diff --git a/.eslintignore b/.eslintignore
index cc014c8b92f..54bd9d41efd 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,7 +1,5 @@
 app/assets/javascripts/env.js
-app/assets/javascripts/main_include.js
 app/assets/javascripts/main_include_admin.js
-app/assets/javascripts/pagedown_custom.js
 app/assets/javascripts/vendor.js
 app/assets/javascripts/locales/i18n.js
 app/assets/javascripts/ember-addons/
@@ -9,13 +7,12 @@ app/assets/javascripts/discourse/lib/autosize.js.es6
 lib/javascripts/locale/
 lib/javascripts/messageformat.js
 lib/javascripts/moment.js
+lib/javascripts/moment-timezone-with-data.js
 lib/javascripts/moment_locale/
 lib/highlight_js/
+plugins/**/lib/javascripts/locale
 public/javascripts/
-spec/phantom_js/smoke_test.js
 vendor/
 test/javascripts/test_helper.js
-test/javascripts/test_helper.js
 test/javascripts/fixtures
 test/javascripts/helpers/assertions.js
-app/assets/javascripts/ember-addons/
diff --git a/.gitattributes b/.gitattributes
index ae7015b472a..546b134a0ce 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,11 +1,14 @@
 # Set default behaviour, in case users don't have core.autocrlf set.
 * text=auto
 
-# Explicitly declare text files we want to always be normalized and converted 
+# Treat email fixtures as binary files so CRLF are not converted to LF.
+*.eml binary
+
+# Explicitly declare text files we want to always be normalized and converted
 # to native line endings on checkout.
 *.yml text
 
-# Custom for Visual Studio, very unlikely, but lets keep it 
+# Custom for Visual Studio, very unlikely, but lets keep it
 *.cs     diff=csharp
 *.sln    merge=union
 *.csproj merge=union
diff --git a/.gitignore b/.gitignore
index 8a1f8652b9a..cf4493d4427 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,8 +19,6 @@ public/tombstone/*
 
 # Ignore bundler config
 /.bundle
-/.vagrant
-/.vagrantfile
 /cache
 /coverage/*
 
@@ -48,13 +46,13 @@ bootsnap-compile-cache/
 
 # Ignore plugins except for the bundled ones.
 /plugins/*
-!/plugins/emoji/
 !/plugins/lazyYT/
 !/plugins/poll/
 !/plugins/discourse-details/
 !/plugins/discourse-nginx-performance-report
 !/plugins/discourse-narrative-bot
 !/plugins/discourse-presence
+!/plugins/discourse-local-dates
 /plugins/*/auto_generated/
 
 /spec/fixtures/plugins/my_plugin/auto_generated
@@ -80,6 +78,7 @@ discourse.sublime-workspace
 *~
 *.swp
 *.swo
+*.swm
 
 # don't check in multisite config
 config/multisite.yml
@@ -95,9 +94,6 @@ config/fog_credentials.yml
 script/download_db
 script/refresh_db
 
-# temp directory for chef (used to configure vagrant VM)
-chef/tmp/*
-
 # .procfile
 .procfile
 
@@ -117,9 +113,12 @@ bundler_stubs/*
 vendor/bundle/*
 *.db
 
-#ignore jetbrains ide file
+# ignore jetbrains ide file
 *.iml
 
+# vim swap
+*.swn
+
 # ignore nodejs files
 /node_modules
 /package-lock.json
diff --git a/.rubocop.yml b/.rubocop.yml
index b897ad3b9ec..8472c89a91f 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -89,12 +89,12 @@ Layout/TrailingWhitespace:
 Lint/Debugger:
   Enabled: true
 
-Lint/BlockAlignment:
+Layout/BlockAlignment:
   Enabled: true
 
 # Align `end` with the matching keyword or starting expression except for
 # assignments, where it should be aligned with the LHS.
-Lint/EndAlignment:
+Layout/EndAlignment:
   Enabled: true
   EnforcedStyleAlignWith: variable
 
diff --git a/.travis.yml b/.travis.yml
index 73ae46e5b09..16ccc5722be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,15 @@
 language: ruby
 
+branches:
+  only:
+    - master
+    - beta
+    - stable
+
 env:
   global:
     - DISCOURSE_HOSTNAME=www.example.com
-    - RUBY_GC_MALLOC_LIMIT=50000000
+    - RUBY_GLOBAL_METHOD_CACHE_SIZE=131072
   matrix:
     - "RAILS_MASTER=0 QUNIT_RUN=0 RUN_LINT=0"
     - "RAILS_MASTER=0 QUNIT_RUN=1 RUN_LINT=0"
@@ -11,8 +17,9 @@ env:
 
 addons:
   chrome: stable
-  postgresql: 9.5
+  postgresql: 9.6
   apt:
+    update: true
     packages:
     - gifsicle
     - jpegoptim
@@ -21,13 +28,10 @@ addons:
 
 matrix:
   fast_finish: true
-  allow_failures:
-    - rvm: 2.5.0
 
 rvm:
-  - 2.5.0
-  - 2.4.2
-  - 2.3.4
+  - 2.5.1
+  - 2.4.4
 
 services:
   - redis-server
@@ -36,6 +40,7 @@ sudo: required
 dist: trusty
 
 cache:
+  apt: true
   yarn: true
   directories:
     - vendor/bundle
@@ -49,13 +54,15 @@ before_install:
   - git clone --depth=1 https://github.com/discourse/discourse-chat-integration.git plugins/discourse-chat-integration
   - git clone --depth=1 https://github.com/discourse/discourse-assign.git plugins/discourse-assign
   - git clone --depth=1 https://github.com/discourse/discourse-patreon.git plugins/discourse-patreon
+  - git clone --depth=1 https://github.com/discourse/discourse-staff-notes.git plugins/discourse-staff-notes
   - export PATH=$HOME/.yarn/bin:$PATH
 
 install:
-  - bash -c "if [ '$RAILS_MASTER' == '1' ]; then bundle update --retry=3 --jobs=3 arel rails seed-fu; fi"
-  - bash -c "if [ '$RAILS_MASTER' == '0' ]; then bundle install --without development --deployment --retry=3 --jobs=3; fi"
-  - bash -c "if [ '$RUN_LINT' == '1' ]; then yarn global add eslint babel-eslint; fi"
-  - bash -c "if [ '$QUNIT_RUN' == '1' ]; then yarn install --dev; fi"
+  - bash -c "if [ '$RAILS_MASTER' == '1' ]; then bundle update --retry=3 --jobs=3 arel rails seed-fu > /dev/null; fi"
+  - bash -c "if [ '$RAILS_MASTER' == '0' ]; then bundle install --without development --deployment --retry=3 --jobs=3 > /dev/null; fi"
+  - bash -c "if [ '$RUN_LINT' == '1' ]; then yarn global add eslint babel-eslint > /dev/null; fi"
+  - bash -c "if [ '$QUNIT_RUN' == '1' ]; then yarn install --dev > /dev/null; fi"
+  - bash -c "if [ '$RUN_LINT' != '1' ]; then bundle exec rake db:create db:migrate > /dev/null; fi"
 
 script:
   - |
@@ -68,11 +75,9 @@ script:
         eslint --ext .es6 plugins/**/test/javascripts && \
         eslint app/assets/javascripts test/javascripts
       else
-        bundle exec rake db:create db:migrate
-
         if [ '$QUNIT_RUN' == '1' ]; then
-          bundle exec rake qunit:test['400000'] && \
-          bundle exec rake plugin:spec
+          bundle exec rake qunit:test['500000'] && \
+          bundle exec rake plugin:qunit
         else
           bundle exec rspec && bundle exec rake plugin:spec
         fi
diff --git a/.tx/config b/.tx/config
index 26ec9541c48..bc1bcb84c93 100644
--- a/.tx/config
+++ b/.tx/config
@@ -2,13 +2,13 @@
 host = https://www.transifex.com
 lang_map = el_GR: el, es_ES: es, fr_FR: fr, ko_KR: ko, pt_PT: pt, sk_SK: sk, vi_VN: vi
 
-[discourse-org.clientenyml]
+[discourse-org.core-client-yml]
 file_filter = config/locales/client.<lang>.yml
 source_file = config/locales/client.en.yml
 source_lang = en
 type = YML
 
-[discourse-org.serverenyml]
+[discourse-org.core-server-yml]
 file_filter = config/locales/server.<lang>.yml
 source_file = config/locales/server.en.yml
 source_lang = en
@@ -50,6 +50,36 @@ source_file = plugins/discourse-presence/config/locales/server.en.yml
 source_lang = en
 type = YML
 
+[discourse-org.coreplugindetailsclientyml]
+file_filter = plugins/discourse-details/config/locales/client.<lang>.yml
+source_file = plugins/discourse-details/config/locales/client.en.yml
+source_lang = en
+type = YML
+
+[discourse-org.coreplugindetailsserveryml]
+file_filter = plugins/discourse-details/config/locales/server.<lang>.yml
+source_file = plugins/discourse-details/config/locales/server.en.yml
+source_lang = en
+type = YML
+
+[discourse-org.corepluginnginx-performance-reportserveryml]
+file_filter = plugins/discourse-nginx-performance-report/config/locales/server.<lang>.yml
+source_file = plugins/discourse-nginx-performance-report/config/locales/server.en.yml
+source_lang = en
+type = YML
+
+[discourse-org.core-plugin-local-dates-client-yml]
+file_filter = plugins/discourse-local-dates/config/locales/client.<lang>.yml
+source_file = plugins/discourse-local-dates/config/locales/client.en.yml
+source_lang = en
+type = YML
+
+[discourse-org.core-plugin-local-dates-server-yml]
+file_filter = plugins/discourse-local-dates/config/locales/server.<lang>.yml
+source_file = plugins/discourse-local-dates/config/locales/server.en.yml
+source_lang = en
+type = YML
+
 [discourse-org.403html]
 file_filter = public/403.<lang>.html
 source_file = public/403.html
diff --git a/Brewfile b/Brewfile
index ba4f913899d..89595137b60 100644
--- a/Brewfile
+++ b/Brewfile
@@ -1,11 +1,5 @@
 # Install development dependencies on Mac OS X using Homebrew (http://mxcl.github.com/homebrew)
 
-# add this repo to Homebrew's sources
-tap 'homebrew/dupes'
-
-# install the gcc compiler required for ruby
-brew 'apple-gcc42'
-
 # you probably already have git installed; ensure that it is the latest version
 brew 'git'
 
diff --git a/Gemfile b/Gemfile
index e558ffb47c5..f5a03d7d5d3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,8 +2,7 @@ source 'https://rubygems.org'
 # if there is a super emergency and rubygems is playing up, try
 #source 'http://production.cf.rubygems.org'
 
-# does not install in linux ATM, so hack this for now
-gem 'bootsnap', require: false
+gem 'bootsnap', require: false, platform: :mri
 
 def rails_master?
   ENV["RAILS_MASTER"] == '1'
@@ -25,8 +24,7 @@ else
   gem 'seed-fu'
 end
 
-gem 'mail'
-gem 'mime-types', require: 'mime/types/columnar'
+gem 'mail', '2.7.1.rc1', require: false
 gem 'mini_mime'
 gem 'mini_suffix'
 
@@ -36,12 +34,12 @@ gem 'redis-namespace'
 
 gem 'active_model_serializers', '~> 0.8.3'
 
-gem 'onebox', '1.8.33'
+gem 'onebox', '1.8.48'
 
 gem 'http_accept_language', '~>2.0.5', require: false
 
 gem 'ember-rails', '0.18.5'
-gem 'ember-source'
+gem 'ember-source', '2.13.3'
 gem 'ember-handlebars-template', '0.7.5'
 gem 'barber'
 
@@ -49,18 +47,18 @@ gem 'message_bus'
 
 gem 'rails_multisite'
 
-gem 'fast_xs'
+gem 'fast_xs', platform: :mri
 
-gem 'fast_xor'
+# may move to xorcist post: https://github.com/fny/xorcist/issues/4
+gem 'fast_xor', platform: :mri
 
-# Forked until https://github.com/sdsykes/fastimage/pull/93 is merged
-gem 'discourse_fastimage', require: 'fastimage'
+gem 'fastimage'
 
 gem 'aws-sdk-s3', require: false
 gem 'excon', require: false
 gem 'unf', require: false
 
-gem 'email_reply_trimmer', '0.1.8'
+gem 'email_reply_trimmer', '~> 0.1'
 
 # Forked until https://github.com/toy/image_optim/pull/149 is merged
 gem 'discourse_image_optim', require: 'image_optim'
@@ -68,9 +66,6 @@ gem 'multi_json'
 gem 'mustache'
 gem 'nokogiri'
 
-# this may end up deprecating nokogiri
-gem 'oga', require: false
-
 gem 'omniauth'
 gem 'omniauth-openid'
 gem 'openid-redis-store'
@@ -83,7 +78,7 @@ gem 'omniauth-oauth2', require: false
 
 gem 'omniauth-google-oauth2'
 gem 'oj'
-gem 'pg'
+gem 'pg', '~> 0.21.0'
 gem 'pry-rails', require: false
 gem 'r2', '~> 0.2.5', require: false
 gem 'rake'
@@ -120,8 +115,7 @@ group :test, :development do
   gem 'listen', require: false
   gem 'certified', require: false
   # later appears to break Fabricate(:topic, category: category)
-  gem 'fabrication', '2.9.8', require: false
-  gem 'discourse-qunit-rails', require: 'qunit-rails'
+  gem 'fabrication', require: false
   gem 'mocha', require: false
   gem 'rb-fsevent', require: RUBY_PLATFORM =~ /darwin/i ? 'rb-fsevent' : false
   gem 'rb-inotify', '~> 0.9', require: RUBY_PLATFORM =~ /linux/i ? 'rb-inotify' : false
@@ -145,7 +139,7 @@ end
 # this is an optional gem, it provides a high performance replacement
 # to String#blank? a method that is called quite frequently in current
 # ActiveRecord, this may change in the future
-gem 'fast_blank'
+gem 'fast_blank', platform: :mri
 
 # this provides a very efficient lru cache
 gem 'lru_redux'
@@ -159,7 +153,7 @@ gem 'htmlentities', require: false
 gem 'flamegraph', require: false
 gem 'rack-mini-profiler', require: false
 
-gem 'unicorn', require: false
+gem 'unicorn', require: false, platform: :mri
 gem 'puma', require: false
 gem 'rbtrace', require: false, platform: :mri
 gem 'gc_tracer', require: false, platform: :mri
@@ -179,9 +173,17 @@ gem 'logster'
 
 gem 'sassc', require: false
 
+gem 'rotp'
+gem 'rqrcode'
+
+gem 'sshkey', require: false
+
 if ENV["IMPORT"] == "1"
   gem 'mysql2'
   gem 'redcarpet'
   gem 'sqlite3', '~> 1.3.13'
   gem 'ruby-bbcode-to-md', github: 'nlalonde/ruby-bbcode-to-md'
+  gem 'reverse_markdown'
 end
+
+gem 'webpush', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 48b2c7df1c5..50f5b5c6935 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -41,9 +41,8 @@ GEM
     annotate (2.7.2)
       activerecord (>= 3.2, < 6.0)
       rake (>= 10.4, < 13.0)
-    ansi (1.5.0)
     arel (8.0.0)
-    ast (2.3.0)
+    ast (2.4.0)
     aws-partitions (1.24.0)
     aws-sdk-core (3.6.0)
       aws-partitions (~> 1.0)
@@ -64,9 +63,9 @@ GEM
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
       rack (>= 0.9.0)
-    binding_of_caller (0.7.2)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.0.0)
+    bootsnap (1.1.8)
       msgpack (~> 1.0)
     builder (3.2.3)
     bullet (5.5.1)
@@ -74,25 +73,23 @@ GEM
       uniform_notifier (~> 1.10.0)
     byebug (9.0.6)
     certified (1.0.0)
-    coderay (1.1.1)
+    chunky_png (1.3.8)
+    coderay (1.1.2)
     concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
     cppjieba_rb (0.3.0)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    crass (1.0.2)
+    crass (1.0.3)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
-    discourse-qunit-rails (0.0.11)
-      railties
-    discourse_fastimage (2.1.0)
     discourse_image_optim (0.24.5)
       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
       image_size (~> 1.5)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
-    email_reply_trimmer (0.1.8)
+    email_reply_trimmer (0.1.12)
     ember-data-source (2.2.1)
       ember-source (>= 1.8, < 3.0)
     ember-handlebars-template (0.7.5)
@@ -120,6 +117,7 @@ GEM
       rake
       rake-compiler
     fast_xs (0.8.0)
+    fastimage (2.1.1)
     ffi (1.9.18)
     flamegraph (0.9.5)
     foreman (0.84.0)
@@ -133,6 +131,7 @@ GEM
     hashie (3.5.5)
     highline (1.7.8)
     hiredis (0.6.1)
+    hkdf (0.3.0)
     htmlentities (4.3.4)
     http_accept_language (2.0.5)
     i18n (0.8.6)
@@ -144,7 +143,7 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jwt (1.5.6)
-    kgio (2.11.0)
+    kgio (2.11.1)
     libv8 (6.3.292.48.1)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -159,21 +158,18 @@ GEM
     logstash-logger (0.25.1)
       logstash-event (~> 1.2)
     logster (1.2.9)
-    loofah (2.1.1)
+    loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lru_redux (1.1.0)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
-    memory_profiler (0.9.8)
-    message_bus (2.1.1)
+    mail (2.7.1.rc1)
+      mini_mime (>= 0.1.1)
+    memory_profiler (0.9.10)
+    message_bus (2.1.5)
       rack (>= 1.1.3)
     metaclass (0.0.4)
     method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_mime (0.1.3)
+    mini_mime (1.0.0)
     mini_portile2 (2.3.0)
     mini_racer (0.1.15)
       libv8 (~> 6.3)
@@ -184,14 +180,14 @@ GEM
       metaclass (~> 0.0.1)
     mock_redis (0.17.3)
     moneta (1.0.0)
-    msgpack (1.1.0)
-    multi_json (1.12.1)
+    msgpack (1.2.4)
+    multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     mustache (1.0.5)
-    nokogiri (1.8.1)
+    nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
-    nokogumbo (1.4.13)
+    nokogumbo (1.5.0)
       nokogiri
     oauth (0.5.1)
     oauth2 (1.3.1)
@@ -200,10 +196,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oga (2.10)
-      ast
-      ruby-ll (~> 2.1)
-    oj (3.1.0)
+    oj (3.4.0)
     omniauth (1.6.1)
       hashie (>= 3.4.6, < 3.6.0)
       rack (>= 1.6.2, < 3)
@@ -232,8 +225,7 @@ GEM
     omniauth-twitter (1.3.0)
       omniauth-oauth (~> 1.1)
       rack
-    onebox (1.8.33)
-      fast_blank (>= 1.0.0)
+    onebox (1.8.48)
       htmlentities (~> 4.3)
       moneta (~> 1.0)
       multi_json (~> 1.11)
@@ -243,10 +235,10 @@ GEM
     openid-redis-store (0.0.2)
       redis
       ruby-openid
-    parallel (1.12.0)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    pg (0.20.0)
+    parallel (1.12.1)
+    parser (2.5.0.3)
+      ast (~> 2.4.0)
+    pg (0.21.0)
     powerpack (0.1.1)
     progress (3.3.1)
     pry (0.10.4)
@@ -260,22 +252,22 @@ GEM
     public_suffix (2.0.5)
     puma (3.9.1)
     r2 (0.2.6)
-    rack (2.0.3)
-    rack-mini-profiler (0.10.7)
+    rack (2.0.5)
+    rack-mini-profiler (1.0.0)
       rack (>= 1.2.0)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rack-protection (2.0.0)
+    rack-protection (2.0.1)
       rack
     rack-test (0.7.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    rails_multisite (1.1.2)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    rails_multisite (2.0.4)
       activerecord (> 4.2, < 6)
       railties (> 4.2, < 6)
     railties (5.1.4)
@@ -284,24 +276,26 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.2)
-      rake
+    rainbow (3.0.0)
     raindrops (0.19.0)
-    rake (12.1.0)
+    rake (12.3.0)
     rake-compiler (1.0.4)
       rake
     rb-fsevent (0.9.8)
     rb-inotify (0.9.8)
       ffi (>= 0.5.0)
-    rbtrace (0.4.8)
+    rbtrace (0.4.10)
       ffi (>= 1.0.6)
       msgpack (>= 0.4.3)
       trollop (>= 1.16.2)
-    redis (3.3.5)
-    redis-namespace (1.5.3)
-      redis (~> 3.0, >= 3.0.4)
+    redis (4.0.1)
+    redis-namespace (1.6.0)
+      redis (>= 3.0.4)
     request_store (1.3.2)
     rinku (2.0.2)
+    rotp (3.3.0)
+    rqrcode (0.10.1)
+      chunky_png (~> 1.0)
     rspec (3.6.0)
       rspec-core (~> 3.6.0)
       rspec-expectations (~> 3.6.0)
@@ -327,16 +321,13 @@ GEM
       rspec-support (~> 3.6.0)
     rspec-support (3.6.0)
     rtlit (0.0.5)
-    rubocop (0.51.0)
+    rubocop (0.53.0)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
+      parser (>= 2.5)
       powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-ll (2.1.2)
-      ansi
-      ast
     ruby-openid (2.7.0)
     ruby-prof (0.16.2)
     ruby-progressbar (1.9.0)
@@ -345,10 +336,10 @@ GEM
       nokogiri (>= 1.6.0)
     ruby_dep (1.5.0)
     safe_yaml (1.0.4)
-    sanitize (4.5.0)
+    sanitize (4.6.4)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
-      nokogumbo (~> 1.4.1)
+      nokogumbo (~> 1.4)
     sass (3.4.24)
     sassc (1.11.2)
       bundler
@@ -363,11 +354,11 @@ GEM
     shoulda-context (1.2.2)
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
-    sidekiq (5.0.5)
+    sidekiq (5.1.3)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
-      redis (>= 3.3.4, < 5)
+      redis (>= 3.3.5, < 5)
     slop (3.6.0)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
@@ -376,6 +367,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
+    sshkey (1.9.0)
     stackprof (0.2.10)
     thor (0.19.4)
     thread_safe (0.3.6)
@@ -389,7 +381,7 @@ GEM
       unf_ext
     unf_ext (0.0.7.4)
     unicode-display_width (1.3.0)
-    unicorn (5.3.1)
+    unicorn (5.4.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     uniform_notifier (1.10.0)
@@ -397,6 +389,9 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
+    webpush (0.3.2)
+      hkdf (~> 0.2)
+      jwt
 
 PLATFORMS
   ruby
@@ -419,20 +414,19 @@ DEPENDENCIES
   byebug
   certified
   cppjieba_rb
-  discourse-qunit-rails
-  discourse_fastimage
   discourse_image_optim
-  email_reply_trimmer (= 0.1.8)
+  email_reply_trimmer (~> 0.1)
   ember-handlebars-template (= 0.7.5)
   ember-rails (= 0.18.5)
-  ember-source
+  ember-source (= 2.13.3)
   excon
   execjs
-  fabrication (= 2.9.8)
+  fabrication
   fakeweb (~> 1.3.0)
   fast_blank
   fast_xor
   fast_xs
+  fastimage
   flamegraph
   foreman
   gc_tracer
@@ -446,10 +440,9 @@ DEPENDENCIES
   logstash-logger
   logster
   lru_redux
-  mail
+  mail (= 2.7.1.rc1)
   memory_profiler
   message_bus
-  mime-types
   mini_mime
   mini_racer
   mini_suffix
@@ -459,7 +452,6 @@ DEPENDENCIES
   multi_json
   mustache
   nokogiri
-  oga
   oj
   omniauth
   omniauth-facebook
@@ -469,9 +461,9 @@ DEPENDENCIES
   omniauth-oauth2
   omniauth-openid
   omniauth-twitter
-  onebox (= 1.8.33)
+  onebox (= 1.8.48)
   openid-redis-store
-  pg
+  pg (~> 0.21.0)
   pry-nav
   pry-rails
   puma
@@ -487,6 +479,8 @@ DEPENDENCIES
   redis
   redis-namespace
   rinku
+  rotp
+  rqrcode
   rspec
   rspec-html-matchers
   rspec-rails
@@ -500,6 +494,7 @@ DEPENDENCIES
   shoulda
   sidekiq
   sprockets-rails
+  sshkey
   stackprof
   thor
   tilt
@@ -507,6 +502,7 @@ DEPENDENCIES
   unf
   unicorn
   webmock
+  webpush
 
 BUNDLED WITH
-   1.16.0
+   1.16.1
diff --git a/README.md b/README.md
index 9a4c6f7595d..6e04e399e9d 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Browse [lots more notable Discourse instances](https://www.discourse.org/custome
 
 ## Development
 
-1. If you're **brand new to Ruby and Rails**, please see [**Discourse as Your First Rails App**](http://blog.discourse.org/2013/04/discourse-as-your-first-rails-app/) or our [**Discourse Vagrant Developer Guide**](docs/VAGRANT.md), which includes a development environment in a virtual machine.
+1. If you're **brand new to Ruby and Rails**, please see [**Discourse as Your First Rails App**](http://blog.discourse.org/2013/04/discourse-as-your-first-rails-app/).
 
 2. If you're familiar with how Rails works and are comfortable setting up your own environment, use our [**Discourse Advanced Developer Guide**](docs/DEVELOPER-ADVANCED.md).
 
@@ -57,7 +57,6 @@ Plus *lots* of Ruby Gems, a complete list of which is at [/master/Gemfile](https
 ## Contributing
 
 [![Build Status](https://api.travis-ci.org/discourse/discourse.svg?branch=master)](https://travis-ci.org/discourse/discourse)
-[![Code Climate](https://codeclimate.com/github/discourse/discourse.svg)](https://codeclimate.com/github/discourse/discourse)
 
 Discourse is **100% free** and **open source**. We encourage and support an active, healthy community that
 accepts contributions from the public &ndash; including you!
@@ -84,7 +83,7 @@ The original Discourse code contributors can be found in [**AUTHORS.MD**](docs/A
 
 ## Copyright / License
 
-Copyright 2014 - 2017 Civilized Discourse Construction Kit, Inc.
+Copyright 2014 - 2018 Civilized Discourse Construction Kit, Inc.
 
 Licensed under the GNU General Public License Version 2.0 (or later);
 you may not use this work except in compliance with the License.
diff --git a/Vagrantfile b/Vagrantfile
deleted file mode 100644
index bac277c0907..00000000000
--- a/Vagrantfile
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-# See https://github.com/discourse/discourse/blob/master/docs/VAGRANT.md
-#
-Vagrant.configure("2") do |config|
-  config.vm.box     = 'discourse-16.04'
-  config.vm.box_url = "https://www.dropbox.com/s/2132770g1e05c6d/discourse.box?dl=1"
-
-  # Make this VM reachable on the host network as well, so that other
-  # VM's running other browsers can access our dev server.
-  config.vm.network :private_network, ip: "192.168.10.200"
-
-  # Make it so that network access from the vagrant guest is able to
-  # use SSH private keys that are present on the host without copying
-  # them into the VM.
-  config.ssh.forward_agent = true
-
-  config.vm.provider :virtualbox do |v|
-    # This setting gives the VM 1024MB of RAM instead of the default 384.
-    v.customize ["modifyvm", :id, "--memory", [ENV['DISCOURSE_VM_MEM'].to_i, 1024].max]
-
-    # Who has a single core cpu these days anyways?
-    cpu_count = 2
-
-    # Determine the available cores in host system.
-    # This mostly helps on linux, but it couldn't hurt on MacOSX.
-    if RUBY_PLATFORM =~ /linux/
-      cpu_count = `nproc`.to_i
-    elsif RUBY_PLATFORM =~ /darwin/
-      cpu_count = `sysctl -n hw.ncpu`.to_i
-    end
-
-    # Assign additional cores to the guest OS.
-    v.customize ["modifyvm", :id, "--cpus", cpu_count]
-    v.customize ["modifyvm", :id, "--ioapic", "on"]
-
-    # This setting makes it so that network access from inside the vagrant guest
-    # is able to resolve DNS using the hosts VPN connection.
-    v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
-  end
-
-  config.vm.network :forwarded_port, guest: 3000, host: 4000
-  config.vm.network :forwarded_port, guest: 1080, host: 4080 # Mailcatcher
-
-  nfs_setting = RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/
-  config.vm.synced_folder ".", "/vagrant", id: "vagrant-root"
-
-end
diff --git a/app/assets/images/favicons/instagram.png b/app/assets/images/favicons/instagram.png
new file mode 100644
index 00000000000..e51ea9c92fb
Binary files /dev/null and b/app/assets/images/favicons/instagram.png differ
diff --git a/app/assets/images/push-notifications/check.png b/app/assets/images/push-notifications/check.png
new file mode 100644
index 00000000000..ad223d26f34
Binary files /dev/null and b/app/assets/images/push-notifications/check.png differ
diff --git a/app/assets/images/push-notifications/discourse.png b/app/assets/images/push-notifications/discourse.png
new file mode 100644
index 00000000000..46d9720633b
Binary files /dev/null and b/app/assets/images/push-notifications/discourse.png differ
diff --git a/app/assets/images/push-notifications/group_mentioned.png b/app/assets/images/push-notifications/group_mentioned.png
new file mode 100644
index 00000000000..ebb5560414b
Binary files /dev/null and b/app/assets/images/push-notifications/group_mentioned.png differ
diff --git a/app/assets/images/push-notifications/linked.png b/app/assets/images/push-notifications/linked.png
new file mode 100644
index 00000000000..5e25f2426a1
Binary files /dev/null and b/app/assets/images/push-notifications/linked.png differ
diff --git a/app/assets/images/push-notifications/mentioned.png b/app/assets/images/push-notifications/mentioned.png
new file mode 100644
index 00000000000..ebb5560414b
Binary files /dev/null and b/app/assets/images/push-notifications/mentioned.png differ
diff --git a/app/assets/images/push-notifications/posted.png b/app/assets/images/push-notifications/posted.png
new file mode 100644
index 00000000000..41d02aff0eb
Binary files /dev/null and b/app/assets/images/push-notifications/posted.png differ
diff --git a/app/assets/images/push-notifications/private_message.png b/app/assets/images/push-notifications/private_message.png
new file mode 100644
index 00000000000..8e71e69c7fe
Binary files /dev/null and b/app/assets/images/push-notifications/private_message.png differ
diff --git a/app/assets/images/push-notifications/quoted.png b/app/assets/images/push-notifications/quoted.png
new file mode 100644
index 00000000000..01d889b468a
Binary files /dev/null and b/app/assets/images/push-notifications/quoted.png differ
diff --git a/app/assets/images/push-notifications/replied.png b/app/assets/images/push-notifications/replied.png
new file mode 100644
index 00000000000..41d02aff0eb
Binary files /dev/null and b/app/assets/images/push-notifications/replied.png differ
diff --git a/app/assets/javascripts/admin/components/admin-graph.js.es6 b/app/assets/javascripts/admin/components/admin-graph.js.es6
index c99c7b186b5..724e9673742 100644
--- a/app/assets/javascripts/admin/components/admin-graph.js.es6
+++ b/app/assets/javascripts/admin/components/admin-graph.js.es6
@@ -1,4 +1,5 @@
 import loadScript from 'discourse/lib/load-script';
+import { number } from 'discourse/lib/formatter';
 
 export default Ember.Component.extend({
   tagName: 'canvas',
@@ -22,10 +23,16 @@ export default Ember.Component.extend({
       data: data,
       options: {
         responsive: true,
+        tooltips: {
+          callbacks: {
+            title: (context) => moment(context[0].xLabel, "YYYY-MM-DD").format("LL")
+          }
+        },
         scales: {
           yAxes: [{
             display: true,
             ticks: {
+              callback: (label) => number(label),
               suggestedMin: 0
             }
           }]
diff --git a/app/assets/javascripts/admin/components/admin-report-counts.js.es6 b/app/assets/javascripts/admin/components/admin-report-counts.js.es6
index 46ab32f6091..1739a186b34 100644
--- a/app/assets/javascripts/admin/components/admin-report-counts.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-counts.js.es6
@@ -1,4 +1,5 @@
 export default Ember.Component.extend({
+  allTime: true,
   tagName: 'tr',
   reverseColors: Ember.computed.match('report.type', /^(time_to_first_response|topics_with_no_response)$/),
   classNameBindings: ['reverseColors']
diff --git a/app/assets/javascripts/discourse/components/latest-topic-list.js.es6 b/app/assets/javascripts/admin/components/cancel-link.js.es6
similarity index 55%
rename from app/assets/javascripts/discourse/components/latest-topic-list.js.es6
rename to app/assets/javascripts/admin/components/cancel-link.js.es6
index 664eb94c31e..9250c1ae73b 100644
--- a/app/assets/javascripts/discourse/components/latest-topic-list.js.es6
+++ b/app/assets/javascripts/admin/components/cancel-link.js.es6
@@ -1,3 +1,3 @@
 export default Ember.Component.extend({
-  classNames: ['latest-topic-list']
+  tagName: ''
 });
diff --git a/app/assets/javascripts/admin/components/dashboard-inline-table.js.es6 b/app/assets/javascripts/admin/components/dashboard-inline-table.js.es6
new file mode 100644
index 00000000000..8fae065f7bc
--- /dev/null
+++ b/app/assets/javascripts/admin/components/dashboard-inline-table.js.es6
@@ -0,0 +1,19 @@
+import { ajax } from "discourse/lib/ajax";
+import AsyncReport from "admin/mixins/async-report";
+
+export default Ember.Component.extend(AsyncReport, {
+  classNames: ["dashboard-inline-table"],
+
+  fetchReport() {
+    this._super();
+
+    let payload = this.buildPayload(["total", "prev30Days"]);
+
+    return Ember.RSVP.Promise.all(this.get("dataSources").map(dataSource => {
+      return ajax(dataSource, payload)
+        .then(response => {
+          this.get("reports").pushObject(this.loadReport(response.report));
+        });
+    }));
+  }
+});
diff --git a/app/assets/javascripts/admin/components/dashboard-mini-chart.js.es6 b/app/assets/javascripts/admin/components/dashboard-mini-chart.js.es6
new file mode 100644
index 00000000000..5992e47953d
--- /dev/null
+++ b/app/assets/javascripts/admin/components/dashboard-mini-chart.js.es6
@@ -0,0 +1,164 @@
+import { ajax } from "discourse/lib/ajax";
+import AsyncReport from "admin/mixins/async-report";
+import Report from "admin/models/report";
+import { number } from 'discourse/lib/formatter';
+import loadScript from "discourse/lib/load-script";
+import { registerTooltip, unregisterTooltip } from "discourse/lib/tooltip";
+
+function collapseWeekly(data, average) {
+  let aggregate = [];
+  let bucket, i;
+  let offset = data.length % 7;
+  for(i = offset; i < data.length; i++) {
+
+    if (bucket && (i % 7 === offset)) {
+      if (average) {
+        bucket.y = parseFloat((bucket.y / 7.0).toFixed(2));
+      }
+      aggregate.push(bucket);
+      bucket = null;
+    }
+
+    bucket = bucket || { x: data[i].x, y: 0 };
+    bucket.y += data[i].y;
+  }
+  return aggregate;
+}
+
+export default Ember.Component.extend(AsyncReport, {
+  classNames: ["chart", "dashboard-mini-chart"],
+  total: 0,
+
+  init() {
+    this._super();
+
+    this._colorsPool = ["rgb(0,136,204)", "rgb(235,83,148)"];
+  },
+
+  didRender() {
+    this._super();
+    registerTooltip($(this.element).find("[data-tooltip]"));
+  },
+
+  willDestroyElement() {
+    this._super();
+    unregisterTooltip($(this.element).find("[data-tooltip]"));
+  },
+
+  pickColorAtIndex(index) {
+    return this._colorsPool[index] || this._colorsPool[0];
+  },
+
+  fetchReport() {
+    this._super();
+
+    let payload = this.buildPayload(["prev_period"]);
+
+    if (this._chart) {
+      this._chart.destroy();
+      this._chart = null;
+    }
+
+    return Ember.RSVP.Promise.all(this.get("dataSources").map(dataSource => {
+      return ajax(dataSource, payload)
+        .then(response => {
+          this.get("reports").pushObject(this.loadReport(response.report));
+        });
+    }));
+  },
+
+  loadReport(report, previousReport) {
+    Report.fillMissingDates(report);
+
+    if (report.data && report.data.length > 40) {
+      report.data = collapseWeekly(report.data, report.average);
+    }
+
+    if (previousReport && previousReport.color.length) {
+      report.color = previousReport.color;
+    } else {
+      const dataSourceNameIndex = this.get("dataSourceNames").split(",").indexOf(report.type);
+      report.color = this.pickColorAtIndex(dataSourceNameIndex);
+    }
+
+    return Report.create(report);
+  },
+
+  renderReport() {
+    this._super();
+
+    Ember.run.schedule("afterRender", () => {
+      const $chartCanvas = this.$(".chart-canvas");
+      if (!$chartCanvas.length) return;
+      const context = $chartCanvas[0].getContext("2d");
+
+      const reportsForPeriod = this.get("reportsForPeriod");
+
+      const labels = Ember.makeArray(reportsForPeriod.get("firstObject.data")).map(d => d.x);
+
+      const data = {
+        labels,
+        datasets: reportsForPeriod.map(report => {
+          return {
+            data: Ember.makeArray(report.data).map(d => number(d.y, { ceil: true })),
+            backgroundColor: "rgba(200,220,240,0.3)",
+            borderColor: report.color
+          };
+        })
+      };
+
+      if (this._chart) {
+        this._chart.destroy();
+        this._chart = null;
+      }
+
+      loadScript("/javascripts/Chart.min.js").then(() => {
+        if (this._chart) {
+          this._chart.destroy();
+        }
+        this._chart = new window.Chart(context, this._buildChartConfig(data));
+      });
+    });
+  },
+
+  _buildChartConfig(data) {
+    return {
+      type: "line",
+      data,
+      options: {
+        tooltips: {
+          callbacks: {
+            title: (context) => moment(context[0].xLabel, "YYYY-MM-DD").format("LL")
+          }
+        },
+        legend: {
+          display: false
+        },
+        responsive: true,
+        maintainAspectRatio: false,
+        layout: {
+          padding: {
+            left: 0,
+            top: 0,
+            right: 0,
+            bottom: 0
+          }
+        },
+        scales: {
+          yAxes: [{
+            display: true,
+            ticks: { callback: (label) => number(label, { ceil: true }) }
+          }],
+          xAxes: [{
+            display: true,
+            gridLines: { display: false },
+            type: "time",
+            time: {
+              parser: "YYYY-MM-DD"
+            }
+          }],
+        }
+      },
+    };
+  }
+});
diff --git a/app/assets/javascripts/admin/components/dashboard-table.js.es6 b/app/assets/javascripts/admin/components/dashboard-table.js.es6
new file mode 100644
index 00000000000..96b74e6e153
--- /dev/null
+++ b/app/assets/javascripts/admin/components/dashboard-table.js.es6
@@ -0,0 +1,19 @@
+import { ajax } from "discourse/lib/ajax";
+import AsyncReport from "admin/mixins/async-report";
+
+export default Ember.Component.extend(AsyncReport, {
+  classNames: ["dashboard-table"],
+
+  fetchReport() {
+    this._super();
+
+    let payload = this.buildPayload(["total", "prev30Days"]);
+
+    return Ember.RSVP.Promise.all(this.get("dataSources").map(dataSource => {
+      return ajax(dataSource, payload)
+        .then(response => {
+          this.get("reports").pushObject(this.loadReport(response.report));
+        });
+    }));
+  }
+});
diff --git a/app/assets/javascripts/admin/components/flag-user-lists.js.es6 b/app/assets/javascripts/admin/components/flag-user-lists.js.es6
new file mode 100644
index 00000000000..cd843ff7ab6
--- /dev/null
+++ b/app/assets/javascripts/admin/components/flag-user-lists.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Component.extend({
+  classNames: ['flag-user-lists']
+});
diff --git a/app/assets/javascripts/admin/components/flagged-post-title.js.es6 b/app/assets/javascripts/admin/components/flagged-post-title.js.es6
new file mode 100644
index 00000000000..7c1c013375b
--- /dev/null
+++ b/app/assets/javascripts/admin/components/flagged-post-title.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Component.extend({
+  tagName: 'h3'
+});
diff --git a/app/assets/javascripts/admin/components/flagged-post.js.es6 b/app/assets/javascripts/admin/components/flagged-post.js.es6
index 0754952a011..8aff3d2a2d1 100644
--- a/app/assets/javascripts/admin/components/flagged-post.js.es6
+++ b/app/assets/javascripts/admin/components/flagged-post.js.es6
@@ -4,8 +4,6 @@ import computed from 'ember-addons/ember-computed-decorators';
 export default Ember.Component.extend({
   adminTools: Ember.inject.service(),
   expanded: false,
-  suspended: false,
-
   tagName: 'div',
   classNameBindings: [
     ':flagged-post',
@@ -13,17 +11,15 @@ export default Ember.Component.extend({
     'flaggedPost.deleted'
   ],
 
+  canAct: Ember.computed.alias('actableFilter'),
+
   @computed('filter')
-  canAct(filter) {
+  actableFilter(filter) {
     return filter === 'active';
   },
 
   removeAfter(promise) {
-    return promise.then(() => {
-      this.attrs.removePost();
-    }).catch(() => {
-      bootbox.alert(I18n.t("admin.flags.error"));
-    });
+    return promise.then(() => this.attrs.removePost());
   },
 
   _spawnModal(name, model, modalClass) {
@@ -33,7 +29,7 @@ export default Ember.Component.extend({
 
   actions: {
     removeAfter(promise) {
-      this.removeAfter(promise);
+      return this.removeAfter(promise);
     },
 
     disagree() {
@@ -55,18 +51,6 @@ export default Ember.Component.extend({
         filter: 'post',
         post_id: this.get('flaggedPost.id')
       });
-    },
-
-    showSuspendModal() {
-      let post = this.get('flaggedPost');
-      let user = post.get('user');
-      this.get('adminTools').showSuspendModal(
-        user,
-        {
-          post,
-          successCallback: result => this.set('suspended', result.suspended)
-        }
-      );
     }
   }
 });
diff --git a/app/assets/javascripts/admin/components/penalty-post-action.js.es6 b/app/assets/javascripts/admin/components/penalty-post-action.js.es6
new file mode 100644
index 00000000000..d89c69a32d0
--- /dev/null
+++ b/app/assets/javascripts/admin/components/penalty-post-action.js.es6
@@ -0,0 +1,32 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
+const ACTIONS = ['delete', 'edit', 'none'];
+export default Ember.Component.extend({
+  postAction: null,
+  postEdit: null,
+
+  @computed
+  penaltyActions() {
+    return ACTIONS.map(id => {
+      return { id, name: I18n.t(`admin.user.penalty_post_${id}`) };
+    });
+  },
+
+  editing: Ember.computed.equal('postAction', 'edit'),
+
+  actions: {
+    penaltyChanged() {
+      let postAction = this.get('postAction');
+
+      // If we switch to edit mode, jump to the edit textarea
+      if (postAction === 'edit') {
+        Ember.run.scheduleOnce('afterRender', () => {
+          let $elem = this.$();
+          let body = $elem.closest('.modal-body');
+          body.scrollTop(body.height());
+          $elem.find('.post-editor').focus();
+        });
+      }
+    }
+  }
+});
diff --git a/app/assets/javascripts/admin/components/screened-ip-address-form.js.es6 b/app/assets/javascripts/admin/components/screened-ip-address-form.js.es6
index 0f8a29ba8c3..ef6e7596d11 100644
--- a/app/assets/javascripts/admin/components/screened-ip-address-form.js.es6
+++ b/app/assets/javascripts/admin/components/screened-ip-address-form.js.es6
@@ -48,13 +48,17 @@ export default Ember.Component.extend({
           action_name: this.get('actionName')
         });
         screenedIpAddress.save().then(result => {
-          this.setProperties({ ip_address: '', formSubmitted: false });
-          this.sendAction('action', ScreenedIpAddress.create(result.screened_ip_address));
-          Ember.run.schedule('afterRender', () => this.$('.ip-address-input').focus());
+          if (result.success) {
+            this.setProperties({ ip_address: '', formSubmitted: false });
+            this.sendAction('action', ScreenedIpAddress.create(result.screened_ip_address));
+            Ember.run.schedule('afterRender', () => this.$('.ip-address-input').focus());
+          } else {
+            bootbox.alert(result.errors);
+          }
         }).catch(e => {
           this.set('formSubmitted', false);
-          const msg = (e.responseJSON && e.responseJSON.errors) ?
-                      I18n.t("generic_error_with_reason", {error: e.responseJSON.errors.join('. ')}) :
+          const msg = (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) ?
+                      I18n.t("generic_error_with_reason", {error: e.jqXHR.responseJSON.errors.join('. ')}) :
                       I18n.t("generic_error");
           bootbox.alert(msg, () => this.$('.ip-address-input').focus());
         });
diff --git a/app/assets/javascripts/admin/components/silence-details.js.es6 b/app/assets/javascripts/admin/components/silence-details.js.es6
new file mode 100644
index 00000000000..9250c1ae73b
--- /dev/null
+++ b/app/assets/javascripts/admin/components/silence-details.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Component.extend({
+  tagName: ''
+});
diff --git a/app/assets/javascripts/admin/components/site-setting.js.es6 b/app/assets/javascripts/admin/components/site-setting.js.es6
index 73e8160a28c..98bdf950f65 100644
--- a/app/assets/javascripts/admin/components/site-setting.js.es6
+++ b/app/assets/javascripts/admin/components/site-setting.js.es6
@@ -1,96 +1,10 @@
 import BufferedContent from 'discourse/mixins/buffered-content';
 import SiteSetting from 'admin/models/site-setting';
-import { propertyNotEqual } from 'discourse/lib/computed';
-import computed from 'ember-addons/ember-computed-decorators';
-import { categoryLinkHTML } from 'discourse/helpers/category-link';
-
-const CustomTypes = ['bool', 'enum', 'list', 'url_list', 'host_list', 'category_list', 'value_list'];
-
-export default Ember.Component.extend(BufferedContent, {
-  classNameBindings: [':row', ':setting', 'setting.overridden', 'typeClass'],
-  content: Ember.computed.alias('setting'),
-  dirty: propertyNotEqual('buffered.value', 'setting.value'),
-  validationMessage: null,
-
-  @computed("setting", "buffered.value")
-  preview(setting, value) {
-    // A bit hacky, but allows us to use helpers
-    if (setting.get('setting') === 'category_style') {
-      let category = this.site.get('categories.firstObject');
-      if (category) {
-        return categoryLinkHTML(category, {
-          categoryStyle: value
-        });
-      }
-    }
-
-    let preview = setting.get('preview');
-    if (preview) {
-      return new Handlebars.SafeString("<div class='preview'>" + preview.replace(/\{\{value\}\}/g, value) + "</div>");
-    }
-  },
-
-  @computed('componentType')
-  typeClass(componentType) {
-    return componentType.replace(/\_/g, '-');
-  },
-
-  @computed("setting.setting")
-  settingName(setting) {
-    return setting.replace(/\_/g, ' ');
-  },
-
-  @computed("setting.type")
-  componentType(type) {
-    return CustomTypes.indexOf(type) !== -1 ? type : 'string';
-  },
-
-  @computed("typeClass")
-  componentName(typeClass) {
-    return "site-settings/" + typeClass;
-  },
-
-  _watchEnterKey: function() {
-    const self = this;
-    this.$().on("keydown.site-setting-enter", ".input-setting-string", function (e) {
-      if (e.keyCode === 13) { // enter key
-        self._save();
-      }
-    });
-  }.on('didInsertElement'),
-
-  _removeBindings: function() {
-    this.$().off("keydown.site-setting-enter");
-  }.on("willDestroyElement"),
+import SettingComponent from 'admin/mixins/setting-component';
 
+export default Ember.Component.extend(BufferedContent, SettingComponent, {
   _save() {
-    const setting = this.get('buffered'),
-      action = SiteSetting.update(setting.get('setting'), setting.get('value'));
-    action.then(() => {
-      this.set('validationMessage', null);
-      this.commitBuffer();
-    }).catch((e) => {
-      if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
-        this.set('validationMessage', e.jqXHR.responseJSON.errors[0]);
-      } else {
-        this.set('validationMessage', I18n.t('generic_error'));
-      }
-    });
-  },
-
-  actions: {
-    save() {
-      this._save();
-    },
-
-    resetDefault() {
-      this.set('buffered.value', this.get('setting.default'));
-      this._save();
-    },
-
-    cancel() {
-      this.rollbackBuffer();
-    }
+    const setting = this.get('buffered');
+    return SiteSetting.update(setting.get('setting'), setting.get('value'));
   }
-
 });
diff --git a/app/assets/javascripts/admin/components/site-settings/bool.js.es6 b/app/assets/javascripts/admin/components/site-settings/bool.js.es6
index 40fcfb354b6..6be1a14e27a 100644
--- a/app/assets/javascripts/admin/components/site-settings/bool.js.es6
+++ b/app/assets/javascripts/admin/components/site-settings/bool.js.es6
@@ -6,7 +6,7 @@ export default Ember.Component.extend({
   enabled: {
     get(value) {
       if (Ember.isEmpty(value)) { return false; }
-      return value === "true";
+      return value.toString() === "true";
     },
     set(value) {
       this.set("value", value ? "true" : "false");
diff --git a/app/assets/javascripts/admin/components/staff-actions.js.es6 b/app/assets/javascripts/admin/components/staff-actions.js.es6
new file mode 100644
index 00000000000..9e742526afa
--- /dev/null
+++ b/app/assets/javascripts/admin/components/staff-actions.js.es6
@@ -0,0 +1,22 @@
+import DiscourseURL from 'discourse/lib/url';
+
+export default Ember.Component.extend({
+  classNames: ['table', 'staff-actions'],
+
+  willDestroyElement() {
+    this.$().off('click.discourse-staff-logs');
+  },
+
+  didInsertElement() {
+    this._super();
+
+    this.$().on('click.discourse-staff-logs', '[data-link-post-id]', e => {
+      let postId = $(e.target).attr('data-link-post-id');
+
+      this.store.find('post', postId).then(p => {
+        DiscourseURL.routeTo(p.get('url'));
+      });
+      return false;
+    });
+  }
+});
diff --git a/app/assets/javascripts/admin/components/suspension-details.js.es6 b/app/assets/javascripts/admin/components/suspension-details.js.es6
new file mode 100644
index 00000000000..9250c1ae73b
--- /dev/null
+++ b/app/assets/javascripts/admin/components/suspension-details.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Component.extend({
+  tagName: ''
+});
diff --git a/app/assets/javascripts/admin/components/theme-setting.js.es6 b/app/assets/javascripts/admin/components/theme-setting.js.es6
new file mode 100644
index 00000000000..eb576e9b644
--- /dev/null
+++ b/app/assets/javascripts/admin/components/theme-setting.js.es6
@@ -0,0 +1,9 @@
+import BufferedContent from 'discourse/mixins/buffered-content';
+import SettingComponent from 'admin/mixins/setting-component';
+
+export default Ember.Component.extend(BufferedContent, SettingComponent, {
+  layoutName: 'admin/templates/components/site-setting',
+  _save() {
+    return this.get('model').saveSettings(this.get('setting.setting'), this.get('buffered.value'));
+  }
+});
diff --git a/app/assets/javascripts/admin/components/watched-word-form.js.es6 b/app/assets/javascripts/admin/components/watched-word-form.js.es6
index 1e187bcd538..e7ead641f2e 100644
--- a/app/assets/javascripts/admin/components/watched-word-form.js.es6
+++ b/app/assets/javascripts/admin/components/watched-word-form.js.es6
@@ -5,7 +5,7 @@ export default Ember.Component.extend({
   classNames: ['watched-word-form'],
   formSubmitted: false,
   actionKey: null,
-  showSuccessMessage: false,
+  showMessage: false,
 
   @computed('regularExpressions')
   placeholderKey(regularExpressions) {
@@ -14,28 +14,40 @@ export default Ember.Component.extend({
   },
 
   @observes('word')
-  removeSuccessMessage() {
-    if (this.get('showSuccessMessage') && !Ember.isEmpty(this.get('word'))) {
-      this.set('showSuccessMessage', false);
+  removeMessage() {
+    if (this.get('showMessage') && !Ember.isEmpty(this.get('word'))) {
+      this.set('showMessage', false);
     }
   },
 
+  @computed('word')
+  isUniqueWord(word) {
+    const words = this.get("filteredContent") || [];
+    const filtered = words.filter(content => content.action === this.get("actionKey"));
+    return filtered.every(content => content.word.toLowerCase() !== word.toLowerCase());
+  },
+
   actions: {
     submit() {
+      if (!this.get("isUniqueWord")) {
+        this.setProperties({ showMessage: true, message: I18n.t('admin.watched_words.form.exists') });
+        return;
+      }
+
       if (!this.get('formSubmitted')) {
         this.set('formSubmitted', true);
 
         const watchedWord = WatchedWord.create({ word: this.get('word'), action: this.get('actionKey') });
 
         watchedWord.save().then(result => {
-          this.setProperties({ word: '', formSubmitted: false, showSuccessMessage: true });
+          this.setProperties({ word: '', formSubmitted: false, showMessage: true, message: I18n.t('admin.watched_words.form.success') });
           this.sendAction('action', WatchedWord.create(result));
           Ember.run.schedule('afterRender', () => this.$('.watched-word-input').focus());
         }).catch(e => {
           this.set('formSubmitted', false);
-          const msg = (e.responseJSON && e.responseJSON.errors) ?
-                      I18n.t("generic_error_with_reason", {error: e.responseJSON.errors.join('. ')}) :
-                      I18n.t("generic_error");
+          const msg = (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) ?
+            I18n.t("generic_error_with_reason", {error: e.jqXHR.responseJSON.errors.join('. ')}) :
+            I18n.t("generic_error");
           bootbox.alert(msg, () => this.$('.watched-word-input').focus());
         });
       }
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6
index fb91322edff..28ae718afab 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6
@@ -5,12 +5,25 @@ export default Ember.Controller.extend({
   maximized: false,
   section: null,
 
+  editRouteName: 'adminCustomizeThemes.edit',
+
   targets: [
-    {id: 0, name: I18n.t('admin.customize.theme.common')},
-    {id: 1, name: I18n.t('admin.customize.theme.desktop')},
-    {id: 2, name: I18n.t('admin.customize.theme.mobile')}
+    { id: 0, name: 'common'   },
+    { id: 1, name: 'desktop'  },
+    { id: 2, name: 'mobile'   },
+    { id: 3, name: 'settings' }
   ],
 
+  fieldsForTarget: function (target) {
+    const common = ["scss", "head_tag", "header", "after_header", "body_tag", "footer"];
+    switch(target) {
+      case "common": return [...common, "embedded_scss"];
+      case "desktop": return common;
+      case "mobile": return common;
+      case "settings": return ["yaml"];
+    }
+  },
+
   @computed('onlyOverridden')
   showCommon() {
     return this.shouldShow('common');
@@ -26,6 +39,11 @@ export default Ember.Controller.extend({
     return this.shouldShow('mobile');
   },
 
+  @computed('onlyOverridden', 'model.remote_theme')
+  showSettings() {
+    return false;
+  },
+
   @observes('onlyOverridden')
   onlyOverriddenChanged() {
     if (this.get('onlyOverridden')) {
@@ -36,7 +54,7 @@ export default Ember.Controller.extend({
 
         let fields = this.get('model.theme_fields');
         let field = fields && fields.find(f => (f.target === target));
-        this.replaceRoute('adminCustomizeThemes.edit', this.get('model.id'), target, field && field.name);
+        this.replaceRoute(this.get('editRouteName'), this.get('model.id'), target, field && field.name);
       }
     }
   },
@@ -51,27 +69,19 @@ export default Ember.Controller.extend({
   currentTarget: 0,
 
   setTargetName: function(name) {
-    let target;
-    switch(name) {
-      case "common": target = 0; break;
-      case "desktop": target = 1; break;
-      case "mobile": target = 2; break;
-    }
-
-    this.set("currentTarget", target);
+    const target = this.get('targets').find(t => t.name === name);
+    this.set("currentTarget", target && target.id);
   },
 
   @computed("currentTarget")
-  currentTargetName(target) {
-    switch(parseInt(target)) {
-      case 0: return "common";
-      case 1: return "desktop";
-      case 2: return "mobile";
-    }
+  currentTargetName(id) {
+    const target = this.get('targets').find(t => t.id === parseInt(id, 10));
+    return target && target.name;
   },
 
   @computed("fieldName")
   activeSectionMode(fieldName) {
+    if (fieldName === "yaml") return "yaml";
     return fieldName && fieldName.indexOf("scss") > -1 ? "scss" : "html";
   },
 
@@ -96,15 +106,9 @@ export default Ember.Controller.extend({
     }
   },
 
-  @computed("currentTarget", "onlyOverridden")
+  @computed("currentTargetName", "onlyOverridden")
   fields(target, onlyOverridden) {
-    let fields = [
-      "scss", "head_tag", "header", "after_header", "body_tag", "footer"
-    ];
-
-    if (parseInt(target) === 0) {
-      fields.push("embedded_scss");
-    }
+    let fields = this.fieldsForTarget(target);
 
     if (onlyOverridden) {
       const model = this.get("model");
@@ -155,5 +159,4 @@ export default Ember.Controller.extend({
       });
     }
   }
-
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
index 2873f62a9f4..16eff829470 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
@@ -2,11 +2,14 @@ import { default as computed } from 'ember-addons/ember-computed-decorators';
 import { url } from 'discourse/lib/computed';
 import { popupAjaxError } from 'discourse/lib/ajax-error';
 import showModal from 'discourse/lib/show-modal';
+import ThemeSettings from 'admin/models/theme-settings';
 
 const THEME_UPLOAD_VAR = 2;
 
 export default Ember.Controller.extend({
 
+  editRouteName: 'adminCustomizeThemes.edit',
+
   @computed("model", "allThemes")
   parentThemes(model, allThemes) {
     let parents = allThemes.filter(theme =>
@@ -30,7 +33,7 @@ export default Ember.Controller.extend({
         return text + ": " + localized.join(" , ");
       }
     };
-    ['common','desktop','mobile'].forEach(target=> {
+    ['common', 'desktop', 'mobile'].forEach(target => {
       descriptions.push(description(target));
     });
     return descriptions.reject(d=>Em.isBlank(d));
@@ -77,6 +80,16 @@ export default Ember.Controller.extend({
     return themes;
   },
 
+  @computed("model.settings")
+  settings(settings) {
+    return settings.map(setting => ThemeSettings.create(setting));
+  },
+
+  @computed("settings")
+  hasSettings(settings) {
+    return settings.length > 0;
+  },
+
   downloadUrl: url('model.id', '/admin/themes/%@'),
 
   actions: {
@@ -131,7 +144,7 @@ export default Ember.Controller.extend({
     },
 
     editTheme() {
-      let edit = ()=>this.transitionToRoute('adminCustomizeThemes.edit', this.get('model.id'), 'common', 'scss');
+      let edit = ()=>this.transitionToRoute(this.get('editRouteName'), this.get('model.id'), 'common', 'scss');
 
       if (this.get("model.remote_theme")) {
       bootbox.confirm(I18n.t("admin.customize.theme.edit_confirm"), result => {
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-next.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard-next.js.es6
new file mode 100644
index 00000000000..2f24cf9edd0
--- /dev/null
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard-next.js.es6
@@ -0,0 +1,139 @@
+import { setting } from "discourse/lib/computed";
+import DiscourseURL from "discourse/lib/url";
+import computed from "ember-addons/ember-computed-decorators";
+import AdminDashboardNext from "admin/models/admin-dashboard-next";
+import Report from "admin/models/report";
+import VersionCheck from "admin/models/version-check";
+
+const PROBLEMS_CHECK_MINUTES = 1;
+
+export default Ember.Controller.extend({
+  queryParams: ["period"],
+  period: "monthly",
+  isLoading: false,
+  dashboardFetchedAt: null,
+  exceptionController: Ember.inject.controller("exception"),
+  showVersionChecks: setting("version_checks"),
+  diskSpace: Ember.computed.alias("model.attributes.disk_space"),
+  logSearchQueriesEnabled: setting("log_search_queries"),
+  availablePeriods: ["yearly", "quarterly", "monthly", "weekly"],
+
+  @computed("problems.length")
+  foundProblems(problemsLength) {
+    return this.currentUser.get("admin") && (problemsLength || 0) > 0;
+  },
+
+  @computed("foundProblems")
+  thereWereProblems(foundProblems) {
+    if (!this.currentUser.get("admin")) { return false; }
+
+    if (foundProblems) {
+      this.set("hadProblems", true);
+      return true;
+    } else {
+      return this.get("hadProblems") || false;
+    }
+  },
+
+  fetchDashboard() {
+    if (this.get("isLoading")) return;
+
+    if (!this.get("dashboardFetchedAt") || moment().subtract(30, "minutes").toDate() > this.get("dashboardFetchedAt")) {
+      this.set("isLoading", true);
+
+      const versionChecks = this.siteSettings.version_checks;
+
+      AdminDashboardNext.find().then(adminDashboardNextModel => {
+
+        if (versionChecks) {
+          this.set("versionCheck", VersionCheck.create(adminDashboardNextModel.version_check));
+        }
+
+        this.setProperties({
+          dashboardFetchedAt: new Date(),
+          model: adminDashboardNextModel,
+          reports: adminDashboardNextModel.reports.map(x => Report.create(x))
+        });
+      }).catch(e => {
+        this.get("exceptionController").set("thrown", e.jqXHR);
+        this.replaceRoute("exception");
+      }).finally(() => {
+        this.set("isLoading", false);
+      });
+    }
+
+    if (!this.get("problemsFetchedAt") || moment().subtract(PROBLEMS_CHECK_MINUTES, "minutes").toDate() > this.get("problemsFetchedAt")) {
+      this.loadProblems();
+    }
+  },
+
+  loadProblems() {
+    this.set("loadingProblems", true);
+    this.set("problemsFetchedAt", new Date());
+    AdminDashboardNext.fetchProblems().then(d => {
+      this.set("problems", d.problems);
+    }).finally(() => {
+      this.set("loadingProblems", false);
+    });
+  },
+
+  @computed("problemsFetchedAt")
+  problemsTimestamp(problemsFetchedAt) {
+    return moment(problemsFetchedAt).locale("en").format("LLL");
+  },
+
+  @computed("period")
+  startDate(period) {
+    let fullDay = moment().locale("en").utc().subtract(1, "day");
+
+    switch (period) {
+      case "yearly":
+        return fullDay.subtract(1, "year").startOf("day");
+        break;
+      case "quarterly":
+        return fullDay.subtract(3, "month").startOf("day");
+        break;
+      case "weekly":
+        return fullDay.subtract(1, "week").startOf("day");
+        break;
+      case "monthly":
+        return fullDay.subtract(1, "month").startOf("day");
+        break;
+      default:
+        return fullDay.subtract(1, "month").startOf("day");
+    }
+  },
+
+  @computed()
+  lastWeek() {
+    return moment().locale("en").utc().endOf("day").subtract(1, "week");
+  },
+
+  @computed()
+  endDate() {
+    return moment().locale("en").utc().subtract(1, "day").endOf("day");
+  },
+
+  @computed("updated_at")
+  updatedTimestamp(updatedAt) {
+    return moment(updatedAt).format("LLL");
+  },
+
+  @computed("last_backup_taken_at")
+  backupTimestamp(lastBackupTakenAt) {
+    return moment(lastBackupTakenAt).format("LLL");
+  },
+
+  actions: {
+    changePeriod(period) {
+      DiscourseURL.routeTo(this._reportsForPeriodURL(period));
+    },
+    refreshProblems() {
+      this.loadProblems();
+    },
+  },
+
+  _reportsForPeriodURL(period) {
+    return Discourse.getURL(`/admin?period=${period}`);
+  }
+});
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
index d06b8dc06ea..973cd3d57c9 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
@@ -1,11 +1,8 @@
-import { setting } from 'discourse/lib/computed';
 import AdminDashboard from 'admin/models/admin-dashboard';
-import VersionCheck from 'admin/models/version-check';
 import Report from 'admin/models/report';
 import AdminUser from 'admin/models/admin-user';
 import computed from 'ember-addons/ember-computed-decorators';
 
-const PROBLEMS_CHECK_MINUTES = 1;
 
 const ATTRIBUTES = [ 'disk_space','admins', 'moderators', 'silenced', 'suspended', 'top_traffic_sources',
                      'top_referred_topics', 'updated_at'];
@@ -18,34 +15,13 @@ export default Ember.Controller.extend({
   loading: null,
   versionCheck: null,
   dashboardFetchedAt: null,
-  showVersionChecks: setting('version_checks'),
-
-  @computed('problems.length')
-  foundProblems(problemsLength) {
-    return this.currentUser.get('admin') && (problemsLength || 0) > 0;
-  },
-
-  @computed('foundProblems')
-  thereWereProblems(foundProblems) {
-    if (!this.currentUser.get('admin')) { return false; }
-
-    if (foundProblems) {
-      this.set('hadProblems', true);
-      return true;
-    } else {
-      return this.get('hadProblems') || false;
-    }
-  },
+  exceptionController: Ember.inject.controller('exception'),
 
   fetchDashboard() {
     if (!this.get('dashboardFetchedAt') || moment().subtract(30, 'minutes').toDate() > this.get('dashboardFetchedAt')) {
-      this.set('dashboardFetchedAt', new Date());
       this.set('loading', true);
-      const versionChecks = this.siteSettings.version_checks;
       AdminDashboard.find().then(d => {
-        if (versionChecks) {
-          this.set('versionCheck', VersionCheck.create(d.version_check));
-        }
+        this.set('dashboardFetchedAt', new Date());
 
         REPORTS.forEach(name => this.set(name, d[name].map(r => Report.create(r))));
 
@@ -56,29 +32,15 @@ export default Ember.Controller.extend({
         }
 
         ATTRIBUTES.forEach(a => this.set(a, d[a]));
+      }).catch(e => {
+        this.get('exceptionController').set('thrown', e.jqXHR);
+        this.replaceRoute('exception');
+      }).finally(() => {
         this.set('loading', false);
       });
     }
-
-    if (!this.get('problemsFetchedAt') || moment().subtract(PROBLEMS_CHECK_MINUTES, 'minutes').toDate() > this.get('problemsFetchedAt')) {
-      this.loadProblems();
-    }
   },
 
-  loadProblems() {
-    this.set('loadingProblems', true);
-    this.set('problemsFetchedAt', new Date());
-    AdminDashboard.fetchProblems().then(d => {
-      this.set('problems', d.problems);
-    }).finally(() => {
-      this.set('loadingProblems', false);
-    });
-  },
-
-  @computed('problemsFetchedAt')
-  problemsTimestamp(problemsFetchedAt) {
-    return moment(problemsFetchedAt).format('LLL');
-  },
 
   @computed('updated_at')
   updatedTimestamp(updatedAt) {
@@ -86,9 +48,6 @@ export default Ember.Controller.extend({
   },
 
   actions: {
-    refreshProblems() {
-      this.loadProblems();
-    },
     showTrafficReport() {
       this.set("showTrafficReport", true);
     }
diff --git a/app/assets/javascripts/admin/controllers/admin-group.js.es6 b/app/assets/javascripts/admin/controllers/admin-group.js.es6
deleted file mode 100644
index cab20f908f0..00000000000
--- a/app/assets/javascripts/admin/controllers/admin-group.js.es6
+++ /dev/null
@@ -1,110 +0,0 @@
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-import computed from 'ember-addons/ember-computed-decorators';
-
-export default Ember.Controller.extend({
-  adminGroupsType: Ember.inject.controller(),
-  disableSave: false,
-  savingStatus: '',
-
-  aliasLevelOptions: function() {
-    return [
-      { name: I18n.t("groups.alias_levels.nobody"), value: 0 },
-      { name: I18n.t("groups.alias_levels.mods_and_admins"), value: 2 },
-      { name: I18n.t("groups.alias_levels.members_mods_and_admins"), value: 3 },
-      { name: I18n.t("groups.alias_levels.everyone"), value: 99 }
-    ];
-  }.property(),
-
-  visibilityLevelOptions: function() {
-    return [
-      { name: I18n.t("groups.visibility_levels.public"), value: 0 },
-      { name: I18n.t("groups.visibility_levels.members"), value: 1 },
-      { name: I18n.t("groups.visibility_levels.staff"), value: 2 },
-      { name: I18n.t("groups.visibility_levels.owners"), value: 3 }
-    ];
-  }.property(),
-
-  trustLevelOptions: function() {
-    return [
-      { name: I18n.t("groups.trust_levels.none"), value: 0 },
-      { name: 1, value: 1 }, { name: 2, value: 2 }, { name: 3, value: 3 }, { name: 4, value: 4 }
-    ];
-  }.property(),
-
-  @computed('model.visibility_level', 'model.public_admission')
-  disableMembershipRequestSetting(visibility_level, publicAdmission) {
-    visibility_level = parseInt(visibility_level);
-    return (visibility_level !== 0) || publicAdmission;
-  },
-
-  @computed('model.visibility_level', 'model.allow_membership_requests')
-  disablePublicSetting(visibility_level, allowMembershipRequests) {
-    visibility_level = parseInt(visibility_level);
-    return (visibility_level !== 0) || allowMembershipRequests;
-  },
-
-  actions: {
-    removeOwner(member) {
-      const self = this,
-            message = I18n.t("admin.groups.delete_owner_confirm", { username: member.get("username"), group: this.get("model.name") });
-      return bootbox.confirm(message, I18n.t("no_value"), I18n.t("yes_value"), function(confirm) {
-        if (confirm) {
-          self.get("model").removeOwner(member);
-        }
-      });
-    },
-
-    addOwners() {
-      if (Em.isEmpty(this.get("model.ownerUsernames"))) { return; }
-      this.get("model").addOwners(this.get("model.ownerUsernames")).catch(popupAjaxError);
-      this.set("model.ownerUsernames", null);
-    },
-
-    save() {
-      const group = this.get('model'),
-            groupsController = this.get("adminGroupsType"),
-            groupType = groupsController.get("type");
-
-      this.set('disableSave', true);
-      this.set('savingStatus', I18n.t('saving'));
-
-      let promise = group.get("id") ? group.save() : group.create().then(() => groupsController.get('model').addObject(group));
-
-      promise.then(() => {
-        this.transitionToRoute("adminGroup", groupType, group.get('name'));
-        this.set('savingStatus', I18n.t('saved'));
-      }).catch(popupAjaxError)
-        .finally(() => this.set('disableSave', false));
-    },
-
-    destroy() {
-      const group = this.get('model'),
-            groupsController = this.get('adminGroupsType'),
-            self = this;
-
-      if (!group.get('id')) {
-        self.transitionToRoute('adminGroupsType.index', 'custom');
-        return;
-      }
-
-      this.set('disableSave', true);
-
-      bootbox.confirm(
-        I18n.t("admin.groups.delete_confirm"),
-        I18n.t("no_value"),
-        I18n.t("yes_value"),
-        function(confirmed) {
-          if (confirmed) {
-            group.destroy().then(() => {
-              groupsController.get('model').removeObject(group);
-              self.transitionToRoute('adminGroups.index');
-            }).catch(() => bootbox.alert(I18n.t("admin.groups.delete_failed")))
-              .finally(() => self.set('disableSave', false));
-          } else {
-            self.set('disableSave', false);
-          }
-        }
-      );
-    }
-  }
-});
diff --git a/app/assets/javascripts/admin/controllers/admin-groups-bulk-complete.js.es6 b/app/assets/javascripts/admin/controllers/admin-groups-bulk-complete.js.es6
deleted file mode 100644
index 780543b7241..00000000000
--- a/app/assets/javascripts/admin/controllers/admin-groups-bulk-complete.js.es6
+++ /dev/null
@@ -1,4 +0,0 @@
-export default Ember.Controller.extend({
-  adminGroupsBulk: Ember.inject.controller(),
-  bulkAddResponse: Ember.computed.alias('adminGroupsBulk.bulkAddResponse')
-});
diff --git a/app/assets/javascripts/admin/controllers/admin-groups-bulk.js.es6 b/app/assets/javascripts/admin/controllers/admin-groups-bulk.js.es6
deleted file mode 100644
index 8f8b28f6b45..00000000000
--- a/app/assets/javascripts/admin/controllers/admin-groups-bulk.js.es6
+++ /dev/null
@@ -1,37 +0,0 @@
-import { ajax } from 'discourse/lib/ajax';
-import computed from 'ember-addons/ember-computed-decorators';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-
-export default Ember.Controller.extend({
-  users: null,
-  groupId: null,
-  saving: false,
-  bulkAddResponse: null,
-
-  @computed('saving', 'users', 'groupId')
-  buttonDisabled(saving, users, groupId) {
-    return saving || !groupId || !users || !users.length;
-  },
-
-  actions: {
-    addToGroup() {
-      if (this.get('saving')) { return; }
-
-      const users = this.get('users').split("\n")
-                                      .uniq()
-                                      .reject(x => x.length === 0);
-
-      this.set('saving', true);
-      ajax('/admin/groups/bulk', {
-        data: { users, group_id: this.get('groupId') },
-        method: 'PUT'
-      }).then(result => {
-        this.set('bulkAddResponse', result);
-        this.transitionToRoute('adminGroups.bulkComplete');
-      }).catch(popupAjaxError).finally(() => {
-        this.set('saving', false);
-      });
-
-    }
-  }
-});
diff --git a/app/assets/javascripts/admin/controllers/admin-groups-type-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-groups-type-index.js.es6
deleted file mode 100644
index ca80f093d1b..00000000000
--- a/app/assets/javascripts/admin/controllers/admin-groups-type-index.js.es6
+++ /dev/null
@@ -1,11 +0,0 @@
-import computed from 'ember-addons/ember-computed-decorators';
-
-export default Ember.Controller.extend({
-  adminGroupsType: Ember.inject.controller(),
-  sortedGroups: Ember.computed.alias("adminGroupsType.sortedGroups"),
-
-  @computed("sortedGroups")
-  messageKey(sortedGroups) {
-    return `admin.groups.${sortedGroups.length > 0 ? 'none_selected' : 'no_custom_groups'}`;
-  }
-});
diff --git a/app/assets/javascripts/admin/controllers/admin-groups-type.js.es6 b/app/assets/javascripts/admin/controllers/admin-groups-type.js.es6
deleted file mode 100644
index 10d7ad01cfe..00000000000
--- a/app/assets/javascripts/admin/controllers/admin-groups-type.js.es6
+++ /dev/null
@@ -1,20 +0,0 @@
-import { ajax } from 'discourse/lib/ajax';
-export default Ember.Controller.extend({
-  sortedGroups: Ember.computed.sort('model', 'groupSorting'),
-  groupSorting: ['name'],
-
-  refreshingAutoGroups: false,
-
-  isAuto: Ember.computed.equal('type', 'automatic'),
-
-  actions: {
-    refreshAutoGroups() {
-      this.set('refreshingAutoGroups', true);
-      ajax('/admin/groups/refresh_automatic_groups', {type: 'POST'}).then(() => {
-        this.transitionToRoute("adminGroupsType", "automatic").then(() => {
-          this.set('refreshingAutoGroups', false);
-        });
-      });
-    }
-  }
-});
diff --git a/app/assets/javascripts/admin/controllers/admin-reports.js.es6 b/app/assets/javascripts/admin/controllers/admin-reports.js.es6
index 83fde41c7e9..1b02d5575ac 100644
--- a/app/assets/javascripts/admin/controllers/admin-reports.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-reports.js.es6
@@ -4,6 +4,7 @@ import Report from 'admin/models/report';
 import computed from 'ember-addons/ember-computed-decorators';
 
 export default Ember.Controller.extend({
+  classNames: ["admin-reports"],
   queryParams: ["mode", "start_date", "end_date", "category_id", "group_id"],
   viewMode: 'graph',
   viewingTable: Em.computed.equal('viewMode', 'table'),
diff --git a/app/assets/javascripts/admin/controllers/admin-search-logs-term.js.es6 b/app/assets/javascripts/admin/controllers/admin-search-logs-term.js.es6
index 98d061e0607..92045416561 100644
--- a/app/assets/javascripts/admin/controllers/admin-search-logs-term.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-search-logs-term.js.es6
@@ -1,7 +1,7 @@
 export default Ember.Controller.extend({
   loading: false,
   term: null,
-  period: "yearly",
+  period: "quarterly",
   searchType: "all",
 
   searchTypeOptions: [
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 df0738bed18..c2d96201bd4 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 @@
+import computed from "ember-addons/ember-computed-decorators";
+
 export default Ember.Controller.extend({
   categoryNameKey: null,
   adminSiteSettings: Ember.inject.controller(),
 
-  filteredContent: function() {
-    if (!this.get('categoryNameKey')) { return []; }
-
-    const category = (this.get('adminSiteSettings.model') || []).findBy('nameKey', this.get('categoryNameKey'));
-    if (category) {
-      return category.siteSettings;
-    } else {
-      return [];
-    }
-  }.property('adminSiteSettings.model', 'categoryNameKey')
+  @computed("adminSiteSettings.model", "categoryNameKey")
+  category(categories, nameKey) {
+    return (categories || []).findBy("nameKey", nameKey);
+  },
 
+  @computed("category")
+  filteredContent(category) {
+    return category ? category.siteSettings : [];
+  }
 });
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 02a907d7af9..6469efa6ccf 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
@@ -3,7 +3,6 @@ import debounce from 'discourse/lib/debounce';
 export default Ember.Controller.extend({
   filter: null,
   onlyOverridden: false,
-  filtered: Ember.computed.notEmpty('filter'),
 
   filterContentNow(category) {
     // If we have no content, don't bother filtering anything
@@ -14,9 +13,9 @@ export default Ember.Controller.extend({
       filter = this.get('filter').toLowerCase();
     }
 
-    if ((filter === undefined || filter.length < 1) && !this.get('onlyOverridden')) {
+    if ((!filter || 0 === filter.length) && !this.get('onlyOverridden')) {
       this.set('model', this.get('allSiteSettings'));
-      this.transitionToRoute("adminSiteSettings");
+      this.transitionToRoute('adminSiteSettings');
       return;
     }
 
@@ -28,11 +27,11 @@ export default Ember.Controller.extend({
       const siteSettings = settingsCategory.siteSettings.filter(item => {
         if (this.get('onlyOverridden') && !item.get('overridden')) return false;
         if (filter) {
-          if (item.get('setting').toLowerCase().indexOf(filter) > -1) return true;
-          if (item.get('setting').toLowerCase().replace(/_/g, ' ').indexOf(filter) > -1) return true;
-          if (item.get('description').toLowerCase().indexOf(filter) > -1) return true;
-          if (item.get('value').toLowerCase().indexOf(filter) > -1) return true;
-          return false;
+          const setting = item.get('setting').toLowerCase();
+          return setting.includes(filter) ||
+                 setting.replace(/_/g, ' ').includes(filter) ||
+                 item.get('description').toLowerCase().includes(filter) ||
+                 (item.get('value') || '').toLowerCase().includes(filter);
         } else {
           return true;
         }
@@ -49,15 +48,16 @@ export default Ember.Controller.extend({
     });
 
     all.siteSettings.pushObjects(matches.slice(0, 30));
-    all.count = matches.length;
+    all.hasMore = matches.length > 30;
+    all.count = all.hasMore ? '30+' : matches.length;
 
     this.set('model', matchesGroupedByCategory);
-    this.transitionToRoute("adminSiteSettingsCategory", category || "all_results");
+    this.transitionToRoute('adminSiteSettingsCategory', category || 'all_results');
   },
 
   filterContent: debounce(function() {
-    if (this.get("_skipBounce")) {
-      this.set("_skipBounce", false);
+    if (this.get('_skipBounce')) {
+      this.set('_skipBounce', false);
     } else {
       this.filterContentNow();
     }
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 a2b7c94f175..346bc273c16 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
@@ -1,8 +1,10 @@
-import UserBadge from 'discourse/models/user-badge';
+import GrantBadgeController from "discourse/mixins/grant-badge-controller";
 
-export default Ember.Controller.extend({
+export default Ember.Controller.extend(GrantBadgeController, {
   adminUser: Ember.inject.controller(),
   user: Ember.computed.alias('adminUser.model'),
+  userBadges: Ember.computed.alias('model'),
+  allBadges: Ember.computed.alias('badges'),
 
   sortedBadges: Ember.computed.sort('model', 'badgeSortOrder'),
   badgeSortOrder: ['granted_at:desc'],
@@ -41,36 +43,6 @@ export default Ember.Controller.extend({
     return _(expanded).sortBy(group => group.granted_at).reverse().value();
   }.property('model', 'model.[]', 'model.expandedBadges.[]'),
 
-  /**
-    Array of badges that have not been granted to this user.
-
-    @property grantableBadges
-    @type {Boolean}
-  **/
-  grantableBadges: function() {
-    var granted = {};
-    this.get('model').forEach(function(userBadge) {
-      granted[userBadge.get('badge_id')] = true;
-    });
-
-    var badges = [];
-    this.get('badges').forEach(function(badge) {
-      if (badge.get('enabled') && (badge.get('multiple_grant') || !granted[badge.get('id')])) {
-        badges.push(badge);
-      }
-    });
-
-    return _.sortBy(badges, badge => badge.get('name'));
-  }.property('badges.[]', 'model.[]'),
-
-  /**
-    Whether there are any badges that can be granted.
-
-    @property noBadges
-    @type {Boolean}
-  **/
-  noBadges: Em.computed.empty('grantableBadges'),
-
   actions: {
 
     expandGroup: function(userBadge){
@@ -79,21 +51,21 @@ export default Ember.Controller.extend({
       model.get('expandedBadges').pushObject(userBadge.badge.id);
     },
 
-    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.
-          const newSelectedBadge = this.get('grantableBadges')[0];
-          if (newSelectedBadge) {
-            this.set('selectedBadgeId', newSelectedBadge.get('id'));
-          }
+    grantBadge() {
+      this.grantBadge(this.get('selectedBadgeId'), this.get('user.username'), this.get('badgeReason'))
+        .then(() => {
+          this.set('badgeReason', '');
+          Ember.run.next(() => {
+            // Update the selected badge ID after the combobox has re-rendered.
+            const newSelectedBadge = this.get('grantableBadges')[0];
+            if (newSelectedBadge) {
+              this.set('selectedBadgeId', newSelectedBadge.get('id'));
+            }
+          });
+        }, function() {
+          // Failure
+          bootbox.alert(I18n.t('generic_error'));
         });
-      }, function() {
-        // Failure
-        bootbox.alert(I18n.t('generic_error'));
-      });
     },
 
     revokeBadge(userBadge) {
diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
index 266fdbd02c4..0d2ae55508e 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
@@ -19,9 +19,18 @@ export default Ember.Controller.extend(CanCheckEmails, {
 
   primaryGroupDirty: propertyNotEqual('originalPrimaryGroupId', 'model.primary_group_id'),
 
-  automaticGroups: function() {
-    return this.get("model.automaticGroups").map((g) => g.name).join(", ");
-  }.property("model.automaticGroups"),
+  canDisableSecondFactor: Ember.computed.and(
+    'model.second_factor_enabled',
+    'model.can_disable_second_factor'
+  ),
+
+  @computed("model.automaticGroups")
+  automaticGroups(automaticGroups) {
+    return automaticGroups.map(group => {
+      const name = Ember.String.htmlSafe(group.name);
+      return `<a href="/groups/${name}">${name}</a>`;
+    }).join(", ");
+  },
 
   userFields: function() {
     const siteUserFields = this.site.get('user_fields'),
@@ -41,6 +50,36 @@ export default Ember.Controller.extend(CanCheckEmails, {
     return userPath(`${username}/preferences`);
   },
 
+  @computed('model.can_delete_all_posts', 'model.staff', 'model.post_count')
+  deleteAllPostsExplanation(canDeleteAllPosts, staff, postCount) {
+    if (canDeleteAllPosts) {
+      return null;
+    }
+
+    if (staff) {
+      return I18n.t('admin.user.delete_posts_forbidden_because_staff');
+    }
+    if (postCount > this.siteSettings.delete_all_posts_max) {
+      return I18n.t('admin.user.cant_delete_all_too_many_posts', {count: this.siteSettings.delete_all_posts_max});
+    } else {
+      return I18n.t('admin.user.cant_delete_all_posts', {count: this.siteSettings.delete_user_max_post_age});
+    }
+  },
+
+  @computed('model.canBeDeleted', 'model.staff')
+  deleteExplanation(canBeDeleted, staff) {
+    if (canBeDeleted) {
+      return null;
+    }
+
+    if (staff) {
+      return I18n.t('admin.user.delete_forbidden_because_staff');
+    } else {
+      return I18n.t('admin.user.delete_forbidden', {count: this.siteSettings.delete_user_max_post_age});
+    }
+  },
+
+
   actions: {
 
     impersonate() { return this.get("model").impersonate(); },
@@ -62,8 +101,36 @@ export default Ember.Controller.extend(CanCheckEmails, {
     silence() { return this.get("model").silence(); },
     deleteAllPosts() { return this.get("model").deleteAllPosts(); },
     anonymize() { return this.get('model').anonymize(); },
-    destroy() { return this.get('model').destroy(); },
+    disableSecondFactor() { return this.get('model').disableSecondFactor(); },
 
+
+    clearPenaltyHistory() {
+      let user = this.get('model');
+      return ajax(`/admin/users/${user.get('id')}/penalty_history`, {
+        type: 'DELETE'
+      }).then(() => {
+        user.set('tl3_requirements.penalty_counts.total', 0);
+      }).catch(popupAjaxError);
+    },
+
+    destroy() {
+      const postCount = this.get('model.post_count');
+      if (postCount <= 5) {
+        return this.get('model').destroy({ deletePosts: true });
+      } else {
+        return this.get('model').destroy();
+      }
+    },
+
+    viewActionLogs() {
+      this.get('adminTools').showActionLogs(this, {
+        target_user: this.get('model.username'),
+      });
+    },
+
+    showFlagsReceived() {
+      this.get('adminTools').showFlagsReceived(this.get('model'));
+    },
     showSuspendModal() {
       this.get('adminTools').showSuspendModal(this.get('model'));
     },
diff --git a/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6 b/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6
index bd11f15fcff..9e899c4296d 100644
--- a/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6
@@ -10,11 +10,11 @@ export default Ember.Controller.extend({
     return (this.get('adminWatchedWords.model') || []).findBy('nameKey', actionName);
   },
 
-  @computed('adminWatchedWords.model', 'actionNameKey')
-  filteredContent() {
-    if (!this.get('actionNameKey')) { return []; }
+  @computed('actionNameKey', 'adminWatchedWords.model')
+  filteredContent(actionNameKey) {
+    if (!actionNameKey) { return []; }
 
-    const a = this.findAction(this.get('actionNameKey'));
+    const a = this.findAction(actionNameKey);
     return a ? a.words : [];
   },
 
@@ -23,6 +23,12 @@ export default Ember.Controller.extend({
     return I18n.t('admin.watched_words.action_descriptions.' + actionNameKey);
   },
 
+  @computed('actionNameKey', 'adminWatchedWords.model')
+  wordCount(actionNameKey) {
+    const a = this.findAction(actionNameKey);
+    return a ? a.words.length : 0;
+  },
+
   actions: {
     recordAdded(arg) {
       const a = this.findAction(this.get('actionNameKey'));
diff --git a/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6 b/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6
index dc4428fc723..7f9bc8fd861 100644
--- a/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6
@@ -46,6 +46,10 @@ export default Ember.Controller.extend({
   actions: {
     clearFilter() {
       this.setProperties({ filter: '' });
+    },
+
+    toggleMenu() {
+      $('.admin-detail').toggleClass('mobile-closed mobile-open');
     }
   }
 
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6
index 7bbdaa3de57..f47869d6468 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6
@@ -3,9 +3,31 @@ import { ajax } from 'discourse/lib/ajax';
 import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
 import { popupAjaxError } from 'discourse/lib/ajax-error';
 
+const THEME_FIELD_VARIABLE_TYPE_IDS = [2, 3, 4];
+
+const SCSS_VARIABLE_NAMES = [
+  // common/foundation/colors.scss
+  "primary", "secondary", "tertiary", "quaternary", "header_background",
+  "header_primary", "highlight", "danger", "success", "love",
+  // common/foundation/math.scss
+  "E", "PI", "LN2", "SQRT2",
+  // common/foundation/variables.scss
+  "small-width", "medium-width", "large-width",
+  "google", "instagram", "facebook", "cas", "twitter", "yahoo", "github",
+  "base-font-size", "base-line-height", "base-font-family",
+  "primary-low", "primary-medium",
+  "secondary-low", "secondary-medium",
+  "tertiary-low", "quaternary-low",
+  "highlight-low", "highlight-medium",
+  "danger-low", "danger-medium",
+  "success-low", "love-low",
+];
+
 export default Ember.Controller.extend(ModalFunctionality, {
   adminCustomizeThemesShow: Ember.inject.controller(),
 
+  uploadUrl: '/admin/themes/upload_asset',
+
   onShow() {
     this.set('name', null);
     this.set('fileSelected', false);
@@ -14,9 +36,24 @@ export default Ember.Controller.extend(ModalFunctionality, {
   enabled: Em.computed.and('nameValid', 'fileSelected'),
   disabled: Em.computed.not('enabled'),
 
-  @computed('name')
-  nameValid(name) {
-    return name && name.match(/^[a-z_][a-z0-9_-]*$/i);
+  @computed('name', 'adminCustomizeThemesShow.model.theme_fields')
+  errorMessage(name, themeFields) {
+    if (name) {
+      if (!name.match(/^[a-z_][a-z0-9_-]*$/i)) {
+        return I18n.t("admin.customize.theme.variable_name_error.invalid_syntax");
+      } else if (SCSS_VARIABLE_NAMES.includes(name.toLowerCase())) {
+        return I18n.t("admin.customize.theme.variable_name_error.no_overwrite");
+      } else if (themeFields.some(tf => THEME_FIELD_VARIABLE_TYPE_IDS.includes(tf.type_id) && name === tf.name)) {
+        return I18n.t("admin.customize.theme.variable_name_error.must_be_unique");
+      }
+    }
+
+    return null;
+  },
+
+  @computed('errorMessage')
+  nameValid(errorMessage) {
+    return null === errorMessage;
   },
 
   @observes('name')
@@ -48,7 +85,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
       options.data.append('file', file);
 
-      ajax('/admin/themes/upload_asset', options).then(result => {
+      ajax(this.get('uploadUrl'), options).then(result => {
         const upload = {
           upload_id: result.upload_id,
           name: this.get('name'),
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6
index fe0416bc307..4c53ba68d87 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,5 +1,7 @@
 import { ajax } from 'discourse/lib/ajax';
-export default Ember.Controller.extend({
+import ModalFunctionality from 'discourse/mixins/modal-functionality';
+
+export default Ember.Controller.extend(ModalFunctionality, {
 
   modelChanged: function(){
     const model = this.get('model');
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-flags-received.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-flags-received.js.es6
new file mode 100644
index 00000000000..bf47fb4ae33
--- /dev/null
+++ b/app/assets/javascripts/admin/controllers/modals/admin-flags-received.js.es6
@@ -0,0 +1,17 @@
+export default Ember.Controller.extend({
+  loadingFlags: null,
+  user: null,
+
+  onShow() {
+    this.set('loadingFlags', true);
+    this.store.findAll('flagged-post', {
+      filter: 'without_custom',
+      user_id: this.get('model.id')
+    }).then(result => {
+      this.set('loadingFlags', false);
+      console.log(result);
+      this.set('flaggedPosts', result);
+    });
+  }
+
+});
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-import-theme.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-import-theme.js.es6
index d59d419ef53..e1076667b97 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-import-theme.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-import-theme.js.es6
@@ -1,12 +1,35 @@
 import ModalFunctionality from 'discourse/mixins/modal-functionality';
 import { ajax } from 'discourse/lib/ajax';
-// import computed from 'ember-addons/ember-computed-decorators';
+import { popupAjaxError } from 'discourse/lib/ajax-error';
+import { observes } from 'ember-addons/ember-computed-decorators';
 
 export default Ember.Controller.extend(ModalFunctionality, {
   local: Ember.computed.equal('selection', 'local'),
   remote: Ember.computed.equal('selection', 'remote'),
   selection: 'local',
   adminCustomizeThemes: Ember.inject.controller(),
+  loading: false,
+  keyGenUrl: '/admin/themes/generate_key_pair',
+  importUrl: '/admin/themes/import',
+
+  checkPrivate: Ember.computed.match('uploadUrl', /^git/),
+
+  @observes('privateChecked')
+  privateWasChecked() {
+    const checked = this.get('privateChecked');
+    if (checked && !this._keyLoading) {
+      this._keyLoading = true;
+      ajax(this.get('keyGenUrl'), {method: 'POST'})
+        .then(pair => {
+          this.set('privateKey', pair.private_key);
+          this.set('publicKey', pair.public_key);
+        })
+        .catch(popupAjaxError)
+        .finally(()=>{
+          this._keyLoading = false;
+        });
+    }
+  },
 
   actions: {
     importTheme() {
@@ -21,14 +44,27 @@ export default Ember.Controller.extend(ModalFunctionality, {
         options.data = new FormData();
         options.data.append('theme', $('#file-input')[0].files[0]);
       } else {
-        options.data = {remote: this.get('uploadUrl')};
+        options.data = {
+          remote: this.get('uploadUrl')
+        };
+
+        if (this.get('privateChecked')){
+          options.data.private_key = this.get('privateKey');
+        }
       }
 
-      ajax('/admin/themes/import', options).then(result=>{
+      this.set('loading', true);
+      ajax(this.get('importUrl'), options).then(result=>{
         const theme = this.store.createRecord('theme',result.theme);
         this.get('adminCustomizeThemes').send('addTheme', theme);
         this.send('closeModal');
-      });
+      })
+      .then(()=>{
+        this.set('privateKey', null);
+        this.set('publicKey', null);
+      })
+      .catch(popupAjaxError)
+      .finally(() => this.set('loading', false));
 
     }
   }
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6
index 9f1aef916f8..ec55cbdbe88 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6
@@ -1,26 +1,13 @@
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
 import computed from 'ember-addons/ember-computed-decorators';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
+import PenaltyController from 'admin/mixins/penalty-controller';
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Ember.Controller.extend(PenaltyController, {
   silenceUntil: null,
-  reason: null,
-  message: null,
   silencing: false,
-  user: null,
-  post: null,
-  successCallback: null,
 
   onShow() {
-    this.setProperties({
-      silenceUntil: null,
-      reason: null,
-      message: null,
-      silencing: false,
-      loadingUser: true,
-      post: null,
-      successCallback: null,
-    });
+    this.resetModal();
+    this.setProperties({ silenceUntil: null, silencing: false });
   },
 
   @computed('silenceUntil', 'reason', 'silencing')
@@ -33,18 +20,16 @@ export default Ember.Controller.extend(ModalFunctionality, {
       if (this.get('submitDisabled')) { return; }
 
       this.set('silencing', true);
-      this.get('user').silence({
-        silenced_till: this.get('silenceUntil'),
-        reason: this.get('reason'),
-        message: this.get('message'),
-        post_id: this.get('post.id')
-      }).then(result => {
-        this.send('closeModal');
-        let callback = this.get('successCallback');
-        if (callback) {
-          callback(result);
-        }
-      }).catch(popupAjaxError).finally(() => this.set('silencing', false));
+      this.penalize(() => {
+        return this.get('user').silence({
+          silenced_till: this.get('silenceUntil'),
+          reason: this.get('reason'),
+          message: this.get('message'),
+          post_id: this.get('post.id'),
+          post_action: this.get('postAction'),
+          post_edit: this.get('postEdit')
+        });
+      }).finally(() => this.set('silencing', false));
     }
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6
index efcd1426700..f66a1eec694 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6
@@ -1,26 +1,13 @@
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
 import computed from 'ember-addons/ember-computed-decorators';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
+import PenaltyController from 'admin/mixins/penalty-controller';
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Ember.Controller.extend(PenaltyController, {
   suspendUntil: null,
-  reason: null,
-  message: null,
   suspending: false,
-  user: null,
-  post: null,
-  successCallback: null,
 
   onShow() {
-    this.setProperties({
-      suspendUntil: null,
-      reason: null,
-      message: null,
-      suspending: false,
-      loadingUser: true,
-      post: null,
-      successCallback: null,
-    });
+    this.resetModal();
+    this.setProperties({ suspendUntil: null, suspending: false });
   },
 
   @computed('suspendUntil', 'reason', 'suspending')
@@ -33,19 +20,17 @@ export default Ember.Controller.extend(ModalFunctionality, {
       if (this.get('submitDisabled')) { return; }
 
       this.set('suspending', true);
-      this.get('user').suspend({
-        suspend_until: this.get('suspendUntil'),
-        reason: this.get('reason'),
-        message: this.get('message'),
-        post_id: this.get('post.id')
-      }).then(result => {
-        this.send('closeModal');
-        let callback = this.get('successCallback');
-        if (callback) {
-          callback(result);
-        }
-      }).catch(popupAjaxError).finally(() => this.set('suspending', false));
+
+      this.penalize(() => {
+        return this.get('user').suspend({
+          suspend_until: this.get('suspendUntil'),
+          reason: this.get('reason'),
+          message: this.get('message'),
+          post_id: this.get('post.id'),
+          post_action: this.get('postAction'),
+          post_edit: this.get('postEdit')
+        });
+      }).finally(() => this.set('suspending', false));
     }
   }
-
 });
diff --git a/app/assets/javascripts/admin/mixins/async-report.js.es6 b/app/assets/javascripts/admin/mixins/async-report.js.es6
new file mode 100644
index 00000000000..760a2059489
--- /dev/null
+++ b/app/assets/javascripts/admin/mixins/async-report.js.es6
@@ -0,0 +1,99 @@
+import computed from "ember-addons/ember-computed-decorators";
+import Report from "admin/models/report";
+
+export default Ember.Mixin.create({
+  classNameBindings: ["isLoading", "dataSourceNames"],
+  reports: null,
+  isLoading: false,
+  dataSourceNames: "",
+  title: null,
+
+  init() {
+    this._super();
+    this.set("reports", []);
+  },
+
+  @computed("dataSourceNames")
+  dataSources(dataSourceNames) {
+    return dataSourceNames.split(",").map(source => `/admin/reports/${source}`);
+  },
+
+  buildPayload(facets) {
+    let payload = { data: { cache: true, facets } };
+
+    if (this.get("startDate")) {
+      payload.data.start_date = this.get("startDate").format("YYYY-MM-DD[T]HH:mm:ss.SSSZZ");
+    }
+
+    if (this.get("endDate")) {
+      payload.data.end_date = this.get("endDate").format("YYYY-MM-DD[T]HH:mm:ss.SSSZZ");
+    }
+
+    if (this.get("limit")) {
+      payload.data.limit = this.get("limit");
+    }
+
+    return payload;
+  },
+
+  @computed("reports.[]", "startDate", "endDate", "dataSourceNames")
+  reportsForPeriod(reports, startDate, endDate, dataSourceNames) {
+    // on a slow network fetchReport could be called multiple times between
+    // T and T+x, and all the ajax responses would occur after T+(x+y)
+    // to avoid any inconsistencies we filter by period and make sure
+    // the array contains only unique values
+    reports = reports.uniqBy("report_key");
+
+    const sort = (r) => {
+      if (r.length > 1)  {
+        return dataSourceNames
+          .split(",")
+          .map(name => r.findBy("type", name));
+      } else {
+        return r;
+      }
+    };
+
+    if (!startDate || !endDate) {
+      return sort(reports);
+    }
+
+    return sort(reports.filter(report => {
+      return report.report_key.includes(startDate.format("YYYYMMDD")) &&
+             report.report_key.includes(endDate.format("YYYYMMDD"));
+    }));
+  },
+
+  didInsertElement() {
+    this._super();
+
+    this.fetchReport()
+        .finally(() => {
+          this.renderReport();
+        });
+  },
+
+  didUpdateAttrs() {
+    this._super();
+
+    this.fetchReport()
+        .finally(() => {
+          this.renderReport();
+        });
+  },
+
+  renderReport() {
+    if (!this.element || this.isDestroying || this.isDestroyed) return;
+    this.set("title", this.get("reportsForPeriod").map(r => r.title).join(", "));
+    this.set("isLoading", false);
+  },
+
+  loadReport(jsonReport) {
+    return Report.create(jsonReport);
+  },
+
+  fetchReport() {
+    this.set("reports", []);
+    this.set("isLoading", true);
+  },
+});
diff --git a/app/assets/javascripts/admin/mixins/penalty-controller.js.es6 b/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
new file mode 100644
index 00000000000..8b5bbb06297
--- /dev/null
+++ b/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
@@ -0,0 +1,41 @@
+import ModalFunctionality from 'discourse/mixins/modal-functionality';
+import { popupAjaxError } from 'discourse/lib/ajax-error';
+
+export default Ember.Mixin.create(ModalFunctionality, {
+  reason: null,
+  message: null,
+  postEdit: null,
+  postAction: null,
+  user: null,
+  post: null,
+  successCallback: null,
+
+  resetModal() {
+    this.setProperties({
+      reason: null,
+      message: null,
+      loadingUser: true,
+      post: null,
+      postEdit: null,
+      postAction: 'delete',
+      before: null,
+      successCallback: null
+    });
+  },
+
+  penalize(cb) {
+    let before = this.get('before');
+    let promise = before ? before() : Ember.RSVP.resolve();
+
+    return promise
+      .then(() => cb())
+      .then(result => {
+        this.send('closeModal');
+        let callback = this.get('successCallback');
+        if (callback) {
+          callback(result);
+        }
+      })
+      .catch(popupAjaxError);
+  }
+});
diff --git a/app/assets/javascripts/admin/mixins/setting-component.js.es6 b/app/assets/javascripts/admin/mixins/setting-component.js.es6
new file mode 100644
index 00000000000..71fc679f8d0
--- /dev/null
+++ b/app/assets/javascripts/admin/mixins/setting-component.js.es6
@@ -0,0 +1,107 @@
+import computed from 'ember-addons/ember-computed-decorators';
+import { categoryLinkHTML } from 'discourse/helpers/category-link';
+
+const CUSTOM_TYPES = [
+  'bool',
+  'enum',
+  'list',
+  'url_list',
+  'host_list',
+  'category_list',
+  'value_list',
+  'category'
+];
+
+export default Ember.Mixin.create({
+  classNameBindings: [':row', ':setting', 'setting.overridden', 'typeClass'],
+  content: Ember.computed.alias('setting'),
+  validationMessage: null,
+
+  @computed("buffered.value", "setting.value")
+  dirty(bufferVal, settingVal) {
+    if (bufferVal === null || bufferVal === undefined) bufferVal = '';
+    if (settingVal === null || settingVal === undefined) settingVal = '';
+
+    return bufferVal.toString() !== settingVal.toString();
+  },
+
+  @computed("setting", "buffered.value")
+  preview(setting, value) {
+    // A bit hacky, but allows us to use helpers
+    if (setting.get('setting') === 'category_style') {
+      let category = this.site.get('categories.firstObject');
+      if (category) {
+        return categoryLinkHTML(category, {
+          categoryStyle: value
+        });
+      }
+    }
+
+    let preview = setting.get('preview');
+    if (preview) {
+      return new Handlebars.SafeString("<div class='preview'>" + preview.replace(/\{\{value\}\}/g, value) + "</div>");
+    }
+  },
+
+  @computed('componentType')
+  typeClass(componentType) {
+    return componentType.replace(/\_/g, '-');
+  },
+
+  @computed("setting.setting")
+  settingName(setting) {
+    return setting.replace(/\_/g, ' ');
+  },
+
+  @computed("setting.type")
+  componentType(type) {
+    return CUSTOM_TYPES.indexOf(type) !== -1 ? type : 'string';
+  },
+
+  @computed("typeClass")
+  componentName(typeClass) {
+    return "site-settings/" + typeClass;
+  },
+
+  _watchEnterKey: function() {
+    const self = this;
+    this.$().on("keydown.setting-enter", ".input-setting-string", function (e) {
+      if (e.keyCode === 13) { // enter key
+        self._save();
+      }
+    });
+  }.on('didInsertElement'),
+
+  _removeBindings: function() {
+    this.$().off("keydown.setting-enter");
+  }.on("willDestroyElement"),
+
+  _save() {
+    Em.warn("You should define a `_save` method", { id: "admin.mixins.setting-component" });
+    return Ember.RSVP.resolve();
+  },
+
+  actions: {
+    save() {
+      this._save().then(() => {
+        this.set('validationMessage', null);
+        this.commitBuffer();
+      }).catch(e => {
+        if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
+          this.set('validationMessage', e.jqXHR.responseJSON.errors[0]);
+        } else {
+          this.set('validationMessage', I18n.t('generic_error'));
+        }
+      });
+    },
+
+    resetDefault() {
+      this.set('buffered.value', this.get('setting.default'));
+      this._save();
+    },
+
+    cancel() {
+      this.rollbackBuffer();
+    }
+  }
+});
diff --git a/app/assets/javascripts/admin/mixins/setting-object.js.es6 b/app/assets/javascripts/admin/mixins/setting-object.js.es6
new file mode 100644
index 00000000000..0b16ed50095
--- /dev/null
+++ b/app/assets/javascripts/admin/mixins/setting-object.js.es6
@@ -0,0 +1,29 @@
+export default Ember.Mixin.create({
+  overridden: function() {
+    let val = this.get('value'),
+        defaultVal = this.get('default');
+
+    if (val === null) val = '';
+    if (defaultVal === null) defaultVal = '';
+
+    return val.toString() !== defaultVal.toString();
+  }.property('value', 'default'),
+
+  validValues: function() {
+    const vals = [],
+          translateNames = this.get('translate_names');
+
+    this.get('valid_values').forEach(v => {
+      if (v.name && v.name.length > 0 && translateNames) {
+        vals.addObject({ name: I18n.t(v.name), value: v.value });
+      } else {
+        vals.addObject(v);
+      }
+    });
+    return vals;
+  }.property('valid_values'),
+
+  allowsNone: function() {
+    if ( _.indexOf(this.get('valid_values'), '') >= 0 ) return 'admin.settings.none';
+  }.property('valid_values')
+});
diff --git a/app/assets/javascripts/admin/models/admin-dashboard-next.js.es6 b/app/assets/javascripts/admin/models/admin-dashboard-next.js.es6
new file mode 100644
index 00000000000..db3adf22481
--- /dev/null
+++ b/app/assets/javascripts/admin/models/admin-dashboard-next.js.es6
@@ -0,0 +1,54 @@
+import { ajax } from "discourse/lib/ajax";
+
+const ATTRIBUTES = [ "disk_space", "updated_at", "last_backup_taken_at" ];
+
+const AdminDashboardNext = Discourse.Model.extend({});
+
+AdminDashboardNext.reopenClass({
+  /**
+    Fetch all dashboard data. This can be an expensive request when the cached data
+    has expired and the server must collect the data again.
+
+    @method find
+    @return {jqXHR} a jQuery Promise object
+  **/
+  find() {
+
+    return ajax("/admin/dashboard-next.json").then(function(json) {
+
+      var model = AdminDashboardNext.create();
+
+      model.set("reports", json.reports);
+      model.set("version_check", json.version_check);
+
+      const attributes = {};
+      ATTRIBUTES.forEach(a => attributes[a] = json[a]);
+      model.set("attributes", attributes);
+
+      model.set("loaded", true);
+
+      return model;
+    });
+  },
+
+
+  /**
+    Only fetch the list of problems that should be rendered on the dashboard.
+    The model will only have its "problems" attribute set.
+
+    @method fetchProblems
+    @return {jqXHR} a jQuery Promise object
+  **/
+  fetchProblems: function() {
+    return ajax("/admin/dashboard/problems.json", {
+      type: 'GET',
+      dataType: 'json'
+    }).then(function(json) {
+      var model = AdminDashboardNext.create(json);
+      model.set('loaded', true);
+      return model;
+    });
+  }
+});
+
+export default AdminDashboardNext;
diff --git a/app/assets/javascripts/admin/models/admin-dashboard.js.es6 b/app/assets/javascripts/admin/models/admin-dashboard.js.es6
index ac44a7677f1..49ed8e1a078 100644
--- a/app/assets/javascripts/admin/models/admin-dashboard.js.es6
+++ b/app/assets/javascripts/admin/models/admin-dashboard.js.es6
@@ -19,23 +19,6 @@ AdminDashboard.reopenClass({
     });
   },
 
-  /**
-    Only fetch the list of problems that should be rendered on the dashboard.
-    The model will only have its "problems" attribute set.
-
-    @method fetchProblems
-    @return {jqXHR} a jQuery Promise object
-  **/
-  fetchProblems: function() {
-    return ajax("/admin/dashboard/problems.json", {
-      type: 'GET',
-      dataType: 'json'
-    }).then(function(json) {
-      var model = AdminDashboard.create(json);
-      model.set('loaded', true);
-      return model;
-    });
-  }
 });
 
 export default AdminDashboard;
diff --git a/app/assets/javascripts/admin/models/admin-user.js.es6 b/app/assets/javascripts/admin/models/admin-user.js.es6
index e3f1530badf..ba7528258d7 100644
--- a/app/assets/javascripts/admin/models/admin-user.js.es6
+++ b/app/assets/javascripts/admin/models/admin-user.js.es6
@@ -5,7 +5,6 @@ import { propertyNotEqual } from 'discourse/lib/computed';
 import { popupAjaxError } from 'discourse/lib/ajax-error';
 import ApiKey from 'admin/models/api-key';
 import Group from 'discourse/models/group';
-import TL3Requirements from 'admin/models/tl3-requirements';
 import { userPath } from 'discourse/lib/url';
 
 const wrapAdmin = user => user ? AdminUser.create(user) : null;
@@ -88,21 +87,6 @@ const AdminUser = Discourse.User.extend({
     }).then(() => this.set('api_key', null));
   },
 
-  deleteAllPostsExplanation: function() {
-    if (!this.get('can_delete_all_posts')) {
-      if (this.get('deleteForbidden') && this.get('staff')) {
-        return I18n.t('admin.user.delete_posts_forbidden_because_staff');
-      }
-      if (this.get('post_count') > Discourse.SiteSettings.delete_all_posts_max) {
-        return I18n.t('admin.user.cant_delete_all_too_many_posts', {count: Discourse.SiteSettings.delete_all_posts_max});
-      } else {
-        return I18n.t('admin.user.cant_delete_all_posts', {count: Discourse.SiteSettings.delete_user_max_post_age});
-      }
-    } else {
-      return null;
-    }
-  }.property('can_delete_all_posts', 'deleteForbidden'),
-
   deleteAllPosts() {
     const user = this,
           message = I18n.messageFormat('admin.user.delete_all_posts_confirm_MF', { "POSTS": user.get('post_count'), "TOPICS": user.get('topic_count') }),
@@ -168,6 +152,14 @@ const AdminUser = Discourse.User.extend({
     }).catch(popupAjaxError);
   },
 
+  disableSecondFactor() {
+    return ajax(`/admin/users/${this.get('id')}/disable_second_factor`, {
+      type: 'PUT'
+    }).then(() => {
+      this.set('second_factor_enabled', false);
+    }).catch(popupAjaxError);
+  },
+
   refreshBrowsers() {
     return ajax("/admin/users/" + this.get('id') + "/refresh_browsers", {
       type: 'POST'
@@ -233,8 +225,6 @@ const AdminUser = Discourse.User.extend({
     return this.get('trust_level') < 4;
   }.property('trust_level'),
 
-  isSuspended: Em.computed.equal('suspended', true),
-  isSilenced: Ember.computed.equal('silenced', true),
   canSuspend: Em.computed.not('staff'),
 
   suspendDuration: function() {
@@ -293,7 +283,8 @@ const AdminUser = Discourse.User.extend({
 
   deactivate() {
     return ajax('/admin/users/' + this.id + '/deactivate', {
-      type: 'PUT'
+      type: 'PUT',
+      data: { context: document.location.pathname }
     }).then(function() {
       window.location.reload();
     }).catch(function(e) {
@@ -345,8 +336,6 @@ const AdminUser = Discourse.User.extend({
     }).catch(popupAjaxError);
   },
 
-  anonymizeForbidden: Em.computed.not("can_be_anonymized"),
-
   anonymize() {
     const user = this,
           message = I18n.t("admin.user.anonymize_confirm");
@@ -385,26 +374,13 @@ const AdminUser = Discourse.User.extend({
     bootbox.dialog(message, buttons, { "classes": "delete-user-modal" });
   },
 
-  deleteForbidden: Em.computed.not("canBeDeleted"),
-
-  deleteExplanation: function() {
-    if (this.get('deleteForbidden')) {
-      if (this.get('staff')) {
-        return I18n.t('admin.user.delete_forbidden_because_staff');
-      } else {
-        return I18n.t('admin.user.delete_forbidden', {count: Discourse.SiteSettings.delete_user_max_post_age});
-      }
-    } else {
-      return null;
-    }
-  }.property('deleteForbidden'),
-
   destroy(opts) {
     const user = this,
           message = I18n.t("admin.user.delete_confirm"),
           location = document.location.pathname;
 
     const performDestroy = function(block) {
+      bootbox.dialog(I18n.t('admin.user.deleting_user'));
       let formData = { context: location };
       if (block) {
         formData["block_email"] = true;
@@ -464,11 +440,12 @@ const AdminUser = Discourse.User.extend({
     });
   },
 
-  tl3Requirements: function() {
-    if (this.get('tl3_requirements')) {
-      return TL3Requirements.create(this.get('tl3_requirements'));
+  @computed('tl3_requirements')
+  tl3Requirements(requirements) {
+    if (requirements) {
+      return this.store.createRecord('tl3Requirements', requirements);
     }
-  }.property('tl3_requirements'),
+  },
 
   @computed('suspended_by')
   suspendedBy: wrapAdmin,
diff --git a/app/assets/javascripts/admin/models/flagged-post.js.es6 b/app/assets/javascripts/admin/models/flagged-post.js.es6
index acd3a0e0dfe..a1cd66ccd99 100644
--- a/app/assets/javascripts/admin/models/flagged-post.js.es6
+++ b/app/assets/javascripts/admin/models/flagged-post.js.es6
@@ -22,6 +22,11 @@ export default Post.extend({
     });
   },
 
+  @computed('post_actions')
+  hasDisposedBy() {
+    return this.get('post_actions').some(action => action.disposed_by);
+  },
+
   @computed('post_actions.@each.name_key')
   flaggedForSpam() {
     return this.get('post_actions').every(action => action.name_key === 'spam');
@@ -57,11 +62,74 @@ export default Post.extend({
   },
 
   deferFlags(deletePost) {
-    return ajax('/admin/flags/defer/' + this.id, { type: 'POST', cache: false, data: { delete_post: deletePost } }).catch(popupAjaxError);
+    const action = () => {
+      return ajax('/admin/flags/defer/' + this.id, {
+        type: 'POST', cache: false, data: { delete_post: deletePost }
+      });
+    };
+
+    if (deletePost && this._hasDeletableReplies()) {
+      return this._actOnFlagAndDeleteReplies(action);
+    } else {
+      return action().catch(popupAjaxError);
+    }
   },
 
   agreeFlags(actionOnPost) {
-    return ajax('/admin/flags/agree/' + this.id, { type: 'POST', cache: false, data: { action_on_post: actionOnPost } }).catch(popupAjaxError);
+    const action = () => {
+      return ajax('/admin/flags/agree/' + this.id, {
+        type: 'POST', cache: false, data: { action_on_post: actionOnPost }
+      });
+    };
+
+    if (actionOnPost === 'delete' && this._hasDeletableReplies()) {
+      return this._actOnFlagAndDeleteReplies(action);
+    } else {
+      return action().catch(popupAjaxError);
+    }
+  },
+
+  _hasDeletableReplies() {
+    return this.get('post_number') > 1 && this.get('reply_count') > 0;
+  },
+
+  _actOnFlagAndDeleteReplies(action) {
+    return new Ember.RSVP.Promise((resolve, reject) => {
+      return ajax(`/posts/${this.id}/reply-ids/all.json`).then(replies => {
+        const buttons = [];
+
+        buttons.push({
+          label: I18n.t('no_value'),
+          callback() {
+            action()
+              .then(resolve)
+              .catch(error => {
+                popupAjaxError(error);
+                reject();
+              });
+          }
+        });
+
+        buttons.push({
+          label: I18n.t('yes_value'),
+          class: "btn-danger",
+          callback() {
+            Post.deleteMany(replies.map(r => r.id))
+              .then(action)
+              .then(resolve)
+              .catch(error => {
+                popupAjaxError(error);
+                reject();
+              });
+          }
+        });
+
+        bootbox.dialog(I18n.t("admin.flags.delete_replies", { count: replies.length }), buttons);
+      }).catch(error => {
+        popupAjaxError(error);
+        reject();
+      });
+    });
   },
 
   postHidden: Ember.computed.alias('hidden'),
diff --git a/app/assets/javascripts/admin/models/report.js.es6 b/app/assets/javascripts/admin/models/report.js.es6
index 03e3888f97b..80c160a8d90 100644
--- a/app/assets/javascripts/admin/models/report.js.es6
+++ b/app/assets/javascripts/admin/models/report.js.es6
@@ -1,13 +1,24 @@
-import { ajax } from 'discourse/lib/ajax';
+import { ajax } from "discourse/lib/ajax";
 import round from "discourse/lib/round";
-import { fmt } from 'discourse/lib/computed';
+import { fillMissingDates } from "discourse/lib/utilities";
+import computed from "ember-addons/ember-computed-decorators";
+import { number } from 'discourse/lib/formatter';
 
 const Report = Discourse.Model.extend({
-  reportUrl: fmt("type", "/admin/reports/%@"),
+  average: false,
+  percent: false,
+  higher_is_better: true,
+
+  @computed("type", "start_date", "end_date")
+  reportUrl(type, start_date, end_date) {
+    start_date = moment(start_date).locale("en").format("YYYY-MM-DD");
+    end_date = moment(end_date).locale("en").format("YYYY-MM-DD");
+    return Discourse.getURL(`/admin/reports/${type}?start_date=${start_date}&end_date=${end_date}`);
+  },
 
   valueAt(numDaysAgo) {
     if (this.data) {
-      const wantedDate = moment().subtract(numDaysAgo, "days").format("YYYY-MM-DD");
+      const wantedDate = moment().subtract(numDaysAgo, "days").locale("en").format("YYYY-MM-DD");
       const item = this.data.find(d => d.x === wantedDate);
       if (item) {
         return item.y;
@@ -20,7 +31,7 @@ const Report = Discourse.Model.extend({
     if (this.data) {
       const earliestDate = moment().subtract(endDaysAgo, "days").startOf("day");
       const latestDate = moment().subtract(startDaysAgo, "days").startOf("day");
-      var d, sum = 0, count = 0;
+      let d, sum = 0, count = 0;
       _.each(this.data, datum => {
         d = moment(datum.x);
         if (d >= earliestDate && d <= latestDate) {
@@ -33,105 +44,208 @@ const Report = Discourse.Model.extend({
     }
   },
 
-  todayCount:          function() { return this.valueAt(0); }.property("data"),
-  yesterdayCount:      function() { return this.valueAt(1); }.property("data"),
-  sevenDaysAgoCount:   function() { return this.valueAt(7); }.property("data"),
-  thirtyDaysAgoCount:  function() { return this.valueAt(30); }.property("data"),
+  todayCount:          function() { return this.valueAt(0); }.property("data", "average"),
+  yesterdayCount:      function() { return this.valueAt(1); }.property("data", "average"),
+  sevenDaysAgoCount:   function() { return this.valueAt(7); }.property("data", "average"),
+  thirtyDaysAgoCount:  function() { return this.valueAt(30); }.property("data", "average"),
 
-  lastSevenDaysCount:  function() { return this.valueFor(1, 7); }.property("data"),
-  lastThirtyDaysCount: function() { return this.valueFor(1, 30); }.property("data"),
+  lastSevenDaysCount:  function() {
+    return this.averageCount(7, this.valueFor(1, 7));
+  }.property("data", "average"),
+  lastThirtyDaysCount: function() {
+    return this.averageCount(30, this.valueFor(1, 30));
+  }.property("data", "average"),
 
-  yesterdayTrend: function() {
-    const yesterdayVal = this.valueAt(1);
-    const twoDaysAgoVal = this.valueAt(2);
-    if (yesterdayVal > twoDaysAgoVal) {
-      return "trending-up";
-    } else if (yesterdayVal < twoDaysAgoVal) {
-      return "trending-down";
-    } else {
-      return "no-change";
+  averageCount(count, value) {
+    return this.get("average") ? value / count : value;
+  },
+
+  @computed("yesterdayCount", "higher_is_better")
+  yesterdayTrend(yesterdayCount, higherIsBetter) {
+    return this._computeTrend(this.valueAt(2), yesterdayCount, higherIsBetter);
+  },
+
+  @computed("lastSevenDaysCount", "higher_is_better")
+  sevenDaysTrend(lastSevenDaysCount, higherIsBetter) {
+    return this._computeTrend(this.valueFor(8, 14), lastSevenDaysCount, higherIsBetter);
+  },
+
+  @computed("data")
+  currentTotal(data){
+    return _.reduce(data, (cur, pair) => cur + pair.y, 0);
+  },
+
+  @computed("data", "currentTotal")
+  currentAverage(data, total) {
+    return Ember.makeArray(data).length === 0 ? 0 : parseFloat((total / parseFloat(data.length)).toFixed(1));
+  },
+
+  @computed("trend", "higher_is_better")
+  trendIcon(trend, higherIsBetter) {
+    return this._iconForTrend(trend, higherIsBetter);
+  },
+
+  @computed("sevenDaysTrend", "higher_is_better")
+  sevenDaysTrendIcon(sevenDaysTrend, higherIsBetter) {
+    return this._iconForTrend(sevenDaysTrend, higherIsBetter);
+  },
+
+  @computed("thirtyDaysTrend", "higher_is_better")
+  thirtyDaysTrendIcon(thirtyDaysTrend, higherIsBetter) {
+    return this._iconForTrend(thirtyDaysTrend, higherIsBetter);
+  },
+
+  @computed("yesterdayTrend", "higher_is_better")
+  yesterdayTrendIcon(yesterdayTrend, higherIsBetter) {
+    return this._iconForTrend(yesterdayTrend, higherIsBetter);
+  },
+
+  @computed("prev_period", "currentTotal", "currentAverage", "higher_is_better")
+  trend(prev, currentTotal, currentAverage, higherIsBetter) {
+    const total = this.get("average") ? currentAverage : currentTotal;
+    return this._computeTrend(prev, total, higherIsBetter);
+  },
+
+  @computed("prev30Days", "lastThirtyDaysCount", "higher_is_better")
+  thirtyDaysTrend(prev30Days, lastThirtyDaysCount, higherIsBetter) {
+    return this._computeTrend(prev30Days, lastThirtyDaysCount, higherIsBetter);
+  },
+
+  @computed("type")
+  icon(type) {
+    if (type.indexOf("message") > -1) {
+      return "envelope";
     }
-  }.property("data"),
-
-  sevenDayTrend: function() {
-    const currentPeriod = this.valueFor(1, 7);
-    const prevPeriod = this.valueFor(8, 14);
-    if (currentPeriod > prevPeriod) {
-      return "trending-up";
-    } else if (currentPeriod < prevPeriod) {
-      return "trending-down";
-    } else {
-      return "no-change";
-    }
-  }.property("data"),
-
-  thirtyDayTrend: function() {
-    if (this.get("prev30Days")) {
-      const currentPeriod = this.valueFor(1, 30);
-      if (currentPeriod > this.get("prev30Days")) {
-        return "trending-up";
-      } else if (currentPeriod < this.get("prev30Days")) {
-        return "trending-down";
-      }
-    }
-    return "no-change";
-  }.property("data", "prev30Days"),
-
-  icon: function() {
-    switch (this.get("type")) {
+    switch (type) {
+      case "page_view_total_reqs": return "file";
+      case "visits": return "user";
+      case "time_to_first_response": return "reply";
       case "flags": return "flag";
       case "likes": return "heart";
       case "bookmarks": return "bookmark";
       default: return null;
     }
-  }.property("type"),
+  },
 
-  method: function() {
-    if (this.get("type") === "time_to_first_response") {
+  @computed("type")
+  method(type) {
+    if (type === "time_to_first_response") {
       return "average";
     } else {
       return "sum";
     }
-  }.property("type"),
+  },
 
   percentChangeString(val1, val2) {
-    const val = ((val1 - val2) / val2) * 100;
-    if (isNaN(val) || !isFinite(val)) {
+    const change = this._computeChange(val1, val2);
+
+    if (isNaN(change) || !isFinite(change)) {
       return null;
-    } else if (val > 0) {
-      return "+" + val.toFixed(0) + "%";
+    } else if (change > 0) {
+      return "+" + change.toFixed(0) + "%";
     } else {
-      return val.toFixed(0) + "%";
+      return change.toFixed(0) + "%";
     }
   },
 
-  changeTitle(val1, val2, prevPeriodString) {
-    const percentChange = this.percentChangeString(val1, val2);
-    var title = "";
-    if (percentChange) { title += percentChange + " change. "; }
-    title += "Was " + val2 + " " + prevPeriodString + ".";
+  @computed("prev_period", "currentTotal", "currentAverage")
+  trendTitle(prev, currentTotal, currentAverage) {
+    let current = this.get("average") ? currentAverage : currentTotal;
+    let percent = this.percentChangeString(prev, current);
+
+    if (this.get("average")) {
+      prev = prev ? prev.toFixed(1) : "0";
+      if (this.get("percent")) {
+        current += "%";
+        prev += "%";
+      }
+    } else {
+      prev = number(prev);
+      current = number(current);
+    }
+
+    return I18n.t("admin.dashboard.reports.trend_title", {percent, prev, current});
+  },
+
+  changeTitle(valAtT1, valAtT2, prevPeriodString) {
+    const change = this.percentChangeString(valAtT1, valAtT2);
+    let title = "";
+    if (change) { title += `${change} change. `; }
+    title += `Was ${number(valAtT1)} ${prevPeriodString}.`;
     return title;
   },
 
-  yesterdayCountTitle: function() {
-    return this.changeTitle(this.valueAt(1), this.valueAt(2), "two days ago");
-  }.property("data"),
+  @computed("yesterdayCount")
+  yesterdayCountTitle(yesterdayCount) {
+    return this.changeTitle(this.valueAt(2), yesterdayCount, "two days ago");
+  },
 
-  sevenDayCountTitle: function() {
-    return this.changeTitle(this.valueFor(1, 7), this.valueFor(8, 14), "two weeks ago");
-  }.property("data"),
+  @computed("lastSevenDaysCount")
+  sevenDaysCountTitle(lastSevenDaysCount) {
+    return this.changeTitle(this.valueFor(8, 14), lastSevenDaysCount, "two weeks ago");
+  },
 
-  thirtyDayCountTitle: function() {
-    return this.changeTitle(this.valueFor(1, 30), this.get("prev30Days"), "in the previous 30 day period");
-  }.property("data"),
+  @computed("prev30Days", "lastThirtyDaysCount")
+  thirtyDaysCountTitle(prev30Days, lastThirtyDaysCount) {
+    return this.changeTitle(prev30Days, lastThirtyDaysCount, "in the previous 30 day period");
+  },
 
-  dataReversed: function() {
-    return this.get("data").toArray().reverse();
-  }.property("data")
+  @computed("data")
+  sortedData(data) {
+    return this.get("xAxisIsDate") ? data.toArray().reverse() : data.toArray();
+  },
 
+  @computed("data")
+  xAxisIsDate() {
+    if (!this.data[0]) return false;
+    return this.data && this.data[0].x.match(/\d{4}-\d{1,2}-\d{1,2}/);
+  },
+
+  _computeChange(valAtT1, valAtT2) {
+    return ((valAtT2 - valAtT1) / valAtT1) * 100;
+  },
+
+  _computeTrend(valAtT1, valAtT2, higherIsBetter) {
+    const change = this._computeChange(valAtT1, valAtT2);
+
+    if (change > 50) {
+      return higherIsBetter ? "high-trending-up" : "high-trending-down";
+    } else if (change > 2) {
+      return higherIsBetter ? "trending-up" : "trending-down";
+    } else if (change <= 2 && change >= -2) {
+      return "no-change";
+    } else if (change < -50) {
+      return higherIsBetter ? "high-trending-down" : "high-trending-up";
+    } else if (change < -2) {
+      return higherIsBetter ? "trending-down" : "trending-up";
+    }
+  },
+
+  _iconForTrend(trend, higherIsBetter) {
+    switch (trend) {
+      case "trending-up":
+        return higherIsBetter ? "angle-up" : "angle-down";
+      case "trending-down":
+        return higherIsBetter ? "angle-down" : "angle-up";
+      case "high-trending-up":
+        return higherIsBetter ? "angle-double-up" : "angle-double-down";
+      case "high-trending-down":
+        return higherIsBetter ? "angle-double-down" : "angle-double-up";
+      default:
+        return null;
+    }
+  }
 });
 
 Report.reopenClass({
+  fillMissingDates(report) {
+    if (_.isArray(report.data)) {
+
+      const startDateFormatted = moment.utc(report.start_date).locale("en").format("YYYY-MM-DD");
+      const endDateFormatted = moment.utc(report.end_date).locale("en").format("YYYY-MM-DD");
+      report.data = fillMissingDates(report.data, startDateFormatted, endDateFormatted);
+    }
+  },
 
   find(type, startDate, endDate, categoryId, groupId) {
     return ajax("/admin/reports/" + type, {
@@ -142,16 +256,19 @@ Report.reopenClass({
         group_id: groupId
       }
     }).then(json => {
-      // Add a percent field to each tuple
-      let maxY = 0;
-      json.report.data.forEach(row => {
-        if (row.y > maxY) maxY = row.y;
-      });
-      if (maxY > 0) {
-        json.report.data.forEach(row => row.percentage = Math.round((row.y / maxY) * 100));
-      }
+      // Add zero values for missing dates
+      Report.fillMissingDates(json.report);
+
       const model = Report.create({ type: type });
       model.setProperties(json.report);
+
+      if (json.report.related_report) {
+        // TODO: fillMissingDates if xaxis is date
+        const related = Report.create({ type: json.report.related_report.type });
+        related.setProperties(json.report.related_report);
+        model.set("relatedReport", related);
+      }
+
       return model;
     });
   }
diff --git a/app/assets/javascripts/admin/models/site-setting.js.es6 b/app/assets/javascripts/admin/models/site-setting.js.es6
index 6ed78787968..3fc3cf43f5c 100644
--- a/app/assets/javascripts/admin/models/site-setting.js.es6
+++ b/app/assets/javascripts/admin/models/site-setting.js.es6
@@ -1,31 +1,7 @@
 import { ajax } from 'discourse/lib/ajax';
-const SiteSetting = Discourse.Model.extend({
-  overridden: function() {
-    let val = this.get('value'),
-        defaultVal = this.get('default');
+import Setting from 'admin/mixins/setting-object';
 
-    if (val === null) val = '';
-    if (defaultVal === null) defaultVal = '';
-
-    return val.toString() !== defaultVal.toString();
-  }.property('value', 'default'),
-
-  validValues: function() {
-    const vals = [],
-          translateNames = this.get('translate_names');
-
-    this.get('valid_values').forEach(function(v) {
-      if (v.name && v.name.length > 0) {
-        vals.addObject(translateNames ? {name: I18n.t(v.name), value: v.value} : v);
-      }
-    });
-    return vals;
-  }.property('valid_values'),
-
-  allowsNone: function() {
-    if ( _.indexOf(this.get('valid_values'), '') >= 0 ) return 'admin.site_settings.none';
-  }.property('valid_values')
-});
+const SiteSetting = Discourse.Model.extend(Setting, {});
 
 SiteSetting.reopenClass({
   findAll() {
diff --git a/app/assets/javascripts/admin/models/staff-action-log.js.es6 b/app/assets/javascripts/admin/models/staff-action-log.js.es6
index e60d815f7c7..88cba94b4c8 100644
--- a/app/assets/javascripts/admin/models/staff-action-log.js.es6
+++ b/app/assets/javascripts/admin/models/staff-action-log.js.es6
@@ -1,50 +1,58 @@
-import { ajax } from 'discourse/lib/ajax';
-import AdminUser from 'admin/models/admin-user';
-import { escapeExpression } from 'discourse/lib/utilities';
+import computed from "ember-addons/ember-computed-decorators";
+import { ajax } from "discourse/lib/ajax";
+import AdminUser from "admin/models/admin-user";
+import { escapeExpression } from "discourse/lib/utilities";
+
+function format(label, value, escape = true) {
+  return value ? `<b>${I18n.t(label)}</b>: ${escape ? escapeExpression(value) : value}` : "";
+};
 
 const StaffActionLog = Discourse.Model.extend({
   showFullDetails: false,
 
-  actionName: function() {
-    return I18n.t("admin.logs.staff_actions.actions." + this.get('action_name'));
-  }.property('action_name'),
-
-  formattedDetails: function() {
-    var formatted = "";
-    formatted += this.format('email', 'email');
-    formatted += this.format('admin.logs.ip_address', 'ip_address');
-    formatted += this.format('admin.logs.topic_id', 'topic_id');
-    formatted += this.format('admin.logs.post_id', 'post_id');
-    formatted += this.format('admin.logs.category_id', 'category_id');
-    if (!this.get('useCustomModalForDetails')) {
-      formatted += this.format('admin.logs.staff_actions.new_value', 'new_value');
-      formatted += this.format('admin.logs.staff_actions.previous_value', 'previous_value');
-    }
-    if (!this.get('useModalForDetails')) {
-      if (this.get('details')) formatted += escapeExpression(this.get('details')) + '<br/>';
-    }
-    return formatted;
-  }.property('ip_address', 'email', 'topic_id', 'post_id', 'category_id'),
-
-  format: function(label, propertyName) {
-    if (this.get(propertyName)) {
-      return ('<b>' + I18n.t(label) + ':</b> ' + escapeExpression(this.get(propertyName)) + '<br/>');
-    } else {
-      return '';
-    }
+  @computed("action_name")
+  actionName(actionName) {
+    return I18n.t(`admin.logs.staff_actions.actions.${actionName}`);
   },
 
-  useModalForDetails: function() {
-    return (this.get('details') && this.get('details').length > 100);
-  }.property('action_name'),
+  @computed("email", "ip_address", "topic_id", "post_id", "category_id", "new_value", "previous_value", "details", "useCustomModalForDetails", "useModalForDetails")
+  formattedDetails(email, ipAddress, topicId, postId, categoryId, newValue, previousValue, details, useCustomModalForDetails, useModalForDetails) {
+    const postLink = postId ? `<a href data-link-post-id="${postId}">${postId}</a>` : null;
 
-  useCustomModalForDetails: function() {
-    return _.contains(['change_theme', 'delete_theme'], this.get('action_name'));
-  }.property('action_name')
+    let lines = [
+      format("email", email),
+      format("admin.logs.ip_address", ipAddress),
+      format("admin.logs.topic_id", topicId),
+      format("admin.logs.post_id", postLink, false),
+      format("admin.logs.category_id", categoryId),
+    ];
+
+    if (!useCustomModalForDetails) {
+      lines.push(format("admin.logs.staff_actions.new_value", newValue));
+      lines.push(format("admin.logs.staff_actions.previous_value", previousValue));
+    }
+
+    if (!useModalForDetails && details) {
+      lines = [...lines, ...escapeExpression(details).split("\n")];
+    }
+
+    const formatted = lines.filter(l => l.length > 0).join("<br/>");
+    return formatted.length > 0 ? formatted + "<br/>" : "";
+  },
+
+  @computed("details")
+  useModalForDetails(details) {
+    return details && details.length > 100;
+  },
+
+  @computed("action_name")
+  useCustomModalForDetails(actionName) {
+    return ["change_theme", "delete_theme"].includes(actionName);
+  }
 });
 
 StaffActionLog.reopenClass({
-  create: function(attrs) {
+  create(attrs) {
     attrs = attrs || {};
 
     if (attrs.acting_user) {
@@ -56,13 +64,11 @@ StaffActionLog.reopenClass({
     return this._super(attrs);
   },
 
-  findAll: function(filters) {
-    return ajax("/admin/logs/staff_action_logs.json", { data: filters }).then((data) => {
+  findAll(data) {
+    return ajax("/admin/logs/staff_action_logs.json", { data }).then(result => {
       return {
-        staff_action_logs: data.staff_action_logs.map(function(s) {
-          return StaffActionLog.create(s);
-        }),
-        user_history_actions: data.user_history_actions
+        staff_action_logs: result.staff_action_logs.map(s => StaffActionLog.create(s)),
+        user_history_actions: result.user_history_actions
       };
     });
   }
diff --git a/app/assets/javascripts/admin/models/theme-settings.js.es6 b/app/assets/javascripts/admin/models/theme-settings.js.es6
new file mode 100644
index 00000000000..b1e824cf493
--- /dev/null
+++ b/app/assets/javascripts/admin/models/theme-settings.js.es6
@@ -0,0 +1,3 @@
+import Setting from 'admin/mixins/setting-object';
+
+export default Discourse.Model.extend(Setting, {});
diff --git a/app/assets/javascripts/admin/models/theme.js.es6 b/app/assets/javascripts/admin/models/theme.js.es6
index 742d06317fd..d7c5a89fd05 100644
--- a/app/assets/javascripts/admin/models/theme.js.es6
+++ b/app/assets/javascripts/admin/models/theme.js.es6
@@ -5,6 +5,8 @@ const THEME_UPLOAD_VAR = 2;
 
 const Theme = RestModel.extend({
 
+  FIELDS_IDS: [0, 1],
+
   @computed('theme_fields')
   themeFields(fields) {
 
@@ -14,13 +16,11 @@ const Theme = RestModel.extend({
     }
 
     let hash = {};
-    if (fields) {
-      fields.forEach(field=>{
-        if (!field.type_id || field.type_id < THEME_UPLOAD_VAR) {
-          hash[this.getKey(field)] = field;
-        }
-      });
-    }
+    fields.forEach(field => {
+      if (!field.type_id || this.get('FIELDS_IDS').includes(field.type_id)) {
+        hash[this.getKey(field)] = field;
+      }
+    });
     return hash;
   },
 
@@ -29,11 +29,11 @@ const Theme = RestModel.extend({
     if (!fields) {
       return [];
     }
-    return fields.filter((f)=> f.target === 'common' && f.type_id === THEME_UPLOAD_VAR);
+    return fields.filter(f => f.target === 'common' && f.type_id === THEME_UPLOAD_VAR);
   },
 
   getKey(field){
-    return field.target + " " + field.name;
+    return `${field.target} ${field.name}`;
   },
 
   hasEdited(target, name){
@@ -151,6 +151,11 @@ const Theme = RestModel.extend({
       .then(() => this.set("changed", false));
   },
 
+  saveSettings(name, value) {
+    const settings = {};
+    settings[name] = value;
+    return this.save({ settings });
+  }
 });
 
 export default Theme;
diff --git a/app/assets/javascripts/admin/models/tl3-requirements.js.es6 b/app/assets/javascripts/admin/models/tl3-requirements.js.es6
index ac27b095a7b..6dc655b1ced 100644
--- a/app/assets/javascripts/admin/models/tl3-requirements.js.es6
+++ b/app/assets/javascripts/admin/models/tl3-requirements.js.es6
@@ -1,11 +1,15 @@
-const TL3Requirements = Discourse.Model.extend({
-  days_visited_percent: function() {
-    return Math.round((this.get('days_visited') * 100) / this.get('time_period'));
-  }.property('days_visited', 'time_period'),
+import computed from 'ember-addons/ember-computed-decorators';
 
-  min_days_visited_percent: function() {
-    return Math.round((this.get('min_days_visited') * 100) / this.get('time_period'));
-  }.property('min_days_visited', 'time_period'),
+export default Discourse.Model.extend({
+  @computed('days_visited', 'time_period')
+  days_visited_percent(daysVisited, timePeriod) {
+    return Math.round((daysVisited * 100) / timePeriod);
+  },
+
+  @computed('min_days_visited', 'time_period')
+  min_days_visited_percent(minDaysVisited, timePeriod) {
+    return Math.round((minDaysVisited * 100) / timePeriod);
+  },
 
   met: function() {
     return {
@@ -21,22 +25,26 @@ const TL3Requirements = Discourse.Model.extend({
       likes_received: this.get('num_likes_received') >= this.get('min_likes_received'),
       likes_received_days: this.get('num_likes_received_days') >= this.get('min_likes_received_days'),
       likes_received_users: this.get('num_likes_received_users') >= this.get('min_likes_received_users'),
-      level_locked: this.get('trust_level_locked')
+      level_locked: this.get('trust_level_locked'),
+      silenced: this.get('penalty_counts.silenced') === 0,
+      suspended: this.get('penalty_counts.suspended') === 0
     };
-  }.property('days_visited', 'min_days_visited',
-             'num_topics_replied_to', 'min_topics_replied_to',
-             'topics_viewed', 'min_topics_viewed',
-             'posts_read', 'min_posts_read',
-             'num_flagged_posts', 'max_flagged_posts',
-             'topics_viewed_all_time', 'min_topics_viewed_all_time',
-             'posts_read_all_time', 'min_posts_read_all_time',
-             'num_flagged_by_users', 'max_flagged_by_users',
-             'num_likes_given', 'min_likes_given',
-             'num_likes_received', 'min_likes_received',
-             'num_likes_received', 'min_likes_received',
-             'num_likes_received_days', 'min_likes_received_days',
-             'num_likes_received_users', 'min_likes_received_users',
-             'trust_level_locked')
+  }.property(
+    'days_visited', 'min_days_visited',
+    'num_topics_replied_to', 'min_topics_replied_to',
+    'topics_viewed', 'min_topics_viewed',
+    'posts_read', 'min_posts_read',
+    'num_flagged_posts', 'max_flagged_posts',
+    'topics_viewed_all_time', 'min_topics_viewed_all_time',
+    'posts_read_all_time', 'min_posts_read_all_time',
+    'num_flagged_by_users', 'max_flagged_by_users',
+    'num_likes_given', 'min_likes_given',
+    'num_likes_received', 'min_likes_received',
+    'num_likes_received', 'min_likes_received',
+    'num_likes_received_days', 'min_likes_received_days',
+    'num_likes_received_users', 'min_likes_received_users',
+    'trust_level_locked',
+    'penalty_counts.silenced',
+    'penalty_counts.suspended'
+  )
 });
-
-export default TL3Requirements;
diff --git a/app/assets/javascripts/admin/routes/admin-backups-index.js.es6 b/app/assets/javascripts/admin/routes/admin-backups-index.js.es6
index fce0b126d36..8c77fdd1aef 100644
--- a/app/assets/javascripts/admin/routes/admin-backups-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-backups-index.js.es6
@@ -1,7 +1,15 @@
 import Backup from 'admin/models/backup';
 
 export default Ember.Route.extend({
+  activate() {
+    this.messageBus.subscribe("/admin/backups", backups => this.controller.set("model", backups));
+  },
+
   model() {
     return Backup.find();
+  },
+
+  deactivate() {
+    this.messageBus.unsubscribe("/admin/backups");
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-backups.js.es6 b/app/assets/javascripts/admin/routes/admin-backups.js.es6
index 92ac4652fa6..f992b5fc93f 100644
--- a/app/assets/javascripts/admin/routes/admin-backups.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-backups.js.es6
@@ -9,26 +9,24 @@ const LOG_CHANNEL = "/admin/backups/logs";
 export default Discourse.Route.extend({
 
   activate() {
-    this.messageBus.subscribe(LOG_CHANNEL, this._processLogMessage.bind(this));
-  },
-
-  _processLogMessage(log) {
-    if (log.message === "[STARTED]") {
-      this.controllerFor("adminBackups").set("model.isOperationRunning", true);
-      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 }));
-    } else if (log.message === "[SUCCESS]") {
-      Discourse.User.currentProp("hideReadOnlyAlert", false);
-      this.controllerFor("adminBackups").set("model.isOperationRunning", false);
-      if (log.operation === "restore") {
-        // redirect to homepage when the restore is done (session might be lost)
-        window.location.pathname = Discourse.getURL("/");
+    this.messageBus.subscribe(LOG_CHANNEL, (log) => {
+      if (log.message === "[STARTED]") {
+        this.controllerFor("adminBackups").set("model.isOperationRunning", true);
+        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 }));
+      } else if (log.message === "[SUCCESS]") {
+        Discourse.User.currentProp("hideReadOnlyAlert", false);
+        this.controllerFor("adminBackups").set("model.isOperationRunning", false);
+        if (log.operation === "restore") {
+          // redirect to homepage when the restore is done (session might be lost)
+          window.location.pathname = Discourse.getURL("/");
+        }
+      } else {
+        this.controllerFor("adminBackupsLogs").get('logs').pushObject(Em.Object.create(log));
       }
-    } else {
-      this.controllerFor("adminBackupsLogs").get('logs').pushObject(Em.Object.create(log));
-    }
+    });
   },
 
   model() {
@@ -122,12 +120,7 @@ export default Discourse.Route.extend({
     },
 
     uploadSuccess(filename) {
-      const self = this;
-      bootbox.alert(I18n.t("admin.backups.upload.success", { filename: filename }), function() {
-        Backup.find().then(function (backups) {
-          self.controllerFor("adminBackupsIndex").set("model", backups);
-        });
-      });
+      bootbox.alert(I18n.t("admin.backups.upload.success", { filename: filename }));
     },
 
     uploadError(filename, message) {
diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes-edit.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-themes-edit.js.es6
index c1d3b225ffd..d9e7e6249fd 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-themes-edit.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-themes-edit.js.es6
@@ -18,6 +18,11 @@ export default Ember.Route.extend({
   },
 
   setupController(controller, wrapper) {
+    const fields = controller.fieldsForTarget(wrapper.target);
+    if (!fields.includes(wrapper.field_name)) {
+      this.transitionTo('adminCustomizeThemes.edit', wrapper.model.id, wrapper.target, fields[0]);
+      return;
+    }
     controller.set("model", wrapper.model);
     controller.setTargetName(wrapper.target || "common");
     controller.set("fieldName", wrapper.field_name || "scss");
diff --git a/app/assets/javascripts/admin/routes/admin-dashboard-next.js.es6 b/app/assets/javascripts/admin/routes/admin-dashboard-next.js.es6
new file mode 100644
index 00000000000..30ca9b033c0
--- /dev/null
+++ b/app/assets/javascripts/admin/routes/admin-dashboard-next.js.es6
@@ -0,0 +1,5 @@
+export default Discourse.Route.extend({
+  activate() {
+    this.controllerFor('admin-dashboard-next').fetchDashboard();
+  }
+});
diff --git a/app/assets/javascripts/admin/routes/admin-group.js.es6 b/app/assets/javascripts/admin/routes/admin-group.js.es6
deleted file mode 100644
index 0009f834e13..00000000000
--- a/app/assets/javascripts/admin/routes/admin-group.js.es6
+++ /dev/null
@@ -1,24 +0,0 @@
-import Group from 'discourse/models/group';
-
-export default Discourse.Route.extend({
-
-  model(params) {
-    if (params.name === 'new') {
-      return Group.create({ automatic: false, visibility_level: 0 });
-    }
-
-    const group = this.modelFor('adminGroupsType').findBy('name', params.name);
-
-    if (!group) { return this.transitionTo('adminGroups.index'); }
-
-    return group;
-  },
-
-  setupController(controller, model) {
-    controller.set("model", model);
-    controller.set("model.usernames", null);
-    controller.set("savingStatus", "");
-    model.findMembers();
-  }
-
-});
diff --git a/app/assets/javascripts/admin/routes/admin-groups-bulk.js.es6 b/app/assets/javascripts/admin/routes/admin-groups-bulk.js.es6
deleted file mode 100644
index 8d9554556f8..00000000000
--- a/app/assets/javascripts/admin/routes/admin-groups-bulk.js.es6
+++ /dev/null
@@ -1,13 +0,0 @@
-import Group from 'discourse/models/group';
-
-export default Ember.Route.extend({
-  model() {
-    return Group.findAll().then(groups => {
-      return groups.filter(g => !g.get('automatic'));
-    });
-  },
-
-  setupController(controller, groups) {
-    controller.setProperties({ groups, groupId: null, users: null });
-  }
-});
diff --git a/app/assets/javascripts/admin/routes/admin-groups-index.js.es6 b/app/assets/javascripts/admin/routes/admin-groups-index.js.es6
deleted file mode 100644
index e650d150fb7..00000000000
--- a/app/assets/javascripts/admin/routes/admin-groups-index.js.es6
+++ /dev/null
@@ -1,5 +0,0 @@
-export default Discourse.Route.extend({
-  redirect: function() {
-    this.transitionTo("adminGroupsType", "custom");
-  }
-});
diff --git a/app/assets/javascripts/admin/routes/admin-groups-type.js.es6 b/app/assets/javascripts/admin/routes/admin-groups-type.js.es6
deleted file mode 100644
index 52e383bf9a0..00000000000
--- a/app/assets/javascripts/admin/routes/admin-groups-type.js.es6
+++ /dev/null
@@ -1,15 +0,0 @@
-import Group from 'discourse/models/group';
-
-export default Discourse.Route.extend({
-  model(params) {
-    this.set("type", params.type);
-    return Group.findAll().then(function(groups) {
-      return groups.filterBy("type", params.type);
-    });
-  },
-
-  setupController(controller, model){
-    controller.set("type", this.get("type"));
-    controller.set("model", model);
-  }
-});
diff --git a/app/assets/javascripts/admin/routes/admin-plugins.js.es6 b/app/assets/javascripts/admin/routes/admin-plugins.js.es6
index 820c5207d44..8c5886f4a43 100644
--- a/app/assets/javascripts/admin/routes/admin-plugins.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-plugins.js.es6
@@ -8,12 +8,15 @@ export default Ember.Route.extend({
       const controller = this.controllerFor('adminSiteSettings');
       this.transitionTo('adminSiteSettingsCategory', 'plugins').then(() => {
         if (plugin) {
+          const siteSettingFilter = plugin.get('enabled_setting_filter');
           const match = /^(.*)_enabled/.exec(plugin.get('enabled_setting'));
-          if (match[1]) {
+          const filter = siteSettingFilter || match[1];
+
+          if (filter) {
             // filterContent() is normally on a debounce from typing.
             // Because we don't want the default of "All Results", we tell it
             // to skip the next debounce.
-            controller.set('filter', match[1]);
+            controller.set('filter', filter);
             controller.set('_skipBounce', true);
             controller.filterContentNow('plugins');
           }
@@ -22,4 +25,3 @@ export default Ember.Route.extend({
     }
   }
 });
-
diff --git a/app/assets/javascripts/admin/routes/admin-reports.js.es6 b/app/assets/javascripts/admin/routes/admin-reports.js.es6
index 65771110e86..acddcff5d61 100644
--- a/app/assets/javascripts/admin/routes/admin-reports.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-reports.js.es6
@@ -12,8 +12,8 @@ export default Discourse.Route.extend({
       model: model,
       categoryId: (model.get('category_id') || 'all'),
       groupId: model.get('group_id'),
-      startDate: moment(model.get('start_date')).format('YYYY-MM-DD'),
-      endDate: moment(model.get('end_date')).format('YYYY-MM-DD')
+      startDate: moment(model.get('start_date')).utc().format('YYYY-MM-DD'),
+      endDate: moment(model.get('end_date')).utc().format('YYYY-MM-DD')
     });
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-route-map.js.es6 b/app/assets/javascripts/admin/routes/admin-route-map.js.es6
index a6ccabc810e..5a033e1efa5 100644
--- a/app/assets/javascripts/admin/routes/admin-route-map.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-route-map.js.es6
@@ -1,6 +1,7 @@
 export default function() {
   this.route('admin', { resetNamespace: true }, function() {
-    this.route('dashboard', { path: '/' });
+    this.route('dashboard', { path: '/dashboard-old' });
+    this.route('dashboardNext', { path: '/' });
     this.route('adminSiteSettings', { path: '/site_settings', resetNamespace: true }, function() {
       this.route('adminSiteSettingsCategory', { path: 'category/:category_id', resetNamespace: true} );
     });
@@ -76,14 +77,6 @@ export default function() {
       });
     });
 
-    this.route('adminGroups', { path: '/groups', resetNamespace: true }, function() {
-      this.route('bulk');
-      this.route('bulkComplete', { path: 'bulk-complete' });
-      this.route('adminGroupsType', { path: '/:type', resetNamespace: true }, function() {
-        this.route('adminGroup', { path: '/:name', resetNamespace: true });
-      });
-    });
-
     this.route('adminUsers', { path: '/users', resetNamespace: true }, function() {
       this.route('adminUser', { path: '/:user_id/:username', resetNamespace: true }, function() {
         this.route('badges');
diff --git a/app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6 b/app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6
index 775fec62c5e..80c5117dc41 100644
--- a/app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6
@@ -1,4 +1,6 @@
 import { ajax } from 'discourse/lib/ajax';
+import { fillMissingDates } from 'discourse/lib/utilities';
+import { translateResults } from "discourse/lib/search";
 
 export default Discourse.Route.extend({
   queryParams: {
@@ -15,6 +17,16 @@ export default Discourse.Route.extend({
         search_type: params.searchType
       }
     }).then(json => {
+      // Add zero values for missing dates
+      if (json.term.data.length > 0) {
+        const startDate = (json.term.period === "all") ? moment(json.term.data[0].x).format('YYYY-MM-DD') : moment(json.term.start_date).format('YYYY-MM-DD');
+        const endDate = moment(json.term.end_date).format('YYYY-MM-DD');
+        json.term.data = fillMissingDates(json.term.data, startDate, endDate);
+      }
+      if (json.term.search_result) {
+        json.term.search_result = translateResults(json.term.search_result);
+      }
+
       const model = Ember.Object.create({ type: "search_log_term" });
       model.setProperties(json.term);
       return model;
diff --git a/app/assets/javascripts/admin/routes/admin-user-index.js.es6 b/app/assets/javascripts/admin/routes/admin-user-index.js.es6
index 36d1d8cedd0..930b45c8b14 100644
--- a/app/assets/javascripts/admin/routes/admin-user-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-user-index.js.es6
@@ -21,15 +21,5 @@ export default Discourse.Route.extend({
       availableGroups: this._availableGroups,
       model
     });
-  },
-
-  actions: {
-    viewActionLogs(username) {
-      const controller = this.controllerFor('adminLogs.staffActionLogs');
-      this.transitionTo('adminLogs.staffActionLogs').then(() => {
-        controller.set('filters', Ember.Object.create());
-        controller._changeFilters({ target_user: username });
-      });
-    }
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-user-tl3-requirements.js.es6 b/app/assets/javascripts/admin/routes/admin-user-tl3-requirements.js.es6
index 40c874eaaa1..cceaf9fd478 100644
--- a/app/assets/javascripts/admin/routes/admin-user-tl3-requirements.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-user-tl3-requirements.js.es6
@@ -1,5 +1,5 @@
 export default Discourse.Route.extend({
-  model: function() {
+  model() {
     return this.modelFor('adminUser');
   }
 });
diff --git a/app/assets/javascripts/admin/services/admin-tools.js.es6 b/app/assets/javascripts/admin/services/admin-tools.js.es6
index 439b85cd421..9f9bec8b036 100644
--- a/app/assets/javascripts/admin/services/admin-tools.js.es6
+++ b/app/assets/javascripts/admin/services/admin-tools.js.es6
@@ -17,10 +17,26 @@ export default Ember.Service.extend({
     this.siteSettings = getOwner(this).lookup('site-settings:main');
   },
 
+  showActionLogs(target, filters) {
+    const controller = getOwner(target).lookup('controller:adminLogs.staffActionLogs');
+    target.transitionToRoute('adminLogs.staffActionLogs').then(() => {
+      controller.set('filters', Ember.Object.create());
+      controller._changeFilters(filters);
+    });
+  },
+
+  showFlagsReceived(user) {
+    showModal(`admin-flags-received`, { admin: true, model: user });
+  },
+
   checkSpammer(userId) {
     return AdminUser.find(userId).then(au => this.spammerDetails(au));
   },
 
+  deleteUser(id) {
+    AdminUser.find(id).then(user => user.destroy({ deletePosts: true }));
+  },
+
   spammerDetails(adminUser) {
     return {
       deleteUser: () => this._deleteSpammer(adminUser),
@@ -36,17 +52,20 @@ export default Ember.Service.extend({
       modalClass: `${type}-user-modal`
     });
     if (opts.post) {
-      controller.set('post', opts.post);
+      controller.setProperties({
+        post: opts.post,
+        postEdit: opts.post.get('raw')
+      });
     }
 
-    let promise = user.adminUserView ?
+    return (user.adminUserView ?
       Ember.RSVP.resolve(user) :
-      AdminUser.find(user.get('id'));
-
-    promise.then(loadedUser => {
+      AdminUser.find(user.get('id'))
+    ).then(loadedUser => {
       controller.setProperties({
         user: loadedUser,
         loadingUser: false,
+        before: opts.before,
         successCallback: opts.successCallback
       });
     });
diff --git a/app/assets/javascripts/admin/templates/.dashboard_next.hbs.swl b/app/assets/javascripts/admin/templates/.dashboard_next.hbs.swl
new file mode 100644
index 00000000000..23cc50b1f35
Binary files /dev/null and b/app/assets/javascripts/admin/templates/.dashboard_next.hbs.swl differ
diff --git a/app/assets/javascripts/admin/templates/admin.hbs b/app/assets/javascripts/admin/templates/admin.hbs
index af4aafde947..cf4d231d4ed 100644
--- a/app/assets/javascripts/admin/templates/admin.hbs
+++ b/app/assets/javascripts/admin/templates/admin.hbs
@@ -3,7 +3,7 @@
     <div class="full-width">
 
       <ul class="nav nav-pills">
-        {{nav-item route='admin.dashboard' label='admin.dashboard.title'}}
+        {{nav-item route='admin.dashboardNext' label='admin.dashboard.title'}}
         {{#if currentUser.admin}}
           {{nav-item route='adminSiteSettings' label='admin.site_settings.title'}}
         {{/if}}
@@ -12,7 +12,6 @@
           {{nav-item route='adminBadges' label='admin.badges.title'}}
         {{/if}}
         {{#if currentUser.admin}}
-          {{nav-item route='adminGroups' label='admin.groups.title'}}
           {{nav-item route='adminEmail' label='admin.email.title'}}
         {{/if}}
         {{nav-item route='adminFlags' label='admin.flags.title'}}
@@ -25,7 +24,7 @@
           {{/if}}
         {{/if}}
         {{nav-item route='adminPlugins' label='admin.plugins.title'}}
-        {{plugin-outlet name="admin-menu" connectorTagName="li"}}
+        {{plugin-outlet name="admin-menu" connectorTagName="" tagName=""}}
       </ul>
 
       <div class='boxed white admin-content'>
diff --git a/app/assets/javascripts/admin/templates/backups.hbs b/app/assets/javascripts/admin/templates/backups.hbs
index 5cfd1231144..33229e22534 100644
--- a/app/assets/javascripts/admin/templates/backups.hbs
+++ b/app/assets/javascripts/admin/templates/backups.hbs
@@ -1,12 +1,12 @@
 <div class='admin-backups'>
   <div class="admin-controls">
-    <div class="span15">
+    <nav>
       <ul class="nav nav-pills">
         {{nav-item route='admin.backups.index' label='admin.backups.menu.backups'}}
         {{nav-item route='admin.backups.logs' label='admin.backups.menu.logs'}}
         {{plugin-outlet name="downloader" tagName=""}}
       </ul>
-    </div>
+    </nav>
     <div class="pull-right">
       {{#if model.canRollback}}
         {{d-button action="rollback"
diff --git a/app/assets/javascripts/admin/templates/badges-index.hbs b/app/assets/javascripts/admin/templates/badges-index.hbs
index 674eae8de29..4a71e7d69a0 100644
--- a/app/assets/javascripts/admin/templates/badges-index.hbs
+++ b/app/assets/javascripts/admin/templates/badges-index.hbs
@@ -1,4 +1,4 @@
-{{#d-section class="current-badge span13"}}
+{{#d-section class="current-badge content-body"}}
   <p>{{i18n 'admin.badges.none_selected'}}</p>
 
   <div>
diff --git a/app/assets/javascripts/admin/templates/badges-show.hbs b/app/assets/javascripts/admin/templates/badges-show.hbs
index 94239f9d03c..7436c48898f 100644
--- a/app/assets/javascripts/admin/templates/badges-show.hbs
+++ b/app/assets/javascripts/admin/templates/badges-show.hbs
@@ -1,4 +1,4 @@
-{{#d-section class="current-badge span13"}}
+{{#d-section class="current-badge content-body"}}
   <form class="form-horizontal">
     <div>
       <label for="name">{{i18n 'admin.badges.name'}}</label>
@@ -18,7 +18,7 @@
     <div>
       <label for="image">{{i18n 'admin.badges.image'}}</label>
       {{input type="text" name="image" value=buffered.image}}
-      <p class='help'>{{i18n 'admin.badges.icon_help'}}</p>
+      <p class='help'>{{i18n 'admin.badges.image_help'}}</p>
     </div>
 
     <div>
@@ -144,7 +144,7 @@
 {{/d-section}}
 
 {{#if grant_count}}
-  <div class="span13 current-badge-actions">
+  <div class="content-body current-badge-actions">
     <div>
       {{#link-to 'badges.show' this}}{{i18n 'badges.granted' count=grant_count}}{{/link-to}}
     </div>
diff --git a/app/assets/javascripts/admin/templates/badges.hbs b/app/assets/javascripts/admin/templates/badges.hbs
index aeeaac9c9e2..b5789d4c42a 100644
--- a/app/assets/javascripts/admin/templates/badges.hbs
+++ b/app/assets/javascripts/admin/templates/badges.hbs
@@ -1,6 +1,6 @@
 <div class="badges">
 
-  <div class='content-list span6'>
+  <div class='content-list'>
     <h3>{{i18n 'admin.badges.title'}}</h3>
     <ul>
       {{#each model as |badge|}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-nav.hbs b/app/assets/javascripts/admin/templates/components/admin-nav.hbs
index c5b1d3b58a7..eb705949e54 100644
--- a/app/assets/javascripts/admin/templates/components/admin-nav.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-nav.hbs
@@ -1,7 +1,7 @@
 <div class='admin-controls'>
-  <div class='span15'>
+  <nav>
     <ul class="nav nav-pills">
       {{yield}}
     </ul>
-  </div>
+  </nav>
 </div>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs b/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs
index 82fbf0d7996..d7f37040f67 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs
@@ -5,18 +5,20 @@
   <a href="{{report.reportUrl}}">{{report.title}}</a>
 </td>
 
-<td class="value">{{number report.todayCount}}</td>
+<td class="value">{{number report.todayCount ceil=true}}</td>
 
 <td class="value {{report.yesterdayTrend}}" title={{report.yesterdayCountTitle}}>
-  {{number report.yesterdayCount}} {{d-icon "caret-up" class="up"}} {{d-icon "caret-down" class="down"}}
+  {{number report.yesterdayCount ceil=true}} {{d-icon report.yesterdayTrendIcon}}
 </td>
 
-<td class="value {{report.sevenDayTrend}}" title={{report.sevenDayCountTitle}}>
-  {{number report.lastSevenDaysCount}} {{d-icon "caret-up" class="up"}} {{d-icon "caret-down" class="down"}}
+<td class="value {{report.sevenDaysTrend}}" title={{report.sevenDaysCountTitle}}>
+  {{number report.lastSevenDaysCount ceil=true}} {{d-icon report.sevenDaysTrendIcon}}
 </td>
 
-<td class="value {{report.thirtyDayTrend}}" title={{report.thirtyDayCountTitle}}>
-  {{number report.lastThirtyDaysCount}} {{d-icon "caret-up" class="up"}} {{d-icon "caret-down" class="down"}}
+<td class="value {{report.thirtyDaysTrend}}" title={{report.thirtyDaysCountTitle}}>
+  {{number report.lastThirtyDaysCount ceil=true}} {{d-icon report.thirtyDaysTrendIcon}}
 </td>
 
-<td class="value">{{number report.total}}</td>
+{{#if allTime}}
+  <td class="value">{{number report.total}}</td>
+{{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-table-report.hbs b/app/assets/javascripts/admin/templates/components/admin-table-report.hbs
new file mode 100644
index 00000000000..53ea2e51c6e
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/admin-table-report.hbs
@@ -0,0 +1,17 @@
+{{#if model.sortedData}}
+  <table class="table report {{model.type}}">
+    <tr>
+      <th>{{model.xaxis}}</th>
+      <th>{{model.yaxis}}</th>
+    </tr>
+
+    {{#each model.sortedData as |row|}}
+      <tr>
+        <td class="x-value">{{row.x}}</td>
+        <td>
+          {{row.y}}
+        </td>
+      </tr>
+    {{/each}}
+  </table>
+{{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
index 419ef0b69cf..99f1de8ce24 100644
--- a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
@@ -4,11 +4,11 @@
   {{/admin-form-row}}
 
   {{#admin-form-row label="admin.user_fields.name"}}
-    {{input value=buffered.name class="user-field-name"}}
+    {{input value=buffered.name class="user-field-name" maxlength="255"}}
   {{/admin-form-row}}
 
   {{#admin-form-row label="admin.user_fields.description"}}
-    {{input value=buffered.description class="user-field-desc"}}
+    {{input value=buffered.description class="user-field-desc" maxlength="255"}}
   {{/admin-form-row}}
 
   {{#if bufferedFieldType.hasOptions}}
diff --git a/app/assets/javascripts/admin/templates/components/dashboard-inline-table.hbs b/app/assets/javascripts/admin/templates/components/dashboard-inline-table.hbs
new file mode 100644
index 00000000000..9e976f46d26
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/dashboard-inline-table.hbs
@@ -0,0 +1,27 @@
+{{#conditional-loading-section isLoading=isLoading}}
+  <div class="table-title">
+    <h3>{{title}}</h3>
+  </div>
+
+  {{#each reportsForPeriod as |report|}}
+    <div class="table-container">
+      {{#unless hasBlock}}
+        {{#each report.data as |data|}}
+          <a class="table-cell user-{{data.key}}" href="{{data.url}}">
+            <span class="label">
+              {{#if data.icon}}
+                {{d-icon data.icon}}
+              {{/if}}
+              {{data.x}}
+            </span>
+            <span class="value">
+                {{number data.y}}
+            </span>
+          </a>
+        {{/each}}
+      {{else}}
+        {{yield (hash report=report)}}
+      {{/unless}}
+    </div>
+  {{/each}}
+{{/conditional-loading-section}}
diff --git a/app/assets/javascripts/admin/templates/components/dashboard-mini-chart.hbs b/app/assets/javascripts/admin/templates/components/dashboard-mini-chart.hbs
new file mode 100644
index 00000000000..62e956cd8ca
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/dashboard-mini-chart.hbs
@@ -0,0 +1,33 @@
+{{#conditional-loading-section isLoading=isLoading}}
+  {{#each reportsForPeriod as |report|}}
+    <div class="status">
+      <h4 class="title">
+        <a href="{{report.reportUrl}}">
+          {{report.title}}
+        </a>
+
+        <span class="info" data-tooltip="{{report.description}}">
+          {{d-icon "question-circle"}}
+        </span>
+      </h4>
+
+      <div class="trend {{report.trend}}">
+        <span class="trend-value" title="{{report.trendTitle}}">
+          {{#if report.average}}
+            {{number report.currentAverage ceil=true}}{{#if report.percent}}%{{/if}}
+          {{else}}
+            {{number report.currentTotal ceil=true noTitle="true"}}{{#if report.percent}}%{{/if}}
+          {{/if}}
+        </span>
+
+        {{#if report.trendIcon}}
+          {{d-icon report.trendIcon class="trend-icon"}}
+        {{/if}}
+      </div>
+    </div>
+  {{/each}}
+
+  <div class="chart-canvas-container">
+    <canvas class="chart-canvas"></canvas>
+  </div>
+{{/conditional-loading-section}}
diff --git a/app/assets/javascripts/admin/templates/components/dashboard-table.hbs b/app/assets/javascripts/admin/templates/components/dashboard-table.hbs
new file mode 100644
index 00000000000..29ab8332cb7
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/dashboard-table.hbs
@@ -0,0 +1,36 @@
+{{#conditional-loading-section isLoading=isLoading}}
+  <div class="table-title">
+    <h3>{{title}}</h3>
+  </div>
+
+  {{#each reportsForPeriod as |report|}}
+    <div class="table-container">
+      <table>
+        <thead>
+          <tr>
+            {{#if report.labels}}
+              {{#each report.labels as |label|}}
+                <th>{{label}}</th>
+              {{/each}}
+            {{else}}
+              {{#each report.data as |data|}}
+                <th>{{data.x}}</th>
+              {{/each}}
+            {{/if}}
+          </tr>
+        </thead>
+        <tbody>
+          {{#unless hasBlock}}
+            {{#each report.data as |data|}}
+              <tr>
+                <td>{{number data.y}}</td>
+              </tr>
+            {{/each}}
+          {{else}}
+            {{yield (hash report=report)}}
+          {{/unless}}
+        </tbody>
+      </table>
+    </div>
+  {{/each}}
+{{/conditional-loading-section}}
diff --git a/app/assets/javascripts/admin/templates/components/flag-user-lists.hbs b/app/assets/javascripts/admin/templates/components/flag-user-lists.hbs
new file mode 100644
index 00000000000..7c793b98bcf
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/flag-user-lists.hbs
@@ -0,0 +1,32 @@
+<div class='flagged-by'>
+  <div class='user-list-title'>
+    {{i18n "admin.flags.flagged_by"}}
+  </div>
+  <div class='flag-users'>
+    {{#each flaggedPost.post_actions as |postAction|}}
+      {{#flag-user user=postAction.user date=postAction.created_at}}
+        <div class='flagger-flag-type'>
+          {{post-action-title postAction.post_action_type_id postAction.name_key}}
+        </div>
+      {{/flag-user}}
+    {{/each}}
+  </div>
+</div>
+
+{{#if showResolvedBy}}
+  <div class='flagged-post-resolved-by'>
+    <div class='user-list-title'>
+      {{i18n "admin.flags.resolved_by"}}
+    </div>
+    <div class='flag-users'>
+      {{#each flaggedPost.post_actions as |postAction|}}
+        {{#flag-user user=postAction.disposed_by date=postAction.disposed_at}}
+          {{disposition-icon postAction.disposition}}
+          {{#if postAction.staff_took_action}}
+            {{d-icon "gavel" title="admin.flags.took_action"}}
+          {{/if}}
+        {{/flag-user}}
+      {{/each}}
+    </div>
+  </div>
+{{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/flagged-post-title.hbs b/app/assets/javascripts/admin/templates/components/flagged-post-title.hbs
new file mode 100644
index 00000000000..0871c5c6f1d
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/flagged-post-title.hbs
@@ -0,0 +1,8 @@
+{{#if flaggedPost.topic.isPrivateMessage}}
+  <span class="private-message-glyph">{{d-icon "envelope"}}</span>
+{{/if}}
+{{topic-status topic=flaggedPost.topic}}
+<a href='{{unbound flaggedPost.url}}'>{{{unbound flaggedPost.topic.fancyTitle}}}</a>
+{{#if flaggedPost.reply_count}}
+  <span class="flagged-post-reply-count">{{i18n 'admin.flags.replies' count=flaggedPost.reply_count}}</span>
+{{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/flagged-post.hbs b/app/assets/javascripts/admin/templates/components/flagged-post.hbs
index 2b7f03940fc..37631f1442f 100644
--- a/app/assets/javascripts/admin/templates/components/flagged-post.hbs
+++ b/app/assets/javascripts/admin/templates/components/flagged-post.hbs
@@ -22,17 +22,15 @@
   <div class="flagged-post-contents">
     <div class='flagged-post-user-details'>
       <a class='username' href={{user.path}} data-user-card={{flaggedPost.user.username}}>{{format-username flaggedPost.user.username}}</a>
+      {{plugin-outlet
+        name="flagged-post-controls"
+        tagName=""
+        args=(hash flaggedPost=flaggedPost actableFilter=actableFilter topic=topic)}}
     </div>
 
     <div class='flagged-post-excerpt'>
       {{#unless hideTitle}}
-        <h3>
-          {{#if flaggedPost.topic.isPrivateMessage}}
-            <span class="private-message-glyph">{{d-icon "envelope"}}</span>
-          {{/if}}
-          {{topic-status topic=flaggedPost.topic}}
-          <a href='{{unbound flaggedPost.url}}'>{{{unbound flaggedPost.topic.fancyTitle}}}</a>
-        </h3>
+        {{flagged-post-title flaggedPost=flaggedPost}}
       {{/unless}}
       {{#if flaggedPost.postAuthorFlagged}}
         {{#if expanded}}
@@ -68,46 +66,7 @@
       </div>
     {{/each}}
 
-    <div class='flag-user-lists'>
-      <div class='flagged-by'>
-        <div class='user-list-title'>
-          {{i18n "admin.flags.flagged_by"}}
-        </div>
-        <div class='flag-users'>
-          {{#each flaggedPost.post_actions as |postAction|}}
-            {{#flag-user user=postAction.user date=postAction.created_at}}
-              <div class='flagger-flag-type'>
-                {{post-action-title postAction.post_action_type_id postAction.name_key}}
-              </div>
-            {{/flag-user}}
-          {{/each}}
-        </div>
-      </div>
-
-      {{#if showResolvedBy}}
-        <div class='flagged-post-resolved-by'>
-          <div class='user-list-title'>
-            {{i18n "admin.flags.resolved_by"}}
-          </div>
-          <div class='flag-users'>
-            {{#each flaggedPost.post_actions as |postAction|}}
-              {{#flag-user user=postAction.disposed_by date=postAction.disposed_at}}
-                {{disposition-icon postAction.disposition}}
-                {{#if postAction.staff_took_action}}
-                  {{d-icon "gavel" title="admin.flags.took_action"}}
-                {{/if}}
-              {{/flag-user}}
-            {{/each}}
-          </div>
-        </div>
-      {{/if}}
-    </div>
-
-    {{#if suspended}}
-      <div class='suspended-message'>
-        The user was suspended for this post.
-      </div>
-    {{/if}}
+    {{flag-user-lists flaggedPost=flaggedPost showResolvedBy=showResolvedBy}}
 
     <div class='flagged-post-controls'>
       {{#if canAct}}
@@ -133,21 +92,14 @@
 
         {{d-button
           class="defer-flag"
-          title="admin.flags.defer_flag_title"
+          title="admin.flags.ignore_flag_title"
           action="defer"
           icon="external-link"
-          label="admin.flags.defer_flag"}}
+          label="admin.flags.ignore_flag"}}
 
-        {{admin-delete-flag-dropdown post=flaggedPost removeAfter=(action "removeAfter")}}
-
-        {{#unless suspended}}
-          {{d-button
-            class="btn-danger suspend-user"
-            icon="ban"
-            label="admin.flags.suspend_user"
-            title="admin.flags.suspend_user_title"
-            action=(action "showSuspendModal")}}
-        {{/unless}}
+        {{admin-delete-flag-dropdown
+          post=flaggedPost
+          removeAfter=(action "removeAfter")}}
       {{/if}}
 
       {{d-button
@@ -158,6 +110,6 @@
     {{plugin-outlet
       name="flagged-post-below-controls"
       tagName=""
-      args=(hash flaggedPost=flaggedPost canAct=canAct)}}
+      args=(hash flaggedPost=flaggedPost canAct=canAct actableFilter=actableFilter)}}
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/components/flagged-posts.hbs b/app/assets/javascripts/admin/templates/components/flagged-posts.hbs
index a2f60c25875..5f1aab3a86e 100644
--- a/app/assets/javascripts/admin/templates/components/flagged-posts.hbs
+++ b/app/assets/javascripts/admin/templates/components/flagged-posts.hbs
@@ -5,6 +5,7 @@
         {{flagged-post
           flaggedPost=flaggedPost
           filter=filter
+          topic=topic
           showResolvedBy=showResolvedBy
           removePost=(action "removePost" flaggedPost)
           hideTitle=topic}}
diff --git a/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs b/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
new file mode 100644
index 00000000000..1c8ffe56d8e
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
@@ -0,0 +1,16 @@
+<div class='penalty-post-controls'>
+  <label>
+    <div class='penalty-post-label'>
+      {{{i18n 'admin.user.penalty_post_actions'}}}
+    </div>
+  </label>
+  {{combo-box value=postAction content=penaltyActions onSelect=(action "penaltyChanged")}}
+</div>
+
+{{#if editing}}
+  <div class='penalty-post-edit'>
+    {{textarea
+      value=postEdit
+      class="post-editor"}}
+  </div>
+{{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/silence-details.hbs b/app/assets/javascripts/admin/templates/components/silence-details.hbs
new file mode 100644
index 00000000000..3f7c19d5ba5
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/silence-details.hbs
@@ -0,0 +1,21 @@
+<div class='reason-controls'>
+  <label>
+    <div class='silence-reason-label'>
+      {{{i18n 'admin.user.silence_reason_label'}}}
+    </div>
+    </label>
+    {{text-field
+      value=reason
+      class="silence-reason"
+      placeholderKey="admin.user.silence_reason_placeholder"}}
+</div>
+
+<label>
+  <div class='silence-message-label'>
+    {{i18n "admin.user.silence_message"}}
+  </div>
+</label>
+{{textarea
+  value=message
+  class="silence-message"
+  placeholder=(i18n "admin.user.silence_message_placeholder")}}
diff --git a/app/assets/javascripts/admin/templates/components/site-setting.hbs b/app/assets/javascripts/admin/templates/components/site-setting.hbs
index 7fd80e44462..e91922f7a77 100644
--- a/app/assets/javascripts/admin/templates/components/site-setting.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-setting.hbs
@@ -10,5 +10,5 @@
     {{d-button class="cancel" action="cancel" icon="times"}}
   </div>
 {{else if setting.overridden}}
-  {{d-button action="resetDefault" icon="undo" label="admin.site_settings.reset"}}
+  {{d-button action="resetDefault" icon="undo" label="admin.settings.reset"}}
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/category.hbs b/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
new file mode 100644
index 00000000000..e3ab41137c1
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
@@ -0,0 +1,3 @@
+{{category-chooser value=value allowUncategorized="true"}}
+{{setting-validation-message message=validationMessage}}
+<div class='desc'>{{{unbound setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/suspension-details.hbs b/app/assets/javascripts/admin/templates/components/suspension-details.hbs
new file mode 100644
index 00000000000..0f2aa0fc848
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/suspension-details.hbs
@@ -0,0 +1,25 @@
+<div class='reason-controls'>
+  <label>
+    <div class='suspend-reason-label'>
+      {{#if siteSettings.hide_suspension_reasons}}
+        {{{i18n 'admin.user.suspend_reason_hidden_label'}}}
+      {{else}}
+        {{{i18n 'admin.user.suspend_reason_label'}}}
+      {{/if}}
+    </div>
+  </label>
+  {{text-field
+    value=reason
+    class="suspend-reason"
+    placeholderKey="admin.user.suspend_reason_placeholder"}}
+</div>
+
+<label>
+  <div class='suspend-message-label'>
+    {{i18n "admin.user.suspend_message"}}
+  </div>
+</label>
+{{textarea
+  value=message
+  class="suspend-message"
+  placeholder=(i18n "admin.user.suspend_message_placeholder")}}
diff --git a/app/assets/javascripts/admin/templates/components/watched-word-form.hbs b/app/assets/javascripts/admin/templates/components/watched-word-form.hbs
index 7d2b460aa07..e4b2fab801f 100644
--- a/app/assets/javascripts/admin/templates/components/watched-word-form.hbs
+++ b/app/assets/javascripts/admin/templates/components/watched-word-form.hbs
@@ -2,6 +2,6 @@
 {{text-field value=word disabled=formSubmitted class="watched-word-input" autocorrect="off" autocapitalize="off" placeholderKey=placeholderKey}}
 {{d-button action="submit" disabled=formSubmitted label="admin.watched_words.form.add"}}
 
-{{#if showSuccessMessage}}
-  <span class="success-message">{{i18n 'admin.watched_words.form.success'}}</span>
+{{#if showMessage}}
+  <span class="success-message">{{message}}</span>
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/customize-colors-show.hbs b/app/assets/javascripts/admin/templates/customize-colors-show.hbs
index e688e133166..08cbef2ddc6 100644
--- a/app/assets/javascripts/admin/templates/customize-colors-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-colors-show.hbs
@@ -22,7 +22,7 @@
       <div class='search controls'>
         <label>
           {{input type="checkbox" checked=onlyOverridden}}
-          {{i18n 'admin.site_settings.show_overriden'}}
+          {{i18n 'admin.settings.show_overriden'}}
         </label>
       </div>
     </div>
diff --git a/app/assets/javascripts/admin/templates/customize-colors.hbs b/app/assets/javascripts/admin/templates/customize-colors.hbs
index 920f6f19540..761996b6cb9 100644
--- a/app/assets/javascripts/admin/templates/customize-colors.hbs
+++ b/app/assets/javascripts/admin/templates/customize-colors.hbs
@@ -1,4 +1,4 @@
-<div class='content-list span6 color-schemes'>
+<div class='content-list color-schemes'>
   <h3>{{i18n 'admin.customize.colors.long_title'}}</h3>
   <ul>
     {{#each model as |scheme|}}
diff --git a/app/assets/javascripts/admin/templates/customize-email-templates.hbs b/app/assets/javascripts/admin/templates/customize-email-templates.hbs
index 152c02e44a2..7dd95b092f5 100644
--- a/app/assets/javascripts/admin/templates/customize-email-templates.hbs
+++ b/app/assets/javascripts/admin/templates/customize-email-templates.hbs
@@ -1,5 +1,5 @@
 <div class='row'>
-  <div class='content-list span6'>
+  <div class='content-list'>
     <ul>
       {{#each sortedTemplates as |et|}}
         <li>
diff --git a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
index 83eebb83d08..c798836b767 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
@@ -3,39 +3,47 @@
     <h2>{{i18n 'admin.customize.theme.edit_css_html'}} {{#link-to 'adminCustomizeThemes.show' model.id replace=true}}{{model.name}}{{/link-to}}</h2>
 
     {{#if error}}
-    <pre class='field-error'>{{error}}</pre>
+      <pre class='field-error'>{{error}}</pre>
     {{/if}}
 
     <div class='edit-main-nav'>
       <ul class='nav nav-pills target'>
         {{#if showCommon}}
-        <li>
-          {{#link-to 'adminCustomizeThemes.edit' model.id 'common' fieldName replace=true title=field.title}}
-            {{i18n 'admin.customize.theme.common'}}
-          {{/link-to}}
-        </li>
+          <li>
+            {{#link-to 'adminCustomizeThemes.edit' model.id 'common' fieldName replace=true}}
+              {{i18n 'admin.customize.theme.common'}}
+            {{/link-to}}
+          </li>
         {{/if}}
         {{#if showDesktop}}
-        <li>
-          {{#link-to 'adminCustomizeThemes.edit' model.id 'desktop' fieldName replace=true title=field.title}}
-            {{i18n 'admin.customize.theme.desktop'}}
-            {{d-icon 'desktop'}}
-          {{/link-to}}
-        </li>
+          <li>
+            {{#link-to 'adminCustomizeThemes.edit' model.id 'desktop' fieldName replace=true}}
+              {{i18n 'admin.customize.theme.desktop'}}
+              {{d-icon 'desktop'}}
+            {{/link-to}}
+          </li>
         {{/if}}
         {{#if showMobile}}
-        <li class='mobile'>
-          {{#link-to 'adminCustomizeThemes.edit' model.id 'mobile' fieldName replace=true title=field.title}}
-            {{i18n 'admin.customize.theme.mobile'}}
-            {{d-icon 'mobile'}}
-          {{/link-to}}
-        </li>
+          <li class='mobile'>
+            {{#link-to 'adminCustomizeThemes.edit' model.id 'mobile' fieldName replace=true}}
+              {{i18n 'admin.customize.theme.mobile'}}
+              {{d-icon 'mobile'}}
+            {{/link-to}}
+          </li>
+        {{/if}}
+        {{#if showSettings}}
+          <li class='theme-settings'>
+            {{#link-to 'adminCustomizeThemes.edit' model.id 'settings' fieldName replace=true}}
+              {{i18n 'admin.customize.theme.settings'}}
+              {{d-icon 'cog'}}
+            {{/link-to}}
+          </li>
         {{/if}}
       </ul>
       <div class='show-overidden'>
         <label>
           {{input type="checkbox" checked=onlyOverridden}}
-          {{i18n 'admin.site_settings.show_overriden'}}
+          {{i18n 'admin.settings.show_overriden'}}
         </label>
       </div>
       <div class='clearfix'></div>
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index 7f339d63d74..fcd933553ca 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -50,16 +50,16 @@
 
   <h3>{{i18n "admin.customize.theme.css_html"}}</h3>
   {{#if hasEditedFields}}
-  <p>{{i18n "admin.customize.theme.custom_sections"}}</p>
-  <ul>
-  {{#each editedDescriptions as |desc|}}
-  <li>{{desc}}</li>
-  {{/each}}
-  </ul>
+    <p>{{i18n "admin.customize.theme.custom_sections"}}</p>
+    <ul>
+      {{#each editedDescriptions as |desc|}}
+        <li>{{desc}}</li>
+      {{/each}}
+    </ul>
   {{else}}
-  <p>
-  {{i18n "admin.customize.theme.edit_css_html_help"}}
-  </p>
+    <p>
+      {{i18n "admin.customize.theme.edit_css_html_help"}}
+    </p>
   {{/if}}
   <p>
     {{#if model.remote_theme}}
@@ -71,17 +71,17 @@
     {{/if}}
     {{#d-button action="editTheme" class="btn edit"}}{{i18n 'admin.customize.theme.edit_css_html'}}{{/d-button}}
     {{#if model.remote_theme}}
-    <span class='status-message'>
-      {{#if updatingRemote}}
-      {{i18n 'admin.customize.theme.updating'}}
-      {{else}}
-        {{#if model.remote_theme.commits_behind}}
-          {{i18n 'admin.customize.theme.commits_behind' count=model.remote_theme.commits_behind}}
+      <span class='status-message'>
+        {{#if updatingRemote}}
+          {{i18n 'admin.customize.theme.updating'}}
         {{else}}
-          {{i18n 'admin.customize.theme.up_to_date'}} {{format-date model.remote_theme.updated_at leaveAgo="true"}}
+          {{#if model.remote_theme.commits_behind}}
+            {{i18n 'admin.customize.theme.commits_behind' count=model.remote_theme.commits_behind}}
+          {{else}}
+            {{i18n 'admin.customize.theme.up_to_date'}} {{format-date model.remote_theme.updated_at leaveAgo="true"}}
+          {{/if}}
         {{/if}}
-      {{/if}}
-    </span>
+      </span>
     {{/if}}
   </p>
 
@@ -105,6 +105,15 @@
     {{#d-button action="addUploadModal" icon="plus"}}{{i18n "admin.customize.theme.add"}}{{/d-button}}
   </p>
 
+  {{#if hasSettings}}
+  <h3>{{i18n "admin.customize.theme.theme_settings"}}</h3>
+  {{#d-section class="form-horizontal theme settings"}}
+    {{#each settings as |setting|}}
+      {{theme-setting setting=setting model=model class="theme-setting"}}
+    {{/each}}
+  {{/d-section}}
+  {{/if}}
+
   {{#if availableChildThemes}}
     <h3>{{i18n "admin.customize.theme.theme_components"}}</h3>
     {{#unless model.childThemes.length}}
diff --git a/app/assets/javascripts/admin/templates/customize-themes.hbs b/app/assets/javascripts/admin/templates/customize-themes.hbs
index c9474917ef6..91644922640 100644
--- a/app/assets/javascripts/admin/templates/customize-themes.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes.hbs
@@ -1,10 +1,11 @@
 {{#unless editingTheme}}
-<div class='content-list span6'>
+<div class='content-list'>
   <h3>{{i18n 'admin.customize.theme.long_title'}}</h3>
   <ul>
     {{#each sortedThemes as |theme|}}
       <li>
         {{#link-to 'adminCustomizeThemes.show' theme replace=true}}
+          {{plugin-outlet name="admin-customize-themes-list-item" connectorTagName='span' args=(hash theme=theme)}}
           {{theme.name}}
           {{#if theme.user_selectable}}
             {{d-icon "user"}}
diff --git a/app/assets/javascripts/admin/templates/dashboard-problems.hbs b/app/assets/javascripts/admin/templates/dashboard-problems.hbs
new file mode 100644
index 00000000000..94f878bc9e9
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/dashboard-problems.hbs
@@ -0,0 +1,36 @@
+{{#if foundProblems}}
+  <div class="dashboard-stats detected-problems">
+    <div class="problem-messages">
+      {{#conditional-loading-spinner condition=loadingProblems}}
+        <div>
+          <h3>
+            <span class="look-here">{{d-icon "exclamation-triangle"}}</span>
+            {{i18n 'admin.dashboard.problems_found'}}</h3>
+          <ul class="{{if loadingProblems 'invisible'}}">
+            {{#each problems as |problem|}}
+              <li>{{{problem}}}</li>
+            {{/each}}
+          </ul>
+        </div>
+        <p class="actions">
+          <small>{{i18n 'admin.dashboard.last_checked'}}: {{problemsTimestamp}}</small>
+          {{d-button action="refreshProblems" class="btn-small" icon="refresh" label="admin.dashboard.refresh_problems"}}
+        </p>
+      {{/conditional-loading-spinner}}
+    </div>
+    <div class="clearfix"></div>
+  </div>
+{{else}}
+  {{#if thereWereProblems}}
+    <div class="dashboard-stats detected-problems">
+      <div class="look-here">&nbsp;</div>
+      <div class="problem-messages">
+        <p>
+          {{i18n 'admin.dashboard.no_problems'}}
+          {{d-button action="refreshProblems" class="btn-small" icon="refresh" label="admin.dashboard.refresh_problems"}}
+        </p>
+      </div>
+      <div class="clearfix"></div>
+    </div>
+  {{/if}}
+{{/if}}
diff --git a/app/assets/javascripts/admin/templates/dashboard.hbs b/app/assets/javascripts/admin/templates/dashboard.hbs
index 6b4dc88584a..6018b64572f 100644
--- a/app/assets/javascripts/admin/templates/dashboard.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard.hbs
@@ -1,11 +1,5 @@
-{{plugin-outlet name="admin-dashboard-top"}}
-
 {{#conditional-loading-spinner condition=loading}}
   <div class="dashboard-left">
-    {{#if showVersionChecks}}
-      {{partial 'admin/templates/version-checks'}}
-    {{/if}}
-
     <div class="dashboard-stats trust-levels">
       <table class="table table-condensed table-hover">
         <thead>
@@ -174,42 +168,6 @@
   </div>
 
   <div class="dashboard-right">
-    {{#if foundProblems}}
-      <div class="dashboard-stats detected-problems">
-        <div class="look-here">{{d-icon "exclamation-triangle"}}</div>
-        <div class="problem-messages">
-          {{#conditional-loading-spinner condition=loadingProblems}}
-            <p>
-              {{i18n 'admin.dashboard.problems_found'}}
-              <ul class="{{if loadingProblems 'invisible'}}">
-                {{#each problems as |problem|}}
-                  <li>{{{problem}}}</li>
-                {{/each}}
-              </ul>
-            </p>
-            <p class="actions">
-              <small>{{i18n 'admin.dashboard.last_checked'}}: {{problemsTimestamp}}</small>
-              {{d-button action="refreshProblems" class="btn-small" icon="refresh" label="admin.dashboard.refresh_problems"}}
-            </p>
-          {{/conditional-loading-spinner}}
-        </div>
-        <div class="clearfix"></div>
-      </div>
-    {{else}}
-      {{#if thereWereProblems}}
-        <div class="dashboard-stats detected-problems">
-          <div class="look-here">&nbsp;</div>
-          <div class="problem-messages">
-            <p>
-              {{i18n 'admin.dashboard.no_problems'}}
-              {{d-button action="refreshProblems" class="btn-small" icon="refresh" label="admin.dashboard.refresh_problems"}}
-            </p>
-          </div>
-          <div class="clearfix"></div>
-        </div>
-      {{/if}}
-    {{/if}}
-
     <div class="dashboard-stats">
       <table class="table table-condensed table-hover">
         <thead>
@@ -224,7 +182,7 @@
               <td class="title">
                 <div class="referred-topic-title">
                   <div class="overflow-ellipsis">
-                    <a href="/t/{{unbound data.topic_slug}}/{{unbound data.topic_id}}">{{data.topic_title}}</a>
+                    <a href="{{unbound data.topic_url}}">{{data.topic_title}}</a>
                   </div>
                 </div>
               </td>
diff --git a/app/assets/javascripts/admin/templates/dashboard_next.hbs b/app/assets/javascripts/admin/templates/dashboard_next.hbs
new file mode 100644
index 00000000000..1608d6238ce
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/dashboard_next.hbs
@@ -0,0 +1,175 @@
+{{plugin-outlet name="admin-dashboard-top"}}
+
+<div class="section-top">
+  {{#if showVersionChecks}}
+  <div class="version-checks">
+      {{partial 'admin/templates/version-checks'}}
+      {{partial 'admin/templates/dashboard-problems'}}
+  </div>
+  {{/if}}
+  <div class='clearfix'></div>
+</div>
+
+<div class="community-health section">
+  <div class="section-title">
+    <h2>{{i18n "admin.dashboard.community_health"}}</h2>
+    {{period-chooser period=period action="changePeriod" content=availablePeriods fullDay=true}}
+  </div>
+
+  <div class="section-body">
+    <div class="charts">
+      {{dashboard-mini-chart
+        dataSourceNames="signups"
+        startDate=startDate
+        endDate=endDate}}
+
+      {{dashboard-mini-chart
+        dataSourceNames="topics"
+        startDate=startDate
+        endDate=endDate}}
+
+      {{dashboard-mini-chart
+        dataSourceNames="posts"
+        startDate=startDate
+        endDate=endDate}}
+
+      {{dashboard-mini-chart
+        dataSourceNames="dau_by_mau"
+        startDate=startDate
+        endDate=endDate}}
+
+      {{dashboard-mini-chart
+        dataSourceNames="daily_engaged_users"
+        startDate=startDate
+        endDate=endDate}}
+
+      {{dashboard-mini-chart
+        dataSourceNames="new_contributors"
+        startDate=startDate
+        endDate=endDate}}
+    </div>
+  </div>
+</div>
+
+<div class="section-columns">
+  <div class="section-column">
+    <div class="dashboard-table activity-metrics">
+      {{#conditional-loading-section isLoading=isLoading title=(i18n "admin.dashboard.activity_metrics")}}
+        <div class="table-title">
+          <h3>{{i18n "admin.dashboard.activity_metrics"}}</h3>
+        </div>
+
+        <div class="table-container">
+          <table>
+            <thead>
+              <tr>
+                <th></th>
+                <th>{{i18n 'admin.dashboard.reports.today'}}</th>
+                <th>{{i18n 'admin.dashboard.reports.yesterday'}}</th>
+                <th>{{i18n 'admin.dashboard.reports.last_7_days'}}</th>
+                <th>{{i18n 'admin.dashboard.reports.last_30_days'}}</th>
+              </tr>
+            </thead>
+            <tbody>
+              {{#each reports as |report|}}
+                {{admin-report-counts report=report allTime=false}}
+              {{/each}}
+            </tbody>
+          </table>
+        </div>
+      {{/conditional-loading-section}}
+    </div>
+    <div class="user-metrics">
+    {{dashboard-inline-table dataSourceNames="users_by_type" lastRefreshedAt=lastRefreshedAt}}
+
+    {{dashboard-inline-table dataSourceNames="users_by_trust_level" lastRefreshedAt=lastRefreshedAt}}
+    </div>
+    {{#conditional-loading-section isLoading=isLoading title=(i18n "admin.dashboard.backups")}}
+      <div class="misc">
+        <div class="durability">
+          {{#if currentUser.admin}}
+            <div class="backups">
+              <h3 class="durability-title">
+                <a href="/admin/backups">{{d-icon "archive"}} {{i18n "admin.dashboard.backups"}}</a>
+              </h3>
+              <p>
+                {{diskSpace.backups_used}} ({{i18n "admin.dashboard.space_free" size=diskSpace.backups_free}})
+                <br />
+                {{{i18n "admin.dashboard.lastest_backup" date=backupTimestamp}}}
+              </p>
+            </div>
+          {{/if}}
+
+          <div class="uploads">
+            <h3 class="durability-title">{{d-icon "upload"}} {{i18n "admin.dashboard.uploads"}}</h3>
+            <p>
+              {{diskSpace.uploads_used}} ({{i18n "admin.dashboard.space_free" size=diskSpace.uploads_free}})
+            </p>
+          </div>
+        </div>
+
+        <div class="last-dashboard-update">
+          <div>
+          <h4>{{i18n "admin.dashboard.last_updated"}} </h4>
+          <p>{{updatedTimestamp}}</p>
+             <a rel="noopener" target="_blank" href="https://meta.discourse.org/tags/release-notes" class="btn">
+          {{i18n "admin.dashboard.whats_new_in_discourse"}}
+                  </a>
+          </div>
+        </div>
+      </div>
+
+      <p>
+        {{i18n 'admin.dashboard.find_old'}} {{#link-to 'admin.dashboard'}}{{i18n "admin.dashboard.old_link"}}{{/link-to}}
+      </p>
+    {{/conditional-loading-section}}
+  </div>
+
+  <div class="section-column">
+    <div class="top-referred-topics">
+      {{#dashboard-table
+          dataSourceNames="top_referred_topics"
+          lastRefreshedAt=lastRefreshedAt
+          limit=8
+          as |context|}}
+        {{#each context.report.data as |data|}}
+          <tr>
+            <td class='left'>
+              <a href="{{data.topic_url}}">
+                {{data.topic_title}}
+              </a>
+            </td>
+            <td>
+              {{data.num_clicks}}
+            </td>
+          </tr>
+        {{/each}}
+      {{/dashboard-table}}
+    </div>
+
+    <div class="trending-search">
+      {{#dashboard-table
+        limit=8
+        dataSourceNames="trending_search"
+        isEnabled=logSearchQueriesEnabled
+        disabledLabel="admin.dashboard.reports.trending_search.disabled"
+        startDate=lastWeek
+        endDate=endDate as |context|}}
+        {{#each context.report.data as |data|}}
+          <tr>
+            <td class='left'>
+              {{data.term}}
+            </td>
+            <td>
+              {{number data.unique_searches}}
+            </td>
+            <td>
+              {{data.ctr}}
+            </td>
+          </tr>
+        {{/each}}
+      {{/dashboard-table}}
+      {{{i18n "admin.dashboard.reports.trending_search.more"}}}
+    </div>
+  </div>
+</div>
diff --git a/app/assets/javascripts/admin/templates/email-index.hbs b/app/assets/javascripts/admin/templates/email-index.hbs
index 7fc5ce5d838..80b3d5d062d 100644
--- a/app/assets/javascripts/admin/templates/email-index.hbs
+++ b/app/assets/javascripts/admin/templates/email-index.hbs
@@ -19,7 +19,7 @@
   <div class='controls'>
     {{text-field value=testEmailAddress placeholderKey="admin.email.test_email_address"}}
   </div>
-  <div class='span10 controls'>
+  <div class='controls'>
     <button class='btn btn-primary' {{action "sendTestEmail"}} disabled={{sendTestEmailDisabled}}>{{i18n 'admin.email.send_test'}}</button>
     {{#if sentTestEmail}}<span class='result-message'>{{i18n 'admin.email.sent_test'}}</span>{{/if}}
   </div>
diff --git a/app/assets/javascripts/admin/templates/emojis.hbs b/app/assets/javascripts/admin/templates/emojis.hbs
index 675e8249be0..4cf568fd450 100644
--- a/app/assets/javascripts/admin/templates/emojis.hbs
+++ b/app/assets/javascripts/admin/templates/emojis.hbs
@@ -6,7 +6,7 @@
   <p>{{emoji-uploader done="emojiUploaded"}}</p>
 
   {{#if sortedEmojis}}
-    <div class="span8">
+    <div>
       <table id="custom_emoji">
         <thead>
           <tr>
diff --git a/app/assets/javascripts/admin/templates/flags-topics-index.hbs b/app/assets/javascripts/admin/templates/flags-topics-index.hbs
index b5a7eca133e..5ece61b6b72 100644
--- a/app/assets/javascripts/admin/templates/flags-topics-index.hbs
+++ b/app/assets/javascripts/admin/templates/flags-topics-index.hbs
@@ -1,46 +1,50 @@
 {{plugin-outlet name="flagged-topics-before" noTags=true args=(hash flaggedTopics=flaggedTopics)}}
 
-<table class='flagged-topics'>
-  <thead>
-    {{plugin-outlet name="flagged-topic-header-row" noTags=true}}
-    <th>{{i18n "admin.flags.flagged_topics.topic"}} </th>
-    <th>{{i18n "admin.flags.flagged_topics.type"}}</th>
-    <th>{{I18n "admin.flags.flagged_topics.users"}}</th>
-    <th>{{i18n "admin.flags.flagged_topics.last_flagged"}}</th>
-    <th></th>
-  </thead>
+{{#if flaggedTopics}}
+  <table class='flagged-topics'>
+    <thead>
+      {{plugin-outlet name="flagged-topic-header-row" noTags=true}}
+      <th>{{i18n "admin.flags.flagged_topics.topic"}} </th>
+      <th>{{i18n "admin.flags.flagged_topics.type"}}</th>
+      <th>{{I18n "admin.flags.flagged_topics.users"}}</th>
+      <th>{{i18n "admin.flags.flagged_topics.last_flagged"}}</th>
+      <th></th>
+    </thead>
 
-  {{#each flaggedTopics as |ft|}}
-    <tr class='flagged-topic'>
-      {{plugin-outlet name="flagged-topic-row" noTags=true args=(hash topic=ft.topic)}}
+    {{#each flaggedTopics as |ft|}}
+      <tr class='flagged-topic'>
+        {{plugin-outlet name="flagged-topic-row" noTags=true args=(hash topic=ft.topic)}}
 
-      <td class="topic-title">
-        <a href={{ft.topic.relative_url}} target="_blank">{{replace-emoji ft.topic.fancy_title}}</a>
-      </td>
-      <td>
-        {{#each ft.flag_counts as |fc|}}
-          <div class='flag-counts'>
-            <span class='type-name'>{{post-action-title fc.post_action_type_id fc.name_key}}</span>
-            <span class='type-count'>x{{fc.count}}</span>
-          </div>
-        {{/each}}
-      </td>
-      <td class='flagged-topic-users'>
-        {{flagged-topic-users users=ft.users tagName=""}}
-      </td>
-      <td>
-        {{format-age ft.last_flag_at}}
-      </td>
-      <td>
-        {{#link-to
-          "adminFlags.topics.show"
-          ft.id
-          class="btn d-button no-text btn-small btn-primary show-details"
-          title=(i18n "admin.flags.show_details")}}
-          {{d-icon "list"}}
-          {{i18n "admin.flags.details"}}
-        {{/link-to}}
-      </td>
-    </tr>
-  {{/each}}
-</table>
+        <td class="topic-title">
+          <a href={{ft.topic.relative_url}} target="_blank">{{replace-emoji ft.topic.fancy_title}}</a>
+        </td>
+        <td>
+          {{#each ft.flag_counts as |fc|}}
+            <div class='flag-counts'>
+              <span class='type-name'>{{post-action-title fc.post_action_type_id fc.name_key}}</span>
+              <span class='type-count'>x{{fc.count}}</span>
+            </div>
+          {{/each}}
+        </td>
+        <td class='flagged-topic-users'>
+          {{flagged-topic-users users=ft.users tagName=""}}
+        </td>
+        <td>
+          {{format-age ft.last_flag_at}}
+        </td>
+        <td>
+          {{#link-to
+            "adminFlags.topics.show"
+            ft.id
+            class="btn d-button no-text btn-small btn-primary show-details"
+            title=(i18n "admin.flags.show_details")}}
+            {{d-icon "list"}}
+            {{i18n "admin.flags.details"}}
+          {{/link-to}}
+        </td>
+      </tr>
+    {{/each}}
+  </table>
+{{else}}
+  {{i18n "admin.flags.flagged_topics.no_results"}}
+{{/if}}
diff --git a/app/assets/javascripts/admin/templates/group.hbs b/app/assets/javascripts/admin/templates/group.hbs
deleted file mode 100644
index 0689bd30ce1..00000000000
--- a/app/assets/javascripts/admin/templates/group.hbs
+++ /dev/null
@@ -1,173 +0,0 @@
-<form class="form-horizontal">
-
-  <div>
-    {{#if model.automatic}}
-      <h3>{{model.name}}</h3>
-    {{else}}
-      <label for="name">{{i18n 'groups.name'}}</label>
-      {{text-field name="name" value=model.name placeholderKey="groups.name_placeholder"}}
-    {{/if}}
-  </div>
-
-  {{#unless model.automatic}}
-    <div>
-      <label for='full_name'>{{i18n 'groups.edit.full_name'}}</label>
-      {{input type='text' name='full_name' value=model.full_name class='group-edit-full-name'}}
-    </div>
-
-    <div>
-      <label for="bio">{{i18n 'groups.bio'}}</label>
-      {{d-editor value=model.bio_raw}}
-    </div>
-
-    {{#if model.hasOwners}}
-      <div>
-        <label for='owner-list'>{{i18n 'admin.groups.group_owners'}}</label>
-        <div class="ac-wrap clearfix" id='owner-list'>
-          {{#each model.owners as |member|}}
-            {{group-member member=member removeAction="removeOwner"}}
-          {{/each}}
-        </div>
-      </div>
-    {{/if}}
-
-    <div>
-      <label for="owner-selector">{{i18n 'admin.groups.add_owners'}}</label>
-
-      {{user-selector usernames=model.ownerUsernames
-          placeholderKey="admin.groups.selector_placeholder"
-          id="owner-selector"}}
-
-      {{#if model.id}}
-        {{d-button
-            action="addOwners"
-            class="add"
-            icon="plus"
-            label="admin.groups.add"}}
-      {{/if}}
-    </div>
-  {{/unless}}
-
-  <div>
-    {{group-members-input model=model addButton=model.id}}
-  </div>
-
-  <div>
-    <label for="visiblity">{{i18n 'groups.visibility_levels.title'}}</label>
-    {{combo-box name="alias"
-        valueAttribute="value"
-        value=model.visibility_level
-        content=visibilityLevelOptions
-        castInteger=true}}
-  </div>
-
-  {{#unless model.automatic}}
-    <div>
-      <label>
-        {{input type="checkbox"
-            checked=model.public_admission
-            disabled=disablePublicSetting}}
-
-        {{i18n 'groups.public_admission'}}
-      </label>
-    </div>
-
-    <div>
-      <label>
-        {{input type='checkbox'
-            checked=model.public_exit}}
-
-        {{i18n 'groups.public_exit'}}
-      </label>
-    </div>
-
-    <div>
-      <label>
-        {{input type="checkbox"
-            checked=model.allow_membership_requests
-            disabled=disableMembershipRequestSetting}}
-
-        {{i18n 'groups.allow_membership_requests'}}
-      </label>
-    </div>
-
-    {{#if model.allow_membership_requests}}
-      <div>
-        <label for="membership-request-template">
-          {{i18n 'groups.membership_request_template'}}
-        </label>
-
-        {{expanding-text-area name="membership-request-template"
-            value=model.membership_request_template}}
-      </div>
-    {{/if}}
-
-    <div>
-      <label>
-        {{input type="checkbox" checked=model.primary_group}}
-        {{i18n 'admin.groups.primary_group'}}
-      </label>
-    </div>
-  {{/unless}}
-
-  <div>
-    <label for="alias">{{i18n 'groups.alias_levels.mentionable'}}</label>
-    {{combo-box name="alias" valueAttribute="value" value=model.mentionable_level content=aliasLevelOptions}}
-  </div>
-
-  <div>
-    <label for="alias">{{i18n 'groups.alias_levels.messageable'}}</label>
-    {{combo-box name="alias" valueAttribute="value" value=model.messageable_level content=aliasLevelOptions}}
-  </div>
-
-  <div>
-    <label>{{i18n 'groups.notification_level'}}</label>
-    {{notifications-button i18nPrefix='groups.notifications' value=model.default_notification_level}}
-    <div class='clearfix'></div>
-  </div>
-
-  {{#unless model.automatic}}
-    <div>
-      <label for="automatic_membership">{{i18n 'admin.groups.automatic_membership_email_domains'}}</label>
-      {{list-setting name="automatic_membership" settingValue=model.emailDomains}}
-      <label>
-        {{input type="checkbox" checked=model.automatic_membership_retroactive}}
-        {{i18n 'admin.groups.automatic_membership_retroactive'}}
-      </label>
-    </div>
-
-    <div>
-      <label for="title">
-        {{i18n 'admin.groups.default_title'}}
-      </label>
-        {{input value=model.title}}
-    </div>
-
-    <div>
-      <label for="grant_trust_level">{{i18n 'groups.trust_levels.title'}}</label>
-      {{combo-box name="grant_trust_level" valueAttribute="value" value=model.grant_trust_level content=trustLevelOptions}}
-    </div>
-
-    {{#if siteSettings.email_in}}
-        <label for="incoming_email">{{i18n 'admin.groups.incoming_email'}}</label>
-        {{text-field name="incoming_email" value=model.incoming_email placeholderKey="admin.groups.incoming_email_placeholder"}}
-      {{plugin-outlet name="group-email-in" args=(hash model=model)}}
-    {{/if}}
-  {{/unless}}
-
-  {{#unless model.automatic}}
-    {{group-flair-inputs model=model}}
-  {{/unless}}
-
-  {{plugin-outlet name="group-edit" args=(hash group=model)}}
-
-  <div class='buttons'>
-    <button {{action "save"}} disabled={{disableSave}} class='btn btn-primary'>{{i18n 'admin.customize.save'}}</button>
-    {{#unless model.automatic}}
-      <button {{action "destroy"}} class='btn btn-danger'>{{d-icon "trash-o"}}{{i18n 'admin.customize.delete'}}</button>
-    {{/unless}}
-
-    <span class="saving {{unless savingStatus 'hidden'}}">{{savingStatus}}</span>
-  </div>
-
-</form>
diff --git a/app/assets/javascripts/admin/templates/groups-bulk-complete.hbs b/app/assets/javascripts/admin/templates/groups-bulk-complete.hbs
deleted file mode 100644
index 6a2d8b13e5b..00000000000
--- a/app/assets/javascripts/admin/templates/groups-bulk-complete.hbs
+++ /dev/null
@@ -1,11 +0,0 @@
-{{#if bulkAddResponse}}
-  <p>{{{bulkAddResponse.message}}}</p>
-  {{#if bulkAddResponse.users_not_added}}
-    <p>{{i18n "admin.groups.bulk_complete_users_not_added"}}</p>
-    {{#each bulkAddResponse.users_not_added as |user|}}
-      {{user}}<br/>
-    {{/each}}
-  {{/if}}
-{{else}}
-  <p>{{i18n "admin.groups.bulk_complete"}}</p>
-{{/if}}
diff --git a/app/assets/javascripts/admin/templates/groups-bulk.hbs b/app/assets/javascripts/admin/templates/groups-bulk.hbs
deleted file mode 100644
index 337ab37cb3e..00000000000
--- a/app/assets/javascripts/admin/templates/groups-bulk.hbs
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class='groups-bulk'>
-  <p>{{i18n "admin.groups.bulk_paste"}}</p>
-
-  <div class='control'>
-    {{textarea value=users class="paste-users"}}
-  </div>
-
-  <div class='control'>
-    {{combo-box filterable=true content=groups value=groupId none="admin.groups.bulk_select"}}
-  </div>
-
-  <div class='control'>
-    {{d-button disabled=buttonDisabled
-               class="btn-primary"
-               action="addToGroup"
-               icon="plus"
-               label="admin.groups.bulk"}}
-  </div>
-</div>
diff --git a/app/assets/javascripts/admin/templates/groups-type-index.hbs b/app/assets/javascripts/admin/templates/groups-type-index.hbs
deleted file mode 100644
index 196ded96d2e..00000000000
--- a/app/assets/javascripts/admin/templates/groups-type-index.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="groups-type-index">
-  <p>{{i18n messageKey}}</p>
-
-  <div>
-    {{#link-to 'adminGroup' 'new' class="btn"}}
-      {{d-icon "plus"}} {{i18n 'admin.groups.new'}}
-    {{/link-to}}
-  </div>
-</div>
diff --git a/app/assets/javascripts/admin/templates/groups-type.hbs b/app/assets/javascripts/admin/templates/groups-type.hbs
deleted file mode 100644
index a1fa8298970..00000000000
--- a/app/assets/javascripts/admin/templates/groups-type.hbs
+++ /dev/null
@@ -1,31 +0,0 @@
-<div class='row groups'>
-  {{#if sortedGroups}}
-    <div class='content-list span6'>
-      <h3>{{i18n 'admin.groups.edit'}}</h3>
-      <ul>
-        {{#each sortedGroups as |group|}}
-          <li>
-            {{#link-to "adminGroup" group.type group.name}}{{group.name}}
-              {{#if group.userCountDisplay}}
-                <span class="count">{{number group.userCountDisplay}}</span>
-              {{/if}}
-            {{/link-to}}
-          </li>
-        {{/each}}
-      </ul>
-      <div class='controls'>
-        {{#if isAuto}}
-          {{d-button action="refreshAutoGroups" icon="refresh" label="admin.groups.refresh" disabled=refreshingAutoGroups}}
-        {{else}}
-          {{#link-to 'adminGroup' 'new' class="btn"}}
-            {{d-icon "plus"}} {{i18n 'admin.groups.new'}}
-          {{/link-to}}
-        {{/if}}
-      </div>
-    </div>
-  {{/if}}
-
-  <div class="span13">
-    {{outlet}}
-  </div>
-</div>
diff --git a/app/assets/javascripts/admin/templates/groups.hbs b/app/assets/javascripts/admin/templates/groups.hbs
deleted file mode 100644
index aa7d9213ca8..00000000000
--- a/app/assets/javascripts/admin/templates/groups.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-{{#admin-nav}}
-  {{nav-item route='adminGroupsType' routeParam='custom' label='admin.groups.custom'}}
-  {{nav-item route='adminGroupsType' routeParam='automatic' label='admin.groups.automatic'}}
-  {{nav-item route='adminGroups.bulk' label='admin.groups.bulk'}}
-{{/admin-nav}}
-
-<div class="admin-container">
-  {{outlet}}
-</div>
diff --git a/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
index 00e67a9aa5c..e8ee4d896dd 100644
--- a/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
@@ -58,7 +58,7 @@
             {{#unless item.editing}}
               {{d-button action="destroy" actionParam=item icon="trash-o" class="btn-danger"}}
               {{d-button action="edit" actionParam=item icon="pencil"}}
-              {{#if isBlocked}}
+              {{#if item.isBlocked}}
                 {{d-button action="allow" actionParam=item icon="check" label="admin.logs.screened_ips.actions.do_nothing"}}
               {{else}}
                 {{d-button action="block" actionParam=item icon="ban" label="admin.logs.screened_ips.actions.block"}}
diff --git a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
index 5df150c79fb..3445abf8df5 100644
--- a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
@@ -39,7 +39,7 @@
 </div>
 <div class="clearfix"></div>
 
-<div class='table staff-actions'>
+{{#staff-actions}}
   <div class="heading-container">
     <div class="col heading first staff_user">{{i18n 'admin.logs.staff_actions.staff_user'}}</div>
     <div class="col heading action">{{i18n 'admin.logs.action'}}</div>
@@ -86,4 +86,4 @@
       {{i18n 'search.no_results'}}
     {{/each}}
   {{/conditional-loading-spinner}}
-</div>
+{{/staff-actions}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs b/app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs
index 2bd1691a325..18065237a4f 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs
@@ -5,6 +5,11 @@
       <label>{{i18n 'admin.customize.theme.variable_name'}}
         {{input id="name" value=name}}<br>
       </label>
+      {{#if fileSelected}}
+        {{#if errorMessage}}
+          <span class="alert alert-error">{{errorMessage}}</span>
+        {{/if}}
+      {{/if}}
     </div>
 {{/d-modal-body}}
 
diff --git a/app/assets/javascripts/admin/templates/modal/admin-flags-received.hbs b/app/assets/javascripts/admin/templates/modal/admin-flags-received.hbs
new file mode 100644
index 00000000000..9f05993cf90
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/modal/admin-flags-received.hbs
@@ -0,0 +1,14 @@
+{{#d-modal-body rawTitle=(i18n "admin.user.flags_received_by" username=model.username)}}
+  {{#conditional-loading-spinner condition=loadingFlags}}
+    {{#each flaggedPosts as |flaggedPost|}}
+      <div class='received-flag flagged-post'>
+        <div class='flagged-post-excerpt'>
+          {{flagged-post-title flaggedPost=flaggedPost}}
+        </div>
+        {{flag-user-lists flaggedPost=flaggedPost showResolvedBy=flaggedPost.hasDisposedBy}}
+      </div>
+    {{else}}
+      {{i18n "admin.user.flags_received_none"}}
+    {{/each}}
+  {{/conditional-loading-spinner}}
+{{/d-modal-body}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-import-theme.hbs b/app/assets/javascripts/admin/templates/modal/admin-import-theme.hbs
index 19d7065db61..c00f67c941e 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-import-theme.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-import-theme.hbs
@@ -4,7 +4,7 @@
     <label class="radio" for="local">{{i18n 'upload_selector.from_my_computer'}}</label>
     {{#if local}}
       <div class="inputs">
-        <input type="file" id="file-input" accept='.dcstyle.json'><br>
+        <input type="file" id="file-input" accept='.dcstyle.json,application/json'><br>
         <span class="description">{{i18n 'admin.customize.theme.import_file_tip'}}</span>
       </div>
     {{/if}}
@@ -16,7 +16,24 @@
       <div class="inputs">
         {{input value=uploadUrl placeholder="https://github.com/discourse/discourse/sample_theme"}}
         <span class="description">{{i18n 'admin.customize.theme.import_web_tip'}}</span>
+        {{#if checkPrivate}}
+          <div class='check-private'>
+          <label>
+            {{input type="checkbox" checked=privateChecked}}
+            {{i18n 'admin.customize.theme.is_private'}}
+          </label>
+          {{#if privateChecked}}
+          {{#if publicKey}}
+          <div class='public-key'>
+            {{i18n 'admin.customize.theme.public_key'}}
+            {{textarea disabled=true value=publicKey}}
+          </div>
+          {{/if}}
+          {{/if}}
+          </div>
+        {{/if}}
       </div>
+
     {{/if}}
   </div>
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs b/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs
index 0abe77544c6..b31251a91d5 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs
@@ -11,28 +11,13 @@
       </label>
     </div>
 
-    <div class='reason-controls'>
-      <label>
-        <div class='silence-reason-label'>
-          {{{i18n 'admin.user.silence_reason_label'}}}
-        </div>
-        </label>
-        {{text-field
-          value=reason
-          class="silence-reason"
-          placeholderKey="admin.user.silence_reason_placeholder"}}
-    </div>
-
-    <label>
-      <div class='silence-message-label'>
-        {{i18n "admin.user.silence_message"}}
-      </div>
-    </label>
-    {{textarea
-      value=message
-      class="silence-message"
-      placeholder=(i18n "admin.user.silence_message_placeholder")}}
-
+    {{silence-details reason=reason message=message}}
+    {{#if post}}
+      {{penalty-post-action
+        post=post
+        postAction=postAction
+        postEdit=postEdit}}
+    {{/if}}
 
   {{/conditional-loading-spinner}}
 
@@ -47,4 +32,4 @@
     label="admin.user.silence"}}
   {{d-modal-cancel close=(action "closeModal")}}
   {{conditional-loading-spinner condition=loading size="small"}}
-</div>
\ No newline at end of file
+</div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs b/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
index fc6025a6a63..6c2e8e1636a 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
@@ -11,32 +11,15 @@
             input=suspendUntil}}
         </label>
       </div>
+      {{suspension-details reason=reason message=message}}
 
-      <div class='reason-controls'>
-        <label>
-          <div class='suspend-reason-label'>
-            {{#if siteSettings.hide_suspension_reasons}}
-              {{{i18n 'admin.user.suspend_reason_hidden_label'}}}
-            {{else}}
-              {{{i18n 'admin.user.suspend_reason_label'}}}
-            {{/if}}
-          </div>
-        </label>
-        {{text-field
-          value=reason
-          class="suspend-reason"
-          placeholderKey="admin.user.suspend_reason_placeholder"}}
-      </div>
+      {{#if post}}
+        {{penalty-post-action
+          post=post
+          postAction=postAction
+          postEdit=postEdit}}
+      {{/if}}
 
-      <label>
-        <div class='suspend-message-label'>
-          {{i18n "admin.user.suspend_message"}}
-        </div>
-      </label>
-      {{textarea
-          value=message
-          class="suspend-message"
-          placeholder=(i18n "admin.user.suspend_message_placeholder")}}
     {{else}}
       <div class='cant-suspend'>
         {{i18n "admin.user.cant_suspend"}}
diff --git a/app/assets/javascripts/admin/templates/plugins-index.hbs b/app/assets/javascripts/admin/templates/plugins-index.hbs
index b7d64f2a346..dc5405471ba 100644
--- a/app/assets/javascripts/admin/templates/plugins-index.hbs
+++ b/app/assets/javascripts/admin/templates/plugins-index.hbs
@@ -14,6 +14,7 @@
   <table class="admin-plugins">
     <thead>
       <tr>
+        <th></th>
         <th>{{i18n "admin.plugins.name"}}</th>
         <th>{{i18n "admin.plugins.version"}}</th>
         <th>{{i18n "admin.plugins.enabled"}}</th>
@@ -23,6 +24,14 @@
     <tbody>
       {{#each model as |plugin|}}
         <tr>
+          <td>
+            {{#if plugin.is_official}}
+              {{d-icon "check-circle"
+                  title="admin.plugins.official"
+                  class="admin-plugins-official-badge"}}
+            {{/if}}
+          </td>
+
           <td>
             {{#if plugin.url}}
               <a href={{plugin.url}} target="_blank">{{plugin.name}}</a>
@@ -58,4 +67,3 @@
 {{/if}}
 
 <p><a href="https://meta.discourse.org/t/install-a-plugin/19157">{{i18n "admin.plugins.howto"}}</a></p>
-
diff --git a/app/assets/javascripts/admin/templates/reports.hbs b/app/assets/javascripts/admin/templates/reports.hbs
index 3927d1e384f..26b5bfb4fe6 100644
--- a/app/assets/javascripts/admin/templates/reports.hbs
+++ b/app/assets/javascripts/admin/templates/reports.hbs
@@ -1,50 +1,52 @@
 <h3>{{model.title}}</h3>
 
-<div class="admin-reports-filter">
-  {{i18n 'admin.dashboard.reports.start_date'}} {{date-picker-past value=startDate defaultDate=startDate}}
-  {{i18n 'admin.dashboard.reports.end_date'}} {{date-picker-past value=endDate defaultDate=endDate}}
-  {{#if showCategoryOptions}}
-    {{combo-box filterable=true valueAttribute="value" content=categoryOptions value=categoryId}}
-  {{/if}}
-  {{#if showGroupOptions}}
-    {{combo-box filterable=true valueAttribute="value" content=groupOptions value=groupId}}
-  {{/if}}
-  {{d-button action="refreshReport" class="btn-primary" label="admin.dashboard.reports.refresh_report" icon="refresh"}}
-  {{d-button action="exportCsv" label="admin.export_csv.button_text" icon="download"}}
+{{#if model.description}}
+  <p>{{model.description}}</p>
+{{/if}}
+
+<div class="report-container">
+  <div class="visualization">
+    {{#conditional-loading-spinner condition=refreshing}}
+      <div class='view-options'>
+        {{#if viewingTable}}
+          {{i18n 'admin.dashboard.reports.view_table'}}
+        {{else}}
+          <a href {{action "viewAsTable"}}>{{i18n 'admin.dashboard.reports.view_table'}}</a>
+        {{/if}}
+        |
+        {{#if viewingGraph}}
+          {{i18n 'admin.dashboard.reports.view_graph'}}
+        {{else}}
+          <a href {{action "viewAsGraph"}}>{{i18n 'admin.dashboard.reports.view_graph'}}</a>
+        {{/if}}
+      </div>
+
+      {{#if viewingGraph}}
+        {{admin-graph model=model}}
+      {{else}}
+        {{admin-table-report model=model}}
+      {{/if}}
+
+      {{#if model.relatedReport}}
+        {{admin-table-report model=model.relatedReport}}
+      {{/if}}
+    {{/conditional-loading-spinner}}
+  </div>
+
+  <div class="filters">
+    <span>
+      {{i18n 'admin.dashboard.reports.start_date'}} {{date-picker-past value=startDate defaultDate=startDate}}
+    </span>
+    <span>
+      {{i18n 'admin.dashboard.reports.end_date'}} {{date-picker-past value=endDate defaultDate=endDate}}
+    </span>
+    {{#if showCategoryOptions}}
+      {{combo-box filterable=true valueAttribute="value" content=categoryOptions value=categoryId}}
+    {{/if}}
+    {{#if showGroupOptions}}
+      {{combo-box filterable=true valueAttribute="value" content=groupOptions value=groupId}}
+    {{/if}}
+    {{d-button action="refreshReport" class="btn-primary" label="admin.dashboard.reports.refresh_report" icon="refresh"}}
+    {{d-button action="exportCsv" label="admin.export_csv.button_text" icon="download"}}
+  </div>
 </div>
-
-<div class='view-options'>
-  {{#if viewingTable}}
-    {{i18n 'admin.dashboard.reports.view_table'}}
-  {{else}}
-    <a href {{action "viewAsTable"}}>{{i18n 'admin.dashboard.reports.view_table'}}</a>
-  {{/if}}
-  |
-  {{#if viewingGraph}}
-    {{i18n 'admin.dashboard.reports.view_graph'}}
-  {{else}}
-    <a href {{action "viewAsGraph"}}>{{i18n 'admin.dashboard.reports.view_graph'}}</a>
-  {{/if}}
-</div>
-
-{{#conditional-loading-spinner condition=refreshing}}
-  {{#if viewingGraph}}
-    {{admin-graph model=model}}
-  {{else}}
-  <table class='table report'>
-    <tr>
-      <th>{{model.xaxis}}</th>
-      <th>{{model.yaxis}}</th>
-    </tr>
-
-    {{#each model.dataReversed as |row|}}
-      <tr>
-        <td>{{row.x}}</td>
-        <td>
-          {{row.y}}
-        </td>
-      </tr>
-    {{/each}}
-  </table>
-  {{/if}}
-{{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/search-logs-term.hbs b/app/assets/javascripts/admin/templates/search-logs-term.hbs
index c405a86d358..5e640039c34 100644
--- a/app/assets/javascripts/admin/templates/search-logs-term.hbs
+++ b/app/assets/javascripts/admin/templates/search-logs-term.hbs
@@ -10,4 +10,53 @@
 
 {{#conditional-loading-spinner condition=refreshing}}
   {{admin-graph model=model}}
+
+  <br><br>
+  <h2> {{i18n "admin.logs.search_logs.header_search_results"}} </h2>
+  <br>
+
+  <div class='header-search-results'>
+  {{#each model.search_result.posts as |result|}}
+    <div class='fps-result'>
+      <div class='author'>
+        <a href={{result.userPath}} data-user-card="{{unbound result.username}}">
+          {{avatar result imageSize="large"}}
+        </a>
+      </div>
+
+      <div class='fps-topic'>
+        <div class='topic'>
+          <a class='search-link' href='{{unbound result.url}}'>
+            {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}}</span>
+          </a>
+
+          <div class='search-category'>
+            {{#if result.topic.category.parentCategory}}
+              {{category-link result.topic.category.parentCategory}}
+            {{/if}}
+            {{category-link result.topic.category hideParent=true}}
+            {{#each result.topic.tags as |tag|}}
+              {{discourse-tag tag}}
+            {{/each}}
+          </div>
+        </div>
+
+        <div class='blurb container'>
+          <span class='date'>
+            {{format-age result.created_at}}
+            {{#if result.blurb}}
+              -
+            {{/if}}
+          </span>
+
+          {{#if result.blurb}}
+            {{#highlight-text highlight=term}}
+              {{{unbound result.blurb}}}
+            {{/highlight-text}}
+          {{/if}}
+        </div>
+      </div>
+    </div>
+  {{/each}}
+  </div>
 {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/site-settings-category.hbs b/app/assets/javascripts/admin/templates/site-settings-category.hbs
index 2e44f80c38c..5f612419326 100644
--- a/app/assets/javascripts/admin/templates/site-settings-category.hbs
+++ b/app/assets/javascripts/admin/templates/site-settings-category.hbs
@@ -1,8 +1,11 @@
 {{#if filteredContent}}
   {{#d-section class="form-horizontal settings"}}
     {{#each filteredContent as |setting|}}
-      {{site-setting setting=setting saveAction="saveSetting"}}
+      {{site-setting setting=setting}}
     {{/each}}
+    {{#if category.hasMore}}
+      <p class="warning">{{i18n 'admin.site_settings.more_than_30_results'}}</p>
+    {{/if}}
   {{/d-section}}
 {{else}}
   <br/>
diff --git a/app/assets/javascripts/admin/templates/site-settings.hbs b/app/assets/javascripts/admin/templates/site-settings.hbs
index 4561129eb86..9f455b01e92 100644
--- a/app/assets/javascripts/admin/templates/site-settings.hbs
+++ b/app/assets/javascripts/admin/templates/site-settings.hbs
@@ -2,7 +2,7 @@
   <div class='search controls'>
     <label>
       {{input type="checkbox" checked=onlyOverridden}}
-      {{i18n 'admin.site_settings.show_overriden'}}
+      {{i18n 'admin.settings.show_overriden'}}
     </label>
   </div>
   <div class='controls'>
@@ -18,9 +18,7 @@
       <li class="{{category.nameKey}}">
         {{#link-to 'adminSiteSettingsCategory' category.nameKey class=category.nameKey}}
           {{category.name}}
-          {{#if filtered}}
-            {{#if category.count}}<span class="count">({{category.count}})</span>{{/if}}
-          {{/if}}
+          {{#if category.count}}<span class="count">({{category.count}})</span>{{/if}}
         {{/link-to}}
       </li>
     {{/each}}
diff --git a/app/assets/javascripts/admin/templates/user-badges.hbs b/app/assets/javascripts/admin/templates/user-badges.hbs
index 1f6bae617c9..52faf9b4333 100644
--- a/app/assets/javascripts/admin/templates/user-badges.hbs
+++ b/app/assets/javascripts/admin/templates/user-badges.hbs
@@ -1,16 +1,16 @@
 <div class='admin-controls'>
-  <div class='span15'>
+  <nav>
     <ul class='nav nav-pills'>
       <li>{{#link-to 'adminUser' user}}{{d-icon "caret-left"}} &nbsp;{{user.username}}{{/link-to}}</li>
     </ul>
-  </div>
+  </nav>
 </div>
 
 {{#conditional-loading-spinner condition=loading}}
   <div class='admin-container user-badges'>
     <h2>{{i18n 'admin.badges.grant_badge'}}</h2>
     <br>
-    {{#if noBadges}}
+    {{#if noGrantableBadges}}
       <p>{{i18n 'admin.badges.no_badges'}}</p>
     {{else}}
     <form class="form-horizontal">
@@ -22,7 +22,7 @@
       <label>{{i18n 'admin.badges.reason'}}</label>
       {{input type="text" value=badgeReason}}<br><small>{{i18n 'admin.badges.reason_help'}}</small>
       </label>
-      <button class='btn btn-primary' {{action "grantBadge" selectedBadgeId}}>{{i18n 'admin.badges.grant'}}</button>
+      <button class='btn btn-primary' {{action "grantBadge"}}>{{i18n 'admin.badges.grant'}}</button>
     </form>
     {{/if}}
 
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index 96f962a0b50..e36f7cd4b5c 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -6,13 +6,11 @@
         {{i18n 'admin.user.show_public_profile'}}
       {{/link-to}}
     {{/if}}
+
     {{#if model.can_view_action_logs}}
       {{d-button action="viewActionLogs" actionParam=model.username icon="list-alt" label="admin.user.action_logs"}}
     {{/if}}
     {{#if model.active}}
-      {{#if model.can_impersonate}}
-        {{d-button class="btn-danger" action="impersonate" icon="crosshairs" label="admin.impersonate.title" title="admin.impersonate.help"}}
-      {{/if}}
       {{#if currentUser.admin}}
         {{d-button action="logOut" icon="power-off" label="admin.user.log_out"}}
       {{/if}}
@@ -58,6 +56,8 @@
     </div>
   </div>
 
+  {{plugin-outlet name="admin-user-below-names" args=(hash user=model) tagName='' connectorTagName=''}}
+
   {{#if canCheckEmails}}
     <div class='display-row email'>
       <div class='field'>{{i18n 'user.email.title'}}</div>
@@ -123,7 +123,7 @@
     </div>
   </div>
 
-  <div class='display-row'>
+  <div class='display-row last-ip'>
     <div class='field'>{{i18n 'user.ip_address.title'}}</div>
     <div class='value'>{{model.ip_address}}</div>
     <div class='controls'>
@@ -134,7 +134,7 @@
     </div>
   </div>
 
-  <div class='display-row'>
+  <div class='display-row registration-ip'>
     <div class='field'>{{i18n 'user.registration_ip_address.title'}}</div>
     <div class='value'>{{model.registration_ip_address}}</div>
     <div class='controls'>
@@ -155,6 +155,22 @@
       </div>
     </div>
   {{/if}}
+
+  <div class='display-row'>
+    <div class='field'>{{i18n 'user.second_factor.title'}}</div>
+    <div class='value'>
+      {{#if model.second_factor_enabled}}
+        {{i18n "yes_value"}}
+      {{else}}
+        {{i18n "no_value"}}
+      {{/if}}
+    </div>
+    <div class='controls'>
+      {{#if canDisableSecondFactor}}
+        {{d-button action="disableSecondFactor" icon="unlock-alt" label="user.second_factor.disable"}}
+      {{/if}}
+    </div>
+  </div>
 </section>
 
 {{#if userFields}}
@@ -185,8 +201,8 @@
       <div class='value'>
         {{#if model.approved}}
           {{i18n 'admin.user.approved_by'}}
-          {{#link-to 'adminUser' approvedBy}}{{avatar model.approvedBy imageSize="small"}}{{/link-to}}
-          {{#link-to 'adminUser' approvedBy}}{{model.approvedBy.username}}{{/link-to}}
+          {{#link-to 'adminUser' model.approvedBy}}{{avatar model.approvedBy imageSize="small"}}{{/link-to}}
+          {{#link-to 'adminUser' model.approvedBy}}{{model.approvedBy.username}}{{/link-to}}
         {{else}}
           {{i18n 'no_value'}}
         {{/if}}
@@ -302,18 +318,18 @@
     </div>
   </div>
 
-    <div class="user-suspended display-row {{if model.isSuspended 'highlight-danger'}}">
-      <div class='field'>{{i18n 'admin.user.suspended'}}</div>
-      <div class='value'>
-        {{i18n-yes-no model.isSuspended}}
-        {{#if model.isSuspended}}
-          {{#unless model.suspendedForever}}
-            {{i18n "admin.user.suspended_until" until=model.suspendedTillDate}}
-          {{/unless}}
-        {{/if}}
-      </div>
-      <div class='controls'>
-      {{#if model.isSuspended}}
+  <div class="user-suspended display-row {{if model.suspended 'highlight-danger'}}">
+    <div class='field'>{{i18n 'admin.user.suspended'}}</div>
+    <div class='value'>
+      {{i18n-yes-no model.suspended}}
+      {{#if model.suspended}}
+        {{#unless model.suspendedForever}}
+          {{i18n "admin.user.suspended_until" until=model.suspendedTillDate}}
+        {{/unless}}
+      {{/if}}
+    </div>
+    <div class='controls'>
+      {{#if model.suspended}}
         {{d-button
           class="btn-danger unsuspend-user"
           action=(action "unsuspend")
@@ -333,12 +349,12 @@
     </div>
   </div>
 
-  {{#if model.isSuspended}}
+  {{#if model.suspended}}
     <div class='display-row highlight-danger suspension-info'>
       <div class='field'>{{i18n 'admin.user.suspended_by'}}</div>
       <div class='value'>
-        {{#link-to 'adminUser' suspendedBy}}{{avatar model.suspendedBy imageSize="tiny"}}{{/link-to}}
-        {{#link-to 'adminUser' suspendedBy}}{{model.suspendedBy.username}}{{/link-to}}
+        {{#link-to 'adminUser' model.suspendedBy}}{{avatar model.suspendedBy imageSize="tiny"}}{{/link-to}}
+        {{#link-to 'adminUser' model.suspendedBy}}{{model.suspendedBy.username}}{{/link-to}}
       </div>
       <div class='controls'>
         <b>{{i18n 'admin.user.suspend_reason'}}</b>:
@@ -351,7 +367,7 @@
     <div class='field'>{{i18n 'admin.user.silenced'}}</div>
     <div class='value'>
       {{i18n-yes-no model.silenced}}
-      {{#if model.isSilenced}}
+      {{#if model.silenced}}
         {{#unless model.silencedForever}}
           {{i18n "admin.user.suspended_until" until=model.silencedTillDate}}
         {{/unless}}
@@ -378,12 +394,12 @@
     </div>
   </div>
 
-  {{#if model.isSilenced}}
+  {{#if model.silenced}}
     <div class='display-row highlight-danger silence-info'>
       <div class='field'>{{i18n 'admin.user.silenced_by'}}</div>
       <div class='value'>
-        {{#link-to 'adminUser' silencedBy}}{{avatar model.silencedBy imageSize="tiny"}}{{/link-to}}
-        {{#link-to 'adminUser' silencedBy}}{{model.silencedBy.username}}{{/link-to}}
+        {{#link-to 'adminUser' model.silencedBy}}{{avatar model.silencedBy imageSize="tiny"}}{{/link-to}}
+        {{#link-to 'adminUser' model.silencedBy}}{{model.silencedBy.username}}{{/link-to}}
       </div>
       <div class='controls'>
         <b>{{i18n 'admin.user.silence_reason'}}</b>:
@@ -392,6 +408,21 @@
     </div>
   {{/if}}
 
+  {{#if model.tl3_requirements.penalty_counts.total}}
+    <div class='display-row clear-penalty-history'>
+      <div class='field'>{{i18n 'admin.user.penalty_count'}}</div>
+      <div class='value'>{{model.tl3_requirements.penalty_counts.total}}</div>
+      {{#if currentUser.admin}}
+        <div class='controls'>
+          {{d-button label="admin.user.clear_penalty_history.title"
+                     icon="times"
+                     action=(action "clearPenaltyHistory")}}
+          {{i18n "admin.user.clear_penalty_history.description"}}
+        </div>
+      {{/if}}
+    </div>
+  {{/if}}
+
 </section>
 
 {{#if currentUser.admin}}
@@ -399,7 +430,7 @@
     <h1>{{i18n 'admin.groups.title'}}</h1>
       <div class='display-row'>
         <div class='field'>{{i18n 'admin.groups.automatic'}}</div>
-        <div class='value'>{{automaticGroups}}</div>
+        <div class='value'>{{{automaticGroups}}}</div>
       </div>
       <div class='display-row'>
         <div class='field'>{{i18n 'admin.groups.custom'}}</div>
@@ -452,7 +483,7 @@
           {{d-button class="btn-danger" action="deleteAllPosts" icon="trash-o" label="admin.user.delete_all_posts"}}
         {{/if}}
       {{else}}
-        {{model.deleteAllPostsExplanation}}
+        {{deleteAllPostsExplanation}}
       {{/if}}
     </div>
   </div>
@@ -466,7 +497,18 @@
   </div>
   <div class='display-row'>
     <div class='field'>{{i18n 'admin.user.flags_given_received_count'}}</div>
-    <div class='value'>{{model.flags_given_count}} / {{model.flags_received_count}}</div>
+    <div class='value'>
+      {{model.flags_given_count}} / {{model.flags_received_count}}
+    </div>
+    <div class='controls'>
+      {{#if model.flags_received_count}}
+        {{d-button
+          action=(action "showFlagsReceived")
+          label="admin.user.show_flags_received"
+          icon="flag"
+        }}
+      {{/if}}
+    </div>
   </div>
   <div class='display-row'>
     <div class='field'>{{i18n 'admin.user.private_topics_count'}}</div>
@@ -511,31 +553,37 @@
 </section>
 {{/if}}
 
+{{plugin-outlet name="after-user-details" args=(hash model=model)}}
+
 <section>
   <hr>
   <div class="pull-right">
-    {{#unless model.anonymizeForbidden}}
+    {{#if model.active}}
+      {{#if model.can_impersonate}}
+        {{d-button class="btn-danger" action="impersonate" icon="crosshairs" label="admin.impersonate.title" title="admin.impersonate.help"}}
+      {{/if}}
+    {{/if}}
+
+    {{#if model.can_be_anonymized}}
       {{d-button label="admin.user.anonymize"
                  icon="exclamation-triangle"
                  class="btn-danger"
-                 disabled=model.anonymizeForbidden
                  action="anonymize"}}
-    {{/unless}}
+    {{/if}}
 
-    {{#unless model.deleteForbidden}}
+    {{#if model.canBeDeleted}}
       {{d-button label="admin.user.delete"
                  icon="exclamation-triangle"
                  class="btn-danger"
-                 disabled=model.deleteForbidden
                  action="destroy"}}
-    {{/unless}}
+    {{/if}}
   </div>
 
-  {{#if model.deleteExplanation}}
+  {{#if deleteExplanation}}
     <div class="clearfix"></div>
     <br>
     <div class="pull-right">
-      {{d-icon "exclamation-triangle"}} {{model.deleteExplanation}}
+      {{d-icon "exclamation-triangle"}} {{deleteExplanation}}
     </div>
   {{/if}}
 </section>
diff --git a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
index 1561a95670b..1ac192e1926 100644
--- a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
+++ b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
@@ -1,10 +1,10 @@
 <div class='admin-controls'>
-  <div class='span15'>
+  <nav>
     <ul class="nav nav-pills">
       <li>{{#link-to 'adminUser' model}}{{d-icon "caret-left"}} &nbsp;{{model.username}}{{/link-to}}</li>
       <li>{{#link-to 'adminUsersList.show' 'member'}}{{i18n 'admin.user.trust_level_2_users'}}{{/link-to}}</li>
     </ul>
-  </div>
+  </nav>
 </div>
 
 <div class="admin-container tl3-requirements">
@@ -96,6 +96,18 @@
         <td>{{model.tl3Requirements.num_likes_received_users}}</td>
         <td>{{model.tl3Requirements.min_likes_received_users}}</td>
       </tr>
+      <tr>
+        <th>{{i18n 'admin.user.tl3_requirements.silenced'}}</th>
+        <td>{{check-icon model.tl3Requirements.met.silenced}}</td>
+        <td>{{model.tl3Requirements.penalty_counts.silenced}}</td>
+        <td>0</td>
+      </tr>
+      <tr>
+        <th>{{i18n 'admin.user.tl3_requirements.suspended'}}</th>
+        <td>{{check-icon model.tl3Requirements.met.suspended}}</td>
+        <td>{{model.tl3Requirements.penalty_counts.suspended}}</td>
+        <td>0</td>
+      </tr>
     </tbody>
   </table>
 
diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs
index 0ccaee02513..7401077ee63 100644
--- a/app/assets/javascripts/admin/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/templates/users-list-show.hbs
@@ -98,6 +98,10 @@
               {{#if user.moderator}}
                 {{d-icon "shield" title="admin.moderator" }}
               {{/if}}
+
+              {{#if user.second_factor_enabled}}
+                {{d-icon "lock" title="admin.user.second_factor_enabled" }}
+              {{/if}}
             </td>
           </tr>
         {{/each}}
diff --git a/app/assets/javascripts/admin/templates/users-list.hbs b/app/assets/javascripts/admin/templates/users-list.hbs
index 398732685b1..c101a1a13bd 100644
--- a/app/assets/javascripts/admin/templates/users-list.hbs
+++ b/app/assets/javascripts/admin/templates/users-list.hbs
@@ -1,5 +1,5 @@
 <div class='admin-controls'>
-  <div class='span15'>
+  <nav>
     <ul class="nav nav-pills">
       {{nav-item route='adminUsersList.show' routeParam='active' label='admin.users.nav.active'}}
       {{nav-item route='adminUsersList.show' routeParam='new' label='admin.users.nav.new'}}
@@ -10,8 +10,10 @@
       {{nav-item route='adminUsersList.show' routeParam='suspended' label='admin.users.nav.suspended'}}
       {{nav-item route='adminUsersList.show' routeParam='silenced' label='admin.users.nav.silenced'}}
       {{nav-item route='adminUsersList.show' routeParam='suspect' label='admin.users.nav.suspect'}}
+      {{nav-item route='adminUsersList.show' routeParam='staged' label='admin.users.nav.staged'}}
+      {{nav-item route='groups' label='groups.index.title'}}
     </ul>
-  </div>
+  </nav>
   <div class="pull-right">
     {{#unless siteSettings.enable_sso}}
       {{d-button action="sendInvites" title="admin.invite.button_title" icon="user-plus" label="admin.invite.button_text"}}
diff --git a/app/assets/javascripts/admin/templates/version-checks.hbs b/app/assets/javascripts/admin/templates/version-checks.hbs
index a8724b7e5a5..abd5f4befdd 100644
--- a/app/assets/javascripts/admin/templates/version-checks.hbs
+++ b/app/assets/javascripts/admin/templates/version-checks.hbs
@@ -1,73 +1,83 @@
-<div class="dashboard-stats version-check {{if versionCheck.critical_updates 'critical' 'normal'}}">
-  <table class="table table-condensed table-hover">
-    {{custom-html name="upgrade-header" versionCheck=versionCheck tagName="thead"}}
-  </table>
+      <div class="section-title">
+        <h2>{{i18n 'admin.dashboard.version'}}</h2>
+      </div>
+      <div class="dashboard-stats version-check {{if versionCheck.critical_updates 'critical' 'normal'}}">
 
-  <table class="table table-condensed table-hover">
-    <thead>
-      <tr>
-        <th>&nbsp;</th>
-        <th>{{i18n 'admin.dashboard.installed_version'}}</th>
-        <th colspan="3">{{i18n 'admin.dashboard.latest_version'}}</th>
-      </tr>
-    </thead>
-    <tbody>
-      <td class="title">{{i18n 'admin.dashboard.version'}}</td>
-      <td class="version-number"><a href={{versionCheck.gitLink}} target="_blank">{{dash-if-empty versionCheck.installed_describe}}</a></td>
+      <div class="version-number">
+        <h4>{{i18n 'admin.dashboard.installed_version'}}</h4>
+        <h3><a href={{versionCheck.gitLink}} target="_blank">{{dash-if-empty versionCheck.installed_describe}}</a></h3>
+      </div>
 
       {{#if versionCheck.noCheckPerformed}}
-        <td class="version-number">&mdash;</td>
-        <td class="face">
-          <span class="icon critical-updates-available">{{d-icon "frown-o"}}</span>
-        </td>
-        <td class="version-notes">
-          <span class="normal-note">{{i18n 'admin.dashboard.no_check_performed'}}</span>
-        </td>
+        <div class="version-number"> 
+          <h4>{{i18n 'admin.dashboard.latest_version'}}</h4>  
+          <h3>&mdash;</h3>
+        </div>
+        <div class="version-status">
+          <div class="face">
+            <span class="icon critical-updates-available">{{d-icon "frown-o"}}</span>
+          </div>
+          <div class="version-notes">
+            <span class="normal-note">{{i18n 'admin.dashboard.no_check_performed'}}</span>
+          </div>
+        </div>
       {{else}}
         {{#if versionCheck.stale_data}}
-          <td class="version-number">{{#if versionCheck.version_check_pending}}{{dash-if-empty versionCheck.installed_version}}{{/if}}</td>
-          <td class="face">
-            {{#if versionCheck.version_check_pending}}
-              <span class='icon up-to-date'>{{d-icon "smile-o"}}</span>
-            {{else}}
-              <span class="icon critical-updates-available">{{d-icon "frown-o"}}</span>
-            {{/if}}
-          </td>
-          <td class="version-notes">
-            <span class="normal-note">
+          <div class="version-number">
+            <h4>{{i18n 'admin.dashboard.latest_version'}}</h4>  
+            <h3>{{#if versionCheck.version_check_pending}}{{dash-if-empty versionCheck.installed_version}}{{/if}}</h3>
+            </div>
+          <div class="version-status">
+            <div class="face">
               {{#if versionCheck.version_check_pending}}
-                {{i18n 'admin.dashboard.version_check_pending'}}
+                <span class='icon up-to-date'>{{d-icon "smile-o"}}</span>
               {{else}}
-                {{i18n 'admin.dashboard.stale_data'}}
+                <span class="icon critical-updates-available">{{d-icon "frown-o"}}</span>
               {{/if}}
-            </span>
-          </td>
-        {{else}}
-          <td class="version-number">{{dash-if-empty versionCheck.latest_version}}</td>
-          <td class="face">
-            {{#if versionCheck.upToDate }}
-            <span class='icon up-to-date'>{{d-icon "smile-o"}}</span>
-            {{else}}
-              <span class="icon {{if versionCheck.critical_updates 'critical-updates-available' 'updates-available'}}">
-                {{#if versionCheck.behindByOneVersion}}
-                  {{d-icon "meh-o"}}
+            </div>
+            <div class="version-notes">
+              <span class="normal-note">
+                {{#if versionCheck.version_check_pending}}
+                  {{i18n 'admin.dashboard.version_check_pending'}}
                 {{else}}
-                  {{d-icon "frown-o"}}
+                  {{i18n 'admin.dashboard.stale_data'}}
                 {{/if}}
               </span>
-            {{/if}}
-          </td>
-          <td class="version-notes">
-            {{#if versionCheck.upToDate }}
-              {{i18n 'admin.dashboard.up_to_date'}}
-            {{else}}
-              <span class="critical-note">{{i18n 'admin.dashboard.critical_available'}}</span>
-              <span class="normal-note">{{i18n 'admin.dashboard.updates_available'}}</span>
-              {{i18n 'admin.dashboard.please_upgrade'}}
-            {{/if}}
-          </td>
+            </div>
+          </div>
+        {{else}}
+          <div class="version-number">
+            <h4>{{i18n 'admin.dashboard.latest_version'}}</h4>  
+            <h3>{{dash-if-empty versionCheck.latest_version}}</h3>
+          </div>
+          <div class="version-status">
+            <div class="face">
+              {{#if versionCheck.upToDate }}
+              <span class='icon up-to-date'>{{d-icon "smile-o"}}</span>
+              {{else}}
+                <span class="icon {{if versionCheck.critical_updates 'critical-updates-available' 'updates-available'}}">
+                  {{#if versionCheck.behindByOneVersion}}
+                    {{d-icon "meh-o"}}
+                  {{else}}
+                    {{d-icon "frown-o"}}
+                  {{/if}}
+                </span>
+              {{/if}}
+            </div>
+            <div class="version-notes">
+              {{#if versionCheck.upToDate }}
+                {{i18n 'admin.dashboard.up_to_date'}}
+              {{else}}
+                <span class="critical-note">{{i18n 'admin.dashboard.critical_available'}}</span>
+                <span class="normal-note">{{i18n 'admin.dashboard.updates_available'}}</span>
+                {{i18n 'admin.dashboard.please_upgrade'}}
+              {{/if}}
+            </div>
+          </div>
+
         {{/if}}
       {{/if}}
-    </tbody>
-  </table>
+
+      {{custom-html name="upgrade-header" versionCheck=versionCheck tagName="div" classNames="upgrade-header"}}
+
 </div>
diff --git a/app/assets/javascripts/admin/templates/watched-words-action.hbs b/app/assets/javascripts/admin/templates/watched-words-action.hbs
index 8377c28bd50..1cf0f77cd92 100644
--- a/app/assets/javascripts/admin/templates/watched-words-action.hbs
+++ b/app/assets/javascripts/admin/templates/watched-words-action.hbs
@@ -5,17 +5,24 @@
 {{watched-word-form
   actionKey=actionNameKey
   action="recordAdded"
+  filteredContent=filteredContent
   regularExpressions=adminWatchedWords.regularExpressions}}
 
 {{watched-word-uploader uploading=uploading actionKey=actionNameKey done="uploadComplete"}}
 
 <div class='clearfix'></div>
+<div>
+  <label class="show-words-checkbox">
+    {{input type="checkbox" checked=adminWatchedWords.showWords disabled=adminWatchedWords.disableShowWords}}
+    {{i18n 'admin.watched_words.show_words'}}
+  </label>
+</div>
 <div class="watched-words-list">
   {{#if showWordsList}}
     {{#each filteredContent as |word| }}
       <div class="watched-word-box">{{admin-watched-word word=word action="recordRemoved"}}</div>
     {{/each}}
   {{else}}
-    {{i18n 'admin.watched_words.word_count' count=model.words.length}}
+    {{i18n 'admin.watched_words.word_count' count=wordCount}}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/watched-words.hbs b/app/assets/javascripts/admin/templates/watched-words.hbs
index 7bec3d88120..cf5f50cc643 100644
--- a/app/assets/javascripts/admin/templates/watched-words.hbs
+++ b/app/assets/javascripts/admin/templates/watched-words.hbs
@@ -1,11 +1,6 @@
 <div class='admin-controls'>
-  <div class='search controls'>
-    <label class="show-words-checkbox">
-      {{input type="checkbox" checked=showWords disabled=disableShowWords}}
-      {{i18n 'admin.watched_words.show_words'}}
-    </label>
-  </div>
   <div class='controls'>
+    {{d-button action="toggleMenu" class="menu-toggle" icon="bars"}}
     {{text-field value=filter placeholderKey="admin.watched_words.search" class="no-blur"}}
     {{d-button action="clearFilter" label="admin.watched_words.clear_filter"}}
   </div>
diff --git a/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs b/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
index e0d06098713..d2f926a9424 100644
--- a/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
+++ b/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
@@ -23,7 +23,6 @@
       {{#if hasIncoming}}
         <div class='alert alert-info clickable' {{action "showInserted"}}>
           {{count-i18n key="admin.web_hooks.events.incoming" count=incomingCount}}
-          {{i18n 'click_to_show'}}
         </div>
       {{/if}}
       <ul>
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 6b0d64be848..e7e9db37b4c 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -9,8 +9,11 @@
 //= require ./deprecated
 
 // Stuff we need to load first
+//= require ./discourse/helpers/parse-html
+//= require ./discourse/lib/to-markdown
 //= require ./discourse/lib/utilities
 //= require ./discourse/lib/page-visible
+//= require ./discourse/lib/logout
 //= require ./discourse/lib/ajax
 //= require ./discourse/lib/text
 //= require ./discourse/lib/hash
@@ -25,6 +28,7 @@
 //= require ./discourse/lib/key-value-store
 //= require ./discourse/lib/computed
 //= require ./discourse/lib/formatter
+//= require ./discourse/lib/text-direction
 //= require ./discourse/lib/eyeline
 //= require ./discourse/lib/show-modal
 //= require ./discourse/mixins/scrolling
@@ -34,6 +38,8 @@
 //= require ./discourse/models/result-set
 //= require ./discourse/models/store
 //= require ./discourse/models/action-summary
+//= require ./discourse/models/permission-type
+//= require ./discourse/models/category
 //= require ./discourse/models/topic
 //= require ./discourse/models/draft
 //= require ./discourse/models/composer
@@ -41,7 +47,6 @@
 //= require ./discourse/models/badge
 //= require ./discourse/models/permission-type
 //= require ./discourse/models/user-action-group
-//= require ./discourse/models/category
 //= require ./discourse/models/input-validation
 //= require ./discourse/lib/search
 //= require ./discourse/lib/user-search
@@ -60,9 +65,10 @@
 //= require ./discourse/models/user-action
 //= require ./discourse/models/draft
 //= require ./discourse/models/composer
+//= require ./discourse/models/user-badge
+//= require_tree ./discourse/lib
 //= require_tree ./discourse/mixins
 //= require ./discourse/models/invite
-//= require ./discourse/models/user-badge
 //= require ./discourse/controllers/discovery-sortable
 //= require ./discourse/controllers/navigation/default
 //= require ./discourse/components/edit-category-panel
@@ -84,7 +90,6 @@
 //= require ./discourse/helpers/loading-spinner
 //= require ./discourse/helpers/category-link
 //= require ./discourse/lib/export-result
-//= require_tree ./discourse/lib
 //= require ./discourse/mapping-router
 
 //= require_tree ./discourse/controllers
diff --git a/app/assets/javascripts/discourse-common/lib/icon-library.js.es6 b/app/assets/javascripts/discourse-common/lib/icon-library.js.es6
index 84242d03f65..1a6c453f414 100644
--- a/app/assets/javascripts/discourse-common/lib/icon-library.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/icon-library.js.es6
@@ -9,7 +9,7 @@ const REPLACEMENTS = {
   'd-watching-first': 'dot-circle-o',
   'd-drop-expanded': 'caret-down',
   'd-drop-collapsed': 'caret-right',
-  'd-unliked': 'heart',
+  'd-unliked': 'heart-o',
   'd-liked': 'heart',
   'notification.mentioned': "at",
   'notification.group_mentioned': "at",
@@ -90,7 +90,7 @@ registerIconRenderer({
     if (params.label) { html += " aria-hidden='true'"; }
     html += `></${tagName}>`;
     if (params.label) {
-      html += "<span class='sr-only'>" + I18n.t(params.label) + "</span>";
+      html += `<span class='sr-only'>${params.label}</span>`;
     }
     return html;
   },
diff --git a/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6 b/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6
index 4b547a68828..2900e5d6704 100644
--- a/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6
@@ -18,13 +18,15 @@ RawHandlebars.helpers['get'] = function(context, options) {
   var firstContext =  options.contexts[0];
   var val = firstContext[context];
 
-  if (context.indexOf('controller') === 0) {
-    context = context.replace(/^controller\./, '');
+  if (context.indexOf('controller.') === 0) {
+    context = context.slice(context.indexOf('.') + 1);
   }
 
-  if (val && val.isDescriptor) { return Em.get(firstContext, context); }
-  val = val === undefined ? Em.get(firstContext, context): val;
-  return val;
+  if (val && val.isDescriptor) {
+    return Em.get(firstContext, context);
+  }
+
+  return val === undefined ? Em.get(firstContext, context) : val;
 };
 
 // adds compatability so this works with stringParams
diff --git a/app/assets/javascripts/discourse-common/resolver.js.es6 b/app/assets/javascripts/discourse-common/resolver.js.es6
index 4c2dec2f0bf..569fb3a0a24 100644
--- a/app/assets/javascripts/discourse-common/resolver.js.es6
+++ b/app/assets/javascripts/discourse-common/resolver.js.es6
@@ -195,7 +195,8 @@ export function buildResolver(baseName) {
     findAdminTemplate(parsedName) {
       var decamelized = parsedName.fullNameWithoutType.decamelize();
       if (decamelized.indexOf('components') === 0) {
-        const compTemplate = Ember.TEMPLATES['admin/templates/' + decamelized];
+        let comPath = `admin/templates/${decamelized}`;
+        const compTemplate = Ember.TEMPLATES[`javascripts/${comPath}`] || Ember.TEMPLATES[comPath];
         if (compTemplate) { return compTemplate; }
       }
 
diff --git a/app/assets/javascripts/discourse/adapters/group.js.es6 b/app/assets/javascripts/discourse/adapters/group.js.es6
new file mode 100644
index 00000000000..34134b50ea3
--- /dev/null
+++ b/app/assets/javascripts/discourse/adapters/group.js.es6
@@ -0,0 +1,7 @@
+import RestAdapter from 'discourse/adapters/rest';
+
+export default RestAdapter.extend({
+  appendQueryParams(path, findArgs) {
+    return this._super(path, findArgs, '.json');
+  },
+});
diff --git a/app/assets/javascripts/discourse/adapters/rest.js.es6 b/app/assets/javascripts/discourse/adapters/rest.js.es6
index c826bbefc9c..e33a755970b 100644
--- a/app/assets/javascripts/discourse/adapters/rest.js.es6
+++ b/app/assets/javascripts/discourse/adapters/rest.js.es6
@@ -40,7 +40,7 @@ export default Ember.Object.extend({
     return "/";
   },
 
-  appendQueryParams(path, findArgs) {
+  appendQueryParams(path, findArgs, extension) {
     if (findArgs) {
       if (typeof findArgs === "object") {
         const queryString = Object.keys(findArgs)
@@ -48,11 +48,11 @@ export default Ember.Object.extend({
                                   .map(k => k + "=" + encodeURIComponent(findArgs[k]));
 
         if (queryString.length) {
-          return path + "?" + queryString.join('&');
+          return `${path}${extension ? extension : ''}?${queryString.join('&')}`;
         }
       } else {
         // It's serializable as a string if not an object
-        return path + "/" + findArgs;
+        return `${path}/${findArgs}${extension ? extension : ''}`;
       }
     }
     return path;
diff --git a/app/assets/javascripts/discourse/components/basic-topic-list.js.es6 b/app/assets/javascripts/discourse/components/basic-topic-list.js.es6
index 260d13ce288..986ac0ff6cb 100644
--- a/app/assets/javascripts/discourse/components/basic-topic-list.js.es6
+++ b/app/assets/javascripts/discourse/components/basic-topic-list.js.es6
@@ -61,5 +61,11 @@ export default Ember.Component.extend({
       }
       return false;
     }
-  }
+  },
+
+  actions: {
+    showInserted() {
+      this.sendAction('showInserted');
+    },
+  },
 });
diff --git a/app/assets/javascripts/discourse/components/categories-and-top-topics.js.es6 b/app/assets/javascripts/discourse/components/categories-and-top-topics.js.es6
new file mode 100644
index 00000000000..4f1c8886929
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/categories-and-top-topics.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Component.extend({
+  classNames: ["categories-and-top"]
+});
diff --git a/app/assets/javascripts/discourse/components/categories-boxes.js.es6 b/app/assets/javascripts/discourse/components/categories-boxes.js.es6
index fc63667da2c..7f364b9d9e2 100644
--- a/app/assets/javascripts/discourse/components/categories-boxes.js.es6
+++ b/app/assets/javascripts/discourse/components/categories-boxes.js.es6
@@ -1,4 +1,5 @@
 import computed from 'ember-addons/ember-computed-decorators';
+import DiscourseURL from 'discourse/lib/url';
 
 export default Ember.Component.extend({
   tagName: "section",
@@ -8,5 +9,14 @@ export default Ember.Component.extend({
   anyLogos() {
     return this.get("categories").any((c) => { return !Ember.isEmpty(c.get('uploaded_logo.url')); });
     return this.get("categories").any(c => !Ember.isEmpty(c.get('uploaded_logo.url')));
+  },
+
+  click(e) {
+    if (!$(e.target).is('a')) {
+      const url = $(e.target).closest('.category-box').data("url");
+      if (url) {
+        DiscourseURL.routeTo(url);
+      }
+    }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/categories-topic-list.js.es6 b/app/assets/javascripts/discourse/components/categories-topic-list.js.es6
new file mode 100644
index 00000000000..9b102dc46c7
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/categories-topic-list.js.es6
@@ -0,0 +1,2 @@
+// Exists so plugins can use it
+export default Ember.Component.extend();
diff --git a/app/assets/javascripts/discourse/components/category-drop.js.es6 b/app/assets/javascripts/discourse/components/category-drop.js.es6
deleted file mode 100644
index 379e326ac84..00000000000
--- a/app/assets/javascripts/discourse/components/category-drop.js.es6
+++ /dev/null
@@ -1,152 +0,0 @@
-import { setting } from 'discourse/lib/computed';
-import computed from 'ember-addons/ember-computed-decorators';
-
-var get = Ember.get;
-
-export default Ember.Component.extend({
-  classNameBindings: ['category::no-category', 'categories:has-drop', 'categoryStyle'],
-  categoryStyle: setting('category_style'),
-  expanded: false,
-
-  tagName: 'li',
-
-  @computed('expanded')
-  expandIcon(expanded) {
-    return expanded ? 'd-drop-expanded' : 'd-drop-collapsed';
-  },
-
-  allCategoriesUrl: function() {
-    if (this.get('subCategory')) {
-      return this.get('parentCategory.url') || "/";
-    } else {
-      return "/";
-    }
-  }.property('parentCategory.url', 'subCategory'),
-
-  noCategoriesUrl: function() {
-    return this.get('parentCategory.url') + "/none";
-  }.property('parentCategory.url'),
-
-  allCategoriesLabel: function() {
-    if (this.get('subCategory')) {
-      return I18n.t('categories.all_subcategories', {categoryName: this.get('parentCategory.name')});
-    }
-    return I18n.t('categories.all');
-  }.property('category'),
-
-  dropdownButtonClass: function() {
-    let result = 'dropdown-header category-dropdown-button';
-    if (Em.isNone(this.get('category'))) {
-      result += ' home';
-    }
-    return result;
-  }.property('category'),
-
-  categoryColor: function() {
-    var category = this.get('category');
-
-    if (category) {
-      var color = get(category, 'color');
-
-      if (color) {
-        var style = "";
-        if (color) { style += "background-color: #" + color + ";"; }
-        return style.htmlSafe();
-      }
-    }
-
-    return "background-color: #eee;".htmlSafe();
-  }.property('category'),
-
-  badgeStyle: function() {
-    let category = this.get('category');
-
-    const categoryStyle = this.siteSettings.category_style;
-    if (categoryStyle === 'bullet') {
-      return;
-    }
-
-    if (category) {
-      let color = get(category, 'color');
-      let textColor = get(category, 'text_color');
-
-      if (color || textColor) {
-        let style = "";
-        if (color) {
-          if (categoryStyle === "bar") {
-            style += `border-color: #${color};`;
-          } else if (categoryStyle === "box") {
-            style += `background-color: #${color};`;
-            if (textColor) { style += "color: #" + textColor + "; "; }
-          }
-        }
-
-        return style.htmlSafe();
-      }
-    }
-
-    if (categoryStyle === 'box') {
-      return "background-color: #eee; color: #333".htmlSafe();
-    }
-  }.property('category'),
-
-  clickEventName: function() {
-    return "click.category-drop-" + (this.get('category.id') || "all");
-  }.property('category.id'),
-
-  actions: {
-    expand: function() {
-      var self = this;
-
-      if(!this.get('renderCategories')){
-        this.set('renderCategories',true);
-        Em.run.next(function(){
-          self.send('expand');
-        });
-        return;
-      }
-
-      if (this.get('expanded')) {
-        this.close();
-        return;
-      }
-
-      if (this.get('categories')) {
-        this.set('expanded', true);
-      }
-      var $dropdown = this.$()[0];
-
-      this.$('a[data-drop-close]').on('click.category-drop', function() {
-        self.close();
-      });
-
-      Em.run.next(function(){
-        self.$('.cat a').add('html').on(self.get('clickEventName'), function(e) {
-          var $target = $(e.target),
-              closest = $target.closest($dropdown);
-
-          if ($(e.currentTarget).hasClass('badge-wrapper')){
-            self.close();
-          }
-
-          return ($(e.currentTarget).hasClass('badge-category') || (closest.length && closest[0] === $dropdown)) ? true : self.close();
-        });
-      });
-    }
-  },
-
-  removeEvents: function(){
-    $('html').off(this.get('clickEventName'));
-    this.$('a[data-drop-close]').off('click.category-drop');
-  },
-
-  close: function() {
-    this.removeEvents();
-    this.set('expanded', false);
-  },
-
-  willDestroyElement: function() {
-    this.removeEvents();
-  }
-
-});
diff --git a/app/assets/javascripts/discourse/components/category-title-before.js.es6 b/app/assets/javascripts/discourse/components/category-title-before.js.es6
new file mode 100644
index 00000000000..9250c1ae73b
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/category-title-before.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Component.extend({
+  tagName: ''
+});
diff --git a/app/assets/javascripts/discourse/components/composer-action-title.js.es6 b/app/assets/javascripts/discourse/components/composer-action-title.js.es6
new file mode 100644
index 00000000000..3f9483595f2
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/composer-action-title.js.es6
@@ -0,0 +1,77 @@
+import { default as computed } from 'ember-addons/ember-computed-decorators';
+import {
+  PRIVATE_MESSAGE,
+  CREATE_TOPIC,
+  CREATE_SHARED_DRAFT,
+  REPLY,
+  EDIT,
+  EDIT_SHARED_DRAFT
+} from "discourse/models/composer";
+import { iconHTML } from 'discourse-common/lib/icon-library';
+
+const TITLES = {
+  [PRIVATE_MESSAGE]: 'topic.private_message',
+  [CREATE_TOPIC]: 'topic.create_long',
+  [CREATE_SHARED_DRAFT]: 'composer.create_shared_draft',
+  [EDIT_SHARED_DRAFT]: 'composer.edit_shared_draft'
+};
+
+export default Ember.Component.extend({
+  classNames: ["composer-action-title"],
+  options: Ember.computed.alias("model.replyOptions"),
+  action: Ember.computed.alias("model.action"),
+  isEditing: Ember.computed.equal("action", EDIT),
+
+  @computed("options", "action")
+  actionTitle(opts, action) {
+    if (TITLES[action]) {
+      return I18n.t(TITLES[action]);
+    }
+
+    switch (action) {
+      case REPLY:
+        if (opts.userAvatar && opts.userLink) {
+          return this._formatReplyToUserPost(opts.userAvatar, opts.userLink);
+        } else if (opts.topicLink) {
+          return this._formatReplyToTopic(opts.topicLink);
+        }
+      case EDIT:
+        if (opts.userAvatar && opts.userLink && opts.postLink) {
+          return this._formatEditUserPost(
+            opts.userAvatar,
+            opts.userLink,
+            opts.postLink,
+            opts.originalUser
+          );
+        }
+    };
+  },
+
+  _formatEditUserPost(userAvatar, userLink, postLink, originalUser) {
+    let editTitle = `
+      <a class="post-link" href="${postLink.href}">${postLink.anchor}</a>
+      ${userAvatar}
+      <span class="username">${userLink.anchor}</span>
+    `;
+
+    if (originalUser) {
+      editTitle += `
+        ${iconHTML("mail-forward", { class: "reply-to-glyph" })}
+        ${originalUser.avatar}
+        <span class="original-username">${originalUser.username}</span>
+      `;
+    }
+
+    return editTitle.htmlSafe();
+  },
+
+  _formatReplyToTopic(link) {
+    return `<a class="topic-link" href="${link.href}">${link.anchor}</a>`.htmlSafe();
+  },
+
+  _formatReplyToUserPost(avatar, link) {
+    const htmlLink = `<a class="user-link" href="${link.href}">${link.anchor}</a>`;
+    return `${avatar}${htmlLink}`.htmlSafe();
+  },
+
+});
diff --git a/app/assets/javascripts/discourse/components/composer-body.js.es6 b/app/assets/javascripts/discourse/components/composer-body.js.es6
index 8df136d3724..e868268c350 100644
--- a/app/assets/javascripts/discourse/components/composer-body.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-body.js.es6
@@ -15,6 +15,7 @@ export default Ember.Component.extend(KeyEnterEscape, {
                       'composer.createdPost:created-post',
                       'composer.creatingTopic:topic',
                       'composer.whisper:composing-whisper',
+                      'composer.sharedDraft:composing-shared-draft',
                       'showPreview:show-preview:hide-preview',
                       'currentUserPrimaryGroupClass'],
 
diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index 968e1ade9a3..86b4d39f87d 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -13,6 +13,7 @@ import { tinyAvatar,
          displayErrorForUpload,
          getUploadMarkdown,
          validateUploadedFiles,
+         authorizesOneOrMoreImageExtensions,
          formatUsername,
          clipboardData
 } from 'discourse/lib/utilities';
@@ -36,6 +37,21 @@ export default Ember.Component.extend({
     return `[${I18n.t('uploading')}]() `;
   },
 
+  @computed('composer.requiredCategoryMissing')
+  replyPlaceholder(requiredCategoryMissing) {
+    if (requiredCategoryMissing) {
+      return 'composer.reply_placeholder_choose_category';
+    } else {
+      const key = authorizesOneOrMoreImageExtensions() ? "reply_placeholder" : "reply_placeholder_no_images";
+      return `composer.${key}`;
+    }
+  },
+
+  @computed('composer.requiredCategoryMissing', 'composer.replyLength')
+  disableTextarea(requiredCategoryMissing, replyLength) {
+    return requiredCategoryMissing && replyLength === 0;
+  },
+
   @observes('composer.uploadCancelled')
   _cancelUpload() {
     if (!this.get('composer.uploadCancelled')) { return; }
@@ -365,7 +381,13 @@ export default Ember.Component.extend({
       post.set('refreshedPost', true);
     }
 
-    $oneboxes.each((_, o) => load(o, refresh, ajax, this.currentUser.id));
+    $oneboxes.each((_, o) => load({
+      elem: o,
+      refresh,
+      ajax,
+      categoryId: this.get('composer.category.id'),
+      topicId: this.get('composer.topic.id')
+    }));
   },
 
   _warnMentionedGroups($preview) {
@@ -403,8 +425,16 @@ export default Ember.Component.extend({
         let name = $e.data('name');
 
         if (found.indexOf(name) === -1) {
-          this.sendAction('cannotSeeMention', [{ name: name }]);
-          found.push(name);
+
+          // add a delay to allow for typing, so you don't open the warning right away
+          // previously we would warn after @bob even if you were about to mention @bob2
+          Em.run.later(this, () => {
+            if ($preview.find('.mention.cannot-see[data-name="' + name + '"]').length > 0) {
+              this.sendAction('cannotSeeMention', [{ name: name }]);
+              found.push(name);
+            }
+          }, 2000);
+
         }
       });
 
@@ -662,13 +692,15 @@ export default Ember.Component.extend({
         unshift: true
       });
 
-      toolbar.addButton({
-        id: 'upload',
-        group: 'insertions',
-        icon: 'upload',
-        title: 'upload',
-        sendAction: 'showUploadModal'
-      });
+      if (this.get('allowUpload')) {
+        toolbar.addButton({
+          id: 'upload',
+          group: 'insertions',
+          icon: 'upload',
+          title: 'upload',
+          sendAction: 'showUploadModal'
+        });
+      }
 
       toolbar.addButton({
         id: 'options',
diff --git a/app/assets/javascripts/discourse/components/composer-messages.js.es6 b/app/assets/javascripts/discourse/components/composer-messages.js.es6
index 6f791315ab9..25cbad063b1 100644
--- a/app/assets/javascripts/discourse/components/composer-messages.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-messages.js.es6
@@ -1,5 +1,7 @@
 import LinkLookup from 'discourse/lib/link-lookup';
 
+let _messagesCache = {};
+
 export default Ember.Component.extend({
   classNameBindings: [':composer-popup-container', 'hidden'],
   checkedMessages: false,
@@ -165,7 +167,9 @@ export default Ember.Component.extend({
     if (topicId) { args.topic_id = topicId; }
     if (postId)  { args.post_id = postId; }
 
-    composer.store.find('composer-message', args).then(messages => {
+    const cacheKey = `${args.composer_action}${args.topic_id}${args.post_id}`;
+
+    const processMessages = messages => {
       if (this.isDestroying || this.isDestroyed) { return; }
 
       // Checking composer messages on replies can give us a list of links to check for
@@ -177,6 +181,15 @@ export default Ember.Component.extend({
       this.set('checkedMessages', true);
       const queuedForTyping = this.get('queuedForTyping');
       messages.forEach(msg => msg.wait_for_typing ? queuedForTyping.addObject(msg) : this.send('popup', msg));
-    });
+    };
+
+    if (_messagesCache.cacheKey === cacheKey) {
+      processMessages(_messagesCache.messages);
+    } else {
+      composer.store.find('composer-message', args).then(messages => {
+        _messagesCache = {messages, cacheKey};
+        processMessages(messages);
+      });
+    }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/composer-title.js.es6 b/app/assets/javascripts/discourse/components/composer-title.js.es6
index 2a828a9483a..9fc446930af 100644
--- a/app/assets/javascripts/discourse/components/composer-title.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-title.js.es6
@@ -53,7 +53,11 @@ export default Ember.Component.extend({
     if (this.get('autoPosted') || !this.get('watchForLink')) { return; }
 
     if (Ember.testing) {
-      this._checkForUrl();
+      Em.run.next(() =>
+        // not ideal but we don't want to run this in current
+        // runloop to avoid an error in console
+        this._checkForUrl()
+      );
     } else {
       Ember.run.debounce(this, this._checkForUrl, 500);
     }
@@ -80,7 +84,14 @@ export default Ember.Component.extend({
       const link = document.createElement('a');
       link.href = this.get('composer.title');
 
-      let loadOnebox = load(link, false, ajax, this.currentUser.id, true);
+      const loadOnebox = load({
+        elem: link,
+        refresh: false,
+        ajax,
+        synchronous: true,
+        categoryId: this.get('composer.category.id'),
+        topicId: this.get('composer.topic.id')
+      });
 
       if (loadOnebox && loadOnebox.then) {
         loadOnebox.then( () => {
diff --git a/app/assets/javascripts/discourse/components/conditional-loading-section.js.es6 b/app/assets/javascripts/discourse/components/conditional-loading-section.js.es6
new file mode 100644
index 00000000000..dd8f321635c
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/conditional-loading-section.js.es6
@@ -0,0 +1,9 @@
+export default Ember.Component.extend({
+  classNames: ["conditional-loading-section"],
+
+  classNameBindings: ["isLoading"],
+
+  isLoading: false,
+
+  title: I18n.t("conditional_loading_section.loading")
+});
diff --git a/app/assets/javascripts/discourse/components/create-topic-button.js.es6 b/app/assets/javascripts/discourse/components/create-topic-button.js.es6
index a792b83a291..c450bf72069 100644
--- a/app/assets/javascripts/discourse/components/create-topic-button.js.es6
+++ b/app/assets/javascripts/discourse/components/create-topic-button.js.es6
@@ -1 +1,4 @@
-export default Ember.Component.extend({ tagName: '' });
+export default Ember.Component.extend({
+  tagName: '',
+  label: 'topic.create'
+});
diff --git a/app/assets/javascripts/discourse/components/custom-html.js.es6 b/app/assets/javascripts/discourse/components/custom-html.js.es6
index c5df7fb51ed..f6114745f5d 100644
--- a/app/assets/javascripts/discourse/components/custom-html.js.es6
+++ b/app/assets/javascripts/discourse/components/custom-html.js.es6
@@ -2,6 +2,8 @@ import { getCustomHTML } from 'discourse/helpers/custom-html';
 import { getOwner } from 'discourse-common/lib/get-owner';
 
 export default Ember.Component.extend({
+  triggerAppEvent: null,
+
   init() {
     this._super();
     const name = this.get('name');
@@ -16,5 +18,19 @@ export default Ember.Component.extend({
         this.set('layoutName', name);
       }
     }
+  },
+
+  didInsertElement() {
+    this._super();
+    if (this.get('triggerAppEvent') === 'true') {
+      this.appEvents.trigger(`inserted-custom-html:${this.get('name')}`);
+    }
+  },
+
+  willDestroyElement() {
+    this._super();
+    if (this.get('triggerAppEvent') === 'true') {
+      this.appEvents.trigger(`destroyed-custom-html:${this.get('name')}`);
+    }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/d-button.js.es6 b/app/assets/javascripts/discourse/components/d-button.js.es6
index c56e1b6b34a..464a434bf11 100644
--- a/app/assets/javascripts/discourse/components/d-button.js.es6
+++ b/app/assets/javascripts/discourse/components/d-button.js.es6
@@ -6,7 +6,7 @@ export default Ember.Component.extend({
 
   tagName: 'button',
   classNameBindings: [':btn', 'noText', 'btnType'],
-  attributeBindings: ['disabled', 'translatedTitle:title', 'tabindex'],
+  attributeBindings: ['disabled', 'translatedTitle:title', 'translatedTitle:aria-label', 'tabindex'],
 
   btnIcon: Ember.computed.notEmpty('icon'),
 
@@ -23,7 +23,7 @@ export default Ember.Component.extend({
 
   @computed("title")
   translatedTitle(title) {
-    return title ? I18n.t(title) : this.get('translatedLabel');
+    if (title) return I18n.t(title);
   },
 
   @computed("label")
diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6
index 3d357ec2255..d320767144c 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor.js.es6
@@ -8,9 +8,11 @@ import { emojiSearch, isSkinTonableEmoji } from 'pretty-text/emoji';
 import { emojiUrlFor } from 'discourse/lib/text';
 import { getRegister } from 'discourse-common/lib/get-owner';
 import { findRawTemplate } from 'discourse/lib/raw-templates';
+import { siteDir } from 'discourse/lib/text-direction';
 import { determinePostReplaceSelection, clipboardData } from 'discourse/lib/utilities';
 import toMarkdown from 'discourse/lib/to-markdown';
 import deprecated from 'discourse-common/lib/deprecated';
+import { wantsNewWindow } from 'discourse/lib/intercept-click';
 
 // Our head can be a static string or a function that returns a string
 // based on input (like for numbered lists).
@@ -44,7 +46,8 @@ const isInside = (text, regex) => {
 
 class Toolbar {
 
-  constructor(site) {
+  constructor(opts) {
+    const { site, siteSettings } = opts;
     this.shortcuts = {};
 
     this.groups = [
@@ -73,7 +76,14 @@ class Toolbar {
       perform: e => e.applySurround('_', '_', 'italic_text')
     });
 
-    this.addButton({id: 'link', group: 'insertions', shortcut: 'K', action: 'showLinkModal'});
+    if (opts.showLink) {
+      this.addButton({
+        id: 'link',
+        group: 'insertions',
+        shortcut: 'K',
+        action: 'showLinkModal'
+      });
+    }
 
     this.addButton({
       id: 'quote',
@@ -107,6 +117,17 @@ class Toolbar {
       perform: e => e.applyList(i => !i ? "1. " : `${parseInt(i) + 1}. `, 'list_item')
     });
 
+    if (siteSettings.support_mixed_text_direction) {
+      this.addButton({
+        id: 'toggle-direction',
+        group: 'extras',
+        icon: 'exchange',
+        shortcut: 'Shift+6',
+        title: 'composer.toggle_direction',
+        perform: e => e.toggleDirection(),
+      });
+    }
+
     if (site.mobileView) {
       this.groups.push({group: 'mobileExtras', buttons: []});
     }
@@ -188,6 +209,7 @@ export default Ember.Component.extend({
   lastSel: null,
   _mouseTrap: null,
   emojiPickerIsActive: false,
+  showLink: true,
 
   @computed('placeholder')
   placeholderTranslated(placeholder) {
@@ -237,7 +259,15 @@ export default Ember.Component.extend({
 
     // disable clicking on links in the preview
     this.$('.d-editor-preview').on('click.preview', e => {
-      if ($(e.target).is("a")) {
+      if (wantsNewWindow(e)) { return; }
+      const $target = $(e.target);
+      if ($target.is("a.mention")) {
+        this.appEvents.trigger('click.discourse-preview-user-card-mention', $target);
+      }
+      if ($target.is("a.mention-group")) {
+        this.appEvents.trigger('click.discourse-preview-group-card-mention-group', $target);
+      }
+      if ($target.is("a")) {
         e.preventDefault();
         return false;
       }
@@ -254,6 +284,7 @@ export default Ember.Component.extend({
   @on('willDestroyElement')
   _shutDown() {
     if (this.get('composerEvents')) {
+      this.appEvents.off('composer:insert-block');
       this.appEvents.off('composer:insert-text');
       this.appEvents.off('composer:replace-text');
     }
@@ -266,7 +297,9 @@ export default Ember.Component.extend({
 
   @computed
   toolbar() {
-    const toolbar = new Toolbar(this.site);
+    const toolbar = new Toolbar(
+      this.getProperties('site', 'siteSettings', 'showLink')
+    );
     _createCallbacks.forEach(cb => cb(toolbar));
     this.sendAction('extraButtons', toolbar);
     return toolbar;
@@ -312,6 +345,9 @@ export default Ember.Component.extend({
         return obj.text;
       },
       dataSource(term) {
+        if (term.match(/\s/)) {
+          return null;
+        }
         return searchCategoryTag(term, siteSettings);
       },
       triggerRule(textarea, opts) {
@@ -333,7 +369,11 @@ export default Ember.Component.extend({
       },
 
       onKeyUp(text, cp) {
-        return text.substring(0, cp).match(/(:(?!:).?[\w-]*:?(?!:)(?:t\d?)?:?) ?$/g);
+        const matches = /(?:^|[^a-z])(:(?!:).?[\w-]*:?(?!:)(?:t\d?)?:?) ?$/gi.exec(text.substring(0, cp));
+
+        if (matches && matches[1]) {
+          return [ matches[1] ];
+        }
       },
 
       transformComplete(v) {
@@ -646,6 +686,14 @@ export default Ember.Component.extend({
     return null;
   },
 
+  _toggleDirection() {
+    const $textArea = $(".d-editor-input");
+    let currentDir = $textArea.attr('dir') ? $textArea.attr('dir') : siteDir(),
+        newDir = currentDir === 'ltr' ? 'rtl' : 'ltr';
+
+    $textArea.attr('dir', newDir).focus();
+  },
+
   paste(e) {
     if (!$(".d-editor-input").is(":focus")) {
       return;
@@ -714,6 +762,8 @@ export default Ember.Component.extend({
     },
 
     toolbarButton(button) {
+      if (this.get('disabled')) { return; }
+
       const selected = this._getSelected(button.trimLeading);
       const toolbarEvent = {
         selected,
@@ -723,6 +773,7 @@ export default Ember.Component.extend({
         addText: text => this._addText(selected, text),
         replaceText: text => this._addText({pre: '', post: ''}, text),
         getText: () => this.get('value'),
+        toggleDirection: () => this._toggleDirection(),
       };
 
       if (button.sendAction) {
@@ -733,11 +784,20 @@ export default Ember.Component.extend({
     },
 
     showLinkModal() {
+      if (this.get('disabled')) { return; }
+
       this._lastSel = this._getSelected();
+
+      if (this._lastSel) {
+        this.set("linkText", this._lastSel.value.trim());
+      }
+
       this.set('insertLinkHidden', false);
     },
 
     formatCode() {
+      if (this.get('disabled')) { return; }
+
       const sel = this._getSelected('', { lineVal: true });
       const selValue = sel.value;
       const hasNewLine = selValue.indexOf("\n") !== -1;
@@ -791,6 +851,7 @@ export default Ember.Component.extend({
     },
 
     emoji() {
+      if (this.get('disabled')) { return; }
       this.set('emojiPickerIsActive', !this.get('emojiPickerIsActive'));
     }
   }
diff --git a/app/assets/javascripts/discourse/components/d-modal-body.js.es6 b/app/assets/javascripts/discourse/components/d-modal-body.js.es6
index 660456db7f5..04c9754dd88 100644
--- a/app/assets/javascripts/discourse/components/d-modal-body.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal-body.js.es6
@@ -14,11 +14,13 @@ export default Ember.Component.extend({
 
     Ember.run.scheduleOnce('afterRender', this, this._afterFirstRender);
     this.appEvents.on('modal-body:flash', msg => this._flash(msg));
+    this.appEvents.on('modal-body:clearFlash', () => this._clearFlash());
   },
 
   willDestroyElement() {
     this._super();
     this.appEvents.off('modal-body:flash');
+    this.appEvents.off('modal-body:clearFlash');
   },
 
   _afterFirstRender() {
@@ -40,15 +42,23 @@ export default Ember.Component.extend({
       this.getProperties(
         'title',
         'rawTitle',
-        'fixed'
+        'fixed',
+        'subtitle',
+        'rawSubtitle'
       )
     );
   },
 
+  _clearFlash() {
+    $('#modal-alert').hide().removeClass('alert-error', 'alert-success');
+  },
+
   _flash(msg) {
-    $('#modal-alert').hide()
-                     .removeClass('alert-error', 'alert-success')
-                     .addClass(`alert alert-${msg.messageClass || 'success'}`).html(msg.text || '')
-                     .fadeIn();
+    this._clearFlash();
+
+    $('#modal-alert')
+      .addClass(`alert alert-${msg.messageClass || 'success'}`)
+      .html(msg.text || '')
+      .fadeIn();
   },
 });
diff --git a/app/assets/javascripts/discourse/components/d-modal.js.es6 b/app/assets/javascripts/discourse/components/d-modal.js.es6
index c015ca6ba52..a57f4daea09 100644
--- a/app/assets/javascripts/discourse/components/d-modal.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal.js.es6
@@ -28,6 +28,7 @@ export default Ember.Component.extend({
 
     this.appEvents.on('modal:body-shown', data => {
       if (this.isDestroying || this.isDestroyed) { return; }
+
       if (data.fixed) {
         this.$().removeClass('hidden');
       }
@@ -37,6 +38,16 @@ export default Ember.Component.extend({
       } else if (data.rawTitle) {
         this.set('title', data.rawTitle);
       }
+
+      if (data.subtitle) {
+        this.set('subtitle', I18n.t(data.subtitle));
+      } else if (data.rawSubtitle) {
+        this.set('subtitle', data.rawSubtitle);
+      } else {
+        // if no subtitle provided, makes sure the previous subtitle
+        // of another modal is not used
+        this.set('subtitle', null);
+      }
     });
   },
 
diff --git a/app/assets/javascripts/discourse/components/d-navigation.js.es6 b/app/assets/javascripts/discourse/components/d-navigation.js.es6
index ff1e6ef40aa..313386c6219 100644
--- a/app/assets/javascripts/discourse/components/d-navigation.js.es6
+++ b/app/assets/javascripts/discourse/components/d-navigation.js.es6
@@ -13,6 +13,12 @@ export default Ember.Component.extend({
     return this.site.get('categoriesList');
   },
 
+  @computed('hasDraft')
+  createTopicLabel(hasDraft)
+  {
+    return hasDraft ? 'topic.open_draft': 'topic.create';
+  },
+
   @computed('category.can_edit')
   showCategoryEdit: canEdit => canEdit,
 
diff --git a/app/assets/javascripts/discourse/components/date-picker.js.es6 b/app/assets/javascripts/discourse/components/date-picker.js.es6
index 709e1e51497..180c46c3623 100644
--- a/app/assets/javascripts/discourse/components/date-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/date-picker.js.es6
@@ -36,6 +36,9 @@ export default Ember.Component.extend({
 
   @on("willDestroyElement")
   _destroy() {
+    if (this._picker) {
+      this._picker.destroy();
+    }
     this._picker = null;
   },
 
diff --git a/app/assets/javascripts/discourse/components/desktop-notification-config.js.es6 b/app/assets/javascripts/discourse/components/desktop-notification-config.js.es6
index d1ad4f28abb..9b981b6b8f3 100644
--- a/app/assets/javascripts/discourse/components/desktop-notification-config.js.es6
+++ b/app/assets/javascripts/discourse/components/desktop-notification-config.js.es6
@@ -1,6 +1,13 @@
 import computed from 'ember-addons/ember-computed-decorators';
 import KeyValueStore from 'discourse/lib/key-value-store';
-import { context } from 'discourse/lib/desktop-notifications';
+import { context, confirmNotification } from 'discourse/lib/desktop-notifications';
+import {
+  subscribe as subscribePushNotification,
+  unsubscribe as unsubscribePushNotification,
+  isPushNotificationsSupported,
+  keyValueStore as pushNotificationKeyValueStore,
+  userSubscriptionKey as pushNotificationUserSubscriptionKey
+} from 'discourse/lib/push-notifications';
 
 const keyValueStore = new KeyValueStore(context);
 
@@ -28,11 +35,6 @@ export default Ember.Component.extend({
     return typeof window.Notification === "undefined";
   },
 
-  @computed("isNotSupported", "notificationsPermission")
-  isDefaultPermission(isNotSupported, notificationsPermission) {
-    return isNotSupported ? false : notificationsPermission === "default";
-  },
-
   @computed("isNotSupported", "notificationsPermission")
   isDeniedPermission(isNotSupported, notificationsPermission) {
     return isNotSupported ? false : notificationsPermission === "denied";
@@ -44,27 +46,65 @@ export default Ember.Component.extend({
   },
 
   @computed("isGrantedPermission", "notificationsDisabled")
-  isEnabled(isGrantedPermission, notificationsDisabled) {
+  isEnabledDesktop(isGrantedPermission, notificationsDisabled) {
     return isGrantedPermission ? !notificationsDisabled : false;
   },
 
-  actions: {
-    requestPermission() {
-      Notification.requestPermission(() => this.propertyDidChange('notificationsPermission'));
+  @computed
+  isEnabledPush: {
+    set(value) {
+      const user = this.currentUser;
+      if(!user) {
+        return false;
+      }
+      pushNotificationKeyValueStore.setItem(pushNotificationUserSubscriptionKey(user), value);
+      return pushNotificationKeyValueStore.getItem(pushNotificationUserSubscriptionKey(user));
     },
+    get() {
+      const user = this.currentUser;
+      return user ? pushNotificationKeyValueStore.getItem(pushNotificationUserSubscriptionKey(user)) : false;
+    }
+  },
 
+  isEnabled: Ember.computed.or("isEnabledDesktop", "isEnabledPush"),
+
+  isPushNotificationsPreferred() {
+    if(!this.site.mobileView) {
+      return false;
+    }
+    return isPushNotificationsSupported(this.site.mobileView);
+  },
+
+  actions: {
     recheckPermission() {
       this.propertyDidChange('notificationsPermission');
     },
 
     turnoff() {
-      this.set('notificationsDisabled', 'disabled');
-      this.propertyDidChange('notificationsPermission');
+      if(this.get('isEnabledDesktop')) {
+        this.set('notificationsDisabled', 'disabled');
+        this.propertyDidChange('notificationsPermission');
+      }
+      if(this.get('isEnabledPush')) {
+        unsubscribePushNotification(this.currentUser, () => {
+          this.set("isEnabledPush", '');
+        });
+      }
     },
 
     turnon() {
-      this.set('notificationsDisabled', '');
-      this.propertyDidChange('notificationsPermission');
+      if(this.isPushNotificationsPreferred()) {
+        subscribePushNotification(() => {
+          this.set("isEnabledPush", 'subscribed');
+        }, this.siteSettings.vapid_public_key_bytes);
+      }
+      else {
+        this.set('notificationsDisabled', '');
+        Notification.requestPermission(() =>  {
+          confirmNotification();
+          this.propertyDidChange('notificationsPermission');
+        });
+      }
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/directory-toggle.js.es6 b/app/assets/javascripts/discourse/components/directory-toggle.js.es6
index 8da529957a4..f6a9de9b800 100644
--- a/app/assets/javascripts/discourse/components/directory-toggle.js.es6
+++ b/app/assets/javascripts/discourse/components/directory-toggle.js.es6
@@ -1,16 +1,22 @@
 import { iconHTML } from 'discourse-common/lib/icon-library';
 import { bufferedRender } from 'discourse-common/lib/buffered-render';
+import computed from 'ember-addons/ember-computed-decorators';
 
 export default Ember.Component.extend(bufferedRender({
   tagName: 'th',
   classNames: ['sortable'],
   attributeBindings: ['title'],
   rerenderTriggers: ['order', 'asc'],
+  labelKey: null,
+
+  @computed("field", "labelKey")
+  title(field, labelKey) {
+    if (!labelKey) {
+      labelKey = `directory.${this.get('field')}`;
+    }
 
-  title: function() {
-    const labelKey = 'directory.' + this.get('field');
     return I18n.t(labelKey + '_long', { defaultValue: I18n.t(labelKey) });
-  }.property('field'),
+  },
 
   buildBuffer(buffer) {
     const icon = this.get('icon');
@@ -19,7 +25,7 @@ export default Ember.Component.extend(bufferedRender({
     }
 
     const field = this.get('field');
-    buffer.push(I18n.t('directory.' + field));
+    buffer.push(I18n.t(this.get('labelKey') || `directory.${field}`));
 
     if (field === this.get('order')) {
       buffer.push(iconHTML(this.get('asc') ? 'chevron-up' : 'chevron-down'));
diff --git a/app/assets/javascripts/discourse/components/discourse-linked-text.js.es6 b/app/assets/javascripts/discourse/components/discourse-linked-text.js.es6
new file mode 100644
index 00000000000..44e8bf9e596
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/discourse-linked-text.js.es6
@@ -0,0 +1,18 @@
+import { default as computed } from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+  tagName: 'span',
+
+  @computed("text")
+  translatedText(text) {
+    if (text) return I18n.t(text);
+  },
+
+  click(event) {
+    if (event.target.tagName.toUpperCase() === 'A') {
+      this.sendAction("action", this.get("actionParam"));
+    }
+
+    return false;
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6 b/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6
index 421972b834c..4b853e541da 100644
--- a/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6
@@ -46,5 +46,12 @@ export default Ember.Component.extend({
     }
 
     this.set("topicTimer.updateTime", time);
-  }
+  },
+
+  @observes("selection")
+  _updateBasedOnLastPost() {
+    if (!this.get('autoClose')) {
+      this.set('topicTimer.based_on_last_post', false);
+    }
+  },
 });
diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js.es6 b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
index 03efe27a53c..0bf7f9f7bf3 100644
--- a/app/assets/javascripts/discourse/components/emoji-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
@@ -2,8 +2,8 @@ import { on, observes } from "ember-addons/ember-computed-decorators";
 import { findRawTemplate } from "discourse/lib/raw-templates";
 import { emojiUrlFor } from "discourse/lib/text";
 import KeyValueStore from "discourse/lib/key-value-store";
-import { emojis } from "pretty-text/emoji/data";
-import { extendedEmojiList, isSkinTonableEmoji } from "pretty-text/emoji";
+import { extendedEmojiList, isSkinTonableEmoji, emojiSearch } from "pretty-text/emoji";
+const { run } = Ember;
 
 const keyValueStore = new KeyValueStore("discourse_emojis_");
 const EMOJI_USAGE = "emojiUsage";
@@ -44,13 +44,13 @@ export default Ember.Component.extend({
     this.set("selectedDiversity", keyValueStore.getObject(EMOJI_SELECTED_DIVERSITY) || 1);
     this.set("recentEmojis", keyValueStore.getObject(EMOJI_USAGE) || []);
 
-    Ember.run.scheduleOnce("afterRender", this, function() {
+    run.scheduleOnce("afterRender", this, function() {
       this._bindEvents();
-      this._sectionLoadingCheck();
       this._loadCategoriesEmojis();
       this._positionPicker();
       this._scrollTo();
       this._updateSelectedDiversity();
+      this._checkVisibleSection(true);
     });
   },
 
@@ -83,13 +83,14 @@ export default Ember.Component.extend({
 
   @on("didUpdateAttrs")
   _setState() {
-    this.get("active") === true ? this.show() : this.close();
+    this.get("active") ? this.show() : this.close();
   },
 
   @observes("filter")
   filterChanged() {
     this.$filter.find(".clear-filter").toggle(!_.isEmpty(this.get("filter")));
-    Ember.run.debounce(this, this._filterEmojisList, 250);
+    const filterDelay = this.site.isMobileDevice ? 400 : 250;
+    run.debounce(this, this._filterEmojisList, filterDelay);
   },
 
   @observes("selectedDiversity")
@@ -105,6 +106,7 @@ export default Ember.Component.extend({
     }
 
     this._updateSelectedDiversity();
+    this._checkVisibleSection(true);
   },
 
   @observes("recentEmojis")
@@ -146,11 +148,6 @@ export default Ember.Component.extend({
       .addClass("selected");
   },
 
-  _sectionLoadingCheck() {
-    this._checkTimeout = setTimeout(() => { this._sectionLoadingCheck(); }, 500);
-    Ember.run.throttle(this, this._checkVisibleSection, 100);
-  },
-
   _loadCategoriesEmojis() {
     $.each(this.$picker.find(".categories-column button.emoji"), (_, button) => {
       const $button = $(button);
@@ -177,13 +174,17 @@ export default Ember.Component.extend({
   _bindModalClick() {
     this.$modal.on("click", () => this.set("active", false));
 
-    this.$(document).on("click.emoji-picker", (event) => {
-      const onPicker = $(event.target).parents(".emoji-picker").length === 1;
-      const onGrippie = event.target.className.indexOf("grippie") > -1;
-      if(!onPicker && !onGrippie) {
-        this.set("active", false);
-        return false;
+    $('html').on("mouseup.emoji-picker", event => {
+      let $target = $(event.target);
+      if ($target.closest(".emoji-picker").length ||
+          $target.closest('.emoji.btn').length ||
+          $target.hasClass('grippie')) {
+        return;
       }
+
+      // Close the popup if clicked outside
+      this.set("active", false);
+      return false;
     });
   },
 
@@ -191,22 +192,19 @@ export default Ember.Component.extend({
   _unbindEvents() {
     this.$().off();
     this.$(window).off("resize");
-    this.$modal.off("click");
+    clearInterval(this._refreshInterval);
     $("#reply-control").off("div-resizing");
-    this.$(document).off("click.emoji-picker");
+    $('html').off("mouseup.emoji-picker");
   },
 
   _filterEmojisList() {
     if (this.get("filter") === "") {
       this.$filter.find("input[name='filter']").val("");
       this.$results.empty().hide();
-      this.$list.show();
+      this.$list.css("visibility", "visible");
     } else {
       const lowerCaseFilter = this.get("filter").toLowerCase();
-      const filterableEmojis = emojis.concat(_.keys(extendedEmojiList()));
-      const filteredCodes = _.filter(filterableEmojis, code => {
-        return code.indexOf(lowerCaseFilter) > -1;
-      }).slice(0, 30);
+      const filteredCodes = emojiSearch(lowerCaseFilter, { maxResults: 30});
       this.$results.empty().html(
         _.map(filteredCodes, (code) => {
           const hasDiversity = isSkinTonableEmoji(code);
@@ -217,7 +215,7 @@ export default Ember.Component.extend({
       ).show();
       this._bindHover(this.$results);
       this._bindEmojiClick(this.$results);
-      this.$list.hide();
+      this.$list.css("visibility", "hidden");
     }
   },
 
@@ -239,7 +237,7 @@ export default Ember.Component.extend({
     this.$picker.find(".category-icon").on("click", "button.emoji", (event) => {
       this.set("filter", "");
       this.$results.empty();
-      this.$list.show();
+      this.$list.css("visibility", "visible");
 
       const section = $(event.currentTarget).data("section");
       const $section = this.$list.find(`.section[data-section="${section}"]`);
@@ -264,11 +262,11 @@ export default Ember.Component.extend({
 
   _bindResizing() {
     this.$(window).on("resize", () => {
-      Ember.run.throttle(this, this._positionPicker, 16);
+      run.throttle(this, this._positionPicker, 16);
     });
 
     $("#reply-control").on("div-resizing", () => {
-      Ember.run.throttle(this, this._positionPicker, 16);
+      run.throttle(this, this._positionPicker, 16);
     });
   },
 
@@ -318,18 +316,27 @@ export default Ember.Component.extend({
   },
 
   _bindSectionsScroll() {
-    this.$list.on("scroll", () => {
-      this.scrollPosition = this.$list.scrollTop();
-      Ember.run.throttle(this, this._checkVisibleSection, 150);
-    });
+    let onScroll = () => {
+      run.debounce(this, this._checkVisibleSection, 50);
+    };
+
+    this.$list.on("scroll", onScroll);
+    this._refreshInterval = setInterval(onScroll, 100);
   },
 
-  _checkVisibleSection() {
+  _checkVisibleSection(force) {
     // make sure we stop loading if picker has been removed
     if(!this.$picker) {
       return;
     }
 
+    const newPosition = this.$list.scrollTop();
+    if (newPosition === this.scrollPosition && !force) {
+      return;
+    }
+
+    this.scrollPosition = newPosition;
+
     const $sections = this.$list.find(".section");
     const listHeight = this.$list.innerHeight();
     let $selectedSection;
@@ -362,15 +369,19 @@ export default Ember.Component.extend({
     }
 
     const listHeight = this.$list.innerHeight();
+
+
     this.$visibleSections.forEach(visibleSection => {
       const $unloadedEmojis = $(visibleSection).find("button.emoji[data-loaded!='1']");
       $.each($unloadedEmojis, (_, button) => {
-        const $button = $(button);
-        const buttonTop = $button.position().top;
-        const buttonHeight = $button.height();
 
-        if(buttonTop + buttonHeight > 0 && buttonTop - buttonHeight < listHeight) {
-          this._setButtonBackground($button);
+        let offsetTop = button.offsetTop;
+
+        if (offsetTop < this.scrollPosition + listHeight + 200) {
+          if (offsetTop + 200 > this.scrollPosition) {
+            const $button = $(button);
+            this._setButtonBackground($button);
+          }
         }
       });
     });
@@ -415,12 +426,12 @@ export default Ember.Component.extend({
 
     const mobilePositioning = options => {
       let attributes = {
-        width: windowWidth - 12,
-        marginLeft: 5,
-        marginTop: -130,
+        width: windowWidth,
+        marginLeft: 0,
+        marginTop: "auto",
         left: 0,
         bottom: "",
-        top: "50%",
+        top: 0,
         display: "flex"
       };
 
@@ -445,7 +456,7 @@ export default Ember.Component.extend({
       this.$picker.css(_.merge(attributes, options));
     };
 
-    if(Ember.testing || this.get("automaticPositioning") === false) {
+    if(Ember.testing || !this.get("automaticPositioning")) {
       desktopPositioning();
       return;
     }
@@ -510,7 +521,7 @@ export default Ember.Component.extend({
     this.$list.scrollTop(yPosition);
 
     // if we don’t actually scroll we need to force it
-    if(yPosition === 0) {
+    if (yPosition === 0) {
       this.$list.scroll();
     }
   },
@@ -521,19 +532,31 @@ export default Ember.Component.extend({
   },
 
   _setButtonBackground(button, diversity) {
-    const $button = $(button);
-    const code = this._codeWithDiversity(
-      $button.attr("title"),
-      diversity || $button.hasClass("diversity")
-    );
 
-    // force visual reloading if needed
-    if($button.css("background-image") !== "none") {
-      $button.css("background-image", "");
+    if (!button) {
+      return;
     }
 
-    $button
-      .attr("data-loaded", 1)
-      .css("background-image", `url("${emojiUrlFor(code)}")`);
+    const $button = $(button);
+    button = $button[0];
+
+    // changing style can force layout events
+    // this could slow down timers and lead to
+    // chrome delaying the request
+    window.requestAnimationFrame(() =>{
+      const code = this._codeWithDiversity(
+        $button.attr("title"),
+        diversity || $button.hasClass("diversity")
+      );
+
+      // // force visual reloading if needed
+      if(button.style.backgroundImage !== "none") {
+        button.style.backgroundImage = "";
+      }
+
+      button.style.backgroundImage = `url("${emojiUrlFor(code)}")`;
+      $button.attr("data-loaded", 1);
+    });
+
   },
 });
diff --git a/app/assets/javascripts/discourse/components/flag-action-type.js.es6 b/app/assets/javascripts/discourse/components/flag-action-type.js.es6
index 7f0ffb70edc..fe2b5c601a0 100644
--- a/app/assets/javascripts/discourse/components/flag-action-type.js.es6
+++ b/app/assets/javascripts/discourse/components/flag-action-type.js.es6
@@ -34,13 +34,13 @@ export default Ember.Component.extend({
 
   @computed('message.length')
   customMessageLengthClasses(messageLength) {
-    return (messageLength < Discourse.SiteSettings.min_private_message_post_length) ? "too-short" : "ok";
+    return (messageLength < Discourse.SiteSettings.min_personal_message_post_length) ? "too-short" : "ok";
   },
 
   @computed('message.length')
   customMessageLength(messageLength) {
     const len = messageLength || 0;
-    const minLen = Discourse.SiteSettings.min_private_message_post_length;
+    const minLen = Discourse.SiteSettings.min_personal_message_post_length;
     if (len === 0) {
       return I18n.t("flagging.custom_message.at_least", { count: minLen });
     } else if (len < minLen) {
diff --git a/app/assets/javascripts/discourse/components/global-notice.js.es6 b/app/assets/javascripts/discourse/components/global-notice.js.es6
index 06f7e68a166..9ea7f4104bd 100644
--- a/app/assets/javascripts/discourse/components/global-notice.js.es6
+++ b/app/assets/javascripts/discourse/components/global-notice.js.es6
@@ -9,6 +9,11 @@ export default Ember.Component.extend(bufferedRender({
   buildBuffer(buffer) {
     let notices = [];
 
+    if ($.cookie("dosp") === "1") {
+      $.cookie("dosp", null, { path: '/' });
+      notices.push([I18n.t("forced_anonymous"), 'forced-anonymous']);
+    }
+
     if (this.session.get('safe_mode')) {
       notices.push([I18n.t("safe_mode.enabled"), 'safe-mode']);
     }
diff --git a/app/assets/javascripts/discourse/components/group-card-contents.js.es6 b/app/assets/javascripts/discourse/components/group-card-contents.js.es6
new file mode 100644
index 00000000000..e21410fa511
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/group-card-contents.js.es6
@@ -0,0 +1,83 @@
+import { setting } from 'discourse/lib/computed';
+import { default as computed } from 'ember-addons/ember-computed-decorators';
+import CardContentsBase from 'discourse/mixins/card-contents-base';
+import CleansUp from 'discourse/mixins/cleans-up';
+
+const maxMembersToDisplay = 10;
+
+export default Ember.Component.extend(CardContentsBase, CleansUp, {
+  elementId: 'group-card',
+  triggeringLinkClass: 'mention-group',
+  classNames: ['no-bg'],
+  classNameBindings: ['visible:show', 'showBadges', 'hasCardBadgeImage', 'isFixed:fixed'],
+  allowBackgrounds: setting('allow_profile_backgrounds'),
+  showBadges: setting('enable_badges'),
+
+  postStream: Ember.computed.alias('topic.postStream'),
+  viewingTopic: Ember.computed.match('currentPath', /^topic\./),
+
+  showMoreMembers: Ember.computed.gt('moreMembersCount', 0),
+
+  group: null,
+
+  @computed('group.user_count', 'group.members.length')
+  moreMembersCount: (memberCount, maxMemberDisplay) => memberCount - maxMemberDisplay,
+
+  @computed('group')
+  groupPath(group) {
+    return `${Discourse.BaseUri}/groups/${group.name}`;
+  },
+
+  _showCallback(username, $target) {
+    this.store.find("group", username).then(group => {
+      this.setProperties({ group, visible: true });
+      this._positionCard($target);
+      if(!group.flair_url && !group.flair_bg_color) {
+        group.set('flair_url', 'fa-users');
+      }
+      group.set('limit', maxMembersToDisplay);
+      return group.findMembers();
+    }).catch(() => this._close()).finally(() => this.set('loading', null));
+  },
+
+  didInsertElement() {
+    this._super();
+  },
+
+  _close() {
+    this._super();
+    this.setProperties({
+      group: null,
+    });
+  },
+
+  cleanUp() {
+    this._close();
+  },
+
+  actions: {
+    close() {
+      this._close();
+    },
+
+    cancelFilter() {
+      const postStream = this.get('postStream');
+      postStream.cancelFilter();
+      postStream.refresh();
+      this._close();
+    },
+
+    composePrivateMessage(...args) {
+      this.sendAction('composePrivateMessage', ...args);
+    },
+
+    messageGroup() {
+      this.sendAction('createNewMessageViaParams', this.get('group.name'));
+    },
+
+    showGroup() {
+      this.sendAction('showGroup', this.get('group'));
+      this._close();
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6 b/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6
index ce4113450b3..bb6cb51fe8a 100644
--- a/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6
+++ b/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6
@@ -34,7 +34,7 @@ export default Ember.Component.extend({
 
     if (flairHexColor) style += `color: #${flairHexColor};`;
 
-    return style;
+    return Ember.String.htmlSafe(style);
   },
 
   @computed('model.flairBackgroundHexColor')
diff --git a/app/assets/javascripts/discourse/components/group-index-toggle.js.es6 b/app/assets/javascripts/discourse/components/group-index-toggle.js.es6
index f5b24684087..6967a502a81 100644
--- a/app/assets/javascripts/discourse/components/group-index-toggle.js.es6
+++ b/app/assets/javascripts/discourse/components/group-index-toggle.js.es6
@@ -7,11 +7,13 @@ export default Ember.Component.extend(bufferedRender({
   rerenderTriggers: ['order', 'desc'],
 
   buildBuffer(buffer) {
+    buffer.push("<span class='header-contents'>");
     buffer.push(I18n.t(this.get('i18nKey')));
 
     if (this.get('field') === this.get('order')) {
       buffer.push(iconHTML(this.get('desc') ? 'chevron-down' : 'chevron-up'));
     }
+    buffer.push("</span>");
   },
 
   click() {
diff --git a/app/assets/javascripts/discourse/components/group-logs-filter.js.es6 b/app/assets/javascripts/discourse/components/group-manage-logs-filter.js.es6
similarity index 89%
rename from app/assets/javascripts/discourse/components/group-logs-filter.js.es6
rename to app/assets/javascripts/discourse/components/group-manage-logs-filter.js.es6
index ba4ccc3f742..d598bc568fe 100644
--- a/app/assets/javascripts/discourse/components/group-logs-filter.js.es6
+++ b/app/assets/javascripts/discourse/components/group-manage-logs-filter.js.es6
@@ -5,7 +5,7 @@ export default Ember.Component.extend({
 
   @computed('type')
   label(type) {
-    return I18n.t(`groups.logs.${type}`);
+    return I18n.t(`groups.manage.logs.${type}`);
   },
 
   @computed('value', 'type')
diff --git a/app/assets/javascripts/discourse/components/group-logs-row.js.es6 b/app/assets/javascripts/discourse/components/group-manage-logs-row.js.es6
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-logs-row.js.es6
rename to app/assets/javascripts/discourse/components/group-manage-logs-row.js.es6
diff --git a/app/assets/javascripts/discourse/components/group-manage-save-button.js.es6 b/app/assets/javascripts/discourse/components/group-manage-save-button.js.es6
new file mode 100644
index 00000000000..1055dc8913b
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/group-manage-save-button.js.es6
@@ -0,0 +1,25 @@
+import { popupAjaxError } from 'discourse/lib/ajax-error';
+import computed from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+  saving: null,
+
+  @computed('saving')
+  savingText(saving) {
+    if (saving) return I18n.t("saving");
+    return saving ? I18n.t("saving") : I18n.t("save");
+  },
+
+  actions: {
+    save() {
+      this.set('saving', true);
+
+      return this.get('model').save()
+        .then(() => {
+          this.set("saved", true);
+        })
+        .catch(popupAjaxError)
+        .finally(() => this.set('saving', false));
+    }
+  },
+});
diff --git a/app/assets/javascripts/discourse/components/group-member-dropdown.js.es6 b/app/assets/javascripts/discourse/components/group-member-dropdown.js.es6
new file mode 100644
index 00000000000..0ba9bb5d1ce
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/group-member-dropdown.js.es6
@@ -0,0 +1,65 @@
+import { iconHTML } from 'discourse-common/lib/icon-library';
+import DropdownButton from 'discourse/components/dropdown-button';
+import computed from "ember-addons/ember-computed-decorators";
+
+export default DropdownButton.extend({
+  buttonExtraClasses: 'no-text',
+  title: '',
+  text: iconHTML('wrench'),
+  classNames: ['group-member-dropdown'],
+
+  @computed("member.owner")
+  dropDownContent(isOwner) {
+    const items = [
+      {
+        id: 'removeMember',
+        title: I18n.t('groups.members.remove_member'),
+        description: I18n.t(
+          'groups.members.remove_member_description',
+          { username: this.get('member.username') }
+        ),
+        icon: 'user-times'
+      }
+    ];
+
+    if (this.currentUser && this.currentUser.admin) {
+      if (isOwner) {
+        items.push({
+          id: 'removeOwner',
+          title: I18n.t('groups.members.remove_owner'),
+          description: I18n.t(
+            'groups.members.remove_owner_description',
+            { username: this.get('member.username') }
+          ),
+          icon: 'shield'
+        });
+      } else {
+        items.push({
+          id: 'makeOwner',
+          title: I18n.t('groups.members.make_owner'),
+          description: I18n.t(
+            'groups.members.make_owner_description',
+            { username: this.get('member.username') }
+          ),
+          icon: 'shield'
+        });
+      }
+    }
+
+    return items;
+  },
+
+  clicked(id) {
+    switch (id) {
+      case 'removeMember':
+        this.sendAction('removeMember', this.get('member'));
+        break;
+      case 'makeOwner':
+        this.sendAction('makeOwner', this.get('member.username'));
+        break;
+      case 'removeOwner':
+        this.sendAction('removeOwner', this.get('member'));
+        break;
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/group-members-input.js.es6 b/app/assets/javascripts/discourse/components/group-members-input.js.es6
index 691eb051bbc..1bb3ca048d7 100644
--- a/app/assets/javascripts/discourse/components/group-members-input.js.es6
+++ b/app/assets/javascripts/discourse/components/group-members-input.js.es6
@@ -55,7 +55,7 @@ export default Ember.Component.extend({
     },
 
     removeMember(member) {
-      const message = I18n.t("groups.edit.delete_member_confirm",{
+      const message = I18n.t("groups.manage.delete_member_confirm",{
         username: member.get("username"),
         group: this.get("model.name")
       });
diff --git a/app/assets/javascripts/discourse/components/group-membership-button.js.es6 b/app/assets/javascripts/discourse/components/group-membership-button.js.es6
index 99c5273e09b..52478ada28d 100644
--- a/app/assets/javascripts/discourse/components/group-membership-button.js.es6
+++ b/app/assets/javascripts/discourse/components/group-membership-button.js.es6
@@ -3,6 +3,8 @@ import { popupAjaxError } from 'discourse/lib/ajax-error';
 import showModal from 'discourse/lib/show-modal';
 
 export default Ember.Component.extend({
+  classNames: ["group-membership-button"],
+
   @computed("model.public_admission", "userIsGroupUser")
   canJoinGroup(publicAdmission, userIsGroupUser) {
     return publicAdmission && !userIsGroupUser;
@@ -13,13 +15,9 @@ export default Ember.Component.extend({
     return publicExit && userIsGroupUser;
   },
 
-  @computed("model.is_group_user", "model.id", "groupUserIds")
-  userIsGroupUser(isGroupUser, groupId, groupUserIds) {
-    if (isGroupUser !== undefined) {
-      return isGroupUser;
-    } else {
-      return !!groupUserIds && groupUserIds.includes(groupId);
-    }
+  @computed("model.is_group_user")
+  userIsGroupUser(isGroupUser) {
+    return !!isGroupUser;
   },
 
   _showLoginModal() {
diff --git a/app/assets/javascripts/discourse/components/group-navigation.js.es6 b/app/assets/javascripts/discourse/components/group-navigation.js.es6
index 35f5f238e47..e164f8c987a 100644
--- a/app/assets/javascripts/discourse/components/group-navigation.js.es6
+++ b/app/assets/javascripts/discourse/components/group-navigation.js.es6
@@ -1,15 +1,3 @@
-import computed from 'ember-addons/ember-computed-decorators';
-
 export default Ember.Component.extend({
   tagName: '',
-
-  @computed('group')
-  availableTabs(group) {
-    return this.get('tabs').filter(t => {
-      if (t.admin) {
-        return this.currentUser ? this.currentUser.canManageGroup(group) : false;
-      }
-      return true;
-    });
-  }
 });
diff --git a/app/assets/javascripts/discourse/components/group-post.js.es6 b/app/assets/javascripts/discourse/components/group-post.js.es6
new file mode 100644
index 00000000000..51e67b8490e
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/group-post.js.es6
@@ -0,0 +1,6 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+  @computed('post.url')
+  postUrl: Discourse.getURL
+});
diff --git a/app/assets/javascripts/discourse/components/groups-form-interaction-fields.js.es6 b/app/assets/javascripts/discourse/components/groups-form-interaction-fields.js.es6
new file mode 100644
index 00000000000..8316c6069c9
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/groups-form-interaction-fields.js.es6
@@ -0,0 +1,23 @@
+import { default as computed } from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+  visibilityLevelOptions: [
+    { name: I18n.t("admin.groups.manage.interaction.visibility_levels.public"), value: 0 },
+    { name: I18n.t("admin.groups.manage.interaction.visibility_levels.members"), value: 1 },
+    { name: I18n.t("admin.groups.manage.interaction.visibility_levels.staff"), value: 2 },
+    { name: I18n.t("admin.groups.manage.interaction.visibility_levels.owners"), value: 3 }
+  ],
+
+  aliasLevelOptions: [
+    { name: I18n.t("groups.alias_levels.nobody"), value: 0 },
+    { name: I18n.t("groups.alias_levels.only_admins"), value: 1 },
+    { name: I18n.t("groups.alias_levels.mods_and_admins"), value: 2 },
+    { name: I18n.t("groups.alias_levels.members_mods_and_admins"), value: 3 },
+    { name: I18n.t("groups.alias_levels.everyone"), value: 99 }
+  ],
+
+  @computed('siteSettings.email_in', 'model.automatic', 'currentUser.admin')
+  showEmailSettings(emailIn, automatic, isAdmin) {
+    return emailIn && isAdmin && !automatic;
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/groups-form-membership-fields.js.es6 b/app/assets/javascripts/discourse/components/groups-form-membership-fields.js.es6
new file mode 100644
index 00000000000..e9c7e8a37e3
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/groups-form-membership-fields.js.es6
@@ -0,0 +1,20 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+  trustLevelOptions: [
+    { name: I18n.t("admin.groups.manage.membership.trust_levels_none"), value: 0 },
+    { name: 1, value: 1 }, { name: 2, value: 2 }, { name: 3, value: 3 }, { name: 4, value: 4 }
+  ],
+
+  @computed('model.visibility_level', 'model.public_admission')
+  disableMembershipRequestSetting(visibility_level, publicAdmission) {
+    visibility_level = parseInt(visibility_level);
+    return (visibility_level !== 0) || publicAdmission;
+  },
+
+  @computed('model.visibility_level', 'model.allow_membership_requests')
+  disablePublicSetting(visibility_level, allowMembershipRequests) {
+    visibility_level = parseInt(visibility_level);
+    return (visibility_level !== 0) || allowMembershipRequests;
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/groups-form-profile-fields.js.es6 b/app/assets/javascripts/discourse/components/groups-form-profile-fields.js.es6
new file mode 100644
index 00000000000..c62f7710981
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/groups-form-profile-fields.js.es6
@@ -0,0 +1,89 @@
+import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+import User from "discourse/models/user";
+import InputValidation from 'discourse/models/input-validation';
+import debounce from 'discourse/lib/debounce';
+
+export default Ember.Component.extend({
+  disableSave: null,
+  nameInput: null,
+
+  didInsertElement() {
+    this._super();
+    const name = this.get('model.name');
+
+    if (name) {
+      this.set("nameInput", name);
+    } else {
+      this.set('disableSave', true);
+    }
+  },
+
+  @computed('basicNameValidation', 'uniqueNameValidation')
+  nameValidation(basicNameValidation, uniqueNameValidation) {
+    return uniqueNameValidation ? uniqueNameValidation : basicNameValidation;
+  },
+
+  @observes("nameInput")
+  _validateName() {
+    name = this.get('nameInput');
+    if (name === this.get('model.name')) return;
+
+    if (name === undefined) {
+      return this._failedInputValidation();
+    };
+
+    if (name === "") {
+      this.set('uniqueNameValidation', null);
+      return this._failedInputValidation(I18n.t('admin.groups.new.name.blank'));
+    }
+
+    if (name.length < this.siteSettings.min_username_length) {
+      return this._failedInputValidation(I18n.t('admin.groups.new.name.too_short'));
+    }
+
+    if (name.length > this.siteSettings.max_username_length) {
+      return this._failedInputValidation(I18n.t('admin.groups.new.name.too_long'));
+    }
+
+    this.checkGroupName();
+
+    return this._failedInputValidation(I18n.t('admin.groups.new.name.checking'));
+  },
+
+  checkGroupName: debounce(function() {
+    name = this.get('nameInput');
+    if (Ember.isEmpty(name)) return;
+
+    User.checkUsername(name).then(response => {
+      const validationName = 'uniqueNameValidation';
+
+      if (response.available) {
+        this.set(validationName, InputValidation.create({
+          ok: true,
+          reason: I18n.t('admin.groups.new.name.available')
+        }));
+
+        this.set('disableSave', false);
+        this.set('model.name', this.get('nameInput'));
+      } else {
+        let reason;
+
+        if (response.errors) {
+          reason = response.errors.join(' ');
+        } else {
+          reason = I18n.t('admin.groups.new.name.not_available');
+        }
+
+        this.set(validationName, this._failedInputValidation(reason));
+      }
+    });
+  }, 500),
+
+  _failedInputValidation(reason) {
+    this.set('disableSave', true);
+
+    const options = { failed: true };
+    if (reason) options.reason = reason;
+    this.set('basicNameValidation', InputValidation.create(options));
+  },
+});
diff --git a/app/assets/javascripts/discourse/components/groups-info.js.es6 b/app/assets/javascripts/discourse/components/groups-info.js.es6
new file mode 100644
index 00000000000..db6f78d73df
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/groups-info.js.es6
@@ -0,0 +1,10 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+  tagName: 'span',
+
+  @computed('group.full_name', 'group.title')
+  showFullName(fullName, title) {
+    return fullName && fullName.length && fullName !== title;
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/login-buttons.js.es6 b/app/assets/javascripts/discourse/components/login-buttons.js.es6
index 4c68d1740f2..aa90e565c73 100644
--- a/app/assets/javascripts/discourse/components/login-buttons.js.es6
+++ b/app/assets/javascripts/discourse/components/login-buttons.js.es6
@@ -13,8 +13,12 @@ export default Ember.Component.extend({
   },
 
   actions: {
-    externalLogin: function(provider) {
-      this.sendAction('action', provider);
+    emailLogin() {
+      this.sendAction('emailLogin');
+    },
+
+    externalLogin(provider) {
+      this.sendAction('externalLogin', provider);
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/login-modal.js.es6 b/app/assets/javascripts/discourse/components/login-modal.js.es6
index e366392b342..c4d710966ac 100644
--- a/app/assets/javascripts/discourse/components/login-modal.js.es6
+++ b/app/assets/javascripts/discourse/components/login-modal.js.es6
@@ -11,7 +11,7 @@ export default Ember.Component.extend({
     }
 
     Ember.run.schedule('afterRender', () => {
-      $('#login-account-password, #login-account-name').keydown(e => {
+      $('#login-account-password, #login-account-name, #login-second-factor').keydown(e => {
         if (e.keyCode === 13) {
           this.sendAction();
         }
diff --git a/app/assets/javascripts/discourse/components/navigation-item.js.es6 b/app/assets/javascripts/discourse/components/navigation-item.js.es6
index 888eb3c28ca..5c3b21d3b2e 100644
--- a/app/assets/javascripts/discourse/components/navigation-item.js.es6
+++ b/app/assets/javascripts/discourse/components/navigation-item.js.es6
@@ -3,9 +3,9 @@ import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
 export default Ember.Component.extend(bufferedRender({
   tagName: 'li',
-  classNameBindings: ['active', 'content.hasIcon:has-icon', 'content.classNames'],
+  classNameBindings: ['active', 'content.hasIcon:has-icon', 'content.classNames', 'hidden'],
   attributeBindings: ['content.title:title'],
-  hidden: Em.computed.not('content.visible'),
+  hidden: false,
   rerenderTriggers: ['content.count'],
 
   @computed("content.filterMode", "filterMode")
@@ -27,6 +27,12 @@ export default Ember.Component.extend(bufferedRender({
       }
     }
 
+    if (!this.get('active') && this.currentUser && this.currentUser.trust_level > 0 && (content.get('name') === "new" || content.get('name') === "unread") && (content.get('count') < 1)) {
+      this.set('hidden', true);
+    } else {
+      this.set('hidden', false);
+    }
+
     buffer.push(`<a href='${href}'>`);
     if (content.get('hasIcon')) {
       buffer.push("<span class='" + content.get('name') + "'></span>");
diff --git a/app/assets/javascripts/discourse/components/notification-consent-banner.js.es6 b/app/assets/javascripts/discourse/components/notification-consent-banner.js.es6
new file mode 100644
index 00000000000..2c2f5c1012c
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/notification-consent-banner.js.es6
@@ -0,0 +1,45 @@
+import { default as computed } from 'ember-addons/ember-computed-decorators';
+
+import {
+  keyValueStore as pushNotificationKeyValueStore
+} from 'discourse/lib/push-notifications';
+
+import { default as DesktopNotificationConfig } from 'discourse/components/desktop-notification-config';
+
+const userDismissedPromptKey = "dismissed-prompt";
+
+export default DesktopNotificationConfig.extend({
+  @computed
+  bannerDismissed: {
+    set(value) {
+      pushNotificationKeyValueStore.setItem(userDismissedPromptKey, value);
+      return pushNotificationKeyValueStore.getItem(userDismissedPromptKey);
+    },
+    get() {
+      return pushNotificationKeyValueStore.getItem(userDismissedPromptKey);
+    }
+  },
+
+  @computed("isNotSupported", "isEnabled", "bannerDismissed", "currentUser.reply_count", "currentUser.topic_count")
+  showNotificationPromptBanner(isNotSupported, isEnabled, bannerDismissed, replyCount, topicCount) {
+    return (this.siteSettings.push_notifications_prompt &&
+            !isNotSupported &&
+            this.currentUser &&
+            replyCount + topicCount > 0 &&
+            Notification.permission !== "denied" &&
+            Notification.permission !== "granted" &&
+            !isEnabled &&
+            !bannerDismissed
+           );
+  },
+
+  actions: {
+    turnon() {
+      this._super();
+      this.set("bannerDismissed", true);
+    },
+    dismiss() {
+      this.set("bannerDismissed", true);
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/period-chooser.js.es6 b/app/assets/javascripts/discourse/components/period-chooser.js.es6
deleted file mode 100644
index e3bc67fb5fe..00000000000
--- a/app/assets/javascripts/discourse/components/period-chooser.js.es6
+++ /dev/null
@@ -1,46 +0,0 @@
-import CleansUp from 'discourse/mixins/cleans-up';
-
-export default Ember.Component.extend(CleansUp, {
-  classNames: 'period-chooser',
-  showPeriods: false,
-
-  cleanUp: function() {
-    this.set('showPeriods', false);
-    $('html').off('mousedown.top-period');
-  },
-
-  _clickToClose: function() {
-    const self = this;
-    $('html').off('mousedown.top-period').on('mousedown.top-period', function(e) {
-      const $target = $(e.target);
-      if (($target.prop('id') === 'topic-entrance') || (self.$().has($target).length !== 0)) {
-        return;
-      }
-      self.cleanUp();
-    });
-  },
-
-  click(e) {
-    if ($(e.target).closest('.period-popup').length) { return; }
-
-    if (!this.get('showPeriods')) {
-      if (!this.site.mobileView) {
-        const $chevron = this.$('.d-icon-caret-down');
-        this.$('#period-popup').css($chevron.position());
-      } else {
-        this.$('#period-popup').css({top: this.$().height()});
-      }
-      this.set('showPeriods', true);
-      this._clickToClose();
-    }
-  },
-
-  actions: {
-    changePeriod(p) {
-      this.cleanUp();
-      this.set('period', p);
-      this.sendAction('action', p);
-    }
-  }
-
-});
diff --git a/app/assets/javascripts/discourse/components/quote-button.js.es6 b/app/assets/javascripts/discourse/components/quote-button.js.es6
index 5d41b049cc7..49ee520e95a 100644
--- a/app/assets/javascripts/discourse/components/quote-button.js.es6
+++ b/app/assets/javascripts/discourse/components/quote-button.js.es6
@@ -78,7 +78,10 @@ export default Ember.Component.extend({
     const $quoteButton = this.$();
 
     // remove the marker
-    markerElement.parentNode.removeChild(markerElement);
+    const parent = markerElement.parentNode;
+    parent.removeChild(markerElement);
+    // merge back all text nodes so they don't get messed up
+    parent.normalize();
 
     // work around Safari that would sometimes lose the selection
     if (isSafari) {
diff --git a/app/assets/javascripts/discourse/components/radio-button.js.es6 b/app/assets/javascripts/discourse/components/radio-button.js.es6
index 3004f941068..252f7d7ac4c 100644
--- a/app/assets/javascripts/discourse/components/radio-button.js.es6
+++ b/app/assets/javascripts/discourse/components/radio-button.js.es6
@@ -5,8 +5,12 @@ export default Ember.Component.extend({
   type : "radio",
   attributeBindings : ["name", "type", "value", "checked:checked", "disabled:disabled"],
 
-  click: function() {
-    this.set("selection", this.$().val());
+  click() {
+    const value = this.$().val();
+    if (this.get("selection") === value) {
+      this.set("selection", undefined);
+    }
+    this.set("selection", value);
   },
 
   @computed('value', 'selection')
diff --git a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6 b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
index b36b39a7019..79acf111840 100644
--- a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
+++ b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
@@ -54,8 +54,7 @@ export default MountWidget.extend({
     const scrollTop = $body.scrollTop();
 
     // This hack is for when swapping out many cloaked views at once
-    // when using keyboard navigation. It could suddenly move the
-    // scroll
+    // when using keyboard navigation. It could suddenly move the scroll
     if (this.prevHeight === height && scrollTop !== this.prevScrollTop) {
       $body.scrollTop(this.prevScrollTop);
     }
@@ -80,7 +79,7 @@ export default MountWidget.extend({
     const postsWrapperTop = $('.posts-wrapper').offset().top;
     const $posts = this.$('.onscreen-post, .cloaked-post');
     const viewportTop = windowTop - slack;
-    const topView = findTopView($posts, viewportTop, postsWrapperTop, 0, $posts.length-1);
+    const topView = findTopView($posts, viewportTop, postsWrapperTop, 0, $posts.length - 1);
 
     let windowBottom = windowTop + windowHeight;
     let viewportBottom = windowBottom + slack;
@@ -93,10 +92,17 @@ export default MountWidget.extend({
     let percent = null;
 
     const offset = offsetCalculator();
-    const topCheck = Math.ceil(windowTop + offset);
+    const topCheck = Math.ceil(windowTop + offset + 5);
 
     // uncomment to debug the eyeline
-    // $('.debug-eyeline').css({ height: '1px', width: '100%', backgroundColor: 'blue', position: 'absolute', top: `${topCheck}px` });
+    /*
+    let $eyeline = $('.debug-eyeline');
+    if ($eyeline.length === 0) {
+      $('body').prepend('<div class="debug-eyeline"></div>');
+      $eyeline = $('.debug-eyeline');
+    }
+    $eyeline.css({ height: '5px', width: '100%', backgroundColor: 'blue', position: 'absolute', top: `${topCheck}px`, zIndex: 999999 });
+    */
 
     let allAbove = true;
     let bottomView = topView;
@@ -108,7 +114,7 @@ export default MountWidget.extend({
       if (!$post) { break; }
 
       const viewTop = $post.offset().top;
-      const postHeight = $post.height();
+      const postHeight = $post.outerHeight(true);
       const viewBottom = Math.ceil(viewTop + postHeight);
 
       allAbove = allAbove && (viewTop < topCheck);
@@ -163,7 +169,7 @@ export default MountWidget.extend({
         this.sendAction('topVisibleChanged', { post: first, refresh: topRefresh });
       }
 
-      const last = posts.objectAt(onscreen[onscreen.length-1]);
+      const last = posts.objectAt(onscreen[onscreen.length - 1]);
       if (this._bottomVisible !== last) {
         this._bottomVisible = last;
         this.sendAction('bottomVisibleChanged', { post: last, refresh });
@@ -177,7 +183,7 @@ export default MountWidget.extend({
       }
 
       if (percent !== null) {
-        if (percent > 1.0) { percent = 1.0; }
+        percent = Math.max(0.0, Math.min(1.0, percent));
 
         if (changedPost || (this._currentPercent !== percent)) {
           this._currentPercent = percent;
diff --git a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6 b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
index a171083523d..22976d76d34 100644
--- a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
+++ b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
@@ -18,6 +18,7 @@ const REGEXP_TAGS_REPLACE          = /(^(tags?:|#(?=[a-z0-9\-]+::tag))|::tag\s?$
 
 const REGEXP_IN_MATCH                 = /^(in|with):(posted|watching|tracking|bookmarks|first|pinned|unpinned|wiki|unseen|image)/ig;
 const REGEXP_SPECIAL_IN_LIKES_MATCH   = /^in:likes/ig;
+const REGEXP_SPECIAL_IN_TITLE_MATCH   = /^in:title/ig;
 const REGEXP_SPECIAL_IN_PRIVATE_MATCH = /^in:private/ig;
 const REGEXP_SPECIAL_IN_SEEN_MATCH    = /^in:seen/ig;
 
@@ -81,6 +82,7 @@ export default Em.Component.extend({
         in: '',
         special: {
           in: {
+            title: false,
             likes: false,
             private: false,
             seen: false
@@ -111,6 +113,7 @@ export default Em.Component.extend({
     this.setSearchedTermValueForTags();
     this.setSearchedTermValue('searchedTerms.in', REGEXP_IN_PREFIX, REGEXP_IN_MATCH);
     this.setSearchedTermSpecialInValue('searchedTerms.special.in.likes', REGEXP_SPECIAL_IN_LIKES_MATCH);
+    this.setSearchedTermSpecialInValue('searchedTerms.special.in.title', REGEXP_SPECIAL_IN_TITLE_MATCH);
     this.setSearchedTermSpecialInValue('searchedTerms.special.in.private', REGEXP_SPECIAL_IN_PRIVATE_MATCH);
     this.setSearchedTermSpecialInValue('searchedTerms.special.in.seen', REGEXP_SPECIAL_IN_SEEN_MATCH);
     this.setSearchedTermValue('searchedTerms.status', REGEXP_STATUS_PREFIX);
@@ -424,15 +427,14 @@ export default Em.Component.extend({
     }
   },
 
-  @observes('searchedTerms.special.in.likes')
-  updateSearchTermForSpecialInLikes() {
-    const match = this.filterBlocks(REGEXP_SPECIAL_IN_LIKES_MATCH);
-    const inFilter = this.get('searchedTerms.special.in.likes');
+  updateInRegex(regex, filter) {
+    const match = this.filterBlocks(regex);
+    const inFilter = this.get('searchedTerms.special.in.' + filter);
     let searchTerm = this.get('searchTerm') || '';
 
     if (inFilter) {
       if (match.length === 0) {
-        searchTerm += ` in:likes`;
+        searchTerm += ` in:${filter}`;
         this.set('searchTerm', searchTerm.trim());
       }
     } else if (match.length !== 0) {
@@ -441,38 +443,24 @@ export default Em.Component.extend({
     }
   },
 
+  @observes('searchedTerms.special.in.likes')
+  updateSearchTermForSpecialInLikes() {
+    this.updateInRegex(REGEXP_SPECIAL_IN_LIKES_MATCH, 'likes');
+  },
+
   @observes('searchedTerms.special.in.private')
   updateSearchTermForSpecialInPrivate() {
-    const match = this.filterBlocks(REGEXP_SPECIAL_IN_PRIVATE_MATCH);
-    const inFilter = this.get('searchedTerms.special.in.private');
-    let searchTerm = this.get('searchTerm') || '';
-
-    if (inFilter) {
-      if (match.length === 0) {
-        searchTerm += ` in:private`;
-        this.set('searchTerm', searchTerm.trim());
-      }
-    } else if (match.length !== 0) {
-      searchTerm = searchTerm.replace(match, '');
-      this.set('searchTerm', searchTerm.trim());
-    }
+    this.updateInRegex(REGEXP_SPECIAL_IN_PRIVATE_MATCH, 'private');
   },
 
   @observes('searchedTerms.special.in.seen')
   updateSearchTermForSpecialInSeen() {
-    const match = this.filterBlocks(REGEXP_SPECIAL_IN_SEEN_MATCH);
-    const inFilter = this.get('searchedTerms.special.in.seen');
-    let searchTerm = this.get('searchTerm') || '';
+    this.updateInRegex(REGEXP_SPECIAL_IN_SEEN_MATCH, 'seen');
+  },
 
-    if (inFilter) {
-      if (match.length === 0) {
-        searchTerm += ` in:seen`;
-        this.set('searchTerm', searchTerm.trim());
-      }
-    } else if (match.length !== 0) {
-      searchTerm = searchTerm.replace(match, '');
-      this.set('searchTerm', searchTerm.trim());
-    }
+  @observes('searchedTerms.special.in.title')
+  updateSearchTermForSpecialInTitle() {
+    this.updateInRegex(REGEXP_SPECIAL_IN_TITLE_MATCH, 'title');
   },
 
   @observes('searchedTerms.status')
diff --git a/app/assets/javascripts/discourse/components/search-text-field.js.es6 b/app/assets/javascripts/discourse/components/search-text-field.js.es6
index 85547425795..7e449b35700 100644
--- a/app/assets/javascripts/discourse/components/search-text-field.js.es6
+++ b/app/assets/javascripts/discourse/components/search-text-field.js.es6
@@ -6,7 +6,7 @@ import { applySearchAutocomplete } from "discourse/lib/search";
 export default TextField.extend({
   @computed('searchService.searchContextEnabled')
   placeholder(searchContextEnabled) {
-    return searchContextEnabled ? "" : I18n.t('search.title');
+    return searchContextEnabled ? "" : I18n.t('search.full_page_title');
   },
 
   @on("didInsertElement")
diff --git a/app/assets/javascripts/discourse/components/shared-draft-controls.js.es6 b/app/assets/javascripts/discourse/components/shared-draft-controls.js.es6
new file mode 100644
index 00000000000..0fb51515c3b
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/shared-draft-controls.js.es6
@@ -0,0 +1,32 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+  tagName: '',
+  publishing: false,
+
+  @computed('topic.destination_category_id')
+  validCategory(destCatId) {
+    return destCatId &&
+      destCatId !== this.site.shared_drafts_category_id;
+  },
+
+  actions: {
+    updateDestinationCategory(category) {
+      return this.get('topic').updateDestinationCategory(category.get('id'));
+    },
+
+    publish() {
+      bootbox.confirm(I18n.t('shared_drafts.confirm_publish'), result => {
+        if (result) {
+          this.set('publishing', true);
+          let destId = this.get('topic.destination_category_id');
+          this.get('topic').publish().then(() => {
+            this.set('topic.category_id', destId);
+          }).finally(() => {
+            this.set('publishing', false);
+          });
+        }
+      });
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/site-header.js.es6 b/app/assets/javascripts/discourse/components/site-header.js.es6
index 56731c96df4..ac19edd63dd 100644
--- a/app/assets/javascripts/discourse/components/site-header.js.es6
+++ b/app/assets/javascripts/discourse/components/site-header.js.es6
@@ -16,7 +16,7 @@ const SiteHeaderComponent = MountWidget.extend(Docking, {
   _topic: null,
 
   @observes('currentUser.unread_notifications', 'currentUser.unread_private_messages')
-  _notificationsChanged() {
+  notificationsChanged() {
     this.queueRerender();
   },
 
@@ -112,7 +112,8 @@ const SiteHeaderComponent = MountWidget.extend(Docking, {
       $panel.removeClass('drop-down').removeClass('slide-in').addClass(viewMode);
 
       const $panelBody = $('.panel-body', $panel);
-      let contentHeight = parseInt($('.panel-body-contents', $panel).height());
+      // 2 pixel fudge allows for firefox subpixel sizing stuff causing scrollbar
+      let contentHeight = parseInt($('.panel-body-contents', $panel).height()) + 2;
 
       // We use a mutationObserver to check for style changes, so it's important
       // we don't set it if it doesn't change. Same goes for the $panelBody!
@@ -139,7 +140,7 @@ const SiteHeaderComponent = MountWidget.extend(Docking, {
         if ($panelBody.height() !== contentHeight) {
           $panelBody.height(contentHeight);
         }
-        $('body').addClass('drop-down-visible');
+        $('body').addClass('drop-down-mode');
       } else {
         const menuTop = headerHeight();
 
@@ -157,7 +158,7 @@ const SiteHeaderComponent = MountWidget.extend(Docking, {
         if (style.top !== menuTop + "px" || style.height !== height) {
           $panel.css({ top: menuTop + "px", height });
         }
-        $('body').removeClass('drop-down-visible');
+        $('body').removeClass('drop-down-mode');
       }
 
       $panel.width(width);
diff --git a/app/assets/javascripts/discourse/components/suggested-topics.js.es6 b/app/assets/javascripts/discourse/components/suggested-topics.js.es6
index 87ffd1865b6..b557bda31a0 100644
--- a/app/assets/javascripts/discourse/components/suggested-topics.js.es6
+++ b/app/assets/javascripts/discourse/components/suggested-topics.js.es6
@@ -7,8 +7,9 @@ export default Ember.Component.extend({
 
   @computed('topic')
   suggestedTitle(topic) {
-    return topic.get('isPrivateMessage') ?
-      `<a href="${this.get('pmPath')}">${iconHTML('envelope', { class: 'private-message-glyph' })}</a> ${I18n.t("suggested_topics.pm_title")}` :
+    const href = this.currentUser && this.currentUser.pmPath(topic);
+    return topic.get('isPrivateMessage') && href ?
+      `<a href="${href}">${iconHTML('envelope', { class: 'private-message-glyph' })}</a><span>${I18n.t("suggested_topics.pm_title")}</span>` :
       I18n.t("suggested_topics.title");
   },
 
@@ -31,7 +32,7 @@ export default Ember.Component.extend({
     }
 
     const unreadTopics = this.topicTrackingState.countUnread();
-    const newTopics = this.topicTrackingState.countNew();
+    const newTopics = this.currentUser ? this.topicTrackingState.countNew() : 0;
 
     if (newTopics + unreadTopics > 0) {
       const hasBoth = unreadTopics > 0 && newTopics > 0;
diff --git a/app/assets/javascripts/discourse/components/tag-chooser.js.es6 b/app/assets/javascripts/discourse/components/tag-chooser.js.es6
deleted file mode 100644
index 00fc2444879..00000000000
--- a/app/assets/javascripts/discourse/components/tag-chooser.js.es6
+++ /dev/null
@@ -1,139 +0,0 @@
-import renderTag from 'discourse/lib/render-tag';
-
-function formatTag(t) {
-  return renderTag(t.id, {count: t.count, noHref: true});
-}
-
-export default Ember.TextField.extend({
-  classNameBindings: [':tag-chooser'],
-  attributeBindings: ['tabIndex', 'placeholderKey', 'categoryId'],
-
-  init() {
-    this._super();
-    const tags = this.get('tags') || [];
-    this.set('value', tags.join(", "));
-
-    if (this.get('allowCreate') !== false) {
-      this.set('allowCreate', this.site.get('can_create_tag'));
-    }
-
-    this.set('termMatchesForbidden', false);
-  },
-
-  _valueChanged: function() {
-    const tags = this.get('value').split(',').map(v => v.trim()).reject(v => v.length === 0).uniq();
-    this.set('tags', tags);
-  }.observes('value'),
-
-  _tagsChanged: function() {
-    const $tagChooser = this.$(),
-          val = this.get('value');
-
-    if ($tagChooser && val !== this.get('tags')) {
-      if (this.get('tags')) {
-        const data = this.get('tags').map((t) => {return {id: t, text: t};});
-        $tagChooser.select2('data', data);
-      } else {
-        $tagChooser.select2('data', []);
-      }
-    }
-  }.observes('tags'),
-
-  didInsertElement() {
-    this._super();
-
-    const self = this;
-    const filterRegexp = new RegExp(this.site.tags_filter_regexp, "g");
-
-    let limit = this.siteSettings.max_tags_per_topic;
-
-    if (this.get('unlimitedTagCount')) {
-      limit = null;
-    } else if (this.get('limit')) {
-      limit = parseInt(this.get('limit'));
-    }
-
-    this.$().select2({
-      tags: true,
-      placeholder: this.get('placeholder') === "" ? "" : I18n.t(this.get('placeholderKey') || 'tagging.choose_for_topic'),
-      maximumInputLength: this.siteSettings.max_tag_length,
-      maximumSelectionSize: limit,
-      width: this.get('width') || 'resolve',
-      initSelection(element, callback) {
-        const data = [];
-
-        function splitVal(string, separator) {
-          var val, i, l;
-          if (string === null || string.length < 1) return [];
-          val = string.split(separator);
-          for (i = 0, l = val.length; i < l; i = i + 1) val[i] = $.trim(val[i]);
-          return val;
-        }
-
-        $(splitVal(element.val(), ",")).each(function () {
-          data.push({
-            id: this,
-            text: this
-          });
-        });
-
-        callback(data);
-      },
-      createSearchChoice(term, data) {
-        term = term.replace(filterRegexp, '').trim().toLowerCase();
-
-        // No empty terms, make sure the user has permission to create the tag
-        if (!term.length || !self.get('allowCreate') || self.get('termMatchesForbidden')) return;
-
-        if ($(data).filter(function() {
-          return this.text.localeCompare(term) === 0;
-        }).length === 0) {
-          return { id: term, text: term };
-        }
-      },
-      createSearchChoicePosition(list, item) {
-        // Search term goes on the bottom
-        list.push(item);
-      },
-      formatSelection(data) {
-        return data ? renderTag(this.text(data), {noHref: true}) : undefined;
-      },
-      formatSelectionCssClass() {
-        return "discourse-tag-select2";
-      },
-      formatResult: formatTag,
-      multiple: true,
-      ajax: {
-        quietMillis: 200,
-        cache: true,
-        url: Discourse.getURL("/tags/filter/search"),
-        dataType: 'json',
-        data: function (term) {
-          const d = {
-            q: term,
-            limit: self.siteSettings.max_tag_search_results,
-            categoryId: self.get('categoryId'),
-            selected_tags: self.get('tags')
-          };
-          if (!self.get('everyTag')) {
-            d.filterForInput = true;
-          }
-          return d;
-        },
-        results: function (data) {
-          if (self.siteSettings.tags_sort_alphabetically) {
-            data.results = data.results.sort(function(a,b) { return a.id > b.id; });
-          }
-          self.set('termMatchesForbidden', data.forbidden ? true : false);
-          return data;
-        }
-      },
-    });
-  },
-
-  willDestroyElement() {
-    this._super();
-    this.$().select2('destroy');
-  }
-
-});
diff --git a/app/assets/javascripts/discourse/components/tag-drop.js.es6 b/app/assets/javascripts/discourse/components/tag-drop.js.es6
deleted file mode 100644
index 201d9a134d5..00000000000
--- a/app/assets/javascripts/discourse/components/tag-drop.js.es6
+++ /dev/null
@@ -1,139 +0,0 @@
-import { setting } from 'discourse/lib/computed';
-import computed from 'ember-addons/ember-computed-decorators';
-
-export default Ember.Component.extend({
-  classNameBindings: [':tag-drop', 'tag::no-category', 'tags:has-drop','categoryStyle','tagClass'],
-  categoryStyle: setting('category_style'), // match the category-drop style
-  currentCategory: Em.computed.or('secondCategory', 'firstCategory'),
-  showFilterByTag: setting('show_filter_by_tag'),
-  showTagDropdown: Em.computed.and('showFilterByTag', 'tags'),
-  tagId: null,
-
-  tagName: 'li',
-
-  @computed('site.top_tags')
-  tags(topTags) {
-    if (this.siteSettings.tags_sort_alphabetically && topTags) {
-      return topTags.sort();
-    } else {
-      return topTags;
-    }
-  },
-
-  @computed('expanded')
-  expandedIcon(expanded) {
-    return expanded ? 'd-drop-expanded' : 'd-drop-collapsed';
-  },
-
-  @computed('tagId')
-  tagClass() {
-    if (this.get('tagId')) {
-      return "tag-" + this.get('tagId');
-    } else {
-      return "tag_all";
-    }
-  },
-
-  @computed('firstCategory', 'secondCategory')
-  allTagsUrl() {
-    if (this.get('currentCategory')) {
-      return this.get('currentCategory.url') + "?allTags=1";
-    } else {
-      return "/";
-    }
-  },
-
-  @computed('tag')
-  allTagsLabel() {
-    return I18n.t("tagging.selector_all_tags");
-  },
-
-  @computed('tagId')
-  noTagsSelected() {
-    return this.get('tagId') === 'none';
-  },
-
-  @computed('firstCategory', 'secondCategory')
-  noTagsUrl() {
-    var url = '/tags';
-    if (this.get('currentCategory')) {
-      url += this.get('currentCategory.url');
-    }
-    return url + '/none';
-  },
-
-  @computed('tag')
-  noTagsLabel() {
-    return I18n.t("tagging.selector_no_tags");
-  },
-
-  @computed('tag')
-  dropdownButtonClass() {
-    let result = 'dropdown-header category-dropdown-button';
-    if (Em.isNone(this.get('tag'))) {
-      result += ' home';
-    }
-    return result;
-  },
-
-  @computed('tag')
-  clickEventName() {
-    return "click.tag-drop-" + (this.get('tag') || "all");
-  },
-
-  actions: {
-    expand: function() {
-      var self = this;
-
-      if(!this.get('renderTags')){
-        this.set('renderTags',true);
-        Em.run.next(function(){
-          self.send('expand');
-        });
-        return;
-      }
-
-      if (this.get('expanded')) {
-        this.close();
-        return;
-      }
-
-      if (this.get('tags')) {
-        this.set('expanded', true);
-      }
-      var $dropdown = this.$()[0];
-
-      this.$('a[data-drop-close]').on('click.tag-drop', function() {
-        self.close();
-      });
-
-      Em.run.next(function(){
-        self.$('.cat a').add('html').on(self.get('clickEventName'), function(e) {
-          var $target = $(e.target),
-              closest = $target.closest($dropdown);
-
-          if ($(e.currentTarget).hasClass('badge-wrapper')){
-            self.close();
-          }
-
-          return ($(e.currentTarget).hasClass('badge-category') || (closest.length && closest[0] === $dropdown)) ? true : self.close();
-        });
-      });
-    }
-  },
-
-  removeEvents: function(){
-    $('html').off(this.get('clickEventName'));
-    this.$('a[data-drop-close]').off('click.tag-drop');
-  },
-
-  close: function() {
-    this.removeEvents();
-    this.set('expanded', false);
-  },
-
-  willDestroyElement: function() {
-    this.removeEvents();
-  }
-
-});
diff --git a/app/assets/javascripts/discourse/components/tag-group-chooser.js.es6 b/app/assets/javascripts/discourse/components/tag-group-chooser.js.es6
deleted file mode 100644
index efe35db5bb5..00000000000
--- a/app/assets/javascripts/discourse/components/tag-group-chooser.js.es6
+++ /dev/null
@@ -1,86 +0,0 @@
-function renderTagGroup(tag) {
-  return "<a class='discourse-tag'>" + Handlebars.Utils.escapeExpression(tag.text ? tag.text : tag) + "</a>";
-};
-
-export default Ember.TextField.extend({
-  classNameBindings: [':tag-chooser'],
-  attributeBindings: ['tabIndex', 'placeholderKey', 'categoryId'],
-
-  _initValue: function() {
-    const names = this.get('tagGroups') || [];
-    this.set('value', names.join(","));
-  }.on('init'),
-
-  _valueChanged: function() {
-    const names = this.get('value').split(',').map(v => v.trim()).reject(v => v.length === 0).uniq();
-    if ( this.get('tagGroups').join(',') !== this.get('value') ) {
-      this.set('tagGroups', names);
-    }
-  }.observes('value'),
-
-  _tagGroupsChanged: function() {
-    const $chooser = this.$(),
-          val = this.get('value');
-
-    if ($chooser && val !== this.get('tagGroups')) {
-      if (this.get('tagGroups')) {
-        const data = this.get('tagGroups').map((t) => {return {id: t, text: t};});
-        $chooser.select2('data', data);
-      } else {
-        $chooser.select2('data', []);
-      }
-    }
-  }.observes('tagGroups'),
-
-  _initializeChooser: function() {
-    const self = this;
-
-    this.$().select2({
-      tags: true,
-      placeholder: this.get('placeholderKey') ? I18n.t(this.get('placeholderKey')) : null,
-      initSelection(element, callback) {
-        const data = [];
-
-        function splitVal(string, separator) {
-          var val, i, l;
-          if (string === null || string.length < 1) return [];
-          val = string.split(separator);
-          for (i = 0, l = val.length; i < l; i = i + 1) val[i] = $.trim(val[i]);
-          return val;
-        }
-
-        $(splitVal(element.val(), ",")).each(function () {
-          data.push({ id: this, text: this });
-        });
-
-        callback(data);
-      },
-      formatSelection: function (data) {
-        return data ? renderTagGroup(this.text(data)) : undefined;
-      },
-      formatSelectionCssClass: function(){
-        return "discourse-tag-select2";
-      },
-      formatResult: renderTagGroup,
-      multiple: true,
-      ajax: {
-        quietMillis: 200,
-        cache: true,
-        url: Discourse.getURL("/tag_groups/filter/search"),
-        dataType: 'json',
-        data: function (term) {
-          return { q: term, limit: self.siteSettings.max_tag_search_results };
-        },
-        results: function (data) {
-          data.results = data.results.sort(function(a,b) { return a.text > b.text; });
-          return data;
-        }
-      },
-    });
-  }.on('didInsertElement'),
-
-  _destroyChooser: function() {
-    this.$().select2('destroy');
-  }.on('willDestroyElement')
-
-});
diff --git a/app/assets/javascripts/discourse/components/tag-list.js.es6 b/app/assets/javascripts/discourse/components/tag-list.js.es6
index df2c024cb87..decb1cea5df 100644
--- a/app/assets/javascripts/discourse/components/tag-list.js.es6
+++ b/app/assets/javascripts/discourse/components/tag-list.js.es6
@@ -1,21 +1,23 @@
+import computed from "ember-addons/ember-computed-decorators";
+
 export default Ember.Component.extend({
   classNameBindings: [':tag-list', 'categoryClass'],
 
+  isPrivateMessage: false,
   sortedTags: Ember.computed.sort('tags', 'sortProperties'),
 
-  title: function() {
-    if (this.get('titleKey')) { return I18n.t(this.get('titleKey')); }
-  }.property('titleKey'),
+  @computed("titleKey")
+  title(titleKey) {
+    return titleKey && I18n.t(titleKey);
+  },
 
-  category: function() {
-    if (this.get('categoryId')) {
-      return Discourse.Category.findById(this.get('categoryId'));
-    }
-  }.property('categoryId'),
+  @computed("categoryId")
+  category(categoryId) {
+    return categoryId && Discourse.Category.findById(categoryId);
+  },
 
-  categoryClass: function() {
-    if (this.get('category')) {
-      return "tag-list-" + this.get('category.fullSlug');
-    }
-  }.property('category')
+  @computed("category.fullSlug")
+  categoryClass(slug) {
+    return slug && `tag-list-${slug}`;
+  }
 });
diff --git a/app/assets/javascripts/discourse/components/text-field.js.es6 b/app/assets/javascripts/discourse/components/text-field.js.es6
index a9246efa7db..6e1fabc8195 100644
--- a/app/assets/javascripts/discourse/components/text-field.js.es6
+++ b/app/assets/javascripts/discourse/components/text-field.js.es6
@@ -1,7 +1,35 @@
 import computed from "ember-addons/ember-computed-decorators";
+import { siteDir, isRTL, isLTR } from "discourse/lib/text-direction";
 
 export default Ember.TextField.extend({
-  attributeBindings: ['autocorrect', 'autocapitalize', 'autofocus', 'maxLength'],
+  attributeBindings: ['autocorrect', 'autocapitalize', 'autofocus', 'maxLength', 'dir'],
+
+  @computed
+  dir() {
+    if (this.siteSettings.support_mixed_text_direction) {
+      let val = this.value;
+      if (val) {
+        return isRTL(val) ? 'rtl' : 'ltr';
+      } else {
+        return siteDir();
+      }
+    }
+  },
+
+  keyUp(event) {
+    this._super(event);
+
+    if (this.siteSettings.support_mixed_text_direction) {
+      let val = this.value;
+      if (isRTL(val)) {
+        this.set('dir', 'rtl');
+      } else if (isLTR(val)) {
+        this.set('dir', 'ltr');
+      } else {
+        this.set('dir', siteDir());
+      }
+    }
+  },
 
   @computed("placeholderKey")
   placeholder(placeholderKey) {
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 e370f0d3379..d2c110adfd8 100644
--- a/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6
@@ -6,6 +6,16 @@ export default Ember.Component.extend({
   // Allow us to extend it
   layoutName: 'components/topic-footer-buttons',
 
+  @computed('topic.isPrivateMessage')
+  canArchive(isPM) {
+    return this.siteSettings.enable_personal_messages && isPM;
+  },
+
+  @computed('topic.isPrivateMessage')
+  showNotificationsButton(isPM) {
+    return (!isPM) || this.siteSettings.enable_personal_messages;
+  },
+
   @computed('topic.details.can_invite_to')
   canInviteTo(result) {
     return !this.site.mobileView && result;
@@ -18,6 +28,11 @@ export default Ember.Component.extend({
     return !this.site.mobileView && this.currentUser && this.currentUser.get('canManageTopic');
   },
 
+  showEditOnFooter: Ember.computed.and(
+    'topic.isPrivateMessage',
+    'site.can_tag_pms'
+  ),
+
   @computed('topic.message_archived')
   archiveIcon: archived => archived ? '' : 'folder',
 
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 f9b3cd38b76..b521ea876bf 100644
--- a/app/assets/javascripts/discourse/components/topic-list-item.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list-item.js.es6
@@ -33,6 +33,11 @@ export default Ember.Component.extend(bufferedRender({
   attributeBindings: ['data-topic-id'],
   'data-topic-id': Em.computed.alias('topic.id'),
 
+  @computed
+  newDotText() {
+    return (this.currentUser && this.currentUser.trust_level > 0) ? "" : I18n.t('filters.new.lower_title');
+  },
+
   actions: {
     toggleBookmark() {
       this.get('topic').toggleBookmark().finally(() => this.rerenderBuffer());
@@ -58,8 +63,15 @@ export default Ember.Component.extend(bufferedRender({
       classes.push('has-excerpt');
     }
 
+    if (topic.get('unseen')) {
+      classes.push("unseen-topic");
+    }
 
-    ['liked', 'archived', 'bookmarked', 'pinned'].forEach(name => {
+    if (topic.get('displayNewPosts')) {
+      classes.push("new-posts");
+    }
+
+    ['liked', 'archived', 'bookmarked', 'pinned', 'closed'].forEach(name => {
       if (topic.get(name)) {
         classes.push(name);
       }
diff --git a/app/assets/javascripts/discourse/components/topic-list.js.es6 b/app/assets/javascripts/discourse/components/topic-list.js.es6
index 7dde582385e..bff2c380a60 100644
--- a/app/assets/javascripts/discourse/components/topic-list.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list.js.es6
@@ -4,6 +4,7 @@ export default Ember.Component.extend({
   tagName: 'table',
   classNames: ['topic-list'],
   showTopicPostBadges: true,
+  listTitle: 'topic.title',
 
   // Overwrite this to perform client side filtering of topics, if desired
   filteredTopics: Ember.computed.alias('topics'),
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 9eb07ade4fb..f125c839b22 100644
--- a/app/assets/javascripts/discourse/components/topic-post-badges.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-post-badges.js.es6
@@ -13,9 +13,10 @@ export default Ember.Component.extend(bufferedRender({
   rerenderTriggers: ['url', 'unread', 'newPosts', 'unseen'],
 
   buildBuffer(buffer) {
+    const newDotText = (this.currentUser && this.currentUser.trust_level > 0) ? " " : I18n.t('filters.new.lower_title');
     const url = this.get('url');
     link(buffer, this.get('unread'), url, 'unread', 'unread_posts');
     link(buffer, this.get('newPosts'), url, 'new-posts', 'new_posts');
-    link(buffer, this.get('unseen'), url, 'new-topic', 'new', I18n.t('filters.new.lower_title'));
+    link(buffer, this.get('unseen'), url, 'new-topic', 'new', newDotText);
   }
 }));
diff --git a/app/assets/javascripts/discourse/components/topic-progress.js.es6 b/app/assets/javascripts/discourse/components/topic-progress.js.es6
index a3f09e3182a..70dcf5dccca 100644
--- a/app/assets/javascripts/discourse/components/topic-progress.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-progress.js.es6
@@ -111,47 +111,36 @@ export default Ember.Component.extend({
       const style = `border-right-width: ${borderSize}; width: ${progressWidth}px`;
       $topicProgress.append(`<div class='bg' style="${style}">&nbsp;</div>`);
     } else {
-      $bg.css("border-right-width", borderSize).width(progressWidth);
+      $bg.css("border-right-width", borderSize).width(progressWidth - 2);
     }
   },
 
   _dock() {
-    const maximumOffset = $('#topic-bottom').offset(),
-          composerHeight = $('#reply-control').height() || 0,
-          $topicProgressWrapper = this.$(),
-          offset = window.pageYOffset || $('html').scrollTop();
+    const $wrapper = this.$();
+    if (!$wrapper || $wrapper.length === 0) return;
 
-    if (!$topicProgressWrapper || $topicProgressWrapper.length === 0) {
-      return;
-    }
+    const offset         = window.pageYOffset || $("html").scrollTop();
+    const progressHeight = this.site.mobileView ? 0 : $("#topic-progress").height();
+    const maximumOffset  = $("#topic-bottom").offset().top + progressHeight;
+    const windowHeight   = $(window).height();
+    const composerHeight = $("#reply-control").height() || 0;
+    const isDocked       = offset >= maximumOffset - windowHeight + composerHeight;
+    const bottom         = $("#main").height() - maximumOffset;
 
-    let isDocked = false;
-    if (maximumOffset) {
-      const threshold = maximumOffset.top;
-      const windowHeight = $(window).height();
-      const headerHeight = $('header').outerHeight(true);
-
-      if (this.capabilities.isIOS) {
-        isDocked = offset >= (threshold - windowHeight - headerHeight + composerHeight);
-      } else {
-        isDocked = offset >= (threshold - windowHeight + composerHeight);
-      }
-    }
-
-    const dockPos = $(document).height() - $('#topic-bottom').offset().top;
     if (composerHeight > 0) {
-      if (isDocked) {
-        $topicProgressWrapper.css('bottom', dockPos);
-      } else {
-        const height = composerHeight + "px";
-        if ($topicProgressWrapper.css('bottom') !== height) {
-          $topicProgressWrapper.css('bottom', height);
-        }
-      }
+      $wrapper.css("bottom", isDocked ? bottom : composerHeight);
     } else {
-      $topicProgressWrapper.css('bottom', isDocked ? dockPos : '');
+      $wrapper.css("bottom", isDocked ? bottom : "");
+    }
+
+    this.set("docked", isDocked);
+
+    const $replyArea = $("#reply-control .reply-area");
+    if ($replyArea && $replyArea.length > 0) {
+      $wrapper.css("right", `${$replyArea.offset().left}px`);
+    } else {
+      $wrapper.css("right", "1em");
     }
-    this.set('docked', isDocked);
   },
 
   click(e) {
@@ -160,7 +149,6 @@ export default Ember.Component.extend({
     }
   },
 
-
   actions: {
     toggleExpansion() {
       this.toggleProperty('expanded');
diff --git a/app/assets/javascripts/discourse/components/topic-status.js.es6 b/app/assets/javascripts/discourse/components/topic-status.js.es6
index f1c8695dfde..be8076458e9 100644
--- a/app/assets/javascripts/discourse/components/topic-status.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-status.js.es6
@@ -8,15 +8,10 @@ export default Ember.Component.extend(bufferedRender({
   rerenderTriggers: ['topic.archived', 'topic.closed', 'topic.pinned', 'topic.visible', 'topic.unpinned', 'topic.is_warning'],
 
   click(e) {
-    if ($(e.target).hasClass('d-icon-thumb-tack')) {
+    // only pin unpin for now
+    if (this.get("canAct") && $(e.target).hasClass('d-icon-thumb-tack')) {
       const topic = this.get('topic');
-
-      // only pin unpin for now
-      if (topic.get('pinned')) {
-        topic.clearPin();
-      } else {
-        topic.rePin();
-      }
+      topic.get('pinned') ? topic.clearPin() : topic.rePin();
     }
 
     return false;
diff --git a/app/assets/javascripts/discourse/components/topic-timeline.js.es6 b/app/assets/javascripts/discourse/components/topic-timeline.js.es6
index c693fd9c942..747bc975655 100644
--- a/app/assets/javascripts/discourse/components/topic-timeline.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-timeline.js.es6
@@ -62,13 +62,14 @@ export default MountWidget.extend(Docking, {
 
     this.dockBottom = false;
     if (posTop < topicTop) {
-      this.dockAt = topicTop;
+      this.dockAt = parseInt(topicTop, 10);
     } else if (pos > topicBottom + footerHeight) {
-      this.dockAt = (topicBottom - timelineHeight) + footerHeight;
+      this.dockAt = parseInt((topicBottom - timelineHeight) + footerHeight, 10);
       this.dockBottom = true;
       if (this.dockAt < 0) { this.dockAt = 0; }
     } else {
       this.dockAt = null;
+      this.fastDockAt = parseInt(topicBottom - timelineHeight + footerHeight - offsetTop, 10);
     }
 
     if (this.dockAt !== prev) {
diff --git a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6 b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
index 16ea7518340..e0e8fb91420 100644
--- a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
@@ -18,7 +18,6 @@ export default Ember.Component.extend(bufferedRender({
     if (!this.get('executeAt')) return;
 
     let statusUpdateAt = moment(this.get('executeAt'));
-    if (statusUpdateAt < new Date()) return;
 
     let duration = moment.duration(statusUpdateAt - moment());
     let minutesLeft = duration.asMinutes();
@@ -54,7 +53,7 @@ export default Ember.Component.extend(bufferedRender({
       }, options);
     }
 
-    buffer.push(I18n.t(this._noticeKey(), options));
+    buffer.push(`<span>${I18n.t(this._noticeKey(), options)}</span>`);
     buffer.push('</h3>');
 
     // TODO Sam: concerned this can cause a heavy rerender loop
diff --git a/app/assets/javascripts/discourse/components/user-card-contents.js.es6 b/app/assets/javascripts/discourse/components/user-card-contents.js.es6
index b7d3b4d31fe..d75bab921a0 100644
--- a/app/assets/javascripts/discourse/components/user-card-contents.js.es6
+++ b/app/assets/javascripts/discourse/components/user-card-contents.js.es6
@@ -1,45 +1,30 @@
-import { wantsNewWindow } from 'discourse/lib/intercept-click';
-import { propertyNotEqual, setting } from 'discourse/lib/computed';
-import CleansUp from 'discourse/mixins/cleans-up';
-import afterTransition from 'discourse/lib/after-transition';
 import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
-import DiscourseURL from 'discourse/lib/url';
 import User from 'discourse/models/user';
-import { userPath } from 'discourse/lib/url';
+import { propertyNotEqual, setting } from 'discourse/lib/computed';
 import { durationTiny } from 'discourse/lib/formatter';
 import CanCheckEmails from 'discourse/mixins/can-check-emails';
+import CardContentsBase from 'discourse/mixins/card-contents-base';
+import CleansUp from 'discourse/mixins/cleans-up';
 
-const clickOutsideEventName = "mousedown.outside-user-card";
-const clickDataExpand = "click.discourse-user-card";
-const clickMention = "click.discourse-user-mention";
-
-export default Ember.Component.extend(CleansUp, CanCheckEmails, {
+export default Ember.Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
   elementId: 'user-card',
-  classNameBindings: ['visible:show', 'showBadges', 'hasCardBadgeImage', 'user.card_background::no-bg'],
+  triggeringLinkClass: 'mention',
+  classNameBindings: ['visible:show', 'showBadges', 'user.card_background::no-bg', 'isFixed:fixed'],
   allowBackgrounds: setting('allow_profile_backgrounds'),
+  showBadges: setting('enable_badges'),
 
   postStream: Ember.computed.alias('topic.postStream'),
   enoughPostsForFiltering: Ember.computed.gte('topicPostCount', 2),
-  viewingTopic: Ember.computed.match('currentPath', /^topic\./),
-  viewingAdmin: Ember.computed.match('currentPath', /^admin\./),
   showFilter: Ember.computed.and('viewingTopic', 'postStream.hasNoFilters', 'enoughPostsForFiltering'),
   showName: propertyNotEqual('user.name', 'user.username'),
   hasUserFilters: Ember.computed.gt('postStream.userFilters.length', 0),
-  isSuspended: Ember.computed.notEmpty('user.suspend_reason'),
-  showBadges: setting('enable_badges'),
   showMoreBadges: Ember.computed.gt('moreBadgesCount', 0),
   showDelete: Ember.computed.and("viewingAdmin", "showName", "user.canBeDeleted"),
   linkWebsite: Ember.computed.not('user.isBasic'),
   hasLocationOrWebsite: Ember.computed.or('user.location', 'user.website_name'),
   showCheckEmail: Ember.computed.and('user.staged', 'canCheckEmails'),
 
-  visible: false,
   user: null,
-  username: null,
-  avatar: null,
-  userLoading: null,
-  cardTarget: null,
-  post: null,
 
   // If inside a topic
   topicPostCount: null,
@@ -75,21 +60,6 @@ export default Ember.Component.extend(CleansUp, CanCheckEmails, {
   @computed('user.badge_count', 'user.featured_user_badges.length')
   moreBadgesCount: (badgeCount, badgeLength) => badgeCount - badgeLength,
 
-  @computed('user.card_badge.image')
-  hasCardBadgeImage: image => image && image.indexOf('fa-') !== 0,
-
-  @observes('user.card_background')
-  addBackground() {
-    if (!this.get('allowBackgrounds')) { return; }
-
-    const $this = this.$();
-    if (!$this) { return; }
-
-    const url = this.get('user.card_background');
-    const bg = Ember.isEmpty(url) ? '' : `url(${Discourse.getURLWithCDN(url)})`;
-    $this.css('background-image', bg);
-  },
-
   @computed('user.time_read', 'user.recent_time_read')
   showRecentTimeRead(timeRead, recentTimeRead) {
     return timeRead !== recentTimeRead && recentTimeRead !== 0;
@@ -109,144 +79,40 @@ export default Ember.Component.extend(CleansUp, CanCheckEmails, {
     }
   },
 
-  _show(username, $target) {
-    // No user card for anon
-    if (this.siteSettings.hide_user_profiles_from_public && !this.currentUser) {
-      return false;
-    }
+  @observes('user.card_background')
+  addBackground() {
+    if (!this.get('allowBackgrounds')) { return; }
 
-    username = Ember.Handlebars.Utils.escapeExpression(username.toString());
+    const $this = this.$();
+    if (!$this) { return; }
 
-    // Don't show on mobile
-    if (this.site.mobileView) {
-      DiscourseURL.routeTo(userPath(username));
-      return false;
-    }
-
-    const currentUsername = this.get('username');
-    if (username === currentUsername && this.get('userLoading') === username) {
-      return;
-    }
-
-    const postId = $target.parents('article').data('post-id');
-
-    const wasVisible = this.get('visible');
-    const previousTarget = this.get('cardTarget');
-    const target = $target[0];
-    if (wasVisible) {
-      this._close();
-      if (target === previousTarget) { return; }
-    }
-
-    const post = this.get('viewingTopic') && postId ? this.get('postStream').findLoadedPost(postId) : null;
-    this.setProperties({ username, userLoading: username, cardTarget: target, post });
+    const url = this.get('user.card_background');
+    const bg = Ember.isEmpty(url) ? '' : `url(${Discourse.getURLWithCDN(url)})`;
+    $this.css('background-image', bg);
+  },
 
+  _showCallback(username, $target) {
     const args = { stats: false };
     args.include_post_count_for = this.get('topic.id');
-
     User.findByUsername(username, args).then(user => {
       if (user.topic_post_count) {
         this.set('topicPostCount', user.topic_post_count[args.include_post_count_for]);
       }
-      this.setProperties({ user, avatar: user, visible: true });
-
       this._positionCard($target);
-    }).catch(() => this._close()).finally(() => this.set('userLoading', null));
+      this.setProperties({ user, visible: true });
 
-    return false;
+    }).catch(() => this._close()).finally(() => this.set('loading', null));
   },
 
   didInsertElement() {
     this._super();
-    afterTransition(this.$(), this._hide.bind(this));
-
-    $('html').off(clickOutsideEventName)
-      .on(clickOutsideEventName, (e) => {
-        if (this.get('visible')) {
-          const $target = $(e.target);
-          if ($target.closest('[data-user-card]').data('userCard') ||
-            $target.closest('a.mention').length > 0 ||
-            $target.closest('#user-card').length > 0) {
-            return;
-          }
-
-          this._close();
-        }
-
-        return true;
-      });
-
-    $('#main-outlet').on(clickDataExpand, '[data-user-card]', (e) => {
-      if (wantsNewWindow(e)) { return; }
-      const $target = $(e.currentTarget);
-      return this._show($target.data('user-card'), $target);
-    });
-
-    $('#main-outlet').on(clickMention, 'a.mention', (e) => {
-      if (wantsNewWindow(e)) { return; }
-      const $target = $(e.target);
-      return this._show($target.text().replace(/^@/, ''), $target);
-    });
-  },
-
-  _positionCard(target) {
-    const rtl = ($('html').css('direction')) === 'rtl';
-    if (!target) { return; }
-    const width = this.$().width();
-
-    Ember.run.schedule('afterRender', () => {
-      if (target) {
-        let position = target.offset();
-        if (position) {
-
-          if (rtl) { // The site direction is rtl
-            position.right = $(window).width() - position.left + 10;
-            position.left = 'auto';
-            let overage = ($(window).width() - 50) - (position.right + width);
-            if (overage < 0) {
-              position.right += overage;
-              position.top += target.height() + 48;
-            }
-          } else { // The site direction is ltr
-            position.left += target.width() + 10;
-
-            let overage = ($(window).width() - 50) - (position.left + width);
-            if (overage < 0) {
-              position.left += overage;
-              position.top += target.height() + 48;
-            }
-          }
-
-          position.top -= $('#main-outlet').offset().top;
-          this.$().css(position);
-        }
-
-        // After the card is shown, focus on the first link
-        //
-        // note: we DO NOT use afterRender here cause _positionCard may
-        // run afterwards, if we allowed this to happen the usercard
-        // may be offscreen and we may scroll all the way to it on focus
-        Ember.run.next(null, () => this.$('a:first').focus() );
-      }
-    });
-  },
-
-  _hide() {
-    if (!this.get('visible')) {
-      this.$().css({left: -9999, top: -9999});
-    }
   },
 
   _close() {
+    this._super();
     this.setProperties({
-      visible: false,
       user: null,
-      username: null,
-      avatar: null,
-      userLoading: null,
-      cardTarget: null,
-      post: null,
-      topicPostCount: null
+      topicPostCount: null,
     });
   },
 
@@ -254,20 +120,6 @@ export default Ember.Component.extend(CleansUp, CanCheckEmails, {
     this._close();
   },
 
-  keyUp(e) {
-    if (e.keyCode === 27) { // ESC
-      const target = this.get('cardTarget');
-      this._close();
-      target.focus();
-    }
-  },
-
-  willDestroyElement() {
-    this._super();
-    $('html').off(clickOutsideEventName);
-    $('#main').off(clickDataExpand).off(clickMention);
-  },
-
   actions: {
     close() {
       this._close();
diff --git a/app/assets/javascripts/discourse/components/user-selector.js.es6 b/app/assets/javascripts/discourse/components/user-selector.js.es6
index 830a74d708c..561197075d3 100644
--- a/app/assets/javascripts/discourse/components/user-selector.js.es6
+++ b/app/assets/javascripts/discourse/components/user-selector.js.es6
@@ -16,20 +16,31 @@ export default TextField.extend({
 
   didInsertElement(opts) {
     this._super();
+
+    const bool = (n => {
+      const val = this.get(n);
+      return val === true || val === "true";
+    });
+
     var self = this,
         selected = [],
         groups = [],
         currentUser = this.currentUser,
-        includeMentionableGroups = this.get('includeMentionableGroups') === 'true',
-        includeMessageableGroups = this.get('includeMessageableGroups') === 'true',
-        includeGroups = this.get('includeGroups') === 'true',
-        allowedUsers = this.get('allowedUsers') === 'true';
+        includeMentionableGroups = bool('includeMentionableGroups'),
+        includeMessageableGroups = bool('includeMessageableGroups'),
+        includeGroups = bool('includeGroups'),
+        allowedUsers = bool('allowedUsers'),
+        excludeCurrentUser = bool('excludeCurrentUser'),
+        single = bool('single'),
+        allowAny = bool('allowAny'),
+        disabled = bool('disabled'),
+        disallowEmails = bool('disallowEmails');
 
     function excludedUsernames() {
       // hack works around some issues with allowAny eventing
-      const usernames = self.get('single') ? [] : selected;
+      const usernames = single ? [] : selected;
 
-      if (currentUser && self.get('excludeCurrentUser')) {
+      if (currentUser && excludeCurrentUser) {
         return usernames.concat([currentUser.get('username')]);
       }
       return usernames;
@@ -37,9 +48,9 @@ export default TextField.extend({
 
     this.$().val(this.get('usernames')).autocomplete({
       template: findRawTemplate('user-selector-autocomplete'),
-      disabled: this.get('disabled'),
-      single: this.get('single'),
-      allowAny: this.get('allowAny'),
+      disabled: disabled,
+      single: single,
+      allowAny: allowAny,
       updateData: (opts && opts.updateData) ? opts.updateData : false,
 
       dataSource(term) {
@@ -54,7 +65,8 @@ export default TextField.extend({
           allowedUsers,
           includeMentionableGroups,
           includeMessageableGroups,
-          group: self.get("group")
+          group: self.get("group"),
+          disallowEmails,
         });
 
         return results;
diff --git a/app/assets/javascripts/discourse/components/user-stat.js.es6 b/app/assets/javascripts/discourse/components/user-stat.js.es6
index 8931501e3e6..933f11a11bd 100644
--- a/app/assets/javascripts/discourse/components/user-stat.js.es6
+++ b/app/assets/javascripts/discourse/components/user-stat.js.es6
@@ -1,5 +1,6 @@
 export default Ember.Component.extend({
   classNames: ['user-stat'],
   type: 'number',
-  isNumber: Ember.computed.equal('type', 'number')
+  isNumber: Ember.computed.equal('type', 'number'),
+  isDuration: Ember.computed.equal('type', 'duration')
 });
diff --git a/app/assets/javascripts/discourse/components/user-stream-item.js.es6 b/app/assets/javascripts/discourse/components/user-stream-item.js.es6
index 103f450b245..b239613c477 100644
--- a/app/assets/javascripts/discourse/components/user-stream-item.js.es6
+++ b/app/assets/javascripts/discourse/components/user-stream-item.js.es6
@@ -11,5 +11,5 @@ export default Ember.Component.extend({
   ],
 
   moderatorAction: propertyEqual("item.post_type", "site.post_types.moderator_action"),
-  actionDescription: actionDescription("item.action_code", "item.created_at", "item.username"),
+  actionDescription: actionDescription("item.action_code", "item.created_at", "item.action_code_who"),
 });
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index df41d58a0a9..bc64c7e3bfa 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -5,7 +5,7 @@ import Composer from 'discourse/models/composer';
 import { default as computed, observes, on } from 'ember-addons/ember-computed-decorators';
 import InputValidation from 'discourse/models/input-validation';
 import { getOwner } from 'discourse-common/lib/get-owner';
-import { escapeExpression } from 'discourse/lib/utilities';
+import { escapeExpression, authorizesOneOrMoreExtensions } from 'discourse/lib/utilities';
 import { emojiUnescape } from 'discourse/lib/text';
 import { shortDate } from 'discourse/lib/formatter';
 
@@ -41,7 +41,8 @@ function loadDraft(store, opts) {
       composerState: Composer.DRAFT,
       composerTime: draft.composerTime,
       typingTime: draft.typingTime,
-      whisper: draft.whisper
+      whisper: draft.whisper,
+      tags: draft.tags
     });
     return composer;
   }
@@ -70,6 +71,7 @@ export default Ember.Controller.extend({
   scopedCategoryId: null,
   lastValidatedAt: null,
   isUploading: false,
+  allowUpload: false,
   topic: null,
   linkLookup: null,
   showPreview: true,
@@ -139,7 +141,8 @@ export default Ember.Controller.extend({
     return !this.site.mobileView &&
             this.site.get('can_tag_topics') &&
             canEditTitle &&
-            !creatingPrivateMessage;
+            !creatingPrivateMessage &&
+            (!this.get('model.topic.isPrivateMessage') || this.site.get('can_tag_pms'));
   },
 
   @computed('model.whisper', 'model.unlistTopic')
@@ -223,6 +226,11 @@ export default Ember.Controller.extend({
     return emojiUnescape(escapeExpression(topic.get('title')));
   },
 
+  @computed
+  allowUpload() {
+    return authorizesOneOrMoreExtensions();
+  },
+
   actions: {
     cancelUpload() {
       this.set('model.uploadCancelled', true);
@@ -512,7 +520,7 @@ export default Ember.Controller.extend({
       if (result.responseJson.action === "create_post" || this.get('replyAsNewTopicDraft') || this.get('replyAsNewPrivateMessageDraft')) {
         this.destroyDraft();
       }
-      if (this.get('model.action') === 'edit') {
+      if (this.get('model.editingPost')) {
         this.appEvents.trigger('post-stream:refresh', { id: parseInt(result.responseJson.id) });
         if (result.responseJson.post.post_number === 1) {
           this.appEvents.trigger('header:update-topic', composer.get('topic'));
@@ -670,8 +678,12 @@ export default Ember.Controller.extend({
     composerModel.set('composeState', Composer.OPEN);
     composerModel.set('isWarning', false);
 
+    if (opts.usernames) {
+      this.set('model.targetUsernames', opts.usernames);
+    }
+
     if (opts.topicTitle && opts.topicTitle.length <= this.siteSettings.max_topic_title_length) {
-      this.set('model.title', opts.topicTitle);
+      this.set('model.title', escapeExpression(opts.topicTitle));
     }
 
     if (opts.topicCategoryId) {
@@ -719,25 +731,26 @@ export default Ember.Controller.extend({
   destroyDraft() {
     const key = this.get('model.draftKey');
     if (key) {
+      if (key === 'new_topic') {
+        this.send('clearTopicDraft');
+      }
       Draft.clear(key, this.get('model.draftSequence'));
     }
   },
 
   cancelComposer() {
-    const self = this;
-
-    return new Ember.RSVP.Promise(function (resolve) {
-      if (self.get('model.hasMetaData') || self.get('model.replyDirty')) {
+    return new Ember.RSVP.Promise((resolve) => {
+      if (this.get('model.hasMetaData') || this.get('model.replyDirty')) {
         bootbox.dialog(I18n.t("post.abandon.confirm"), [
           { label: I18n.t("post.abandon.no_value") },
           {
             label: I18n.t("post.abandon.yes_value"),
             'class': 'btn-danger',
-            callback(result) {
+            callback: (result) => {
               if (result) {
-                self.destroyDraft();
-                self.get('model').clearState();
-                self.close();
+                this.destroyDraft();
+                this.get('model').clearState();
+                this.close();
                 resolve();
               }
             }
@@ -745,9 +758,9 @@ export default Ember.Controller.extend({
         ]);
       } else {
         // it is possible there is some sort of crazy draft with no body ... just give up on it
-        self.destroyDraft();
-        self.get('model').clearState();
-        self.close();
+        this.destroyDraft();
+        this.get('model').clearState();
+        this.close();
         resolve();
       }
     });
@@ -773,11 +786,19 @@ export default Ember.Controller.extend({
 
   @computed('model.categoryId', 'lastValidatedAt')
   categoryValidation(categoryId, lastValidatedAt) {
-    if( !this.siteSettings.allow_uncategorized_topics && !categoryId) {
+    if(!this.siteSettings.allow_uncategorized_topics && !categoryId) {
       return InputValidation.create({ failed: true, reason: I18n.t('composer.error.category_missing'), lastShownAt: lastValidatedAt });
     }
   },
 
+  @computed('model.category', 'model.tags', 'lastValidatedAt')
+  tagValidation(category, tags, lastValidatedAt) {
+    const tagsArray = tags || [];
+    if (this.site.get('can_tag_topics') && category && category.get('minimum_required_tags') > tagsArray.length) {
+      return InputValidation.create({ failed: true, reason: I18n.t('composer.error.tags_missing', {count: category.get('minimum_required_tags')}), lastShownAt: lastValidatedAt });
+    }
+  },
+
   collapse() {
     this._saveDraft();
     this.set('model.composeState', Composer.DRAFT);
diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6
index 9b3528f32b4..1ac854e9fa1 100644
--- a/app/assets/javascripts/discourse/controllers/create-account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6
@@ -157,21 +157,18 @@ export default Ember.Controller.extend(ModalFunctionality, PasswordValidation, U
     },
 
     createAccount() {
-      const self = this,
-          attrs = this.getProperties('accountName', 'accountEmail', 'accountPassword', 'accountUsername', 'accountPasswordConfirm', 'accountChallenge'),
-          userFields = this.get('userFields');
+      const attrs = this.getProperties('accountName', 'accountEmail', 'accountPassword', 'accountUsername', 'accountPasswordConfirm', 'accountChallenge');
+      const userFields = this.get('userFields');
 
       // Add the userfields to the data
       if (!Ember.isEmpty(userFields)) {
         attrs.userFields = {};
-        userFields.forEach(function(f) {
-          attrs.userFields[f.get('field.id')] = f.get('value');
-        });
+        userFields.forEach(f => attrs.userFields[f.get('field.id')] = f.get('value'));
       }
 
       this.set('formSubmitted', true);
-      return Discourse.User.createAccount(attrs).then(function(result) {
-        self.set('isDeveloper', false);
+      return Discourse.User.createAccount(attrs).then(result => {
+        this.set('isDeveloper', false);
         if (result.success) {
           // Trigger the browser's password manager using the hidden static login form:
           const $hidden_login_form = $('#hidden-login-form');
@@ -180,24 +177,21 @@ export default Ember.Controller.extend(ModalFunctionality, PasswordValidation, U
           $hidden_login_form.find('input[name=redirect]').val(userPath('account-created'));
           $hidden_login_form.submit();
         } else {
-          self.flash(result.message || I18n.t('create_account.failed'), 'error');
+          this.flash(result.message || I18n.t('create_account.failed'), 'error');
           if (result.is_developer) {
-            self.set('isDeveloper', true);
+            this.set('isDeveloper', true);
           }
           if (result.errors && result.errors.email && result.errors.email.length > 0 && result.values) {
-            self.get('rejectedEmails').pushObject(result.values.email);
+            this.get('rejectedEmails').pushObject(result.values.email);
           }
           if (result.errors && result.errors.password && result.errors.password.length > 0) {
-            self.get('rejectedPasswords').pushObject(attrs.accountPassword);
+            this.get('rejectedPasswords').pushObject(attrs.accountPassword);
           }
-          self.set('formSubmitted', false);
+          this.set('formSubmitted', false);
         }
-        if (result.active && !Discourse.SiteSettings.must_approve_users) {
-          return window.location.reload();
-        }
-      }, function() {
-        self.set('formSubmitted', false);
-        return self.flash(I18n.t('create_account.failed'), 'error');
+      }, () => {
+        this.set('formSubmitted', false);
+        return this.flash(I18n.t('create_account.failed'), 'error');
       });
     }
   }
diff --git a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
index e955208acc2..344b79baff6 100644
--- a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
@@ -42,7 +42,7 @@ const controllerOpts = {
       const tracker = this.topicTrackingState;
 
       // Move inserted into topics
-      this.get('content').loadBefore(tracker.get('newIncoming'));
+      this.get('content').loadBefore(tracker.get('newIncoming'), true);
       tracker.resetTracking();
       return false;
     },
@@ -137,11 +137,12 @@ const controllerOpts = {
   footerEducation: function() {
     if (!this.get('allLoaded') || this.get('model.topics.length') > 0 || !this.currentUser) { return; }
 
-    const split = (this.get('model.filter') || '').split('/');
+    const segments = (this.get('model.filter') || '').split('/');
 
-    if (split[0] !== 'new' && split[0] !== 'unread') { return; }
+    const tab = segments[segments.length - 1];
+    if (tab !== 'new' && tab !== 'unread') { return; }
 
-    return I18n.t("topics.none.educate." + split[0], {
+    return I18n.t("topics.none.educate." + tab, {
       userPrefsUrl: userPath(`${this.currentUser.get('username_lower')}/preferences`)
     });
   }.property('allLoaded', 'model.topics.length')
diff --git a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6 b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
index e1a122a37a7..c12ae43a591 100644
--- a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
@@ -15,12 +15,15 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
   @computed("model.closed")
   publicTimerTypes(closed) {
-    return [
+    let types = [
       { id: CLOSE_STATUS_TYPE, name: I18n.t(closed ? 'topic.temp_open.title' : 'topic.auto_close.title'), },
       { id: OPEN_STATUS_TYPE, name: I18n.t(closed ? 'topic.auto_reopen.title' : 'topic.temp_close.title') },
       { id: PUBLISH_TO_CATEGORY_STATUS_TYPE, name: I18n.t('topic.publish_to_category.title') },
-      { id: DELETE_STATUS_TYPE, name: I18n.t('topic.auto_delete.title') }
     ];
+    if (this.currentUser.get("staff")) {
+      types.push({ id: DELETE_STATUS_TYPE, name: I18n.t('topic.auto_delete.title') });
+    }
+    return types;
   },
 
   @computed()
@@ -32,20 +35,12 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
   @computed("isPublic", 'publicTimerTypes', 'privateTimerTypes')
   selections(isPublic, publicTimerTypes, privateTimerTypes) {
-    if (isPublic === 'true') {
-      return publicTimerTypes;
-    } else {
-      return privateTimerTypes;
-    }
+    return "true" === isPublic ? publicTimerTypes : privateTimerTypes;
   },
 
   @computed('isPublic', 'model.topic_timer', 'model.private_topic_timer')
   topicTimer(isPublic, publicTopicTimer, privateTopicTimer) {
-    if (isPublic === 'true') {
-      return publicTopicTimer;
-    } else {
-      return privateTopicTimer;
-    }
+    return "true" === isPublic ? publicTopicTimer : privateTopicTimer;
   },
 
   _setTimer(time, statusType) {
diff --git a/app/assets/javascripts/discourse/controllers/flag.js.es6 b/app/assets/javascripts/discourse/controllers/flag.js.es6
index e8d309c8c98..87b9daf0012 100644
--- a/app/assets/javascripts/discourse/controllers/flag.js.es6
+++ b/app/assets/javascripts/discourse/controllers/flag.js.es6
@@ -80,7 +80,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
     if (selected.get('is_custom_flag')) {
       const len = this.get('message.length') || 0;
-      return len >= Discourse.SiteSettings.min_private_message_post_length &&
+      return len >= Discourse.SiteSettings.min_personal_message_post_length &&
              len <= MAX_MESSAGE_LENGTH;
     }
     return true;
diff --git a/app/assets/javascripts/discourse/controllers/forgot-password.js.es6 b/app/assets/javascripts/discourse/controllers/forgot-password.js.es6
index 4311368186c..dd9dacc1a4a 100644
--- a/app/assets/javascripts/discourse/controllers/forgot-password.js.es6
+++ b/app/assets/javascripts/discourse/controllers/forgot-password.js.es6
@@ -20,48 +20,54 @@ export default Ember.Controller.extend(ModalFunctionality, {
   },
 
   actions: {
-    submit() {
-      if (this.get('submitDisabled')) return false;
-
-      this.set('disabled', true);
-
-      ajax('/session/forgot_password', {
-        data: { login: this.get('accountEmailOrUsername').trim() },
-        type: 'POST'
-      }).then(data => {
-        const escaped = escapeExpression(this.get('accountEmailOrUsername'));
-        const isEmail = this.get('accountEmailOrUsername').match(/@/);
-        let key = 'forgot_password.complete_' + (isEmail ? 'email' : 'username');
-        let extraClass;
-
-        if (data.user_found === true) {
-          key += '_found';
-          this.set('accountEmailOrUsername', '');
-          this.set('offerHelp', I18n.t(key, {email: escaped, username: escaped}));
-        } else {
-          if (data.user_found === false) {
-            key += '_not_found';
-            extraClass = 'error';
-          }
-
-          this.flash(I18n.t(key, {email: escaped, username: escaped}), extraClass);
-        }
-      }).catch(e => {
-        this.flash(extractError(e), 'error');
-      }).finally(() => {
-        setTimeout(() => this.set('disabled', false), 1000);
-      });
-
-      return false;
-    },
-
     ok() {
       this.send('closeModal');
     },
 
     help() {
       this.setProperties({ offerHelp: I18n.t('forgot_password.help'), helpSeen: true });
-    }
-  }
+    },
 
+    resetPassword() {
+      if (this.get('submitDisabled')) return false;
+      this.set('disabled', true);
+
+      this.clearFlash();
+
+      ajax('/session/forgot_password', {
+        data: { login: this.get('accountEmailOrUsername').trim() },
+        type: 'POST'
+      }).then(data => {
+        const accountEmailOrUsername = escapeExpression(this.get("accountEmailOrUsername"));
+        const isEmail = accountEmailOrUsername.match(/@/);
+        let key = `forgot_password.complete_${isEmail ? 'email' : 'username'}`;
+        let extraClass;
+
+        if (data.user_found === true) {
+          key += '_found';
+          this.set('accountEmailOrUsername', '');
+          this.set('offerHelp', I18n.t(key, {
+            email: accountEmailOrUsername,
+            username: accountEmailOrUsername
+          }));
+        } else {
+          if (data.user_found === false) {
+            key += '_not_found';
+            extraClass = 'error';
+          }
+
+          this.flash(I18n.t(key, {
+            email: accountEmailOrUsername,
+            username: accountEmailOrUsername
+          }), extraClass);
+        }
+      }).catch(e => {
+        this.flash(extractError(e), 'error');
+      }).finally(() => {
+        this.set('disabled', false);
+      });
+
+      return false;
+    }
+  },
 });
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 741e74a8978..5534be1f99c 100644
--- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
@@ -146,6 +146,11 @@ export default Ember.Controller.extend({
     }
   },
 
+  @computed('q')
+  isPrivateMessage(q) {
+    return q && this.currentUser && (q.indexOf("in:private") > -1 || q.indexOf(`private_messages:${this.currentUser.get('username_lower')}`) > -1);
+  },
+
   @observes('loading')
   _showFooter() {
     this.set("application.showFooter", !this.get("loading"));
@@ -167,14 +172,14 @@ export default Ember.Controller.extend({
     return this.currentUser && this.currentUser.staff && hasResults;
   },
 
-  @computed('expanded', 'model.grouped_search_result.can_create_topic')
-  canCreateTopic(expanded, userCanCreateTopic) {
-    return this.currentUser && userCanCreateTopic && !this.site.mobileView && !expanded;
+  @computed('model.grouped_search_result.can_create_topic')
+  canCreateTopic(userCanCreateTopic) {
+    return this.currentUser && userCanCreateTopic;
   },
 
   @computed('expanded')
   searchAdvancedIcon(expanded) {
-    return iconHTML(expanded ? "caret-down" : "caret-right");
+    return iconHTML(expanded ? "caret-down fa-fw" : "caret-right fa-fw");
   },
 
   @computed('page')
@@ -231,6 +236,7 @@ export default Ember.Controller.extend({
         }
       }else{
         setTransient('lastSearch', { searchKey, model }, 5);
+        model.grouped_search_result = results.grouped_search_result;
         this.set("model", model);
       }
     }).finally(() => {
diff --git a/app/assets/javascripts/discourse/controllers/grant-badge.js.es6 b/app/assets/javascripts/discourse/controllers/grant-badge.js.es6
new file mode 100644
index 00000000000..8a33d053ff2
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/grant-badge.js.es6
@@ -0,0 +1,63 @@
+import computed from "ember-addons/ember-computed-decorators";
+import { extractError } from 'discourse/lib/ajax-error';
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import GrantBadgeController from "discourse/mixins/grant-badge-controller";
+import Badge from 'discourse/models/badge';
+import UserBadge from 'discourse/models/user-badge';
+
+export default Ember.Controller.extend(ModalFunctionality, GrantBadgeController, {
+  topicController: Ember.inject.controller("topic"),
+  loading: true,
+  saving: false,
+  selectedBadgeId: null,
+  allBadges: [],
+  userBadges: [],
+
+  @computed('topicController.selectedPosts')
+  post() {
+    return this.get('topicController.selectedPosts')[0];
+  },
+
+  @computed('post')
+  badgeReason(post) {
+    const url = post.get('url');
+    const protocolAndHost = window.location.protocol + '//' + window.location.host;
+
+    return url.indexOf('/') === 0 ? protocolAndHost + url : url;
+  },
+
+  @computed("saving", "selectedBadgeGrantable")
+  buttonDisabled(saving, selectedBadgeGrantable) {
+    return saving || !selectedBadgeGrantable;
+  },
+
+  onShow() {
+    this.set('loading', true);
+
+    Ember.RSVP.all([Badge.findAll(), UserBadge.findByUsername(this.get('post.username'))])
+      .then(([allBadges, userBadges]) => {
+        this.setProperties({
+          'allBadges': allBadges,
+          'userBadges': userBadges,
+          'loading': false,
+        });
+      });
+  },
+
+  actions: {
+    grantBadge() {
+      this.set('saving', true);
+
+      this.grantBadge(this.get('selectedBadgeId'), this.get('post.username'), this.get('badgeReason'))
+        .then(newBadge => {
+          this.set('selectedBadgeId', null);
+          this.flash(I18n.t(
+            'badges.successfully_granted', { username: this.get('post.username'), badge: newBadge.get('badge.name') }
+          ), 'success');
+        }, error => {
+          this.flash(extractError(error), 'error');
+        })
+        .finally(() => this.set('saving', false));
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6 b/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
index 4047450a1cc..f0b6b757f74 100644
--- a/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
@@ -24,7 +24,7 @@ export default Ember.Controller.extend({
 
         group.findPosts(opts).then(newPosts => {
           posts.addObjects(newPosts);
-          if(newPosts.length === 0) {
+          if (newPosts.length === 0) {
             this.set('canLoadMore', false);
           }
         }).finally(() => {
diff --git a/app/assets/javascripts/discourse/controllers/group-activity-topics.js.es6 b/app/assets/javascripts/discourse/controllers/group-activity-topics.js.es6
new file mode 100644
index 00000000000..e538cb9c77f
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/group-activity-topics.js.es6
@@ -0,0 +1,7 @@
+export default Ember.Controller.extend({
+  actions: {
+    loadMore() {
+      this.get('model').loadMore();
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/controllers/group-activity.js.es6 b/app/assets/javascripts/discourse/controllers/group-activity.js.es6
index de4bda4dcdd..2e85014b8e3 100644
--- a/app/assets/javascripts/discourse/controllers/group-activity.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-activity.js.es6
@@ -1,11 +1,4 @@
-import computed from 'ember-addons/ember-computed-decorators';
-
 export default Ember.Controller.extend({
   application: Ember.inject.controller(),
   queryParams: ['category_id'],
-
-  @computed('model.is_group_user')
-  showGroupMessages(isGroupUser) {
-    return isGroupUser || (this.currentUser && this.currentUser.admin);
-  }
 });
diff --git a/app/assets/javascripts/discourse/controllers/group-add-members.js.es6 b/app/assets/javascripts/discourse/controllers/group-add-members.js.es6
new file mode 100644
index 00000000000..ac65416c5ca
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/group-add-members.js.es6
@@ -0,0 +1,45 @@
+import computed from 'ember-addons/ember-computed-decorators';
+import { extractError } from 'discourse/lib/ajax-error';
+import ModalFunctionality from 'discourse/mixins/modal-functionality';
+
+export default Ember.Controller.extend(ModalFunctionality, {
+  loading: false,
+  setAsOwner: false,
+
+  @computed('model.usernames', 'loading')
+  disableAddButton(usernames, loading) {
+    return loading || !usernames || !(usernames.length > 0);
+  },
+
+  actions: {
+    addMembers() {
+      this.set('loading', true);
+
+      const model = this.get('model');
+      const usernames = model.get('usernames');
+      if (Em.isEmpty(usernames)) { return; }
+      let promise;
+
+      if (this.get('setAsOwner')) {
+        promise = model.addOwners(usernames, true);
+      } else {
+        promise = model.addMembers(usernames, true);
+      }
+
+      promise.then(() => {
+        this.transitionToRoute(
+          "group.members",
+          this.get('model.name'),
+          { queryParams: { filter: usernames } }
+        );
+
+        model.set("usernames", null);
+        this.send('closeModal');
+      })
+      .catch(error => {
+        this.flash(extractError(error), 'error');
+      })
+      .finally(() => this.set('loading', false));
+    },
+  },
+});
diff --git a/app/assets/javascripts/discourse/controllers/group-bulk-add.js.es6 b/app/assets/javascripts/discourse/controllers/group-bulk-add.js.es6
new file mode 100644
index 00000000000..5469cc1235e
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/group-bulk-add.js.es6
@@ -0,0 +1,45 @@
+import computed from 'ember-addons/ember-computed-decorators';
+import { extractError } from 'discourse/lib/ajax-error';
+import ModalFunctionality from 'discourse/mixins/modal-functionality';
+import { ajax } from 'discourse/lib/ajax';
+
+export default Ember.Controller.extend(ModalFunctionality, {
+  loading: false,
+
+  @computed('input', 'loading', 'result')
+  disableAddButton(input, loading, result) {
+    return loading || Ember.isEmpty(input) || (input.length <= 0) || result;
+  },
+
+  actions: {
+    cancel() {
+      this.set('result', null);
+    },
+
+    add() {
+      this.setProperties({
+        loading: true,
+        result: null,
+      });
+
+      const users = this.get('input').split("\n")
+        .uniq()
+        .reject(x => x.length === 0);
+
+      ajax('/admin/groups/bulk', {
+        data: { users, group_id: this.get('model.id') },
+        method: 'PUT'
+      }).then(result => {
+        this.set('result', result);
+
+        if (result.users_not_added) {
+          this.set('result.invalidUsers', result.users_not_added.join(", "));
+        }
+      }).catch(error => {
+        this.flash(extractError(error), 'error');
+      }).finally(() => {
+        this.set('loading', false);
+      });
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/controllers/group-edit.js.es6 b/app/assets/javascripts/discourse/controllers/group-edit.js.es6
deleted file mode 100644
index 32277430af5..00000000000
--- a/app/assets/javascripts/discourse/controllers/group-edit.js.es6
+++ /dev/null
@@ -1,23 +0,0 @@
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-import computed from 'ember-addons/ember-computed-decorators';
-
-export default Ember.Controller.extend({
-  @computed('saving')
-  savingText(saving) {
-    if (saving !== undefined) {
-      return saving ? I18n.t('saving') : I18n.t('saved');
-    }
-  },
-
-  actions: {
-    save() {
-      this.set('saving', true);
-
-      this.get('model').save().catch(error => {
-        popupAjaxError(error);
-      }).finally(() => {
-        this.set('saving', false);
-      });
-    }
-  }
-});
diff --git a/app/assets/javascripts/discourse/controllers/group-index.js.es6 b/app/assets/javascripts/discourse/controllers/group-index.js.es6
index 269ecab7cdb..c58b0a71842 100644
--- a/app/assets/javascripts/discourse/controllers/group-index.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-index.js.es6
@@ -1,9 +1,10 @@
 import { popupAjaxError } from 'discourse/lib/ajax-error';
 import Group from 'discourse/models/group';
 import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+import debounce from 'discourse/lib/debounce';
 
 export default Ember.Controller.extend({
-  queryParams: ['order', 'desc'],
+  queryParams: ['order', 'desc', 'filter'],
   order: '',
   desc: null,
   loading: false,
@@ -11,15 +12,32 @@ export default Ember.Controller.extend({
   offset: null,
   isOwner: Ember.computed.alias('model.is_group_owner'),
   showActions: false,
+  filter: null,
+  filterInput: null,
+  application: Ember.inject.controller(),
 
-  @observes('order', 'desc')
+  @observes("filterInput")
+  _setFilter: debounce(function() {
+    this.set("filter", this.get("filterInput"));
+  }, 500),
+
+  @observes('order', 'desc', 'filter')
   refreshMembers() {
     this.set('loading', true);
+    const model = this.get('model');
 
-    this.get('model') &&
-      this.get('model')
-        .findMembers({ order: this.get('order'), desc: this.get('desc') })
-        .finally(() => this.set('loading', false));
+    if (model) {
+      model.findMembers(this.get('memberParams'))
+        .finally(() => {
+          this.set('application.showFooter', model.members.length >= model.user_count);
+          this.set('loading', false);
+        });
+    }
+  },
+
+  @computed('order', 'desc', 'filter')
+  memberParams(order, desc, filter) {
+    return { order, desc, filter };
   },
 
   @computed('model.members')
@@ -27,13 +45,35 @@ export default Ember.Controller.extend({
     return members && members.length > 0;
   },
 
+  @computed('model')
+  canManageGroup(model) {
+    return this.currentUser && this.currentUser.canManageGroup(model);
+  },
+
+  @computed
+  filterPlaceholder() {
+    if (this.currentUser && this.currentUser.admin) {
+      return "groups.members.filter_placeholder_admin";
+    } else {
+      return "groups.members.filter_placeholder";
+    }
+  },
+
   actions: {
     toggleActions() {
       this.toggleProperty("showActions");
     },
 
     removeMember(user) {
-      this.get('model').removeMember(user);
+      this.get('model').removeMember(user, this.get('memberParams'));
+    },
+
+    makeOwner(username) {
+      this.get('model').addOwners(username);
+    },
+
+    removeOwner(user) {
+      this.get('model').removeOwner(user);
     },
 
     addMembers() {
@@ -45,7 +85,10 @@ export default Ember.Controller.extend({
 
     loadMore() {
       if (this.get("loading")) { return; }
-      if (this.get("model.members.length") >= this.get("model.user_count")) { return; }
+      if (this.get("model.members.length") >= this.get("model.user_count")) {
+        this.set("application.showFooter", true);
+        return;
+      }
 
       this.set("loading", true);
 
diff --git a/app/assets/javascripts/discourse/controllers/group-logs.js.es6 b/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6
similarity index 90%
rename from app/assets/javascripts/discourse/controllers/group-logs.js.es6
rename to app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6
index 0019127c3a6..bd6bb30472c 100644
--- a/app/assets/javascripts/discourse/controllers/group-logs.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6
@@ -4,6 +4,7 @@ export default Ember.Controller.extend({
   group: Ember.inject.controller(),
   loading: false,
   offset: 0,
+  application: Ember.inject.controller(),
 
   init() {
     this._super();
@@ -27,6 +28,11 @@ export default Ember.Controller.extend({
     });
   },
 
+  @observes("model.all_loaded")
+  _showFooter() {
+    this.set("application.showFooter", this.get("model.all_loaded"));
+  },
+
   reset() {
     this.setProperties({
       offset: 0,
diff --git a/app/assets/javascripts/discourse/controllers/group-manage-profile.js.es6 b/app/assets/javascripts/discourse/controllers/group-manage-profile.js.es6
new file mode 100644
index 00000000000..17df28ceb03
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/group-manage-profile.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Controller.extend({
+  saving: null,
+});
diff --git a/app/assets/javascripts/discourse/controllers/group-manage.js.es6 b/app/assets/javascripts/discourse/controllers/group-manage.js.es6
new file mode 100644
index 00000000000..9d100f63e68
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/group-manage.js.es6
@@ -0,0 +1,25 @@
+import { default as computed } from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Controller.extend({
+  application: Ember.inject.controller(),
+
+  @computed("model.automatic")
+  tabs(automatic) {
+    const defaultTabs = [
+      { route: 'group.manage.interaction', title: 'groups.manage.interaction.title' },
+      { route: 'group.manage.logs', title: 'groups.manage.logs.title' },
+    ];
+
+    if (!automatic) {
+      defaultTabs.splice(0, 0,
+        { route: 'group.manage.profile', title: 'groups.manage.profile.title' }
+      );
+
+      defaultTabs.splice(1, 0,
+        { route: 'group.manage.membership', title: 'groups.manage.membership.title' }
+      );
+    }
+
+    return defaultTabs;
+  },
+});
diff --git a/app/assets/javascripts/discourse/controllers/group-messages.js.es6 b/app/assets/javascripts/discourse/controllers/group-messages.js.es6
new file mode 100644
index 00000000000..63bf54eb78c
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/group-messages.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Controller.extend({
+  application: Ember.inject.controller(),
+});
diff --git a/app/assets/javascripts/discourse/controllers/group.js.es6 b/app/assets/javascripts/discourse/controllers/group.js.es6
index 98e4687f893..e9bf3bde7d1 100644
--- a/app/assets/javascripts/discourse/controllers/group.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group.js.es6
@@ -1,4 +1,4 @@
-import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+import { default as computed } from 'ember-addons/ember-computed-decorators';
 
 const Tab = Ember.Object.extend({
   init() {
@@ -13,17 +13,49 @@ export default Ember.Controller.extend({
   application: Ember.inject.controller(),
   counts: null,
   showing: 'members',
+  destroying: null,
 
-  tabs: [
-    Tab.create({ name: 'members', route: 'group.index', icon: 'users' }),
-    Tab.create({ name: 'activity' }),
-    Tab.create({
-      name: 'edit', i18nKey: 'edit.title', icon: 'pencil', admin: true
-    }),
-    Tab.create({
-      name: 'logs', i18nKey: 'logs.title', icon: 'list-alt', admin: true
-    })
-  ],
+  @computed('showMessages', 'model.user_count', 'canManageGroup')
+  tabs(showMessages, userCount, canManageGroup) {
+    const membersTab = Tab.create({
+      name: 'members',
+      route: 'group.index',
+      icon: 'users',
+      i18nKey: "members.title"
+    });
+
+    membersTab.set('count', userCount);
+
+    const defaultTabs = [
+      membersTab,
+      Tab.create({ name: 'activity' })
+    ];
+
+    if (showMessages) {
+      defaultTabs.push(Tab.create({
+        name: 'messages', i18nKey: 'messages'
+      }));
+    }
+
+    if (canManageGroup) {
+      defaultTabs.push(
+        Tab.create({
+          name: 'manage', i18nKey: 'manage.title', icon: 'wrench'
+        })
+      );
+    }
+
+    return defaultTabs;
+  },
+
+  @computed('model.is_group_user')
+  showMessages(isGroupUser) {
+    if (!this.siteSettings.enable_personal_messages) {
+      return false;
+    }
+
+    return isGroupUser || (this.currentUser && this.currentUser.admin);
+  },
 
   @computed('model.is_group_owner', 'model.automatic')
   canEditGroup(isGroupOwner, automatic) {
@@ -50,14 +82,40 @@ export default Ember.Controller.extend({
     return this.currentUser && messageable;
   },
 
-  @observes('model.user_count')
-  _setMembersTabCount() {
-    this.get('tabs')[0].set('count', this.get('model.user_count'));
+  @computed('model', 'model.automatic')
+  canManageGroup(model, automatic) {
+    return this.currentUser && (
+      this.currentUser.canManageGroup(model) ||
+      (this.currentUser.admin && automatic)
+    );
   },
 
   actions: {
     messageGroup() {
       this.send('createNewMessageViaParams', this.get('model.name'));
-    }
+    },
+
+    destroy() {
+      const group = this.get('model');
+      this.set('destroying', true);
+
+      bootbox.confirm(
+        I18n.t("admin.groups.delete_confirm"),
+        I18n.t("no_value"),
+        I18n.t("yes_value"),
+        confirmed => {
+          if (confirmed) {
+            group.destroy().then(() => {
+              this.transitionToRoute('groups.index');
+            }).catch(error => {
+              Ember.Logger.error(error);
+              bootbox.alert(I18n.t("admin.groups.delete_failed"));
+            }).finally(() => this.set('destroying', false));
+          } else {
+            this.set('destroying', false);
+          }
+        }
+      );
+    },
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/groups-index.js.es6 b/app/assets/javascripts/discourse/controllers/groups-index.js.es6
new file mode 100644
index 00000000000..e8f4098ae8f
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/groups-index.js.es6
@@ -0,0 +1,44 @@
+import debounce from 'discourse/lib/debounce';
+import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Controller.extend({
+  application: Ember.inject.controller(),
+  queryParams: ["order", "asc", "filter", "type"],
+  order: null,
+  asc: null,
+  filter: "",
+  type: null,
+
+  @computed("model.extras.type_filters")
+  types(typeFilters) {
+    const types = [];
+
+    if (typeFilters) {
+      typeFilters.forEach(type => {
+        types.push({ id: type, name: I18n.t(`groups.index.${type}_groups`) });
+      });
+    }
+
+    return types;
+  },
+
+  @observes("filterInput")
+  _setFilter: debounce(function() {
+    this.set("filter", this.get("filterInput"));
+  }, 500),
+
+  @observes("model.canLoadMore")
+  _showFooter() {
+    this.set("application.showFooter", !this.get("model.canLoadMore"));
+  },
+
+  actions: {
+    loadMore() {
+      this.get('model').loadMore();
+    },
+
+    new() {
+      this.transitionToRoute("groups.new");
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/controllers/groups-new.js.es6 b/app/assets/javascripts/discourse/controllers/groups-new.js.es6
new file mode 100644
index 00000000000..17e81c5da87
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/groups-new.js.es6
@@ -0,0 +1,17 @@
+import { popupAjaxError } from 'discourse/lib/ajax-error';
+
+export default Ember.Controller.extend({
+  saving: null,
+
+  actions: {
+    save() {
+      this.set('saving', true);
+      const group = this.get('model');
+
+      group.create().then(() => {
+        this.transitionToRoute("group.members", group.name);
+      }).catch(popupAjaxError)
+        .finally(() => this.set('saving', false));
+    },
+  }
+});
diff --git a/app/assets/javascripts/discourse/controllers/groups.js.es6 b/app/assets/javascripts/discourse/controllers/groups.js.es6
deleted file mode 100644
index d8ce08f3227..00000000000
--- a/app/assets/javascripts/discourse/controllers/groups.js.es6
+++ /dev/null
@@ -1,16 +0,0 @@
-import { observes } from 'ember-addons/ember-computed-decorators';
-
-export default Ember.Controller.extend({
-  application: Ember.inject.controller(),
-
-  @observes("groups.canLoadMore")
-  _showFooter() {
-    this.set("application.showFooter", !this.get("groups.canLoadMore"));
-  },
-
-  actions: {
-    loadMore() {
-      this.get('groups').loadMore();
-    }
-  }
-});
diff --git a/app/assets/javascripts/discourse/controllers/invite.js.es6 b/app/assets/javascripts/discourse/controllers/invite.js.es6
index 71509d9e137..178bb02234b 100644
--- a/app/assets/javascripts/discourse/controllers/invite.js.es6
+++ b/app/assets/javascripts/discourse/controllers/invite.js.es6
@@ -158,6 +158,11 @@ export default Ember.Controller.extend(ModalFunctionality, {
     return Group.findAll({ term: term, ignore_automatic: true });
   },
 
+  @computed('isPrivateTopic', 'isMessage')
+  includeMentionableGroups(isPrivateTopic, isMessage) {
+    return !isPrivateTopic && !isMessage;
+  },
+
   @computed('isMessage', 'emailOrUsername', 'invitingExistingUserToTopic')
   successMessage(isMessage, emailOrUsername, invitingExistingUserToTopic) {
     if (this.get('hasGroups')) {
diff --git a/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6 b/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
index 94ccc5595a4..06fae57eb80 100644
--- a/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
+++ b/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
@@ -6,10 +6,8 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
   actions: {
     jump() {
-      let where = parseInt(this.get('postNumber'));
-      if (where < 1) { where = 1; }
-      const max = this.get('topic.postStream.filteredPostsCount');
-      if (where > max) { where = max; }
+      const max   = this.get("topic.postStream.filteredPostsCount");
+      const where = Math.min(max, Math.max(1, parseInt(this.get("postNumber"))));
 
       this.jumpToIndex(where);
       this.send('closeModal');
diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6
index c524939435b..710a2a084ab 100644
--- a/app/assets/javascripts/discourse/controllers/login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/login.js.es6
@@ -4,6 +4,9 @@ import showModal from 'discourse/lib/show-modal';
 import { setting } from 'discourse/lib/computed';
 import { findAll } from 'discourse/models/login-method';
 import { escape } from 'pretty-text/sanitizer';
+import { escapeExpression } from 'discourse/lib/utilities';
+import { extractError } from 'discourse/lib/ajax-error';
+import computed from 'ember-addons/ember-computed-decorators';
 
 // This is happening outside of the app via popup
 const AuthErrors = [
@@ -11,7 +14,7 @@ const AuthErrors = [
   'awaiting_approval',
   'awaiting_activation',
   'admin_not_allowed_from_ip_address',
-  'not_allowed_from_ip_address'
+  'not_allowed_from_ip_address',
 ];
 
 export default Ember.Controller.extend(ModalFunctionality, {
@@ -23,14 +26,23 @@ export default Ember.Controller.extend(ModalFunctionality, {
   authenticate: null,
   loggingIn: false,
   loggedIn: false,
+  processingEmailLink: false,
+  showLoginButtons: true,
 
   canLoginLocal: setting('enable_local_logins'),
+  canLoginLocalWithEmail: setting('enable_local_logins_via_email'),
   loginRequired: Em.computed.alias('application.loginRequired'),
 
   resetForm: function() {
-    this.set('authenticate', null);
-    this.set('loggingIn', false);
-    this.set('loggedIn', false);
+    this.setProperties({
+      'authenticate': null,
+      'loggingIn': false,
+      'loggedIn': false,
+      'secondFactorRequired': false,
+      'showLoginButtons': true,
+    });
+    $("#credentials").show();
+    $("#second-factor").hide();
   },
 
   // Determines whether at least one login button is enabled
@@ -38,9 +50,10 @@ export default Ember.Controller.extend(ModalFunctionality, {
     return findAll(this.siteSettings).length > 0;
   }.property(),
 
-  loginButtonText: function() {
-    return this.get('loggingIn') ? I18n.t('login.logging_in') : I18n.t('login.title');
-  }.property('loggingIn'),
+  @computed('loggingIn')
+  loginButtonLabel(loggingIn) {
+    return loggingIn ? 'login.logging_in' : 'login.title';
+  },
 
   loginDisabled: Em.computed.or('loggingIn', 'loggedIn'),
 
@@ -54,6 +67,11 @@ export default Ember.Controller.extend(ModalFunctionality, {
     return this.get('loggingIn') || this.get('authenticate');
   }.property('loggingIn', 'authenticate'),
 
+  @computed('canLoginLocalWithEmail', 'loginName', 'processingEmailLink')
+  showLoginWithEmailLink(canLoginLocalWithEmail, loginName, processingEmailLink) {
+    return canLoginLocalWithEmail && !Ember.isEmpty(loginName) && !processingEmailLink;
+  },
+
   actions: {
     login() {
       const self = this;
@@ -67,13 +85,30 @@ export default Ember.Controller.extend(ModalFunctionality, {
       this.set('loggingIn', true);
 
       ajax("/session", {
-        data: { login: this.get('loginName'), password: this.get('loginPassword') },
-        type: 'POST'
+        type: 'POST',
+        data: {
+          login: this.get('loginName'),
+          password: this.get('loginPassword'),
+          second_factor_token: this.get('loginSecondFactor')
+        },
       }).then(function (result) {
         // Successful login
         if (result && result.error) {
           self.set('loggingIn', false);
-          if (result.reason === 'not_activated') {
+
+          if (result.reason === 'invalid_second_factor' && !self.get('secondFactorRequired')) {
+            $('#modal-alert').hide();
+            self.setProperties({
+              'secondFactorRequired': true,
+              'showLoginButtons': false,
+            });
+
+            $("#credentials").hide();
+            $("#second-factor").show();
+            $("#second-factor input").focus();
+
+            return;
+          } else if (result.reason === 'not_activated') {
             self.send('showNotActivated', {
               username: self.get('loginName'),
               sentTo: escape(result.sent_to_email),
@@ -182,6 +217,37 @@ export default Ember.Controller.extend(ModalFunctionality, {
       const forgotPasswordController = this.get('forgotPassword');
       if (forgotPasswordController) { forgotPasswordController.set("accountEmailOrUsername", this.get("loginName")); }
       this.send("showForgotPassword");
+    },
+
+    emailLogin() {
+      if (this.get('processingEmailLink')) {
+        return;
+      }
+
+      if (Ember.isEmpty(this.get('loginName'))){
+        this.flash(I18n.t('login.blank_username'), 'error');
+        return;
+      }
+
+      this.set('processingEmailLink', true);
+
+      ajax('/u/email-login', {
+        data: { login: this.get('loginName').trim() },
+        type: 'POST'
+      }).then(data => {
+        const loginName = escapeExpression(this.get('loginName'));
+        const isEmail = loginName.match(/@/);
+        let key = `email_login.complete_${isEmail ? 'email' : 'username'}`;
+        if (data.user_found === false) {
+          this.flash(I18n.t(`${key}_not_found`, { email: loginName, username: loginName }), 'error');
+        } else {
+          this.flash(I18n.t(`${key}_found`, { email: loginName, username: loginName }));
+        }
+      }).catch(e => {
+        this.flash(extractError(e), 'error');
+      }).finally(() => {
+        this.set('processingEmailLink', false);
+      });
     }
   },
 
@@ -194,16 +260,28 @@ export default Ember.Controller.extend(ModalFunctionality, {
   }).property('authenticate'),
 
   authenticationComplete(options) {
-
     const self = this;
-    function loginError(errorMsg, className) {
+    function loginError(errorMsg, className, callback) {
       showModal('login');
-      Ember.run.next(function() {
+
+      Ember.run.next(() => {
+        if (callback) callback();
         self.flash(errorMsg, className || 'success');
         self.set('authenticate', null);
       });
     }
 
+    if (options.omniauth_disallow_totp) {
+      return loginError(I18n.t('login.omniauth_disallow_totp'), 'error', () => {
+        this.setProperties({
+          'loginName': options.email,
+          'showLoginButtons': false,
+        });
+
+        $('#login-account-password').focus();
+      });
+    }
+
     for (let i=0; i<AuthErrors.length; i++) {
       const cond = AuthErrors[i];
       if (options[cond]) {
@@ -217,7 +295,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
     // Reload the page if we're authenticated
     if (options.authenticated) {
-      const destinationUrl = $.cookie('destination_url');
+      const destinationUrl = $.cookie('destination_url') || options.destination_url;
       if (destinationUrl) {
         // redirect client to the original URL
         $.cookie('destination_url', null);
diff --git a/app/assets/javascripts/discourse/controllers/navigation/categories.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/categories.js.es6
index 8276b094c14..5a8a32c5d3e 100644
--- a/app/assets/javascripts/discourse/controllers/navigation/categories.js.es6
+++ b/app/assets/javascripts/discourse/controllers/navigation/categories.js.es6
@@ -1,3 +1,10 @@
 import NavigationDefaultController from 'discourse/controllers/navigation/default';
 
-export default NavigationDefaultController.extend();
+export default NavigationDefaultController.extend({
+
+  discoveryCategories: Ember.inject.controller('discovery/categories'),
+
+  draft: function() {
+    return this.get('discoveryCategories.model.draft');
+  }.property('discoveryCategories.model', 'discoveryCategories.model.draft')
+});
diff --git a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
index 1fa8eedcc7a..e56e4dd5f16 100644
--- a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
+++ b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
@@ -1,4 +1,9 @@
+
 export default Ember.Controller.extend({
   discovery: Ember.inject.controller(),
   discoveryTopics: Ember.inject.controller('discovery/topics'),
+
+  draft: function() {
+    return this.get('discoveryTopics.model.draft');
+  }.property('discoveryTopics.model', 'discoveryTopics.model.draft')
 });
diff --git a/app/assets/javascripts/discourse/controllers/password-reset.js.es6 b/app/assets/javascripts/discourse/controllers/password-reset.js.es6
index 91c62436d6a..bcf40ca88cf 100644
--- a/app/assets/javascripts/discourse/controllers/password-reset.js.es6
+++ b/app/assets/javascripts/discourse/controllers/password-reset.js.es6
@@ -8,6 +8,7 @@ import { userPath } from 'discourse/lib/url';
 export default Ember.Controller.extend(PasswordValidation, {
   isDeveloper: Ember.computed.alias('model.is_developer'),
   admin: Ember.computed.alias('model.admin'),
+  secondFactorRequired: Ember.computed.alias('model.second_factor_required'),
   passwordRequired: true,
   errorMessage: null,
   successMessage: null,
@@ -32,7 +33,8 @@ export default Ember.Controller.extend(PasswordValidation, {
         url: userPath(`password-reset/${this.get('model.token')}.json`),
         type: 'PUT',
         data: {
-          password: this.get('accountPassword')
+          password: this.get('accountPassword'),
+          second_factor_token: this.get('secondFactor')
         }
       }).then(result => {
         if (result.success) {
@@ -45,10 +47,22 @@ export default Ember.Controller.extend(PasswordValidation, {
             DiscourseURL.redirectTo(result.redirect_to || '/');
           }
         } else {
-          if (result.errors && result.errors.password && result.errors.password.length > 0) {
+          if (result.errors && result.errors.user_second_factor) {
+            this.setProperties({
+              secondFactorRequired: true,
+              password: null,
+              errorMessage: result.message
+            });
+          } else if (this.get('secondFactorRequired')) {
+            this.setProperties({
+              secondFactorRequired: false,
+              errorMessage: null
+            });
+          } else if (result.errors && result.errors.password && result.errors.password.length > 0) {
             this.get('rejectedPasswords').pushObject(this.get('accountPassword'));
             this.get('rejectedPasswordsMessages').set(this.get('accountPassword'), result.errors.password[0]);
           }
+
           if (result.message) {
             this.set('errorMessage', result.message);
           }
diff --git a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
index 9dc6083f15c..40befe7218c 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
@@ -4,15 +4,17 @@ import { default as computed } from "ember-addons/ember-computed-decorators";
 import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { setting } from 'discourse/lib/computed';
 import { popupAjaxError } from 'discourse/lib/ajax-error';
+import showModal from 'discourse/lib/show-modal';
 
 export default Ember.Controller.extend(CanCheckEmails, PreferencesTabController, {
 
-  saveAttrNames: ['name'],
+  saveAttrNames: ['name', 'title'],
 
   canEditName: setting('enable_names'),
   canSaveUser: true,
 
   newNameInput: null,
+  newTitleInput: null,
 
   passwordProgress: null,
 
@@ -30,9 +32,9 @@ export default Ember.Controller.extend(CanCheckEmails, PreferencesTabController,
     return I18n.t(this.siteSettings.full_name_required ? 'user.name.instructions_required' : 'user.name.instructions');
   },
 
-  @computed("model.has_title_badges")
-  canSelectTitle(hasTitleBadges) {
-    return this.siteSettings.enable_badges && hasTitleBadges;
+  @computed('model.availableTitles')
+  canSelectTitle(availableTitles) {
+    return availableTitles.length > 0;
   },
 
   @computed()
@@ -47,6 +49,7 @@ export default Ember.Controller.extend(CanCheckEmails, PreferencesTabController,
       const model = this.get('model');
 
       model.set('name', this.get('newNameInput'));
+      model.set('title', this.get('newTitleInput'));
 
       return model.save(this.get('saveAttrNames')).then(() => {
         this.set('saved', true);
@@ -98,6 +101,10 @@ export default Ember.Controller.extend(CanCheckEmails, PreferencesTabController,
           }
         ];
       bootbox.dialog(message, buttons, {"classes": "delete-account"});
+    },
+
+    showTwoFactorModal() {
+      showModal('second-factor-intro');
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/preferences/badge-title.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/badge-title.js.es6
deleted file mode 100644
index c39fb863956..00000000000
--- a/app/assets/javascripts/discourse/controllers/preferences/badge-title.js.es6
+++ /dev/null
@@ -1,9 +0,0 @@
-import BadgeSelectController from "discourse/mixins/badge-select-controller";
-
-export default Ember.Controller.extend(BadgeSelectController, {
-
-  filteredList: function() {
-    return this.get('model').filterBy('badge.allow_title', true);
-  }.property('model')
-
-});
diff --git a/app/assets/javascripts/discourse/controllers/preferences/card-badge.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/card-badge.js.es6
deleted file mode 100644
index 9f820f9647f..00000000000
--- a/app/assets/javascripts/discourse/controllers/preferences/card-badge.js.es6
+++ /dev/null
@@ -1,30 +0,0 @@
-import { ajax } from 'discourse/lib/ajax';
-import BadgeSelectController from "discourse/mixins/badge-select-controller";
-
-export default Ember.Controller.extend(BadgeSelectController, {
-  filteredList: function() {
-    return this.get('model').filter(function(b) {
-      return !Ember.isEmpty(b.get('badge.image'));
-    });
-  }.property('model'),
-
-  actions: {
-    save: function() {
-      this.setProperties({ saved: false, saving: true });
-
-      ajax(this.get('user.path') + "/preferences/card-badge", {
-        type: "PUT",
-        data: { user_badge_id: this.get('selectedUserBadgeId') }
-      }).then(() => {
-        this.setProperties({
-          saved: true,
-          saving: false,
-          "user.card_image_badge": this.get('selectedUserBadge.badge.image')
-        });
-      }).catch(() => {
-        this.set('saving', false);
-        bootbox.alert(I18n.t('generic_error'));
-      });
-    }
-  }
-});
diff --git a/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6
index f394acd3e1e..6e27ea04e07 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6
@@ -1,6 +1,6 @@
 import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { popupAjaxError } from 'discourse/lib/ajax-error';
-import { default as computed } from "ember-addons/ember-computed-decorators";
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Controller.extend(PreferencesTabController, {
   saveAttrNames: [
@@ -12,7 +12,7 @@ export default Ember.Controller.extend(PreferencesTabController, {
 
   @computed("model.watchedCategories", "model.watchedFirstPostCategories", "model.trackedCategories", "model.mutedCategories")
   selectedCategories(watched, watchedFirst, tracked, muted) {
-    return [].concat(watched, watchedFirst, tracked, muted);
+    return [].concat(watched, watchedFirst, tracked, muted).filter(t => t);
   },
 
   canSave: function() {
diff --git a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
index fd688471bc9..9eb2960b836 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
@@ -57,16 +57,24 @@ export default Ember.Controller.extend(PreferencesTabController, {
   },
 
   homeChanged() {
-    const siteHome = Discourse.SiteSettings.top_menu.split("|")[0].split(",")[0];
+    const siteHome = this.siteSettings.top_menu.split("|")[0].split(",")[0];
     const userHome = USER_HOMES[this.get('model.user_option.homepage_id')];
+
     setDefaultHomepage(userHome || siteHome);
   },
 
   @computed()
   userSelectableHome() {
-    return _.map(USER_HOMES, (name, num) => {
-      return {name: I18n.t('filters.' + name + '.title'), value: Number(num)};
+    let homeValues = _.invert(USER_HOMES);
+
+    let result = [];
+    this.siteSettings.top_menu.split('|').forEach(m => {
+      let id = homeValues[m];
+      if (id) {
+        result.push({ name: I18n.t(`filters.${m}.title`), value: Number(id) });
+      }
     });
+    return result;
   },
 
   actions: {
diff --git a/app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6
new file mode 100644
index 00000000000..bdaab628cd9
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6
@@ -0,0 +1,109 @@
+import { default as computed } from 'ember-addons/ember-computed-decorators';
+import { default as DiscourseURL, userPath } from 'discourse/lib/url';
+import { popupAjaxError } from 'discourse/lib/ajax-error';
+import { LOGIN_METHODS }  from 'discourse/models/login-method';
+
+export default Ember.Controller.extend({
+  loading: false,
+  resetPasswordLoading: false,
+  resetPasswordProgress: '',
+  password: null,
+  secondFactorImage: null,
+  secondFactorKey: null,
+  showSecondFactorKey: false,
+  errorMessage: null,
+  newUsername: null,
+
+  loaded: Ember.computed.and('secondFactorImage', 'secondFactorKey'),
+
+  @computed('loading')
+  submitButtonText(loading) {
+    return loading ? 'loading' : 'continue';
+  },
+
+  @computed('loading')
+  enableButtonText(loading) {
+    return loading ? 'loading' : 'enable';
+  },
+
+  @computed('loading')
+  disableButtonText(loading) {
+    return loading ? 'loading' : 'disable';
+  },
+
+  @computed
+  displayOAuthWarning() {
+    return LOGIN_METHODS.some(name => {
+      return this.siteSettings[`enable_${name}_logins`];
+    });
+  },
+
+  toggleSecondFactor(enable) {
+    if (!this.get('secondFactorToken')) return;
+    this.set('loading', true);
+
+    this.get('content').toggleSecondFactor(this.get('secondFactorToken'), enable)
+      .then(response => {
+        if (response.error) {
+          this.set('errorMessage', response.error);
+          this.set('loading', false);
+          return;
+        }
+
+        this.set('errorMessage',null);
+        DiscourseURL.redirectTo(userPath(`${this.get('content').username.toLowerCase()}/preferences`));
+      })
+      .catch(error => {
+        this.set('loading', false);
+        popupAjaxError(error);
+      });
+  },
+
+  actions: {
+    confirmPassword() {
+      if (!this.get('password')) return;
+      this.set('loading', true);
+
+      this.get('content').loadSecondFactorCodes(this.get('password'))
+        .then(response => {
+          if(response.error) {
+            this.set('errorMessage', response.error);
+            return;
+          }
+
+          this.setProperties({
+            errorMessage: null,
+            secondFactorKey: response.key,
+            secondFactorImage: response.qr,
+          });
+        })
+        .catch(popupAjaxError)
+        .finally(() => this.set('loading', false));
+    },
+
+    resetPassword() {
+      this.setProperties({
+        resetPasswordLoading: true,
+        resetPasswordProgress: ''
+      });
+
+      return this.get('model').changePassword().then(() => {
+        this.set('resetPasswordProgress', I18n.t('user.change_password.success'));
+      })
+      .catch(popupAjaxError)
+      .finally(() => this.set('resetPasswordLoading', false));
+    },
+
+    showSecondFactorKey() {
+      this.set('showSecondFactorKey', true);
+    },
+
+    enableSecondFactor() {
+      this.toggleSecondFactor(true);
+    },
+
+    disableSecondFactor() {
+      this.toggleSecondFactor(false);
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/controllers/preferences/tags.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/tags.js.es6
index 6264d42b2de..39608df5b45 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/tags.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/tags.js.es6
@@ -1,8 +1,8 @@
 import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { popupAjaxError } from 'discourse/lib/ajax-error';
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Controller.extend(PreferencesTabController, {
-
   saveAttrNames: [
     'muted_tags',
     'tracked_tags',
@@ -10,6 +10,11 @@ export default Ember.Controller.extend(PreferencesTabController, {
     'watching_first_post_tags'
   ],
 
+  @computed("model.watched_tags.[]", "model.watching_first_post_tags.[]", "model.tracked_tags.[]", "model.muted_tags.[]")
+  selectedTags(watched, watchedFirst, tracked, muted) {
+    return [].concat(watched, watchedFirst, tracked, muted).filter(t => t);
+  },
+
   actions: {
     save() {
       this.set('saved', false);
diff --git a/app/assets/javascripts/discourse/controllers/tags-index.js.es6 b/app/assets/javascripts/discourse/controllers/tags-index.js.es6
index 07a9da7cfed..acf1c58d466 100644
--- a/app/assets/javascripts/discourse/controllers/tags-index.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tags-index.js.es6
@@ -1,15 +1,38 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
 export default Ember.Controller.extend({
-  sortProperties: ['count:desc', 'id'],
+  sortProperties: ['totalCount:desc', 'id'],
+  sortedByCount: true,
+  sortedByName: false,
 
   canAdminTags: Ember.computed.alias("currentUser.staff"),
+  groupedByCategory: Ember.computed.notEmpty('model.extras.categories'),
+  groupedByTagGroup: Ember.computed.notEmpty('model.extras.tag_groups'),
+
+  @computed('groupedByCategory', 'groupedByTagGroup')
+  otherTagsTitleKey(groupedByCategory, groupedByTagGroup) {
+    if (!groupedByCategory && !groupedByTagGroup) {
+      return 'tagging.all_tags';
+    } else {
+      return 'tagging.other_tags';
+    }
+  },
 
   actions: {
     sortByCount() {
-      this.set('sortProperties', ['count:desc', 'id']);
+      this.setProperties({
+        sortProperties: ['totalCount:desc', 'id'],
+        sortedByCount: true,
+        sortedByName: false
+      });
     },
 
     sortById() {
-      this.set('sortProperties', ['id']);
+      this.setProperties({
+        sortProperties: ['id'],
+        sortedByCount: false,
+        sortedByName: true
+      });
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/tags-show.js.es6 b/app/assets/javascripts/discourse/controllers/tags-show.js.es6
index d1a292c2e88..643d1095b22 100644
--- a/app/assets/javascripts/discourse/controllers/tags-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tags-show.js.es6
@@ -61,6 +61,10 @@ export default Ember.Controller.extend(BulkTopicSelection, {
 
   categories: Ember.computed.alias('site.categoriesList'),
 
+  createTopicLabel: function() {
+    return this.get('list.draft') ? 'topic.open_draft' : 'topic.create';
+  }.property('list', 'list.draft'),
+
   @computed('canCreateTopic', 'category', 'canCreateTopicOnCategory')
   createTopicDisabled(canCreateTopic, category, canCreateTopicOnCategory) {
     return !canCreateTopic || (category && !canCreateTopicOnCategory);
@@ -119,8 +123,8 @@ export default Ember.Controller.extend(BulkTopicSelection, {
 
     deleteTag() {
       const self = this;
-      const topicsLength = this.get('list.topic_list.topics.length');
-      const confirmText = topicsLength === 0 ? I18n.t("tagging.delete_confirm_no_topics") : I18n.t("tagging.delete_confirm", {count: topicsLength});
+      const numTopics = this.get('list.topic_list.tags.firstObject.topic_count') || 0;
+      const confirmText = numTopics === 0 ? I18n.t("tagging.delete_confirm_no_topics") : I18n.t("tagging.delete_confirm", {count: numTopics});
       bootbox.confirm(confirmText, function(result) {
         if (!result) { return; }
 
diff --git a/app/assets/javascripts/discourse/controllers/topic-unsubscribe.js.es6 b/app/assets/javascripts/discourse/controllers/topic-unsubscribe.js.es6
deleted file mode 100644
index a2611ebdcbd..00000000000
--- a/app/assets/javascripts/discourse/controllers/topic-unsubscribe.js.es6
+++ /dev/null
@@ -1,7 +0,0 @@
-export default Ember.Controller.extend({
-
-  stopNotificiationsText: function() {
-    return I18n.t("topic.unsubscribe.stop_notifications", { title: this.get("model.fancyTitle") });
-  }.property("model.fancyTitle"),
-
-});
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index 80209d7b731..9a464c463cf 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -14,6 +14,20 @@ import { popupAjaxError } from 'discourse/lib/ajax-error';
 import { spinnerHTML } from 'discourse/helpers/loading-spinner';
 import { userPath } from 'discourse/lib/url';
 
+let customPostMessageCallbacks = {};
+
+export function resetCustomPostMessageCallbacks() {
+  customPostMessageCallbacks = {};
+}
+
+export function registerCustomPostMessageCallback(type, callback) {
+  if (customPostMessageCallbacks[type]) {
+    throw `Error ${type} is an already registered post message!`;
+  }
+
+  customPostMessageCallbacks[type] = callback;
+}
+
 export default Ember.Controller.extend(BufferedContent, {
   composer: Ember.inject.controller(),
   application: Ember.inject.controller(),
@@ -46,6 +60,12 @@ export default Ember.Controller.extend(BufferedContent, {
     }
   },
 
+  @computed('model.postStream.loaded', 'model.category_id')
+  showSharedDraftControls(loaded, categoryId) {
+    let draftCat = this.site.shared_drafts_category_id;
+    return loaded && draftCat && categoryId && draftCat === categoryId;
+  },
+
   @computed('site.mobileView', 'model.posts_count')
   showSelectedPostsAtBottom(mobileView, postsCount) {
     return mobileView && postsCount > 3;
@@ -104,7 +124,7 @@ export default Ember.Controller.extend(BufferedContent, {
 
   @computed('model.isPrivateMessage')
   canEditTags(isPrivateMessage) {
-    return !isPrivateMessage && this.site.get('can_tag_topics');
+    return this.site.get('can_tag_topics') && (!isPrivateMessage || this.site.get('can_tag_pms'));
   },
 
   actions: {
@@ -125,7 +145,6 @@ export default Ember.Controller.extend(BufferedContent, {
       return this.get('model.postStream').loadPost(postId).then(post => {
         const composer = this.get('composer');
         const viewOpen = composer.get('model.viewOpen');
-
         const quotedText = Quote.build(post, buffer);
 
         // If we can't create a post, delegate to reply as new topic
@@ -199,7 +218,7 @@ export default Ember.Controller.extend(BufferedContent, {
       });
     },
 
-    // Called the the topmost visible post on the page changes.
+    // Called when the topmost visible post on the page changes.
     topVisibleChanged(event) {
       const { post, refresh } = event;
       if (!post) { return; }
@@ -265,6 +284,23 @@ export default Ember.Controller.extend(BufferedContent, {
       }
     },
 
+    editFirstPost() {
+      const postStream = this.get('model.postStream');
+      let firstPost = postStream.get('posts.firstObject');
+
+      if (firstPost.get('post_number') !== 1) {
+        const postId = postStream.findPostIdForPostNumber(1);
+        // try loading from identity map first
+        firstPost = postStream.findLoadedPost(postId);
+        if (firstPost === undefined) {
+          return this.get('model.postStream').loadPost(postId).then(post => {
+            this.send("editPost", post);
+          });
+        }
+      }
+      this.send("editPost", firstPost);
+    },
+
     // Post related methods
     replyToPost(post) {
       const composerController = this.get('composer');
@@ -386,16 +422,29 @@ export default Ember.Controller.extend(BufferedContent, {
       }
 
       const composer = this.get("composer");
+      let topic = this.get('model');
       const composerModel = composer.get("model");
+      let editingFirst = composerModel && (post.get('firstPost') || composerModel.get('editingFirstPost'));
+
+      let editingSharedDraft = false;
+      let draftsCategoryId = this.get('site.shared_drafts_category_id');
+      if (draftsCategoryId && draftsCategoryId === topic.get('category.id')) {
+        editingSharedDraft = post.get('firstPost');
+      }
+
       const opts = {
         post,
-        action: Composer.EDIT,
+        action: editingSharedDraft ? Composer.EDIT_SHARED_DRAFT : Composer.EDIT,
         draftKey: post.get("topic.draft_key"),
         draftSequence: post.get("topic.draft_sequence")
       };
 
+      if (editingSharedDraft) {
+        opts.destinationCategoryId = topic.get('destination_category_id');
+      }
+
       // Cancel and reopen the composer for the first post
-      if (composerModel && (post.get('firstPost') || composerModel.get('editingFirstPost'))) {
+      if (editingFirst) {
         composer.cancelComposer().then(() => composer.open(opts));
       } else {
         composer.open(opts);
@@ -416,17 +465,17 @@ export default Ember.Controller.extend(BufferedContent, {
     },
 
     jumpToIndex(index) {
-      this._jumpToPostId(this.get('model.postStream.stream')[index - 1]);
+      this._jumpToIndex(index);
     },
 
     jumpToPostPrompt() {
       const postText = prompt(I18n.t('topic.progress.jump_prompt_long'));
       if (postText === null) { return; }
 
-      const postNumber = parseInt(postText, 10);
-      if (postNumber === 0) { return; }
+      const postIndex = parseInt(postText, 10);
+      if (postIndex === 0) { return; }
 
-      this._jumpToPostId(this.get('model.postStream').findPostIdForPostNumber(postNumber));
+      this._jumpToIndex(postIndex);
     },
 
     jumpToPost(postNumber) {
@@ -454,6 +503,10 @@ export default Ember.Controller.extend(BufferedContent, {
       this._jumpToPostId(this.get('model.last_read_post_id'));
     },
 
+    jumpToPostId(postId) {
+      this._jumpToPostId(postId);
+    },
+
     toggleMultiSelect() {
       this.toggleProperty('multiSelect');
       this.appEvents.trigger('post-stream:refresh', { force: true });
@@ -518,6 +571,19 @@ export default Ember.Controller.extend(BufferedContent, {
       this.send('changeOwner');
     },
 
+    lockPost(post) {
+      return post.updatePostField('locked', true);
+    },
+
+    unlockPost(post) {
+      return post.updatePostField('locked', false);
+    },
+
+    grantBadge(post) {
+      this.set("selectedPostIds", [post.id]);
+      this.send('showGrantBadgeModal');
+    },
+
     toggleParticipant(user) {
       this.get("model.postStream")
           .toggleParticipant(user.get("username"))
@@ -702,6 +768,12 @@ export default Ember.Controller.extend(BufferedContent, {
     }
   },
 
+  _jumpToIndex(index) {
+    const stream = this.get("model.postStream.stream");
+    index = Math.max(1, Math.min(stream.length, index));
+    this._jumpToPostId(stream[index - 1]);
+  },
+
   _jumpToPostId(postId) {
     if (!postId) {
       Ember.Logger.warn("jump-post code broken - requested an index outside the stream array");
@@ -767,9 +839,12 @@ export default Ember.Controller.extend(BufferedContent, {
     return selectedPostsCount > 0 && (selectedAllPosts || selectedPosts.every(p => p.can_delete));
   },
 
-  @computed('canMergeTopic', 'selectedAllPosts')
-  canSplitTopic(canMergeTopic, selectedAllPosts) {
-    return canMergeTopic && !selectedAllPosts;
+  @computed('canMergeTopic', 'selectedAllPosts', 'selectedPosts', 'selectedPosts.[]')
+  canSplitTopic(canMergeTopic, selectedAllPosts, selectedPosts) {
+    return canMergeTopic &&
+           !selectedAllPosts &&
+           selectedPosts.length > 0 &&
+           selectedPosts.sort((a, b) => a.post_number - b.post_number)[0].post_type === 1;
   },
 
   @computed('model.details.can_move_posts', 'selectedPostsCount')
@@ -874,7 +949,12 @@ export default Ember.Controller.extend(BufferedContent, {
           break;
         }
         default: {
-          Em.Logger.warn("unknown topic bus message type", data);
+          let callback = customPostMessageCallbacks[data.type];
+          if (callback) {
+            callback(this, data);
+          } else {
+            Em.Logger.warn("unknown topic bus message type", data);
+          }
         }
       }
 
diff --git a/app/assets/javascripts/discourse/controllers/user-private-messages-tags.js.es6 b/app/assets/javascripts/discourse/controllers/user-private-messages-tags.js.es6
new file mode 100644
index 00000000000..9d2cd890ed4
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/user-private-messages-tags.js.es6
@@ -0,0 +1,24 @@
+export default Ember.Controller.extend({
+  sortProperties: ['count:desc', 'id'],
+  tagsForUser: null,
+  sortedByCount: true,
+  sortedByName: false,
+
+  actions: {
+    sortByCount() {
+      this.setProperties({
+        sortProperties: ['count:desc', 'id'],
+        sortedByCount: true,
+        sortedByName: false
+      });
+    },
+
+    sortById() {
+      this.setProperties({
+        sortProperties: ['id'],
+        sortedByCount: false,
+        sortedByName: true
+      });
+    }
+  }
+});
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 bb79db55d37..fa1aaca9421 100644
--- a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
@@ -12,6 +12,9 @@ export default Ember.Controller.extend({
   currentPath: Em.computed.alias('application.currentPath'),
   selected: Em.computed.alias('userTopicsList.selected'),
   bulkSelectEnabled: Em.computed.alias('userTopicsList.bulkSelectEnabled'),
+  showToggleBulkSelect: true,
+  pmTaggingEnabled: Ember.computed.alias('site.can_tag_pms'),
+  tagId: null,
 
   showNewPM: function(){
     return this.get('user.viewingSelf') &&
@@ -33,7 +36,6 @@ export default Ember.Controller.extend({
     return hasSelection && pmView !== "archive" && !archive;
   },
 
-
   bulkOperation(operation) {
     const selected = this.get('selected');
     var params = {type: operation};
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 8e150fd2890..0d119f6d331 100644
--- a/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
@@ -1,18 +1,60 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
 // Lists of topics on a user's page.
 export default Ember.Controller.extend({
   application: Ember.inject.controller(),
 
   hideCategory: false,
   showPosters: false,
+  newIncoming: [],
+  incomingCount: 0,
+  channel: null,
+  tagsForUser: null,
 
   _showFooter: function() {
     this.set("application.showFooter", !this.get("model.canLoadMore"));
   }.observes("model.canLoadMore"),
 
+  @computed('incomingCount')
+  hasIncoming(incomingCount) {
+    return incomingCount > 0;
+  },
+
+  subscribe(channel) {
+    this.set('channel', channel);
+
+    this.messageBus.subscribe(channel, data => {
+      if (this.get('newIncoming').indexOf(data.topic_id) === -1) {
+        this.get('newIncoming').push(data.topic_id);
+        this.incrementProperty('incomingCount');
+      }
+    });
+  },
+
+  unsubscribe() {
+    const channel = this.get('channel');
+    if (channel) this.messageBus.unsubscribe(channel);
+    this._resetTracking();
+    this.set('channel', null);
+  },
+
+  _resetTracking() {
+    this.setProperties({
+      "newIncoming": [],
+      "incomingCount": 0
+    });
+  },
+
   actions: {
     loadMore: function() {
       this.get('model').loadMore();
-    }
+    },
+
+    showInserted() {
+      this.get('model').loadBefore(this.get('newIncoming'));
+      this._resetTracking();
+      return false;
+    },
   },
 
 });
diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6
index 37e88e21acc..afa32314131 100644
--- a/app/assets/javascripts/discourse/controllers/user.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user.js.es6
@@ -1,16 +1,24 @@
 import CanCheckEmails from 'discourse/mixins/can-check-emails';
 import computed from 'ember-addons/ember-computed-decorators';
 import User from 'discourse/models/user';
+import optionalService from 'discourse/lib/optional-service';
 
 export default Ember.Controller.extend(CanCheckEmails, {
   indexStream: false,
   application: Ember.inject.controller(),
   userNotifications: Ember.inject.controller('user-notifications'),
   currentPath: Ember.computed.alias('application.currentPath'),
+  adminTools: optionalService(),
 
-  @computed("content.username")
+  @computed('model.username')
   viewingSelf(username) {
-    return username === User.currentProp('username');
+    let currentUser = this.currentUser;
+    return currentUser && username === currentUser.get('username');
+  },
+
+  @computed('viewingSelf')
+  canExpandProfile(viewingSelf) {
+    return viewingSelf;
   },
 
   @computed('model.profileBackground')
@@ -31,9 +39,9 @@ export default Ember.Controller.extend(CanCheckEmails, {
 
   showStaffCounters: Ember.computed.or('hasGivenFlags', 'hasFlaggedPosts', 'hasDeletedPosts', 'hasBeenSuspended', 'hasReceivedWarnings'),
 
-  @computed('model.isSuspended', 'currentUser.staff')
-  isNotSuspendedOrIsStaff(isSuspended, isStaff) {
-    return !isSuspended || isStaff;
+  @computed('model.suspended', 'currentUser.staff')
+  isNotSuspendedOrIsStaff(suspended, isStaff) {
+    return !suspended || isStaff;
   },
 
   linkWebsite: Em.computed.not('model.isBasic'),
@@ -50,7 +58,7 @@ export default Ember.Controller.extend(CanCheckEmails, {
 
   @computed('viewingSelf', 'currentUser.admin')
   showPrivateMessages(viewingSelf, isAdmin) {
-    return this.siteSettings.enable_private_messages && (viewingSelf || isAdmin);
+    return this.siteSettings.enable_personal_messages && (viewingSelf || isAdmin);
   },
 
   @computed('viewingSelf', 'currentUser.staff')
@@ -89,15 +97,23 @@ export default Ember.Controller.extend(CanCheckEmails, {
   },
 
   actions: {
+    collapseProfile() {
+      this.set('forceExpand', false);
+    },
+
     expandProfile() {
       this.set('forceExpand', true);
     },
 
-    adminDelete() {
-      // I really want this deferred, don't want to bring in all this code till used
-      const AdminUser = requirejs('admin/models/admin-user').default;
-      AdminUser.find(this.get('model.id')).then(user => user.destroy({deletePosts: true}));
+    showSuspensions() {
+      this.get('adminTools').showActionLogs(this, {
+        target_user: this.get('model.username'),
+        action_name: 'suspend_user'
+      });
     },
 
+    adminDelete() {
+      this.get('adminTools').deleteUser(this.get('model.id'));
+    }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/users.js.es6 b/app/assets/javascripts/discourse/controllers/users.js.es6
index f5bb1963025..cb2cafbc1f3 100644
--- a/app/assets/javascripts/discourse/controllers/users.js.es6
+++ b/app/assets/javascripts/discourse/controllers/users.js.es6
@@ -2,11 +2,13 @@ import debounce from 'discourse/lib/debounce';
 
 export default Ember.Controller.extend({
   application: Ember.inject.controller(),
-  queryParams: ["period", "order", "asc", "name"],
+  queryParams: ["period", "order", "asc", "name", "group", "exclude_usernames"],
   period: "weekly",
   order: "likes_received",
   asc: null,
   name: "",
+  group: null,
+  exclude_usernames: null,
 
   showTimeRead: Ember.computed.equal("period", "all"),
 
diff --git a/app/assets/javascripts/discourse/helpers/application.js.es6 b/app/assets/javascripts/discourse/helpers/application.js.es6
index 5686e07d6b4..d43c1a77915 100644
--- a/app/assets/javascripts/discourse/helpers/application.js.es6
+++ b/app/assets/javascripts/discourse/helpers/application.js.es6
@@ -8,6 +8,10 @@ registerUnbound('raw-date', dt => longDate(new Date(dt)));
 registerUnbound('age-with-tooltip', dt => new safe(autoUpdatingRelativeAge(new Date(dt), {title: true})));
 
 registerUnbound('number', (orig, params) => {
+  if (params.ceil) {
+    orig = Math.ceil(orig);
+  }
+
   orig = parseInt(orig, 10);
   if (isNaN(orig)) { orig = 0; }
 
diff --git a/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6
index 2833f8cefb1..a284fb36714 100644
--- a/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6
+++ b/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6
@@ -1,11 +1,12 @@
 import { htmlHelper } from 'discourse-common/lib/helpers';
 import { avatarImg } from 'discourse/lib/utilities';
+import { addExtraUserClasses } from 'discourse/helpers/user-avatar';
 
 export default htmlHelper((user, size) => {
   if (Ember.isEmpty(user)) {
     return "<div class='avatar-placeholder'></div>";
   }
 
-  const avatarTemplate = Em.get(user, 'avatar_template');
-  return avatarImg({ size, avatarTemplate });
+  const avatarTemplate = Ember.get(user, 'avatar_template');
+  return avatarImg(addExtraUserClasses(user, { size, avatarTemplate }));
 });
diff --git a/app/assets/javascripts/discourse/helpers/category-link.js.es6 b/app/assets/javascripts/discourse/helpers/category-link.js.es6
index d02254e31c7..7735be3d69b 100644
--- a/app/assets/javascripts/discourse/helpers/category-link.js.es6
+++ b/app/assets/javascripts/discourse/helpers/category-link.js.es6
@@ -1,4 +1,5 @@
 import { registerUnbound } from 'discourse-common/lib/helpers';
+import { isRTL } from "discourse/lib/text-direction";
 import { iconHTML } from 'discourse-common/lib/icon-library';
 
 var get = Em.get,
@@ -38,6 +39,7 @@ export function categoryBadgeHTML(category, opts) {
   let color = get(category, 'color');
   let html = "";
   let parentCat = null;
+  let categoryDir = "";
 
   if (!opts.hideParent) {
     parentCat = Discourse.Category.findById(get(category, 'parent_category_id'));
@@ -66,10 +68,14 @@ export function categoryBadgeHTML(category, opts) {
 
   let categoryName = escapeExpression(get(category, 'name'));
 
+  if (Discourse.SiteSettings.support_mixed_text_direction) {
+    categoryDir = isRTL(categoryName) ? 'dir="rtl"' : 'dir="ltr"';
+  }
+
   if (restricted) {
-    html += iconHTML('lock') + " " + categoryName;
+    html += `${iconHTML('lock')}<span class="category-name" ${categoryDir}>${categoryName}</span>`;
   } else {
-    html += categoryName;
+    html += `<span class="category-name" ${categoryDir}>${categoryName}</span>`;
   }
   html += "</span>";
 
diff --git a/app/assets/javascripts/discourse/helpers/dir-span.js.es6 b/app/assets/javascripts/discourse/helpers/dir-span.js.es6
new file mode 100644
index 00000000000..3f258025651
--- /dev/null
+++ b/app/assets/javascripts/discourse/helpers/dir-span.js.es6
@@ -0,0 +1,15 @@
+import { registerUnbound } from "discourse-common/lib/helpers";
+import { isRTL } from 'discourse/lib/text-direction';
+
+function setDir(text) {
+  let content = text ? text : "";
+  if (content && Discourse.SiteSettings.support_mixed_text_direction) {
+    let textDir = isRTL(content) ? 'rtl' : 'ltr';
+    return `<span dir="${textDir}">${content}</span>`;
+  }
+  return content;
+}
+
+export default registerUnbound('dir-span', function(str) {
+  return new Handlebars.SafeString(setDir(str));
+});
diff --git a/app/assets/javascripts/discourse/helpers/icon-or-image.js.es6 b/app/assets/javascripts/discourse/helpers/icon-or-image.js.es6
index d5439c7323f..44b9d32325c 100644
--- a/app/assets/javascripts/discourse/helpers/icon-or-image.js.es6
+++ b/app/assets/javascripts/discourse/helpers/icon-or-image.js.es6
@@ -1,7 +1,14 @@
 import { htmlHelper } from 'discourse-common/lib/helpers';
 import { iconHTML } from 'discourse-common/lib/icon-library';
 
-export default htmlHelper(function(str) {
-  if (Ember.isEmpty(str)) { return ""; }
-  return (str.indexOf('fa-') === 0) ? iconHTML(str.replace('fa-', '')) : `<img src='${str}'>`;
+export default htmlHelper(function({ icon, image }) {
+  if (!Ember.isEmpty(image)) {
+    return `<img src='${image}'>`;
+  }
+
+  if (Ember.isEmpty(icon) || icon.indexOf('fa-') !== 0) {
+    return '';
+  }
+
+  return iconHTML(icon.replace('fa-', ''));
 });
diff --git a/app/assets/javascripts/discourse/helpers/period-title.js.es6 b/app/assets/javascripts/discourse/helpers/period-title.js.es6
index 37af602c29d..d5d398791e7 100644
--- a/app/assets/javascripts/discourse/helpers/period-title.js.es6
+++ b/app/assets/javascripts/discourse/helpers/period-title.js.es6
@@ -12,25 +12,33 @@ export default htmlHelper((period, options) => {
   const title = I18n.t('filters.top.' + (TITLE_SUBS[period] || 'this_week'));
   if (options.hash.showDateRange) {
     var dateString = "";
+    let finish;
+
+    if (options.hash.fullDay) {
+      finish = moment().utc().subtract(1, 'days');
+    } else {
+      finish = moment();
+    }
+
     switch(period) {
       case 'yearly':
-        dateString = moment().subtract(1, 'year').format(I18n.t('dates.long_with_year_no_time')) + " - " + moment().format(I18n.t('dates.long_with_year_no_time'));
+        dateString = finish.clone().subtract(1, 'year').format(I18n.t('dates.long_with_year_no_time')) + " - " + finish.format(I18n.t('dates.long_with_year_no_time'));
         break;
       case 'quarterly':
-        dateString = moment().subtract(3, 'month').format(I18n.t('dates.long_no_year_no_time')) + " - " + moment().format(I18n.t('dates.long_no_year_no_time'));
+        dateString = finish.clone().subtract(3, 'month').format(I18n.t('dates.long_no_year_no_time')) + " - " + finish.format(I18n.t('dates.long_no_year_no_time'));
         break;
       case 'weekly':
-        dateString = moment().subtract(1, 'week').format(I18n.t('dates.long_no_year_no_time')) + " - " + moment().format(I18n.t('dates.long_no_year_no_time'));
+        dateString = finish.clone().subtract(1, 'week').format(I18n.t('dates.long_no_year_no_time')) + " - " + finish.format(I18n.t('dates.long_no_year_no_time'));
         break;
       case 'monthly':
-        dateString = moment().subtract(1, 'month').format(I18n.t('dates.long_no_year_no_time')) + " - " + moment().format(I18n.t('dates.long_no_year_no_time'));
+        dateString = finish.clone().subtract(1, 'month').format(I18n.t('dates.long_no_year_no_time')) + " - " + finish.format(I18n.t('dates.long_no_year_no_time'));
         break;
       case 'daily':
-        dateString = moment().format(I18n.t('dates.full_no_year_no_time'));
+        dateString = finish.clone().format(I18n.t('dates.full_no_year_no_time'));
         break;
     }
 
-    return `${title} <span class='top-date-string'>${dateString}</span>`;
+    return `<span class="date-section">${title}</span><span class='top-date-string'>${dateString}</span>`;
   } else {
     return title;
   }
diff --git a/app/assets/javascripts/discourse/helpers/theme-setting-injector.es6 b/app/assets/javascripts/discourse/helpers/theme-setting-injector.es6
new file mode 100644
index 00000000000..b0c774c84ab
--- /dev/null
+++ b/app/assets/javascripts/discourse/helpers/theme-setting-injector.es6
@@ -0,0 +1,36 @@
+// A small helper to inject theme settings into
+// context objects of handlebars templates used
+// in themes
+
+import { registerHelper } from 'discourse-common/lib/helpers';
+
+function inject(context, key, value) {
+  if (typeof value === "string") {
+    value = value.replace(/\\u0022/g, '"');
+  }
+
+  if (!(context instanceof Ember.Object)) {
+    injectPlainObject(context, key, value);
+    return;
+  }
+
+  if (!context.get("themeSettings")) {
+    context.set("themeSettings", {});
+  }
+  context.set(`themeSettings.${key}`, value);
+}
+
+function injectPlainObject(context, key, value) {
+  if (!context.themeSettings) {
+    _.assign(context, { themeSettings: {} });
+  }
+  _.assign(context.themeSettings, { [key]: value });
+}
+
+registerHelper('theme-setting-injector', function(arr, hash) {
+  inject(hash.context, hash.key, hash.value);
+});
+
+Handlebars.registerHelper('theme-setting-injector', function(hash) {
+  inject(this, hash.hash.key, hash.hash.value);
+});
diff --git a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
index 71e6e87249c..dc685eee6e5 100644
--- a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
+++ b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
@@ -1,6 +1,31 @@
 import { registerUnbound } from 'discourse-common/lib/helpers';
 import { avatarImg, formatUsername } from 'discourse/lib/utilities';
 
+let _customAvatarHelpers;
+
+export function registerCustomAvatarHelper(fn) {
+  _customAvatarHelpers = _customAvatarHelpers || [];
+  _customAvatarHelpers.push(fn);
+}
+
+export function addExtraUserClasses(u, args) {
+  let extraClasses = classesForUser(u).join(' ');
+  if (extraClasses && extraClasses.length) {
+    args.extraClasses = extraClasses;
+  }
+  return args;
+}
+
+export function classesForUser(u) {
+  let result = [];
+  if (_customAvatarHelpers) {
+    for (let i=0; i<_customAvatarHelpers.length; i++) {
+      result = result.concat(_customAvatarHelpers[i](u));
+    }
+  }
+  return result;
+}
+
 function renderAvatar(user, options) {
   options = options || {};
 
@@ -11,7 +36,7 @@ function renderAvatar(user, options) {
 
     if (!username || !avatarTemplate) { return ''; }
 
-    let formattedUsername = formatUsername(username);
+    let displayName = Ember.get(user, 'name') || formatUsername(username);
 
     let title = options.title;
     if (!title && !options.ignoreTitle) {
@@ -24,7 +49,7 @@ function renderAvatar(user, options) {
         // if a description has been provided
         if (description && description.length > 0) {
           // preprend the username before the description
-          title = formattedUsername + " - " + description;
+          title = displayName + " - " + description;
         }
       }
     }
@@ -32,7 +57,7 @@ function renderAvatar(user, options) {
     return avatarImg({
       size: options.imageSize,
       extraClasses: Em.get(user, 'extras') || options.extraClasses,
-      title: title || formattedUsername,
+      title: title || displayName,
       avatarTemplate: avatarTemplate
     });
   } else {
diff --git a/app/assets/javascripts/discourse/initializers/banner.js.es6 b/app/assets/javascripts/discourse/initializers/banner.js.es6
index 9c9ff47d927..4ce88b2c480 100644
--- a/app/assets/javascripts/discourse/initializers/banner.js.es6
+++ b/app/assets/javascripts/discourse/initializers/banner.js.es6
@@ -5,7 +5,6 @@ export default {
   after: "message-bus",
 
   initialize(container) {
-
     const banner = Em.Object.create(PreloadStore.get("banner")),
           site = container.lookup('site:main');
 
diff --git a/app/assets/javascripts/discourse/initializers/live-development.js.es6 b/app/assets/javascripts/discourse/initializers/live-development.js.es6
index c6dba5fdfcf..de482647b35 100644
--- a/app/assets/javascripts/discourse/initializers/live-development.js.es6
+++ b/app/assets/javascripts/discourse/initializers/live-development.js.es6
@@ -7,6 +7,28 @@ export default {
   initialize(container) {
     const messageBus = container.lookup('message-bus:main');
 
+    if (window.history && window.location.search.indexOf("?preview_theme_key=") === 0) {
+      // force preview theme key to always be carried along
+      const themeKey = window.location.search.slice(19).split('&')[0];
+      if (themeKey.match(/^[a-z0-9-]+$/i)) {
+        const patchState = function(f) {
+          const patched = window.history[f];
+
+          window.history[f] = function(stateObj, name, url) {
+            if (url.indexOf("preview_theme_key=") === -1) {
+              const joiner = url.indexOf("?") === -1 ? "?" : "&";
+              url = `${url}${joiner}preview_theme_key=${themeKey}`;
+            }
+
+            return patched.call(window.history, stateObj, name, url);
+          };
+        };
+        patchState("replaceState");
+        patchState("pushState");
+      }
+
+    }
+
     // Custom header changes
     $('header.custom').each(function() {
       const header = $(this);
diff --git a/app/assets/javascripts/discourse/initializers/localization.js.es6 b/app/assets/javascripts/discourse/initializers/localization.js.es6
index 2603ddaf4bd..e4403e04898 100644
--- a/app/assets/javascripts/discourse/initializers/localization.js.es6
+++ b/app/assets/javascripts/discourse/initializers/localization.js.es6
@@ -4,31 +4,21 @@ export default {
   name: 'localization',
   after: 'inject-objects',
 
-  enableVerboseLocalization() {
-    let counter = 0;
-    let keys = {};
-    let t = I18n.t;
 
-    I18n.noFallbacks = true;
+  isVerboseLocalizationEnabled(container) {
+    const siteSettings = container.lookup('site-settings:main');
+    if (siteSettings.verbose_localization) return true;
 
-    I18n.t = I18n.translate = function(scope, value){
-      let current = keys[scope];
-      if (!current) {
-        current = keys[scope] = ++counter;
-        let message = "Translation #" + current + ": " + scope;
-        if (!_.isEmpty(value)) {
-          message += ", parameters: " + JSON.stringify(value);
-        }
-        Em.Logger.info(message);
-      }
-      return t.apply(I18n, [scope, value]) + " (#" + current + ")";
-    };
+    try {
+      return sessionStorage && sessionStorage.getItem("verbose_localization");
+    } catch (e) {
+      return false;
+    }
   },
 
   initialize(container) {
-    const siteSettings = container.lookup('site-settings:main');
-    if (siteSettings.verbose_localization) {
-      this.enableVerboseLocalization();
+    if (this.isVerboseLocalizationEnabled(container)) {
+      I18n.enableVerboseLocalization();
     }
 
     // Merge any overrides into our object
diff --git a/app/assets/javascripts/discourse/initializers/logout.js.es6 b/app/assets/javascripts/discourse/initializers/logout.js.es6
index dc0ff59c81d..db7d4de9608 100644
--- a/app/assets/javascripts/discourse/initializers/logout.js.es6
+++ b/app/assets/javascripts/discourse/initializers/logout.js.es6
@@ -1,5 +1,7 @@
 import logout from 'discourse/lib/logout';
 
+let _showingLogout = false;
+
 //  Subscribe to "logout" change events via the Message Bus
 export default {
   name: "logout",
@@ -7,14 +9,22 @@ export default {
 
   initialize: function (container) {
     const messageBus = container.lookup('message-bus:main');
-    const siteSettings = container.lookup('site-settings:main');
-    const keyValueStore = container.lookup('key-value-store:main');
 
     if (!messageBus) { return; }
-    const callback = () => logout(siteSettings, keyValueStore);
 
     messageBus.subscribe("/logout", function () {
-      bootbox.dialog(I18n.t("logout"), {label: I18n.t("refresh"), callback}, {onEscape: callback, backdrop: 'static'});
+      if (!_showingLogout) {
+
+        _showingLogout = true;
+
+        bootbox.dialog(I18n.t("logout"), {
+          label: I18n.t("refresh"),
+          callback: logout
+        }, {
+          onEscape: logout,
+          backdrop: 'static'
+        });
+      }
     });
   }
 };
diff --git a/app/assets/javascripts/discourse/initializers/message-bus.js.es6 b/app/assets/javascripts/discourse/initializers/message-bus.js.es6
index a0b113765cb..11141b4dc02 100644
--- a/app/assets/javascripts/discourse/initializers/message-bus.js.es6
+++ b/app/assets/javascripts/discourse/initializers/message-bus.js.es6
@@ -1,5 +1,20 @@
 // Initialize the message bus to receive messages.
 import pageVisible from 'discourse/lib/page-visible';
+import { handleLogoff } from 'discourse/lib/ajax';
+
+function ajax(opts) {
+  if (opts.complete) {
+    let oldComplete = opts.complete;
+    opts.complete = function(xhr, stat) {
+      handleLogoff(xhr);
+      oldComplete(xhr, stat);
+    };
+  } else {
+    opts.complete = handleLogoff;
+  }
+
+  return $.ajax(opts);
+}
 
 export default {
   name: "message-bus",
@@ -41,7 +56,7 @@ export default {
         if (pageVisible()) {
           opts.headers['Discourse-Visible'] = "true";
         }
-        return $.ajax(opts);
+        return ajax(opts);
       };
     } else {
 
@@ -50,7 +65,7 @@ export default {
         if (pageVisible()) {
           opts.headers['Discourse-Visible'] = "true";
         }
-        return $.ajax(opts);
+        return ajax(opts);
       };
 
       messageBus.baseUrl = Discourse.getURL('/');
diff --git a/app/assets/javascripts/discourse/initializers/page-tracking.js.es6 b/app/assets/javascripts/discourse/initializers/page-tracking.js.es6
index ec1f3a446dc..acc8573d203 100644
--- a/app/assets/javascripts/discourse/initializers/page-tracking.js.es6
+++ b/app/assets/javascripts/discourse/initializers/page-tracking.js.es6
@@ -1,5 +1,5 @@
 import { cleanDOM } from 'discourse/lib/clean-dom';
-import { startPageTracking } from 'discourse/lib/page-tracker';
+import { startPageTracking, googleTagManagerPageChanged } from 'discourse/lib/page-tracker';
 import { viewTrackingRequired } from 'discourse/lib/ajax';
 
 export default {
@@ -35,15 +35,7 @@ export default {
 
     // And Google Tag Manager too
     if (typeof window.dataLayer !== 'undefined') {
-      appEvents.on('page:changed', data => {
-        window.dataLayer.push({
-          'event': 'virtualPageView',
-          'page': {
-            'title': data.title,
-            'url': data.url
-          }
-        });
-      });
+      appEvents.on('page:changed', googleTagManagerPageChanged);
     }
   }
 };
diff --git a/app/assets/javascripts/discourse/initializers/post-decorations.js.es6 b/app/assets/javascripts/discourse/initializers/post-decorations.js.es6
index d17b2087acd..0cab9b554de 100644
--- a/app/assets/javascripts/discourse/initializers/post-decorations.js.es6
+++ b/app/assets/javascripts/discourse/initializers/post-decorations.js.es6
@@ -1,13 +1,18 @@
 import highlightSyntax from 'discourse/lib/highlight-syntax';
 import lightbox from 'discourse/lib/lightbox';
+import { setTextDirections } from "discourse/lib/text-direction";
 import { withPluginApi } from 'discourse/lib/plugin-api';
 
 export default {
   name: "post-decorations",
-  initialize() {
+  initialize(container) {
     withPluginApi('0.1', api => {
+      const siteSettings = container.lookup('site-settings:main');
       api.decorateCooked(highlightSyntax);
       api.decorateCooked(lightbox);
+      if (siteSettings.support_mixed_text_direction) {
+        api.decorateCooked(setTextDirections);
+      }
 
       api.decorateCooked($elem => {
         const players = $('audio', $elem);
diff --git a/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6 b/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6
index 7c16106ddae..8632ced10ee 100644
--- a/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6
+++ b/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6
@@ -2,11 +2,26 @@ export default {
   name: 'register-service-worker',
 
   initialize() {
-    const isSecure = (document.location.protocol === 'https:') ||
-      (location.hostname === "localhost");
+    const isSecured = (document.location.protocol === 'https:') ||
+          (location.hostname === "localhost");
 
-    if (isSecure && ('serviceWorker' in navigator)) {
-      navigator.serviceWorker.register(`${Discourse.BaseUri}/service-worker.js`);
+    const isSupported= isSecured && ('serviceWorker' in navigator);
+    const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
+
+    if (isSupported) {
+      if (Discourse.ServiceWorkerURL && !isSafari) {
+        navigator.serviceWorker
+          .register(`${Discourse.BaseUri}/${Discourse.ServiceWorkerURL}`)
+          .catch(error => {
+            Ember.Logger.info(`Failed to register Service Worker: ${error}`);
+          });
+      } else {
+        navigator.serviceWorker.getRegistrations().then(registrations => {
+          for(let registration of registrations) {
+            registration.unregister();
+          };
+        });
+      }
     }
   }
 };
diff --git a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
index a477463d953..75fe71d1d78 100644
--- a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
@@ -2,8 +2,14 @@
 import {
   init as initDesktopNotifications,
   onNotification,
-  alertChannel
+  alertChannel,
+  disable as disableDesktopNotifications,
 } from 'discourse/lib/desktop-notifications';
+import {
+  register as registerPushNotifications,
+  unsubscribe as unsubscribePushNotifications,
+  isPushNotificationsEnabled
+} from 'discourse/lib/push-notifications';
 
 export default {
   name: 'subscribe-user-notifications',
@@ -11,14 +17,9 @@ export default {
 
   initialize(container) {
     const user = container.lookup('current-user:main');
-    const keyValueStore = container.lookup('key-value-store:main');
     const bus = container.lookup('message-bus:main');
     const appEvents = container.lookup('app-events:main');
 
-    // clear old cached notifications, we used to store in local storage
-    // TODO 2017 delete this line
-    keyValueStore.remove('recent-notifications');
-
     if (user) {
       if (user.get('staff')) {
         bus.subscribe('/flagged_counts', data => {
@@ -34,7 +35,6 @@ export default {
 
       bus.subscribe(`/notification/${user.get('id')}`, data => {
         const store = container.lookup('service:store');
-
         const oldUnread = user.get('unread_notifications');
         const oldPM = user.get('unread_private_messages');
 
@@ -65,7 +65,7 @@ export default {
             oldNotifications.insertAt(insertPosition, Em.Object.create(lastNotification));
           }
 
-          for (let idx=0; idx < data.recent.length; idx++) {
+          for (let idx = 0; idx < data.recent.length; idx++) {
             let old;
             while(old = oldNotifications[idx]) {
               const info = data.recent[idx];
@@ -87,6 +87,7 @@ export default {
 
       const site = container.lookup('site:main');
       const siteSettings = container.lookup('site-settings:main');
+      const router = container.lookup('router:main');
 
       bus.subscribe("/categories", data => {
         _.each(data.categories, c => site.updateCategory(c));
@@ -94,15 +95,17 @@ export default {
       });
 
       bus.subscribe("/client_settings", data => Ember.set(siteSettings, data.name, data.value));
-
-      bus.subscribe("/refresh_client", data => {
-        Discourse.set("assetVersion", data);
-      });
+      bus.subscribe("/refresh_client", data => Discourse.set("assetVersion", data));
 
       if (!Ember.testing) {
-        if (!site.mobileView) {
-          bus.subscribe(alertChannel(user), data => onNotification(data, user));
-          initDesktopNotifications(bus, appEvents);
+        bus.subscribe(alertChannel(user), data => onNotification(data, user));
+        initDesktopNotifications(bus, appEvents);
+
+        if (isPushNotificationsEnabled(user, site.mobileView)) {
+          disableDesktopNotifications();
+          registerPushNotifications(Discourse.User.current(), site.mobileView, router, appEvents);
+        } else {
+          unsubscribePushNotifications(user);
         }
       }
     }
diff --git a/app/assets/javascripts/discourse/initializers/url-redirects.js.es6 b/app/assets/javascripts/discourse/initializers/url-redirects.js.es6
index afe7dbe6bd8..9b952941d15 100644
--- a/app/assets/javascripts/discourse/initializers/url-redirects.js.es6
+++ b/app/assets/javascripts/discourse/initializers/url-redirects.js.es6
@@ -21,7 +21,7 @@ export default {
     }
 
     DiscourseURL.rewrite(/^\/u\/([^\/]+)\/?$/, "/u/$1/summary", {
-      exceptions: ['/u/account-created', '/users/account-created']
+      exceptions: ['/u/account-created', '/users/account-created', '/u/password-reset', '/users/password-reset']
     });
   }
 };
diff --git a/app/assets/javascripts/discourse/lib/ajax-error.js.es6 b/app/assets/javascripts/discourse/lib/ajax-error.js.es6
index bb2a915727f..9666d9c378f 100644
--- a/app/assets/javascripts/discourse/lib/ajax-error.js.es6
+++ b/app/assets/javascripts/discourse/lib/ajax-error.js.es6
@@ -54,5 +54,11 @@ export function throwAjaxError(undoCallback) {
 }
 
 export function popupAjaxError(error) {
+  if (error && error._discourse_displayed) { return; }
   bootbox.alert(extractError(error));
+
+  error._discourse_displayed = true;
+
+  // We re-throw in a catch to not swallow the exception
+  throw error;
 }
diff --git a/app/assets/javascripts/discourse/lib/ajax.js.es6 b/app/assets/javascripts/discourse/lib/ajax.js.es6
index 98e65ed9c08..15e66b3f042 100644
--- a/app/assets/javascripts/discourse/lib/ajax.js.es6
+++ b/app/assets/javascripts/discourse/lib/ajax.js.es6
@@ -1,7 +1,9 @@
 import pageVisible from 'discourse/lib/page-visible';
+import logout from 'discourse/lib/logout';
 
 let _trackView = false;
 let _transientHeader = null;
+let _showingLogout = false;
 
 export function setTransientHeader(key, value) {
   _transientHeader = {key, value};
@@ -11,6 +13,22 @@ export function viewTrackingRequired() {
   _trackView = true;
 }
 
+export function handleLogoff(xhr) {
+  if (xhr.getResponseHeader('Discourse-Logged-Out') && !_showingLogout) {
+    _showingLogout = true;
+    const messageBus = Discourse.__container__.lookup('message-bus:main');
+    messageBus.stop();
+    bootbox.dialog(
+      I18n.t("logout"), {label: I18n.t("refresh"), callback: logout},
+      {
+        onEscape: () => logout(),
+        backdrop: 'static'
+      }
+    );
+  }
+};
+
+
 /**
   Our own $.ajax method. Makes sure the .then method executes in an Ember runloop
   for performance reasons. Also automatically adjusts the URL to support installs
@@ -39,6 +57,10 @@ export function ajax() {
 
     args.headers = args.headers || {};
 
+    if (Discourse.__container__.lookup('current-user:main')) {
+      args.headers['Discourse-Logged-In'] = "true";
+    }
+
     if (_transientHeader) {
       args.headers[_transientHeader.key] = _transientHeader.value;
       _transientHeader = null;
@@ -55,6 +77,8 @@ export function ajax() {
     }
 
     args.success = (data, textStatus, xhr) => {
+      handleLogoff(xhr);
+
       if (xhr.getResponseHeader('Discourse-Readonly')) {
         Ember.run(() => Discourse.Site.currentProp('isReadOnly', true));
       }
@@ -67,6 +91,8 @@ export function ajax() {
     };
 
     args.error = (xhr, textStatus, errorThrown) => {
+      handleLogoff(xhr);
+
       // note: for bad CSRF we don't loop an extra request right away.
       //  this allows us to eliminate the possibility of having a loop.
       if (xhr.status === 403 && xhr.responseText === "[\"BAD CSRF\"]") {
@@ -110,7 +136,7 @@ export function ajax() {
   if(args.type && args.type.toUpperCase() !== 'GET' && !Discourse.Session.currentProp('csrfToken')){
     promise = new Ember.RSVP.Promise((resolve, reject) => {
       ajaxObj = $.ajax(Discourse.getURL('/session/csrf'), {cache: false})
-        .success(result => {
+        .done(result => {
           Discourse.Session.currentProp('csrfToken', result.csrf);
           performAjax(resolve, reject);
         });
diff --git a/app/assets/javascripts/discourse/lib/autocomplete.js.es6 b/app/assets/javascripts/discourse/lib/autocomplete.js.es6
index 15cb6d5d937..cf0a9a01d6f 100644
--- a/app/assets/javascripts/discourse/lib/autocomplete.js.es6
+++ b/app/assets/javascripts/discourse/lib/autocomplete.js.es6
@@ -276,7 +276,6 @@ export default function(options) {
       }
 
       if (Discourse.Site.currentProp('mobileView')) {
-        div.css('width', 'auto');
 
         if ((me.height() / 2) >= pos.top) { vOffset = -23; }
         if ((me.width() / 2) <= pos.left) { hOffset = -div.width(); }
diff --git a/app/assets/javascripts/discourse/lib/binary-search.js.es6 b/app/assets/javascripts/discourse/lib/binary-search.js.es6
deleted file mode 100644
index 03675866e0a..00000000000
--- a/app/assets/javascripts/discourse/lib/binary-search.js.es6
+++ /dev/null
@@ -1,29 +0,0 @@
-// The binarySearch() function is licensed under the UNLICENSE
-// https://github.com/Olical/binary-search
-
-// Modified for use in Discourse
-
-export default function binarySearch(list, target, keyProp) {
-  var min = 0;
-  var max = list.length - 1;
-  var guess;
-  var keyProperty = keyProp || "id";
-
-  while (min <= max) {
-    guess = Math.floor((min + max) / 2);
-
-    if (Em.get(list[guess], keyProperty) === target) {
-      return guess;
-    }
-    else {
-      if (Em.get(list[guess], keyProperty) < target) {
-        min = guess + 1;
-      }
-      else {
-        max = guess - 1;
-      }
-    }
-  }
-
-  return -Math.floor((min + max) / 2);
-}
diff --git a/app/assets/javascripts/discourse/lib/click-track.js.es6 b/app/assets/javascripts/discourse/lib/click-track.js.es6
index 6247973d451..d4dc44f2cbb 100644
--- a/app/assets/javascripts/discourse/lib/click-track.js.es6
+++ b/app/assets/javascripts/discourse/lib/click-track.js.es6
@@ -26,7 +26,7 @@ export default {
     }
 
     // don't track links in quotes or in elided part
-    let tracking = $link.parents('aside.quote,.elided').length === 0;
+    let tracking = $link.parents('aside.quote, .elided').length === 0;
 
     let href = $link.attr('href') || $link.data('href');
 
@@ -113,8 +113,10 @@ export default {
       return false;
     }
 
+    const isInternal = DiscourseURL.isInternal(href);
+
     // If we're on the same site, use the router and track via AJAX
-    if (tracking && DiscourseURL.isInternal(href) && !$link.hasClass('attachment')) {
+    if (tracking && isInternal && !$link.hasClass('attachment')) {
       ajax("/clicks/track", {
         data: {
           url: href,
@@ -128,8 +130,11 @@ export default {
       return false;
     }
 
-    // Otherwise, use a custom URL with a redirect
-    if (Discourse.User.currentProp('external_links_in_new_tab')) {
+    const modifierLeftClicked = (e.ctrlKey || e.metaKey) && e.which === 1;
+    const middleClicked = e.which === 2;
+    const openExternalInNewTab = Discourse.User.currentProp('external_links_in_new_tab');
+
+    if (modifierLeftClicked || middleClicked || (!isInternal && openExternalInNewTab)) {
       window.open(destUrl, '_blank').focus();
     } else {
       DiscourseURL.redirectTo(destUrl);
diff --git a/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6 b/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
index 12c481e4afb..d07442d24c6 100644
--- a/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
+++ b/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
@@ -55,6 +55,22 @@ function init(messageBus, appEvents) {
   }
 }
 
+function confirmNotification() {
+  const notification = new Notification(I18n.t("notifications.popup.confirm_title", {site_title: Discourse.SiteSettings.title}), {
+    body: I18n.t("notifications.popup.confirm_body"),
+    icon: Discourse.SiteSettings.logo_small_url || Discourse.SiteSettings.logo_url,
+    tag: "confirm-subscription"
+  });
+
+  const clickEventHandler = () => notification.close();
+
+  notification.addEventListener('click', clickEventHandler);
+  setTimeout(() => {
+    notification.close();
+    notification.removeEventListener('click', clickEventHandler);
+  }, 10 * 1000);
+}
+
 // This function is only called if permission was granted
 function setupNotifications(appEvents) {
 
@@ -167,4 +183,8 @@ function unsubscribe(bus, user) {
   bus.unsubscribe(alertChannel(user));
 }
 
-export { context, init, onNotification, unsubscribe, alertChannel };
+function disable() {
+  keyValueStore.setItem('notifications-disabled', 'disabled');
+}
+
+export { context, init, onNotification, unsubscribe, alertChannel, confirmNotification, disable };
diff --git a/app/assets/javascripts/discourse/lib/formatter.js.es6 b/app/assets/javascripts/discourse/lib/formatter.js.es6
index dcce95ca999..3eed7e3d97f 100644
--- a/app/assets/javascripts/discourse/lib/formatter.js.es6
+++ b/app/assets/javascripts/discourse/lib/formatter.js.es6
@@ -301,9 +301,13 @@ export function relativeAge(date, options) {
   return "UNKNOWN FORMAT";
 }
 
-export function number(val) {
+export function number(val, options = {}) {
   let formattedNumber;
 
+  if (options.ceil) {
+    val = Math.ceil(val);
+  }
+
   val = parseInt(val, 10);
   if (isNaN(val)) val = 0;
 
@@ -311,7 +315,7 @@ export function number(val) {
     formattedNumber = I18n.toNumber(val / 1000000, {precision: 1});
     return I18n.t("number.short.millions", {number: formattedNumber});
   } else if (val > 99999) {
-    formattedNumber = I18n.toNumber(val / 1000, {precision: 0});
+    formattedNumber = I18n.toNumber(Math.floor(val / 1000), {precision: 0});
     return I18n.t("number.short.thousands", {number: formattedNumber});
   } else if (val > 999) {
     formattedNumber = I18n.toNumber(val / 1000, {precision: 1});
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
index c3a7ecd27ca..6a1ddbdf9f1 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
@@ -1,6 +1,6 @@
 import DiscourseURL from 'discourse/lib/url';
 import Composer from 'discourse/models/composer';
-import { scrollTopFor } from 'discourse/lib/offset-calculator';
+import { minimumOffset } from 'discourse/lib/offset-calculator';
 
 const bindings = {
   '!':               {postAction: 'showFlags'},
@@ -12,6 +12,7 @@ const bindings = {
   '.':               {click: '.alert.alert-info.clickable', anonymous: true}, // show incoming/updated topics
   'b':               {handler: 'toggleBookmark'},
   'c':               {handler: 'createTopic'},
+  'C':               {handler: 'focusComposer'},
   'ctrl+f':          {handler: 'showPageSearch', anonymous: true},
   'command+f':       {handler: 'showPageSearch', anonymous: true},
   'ctrl+p':          {handler: 'printTopic', anonymous: true},
@@ -67,6 +68,12 @@ export default {
     this.searchService = this.container.lookup('search-service:main');
     this.appEvents = this.container.lookup('app-events:main');
     this.currentUser = this.container.lookup('current-user:main');
+    let siteSettings = this.container.lookup('site-settings:main');
+
+    // Disable the shortcut if private messages are disabled
+    if (!siteSettings.enable_personal_messages) {
+      delete bindings['g m'];
+    }
 
     Object.keys(bindings).forEach(key => {
       const binding = bindings[key];
@@ -174,6 +181,15 @@ export default {
     }
   },
 
+  focusComposer() {
+    const composer = this.container.lookup('controller:composer');
+    if (composer.get('model.viewOpen')) {
+      setTimeout(() => $('textarea.d-editor-input').focus(), 0);
+    } else {
+      composer.send('openIfDraft');
+    }
+  },
+
   pinUnpinTopic() {
     this.container.lookup('controller:topic').togglePinnedState();
   },
@@ -295,52 +311,36 @@ export default {
   _moveSelection(direction) {
     const $articles = this._findArticles();
 
-    if (typeof $articles === 'undefined') {
-      return;
-    }
+    if (typeof $articles === 'undefined') return;
 
     const $selected = ($articles.filter('.selected').length !== 0)
       ? $articles.filter('.selected')
       : $articles.filter('[data-islastviewedtopic=true]');
+
     let index = $articles.index($selected);
 
-    if ($selected.length !== 0) { //boundries check
-      // loop is not allowed
-      if (direction === -1 && index === 0) { return; }
-      if (direction === 1 && index === ($articles.size()-1) ) { return; }
+    if ($selected.length !== 0) {
+      if (direction === -1 && index === 0) return;
+      if (direction ===  1 && index === $articles.length - 1) return;
     }
 
-    // if nothing is selected go to the first post on screen
+    // when nothing is selected
     if ($selected.length === 0) {
-      const scrollTop = $(document).scrollTop();
-
-      index = 0;
-      $articles.each(function() {
-        const top = $(this).position().top;
-        if (top >= scrollTop) {
-          return false;
-        }
-        index += 1;
-      });
-
-      if (index >= $articles.length) {
-        index = $articles.length - 1;
-      }
-
+      // select the first post with its top visible
+      const offset = minimumOffset();
+      index = $articles.toArray().findIndex(article => article.getBoundingClientRect().top > offset);
       direction = 0;
     }
 
     const $article = $articles.eq(index + direction);
 
-    if ($article.size() > 0) {
-
+    if ($article.length > 0) {
       $articles.removeClass('selected');
       $article.addClass('selected');
 
       if ($article.is('.topic-post')) {
         $('a.tabLoc', $article).focus();
         this._scrollToPost($article);
-
       } else {
         this._scrollList($article, direction);
       }
@@ -348,8 +348,11 @@ export default {
   },
 
   _scrollToPost($article) {
-    const pos = $article.offset();
-    $(window).scrollTop(Math.ceil(pos.top - scrollTopFor(pos.top)));
+    if ($article.find("#post_1").length > 0) {
+      $(window).scrollTop(0);
+    } else {
+      $(window).scrollTop($article.offset().top - minimumOffset());
+    }
   },
 
   _scrollList($article) {
@@ -377,14 +380,13 @@ export default {
 
 
   _findArticles() {
-    const $topicList = $('.topic-list'),
-        $topicArea = $('.posts-wrapper');
+    const $topicList = $(".topic-list");
+    const $postsWrapper = $(".posts-wrapper");
 
-    if ($topicArea.size() > 0) {
-      return $('.posts-wrapper .topic-post, .topic-list tbody tr');
-    }
-    else if ($topicList.size() > 0) {
-      return $topicList.find('.topic-list-item');
+    if ($postsWrapper.length > 0) {
+      return $(".posts-wrapper .topic-post, .topic-list tbody tr");
+    } else if ($topicList.length > 0) {
+      return $topicList.find(".topic-list-item");
     }
   },
 
diff --git a/app/assets/javascripts/discourse/lib/lock-on.js.es6 b/app/assets/javascripts/discourse/lib/lock-on.js.es6
index 65504d4df67..fe20031ab3a 100644
--- a/app/assets/javascripts/discourse/lib/lock-on.js.es6
+++ b/app/assets/javascripts/discourse/lib/lock-on.js.es6
@@ -1,13 +1,13 @@
-import { scrollTopFor } from 'discourse/lib/offset-calculator';
+import { minimumOffset } from "discourse/lib/offset-calculator";
 
-// Dear traveller, you are entering a zone where we are at war with the browser
-// the browser is insisting on positioning scrollTop per the location it was in
-// the past, we are insisting on it being where we want it to be
-// The hack is just to keep trying over and over to position the scrollbar (up to 1 minute)
+// Dear traveller, you are entering a zone where we are at war with the browser.
+// The browser is insisting on positioning scrollTop per the location it was in
+// the past, we are insisting on it being where we want it to be.
+// The hack is just to keep trying over and over to position the scrollbar (up to 1 second).
 //
 // The root cause is that a "refresh" on a topic page will almost never be at the
 // same position it was in the past, the URL points to the post at the top of the
-// page, so a refresh will try to bring that post into view causing drift
+// page, so a refresh will try to bring that post into view causing drift.
 //
 // Additionally if you loaded multiple batches of posts, on refresh they will not
 // be loaded.
@@ -18,29 +18,29 @@ import { scrollTopFor } from 'discourse/lib/offset-calculator';
 // 1. onbeforeunload ensure we are scrolled to the right spot
 // 2. give up on the scrollbar and implement it ourselves (something that will happen)
 
+const LOCK_DURATION_MS = 1000;
 const SCROLL_EVENTS = "scroll.lock-on touchmove.lock-on mousedown.lock-on wheel.lock-on DOMMouseScroll.lock-on mousewheel.lock-on keyup.lock-on";
+const SCROLL_TYPES  = ["mousedown", "mousewheel", "touchmove", "wheel"];
 
 function within(threshold, x, y) {
-  return Math.abs(x-y) < threshold;
+  return Math.abs(x - y) < threshold;
 }
 
 export default class LockOn {
   constructor(selector, options) {
     this.selector = selector;
     this.options = options || {};
-    this.offsetTop = null;
   }
 
   elementTop() {
-    const selected = $(this.selector);
-    if (selected && selected.offset && selected.offset()) {
-      const result = selected.offset().top;
-      return result - (Math.round(scrollTopFor(result)) * 0.9);
+    const $selected = $(this.selector);
+    if ($selected && $selected.offset && $selected.offset()) {
+      return $selected.offset().top - minimumOffset();
     }
   }
 
   clearLock(interval) {
-    $('body,html').off(SCROLL_EVENTS);
+    $("body, html").off(SCROLL_EVENTS);
     clearInterval(interval);
     if (this.options.finished) {
       this.options.finished();
@@ -54,9 +54,7 @@ export default class LockOn {
     $(window).scrollTop(previousTop);
 
     const interval = setInterval(() => {
-      let top = this.elementTop();
-      if (top < 0) { top = 0; }
-
+      const top = Math.max(0, this.elementTop());
       const scrollTop = $(window).scrollTop();
 
       if (typeof(top) === "undefined" || isNaN(top)) {
@@ -68,20 +66,14 @@ export default class LockOn {
         previousTop = top;
       }
 
-      // We commit suicide after 3s just to clean up
-      const nowTime = new Date().getTime();
-      if (nowTime - startedAt > 1000) {
+      // Commit suicide after a little while
+      if (new Date().getTime() - startedAt > LOCK_DURATION_MS) {
         return this.clearLock(interval);
       }
     }, 50);
 
-    $('body,html').off(SCROLL_EVENTS).on(SCROLL_EVENTS, e => {
-      if ( e.which > 0 ||
-           e.type === "mousedown" ||
-           e.type === "mousewheel" ||
-           e.type === "touchmove" ||
-           e.type === "wheel"
-      ) {
+    $("body, html").off(SCROLL_EVENTS).on(SCROLL_EVENTS, e => {
+      if (e.which > 0 || SCROLL_TYPES.includes(e.type)) {
         this.clearLock(interval);
       }
     });
diff --git a/app/assets/javascripts/discourse/lib/logout.js.es6 b/app/assets/javascripts/discourse/lib/logout.js.es6
index 2fe4078a69f..51f397d186b 100644
--- a/app/assets/javascripts/discourse/lib/logout.js.es6
+++ b/app/assets/javascripts/discourse/lib/logout.js.es6
@@ -1,4 +1,10 @@
 export default function logout(siteSettings, keyValueStore) {
+  if (!siteSettings || !keyValueStore) {
+    const container = Discourse.__container__;
+    siteSettings = siteSettings || container.lookup('site-settings:main');
+    keyValueStore = keyValueStore || container.lookup('key-value-store:main');
+  }
+
   keyValueStore.abandonLocal();
 
   const redirect = siteSettings.logout_redirect;
diff --git a/app/assets/javascripts/discourse/lib/offset-calculator.js.es6 b/app/assets/javascripts/discourse/lib/offset-calculator.js.es6
index 84691d6a05d..41d50903bcb 100644
--- a/app/assets/javascripts/discourse/lib/offset-calculator.js.es6
+++ b/app/assets/javascripts/discourse/lib/offset-calculator.js.es6
@@ -1,49 +1,36 @@
-// TODO: This is quite ugly but seems reasonably fast? Maybe refactor
-// this out before we merge into stable.
 export function scrollTopFor(y) {
-  let off = 0;
-  for (let i=0; i<3; i++) {
-    off = offsetCalculator(y - off);
-  }
-  return off;
+  return y - offsetCalculator();
 }
 
-export default function offsetCalculator(y) {
-  const $header = $('header');
-  const $title = $('#topic-title');
-  const rawWinHeight = $(window).height();
-  const windowHeight = rawWinHeight - $title.height();
-  const eyeTarget = (windowHeight / 10);
-  const headerHeight = $header.outerHeight(true);
-  const expectedOffset = $title.height() - $header.find('.contents').height() + (eyeTarget * 2);
-  const ideal = headerHeight + ((expectedOffset < 0) ? 0 : expectedOffset);
-
-  const $container = $('.posts-wrapper');
-  if ($container.length === 0) { return expectedOffset; }
-
-  const topPos = $container.offset().top;
-
-  const scrollTop = y || $(window).scrollTop();
-  const docHeight = $(document).height();
-  let scrollPercent = Math.min((scrollTop / (docHeight-rawWinHeight)), 1.0);
-
-  let inter = topPos - scrollTop + ($container.height() * scrollPercent);
-  if (inter < headerHeight + eyeTarget) {
-    inter = headerHeight + eyeTarget;
-  }
-
-
-  if (inter > ideal) {
-    const bottom = $('#topic-bottom').offset().top;
-    const switchPos = bottom - rawWinHeight - ideal;
-
-    if (scrollTop > switchPos) {
-      const p = Math.max(Math.min((scrollTop + inter - switchPos) / rawWinHeight, 1.0), 0.0);
-      return ((1 - p) * ideal) + (p * inter);
-    } else {
-      return ideal;
-    }
-  }
-
-  return inter;
+export function minimumOffset() {
+  const $header = $("header.d-header");
+  const headerHeight = $header.outerHeight(true) || 0;
+  const headerPositionTop = $header.position().top;
+  return headerHeight + headerPositionTop;
+}
+
+export default function offsetCalculator() {
+  const min = minimumOffset();
+
+  // on mobile, just use the header
+  if ($("html").hasClass("mobile-view")) return min;
+
+  const $window = $(window);
+  const windowHeight = $window.height();
+  const documentHeight = $(document).height();
+  const topicBottomOffsetTop = $("#topic-bottom").offset().top;
+
+  // the footer is bigger than the window, we can scroll down past the last post
+  if (documentHeight - windowHeight > topicBottomOffsetTop) return min;
+
+  const scrollTop = $window.scrollTop();
+  const visibleBottomHeight = scrollTop + windowHeight - topicBottomOffsetTop;
+
+  if (visibleBottomHeight > 0) {
+    const bottomHeight = documentHeight - topicBottomOffsetTop;
+    const offset = (windowHeight - bottomHeight) * visibleBottomHeight / bottomHeight;
+    return Math.max(min, offset);
+  }
+
+  return min;
 }
diff --git a/app/assets/javascripts/discourse/lib/page-tracker.js.es6 b/app/assets/javascripts/discourse/lib/page-tracker.js.es6
index e6bd2c79e1b..77daeedce1a 100644
--- a/app/assets/javascripts/discourse/lib/page-tracker.js.es6
+++ b/app/assets/javascripts/discourse/lib/page-tracker.js.es6
@@ -38,3 +38,23 @@ export function startPageTracking(router, appEvents) {
   });
   _started = true;
 }
+
+const _gtmPageChangedCallbacks = [];
+
+export function addGTMPageChangedCallback(callback) {
+  _gtmPageChangedCallbacks.push(callback);
+}
+
+export function googleTagManagerPageChanged(data) {
+  let gtmData = {
+    'event': 'virtualPageView',
+    'page': {
+      'title': data.title,
+      'url': data.url
+    }
+  };
+
+  _.each(_gtmPageChangedCallbacks, callback => callback(gtmData));
+
+  window.dataLayer.push(gtmData);
+}
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
index 68cc7eb8e61..3222c2ddd26 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
@@ -22,9 +22,13 @@ import { registerIconRenderer, replaceIcon } from 'discourse-common/lib/icon-lib
 import { addNavItem } from 'discourse/models/nav-item';
 import { replaceFormatter } from 'discourse/lib/utilities';
 import { modifySelectKit } from "select-kit/mixins/plugin-api";
+import { addGTMPageChangedCallback } from 'discourse/lib/page-tracker';
+import { registerCustomAvatarHelper } from 'discourse/helpers/user-avatar';
+import { disableNameSuppression } from 'discourse/widgets/poster-name';
+import { registerCustomPostMessageCallback as registerCustomPostMessageCallback1 } from 'discourse/controllers/topic';
 
 // If you add any methods to the API ensure you bump up this number
-const PLUGIN_API_VERSION = '0.8.13';
+const PLUGIN_API_VERSION = '0.8.22';
 
 class PluginApi {
   constructor(version, container) {
@@ -41,20 +45,7 @@ class PluginApi {
     return this.container.lookup('current-user:main');
   }
 
-  /**
-   * Allows you to overwrite or extend methods in a class.
-   *
-   * For example:
-   *
-   * ```
-   * api.modifyClass('controller:composer', {
-   *   actions: {
-   *     newActionHere() { }
-   *   }
-   * });
-   * ```
-   **/
-  modifyClass(resolverName, changes, opts) {
+  _resolveClass(resolverName, opts) {
     opts = opts || {};
 
     if (this.container.cache[resolverName]) {
@@ -69,7 +60,48 @@ class PluginApi {
       return;
     }
 
-    klass.class.reopen(changes);
+    return klass;
+  }
+
+  /**
+   * Allows you to overwrite or extend methods in a class.
+   *
+   * For example:
+   *
+   * ```
+   * api.modifyClass('controller:composer', {
+   *   actions: {
+   *     newActionHere() { }
+   *   }
+   * });
+   * ```
+   **/
+  modifyClass(resolverName, changes, opts) {
+
+    const klass = this._resolveClass(resolverName, opts);
+    if (klass) {
+      klass.class.reopen(changes);
+    }
+    return klass;
+  }
+
+  /**
+   * Allows you to overwrite or extend static methods in a class.
+   *
+   * For example:
+   *
+   * ```
+   * api.modifyClassStatic('controller:composer', {
+   *   superFinder: function() { return []; }
+   * });
+   * ```
+   **/
+  modifyClassStatic(resolverName, changes, opts) {
+
+    const klass = this._resolveClass(resolverName, opts);
+    if (klass) {
+      klass.class.reopenClass(changes);
+    }
     return klass;
   }
 
@@ -350,8 +382,67 @@ class PluginApi {
     ```
   **/
   onPageChange(fn) {
+    this.onAppEvent('page:changed', data => fn(data.url, data.title));
+  }
+
+  /**
+    Listen for a triggered `AppEvent` from Discourse.
+
+    ```javascript
+      api.onAppEvent('inserted-custom-html', () => {
+        console.log('a custom footer was rendered');
+      });
+    ```
+  **/
+  onAppEvent(name, fn) {
     let appEvents = this.container.lookup('app-events:main');
-    appEvents.on('page:changed', data => fn(data.url, data.title));
+    appEvents.on(name, fn);
+  }
+
+  /**
+    Registers a function to generate custom avatar CSS classes
+    for a particular user.
+
+    Takes a function that will accept a user as a parameter
+    and return an array of CSS classes to apply.
+
+    ```javascript
+    api.customUserAvatarClasses(user => {
+      if (Ember.get(user, 'primary_group_name') === 'managers') {
+        return ['managers'];
+      }
+    });
+   **/
+  customUserAvatarClasses(fn) {
+    registerCustomAvatarHelper(fn);
+  }
+
+  /**
+   * Allows you to disable suppression of similar username / names on posts
+   * If a user has the username bob.bob and the name Bob Bob, one of the two
+   * will be suppressed depending on prioritize_username_in_ux.
+   * This allows you to override core behavior
+   **/
+  disableNameSuppressionOnPosts() {
+    disableNameSuppression();
+  }
+
+  /**
+   * Registers a callback that will be invoked when the server calls
+   * Post#publish_change_to_clients! please ensure your type does not
+   * match acted,revised,rebaked,recovered, created,move_to_inbox or archived
+   *
+   * callback will be called with topicController and Message
+   *
+   * Example:
+   *
+   * api.registerCustomPostMessageCallback("applied_color", (topicController, message) => {
+   *   let stream = topicController.get("model.postStream");
+   *   // etc
+   * });
+   */
+  registerCustomPostMessageCallback(type, callback) {
+    registerCustomPostMessageCallback1(type, callback);
   }
 
   /**
@@ -605,6 +696,20 @@ class PluginApi {
   modifySelectKit(pluginApiKey) {
     return modifySelectKit(pluginApiKey);
   }
+
+  /**
+  *
+  * Registers a function that can inspect and modify the data that
+  * will be sent to Google Tag Manager when a page changed event is triggered.
+  *
+  * Example:
+  *
+  * addGTMPageChangedCallback( gtmData => gtmData.locale = I18n.currentLocale() )
+  *
+  */
+  addGTMPageChangedCallback(fn) {
+    addGTMPageChangedCallback(fn);
+  }
 }
 
 let _pluginv01;
@@ -665,7 +770,12 @@ export function withPluginApi(version, apiCodeCallback, opts) {
 let _decorateId = 0;
 function decorate(klass, evt, cb) {
   const mixin = {};
-  mixin["_decorate_" + (_decorateId++)] = function($elem) { cb($elem); }.on(evt);
+  mixin["_decorate_" + (_decorateId++)] = function($elem) {
+    $elem = $elem || this.$();
+    if ($elem) {
+      cb($elem);
+    }
+  }.on(evt);
   klass.reopen(mixin);
 }
 
diff --git a/app/assets/javascripts/discourse/lib/push-notifications.js.es6 b/app/assets/javascripts/discourse/lib/push-notifications.js.es6
new file mode 100644
index 00000000000..53976b1cba7
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/push-notifications.js.es6
@@ -0,0 +1,119 @@
+import { ajax } from 'discourse/lib/ajax';
+import KeyValueStore from 'discourse/lib/key-value-store';
+
+export const keyValueStore = new KeyValueStore("discourse_push_notifications_");
+
+export function userSubscriptionKey(user) {
+  return `subscribed-${user.get('id')}`;
+}
+
+function sendSubscriptionToServer(subscription, sendConfirmation) {
+  ajax('/push_notifications/subscribe', {
+    type: 'POST',
+    data: { subscription: subscription.toJSON(), send_confirmation: sendConfirmation }
+  });
+}
+
+function userAgentVersionChecker(agent, version, mobileView) {
+  const uaMatch = navigator.userAgent.match(new RegExp(`${agent}\/(\\d+)\\.\\d`));
+  if (uaMatch && mobileView) return false;
+  if (!uaMatch || parseInt(uaMatch[1]) < version) return false;
+  return true;
+}
+
+function resetIdle() {
+  if('controller' in navigator.serviceWorker && navigator.serviceWorker.controller != null) {
+    navigator.serviceWorker.controller.postMessage({lastAction: Date.now()});
+  }
+}
+
+function setupActivityListeners(appEvents) {
+  window.addEventListener("focus", resetIdle);
+
+  if (document) {
+    document.addEventListener("scroll", resetIdle);
+  }
+
+  appEvents.on('page:changed', resetIdle);
+}
+
+export function isPushNotificationsSupported(mobileView) {
+  if (!(('serviceWorker' in navigator) &&
+     (ServiceWorkerRegistration &&
+     (typeof(Notification) !== "undefined") &&
+     ('showNotification' in ServiceWorkerRegistration.prototype) &&
+     ('PushManager' in window)))) {
+
+    return false;
+  }
+
+  if ((!userAgentVersionChecker('Firefox', 44, mobileView)) &&
+     (!userAgentVersionChecker('Chrome', 50))) {
+    return false;
+  }
+
+  return true;
+}
+
+export function isPushNotificationsEnabled(user, mobileView) {
+  return user && isPushNotificationsSupported(mobileView) && keyValueStore.getItem(userSubscriptionKey(user));
+}
+
+export function register(user, mobileView, router, appEvents) {
+  if (!isPushNotificationsSupported(mobileView)) return;
+  if (Notification.permission === 'denied' || !user) return;
+
+  navigator.serviceWorker.ready.then(serviceWorkerRegistration => {
+    serviceWorkerRegistration.pushManager.getSubscription().then(subscription => {
+      if (subscription) {
+        sendSubscriptionToServer(subscription, false);
+        // Resync localStorage
+        keyValueStore.setItem(userSubscriptionKey(user), 'subscribed');
+      }
+      setupActivityListeners(appEvents);
+    }).catch(e => Ember.Logger.error(e));
+  });
+
+  navigator.serviceWorker.addEventListener('message', (event) => {
+    if ('url' in event.data) {
+      const url = event.data.url;
+      router.handleURL(url);
+    }
+  });
+}
+
+export function subscribe(callback, applicationServerKey, mobileView) {
+  if (!isPushNotificationsSupported(mobileView)) return;
+
+  navigator.serviceWorker.ready.then(serviceWorkerRegistration => {
+    serviceWorkerRegistration.pushManager.subscribe({
+      userVisibleOnly: true,
+      applicationServerKey: new Uint8Array(applicationServerKey.split("|")) // eslint-disable-line no-undef
+    }).then(subscription => {
+      sendSubscriptionToServer(subscription, true);
+      if (callback) callback();
+    }).catch(e => Ember.Logger.error(e));
+  });
+}
+
+export function unsubscribe(user, callback, mobileView) {
+  if (!isPushNotificationsSupported(mobileView)) return;
+
+  keyValueStore.setItem(userSubscriptionKey(user), '');
+  navigator.serviceWorker.ready.then(serviceWorkerRegistration => {
+    serviceWorkerRegistration.pushManager.getSubscription().then(subscription => {
+      if (subscription) {
+        subscription.unsubscribe().then((successful) => {
+          if (successful) {
+            ajax('/push_notifications/unsubscribe', {
+              type: 'POST',
+              data: { subscription: subscription.toJSON() }
+            });
+          }
+        });
+      }
+    }).catch(e => Ember.Logger.error(e));
+
+    if (callback) callback();
+  });
+}
diff --git a/app/assets/javascripts/discourse/lib/quote.js.es6 b/app/assets/javascripts/discourse/lib/quote.js.es6
index bf1d290a5f0..8dee8809818 100644
--- a/app/assets/javascripts/discourse/lib/quote.js.es6
+++ b/app/assets/javascripts/discourse/lib/quote.js.es6
@@ -4,41 +4,32 @@ export default {
 
   // Build the BBCode quote around the selected text
   build(post, contents, opts) {
-    var contents_hashed, result, sansQuotes, stripped, stripped_hashed, tmp;
-    var full = opts && opts["full"];
-    var raw = opts && opts["raw"];
-
     if (!post) { return ""; }
 
     if (!contents) contents = "";
 
-    sansQuotes = contents.replace(this.REGEXP, '').trim();
+    const sansQuotes = contents.replace(this.REGEXP, "").trim();
     if (sansQuotes.length === 0) { return ""; }
 
-    // Escape the content of the quote
-    sansQuotes = sansQuotes.replace(/</g, "&lt;")
-                           .replace(/>/g, "&gt;");
+    // Strip the HTML from cooked
+    const stripped = $("<div/>").html(post.get("cooked")).text();
 
-    result = "[quote=\"" + post.get('username') + ", post:" + post.get('post_number') + ", topic:" + post.get('topic_id');
+    // Let's remove any non-word characters as a kind of hash.
+    // Yes it's not accurate but it should work almost every time we need it to.
+    // It would be unlikely that the user would quote another post that matches in exactly this way.
+    const sameContent = stripped.replace(/\W/g, "") === contents.replace(/\W/g, "");
 
-    /* Strip the HTML from cooked */
-    tmp = document.createElement('div');
-    tmp.innerHTML = post.get('cooked');
-    stripped = tmp.textContent || tmp.innerText || "";
+    const params = [
+      post.get("username"),
+      `post:${post.get("post_number")}`,
+      `topic:${post.get("topic_id")}`,
+    ];
 
-    /*
-      Let's remove any non alphanumeric characters as a kind of hash. Yes it's
-      not accurate but it should work almost every time we need it to. It would be unlikely
-      that the user would quote another post that matches in exactly this way.
-    */
-    stripped_hashed = stripped.replace(/[^a-zA-Z0-9]/g, '');
-    contents_hashed = contents.replace(/[^a-zA-Z0-9]/g, '');
+    opts = opts || {};
 
-    /* If the quote is the full message, attribute it as such */
-    if (full || stripped_hashed === contents_hashed) result += ", full:true";
-    result += "\"]\n" + (raw ? contents : sansQuotes) + "\n[/quote]\n\n";
+    if (opts["full"] || sameContent) params.push("full:true");
 
-    return result;
+    return `[quote="${params.join(", ")}"]\n${opts["raw"] ? contents : sansQuotes}\n[/quote]\n\n`;
   }
 
 };
diff --git a/app/assets/javascripts/discourse/lib/render-tag.js.es6 b/app/assets/javascripts/discourse/lib/render-tag.js.es6
index 127dc5c9fe4..b9763676f40 100644
--- a/app/assets/javascripts/discourse/lib/render-tag.js.es6
+++ b/app/assets/javascripts/discourse/lib/render-tag.js.es6
@@ -3,7 +3,16 @@ export default function renderTag(tag, params) {
   tag = Handlebars.Utils.escapeExpression(tag);
   const classes = ['tag-' + tag, 'discourse-tag'];
   const tagName = params.tagName || "a";
-  const href = (tagName === "a" && !params.noHref) ? " href='" + Discourse.getURL("/tags/" + tag) + "' " : "";
+  let path;
+  if (tagName === "a" && !params.noHref) {
+    if (params.isPrivateMessage && Discourse.User.current()) {
+      const username = params.tagsForUser ? params.tagsForUser : Discourse.User.current().username;
+      path = `/u/${username}/messages/tags/${tag}`;
+    } else {
+      path = `/tags/${tag}`;
+    }
+  }
+  const href = path ? ` href='${Discourse.getURL(path)}' ` : "";
 
   if (Discourse.SiteSettings.tag_style || params.style) {
     classes.push(params.style || Discourse.SiteSettings.tag_style);
diff --git a/app/assets/javascripts/discourse/lib/render-tags.js.es6 b/app/assets/javascripts/discourse/lib/render-tags.js.es6
index 6989eab57b1..f6bb19b92e4 100644
--- a/app/assets/javascripts/discourse/lib/render-tags.js.es6
+++ b/app/assets/javascripts/discourse/lib/render-tags.js.es6
@@ -20,9 +20,16 @@ export function addTagsHtmlCallback(callback, options) {
 export default function(topic, params){
   let tags = topic.tags;
   let buffer = "";
+  let tagsForUser = null;
+  const isPrivateMessage = topic.get('isPrivateMessage');
 
-  if (params && params.mode === "list") {
-    tags = topic.get("visibleListTags");
+  if (params) {
+    if (params.mode === "list") {
+      tags = topic.get("visibleListTags");
+    }
+    if (params.tagsForUser) {
+      tagsForUser = params.tagsForUser;
+    }
   }
 
   let customHtml = null;
@@ -43,7 +50,7 @@ export default function(topic, params){
     buffer = "<div class='discourse-tags'>";
     if (tags) {
       for(let i=0; i<tags.length; i++){
-        buffer += renderTag(tags[i]) + ' ';
+        buffer += renderTag(tags[i], { isPrivateMessage, tagsForUser }) + ' ';
       }
     }
 
diff --git a/app/assets/javascripts/discourse/lib/screen-track.js.es6 b/app/assets/javascripts/discourse/lib/screen-track.js.es6
index af4c46a04c1..1d43bf667ec 100644
--- a/app/assets/javascripts/discourse/lib/screen-track.js.es6
+++ b/app/assets/javascripts/discourse/lib/screen-track.js.es6
@@ -66,6 +66,7 @@ export default class {
     this._totalTimings = {};
     this._topicTime = 0;
     this._onscreen = [];
+    this._inProgress = false;
   }
 
   scrolled() {
@@ -108,6 +109,7 @@ export default class {
 
     if (!$.isEmptyObject(newTimings)) {
       if (this.currentUser) {
+        this._inProgress = true;
         ajax('/topics/timings', {
           data: {
             timings: newTimings,
@@ -128,6 +130,9 @@ export default class {
         }).catch(e => {
           const error = e.jqXHR;
           if (error.status === 405 && error.responseJSON.error_type === "read_only") return;
+        }).finally(() => {
+          this._inProgress = false;
+          this._lastFlush = 0;
         });
       } else if (this._anonCallback) {
         // Anonymous viewer - save to localStorage
@@ -182,7 +187,7 @@ export default class {
       return timings[postNumber] > 0 && !totalTimings[postNumber];
     });
 
-    if (this._lastFlush > nextFlush || rush) {
+    if (!this._inProgress && (this._lastFlush > nextFlush || rush)) {
       this.flush();
     }
 
diff --git a/app/assets/javascripts/discourse/lib/text-direction.js.es6 b/app/assets/javascripts/discourse/lib/text-direction.js.es6
new file mode 100644
index 00000000000..928b147ed79
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/text-direction.js.es6
@@ -0,0 +1,30 @@
+const ltrChars = 'A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02B8\u0300-\u0590\u0800-\u1FFF\u2C00-\uFB1C\uFDFE-\uFE6F\uFEFD-\uFFFF';
+const rtlChars = '\u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC';
+const rtlDirCheck = new RegExp('^[^'+ltrChars+']*['+rtlChars+']');
+const ltrDirCheck = new RegExp('^[^'+rtlChars+']*['+ltrChars+']');
+let _siteDir;
+
+export function isRTL(text) {
+  return rtlDirCheck.test(text);
+}
+
+export function isLTR(text) {
+  return ltrDirCheck.test(text);
+}
+
+export function setTextDirections($elem) {
+  $elem.find('*').each((i, e) => {
+    let $e = $(e),
+      textContent = $e.text();
+    if (textContent) {
+      isRTL(textContent) ? $e.attr('dir', 'rtl') : $e.attr('dir', 'ltr');
+    }
+  });
+}
+
+export function siteDir() {
+  if (!_siteDir) {
+    _siteDir = $('html').hasClass('rtl') ? 'rtl' : 'ltr';
+  }
+  return _siteDir;
+}
diff --git a/app/assets/javascripts/discourse/lib/to-markdown.js.es6 b/app/assets/javascripts/discourse/lib/to-markdown.js.es6
index 2fd90c59e01..fa8259b7df4 100644
--- a/app/assets/javascripts/discourse/lib/to-markdown.js.es6
+++ b/app/assets/javascripts/discourse/lib/to-markdown.js.es6
@@ -2,7 +2,8 @@ import parseHTML from 'discourse/helpers/parse-html';
 
 const trimLeft = text => text.replace(/^\s+/,"");
 const trimRight = text => text.replace(/\s+$/,"");
-const countPipes = text => text.replace(/\\\|/,"").match(/\|/g).length;
+const countPipes = text => (text.replace(/\\\|/,"").match(/\|/g) || []).length;
+const msoListClasses = ["MsoListParagraphCxSpFirst", "MsoListParagraphCxSpMiddle", "MsoListParagraphCxSpLast"];
 
 class Tag {
   constructor(name, prefix = "", suffix = "", inline = false) {
@@ -125,6 +126,14 @@ class Tag {
       decorate(text) {
         const attr = this.element.attributes;
 
+        if (/^mention/.test(attr.class) && "@" === text[0]) {
+          return text;
+        }
+
+        if ("hashtag" === attr.class && "#" === text[0]) {
+          return text;
+        }
+
         if (attr.href && text !== attr.href) {
           text = text.replace(/\n{2,}/g, "\n");
           return "[" + text + "](" + attr.href + ")";
@@ -189,8 +198,14 @@ class Tag {
       toMarkdown() {
         const text = this.element.innerMarkdown().trim();
 
-        if (text.includes("\n")) {
-          throw "Unsupported format inside Markdown table cells";
+        if(text.includes("\n")) {  // Unsupported format inside Markdown table cells
+          let e = this.element;
+          while(e = e.parent) {
+            if (e.name === "table") {
+              e.tag().invalid();
+              break;
+            }
+          }
         }
 
         return this.decorate(text);
@@ -201,7 +216,22 @@ class Tag {
   static li() {
     return class extends Tag.slice("li", "\n") {
       decorate(text) {
-        const indent = this.element.filterParentNames(["ol", "ul"]).slice(1).map(() => "\t").join("");
+        let indent = this.element.filterParentNames(["ol", "ul"]).slice(1).map(() => "\t").join("");
+        const attrs = this.element.attributes;
+
+        if (msoListClasses.includes(attrs.class)) {
+          try {
+            const level = parseInt(attrs.style.match(/level./)[0].replace("level", ""));
+            indent = Array(level).join("\t") + indent;
+          } finally {
+            if (attrs.class === "MsoListParagraphCxSpFirst") {
+              indent = `\n\n${indent}`;
+            } else if (attrs.class === "MsoListParagraphCxSpLast") {
+              text = `${text}\n`;
+            }
+          }
+        }
+
         return super.decorate(`${indent}* ${trimLeft(text)}`);
       }
     };
@@ -242,21 +272,38 @@ class Tag {
 
   static table() {
     return class extends Tag.block("table") {
+      constructor() {
+        super();
+        this.isValid = true;
+      }
+
+      invalid() {
+        this.isValid = false;
+        if (this.element.parentNames.includes("table")) {
+          let e = this.element;
+          while(e = e.parent) {
+            if (e.name === "table") {
+              e.tag().invalid();
+              break;
+            }
+          }
+        }
+      }
+
       decorate(text) {
         text = super.decorate(text).replace(/\|\n{2,}\|/g, "|\n|");
         const rows = text.trim().split("\n");
         const pipeCount = countPipes(rows[0]);
-        const isValid = rows.length > 1 &&
-                        pipeCount > 2 &&
-                        rows.reduce((a, c) => a && countPipes(c) <= pipeCount);
+        this.isValid =  this.isValid && rows.length > 1 && pipeCount > 2 && rows.reduce((a, c) => a && countPipes(c) <= pipeCount);  // Unsupported table format for Markdown conversion
 
-        if (!isValid) {
-          throw "Unsupported table format for Markdown conversion";
+        if (this.isValid) {
+          const splitterRow = [...Array(pipeCount-1)].map(() => "| --- ").join("") + "|\n";
+          text = text.replace("|\n", "|\n" + splitterRow);
+        } else {
+          text = text.replace(/\|/g, " ");
+          this.invalid();
         }
 
-        const splitterRow = [...Array(pipeCount-1)].map(() => "| --- ").join("") + "|\n";
-        text = text.replace("|\n", "|\n" + splitterRow);
-
         return text;
       }
     };
@@ -312,7 +359,7 @@ const tags = [
   ...Tag.emphases().map((e) => Tag.emphasis(e[0], e[1])),
   Tag.cell("td"), Tag.cell("th"),
   Tag.replace("br", "\n"), Tag.replace("hr", "\n---\n"), Tag.replace("head", ""),
-  Tag.keep("ins"), Tag.keep("del"), Tag.keep("small"), Tag.keep("big"),
+  Tag.keep("ins"), Tag.keep("del"), Tag.keep("small"), Tag.keep("big"), Tag.keep("kbd"),
   Tag.li(), Tag.link(), Tag.image(), Tag.code(), Tag.blockquote(), Tag.table(), Tag.tr(), Tag.ol(), Tag.list("ul"),
 ];
 
@@ -333,6 +380,13 @@ class Element {
     this.parentNames = this.parentNames || [];
     this.previous = previous;
     this.next = next;
+
+    if (this.name === "p") {
+      if (msoListClasses.includes(this.attributes.class)) {
+        this.name = "li";
+        this.parentNames.push("ul");
+      }
+    }
   }
 
   tag() {
@@ -410,7 +464,7 @@ class Element {
   }
 }
 
-function trimUnwantedSpaces(html) {
+function trimUnwanted(html) {
   const body = html.match(/<body[^>]*>([\s\S]*?)<\/body>/);
   html = body ? body[1] : html;
   html = html.replace(/\r|\n|&nbsp;/g, " ");
@@ -420,6 +474,8 @@ function trimUnwantedSpaces(html) {
     html = html.replace(match[0], match[0].replace(/>\s{2,}</, "> <"));
   }
 
+  html = html.replace(/<!\[if !?\S*]>[^!]*<!\[endif]>/g, ""); // to support ms word list tags
+
   return html;
 }
 
@@ -438,7 +494,7 @@ function putPlaceholders(html) {
     match = codeRegEx.exec(origHtml);
   }
 
-  const elements = parseHTML(trimUnwantedSpaces(html));
+  const elements = parseHTML(trimUnwanted(html));
   return { elements, placeholders };
 }
 
diff --git a/app/assets/javascripts/discourse/lib/tooltip.js.es6 b/app/assets/javascripts/discourse/lib/tooltip.js.es6
new file mode 100644
index 00000000000..f1df4b3c9e6
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/tooltip.js.es6
@@ -0,0 +1,73 @@
+export function showTooltip() {
+  const fadeSpeed = 300;
+  const tooltipID = "#discourse-tooltip";
+  const $this = $(this);
+  const $parent = $this.offsetParent();
+  const content = $this.attr("data-tooltip");
+  const retina = window.devicePixelRatio && window.devicePixelRatio > 1 ? "class='retina'" : "";
+
+  let pos = $this.offset();
+  const delta = $parent.offset();
+  pos.top -= delta.top;
+  pos.left -= delta.left;
+
+  $(tooltipID).fadeOut(fadeSpeed).remove();
+
+  $(this).after(`
+    <div id="discourse-tooltip" ${retina}>
+      <div class="tooltip-pointer"></div>
+      <div class="tooltip-content">${content}</div>
+    </div>
+  `);
+
+  $(window).on("click.discourse", (event) => {
+    if ($(event.target).closest(tooltipID).length === 0) {
+      $(tooltipID).remove();
+      $(window).off("click.discourse");
+    }
+    return true;
+  });
+
+  const $tooltip = $(tooltipID);
+  $tooltip.css({top: 0, left: 0});
+
+  let left = (pos.left - ($tooltip.width() / 2) + $this.width()/2);
+  if (left < 0) {
+    $tooltip.find(".tooltip-pointer").css({
+      "margin-left": left*2 + "px"
+    });
+    left = 0;
+  }
+
+  // also do a right margin fix
+  const parentWidth = $parent.width();
+  if (left + $tooltip.width() > parentWidth) {
+    let oldLeft = left;
+    left = parentWidth - $tooltip.width();
+
+    $tooltip.find(".tooltip-pointer").css({
+      "margin-left": (oldLeft - left) * 2 + "px"
+    });
+  }
+
+  $tooltip.css({
+    top: pos.top + 5 + "px",
+    left: left + "px"
+  });
+
+  $tooltip.fadeIn(fadeSpeed);
+
+  return false;
+}
+
+export function registerTooltip(jqueryContext) {
+  if (jqueryContext.length) {
+    jqueryContext.on('click', showTooltip);
+  }
+}
+
+export function unregisterTooltip(jqueryContext) {
+  if (jqueryContext.length) {
+    jqueryContext.off('click');
+  }
+}
diff --git a/app/assets/javascripts/discourse/lib/transform-post.js.es6 b/app/assets/javascripts/discourse/lib/transform-post.js.es6
index ac81e64e682..e205dea1d02 100644
--- a/app/assets/javascripts/discourse/lib/transform-post.js.es6
+++ b/app/assets/javascripts/discourse/lib/transform-post.js.es6
@@ -27,7 +27,7 @@ export function transformBasicPost(post) {
     deleted: post.get('deleted'),
     deleted_at: post.deleted_at,
     user_deleted: post.user_deleted,
-    isDeleted: post.deleted_at || post.user_deleted,
+    isDeleted: post.deleted_at || post.user_deleted, // xxxxx
     deletedByAvatarTemplate: null,
     deletedByUsername: null,
     primary_group_name: post.primary_group_name,
@@ -77,6 +77,7 @@ export function transformBasicPost(post) {
     cooked_hidden: !!post.cooked_hidden,
     expandablePost: false,
     replyCount: post.reply_count,
+    locked: post.locked
   };
 
   _additionalAttributes.forEach(a => postAtts[a] = post[a]);
@@ -137,10 +138,12 @@ export default function transformPost(currentUser, site, post, prevPost, nextPos
     postAtts.topicCreatedAt = topic.created_at;
     postAtts.createdByUsername = createdBy.username;
     postAtts.createdByAvatarTemplate = createdBy.avatar_template;
+    postAtts.createdByName = createdBy.name;
 
     postAtts.lastPostUrl = topic.get('lastPostUrl');
     postAtts.lastPostUsername = details.last_poster.username;
     postAtts.lastPostAvatarTemplate = details.last_poster.avatar_template;
+    postAtts.lastPostName = details.last_poster.name;
     postAtts.lastPostAt = topic.last_posted_at;
 
     postAtts.topicReplyCount = topic.get('replyCount');
@@ -212,7 +215,8 @@ export default function transformPost(currentUser, site, post, prevPost, nextPos
     postAtts.expandablePost = topic.expandable_first_post;
   } else {
     postAtts.canRecover = postAtts.isDeleted && postAtts.canRecover;
-    postAtts.canDelete = !postAtts.isDeleted && postAtts.canDelete;
+    postAtts.canDelete = postAtts.canDelete && !post.deleted_at &&
+      currentUser && (currentUser.staff || !post.user_deleted);
   }
 
   _additionalAttributes.forEach(a => postAtts[a] = post[a]);
diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6
index 2fe1b79a8bc..16acbbf2655 100644
--- a/app/assets/javascripts/discourse/lib/url.js.es6
+++ b/app/assets/javascripts/discourse/lib/url.js.es6
@@ -5,6 +5,11 @@ import { defaultHomepage } from 'discourse/lib/utilities';
 const rewrites = [];
 const TOPIC_REGEXP = /\/t\/([^\/]+)\/(\d+)\/?(\d+)?/;
 
+function redirectTo(url) {
+  document.location = url;
+  return true;
+}
+
 // We can add links here that have server side responses but not client side.
 const SERVER_SIDE_ONLY = [
   /^\/assets\//,
@@ -17,6 +22,7 @@ const SERVER_SIDE_ONLY = [
   /^\/wizard/,
   /\.rss$/,
   /\.json$/,
+  /^\/admin\/upgrade$/
 ];
 
 export function rewritePath(path) {
@@ -75,6 +81,7 @@ const DiscourseURL = Ember.Object.extend({
     const holderId = `#post_${postNumber}`;
 
     _transitioning = postNumber > 1;
+
     Ember.run.schedule('afterRender', () => {
       let elementId;
       let holder;
@@ -101,7 +108,7 @@ const DiscourseURL = Ember.Object.extend({
         }
       });
 
-      if (holder.length > 0 && opts && opts.skipIfOnScreen){
+      if (holder.length > 0 && opts && opts.skipIfOnScreen) {
         const elementTop = lockon.elementTop();
         const scrollTop = $(window).scrollTop();
         const windowHeight = $(window).height() - offsetCalculator();
@@ -162,15 +169,23 @@ const DiscourseURL = Ember.Object.extend({
     if (Em.isEmpty(path)) { return; }
 
     if (Discourse.get('requiresRefresh')) {
-      document.location.href = Discourse.getURL(path);
-      return;
+      return redirectTo(Discourse.getURL(path));
     }
 
     const pathname = path.replace(/(https?\:)?\/\/[^\/]+/, '');
+    const baseUri = Discourse.BaseUri;
+
+    // If we have a baseUri and an absolute URL, make sure the baseUri
+    // is the same. Otherwise we could be switching forums.
+    if (baseUri &&
+      path.indexOf('http') === 0 &&
+      pathname.indexOf(baseUri) !== 0) {
+      return redirectTo(path);
+    }
+
     const serverSide = SERVER_SIDE_ONLY.some(r => {
       if (pathname.match(r)) {
-        document.location = path;
-        return true;
+        return redirectTo(path);
       }
     });
 
@@ -178,8 +193,7 @@ const DiscourseURL = Ember.Object.extend({
 
     // Protocol relative URLs
     if (path.indexOf('//') === 0) {
-      document.location = path;
-      return;
+      return redirectTo(path);
     }
 
     // Scroll to the same page, different anchor
@@ -193,29 +207,29 @@ const DiscourseURL = Ember.Object.extend({
     path = path.replace(/(https?\:)?\/\/[^\/]+/, '');
 
     // Rewrite /my/* urls
-    if (path.indexOf(Discourse.BaseUri + '/my/') === 0) {
+    let myPath = `${baseUri}/my/`;
+    if (path.indexOf(myPath) === 0) {
       const currentUser = Discourse.User.current();
       if (currentUser) {
-        path = path.replace(Discourse.BaseUri + '/my/', userPath(currentUser.get('username_lower') + "/"));
+        path = path.replace(myPath, userPath(currentUser.get('username_lower') + "/"));
       } else {
-        document.location.href = "/404";
-        return;
+        return redirectTo('/404');
       }
     }
 
     // handle prefixes
-    if (path.match(/^\//)) {
-      let rootURL = (Discourse.BaseUri === undefined ? "/" : Discourse.BaseUri);
-      rootURL = rootURL.replace(/\/$/, '');
-      path = path.replace(rootURL, '');
+    if (path.indexOf("/") === 0) {
+      const rootURL = (baseUri === undefined ? "/" : baseUri).replace(/\/$/, "");
+      path = path.replace(rootURL, "");
     }
 
     path = rewritePath(path);
+
     if (this.navigatedToPost(oldPath, path, opts)) { return; }
 
     if (oldPath === path) {
-      // If navigating to the same path send an app event. Views can watch it
-      // and tell their controllers to refresh
+      // If navigating to the same path send an app event.
+      // Views can watch it and tell their controllers to refresh
       this.appEvents.trigger('url:refresh');
     }
 
diff --git a/app/assets/javascripts/discourse/lib/user-search.js.es6 b/app/assets/javascripts/discourse/lib/user-search.js.es6
index 29ad228a050..84edc4e4d62 100644
--- a/app/assets/javascripts/discourse/lib/user-search.js.es6
+++ b/app/assets/javascripts/discourse/lib/user-search.js.es6
@@ -1,5 +1,6 @@
 import { CANCELLED_STATUS } from 'discourse/lib/autocomplete';
 import { userPath } from 'discourse/lib/url';
+import { emailValid } from 'discourse/lib/utilities';
 
 var cache = {},
     cacheTopicId,
@@ -61,7 +62,7 @@ function organizeResults(r, options) {
     });
   }
 
-  if (options.term.match(/@/)) {
+  if (!options.disallowEmails && emailValid(options.term)) {
     let e = { username: options.term };
     emails = [ e ];
     results.push(e);
@@ -69,10 +70,11 @@ function organizeResults(r, options) {
 
   if (r.groups) {
     r.groups.every(function(g) {
-      if (results.length > limit && options.term.toLowerCase() !== g.name.toLowerCase()) return false;
-      if (exclude.indexOf(g.name) === -1) {
-        groups.push(g);
-        results.push(g);
+      if (options.term.toLowerCase() === g.name.toLowerCase() || results.length < limit) {
+        if (exclude.indexOf(g.name) === -1) {
+          groups.push(g);
+          results.push(g);
+        }
       }
       return true;
     });
diff --git a/app/assets/javascripts/discourse/lib/utilities.js.es6 b/app/assets/javascripts/discourse/lib/utilities.js.es6
index 33558befacb..91a48e0de6e 100644
--- a/app/assets/javascripts/discourse/lib/utilities.js.es6
+++ b/app/assets/javascripts/discourse/lib/utilities.js.es6
@@ -1,4 +1,5 @@
 import { escape } from 'pretty-text/sanitizer';
+import toMarkdown from 'discourse/lib/to-markdown';
 
 const homepageSelector = 'meta[name=discourse_current_homepage]';
 
@@ -113,12 +114,8 @@ export function selectedText() {
   $div.find(".clicks").remove();
   // replace emojis
   $div.find("img.emoji").replaceWith(function() { return this.title; });
-  // replace br with newlines
-  $div.find("br").replaceWith(() => "\n");
-  // enforce newline at the end of paragraphs
-  $div.find("p").append(() => "\n");
 
-  return String($div.text()).trim().replace(/(^\s*\n)+/gm, "\n");
+  return toMarkdown($div.html());
 }
 
 // Determine the row and col of the caret in an element
@@ -193,6 +190,8 @@ export function validateUploadedFiles(files, opts) {
 }
 
 export function validateUploadedFile(file, opts) {
+  if (!authorizesOneOrMoreExtensions()) return false;
+
   opts = opts || {};
 
   const name = file && file.name;
@@ -201,7 +200,7 @@ export function validateUploadedFile(file, opts) {
 
   // check that the uploaded file is authorized
   if (opts.allowStaffToUploadAnyFileInPm && opts.isPrivateMessage) {
-    if (Discourse.User.current("staff")) {
+    if (Discourse.User.currentProp('staff')) {
       return true;
     }
   }
@@ -237,16 +236,28 @@ export function validateUploadedFile(file, opts) {
 
 const IMAGES_EXTENSIONS_REGEX = /(png|jpe?g|gif|bmp|tiff?|svg|webp|ico)/i;
 
+function extensionsToArray(exts) {
+  return exts.toLowerCase()
+             .replace(/[\s\.]+/g, "")
+             .split("|")
+             .filter(ext => ext.indexOf("*") === -1);
+}
+
 function extensions() {
-  return Discourse.SiteSettings.authorized_extensions
-                               .toLowerCase()
-                               .replace(/[\s\.]+/g, "")
-                               .split("|")
-                               .filter(ext => ext.indexOf("*") === -1);
+  return extensionsToArray(Discourse.SiteSettings.authorized_extensions);
+}
+
+function staffExtensions() {
+  return extensionsToArray(Discourse.SiteSettings.authorized_extensions_for_staff);
 }
 
 function imagesExtensions() {
-  return extensions().filter(ext => IMAGES_EXTENSIONS_REGEX.test(ext));
+  let exts =  extensions().filter(ext => IMAGES_EXTENSIONS_REGEX.test(ext));
+  if (Discourse.User.currentProp('staff')) {
+    const staffExts = staffExtensions().filter(ext => IMAGES_EXTENSIONS_REGEX.test(ext));
+    exts = _.union(exts, staffExts);
+  }
+  return exts;
 }
 
 function extensionsRegex() {
@@ -257,7 +268,14 @@ function imagesExtensionsRegex() {
   return new RegExp("\\.(" + imagesExtensions().join("|") + ")$", "i");
 }
 
+function staffExtensionsRegex() {
+  return new RegExp("\\.(" + staffExtensions().join("|") + ")$", "i");
+}
+
 function isAuthorizedFile(fileName) {
+  if (Discourse.User.currentProp('staff') && staffExtensionsRegex().test(fileName)) {
+    return true;
+  }
   return extensionsRegex().test(fileName);
 }
 
@@ -266,7 +284,8 @@ function isAuthorizedImage(fileName){
 }
 
 export function authorizedExtensions() {
-  return authorizesAllExtensions() ? "*" : extensions().join(", ");
+  const exts = Discourse.User.currentProp('staff') ? [...extensions(), ...staffExtensions()] : extensions();
+  return exts.filter(ext => ext.length > 0).join(", ");
 }
 
 export function authorizedImagesExtensions() {
@@ -274,7 +293,24 @@ export function authorizedImagesExtensions() {
 }
 
 export function authorizesAllExtensions() {
-  return Discourse.SiteSettings.authorized_extensions.indexOf("*") >= 0;
+  return Discourse.SiteSettings.authorized_extensions.indexOf("*") >= 0 || (
+         Discourse.SiteSettings.authorized_extensions_for_staff.indexOf("*") >= 0 &&
+         Discourse.User.currentProp('staff'));
+}
+
+export function authorizesOneOrMoreExtensions() {
+  if (authorizesAllExtensions()) return true;
+
+  return Discourse.SiteSettings.authorized_extensions
+          .split("|")
+          .filter(ext => ext)
+          .length > 0;
+}
+
+export function authorizesOneOrMoreImageExtensions() {
+  if (authorizesAllExtensions()) return true;
+
+  return imagesExtensions().length > 0;
 }
 
 export function isAnImage(path) {
@@ -291,13 +327,13 @@ function isGUID(value) {
 
 function imageNameFromFileName(fileName) {
   const split = fileName.split('.');
-  const name = split[split.length-2];
+  let name = split[split.length - 2];
 
   if (exports.isAppleDevice() && isGUID(name)) {
-    return I18n.t('upload_selector.default_image_alt_text');
+    name = I18n.t('upload_selector.default_image_alt_text');
   }
 
-  return name;
+  return encodeURIComponent(name);
 }
 
 export function allowsImages() {
@@ -305,7 +341,7 @@ export function allowsImages() {
 }
 
 export function allowsAttachments() {
-  return authorizesAllExtensions() || extensions().length > imagesExtensions().length;
+  return authorizesAllExtensions() || authorizedExtensions().split(", ").length > imagesExtensions().length;
 }
 
 export function uploadLocation(url) {
@@ -352,7 +388,7 @@ export function displayErrorForUpload(data) {
         if (data.jqXHR.responseJSON.message) {
           bootbox.alert(data.jqXHR.responseJSON.message);
         } else {
-          bootbox.alert(data.jqXHR.responseJSON.join("\n"));
+          bootbox.alert(data.jqXHR.responseJSON.errors.join("\n"));
         }
         return;
     }
@@ -450,5 +486,25 @@ export function clipboardData(e, canUpload) {
   return { clipboard, types, canUpload, canPasteHtml };
 }
 
+export function fillMissingDates(data, startDate, endDate) {
+  const startMoment = moment(startDate, "YYYY-MM-DD");
+  const endMoment = moment(endDate, "YYYY-MM-DD");
+  const countDays = endMoment.diff(startMoment, 'days');
+  let currentMoment = startMoment;
+
+  for (let i = 0; i <= countDays; i++) {
+    let date = (data[i]) ? moment(data[i].x, "YYYY-MM-DD") : null;
+    if (i === 0 && (!date || date.isAfter(startMoment))) {
+      data.splice(i, 0, { "x" : startMoment.format("YYYY-MM-DD"), 'y': 0 });
+    } else {
+      if (!date || date.isAfter(moment(currentMoment))) {
+        data.splice(i, 0, { "x" : currentMoment, 'y': 0 });
+      }
+    }
+    currentMoment = moment(currentMoment).add(1, "day").format("YYYY-MM-DD");
+  }
+  return data;
+}
+
 // This prevents a mini racer crash
 export default {};
diff --git a/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6 b/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
index dc802c4d047..8e15c955c26 100644
--- a/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
+++ b/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
@@ -1,9 +1,9 @@
 import { propertyEqual, setting } from 'discourse/lib/computed';
 
 export default Ember.Mixin.create({
-  isOwnEmail: propertyEqual("model.id", "currentUser.id"),
+  isCurrentUser: propertyEqual("model.id", "currentUser.id"),
   showEmailOnProfile: setting("show_email_on_profile"),
   canStaffCheckEmails: Em.computed.and("showEmailOnProfile", "currentUser.staff"),
   canAdminCheckEmails: Em.computed.alias("currentUser.admin"),
-  canCheckEmails: Em.computed.or("isOwnEmail", "canStaffCheckEmails", "canAdminCheckEmails"),
+  canCheckEmails: Em.computed.or("isCurrentUser", "canStaffCheckEmails", "canAdminCheckEmails"),
 });
diff --git a/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6 b/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
new file mode 100644
index 00000000000..0ff1193368a
--- /dev/null
+++ b/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
@@ -0,0 +1,198 @@
+import { wantsNewWindow } from 'discourse/lib/intercept-click';
+import afterTransition from 'discourse/lib/after-transition';
+import DiscourseURL from 'discourse/lib/url';
+
+export default Ember.Mixin.create({
+  elementId: null, //click detection added for data-{elementId}
+  triggeringLinkClass: null, //the <a> classname where this card should appear
+  _showCallback: null, //username, $target - load up data for when show is called, should call this._positionCard($target) when it's done.
+
+  postStream: Ember.computed.alias('topic.postStream'),
+  viewingTopic: Ember.computed.match('currentPath', /^topic\./),
+
+  visible: false,
+  username: null,
+  loading: null,
+  cardTarget: null,
+  post: null,
+  isFixed: false,
+
+  _show(username, $target) {
+    // No user card for anon
+    if (this.siteSettings.hide_user_profiles_from_public && !this.currentUser) {
+      return false;
+    }
+
+    username = Ember.Handlebars.Utils.escapeExpression(username.toString());
+
+    // Don't show on mobile
+    if (this.site.mobileView) {
+      DiscourseURL.routeTo($target.attr("href"));
+      return false;
+    }
+
+    const currentUsername = this.get('username');
+    if (username === currentUsername && this.get('loading') === username) {
+      return;
+    }
+
+    const postId = $target.parents('article').data('post-id');
+    const wasVisible = this.get('visible');
+    const previousTarget = this.get('cardTarget');
+    const target = $target[0];
+
+    if (wasVisible) {
+      this._close();
+      if (target === previousTarget) { return; }
+    }
+
+    const post = this.get('viewingTopic') && postId ? this.get('postStream').findLoadedPost(postId) : null;
+    this.setProperties({ username, loading: username, cardTarget: target, post });
+
+    this._showCallback(username, $target);
+
+    return false;
+  },
+
+  didInsertElement() {
+    this._super();
+    afterTransition(this.$(), this._hide.bind(this));
+    const id = this.get('elementId');
+    const triggeringLinkClass = this.get('triggeringLinkClass');
+    const clickOutsideEventName = `mousedown.outside-${id}`;
+    const clickDataExpand = `click.discourse-${id}`;
+    const clickMention = `click.discourse-${id}-${triggeringLinkClass}`;
+    const previewClickEvent = `click.discourse-preview-${id}-${triggeringLinkClass}`;
+
+    this.setProperties({ clickOutsideEventName, clickDataExpand, clickMention, previewClickEvent });
+
+    $('html').off(clickOutsideEventName)
+      .on(clickOutsideEventName, (e) => {
+        if (this.get('visible')) {
+          const $target = $(e.target);
+          if ($target.closest(`[data-${id}]`).data(id) ||
+              $target.closest(`a.${triggeringLinkClass}`).length > 0 ||
+              $target.closest(`#${id}`).length > 0) {
+            return;
+          }
+
+          this._close();
+        }
+
+        return true;
+      });
+
+    $('#main-outlet').on(clickDataExpand, `[data-${id}]`, (e) => {
+      if (wantsNewWindow(e)) { return; }
+      const $target = $(e.currentTarget);
+      return this._show($target.data(id), $target);
+    });
+
+    $('#main-outlet').on(clickMention, `a.${triggeringLinkClass}`, (e) => {
+      if (wantsNewWindow(e)) { return; }
+      const $target = $(e.target);
+      return this._show($target.text().replace(/^@/, ''), $target);
+    });
+
+    this.appEvents.on(previewClickEvent, $target => {
+      this.set('isFixed', true);
+      return this._show($target.text().replace(/^@/, ''), $target);
+    });
+  },
+
+  _positionCard(target) {
+    const rtl = ($('html').css('direction')) === 'rtl';
+    if (!target) { return; }
+    const width = this.$().width();
+    const height = 175;
+    const isFixed = this.get('isFixed');
+
+    let verticalAdjustments = 0;
+
+    Ember.run.schedule('afterRender', () => {
+      if (target) {
+        let position = target.offset();
+        if (position) {
+          position.bottom = 'unset';
+
+          if (rtl) { // The site direction is rtl
+            position.right = $(window).width() - position.left + 10;
+            position.left = 'auto';
+            let overage = ($(window).width() - 50) - (position.right + width);
+            if (overage < 0) {
+              position.right += overage;
+              position.top += target.height() + 48;
+              verticalAdjustments += target.height() + 48;
+            }
+          } else { // The site direction is ltr
+            position.left += target.width() + 10;
+
+            let overage = ($(window).width() - 50) - (position.left + width);
+            if (overage < 0) {
+              position.left += overage;
+              position.top += target.height() + 48;
+              verticalAdjustments += target.height() + 48;
+            }
+          }
+
+          position.top -= $('#main-outlet').offset().top;
+          if(isFixed) {
+            position.top -= $('html').scrollTop();
+            //if content is fixed and will be cut off on the bottom, display it above...
+            if(position.top + height + verticalAdjustments > $(window).height() - 50) {
+              position.bottom = $(window).height() - (target.offset().top - $('html').scrollTop());
+              if(verticalAdjustments > 0) {
+                position.bottom += 48;
+              }
+              position.top = 'unset';
+            }
+          }
+          this.$().css(position);
+        }
+
+        // After the card is shown, focus on the first link
+        //
+        // note: we DO NOT use afterRender here cause _positionCard may
+        // run afterwards, if we allowed this to happen the usercard
+        // may be offscreen and we may scroll all the way to it on focus
+        Ember.run.next(null, () => this.$('a:first').focus() );
+      }
+    });
+  },
+
+  _hide() {
+    if (!this.get('visible')) {
+      this.$().css({left: -9999, top: -9999});
+    }
+  },
+
+  _close() {
+    this.setProperties({
+      visible: false,
+      username: null,
+      loading: null,
+      cardTarget: null,
+      post: null,
+      isFixed: false
+    });
+  },
+
+  willDestroyElement() {
+    this._super();
+    const clickOutsideEventName = this.get('clickOutsideEventName');
+    const clickDataExpand = this.get('clickDataExpand');
+    const clickMention = this.get('clickMention');
+    const previewClickEvent = this.get('previewClickEvent');
+    $('html').off(clickOutsideEventName);
+    $('#main').off(clickDataExpand).off(clickMention);
+    this.appEvents.off(previewClickEvent);
+  },
+
+  keyUp(e) {
+    if (e.keyCode === 27) { // ESC
+      const target = this.get('cardTarget');
+      this._close();
+      target.focus();
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6 b/app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6
new file mode 100644
index 00000000000..6000f041917
--- /dev/null
+++ b/app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6
@@ -0,0 +1,38 @@
+import computed from "ember-addons/ember-computed-decorators";
+import UserBadge from 'discourse/models/user-badge';
+
+export default Ember.Mixin.create({
+  @computed('allBadges.[]', 'userBadges.[]')
+  grantableBadges(allBadges, userBadges) {
+    const granted = userBadges.reduce((map, badge) => {
+      map[badge.get('badge_id')] = true;
+      return map;
+    }, {});
+
+    return allBadges
+      .filter(badge => {
+        return badge.get('enabled')
+          && badge.get('manually_grantable')
+          && (!granted[badge.get('id')] || badge.get('multiple_grant'));
+      })
+      .sort((a, b) => a.get('name').localeCompare(b.get('name')));
+  },
+
+  noGrantableBadges: Ember.computed.empty('grantableBadges'),
+
+  @computed('selectedBadgeId', 'grantableBadges')
+  selectedBadgeGrantable(selectedBadgeId, grantableBadges) {
+    return grantableBadges && grantableBadges.find(badge => badge.get('id') === selectedBadgeId);
+  },
+
+  grantBadge(selectedBadgeId, username, badgeReason) {
+    return UserBadge.grant(selectedBadgeId, username, badgeReason)
+      .then(newBadge => {
+        this.get('userBadges').pushObject(newBadge);
+        return newBadge;
+      }, error => {
+        throw error;
+      });
+  }
+});
+
diff --git a/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6 b/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6
index d78478dae63..b34b906bdcd 100644
--- a/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6
+++ b/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6
@@ -5,6 +5,10 @@ export default Ember.Mixin.create({
     this.appEvents.trigger('modal-body:flash', { text, messageClass });
   },
 
+  clearFlash() {
+    this.appEvents.trigger('modal-body:clearFlash');
+  },
+
   showModal(...args) {
     return showModal(...args);
   },
diff --git a/app/assets/javascripts/discourse/mixins/open-composer.js.es6 b/app/assets/javascripts/discourse/mixins/open-composer.js.es6
index 2303281b63b..dcb92d14786 100644
--- a/app/assets/javascripts/discourse/mixins/open-composer.js.es6
+++ b/app/assets/javascripts/discourse/mixins/open-composer.js.es6
@@ -7,8 +7,8 @@ export default Ember.Mixin.create({
     this.controllerFor('composer').open({
       categoryId: controller.get('category.id'),
       action: Composer.CREATE_TOPIC,
-      draftKey: controller.get('model.draft_key'),
-      draftSequence: controller.get('model.draft_sequence')
+      draftKey: controller.get('model.draft_key') || Composer.CREATE_TOPIC,
+      draftSequence: controller.get('model.draft_sequence') || 0
     });
   },
 
diff --git a/app/assets/javascripts/discourse/models/category-list.js.es6 b/app/assets/javascripts/discourse/models/category-list.js.es6
index 987e5020530..9511c49c589 100644
--- a/app/assets/javascripts/discourse/models/category-list.js.es6
+++ b/app/assets/javascripts/discourse/models/category-list.js.es6
@@ -37,7 +37,6 @@ CategoryList.reopenClass({
         c.topics = c.topics.map(t => Discourse.Topic.create(t));
       }
 
-
       switch(statPeriod) {
         case "week":
         case "month":
diff --git a/app/assets/javascripts/discourse/models/category.js.es6 b/app/assets/javascripts/discourse/models/category.js.es6
index 52c3eb443c7..e30a2ba7dd2 100644
--- a/app/assets/javascripts/discourse/models/category.js.es6
+++ b/app/assets/javascripts/discourse/models/category.js.es6
@@ -97,7 +97,7 @@ const Category = RestModel.extend({
         allow_badges: this.get('allow_badges'),
         custom_fields: this.get('custom_fields'),
         topic_template: this.get('topic_template'),
-        suppress_from_homepage: this.get('suppress_from_homepage'),
+        suppress_from_latest: this.get('suppress_from_latest'),
         all_topics_wiki: this.get('all_topics_wiki'),
         allowed_tags: this.get('allowed_tags'),
         allowed_tag_groups: this.get('allowed_tag_groups'),
@@ -108,7 +108,8 @@ const Category = RestModel.extend({
         num_featured_topics: this.get('num_featured_topics'),
         default_view: this.get('default_view'),
         subcategory_list_style: this.get('subcategory_list_style'),
-        default_top_period: this.get('default_top_period')
+        default_top_period: this.get('default_top_period'),
+        minimum_required_tags: this.get('minimum_required_tags')
       },
       type: id ? 'PUT' : 'POST'
     });
diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6
index 4cdc2bd4c43..cefd6df7ddf 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -1,4 +1,3 @@
-import { iconHTML } from 'discourse-common/lib/icon-library';
 import RestModel from 'discourse/models/rest';
 import Topic from 'discourse/models/topic';
 import { throwAjaxError } from 'discourse/lib/ajax-error';
@@ -6,51 +5,70 @@ import Quote from 'discourse/lib/quote';
 import Draft from 'discourse/models/draft';
 import computed from 'ember-addons/ember-computed-decorators';
 import { escapeExpression, tinyAvatar } from 'discourse/lib/utilities';
-import { emojiUnescape } from 'discourse/lib/text';
+
+// The actions the composer can take
+export const
+  CREATE_TOPIC = 'createTopic',
+  CREATE_SHARED_DRAFT = 'createSharedDraft',
+  EDIT_SHARED_DRAFT = 'editSharedDraft',
+  PRIVATE_MESSAGE = 'privateMessage',
+  NEW_PRIVATE_MESSAGE_KEY = 'new_private_message',
+  REPLY = 'reply',
+  EDIT = 'edit',
+  REPLY_AS_NEW_TOPIC_KEY = "reply_as_new_topic",
+  REPLY_AS_NEW_PRIVATE_MESSAGE_KEY = "reply_as_new_private_message";
+
+function isEdit(action) {
+  return action === EDIT || action === EDIT_SHARED_DRAFT;
+}
 
 const CLOSED = 'closed',
-      SAVING = 'saving',
-      OPEN = 'open',
-      DRAFT = 'draft',
+  SAVING = 'saving',
+  OPEN = 'open',
+  DRAFT = 'draft',
 
-      // The actions the composer can take
-      CREATE_TOPIC = 'createTopic',
-      PRIVATE_MESSAGE = 'privateMessage',
-      NEW_PRIVATE_MESSAGE_KEY = 'new_private_message',
-      REPLY = 'reply',
-      EDIT = 'edit',
-      REPLY_AS_NEW_TOPIC_KEY = "reply_as_new_topic",
-      REPLY_AS_NEW_PRIVATE_MESSAGE_KEY = "reply_as_new_private_message",
+  // When creating, these fields are moved into the post model from the composer model
+  _create_serializer = {
+    raw: 'reply',
+    title: 'title',
+    unlist_topic: 'unlistTopic',
+    category: 'categoryId',
+    topic_id: 'topic.id',
+    is_warning: 'isWarning',
+    whisper: 'whisper',
+    archetype: 'archetypeId',
+    target_usernames: 'targetUsernames',
+    typing_duration_msecs: 'typingTime',
+    composer_open_duration_msecs: 'composerTime',
+    tags: 'tags',
+    featured_link: 'featuredLink',
+    shared_draft: 'sharedDraft'
+  },
 
-      // When creating, these fields are moved into the post model from the composer model
-      _create_serializer = {
-        raw: 'reply',
-        title: 'title',
-        unlist_topic: 'unlistTopic',
-        category: 'categoryId',
-        topic_id: 'topic.id',
-        is_warning: 'isWarning',
-        whisper: 'whisper',
-        archetype: 'archetypeId',
-        target_usernames: 'targetUsernames',
-        typing_duration_msecs: 'typingTime',
-        composer_open_duration_msecs: 'composerTime',
-        tags: 'tags',
-        featured_link: 'featuredLink'
-      },
+  _edit_topic_serializer = {
+    title: 'topic.title',
+    categoryId: 'topic.category.id',
+    tags: 'topic.tags',
+    featuredLink: 'topic.featured_link'
+  };
 
-      _edit_topic_serializer = {
-        title: 'topic.title',
-        categoryId: 'topic.category.id',
-        tags: 'topic.tags',
-        featuredLink: 'topic.featured_link'
-      };
+const SAVE_LABELS = {
+  [EDIT]: 'composer.save_edit',
+  [REPLY]: 'composer.reply',
+  [CREATE_TOPIC]: 'composer.create_topic',
+  [PRIVATE_MESSAGE]: 'composer.create_pm',
+  [CREATE_SHARED_DRAFT]: 'composer.create_shared_draft',
+  [EDIT_SHARED_DRAFT]: 'composer.save_edit'
+};
 
-const _saveLabels = {};
-_saveLabels[EDIT] = 'composer.save_edit';
-_saveLabels[REPLY] = 'composer.reply';
-_saveLabels[CREATE_TOPIC] = 'composer.create_topic';
-_saveLabels[PRIVATE_MESSAGE] = 'composer.create_pm';
+const SAVE_ICONS = {
+  [EDIT]: 'pencil',
+  [EDIT_SHARED_DRAFT]: 'clipboard',
+  [REPLY]: 'reply',
+  [CREATE_TOPIC]: 'plus',
+  [PRIVATE_MESSAGE]: 'envelope',
+  [CREATE_SHARED_DRAFT]: 'clipboard'
+};
 
 const Composer = RestModel.extend({
   _categoryId: null,
@@ -60,6 +78,8 @@ const Composer = RestModel.extend({
     return this.site.get('archetypes');
   }.property(),
 
+  @computed('action')
+  sharedDraft: action => action === CREATE_SHARED_DRAFT,
 
   @computed
   categoryId: {
@@ -85,7 +105,13 @@ const Composer = RestModel.extend({
     return categoryId ? this.site.categories.findBy('id', categoryId) : null;
   },
 
+  @computed('category')
+  minimumRequiredTags(category) {
+    return (category && category.get('minimum_required_tags') > 0) ? category.get('minimum_required_tags') : null;
+  },
+
   creatingTopic: Em.computed.equal('action', CREATE_TOPIC),
+  creatingSharedDraft: Em.computed.equal('action', CREATE_SHARED_DRAFT),
   creatingPrivateMessage: Em.computed.equal('action', PRIVATE_MESSAGE),
   notCreatingPrivateMessage: Em.computed.not('creatingPrivateMessage'),
 
@@ -102,13 +128,14 @@ const Composer = RestModel.extend({
 
   topicFirstPost: Em.computed.or('creatingTopic', 'editingFirstPost'),
 
-  editingPost: Em.computed.equal('action', EDIT),
+  @computed('action')
+  editingPost: isEdit,
+
   replyingToTopic: Em.computed.equal('action', REPLY),
 
   viewOpen: Em.computed.equal('composeState', OPEN),
   viewDraft: Em.computed.equal('composeState', DRAFT),
 
-
   composeStateChanged: function() {
     var oldOpen = this.get('composerOpened');
 
@@ -149,7 +176,14 @@ const Composer = RestModel.extend({
   }, 100, {leading: false, trailing: true}),
 
   editingFirstPost: Em.computed.and('editingPost', 'post.firstPost'),
-  canEditTitle: Em.computed.or('creatingTopic', 'creatingPrivateMessage', 'editingFirstPost'),
+
+  canEditTitle: Em.computed.or(
+    'creatingTopic',
+    'creatingPrivateMessage',
+    'editingFirstPost',
+    'creatingSharedDraft'
+  ),
+
   canCategorize: Em.computed.and('canEditTitle', 'notCreatingPrivateMessage'),
 
   @computed('canEditTitle', 'creatingPrivateMessage', 'categoryId')
@@ -167,78 +201,98 @@ const Composer = RestModel.extend({
     return this.get('canEditTopicFeaturedLink') ? 'composer.title_or_link_placeholder' : 'composer.title_placeholder';
   },
 
-  // Determine the appropriate title for this action
-  actionTitle: function() {
-    const topic = this.get('topic');
+  @computed("action", "post", "topic", "topic.title")
+  replyOptions(action, post, topic, topicTitle) {
+    let options = {
+      userLink: null,
+      topicLink: null,
+      postLink: null,
+      userAvatar: null,
+      originalUser: null
+    };
 
-    let postLink, topicLink, usernameLink;
     if (topic) {
-      const postNumber = this.get('post.post_number');
-      postLink = "<a href='" + (topic.get('url')) + "/" + postNumber + "'>" +
-        I18n.t("post.post_number", { number: postNumber }) + "</a>";
-
-      let title = topic.get('fancy_title') || escapeExpression(topic.get('title'));
-
-      topicLink = "<a href='" + (topic.get('url')) + "'> " + title + "</a>";
-      usernameLink = "<a href='" + (topic.get('url')) + "/" + postNumber + "'>" + this.get('post.username') + "</a>";
+      options.topicLink = {
+        href: topic.get("url"),
+        anchor: topic.get("fancy_title") || escapeExpression(topicTitle)
+      };
     }
 
-    let postDescription;
-    const post = this.get('post');
-
     if (post) {
-      postDescription = I18n.t('post.' +  this.get('action'), {
-        link: postLink,
-        replyAvatar: tinyAvatar(post.get('avatar_template')),
-        username: this.get('post.username'),
-        usernameLink
-      });
+      options.label =  I18n.t(`post.${action}`);
+      options.userAvatar = tinyAvatar(post.get("avatar_template"));
 
       if (!this.site.mobileView) {
-        const replyUsername = post.get('reply_to_user.username');
-        const replyAvatarTemplate = post.get('reply_to_user.avatar_template');
-        if (replyUsername && replyAvatarTemplate && this.get('action') === EDIT) {
-          postDescription += ` ${iconHTML('mail-forward', { class: 'reply-to-glyph' })} ` + tinyAvatar(replyAvatarTemplate) + " " + replyUsername;
+        const originalUserName = post.get('reply_to_user.username');
+        const originalUserAvatar = post.get('reply_to_user.avatar_template');
+        if (originalUserName && originalUserAvatar && isEdit(action)) {
+          options.originalUser = {
+            username: originalUserName,
+            avatar: tinyAvatar(originalUserAvatar)
+          };
         }
       }
     }
 
-    switch (this.get('action')) {
-      case PRIVATE_MESSAGE: return I18n.t('topic.private_message');
-      case CREATE_TOPIC: return I18n.t('topic.create_long');
-      case REPLY:
-      case EDIT:
-        if (postDescription) return postDescription;
-        if (topic) return emojiUnescape(I18n.t('post.reply_topic', { link: topicLink }));
+    if (topic && post) {
+      const postNumber = post.get("post_number");
+
+      options.postLink = {
+        href: `${topic.get("url")}/${postNumber}`,
+        anchor: I18n.t("post.post_number", { number: postNumber })
+      };
+
+      options.userLink = {
+        href: `${topic.get("url")}/${postNumber}`,
+        anchor: post.get("username")
+      };
     }
 
-  }.property('action', 'post', 'topic', 'topic.title'),
+    return options;
+  },
 
-  // whether to disable the post button
-  cantSubmitPost: function() {
+  @computed
+  isStaffUser() {
+    const currentUser = Discourse.User.current();
+    return currentUser && currentUser.get('staff');
+  },
+
+  @computed('loading', 'canEditTitle', 'titleLength', 'targetUsernames', 'replyLength', 'categoryId', 'missingReplyCharacters', 'tags', 'topicFirstPost', 'minimumRequiredTags', 'isStaffUser')
+  cantSubmitPost(loading, canEditTitle, titleLength, targetUsernames, replyLength, categoryId, missingReplyCharacters, tags, topicFirstPost, minimumRequiredTags, isStaffUser) {
 
     // can't submit while loading
-    if (this.get('loading')) return true;
+    if (loading) return true;
 
     // title is required when
     //  - creating a new topic/private message
     //  - editing the 1st post
-    if (this.get('canEditTitle') && !this.get('titleLengthValid')) return true;
+    if (canEditTitle && !this.get('titleLengthValid')) return true;
 
     // reply is always required
-    if (this.get('missingReplyCharacters') > 0) return true;
+    if (missingReplyCharacters > 0) return true;
+
+    if (this.site.get('can_tag_topics') && !isStaffUser && topicFirstPost && minimumRequiredTags) {
+      const tagsArray = tags || [];
+      if (tagsArray.length < minimumRequiredTags) {
+        return true;
+      }
+    }
 
     if (this.get("privateMessage")) {
       // need at least one user when sending a PM
-      return this.get('targetUsernames') && (this.get('targetUsernames').trim() + ',').indexOf(',') === 0;
+      return targetUsernames && (targetUsernames.trim() + ',').indexOf(',') === 0;
     } else {
       // has a category? (when needed)
-      return this.get('canCategorize') &&
-            !this.siteSettings.allow_uncategorized_topics &&
-            !this.get('categoryId') &&
-            !this.user.get('admin');
+      return this.get('requiredCategoryMissing');
     }
-  }.property('loading', 'canEditTitle', 'titleLength', 'targetUsernames', 'replyLength', 'categoryId', 'missingReplyCharacters'),
+  },
+
+  @computed('canCategorize', 'categoryId')
+  requiredCategoryMissing(canCategorize, categoryId) {
+    return canCategorize && !categoryId &&
+      !this.siteSettings.allow_uncategorized_topics &&
+      !this.user.get('admin');
+  },
 
   titleLengthValid: function() {
     if (this.user.get('admin') && this.get('post.static_doc') && this.get('titleLength') > 0) return true;
@@ -248,17 +302,12 @@ const Composer = RestModel.extend({
 
   @computed('action')
   saveIcon(action) {
-    switch (action) {
-      case EDIT: return 'pencil';
-      case REPLY: return 'reply';
-      case CREATE_TOPIC: 'plus';
-      case PRIVATE_MESSAGE: 'envelope';
-    }
+    return SAVE_ICONS[action];
   },
 
   @computed('action', 'whisper')
   saveLabel(action, whisper) {
-    return whisper ? 'composer.create_whisper' : _saveLabels[action];
+    return whisper ? 'composer.create_whisper' : SAVE_LABELS[action];
   },
 
   hasMetaData: function() {
@@ -302,7 +351,7 @@ const Composer = RestModel.extend({
   @computed('privateMessage')
   minimumTitleLength(privateMessage) {
     if (privateMessage) {
-      return this.siteSettings.min_private_message_title_length;
+      return this.siteSettings.min_personal_message_title_length;
     } else {
       return this.siteSettings.min_topic_title_length;
     }
@@ -325,7 +374,7 @@ const Composer = RestModel.extend({
     if (pmWithNonHumanUser) {
       return 1;
     } else if (privateMessage) {
-      return this.siteSettings.min_private_message_post_length;
+      return this.siteSettings.min_personal_message_post_length;
     } else if (topicFirstPost) {
       // first post (topic body)
       return this.siteSettings.min_first_post_length;
@@ -452,11 +501,11 @@ const Composer = RestModel.extend({
 
     const composer = this;
     if (!replyBlank &&
-        ((opts.reply || opts.action === EDIT) && this.get('replyDirty'))) {
+        ((opts.reply || isEdit(opts.action)) && this.get('replyDirty'))) {
       return;
     }
 
-    if (opts.action === REPLY && this.get('action') === EDIT) this.set('reply', '');
+    if (opts.action === REPLY && isEdit(this.get('action'))) this.set('reply', '');
     if (!opts.draftKey) throw 'draft key is required';
     if (opts.draftSequence === null) throw 'draft sequence is required';
 
@@ -469,7 +518,8 @@ const Composer = RestModel.extend({
       targetUsernames: opts.usernames,
       composerTotalOpened: opts.composerTime,
       typingTime: opts.typingTime,
-      whisper: opts.whisper
+      whisper: opts.whisper,
+      tags: opts.tags
     });
 
     if (opts.post) {
@@ -508,11 +558,15 @@ const Composer = RestModel.extend({
     }
 
     // If we are editing a post, load it.
-    if (opts.action === EDIT && opts.post) {
+    if (isEdit(opts.action) && opts.post) {
 
       const topicProps = this.serialize(_edit_topic_serializer);
       topicProps.loading = true;
 
+      // When editing a shared draft, use its category
+      if (opts.action === EDIT_SHARED_DRAFT && opts.destinationCategoryId) {
+        topicProps.categoryId = opts.destinationCategoryId;
+      }
       this.setProperties(topicProps);
 
       this.store.find('post', opts.post.get('id')).then(function(post) {
@@ -572,21 +626,25 @@ const Composer = RestModel.extend({
 
   // When you edit a post
   editPost(opts) {
-    const post = this.get('post'),
-          oldCooked = post.get('cooked'),
-          self = this;
+    let post = this.get('post');
+    let oldCooked = post.get('cooked');
+    let promise = Ember.RSVP.resolve();
 
-    let promise;
-
-    // Update the title if we've changed it, otherwise consider it a
-    // successful resolved promise
+    // Update the topic if we're editing the first post
     if (this.get('title') &&
         post.get('post_number') === 1 &&
         this.get('topic.details.can_edit')) {
       const topicProps = this.getProperties(Object.keys(_edit_topic_serializer));
-      promise = Topic.update(this.get('topic'), topicProps);
-    } else {
-      promise = Ember.RSVP.resolve();
+
+      let topic = this.get('topic');
+
+      // If we're editing a shared draft, keep the original category
+      if (this.get('action') === EDIT_SHARED_DRAFT) {
+        let destinationCategoryId = topicProps.categoryId;
+        promise = promise.then(() => topic.updateDestinationCategory(destinationCategoryId));
+        topicProps.categoryId = topic.get('category.id');
+      }
+      promise = promise.then(() => Topic.update(topic, topicProps));
     }
 
     const props = {
@@ -598,18 +656,18 @@ const Composer = RestModel.extend({
 
     this.set('composeState', SAVING);
 
-    var rollback = throwAjaxError(function(){
+    let rollback = throwAjaxError(() => {
       post.set('cooked', oldCooked);
-      self.set('composeState', OPEN);
+      this.set('composeState', OPEN);
     });
 
-    return promise.then(function() {
+    return promise.then(() => {
       // rest model only sets props after it is saved
       post.set("cooked", props.cooked);
-      return post.save(props).then(function(result) {
-        self.clearState();
+      return post.save(props).then(result => {
+        this.clearState();
         return result;
-      }).catch(function(error) {
+      }).catch(error => {
         throw error;
       });
     }).catch(rollback);
@@ -779,7 +837,8 @@ const Composer = RestModel.extend({
       metaData: this.get('metaData'),
       usernames: this.get('targetUsernames'),
       composerTime: this.get('composerTime'),
-      typingTime: this.get('typingTime')
+      typingTime: this.get('typingTime'),
+      tags: this.get('tags')
     };
 
     this.set('draftStatus', I18n.t('composer.saving_draft_tip'));
@@ -848,6 +907,8 @@ Composer.reopenClass({
 
   // The actions the composer can take
   CREATE_TOPIC,
+  CREATE_SHARED_DRAFT,
+  EDIT_SHARED_DRAFT,
   PRIVATE_MESSAGE,
   REPLY,
   EDIT,
diff --git a/app/assets/javascripts/discourse/models/group.js.es6 b/app/assets/javascripts/discourse/models/group.js.es6
index c26544e7c55..1fe9a1999fb 100644
--- a/app/assets/javascripts/discourse/models/group.js.es6
+++ b/app/assets/javascripts/discourse/models/group.js.es6
@@ -33,13 +33,13 @@ const Group = RestModel.extend({
   findMembers(params) {
     if (Em.isEmpty(this.get('name'))) { return ; }
 
-    const self = this, offset = Math.min(this.get("user_count"), Math.max(this.get("offset"), 0));
+    const offset = Math.min(this.get("user_count"), Math.max(this.get("offset"), 0));
 
-    return Group.loadMembers(this.get("name"), offset, this.get("limit"), params).then(function (result) {
+    return Group.loadMembers(this.get("name"), offset, this.get("limit"), params).then(result => {
       var ownerIds = {};
       result.owners.forEach(owner => ownerIds[owner.id] = true);
 
-      self.setProperties({
+      this.setProperties({
         user_count: result.meta.total,
         limit: result.meta.limit,
         offset: result.meta.offset,
@@ -65,37 +65,45 @@ const Group = RestModel.extend({
     });
   },
 
-  removeMember(member) {
-    var self = this;
+  removeMember(member, params) {
     return ajax('/groups/' + this.get('id') + '/members.json', {
       type: "DELETE",
       data: { user_id: member.get("id") }
-    }).then(function() {
-      // reload member list
-      self.findMembers();
+    }).then(() => {
+      this.findMembers(params);
     });
   },
 
-  addMembers(usernames) {
-    var self = this;
+  addMembers(usernames, filter) {
     return ajax('/groups/' + this.get('id') + '/members.json', {
       type: "PUT",
       data: { usernames: usernames }
-    }).then(function() {
-      self.findMembers();
+    }).then(response => {
+      if (filter) {
+        this._filterMembers(response);
+      } else {
+        this.findMembers();
+      }
     });
   },
 
-  addOwners(usernames) {
-    var self = this;
+  addOwners(usernames, filter) {
     return ajax(`/admin/groups/${this.get('id')}/owners.json`, {
       type: "PUT",
       data: { group: { usernames: usernames } }
-    }).then(function() {
-      self.findMembers();
+    }).then(response => {
+      if (filter) {
+        this._filterMembers(response);
+      } else {
+        this.findMembers();
+      }
     });
   },
 
+  _filterMembers(response) {
+    return this.findMembers({ filter: response.usernames.join(",") });
+  },
+
   @computed("display_name", "name")
   displayName(groupDisplayName, name) {
     return groupDisplayName || name;
@@ -116,16 +124,21 @@ const Group = RestModel.extend({
     return mentionableLevel === '99';
   },
 
+  @computed("visibility_level")
+  isPrivate(visibilityLevel) {
+    return visibilityLevel !== 0;
+  },
+
   @observes("visibility_level", "canEveryoneMention")
   _updateAllowMembershipRequests() {
-    if (this.get('visibility_level') !== 0 || !this.get('canEveryoneMention')) {
+    if (this.get('isPrivate') || !this.get('canEveryoneMention')) {
       this.set ('allow_membership_requests', false);
     }
   },
 
   @observes("visibility_level")
   _updatePublic() {
-    if (this.get('visibility_level') !== 0) {
+    if (this.get('isPrivate')) {
       this.set('public', false);
       this.set('allow_membership_requests', false);
     }
@@ -177,10 +190,7 @@ const Group = RestModel.extend({
   },
 
   save() {
-    const id = this.get('id');
-    const url = this.get('is_group_owner') ? `/groups/${id}` : `/admin/groups/${id}`;
-
-    return ajax(url, {
+    return ajax(`/groups/${this.get('id')}`, {
       type: "PUT",
       data: { group: this.asJSON() }
     });
@@ -242,10 +252,6 @@ Group.reopenClass({
     });
   },
 
-  find(name) {
-    return ajax("/groups/" + name + ".json").then(result => Group.create(result.basic_group));
-  },
-
   loadMembers(name, offset, limit, params) {
     return ajax('/groups/' + name + '/members.json', {
       data: _.extend({
diff --git a/app/assets/javascripts/discourse/models/login-method.js.es6 b/app/assets/javascripts/discourse/models/login-method.js.es6
index c125e7bd831..866c657f6b8 100644
--- a/app/assets/javascripts/discourse/models/login-method.js.es6
+++ b/app/assets/javascripts/discourse/models/login-method.js.es6
@@ -22,12 +22,21 @@ const LoginMethod = Ember.Object.extend({
 let methods;
 let preRegister;
 
+export const LOGIN_METHODS = [
+  "google_oauth2",
+  "facebook",
+  "twitter",
+  "yahoo",
+  "instagram",
+  "github"
+];
+
 export function findAll(siteSettings, capabilities, isMobileDevice) {
   if (methods) { return methods; }
 
   methods = [];
 
-  [ "google_oauth2", "facebook", "cas", "twitter", "yahoo", "instagram", "github" ].forEach(name => {
+  LOGIN_METHODS.forEach(name => {
     if (siteSettings["enable_" + name + "_logins"]) {
       const params = { name };
       if (name === "google_oauth2") {
diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6
index c6903f71fd3..955c3018375 100644
--- a/app/assets/javascripts/discourse/models/post.js.es6
+++ b/app/assets/javascripts/discourse/models/post.js.es6
@@ -168,7 +168,8 @@ const Post = RestModel.extend({
       this.setProperties({
         deleted_at: new Date(),
         deleted_by: deletedBy,
-        can_delete: false
+        can_delete: false,
+        can_recover: true
       });
     } else {
       promise = cookAsync(I18n.t("post.deleted_by_author", {count: Discourse.SiteSettings.delete_removed_posts_after})).then(cooked => {
diff --git a/app/assets/javascripts/discourse/models/site.js.es6 b/app/assets/javascripts/discourse/models/site.js.es6
index 073f6b43f9b..c1e3889176c 100644
--- a/app/assets/javascripts/discourse/models/site.js.es6
+++ b/app/assets/javascripts/discourse/models/site.js.es6
@@ -54,6 +54,11 @@ const Site = RestModel.extend({
     return result;
   },
 
+  @computed
+  baseUri() {
+    return Discourse.baseUri;
+  },
+
   // Returns it in the correct order, by setting
   @computed
   categoriesList() {
diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js.es6
index d198883b58c..efd364ed341 100644
--- a/app/assets/javascripts/discourse/models/store.js.es6
+++ b/app/assets/javascripts/discourse/models/store.js.es6
@@ -107,6 +107,11 @@ export default Ember.Object.extend({
     var adapter = this.adapterFor(type);
     return adapter.find(this, type, findArgs, opts).then(result => {
       var hydrated = this._hydrateFindResults(result, type, findArgs, opts);
+
+      if (result.extras) {
+        hydrated.set('extras', result.extras);
+      }
+
       if (adapter.cache) {
         const stale = adapter.findStale(this, type, findArgs, opts);
         hydrated = this._updateStale(stale, hydrated);
diff --git a/app/assets/javascripts/discourse/models/tag-group.js.es6 b/app/assets/javascripts/discourse/models/tag-group.js.es6
index cfbd83e1640..ea29f414123 100644
--- a/app/assets/javascripts/discourse/models/tag-group.js.es6
+++ b/app/assets/javascripts/discourse/models/tag-group.js.es6
@@ -1,44 +1,62 @@
-import { ajax } from 'discourse/lib/ajax';
-import RestModel from 'discourse/models/rest';
-import computed from 'ember-addons/ember-computed-decorators';
+import { ajax } from "discourse/lib/ajax";
+import RestModel from "discourse/models/rest";
+import computed from "ember-addons/ember-computed-decorators";
+import PermissionType from "discourse/models/permission-type";
 
-const TagGroup = RestModel.extend({
-  @computed('name', 'tag_names')
-  disableSave() {
-    return Ember.isEmpty(this.get('name')) || Ember.isEmpty(this.get('tag_names')) || this.get('saving');
+export default RestModel.extend({
+  @computed("name", "tag_names", "saving")
+  disableSave(name, tagNames, saving) {
+    return saving || Ember.isEmpty(name) || Ember.isEmpty(tagNames);
+  },
+
+  @computed("permissions")
+  permissionName: {
+    get(permissions) {
+      if (!permissions) return "public";
+
+      if (permissions["everyone"] === PermissionType.FULL) {
+        return "public";
+      } else if (permissions["everyone"] === PermissionType.READONLY) {
+        return "visible";
+      } else {
+        return "private";
+      }
+    },
+
+    set(value) {
+      if (value === "private") {
+        this.set("permissions", { "staff": PermissionType.FULL });
+      } else if (value === "visible") {
+        this.set("permissions", { "staff": PermissionType.FULL, "everyone": PermissionType.READONLY });
+      } else {
+        this.set("permissions", { "everyone": PermissionType.FULL });
+      }
+    }
   },
 
   save() {
-    let url = "/tag_groups";
-    const self = this,
-          isNew = this.get('id') === 'new';
-    if (!isNew) {
-      url = "/tag_groups/" + this.get('id');
-    }
+    this.set("savingStatus", I18n.t("saving"));
+    this.set("saving", true);
 
-    this.set('savingStatus', I18n.t('saving'));
-    this.set('saving', true);
+    const isNew = this.get("id") === "new";
+    const url = isNew ? "/tag_groups" : `/tag_groups/${this.get("id")}`;
+    const data = this.getProperties("name", "tag_names", "parent_tag_name", "one_per_topic", "permissions");
 
     return ajax(url, {
-      data: {
-        name: this.get('name'),
-        tag_names: this.get('tag_names'),
-        parent_tag_name: this.get('parent_tag_name') ? this.get('parent_tag_name') : undefined,
-        one_per_topic: this.get('one_per_topic')
-      },
-      type: isNew ? 'POST' : 'PUT'
-    }).then(function(result) {
-      if(result.tag_group && result.tag_group.id) {
-        self.set('id', result.tag_group.id);
+      data,
+      type: isNew ? "POST" : "PUT"
+    }).then(result => {
+      if (result.tag_group && result.tag_group.id) {
+        this.set("id", result.tag_group.id);
       }
-      self.set('savingStatus', I18n.t('saved'));
-      self.set('saving', false);
+    }).finally(() => {
+      this.set("savingStatus", I18n.t("saved"));
+      this.set("saving", false);
     });
   },
 
   destroy() {
-    return ajax("/tag_groups/" + this.get('id'), {type: "DELETE"});
+    return ajax(`/tag_groups/${this.get("id")}`, { type: "DELETE" });
   }
 });
 
-export default TagGroup;
diff --git a/app/assets/javascripts/discourse/models/tag.js.es6 b/app/assets/javascripts/discourse/models/tag.js.es6
new file mode 100644
index 00000000000..572463e5bde
--- /dev/null
+++ b/app/assets/javascripts/discourse/models/tag.js.es6
@@ -0,0 +1,9 @@
+import RestModel from "discourse/models/rest";
+import computed from "ember-addons/ember-computed-decorators";
+
+export default RestModel.extend({
+  @computed("count", "pm_count")
+  totalCount(count, pmCount) {
+    return count + pmCount;
+  }
+});
diff --git a/app/assets/javascripts/discourse/models/topic-list.js.es6 b/app/assets/javascripts/discourse/models/topic-list.js.es6
index 3e39ae5c895..df357eed513 100644
--- a/app/assets/javascripts/discourse/models/topic-list.js.es6
+++ b/app/assets/javascripts/discourse/models/topic-list.js.es6
@@ -2,6 +2,23 @@ import { ajax } from 'discourse/lib/ajax';
 import RestModel from 'discourse/models/rest';
 import Model from 'discourse/models/model';
 
+// Whether to show the category badge in topic lists
+function displayCategoryInList(site, category) {
+  if (category) {
+    if (category.get('has_children')) {
+      return true;
+    }
+    let draftCategoryId = site.get('shared_drafts_category_id');
+    if (draftCategoryId && category.get('id') === draftCategoryId) {
+      return true;
+    }
+
+    return false;
+  }
+
+  return true;
+}
+
 const TopicList = RestModel.extend({
   canLoadMore: Em.computed.notEmpty("more_topics_url"),
 
@@ -34,8 +51,22 @@ const TopicList = RestModel.extend({
   loadMore() {
     if (this.get('loadingMore')) { return Ember.RSVP.resolve(); }
 
-    const moreUrl = this.get('more_topics_url');
+    let moreUrl = this.get('more_topics_url');
     if (moreUrl) {
+
+      let [url, params] = moreUrl.split("?");
+
+      // ensure we postfix with .json so username paths work
+      // correctly
+      if (!url.match(/\.json$/)) {
+        url += '.json';
+      }
+
+      moreUrl = url;
+      if (params) {
+        moreUrl += "?" + params;
+      }
+
       const self = this;
       this.set('loadingMore', true);
 
@@ -70,17 +101,17 @@ const TopicList = RestModel.extend({
 
 
   // loads topics with these ids "before" the current topics
-  loadBefore(topic_ids) {
+  loadBefore(topic_ids, storeInSession) {
     const topicList = this,
           topics = this.get('topics');
 
     // refresh dupes
     topics.removeObjects(topics.filter(topic => topic_ids.indexOf(topic.get('id')) >= 0));
 
-    const url = `${Discourse.getURL("/")}${this.get('filter')}?topic_ids=${topic_ids.join(",")}`;
+    const url = `${Discourse.getURL("/")}${this.get('filter')}.json?topic_ids=${topic_ids.join(",")}`;
     const store = this.store;
 
-    return ajax({ url }).then(result => {
+    return ajax({ url, data: this.get("params") }).then(result => {
       let i = 0;
       topicList.forEachNew(TopicList.topicsFrom(store, result), function(t) {
         // highlight the first of the new topics so we can get a visual feedback
@@ -88,22 +119,25 @@ const TopicList = RestModel.extend({
         topics.insertAt(i,t);
         i++;
       });
-      Discourse.Session.currentProp('topicList', topicList);
+      if (storeInSession) Discourse.Session.currentProp('topicList', topicList);
     });
   }
 });
 
 TopicList.reopenClass({
-  topicsFrom(store, result) {
+  topicsFrom(store, result, opts) {
     if (!result) { return; }
 
+    opts = opts || {};
+    let listKey = opts.listKey || 'topics';
+
     // Stitch together our side loaded data
 
     const categories = Discourse.Category.list(),
           users = Model.extractByKey(result.users, Discourse.User),
           groups = Model.extractByKey(result.primary_groups, Ember.Object);
 
-    return result.topic_list.topics.map(function (t) {
+    return result.topic_list[listKey].map(function (t) {
       t.category = categories.findBy('id', t.category_id);
       t.posters.forEach(function(p) {
         p.user = users[p.user_id];
@@ -136,6 +170,10 @@ TopicList.reopenClass({
     json.per_page = json.topic_list.per_page;
     json.topics = this.topicsFrom(store, json);
 
+    if (json.topic_list.shared_drafts) {
+      json.sharedDrafts = this.topicsFrom(store, json, { listKey: 'shared_drafts' });
+    }
+
     return json;
   },
 
@@ -146,7 +184,7 @@ TopicList.reopenClass({
 
   // hide the category when it has no children
   hideUniformCategory(list, category) {
-    list.set('hideCategory', category && !category.get("has_children"));
+    list.set('hideCategory', !displayCategoryInList(list.site, category));
   }
 
 });
diff --git a/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6 b/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
index d4c3a0354a3..45fe3f6761e 100644
--- a/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
+++ b/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
@@ -1,6 +1,5 @@
 import { NotificationLevels } from 'discourse/lib/notification-levels';
-import computed from "ember-addons/ember-computed-decorators";
-import { on } from "ember-addons/ember-computed-decorators";
+import { default as computed, on } from "ember-addons/ember-computed-decorators";
 import { defaultHomepage } from 'discourse/lib/utilities';
 import PreloadStore from 'preload-store';
 
@@ -35,7 +34,7 @@ const TopicTrackingState = Discourse.Model.extend({
         tracker.incrementMessageCount();
       }
 
-      if (data.message_type === "new_topic" || data.message_type === "latest") {
+      if (["new_topic", "latest"].includes(data.message_type)) {
         const muted_category_ids = Discourse.User.currentProp("muted_category_ids");
         if (_.include(muted_category_ids, data.payload.category_id)) {
           return;
@@ -55,7 +54,7 @@ const TopicTrackingState = Discourse.Model.extend({
         tracker.notify(data);
       }
 
-      if (data.message_type === "new_topic" || data.message_type === "unread" || data.message_type === "read") {
+      if (["new_topic", "unread", "read"].includes(data.message_type)) {
         tracker.notify(data);
         const old = tracker.states["t" + data.topic_id];
 
@@ -117,17 +116,17 @@ const TopicTrackingState = Discourse.Model.extend({
     }
 
     if (filter === defaultHomepage()) {
-      const suppressed_from_homepage_category_ids = Discourse.Site.currentProp("suppressed_from_homepage_category_ids");
-      if (_.include(suppressed_from_homepage_category_ids, data.payload.category_id)) {
+      const suppressed_from_latest_category_ids = Discourse.Site.currentProp("suppressed_from_latest_category_ids");
+      if (_.include(suppressed_from_latest_category_ids, data.payload.category_id)) {
         return;
       }
     }
 
-    if ((filter === "all" || filter === "latest" || filter === "new") && data.message_type === "new_topic") {
+    if (["all", "latest", "new"].includes(filter) && data.message_type === "new_topic") {
       this.addIncoming(data.topic_id);
     }
 
-    if ((filter === "all" || filter === "unread") && data.message_type === "unread") {
+    if (["all", "unread"].includes(filter) && data.message_type === "unread") {
       const old = this.states["t" + data.topic_id];
       if(!old || old.highest_post_number === old.last_read_post_number) {
         this.addIncoming(data.topic_id);
diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6
index 69a4f9c27f2..bf37af7917e 100644
--- a/app/assets/javascripts/discourse/models/topic.js.es6
+++ b/app/assets/javascripts/discourse/models/topic.js.es6
@@ -3,6 +3,7 @@ import { flushMap } from 'discourse/models/store';
 import RestModel from 'discourse/models/rest';
 import { propertyEqual } from 'discourse/lib/computed';
 import { longDate } from 'discourse/lib/formatter';
+import { isRTL } from 'discourse/lib/text-direction';
 import computed from 'ember-addons/ember-computed-decorators';
 import ActionSummary from 'discourse/models/action-summary';
 import { popupAjaxError } from 'discourse/lib/ajax-error';
@@ -58,7 +59,13 @@ const Topic = RestModel.extend({
 
   @computed('fancy_title')
   fancyTitle(title) {
-    return censor(emojiUnescape(title || ""), Discourse.Site.currentProp('censored_words'));
+    let fancyTitle = censor(emojiUnescape(title || ""), Discourse.Site.currentProp('censored_words'));
+
+    if (Discourse.SiteSettings.support_mixed_text_direction) {
+      let titleDir = isRTL(title) ? 'rtl' : 'ltr';
+      return `<span dir="${titleDir}">${fancyTitle}</span>`;
+    }
+    return fancyTitle;
   },
 
   // returns createdAt if there's no bumped date
@@ -94,7 +101,7 @@ const Topic = RestModel.extend({
     const newTags = [];
 
     tags.forEach(function(tag){
-      if (title.toLowerCase().indexOf(tag) === -1 || Discourse.SiteSettings.staff_tags.indexOf(tag) !== -1) {
+      if (title.toLowerCase().indexOf(tag) === -1) {
         newTags.push(tag);
       }
     });
@@ -348,7 +355,7 @@ const Topic = RestModel.extend({
       'details.can_delete': false,
       'details.can_recover': true
     });
-    return ajax("/t/" + this.get('id'), {
+    return ajax(`/t/${this.get('id')}`, {
       data: { context: window.location.pathname },
       type: 'DELETE'
     });
@@ -362,7 +369,10 @@ const Topic = RestModel.extend({
       'details.can_delete': true,
       'details.can_recover': false
     });
-    return ajax("/t/" + this.get('id') + "/recover", { type: 'PUT' });
+    return ajax(`/t/${this.get('id')}/recover`, {
+      data: { context: window.location.pathname },
+      type: 'PUT'
+    });
   },
 
   // Update our attributes from a JSON result
@@ -469,6 +479,23 @@ const Topic = RestModel.extend({
     return promise;
   },
 
+  publish() {
+    return ajax(`/t/${this.get('id')}/publish`, {
+      type: 'PUT',
+      data: this.getProperties('destination_category_id')
+    }).then(() => {
+      this.set('destination_category_id', null);
+    }).catch(popupAjaxError);
+  },
+
+  updateDestinationCategory(categoryId) {
+    this.set('destination_category_id', categoryId);
+    return ajax(`/t/${this.get('id')}/shared-draft`, {
+      method: 'PUT',
+      data: { category_id: categoryId }
+    });
+  },
+
   convertTopic(type) {
     return ajax(`/t/${this.get('id')}/convert-topic/${type}`, {type: 'PUT'}).then(() => {
       window.location.reload();
diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
index 9925d4798a0..a76f17be969 100644
--- a/app/assets/javascripts/discourse/models/user.js.es6
+++ b/app/assets/javascripts/discourse/models/user.js.es6
@@ -23,14 +23,16 @@ const User = RestModel.extend({
   hasPMs: Em.computed.gt("private_messages_stats.all", 0),
   hasStartedPMs: Em.computed.gt("private_messages_stats.mine", 0),
   hasUnreadPMs: Em.computed.gt("private_messages_stats.unread", 0),
-  hasPosted: Em.computed.gt("post_count", 0),
-  hasNotPosted: Em.computed.not("hasPosted"),
-  canBeDeleted: Em.computed.and("can_be_deleted", "hasNotPosted"),
 
   redirected_to_top: {
     reason: null,
   },
 
+  @computed("can_be_deleted", "post_count")
+  canBeDeleted(canBeDeleted, postCount) {
+    return canBeDeleted && postCount <= 5;
+  },
+
   @computed()
   stream() {
     return UserStream.create({ user: this });
@@ -167,8 +169,6 @@ const User = RestModel.extend({
   isElder: Em.computed.equal('trust_level', 4),
   canManageTopic: Em.computed.or('staff', 'isElder'),
 
-  isSuspended: Em.computed.equal('suspended', true),
-
   @computed("previous_visit_at")
   previousVisitAt(previous_visit_at) {
     return new Date(previous_visit_at);
@@ -216,6 +216,7 @@ const User = RestModel.extend({
       'website',
       'location',
       'name',
+      'title',
       'locale',
       'custom_fields',
       'user_fields',
@@ -281,6 +282,12 @@ const User = RestModel.extend({
       }
     });
 
+    ['muted_tags', 'tracked_tags', 'watched_tags', 'watching_first_post_tags'].forEach(prop => {
+      if (fields === undefined || fields.includes(prop)) {
+        data[prop] = this.get(prop) ? this.get(prop).join(',') : '';
+      }
+    });
+
     // TODO: We can remove this when migrated fully to rest model.
     this.set('isSaving', true);
     return ajax(userPath(`${this.get('username_lower')}.json`), {
@@ -304,6 +311,20 @@ const User = RestModel.extend({
     });
   },
 
+  loadSecondFactorCodes(password) {
+    return ajax("/u/second_factors.json", {
+      data: { password },
+      type: 'POST'
+    });
+  },
+
+  toggleSecondFactor(token, enable) {
+    return ajax("/u/second_factor.json", {
+      data: { second_factor_token: token, enable },
+      type: 'PUT'
+    });
+  },
+
   loadUserAction(id) {
     const stream = this.get('stream');
     return ajax(`/user_actions/${id}.json`, { cache: 'false' }).then(result => {
@@ -326,13 +347,26 @@ const User = RestModel.extend({
            ua.action_type === UserAction.TYPES.topics;
   },
 
+  numGroupsToDisplay: 2,
+
   @computed("groups.[]")
-  displayGroups() {
+  filteredGroups() {
     const groups = this.get('groups') || [];
-    const filtered = groups.filter(group => {
+
+    return groups.filter(group => {
       return !group.automatic || group.name === "moderators";
     });
-    return filtered.length === 0 ? null : filtered;
+  },
+
+  @computed("filteredGroups", "numGroupsToDisplay")
+  displayGroups(filteredGroups, numGroupsToDisplay) {
+    const groups = filteredGroups.slice(0, numGroupsToDisplay);
+    return groups.length === 0 ? null : groups;
+  },
+
+  @computed("filteredGroups", "numGroupsToDisplay")
+  showMoreGroupsLink(filteredGroups, numGroupsToDisplay) {
+    return filteredGroups.length > numGroupsToDisplay;
   },
 
   // The user's stat count, excluding PMs.
@@ -534,6 +568,25 @@ const User = RestModel.extend({
 
   canManageGroup(group) {
     return group.get('automatic') ? false : (this.get('admin') || group.get('is_group_owner'));
+  },
+
+  @computed('groups.@each.title', 'badges.@each')
+  availableTitles() {
+    let titles = [];
+
+    _.each(this.get('groups'), group => {
+      if (group.get('title')) {
+        titles.push(group.get('title'));
+      }
+    });
+
+    _.each(this.get('badges'), badge => {
+      if (badge.get('allow_title')) {
+        titles.push(badge.get('name'));
+      }
+    });
+
+    return _.uniq(titles).sort();
   }
 });
 
diff --git a/app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js.es6 b/app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js.es6
index 40faddcde29..6d35e0800fc 100644
--- a/app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js.es6
+++ b/app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js.es6
@@ -1,4 +1,11 @@
+import { default as computed } from "ember-addons/ember-computed-decorators";
+
 export default Ember.Object.extend({
   postCountsPresent: Ember.computed.or('topic.unread', 'topic.displayNewPosts'),
-  showBadges: Ember.computed.and('postBadgesEnabled', 'postCountsPresent')
+  showBadges: Ember.computed.and('postBadgesEnabled', 'postCountsPresent'),
+
+  @computed
+  newDotText() {
+    return (this.currentUser && this.currentUser.trust_level > 0) ? "" : I18n.t('filters.new.lower_title');
+  }
 });
diff --git a/app/assets/javascripts/discourse/raw-views/topic-status.js.es6 b/app/assets/javascripts/discourse/raw-views/topic-status.js.es6
index 8b6af94cbb3..cf9f81cc0cb 100644
--- a/app/assets/javascripts/discourse/raw-views/topic-status.js.es6
+++ b/app/assets/javascripts/discourse/raw-views/topic-status.js.es6
@@ -53,7 +53,7 @@ export default Ember.Object.extend({
 
     results.forEach(result => {
       result.title = I18n.t(`topic_statuses.${result.key}.help`);
-      if (!self.disableActions && (result.key === "pinned" ||result.key === "unpinned")) {
+      if (this.currentUser && (result.key === "pinned" || result.key === "unpinned")) {
         result.openTag = 'a href';
         result.closeTag = 'a';
       } else {
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 72dca540a18..a2f1dfe3dbe 100644
--- a/app/assets/javascripts/discourse/routes/app-route-map.js.es6
+++ b/app/assets/javascripts/discourse/routes/app-route-map.js.es6
@@ -5,6 +5,8 @@ export default function() {
 
   this.route('about', { path: '/about', resetNamespace: true });
 
+  this.route('post', { path: '/p/:id' });
+
   // Topic routes
   this.route('topic', { path: '/t/:slug/:id', resetNamespace: true }, function() {
     this.route('fromParams', { path: '/' });
@@ -12,7 +14,6 @@ export default function() {
   });
 
   this.route('topicBySlugOrId', { path: '/t/:slugOrId', resetNamespace: true });
-  this.route('topicUnsubscribe', { path: '/t/:slug/:id/unsubscribe' });
 
   this.route('discovery', { path: '/', resetNamespace: true }, function() {
     // top
@@ -47,7 +48,9 @@ export default function() {
     this.route('categoryWithID', { path: '/c/:parentSlug/:slug/:id' });
   });
 
-  this.route('groups', { resetNamespace: true });
+  this.route('groups', { resetNamespace: true }, function() {
+    this.route("new", { path: "custom/new" });
+  });
 
   this.route('group', { path: '/groups/:name', resetNamespace: true }, function() {
     this.route('members');
@@ -56,11 +59,20 @@ export default function() {
       this.route('posts');
       this.route('topics');
       this.route('mentions');
-      this.route('messages');
     });
 
-    this.route('logs');
-    this.route('edit');
+    this.route('manage', function() {
+      this.route('profile');
+      this.route('membership');
+      this.route('interaction');
+      this.route('members');
+      this.route('logs');
+    });
+
+    this.route('messages', function() {
+      this.route('inbox');
+      this.route('archive');
+    });
   });
 
   // User routes
@@ -96,6 +108,8 @@ export default function() {
       this.route('archive');
       this.route('group', { path: 'group/:name'});
       this.route('groupArchive', { path: 'group/:name/archive'});
+      this.route('tags');
+      this.route('tagsShow', { path: 'tags/:id'});
     });
 
     this.route('preferences', { resetNamespace: true }, function() {
@@ -110,9 +124,8 @@ export default function() {
 
       this.route('username');
       this.route('email');
+      this.route('second-factor');
       this.route('about', { path: '/about-me' });
-      this.route('badgeTitle', { path: '/badge_title' });
-      this.route('card-badge', { path: '/card-badge' });
     });
 
     this.route('userInvited', { path: '/invited', resetNamespace: true }, function() {
diff --git a/app/assets/javascripts/discourse/routes/build-category-route.js.es6 b/app/assets/javascripts/discourse/routes/build-category-route.js.es6
index 4b29783e565..fb4f1b7fe83 100644
--- a/app/assets/javascripts/discourse/routes/build-category-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-category-route.js.es6
@@ -118,8 +118,6 @@ export default (filterArg, params) => {
       this.controllerFor('discovery/topics').setProperties(topicOpts);
       this.searchService.set('searchContext', category.get('searchContext'));
       this.set('topics', null);
-
-      this.openTopicDraft(topics);
     },
 
     renderTemplate() {
diff --git a/app/assets/javascripts/discourse/routes/build-group-messages-route.js.es6 b/app/assets/javascripts/discourse/routes/build-group-messages-route.js.es6
new file mode 100644
index 00000000000..460134ee8de
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/build-group-messages-route.js.es6
@@ -0,0 +1,35 @@
+import UserTopicListRoute from "discourse/routes/user-topic-list";
+
+export default (type) => {
+  return UserTopicListRoute.extend({
+    titleToken() {
+      return I18n.t(`user.messages.${type}`);
+    },
+
+    model() {
+      const groupName = this.modelFor('group').get('name');
+      const username = this.currentUser.get("username_lower");
+      let filter = `topics/private-messages-group/${username}/${groupName}`;
+      if (this._isArchive()) filter = `${filter}/archive`;
+      return this.store.findFiltered("topicList", { filter });
+    },
+
+    setupController() {
+      this._super.apply(this, arguments);
+
+      const groupName = this.modelFor('group').get('name');
+      let channel = `/private-messages/group/${groupName}`;
+      if (this._isArchive()) channel = `${channel}/archive`;
+      this.controllerFor("user-topics-list").subscribe(channel);
+
+      this.controllerFor("user-topics-list").setProperties({
+        hideCategory: true,
+        showPosters: true
+      });
+    },
+
+    _isArchive() {
+      return type === 'archive';
+    },
+  });
+};
diff --git a/app/assets/javascripts/discourse/routes/build-private-messages-route.js.es6 b/app/assets/javascripts/discourse/routes/build-private-messages-route.js.es6
index b20e9e1b3dc..4be8889dea9 100644
--- a/app/assets/javascripts/discourse/routes/build-private-messages-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-private-messages-route.js.es6
@@ -1,10 +1,15 @@
 import UserTopicListRoute from "discourse/routes/user-topic-list";
 
 // A helper to build a user topic list route
-export default (viewName, path) => {
+export default (viewName, path, channel) => {
   return UserTopicListRoute.extend({
     userActionType: Discourse.UserAction.TYPES.messages_received,
 
+    titleToken() {
+      const key = viewName === "index" ? "inbox" : viewName;
+      return [I18n.t(`user.messages.${key}`), I18n.t("user.private_messages")];
+    },
+
     actions: {
       didTransition() {
         this.controllerFor("user-topics-list")._showFooter();
@@ -19,19 +24,30 @@ export default (viewName, path) => {
     setupController() {
       this._super.apply(this, arguments);
 
+      if (channel) {
+        this.controllerFor("user-topics-list").subscribe(`/private-messages/${channel}`);
+      }
+
       this.controllerFor("user-topics-list").setProperties({
         hideCategory: true,
         showPosters: true,
         canBulkSelect: true,
+        tagsForUser: this.modelFor("user").get("username_lower"),
         selected: []
       });
 
-      this.controllerFor("user-private-messages").set("archive", false);
-      this.controllerFor("user-private-messages").set("pmView", viewName);
+      this.controllerFor("user-private-messages").setProperties({
+        archive: false,
+        pmView: viewName,
+        showToggleBulkSelect: true
+      });
+
       this.searchService.set('contextType', 'private_messages');
     },
 
     deactivate() {
+      this.controllerFor('user-topics-list').unsubscribe();
+
       this.searchService.set(
         'searchContext',
         this.controllerFor("user").get("model.searchContext")
diff --git a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
index d7a2116bee6..198ab74e49f 100644
--- a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
@@ -54,8 +54,8 @@ function findTopicList(store, tracking, filter, filterParams, extras) {
       tracking.trackIncoming(list.filter);
     }
     Discourse.Session.currentProp('topicList', list);
-    if (list.topic_list && list.topic_list.tags) {
-      Discourse.Site.currentProp('top_tags', list.topic_list.tags);
+    if (list.topic_list && list.topic_list.top_tags) {
+      Discourse.Site.currentProp('top_tags', list.topic_list.top_tags);
     }
     return list;
   });
@@ -91,7 +91,7 @@ export default function(filter, extras) {
       const topicOpts = {
         model,
         category: null,
-        period: model.get('for_period') || (filter.indexOf('/') > 0 ? filter.split('/')[1] : ''),
+        period: model.get('for_period') || (filter.indexOf('top/') >= 0 ? filter.split('/')[1] : ''),
         selected: [],
         expandGloballyPinned: true
       };
@@ -106,8 +106,6 @@ export default function(filter, extras) {
         }
       }
       this.controllerFor('discovery/topics').setProperties(topicOpts);
-
-      this.openTopicDraft(model);
       this.controllerFor('navigation/default').set('canCreateTopic', model.get('can_create_topic'));
     },
 
diff --git a/app/assets/javascripts/discourse/routes/discourse.js.es6 b/app/assets/javascripts/discourse/routes/discourse.js.es6
index 8b3d3bbc310..f726cb5d8f1 100644
--- a/app/assets/javascripts/discourse/routes/discourse.js.es6
+++ b/app/assets/javascripts/discourse/routes/discourse.js.es6
@@ -1,15 +1,23 @@
 import Composer from 'discourse/models/composer';
 
 const DiscourseRoute = Ember.Route.extend({
+  showFooter: false,
 
   // Set to true to refresh a model without a transition if a query param
   // changes
   resfreshQueryWithoutTransition: false,
 
+  activate() {
+    this._super();
+    if (this.get('showFooter')) {
+      this.controllerFor('application').set('showFooter', true);
+    }
+  },
+
   refresh() {
     if (!this.refreshQueryWithoutTransition) { return this._super(); }
 
-    if (!this.router.router.activeTransition) {
+    if (!this.router._routerMicrolib.activeTransition) {
       const controller = this.controller,
             model = controller.get('model'),
             params = this.controller.getProperties(Object.keys(this.queryParams));
@@ -44,7 +52,25 @@ const DiscourseRoute = Ember.Route.extend({
 
     refreshTitle() {
       Ember.run.once(this, this._refreshTitleOnce);
+    },
+
+    clearTopicDraft() {
+      // perhaps re-delegate this to root controller in all cases?
+      // TODO also poison the store so it does not come back from the
+      // dead
+      if (this.get('controller.list.draft')) {
+        this.set('controller.list.draft', null);
+      }
+
+      if (this.controllerFor("discovery/categories").get('model.draft')) {
+         this.controllerFor("discovery/categories").set('model.draft', null);
+      }
+
+      if (this.controllerFor("discovery/topics").get('model.draft')) {
+         this.controllerFor("discovery/topics").set('model.draft', null);
+      }
     }
+
   },
 
   redirectIfLoginRequired() {
@@ -55,17 +81,18 @@ const DiscourseRoute = Ember.Route.extend({
   },
 
   openTopicDraft(model){
-    // If there's a draft, open the create topic composer
-    if (model.draft) {
-      const composer = this.controllerFor('composer');
-      if (!composer.get('model.viewOpen')) {
-        composer.open({
-          action: Composer.CREATE_TOPIC,
-          draft: model.draft,
-          draftKey: model.draft_key,
-          draftSequence: model.draft_sequence
-        });
-      }
+    const composer = this.controllerFor('composer');
+
+    if (composer.get('model.action') === Composer.CREATE_TOPIC &&
+      composer.get('model.draftKey') === model.draft_key) {
+      composer.set('model.composeState', Composer.OPEN);
+    } else {
+      composer.open({
+        action: Composer.CREATE_TOPIC,
+        draft: model.draft,
+        draftKey: model.draft_key,
+        draftSequence: model.draft_sequence
+      });
     }
   },
 
diff --git a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6 b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
index 0ba2194e501..a85c0743f66 100644
--- a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
+++ b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
@@ -12,20 +12,24 @@ const DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, {
     this.render("discovery/categories", { outlet: "list-container" });
   },
 
-  model() {
-    const style = !this.site.mobileView && this.siteSettings.desktop_category_page_style;
-    const parentCategory = this.get("model.parentCategory");
+  findCategories() {
+    let style = !this.site.mobileView &&
+      this.siteSettings.desktop_category_page_style;
 
-    let promise;
+    let parentCategory = this.get("model.parentCategory");
     if (parentCategory) {
-      promise = CategoryList.listForParent(this.store, parentCategory);
+      return CategoryList.listForParent(this.store, parentCategory);
     } else if (style === "categories_and_latest_topics") {
-      promise = this._loadCategoriesAndLatestTopics();
-    } else {
-      promise = CategoryList.list(this.store);
+      return this._findCategoriesAndTopics('latest');
+    } else if (style === "categories_and_top_topics") {
+      return this._findCategoriesAndTopics('top');
     }
 
-    return promise.then(model => {
+    return CategoryList.list(this.store);
+  },
+
+  model() {
+    return this.findCategories().then(model => {
       const tracking = this.topicTrackingState;
       if (tracking) {
         tracking.sync(model, "categories");
@@ -35,26 +39,31 @@ const DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, {
     });
   },
 
-  _loadCategoriesAndLatestTopics() {
-    const wrappedCategoriesList = PreloadStore.getAndRemove("categories_list");
-    const topicListLatest = PreloadStore.getAndRemove("topic_list_latest");
-    const categoriesList = wrappedCategoriesList && wrappedCategoriesList.category_list;
-    if (categoriesList && topicListLatest) {
-      return new Ember.RSVP.Promise(resolve => {
-        const result = Ember.Object.create({
-          categories: CategoryList.categoriesFrom(this.store, wrappedCategoriesList),
-          topics: TopicList.topicsFrom(this.store, topicListLatest),
+  _findCategoriesAndTopics(filter) {
+    return Ember.RSVP.hash({
+      wrappedCategoriesList: PreloadStore.getAndRemove("categories_list"),
+      topicsList: PreloadStore.getAndRemove(`topic_list_${filter}`)
+    }).then(hash => {
+      let { wrappedCategoriesList, topicsList } = hash;
+      let categoriesList = wrappedCategoriesList &&
+        wrappedCategoriesList.category_list;
+
+      if (categoriesList && topicsList) {
+        return Ember.Object.create({
+          categories: CategoryList.categoriesFrom(
+            this.store,
+            wrappedCategoriesList
+          ),
+          topics: TopicList.topicsFrom(this.store, topicsList),
           can_create_category: categoriesList.can_create_category,
           can_create_topic: categoriesList.can_create_topic,
           draft_key: categoriesList.draft_key,
           draft: categoriesList.draft,
           draft_sequence: categoriesList.draft_sequence
         });
-
-        resolve(result);
-      });
-    } else {
-      return ajax("/categories_and_latest").then(result => {
+      }
+      // Otherwise, return the ajax result
+      return ajax(`/categories_and_${filter}`).then(result => {
         return Ember.Object.create({
           categories: CategoryList.categoriesFrom(this.store, result),
           topics: TopicList.topicsFrom(this.store, result),
@@ -65,7 +74,7 @@ const DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, {
           draft_sequence: result.category_list.draft_sequence
         });
       });
-    }
+    });
   },
 
   titleToken() {
@@ -80,8 +89,6 @@ const DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, {
       showCategoryAdmin: model.get("can_create_category"),
       canCreateTopic: model.get("can_create_topic"),
     });
-
-    this.openTopicDraft(model);
   },
 
   actions: {
@@ -124,7 +131,12 @@ const DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, {
     },
 
     createTopic() {
-      this.openComposer(this.controllerFor("discovery/categories"));
+      const model = this.controllerFor("discovery/categories").get('model');
+      if (model.draft) {
+        this.openTopicDraft(model);
+      } else {
+        this.openComposer(this.controllerFor("discovery/categories"));
+      }
     },
 
     didTransition() {
diff --git a/app/assets/javascripts/discourse/routes/discovery.js.es6 b/app/assets/javascripts/discourse/routes/discovery.js.es6
index a77806d1a4d..b8b05fe35e6 100644
--- a/app/assets/javascripts/discourse/routes/discovery.js.es6
+++ b/app/assets/javascripts/discourse/routes/discovery.js.es6
@@ -45,7 +45,12 @@ export default Discourse.Route.extend(OpenComposer, {
     },
 
     createTopic() {
-      this.openComposer(this.controllerFor("discovery/topics"));
+      const model = this.controllerFor("discovery/topics").get('model');
+      if (model.draft) {
+        this.openTopicDraft(model);
+      } else {
+        this.openComposer(this.controllerFor("discovery/topics"));
+      }
     },
 
     dismissReadTopics(dismissTopics) {
diff --git a/app/assets/javascripts/discourse/routes/full-page-search.js.es6 b/app/assets/javascripts/discourse/routes/full-page-search.js.es6
index 73598c948ef..3d981720ac4 100644
--- a/app/assets/javascripts/discourse/routes/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/routes/full-page-search.js.es6
@@ -36,7 +36,8 @@ export default Discourse.Route.extend({
         return null;
       }
     }).then(results => {
-      const model = (results && translateResults(results)) || {};
+      const grouped_search_result = results ? results.grouped_search_result : {};
+      const model = (results && translateResults(results)) || { grouped_search_result };
       setTransient('lastSearch', { searchKey, model }, 5);
       return model;
     });
diff --git a/app/assets/javascripts/discourse/routes/group-activity-messages.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-messages.js.es6
deleted file mode 100644
index 660a5c7cd5f..00000000000
--- a/app/assets/javascripts/discourse/routes/group-activity-messages.js.es6
+++ /dev/null
@@ -1,3 +0,0 @@
-import { buildGroupPage } from 'discourse/routes/group-activity-posts';
-
-export default buildGroupPage('messages');
diff --git a/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6
index 827c8c468b6..bc0e3d2ccf7 100644
--- a/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6
@@ -12,8 +12,13 @@ export function buildGroupPage(type) {
     },
 
     setupController(controller, model) {
-      this.controllerFor('group-activity-posts').setProperties({ model, type, canLoadMore: true });
-      this.controllerFor("group").set("showing", type);
+      let loadedAll = model.length < 20;
+      this.controllerFor('group-activity-posts').setProperties({
+        model,
+        type,
+        canLoadMore: !loadedAll,
+      });
+      this.controllerFor('application').set('showFooter', loadedAll);
     },
 
     renderTemplate() {
diff --git a/app/assets/javascripts/discourse/routes/group-activity-topics.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-topics.js.es6
index 16164a51bb3..5310f0cad65 100644
--- a/app/assets/javascripts/discourse/routes/group-activity-topics.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-activity-topics.js.es6
@@ -1,3 +1,11 @@
-import { buildGroupPage } from 'discourse/routes/group-activity-posts';
+export default Discourse.Route.extend({
+  titleToken() {
+    return I18n.t(`groups.topics`);
+  },
 
-export default buildGroupPage('topics');
+  model() {
+    return this.store.findFiltered("topicList", {
+      filter: `topics/groups/${this.modelFor('group').get('name')}`
+    });
+  }
+});
diff --git a/app/assets/javascripts/discourse/routes/group-edit.js.es6 b/app/assets/javascripts/discourse/routes/group-edit.js.es6
deleted file mode 100644
index 19b8ec1caee..00000000000
--- a/app/assets/javascripts/discourse/routes/group-edit.js.es6
+++ /dev/null
@@ -1,21 +0,0 @@
-export default Ember.Route.extend({
-  titleToken() {
-    return I18n.t('groups.edit.title');
-  },
-
-  model() {
-    return this.modelFor('group');
-  },
-
-  afterModel(group) {
-    if (!this.currentUser || !this.currentUser.canManageGroup(group)) {
-      this.transitionTo("group.members", group);
-    }
-  },
-
-  setupController(controller, model) {
-    this.controllerFor('group-edit').setProperties({ model });
-    this.controllerFor("group").set("showing", 'edit');
-    model.findMembers();
-  }
-});
diff --git a/app/assets/javascripts/discourse/routes/group-index.js.es6 b/app/assets/javascripts/discourse/routes/group-index.js.es6
index 003a4a8d9e1..2792291dc31 100644
--- a/app/assets/javascripts/discourse/routes/group-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-index.js.es6
@@ -1,15 +1,38 @@
+import showModal from 'discourse/lib/show-modal';
+
 export default Discourse.Route.extend({
   titleToken() {
-    return I18n.t('groups.members');
+    return I18n.t('groups.members.title');
   },
 
-  model() {
+  model(params) {
+    this._params = params;
     return this.modelFor("group");
   },
 
   setupController(controller, model) {
     this.controllerFor("group").set("showing", "members");
-    controller.set("model", model);
+
+    controller.setProperties({
+      model,
+      filterInput: this._params.filter
+    });
+
     controller.refreshMembers();
+  },
+
+  actions: {
+    showAddMembersModal() {
+      showModal('group-add-members', { model: this.modelFor('group') });
+    },
+
+    showBulkAddModal() {
+      showModal('group-bulk-add', { model: this.modelFor('group') });
+    },
+
+    didTransition() {
+      this.controllerFor("group-index").set("filterInput", this._params.filter);
+      return true;
+    }
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/group-logs.js.es6 b/app/assets/javascripts/discourse/routes/group-logs.js.es6
deleted file mode 100644
index 0d365fab188..00000000000
--- a/app/assets/javascripts/discourse/routes/group-logs.js.es6
+++ /dev/null
@@ -1,20 +0,0 @@
-export default Ember.Route.extend({
-  titleToken() {
-    return I18n.t('groups.logs');
-  },
-
-  model() {
-    return this.modelFor('group').findLogs();
-  },
-
-  setupController(controller, model) {
-    this.controllerFor('group-logs').setProperties({ model });
-    this.controllerFor("group").set("showing", 'logs');
-  },
-
-  actions: {
-    willTransition() {
-      this.controllerFor('group-logs').reset();
-    }
-  }
-});
diff --git a/app/assets/javascripts/discourse/routes/group-manage-index.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-index.js.es6
new file mode 100644
index 00000000000..590722bb0fa
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/group-manage-index.js.es6
@@ -0,0 +1,7 @@
+export default Discourse.Route.extend({
+  showFooter: true,
+
+  beforeModel() {
+    this.transitionTo("group.manage.profile");
+  }
+});
diff --git a/app/assets/javascripts/discourse/routes/group-manage-interaction.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-interaction.js.es6
new file mode 100644
index 00000000000..313fcda6423
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/group-manage-interaction.js.es6
@@ -0,0 +1,7 @@
+export default Discourse.Route.extend({
+  showFooter: true,
+
+  titleToken() {
+    return I18n.t('groups.manage.interaction.title');
+  },
+});
diff --git a/app/assets/javascripts/discourse/routes/group-manage-logs.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-logs.js.es6
new file mode 100644
index 00000000000..85ee4dfae98
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/group-manage-logs.js.es6
@@ -0,0 +1,19 @@
+export default Discourse.Route.extend({
+  titleToken() {
+    return I18n.t('groups.manage.logs.title');
+  },
+
+  model() {
+    return this.modelFor('group').findLogs();
+  },
+
+  setupController(controller, model) {
+    this.controllerFor('group-manage-logs').setProperties({ model });
+  },
+
+  actions: {
+    willTransition() {
+      this.controllerFor('group-manage-logs').reset();
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/routes/group-manage-membership.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-membership.js.es6
new file mode 100644
index 00000000000..7689197d96a
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/group-manage-membership.js.es6
@@ -0,0 +1,13 @@
+export default Discourse.Route.extend({
+  showFooter: true,
+
+  titleToken() {
+    return I18n.t('groups.manage.membership.title');
+  },
+
+  afterModel(group) {
+    if (group.get('automatic')) {
+      this.replaceWith("group.manage.interaction", group);
+    }
+  },
+});
diff --git a/app/assets/javascripts/discourse/routes/group-manage-profile.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-profile.js.es6
new file mode 100644
index 00000000000..e0c37246e16
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/group-manage-profile.js.es6
@@ -0,0 +1,13 @@
+export default Discourse.Route.extend({
+  showFooter: true,
+
+  titleToken() {
+    return I18n.t('groups.manage.profile.title');
+  },
+
+  afterModel(group) {
+    if (group.get('automatic')) {
+      this.replaceWith("group.manage.interaction", group);
+    }
+  },
+});
diff --git a/app/assets/javascripts/discourse/routes/group-manage.js.es6 b/app/assets/javascripts/discourse/routes/group-manage.js.es6
new file mode 100644
index 00000000000..e7af6740ed3
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/group-manage.js.es6
@@ -0,0 +1,25 @@
+export default Discourse.Route.extend({
+  showFooter: true,
+
+  titleToken() {
+    return I18n.t('groups.manage.title');
+  },
+
+  model() {
+    return this.modelFor('group');
+  },
+
+  afterModel(group) {
+    if (!this.currentUser ||
+        !(this.currentUser.admin && group.get('automatic')) &&
+        !this.currentUser.canManageGroup(group)) {
+
+      this.transitionTo("group.members", group);
+    }
+  },
+
+  setupController(controller, model) {
+    this.controllerFor('group-manage').setProperties({ model });
+    this.controllerFor("group").set("showing", 'manage');
+  },
+});
diff --git a/app/assets/javascripts/discourse/routes/group-messages-archive.js.es6 b/app/assets/javascripts/discourse/routes/group-messages-archive.js.es6
new file mode 100644
index 00000000000..4920aa20005
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/group-messages-archive.js.es6
@@ -0,0 +1,3 @@
+import buildGroupMessagesRoute from 'discourse/routes/build-group-messages-route';
+
+export default buildGroupMessagesRoute('archive');
diff --git a/app/assets/javascripts/discourse/routes/group-messages-inbox.js.es6 b/app/assets/javascripts/discourse/routes/group-messages-inbox.js.es6
new file mode 100644
index 00000000000..03ad513b5d2
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/group-messages-inbox.js.es6
@@ -0,0 +1,3 @@
+import buildGroupMessagesRoute from 'discourse/routes/build-group-messages-route';
+
+export default buildGroupMessagesRoute('inbox');
diff --git a/app/assets/javascripts/discourse/routes/group-messages-index.js.es6 b/app/assets/javascripts/discourse/routes/group-messages-index.js.es6
new file mode 100644
index 00000000000..68750d154a0
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/group-messages-index.js.es6
@@ -0,0 +1,5 @@
+export default Ember.Route.extend({
+  beforeModel: function() {
+    this.transitionTo("group.messages.inbox");
+  }
+});
diff --git a/app/assets/javascripts/discourse/routes/group-messages.js.es6 b/app/assets/javascripts/discourse/routes/group-messages.js.es6
new file mode 100644
index 00000000000..2bf743b726d
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/group-messages.js.es6
@@ -0,0 +1,15 @@
+export default Discourse.Route.extend({
+  titleToken() {
+    return I18n.t('groups.messages');
+  },
+
+  model() {
+    return this.modelFor('group');
+  },
+
+  afterModel(group) {
+    if (!group.get('is_group_user') && !(this.currentUser && this.currentUser.admin)) {
+      this.transitionTo("group.members", group);
+    }
+  },
+});
diff --git a/app/assets/javascripts/discourse/routes/group.js.es6 b/app/assets/javascripts/discourse/routes/group.js.es6
index 3df20f794bf..11926198cca 100644
--- a/app/assets/javascripts/discourse/routes/group.js.es6
+++ b/app/assets/javascripts/discourse/routes/group.js.es6
@@ -1,13 +1,10 @@
-import Group from 'discourse/models/group';
-
 export default Discourse.Route.extend({
-
   titleToken() {
     return [ this.modelFor('group').get('name') ];
   },
 
   model(params) {
-    return Group.find(params.name);
+    return this.store.find("group", params.name);
   },
 
   serialize(model) {
@@ -15,6 +12,6 @@ export default Discourse.Route.extend({
   },
 
   setupController(controller, model) {
-    controller.setProperties({ model, counts: this.get('counts') });
+    controller.setProperties({ model });
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/groups-index.js.es6 b/app/assets/javascripts/discourse/routes/groups-index.js.es6
new file mode 100644
index 00000000000..9b53f67906d
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/groups-index.js.es6
@@ -0,0 +1,27 @@
+export default Discourse.Route.extend({
+  titleToken() {
+    return I18n.t('groups.index.title');
+  },
+
+  queryParams: {
+    order: { refreshModel: true, replace: true },
+    asc: { refreshModel: true, replace: true },
+    filter: { refreshModel: true },
+    type: { refreshModel: true, replace: true },
+    username: { refreshModel: true },
+  },
+
+  refreshQueryWithoutTransition: true,
+
+  model(params) {
+    this._params = params;
+    return this.store.findAll("group", params);
+  },
+
+  setupController(controller, model) {
+    controller.setProperties({
+      model,
+      filterInput: this._params.filter
+    });
+  },
+});
diff --git a/app/assets/javascripts/discourse/routes/groups-new.js.es6 b/app/assets/javascripts/discourse/routes/groups-new.js.es6
new file mode 100644
index 00000000000..e5a6fdd03c4
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/groups-new.js.es6
@@ -0,0 +1,23 @@
+import Group from 'discourse/models/group';
+
+export default Discourse.Route.extend({
+  showFooter: true,
+
+  titleToken() {
+    return I18n.t('admin.groups.new.title');
+  },
+
+  model() {
+    return Group.create({ automatic: false, visibility_level: 0 });
+  },
+
+  setupController(controller, model) {
+    controller.set("model", model);
+  },
+
+  afterModel() {
+    if (!(this.currentUser && this.currentUser.admin)) {
+      this.transitionTo("groups");
+    }
+  },
+});
diff --git a/app/assets/javascripts/discourse/routes/groups.js.es6 b/app/assets/javascripts/discourse/routes/groups.js.es6
deleted file mode 100644
index 582ebe0f5c6..00000000000
--- a/app/assets/javascripts/discourse/routes/groups.js.es6
+++ /dev/null
@@ -1,13 +0,0 @@
-export default Discourse.Route.extend({
-  titleToken() {
-    return I18n.t('groups.index.title');
-  },
-
-  model(params) {
-    return this.store.findAll('group', params);
-  },
-
-  setupController(controller, model) {
-    controller.set('groups', model);
-  }
-});
diff --git a/app/assets/javascripts/discourse/routes/new-message.js.es6 b/app/assets/javascripts/discourse/routes/new-message.js.es6
index 91269c4a5b0..d3ea4fde433 100644
--- a/app/assets/javascripts/discourse/routes/new-message.js.es6
+++ b/app/assets/javascripts/discourse/routes/new-message.js.es6
@@ -4,10 +4,12 @@ import Group from 'discourse/models/group';
 export default Discourse.Route.extend({
 
   beforeModel(transition) {
+    const self = this;
     const params = transition.queryParams;
+    const groupName = params.groupname || params.group_name;
 
-    if (this.currentUser) {
-      this.replaceWith("discovery.latest").then(e => {
+    if (self.currentUser) {
+      self.replaceWith("discovery.latest").then(e => {
         if (params.username) {
           // send a message to a user
           User.findByUsername(params.username).then(user => {
@@ -19,13 +21,13 @@ export default Discourse.Route.extend({
           }).catch(function() {
             bootbox.alert(I18n.t("generic_error"));
           });
-        } else if (params.groupname) {
+        } else if (groupName) {
           // send a message to a group
-          Group.messageable(params.groupname).then(result => {
+          Group.messageable(groupName).then(result => {
             if (result.messageable) {
-              Ember.run.next(() => e.send("createNewMessageViaParams", params.groupname, params.title, params.body));
+              Ember.run.next(() => e.send("createNewMessageViaParams", groupName, params.title, params.body));
             } else {
-              bootbox.alert(I18n.t("composer.cant_send_pm", { username: params.groupname }));
+              bootbox.alert(I18n.t("composer.cant_send_pm", { username: groupName }));
             }
           }).catch(function() {
             bootbox.alert(I18n.t("generic_error"));
diff --git a/app/assets/javascripts/discourse/routes/post.js.es6 b/app/assets/javascripts/discourse/routes/post.js.es6
new file mode 100644
index 00000000000..f8f06e46c43
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/post.js.es6
@@ -0,0 +1,9 @@
+import { ajax } from "discourse/lib/ajax";
+
+export default Discourse.Route.extend({
+  beforeModel({ params }) {
+    return ajax(`/p/${params.post.id}`).then(t => {
+      this.transitionTo("topic.fromParamsNear", t.slug, t.id, t.current_post_number);
+    });
+  }
+});
diff --git a/app/assets/javascripts/discourse/routes/preferences-about.js.es6 b/app/assets/javascripts/discourse/routes/preferences-about.js.es6
index 12e819af59a..e5c86f6fdb4 100644
--- a/app/assets/javascripts/discourse/routes/preferences-about.js.es6
+++ b/app/assets/javascripts/discourse/routes/preferences-about.js.es6
@@ -1,6 +1,8 @@
 import RestrictedUserRoute from "discourse/routes/restricted-user";
 
 export default RestrictedUserRoute.extend({
+  showFooter: true,
+
   model: function() {
     return this.modelFor('user');
   },
diff --git a/app/assets/javascripts/discourse/routes/preferences-account.js.es6 b/app/assets/javascripts/discourse/routes/preferences-account.js.es6
index 2c34c9df2f0..29200b6fd11 100644
--- a/app/assets/javascripts/discourse/routes/preferences-account.js.es6
+++ b/app/assets/javascripts/discourse/routes/preferences-account.js.es6
@@ -1,11 +1,27 @@
+import UserBadge from 'discourse/models/user-badge';
 import RestrictedUserRoute from "discourse/routes/restricted-user";
 
 export default RestrictedUserRoute.extend({
+  showFooter: true,
+
+  model: function() {
+    const user = this.modelFor('user');
+    if (this.siteSettings.enable_badges) {
+      return UserBadge.findByUsername(this.modelFor('user').get('username')).then(userBadges => {
+        user.set('badges', userBadges.map(ub => ub.badge));
+        return user;
+      });
+    } else {
+     return user;
+    }
+  },
+
   setupController(controller, user) {
     controller.reset();
     controller.setProperties({
       model: user,
-      newNameInput: user.get('name')
+      newNameInput: user.get('name'),
+      newTitleInput: user.get('title')
     });
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/preferences-badge-title.js.es6 b/app/assets/javascripts/discourse/routes/preferences-badge-title.js.es6
deleted file mode 100644
index 4491aff2543..00000000000
--- a/app/assets/javascripts/discourse/routes/preferences-badge-title.js.es6
+++ /dev/null
@@ -1,32 +0,0 @@
-import UserBadge from 'discourse/models/user-badge';
-import RestrictedUserRoute from "discourse/routes/restricted-user";
-
-export default RestrictedUserRoute.extend({
-  model: function() {
-    return UserBadge.findByUsername(this.modelFor('user').get('username'));
-  },
-
-  renderTemplate: function() {
-    return this.render('user/badge-title', { into: 'user' });
-  },
-
-  // A bit odd, but if we leave to /preferences we need to re-render that outlet
-  deactivate: function() {
-    this._super();
-    this.render('preferences', { into: 'user', controller: 'preferences' });
-  },
-
-  setupController: function(controller, model) {
-    controller.set('model', model);
-    controller.set('user', this.modelFor('user'));
-
-    model.forEach(function(userBadge) {
-      if (userBadge.get('badge.name') === controller.get('user.title')) {
-        controller.set('selectedUserBadgeId', userBadge.get('id'));
-      }
-    });
-    if (!controller.get('selectedUserBadgeId') && controller.get('selectableUserBadges.length') > 0) {
-      controller.set('selectedUserBadgeId', controller.get('selectableUserBadges')[0].get('id'));
-    }
-  }
-});
diff --git a/app/assets/javascripts/discourse/routes/preferences-card-badge.js.es6 b/app/assets/javascripts/discourse/routes/preferences-card-badge.js.es6
deleted file mode 100644
index 8ec81a95d1c..00000000000
--- a/app/assets/javascripts/discourse/routes/preferences-card-badge.js.es6
+++ /dev/null
@@ -1,30 +0,0 @@
-import UserBadge from 'discourse/models/user-badge';
-import RestrictedUserRoute from "discourse/routes/restricted-user";
-
-export default RestrictedUserRoute.extend({
-  model: function() {
-    return UserBadge.findByUsername(this.modelFor('user').get('username'));
-  },
-
-  renderTemplate: function() {
-    return this.render({ into: 'user' });
-  },
-
-  // A bit odd, but if we leave to /preferences we need to re-render that outlet
-  deactivate: function() {
-    this._super();
-    this.render('preferences', { into: 'user', controller: 'preferences' });
-  },
-
-  setupController: function(controller, model) {
-    controller.set('model', model);
-    controller.set('user', this.modelFor('user'));
-
-    model.forEach(function(userBadge) {
-      if (userBadge.get('badge.image') === controller.get('user.card_image_badge')) {
-        controller.set('selectedUserBadgeId', userBadge.get('id'));
-      }
-    });
-  }
-});
-
diff --git a/app/assets/javascripts/discourse/routes/preferences-categories.js.es6 b/app/assets/javascripts/discourse/routes/preferences-categories.js.es6
new file mode 100644
index 00000000000..713d79e4207
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/preferences-categories.js.es6
@@ -0,0 +1,5 @@
+import RestrictedUserRoute from "discourse/routes/restricted-user";
+
+export default RestrictedUserRoute.extend({
+  showFooter: true
+});
diff --git a/app/assets/javascripts/discourse/routes/preferences-email.js.es6 b/app/assets/javascripts/discourse/routes/preferences-email.js.es6
index b9c02c3a850..77e80e75764 100644
--- a/app/assets/javascripts/discourse/routes/preferences-email.js.es6
+++ b/app/assets/javascripts/discourse/routes/preferences-email.js.es6
@@ -1,6 +1,8 @@
 import RestrictedUserRoute from "discourse/routes/restricted-user";
 
 export default RestrictedUserRoute.extend({
+  showFooter: true,
+
   model: function() {
     return this.modelFor('user');
   },
diff --git a/app/assets/javascripts/discourse/routes/preferences-index.js.es6 b/app/assets/javascripts/discourse/routes/preferences-index.js.es6
index 3006f4b8533..49964f42cc2 100644
--- a/app/assets/javascripts/discourse/routes/preferences-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/preferences-index.js.es6
@@ -1,6 +1,8 @@
 import RestrictedUserRoute from "discourse/routes/restricted-user";
 
 export default RestrictedUserRoute.extend({
+  showFooter: true,
+
   redirect() {
     this.transitionTo('preferences.account');
   }
diff --git a/app/assets/javascripts/discourse/routes/preferences-interface.js.es6 b/app/assets/javascripts/discourse/routes/preferences-interface.js.es6
index f58658956fc..729e79dedd9 100644
--- a/app/assets/javascripts/discourse/routes/preferences-interface.js.es6
+++ b/app/assets/javascripts/discourse/routes/preferences-interface.js.es6
@@ -1,6 +1,8 @@
 import RestrictedUserRoute from "discourse/routes/restricted-user";
 
 export default RestrictedUserRoute.extend({
+  showFooter: true,
+
   setupController(controller, user) {
     controller.setProperties({
       model: user
diff --git a/app/assets/javascripts/discourse/routes/preferences-notifications.js.es6 b/app/assets/javascripts/discourse/routes/preferences-notifications.js.es6
new file mode 100644
index 00000000000..713d79e4207
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/preferences-notifications.js.es6
@@ -0,0 +1,5 @@
+import RestrictedUserRoute from "discourse/routes/restricted-user";
+
+export default RestrictedUserRoute.extend({
+  showFooter: true
+});
diff --git a/app/assets/javascripts/discourse/routes/preferences-second-factor.js.es6 b/app/assets/javascripts/discourse/routes/preferences-second-factor.js.es6
new file mode 100644
index 00000000000..b688ec813bc
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/preferences-second-factor.js.es6
@@ -0,0 +1,15 @@
+import RestrictedUserRoute from "discourse/routes/restricted-user";
+
+export default RestrictedUserRoute.extend({
+  model() {
+    return this.modelFor('user');
+  },
+
+  renderTemplate() {
+    return this.render({ into: 'user' });
+  },
+
+  setupController(controller, model) {
+    controller.setProperties({ model, newUsername: model.get('username') });
+  }
+});
diff --git a/app/assets/javascripts/discourse/routes/preferences-username.js.es6 b/app/assets/javascripts/discourse/routes/preferences-username.js.es6
index 09fbc0ec6b0..6737345bcd0 100644
--- a/app/assets/javascripts/discourse/routes/preferences-username.js.es6
+++ b/app/assets/javascripts/discourse/routes/preferences-username.js.es6
@@ -1,6 +1,8 @@
 import RestrictedUserRoute from "discourse/routes/restricted-user";
 
 export default RestrictedUserRoute.extend({
+  showFooter: true,
+
   model: function() {
     return this.modelFor('user');
   },
diff --git a/app/assets/javascripts/discourse/routes/preferences.js.es6 b/app/assets/javascripts/discourse/routes/preferences.js.es6
index e1cc50fc5cc..1eb3d4b3e17 100644
--- a/app/assets/javascripts/discourse/routes/preferences.js.es6
+++ b/app/assets/javascripts/discourse/routes/preferences.js.es6
@@ -3,6 +3,7 @@ import showModal from 'discourse/lib/show-modal';
 import { popupAjaxError } from 'discourse/lib/ajax-error';
 
 export default RestrictedUserRoute.extend({
+
   model() {
     return this.modelFor('user');
   },
diff --git a/app/assets/javascripts/discourse/routes/tag-groups-show.js.es6 b/app/assets/javascripts/discourse/routes/tag-groups-show.js.es6
index 0d67542b2f9..b91bbf9aa07 100644
--- a/app/assets/javascripts/discourse/routes/tag-groups-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/tag-groups-show.js.es6
@@ -1,4 +1,6 @@
 export default Discourse.Route.extend({
+  showFooter: true,
+
   model(params) {
     return this.store.find('tagGroup', params.id);
   }
diff --git a/app/assets/javascripts/discourse/routes/tag-groups.js.es6 b/app/assets/javascripts/discourse/routes/tag-groups.js.es6
index 6d6476964af..fb983936cf5 100644
--- a/app/assets/javascripts/discourse/routes/tag-groups.js.es6
+++ b/app/assets/javascripts/discourse/routes/tag-groups.js.es6
@@ -1,4 +1,6 @@
 export default Discourse.Route.extend({
+  showFooter: true,
+
   model() {
     return this.store.findAll('tagGroup');
   },
diff --git a/app/assets/javascripts/discourse/routes/tags-index.js.es6 b/app/assets/javascripts/discourse/routes/tags-index.js.es6
index dcbe6f19290..7b7bffedb9a 100644
--- a/app/assets/javascripts/discourse/routes/tags-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/tags-index.js.es6
@@ -1,6 +1,22 @@
+import Tag from "discourse/models/tag";
+
 export default Discourse.Route.extend({
   model() {
-    return this.store.findAll('tag');
+    return this.store.findAll("tag").then(result => {
+      if (result.extras) {
+        if (result.extras.categories) {
+          result.extras.categories.forEach(category => {
+            category.tags = category.tags.map(t => Tag.create(t));
+          });
+        }
+        if (result.extras.tag_groups) {
+          result.extras.tag_groups.forEach(tagGroup => {
+            tagGroup.tags = tagGroup.tags.map(t => Tag.create(t));
+          });
+        }
+      }
+      return result;
+    });
   },
 
   titleToken() {
@@ -10,7 +26,7 @@ export default Discourse.Route.extend({
   setupController(controller, model) {
     this.controllerFor('tags.index').setProperties({
       model,
-      sortProperties: this.siteSettings.tags_sort_alphabetically ? ['id'] : ['count:desc', 'id']
+      sortProperties: this.siteSettings.tags_sort_alphabetically ? ['id'] : ['totalCount:desc', 'id']
     });
   },
 
diff --git a/app/assets/javascripts/discourse/routes/tags-show.js.es6 b/app/assets/javascripts/discourse/routes/tags-show.js.es6
index eec3a6b3623..68e37e44eff 100644
--- a/app/assets/javascripts/discourse/routes/tags-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/tags-show.js.es6
@@ -129,18 +129,22 @@ export default Discourse.Route.extend({
       var controller = this.controllerFor("tags.show"),
           self = this;
 
-      this.controllerFor('composer').open({
-        categoryId: controller.get('category.id'),
-        action: Composer.CREATE_TOPIC,
-        draftKey: controller.get('list.draft_key'),
-        draftSequence: controller.get('list.draft_sequence')
-      }).then(function() {
-        // Pre-fill the tags input field
-        if (controller.get('model.id')) {
-          var c = self.controllerFor('composer').get('model');
-          c.set('tags', _.flatten([controller.get('model.id')], controller.get('additionalTags')));
-        }
-      });
+      if (controller.get('list.draft')) {
+        this.openTopicDraft(controller.get('list'));
+      } else {
+        this.controllerFor('composer').open({
+          categoryId: controller.get('category.id'),
+          action: Composer.CREATE_TOPIC,
+          draftKey: controller.get('list.draft_key'),
+          draftSequence: controller.get('list.draft_sequence')
+        }).then(function() {
+          // Pre-fill the tags input field
+          if (controller.get('model.id')) {
+            var c = self.controllerFor('composer').get('model');
+            c.set('tags', _.flatten([controller.get('model.id')], controller.get('additionalTags')));
+          }
+        });
+      }
     },
 
     didTransition() {
diff --git a/app/assets/javascripts/discourse/routes/topic-unsubscribe.js.es6 b/app/assets/javascripts/discourse/routes/topic-unsubscribe.js.es6
deleted file mode 100644
index 2faf69d0fb5..00000000000
--- a/app/assets/javascripts/discourse/routes/topic-unsubscribe.js.es6
+++ /dev/null
@@ -1,19 +0,0 @@
-import { loadTopicView } from 'discourse/models/topic';
-
-export default Discourse.Route.extend({
-  model(params) {
-    const topic = this.store.createRecord("topic", { id: params.id });
-    return loadTopicView(topic).then(() => topic);
-  },
-
-  afterModel(topic) {
-    topic.set("details.notificationReasonText", null);
-  },
-
-  actions: {
-    didTransition() {
-      this.controllerFor("application").set("showFooter", true);
-      return true;
-    }
-  }
-});
diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6
index 9cc709d1979..281adb45ff5 100644
--- a/app/assets/javascripts/discourse/routes/topic.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic.js.es6
@@ -85,6 +85,10 @@ const TopicRoute = Discourse.Route.extend({
       this.controllerFor('modal').set('modalClass', 'history-modal');
     },
 
+    showGrantBadgeModal() {
+      showModal('grant-badge', { model: this.modelFor('topic'), title: 'admin.badges.grant_badge' });
+    },
+
     showRawEmail(model) {
       showModal('raw-email', { model });
       this.controllerFor('raw_email').loadRawEmail(model.get("id"));
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-archive.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-archive.js.es6
index 7ebf279b290..ef304e9094b 100644
--- a/app/assets/javascripts/discourse/routes/user-private-messages-archive.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-private-messages-archive.js.es6
@@ -1,3 +1,3 @@
 import createPMRoute from "discourse/routes/build-private-messages-route";
 
-export default createPMRoute('archive', 'private-messages-archive');
+export default createPMRoute('archive', 'private-messages-archive', 'archive');
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-group-archive.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-group-archive.js.es6
index 19d84f9b7e1..0594b9d1128 100644
--- a/app/assets/javascripts/discourse/routes/user-private-messages-group-archive.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-private-messages-group-archive.js.es6
@@ -1,26 +1,41 @@
 import createPMRoute from "discourse/routes/build-private-messages-route";
 
 export default createPMRoute('groups', 'private-messages-groups').extend({
-    model(params) {
-      const username = this.modelFor("user").get("username_lower");
-      return this.store.findFiltered("topicList", {
-        filter: `topics/private-messages-group/${username}/${params.name}/archive`
-      });
-    },
+  groupName: null,
 
-    afterModel(model) {
-      const split = model.get("filter").split('/');
-      const groupName = split[split.length-2];
-      const groups = this.modelFor("user").get("groups");
-      const group = _.first(groups.filterBy("name", groupName));
-      this.controllerFor("user-private-messages").set("group", group);
-    },
+  titleToken() {
+    const groupName = this.get('groupName');
 
-    setupController(controller, model) {
-      this._super.apply(this, arguments);
-      const split = model.get("filter").split('/');
-      const group = split[split.length-2];
-      this.controllerFor("user-private-messages").set("groupFilter", group);
-      this.controllerFor("user-private-messages").set("archive", true);
-    }
+    if (groupName) {
+      return [
+        `${groupName.capitalize()} ${I18n.t('user.messages.archive')}`,
+        I18n.t("user.private_messages")
+      ];
+    };
+  },
+
+  model(params) {
+    const username = this.modelFor("user").get("username_lower");
+    return this.store.findFiltered("topicList", {
+      filter: `topics/private-messages-group/${username}/${params.name}/archive`
+    });
+  },
+
+  afterModel(model) {
+    const split = model.get("filter").split('/');
+    const groupName = split[split.length-2];
+    this.set("groupName", groupName);
+    const groups = this.modelFor("user").get("groups");
+    const group = _.first(groups.filterBy("name", groupName));
+    this.controllerFor("user-private-messages").set("group", group);
+  },
+
+  setupController(controller, model) {
+    this._super.apply(this, arguments);
+    const split = model.get("filter").split('/');
+    const group = split[split.length-2];
+    this.controllerFor("user-private-messages").set("groupFilter", group);
+    this.controllerFor("user-private-messages").set("archive", true);
+    this.controllerFor("user-topics-list").subscribe(`/private-messages/group/${group}/archive`);
+  }
 });
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-group.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-group.js.es6
index 0b7f923f208..556f65fded1 100644
--- a/app/assets/javascripts/discourse/routes/user-private-messages-group.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-private-messages-group.js.es6
@@ -1,24 +1,33 @@
 import createPMRoute from "discourse/routes/build-private-messages-route";
 
 export default createPMRoute('groups', 'private-messages-groups').extend({
-    model(params) {
-      const username = this.modelFor("user").get("username_lower");
-      return this.store.findFiltered("topicList", {
-        filter: `topics/private-messages-group/${username}/${params.name}`
-      });
-    },
+  groupName: null,
 
-    afterModel(model) {
-      const groupName = _.last(model.get("filter").split('/'));
-      const groups = this.modelFor("user").get("groups");
-      const group = _.first(groups.filterBy("name", groupName));
-      this.controllerFor("user-private-messages").set("group", group);
-    },
+  titleToken() {
+    const groupName = this.get('groupName');
+    if (groupName) return [groupName.capitalize(), I18n.t("user.private_messages")];
+  },
 
-    setupController(controller, model) {
-      this._super.apply(this, arguments);
-      const group = _.last(model.get("filter").split('/'));
-      this.controllerFor("user-private-messages").set("groupFilter", group);
-      this.controllerFor("user-private-messages").set("archive", false);
-    }
+  model(params) {
+    const username = this.modelFor("user").get("username_lower");
+    return this.store.findFiltered("topicList", {
+      filter: `topics/private-messages-group/${username}/${params.name}`
+    });
+  },
+
+  afterModel(model) {
+    const groupName = _.last(model.get("filter").split('/'));
+    this.set("groupName", groupName);
+    const groups = this.modelFor("user").get("groups");
+    const group = _.first(groups.filterBy("name", groupName));
+    this.controllerFor("user-private-messages").set("group", group);
+  },
+
+  setupController(controller, model) {
+    this._super.apply(this, arguments);
+    const group = _.last(model.get("filter").split('/'));
+    this.controllerFor("user-private-messages").set("groupFilter", group);
+    this.controllerFor("user-private-messages").set("archive", false);
+    this.controllerFor("user-topics-list").subscribe(`/private-messages/group/${group}`);
+  }
 });
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-index.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-index.js.es6
index d1e2bf3c275..127d64cfee6 100644
--- a/app/assets/javascripts/discourse/routes/user-private-messages-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-private-messages-index.js.es6
@@ -1,3 +1,3 @@
 import createPMRoute from "discourse/routes/build-private-messages-route";
 
-export default createPMRoute('index', 'private-messages');
+export default createPMRoute('index', 'private-messages', 'inbox');
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-sent.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-sent.js.es6
index b31c2f4c9fe..2312be91796 100644
--- a/app/assets/javascripts/discourse/routes/user-private-messages-sent.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-private-messages-sent.js.es6
@@ -1,3 +1,3 @@
 import createPMRoute from "discourse/routes/build-private-messages-route";
 
-export default createPMRoute('sent', 'private-messages-sent');
+export default createPMRoute('sent', 'private-messages-sent', 'sent');
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-tags-show.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-tags-show.js.es6
new file mode 100644
index 00000000000..3ab2439e86e
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/user-private-messages-tags-show.js.es6
@@ -0,0 +1,11 @@
+import createPMRoute from "discourse/routes/build-private-messages-route";
+
+export default createPMRoute('tags', 'private-messages-tags').extend({
+    model(params) {
+      this.controllerFor('user-private-messages').set('tagId', params.id);
+      const username = this.modelFor("user").get("username_lower");
+      return this.store.findFiltered("topicList", {
+        filter: `topics/private-messages-tags/${username}/${params.id}`
+      });
+    }
+});
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-tags.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-tags.js.es6
new file mode 100644
index 00000000000..d2297f23842
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/user-private-messages-tags.js.es6
@@ -0,0 +1,27 @@
+import { ajax } from 'discourse/lib/ajax';
+import { popupAjaxError } from 'discourse/lib/ajax-error';
+
+export default Discourse.Route.extend({
+  model() {
+    const username = this.modelFor("user").get("username_lower");
+    return ajax(`/tags/personal_messages/${username}`).then(result => {
+      return result.tags.map(tag => Ember.Object.create(tag));
+    }).catch(popupAjaxError);
+  },
+
+  titleToken() {
+    return [I18n.t("tagging.tags"), I18n.t("user.private_messages")];
+  },
+
+  setupController(controller, model) {
+    this.controllerFor('user-private-messages-tags').setProperties({
+      model,
+      sortProperties: this.siteSettings.tags_sort_alphabetically ? ['id'] : ['count:desc', 'id'],
+      tagsForUser: this.modelFor("user").get("username_lower")
+    });
+    this.controllerFor('user-private-messages').setProperties({
+      showToggleBulkSelect: false,
+      pmView: "tags"
+    });
+  }
+});
diff --git a/app/assets/javascripts/discourse/routes/user-summary.js.es6 b/app/assets/javascripts/discourse/routes/user-summary.js.es6
index a191c418722..39d4571973d 100644
--- a/app/assets/javascripts/discourse/routes/user-summary.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-summary.js.es6
@@ -1,4 +1,6 @@
 export default Discourse.Route.extend({
+  showFooter: true,
+
   model() {
     return this.modelFor("user").summary();
   },
diff --git a/app/assets/javascripts/discourse/routes/users.js.es6 b/app/assets/javascripts/discourse/routes/users.js.es6
index ab3cbe32060..9cb825c0f47 100644
--- a/app/assets/javascripts/discourse/routes/users.js.es6
+++ b/app/assets/javascripts/discourse/routes/users.js.es6
@@ -3,7 +3,9 @@ export default Discourse.Route.extend({
     period: { refreshModel: true },
     order: { refreshModel: true },
     asc: { refreshModel: true },
-    name: { refreshModel: true, replace: true }
+    name: { refreshModel: true, replace: true },
+    group: { refreshModel: true },
+    exclude_usernames: { refreshModel: true }
   },
 
   refreshQueryWithoutTransition: true,
@@ -18,7 +20,9 @@ export default Discourse.Route.extend({
         period: "weekly",
         order: "likes_received",
         asc: null,
-        name: ""
+        name: "",
+        group: null,
+        exclude_usernames: null
       });
     }
   },
diff --git a/app/assets/javascripts/discourse/templates/application.hbs b/app/assets/javascripts/discourse/templates/application.hbs
index dfe8853dcec..c75d0087c1f 100644
--- a/app/assets/javascripts/discourse/templates/application.hbs
+++ b/app/assets/javascripts/discourse/templates/application.hbs
@@ -14,6 +14,7 @@
     {{#if showTop}}
       {{custom-html name="top"}}
     {{/if}}
+    {{notification-consent-banner}}
     {{global-notice}}
     {{create-topics-notice}}
   </div>
@@ -23,7 +24,7 @@
 
 {{plugin-outlet name="above-footer" args=(hash showFooter=showFooter)}}
 {{#if showFooter}}
-  {{custom-html name="footer"}}
+  {{custom-html name="footer" triggerAppEvent="true"}}
 {{/if}}
 {{plugin-outlet name="below-footer" args=(hash showFooter=showFooter)}}
 
diff --git a/app/assets/javascripts/discourse/templates/badge-selector-autocomplete.raw.hbs b/app/assets/javascripts/discourse/templates/badge-selector-autocomplete.raw.hbs
index 4537c451601..611ba05f3a9 100644
--- a/app/assets/javascripts/discourse/templates/badge-selector-autocomplete.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/badge-selector-autocomplete.raw.hbs
@@ -1,4 +1,4 @@
-<div class='autocomplete'>
+<div class='autocomplete ac-badge'>
   <ul>
     {{#each options as |option|}}
       <li><a href>{{option.name}}</a></li>
diff --git a/app/assets/javascripts/discourse/templates/badges/index.hbs b/app/assets/javascripts/discourse/templates/badges/index.hbs
index 12adeb3d06f..b0e2c030f96 100644
--- a/app/assets/javascripts/discourse/templates/badges/index.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/index.hbs
@@ -8,10 +8,11 @@
           <div class='title'>
             <h3>{{bg.badgeGrouping.displayName}}</h3>
           </div>
-
-          {{#each bg.badges as |b|}}
-            {{badge-card badge=b filterUser=b.has_badge username=currentUser.username}}
-          {{/each}}
+          <div class="badge-group-list">
+            {{#each bg.badges as |b|}}
+              {{badge-card badge=b filterUser=b.has_badge username=currentUser.username}}
+            {{/each}}
+          </div>
         </div>
       {{/each}}
     </div>
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs
index fab3e9a5aad..952bac8b4f8 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/show.hbs
@@ -37,6 +37,7 @@
   {{#if userBadges}}
     <div class="user-badges {{model.slug}}">
       {{#load-more selector=".badge-info" action="loadMore"}}
+      <div class="badges-granted">
         {{#each userBadges as |ub|}}
           {{#user-info user=ub.user size="medium" class="badge-info" date=ub.granted_at}}
             <div class="granted-on">{{i18n 'badges.granted_on' date=(inline-date ub.granted_at)}}</div>
@@ -45,6 +46,7 @@
             {{/if}}
           {{/user-info}}
         {{/each}}
+        </div>
       {{/load-more}}
 
       {{#unless canLoadMore}}
diff --git a/app/assets/javascripts/discourse/templates/bulk-tag.hbs b/app/assets/javascripts/discourse/templates/bulk-tag.hbs
index 4ed48ddc2b6..3a54edf758d 100644
--- a/app/assets/javascripts/discourse/templates/bulk-tag.hbs
+++ b/app/assets/javascripts/discourse/templates/bulk-tag.hbs
@@ -1,5 +1,5 @@
 <p>{{i18n (concat "topics.bulk." title)}}</p>
 
-<p>{{tag-chooser tags=tags categoryId=categoryId}}</p>
+<p>{{tag-chooser filterPlaceholder=null tags=tags categoryId=categoryId}}</p>
 
 {{d-button action=action disabled=emptyTags label=(concat "topics.bulk." label)}}
diff --git a/app/assets/javascripts/discourse/templates/category-selector-autocomplete.raw.hbs b/app/assets/javascripts/discourse/templates/category-selector-autocomplete.raw.hbs
index bc2181f534a..76aad2442f5 100644
--- a/app/assets/javascripts/discourse/templates/category-selector-autocomplete.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/category-selector-autocomplete.raw.hbs
@@ -1,4 +1,4 @@
-<div class='autocomplete'>
+<div class='autocomplete ac-category'>
   <ul>
     {{#each options as |option|}}
       <li><a href>{{category-link option allowUncategorized="true" link="false"}}</a></li>
diff --git a/app/assets/javascripts/discourse/templates/category-tag-autocomplete.raw.hbs b/app/assets/javascripts/discourse/templates/category-tag-autocomplete.raw.hbs
index 3f4359aab56..7d1d72e88df 100644
--- a/app/assets/javascripts/discourse/templates/category-tag-autocomplete.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/category-tag-autocomplete.raw.hbs
@@ -1,4 +1,4 @@
-<div class='autocomplete'>
+<div class='autocomplete ac-category-or-tag'>
   <ul>
     {{#each options as |option|}}
       <li>
diff --git a/app/assets/javascripts/discourse/templates/components/badge-button.hbs b/app/assets/javascripts/discourse/templates/components/badge-button.hbs
index 8116e5195be..4dd20f5cdb0 100644
--- a/app/assets/javascripts/discourse/templates/components/badge-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/badge-button.hbs
@@ -1,3 +1,3 @@
-{{icon-or-image badge.icon}}
+{{icon-or-image badge}}
 <span class="badge-display-name">{{badge.name}}</span>
 {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/badge-card.hbs b/app/assets/javascripts/discourse/templates/components/badge-card.hbs
index 3c519d85ddf..4d30b969767 100644
--- a/app/assets/javascripts/discourse/templates/components/badge-card.hbs
+++ b/app/assets/javascripts/discourse/templates/components/badge-card.hbs
@@ -5,13 +5,15 @@
   <span class='check-display status-checked'>{{d-icon "check"}}</span>
 {{/if}}
 <div class='badge-contents'>
-  <div class='badge-icon {{badge.badgeTypeClassName}}'>
-    {{icon-or-image badge.icon}}
-  </div>
-  <div class='badge-info'>
-    <div class='badge-info-item'>
-      <h3><a href={{url}}>{{badge.name}}</a></h3>
-      <div class='badge-summary'>{{{summary}}}</div>
+  <a href={{url}} class="badge-link">
+    <div class='badge-icon {{badge.badgeTypeClassName}}'>
+      {{icon-or-image badge}}
     </div>
-  </div>
+    <div class='badge-info'>
+      <div class='badge-info-item'>
+        <h3>{{badge.name}}</h3>
+        <div class='badge-summary'>{{{summary}}}</div>
+      </div>
+    </div>
+  </a>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/badge-title.hbs b/app/assets/javascripts/discourse/templates/components/badge-title.hbs
index 8101829c4d1..0ac803fdad8 100644
--- a/app/assets/javascripts/discourse/templates/components/badge-title.hbs
+++ b/app/assets/javascripts/discourse/templates/components/badge-title.hbs
@@ -10,7 +10,10 @@
     <div class="control-group">
       <label class="control-label"></label>
       <div class="controls">
-        {{combo-box value=selectedUserBadgeId nameProperty="badge.name" content=selectableUserBadges}}
+        {{combo-box
+          value=selectedUserBadgeId
+          nameProperty="badge.name"
+          content=selectableUserBadges}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
index c174d4a9b42..a15dc6276db 100644
--- a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
@@ -1,4 +1,12 @@
 {{#conditional-loading-spinner condition=loading}}
+  {{#if hasIncoming}}
+  <div class="show-mores">
+    <div class='alert alert-info clickable' {{action "showInserted"}}>
+      {{count-i18n key="topic_count_" suffix="latest" count=incomingCount}}
+    </div>
+  </div>
+  {{/if}}
+
   {{#if topics}}
     {{topic-list showParticipants=showParticipants
                  showPosters=showPosters
@@ -8,7 +16,8 @@
                  bulkSelectEnabled=bulkSelectEnabled
                  canBulkSelect=canBulkSelect
                  selected=selected
-                 skipHeader=skipHeader}}
+                 skipHeader=skipHeader
+                 tagsForUser=tagsForUser}}
   {{else}}
     {{#unless loadingMore}}
     <div class='alert alert-info'>
diff --git a/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs b/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs
index bbf8ef4caba..e46d6c32e15 100644
--- a/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs
+++ b/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs
@@ -1,7 +1,14 @@
-{{category-drop category=firstCategory categories=parentCategories}}
+{{category-drop
+  category=firstCategory
+  categories=parentCategories}}
 
 {{#if childCategories}}
-  {{category-drop category=secondCategory parentCategory=firstCategory categories=childCategories subCategory="true" noSubcategories=noSubcategories}}
+  {{category-drop
+    category=secondCategory
+    parentCategory=firstCategory
+    categories=childCategories
+    subCategory=true
+    noSubcategories=noSubcategories}}
 {{/if}}
 
 {{#if siteSettings.tagging_enabled}}
diff --git a/app/assets/javascripts/discourse/templates/components/cancel-link.hbs b/app/assets/javascripts/discourse/templates/components/cancel-link.hbs
new file mode 100644
index 00000000000..8c3a3cb4c7e
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/cancel-link.hbs
@@ -0,0 +1,3 @@
+{{#link-to route args}}
+  {{i18n 'cancel'}}
+{{/link-to}}
diff --git a/app/assets/javascripts/discourse/templates/components/categories-and-latest-topics.hbs b/app/assets/javascripts/discourse/templates/components/categories-and-latest-topics.hbs
index 1a32cea92d3..be7ee3e4a31 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-and-latest-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-and-latest-topics.hbs
@@ -3,5 +3,5 @@
 </div>
 
 <div class='column'>
-  {{latest-topic-list topics=topics}}
+  {{categories-topic-list topics=topics filter="latest" class="latest-topic-list"}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-and-top-topics.hbs b/app/assets/javascripts/discourse/templates/components/categories-and-top-topics.hbs
new file mode 100644
index 00000000000..4e84c4d6318
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/categories-and-top-topics.hbs
@@ -0,0 +1,7 @@
+<div class='column categories'>
+  {{categories-only categories=categories}}
+</div>
+
+<div class='column'>
+  {{categories-topic-list topics=topics filter="top" class="top-topic-list"}}
+</div>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
index 434e18fe629..aae157c5213 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
@@ -11,6 +11,7 @@
             {{#if c.read_restricted}}
               {{d-icon 'lock'}}
             {{/if}}
+            {{category-title-before category=c}}
             {{c.name}}
           </h3>
         </a>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
index c473668648f..0c90a54a03f 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
@@ -1,24 +1,22 @@
 {{#each categories as |c|}}
-  <div class='category-box category-box-{{unbound c.slug}}' style={{border-color c.color}}>
+  <div class='category-box category-box-{{unbound c.slug}}' style={{border-color c.color}} data-url={{c.url}}>
     <div class='category-box-inner'>
-      <a href={{c.url}}>
-        <div class='category-box-heading'>
-          {{#if c.uploaded_logo.url}}
-            {{cdn-img src=c.uploaded_logo.url class="logo"}}
+      <div class='category-box-heading'>
+        {{#if c.uploaded_logo.url}}
+          {{cdn-img src=c.uploaded_logo.url class="logo"}}
+        {{/if}}
+
+        <h3>
+          {{#if c.read_restricted}}
+            {{d-icon 'lock'}}
           {{/if}}
+          {{c.name}}
+        </h3>
+      </div>
 
-          <h3>
-            {{#if c.read_restricted}}
-              {{d-icon 'lock'}}
-            {{/if}}
-            {{c.name}}
-          </h3>
-        </div>
-
-        <div class='description'>
-          {{{text-overflow class="overflow" text=c.description_excerpt}}}
-        </div>
-      </a>
+      <div class='description'>
+        {{{text-overflow class="overflow" text=c.description_excerpt}}}
+      </div>
     </div>
   </div>
 {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
index f2db6778627..282e5d520cc 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
@@ -2,21 +2,21 @@
   <table class="category-list {{if showTopics 'with-topics'}}">
     <thead>
       <tr>
-        <th class="category">{{i18n 'categories.category'}}</th>
+        <th class="category"><span aria-role="heading" aria-level="2" id="categories-only-category">{{i18n 'categories.category'}}</span></th>
         <th class="topics">{{i18n 'categories.topics'}}</th>
         {{#if showTopics}}
           <th class="latest">{{i18n 'categories.latest'}}</th>
         {{/if}}
       </tr>
     </thead>
-    <tbody>
+    <tbody aria-labelledby="categories-only-category">
       {{#each categories as |c|}}
         <tr data-category-id={{c.id}} class="{{if c.description_excerpt 'has-description' 'no-description'}} {{if c.uploaded_logo.url 'has-logo' 'no-logo'}}">
           <td class="category" style={{border-color c.color}}>
             <div>
               {{category-title-link category=c}}
               <div class="category-description">
-                {{{c.description_excerpt}}}
+                {{{dir-span c.description_excerpt}}}
               </div>
               <div class="clearfix"></div>
             </div>
@@ -24,6 +24,7 @@
               <div class='subcategories'>
                 {{#each c.subcategories as |s|}}
                   <span class='subcategory'>
+                    {{category-title-before category=s}}
                     {{category-link s hideParent="true"}}
                     {{category-unread category=s}}
                   </span>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs b/app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs
new file mode 100644
index 00000000000..7761050a38a
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs
@@ -0,0 +1,16 @@
+<div class='table-heading' aria-role="heading" aria-level="2">
+  {{i18n (concat "filters." filter ".title")}}
+</div>
+
+{{#if topics}}
+  {{#each topics as |t|}}
+    {{latest-topic-list-item topic=t}}
+  {{/each}}
+  <div class="more-topics">
+    <a href="/{{filter}}" class="btn pull-right">{{i18n "more"}}</a>
+  </div>
+{{else}}
+  <div class='no-topics'>
+    <h3>{{i18n (concat "topics.none." filter)}}</h3>
+  </div>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/category-drop.hbs b/app/assets/javascripts/discourse/templates/components/category-drop.hbs
deleted file mode 100644
index ba5062a429b..00000000000
--- a/app/assets/javascripts/discourse/templates/components/category-drop.hbs
+++ /dev/null
@@ -1,30 +0,0 @@
-{{#if category}}
-  <a href {{action "expand"}} class="dropdown-header" style={{badgeStyle}} aria-label={{i18n 'categories.category_list'}} aria-expanded={{expanded}}>
-    <span class="badge-category-bg" style={{categoryColor}}></span>
-    {{#if category.read_restricted}}
-      {{d-icon "lock"}}
-    {{/if}}
-    <span class='d-label'>{{category.name}}</span>
-  </a>
-{{else}}
-  {{#if noSubcategories}}
-    <a href {{action "expand"}} class='dropdown-header home' style={{badgeStyle}} aria-label={{i18n 'categories.category_list'}} aria-expanded={{expanded}}>{{i18n 'categories.no_subcategory'}}</a>
-  {{else}}
-    <a href {{action "expand"}} class='dropdown-header home' style={{badgeStyle}} aria-label={{i18n 'categories.category_list'}} aria-expanded={{expanded}}>{{allCategoriesLabel}}</a>
-  {{/if}}
-{{/if}}
-
-{{#if categories}}
-  <a href {{action "expand"}} class={{dropdownButtonClass}} style={{badgeStyle}}>
-    {{d-icon expandIcon}}
-  </a>
-  <section class="{{unless expanded 'hidden'}} category-dropdown-menu chooser">
-    <div class='cat'><a href={{allCategoriesUrl}} data-drop-close="true" class='badge-category home'>{{allCategoriesLabel}}</a></div>
-    {{#if subCategory}}
-      <div class='cat'><a href={{noCategoriesUrl}} data-drop-close="true" class='badge-category home'>{{i18n 'categories.no_subcategory'}}</a></div>
-    {{/if}}
-    {{#if renderCategories}}
-      {{#each categories as |c|}}<div class='cat'>{{category-link c allowUncategorized=true hideParent=subCategory}}</div>{{/each}}
-    {{/if}}
-  </section>
-{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/category-name-fields.hbs b/app/assets/javascripts/discourse/templates/components/category-name-fields.hbs
new file mode 100644
index 00000000000..e0766f48284
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/category-name-fields.hbs
@@ -0,0 +1,10 @@
+<section class='field'>
+  <section class="field-item">
+    <label>{{i18n 'category.name'}}</label>
+    {{text-field value=category.name placeholderKey="category.name_placeholder" maxlength="50"}}
+  </section>
+  <section class="field-item">
+    <label>{{i18n 'category.slug'}}</label>
+    {{text-field value=category.slug placeholderKey="category.slug_placeholder" maxlength="255"}}
+  </section>
+</section>
diff --git a/app/assets/javascripts/discourse/templates/components/category-title-before.hbs b/app/assets/javascripts/discourse/templates/components/category-title-before.hbs
new file mode 100644
index 00000000000..af92a5ecd6f
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/category-title-before.hbs
@@ -0,0 +1 @@
+{{plugin-outlet name="category-title-before" noTags=true args=(hash category=category)}}
diff --git a/app/assets/javascripts/discourse/templates/components/category-title-link.hbs b/app/assets/javascripts/discourse/templates/components/category-title-link.hbs
index fcb0bdeb071..f27eac550c9 100644
--- a/app/assets/javascripts/discourse/templates/components/category-title-link.hbs
+++ b/app/assets/javascripts/discourse/templates/components/category-title-link.hbs
@@ -1,10 +1,12 @@
-<a href={{category.url}}>
-  {{#if category.read_restricted}}
-    {{d-icon 'lock'}}
-  {{/if}}
-
-  <span class="category-name">{{category.name}}</span>
+{{category-title-before category=category}}
+<a class="category-title-link" href={{category.url}}>
+  <div class="category-text-title">
+    {{#if category.read_restricted}}
+      {{d-icon 'lock'}}
+    {{/if}}
 
+    <span class="category-name">{{dir-span category.name}}</span>
+  </div>
   {{#if category.uploaded_logo.url}}
     <div>{{cdn-img src=category.uploaded_logo.url class="category-logo"}}</div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs b/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs
new file mode 100644
index 00000000000..0019b1d1797
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs
@@ -0,0 +1,14 @@
+{{#if isEditing}}
+  {{d-icon "pencil"}}
+{{else}}
+  {{composer-actions
+    composerModel=model
+    options=model.replyOptions
+    canWhisper=canWhisper
+    action=model.action
+    tabindex=tabindex}}
+{{/if}}
+
+<span class="action-title">
+  {{actionTitle}}
+</span>
diff --git a/app/assets/javascripts/discourse/templates/components/composer-editor.hbs b/app/assets/javascripts/discourse/templates/components/composer-editor.hbs
index 006cd5eddc8..ebf9a3d856f 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-editor.hbs
@@ -1,20 +1,24 @@
-{{d-editor tabindex="4"
-           value=composer.reply
-           placeholder="composer.reply_placeholder"
-           previewUpdated="previewUpdated"
-           markdownOptions=markdownOptions
-           extraButtons="extraButtons"
-           importQuote="importQuote"
-           showUploadModal="showUploadModal"
-           togglePreview="togglePreview"
-           validation=validation
-           loading=composer.loading
-           forcePreview=forcePreview
-           composerEvents=true
-           onExpandPopupMenuOptions="onExpandPopupMenuOptions"
-           onPopupMenuAction=onPopupMenuAction
-           popupMenuOptions=popupMenuOptions}}
+{{d-editor
+  tabindex="4"
+  value=composer.reply
+  placeholder=replyPlaceholder
+  previewUpdated="previewUpdated"
+  markdownOptions=markdownOptions
+  extraButtons="extraButtons"
+  importQuote="importQuote"
+  showUploadModal="showUploadModal"
+  togglePreview="togglePreview"
+  validation=validation
+  loading=composer.loading
+  forcePreview=forcePreview
+  showLink=currentUser.can_post_link
+  composerEvents=true
+  onExpandPopupMenuOptions="onExpandPopupMenuOptions"
+  onPopupMenuAction=onPopupMenuAction
+  popupMenuOptions=popupMenuOptions
+  disabled=disableTextarea
+  outletArgs=(hash composer=composer editorType="composer")}}
 
 {{#if site.mobileView}}
-    <input type="file" id="mobile-uploader" multiple />
+  <input type="file" id="mobile-uploader" multiple>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs b/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
index 99fc0a5b97d..0722426f163 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
@@ -3,7 +3,6 @@
                   onChangeCallback='triggerResize'
                   id="private-message-users"
                   includeMessageableGroups='true'
-                  class="span8"
                   placeholderKey="composer.users_placeholder"
                   tabindex="1"
                   usernames=usernames
diff --git a/app/assets/javascripts/discourse/templates/components/conditional-loading-section.hbs b/app/assets/javascripts/discourse/templates/components/conditional-loading-section.hbs
new file mode 100644
index 00000000000..b97ce25a01f
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/conditional-loading-section.hbs
@@ -0,0 +1,6 @@
+{{#if isLoading}}
+  <span class="title">{{title}}</span>
+  <div class="spinner {{size}}"></div>
+{{else}}
+  {{yield}}
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/create-topic-button.hbs b/app/assets/javascripts/discourse/templates/components/create-topic-button.hbs
index ee1172ffe23..e99673f9cb4 100644
--- a/app/assets/javascripts/discourse/templates/components/create-topic-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/create-topic-button.hbs
@@ -5,5 +5,5 @@
     action=action
     icon="plus"
     disabled=disabled
-    label="topic.create"}}
+    label=label}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
index 6133b28f8fc..be1f2d50dad 100644
--- a/app/assets/javascripts/discourse/templates/components/d-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
@@ -9,7 +9,7 @@
 </div>
 
 <div class='d-editor-container'>
-  <div class="d-editor-textarea-wrapper">
+  <div class="d-editor-textarea-wrapper {{if disabled "disabled"}}">
     <div class='d-editor-button-bar'>
       {{#each toolbar.groups as |group|}}
         {{#each group.buttons as |b|}}
@@ -39,15 +39,16 @@
     </div>
 
     {{conditional-loading-spinner condition=loading}}
-    {{textarea tabindex=tabindex value=value class="d-editor-input" placeholder=placeholderTranslated}}
+    {{textarea tabindex=tabindex value=value class="d-editor-input" placeholder=placeholderTranslated disabled=disabled}}
     {{popup-input-tip validation=validation}}
+    {{plugin-outlet name="after-d-editor" tagName="" args=outletArgs}}
   </div>
 
   <div class="d-editor-preview-wrapper {{if forcePreview 'force-preview'}}">
     <div class="d-editor-preview">
       {{{preview}}}
     </div>
-      {{plugin-outlet name="editor-preview" classNames="d-editor-plugin"}}
+    {{plugin-outlet name="editor-preview" classNames="d-editor-plugin"}}
   </div>
 </div>
 
diff --git a/app/assets/javascripts/discourse/templates/components/d-modal.hbs b/app/assets/javascripts/discourse/templates/components/d-modal.hbs
index 8ed28a6a0e4..852b29f884d 100644
--- a/app/assets/javascripts/discourse/templates/components/d-modal.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-modal.hbs
@@ -6,7 +6,13 @@
           <a class="close" {{action closeModal}}>{{d-icon "times"}}</a>
         </div>
 
-        <h3>{{title}}</h3>
+        <div class="title">
+          <h3>{{title}}</h3>
+
+          {{#if subtitle}}
+            <p>{{subtitle}}</p>
+          {{/if}}
+        </div>
       </div>
 
       <div id='modal-alert'></div>
diff --git a/app/assets/javascripts/discourse/templates/components/d-navigation.hbs b/app/assets/javascripts/discourse/templates/components/d-navigation.hbs
index 6f8c71f5249..2d1b956b610 100644
--- a/app/assets/javascripts/discourse/templates/components/d-navigation.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-navigation.hbs
@@ -15,7 +15,9 @@
 {{create-topic-button
   canCreateTopic=canCreateTopic
   action=createTopic
-  disabled=createTopicDisabled}}
+  disabled=createTopicDisabled
+  label=createTopicLabel
+}}
 
 {{#if showCategoryEdit}}
   {{d-button
diff --git a/app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs b/app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs
index dc8edd2018c..d1ffffbdee7 100644
--- a/app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs
+++ b/app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs
@@ -1,15 +1,10 @@
-
 {{#if isNotSupported}}
   {{d-button icon="bell-slash" label="user.desktop_notifications.not_supported" disabled="true"}}
 {{/if}}
-{{#if isDefaultPermission}}
-  {{d-button icon="bell-slash" label="user.desktop_notifications.perm_default" action="requestPermission"}}
-{{/if}}
 {{#if isDeniedPermission}}
   {{d-button icon="bell-slash" label="user.desktop_notifications.perm_denied_btn" action="recheckPermission" disabled='true'}}
   {{i18n "user.desktop_notifications.perm_denied_expl"}}
-{{/if}}
-{{#if isGrantedPermission}}
+{{else}}
   {{#if isEnabled}}
     {{d-button icon="bell-slash-o" label="user.desktop_notifications.disable" action="turnoff"}}
     {{i18n "user.desktop_notifications.currently_enabled"}}
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs b/app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs
new file mode 100644
index 00000000000..dd15a6dc6a4
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs
@@ -0,0 +1 @@
+{{{translatedText}}}
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
index c31406819a7..2e498f77c3f 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
@@ -1,14 +1,5 @@
 <form>
-  <section class='field'>
-    <section class="field-item">
-      <label>{{i18n 'category.name'}}</label>
-      {{text-field value=category.name placeholderKey="category.name_placeholder" maxlength="50"}}
-    </section>
-    <section class="field-item">
-      <label>{{i18n 'category.slug'}}</label>
-      {{text-field value=category.slug placeholderKey="category.slug_placeholder" maxlength="255"}}
-    </section>
-  </section>
+  {{category-name-fields category=category tagName=""}}
 
   {{#if canSelectParentCategory}}
     <section class='field'>
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 fa7b2a5653e..36e6bfc0b4c 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
@@ -21,8 +21,8 @@
 
 <section class="field">
   <label>
-    {{input type="checkbox" checked=category.suppress_from_homepage}}
-    {{i18n "category.suppress_from_homepage"}}
+    {{input type="checkbox" checked=category.suppress_from_latest}}
+    {{i18n "category.suppress_from_latest"}}
   </label>
 </section>
 
@@ -69,7 +69,7 @@
   <div class="controls">
   {{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"}}
+    {{combo-box castBoolean=true valueAttribute="value" content=sortAscendingOptions value=category.sort_ascending none="category.sort_options.default"}}
   {{/unless}}
     </div>
 </section>
@@ -152,4 +152,13 @@
   </section>
 {{/unless}}
 
+{{#if siteSettings.tagging_enabled}}
+  <section class='field minimum-required-tags'>
+    <label>
+      {{i18n 'category.minimum_required_tags'}}
+      {{text-field value=category.minimum_required_tags type="number"}}
+    </label>
+  </section>
+{{/if}}
+
 {{plugin-outlet name="category-custom-settings" args=(hash category=category)}}
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-tags.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-tags.hbs
index df6544d770b..c8ea0536360 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-tags.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-tags.hbs
@@ -1,7 +1,11 @@
 <section class="field">
   <p>{{i18n 'category.tags_allowed_tags'}}</p>
-  {{tag-chooser placeholderKey="category.tags_placeholder" tags=category.allowed_tags everyTag="true" unlimitedTagCount="true"}}
+  {{tag-chooser
+    filterPlaceholder="category.tags_placeholder"
+    tags=category.allowed_tags
+    everyTag=true
+    unlimitedTagCount=true}}
 
   <p>{{i18n 'category.tags_allowed_tag_groups'}}</p>
-  {{tag-group-chooser placeholderKey="category.tag_groups_placeholder" tagGroups=category.allowed_tag_groups}}
+  {{tag-group-chooser tagGroups=category.allowed_tag_groups}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs b/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs
index f90534931b7..52f618fec96 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs
@@ -9,7 +9,7 @@
           input=topicTimer.updateTime
           statusType=selection
           includeWeekend=true
-          basedOnLastPost=false}}
+          basedOnLastPost=topicTimer.based_on_last_post}}
     {{else if publishToCategory}}
       <div class="control-group">
         <label>{{i18n 'topic.topic_status_update.publish_to'}}</label>
@@ -23,7 +23,7 @@
           statusType=selection
           includeWeekend=true
           categoryId=topicTimer.category_id
-          basedOnLastPost=false}}
+          basedOnLastPost=topicTimer.based_on_last_post}}
     {{else if autoClose}}
       {{future-date-input
           input=topicTimer.updateTime
diff --git a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
new file mode 100644
index 00000000000..b458965cec3
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
@@ -0,0 +1,72 @@
+{{#if visible}}
+  <div class="card-content">
+    <div class="group-card-avatar">
+      <a href={{groupPath}} {{action "showGroup"}} class="card-huge-avatar">
+        {{avatar-flair
+          flairURL=group.flair_url
+          flairBgColor=group.flair_bg_color
+          flairColor=group.flair_color
+          groupName=group.name}}
+      </a>
+    </div>
+
+    <div class="names">
+      <span>
+        <h1 class="{{ group.name }}">
+          <a href={{groupPath}} {{action "showGroup"}}>{{ group.name }}</a>
+        </h1>
+        {{#if group.full_name}}
+          <h2 class='full-name'>{{group.full_name}}</h2>
+        {{else}}
+          <h2 class='username'>{{group.name}}</h2>
+        {{/if}}
+      </span>
+    </div>
+
+    <div class="usercard-controls group-details-button">
+      {{group-membership-button
+        model=group
+        showLogin='showLogin'}}
+
+      {{#if group.messageable}}
+        {{d-button
+          action="messageGroup"
+          class="btn-primary group-message-button inline"
+          icon="envelope"
+          label="groups.message"}}
+      {{/if}}
+    </div>
+
+    {{#if group.bio_cooked}}<div class='bio'>{{{group.bio_cooked}}}</div>{{/if}}
+
+    <div class="metadata">
+      <h3>
+        <span class="desc">
+          {{i18n 'groups.user_count'}}
+        </span>
+        {{ group.user_count }}
+      </h3>
+      <h3>
+        {{#if group.is_group_owner}}
+
+            {{i18n "groups.index.is_group_owner"}}
+        {{else if group.is_group_user}}
+
+            {{i18n "groups.index.is_group_user"}}
+        {{/if}}
+      </h3>
+    </div>
+    {{#if group.members}}
+    <div class="members metadata">
+      <span>
+        {{#each group.members as |user|}}
+          <a href={{user.path}} {{action "showUser" user}} class="card-tiny-avatar">{{bound-avatar user "tiny"}}</a>
+        {{/each}}
+        {{#if showMoreMembers}}
+          <a href={{groupPath}} {{action "showGroup"}}>+{{ moreMembersCount }} {{i18n "more"}}</a>
+        {{/if}}
+      </span>
+    </div>
+    {{/if}}
+  </div>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs b/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
index 5693422c4d5..ad0530ba8e7 100644
--- a/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
@@ -1,36 +1,35 @@
-<div class="group-flair-left">
-  <div>
-    <label for="flair_url">{{i18n 'groups.flair_url'}}</label>
-    {{text-field name="flair_url"
-        value=model.flair_url
-        placeholderKey="groups.flair_url_placeholder"}}
-  </div>
+<div class='control-group'>
+  <label class="control-label" for="flair_url">{{i18n 'groups.flair_url'}}</label>
 
-  <div>
-    <label for="flair_bg_color">{{i18n 'groups.flair_bg_color'}}</label>
-    {{text-field name="flair_bg_color"
-        class="group-flair-bg-color"
-        value=model.flair_bg_color
-        placeholderKey="groups.flair_bg_color_placeholder"}}
-  </div>
-
-  {{#if flairPreviewIcon}}
-    <div>
-      <label for="flair_color">{{i18n 'groups.flair_color'}}</label>
-      {{text-field name="flair_color"
-          class="group-flair-color"
-          value=model.flair_color
-          placeholderKey="groups.flair_color_placeholder"}}
-    </div>
-  {{/if}}
-
-  <div>
-    <strong>{{i18n 'groups.flair_note'}}</strong>
-  </div>
+  {{text-field name="flair_url"
+      class="input-xxlarge"
+      value=model.flair_url
+      placeholderKey="groups.flair_url_placeholder"}}
 </div>
 
-<div class="group-flair-right">
-  <label>{{flairPreviewLabel}}</label>
+<div class='control-group'>
+  <label class="control-label" for="flair_bg_color">{{i18n 'groups.flair_bg_color'}}</label>
+
+  {{text-field name="flair_bg_color"
+      class="group-flair-bg-color input-xxlarge"
+      value=model.flair_bg_color
+      placeholderKey="groups.flair_bg_color_placeholder"}}
+</div>
+
+{{#if flairPreviewIcon}}
+  <div class='control-group'>
+    <label class="control-label" for="flair_color">{{i18n 'groups.flair_color'}}</label>
+
+    {{text-field name="flair_color"
+        class="group-flair-color input-xxlarge"
+        value=model.flair_color
+        placeholderKey="groups.flair_color_placeholder"}}
+  </div>
+{{/if}}
+
+<div class='control-group'>
+  <label class='control-label'>{{flairPreviewLabel}}</label>
+
   <div class="avatar-flair-preview">
     <div class="avatar-wrapper">
       <img width="45" height="45" src="{{demoAvatarUrl}}" class="avatar actor">
diff --git a/app/assets/javascripts/discourse/templates/components/group-logs-filter.hbs b/app/assets/javascripts/discourse/templates/components/group-manage-logs-filter.hbs
similarity index 53%
rename from app/assets/javascripts/discourse/templates/components/group-logs-filter.hbs
rename to app/assets/javascripts/discourse/templates/components/group-manage-logs-filter.hbs
index f9f13474c7f..1625fa5fc92 100644
--- a/app/assets/javascripts/discourse/templates/components/group-logs-filter.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-manage-logs-filter.hbs
@@ -1,5 +1,5 @@
 {{#if value}}
-  {{#d-button class="btn-small group-logs-filter" action="clearFilter" actionParam=type}}
+  {{#d-button class="btn-small group-manage-logs-filter" action="clearFilter" actionParam=type}}
     <span>{{label}}</span>: {{filterText}}
     {{d-icon "times-circle"}}
   {{/d-button}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-logs-row.hbs b/app/assets/javascripts/discourse/templates/components/group-manage-logs-row.hbs
similarity index 80%
rename from app/assets/javascripts/discourse/templates/components/group-logs-row.hbs
rename to app/assets/javascripts/discourse/templates/components/group-manage-logs-row.hbs
index 6fe9bfd858a..da955686e19 100644
--- a/app/assets/javascripts/discourse/templates/components/group-logs-row.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-manage-logs-row.hbs
@@ -1,4 +1,4 @@
-<tr class="group-logs-row">
+<tr class="group-manage-logs-row">
   <td>
     {{#d-button class="btn-small" action="filter" actionParam=(hash value=log.action key="action")}}
       {{log.actionTitle}}
@@ -33,7 +33,7 @@
 
   <td>{{bound-date log.created_at}}</td>
 
-  <td {{action "toggleDetails"}} class="group-logs-expand-details">
+  <td {{action "toggleDetails"}} class="group-manage-logs-expand-details">
     {{#if log.prev_value}}
       {{#if expandDetails}}
         {{d-icon 'ellipsis-v'}}
@@ -48,11 +48,11 @@
   <tr>
     <td colspan='6'>
       <p>
-        <strong>{{i18n 'groups.logs.from'}}</strong>: <code>{{log.prev_value}}</code>
+        <strong>{{i18n 'groups.manage.logs.from'}}</strong>: <code>{{log.prev_value}}</code>
       </p>
 
       <p>
-        <strong>{{i18n 'groups.logs.to'}}</strong>: <code>{{log.new_value}}</code>
+        <strong>{{i18n 'groups.manage.logs.to'}}</strong>: <code>{{log.new_value}}</code>
       </p>
     </td>
   </tr>
diff --git a/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs b/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs
new file mode 100644
index 00000000000..0276ac16e5d
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs
@@ -0,0 +1,12 @@
+<div class='control-group buttons'>
+  {{#d-button action="save"
+      disabled=saving
+      class='btn btn-primary group-manage-save'}}
+
+      {{savingText}}
+  {{/d-button}}
+
+  {{#if saved}}
+    <span>{{i18n 'saved'}}</span>
+  {{/if}}
+</div>
diff --git a/app/assets/javascripts/discourse/templates/components/group-members-input.hbs b/app/assets/javascripts/discourse/templates/components/group-members-input.hbs
index ad66499dbbd..036bf9b1ca9 100644
--- a/app/assets/javascripts/discourse/templates/components/group-members-input.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-members-input.hbs
@@ -1,4 +1,4 @@
-<label>{{i18n 'groups.members'}} ({{model.user_count}})</label>
+<label>{{i18n 'groups.members.title'}} ({{model.user_count}})</label>
 
 {{#if model.members}}
   <div>
@@ -16,7 +16,7 @@
 {{#unless model.automatic}}
   <div class="group-members-input-selector">
     {{user-selector usernames=model.usernames
-          placeholderKey="admin.groups.selector_placeholder"
+          placeholderKey="groups.selector_placeholder"
           id="member-selector"}}
 
     {{#if addButton}}
@@ -24,7 +24,7 @@
           class="add"
           icon="plus"
           disabled=disableAddButton
-          label="groups.edit.add_members"}}
+          label="groups.manage.add_members"}}
     {{/if}}
   </div>
 {{/unless}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs b/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs
index 8240f372f93..2bd19564927 100644
--- a/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs
@@ -11,25 +11,9 @@
       label="groups.leave"
       disabled=updatingMembership}}
 {{else if model.allow_membership_requests}}
-  {{#if userIsGroupUser}}
-    {{#if showMembershipStatus}}
-      {{d-button
-          class="btn-primary"
-          icon="user"
-          label="groups.is_group_user"
-          disabled=true}}
-    {{/if}}
-  {{else}}
-    {{d-button action="showRequestMembershipForm"
-        class="group-index-request"
-        disabled=loading
-        icon="user-plus"
-        label="groups.request"}}
-
-    {{#if loading}}
-      {{loading-spinner size="small"}}
-    {{/if}}
-  {{/if}}
-{{else}}
-  {{yield}}
+  {{d-button action="showRequestMembershipForm"
+      class="group-index-request"
+      disabled=loading
+      icon="user-plus"
+      label="groups.request"}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-navigation.hbs b/app/assets/javascripts/discourse/templates/components/group-navigation.hbs
index 8501e9e2f54..29ad6b7f1e1 100644
--- a/app/assets/javascripts/discourse/templates/components/group-navigation.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-navigation.hbs
@@ -1,5 +1,15 @@
 {{#mobile-nav class='group-nav' desktopClass="nav nav-pills" currentPath=currentPath}}
-  {{#each availableTabs as |tab|}}
+  {{#if site.mobileView}}
+    <li>
+      {{#link-to "groups.index"}}
+        {{i18n "groups.index.all"}}
+      {{/link-to}}
+    </li>
+  {{else}}
+    {{group-dropdown content=group.extras.visible_group_names value=group.name}}
+  {{/if}}
+
+  {{#each tabs as |tab|}}
     <li>
       {{#link-to tab.route group title=tab.message class=tab.name}}
         {{#if tab.icon}}{{d-icon tab.icon}}{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-post.hbs b/app/assets/javascripts/discourse/templates/components/group-post.hbs
index 9f51a1584f0..9e56010fad0 100644
--- a/app/assets/javascripts/discourse/templates/components/group-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-post.hbs
@@ -1,13 +1,15 @@
-<div class='group-post-header'>
-  <div class='group-post-avatar'>
+<div class='clearfix info'>
     <a href="{{unbound post.user.userUrl}}" data-user-card="{{unbound post.user.username}}" class='avatar-link'>
       {{avatar post.user imageSize="large" extraClasses="actor" ignoreTitle="true"}}
     </a>
-  </div>
-  <div class='group-post-info'>
-    <div class="group-post-topic">
-      <div class='group-post-title'>
-        <a href={{post.url}}>{{{post.topic.fancyTitle}}}</a>
+    <span class='time'>{{format-date post.created_at leaveAgo="true"}}</span>
+    {{expand-post item=post}}
+
+  <div class='stream-topic-details'>
+      <div class='stream-topic-title'>
+        <span class='title'>
+          <a href={{postUrl}}>{{{post.topic.fancyTitle}}}</a>
+        </span>
       </div>
       <div class="group-post-category">{{category-link post.category}}</div>
       {{#if post.user.name}}
@@ -16,14 +18,11 @@
           {{#if post.user.title}}<span class="title">, {{post.user.title}}</span>{{/if}}
         </div>
       {{/if}}
-    </div>
-    <div class='group-post-controls'>
-      {{expand-post item=post}}
-      <span class='time'>{{format-date post.created_at leaveAgo="true"}}</span>
-    </div>
   </div>
+  
 </div>
-<div class='group-post-excerpt'>
+
+<div class='excerpt'>
   {{#if post.expandedExcerpt}}
     {{{post.expandedExcerpt}}}
   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/groups-form-interaction-fields.hbs b/app/assets/javascripts/discourse/templates/components/groups-form-interaction-fields.hbs
new file mode 100644
index 00000000000..5ed87a5c027
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/groups-form-interaction-fields.hbs
@@ -0,0 +1,58 @@
+{{#if currentUser.admin}}
+  <div class="control-group">
+    <label class="control-label">{{i18n 'admin.groups.manage.interaction.visibility'}}</label>
+    <label for="visiblity">{{i18n 'admin.groups.manage.interaction.visibility_levels.title'}}</label>
+
+    {{combo-box name="alias"
+        valueAttribute="value"
+        value=model.visibility_level
+        content=visibilityLevelOptions
+        castInteger=true
+        class="groups-form-visibility-level"}}
+  </div>
+{{/if}}
+
+<div class="control-group">
+  <label class="control-label">{{i18n 'groups.manage.interaction.posting'}}</label>
+  <label for="alias">{{i18n 'groups.alias_levels.mentionable'}}</label>
+
+  {{combo-box name="alias"
+      valueAttribute="value"
+      value=model.mentionable_level
+      content=aliasLevelOptions
+      class="groups-form-mentionable-level"}}
+</div>
+
+<div class="control-group">
+  <label for="alias">{{i18n 'groups.alias_levels.messageable'}}</label>
+
+  {{combo-box name="alias"
+      valueAttribute="value"
+      value=model.messageable_level
+      content=aliasLevelOptions
+      class="groups-form-messageable-level"}}
+</div>
+
+{{#if showEmailSettings}}
+  <div class="control-group">
+    <label class="control-label">{{i18n 'admin.groups.manage.interaction.email'}}</label>
+    <label for="incoming_email">{{i18n 'admin.groups.manage.interaction.incoming_email'}}</label>
+
+    {{text-field name="incoming_email"
+        class="input-xxlarge groups-form-incoming-email"
+        value=model.incoming_email
+        placeholderKey="admin.groups.manage.interaction.incoming_email_placeholder"}}
+
+    {{plugin-outlet name="group-email-in" args=(hash model=model)}}
+  </div>
+{{/if}}
+
+<label class="control-label">{{i18n 'groups.manage.interaction.notification'}}</label>
+
+<div class="control-group">
+  <label>{{i18n 'groups.notification_level'}}</label>
+
+  {{notifications-button i18nPrefix='groups.notifications'
+      value=model.default_notification_level
+      class="groups-form-default-notification-level"}}
+</div>
diff --git a/app/assets/javascripts/discourse/templates/components/groups-form-membership-fields.hbs b/app/assets/javascripts/discourse/templates/components/groups-form-membership-fields.hbs
new file mode 100644
index 00000000000..03f5755d8f9
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/groups-form-membership-fields.hbs
@@ -0,0 +1,82 @@
+{{#if currentUser.admin}}
+  <div class="control-group">
+    <label class="control-label">{{i18n "admin.groups.manage.membership.automatic"}}</label>
+
+    <label for="automatic_membership">
+      {{i18n 'admin.groups.manage.membership.automatic_membership_email_domains'}}
+    </label>
+
+    {{list-setting name="automatic_membership"
+        settingValue=model.emailDomains
+        class="group-form-automatic-membership-automatic"}}
+
+    <label>
+      {{input type="checkbox"
+          checked=model.automatic_membership_retroactive
+          class="groups-form-automatic-membership-retroactive"}}
+
+      {{i18n 'admin.groups.manage.membership.automatic_membership_retroactive'}}
+    </label>
+
+    <label>
+      {{input type="checkbox"
+          checked=model.primary_group
+          class="groups-form-primary-group"}}
+
+      {{i18n 'admin.groups.manage.membership.primary_group'}}
+    </label>
+  </div>
+
+  <div class="control-group">
+    <label class="control-label">{{i18n "admin.groups.manage.membership.trust_level"}}</label>
+    <label for="grant_trust_level">{{i18n 'admin.groups.manage.membership.trust_levels_title'}}</label>
+
+    {{combo-box name="grant_trust_level"
+        valueAttribute="value"
+        value=model.grant_trust_level
+        content=trustLevelOptions
+        class="groups-form-grant-trust-level"}}
+  </div>
+{{/if}}
+
+<div class="control-group">
+  <label class="control-label">{{i18n "groups.manage.membership.access"}}</label>
+
+  <label>
+    {{input type="checkbox"
+        class="group-form-public-admission"
+        checked=model.public_admission
+        disabled=disablePublicSetting}}
+
+    {{i18n 'groups.public_admission'}}
+  </label>
+
+  <label>
+    {{input type='checkbox'
+        class='group-form-public-exit'
+        checked=model.public_exit}}
+
+    {{i18n 'groups.public_exit'}}
+  </label>
+
+  <label>
+    {{input type="checkbox"
+        class="group-form-allow-membership-requests"
+        checked=model.allow_membership_requests
+        disabled=disableMembershipRequestSetting}}
+
+    {{i18n 'groups.allow_membership_requests'}}
+  </label>
+
+  {{#if model.allow_membership_requests}}
+    <div>
+      <label for="membership-request-template">
+        {{i18n 'groups.membership_request_template'}}
+      </label>
+
+      {{expanding-text-area name="membership-request-template"
+          class='group-form-membership-request-template input-xxlarge'
+          value=model.membership_request_template}}
+    </div>
+  {{/if}}
+</div>
diff --git a/app/assets/javascripts/discourse/templates/components/groups-form-profile-fields.hbs b/app/assets/javascripts/discourse/templates/components/groups-form-profile-fields.hbs
new file mode 100644
index 00000000000..81de1132251
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/groups-form-profile-fields.hbs
@@ -0,0 +1,47 @@
+{{#if this.currentUser.admin}}
+  <div class="control-group">
+    <label class="control-label" for="name">{{i18n 'groups.name'}}</label>
+
+    {{text-field name="name"
+        class="input-xxlarge group-form-name"
+        value=nameInput
+        placeholderKey="admin.groups.name_placeholder"}}
+
+    {{input-tip validation=nameValidation}}
+  </div>
+{{/if}}
+
+<div class="control-group">
+  <label class="control-label" for='full_name'>{{i18n 'groups.manage.full_name'}}</label>
+
+  {{text-field name='full_name'
+      class="input-xxlarge group-form-full-name"
+      value=model.full_name}}
+</div>
+
+{{#if this.currentUser.admin}}
+  <div class="control-group">
+    <label class="control-label" for="title">
+      {{i18n 'admin.groups.default_title'}}
+    </label>
+
+    {{input value=model.title name="title" class="input-xxlarge"}}
+
+    <div class="control-instructions">
+      {{i18n 'admin.groups.default_title_description'}}
+    </div>
+  </div>
+{{/if}}
+
+<div class="control-group">
+  <label class="control-label" for="bio">{{i18n 'groups.bio'}}</label>
+  {{d-editor value=model.bio_raw class="group-form-bio input-xxlarge"}}
+</div>
+
+{{yield}}
+
+<div class="control-group">
+  {{group-flair-inputs model=model}}
+</div>
+
+{{plugin-outlet name="group-edit" args=(hash group=model)}}
diff --git a/app/assets/javascripts/discourse/templates/components/groups-info.hbs b/app/assets/javascripts/discourse/templates/components/groups-info.hbs
new file mode 100644
index 00000000000..bf1628996e1
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/groups-info.hbs
@@ -0,0 +1,11 @@
+<span class='groups-info-name'>{{group.displayName}}</span>
+
+{{#if showFullName}}
+  <span class='groups-info-full-name'>{{group.full_name}}</span>
+{{/if}}
+
+{{#if group.title}}
+  <div>
+    <span class='groups-info-title'>{{group.title}}</span>
+  </div>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/latest-topic-list-contents.hbs b/app/assets/javascripts/discourse/templates/components/latest-topic-list-contents.hbs
deleted file mode 100644
index 33b8ec95b90..00000000000
--- a/app/assets/javascripts/discourse/templates/components/latest-topic-list-contents.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-{{#each topics as |t|}}
-  {{latest-topic-list-item topic=t}}
-{{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/latest-topic-list.hbs b/app/assets/javascripts/discourse/templates/components/latest-topic-list.hbs
deleted file mode 100644
index 2390a154ab4..00000000000
--- a/app/assets/javascripts/discourse/templates/components/latest-topic-list.hbs
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class='table-heading'>
-  {{i18n "filters.latest.title"}}
-</div>
-
-{{#if topics}}
-  {{latest-topic-list-contents topics=topics tagName=""}}
-  <div class="more-topics">
-    <a href="/latest" class="btn pull-right">{{i18n "more"}}</a>
-  </div>
-{{else}}
-  <div class='no-topics'>
-    <h3>{{i18n "topics.none.latest"}}</h3>
-  </div>
-{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/login-buttons.hbs b/app/assets/javascripts/discourse/templates/components/login-buttons.hbs
index 776ddff179e..bdd430c4e7a 100644
--- a/app/assets/javascripts/discourse/templates/components/login-buttons.hbs
+++ b/app/assets/javascripts/discourse/templates/components/login-buttons.hbs
@@ -1,3 +1,12 @@
 {{#each buttons as |b|}}
   <button class="btn btn-social {{b.name}}" {{action "externalLogin" b}}>{{b.title}}</button>
 {{/each}}
+
+{{#if canLoginLocalWithEmail}}
+  {{d-button
+    action="emailLogin"
+    label="email_login.button_label"
+    disabled=processingEmailLink
+    icon="envelope-o"
+    class="login-with-email-button"}}
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/notification-consent-banner.hbs b/app/assets/javascripts/discourse/templates/components/notification-consent-banner.hbs
new file mode 100644
index 00000000000..f258abf113e
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/notification-consent-banner.hbs
@@ -0,0 +1,8 @@
+{{#if showNotificationPromptBanner}}
+  <div class="row">
+    <div class="consent_banner alert alert-info">
+      <div class="close" {{action "dismiss"}}><i class="fa fa-times d-icon d-icon-times"></i></div>
+      {{i18n 'user.desktop_notifications.consent_prompt'}} <a {{action "turnon"}}>{{i18n 'user.desktop_notifications.enable'}}</a>.
+    </div>
+  </div>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/period-chooser.hbs b/app/assets/javascripts/discourse/templates/components/period-chooser.hbs
deleted file mode 100644
index ce4d6066c57..00000000000
--- a/app/assets/javascripts/discourse/templates/components/period-chooser.hbs
+++ /dev/null
@@ -1,11 +0,0 @@
-<h2>{{period-title period showDateRange=true}}</h2>
-<button>{{d-icon "caret-down"}}</button>
-
-<div id='period-popup' class="{{unless showPeriods 'hidden'}} period-popup">
-  <ul>
-    {{#each site.periods as |p|}}
-      <li><a href {{action "changePeriod" p}}>{{period-title p showDateRange=true}}</a></li>
-    {{/each}}
-  </ul>
-</div>
-<div class='clearfix'></div>
diff --git a/app/assets/javascripts/discourse/templates/components/queued-post.hbs b/app/assets/javascripts/discourse/templates/components/queued-post.hbs
index de2709ca4ab..99162937d14 100644
--- a/app/assets/javascripts/discourse/templates/components/queued-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/queued-post.hbs
@@ -52,7 +52,7 @@
         {{/each}}
       </div>
     {{else if editTags}}
-      {{tag-chooser tags=buffered.tags categoryId=buffered.category_id width='100%'}}
+      {{tag-chooser tags=buffered.tags categoryId=buffered.category_id}}
     {{/if}}
 
     <div class='queue-controls'>
diff --git a/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs b/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
index f53a0e0c50b..371a1c3849a 100644
--- a/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
+++ b/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
@@ -40,7 +40,12 @@
     <div class="control-group">
       <label class="control-label" for="search-with-tags">{{i18n "search.advanced.with_tags.label"}}</label>
       <div class="controls">
-        {{tag-chooser tags=searchedTerms.tags blacklist=searchedTerms.tags allowCreate=false placeholder="" everyTag="true" unlimitedTagCount="true" width="70%"}}
+        {{tag-chooser
+          tags=searchedTerms.tags
+          allowCreate=false
+          filterPlaceholder=null
+          everyTag=true
+          unlimitedTagCount=true}}
       <section class="field">
           <label>{{ input type="checkbox" class="all-tags" checked=searchedTerms.special.all_tags}} {{i18n "search.advanced.filters.all_tags"}} </label>
       </section>
@@ -55,6 +60,7 @@
     <div class="controls">
       {{#if currentUser}}
         <section class='field'>
+          <label>{{input type="checkbox" class="in-title" checked=searchedTerms.special.in.title}} {{i18n "search.advanced.filters.title"}}</label>
           <label>{{input type="checkbox" class="in-likes" checked=searchedTerms.special.in.likes}} {{i18n "search.advanced.filters.likes"}}</label>
           <label>{{input type="checkbox" class="in-private" checked=searchedTerms.special.in.private}} {{i18n "search.advanced.filters.private"}}</label>
           <label>{{input type="checkbox" class="in-seen" checked=searchedTerms.special.in.seen}} {{i18n "search.advanced.filters.seen"}}</label>
diff --git a/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs b/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
new file mode 100644
index 00000000000..c6e6e6d4355
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
@@ -0,0 +1,13 @@
+<div id="second-factor" style="display: none;">
+  <h3>{{i18n 'login.second_factor_title'}}</h3>
+  <p>{{i18n 'login.second_factor_description'}}</p>
+
+  <table>
+    <tr>
+      <td>
+        {{yield}}
+      </td>
+      <td></td>
+    </tr>
+  </table>
+</div>
diff --git a/app/assets/javascripts/discourse/templates/components/second-factor-input.hbs b/app/assets/javascripts/discourse/templates/components/second-factor-input.hbs
new file mode 100644
index 00000000000..6cd05a616b9
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/second-factor-input.hbs
@@ -0,0 +1,8 @@
+{{text-field value=value
+    type="tel"
+    pattern='[0-9]{6}'
+    maxlength='6'
+    id=inputId
+    autocorrect="off"
+    autocapitalize="off"
+    autofocus="autofocus"}}
diff --git a/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs b/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
new file mode 100644
index 00000000000..feeed4be439
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
@@ -0,0 +1,24 @@
+<div class='shared-draft-controls'>
+  {{#if publishing}}
+    {{i18n "shared_drafts.publishing"}}
+  {{else}}
+    {{{i18n "shared_drafts.notice" category=topic.category.name}}}
+
+    <div class='publish-field'>
+      <label>{{i18n "shared_drafts.destination_category"}}</label>
+      {{category-chooser
+        value=topic.destination_category_id
+        onChooseCategory=(action "updateDestinationCategory")}}
+    </div>
+
+    <div class='publish-field'>
+      {{#if validCategory}}
+        {{d-button
+          action=(action "publish")
+          label="shared_drafts.publish"
+          class="btn-primary publish-shared-draft"
+          icon="clipboard"}}
+      {{/if}}
+    </div>
+  {{/if}}
+</div>
diff --git a/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs b/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
index 76127f2bf50..8d0263c71c4 100644
--- a/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
@@ -1,4 +1,5 @@
-<h3>{{{suggestedTitle}}}</h3>
+<h3 class="suggested-topics-title">{{{suggestedTitle}}}</h3>
+
 <div class="topics">
   {{#if topic.isPrivateMessage}}
     {{basic-topic-list
@@ -9,4 +10,5 @@
     {{basic-topic-list topics=topic.suggestedTopics}}
   {{/if}}
 </div>
-<h3 class='suggested-topics-message'>{{{browseMoreMessage}}}</h3>
+
+<h3 class="suggested-topics-message">{{{browseMoreMessage}}}</h3>
diff --git a/app/assets/javascripts/discourse/templates/components/tag-drop.hbs b/app/assets/javascripts/discourse/templates/components/tag-drop.hbs
deleted file mode 100644
index 8dc8869f6f0..00000000000
--- a/app/assets/javascripts/discourse/templates/components/tag-drop.hbs
+++ /dev/null
@@ -1,28 +0,0 @@
-{{#if showTagDropdown}}
-  {{#if tagId}}
-    {{#if noTagsSelected}}
-      <a href {{action "expand"}} class="dropdown-header {{tagClass}} home">{{noTagsLabel}}</a>
-    {{else}}
-      <a href {{action "expand"}} class="dropdown-header {{tagClass}}">{{tagId}}</a>
-    {{/if}}
-  {{else}}
-    <a href {{action "expand"}} class="dropdown-header {{tagClass}} home">{{allTagsLabel}}</a>
-  {{/if}}
-
-  {{#if tags}}
-    <a href {{action "expand"}} class={{dropdownButtonClass}}>
-      {{d-icon expandedIcon}}
-    </a>
-    <section class="{{unless expanded 'hidden'}} category-dropdown-menu chooser">
-      <div class='cat'><a href={{allTagsUrl}} data-drop-close="true" class='dropdown-header home'>{{allTagsLabel}}</a></div>
-      <div class='cat'><a href={{noTagsUrl}}  data-drop-close="true" class='dropdown-header home'>{{noTagsLabel}}</a></div>
-      {{#if renderTags}}
-        {{#each tags as |t|}}
-          <div class='cat'>
-            {{tag-drop-link tagId=t category=currentCategory}}
-          </div>
-        {{/each}}
-      {{/if}}
-    </section>
-  {{/if}}
-{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/tag-list.hbs b/app/assets/javascripts/discourse/templates/components/tag-list.hbs
index a3e912d26ca..7be97e2439f 100644
--- a/app/assets/javascripts/discourse/templates/components/tag-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/tag-list.hbs
@@ -4,13 +4,12 @@
 {{#if category}}
   {{category-title-link category=category}}
 {{/if}}
+{{#if tagGroupName}}
+  <h3>{{tagGroupName}}</h3>
+{{/if}}
 {{#each sortedTags as |tag|}}
   <div class='tag-box'>
-    {{#if tag.count}}
-      {{discourse-tag tag.id}} <span class='tag-count'>x {{tag.count}}</span>
-    {{else}}
-      {{discourse-tag tag.id}}
-    {{/if}}
+    {{discourse-tag tag.id isPrivateMessage=isPrivateMessage tagsForUser=tagsForUser}} {{#if tag.pm_count}}{{d-icon "envelope"}}{{/if}}{{#if tag.totalCount}} <span class='tag-count'>x {{tag.totalCount}}</span>{{/if}}
   </div>
 {{/each}}
 <div class="clearfix" />
diff --git a/app/assets/javascripts/discourse/templates/components/topic-category.hbs b/app/assets/javascripts/discourse/templates/components/topic-category.hbs
index edf11686ba9..122727e3829 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-category.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-category.hbs
@@ -1,17 +1,18 @@
-{{#if topic.category.parentCategory}}
-  {{bound-category-link topic.category.parentCategory}}
-{{/if}}
-{{bound-category-link topic.category hideParent=true}}
+{{#unless topic.isPrivateMessage}}
+  {{#if topic.category.parentCategory}}
+    {{bound-category-link topic.category.parentCategory}}
+  {{/if}}
+  {{bound-category-link topic.category hideParent=true}}
+{{/unless}}
 <div class="topic-header-extra">
   {{#if siteSettings.tagging_enabled}}
     <div class="list-tags">
-      {{#each topic.tags as |t|}}
-        {{discourse-tag t}}
-      {{/each}}
+      {{discourse-tags topic mode="list"}}
     </div>
   {{/if}}
   {{#if siteSettings.topic_featured_link_enabled}}
     {{topic-featured-link topic}}
   {{/if}}
 </div>
+
 {{plugin-outlet name="topic-category" args=(hash topic=topic category=topic.category)}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs b/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
index 3af1dba0172..1e6a61eef5c 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
@@ -50,14 +50,22 @@
                disabled=inviteDisabled}}
   {{/if}}
 
-  {{#if topic.isPrivateMessage}}
-    {{d-button class="standard"
+  {{#if canArchive}}
+    {{d-button class="standard archive-topic"
                title=archiveTitle
                label=archiveLabel
                icon=archiveIcon
                action=toggleArchiveMessage}}
   {{/if}}
 
+  {{#if showEditOnFooter}}
+    {{d-button class="edit-message"
+               title="topic.edit_message.help"
+               label="topic.edit_message.title"
+               icon="pencil"
+               action=editFirstPost}}
+  {{/if}}
+
   {{plugin-outlet name="topic-footer-main-buttons-before-create"
                   args=(hash topic=topic)
                   tagName=""
@@ -79,7 +87,9 @@
   {{pinned-button pinned=topic.pinned topic=topic}}
 </div>
 
-{{topic-notifications-button notificationLevel=topic.details.notification_level topic=topic}}
+{{#if showNotificationsButton}}
+  {{topic-notifications-button notificationLevel=topic.details.notification_level topic=topic}}
+{{/if}}
 
 {{plugin-outlet name="after-topic-footer-buttons"
                 args=(hash topic=topic)
diff --git a/app/assets/javascripts/discourse/templates/components/topic-list.hbs b/app/assets/javascripts/discourse/templates/components/topic-list.hbs
index b0d2ae5b115..bcdbf0123cd 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-list.hbs
@@ -11,6 +11,7 @@
       order=order
       ascending=ascending
       sortable=sortable
+      listTitle=listTitle
       bulkSelectEnabled=bulkSelectEnabled}}
   </thead>
 {{/unless}}
@@ -40,7 +41,8 @@
                       expandGloballyPinned=expandGloballyPinned
                       expandAllPinned=expandAllPinned
                       lastVisitedTopic=lastVisitedTopic
-                      selected=selected}}
+                      selected=selected
+                      tagsForUser=tagsForUser}}
     {{raw "list/visited-line" lastVisitedTopic=lastVisitedTopic topic=topic}}
   {{/each}}
 </tbody>
diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
index 31e9c70b270..59c1891fb1d 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -1,8 +1,7 @@
 {{#if visible}}
   <div class="card-content">
-
     <div class="user-card-avatar">
-      <a href={{user.path}} {{action "showUser"}} class="card-huge-avatar">{{bound-avatar avatar "huge"}}</a>
+      <a href={{user.path}} {{action "showUser"}} class="card-huge-avatar">{{bound-avatar user "huge"}}</a>
       {{#if user.primary_group_name}}
         {{avatar-flair
           flairURL=user.primary_group_flair_url
@@ -79,12 +78,13 @@
         </li>
       {{/if}}
     </ul>
+
     {{plugin-outlet
       name="user-card-additional-controls"
       args=(hash user=user close=(action "close"))
       tagName=""}}
 
-    {{#if isSuspended}}
+    {{#if user.suspend_reason}}
       <div class='suspended'>
         {{d-icon "ban"}}
         <b>{{i18n 'user.suspended_notice' date=user.suspendedTillDate}}</b><br>
@@ -94,16 +94,10 @@
       {{#if user.bio_cooked}}<div class='bio'>{{text-overflow class="overflow" text=user.bio_excerpt}}</div>{{/if}}
     {{/if}}
 
-    {{#if user.card_badge}}
-      {{#link-to 'badges.show' user.card_badge class="card-badge" title=user.card_badge.name}}
-        {{icon-or-image user.card_badge.image title=user.card_badge.name}}
-      {{/link-to}}
-    {{/if}}
-
     {{#if hasLocationOrWebsite}}
       <div class="location-and-website">
         {{#if user.location}}
-          <span class='location'>{{d-icon "map-marker"}} {{user.location}}</span>
+          <span class='location'>{{d-icon "map-marker"}} <span>{{user.location}}</span></span>
         {{/if}}
 
         {{#if user.website_name}}
@@ -162,6 +156,7 @@
     {{/if}}
 
     {{#if showBadges}}
+      {{#if user.featured_user_badges}}
       <div class="badge-section">
         {{#each user.featured_user_badges as |ub|}}
           {{user-badge badge=ub.badge user=user}}
@@ -172,6 +167,7 @@
           {{/link-to}}
         {{/if}}
       </div>
+     {{/if}}
     {{/if}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
index ad7f851e2c7..2158ccb1efc 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
@@ -1,3 +1,4 @@
+<label class="control-label">{{{field.name}}}</label>
 <div class='controls'>
   <label class="control-label checkbox-label">{{input checked=value type="checkbox"}} {{{field.description}}}</label>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stat.hbs b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
index 19c62e09d9d..87b1a220e13 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stat.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
@@ -1,6 +1,8 @@
 <span class='value'>
   {{#if isNumber}}
     {{number value}}
+  {{else if isDuration}}
+    {{format-duration value}}
   {{else}}
     {{value}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index 93864a0863c..204c01ac729 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -9,14 +9,13 @@
       {{composer-messages composer=model
                           messageCount=messageCount
                           addLinkLookup="addLinkLookup"}}
-
       {{#if model.viewOpen}}
         <div class="reply-area {{if canEditTags 'with-tags'}}">
           <div class='composer-fields'>
             {{plugin-outlet name="composer-open" args=(hash model=model)}}
             <div class='reply-to'>
               <div class="reply-details">
-                {{{model.actionTitle}}}
+                {{composer-action-title model=model canWhisper=canWhisper tabindex=8}}
 
                 {{#unless site.mobileView}}
                   {{#if whisperOrUnlistTopicText}}
@@ -65,7 +64,8 @@
                   </div>
                 {{/if}}
                 {{#if canEditTags}}
-                  {{tag-chooser tags=model.tags tabIndex="4" categoryId=model.categoryId}}
+                  {{mini-tag-chooser tags=model.tags tabindex="4" categoryId=model.categoryId minimum=model.minimumRequiredTags}}
+                  {{popup-input-tip validation=tagValidation}}
                 {{/if}}
 
 
@@ -85,6 +85,7 @@
                             popupMenuOptions=popupMenuOptions
                             draftStatus=model.draftStatus
                             isUploading=isUploading
+                            allowUpload=allowUpload
                             isCancellable=isCancellable
                             uploadProgress=uploadProgress
                             groupsMentioned="groupsMentioned"
@@ -103,8 +104,18 @@
                                      icon=model.saveIcon
                                      label=model.saveLabel
                                      disableSubmit=disableSubmit}}
+            {{#if site.mobileView}}
+              <a href {{action "cancel"}} class='cancel' tabindex="6" title="{{i18n 'cancel'}}">
+                {{#if canEdit}}
+                  {{d-icon "times"}}
+                {{else}}
+                  {{d-icon "trash-o"}}
+                {{/if}}
+              </a>
+            {{else}}
+              <a href {{action "cancel"}} class='cancel' tabindex="6" >{{i18n 'cancel'}}</a>
+            {{/if}}
 
-              <a href {{action "cancel"}} class='cancel' tabindex="6">{{i18n 'cancel'}}</a>
 
               {{#if site.mobileView}}
                 {{#if whisperOrUnlistTopic}}
@@ -117,8 +128,7 @@
 
               {{#if isUploading}}
                 <div id="file-uploading">
-                  {{loading-spinner size="small"}} {{i18n 'upload_selector.uploading'}}
-                  {{uploadProgress}}%
+                  {{loading-spinner size="small"}}<span>{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span>
                   {{#if isCancellable}}
                     <a href id="cancel-file-upload" {{action "cancelUpload"}}>{{d-icon "times"}}</a>
                   {{/if}}
@@ -131,7 +141,9 @@
 
             <div class="composer-bottom-right">
               {{#if site.mobileView}}
-                <a class="mobile-file-upload {{if isUploading 'hidden'}}">{{i18n 'upload'}}</a>
+                {{#if allowUpload}}
+                  <a class="btn btn-default no-text mobile-file-upload {{if isUploading 'hidden'}}">{{d-icon "upload"}}</a>
+                {{/if}}
 
                 {{#if showPreview}}
                   {{d-button action='togglePreview' class='hide-preview' label='composer.hide_preview'}}
diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
index 3ae66d589d2..acbb3cdcdb8 100644
--- a/app/assets/javascripts/discourse/templates/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
@@ -13,6 +13,17 @@
   </div>
 {{/if}}
 
+{{#if model.sharedDrafts}}
+  {{topic-list
+    class="shared-drafts"
+    listTitle="shared_drafts.title"
+    top=top
+    hideCategory="true"
+    category=category
+    topics=model.sharedDrafts
+    discoveryList=true}}
+{{/if}}
+
 {{bulk-select-button selected=selected action="refresh" category=category}}
 
 {{#discovery-topics-list model=model refresh="refresh" incomingCount=topicTrackingState.incomingCount}}
@@ -25,7 +36,6 @@
       <div class="show-more {{if hasTopics 'has-topics'}}">
         <div class='alert alert-info clickable' {{action "showInserted"}}>
           {{count-i18n key="topic_count_" suffix=topicTrackingState.filter count=topicTrackingState.incomingCount}}
-          {{i18n 'click_to_show'}}
         </div>
       </div>
     {{/if}}
@@ -66,12 +76,12 @@
 
     {{#footer-message education=footerEducation message=footerMessage}}
       {{#if latest}}
-        {{#if canCreateTopicOnCategory}}<a href {{action "createTopic"}}>{{i18n 'topic.suggest_create_topic'}}</a>{{/if}}
+        {{#if canCreateTopicOnCategory}}<a href {{action "createTopic"}}>{{i18n 'topic.suggest_create_topic'}}</a>.{{/if}}
       {{else if top}}
-        {{#link-to "discovery.categories"}}{{i18n 'topic.browse_all_categories'}}{{/link-to}}, {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}} {{i18n 'or'}} {{i18n 'filters.top.other_periods'}}
+        {{#link-to "discovery.categories"}}{{i18n 'topic.browse_all_categories'}}{{/link-to}}, {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}} {{i18n 'or'}} {{i18n 'filters.top.other_periods'}}.
         {{top-period-buttons period=period action="changePeriod"}}
       {{else}}
-        {{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}}
+        {{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}}.
       {{/if}}
     {{/footer-message}}
 
diff --git a/app/assets/javascripts/discourse/templates/emoji-picker.raw.hbs.erb b/app/assets/javascripts/discourse/templates/emoji-picker.raw.hbs.erb
index c2ae260f777..b148675b34c 100644
--- a/app/assets/javascripts/discourse/templates/emoji-picker.raw.hbs.erb
+++ b/app/assets/javascripts/discourse/templates/emoji-picker.raw.hbs.erb
@@ -5,7 +5,7 @@
 
   <% JSON.parse(File.read("lib/emoji/groups.json")).each.with_index do |group, group_index| %>
     <div class='category-icon'>
-      <button type="button" class="emoji" tabindex="-1" data-tabicon="<%= group["tabicon"] %>" data-section="<%= group["name"] %>" title="<%= group["fullname"] %>"></button>
+    <button type="button" class="emoji" tabindex="-1" data-tabicon="<%= group["tabicon"] %>" data-section="<%= group["name"] %>" title="{{i18n '<%= "emoji_picker.#{group["name"]}" %>'}}"></button>
     </div>
   <% end %>
 
diff --git a/app/assets/javascripts/discourse/templates/emoji-selector-autocomplete.raw.hbs b/app/assets/javascripts/discourse/templates/emoji-selector-autocomplete.raw.hbs
index c36583c6eda..230c236033e 100644
--- a/app/assets/javascripts/discourse/templates/emoji-selector-autocomplete.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/emoji-selector-autocomplete.raw.hbs
@@ -1,4 +1,4 @@
-<div class='autocomplete'>
+<div class='autocomplete ac-emoji'>
   <ul>
     {{#each options as |option|}}
       <li>
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index 01edd140237..346b3836645 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -1,163 +1,198 @@
 {{#d-section pageClass="search" class="search-container"}}
-  {{scroll-tracker name="full-page-search" tag=searchTerm}}
-  <div class="search row clearfix">
-    <div class="search-bar">
-    {{search-text-field value=searchTerm class="full-page-search input-xxlarge search no-blur" action="search" hasAutofocus=hasAutofocus}}
-    {{d-button action="search" icon="search" class="btn-primary" disabled=searching}}
-    </div>
-    <div class='search-advanced'>
-      <button class="search-advanced-btn btn" {{action "toggleAdvancedSearch"}}>
-        {{{searchAdvancedIcon}}}
-        {{i18n "search.advanced.title"}}
-      </button>
+  {{scroll-tracker name="full-page-search" tag=searchTerm class="hidden"}}
 
-      {{#if expanded}}
-        {{search-advanced-options searchTerm=searchTerm isExpanded=expanded}}
+  <div class="search-advanced">
+    {{#unless site.mobileView}}
+      <div class="search-bar">
+        {{search-text-field value=searchTerm class="full-page-search search no-blur search-query" action="search" hasAutofocus=hasAutofocus}}
+        {{d-button action="search" icon="search" class="btn-primary search-cta" disabled=searching}}
+      </div>
+    {{/unless}}
+
+    <div class="search-notice">
+      {{#if invalidSearch}}
+        <div class="fps-invalid">
+          {{i18n "search.too_short"}}
+        </div>
+      {{/if}}
+    </div>
+
+    <div class="search-context">
+      {{#if context}}
+        <div class='fps-search-context'>
+          <label>
+            {{input type="checkbox" name="searchContext" checked=searchContextEnabled}} {{searchContextDescription}}
+          </label>
+        </div>
       {{/if}}
     </div>
 
     {{#if hasResults}}
-      {{create-topic-button canCreateTopic=canCreateTopic action=(action "createTopic" searchTerm)}}
+      <div class='search-title'>
+        {{#if hasResults}}
+          {{create-topic-button canCreateTopic=canCreateTopic action=(action "createTopic" searchTerm)}}
+        {{/if}}
+
+        {{#if canBulkSelect}}
+          {{d-button icon="list" class="bulk-select" title="topics.bulk.toggle" action="toggleBulkSelect"}}
+          {{bulk-select-button selected=selected action="search"}}
+        {{/if}}
+
+        {{#if bulkSelectEnabled}}
+          <div class='fps-select'>
+            <a {{action "selectAll"}}>{{i18n "search.select_all"}}</a>
+            <a {{action "clearAll"}}>{{i18n "search.clear_all"}}</a>
+          </div>
+        {{/if}}
+      </div>
+
+      <div class='search-info'>
+        <div class='result-count'>
+          {{{resultCountLabel}}}
+        </div>
+        <div class='sort-by'>
+          <span class='desc'>
+            {{i18n "search.sort_by"}}
+          </span>
+          {{combo-box value=sortOrder content=sortOrders castInteger=true}}
+        </div>
+      </div>
     {{/if}}
 
-    {{#if canBulkSelect}}
-      {{d-button icon="list" class="bulk-select" title="topics.bulk.toggle" action="toggleBulkSelect"}}
-      {{bulk-select-button selected=selected action="search"}}
-    {{/if}}
+    <div class="search-results">
+      {{#load-more selector=".fps-result" action="loadMore"}}
+        {{#each model.posts as |result|}}
+          <div class='fps-result'>
+            <div class='author'>
+              <a href={{result.userPath}} data-user-card="{{unbound result.username}}">
+                {{avatar result imageSize="large"}}
+              </a>
+            </div>
+
+            <div class='fps-topic'>
+              <div class='topic'>
+                {{#if bulkSelectEnabled}}
+                  {{track-selected selectedList=selected selectedId=result.topic}}
+                {{/if}}
+
+                <a class='search-link' href='{{unbound result.url}}' {{action "logClick" result.topic_id}}>
+                  {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=q}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}}</span>
+                </a>
+
+                <div class='search-category'>
+                  {{#if result.topic.category.parentCategory}}
+                  {{category-link result.topic.category.parentCategory}}
+                  {{/if}}
+                  {{category-link result.topic.category hideParent=true}}
+                  {{#each result.topic.tags as |tag|}}
+                    {{discourse-tag tag isPrivateMessage=isPrivateMessage}}
+                  {{/each}}
+                  {{plugin-outlet name="full-page-search-category" args=(hash result=result)}}
+                </div>
+              </div>
+
+              <div class='blurb container'>
+                <span class='date'>
+                  {{format-age result.created_at}}
+                  {{#if result.blurb}}
+                  -
+                  {{/if}}
+                </span>
+
+                {{#if result.blurb}}
+                  {{#highlight-text highlight=highlightQuery}}
+                    {{{unbound result.blurb}}}
+                  {{/highlight-text}}
+                {{/if}}
+              </div>
+
+              {{#if showLikeCount}}
+                {{#if result.like_count}}
+                  <span class='like-count'>
+                    {{result.like_count}} {{d-icon "heart"}}
+                  </span>
+                {{/if}}
+              {{/if}}
+            </div>
+          </div>
+        {{/each}}
+
+        {{#conditional-loading-spinner condition=loading }}
+          {{#unless hasResults}}
+            {{#if searchActive}}
+              <h3>{{i18n "search.no_results"}}</h3>
+
+              {{#if showSuggestion}}
+                <div class="no-results-suggestion">
+                  {{i18n "search.cant_find"}}
+                  {{#if canCreateTopic}}
+                    <a href {{action "createTopic" searchTerm}}>{{i18n "search.start_new_topic"}}</a>
+                    {{#unless siteSettings.login_required}}
+                      {{i18n "search.or_search_google"}}
+                    {{/unless}}
+                  {{else}}
+                    {{i18n "search.search_google"}}
+                  {{/if}}
+                </div>
+
+                {{google-search searchTerm=searchTerm}}
+              {{/if}}
+            {{/if}}
+          {{/unless}}
+
+          {{#if hasResults}}
+            {{#unless loading}}
+              <h3 class="search-footer">
+                {{#if model.grouped_search_result.more_full_page_results}}
+                  {{#if isLastPage }}
+                    {{i18n "search.more_results"}}
+                  {{/if}}
+                {{else}}
+                  {{i18n "search.no_more_results"}}
+                {{/if}}
+              </h3>
+            {{/unless}}
+          {{/if}}
+        {{/conditional-loading-spinner}}
+      {{/load-more}}
+    </div>
   </div>
 
-  {{#if bulkSelectEnabled}}
-    <div class='fps-select'>
-      <a {{action "selectAll"}}>{{i18n "search.select_all"}}</a>
-      <a {{action "clearAll"}}>{{i18n "search.clear_all"}}</a>
-    </div>
-  {{/if}}
-
-  {{#if invalidSearch}}
-    <div class='fps-invalid'>
-      {{i18n "search.too_short"}}
-    </div>
-  {{/if}}
-
-  {{#if context}}
-    <div class='fps-search-context'>
-      <label>
-        {{input type="checkbox" name="searchContext" checked=searchContextEnabled}} {{searchContextDescription}}
-      </label>
-    </div>
-  {{/if}}
-
-  {{#if hasResults}}
-    <div class='search-title clearfix'>
-      <div class='result-count'>
-        <span>
-          {{{resultCountLabel}}}
-        </span>
+  <div class="search-advanced-sidebar">
+    {{#if site.mobileView}}
+      <div class="search-bar">
+        {{search-text-field value=searchTerm class="full-page-search search no-blur search-query" action="search" hasAutofocus=hasAutofocus}}
+        {{d-button action="search" icon="search" class="btn-primary search-cta" disabled=searching}}
       </div>
-      <div class='sort-by'>
-        <span class='desc'>
-          {{i18n "search.sort_by"}}
-        </span>
-        {{combo-box value=sortOrder content=sortOrders castInteger=true}}
-      </div>
-    </div>
-  {{/if}}
+    {{/if}}
 
-  {{#load-more selector=".fps-result" action="loadMore"}}
-    {{#each model.posts as |result|}}
-      <div class='fps-result'>
-        <div class='author'>
-          <a href={{result.userPath}} data-user-card="{{unbound result.username}}">
-            {{avatar result imageSize="large"}}
-          </a>
+    {{#if site.mobileView}}
+      <button class="search-advanced-title btn" {{action "toggleAdvancedSearch"}}>
+        {{{searchAdvancedIcon}}} {{i18n "search.advanced.title"}}
+      </button>
+    {{else}}
+      <span class="search-advanced-title">
+        {{i18n "search.advanced.title"}}
+      </span>
+    {{/if}}
+
+    {{#if site.mobileView}}
+      {{#if expanded}}
+        <div class="search-advanced-filters">
+          {{search-advanced-options searchTerm=searchTerm isExpanded=expanded}}
         </div>
-
-        <div class='fps-topic'>
-          <div class='topic'>
-            {{#if bulkSelectEnabled}}
-              {{track-selected selectedList=selected selectedId=result.topic}}
-            {{/if}}
-
-            <a class='search-link' href='{{unbound result.url}}' {{action "logClick" result.topic_id}}>
-              {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=q}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}}</span>
-            </a>
-
-            <div class='search-category'>
-              {{#if result.topic.category.parentCategory}}
-              {{category-link result.topic.category.parentCategory}}
-              {{/if}}
-              {{category-link result.topic.category hideParent=true}}
-              {{#each result.topic.tags as |tag|}}
-                {{discourse-tag tag}}
-              {{/each}}
-              {{plugin-outlet name="full-page-search-category" args=(hash result=result)}}
-            </div>
-          </div>
-
-          <div class='blurb container'>
-            <span class='date'>
-              {{format-age result.created_at}}
-              {{#if result.blurb}}
-              -
-              {{/if}}
-            </span>
-
-            {{#if result.blurb}}
-              {{#highlight-text highlight=highlightQuery}}
-                {{{unbound result.blurb}}}
-              {{/highlight-text}}
-            {{/if}}
-          </div>
-
-          {{#if showLikeCount}}
-            {{#if result.like_count}}
-              <span class='like-count'>
-                {{result.like_count}} {{d-icon "heart"}}
-              </span>
-            {{/if}}
-          {{/if}}
-        </div>
-      </div>
-    {{/each}}
-
-    {{#conditional-loading-spinner condition=loading }}
-      {{#unless hasResults}}
-        {{#if searchActive}}
-          <h3>{{i18n "search.no_results"}}</h3>
-
-          {{#if showSuggestion}}
-            <div class="no-results-suggestion">
-              {{i18n "search.cant_find"}}
-              {{#if canCreateTopic}}
-                <a href {{action "createTopic" searchTerm}}>{{i18n "search.start_new_topic"}}</a>
-                {{#unless siteSettings.login_required}}
-                  {{i18n "search.or_search_google"}}
-                {{/unless}}
-              {{else}}
-                {{i18n "search.search_google"}}
-              {{/if}}
-            </div>
-
-            {{google-search searchTerm=searchTerm}}
-          {{/if}}
-        {{/if}}
-      {{/unless}}
-
-      {{#if hasResults}}
-        {{#unless loading}}
-          <h3 class="search-footer">
-            {{#if model.grouped_search_result.more_full_page_results}}
-              {{#if isLastPage }}
-                {{i18n "search.more_results"}}
-              {{/if}}
-            {{else}}
-              {{i18n "search.no_more_results"}}
-            {{/if}}
-          </h3>
-        {{/unless}}
       {{/if}}
-    {{/conditional-loading-spinner}}
-
-  {{/load-more}}
+    {{else}}
+      <div class="search-advanced-filters">
+        {{search-advanced-options searchTerm=searchTerm isExpanded=true}}
 
+        {{d-button
+          label="submit"
+          action="search"
+          icon="search"
+          class="btn-primary search-cta"
+          disabled=searching}}
+      </div>
+    {{/if}}
+  </div>
 {{/d-section}}
diff --git a/app/assets/javascripts/discourse/templates/group-activity-posts.hbs b/app/assets/javascripts/discourse/templates/group-activity-posts.hbs
index 061160d1ed1..7599c31cf21 100644
--- a/app/assets/javascripts/discourse/templates/group-activity-posts.hbs
+++ b/app/assets/javascripts/discourse/templates/group-activity-posts.hbs
@@ -1,11 +1,10 @@
-{{#load-more selector=".group-post" action=(action "loadMore")}}
-  <div class='group-posts'>
+{{#load-more selector=".user-stream-item" action="loadMore"}}
+  <div class="user-stream">
     {{#each model as |post|}}
-      {{group-post post=post class="group-post"}}
+      {{group-post post=post class="user-stream-item item"}}
     {{else}}
       <div>{{i18n emptyText}}</div>
     {{/each}}
   </div>
+  {{conditional-loading-spinner condition=loading}}
 {{/load-more}}
-
-{{conditional-loading-spinner condition=loading}}
diff --git a/app/assets/javascripts/discourse/templates/group-activity-topics.hbs b/app/assets/javascripts/discourse/templates/group-activity-topics.hbs
new file mode 100644
index 00000000000..7e87f59d094
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/group-activity-topics.hbs
@@ -0,0 +1,5 @@
+{{#load-more class="paginated-topics-list" selector=".paginated-topics-list .topic-list tr" action="loadMore"}}
+  {{basic-topic-list topicList=model
+                     showPosters=true}}
+  {{conditional-loading-spinner condition=model.loadingMore}}
+{{/load-more}}
diff --git a/app/assets/javascripts/discourse/templates/group-edit.hbs b/app/assets/javascripts/discourse/templates/group-edit.hbs
deleted file mode 100644
index b149a4ad7f7..00000000000
--- a/app/assets/javascripts/discourse/templates/group-edit.hbs
+++ /dev/null
@@ -1,70 +0,0 @@
-<div class='group-edit'>
-  <form class="form-horizontal">
-    <div class="control-group">
-      <label for='full_name'>{{i18n 'groups.edit.full_name'}}</label>
-      {{input type='text' name='full_name' value=model.full_name class='group-edit-full-name'}}
-    </div>
-
-    <div class="control-group">
-      <label for='bio'>{{i18n 'groups.bio'}}</label>
-      {{d-editor value=model.bio_raw class="group-edit-bio"}}
-    </div>
-
-    <div class="control-group">
-      {{group-members-input model=model}}
-    </div>
-
-    <div class="control-group">
-      {{group-flair-inputs model=model}}
-    </div>
-
-    <div class="control-group">
-      <label>
-        {{input type='checkbox'
-            checked=model.public_admission
-            class="group-edit-public-admission"
-            disabled=model.allow_membership_requests}}
-
-        {{i18n 'groups.public_admission'}}
-      </label>
-    </div>
-
-    <div class="control-group">
-      <label>
-        {{input type='checkbox'
-            checked=model.public_exit
-            class="group-edit-public-exit"}}
-
-        {{i18n 'groups.public_exit'}}
-      </label>
-    </div>
-
-    <div class="control-group">
-      <label>
-        {{input type='checkbox'
-            checked=model.allow_membership_requests
-            class="group-edit-allow-membership-requests"
-            disabled=model.public_admission}}
-
-        {{i18n 'groups.allow_membership_requests'}}
-      </label>
-    </div>
-
-    {{#if model.allow_membership_requests}}
-      <div>
-        <label for="membership-request-template">
-          {{i18n 'groups.membership_request_template'}}
-        </label>
-
-        {{expanding-text-area name="membership-request-template"
-            value=model.membership_request_template
-            class="group-edit-membership-request-template"}}
-      </div>
-    {{/if}}
-
-    {{plugin-outlet name="group-edit" args=(hash group=model)}}
-
-    {{d-button action="save" class="btn-primary" disabled=saving label="save"}}
-    {{savingText}}
-  </form>
-</div>
diff --git a/app/assets/javascripts/discourse/templates/group-index.hbs b/app/assets/javascripts/discourse/templates/group-index.hbs
index a58ed87a3c4..d5a880b8bed 100644
--- a/app/assets/javascripts/discourse/templates/group-index.hbs
+++ b/app/assets/javascripts/discourse/templates/group-index.hbs
@@ -1,26 +1,66 @@
+<div class="group-members-actions">
+    {{text-field value=filterInput
+        placeholderKey=filterPlaceholder
+        class="group-username-filter no-blur"}}
+
+  <div class="group-members-manage">
+    {{#if canManageGroup}}
+      {{d-button icon="plus"
+      action="showAddMembersModal"
+      label="groups.add_members.title"
+      class="group-members-add"}}
+      {{#if currentUser.admin}}
+        {{d-button icon="plus"
+        action="showBulkAddModal"
+        label="admin.groups.bulk_add.title"
+        class="group-bulk-add"}}
+      {{/if}}
+    {{/if}}
+  </div>
+</div>
+
 {{#if hasMembers}}
   {{#load-more selector=".group-members tr" action="loadMore"}}
     <table class='group-members'>
       <thead>
         {{group-index-toggle order=order desc=desc field='username_lower' i18nKey='username'}}
+        <th class='group-owner'>{{i18n "groups.members.owner"}}</th>
         {{group-index-toggle order=order desc=desc field='last_posted_at' i18nKey='last_post'}}
         {{group-index-toggle order=order desc=desc field='last_seen_at'  i18nKey='last_seen'}}
+        <th></th>
       </thead>
 
       <tbody>
         {{#each model.members as |m|}}
           <tr>
             <td class='avatar'>
-              {{#user-info user=m skipName=skipName}}
-                {{#if m.owner}}<strong class="group-owner-label">{{i18n "groups.owner"}}</strong>{{/if}}
-              {{/user-info}}
+              {{user-info user=m skipName=skipName}}
             </td>
+
+            <td class='group-owner'>
+              {{#if m.owner}}
+                <strong class="group-owner-label">
+                  {{d-icon "shield"}}
+                </strong>
+              {{/if}}
+            </td>
+
             <td>
               <span class="text">{{bound-date m.last_posted_at}}</span>
             </td>
             <td>
               <span class="text">{{bound-date m.last_seen_at}}</span>
             </td>
+
+            <td>
+              {{#if canManageGroup}}
+                {{group-member-dropdown
+                    removeMember="removeMember"
+                    makeOwner="makeOwner"
+                    removeOwner="removeOwner"
+                    member=m}}
+              {{/if}}
+            </td>
           </tr>
         {{/each}}
       </tbody>
diff --git a/app/assets/javascripts/discourse/templates/group-logs.hbs b/app/assets/javascripts/discourse/templates/group-logs.hbs
deleted file mode 100644
index 154b78d678e..00000000000
--- a/app/assets/javascripts/discourse/templates/group-logs.hbs
+++ /dev/null
@@ -1,33 +0,0 @@
-{{#if model.logs}}
-  <div class="group-logs-controls">
-    {{group-logs-filter clearFilter="clearFilter" value=filters.action type="action"}}
-    {{group-logs-filter clearFilter="clearFilter" value=filters.acting_user type="acting_user"}}
-    {{group-logs-filter clearFilter="clearFilter" value=filters.target_user type="target_user"}}
-    {{group-logs-filter clearFilter="clearFilter" value=filters.subject type="subject"}}
-  </div>
-
-  {{#load-more selector=".group-logs .group-logs-row" action="loadMore"}}
-    <table class="group-logs">
-      <thead>
-        <th>{{i18n 'groups.logs.action'}}</th>
-        <th>{{i18n 'groups.logs.acting_user'}}</th>
-        <th>{{i18n 'groups.logs.target_user'}}</th>
-        <th>{{i18n 'groups.logs.subject'}}</th>
-        <th>{{i18n 'groups.logs.when'}}</th>
-        <th></th>
-      </thead>
-
-      <tbody>
-        {{#each model.logs as |log|}}
-          {{group-logs-row
-              log=log
-              filters=filters}}
-        {{/each}}
-      </tbody>
-    </table>
-  {{/load-more}}
-
-  {{conditional-loading-spinner condition=loading}}
-{{else}}
-  <div>{{i18n "groups.empty.logs"}}</div>
-{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/group-selector-autocomplete.raw.hbs b/app/assets/javascripts/discourse/templates/group-selector-autocomplete.raw.hbs
index 4537c451601..e9e8d159fc1 100644
--- a/app/assets/javascripts/discourse/templates/group-selector-autocomplete.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/group-selector-autocomplete.raw.hbs
@@ -1,4 +1,4 @@
-<div class='autocomplete'>
+<div class='autocomplete ac-group'>
   <ul>
     {{#each options as |option|}}
       <li><a href>{{option.name}}</a></li>
diff --git a/app/assets/javascripts/discourse/templates/group.hbs b/app/assets/javascripts/discourse/templates/group.hbs
index 909c3f6e152..ffd45ca15aa 100644
--- a/app/assets/javascripts/discourse/templates/group.hbs
+++ b/app/assets/javascripts/discourse/templates/group.hbs
@@ -29,25 +29,40 @@
         <p>{{{model.bio_cooked}}}</p>
       </div>
     {{/if}}
+
+    <div class="group-details-button">
+      {{group-membership-button
+          class="inline"
+          model=model
+          showLogin='showLogin'}}
+
+      {{#if displayGroupMessageButton}}
+        {{d-button
+            action="messageGroup"
+            class="btn-primary group-message-button inline"
+            icon="envelope"
+            label="groups.message"}}
+      {{/if}}
+
+      {{#if currentUser.admin}}
+        {{d-button action="destroy"
+            disabled=destroying
+            icon="trash"
+            class='btn-danger'
+            label="admin.groups.delete"}}
+      {{/if}}
+    </div>
   </div>
 
   <div class="list-controls">
     <div class="container">
       {{group-navigation group=model currentPath=application.currentPath tabs=tabs}}
-
-      {{#if displayGroupMessageButton}}
-        {{d-button
-            action="messageGroup"
-            class="btn-primary group-message-button"
-            icon="envelope"
-            label="groups.message"}}
-      {{/if}}
-
-      {{group-membership-button model=model showLogin='showLogin'}}
     </div>
   </div>
 
-  <div class='group-outlet'>
-    {{outlet}}
-  </div>
+    <div class='user-table'>
+      <div class='wrapper'>
+        {{outlet}}
+      </div>
+    </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/group/activity.hbs b/app/assets/javascripts/discourse/templates/group/activity.hbs
index 50798a89d7c..ce6ec6d9bd1 100644
--- a/app/assets/javascripts/discourse/templates/group/activity.hbs
+++ b/app/assets/javascripts/discourse/templates/group/activity.hbs
@@ -1,19 +1,14 @@
-<div class='group-activity container'>
-  {{#mobile-nav class='group-activity-nav' desktopClass="pull-left nav nav-stacked" currentPath=application.currentPath}}
+<section class="user-navigation">
+  {{#mobile-nav class='activity-nav' desktopClass='action-list activity-list nav-stacked' currentPath=application.currentPath}}
     {{group-activity-filter filter="posts" categoryId=category_id}}
     {{group-activity-filter filter="topics" categoryId=category_id}}
     {{#if siteSettings.enable_mentions}}
       {{group-activity-filter filter="mentions" categoryId=category_id}}
     {{/if}}
-    {{#if showGroupMessages}}
-      {{group-activity-filter filter="messages"}}
-    {{/if}}
-    {{plugin-outlet name="below-group-activity-nav" tagName='' connectorTagName='li'}}
+    {{plugin-outlet name="group-activity-bottom" tagName='' connectorTagName='li'}}
   {{/mobile-nav}}
+</section>
 
-  <div class="{{if site.mobileView "" "pull-left"}} group-activity-outlet">
-    <div class='user-main'>
-      {{outlet}}
-    </div>
-  </div>
-</div>
+<section class='user-right'>
+  {{outlet}}
+</section>
diff --git a/app/assets/javascripts/discourse/templates/group/manage.hbs b/app/assets/javascripts/discourse/templates/group/manage.hbs
new file mode 100644
index 00000000000..6357ae842aa
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/group/manage.hbs
@@ -0,0 +1,15 @@
+<section class='user-navigation'>
+  {{#mobile-nav class='activity-nav' desktopClass='action-list activity-list nav-stacked' currentPath=application.currentPath}}
+    {{#each tabs as |tab|}}
+      <li>
+        {{#link-to tab.route model.name}}
+          {{i18n tab.title}}
+        {{/link-to}}
+      </li>
+    {{/each}}
+  {{/mobile-nav}}
+</section>
+
+<section class='user-right'>
+  {{outlet}}
+</section>
diff --git a/app/assets/javascripts/discourse/templates/group/manage/interaction.hbs b/app/assets/javascripts/discourse/templates/group/manage/interaction.hbs
new file mode 100644
index 00000000000..8879b9000c2
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/group/manage/interaction.hbs
@@ -0,0 +1,4 @@
+<form class="groups-form form-vertical">
+  {{groups-form-interaction-fields model=model}}
+  {{group-manage-save-button model=model}}
+</form>
diff --git a/app/assets/javascripts/discourse/templates/group/manage/logs.hbs b/app/assets/javascripts/discourse/templates/group/manage/logs.hbs
new file mode 100644
index 00000000000..d21a3a98ae7
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/group/manage/logs.hbs
@@ -0,0 +1,33 @@
+{{#if model.logs}}
+  <div class="group-manage-logs-controls">
+    {{group-manage-logs-filter clearFilter="clearFilter" value=filters.action type="action"}}
+    {{group-manage-logs-filter clearFilter="clearFilter" value=filters.acting_user type="acting_user"}}
+    {{group-manage-logs-filter clearFilter="clearFilter" value=filters.target_user type="target_user"}}
+    {{group-manage-logs-filter clearFilter="clearFilter" value=filters.subject type="subject"}}
+  </div>
+
+  {{#load-more selector=".group-manage-logs .group-manage-logs-row" action="loadMore"}}
+    <table class="group-manage-logs">
+      <thead>
+        <th>{{i18n 'groups.manage.logs.action'}}</th>
+        <th>{{i18n 'groups.manage.logs.acting_user'}}</th>
+        <th>{{i18n 'groups.manage.logs.target_user'}}</th>
+        <th>{{i18n 'groups.manage.logs.subject'}}</th>
+        <th>{{i18n 'groups.manage.logs.when'}}</th>
+        <th></th>
+      </thead>
+
+      <tbody>
+        {{#each model.logs as |log|}}
+          {{group-manage-logs-row
+              log=log
+              filters=filters}}
+        {{/each}}
+      </tbody>
+    </table>
+  {{/load-more}}
+
+  {{conditional-loading-spinner condition=loading}}
+{{else}}
+  <div>{{i18n "groups.empty.logs"}}</div>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/group/manage/membership.hbs b/app/assets/javascripts/discourse/templates/group/manage/membership.hbs
new file mode 100644
index 00000000000..bb0a12982fe
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/group/manage/membership.hbs
@@ -0,0 +1,4 @@
+<form class="groups-form form-vertical">
+  {{groups-form-membership-fields model=model}}
+  {{group-manage-save-button model=model}}
+</form>
diff --git a/app/assets/javascripts/discourse/templates/group/manage/profile.hbs b/app/assets/javascripts/discourse/templates/group/manage/profile.hbs
new file mode 100644
index 00000000000..4c4ab73ba1d
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/group/manage/profile.hbs
@@ -0,0 +1,4 @@
+<form class="groups-form form-vertical">
+  {{groups-form-profile-fields model=model disableSave=saving}}
+  {{group-manage-save-button model=model saving=saving}}
+</form>
diff --git a/app/assets/javascripts/discourse/templates/group/messages.hbs b/app/assets/javascripts/discourse/templates/group/messages.hbs
new file mode 100644
index 00000000000..78d73cc4390
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/group/messages.hbs
@@ -0,0 +1,18 @@
+<section class="user-navigation">
+  {{#mobile-nav class='messages-nav' desktopClass='nav-stacked action-list' currentPath=application.currentPath}}
+
+    <li>
+      {{#link-to 'group.messages.inbox' model.name}}
+        {{i18n 'user.messages.inbox'}}
+      {{/link-to}}
+    </li>
+    <li>
+      {{#link-to 'group.messages.archive' model.name}}
+        {{i18n 'user.messages.archive'}}
+      {{/link-to}}
+    </li>
+  {{/mobile-nav}}
+</section>
+<section class='user-right messages'>
+    {{outlet}}
+</section>
diff --git a/app/assets/javascripts/discourse/templates/groups.hbs b/app/assets/javascripts/discourse/templates/groups.hbs
deleted file mode 100644
index 296324e7737..00000000000
--- a/app/assets/javascripts/discourse/templates/groups.hbs
+++ /dev/null
@@ -1,68 +0,0 @@
-{{#d-section pageClass="groups"}}
-  <h1>{{i18n "groups.index.title"}}</h1>
-  {{#if groups}}
-    {{#load-more selector=".groups-table .groups-table-row" action="loadMore"}}
-      <div class='container'>
-        <table class="groups-table">
-          <thead>
-            <th></th>
-            <th>{{i18n "groups.user_count"}}</th>
-            <th>{{i18n "groups.membership"}}</th>
-          </thead>
-
-          <tbody>
-            {{#each groups as |group|}}
-              <tr class="groups-table-row">
-                <td class="groups-info">
-                  {{#link-to "group.members" group.name}}
-                    {{#if group.flair_url}}
-                      <span class='group-avatar-flair'>
-                        {{avatar-flair
-                          flairURL=group.flair_url
-                          flairBgColor=group.flair_bg_color
-                          flairColor=group.flair_color
-                          groupName=group.name}}
-                      </span>
-                    {{/if}}
-
-                    <span>
-                      <span class='groups-info-name'>{{group.displayName}}</span>
-
-                      {{#if group.full_name}}
-                        <span class='groups-info-full-name'>{{group.full_name}}</span>
-                      {{/if}}
-
-                      {{#if group.title}}
-                        <div>
-                          <span class='groups-info-title'>{{group.title}}</span>
-                        </div>
-                      {{/if}}
-                    </span>
-                  {{/link-to}}
-                </td>
-
-                <td class="groups-user-count">{{group.user_count}}</td>
-
-                <td>
-                  {{#group-membership-button model=group
-                      showMembershipStatus=true
-                      groupUserIds=groups.extras.group_user_ids
-                      showLogin='showLogin'}}
-
-                    {{d-button icon="ban"
-                        label=(if group.automatic 'groups.automatic_group' 'groups.closed_group')
-                        disabled=true}}
-                  {{/group-membership-button}}
-                </td>
-              </tr>
-            {{/each}}
-          </tbody>
-        </table>
-      </div>
-    {{/load-more}}
-
-    {{conditional-loading-spinner condition=groups.loadingMore}}
-  {{else}}
-    <p>{{i18n "groups.index.empty"}}</p>
-  {{/if}}
-{{/d-section}}
diff --git a/app/assets/javascripts/discourse/templates/groups/index.hbs b/app/assets/javascripts/discourse/templates/groups/index.hbs
new file mode 100644
index 00000000000..c9a96ebe046
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/groups/index.hbs
@@ -0,0 +1,99 @@
+{{#d-section pageClass="groups"}}
+  <div class="groups-header">
+    {{#if currentUser.admin}}
+      {{d-button action="new"
+          class="groups-header-new pull-right"
+          icon="plus"
+          label="admin.groups.new.title"}}
+    {{/if}}
+
+    <div class="groups-header-filters">
+      {{text-field value=filterInput
+          placeholderKey="groups.index.all"
+          class="groups-header-filters-name no-blur"}}
+
+      {{combo-box value=type
+                  content=types
+                  clearable=true
+                  allowAutoSelectFirst=false
+                  noneLabel="groups.index.filter"
+                  class="groups-header-filters-type"}}
+    </div>
+  </div>
+
+  {{#if model}}
+    {{#conditional-loading-spinner condition=model.loading}}
+      {{#load-more selector=".groups-table .groups-table-row" action="loadMore"}}
+        <div class='container'>
+          <table class="groups-table">
+            <thead>
+              <tr>
+                {{directory-toggle field="name" labelKey="groups.group_name" order=order asc=asc}}
+                {{directory-toggle field="user_count" labelKey="groups.user_count" order=order asc=asc}}
+                <th>{{i18n "groups.index.group_type"}}</th>
+                <th>{{i18n "groups.membership"}}</th>
+              </tr>
+            </thead>
+
+            <tbody>
+              {{#each model as |group|}}
+                <tr class="groups-table-row">
+                  <td class="groups-info">
+                    {{#link-to "group.members" group.name}}
+                      {{#if group.flair_url}}
+                        <span class='group-avatar-flair'>
+                          {{avatar-flair
+                            flairURL=group.flair_url
+                            flairBgColor=group.flair_bg_color
+                            flairColor=group.flair_color
+                            groupName=group.name}}
+                        </span>
+                      {{/if}}
+
+                      {{groups-info group=group}}
+                    {{/link-to}}
+                  </td>
+
+                  <td class="groups-user-count">{{group.user_count}}</td>
+
+                  <td class="groups-table-type">
+                    {{#if group.public_admission}}
+                      {{i18n 'groups.index.public'}}
+                    {{else if group.isPrivate}}
+                      {{d-icon "eye-slash"}}
+                      {{i18n 'groups.index.private'}}
+                    {{else}}
+                      {{#if group.automatic}}
+                        {{i18n 'groups.index.automatic'}}
+                      {{else}}
+                        {{i18n 'groups.index.closed'}}
+                      {{/if}}
+                    {{/if}}
+                  </td>
+
+                  <td class="groups-table-membership">
+                    {{#if group.is_group_owner}}
+                      <span>
+                        {{i18n "groups.index.is_group_owner"}}
+                      </span>
+                    {{else if group.is_group_user}}
+                      <span>
+                        {{i18n "groups.index.is_group_user"}}
+                      </span>
+                    {{/if}}
+
+                    {{group-membership-button model=group showLogin='showLogin'}}
+                  </td>
+                </tr>
+              {{/each}}
+            </tbody>
+          </table>
+        </div>
+      {{/load-more}}
+
+      {{conditional-loading-spinner condition=model.loadingMore}}
+    {{/conditional-loading-spinner}}
+  {{else}}
+    <p>{{i18n "groups.index.empty"}}</p>
+  {{/if}}
+{{/d-section}}
diff --git a/app/assets/javascripts/discourse/templates/groups/new.hbs b/app/assets/javascripts/discourse/templates/groups/new.hbs
new file mode 100644
index 00000000000..2501e0be9f0
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/groups/new.hbs
@@ -0,0 +1,41 @@
+{{#d-section pageClass="groups-new"}}
+  <h1>{{i18n "admin.groups.new.title"}}</h1>
+
+  <hr/>
+
+  <form class="groups-form form-vertical">
+    {{#groups-form-profile-fields model=model disableSave=saving}}
+      <div class="control-group">
+        <label class="control-label" for="owner-selector">{{i18n 'admin.groups.add_owners'}}</label>
+
+        {{user-selector usernames=model.ownerUsernames
+            class="input-xxlarge"
+            placeholderKey="groups.selector_placeholder"
+            id="owner-selector"}}
+      </div>
+
+      <div class="control-group">
+        <label class="control-label" for="member-selector">{{i18n 'groups.members.title'}}</label>
+
+        {{user-selector usernames=model.usernames
+            class="input-xxlarge"
+            placeholderKey="groups.selector_placeholder"
+            id="member-selector"}}
+      </div>
+    {{/groups-form-profile-fields}}
+
+    {{groups-form-membership-fields model=model}}
+    {{groups-form-interaction-fields model=model}}
+
+    <div class='control-group buttons'>
+      {{d-button action="save"
+          disabled=saving
+          class='btn btn-primary group-form-save'
+          label="admin.groups.new.create"}}
+
+      {{#link-to "groups"}}
+        {{i18n 'cancel'}}
+      {{/link-to}}
+    </div>
+  </form>
+{{/d-section}}
diff --git a/app/assets/javascripts/discourse/templates/list/activity-column.raw.hbs b/app/assets/javascripts/discourse/templates/list/activity-column.raw.hbs
index 56a994a5510..5bb3d822801 100644
--- a/app/assets/javascripts/discourse/templates/list/activity-column.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/list/activity-column.raw.hbs
@@ -1 +1 @@
-<{{tagName}} class="{{class}} {{cold-age-class topic.createdAt startDate=topic.bumpedAt class=""}} activity" title="{{{topic.bumpedAtTitle}}}"><a href="{{topic.lastPostUrl}}">{{format-date topic.bumpedAt format="tiny" noTitle="true"}}</a></{{tagName}}>
+<{{tagName}} class="{{class}} {{cold-age-class topic.createdAt startDate=topic.bumpedAt class=""}} activity" title="{{{topic.bumpedAtTitle}}}"><a class="post-activity" href="{{topic.lastPostUrl}}">{{format-date topic.bumpedAt format="tiny" noTitle="true"}}</a></{{tagName}}>
diff --git a/app/assets/javascripts/discourse/templates/list/post-count-or-badges.raw.hbs b/app/assets/javascripts/discourse/templates/list/post-count-or-badges.raw.hbs
index 4e41ba326b1..f997dcbff02 100644
--- a/app/assets/javascripts/discourse/templates/list/post-count-or-badges.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/list/post-count-or-badges.raw.hbs
@@ -1,5 +1,5 @@
 {{#if view.showBadges}}
-  {{raw "topic-post-badges" unread=topic.unread newPosts=topic.displayNewPosts unseen=topic.unseen url=topic.lastUnreadUrl}}
+  {{raw "topic-post-badges" unread=topic.unread newPosts=topic.displayNewPosts unseen=topic.unseen url=topic.lastUnreadUrl newDotText=newDotText}}
 {{else}}
   {{raw "list/posts-count-column" topic=topic tagName="div"}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/list/topic-excerpt.raw.hbs b/app/assets/javascripts/discourse/templates/list/topic-excerpt.raw.hbs
index 0a42a6a0c56..1c7b5eead0e 100644
--- a/app/assets/javascripts/discourse/templates/list/topic-excerpt.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/list/topic-excerpt.raw.hbs
@@ -1,6 +1,6 @@
 {{#if topic.hasExcerpt}}
   <div class="topic-excerpt">
-    {{{topic.escapedExcerpt}}}
+    {{{dir-span topic.escapedExcerpt}}}
     {{#if topic.excerptTruncated}}
       <a href="{{topic.url}}">{{i18n 'read_more'}}</a>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
index 3ad017f622c..34616743db0 100644
--- a/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
@@ -1,24 +1,31 @@
 {{#if bulkSelectEnabled}}
-  <td class='star'>
+  <td class="bulk-select">
     <input type="checkbox" class="bulk-select">
   </td>
 {{/if}}
 
+{{!--
+  The `~` syntax strip spaces between the elements, making it produce
+  `<a class=topic-post-badges>Some text</a><span class=topic-post-badges>`,
+  with no space between them.
+  This causes the topic-post-badge to be considered the same word as "text"
+  at the end of the link, preventing it from line wrapping onto its own line.
+--}}
 <td class='main-link clearfix' colspan="{{titleColSpan}}">
   <span class='link-top-line'>
-    {{raw-plugin-outlet name="topic-list-before-status"}}
-    {{raw "topic-status" topic=topic}}
-    {{topic-link topic class="raw-link raw-topic-link"}}
-    {{#if topic.featured_link}}
-      {{topic-featured-link topic}}
-    {{/if}}
-    {{raw-plugin-outlet name="topic-list-after-title"}}
-    {{#if showTopicPostBadges}}
-      {{raw "topic-post-badges" unread=topic.unread newPosts=topic.displayNewPosts unseen=topic.unseen url=topic.lastUnreadUrl}}
-    {{/if}}
+    {{~raw-plugin-outlet name="topic-list-before-status"}}
+    {{~raw "topic-status" topic=topic}}
+    {{~topic-link topic class="raw-link raw-topic-link"}}
+    {{~#if topic.featured_link}}
+      {{~topic-featured-link topic}}
+    {{~/if}}
+    {{~raw-plugin-outlet name="topic-list-after-title"}}
+    {{~#if showTopicPostBadges}}
+      {{~raw "topic-post-badges" unread=topic.unread newPosts=topic.displayNewPosts unseen=topic.unseen url=topic.lastUnreadUrl newDotText=newDotText}}
+    {{~/if}}
   </span>
 
-  {{discourse-tags topic mode="list"}}
+  {{discourse-tags topic mode="list" tagsForUser=tagsForUser}}
   {{#if expandPinned}}
     {{raw "list/topic-excerpt" topic=topic}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
index b0a3dbe21e8..7e3929b3263 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
@@ -1,4 +1,12 @@
 {{#conditional-loading-spinner condition=loading}}
+  {{#if hasIncoming}}
+  <div class="show-mores">
+    <div class='alert alert-info clickable' {{action "showInserted"}}>
+      {{count-i18n key="topic_count_" suffix="latest" count=incomingCount}}
+    </div>
+  </div>
+  {{/if}}
+
   {{#if topics}}
     <table class="topic-list">
       <tbody>
@@ -28,6 +36,7 @@
             </div>
             <div class='clearfix'></div>
             <div class="topic-item-stats clearfix">
+              {{discourse-tags t mode="list" tagsForUser=tagsForUser}}
               <div class="pull-right">
                 {{raw "list/activity-column" topic=t tagName="div" class="num activity last"}}
                 <a href="{{t.lastPostUrl}}" title='{{i18n 'last_post'}}: {{{raw-date t.bumped_at}}}'>{{t.last_poster_username}}</a>
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
index 8f064ab82d8..3c5c1140203 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
@@ -1,7 +1,7 @@
 {{#if categories}}
   <div class="category-list {{if showTopics 'with-topics'}}">
     {{#each categories as |c|}}
-      <div class='category-list-item category' style={{border-color c.color}}>
+      <div data-category-id={{c.id}} 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/mobile/components/directory-item.hbs b/app/assets/javascripts/discourse/templates/mobile/components/directory-item.hbs
index cf592623fe1..f55fd6e5692 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/directory-item.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/directory-item.hbs
@@ -7,5 +7,5 @@
 {{user-stat value=item.posts_read label="directory.posts_read"}}
 {{user-stat value=item.days_visited label="directory.days_visited"}}
 {{#if showTimeRead}}
-  <div class='time-read'>{{unbound item.time_read}}</div>
+  {{user-stat value=item.time_read label="directory.time_read" type="duration"}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
index 192129e037f..c497fa9ff9a 100644
--- a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
@@ -7,7 +7,6 @@
     {{#if topicTrackingState.hasIncoming}}
       <div class='alert alert-info clickable' {{action "showInserted"}}>
         {{count-i18n key="topic_count_" suffix=topicTrackingState.filter count=topicTrackingState.incomingCount}}
-        {{i18n 'click_to_show'}}
       </div>
     {{/if}}
   {{/if}}
@@ -41,12 +40,12 @@
 
     {{#footer-message education=footerEducation message=footerMessage}}
       {{#if latest}}
-        {{#if canCreateTopicOnCategory}}<a href {{action "createTopic"}}>{{i18n 'topic.suggest_create_topic'}}</a>{{/if}}
+        {{#if canCreateTopicOnCategory}}<a href {{action "createTopic"}}>{{i18n 'topic.suggest_create_topic'}}</a>.{{/if}}
       {{else if top}}
-        {{#link-to "discovery.categories"}}{{i18n 'topic.browse_all_categories'}}{{/link-to}}, {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}} {{i18n 'or'}} {{i18n 'filters.top.other_periods'}}
+        {{#link-to "discovery.categories"}}{{i18n 'topic.browse_all_categories'}}{{/link-to}}, {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}} {{i18n 'or'}} {{i18n 'filters.top.other_periods'}}.
         {{top-period-buttons period=period action="changePeriod"}}
       {{else}}
-        {{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}}
+        {{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}}.
       {{/if}}
     {{/footer-message}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/group-index.hbs b/app/assets/javascripts/discourse/templates/mobile/group-index.hbs
new file mode 100644
index 00000000000..b1c05322a17
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/mobile/group-index.hbs
@@ -0,0 +1,55 @@
+{{text-field value=filterInput
+    placeholderKey=filterPlaceholder
+    class="group-username-filter no-blur"}}
+
+<div class="group-members-manage">
+  {{#if canManageGroup}}
+    {{#if currentUser.admin}}
+      {{group-members-dropdown
+          showAddMembersModal="showAddMembersModal"
+          showBulkAddModal="showBulkAddModal"}}
+    {{else}}
+      {{d-button icon="plus"
+          label="groups.add_members.title"
+          class="group-members-add"}}
+    {{/if}}
+  {{/if}}
+</div>
+
+{{#if hasMembers}}
+  {{#load-more selector=".group-members .user-info" action="loadMore"}}
+    <div class="group-members">
+      {{#each model.members as |user|}}
+        <div class="group-member">
+          {{#user-info user=user skipName=skipName}}
+            {{#if user.owner}}<strong class="group-owner-label">{{i18n "groups.owner"}}</strong>{{/if}}
+
+            <div class="group-member-info">
+              <label>{{i18n "last_post"}}</label>
+              <span class="text">{{bound-date user.last_posted_at}}</span>
+            </div>
+
+            <div class="group-member-info">
+              <label>{{i18n "last_seen"}}</label>
+              <span class="text">{{bound-date user.last_seen_at}}</span>
+            </div>
+
+            {{#if canManageGroup}}
+              {{group-member-dropdown
+                  removeMember="removeMember"
+                  makeOwner="makeOwner"
+                  removeOwner="removeOwner"
+                  member=user}}
+            {{/if}}
+          {{/user-info}}
+        </div>
+      {{/each}}
+    </div>
+  {{/load-more}}
+
+  {{conditional-loading-spinner condition=loading}}
+{{else}}
+  <br>
+
+  <div>{{i18n "groups.empty.members"}}</div>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.raw.hbs b/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.raw.hbs
index d0541cf791b..2363ec4371a 100644
--- a/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.raw.hbs
@@ -8,17 +8,17 @@
   <div>
   {{/unless~}}
     <div class='main-link'>
-      {{raw "topic-status" topic=topic}}
-      {{topic-link topic}}
-      {{#if topic.featured_link}}
-        {{topic-featured-link topic}}
-      {{/if}}
-      {{#if topic.unseen}}
-        <span class="badge-notification new-topic"></span>
-      {{/if}}
-      {{~#if expandPinned}}
-      {{raw "list/topic-excerpt" topic=topic}}
-      {{/if~}}
+      {{~raw "topic-status" topic=topic~}}
+      {{~topic-link topic~}}
+      {{~#if topic.featured_link~}}
+        {{~topic-featured-link topic~}}
+      {{~/if~}}
+      {{~#if topic.unseen~}}
+        &nbsp;<span class="badge-notification new-topic"></span>
+      {{~/if~}}
+      {{~#if expandPinned~}}
+      {{~raw "list/topic-excerpt" topic=topic~}}
+      {{~/if~}}
     </div>
 
     <div class='pull-right'>
diff --git a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
index 0e191a6c8da..c98f8badd66 100644
--- a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
@@ -1,24 +1,41 @@
-{{#login-modal screenX=lastX screenY=lastY loginName=loginName loginPassword=loginPassword action="login"}}
+{{#login-modal screenX=lastX screenY=lastY loginName=loginName loginPassword=loginPassword loginSecondFactor=loginSecondFactor action="login"}}
   {{#d-modal-body title="login.title" class="login-modal"}}
-    {{login-buttons action="externalLogin"}}
+    {{#if showLoginButtons}}
+      {{login-buttons
+        canLoginLocalWithEmail=canLoginLocalWithEmail
+        processingEmailLink=processingEmailLink
+        emailLogin='emailLogin'
+        externalLogin='externalLogin'}}
+    {{/if}}
+
     {{#if canLoginLocal}}
       <form id='login-form' method='post'>
-        <div>
+        <div id="credentials">
           <table>
             <tr>
               <td>
-                <label for='login-account-name'>{{i18n 'login.username'}}&nbsp;</label>
+                <label for='login-account-name'>{{i18n 'login.username'}}</label>
               </td>
               <td>
                 {{text-field value=loginName type="email" placeholderKey="login.email_placeholder" id="login-account-name" autocorrect="off" autocapitalize="off"}}
               </td>
             </tr>
+            {{#if showLoginWithEmailLink}}
+              <tr>
+                <td></td>
+                <td>
+                  <a class="login-with-email-link" {{action "emailLogin"}}>
+                    {{i18n 'email_login.link_label'}}
+                  </a>
+                </td>
+              </tr>
+            {{/if}}
             <tr>
               <td>
-                  <label for='login-account-password'>{{i18n 'login.password'}}&nbsp;</label>
+                <label for='login-account-password'>{{i18n 'login.password'}}</label>
               </td>
               <td>
-                  {{text-field value=loginPassword type="password" id="login-account-password" maxlength="200"}} &nbsp;
+                {{text-field value=loginPassword type="password" id="login-account-password" maxlength="200"}}
               </td>
             </tr>
             <tr>
@@ -29,12 +46,12 @@
             </tr>
           </table>
         </div>
-
-
+        {{#second-factor-form}}
+          {{second-factor-input value=loginSecondFactor inputId='login-second-factor'}}
+        {{/second-factor-form}}
       </form>
     {{/if}}
-    {{authMessage}}
-    <div id='login-alert' class={{alertClass}}>{{alert}}</div>
+  
   {{/d-modal-body}}
 
   <div class="modal-footer">
@@ -43,11 +60,11 @@
     {{/if}}
 
     {{#if canLoginLocal}}
-      <button class='btn btn-large btn-primary'
-        disabled={{loginDisabled}}
-        {{action "login"}}>
-          {{d-icon "unlock"}}&nbsp;{{loginButtonText}}
-      </button>
+      {{d-button action="login"
+          icon="unlock"
+          label=loginButtonLabel
+          disabled=loginDisabled
+          class='btn btn-large btn-primary'}}
 
       {{#if showSignupLink}}
         <button class="btn btn-large" id="new-account-link" {{action "showCreateAccount"}}>
@@ -56,4 +73,6 @@
       {{/if}}
     {{/if}}
   </div>
+  <div class="auth-message">{{authMessage}}</div>
+  <div id='login-alert' class={{alertClass}}>{{alert}}</div>
 {{/login-modal}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/users.hbs b/app/assets/javascripts/discourse/templates/mobile/users.hbs
index 56417c588c4..605ce97fca7 100644
--- a/app/assets/javascripts/discourse/templates/mobile/users.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/users.hbs
@@ -1,6 +1,7 @@
 {{#load-more selector=".directory .user" action="loadMore"}}
   <div class="container">
     <div class='directory'>
+      {{plugin-outlet name="users-top" connectorTagName='div' args=(hash model=model)}}
 
       <div class='clearfix user-controls'>
         {{period-chooser period=period}}
diff --git a/app/assets/javascripts/discourse/templates/modal.hbs b/app/assets/javascripts/discourse/templates/modal.hbs
index 43c4e79f49b..953578f6efe 100644
--- a/app/assets/javascripts/discourse/templates/modal.hbs
+++ b/app/assets/javascripts/discourse/templates/modal.hbs
@@ -1,6 +1,7 @@
 {{#d-modal
   modalClass=modalClass
   title=title
+  subtitle=subtitle
   class="hidden"
   errors=errors
   closeModal=(route-action "closeModal")}}
diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index 9efde75e557..e79b2c74544 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -1,13 +1,13 @@
 {{#create-account email=accountEmail disabled=submitDisabled action="createAccount"}}
-
   {{#unless complete}}
     {{#d-modal-body title="create_account.title"}}
+          
       {{#unless hasAuthOptions}}
-        {{login-buttons action="externalLogin"}}
+        {{login-buttons externalLogin="externalLogin"}}
       {{/unless}}
-
+      
       {{#if showCreateForm}}
-        <div>
+        <div class="login-form">
           <form>
           <table>
 
@@ -15,12 +15,13 @@
                 <td class="label"><label for='new-account-email'>{{i18n 'user.email.title'}}</label></td>
                 <td>
                 {{input type="email" value=accountEmail id="new-account-email" disabled=emailValidated name="email" autofocus="autofocus"}}
-                &nbsp;{{input-tip validation=emailValidation}}
                 </td>
           </tr>
+          
           <tr class="instructions create-account-email">
             <td></td>
-            <td><label>{{i18n 'user.email.instructions'}}</label></td>
+                {{input-tip validation=emailValidation}}
+                <td><label>{{i18n 'user.email.instructions'}}</label></td>
           </tr>
 
           {{#if usernameRequired}}
@@ -28,11 +29,11 @@
                   <td class="label"><label for='new-account-username'>{{i18n 'user.username.title'}}</label></td>
                   <td>
                   {{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength autocomplete="off"}}
-                  &nbsp;{{input-tip validation=usernameValidation id="username-validation"}}
                   </td>
             </tr>
             <tr class="instructions">
               <td></td>
+              {{input-tip validation=usernameValidation id="username-validation"}}
               <td><label>{{i18n 'user.username.instructions'}}</label></td>
             </tr>
           {{/if}}
@@ -43,11 +44,12 @@
                 <label for='new-account-name'>{{i18n 'user.name.title'}}</label>
               </td>
               <td>
-                {{text-field value=accountName id="new-account-name"}}&nbsp;{{input-tip validation=nameValidation}}
+                {{text-field value=accountName id="new-account-name"}}
               </td>
             </tr>
             <tr class="instructions">
               <td></td>
+              {{input-tip validation=nameValidation}}
               <td><label>{{nameInstructions}}</label></td>
             </tr>
           {{/if}}
@@ -63,14 +65,14 @@
                 <td class="label"><label for='new-account-password'>{{i18n 'user.password.title'}}</label></td>
                 <td>
                 {{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn}}
-                &nbsp;{{input-tip validation=passwordValidation}}
                 </td>
             </tr>
             <tr class="instructions">
               <td></td>
+              {{input-tip validation=passwordValidation}}
               <td>
                 <label>{{passwordInstructions}}</label>
-                <div class="caps-lock-warning {{unless capsLockOn 'invisible'}}">
+                <div class="caps-lock-warning {{unless capsLockOn 'hidden'}}">
                   {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}</div>
               </td>
             </tr>
@@ -79,7 +81,7 @@
           <tr class="password-confirmation">
             <td><label for='new-account-password-confirmation'>{{i18n 'user.password_confirmation.title'}}</label></td>
             <td>
-              {{input type="password" value=accountPasswordConfirm id="new-account-confirmation"}}
+              {{input type="password" value=accountPasswordConfirm id="new-account-confirmation" autocomplete="new-password"}}
               {{input value=accountChallenge id="new-account-challenge"}}
             </td>
           </tr>
@@ -97,6 +99,7 @@
           </form>
         </div>
       {{/if}}
+
     {{/d-modal-body}}
 
     {{#if showCreateForm}}
diff --git a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
index 36146e7ee49..0b173d7deb5 100644
--- a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
@@ -36,12 +36,22 @@
         <p>
           {{i18n "topic.feature_topic.pin_note"}}
         </p>
-        <p class="with-validation">
-          {{{pinMessage}}}
-          {{d-icon "clock-o"}}
-          {{date-picker-future value=model.pinnedInCategoryUntil}}
-          {{popup-input-tip validation=pinInCategoryValidation shownAt=pinInCategoryTipShownAt}}
-        </p>
+        {{#if site.isMobileDevice}}
+          <p>
+            {{{pinMessage}}}
+          </p>
+          <p class="with-validation">
+            {{date-picker-future value=model.pinnedInCategoryUntil}}
+            {{popup-input-tip validation=pinInCategoryValidation shownAt=pinInCategoryTipShownAt}}
+          </p>
+        {{else}}
+          <p class="with-validation">
+            {{{pinMessage}}}
+            {{d-icon "clock-o"}}
+            {{date-picker-future value=model.pinnedInCategoryUntil}}
+            {{popup-input-tip validation=pinInCategoryValidation shownAt=pinInCategoryTipShownAt}}
+          </p>
+        {{/if}}
         <p>
           {{d-button action="pin" icon="thumb-tack" label="topic.feature.pin" class="btn-primary"}}
         </p>
@@ -62,12 +72,22 @@
         <p>
           {{i18n "topic.feature_topic.global_pin_note"}}
         </p>
-        <p class="with-validation">
-          {{i18n "topic.feature_topic.pin_globally"}}
-          {{d-icon "clock-o"}}
-          {{date-picker-future value=model.pinnedGloballyUntil}}
-          {{popup-input-tip validation=pinGloballyValidation shownAt=pinGloballyTipShownAt}}
-        </p>
+        {{#if site.isMobileDevice}}
+          <p>
+            {{i18n "topic.feature_topic.pin_globally"}}
+          </p>
+          <p class="with-validation">
+            {{date-picker-future value=model.pinnedGloballyUntil}}
+            {{popup-input-tip validation=pinGloballyValidation shownAt=pinGloballyTipShownAt}}
+          </p>
+        {{else}}
+          <p class="with-validation">
+            {{i18n "topic.feature_topic.pin_globally"}}
+            {{d-icon "clock-o"}}
+            {{date-picker-future value=model.pinnedGloballyUntil}}
+            {{popup-input-tip validation=pinGloballyValidation shownAt=pinGloballyTipShownAt}}
+          </p>
+        {{/if}}
         <p>
           {{d-button action="pinGlobally" icon="thumb-tack" label="topic.feature.pin_globally" class="btn-primary"}}
         </p>
diff --git a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
index c739f771979..f2d00aac48c 100644
--- a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
@@ -9,10 +9,10 @@
   {{/d-modal-body}}
   <div class="modal-footer">
     {{#unless offerHelp}}
-      {{d-button action="submit"
-	               label="forgot_password.reset"
-	               disabled=submitDisabled
-	               class="btn-primary"}}
+      {{d-button action="resetPassword"
+                 label="forgot_password.reset"
+                 disabled=submitDisabled
+                 class="btn-primary forgot-password-reset"}}
     {{else}}
       {{d-button class="btn-large btn-primary"
                  label="forgot_password.button_ok"
diff --git a/app/assets/javascripts/discourse/templates/modal/grant-badge.hbs b/app/assets/javascripts/discourse/templates/modal/grant-badge.hbs
new file mode 100644
index 00000000000..eadced1c9c9
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/modal/grant-badge.hbs
@@ -0,0 +1,15 @@
+{{#d-modal-body class='grant-badge'}}
+  {{#conditional-loading-spinner condition=loading}}
+    {{#if noGrantableBadges}}
+      <p>{{i18n 'admin.badges.no_badges'}}</p>
+    {{else}}
+      <p>{{combo-box filterable=true value=selectedBadgeId content=grantableBadges none="badges.none"}}</p>
+    {{/if}}
+  {{/conditional-loading-spinner}}
+{{/d-modal-body}}
+
+<div class="modal-footer">
+  <button class='btn btn-primary' disabled={{buttonDisabled}} {{action "grantBadge"}}>
+    {{i18n 'admin.badges.grant'}}
+  </button>
+</div>
diff --git a/app/assets/javascripts/discourse/templates/modal/group-add-members.hbs b/app/assets/javascripts/discourse/templates/modal/group-add-members.hbs
new file mode 100644
index 00000000000..d32d729c075
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/modal/group-add-members.hbs
@@ -0,0 +1,36 @@
+{{#d-modal-body title="groups.add_members.title"}}
+  <form class="form-vertical group-add-members">
+    <div class="control-group">
+      <label class="control-label">
+        {{i18n "groups.add_members.usernames"}}
+      </label>
+
+      {{user-selector
+          class="input-xxlarge"
+          usernames=model.usernames
+          placeholderKey="groups.selector_placeholder"
+          id="group-add-members-user-selector"
+          disallowEmails=true}}
+    </div>
+
+    {{#if currentUser.admin}}
+      <div class="control-group group-add-members-make-owner">
+        <label>
+          {{input type="checkbox"
+              class="inline"
+              checked=setAsOwner
+              disabled=bulkAdd}}
+          {{i18n "admin.groups.add_members.as_owner"}}
+        </label>
+      </div>
+    {{/if}}
+  </form>
+{{/d-modal-body}}
+
+<div class="modal-footer">
+  {{d-button action="addMembers"
+      class="add btn-primary"
+      icon="plus"
+      disabled=disableAddButton
+      label="groups.add"}}
+</div>
diff --git a/app/assets/javascripts/discourse/templates/modal/group-bulk-add.hbs b/app/assets/javascripts/discourse/templates/modal/group-bulk-add.hbs
new file mode 100644
index 00000000000..887e5a9011f
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/modal/group-bulk-add.hbs
@@ -0,0 +1,38 @@
+{{#d-modal-body title="admin.groups.bulk_add.title"}}
+  {{#if result}}
+    {{#if result.message}}
+      <div class="alert alert-success">
+        {{result.message}}
+      </div>
+    {{/if}}
+
+    {{#if result.invalidUsers}}
+      <div class="alert alert-error">
+        {{i18n "admin.groups.bulk_add.complete_users_not_added"}}
+        {{result.invalidUsers}}
+      </div>
+    {{/if}}
+
+    <div class="">
+      <a {{action 'cancel'}}>{{i18n 'cancel'}}</a>
+    </div>
+  {{else}}
+    <form class="form-vertical group-bulk-add">
+      <div class="control-group">
+        <label class="control-label">
+          {{i18n "admin.groups.bulk_add.paste"}}
+        </label>
+
+        {{textarea value=input}}
+      </div>
+    </form>
+  {{/if}}
+{{/d-modal-body}}
+
+<div class="modal-footer">
+  {{d-button action="add"
+      class="add btn-primary"
+      icon="plus"
+      disabled=disableAddButton
+      label="groups.add"}}
+</div>
diff --git a/app/assets/javascripts/discourse/templates/modal/history.hbs b/app/assets/javascripts/discourse/templates/modal/history.hbs
index 7b83a8961fb..0b2ca23a231 100644
--- a/app/assets/javascripts/discourse/templates/modal/history.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/history.hbs
@@ -1,4 +1,4 @@
-{{#d-modal-body title="history" maxHeight="80%"}}
+{{#d-modal-body title="history" maxHeight="70%"}}
   <div id="revision">
     <div id="revision-controls">
       {{d-button action="loadFirstVersion" icon="fast-backward" title="post.revisions.controls.first" disabled=loadFirstDisabled}}
@@ -119,9 +119,9 @@
     {{#links-redirect class="row"}}
       {{{bodyDiff}}}
     {{/links-redirect}}
-
-    <hr>
-
+  </div>
+{{/d-modal-body}}
+<div class="modal-footer">
     {{#if displayRevert}}
       {{d-button action="revertToVersion" icon="undo" label="post.revisions.controls.revert" class="btn-danger" disabled=loading}}
     {{/if}}
@@ -139,5 +139,4 @@
           icon="pencil"
           label=editButtonLabel}}
     {{/if}}
-  </div>
-{{/d-modal-body}}
+</div>
diff --git a/app/assets/javascripts/discourse/templates/modal/invite.hbs b/app/assets/javascripts/discourse/templates/modal/invite.hbs
index 7ed29ae7ddd..e401b8e712c 100644
--- a/app/assets/javascripts/discourse/templates/modal/invite.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/invite.hbs
@@ -14,36 +14,27 @@
   {{else}}
     <label>{{inviteInstructions}}</label>
     {{#if allowExistingMembers}}
-      {{#if isPrivateTopic}}
-        {{user-selector single="true"
-                        allowAny=true
-                        excludeCurrentUser="true"
-                        usernames=emailOrUsername
-                        allowedUsers="true"
-                        topicId=topicId
-                        placeholderKey=placeholderKey
-                        autocomplete="off"}}
-      {{else}}
-        {{user-selector
-            single="true"
-            allowAny=true
-            excludeCurrentUser="true"
-            includeMentionableGroups="true"
-            hasGroups=hasGroups
-            usernames=emailOrUsername
-            placeholderKey=placeholderKey
-            autocomplete="off"}}
-      {{/if}}
+      {{user-selector
+          single=true
+          allowAny=true
+          excludeCurrentUser=true
+          includeMentionableGroups=includeMentionableGroups
+          includeMessageableGroups=isMessage
+          hasGroups=hasGroups
+          usernames=emailOrUsername
+          placeholderKey=placeholderKey
+          autocomplete="off"}}
     {{else}}
       {{text-field value=emailOrUsername placeholderKey="topic.invite_reply.email_placeholder"}}
     {{/if}}
+
     {{#if showGroups}}
       <label><span class={{showGroupsClass}}>{{i18n 'topic.automatically_add_to_groups'}}</span></label>
       {{group-selector groupFinder=groupFinder groupNames=model.groupNames placeholderKey="topic.invite_private.group_name"}}
     {{/if}}
 
     {{#if showCustomMessage}}
-      <br><label><span class='optional'>{{i18n 'invite.custom_message'}}</span> <a {{action "showCustomMessageBox"}}>{{i18n 'invite.custom_message_link'}}</a>.</label>
+      <label><span class='optional'>{{i18n 'invite.custom_message'}}</span> <a {{action "showCustomMessageBox"}}>{{i18n 'invite.custom_message_link'}}</a>.</label>
       {{#if hasCustomMessage}}{{textarea value=customMessage placeholder=customMessagePlaceholder}}{{/if}}
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
index 1ffb3e2c337..a7b6c0705b8 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
@@ -1,6 +1,6 @@
 {{#d-modal-body id="keyboard-shortcuts-help"}}
   <div class="row">
-    <div class="span6">
+    <div>
       <h4>{{i18n 'keyboard_shortcuts_help.jump_to.title'}}</h4>
       <ul>
         <li>{{{i18n 'keyboard_shortcuts_help.jump_to.home'}}}</li>
@@ -11,7 +11,9 @@
         <li>{{{i18n 'keyboard_shortcuts_help.jump_to.top'}}}</li>
         <li>{{{i18n 'keyboard_shortcuts_help.jump_to.bookmarks'}}}</li>
         <li>{{{i18n 'keyboard_shortcuts_help.jump_to.profile'}}}</li>
-        <li>{{{i18n 'keyboard_shortcuts_help.jump_to.messages'}}}</li>
+        {{#if siteSettings.enable_personal_messages}}
+          <li>{{{i18n 'keyboard_shortcuts_help.jump_to.messages'}}}</li>
+        {{/if}}
       </ul>
       <h4>{{i18n 'keyboard_shortcuts_help.navigation.title'}}</h4>
       <ul>
@@ -22,10 +24,9 @@
         <li>{{{i18n 'keyboard_shortcuts_help.navigation.next_prev'}}}</li>
       </ul>
     </div>
-    <div class="span6">
+    <div>
       <h4>{{i18n 'keyboard_shortcuts_help.application.title'}}</h4>
       <ul>
-        <li>{{{i18n 'keyboard_shortcuts_help.application.create'}}}</li>
         <li>{{{i18n 'keyboard_shortcuts_help.application.hamburger_menu'}}}</li>
         <li>{{{i18n 'keyboard_shortcuts_help.application.user_profile_menu'}}}</li>
         <li>{{{i18n 'keyboard_shortcuts_help.application.show_incoming_updated_topics'}}}</li>
@@ -35,18 +36,23 @@
         <li>{{{i18n 'keyboard_shortcuts_help.application.dismiss_topics'}}}</li>
         <li>{{{i18n 'keyboard_shortcuts_help.application.log_out'}}}</li>
       </ul>
+      <h4>{{i18n 'keyboard_shortcuts_help.composing.title'}}</h4>
+      <ul>
+        <li>{{{i18n 'keyboard_shortcuts_help.composing.return'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.application.create'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.reply_as_new_topic'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.reply_topic'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.reply_post'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.quote_post'}}}</li>
+      </ul>
     </div>
-    <div class="span6">
+    <div>
       <h4>{{i18n 'keyboard_shortcuts_help.actions.title'}}</h4>
       <ul>
         <li>{{{i18n 'keyboard_shortcuts_help.actions.bookmark_topic'}}}</li>
         <li>{{{i18n 'keyboard_shortcuts_help.actions.pin_unpin_topic'}}}</li>
         <li>{{{i18n 'keyboard_shortcuts_help.actions.share_topic'}}}</li>
         <li>{{{i18n 'keyboard_shortcuts_help.actions.share_post'}}}</li>
-        <li>{{{i18n 'keyboard_shortcuts_help.actions.reply_as_new_topic'}}}</li>
-        <li>{{{i18n 'keyboard_shortcuts_help.actions.reply_topic'}}}</li>
-        <li>{{{i18n 'keyboard_shortcuts_help.actions.reply_post'}}}</li>
-        <li>{{{i18n 'keyboard_shortcuts_help.actions.quote_post'}}}</li>
         <li>{{{i18n 'keyboard_shortcuts_help.actions.like'}}}</li>
         <li>{{{i18n 'keyboard_shortcuts_help.actions.flag'}}}</li>
         <li>{{{i18n 'keyboard_shortcuts_help.actions.bookmark'}}}</li>
diff --git a/app/assets/javascripts/discourse/templates/modal/login.hbs b/app/assets/javascripts/discourse/templates/modal/login.hbs
index 81b3fb611df..fe2ec0f575d 100644
--- a/app/assets/javascripts/discourse/templates/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/login.hbs
@@ -1,53 +1,57 @@
-{{#login-modal screenX=lastX screenY=lastY loginName=loginName loginPassword=loginPassword action="login"}}
+{{#login-modal screenX=lastX screenY=lastY loginName=loginName loginPassword=loginPassword loginSecondFactor=loginSecondFactor action="login"}}
   {{#d-modal-body title="login.title" class="login-modal"}}
-    {{login-buttons action="externalLogin"}}
+
     {{#if canLoginLocal}}
       <form id='login-form' method='post'>
-        <div>
+        <div id="credentials">
           <table>
             <tr>
+              <td><label for='login-account-name'>{{i18n 'login.username'}}</label></td>
+              <td>{{text-field value=loginName placeholderKey="login.email_placeholder" id="login-account-name" autocorrect="off" autocapitalize="off" autofocus="autofocus"}}</td>
               <td>
-                <label for='login-account-name'>{{i18n 'login.username'}}&nbsp;</label>
-              </td>
-              <td>
-                {{text-field value=loginName placeholderKey="login.email_placeholder" id="login-account-name" autocorrect="off" autocapitalize="off" autofocus="autofocus"}}
-              </td>
-              <td></td>
-            </tr>
-            <tr>
-              <td>
-                  <label for='login-account-password'>{{i18n 'login.password'}}&nbsp;</label>
-              </td>
-              <td>
-                  {{password-field value=loginPassword type="password" id="login-account-password" maxlength="200" capsLockOn=capsLockOn}} &nbsp;
-              </td>
-              <td>
-                <a id="forgot-password-link" {{action "forgotPassword"}}>{{i18n 'forgot_password.action'}}</a>
+                {{#if showLoginWithEmailLink}}
+                  <a class="login-with-email-link" {{action "emailLogin"}}>
+                    {{i18n 'email_login.link_label'}}
+                  </a>
+                {{/if}}
               </td>
             </tr>
+            <tr>
+              <td><label for='login-account-password'>{{i18n 'login.password'}}</label></td>
+              <td>{{password-field value=loginPassword type="password" id="login-account-password" maxlength="200" capsLockOn=capsLockOn}}</td>
+              <td><a id="forgot-password-link" {{action "forgotPassword"}}>{{i18n 'forgot_password.action'}}</a></td>
+            </tr>
             <tr>
               <td></td>
-              <td><div class="caps-lock-warning {{unless capsLockOn 'invisible'}}">{{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}</div></td>
+              <td><div class="caps-lock-warning {{unless capsLockOn 'hidden'}}">{{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}</div></td>
               <td></td>
             </tr>
           </table>
         </div>
+        {{#second-factor-form}}
+          {{second-factor-input value=loginSecondFactor inputId='login-second-factor'}}
+        {{/second-factor-form}}
       </form>
     {{/if}}
-    {{authMessage}}
-    <div id='login-alert' class={{alertClass}}>{{alert}}</div>
+ 
+    {{#if showLoginButtons}}
+      {{login-buttons
+        canLoginLocalWithEmail=canLoginLocalWithEmail
+        processingEmailLink=processingEmailLink
+        emailLogin='emailLogin'
+        externalLogin='externalLogin'}}
+    {{/if}}
   {{/d-modal-body}}
 
   <div class="modal-footer">
     {{#if canLoginLocal}}
-      <button class="btn btn-large btn-primary"
-        disabled={{loginDisabled}}
-        {{action "login"}}>
-          {{d-icon "unlock"}} &nbsp;{{loginButtonText}}
-      </button>
+      {{d-button action="login"
+          icon="unlock"
+          label=loginButtonLabel
+          disabled=loginDisabled
+          class='btn btn-large btn-primary'}}
 
       {{#if showSignupLink}}
-        &nbsp;
         <button class="btn btn-large" id="new-account-link" {{action "createAccount"}}>
           {{i18n 'create_account.title'}}
         </button>
@@ -55,9 +59,12 @@
     {{/if}}
 
     {{#if authenticate}}
-      &nbsp; {{i18n 'login.authenticating'}}
+      &nbsp;{{i18n 'login.authenticating'}}
     {{/if}}
 
     {{conditional-loading-spinner condition=showSpinner size="small"}}
   </div>
+
+  <div class="auth-message">{{authMessage}}</div>
+  <div id='login-alert' class={{alertClass}}>{{alert}}</div>
 {{/login-modal}}
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-intro.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-intro.hbs
new file mode 100644
index 00000000000..f573c45cc91
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-intro.hbs
@@ -0,0 +1,6 @@
+{{#d-modal-body title="user.second_factor.title"}}
+  <div>{{{i18n 'user.second_factor.extended_description'}}}</div>
+{{/d-modal-body}}
+
+<div class="modal-footer">
+</div>
diff --git a/app/assets/javascripts/discourse/templates/navigation/categories.hbs b/app/assets/javascripts/discourse/templates/navigation/categories.hbs
index 30495333df2..4dba68da5ca 100644
--- a/app/assets/javascripts/discourse/templates/navigation/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/categories.hbs
@@ -5,5 +5,6 @@
     createCategory=(route-action "createCategory")
     reorderCategories=(route-action "reorderCategories")
     canCreateTopic=canCreateTopic
+    hasDraft=draft
     createTopic=(route-action "createTopic")}}
 {{/d-section}}
diff --git a/app/assets/javascripts/discourse/templates/navigation/category.hbs b/app/assets/javascripts/discourse/templates/navigation/category.hbs
index d8dcac7040c..9bffcd46dc6 100644
--- a/app/assets/javascripts/discourse/templates/navigation/category.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/category.hbs
@@ -5,7 +5,7 @@
     {{#if category.uploaded_logo.url}}
       {{cdn-img src=category.uploaded_logo.url class="category-logo"}}
       {{#if category.description}}
-        <p>{{{category.description}}}</p>
+        <p>{{{dir-span category.description}}}</p>
       {{/if}}
     {{/if}}
   </section>
@@ -18,6 +18,7 @@
       canCreateTopic=canCreateTopic
       createTopic=(route-action "createTopic")
       createTopicDisabled=cannotCreateTopicOnCategory
+      hasDraft=draft
       editCategory=(route-action "editCategory" category)}}
 
     {{plugin-outlet name="category-navigation" args=(hash category=category)}}
diff --git a/app/assets/javascripts/discourse/templates/navigation/default.hbs b/app/assets/javascripts/discourse/templates/navigation/default.hbs
index b9d9854295f..d1bf784c4fd 100644
--- a/app/assets/javascripts/discourse/templates/navigation/default.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/default.hbs
@@ -2,5 +2,6 @@
   {{d-navigation
     filterMode=filterMode
     canCreateTopic=canCreateTopic
+    hasDraft=draft
     createTopic=(route-action "createTopic")}}
 {{/d-section}}
diff --git a/app/assets/javascripts/discourse/templates/password-reset.hbs b/app/assets/javascripts/discourse/templates/password-reset.hbs
index e999fedb1ef..01d1db9df3a 100644
--- a/app/assets/javascripts/discourse/templates/password-reset.hbs
+++ b/app/assets/javascripts/discourse/templates/password-reset.hbs
@@ -16,20 +16,28 @@
       {{/if}}
     {{else}}
       <form>
+        {{#if secondFactorRequired}}
+          <h2>{{i18n 'login.second_factor_title'}}</h2>
+          <p>{{i18n 'login.second_factor_description'}}</p>
+          <div class="input">
+            {{input value=secondFactor id="second-factor" autofocus="autofocus"}}
+          </div>
+          {{d-button action="submit" class='btn-primary' label='submit'}}
+        {{else}}
+          <h2>{{i18n 'user.change_password.choose'}}</h2>
 
-        <h2>{{i18n 'user.change_password.choose'}}</h2>
+          <div class="input">
+            {{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn autofocus="autofocus"}}
+            &nbsp;{{input-tip validation=passwordValidation}}
+          </div>
 
-        <div class="input">
-          {{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn autofocus="autofocus"}}
-          &nbsp;{{input-tip validation=passwordValidation}}
-        </div>
+          <div class="instructions">
+            <div class="caps-lock-warning {{unless capsLockOn 'invisible'}}">
+              {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}</div>
+          </div>
 
-        <div class="instructions">
-          <div class="caps-lock-warning {{unless capsLockOn 'invisible'}}">
-            {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}</div>
-        </div>
-
-        <button class='btn btn-primary' {{action "submit"}}>{{i18n 'user.change_password.set_password'}}</button>
+          {{d-button action="submit" class='btn-primary' label='user.change_password.set_password'}}
+        {{/if}}
 
         {{#if errorMessage}}
           <br/><br/>
diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
new file mode 100644
index 00000000000..6621b7e2a7a
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
@@ -0,0 +1,126 @@
+<section class='user-content user-preferences'>
+  <form class="form-horizontal">
+    <div class="control-group">
+      <div class="controls">
+        <h3>{{i18n 'user.second_factor.title'}}</h3>
+      </div>
+    </div>
+
+    {{#if errorMessage}}
+      <div class="control-group">
+        <div class="instructions">
+          <div class='alert alert-error'>{{errorMessage}}</div>
+        </div>
+      </div>
+    {{/if}}
+
+    {{#if model.second_factor_enabled}}
+      <label class='control-label'>{{i18n 'user.second_factor.label'}}</label>
+
+      <div class="control-group">
+        <div class="controls">
+          {{second-factor-input value=secondFactorToken inputId='second-factor-token'}}
+        </div>
+
+        <div class='instructions'>
+          {{i18n 'user.second_factor.disable_description'}}
+        </div>
+      </div>
+
+      <div class="control-group">
+        <div class="controls">
+          {{d-button action="disableSecondFactor"
+              class="btn btn-primary"
+              disabled=loading
+              label=disableButtonText}}
+
+          {{cancel-link route="preferences.account" args= model.username}}
+        </div>
+      </div>
+    {{else}}
+      {{#if loaded}}
+        <div class="control-group">
+          <div class="controls">
+            {{{i18n 'user.second_factor.enable_description'}}}
+
+            {{#if displayOAuthWarning}}
+              {{i18n 'user.second_factor.oauth_enabled_warning'}}
+            {{/if}}
+          </div>
+        </div>
+
+        <div class="control-group">
+          <div class="controls">
+            <div class="qr-code-container">
+              <div class="qr-code">
+                {{{secondFactorImage}}}
+              </div>
+            </div>
+
+            <p>
+            {{#if showSecondFactorKey}}
+              {{secondFactorKey}}
+            {{else}}
+              <a {{action "showSecondFactorKey"}}>{{i18n 'user.second_factor.show_key_description'}}</a>
+            {{/if}}
+            </p>
+          </div>
+        </div>
+
+        <div class="control-group">
+          <label class="control-label input-prepend">{{i18n 'user.second_factor.label'}}</label>
+
+          <div class="controls">
+            {{second-factor-input value=secondFactorToken inputId='second-factor-token'}}
+          </div>
+        </div>
+
+        <div class="control-group">
+          <div class="controls">
+            {{d-button action="enableSecondFactor"
+                class="btn btn-primary"
+                disabled=loading
+                label=enableButtonText}}
+
+            {{cancel-link route="preferences.account" args= model.username}}
+          </div>
+        </div>
+      {{else}}
+        <div class="control-group">
+          <label class='control-label'>{{i18n 'user.password.title'}}</label>
+
+          <div class="controls">
+            {{text-field value=password
+                id="password"
+                type="password"
+                classNames="input-xxlarge"
+                autofocus="autofocus"}}
+          </div>
+
+          <div class='instructions'>
+            {{i18n 'user.second_factor.confirm_password_description'}}
+          </div>
+        </div>
+
+        <div class="control-group">
+          <div class="controls">
+            {{d-button action="confirmPassword"
+                class="btn btn-primary"
+                disabled=loading
+                label=submitButtonText}}
+
+            {{d-button action="resetPassword"
+                class="btn"
+                disabled=resetPasswordLoading
+                icon="envelope"
+                label='user.change_password.action'}}
+
+            {{resetPasswordProgress}}
+
+            {{cancel-link route="preferences.account" args= model.username}}
+          </div>
+        </div>
+      {{/if}}
+    {{/if}}
+  </form>
+</section>
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 38569dd9bdd..2a7f3a0d192 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -63,8 +63,23 @@
         {{i18n 'user.change_password.action'}}
       {{/if}}
     </a>
+
     {{passwordProgress}}
   </div>
+
+  <div class="controls pref-second-factor">
+    {{#if model.second_factor_enabled}}
+      {{i18n 'user.second_factor.disable'}}
+    {{else}}
+      {{discourse-linked-text action="showTwoFactorModal" text="user.second_factor.enable"}}
+    {{/if}}
+
+    {{#if isCurrentUser}}
+      {{#link-to "preferences.second-factor" class="btn btn-small btn-icon pad-left no-text"}}
+        {{d-icon "pencil"}}
+      {{/link-to}}
+    {{/if}}
+  </div>
 </div>
 {{/if}}
 
@@ -83,8 +98,10 @@
   <div class="control-group pref-title">
     <label class="control-label">{{i18n 'user.title.title'}}</label>
     <div class="controls">
-      <span class="static">{{model.title}}</span>
-      {{#link-to "preferences.badgeTitle" class="btn btn-small btn-icon pad-left no-text"}}{{d-icon "pencil"}}{{/link-to}}
+      {{combo-box
+        value=newTitleInput
+        content=model.availableTitles
+        none="user.title.none"}}
     </div>
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/apps.hbs b/app/assets/javascripts/discourse/templates/preferences/apps.hbs
index 1d18e69d0f1..958ec75cb7e 100644
--- a/app/assets/javascripts/discourse/templates/preferences/apps.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/apps.hbs
@@ -24,4 +24,4 @@
 </div>
 {{/if}}
 
-{{plugin-outlet name="user-preferences-apps"}}
+{{plugin-outlet name="user-preferences-apps" args=(hash model=model save=(action "save"))}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/card-badge.hbs b/app/assets/javascripts/discourse/templates/preferences/card-badge.hbs
deleted file mode 100644
index 12f06094ea7..00000000000
--- a/app/assets/javascripts/discourse/templates/preferences/card-badge.hbs
+++ /dev/null
@@ -1,25 +0,0 @@
-<section class='user-content'>
-  <form class="form-horizontal">
-
-    <div class="control-group">
-      <div class="controls">
-        <h3>{{i18n 'user.card_badge.title'}}</h3>
-      </div>
-    </div>
-
-    <div class="control-group">
-      <label class="control-label"></label>
-      <div class="controls">
-        {{combo-box value=selectedUserBadgeId nameProperty="badge.name" content=selectableUserBadges}}
-      </div>
-    </div>
-
-    <div class="control-group">
-      <div class="controls">
-        <button class="btn btn-primary" disabled={{disableSave}} {{action "save"}}>{{savingStatus}}</button>
-        {{#if saved}}{{i18n 'saved'}}{{/if}}
-      </div>
-    </div>
-
-  </form>
-</section>
diff --git a/app/assets/javascripts/discourse/templates/preferences/categories.hbs b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
index ee57fea81e4..fa29ec5cd11 100644
--- a/app/assets/javascripts/discourse/templates/preferences/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
@@ -36,7 +36,7 @@
 
 </div>
 
-{{plugin-outlet name="user-preferences-categories"}}
+{{plugin-outlet name="user-preferences-categories" args=(hash model=model save=(action "save"))}}
 
 <br/>
 
diff --git a/app/assets/javascripts/discourse/templates/preferences/emails.hbs b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
index 9d5f3b57665..d877bf7f826 100644
--- a/app/assets/javascripts/discourse/templates/preferences/emails.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
@@ -1,3 +1,10 @@
+{{#unless siteSettings.disable_mailing_list_mode}}
+  <div class="warning-wrap">
+    {{#if model.user_option.mailing_list_mode}}
+      <div class="warning">{{i18n 'user.mailing_list_mode.warning'}}</div>
+    {{/if}}
+  </div>
+{{/unless}}
 <div class="control-group pref-email-settings">
   <label class="control-label">{{i18n 'user.email_settings'}}</label>
   <div class='controls controls-dropdown'>
@@ -45,7 +52,7 @@
   </div>
 {{/unless}}
 
-{{plugin-outlet name="user-preferences-emails"}}
+{{plugin-outlet name="user-preferences-emails" args=(hash model=model save=(action "save"))}}
 
 <br/>
 
diff --git a/app/assets/javascripts/discourse/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
index f6db98b840c..9954bd40092 100644
--- a/app/assets/javascripts/discourse/templates/preferences/interface.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
@@ -43,7 +43,7 @@
   {{/if}}
 </div>
 
-{{plugin-outlet name="user-preferences-interface"}}
+{{plugin-outlet name="user-preferences-interface" args=(hash model=model save=(action "save"))}}
 
 <br/>
 
diff --git a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
index c0441202b4a..d4d258c748d 100644
--- a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
@@ -24,17 +24,20 @@
   <label class="control-label">{{i18n 'user.desktop_notifications.label'}}</label>
   {{desktop-notification-config}}
   <div class="instructions">{{i18n 'user.desktop_notifications.each_browser_note'}}</div>
+  {{plugin-outlet name="user-preferences-desktop-notifications" args=(hash model=model save=(action "save"))}}
 </div>
 
-<div class="control-group private-messages">
-  <label class="control-label">{{i18n 'user.private_messages'}}</label>
+{{#if siteSettings.enable_personal_messages}}
+  <div class="control-group private-messages">
+    <label class="control-label">{{i18n 'user.private_messages'}}</label>
 
-  <div class="controls">
-    {{preference-checkbox
-        labelKey="user.allow_private_messages"
-        checked=model.user_option.allow_private_messages}}
+    <div class="controls">
+      {{preference-checkbox
+          labelKey="user.allow_private_messages"
+          checked=model.user_option.allow_private_messages}}
+    </div>
   </div>
-</div>
+{{/if}}
 
 <div class="control-group muting">
   <label class="control-label">{{i18n 'user.users'}}</label>
@@ -45,7 +48,7 @@
   <div class="instructions">{{i18n 'user.muted_users_instructions'}}</div>
 </div>
 
-{{plugin-outlet name="user-preferences-notifications"}}
+{{plugin-outlet name="user-preferences-notifications" args=(hash model=model save=(action "save"))}}
 
 <br/>
 
diff --git a/app/assets/javascripts/discourse/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
index 39686f2b128..b906cfe75d1 100644
--- a/app/assets/javascripts/discourse/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
@@ -50,17 +50,7 @@
   </div>
 {{/if}}
 
-<div class="control-group pref-card-badge">
-  <label class="control-label">{{i18n 'user.card_badge.title'}}</label>
-  <div class="controls">
-    {{#if model.card_image_badge}}
-      {{icon-or-image model.card_image_badge}}
-    {{/if}}
-    {{#link-to "preferences.card-badge" class="btn btn-small pad-left no-text"}}{{d-icon "pencil"}}{{/link-to}}
-  </div>
-</div>
-
-{{plugin-outlet name="user-preferences-profile"}}
+{{plugin-outlet name="user-preferences-profile" args=(hash model=model save=(action "save"))}}
 
 {{plugin-outlet name="user-custom-preferences" args=(hash model=model)}}
 
diff --git a/app/assets/javascripts/discourse/templates/preferences/tags.hbs b/app/assets/javascripts/discourse/templates/preferences/tags.hbs
index 1c24147a2f6..ef1dcc541f6 100644
--- a/app/assets/javascripts/discourse/templates/preferences/tags.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/tags.hbs
@@ -5,31 +5,55 @@
 
   <div class="controls tag-controls">
     <label>{{d-icon "d-watching" class="icon watching"}} {{i18n 'user.watched_tags'}}</label>
-    {{tag-chooser tags=model.watched_tags blacklist=selectedTags allowCreate=false placeholder="" everyTag="true" unlimitedTagCount="true"}}
+    {{tag-chooser
+      tags=model.watched_tags
+      blacklist=selectedTags
+      filterPlaceholder=null
+      allowCreate=false
+      everyTag=true
+      unlimitedTagCount=true}}
   </div>
   <div class="instructions">{{i18n 'user.watched_tags_instructions'}}</div>
 
   <div class="controls tag-controls">
-    <label>{{d-icon "d-regular" class="icon tracking"}} {{i18n 'user.tracked_tags'}}</label>
-    {{tag-chooser tags=model.tracked_tags blacklist=selectedTags allowCreate=false placeholder="" everyTag="true" unlimitedTagCount="true"}}
+    <label>{{d-icon "d-tracking" class="icon tracking"}} {{i18n 'user.tracked_tags'}}</label>
+    {{tag-chooser
+      tags=model.tracked_tags
+      blacklist=selectedTags
+      filterPlaceholder=null
+      allowCreate=false
+      everyTag=true
+      unlimitedTagCount=true}}
   </div>
   <div class="instructions">{{i18n 'user.tracked_tags_instructions'}}</div>
 
   <div class="controls tag-controls">
     <label>{{d-icon "d-watching-first" class="icon watching-first-post"}} {{i18n 'user.watched_first_post_tags'}}</label>
-    {{tag-chooser tags=model.watching_first_post_tags blacklist=selectedTags allowCreate=false placeholder="" everyTag="true" unlimitedTagCount="true"}}
+    {{tag-chooser
+      tags=model.watching_first_post_tags
+      blacklist=selectedTags
+      filterPlaceholder=null
+      allowCreate=false
+      everyTag=true
+      unlimitedTagCount=true}}
   </div>
   <div class="instructions">{{i18n 'user.watched_first_post_tags_instructions'}}</div>
 
   <div class="controls tag-controls">
     <label>{{d-icon "d-muted" class="icon muted"}} {{i18n 'user.muted_tags'}}</label>
-    {{tag-chooser tags=model.muted_tags blacklist=selectedTags allowCreate=false placeholder="" everyTag="true" unlimitedTagCount="true"}}
+    {{tag-chooser
+      tags=model.muted_tags
+      blacklist=selectedTags
+      filterPlaceholder=null
+      allowCreate=false
+      everyTag=true
+      unlimitedTagCount=true}}
   </div>
   <div class="instructions">{{i18n 'user.muted_tags_instructions'}}</div>
 
 </div>
 
-{{plugin-outlet name="user-preferences-tags"}}
+{{plugin-outlet name="user-preferences-tags" args=(hash model=model save=(action "save"))}}
 
 <br/>
 
diff --git a/app/assets/javascripts/discourse/templates/tag-groups-show.hbs b/app/assets/javascripts/discourse/templates/tag-groups-show.hbs
index 26fde8830f4..60f2f48bcd4 100644
--- a/app/assets/javascripts/discourse/templates/tag-groups-show.hbs
+++ b/app/assets/javascripts/discourse/templates/tag-groups-show.hbs
@@ -3,12 +3,21 @@
   <br/>
   <section class="group-tags-list">
     <label>{{i18n 'tagging.groups.tags_label'}}</label><br/>
-    {{tag-chooser tags=model.tag_names everyTag="true" unlimitedTagCount="true"}}
+    {{tag-chooser
+      tags=model.tag_names
+      everyTag=true
+      allowCreate=true
+      unlimitedTagCount=true}}
   </section>
 
   <section class="parent-tag-section">
     <label>{{i18n 'tagging.groups.parent_tag_label'}}</label>
-    {{tag-chooser tags=model.parent_tag_name everyTag="true" limit="1" placeholderKey="tagging.groups.parent_tag_placeholder"}}
+    {{tag-chooser
+      tags=model.parent_tag_name
+      everyTag=true
+      maximum=1
+      allowCreate=true
+      filterPlaceholder="tagging.groups.parent_tag_placeholder"}}
     <span class="description">{{i18n 'tagging.groups.parent_tag_description'}}</span>
   </section>
 
@@ -19,6 +28,21 @@
     </label>
   </section>
 
+  <section class="group-visibility">
+    <div>
+      {{radio-button class="tag-permissions-choice" name="tag-permissions-choice" value="public" id="public-permission" selection=model.permissionName onChange="changed"}}
+      <label class="radio" for="public-permission">{{i18n 'tagging.groups.everyone_can_use'}}</label>
+    </div>
+    <div>
+      {{radio-button class="tag-permissions-choice" name="tag-permissions-choice" value="visible" id="visible-permission" selection=model.permissionName onChange="changed"}}
+      <label class="radio" for="visible-permission">{{i18n 'tagging.groups.usable_only_by_staff'}}</label>
+    </div>
+    <div>
+      {{radio-button class="tag-permissions-choice" name="tag-permissions-choice" value="private" id="private-permission" selection=model.permissionName onChange="changed"}}
+      <label class="radio" for="private-permission">{{i18n 'tagging.groups.visible_only_to_staff'}}</label>
+    </div>
+  </section>
+
   <button {{action "save"}} disabled={{model.disableSave}} class='btn'>{{i18n 'tagging.groups.save'}}</button>
   <button {{action "destroy"}} disabled={{model.disableSave}} class='btn btn-danger'>{{d-icon "trash-o"}} {{i18n 'tagging.groups.delete'}}</button>
   <span class="saving {{unless model.savingStatus 'hidden'}}">{{model.savingStatus}}</span>
diff --git a/app/assets/javascripts/discourse/templates/tags/index.hbs b/app/assets/javascripts/discourse/templates/tags/index.hbs
index 1cf1beb970b..4f40428f9fb 100644
--- a/app/assets/javascripts/discourse/templates/tags/index.hbs
+++ b/app/assets/javascripts/discourse/templates/tags/index.hbs
@@ -13,8 +13,8 @@
 
 <div class='tag-sort-options'>
   {{i18n "tagging.sort_by"}}
-  <a {{action "sortByCount"}}>{{i18n "tagging.sort_by_count"}}</a>
-  <a {{action "sortById"}}>{{i18n "tagging.sort_by_name"}}</a>
+  <span class="tag-sort-count {{if sortedByCount 'active'}}"><a {{action "sortByCount"}}>{{i18n "tagging.sort_by_count"}}</a></span>
+  <span class="tag-sort-name {{if sortedByName 'active'}}"><a {{action "sortById"}}>{{i18n "tagging.sort_by_name"}}</a></span>
 </div>
 
 <hr/>
@@ -23,4 +23,10 @@
   {{tag-list tags=category.tags sortProperties=sortProperties categoryId=category.id}}
 {{/each}}
 
-{{tag-list tags=model sortProperties=sortProperties titleKey="tagging.all_tags"}}
+{{#each model.extras.tag_groups as |tagGroup|}}
+  {{tag-list tags=tagGroup.tags sortProperties=sortProperties tagGroupName=tagGroup.name}}
+{{/each}}
+
+{{#if model}}
+  {{tag-list tags=model sortProperties=sortProperties titleKey=otherTagsTitleKey}}
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/tags/show.hbs b/app/assets/javascripts/discourse/templates/tags/show.hbs
index 3504bacd987..1196908497b 100644
--- a/app/assets/javascripts/discourse/templates/tags/show.hbs
+++ b/app/assets/javascripts/discourse/templates/tags/show.hbs
@@ -14,13 +14,14 @@
     {{#if showAdminControls}}
       {{d-button action="deleteTag" icon="trash-o" class="admin-tag btn-danger"}}
       {{d-button action="renameTag" actionParam=tag icon="pencil" class="admin-tag"}}
-    {{else}}
-      {{create-topic-button
-        canCreateTopic=canCreateTopic
-        disabled=createTopicDisabled
-        action=(route-action "createTopic")}}
     {{/if}}
 
+    {{create-topic-button
+      canCreateTopic=canCreateTopic
+      disabled=createTopicDisabled
+      label=createTopicLabel
+      action=(route-action "createTopic")}}
+
     {{#if showTagFilter}}
       {{bread-crumbs categories=categories
                      category=category
@@ -65,7 +66,7 @@
   {{else}}
     <footer class='topic-list-bottom'>
       <h3>
-        {{footerMessage}}{{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}}
+        {{footerMessage}}{{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}}.
       </h3>
     </footer>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/topic-list-header.raw.hbs b/app/assets/javascripts/discourse/templates/topic-list-header.raw.hbs
index 9f4646b3ad3..361ffb91b95 100644
--- a/app/assets/javascripts/discourse/templates/topic-list-header.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/topic-list-header.raw.hbs
@@ -1,11 +1,11 @@
 {{#if bulkSelectEnabled}}
-  <th class='star'>
+  <th class="bulk-select">
     {{#if canBulkSelect}}
       {{raw "flat-button" class="bulk-select" icon="list" title="topics.bulk.toggle"}}
     {{/if}}
   </th>
 {{/if}}
-{{raw "topic-list-header-column" order='default' name='topic.title' bulkSelectEnabled=bulkSelectEnabled showBulkToggle=toggleInTitle canBulkSelect=canBulkSelect}}
+{{raw "topic-list-header-column" order='default' name=listTitle bulkSelectEnabled=bulkSelectEnabled showBulkToggle=toggleInTitle canBulkSelect=canBulkSelect}}
 {{#unless hideCategory}}
   {{raw "topic-list-header-column" sortable=sortable order='category' name='category_title'}}
 {{/unless}}
diff --git a/app/assets/javascripts/discourse/templates/topic-post-badges.raw.hbs b/app/assets/javascripts/discourse/templates/topic-post-badges.raw.hbs
index b2076113c31..2580b38a8ce 100644
--- a/app/assets/javascripts/discourse/templates/topic-post-badges.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/topic-post-badges.raw.hbs
@@ -1,11 +1,11 @@
 <span class='topic-post-badges'>
-  {{#if unread ~}}
-    <a href='{{url}}' class='badge badge-notification unread' title='{{i18n "topic.unread_posts" count=unread}}'>{{unread}}</a>
-  {{/if }}
-  {{#if newPosts ~}}
-    <a href='{{url}}' class='badge badge-notification new-posts' title='{{i18n "topic.total_unread_posts" count=newPosts}}'>{{newPosts}}</a>
-  {{/if}}
-  {{#if unseen ~}}
-    <a href='{{url}}' class='badge badge-notification new-topic' title='{{i18n "topic.new"}}'>{{i18n 'filters.new.lower_title'}}</a>
-  {{/if}}
+  {{~#if unread ~}}
+    &nbsp;<a href='{{url}}' class='badge badge-notification unread' title='{{i18n "topic.unread_posts" count=unread}}'>{{unread}}</a>
+  {{~/if}}
+  {{~#if newPosts ~}}
+    &nbsp;<a href='{{url}}' class='badge badge-notification new-posts' title='{{i18n "topic.total_unread_posts" count=newPosts}}'>{{newPosts}}</a>
+  {{~/if}}
+  {{~#if unseen ~}}
+    &nbsp;<a href='{{url}}' class='badge badge-notification new-topic' title='{{i18n "topic.new"}}'>{{newDotText}}</a>
+  {{~/if}}
 </span>
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 28a0cf5fdc8..47f221ec08a 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -6,6 +6,10 @@
     </div>
   {{/if}}
 
+  {{#if showSharedDraftControls}}
+    {{shared-draft-controls topic=model}}
+  {{/if}}
+
   {{plugin-outlet name="topic-above-post-stream" args=(hash model=model)}}
 
   {{#if model.postStream.loaded}}
@@ -22,7 +26,7 @@
             {{/if}}
 
             {{#if canEditTags}}
-              {{tag-chooser tags=buffered.tags categoryId=buffered.category_id}}
+              {{mini-tag-chooser filterable=true tags=buffered.tags categoryId=buffered.category_id}}
             {{/if}}
 
             {{plugin-outlet name="edit-topic" args=(hash model=model buffered=buffered)}}
@@ -42,9 +46,13 @@
         {{else}}
           <h1>
             {{#unless model.is_warning}}
-              <a href={{pmPath}}>
+              {{#if siteSettings.enable_personal_messages}}
+                <a href={{pmPath}}>
+                  <span class="private-message-glyph">{{d-icon "envelope"}}</span>
+                </a>
+              {{else}}
                 <span class="private-message-glyph">{{d-icon "envelope"}}</span>
-              </a>
+              {{/if}}
             {{/unless}}
 
             {{#if model.details.loaded}}
@@ -59,13 +67,12 @@
             {{/if}}
           </h1>
 
-          {{#unless model.isPrivateMessage}}
-            {{topic-category topic=model class="topic-category"}}
-          {{/unless}}
+          {{topic-category topic=model class="topic-category"}}
         {{/if}}
       {{/topic-title}}
     {{/if}}
 
+
     <div class="container posts">
       <div class='selected-posts {{unless multiSelect 'hidden'}}'>
         {{partial "selected-posts"}}
@@ -170,6 +177,9 @@
                 togglePostType=(action "togglePostType")
                 rebakePost=(action "rebakePost")
                 changePostOwner=(action "changePostOwner")
+                grantBadge=(action "grantBadge")
+                lockPost=(action "lockPost")
+                unlockPost=(action "unlockPost")
                 unhidePost=(action "unhidePost")
                 replyToPost=(action "replyToPost")
                 toggleWiki=(action "toggleWiki")
@@ -246,6 +256,7 @@
                     showFlagTopic=(action "topicRouteAction" "showFlagTopic")
                     showInvite=(action "topicRouteAction" "showInvite")
                     toggleArchiveMessage=(action "toggleArchiveMessage")
+                    editFirstPost=(action "editFirstPost")
                     replyToPost=(action "replyToPost")
                     }}
                 {{else}}
diff --git a/app/assets/javascripts/discourse/templates/topic/unsubscribe.hbs b/app/assets/javascripts/discourse/templates/topic/unsubscribe.hbs
deleted file mode 100644
index 17a4df882eb..00000000000
--- a/app/assets/javascripts/discourse/templates/topic/unsubscribe.hbs
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class='topic-unsubscribe'>
-  <div class="container">
-    <p>
-      {{{stopNotificiationsText}}}
-    </p>
-
-    <p>
-      {{i18n "topic.unsubscribe.change_notification_state"}}
-    </p>
-
-    {{topic-notifications-button notificationLevel=model.details.notification_level topic=model}}
-  </div>
-</div>
diff --git a/app/assets/javascripts/discourse/templates/user-card.hbs b/app/assets/javascripts/discourse/templates/user-card.hbs
index 6a0b2ade382..f2ad8f600db 100644
--- a/app/assets/javascripts/discourse/templates/user-card.hbs
+++ b/app/assets/javascripts/discourse/templates/user-card.hbs
@@ -4,4 +4,14 @@
   showUser="showUser"
   togglePosts="togglePosts"
   composePrivateMessage="composePrivateMessage"
+  createNewMessageViaParams="createNewMessageViaParams"
+  deleteUser="deleteUser"}}
+
+{{group-card-contents
+  currentPath=application.currentPath
+  topic=topic.model
+  showUser="showUser"
+  togglePosts="togglePosts"
+  composePrivateMessage="composePrivateMessage"
+  createNewMessageViaParams="createNewMessageViaParams"
   deleteUser="deleteUser"}}
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index 5f8dc6d18ad..c02499e76bf 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -5,13 +5,13 @@
         <h2>{{i18n 'user.invited.title'}}</h2>
 
         {{#if model.can_see_invite_details}}
-          <div class='user-invite-controls'>
-            <div class='span15'>
+          <div class='admin-controls'>
+            <nav>
               <ul class="nav nav-pills">
                 {{nav-item route='userInvited.show' routeParam='pending' i18nLabel=pendingLabel}}
                 {{nav-item route='userInvited.show' routeParam='redeemed' i18nLabel=redeemedLabel}}
               </ul>
-            </div>
+            </nav>
 
             <div class="pull-right">
               {{d-button icon="plus" action="showInvite" label="user.invited.create" class="btn"}}
diff --git a/app/assets/javascripts/discourse/templates/user-private-messages-tags.hbs b/app/assets/javascripts/discourse/templates/user-private-messages-tags.hbs
new file mode 100644
index 00000000000..89a47eb4dde
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/user-private-messages-tags.hbs
@@ -0,0 +1,17 @@
+<div class="list-controls">
+  <div class="container">
+    <h2>{{i18n "tagging.tags"}}</h2>
+  </div>
+</div>
+
+<div class='tag-sort-options'>
+  {{i18n "tagging.sort_by"}}
+  <span class="tag-sort-count {{if sortedByCount 'active'}}"><a {{action "sortByCount"}}>{{i18n "tagging.sort_by_count"}}</a></span>
+  <span class="tag-sort-name {{if sortedByName 'active'}}"><a {{action "sortById"}}>{{i18n "tagging.sort_by_name"}}</a></span>
+</div>
+
+<hr/>
+
+{{#if model}}
+  {{tag-list tags=model sortProperties=sortProperties titleKey="tagging.all_tags" isPrivateMessage=true tagsForUser=tagsForUser}}
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs b/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs
index a72dd3e5186..1c0856d2cc6 100644
--- a/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs
@@ -1,4 +1,4 @@
-<div class='autocomplete'>
+<div class='autocomplete ac-user'>
   <ul>
     {{#each options.users as |user|}}
       <li>
diff --git a/app/assets/javascripts/discourse/templates/user-topics-list.hbs b/app/assets/javascripts/discourse/templates/user-topics-list.hbs
index 355e4aee776..933e3dfe168 100644
--- a/app/assets/javascripts/discourse/templates/user-topics-list.hbs
+++ b/app/assets/javascripts/discourse/templates/user-topics-list.hbs
@@ -4,7 +4,11 @@
                      showParticipants=showParticipants
                      showPosters=showPosters
                      bulkSelectEnabled=bulkSelectEnabled
-                     selected=selected}}
+                     selected=selected
+                     hasIncoming=hasIncoming
+                     incomingCount=incomingCount
+                     showInserted="showInserted"
+                     tagsForUser=tagsForUser}}
 
   {{conditional-loading-spinner condition=model.loadingMore}}
 {{/load-more}}
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index e97ab3cefbe..3b3acc6fa94 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -23,7 +23,11 @@
             </div>
           {{/if}}
           {{#if model.number_of_suspensions}}
-            <div><span class="suspensions">{{model.number_of_suspensions}}</span>{{i18n 'user.staff_counters.suspensions'}}</div>
+            <div>
+              <a {{action "showSuspensions"}}>
+                <span class="suspensions">{{model.number_of_suspensions}}</span>{{i18n 'user.staff_counters.suspensions'}}
+              </a>
+            </div>
           {{/if}}
           {{#if model.warnings_received_count}}
             <div><span class="warnings-received">{{model.warnings_received_count}}</span>{{i18n 'user.staff_counters.warnings_received'}}</div>
@@ -35,12 +39,22 @@
       <div class='profile-image'></div>
       <div class='details'>
         <div class='primary'>
-          {{bound-avatar model "huge"}}
+          <div class='user-profile-avatar'>
+            {{bound-avatar model "huge"}}
+            {{#if model.primary_group_name}}
+              {{avatar-flair
+                flairURL=model.primary_group_flair_url
+                flairBgColor=model.primary_group_flair_bg_color
+                flairColor=model.primary_group_flair_color
+                groupName=model.primary_group_name}}
+            {{/if}}
+            {{plugin-outlet name="user-profile-avatar-flair" args=(hash model=model) tagName='div'}}
+          </div>
           <section class='controls'>
             <ul>
               {{#if model.can_send_private_message_to_user}}
               <li>
-                <a class='btn btn-primary' {{action "composePrivateMessage" model}}>
+                <a class='btn btn-primary compose-pm' {{action "composePrivateMessage" model}}>
                   {{d-icon "envelope"}}
                   {{i18n 'user.private_message'}}
                 </a>
@@ -53,23 +67,33 @@
                               connectorTagName="li"
                               args=(hash model=model)}}
 
-              {{#if collapsedInfo}}
-              {{#if viewingSelf}}
-              <li><a {{action "expandProfile"}} href class="btn">{{d-icon "angle-double-down"}}{{i18n 'user.expand_profile'}}</a></li>
+              {{#if canExpandProfile}}
+                <li>
+                  {{#if collapsedInfo}}
+                    <a {{action "expandProfile"}} href class="btn">
+                      {{d-icon "angle-double-down"}} {{i18n 'user.expand_profile'}}
+                    </a>
+                  {{else}}
+                    <a {{action "collapseProfile"}} href class="btn">
+                      {{d-icon "angle-double-up"}} {{i18n 'user.collapse_profile'}}
+                    </a>
+                  {{/if}}
+                </li>
               {{/if}}
-              {{/if}}
-
             </ul>
           </section>
 
           <div class="primary-textual">
             <h1 class="{{if nameFirst "full-name" "username"}}">{{if nameFirst model.name (format-username model.username)}} {{user-status model currentUser=currentUser}}</h1>
             <h2 class="{{if nameFirst "username" "full-name"}}">{{#if nameFirst}}{{model.username}}{{else}}{{model.name}}{{/if}}</h2>
+            {{#if model.staged}}
+              <h2 class="staged">{{i18n 'user.staged'}}</h2>
+            {{/if}}
             {{#if model.title}}
               <h3>{{model.title}}</h3>
             {{/if}}
             {{plugin-outlet name="user-post-names" args=(hash model=model)}}
-            <h3>
+            <h3 class="location-and-website">
             {{#if model.location}}{{d-icon "map-marker"}} {{model.location}}{{/if}}
             {{#if model.website_name}}
               {{d-icon "globe"}}
@@ -83,7 +107,7 @@
             </h3>
 
             <div class='bio'>
-              {{#if model.isSuspended}}
+              {{#if model.suspended}}
                 <div class='suspended'>
                   {{d-icon "ban"}}
                   <b>
@@ -130,23 +154,23 @@
       <div class='secondary'>
         <dl>
           {{#if model.created_at}}
-            <dt>{{i18n 'user.created'}}</dt><dd>{{bound-date model.created_at}}</dd>
+            <div><dt>{{i18n 'user.created'}}</dt><dd>{{bound-date model.created_at}}</dd></div>
           {{/if}}
           {{#if model.last_posted_at}}
-            <dt>{{i18n 'user.last_posted'}}</dt><dd>{{bound-date model.last_posted_at}}</dd>
+            <div><dt>{{i18n 'user.last_posted'}}</dt><dd>{{bound-date model.last_posted_at}}</dd></div>
           {{/if}}
           {{#if model.last_seen_at}}
-            <dt>{{i18n 'user.last_seen'}}</dt><dd>{{bound-date model.last_seen_at}}</dd>
+            <div><dt>{{i18n 'user.last_seen'}}</dt><dd>{{bound-date model.last_seen_at}}</dd></div>
           {{/if}}
-          <dt>{{i18n 'views'}}</dt><dd>{{model.profile_view_count}}</dd>
+          <div><dt>{{i18n 'views'}}</dt><dd>{{model.profile_view_count}}</dd></div>
           {{#if model.invited_by}}
-            <dt class="invited-by">{{i18n 'user.invited_by'}}</dt><dd class="invited-by">{{#link-to 'user' model.invited_by}}{{model.invited_by.username}}{{/link-to}}</dd>
+            <div><dt class="invited-by">{{i18n 'user.invited_by'}}</dt><dd class="invited-by">{{#link-to 'user' model.invited_by}}{{model.invited_by.username}}{{/link-to}}</dd></div>
           {{/if}}
           {{#if model.trust_level}}
-            <dt class="trust-level">{{i18n 'user.trust_level'}}</dt><dd class="trust-level">{{model.trustLevel.name}}</dd>
+            <div><dt class="trust-level">{{i18n 'user.trust_level'}}</dt><dd class="trust-level">{{model.trustLevel.name}}</dd></div>
           {{/if}}
           {{#if canCheckEmails}}
-            <dt>{{i18n 'user.email.title'}}</dt>
+            <div><dt>{{i18n 'user.email.title'}}</dt>
             <dd title={{model.email}}>
               {{#if model.email}}
                 {{model.email}}
@@ -154,17 +178,25 @@
                 {{d-button action="checkEmail" actionParam=model icon="envelope-o" label="admin.users.check_email.text" class="btn-primary"}}
               {{/if}}
             </dd>
+            </div>
           {{/if}}
+
           {{#if model.displayGroups}}
-            <dt class="groups">{{i18n 'groups.title' count=model.displayGroups.length}}</dt>
+            <div><dt class="groups">{{i18n 'groups.title' count=model.displayGroups.length}}</dt>
             <dd class='groups'>
               {{#each model.displayGroups as |group|}}
                 <span>{{#link-to 'group' group.name class="group-link"}}{{group.name}}{{/link-to}}</span>
               {{/each}}
+
+              {{#link-to "groups" (query-params username=model.username)}}
+                ...
+              {{/link-to}}
             </dd>
+            </div>
           {{/if}}
+
           {{#if canDeleteUser}}
-            {{d-button action="adminDelete" icon="exclamation-triangle" label="user.admin_delete" class="btn-danger"}}
+            <div>{{d-button action="adminDelete" icon="exclamation-triangle" label="user.admin_delete" class="btn-danger"}}</div>
           {{/if}}
         </dl>
         {{plugin-outlet name="user-profile-secondary" args=(hash model=model)}}
diff --git a/app/assets/javascripts/discourse/templates/user/badge-title.hbs b/app/assets/javascripts/discourse/templates/user/badge-title.hbs
deleted file mode 100644
index f51fbd234bc..00000000000
--- a/app/assets/javascripts/discourse/templates/user/badge-title.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{badge-title selectableUserBadges=selectableUserBadges user=user}}
diff --git a/app/assets/javascripts/discourse/templates/user/messages.hbs b/app/assets/javascripts/discourse/templates/user/messages.hbs
index 5a788282337..0e53780129c 100644
--- a/app/assets/javascripts/discourse/templates/user/messages.hbs
+++ b/app/assets/javascripts/discourse/templates/user/messages.hbs
@@ -23,29 +23,46 @@
     </li>
     {{plugin-outlet name="user-messages-nav" connectorTagName='li' args=(hash model=model)}}
     {{#each model.groups as |group|}}
-    {{#if group.has_messages}}
-    <li>
-      {{#link-to 'userPrivateMessages.group' group.name}}
-        {{d-icon "group" class="glyph"}}
-        {{capitalize-string group.name}}
-      {{/link-to}}
-    </li>
-    <li class='archive'>
-      {{#link-to 'userPrivateMessages.groupArchive' group.name}}
-        {{i18n 'user.messages.archive'}}
-      {{/link-to}}
-    </li>
-    {{/if}}
+      {{#if group.has_messages}}
+        <li>
+          {{#link-to 'userPrivateMessages.group' group.name}}
+            {{d-icon "group" class="glyph"}}
+            {{capitalize-string group.name}}
+          {{/link-to}}
+        </li>
+        <li class='archive'>
+          {{#link-to 'userPrivateMessages.groupArchive' group.name}}
+            {{i18n 'user.messages.archive'}}
+          {{/link-to}}
+        </li>
+      {{/if}}
     {{/each}}
+
+    {{#if pmTaggingEnabled}}
+      <li class="noGlyph">
+        {{#link-to 'userPrivateMessages.tags' model}}
+          {{i18n 'user.messages.tags'}}
+        {{/link-to}}
+      </li>
+      {{#if tagId}}
+        <li class="archive">
+          {{#link-to 'userPrivateMessages.tagsShow' tagId}}
+            {{tagId}}
+          {{/link-to}}
+        </li>
+      {{/if}}
+    {{/if}}
   {{/mobile-nav}}
 {{/d-section}}
 
 <section class='user-right messages'>
 
 <div class="clearfix list-actions">
-    <button {{action "toggleBulkSelect"}} class="btn bulk-select" title="{{i18n "user.messages.bulk_select"}}">
-      {{d-icon "list"}}
-    </button>
+    {{#if showToggleBulkSelect}}
+      <button {{action "toggleBulkSelect"}} class="btn bulk-select" title="{{i18n "user.messages.bulk_select"}}">
+        {{d-icon "list"}}
+      </button>
+    {{/if}}
 
     {{#if site.mobileView}}
       {{#if showNewPM}}
@@ -65,7 +82,6 @@
     </button>
     {{/if}}
 
-
     {{#if bulkSelectEnabled}}
     <button {{action "selectAll"}} class="btn btn-select-all">
       {{i18n "user.messages.select_all"}}
diff --git a/app/assets/javascripts/discourse/templates/users.hbs b/app/assets/javascripts/discourse/templates/users.hbs
index 0fe4408dd76..bfe29fb340c 100644
--- a/app/assets/javascripts/discourse/templates/users.hbs
+++ b/app/assets/javascripts/discourse/templates/users.hbs
@@ -2,7 +2,7 @@
   {{#load-more selector=".directory tbody tr" action="loadMore"}}
     <div class="container">
       <div class='directory'>
-
+        {{plugin-outlet name="users-top" connectorTagName='div' args=(hash model=model)}}
         <div class='clearfix'>
           {{period-chooser period=period}}
           {{text-field value=nameInput placeholderKey="directory.filter_name" class="filter-name no-blur"}}
diff --git a/app/assets/javascripts/discourse/widgets/button.js.es6 b/app/assets/javascripts/discourse/widgets/button.js.es6
index ebc7b561495..1794c0ab857 100644
--- a/app/assets/javascripts/discourse/widgets/button.js.es6
+++ b/app/assets/javascripts/discourse/widgets/button.js.es6
@@ -28,15 +28,14 @@ export const ButtonClass = {
 
   buildAttributes() {
     const attrs = this.attrs;
+    const attributes = {};
 
-    let title;
     if (attrs.title) {
-      title = I18n.t(attrs.title, attrs.titleOptions);
-    } else if (attrs.label) {
-      title = I18n.t(attrs.label, attrs.labelOptions);
+      const title = I18n.t(attrs.title, attrs.titleOptions);
+      attributes["aria-label"] = title;
+      attributes.title = title;
     }
 
-    const attributes = { "aria-label": title, title };
     if (attrs.disabled) { attributes.disabled = "true"; }
 
     if (attrs.data) {
@@ -71,7 +70,7 @@ export const ButtonClass = {
     if (attrs.sendActionEvent) {
       return this.sendWidgetAction(attrs.action, e);
     }
-    return this.sendWidgetAction(attrs.action);
+    return this.sendWidgetAction(attrs.action, attrs.actionParam);
   }
 };
 
diff --git a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
index 77e8b331867..957fd246a86 100644
--- a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
@@ -90,23 +90,35 @@ export default createWidget('hamburger-menu', {
     const { siteSettings } = this;
     const links = [];
 
-    links.push({ route: 'discovery.latest', className: 'latest-topics-link', label: 'filters.latest.title' });
+    links.push({
+      route: 'discovery.latest',
+      className: 'latest-topics-link',
+      label: 'filters.latest.title',
+      title: 'filters.latest.help'
+    });
 
     if (this.currentUser) {
       links.push({ route: 'discovery.new',
                    className: 'new-topics-link',
                    labelCount: 'filters.new.title_with_count',
                    label: 'filters.new.title',
+                   title: 'filters.new.help',
                    count: this.lookupCount('new') });
 
       links.push({ route: 'discovery.unread',
                    className: 'unread-topics-link',
                    labelCount: 'filters.unread.title_with_count',
                    label: 'filters.unread.title',
+                   title: 'filters.unread.help',
                    count: this.lookupCount('unread') });
     }
 
-    links.push({ route: 'discovery.top', className: 'top-topics-link', label: 'filters.top.title' });
+    links.push({
+      route: 'discovery.top',
+      className: 'top-topics-link',
+      label: 'filters.top.title',
+      title: 'filters.top.help'
+    });
 
     if (siteSettings.enable_badges) {
       links.push({ route: 'badges', className: 'badge-link', label: 'badges.title' });
@@ -116,7 +128,7 @@ export default createWidget('hamburger-menu', {
       links.push({ route: 'users', className: 'user-directory-link', label: 'directory.title' });
     }
 
-    if (this.siteSettings.enable_group_directory) {
+    if (this.siteSettings.enable_group_directory || (this.currentUser && this.currentUser.staff)) {
       links.push({ route: 'groups', className: 'groups-link', label: 'groups.index.title' });
     }
 
@@ -153,7 +165,7 @@ export default createWidget('hamburger-menu', {
 
     const { site } = this;
     if (!site.mobileView && !this.capabilities.touch) {
-      links.push({ action: 'showKeyboard', className: 'keyboard-shortcuts-link', label: 'keyboard_shortcuts_help.title' });
+      links.push({ href: '', action: 'showKeyboard', className: 'keyboard-shortcuts-link', label: 'keyboard_shortcuts_help.title' });
     }
 
     if (this.site.mobileView || (this.siteSettings.enable_mobile_theme && this.capabilities.touch)) {
diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js.es6
index db166e66596..4d8876b6197 100644
--- a/app/assets/javascripts/discourse/widgets/header.js.es6
+++ b/app/assets/javascripts/discourse/widgets/header.js.es6
@@ -5,6 +5,7 @@ import DiscourseURL from 'discourse/lib/url';
 import { wantsNewWindow } from 'discourse/lib/intercept-click';
 import { applySearchAutocomplete } from "discourse/lib/search";
 import { ajax } from 'discourse/lib/ajax';
+import { addExtraUserClasses } from 'discourse/helpers/user-avatar';
 
 import { h } from 'virtual-dom';
 
@@ -30,10 +31,18 @@ createWidget('header-notifications', {
   html(attrs) {
     const { user } = attrs;
 
-    const contents = [ avatarImg(this.settings.avatarSize, {
+    let avatarAttrs = {
       template: user.get('avatar_template'),
       username: user.get('username')
-    }) ];
+    };
+
+    if (this.siteSettings.enable_names) {
+      avatarAttrs.name = user.get('name');
+    }
+
+    const contents = [
+      avatarImg(this.settings.avatarSize, addExtraUserClasses(user, avatarAttrs))
+    ];
 
     const unreadNotifications = user.get('unread_notifications');
     if (!!unreadNotifications) {
@@ -129,6 +138,7 @@ createWidget('header-icons', {
                         iconId: 'toggle-hamburger-menu',
                         active: attrs.hamburgerVisible,
                         action: 'toggleHamburger',
+                        href: '',
                         contents() {
                           if (!attrs.flagCount) { return; }
                           return h('div.badge-notification.flagged-posts', { attributes: {
@@ -400,6 +410,10 @@ export default createWidget('header', {
         this.toggleHamburger();
         break;
       case 'page-search':
+        let contextType = this.searchContextType();
+        if (contextType === 'topic') {
+          this.state.searchContextType = contextType;
+        }
         if (!this.togglePageSearch()) {
           msg.event.preventDefault();
           msg.event.stopPropagation();
diff --git a/app/assets/javascripts/discourse/widgets/home-logo.js.es6 b/app/assets/javascripts/discourse/widgets/home-logo.js.es6
index c226d944eb5..0c4c7bcf25b 100644
--- a/app/assets/javascripts/discourse/widgets/home-logo.js.es6
+++ b/app/assets/javascripts/discourse/widgets/home-logo.js.es6
@@ -38,7 +38,7 @@ export default createWidget('home-logo', {
     } else if (logoUrl.length) {
       return h('img#site-logo.logo-big', { key: 'logo-big', attributes: { src: logoUrl, alt: title } });
     } else {
-      return h('h2#site-text-logo.text-logo', { key: 'logo-text' }, title);
+      return h('h1#site-text-logo.text-logo', { key: 'logo-text' }, title);
     }
   },
 
diff --git a/app/assets/javascripts/discourse/widgets/hooks.js.es6 b/app/assets/javascripts/discourse/widgets/hooks.js.es6
index e7bef60f0be..bc1f91cc87a 100644
--- a/app/assets/javascripts/discourse/widgets/hooks.js.es6
+++ b/app/assets/javascripts/discourse/widgets/hooks.js.es6
@@ -59,7 +59,7 @@ function cancelDrag(e) {
   $('body').removeClass('widget-dragging');
   $(document).off(DRAG_NAME);
 
-  // We leave the drag event cause touch needs it always bound on iOS
+  // We leave the touchmove event cause touch needs it always bound on iOS
 
   if (_dragging) {
     if (_dragging.dragEnd) { _dragging.dragEnd(e); }
diff --git a/app/assets/javascripts/discourse/widgets/notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/notification-item.js.es6
index 83f0c368fab..1b5892fff74 100644
--- a/app/assets/javascripts/discourse/widgets/notification-item.js.es6
+++ b/app/assets/javascripts/discourse/widgets/notification-item.js.es6
@@ -101,10 +101,8 @@ createWidget('notification-item', {
 
     let { data } = attrs;
     let infoKey = notName === 'custom' ? data.message : notName;
-    let title = I18n.t(`notifications.alt.${infoKey}`);
-    let icon = iconNode(`notification.${infoKey}`, { title });
-
     let text = emojiUnescape(this.text(notificationType, notName));
+    let icon = iconNode(`notification.${infoKey}`);
 
     // We can use a `<p>` tag here once other languages have fixed their HTML
     // translations.
@@ -113,7 +111,7 @@ createWidget('notification-item', {
     let contents = [ icon, html ];
 
     const href = this.url();
-    return href ? h('a', { attributes: { href, title, 'data-auto-route': true } }, contents) : contents;
+    return href ? h('a', { attributes: { href, 'data-auto-route': true } }, contents) : contents;
   },
 
   click(e) {
diff --git a/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
index 484935a7a92..32f0a43c389 100644
--- a/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
@@ -10,7 +10,7 @@ createWidget('post-admin-menu-button', jQuery.extend(ButtonClass, {
   }
 }));
 
-export function buildManageButtons(attrs, currentUser) {
+export function buildManageButtons(attrs, currentUser, siteSettings) {
   if (!currentUser) {
     return [];
   }
@@ -66,6 +66,26 @@ export function buildManageButtons(attrs, currentUser) {
     });
   }
 
+  if (currentUser.staff) {
+    if (siteSettings.enable_badges) {
+      contents.push({
+        icon: 'certificate',
+        label: 'post.controls.grant_badge',
+        action: 'grantBadge',
+        className: 'grant-badge'
+      });
+    }
+
+    const action = attrs.locked ? "unlock" : "lock";
+    contents.push({
+      icon: action,
+      label: `post.controls.${action}_post`,
+      action: `${action}Post`,
+      title: `post.controls.${action}_post_description`,
+      className: `${action}-post`
+    });
+  }
+
   if (attrs.canManage || attrs.canWiki) {
     if (attrs.wiki) {
       contents.push({
@@ -94,7 +114,7 @@ export default createWidget('post-admin-menu', {
     const contents = [];
     contents.push(h('h3', I18n.t('admin_title')));
 
-    buildManageButtons(this.attrs, this.currentUser).forEach(b => {
+    buildManageButtons(this.attrs, this.currentUser, this.siteSettings).forEach(b => {
       contents.push(this.attach('post-admin-menu-button', b));
     });
 
diff --git a/app/assets/javascripts/discourse/widgets/post-cooked.js.es6 b/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
index 6e8f82c167a..107383d9353 100644
--- a/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
@@ -20,7 +20,9 @@ export default class PostCooked {
   }
 
   update(prev) {
-    if (prev.attrs.cooked !== this.attrs.cooked) {
+    if ((prev.attrs.cooked !== this.attrs.cooked) ||
+        (prev.attrs.highlightTerm !== this.attrs.highlightTerm)) {
+
       return this.init();
     }
   }
@@ -101,7 +103,7 @@ export default class PostCooked {
         // don't display badge counts on category badge & oneboxes (unless when explicitely stated)
         if (valid && isValidLink($link)) {
           const title = I18n.t("topic_map.clicks", {count: lc.clicks});
-          $link.append(`<span class='badge badge-notification clicks' title='${title}'>${number(lc.clicks)}</span>`);
+          $link.append(` <span class='badge badge-notification clicks' title='${title}'>${number(lc.clicks)}</span>`);
         }
       });
     });
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
index 6186ae4e726..7a0f643fa21 100644
--- a/app/assets/javascripts/discourse/widgets/post-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
@@ -12,7 +12,7 @@ function animateHeart($elem, start, end, complete) {
        .animate({ textIndent: end }, {
           complete,
           step(now) {
-            $(this).css('transform','scale('+now+')');
+            $(this).css('transform','scale('+now+')').addClass("d-liked").removeClass("d-unliked");
           },
           duration: 150
         }, 'linear');
@@ -69,11 +69,15 @@ registerButton('like-count', attrs => {
     const title = attrs.liked
       ? count === 1 ? 'post.has_likes_title_only_you' : 'post.has_likes_title_you'
       : 'post.has_likes_title';
+      const icon = attrs.yours ? 'd-liked' : '';
+      const additionalClass = attrs.yours ? 'my-likes' : 'regular-likes';
 
     return { action: 'toggleWhoLiked',
       title,
-      className: 'like-count highlight-action',
-      contents: I18n.t("post.has_likes", { count }),
+      className: `like-count highlight-action ${additionalClass}`,
+      contents: count,
+      icon,
+      iconRight: true,
       titleOptions: {count: attrs.liked ? (count-1) : count }
     };
   }
@@ -194,7 +198,7 @@ registerButton('bookmark', attrs => {
   }
 
   return {
-    id: attrs.bookmarked ? 'bookmark' : 'unbookmark',
+    id: attrs.bookmarked ? 'unbookmark' : 'bookmark',
     action: 'toggleBookmark',
     title: attrs.bookmarked ? "bookmarks.created" : "bookmarks.not_bookmarked",
     className,
@@ -281,15 +285,18 @@ export default createWidget('post-menu', {
       replaceButton(orderedButtons, 'reply', 'wiki-edit');
     }
 
-    orderedButtons.forEach(i => {
-      const button = this.attachButton(i, attrs);
-      if (button) {
-        allButtons.push(button);
+    orderedButtons
+      .filter(x => x !== "like-count" && x !== "like")
+      .forEach(i => {
+        const button = this.attachButton(i, attrs);
 
-        if ((attrs.yours && button.attrs.alwaysShowYours) || (hiddenButtons.indexOf(i) === -1)) {
-          visibleButtons.push(button);
+        if (button) {
+          allButtons.push(button);
+
+          if ((attrs.yours && button.attrs.alwaysShowYours) || (hiddenButtons.indexOf(i) === -1)) {
+            visibleButtons.push(button);
+          }
         }
-      }
     });
 
     if (!this.settings.collapseButtons) {
@@ -310,6 +317,11 @@ export default createWidget('post-menu', {
       visibleButtons.splice(visibleButtons.length - 1, 0, showMore);
     }
 
+    visibleButtons.unshift(h('div.like-button', [
+      this.attachButton("like-count", attrs),
+      this.attachButton("like", attrs)
+    ]));
+
     Object.keys(_extraButtons).forEach(k => {
       const builder = _extraButtons[k];
       if (builder) {
@@ -384,6 +396,9 @@ export default createWidget('post-menu', {
 
   showMoreActions() {
     this.state.collapsed = false;
+    if (!this.state.likedUsers.length) {
+      return this.getWhoLiked();
+    }
   },
 
   like() {
@@ -401,18 +416,14 @@ export default createWidget('post-menu', {
     const $heart = $(`[data-post-id=${attrs.id}] .toggle-like .d-icon`);
     $heart.closest('button').addClass('has-like');
 
-    if (!Ember.testing) {
-      const scale = [1.0, 1.5];
-      return new Ember.RSVP.Promise(resolve => {
-        animateHeart($heart, scale[0], scale[1], () => {
-          animateHeart($heart, scale[1], scale[0], () => {
-            this.sendWidgetAction('toggleLike').then(() => resolve());
-          });
+    const scale = [1.0, 1.5];
+    return new Ember.RSVP.Promise(resolve => {
+      animateHeart($heart, scale[0], scale[1], () => {
+        animateHeart($heart, scale[1], scale[0], () => {
+          this.sendWidgetAction('toggleLike').then(() => resolve());
         });
       });
-    } else {
-      this.sendWidgetAction('toggleLike');
-    }
+    });
   },
 
   refreshLikes() {
diff --git a/app/assets/javascripts/discourse/widgets/post.js.es6 b/app/assets/javascripts/discourse/widgets/post.js.es6
index 427b7c3baef..27f263c2164 100644
--- a/app/assets/javascripts/discourse/widgets/post.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post.js.es6
@@ -7,6 +7,7 @@ import { h } from 'virtual-dom';
 import DiscourseURL from 'discourse/lib/url';
 import { dateNode } from 'discourse/helpers/node';
 import { translateSize, avatarUrl, formatUsername } from 'discourse/lib/utilities';
+import hbs from 'discourse/widgets/hbs-compiler';
 
 export function avatarImg(wanted, attrs) {
   const size = translateSize(wanted);
@@ -14,11 +15,15 @@ export function avatarImg(wanted, attrs) {
 
   // We won't render an invalid url
   if (!url || url.length === 0) { return; }
-  const title = formatUsername(attrs.username);
+  const title = attrs.name || formatUsername(attrs.username);
+
+  let className = 'avatar' + (
+    attrs.extraClasses ? " " + attrs.extraClasses : ""
+  );
 
   const properties = {
     attributes: { alt: '', width: size, height: size, src: Discourse.getURLWithCDN(url), title },
-    className: 'avatar'
+    className
   };
 
   return h('img', properties);
@@ -118,6 +123,7 @@ createWidget('post-avatar', {
       body = avatarFor.call(this, this.settings.size, {
         template: attrs.avatar_template,
         username: attrs.username,
+        name: attrs.name,
         url: attrs.usernameUrl,
         className: 'main-avatar'
       });
@@ -139,6 +145,12 @@ createWidget('post-avatar', {
   }
 });
 
+createWidget('post-locked-indicator', {
+  tagName: 'div.post-info.post-locked',
+  template: hbs`{{d-icon "lock"}}`,
+  title: () => I18n.t("post.locked")
+});
+
 createWidget('post-email-indicator', {
   tagName: 'div.post-info.via-email',
 
@@ -201,12 +213,16 @@ createWidget('post-meta-data', {
       attributes["class"] += " last-wiki-edit";
     }
 
-    result.push(h('div.post-info', h('a', { attributes }, date)));
+    result.push(h('div.post-info.post-date', h('a', { attributes }, date)));
 
     if (attrs.via_email) {
       result.push(this.attach('post-email-indicator', attrs));
     }
 
+    if (attrs.locked) {
+      result.push(this.attach('post-locked-indicator', attrs));
+    }
+
     if (attrs.version > 1 || attrs.wiki) {
       result.push(this.attach('post-edits-indicator', attrs));
     }
@@ -299,17 +315,29 @@ createWidget('post-contents', {
 
     const repliesBelow = state.repliesBelow;
     if (repliesBelow.length) {
-      result.push(h('section.embedded-posts.bottom', repliesBelow.map(p => {
-        return this.attach('embedded-post', p, { model: this.store.createRecord('post', p) });
-      })));
+      result.push(h('section.embedded-posts.bottom', [
+        repliesBelow.map(p => {
+          return this.attach('embedded-post', p, { model: this.store.createRecord('post', p) });
+        }),
+        this.attach('button', {
+          title: 'post.collapse',
+          icon: 'chevron-up',
+          action: 'toggleRepliesBelow',
+          actionParam: 'true',
+          className: 'btn collapse-up'
+        })
+      ]));
     }
 
     return result;
   },
 
-  toggleRepliesBelow() {
+  toggleRepliesBelow(goToPost = 'false') {
     if (this.state.repliesBelow.length) {
       this.state.repliesBelow = [];
+      if (goToPost === 'true') {
+        DiscourseURL.routeTo(`${this.attrs.topicUrl}/${this.attrs.post_number}`);
+      }
       return;
     }
 
@@ -332,10 +360,11 @@ createWidget('post-contents', {
 createWidget('post-body', {
   tagName: 'div.topic-body.clearfix',
 
-  html(attrs) {
+  html(attrs, state) {
     const postContents = this.attach('post-contents', attrs);
-    const result = [this.attach('post-meta-data', attrs), postContents];
-
+    let result = [this.attach('post-meta-data', attrs)];
+    result = result.concat(applyDecorators(this, 'after-meta-data', attrs, state));
+    result.push(postContents);
     result.push(this.attach('actions-summary', attrs));
     result.push(this.attach('post-links', attrs));
     if (attrs.showTopicMap) {
@@ -376,7 +405,16 @@ createWidget('post-article', {
         return this.attach('embedded-post', p, { model: this.store.createRecord('post', p), state: { above: true } });
       });
 
-      rows.push(h('div.row', h('section.embedded-posts.top.topic-body.offset2', replies)));
+      rows.push(h('div.row', h('section.embedded-posts.top.topic-body.offset2', [
+        this.attach('button', {
+          title: 'post.collapse',
+          icon: 'chevron-down',
+          action: 'toggleReplyAbove',
+          actionParam: 'true',
+          className: 'btn collapse-down'
+        }),
+        replies
+      ])));
     }
 
     rows.push(h('div.row', [this.attach('post-avatar', attrs), this.attach('post-body', attrs)]));
@@ -388,7 +426,7 @@ createWidget('post-article', {
     return post ? post.get('topic.url') : null;
   },
 
-  toggleReplyAbove() {
+  toggleReplyAbove(goToPost = 'false') {
     const replyPostNumber = this.attrs.reply_to_post_number;
 
     // jump directly on mobile
@@ -402,6 +440,9 @@ createWidget('post-article', {
 
     if (this.state.repliesAbove.length) {
       this.state.repliesAbove = [];
+      if (goToPost === 'true') {
+        DiscourseURL.routeTo(`${this.attrs.topicUrl}/${this.attrs.post_number}`);
+      }
       return Ember.RSVP.Promise.resolve();
     } else {
       const topicUrl = this._getTopicUrl();
diff --git a/app/assets/javascripts/discourse/widgets/poster-name.js.es6 b/app/assets/javascripts/discourse/widgets/poster-name.js.es6
index 363f769101f..41eeb1a4f8b 100644
--- a/app/assets/javascripts/discourse/widgets/poster-name.js.es6
+++ b/app/assets/javascripts/discourse/widgets/poster-name.js.es6
@@ -3,13 +3,35 @@ import { createWidget } from 'discourse/widgets/widget';
 import { h } from 'virtual-dom';
 import { formatUsername } from 'discourse/lib/utilities';
 
-function sanitizeName(name){
-  return name.toLowerCase().replace(/[\s_-]/g,'');
+let sanitizeName = function(name){
+  return name.toLowerCase().replace(/[\s\._-]/g,'');
+};
+
+export function disableNameSuppression() {
+  sanitizeName = name => name;
 }
 
+createWidget('poster-name-title', {
+  tagName: 'span.user-title',
+
+  html(attrs) {
+    let titleContents = attrs.title;
+    if (attrs.primaryGroupName) {
+      const href = Discourse.getURL(`/groups/${attrs.primaryGroupName}`);
+      titleContents = h('a.user-group', { className: attrs.extraClasses, attributes: { href, 'data-group-card': attrs.primaryGroupName } }, attrs.title);
+    }
+    return titleContents;
+  }
+});
+
 export default createWidget('poster-name', {
   tagName: 'div.names.trigger-user-card',
 
+  settings: {
+    showNameAndGroup: true,
+    showGlyph: true
+  },
+
   // TODO: Allow extensibility
   posterGlyph(attrs) {
     if (attrs.moderator) {
@@ -41,22 +63,26 @@ export default createWidget('poster-name', {
       classNames.push(primaryGroupName);
     }
     const nameContents = [ this.userLink(attrs, nameFirst ? name : username) ];
-    const glyph = this.posterGlyph(attrs);
-    if (glyph) { nameContents.push(glyph); }
+
+    if (this.settings.showGlyph) {
+      const glyph = this.posterGlyph(attrs);
+      if (glyph) { nameContents.push(glyph); }
+    }
 
     const contents = [h('span', { className: classNames.join(' ') }, nameContents)];
+
+    if (!this.settings.showNameAndGroup) {
+      return contents;
+    }
+
     if (name && this.siteSettings.display_name_on_posts && sanitizeName(name) !== sanitizeName(username)) {
       contents.push(h('span.second.' + (nameFirst ? "username" : "full-name"),
             this.userLink(attrs, nameFirst ? username : name)));
     }
+
     const title = attrs.user_title;
     if (title && title.length) {
-      let titleContents = title;
-      if (primaryGroupName) {
-        const href = Discourse.getURL(`/groups/${primaryGroupName}`);
-        titleContents = h('a.user-group', { attributes: { href } }, title);
-      }
-      contents.push(h('span.user-title', titleContents));
+      contents.push(this.attach('poster-name-title', { title, primaryGroupName }));
     }
 
     return contents;
diff --git a/app/assets/javascripts/discourse/widgets/search-menu.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu.js.es6
index 5bd25047f10..4bec0f16cdf 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/search-menu.js.es6
@@ -12,6 +12,7 @@ export function initSearchData() {
   searchData.term = undefined;
   searchData.typeFilter = null;
   searchData.invalidTerm = false;
+  searchData.topicId = null;
 }
 
 initSearchData();
@@ -64,6 +65,13 @@ const SearchHelper = {
         }
 
         searchData.results = content;
+
+        if (searchContext && searchContext.type === 'topic') {
+          widget.appEvents.trigger('post-stream:refresh', { force: true });
+          searchData.topicId = searchContext.id;
+        } else {
+          searchData.topicId = null;
+        }
       }).finally(() => {
         searchData.loading = false;
         widget.scheduleRerender();
@@ -97,7 +105,7 @@ export default createWidget('search-menu', {
 
       if (contextEnabled && ctx) {
         if (this.currentUser &&
-            ctx.id.toString().toLowerCase() === this.currentUser.username_lower &&
+            ctx.id.toString().toLowerCase() === this.currentUser.get('username_lower') &&
             type === "private_messages") {
           query += ' in:private';
         } else {
@@ -163,11 +171,20 @@ export default createWidget('search-menu', {
   },
 
   html(attrs) {
-    if (searchData.contextEnabled !== attrs.contextEnabled) {
-      searchData.contextEnabled = attrs.contextEnabled;
-      if (searchData.term) this.triggerSearch();
-    } else {
-      searchData.contextEnabled = attrs.contextEnabled;
+    searchData.contextEnabled = attrs.contextEnabled;
+    const searchContext = this.searchContext();
+
+    const shouldTriggerSearch = (
+      (searchData.contextEnabled !== attrs.contextEnabled) ||
+      (searchContext &&
+       searchContext.type === 'topic' &&
+       searchData.topicId !== null &&
+       searchData.topicId !== searchContext.id
+      )
+    );
+
+    if (shouldTriggerSearch && searchData.term) {
+      this.triggerSearch();
     }
 
     return this.attach('menu-panel', { maxWidth: 500, contents: () => this.panelContents() });
diff --git a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6 b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
index bd24b598400..8688c3d6e45 100644
--- a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
@@ -63,9 +63,14 @@ createWidget('topic-admin-menu-button', {
 
     const $button = $(e.target).closest('button');
     const position = $button.position();
+    const rtl = $('html').hasClass('rtl');
     position.left = position.left;
     position.outerHeight = $button.outerHeight();
 
+    if (rtl) {
+        position.left -= 217 - $button.outerWidth();
+    }
+
     if (this.attrs.fixed) {
       position.left += $button.width() - 203;
     }
@@ -141,12 +146,11 @@ export default createWidget('topic-admin-menu', {
                      icon: 'lock',
                      label: 'actions.close' });
     }
-    if (this.currentUser.get('staff')) {
-      buttons.push({ className: 'topic-admin-status-update',
+
+    buttons.push({ className: 'topic-admin-status-update',
                    action: 'showTopicStatusUpdate',
                    icon: 'clock-o',
                    label: 'actions.timed_update' });
-    }
 
     const isPrivateMessage = topic.get('isPrivateMessage');
 
diff --git a/app/assets/javascripts/discourse/widgets/topic-map.js.es6 b/app/assets/javascripts/discourse/widgets/topic-map.js.es6
index fbf6074e0a2..d63b9169ce2 100644
--- a/app/assets/javascripts/discourse/widgets/topic-map.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-map.js.es6
@@ -37,7 +37,12 @@ createWidget('topic-participant', {
   },
 
   html(attrs, state) {
-    const linkContents = [avatarImg('medium', { username: attrs.username, template: attrs.avatar_template })];
+    const linkContents = [
+      avatarImg('medium', {
+        username: attrs.username,
+        template: attrs.avatar_template,
+        name: attrs.name
+      })];
 
     if (attrs.post_count > 2) {
       linkContents.push(h('span.post-count', attrs.post_count.toString()));
@@ -67,7 +72,11 @@ createWidget('topic-map-summary', {
       [
         h('h4', I18n.t('created_lowercase')),
         h('div.topic-map-post.created-at', [
-          avatarFor('tiny', { username: attrs.createdByUsername, template: attrs.createdByAvatarTemplate }),
+          avatarFor('tiny', {
+            username: attrs.createdByUsername,
+            template: attrs.createdByAvatarTemplate,
+            name: attrs.createdByName
+          }),
           dateNode(attrs.topicCreatedAt)
         ])
       ]
@@ -76,7 +85,11 @@ createWidget('topic-map-summary', {
       h('a', { attributes: { href: attrs.lastPostUrl } }, [
         h('h4', I18n.t('last_reply_lowercase')),
         h('div.topic-map-post.last-reply', [
-          avatarFor('tiny', { username: attrs.lastPostUsername, template: attrs.lastPostAvatarTemplate }),
+          avatarFor('tiny', {
+            username: attrs.lastPostUsername,
+            template: attrs.lastPostAvatarTemplate,
+            name: attrs.lastPostName
+          }),
           dateNode(attrs.lastPostAt)
         ])
       ])
diff --git a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
index 0b4d32661a6..7cff52d3f80 100644
--- a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
@@ -4,12 +4,20 @@ import { h } from 'virtual-dom';
 import { relativeAge } from 'discourse/lib/formatter';
 import { iconNode } from 'discourse-common/lib/icon-library';
 import RawHtml from 'discourse/widgets/raw-html';
+import renderTags from 'discourse/lib/render-tags';
+import renderTopicFeaturedLink from 'discourse/lib/render-topic-featured-link';
 
-const SCROLLAREA_HEIGHT = 300;
 const SCROLLER_HEIGHT = 50;
-const SCROLLAREA_REMAINING = SCROLLAREA_HEIGHT - SCROLLER_HEIGHT;
 const LAST_READ_HEIGHT = 20;
 
+function scrollareaHeight() {
+  return ($(window).height() < 425) ? 150 : 300;
+}
+
+function scrollareaRemaining() {
+  return scrollareaHeight() - SCROLLER_HEIGHT;
+}
+
 function clamp(p, min=0.0, max=1.0) {
   return Math.max(Math.min(p, max), min);
 }
@@ -27,7 +35,7 @@ createWidget('timeline-last-read', {
   tagName: 'div.timeline-last-read',
 
   buildAttributes(attrs) {
-    const bottom = SCROLLAREA_HEIGHT - (LAST_READ_HEIGHT / 2);
+    const bottom = scrollareaHeight() - (LAST_READ_HEIGHT / 2);
     const top = attrs.top > bottom ? bottom : attrs.top;
     return { style: `height: ${LAST_READ_HEIGHT}px; top: ${top}px` };
   },
@@ -115,7 +123,7 @@ createWidget('timeline-scrollarea', {
   buildKey: () => `timeline-scrollarea`,
 
   buildAttributes() {
-    return { style: `height: ${SCROLLAREA_HEIGHT}px` };
+    return { style: `height: ${scrollareaHeight()}px` };
   },
 
   defaultState(attrs) {
@@ -168,8 +176,8 @@ createWidget('timeline-scrollarea', {
     const percentage = state.percentage;
     if (percentage === null) { return; }
 
-    const before = SCROLLAREA_REMAINING * percentage;
-    const after = (SCROLLAREA_HEIGHT - before) - SCROLLER_HEIGHT;
+    const before = scrollareaRemaining() * percentage;
+    const after = (scrollareaHeight() - before) - SCROLLER_HEIGHT;
 
     let showButton = false;
     const hasBackPosition =
@@ -179,13 +187,13 @@ createWidget('timeline-scrollarea', {
       (position.lastRead && position.lastRead !== position.total);
 
     if (hasBackPosition) {
-      const lastReadTop = Math.round(position.lastReadPercentage * SCROLLAREA_HEIGHT);
+      const lastReadTop = Math.round(position.lastReadPercentage * scrollareaHeight());
       showButton = ((before + SCROLLER_HEIGHT - 5) < lastReadTop) ||
                     (before > (lastReadTop + 25));
 
 
       // Don't show if at the bottom of the timeline
-      if (lastReadTop > (SCROLLAREA_HEIGHT - (LAST_READ_HEIGHT / 2))) {
+      if (lastReadTop > (scrollareaHeight() - (LAST_READ_HEIGHT / 2))) {
         showButton = false;
       }
     }
@@ -200,7 +208,7 @@ createWidget('timeline-scrollarea', {
     ];
 
     if (hasBackPosition) {
-      const lastReadTop = Math.round(position.lastReadPercentage * SCROLLAREA_HEIGHT);
+      const lastReadTop = Math.round(position.lastReadPercentage * scrollareaHeight());
       result.push(this.attach('timeline-last-read', {
         top: lastReadTop,
         lastRead: position.lastRead,
@@ -376,6 +384,7 @@ export default createWidget('topic-timeline', {
     const createdAt = new Date(topic.created_at);
     const stream = attrs.topic.get('postStream.stream');
     const { currentUser } = this;
+    const { tagging_enabled, topic_featured_link_enabled } = this.siteSettings;
 
     attrs["currentUser"] = currentUser;
 
@@ -393,6 +402,34 @@ export default createWidget('topic-timeline', {
         action: 'jumpTop'
       }))];
 
+      // duplicate of the {{topic-category}} component
+      let category = [];
+
+      if (!topic.get("isPrivateMessage")) {
+        if (topic.category.parentCategory) {
+          category.push(this.attach("category-link", { category: topic.category.parentCategory }));
+        }
+        category.push(this.attach("category-link", { category: topic.category }));
+      }
+
+      const showTags = tagging_enabled && topic.tags && topic.tags.length > 0;
+
+      if (showTags || topic_featured_link_enabled) {
+        let extras = [];
+        if (showTags) {
+          const tagsHtml = new RawHtml({ html: renderTags(topic, { mode: "list" }) });
+          extras.push(h("div.list-tags", tagsHtml));
+        }
+        if (topic_featured_link_enabled) {
+          extras.push(new RawHtml({ html: renderTopicFeaturedLink(topic) }));
+        }
+        category.push(h("div.topic-header-extra", extras));
+      }
+
+      if (category.length > 0) {
+        elems.push(h("div.topic-category", category));
+      }
+
       if (this.state.excerpt) {
         elems.push(new RawHtml({
           html: `<div class='post-excerpt'>${this.state.excerpt}</div>`
diff --git a/app/assets/javascripts/discourse/widgets/user-menu.js.es6 b/app/assets/javascripts/discourse/widgets/user-menu.js.es6
index 302264c07e5..39313c78e6e 100644
--- a/app/assets/javascripts/discourse/widgets/user-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/user-menu.js.es6
@@ -1,7 +1,7 @@
 import { createWidget } from 'discourse/widgets/widget';
 import { h } from 'virtual-dom';
 import { formatUsername } from 'discourse/lib/utilities';
-import { ajax } from 'discourse/lib/ajax';
+import hbs from 'discourse/widgets/hbs-compiler';
 
 let extraGlyphs;
 
@@ -40,7 +40,7 @@ createWidget('user-menu-links', {
                       icon: 'bookmark',
                       href: `${path}/activity/bookmarks` });
 
-    if (siteSettings.enable_private_messages) {
+    if (siteSettings.enable_personal_messages) {
       glyphs.push({ label: 'user.private_messages',
                     className: 'user-pms-link',
                     icon: 'envelope',
@@ -90,65 +90,84 @@ createWidget('user-menu-links', {
 
 createWidget('user-menu-dismiss-link', {
   tagName: 'div.dismiss-link',
-  buildKey: () => 'user-menu-dismiss-link',
 
-  html() {
-    if (userNotifications.state.notifications.filterBy("read", false).length > 0) {
-      return h('ul.menu-links',
-        h('li',
-          this.attach('link', {
-            action: 'dismissNotifications',
-            className: 'dismiss',
-            icon: 'check',
-            label: 'user.dismiss',
-            title: 'user.dismiss_notifications_tooltip'
-          })
-        )
-      );
-    } else {
-      return '';
-    }
-  },
-
-  dismissNotifications() {
-    ajax('/notifications/mark-read', { method: 'PUT' }).then(() => {
-      userNotifications.notificationsChanged();
-    });
-  }
+  template: hbs`
+    <ul class='menu-links'>
+      <li>
+        {{attach
+          widget="link"
+          attrs=(hash
+            action="dismissNotifications"
+            className="dismiss"
+            tabindex="0"
+            icon="check"
+            label="user.dismiss"
+            title="user.dismiss_notifications_tooltip")}}
+      </li>
+    </ul>
+  `,
 });
 
-let userNotifications = null,
-  dismissLink = null;
-
 export default createWidget('user-menu', {
   tagName: 'div.user-menu',
+  buildKey: () => 'user-menu',
 
   settings: {
-    maxWidth: 300
+    maxWidth: 300,
+    showLogoutButton: true
+  },
+
+  defaultState() {
+    return {
+      hasUnread: false,
+      markUnread: null
+    };
   },
 
   panelContents() {
     const path = this.currentUser.get('path');
-    userNotifications = this.attach('user-notifications', { path });
-    dismissLink = this.attach('user-menu-dismiss-link');
 
-    return [
+    let result = [
       this.attach('user-menu-links', { path }),
-      userNotifications,
-      h('div.logout-link', [
-        h('ul.menu-links',
-          h('li',
-            this.attach('link', {
-              action: 'logout',
-              className: 'logout',
-              icon: 'sign-out',
-              label: 'user.log_out'
-            })
-          )
-        )
-      ]),
-      dismissLink
+      this.attach('user-notifications', { path })
     ];
+
+    if (this.settings.showLogoutButton || this.state.hasUnread) {
+      result.push(h('hr.bottom-area'));
+    }
+
+    if (this.settings.showLogoutButton) {
+      result.push(
+        h('div.logout-link', [
+          h('ul.menu-links',
+            h('li',
+              this.attach('link', {
+                action: 'logout',
+                className: 'logout',
+                icon: 'sign-out',
+                href: '',
+                label: 'user.log_out'
+              })
+            )
+          )
+        ]),
+      );
+    }
+
+    if (this.state.hasUnread) {
+      result.push(this.attach('user-menu-dismiss-link'));
+    }
+
+    return result;
+  },
+
+  dismissNotifications() {
+    return this.state.markRead();
+  },
+
+  notificationsLoaded({ notifications, markRead }) {
+    this.state.hasUnread = notifications.filterBy("read", false).length > 0;
+    this.state.markRead = markRead;
   },
 
   html() {
diff --git a/app/assets/javascripts/discourse/widgets/user-notifications.js.es6 b/app/assets/javascripts/discourse/widgets/user-notifications.js.es6
index a6353a995f4..2082b53fcc5 100644
--- a/app/assets/javascripts/discourse/widgets/user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/widgets/user-notifications.js.es6
@@ -2,6 +2,7 @@ import { createWidget } from 'discourse/widgets/widget';
 import { headerHeight } from 'discourse/components/site-header';
 import { h } from 'virtual-dom';
 import DiscourseURL from 'discourse/lib/url';
+import { ajax } from 'discourse/lib/ajax';
 
 export default createWidget('user-notifications', {
   tagName: 'div.notifications',
@@ -11,8 +12,10 @@ export default createWidget('user-notifications', {
     return { notifications: [], loading: false, loaded: false };
   },
 
-  notificationsChanged() {
-    this.refreshNotifications(this.state);
+  markRead() {
+    ajax('/notifications/mark-read', { method: 'PUT' }).then(() => {
+      this.refreshNotifications(this.state);
+    });
   },
 
   refreshNotifications(state) {
@@ -51,6 +54,10 @@ export default createWidget('user-notifications', {
     }).finally(() => {
       state.loading = false;
       state.loaded = true;
+      this.sendWidgetAction('notificationsLoaded', {
+        notifications: state.notifications,
+        markRead: () => this.markRead()
+      });
       this.scheduleRerender();
     });
   },
@@ -79,8 +86,7 @@ export default createWidget('user-notifications', {
               icon: 'chevron-down',
               action: 'showAllNotifications',
               className: 'btn'
-            })),
-          h('hr')
+            }))
         );
       }
 
diff --git a/app/assets/javascripts/discourse/widgets/widget.js.es6 b/app/assets/javascripts/discourse/widgets/widget.js.es6
index e81123c8ade..9349e4aba5b 100644
--- a/app/assets/javascripts/discourse/widgets/widget.js.es6
+++ b/app/assets/javascripts/discourse/widgets/widget.js.es6
@@ -32,6 +32,10 @@ export function applyDecorators(widget, type, attrs, state) {
   return [];
 }
 
+export function resetDecorators() {
+  Object.keys(_decorators).forEach(key => delete _decorators[key]);
+}
+
 const _customSettings = {};
 export function changeSetting(widgetName, settingName, newValue) {
   _customSettings[widgetName] = _customSettings[widgetName] || {};
diff --git a/app/assets/javascripts/locales/bg.js.erb b/app/assets/javascripts/locales/bg.js.erb
new file mode 100644
index 00000000000..006dfde3190
--- /dev/null
+++ b/app/assets/javascripts/locales/bg.js.erb
@@ -0,0 +1,3 @@
+//= depend_on 'client.bg.yml'
+//= require locales/i18n
+<%= JsLocaleHelper.output_locale(:bg) %>
diff --git a/app/assets/javascripts/locales/i18n.js b/app/assets/javascripts/locales/i18n.js
index ba56bc3a80c..0d27ee2fca1 100644
--- a/app/assets/javascripts/locales/i18n.js
+++ b/app/assets/javascripts/locales/i18n.js
@@ -15,6 +15,7 @@ I18n.pluralizationRules = {
 
 // Set current locale to null
 I18n.locale = null;
+I18n.fallbackLocale = null;
 
 // Set the placeholder format. Accepts `{{placeholder}}` and `%{placeholder}`.
 I18n.PLACEHOLDER = /(?:\{\{|%\{)(.*?)(?:\}\}?)/gm;
@@ -143,6 +144,10 @@ I18n.translate = function(scope, options) {
   var translation = this.lookup(scope, options);
 
   if (!this.noFallbacks) {
+    if (!translation && this.fallbackLocale) {
+      options.locale = this.fallbackLocale;
+      translation = this.lookup(scope, options);
+    }
     if (!translation && this.currentLocale() !== this.defaultLocale) {
       options.locale = this.defaultLocale;
       translation = this.lookup(scope, options);
@@ -287,5 +292,33 @@ I18n.currentLocale = function() {
   return I18n.locale || I18n.defaultLocale;
 };
 
+I18n.enableVerboseLocalization = function() {
+  var counter = 0;
+  var keys = {};
+  var t = I18n.t;
+
+  I18n.noFallbacks = true;
+
+  I18n.t = I18n.translate = function(scope, value){
+    var current = keys[scope];
+    if (!current) {
+      current = keys[scope] = ++counter;
+      var message = "Translation #" + current + ": " + scope;
+      if (!_.isEmpty(value)) {
+        message += ", parameters: " + JSON.stringify(value);
+      }
+      Em.Logger.info(message);
+    }
+    return t.apply(I18n, [scope, value]) + " (#" + current + ")";
+  };
+};
+
+I18n.enableVerboseLocalizationSession = function() {
+  sessionStorage.setItem("verbose_localization", "true");
+  I18n.enableVerboseLocalization();
+
+  return 'Verbose localization is enabled. Close the browser tab to turn it off. Reload the page to see the translation keys.';
+};
+
 // shortcuts
 I18n.t = I18n.translate;
diff --git a/app/assets/javascripts/locales/sl.js.erb b/app/assets/javascripts/locales/sl.js.erb
new file mode 100644
index 00000000000..84c07776975
--- /dev/null
+++ b/app/assets/javascripts/locales/sl.js.erb
@@ -0,0 +1,3 @@
+//= depend_on 'client.sl.yml'
+//= require locales/i18n
+<%= JsLocaleHelper.output_locale(:sl) %>
\ No newline at end of file
diff --git a/app/assets/javascripts/pretty-text/censored-words.js.es6 b/app/assets/javascripts/pretty-text/censored-words.js.es6
index 58900460bcb..e2e52032d96 100644
--- a/app/assets/javascripts/pretty-text/censored-words.js.es6
+++ b/app/assets/javascripts/pretty-text/censored-words.js.es6
@@ -1,26 +1,29 @@
 function escapeRegexp(text) {
-  return text.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
+  return text.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&').replace(/\*/g, "\S*");
 }
 
-export function censorFn(censoredWords, censoredPattern, replacementLetter) {
+export function censorFn(censoredWords, replacementLetter, watchedWordsRegularExpressions) {
 
   let patterns = [];
 
   replacementLetter = replacementLetter || "&#9632;";
 
   if (censoredWords && censoredWords.length) {
-    patterns = censoredWords.split("|").map(t => `(${escapeRegexp(t)})`);
-  }
-
-  if (censoredPattern && censoredPattern.length > 0) {
-    patterns.push("(" + censoredPattern + ")");
+    patterns = censoredWords.split("|");
+    if (!watchedWordsRegularExpressions) {
+      patterns = patterns.map(t => `(${escapeRegexp(t)})`);
+    }
   }
 
   if (patterns.length) {
     let censorRegexp;
 
     try {
-      censorRegexp = new RegExp("(\\b(?:" + patterns.join("|") + ")\\b)(?![^\\(]*\\))", "ig");
+      if (watchedWordsRegularExpressions) {
+        censorRegexp = new RegExp("((?:" + patterns.join("|") + "))(?![^\\(]*\\))", "ig");
+      } else {
+        censorRegexp = new RegExp("(\\b(?:" + patterns.join("|") + ")\\b)(?![^\\(]*\\))", "ig");
+      }
 
       if (censorRegexp) {
 
@@ -29,11 +32,16 @@ export function censorFn(censoredWords, censoredPattern, replacementLetter) {
 
           try {
             let m = censorRegexp.exec(text);
+            const fourCharReplacement = new Array(5).join(replacementLetter);
 
             while (m && m[0]) {
               if (m[0].length > original.length) { return original; } // regex is dangerous
-              const replacement = new Array(m[0].length+1).join(replacementLetter);
-              text = text.replace(new RegExp(`(\\b${escapeRegexp(m[0])}\\b)(?![^\\(]*\\))`, "ig"), replacement);
+              if (watchedWordsRegularExpressions) {
+                text = text.replace(censorRegexp, fourCharReplacement);
+              } else {
+                const replacement = new Array(m[0].length+1).join(replacementLetter);
+                text = text.replace(new RegExp(`(\\b${escapeRegexp(m[0])}\\b)(?![^\\(]*\\))`, "ig"), replacement);
+              }
               m = censorRegexp.exec(text);
             }
 
@@ -52,6 +60,6 @@ export function censorFn(censoredWords, censoredPattern, replacementLetter) {
   return function(t){ return t;};
 }
 
-export function censor(text, censoredWords, censoredPattern, replacementLetter) {
-  return censorFn(censoredWords, censoredPattern, replacementLetter)(text);
+export function censor(text, censoredWords, replacementLetter) {
+  return censorFn(censoredWords, replacementLetter)(text);
 }
diff --git a/app/assets/javascripts/pretty-text/emoji.js.es6.erb b/app/assets/javascripts/pretty-text/emoji.js.es6.erb
index fc7f79c94b6..09ab4ce5ed6 100644
--- a/app/assets/javascripts/pretty-text/emoji.js.es6.erb
+++ b/app/assets/javascripts/pretty-text/emoji.js.es6.erb
@@ -1,4 +1,4 @@
-import { emojis, aliases, translations, tonableEmojis } from 'pretty-text/emoji/data';
+import { emojis, aliases, searchAliases, translations, tonableEmojis } from 'pretty-text/emoji/data';
 
 // bump up this number to expire all emojis
 export const IMAGE_VERSION = "<%= Emoji::EMOJI_VERSION %>";
@@ -94,24 +94,28 @@ export function emojiSearch(term, options) {
     if (results.indexOf(val) === -1) {
       results.push(val);
     }
-    return maxResults > 0 && results.length >= maxResults;
+  }
+
+  // if term matches from beginning
+  for (let i=0; i<toSearch.length; i++) {
+    const item = toSearch[i];
+    if (item.indexOf(term) === 0) addResult(item);
+  }
+
+  if (searchAliases[term]) {
+    results.push.apply(results, searchAliases[term]);
   }
 
   for (let i=0; i<toSearch.length; i++) {
     const item = toSearch[i];
-    if (item.indexOf(term) === 0 && addResult(item)) {
-      return results;
-    }
+    if (item.indexOf(term) > 0) addResult(item);
   }
 
-  for (let i=0; i<toSearch.length; i++) {
-    const item = toSearch[i];
-    if (item.indexOf(term) > 0 && addResult(item)) {
-      return results;
-    }
+  if (maxResults === -1) {
+    return results;
+  } else {
+    return results.slice(0, maxResults);
   }
-
-  return results;
 };
 
 export function isSkinTonableEmoji(term) {
diff --git a/app/assets/javascripts/pretty-text/emoji/data.js.es6.erb b/app/assets/javascripts/pretty-text/emoji/data.js.es6.erb
index 18648449574..765ecc3303e 100644
--- a/app/assets/javascripts/pretty-text/emoji/data.js.es6.erb
+++ b/app/assets/javascripts/pretty-text/emoji/data.js.es6.erb
@@ -1,6 +1,7 @@
 export const emojis = <%= Emoji.standard.map(&:name).flatten.inspect %>;
 export const tonableEmojis = <%= Emoji.tonable_emojis.flatten.inspect %>;
 export const aliases = <%= Emoji.aliases.inspect.gsub("=>", ":") %>;
+export const searchAliases = <%= Emoji.searchAliases.inspect.gsub("=>", ":") %>;
 export const translations = {
   ':)'   : 'slight_smile',
   ':-)'  : 'slight_smile',
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js.es6
index 4af5b67f08b..ecec3b16978 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js.es6
@@ -215,10 +215,12 @@ export function setup(opts, siteSettings, state) {
     html: true,
     breaks: opts.discourse.features.newline,
     xhtmlOut: false,
-    linkify: opts.discourse.features.linkify,
+    linkify: siteSettings.enable_markdown_linkify,
     typographer: siteSettings.enable_markdown_typographer
   });
 
+  opts.engine.linkify.tlds((siteSettings.markdown_linkify_tlds || '').split('|'));
+
   setupUrlDecoding(opts.engine);
   setupHoister(opts.engine);
   setupImageDimensions(opts.engine);
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js.es6
index ddb92eefdb1..b7348d0262f 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js.es6
@@ -11,7 +11,7 @@ function trailingSpaceOnly(src, start, max) {
   return true;
 }
 
-const ATTR_REGEX = /^\s*=(.+)$|((([a-z0-9]*)\s*)=)(["“”'].*["“”']|\S+)/ig;
+const ATTR_REGEX = /^\s*=(.+)$|((([a-z0-9]*)\s*)=)(["“”'].*?["“”']|\S+)/ig;
 
 // parse a tag [test a=1 b=2] to a data structure
 // {tag: "test", attrs={a: "1", b: "2"}
@@ -51,6 +51,8 @@ export function parseBBCodeTag(src, start, max, multiline) {
         return;
       }
 
+      tag = tag.toLowerCase();
+
       return {tag, length: tag.length+3, closing: true};
     }
     return;
@@ -240,7 +242,14 @@ function applyBBCode(state, startLine, endLine, silent, md) {
   state.lineMax = nextLine;
 
   if (rule.replace) {
-    let content = state.src.slice(state.bMarks[startLine+1], state.eMarks[nextLine-1]);
+    let content;
+
+    if (startLine === nextLine) {
+      content = state.src.slice(start + info.length, closeTag.start);
+    } else {
+      content = state.src.slice(state.bMarks[startLine+1], state.eMarks[nextLine-1]);
+    }
+
     if (!rule.replace.call(this, state, info, content)) {
       return false;
     }
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js.es6
index 91a0d297ba0..e5587145d66 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js.es6
@@ -24,16 +24,15 @@ function censorTree(state, censor) {
 
 export function setup(helper) {
   helper.registerOptions((opts, siteSettings) => {
-    opts.censoredPattern = siteSettings.censored_pattern;
+    opts.watchedWordsRegularExpressions = siteSettings.watched_words_regular_expressions;
   });
 
   helper.registerPlugin(md => {
     const words = md.options.discourse.censoredWords;
-    const patterns = md.options.discourse.censoredPattern;
 
-    if ((words && words.length > 0) || (patterns && patterns.length > 0)) {
+    if ((words && words.length > 0)) {
       const replacement = String.fromCharCode(9632);
-      const censor = censorFn(words, patterns, replacement);
+      const censor = censorFn(words, replacement, md.options.discourse.watchedWordsRegularExpressions);
       md.core.ruler.push('censored', state => censorTree(state, censor));
     }
   });
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6
index 522edbe7669..dd45e3f54c7 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6
@@ -170,7 +170,7 @@ function getEmojiTokenByTranslation(content, pos, state) {
   }
 }
 
-function applyEmoji(content, state, emojiUnicodeReplacer) {
+function applyEmoji(content, state, emojiUnicodeReplacer, enableShortcuts) {
   let i;
   let result = null;
   let contentToken = null;
@@ -195,7 +195,7 @@ function applyEmoji(content, state, emojiUnicodeReplacer) {
       }
     }
 
-    if (!token) {
+    if (enableShortcuts && !token) {
       // handle aliases (note: we can't do this in inline cause ; is not a split point)
       //
       let info = getEmojiTokenByTranslation(content, i, state);
@@ -231,13 +231,19 @@ function applyEmoji(content, state, emojiUnicodeReplacer) {
 export function setup(helper) {
   helper.registerOptions((opts, siteSettings, state)=>{
     opts.features.emoji = !!siteSettings.enable_emoji;
+    opts.features.emojiShortcuts = !!siteSettings.enable_emoji_shortcuts;
     opts.emojiSet = siteSettings.emoji_set || "";
     opts.customEmoji = state.customEmoji;
   });
 
   helper.registerPlugin((md)=>{
     md.core.ruler.push('emoji', state => md.options.discourse.helpers.textReplace(
-      state, (c,s)=>applyEmoji(c,s,md.options.discourse.emojiUnicodeReplacer))
+      state, (c,s)=>applyEmoji(
+        c,
+        s,
+        md.options.discourse.emojiUnicodeReplacer,
+        md.options.discourse.features.emojiShortcuts
+      ))
     );
   });
 
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js.es6
index 2ff5c2a1204..d229837d4cc 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js.es6
@@ -96,15 +96,15 @@ function applyOnebox(state, silent) {
 
             if (!isTopLevel(href)) {
               let onebox = cachedInlineOnebox(href);
-
               let options = state.md.options.discourse;
+
               if (options.lookupInlineOnebox) {
                 onebox = options.lookupInlineOnebox(href);
               }
 
-              if (onebox) {
+              if (onebox && onebox.title) {
                 text.content = onebox.title;
-              } else if (state.md.options.discourse.previewing) {
+              } else if (state.md.options.discourse.previewing && !onebox) {
                 attrs.push(["class", "inline-onebox-loading"]);
               }
             }
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6
index 3a0523bef66..97ad98445da 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6
@@ -62,7 +62,7 @@ const rule = {
     if (primaryGroupName && primaryGroupName.length !== 0) {
       token.attrs.push(['class', `quote group-${primaryGroupName}`]);
     } else {
-      token.attrs.push(['class', 'quote']);
+      token.attrs.push(['class', 'quote no-group']);
     }
 
     if (postNumber) {
@@ -105,7 +105,6 @@ const rule = {
 
           let title = topicInfo.title;
 
-
           if (options.enableEmoji) {
             title = performEmojiUnescape(topicInfo.title, {
               getURL: options.getURL, emojiSet: options.emojiSet
@@ -130,7 +129,7 @@ const rule = {
       token = state.push('quote_header_close', 'div', -1);
     }
 
-    token        = state.push('bbcode_open', 'blockquote', 1);
+    token = state.push('bbcode_open', 'blockquote', 1);
   },
 
   after: function(state) {
@@ -146,15 +145,16 @@ export function setup(helper) {
     opts.emojiSet = siteSettings.emoji_set;
   });
 
-  helper.registerPlugin(md=>{
-     md.block.bbcode.ruler.push('quotes', rule);
+  helper.registerPlugin(md => {
+    md.block.bbcode.ruler.push('quotes', rule);
   });
 
   helper.whiteList(['img[class=avatar]']);
   helper.whiteList({
     custom(tag, name, value) {
       if (tag === 'aside' && name === 'class') {
-        return !!/^quote group\-(.+)$/.exec(value);
+        return value === "quote no-group" ||
+          !!/^quote group\-(.+)$/.exec(value);
       }
     }
   });
diff --git a/app/assets/javascripts/pretty-text/inline-oneboxer.js.es6 b/app/assets/javascripts/pretty-text/inline-oneboxer.js.es6
index b8be79f60e7..171611506a1 100644
--- a/app/assets/javascripts/pretty-text/inline-oneboxer.js.es6
+++ b/app/assets/javascripts/pretty-text/inline-oneboxer.js.es6
@@ -1,6 +1,12 @@
 let _cache = {};
 
 export function applyInlineOneboxes(inline, ajax) {
+
+  Object.keys(inline).forEach(url => {
+    // cache a blank locally, so we never trigger a lookup
+    _cache[url] = {};
+  });
+
   return ajax("/inline-onebox", {
     data: { urls: Object.keys(inline) },
   }).then(result => {
diff --git a/app/assets/javascripts/pretty-text/oneboxer.js.es6 b/app/assets/javascripts/pretty-text/oneboxer.js.es6
index 245c87cbca1..aef317865dd 100644
--- a/app/assets/javascripts/pretty-text/oneboxer.js.es6
+++ b/app/assets/javascripts/pretty-text/oneboxer.js.es6
@@ -43,16 +43,20 @@ function loadNext(ajax) {
 
   let timeoutMs = 150;
   let removeLoading = true;
-  const { url, refresh, $elem, userId } = loadingQueue.shift();
+  const { url, refresh, $elem, categoryId, topicId } = loadingQueue.shift();
 
   // Retrieve the onebox
   return ajax("/onebox", {
     dataType: 'html',
-    data: { url, refresh },
+    data: {
+      url,
+      refresh,
+      category_id: categoryId,
+      topic_id: topicId
+    },
     cache: true
   }).then(html => {
     let $html = $(html);
-
     localCache[normalize(url)] = $html;
     $elem.replaceWith($html);
     applySquareGenericOnebox($html, normalize(url));
@@ -60,7 +64,7 @@ function loadNext(ajax) {
     if (result && result.jqXHR && result.jqXHR.status === 429) {
       timeoutMs = 2000;
       removeLoading = false;
-      loadingQueue.unshift({ url, refresh, $elem, userId });
+      loadingQueue.unshift({ url, refresh, $elem, categoryId, topicId });
     } else {
       failedCache[normalize(url)] = true;
     }
@@ -75,14 +79,14 @@ function loadNext(ajax) {
 
 // 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, userId, synchronous) {
-  const $elem = $(e);
+export function load({ elem , refresh = true, ajax, synchronous = false, categoryId, topicId }) {
+  const $elem = $(elem);
 
   // If the onebox has loaded or is loading, return
   if ($elem.data('onebox-loaded')) return;
   if ($elem.hasClass('loading-onebox')) return;
 
-  const url = e.href;
+  const url = elem.href;
 
   // Unless we're forcing a refresh...
   if (!refresh) {
@@ -99,7 +103,7 @@ export function load(e, refresh, ajax, userId, synchronous) {
   $elem.addClass('loading-onebox');
 
   // Add to the loading queue
-  loadingQueue.push({ url, refresh, $elem, userId });
+  loadingQueue.push({ url, refresh, $elem, categoryId, topicId });
 
   // Load next url in queue
   if (synchronous) {
diff --git a/app/assets/javascripts/pretty-text/sanitizer.js.es6 b/app/assets/javascripts/pretty-text/sanitizer.js.es6
index 512e3328465..3729dfa6e9a 100644
--- a/app/assets/javascripts/pretty-text/sanitizer.js.es6
+++ b/app/assets/javascripts/pretty-text/sanitizer.js.es6
@@ -73,6 +73,9 @@ export function sanitize(text, whiteLister) {
 
   if (allowedHrefSchemes && allowedHrefSchemes.length > 0) {
     extraHrefMatchers = [new RegExp('^(' + allowedHrefSchemes.join('|') + '):\/\/[\\w\\.\\-]+','i')];
+    if (allowedHrefSchemes.includes('tel')) {
+      extraHrefMatchers.push(new RegExp('^tel:\/\/\\+?[\\w\\.\\-]+','i'));
+    }
   }
 
   let result = xss(text, {
diff --git a/app/assets/javascripts/pretty-text/white-lister.js.es6 b/app/assets/javascripts/pretty-text/white-lister.js.es6
index 4fd6e362954..8e00d76a7b9 100644
--- a/app/assets/javascripts/pretty-text/white-lister.js.es6
+++ b/app/assets/javascripts/pretty-text/white-lister.js.es6
@@ -137,6 +137,12 @@ const DEFAULT_LIST = [
   'div.quote-controls',
   'div.title',
   'div[align]',
+  'div[data-*]', /* This may seem a bit much but polls does
+                    it anyway and this is needed for themes,
+                    special code in sanitizer handles data-*
+                    nothing exists for data-theme-* and we
+                    don't want to slow sanitize for this case
+                  */
   'div[dir]',
   'dl',
   'dt',
diff --git a/app/assets/javascripts/select-kit/components/admin-agree-flag-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/admin-agree-flag-dropdown.js.es6
index 55708f10eaa..51fa7317d0d 100644
--- a/app/assets/javascripts/select-kit/components/admin-agree-flag-dropdown.js.es6
+++ b/app/assets/javascripts/select-kit/components/admin-agree-flag-dropdown.js.es6
@@ -10,7 +10,7 @@ export default DropdownSelectBox.extend({
   headerIcon: "thumbs-o-up",
 
   computeHeaderContent() {
-    let content = this.baseHeaderComputedContent();
+    let content = this._super();
     content.name = `${I18n.t("admin.flags.agree")}...`;
     return content;
   },
@@ -55,6 +55,22 @@ export default DropdownSelectBox.extend({
       label:  I18n.t("admin.flags.agree_flag"),
     });
 
+    content.push({
+      icon: 'ban',
+      id: 'confirm-agree-suspend',
+      description: I18n.t('admin.flags.agree_flag_suspend_title'),
+      action: () => this.send("showSuspendModal"),
+      label:  I18n.t("admin.flags.agree_flag_suspend"),
+    });
+
+    content.push({
+      icon: 'microphone-slash',
+      id: 'confirm-agree-silence',
+      description: I18n.t('admin.flags.agree_flag_silence_title'),
+      action: () => this.send("showSilenceModal"),
+      label:  I18n.t("admin.flags.agree_flag_silence"),
+    });
+
     if (canDeleteSpammer) {
       content.push({
         title:  I18n.t("admin.flags.delete_spammer_title"),
@@ -79,6 +95,28 @@ export default DropdownSelectBox.extend({
       this.attrs.removeAfter(spammerDetails.deleteUser());
     },
 
+    showSuspendModal() {
+      let post = this.get('post');
+      let user = post.get('user');
+      this.get('adminTools').showSuspendModal(user, {
+        post,
+        before: () => {
+          return this.attrs.removeAfter(post.agreeFlags('suspended'));
+        }
+      });
+    },
+
+    showSilenceModal() {
+      let post = this.get('post');
+      let user = post.get('user');
+      this.get('adminTools').showSilenceModal(user, {
+        post,
+        before: () => {
+          return this.attrs.removeAfter(post.agreeFlags('silenced'));
+        }
+      });
+    },
+
     perform(action) {
       let flaggedPost = this.get("post");
       this.attrs.removeAfter(flaggedPost.agreeFlags(action));
diff --git a/app/assets/javascripts/select-kit/components/admin-delete-flag-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/admin-delete-flag-dropdown.js.es6
index 2144a1512a6..a8c64523be4 100644
--- a/app/assets/javascripts/select-kit/components/admin-delete-flag-dropdown.js.es6
+++ b/app/assets/javascripts/select-kit/components/admin-delete-flag-dropdown.js.es6
@@ -1,5 +1,6 @@
 import DropdownSelectBox from "select-kit/components/dropdown-select-box";
 import computed from "ember-addons/ember-computed-decorators";
+const { get } = Ember;
 
 export default DropdownSelectBox.extend({
   classNames: ["delete-flag", "admin-delete-flag-dropdown"],
@@ -8,8 +9,8 @@ export default DropdownSelectBox.extend({
   headerIcon: "trash-o",
 
   computeHeaderContent() {
-    let content = this.baseHeaderComputedContent();
-    content.name = I18n.t("admin.flags.delete");
+    let content = this._super();
+    content.name = `${I18n.t("admin.flags.delete")}...`;
     return content;
   },
 
@@ -55,7 +56,7 @@ export default DropdownSelectBox.extend({
 
   mutateValue(value) {
     const computedContentItem = this.get("computedContent").findBy("value", value);
-    Ember.get(computedContentItem, "originalContent.action")();
+    get(computedContentItem, "originalContent.action")();
   },
 
   actions: {
diff --git a/app/assets/javascripts/select-kit/components/admin-group-selector.js.es6 b/app/assets/javascripts/select-kit/components/admin-group-selector.js.es6
index be3352b376b..3cab568f60b 100644
--- a/app/assets/javascripts/select-kit/components/admin-group-selector.js.es6
+++ b/app/assets/javascripts/select-kit/components/admin-group-selector.js.es6
@@ -18,9 +18,9 @@ export default MultiSelectComponent.extend({
   },
 
   computeContentItem(contentItem, name) {
-    let computedContent = this.baseComputedContentItem(contentItem, name);
-    computedContent.locked = contentItem.automatic;
-    return computedContent;
+    let computedContentItem = this._super(contentItem, name);
+    computedContentItem.locked = contentItem.automatic;
+    return computedContentItem;
   },
 
   mutateValues(values) {
diff --git a/app/assets/javascripts/select-kit/components/category-chooser.js.es6 b/app/assets/javascripts/select-kit/components/category-chooser.js.es6
index 47a319e066a..b1e4fedc73a 100644
--- a/app/assets/javascripts/select-kit/components/category-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-chooser.js.es6
@@ -3,6 +3,7 @@ import { on } from "ember-addons/ember-computed-decorators";
 import computed from "ember-addons/ember-computed-decorators";
 import PermissionType from "discourse/models/permission-type";
 import Category from "discourse/models/category";
+import { categoryBadgeHTML } from "discourse/helpers/category-link";
 const { get, isNone, isEmpty } = Ember;
 
 export default ComboBoxComponent.extend({
@@ -14,6 +15,15 @@ export default ComboBoxComponent.extend({
   rowComponent: "category-row",
   noneRowComponent: "none-category-row",
   allowSubCategories: true,
+  permissionType: PermissionType.FULL,
+
+  init() {
+    this._super();
+
+    this.get("rowComponentOptions").setProperties({
+      allowUncategorized: this.get("allowUncategorized"),
+    });
+  },
 
   filterComputedContent(computedContent, computedValue, filter) {
     if (isEmpty(filter)) { return computedContent; }
@@ -48,6 +58,36 @@ export default ComboBoxComponent.extend({
     }
   },
 
+  computeHeaderContent() {
+    let content = this._super();
+
+    if (this.get("hasSelection")) {
+      const category = Category.findById(content.value);
+      const parentCategoryId = category.get("parent_category_id");
+      const hasParentCategory = Ember.isPresent(parentCategoryId);
+
+      let badge = "";
+
+      if (hasParentCategory) {
+        const parentCategory = Category.findById(parentCategoryId);
+        badge += categoryBadgeHTML(parentCategory, {
+          link: false,
+          allowUncategorized: true
+        }).htmlSafe();
+      }
+
+      badge += categoryBadgeHTML(category, {
+        link: false,
+        hideParent: hasParentCategory ? true : false,
+        allowUncategorized: true
+      }).htmlSafe();
+
+      content.label = badge;
+    }
+
+    return content;
+  },
+
   @on("didRender")
   _bindComposerResizing() {
     this.appEvents.on("composer:resized", this, this.applyDirection);
@@ -58,6 +98,12 @@ export default ComboBoxComponent.extend({
     this.appEvents.off("composer:resized");
   },
 
+  didSelect(computedContentItem) {
+    if (this.attrs.onChooseCategory) {
+      this.attrs.onChooseCategory(computedContentItem.originalContent);
+    }
+  },
+
   computeContent() {
     const categories = Discourse.SiteSettings.fixed_category_positions_on_create ?
       Category.list() :
@@ -86,7 +132,11 @@ export default ComboBoxComponent.extend({
         return false;
       }
 
-      return get(c, "permission") === PermissionType.FULL;
+      if (this.get("permissionType")) {
+        return this.get("permissionType") === get(c, "permission");
+      }
+
+      return true;
     });
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/category-drop.js.es6 b/app/assets/javascripts/select-kit/components/category-drop.js.es6
new file mode 100644
index 00000000000..d88fa7ff588
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/category-drop.js.es6
@@ -0,0 +1,119 @@
+import ComboBoxComponent from "select-kit/components/combo-box";
+import DiscourseURL from "discourse/lib/url";
+import { default as computed } from "ember-addons/ember-computed-decorators";
+import Category from "discourse/models/category";
+import { categoryBadgeHTML } from "discourse/helpers/category-link";
+
+export default ComboBoxComponent.extend({
+  pluginApiIdentifiers: ["category-drop"],
+  classNameBindings: ["categoryStyle"],
+  classNames: "category-drop",
+  verticalOffset: 3,
+  content: Ember.computed.alias("categories"),
+  rowComponent: "category-row",
+  headerComponent: "category-drop/category-drop-header",
+  allowAutoSelectFirst: false,
+  tagName: "li",
+  categoryStyle: Ember.computed.alias("siteSettings.category_style"),
+  noCategoriesLabel: I18n.t("categories.no_subcategory"),
+  mutateAttributes() {},
+  fullWidthOnMobile: true,
+  caretDownIcon: "caret-right",
+  caretUpIcon: "caret-down",
+  subCategory: false,
+
+  init() {
+    this._super();
+
+    if (this.get("category")) {
+      this.set("value", this.get("category.id"));
+    } else {
+      this.set("value", null);
+    }
+    if (!this.get("categories")) this.set("categories", []);
+
+    this.get("rowComponentOptions").setProperties({
+      hideParentCategory: this.get("subCategory"),
+      allowUncategorized: true,
+      displayCategoryDescription: !(
+        this.currentUser &&
+        (this.currentUser.get("staff") || this.currentUser.trust_level > 0)
+      )
+    });
+  },
+
+  @computed("content")
+  filterable(content) {
+    return content && content.length >= 15;
+  },
+
+  @computed("allCategoriesUrl", "allCategoriesLabel", "noCategoriesUrl", "noCategoriesLabel")
+  collectionHeader(allCategoriesUrl, allCategoriesLabel, noCategoriesUrl, noCategoriesLabel) {
+    let shortcuts = "";
+
+    if (this.get("hasSelection") || (this.get("noSubcategories") && this.get("subCategory"))) {
+      shortcuts += `
+        <a href="${allCategoriesUrl}" class="category-filter">
+          ${allCategoriesLabel}
+        </a>
+      `;
+    }
+
+    if (this.get("subCategory") && (this.get("hasSelection") || !this.get("noSubcategories"))) {
+      shortcuts += `
+        <a href="${noCategoriesUrl}" class="category-filter">
+          ${noCategoriesLabel}
+        </a>
+      `;
+    }
+
+    return shortcuts.htmlSafe();
+  },
+
+  computeHeaderContent() {
+    let content = this._super();
+
+    if (this.get("hasSelection")) {
+      const category = Category.findById(content.value);
+      content.label = categoryBadgeHTML(category, {
+        link: false,
+        allowUncategorized: true,
+        hideParent: true
+      }).htmlSafe();
+    } else {
+      if (this.get("noSubcategories")) {
+        content.label = `<span class="category-name">${this.get("noCategoriesLabel")}</span>`;
+      } else {
+        content.label = `<span class="category-name">${this.get("allCategoriesLabel")}</span>`;
+      }
+    }
+
+    return content;
+  },
+
+  @computed("parentCategory.name", "subCategory")
+  allCategoriesLabel(categoryName, subCategory) {
+    if (subCategory) {
+      return I18n.t("categories.all_subcategories", { categoryName });
+    }
+    return I18n.t("categories.all");
+  },
+
+  @computed("parentCategory.url", "subCategory")
+  allCategoriesUrl(parentCategoryUrl, subCategory) {
+    return subCategory ? ( parentCategoryUrl || "/" ) : "/";
+  },
+
+  @computed("parentCategory.url")
+  noCategoriesUrl(parentCategoryUrl) {
+    return `${parentCategoryUrl}/none`;
+  },
+
+  actions: {
+    onSelect(categoryId) {
+      const category = Category.findById(parseInt(categoryId, 10));
+      const categoryURL = Discourse.getURL("/c/") + Discourse.Category.slugFor(category);
+      DiscourseURL.routeTo(categoryURL);
+    }
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/category-drop/category-drop-header.js.es6 b/app/assets/javascripts/select-kit/components/category-drop/category-drop-header.js.es6
new file mode 100644
index 00000000000..cc952c4dc4b
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/category-drop/category-drop-header.js.es6
@@ -0,0 +1,67 @@
+import ComboBoxSelectBoxHeaderComponent from "select-kit/components/combo-box/combo-box-header";
+import computed from "ember-addons/ember-computed-decorators";
+import Category from "discourse/models/category";
+
+export default ComboBoxSelectBoxHeaderComponent.extend({
+  layoutName: "select-kit/templates/components/category-drop/category-drop-header",
+  classNames: "category-drop-header",
+
+  classNameBindings: ["categoryStyleClass"],
+  categoryStyleClass: Ember.computed.alias("site.category_style"),
+
+  @computed("computedContent.value", "computedContent.name")
+  category(value, name) {
+    if (Ember.isEmpty(value)) {
+      const uncat = Category.findUncategorized();
+      if (uncat && uncat.get("name") === name) {
+        return uncat;
+      }
+    } else {
+      return Category.findById(parseInt(value, 10));
+    }
+  },
+
+  @computed("category.color")
+  categoryBackgroundColor(categoryColor) {
+    return categoryColor || "#e9e9e9";
+  },
+
+  @computed("category.text_color")
+  categoryTextColor(categoryTextColor) {
+    return categoryTextColor || "#333";
+  },
+
+  @computed("category", "categoryBackgroundColor", "categoryTextColor")
+  categoryStyle(category, categoryBackgroundColor, categoryTextColor) {
+    const categoryStyle = this.siteSettings.category_style;
+
+    if (categoryStyle === "bullet") return;
+
+    if (category) {
+      if (categoryBackgroundColor || categoryTextColor) {
+        let style = "";
+        if (categoryBackgroundColor) {
+          if (categoryStyle === "bar") {
+            style += `border-color: #${categoryBackgroundColor};`;
+          } else if (categoryStyle === "box") {
+            style += `background-color: #${categoryBackgroundColor};`;
+            if (categoryTextColor) { style += `color: #${categoryTextColor};`; }
+          }
+        }
+
+        return style.htmlSafe();
+      }
+    }
+
+    if (categoryStyle === "box") {
+      return `background-color: ${categoryBackgroundColor}; color: ${categoryTextColor}`.htmlSafe();
+    }
+  },
+
+  didRender() {
+    this._super();
+
+    this.$().attr("style", this.get("categoryStyle"));
+    this.$(".caret-icon").attr("style", this.get("categoryStyle"));
+  },
+});
diff --git a/app/assets/javascripts/select-kit/components/category-notifications-button.js.es6 b/app/assets/javascripts/select-kit/components/category-notifications-button.js.es6
index f84c0ba4c2f..602369f5212 100644
--- a/app/assets/javascripts/select-kit/components/category-notifications-button.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-notifications-button.js.es6
@@ -1,20 +1,15 @@
 import NotificationOptionsComponent from "select-kit/components/notifications-button";
-import computed from "ember-addons/ember-computed-decorators";
 
 export default NotificationOptionsComponent.extend({
   pluginApiIdentifiers: ["category-notifications-button"],
   classNames: "category-notifications-button",
-  isHidden: Ember.computed.or("category.deleted", "site.isMobileDevice"),
+  isHidden: Ember.computed.or("category.deleted"),
+  headerIcon: Ember.computed.alias("iconForSelectedDetails"),
   i18nPrefix: "category.notifications",
   showFullTitle: false,
   allowInitialValueMutation: false,
 
   mutateValue(value) {
     this.get("category").setNotification(value);
-  },
-
-  @computed("iconForSelectedDetails")
-  headerIcon(iconForSelectedDetails) {
-    return [iconForSelectedDetails, "caret-down"];
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/category-row.js.es6 b/app/assets/javascripts/select-kit/components/category-row.js.es6
index da59a4cfe99..74f146e51c7 100644
--- a/app/assets/javascripts/select-kit/components/category-row.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-row.js.es6
@@ -7,6 +7,10 @@ export default SelectKitRowComponent.extend({
   layoutName: "select-kit/templates/components/category-row",
   classNames: "category-row",
 
+  hideParentCategory: Ember.computed.bool("options.hideParentCategory"),
+  allowUncategorized: Ember.computed.bool("options.allowUncategorized"),
+  categoryLink: Ember.computed.bool("options.categoryLink"),
+
   @computed("options.displayCategoryDescription")
   displayCategoryDescription(displayCategoryDescription) {
     if (Ember.isNone(displayCategoryDescription)) {
@@ -16,6 +20,12 @@ export default SelectKitRowComponent.extend({
     return displayCategoryDescription;
   },
 
+  @computed("description", "category.name")
+  title(categoryDescription, categoryName) {
+    if (categoryDescription) return categoryDescription;
+    return categoryName;
+  },
+
   @computed("computedContent.value", "computedContent.name")
   category(value, name) {
     if (Ember.isEmpty(value)) {
@@ -28,18 +38,21 @@ export default SelectKitRowComponent.extend({
     }
   },
 
-  @computed("category")
-  badgeForCategory(category) {
+  @computed("category", "parentCategory")
+  badgeForCategory(category, parentCategory) {
     return categoryBadgeHTML(category, {
-      link: false,
-      allowUncategorized: true,
-      hideParent: true
+      link: this.get("categoryLink"),
+      allowUncategorized: this.get("allowUncategorized"),
+      hideParent: parentCategory ? true : false
     }).htmlSafe();
   },
 
   @computed("parentCategory")
   badgeForParentCategory(parentCategory) {
-    return categoryBadgeHTML(parentCategory, {link: false}).htmlSafe();
+    return categoryBadgeHTML(parentCategory, {
+      link: this.get("categoryLink"),
+      allowUncategorized: this.get("allowUncategorized")
+    }).htmlSafe();
   },
 
   @computed("parentCategoryid")
@@ -57,7 +70,10 @@ export default SelectKitRowComponent.extend({
     return category.get("parent_category_id");
   },
 
-  topicCount: Ember.computed.alias("category.topic_count"),
+  @computed("category.topic_count")
+  topicCount(topicCount) {
+    return `&times; ${topicCount}`.htmlSafe();
+  },
 
   @computed("displayCategoryDescription", "category.description")
   shouldDisplayDescription(displayCategoryDescription, description) {
@@ -66,6 +82,8 @@ export default SelectKitRowComponent.extend({
 
   @computed("category.description")
   description(description) {
-    return `${description.substr(0, 200)}${description.length > 200 ? '&hellip;' : ''}`;
+    if (description) {
+      return `${description.substr(0, 200)}${description.length > 200 ? '&hellip;' : ''}`;
+    }
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/category-selector.js.es6 b/app/assets/javascripts/select-kit/components/category-selector.js.es6
index 9484e13844e..58ec15c0f60 100644
--- a/app/assets/javascripts/select-kit/components/category-selector.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-selector.js.es6
@@ -9,6 +9,7 @@ export default MultiSelectComponent.extend({
   rowComponent: "category-row",
   categories: null,
   blacklist: null,
+  allowUncategorized: true,
 
   init() {
     this._super();
@@ -21,6 +22,7 @@ export default MultiSelectComponent.extend({
     });
 
     this.get("rowComponentOptions").setProperties({
+      allowUncategorized: this.get("allowUncategorized"),
       displayCategoryDescription: false
     });
   },
diff --git a/app/assets/javascripts/select-kit/components/combo-box.js.es6 b/app/assets/javascripts/select-kit/components/combo-box.js.es6
index 0a576eae9af..a43839a6eee 100644
--- a/app/assets/javascripts/select-kit/components/combo-box.js.es6
+++ b/app/assets/javascripts/select-kit/components/combo-box.js.es6
@@ -1,5 +1,5 @@
 import SingleSelectComponent from "select-kit/components/single-select";
-import { on } from "ember-addons/ember-computed-decorators";
+import { on, default as computed } from "ember-addons/ember-computed-decorators";
 
 export default SingleSelectComponent.extend({
   pluginApiIdentifiers: ["combo-box"],
@@ -12,17 +12,20 @@ export default SingleSelectComponent.extend({
   clearable: false,
 
   computeHeaderContent() {
-    let content = this.baseHeaderComputedContent();
+    let content = this._super();
     content.hasSelection = this.get("hasSelection");
     return content;
   },
 
+  @computed("isExpanded", "caretUpIcon", "caretDownIcon")
+  caretIcon(isExpanded, caretUpIcon, caretDownIcon) {
+    return isExpanded ? caretUpIcon : caretDownIcon;
+  },
+
   @on("didReceiveAttrs")
   _setComboBoxOptions() {
     this.get("headerComponentOptions").setProperties({
-      caretUpIcon: this.get("caretUpIcon"),
-      caretDownIcon: this.get("caretDownIcon"),
-      clearable: this.get("clearable"),
+      clearable: this.get("clearable")
     });
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/combo-box/combo-box-header.js.es6 b/app/assets/javascripts/select-kit/components/combo-box/combo-box-header.js.es6
index 6cc5ecd21f7..3835dc01cba 100644
--- a/app/assets/javascripts/select-kit/components/combo-box/combo-box-header.js.es6
+++ b/app/assets/javascripts/select-kit/components/combo-box/combo-box-header.js.es6
@@ -1,5 +1,4 @@
 import SelectKitHeaderComponent from "select-kit/components/select-kit/select-kit-header";
-import { default as computed } from "ember-addons/ember-computed-decorators";
 
 export default SelectKitHeaderComponent.extend({
   layoutName: "select-kit/templates/components/combo-box/combo-box-header",
@@ -8,14 +7,5 @@ export default SelectKitHeaderComponent.extend({
   clearable: Ember.computed.alias("options.clearable"),
   caretUpIcon: Ember.computed.alias("options.caretUpIcon"),
   caretDownIcon: Ember.computed.alias("options.caretDownIcon"),
-
-  @computed("isExpanded", "caretUpIcon", "caretDownIcon")
-  caretIcon(isExpanded, caretUpIcon, caretDownIcon) {
-    return isExpanded === true ? caretUpIcon : caretDownIcon;
-  },
-
-  @computed("clearable", "computedContent.hasSelection")
-  shouldDisplayClearableButton(clearable, hasSelection) {
-    return clearable === true && hasSelection === true;
-  }
+  shouldDisplayClearableButton: Ember.computed.and("clearable", "computedContent.hasSelection")
 });
diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js.es6 b/app/assets/javascripts/select-kit/components/composer-actions.js.es6
new file mode 100644
index 00000000000..5a3479f751a
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/composer-actions.js.es6
@@ -0,0 +1,257 @@
+import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
+import computed from "ember-addons/ember-computed-decorators";
+import {
+  PRIVATE_MESSAGE,
+  CREATE_TOPIC,
+  CREATE_SHARED_DRAFT,
+  REPLY,
+  EDIT,
+  NEW_PRIVATE_MESSAGE_KEY
+} from "discourse/models/composer";
+
+// Component can get destroyed and lose state
+let _topicSnapshot = null;
+let _postSnapshot = null;
+
+export function _clearSnapshots() {
+  _topicSnapshot = null;
+  _postSnapshot = null;
+}
+
+export default DropdownSelectBoxComponent.extend({
+  composerController: Ember.inject.controller("composer"),
+  pluginApiIdentifiers: ["composer-actions"],
+  classNames: "composer-actions",
+  fullWidthOnMobile: true,
+  autofilterable: false,
+  filterable: false,
+  allowInitialValueMutation: false,
+  allowAutoSelectFirst: false,
+  showFullTitle: false,
+  isHidden: Ember.computed.empty("content"),
+
+  didReceiveAttrs() {
+    this._super();
+
+    // if we change topic we want to change both snapshots
+    if (this.get("composerModel.topic") && (!_topicSnapshot || this.get("composerModel.topic.id") !== _topicSnapshot.get("id"))) {
+      _topicSnapshot = this.get("composerModel.topic");
+      _postSnapshot = this.get("composerModel.post");
+    }
+
+    // if we hit reply on a different post we want to change postSnapshot
+    if (this.get("composerModel.post") && (!_postSnapshot || this.get("composerModel.post.id") !== _postSnapshot.get("id"))) {
+      _postSnapshot = this.get("composerModel.post");
+    }
+  },
+
+  computeHeaderContent() {
+    let content = this._super();
+
+    switch (this.get("action")) {
+      case PRIVATE_MESSAGE:
+      case CREATE_TOPIC:
+      case REPLY:
+        content.icon = "mail-forward";
+        break;
+      case EDIT:
+        content.icon = "pencil";
+        break;
+      case CREATE_SHARED_DRAFT:
+        content.icon = 'clipboard';
+        break;
+    };
+
+    return content;
+  },
+
+  @computed("options", "canWhisper", "action")
+  content(options, canWhisper, action) {
+    let items = [];
+
+    if (action !== CREATE_TOPIC && action !== CREATE_SHARED_DRAFT && _topicSnapshot) {
+      items.push({
+        name: I18n.t("composer.composer_actions.reply_as_new_topic.label"),
+        description: I18n.t("composer.composer_actions.reply_as_new_topic.desc"),
+        icon: "plus",
+        id: "reply_as_new_topic"
+      });
+    }
+
+    if ((action !== REPLY && _postSnapshot) || (action === REPLY && _postSnapshot && !(options.userAvatar && options.userLink))) {
+      items.push({
+        name: I18n.t("composer.composer_actions.reply_to_post.label", {
+          postNumber: _postSnapshot.get("post_number"),
+          postUsername: _postSnapshot.get("username")
+        }),
+        description: I18n.t("composer.composer_actions.reply_to_post.desc"),
+        icon: "mail-forward",
+        id: "reply_to_post"
+      });
+    }
+
+    if (this.siteSettings.enable_personal_messages && action !== PRIVATE_MESSAGE) {
+      items.push({
+        name: I18n.t("composer.composer_actions.reply_as_private_message.label"),
+        description: I18n.t("composer.composer_actions.reply_as_private_message.desc"),
+        icon: "envelope",
+        id: "reply_as_private_message"
+      });
+    }
+
+    if ((action !== REPLY && _topicSnapshot) || (action === REPLY && _topicSnapshot && (options.userAvatar && options.userLink && options.topicLink))) {
+      items.push({
+        name: I18n.t("composer.composer_actions.reply_to_topic.label"),
+        description: I18n.t("composer.composer_actions.reply_to_topic.desc"),
+        icon: "mail-forward",
+        id: "reply_to_topic"
+      });
+    }
+
+    // if answered post is a whisper, we can only answer with a whisper so no need for toggle
+    if (canWhisper && (!_postSnapshot || _postSnapshot && _postSnapshot.post_type !== this.site.post_types.whisper)) {
+      items.push({
+        name: I18n.t("composer.composer_actions.toggle_whisper.label"),
+        description: I18n.t("composer.composer_actions.toggle_whisper.desc"),
+        icon: "eye-slash",
+        id: "toggle_whisper"
+      });
+    }
+
+    let showCreateTopic = false;
+    if (action === CREATE_SHARED_DRAFT) {
+      showCreateTopic = true;
+    }
+
+    if (action === CREATE_TOPIC) {
+      if (this.site.shared_drafts_category_id) {
+        // Shared Drafts Choice
+        items.push({
+          name: I18n.t("composer.composer_actions.shared_draft.label"),
+          description: I18n.t("composer.composer_actions.shared_draft.desc"),
+          icon: "clipboard",
+          id: "shared_draft"
+        });
+      }
+
+      // Edge case: If personal messages are disabled, it is possible to have
+      // no items which stil renders a button that pops up nothing. In this
+      // case, add an option for what you're currently doing.
+      if (items.length === 0) {
+        showCreateTopic = true;
+      }
+    }
+
+    if (showCreateTopic) {
+      items.push({
+        name: I18n.t("composer.composer_actions.create_topic.label"),
+        description: I18n.t("composer.composer_actions.reply_as_new_topic.desc"),
+        icon: "mail-forward",
+        id: "create_topic"
+      });
+    }
+
+    return items;
+  },
+
+  _replyFromExisting(options, post, topic) {
+    const reply = this.get("composerModel.reply");
+
+    let url;
+    if (post) url = post.get("url");
+    if (!post && topic) url = topic.get("url");
+
+    let topicTitle;
+    if (topic) topicTitle = topic.get("title");
+
+    this.get("composerController").close();
+    this.get("composerController").open(options).then(() => {
+      if (!url || ! topicTitle) return;
+
+      url = `${location.protocol}//${location.host}${url}`;
+      const link = `[${Handlebars.escapeExpression(topicTitle)}](${url})`;
+      const continueDiscussion = I18n.t("post.continue_discussion", { postLink: link });
+
+      if (!reply.includes(continueDiscussion)) {
+        this.get("composerController")
+            .get("model")
+            .prependText(continueDiscussion, {new_line: true});
+      }
+    });
+  },
+
+  _openComposer(options) {
+    this.get("composerController").close();
+    this.get("composerController").open(options);
+  },
+
+  toggleWhisperSelected(options, model) {
+    model.toggleProperty('whisper');
+  },
+
+  replyToTopicSelected(options) {
+    options.action = REPLY;
+    options.topic = _topicSnapshot;
+    this._openComposer(options);
+  },
+
+  replyToPostSelected(options) {
+    options.action = REPLY;
+    options.post = _postSnapshot;
+    this._openComposer(options);
+  },
+
+  replyAsNewTopicSelected(options) {
+    options.action = CREATE_TOPIC;
+    options.categoryId = this.get("composerModel.topic.category.id");
+    this._replyFromExisting(options, _postSnapshot, _topicSnapshot);
+  },
+
+  replyAsPrivateMessageSelected(options) {
+    let usernames;
+
+    if (_postSnapshot && !_postSnapshot.get("yours")) {
+      const postUsername = _postSnapshot.get("username");
+      if (postUsername) {
+        usernames = postUsername;
+      }
+    }
+
+    options.action = PRIVATE_MESSAGE;
+    options.usernames = usernames;
+    options.archetypeId = "private_message";
+    options.draftKey = NEW_PRIVATE_MESSAGE_KEY;
+
+    this._replyFromExisting(options, _postSnapshot, _topicSnapshot);
+  },
+
+  _switchCreate(options, action) {
+    options.action = action;
+    options.categoryId = this.get("composerModel.categoryId");
+    options.topicTitle = this.get('composerModel.title');
+    this._openComposer(options);
+  },
+
+  createTopicSelected(options) {
+    this._switchCreate(options, CREATE_TOPIC);
+  },
+
+  sharedDraftSelected(options) {
+    this._switchCreate(options, CREATE_SHARED_DRAFT);
+  },
+
+  actions: {
+    onSelect(value) {
+      let action = `${Ember.String.camelize(value)}Selected`;
+      if (this[action]) {
+        let model = this.get('composerModel');
+        this[action](
+          model.getProperties('draftKey', 'draftSequence', 'reply'),
+          model
+        );
+      } else {
+        Ember.Logger.error(`No method '${action}' found`);
+      }
+    }
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/dropdown-select-box.js.es6 b/app/assets/javascripts/select-kit/components/dropdown-select-box.js.es6
index 5f76542aac3..0b540b47885 100644
--- a/app/assets/javascripts/select-kit/components/dropdown-select-box.js.es6
+++ b/app/assets/javascripts/select-kit/components/dropdown-select-box.js.es6
@@ -21,7 +21,7 @@ export default SingleSelectComponent.extend({
   },
 
   didClickOutside() {
-    if (this.get("isExpanded") === false) return;
+    if (!this.get("isExpanded")) return;
     this.close();
   },
 
diff --git a/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-header.js.es6 b/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-header.js.es6
index d7e08764309..e1939e3214a 100644
--- a/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-header.js.es6
+++ b/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-header.js.es6
@@ -10,6 +10,6 @@ export default SelectKitHeaderComponent.extend({
 
   @computed("options.showFullTitle")
   btnClassName(showFullTitle) {
-    return `btn ${showFullTitle ? 'btn-icon-text' : 'no-text btn-icon'}`;
+    return `btn ${showFullTitle ? "btn-icon-text" : "no-text btn-icon"}`;
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6 b/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6
index 8597cb9668b..66b378d891d 100644
--- a/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6
+++ b/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6
@@ -120,19 +120,19 @@ export default ComboBoxComponent.extend(DatetimeMixin, {
   headerComponent: "future-date-input-selector/future-date-input-selector-header",
 
   computeHeaderContent() {
-    let content = this.baseHeaderComputedContent();
+    let content = this._super();
     content.datetime = this._computeDatetimeForValue(this.get("computedValue"));
-    content.name = this.get("selectedComputedContent.name") || content.name;
+    content.name = this.get("selection.name") || content.name;
     content.hasSelection = this.get("hasSelection");
     content.icons = this._computeIconsForValue(this.get("computedValue"));
     return content;
   },
 
   computeContentItem(contentItem, name) {
-    let item = this.baseComputedContentItem(contentItem, name);
-    item.datetime = this._computeDatetimeForValue(contentItem.id);
-    item.icons = this._computeIconsForValue(contentItem.id);
-    return item;
+    let computedContentItem = this._super(contentItem, name);
+    computedContentItem.datetime = this._computeDatetimeForValue(contentItem.id);
+    computedContentItem.icons = this._computeIconsForValue(contentItem.id);
+    return computedContentItem;
   },
 
   computeContent() {
@@ -155,14 +155,14 @@ export default ComboBoxComponent.extend(DatetimeMixin, {
   },
 
   mutateValue(value) {
-    if (this.get("isCustom") || this.get("isBasedOnLastPost")) {
+    if (value === 'pick_date_and_time' || this.get("isBasedOnLastPost")) {
       this.set("value", value);
     } else {
       let input = null;
       const { time } = this._updateAt(value);
 
       if (time && !Ember.isEmpty(value)) {
-        input = time.format(FORMAT);
+        input = time.locale('en').format(FORMAT);
       }
 
       this.setProperties({ input, value });
diff --git a/app/assets/javascripts/select-kit/components/group-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/group-dropdown.js.es6
new file mode 100644
index 00000000000..7657a28e317
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/group-dropdown.js.es6
@@ -0,0 +1,48 @@
+import ComboBoxComponent from "select-kit/components/combo-box";
+import DiscourseURL from "discourse/lib/url";
+import { default as computed } from "ember-addons/ember-computed-decorators";
+
+export default ComboBoxComponent.extend({
+  pluginApiIdentifiers: ["group-dropdown"],
+  classNames: "group-dropdown",
+  content: Ember.computed.alias("groups"),
+  tagName: "li",
+  caretDownIcon: "caret-right",
+  caretUpIcon: "caret-down",
+  allowAutoSelectFirst: false,
+  valueAttribute: 'name',
+
+  @computed("content")
+  filterable(content) {
+    return content && content.length >= 10;
+  },
+
+  computeHeaderContent() {
+    let content = this._super();
+
+    if (!this.get("hasSelection")) {
+      content.label = `<span>${I18n.t("groups.index.all")}</span>`;
+    }
+
+    return content;
+  },
+
+  @computed
+  collectionHeader() {
+    if (this.siteSettings.enable_group_directory ||
+        (this.currentUser && this.currentUser.get('staff'))) {
+
+      return `
+        <a href="${Discourse.getURL("/groups")}" class="group-dropdown-filter">
+          ${I18n.t("groups.index.all").toLowerCase()}
+        </a>
+      `.htmlSafe();
+    }
+  },
+
+  actions: {
+    onSelect(groupName) {
+      DiscourseURL.routeTo(Discourse.getURL(`/groups/${groupName}`));
+    }
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/group-members-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/group-members-dropdown.js.es6
new file mode 100644
index 00000000000..cda2720a25a
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/group-members-dropdown.js.es6
@@ -0,0 +1,33 @@
+import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
+
+export default DropdownSelectBoxComponent.extend({
+  classNames: "group-members-dropdown",
+  headerIcon: ["bars", "caret-down"],
+  showFullTitle: false,
+  allowInitialValueMutation: false,
+  autoHighlight() {},
+
+  computeContent() {
+    const items = [
+      {
+        id: "showAddMembersModal",
+        name: I18n.t("groups.add_members.title"),
+        icon: "user-plus"
+      }
+    ];
+
+    if (this.currentUser.admin) {
+      items.push({
+        id: "showBulkAddModal",
+        name: I18n.t("admin.groups.bulk_add.title"),
+        icon: "users"
+      });
+    }
+
+    return items;
+  },
+
+  mutateValue(value) {
+    this.sendAction(value);
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/list-setting.js.es6 b/app/assets/javascripts/select-kit/components/list-setting.js.es6
index 0872aab9510..cc1c4f94fb7 100644
--- a/app/assets/javascripts/select-kit/components/list-setting.js.es6
+++ b/app/assets/javascripts/select-kit/components/list-setting.js.es6
@@ -1,4 +1,5 @@
 import MultiSelectComponent from "select-kit/components/multi-select";
+const { isNone, makeArray } = Ember;
 
 export default MultiSelectComponent.extend({
   pluginApiIdentifiers: ["list-setting"],
@@ -11,7 +12,7 @@ export default MultiSelectComponent.extend({
   init() {
     this._super();
 
-    if (!Ember.isNone(this.get("settingName"))) {
+    if (!isNone(this.get("settingName"))) {
       this.set("nameProperty", this.get("settingName"));
     }
 
@@ -24,13 +25,13 @@ export default MultiSelectComponent.extend({
 
   computeContent() {
     let content;
-    if (Ember.isNone(this.get("choices"))) {
+    if (isNone(this.get("choices"))) {
       content = this.get("settingValue").split(this.get("tokenSeparator"));;
     }  else {
       content = this.get("choices");
     }
 
-    return Ember.makeArray(content).filter(c => c);
+    return makeArray(content).filter(c => c);
   },
 
   mutateValues(values) {
diff --git a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6
new file mode 100644
index 00000000000..dbcb5d03841
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6
@@ -0,0 +1,230 @@
+import ComboBox from "select-kit/components/combo-box";
+import Tags from "select-kit/mixins/tags";
+import { default as computed } from "ember-addons/ember-computed-decorators";
+import renderTag from "discourse/lib/render-tag";
+import { escapeExpression } from 'discourse/lib/utilities';
+const { get, isEmpty, run, makeArray } = Ember;
+
+export default ComboBox.extend(Tags, {
+  allowContentReplacement: true,
+  headerComponent: "mini-tag-chooser/mini-tag-chooser-header",
+  pluginApiIdentifiers: ["mini-tag-chooser"],
+  attributeBindings: ["categoryId"],
+  classNames: ["mini-tag-chooser"],
+  classNameBindings: ["noTags"],
+  verticalOffset: 3,
+  filterable: true,
+  noTags: Ember.computed.empty("selection"),
+  allowAny: true,
+  caretUpIcon: Ember.computed.alias("caretIcon"),
+  caretDownIcon: Ember.computed.alias("caretIcon"),
+  isAsync: true,
+  fullWidthOnMobile: true,
+
+  init() {
+    this._super();
+
+    this.set("termMatchesForbidden", false);
+    this.selectionSelector = ".selected-tag";
+
+    this.set("templateForRow", (rowComponent) => {
+      const tag = rowComponent.get("computedContent");
+      return renderTag(get(tag, "value"), {
+        count: get(tag, "originalContent.count"),
+        noHref: true
+      });
+    });
+
+    this.set("maximum", parseInt(this.get("limit") || this.get("maximum") || this.get("siteSettings.max_tags_per_topic")));
+  },
+
+  @computed("hasReachedMaximum")
+  caretIcon(hasReachedMaximum) {
+    return hasReachedMaximum ? null : "plus fa-fw";
+  },
+
+  @computed("tags")
+  selection(tags) {
+    return makeArray(tags).map(c => this.computeContentItem(c));
+  },
+
+  filterComputedContent(computedContent) {
+    return computedContent;
+  },
+
+  didRender() {
+    this._super();
+
+    this.$(".select-kit-body").on("click.mini-tag-chooser", ".selected-tag", (event) => {
+      event.stopImmediatePropagation();
+      this.destroyTags(this.computeContentItem($(event.target).attr("data-value")));
+    });
+
+    this.$(".select-kit-header").on("focus.mini-tag-chooser", ".selected-name", (event) => {
+      event.stopImmediatePropagation();
+      this.focus(event);
+    });
+  },
+
+  willDestroyElement() {
+    this._super();
+
+    this.$(".select-kit-body").off("click.mini-tag-chooser");
+    this.$(".select-kit-header").off("focus.mini-tag-chooser");
+  },
+
+  // we are directly mutatings tags to define the current selection
+  mutateValue() {},
+
+  didPressTab(event) {
+    if (this.get("isLoading")) {
+      this._destroyEvent(event);
+      return false;
+    }
+
+    if (isEmpty(this.get("filter")) && !this.get("highlighted")) {
+      this.$header().focus();
+      this.close(event);
+      return true;
+    }
+
+    if (this.get("highlighted") && this.get("isExpanded")) {
+      this._destroyEvent(event);
+      this.focus();
+      this.select(this.get("highlighted"));
+      return false;
+    } else {
+      this.close(event);
+    }
+
+    return true;
+  },
+
+  @computed("tags.[]", "filter", "highlightedSelection.[]")
+  collectionHeader(tags, filter, highlightedSelection) {
+    if (!isEmpty(tags)) {
+      let output = "";
+
+      // if we have more than x tags we will also filter the selection
+      if (tags.length >= 20) {
+        tags = tags.filter(t => t.indexOf(filter) >= 0);
+      }
+
+      tags.map((tag) => {
+        tag = escapeExpression(tag);
+        const isHighlighted = highlightedSelection.map(s => get(s, "value")).includes(tag);
+        output += `
+          <button aria-label="${tag}" title="${tag}" class="selected-tag ${isHighlighted ? 'is-highlighted' : ''}" data-value="${tag}">
+            ${tag}
+          </button>
+        `;
+      });
+
+      return `<div class="selected-tags">${output}</div>`;
+    }
+  },
+
+  computeHeaderContent() {
+    let content = this._super();
+
+    const joinedTags = this.get("selection")
+                           .map(s => Ember.get(s, "value"))
+                           .join(", ");
+
+    if (isEmpty(this.get("selection"))) {
+      content.label = I18n.t("tagging.choose_for_topic");
+    } else {
+      content.label = joinedTags;
+    }
+
+    if (!this.get("hasReachedMinimum") && isEmpty(this.get("selection"))) {
+      const key = this.get("minimumLabel") || "select_kit.min_content_not_reached";
+      const label = I18n.t(key, { count: this.get("minimum") });
+      content.title = content.name = content.label = label;
+    }
+
+    content.title = content.name = content.value = joinedTags;
+
+    return content;
+  },
+
+  _prepareSearch(query) {
+    const data = {
+      q: query,
+      limit: this.get("siteSettings.max_tag_search_results"),
+      categoryId: this.get("categoryId")
+    };
+
+    if (this.get("selection")) {
+      data.selected_tags = this.get("selection")
+                               .map(s => Ember.get(s, "value"))
+                               .slice(0, 100);
+    }
+
+    if (!this.get("everyTag")) data.filterForInput = true;
+
+    this.searchTags("/tags/filter/search", data, this._transformJson);
+  },
+
+  _transformJson(context, json) {
+    let results = json.results;
+
+    context.set("termMatchesForbidden", json.forbidden ? true : false);
+
+    if (context.get("siteSettings.tags_sort_alphabetically")) {
+      results = results.sort((a, b) => a.id > b.id);
+    }
+
+    results = results.filter(r => !context.get("selection").includes(r.id));
+
+    results = results.map(result => {
+      return { id: result.text, name: result.text, count: result.count };
+    });
+
+    // if forbidden we probably have an existing tag which is not in the list of
+    // returned tags, so we manually add it at the top
+    if (json.forbidden) {
+      results.unshift({ id: json.forbidden, name: json.forbidden, count: 0 });
+    }
+
+    return results;
+  },
+
+  destroyTags(tags) {
+    tags = Ember.makeArray(tags).map(c => get(c, "value"));
+
+    // work around usage with buffered proxy
+    // it does not listen on array changes, similar hack already on select
+    // TODO: FIX buffered-proxy.js to support arrays
+    this.get("tags").removeObjects(tags);
+    this.set("tags", this.get("tags").slice(0));
+
+    this.set("searchDebounce", run.debounce(this, this._prepareSearch, this.get("filter"), 350));
+  },
+
+  didDeselect(tags) {
+    this.destroyTags(tags);
+  },
+
+  actions: {
+    onSelect(tag) {
+      this.set("tags", makeArray(this.get("tags")).concat(tag));
+      this._prepareSearch(this.get("filter"));
+      this.autoHighlight();
+    },
+
+    onExpand() {
+      if (isEmpty(this.get("collectionComputedContent"))) {
+        this.set("searchDebounce", run.debounce(this, this._prepareSearch, this.get("filter"), 350));
+      }
+    },
+
+    onFilter(filter) {
+      // we start loading right away so we avoid updating createRow multiple times
+      this.startLoading();
+
+      filter = isEmpty(filter) ? null : filter;
+      this.set("searchDebounce", run.debounce(this, this._prepareSearch, filter, 350));
+    }
+  },
+});
diff --git a/app/assets/javascripts/select-kit/components/mini-tag-chooser/mini-tag-chooser-header.js.es6 b/app/assets/javascripts/select-kit/components/mini-tag-chooser/mini-tag-chooser-header.js.es6
new file mode 100644
index 00000000000..20f13a4b3b7
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/mini-tag-chooser/mini-tag-chooser-header.js.es6
@@ -0,0 +1,6 @@
+import SelectKitHeaderComponent from "select-kit/components/select-kit/select-kit-header";
+
+export default SelectKitHeaderComponent.extend({
+  layoutName: "select-kit/templates/components/mini-tag-chooser/mini-tag-chooser-header",
+  classNames: "mini-tag-chooser-header"
+});
diff --git a/app/assets/javascripts/select-kit/components/multi-select.js.es6 b/app/assets/javascripts/select-kit/components/multi-select.js.es6
index 2929584f814..8e7622e1e3b 100644
--- a/app/assets/javascripts/select-kit/components/multi-select.js.es6
+++ b/app/assets/javascripts/select-kit/components/multi-select.js.es6
@@ -1,26 +1,31 @@
 import SelectKitComponent from "select-kit/components/select-kit";
 import computed from "ember-addons/ember-computed-decorators";
 import { on } from "ember-addons/ember-computed-decorators";
-const { get, isNone, isEmpty, makeArray } = Ember;
+const { get, isNone, isEmpty, makeArray, run } = Ember;
 import {
   applyOnSelectPluginApiCallbacks
 } from "select-kit/mixins/plugin-api";
 
 export default SelectKitComponent.extend({
   pluginApiIdentifiers: ["multi-select"],
+  layoutName: "select-kit/templates/components/multi-select",
   classNames: "multi-select",
   headerComponent: "multi-select/multi-select-header",
-  filterComponent: null,
   headerText: "select_kit.default_header_text",
   allowAny: true,
   allowInitialValueMutation: false,
   autoFilterable: true,
   selectedNameComponent: "multi-select/selected-name",
+  filterIcon: null,
+  filterComponent: "multi-select/multi-select-filter",
+  computedValues: null,
+  values: null,
 
   init() {
     this._super();
 
     this.set("computedValues", []);
+
     if (isNone(this.get("values"))) { this.set("values", []); }
 
     this.set("headerComponentOptions", Ember.Object.create({
@@ -36,17 +41,22 @@ export default SelectKitComponent.extend({
 
   @on("didReceiveAttrs")
   _compute() {
-    Ember.run.scheduleOnce("afterRender", () => {
+    run.scheduleOnce("afterRender", () => {
       this.willComputeAttributes();
-      let content = this.willComputeContent(this.get("content") || []);
+      let content = this.get("content") || [];
+      let asyncContent = this.get("asyncContent") || [];
+      content = this.willComputeContent(content);
+      asyncContent = this.willComputeAsyncContent(asyncContent);
       let values = this._beforeWillComputeValues(this.get("values"));
       content = this.computeContent(content);
+      asyncContent = this.computeAsyncContent(asyncContent);
       content = this._beforeDidComputeContent(content);
+      asyncContent = this._beforeDidComputeAsyncContent(asyncContent);
       values = this.willComputeValues(values);
       values = this.computeValues(values);
       values = this._beforeDidComputeValues(values);
-      this.set("headerComputedContent", this.computeHeaderContent());
       this.didComputeContent(content);
+      this.didComputeAsyncContent(asyncContent);
       this.didComputeValues(values);
       this.didComputeAttributes();
     });
@@ -54,7 +64,7 @@ export default SelectKitComponent.extend({
 
   @computed("filter", "shouldDisplayCreateRow")
   createRowComputedContent(filter, shouldDisplayCreateRow) {
-    if (shouldDisplayCreateRow === true) {
+    if (shouldDisplayCreateRow) {
       let content = this.createContentFromInput(filter);
       return this.computeContentItem(content, { created: true });
     }
@@ -69,7 +79,7 @@ export default SelectKitComponent.extend({
   shouldDisplayFilter() { return true; },
 
   _beforeWillComputeValues(values) {
-    return values.map(v => this._castInteger(v === "" ? null : v));
+    return values.map(v => this._cast(v === "" ? null : v));
   },
   willComputeValues(values) { return values; },
   computeValues(values) { return values; },
@@ -80,13 +90,11 @@ export default SelectKitComponent.extend({
   didComputeValues(values) { return values; },
 
   mutateAttributes() {
-    if (this.get("isDestroyed") || this.get("isDestroying")) return;
+    run.next(() => {
+      if (this.get("isDestroyed") || this.get("isDestroying")) return;
 
-    Ember.run.next(() => {
       this.mutateContent(this.get("computedContent"));
       this.mutateValues(this.get("computedValues"));
-      applyOnSelectPluginApiCallbacks(this.get("pluginApiIdentifiers"), this.get("computedValues"), this);
-      this.set("headerComputedContent", this.computeHeaderContent());
     });
   },
   mutateValues(computedValues) {
@@ -101,24 +109,54 @@ export default SelectKitComponent.extend({
     });
   },
 
+  @computed("computedAsyncContent.[]", "computedValues.[]")
+  filteredAsyncComputedContent(computedAsyncContent, computedValues) {
+    computedAsyncContent = computedAsyncContent.filter(c => {
+      return !computedValues.includes(get(c, "value"));
+    });
+
+    if (this.get("limitMatches")) {
+      return computedAsyncContent.slice(0, this.get("limitMatches"));
+    }
+
+    return computedAsyncContent;
+  },
+
   @computed("computedContent.[]", "computedValues.[]", "filter")
   filteredComputedContent(computedContent, computedValues, filter) {
     computedContent = computedContent.filter(c => {
       return !computedValues.includes(get(c, "value"));
     });
 
-    if (this.get("shouldFilter") === true) {
+    if (this.get("shouldFilter")) {
       computedContent = this.filterComputedContent(computedContent, computedValues, filter);
     }
 
-    return computedContent.slice(0, this.get("limitMatches"));
+    if (this.get("limitMatches")) {
+      return computedContent.slice(0, this.get("limitMatches"));
+    }
+
+    return computedContent;
   },
 
-  baseHeaderComputedContent() {
-    return {
+  computeHeaderContent() {
+    let content = {
       title: this.get("title"),
-      selectedComputedContents: this.get("selectedComputedContents")
+      selection: this.get("selection")
     };
+
+    if (this.get("noneLabel")) {
+      if (!this.get("hasSelection")) {
+        content.title = content.name = content.label = I18n.t(this.get("noneLabel"));
+      }
+    } else {
+      if (!this.get("hasReachedMinimum")) {
+        const key = this.get("minimumLabel") || "select_kit.min_content_not_reached";
+        content.title = content.name = content.label = I18n.t(key, { count: this.get("minimum") });
+      }
+    }
+
+    return content;
   },
 
   @computed("filter")
@@ -128,71 +166,12 @@ export default SelectKitComponent.extend({
     };
   },
 
-  didPressBackspace(event) {
-    this.expand(event);
-    this.keyDown(event);
-    this._destroyEvent(event);
-  },
-
-  didPressEscape(event) {
-    const $highlighted = this.$(".selected-name.is-highlighted");
-    if ($highlighted.length > 0) {
-      $highlighted.removeClass("is-highlighted");
-    }
-
-    this._super(event);
-  },
-
-  keyDown(event) {
-    if (!isEmpty(this.get("filter"))) return;
-
-    const keyCode = event.keyCode || event.which;
-    const $filterInput = this.$filterInput();
-
-    // select all choices
-    if (this.get("hasSelection") && event.metaKey === true && keyCode === 65) {
-      this.$(".choices .selected-name:not(.is-locked)").addClass("is-highlighted");
-      return false;
-    }
-
-    // clear selection when multiple
-    if (this.$(".selected-name.is-highlighted").length >= 1 && keyCode === this.keys.BACKSPACE) {
-      const highlightedComputedContents = [];
-      $.each(this.$(".selected-name.is-highlighted"), (i, el) => {
-        const computedContent = this._findComputedContentItemByGuid($(el).attr("data-guid"));
-        if (!Ember.isNone(computedContent)) { highlightedComputedContents.push(computedContent); }
-      });
-      this.send("onDeselect", highlightedComputedContents);
-      return;
-    }
-
-    // try to remove last item from the list
-    if (keyCode === this.keys.BACKSPACE) {
-      let $lastSelectedValue = $(this.$(".choices .selected-name:not(.is-locked)").last());
-
-      if ($lastSelectedValue.length === 0) { return; }
-
-      if ($filterInput.not(":visible") && $lastSelectedValue.length > 0) {
-        $lastSelectedValue.click();
-        return false;
-      }
-
-      if ($filterInput.val() === "") {
-        if ($filterInput.is(":focus")) {
-          if ($lastSelectedValue.length > 0) { $lastSelectedValue.click(); }
-        } else {
-          if ($lastSelectedValue.length > 0) {
-            $lastSelectedValue.click();
-          } else {
-            $filterInput.focus();
-          }
-        }
-      }
-    }
+  validateSelect() {
+    return this._super() && !this.get("hasReachedMaximum");
   },
 
   @computed("computedValues.[]", "computedContent.[]")
-  selectedComputedContents(computedValues, computedContent) {
+  selection(computedValues, computedContent) {
     const selected = [];
 
     computedValues.forEach(v => {
@@ -203,70 +182,123 @@ export default SelectKitComponent.extend({
     return selected;
   },
 
-  @computed("selectedComputedContents.[]")
-  hasSelection(selectedComputedContents) { return !Ember.isEmpty(selectedComputedContents); },
+  @computed("selection.[]")
+  hasSelection(selection) { return !isEmpty(selection); },
+
+  didPressTab(event) {
+    if (isEmpty(this.get("filter")) && !this.get("highlighted")) {
+      this.$header().focus();
+      this.close(event);
+      return true;
+    }
+
+    if (this.get("highlighted") && this.get("isExpanded")) {
+      this._destroyEvent(event);
+      this.focus();
+      this.select(this.get("highlighted"));
+      return false;
+    } else {
+      this.close(event);
+    }
+
+    return true;
+  },
 
   autoHighlight() {
-    Ember.run.schedule("afterRender", () => {
-      if (this.get("isExpanded") === false) { return; }
-      if (this.get("renderedBodyOnce") === false) { return; }
-      if (!isNone(this.get("highlightedValue"))) { return; }
+    run.schedule("afterRender", () => {
+      if (!this.get("isExpanded")) return;
+      if (!this.get("renderedBodyOnce")) return;
+      if (this.get("highlighted")) return;
 
-      if (isEmpty(this.get("filteredComputedContent"))) {
+      if (isEmpty(this.get("collectionComputedContent"))) {
         if (this.get("createRowComputedContent")) {
-          this.send("onHighlight", this.get("createRowComputedContent"));
-        } else if (this.get("noneRowComputedContent") && this.get("hasSelection") === true) {
-          this.send("onHighlight", this.get("noneRowComputedContent"));
+          this.highlight(this.get("createRowComputedContent"));
+        } else if (this.get("noneRowComputedContent") && this.get("hasSelection")) {
+          this.highlight(this.get("noneRowComputedContent"));
         }
       } else {
-        this.send("onHighlight", this.get("filteredComputedContent.firstObject"));
+        this.highlight(this.get("collectionComputedContent.firstObject"));
       }
     });
   },
 
-  didSelect() {
-    this.focusFilterOrHeader();
-    this.autoHighlight();
-  },
-
-  didDeselect() {
-    this.focusFilterOrHeader();
-    this.autoHighlight();
-  },
-
-  validateComputedContentItem(computedContentItem) {
-    return !this.get("computedValues").includes(computedContentItem.value);
-  },
-
-  actions: {
-    onClear() {
-      this.get("selectedComputedContents").forEach(selectedComputedContent => {
-        this.send("onDeselect", selectedComputedContent);
-      });
-    },
-
-    onCreate(computedContentItem) {
-      if (this.validateComputedContentItem(computedContentItem)) {
-        this.get("computedContent").pushObject(computedContentItem);
-        this.send("onSelect", computedContentItem);
-      }
-    },
-
-    onSelect(computedContentItem) {
-      this.willSelect(computedContentItem);
-      this.get("computedValues").pushObject(computedContentItem.value);
-      Ember.run.next(() => this.mutateAttributes());
-      Ember.run.schedule("afterRender", () => this.didSelect(computedContentItem));
-    },
-
-    onDeselect(rowComputedContentItems) {
-      rowComputedContentItems = Ember.makeArray(rowComputedContentItems);
-      const generatedComputedContents = this._filterRemovableComputedContents(makeArray(rowComputedContentItems));
-      this.willDeselect(rowComputedContentItems);
-      this.get("computedValues").removeObjects(rowComputedContentItems.map(r => r.value));
-      this.get("computedContent").removeObjects(generatedComputedContents);
-      Ember.run.next(() => this.mutateAttributes());
-      Ember.run.schedule("afterRender", () => this.didDeselect(rowComputedContentItems));
+  select(computedContentItem) {
+    if (!computedContentItem || computedContentItem.__sk_row_type === "noneRow") {
+      this.clearSelection();
+      return;
     }
+
+    if (computedContentItem.__sk_row_type === "createRow") {
+      if (!this.get("computedValues").includes(computedContentItem.value) &&
+          this.validateCreate(computedContentItem.value)) {
+        this.willCreate(computedContentItem);
+
+        computedContentItem.__sk_row_type = null;
+        this.get("computedContent").pushObject(computedContentItem);
+
+        run.schedule("afterRender", () => {
+          this.didCreate(computedContentItem);
+          this._boundaryActionHandler("onCreate");
+        });
+
+        this.select(computedContentItem);
+        return;
+      } else {
+        this._boundaryActionHandler("onCreateFailure");
+        return;
+      }
+    }
+
+    if (this.validateSelect(computedContentItem)) {
+      this.willSelect(computedContentItem);
+      this.clearFilter();
+      this.setProperties({ highlighted: null });
+      this.get("computedValues").pushObject(computedContentItem.value);
+
+      run.next(() => this.mutateAttributes());
+
+      run.schedule("afterRender", () => {
+        this.didSelect(computedContentItem);
+
+        applyOnSelectPluginApiCallbacks(
+          this.get("pluginApiIdentifiers"),
+          computedContentItem.value,
+          this
+        );
+
+        this.autoHighlight();
+
+        this._boundaryActionHandler("onSelect", computedContentItem.value);
+      });
+    } else {
+      this._boundaryActionHandler("onSelectFailure");
+    }
+  },
+
+  deselect(rowComputedContentItems) {
+    this.willDeselect(rowComputedContentItems);
+    rowComputedContentItems = makeArray(rowComputedContentItems);
+    const generatedComputedContents = this._filterRemovableComputedContents(makeArray(rowComputedContentItems));
+    this.set("highlighted", null);
+    this.set("highlightedSelection", []);
+    this.get("computedValues").removeObjects(rowComputedContentItems.map(r => r.value));
+    this.get("computedContent").removeObjects(generatedComputedContents);
+    run.next(() => this.mutateAttributes());
+    run.schedule("afterRender", () => {
+      this.didDeselect(rowComputedContentItems);
+      this.autoHighlight();
+    });
+  },
+
+  close(event) {
+    this.clearHighlightSelection();
+
+    this._super(event);
+  },
+
+  unfocus(event) {
+    this.clearHighlightSelection();
+
+    this._super(event);
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/multi-select/multi-select-filter.js.es6 b/app/assets/javascripts/select-kit/components/multi-select/multi-select-filter.js.es6
new file mode 100644
index 00000000000..e9b92334484
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/multi-select/multi-select-filter.js.es6
@@ -0,0 +1,14 @@
+import computed from "ember-addons/ember-computed-decorators";
+const { isEmpty } = Ember;
+import SelectKitFilterComponent from "select-kit/components/select-kit/select-kit-filter";
+
+export default SelectKitFilterComponent.extend({
+  layoutName: "select-kit/templates/components/select-kit/select-kit-filter",
+  classNames: ["multi-select-filter"],
+
+  @computed("placeholder", "hasSelection")
+  computedPlaceholder(placeholder, hasSelection) {
+    if (hasSelection) return "";
+    return isEmpty(placeholder) ? "" : I18n.t(placeholder);
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/multi-select/multi-select-header.js.es6 b/app/assets/javascripts/select-kit/components/multi-select/multi-select-header.js.es6
index 2db20196894..bd57cf549e7 100644
--- a/app/assets/javascripts/select-kit/components/multi-select/multi-select-header.js.es6
+++ b/app/assets/javascripts/select-kit/components/multi-select/multi-select-header.js.es6
@@ -34,12 +34,12 @@ export default SelectKitHeaderComponent.extend({
     $filter.width(availableSpace - parentRightPadding * 4);
   },
 
-  @computed("computedContent.selectedComputedContents.[]")
+  @computed("computedContent.selection.[]")
   names(selection) {
     return Ember.makeArray(selection).map(s => s.name).join(",");
   },
 
-  @computed("computedContent.selectedComputedContents.[]")
+  @computed("computedContent.selection.[]")
   values(selection) {
     return Ember.makeArray(selection).map(s => s.value).join(",");
   }
diff --git a/app/assets/javascripts/select-kit/components/multi-select/selected-color.js.es6 b/app/assets/javascripts/select-kit/components/multi-select/selected-color.js.es6
index 7e835e84392..f75e7a708f6 100644
--- a/app/assets/javascripts/select-kit/components/multi-select/selected-color.js.es6
+++ b/app/assets/javascripts/select-kit/components/multi-select/selected-color.js.es6
@@ -1,11 +1,11 @@
 import SelectedNameComponent from "select-kit/components/multi-select/selected-name";
+import computed from "ember-addons/ember-computed-decorators";
 
 export default SelectedNameComponent.extend({
   classNames: "selected-color",
-  layoutName: "select-kit/templates/components/multi-select/selected-color",
 
-  didRender() {
-    const name = this.get("name");
-    this.$(".color-preview").css("background", `#${name}`.htmlSafe());
+  @computed("name")
+  footerContent(name) {
+    return `<span class="color-preview" style="background:#${name}"></span>`.htmlSafe();
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/multi-select/selected-name.js.es6 b/app/assets/javascripts/select-kit/components/multi-select/selected-name.js.es6
index a6b672d50ed..9b6b288023e 100644
--- a/app/assets/javascripts/select-kit/components/multi-select/selected-name.js.es6
+++ b/app/assets/javascripts/select-kit/components/multi-select/selected-name.js.es6
@@ -38,9 +38,14 @@ export default Ember.Component.extend({
     return this.getWithDefault("computedContent.locked", false);
   }),
 
+  @computed("computedContent", "highlightedSelection.[]")
+  isHighlighted(computedContent, highlightedSelection) {
+    return highlightedSelection.includes(this.get("computedContent"));
+  },
+
   click() {
-    if (this.get("isLocked") === true) { return false; }
-    this.toggleProperty("isHighlighted");
+    if (this.get("isLocked")) return false;
+    this.sendAction("onClickSelectionItem", [this.get("computedContent")]);
     return false;
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/none-category-row.js.es6 b/app/assets/javascripts/select-kit/components/none-category-row.js.es6
index 60b932920ee..7e92c2bc85c 100644
--- a/app/assets/javascripts/select-kit/components/none-category-row.js.es6
+++ b/app/assets/javascripts/select-kit/components/none-category-row.js.es6
@@ -1,10 +1,17 @@
 import CategoryRowComponent from "select-kit/components/category-row";
+import { categoryBadgeHTML } from "discourse/helpers/category-link";
+import computed from "ember-addons/ember-computed-decorators";
 
 export default CategoryRowComponent.extend({
   layoutName: "select-kit/templates/components/category-row",
   classNames: "none category-row",
 
-  click() {
-    this.sendAction("onClear");
+  @computed("category")
+  badgeForCategory(category) {
+    return categoryBadgeHTML(category, {
+      link: this.get("categoryLink"),
+      allowUncategorized: true,
+      hideParent: true
+    }).htmlSafe();
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/notifications-button.js.es6 b/app/assets/javascripts/select-kit/components/notifications-button.js.es6
index eaa9c6780f3..b7bd8dfa8c9 100644
--- a/app/assets/javascripts/select-kit/components/notifications-button.js.es6
+++ b/app/assets/javascripts/select-kit/components/notifications-button.js.es6
@@ -8,7 +8,6 @@ export default DropdownSelectBoxComponent.extend({
   nameProperty: "key",
   fullWidthOnMobile: true,
   content: allLevels,
-  collectionHeight: "auto",
   castInteger: true,
   autofilterable: false,
   filterable: false,
@@ -23,7 +22,7 @@ export default DropdownSelectBoxComponent.extend({
   iconForSelectedDetails: Ember.computed.alias("selectedDetails.icon"),
 
   computeHeaderContent() {
-    let content = this.baseHeaderComputedContent();
+    let content = this._super();
     content.name = I18n.t(`${this.get("i18nPrefix")}.${this.get("selectedDetails.key")}.title`);
     content.hasSelection = this.get("hasSelection");
     return content;
diff --git a/app/assets/javascripts/select-kit/components/period-chooser.js.es6 b/app/assets/javascripts/select-kit/components/period-chooser.js.es6
new file mode 100644
index 00000000000..847b9a4a4ad
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/period-chooser.js.es6
@@ -0,0 +1,30 @@
+import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
+import computed, { on } from "ember-addons/ember-computed-decorators";
+
+export default DropdownSelectBoxComponent.extend({
+  classNames: ["period-chooser"],
+  rowComponent: "period-chooser/period-chooser-row",
+  headerComponent: "period-chooser/period-chooser-header",
+  content: Ember.computed.alias("site.periods"),
+  value: Ember.computed.alias("period"),
+  isHidden: Ember.computed.alias("showPeriods"),
+
+  @computed("isExpanded")
+  caretIcon(isExpanded) {
+    return isExpanded ? "caret-up" : "caret-down";
+  },
+
+
+  @on("didReceiveAttrs")
+  _setFullDay() {
+    this.get("headerComponentOptions").setProperties({fullDay: this.get("fullDay")});
+    this.get("rowComponentOptions").setProperties({fullDay: this.get("fullDay")});
+  },
+
+
+  actions: {
+    onSelect() {
+      this.sendAction("action", this.get("computedValue"));
+    }
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-header.js.es6 b/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-header.js.es6
new file mode 100644
index 00000000000..99cd40352e0
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-header.js.es6
@@ -0,0 +1,6 @@
+import DropdownSelectBoxHeaderomponent from "select-kit/components/dropdown-select-box/dropdown-select-box-header";
+
+export default DropdownSelectBoxHeaderomponent.extend({
+  layoutName: "select-kit/templates/components/period-chooser/period-chooser-header",
+  classNames: "period-chooser-header"
+});
diff --git a/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js.es6 b/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js.es6
new file mode 100644
index 00000000000..0ab99cd42bc
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js.es6
@@ -0,0 +1,12 @@
+import DropdownSelectBoxRowComponent from "select-kit/components/dropdown-select-box/dropdown-select-box-row";
+import computed from "ember-addons/ember-computed-decorators";
+
+export default DropdownSelectBoxRowComponent.extend({
+  layoutName: "select-kit/templates/components/period-chooser/period-chooser-row",
+  classNames: "period-chooser-row",
+
+  @computed("computedContent")
+  title(computedContent) {
+    return I18n.t(`filters.top.${computedContent.name || 'this_week'}`).title;
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/pinned-options.js.es6 b/app/assets/javascripts/select-kit/components/pinned-options.js.es6
index ca4c65289c7..44a4f16612c 100644
--- a/app/assets/javascripts/select-kit/components/pinned-options.js.es6
+++ b/app/assets/javascripts/select-kit/components/pinned-options.js.es6
@@ -10,7 +10,7 @@ export default DropdownSelectBoxComponent.extend({
   autoHighlight() {},
 
   computeHeaderContent() {
-    let content = this.baseHeaderComputedContent();
+    let content = this._super();
     const pinnedGlobally = this.get("topic.pinned_globally");
     const pinned = this.get("computedValue");
     const globally = pinnedGlobally ? "_globally" : "";
@@ -44,13 +44,15 @@ export default DropdownSelectBoxComponent.extend({
     ]);
   },
 
-  mutateValue(value) {
-    const topic = this.get("topic");
+  actions: {
+    onSelect() {
+      const topic = this.get("topic");
 
-    if (value === "unpinned") {
-      topic.clearPin();
-    } else {
-      topic.rePin();
+      if (this.get("computedValue") === "unpinned") {
+        topic.clearPin();
+      } else {
+        topic.rePin();
+      }
     }
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/search-advanced-category-chooser.js.es6 b/app/assets/javascripts/select-kit/components/search-advanced-category-chooser.js.es6
index 7ed95af14a0..652ee3fce9d 100644
--- a/app/assets/javascripts/select-kit/components/search-advanced-category-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/search-advanced-category-chooser.js.es6
@@ -8,6 +8,7 @@ export default CategoryChooserComponent.extend({
   rootNoneLabel: "category.all",
   allowUncategorized: true,
   clearable: true,
+  permissionType: null,
 
   init() {
     this._super();
diff --git a/app/assets/javascripts/select-kit/components/select-kit.js.es6 b/app/assets/javascripts/select-kit/components/select-kit.js.es6
index 0e7546bae81..d07fe5cdc24 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6
@@ -1,18 +1,21 @@
-const { isNone } = Ember;
+const { get, isNone, run, isEmpty, makeArray } = Ember;
 import computed from "ember-addons/ember-computed-decorators";
 import UtilsMixin from "select-kit/mixins/utils";
 import DomHelpersMixin from "select-kit/mixins/dom-helpers";
 import EventsMixin from "select-kit/mixins/events";
 import PluginApiMixin from "select-kit/mixins/plugin-api";
 import {
-  applyContentPluginApiCallbacks
+  applyContentPluginApiCallbacks,
+  applyHeaderContentPluginApiCallbacks,
+  applyCollectionHeaderCallbacks
 } from "select-kit/mixins/plugin-api";
 
 export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixin, EventsMixin, {
   pluginApiIdentifiers: ["select-kit"],
   layoutName: "select-kit/templates/components/select-kit",
-  classNames: ["select-kit", "select-box-kit"],
+  classNames: ["select-kit"],
   classNameBindings: [
+    "isLoading",
     "isFocused",
     "isExpanded",
     "isDisabled",
@@ -20,23 +23,28 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
     "isAbove",
     "isBelow",
     "isLeftAligned",
-    "isRightAligned"
+    "isRightAligned",
+    "hasSelection",
+    "hasReachedMaximum",
+    "hasReachedMinimum",
   ],
   isDisabled: false,
   isExpanded: false,
   isFocused: false,
   isHidden: false,
+  isLoading: false,
+  isAsync: false,
   renderedBodyOnce: false,
   renderedFilterOnce: false,
   tabindex: 0,
   none: null,
-  highlightedValue: null,
-  noContentLabel: "select_kit.no_content",
+  highlighted: null,
   valueAttribute: "id",
   nameProperty: "name",
   autoFilterable: false,
   filterable: false,
   filter: "",
+  previousFilter: "",
   filterPlaceholder: "select_kit.filter_placeholder",
   filterIcon: "search",
   headerIcon: null,
@@ -48,20 +56,27 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
   headerComponent: "select-kit/select-kit-header",
   headerComponentOptions: null,
   headerComputedContent: null,
+  collectionHeaderComputedContent: null,
   collectionComponent: "select-kit/select-kit-collection",
-  collectionHeight: 200,
   verticalOffset: 0,
   horizontalOffset: 0,
   fullWidthOnMobile: false,
   castInteger: false,
+  castBoolean: false,
   allowAny: false,
   allowInitialValueMutation: false,
   content: null,
   computedContent: null,
-  limitMatches: 100,
+  limitMatches: null,
   nameChanges: false,
   allowContentReplacement: false,
   collectionHeader: null,
+  allowAutoSelectFirst: true,
+  highlightedSelection: null,
+  maximum: null,
+  minimum: null,
+  minimumLabel: null,
+  maximumLabel: null,
 
   init() {
     this._super();
@@ -70,9 +85,13 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
     this.set("headerComponentOptions", Ember.Object.create());
     this.set("rowComponentOptions", Ember.Object.create());
     this.set("computedContent", []);
+    this.set("highlightedSelection", []);
 
     if (this.site && this.site.isMobileDevice) {
-      this.setProperties({ filterable: false, autoFilterable: false });
+      this.setProperties({
+        filterable: isNone(this.get("filterable")) ? false : this.get("filterable"),
+        autoFilterable: isNone(this.get("autoFilterable")) ? false : this.get("filterable")
+      });
     }
 
     if (this.get("nameChanges")) {
@@ -82,11 +101,32 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
     if (this.get("allowContentReplacement")) {
       this.addObserver(`content.[]`, this, this._compute);
     }
+
+    if (this.get("isAsync")) {
+      this.addObserver(`asyncContent.[]`, this, this._compute);
+    }
+  },
+
+  keyDown(event) {
+    if (!isEmpty(this.get("filter"))) return true;
+
+    const keyCode = event.keyCode || event.which;
+
+    if (event.metaKey === true && keyCode === this.keys.A) {
+      this.didPressSelectAll();
+      return false;
+    }
+
+    if (keyCode === this.keys.BACKSPACE) {
+      this.didPressBackspace();
+      return false;
+    }
   },
 
   willDestroyElement() {
     this.removeObserver(`content.@each.${this.get("nameProperty")}`, this, this._compute);
     this.removeObserver(`content.[]`, this, this._compute);
+    this.removeObserver(`asyncContent.[]`, this, this._compute);
   },
 
   willComputeAttributes() {},
@@ -105,15 +145,18 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
   },
   didComputeContent() {},
 
-  computeHeaderContent() {
-    return this.baseHeaderComputedContent();
+  willComputeAsyncContent(content) { return content; },
+  computeAsyncContent(content) { return content; },
+  _beforeDidComputeAsyncContent(content) {
+    content = applyContentPluginApiCallbacks(this.get("pluginApiIdentifiers"), content, this);
+    this.setProperties({
+      computedAsyncContent: content.map(c => this.computeAsyncContentItem(c))
+    });
+    return content;
   },
+  didComputeAsyncContent() {},
 
   computeContentItem(contentItem, options) {
-    return this.baseComputedContentItem(contentItem, options);
-  },
-
-  baseComputedContentItem(contentItem, options) {
     let originalContent;
     options = options || {};
     const name = options.name;
@@ -126,47 +169,99 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
       originalContent = contentItem;
     }
 
-    return {
-      value: this._castInteger(this.valueForContentItem(contentItem)),
+    let computedContentItem = {
+      value: this._cast(this.valueForContentItem(contentItem)),
       name: name || this._nameForContent(contentItem),
       locked: false,
       created: options.created || false,
+      __sk_row_type: options.created ? "createRow" : null,
       originalContent
     };
+
+    return computedContentItem;
+  },
+
+  computeAsyncContentItem(contentItem, options) {
+    return this.computeContentItem(contentItem, options);
+  },
+
+  @computed("isAsync", "isLoading", "filteredAsyncComputedContent.[]", "filteredComputedContent.[]")
+  collectionComputedContent(isAsync, isLoading, filteredAsyncComputedContent, filteredComputedContent) {
+    if (isAsync) {
+      return isLoading ? [] : filteredAsyncComputedContent;
+    } else {
+      return filteredComputedContent;
+    }
+  },
+
+  validateCreate() { return !this.get("hasReachedMaximum"); },
+
+  validateSelect() { return !this.get("hasReachedMaximum"); },
+
+  @computed("maximum", "selection.[]")
+  hasReachedMaximum(maximum, selection) {
+    if (!maximum) return false;
+    selection = makeArray(selection);
+    return selection.length >= maximum;
+  },
+
+  @computed("minimum", "selection.[]")
+  hasReachedMinimum(minimum, selection) {
+    if (!minimum) return true;
+    selection = makeArray(selection);
+    return selection.length >= minimum;
   },
 
   @computed("shouldFilter", "allowAny", "filter")
   shouldDisplayFilter(shouldFilter, allowAny, filter) {
-    if (shouldFilter === true) return true;
-    if (allowAny === true && filter.length > 0) return true;
+    if (shouldFilter) return true;
+    if (allowAny && filter.length > 0) return true;
     return false;
   },
 
-  @computed("filter", "filteredComputedContent.[]")
-  shouldDisplayNoContentRow(filter, filteredComputedContent) {
-    return filter.length > 0 && filteredComputedContent.length === 0;
+  @computed("filter", "collectionComputedContent.[]", "isLoading")
+  noContentRow(filter, collectionComputedContent, isLoading) {
+    if (filter.length > 0 && collectionComputedContent.length === 0 && !isLoading) {
+      return I18n.t("select_kit.no_content");
+    }
+  },
+
+  @computed("hasReachedMaximum", "hasReachedMinimum", "isExpanded")
+  validationMessage(hasReachedMaximum, hasReachedMinimum) {
+    if (hasReachedMaximum && this.get("maximum")) {
+      const key = this.get("maximumLabel") || "select_kit.max_content_reached";
+      return I18n.t(key, { count: this.get("maximum") });
+    }
+
+    if (!hasReachedMinimum && this.get("minimum")) {
+      const key = this.get("minimumLabel") || "select_kit.min_content_not_reached";
+      return I18n.t(key, { count: this.get("minimum") });
+    }
   },
 
   @computed("filter", "filterable", "autoFilterable", "renderedFilterOnce")
   shouldFilter(filter, filterable, autoFilterable, renderedFilterOnce) {
-    if (renderedFilterOnce === true && filterable === true) return true;
-    if (filterable === true) return true;
-    if (autoFilterable === true && filter.length > 0) return true;
+    if (renderedFilterOnce && filterable) return true;
+    if (filterable) return true;
+    if (autoFilterable && filter.length > 0) return true;
     return false;
   },
 
-  @computed("filter", "computedContent")
-  shouldDisplayCreateRow(filter, computedContent) {
-    if (computedContent.map(c => c.value).includes(filter)) return false;
-    if (this.get("allowAny") === true && filter.length > 0) return true;
+  @computed("computedValue", "filter", "collectionComputedContent.[]", "hasReachedMaximum", "isLoading")
+  shouldDisplayCreateRow(computedValue, filter, collectionComputedContent, hasReachedMaximum, isLoading) {
+    if (isLoading || hasReachedMaximum) return false;
+    if (collectionComputedContent.map(c => c.value).includes(filter)) return false;
+    if (this.get("allowAny") && filter.length > 0 && this.validateCreate(filter)) return true;
     return false;
   },
 
   @computed("filter", "shouldDisplayCreateRow")
   createRowComputedContent(filter, shouldDisplayCreateRow) {
-    if (shouldDisplayCreateRow === true) {
+    if (shouldDisplayCreateRow) {
       let content = this.createContentFromInput(filter);
-      return this.computeContentItem(content, { created: true });
+      let computedContentItem = this.computeContentItem(content, { created: true });
+      computedContentItem.__sk_row_type = "createRow";
+      return computedContentItem;
     }
   },
 
@@ -179,7 +274,7 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
   @computed("filter")
   templateForCreateRow() {
     return (rowComponent) => {
-      return I18n.t("select_box.create", {
+      return I18n.t("select_kit.create", {
         content: rowComponent.get("computedContent.name")
       });
     };
@@ -187,63 +282,142 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
 
   @computed("none")
   noneRowComputedContent(none) {
-    if (isNone(none)) { return null; }
+    if (isNone(none)) return null;
+
+    let noneRowComputedContent;
 
     switch (typeof none) {
     case "string":
-      return this.computeContentItem(this.noneValue, {
-        name: I18n.t(none).htmlSafe()
+      noneRowComputedContent = this.computeContentItem(this.noneValue, {
+        name: (I18n.t(none) || "").htmlSafe()
       });
+      break;
     default:
-      return this.computeContentItem(none);
+      noneRowComputedContent = this.computeContentItem(none);
     }
+
+    noneRowComputedContent.__sk_row_type = "noneRow";
+
+    return noneRowComputedContent;
   },
 
   createContentFromInput(input) { return input; },
 
-  willSelect() {
-    this.clearFilter();
-    this.set("highlightedValue", null);
-  },
-  didSelect() {
-    this.collapse();
-    this.focus();
+  highlightSelection(items) {
+    this.propertyWillChange("highlightedSelection");
+    this.set("highlightedSelection", makeArray(items));
+    this.propertyDidChange("highlightedSelection");
   },
 
-  willDeselect() {
-    this.clearFilter();
-    this.set("highlightedValue", null);
-  },
-  didDeselect() {
-    this.collapse();
-    this.focus();
+  clearHighlightSelection() {
+    this.highlightSelection([]);
   },
 
+  willSelect() {},
+  didSelect() {},
+
+  willCreate() {},
+  didCreate() {},
+
+  willDeselect() {},
+  didDeselect() {},
+
   clearFilter() {
     this.$filterInput().val("");
-    this.setProperties({ filter: "" });
+    this.setProperties({ filter: "", previousFilter: "" });
+  },
+
+  startLoading() {
+    this.set("isLoading", true);
+    this.set("highlighted", null);
+    this._boundaryActionHandler("onStartLoading");
+  },
+
+  stopLoading() {
+    if (this.site && !this.site.isMobileDevice) {
+      this.focusFilterOrHeader();
+    }
+
+    this.set("isLoading", false);
+    this._boundaryActionHandler("onStopLoading");
+  },
+
+  @computed("selection.[]", "isExpanded", "filter", "highlightedSelection.[]")
+  collectionHeaderComputedContent() {
+    return applyCollectionHeaderCallbacks(
+      this.get("pluginApiIdentifiers"),
+      this.get("collectionHeader"),
+      this
+    );
+  },
+
+  @computed("selection.[]", "isExpanded", "headerIcon")
+  headerComputedContent() {
+    return applyHeaderContentPluginApiCallbacks(
+      this.get("pluginApiIdentifiers"),
+      this.computeHeaderContent(),
+      this
+    );
+  },
+
+  _boundaryActionHandler(actionName, ...params) {
+    if (get(this.actions, actionName)) {
+      run.next(() => this.send(actionName, ...params));
+    } else if (this.get(actionName)) {
+      run.next(() => this.get(actionName)());
+    }
+  },
+
+  highlight(computedContent) {
+    this.set("highlighted", computedContent);
+    this._boundaryActionHandler("onHighlight", computedContent);
+  },
+
+  clearSelection() {
+    this.deselect(this.get("selection"));
+    this.focus();
   },
 
   actions: {
     onToggle() {
-      if (this.get("onToggle")) this.sendAction("onToggle");
-      if (this.get("onCollapse") && this.get("isExpanded") === true) this.sendAction("onCollapse");
-      if (this.get("onExpand") && this.get("isExpanded") === false) this.sendAction("onExpand");
+      this.clearHighlightSelection();
 
-      this.get("isExpanded") === true ? this.collapse() : this.expand();
+      if (this.get("isExpanded")) {
+        this.collapse();
+      } else {
+        this.expand();
+      }
     },
 
-    onHighlight(rowComputedContent) {
-      this.set("highlightedValue", rowComputedContent.value);
+    onClickRow(computedContentItem) {
+      this.didClickRow(computedContentItem);
     },
 
-    onFilter(filter) {
+    onClickSelectionItem(computedContentItem) {
+      this.didClickSelectionItem(computedContentItem);
+    },
+
+    onClearSelection() {
+      this.clearSelection();
+    },
+
+    onMouseoverRow(computedContentItem) {
+      this.highlight(computedContentItem);
+    },
+
+    onFilterComputedContent(filter) {
+      if (filter === this.get("previousFilter")) return;
+
+      this.clearHighlightSelection();
+
       this.setProperties({
-        highlightedValue: null,
+        highlighted: null,
         renderedFilterOnce: true,
+        previousFilter: filter,
         filter
       });
       this.autoHighlight();
+      this._boundaryActionHandler("onFilter", filter);
     }
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-collection.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-collection.js.es6
index 67508609d2a..3dd760e985f 100644
--- a/app/assets/javascripts/select-kit/components/select-kit/select-kit-collection.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-collection.js.es6
@@ -1,5 +1,5 @@
 export default Ember.Component.extend({
   layoutName: "select-kit/templates/components/select-kit/select-kit-collection",
-  classNames: ["select-kit-collection", "select-box-kit-collection"],
+  classNames: ["select-kit-collection"],
   tagName: "ul"
 });
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-create-row.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-create-row.js.es6
index 390408349b9..4ab476091c0 100644
--- a/app/assets/javascripts/select-kit/components/select-kit/select-kit-create-row.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-create-row.js.es6
@@ -2,9 +2,5 @@ import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-r
 
 export default SelectKitRowComponent.extend({
   layoutName: "select-kit/templates/components/select-kit/select-kit-row",
-  classNames: "create",
-
-  click() {
-    this.sendAction("onCreate", this.get("computedContent"));
-  },
+  classNames: "create"
 });
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js.es6
index f60a627de85..426261f4bfb 100644
--- a/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js.es6
@@ -1,6 +1,14 @@
+import computed from "ember-addons/ember-computed-decorators";
+const { isEmpty } = Ember;
+
 export default Ember.Component.extend({
   layoutName: "select-kit/templates/components/select-kit/select-kit-filter",
-  classNames: ["select-kit-filter", "select-box-kit-filter"],
+  classNames: ["select-kit-filter"],
   classNameBindings: ["isFocused", "isHidden"],
-  isHidden: Ember.computed.not("shouldDisplayFilter")
+  isHidden: Ember.computed.not("shouldDisplayFilter"),
+
+  @computed("placeholder")
+  computedPlaceholder(placeholder) {
+    return isEmpty(placeholder) ? "" : I18n.t(placeholder);
+  }
 });
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6
index b7705fa9991..207de3259fa 100644
--- a/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6
@@ -1,21 +1,24 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
+const { isEmpty, makeArray } = Ember;
 
 export default Ember.Component.extend({
   layoutName: "select-kit/templates/components/select-kit/select-kit-header",
-  classNames: ["select-kit-header", "select-box-kit-header"],
-  classNameBindings: ["isFocused"],
+  classNames: ["select-kit-header"],
+  classNameBindings: ["isFocused", "isNone"],
   attributeBindings: [
     "tabindex",
     "ariaLabel:aria-label",
     "ariaHasPopup:aria-haspopup",
-    "title",
+    "sanitizedTitle:title",
     "value:data-value",
     "name:data-name",
   ],
 
+  isNone: Ember.computed.none("computedContent.value"),
+
   ariaHasPopup: true,
 
-  ariaLabel: Ember.computed.or("computedContent.ariaLabel", "title"),
+  ariaLabel: Ember.computed.or("computedContent.ariaLabel", "sanitizedTitle"),
 
   @computed("computedContent.title", "name")
   title(computedContentTitle, name) {
@@ -25,6 +28,13 @@ export default Ember.Component.extend({
     return null;
   },
 
+  // this might need a more advanced solution
+  // but atm it's the only case we have to handle
+  @computed("title")
+  sanitizedTitle(title) {
+    return String(title).replace("&hellip;", "");
+  },
+
   label: Ember.computed.or("computedContent.label", "title", "name"),
 
   name: Ember.computed.alias("computedContent.name"),
@@ -33,7 +43,7 @@ export default Ember.Component.extend({
 
   @computed("computedContent.icon", "computedContent.icons")
   icons(icon, icons) {
-    return Ember.makeArray(icon).concat(icons).filter(i => !Ember.isEmpty(i));
+    return makeArray(icon).concat(icons).filter(i => !isEmpty(i));
   },
 
   click() {
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-none-row.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-none-row.js.es6
index 542b9472c41..49b922d14b9 100644
--- a/app/assets/javascripts/select-kit/components/select-kit/select-kit-none-row.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-none-row.js.es6
@@ -2,9 +2,5 @@ import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-r
 
 export default SelectKitRowComponent.extend({
   layoutName: "select-kit/templates/components/select-kit/select-kit-row",
-  classNames: "none",
-
-  click() {
-    this.sendAction("onClear");
-  }
+  classNames: "none"
 });
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js.es6
index d4638a9386d..ab08156148d 100644
--- a/app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js.es6
@@ -5,7 +5,7 @@ import UtilsMixin from "select-kit/mixins/utils";
 
 export default Ember.Component.extend(UtilsMixin, {
   layoutName: "select-kit/templates/components/select-kit/select-kit-row",
-  classNames: ["select-kit-row", "select-box-kit-row"],
+  classNames: ["select-kit-row"],
   tagName: "li",
   tabIndex: -1,
   attributeBindings: [
@@ -13,7 +13,8 @@ export default Ember.Component.extend(UtilsMixin, {
     "title",
     "value:data-value",
     "name:data-name",
-    "ariaLabel:aria-label"
+    "ariaLabel:aria-label",
+    "guid:data-guid"
   ],
   classNameBindings: ["isHighlighted", "isSelected"],
 
@@ -27,6 +28,9 @@ export default Ember.Component.extend(UtilsMixin, {
     return null;
   },
 
+  @computed("computedContent")
+  guid(computedContent) { return Ember.guidFor(computedContent); },
+
   label: Ember.computed.or("computedContent.label", "title", "name"),
 
   name: Ember.computed.alias("computedContent.name"),
@@ -39,7 +43,7 @@ export default Ember.Component.extend(UtilsMixin, {
   @on("didReceiveAttrs")
   _setSelectionState() {
     this.set("isSelected", this.get("computedValue") === this.get("value"));
-    this.set("isHighlighted", this.get("highlightedValue") === this.get("value"));
+    this.set("isHighlighted", this.get("highlighted.value") === this.get("value"));
   },
 
   @on("willDestroyElement")
@@ -57,14 +61,14 @@ export default Ember.Component.extend(UtilsMixin, {
   },
 
   mouseEnter() {
-    this.set("hoverDebounce", run.debounce(this, this._sendOnHighlightAction, 32));
+    this.set("hoverDebounce", run.debounce(this, this._sendMouseoverAction, 32));
   },
 
   click() {
-    this.sendAction("onSelect", this.get("computedContent"));
+    this.sendAction("onClickRow", this.get("computedContent"));
   },
 
-  _sendOnHighlightAction() {
-    this.sendAction("onHighlight", this.get("computedContent"));
+  _sendMouseoverAction() {
+    this.sendAction("onMouseoverRow", this.get("computedContent"));
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/single-select.js.es6 b/app/assets/javascripts/select-kit/components/single-select.js.es6
index 8e2a35a5ef4..e10ae018aa0 100644
--- a/app/assets/javascripts/select-kit/components/single-select.js.es6
+++ b/app/assets/javascripts/select-kit/components/single-select.js.es6
@@ -1,13 +1,14 @@
 import SelectKitComponent from "select-kit/components/select-kit";
-import { on } from "ember-addons/ember-computed-decorators";
-import computed from "ember-addons/ember-computed-decorators";
-const { get, isNone, isEmpty, isPresent, run } = Ember;
+import { default as computed, on } from 'ember-addons/ember-computed-decorators';
+const { get, isNone, isEmpty, isPresent, run, makeArray } = Ember;
+
 import {
-  applyOnSelectPluginApiCallbacks
+  applyOnSelectPluginApiCallbacks,
 } from "select-kit/mixins/plugin-api";
 
 export default SelectKitComponent.extend({
   pluginApiIdentifiers: ["single-select"],
+  layoutName: "select-kit/templates/components/single-select",
   classNames: "single-select",
   computedValue: null,
   value: null,
@@ -17,16 +18,21 @@ export default SelectKitComponent.extend({
   _compute() {
     run.scheduleOnce("afterRender", () => {
       this.willComputeAttributes();
-      let content = this.willComputeContent(this.get("content") || []);
+      let content = this.get("content") || [];
+      let asyncContent = this.get("asyncContent") || [];
+      content = this.willComputeContent(content);
+      asyncContent = this.willComputeAsyncContent(asyncContent);
       let value = this._beforeWillComputeValue(this.get("value"));
       content = this.computeContent(content);
+      asyncContent = this.computeAsyncContent(asyncContent);
       content = this._beforeDidComputeContent(content);
+      asyncContent = this._beforeDidComputeAsyncContent(asyncContent);
       value = this.willComputeValue(value);
       value = this.computeValue(value);
       value = this._beforeDidComputeValue(value);
       this.didComputeContent(content);
+      this.didComputeAsyncContent(asyncContent);
       this.didComputeValue(value);
-      this.set("headerComputedContent", this.computeHeaderContent());
       this.didComputeAttributes();
 
       if (this.get("allowInitialValueMutation")) this.mutateAttributes();
@@ -34,13 +40,11 @@ export default SelectKitComponent.extend({
   },
 
   mutateAttributes() {
-    if (this.get("isDestroyed") || this.get("isDestroying")) return;
-
     run.next(() => {
+      if (this.get("isDestroyed") || this.get("isDestroying")) return;
+
       this.mutateContent(this.get("computedContent"));
       this.mutateValue(this.get("computedValue"));
-      applyOnSelectPluginApiCallbacks(this.get("pluginApiIdentifiers"), this.get("computedValue"), this);
-      this.set("headerComputedContent", this.computeHeaderContent());
     });
   },
   mutateContent() {},
@@ -49,14 +53,17 @@ export default SelectKitComponent.extend({
   },
 
   _beforeWillComputeValue(value) {
-    if (!isEmpty(this.get("content")) && isEmpty(value) && isNone(this.get("none"))) {
-      value = this.valueForContentItem(get(this.get("content"), "firstObject"));
+    if (!isEmpty(this.get("content")) &&
+      isEmpty(value) &&
+      isNone(this.get("none")) &&
+      this.get("allowAutoSelectFirst")) {
+        value = this.valueForContentItem(get(this.get("content"), "firstObject"));
     }
 
     switch (typeof value) {
     case "string":
     case "number":
-      return this._castInteger(value === "" ? null : value);
+      return this._cast(value === "" ? null : value);
     default:
       return value;
     }
@@ -76,98 +83,160 @@ export default SelectKitComponent.extend({
     });
   },
 
-  baseHeaderComputedContent() {
-    return {
+  computeHeaderContent() {
+    let content = {
       title: this.get("title"),
-      icons: Ember.makeArray(this.getWithDefault("headerIcon", [])),
-      value: this.get("selectedComputedContent.value"),
-      name: this.get("selectedComputedContent.name") || this.get("noneRowComputedContent.name")
+      icons: makeArray(this.getWithDefault("headerIcon", [])),
+      value: this.get("selection.value"),
+      name: this.get("selection.name") || this.get("noneRowComputedContent.name")
     };
+
+    if (this.get("noneLabel") && !this.get("hasSelection")) {
+      content.title = content.name = I18n.t(this.get("noneLabel"));
+    }
+
+    return content;
+  },
+
+  @computed("computedAsyncContent.[]", "computedValue")
+  filteredAsyncComputedContent(computedAsyncContent, computedValue) {
+    computedAsyncContent = computedAsyncContent.filter(c => {
+      return computedValue !== get(c, "value");
+    });
+
+    if (this.get("limitMatches")) {
+      return computedAsyncContent.slice(0, this.get("limitMatches"));
+    }
+
+    return computedAsyncContent;
   },
 
   @computed("computedContent.[]", "computedValue", "filter", "shouldFilter")
   filteredComputedContent(computedContent, computedValue, filter, shouldFilter) {
-    if (shouldFilter === true) {
+    if (shouldFilter) {
       computedContent = this.filterComputedContent(computedContent, computedValue, filter);
     }
 
-    return computedContent.slice(0, this.get("limitMatches"));
+    if (this.get("limitMatches")) {
+      return computedContent.slice(0, this.get("limitMatches"));
+    }
+
+    return computedContent;
   },
 
   @computed("computedValue", "computedContent.[]")
-  selectedComputedContent(computedValue, computedContent) {
+  selection(computedValue, computedContent) {
     return computedContent.findBy("value", computedValue);
   },
 
-  @computed("selectedComputedContent")
-  hasSelection(selectedComputedContent) {
-    return selectedComputedContent !== this.get("noneRowComputedContent") &&
-      !Ember.isNone(selectedComputedContent);
+  @computed("selection")
+  hasSelection(selection) {
+    return selection !== this.get("noneRowComputedContent") && !isNone(selection);
   },
 
-  @computed("filter", "computedValue")
-  shouldDisplayCreateRow(filter, computedValue) {
+  @computed("computedValue", "filter", "collectionComputedContent.[]", "hasReachedMaximum", "hasReachedMinimum")
+  shouldDisplayCreateRow(computedValue, filter) {
     return this._super() && computedValue !== filter;
   },
 
   autoHighlight() {
     run.schedule("afterRender", () => {
-      if (!isNone(this.get("highlightedValue"))) { return; }
-
-      const filteredComputedContent = this.get("filteredComputedContent");
-      const displayCreateRow = this.get("shouldDisplayCreateRow");
-      const none = this.get("noneRowComputedContent");
-
-      if (this.get("hasSelection") && isEmpty(this.get("filter"))) {
-        this.send("onHighlight", this.get("selectedComputedContent"));
+      if (this.get("shouldDisplayCreateRow")) {
+        this.highlight(this.get("createRowComputedContent"));
         return;
       }
 
-      if (isNone(this.get("highlightedValue")) && !isEmpty(filteredComputedContent)) {
-        this.send("onHighlight", get(filteredComputedContent, "firstObject"));
+      if (!isEmpty(this.get("filter")) && !isEmpty(this.get("collectionComputedContent"))) {
+        this.highlight(this.get("collectionComputedContent.firstObject"));
         return;
       }
 
-      if (displayCreateRow === true && isEmpty(filteredComputedContent)) {
-        this.send("onHighlight", this.get("createRowComputedContent"));
+      if (!this.get("isAsync") && this.get("hasSelection") && isEmpty(this.get("filter"))) {
+        this.highlight(get(makeArray(this.get("selection")), "firstObject"));
+        return;
       }
-      else if (!isEmpty(filteredComputedContent)) {
-        this.send("onHighlight", get(filteredComputedContent, "firstObject"));
+
+      if (!this.get("isAsync") && !this.get("hasSelection") && isEmpty(this.get("filter")) && !isEmpty(this.get("collectionComputedContent"))) {
+        this.highlight(this.get("collectionComputedContent.firstObject"));
+        return;
       }
-      else if (isEmpty(filteredComputedContent) && isPresent(none) && displayCreateRow === false) {
-        this.send("onHighlight", none);
+
+      if (isPresent(this.get("noneRowComputedContent"))) {
+        this.highlight(this.get("noneRowComputedContent"));
+        return;
       }
     });
   },
 
-  validateComputedContentItem(computedContentItem) {
-    return this.get("computedValue") !== computedContentItem.value;
+  select(computedContentItem) {
+    if (!computedContentItem || computedContentItem.__sk_row_type === "noneRow") {
+      this.clearSelection();
+      return;
+    }
+
+    if (computedContentItem.__sk_row_type === "createRow") {
+      if (this.get("computedValue") !== computedContentItem.value &&
+          this.validateCreate(computedContentItem.value)) {
+        this.willCreate(computedContentItem);
+        computedContentItem.__sk_row_type = null;
+        this.get("computedContent").pushObject(computedContentItem);
+
+        run.schedule("afterRender", () => {
+          this.didCreate(computedContentItem);
+          this._boundaryActionHandler("onCreate");
+        });
+
+        this.select(computedContentItem);
+        return;
+      } else {
+        this._boundaryActionHandler("onCreateFailure");
+        return;
+      }
+    }
+
+    if (this.validateSelect(computedContentItem)) {
+      this.willSelect(computedContentItem);
+      this.clearFilter();
+      this.setProperties({ highlighted: null, computedValue: computedContentItem.value });
+
+      run.next(() => this.mutateAttributes());
+
+      run.schedule("afterRender", () => {
+        this.didSelect(computedContentItem);
+
+        applyOnSelectPluginApiCallbacks(
+          this.get("pluginApiIdentifiers"),
+          computedContentItem.value,
+          this
+        );
+
+        this._boundaryActionHandler("onSelect", computedContentItem.value);
+
+        this.autoHighlight();
+      });
+    } else {
+      this._boundaryActionHandler("onSelectFailure");
+    }
   },
 
-  actions: {
-    onClear() {
-      this.send("onDeselect", this.get("selectedComputedContent"));
-    },
+  deselect(computedContentItem) {
+    makeArray(computedContentItem).forEach((item) => {
+      this.willDeselect(item);
 
-    onCreate(computedContentItem) {
-      if (this.validateComputedContentItem(computedContentItem)) {
-        this.get("computedContent").pushObject(computedContentItem);
-        this.send("onSelect", computedContentItem);
-      }
-    },
+      this.clearFilter();
 
-    onSelect(rowComputedContentItem) {
-      this.willSelect(rowComputedContentItem);
-      this.set("computedValue", rowComputedContentItem.value);
-      this.mutateAttributes();
-      run.schedule("afterRender", () => this.didSelect(rowComputedContentItem));
-    },
+      this.setProperties({
+        computedValue: null,
+        highlighted: null,
+        highlightedSelection: []
+      });
 
-    onDeselect(rowComputedContentItem) {
-      this.willDeselect(rowComputedContentItem);
-      this.set("computedValue", null);
-      this.mutateAttributes();
-      run.schedule("afterRender", () => this.didDeselect(rowComputedContentItem));
-    }
+      run.next(() => this.mutateAttributes());
+      run.schedule("afterRender", () => {
+        this.didDeselect(item);
+        this._boundaryActionHandler("onDeselect", item);
+        this.autoHighlight();
+      });
+    });
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/tag-chooser.js.es6 b/app/assets/javascripts/select-kit/components/tag-chooser.js.es6
new file mode 100644
index 00000000000..de5341c32ac
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/tag-chooser.js.es6
@@ -0,0 +1,123 @@
+import MultiSelectComponent from "select-kit/components/multi-select";
+import Tags from "select-kit/mixins/tags";
+import renderTag from "discourse/lib/render-tag";
+import computed from "ember-addons/ember-computed-decorators";
+const { get, run, makeArray } = Ember;
+
+export default MultiSelectComponent.extend(Tags, {
+  pluginApiIdentifiers: ["tag-chooser"],
+  classNames: "tag-chooser",
+  isAsync: true,
+  filterable: true,
+  filterPlaceholder: "tagging.choose_for_topic",
+  limit: null,
+  blacklist: null,
+  attributeBindings: ["categoryId"],
+  allowAny: Ember.computed.alias("allowCreate"),
+
+  init() {
+    this._super();
+
+    if (this.get("allowCreate") !== false) {
+      this.set("allowCreate", this.site.get("can_create_tag"));
+    }
+
+    if (!this.get("blacklist")) {
+      this.set("blacklist", []);
+    }
+
+    this.set("termMatchesForbidden", false);
+
+    this.set("templateForRow", (rowComponent) => {
+      const tag = rowComponent.get("computedContent");
+      return renderTag(get(tag, "value"), {
+        count: get(tag, "originalContent.count"),
+        noHref: true
+      });
+    });
+
+    if (!this.get("unlimitedTagCount")) {
+      this.set("maximum", parseInt(this.get("limit") || this.get("maximum") || this.get("siteSettings.max_tags_per_topic")));
+    }
+  },
+
+  mutateValues(values) {
+    this.set("tags", values.filter(v => v));
+  },
+
+  @computed("tags")
+  values(tags) {
+    return makeArray(tags);
+  },
+
+  @computed("tags")
+  content(tags) {
+    return makeArray(tags);
+  },
+
+  actions: {
+    onFilter(filter) {
+      this.expand();
+      this.set("searchDebounce", run.debounce(this, this._prepareSearch, filter, 200));
+    },
+
+    onExpand() {
+      this.set("searchDebounce", run.debounce(this, this._prepareSearch, this.get("filter"), 200));
+    },
+
+    onDeselect() {
+      this.set("searchDebounce", run.debounce(this, this._prepareSearch, this.get("filter"), 200));
+    },
+
+    onSelect() {
+      this.set("searchDebounce", run.debounce(this, this._prepareSearch, this.get("filter"), 50));
+    }
+  },
+
+  _prepareSearch(query) {
+    const selectedTags = makeArray(this.get("values")).filter(t => t);
+
+    const data = {
+      q: query,
+      limit: this.get("siteSettings.max_tag_search_results"),
+      categoryId: this.get("categoryId")
+    };
+
+    if (selectedTags.length || this.get("blacklist").length) {
+      data.selected_tags = _.uniq(selectedTags.concat(this.get("blacklist")))
+                            .slice(0, 100);
+    }
+
+    if (!this.get("everyTag")) data.filterForInput = true;
+
+    this.searchTags("/tags/filter/search", data, this._transformJson);
+  },
+
+  _transformJson(context, json) {
+    let results = json.results;
+
+    context.set("termMatchesForbidden", json.forbidden ? true : false);
+
+    if (context.get("blacklist")) {
+      results = results.filter(result => {
+        return !context.get("blacklist").includes(result.id);
+      });
+    }
+
+    if (context.get("siteSettings.tags_sort_alphabetically")) {
+      results = results.sort((a, b) => a.id > b.id);
+    }
+
+    results = results.map(result => {
+      return { id: result.text, name: result.text, count: result.count };
+    });
+
+    // if forbidden we probably have an existing tag which is not in the list of
+    // returned tags, so we manually add it at the top
+    if (json.forbidden) {
+      results.unshift({ id: json.forbidden, name: json.forbidden, count: 0 });
+    }
+
+    return results;
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/tag-drop.js.es6 b/app/assets/javascripts/select-kit/components/tag-drop.js.es6
new file mode 100644
index 00000000000..e5082277474
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/tag-drop.js.es6
@@ -0,0 +1,130 @@
+import ComboBoxComponent from "select-kit/components/combo-box";
+import DiscourseURL from "discourse/lib/url";
+import { default as computed } from "ember-addons/ember-computed-decorators";
+const { isEmpty } = Ember;
+
+export default ComboBoxComponent.extend({
+  pluginApiIdentifiers: ["tag-drop"],
+  classNameBindings: ["categoryStyle", "tagClass"],
+  classNames: "tag-drop",
+  verticalOffset: 3,
+  value: Ember.computed.alias("tagId"),
+  headerComponent: "tag-drop/tag-drop-header",
+  rowComponent: "tag-drop/tag-drop-row",
+  allowAutoSelectFirst: false,
+  tagName: "li",
+  showFilterByTag: Ember.computed.alias("siteSettings.show_filter_by_tag"),
+  currentCategory: Ember.computed.or("secondCategory", "firstCategory"),
+  tagId: null,
+  categoryStyle: Ember.computed.alias("siteSettings.category_style"),
+  mutateAttributes() {},
+  fullWidthOnMobile: true,
+  caretDownIcon: "caret-right",
+  caretUpIcon: "caret-down",
+
+  @computed("tagId")
+  noTagsSelected() {
+    return this.get("tagId") === "none";
+  },
+
+  @computed("showFilterByTag", "content")
+  isHidden(showFilterByTag, content) {
+    if (showFilterByTag && !isEmpty(content)) return false;
+    return true;
+  },
+
+  @computed("content")
+  filterable(content) {
+    return content && content.length >= 15;
+  },
+
+  computeHeaderContent() {
+    let content = this._super();
+
+    if (!content.value) {
+      if (this.get("noTagsSelected")) {
+        content.label = this.get("noTagsLabel");
+      } else {
+        content.label = this.get("allTagsLabel");
+      }
+    }
+
+    return content;
+  },
+
+  @computed("tagId")
+  tagClass(tagId) {
+    return tagId ? `tag-${tagId}` : "tag_all";
+  },
+
+  @computed("firstCategory", "secondCategory")
+  allTagsUrl() {
+    if (this.get("currentCategory")) {
+      return this.get("currentCategory.url") + "?allTags=1";
+    } else {
+      return "/";
+    }
+  },
+
+  @computed("firstCategory", "secondCategory")
+  noTagsUrl() {
+    var url = "/tags";
+    if (this.get("currentCategory")) {
+      url += this.get("currentCategory.url");
+    }
+    return `${url}/none`;
+  },
+
+  @computed("allTagsUrl", "allTagsLabel", "noTagsUrl", "noTagsLabel")
+  collectionHeader(allTagsUrl, allTagsLabel, noTagsUrl, noTagsLabel) {
+    let content = "";
+
+    if (this.get("tagId") !== "none") {
+      content += `
+        <a href="${noTagsUrl}" class="tag-filter">
+          ${noTagsLabel}
+        </a>
+      `;
+    }
+
+    if (this.get("hasSelection") || this.get("tagId") === "none") {
+      content += `
+        <a href="${allTagsUrl}" class="tag-filter">
+          ${allTagsLabel}
+        </a>
+      `;
+    }
+
+    return content;
+  },
+
+  @computed("tag")
+  allTagsLabel() {
+    return I18n.t("tagging.selector_all_tags");
+  },
+
+  @computed("tag")
+  noTagsLabel() {
+    return I18n.t("tagging.selector_no_tags");
+  },
+
+  @computed("site.top_tags")
+  content(topTags) {
+    if (this.siteSettings.tags_sort_alphabetically && topTags) {
+      return topTags.sort();
+    } else {
+      return topTags;
+    }
+  },
+
+  actions: {
+    onSelect(tagId) {
+      let url = "/tags";
+      if (this.get("currentCategory")) {
+        url += this.get("currentCategory.url");
+      }
+      url = `${url}/${tagId}`;
+      DiscourseURL.routeTo(url);
+    }
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/tag-drop/tag-drop-header.js.es6 b/app/assets/javascripts/select-kit/components/tag-drop/tag-drop-header.js.es6
new file mode 100644
index 00000000000..4b243f4580c
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/tag-drop/tag-drop-header.js.es6
@@ -0,0 +1,6 @@
+import ComboBoxSelectBoxHeaderComponent from "select-kit/components/combo-box/combo-box-header";
+
+export default ComboBoxSelectBoxHeaderComponent.extend({
+  layoutName: "select-kit/templates/components/tag-drop/tag-drop-header",
+  classNames: "tag-drop-header",
+});
diff --git a/app/assets/javascripts/select-kit/components/tag-drop/tag-drop-row.js.es6 b/app/assets/javascripts/select-kit/components/tag-drop/tag-drop-row.js.es6
new file mode 100644
index 00000000000..cb87469d919
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/tag-drop/tag-drop-row.js.es6
@@ -0,0 +1,8 @@
+import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
+
+export default SelectKitRowComponent.extend({
+  layoutName: "select-kit/templates/components/tag-drop/tag-drop-row",
+  classNames: "tag-drop-row",
+
+  tagId: Ember.computed.alias("computedContent.value")
+});
diff --git a/app/assets/javascripts/select-kit/components/tag-group-chooser.js.es6 b/app/assets/javascripts/select-kit/components/tag-group-chooser.js.es6
new file mode 100644
index 00000000000..b790b94b544
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/tag-group-chooser.js.es6
@@ -0,0 +1,87 @@
+import MultiSelectComponent from "select-kit/components/multi-select";
+import Tags from "select-kit/mixins/tags";
+import renderTag from "discourse/lib/render-tag";
+import computed from "ember-addons/ember-computed-decorators";
+const { get, isEmpty, run, makeArray } = Ember;
+
+export default MultiSelectComponent.extend(Tags, {
+  pluginApiIdentifiers: ["tag-group-chooser"],
+  classNames: ["tag-group-chooser", "tag-chooser"],
+  isAsync: true,
+  filterable: true,
+  filterPlaceholder: "category.tag_groups_placeholder",
+  limit: null,
+  allowAny: false,
+
+  init() {
+    this._super();
+
+    this.set("templateForRow", (rowComponent) => {
+      const tag = rowComponent.get("computedContent");
+      return renderTag(get(tag, "value"), {
+        count: get(tag, "originalContent.count"),
+        noHref: true
+      });
+    });
+  },
+
+  mutateValues(values) {
+    this.set("tagGroups", values.filter(v => v));
+  },
+
+  @computed("tagGroups")
+  values(tagGroups) {
+    return makeArray(tagGroups);
+  },
+
+  @computed("tagGroups")
+  content(tagGroups) {
+    return makeArray(tagGroups);
+  },
+
+  actions: {
+    onFilter(filter) {
+      this.expand();
+      this.set("searchDebounce", run.debounce(this, this._prepareSearch, filter, 200));
+    },
+
+    onExpand() {
+      if (isEmpty(this.get("collectionComputedContent"))) {
+        this.set("searchDebounce", run.debounce(this, this._prepareSearch, this.get("filter"), 200));
+      }
+    },
+
+    onDeselect() {
+      this.set("searchDebounce", run.debounce(this, this._prepareSearch, this.get("filter"), 200));
+    },
+
+    onSelect() {
+      this.set("searchDebounce", run.debounce(this, this._prepareSearch, this.get("filter"), 50));
+    }
+  },
+
+  _prepareSearch(query) {
+    const data = {
+      q: query,
+      limit: this.get("siteSettings.max_tag_search_results")
+    };
+
+    this.searchTags("/tag_groups/filter/search", data, this._transformJson);
+  },
+
+  _transformJson(context, json) {
+    let results = json.results.sort((a, b) => a.id > b.id);
+
+    results = results.map(result => {
+      return { id: result.text, name: result.text, count: result.count };
+    });
+
+    // if forbidden we probably have an existing tag which is not in the list of
+    // returned tags, so we manually add it at the top
+    if (json.forbidden) {
+      results.unshift({ id: json.forbidden, name: json.forbidden, count: 0 });
+    }
+
+    return results;
+  },
+});
diff --git a/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js.es6 b/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js.es6
index d679b9421ee..73272fc1ca7 100644
--- a/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js.es6
+++ b/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js.es6
@@ -6,7 +6,6 @@ export default DropdownSelectBoxComponent.extend({
   classNames: ["toolbar-popup-menu-options"],
   isHidden: Ember.computed.empty("computedContent"),
   showFullTitle: false,
-  collectionHeight: "auto",
 
   @computed("title")
   collectionHeader(title) {
@@ -15,7 +14,7 @@ export default DropdownSelectBoxComponent.extend({
 
   mutateValue(value) {
     this.sendAction("onPopupMenuAction", value);
-    this.setProperties({ value: null, highlightedValue: null });
+    this.setProperties({ value: null, highlighted: null });
   },
 
   computeContent(content) {
diff --git a/app/assets/javascripts/select-kit/components/topic-footer-mobile-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/topic-footer-mobile-dropdown.js.es6
index ccdf3af4890..0aa66a1920b 100644
--- a/app/assets/javascripts/select-kit/components/topic-footer-mobile-dropdown.js.es6
+++ b/app/assets/javascripts/select-kit/components/topic-footer-mobile-dropdown.js.es6
@@ -8,7 +8,7 @@ export default ComboBoxComponent.extend({
   allowInitialValueMutation: false,
 
   computeHeaderContent() {
-    let content = this.baseHeaderComputedContent();
+    let content = this._super();
     content.name = I18n.t("topic.controls");
     return content;
   },
@@ -45,7 +45,7 @@ export default ComboBoxComponent.extend({
       return;
     }
 
-    const refresh = () => this.send("onDeselect", value);
+    const refresh = () => this.deselect(this.get("selection"));
 
     switch(value) {
       case "invite":
diff --git a/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6 b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
index 6f9e7f556b8..14788dba5f1 100644
--- a/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
@@ -6,6 +6,7 @@ export default Ember.Mixin.create({
 
     this._previousScrollParentOverflow = null;
     this._previousCSSContext = null;
+    this.selectionSelector = ".choice";
     this.filterInputSelector = ".filter-input";
     this.rowSelector = ".select-kit-row";
     this.collectionSelector = ".select-kit-collection";
@@ -42,7 +43,6 @@ export default Ember.Mixin.create({
 
   @on("didRender")
   _adjustPosition() {
-    this.$collection().css("max-height", this.get("collectionHeight"));
     this._applyFixedPosition();
     this._applyDirection();
     this._positionWrapper();
@@ -59,38 +59,45 @@ export default Ember.Mixin.create({
     this.setProperties({ isFocused: false });
   },
 
-  // force the component in a known default state
   focus() {
-    Ember.run.schedule("afterRender", () => this.$header().focus());
+    Ember.run.schedule("afterRender", () => {
+      this.$header().focus();
+    });
   },
 
   // try to focus filter and fallback to header if not present
   focusFilterOrHeader() {
-    Ember.run.schedule("afterRender", () => {
-      if ((this.site && this.site.isMobileDevice) || !this.$filterInput().is(":visible")) {
-        this.$header().focus();
-      } else {
-        this.$filterInput().focus();
-      }
+    const context = this;
+    // next so we are sure it finised expand/collapse
+    Ember.run.next(() => {
+      Ember.run.schedule("afterRender", () => {
+        if ((this.site && this.site.isMobileDevice) || !context.$filterInput() || !context.$filterInput().is(":visible")) {
+          context.$header().focus();
+        } else {
+          context.$filterInput().focus();
+        }
+      });
     });
   },
 
   expand() {
-    if (this.get("isExpanded") === true) return;
+    if (this.get("isExpanded")) return;
     this.setProperties({ isExpanded: true, renderedBodyOnce: true, isFocused: true });
     this.focusFilterOrHeader();
     this.autoHighlight();
+    this._boundaryActionHandler("onExpand", this);
   },
 
   collapse() {
     this.set("isExpanded", false);
     Ember.run.schedule("afterRender", () => this._removeFixedPosition() );
+    this._boundaryActionHandler("onCollapse", this);
   },
 
   // lose focus of the component in two steps
   // first collapse and keep focus and then remove focus
   unfocus(event) {
-    if (this.get("isExpanded") === true) {
+    if (this.get("isExpanded")) {
       this.collapse(event);
       this.focus(event);
     } else {
@@ -109,11 +116,10 @@ export default Ember.Mixin.create({
     const discourseHeader = $(".d-header")[0];
     const discourseHeaderHeight = discourseHeader ? (discourseHeader.getBoundingClientRect().top + this._computedStyle(discourseHeader, "height")) : 0;
     const bodyHeight = this._computedStyle(this.$body()[0], "height");
-    const windowWidth = $(window).width();
     const componentHeight = this._computedStyle(this.get("element"), "height");
-    const componentWidth = this._computedStyle(this.get("element"), "width");
     const offsetTop = this.get("element").getBoundingClientRect().top;
     const offsetBottom = this.get("element").getBoundingClientRect().bottom;
+    const windowWidth = $(window).width();
 
     if (this.get("fullWidthOnMobile") && (this.site && this.site.isMobileDevice)) {
       const margin = 10;
@@ -122,28 +128,25 @@ export default Ember.Mixin.create({
       options.width = windowWidth - margin * 2;
       options.maxWidth = options.minWidth = "unset";
     } else {
+      const parentWidth = this.$scrollableParent().length ? this.$scrollableParent().width() : windowWidth;
       const bodyWidth = this._computedStyle(this.$body()[0], "width");
 
-      if (this._isRTL()) {
-        const horizontalSpacing = this.get("element").getBoundingClientRect().right;
-        const hasHorizontalSpace = horizontalSpacing - (this.get("horizontalOffset") + bodyWidth) > 0;
-        if (hasHorizontalSpace) {
-          this.setProperties({ isLeftAligned: true, isRightAligned: false });
-          options.left = bodyWidth + this.get("horizontalOffset");
-        } else {
-          this.setProperties({ isLeftAligned: false, isRightAligned: true });
-          options.right = - (bodyWidth - componentWidth + this.get("horizontalOffset"));
-        }
+      let marginToEdge;
+      if (this.$scrollableParent().length) {
+        marginToEdge = this.$().offset().left - this.$scrollableParent().offset().left;
       } else {
-        const horizontalSpacing = this.get("element").getBoundingClientRect().left;
-        const hasHorizontalSpace = (windowWidth - (this.get("horizontalOffset") + horizontalSpacing + bodyWidth) > 0);
-        if (hasHorizontalSpace) {
-          this.setProperties({ isLeftAligned: true, isRightAligned: false });
-          options.left = this.get("horizontalOffset");
-        } else {
-          this.setProperties({ isLeftAligned: false, isRightAligned: true });
-          options.right = this.get("horizontalOffset");
-        }
+        marginToEdge = this.get("element").getBoundingClientRect().left;
+      }
+
+      const enoughMarginToOppositeEdge = (parentWidth - marginToEdge - bodyWidth + this.get("horizontalOffset")) > 0;
+      if (enoughMarginToOppositeEdge) {
+        this.setProperties({ isLeftAligned: true, isRightAligned: false });
+        options.left = this.get("horizontalOffset");
+        options.right = "unset";
+      } else {
+        this.setProperties({ isLeftAligned: false, isRightAligned: true });
+        options.left = "unset";
+        options.right = this.get("horizontalOffset");
       }
     }
 
@@ -164,8 +167,8 @@ export default Ember.Mixin.create({
 
   _applyFixedPosition() {
     if (this.get("isExpanded") !== true) return;
-    if (this.$fixedPlaceholder().length === 1) return;
-    if (this.$scrollableParent().length === 0) return;
+    if (this.$fixedPlaceholder().length) return;
+    if (!this.$scrollableParent().length) return;
 
     const width =  this._computedStyle(this.get("element"), "width");
     const height =  this._computedStyle(this.get("element"), "height");
diff --git a/app/assets/javascripts/select-kit/mixins/events.js.es6 b/app/assets/javascripts/select-kit/mixins/events.js.es6
index 8490293e4ac..2d87e9c9f0b 100644
--- a/app/assets/javascripts/select-kit/mixins/events.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/events.js.es6
@@ -9,6 +9,9 @@ export default Ember.Mixin.create({
       UP: 38,
       DOWN: 40,
       BACKSPACE: 8,
+      LEFT: 37,
+      RIGHT: 39,
+      A: 65
     };
   },
 
@@ -38,19 +41,24 @@ export default Ember.Mixin.create({
 
     $(document)
       .on("mousedown.select-kit", event => {
-        event.stopPropagation();
+        if (!this.element || this.isDestroying || this.isDestroyed) {
+          return true;
+        }
 
-        if (!this.get("renderedBodyOnce")) return;
-        if (!this.get("isFocused")) return;
-        if (Ember.isNone(this.get("element"))) return;
-        if (Ember.$.contains(this.get("element"), event.target)) return;
+        if (Ember.$.contains(this.element, event.target)) {
+          event.stopPropagation();
+          if (!this.get("renderedBodyOnce")) return;
+          if (!this.get("isFocused")) return;
+        } else {
+          this.didClickOutside(event);
+        }
 
-        this.didClickOutside(event);
+        return true;
     });
 
     this.$header()
       .on("blur.select-kit", () => {
-        if (this.get("isExpanded") === false && this.get("isFocused") === true) {
+        if (!this.get("isExpanded") && this.get("isFocused")) {
           this.close();
         }
       })
@@ -63,22 +71,27 @@ export default Ember.Mixin.create({
 
         if (document.activeElement !== this.$header()[0]) return event;
 
-        if (keyCode === this.keys.TAB) this.tabFromHeader(event);
-        if (keyCode === this.keys.BACKSPACE) this.backspaceFromHeader(event);
+        if (keyCode === this.keys.TAB && event.shiftKey) { this.unfocus(event); }
+        if (keyCode === this.keys.TAB && !event.shiftKey) this.tabFromHeader(event);
+        if (Ember.isEmpty(this.get("filter")) && keyCode === this.keys.BACKSPACE) this.backspaceFromHeader(event);
         if (keyCode === this.keys.ESC) this.escapeFromHeader(event);
         if (keyCode === this.keys.ENTER) this.enterFromHeader(event);
         if ([this.keys.UP, this.keys.DOWN].includes(keyCode)) this.upAndDownFromHeader(event);
+        if (Ember.isEmpty(this.get("filter")) &&
+            [this.keys.LEFT, this.keys.RIGHT].includes(keyCode)) {
+              this.leftAndRightFromHeader(event);
+        }
         return event;
       })
       .on("keypress.select-kit", (event) => {
         const keyCode = event.keyCode || event.which;
 
-        if (keyCode === this.keys.ENTER) { return true; }
-        if (keyCode === this.keys.TAB) { return true; }
+        if (keyCode === this.keys.ENTER) return true;
+        if (keyCode === this.keys.TAB) return true;
 
         this.expand(event);
 
-        if (this.get("filterable") === true || this.get("autoFilterable")) {
+        if (this.get("filterable") || this.get("autoFilterable")) {
           this.set("renderedFilterOnce", true);
         }
 
@@ -95,7 +108,7 @@ export default Ember.Mixin.create({
 
     this.$filterInput()
       .on("change.select-kit", (event) => {
-        this.send("onFilter", $(event.target).val());
+        this.send("onFilterComputedContent", $(event.target).val());
       })
       .on("keypress.select-kit", (event) => {
         event.stopPropagation();
@@ -103,49 +116,98 @@ export default Ember.Mixin.create({
       .on("keydown.select-kit", (event) => {
         const keyCode = event.keyCode || event.which;
 
-        if (keyCode === this.keys.TAB) this.tabFromFilter(event);
+        if (Ember.isEmpty(this.get("filter")) &&
+            keyCode === this.keys.BACKSPACE &&
+            typeof this.didPressBackspaceFromFilter === "function") {
+          this.didPressBackspaceFromFilter(event);
+        };
+
+        if (keyCode === this.keys.TAB && event.shiftKey) { this.unfocus(event); }
+        if (keyCode === this.keys.TAB && !event.shiftKey) this.tabFromFilter(event);
         if (keyCode === this.keys.ESC) this.escapeFromFilter(event);
         if (keyCode === this.keys.ENTER) this.enterFromFilter(event);
         if ([this.keys.UP, this.keys.DOWN].includes(keyCode)) this.upAndDownFromFilter(event);
+
+        if (Ember.isEmpty(this.get("filter")) &&
+            [this.keys.LEFT, this.keys.RIGHT].includes(keyCode)) {
+          this.leftAndRightFromFilter(event);
+        }
       });
   },
 
   didPressTab(event) {
-    if (this.get("isExpanded") === false) {
-      this.unfocus(event);
-    } else if (this.$highlightedRow().length === 1) {
-      Ember.run.throttle(this, this._rowClick, this.$highlightedRow(), 150, 150, true);
-      this.unfocus(event);
+    if (this.$highlightedRow().length && this.get("isExpanded")) {
+      this.close(event);
+      this.$header().focus();
+      const guid = this.$highlightedRow().attr("data-guid");
+      this.select(this._findComputedContentItemByGuid(guid));
+      return true;
+    }
+
+    if (Ember.isEmpty(this.get("filter"))) {
+      this.close(event);
       return true;
-    } else {
-      this._destroyEvent(event);
-      this.unfocus(event);
     }
 
     return true;
   },
 
+  didPressEnter(event) {
+    if (!this.get("isExpanded")) {
+      this.expand(event);
+    } else if (this.$highlightedRow().length) {
+      this.close(event);
+      this.$header().focus();
+      const guid = this.$highlightedRow().attr("data-guid");
+      this.select(this._findComputedContentItemByGuid(guid));
+    }
+
+    return true;
+  },
+
+  didClickSelectionItem(computedContentItem) {
+    this.focus();
+    this.deselect(computedContentItem);
+  },
+
+  didClickRow(computedContentItem) {
+    this.close();
+    this.focus();
+    this.select(computedContentItem);
+  },
+
   didPressEscape(event) {
     this._destroyEvent(event);
-    this.unfocus(event);
+
+    if (this.get("highlightedSelection").length && this.get("isExpanded")) {
+      this.clearHighlightSelection();
+    } else {
+      this.unfocus(event);
+    }
   },
 
   didPressUpAndDownArrows(event) {
     this._destroyEvent(event);
 
-    const keyCode = event.keyCode || event.which;
-    const $rows = this.$rows();
+    this.clearHighlightSelection();
 
-    if (this.get("isExpanded") === false) {
+    const keyCode = event.keyCode || event.which;
+
+    if (!this.get("isExpanded")) {
       this.expand(event);
 
       if (this.$selectedRow().length === 1) {
         this._highlightRow(this.$selectedRow());
         return;
       }
+
+      return;
     }
 
-    if ($rows.length <= 0) { return; }
+    const $rows = this.$rows();
+
+    if (!$rows.length) { return; }
+
     if ($rows.length === 1) {
       this._rowSelection($rows, 0);
       return;
@@ -156,28 +218,43 @@ export default Ember.Mixin.create({
     Ember.run.throttle(this, this._moveHighlight, direction, $rows, 32);
   },
 
+  didPressBackspaceFromFilter(event) { this.didPressBackspace(event); },
   didPressBackspace(event) {
-    this._destroyEvent(event);
+    if (!this.get("isExpanded")) {
+      this.expand();
+      if (event) event.stopImmediatePropagation();
+      return;
+    }
 
-    this.expand(event);
+    if (!this.get("selection").length) return;
 
-    if (this.$filterInput().is(":visible")) {
-      this.$filterInput().focus().trigger(event).trigger("change");
+    if (!Ember.isEmpty(this.get("filter"))) {
+      this.clearHighlightSelection();
+      return;
+    }
+
+    if (!this.get("highlightedSelection").length) {
+      // try to highlight the last non locked item from the current selection
+      Ember.makeArray(this.get("selection")).slice().reverse().some(selection => {
+        if (!Ember.get(selection, "locked")) {
+          this.highlightSelection(selection);
+          return true;
+        }
+      });
+
+      if (event) event.stopImmediatePropagation();
+    } else {
+      this.deselect(this.get("highlightedSelection"));
+      if (event) event.stopImmediatePropagation();
     }
   },
 
-  didPressEnter(event) {
-    this._destroyEvent(event);
-
-    if (this.get("isExpanded") === false) {
-      this.expand(event);
-    } else if (this.$highlightedRow().length === 1) {
-      Ember.run.throttle(this, this._rowClick, this.$highlightedRow(), 150, true);
-    }
+  didPressSelectAll() {
+    this.highlightSelection(Ember.makeArray(this.get("selection")));
   },
 
   didClickOutside(event) {
-    if ($(event.target).parents(".select-kit").length === 1) {
+    if (this.get("isExpanded") && $(event.target).parents(".select-kit").length) {
       this.close(event);
       return false;
     }
@@ -192,6 +269,38 @@ export default Ember.Mixin.create({
     this._destroyEvent(event);
   },
 
+  didPressLeftAndRightArrows(event) {
+    if (!this.get("isExpanded")) {
+      this.expand();
+      event.stopImmediatePropagation();
+      return;
+    }
+
+    if (Ember.isEmpty(this.get("selection"))) return;
+
+    const keyCode = event.keyCode || event.which;
+
+    if (keyCode === this.keys.LEFT) {
+      const prev = this.get("highlightedSelection.lastObject");
+      const indexOfPrev = this.get("selection").indexOf(prev);
+
+      if (this.get("selection")[indexOfPrev - 1]) {
+        this.highlightSelection(this.get("selection")[indexOfPrev - 1]);
+      } else {
+        this.highlightSelection(this.get("selection.lastObject"));
+      }
+    } else {
+      const prev = this.get("highlightedSelection.firstObject");
+      const indexOfNext= this.get("selection").indexOf(prev);
+
+      if (this.get("selection")[indexOfNext + 1]) {
+        this.highlightSelection(this.get("selection")[indexOfNext + 1]);
+      } else {
+        this.highlightSelection(this.get("selection.firstObject"));
+      }
+    }
+  },
+
   tabFromHeader(event) { this.didPressTab(event); },
   tabFromFilter(event) { this.didPressTab(event); },
 
@@ -201,6 +310,9 @@ export default Ember.Mixin.create({
   upAndDownFromHeader(event) { this.didPressUpAndDownArrows(event); },
   upAndDownFromFilter(event) { this.didPressUpAndDownArrows(event); },
 
+  leftAndRightFromHeader(event) { this.didPressLeftAndRightArrows(event); },
+  leftAndRightFromFilter(event) { this.didPressLeftAndRightArrows(event); },
+
   backspaceFromHeader(event) { this.didPressBackspace(event); },
 
   enterFromHeader(event) { this.didPressEnter(event); },
@@ -219,8 +331,6 @@ export default Ember.Mixin.create({
     this._rowSelection($rows, nextIndex);
   },
 
-  _rowClick($row) { $row.click(); },
-
   _rowSelection($rows, nextIndex) {
     const highlightableValue = $rows.eq(nextIndex).attr("data-value");
     const $highlightableRow = this.$findRowByValue(highlightableValue);
diff --git a/app/assets/javascripts/select-kit/mixins/plugin-api.js.es6 b/app/assets/javascripts/select-kit/mixins/plugin-api.js.es6
index 5fd32fcd1d4..579795911f0 100644
--- a/app/assets/javascripts/select-kit/mixins/plugin-api.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/plugin-api.js.es6
@@ -25,6 +25,24 @@ function modifyContent(pluginApiIdentifiers, contentFunction) {
   _modifyContentCallbacks[pluginApiIdentifiers].push(contentFunction);
 }
 
+let _modifyHeaderComputedContentCallbacks = {};
+function modifyHeaderComputedContent(pluginApiIdentifiers, contentFunction) {
+  if (Ember.isNone(_modifyHeaderComputedContentCallbacks[pluginApiIdentifiers])) {
+    _modifyHeaderComputedContentCallbacks[pluginApiIdentifiers] = [];
+  }
+
+  _modifyHeaderComputedContentCallbacks[pluginApiIdentifiers].push(contentFunction);
+}
+
+let _modifyCollectionHeaderCallbacks = {};
+function modifyCollectionHeader(pluginApiIdentifiers, contentFunction) {
+  if (Ember.isNone(_modifyCollectionHeaderCallbacks[pluginApiIdentifiers])) {
+    _modifyCollectionHeaderCallbacks[pluginApiIdentifiers] = [];
+  }
+
+  _modifyCollectionHeaderCallbacks[pluginApiIdentifiers].push(contentFunction);
+}
+
 let _onSelectCallbacks = {};
 function onSelect(pluginApiIdentifiers, mutationFunction) {
   if (Ember.isNone(_onSelectCallbacks[pluginApiIdentifiers])) {
@@ -50,6 +68,26 @@ export function applyContentPluginApiCallbacks(identifiers, content, context) {
   return content;
 }
 
+export function applyHeaderContentPluginApiCallbacks(identifiers, content, context) {
+  identifiers.forEach((key) => {
+    (_modifyHeaderComputedContentCallbacks[key] || []).forEach((c) => {
+      content = c(context, content);
+    });
+  });
+
+  return content;
+}
+
+export function applyCollectionHeaderCallbacks(identifiers, content, context) {
+  identifiers.forEach((key) => {
+    (_modifyCollectionHeaderCallbacks[key] || []).forEach((c) => {
+      content = c(context, content);
+    });
+  });
+
+  return content;
+}
+
 export function applyOnSelectPluginApiCallbacks(identifiers, val, context) {
   identifiers.forEach((key) => {
     (_onSelectCallbacks[key] || []).forEach((c) => c(context, val));
@@ -70,6 +108,14 @@ export function modifySelectKit(pluginApiIdentifiers) {
       modifyContent(pluginApiIdentifiers, callback);
       return modifySelectKit(pluginApiIdentifiers);
     },
+    modifyHeaderComputedContent: (callback) => {
+      modifyHeaderComputedContent(pluginApiIdentifiers, callback);
+      return modifySelectKit(pluginApiIdentifiers);
+    },
+    modifyCollectionHeader: (callback) => {
+      modifyCollectionHeader(pluginApiIdentifiers, callback);
+      return modifySelectKit(pluginApiIdentifiers);
+    },
     onSelect: (callback) => {
       onSelect(pluginApiIdentifiers, callback);
       return modifySelectKit(pluginApiIdentifiers);
@@ -81,6 +127,8 @@ export function clearCallbacks() {
   _appendContentCallbacks = {};
   _prependContentCallbacks = {};
   _modifyContentCallbacks = {};
+  _modifyHeaderComputedContentCallbacks = {};
+  _modifyCollectionHeaderCallbacks = {};
   _onSelectCallbacks = {};
 }
 
diff --git a/app/assets/javascripts/select-kit/mixins/tags.js.es6 b/app/assets/javascripts/select-kit/mixins/tags.js.es6
new file mode 100644
index 00000000000..e1c2d0e0d9b
--- /dev/null
+++ b/app/assets/javascripts/select-kit/mixins/tags.js.es6
@@ -0,0 +1,59 @@
+const { run, get } = Ember;
+import { ajax } from "discourse/lib/ajax";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+
+export default Ember.Mixin.create({
+  willDestroyElement() {
+    this._super();
+
+    const searchDebounce = this.get("searchDebounce");
+    if (searchDebounce) run.cancel(searchDebounce);
+  },
+
+  searchTags(url, data, callback) {
+    const self = this;
+
+    this.startLoading();
+
+    return ajax(Discourse.getURL(url), {
+      quietMillis: 200,
+      cache: true,
+      dataType: "json",
+      data
+    }).then(json => {
+      self.set("asyncContent", callback(self, json));
+      self.autoHighlight();
+    }).catch(error => {
+      popupAjaxError(error);
+    })
+    .finally(() => {
+      self.stopLoading();
+    });
+  },
+
+  validateCreate(term) {
+    if (this.get("hasReachedMaximum") || !this.site.get("can_create_tag")) {
+      return false;
+    }
+
+    const filterRegexp = new RegExp(this.site.tags_filter_regexp, "g");
+    term = term.replace(filterRegexp, "").trim().toLowerCase();
+
+    if (!term.length || this.get("termMatchesForbidden")) {
+      return false;
+    }
+
+    if (this.get("siteSettings.max_tag_length") < term.length) {
+      return false;
+    }
+
+    const inCollection = this.get("collectionComputedContent").map(c => get(c, "id")).includes(term);
+
+    const inSelection = this.get("selection").map(s => get(s, "value").toLowerCase()).includes(term);
+    if (inCollection || inSelection) {
+      return false;
+    }
+
+    return true;
+  },
+});
diff --git a/app/assets/javascripts/select-kit/mixins/utils.js.es6 b/app/assets/javascripts/select-kit/mixins/utils.js.es6
index 54f404b3b9e..ad61c7926bd 100644
--- a/app/assets/javascripts/select-kit/mixins/utils.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/utils.js.es6
@@ -27,6 +27,19 @@ export default Ember.Mixin.create({
     return !isNaN(parseFloat(input)) && isFinite(input);
   },
 
+  _cast(value) {
+    if (value === this.noneValue) return value;
+    return this._castInteger(this._castBoolean(value));
+  },
+
+  _castBoolean(value) {
+    if (this.get("castBoolean") && Ember.isPresent(value) && typeof(value) === "string") {
+      return value === "true";
+    }
+
+    return value;
+  },
+
   _castInteger(value) {
     if (this.get("castInteger") && Ember.isPresent(value) && this._isNumeric(value)) {
       return parseInt(value, 10);
@@ -36,12 +49,20 @@ export default Ember.Mixin.create({
   },
 
   _findComputedContentItemByGuid(guid) {
-    return this.get("computedContent").find(c => {
+    if (guidFor(this.get("createRowComputedContent")) === guid) {
+      return this.get("createRowComputedContent");
+    }
+
+    if (guidFor(this.get("noneRowComputedContent")) === guid) {
+      return this.get("noneRowComputedContent");
+    }
+
+    return this.get("collectionComputedContent").find(c => {
       return guidFor(c) === guid;
     });
   },
 
   _filterRemovableComputedContents(computedContent) {
-    return computedContent.filter(c => c.created === true);
+    return computedContent.filter(c => c.created);
   }
 });
diff --git a/app/assets/javascripts/select-kit/templates/components/category-drop/category-drop-header.hbs b/app/assets/javascripts/select-kit/templates/components/category-drop/category-drop-header.hbs
new file mode 100644
index 00000000000..7e3ea1baf4f
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/category-drop/category-drop-header.hbs
@@ -0,0 +1,5 @@
+<span class="selected-name">
+  {{{label}}}
+</span>
+
+{{d-icon caretIcon class="caret-icon fa-fw"}}
diff --git a/app/assets/javascripts/select-kit/templates/components/category-row.hbs b/app/assets/javascripts/select-kit/templates/components/category-row.hbs
index 6ea0bf428cf..85cdfd8f156 100644
--- a/app/assets/javascripts/select-kit/templates/components/category-row.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/category-row.hbs
@@ -1,18 +1,21 @@
 {{#if category}}
     {{#if hasParentCategory}}
       <div class="category-status">
-        {{badgeForParentCategory}}&nbsp;{{badgeForCategory}}
-        &nbsp;<span class="topic-count">&times; {{topicCount}}</span>
+        {{#unless hideParentCategory}}
+          {{badgeForParentCategory}}
+        {{/unless}}
+        {{badgeForCategory}}
+        <span class="topic-count">{{topicCount}}</span>
       </div>
     {{else}}
       <div class="category-status">
         {{badgeForCategory}}
-        &nbsp;<span class="topic-count">&times; {{topicCount}}</span>
+        <span class="topic-count">{{topicCount}}</span>
       </div>
     {{/if}}
 
     {{#if shouldDisplayDescription}}
-      <div class="category-desc">{{{description}}}</div>
+      <div class="category-desc">{{{dir-span description}}}</div>
     {{/if}}
 {{else}}
   {{{label}}}
diff --git a/app/assets/javascripts/select-kit/templates/components/combo-box/combo-box-header.hbs b/app/assets/javascripts/select-kit/templates/components/combo-box/combo-box-header.hbs
index 97a66905a99..b13075d3f2d 100644
--- a/app/assets/javascripts/select-kit/templates/components/combo-box/combo-box-header.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/combo-box/combo-box-header.hbs
@@ -5,9 +5,9 @@
 </span>
 
 {{#if shouldDisplayClearableButton}}
-  <button class="btn-clear" {{action onClear bubbles=false}}>
+  <button class="btn-clear" {{action onClearSelection bubbles=false}}>
     {{d-icon 'times'}}
   </button>
 {{/if}}
 
-{{d-icon caretIcon class="caret-icon"}}
+{{d-icon caretIcon class="caret-icon fa-fw"}}
diff --git a/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-header.hbs b/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
index 48af8fab951..5a1ba341646 100644
--- a/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
@@ -2,6 +2,6 @@
 
 {{#if options.showFullTitle}}
   <span class="d-button-label selected-name">
-    {{label}}
+    {{{label}}}
   </span>
 {{/if}}
diff --git a/app/assets/javascripts/select-kit/templates/components/future-date-input-selector/future-date-input-selector-header.hbs b/app/assets/javascripts/select-kit/templates/components/future-date-input-selector/future-date-input-selector-header.hbs
index caa167199ec..5034fa77bb8 100644
--- a/app/assets/javascripts/select-kit/templates/components/future-date-input-selector/future-date-input-selector-header.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/future-date-input-selector/future-date-input-selector-header.hbs
@@ -15,7 +15,7 @@
 {{/if}}
 
 {{#if shouldDisplayClearableButton}}
-  <button class="btn-clear" {{action onClear bubbles=false}}>
+  <button class="btn-clear" {{action onClearSelection bubbles=false}}>
     {{d-icon 'times'}}
   </button>
 {{/if}}
diff --git a/app/assets/javascripts/select-kit/templates/components/mini-tag-chooser/mini-tag-chooser-header.hbs b/app/assets/javascripts/select-kit/templates/components/mini-tag-chooser/mini-tag-chooser-header.hbs
new file mode 100644
index 00000000000..1bd94d922ce
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/mini-tag-chooser/mini-tag-chooser-header.hbs
@@ -0,0 +1,3 @@
+{{input class="selected-name" value=label readonly="readonly" tabindex="-1"}}
+
+{{d-icon caretIcon class="caret-icon"}}
diff --git a/app/assets/javascripts/select-kit/templates/components/multi-select.hbs b/app/assets/javascripts/select-kit/templates/components/multi-select.hbs
new file mode 100644
index 00000000000..d541cc2c1c4
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/multi-select.hbs
@@ -0,0 +1,50 @@
+{{#component headerComponent
+  tabindex=tabindex
+  isFocused=isFocused
+  isExpanded=isExpanded
+  highlightedSelection=highlightedSelection
+  onClickSelectionItem=(action "onClickSelectionItem")
+  computedContent=headerComputedContent
+  onToggle=(action "onToggle")
+  options=headerComponentOptions
+}}
+  {{component filterComponent
+    icon=filterIcon
+    placeholder=filterPlaceholder
+    filter=filter
+    hasSelection=hasSelection
+    isLoading=isLoading
+    shouldDisplayFilter=shouldDisplayFilter
+    isFocused=isFocused
+    onFilterComputedContent=(action "onFilterComputedContent")
+  }}
+{{/component}}
+
+<div class="select-kit-body">
+  {{#if renderedBodyOnce}}
+  {{#unless isLoading}}
+    {{component collectionComponent
+      collectionHeaderComputedContent=collectionHeaderComputedContent
+      hasSelection=hasSelection
+      noneRowComputedContent=noneRowComputedContent
+      createRowComputedContent=createRowComputedContent
+      collectionComputedContent=collectionComputedContent
+      rowComponent=rowComponent
+      noneRowComponent=noneRowComponent
+      createRowComponent=createRowComponent
+      templateForRow=templateForRow
+      templateForNoneRow=templateForNoneRow
+      templateForCreateRow=templateForCreateRow
+      onClickRow=(action "onClickRow")
+      onMouseoverRow=(action "onMouseoverRow")
+      highlighted=highlighted
+      computedValue=computedValue
+      rowComponentOptions=rowComponentOptions
+      noContentRow=noContentRow
+      validationMessage=validationMessage
+    }}
+  {{/unless}}
+  {{/if}}
+</div>
+
+<div class="select-kit-wrapper"></div>
diff --git a/app/assets/javascripts/select-kit/templates/components/multi-select/multi-select-header.hbs b/app/assets/javascripts/select-kit/templates/components/multi-select/multi-select-header.hbs
index 5cfd580279b..2627302c4e7 100644
--- a/app/assets/javascripts/select-kit/templates/components/multi-select/multi-select-header.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/multi-select/multi-select-header.hbs
@@ -1,13 +1,11 @@
 <div class="choices">
-  {{#each computedContent.selectedComputedContents as |selectedComputedContent|}}
-    {{component selectedNameComponent onDeselect=onDeselect computedContent=selectedComputedContent}}
+  {{#each computedContent.selection as |selection|}}
+    {{component selectedNameComponent
+      onClickSelectionItem=onClickSelectionItem
+      highlightedSelection=highlightedSelection
+      computedContent=selection}}
   {{/each}}
   <span class="filter choice" tabindex="-1">
-    {{component "select-kit/select-kit-filter"
-      onFilter=onFilter
-      shouldDisplayFilter=shouldDisplayFilter
-      isFocused=isFocused
-      filter=filter
-    }}
+    {{yield}}
   </span>
 </div>
diff --git a/app/assets/javascripts/select-kit/templates/components/multi-select/selected-category.hbs b/app/assets/javascripts/select-kit/templates/components/multi-select/selected-category.hbs
index d96b31245b9..09b5adfa859 100644
--- a/app/assets/javascripts/select-kit/templates/components/multi-select/selected-category.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/multi-select/selected-category.hbs
@@ -1,7 +1,3 @@
-<span class="name">
-  <span class="delete-icon" {{action onDeselect computedContent bubbles=false}}>
-    {{d-icon "times"}}
-  </span>
-
+<div class="body">
   {{badge}}
-</span>
+</div>
diff --git a/app/assets/javascripts/select-kit/templates/components/multi-select/selected-color.hbs b/app/assets/javascripts/select-kit/templates/components/multi-select/selected-color.hbs
deleted file mode 100644
index 2d70a3d7df3..00000000000
--- a/app/assets/javascripts/select-kit/templates/components/multi-select/selected-color.hbs
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="selected-color-wrapper">
-  <span class="name">
-    {{#unless isLocked}}
-      <span class="delete-icon" {{action onDeselect computedContent bubbles=false}}>
-        {{d-icon "times"}}
-      </span>
-    {{/unless}}
-
-    #{{{label}}}
-  </span>
-
-  <span class="color-preview"></span>
-</div>
diff --git a/app/assets/javascripts/select-kit/templates/components/multi-select/selected-name.hbs b/app/assets/javascripts/select-kit/templates/components/multi-select/selected-name.hbs
index a48a160ccc7..ffa6a8f3b91 100644
--- a/app/assets/javascripts/select-kit/templates/components/multi-select/selected-name.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/multi-select/selected-name.hbs
@@ -1,13 +1,9 @@
-{{#if isLocked}}
-  <span class="delete-icon">
-    {{d-icon "lock"}}
-  </span>
-{{else}}
-  <span class="locked-icon" {{action onDeselect computedContent bubbles=false}}>
-    {{d-icon "times"}}
-  </span>
-{{/if}}
+{{#if headerContent}}<div class="header">{{headerContent}}</div>{{/if}}
 
-<span class="name">
-  {{{label}}}
-</span>
+<div class="body">
+  <span class="name">
+    {{{label}}}
+  </span>
+</div>
+
+{{#if footerContent}}<div class="footer">{{footerContent}}</div>{{/if}}
diff --git a/app/assets/javascripts/select-kit/templates/components/period-chooser/period-chooser-header.hbs b/app/assets/javascripts/select-kit/templates/components/period-chooser/period-chooser-header.hbs
new file mode 100644
index 00000000000..698c054c930
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/period-chooser/period-chooser-header.hbs
@@ -0,0 +1,5 @@
+<h2 class="selected-name" title={{title}}>
+  {{period-title value showDateRange=true fullDay=options.fullDay}}
+</h2>
+
+{{d-icon caretIcon class="caret-icon"}}
diff --git a/app/assets/javascripts/select-kit/templates/components/period-chooser/period-chooser-row.hbs b/app/assets/javascripts/select-kit/templates/components/period-chooser/period-chooser-row.hbs
new file mode 100644
index 00000000000..d37693289a1
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/period-chooser/period-chooser-row.hbs
@@ -0,0 +1,5 @@
+<span class="selection-indicator"></span>
+
+<span class="period-title">
+  {{period-title value showDateRange=true fullDay=options.fullDay}}
+</span>
diff --git a/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-collection.hbs b/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-collection.hbs
index f6cd9cf1a60..b673bd18d24 100644
--- a/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-collection.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-collection.hbs
@@ -1,6 +1,6 @@
-{{#if collectionHeader}}
+{{#if collectionHeaderComputedContent}}
   <div class="collection-header">
-    {{{collectionHeader}}}
+    {{{collectionHeaderComputedContent}}}
   </div>
 {{/if}}
 
@@ -9,11 +9,11 @@
     {{component noneRowComponent
       computedContent=noneRowComputedContent
       templateForRow=templateForNoneRow
-      highlightedValue=highlightedValue
-      onClear=onClear
-      onHighlight=onHighlight
+      highlighted=highlighted
+      onMouseoverRow=onMouseoverRow
       computedValue=computedValue
       options=rowComponentOptions
+      onClickRow=onClickRow
     }}
   {{/if}}
 {{/if}}
@@ -21,31 +21,34 @@
 {{#if createRowComputedContent}}
   {{component createRowComponent
     computedContent=createRowComputedContent
+    highlighted=highlighted
+    computedValue=computedValue
     templateForRow=templateForCreateRow
-    highlightedValue=highlightedValue
-    onHighlight=onHighlight
-    onCreate=onCreate
-    computedValue=computedValue
+    onMouseoverRow=onMouseoverRow
+    onClickRow=onClickRow
     options=rowComponentOptions
   }}
 {{/if}}
 
-{{#each filteredComputedContent as |computedContent|}}
-  {{component rowComponent
-    computedContent=computedContent
-    templateForRow=templateForRow
-    highlightedValue=highlightedValue
-    onSelect=onSelect
-    onHighlight=onHighlight
-    computedValue=computedValue
-    options=rowComponentOptions
-  }}
-{{/each}}
-
-{{#if shouldDisplayNoContentRow}}
-  {{#if noContentLabel}}
-    <li class="select-kit-row no-content">
-      {{i18n noContentLabel}}
-    </li>
+{{#if noContentRow}}
+  <li class="select-kit-row no-content">
+    {{noContentRow}}
+  </li>
+{{else}}
+  {{#if validationMessage}}
+    <div class="validation-message">
+      {{validationMessage}}
+    </div>
   {{/if}}
+  {{#each collectionComputedContent as |computedContent|}}
+    {{component rowComponent
+      computedContent=computedContent
+      highlighted=highlighted
+      computedValue=computedValue
+      templateForRow=templateForRow
+      onClickRow=onClickRow
+      onMouseoverRow=onMouseoverRow
+      options=rowComponentOptions
+    }}
+  {{/each}}
 {{/if}}
diff --git a/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-filter.hbs b/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-filter.hbs
index dd62fca94ad..4e0a519d58c 100644
--- a/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-filter.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-filter.hbs
@@ -1,8 +1,8 @@
 {{input
   tabindex=-1
   class="filter-input"
-  placeholder=placeholder
-  key-up=onFilter
+  placeholder=computedPlaceholder
+  key-up=onFilterComputedContent
   autocomplete="off"
   autocorrect="off"
   autocapitalize="off"
@@ -10,6 +10,10 @@
   value=filter
 }}
 
-{{#if icon}}
-  {{d-icon icon class="filter-icon"}}
+{{#if isLoading}}
+  {{loading-spinner size="small"}}
+{{else}}
+  {{#if icon}}
+    {{d-icon icon class="filter-icon"}}
+  {{/if}}
 {{/if}}
diff --git a/app/assets/javascripts/select-kit/templates/components/select-kit.hbs b/app/assets/javascripts/select-kit/templates/components/single-select.hbs
similarity index 62%
rename from app/assets/javascripts/select-kit/templates/components/select-kit.hbs
rename to app/assets/javascripts/select-kit/templates/components/single-select.hbs
index 576cab22485..e01241d3190 100644
--- a/app/assets/javascripts/select-kit/templates/components/select-kit.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/single-select.hbs
@@ -1,48 +1,46 @@
 {{component headerComponent
+  caretIcon=caretIcon
   tabindex=tabindex
   isFocused=isFocused
   isExpanded=isExpanded
   computedContent=headerComputedContent
-  onDeselect=(action "onDeselect")
   onToggle=(action "onToggle")
-  onFilter=(action "onFilter")
-  onClear=(action "onClear")
+  onClearSelection=(action "onClearSelection")
   options=headerComponentOptions
-  shouldDisplayFilter=shouldDisplayFilter
 }}
 
 <div class="select-kit-body">
   {{component filterComponent
-    onFilter=(action "onFilter")
-    icon=filterIcon
-    shouldDisplayFilter=shouldDisplayFilter
-    isFocused=isFocused
-    placeholder=(i18n filterPlaceholder)
     filter=filter
+    isLoading=isLoading
+    icon=filterIcon
+    hasSelection=hasSelection
+    shouldDisplayFilter=shouldDisplayFilter
+    placeholder=filterPlaceholder
+    isFocused=isFocused
+    onFilterComputedContent=(action "onFilterComputedContent")
   }}
 
   {{#if renderedBodyOnce}}
     {{component collectionComponent
-      collectionHeader=collectionHeader
+      collectionHeaderComputedContent=collectionHeaderComputedContent
       hasSelection=hasSelection
       noneRowComputedContent=noneRowComputedContent
       createRowComputedContent=createRowComputedContent
-      filteredComputedContent=filteredComputedContent
+      collectionComputedContent=collectionComputedContent
       rowComponent=rowComponent
       noneRowComponent=noneRowComponent
       createRowComponent=createRowComponent
       templateForRow=templateForRow
       templateForNoneRow=templateForNoneRow
       templateForCreateRow=templateForCreateRow
-      onClear=(action "onClear")
-      onSelect=(action "onSelect")
-      onHighlight=(action "onHighlight")
-      onCreate=(action "onCreate")
-      noContentLabel=noContentLabel
-      highlightedValue=highlightedValue
+      onClickRow=(action "onClickRow")
+      onMouseoverRow=(action "onMouseoverRow")
+      highlighted=highlighted
       computedValue=computedValue
-      shouldDisplayNoContentRow=shouldDisplayNoContentRow
       rowComponentOptions=rowComponentOptions
+      noContentRow=noContentRow
+      validationMessage=validationMessage
     }}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/select-kit/templates/components/tag-drop/tag-drop-header.hbs b/app/assets/javascripts/select-kit/templates/components/tag-drop/tag-drop-header.hbs
new file mode 100644
index 00000000000..7e3ea1baf4f
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/tag-drop/tag-drop-header.hbs
@@ -0,0 +1,5 @@
+<span class="selected-name">
+  {{{label}}}
+</span>
+
+{{d-icon caretIcon class="caret-icon fa-fw"}}
diff --git a/app/assets/javascripts/select-kit/templates/components/tag-drop/tag-drop-row.hbs b/app/assets/javascripts/select-kit/templates/components/tag-drop/tag-drop-row.hbs
new file mode 100644
index 00000000000..e8adb89fe43
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/tag-drop/tag-drop-row.hbs
@@ -0,0 +1 @@
+{{tagId}}
diff --git a/app/assets/javascripts/service-worker.js.erb b/app/assets/javascripts/service-worker.js.erb
index 43fb85a33e6..3f6ab9b4725 100644
--- a/app/assets/javascripts/service-worker.js.erb
+++ b/app/assets/javascripts/service-worker.js.erb
@@ -11,7 +11,11 @@ const CURRENT_CACHES = {
 const OFFLINE_URL = 'offline.html';
 
 function createCacheBustedRequest(url) {
-  var request = new Request(url, {cache: 'reload'});
+  var headers = new Headers({
+    'Discourse-Track-View': '0'
+  });
+
+  var request = new Request(url, {cache: 'reload', headers: headers});
   // See https://fetch.spec.whatwg.org/#concept-request-mode
   // This is not yet supported in Chrome as of M48, so we need to explicitly check to see
   // if the cache: 'reload' option had any effect.
@@ -22,7 +26,7 @@ function createCacheBustedRequest(url) {
   // If {cache: 'reload'} didn't have any effect, append a cache-busting URL parameter instead.
   var bustedUrl = new URL(url, self.location.href);
   bustedUrl.search += (bustedUrl.search ? '&' : '') + 'cachebust=' + Date.now();
-  return new Request(bustedUrl);
+  return new Request(bustedUrl, {headers: headers});
 }
 
 self.addEventListener('install', function(event) {
@@ -33,6 +37,8 @@ self.addEventListener('install', function(event) {
       return caches.open(CURRENT_CACHES.offline).then(function(cache) {
         return cache.put(OFFLINE_URL, response);
       });
+    }).then(function(cache) {
+      self.skipWaiting();
     })
   );
 });
@@ -56,11 +62,17 @@ self.addEventListener('activate', function(event) {
           }
         })
       );
+    }).then(function() {
+      self.clients.claim()
     })
   );
 });
 
 self.addEventListener('fetch', function(event) {
+  // Bypass service workers if this is a url with a token param
+  if(/\?.*token/i.test(event.request.url)) {
+    return;
+  }
   // We only want to call event.respondWith() if this is a navigation request
   // for an HTML page.
   // request.mode of 'navigate' is unfortunately not supported in Chrome
@@ -76,7 +88,11 @@ self.addEventListener('fetch', function(event) {
         // If fetch() returns a valid HTTP response with an response code in the 4xx or 5xx
         // range, the catch() will NOT be called. If you need custom handling for 4xx or 5xx
         // errors, see https://github.com/GoogleChrome/samples/tree/gh-pages/service-worker/fallback-response
-        return caches.match(OFFLINE_URL);
+        if (!navigator.onLine) {
+          return caches.match(OFFLINE_URL);
+        } else {
+          throw error;
+        }
       })
     );
   }
@@ -87,6 +103,80 @@ self.addEventListener('fetch', function(event) {
   // handled by the browser as if there were no service worker involvement.
 });
 
+
+const idleThresholdTime = 1000 * 10; // 10 seconds
+var lastAction = -1;
+
+function isIdle() {
+  return lastAction + idleThresholdTime < Date.now();
+}
+
+function showNotification(title, body, icon, badge, tag, baseUrl, url) {
+  var notificationOptions = {
+    body: body,
+    icon: icon,
+    badge: badge,
+    data: { url: url, baseUrl: baseUrl },
+    tag: tag
+  }
+
+  return self.registration.showNotification(title, notificationOptions);
+}
+
+self.addEventListener('push', function(event) {
+  var payload = event.data.json();
+  if(!isIdle() && payload.hide_when_active) {
+    return false;
+  }
+
+  event.waitUntil(
+    self.registration.getNotifications({ tag: payload.tag }).then(function(notifications) {
+      if (notifications && notifications.length > 0) {
+        notifications.forEach(function(notification) {
+          notification.close();
+        });
+      }
+
+      return showNotification(payload.title, payload.body, payload.icon, payload.badge, payload.tag, payload.base_url, payload.url);
+    })
+  );
+});
+
+self.addEventListener('notificationclick', function(event) {
+  // Android doesn't close the notification when you click on it
+  // See: http://crbug.com/463146
+  event.notification.close();
+  var url = event.notification.data.url;
+  var baseUrl = event.notification.data.baseUrl;
+
+  // This looks to see if the current window is already open and
+  // focuses if it is
+  event.waitUntil(
+    clients.matchAll({ type: "window" })
+      .then(function(clientList) {
+        var reusedClientWindow = clientList.some(function(client) {
+          if (client.url === baseUrl + url && 'focus' in client) {
+            client.focus();
+            return true;
+          }
+
+          if ('postMessage' in client && 'focus' in client) {
+            client.focus();
+            client.postMessage({ url: url });
+            return true;
+          }
+          return false;
+        });
+
+        if (!reusedClientWindow && clients.openWindow) return clients.openWindow(baseUrl + url);
+      })
+  );
+});
+
+self.addEventListener('message', function(event) {
+  if('lastAction' in event.data){
+    lastAction = event.data.lastAction;
+  }});
 <% DiscoursePluginRegistry.service_workers.each do |js| %>
 <%=raw "#{File.read(js)}" %>
 <% end %>
diff --git a/app/assets/javascripts/vendor.js b/app/assets/javascripts/vendor.js
index 6a7bd345eca..03accd59828 100644
--- a/app/assets/javascripts/vendor.js
+++ b/app/assets/javascripts/vendor.js
@@ -14,7 +14,6 @@
 //= require bootstrap-dropdown.js
 //= require bootstrap-modal.js
 //= require bootstrap-transition.js
-//= require select2.js
 //= require div_resizer
 //= require caret_position
 //= require favcount.js
diff --git a/app/assets/javascripts/wizard-vendor.js b/app/assets/javascripts/wizard-vendor.js
index ecb8d2bd7e0..4d07d0ceea5 100644
--- a/app/assets/javascripts/wizard-vendor.js
+++ b/app/assets/javascripts/wizard-vendor.js
@@ -1,5 +1,4 @@
 //= require template_include.js
-//= require select2.js
 //= require jquery.ui.widget.js
 //= require jquery.fileupload.js
 //= require sweetalert.js
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 565e4317447..d1c9e353363 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -3,10 +3,29 @@
 @import "vendor/pikaday";
 @import "common/foundation/helpers";
 @import "common/foundation/base";
-@import "vendor/select2";
 @import "common/foundation/mixins";
 @import "common/foundation/variables";
-@import "common/select-kit/*";
+@import "common/select-kit/admin-agree-flag-dropdown";
+@import "common/select-kit/admin-delete-flag-dropdown";
+@import "common/select-kit/categories-admin-dropdown";
+@import "common/select-kit/category-chooser";
+@import "common/select-kit/category-drop";
+@import "common/select-kit/category-row";
+@import "common/select-kit/category-selector";
+@import "common/select-kit/combo-box";
+@import "common/select-kit/composer-actions";
+@import "common/select-kit/dropdown-select-box";
+@import "common/select-kit/future-date-input-selector";
+@import "common/select-kit/list-setting";
+@import "common/select-kit/mini-tag-chooser";
+@import "common/select-kit/multi-select";
+@import "common/select-kit/notifications-button";
+@import "common/select-kit/period-chooser";
+@import "common/select-kit/pinned-button";
+@import "common/select-kit/select-kit";
+@import "common/select-kit/tag-chooser";
+@import "common/select-kit/toolbar-popup-menu-options";
+@import "common/select-kit/topic-notifications-button";
 @import "common/components/*";
 @import "common/input_tip";
 @import "common/topic-entrance";
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index e66c539e393..5557f7c795e 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -5,6 +5,8 @@
 
 @import "common/admin/customize";
 @import "common/admin/flagging";
+@import "common/admin/dashboard_next";
+@import "common/admin/admin_reports";
 @import "common/admin/moderation_history";
 @import "common/admin/suspend";
 
@@ -38,10 +40,7 @@ $mobile-breakpoint: 700px;
 
   tr {text-align: left;}
   td, th {padding: 8px;}
-  td {
-    border-bottom: 1px solid $primary-low;
-    border-top: 1px solid $primary-low;
-  }
+
   th {
     text-align: left;
 
@@ -74,7 +73,7 @@ $mobile-breakpoint: 700px;
 
     .site-text-search {
       padding: 0.5em;
-      font-size: 1em;
+      font-size: $font-0;
       width: 50%;
     }
 
@@ -101,7 +100,7 @@ $mobile-breakpoint: 700px;
 
     h3 {
       font-weight: normal;
-      font-size: 1em;
+      font-size: $font-0;
     }
 
     button.edit {
@@ -130,14 +129,23 @@ $mobile-breakpoint: 700px;
   }
 }
 
-.content-list li a span.count {
-  font-size: 0.857em;
-  float: right;
-  margin-right: 10px;
-  background-color: $primary-low;
-  padding: 2px 5px;
-  border-radius: 5px;
-  color: $primary;
+.content-list {
+  width: 27%;
+  float: left;
+  li a span.count {
+    font-size: $font-down-1;
+    float: right;
+    margin-right: 10px;
+    background-color: $primary-low;
+    padding: 2px 5px;
+    border-radius: 5px;
+    color: $primary;
+  }
+}
+
+.content-body {
+  float: left;
+  width: 60%;
 }
 
 .admin-content {
@@ -158,6 +166,20 @@ $mobile-breakpoint: 700px;
       }
     }
 
+    &.web_crawlers {
+      tr {
+        th:nth-of-type(1) {
+          width: 60%;
+        }
+      }
+      td.x-value {
+        max-width: 0;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+    }
+
     .bar-container {
       float: left;
       width: 300px;
@@ -194,15 +216,15 @@ $mobile-breakpoint: 700px;
   .location-box {
     position: absolute;
     width: 460px;
-    right: 0px;
-    z-index: 990;
-    box-shadow: 0 2px 6px rgba(0,0,0, .8);
+    right: 0;
+    z-index: z("dropdown");
+    box-shadow: shadow("card");
     margin-top: -2px;
     background-color: $secondary;
     padding: 12px 12px 5px;
 
     .powered-by {
-      font-size: 0.857em;
+      font-size: $font-down-1;
       position: absolute;
       bottom: -10px;
       left: 10px;
@@ -229,7 +251,7 @@ $mobile-breakpoint: 700px;
   .select-kit.multi-select {
     width: 500px;
   }
-  .select-box-kit.dropdown-select-box {
+  .select-kit.dropdown-select-box {
     width: auto;
   }
 
@@ -237,6 +259,10 @@ $mobile-breakpoint: 700px;
     width: 200px;
     float: right;
   }
+  .header-search-results {
+    clear: both;
+    padding: 4px;
+  }
 }
 
 .admin-container .controls {
@@ -255,6 +281,10 @@ $mobile-breakpoint: 700px;
   background-color: $primary-low;
   padding: 10px 10px 3px 0;
   @include clearfix;
+  nav {
+    float: left;
+    margin-left: 12px;
+  }
   .nav.nav-pills {
     li.active {
       a {
@@ -267,8 +297,8 @@ $mobile-breakpoint: 700px;
     }
   }
   h1 {
-    font-size: 1.429em;
-    line-height: 25px;
+    font-size: $font-up-3;
+    line-height: $line-height-medium;
     color: $primary;
   }
   .controls {
@@ -368,7 +398,7 @@ $mobile-breakpoint: 700px;
     }
 
     .d-editor-textarea-wrapper {
-      max-width: 60%; 
+      max-width: 60%;
       .d-editor-button-bar {
         overflow: hidden;
       }
@@ -403,7 +433,7 @@ $mobile-breakpoint: 700px;
   // The admin-nav becomes a slide-out menu at the mobile-nav breakpoint
   @media (max-width: $mobile-breakpoint) {
     position: absolute;
-    z-index: 0;
+    z-index: z("base") - 1;
     width: 50%;
   }
 }
@@ -411,7 +441,7 @@ $mobile-breakpoint: 700px;
 .admin-detail {
   width: 76.5765%;
   @media (max-width: $mobile-breakpoint) {
-    z-index: 10;
+    z-index: z("base");
     width: 100%;
   }
   background-color: $secondary;
@@ -476,9 +506,6 @@ $mobile-breakpoint: 700px;
           width: 100% !important; // !important overrides hard-coded mobile width of 68px
         }
       }
-      .select2-container-multi .select2-choices {
-        border: none;
-      }
     }
     .setting-controls {
       float: left;
@@ -502,21 +529,13 @@ $mobile-breakpoint: 700px;
       background-color: $secondary;
       border: 1px solid $primary-low;
       border-radius: 3px;
-      box-shadow: inset 0 1px 1px rgba(51, 51, 51, 0.3);
       transition: border linear 0.2s, box-shadow linear 0.2s;
 
-      li.select2-search-choice {
-        cursor: pointer;
-        .select2-search-choice-close {
-          content: "x"
-        }
-      }
-
       li.sortable-placeholder {
         padding: 3px 5px 3px 18px;
-        margin: 3px 0px 3px 5px;
+        margin: 3px 0 3px 5px;
         position: relative;
-        line-height: 13px;
+        line-height: $line-height-small;
         cursor: default;
         border: 1px dashed #AAA;
         border-radius: 3px;
@@ -531,8 +550,8 @@ $mobile-breakpoint: 700px;
 
     .desc, .validation-error {
       padding-top: 3px;
-      font-size: .857em;
-      line-height: 1.4em;
+      font-size: $font-down-1;
+      line-height: $line-height-large;
     }
 
     .validation-error {
@@ -544,7 +563,7 @@ $mobile-breakpoint: 700px;
     }
 
     h3 {
-      font-size: 1em;
+      font-size: $font-0;
       font-weight: normal;
     }
   }
@@ -560,11 +579,15 @@ $mobile-breakpoint: 700px;
       background-color: $highlight-medium;
     }
   }
+
+  .warning {
+    color: $danger;
+  }
 }
 
 section.details {
   h1 {
-    font-size: 1.429em;
+    font-size: $font-up-3;
     color: $primary;
     padding: 5px 10px;
     margin: 30px 0 5px 0;
@@ -603,8 +626,9 @@ section.details {
 }
 
 .display-row {
-  line-height: 30px;
-  padding: 5px;
+  display: flex;
+  align-items: center;
+  padding: 10px 5px;
   &:nth-of-type(1) {
     border-top: 0;
   }
@@ -626,7 +650,7 @@ section.details {
     margin-left: 12px;
     @media (max-width: $mobile-breakpoint) {
       margin-left: 0;
-      line-height: 20px;
+      line-height: $line-height-large;
       margin-top: 5px;
     }
   }
@@ -649,7 +673,7 @@ section.details {
     width: 800px;
     float: left;
     margin-left: 12px;
-    font-size: 0.857em;
+    font-size: $font-down-1;
 
     button {
       margin-left: 10px;
@@ -679,7 +703,7 @@ section.details {
 
     .list-badge {
       float: right;
-      font-size: .857em;
+      font-size: $font-down-1;
       font-weight: normal;
       padding: 0 6px;
       color: $secondary;
@@ -694,7 +718,7 @@ section.details {
     p.help {
       margin: 0;
       color: dark-light-choose($primary-medium, $secondary-medium);
-      font-size: 0.857em;
+      font-size: $font-down-1;
     }
   }
 
@@ -765,15 +789,15 @@ section.details {
   }
 
   .badge-errors {
-    font-size: 1em;
-    line-height: 16px;
+    font-size: $font-0;
+    line-height: $line-height-medium;
     padding: 4px;
     background-color: $primary-low;
   }
 
   .badge-query-plan {
-    font-size: 0.857em;
-    line-height: 13px;
+    font-size: $font-down-1;
+    line-height: $line-height-medium;
     padding: 4px;
     background-color: $primary-low;
   }
@@ -814,14 +838,6 @@ section.details {
   .controls {
     margin-top: 10px;
   }
-  .select2-container {
-    width: 100%;
-  }
-  .select2-choices {
-    width: 100%;
-    border-color: dark-light-choose($primary-low-mid, $secondary-high);
-  }
-
   .content-list {
     margin-right: 20px;
   }
@@ -843,24 +859,80 @@ section.details {
   }
 }
 
-.version-check {
+.version-checks {
+  display: flex;
+  flex-wrap: wrap;
 
-  th {
-    text-align: left !important;
+  .section-title {
+    flex: 1 1 100%;
+    border-bottom: 1px solid $primary-low;
+    margin-bottom: .5em;
+  }
+}
+
+.version-check {
+  display: flex;
+  flex: 1 1 50%;
+  flex-wrap: wrap;
+  align-items: flex-start;
+  align-self: flex-start;
+  justify-content: space-between;
+  padding: 10px 0 10px 0;
+
+  .upgrade-header {
+    flex: 1 1 100%;
+    @media screen and (max-width: 650px) {
+       margin: 0;
+    }
+    tr {
+      border: none;
+    }
+    th {
+      background: transparent;
+      text-align: left;
+      padding: 0;
+    }
+  }
+
+  h2 {
+    flex: 1 1 100%;
   }
 
   .version-number {
-    font-size: 1.429em;
+    font-size: $font-up-2;
+    line-height: $line-height-medium;
+    box-sizing: border-box;
     font-weight: bold;
+    margin: 0 0 1em 0;
+    padding-right: 20px;
+    flex: 1 1 27%;
+    h3 {
+      flex: 1 0 auto;
+      white-space: nowrap;
+    }
+    h4 {
+      font-size: $font-down-2;
+      margin-bottom: 0;
+    }
   }
 
-  .face {
-    width: 20px;
+  .version-status {
+    display: flex;
+    align-items: center;
+    margin: 0 0 1em 0;
+    flex: 1 1 24%;
+    box-sizing: border-box;
+    padding-right: 20px;
+    min-width: 250px;
+    @include small-width {
+      max-width: unset;
+    }
+    .face {
+      margin: 0 .75em 0 0;
+      font-size: $font-up-3;
+    }
   }
 
-  .version-notes .fa {
-    vertical-align: bottom;
-  }
 
   &.critical .version-notes .normal-note {
     display: none;
@@ -870,7 +942,7 @@ section.details {
   }
 
   .fa {
-    font-size: 1.857em;
+    font-size: $font-up-4;
   }
 
   .up-to-date {
@@ -886,7 +958,7 @@ section.details {
 
 .update-nag {
   .d-icon {
-    font-size: 1.429em;
+    font-size: $font-up-3;
   }
 }
 
@@ -904,18 +976,32 @@ table.api-keys {
   }
 
   td.key {
-    font-size: 0.857em;
+    font-size: $font-down-1;
   }
 }
 
 .dashboard-stats {
+  box-sizing: border-box;
   margin-bottom: 30px;
-  margin-right: 40px;
+  flex: 1 1 50%;
+  box-sizing: border-box;
+  &.version-check {
+    margin: 0;
+  }
+  &.detected-problems {
+    border-left: 1px solid $primary-low;
+    margin: 10px 0 0 0;
+    padding-left: 20px;
+  }
   h4 {
     font-weight: normal;
     margin-bottom: 8px;
   }
 
+  @media screen and (max-width: 650px) {
+    flex: 1 1 100%;
+  }
+
   table {
     width: 100%;
 
@@ -950,13 +1036,13 @@ table.api-keys {
         display: none;
       }
 
-      &.trending-up {
+      &.high-trending-up, &.trending-up {
         i.up {
           color: $success;
           display: inline;
         }
       }
-      &.trending-down {
+      &.high-trending-down, &.trending-down {
         i.down {
           color: $danger;
           display: inline;
@@ -971,50 +1057,66 @@ table.api-keys {
     }
 
     tr.reverse-colors {
-      td.value.trending-down i.down {
+      td.value.high-trending-down i.down, td.value.trending-down i.down {
         color: $success;
       }
-      td.value.trending-up i.up {
+      td.value.high-trending-up i.up, td.value.trending-up i.up {
         color: $danger;
       }
     }
   }
 
   &.detected-problems {
-    background: $primary-low;
-    margin-bottom: 20px;
+    display: flex;
+    margin-bottom: 30px;
 
     .look-here {
-      float: left;
-      margin: 20px 10px 0 10px;
+      margin: 10px 20px;
 
       .fa {
-        font-size: 2.286em;
-        vertical-align: middle;
-        color: $primary
+        font-size: $font-up-5;
+        color: $danger
       }
     }
+    @media screen and (max-width: 650px) {
+        border-left: none;
+        border-top: 1px solid $primary-low;
+        padding: 20px 0 0 0;
+        .look-here {
+          margin-left: 0;
+        }
+    }
+    h3 {
+      display: flex;
+    }
+
 
     .problem-messages {
-      float: left;
-      width: 80%;
-      margin-left: 1%;
+      display: flex;
+
       a {
         text-decoration: underline;
       }
-      .actions {
-        text-align: right;
-      }
+
       .btn {
         background: $primary-low;
       }
       ul {
         margin-left: 0;
-        padding-left: 20px;
+        padding-left: 90px;
+        @media screen and (max-width:650px) {
+          padding-left: 20px;
+        }
       li {
         margin-bottom: 10px;
         }
       }
+      p.actions {
+        padding-left: 75px;
+        @media screen and (max-width:650px) {
+          padding-left: 0;
+        }
+      }
   }
 }
 
@@ -1313,6 +1415,10 @@ table.api-keys {
   width: 20px;
 }
 
+.admin-plugins-official-badge {
+  color: $success;
+}
+
 // Backups
 // --------------------------------------------------
 
@@ -1612,7 +1718,7 @@ table#user-badges {
   }
   .reply-key {
     display: block;
-    font-size: .857em;
+    font-size: $font-down-1;
     color: dark-light-choose($primary-medium, $secondary-high);
   }
   .username div {
@@ -1642,7 +1748,7 @@ table#user-badges {
   }
   .error-description {
     color: #919191;
-    font-size: .857em;
+    font-size: $font-down-1;
   }
   hr {
     margin: 0;
@@ -1744,7 +1850,11 @@ table#user-badges {
     margin-top: 10px;
   }
   label {
-    font-size: 1em;
+    font-size: $font-0;
+  }
+
+  &.content-list {
+    width: 100%;
   }
 }
 
@@ -1778,7 +1888,7 @@ table#user-badges {
 }
 
 .watched-words-list {
-  margin-top: 40px;
+  margin-top: 20px;
 }
 .watched-word {
   display: inline-block;
@@ -1801,7 +1911,7 @@ table#user-badges {
   float: right;
   text-align: right;
   .instructions {
-    font-size: .857em;
+    font-size: $font-down-1;
   }
 }
 .watched-words-detail {
@@ -1859,6 +1969,12 @@ table#user-badges {
   margin-right: 20px;
 }
 
+.admin-reports, .dashboard-next {
+  &.admin-contents {
+    margin: 0;
+  }
+}
+
 .cbox0 { background: blend-primary-secondary(0%); }
 .cbox10 { background: blend-primary-secondary(10%); }
 .cbox20 { background: blend-primary-secondary(20%); }
diff --git a/app/assets/stylesheets/common/admin/admin_reports.scss b/app/assets/stylesheets/common/admin/admin_reports.scss
new file mode 100644
index 00000000000..9a064a85c02
--- /dev/null
+++ b/app/assets/stylesheets/common/admin/admin_reports.scss
@@ -0,0 +1,53 @@
+.admin-reports {
+  h3 {
+    border-bottom: 1px solid $primary-low;
+    margin-bottom: .5em;
+    padding-bottom: .5em;
+  }
+
+  .report-container {
+    display: flex;
+
+    .loading-container {
+      width: 100%;
+    }
+
+    .visualization {
+      display: flex;
+      flex: 4;
+    }
+
+    .filters {
+      display: flex;
+      flex: 1;
+      align-items: center;
+      flex-direction: column;
+      margin-left: 2em;
+
+      .date-picker  {
+        margin: 0;
+        width: 195px;
+      }
+
+      .combo-box, .date-picker-wrapper, .btn {
+        width: 100%;
+        margin-bottom: 1em;
+      }
+    }
+
+    @include small-width  {
+      flex-direction: column;
+      min-width: 100%;
+
+      .visualization {
+        order: 2;
+      }
+
+      .filters {
+        order: 1;
+        margin: 0;
+        align-items: flex-start;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss
index d39b9ababe8..453af75209e 100644
--- a/app/assets/stylesheets/common/admin/customize.scss
+++ b/app/assets/stylesheets/common/admin/customize.scss
@@ -4,10 +4,10 @@
     margin-bottom: 10px;
     input {
       margin-bottom: 0;
-      font-size: 1rem;
+      font-size: $font-down-2;
     }
     .btn-small {
-      font-size: 1rem;
+      font-size: $font-down-2;
     }
   }
 
@@ -36,7 +36,7 @@
   .admin-footer {
     margin-top: 20px;
   }
-  .select2-chosen, .color-schemes li {
+  .color-schemes li {
     .fa {
       margin-right: 6px;
       color: dark-light-choose($primary-medium, $secondary-medium);
@@ -55,13 +55,28 @@
     }
   }
 
+  .theme.settings {
+    .theme-setting {
+      padding-bottom: 0;
+      padding-top: 18px;
+      min-height: 35px;
+    }
+    .setting-label {
+      width: 25%;
+      h3 {
+        margin-top: 0;
+        margin-bottom: .5rem;
+      }
+    }
+  }
+
   .current-style.maximized {
     position: fixed;
     top: 0;
     bottom: 0;
     left: 0;
     right: 0;
-    z-index: 100000;
+    z-index: z("fullscreen");
     background-color: white;
     width: 100%;
     padding: 0;
@@ -111,7 +126,7 @@
       .d-icon-mobile {
         position: relative;
         top: -3px;
-        font-size: 1.5em;
+        font-size: $font-up-3;
         max-height: 20px;
       }
     }
@@ -194,7 +209,7 @@
 
   .status-message {
     display: block;
-    font-size: 0.857em;
+    font-size:  $font-down-1;
     margin-top: 8px;
   }
 
@@ -220,3 +235,27 @@
     margin-top: 20px;
   }
 }
+
+#custom_emoji {
+  width: 27%;
+}
+
+.modal-body .inputs .check-private {
+  margin-top: 10px;
+  label {
+    padding-left: 0;
+  }
+  label input {
+    width: auto;
+    margin: 3px 0;
+  }
+
+  .public-key {
+    margin-top: 10px;
+    textarea {
+      cursor: auto;
+      height: 150px;
+    }
+  }
+}
+
diff --git a/app/assets/stylesheets/common/admin/dashboard_next.scss b/app/assets/stylesheets/common/admin/dashboard_next.scss
new file mode 100644
index 00000000000..78e4cdf0c0b
--- /dev/null
+++ b/app/assets/stylesheets/common/admin/dashboard_next.scss
@@ -0,0 +1,511 @@
+.dashboard-next {
+  .section-top {
+    margin-bottom: 1em;
+  }
+
+  .section-columns {
+    display: flex;
+    justify-content: space-between;
+
+    @include small-width  {
+      flex-direction: column;
+    }
+
+    .section-column {
+      min-width: calc(50% - .5em);
+      max-width: 100%;
+
+      &:last-child, {
+        margin-left: 1em;
+      }
+
+      &:first-child {
+        margin-right: 1em;
+      }
+
+      @include small-width  {
+        min-width: 100%;
+
+        &:last-child {
+          order: 1;
+        }
+
+        &:first-child {
+          order: 2;
+        }
+      }
+    }
+
+    @include small-width  {
+      .section-column:last-child,
+      .section-column:first-child {
+        margin: 0;
+      }
+    }
+  }
+
+  .section {
+    .section-title {
+      h2 {
+        margin: 0 .5em 0 0;
+      }
+
+      display: flex;
+      @media screen and (max-width: 400px) {
+        flex-wrap: wrap;
+      }
+      align-items: center;
+      justify-content: space-between;
+      border-bottom: 1px solid $primary-low;
+      margin-bottom: .5em;
+      padding-bottom: .5em;
+    }
+
+    .section-body {
+      padding: 1em 0 0;
+    }
+  }
+
+  .charts {
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+
+    .chart {
+      max-width: calc(100% * 1/3.2);
+      width: 100%;
+      flex-grow: 1;
+      flex-basis: 100%;
+      display: flex;
+      margin-bottom: 1em;
+    }
+
+    @include small-width  {
+      .chart {
+        max-width: 100%;
+      }
+    }
+
+    .chart-canvas-container {
+      position: relative;
+      margin-left: -5px;
+    }
+
+    .chart-canvas {
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  .misc {
+    display: flex;
+    border: 1px solid $primary-low;
+
+    .durability, .last-dashboard-update {
+      flex: 1 1 50%;
+      box-sizing: border-box;
+      margin: 1em 0;
+      padding: 0 1em;
+    }
+
+    .durability {
+      display: flex;
+      flex-wrap: wrap;
+      justify-content: space-between;
+
+      .backups, .uploads {
+        flex: 1 1 100%;
+      }
+
+      .uploads p:last-of-type {
+        margin-bottom: 0;
+      }
+
+      .durability-title {
+        text-transform: capitalize;
+      }
+    }
+
+    @media screen and (max-width: 400px) {
+      flex-wrap: wrap;
+      .durability, .last-dashboard-update {
+        flex: 1 1 100%;
+        text-align: left;
+      }
+      .last-dashboard-update {
+        display: block;
+        margin: 0 20px 20px 20px;
+        padding: 20px 0 0 0;
+        border-top: 1px solid $primary-low;
+        border-left: none;
+      }
+    }
+    .last-dashboard-update {
+      border-left: 1px solid $primary-low;
+      text-align: center;
+      display: flex;
+      justify-content: center;
+      div {
+        align-self: center;
+        h4 {
+          margin-bottom: 0;
+        }
+      }
+    }
+  }
+
+  .top-referred-topics, .trending-search {
+    th:first-of-type {
+      text-align: left;
+    }
+  }
+
+  .top-referred-topics {
+    .dashboard-table table {
+      table-layout: auto;
+    }
+  }
+
+  .community-health {
+    .period-chooser .period-chooser-header {
+      .selected-name, .d-icon {
+        font-size: $font-up-1;
+      }
+
+      .d-icon {
+        margin: 0;
+      }
+    }
+  }
+}
+
+.dashboard-mini-chart {
+  .status {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: .5em;
+    padding: 0 .45em 0 0;
+
+    .title {
+      font-size: $font-up-1;
+      font-weight: 700;
+      margin: 0;
+
+      a { color: $primary; }
+
+      .info {
+        cursor: pointer;
+        margin-left: .25em;
+        color: $primary-low-mid;
+
+        &:hover {
+          color: $primary-medium;
+        }
+      }
+    }
+
+    .trend {
+      align-items: center;
+
+      &.trending-down, &.high-trending-down {
+        color: $danger;
+      }
+
+      &.trending-up, &.high-trending-up {
+        color: $success;
+      }
+
+      &.no-change {
+        color: $primary-medium;
+      }
+
+      .trend-value {
+        font-size: $font-up-1;
+      }
+
+      .trend-icon {
+        font-size: $font-up-1;
+        font-weight: 700;
+      }
+    }
+  }
+
+  .conditional-loading-section {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    flex: 1;
+    width: 100%;
+    min-width: 0;
+  }
+
+  @include small-width  {
+    max-width: 100%;
+  }
+
+  &.is-loading {
+    height: 200px;
+  }
+
+  .loading-container.visible {
+    display: flex;
+    align-items: center;
+    height: 100%;
+    width: 100%;
+  }
+
+  .tooltip {
+    cursor: pointer;
+  }
+
+  .chart-title {
+    align-items: center;
+    display: flex;
+    justify-content: space-between;
+
+    h3 {
+      margin: 1em 0;
+      a, a:visited {
+        color: $primary;
+      }
+    }
+  }
+}
+
+.dashboard-table {
+  margin-bottom: 1em;
+
+  &.is-disabled {
+    background: $primary-low;
+    padding: 1em;
+  }
+
+  @media screen and (max-width: 650px)  {
+    table {
+      tbody tr td {
+        font-size: $font-down-1;
+      }
+    }
+  }
+
+  &.is-loading {
+    height: 150px;
+  }
+
+  .table-title {
+    align-items: center;
+    display: flex;
+    justify-content: space-between;
+
+    h3 {
+      margin: 1em 0 0 0;
+    }
+  }
+
+  table {
+    table-layout: fixed;
+    border: 1px solid $primary-low;
+
+    thead {
+      border: 1px solid $primary-low;
+      tr {
+        th {
+          text-align: center;
+          text-overflow: ellipsis;
+          overflow: hidden;
+          white-space: nowrap;
+        }
+      }
+    }
+
+    tbody {
+      border-top: none;
+      tr {
+        td:first-child {
+          text-overflow: ellipsis;
+          overflow: hidden;
+          white-space: normal;
+        }
+
+        td {
+          text-align: center;
+          padding: 8px;
+        }
+
+        td.left {
+          text-align: left;
+        }
+
+        td.title {
+          text-align: left;
+        }
+
+        td.value {
+          text-align: right;
+          padding: 8px 21px 8px 8px; // accounting for negative right caret margin
+          &:nth-of-type(2) {
+            padding: 8px 12px 8px;
+          }
+          i {
+            margin-right: -12px; // align on caret
+            @media screen and (max-width: 650px) {
+              margin-right: -9px;
+            }
+          }
+
+          &.high-trending-up, &.trending-up {
+            i { color: $success; }
+          }
+          &.high-trending-down, &.trending-down {
+            i { color: $danger; }
+          }
+        }
+      }
+    }
+  }
+}
+
+.user-metrics {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  margin-left: -5%;
+  margin: 2em 0 .75em -5%;   // Negative margin allows for a margin when in 2-columns,
+  .dashboard-inline-table { //  and "hides" margin when the item spans 100% width
+    flex: 1 0 auto;
+    max-width: 95%;
+  }
+  .table-cell {
+    display: flex;
+    flex: 0 1 auto;
+    margin: 0 10px 5px 0;
+    border: 1px solid $primary-low;
+    border-radius: 10px;
+    .label {
+      display: flex;
+      align-items: center;
+      color: $primary;
+      background: $primary-very-low;
+      justify-content: center;
+      border-radius: 9px 0 0 9px;
+      padding: 0 5px 0 8px;
+
+      .d-icon {
+        margin-right: 5px;
+        font-size: $font-down-1;
+      }
+    }
+
+    .value {
+      padding: 0 8px 0 5px;
+    }
+    &.user-newuser{
+      .label {
+        color: $primary-high;
+      }
+    }
+    &.user-basic , &.user-member {
+      border-color: $bronze;
+      .label {
+        border-color: $bronze;
+        background: $bronze;
+        color: $secondary;
+      }
+    }
+    &.user-regular {
+      border-color: $silver;
+      .label {
+        border-color: $silver;
+        background: $silver;
+        color: $secondary;
+      }
+    }
+    &.user-leader {
+      border-color: $gold;
+      .label {
+        background: $gold;
+        border-color: $gold;
+        color: $secondary;
+      }
+    }
+  }
+}
+
+.dashboard-inline-table {
+  margin-left: 5%;
+  margin-bottom: 1.25em;
+
+  .table-title {
+    border-bottom: 1px solid $primary-low;
+    margin-bottom: 1em;
+  }
+
+  .table-container {
+    display: flex;
+    flex-wrap: wrap;
+    flex: 1 1 auto;
+  }
+}
+
+.dashboard-table.activity-metrics {
+  table {
+    @media screen and (min-width: 400px) {
+      table-layout: auto;
+    }
+    tr th {
+      text-align: right;
+    }
+    .d-icon {
+      color: $primary-low-mid;
+      min-width: 14px;
+      text-align: center;
+    }
+    @media screen and (max-width: 400px) {
+      .d-icon { display: none; }
+      td.title {
+        padding: 8px 0 8px 4px;
+      }
+    }
+  }
+}
+
+
+.rtl .dashboard-next {
+  .section-column {
+    &:last-child, {
+      margin-right: 1em;
+      margin-left: 0;
+    }
+
+    &:first-child {
+      margin-left: 1em;
+      margin-right: 0;
+    }
+  }
+
+  .dashboard-table table tbody tr {
+    td.title {
+      text-align: right;
+    }
+
+    td.value i {
+      margin-right: 0;
+      margin-left: -12px;
+    }
+  }
+
+  .user-metrics .table-cell {
+    margin: 0 0 5px 10px;
+  }
+
+  .table-cell {
+    .label {
+      border-radius: 0 9px 9px 0;
+
+      .d-icon {
+        margin-right: 0;
+        margin-left: 5px;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/admin/flagging.scss b/app/assets/stylesheets/common/admin/flagging.scss
index 4574540c2a4..e4d191678ea 100644
--- a/app/assets/stylesheets/common/admin/flagging.scss
+++ b/app/assets/stylesheets/common/admin/flagging.scss
@@ -43,6 +43,9 @@
       word-wrap: break-word;
 
       .flagged-post-user-details {
+        display: flex;
+        justify-content: space-between;
+
         .username {
           font-weight: bold;
           color: $primary;
@@ -64,6 +67,10 @@
     }
   }
 
+  .flagged-post-reply-count {
+    font-weight: normal;
+  }
+
   .flag-user-lists {
     display: flex;
     align-items: flex-start;
@@ -167,7 +174,7 @@
 
   .type-count {
     color: $primary-medium;
-    font-size: 0.857em;
+    font-size: $font-down-1;
   }
 }
 
diff --git a/app/assets/stylesheets/common/admin/moderation_history.scss b/app/assets/stylesheets/common/admin/moderation_history.scss
index aac258b92eb..37ca38e5455 100644
--- a/app/assets/stylesheets/common/admin/moderation_history.scss
+++ b/app/assets/stylesheets/common/admin/moderation_history.scss
@@ -15,7 +15,7 @@
       margin: 1em 0;
       color: $primary-medium;
       white-space: pre-wrap;
-      line-height: 1em;
+      line-height: $line-height-small;
       width: 300px;
     }
   }
diff --git a/app/assets/stylesheets/common/admin/suspend.scss b/app/assets/stylesheets/common/admin/suspend.scss
index efdfb68f791..8e2ab667e1f 100644
--- a/app/assets/stylesheets/common/admin/suspend.scss
+++ b/app/assets/stylesheets/common/admin/suspend.scss
@@ -21,3 +21,13 @@
     float: right;
   }
 }
+
+.modal-body {
+  .penalty-post-edit {
+    margin-top: 1em;
+
+    textarea {
+      height: 10em;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 57121a834b4..82fff84febe 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -1,6 +1,10 @@
+.topic-list.shared-drafts {
+  margin-bottom: 1.5em;
+}
+
 .show-more {
   width: 100%;
-  z-index: 1;
+  z-index: z("base");
   &.has-topics {
     position: absolute;
     top: 7px;
@@ -8,15 +12,30 @@
 }
 
 .list-controls {
+  clear: both;
+  .combo-box .combo-box-header {
+    background: $primary-low;
+    color: $primary;
+    border: 1px solid transparent;
+    padding: 5px 6px 5px 10px;
+    font-size: $font-0;
+    transition: none;
+  }
   .select-kit {
     align-self: center;
-
+    .select-kit-collection {
+      font-size: $font-down-1;
+      max-height: 40vh;
+      .texts, .icons {
+        font-size: $font-up-1;
+      }
+    }
     &.categories-admin-dropdown, &.category-notifications-button, &.tag-notifications-button {
       float: right;
     }
   }
 }
-
+  
 .topic-list-item.visited,
 .latest-topic-list-item.visited,
 .category-topic-link.visited {
@@ -24,7 +43,7 @@
 }
 
 .topic-list-main-link {
-  font-size: 1.143em;
+  font-size: $font-up-1;
   a.title {
     padding: 15px 0;
     word-break: break-word;
@@ -51,7 +70,6 @@
       vertical-align: top;
       margin-top: 2px;
     }
-    border-bottom: 1px solid $primary-low;
 
     &.last-visit {
       border-bottom: none;
@@ -68,25 +86,21 @@
     td {
       border-bottom: 1px solid $danger-low;
       line-height: 0.1em;
-      padding: 0px;
+      padding: 0;
       text-align: center;
     }
 
     td span {
       background-color: $secondary;
       color: $danger-low;
-      padding: 0px 8px;
-      font-size: 0.929em;
+      padding: 0 8px;
+      font-size: $font-down-1;
     }
   }
 
-  > tbody > tr:first-of-type {
-    border-top: 3px solid $primary-low;
-  }
-
   th,
   td {
-    line-height: 1.25;
+    line-height: $line-height-large;
     text-align: left;
     vertical-align: middle;
 
@@ -94,13 +108,13 @@
   th {
     color: dark-light-choose($primary-medium, $secondary-medium);
     font-weight: normal;
-    font-size: 1em;
+    font-size: $font-0;
     button .d-icon {color: dark-light-choose($primary-medium, $secondary-medium);}
 
   }
   td {
     color: dark-light-choose($primary-medium, $secondary-medium);
-    font-size: 1em;
+    font-size: $font-0;
   }
 
   .main-link {
@@ -111,12 +125,18 @@
     padding-left: 5px;
   }
 
+  span.badge-category {
+    .category-name {
+      max-width: 150px;
+    }
+  }
+
   .topic-excerpt {
-    font-size: 0.929em;
-    margin-top: 8px;
-    color: dark-light-choose($primary-medium, $secondary-medium);
+    font-size: $font-down-1;
+    margin-top: 5px;
+    color: dark-light-choose($primary-high, $secondary-high);
     word-wrap: break-word;
-    line-height: 1.4;
+    line-height: $line-height-large;
     padding-right: 20px;
   }
   .topic-statuses:empty {
@@ -155,6 +175,10 @@
 
 }
 
+.heatmap-high, .heatmap-high a {color: #fe7a15 !important;}
+.heatmap-med, .heatmap-med a {color: #cf7721 !important;}
+.heatmap-low, .heatmap-low a {color: #9b764f !important;}
+
 .topic-list.categories {
 
   .category .badge-notification {
@@ -174,7 +198,7 @@
   }
   td.stats {
     .unit {
-      font-size: .857em;
+      font-size: $font-down-1;
     }
   }
 
@@ -182,8 +206,8 @@
       td {
         padding: 2px;
         vertical-align: bottom;
-        line-height: 24px;
-        &.value { text-align: right; font-size: 1.429em; }
+        line-height: $line-height-large;
+        &.value { text-align: right; font-size: $font-up-3; }
         &.unit  { text-align: left; }
       }
     }
@@ -198,15 +222,6 @@
   }
 }
 
-.list-controls {
-  .category-dropdown-menu .home {
-    color: $primary;
-    margin-left: 8px;
-  }
-
-  clear: both;
-}
-
 #list-area {
   margin-bottom: 100px;
   .empty-topic-list {
@@ -217,7 +232,7 @@
     padding: 0;
     border: 0;
     color: $danger-medium;
-    font-size: 1em;
+    font-size: $font-0;
     cursor: default;
   }
 }
@@ -225,7 +240,7 @@
 .topic-list {
   .alert {
     margin-bottom: 0;
-    font-size: 1em;
+    font-size: $font-0;
   }
   .spinner {
     margin-top: 40px;
@@ -240,7 +255,7 @@ ol.category-breadcrumb {
   display: block;
   float: left;
   list-style: none;
-  margin: 0 10px 0 0;
+  margin: 0 10px 10px 0;
   padding: 0;
 
   li {
@@ -253,29 +268,6 @@ ol.category-breadcrumb {
   }
 }
 
-.list-controls .category-dropdown-menu {
-  overflow-x: hidden;
-  overflow-y: auto;
-  position: absolute;
-  border: 1px solid $primary-low;
-  background-color: $secondary;
-  z-index: 100;
-
-  a.badge-category, a.badge-category-parent {
-    line-height: 19px;
-    overflow:hidden;
-    margin-bottom: 0;
-  }
-  a.badge-category, .dropdown-header {
-    font-size: 0.857em;
-    font-weight: bold;
-    float: none;
-    text-transform: none;
-    max-width:200px;
-    text-overflow:ellipsis;
-  }
-}
-
 .d-icon-thumb-tack.unpinned {
   @include fa-icon-rotate(180deg, 1);
   color: $primary;
@@ -288,70 +280,6 @@ ol.category-breadcrumb {
   padding-right: 3px;
 }
 
-.period-chooser {
-  display: inline-block;
-  @include unselectable;
-
-  h2 {
-    float: left;
-    margin: 5px 0 10px;
-    .top-date-string {
-      font-size: 0.857em;
-    }
-  }
-
-  .top-date-string {
-    color: dark-light-choose($primary-medium, $secondary-high);
-    font-weight: normal;
-    text-transform: uppercase;
-  }
-
-  button {
-    outline: 0;
-    background: transparent;
-    border: 0;
-    font-size: 1.429em;
-    padding: 5px 10px 0 10px;
-  }
-
-  #period-popup {
-
-    @include unselectable;
-
-    font-size: 1.143em;
-    border: 1px solid $primary-low;
-    padding: 5px;
-    background: $secondary;
-    position: absolute;
-    z-index: 999;
-    box-shadow: 0 2px 2px rgba(0,0,0, .4);
-
-    ul {
-      list-style: none;
-      margin: 0;
-      padding: 0;
-
-      li {
-        margin: 0;
-        padding: 0;
-        font-weight: bold;
-        a, a:visited {
-          display: block;
-          padding: 5px;
-          color: $primary;
-        }
-        .top-date-string {
-          font-weight: normal;
-          font-size: 0.857em;
-        }
-        &:hover {
-          background-color: $highlight-medium;
-        }
-      }
-    }
-  }
-}
-
 .top-title-buttons {
   display: inline;
 
@@ -371,5 +299,18 @@ div.education {
 
 .table-heading {
   @extend .list-cell;
-  border-bottom: 2px solid $primary-low;
+  border-bottom: 3px solid $primary-low;
 }
+
+// This is not what we want:
+//
+//     This is an overly-long topic title that would break just right
+//     *
+//
+// Instead, we want the line to break like this:
+//
+//     This is an overly-long topic title that would break just
+//     right *
+.topic-post-badges {
+  white-space: nowrap;
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/common/base/about.scss b/app/assets/stylesheets/common/base/about.scss
index 596f3f1a713..65e09d27c94 100644
--- a/app/assets/stylesheets/common/base/about.scss
+++ b/app/assets/stylesheets/common/base/about.scss
@@ -1,27 +1,19 @@
 section.about {
+  margin-bottom: 40px;
 
   h3 {
-    margin-bottom: 10px;
-    margin-top: 10px;
-  }
-
-
-  p {
-    margin: 10px 0;
+    margin-bottom: 15px;
   }
 
   table {
-    margin-top: 20px;
-    width: 90%;
+    width: auto;
 
     th {
       text-align: left;
     }
 
     td, th {
-      padding: 10px 5px 5px 5px;
-      border-bottom: 1px solid lighten($primary, 70%);
-      line-height: 1.0em;
+      padding: 10px;
     }
 
     td.title {
diff --git a/app/assets/stylesheets/common/base/activation.scss b/app/assets/stylesheets/common/base/activation.scss
index b6f45361d8c..ba0aa79df0b 100644
--- a/app/assets/stylesheets/common/base/activation.scss
+++ b/app/assets/stylesheets/common/base/activation.scss
@@ -10,8 +10,8 @@
 
   .account-created {
     .ac-message {
-      font-size: 1.143em;
-      line-height: 24px;
+      font-size: $font-up-1;
+      line-height: $line-height-large;
     }
 
     .activation-controls {
diff --git a/app/assets/stylesheets/common/base/alert.scss b/app/assets/stylesheets/common/base/alert.scss
index 397c7c9da86..3d93a7be470 100644
--- a/app/assets/stylesheets/common/base/alert.scss
+++ b/app/assets/stylesheets/common/base/alert.scss
@@ -7,9 +7,9 @@
     position: relative;
     top: -2px;
     right: -21px;
-    line-height: 18px;
+    line-height: $line-height-small;
     float: right;
-    font-size: 1.429em;
+    font-size: $font-up-3;
     font-weight: bold;
     color: $primary;
     opacity: 0.2;
diff --git a/app/assets/stylesheets/common/base/category-list.scss b/app/assets/stylesheets/common/base/category-list.scss
index 1e01b6268d7..ebd131dadbb 100644
--- a/app/assets/stylesheets/common/base/category-list.scss
+++ b/app/assets/stylesheets/common/base/category-list.scss
@@ -1,3 +1,19 @@
+.category-list {
+  table-layout: fixed;
+  .category-text-title {
+    display: flex;
+    align-items: baseline;
+  }
+  .category-name {
+    display: inline-block;
+    max-width: 100%; 
+    overflow: hidden;
+    text-overflow: ellipsis;
+    vertical-align: text-top;
+    line-height: $line-height-medium;
+  }
+}
+
 .category-boxes, .category-boxes-with-topics {
   display: flex;
   flex-wrap: wrap;
@@ -10,6 +26,7 @@
     display: flex;
     flex-direction: row;
     align-content: flex-start;
+    cursor: pointer;
 
     box-sizing: border-box;
 
@@ -75,7 +92,7 @@
   .description {
     padding: 0 1em 1em 1em;
     text-align: center;
-    font-size: 1em;
+    font-size: $font-0;
     color: dark-light-choose($primary-medium, $secondary-high);
     .overflow {
       max-height: 6em;
@@ -85,12 +102,14 @@
   }
 
   h3 {
-    font-size: 1.286em;
+    font-size: $font-up-2;
     margin-bottom: 0.5em;
     margin-top: 0.25em;
-    line-height: 1.1em;
+    line-height: $line-height-medium;
     text-align: center;
     color: $primary;
+    overflow: hidden;
+    text-overflow: ellipsis;
   }
 }
 
@@ -102,8 +121,10 @@
   }
 
   h3 {
-    font-size: 1.286em;
+    font-size: $font-up-2;
     text-align: center;
+    overflow: hidden;
+    text-overflow: ellipsis;
   }
 
   .category-box-heading {
diff --git a/app/assets/stylesheets/common/base/colorpicker.scss b/app/assets/stylesheets/common/base/colorpicker.scss
index 83f29f78537..d78ff1684b7 100644
--- a/app/assets/stylesheets/common/base/colorpicker.scss
+++ b/app/assets/stylesheets/common/base/colorpicker.scss
@@ -3,19 +3,19 @@
 .category-color-editor {
   input {
     width: 70px;
+    margin-right: 10px;
   }
 
   .color-title {
     display: inline-block;
-    width: 130px;
+    width: 120px;
   }
 
   .colors-container {
     display: inline-block;
     vertical-align: middle;
     padding-top: 4px;
-    padding-left: 15px;
-    max-width: 300px;
+    max-width: 240px;
 
     .colorpicker {
       border: 1px solid $primary-low; 
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index a5fe8a86ee7..70e8ea148b2 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -11,15 +11,15 @@
   max-width: 1475px;
   width: 100%;
   &.hide-preview {
-    max-width:740px;  
+    max-width:740px;
   }
   @media screen and (max-width: 1200px) {
     min-width: 0;
   }
-  z-index: 999;
+  z-index: z("composer","content");
   transition: height 250ms ease, background 250ms ease, transform 250ms ease, max-width 250ms ease;
   background-color: $secondary;
-  box-shadow: 0 -1px 40px rgba(0,0,0, .12);
+  box-shadow: shadow("composer");
 
   .reply-area {
     display: flex;
@@ -29,7 +29,7 @@
   .saving-text,
   .draft-text {
     display: none;
-    padding-left: 10px;   
+    padding-left: 10px;
     .spinner {
       margin-left: 5px;
       border-color: $secondary;
@@ -88,18 +88,56 @@
   }
 
   .reply-to {
-    color: $primary-medium;
+    color: $primary-high;
     margin: 5px 0 10px 0;
     display: flex;
     align-items: center;
     i {
-      color: $primary-medium;
+      color: $primary-high;
     }
     .reply-details {
-      overflow: hidden;
-      text-overflow: ellipsis;
+      max-width: calc(100% - 60px);
+      flex: 1 1 auto;
       white-space: nowrap;
-      max-width: calc(100% - 100px);
+    }
+    .composer-action-title {
+      display: inline-flex;
+      align-items: center;
+      width: auto;
+      max-width: 100%;
+
+      .avatar {
+        width: 20px;
+      }
+
+      .action-title {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+
+      .topic-link, .user-link, .post-link {
+        margin-right: 5px;
+      }
+
+      .username {
+        margin-right: 5px;
+        max-width: 100px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        @media screen and (max-width: 500px) {
+          display: none;
+        }
+      }
+
+      .d-icon {
+        margin-right: 5px;
+      }
+
+      img.avatar {
+        margin-right: 3px;
+      }
     }
     .composer-controls {
       margin-left: auto;
@@ -167,6 +205,11 @@
     .category-input {
       flex-basis: 25%;
       margin-left: 0;
+      margin-right: 5px;
+      @media screen and (max-width: 920px) {
+        flex-basis: 100%;
+        margin-right: 0;
+      }
     }
   }
 
@@ -179,28 +222,25 @@
   }
 
   #reply-title {
-    padding: 6px 10px;
     margin: 0 0 5px 0;
     flex-basis: 50%;
   }
 
-  .tag-chooser {
+  .mini-tag-chooser {
     flex: 1 1 25%;
-    margin: 0 0 5px 10px;
-    border: 1px solid $primary-medium;
+    margin: 0 0 5px 0;
     background: $secondary;
+    z-index: z("composer","dropdown");
     @media all and (max-width: 900px) {
       margin: 0;
       flex: 1 1 100%;
     }
-    .select2-choices {
-      border: none;
-    }
-    &.select2-dropdown-open, &.select2-container-active {
-      border-color: $tertiary;
-    }
   }
 
+  .popup-tip {
+    z-index: z("composer","dropdown");
+  }
+    
   .wmd-controls {
     position: relative;
     display: flex;
@@ -210,7 +250,8 @@
   }
 
   .d-editor-button-bar .btn {
-    padding: 3px 8px;
+    padding: 4px 8px;
+    display: inline-block;
     @media all and (max-width: 800px) {
       padding: 5px;
     }
@@ -219,7 +260,7 @@
   .submit-panel {
     display: flex;
     flex-shrink: 0;
-    margin-top: 10px;
+    margin: 7px 0 3px 0;
   }
 
   .save-or-cancel {
@@ -230,7 +271,13 @@
       flex: 0 0 auto;
     }
     .cancel {
-      margin-left: 10px;
+      margin-left: 1.25em;
+      line-height: normal;
+      color: $primary-high;
+      transition: color 250ms;
+      &:hover {
+        color: $danger;
+      }
     }
     #draft-status,
     #file-uploading {
@@ -238,9 +285,10 @@
     }
     #file-uploading {
       display: flex;
+      align-items: center;
       a {
         margin-left: 5px;
-        color: $primary-medium;
+        color: $primary-high;
       }
       .spinner {
         margin-right: 5px;
@@ -257,12 +305,8 @@
     }
   }
 
-  .create {
-    margin-right: 5px;
-  }
-
   #draft-status, #file-uploading {
-    color: $primary-medium;
+    color: $primary-high;
   }
 }
 
@@ -271,7 +315,7 @@
 }
 
 .autocomplete {
-  z-index: 999999;
+  z-index: z("composer","dropdown") + 1;
   position: absolute;
   width: 240px;
   background-color: $secondary;
@@ -300,7 +344,7 @@
           color: $primary;
         }
         span.name {
-          font-size: .857em;
+          font-size: $font-down-1;
           vertical-align: middle;
         }
         &.selected {
@@ -326,12 +370,11 @@ div.ac-wrap.disabled {
 
 div.ac-wrap div.item a.remove, .remove-link {
   margin-left: 4px;
-  font-size: .857em;
-  line-height: 10px;
-  padding: 1.5px 1.5px 1.5px 2.5px;
+  font-size: $font-down-1;
+  line-height: $line-height-small;
+  padding: 1px 3.5px;
   border-radius: 12px;
-  width: 10px;
-  display: inline-block;
+  box-sizing: border-box;
   border: 1px solid $primary-low;
   &:hover {
     background-color: $danger-low;
@@ -344,17 +387,17 @@ div.ac-wrap div.item a.remove, .remove-link {
 div.ac-wrap {
   overflow: auto;
   max-height: 150px;
+  display: flex;
+  flex-wrap: wrap;
   background-color: $secondary;
   border: 1px solid $primary-medium;
-  padding: 5px 4px 1px 10px;
   div.item {
     float: left;
-    margin-bottom: 4px;
-    margin-right: 10px;
+    padding: 4px 10px;
+    line-height: $line-height-large;
     span {
-      height: 24px;
       display: inline-block;
-      line-height: 20px;
+      line-height: $line-height-medium;
     }
   }
 
@@ -368,12 +411,11 @@ div.ac-wrap {
 
   input[type="text"] {
     float: left;
-    margin-bottom: 4px;
-    height: 24px;
     display: block;
-    border: 0;
-    padding: 0;
     box-shadow: none;
+    border: 0;
+    margin: 0;
+    background: transparent;
   }
 }
 
@@ -385,4 +427,4 @@ div.ac-wrap {
 
 .md-table {
   overflow-y: auto;
-}
\ No newline at end of file
+}
diff --git a/app/assets/stylesheets/common/base/crawler_layout.scss b/app/assets/stylesheets/common/base/crawler_layout.scss
index beb3208c46f..9d072e7c70d 100644
--- a/app/assets/stylesheets/common/base/crawler_layout.scss
+++ b/app/assets/stylesheets/common/base/crawler_layout.scss
@@ -3,16 +3,16 @@ body.crawler {
     width: 100%;
     position: absolute;
     top: 0;
-    z-index: 1001;
+    z-index: z("max");
     background-color: #fff;
     padding: 10px;
-    box-shadow: 0 2px 4px -1px rgba(0,0,0,0.25);
+    box-shadow: shadow("header");
   }
   div.topic-list div[itemprop='itemListElement'] {
-    padding: 10px 0px;
+    padding: 10px 0;
     border-bottom: 1px solid #e9e9e9;
     .page-links a {
-      padding: 0px 4px;
+      padding: 0 4px;
     }
   }
   div#main-outlet {
@@ -23,7 +23,7 @@ body.crawler {
     }
   }
   footer nav {
-    margin: 50px 0px;
+    margin: 50px 0;
     a {
       padding: 15px;
     }
diff --git a/app/assets/stylesheets/common/base/directory.scss b/app/assets/stylesheets/common/base/directory.scss
index c9092a03b7d..3b8315da391 100644
--- a/app/assets/stylesheets/common/base/directory.scss
+++ b/app/assets/stylesheets/common/base/directory.scss
@@ -26,28 +26,26 @@
     td, th {
       padding: 0.5em;
       text-align: left;
-      border-bottom: 1px solid $primary-low; 
+      border-bottom: 1px solid $primary-low;
+      @media screen and (max-width: $small-width) {
+        padding: .5em .25em;
+      }
 
       .number, .time-read {
-        font-size: 1.429em;
-        color: $primary-medium; 
+        font-size: $font-up-3;
+        color: $primary-medium;
+        @media screen and (max-width: $small-width) {
+         font-size: $font-up-1;
+        }          
       }
-    }
-
-    tr.me {
-      td {
-        background-color: dark-light-choose($highlight-low, $highlight-medium);
-
-        .username a, .name, .title, .number, .time-read {
-          color: $primary-medium;           
-        }
+      .time-read {
+        white-space: nowrap;
       }
     }
 
     th.sortable {
       cursor: pointer;
       white-space: nowrap;
-
       width: 13%;
       .d-icon-heart {
         color: $love;
@@ -58,8 +56,14 @@
       }
 
       &:hover {
-        background-color: $primary-low; 
+        background-color: $primary-low;
       }
     }
   }
+  .me {
+    background-color: dark-light-choose($highlight-low, $highlight-medium);
+    .username a, .name, .title, .number, .time-read {
+      color: $primary-medium;
+    }
+  }
 }
diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index ce410bfb13f..6c7ab1802cf 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -46,15 +46,14 @@ body {
   @include clearfix;
 }
 
+// setting a static limit on big and small prevents nesting abuse
 big {
-  font-size: 2.286em;
+  font-size: $font-up-5;
 }
-
 small {
-  font-size: .786em;
+  font-size: $font-down-2;
 }
 
-//setting a static limit on big and small prevents nesting abuse
 blockquote {
   @include post-aside;
   clear: both;
@@ -120,7 +119,7 @@ input {
   &[type="radio"],
   &[type="checkbox"] {
     margin: 3px 0;
-    line-height: normal;
+    line-height: $line-height-medium;
     cursor: pointer;
   }
   &[type="submit"],
@@ -166,7 +165,7 @@ textarea {
 
   &:focus:required:invalid:focus {
     border-color: $danger;
-    box-shadow: 0 0 6px $danger;
+    box-shadow: shadow("focus-danger");
   }
 }
 
@@ -187,18 +186,17 @@ input {
   &[type="color"] {
     @include appearance-none;
     display: inline-block;
-    height: 18px;
-    padding: 4px 10px;
+    padding: $input-padding;
     margin-bottom: 9px;
-    font-size:  1em;
-    line-height: 1.25;
+    font-size:  $font-0;
+    line-height: $line-height-large;
     color: $primary;
     background-color: $secondary;
     border: 1px solid $primary-medium;
     border-radius: 0;
     &:focus {
       border-color: $tertiary;
-      box-shadow: $tertiary 0px 0px 6px 0px;
+      box-shadow: shadow("focus");
       outline: 0;
     }
   }
@@ -210,13 +208,13 @@ textarea {
   border: 1px solid $primary-medium;
   &:focus {
     border-color: $tertiary;
-    box-shadow: $tertiary 0px 0px 6px 0px;    
+    box-shadow: shadow("focus");
     outline: 0;
   }
 }
 
 select {
-  border: 1px solid $primary-low;  
+  border: 1px solid $primary-low;
 }
 
 // Common Classes
@@ -353,7 +351,7 @@ select {
   top: -18px !important;
   right: -18px !important;
   box-shadow: 0 0 0 9999px rgba($primary, 0.85);
-  z-index: 1040;
+  z-index: z("modal","overlay");
 }
 
 .ring-first-notification {
@@ -363,7 +361,7 @@ select {
   right: 70px;
   top: 60px;
   width: 230px;
-  line-height: 30px;
+  line-height: $line-height-medium;
 }
 
 .ring {
@@ -423,7 +421,7 @@ select {
 .content-list {
   h3 {
     color: $primary-medium;
-    font-size: 1.143em;
+    font-size: $font-up-1;
     padding-left: 5px;
     margin-bottom: 10px;
   }
@@ -474,8 +472,8 @@ select {
 
   .control-label {
     font-weight: bold;
-    font-size: 1.286em;
-    line-height: 2;
+    font-size: $font-up-2;
+    line-height: $line-height-large;
   }
 
   .controls {
@@ -517,7 +515,7 @@ select {
 
 #loading-message {
   position: absolute;
-  font-size: 2.286em;
+  font-size: $font-up-5;
   text-align: center;
   top: 120px;
   left: 500px;
@@ -535,3 +533,7 @@ select {
     }
   }
 }
+
+.inline {
+  display: inline;
+}
diff --git a/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss b/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss
index c842e1f7110..ba989a4f0d9 100644
--- a/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss
+++ b/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss
@@ -49,7 +49,7 @@
 
       h3 {
         font-weight: normal;
-        font-size: 1.143em;
+        font-size: $font-up-1;
       }
     }
   }
diff --git a/app/assets/stylesheets/common/base/emoji.scss b/app/assets/stylesheets/common/base/emoji.scss
index 78595461bfd..4588662b6df 100644
--- a/app/assets/stylesheets/common/base/emoji.scss
+++ b/app/assets/stylesheets/common/base/emoji.scss
@@ -5,14 +5,12 @@ img.emoji {
 }
 
 .emoji-picker {
-  box-shadow: 0 1px 5px rgba(0,0,0,0.4);
   background-clip: padding-box;
-  z-index: 10000;
+  z-index: z("modal","content"); 
   position: fixed;
   display: none;
   flex-direction: row;
   height: 300px;
-  border-radius: 3px;
   color: dark-light-choose(darken($primary, 40%), blend-primary-secondary(90%));
   background-color: $secondary;
   border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
@@ -54,19 +52,20 @@ img.emoji {
 .emoji-picker .list {
   overflow-y: scroll;
   -webkit-overflow-scrolling: touch;
-  padding: 0px;
+  padding: 0;
   flex: 1;
   flex-direction: column;
 }
 
 .emoji-picker .section-header {
   padding: 8px;
-  margin-bottom: 4px;
-  padding-bottom: 4px;
-  border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  margin-top: 2px;
+  margin-bottom: 0px;
+  padding-bottom: 0px;
   justify-content: space-between;
   display: flex;
   align-items: center;
+  font-weight: bold;
 }
 
 .emoji-picker .section-header .title {
@@ -100,7 +99,6 @@ img.emoji {
 
 .emoji-picker .info {
   text-overflow: ellipsis;
-  max-width: 232px;
   padding-left: 8px;
   white-space: nowrap;
   overflow: hidden;
@@ -142,7 +140,7 @@ img.emoji {
 
 .emoji-picker .diversity-picker .d-icon {
   color: #fff;
-  font-size: 1em;
+  font-size: $font-0;
   text-shadow: 0.5px 1.5px 0 rgba(0,0,0,0.3);
 }
 
@@ -155,8 +153,6 @@ img.emoji {
   -moz-box-sizing: content-box;
   box-sizing: content-box;
   height: 20px;
-  margin: 0;
-  padding: 0;
   border: 0;
   vertical-align: top;
   width: 20px;
@@ -168,7 +164,7 @@ img.emoji {
 .emoji-picker .section-group button.emoji:hover, .emoji-picker .results button.emoji:hover {
   display: inline-block;
   vertical-align: top;
-  border-radius: 50%;
+  border-radius: 2px;
   background-color: lighten($tertiary, 40%);
 }
 
@@ -177,7 +173,7 @@ img.emoji {
 }
 
 .emoji-picker-modal.fadeIn {
-  z-index: 9999;
+  z-index: z("modal","overlay");
   position: fixed;
   left: 0;
   top: 0;
@@ -202,7 +198,7 @@ img.emoji {
 
 .emoji-picker .filter .d-icon-search {
   color: dark-light-choose($header_primary-medium, $header_primary);
-  font-size: 1.143em;
+  font-size: $font-up-1;
   margin-left: 5px;
   margin-right: 5px;
 }
diff --git a/app/assets/stylesheets/common/base/exception.scss b/app/assets/stylesheets/common/base/exception.scss
index 346a833432e..122b1605ed7 100644
--- a/app/assets/stylesheets/common/base/exception.scss
+++ b/app/assets/stylesheets/common/base/exception.scss
@@ -4,15 +4,13 @@
 
   .face {
     font-size: 4.286em;
-    height: 60px;
   }
   .reason {
-    font-size: 1.857em;
-    height: 24px;
+    font-size: $font-up-4;
   }
   .url {
     font-style: italic;
-    font-size: .857em;
+    font-size: $font-down-1;
   }
   .desc {
     margin-top: 16px;
diff --git a/app/assets/stylesheets/common/base/faqs.scss b/app/assets/stylesheets/common/base/faqs.scss
index b652ff58ea4..c02f981538c 100644
--- a/app/assets/stylesheets/common/base/faqs.scss
+++ b/app/assets/stylesheets/common/base/faqs.scss
@@ -1,32 +1,25 @@
 .body-page {
-
-  // Consistent vertical spacing
-  blockquote,
-  h1,
-  h2,
-  h3,
-  hr,
-  p,
-  pre,
-  ul,
-  ol,
-  table {
-    margin: 0 0 20px;
-    font-size: 1.143em;
-    line-height: 22px;
+  /* intended only for /about /faq, /guidelines, /tos, and /privacy */
+  width: 100%;
+  max-width: 700px;
+  font-size: $font-up-1;  
+  .mobile-view & {
+    font-size: $font-0;
+    margin-top: 20px;
   }
 
+
   li {
      margin-bottom: 8px;
   }
 
+  .nav-pills {
+    margin-bottom: 20px;
+  }
+
   ul:not(.nav-pills),
   ol:not(.nav-pills) {
     margin-left: 40px;
   }
 
-  /* intended only for /faq, /guidelines, /tos, and /privacy */
-  width: 700px;
-  padding-left:20px;
-
 }
diff --git a/app/assets/stylesheets/common/base/group.scss b/app/assets/stylesheets/common/base/group.scss
index 3f04c28bf18..fa088560cd0 100644
--- a/app/assets/stylesheets/common/base/group.scss
+++ b/app/assets/stylesheets/common/base/group.scss
@@ -1,59 +1,45 @@
+// We should try to reuse the user page HTML for groups when possible
+// To style group content differently, use the existing classes with a .group parent class.
+// For example: .group .user-navigation 
+
 .group-details-container {
-  background: rgba(230, 230, 230, 0.3);
+  background: $primary-very-low;
   padding: 20px;
   margin-bottom: 15px;
+  position: relative;
 }
 
-.group-post {
-  .group-post-header {
-    display: flex;
+.group-outlet {
+  position: relative;
+}
 
-    .group-post-avatar {
-      margin-right: 0.5em;
-    }
+.group-members-actions {
+  display: flex;
+  flex-wrap: wrap;
+  width: 100%;
 
-    .time,
-    .delete-info {
-      color: lighten($primary, 40%);
-      font-size: 0.857em;
-    }
-
-    .group-member-info {
-      display: flex;
-      color: lighten($primary, 40%);
-    }
+  input + .group-members-manage {
+    margin-left: auto;
   }
 
-  .group-post-info {
-    display: flex;
-    width: 100%;
-    justify-content: space-between;
-    .group-post-title {
-      font-size: 1.143em;
-    }
+  .group-username-filter {
+    margin: 0 0 5px 0;
+    vertical-align: middle;
   }
 
-  .group-post-excerpt {
-    margin: 1em 0;
-    word-wrap: break-word;
-    color: $primary;
-  }
-
-  padding: 1em 0;
-  border-bottom: 1px solid $primary-low;
 }
 
 .group-info {
   width: 100%;
 
   .group-info-name {
-    font-size: 1.429em;
+    font-size: $font-up-3;
     font-weight: bold;
     color: $primary;
   }
 
   .group-info-full-name {
-    font-size: 1.286em;
+    font-size: $font-up-2;
     color: dark-light-choose($primary-high, $secondary-low);
   }
 
@@ -78,7 +64,7 @@
   }
 }
 
-.group-logs-filter {
+.group-manage-logs-filter {
   margin-right: 10px;
 
   &:hover {
@@ -86,23 +72,19 @@
   }
 }
 
-table.group-logs {
+table.group-manage-logs {
   width: 100%;
 
-  th, tr {
-    border-bottom: 1px solid $primary-low;
-  }
-
   th {
     text-align: left;
-    padding: 5px 0px;
+    padding: 5px 0;
   }
 
   td {
-    padding: 10px 0px;
+    padding: 10px 0;
   }
 
-  .group-logs-expand-details {
+  .group-manage-logs-expand-details {
     cursor: pointer;
 
     i {
@@ -115,13 +97,13 @@ table.group-members {
   width: 100%;
   table-layout: fixed;
 
-  tr {
-    border-bottom: 1px solid $primary-low;
+  th:first-child {
+    width: 30%;
+    text-align: left;
   }
 
-  th:first-child {
-    width: 60%;
-    text-align: left;
+  th:last-child {
+    width: 5%;
   }
 
   th.group-members-actions {
@@ -129,9 +111,8 @@ table.group-members {
   }
 
   th {
-    border-bottom: 3px solid $primary-low;
     text-align: center;
-    padding: 5px 0px 5px 5px;
+    padding: 5px 0 5px 5px;
     color: dark-light-choose($primary-medium, $secondary-medium);
     font-weight: normal;
   }
@@ -158,7 +139,7 @@ table.group-members {
 
     td {
       text-align: center;
-      color: blend-primary-secondary(50%);
+      color: $primary-medium;
       padding: 0.8em 0;
     }
   }
@@ -168,23 +149,9 @@ table.group-members {
   color: $primary;
 }
 
-.form-horizontal {
+.form-vertical {
   .group-flair-inputs {
     display: inline-block;
-
-    input[type="text"] {
-      width: 80% !important;
-      margin-bottom: 10px;
-    }
-
-    .group-flair-left {
-      float: left;
-    }
-
-    .group-flair-right {
-      float: left;
-      margin-left: 30px;
-    }
   }
 
   .avatar-flair-preview {
@@ -197,10 +164,19 @@ table.group-members {
   }
 }
 
-.group-edit {
-  .form-horizontal {
+.group-form-save {
+  margin-right: 20px;
+}
+
+.group-add-members {
+  .group-add-members-make-owner {
     label {
-      font-weight: bold;
+      display: inline;
+      vertical-align: middle;
+    }
+
+    input[type='checkbox'] {
+      vertical-align: middle;
     }
   }
 }
diff --git a/app/assets/stylesheets/common/base/groups.scss b/app/assets/stylesheets/common/base/groups.scss
index 6ea6a1a8c9e..9837b3f46d2 100644
--- a/app/assets/stylesheets/common/base/groups.scss
+++ b/app/assets/stylesheets/common/base/groups.scss
@@ -1,6 +1,24 @@
 .groups-page {
   h1 {
-    margin: 20px 0px;
+    margin-bottom: 20px;
+    display: inline-block;
+  }
+}
+
+.groups-header {
+  margin-bottom: 30px;
+}
+
+.groups-header-filters {
+  display: inline-block;
+
+  .groups-header-filters-type {
+    vertical-align: middle;
+  }
+
+  .groups-header-filters-name {
+    vertical-align: middle;
+    margin: 0;
   }
 }
 
@@ -9,22 +27,55 @@
 
   th {
     border-bottom: 1px solid $primary-low;
-    padding: 5px 0px;
+    padding: 0.5em;
     text-align: left;
   }
 
+  .sortable {
+    &:hover {
+      background-color: $primary-low;
+      cursor: pointer;
+    }
+  }
+
   tr {
-    border-bottom: 1px solid $primary-low; 
 
     td {
-      color: blend-primary-secondary(50%);
-      padding: 0.8em 0;
+      padding: 0.8em;
+      color: $primary-medium;
+    }
+
+    td.groups-info {
+      width: 50%;
+    }
+
+    td.group-user-status {
+      i {
+        color: $primary;
+      }
     }
 
     td.groups-user-count {
-      font-size: 1.286em;
+      width: 17%;
+      font-size: $font-up-2;
     }
-  }
+
+    td.groups-table-type {
+      width: 17%;
+      font-size: $font-up-1;
+    }
+
+    td.groups-table-membership {
+      .group-membership-button {
+        display: inline-block;
+      }
+
+      > span {
+        margin-right: 5px;
+        font-size: $font-up-1;
+      }
+    }
+   }
 
   .groups-info {
     .groups-info-name {
@@ -38,7 +89,7 @@
     }
 
     .groups-info-title {
-      font-size: 0.857em;
+      font-size: $font-down-1;
       color: dark-light-choose($primary-medium, $secondary-medium);
     }
 
diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index 79a23a404cf..f3615a4d90b 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -2,9 +2,9 @@
   width: 100%;
   position: absolute;
   top: 0;
-  z-index: 1001;
+  z-index: z("header");
   background-color: $header_background;
-  box-shadow: 0 2px 4px -1px rgba(0,0,0, .25);
+  box-shadow: shadow("header");
 
   .docked & {
     position: fixed;
@@ -33,11 +33,19 @@
   .panel {
     float: right;
     position: relative;
+    display: flex;
+    align-items: center;
+  }
+
+  .hamburger-panel, .user-menu, .search-menu {
+    width: 0; // Flexbox fix for Safari 
+  }
+
+  .header-buttons {
+    margin-top: .2em;
   }
 
   .login-button, button.sign-up-button {
-    float: left;
-    margin-top: 7px;
     padding: 6px 10px;
     .fa { margin-right: 3px; }
   }
@@ -46,14 +54,12 @@
     margin-left: 7px;
   }
 
-  .d-header-icons {
-    float: right;
-  }
 }
 
 .header-dropdown-toggle, .drop-down, .panel-body {
   .flagged-posts, .queued-posts {
     background: $danger;
+    min-width: 6px;
   }
 }
 
@@ -62,14 +68,17 @@
   margin: 0 0 0 5px;
   list-style: none;
 
-
   > li {
     float: left;
   }
   .icon {
     position: relative;
-    display: block;
-    padding: 3px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 2.2857em;
+    height: 2.2857em;
+    padding: .2143em;
     color: dark-light-choose(scale-color($header_primary, $lightness: 50%), $header_primary);
     text-decoration: none;
     cursor: pointer;
@@ -77,11 +86,14 @@
     border-left: 1px solid transparent;
     border-right: 1px solid transparent;
     transition: all linear .15s;
-
-
-    &:hover {
+    outline: none;
+    img.avatar {
+      width: 2.2857em;
+      height: 2.2857em;
+    }
+    &:hover, &:focus { 
       color: $primary;
-      background-color:  $primary-low;
+      background-color: $primary-low;
       border-top: 1px solid transparent;
       border-left: 1px solid transparent;
       border-right: 1px solid transparent;
@@ -91,7 +103,7 @@
       background-color: $primary-low;
     }
   }
-  .drop-down-visible & {
+  .drop-down-mode & {
     .active .icon {
       position: relative;
       color: #7b7b7b;
@@ -101,16 +113,12 @@
       border-left: 1px solid $primary-low;
       border-right: 1px solid $primary-low;
 
-      .flagged-posts {
-        right: 24px;
-      }
-
       &:after {
         display: block;
         position: absolute;
         top: 100%;
         left: 0;
-        z-index: 1101;
+        z-index: z("header") + 1; // Higher than .menu-panel
         width: 100%;
         height: 0;
         content: "";
@@ -123,10 +131,9 @@
   }
 
   .d-icon {
-    width: 32px;
-    height: 32px;
-    font-size: 1.714em;
-    line-height: 32px;
+    width: 100%;
+    font-size: $font-up-4;
+    line-height: $line-height-large;
     display: inline-block;
   }
   .notifications {
@@ -135,7 +142,7 @@
   .ring {
     position: absolute;
     top: -9px;
-    z-index: 1;
+    z-index: z("base");
     margin-left: 0;
   }
   .header-dropdown-toggle {
@@ -143,14 +150,14 @@
   }
   .badge-notification {
     position: absolute;
-    z-index: 1;
+    z-index: z("base");
     left: 0;
-    top: -9px;
+    top: -4px;
     min-width: 6px;
   }
   .unread-notifications {
     left: auto;
-    right: 0;
+    right: -3px;
     background-color: dark-light-choose($tertiary-medium, $tertiary);
   }
   .unread-private-messages, .ring {
diff --git a/app/assets/stylesheets/common/base/history.scss b/app/assets/stylesheets/common/base/history.scss
index 138784a7376..430ee671fa9 100644
--- a/app/assets/stylesheets/common/base/history.scss
+++ b/app/assets/stylesheets/common/base/history.scss
@@ -13,6 +13,21 @@
 
   #revision-controls {
     display: inline-block;
+    margin-bottom: 5px;
+  }
+
+  .revision-content {
+    width: 47.5%;
+    float: left;
+    &:nth-of-type(2) {
+      margin-left: 5%;
+    }
+  }
+
+  #revision-details {
+    padding: 5px;
+    margin-top: 10px;
+    border-bottom: 3px solid $primary-low;     
   }
 
   #revisions .row:first-of-type {
diff --git a/app/assets/stylesheets/common/base/lightbox.scss b/app/assets/stylesheets/common/base/lightbox.scss
index 2570034d60d..b880a78bbe7 100644
--- a/app/assets/stylesheets/common/base/lightbox.scss
+++ b/app/assets/stylesheets/common/base/lightbox.scss
@@ -43,7 +43,7 @@
     margin: 6px;
     padding-right: 20px;
     color: blend-primary-secondary(50%);
-    font-size: 1em;
+    font-size: $font-0;
   }
 
   .expand {
diff --git a/app/assets/stylesheets/common/base/login.scss b/app/assets/stylesheets/common/base/login.scss
index d774ad0fed3..022030d4faa 100644
--- a/app/assets/stylesheets/common/base/login.scss
+++ b/app/assets/stylesheets/common/base/login.scss
@@ -1,6 +1,6 @@
 .caps-lock-warning {
   color: $danger;
-  font-size: 0.857em;
+  font-size: $font-down-1;
   font-weight: bold;
 }
 
@@ -12,10 +12,47 @@
   display: none;
 }
 
+#login-form {
+  table {
+    width: 100%;
+  }
+  a {
+    color: dark-light-choose($primary-high, $secondary-low);
+  }
+  td {
+    padding-right: 5px;
+  }
+}
+
+#new-account-link {
+  cursor: pointer;
+}
 
 $label-width: 92px;
 $input-width: 220px;
 
+.login-modal, .create-account {
+  tr {
+    border: none;
+  }
+  tr:not(.instructions) {
+    td {
+      padding: 10px 0 0 0;
+    }
+  }
+  td {
+    label, input {
+      margin-bottom: 0;
+      width: 100%;
+    }
+  }
+  .modal-footer {
+    .inline-spinner {
+      display: inline-flex;
+    }
+  }
+}
+
 .create-account {
   table {
     td.label {
@@ -28,9 +65,8 @@ $input-width: 220px;
   }
 
   .disclaimer {
-    font-size: 0.857em;
     color: dark-light-choose($primary-medium, $secondary-medium);
-    clear: both;
+    margin-top: .5em;
   }
 
   .user-field.confirm {
@@ -38,7 +74,7 @@ $input-width: 220px;
   }
 
   .user-field {
-    label {
+    > label {
       width: $label-width;
       float: left;
     }
@@ -58,9 +94,9 @@ $input-width: 220px;
       .instructions {
         color: dark-light-choose($primary-medium, $secondary-medium);
         margin: 0;
-        font-size: 0.857em;
+        font-size: $font-down-1;
         font-weight: normal;
-        line-height: 18px;
+        line-height: $line-height-medium;
       }
     }
     clear: both;
@@ -100,13 +136,28 @@ $input-width: 220px;
     .instructions {
       color: dark-light-choose($primary-medium, $secondary-medium);
       margin: 0;
-      font-size: 0.857em;
+      font-size: $font-down-1;
       font-weight: normal;
-      line-height: 18px;
+      line-height: $line-height-medium;
     }
   }
 }
 
+.auth-message {
+  padding: 0 15px 15px 15px;
+  &:empty {
+    padding: 0;
+  }
+}
+
+.modal tr.instructions {
+  display: flex;
+  flex-direction: column;
+  margin-top: 0.15em;
+  label {
+    color: dark-light-choose($primary-medium, $secondary-medium);
+  }
+}
 
 // alternate login / create new account buttons should be de-emphasized
 
@@ -114,4 +165,4 @@ button#login-link, button#new-account-link
 {
   background: transparent;
   color: dark-light-choose($primary-high, $secondary-low);
-}
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/common/base/magnific-popup.scss b/app/assets/stylesheets/common/base/magnific-popup.scss
index c1dfab230bf..ed4addcfda1 100644
--- a/app/assets/stylesheets/common/base/magnific-popup.scss
+++ b/app/assets/stylesheets/common/base/magnific-popup.scss
@@ -53,7 +53,7 @@ $iframe-ratio:                    9/16 !default;
 
 // Image-type options
 $include-image-type:              true !default;
-$image-background:                #444 !default;
+$image-background:                linear-gradient(45deg, #111 0%,#333 100%) !default;
 $image-padding-top:               40px !default;
 $image-padding-bottom:            40px !default;
 $include-mobile-layout-for-image: true !default; // Removes paddings from top and bottom
@@ -272,8 +272,7 @@ button {
 .mfp-close {
   width: 44px;
   height: 44px;
-  line-height: 44px;
-
+  line-height: $line-height-large;
   position: absolute;
   right: 0;
   top: 0;
@@ -286,7 +285,7 @@ button {
   padding: 0 0 18px 10px;
   color: $controls-color;
   font-style: normal;
-  font-size: 2em;
+  font-size: $font-up-5;
   font-family: Arial, Baskerville, monospace;
 
   &:hover,
@@ -324,8 +323,8 @@ button {
   top: 0;
   right: 0;
   color: $controls-text-color;
-  font-size: 0.857em;
-  line-height: 18px;
+  font-size: $font-down-1;
+  line-height: $line-height-medium;
 }
 
 // Navigation arrows
@@ -489,8 +488,8 @@ button {
     small {
       color: $caption-subtitle-color;
       display: block;
-      font-size: 0.857em;
-      line-height: 14px;
+      font-size: $font-down-1;
+      line-height: $line-height-medium;
     }
     figure {
       margin: 0;
@@ -506,7 +505,7 @@ button {
   }
   .mfp-title {
     text-align: left;
-    line-height: 18px;
+    line-height: $line-height-medium;
     color: $caption-title-color;
     word-wrap: break-word;
     padding-right: 36px; // leave some space for counter at right side
@@ -583,7 +582,7 @@ button {
           right: 0;
           width: 35px;
           height: 35px;
-          line-height: 35px;
+          line-height: $line-height-large;
           background: rgba(0, 0, 0, 0.6);
           position: fixed;
           text-align: center;
diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index 4c4fe1279bb..c724aea82d5 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -1,6 +1,7 @@
 .menu-panel.slide-in {
   position: fixed;
   right: 0;
+  box-shadow: shadow("header");
 
   .panel-body {
     position: absolute;
@@ -19,9 +20,9 @@
 
 .menu-panel {
   border: 1px solid $primary-low;
-  box-shadow: 0 2px 2px rgba(0,0,0, .25);
+  box-shadow: shadow("menu-panel");
   background-color: $secondary;
-  z-index: 1100;
+  z-index: z("header");
   padding: 0.5em;
   width: 300px;
 
@@ -44,7 +45,6 @@
     overflow-y: auto;
     overflow-x: hidden;
   }
-
 }
 
 .menu-links.columned {
@@ -59,38 +59,60 @@
     a {
       padding: 0.25em 0.5em;
       display: block;
-      &:hover {
+      &:hover, &:focus {
         background-color: $highlight-medium;
+        outline: none;
       }
     }
 
     .new {
-      font-size: 0.857em;
+      font-size: $font-down-1;
       margin-left: 0.5em;
       color: dark-light-choose($primary-medium, $secondary-medium);
     }
-
   }
 
   li.category-link {
     float: left;
     background-color: transparent;
-    width: 45%;
-    margin: 5px 5px 0 8px;
-    .box {margin-top: 0;}
+    display: inline-flex;
+    padding: 0.25em 0.5em;
+    width: 50%;
+    box-sizing: border-box;
     .badge-notification {
       color: dark-light-choose($primary-medium, $secondary-medium);
       background-color: transparent;
       display: inline;
       padding: 0;
+      font-size: $font-down-1;
+      line-height: $line-height-large;
+    }
+    .badge-wrapper {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      &.bar, &.bullet {
+        color: $primary;
+      }
+      &.box {
+        color: $secondary;
+        + a.badge.badge-notification {
+          padding-top: 2px;
+        }
+        span {
+          z-index: z("base") * -1;
+        }
+      }
     }
   }
-
+  
   // note these topic counts only appear for anons in the category hamburger drop down
   b.topics-count {
     color: dark-light-choose($primary-medium, $secondary-medium);
     font-weight: normal;
-    font-size: .786em;
+    font-size: $font-down-1;
+  }
+  .box + b.topics-count {
+      padding-top: 2px;      
   }
 
   span.badge-category {
@@ -123,7 +145,6 @@
     box-sizing: border-box;
     width: calc(100% - 6px);
     height: 32px;
-    padding: 5px;
   }
 
   .search-context {
@@ -156,7 +177,7 @@
 
   .search-link {
     .badge-category-parent {
-      line-height: 0.8em;
+      line-height: $line-height-small;
     }
     .topic-title {
       margin-right: 6px;
@@ -174,8 +195,8 @@
   }
 
   li:not(.category):not(.heading) {
-    font-size: 1em;
-    line-height: 16px;
+    font-size: $font-0;
+    line-height: $line-height-medium;
 
     .fa {
       font-size: inherit;
@@ -204,6 +225,9 @@
 .user-menu {
 
   .notifications {
+    width: 100%;
+    display: table;
+
     h3 {
       padding: 0 0.4em;
       font-weight: bold;
@@ -221,9 +245,19 @@
         display: none;
       }
 
-      span { color: $primary; }
-      &:hover { background-color: $highlight-medium; }
-      a { padding: 0; }
+      span { 
+        color: $primary; 
+      }
+
+      &:hover, &:focus { 
+        background-color: $highlight-medium; 
+        outline: none; 
+      }
+
+      a { 
+        padding: 0; 
+      }
+
       p {
         margin: 0;
         overflow: hidden;
@@ -296,9 +330,18 @@ div.menu-links-header {
   border-spacing: 0 0.5em;
   .menu-links-row {
     display: table-row;
+    li.glyphs {
+      text-align: right;
+      a {
+        display: inline-flex;
+        min-width: 15px;
+        justify-content: center;
+      } 
+    }
   }
-  a:hover {
+  a:hover, a:focus {
     background-color: $highlight-medium;
+    outline: none;
   }
   a {
     padding: 0.5em;
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index 30d2fc27e00..1b93f1b99ad 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -1,23 +1,51 @@
 .modal-open {
   .dropdown-menu {
-     z-index: 2050;
+     z-index: z("modal","dropdown");
   }
   .popover {
-    z-index: 2060;
+    z-index: z("modal","popover");
   }
   .tooltip {
-    z-index: 2070;
+    z-index: z("modal","tooltip");
   }
 
 }
 
+.bootbox.modal {
+  position: fixed;
+  z-index: z("modal","content");
+  overflow: auto;
+  height: auto;
+  background-color: $secondary;
+  box-shadow: shadow("card");
+  background-clip: padding-box;
+}
+
 .input-hint-text {
   margin-left: 0.5em;
   color: $secondary-high;
 }
 
 .modal-header {
+  display: flex;
+  align-items: center;
+  padding: 10px 15px;
   border-bottom: 1px solid $primary-low;
+
+  .title {
+    h3 {
+      margin-bottom: 0;
+    }
+
+    p {
+      margin: 0;
+    }
+  }
+
+  .modal-close {
+    order: 2;
+    margin-left: auto;
+  }
 }
 
 .modal-backdrop {
@@ -26,7 +54,7 @@
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: 1040;
+  z-index: z("modal","overlay");
   background-color: #111;
   &.fade {
     opacity: 0;
@@ -35,8 +63,7 @@
 
 .modal-backdrop,
 .modal-backdrop.fade.in {
-  -webkit-animation: fade .3s;
-          animation: fade .3s;
+  animation: fade .3s;
   opacity: .9;
   filter: alpha(opacity=90);
 }
@@ -47,43 +74,46 @@
     to { opacity: .9 }
 }
 
-@-webkit-keyframes fade {
-  from { opacity: 0 }
-    to { opacity: .9 }
-}
-
 // slide in
 @keyframes slidein {
   from { transform: translateY(-20%); }
     to { transform: translateY(0); }
 }
 
-@-webkit-keyframes slidein {
-  from { -webkit-transform: translateY(-20%); }
-    to { -webkit-transform: translateY(0); }
-}
-
 .modal-outer-container {
   display:table;
+  table-layout: fixed;
   width:100%;
   height:100%;
 }
 
 .modal-inner-container {
-  max-width: 710px;
+  display: table;
+  width: 100%;
+  min-width: 320px;
+  max-width: 700px;
   margin: 0 auto;
   background-color: $secondary;
   background-clip: padding-box;
+  box-shadow: shadow("modal");
+
+  @media screen and (min-width: 475px) {
+    min-width: 475px;
+    width: auto;
+  }
 
   .select-kit {
     width: 220px;
+
+    &.tag-chooser {
+      width: 100%;
+    }
   }
 }
 
 .create-account.in .modal-inner-container,
 .login-modal.in .modal-inner-container {
-  -webkit-animation: slidein .3s;
-          animation: slidein .3s;
+  animation: slidein .3s;
 }
 
 
@@ -98,15 +128,23 @@
   top: 0;
   width: 100%;
   height: 100%;
-  z-index: 1050;
+  z-index: z("modal","content");
   overflow: auto;
+
+  .modal-body {
+    max-height: none !important;
+  }
 }
+
 .modal-form {
   margin-bottom: 0;
 }
 .modal-footer {
-  padding: 14px 15px 15px;
+  padding: 14px 15px 10px;
   border-top: 1px solid $primary-low;
+  .btn {
+  margin: 0 5px 5px 0;
+  }
 }
 .modal-footer:before,
 .modal-footer:after {
@@ -123,6 +161,11 @@
       height: 10em;
     }
   }
+  @media screen and (min-width: 524px) {
+    .modal-inner-container {
+     min-width: 525px; 
+    }
+  }
 }
 
 .modal {
@@ -130,7 +173,7 @@
     padding: 10px 30px 10px 15px;
     background-color: $secondary;
     li > a {
-      font-size: 1em;
+      font-size: $font-0;
     }
     border-bottom: 1px solid $primary-low;
 
@@ -141,6 +184,10 @@
   }
 
   .modal-body {
+    box-sizing: border-box;
+    width: 100%;
+    overflow-y: auto;
+    max-height: 400px;
     &.full-height-modal {
       max-height: calc(100vh - 150px);
     }
@@ -153,7 +200,7 @@
     }
     p {
       color: darken($primary, 40%);
-      font-size: 1em;
+      font-size: $font-0;
     }
     .archetype-option {
       margin-bottom: 20px;
@@ -169,7 +216,7 @@
         position: relative;
       }
       .jsfu-shade {
-        z-index: 1;
+        z-index: z("base");
         position: absolute;
         top: 0;
         left: 0;
@@ -180,9 +227,9 @@
           color: rgb(255,255,255);
           position: absolute;
           top: 40%;
-          font-size: 2.571em;
+          font-size: $font-up-6;
           text-align: center;
-          line-height: 38px;
+          line-height: $line-height-medium;
           margin-left: auto;
           margin-right: auto;
           left: 0;
@@ -225,7 +272,7 @@
 
   // password reset modal
   .modal-body.forgot-password-modal p {
-    font-size: 1em;
+    font-size: $font-0;
   }
 }
 
@@ -239,15 +286,15 @@
     }
     .btn {
       text-align: left;
-      font-size: 1.286em;
-      line-height: 20px;
+      font-size: $font-up-2;
+      line-height: $line-height-medium;
       width: auto;
       margin-bottom: 10px;
       display: block;
       margin-left: 0 !important; // override needed
       font-weight: bold;
       .topic-title {
-        font-size: 1em;
+        font-size: $font-0;
         font-weight: normal;
       }
       &.btn-reply-here {
@@ -259,7 +306,7 @@
   }
 }
 .d-modal-cancel {
-  margin-left: 5px;
+  margin-left: 1em;
   color: $primary-medium;
 }
 
@@ -268,8 +315,8 @@
     .btn {
       font-weight: normal;
       text-align: left;
-      font-size: 1em;
-      line-height: 20px;
+      font-size: $font-0;
+      line-height: $line-height-large;
       margin-bottom: 10px;
       display: inline-block;
       margin-left: 0;
@@ -277,11 +324,14 @@
   }
 }
 
-.invite-modal {
+#invite-modal {
   overflow: visible;
-  .ember-text-field {
-    width: 550px;
+
+  label {
+    margin-top: 7px;
+    max-width: 450px;
   }
+
   .optional {
     color: #9e9ea6;
   }
@@ -348,6 +398,12 @@
       }
     }
   }
+
+  section.minimum-required-tags {
+    input[type=number] {
+      width: 50px;
+    }
+  }
 }
 
 .incoming-email-modal {
@@ -370,6 +426,8 @@
   }
   .incoming-email-content {
     height: 300px;
+    max-width: 700px;  
+    width: 90vw; // forcing textarea wider
     textarea, .incoming-email-html-part {
       height: 95%;
       border: none;
@@ -379,7 +437,7 @@
     textarea {
       font-family: monospace;
       resize: none;
-      border-radius: 0px;
+      border-radius: 0;
       box-shadow: none;
     }
     .incoming-email-html-part {
@@ -395,3 +453,77 @@
     margin-right: 0.5em;
   }
 }
+
+.change-timestamp,
+.poll-ui-builder {
+
+    .date-picker {
+      width: 9em;
+    }
+
+    #date-container {
+      .pika-single {
+        position: relative !important; // overriding another important
+        display: inline-block;
+        margin-top: 5px;
+      }
+    }
+
+    input[type=time] {
+      width: 6em;
+      text-align: center;
+    }
+
+    form {
+      margin: 0;
+    }
+}
+
+.flag-modal {
+  max-height: 450px;
+  .flag-action-type-details {
+    line-height: $line-height-large;
+  }
+}
+
+.flag-message {
+  width: 95% !important;
+  margin: 0;
+}
+
+.custom-message-length {
+  color: dark-light-choose($primary-low-mid, $secondary-high);
+  font-size: $font-down-1;
+}
+
+.edit-category-modal {
+  .secure-category-options {
+    margin: 10px 0 0 16px;
+    .badge-list {
+      margin: 10px 0;
+      li {
+        margin: 0 4px 8px 0;
+        a {
+          color: dark-light-choose($primary-medium, $secondary-medium);
+          cursor: pointer;
+        }
+        a:hover {
+          color: dark-light-choose($primary-medium, $secondary-medium);
+        }
+      }
+    }
+  }
+}
+
+.tabbed-modal {
+  .modal-body {
+    position: relative;
+    height: 350px;
+  }
+}
+
+
+.modal-tab {
+  position: absolute;
+  width: 95%;
+}
diff --git a/app/assets/stylesheets/common/base/not-found.scss b/app/assets/stylesheets/common/base/not-found.scss
index 22295480074..4f58cc362bc 100644
--- a/app/assets/stylesheets/common/base/not-found.scss
+++ b/app/assets/stylesheets/common/base/not-found.scss
@@ -1,8 +1,8 @@
 // Page not found styles 
 
 h1.page-not-found {
-  font-size: 2.286em;
-  line-height: 1.25;
+  font-size: $font-up-5;
+  line-height: $line-height-medium;
 }
 
 .page-not-found {
@@ -43,7 +43,7 @@ h1.page-not-found {
       display: none;
     }
   }
-  .badge-wrapper {
+  a:not(.badge-wrapper) {
     flex-basis: 100%;
   }
 }
diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index 82518359343..7a306a96d84 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -15,7 +15,7 @@ a.loading-onebox {
 
   margin-top: 15px;
   padding: 12px;
-  font-size: 1em;
+  font-size: $font-0;
   > .source {
     margin-bottom: 12px;
     margin-right: 10px;
@@ -30,7 +30,7 @@ a.loading-onebox {
         padding-right: 10px;
       }
       position: absolute;
-      font-size: 1em;
+      font-size: $font-0;
       img.favicon {
         margin-right: 3px;
       }
@@ -90,9 +90,9 @@ a.loading-onebox {
 
 aside.onebox {
   border: 5px solid $primary-low;
-
+  margin-bottom: 1em;
   padding: 12px 25px 12px 12px;
-  font-size: 1em;
+  font-size: $font-0;
 
   header {
     margin-bottom: 8px;
@@ -111,6 +111,7 @@ aside.onebox {
   @include onebox-favicon('githubissue', 'github');
   @include onebox-favicon('githubgist', 'github');
   @include onebox-favicon('amazon', 'amazon');
+  @include onebox-favicon('instagram', 'instagram');
   @include onebox-favicon('googledocs', 'google_branding/logo_drive_48px');
 
 
@@ -118,7 +119,7 @@ aside.onebox {
     clear: both;
 
     h3, h4 {
-      font-size: 1.143em;
+      font-size: $font-up-1;
       margin: 0 0 10px 0;
     }
 
@@ -178,6 +179,23 @@ aside.onebox {
           margin-right: none;
         }
       }
+
+      // full size images for instagram, twitter, etc.
+      .aspect-image-full-size {
+        max-height: 500px;
+        width: calc(500px * var(--aspect-ratio));
+        max-width: 100%;
+
+        img {
+          width: 100%;
+          height: inherit;
+          max-width: initial;
+          max-height: initial;
+          float: none;
+          padding: 5px 5px 5px 5px;
+        }
+      }
+
       [style*="--aspect-ratio"] {
         position: relative;
       }
@@ -212,6 +230,27 @@ aside.onebox {
       }
     }
 
+    &.user-onebox {
+      .fa {
+        margin-right: 5px;
+      }
+      .full-name,
+      .location {
+        margin-right: 10px;
+      }
+    }
+
+    // instagram fixes
+    .instagram-images {
+      clear: both;
+
+      .instagram-image {
+        padding: 5px 5px 5px 5px;
+        max-width: 100%;
+        max-height: 100%;
+        float: none;
+      }
+    }
   }
 }
 
@@ -270,16 +309,16 @@ pre.onebox code ol.lines li:before {
   color:#AFAFAF;
   text-align:right;
   padding-right:5px;
-  font-size:.857em;
-  line-height: 1.9em;
+  font-size: $font-down-1;
+  line-height: $line-height-large;
   content: counter(li-counter);
   counter-increment: li-counter;
 }
 
 
 pre.onebox code ol{
-	margin-left:0px;
-	line-height:1.5em;
+	margin-left:0;
+	line-height: $line-height-large;
 }
 pre.onebox code {
   background-color: dark-light-choose(#fff, #000);
@@ -290,13 +329,13 @@ pre.onebox code li{
 
 pre.onebox code ol.lines{
 	position:relative;
-	margin-left: 40px;
+	margin: 0 0 0 40px;
 }
 
 pre.onebox code ol.lines li {
 	list-style-type: none;
 	padding-left: 5px;
-	margin-left: 0px;
+	margin-left: 0;
 	border-left: 1px solid #CFCFCF;
 	min-height: 1.5em; //show empty li lines
   white-space: pre;
@@ -314,7 +353,7 @@ pre.onebox code {
 .onebox-body .github-commit-status {
   background: #F5F5F5;
   border-radius: 5px;
-  margin:0px 0px 5px 100px;
+  margin:0 0 5px 100px;
   padding: 10px;
 }
 
@@ -331,7 +370,7 @@ pre.onebox code {
 .onebox-body .build_status
 {
   padding: 2px;
-  font-size:.857em;
+  font-size: $font-down-1;
 }
 
 .onebox-body .status_tag.open {
@@ -376,14 +415,14 @@ aside.onebox.twitterstatus .onebox-body {
 .onebox.imgur-album {
   .outer-box {
     position: absolute;
-    z-index: 935;
-    height: 30px;
+    z-index: z("base");
     overflow: hidden;
-    font-size: .857em;
+    font-size: $font-down-1;
     color: #fff;
     background-color: rgba(0, 0, 0, 0.6);
     text-overflow: ellipsis;
     max-width: 100%;
+    padding: 5px 0;
 
     .inner-box {
       padding-left: 10px;
@@ -395,8 +434,8 @@ aside.onebox.twitterstatus .onebox-body {
 
       .album-title {
         width: 100%;
-        font-size: 1.143em;
-        line-height: 30px;
+        font-size: $font-up-1;
+        line-height: $line-height-large;
         color: #ccc;
         text-decoration: none;
       }
@@ -453,18 +492,35 @@ aside.onebox.stackexchange .onebox-body {
   .label2 {
     float: right;
   }
-  .site-icon {
-    width: 16px;
-    height: 16px;
-    margin-right: 3px;
+}
+
+.onebox {
+  &.whitelistedgeneric,
+  &.gfycat {
+    .site-icon {
+      width: 16px;
+      height: 16px;
+      margin-right: 3px;
+    }
+  }
+}
+
+.onebox.gfycat p {
+  span.label1 a {
+    white-space: nowrap;
+  }
+}
+
+.onebox.instagram {
+  div.instagram-description {
+    color: dark-light-choose($primary-medium, $secondary-medium);
+    padding-top: 10px;
   }
 }
 
 .onebox.githubcommit {
    pre.message {
-     clear: left;
      padding: 0;
-     padding-top: 10px;
    }
 }
 
diff --git a/app/assets/stylesheets/common/base/redirection.scss b/app/assets/stylesheets/common/base/redirection.scss
new file mode 100644
index 00000000000..bf7536243d0
--- /dev/null
+++ b/app/assets/stylesheets/common/base/redirection.scss
@@ -0,0 +1,6 @@
+.redirection-warning {
+  margin: 0 auto;
+  text-align: center;
+  font-size: $font-up-4;
+  line-height: $line-height-medium;
+}
diff --git a/app/assets/stylesheets/common/base/request-group-membership-form.scss b/app/assets/stylesheets/common/base/request-group-membership-form.scss
index 63dfd0aec7b..33669fc0e24 100644
--- a/app/assets/stylesheets/common/base/request-group-membership-form.scss
+++ b/app/assets/stylesheets/common/base/request-group-membership-form.scss
@@ -4,6 +4,6 @@
   }
 }
 
-.group-edit-membership-request-template {
+.group-add-membership-request-template {
   width: 98%;
 }
diff --git a/app/assets/stylesheets/common/base/request_access.scss b/app/assets/stylesheets/common/base/request_access.scss
index 77fd99202ac..069511ce009 100644
--- a/app/assets/stylesheets/common/base/request_access.scss
+++ b/app/assets/stylesheets/common/base/request_access.scss
@@ -4,10 +4,10 @@
   input[type=text] {
     width: 320px;
     height: 30px;
-    font-size: 1.429em;
+    font-size: $font-up-3;
   }
   input[type=submit] {
-    font-size: 1.429em;
+    font-size: $font-up-3;
     padding: 10px;
   }
 }
diff --git a/app/assets/stylesheets/common/base/rtl.scss b/app/assets/stylesheets/common/base/rtl.scss
index ad7e5c4af7a..298f458f3ec 100644
--- a/app/assets/stylesheets/common/base/rtl.scss
+++ b/app/assets/stylesheets/common/base/rtl.scss
@@ -2,9 +2,9 @@
 // *** These styles are all going to be flipped by the r2 gem ***
 // Adding the !important declaration to a rule prevents it from being flipped.
 
-// Keep the topic admin menu on the page
-.rtl .popup-menu {
-  right: 0 !important;
+.rtl #topic-progress-wrapper .topic-admin-popup-menu.right-side,
+.rtl #topic-progress-wrapper.docked .topic-admin-popup-menu.right-side {
+  right: 80px;
 }
 
 // This is used to flip the .d-icon-caret-right
diff --git a/app/assets/stylesheets/common/base/search.scss b/app/assets/stylesheets/common/base/search.scss
index e4a18b18ae3..8934fcb90f4 100644
--- a/app/assets/stylesheets/common/base/search.scss
+++ b/app/assets/stylesheets/common/base/search.scss
@@ -1,9 +1,182 @@
+.search-container {
+  display: flex;
+  justify-content: space-between;
+
+  .search-bar {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 1em;
+
+    .search-query {
+      flex: 1;
+      margin: 0 .5em 0 0;
+    }
+
+    .search-cta {
+      padding-bottom: 6.5px;
+      padding-top: 6.5px;
+    }
+  }
+
+  .search-advanced {
+    width: 70%;
+    @include small-width  { width: 65%; }
+
+    .search-actions,
+    .search-notice,
+    .search-results,
+    .search-title,
+    .search-bar {
+      margin-bottom: 1em;
+    }
+
+    .search-info {
+      display: flex;
+      flex-wrap: wrap;
+      border-bottom: 3px solid $primary-low;      
+      padding-bottom: .5em;
+      margin-bottom: 1em;
+      flex-direction: row;
+      align-items: center;
+
+      .result-count {
+        display: flex;
+
+        .term {
+          font-weight: bold;
+        }
+
+        // spans can be in different orders depending of locale
+        span + span {
+          margin-left: .25em;
+        }
+      }
+
+      .sort-by {
+        display: flex;
+        margin-left: auto;
+        align-items: center;
+
+        .desc {
+          margin-right: .5em;
+        }
+
+        .combo-box {
+          min-width: 150px;
+        }
+      }
+    }
+
+    .search-title {
+      display: flex;
+      justify-content: flex-start;
+      align-items: center;
+
+      .bulk-select {
+        margin-left: .5em;
+      }
+
+      .fps-select a {
+        margin-left: .5em;
+        font-size: $font-down-1;
+
+        &:hover {
+          text-decoration: underline;
+        }
+      }
+    }
+
+    .search-notice {
+      .fps-invalid {
+        padding: .5em;
+        background-color: $danger-low;
+        border: 1px solid $danger-medium;
+        color: $danger;
+      }
+    }
+  }
+
+  .search-advanced-sidebar {
+    width: 30%;
+    @include small-width  { width: 35%; }
+    margin-left: 1em;
+    display: flex;
+    flex-direction: column;
+
+    #search-min-post-count,
+    .date-picker,
+    .combo-box,
+    .ac-wrap,
+    .control-group,
+    .date-picker-wrapper,
+    .search-advanced-category-chooser {
+      box-sizing: border-box;
+      width: 100%;
+      min-width: 100%;
+      input, .item {
+        padding-left: 4px; // temporarily normalizing input padding for this section
+      }
+    }
+
+    .date-picker-wrapper {
+      margin-top: .5em;
+    }
+
+    .date-picker {
+      box-sizing: border-box;
+      text-align: left;
+      padding: 4px;
+      margin-bottom: 0;
+    }
+
+    .search-advanced-title {
+      background: $primary-low;
+      padding: .358em 1em;
+      @include small-width  { padding: .358em .5em; }
+      font-weight: 700;
+      text-align: left;
+      font-weight: bold;
+
+      &.btn {
+        background: $primary-low;
+      }
+
+      .d-icon {
+        margin: 0;
+      }
+    }
+
+    .search-advanced-filters {
+      background: $primary-very-low;
+      padding: 1em;
+      .control-group {
+        margin-bottom: 15px;
+      }
+      section.field {
+        margin-top: 5px;
+      }
+      @include small-width  { 
+        padding: .75em .5em; 
+        .ac-wrap, .choices, .select-kit.multi-select { // overriding inline width from JS
+          width: 100% !important;
+        } 
+        .select-kit {
+          min-width: unset;
+        }
+      }
+    }
+  }
+}
+
+
 .fps-invalid {
   margin-bottom: 1em;
 }
 
 .fps-result {
-
+  display: flex;
   .author {
     display: inline-block;
     vertical-align: top;
@@ -11,7 +184,7 @@
 
   .like-count {
     color: dark-light-choose($primary-medium, $secondary-medium);
-    .fa { color: $love; font-size: .857em; }
+    .fa { color: $love; font-size: $font-down-1; }
   }
 
   .badge-wrapper span.badge-category {
@@ -36,20 +209,20 @@
   }
   .search-link {
     .topic-statuses, .topic-title {
-      font-size: 1.286em;
-      line-height: 25px;
+      font-size: $font-up-2;
+      line-height: $line-height-large;
     }
 
     .topic-statuses {
       float: none;
       display: inline-block;
       color: dark-light-choose($primary-medium, $secondary-medium);
-      font-size: 1.0em;
+      font-size: $font-0;
     }
   }
   .blurb {
-    font-size: 1.0em;
-    line-height: 20px;
+    font-size: $font-0;
+    line-height: $line-height-large;
     word-wrap: break-word;
     max-width: 640px;
     color: dark-light-choose($primary-medium, $secondary-medium);
@@ -63,7 +236,7 @@
   }
 
   .discourse-tag {
-    font-size: 0.857em;
+    font-size: $font-down-1;
   }
 }
 
@@ -71,62 +244,6 @@
   display: inline-block;
 }
 
-.fps-select {
-  margin-top: -15px;
-  margin-bottom: 15px;
-  a:hover {
-    color: $secondary;
-    background-color: $tertiary;
-  }
-  a {
-    margin-right: 15px;
-    font-size: .857em;
-    padding: 2px 5px;
-  }
-}
-
-.search.row {
-  margin-bottom: 15px;
-
-  .search-bar {
-    display: flex; 
-    margin-bottom: 10px;
-    input {
-      height: 22px;
-      padding-left: 6px;
-      margin: 0 5px 0 0;
-    }
-  }
-
-  .new-topic-btn {
-    float:right;
-  }
-}
-
-.search-advanced {
-  margin-bottom: 15px;
-
-  .search-advanced-btn {
-    padding: 8px 10px;
-    width: 100%;
-    text-align: left;
-    font-weight: bold;
-  }
-
-  .search-advanced-options {
-    border: 1px solid $primary-low;
-    padding: 10px;
-
-    .control-group.pull-left {
-      width: 50%;
-    }
-
-    input[type="checkbox"] {
-      height: auto;
-    }
-  }
-}
-
 .no-results-suggestion {
   margin-top: 30px;
 }
@@ -138,40 +255,6 @@
   float: left;
 }
 
-.search-title {
-
-  .term {
-    font-weight: bold;
-  }
-
-  position: relative;
-  .result-count {
-    float: left;
-    span {
-      line-height: 28px;
-      height: 28px;
-      display: inline-block;
-    }
-    margin-bottom: 4px;
-  }
-  margin: 10px 0 15px;
-  max-width: 780px;
-  border-bottom: 3px solid $primary-low; 
-  width: 100%;
-  .sort-by {
-    .desc {
-      margin-right: 5px;
-    }
-    select {
-      margin-bottom: 0;
-      width: auto;
-      min-width: 150px;
-    }
-    float: right;
-    margin-bottom: 4px;
-  }
-}
-
 .google-search-form {
   margin-top: 2em;
 }
diff --git a/app/assets/stylesheets/common/base/share_link.scss b/app/assets/stylesheets/common/base/share_link.scss
index b9c3694119e..2914ceb9a12 100644
--- a/app/assets/stylesheets/common/base/share_link.scss
+++ b/app/assets/stylesheets/common/base/share_link.scss
@@ -3,8 +3,8 @@
 #share-link {
   position: absolute;
   left: 20px;
-  z-index: 1200;
-  box-shadow: 0 1px 5px rgba(0,0,0, .4);
+  z-index: z("dropdown");
+  box-shadow: shadow("card");
   background-color: $secondary;
   padding: 6px 10px 10px 10px;
   width: 300px;
@@ -22,7 +22,7 @@
     margin: 14px 0;
   }
   h3 {
-    font-size: 1em;
+    font-size: $font-0;
   }
   .copy-text {
     display: inline-block;
@@ -31,7 +31,7 @@
     color: $success;
     opacity: 1;
     transition: opacity 0.25s;
-    font-size: 1em;
+    font-size: $font-0;
     &:not(.success) {
       opacity: 0;
     }
@@ -40,12 +40,13 @@
     margin-left: 2px;
     margin-right: 8px;
     float: left;
-    font-size: 1.857em;
+    font-size: $font-up-4;
   }
   .reply-as-new-topic {
     float: left;
-    line-height: 22px;
+    line-height: $line-height-large;
     margin-left: 8px;
+    margin-top: .5em;
     .fa {
       margin-right: 5px;
     }
@@ -53,7 +54,7 @@
   .link {
     margin-right: 2px;
     float: right;
-    font-size: 1.429em;
+    font-size: $font-up-3;
     a {
       color: dark-light-choose($primary-medium, $secondary-medium);
     }
@@ -71,7 +72,7 @@
   }
 
   input[type=text] {
-    font-size: 1.143em;
+    font-size: $font-up-1;
     margin-bottom: 10px;
   }
 }
diff --git a/app/assets/stylesheets/common/base/shared-drafts.scss b/app/assets/stylesheets/common/base/shared-drafts.scss
new file mode 100644
index 00000000000..bddff920b0f
--- /dev/null
+++ b/app/assets/stylesheets/common/base/shared-drafts.scss
@@ -0,0 +1,10 @@
+.shared-draft-controls {
+  background-color: $tertiary-low;
+  padding: 1em;
+
+  .publish-field {
+    margin-top: 1em;
+  }
+
+  clear: both;
+}
diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss
index 46a363c53aa..d459ea4f52e 100644
--- a/app/assets/stylesheets/common/base/tagging.scss
+++ b/app/assets/stylesheets/common/base/tagging.scss
@@ -17,13 +17,16 @@
   width: 300px;
   margin-bottom: 1em;
   float: left;
+  vertical-align: middle;
 
   .discourse-tag {
-    font-size: 1em;
+    font-size: $font-0;
   }
 
   .tag-count {
-    font-size: 0.857em;
+    font-size: $font-down-1;
+    vertical-align: middle;
+    line-height: $line-height-small;
   }
 }
 
@@ -34,70 +37,58 @@
 
 .bullet + .topic-header-extra {
   display: block;
-  line-height: 15px;
-  font-size: .857em;
-  .list-tags { font-size: 1em; }
-}
-
-.bar + .topic-header-extra {
-  line-height: 1.25;
 }
 
 .box + .topic-header-extra {
   display: inline-block;
-  margin: 0 0 0 5px;
-  padding-top: 5px;
 }
 
 .topic-category {
-  margin-top: 5px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: flex-end;
 
   .topic-header-extra {
-    display: inline;
+    display: inline-block;
     vertical-align: baseline;
-    margin: 0;
   }
 
   .badge-wrapper {
-    display: inline-block;
-    vertical-align: baseline;
     margin-top: 0;
 
     &.bullet .badge-category {
-      vertical-align: middle;
     }
 
     &.box, &.bullet {
-      vertical-align: middle;
     }
 
     &.box + .topic-header-extra,
     &.bullet + .topic-header-extra,
     &.bar + .topic-header-extra {
-      vertical-align: middle;
     }
   }
 }
 
-.add-tags .select2 {
-  margin: 0;
-}
-
 $tag-color: $primary-medium;
 
 .discourse-tag-count {
-  font-size: 0.857em;
+  font-size: $font-down-1;
   color: $tag-color;
+  line-height: $line-height-small;
+  vertical-align: middle;
 }
 
-.select2-result-label .discourse-tag {
-  margin-right: 0;
-}
-
-
 .discourse-tag {
-  padding: 0;
-  margin: 0 5px 0 0;
+  max-width: 14em;
+  display: inline-block;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  vertical-align: middle;
+}
+
+.discourse-tag {
+  margin: 0;
   color: $tag-color;
 
   &:visited, &:hover {
@@ -119,7 +110,7 @@ $tag-color: $primary-medium;
   }
 
   &.simple, &.simple:visited, &.simple:hover {
-    margin-right: 0px;
+    margin-right: 0;
     color: $primary-high;
   }
 }
@@ -132,31 +123,22 @@ $tag-color: $primary-medium;
 }
 
 .d-header .topic-header-extra {
-  display: inline-block;
-  .discourse-tags { display: inline-block; }
+  .discourse-tags {
+    display: inline-block;
+    font-size: $font-down-1;
+  }
   .topic-featured-link { margin-left: 8px; }
 }
 
-.select2-container-multi .select2-choices .select2-search-choice.discourse-tag-select2 {
-  padding-top: 5px;
-  -webkit-box-shadow: none;
-  box-shadow: none;
-  border: 0;
-  border-radius: 0;
-  background-color: transparent;
-}
-
-
 .fps-result .add-full-page-tags {
   display: inline-block;
 }
 
 .topic-list-item .discourse-tags {
   display: block;
-  font-size: 0.786em;
+  font-size: $font-down-2;
   font-weight: normal;
   clear: both;
-  margin-top: 5px;
 
   .discourse-tag.box {
     position:relative;
@@ -169,9 +151,13 @@ $tag-color: $primary-medium;
 }
 
 .mobile-view .topic-list-item .discourse-tags {
-  display: inline-block;
-  font-size: 0.857em;
+  display: inline-flex;
+  flex-wrap: wrap;
+  font-size: $font-down-1;
   margin-top: 0;
+  .discourse-tag {
+    margin-right: .2em;
+  }
   .discourse-tag.box {
     position:relative;
     top: 0;
@@ -179,33 +165,29 @@ $tag-color: $primary-medium;
 }
 
 
-
-.discourse-tag.bullet:before {
-  content: "\f04d";
-  font-family: FontAwesome;
-  color: $primary-low-mid;
-  margin-right: 5px;
-  font-size: 0.786em;
-  position:relative;
-  top: -0.1em;
+.discourse-tag.bullet {
+  margin-right: .25em;
+  &:before {
+    content: "\f04d";
+    font-family: FontAwesome;
+    color: $primary-low-mid;
+    margin-right: 5px;
+    font-size: $font-down-2;
+    position:relative;
+  }
 }
 
 header .discourse-tag {color: $tag-color }
 
 .list-tags {
+  display: inline-block;
   margin-right: 3px;
-  display: inline;
-  font-size: 0.857em;
+  font-size: $font-down-1;
 }
 
 .tag-chooser {
   width: 100%;
   max-width: 100%;
-  margin: 5px 0;
-  ul.select2-choices {
-    max-height: 30px;
-    overflow-y: auto;
-  }
 }
 
 .title-wrapper .tag-chooser {
@@ -223,6 +205,9 @@ header .discourse-tag {color: $tag-color }
   a {
     text-decoration: underline;
   }
+  span.active a {
+    font-weight: bold;
+  }
 }
 
 .autocomplete {
@@ -252,6 +237,9 @@ header .discourse-tag {color: $tag-color }
     ul {
       margin-bottom: 10px;
     }
+    .btn {
+      margin-left: 10px;
+    }
   }
   .tag-group-content {
     width: 75%;
@@ -260,18 +248,17 @@ header .discourse-tag {color: $tag-color }
       margin-bottom: 20px;
     }
     label {
-      font-size: 1em;
+      font-size: $font-0;
       display: inline-block;
       margin-right: 10px;
     }
+    .btn {
+      margin-right: 10px;
+    }
   }
   .group-tags-list .tag-chooser {
-    height: 250px !important;
-    .select2-choices {
-      height: 250px !important; // to fight with select2.scss's important
-    }
+    width: 100%;
   }
-  .btn {margin-left: 10px;}
   .saving {
     margin-left: 20px;
   }
diff --git a/app/assets/stylesheets/common/base/tooltip.scss b/app/assets/stylesheets/common/base/tooltip.scss
new file mode 100644
index 00000000000..6dd84a8de27
--- /dev/null
+++ b/app/assets/stylesheets/common/base/tooltip.scss
@@ -0,0 +1,60 @@
+$discourse-tooltip-background: $secondary;
+$discourse-tooltip-border: $primary-medium;
+
+#discourse-tooltip {
+  background-color: $discourse-tooltip-background;
+  position: absolute;
+  z-index: 1000;
+  border: 1px solid $discourse-tooltip-border;
+  max-width: 400px;
+  margin-top: 25px;
+  overflow-wrap: break-word;
+  display: none;
+  font-size: $font-0;
+  font-weight: 500;
+
+  &.retina {
+    border: 0.5px solid $discourse-tooltip-border;
+  }
+
+  .tooltip-pointer {
+    position: relative;
+    background: $discourse-tooltip-background;
+  }
+
+  .tooltip-pointer:before, .tooltip-pointer:after {
+    position: absolute;
+    pointer-events: none;
+    border: solid transparent;
+    bottom: 100%;
+    content: "";
+    height: 0;
+    width: 0;
+  }
+
+  .tooltip-pointer:after
+  {
+    border-bottom-color: $discourse-tooltip-background;
+    border-width: 8px;
+    left: 50%;
+    margin-left: -8px;
+    margin-bottom: -0.5px;
+  }
+
+  .tooltip-pointer:before {
+    border-bottom-color: $discourse-tooltip-border;
+    border-width: 9px;
+    left: 50%;
+    margin-left: -9px;
+    margin-bottom: -0.5px;
+  }
+
+  .tooltip-content {
+    padding: 1em;
+    max-width: 250px;
+    font-size: $font-down-1;
+    color: $primary;
+    box-shadow: shadow("dropdown");
+    line-height: 1.4em;
+  }
+}
diff --git a/app/assets/stylesheets/common/base/topic-admin-menu.scss b/app/assets/stylesheets/common/base/topic-admin-menu.scss
index 7816086dc94..a2ef7aaddd6 100644
--- a/app/assets/stylesheets/common/base/topic-admin-menu.scss
+++ b/app/assets/stylesheets/common/base/topic-admin-menu.scss
@@ -4,16 +4,17 @@
   position: fixed;
   top: 120px;
   right: 10px;
-  z-index: 999;
+  z-index: z("dropdown");
   height: 35px;
 }
 
 .popup-menu {
   background-color: $secondary;
-  width: 205px;
+  width: 215px;
   padding: 10px;
-  border: 1px solid $primary-low; 
-  z-index: 999;
+  border: 1px solid $primary-low;
+  z-index: z("dropdown");
+  box-shadow: shadow("card");
 
   ul {
     list-style: none;
@@ -25,7 +26,7 @@
   }
 
   button {
-    width: 200px;
+    width: 100%;
     margin-bottom: 5px;
     i {
       width: 14px;
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 9197ebfa736..80668a280b0 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -22,7 +22,7 @@
  }
 
  span {
-   font-size: 0.929em;
+   font-size: $font-0;
    margin-right: 8px;
    display: inline-block;
    max-width: 280px;
@@ -34,7 +34,7 @@
    }
  }
  .fa {
-   font-size: .786em;
+   font-size: $font-down-1;
    margin-left: 3px;
    color: dark-light-choose($primary-medium, $secondary-medium);
  }
@@ -46,14 +46,46 @@
 // global styles for the cooked HTML content in posts (and preview)
 .cooked, .d-editor-preview {
   word-wrap: break-word;
-  h1, h2, h3, h4, h5, h6 { 
-    margin: 30px 0 10px; 
-    line-height: 1.25; 
+  line-height: $line-height-large;
+  h1, h2, h3, h4, h5, h6 {
+    margin: 30px 0 10px;
+    line-height: $line-height-medium;
   }
-  
+
+  h1 {
+    font-size: $font-up-3;
+  }
+
+  h2 {
+    font-size: $font-up-2;
+  }
+
+  h3 {
+    font-size: $font-up-1;
+  }
+
+  h4 {
+    font-size: $font-0;
+  }
+
+  h5 {
+    font-size: $font-down-1;
+  }
+
+  h6 {
+    font-size: $font-down-2;
+  }
+
   a { word-wrap: break-word; }
   ins { background-color: dark-light-choose($success-low, scale-color($success, $lightness: -60%)); }
   del { background-color: dark-light-choose($danger-low, scale-color($danger, $lightness: -60%)); }
+  // Prevents users from breaking posts with tag nesting
+  big { font-size: 1.5rem; }
+  small { font-size: 0.75rem; }
+  small small { font-size: .75em; }
+  big big { font-size: 1em; }
+  sub sub sub {bottom: 0;}
+  sup sup sup {top: 0;}
 }
 
 .cooked, .d-editor-preview {
@@ -78,7 +110,7 @@
   .clearfix > .topic-meta-data > .names {
     span.user-title {
       background-color: dark-light-choose($highlight-low, $highlight-medium);
-      color: dark-light-choose($primary-high, $secondary-low);      
+      color: dark-light-choose($primary-high, $secondary-low);
       padding-left: 4px;
       padding-right: 4px;
     }
@@ -127,14 +159,15 @@ aside.quote {
 }
 
 .post-hidden {
-  opacity: 0.5;
+  opacity: 0.5;       // opacity sets a new z-index context,
+  position: relative; // so the positioning is required,
+  z-index: z("base"); // otherwise post controls are stacked too low
 }
 
 .topic-post.staged {
   opacity: 0.4;
 }
 
-
 .quote-controls {
   float: right;
   display: flex;
@@ -149,7 +182,7 @@ aside.quote {
   background-color: blend-primary-secondary(50%);
   color: dark-light-choose($secondary, $primary);
   padding: 10px;
-  z-index: 401;
+  z-index: z("dropdown");
   opacity: 0.9;
 
   .d-icon {
@@ -166,7 +199,81 @@ aside.quote {
   position: relative;
 }
 
-.topic-avatar, .avatar-flair-preview, .user-card-avatar, .topic-map .poster {
+.topic-map {
+  background: blend-primary-secondary(5%);
+  border: 1px solid $primary-low;
+  border-top: none; // would cause double top border
+
+  .avatars {
+    > div {
+      float: left;
+      position: relative;
+      margin: 3px 0;
+    }
+    .post-count {
+      position: absolute;
+      right: 0;
+      border-radius: 100px;
+      padding: 3px 5px;
+      text-align: center;
+      font-weight: normal;
+      font-size: $font-down-2;
+      line-height: $line-height-small;
+    }
+  }
+
+  .avatar {
+    float: left;
+    margin-right: 4px;
+  }
+
+  section {
+    border-top: 1px solid $primary-low;
+  }
+
+  ul {
+    margin: 0;
+    list-style: none;
+  }
+
+  h3 {
+    margin-bottom: 4px;
+    color: dark-light-choose($primary-high, $secondary-low);
+    line-height: $line-height-large;
+    font-weight: normal;
+    font-size: $font-0;
+  }
+
+  h4 {
+    margin: 1px 0 2px 0;
+    color: dark-light-choose($primary-medium, $secondary-medium);
+    font-weight: normal;
+    font-size: $font-down-1;
+    line-height: $line-height-small;
+  }
+
+  span.domain {
+    font-size: $font-down-2;
+    color: dark-light-choose($primary-medium, $secondary-medium);
+  }
+
+  td {
+    vertical-align: top;
+    padding:1px;
+  }
+
+  .topic-links {
+    tr {
+      border: none;
+    }
+    .badge-notification {
+      margin: 1px 5px 2px 0;
+    }
+  }
+
+}
+
+.topic-avatar, .avatar-flair-preview, .user-card-avatar, .topic-map .poster, .user-profile-avatar {
   .avatar-flair {
     display: flex;
     align-items: center;
@@ -178,7 +285,7 @@ aside.quote {
     right: -6px;
   }
 }
-.topic-avatar .avatar-flair, .avatar-flair-preview .avatar-flair {
+.topic-avatar .avatar-flair, .avatar-flair-preview .avatar-flair, .collapsed-info .user-profile-avatar .avatar-flair {
   background-size: 20px 20px;
   width: 20px;
   height: 20px;
@@ -191,7 +298,7 @@ aside.quote {
     right: -8px;
   }
 }
-.user-card-avatar .avatar-flair {
+.user-card-avatar .avatar-flair, .user-profile-avatar .avatar-flair {
   background-size: 40px 40px;
   width: 40px;
   height: 40px;
@@ -204,7 +311,7 @@ aside.quote {
     right: -4px;
   }
   .fa {
-    font-size: 1.714em;
+    font-size: $font-up-4;
   }
 }
 .topic-map .poster .avatar-flair {
@@ -222,13 +329,26 @@ aside.quote {
     right: 0;
   }
   .fa {
-    font-size: 1em;
+    font-size: $font-0;
   }
 }
 .topic-avatar .poster-avatar-extra {
   display: none;
 }
 
+.map {
+  &:first-of-type {
+    display: flex;
+    .buttons {
+      margin-left: auto;
+      order: 15;
+      .btn {
+        height: 100%;
+      }
+    }
+  }
+}
+
 .topic-body {
   // this is necessary for ANYTHING that extends past the right edge of
   // the post body, such as an image in a deeply nested list, image in
@@ -248,10 +368,14 @@ aside.quote {
 }
 
 .post-info {
+
   &.via-email, &.whisper {
+    line-height: $line-height-medium;
+  }
+  &.via-email, &.whisper, &.post-locked {
     margin-right: 5px;
     .d-icon {
-      font-size: 1em;
+      font-size: $font-0;
     }
   }
 
@@ -284,11 +408,15 @@ kbd
   background-color: $secondary;
   border: 1px solid $primary-low;
   border-radius: 3px;
-  box-shadow: 0 1px 0 rgba(0,0,0, .8);
+  box-shadow: shadow("kbd");
+  background: dark-light-choose(#fafafa, #333);
+  border: 1px solid dark-light-choose(#ccc, #555);
+  border-bottom: medium none dark-light-choose(#fff, #000);
+
   color: $primary;
   display: inline-block;
-  font-size: 0.857em;
-  line-height: 1.4;
+  font-size: $font-down-1;
+  line-height: $line-height-large;
   margin: 0 .1em;
   padding: .1em .6em;
 
@@ -309,12 +437,12 @@ blockquote > *:last-child {
 }
 
 .gap {
-  padding: 0.25em 0 0.5em 4.3em;
+  padding: 0.25em 0 0.5em 4.6em;
   color: dark-light-choose($primary-medium, $secondary-high);
   cursor: pointer;
   text-transform: uppercase;
   font-weight: bold;
-  font-size: 0.9em;
+  font-size: $font-down-1;
 }
 
 .who-liked {
@@ -338,23 +466,23 @@ blockquote > *:last-child {
   td,th {
     padding: 3px 3px 3px 10px;
   }
-  tr {
-    border-bottom: 1px solid lighten($primary, 80%);
-  }
 }
 
 .small-action {
+  display: flex;
+  align-items: center;
   max-width: 755px;
   border-top: 1px solid $primary-low;
   .topic-avatar {
-    padding: 5px 0 3px;
+    align-self: flex-start;
+    padding: .7em 0;
     border-top: none;
-    float: left;
+    margin-right: 11px;
     i {
-      font-size: 2.500em;
+      font-size: 2em;
       width: 45px;
       text-align: center;
-      color: dark-light-choose($primary-low-mid, $secondary-high);
+      color: $primary-low-mid;
     }
   }
 
@@ -363,27 +491,33 @@ blockquote > *:last-child {
   }
 
   .small-action-desc.timegap {
-      color: dark-light-choose($primary-medium, $secondary-high);
+      color: $primary-medium;
   }
 
   .small-action-desc {
-    padding: 0.25em 0 0.5em 4.3em;
-    margin-top: 6px;
+    display: flex;
+    flex-wrap: wrap;
+    flex: 1 1 100%;
+    align-items: center;
+    padding: 1em 0;
     text-transform: uppercase;
     font-weight: bold;
-    font-size: 0.857em;
-    color: dark-light-choose($primary-low-mid, $secondary-high);
+    font-size: $font-down-1;
+    color: $primary-medium;
 
     .custom-message {
+      flex: 1 1 100%;
       text-transform: none;
-      margin: 15px 0px 5px;
       font-weight: normal;
-      font-size: 1.143em;
+      font-size: $font-up-1;
+      order: 12;
       p {
-        margin: 5px 0;
+        margin-bottom: 0;
       }
     }
-
+    a.trigger-user-card {
+      align-self: stretch;
+    }
     .avatar {
       margin-right: 0.8em;
       float: left;
@@ -391,17 +525,21 @@ blockquote > *:last-child {
 
     > p {
       margin: 0;
-      padding-top: 4px;
+      line-height: $line-height-medium;
+      flex: 1 1;
+
     }
   }
 
   button {
     background: transparent;
     border: 0;
-    float: right;
+    order: 9;
+    &:last-of-type {
+       margin-left: auto;
+       order: 8;
+    }
   }
-
-  clear: both;
 }
 
 .whisper {
@@ -449,8 +587,8 @@ a.mention, a.mention-group {
     > i.fa {
       color: dark-light-choose($primary-medium, $secondary-medium);
       margin-right: 6px;
-      font-size: $base-font-size;
-      line-height: $base-line-height;
+      font-size: $font-0;
+      line-height: $line-height-large;
     }
 
     > span.url {
@@ -464,9 +602,9 @@ a.mention, a.mention-group {
     > span.help {
       display: inline-block;
       color: dark-light-choose($primary-medium, $secondary-medium);
-      font-size: 0.857em;
+      font-size: $font-down-1;
       font-style: italic;
-      line-height: $base-line-height;
+      line-height: $line-height-large;
       margin-bottom: 1px;
     }
 
@@ -479,7 +617,7 @@ a.mention, a.mention-group {
 .broken-image, .large-image {
   color: dark-light-choose($primary-low-mid, $secondary-high);
   border: 1px solid $primary-low;
-  font-size: 2.286em;
+  font-size: $font-up-5;
   padding: 16px;
 }
 
@@ -498,3 +636,13 @@ and (max-width : 767px) {
     clear: left;
   }
 }
+
+.signup-cta {
+  a {
+    float: right;
+    text-decoration: underline;
+  }
+  .buttons {
+    margin-bottom: 1em;
+  }
+}
diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss
index 9efde29e8d5..8bf9f292618 100644
--- a/app/assets/stylesheets/common/base/topic.scss
+++ b/app/assets/stylesheets/common/base/topic.scss
@@ -9,8 +9,8 @@
 .progress-back-container {
   position: fixed;
   bottom: 40px;
-  z-index: 950;
-  margin-right: 0px;
+  z-index: z("dropdown");
+  margin-right: 0;
   animation-duration: 0.5s;
   animation-name: button-jump-up;
   width: 145px;
@@ -35,30 +35,49 @@
 
   .topic-admin-popup-menu.right-side {
     position: relative;
-    right: 35px;
+    right: 50px;
   }
 }
 
 #topic-progress-wrapper.docked {
   .topic-admin-popup-menu.right-side {
-    right: 40px;
+    right: 50px;
   }
 }
 
+.title-wrapper {
+  display: flex;
+  flex-wrap: wrap;
+  width: 90%;
+  align-items: flex-end;
+
+  .btn-small {
+    margin: 0 6px 0 0;
+  }
+
+  a.topic-featured-link {
+    display: inline-block;
+  }
+}
+
+h1 {
+  margin: 0 0 4px 0;
+}
+
+a.badge-category {
+  margin-top: 5px;
+}
 
 #topic-title {
   .title-wrapper {
-    float: left;
+    display: flex;
+    flex-wrap: wrap;
     width: 90%;
 
     .btn-small {
       margin: 0 6px 0 0;
     }
 
-    .badge-wrapper {
-      margin-right: 12px;
-    }
-
     a.topic-featured-link {
       display: inline-block;
     }
@@ -66,6 +85,7 @@
 
   h1 {
     margin: 0 0 4px 0;
+    width: 90%;
   }
 
   a.badge-category {
@@ -85,15 +105,15 @@
     .private-message-glyph {
       margin: 5px 5px 0 0;
     }
-    .category-chooser, .tag-chooser {
+    .category-chooser, .mini-tag-chooser {
       flex: 1 1 49%;
       margin: 0 0 9px 0;
       @media all and (max-width: 500px) {
-        flex: 1 1 100%;        
+        flex: 1 1 100%;
       }
-        
+
     }
-    .tag-chooser {
+    .mini-tag-chooser {
       margin-left: 2%;
       @media all and (max-width: 500px) {
         margin-left: 0;
@@ -102,6 +122,15 @@
   }
 }
 
+.private-message-glyph {
+  color: dark-light-choose($primary-low-mid, $secondary-high);
+  margin-right: 5px;
+}
+
+.archetype-private_message #topic-title .edit-topic-title .tag-chooser {
+  margin-left: 19px;
+}
+
 .private_message {
   #topic-title {
     .edit-topic-title {
@@ -120,11 +149,7 @@
 .extra-info-wrapper {
   .badge-wrapper {
     float: left;
-    &.bullet {
-      margin-top: 5px;
-    }
   }
-
 }
 
 .has-pending-posts {
@@ -147,7 +172,7 @@
 #suggested-topics h3 .badge-wrapper.bullet span.badge-category {
   // Override vertical-align: text-top from `badges.css.scss`
   vertical-align: baseline;
-  line-height: 1.2;
+  line-height: $line-height-medium;
 }
 
 #suggested-topics h3 .badge-wrapper.bullet,
@@ -162,18 +187,9 @@
   max-width: 150px;
 }
 
-.topic-unsubscribe {
-  .notifications-button {
-    display: inline-block;
-    float: none;
-    line-height: 2em;
-    .dropdown-toggle {
-      float: none;
-    }
-    .dropdown-menu {
-      bottom: initial;
-    }
-  }
+#suggested-topics .suggested-topics-title {
+  display: flex;
+  align-items: center;
 }
 
 .post-links-container {
@@ -183,7 +199,10 @@
   .post-links {
     margin-top: 1em;
     padding-top: 1em;
-    border-top: 1px solid $primary-low; 
+    border-top: 1px solid $primary-low;
+    li:last-of-type {
+      margin-bottom: 1em;
+    }
   }
 
   .expand-links {
@@ -191,9 +210,13 @@
   }
 
   .track-link {
-    padding-left: 0;
-    display: inline-block;
-    overflow: hidden;
+    display: flex;
+    align-items: center;
+    span:not(.badge) {
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
   }
 
   ul {
@@ -207,11 +230,11 @@
       }
       .clicks {
         margin-left: 0.5em;
+        flex: 0 0 auto;
       }
       i {
-        float: left;
-        font-size: 0.857em;
-        margin: 0.3em 0.5em 0 0;
+        font-size: $font-down-2;
+        margin: 0 0.5em 0 0;
       }
     }
   }
diff --git a/app/assets/stylesheets/common/base/user-badges.scss b/app/assets/stylesheets/common/base/user-badges.scss
index 7deaf44cff2..98c47475ff5 100644
--- a/app/assets/stylesheets/common/base/user-badges.scss
+++ b/app/assets/stylesheets/common/base/user-badges.scss
@@ -3,7 +3,7 @@
   padding: 3px 8px;
   color: $primary;
   border: 1px solid $primary-low;
-  line-height: 19px;
+  line-height: $line-height-large;
   display: inline-block;
   background-color: $secondary;
   margin: 0 0 3px;
@@ -20,15 +20,15 @@
   }
 
   &.badge-type-gold .fa {
-    color: rgb(231, 195, 0) !important;
+    color: $gold !important;
   }
 
   &.badge-type-silver .fa {
-    color: #c0c0c0 !important;
+    color: $silver !important;
   }
 
   &.badge-type-bronze .fa {
-    color: #cd7f32 !important;
+    color: $bronze !important;
   }
 
   &.disabled {
@@ -68,7 +68,7 @@
 
 .show-badge .badge-user-info {
   .earned {
-    font-size: 1.286em;
+    font-size: $font-up-2;
     margin-bottom: 1em;
   }
 }
@@ -79,7 +79,7 @@
   .load-more {
     padding-top: 30px;
     display: block;
-    font-size: 1.286em;
+    font-size: $font-up-2;
   }
 }
 
@@ -94,11 +94,11 @@
   }
   .date {
     display: inline-block;
-    font-size: 1.143em;
+    font-size: $font-up-1;
     margin-left: 10px;
   }
   .post-link {
-    font-size: 1.286em;
+    font-size: $font-up-2;
     width: 500px;
     margin: 0;
     padding: 0;
@@ -121,11 +121,11 @@
 .badge-card {
   position: relative;
   display: inline-block;
-  background-color: $primary-low;
-  margin-right: 5px;
-  margin-bottom: 10px;
-  box-shadow: 1px 1px 3px rgba(0.0, 0.0, 0.0, 0.2);
-
+  background-color: $primary-very-low;
+  border: 1px solid $primary-low;
+  margin-bottom: 2vh;
+  transition: box-shadow .25s;
+  
   .check-display {
     position: absolute;
     left: 5px;
@@ -138,22 +138,31 @@
     top: 5px;
     font-weight: bold;
     color: $primary-medium;
-    font-size: 1.286em;
+    font-size: $font-up-2;
   }
 
   .badge-contents {
     display: flex;
-    flex-direction: row;
     min-height: 128px;
     height: 100%;
+    
+    .badge-link {
+      display: flex;
+      flex: 1 1 auto;
+      padding: 0 10%;
+      @media screen and (max-width: 550px) {
+        padding: 0 5%;
+      }
+    }
 
     .badge-icon {
-      min-width: 90px;
       display: flex;
+      flex: 0 0 auto; 
+      width: 1.23em;
+      margin-right: 5%;
       align-items: center;
       justify-content: center;
-      background-color: $primary-low;
-      font-size: 3em;
+      font-size: 3.5em;
 
       img {
         max-width: 80px;
@@ -175,33 +184,75 @@
 
     .badge-info {
       display: flex;
+      flex: 1 1 auto;
       align-items: center;
-      justify-content: center;
-      padding: 15px;
+      padding: 1em 1.5em 1em 0;
       color: $primary;
+      @media screen and (max-width: 600px) {
+        padding-right: 0;
+      }
 
       h3 {
-        margin-bottom: 0.4em;
+        margin-bottom: 0.25em;
+        font-size: $font-up-1;
+        @media screen and (min-width: 900px) {
+          font-size: $font-up-2;
+        }
       }
     }
   }
+
+  &.medium {
+    vertical-align: top;
+    flex: 0 0 32%;
+    margin-right: calc(2% - 3px);
+    &:nth-of-type(3n) {
+      margin-right: 0;
+    }
+    @include small-width {
+      flex: 0 0 49%;
+      margin-right: 0;
+    }
+    @media screen and (max-width: 550px) {
+      flex: 0 0 100%;
+    }
+    &:hover {
+      box-shadow: shadow("card");
+    }
+    &:active {
+      box-shadow: none;
+    }
+    @media all and (max-width: 320px) {
+      width: 100%;
+    }
+  }
+  &.large {
+    width: 100%;
+    align-self: flex-start;
+    @media screen and (min-width: 767px) {
+      max-width: calc(#{$large-width} / 2);
+      margin-right: 1.5em;      
+    }
+    .badge-contents {
+      .badge-link {
+        padding: 0 5%;
+        width: 90%;
+        h3 {
+          font-size: $font-up-3;
+        }
+      }      
+    }
+  }
 }
 
-.badge-card.medium {
-  width: 350px;
-  vertical-align: top;
-}
-
-@media all and (max-width: 320px) {
-  .badge-card.medium {
-    width: 100%;
+.badges-granted {
+  display: flex;
+  flex-wrap: wrap;
+  @media screen and (max-width: $small-width) {
+    justify-content: space-between;
   }
 }
 
-.badge-card.large {
-  width: 750px;
-}
-
 .badge-groups {
   margin: 20px 0;
   color: dark-light-choose($primary-medium, $secondary-medium);
@@ -210,35 +261,65 @@
   }
 }
 
-.badge-grouping {
+.badge-title {
+  .user-content {
+    padding: 0;
+  }
+}
+
+.badge-group-list {
   margin-bottom: 1.5em;
+  display: flex;
+  flex-wrap: wrap;
+  @include small-width {
+    justify-content: space-between;    
+  }
+
+  .title {
+    width: 100%;
+    font-size: $font-up-1;
+  }
 }
 
 .show-badge-details {
   display: flex;
+  flex-wrap: wrap;
   flex-direction: row;
   margin-bottom: 2em;
   margin-top: 1em;
 
   .badge-grant-info {
-    display: flex;
-    align-items: center;
-    margin-left: 1em;
     &.hidden {
       display: none;
     }
   }
+
   .grant-info-item {
     margin-bottom: 1em;
     color: dark-light-choose($primary-medium, $secondary-medium);
+    &:first-of-type {
+      margin-right: 10px;
+    }
+  }
+
+  .badge-set-title {
+    padding: 1.5em;
+    border: 1px solid $primary-low;
+    
+    .user-content {
+      padding: 0;
+      .control-group {
+        margin-bottom: 1em;
+      }
+    }
   }
 
   .badge-title .form-horizontal .controls {
-    margin-left: 20px;
+    margin-left: 0;
   }
 
-  .close-btn {
-    margin: -20px 0 0 20px;
+  .form-horizontal {
+    margin-bottom: 0;
   }
 }
 
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index 97197207d22..a81c2798ddc 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -1,4 +1,5 @@
 // Common styles for "/user" section
+// These styles are also used for "/groups" — test those pages if making significant changes
 .user-right {
   .list-actions {
     margin-bottom: 10px;
@@ -7,6 +8,14 @@
       margin-right: 10px;
     }
   }
+
+  .paginated-topics-list {
+    position: relative;
+  }
+
+  .show-mores {
+    width: 100%;
+  }
 }
 
 .user-main {
@@ -17,19 +26,36 @@
   .about {
     overflow: hidden;
     width: 100%;
+    margin-bottom: 15px;
 
     .secondary {
+      background: $secondary;
+      border-top: 1px solid $primary-low;
+      border-bottom: 1px solid $primary-low;
 
       .btn {
-        padding: 3px 12px;
+        padding: 4px 12px;
       }
 
       dl {
         margin: 0;
+        padding: 5px 10px;
+        div {
+          display: inline-flex;
+          align-items: baseline;
+          margin-right: 15px;
+          margin: 4px 0;
+        }
+      }
+
+      dt, dd {
+        display: inline-flex;
+        align-items: center;
       }
 
       dd {
         padding: 0;
+        margin: 0 15px 0 0;
         overflow: hidden;
         text-overflow: ellipsis;
         color: $primary;
@@ -46,7 +72,7 @@
 
       dt {
         color: $secondary-medium;
-        margin: 0;
+        margin-right: 5px;
         display: inline-block;
       }
     }
@@ -60,13 +86,13 @@
       }
 
       h1 {
-        font-size: 2.286em;
+        font-size: $font-up-5;
         font-weight: normal;
         i {font-size: .8em;}
       }
 
       h2 {
-        font-size: 1.286em;
+        font-size: $font-up-2;
         font-weight: normal;
         margin-top: 10px;
         max-width: 100%;
@@ -77,7 +103,7 @@
 
       h3 {
         font-weight: normal;
-        font-size: 1em;
+        font-size: $font-0;
         margin: 5px 0;
 
         .d-icon:not(:first-of-type) {
@@ -120,6 +146,16 @@
           }
         }
       }
+
+      .user-profile-avatar {
+        position: relative;
+        float: left;
+        height: 100%;
+        .avatar-flair {
+          bottom: 8px;
+          right: 16px;
+        }
+      }
     }
 
     .controls {
@@ -163,11 +199,11 @@
           }
 
           h1 {
-            font-size: 1.429em;
+            font-size: $font-up-3;
           }
 
           h2 {
-            font-size: 1.143em;
+            font-size: $font-up-1;
             margin-top: 4px;
           }
 
@@ -176,14 +212,21 @@
           }
         }
       }
+
+      .user-profile-avatar {
+        .avatar-flair {
+          bottom: 8px;
+          right: 2px;
+        }
+      }
     }
   }
 
   .staff-counters {
     background: $primary;
-    color: $secondary;    
+    color: $secondary;
     display: flex;
-    padding: 10px;    
+    padding: 10px;
     > div, > div a {
       display: flex;
       align-items: baseline;
@@ -192,9 +235,9 @@
       span {
         padding: 1px 6px;
         border-radius: 10px;
-        margin-right: 5px;        
+        margin-right: 5px;
       }
-    }  
+    }
 
     a {
       color: $secondary;
@@ -212,7 +255,7 @@
     width: 30px;
     text-align: center;
     vertical-align: middle;
-    line-height: 30px;
+    line-height: $line-height-large;
   }
 
   .helpful-flags {
@@ -255,8 +298,8 @@
       color: dark-light-choose($primary-medium, $secondary-medium);
         margin-top: 5px;
         margin-bottom: 10px;
-        font-size: .857em;
-        line-height: 1.4em;
+        font-size: $font-down-1;
+        line-height: $line-height-large;
       }
     }
   }
@@ -267,7 +310,7 @@
     text-align: top;
     color: $danger;
     font-weight: bold;
-    font-size: 1.286em;
+    font-size: $font-up-2;
   }
 }
 
@@ -306,7 +349,7 @@
 
   h2 {
     a {
-      font-size: 1em;
+      font-size: $font-0;
       color: scale-color($tertiary, $lightness: -10%);
       cursor: pointer;
     }
@@ -348,12 +391,7 @@
 }
 
 .user-nav {
-  margin: 5px 0px;
-  padding-top: 10px;
-
-  li a {
-    color: dark-light-choose($primary-medium, $secondary-medium);
-  }
+  margin: 5px 0;
 }
 
 .top-section {
@@ -405,11 +443,16 @@
 .top-section,
 .top-sub-section {
   margin-bottom: 20px;
+  &.badges-section {
+    display: flex;
+    flex-wrap: wrap;
+  }
 }
 
 .stats-title {
   text-transform: uppercase;
   margin-bottom: 10px;
+  width: 100%;
 }
 
 .stats-section {
@@ -425,7 +468,7 @@
     &.linked-stat { // This makes the entire "box" (the li) clickable instead of a narrow area.
       padding: 0;
       a {
-        padding: 10px 14px;        
+        padding: 10px 14px;
         width: 100%;
         height: 100%;
         display: block;
@@ -440,7 +483,7 @@
 
   .value {
     font-weight: bold;
-    font-size: 1.286em;
+    font-size: $font-up-2;
   }
 
   .label {
@@ -487,7 +530,7 @@
 
 .links-section {
   .domain {
-    font-size: 0.786em;
+    font-size: $font-down-1;
     color: dark-light-choose($primary-medium, $secondary-high);
   }
 }
@@ -517,8 +560,8 @@
   .instructions {
     color: dark-light-choose($primary-medium, $secondary-medium);
     margin-bottom: 10px;
-    font-size: .857em;
-    line-height: 1.4em;
+    font-size: $font-down-1;
+    line-height: $line-height-large;
 
     a[href] {
       color: $tertiary;
@@ -536,19 +579,15 @@
     width: 520px;
   }
 
+  .warning-wrap {
+    height: 30px;
+    margin-bottom: 10px;
+  }
+
   .category-notifications .category-controls,
   .tag-notifications .tag-controls {
     margin-top: 24px;
   }
-
-  .tags .select2-container-multi {
-    border: 1px solid $primary-low;
-    width: 540px;
-    border-radius: 0;
-    .select2-choices {
-      border: none;
-    }
-  }
 }
 
 .paginated-topics-list {
@@ -586,3 +625,15 @@
   }
 }
 
+.qr-code-container {
+    display: flex;
+    .qr-code {
+        padding: 5px 5px 0 5px;
+        background-color: white;
+    }
+}
+
+.primary-textual .staged,
+#user-card .staged {
+  font-style: italic;
+}
diff --git a/app/assets/stylesheets/common/base/username_tagsinput.scss b/app/assets/stylesheets/common/base/username_tagsinput.scss
index 66e5b32ea1a..41fd3fa5d0d 100644
--- a/app/assets/stylesheets/common/base/username_tagsinput.scss
+++ b/app/assets/stylesheets/common/base/username_tagsinput.scss
@@ -20,20 +20,20 @@ div.tagsinput span.tag {
   margin-right: 5px;
   margin-bottom:5px;
   font-family: helvetica;
-  font-size: .929em;
+  font-size: $font-down-1;
 }
 
-div.tagsinput span.tag a { font-weight: bold; color: #82ad2b; text-decoration:none; font-size: .786em;  }
+div.tagsinput span.tag a { font-weight: bold; color: #82ad2b; text-decoration:none; font-size: $font-down-2; }
 div.tagsinput input {
   width:80px;
   font-family: helvetica;
-  font-size: 0.929em;
+  font-size: $font-down-1;
   border:1px solid transparent;
   padding:2px 5px;
   background: transparent;
   color: #000;
-  outline:0px;
-  margin: 0px 5px 5px 0px;
+  outline:0;
+  margin: 0 5px 5px 0;
 }
 div.tagsinput div { display:block; float: left; }
 .tags_clear { clear: both; width: 100%; height: 0; }
diff --git a/app/assets/stylesheets/common/components/badges.scss b/app/assets/stylesheets/common/components/badges.scss
index b988ed40943..a2f3274f728 100644
--- a/app/assets/stylesheets/common/components/badges.scss
+++ b/app/assets/stylesheets/common/components/badges.scss
@@ -16,109 +16,70 @@
 // --------------------------------------------------
 
 .badge-wrapper {
-  font-size: 0.857em;
+  font-size: $font-down-1;
   font-weight: bold;
   white-space: nowrap;
-  display: inline-block;
   position: relative;
+  display: inline-flex;
+  align-items: baseline;
+  
+  .badge-category {
+      display: inline-flex;
+      align-items: baseline;
+      .category-name {
+        text-overflow: ellipsis;
+        overflow: hidden;
+    }
+    .d-icon {
+      margin-right: 3px;
+    }
+  }
 
-  &.bar { //bar category style
-    line-height: 1.25;
-    margin-right: 5px;
-    display: inline-flex;
+  // ----- Bullet 
 
+  &.bullet { 
+    margin-right: 12px;
     span.badge-category {
       color: $primary;
-      padding: 3px;
-      vertical-align: text-top;
-      margin-top: -2px; //vertical alignment fix
-      display: inline-block;
       overflow: hidden;
       text-overflow: ellipsis;
-
       .extra-info-wrapper & {
         color: $header-primary;
       }
     }
-
-    .badge-category-parent-bg, .badge-category-bg {
-      display: inline-block;
-      padding: 1px;
-
-      &:before {
-        content: "\a0";
-      }
-    }
-  }
-
-  &.none { // no category style
-    color: $primary;
-    margin-right: 5px;
-  }
-
-  &.bullet { //bullet category style
-    display: inline-flex;
-    align-items: baseline;
-    margin-right: 5px;
-    font-size: .857em;
-    line-height: 15px;
-
-    span.badge-category {
-      color: $primary;
-      display: inline-block;
-      overflow: hidden;
-      text-overflow: ellipsis;
-
-      #search-dropdown & {
-        margin-top: -2px;
-      }
-
-      .extra-info-wrapper & {
-        color: $header-primary;
-      }
-    }
-
    .badge-category-parent-bg, .badge-category-bg {
-    width: 10px;
-    height: 10px;
+    width: 9px;
+    height: 9px;
     margin-right: 5px;
     display: inline-block;
-    line-height: 1;
-
-    &:before {
-      content: "\a0";
     }
-  }
-
-  span {
-      &.badge-category-parent-bg { //subcategory style
+    .badge-category-parent-bg { // Subcategories
+      width: 5px;
+      margin-right: 0;
+      +.badge-category-bg {
         width: 5px;
-        margin-right: 0;
-        & + .badge-category-bg {
-          width: 5px;
-        }
       }
     }
   }
 
+  // ----- Box 
 
-  &.box {  //box category style (apply custom widths to the wrapper, not the children)
-    line-height: 1.5;
-    margin-top: 5px;
+  &.box {  
     margin-right: 5px;
-
+    padding: 2px 4px 2px 4px;
+    display: inline-flex;
     span {
-      display: block;
       overflow: hidden;
       text-overflow: ellipsis;
-
       &.badge-category-bg, &.badge-category-parent-bg {
         position: absolute;
-        width: 100%;
-        height: 100%;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        left: 0;
       }
 
-      &.badge-category-parent-bg { //subcategory style
+      &.badge-category-parent-bg { // Subcategories 
         width: calc(100% - 5px);
         & + .badge-category-bg {
           left: 5px;
@@ -131,128 +92,73 @@
 
       &.badge-category {
         position: relative;
-        padding: 0 5px;
-        margin-top: 2px;
+      }
+    }
+    + .topic-header-extra {
+      padding: 2px 4px 2px 4px;      
+    }
+  }
+
+  // ----- Bar 
+
+  &.bar { 
+    margin-right: 5px;
+
+    span.badge-category {
+      color: $primary;
+      padding: 1px 3px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+
+      .extra-info-wrapper & {
+        color: $header-primary;
+      }
+    }
+
+    .badge-category-parent-bg, .badge-category-bg { // Subcategories
+      display: inline-block;
+      padding: 0 1px;
+
+      &:before {
+        content: "\a0";
       }
     }
   }
-}
 
-.extra-info-wrapper .title-wrapper .badge-wrapper.bar {
-  margin-top: 6px;
-}
+  // ----- No category style 
 
-.autocomplete, td.category {
-  .badge-wrapper {
-    max-width: 230px;
+  &.none { 
+    color: $primary;
+    margin-right: 5px;
   }
+
 }
 
+
 // Category badge dropdown
 // --------------------------------------------------
 
-
 .list-controls {
   .category-breadcrumb {
-    a.badge-category, .dropdown-header {
+    a.badge-category {
       display: inline-block;
-      padding: 5px 8px;
-      line-height: 20px;
-
-      &.category-dropdown-button {
-        margin-left: -4px;
-        padding: 5px;
-        width: 13px;
-
-        .d-icon-caret-right {
-          margin-left: 2px;
-        }
-      }
-    }
-
-    li.bar>.dropdown-header:not(.home):first-child {
-      border-left: 5px solid;
-      font-size: 1em;
-    }
-
-    li.bar>.dropdown-header {
-      background: $primary-low;
-      color: $primary;
-    }
-
-    li.bullet>.dropdown-header {
-      background: $primary-low;
-      color: $primary;
-
-      .badge-category-bg {
-        width: 10px;
-        height: 10px;
-        display: inline-block;
-        margin: 0 2px;
-      }
+      padding: 6px 8px;
+      line-height: $line-height-medium;
     }
   }
-
-  .category-dropdown-menu {
-    .dropdown-header {
-      &.home {
-        margin-left: 4px;
-        padding-left: 0;
-      }
-    }
-    .cat {
-        line-height: 1;
-      }
-    .badge-wrapper {
-      box-sizing: border-box;
-
-      &.bar {
-        padding: 5px 0;
-        width: 100%;
-        .badge-category {
-          max-width: 100px;
-        }
-      }
-      &.none {
-        padding: 5px;
-      }
-      &.bullet {
-        padding: 5px;
-        width: 100%;
-        .badge-category {
-          max-width: 100px;
-        }
-      }
-      &.box {
-        margin-top: 0;
-        width: 100%;
-        line-height: 1;
-        vertical-align: text-top;
-        span.badge-category {
-          max-width: 100px;
-          padding: 5px;
-        }
-      }
-
-    }
-
-  }
-
 }
 
-
-
-
 // Notification badge
 // --------------------------------------------------
 
 .badge-notification {
   @extend %badge;
-  padding: 4px 5px 2px 5px;
+  padding: 3px 5px;
+  min-width: 8px;
   vertical-align: middle;
   color: $secondary;
-  font-size: .786em;
-  line-height: 1;
+  font-size: $font-down-2;
+  line-height: $line-height-small;
   text-align: center;
   background-color: dark-light-choose($primary-low-mid, $secondary-low);
   &[href] {
@@ -275,7 +181,7 @@
     background-color: transparent;
     color: $tertiary-high;
     font-weight: normal;
-    font-size: 0.929em;
+    font-size: $font-down-1;
   }
 
   &.new-topic::before {
@@ -291,7 +197,6 @@
     top: -1px;
     color: $primary-medium;
     position: relative;
-    margin-left: 2px;
     border: none;
   }
 }
@@ -301,8 +206,8 @@
 
 .badge-posts {
   font-weight: normal;
-  font-size: 1em;
-  line-height: 1;
+  font-size: $font-0;
+  line-height: $line-height-small;
   &[href] {
     color: dark-light-choose($primary-medium, $secondary-medium);
   }
@@ -313,11 +218,9 @@
 
 .badge-group {
   @extend %badge;
-  padding: 4px 5px 2px 5px;
+  padding: 2px 5px;
   color: $primary;
-  text-shadow: 0 1px 0 rgba($primary, 0.1);
   background-color: $primary-low;
   border-color: $primary-low;
-  font-size: 0.857em;
-  box-shadow: inset 0 1px 0 rgba(0,0,0, 0.22);
+  font-size: $font-down-1;
 }
diff --git a/app/assets/stylesheets/common/components/banner.scss b/app/assets/stylesheets/common/components/banner.scss
index 096c01e02ab..c70a20bc979 100644
--- a/app/assets/stylesheets/common/components/banner.scss
+++ b/app/assets/stylesheets/common/components/banner.scss
@@ -5,9 +5,8 @@
 #banner {
   padding: 10px;
   background: $tertiary-low;
-  box-shadow: 0 2px 4px -1px rgba(0,0,0, .25);
   color: $primary;
-  z-index: 1001;
+  z-index: z("base") + 1;
   overflow: auto;
 
   &.overlay {
@@ -15,7 +14,7 @@
   }
 
   .close {
-    font-size: 1.786em;
+    font-size: $font-up-4;
     margin-top: -5px;
     color: dark-light-choose($primary-low-mid, $secondary-medium);
     padding-left: 5px;
diff --git a/app/assets/stylesheets/common/components/buttons.scss b/app/assets/stylesheets/common/components/buttons.scss
index a3ce89e5c94..f0e2255a0dc 100644
--- a/app/assets/stylesheets/common/components/buttons.scss
+++ b/app/assets/stylesheets/common/components/buttons.scss
@@ -10,8 +10,8 @@
   margin: 0;
   padding: 6px 12px;
   font-weight: 500;
-  font-size: 1em;
-  line-height: 18px;
+  font-size: $font-0;
+  line-height: $line-height-medium;
   text-align: center;
   cursor: pointer;
   transition: all .25s;
@@ -29,7 +29,6 @@
   &.no-text {
     .fa {
       margin-right: 0;
-      line-height: 10px;
     }
   }
 }
@@ -62,6 +61,7 @@
 
   .d-icon {
     opacity: 0.7;
+    line-height: $line-height-medium; // Match button text line-height 
   }
   &.btn-primary .d-icon {
     opacity: 1;
@@ -118,16 +118,17 @@
 // --------------------------------------------------
 
 .btn-social {
-  color: $secondary;
-  text-shadow: 0 1px 0 rgba($primary, 0.2);
-  box-shadow: inset 0 1px 0 rgba(0,0,0, 0.1);
+  color: #fff;
+  &:hover {
+    color: #fff;
+  }
   &[href] {
     color: $secondary;
   }
   &:before {
     margin-right: 9px;
     font-family: FontAwesome;
-    font-size: 1.214em;
+    font-size: $font-0;
   }
   &.google, &.google_oauth2 {
     background: $google;
@@ -177,22 +178,22 @@
 
 .btn-small {
   padding: 3px 6px;
-  font-size: 0.857em;
-  line-height: 16px;
+  font-size: $font-down-1;
 }
 
 // Large
 
 .btn-large {
   padding: 9px 18px;
-  font-size: 1.143em;
-  line-height: 20px;
+  font-size: $font-up-1;
+  line-height: $line-height-small;
 }
 
 .btn-flat {
   background: transparent;
   border: 0;
   outline: 0;
+  line-height: $line-height-small;
   .d-icon {
     opacity: 0.7;
   }
diff --git a/app/assets/stylesheets/common/components/conditional-loading-section.scss b/app/assets/stylesheets/common/components/conditional-loading-section.scss
new file mode 100644
index 00000000000..cb6c052b18d
--- /dev/null
+++ b/app/assets/stylesheets/common/components/conditional-loading-section.scss
@@ -0,0 +1,16 @@
+.conditional-loading-section {
+  &.is-loading {
+    padding: 2em;
+    margin: 1em;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: $primary-very-low;
+    flex-direction: column;
+
+    .title {
+      font-size: $font-up-1;
+      font-weight: 700;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/components/date-picker.scss b/app/assets/stylesheets/common/components/date-picker.scss
index edf976fa7fa..350927e4b5b 100644
--- a/app/assets/stylesheets/common/components/date-picker.scss
+++ b/app/assets/stylesheets/common/components/date-picker.scss
@@ -7,8 +7,8 @@
 }
 
 .date-picker-wrapper {
-  display: inline-block;
   position: relative;
+  display: inline-block;
 }
 
 .date-picker {
diff --git a/app/assets/stylesheets/common/components/groups-form-membership-fields.scss b/app/assets/stylesheets/common/components/groups-form-membership-fields.scss
new file mode 100644
index 00000000000..d47b2506967
--- /dev/null
+++ b/app/assets/stylesheets/common/components/groups-form-membership-fields.scss
@@ -0,0 +1,3 @@
+.group-form-automatic-membership-automatic {
+  margin-bottom: 10px;
+}
diff --git a/app/assets/stylesheets/common/components/keyboard_shortcuts.scss b/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
index 04045f843f9..643c314463d 100644
--- a/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
+++ b/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
@@ -15,8 +15,12 @@
 }
 
 #keyboard-shortcuts-help {
-  .span6 {
-    width:32%;
+  div.row {
+    width: 100%;
+    div {
+      float: left;
+      width:32%;
+    }
   }
   ul {
     list-style: none;
@@ -29,7 +33,7 @@
     b {
       padding: 2px 6px;
       border-radius: 4px;
-      box-shadow: 0 2px 0 rgba(0,0,0,0.2),0 0 0 1px dark-light-choose(#fff,#000) inset;
+      box-shadow: shadow("kbd");
       background: dark-light-choose(#fafafa, #333);
       border: 1px solid dark-light-choose(#ccc, #555);
       border-bottom: medium none dark-light-choose(#fff, #000);
diff --git a/app/assets/stylesheets/common/components/navs.scss b/app/assets/stylesheets/common/components/navs.scss
index 55477793a01..6bdc0b3961c 100644
--- a/app/assets/stylesheets/common/components/navs.scss
+++ b/app/assets/stylesheets/common/components/navs.scss
@@ -27,10 +27,10 @@
 
     > a {
       border: none;
-      padding: 5px 12px;
+      padding: 6px 12px;
       color: $primary;
-      font-size: 1.143em;
-      line-height: 20px;
+      font-size: $font-up-1;
+      line-height: $line-height-medium;
       transition: background .15s;
 
       .d-icon {
@@ -81,8 +81,8 @@
   a {
     margin: 0;
     padding: 13px;
-    font-size: 1.143em;
-    line-height: 20px;
+    font-size: $font-up-1;
+    line-height: $line-height-small;
     cursor: pointer;
     color: $primary;
 
@@ -102,15 +102,15 @@
   }
 
   .count {
-    font-size: 0.857em;
-    line-height: 16px;
+    font-size: $font-down-1;
+    line-height: $line-height-large;
   }
 
   .glyph {
-    font-size: 0.857em;
+    font-size: $font-down-1;
     width: 1.25em;
     text-align: center;
     margin-right: .5em;
-    line-height: 20px;
+    line-height: $line-height-large;
   }
 }
diff --git a/app/assets/stylesheets/common/components/user-info.scss b/app/assets/stylesheets/common/components/user-info.scss
index b6e0b71ad12..fa704ab5f89 100644
--- a/app/assets/stylesheets/common/components/user-info.scss
+++ b/app/assets/stylesheets/common/components/user-info.scss
@@ -13,7 +13,9 @@
     float: left;
     width: 70%;
     padding-left: 5px;
-    font-size: .929em;
+    @media screen and (max-width: 600px) {
+      font-size: $font-down-1;
+    }
 
     .name-line {
       white-space: nowrap;
@@ -39,6 +41,10 @@
 
   &.small {
     width: 333px;
+    @media screen and (max-width: $small-width) {
+      width: auto;
+      display: flex;
+    }
     @media screen and (max-width: 600px) {
       width: 100%;
     }
@@ -57,6 +63,7 @@
 
     &.badge-info {
       min-height: 80px;
+      min-width: 250px;
 
       .granted-on {
         color: dark-light-choose($primary-medium, $secondary-medium);
@@ -69,3 +76,4 @@
     }
   }
 }
+
diff --git a/app/assets/stylesheets/common/components/user-stream-item.scss b/app/assets/stylesheets/common/components/user-stream-item.scss
index 5c98eff7d22..ea79b2e3bb8 100644
--- a/app/assets/stylesheets/common/components/user-stream-item.scss
+++ b/app/assets/stylesheets/common/components/user-stream-item.scss
@@ -36,16 +36,17 @@
     display: block;
     float: right;
     color: lighten($primary, 40%);
-    font-size: .786em;
+    font-size: $font-down-2;
   }
 
   .delete-info i {
-    font-size: 1em;
+    font-size: $font-0;
   }
 
   .expand-item, .collapse-item {
     float: right;
     margin-right: 0.5em;
+    line-height: $line-height-small;
     color: lighten($primary, 40%);
   }
 
@@ -62,7 +63,7 @@
   }
 
   .name {
-    font-size: 1em;
+    font-size: $font-0;
     max-width: 400px;
     white-space: nowrap;
     overflow: hidden;
@@ -101,13 +102,13 @@
     // common/base/header.scss
     .fa, .icon {
       color: dark-light-choose($primary-medium, $secondary-medium);
-      font-size: 1.714em;
+      font-size: $font-up-4;
     }
   }
 
   .excerpt {
     margin: 5px 0;
-    font-size: 0.929em;
+    font-size: $font-0;
     word-wrap: break-word;
     color: $primary;
 
@@ -115,6 +116,10 @@
       color: $primary-medium;
     }
   }
+
+  .group-member-info {
+    display: flex;
+  }
 }
 
 .user-stream .child-actions, // DEPRECATED: '.user-stream .child-actions' selector
diff --git a/app/assets/stylesheets/common/d-editor.scss b/app/assets/stylesheets/common/d-editor.scss
index 046338d39db..5ccdd6b224f 100644
--- a/app/assets/stylesheets/common/d-editor.scss
+++ b/app/assets/stylesheets/common/d-editor.scss
@@ -8,12 +8,12 @@
   position: absolute;
   background-color: black;
   opacity: 0.8;
-  z-index: 1000;
+  z-index: z("modal","overlay");
 }
 
 .d-editor-modals {
   position: absolute;
-  z-index: 1001;
+  z-index: z("modal","content");
 }
 
 .d-editor {
@@ -52,11 +52,17 @@
   background-color: $secondary;
   position: relative;
   border: 1px solid $primary-medium;
-  
+
   textarea {
     background: transparent;
   }
 
+  &.disabled {
+    cursor: not-allowed;
+    .d-editor-button-bar {
+      visibility: hidden;
+    }
+  }
 }
 
 .d-editor-preview-wrapper {
@@ -73,14 +79,14 @@
   min-height: 30px;
   padding-left: 3px;
   border-bottom: 1px solid $primary-low;
-  
+
   button {
     background-color: transparent;
     color: $primary-high;
   }
 
   .btn:not(.no-text) {
-    font-size: 1.2em;
+    font-size: $font-up-1;
   }
 
   .btn.bold {
@@ -108,13 +114,13 @@
 .d-editor-input,
 .d-editor-preview {
   box-sizing: border-box;
-  flex: 1 1 100%;  
-  width: 100%;  
+  flex: 1 1 100%;
+  width: 100%;
   margin: 0;
   min-height: auto;
   word-wrap: break-word;
   -webkit-appearance: none;
-  border-radius: 0;  
+  border-radius: 0;
   &:focus {
     box-shadow: none;
     border: 0;
@@ -127,7 +133,7 @@
   padding: 10px;
   height: 100%;
   overflow-x: hidden;
-  resize: none; 
+  resize: none;
 }
 
 .d-editor-preview {
@@ -155,6 +161,7 @@
 }
 
 .user-preferences .bio-composer,
+.group-form-bio,
 .edit-category-tab-topic-template {
   textarea {
     width: 100%;
@@ -164,6 +171,7 @@
   }
   .d-editor-textarea-wrapper {
     border: 1px solid $primary-low;
+    min-height: 14em;
   }
   .d-editor-button-bar .btn {
     padding: 6px 8px;
@@ -178,7 +186,8 @@
   }
 }
 
-.user-preferences .bio-composer {
+.user-preferences .bio-composer,
+.group-form-bio {
   padding: 10px;
   border: 1px solid $primary-low;
 }
diff --git a/app/assets/stylesheets/common/foundation/base.scss b/app/assets/stylesheets/common/foundation/base.scss
index bf08280bb1f..247c60d4760 100644
--- a/app/assets/stylesheets/common/foundation/base.scss
+++ b/app/assets/stylesheets/common/foundation/base.scss
@@ -9,7 +9,7 @@ html {
   color: $primary;
   font-family: $base-font-family;
   font-size: $base-font-size;
-  line-height: $base-line-height;
+  line-height: $line-height-large;
   background-color: $secondary;
   overflow-y: scroll;
   direction: ltr;
@@ -103,3 +103,17 @@ pre code {
 #offscreen-content {
   display: none;
 }
+
+// Tables
+// --------------------------------------------------
+
+tbody {
+  border-top: 3px solid $primary-low;
+}
+
+tr {
+  border-bottom: 1px solid $primary-low;
+  &.highlighted {
+    animation: background-fade-highlight 2.5s ease-out;
+  }  
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/common/foundation/variables.scss b/app/assets/stylesheets/common/foundation/variables.scss
index e0cd65a6468..6a91f1006ae 100644
--- a/app/assets/stylesheets/common/foundation/variables.scss
+++ b/app/assets/stylesheets/common/foundation/variables.scss
@@ -9,6 +9,8 @@ $small-width: 800px !default;
 $medium-width: 995px !default;
 $large-width: 1110px !default;
 
+$input-padding: 4px 10px;
+
 // Brand color variables
 // --------------------------------------------------
 
@@ -20,20 +22,120 @@ $twitter: #00bced !default;
 $yahoo: #810293 !default;
 $github: #6d6d6d !default;
 
+// Badge color variables
+// --------------------------------------------------
+
+$gold: rgb(231, 195, 0) !default;
+$silver: #c0c0c0 !default;
+$bronze: #cd7f32 !default;
 
 // Fonts
 // --------------------------------------------------
 
 $base-font-size: 14px !default;
-$base-line-height: 19px !default;
 $base-font-family: Helvetica, Arial, sans-serif !default;
 
-/* These files don't actually exist. They're injected by Stylesheet::Compiler. */
+// Font-size defintions, multiplier ^ (step / interval)
+$font-up-6: 2.296em;
+$font-up-5: 2em;
+$font-up-4: 1.7511em;
+$font-up-3: 1.5157em;
+$font-up-2: 1.3195em;
+$font-up-1: 1.1487em; // 2^(1/5)
+$font-0: 1em;
+$font-down-1: .8706em; // 2^(-1/5)
+$font-down-2: .7579em; // Smallest size we use based on the 1em base
+$font-down-3: .6599em;
+$font-down-4: .5745em;
+$font-down-5: .5em;
+$font-down-6: .4355em;
+
+// Common line-heights
+$line-height-small: 1;
+$line-height-medium: 1.2; // Headings or large text
+$line-height-large: 1.4; // Normal or small text
+
+// These files don't actually exist. They're injected by Stylesheet::Compiler.
+// --------------------------------------------------
+
 @import "theme_variables";
 @import "plugins_variables";
 @import "common/foundation/math";
 
-// Color Utilities
+// Z-index
+// --------------------------------------------------
+
+$z-layers: (
+  "max":              9999,
+  "fullscreen":       1700,
+  "modal": (
+    "tooltip":        1600,
+    "popover":        1500,
+    "dropdown":       1400,
+    "content":        1300,
+    "overlay":        1200,
+  ),
+  "mobile-composer":  1100,
+  "header":           1000,
+  "tooltip":          600,
+  "composer": (
+      "dropdown":     700,
+      "tooltip":      600,      
+      "popover":      500,
+      "content":      400,
+  ),
+  "dropdown":         300,
+  "usercard":         200,
+  "timeline":         100,
+  "base":             1
+  );
+
+@function map-has-nested-keys($map, $keys...) {
+  @each $key in $keys {
+    @if not map-has-key($map, $key) {
+      @return false;
+    }
+    $map: map-get($map, $key);
+  }
+  @return true;
+}
+
+@function map-deep-get($map, $keys...) {
+  @each $key in $keys {
+    $map: map-get($map, $key);
+  }
+  @return $map;
+}
+
+@function z($layers...) {
+  @if not map-has-nested-keys($z-layers, $layers...) {
+    @warn "No layer defined for `#{inspect($layers...)}` in $z-layers map. Check variables.scss, property omitted.";
+  }
+  @return map-deep-get($z-layers, $layers...);
+}
+
+
+// Box-shadow
+// --------------------------------------------------
+
+$box-shadow: (
+  "modal":        0 8px 60px rgba(0, 0, 0, 0.6),
+  "composer":     0 -1px 40px rgba(0, 0, 0, 0.12),
+  "menu-panel":   0 6px 14px rgba(0, 0, 0, 0.15),
+  "card":         0 4px 14px rgba(0, 0, 0, 0.15),
+  "dropdown":     0 2px 3px 0 rgba(0, 0, 0, 0.2),
+  "header":       0 2px 4px -1px rgba(0, 0, 0, 0.25),
+  "kbd":         (0 2px 0 rgba(0, 0, 0, 0.2), 0 0 0 1px dark-light-choose(#fff, #000) inset),
+  "focus":        0 0 6px 0 $tertiary,
+  "focus-danger": 0 0 6px 0 $danger
+);
+
+@function shadow($key) {
+  @return map-get($box-shadow, $key);
+}
+
+// Color utilities
+// --------------------------------------------------
 
 // w3c definition of color brightness https://www.w3.org/TR/AERT#color-contrast
 @function dc-color-brightness($color) {
@@ -93,7 +195,6 @@ $header_primary-low: dark-light-diff($header_primary, $secondary, 90%, -65%);
 $header_primary-medium: dark-light-diff($header_primary, $secondary, 50%, -20%);
 $header_primary-high: dark-light-diff($header_primary, $secondary, 20%, 20%);
 
-
 //secondary
 $secondary-low: dark-light-diff($secondary, $primary, 70%, -70%);
 $secondary-medium: dark-light-diff($secondary, $primary, 50%, -50%);
diff --git a/app/assets/stylesheets/common/input_tip.scss b/app/assets/stylesheets/common/input_tip.scss
index 5f02aeb1118..7a57d21069a 100644
--- a/app/assets/stylesheets/common/input_tip.scss
+++ b/app/assets/stylesheets/common/input_tip.scss
@@ -5,11 +5,11 @@
   position: absolute;
   display: block;
   padding: 5px 10px;
-  z-index: 101;
+  z-index: z("tooltip");
   &.bad {
     background: $danger-medium;
     color: white;
-    box-shadow: 1px 1px 5px rgba(0,0,0, .7);
+    box-shadow: shadow("dropdown");
   }
   &.hide, &.good {
     display: none;
@@ -18,7 +18,7 @@
     float: right;
     color: $primary;
     opacity: 0.5;
-    font-size: 1.071em;
+    font-size: $font-0;
     margin: 0 0 0 4px;
     cursor: pointer;
   }
diff --git a/app/assets/stylesheets/common/select-kit/admin-agree-flag-dropdown.scss b/app/assets/stylesheets/common/select-kit/admin-agree-flag-dropdown.scss
index 9c1e778499b..762b99dd44a 100644
--- a/app/assets/stylesheets/common/select-kit/admin-agree-flag-dropdown.scss
+++ b/app/assets/stylesheets/common/select-kit/admin-agree-flag-dropdown.scss
@@ -1,14 +1,12 @@
-.select-box-kit-body, .select-kit {
+.select-kit {
   &.dropdown-select-box {
 
     &.admin-agree-flag-dropdown {
-      .select-box-kit-body {
+      .select-kit-body {
         width: 485px;
         max-width: 485px;
       }
-      .select-box-kit-row[data-value="delete-spammer"] .texts .name,
       .select-kit-row[data-value="delete-spammer"] .texts .name,
-      .select-box-kit-row[data-value="delete-spammer"] .icons .d-icon,
       .select-kit-row[data-value="delete-spammer"] .icons .d-icon {
         color: $danger;
       }
diff --git a/app/assets/stylesheets/common/select-kit/admin-delete-flag-dropdown.scss b/app/assets/stylesheets/common/select-kit/admin-delete-flag-dropdown.scss
index ffdf62634b7..c76f9e6dd21 100644
--- a/app/assets/stylesheets/common/select-kit/admin-delete-flag-dropdown.scss
+++ b/app/assets/stylesheets/common/select-kit/admin-delete-flag-dropdown.scss
@@ -1,4 +1,4 @@
-.select-box-kit {
+.select-kit {
   &.dropdown-select-box {
     width: auto;
     &.admin-delete-flag-dropdown {
@@ -7,8 +7,8 @@
         color: white;
       }
 
-      .select-box-kit-row[data-value="delete-spammer"] .texts .name,
-      .select-box-kit-row[data-value="delete-spammer"] .icons .d-icon {
+      .select-kit-row[data-value="delete-spammer"] .texts .name,
+      .select-kit-row[data-value="delete-spammer"] .icons .d-icon {
         color: $danger;
       }
     }
diff --git a/app/assets/stylesheets/common/select-kit/categories-admin-dropdown.scss b/app/assets/stylesheets/common/select-kit/categories-admin-dropdown.scss
index 9e3326dd0eb..915d5768370 100644
--- a/app/assets/stylesheets/common/select-kit/categories-admin-dropdown.scss
+++ b/app/assets/stylesheets/common/select-kit/categories-admin-dropdown.scss
@@ -1,11 +1,11 @@
-.select-box-kit, .select-kit {
+.select-kit {
   &.categories-admin-dropdown {
-    .select-box-kit-body, .select-kit-body {
+    .select-kit-body {
       min-width: auto;
       width: 250px;
     }
 
-    .select-box-kit-header .d-icon, .select-kit-header .d-icon {
+    .select-kit-header .d-icon {
       justify-content: space-between;
     }
   }
diff --git a/app/assets/stylesheets/common/select-kit/category-chooser.scss b/app/assets/stylesheets/common/select-kit/category-chooser.scss
index 62da15be23f..10ad31953e9 100644
--- a/app/assets/stylesheets/common/select-kit/category-chooser.scss
+++ b/app/assets/stylesheets/common/select-kit/category-chooser.scss
@@ -1,8 +1,9 @@
-.select-box-kit, .select-kit {
+.select-kit {
   &.combo-box {
     &.category-chooser {
       width: 300px;
-      .select-box-kit-row, .select-kit-row {
+
+      .select-kit-row {
         display: -webkit-box;
         display: -ms-flexbox;
         display: flex;
@@ -21,12 +22,14 @@
         }
 
         .topic-count {
-          font-size: .786em;
+          font-size: $font-down-2;
           color: $primary;
+          white-space: nowrap;
         }
 
         .category-status {
           color: $primary;
+          line-height: $line-height-large;
           -webkit-box-flex: 0;
               -ms-flex: 1 1 auto;
                   flex: 1 1 auto;
@@ -37,8 +40,8 @@
               -ms-flex: 1 1 auto;
                   flex: 1 1 auto;
           color: #919191;
-          font-size: 0.857em;
-          line-height: 16px;
+          font-size: $font-down-1;
+          line-height: $line-height-large;
         }
       }
     }
diff --git a/app/assets/stylesheets/common/select-kit/category-drop.scss b/app/assets/stylesheets/common/select-kit/category-drop.scss
new file mode 100644
index 00000000000..3bc481336d0
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/category-drop.scss
@@ -0,0 +1,73 @@
+.select-kit {
+  &.combo-box {
+    &.category-drop {
+
+      .badge-wrapper {
+        font-size: $font-0;
+        font-weight: normal;
+
+        &.box {
+          margin: 0;
+
+          span.badge-category {
+            margin: 0;
+          }
+        }
+      }
+
+      &.bar.has-selection .category-drop-header {
+        border: none;
+      }
+
+      &.box.has-selection .category-drop-header {
+        padding: 3px 5px 3px 10px;
+      }
+
+      .category-drop-header {
+        padding: 5px 5px 5px 10px;
+        
+        &.is-none .selected-name {
+          color: inherit;
+        }
+
+        .badge-wrapper {
+          margin-right: 0;
+        }
+
+      }
+
+      .select-kit-body {
+        min-width: 300px;
+      }
+
+      .select-kit-row {
+        flex-direction: column;
+        align-items: flex-start;
+
+        .category-desc {
+          font-weight: normal;
+          color: $primary-medium;
+          margin-top: 2px;
+        }
+
+        .category-status {
+          align-items: center;
+        }
+
+        .topic-count {
+          margin-left: 5px;
+          font-weight: normal;
+        }
+
+        .badge-wrapper {
+          margin: 0;
+          font-weight: bold;
+        }
+      }
+
+      &.is-expanded .select-kit-wrapper, .select-kit-wrapper {
+        display: none;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/select-kit/category-row.scss b/app/assets/stylesheets/common/select-kit/category-row.scss
new file mode 100644
index 00000000000..47d4d2d9204
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/category-row.scss
@@ -0,0 +1,24 @@
+.select-kit {
+  .category-row {
+    .category-status, .category-desc {
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      max-width: 100%;      
+      -webkit-box-flex: 0;
+          -ms-flex: 1 1 auto;
+              flex: 1 1 auto;
+    }
+
+    .category-status {
+      .badge-wrapper.box {
+        margin-bottom: 1px;
+        margin-top: 1px;
+      }
+    }
+
+    .topic-count {
+      white-space: nowrap;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/select-kit/category-selector.scss b/app/assets/stylesheets/common/select-kit/category-selector.scss
index 9dc274553ea..2da4ad182d6 100644
--- a/app/assets/stylesheets/common/select-kit/category-selector.scss
+++ b/app/assets/stylesheets/common/select-kit/category-selector.scss
@@ -1,9 +1,12 @@
 .select-kit, .select-kit-box {
-  .selected-name  {
-    .badge-wrapper {
-      display: inline-flex;
-      align-items: center;
-      line-height: inherit;
+  &.category-selector {
+    .selected-name  {
+      .badge-wrapper {
+        &.box {
+          margin: 2px;
+          padding: 0;
+        }
+      }
     }
   }
 }
diff --git a/app/assets/stylesheets/common/select-kit/combo-box.scss b/app/assets/stylesheets/common/select-kit/combo-box.scss
index f1f73828c59..39365ffa9c0 100644
--- a/app/assets/stylesheets/common/select-kit/combo-box.scss
+++ b/app/assets/stylesheets/common/select-kit/combo-box.scss
@@ -1,39 +1,77 @@
-.select-box-kit, .select-kit {
+.select-kit {
   &.combo-box {
-
-    .select-box-kit-body, .select-kit-body {
+    min-width: auto;
+    .select-kit-body {
       width: 100%;
+      min-width: 150px;
+      border-radius: 0;
+      box-shadow: shadow("dropdown");
     }
 
-    .select-box-kit-row, .select-kit-row {
-      margin: 5px;
+    .select-kit-row {
+      margin: 0;
       min-height: 1px;
-      padding: 5px;
-    }
-
-    .select-box-kit-filter, .select-kit-filter {
-      line-height: 18px;
       padding: 6px 10px;
-      border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-
-      .filter-input {
-        margin-right: 5px;
+      &.no-content {
+        font-weight: normal;
       }
     }
 
-    .select-box-kit-header, .select-kit-header {
+    .select-kit-filter {
+      line-height: $line-height-medium;
+      padding: $input-padding;
+      border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+
+      .filter-input,
+      .filter-input:focus,
+      .filter-input:active {
+        width: auto;
+        max-width: 90%; // Firefox quirk
+      }
+
+      .filter-icon {
+        padding-left: 5px;
+      }
+    }
+
+    .select-kit-header {
       background: $secondary;
       border: 1px solid $primary-medium;
-      padding: 6px 10px;
+      padding: $input-padding;
       font-weight: 500;
-      font-size: 1em;
-      line-height: 18px;
+      font-size: $font-0;
+      line-height: $line-height-large;
+      min-height: 2em; // when no content is available
 
       &.is-focused {
         border: 1px solid $tertiary;
-        -webkit-box-shadow: $tertiary 0px 0px 6px 0px;
-                box-shadow: $tertiary 0px 0px 6px 0px;
+        box-shadow: shadow("focus");
+      }
+    }
+
+    .select-kit-collection {
+      display: flex;
+      flex-direction: column;
+      padding: 0;
+      min-width: 100px;
+      max-height: 200px;
+      max-width: 32em;
+
+      .collection-header {
+        a {
+          white-space: nowrap;
+          color: $primary;
+          line-height: $line-height-medium;
+          font-weight: bold;
+          display: block;
+          padding: 6px 10px;
+          color: $tertiary;
+
+          &:hover {
+            text-decoration: underline;
+          }
+        }
       }
     }
 
@@ -47,8 +85,7 @@
     &.is-highlighted {
       .select-kit-header {
         border: 1px solid $tertiary;
-        -webkit-box-shadow: $tertiary 0px 0px 6px 0px;
-                box-shadow: $tertiary 0px 0px 6px 0px;
+        box-shadow: shadow("focus");
       }
     }
 
@@ -56,18 +93,7 @@
       .select-kit-wrapper {
         display: block;
         border: 1px solid $tertiary;
-        -webkit-box-shadow: $tertiary 0px 0px 6px 0px;
-                box-shadow: $tertiary 0px 0px 6px 0px;
-      }
-
-      .select-kit-header {
-        border-color: transparent;
-        -webkit-box-shadow: none;
-                box-shadow: none;
-      }
-
-      .select-kit-body {
-        border-radius: 0 0 3px 3px ;
+        box-shadow: shadow("focus");
       }
     }
 
@@ -80,5 +106,18 @@
         border-radius: 3px 3px 0 0;
       }
     }
+
+    &.tag-drop,
+    &.group-dropdown {
+      min-width: auto;
+      .select-kit-row {
+        font-weight: bold;
+      }
+    }
+
+    &.is-expanded .select-kit-wrapper,
+    .select-kit-wrapper {
+      display: none;
+    }
   }
 }
diff --git a/app/assets/stylesheets/common/select-kit/composer-actions.scss b/app/assets/stylesheets/common/select-kit/composer-actions.scss
new file mode 100644
index 00000000000..87b81f371f1
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/composer-actions.scss
@@ -0,0 +1,23 @@
+.select-kit {
+  &.dropdown-select-box {
+    &.composer-actions {
+      margin: 0;
+      .select-kit-header {
+        background: none;
+        outline: none;
+        padding: 0;
+        margin-right: 5px;
+
+        .d-icon {
+          border: 1px solid $primary-low;
+          padding: 4px 5px;
+          margin: 0!important;
+        }
+
+        &:hover, &:focus {
+          background: $primary-low;
+        }
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
index a79b5909c0e..20345715ec1 100644
--- a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
+++ b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
@@ -1,4 +1,4 @@
-.select-box-kit, .select-kit {
+.select-kit {
   &.dropdown-select-box {
     display: -webkit-inline-box;
     display: -ms-inline-flexbox;
@@ -7,24 +7,21 @@
     border: none;
 
     &.is-expanded {
-      .select-box-kit-collection,
-      .select-box-kit-body,
       .select-kit-collection,
       .select-kit-body {
         border-radius: 0;
       }
     }
 
-    .select-box-kit-body, .select-kit-body {
+    .select-kit-body {
       border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
       background-clip: padding-box;
-      -webkit-box-shadow: 0 1px 5px rgba(0,0,0,0.4);
-              box-shadow: 0 1px 5px rgba(0,0,0,0.4);
+      box-shadow: shadow("dropdown");
       max-width: 300px;
       width: 300px;
     }
 
-    .select-box-kit-row, .select-kit-row {
+    .select-kit-row {
       margin: 0;
       padding: 10px 5px;
 
@@ -45,7 +42,7 @@
         width: 30px;
 
         .d-icon {
-          font-size: 1.286em;
+          font-size: $font-up-2;
           -ms-flex-item-align: center;
               align-self: center;
           margin-right: 0;
@@ -54,7 +51,8 @@
       }
 
       .texts {
-        line-height: 18px;
+        min-width: 0;
+        line-height: $line-height-large;
         -webkit-box-flex: 1;
             -ms-flex: 1;
                 flex: 1;
@@ -76,16 +74,20 @@
               -ms-flex: 1;
                   flex: 1;
           font-weight: bold;
-          font-size: 1em;
+          font-size: $font-0;
           color: $primary;
           padding: 0;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          max-width: 100%;
         }
 
         .desc {
           -webkit-box-flex: 1;
               -ms-flex: 1;
                   flex: 1;
-          font-size: 0.857em;
+          font-size: $font-down-1;
           font-weight: normal;
           color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 40%));;
           white-space: normal;
@@ -93,8 +95,9 @@
       }
     }
 
-    .select-box-kit-collection, .select-kit-collection {
+    .select-kit-collection {
       padding: 0;
+      max-height: 100%;
     }
 
     .dropdown-select-box-header {
@@ -102,7 +105,6 @@
          -moz-box-sizing: border-box;
               box-sizing: border-box;
       border: 0;
-      height: 30px;
 
       -webkit-box-align: center;
           -ms-flex-align: center;
@@ -122,6 +124,12 @@
         margin-left: 5px;
       }
 
+      &:hover {
+        .d-icon {
+          color: $primary-low;
+        }
+      }
+
       &.is-focused {
         outline-style: auto;
         outline-color: $tertiary;
diff --git a/app/assets/stylesheets/common/select-kit/future-date-input-selector.scss b/app/assets/stylesheets/common/select-kit/future-date-input-selector.scss
index 333b21d060c..1e6385b755a 100644
--- a/app/assets/stylesheets/common/select-kit/future-date-input-selector.scss
+++ b/app/assets/stylesheets/common/select-kit/future-date-input-selector.scss
@@ -1,11 +1,17 @@
-.select-box-kit, .select-kit {
+.select-kit {
   &.combobox {
     &.future-date-input-selector {
       min-width: 50%;
 
+      .future-date-input-selector-header {
+        .btn-clear {
+          line-height: $line-height-large;
+        }
+      }
+
       .future-date-input-selector-datetime {
         color: lighten($primary, 40%);
-        font-size: .929em;
+        font-size: $font-down-1;
       }
 
       .future-date-input-selector-icons {
diff --git a/app/assets/stylesheets/common/select-kit/legacy-combo-box.scss b/app/assets/stylesheets/common/select-kit/legacy-combo-box.scss
deleted file mode 100644
index 4f8aeb70bdd..00000000000
--- a/app/assets/stylesheets/common/select-kit/legacy-combo-box.scss
+++ /dev/null
@@ -1,88 +0,0 @@
-// DO NOT MODIFY
-// TODO: remove when all select2 instances are gone
-.select2-results .select2-highlighted {
-  background: $highlight-medium;
-  color: $primary;
-}
-
-.select2-drop {
-  .badge-category {
-    display: inline-block;
-  }
-  .topic-count {
-    font-size: .786em;
-    color: $primary;
-    display: inline-block;
-  }
-  .highlighted .topic-count, .select2-highlighted .category-desc {
-    color: $primary;
-  }
-  .category-desc {
-    color: $primary;
-    font-size: 0.857em;
-    line-height: 16px;
-  }
-}
-
-.select2-drop {
-  background: $secondary;
-  .d-icon {
-    color: dark-light-choose($primary-medium, $secondary-medium);
-  }
-}
-
-.select2-search input {
-  background: image-url("select2.png") no-repeat 100% -22px, $secondary 0 0
-}
-
-.select2-container {
-  min-width: 200px;
-  
-  &.select2-dropdown-open {
-    border: 0;
-    margin-bottom: 2px;
-  }
-  &.select2-container-active {
-    border-color: $tertiary;
-  }
-  &.select2-container-disabled .select2-chosen {
-    color: blend-primary-secondary(50%);
-  }
-}
-
-.select2-container-multi .select2-choices .select2-search-field input.select2-active {
-  background: $secondary image-url("select2-spinner.gif") no-repeat 100% !important;
-}
-
-.select2-container-multi .select2-choices {
-  border: 1px solid $primary-medium;  
-}
-
-.select2-container a.select2-choice {
-  background: $secondary;
-  border-radius: 3px;
-  border-color: $secondary;
-  color: $primary;
-}
-
-.select2-dropdown-open a.select2-choice {
-  box-shadow: none;
-  border-radius: 3px 3px 0 0;
-  border-color: $tertiary;
-}
-.select2-drop {
-  color: $primary;
-}
-.select2-drop-active {
-  border: 1px solid $tertiary;
-  border-top: 0;
-}
-
-.select2-container-active {
-  box-shadow:  $tertiary 0px 0px 6px 0px;
-}
-
-.select2-results .select2-no-results, .select2-results .select2-searching, .select2-results .select2-selection-limit {
-  background: $secondary;
-  color: $primary;
-}
\ No newline at end of file
diff --git a/app/assets/stylesheets/common/select-kit/list-setting.scss b/app/assets/stylesheets/common/select-kit/list-setting.scss
index 1f7103ef982..4fd866173f2 100644
--- a/app/assets/stylesheets/common/select-kit/list-setting.scss
+++ b/app/assets/stylesheets/common/select-kit/list-setting.scss
@@ -1,7 +1,7 @@
-.select-box-kit, .select-kit {
+.select-kit {
   &.multi-select {
     &.list-setting {
-      .select-box-kit-row.create, .select-kit-row.create {
+      .select-kit-row.create {
         .square {
           width: 12px;
           height: 12px;
diff --git a/app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss b/app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss
new file mode 100644
index 00000000000..b05db54dc35
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss
@@ -0,0 +1,96 @@
+.select-kit {
+  &.combo-box {
+    &.mini-tag-chooser {
+      margin-bottom: 5px;
+      margin-left: 5px;
+
+      &.is-expanded {
+        .select-kit-header {
+          border: 1px solid $tertiary;
+        }
+      }
+
+      &.no-tags {
+        .select-kit-header .selected-name {
+          color: $primary-medium;
+        }
+      }
+
+      .select-kit-body {
+        max-width: 32em;
+        width: 32em;
+      }
+
+      .select-kit-header {
+        .selected-name {
+          margin: 0;
+          border: 0;
+          padding: 0;
+          outline: none;
+          box-shadow: none;
+          cursor: pointer;
+        }
+      }
+
+      .select-kit-filter {
+        border-top: 0;
+      }
+
+      &.is-expanded .select-kit-wrapper, .select-kit-wrapper {
+        display: none;
+      }
+
+      .select-kit-row {
+        &.is-selected {
+          background: none;
+        }
+
+        &.is-highlighted.is-selected {
+          background: $tertiary-low;
+        }
+
+        .discourse-tag-count {
+          margin-left: 5px;
+        }
+      }
+
+      .select-kit-collection {
+        .collection-header {
+          max-height: 125px;
+          overflow-y: auto;
+          flex: 1 0 auto;
+
+          .selected-tags {
+            display: flex;
+            padding: 4px 8px;
+            flex-wrap: wrap;
+            border-bottom: 1px solid $primary-low;
+          }
+
+          .selected-tag {
+            background: $primary-low;
+            padding: 2px 4px;
+            margin: 2px;
+            border: 0;
+
+            &.is-highlighted {
+              box-shadow: 0 0 2px $danger, 0 1px 0 rgba(0,0,0,0.05);
+            }
+
+            &:after {
+              content: '\f00d';
+              color: $primary-low-mid;
+              font-family: 'FontAwesome';
+            }
+
+            &:hover {
+              &:after {
+                color: $danger;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/select-kit/multi-select.scss b/app/assets/stylesheets/common/select-kit/multi-select.scss
index f841e4644fe..1978d1c43ac 100644
--- a/app/assets/stylesheets/common/select-kit/multi-select.scss
+++ b/app/assets/stylesheets/common/select-kit/multi-select.scss
@@ -1,22 +1,23 @@
-.select-box-kit, .select-kit {
+.select-kit {
   &.multi-select {
     width: 300px;
     background: $secondary;
     border-radius: 0;
 
-    .select-box-kit-body, .select-kit-body {
+    .select-kit-body {
       width: 100%;
     }
 
-    .select-box-kit-row, .select-kit-row {
+    .select-kit-row {
       margin: 5px;
       min-height: 1px;
       padding: 5px;
       border-radius: 0;
     }
 
-    .select-box-kit-filter, .select-kit-filter {
+    .select-kit-filter {
       border: 0;
+      flex: 1;
     }
 
     .multi-select-header {
@@ -24,7 +25,7 @@
       border: 1px solid $primary-medium;
 
       &.is-focused {
-        box-shadow: $tertiary 0px 0px 6px 0px;
+        box-shadow: shadow("focus");
         border-radius: 0;
       }
     }
@@ -40,15 +41,15 @@
       .multi-select-header {
         border-radius: 0;
         border-bottom: 1px solid transparent;
-        box-shadow: $tertiary 0px 0px 6px 0px;
+        box-shadow: shadow("focus");
       }
     }
 
     &.is-expanded {
-      .select-box-kit-wrapper, .select-kit-wrapper {
+      .select-kit-wrapper {
         display: block;
         border: 1px solid $tertiary;
-        box-shadow: $tertiary 0px 0px 6px 0px;
+        box-shadow: shadow("focus");
         border-radius: 0;
       }
 
@@ -57,14 +58,13 @@
         box-shadow: none;
       }
 
-      .select-box-kit-body, .select-kit-body {
+      .select-kit-body {
         border-radius: 0;
       }
     }
 
     .choices {
       margin: 0;
-      padding: 2.5px;
       box-sizing: border-box;
       display: inline-flex;
       justify-content: flex-start;
@@ -79,7 +79,7 @@
         justify-content: space-between;
         flex-wrap: wrap;
         flex-direction: row;
-        margin: 2.5px;
+        margin: 2px;
       }
 
       .filter {
@@ -89,6 +89,7 @@
         min-width: 50px;
         padding: 0;
         outline: none;
+        flex: 1;
 
         .filter-input, .filter-input:focus {
           border: none;
@@ -101,7 +102,6 @@
           margin: 0;
           outline: 0;
           border: 0;
-          -webkit-box-shadow: none;
           box-shadow: none;
           border-radius: 0;
           height: 21px;
@@ -118,54 +118,82 @@
         .color-preview {
           height: 5px;
           margin: 0 2px 2px 2px;
-          border-radius: 5px;
+          display: flex;
+          width: 100%;
+        }
+      }
+
+      .selected-category {
+        .badge-wrapper {
+          &.bullet {
+            margin-right: 2.5px;
+          }
+
+          margin: auto 2.5px;
+          padding: 2px 4px;
+          line-height: $line-height-medium;
+          display: flex;
+          flex: 1;
+          align-items: center;
+
+          &:after {
+            content: '\f00d';
+            color: $primary-low-mid;
+            font-family: 'FontAwesome';
+            font-size: $font-down-2;
+            margin-left: 5px;
+          }
         }
       }
 
       .selected-name {
-        align-items: center;
-        justify-content: flex-start;
         color: $primary;
-        cursor: default;
-        border: 1px solid $primary-medium;
-        border-radius: 3px;
-        box-shadow: 0 0 2px $secondary inset, 0 1px 0 rgba(0,0,0,0.05);
         background-clip: padding-box;
         -webkit-touch-callout: none;
         user-select: none;
         background-color: $primary-low;
         cursor: pointer;
         outline: none;
-        line-height: normal;
+        line-height: $line-height-medium;
         overflow: hidden;
         flex: 0 1 auto;
         flex-wrap: nowrap;
+        padding: 0;
+        display: flex;
+        flex-direction: column;
+
+        .footer {
+          display: flex;
+          width: 100%;
+        }
+
+        .body {
+          display: flex;
+          align-items: center;
+          flex: 1;
+        }
 
         .name {
-          padding: 0 5px;
-          line-height: 18px;
+          padding: 2px 4px;
+          line-height: $line-height-medium;
+
+          &:after {
+            content: '\f00d';
+            color: $primary-low-mid;
+            font-family: 'FontAwesome';
+            font-size: $font-down-2;
+          }
+
+          &:hover {
+            &:after {
+              color: $danger;
+            }
+          }
         }
 
         &.is-highlighted {
           box-shadow: 0 0 2px $danger, 0 1px 0 rgba(0,0,0,0.05);
         }
-
-        .locked-icon, .delete-icon {
-          justify-content: center;
-          align-items: center;
-          width: 21px;
-          height: 21px;
-          display: inline-flex;
-          .d-icon {
-            color: $primary-medium;
-            cursor: pointer;
-            font-size: 1em;
-
-            &:hover {
-              color: $primary;
-            }
-          }
-        }
       }
     }
   }
diff --git a/app/assets/stylesheets/common/select-kit/notifications-button.scss b/app/assets/stylesheets/common/select-kit/notifications-button.scss
index 78db012b79f..34b447ed300 100644
--- a/app/assets/stylesheets/common/select-kit/notifications-button.scss
+++ b/app/assets/stylesheets/common/select-kit/notifications-button.scss
@@ -1,12 +1,12 @@
 .select-kit {
   &.dropdown-select-box {
     &.notifications-button {
-      .select-box-kit-body, .select-kit-body {
+      .select-kit-body {
         min-width: 550px;
         max-width: 550px;
       }
 
-      .select-box-kit-row, .select-kit-row {
+      .select-kit-row {
         .icons {
           -ms-flex-item-align: start;
               align-self: flex-start;
diff --git a/app/assets/stylesheets/common/select-kit/period-chooser.scss b/app/assets/stylesheets/common/select-kit/period-chooser.scss
new file mode 100644
index 00000000000..1759b9ddf68
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/period-chooser.scss
@@ -0,0 +1,77 @@
+.select-kit {
+  &.dropdown-select-box {
+    &.period-chooser {
+      display: inline-flex;
+      position: relative;
+
+      .select-kit-collection {
+        padding: 5px;
+      }
+
+      .period-chooser-header {
+        background: none;
+        border: none;
+        justify-content: flex-start;
+        width: auto;
+        height: auto;
+        padding: 0;
+
+        h2.selected-name {
+          overflow: auto;
+          color: $secondary;
+          display: inline-block;
+          box-sizing: border-box;
+
+          .date-section {
+            color: $primary;
+            margin-right: 5px;
+          }
+
+          .top-date-string {
+            font-size: $font-down-1;
+            color: dark-light-choose($primary-medium, $secondary-high);
+            font-weight: normal;
+            text-transform: uppercase;
+          }
+        }
+
+        .d-icon {
+          color: $primary;
+          opacity: 1;
+          margin: 5px 0 10px 5px;
+          font-size: $font-up-3;
+        }
+
+        &.is-focused, &:hover {
+          background: none;
+          border: none;
+          outline: none;
+        }
+      }
+
+      .period-chooser-row {
+        font-weight: bold;
+        padding: 5px;;
+        font-size: $font-up-1;
+        align-items: center;
+        display: flex;
+
+        .period-title {
+          flex: 1;
+        }
+
+        .date-section {
+          color: $primary;
+        }
+
+        .top-date-string {
+          font-weight: normal;
+          font-size: $font-down-1;
+          color: dark-light-choose($primary-medium, $secondary-high);
+          text-transform: uppercase;
+          margin-left: 5px;
+        }
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/select-kit/pinned-button.scss b/app/assets/stylesheets/common/select-kit/pinned-button.scss
index c96365a0e6d..93642050072 100644
--- a/app/assets/stylesheets/common/select-kit/pinned-button.scss
+++ b/app/assets/stylesheets/common/select-kit/pinned-button.scss
@@ -12,7 +12,7 @@
     }
 
     .reason {
-      line-height: 16px;
+      line-height: $line-height-medium;
       margin: 0 0 0 10px;
     }
   }
@@ -38,7 +38,7 @@
   }
 
   .pinned-options {
-    .select-box-kit-body, .select-kit-body {
+    .select-kit-body {
       min-width: unset;
       max-width: unset;
       width: 550px;
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index 2f467745bd2..1ab67344b1f 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -1,25 +1,16 @@
 .mobile-view .select-kit.is-expanded {
-  z-index: 1000;
+  z-index: z("dropdown");
 }
 
-.select-box-kit, .select-kit {
+.select-kit {
   border: none;
   min-width: 220px;
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
+  box-sizing: border-box;
   display: inline-block;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-      -ms-flex-direction: column;
-          flex-direction: column;
+  flex-direction: column;
   position: relative;
   vertical-align: middle;
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-     -moz-user-select: none;
-      -ms-user-select: none;
-          user-select: none;
+  user-select: none;
 
   &.is-hidden {
     display: none;
@@ -30,22 +21,17 @@
   }
 
   &.is-expanded {
-    z-index: 999;
+    z-index: z("dropdown");
 
     .select-kit-body {
-      display: -webkit-box;
-      display: -ms-flexbox;
       display: flex;
-      -webkit-box-orient: vertical;
-      -webkit-box-direction: normal;
-          -ms-flex-direction: column;
-              flex-direction: column;
+      flex-direction: column;
       left: 0;
       position: absolute;
       top: 0;
     }
 
-    .select-kit-collection, {
+    .select-kit-collection {
       border-radius: inherit;
     }
   }
@@ -70,43 +56,28 @@
     opacity: 0.7;
   }
 
-  .select-box-kit-header, .select-kit-header {
+  .select-kit-header {
     box-sizing: border-box;
     overflow: hidden;
-    -webkit-transition: all .25s;
-    -o-transition: all .25s;
     transition: all .25s;
     cursor: pointer;
     outline: none;
-    display: -webkit-box;
-    display: -ms-flexbox;
     display: flex;
-    -webkit-box-align: center;
-        -ms-flex-align: center;
-            align-items: center;
+    align-items: center;
     justify-content: space-between;
-    -webkit-box-orient: horizontal;
-    -webkit-box-direction: normal;
-        -ms-flex-direction: row;
-            flex-direction: row;
-    -webkit-box-pack: justify;
-        -ms-flex-pack: justify;
-            justify-content: space-between;
-
+    flex-direction: row;
+  
     .selected-name {
       text-align: left;
-      -webkit-box-flex: 10;
-          -ms-flex: 10;
-              flex: 10;
-      -o-text-overflow: ellipsis;
-         text-overflow: ellipsis;
+      flex: 1 1 auto;
+      text-overflow: ellipsis;
       white-space: nowrap;
       overflow: hidden;
       color: inherit;
     }
 
     .btn-clear {
-      padding: 0px 10px;
+      padding: 0 10px;
       border: 0;
       background: none;
     }
@@ -121,14 +92,11 @@
     }
 
     .d-button-label {
-      display: -webkit-box;
-      display: -ms-flexbox;
       display: flex;
-      -webkit-box-align: center;
-          -ms-flex-align: center;
-              align-items: center;
+      align-items: center;
       white-space: nowrap;
       overflow: hidden;
+      line-height: $line-height-medium;
 
       .d-icon {
         margin-left: 5px;
@@ -137,34 +105,30 @@
     }
   }
 
-  .select-box-kit-body, .select-kit-body {
+  .select-kit-body {
     display: none;
     background: $secondary;
-    -webkit-box-sizing: border-box;
-            box-sizing: border-box;
+    box-sizing: border-box;
   }
 
-  .select-box-kit-row, .select-kit-row {
+  .select-kit-row {
     cursor: pointer;
-    line-height: normal;
+    line-height: $line-height-medium;
     outline: none;
-    display: -webkit-box;
-    display: -ms-flexbox;
     display: flex;
-    -webkit-box-sizing: border-box;
-            box-sizing: border-box;
-    -webkit-box-align: center;
-        -ms-flex-align: center;
-            align-items: center;
-    -webkit-box-pack: start;
-        -ms-flex-pack: start;
-            justify-content: flex-start;
+    flex: 1 0 auto;
+    box-sizing: border-box;
+    align-items: center;
+    justify-content: flex-start;
+
+    &.no-content {
+      white-space: nowrap;
+    }
 
     .name {
       margin: 0;
       overflow: hidden;
-      -o-text-overflow: ellipsis;
-         text-overflow: ellipsis;
+      text-overflow: ellipsis;
       flex: 10;
     }
 
@@ -183,15 +147,29 @@
     &.is-selected.is-highlighted {
       background: $tertiary-low;
     }
+
+    .discourse-tag, .discourse-tag-count {
+      color: $primary;
+    }
   }
 
-  .select-box-kit-collection, .select-kit-collection {
+  .select-kit-collection {
     background: $secondary;
     overflow-x: hidden;
     overflow-y: auto;
     border-radius: inherit;
     -webkit-overflow-scrolling: touch;
     margin: 0;
+    padding: 0;
+    max-height: 200px;
+
+    .validation-message {
+      white-space: nowrap;
+      color: $danger;
+      flex: 1 0 auto;
+      margin: 5px;
+      padding: 0 2px;
+    }
 
     .select-kit-collection {
       padding: 0;
@@ -219,30 +197,21 @@
     }
   }
 
-  .select-box-kit-filter, .select-kit-filter {
-    display: -webkit-box;
-    display: -ms-flexbox;
+  .select-kit-filter {
     display: flex;
     box-sizing: border-box;
-    -webkit-box-align: center;
-        -ms-flex-align: center;
-            align-items: center;
-    -webkit-box-pack: justify;
-        -ms-flex-pack: justify;
-            justify-content: space-between;
+    align-items: center;
+    justify-content: space-between;
 
     .filter-input, .filter-input:focus, .filter-input:active {
       background: none;
       margin: 0;
       padding: 0;
-      -webkit-box-flex: 1;
-          -ms-flex: 1;
-              flex: 1;
+      flex: 1;
       outline: none;
       border: 0;
       border-radius: 0;
-      -webkit-box-shadow: none;
-              box-shadow: none;
+      box-shadow: none;
       width: 100%;
     }
 
@@ -255,19 +224,18 @@
       overflow: hidden;
       position: fixed;
       outline: 0;
-      left: 0px;
-      top: 0px;
+      left: 0;
+      top: 0;
     }
   }
 
-  .select-box-kit-wrapper, .select-kit-wrapper {
+  .select-kit-wrapper {
     position: absolute;
     top: 0;
     left: 0;
     background: none;
     display: none;
-    -webkit-box-sizing: border-box;
-            box-sizing: border-box;
+    box-sizing: border-box;
     pointer-events: none;
   }
 }
diff --git a/app/assets/stylesheets/common/select-kit/tag-chooser.scss b/app/assets/stylesheets/common/select-kit/tag-chooser.scss
new file mode 100644
index 00000000000..cc51e23ef50
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/tag-chooser.scss
@@ -0,0 +1,14 @@
+.select-kit {
+  &.multi-select {
+    &.tag-chooser {
+      .select-kit-row {
+        display: flex;
+        align-items: center;
+
+        .discourse-tag-count {
+          margin-left: 5px;
+        }
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss b/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss
index 7323b6d8150..21a65c57455 100644
--- a/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss
+++ b/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss
@@ -1,8 +1,3 @@
-#reply-control .d-editor-button-bar .toolbar-popup-menu-options .btn.select-kit-header {
-  padding: 7px 8px;
-  height: auto;
-}
-
 .select-kit {
   &.dropdown-select-box {
     &.toolbar-popup-menu-options {
@@ -20,7 +15,7 @@
         transition: all .25s;
 
         .name, .d-icon {
-          font-size: 1em;
+          font-size: $font-0;
           font-weight: normal;
           color: $primary;
         }
@@ -34,7 +29,6 @@
 
           .name, .d-icon {
             color: $secondary;
-            color: $secondary;
           }
         }
 
diff --git a/app/assets/stylesheets/common/select-kit/topic-notifications-button.scss b/app/assets/stylesheets/common/select-kit/topic-notifications-button.scss
index c9a994089bf..9910a3bf5f8 100644
--- a/app/assets/stylesheets/common/select-kit/topic-notifications-button.scss
+++ b/app/assets/stylesheets/common/select-kit/topic-notifications-button.scss
@@ -8,7 +8,7 @@
     }
 
     .reason {
-      line-height: 16px;
+      line-height: $line-height-medium;
       margin: 0 0 0 10px;
     }
   }
diff --git a/app/assets/stylesheets/common/topic-entrance.scss b/app/assets/stylesheets/common/topic-entrance.scss
index 6e9e1aa2099..1f20b3ac562 100644
--- a/app/assets/stylesheets/common/topic-entrance.scss
+++ b/app/assets/stylesheets/common/topic-entrance.scss
@@ -3,8 +3,8 @@
   border: 1px solid $primary-low; 
   padding: 5px;
   background: $secondary;
-  box-shadow: 0 0px 2px rgba(0,0,0, .2);
-  z-index: 100;
+  box-shadow: shadow("card");
+  z-index: z("dropdown");
 
   position: absolute;
   width: 133px;
@@ -18,7 +18,7 @@
       display: block;
       margin-top: 2px;
       margin-bottom: 2px;
-      font-size: 1.286em;
+      font-size: $font-up-2;
     }
   }
   button.btn.jump-bottom {
diff --git a/app/assets/stylesheets/common/topic-timeline.scss b/app/assets/stylesheets/common/topic-timeline.scss
index 3f5deb9df9d..e854a9c8b11 100644
--- a/app/assets/stylesheets/common/topic-timeline.scss
+++ b/app/assets/stylesheets/common/topic-timeline.scss
@@ -4,7 +4,7 @@
 
 .timeline-container {
   box-sizing: border-box;
-  z-index: 499;
+  z-index: z("timeline");
   margin-left: 757px;
 
   @media all and (min-width: 1140px) {
@@ -32,6 +32,9 @@
   &.timeline-fullscreen.show {
     max-height: 700px;
     transition: max-height 0.4s ease-out;
+    @media screen and (max-height: 425px) {
+      max-height: 75vh;
+    }
     .topic-timeline {
       .timeline-footer-controls {
         display: inherit;
@@ -49,9 +52,12 @@
     left: 0;
     right: 0;
     border-top: 1px solid dark-light-choose($primary-low, $secondary-low);
-    box-shadow: 0px -2px 4px -1px rgba(0,0,0,.25);
+    box-shadow: shadow("composer");
     padding-top: 20px;
-    z-index: 100000;
+    z-index: z("fullscreen");
+    @media screen and (max-height: 425px) {
+      padding-top: 10px;
+    }
     .back-button {
       display: none;
     }
@@ -66,18 +72,20 @@
       .timeline-date-wrapper {
         float: right;
         text-align: right;
-        font-size: 1.1em;
       }
       .post-excerpt {
         max-width: 650px;
-        max-height: 155px;
-        line-height: 1.4em;
+        max-height: 165px;
+        line-height: $line-height-large;
         overflow: hidden;
         word-wrap: break-word;
         text-overflow: ellipsis;
         display: block;
         display: -webkit-box;
         -webkit-line-clamp: 8;
+        @media screen and (max-height: 425px) {
+          -webkit-line-clamp: 5;          
+        }
         -webkit-box-orient: vertical;
       }
       .username {
@@ -98,18 +106,18 @@
           -webkit-line-clamp: 4;
           -webkit-box-orient: vertical;
           max-height: 110px;
-          line-height: 1.3em;
+          line-height: $line-height-medium;
           word-wrap: break-word;
           text-overflow: ellipsis;
           overflow: hidden;
-          font-size: 1.3em;
+          font-size: $font-up-2;
         }
         a {
           color: $primary;
         }
       }
       .timeline-last-read {
-        right: 0px;
+        right: 0;
         margin-left: 0;
         i.progress {
           display: none
@@ -186,8 +194,7 @@
     }
 
     .timeline-footer-controls {
-      margin-top: 1em;
-      line-height: 2.5em;
+      margin-top: 1.5em;
       transition: opacity 0.2s ease-in;
 
       button {
@@ -227,7 +234,7 @@
       background-color: dark-light-choose($tertiary-low, $tertiary-high);
       height: 100%;
       float: left;
-      z-index: 501;
+      z-index: z("base") + 1;
     }
 
     .timeline-scroller-content {
@@ -263,7 +270,7 @@
         color: $tertiary;
         margin-right: 1em;
       }
-      z-index: 502;
+      z-index: z("base") + 2; // above timeline-handle
     }
 
     .back-button {
diff --git a/app/assets/stylesheets/desktop.scss b/app/assets/stylesheets/desktop.scss
index 8534c2f7834..b1a6d6b8495 100644
--- a/app/assets/stylesheets/desktop.scss
+++ b/app/assets/stylesheets/desktop.scss
@@ -19,8 +19,8 @@
 @import "desktop/user";
 @import "desktop/history";
 @import "desktop/queued-posts";
-@import "desktop/menu-panel";
 @import "desktop/group";
+@import "desktop/groups";
 
 // Import all component-specific files
 @import "desktop/components/*";
diff --git a/app/assets/stylesheets/desktop/category-list.scss b/app/assets/stylesheets/desktop/category-list.scss
index 520ad06fa02..c300929b86c 100644
--- a/app/assets/stylesheets/desktop/category-list.scss
+++ b/app/assets/stylesheets/desktop/category-list.scss
@@ -35,10 +35,10 @@
     text-align: right;
 
     .value {
-      font-size: 1.143em;
+      font-size: $font-up-1;
     }
     .unit {
-      font-size: .857em;
+      font-size: $font-down-1;
     }
     .badge-notification {
       display: block;
@@ -48,15 +48,10 @@
     }
   }
 
-  .category-description,
-  .subcategories {
-    margin-top: 10px;
-  }
-
   .subcategories {
     .badge-notification.new-posts {
       padding: 0;
-      margin: 0 5px 0 0;
+      margin: 0 10px 0 0;
     }
   }
 
@@ -69,7 +64,7 @@
 
     a.last-posted-at,
     a.last-posted-at:visited {
-      font-size: 0.857em;
+      font-size: $font-down-1;
       color: dark-light-choose($primary-medium, $secondary-high);
     }
 
@@ -88,17 +83,12 @@
   }
 
   tbody {
-    tr {
-      border-bottom: 1px solid $primary-low;
-      &:first-of-type {
-        border-top: 3px solid $primary-low;
-      }
-    }
 
     .category {
       border-left: 6px solid;
       h3 {
-        font-size: 1.286em;
+        font-size: $font-up-2;
+        line-height: $line-height-medium;
         a[href] {
           color: $primary;
         }
@@ -114,7 +104,7 @@
   }
 }
 
-.categories-and-latest {
+.categories-and-latest, .categories-and-top {
   display: flex;
   flex-flow: row wrap;
 
@@ -137,7 +127,7 @@
   }
 
   .discourse-tag {
-    font-size: 0.786em;
+    font-size: $font-down-2;
   }
 
   .topic-featured-link {
diff --git a/app/assets/stylesheets/desktop/components/group-member-dropdown.scss b/app/assets/stylesheets/desktop/components/group-member-dropdown.scss
new file mode 100644
index 00000000000..49b3209fd23
--- /dev/null
+++ b/app/assets/stylesheets/desktop/components/group-member-dropdown.scss
@@ -0,0 +1,9 @@
+.group-member-dropdown {
+  ul {
+    width: 250px;
+    top: 27px;
+    bottom: auto;
+    left: -217px;
+    text-align: left;
+  }
+}
diff --git a/app/assets/stylesheets/desktop/components/user-info.scss b/app/assets/stylesheets/desktop/components/user-info.scss
index f1b7260d192..ba13a6e182e 100644
--- a/app/assets/stylesheets/desktop/components/user-info.scss
+++ b/app/assets/stylesheets/desktop/components/user-info.scss
@@ -1,14 +1,17 @@
 .user-info {
   &.medium {
-    width: 480px;
-
+    flex: 0 0 32%;
+    margin: 0 2% 4vh 0;
+    display: flex;
+    &:nth-of-type(3n) {
+      margin-right: 0;
+    }
+    @media screen and (max-width: $small-width) {
+      flex: 0 0 48%;
+      margin-right: 0;
+    }
     .user-image {
       width: 55px;
     }
-
-    .user-detail {
-      width: 380px;
-    }
-
   }
 }
diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss
index 1e2b0af89cb..ccdd3fb1060 100644
--- a/app/assets/stylesheets/desktop/compose.scss
+++ b/app/assets/stylesheets/desktop/compose.scss
@@ -10,10 +10,18 @@
       align-items: center;
     }
   }
+
+  #private-message-users {
+    width: 404px;
+  }
+
+  .select-kit.is-expanded {
+    z-index: z("composer","dropdown");    
+  }
 }
 
 .category-input {
-  margin-left: 10px;  
+  margin-left: 10px;
 }
 
 .edit-title {
@@ -23,16 +31,16 @@
   &:not(.private-message) {
     .d-editor-preview-wrapper {
       @media screen and (max-width: 955px) {
-        margin-top: -79px;
+        margin-top: -77px;
       }
     }
   }
-  
+
   .with-tags {
     .d-editor-preview-wrapper {
-      margin-top: -79px;
+      margin-top: -77px;
       @media screen and (max-width: 900px) {
-        margin-top: -116px;
+        margin-top: -105px;
       }
     }
   }
@@ -47,7 +55,7 @@
 .open {
   .grippie {
     cursor: row-resize;
-    padding: 4px 0px;
+    padding: 4px 0;
     background: $tertiary;
     &:before {
       content: '';
@@ -73,10 +81,14 @@
   bottom: 10px;
   left: 51%;
   overflow-y: auto;
-  z-index: 110;
+  z-index: z("composer","popover");
   padding: 10px 10px 35px 10px;
-  box-shadow: 3px 3px 3px rgba(0,0,0, 0.34);
+  box-shadow: shadow("card");
   background: $highlight-medium;
+  .hide-preview & {
+    z-index: z("composer","dropdown") + 1;    
+  }
+  
 
   &.urgent {
     background: $danger-low;
@@ -100,10 +112,10 @@
     bottom: 10px;
     color: $primary;
     opacity: 0.5;
-    font-size: 1.143em;
+    font-size: $font-up-1;
     &:before {
       content: 'esc';
-      font-size: 0.857em;
+      font-size: $font-down-1;
       margin-right: 0.5em;
     }
   }
@@ -142,7 +154,7 @@
   background-color: $tertiary-low;
 
   a[href] {
-    color: $primary-medium;
+    color: $primary;
   }
 
   .posts-count {
@@ -158,9 +170,13 @@
     .fa, .blurb {
       color: dark-light-choose($primary-high, $secondary-medium);
     }
+    span.topic {
+      display: flex;
+      flex-wrap: wrap;
+    }
   }
   .badge-wrapper {
-    padding-left: 5px;
+    margin-left: 5px;
   }
 }
 
@@ -171,7 +187,7 @@
 
 .composer-bottom-right {
   a {
-    color: $primary-medium;
+    color: $primary-high;
     &:hover {
       color: $tertiary;
     }
diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index d4e53b65c8b..c20dbce7fb9 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -24,9 +24,10 @@ header {
   .topic-status {
     padding: 0 2px 0 0;
     margin: 0;
+    line-height: $line-height-small;
 
     i {
-        font-size: 1.071em;
+        font-size: $font-down-1;
       }
   }
 
@@ -59,7 +60,7 @@ h4,
 h5,
 h6 {
   + p {
-    margin-top:0px;
+    margin-top:0;
   }
 }
 
@@ -72,9 +73,9 @@ input,
 button,
 select,
 textarea {
-  font-size: 1em;
+  font-size: $font-0;
   font-weight: normal;
-  line-height: 18px;
+  line-height: $line-height-medium;
 }
 
 select,
@@ -82,8 +83,8 @@ textarea {
   display: inline-block;
   padding: 4px;
   margin-bottom: 9px;
-  font-size: 1em;
-  line-height: 18px;
+  font-size: $font-0;
+  line-height: $line-height-large;
   color: $primary;
 }
 
@@ -93,7 +94,7 @@ input, textarea {
 
 select,
 input[type="file"] {
-  line-height: 28px;
+  line-height: $line-height-large;
 }
 
 select {
@@ -139,7 +140,7 @@ input {
       vertical-align: middle;
 
       &:focus {
-        z-index: 2;
+        z-index: z("base") + 1;
       }
     }
 
@@ -150,7 +151,7 @@ input {
       min-width: 16px;
       padding: 4px 5px;
       font-weight: normal;
-      line-height: 18px;
+      line-height: $line-height-medium;
       text-align: center;
       vertical-align: middle;
       background-color: $secondary;
@@ -224,6 +225,11 @@ input {
   margin-bottom: 10px;
 }
 
+.control-instructions {
+  color: dark-light-choose($primary-medium, $secondary-medium);
+  font-size: 0.875rem;
+}
+
 .control-group {
   margin-bottom: 9px;
 
@@ -243,7 +249,7 @@ input {
 
       &:focus {
         border-color: scale-color($danger, $lightness: -30%);
-        box-shadow: 0 0 6px $danger;
+        box-shadow: shadow("focus-danger");
       }
     }
 
@@ -286,7 +292,7 @@ input {
 
       &:focus {
         border-color: $success;
-        box-shadow: 0 0 6px $success;
+        box-shadow: shadow("focus");
       }
     }
 
@@ -326,6 +332,7 @@ input {
   }
 
   .control-label {
+    margin: 6.5px;
     float: left;
     width: 140px;
     text-align: right;
@@ -350,46 +357,6 @@ input {
   @include clearfix;
 }
 
-.span {
-  &4 {
-    width: 196px;
-    margin-right: 12px;
-    float: left;
-  }
-
-  &6 {
-    width: 27.027%;
-    float: left;
-  }
-
-  &8 {
-    width: 404px;
-    float: left;
-  }
-
-  &10 {
-    width: 508px;
-    float: left;
-  }
-
-  &13 {
-    width: 59.8198%;
-    float: left;
-  }
-
-  &15 {
-    /* intentionally no width set here, do not add one */
-    margin-left: 12px;
-    float: left;
-  }
-
-  &24 {
-    width: 1236px;
-    float: left;
-    color: amarillo;
-  }
-}
-
 .offset {
   &2 {
     margin-left: 116px;
@@ -400,25 +367,7 @@ input {
   }
 }
 
-// Special elements
-#main {
-  a.star {
-    color: $secondary-medium;
 
-    &:before {
-      font-family: "FontAwesome";
-      content: "\f005";
-    }
-
-    @include hover {
-      opacity: 0.6;
-    }
-
-    &:active {
-      opacity: 1;
-    }
-  }
-}
 
 // Media Queries
 @media all
diff --git a/app/assets/stylesheets/desktop/group.scss b/app/assets/stylesheets/desktop/group.scss
index ea1378fd1e2..11c3f99cb45 100644
--- a/app/assets/stylesheets/desktop/group.scss
+++ b/app/assets/stylesheets/desktop/group.scss
@@ -1,27 +1,13 @@
-
 .group-nav {
-  li {
-    float: left;
-
-    a, i {
-      color: dark-light-choose($primary-medium, $secondary-high);
-    }
-
-    .active {
-      a, i {
-        color: $secondary;
-      }
-    }
+  .group-dropdown {
+    margin-right: 10px;
   }
-
-  margin-bottom: 30px;
 }
-
 .group-info {
   margin-bottom: 20px;
 }
 
-.group-activity-nav {
+.group-navigation {
   width: 15%;
   background-color: transparent;
 
@@ -29,32 +15,39 @@
     border: none;
 
     a {
-      padding: 8px 13px;
-    }
+      color: dark-light-choose($primary-medium, $secondary-high);
+      padding: 8px 0;
 
-    a.active {
-      background-color: transparent;
-      font-weight: bold;
-      color: $primary;
-    }
+      &.active {
+        background-color: transparent;
+        font-weight: bold;
+        color: $primary;
 
-    a.active:after {
-      display: none;
+        &:after {
+          display: none;
+        }
+      }
     }
   }
 }
 
-.group-activity-outlet {
+.group-activity-outlet,
+.group-messages-outlet,
+.group-manage-outlet
+{
   width: 85%;
 }
 
-.group-edit {
-  border: 1px solid $primary-low; 
-  padding: 10px;
-
+.group-manage {
   .form-horizontal {
     button {
       float: none;
     }
   }
 }
+
+.group-details-button {
+  position: absolute;
+  top: 20px;
+  right: 20px;
+}
diff --git a/app/assets/stylesheets/desktop/groups.scss b/app/assets/stylesheets/desktop/groups.scss
new file mode 100644
index 00000000000..a43ce6edba7
--- /dev/null
+++ b/app/assets/stylesheets/desktop/groups.scss
@@ -0,0 +1,19 @@
+.groups-page {
+  .list-controls {
+    float: right;
+  }
+}
+
+$filter-line-height: 1.5;
+
+.groups-header-filters {
+  .groups-header-filters-type {
+    .select-kit-header {
+      line-height: $filter-line-height;
+    }
+  }
+
+  input {
+    line-height: $filter-line-height;
+  }
+}
diff --git a/app/assets/stylesheets/desktop/header.scss b/app/assets/stylesheets/desktop/header.scss
index 9a7f7ce4ab1..4a6f4069832 100644
--- a/app/assets/stylesheets/desktop/header.scss
+++ b/app/assets/stylesheets/desktop/header.scss
@@ -5,10 +5,10 @@
 .d-header {
   left: 0;
   padding-top: 3px;
-  height: 60px;
+  height: 4.2857em;
   .d-icon-home {
-    padding:8px;
-    font-size: 2.1em;
+    padding: 8px;
+    font-size: $font-up-5;
   }
 
   .site-text-logo {
@@ -17,9 +17,10 @@
   }
 }
 
-@media all
-and (max-width : 570px) {
-  .extra-info-wrapper {display: none;}
+@media all and (max-width: 570px) {
+  .extra-info-wrapper {
+    display: none;
+  }
 }
 
 #main {
@@ -34,8 +35,8 @@ and (max-width : 570px) {
   color: dark-light-choose($primary-high, $secondary-medium);
   display: block;
   word-wrap: break-word;
-  font-size: .786em;
-  line-height: 1.3em;
+  font-size: $font-down-2;
+  line-height: $line-height-large;
   .search-highlight {
     color: dark-light-choose($primary-high, $secondary-low);
   }
@@ -43,6 +44,8 @@ and (max-width : 570px) {
 
 header {
   #site-text-logo {
-    line-height: 40px;
+    font-size: $font-up-3;
+    margin-top: .4em;
+    line-height: $line-height-medium;
   }
 }
diff --git a/app/assets/stylesheets/desktop/history.scss b/app/assets/stylesheets/desktop/history.scss
index 4519450e1aa..3192d0b9b2e 100644
--- a/app/assets/stylesheets/desktop/history.scss
+++ b/app/assets/stylesheets/desktop/history.scss
@@ -3,13 +3,10 @@
 .modal.history-modal {
 
   .modal-inner-container {
-    min-width: 960px;
     min-height: 500px;
+    max-width: 960px;
   }
   #revision-controls {
-    float: left;
-    padding-right: 5px;
-
     .btn[disabled] {
       cursor: not-allowed;
       background-color: $primary-low; 
@@ -32,11 +29,7 @@
       font-weight: bold;
     }
   }
-  #revision-details {
-    padding: 5px;
-    margin-top: 10px;
-    border-bottom: 3px solid $primary-low; 
-  }
+
   #revisions {
     word-wrap: break-word;
     table {
@@ -52,7 +45,7 @@
   }
   .markdown {
     font-family: monospace;
-    font-size: 0.857em;
+    font-size: $font-down-1;
     width: 100%;
     border-collapse: collapse;
     border-spacing: 0;
@@ -64,9 +57,10 @@
       white-space: pre-wrap;
     }
   }
-  .span8, .markdown {
+  .revision-content, .markdown {
     img {
-      max-width: 400px;
+      max-width: 100%;
+      box-sizing: border-box;
     }
   }
   .modal-header {
diff --git a/app/assets/stylesheets/desktop/latest-topic-list.scss b/app/assets/stylesheets/desktop/latest-topic-list.scss
index 8b17c33cf1c..6cdb77df6b0 100644
--- a/app/assets/stylesheets/desktop/latest-topic-list.scss
+++ b/app/assets/stylesheets/desktop/latest-topic-list.scss
@@ -1,4 +1,4 @@
-.latest-topic-list {
+.latest-topic-list, .top-topic-list {
   @extend .topic-list-icons;
 
   .table-heading {
@@ -23,12 +23,19 @@
   }
   .main-link {
     @extend .topic-list-main-link;
-    flex: 15;
-    font-size: 1em;
+    flex: 0 1 auto;
+    max-width: 65%;
+    font-size: $font-0;
+    .badge-wrapper {
+      max-width: 100%;
+      .badge-category-bg {
+        flex-shrink: 0;
+      }
+    }
 
     .top-row {
       margin-bottom: 0.1em;
-      font-size: 1.143em;
+      font-size: $font-up-1;
     }
   }
   .topic-stats {
diff --git a/app/assets/stylesheets/desktop/login.scss b/app/assets/stylesheets/desktop/login.scss
index 23c933180f4..0828ae0e693 100644
--- a/app/assets/stylesheets/desktop/login.scss
+++ b/app/assets/stylesheets/desktop/login.scss
@@ -1,114 +1,177 @@
-// style that apply to the login popup
+// shared styles used
+// on both the login and
+// create account modals
+.login-modal,
+.create-account {
+  #login-buttons:not(.hidden) {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    flex-basis: 40%;
+    align-items: center;
+    min-height: 175px;
+    border-left: 1px solid $primary-low;
+    padding: 15px;
+    order: 2;
 
-#login-buttons {
-  button {
-    margin: 0 5px 5px 0;
-    min-width: 180px;
-    &:lang(zh_CN) {
-      min-width: 200px;
+    button {
+      margin: 0.35em;
+      width: 160px;
+      &:lang(zh_CN) {
+        min-width: 200px;
+      }
     }
   }
-  margin-top: 10px;
-  margin-bottom: 20px;
-}
 
-#login-form {
-  a {
-    color: dark-light-choose($primary-high, $secondary-low);
+  #login-form {
+    flex: 1 0 auto;
+    padding: 0 15px;
   }
-}
 
-// Create account
+  tr:not(.instructions) {
+    td {
+      display: flex;
+      padding: 5px 0 0 0;
+    }
+  }
 
-#new-account-link {
-  cursor: pointer;
-}
-
-.create-account {
-  form {
+  tr.input label {
     margin-bottom: 0;
   }
-  table {
-    width: 100%;
-  }
-  tr.input {
-    td {
-      padding-top: 10px;
+}
+
+// styles used on
+// login modal only
+.d-modal.login-modal {
+  .modal-body,
+  #credentials {
+    display: flex;
+    align-items: center;
+    padding: 15px 0;
+
+    tr {
+      display: flex;
+      flex-direction: column;
     }
-    input, label {
+  }
+}
+
+// styles used on the
+// create account
+// modal only
+.d-modal.create-account {
+  .modal-body {
+    display: flex;
+    padding: 15px 0;
+  }
+
+  .create-account-form tr {
+    display: flex;
+    flex-direction: column;
+  }
+
+  .login-form {
+    display: flex;
+    flex: 1 1 50%;
+    align-items: center;
+    padding: 0 15px;
+    form, table {
+      width: 100%;
+    }
+
+    tr {
+      display: flex;
+      flex-direction: column;
+      margin-top: 0.15em;
+      &.password-confirmation {
+        display: none;
+      }
+    }
+  }
+
+  tr.input {
+    input,
+    label {
       margin-bottom: 0;
+      width: 100%;      
     }
     .tip {
       max-width: 340px;
     }
   }
 
+  .invites-show {
+    padding-top: 20px;
+
+    .two-col {
+      margin-top: 30px;
+    }
+    .col-image {
+      width: 200px;
+      img {
+        width: 200px;
+      }
+    }
+    .col-form {
+      margin-left: 200px;
+      .inline-invite-img {
+        display: none;
+      }
+    }
+    form {
+      .controls,
+      .input {
+        margin-left: 20px;
+      }
+      input,
+      label {
+        margin-bottom: 0;
+      }
+      .user-field .control-label:not(.checkbox-label) {
+        margin-left: 20px;
+      }
+    }
+  }
+
+  .password-reset,
+  .invites-show {
+    .col-form {
+      padding-left: 20px;
+    }
+    h2 {
+      margin-bottom: 12px;
+    }
+    .col-image img {
+      width: 200px;
+      height: 200px;
+    }
+  }
+
+  .password-reset {
+    .col-form {
+      padding-top: 40px;
+    }
+  }
+
   .tos-agree {
     margin-bottom: 12px;
   }
 
-  .disclaimer {
-    margin-top: 15px;
-  }
-
-  .instructions {
-    label {
-      color: dark-light-choose($primary-medium, $secondary-medium);
-    }
-  }
-
   .user-fields {
     border-top: 1px solid $primary-low;
     padding-top: 20px;
   }
 }
 
-.password-reset, .invites-show {
-  .col-form {
-    padding-left: 20px;
-  }
-  h2 {
-    margin-bottom: 12px;
-  }
-  .col-image img {
-    width: 200px;
-    height: 200px;
-  }
-}
-
-.password-reset {
-  .col-form {
-    padding-top: 40px;
-  }
-}
-
-.invites-show {
-  padding-top: 20px;
-
-  .two-col {
-    margin-top: 30px;
-  }
-  .col-image {
-    width: 200px;
-    img {
-      width: 200px;
-    }
-  }
-  .col-form {
-    margin-left: 200px;
-    .inline-invite-img {
+.login-form {
+  .tip {
+    &:not(:empty) + td {
       display: none;
     }
-  }
-  form {
-    .controls, .input {
-      margin-left: 20px;
-    }
-    input, label {
-      margin-bottom: 0;
-    }
-    .user-field .control-label:not(.checkbox-label) {
-      margin-left: 20px;
+    &:not(:empty),
+    &:empty + td {
+      min-height: 1.75em;
+      width: 240px;
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/desktop/menu-panel.scss b/app/assets/stylesheets/desktop/menu-panel.scss
deleted file mode 100644
index 74266de4cf0..00000000000
--- a/app/assets/stylesheets/desktop/menu-panel.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-.docked #hamburger-menu {
-  position: fixed;
-}
-
-#hamburger-menu {
-  position: absolute;
-  top: 63px;
-  // compensate on the other end for this top
-  .hamburger-body {
-    bottom: 100px;
-  }
-}
diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss
index e7d00fba8fb..d52c0d48692 100644
--- a/app/assets/stylesheets/desktop/modal.scss
+++ b/app/assets/stylesheets/desktop/modal.scss
@@ -7,20 +7,13 @@
 
 // Hardcode to be the same as before for now. I would recommend not using bootbox, or finding a way so the html structure can be the same
 .bootbox.modal {
-  position: fixed;
   top: 50%;
   left: 50%;
-  z-index: 1050;
-  overflow: auto;
   width: 610px;
-  height: auto;
   margin: -250px 0 0 -305px;
-  background-color: $secondary;
-  border: 1px solid $primary-low;
-
-  box-shadow: 0 3px 7px rgba(0,0,0, .8);
-  background-clip: padding-box;
-
+  .cancel {
+    margin-left: 1em;
+  }
 }
 
 .modal.in {
@@ -29,15 +22,9 @@
 }
 
 .modal-body {
-  overflow-y: auto;
-  max-height: 400px;
   padding: 15px;
 }
 
-.modal-footer .btn + .btn {
-  margin-left: 5px;
-  margin-bottom: 0;
-}
 .modal-footer .btn.right {
   float: right;
 }
@@ -46,21 +33,14 @@
   margin-left: -1px;
 }
 
-.modal-close {
-  display: inline-block;
-  float: right;
-  margin: 7px;
-}
-
 .modal-header {
   h3 {
-    display: inline-block;;
-    font-size: 1.429em;
-    padding: 10px 15px 7px;
+    font-size: $font-up-3;
   }
 }
+
 .close {
-  font-size: 1.429em;
+  font-size: $font-up-3;
   text-decoration: none;
   color: dark-light-choose($primary-high, $secondary-low);
   cursor: pointer;
@@ -76,31 +56,9 @@
 
   .category-combobox {
     width: 430px;
-
-    .select2-drop {
-      left: -9000px;
-      width: 428px;
-    }
-    .select2-search input {
-      width: 378px;
-    }
   }
 }
 
-.flag-modal {
-  max-height: 450px;
-}
-
-.custom-message-length {
-  color: dark-light-choose($primary-low-mid, $secondary-high);
-  font-size: .857em;
-}
-
-.flag-message {
-  width: 95%;
-  margin: 0;
-}
-
 .edit-category-modal {
   .modal-body {
     position: relative;
@@ -108,22 +66,6 @@
     max-height: 420px;
     padding-bottom: 0;
   }
-  .secure-category-options {
-    margin: 10px 0 0 16px;
-    .badge-list {
-      margin: 10px 0;
-      li {
-        margin: 0 4px 8px 0;
-        a {
-          color: dark-light-choose($primary-medium, $secondary-medium);
-          cursor: pointer;
-        }
-        a:hover {
-          color: dark-light-choose($primary-medium, $secondary-medium);
-        }
-      }
-    }
-  }
 
   .disable_info_wrap {
     margin-top: -70px;
@@ -162,18 +104,6 @@
       max-width: 23%;
     }
   }
-
-}
-.tabbed-modal {
-  .modal-body {
-    position: relative;
-    height: 350px;
-  }
-}
-
-.modal-tab {
-  position: absolute;
-  width: 95%;
 }
 
 .split-modal {
@@ -219,19 +149,3 @@
   max-height: 150px;
   margin-bottom: 10px;
 }
-
-.change-timestamp {
-  min-height: 300px;
-
-  .date-picker {
-    width: 10em;
-  }
-
-  input[type=time] {
-    width: 6em;
-  }
-
-  form {
-    margin: 0;
-  }
-}
diff --git a/app/assets/stylesheets/desktop/queued-posts.scss b/app/assets/stylesheets/desktop/queued-posts.scss
index 38f48442b7e..b4c5ef08883 100644
--- a/app/assets/stylesheets/desktop/queued-posts.scss
+++ b/app/assets/stylesheets/desktop/queued-posts.scss
@@ -9,7 +9,7 @@
      .post-info  {
        display: inline-block;
        float: right;
-       font-size: 0.929em;
+       font-size: $font-down-1;
        margin-top: 1px;
        span {color: dark-light-choose($primary-medium, $secondary-medium); }
      }
@@ -24,6 +24,15 @@
       }
     }
 
+    .tag-chooser {
+      width: 100%;
+      margin-bottom: .5em;
+
+      .select-kit-collection {
+        padding: 0;
+      }
+    }
+
     .queue-controls {
       button {
         float: left;
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index d8135d7412a..96be4b6da7f 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -1,366 +1,351 @@
-// --------------------------------------------------
-// Topic lists
-// --------------------------------------------------
+  // --------------------------------------------------
+  // Topic lists
+  // --------------------------------------------------
 
-// List controls
-// --------------------------------------------------
+  // List controls
+  // --------------------------------------------------
 
-.list-controls {
-  .nav {
-    float: left;
-    margin-bottom: 18px;
-  }
-
-  .btn {
-    float: right;
-    margin-left: 8px;
-    margin-bottom: 10px;
-    font-size: 1.143em;
-    font-weight: normal;
-  }
-
-  .search .btn {
-    float: none;
-  }
-
-  a.badge-category, .dropdown-header {
-    padding: 3px 12px;
-    font-size: 1.143em;
-  }
-
-}
-
-// Base list
-// --------------------------------------------------
-
-.topic-list-icons {
-  .d-icon-thumb-tack { color: dark-light-choose($primary-medium, $secondary-medium); }
-  .d-icon-thumb-tack.unpinned { color: dark-light-choose($primary-medium, $secondary-medium); }
-  a.title {color: $primary;}
-  .d-icon-bookmark { color: dark-light-choose($primary-medium, $secondary-medium); }
-}
-
-.topic-list {
-  @extend .topic-list-icons;
-
-  margin: 0 0 10px;
-  th,
-  td {
-    padding: 12px 5px;
-    &:first-of-type {
-      padding-left: 10px;
-    }
-    &:last-of-type {
-      padding-right: 10px;
-    }
-  }
-  th {
-    button .d-icon {color: dark-light-choose($primary-medium, $secondary-medium); }
-  }
-
-  > tbody > tr {
-    &.highlighted {
-      animation: background-fade-highlight 2.5s ease-out;
-    }
-  }
-  button.bulk-select {
-    padding: 0;
-    margin-right: 0.3em;
-  }
-
-  .star {
-    width: 20px;
-    padding-right: 0;
-    .d-icon-star {
-      position: relative;
-    }
-    + .main-link {
-      padding-left: 5px;
-    }
-  }
-
-  .badge-notification {
-    position: relative;
-    top: -2px;
-    &.new-topic {
-      top: -1px;
-      padding-left: 5px;
-    }
-  }
-
-  .posters {
-    // we know there are up to 5 avatars of fixed size
-    // will be overridden by media width queries on narrow displays to 1 avatar's width
-    width: 146px;
-    min-width: 146px;
-  }
-  .posters {
-    > a {
+  .list-controls {
+    .nav {
       float: left;
-      margin-right: 4px;
-      &:last-of-type {
-        margin-right: 0;
-      }
+      margin-bottom: 15px;
     }
-  }
 
-  .posters a:first-child .avatar.latest:not(.single) {
-     box-shadow: 0 0 3px 1px desaturate($tertiary-medium, 35%);
-     border: 2px solid desaturate($tertiary-medium, 40%);
-     position: relative;
-     top: -2px;
-     left: -2px;
-  }
-
-
-  .sortable {
-    cursor: pointer;
-    &:hover {
-      background-color: $primary-low;
+    .btn {
+      float: right;
+      margin-left: 8px;
+      margin-bottom: 10px;
+      font-size: $font-up-1;
+      font-weight: normal;
     }
-    @include unselectable;
-  }
-  .likes {
-    width: 65px;
-  }
-  .views {
-    width: 65px;
-  }
-  .posts {
-    width: 65px;
-  }
 
-  .post-actions {
-    clear: both;
-    width: auto;
-    color: dark-light-choose($primary-medium, $secondary-medium);
-    text-align: left;
-    font-size: .857em;
-    margin-top: 5px;
-    .fa {
-      margin-right: 2px;
+    .search .btn {
+      float: none;
     }
-    a {
-      color: dark-light-choose($primary-medium, $secondary-medium);
-      margin-right: 3px;
-      line-height: 20px;
+
+    a.badge-category {
+      padding: 3px 12px;
+      font-size: $font-up-1;
     }
-  }
-  .activity {
-    width: 60px;
-    &:lang(zh_CN) {
-      width: 80px;
-    }
-    span {
-      cursor: pointer;
-    }
-  }
-  .age {
-    width: 60px;
-  }
-  .with-year {
-    white-space: nowrap;
-  }
-}
 
-.topic-list tbody tr.has-excerpt .star {
-  vertical-align: top;
-  margin-top: 3px;
-}
-
-.topic-list.categories {
-  a.title {
-    color: $tertiary;
   }
 
-  th.posts {
-    position: relative;
-  }
-  th.stats {
-    width: 90px;
-  }
-  td.latest {
-    vertical-align: top;
-    padding: 0 8px 8px;
-  }
-  .last-user-info {
-    font-size: 0.857em;
-  }
-  .has-description {
-    td.category {
-      padding-top: 15px;
-    }
-  }
-  .category{
-    h3 {
-      display: inline-block;
-      font-size: 1.286em;
-      i {
-        margin-right: 5px;
-      }
-      a[href] {
-        color: $primary;
-      }
-    }
-    .subcategories {
-      margin-top: 10px;
-    }
-    .category-description {
-      margin-top: 10px;
-    }
-    .clear-badge {
-      color: $primary;
-    }
-  }
+  // Base list
+  // --------------------------------------------------
 
-  .featured-topic {
-    margin: 10px 0 0;
-    /* topic status glyphs */
-    i {
-      color: dark-light-choose($primary-medium, $secondary-medium) !important;
-      font-size: 0.929em;
-    }
-    a.last-posted-at, a.last-posted-at:visited {
-      color: dark-light-choose($primary-medium, $secondary-medium);
-      font-size: 0.857em;
-    }
-    .badge {
-      font-size: 0.857em;
-      top: -1px;
-    }
-  }
-}
-
-.topic-list-bottom {
-  margin: 20px 0;
-}
-
-// Misc. stuff
-// --------------------------------------------------
-
-#list-area .top-lists h2 {
-  cursor: pointer;
-  margin: 5px 0 10px;
-}
-
-#list-area {
-  h2 {
-    margin: 20px 0 10px;
-  }
-  .show-more.has-topics {
-    top: 0;
-    .alert {
-      padding: 12px 35px 12px 14px;
-    }
-  }
-}
-
-.category-dropdown-menu {
-  max-height: 350px;
-  min-width: 131px;
-}
-
-#bulk-select {
-  position: fixed;
-  right: 20px;
-  top: 130px;
-  padding: 5px;
-  background-color: $secondary;
-  z-index: 99999;
-}
-
-button.dismiss-read {
-  float: right;
-  margin-bottom: 5px;
-  margin-left: 10px;
-}
-
-.tags-admin-menu {
-  .dropdown-menu {
-    right: 0;
-    top: 30px;
-    bottom: auto;
-    left: auto;
-  }
-}
-
-.category-heading {
-  clear: both;
-  p {
-    line-height: 1.5em;
-    font-size: 1.429em;
-  }
-}
-
-.category-navigation {
-  clear: both;
-}
-
-.category-logo {
-  max-height: 150px;
-  float: left;
-  margin-bottom: 15px;
-  margin-right: 15px;
-}
-
-/* Tablet (portrait) ----------- */
-
-@media all
-and (max-width : 850px) {
-
-  // slightly smaller font, tighten spacing on nav pills
-  .nav-pills {
-    > li > a {
-      font-size: 1em;
-      padding: 5px 10px;
-      }
-  }
-
-  // new topic just a "+" no text
-  button#create-topic {
-    span {
-      display: none;
-    }
-    i {
-      margin-right: 0;
-    }
+  .topic-list-icons {
+    .d-icon-thumb-tack { color: dark-light-choose($primary-medium, $secondary-medium); }
+    .d-icon-thumb-tack.unpinned { color: dark-light-choose($primary-medium, $secondary-medium); }
+    a.title {color: $primary;}
+    .d-icon-bookmark { color: dark-light-choose($primary-medium, $secondary-medium); }
   }
 
   .topic-list {
+    @extend .topic-list-icons;
 
-    // tighter table header spacing
-   th:first-of-type {
-     padding: 12px 5px;
-     }
-   // smaller table cell font and cell spacing
-   th, td {
-      padding: 12px 2px;
-      font-size: 1em;
-     }
-    .main-link {
-      font-size: 1em;
+    margin: 0 0 10px;
+    th,
+    td {
+      padding: 12px 5px;
+      &:first-of-type {
+        padding-left: 10px;
       }
-    .category {
-      min-width: 0;
+      &:last-of-type {
+        padding-right: 10px;
+      }
+    }
+    th {
+      button .d-icon {color: dark-light-choose($primary-medium, $secondary-medium); }
+    }
+
+    button.bulk-select {
       padding: 0;
+    }
+
+    td.bulk-select {
+      padding: 10px;
+      + .main-link {
+        padding-left: 0;
       }
-    // suppress views column
-    th.views {
-      display: none;
     }
-    td.views {
-      display: none;
+    
+    .badge-notification {
+      position: relative;
+      top: -2px;
+      &.new-topic {
+        top: -1px;
+        padding-left: 5px;
+      }
     }
-    // show only the first poster
+
     .posters {
-       min-width: 0;
-       width: 50px;
-       a:not(.latest) {
-         display: none;
-         }
-       a.latest {
-         padding: 0 8px;
-         }
+    // we know there are up to 5 avatars of fixed size
+    // will be overridden by media width queries on narrow displays to 1 avatar's width
+    width: 146px;    
+      > a {
+        float: left;
+        margin-right: 4px;
+        &:last-of-type {
+          margin-right: 0;
+        }
+      }
+    }
+    td.posters {
+      height: 29px; // min-height of td with avatar glow
+    }
+    .posters a:first-child .avatar.latest:not(.single) {
+      box-shadow: 0 0 3px 1px desaturate($tertiary-medium, 35%);
+      border: 2px solid desaturate($tertiary-medium, 40%);
+      position: relative;
+      top: -2px;
+      left: -2px;
+    }
+
+
+    .sortable {
+      cursor: pointer;
+      &:hover {
+        background-color: $primary-low;
+      }
+      @include unselectable;
+    }
+    .likes {
+      width: 65px;
+    }
+    .views {
+      width: 65px;
+    }
+    .posts {
+      width: 65px;
+    }
+
+    .post-actions {
+      clear: both;
+      width: auto;
+      color: dark-light-choose($primary-medium, $secondary-medium);
+      text-align: left;
+      font-size: $font-down-1;
+      margin-top: 5px;
+      .fa {
+        margin-right: 2px;
+      }
+      a {
+        color: dark-light-choose($primary-medium, $secondary-medium);
+        margin-right: 3px;
+        line-height: $line-height-large;
+      }
+    }
+    .activity {
+      width: 60px;
+      &:lang(zh_CN) {
+        width: 80px;
+      }
+      span {
+        cursor: pointer;
+      }
+    }
+    .age {
+      width: 60px;
+    }
+    .with-year {
+      white-space: nowrap;
+    }
+  }
+
+  .topic-list.categories {
+    a.title {
+      color: $tertiary;
+    }
+
+    th.posts {
+      position: relative;
+    }
+    th.stats {
+      width: 90px;
+    }
+    td.latest {
+      vertical-align: top;
+      padding: 0 8px 8px;
+    }
+    .last-user-info {
+      font-size: $font-down-1;
+    }
+    .has-description {
+      td.category {
+        padding-top: 15px;
+      }
+    }
+    .category{
+      h3 {
+        display: inline-block;
+        font-size: $font-up-2;
+        i {
+          margin-right: 5px;
+        }
+        a[href] {
+          color: $primary;
+        }
+      }
+      .subcategories {
+        margin-top: 10px;
+      }
+      .category-description {
+        margin-top: 10px;
+      }
+      .clear-badge {
+        color: $primary;
+      }
+    }
+
+    .featured-topic {
+      margin: 10px 0 0;
+      /* topic status glyphs */
+      i {
+        color: dark-light-choose($primary-medium, $secondary-medium) !important;
+        font-size: 0.929em;
+      }
+      a.last-posted-at, a.last-posted-at:visited {
+        color: dark-light-choose($primary-medium, $secondary-medium);
+        font-size: $font-down-1;
+      }
+      .badge {
+        font-size: $font-down-1;
+        top: -1px;
+      }
+    }
+  }
+
+  .topic-list-bottom {
+    margin: 20px 0;
+  }
+
+  // Misc. stuff
+  // --------------------------------------------------
+
+  #list-area .top-lists h2 {
+    cursor: pointer;
+    margin: 5px 0 10px;
+  }
+
+  #list-area {
+    h2 {
+      margin: 20px 0 10px;
+    }
+    .show-more.has-topics {
+      top: 0;
+      .alert {
+        padding: 12px 35px 12px 14px;
+      }
+    }
+  }
+
+  #bulk-select {
+    position: fixed;
+    right: 20px;
+    top: 130px;
+    padding: 5px;
+    background-color: $secondary;
+    z-index: z("dropdown");
+  }
+
+  button.dismiss-read {
+    float: right;
+    margin-bottom: 5px;
+    margin-left: 10px;
+  }
+
+  .tags-admin-menu {
+    .dropdown-menu {
+      right: 0;
+      top: 30px;
+      bottom: auto;
+      left: auto;
+    }
+  }
+
+  .category-heading {
+    clear: both;
+    p {
+      line-height: $line-height-large;
+      font-size: $font-up-3;
+    }
+  }
+
+  .category-navigation {
+    clear: both;
+  }
+
+  .category-logo {
+    max-height: 150px;
+    float: left;
+    margin-bottom: 15px;
+    margin-right: 15px;
+  }
+
+  /* Tablet (portrait) ----------- */
+
+  @media all
+  and (max-width : 850px) {
+
+    // slightly smaller font, tighten spacing on nav pills
+    .nav-pills {
+      > li > a {
+        font-size: $font-0;
+        padding: 7px 10px;
+        }
+    }
+
+    // new topic just a "+" no text
+    button#create-topic {
+      span {
+        display: none;
+      }
+      i {
+        margin-right: 0;
+      }
+    }
+
+    .topic-list {
+
+      // tighter table header spacing
+    th:first-of-type {
+      padding: 12px 5px;
+      }
+    // smaller table cell spacing
+    th, td {
+        padding: 10px;
+        font-size: $font-0;
+      }
+      .category {
+        min-width: 0;
+        padding: 0;
+        }
+      // suppress views column
+      th.views {
+        display: none;
+      }
+      td.views {
+        display: none;
+      }
+      // reduce width for more title space
+      .posts {
+        width: 50px;
+      }
+      .posters {
+        width: 30px;  
+        text-align: center;      
+      }
+      // show only the first poster
+      td.posters {
+        a:not(.latest) {
+          display: none;
+          }
+        a.latest {
+          width: 100%;
+          img {
+            margin: 0 auto;
+          }
+        }
+      }
     }
   }
-}
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 40ac5cb3d58..c978ebaa062 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -27,10 +27,9 @@ h1 .topic-statuses .topic-status i {
   }
 
   .reply-to-tab {
-    z-index: 400;
-    font-size: 0.929em;
+    z-index: z("base") + 1;
     float: right;
-    margin: 1px 25px 0 0;
+    margin: -2px 25px 0 0;
     color: dark-light-choose($primary-medium, $secondary-medium);
   }
 
@@ -55,9 +54,63 @@ nav.post-controls {
 
   padding: 0;
 
-  .like-count {
-    font-size: inherit;
-    margin-right: -5px;
+  .like-button {
+    display: inline-flex;
+
+    .like-count {
+      color: dark-light-choose($primary-low-mid, $secondary-high);
+    }
+
+    .widget-button {
+      background: none;
+    }
+
+    &:hover {
+      background: $primary-low;
+      .like-count {
+        color: $primary-medium;
+        &.d-hover {
+          color: $primary;
+        }
+      }
+      .d-hover {
+        background: none;
+      }
+    }
+
+    &:active {
+      box-shadow: inset 0 1px 3px rgba(0,0,0, .4);
+
+      .widget-button {
+        box-shadow: none;
+      }
+    }
+
+    .like {
+      &:focus {
+        background: none;
+      }
+    }
+
+    .like-count {
+      font-size: $font-up-1;
+      margin-left: 0;      
+      i.d-icon {
+        padding-left: 10px;
+        color: dark-light-choose($primary-low-mid, $secondary-high);
+      }
+      &.my-likes {
+        margin-right: -2px;
+      }
+      &.regular-likes {
+        margin-right: -12px;
+      }
+    }
+
+    .toggle-like {
+      padding: 8px 8px;
+      margin-left: 2px;
+    }
   }
 
   .highlight-action {
@@ -105,7 +158,7 @@ nav.post-controls {
     }
     i {
       margin-left: 5px;
-      font-size: .857em;
+      font-size: $font-down-1;
     }
   }
 
@@ -120,14 +173,14 @@ nav.post-controls {
   }
 
   button {
-    font-size: 1.143em;
+    font-size: $font-up-1;
     padding: 8px 10px;
     vertical-align: top;
     background: transparent;
     border: none;
     margin-left: 3px;
 
-    &.d-hover {
+    &.d-hover, &:focus {
       background: $primary-low;
       color: $primary;
     }
@@ -143,12 +196,12 @@ nav.post-controls {
       position: relative;
     }
 
-    &.delete.d-hover {
+    &.delete.d-hover, &.delete:focus {
       background: $danger;
       color: $secondary;
     }
 
-    &.like.d-hover {
+    &.like.d-hover, &.like:focus {
       color: $love;
       background: $love-low;
     }
@@ -178,12 +231,12 @@ nav.post-controls {
     text-align: left;
     bottom: -2px;
     right: 15px;
-    z-index: 1000;
+    z-index: z("dropdown");
 
     h3 {
       margin-top: 0;
       color: $primary;
-      font-size: 1em;
+      font-size: $font-0;
     }
 
     ul {
@@ -205,14 +258,15 @@ nav.post-controls {
 
 .embedded-posts {
   h1, h2, h3 { margin: 10px 0; }
+  border:  1px solid $primary-low;
 
   .topic-body {
     box-sizing: border-box;
-    width: calc(100% - 60px); // [100% - .topic-avatar width]
+    width: calc(100% - 70px); // [100% - .topic-avatar width]
     // WARNING: overflow hide is required for quoted / embedded images
     // which expect "normal" post width, but expansions are narrower
     overflow: hidden;
-    padding: 15px 15px 0 15px;
+    padding: 15px 25px 0 15px;
   }
 
   // this is covered by .topic-body .regular on a normal post
@@ -222,27 +276,58 @@ nav.post-controls {
   }
 
   .topic-avatar {
-    padding-left: 15px;
+    padding-left: 25px;
     padding-top: 15px;
   }
 
+  .collapse-down, .collapse-up {
+    position: absolute;
+    color: $primary-medium;
+    background: $secondary;
+    border:  1px solid $primary-low;
+    padding: 6px 9px 8px;
+    z-index: 99; // Needs to be higher than topic-avatar
+    &:hover {
+      background: $primary-low;
+      color: $primary;
+    }
+  }
+
   // bottom means "reply expansion" below a post
   &.bottom {
+    border-top: none;
+    margin-bottom: 20px;
     &.hidden {
       display: block;
       opacity: 0;
     }
   }
   &.bottom {
+    .collapse-up {
+      transform: translate(-50%, -164%);
+    }
     .row {
-      padding-top: 7px;
+      padding-bottom: .5em;
+      .topic-avatar, .topic-body {
+        border-top: 1px solid $primary-low;
+      }
     }
   }
 
   // top means "in reply to expansion" above a post
   &.top {
+    border-bottom: none;
+    .collapse-down {
+      transform: translate(-50%, 55%);
+    }
     margin-left: 56px;
-    width: 701px;
+    width: 699px;
+    .row {
+      border-bottom: none;
+      .topic-avatar, .topic-body {
+        border-top: 1px solid $primary-low;
+      }
+    }
   }
   &.top.topic-body {
     padding: 0;
@@ -257,8 +342,8 @@ nav.post-controls {
   }
   .topic-meta-data h5 {
     position: absolute;
-    z-index: 1;
-    font-size: 0.929em;
+    z-index: z("base");
+    font-size: $font-down-1;
     a {
       font-weight: bold;
       color: dark-light-choose($primary-low-mid, $secondary-high);
@@ -274,69 +359,8 @@ nav.post-controls {
   .avatar { margin-right: 2px; }
 }
 
-a.star {
-  display: inline-block;
-  float: left;
-}
-
 .topic-map {
-  margin: 20px 0 0 0;
-  background: blend-primary-secondary(5%);
-  border: 1px solid $primary-low;
-  border-top: none; // would cause double top border
-
-  section {
-    border-top: 1px solid $primary-low;
-  }
-
-  h3 {
-    margin-bottom: 4px;
-    color: dark-light-choose($primary-high, $secondary-low);
-    line-height: 23px;
-    font-weight: normal;
-    font-size: 1em;
-  }
-
-  h4 {
-    margin: 1px 0 2px 0;
-    color: dark-light-choose($primary-medium, $secondary-medium);
-    font-weight: normal;
-    font-size: 0.857em;
-    line-height: 15px;
-  }
-
-  ul {
-    margin: 0;
-    list-style: none;
-  }
-
-  span.domain {
-    font-size: 0.786em;
-    color: dark-light-choose($primary-medium, $secondary-medium);
-  }
-
-  .avatars {
-    > div {
-      float: left;
-      position: relative;
-      margin: 3px 0;
-    }
-    .post-count {
-      position: absolute;
-      right: 0;
-      border-radius: 100px;
-      padding: 4px 5px 2px 5px;
-      text-align: center;
-      font-weight: normal;
-      font-size: .786em;
-      line-height: 1;
-    }
-  }
-
-  .avatar {
-    float: left;
-    margin-right: 4px;
-  }
+  margin: 20px 0;
 
   .map {
     .secondary {text-align: center;}
@@ -349,15 +373,19 @@ a.star {
       &:nth-child(3) { text-align:center; }
     }
     a, .number {
-      line-height: 20px;
+      line-height: $line-height-large;
     }
     .number, i {
       color: dark-light-choose($primary-high, $secondary-low);
-      font-size: 1.286em;
+      font-size: $font-up-2;
+      line-height: $line-height-medium;
     }
     .avatar  a {
       float: left;
     }
+    .topic-map-post {
+      margin-top: 6px;
+    }
   }
   .avatars,
   .links,
@@ -371,24 +399,13 @@ a.star {
     .user a {
       color: dark-light-choose($primary-high, $secondary-low);
       font-weight: bold;
-      font-size: 0.929em;
+      font-size: $font-down-1;
     }
     .d-icon-times {
       color: dark-light-choose($primary-medium, $secondary-high);
     }
   }
 
-  .topic-links {
-    .badge-notification {
-      margin: 1px 5px 5px 0;
-    }
-  }
-
-  td {
-    vertical-align: top;
-    padding:1px;
-  }
-
   .buttons {
     float: right;
     .btn {
@@ -397,7 +414,7 @@ a.star {
       color: dark-light-choose($primary-medium, $secondary-high);
       background: blend-primary-secondary(5%);
       border-left: 1px solid $primary-low;
-      border-top: 1px solid $primary-low;
+      border-top: 1px solid transparent;
       &:hover {
         color: $primary;
         background: $primary-low;
@@ -408,7 +425,7 @@ a.star {
       }
       .fa {
         margin: 0;
-        font-size: 1.286em;
+        font-size: $font-up-2;
         line-height: 52px;
       }
     }
@@ -425,11 +442,6 @@ a.star {
   }
 }
 
-@mixin topic-footer-buttons-text {
-  line-height: 32px;
-  color: dark-light-choose($primary-medium, $secondary-medium);
-}
-
 @mixin topic-footer-button {
   margin-bottom: 5px;
   margin-right: 10px;
@@ -439,7 +451,7 @@ a.star {
   padding: 10px 10px 0 0;
   float: left;
   p {
-    @include topic-footer-buttons-text;
+    color: dark-light-choose($primary-medium, $secondary-medium);
   }
   .btn {
     @include topic-footer-button;
@@ -459,7 +471,6 @@ a.star {
   clear: left;
   padding: 20px 0 15px 0;
   table {
-    table-layout: fixed;
     margin-top: 10px;
   }
 
@@ -520,6 +531,7 @@ video {
   .topic-statuses {
     i { color: $header_primary; }
     .d-icon-envelope { color: $danger; }
+    .d-icon-lock {padding-top: .15em;}
     .unpinned { color: $header_primary; }
   }
 
@@ -533,7 +545,6 @@ video {
 
   .topic-header-extra {
     margin: 0 0 0 5px;
-    padding-top: 5px;
   }
 }
 
@@ -541,8 +552,9 @@ video {
 .extra-info {
   h1 {
     margin: 5px 0 0 0;
-    font-size: 1.429em;
-    line-height: 1.3em;
+    font-size: $font-up-3;
+    line-height: $line-height-large;
+    width: 100%;
   }
 
   .topic-statuses {
@@ -553,8 +565,9 @@ video {
 /* override docked header CSS for topics with categories */
 .extra-info.two-rows {
   h1 {
-    line-height: 1.1em;
+    line-height: $line-height-medium;
     margin: 0;
+    width: 100%;
   }
 }
 
@@ -591,7 +604,7 @@ video {
 }
 
 .deleted-user-avatar {
-  font-size: 2.571em;
+  font-size: $font-up-6;
 }
 
 .info-line {
@@ -638,9 +651,9 @@ $topic-avatar-width: 45px;
   width: $topic-body-width;
   float: left;
   position: relative;
-  z-index: 2;
+  z-index: z("base");
   border-top: 1px solid $primary-low;
-  padding: 12px $topic-body-width-padding 15px $topic-body-width-padding;
+  padding: 12px $topic-body-width-padding 0 $topic-body-width-padding;
 }
 
 .topic-avatar {
@@ -648,7 +661,7 @@ $topic-avatar-width: 45px;
   padding-top: 15px;
   width: $topic-avatar-width;
   float: left;
-  z-index: 3;
+  z-index: z("base") + 1;
 }
 
 .gap {
@@ -661,6 +674,11 @@ $topic-avatar-width: 45px;
   border-top: none;
 }
 
+.time-gap + .topic-post .embedded-posts.top {
+  border-bottom: 1px solid $primary-low;
+}
+
+
 .posts-wrapper {
   position: relative;
   -webkit-font-smoothing: subpixel-antialiased;
@@ -684,7 +702,7 @@ $topic-avatar-width: 45px;
   position: absolute;
   bottom: 115%;
   left: 0;
-  z-index: 999;
+  z-index: z("dropdown");
   display: none;
   float: left;
   width: 550px;
@@ -692,16 +710,16 @@ $topic-avatar-width: 45px;
   list-style: none;
   background-color: $secondary;
   border: 1px solid $primary-low;
-  box-shadow: 0 1px 5px rgba(0,0,0, .4);
+  box-shadow: shadow("dropdown");
   background-clip: padding-box;
   span {
-    font-size: 0.857em;
+    font-size: $font-down-1;
     color: dark-light-choose($primary-medium, $secondary-medium);
   }
   span.title {
     font-weight: bold;
     display: block;
-    font-size: 1em;
+    font-size: $font-0;
     color: $primary;
   }
 }
@@ -710,7 +728,7 @@ $topic-avatar-width: 45px;
   padding: 9px;
   clear: both;
   font-weight: normal;
-  line-height: 18px;
+  line-height: $line-height-medium;
   color: $primary;
   transition: all linear .15s;
 
@@ -738,7 +756,7 @@ $topic-avatar-width: 45px;
 .dropdown-menu .icon {
   margin-top: 3px;
   float: left;
-  font-size: 1.286em;
+  font-size: $font-up-2;
 }
 
 .open > .dropdown-menu {
@@ -749,7 +767,7 @@ $topic-avatar-width: 45px;
 .selected-posts {
   width: 200px;
   position: fixed;
-  z-index: 1000;
+  z-index: z("dropdown");
   background-color: $tertiary-low;
   border: 1px solid $tertiary;
   padding: 5px;
@@ -776,14 +794,14 @@ $topic-avatar-width: 45px;
     margin-top: 10px;
   }
   p {
-    font-size: 0.929em;
+    font-size: $font-down-1;
     margin: 0 0 10px 0;
   }
   p.cancel {
     margin: 10px 0 0 0;
   }
   h3 {
-    font-size: 1.857em;
+    font-size: $font-up-4;
     color: $primary;
     margin-bottom: 5px;
     i {
@@ -807,13 +825,12 @@ $topic-avatar-width: 45px;
     }
     &:active {
       @include linear-gradient(darken($tertiary, 18%), darken($tertiary, 12%));
-      box-shadow: inset 0 1px 3px rgba(0,0,0, 0.2);
       color: $secondary;
     }
     &[disabled] {
       text-shadow: 0 1px 0 rgba($primary, 0.2);
       @include linear-gradient($tertiary, darken($tertiary, 20%));
-      @include box-shadow((inset 0 1px 0 rgba(0,0,0, 0.33), inset 0 -1px 2px rgba($primary, 0.2)));
+      @include box-shadow(inset 0 1px 0 rgba(0,0,0, 0.33));
     }
   }
 }
@@ -840,7 +857,7 @@ $topic-avatar-width: 45px;
     .select-posts {
       position: absolute;
       right: 0;
-      z-index: 490;
+      z-index: z("base") + 1;
       top: 3em;
       height: 100px;
 
@@ -872,7 +889,7 @@ a.attachment:before {
   color: rgba($primary-low, .8);
   font: 6.429em/1 FontAwesome;
   content: "\f014";
-  z-index: -5;
+  z-index: z("base");
 }
 
 .topic-meta-data {
@@ -889,8 +906,6 @@ a.attachment:before {
  .post-info  {
    display: inline-block;
    float: right;
-   font-size: 0.929em;
-   margin-top: 1px;
    a {color: dark-light-choose($primary-medium, $secondary-medium); }
  }
 
@@ -898,7 +913,7 @@ a.attachment:before {
 
 .who-liked {
   margin-top: 20px;
-  margin-bottom: 0px;
+  margin-bottom: 0;
   width: 100%;
   text-align: right;
 }
@@ -914,8 +929,8 @@ span.highlighted {
 .read-state {
   color: $tertiary-medium;
   position: absolute;
-  right: 0px;
-  top: 13px;
+  right: 0;
+  top: 2em;
   font-size: 0.571em;
 }
 
@@ -926,10 +941,6 @@ span.highlighted {
 
 .signup-cta {
   width: $topic-body-width;
-  a {
-    float: right;
-    text-decoration: underline;
-  }
 }
 
 /* Tablet (portrait) ----------- */
diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss
index d95273c0afd..0f964d9d8e6 100644
--- a/app/assets/stylesheets/desktop/topic.scss
+++ b/app/assets/stylesheets/desktop/topic.scss
@@ -2,6 +2,7 @@
   @include unselectable;
   clear: both;
   text-align: right;
+  margin-bottom: 10px;
   .post-action {
     display: inline-block;
     margin-left: 10px;
@@ -10,14 +11,13 @@
 }
 
 .post-menu-area {
-  margin-bottom: 10px;
-  margin-top: 20px;
+  margin: 20px 0;
 }
 
 .edits {margin-right: 5px;}
 
 #topic-title {
-  z-index: 1000;
+  z-index: z("base");
   padding-top: 14px;
   margin-bottom: 10px;
 
@@ -25,17 +25,15 @@
     width: 500px;
   }
   h1 {
-    font-size: 1.857em;
-    line-height: 1.25em;
+    font-size: $font-up-4;
+    line-height: $line-height-medium;
     overflow: hidden;
+    width: 100%;
     a {color: $primary;}
   }
   .topic-statuses {
     margin-top: -2px;
   }
-  .select2-container {
-    vertical-align: middle;
-  }
   .private-message-glyph { display: none; }
   .remove-featured-link {
     float: right;
@@ -46,10 +44,9 @@
 }
 
 .private-message-glyph {
-  color: dark-light-choose($primary-low-mid, $secondary-high);
   float: left;
-  margin-right: 5px;
 }
+
 .private_message #topic-title .private-message-glyph { display: inline; }
 
 .topic-error {
@@ -57,9 +54,9 @@
   width: 60%;
   margin-left: auto;
   margin-right: auto;
-  font-size: 1.857em;
+  font-size: $font-up-4;
   text-align: center;
-  line-height: 1.1em;
+  line-height: $line-height-medium;
 
   .topic-retry {
     display: block;
@@ -71,17 +68,16 @@
 
 .topic-status-info {
   border-top: 1px solid $primary-low;
-  padding: 10px 0px;
+  padding: 10px 0;
   height: 20px;
   max-width: 757px;
 }
 
 #topic-progress-wrapper {
   position: fixed;
-  right: 50%;
-  width: 0;
+  right: 1em;
   bottom: 0;
-  z-index: 500;
+  z-index: z("timeline");
   &.docked {
     position: absolute;
     bottom: -70px;
@@ -96,7 +92,6 @@
   position: relative;
   left: 340px;
   width: 135px;
-  padding: 5px;
 
   button.full {
     width: 100%;
@@ -105,7 +100,7 @@
       display: block;
       margin-top: 2px;
       margin-bottom: 2px;
-      font-size: 1.286em;
+      font-size: $font-up-2;
     }
   }
   .jump-form {
@@ -115,7 +110,7 @@
       height: 20px;
       text-align: center;
       margin-bottom: 0;
-      font-size: 1.143em;
+      font-size: $font-up-1;
     }
     button.btn {
       float: right;
@@ -155,47 +150,39 @@
     top: 9px;
     width: 100%;
     text-align: center;
-    z-index: 1;
+    z-index: z("base");
   }
   .d-icon {
     position: absolute;
     right: 8px;
     bottom: 9px;
-    z-index: 1;
+    z-index: z("base");
   }
   h4 {
     display: inline;
-    font-size: 1.286em;
-    line-height: 15px;
+    font-size: $font-up-2;
+    line-height: $line-height-small;
   }
   .bg {
     position: absolute;
     top: 0;
     bottom: 0;
     width: 0;
+    max-width: 145px;
     border-right: 1px solid  $tertiary-low;
     background-color:  $tertiary-low;
     transition: width .75s;
   }
 }
 
-.heatmap-high {color: #fe7a15 !important;}
-.heatmap-med {color: #cf7721 !important;}
-.heatmap-low {color: #9b764f !important;}
-.heatmap-high a {color: #fe7a15 !important;}
-.heatmap-med a {color: #cf7721 !important;}
-.heatmap-low a {color: #9b764f !important;}
-
-
-
 #topic-filter {
   background-color: $highlight-medium;
   padding: 8px;
   bottom: 0;
   position: fixed;
   width: 100%;
-  font-size: 1em;
-  z-index: 495
+  font-size: $font-0;
+  z-index: z("dropdown");
 }
 
 @media all
diff --git a/app/assets/stylesheets/desktop/upload.scss b/app/assets/stylesheets/desktop/upload.scss
index 07f68b15980..fce130e7d37 100644
--- a/app/assets/stylesheets/desktop/upload.scss
+++ b/app/assets/stylesheets/desktop/upload.scss
@@ -4,17 +4,23 @@
     padding-left: 10px;
   }
   .radios {
-    height: 60px;
+    min-height: 60px;
+    display: flex;
+    align-items: flex-start;
+    label {
+      flex: 1 0 auto;
+      margin-right: 1em;
+      margin-top: 1px;
+    }
     .inputs {
-      float: right;
-      width: 75%;
+      width: 100%;
       input {
         width: 90%;
         margin: 0 0 5px 0;
       }
       input[type="file"] {
-        font-size: 1em;
-        line-height: 18px;
+        font-size: $font-0;
+        line-height: $line-height-medium;
       }
       .description, .hint {
         color: dark-light-choose($primary-medium, $secondary-medium);
@@ -26,8 +32,8 @@
       }
     }
   }
-  .radios:last-child {
-    height: 20px;
+  .radios:last-child:not(:nth-child(2)) { // last child for composer modal, but not theme import modal
+    min-height: 20px;
   }
 }
 
@@ -38,6 +44,6 @@
 .image-upload-controls {
   padding: 10px;
   label.btn {
-    padding: 6px 10px;
+    padding: 5px 10px;
   }
 }
diff --git a/app/assets/stylesheets/desktop/user-card.scss b/app/assets/stylesheets/desktop/user-card.scss
index 2a73394fb7f..0f637ee1f0f 100644
--- a/app/assets/stylesheets/desktop/user-card.scss
+++ b/app/assets/stylesheets/desktop/user-card.scss
@@ -4,13 +4,13 @@
 $user_card_primary: $primary;
 $user_card_background: $secondary;
 
-#user-card {
+#user-card, #group-card {
   position: absolute;
   width: 500px;
   left: -9999px;
   top: -9999px;
-  z-index: 990;
-  box-shadow: 1px 2px 6px rgba(0,0,0, .25);
+  z-index: z("usercard");
+  box-shadow: shadow("card");
   margin-top: -2px;
   color: $user_card_primary;
   background: $user_card_background center center;
@@ -27,6 +27,11 @@ $user_card_background: $secondary;
     @include transform(scale(1));
   }
 
+  &.fixed {
+    position: fixed;
+    z-index: z("composer","content") + 1;
+  }
+
   .card-content {
     padding: 12px 12px 0 12px;
     background: rgba($user_card_background, .85);
@@ -41,9 +46,11 @@ $user_card_background: $secondary;
     a.card-huge-avatar {
       outline: none;
     }
-    .staged {
-      font-style: italic;
-    }
+  }
+
+  .bio {
+    max-height: 150px;
+    overflow: auto;
   }
 
   &.no-bg {
@@ -63,8 +70,8 @@ $user_card_background: $secondary;
 
   h1 {
     min-width: 120px;
-    font-size: 1.857em;
-    line-height: 1.25;
+    font-size: $font-up-4;
+    line-height: $line-height-medium;
     display: block;
     max-width: 250px;
     white-space: nowrap;
@@ -74,14 +81,15 @@ $user_card_background: $secondary;
       color: $user_card_primary;
     }
     i {
-      font-size: .857em;
+      font-size: $font-down-1;
       color: $user_card_primary;
     }
   }
 
   h2 {
-    font-size: 1.143em;
-    line-height: 1.25;
+    font-size: $font-up-1;
+    line-height: $line-height-large;
+    margin: 0;
     font-weight: normal;
     display: block;
     max-width: 250px;
@@ -94,7 +102,7 @@ $user_card_background: $secondary;
   }
 
   h3 {
-    font-size: 0.929em;
+    font-size: $font-0;
     font-weight: normal;
     margin-top: 0;
     color: scale-color($user_card_primary, $lightness: 20%);
@@ -106,7 +114,7 @@ $user_card_background: $secondary;
   }
 
   .groups {
-    font-size: 0.929em;
+    font-size: $font-down-1;
     font-weight: normal;
     margin-top: 0;
     color: $user_card_background;
@@ -119,8 +127,8 @@ $user_card_background: $secondary;
   .metadata {
     width: 100%;
     clear: both;
-    padding-top: 5px;
-    padding-bottom: 5px;
+    padding-top: 10px;
+    padding-bottom: 10px;
     h3 {
       display: inline;
       margin-right: 5px;
@@ -138,12 +146,8 @@ $user_card_background: $secondary;
     padding-top: 10px;
   }
 
-  &.has-card-badge-image .bio {
-    width: 75%;
-  }
-
   .bio {
-    padding: 10px 0 0 0;
+    margin-top: 80px;
     clear: left;
 
     a {
@@ -165,21 +169,70 @@ $user_card_background: $secondary;
   }
 
   .location-and-website {
-    clear: left;
-    margin-top: 5px;
-    .location {margin-right: 10px;}
-    .website-name {
-      a {
-        text-decoration: underline;
+    display: flex;
+    width: 100%;
+    align-items: center;
+    padding-top: 5px;
+    .location, .website-name {
+      display: flex;
+      max-width: 90%;
+      overflow: hidden;
+      align-items: baseline;
+      i {
+        margin-right: .25em;
+      }
+    }
+    .website-name a, .location span {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
         color: $user_card_primary;
+    }
+    .location {
+      margin-right: .5em;
+    }
+    .website-name a {
+      text-decoration: underline;
+    }
+  }
+
+  .user-card-avatar, .group-card-avatar {
+    float: left;
+    margin-right: 10px;
+    margin-top: -53px;
+  }
+
+  .group-card-avatar {
+    $size: 120px;
+    width: $size;
+    height: $size;
+    .avatar-flair {
+      width: $size;
+      height: $size;
+      display: flex;
+      align-items: center;
+      background-repeat: no-repeat;
+      background-position: center;
+      background-size: $size;
+      color: $primary;
+      i {
+        margin: auto;
+        font-size: $size / 1.5 !important;
+      }
+      &.rounded {
+        border-radius: 50%;
       }
     }
   }
 
-  .user-card-avatar {
-    float: left;
-    margin-right: 10px;
-    margin-top: -53px;
+  .members {
+    padding: 0 0 10px 0;
+    a {
+      color: lighten($primary, 40%);
+      &:hover {
+        color: $primary;
+      }
+    }
   }
 
   p {
@@ -230,7 +283,7 @@ $user_card_background: $secondary;
 
       h3 {
         color: $user_card_background;
-        font-size: 1em;
+        font-size: $font-0;
         margin-bottom: -8px;
       }
     }
@@ -248,17 +301,6 @@ $user_card_background: $secondary;
     padding-top: 15px;
   }
 
-  .card-badge {
-    img {
-      max-width: 120px;
-    }
-    position: absolute;
-    right: 12px;
-    bottom: 12px;
-    font-size: 2.286em;
-    i {color: $user_card_primary;}
-  }
-
   .metadata .email .btn {
     padding: 2px 12px;
   }
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index c3fec738e98..92fedb9c398 100644
--- a/app/assets/stylesheets/desktop/user.scss
+++ b/app/assets/stylesheets/desktop/user.scss
@@ -8,6 +8,10 @@
       margin-top: 10px;
     }
   }
+
+  .show-mores {
+    position: absolute;
+  }
 }
 
 .profile-image {
@@ -75,6 +79,11 @@
   margin-bottom: 10px;
   box-sizing: border-box;
 
+  &.user-badges-list {
+    display: flex;
+    flex-wrap: wrap;
+  }
+
   .btn.right {
     float: right
   }
@@ -91,13 +100,16 @@
   }
 }
 
+.pref-second-factor {
+  margin-top: 10px;
+}
+
 .user-invite-list {
   width: 100%;
   margin-top: 15px;
 
   th {
     text-align: left;
-    border-bottom: 3px solid $primary-low;
     padding: 0 0 10px 0;
     color: dark-light-choose($primary-medium, $secondary-medium);
     font-weight: normal;
@@ -109,12 +121,6 @@
   }
 }
 
-.user-invite-controls {
-  background-color: $primary-low;
-  padding: 5px 10px 0px 0;
-  height: 35px;
-}
-
 .user-invite-search {
   clear: both;
   margin: 15px 0px -15px 0px;
@@ -134,32 +140,12 @@
 
     &.group {
       .details {
-        padding: 15px 0px;
+        padding: 15px 0;
         margin: 0;
         color: dark-light-choose(lighten($primary, 10%), $secondary);
       }
     }
 
-  .secondary {
-    background: $secondary;
-    border-top: 1px solid $primary-low;
-    border-bottom: 1px solid $primary-low;
-
-      dl {
-        padding: 8px 10px;
-      }
-
-      dd {
-        display: inline;
-        margin: 0 10px 0 0;
-      }
-
-      dt {
-        margin: 0 5px 0 0;
-        padding: 0;
-      }
-    }
-
     .details {
       padding: 0 0 4px 0;
       margin-top: -200px;
@@ -176,6 +162,12 @@
           a[href] {
             text-decoration: underline;
           }
+          .location-and-website {
+            max-width: 100%;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+          }
         }
 
         .bio {
@@ -198,7 +190,6 @@
       padding: 0 0 12px 0;
       float: right;
       text-align: right;
-      width: 180px;
 
       a {
         width: 140px;
@@ -279,10 +270,12 @@
     width: 530px;
   }
 
+  .category-selector, .tag-chooser {
+    width: 530px;
+  }
+
   input {
-    &.category-selector,
-    &.user-selector,
-    &.tag-chooser {
+    &.user-selector {
       width: 530px;
     }
 
diff --git a/app/assets/stylesheets/embed.scss b/app/assets/stylesheets/embed.scss
index 0f48544c046..45b0bf9ca85 100644
--- a/app/assets/stylesheets/embed.scss
+++ b/app/assets/stylesheets/embed.scss
@@ -42,7 +42,7 @@ article.post {
   .post-date {
     float: right;
     color: #aaa;
-    font-size: 0.857em;
+    font-size: $font-down-1;
     margin: 10px 4px 0 0;
   }
 
@@ -76,7 +76,7 @@ article.post {
 }
 
 .username {
-  font-size: 0.929em;
+  font-size: $font-down-1;
   margin: 0 0 10px 0;
 
   a {
@@ -102,7 +102,7 @@ img.emoji {
 }
 
 .in-reply-to {
-  font-size: 0.929em;
+  font-size: $font-down-1;
   text-align: center;
   margin: 10px 20px 6px 0;
   display: inline-block;
@@ -111,7 +111,7 @@ img.emoji {
 }
 
 .replies {
-  font-size: 1.071em;
+  font-size: $font-0;
   color: #999;
 }
 
@@ -124,7 +124,7 @@ header.discourse {
   padding-left: 10px;
   padding-right: 10px;
   padding-bottom: 8px;
-  font-size: 1.286em;
+  font-size: $font-up-2;
   border-bottom: 3px solid #ddd;
 
   display: flex;
@@ -134,7 +134,7 @@ header.discourse {
 
   h3 {
     margin: 0 auto 0 0;
-    font-size: 1.0em;
+    font-size: $font-0;
   }
 }
 
@@ -143,7 +143,7 @@ header.discourse {
 }
 
 footer {
-  font-size: 1.286em;
+  font-size: $font-up-2;
   margin-top: 0.5em;
   .button {
     color: white;
diff --git a/app/assets/stylesheets/mobile.scss b/app/assets/stylesheets/mobile.scss
index 39242962431..05efaa21900 100644
--- a/app/assets/stylesheets/mobile.scss
+++ b/app/assets/stylesheets/mobile.scss
@@ -7,7 +7,6 @@
 @import "mobile/banner";
 @import "mobile/compose";
 @import "mobile/discourse";
-@import "mobile/faqs";
 @import "mobile/header";
 @import "mobile/login";
 @import "mobile/modal";
@@ -18,15 +17,17 @@
 @import "mobile/user";
 @import "mobile/history";
 @import "mobile/directory";
-@import "mobile/menu-panel";
 @import "mobile/search";
 @import "mobile/emoji";
 @import "mobile/ring";
 @import "mobile/group";
+@import "mobile/groups";
 
 // Import all component-specific files
 @import "mobile/components/*";
 
+@import "mobile/select-kit/*";
+
 /* These files doesn't actually exist, they are injected by Stylesheet::Compiler. */
 
 @import "plugins";
diff --git a/app/assets/stylesheets/mobile/alert.scss b/app/assets/stylesheets/mobile/alert.scss
index 0e91f6f71d3..ac71f845a90 100644
--- a/app/assets/stylesheets/mobile/alert.scss
+++ b/app/assets/stylesheets/mobile/alert.scss
@@ -8,5 +8,5 @@
     margin-bottom: -3px;
     margin-top: -5px;
     padding: 15px;
-    font-size: 1em;
+    font-size: $font-0;
 }
diff --git a/app/assets/stylesheets/mobile/components/group-member-dropdown.scss b/app/assets/stylesheets/mobile/components/group-member-dropdown.scss
new file mode 100644
index 00000000000..5cc3e21a253
--- /dev/null
+++ b/app/assets/stylesheets/mobile/components/group-member-dropdown.scss
@@ -0,0 +1,9 @@
+.group-member-dropdown {
+  ul {
+    position: absolute;
+    top: 27px;
+    width: 250px;
+    bottom: auto;
+    text-align: left;
+  }
+}
diff --git a/app/assets/stylesheets/mobile/components/user-info.scss b/app/assets/stylesheets/mobile/components/user-info.scss
deleted file mode 100644
index 8cf359ea186..00000000000
--- a/app/assets/stylesheets/mobile/components/user-info.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-// Mobile styles for "user-info" component
-.user-info {
-  &.medium {
-    width: 300px;
-
-    .user-image {
-      width: auto;
-    }
-
-    .user-detail {
-      width: 240px;
-    }
-  }
-}
diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss
index 0afe0dcb057..af1d5ea8a0d 100644
--- a/app/assets/stylesheets/mobile/compose.scss
+++ b/app/assets/stylesheets/mobile/compose.scss
@@ -7,7 +7,7 @@
 }
 
 #reply-control {
-  z-index: 1002; //d-header is 1001
+  z-index: z("mobile-composer");
     .reply-area {
       padding: 0 10px;
       @media screen and (max-width: 374px) {
@@ -67,6 +67,12 @@
         #file-uploading {
           margin-left: 15px;
         }
+        .cancel {
+          font-size: 1.6em;
+          color: $primary-low-mid;
+          margin-left: .6em;  
+          padding: 0 5px;        
+        }
       }
       .composer-bottom-right {
         margin-left: auto;
@@ -81,7 +87,7 @@
     &.show-preview {
       .d-editor-preview-wrapper {
         position: fixed;
-        z-index: 1000000;
+        z-index: z("base") + 1;
         top: 0;
         bottom: 0;
         left: 0;
@@ -99,7 +105,7 @@
         position: fixed;
         right: 5px;
         bottom: 5px;
-        z-index: 1000001;
+        z-index: z("base") + 2;
       }
     }
 
diff --git a/app/assets/stylesheets/mobile/directory.scss b/app/assets/stylesheets/mobile/directory.scss
index d6cc24df05d..15fdb951658 100644
--- a/app/assets/stylesheets/mobile/directory.scss
+++ b/app/assets/stylesheets/mobile/directory.scss
@@ -1,47 +1,18 @@
-.directory {
-  .period-chooser button {
-    margin: 0;
-  }
-  .period-chooser {
-    li {
-      text-align: left;
-    }
-  }
-}
-
-.user-controls {
-  padding: 1em;
-}
-
-.total-rows {
-  padding: 0.25em 0.5em;
-}
-
 .directory .user {
   border-top: 1px solid $primary-low;
   padding: 1em;
 
-
-  &.me {
-    background-color: dark-light-choose($highlight-low, $highlight-medium);
-
-    .username a, .name, .title, .number, .time-read, .user-stat .label {
-      color: scale-color($highlight, $lightness: -50%);
-    }
-  }
   .user-stat {
     margin-left: 55px;
-
     .value {
       font-weight: bold;
     }
     .label {
       margin-left: 0.2em;
-      color: blend-primary-secondary(50%);
+      color: $primary-medium;
     }
     .d-icon-heart {
       color: $love;
     }
   }
-  margin-bottom: 1em;
 }
diff --git a/app/assets/stylesheets/mobile/discourse.scss b/app/assets/stylesheets/mobile/discourse.scss
index 110663e05e1..d978a127895 100644
--- a/app/assets/stylesheets/mobile/discourse.scss
+++ b/app/assets/stylesheets/mobile/discourse.scss
@@ -4,6 +4,11 @@
 // throughout the Discourse application
 
 // Base Elements
+html {
+  font-size: 15px; // Increasing overall font-size on mobile by 1px
+}
+
+
 body {
   background-color: $secondary;
 }
@@ -74,8 +79,8 @@ blockquote {
   &.activity-nav,
   &.preferences-nav {
     position: absolute;
-    right: 0px;
-    top: -55px;
+    right: 0;
+    top: -57px;
   }
 
   a {
@@ -84,6 +89,7 @@ blockquote {
     .fa {
       margin-right: 8px;
       color: dark-light-choose($primary-medium, $secondary-medium);
+      line-height: $line-height-medium;
     }
   }
 
@@ -97,7 +103,7 @@ blockquote {
 
   .d-icon-caret-down {
     position: absolute;
-    right: 0px;
+    right: 0;
   }
 
   .drop {
@@ -106,7 +112,7 @@ blockquote {
       left: 0;
       display: block;
       position: absolute;
-      z-index: 10000000;
+      z-index: z("dropdown");
       background-color: $secondary;
       width: 100%;
       list-style: none;
@@ -148,6 +154,6 @@ blockquote {
 
 // somehow the image logo assumption inherits margins from earlier in the CSS
 // stack we must remove margins for text site titles
-h2#site-text-logo {
+h1#site-text-logo {
   margin: 0 0 0 10px;
 }
diff --git a/app/assets/stylesheets/mobile/emoji.scss b/app/assets/stylesheets/mobile/emoji.scss
index e69de29bb2d..3bd4ef1ae0b 100644
--- a/app/assets/stylesheets/mobile/emoji.scss
+++ b/app/assets/stylesheets/mobile/emoji.scss
@@ -0,0 +1,4 @@
+.emoji-picker {
+  height: 250px;
+  border: none;
+}
diff --git a/app/assets/stylesheets/mobile/faqs.scss b/app/assets/stylesheets/mobile/faqs.scss
deleted file mode 100644
index 4fdfda90bab..00000000000
--- a/app/assets/stylesheets/mobile/faqs.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-// --------------------------------------------------
-// FAQs, About, etc
-// --------------------------------------------------
-
-.body-page {
-  margin-top: 20px;
-  margin-left: 15px;
-  width: 90%;
-  padding-left: 0;
-}
\ No newline at end of file
diff --git a/app/assets/stylesheets/mobile/group.scss b/app/assets/stylesheets/mobile/group.scss
index ded66e71845..7bbf8107645 100644
--- a/app/assets/stylesheets/mobile/group.scss
+++ b/app/assets/stylesheets/mobile/group.scss
@@ -3,11 +3,11 @@
 }
 
 .group-header {
-  margin: 0px;
+  margin: 0;
 }
 
 .group-name {
-  margin: 5px 0px 0px 0px;
+  margin: 5px 0 0 0;
 }
 
 .group-nav {
@@ -19,21 +19,22 @@
 }
 
 .group-nav.mobile-nav {
-  margin-bottom: 15px;
   float: left;
 }
 
-.group-activity {
+.group-activity, .group-manage {
   position: relative;
 }
 
-.group-activity-nav.mobile-nav {
-  position: absolute;
-  right: 0px;
-  top: -55px;
+.group-navigation {
+  &.mobile-nav {
+    position: absolute;
+    right: 0;
+    top: -51px;
+  }
 }
 
-.group-activity-outlet {
+.group-activity-outlet, .group-messages-outlet {
   float: none;
 }
 
@@ -44,27 +45,62 @@
 
   .group-flair-inputs {
     .group-flair-right {
-      margin: 0px
+      margin: 0
     }
   }
 }
 
-table.group-logs {
+table.group-manage-logs {
   width: 130%;
 }
 
-table.group-members {
-  th {
-    text-align: center;
-  }
+.group-members {
+  .group-member {
+    border-top: 1px solid $primary-low;
 
-  tr {
     .user-info {
-      width: auto;
+      margin: 0;
+      padding: 0.5em;
+      width: 98%;
     }
 
-    td {
-      padding-left: 0.5em;
+    .btn-group {
+      margin-top: 0;
+    }
+
+    .group-member-info {
+      color: dark-light-choose($primary-medium, $secondary-medium);
+
+      label {
+        margin-bottom: 0;
+        font-weight: bold;
+        display: inline-block;
+      }
     }
   }
 }
+
+.group-outlet {
+  .group-username-filter {
+    position: absolute;
+    right: 0px;
+    top: -42px;
+    height: 27px;
+    margin-bottom: 0px;
+  }
+
+  .group-members-manage {
+    width: 100%;
+    text-align: right;
+  }
+
+  .group-members-dropdown,
+  .group-members-add {
+    margin: 5px 0px;
+  }
+}
+
+
+.group-add-members-btn {
+  margin-bottom: 10px;
+}
diff --git a/app/assets/stylesheets/mobile/groups.scss b/app/assets/stylesheets/mobile/groups.scss
new file mode 100644
index 00000000000..a7e6df7af16
--- /dev/null
+++ b/app/assets/stylesheets/mobile/groups.scss
@@ -0,0 +1,16 @@
+.groups-page {
+  h1 {
+    margin-top: 20px;
+  }
+
+  .groups-header-filters {
+    display: block;
+    float: none;
+  }
+
+  .groups-header-filters-name,
+  .groups-header-filters-type, 
+  .groups-header-new {
+    margin-top: 10px;
+  }
+}
diff --git a/app/assets/stylesheets/mobile/header.scss b/app/assets/stylesheets/mobile/header.scss
index e33cbf3c350..30f480f94b3 100644
--- a/app/assets/stylesheets/mobile/header.scss
+++ b/app/assets/stylesheets/mobile/header.scss
@@ -2,9 +2,12 @@
 // Discourse header
 // --------------------------------------------------
 
+#site-text-logo {
+  font-size: $font-up-3;
+}
 @media only screen and (max-width: 320px) {
   #site-text-logo {
-    font-size: 1.286em;
+    font-size: $font-up-2;
   }
 }
 
@@ -34,10 +37,9 @@
 }
 
 .d-header-icons {
-  .badge-notification {
-    top: -5px;
+  .d-icon {
+    line-height: $line-height-medium;
   }
-
   .active .icon {
     &:after { margin-top: -1px; }
   }
@@ -52,5 +54,5 @@
 }
 
 .search-link .topic-statuses .topic-status i {
-  font-size: 1em;
+  font-size: $font-0;
 }
diff --git a/app/assets/stylesheets/mobile/history.scss b/app/assets/stylesheets/mobile/history.scss
index 395f8ca956f..bae7149be0e 100644
--- a/app/assets/stylesheets/mobile/history.scss
+++ b/app/assets/stylesheets/mobile/history.scss
@@ -6,15 +6,17 @@
     display: none;
   }
   #revision-numbers {
-    line-height: 2em;
-  }
-  #revision-details {
-    background-color: $primary-low; 
-    padding: 5px;
-    margin-top: 10px;
+    line-height: $line-height-large;
   }
   img {
     max-width: 95%;
     height: auto;
   }
+  .revision-content {
+    table {
+      table-layout: fixed;
+      width: 100%;
+      word-wrap: break-word;
+    }
+  }
 }
diff --git a/app/assets/stylesheets/mobile/login.scss b/app/assets/stylesheets/mobile/login.scss
index 7079f656043..77e32ca9d81 100644
--- a/app/assets/stylesheets/mobile/login.scss
+++ b/app/assets/stylesheets/mobile/login.scss
@@ -1,71 +1,153 @@
-// style that apply to the login popup
+// shared styles
+// used in both login and
+// create account modals
+.login-modal,
+.create-account {
 
-.btn-social {
-  width: 150px;
-  font-size: 1.143em;
-  overflow: hidden;
-  white-space: nowrap;
-}
-
-#login-buttons {
-  button {
-    margin: 0 0 5px 0;
+  .modal-inner-container {
+    max-width: 350px;
   }
-  display: inline-block;
-}
 
-#login-form {
-  a {
-    color: dark-light-choose($primary-high, $secondary-low);
+  .close {
+    padding: 0;
   }
-  label { float: left; display: block; }
-  textarea, input, select {
-    font-size: 1.143em;
-    clear: left;
-    margin-top: 0;
+
+  #login-buttons:not(.hidden) {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+    width: 102%;
+    padding-bottom: 10px;
+    margin-left: -2%;
+    
+    button {
+      flex: 1 1 48%; 
+      max-width: 50%;
+      margin: 1% 0 1% 2%;
+      font-size: $font-up-1;
+      white-space: nowrap;
+      @media screen and (max-width: 360px) {
+        font-size: $font-0;
+      }
     }
-  td { padding: 4px; }
-}
 
-a#new-account-link { white-space:nowrap; }
+    + #login-form {
+      border-top: 1px solid $primary-low;
+    }
+  }
 
-// Create account
+  form {
+    display: flex;
+    justify-content: center;
+  }
 
-#new-account-link {
-  cursor: pointer;
-}
+  table {
+    width: 100%;
+    padding: 10px;
+  }
 
-a#forgot-password-link {clear: left; float: left; }
+  tr {
+    &.input td label {
+      margin-top: 0.75em;
+    }
 
-.login-modal, .create-account {
-  .btn-primary {
-    margin-bottom: 10px;
-    float: left;
+    &:not(.instructions) td {
+      padding: 2px 0 0 0;
+    }
+
+    &:not(.password-confirmation) {
+      display: flex;
+      flex-direction: column;
+    }
+  }
+
+  .tip {
+    &:not(:empty) + td {
+      display: none;
+    }
+  }
+
+  .modal-body input[type="text"],
+  .modal-body input[type="email"],
+  .modal-body input[type="password"] {
+    margin-top: 0;
+    width: 100%;
+    box-sizing: border-box;
+  }
+
+  .modal-footer {
+    box-sizing: border-box;
+    margin: 0 auto;
+    font-size: $font-down-1;
+  }
+
+  .alert.alert-error {
+    padding: 0.5em 1em;
+    margin: 0;
+  }
+
+  #new-account-link {
+    white-space: nowrap;
   }
 }
 
+// Styles for the
+// login modal only
+.d-modal.login-modal {
+  #credentials {
+    width: 100%;
+    tr {
+      display: flex;
+      flex-direction: column;
+    }
+  }
 
-$label-width: 85px;
-$input-width: 184px;
+  #login-form {
+    margin-bottom: 0.75em;
+    td {
+      padding: 0;
+      width: 100%;
+      margin: 0 auto;
+    }
 
+    label {
+      float: left;
+      display: block;
+    }
+    textarea,
+    input,
+    select {
+      font-size: $font-up-1;
+      clear: left;
+      margin-top: 0;
+    }
+  }
+
+  tr {
+    td label {
+      margin-top: 0.75em;
+      padding: 4px 0;
+    }
+  }
+}
+
+// styles for the
+// create account
+// modal only
 .create-account .modal-body {
-  input[type=text], input[type=email], input[type=password] {
-    display: inline-block;
-    margin-bottom: 5px;
-    margin-top: 10px;
-    width: $input-width;
-  }
-
+  display: flex;
+  flex-direction: column;
   tr.instructions {
     label {
       color: dark-light-choose($primary-medium, $secondary-medium);
     }
   }
 
-  tr.input {
-    td.label {
-      width: $label-width;
-    }
+  #login-buttons + .login-form {
+      border-top: 1px solid $primary-low;
+  }
+  .login-form {
+    margin-bottom: 0.75em;
   }
 }
 
@@ -73,31 +155,17 @@ $input-width: 184px;
   .user-fields {
     margin-top: 10px;
     padding-top: 15px;
-    border-top: 1px solid #e9e9e9;
+    border-top: 1px solid $primary-low;
   }
 
   .user-field.confirm {
     margin-top: 10px;
     margin-bottom: 10px;
   }
-  
-  .user-field {
-    label {
-      width: $label-width;
-    }
-
-    input[type=text] {
-      margin-top: 0;
-      width: $input-width;
-    }
-    .controls {
-      margin-left: $label-width;
-    }
-  }
 }
 
-
-.password-reset, .invites-show {
+.password-reset,
+.invites-show {
   margin-top: 30px;
   .col-image {
     padding-top: 12px;
@@ -128,7 +196,6 @@ $input-width: 184px;
   }
 }
 
-
 .invites-show {
   .col-image {
     display: none;
diff --git a/app/assets/stylesheets/mobile/menu-panel.scss b/app/assets/stylesheets/mobile/menu-panel.scss
deleted file mode 100644
index 972ea30ab2a..00000000000
--- a/app/assets/stylesheets/mobile/menu-panel.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-.menu-panel {
-  span.badge-category {
-    max-width: 85px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-}
diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss
index 7c4e4305c37..8c5f55e3e65 100644
--- a/app/assets/stylesheets/mobile/modal.scss
+++ b/app/assets/stylesheets/mobile/modal.scss
@@ -10,18 +10,8 @@
 
 // Hardcode to be the same as before for now. I would recommend not using bootbox, or finding a way so the html structure can be the same
 .bootbox.modal {
-  position: fixed;
   top: 10%;
-  z-index: 1050;
-  overflow: auto;
   width: 100%;
-  height: auto;
-  background-color: $secondary;
-  border: 1px solid rgba(0, 0, 0, 0.3);
-
-  @include border-radius-all (6px);
-  box-shadow: 0 3px 7px rgba(0,0,0, 0.3);
-  background-clip: padding-box;
 }
 
 .modal.fade {
@@ -32,39 +22,24 @@
   top: 50%;
 }
 .modal-body {
-  overflow-y: auto;
-  max-height: 400px;
   padding: 10px;
 }
 
 // we need a little extra room on mobile for the
 // stuff inside the footer to fit
 .modal-footer {
-  padding-left: 7px;
-  padding-right: 7px;
-}
-
-.modal-footer .btn + .btn {
-  margin-left: 5px;
-  margin-bottom: 0;
-}
-
-.modal-close {
-  display: inline-block;
-  float: right;
+  padding: 10px
 }
 
 .modal-header {
-  padding: 10px 0px 10px 10px;
-
+  padding: 10px;  
   h3 {
-    display: inline;
-    font-size: 1.286em;
-    margin: 0px;
+    font-size: $font-up-2;
   }
 }
+
 .close {
-  font-size: 1.857em;
+  font-size: $font-up-4;
   padding: 10px 15px 5px 5px;
   color: $primary;
 }
@@ -93,27 +68,12 @@
   }
 }
 
-.flag-modal {
-  max-height: 450px;
-}
-
 @media only screen and (max-device-width: 568px) {
   .modal .flag-modal .flag-message {
-    height: 1.2em;
+    height: 3em;
   }
 }
 
-.custom-message-length {
-  margin: -4px 0 10px 20px;
-  color: dark-light-choose($primary-high, $secondary-low);
-  font-size: .857em;
-}
-
-.flag-message {
-  margin-left: 20px;
-  width: 95% !important;
-}
-
 .edit-category-modal {
   .modal-body {
     box-sizing: border-box;
@@ -123,19 +83,6 @@
   &.small .modal-body {
     height: 310px;
   }
-  .secure-category-options {
-    margin: 10px 0 0 16px;
-    .badge-list {
-      margin: 10px 0;
-      li {
-        margin: 0 4px 8px 0;
-        a {
-          color: #888;
-          cursor: pointer;
-        }
-      }
-    }
-  }
 
   .disable_info_wrap .cannot_delete_reason {
     top: -114px;
@@ -144,18 +91,6 @@
   }
 }
 
-.tabbed-modal {
-  .modal-body {
-    position: relative;
-    height: 350px;
-  }
-}
-
-
-.modal-tab {
-  position: absolute;
-}
-
 /* fixes for the new account confirm dialog on mobile */
 
 .modal-inner-container {
diff --git a/app/assets/stylesheets/mobile/push-notifications-mobile.scss b/app/assets/stylesheets/mobile/push-notifications-mobile.scss
new file mode 100644
index 00000000000..3d538d62b9b
--- /dev/null
+++ b/app/assets/stylesheets/mobile/push-notifications-mobile.scss
@@ -0,0 +1,3 @@
+.push-notification-prompt .consent_banner {
+  margin-bottom: 30px;
+}
diff --git a/app/assets/stylesheets/mobile/search.scss b/app/assets/stylesheets/mobile/search.scss
index bb4ea638c3f..b27a8d326f0 100644
--- a/app/assets/stylesheets/mobile/search.scss
+++ b/app/assets/stylesheets/mobile/search.scss
@@ -1,42 +1,43 @@
-.search button.btn-primary, .search button.btn {
-  float: none;
-}
+.search-container {
+  flex-direction: column;
+  margin-top: .5em;
 
-.search-advanced {
-  .search-advanced-options {
-    .control-group {
-      padding-bottom: 10px;
+  .search-advanced {
+    order: 1;
+    width: 100%;
 
-      &.pull-left {
-        float: none;
-        width: auto;
-      }
+    .search-info {
+      flex-direction: column;
+      align-items: left;
+      justify-content: center;
 
-      .controls {
-        label {
-          display: block;
-          margin-bottom: 5px;
-        }
+      .sort-by {
+        display: flex;
+        align-items: center;
+        margin-top: .5em;
+        margin-left: 0;
+        width: 100%;
 
-        input:not([type="checkbox"]),select {
-          width: 75%;
+        .select-kit {
+          flex: 1 1 auto;
         }
       }
     }
   }
-}
 
-.search.row {
-  margin-top: 5px;
-}
+  .search-notice {
+    margin-top: 1em;
+  }
 
-.search.row input.search {
-  height: 25px;
-  width: 69%;
-}
+  .search-advanced-sidebar {
+    order: 0;
+    width: 100%;
+    margin: 0;
 
-.fps-search-context {
-  margin-bottom: 15px;
+    .tag-chooser {
+      width: 100%;
+    }
+  }
 }
 
 .fps-topic {
diff --git a/app/assets/stylesheets/mobile/select-kit/category-drop.scss b/app/assets/stylesheets/mobile/select-kit/category-drop.scss
new file mode 100644
index 00000000000..6205494dea3
--- /dev/null
+++ b/app/assets/stylesheets/mobile/select-kit/category-drop.scss
@@ -0,0 +1,17 @@
+.select-kit {
+  &.combo-box {
+    &.category-drop {
+      .category-drop-header {
+        font-size: $font-0;
+
+        .d-icon {
+          font-size: $font-0;
+        }
+      }
+
+      .select-kit-row {
+        font-weight: normal;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss
new file mode 100644
index 00000000000..1853c4e2308
--- /dev/null
+++ b/app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss
@@ -0,0 +1,8 @@
+.select-kit {
+  &.dropdown-select-box {
+    .select-kit-collection {
+      max-height: 200px;
+      overflow-y: scroll;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/mobile/select-kit/tag-drop.scss b/app/assets/stylesheets/mobile/select-kit/tag-drop.scss
new file mode 100644
index 00000000000..9f2dfbd55f8
--- /dev/null
+++ b/app/assets/stylesheets/mobile/select-kit/tag-drop.scss
@@ -0,0 +1,17 @@
+.select-kit {
+  &.combo-box {
+    &.tag-drop {
+      .tag-drop-header {
+        font-size: $font-0;
+
+        .d-icon {
+          font-size: $font-0;
+        }
+      }
+
+      .select-kit-row {
+        font-weight: normal;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss
index 2fe9e9bb303..e9ba6a16792 100644
--- a/app/assets/stylesheets/mobile/topic-list.scss
+++ b/app/assets/stylesheets/mobile/topic-list.scss
@@ -6,52 +6,121 @@
 // --------------------------------------------------
 
 .list-controls {
+  margin: 10px -3px 5px -3px;  
   .category-breadcrumb.hidden {
     display: none;
   }
-  margin: 5px 0;
-  .nav {
-    float: left;
-    margin-right: 15px;
-    li {
-      margin-top: 5px;
+
+  .container {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    #create-topic {
+      box-sizing: border-box;
+      display: flex;
+      align-self: stretch;
+      margin: 0 3px 10px 3px;   
+      order: 10; // always last for consistent placement      
     }
   }
-  .btn {
-    float: right;
-    margin-left: 8px;
-    margin-top: 5px;
+
+  .dropdown-select-box-header {
+    display: flex;
+    height: 100%;
   }
-  .nav-pills {
-    position: relative;
-  }
-  .nav-pills .drop {
-    border: 1px solid $primary-low;
-    position: absolute;
-    z-index: 1000;
-    background-color: $secondary;
-    padding: 0 10px 10px 10px;
-    width: 150px;
-    top: 100%;
-    margin: 0;
-    li {
-      list-style-type: none;
-      margin-left: 0;
-      margin-top: 5px;
-      padding-top: 10px;
-      a {
-        width: 100%;
-        display: inline-block;
+
+  .navigation-container {
+    display: flex;
+    flex-wrap: wrap;
+    width: 100%;
+    margin: 5px 0;
+  
+    button {
+      margin: 0 3px;
+     
+      &.select-kit-header {
+        display: flex;
+        height: 100%;
+        flex: 1 1 auto;
       }
     }
-
   }
-  .nav-pills > li {
-    background: $primary-low;
-    .d-icon-caret-down {
-      margin-left: 8px;
+
+  .select-kit {
+    display: flex;
+    align-self: stretch;    
+    margin-bottom: 10px;
+  }
+  
+  .btn:not(.select-kit-header) {
+    margin-bottom: 10px;
+  }
+
+  .categories-admin-dropdown, .tag-notifications-button {
+    order: 2; // after main nav
+  }
+
+  .category-navigation {
+    display: flex;
+    flex-wrap: wrap;
+    width: 100%;
+    .edit-category {
+      i {
+        margin: 0;
+      }
+      @media screen and (max-width: 374px) { // Hide edit label on very tiny screens
+        .d-button-label {
+          display: none;
+        }
+      }
     }
   }
+
+  .nav-pills {
+    display: flex;
+    flex: 1 1 auto;
+    margin: 0 3px 5px 3px;
+    position: relative;
+    .navigation-toggle {
+      flex: 0 1 auto;
+      margin-bottom: 5px;
+    }
+    >li {
+      margin-right: 0;
+      background: $primary-low;
+      font-size: $font-down-1;
+    }
+    >li>a {
+      line-height: $line-height-large;
+      display: flex;
+      align-items: center;
+      .d-icon {
+        margin-left: 5px;
+      }
+    }
+    .drop {
+      border: 1px solid $primary-low;
+      position: absolute;
+      z-index: z("dropdown");
+      background-color: $secondary;
+      padding: 0 10px 10px 10px;
+      width: 150px;
+      top: 100%;
+      margin: 0;
+      left: 0; // iOS6 alignment
+      li {  
+        list-style-type: none;
+        margin-left: 0;
+        margin-top: 5px;
+        padding-top: 10px;
+        a {
+          width: 100%;
+          display: inline-block;
+        }
+      }
+    }
+  }
+  
 }
 
 .list-container .full-width {
@@ -67,12 +136,6 @@
     margin-left: 55px;
   }
 
-  > tbody > tr {
-    &.highlighted {
-      animation: background-fade-highlight 2.5s ease-out;
-    }
-  }
-
   th,
   td {
     padding: 7px 0;
@@ -84,8 +147,9 @@
 
   .badge-notification, .category-topic-link td.num .badge-notification {
     position: relative;
+    display: inline;
     top: -1px;
-    font-size: 1em;
+    font-size: $font-down-1;
     padding: 4px 6px 3px 6px;
     i {color: $secondary;}
 
@@ -105,7 +169,6 @@
   }
 
   .topic-item-stats {
-    margin-top: 8px;
     .category, .num, .last-poster {
       float: left;
     }
@@ -140,17 +203,16 @@
     vertical-align: top;
   }
 
+  th {
+    padding: 10px 0 0;
+  }
+
   td:first-of-type {
     padding-left: 10px;
   }
 
   tbody {
-    tr {
-      border-bottom: 1px solid $primary-low;
-      &:first-of-type {
-        border-top: 3px solid $primary-low;
-      }
-    }
+
     .category {
       border-left: 6px solid;
     }
@@ -158,6 +220,9 @@
 }
 
 .category-list-item.category {
+  tr:first-of-type {
+    border: none;
+  }
   // Allow percentage widths on table cells to include their padding
   box-sizing: border-box;
   *, *:before, *:after {
@@ -175,8 +240,10 @@
 }
 
 tr.category-topic-link {
-  border-top: darken($secondary, 3%) 1px solid;
-  border-bottom: darken($secondary, 3%) 1px solid;
+  border-bottom: 1px solid $primary-low;
+  &:last-of-type {
+    border-bottom: none;
+  }
 }
 
 .topic-list.categories {
@@ -217,12 +284,13 @@ tr.category-topic-link {
 }
 
 .category-list-item {
-
+  padding: 5px 0 2px;
   border-left: 6px solid;
+  border-top: 1px solid;
 
   h3 {
     display: inline-block;
-    font-size: 1.286em;
+    font-size: $font-up-2;
     margin: 0 0 0 10px;
     i {
       margin-right: 5px;
@@ -232,12 +300,16 @@ tr.category-topic-link {
     }
   }
 
+  .category-name {
+    max-width: 80vw;
+  }
+
   .category-topic-link .main-link, .subcategories-list td, .category-description td {
     padding-left: 10px;
   }
 
   .category-topic-link .main-link .age {
-    font-size: 0.857em;
+    font-size: $font-down-1;
   }
 
   .category-description td {
@@ -276,14 +348,14 @@ tr.category-topic-link {
     float: left;
   }
   > footer {
-    border-top: 0;
+    border-top: 1px solid $primary-low;
     padding: 7px 10px;
     figure {
       float: left;
       margin: 3px 7px 0 0;
       color: dark-light-choose($primary, $secondary-low);
       font-weight: bold;
-      font-size: 0.857em;
+      font-size: $font-down-1;
     }
     figcaption {
       display: inline;
@@ -309,12 +381,6 @@ tr.category-topic-link {
 
 // Misc. stuff
 // --------------------------------------------------
-.list-controls {
-  .category-dropdown-button {
-    padding: 4px 10px 4px 8px;
-  }
-}
-
 .btn-group .dropdown-toggle:active,
 .btn-group.open .dropdown-toggle {
   outline: 0;
@@ -342,7 +408,7 @@ tr.category-topic-link {
   position: relative;
   top: 100%;
   left: 0;
-  z-index: 1000;
+  z-index: z("dropdown");
   display: none;
   float: left;
   width: 280px;
@@ -351,7 +417,7 @@ tr.category-topic-link {
   background-color: $secondary;
   border: 1px solid dark-light-choose(rgba(0, 0, 0, 0.2), $primary);
   border-radius: 5px;
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  box-shadow: shadow("dropdown");
   background-clip: padding-box;
   margin: 1px 0 20px;
   .title {font-weight: bold; display: block;}
@@ -361,7 +427,7 @@ tr.category-topic-link {
   padding: 3px 15px;
   clear: both;
   font-weight: normal;
-  line-height: 18px;
+  line-height: $line-height-medium;
   color: $primary;
 }
 .dropdown-menu li > a:hover,
@@ -384,15 +450,19 @@ tr.category-topic-link {
 }
 
 ol.category-breadcrumb {
-  margin: 5px 10px 0 0;
-}
-
-.category-dropdown-menu {
-  height: 200px;
-
-  a.badge-category {
-    line-height: 26px !important;
-    margin-bottom: 0 !important;
+  margin: 0 0 5px 0;
+  display: flex;
+  flex-wrap: wrap;
+  flex: 1 1 100%;
+  li.select-kit {
+    flex: 1 1 33%;
+    margin: 0 3px 5px 3px;
+    .select-kit-header .selected-name  {   
+      max-width: 80vw;
+      .badge-wrapper {
+        max-width: 100%;
+      }
+    }
   }
 }
 
@@ -406,6 +476,10 @@ ol.category-breadcrumb {
   display: none;
 }
 
+.staff.tags-page #create-topic {
+  clear: right;
+}
+
 .topic-list-bottom h3 {
   clear:both;
   padding-top:10px;
@@ -434,7 +508,7 @@ td .main-link {
 }
 .topic-list {
   .posts-map {
-    font-size: 1.143em;
+    font-size: $font-up-1;
   }
   // so the topic excerpt is full width
   // as the containing div is 80%
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 49ec7ce78e9..2a45dc766a4 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -3,9 +3,15 @@
   border-top: none;
 }
 
+.time-gap {
+  .topic-avatar {
+    display: none;
+  }
+}
+
 .topic-post article {
   border-top: 1px solid $primary-low;
-  padding: 8px 0;
+  padding: 15px 0 8px 0;
 }
 
 .post-stream {
@@ -20,24 +26,58 @@ span.badge-posts {
   display: none;
 }
 
-.who-liked {
-  margin-left: 10px;
-}
-
 .topic-post {
   nav.post-controls {
-    clear: both;
-    color: dark-light-choose($primary-low-mid, $secondary-high);        
+    color: dark-light-choose($primary-low-mid, $secondary-high);
+
+    .actions {
+      display: flex;
+    }
+
+    .like-button {
+      display: flex;
+      flex: 0 1 auto;
+      button {
+        &.like {
+          flex: 1 1 auto;          
+        }
+        &.like-count {
+          padding: 8px 4px 8px 8px;
+          line-height: 1.2;
+
+          &.regular-likes {
+            margin-right: 0;
+          }
+          &.my-likes {
+            display: flex;
+            align-items: baseline;
+            max-width: unset;
+            margin-right: 0;
+            padding: 8px 9px 8px 8px;
+            i {
+              padding-left: 8px;
+            }
+          }
+        }
+        .d-icon {
+          line-height: $line-height-medium;
+        }
+      }
+      button.like-count + button.toggle-like {
+        padding: 8px 9px 8px 4px;
+      }  
+    }
+
     .d-icon {
       opacity: 1.0;
     }
     button {
       border: none;
-      font-size: 1.286em;
-      padding: 8px 10px;
-      vertical-align: top;
+      font-size: $font-up-1;
+      padding: 10px 8px;
       background: transparent;
-      float: left;
+      flex: 1 1 auto;
+      max-width: 45px;
       &.hidden {
         display: none;
       }
@@ -48,8 +88,8 @@ span.badge-posts {
         margin:10px 0 10px 0;
       }
       &.reply {
-        float: right;
-        color: $primary-high;        
+        color: $primary-high;
+        margin-left: auto;
       }
       &.has-like {
         color: $love;
@@ -59,21 +99,9 @@ span.badge-posts {
       }
     }
 
-    button.like-count {
-      font-size: 1em;
-      padding: 8px 4px;
-    }
   }
 }
 
-
-/* shift post reply button to the right and make it black */
-.post-controls button.create {
-  float: right;
-  color: dark-light-choose($primary-high, $secondary-low);
-}
-
-
 .post-admin-menu {
   background-color: $secondary;
   width: 205px;
@@ -83,12 +111,12 @@ span.badge-posts {
   text-align: left;
   bottom: 0;
   left: 135px;
-  z-index: 1000;
+  z-index: z("dropdown");
 
   h3 {
     margin-top: 0;
     color: $primary;
-    font-size: 1em;
+    font-size: $font-0;
   }
 
   ul {
@@ -129,10 +157,11 @@ span.badge-posts {
 }
 
 a.reply-to-tab {
-  position: absolute;
-  z-index: 400;
+  z-index: z("base") + 1;
   right: 80px;
   color: dark-light-choose($primary-medium, $secondary-medium);
+  margin: -3px 10px 0 0;
+  float: right;
 }
 
 .topic-post .boxed .contents {
@@ -140,31 +169,10 @@ a.reply-to-tab {
 }
 
 .topic-map {
-
   margin: 10px 0;
-  background: blend-primary-secondary(5%);
-  border: 1px solid $primary-low;
-  border-top: none; // would cause double top border
-
-  section {
-    border-top: 1px solid $primary-low;
-  }
-
-  h3 {
-    margin-bottom: 4px;
-    margin-top: 0;
-    color: dark-light-choose($primary-medium, $secondary-medium);
-    line-height: 23px;
-    font-weight: normal;
-    font-size: 1em;
-  }
 
   h4 {
-    margin: 0 0 3px 0;
-    color: dark-light-choose($primary-medium, $secondary-medium);
-    font-weight: normal;
-    font-size: 0.857em;
-    line-height: 15px;
+    line-height: $line-height-medium;
   }
 
   .user {
@@ -172,34 +180,6 @@ a.reply-to-tab {
     margin-right: 10px;
   }
 
-  ul {
-    margin: 0;
-    list-style: none;
-  }
-
-  .avatars {
-    > div {
-      float: left;
-      position: relative;
-      margin: 3px 0;
-    }
-    .post-count {
-      position: absolute;
-      right: 0;
-      border-radius: 100px;
-      padding: 4px 5px 2px 5px;
-      text-align: center;
-      font-weight: normal;
-      font-size: .857em;
-      line-height: 1;
-    }
-  }
-
-  .avatar {
-    float: left;
-    margin-right: 4px;
-  }
-
   .map-collapsed {
     .secondary {
       display: none;
@@ -214,12 +194,12 @@ a.reply-to-tab {
         border-right: 0;
       }
     }
-    a, .number {
-      line-height: 20px;
+    .number {
+      line-height: $line-height-medium;
     }
     .number, i {
       color: dark-light-choose($primary-high, $secondary-low);
-      font-size: 1.143em;
+      font-size: $font-up-1;
     }
 
     .avatar + a {
@@ -231,42 +211,31 @@ a.reply-to-tab {
   }
 
   .links, .information, .avatars {
-    padding: 7px 10px;
+    padding: 10px;
     color: $primary;
     overflow: auto;
   }
 
+  .information {
+    p {
+      margin: 0 0 10px 0;
+    }
+  }
+
   .participants { // PMs //
     .user {float: left; margin: 0 10px 10px 0;}
   }
 
-  .domain {
-    color: dark-light-choose($primary-low-mid, $secondary-high);
-  }
-
-  .topic-links {
-    .badge-notification {
-      margin: 1px 5px 2px 0;
-    }
-  }
-
-  td {
-    vertical-align: top;
-    padding:1px;
-  }
-
   .buttons {
-    float: right;
     .btn {
       border: 0;
       padding: 0 15px;
       color: dark-light-choose($primary-medium, $secondary-high);
       background: blend-primary-secondary(5%);
       border-left: 1px solid $primary-low;
-      border-top: 1px solid $primary-low;
       .fa {
         margin: 0;
-        font-size: 1.286em;
+        font-size: $font-up-2;
         line-height: 52px;
       }
     }
@@ -312,7 +281,7 @@ a.reply-to-tab {
     }
 
    a.badge-category, a.badge-category-parent {
-    font-size: 0.857em;
+    font-size: $font-down-1;
     vertical-align: top;
     }
 }
@@ -328,12 +297,11 @@ span.post-count {
   .btn {
     margin-bottom: 5px;
     margin-right: 10px;
-    .d-icon-star {margin-right: 5px;}
   }
 }
 
 #topic-title {
-  z-index: 1000;
+  z-index: z("base") + 1;
   margin: 0 0 0 0 !important;
   padding: 15px 0;
 }
@@ -347,13 +315,11 @@ span.post-count {
 // this prevents image overflow on deeply nested blockquotes, lists, etc
 .cooked {
   overflow: hidden;
-  font-size: $base-font-size + 1; /* let's bump post body font size on mobile slightly */
-  line-height: $base-line-height + 2; /* bump up line height to match increased font */
 }
 
 .quote-button.visible {
   display: block;
-  z-index: 936;
+  z-index: z("tooltip");
 }
 
 iframe {
@@ -421,7 +387,7 @@ iframe {
 button.select-post {
   display: inline-block;
   position: absolute;
-  z-index: 401; // 400 is the reply-to tab
+  z-index: z("base") + 1;
   left: 200px;
   background-color: srgb-scale($tertiary, $secondary, 60%);
   color: $secondary;
@@ -444,7 +410,7 @@ button.select-post {
 }
 
 .deleted-user-avatar {
-  font-size: 2.286em;
+  font-size: $font-up-5;
 }
 
 span.btn-text {display: none;}
@@ -456,6 +422,10 @@ blockquote {
   margin-right: 0;
 }
 
+.gap {
+  padding: 0.25em 0;
+}
+
 .gutter { display: none; }
 
 .posts-wrapper {  position: relative; }
@@ -466,15 +436,15 @@ span.highlighted {
 
 .topic-avatar {
   float: left;
-  padding-top: 5px;
-  z-index:999; /* must render on top of topic-body + topic-meta-data, otherwise not tappable */
+  margin-right: 10px;
+  z-index: z("base") + 1; /* must render on top of topic-body + topic-meta-data, otherwise not tappable */
 }
 
 .topic-meta-data {
   margin-left: 50px;
+  font-size: $font-down-1;
   .names {
-    margin: 5px 0 0 5px;
-    line-height: 17px;
+    line-height: $line-height-medium;
 
     .poster-icon {
       float: right;
@@ -482,7 +452,6 @@ span.highlighted {
   }
   .post-info {
     float: right;
-    margin: 4px 10px 0 0;
     .edits { margin-right: 5px; }
   }
 }
@@ -507,8 +476,6 @@ span.highlighted {
   margin-right: auto;
   width: calc(100% - 50px);
   a {
-    float: right;
-    text-decoration: underline;
     margin-top: 7px;
   }
   button {
diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss
index d5f302d1794..4281d322b8e 100644
--- a/app/assets/stylesheets/mobile/topic.scss
+++ b/app/assets/stylesheets/mobile/topic.scss
@@ -17,8 +17,8 @@
   //margin-bottom: 20px;
   margin: 0 60px 10px 0;
   h1 {
-    font-size: 1.429em;
-    line-height: 1.25;
+    font-size: $font-up-3;
+    line-height: $line-height-medium;
     a {
       color: $primary;
       vertical-align: middle;
@@ -31,42 +31,36 @@
   .private-message-glyph { display: none; }
 }
 
-.private-message-glyph { color: dark-light-choose($primary-low-mid, $secondary-high); }
 .private_message #topic-title .private-message-glyph { display: inline; }
 
-
 /* both blocks that appear under the standard post control buttons */
 .notification-options, .pinned-options {
   float: left;
-  margin-top: 0px;
+  margin-top: 0;
   padding-top: 1px;
   clear: both;
 }
 
 .topic-status-info {
   padding-left: 10px;
-  border-top: 1px solid $primary-low; 
+  border-top: 1px solid $primary-low;
   padding-top: 10px;
   h3 {
     margin: 0;
   }
 }
 
-.docked #topic-progress {
-  box-shadow: 0 0 3px rbga(0,0,0, .5);
-}
-
 #topic-progress-wrapper {
   position: fixed;
   width: 0;
   right: 0;
   bottom: 0;
-  z-index: 950;
+  z-index: z("timeline");
   margin-right: 148px;
 }
 
 #topic-progress-expanded {
-  border: 1px solid $primary-low; 
+  border: 1px solid $primary-low;
   padding: 5px;
   background: $secondary;
 
@@ -81,7 +75,7 @@
       display: block;
       margin-top: 2px;
       margin-bottom: 2px;
-      font-size: 1.286em;
+      font-size: $font-up-2;
     }
   }
   .jump-form {
@@ -90,7 +84,7 @@
       width: 45px;
       height: 20px;
       text-align: center;
-      font-size: 1.143em;
+      font-size: $font-up-1;
     }
     button.btn {
       float: right !important;
@@ -126,18 +120,18 @@
     top: 9px;
     width: 100%;
     text-align: center;
-    z-index: 1;
+    z-index: z("base");
   }
   h4 {
     display: inline;
-    font-size: 1.286em;
-    line-height: 15px;
+    font-size: $font-up-2;
+    line-height: $line-height-small;
   }
   .d-icon {
     position: absolute;
     right: 8px;
     bottom: 9px;
-    z-index: 1;
+    z-index: z("base");
   }
   .bg {
     position: absolute;
@@ -155,8 +149,8 @@
   width: 90%;
   margin-left: auto;
   margin-right: auto;
-  font-size: 1.857em;
-  line-height: 1.25;
+  font-size: $font-up-4;
+  line-height: $line-height-medium;
 
   .topic-retry {
     display: block;
@@ -172,10 +166,6 @@
 
 .topic-post:last-of-type {padding-bottom: 40px;}
 
-.heatmap-high {color: $danger !important;}
-.heatmap-med {color: $danger-medium !important;}
-.heatmap-low {color: $danger-low !important;}
-
 sup sup, sub sup, sup sub, sub sub { top: 0; }
 
 // inline editing of title on mobile
@@ -189,17 +179,12 @@ sup sup, sub sup, sup sub, sub sub { top: 0; }
     width: 100%;
     height: 32px;
   }
-
-  .select2-container {
-    box-sizing: border-box;
-    width: 100% !important;
-  }
   .btn-small {
-    padding: 8px 12px;
+    padding: 6px 12px;
     margin: 6px 6px 0 0;
   }
 
-  .select-box-kit.combo-box.category-chooser {
+  .select-kit.combo-box.category-chooser {
     width: 100%;
     margin-top: 0;
   }
@@ -207,9 +192,12 @@ sup sup, sub sup, sup sub, sub sub { top: 0; }
 
 // make mobile timeline top and bottom dates easier to select
 .topic-timeline {
-  .start-date, .now-date { 
-    font-size: 1.143em; 
-    padding: 5px; 
+  .start-date, .now-date {
+    font-size: $font-up-1;
+    padding: 5px;
+  }
+  .topic-category {
+    margin-bottom: .5rem;
   }
 }
 
@@ -223,4 +211,4 @@ sup sup, sub sup, sup sub, sub sub { top: 0; }
   .btn.pull-right {
     margin-right: 0;
   }
-}
\ No newline at end of file
+}
diff --git a/app/assets/stylesheets/mobile/upload.scss b/app/assets/stylesheets/mobile/upload.scss
index b9fb0582676..2d487d8013a 100644
--- a/app/assets/stylesheets/mobile/upload.scss
+++ b/app/assets/stylesheets/mobile/upload.scss
@@ -1,14 +1,35 @@
 .upload-selector {
   input[type="text"]{
-    width: 520px;
+    width: calc(100% - 20px);
   }
   input[type="file"] {
-    font-size: 1em;
-    line-height: 18px;
+    font-size: $font-0;
+    line-height: $line-height-medium;
   }
   .description {
     color: dark-light-choose($primary-medium, $secondary-medium);
   }
+  .radios {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    &:first-of-type {
+      margin-bottom: 1em;
+    }
+    input, label {
+      min-height: 20px;
+      line-height: $line-height-medium;
+      margin: 0;
+    }
+    .radio {
+      padding-left: 5px;
+    }
+    .inputs {
+      margin-top: 10px; 
+      width: 100%;
+    }
+  }
+
 }
 
 .uploaded-image-preview {
diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss
index 390d5ce4685..5ab0a5fc5d0 100644
--- a/app/assets/stylesheets/mobile/user.scss
+++ b/app/assets/stylesheets/mobile/user.scss
@@ -9,7 +9,7 @@
 }
 
 .user-main {
-
+margin-top: 10px;
   table.group-members {
     width: 100%;
     p {
@@ -77,18 +77,8 @@
     }
 
     .secondary {
-      background: $primary-low;
-
       dl {
-        display: flex;
-        flex-wrap: wrap;
-        align-items: center;
-        padding: 10px;
-
-      }
-
-      dd {
-        margin: 0 15px 0 5px;
+        padding: 5px 0;
       }
     }
 
@@ -97,11 +87,11 @@
 
       h1 {
         margin: 0;
-        line-height: 1;
+        line-height: $line-height-small;
       }
 
       h2 {
-        line-height: normal;
+        line-height: $line-height-medium;
       }
 
       .primary {
@@ -127,6 +117,10 @@
           max-width: 700px;
         }
       }
+
+      .user-profile-avatar .avatar-flair {
+        right: 2px;
+      }
     }
 
     .controls {
@@ -139,20 +133,20 @@
         display: flex;
         flex: 1 1 auto;
         flex-wrap: wrap;
-        
+
       }
 
       li {
         display: flex;
-        flex: 1 1 auto; 
-        margin: 0 5px;       
+        flex: 1 1 auto;
+        margin: 0 5px;
       }
 
       span {
         flex: 0 1 100%;
-        margin: 0 5px;               
+        margin: 0 5px;
       }
-      
+
       .user-profile-controls-outlet {
         margin: 0;
         li {
@@ -161,7 +155,7 @@
       }
 
       a {
-        flex: 1 1 auto;        
+        flex: 1 1 auto;
         min-width: 120px;
       }
     }
@@ -177,6 +171,9 @@
           }
         }
       }
+      .user-profile-avatar .avatar-flair {
+        bottom: 12px;
+      }
     }
   }
 
@@ -207,7 +204,7 @@
 }
 
 .stats-section {
-  li {    
+  li {
     margin: 0 15px 10px 0;
     padding: 0;
     &.linked-stat {
@@ -270,11 +267,12 @@
 
   .checkbox-label {
     display: flex;
-    overflow: auto;    
+    overflow: auto;
     width: 100%;
     padding: 5px 0;
     input {
       margin-right: 5px;
+      flex: 0 0 auto;
     }
   }
 
diff --git a/app/assets/stylesheets/vendor/bootstrap.scss b/app/assets/stylesheets/vendor/bootstrap.scss
index df21cf6c8a1..6ca0caca0cc 100644
--- a/app/assets/stylesheets/vendor/bootstrap.scss
+++ b/app/assets/stylesheets/vendor/bootstrap.scss
@@ -129,7 +129,6 @@ input[type="submit"].btn::-moz-focus-inner {
   margin: 1px 0 0;
   list-style: none;
   background-color: #ffffff;
-  border: 1px solid #ccc;
   border: 1px solid rgba(0, 0, 0, 0.2);
   border-radius: 5px;
   box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
@@ -190,11 +189,11 @@ body {
     line-height: 36px;
   }
   h2 {
-    font-size: 1.714em;
+    font-size: 1.7511em;
     line-height: 36px;
   }
   h3 {
-    font-size: 1.286em;
+    font-size: 1.3195em;
     line-height: 27px;
   }
   h4, h5, h6 {
@@ -213,7 +212,7 @@ body {
 
   // this removes the unwanted top margin on a paragraph under a heading
   h1+p, h2+p, h3+p, h4+p, h5+p, h6+p {
-    margin-top:0px;
+    margin-top:0;
   }
 
   blockquote {
@@ -228,7 +227,6 @@ body {
   label, input, button, select, textarea {
     font-size: 0.929em;
     font-weight: normal;
-    line-height: 18px;
   }
   input, button, select, textarea {
     font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
diff --git a/app/assets/stylesheets/vendor/normalize.scss b/app/assets/stylesheets/vendor/normalize.scss
index 22ed7c37949..b694193cd7f 100644
--- a/app/assets/stylesheets/vendor/normalize.scss
+++ b/app/assets/stylesheets/vendor/normalize.scss
@@ -132,7 +132,7 @@ dfn {
  */
 
 h1 {
-  font-size: 1.6em;
+  font-size: 1.7511em;
   margin: 0.67em 0;
 }
 
diff --git a/app/assets/stylesheets/vendor/select2.scss b/app/assets/stylesheets/vendor/select2.scss
deleted file mode 100644
index 2e2e4a5a07c..00000000000
--- a/app/assets/stylesheets/vendor/select2.scss
+++ /dev/null
@@ -1,578 +0,0 @@
-/*
-Version: @@ver@@ Timestamp: @@timestamp@@
-*/
-.select2-container {
-    margin: 0;
-    position: relative;
-    display: inline-block;
-    /* inline-block for ie7 */
-    zoom: 1;
-    vertical-align: middle;
-}
-
-.select2-container,
-.select2-drop,
-.select2-search,
-.select2-search input {
-  /*
-    Force border-box so that % widths fit the parent
-    container without overlap because of margin/padding.
-    More Info : http://www.quirksmode.org/css/box.html
-  */
-  -webkit-box-sizing: border-box; /* webkit */
-     -moz-box-sizing: border-box; /* firefox */
-          box-sizing: border-box; /* css3 */
-}
-
-.select2-container .select2-choice {
-    display: block;
-    height: 26px;
-    padding: 0 0 0 8px;
-    overflow: hidden;
-    position: relative;
-
-    border: 1px solid #aaa;
-    white-space: nowrap;
-    line-height: 26px;
-    color: #444;
-    text-decoration: none;
-
-    border-radius: 4px;
-
-    background-clip: padding-box;
-
-    -webkit-touch-callout: none;
-      -webkit-user-select: none;
-         -moz-user-select: none;
-          -ms-user-select: none;
-              user-select: none;
-
-    background-color: #fff;
-}
-
-.select2-container.select2-drop-above .select2-choice {
-    border-bottom-color: #aaa;
-
-    border-radius: 0 0 4px 4px;
-
-}
-
-.select2-container.select2-allowclear .select2-choice .select2-chosen {
-    margin-right: 42px;
-}
-
-.select2-container .select2-choice > .select2-chosen {
-    margin-right: 26px;
-    display: block;
-    overflow: hidden;
-
-    white-space: nowrap;
-
-    text-overflow: ellipsis;
-    float: none;
-    width: auto;
-}
-
-.select2-container .select2-choice abbr {
-    display: none;
-    width: 12px;
-    height: 12px;
-    position: absolute;
-    right: 24px;
-    top: 8px;
-
-    font-size: 1px;
-    text-decoration: none;
-
-    border: 0;
-    background: asset-url('select2.png') right top no-repeat;
-    cursor: pointer;
-    outline: 0;
-}
-
-.select2-container.select2-allowclear .select2-choice abbr {
-    display: inline-block;
-}
-
-.select2-container .select2-choice abbr:hover {
-    background-position: right -11px;
-    cursor: pointer;
-}
-
-.select2-drop-mask {
-    border: 0;
-    margin: 0;
-    padding: 0;
-    position: fixed;
-    left: 0;
-    top: 0;
-    min-height: 100%;
-    min-width: 100%;
-    height: auto;
-    width: auto;
-    opacity: 0;
-    z-index: 9998;
-    /* styles required for IE to work */
-    background-color: #fff;
-    filter: alpha(opacity=0);
-}
-
-.select2-drop {
-    width: 100%;
-    margin-top: -1px;
-    position: absolute;
-    z-index: 9999;
-    top: 100%;
-
-    background: #fff;
-    color: #000;
-    border: 1px solid #aaa;
-    border-top: 0;
-
-
-    -webkit-box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
-            box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
-}
-
-.select2-drop.select2-drop-above {
-    margin-top: 1px;
-    border-top: 1px solid #aaa;
-    border-bottom: 0;
-
-
-    -webkit-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
-            box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
-}
-
-.select2-drop-active {
-    border: 1px solid #5897fb;
-    border-top: none;
-}
-
-.select2-drop.select2-drop-above.select2-drop-active {
-    border-top: 1px solid #5897fb;
-}
-
-.select2-drop-auto-width {
-    border-top: 1px solid #aaa;
-    width: auto;
-}
-
-.select2-drop-auto-width .select2-search {
-    padding-top: 4px;
-}
-
-.select2-container .select2-choice .select2-arrow {
-    display: inline-block;
-    width: 18px;
-    height: 100%;
-    position: absolute;
-    right: 0;
-    top: 0;
-
-    border-radius: 0 4px 4px 0;
-
-    background-clip: padding-box;
-
-}
-
-.select2-container .select2-choice .select2-arrow b {
-    display: block;
-    width: 100%;
-    height: 100%;
-    background: asset-url('select2.png') no-repeat 0 1px;
-}
-
-.select2-search {
-    display: inline-block;
-    width: 100%;
-    min-height: 26px;
-    margin: 0;
-    padding-left: 4px;
-    padding-right: 4px;
-
-    position: relative;
-    z-index: 10000;
-
-    white-space: nowrap;
-}
-
-//noinspection CssOverwrittenProperties
-.select2-search input {
-    width: 100%;
-    height: auto !important;
-    min-height: 26px;
-    padding: 4px 20px 4px 5px;
-    margin: 0;
-
-    outline: 0;
-    font-family: sans-serif;
-    font-size: 1em;
-
-    border: 1px solid #aaa;
-    border-radius: 0;
-
-    -webkit-box-shadow: none;
-            box-shadow: none;
-
-    background: #fff asset-url('select2.png') no-repeat 100% -22px;
-    background: asset-url('select2.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
-    background: asset-url('select2.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
-    background: asset-url('select2.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
-    background: asset-url('select2.png') no-repeat 100% -22px, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0;
-}
-
-.select2-drop.select2-drop-above .select2-search input {
-    margin-top: 4px;
-}
-
-//noinspection CssOverwrittenProperties
-.select2-search input.select2-active {
-    background: #fff asset-url('select2-spinner.gif') no-repeat 100%;
-    background: asset-url('select2-spinner.gif') no-repeat 100%, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
-    background: asset-url('select2-spinner.gif') no-repeat 100%, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
-    background: asset-url('select2-spinner.gif') no-repeat 100%, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
-    background: asset-url('select2-spinner.gif') no-repeat 100%, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0;
-}
-
-.select2-container-active .select2-choice,
-.select2-container-active .select2-choices {
-    border: 1px solid #5897fb;
-    outline: none;
-
-    -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, .3);
-            box-shadow: 0 0 5px rgba(0, 0, 0, .3);
-}
-
-.select2-dropdown-open .select2-choice {
-    border-bottom-color: transparent;
-    -webkit-box-shadow: 0 1px 0 #fff inset;
-            box-shadow: 0 1px 0 #fff inset;
-
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
-
-    background-color: #eee;
-}
-
-.select2-dropdown-open.select2-drop-above .select2-choice,
-.select2-dropdown-open.select2-drop-above .select2-choices {
-    border: 1px solid #5897fb;
-    border-top-color: transparent;
-}
-
-.select2-dropdown-open .select2-choice .select2-arrow {
-    background: transparent;
-    border-left: none;
-    filter: none;
-}
-.select2-dropdown-open .select2-choice .select2-arrow b {
-    background-position: -18px 1px;
-}
-
-.select2-hidden-accessible {
-    border: 0;
-    clip: rect(0 0 0 0);
-    height: 1px;
-    margin: -1px;
-    overflow: hidden;
-    padding: 0;
-    position: absolute;
-    width: 1px;
-}
-
-/* results */
-.select2-results {
-    max-height: 200px;
-    padding: 0 0 0 4px;
-    margin: 4px 4px 4px 0;
-    position: relative;
-    overflow-x: hidden;
-    overflow-y: auto;
-    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-}
-
-.select2-results ul.select2-result-sub {
-    margin: 0;
-    padding-left: 0;
-}
-
-.select2-results li {
-    list-style: none;
-    display: list-item;
-    background-image: none;
-}
-
-.select2-results li.select2-result-with-children > .select2-result-label {
-    font-weight: bold;
-}
-
-.select2-results .select2-result-label {
-    padding: 3px 7px 4px;
-    margin: 0;
-    cursor: pointer;
-
-    min-height: 1em;
-
-    -webkit-touch-callout: none;
-      -webkit-user-select: none;
-         -moz-user-select: none;
-          -ms-user-select: none;
-              user-select: none;
-}
-
-.select2-results-dept-1 .select2-result-label { padding-left: 20px }
-.select2-results-dept-2 .select2-result-label { padding-left: 40px }
-.select2-results-dept-3 .select2-result-label { padding-left: 60px }
-.select2-results-dept-4 .select2-result-label { padding-left: 80px }
-.select2-results-dept-5 .select2-result-label { padding-left: 100px }
-.select2-results-dept-6 .select2-result-label { padding-left: 110px }
-.select2-results-dept-7 .select2-result-label { padding-left: 120px }
-
-.select2-results li em {
-    background: #feffde;
-    font-style: normal;
-}
-
-.select2-results .select2-highlighted em {
-    background: transparent;
-}
-
-.select2-results .select2-highlighted ul {
-    background: #fff;
-    color: #000;
-}
-
-
-.select2-results .select2-no-results,
-.select2-results .select2-searching,
-.select2-results .select2-selection-limit {
-    background: #f4f4f4;
-    display: list-item;
-    padding-left: 5px;
-}
-
-/*
-disabled look for disabled choices in the results dropdown
-*/
-.select2-results .select2-disabled.select2-highlighted {
-    color: #666;
-    background: #f4f4f4;
-    display: list-item;
-    cursor: default;
-}
-.select2-results .select2-disabled {
-  background: #f4f4f4;
-  display: list-item;
-  cursor: default;
-}
-
-.select2-results .select2-selected {
-    display: none;
-}
-
-.select2-more-results.select2-active {
-    background: #f4f4f4 asset-url('select2-spinner.gif') no-repeat 100%;
-}
-
-.select2-more-results {
-    background: #f4f4f4;
-    display: list-item;
-}
-
-/* disabled styles */
-
-.select2-container.select2-container-disabled .select2-choice {
-  background: #f4f4f4 none;
-  border: 1px solid #ddd;
-  cursor: default;
-}
-
-.select2-container.select2-container-disabled .select2-choice .select2-arrow {
-  background: #f4f4f4 none;
-  border-left: 0;
-}
-
-.select2-container.select2-container-disabled .select2-choice abbr {
-    display: none;
-}
-
-
-/* multiselect */
-
-.select2-container-multi .select2-choices {
-    height: auto !important;
-    height: 1%;
-    margin: 0;
-    padding: 0 5px 0 0;
-    position: relative;
-    cursor: text;
-    overflow: hidden;
-}
-
-.select2-locked {
-  padding: 3px 5px 3px 5px !important;
-}
-
-.select2-container-multi .select2-choices {
-    min-height: 26px;
-}
-
-.select2-container-multi.select2-container-active .select2-choices {
-    border: 1px solid #5897fb;
-    outline: none;
-
-    -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, .3);
-            box-shadow: 0 0 5px rgba(0, 0, 0, .3);
-}
-.select2-container-multi .select2-choices li {
-    float: left;
-    list-style: none;
-}
-html[dir="rtl"] .select2-container-multi .select2-choices li
-{
-    float: right;
-}
-.select2-container-multi .select2-choices .select2-search-field {
-    margin: 0;
-    padding: 0;
-    white-space: nowrap;
-}
-
-.select2-container-multi .select2-choices .select2-search-field input {
-    padding: 5px 10px;
-    margin: 1px 0;
-
-    font-family: sans-serif;
-    font-size: 1em;
-    color: #666;
-    outline: 0;
-    border: 0;
-    -webkit-box-shadow: none;
-            box-shadow: none;
-    background: transparent !important;
-}
-
-.select2-container-multi .select2-choices .select2-search-field input.select2-active {
-    background: #fff asset-url('select2-spinner.gif') no-repeat 100% !important;
-}
-
-.select2-default {
-    color: #999 !important;
-}
-
-.select2-container-multi .select2-choices .select2-search-choice {
-    padding: 3px 5px 3px 18px;
-    margin: 3px 0 3px 5px;
-    position: relative;
-
-    line-height: 13px;
-    color: #333;
-    cursor: default;
-    border: 1px solid #aaaaaa;
-
-    border-radius: 3px;
-
-    -webkit-box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
-            box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
-
-    background-clip: padding-box;
-
-    -webkit-touch-callout: none;
-      -webkit-user-select: none;
-         -moz-user-select: none;
-          -ms-user-select: none;
-              user-select: none;
-
-    background-color: #e4e4e4;
-}
-html[dir="rtl"] .select2-container-multi .select2-choices .select2-search-choice
-{
-    margin-left: 0;
-    margin-right: 5px;
-}
-.select2-container-multi .select2-choices .select2-search-choice .select2-chosen {
-    cursor: default;
-}
-.select2-container-multi .select2-choices .select2-search-choice-focus {
-    background: #d4d4d4;
-}
-
-.select2-search-choice-close {
-    display: block;
-    width: 12px;
-    height: 13px;
-    position: absolute;
-    right: 3px;
-    top: 4px;
-
-    font-size: 1px;
-    outline: none;
-    background: asset-url('select2.png') right top no-repeat;
-}
-html[dir="rtl"] .select2-search-choice-close {
-    right: auto;
-    left: 3px;
-}
-
-.select2-container-multi .select2-search-choice-close {
-    left: 3px;
-}
-
-.select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover {
-  background-position: right -11px;
-}
-.select2-container-multi .select2-choices .select2-search-choice-focus .select2-search-choice-close {
-    background-position: right -11px;
-}
-
-/* disabled styles */
-.select2-container-multi.select2-container-disabled .select2-choices {
-  background: #f4f4f4 none;
-  border: 1px solid #ddd;
-  cursor: default;
-}
-
-.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice {
-  padding: 3px 5px 3px 5px;
-  border: 1px solid #ddd;
-  background: #f4f4f4 none;
-}
-
-.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice .select2-search-choice-close {    display: none;
-    background: none;
-}
-/* end multiselect */
-
-
-.select2-result-selectable .select2-match,
-.select2-result-unselectable .select2-match {
-    text-decoration: underline;
-}
-
-.select2-offscreen, .select2-offscreen:focus {
-    clip: rect(0 0 0 0) !important;
-    width: 1px !important;
-    height: 1px !important;
-    border: 0 !important;
-    margin: 0 !important;
-    padding: 0 !important;
-    overflow: hidden !important;
-    position: absolute !important;
-    outline: 0 !important;
-    left: 0px !important;
-    top: 0px !important;
-}
-
-.select2-display-none {
-    display: none;
-}
-
-.select2-measure-scrollbar {
-    position: absolute;
-    top: -10000px;
-    left: -10000px;
-    width: 100px;
-    height: 100px;
-    overflow: scroll;
-}
diff --git a/app/assets/stylesheets/vendor/sweetalert.scss b/app/assets/stylesheets/vendor/sweetalert.scss
index 76f159d7f06..b384cf53a38 100644
--- a/app/assets/stylesheets/vendor/sweetalert.scss
+++ b/app/assets/stylesheets/vendor/sweetalert.scss
@@ -52,7 +52,6 @@ body.stop-scrolling {
   .sweet-alert p {
     color: #797979;
     font-size: 16px;
-    text-align: center;
     font-weight: 300;
     position: relative;
     text-align: inherit;
@@ -132,14 +131,14 @@ body.stop-scrolling {
     margin-top: 10px;
     margin-bottom: 17px;
     font-size: 18px;
-    box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.06);
+    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.06);
     padding: 0 12px;
     display: none;
     -webkit-transition: all 0.3s;
     transition: all 0.3s; }
     .sweet-alert input:focus {
       outline: none;
-      box-shadow: 0px 0px 3px #c4e6f5;
+      box-shadow: 0 0 3px #c4e6f5;
       border: 1px solid #b4dbed; }
       .sweet-alert input:focus::-moz-placeholder {
         transition: opacity 0.3s 0.03s ease;
@@ -195,7 +194,7 @@ body.stop-scrolling {
       .sweet-alert button.cancel:active {
         background-color: #a8a8a8; }
       .sweet-alert button.cancel:focus {
-        box-shadow: rgba(197, 205, 211, 0.8) 0px 0px 2px, rgba(0, 0, 0, 0.0470588) 0px 0px 0px 1px inset !important; }
+        box-shadow: rgba(197, 205, 211, 0.8) 0 0 2px, rgba(0, 0, 0, 0.0470588) 0 0 0 1px inset !important; }
     .sweet-alert button[disabled] {
       opacity: .6;
       cursor: default; }
@@ -216,7 +215,6 @@ body.stop-scrolling {
     height: 80px;
     border: 4px solid gray;
     -webkit-border-radius: 40px;
-    border-radius: 40px;
     border-radius: 50%;
     margin: 20px auto;
     padding: 0;
@@ -291,7 +289,6 @@ body.stop-scrolling {
       .sweet-alert .sa-icon.sa-success::before, .sweet-alert .sa-icon.sa-success::after {
         content: '';
         -webkit-border-radius: 40px;
-        border-radius: 40px;
         border-radius: 50%;
         position: absolute;
         width: 60px;
@@ -315,14 +312,13 @@ body.stop-scrolling {
         left: 30px;
         -webkit-transform: rotate(-45deg);
         transform: rotate(-45deg);
-        -webkit-transform-origin: 0px 60px;
-        transform-origin: 0px 60px; }
+        -webkit-transform-origin: 0 60px;
+        transform-origin: 0 60px; }
       .sweet-alert .sa-icon.sa-success .sa-placeholder {
         width: 80px;
         height: 80px;
         border: 4px solid rgba(165, 220, 134, 0.2);
         -webkit-border-radius: 40px;
-        border-radius: 40px;
         border-radius: 50%;
         box-sizing: content-box;
         position: absolute;
@@ -414,13 +410,13 @@ body.stop-scrolling {
 
 @-webkit-keyframes slideFromTop {
   0% {
-    top: 0%; }
+    top: 0; }
   100% {
     top: 50%; } }
 
 @keyframes slideFromTop {
   0% {
-    top: 0%; }
+    top: 0; }
   100% {
     top: 50%; } }
 
@@ -428,13 +424,13 @@ body.stop-scrolling {
   0% {
     top: 50%; }
   100% {
-    top: 0%; } }
+    top: 0; } }
 
 @keyframes slideToTop {
   0% {
     top: 50%; }
   100% {
-    top: 0%; } }
+    top: 0; } }
 
 @-webkit-keyframes slideFromBottom {
   0% {
@@ -547,7 +543,7 @@ body.stop-scrolling {
     top: 54px; }
   84% {
     width: 55px;
-    right: 0px;
+    right: 0;
     top: 35px; }
   100% {
     width: 47px;
@@ -565,7 +561,7 @@ body.stop-scrolling {
     top: 54px; }
   84% {
     width: 55px;
-    right: 0px;
+    right: 0;
     top: 35px; }
   100% {
     width: 47px;
diff --git a/app/assets/stylesheets/wizard.scss b/app/assets/stylesheets/wizard.scss
index 656b5006a92..0fa4c95008c 100644
--- a/app/assets/stylesheets/wizard.scss
+++ b/app/assets/stylesheets/wizard.scss
@@ -1,6 +1,5 @@
 @import "vendor/normalize";
 @import "vendor/font_awesome/font-awesome";
-@import "vendor/select2";
 @import "vendor/sweetalert";
 @import "common/foundation/colors";
 @import "common/foundation/variables";
@@ -14,7 +13,7 @@ body.wizard {
 
   color: #444;
 
-  line-height: 1.4em;
+  line-height: $line-height-large;
 }
 
 .finish-installation {
@@ -63,9 +62,6 @@ body.wizard {
 .select {
   width: 400px;
 }
-.select2-results .select2-highlighted {
-  background: #ff9;
-}
 
 .wizard-canvas {
   position: absolute;
@@ -171,12 +167,11 @@ body.wizard {
 
     span {
       position: absolute;
-      font-size: 1.071em;
+      font-size: $font-0;
       mix-blend-mode: difference;
       color: white;
       z-index: 13;
-      font-size: 0.8em;
-      left: 2em;
+      left: 1.5em;
     }
 
     .screen {
@@ -195,8 +190,8 @@ body.wizard {
 
   .wizard-btn {
     border-radius: 2px;
-    font-size: 1.0em;
-    border: 0px;
+    font-size: $font-0;
+    border: 0;
     padding: 0.5em;
     transition: background-color .3s;
     margin-right: 0.5em;
@@ -208,7 +203,7 @@ body.wizard {
 
     &.small {
       padding: 0.25em 0.5em;
-      font-size: 0.9em;
+      font-size: $font-down-1;
     }
 
     &:hover {
@@ -408,7 +403,7 @@ body.wizard {
 .text-field {
   input {
     width: 100%;
-    font-size: 1.2em;
+    font-size: $font-up-1;
     padding: 6px;
     border: 1px solid #ccc;
     transition: border-color .5s;
@@ -481,11 +476,10 @@ body.wizard {
 
 /* fix wizard for mobile -- iPhone 5 default width */
 @media only screen and (max-device-width: 568px) {
-  h1 { font-size: 1.3em !important; }
+  h1 { font-size: $font-up-2 !important; }
   .wizard-column { margin: auto !important; }
   .wizard-step-contents { min-height: auto !important; }
   .wizard-step-banner { width: 100% !important; margin-bottom: 1em !important; }
-  .select2-container { width: 100% !important; }
   .wizard-step-footer { display: block !important; }
   .wizard-progress { margin-bottom: 10px !important; }
   .wizard-buttons { text-align: right !important; }
diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb
index 0ca88b6945f..a95cedfca73 100644
--- a/app/controllers/about_controller.rb
+++ b/app/controllers/about_controller.rb
@@ -1,8 +1,10 @@
 require_dependency 'rate_limiter'
 
 class AboutController < ApplicationController
+
+  requires_login only: [:live_post_counts]
+
   skip_before_action :check_xhr, only: [:index]
-  before_action :ensure_logged_in, only: [:live_post_counts]
 
   def index
     return redirect_to path('/login') if SiteSetting.login_required? && current_user.nil?
diff --git a/app/controllers/admin/admin_controller.rb b/app/controllers/admin/admin_controller.rb
index 1b786ac0dec..2a33fd6c906 100644
--- a/app/controllers/admin/admin_controller.rb
+++ b/app/controllers/admin/admin_controller.rb
@@ -1,6 +1,6 @@
 class Admin::AdminController < ApplicationController
 
-  before_action :ensure_logged_in
+  requires_login
   before_action :ensure_staff
 
   def index
diff --git a/app/controllers/admin/badges_controller.rb b/app/controllers/admin/badges_controller.rb
index e84a7dc65fe..53089c8e51e 100644
--- a/app/controllers/admin/badges_controller.rb
+++ b/app/controllers/admin/badges_controller.rb
@@ -15,10 +15,8 @@ class Admin::BadgesController < Admin::AdminController
   end
 
   def preview
-
     unless SiteSetting.enable_badge_sql
-      render json: "preview not allowed", status: 403
-      return
+      return render json: "preview not allowed", status: 403
     end
 
     render json: BadgeGranter.preview(params[:sql],
@@ -39,13 +37,12 @@ class Admin::BadgesController < Admin::AdminController
   end
 
   def save_badge_groupings
-
     badge_groupings = BadgeGrouping.all.order(:position).to_a
     ids = params[:ids].map(&:to_i)
 
     params[:names].each_with_index do |name, index|
       id = ids[index].to_i
-      group = badge_groupings.find { |b| b.id == id } || BadgeGrouping.new()
+      group = badge_groupings.find { |b| b.id == id } || BadgeGrouping.new
       group.name = name
       group.position = index
       group.save
@@ -66,24 +63,27 @@ class Admin::BadgesController < Admin::AdminController
     if errors.present?
       render_json_error errors
     else
+      StaffActionLogger.new(current_user).log_badge_creation(badge)
       render_serialized(badge, AdminBadgeSerializer, root: "badge")
     end
   end
 
   def update
     badge = find_badge
-
     errors = update_badge_from_params(badge)
 
     if errors.present?
       render_json_error errors
     else
+      StaffActionLogger.new(current_user).log_badge_change(badge)
       render_serialized(badge, AdminBadgeSerializer, root: "badge")
     end
   end
 
   def destroy
-    find_badge.destroy
+    badge = find_badge
+    StaffActionLogger.new(current_user).log_badge_deletion(badge)
+    badge.destroy
     render body: nil
   end
 
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb
index ed021d9158d..f14f66d5628 100644
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -3,12 +3,11 @@ class Admin::DashboardController < Admin::AdminController
   def index
     dashboard_data = AdminDashboardData.fetch_cached_stats || Jobs::DashboardStats.new.execute({})
     dashboard_data.merge!(version_check: DiscourseUpdates.check_version.as_json) if SiteSetting.version_checks?
-
     dashboard_data[:disk_space] = DiskSpace.cached_stats
     render json: dashboard_data
   end
 
   def problems
-    render_json_dump(problems: AdminDashboardData.fetch_problems)
+    render_json_dump(problems: AdminDashboardData.fetch_problems(check_force_https: request.ssl?))
   end
 end
diff --git a/app/controllers/admin/dashboard_next_controller.rb b/app/controllers/admin/dashboard_next_controller.rb
new file mode 100644
index 00000000000..47eef7b5f4c
--- /dev/null
+++ b/app/controllers/admin/dashboard_next_controller.rb
@@ -0,0 +1,10 @@
+require 'disk_space'
+
+class Admin::DashboardNextController < Admin::AdminController
+  def index
+    dashboard_data = AdminDashboardNextData.fetch_cached_stats
+    dashboard_data.merge!(version_check: DiscourseUpdates.check_version.as_json) if SiteSetting.version_checks?
+    dashboard_data[:disk_space] = DiskSpace.cached_stats
+    render json: dashboard_data
+  end
+end
diff --git a/app/controllers/admin/email_templates_controller.rb b/app/controllers/admin/email_templates_controller.rb
index 3d83a71cd72..feae4de5d10 100644
--- a/app/controllers/admin/email_templates_controller.rb
+++ b/app/controllers/admin/email_templates_controller.rb
@@ -17,12 +17,13 @@ class Admin::EmailTemplatesController < Admin::AdminController
                      "system_messages.email_reject_screened_email",
                      "system_messages.email_reject_unrecognized_error",
                      "system_messages.pending_users_reminder", "system_messages.post_hidden",
+                     "system_messages.post_hidden_again",
                      "system_messages.restore_failed", "system_messages.restore_succeeded",
                      "system_messages.spam_post_blocked", "system_messages.too_many_spam_flags",
                      "system_messages.unsilenced", "system_messages.user_automatically_silenced",
                      "system_messages.welcome_invite", "system_messages.welcome_user", "test_mailer",
                      "user_notifications.account_created", "user_notifications.admin_login",
-                     "user_notifications.confirm_new_email", "user_notifications.confirm_old_email",
+                     "user_notifications.confirm_new_email",
                      "user_notifications.notify_old_email", "user_notifications.forgot_password",
                      "user_notifications.set_password", "user_notifications.signup",
                      "user_notifications.signup_after_approval",
diff --git a/app/controllers/admin/embeddable_hosts_controller.rb b/app/controllers/admin/embeddable_hosts_controller.rb
index f43ff955050..667db524fe8 100644
--- a/app/controllers/admin/embeddable_hosts_controller.rb
+++ b/app/controllers/admin/embeddable_hosts_controller.rb
@@ -1,7 +1,5 @@
 class Admin::EmbeddableHostsController < Admin::AdminController
 
-  before_action :ensure_logged_in, :ensure_staff
-
   def create
     save_host(EmbeddableHost.new)
   end
diff --git a/app/controllers/admin/embedding_controller.rb b/app/controllers/admin/embedding_controller.rb
index ada7c668b9c..ebac31e576e 100644
--- a/app/controllers/admin/embedding_controller.rb
+++ b/app/controllers/admin/embedding_controller.rb
@@ -2,7 +2,7 @@ require_dependency 'embedding'
 
 class Admin::EmbeddingController < Admin::AdminController
 
-  before_action :ensure_logged_in, :ensure_staff, :fetch_embedding
+  before_action :fetch_embedding
 
   def show
     render_serialized(@embedding, EmbeddingSerializer, root: 'embedding', rest_serializer: true)
diff --git a/app/controllers/admin/flags_controller.rb b/app/controllers/admin/flags_controller.rb
index 702479e82a7..43c6cf129fa 100644
--- a/app/controllers/admin/flags_controller.rb
+++ b/app/controllers/admin/flags_controller.rb
@@ -16,6 +16,7 @@ class Admin::FlagsController < Admin::AdminController
     posts, topics, users, post_actions, total_rows = FlagQuery.flagged_posts_report(
       current_user,
       filter: params[:filter],
+      user_id: params[:user_id],
       offset: offset,
       topic_id: params[:topic_id],
       per_page: per_page,
@@ -72,7 +73,7 @@ class Admin::FlagsController < Admin::AdminController
 
     post_action_type = PostAction.post_action_type_for_post(post.id)
 
-    keep_post = params[:action_on_post] == "keep"
+    keep_post = ['silenced', 'suspended', 'keep'].include?(params[:action_on_post])
     delete_post = params[:action_on_post] == "delete"
     restore_post = params[:action_on_post] == "restore"
 
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index 8a6a7a72394..c8a328000d0 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -1,105 +1,45 @@
 class Admin::GroupsController < Admin::AdminController
-  def index
-    groups = Group.order(:name).where("groups.id <> ?", Group::AUTO_GROUPS[:everyone])
-
-    if search = params[:search].to_s
-      groups = groups.where("name ILIKE ?", "%#{search}%")
-    end
-
-    if params[:ignore_automatic].to_s == "true"
-      groups = groups.where(automatic: false)
-    end
-
-    render_serialized(groups, BasicGroupSerializer)
-  end
-
-  def show
-    render body: nil
-  end
-
   def bulk
-    render body: nil
   end
 
   def bulk_perform
-    group = Group.find(params[:group_id].to_i)
+    group = Group.find_by(id: params[:group_id].to_i)
+    raise Discourse::NotFound unless group
     users_added = 0
-    if group.present?
-      users = (params[:users] || []).map { |u| u.downcase }
-      valid_emails = {}
-      valid_usernames = {}
 
-      valid_users = User.joins(:user_emails)
-        .where("username_lower IN (:users) OR user_emails.email IN (:users)", users: users)
-        .pluck(:id, :username_lower, :"user_emails.email")
+    users = (params[:users] || []).map { |user| user.downcase!; user }
+    valid_emails = {}
+    valid_usernames = {}
 
-      valid_users.map! do |id, username_lower, email|
-        valid_emails[email] = valid_usernames[username_lower] = id
-        id
-      end
-      valid_users.uniq!
-      invalid_users = users.reject! { |u| valid_emails[u] || valid_usernames[u] }
-      group.bulk_add(valid_users) if valid_users.present?
-      users_added = valid_users.count
+    valid_users = User.joins(:user_emails)
+      .where("username_lower IN (:users) OR lower(user_emails.email) IN (:users)", users: users)
+      .pluck(:id, :username_lower, :"user_emails.email")
+
+    valid_users.map! do |id, username_lower, email|
+      valid_emails[email] = valid_usernames[username_lower] = id
+      id
     end
 
-    render json: { success: true, message: I18n.t('groups.success.bulk_add', users_added: users_added), users_not_added: invalid_users }
+    valid_users.uniq!
+    invalid_users = users.reject { |u| valid_emails[u] || valid_usernames[u] }
+    group.bulk_add(valid_users) if valid_users.present?
+    users_added = valid_users.count
+
+    response = success_json.merge(users_not_added: invalid_users)
+
+    if users_added > 0
+      response[:message] = I18n.t('groups.success.bulk_add', count: users_added)
+    end
+
+    render json: response
   end
 
   def create
-    save_group(Group.new)
-  end
+    attributes = group_params.to_h.except(:owner_usernames, :usernames)
+    group = Group.new(attributes)
 
-  def update
-    group = Group.find(params[:id])
-
-    # group rename is ignored for automatic groups
-    group.name = group_params[:name] if group_params[:name] && !group.automatic
-    save_group(group) { |g| GroupActionLogger.new(current_user, g).log_change_group_settings }
-  end
-
-  def save_group(group)
-    group.name = group_params[:name] if group_params[:name].present? && !group.automatic
-    group.mentionable_level = group_params[:mentionable_level].to_i if group_params[:mentionable_level].present?
-    group.messageable_level = group_params[:messageable_level].to_i if group_params[:messageable_level].present?
-
-    if group_params[:visibility_level]
-      group.visibility_level = group_params[:visibility_level]
-    end
-
-    grant_trust_level = group_params[:grant_trust_level].to_i
-    group.grant_trust_level = (grant_trust_level > 0 && grant_trust_level <= 4) ? grant_trust_level : nil
-
-    group.automatic_membership_email_domains = group_params[:automatic_membership_email_domains] unless group.automatic
-    group.automatic_membership_retroactive = group_params[:automatic_membership_retroactive] == "true" unless group.automatic
-
-    group.primary_group = group.automatic ? false : group_params["primary_group"] == "true"
-
-    group.incoming_email = group.automatic ? nil : group_params[:incoming_email]
-
-    title = group_params[:title] if group_params[:title].present?
-    group.title = group.automatic ? nil : title
-
-    group.flair_url      = group_params[:flair_url].presence
-    group.flair_bg_color = group_params[:flair_bg_color].presence
-    group.flair_color    = group_params[:flair_color].presence
-
-    %i{public_admission public_exit}.each do |key|
-      if group_params[key]
-        group.public_send("#{key}=", group_params[key])
-      end
-    end
-
-    group.bio_raw = group_params[:bio_raw] if group_params[:bio_raw]
-    group.full_name = group_params[:full_name] if group_params[:full_name]
-
-    if group_params.key?(:default_notification_level)
-      group.default_notification_level = group_params[:default_notification_level]
-    end
-
-    if group_params[:allow_membership_requests]
-      group.allow_membership_requests = group_params[:allow_membership_requests]
-      group.membership_request_template = group_params[:membership_request_template]
+    unless group_params[:allow_membership_requests]
+      group.membership_request_template = nil
     end
 
     if group_params[:owner_usernames].present?
@@ -123,9 +63,6 @@ class Admin::GroupsController < Admin::AdminController
 
     if group.save
       group.restore_user_count!
-
-      yield(group) if block_given?
-
       render_serialized(group, BasicGroupSerializer)
     else
       render_json_error group
@@ -133,23 +70,21 @@ class Admin::GroupsController < Admin::AdminController
   end
 
   def destroy
-    group = Group.find(params[:id])
+    group = Group.find_by(id: params[:id])
+    raise Discourse::NotFound unless group
 
     if group.automatic
       can_not_modify_automatic
     else
-      group.destroy
+      group.destroy!
       render json: success_json
     end
   end
 
-  def refresh_automatic_groups
-    Group.refresh_automatic_groups!
-    render json: success_json
-  end
-
   def add_owners
-    group = Group.find(params.require(:id))
+    group = Group.find_by(id: params.require(:id))
+    raise Discourse::NotFound unless group
+
     return can_not_modify_automatic if group.automatic
     users = User.where(username: group_params[:usernames].split(","))
 
@@ -166,11 +101,13 @@ class Admin::GroupsController < Admin::AdminController
 
     group.restore_user_count!
 
-    render json: success_json
+    render json: success_json.merge!(usernames: users.pluck(:username))
   end
 
   def remove_owner
-    group = Group.find(params.require(:id))
+    group = Group.find_by(id: params.require(:id))
+    raise Discourse::NotFound unless group
+
     return can_not_modify_automatic if group.automatic
 
     user = User.find(params[:user_id].to_i)
@@ -211,9 +148,9 @@ class Admin::GroupsController < Admin::AdminController
       :allow_membership_requests,
       :full_name,
       :default_notification_level,
-      :usernames,
+      :membership_request_template,
       :owner_usernames,
-      :membership_request_template
+      :usernames
     )
   end
 end
diff --git a/app/controllers/admin/plugins_controller.rb b/app/controllers/admin/plugins_controller.rb
index 516c1e05607..9067fa9e8c9 100644
--- a/app/controllers/admin/plugins_controller.rb
+++ b/app/controllers/admin/plugins_controller.rb
@@ -1,7 +1,7 @@
 class Admin::PluginsController < Admin::AdminController
 
   def index
-    render_serialized(Discourse.plugins, AdminPluginSerializer, root: 'plugins')
+    render_serialized(Discourse.visible_plugins, AdminPluginSerializer, root: 'plugins')
   end
 
 end
diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb
index 6490c96d73e..d67ee854329 100644
--- a/app/controllers/admin/reports_controller.rb
+++ b/app/controllers/admin/reports_controller.rb
@@ -7,8 +7,8 @@ class Admin::ReportsController < Admin::AdminController
 
     raise Discourse::NotFound unless report_type =~ /^[a-z0-9\_]+$/
 
-    start_date = params[:start_date].present? ? Time.parse(params[:start_date]) : 30.days.ago
-    end_date = params[:end_date].present? ? Time.parse(params[:end_date]) : start_date + 30.days
+    start_date = (params[:start_date].present? ? params[:start_date].to_date : 30.days.ago).beginning_of_day
+    end_date = (params[:end_date].present? ? params[:end_date].to_date : start_date + 30.days).end_of_day
 
     if params.has_key?(:category_id) && params[:category_id].to_i > 0
       category_id = params[:category_id].to_i
@@ -22,11 +22,46 @@ class Admin::ReportsController < Admin::AdminController
       group_id = nil
     end
 
-    report = Report.find(report_type, start_date: start_date, end_date: end_date, category_id: category_id, group_id: group_id)
+    facets = nil
+    if Array === params[:facets]
+      facets = params[:facets].map { |s| s.to_s.to_sym }
+    end
 
-    raise Discourse::NotFound if report.blank?
+    limit = nil
+    if params.has_key?(:limit) && params[:limit].to_i > 0
+      limit = params[:limit].to_i
+    end
+
+    args = {
+      start_date: start_date,
+      end_date: end_date,
+      category_id: category_id,
+      group_id: group_id,
+      facets: facets,
+      limit: limit
+    }
+
+    report = nil
+    if (params[:cache])
+      report = Report.find_cached(report_type, args)
+    end
+
+    if report
+      return render_json_dump(report: report)
+    end
+
+    hijack do
+      report = Report.find(report_type, args)
+
+      raise Discourse::NotFound if report.blank?
+
+      if (params[:cache])
+        Report.cache(report, 35.minutes)
+      end
+
+      render_json_dump(report: report)
+    end
 
-    render_json_dump(report: report)
   end
 
 end
diff --git a/app/controllers/admin/search_logs_controller.rb b/app/controllers/admin/search_logs_controller.rb
index 515839b1b50..280121e9c86 100644
--- a/app/controllers/admin/search_logs_controller.rb
+++ b/app/controllers/admin/search_logs_controller.rb
@@ -10,12 +10,14 @@ class Admin::SearchLogsController < Admin::AdminController
     params.require(:term)
 
     term = params[:term]
-    period = params[:period] || "yearly"
+    period = params[:period] || "quarterly"
     search_type = params[:search_type] || "all"
 
     details = SearchLog.term_details(term, period&.to_sym, search_type&.to_sym)
     raise Discourse::NotFound if details.blank?
 
+    result = Search.execute(params[:term], guardian: guardian)
+    details[:search_result] = serialize_data(result, GroupedSearchResultSerializer, result: result)
     render_json_dump(term: details)
   end
 
diff --git a/app/controllers/admin/site_texts_controller.rb b/app/controllers/admin/site_texts_controller.rb
index 8cdb0d9b196..33e636926d5 100644
--- a/app/controllers/admin/site_texts_controller.rb
+++ b/app/controllers/admin/site_texts_controller.rb
@@ -7,6 +7,12 @@ class Admin::SiteTextsController < Admin::AdminController
      'login_required.welcome_message']
   end
 
+  def self.restricted_keys
+    ['user_notifications.confirm_old_email.title',
+     'user_notifications.confirm_old_email.subject_template',
+     'user_notifications.confirm_old_email.text_body_template']
+  end
+
   def index
     overridden = params[:overridden] == 'true'
     extras = {}
@@ -71,7 +77,7 @@ class Admin::SiteTextsController < Admin::AdminController
 
     def record_for(k, value = nil)
       if k.ends_with?("_MF")
-        ovr = TranslationOverride.where(translation_key: k).pluck(:value)
+        ovr = TranslationOverride.where(translation_key: k, locale: I18n.locale).pluck(:value)
         value = ovr[0] if ovr.present?
       end
 
@@ -80,7 +86,7 @@ class Admin::SiteTextsController < Admin::AdminController
     end
 
     def find_site_text
-      raise Discourse::NotFound unless I18n.exists?(params[:id])
+      raise Discourse::NotFound unless I18n.exists?(params[:id]) && !self.class.restricted_keys.include?(params[:id])
       record_for(params[:id])
     end
 
diff --git a/app/controllers/admin/themes_controller.rb b/app/controllers/admin/themes_controller.rb
index b0f8d21f396..a40ec46998d 100644
--- a/app/controllers/admin/themes_controller.rb
+++ b/app/controllers/admin/themes_controller.rb
@@ -7,8 +7,7 @@ class Admin::ThemesController < Admin::AdminController
 
   def preview
     @theme = Theme.find(params[:id])
-
-    redirect_to path("/"), flash: { preview_theme_key: @theme.key }
+    redirect_to path("/?preview_theme_key=#{@theme.key}")
   end
 
   def upload_asset
@@ -27,6 +26,16 @@ class Admin::ThemesController < Admin::AdminController
     end
   end
 
+  def generate_key_pair
+    require 'sshkey'
+    k = SSHKey.generate
+
+    render json: {
+      private_key: k.private_key,
+      public_key: k.ssh_public_key
+    }
+  end
+
   def import
     @theme = nil
     if params[:theme]
@@ -66,8 +75,20 @@ class Admin::ThemesController < Admin::AdminController
         render json: @theme.errors, status: :unprocessable_entity
       end
     elsif params[:remote]
-      @theme = RemoteTheme.import_theme(params[:remote])
-      render json: @theme, status: :created
+      begin
+        @theme = RemoteTheme.import_theme(params[:remote], current_user, private_key: params[:private_key])
+        render json: @theme, status: :created
+      rescue RuntimeError => e
+        Discourse.warn_exception(e, message: "Error importing theme")
+        render_json_error I18n.t('themes.error_importing')
+      end
+    elsif params[:bundle]
+      begin
+        @theme = RemoteTheme.update_tgz_theme(params[:bundle].path, user: current_user)
+        render json: @theme, status: :created
+      rescue RuntimeError
+        render_json_error I18n.t('themes.error_importing')
+      end
     else
       render json: @theme.errors, status: :unprocessable_entity
     end
@@ -138,6 +159,7 @@ class Admin::ThemesController < Admin::AdminController
     end
 
     set_fields
+    update_settings
 
     save_remote = false
     if params[:theme][:remote_check]
@@ -158,7 +180,7 @@ class Admin::ThemesController < Admin::AdminController
         update_default_theme
 
         log_theme_change(original_json, @theme)
-        format.json { render json: @theme, status: :created }
+        format.json { render json: @theme, status: :ok }
       else
         format.json {
 
@@ -193,7 +215,7 @@ class Admin::ThemesController < Admin::AdminController
 
         response.headers['Content-Disposition'] = "attachment; filename=#{@theme.name.parameterize}.dcstyle.json"
         response.sending_file = true
-        render json: ThemeWithEmbeddedUploadsSerializer.new(@theme, root: 'theme')
+        render json: ::ThemeWithEmbeddedUploadsSerializer.new(@theme, root: 'theme')
       end
     end
 
@@ -223,6 +245,7 @@ class Admin::ThemesController < Admin::AdminController
             :color_scheme_id,
             :default,
             :user_selectable,
+            settings: {},
             theme_fields: [:name, :target, :value, :upload_id, :type_id],
             child_theme_ids: []
           )
@@ -243,6 +266,14 @@ class Admin::ThemesController < Admin::AdminController
       end
     end
 
+    def update_settings
+      return unless target_settings = theme_params[:settings]
+
+      target_settings.each_pair do |setting_name, new_value|
+        @theme.update_setting(setting_name.to_sym, new_value)
+      end
+    end
+
     def log_theme_change(old_record, new_record)
       StaffActionLogger.new(current_user).log_theme_change(old_record, new_record)
     end
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 457b049d0d8..7b7f42096c0 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -25,7 +25,8 @@ class Admin::UsersController < Admin::AdminController
                                     :generate_api_key,
                                     :revoke_api_key,
                                     :anonymize,
-                                    :reset_bounce_score]
+                                    :reset_bounce_score,
+                                    :disable_second_factor]
 
   def index
     users = ::AdminUserIndexQuery.new(params).find_users
@@ -45,10 +46,52 @@ class Admin::UsersController < Admin::AdminController
   end
 
   def delete_all_posts
-    @user = User.find_by(id: params[:user_id])
-    @user.delete_all_posts!(guardian)
-    # staff action logs will have an entry for each post
-    render body: nil
+    hijack do
+      user = User.find_by(id: params[:user_id])
+      user.delete_all_posts!(guardian)
+      # staff action logs will have an entry for each post
+      render body: nil
+    end
+  end
+
+  # DELETE action to delete penalty history for a user
+  def penalty_history
+
+    # We don't delete any history, we merely remove the action type
+    # with a removed type. It can still be viewed in the logs but
+    # will not affect TL3 promotions.
+    sql = <<~SQL
+      UPDATE user_histories
+      SET action = CASE
+        WHEN action = :silence_user THEN :removed_silence_user
+        WHEN action = :unsilence_user THEN :removed_unsilence_user
+        WHEN action = :suspend_user THEN :removed_suspend_user
+        WHEN action = :unsuspend_user THEN :removed_unsuspend_user
+      END
+      WHERE target_user_id = :user_id
+        AND action IN (
+          :silence_user,
+          :suspend_user,
+          :unsilence_user,
+          :unsuspend_user
+        )
+    SQL
+
+    UserHistory.exec_sql(
+      sql,
+      UserHistory.actions.slice(
+        :silence_user,
+        :suspend_user,
+        :unsilence_user,
+        :unsuspend_user,
+        :removed_silence_user,
+        :removed_unsilence_user,
+        :removed_suspend_user,
+        :removed_unsuspend_user
+      ).merge(user_id: params[:user_id].to_i)
+    )
+
+    render json: success_json
   end
 
   def suspend
@@ -82,10 +125,24 @@ class Admin::UsersController < Admin::AdminController
       )
     end
 
+    DiscourseEvent.trigger(
+      :user_suspended,
+      user: @user,
+      reason: params[:reason],
+      message: message,
+      user_history: user_history,
+      post_id: params[:post_id],
+      suspended_till: params[:suspend_until],
+      suspended_at: DateTime.now
+    )
+
+    perform_post_action
+
     render_json_dump(
       suspension: {
         suspended: true,
         suspend_reason: params[:reason],
+        full_suspend_reason: user_history.try(:details),
         suspended_till: @user.suspended_till,
         suspended_at: @user.suspended_at
       }
@@ -259,7 +316,7 @@ class Admin::UsersController < Admin::AdminController
   def deactivate
     guardian.ensure_can_deactivate!(@user)
     @user.deactivate
-    StaffActionLogger.new(current_user).log_user_deactivate(@user, I18n.t('user.deactivated_by_staff'))
+    StaffActionLogger.new(current_user).log_user_deactivate(@user, I18n.t('user.deactivated_by_staff'), params.slice(:context))
     refresh_browser @user
     render body: nil
   end
@@ -275,7 +332,8 @@ class Admin::UsersController < Admin::AdminController
       silenced_till: params[:silenced_till],
       reason: params[:reason],
       message_body: message,
-      keep_posts: true
+      keep_posts: true,
+      post_id: params[:post_id]
     )
     if silencer.silence && message.present?
       Jobs.enqueue(
@@ -285,13 +343,15 @@ class Admin::UsersController < Admin::AdminController
         user_history_id: silencer.user_history.id
       )
     end
+    perform_post_action
 
     render_json_dump(
       silence: {
         silenced: true,
-        silence_reason: params[:reason],
+        silence_reason: silencer.user_history.try(:details),
         silenced_till: @user.silenced_till,
-        suspended_at: @user.silenced_at
+        suspended_at: @user.silenced_at,
+        silenced_by: BasicUserSerializer.new(current_user, root: false).as_json
       }
     )
   end
@@ -324,23 +384,46 @@ class Admin::UsersController < Admin::AdminController
     }
   end
 
+  def disable_second_factor
+    guardian.ensure_can_disable_second_factor!(@user)
+    user_second_factor = @user.user_second_factor
+    raise Discourse::InvalidParameters unless user_second_factor
+
+    user_second_factor.destroy!
+    StaffActionLogger.new(current_user).log_disable_second_factor_auth(@user)
+
+    Jobs.enqueue(
+      :critical_user_email,
+      type: :account_second_factor_disabled,
+      user_id: @user.id
+    )
+
+    render json: success_json
+  end
+
   def destroy
     user = User.find_by(id: params[:id].to_i)
     guardian.ensure_can_delete_user!(user)
-    begin
-      options = params.slice(:block_email, :block_urls, :block_ip, :context, :delete_as_spammer)
-      options[:delete_posts] = ActiveModel::Type::Boolean.new.cast(params[:delete_posts])
 
-      if UserDestroyer.new(current_user).destroy(user, options)
-        render json: { deleted: true }
-      else
+    options = params.slice(:block_email, :block_urls, :block_ip, :context, :delete_as_spammer)
+    options[:delete_posts] = ActiveModel::Type::Boolean.new.cast(params[:delete_posts])
+
+    hijack do
+      begin
+        if UserDestroyer.new(current_user).destroy(user, options)
+          render json: { deleted: true }
+        else
+          render json: {
+            deleted: false,
+            user: AdminDetailedUserSerializer.new(user, root: false).as_json
+          }
+        end
+      rescue UserDestroyer::PostsExistError
         render json: {
           deleted: false,
-          user: AdminDetailedUserSerializer.new(user, root: false).as_json
-        }
+          message: "User #{user.username} has #{user.post_count} posts, so they can't be deleted."
+        }, status: 403
       end
-    rescue UserDestroyer::PostsExistError
-      raise Discourse::InvalidAccess.new("User #{user.username} has #{user.post_count} posts, so can't be deleted.")
     end
   end
 
@@ -355,7 +438,13 @@ class Admin::UsersController < Admin::AdminController
     ip = params[:ip]
 
     # should we cache results in redis?
-    location = Excon.get("https://ipinfo.io/#{ip}/json", read_timeout: 10, connect_timeout: 10).body rescue nil
+    begin
+      location = Excon.get(
+        "https://ipinfo.io/#{ip}/json",
+        read_timeout: 10, connect_timeout: 10
+      )&.body
+    rescue Excon::Error
+    end
 
     render json: location
   end
@@ -389,7 +478,7 @@ class Admin::UsersController < Admin::AdminController
     }
 
     AdminUserIndexQuery.new(params).find_users(50).each do |user|
-      user_destroyer.destroy(user, options) rescue nil
+      user_destroyer.destroy(user, options)
     end
 
     render json: success_json
@@ -455,6 +544,28 @@ class Admin::UsersController < Admin::AdminController
 
   private
 
+    def perform_post_action
+      return unless params[:post_id].present? &&
+        params[:post_action].present?
+
+      if post = Post.where(id: params[:post_id]).first
+        case params[:post_action]
+        when 'delete'
+          PostDestroyer.new(current_user, post).destroy
+        when 'edit'
+          revisor = PostRevisor.new(post)
+
+          # Take what the moderator edited in as gospel
+          revisor.revise!(
+            current_user,
+            { raw:  params[:post_edit] },
+            skip_validations: true,
+            skip_revision: true
+          )
+        end
+      end
+    end
+
     def fetch_user
       @user = User.find_by(id: params[:user_id])
     end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index f91baa9c220..218e04eb46b 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'current_user'
 require_dependency 'canonical_url'
 require_dependency 'discourse'
@@ -46,8 +48,9 @@ class ApplicationController < ActionController::Base
   before_action :set_mobile_view
   before_action :block_if_readonly_mode
   before_action :authorize_mini_profiler
-  before_action :preload_json
   before_action :redirect_to_login_if_required
+  before_action :block_if_requires_login
+  before_action :preload_json
   before_action :check_xhr
   after_action  :add_readonly_header
   after_action  :perform_refresh_session
@@ -55,12 +58,26 @@ class ApplicationController < ActionController::Base
 
   layout :set_layout
 
+  if Rails.env == "development"
+    after_action :remember_theme_key
+
+    def remember_theme_key
+      if @theme_key
+        Stylesheet::Watcher.theme_key = @theme_key if defined? Stylesheet::Watcher
+      end
+    end
+  end
+
   def has_escaped_fragment?
     SiteSetting.enable_escaped_fragments? && params.key?("_escaped_fragment_")
   end
 
   def use_crawler_layout?
-    @use_crawler_layout ||= (has_escaped_fragment? || CrawlerDetection.crawler?(request.user_agent) || params.key?("print"))
+    @use_crawler_layout ||=
+      request.user_agent &&
+      (request.content_type.blank? || request.content_type.include?('html')) &&
+      !['json', 'rss'].include?(params[:format]) &&
+      (has_escaped_fragment? || CrawlerDetection.crawler?(request.user_agent) || params.key?("print"))
   end
 
   def add_readonly_header
@@ -100,7 +117,15 @@ class ApplicationController < ActionController::Base
   end
 
   def render_rate_limit_error(e)
-    render_json_error e.description, type: :rate_limit, status: 429
+    retry_time_in_seconds = e&.available_in
+
+    render_json_error(
+      e.description,
+      type: :rate_limit,
+      status: 429,
+      extras: { wait_seconds: retry_time_in_seconds },
+      headers: { 'Retry-After': retry_time_in_seconds },
+    )
   end
 
   # If they hit the rate limiter
@@ -115,7 +140,6 @@ class ApplicationController < ActionController::Base
   end
 
   rescue_from Discourse::NotLoggedIn do |e|
-    raise e if Rails.env.test?
     if (request.format && request.format.json?) || request.xhr? || !request.get?
       rescue_discourse_actions(:not_logged_in, 403, include_ember: true)
     else
@@ -123,6 +147,15 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  rescue_from Discourse::InvalidParameters do |e|
+    message = I18n.t('invalid_params', message: e.message)
+    if (request.format && request.format.json?) || request.xhr? || !request.get?
+      rescue_discourse_actions(:invalid_parameters, 400, include_ember: true, custom_message_translated: message)
+    else
+      rescue_discourse_actions(:not_found, 400, custom_message_translated: message)
+    end
+  end
+
   rescue_from ActiveRecord::StatementInvalid do |e|
     Discourse.reset_active_record_cache_if_needed(e)
     raise e
@@ -139,11 +172,15 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  rescue_from Discourse::NotFound, PluginDisabled  do
+  rescue_from Discourse::NotFound, PluginDisabled, ActionController::RoutingError  do
     rescue_discourse_actions(:not_found, 404)
   end
 
   rescue_from Discourse::InvalidAccess do |e|
+
+    if e.opts[:delete_cookie].present?
+      cookies.delete(e.opts[:delete_cookie])
+    end
     rescue_discourse_actions(
       :invalid_access,
       403,
@@ -162,18 +199,22 @@ class ApplicationController < ActionController::Base
                        (request.xhr?) ||
                        ((params[:external_id] || '').ends_with? '.json')
 
+    message = opts[:custom_message_translated] || I18n.t(opts[:custom_message] || type)
+
     if show_json_errors
       # HACK: do not use render_json_error for topics#show
       if request.params[:controller] == 'topics' && request.params[:action] == 'show'
-        return render status: status_code, layout: false, plain: (status_code == 404 || status_code == 410) ? build_not_found_page(status_code) : I18n.t(type)
+        return render status: status_code, layout: false, plain: (status_code == 404 || status_code == 410) ? build_not_found_page(status_code) : message
       end
 
-      render_json_error I18n.t(opts[:custom_message] || type), type: type, status: status_code
+      render_json_error message, type: type, status: status_code
     else
       begin
+        # 404 pages won't have the session and theme_keys without these:
         current_user
+        handle_theme
       rescue Discourse::InvalidAccess
-        return render plain: I18n.t(opts[:custom_message] || type), status: status_code
+        return render plain: message, status: status_code
       end
 
       render html: build_not_found_page(status_code, opts[:include_ember] ? 'application' : 'no_ember')
@@ -199,12 +240,12 @@ class ApplicationController < ActionController::Base
   def clear_notifications
     if current_user && !@readonly_mode
 
-      cookie_notifications = cookies['cn'.freeze]
-      notifications = request.headers['Discourse-Clear-Notifications'.freeze]
+      cookie_notifications = cookies['cn']
+      notifications = request.headers['Discourse-Clear-Notifications']
 
       if cookie_notifications
         if notifications.present?
-          notifications += "," << cookie_notifications
+          notifications += ",#{cookie_notifications}"
         else
           notifications = cookie_notifications
         end
@@ -213,6 +254,8 @@ class ApplicationController < ActionController::Base
       if notifications.present?
         notification_ids = notifications.split(",").map(&:to_i)
         Notification.read(current_user, notification_ids)
+        current_user.reload
+        current_user.publish_notifications_state
         cookies.delete('cn')
       end
     end
@@ -221,13 +264,15 @@ class ApplicationController < ActionController::Base
   def set_locale
     if !current_user
       if SiteSetting.set_locale_from_accept_language_header
-        I18n.locale = locale_from_header
+        locale = locale_from_header
       else
-        I18n.locale = SiteSetting.default_locale
+        locale = SiteSetting.default_locale
       end
     else
-      I18n.locale = current_user.effective_locale
+      locale = current_user.effective_locale
     end
+
+    I18n.locale = I18n.locale_available?(locale) ? locale : :en
     I18n.ensure_all_loaded!
   end
 
@@ -260,12 +305,14 @@ class ApplicationController < ActionController::Base
     session[:mobile_view] = params[:mobile_view] if params.has_key?(:mobile_view)
   end
 
-  NO_CUSTOM = "no_custom".freeze
-  NO_PLUGINS = "no_plugins".freeze
-  ONLY_OFFICIAL = "only_official".freeze
-  SAFE_MODE = "safe_mode".freeze
+  NO_CUSTOM = "no_custom"
+  NO_PLUGINS = "no_plugins"
+  ONLY_OFFICIAL = "only_official"
+  SAFE_MODE = "safe_mode"
 
   def resolve_safe_mode
+    return unless guardian.can_enable_safe_mode?
+
     safe_mode = params[SAFE_MODE]
     if safe_mode
       request.env[NO_CUSTOM] = !!safe_mode.include?(NO_CUSTOM)
@@ -276,13 +323,13 @@ class ApplicationController < ActionController::Base
 
   def handle_theme
 
-    return if request.xhr? || request.format.json?
+    return if request.xhr? || request.format == "json" || request.format == "js"
     return if request.method != "GET"
 
     resolve_safe_mode
     return if request.env[NO_CUSTOM]
 
-    theme_key = flash[:preview_theme_key]
+    theme_key = request[:preview_theme_key]
 
     user_option = current_user&.user_option
 
@@ -377,10 +424,8 @@ class ApplicationController < ActionController::Base
   end
 
   def post_ids_including_replies
-    post_ids = params[:post_ids].map { |p| p.to_i }
-    if params[:reply_post_ids]
-      post_ids |= PostReply.where(post_id: params[:reply_post_ids].map { |p| p.to_i }).pluck(:reply_id)
-    end
+    post_ids  = params[:post_ids].map(&:to_i)
+    post_ids |= PostReply.where(post_id: params[:reply_post_ids]).pluck(:reply_id) if params[:reply_post_ids]
     post_ids
   end
 
@@ -437,6 +482,7 @@ class ApplicationController < ActionController::Base
     def preload_anonymous_data
       store_preloaded("site", Site.json_for(guardian))
       store_preloaded("siteSettings", SiteSetting.client_settings_json)
+      store_preloaded("themeSettings", Theme.settings_for_client(@theme_key))
       store_preloaded("customHTML", custom_html_json)
       store_preloaded("banner", banner_json)
       store_preloaded("customEmoji", custom_emoji)
@@ -499,12 +545,15 @@ class ApplicationController < ActionController::Base
 
     # Render action for a JSON error.
     #
-    # obj      - a translated string, an ActiveRecord model, or an array of translated strings
+    # obj       - a translated string, an ActiveRecord model, or an array of translated strings
     # opts:
-    #   type   - a machine-readable description of the error
-    #   status - HTTP status code to return
+    #   type    - a machine-readable description of the error
+    #   status  - HTTP status code to return
+    #   headers - extra headers for the response
     def render_json_error(obj, opts = {})
       opts = { status: opts } if opts.is_a?(Integer)
+      opts.fetch(:headers, {}).each { |name, value| headers[name.to_s] = value }
+
       render json: MultiJson.dump(create_errors_json(obj, opts)), status: opts[:status] || 422
     end
 
@@ -554,6 +603,28 @@ class ApplicationController < ActionController::Base
       raise RenderEmpty.new unless ((request.format && request.format.json?) || request.xhr?)
     end
 
+    def self.requires_login(arg = {})
+      @requires_login_arg = arg
+    end
+
+    def self.requires_login_arg
+      @requires_login_arg
+    end
+
+    def block_if_requires_login
+      if arg = self.class.requires_login_arg
+        check =
+          if except = arg[:except]
+            !except.include?(action_name.to_sym)
+          elsif only = arg[:only]
+            only.include?(action_name.to_sym)
+          else
+            true
+          end
+        ensure_logged_in if check
+      end
+    end
+
     def ensure_logged_in
       raise Discourse::NotLoggedIn.new unless current_user.present?
     end
@@ -584,10 +655,12 @@ class ApplicationController < ActionController::Base
           # save original URL in a session so we can redirect after login
           session[:destination_url] = destination_url
           redirect_to path('/session/sso')
+        elsif params[:authComplete].present?
+          redirect_to path("/login?authComplete=true")
         else
           # save original URL in a cookie (javascript redirects after login in this case)
           cookies[:destination_url] = destination_url
-          redirect_to "/login"
+          redirect_to path("/login")
         end
       end
     end
@@ -610,9 +683,14 @@ class ApplicationController < ActionController::Base
       @slug =  params[:slug].class == String ? params[:slug] : ''
       @slug =  (params[:id].class == String ? params[:id] : '') if @slug.blank?
       @slug.tr!('-', ' ')
+      @hide_google = true if SiteSetting.login_required
       render_to_string status: status, layout: layout, formats: [:html], template: '/exceptions/not_found'
     end
 
+    def is_asset_path
+      request.env['DISCOURSE_IS_ASSET_PATH'] = 1
+    end
+
   protected
 
     def render_post_json(post, add_raw = true)
diff --git a/app/controllers/badges_controller.rb b/app/controllers/badges_controller.rb
index 7b11f789206..902f3bfc3d5 100644
--- a/app/controllers/badges_controller.rb
+++ b/app/controllers/badges_controller.rb
@@ -14,8 +14,8 @@ class BadgesController < ApplicationController
     if (params[:only_listable] == "true") || !request.xhr?
       # NOTE: this is sorted client side if needed
       badges = badges.includes(:badge_grouping)
+        .includes(:badge_type)
         .where(enabled: true, listable: true)
-
     end
 
     badges = badges.to_a
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index 56c49b9da9b..f9216fc56be 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -2,10 +2,11 @@ require_dependency 'category_serializer'
 
 class CategoriesController < ApplicationController
 
-  before_action :ensure_logged_in, except: [:index, :categories_and_latest, :show, :redirect, :find_by_slug]
+  requires_login except: [:index, :categories_and_latest, :categories_and_top, :show, :redirect, :find_by_slug]
+
   before_action :fetch_category, only: [:show, :update, :destroy]
   before_action :initialize_staff_action_logger, only: [:create, :update, :destroy]
-  skip_before_action :check_xhr, only: [:index, :categories_and_latest, :redirect]
+  skip_before_action :check_xhr, only: [:index, :categories_and_latest, :categories_and_top, :redirect]
 
   def redirect
     redirect_to path("/c/#{params[:path]}")
@@ -26,7 +27,10 @@ class CategoriesController < ApplicationController
 
     @category_list = CategoryList.new(guardian, category_options)
     @category_list.draft_key = Draft::NEW_TOPIC
-    @category_list.draft_sequence = DraftSequence.current(current_user, Draft::NEW_TOPIC)
+    @category_list.draft_sequence = DraftSequence.current(
+      current_user,
+      Draft::NEW_TOPIC
+    )
     @category_list.draft = Draft.get(current_user, Draft::NEW_TOPIC, @category_list.draft_sequence) if current_user
 
     @title = "#{I18n.t('js.filters.categories.title')} - #{SiteSetting.title}" unless category_options[:is_homepage]
@@ -35,10 +39,24 @@ class CategoriesController < ApplicationController
       format.html do
         store_preloaded(@category_list.preload_key, MultiJson.dump(CategoryListSerializer.new(@category_list, scope: guardian)))
 
-        if SiteSetting.desktop_category_page_style == "categories_and_latest_topics".freeze
-          topic_options = { per_page: SiteSetting.categories_topics, no_definitions: true }
-          topic_list = TopicQuery.new(current_user, topic_options).list_latest
-          store_preloaded(topic_list.preload_key, MultiJson.dump(TopicListSerializer.new(topic_list, scope: guardian)))
+        style = SiteSetting.desktop_category_page_style
+        topic_options = {
+          per_page: SiteSetting.categories_topics,
+          no_definitions: true,
+          exclude_category_ids: Category.where(suppress_from_latest: true).pluck(:id)
+        }
+
+        if style == "categories_and_latest_topics".freeze
+          @topic_list = TopicQuery.new(current_user, topic_options).list_latest
+        elsif style == "categories_and_top_topics".freeze
+          @topic_list = TopicQuery.new(nil, topic_options).list_top_for(SiteSetting.top_page_default_timeframe.to_sym)
+        end
+
+        if @topic_list.present?
+          store_preloaded(
+            @topic_list.preload_key,
+            MultiJson.dump(TopicListSerializer.new(@topic_list, scope: guardian))
+          )
         end
 
         render
@@ -49,35 +67,11 @@ class CategoriesController < ApplicationController
   end
 
   def categories_and_latest
-    discourse_expires_in 1.minute
+    categories_and_topics(:latest)
+  end
 
-    category_options = {
-      is_homepage: current_homepage == "categories".freeze,
-      parent_category_id: params[:parent_category_id],
-      include_topics: false
-    }
-
-    topic_options = {
-      per_page: SiteSetting.categories_topics,
-      no_definitions: true,
-      exclude_category_ids: Category.where(suppress_from_homepage: true).pluck(:id)
-    }
-
-    result = CategoryAndTopicLists.new
-    result.category_list = CategoryList.new(guardian, category_options)
-    result.topic_list = TopicQuery.new(current_user, topic_options).list_latest
-
-    draft_key = Draft::NEW_TOPIC
-    draft_sequence = DraftSequence.current(current_user, draft_key)
-    draft = Draft.get(current_user, draft_key, draft_sequence) if current_user
-
-    %w{category topic}.each do |type|
-      result.send(:"#{type}_list").draft = draft
-      result.send(:"#{type}_list").draft_key = draft_key
-      result.send(:"#{type}_list").draft_sequence = draft_sequence
-    end
-
-    render_serialized(result, CategoryAndTopicListsSerializer, root: false)
+  def categories_and_top
+    categories_and_topics(:top)
   end
 
   def move
@@ -207,6 +201,42 @@ class CategoriesController < ApplicationController
   end
 
   private
+    def categories_and_topics(topics_filter)
+      discourse_expires_in 1.minute
+
+      category_options = {
+        is_homepage: current_homepage == "categories".freeze,
+        parent_category_id: params[:parent_category_id],
+        include_topics: false
+      }
+
+      topic_options = {
+        per_page: SiteSetting.categories_topics,
+        no_definitions: true,
+        exclude_category_ids: Category.where(suppress_from_latest: true).pluck(:id)
+      }
+
+      result = CategoryAndTopicLists.new
+      result.category_list = CategoryList.new(guardian, category_options)
+
+      if topics_filter == :latest
+        result.topic_list = TopicQuery.new(current_user, topic_options).list_latest
+      elsif topics_filter == :top
+        result.topic_list = TopicQuery.new(nil, topic_options).list_top_for(SiteSetting.top_page_default_timeframe.to_sym)
+      end
+
+      draft_key = Draft::NEW_TOPIC
+      draft_sequence = DraftSequence.current(current_user, draft_key)
+      draft = Draft.get(current_user, draft_key, draft_sequence) if current_user
+
+      %w{category topic}.each do |type|
+        result.send(:"#{type}_list").draft = draft
+        result.send(:"#{type}_list").draft_key = draft_key
+        result.send(:"#{type}_list").draft_sequence = draft_sequence
+      end
+
+      render_serialized(result, CategoryAndTopicListsSerializer, root: false)
+    end
 
     def required_param_keys
       [:name, :color, :text_color]
@@ -234,7 +264,7 @@ class CategoriesController < ApplicationController
                         :email_in,
                         :email_in_allow_strangers,
                         :mailinglist_mirror,
-                        :suppress_from_homepage,
+                        :suppress_from_latest,
                         :all_topics_wiki,
                         :parent_category_id,
                         :auto_close_hours,
@@ -252,6 +282,7 @@ class CategoriesController < ApplicationController
                         :default_view,
                         :subcategory_list_style,
                         :default_top_period,
+                        :minimum_required_tags,
                         custom_fields: [params[:custom_fields].try(:keys)],
                         permissions: [*p.try(:keys)],
                         allowed_tags: [],
@@ -268,9 +299,11 @@ class CategoriesController < ApplicationController
     end
 
     def include_topics(parent_category = nil)
+      style = SiteSetting.desktop_category_page_style
       view_context.mobile_view? ||
-      params[:include_topics] ||
-      (parent_category && parent_category.subcategory_list_includes_topics?) ||
-      SiteSetting.desktop_category_page_style == "categories_with_featured_topics".freeze
+        params[:include_topics] ||
+        (parent_category && parent_category.subcategory_list_includes_topics?) ||
+        style == "categories_with_featured_topics".freeze ||
+        style == "categories_with_top_topics".freeze
     end
 end
diff --git a/app/controllers/category_hashtags_controller.rb b/app/controllers/category_hashtags_controller.rb
index e0b6f768d7b..4bbb85a4061 100644
--- a/app/controllers/category_hashtags_controller.rb
+++ b/app/controllers/category_hashtags_controller.rb
@@ -1,5 +1,5 @@
 class CategoryHashtagsController < ApplicationController
-  before_action :ensure_logged_in
+  requires_login
 
   def check
     category_slugs = params[:category_slugs]
diff --git a/app/controllers/clicks_controller.rb b/app/controllers/clicks_controller.rb
index 443196fe840..9602a486256 100644
--- a/app/controllers/clicks_controller.rb
+++ b/app/controllers/clicks_controller.rb
@@ -1,4 +1,5 @@
 class ClicksController < ApplicationController
+  layout "no_ember"
 
   skip_before_action :check_xhr, :preload_json
 
@@ -19,10 +20,12 @@ class ClicksController < ApplicationController
 
     # Sometimes we want to record a link without a 302.
     # Since XHR has to load the redirected URL we want it to not return a 302 in those cases.
-    if params[:redirect] == "false" || @redirect_url.blank?
+    if params[:redirect] == "false"
       render body: nil
-    else
+    elsif @redirect_url.present?
       redirect_to(@redirect_url)
+    else
+      render
     end
   end
 
diff --git a/app/controllers/composer_controller.rb b/app/controllers/composer_controller.rb
index 6eb78a5d061..f5cb462ba47 100644
--- a/app/controllers/composer_controller.rb
+++ b/app/controllers/composer_controller.rb
@@ -2,7 +2,7 @@ require_dependency 'html_to_markdown'
 
 class ComposerController < ApplicationController
 
-  before_action :ensure_logged_in
+  requires_login
 
   def parse_html
     markdown_text = HtmlToMarkdown.new(params[:html]).to_markdown
diff --git a/app/controllers/composer_messages_controller.rb b/app/controllers/composer_messages_controller.rb
index 60bc8a75ba5..26e879b109c 100644
--- a/app/controllers/composer_messages_controller.rb
+++ b/app/controllers/composer_messages_controller.rb
@@ -2,7 +2,7 @@ require_dependency 'composer_messages_finder'
 
 class ComposerMessagesController < ApplicationController
 
-  before_action :ensure_logged_in
+  requires_login
 
   def index
     finder = ComposerMessagesFinder.new(current_user, params.slice(:composer_action, :topic_id, :post_id))
diff --git a/app/controllers/directory_items_controller.rb b/app/controllers/directory_items_controller.rb
index 17f20ea338d..1a66c740034 100644
--- a/app/controllers/directory_items_controller.rb
+++ b/app/controllers/directory_items_controller.rb
@@ -10,6 +10,14 @@ class DirectoryItemsController < ApplicationController
 
     result = DirectoryItem.where(period_type: period_type).includes(:user)
 
+    if params[:group]
+      result = result.includes(user: :groups).where(users: { groups: { name: params[:group] } })
+    end
+
+    if params[:exclude_usernames]
+      result = result.references(:user).where.not(users: { username: params[:exclude_usernames].split(",") })
+    end
+
     order = params[:order] || DirectoryItem.headings.first
     if DirectoryItem.headings.include?(order.to_sym)
       dir = params[:asc] ? 'ASC' : 'DESC'
diff --git a/app/controllers/draft_controller.rb b/app/controllers/draft_controller.rb
index 5734a0326a4..ebd0dd1bccb 100644
--- a/app/controllers/draft_controller.rb
+++ b/app/controllers/draft_controller.rb
@@ -1,6 +1,6 @@
 class DraftController < ApplicationController
-  before_action :ensure_logged_in
-  # TODO really do we need to skip this?
+  requires_login
+
   skip_before_action :check_xhr, :preload_json
 
   def show
diff --git a/app/controllers/email_controller.rb b/app/controllers/email_controller.rb
index 76fcd5fc67b..644876248f6 100644
--- a/app/controllers/email_controller.rb
+++ b/app/controllers/email_controller.rb
@@ -1,7 +1,7 @@
 class EmailController < ApplicationController
-  skip_before_action :check_xhr, :preload_json, :redirect_to_login_if_required
   layout 'no_ember'
 
+  skip_before_action :check_xhr, :preload_json, :redirect_to_login_if_required
   before_action :ensure_logged_in, only: :preferences_redirect
 
   def preferences_redirect
@@ -41,6 +41,8 @@ class EmailController < ApplicationController
   end
 
   def perform_unsubscribe
+    RateLimiter.new(nil, "unsubscribe_#{request.ip}", 10, 1.minute).performed!
+
     key = UnsubscribeKey.find_by(key: params[:key])
     raise Discourse::NotFound unless key && key.user
 
@@ -99,19 +101,24 @@ class EmailController < ApplicationController
     unless updated
       redirect_back fallback_location: path("/")
     else
+
+      key = "unsub_#{SecureRandom.hex}"
+      $redis.setex key, 1.hour, user.email
+
+      url = path("/email/unsubscribed?key=#{key}")
       if topic
-        redirect_to path("/email/unsubscribed?topic_id=#{topic.id}&email=#{user.email}")
-      else
-        redirect_to path("/email/unsubscribed?email=#{user.email}")
+        url += "&topic_id=#{topic.id}"
       end
+
+      redirect_to url
     end
 
   end
 
   def unsubscribed
-    @email = params[:email]
+    @email = $redis.get(params[:key])
     @topic_id = params[:topic_id]
-    user = User.find_by_email(params[:email])
+    user = User.find_by_email(@email)
     raise Discourse::NotFound unless user
     topic = Topic.find_by(id: params[:topic_id].to_i) if @topic_id
     @topic = topic if topic && Guardian.new(nil).can_see?(topic)
diff --git a/app/controllers/embed_controller.rb b/app/controllers/embed_controller.rb
index fff17a578a1..686019e8504 100644
--- a/app/controllers/embed_controller.rb
+++ b/app/controllers/embed_controller.rb
@@ -103,9 +103,12 @@ class EmbedController < ApplicationController
     end
 
     def ensure_embeddable
+      if !(Rails.env.development? && current_user&.admin?)
+        referer = request.referer
 
-      if !(Rails.env.development? && current_user.try(:admin?))
-        raise Discourse::InvalidAccess.new('invalid referer host') unless EmbeddableHost.url_allowed?(request.referer)
+        unless referer && EmbeddableHost.url_allowed?(referer)
+          raise Discourse::InvalidAccess.new('invalid referer host')
+        end
       end
 
       response.headers['X-Frame-Options'] = "ALLOWALL"
diff --git a/app/controllers/export_csv_controller.rb b/app/controllers/export_csv_controller.rb
index 4b74781dbd9..836ad48d70d 100644
--- a/app/controllers/export_csv_controller.rb
+++ b/app/controllers/export_csv_controller.rb
@@ -8,24 +8,7 @@ class ExportCsvController < ApplicationController
     render json: success_json
   end
 
-  # download
-  def show
-    params.require(:id)
-    filename = params.fetch(:id)
-    export_id = filename.split('-')[-1].split('.')[0]
-    export_initiated_by_user_id = 0
-    export_initiated_by_user_id = UserExport.where(id: export_id)[0].user_id unless UserExport.where(id: export_id).empty?
-    export_csv_path = UserExport.get_download_path(filename)
-
-    if export_csv_path && current_user.present? && export_initiated_by_user_id == current_user.id
-      send_file export_csv_path
-    else
-      render body: nil, status: 404
-    end
-  end
-
   private
-
     def export_params
       @_export_params ||= begin
         params.require(:entity)
diff --git a/app/controllers/extra_locales_controller.rb b/app/controllers/extra_locales_controller.rb
index bc8cf8c4758..d0e4884fcc4 100644
--- a/app/controllers/extra_locales_controller.rb
+++ b/app/controllers/extra_locales_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ExtraLocalesController < ApplicationController
 
   layout :false
@@ -6,7 +8,29 @@ class ExtraLocalesController < ApplicationController
   def show
     bundle = params[:bundle]
     raise Discourse::InvalidAccess.new unless bundle =~ /^(admin|wizard)$/
+    if params[:v] && params[:v].length == 32
+      hash = ExtraLocalesController.bundle_js_hash(bundle)
+      if hash == params[:v]
+        immutable_for 24.hours
+      end
+    end
+    render plain: ExtraLocalesController.bundle_js(bundle), content_type: "application/javascript"
+  end
 
+  def self.bundle_js_hash(bundle)
+    @bundle_js_hash ||= {}
+    @bundle_js_hash[bundle] = Digest::MD5.hexdigest(bundle_js(bundle))
+  end
+
+  def self.url(bundle)
+    if Rails.env == "production"
+      "#{Discourse.base_uri}/extra-locales/#{bundle}?v=#{bundle_js_hash(bundle)}"
+    else
+      "#{Discourse.base_uri}/extra-locales/#{bundle}"
+    end
+  end
+
+  def self.bundle_js(bundle)
     locale_str = I18n.locale.to_s
     bundle_str = "#{bundle}_js"
 
@@ -32,6 +56,6 @@ class ExtraLocalesController < ApplicationController
       JS
     end
 
-    render plain: js, content_type: "application/javascript"
+    js
   end
 end
diff --git a/app/controllers/finish_installation_controller.rb b/app/controllers/finish_installation_controller.rb
index 848aa127f81..4640677ebca 100644
--- a/app/controllers/finish_installation_controller.rb
+++ b/app/controllers/finish_installation_controller.rb
@@ -15,7 +15,7 @@ class FinishInstallationController < ApplicationController
       email = params[:email].strip
       raise Discourse::InvalidParameters.new unless @allowed_emails.include?(email)
 
-      return redirect_confirm(email) if UserEmail.exists?(email: email)
+      return redirect_confirm(email) if UserEmail.where("lower(email) = ?", email).exists?
 
       @user.email = email
       @user.username = params[:username]
diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb
index 00b19366287..ec02d4e5a18 100644
--- a/app/controllers/forums_controller.rb
+++ b/app/controllers/forums_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ForumsController < ApplicationController
 
   skip_before_action :preload_json, :check_xhr
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 3fde94894cb..40dab0ff3ee 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -1,54 +1,130 @@
 class GroupsController < ApplicationController
-
-  before_action :ensure_logged_in, only: [
+  requires_login only: [
     :set_notifications,
     :mentionable,
     :messageable,
     :update,
-    :messages,
     :histories,
     :request_membership,
-    :search
+    :search,
+    :new
   ]
 
   skip_before_action :preload_json, :check_xhr, only: [:posts_feed, :mentions_feed]
+  skip_before_action :check_xhr, only: [:show]
+
+  TYPE_FILTERS = {
+    my: Proc.new { |groups, user|
+      raise Discourse::NotFound unless user
+      Group.member_of(groups, user)
+    },
+    owner: Proc.new { |groups, user|
+      raise Discourse::NotFound unless user
+      Group.owner_of(groups, user)
+    },
+    public: Proc.new { |groups|
+      groups.where(public_admission: true, automatic: false)
+    },
+    close: Proc.new { |groups|
+      groups.where(
+        public_admission: false,
+        automatic: false
+      )
+    },
+    automatic: Proc.new { |groups|
+      groups.where(automatic: true)
+    }
+  }
 
   def index
-    unless SiteSetting.enable_group_directory?
+    unless SiteSetting.enable_group_directory? || current_user&.staff?
       raise Discourse::InvalidAccess.new(:enable_group_directory)
     end
 
     page_size = 30
     page = params[:page]&.to_i || 0
+    order = %w{name user_count}.delete(params[:order])
+    dir = params[:asc] ? 'ASC' : 'DESC'
+    groups = Group.visible_groups(current_user, order ? "#{order} #{dir}" : nil)
 
-    groups = Group.visible_groups(current_user)
+    if (filter = params[:filter]).present?
+      groups = Group.search_groups(filter, groups: groups)
+    end
+
+    type_filters = TYPE_FILTERS.keys
+
+    if username = params[:username]
+      groups = TYPE_FILTERS[:my].call(groups, User.find_by_username(username))
+      type_filters = type_filters - [:my, :owner]
+    end
 
     unless guardian.is_staff?
       # hide automatic groups from all non stuff to de-clutter page
-      groups = groups.where(automatic: false)
+      groups = groups.where("automatic IS FALSE OR groups.id = #{Group::AUTO_GROUPS[:moderators]}")
+      type_filters.delete(:automatic)
     end
 
-    count = groups.count
-    groups = groups.offset(page * page_size).limit(page_size)
-
     if Group.preloaded_custom_field_names.present?
       Group.preload_custom_fields(groups, Group.preloaded_custom_field_names)
     end
 
-    group_user_ids = GroupUser.where(group: groups, user: current_user).pluck(:group_id)
+    if type = params[:type]&.to_sym
+      groups = TYPE_FILTERS[type].call(groups, current_user)
+    end
+
+    if current_user
+      group_users = GroupUser.where(group: groups, user: current_user)
+      user_group_ids = group_users.pluck(:group_id)
+      owner_group_ids = group_users.where(owner: true).pluck(:group_id)
+    else
+      type_filters = type_filters - [:my, :owner]
+    end
+
+    count = groups.count
+    groups = groups.offset(page * page_size).limit(page_size)
 
     render_json_dump(
-      groups: serialize_data(groups, BasicGroupSerializer),
+      groups: serialize_data(groups,
+        BasicGroupSerializer,
+        user_group_ids: user_group_ids || [],
+        owner_group_ids: owner_group_ids || []
+      ),
       extras: {
-        group_user_ids: group_user_ids
+        type_filters: type_filters
       },
       total_rows_groups: count,
-      load_more_groups: groups_path(page: page + 1)
+      load_more_groups: groups_path(page: page + 1, type: type),
     )
   end
 
   def show
-    render_serialized(find_group(:id), GroupShowSerializer, root: 'basic_group')
+    respond_to do |format|
+      group = find_group(:id)
+
+      format.html do
+        @title = group.full_name.present? ? group.full_name.capitalize : group.name
+        @description_meta = group.bio_cooked.present? ? PrettyText.excerpt(group.bio_cooked, 300) : @title
+        render :show
+      end
+
+      format.json do
+        groups = Group.visible_groups(current_user)
+
+        if !guardian.is_staff?
+          groups = groups.where(automatic: false)
+        end
+
+        render_json_dump(
+          group: serialize_data(group, GroupShowSerializer, root: nil),
+          extras: {
+            visible_group_names: groups.pluck(:name)
+          }
+        )
+      end
+    end
+  end
+
+  def new
   end
 
   def edit
@@ -56,11 +132,10 @@ class GroupsController < ApplicationController
 
   def update
     group = Group.find(params[:id])
-    guardian.ensure_can_edit!(group)
+    guardian.ensure_can_edit!(group) unless current_user.admin
 
-    if group.update_attributes(group_params)
+    if group.update(group_params(automatic: group.automatic))
       GroupActionLogger.new(current_user, group).log_change_group_settings
-
       render json: success_json
     else
       render_json_error(group)
@@ -88,15 +163,6 @@ class GroupsController < ApplicationController
     render 'posts/latest', formats: [:rss]
   end
 
-  def topics
-    group = find_group(:group_id)
-    posts = group.posts_for(
-      guardian,
-      params.permit(:before_post_id, :category_id)
-    ).where(post_number: 1).limit(20)
-    render_serialized posts.to_a, GroupPostSerializer
-  end
-
   def mentions
     raise Discourse::NotFound unless SiteSetting.enable_mentions?
     group = find_group(:group_id)
@@ -120,19 +186,6 @@ class GroupsController < ApplicationController
     render 'posts/latest', formats: [:rss]
   end
 
-  def messages
-    group = find_group(:group_id)
-    posts = if guardian.can_see_group_messages?(group)
-      group.messages_for(
-        guardian,
-        params.permit(:before_post_id, :category_id)
-      ).where(post_number: 1).limit(20).to_a
-    else
-      []
-    end
-    render_serialized posts, GroupPostSerializer
-  end
-
   def members
     group = find_group(:group_id)
 
@@ -146,8 +199,18 @@ class GroupsController < ApplicationController
     end
 
     users = group.users.human_users
-
     total = users.count
+
+    if (filter = params[:filter]).present?
+      filter = filter.split(',') if filter.include?(',')
+
+      if current_user&.admin
+        users = users.filter_by_username_or_email(filter)
+      else
+        users = users.filter_by_username(filter)
+      end
+    end
+
     members = users
       .order('NOT group_users.owner')
       .order(order)
@@ -175,20 +238,20 @@ class GroupsController < ApplicationController
     group = Group.find(params[:id])
     group.public_admission ? ensure_logged_in : guardian.ensure_can_edit!(group)
 
-    users =
-      if params[:usernames].present?
-        User.where(username: params[:usernames].split(","))
-      elsif params[:user_ids].present?
-        User.find(params[:user_ids].split(","))
-      elsif params[:user_emails].present?
-        User.with_email(params[:user_emails].split(","))
-      else
-        raise Discourse::InvalidParameters.new(
-          'user_ids or usernames or user_emails must be present'
-        )
-      end
-
-    raise Discourse::NotFound if users.blank?
+    if params[:usernames].present?
+      users = User.where(username: params[:usernames].split(","))
+      raise Discourse::InvalidParameters.new(:usernames) if users.blank?
+    elsif params[:user_ids].present?
+      users = User.where(id: params[:user_ids].split(","))
+      raise Discourse::InvalidParameters.new(:user_ids) if users.blank?
+    elsif params[:user_emails].present?
+      users = User.with_email(params[:user_emails].split(","))
+      raise Discourse::InvalidParameters.new(:user_emails) if users.blank?
+    else
+      raise Discourse::InvalidParameters.new(
+        'user_ids or usernames or user_emails must be present'
+      )
+    end
 
     if group.public_admission
       if !guardian.can_log_group_changes?(group) && current_user != users.first
@@ -200,19 +263,21 @@ class GroupsController < ApplicationController
       end
     end
 
-    users.each do |user|
-      if !group.users.include?(user)
+    if (usernames = group.users.where(id: users.pluck(:id)).pluck(:username)).present?
+      render_json_error(I18n.t(
+        "groups.errors.member_already_exist",
+        username: usernames.sort.join(", "),
+        count: usernames.size
+      ))
+    else
+      users.each do |user|
         group.add(user)
         GroupActionLogger.new(current_user, group).log_add_user_to_group(user)
-      else
-        return render_json_error I18n.t('groups.errors.member_already_exist', username: user.username)
       end
-    end
 
-    if group.save
-      render json: success_json
-    else
-      render_json_error(group)
+      render json: success_json.merge!(
+        usernames: users.map(&:username)
+      )
     end
   end
 
@@ -237,7 +302,8 @@ class GroupsController < ApplicationController
   end
 
   def remove_member
-    group = Group.find(params[:id])
+    group = Group.find_by(id: params[:id])
+    raise Discourse::NotFound unless group
     group.public_exit ? ensure_logged_in : guardian.ensure_can_edit!(group)
 
     user =
@@ -321,7 +387,7 @@ class GroupsController < ApplicationController
 
   def histories
     group = find_group(:group_id)
-    guardian.ensure_can_edit!(group)
+    guardian.ensure_can_edit!(group) unless current_user.admin
 
     page_size = 25
     offset = (params[:offset] && params[:offset].to_i) || 0
@@ -358,23 +424,54 @@ class GroupsController < ApplicationController
 
   private
 
-  def group_params
-    params.require(:group).permit(
-      :flair_url,
-      :flair_bg_color,
-      :flair_color,
-      :bio_raw,
-      :full_name,
-      :public_admission,
-      :public_exit,
-      :allow_membership_requests,
-      :membership_request_template,
-    )
+  def group_params(automatic: false)
+    permitted_params =
+      if automatic
+        %i{
+          visibility_level
+          mentionable_level
+          messageable_level
+          default_notification_level
+        }
+      else
+        default_params = %i{
+          mentionable_level
+          messageable_level
+          title
+          flair_url
+          flair_bg_color
+          flair_color
+          bio_raw
+          public_admission
+          public_exit
+          allow_membership_requests
+          full_name
+          default_notification_level
+          membership_request_template
+        }
+
+        if current_user.admin
+          default_params.push(*[
+            :incoming_email,
+            :primary_group,
+            :visibility_level,
+            :name,
+            :grant_trust_level,
+            :automatic_membership_email_domains,
+            :automatic_membership_retroactive
+          ])
+        end
+
+        default_params
+      end
+
+    params.require(:group).permit(*permitted_params)
   end
 
   def find_group(param_name)
     name = params.require(param_name)
-    group = Group.find_by("lower(name) = ?", name.downcase)
+    group = Group
+    group = group.find_by("lower(name) = ?", name.downcase)
     guardian.ensure_can_see!(group)
     group
   end
diff --git a/app/controllers/inline_onebox_controller.rb b/app/controllers/inline_onebox_controller.rb
index c7f4e30f75c..832f3d66a07 100644
--- a/app/controllers/inline_onebox_controller.rb
+++ b/app/controllers/inline_onebox_controller.rb
@@ -1,7 +1,7 @@
 require_dependency 'inline_oneboxer'
 
 class InlineOneboxController < ApplicationController
-  before_action :ensure_logged_in
+  requires_login
 
   def show
     oneboxes = InlineOneboxer.new(params[:urls] || []).process
diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index 9bd0c0e3918..10933affcfe 100644
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -2,11 +2,15 @@ require_dependency 'rate_limiter'
 
 class InvitesController < ApplicationController
 
+  requires_login only: [
+    :destroy, :create, :create_invite_link, :rescind_all_invites,
+    :resend_invite, :resend_all_invites, :upload_csv
+  ]
+
   skip_before_action :check_xhr, except: [:perform_accept_invitation]
   skip_before_action :preload_json, except: [:show]
   skip_before_action :redirect_to_login_if_required
 
-  before_action :ensure_logged_in, only: [:destroy, :create, :create_invite_link, :rescind_all_invites, :resend_invite, :resend_all_invites, :upload_csv]
   before_action :ensure_new_registrations_allowed, only: [:show, :perform_accept_invitation]
   before_action :ensure_not_logged_in, only: [:show, :perform_accept_invitation]
 
@@ -15,7 +19,7 @@ class InvitesController < ApplicationController
 
     invite = Invite.find_by(invite_key: params[:id])
 
-    if invite.present?
+    if invite.present? && !invite.redeemed?
       store_preloaded("invite_info", MultiJson.dump(
         invited_by: UserNameSerializer.new(invite.invited_by, scope: guardian, root: false),
         email: invite.email,
@@ -24,7 +28,7 @@ class InvitesController < ApplicationController
 
       render layout: 'application'
     else
-      flash.now[:error] = I18n.t('invite.not_found')
+      flash.now[:error] = I18n.t('invite.not_found_template', site_name: SiteSetting.title, base_url: Discourse.base_url)
       render layout: 'no_ember'
     end
   end
diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index 905f0077cb2..8339d8b2d3e 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -50,6 +50,7 @@ class ListController < ApplicationController
     TopTopic.periods.map { |p| :"category_top_#{p}" },
     TopTopic.periods.map { |p| :"category_none_top_#{p}" },
     TopTopic.periods.map { |p| :"parent_category_category_top_#{p}" },
+    :group_topics
   ].flatten
 
   # Create our filters
@@ -63,13 +64,34 @@ class ListController < ApplicationController
         if filter == :latest
           list_opts[:no_definitions] = true
         end
-        if filter.to_s == current_homepage
+        if [:latest, :categories].include?(filter)
           list_opts[:exclude_category_ids] = get_excluded_category_ids(list_opts[:category])
         end
       end
 
       list = TopicQuery.new(user, list_opts).public_send("list_#{filter}")
 
+      if guardian.can_create_shared_draft? && @category.present?
+        if @category.id == SiteSetting.shared_drafts_category.to_i
+          # On shared drafts, show the destination category
+          list.topics.each do |t|
+            t.includes_destination_category = true
+          end
+        else
+          # When viewing a non-shared draft category, find topics whose
+          # destination are this category
+          shared_drafts = TopicQuery.new(
+            user,
+            category: SiteSetting.shared_drafts_category,
+            destination_category_id: list_opts[:category]
+          ).list_latest
+
+          if shared_drafts.present? && shared_drafts.topics.present?
+            list.shared_drafts = shared_drafts.topics
+          end
+        end
+      end
+
       list.more_topics_url = construct_url_with(:next, list_opts)
       list.prev_topics_url = construct_url_with(:prev, list_opts)
       if Discourse.anonymous_filters.include?(filter)
@@ -131,6 +153,18 @@ class ListController < ApplicationController
     respond_with_list(list)
   end
 
+  def group_topics
+    group = Group.find_by(name: params[:group_name])
+    raise Discourse::NotFound unless group
+    guardian.ensure_can_see_group!(group)
+
+    list_opts = build_topic_list_options
+    list = generate_list_for("group_topics", group, list_opts)
+    list.more_topics_url = url_for(construct_url_with(:next, list_opts))
+    list.prev_topics_url = url_for(construct_url_with(:prev, list_opts))
+    respond_with_list(list)
+  end
+
   def self.generate_message_route(action)
     define_method("#{action}") do
       list_opts = build_topic_list_options
@@ -151,6 +185,7 @@ class ListController < ApplicationController
     private_messages_archive
     private_messages_group
     private_messages_group_archive
+    private_messages_tag
   }.each do |action|
     generate_message_route(action)
   end
@@ -293,10 +328,11 @@ class ListController < ApplicationController
   def page_params(opts = nil)
     opts ||= {}
     route_params = { format: 'json' }
-    route_params[:category]        = @category.slug_for_url                 if @category
-    route_params[:parent_category] = @category.parent_category.slug_for_url if @category && @category.parent_category
-    route_params[:order]           = opts[:order]                           if opts[:order].present?
-    route_params[:ascending]       = opts[:ascending]                       if opts[:ascending].present?
+    route_params[:category]        = @category.slug_for_url                  if @category
+    route_params[:parent_category] = @category.parent_category.slug_for_url  if @category && @category.parent_category
+    route_params[:order]           = opts[:order]                            if opts[:order].present?
+    route_params[:ascending]       = opts[:ascending]                        if opts[:ascending].present?
+    route_params[:username]        = UrlHelper.escape_uri(params[:username]) if params[:username].present?
     route_params
   end
 
@@ -332,6 +368,7 @@ class ListController < ApplicationController
   def build_topic_list_options
     options = {}
     params[:page] = params[:page].to_i rescue 1
+    params[:tags] = [params[:tag_id].parameterize] if params[:tag_id].present? && guardian.can_tag_pms?
 
     TopicQuery.public_valid_options.each do |key|
       options[key] = params[key]
@@ -368,7 +405,7 @@ class ListController < ApplicationController
   end
 
   def get_excluded_category_ids(current_category = nil)
-    exclude_category_ids = Category.where(suppress_from_homepage: true)
+    exclude_category_ids = Category.where(suppress_from_latest: true)
     exclude_category_ids = exclude_category_ids.where.not(id: current_category) if current_category
     exclude_category_ids.pluck(:id)
   end
diff --git a/app/controllers/metadata_controller.rb b/app/controllers/metadata_controller.rb
index f8d75cfb3df..e123b7c5352 100644
--- a/app/controllers/metadata_controller.rb
+++ b/app/controllers/metadata_controller.rb
@@ -14,6 +14,10 @@ class MetadataController < ApplicationController
 
   def default_manifest
     logo = SiteSetting.large_icon_url.presence || SiteSetting.logo_small_url.presence || SiteSetting.apple_touch_icon_url.presence
+    if !logo
+      logo = path('/images/d-logo-sketch-small.png')
+    end
+    file_info = get_file_info(logo)
 
     manifest = {
       name: SiteSetting.title,
@@ -21,13 +25,16 @@ class MetadataController < ApplicationController
       display: 'standalone',
       orientation: 'natural',
       start_url: "#{Discourse.base_uri}/",
+      share_target: {
+        url_template: 'new-topic?title={title}&body={text}%0A%0A{url}'
+      },
       background_color: "##{ColorScheme.hex_for_name('secondary')}",
       theme_color: "##{ColorScheme.hex_for_name('header_background')}",
       icons: [
         {
           src: logo,
-          sizes: "512x512",
-          type: "image/png"
+          sizes: file_info[:size],
+          type: file_info[:type]
         }
       ]
     }
@@ -46,4 +53,11 @@ class MetadataController < ApplicationController
 
     manifest
   end
+
+  def get_file_info(filename)
+    type = MiniMime.lookup_by_filename(filename)&.content_type || "image/png"
+    upload = Upload.find_by_url(filename)
+    { size: "#{upload&.width || 512}x#{upload&.height || 512}", type: type }
+  end
+
 end
diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
index bedfb6b515f..7fbc06a2b06 100644
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/notifications_controller.rb
@@ -2,7 +2,9 @@ require_dependency 'notification_serializer'
 
 class NotificationsController < ApplicationController
 
-  before_action :ensure_logged_in
+  requires_login
+  before_action :ensure_admin, only: [:create, :update, :destroy]
+  before_action :set_notification, only: [:update, :destroy]
 
   def index
     user =
@@ -57,11 +59,41 @@ class NotificationsController < ApplicationController
     else
       Notification.where(user_id: current_user.id).includes(:topic).where(read: false).update_all(read: true)
       current_user.saw_notification_id(Notification.recent_report(current_user, 1).max.try(:id))
-      current_user.reload
-      current_user.publish_notifications_state
     end
 
+    current_user.reload
+    current_user.publish_notifications_state
+
     render json: success_json
   end
 
+  def create
+    @notification = Notification.create!(notification_params)
+    render_notification
+  end
+
+  def update
+    @notification.update!(notification_params)
+    render_notification
+  end
+
+  def destroy
+    @notification.destroy!
+    render json: success_json
+  end
+
+  private
+
+    def set_notification
+      @notification = Notification.find(params[:id])
+    end
+
+    def notification_params
+      params.permit(:notification_type, :user_id, :data, :read, :topic_id, :post_number, :post_action_id)
+    end
+
+    def render_notification
+      render_json_dump(NotificationSerializer.new(@notification, scope: guardian, root: false))
+    end
+
 end
diff --git a/app/controllers/onebox_controller.rb b/app/controllers/onebox_controller.rb
index 15b99a76486..f093342c772 100644
--- a/app/controllers/onebox_controller.rb
+++ b/app/controllers/onebox_controller.rb
@@ -1,7 +1,7 @@
 require_dependency 'oneboxer'
 
 class OneboxController < ApplicationController
-  before_action :ensure_logged_in
+  requires_login
 
   def show
     unless params[:refresh] == 'true'
@@ -14,13 +14,21 @@ class OneboxController < ApplicationController
     return render(body: nil, status: 429) if Oneboxer.is_previewing?(current_user.id)
 
     user_id = current_user.id
+    category_id = params[:category_id].to_i
+    topic_id = params[:topic_id].to_i
     invalidate = params[:refresh] == 'true'
     url = params[:url]
 
     hijack do
       Oneboxer.preview_onebox!(user_id)
 
-      preview = Oneboxer.preview(url, invalidate_oneboxes: invalidate)
+      preview = Oneboxer.preview(url,
+        invalidate_oneboxes: invalidate,
+        user_id: user_id,
+        category_id: category_id,
+        topic_id: topic_id
+      )
+
       preview.strip! if preview.present?
 
       Oneboxer.onebox_previewed!(user_id)
diff --git a/app/controllers/post_actions_controller.rb b/app/controllers/post_actions_controller.rb
index 2bf6027ba26..fa0314b999c 100644
--- a/app/controllers/post_actions_controller.rb
+++ b/app/controllers/post_actions_controller.rb
@@ -1,7 +1,8 @@
 require_dependency 'discourse'
 
 class PostActionsController < ApplicationController
-  before_action :ensure_logged_in
+  requires_login
+
   before_action :fetch_post_from_params
   before_action :fetch_post_action_type_id_from_params
 
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 12771276852..410a00b80f2 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -4,12 +4,34 @@ require_dependency 'post_destroyer'
 require_dependency 'post_merger'
 require_dependency 'distributed_memoizer'
 require_dependency 'new_post_result_serializer'
+require_dependency 'post_locker'
 
 class PostsController < ApplicationController
 
-  before_action :ensure_logged_in, except: [:show, :replies, :by_number, :short_link, :reply_history, :replyIids, :revisions, :latest_revision, :expand_embed, :markdown_id, :markdown_num, :cooked, :latest, :user_posts_feed]
+  requires_login except: [
+    :show,
+    :replies,
+    :by_number,
+    :short_link,
+    :reply_history,
+    :replyIids,
+    :revisions,
+    :latest_revision,
+    :expand_embed,
+    :markdown_id,
+    :markdown_num,
+    :cooked,
+    :latest,
+    :user_posts_feed
+  ]
 
-  skip_before_action :preload_json, :check_xhr, only: [:markdown_id, :markdown_num, :short_link, :latest, :user_posts_feed]
+  skip_before_action :preload_json, :check_xhr, only: [
+    :markdown_id,
+    :markdown_num,
+    :short_link,
+    :latest,
+    :user_posts_feed
+  ]
 
   def markdown_id
     markdown Post.find(params[:id].to_i)
@@ -237,6 +259,11 @@ class PostsController < ApplicationController
     render json: post.reply_ids(guardian).to_json
   end
 
+  def all_reply_ids
+    post = find_post_from_params
+    render json: post.reply_ids(guardian, only_replies_to_single_post: false).to_json
+  end
+
   def destroy
     post = find_post_from_params
     RateLimiter.new(current_user, "delete_post", 3, 1.minute).performed! unless current_user.staff?
@@ -390,6 +417,13 @@ class PostsController < ApplicationController
     render_json_dump(result)
   end
 
+  def locked
+    post = find_post_from_params
+    locker = PostLocker.new(post, current_user)
+    params[:locked] === "true" ? locker.lock : locker.unlock
+    render_json_dump(locked: post.locked?)
+  end
+
   def bookmark
     if params[:bookmarked] == "true"
       post = find_post_from_params
@@ -612,6 +646,12 @@ class PostsController < ApplicationController
       result[:is_warning] = false
     end
 
+    if params[:shared_draft] == 'true'
+      raise Discourse::InvalidParameters.new(:shared_draft) unless guardian.can_create_shared_draft?
+
+      result[:shared_draft] = true
+    end
+
     if current_user.staff? && SiteSetting.enable_whispers? && params[:whisper] == "true"
       result[:post_type] = Post.types[:whisper]
     end
diff --git a/app/controllers/push_notification_controller.rb b/app/controllers/push_notification_controller.rb
new file mode 100644
index 00000000000..8f7d340b06d
--- /dev/null
+++ b/app/controllers/push_notification_controller.rb
@@ -0,0 +1,21 @@
+class PushNotificationController < ApplicationController
+  layout false
+  before_action :ensure_logged_in
+  skip_before_action :preload_json
+
+  def subscribe
+    PushNotificationPusher.subscribe(current_user, push_params, params[:send_confirmation])
+    render json: success_json
+  end
+
+  def unsubscribe
+    PushNotificationPusher.unsubscribe(current_user, push_params)
+    render json: success_json
+  end
+
+  private
+
+  def push_params
+    params.require(:subscription).permit(:endpoint, keys: [:p256dh, :auth])
+  end
+end
diff --git a/app/controllers/qunit_controller.rb b/app/controllers/qunit_controller.rb
new file mode 100644
index 00000000000..09c979373d4
--- /dev/null
+++ b/app/controllers/qunit_controller.rb
@@ -0,0 +1,9 @@
+class QunitController < ApplicationController
+  skip_before_action :check_xhr, :preload_json
+  layout false
+
+  # only used in test / dev
+  def index
+    raise Discourse::InvalidAccess.new if Rails.env.production?
+  end
+end
diff --git a/app/controllers/robots_txt_controller.rb b/app/controllers/robots_txt_controller.rb
index 4a8600774cc..98153556329 100644
--- a/app/controllers/robots_txt_controller.rb
+++ b/app/controllers/robots_txt_controller.rb
@@ -2,8 +2,93 @@ class RobotsTxtController < ApplicationController
   layout false
   skip_before_action :preload_json, :check_xhr, :redirect_to_login_if_required
 
+  # NOTE: order is important!
+  DISALLOWED_PATHS ||= %w{
+    /auth/cas
+    /auth/facebook/callback
+    /auth/twitter/callback
+    /auth/google/callback
+    /auth/yahoo/callback
+    /auth/github/callback
+    /auth/cas/callback
+    /assets/browser-update*.js
+    /users/
+    /u/
+    /badges/
+    /search
+    /search/
+    /tags
+    /tags/
+    /email/
+    /session
+    /session/
+    /admin
+    /admin/
+    /user-api-key
+    /user-api-key/
+    /*?api_key*
+    /*?*api_key*
+    /groups
+    /groups/
+    /t/*/*.rss
+    /tags/*.rss
+    /c/*.rss
+  }
+
   def index
-    path = SiteSetting.allow_index_in_robots_txt ? :index : :no_index
-    render path, content_type: 'text/plain'
+    if SiteSetting.allow_index_in_robots_txt?
+      @robots_info = fetch_robots_info
+      render :index, content_type: 'text/plain'
+    else
+      render :no_index, content_type: 'text/plain'
+    end
   end
+
+  # If you are hosting Discourse in a subfolder, you will need to create your robots.txt
+  # in the root of your web server with the appropriate paths. This method will return
+  # JSON that can be used by a script to create a robots.txt that works well with your
+  # existing site.
+  def builder
+    render json: fetch_robots_info
+  end
+
+protected
+
+  def fetch_robots_info
+    deny_paths = DISALLOWED_PATHS.map { |p| Discourse.base_uri + p }
+    deny_all = [ "#{Discourse.base_uri}/" ]
+
+    result = {
+      header: "# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file",
+      agents: []
+    }
+
+    if SiteSetting.whitelisted_crawler_user_agents.present?
+      SiteSetting.whitelisted_crawler_user_agents.split('|').each do |agent|
+        result[:agents] << { name: agent, disallow: deny_paths }
+      end
+
+      result[:agents] << { name: '*', disallow: deny_all }
+    elsif SiteSetting.blacklisted_crawler_user_agents.present?
+      result[:agents] << { name: '*', disallow: deny_paths }
+      SiteSetting.blacklisted_crawler_user_agents.split('|').each do |agent|
+        result[:agents] << { name: agent, disallow: deny_all }
+      end
+    else
+      result[:agents] << { name: '*', disallow: deny_paths }
+    end
+
+    if SiteSetting.slow_down_crawler_user_agents.present?
+      SiteSetting.slow_down_crawler_user_agents.split('|').each do |agent|
+        result[:agents] << {
+          name: agent,
+          delay: SiteSetting.slow_down_crawler_rate,
+          disallow: deny_paths
+        }
+      end
+    end
+
+    result
+  end
+
 end
diff --git a/app/controllers/safe_mode_controller.rb b/app/controllers/safe_mode_controller.rb
index 0a0b6ab4ed1..77e31a100fd 100644
--- a/app/controllers/safe_mode_controller.rb
+++ b/app/controllers/safe_mode_controller.rb
@@ -1,5 +1,7 @@
 class SafeModeController < ApplicationController
   layout 'no_ember'
+  before_action :ensure_safe_mode_enabled
+
   skip_before_action :preload_json, :check_xhr
 
   def index
@@ -18,4 +20,11 @@ class SafeModeController < ApplicationController
       redirect_to safe_mode_path
     end
   end
+
+  protected
+
+  def ensure_safe_mode_enabled
+    raise Discourse::NotFound unless guardian.can_enable_safe_mode?
+  end
+
 end
diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb
index e96566fd25c..5a54591a0b0 100644
--- a/app/controllers/session_controller.rb
+++ b/app/controllers/session_controller.rb
@@ -1,5 +1,6 @@
 require_dependency 'rate_limiter'
 require_dependency 'single_sign_on'
+require_dependency 'url_helper'
 
 class SessionController < ApplicationController
   class LocalLoginNotAllowed < StandardError; end
@@ -7,9 +8,10 @@ class SessionController < ApplicationController
     render body: nil, status: 500
   end
 
-  before_action :check_local_login_allowed, only: %i(create forgot_password)
+  before_action :check_local_login_allowed, only: %i(create forgot_password email_login)
+  before_action :rate_limit_login, only: %i(create email_login)
   skip_before_action :redirect_to_login_if_required
-  skip_before_action :preload_json, :check_xhr, only: ['sso', 'sso_login', 'become', 'sso_provider', 'destroy']
+  skip_before_action :preload_json, :check_xhr, only: %i(sso sso_login sso_provider destroy email_login)
 
   ACTIVATE_USER_KEY = "activate_user"
 
@@ -42,8 +44,15 @@ class SessionController < ApplicationController
 
   def sso_provider(payload = nil)
     payload ||= request.query_string
+
     if SiteSetting.enable_sso_provider
       sso = SingleSignOn.parse(payload, SiteSetting.sso_secret)
+
+      if sso.return_sso_url.blank?
+        render plain: "return_sso_url is blank, it must be provided", status: 400
+        return
+      end
+
       if current_user
         sso.name = current_user.name
         sso.username = current_user.username
@@ -51,11 +60,19 @@ class SessionController < ApplicationController
         sso.external_id = current_user.id.to_s
         sso.admin = current_user.admin?
         sso.moderator = current_user.moderator?
-        sso.groups = current_user.groups.pluck(:name)
+        sso.groups = current_user.groups.pluck(:name).join(",")
 
-        if sso.return_sso_url.blank?
-          render plain: "return_sso_url is blank, it must be provided", status: 400
-          return
+        if current_user.uploaded_avatar.present?
+          avatar_url = "#{Discourse.store.absolute_base_url}/#{Discourse.store.get_path_for_upload(current_user.uploaded_avatar)}"
+          sso.avatar_url = UrlHelper.absolute Discourse.store.cdn_url(avatar_url)
+        end
+
+        if current_user.user_profile.profile_background.present?
+          sso.profile_background_url = UrlHelper.absolute upload_cdn_path(current_user.user_profile.profile_background)
+        end
+
+        if current_user.user_profile.card_background.present?
+          sso.card_background_url = UrlHelper.absolute upload_cdn_path(current_user.user_profile.card_background)
         end
 
         if request.xhr?
@@ -64,7 +81,7 @@ class SessionController < ApplicationController
           redirect_to sso.to_url(sso.return_sso_url)
         end
       else
-        session[:sso_payload] = request.query_string
+        cookies[:sso_payload] = request.query_string
         redirect_to path('/login')
       end
     else
@@ -74,13 +91,17 @@ class SessionController < ApplicationController
 
   # For use in development mode only when login options could be limited or disabled.
   # NEVER allow this to work in production.
-  def become
-    raise Discourse::InvalidAccess.new unless Rails.env.development?
-    user = User.find_by_username(params[:session_id])
-    raise "User #{params[:session_id]} not found" if user.blank?
+  if !Rails.env.production?
+    skip_before_action :check_xhr, only: [:become]
 
-    log_on_user(user)
-    redirect_to path("/")
+    def become
+      raise Discourse::InvalidAccess if Rails.env.production?
+      user = User.find_by_username(params[:session_id])
+      raise "User #{params[:session_id]} not found" if user.blank?
+
+      log_on_user(user)
+      redirect_to path("/")
+    end
   end
 
   def sso_login
@@ -187,8 +208,9 @@ class SessionController < ApplicationController
   end
 
   def create
-    RateLimiter.new(nil, "login-hr-#{request.remote_ip}", SiteSetting.max_logins_per_ip_per_hour, 1.hour).performed!
-    RateLimiter.new(nil, "login-min-#{request.remote_ip}", SiteSetting.max_logins_per_ip_per_minute, 1.minute).performed!
+    unless params[:second_factor_token].blank?
+      RateLimiter.new(nil, "second-factor-min-#{request.remote_ip}", 3, 1.minute).performed!
+    end
 
     params.require(:login)
     params.require(:password)
@@ -208,7 +230,7 @@ class SessionController < ApplicationController
 
       # If the site requires user approval and the user is not approved yet
       if login_not_approved_for?(user)
-        login_not_approved
+        render json: login_not_approved
         return
       end
 
@@ -220,20 +242,53 @@ class SessionController < ApplicationController
       return
     end
 
-    if user.suspended?
-      failed_to_login(user)
-      return
+    if payload = login_error_check(user)
+      render json: payload
+    else
+      if user.totp_enabled? && !user.authenticate_totp(params[:second_factor_token])
+        return render json: failed_json.merge(
+          error: I18n.t("login.invalid_second_factor_code"),
+          reason: "invalid_second_factor"
+        )
+      end
+
+      (user.active && user.email_confirmed?) ? login(user) : not_activated(user)
+    end
+  end
+
+  def email_login
+    raise Discourse::NotFound if !SiteSetting.enable_local_logins_via_email
+    second_factor_token = params[:second_factor_token]
+    token = params[:token]
+    valid_token = !!EmailToken.valid_token_format?(token)
+    user = EmailToken.confirmable(token)&.user
+
+    if valid_token && user&.totp_enabled?
+      RateLimiter.new(nil, "second-factor-min-#{request.remote_ip}", 3, 1.minute).performed!
+
+      if !second_factor_token.present?
+        @second_factor_required = true
+        return render layout: 'no_ember'
+      elsif !user.authenticate_totp(second_factor_token)
+        @error = I18n.t('login.invalid_second_factor_code')
+        return render layout: 'no_ember'
+      end
     end
 
-    if ScreenedIpAddress.should_block?(request.remote_ip)
-      return not_allowed_from_ip_address(user)
+    if user = EmailToken.confirm(token)
+      if login_not_approved_for?(user)
+        @error = login_not_approved[:error]
+      elsif payload = login_error_check(user)
+        @error = payload[:error]
+      else
+        log_on_user(user)
+        return redirect_to path("/")
+      end
+    else
+      @error = I18n.t('email_login.invalid_token')
     end
 
-    if ScreenedIpAddress.block_admin_login?(user, request.remote_ip)
-      return admin_not_allowed_from_ip_address(user)
-    end
-
-    (user.active && user.email_confirmed?) ? login(user) : not_activated(user)
+    render layout: 'no_ember'
   end
 
   def forgot_password
@@ -252,7 +307,7 @@ class SessionController < ApplicationController
       Jobs.enqueue(:critical_user_email, type: :forgot_password, user_id: user.id, email_token: email_token.token)
     end
 
-    json = { result: "ok" }
+    json = success_json
     unless SiteSetting.hide_email_address_taken
       json[:user_found] = user_presence
     end
@@ -291,6 +346,18 @@ class SessionController < ApplicationController
 
   private
 
+  def login_error_check(user)
+    return failed_to_login(user) if user.suspended?
+
+    if ScreenedIpAddress.should_block?(request.remote_ip)
+      return not_allowed_from_ip_address(user)
+    end
+
+    if ScreenedIpAddress.block_admin_login?(user, request.remote_ip)
+      return admin_not_allowed_from_ip_address(user)
+    end
+  end
+
   def login_not_approved_for?(user)
     SiteSetting.must_approve_users? && !user.approved? && !user.admin?
   end
@@ -300,7 +367,7 @@ class SessionController < ApplicationController
   end
 
   def login_not_approved
-    render json: { error: I18n.t("login.not_approved") }
+    { error: I18n.t("login.not_approved") }
   end
 
   def not_activated(user)
@@ -314,19 +381,21 @@ class SessionController < ApplicationController
   end
 
   def not_allowed_from_ip_address(user)
-    render json: { error: I18n.t("login.not_allowed_from_ip_address", username: user.username) }
+    { error: I18n.t("login.not_allowed_from_ip_address", username: user.username) }
   end
 
   def admin_not_allowed_from_ip_address(user)
-    render json: { error: I18n.t("login.admin_not_allowed_from_ip_address", username: user.username) }
+    { error: I18n.t("login.admin_not_allowed_from_ip_address", username: user.username) }
   end
 
   def failed_to_login(user)
     message = user.suspend_reason ? "login.suspended_with_reason" : "login.suspended"
 
-    render json: {
-      error: I18n.t(message, date: I18n.l(user.suspended_till, format: :date_only),
-                             reason: Rack::Utils.escape_html(user.suspend_reason)),
+    {
+      error: I18n.t(message,
+        date: I18n.l(user.suspended_till, format: :date_only),
+        reason: Rack::Utils.escape_html(user.suspend_reason)
+      ),
       reason: 'suspended'
     }
   end
@@ -335,13 +404,29 @@ class SessionController < ApplicationController
     session.delete(ACTIVATE_USER_KEY)
     log_on_user(user)
 
-    if payload = session.delete(:sso_payload)
+    if payload = cookies.delete(:sso_payload)
       sso_provider(payload)
     else
       render_serialized(user, UserSerializer)
     end
   end
 
+  def rate_limit_login
+    RateLimiter.new(
+      nil,
+      "login-hr-#{request.remote_ip}",
+      SiteSetting.max_logins_per_ip_per_hour,
+      1.hour
+    ).performed!
+
+    RateLimiter.new(
+      nil,
+      "login-min-#{request.remote_ip}",
+      SiteSetting.max_logins_per_ip_per_minute,
+      1.minute
+    ).performed!
+  end
+
   def render_sso_error(status:, text:)
     @sso_error = text
     render status: status, layout: 'no_ember'
diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
index 993200edb3f..196a4fe02c6 100644
--- a/app/controllers/static_controller.rb
+++ b/app/controllers/static_controller.rb
@@ -6,6 +6,7 @@ class StaticController < ApplicationController
   skip_before_action :check_xhr, :redirect_to_login_if_required
   skip_before_action :verify_authenticity_token, only: [:brotli_asset, :cdn_asset, :enter, :favicon, :service_worker_asset]
   skip_before_action :preload_json, only: [:brotli_asset, :cdn_asset, :enter, :favicon, :service_worker_asset]
+  skip_before_action :handle_theme, only: [:brotli_asset, :cdn_asset, :enter, :favicon, :service_worker_asset]
 
   PAGES_WITH_EMAIL_PARAM = ['login', 'password_reset', 'signup']
 
@@ -93,6 +94,8 @@ class StaticController < ApplicationController
     redirect_to destination
   end
 
+  FAVICON ||= -"favicon"
+
   # We need to be able to draw our favicon on a canvas
   # and pull it off the canvas into a data uri
   # This can work by ensuring people set all the right CORS
@@ -100,16 +103,18 @@ class StaticController < ApplicationController
   # instead we cache the favicon in redis and serve it out real quick with
   # a huge expiry, we also cache these assets in nginx so it bypassed if needed
   def favicon
+    is_asset_path
 
     hijack do
-      data = DistributedMemoizer.memoize('favicon' + SiteSetting.favicon_url, 60 * 30) do
+      data = DistributedMemoizer.memoize(FAVICON + SiteSetting.favicon_url, 60 * 30) do
         begin
           file = FileHelper.download(
             SiteSetting.favicon_url,
             max_file_size: 50.kilobytes,
-            tmp_file_name: "favicon.png",
+            tmp_file_name: FAVICON,
             follow_redirect: true
           )
+          file ||= Tempfile.new([FAVICON, ".png"])
           data = file.read
           file.unlink
           data
@@ -135,22 +140,31 @@ class StaticController < ApplicationController
   end
 
   def brotli_asset
+    is_asset_path
+
     serve_asset(".br") do
       response.headers["Content-Encoding"] = 'br'
     end
   end
 
   def cdn_asset
+    is_asset_path
+
     serve_asset
   end
 
   def service_worker_asset
+    is_asset_path
+
     respond_to do |format|
       format.js do
+        # https://github.com/w3c/ServiceWorker/blob/master/explainer.md#updating-a-service-worker
+        # Maximum cache that the service worker will respect is 24 hours.
+        # However, ensure that these may be cached and served for longer on servers.
+        immutable_for 1.year
 
-        # we take 1 hour to give a new service worker to all users
-        immutable_for 1.hour
-
+        path = File.expand_path(Rails.root + "public/assets/#{Rails.application.assets_manifest.assets['service-worker.js']}")
+        response.headers["Last-Modified"] = File.ctime(path).httpdate
         render(
           plain: Rails.application.assets_manifest.find_sources('service-worker.js').first,
           content_type: 'application/javascript'
diff --git a/app/controllers/steps_controller.rb b/app/controllers/steps_controller.rb
index ebfd4b530d4..d2b9285c67d 100644
--- a/app/controllers/steps_controller.rb
+++ b/app/controllers/steps_controller.rb
@@ -3,9 +3,9 @@ require_dependency 'wizard/builder'
 require_dependency 'wizard/step_updater'
 
 class StepsController < ApplicationController
+  requires_login
 
   before_action :ensure_wizard_enabled
-  before_action :ensure_logged_in
   before_action :ensure_admin
 
   def update
diff --git a/app/controllers/stylesheets_controller.rb b/app/controllers/stylesheets_controller.rb
index 32b1f8be8e4..7377d479893 100644
--- a/app/controllers/stylesheets_controller.rb
+++ b/app/controllers/stylesheets_controller.rb
@@ -6,6 +6,8 @@ class StylesheetsController < ApplicationController
   end
 
   def show
+    is_asset_path
+
     show_resource
   end
 
@@ -36,7 +38,13 @@ class StylesheetsController < ApplicationController
     end
 
     cache_time = request.env["HTTP_IF_MODIFIED_SINCE"]
-    cache_time = Time.rfc2822(cache_time) rescue nil if cache_time
+
+    if cache_time
+      begin
+        cache_time = Time.rfc2822(cache_time)
+      rescue ArgumentError
+      end
+    end
 
     query = StylesheetCache.where(target: target)
     if digest
@@ -80,12 +88,21 @@ class StylesheetsController < ApplicationController
   def handle_missing_cache(location, name, digest)
     location = location.sub(".css.map", ".css")
     source_map_location = location + ".map"
+    existing = read_file(location)
 
-    existing = File.read(location) rescue nil
     if existing && digest
-      source_map = File.read(source_map_location) rescue nil
+      source_map = read_file(source_map_location)
       StylesheetCache.add(name, digest, existing, source_map)
     end
   end
 
+  private
+
+    def read_file(location)
+      begin
+        File.read(location)
+      rescue Errno::ENOENT
+      end
+    end
+
 end
diff --git a/app/controllers/tag_groups_controller.rb b/app/controllers/tag_groups_controller.rb
index b55120954e1..65748f83780 100644
--- a/app/controllers/tag_groups_controller.rb
+++ b/app/controllers/tag_groups_controller.rb
@@ -1,6 +1,7 @@
 class TagGroupsController < ApplicationController
+  requires_login except: [:index, :show]
+
   skip_before_action :check_xhr, only: [:index, :show]
-  before_action :ensure_logged_in, except: [:index, :show]
   before_action :fetch_tag_group, only: [:show, :update, :destroy]
 
   def index
@@ -32,7 +33,7 @@ class TagGroupsController < ApplicationController
     if @tag_group.save
       render_serialized(@tag_group, TagGroupSerializer)
     else
-      return render_json_error(@tag_group)
+      render_json_error(@tag_group)
     end
   end
 
@@ -51,8 +52,7 @@ class TagGroupsController < ApplicationController
 
   def search
     matches = if params[:q].present?
-      term = params[:q].strip.downcase
-      TagGroup.where('lower(name) like ?', "%#{term}%")
+      TagGroup.where('lower(name) ILIKE ?', "%#{params[:q].strip}%")
     else
       TagGroup.all
     end
@@ -69,7 +69,20 @@ class TagGroupsController < ApplicationController
     end
 
     def tag_groups_params
-      result = params.permit(:id, :name, :one_per_topic, tag_names: [], parent_tag_name: [])
+      if permissions = params[:permissions]
+        permissions.each do |k, v|
+          permissions[k] = v.to_i
+        end
+      end
+
+      result = params.permit(
+        :id,
+        :name,
+        :one_per_topic,
+        tag_names: [],
+        parent_tag_name: [],
+        permissions: permissions&.keys,
+      )
       result[:tag_names] ||= []
       result[:parent_tag_name] ||= []
       result[:one_per_topic] = (params[:one_per_topic] == "true")
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 54115945e06..a673bb06d08 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -7,8 +7,7 @@ class TagsController < ::ApplicationController
 
   before_action :ensure_tags_enabled
 
-  skip_before_action :check_xhr, only: [:tag_feed, :show, :index]
-  before_action :ensure_logged_in, except: [
+  requires_login except: [
     :index,
     :show,
     :tag_feed,
@@ -16,33 +15,54 @@ class TagsController < ::ApplicationController
     :check_hashtag,
     Discourse.anonymous_filters.map { |f| :"show_#{f}" }
   ].flatten
-  before_action :set_category_from_params, except: [:index, :update, :destroy, :tag_feed, :search, :notifications, :update_notifications]
+
+  skip_before_action :check_xhr, only: [:tag_feed, :show, :index]
+
+  before_action :set_category_from_params, except: [:index, :update, :destroy,
+    :tag_feed, :search, :notifications, :update_notifications, :personal_messages]
 
   def index
-    categories = Category.where("id in (select category_id from category_tags)")
-      .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(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::COUNT_ARG)
-    @tags = self.class.tag_counts_json(tag_counts)
-
     @description_meta = I18n.t("tags.title")
     @title = @description_meta
 
     respond_to do |format|
+
       format.html do
         render :index
       end
+
       format.json do
-        render json: {
-          tags: @tags,
-          extras: { categories: category_tag_counts }
-        }
+        show_all_tags = guardian.can_admin_tags? && guardian.is_admin?
+
+        if SiteSetting.tags_listed_by_group
+          ungrouped_tags = Tag.where("tags.id NOT IN (SELECT tag_id FROM tag_group_memberships)")
+          ungrouped_tags = ungrouped_tags.where("tags.topic_count > 0") unless show_all_tags
+
+          grouped_tag_counts = TagGroup.visible(guardian).order('name ASC').includes(:tags).map do |tag_group|
+            { id: tag_group.id, name: tag_group.name, tags: self.class.tag_counts_json(tag_group.tags) }
+          end
+
+          render json: {
+            tags: self.class.tag_counts_json(ungrouped_tags),
+            extras: { tag_groups: grouped_tag_counts }
+          }
+        else
+          tags = show_all_tags ? Tag.all : Tag.where("tags.topic_count > 0")
+          unrestricted_tags = DiscourseTagging.filter_visible(tags, guardian)
+
+          categories = Category.where("id IN (SELECT category_id FROM category_tags)")
+            .where("id IN (?)", guardian.allowed_category_ids)
+            .includes(:tags)
+
+          category_tag_counts = categories.map do |c|
+            { id: c.id, tags: self.class.tag_counts_json(c.tags) }
+          end
+
+          render json: {
+            tags: self.class.tag_counts_json(unrestricted_tags),
+            extras: { categories: category_tag_counts }
+          }
+        end
       end
     end
   end
@@ -130,7 +150,7 @@ class TagsController < ::ApplicationController
     category = params[:categoryId] ? Category.find_by_id(params[:categoryId]) : nil
 
     tags_with_counts = DiscourseTagging.filter_allowed_tags(
-      Tag.tags_by_count_query(params.slice(:limit)),
+      Tag.order('topic_count DESC').limit(params[:limit]),
       guardian,
       for_input: params[:filterForInput],
       term: params[:q],
@@ -138,7 +158,7 @@ class TagsController < ::ApplicationController
       selected_tags: params[:selected_tags]
     )
 
-    tags = tags_with_counts.count(Tag::COUNT_ARG).map { |t, c| { id: t, text: t, count: c } }
+    tags = self.class.tag_counts_json(tags_with_counts)
 
     json_response = { results: tags }
 
@@ -175,18 +195,24 @@ class TagsController < ::ApplicationController
     render json: { valid: valid_tags }
   end
 
+  def personal_messages
+    guardian.ensure_can_tag_pms!
+    allowed_user = fetch_user_from_params
+    raise Discourse::NotFound if allowed_user.blank?
+    raise Discourse::NotFound if current_user.id != allowed_user.id && !@guardian.is_admin?
+    pm_tags = Tag.pm_tags(guardian: guardian, allowed_user: allowed_user)
+
+    render json: { tags: pm_tags }
+  end
+
   private
 
     def ensure_tags_enabled
       raise Discourse::NotFound unless SiteSetting.tagging_enabled?
     end
 
-    def self.tags_by_count(guardian, opts = {})
-      guardian.filter_allowed_categories(Tag.tags_by_count_query(opts))
-    end
-
-    def self.tag_counts_json(tag_counts)
-      tag_counts.map { |t, c| { id: t, text: t, count: c } }
+    def self.tag_counts_json(tags)
+      tags.map { |t| { id: t.name, text: t.name, count: t.topic_count, pm_count: t.pm_topic_count } }
     end
 
     def set_category_from_params
@@ -250,10 +276,14 @@ class TagsController < ::ApplicationController
     def construct_url_with(action, opts)
       method = url_method(opts)
 
-      url = if action == :prev
-        public_send(method, opts.merge(prev_page_params(opts)))
-      else # :next
-        public_send(method, opts.merge(next_page_params(opts)))
+      begin
+        url = if action == :prev
+          public_send(method, opts.merge(prev_page_params(opts)))
+        else # :next
+          public_send(method, opts.merge(next_page_params(opts)))
+        end
+      rescue ActionController::UrlGenerationError
+        raise Discourse::NotFound
       end
       url.sub('.json?', '?')
     end
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 8e31c28ed30..fd20607f9e8 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -4,37 +4,41 @@ require_dependency 'url_helper'
 require_dependency 'topics_bulk_action'
 require_dependency 'discourse_event'
 require_dependency 'rate_limiter'
+require_dependency 'topic_publisher'
 
 class TopicsController < ApplicationController
-  before_action :ensure_logged_in, only: [:timings,
-                                          :destroy_timings,
-                                          :update,
-                                          :star,
-                                          :destroy,
-                                          :recover,
-                                          :status,
-                                          :invite,
-                                          :mute,
-                                          :unmute,
-                                          :set_notifications,
-                                          :move_posts,
-                                          :merge_topic,
-                                          :clear_pin,
-                                          :re_pin,
-                                          :status_update,
-                                          :timer,
-                                          :bulk,
-                                          :reset_new,
-                                          :change_post_owners,
-                                          :change_timestamps,
-                                          :archive_message,
-                                          :move_to_inbox,
-                                          :convert_topic,
-                                          :bookmark]
+  requires_login only: [
+    :timings,
+    :destroy_timings,
+    :update,
+    :update_shared_draft,
+    :destroy,
+    :recover,
+    :status,
+    :invite,
+    :mute,
+    :unmute,
+    :set_notifications,
+    :move_posts,
+    :merge_topic,
+    :clear_pin,
+    :re_pin,
+    :status_update,
+    :timer,
+    :bulk,
+    :reset_new,
+    :change_post_owners,
+    :change_timestamps,
+    :archive_message,
+    :move_to_inbox,
+    :convert_topic,
+    :bookmark,
+    :publish
+  ]
 
   before_action :consider_user_for_promotion, only: :show
 
-  skip_before_action :check_xhr, only: [:show, :unsubscribe, :feed]
+  skip_before_action :check_xhr, only: [:show, :feed]
 
   def id_for_slug
     topic = Topic.find_by(slug: params[:slug].downcase)
@@ -113,6 +117,14 @@ class TopicsController < ApplicationController
 
     canonical_url UrlHelper.absolute_without_cdn(@topic_view.canonical_path)
 
+    # provide hint to crawlers only for now
+    # we would like to give them a bit more signal about age of data
+    if use_crawler_layout?
+      if last_modified = @topic_view.posts&.map { |p| p.updated_at }&.max&.httpdate
+        response.headers['Last-Modified'] = last_modified
+      end
+    end
+
     perform_show_response
 
   rescue Discourse::InvalidAccess => ex
@@ -130,28 +142,16 @@ class TopicsController < ApplicationController
     raise ex
   end
 
-  def unsubscribe
-    if current_user.blank?
-      cookies[:destination_url] = request.fullpath
-      return redirect_to "/login-preferences"
-    end
+  def publish
+    params.permit(:id, :destination_category_id)
 
-    @topic_view = TopicView.new(params[:topic_id], current_user)
+    topic = Topic.find(params[:id])
+    category = Category.find(params[:destination_category_id])
 
-    if slugs_do_not_match || (!request.format.json? && params[:slug].blank?)
-      return redirect_to @topic_view.topic.unsubscribe_url, status: 301
-    end
+    guardian.ensure_can_publish_topic!(topic, category)
+    topic = TopicPublisher.new(topic, current_user, category.id).publish!
 
-    tu = TopicUser.find_by(user_id: current_user.id, topic_id: params[:topic_id])
-
-    if tu && tu.notification_level > TopicUser.notification_levels[:regular]
-      tu.notification_level = TopicUser.notification_levels[:regular]
-      tu.save!
-    else
-      TopicUser.change(current_user.id, params[:topic_id].to_i, notification_level: TopicUser.notification_levels[:muted])
-    end
-
-    perform_show_response
+    render_serialized(topic.reload, BasicTopicSerializer)
   end
 
   def wordpress
@@ -221,6 +221,21 @@ class TopicsController < ApplicationController
     render body: nil
   end
 
+  def update_shared_draft
+    topic = Topic.find_by(id: params[:id])
+    guardian.ensure_can_edit!(topic)
+
+    category = Category.where(id: params[:category_id].to_i).first
+    guardian.ensure_can_publish_topic!(topic, category)
+
+    row_count = SharedDraft.where(topic_id: topic.id).update_all(category_id: category.id)
+    if row_count == 0
+      SharedDraft.create(topic_id: topic.id, category_id: category.id)
+    end
+
+    render json: success_json
+  end
+
   def update
     topic = Topic.find_by(id: params[:topic_id])
     guardian.ensure_can_edit!(topic)
@@ -385,19 +400,19 @@ class TopicsController < ApplicationController
         .where('topic_allowed_groups.group_id IN (?)', group_ids).pluck(:id)
       allowed_groups.each do |id|
         if archive
-          GroupArchivedMessage.archive!(id, topic.id)
+          GroupArchivedMessage.archive!(id, topic)
           group_id = id
         else
-          GroupArchivedMessage.move_to_inbox!(id, topic.id)
+          GroupArchivedMessage.move_to_inbox!(id, topic)
         end
       end
     end
 
     if topic.allowed_users.include?(current_user)
       if archive
-        UserArchivedMessage.archive!(current_user.id, topic.id)
+        UserArchivedMessage.archive!(current_user.id, topic)
       else
-        UserArchivedMessage.move_to_inbox!(current_user.id, topic.id)
+        UserArchivedMessage.move_to_inbox!(current_user.id, topic)
       end
     end
 
@@ -435,7 +450,7 @@ class TopicsController < ApplicationController
     guardian.ensure_can_recover_topic!(topic)
 
     first_post = topic.posts.with_deleted.order(:post_number).first
-    PostDestroyer.new(current_user, first_post).recover
+    PostDestroyer.new(current_user, first_post, context: params[:context]).recover
 
     render body: nil
   end
@@ -485,9 +500,10 @@ class TopicsController < ApplicationController
   end
 
   def invite
-    username_or_email = params[:user] ? fetch_username : fetch_email
-
     topic = Topic.find_by(id: params[:topic_id])
+    raise Discourse::InvalidParameters.new unless topic
+
+    username_or_email = params[:user] ? fetch_username : fetch_email
 
     groups = Group.lookup_groups(
       group_ids: params[:group_ids],
@@ -500,6 +516,7 @@ class TopicsController < ApplicationController
     begin
       if topic.invite(current_user, username_or_email, group_ids, params[:custom_message])
         user = User.find_by_username_or_email(username_or_email)
+
         if user
           render_json_dump BasicUserSerializer.new(user, scope: guardian, root: 'user')
         else
@@ -530,13 +547,18 @@ class TopicsController < ApplicationController
   end
 
   def move_posts
-    params.require(:post_ids)
-    params.require(:topic_id)
+    post_ids = params.require(:post_ids)
+    topic_id = params.require(:topic_id)
     params.permit(:category_id)
 
-    topic = Topic.with_deleted.find_by(id: params[:topic_id])
+    topic = Topic.with_deleted.find_by(id: topic_id)
     guardian.ensure_can_move_posts!(topic)
 
+    # when creating a new topic, ensure the 1st post is a regular post
+    if params[:title].present? && Post.where(topic: topic, id: post_ids).order(:post_number).pluck(:post_type).first != Post.types[:regular]
+      return render_json_error("When moving posts to a new topic, the first post must be a regular post.")
+    end
+
     dest_topic = move_posts_to_destination(topic)
     render_topic_changes(dest_topic)
   rescue ActiveRecord::RecordInvalid => ex
@@ -594,14 +616,25 @@ class TopicsController < ApplicationController
   end
 
   def timings
-    PostTiming.process_timings(
-      current_user,
-      topic_params[:topic_id].to_i,
-      topic_params[:topic_time].to_i,
-      (topic_params[:timings].to_h || {}).map { |post_number, t| [post_number.to_i, t.to_i] },
-      mobile: view_context.mobile_view?
-    )
-    render body: nil
+    allowed_params = topic_params
+
+    topic_id = allowed_params[:topic_id].to_i
+    topic_time = allowed_params[:topic_time].to_i
+    timings = allowed_params[:timings].to_h || {}
+
+    # ensure we capture current user for the block
+    user = current_user
+
+    hijack do
+      PostTiming.process_timings(
+        user,
+        topic_id,
+        topic_time,
+        timings.map { |post_number, t| [post_number.to_i, t.to_i] },
+        mobile: view_context.mobile_view?
+      )
+      render body: nil
+    end
   end
 
   def feed
@@ -622,9 +655,10 @@ class TopicsController < ApplicationController
       raise ActionController::ParameterMissing.new(:topic_ids)
     end
 
-    operation = params.require(:operation)
-    operation.permit!
-    operation = operation.to_h.symbolize_keys
+    operation = params
+      .require(:operation)
+      .permit(:type, :group, :category_id, :notification_level_id, tags: [])
+      .to_h.symbolize_keys
 
     raise ActionController::ParameterMissing.new(:operation_type) if operation[:type].blank?
     operator = TopicsBulkAction.new(current_user, topic_ids, operation, group: operation[:group])
diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index dcfaa4ed3c5..b2e1b9fac26 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -2,7 +2,8 @@ require "mini_mime"
 require_dependency 'upload_creator'
 
 class UploadsController < ApplicationController
-  before_action :ensure_logged_in, except: [:show]
+  requires_login except: [:show]
+
   skip_before_action :preload_json, :check_xhr, :redirect_to_login_if_required, only: [:show]
 
   def create
@@ -126,7 +127,7 @@ class UploadsController < ApplicationController
 
     upload.errors.empty? ? upload : { errors: upload.errors.values.flatten }
   ensure
-    tempfile&.close! rescue nil
+    tempfile&.close!
   end
 
 end
diff --git a/app/controllers/user_api_keys_controller.rb b/app/controllers/user_api_keys_controller.rb
index c6d41d2cc30..498a055e5d0 100644
--- a/app/controllers/user_api_keys_controller.rb
+++ b/app/controllers/user_api_keys_controller.rb
@@ -2,9 +2,9 @@ class UserApiKeysController < ApplicationController
 
   layout 'no_ember'
 
+  requires_login only: [:create, :revoke, :undo_revoke]
   skip_before_action :redirect_to_login_if_required, only: [:new]
   skip_before_action :check_xhr, :preload_json
-  before_action :ensure_logged_in, only: [:create, :revoke, :undo_revoke]
 
   AUTH_API_VERSION ||= 2
 
diff --git a/app/controllers/user_avatars_controller.rb b/app/controllers/user_avatars_controller.rb
index dc868d48054..03e9e034712 100644
--- a/app/controllers/user_avatars_controller.rb
+++ b/app/controllers/user_avatars_controller.rb
@@ -33,6 +33,8 @@ class UserAvatarsController < ApplicationController
   end
 
   def show_proxy_letter
+    is_asset_path
+
     if SiteSetting.external_system_avatars_url !~ /^\/letter_avatar_proxy/
       raise Discourse::NotFound
     end
@@ -56,6 +58,8 @@ class UserAvatarsController < ApplicationController
   end
 
   def show_letter
+    is_asset_path
+
     params.require(:username)
     params.require(:version)
     params.require(:size)
@@ -75,6 +79,8 @@ class UserAvatarsController < ApplicationController
   end
 
   def show
+    is_asset_path
+
     # we need multisite support to keep a single origin pull for CDNs
     RailsMultisite::ConnectionManagement.with_hostname(params[:hostname]) do
       hijack do
diff --git a/app/controllers/user_badges_controller.rb b/app/controllers/user_badges_controller.rb
index cd456a8c40f..b6b415d69a5 100644
--- a/app/controllers/user_badges_controller.rb
+++ b/app/controllers/user_badges_controller.rb
@@ -58,7 +58,11 @@ class UserBadgesController < ApplicationController
     post_id = nil
 
     if params[:reason].present?
-      path = URI.parse(params[:reason]).path rescue nil
+      path = begin
+        URI.parse(params[:reason]).path
+      rescue URI::InvalidURIError
+      end
+
       route = Rails.application.routes.recognize_path(path) if path
       if route
         topic_id = route[:topic_id].to_i
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 04ccf5fdf0d..9f708bd0cf7 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -41,20 +41,27 @@ class Users::OmniauthCallbacksController < ApplicationController
     @auth_result = authenticator.after_authenticate(auth)
 
     origin = request.env['omniauth.origin']
+
     if cookies[:destination_url].present?
       origin = cookies[:destination_url]
       cookies.delete(:destination_url)
     end
 
     if origin.present?
-      parsed = URI.parse(origin) rescue nil
+      parsed = begin
+        URI.parse(origin)
+      rescue URI::InvalidURIError
+      end
+
       if parsed
         @origin = "#{parsed.path}?#{parsed.query}"
       end
     end
 
-    unless @origin.present?
+    if @origin.blank?
       @origin = Discourse.base_uri("/")
+    else
+      @auth_result.destination_url = origin
     end
 
     if @auth_result.failed?
@@ -111,11 +118,24 @@ class Users::OmniauthCallbacksController < ApplicationController
   end
 
   def user_found(user)
+    if user.totp_enabled?
+      @auth_result.omniauth_disallow_totp = true
+      @auth_result.email = user.email
+      return
+    end
+
     # automatically activate/unstage any account if a provider marked the email valid
     if @auth_result.email_valid && @auth_result.email == user.email
-      user.update!(staged: false)
+      user.unstage
+      user.save
+
       # ensure there is an active email token
-      user.email_tokens.create(email: user.email) unless EmailToken.where(email: user.email, confirmed: true).present? || user.email_tokens.active.where(email: user.email).exists?
+      unless EmailToken.where(email: user.email, confirmed: true).exists? ||
+        user.email_tokens.active.where(email: user.email).exists?
+
+        user.email_tokens.create!(email: user.email)
+      end
+
       user.activate
       user.update!(registration_ip_address: request.remote_ip) if user.registration_ip_address.blank?
     end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index c18ad1f84cc..548ce754c65 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -8,10 +8,18 @@ require_dependency 'admin_confirmation'
 class UsersController < ApplicationController
 
   skip_before_action :authorize_mini_profiler, only: [:avatar]
-  skip_before_action :check_xhr, only: [:show, :badges, :password_reset, :update, :account_created, :activate_account, :perform_account_activation, :user_preferences_redirect, :avatar, :my_redirect, :toggle_anon, :admin_login, :confirm_admin]
 
-  before_action :ensure_logged_in, only: [:username, :update, :user_preferences_redirect, :upload_user_image,
-                                          :pick_avatar, :destroy_user_image, :destroy, :check_emails, :topic_tracking_state]
+  requires_login only: [
+    :username, :update, :user_preferences_redirect, :upload_user_image,
+    :pick_avatar, :destroy_user_image, :destroy, :check_emails, :topic_tracking_state,
+    :preferences, :create_second_factor, :update_second_factor
+  ]
+
+  skip_before_action :check_xhr, only: [
+    :show, :badges, :password_reset, :update, :account_created,
+    :activate_account, :perform_account_activation, :user_preferences_redirect, :avatar,
+    :my_redirect, :toggle_anon, :admin_login, :confirm_admin, :email_login
+  ]
 
   before_action :respond_to_suspicious_request, only: [:create]
 
@@ -29,6 +37,7 @@ class UsersController < ApplicationController
                                                             :update_activation_email,
                                                             :password_reset,
                                                             :confirm_email_token,
+                                                            :email_login,
                                                             :admin_login,
                                                             :confirm_admin]
 
@@ -39,8 +48,7 @@ class UsersController < ApplicationController
     return redirect_to path('/login') if SiteSetting.hide_user_profiles_from_public && !current_user
 
     @user = fetch_user_from_params(
-      { include_inactive: current_user.try(:staff?) || (current_user && SiteSetting.show_inactive_accounts) },
-      [{ user_profile: :card_image_badge }]
+      include_inactive: current_user.try(:staff?) || (current_user && SiteSetting.show_inactive_accounts)
     )
 
     user_serializer = UserSerializer.new(@user, scope: guardian, root: 'user')
@@ -81,23 +89,6 @@ class UsersController < ApplicationController
     show
   end
 
-  def card_badge
-  end
-
-  def update_card_badge
-    user = fetch_user_from_params
-    guardian.ensure_can_edit!(user)
-
-    user_badge = UserBadge.find_by(id: params[:user_badge_id].to_i)
-    if user_badge && user_badge.user == user && user_badge.badge.image.present?
-      user.user_profile.update_column(:card_image_badge_id, user_badge.badge.id)
-    else
-      user.user_profile.update_column(:card_image_badge_id, nil)
-    end
-
-    render body: nil
-  end
-
   def user_preferences_redirect
     redirect_to email_preferences_path(current_user.username_lower)
   end
@@ -107,6 +98,9 @@ class UsersController < ApplicationController
     guardian.ensure_can_edit!(user)
     attributes = user_params.merge!(custom_fields: params[:custom_fields])
 
+    # We can't update the username via this route. Use the username route
+    attributes.delete(:username)
+
     if params[:user_fields].present?
       attributes[:custom_fields] = {} unless params[:custom_fields].present?
 
@@ -178,7 +172,7 @@ class UsersController < ApplicationController
 
     user_badge = UserBadge.find_by(id: params[:user_badge_id])
     if user_badge && user_badge.user == user && user_badge.badge.allow_title?
-      user.title = user_badge.badge.name
+      user.title = user_badge.badge.display_name
       user.user_profile.badge_granted_title = true
       user.save!
       user.user_profile.save!
@@ -312,8 +306,6 @@ class UsersController < ApplicationController
     params[:for_user_id] ? User.find(params[:for_user_id]) : current_user
   end
 
-  FROM_STAGED = "from_staged".freeze
-
   def create
     params.require(:email)
     params.permit(:user_fields)
@@ -334,14 +326,9 @@ class UsersController < ApplicationController
       return fail_with("login.reserved_username")
     end
 
-    if user = User.where(staged: true).with_email(params[:email].strip.downcase).first
-      user_params.each { |k, v| user.send("#{k}=", v) }
-      user.staged = false
-      user.active = false
-      user.custom_fields[FROM_STAGED] = true
-    else
-      user = User.new(user_params)
-    end
+    new_user_params = user_params
+    user = User.unstage(new_user_params)
+    user = User.new(new_user_params) if user.nil?
 
     # Handle API approval
     if user.approved
@@ -370,7 +357,7 @@ class UsersController < ApplicationController
     authentication = UserAuthenticator.new(user, session)
 
     if !authentication.has_authenticator? && !SiteSetting.enable_local_logins
-      return render body: nil, status: 500
+      return render body: nil, status: :forbidden
     end
 
     authentication.start
@@ -465,12 +452,24 @@ class UsersController < ApplicationController
       end
     end
 
+    totp_enabled = @user&.totp_enabled?
+
+    if !totp_enabled || @user.authenticate_totp(params[:second_factor_token])
+      secure_session["second-factor-#{token}"] = "true"
+    end
+
+    valid_second_factor = secure_session["second-factor-#{token}"] == "true"
+
     if !@user
       @error = I18n.t('password_reset.no_token')
     elsif request.put?
       @invalid_password = params[:password].blank? || params[:password].length > User.max_password_length
 
-      if @invalid_password
+      if !valid_second_factor
+        RateLimiter.new(nil, "second-factor-min-#{request.remote_ip}", 3, 1.minute).performed!
+        @user.errors.add(:user_second_factor, :invalid)
+        @error = I18n.t('login.invalid_second_factor_code')
+      elsif @invalid_password
         @user.errors.add(:password, :invalid)
       else
         @user.password = params[:password]
@@ -479,6 +478,7 @@ class UsersController < ApplicationController
         if @user.save
           Invite.invalidate_for_email(@user.email) # invite link can't be used to log in anymore
           secure_session["password-#{token}"] = nil
+          secure_session["second-factor-#{token}"] = nil
           logon_after_password_reset
         end
       end
@@ -491,9 +491,14 @@ class UsersController < ApplicationController
         else
           store_preloaded(
             "password_reset",
-            MultiJson.dump(is_developer: UsernameCheckerService.is_developer?(@user.email), admin: @user.admin?)
+            MultiJson.dump(
+              is_developer: UsernameCheckerService.is_developer?(@user.email),
+              admin: @user.admin?,
+              second_factor_required: !valid_second_factor
+            )
           )
         end
+
         return redirect_to(wizard_path) if request.put? && Wizard.user_requires_completion?(@user)
       end
 
@@ -516,7 +521,11 @@ class UsersController < ApplicationController
             }
           end
         else
-          render json: { is_developer: UsernameCheckerService.is_developer?(@user.email), admin: @user.admin? }
+          render json: {
+            is_developer: UsernameCheckerService.is_developer?(@user.email),
+            admin: @user.admin?,
+            second_factor_required: !valid_second_factor
+          }
         end
       end
     end
@@ -543,35 +552,61 @@ class UsersController < ApplicationController
   end
 
   def admin_login
-    if current_user
-      return redirect_to path("/")
-    end
+    return redirect_to(path("/")) if current_user
 
-    if request.put?
+    if request.put? && params[:email].present?
       RateLimiter.new(nil, "admin-login-hr-#{request.remote_ip}", 6, 1.hour).performed!
       RateLimiter.new(nil, "admin-login-min-#{request.remote_ip}", 3, 1.minute).performed!
 
-      user = User.with_email(params[:email]).where(admin: true).human_users.first
-      if user
+      if user = User.with_email(params[:email]).admins.human_users.first
         email_token = user.email_tokens.create(email: user.email)
         Jobs.enqueue(:critical_user_email, type: :admin_login, user_id: user.id, email_token: email_token.token)
         @message = I18n.t("admin_login.success")
       else
-        @message = I18n.t("admin_login.error")
+        @message = I18n.t("admin_login.errors.unknown_email_address")
       end
-    elsif params[:token].present?
-      # token recieved, try to login
-      if EmailToken.valid_token_format?(params[:token])
-        @user = EmailToken.confirm(params[:token])
-        if @user && @user.admin?
-          # Log in user
-          log_on_user(@user)
-          return redirect_to path("/")
-        else
-          @message = I18n.t("admin_login.error")
+    elsif (token = params[:token]).present?
+      valid_token = EmailToken.valid_token_format?(token)
+
+      if valid_token
+        if params[:second_factor_token].present?
+          RateLimiter.new(nil, "second-factor-min-#{request.remote_ip}", 3, 1.minute).performed!
+        end
+
+        email_token_user = EmailToken.confirmable(token)&.user
+        totp_enabled = email_token_user&.totp_enabled?
+        second_factor_token = params[:second_factor_token]
+        confirm_email = false
+
+        confirm_email =
+          if totp_enabled
+            @second_factor_required = true
+            @message = I18n.t("login.second_factor_title")
+
+            if second_factor_token.present?
+              if email_token_user.authenticate_totp(second_factor_token)
+                true
+              else
+                @error = I18n.t("login.invalid_second_factor_code")
+                false
+              end
+            end
+          else
+            true
+          end
+
+        if confirm_email
+          @user = EmailToken.confirm(token)
+
+          if @user && @user.admin?
+            log_on_user(@user)
+            return redirect_to path("/")
+          else
+            @message = I18n.t("admin_login.errors.unknown_email_address")
+          end
         end
       else
-        @message = I18n.t("admin_login.error")
+        @message = I18n.t("admin_login.errors.invalid_token")
       end
     end
 
@@ -581,6 +616,40 @@ class UsersController < ApplicationController
     render layout: false
   end
 
+  def email_login
+    raise Discourse::NotFound if !SiteSetting.enable_local_logins_via_email
+    return redirect_to path("/") if current_user
+
+    expires_now
+    params.require(:login)
+
+    RateLimiter.new(nil, "email-login-hour-#{request.remote_ip}", 6, 1.hour).performed!
+    RateLimiter.new(nil, "email-login-min-#{request.remote_ip}", 3, 1.minute).performed!
+    user = User.human_users.find_by_username_or_email(params[:login])
+    user_presence = user.present? && !user.staged
+
+    if user
+      RateLimiter.new(nil, "email-login-hour-#{user.id}", 6, 1.hour).performed!
+      RateLimiter.new(nil, "email-login-min-#{user.id}", 3, 1.minute).performed!
+
+      if user_presence
+        email_token = user.email_tokens.create!(email: user.email)
+
+        Jobs.enqueue(:critical_user_email,
+          type: :email_login,
+          user_id: user.id,
+          email_token: email_token.token
+        )
+      end
+    end
+
+    json = success_json
+    json[:user_found] = user_presence unless SiteSetting.hide_email_address_taken
+    render json: json
+  rescue RateLimiter::LimitExceeded
+    render_json_error(I18n.t("rate_limiter.slow_down"))
+  end
+
   def toggle_anon
     user = AnonymousShadowCreator.get_master(current_user) ||
            AnonymousShadowCreator.get(current_user)
@@ -594,20 +663,23 @@ class UsersController < ApplicationController
   end
 
   def account_created
-    return redirect_to("/") if current_user.present?
+    if current_user.present?
+      if SiteSetting.enable_sso_provider && payload = cookies.delete(:sso_payload)
+        return redirect_to(session_sso_provider_url + "?" + payload)
+      else
+        return redirect_to("/")
+      end
+    end
 
     @custom_body_class = "static-account-created"
     @message = session['user_created_message'] || I18n.t('activation.missing_session')
-    @account_created = {
-      message: @message,
-      show_controls: false
-    }
+    @account_created = { message: @message, show_controls: false }
 
     if session_user_id = session[SessionController::ACTIVATE_USER_KEY]
       if user = User.where(id: session_user_id.to_i).first
         @account_created[:username] = user.username
         @account_created[:email] = user.email
-        @account_created[:show_controls] = !user.custom_fields[FROM_STAGED]
+        @account_created[:show_controls] = !user.from_staged?
       end
     end
 
@@ -627,8 +699,8 @@ class UsersController < ApplicationController
 
   def perform_account_activation
     raise Discourse::InvalidAccess.new if honeypot_or_challenge_fails?(params)
-    if @user = EmailToken.confirm(params[:token])
 
+    if @user = EmailToken.confirm(params[:token])
       # Log in the user unless they need to be approved
       if Guardian.new(@user).can_access_forum?
         @user.enqueue_welcome_message('welcome_user') if @user.send_welcome_message
@@ -639,14 +711,16 @@ class UsersController < ApplicationController
         elsif destination_url = cookies[:destination_url]
           cookies[:destination_url] = nil
           return redirect_to(destination_url)
+        elsif SiteSetting.enable_sso_provider && payload = cookies.delete(:sso_payload)
+          return redirect_to(session_sso_provider_url + "?" + payload)
         end
       else
         @needs_approval = true
       end
-
     else
       flash.now[:error] = I18n.t('activation.already_done')
     end
+
     render layout: 'no_ember'
   end
 
@@ -661,17 +735,12 @@ class UsersController < ApplicationController
       @user = User.where(id: user_key.to_i).first
     end
 
-    if @user.blank? || @user.active? || current_user.present?
-      raise Discourse::InvalidAccess.new
-    end
-
-    if @user.custom_fields[FROM_STAGED]
+    if @user.blank? || @user.active? || current_user.present? || @user.from_staged?
       raise Discourse::InvalidAccess.new
     end
 
     User.transaction do
       primary_email = @user.primary_email
-
       primary_email.email = params[:email]
       primary_email.skip_validate_email = false
 
@@ -680,7 +749,7 @@ class UsersController < ApplicationController
         enqueue_activation_email
         render json: success_json
       else
-        render_json_error(@user)
+        render_json_error(primary_email)
       end
     end
   end
@@ -756,6 +825,7 @@ class UsersController < ApplicationController
     if include_groups || groups
       groups = Group.search_groups(term, groups: groups)
       groups = groups.where(visibility_level: Group.visibility_levels[:public]) if include_groups
+      groups = groups.order('groups.name asc')
 
       to_render[:groups] = groups.map do |m|
         { name: m.name, full_name: m.full_name }
@@ -867,6 +937,61 @@ class UsersController < ApplicationController
     render layout: 'no_ember'
   end
 
+  def create_second_factor
+    raise Discourse::NotFound if SiteSetting.enable_sso || !SiteSetting.enable_local_logins
+    RateLimiter.new(nil, "login-hr-#{request.remote_ip}", SiteSetting.max_logins_per_ip_per_hour, 1.hour).performed!
+    RateLimiter.new(nil, "login-min-#{request.remote_ip}", SiteSetting.max_logins_per_ip_per_minute, 1.minute).performed!
+
+    unless current_user.confirm_password?(params[:password])
+      return render json: failed_json.merge(
+        error: I18n.t("login.incorrect_password")
+      )
+    end
+
+    qrcode_svg = RQRCode::QRCode.new(current_user.totp_provisioning_uri).as_svg(
+      offset: 0,
+      color: '000',
+      shape_rendering: 'crispEdges',
+      module_size: 4
+    )
+
+    render json: success_json.merge(
+      key: current_user.user_second_factor.data.scan(/.{4}/).join(" "),
+      qr: qrcode_svg
+    )
+  end
+
+  def update_second_factor
+    params.require(:second_factor_token)
+
+    [request.remote_ip, current_user.id].each do |key|
+      RateLimiter.new(nil, "second-factor-min-#{key}", 3, 1.minute).performed!
+    end
+
+    user_second_factor = current_user.user_second_factor
+    raise Discourse::InvalidParameters unless user_second_factor
+
+    unless current_user.authenticate_totp(params[:second_factor_token])
+      return render json: failed_json.merge(
+        error: I18n.t("login.invalid_second_factor_code")
+      )
+    end
+
+    if params[:enable] == "true"
+      user_second_factor.update!(enabled: true)
+    else
+      user_second_factor.destroy!
+
+      Jobs.enqueue(
+        :critical_user_email,
+        type: :account_second_factor_disabled,
+        user_id: current_user.id
+      )
+    end
+
+    render json: success_json
+  end
+
   private
 
     def honeypot_value
@@ -925,7 +1050,7 @@ class UsersController < ApplicationController
 
       permitted.concat UserUpdater::OPTION_ATTR
       permitted.concat UserUpdater::CATEGORY_IDS.keys.map { |k| { k => [] } }
-      permitted.concat UserUpdater::TAG_NAMES.keys.map { |k| { k => [] } }
+      permitted.concat UserUpdater::TAG_NAMES.keys
 
       result = params
         .permit(permitted)
@@ -943,7 +1068,12 @@ class UsersController < ApplicationController
         result.merge!(params.permit(:active, :staged, :approved))
       end
 
-      result
+      modify_user_params(result)
+    end
+
+    # Plugins can use this to modify user parameters
+    def modify_user_params(attrs)
+      attrs
     end
 
     def user_locale
diff --git a/app/controllers/users_email_controller.rb b/app/controllers/users_email_controller.rb
index 6e1e2a1f0c7..2fd289edb07 100644
--- a/app/controllers/users_email_controller.rb
+++ b/app/controllers/users_email_controller.rb
@@ -4,7 +4,7 @@ require_dependency 'email_updater'
 
 class UsersEmailController < ApplicationController
 
-  before_action :ensure_logged_in, only: [:index, :update]
+  requires_login only: [:index, :update]
 
   skip_before_action :check_xhr, only: [:confirm]
   skip_before_action :redirect_to_login_if_required, only: [:confirm]
@@ -33,12 +33,32 @@ class UsersEmailController < ApplicationController
 
   def confirm
     expires_now
-    updater = EmailUpdater.new
-    @update_result = updater.confirm(params[:token])
 
-    if @update_result == :complete
-      updater.user.user_stat.reset_bounce_score!
-      log_on_user(updater.user)
+    token = EmailToken.confirmable(params[:token])
+    user = token&.user
+
+    change_request =
+      if user
+        user.email_change_requests.where(new_email_token_id: token.id).first
+      end
+
+    if change_request&.change_state == EmailChangeRequest.states[:authorizing_new] &&
+       user.totp_enabled? && !user.authenticate_totp(params[:second_factor_token])
+
+      @update_result = :invalid_second_factor
+
+      if params[:second_factor_token].present?
+        RateLimiter.new(nil, "second-factor-min-#{request.remote_ip}", 3, 1.minute).performed!
+        @show_invalid_second_factor_error = true
+      end
+    else
+      updater = EmailUpdater.new
+      @update_result = updater.confirm(params[:token])
+
+      if @update_result == :complete
+        updater.user.user_stat.reset_bounce_score!
+        log_on_user(updater.user)
+      end
     end
 
     render layout: 'no_ember'
diff --git a/app/controllers/webhooks_controller.rb b/app/controllers/webhooks_controller.rb
index 1c56b33dd1f..b6e1ad2093c 100644
--- a/app/controllers/webhooks_controller.rb
+++ b/app/controllers/webhooks_controller.rb
@@ -77,8 +77,8 @@ class WebhooksController < ActionController::Base
   def mandrill
     events = params["mandrill_events"]
     events.each do |event|
-      message_id = event["msg"]["metadata"]["message_id"] rescue nil
-      to_address = event["msg"]["email"] rescue nil
+      message_id = event.dig("msg", "metadata", "message_id")
+      to_address = event.dig("msg", "email")
 
       case event["event"]
       when "hard_bounce"
@@ -94,12 +94,12 @@ class WebhooksController < ActionController::Base
   def sparkpost
     events = params["_json"] || [params]
     events.each do |event|
-      message_event = event["msys"]["message_event"] rescue nil
+      message_event = event.dig("msys", "message_event")
       next unless message_event
 
-      message_id   = message_event["rcpt_meta"]["message_id"] rescue nil
-      to_address   = message_event["rcpt_to"]                 rescue nil
-      bounce_class = message_event["bounce_class"]            rescue nil
+      message_id   = message_event.dig("rcpt_meta", "message_id")
+      to_address   = message_event["rcpt_to"]
+      bounce_class = message_event["bounce_class"]
       next unless bounce_class
 
       bounce_class = bounce_class.to_i
diff --git a/app/controllers/wizard_controller.rb b/app/controllers/wizard_controller.rb
index 3c52ee68f31..1bfa774f148 100644
--- a/app/controllers/wizard_controller.rb
+++ b/app/controllers/wizard_controller.rb
@@ -2,10 +2,10 @@ require_dependency 'wizard'
 require_dependency 'wizard/builder'
 
 class WizardController < ApplicationController
-  before_action :ensure_wizard_enabled, only: [:index]
-  before_action :ensure_logged_in, except: [:qunit]
-  before_action :ensure_admin, except: [:qunit]
+  requires_login except: [:qunit]
 
+  before_action :ensure_admin, except: [:qunit]
+  before_action :ensure_wizard_enabled, only: [:index]
   skip_before_action :check_xhr, :preload_json
 
   layout false
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index cfc0006677c..696a2a870a6 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -75,6 +75,13 @@ module ApplicationHelper
       path.gsub!("#{GlobalSetting.cdn_url}/assets/", "#{GlobalSetting.cdn_url}/brotli_asset/")
     end
 
+    if Rails.env == "development"
+      if !path.include?("?")
+        # cache breaker for mobile iOS
+        path = path + "?#{Time.now.to_f}"
+      end
+    end
+
 "<link rel='preload' href='#{path}' as='script'/>
 <script src='#{path}'></script>".html_safe
   end
diff --git a/app/helpers/common_helper.rb b/app/helpers/common_helper.rb
index 1d8317554cf..6e37098d2d8 100644
--- a/app/helpers/common_helper.rb
+++ b/app/helpers/common_helper.rb
@@ -5,9 +5,15 @@ module CommonHelper
     end
   end
 
-  def render_google_tag_manager_code
+  def render_google_tag_manager_head_code
     if Rails.env.production? && SiteSetting.gtm_container_id.present?
-      render partial: "common/google_tag_manager"
+      render partial: "common/google_tag_manager_head"
+    end
+  end
+
+  def render_google_tag_manager_body_code
+    if Rails.env.production? && SiteSetting.gtm_container_id.present?
+      render partial: "common/google_tag_manager_body"
     end
   end
 end
diff --git a/app/helpers/embed_helper.rb b/app/helpers/embed_helper.rb
index 53eedd62592..3115f59e1f4 100644
--- a/app/helpers/embed_helper.rb
+++ b/app/helpers/embed_helper.rb
@@ -14,27 +14,7 @@ module EmbedHelper
     end
   end
 
-  def get_html(cooked)
-    fragment = Nokogiri::HTML.fragment(cooked)
-
-    # convert lazyYT div to link
-    fragment.css('div.lazyYT').each do |yt_div|
-      youtube_id = yt_div["data-youtube-id"]
-      youtube_link = "https://www.youtube.com/watch?v=#{youtube_id}"
-      yt_div.replace "<p><a href='#{youtube_link}'>#{youtube_link}</a></p>"
-    end
-
-    # convert Vimeo iframe to link
-    fragment.css('iframe').each do |iframe|
-      if iframe['src'] =~ /player.vimeo.com/
-        vimeo_id = iframe['src'].split('/').last
-        iframe.replace "<p><a href='https://vimeo.com/#{vimeo_id}'>https://vimeo.com/#{vimeo_id}</a></p>"
-      end
-    end
-
-    # Strip lightbox metadata
-    fragment.css('.lightbox-wrapper .meta').remove
-
-    raw fragment
+  def get_html(post)
+    raw PrettyText.format_for_email(post.cooked, post)
   end
 end
diff --git a/app/helpers/user_notifications_helper.rb b/app/helpers/user_notifications_helper.rb
index 2e18c702ee3..b284f69c611 100644
--- a/app/helpers/user_notifications_helper.rb
+++ b/app/helpers/user_notifications_helper.rb
@@ -32,25 +32,28 @@ module UserNotificationsHelper
     "<a href='#{Discourse.base_url}' style='color: ##{color}'>#{@site_name}</a>"
   end
 
-  def first_paragraph_from(html)
+  def first_paragraphs_from(html)
     doc = Nokogiri::HTML(html)
 
     result = ""
-    doc.css('body > p, aside.onebox').each do |node|
+    length = 0
+
+    doc.css('body > p, aside.onebox, body > ul, body > blockquote').each do |node|
       if node.text.present?
         result << node.to_s
-        return result if result.size >= 100
+        length += node.inner_text.length
+        return result if length >= SiteSetting.digest_min_excerpt_length
       end
     end
+
     return result unless result.blank?
 
     # If there is no first paragaph, return the first div (onebox)
     doc.css('div').first
   end
 
-  def email_excerpt(html_arg, posts_count = nil)
-    # only include 1st paragraph when more than 1 posts
-    html = (posts_count.nil? || posts_count > 1) ? (first_paragraph_from(html_arg) || html_arg).to_s : html_arg
+  def email_excerpt(html_arg)
+    html = (first_paragraphs_from(html_arg) || html_arg).to_s
     PrettyText.format_for_email(html).html_safe
   end
 
diff --git a/app/jobs/onceoff/init_category_tag_stats.rb b/app/jobs/onceoff/init_category_tag_stats.rb
new file mode 100644
index 00000000000..43abdc0b429
--- /dev/null
+++ b/app/jobs/onceoff/init_category_tag_stats.rb
@@ -0,0 +1,18 @@
+module Jobs
+  class InitCategoryTagStats < Jobs::Onceoff
+    def execute_onceoff(args)
+      CategoryTagStat.exec_sql "DELETE FROM category_tag_stats"
+
+      CategoryTagStat.exec_sql <<~SQL
+    INSERT INTO category_tag_stats (category_id, tag_id, topic_count)
+         SELECT topics.category_id, tags.id, COUNT(topics.id)
+           FROM tags
+     INNER JOIN topic_tags ON tags.id = topic_tags.tag_id
+     INNER JOIN topics ON topics.id = topic_tags.topic_id
+            AND topics.deleted_at IS NULL
+            AND topics.category_id IS NOT NULL
+       GROUP BY tags.id, topics.category_id
+      SQL
+    end
+  end
+end
diff --git a/app/jobs/regular/automatic_group_membership.rb b/app/jobs/regular/automatic_group_membership.rb
index 4e688d84000..2b53ffb49cc 100644
--- a/app/jobs/regular/automatic_group_membership.rb
+++ b/app/jobs/regular/automatic_group_membership.rb
@@ -4,10 +4,10 @@ module Jobs
 
     def execute(args)
       group_id = args[:group_id]
-
       raise Discourse::InvalidParameters.new(:group_id) if group_id.blank?
 
-      group = Group.find(group_id)
+      group = Group.find_by(id: group_id)
+      raise Discourse::InvalidParameters.new(:group_id) if group.nil?
 
       return unless group.automatic_membership_retroactive
 
diff --git a/app/jobs/regular/backup_chunks_merger.rb b/app/jobs/regular/backup_chunks_merger.rb
index 97846fd4761..23cda4d2640 100644
--- a/app/jobs/regular/backup_chunks_merger.rb
+++ b/app/jobs/regular/backup_chunks_merger.rb
@@ -1,7 +1,7 @@
 module Jobs
 
   class BackupChunksMerger < Jobs::Base
-    sidekiq_options retry: false
+    sidekiq_options queue: 'critical', retry: false
 
     def execute(args)
       filename   = args[:filename]
@@ -19,6 +19,10 @@ module Jobs
 
       # merge all chunks
       HandleChunkUpload.merge_chunks(chunks, upload_path: backup_path, tmp_upload_path: tmp_backup_path, model: Backup, identifier: identifier, filename: filename, tmp_directory: tmp_directory)
+
+      # push an updated list to the clients
+      data = ActiveModel::ArraySerializer.new(Backup.all, each_serializer: BackupSerializer).as_json
+      MessageBus.publish("/admin/backups", data, user_ids: User.staff.pluck(:id))
     end
 
   end
diff --git a/app/jobs/regular/bulk_invite.rb b/app/jobs/regular/bulk_invite.rb
index dbb195a5cdf..2d6f0e6454e 100644
--- a/app/jobs/regular/bulk_invite.rb
+++ b/app/jobs/regular/bulk_invite.rb
@@ -17,19 +17,20 @@ module Jobs
       filename = args[:filename]
       @current_user = User.find_by(id: args[:current_user_id])
       raise Discourse::InvalidParameters.new(:filename) if filename.blank?
+      csv_path = "#{Invite.base_directory}/#{filename}"
 
       # read csv file, and send out invitations
-      read_csv_file("#{Invite.base_directory}/#{filename}")
+      read_csv_file(csv_path)
     ensure
       # send notification to user regarding progress
       notify_user
 
-      # since emails have already been sent out, delete the uploaded csv file
-      FileUtils.rm_rf(csv_path) rescue nil
+      FileUtils.rm_rf(csv_path) if csv_path
     end
 
     def read_csv_file(csv_path)
-      CSV.foreach(csv_path, encoding: "bom|utf-8") do |csv_info|
+      file = File.open(csv_path, encoding: 'bom|utf-8')
+      CSV.new(file).each do |csv_info|
         if csv_info[0]
           if (EmailValidator.email_regex =~ csv_info[0])
             # email is valid
@@ -45,6 +46,8 @@ module Jobs
     rescue Exception => e
       log "Bulk Invite Process Failed -- '#{e.message}'"
       @failed += 1
+    ensure
+      file.close
     end
 
     def get_group_ids(group_names, csv_line_number)
diff --git a/app/jobs/regular/close_topic.rb b/app/jobs/regular/close_topic.rb
deleted file mode 100644
index 5ebbfaca403..00000000000
--- a/app/jobs/regular/close_topic.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-
-module Jobs
-  class CloseTopic < Jobs::Base
-
-    def execute(args)
-      # This file is back temporarily to handle jobs that are enqueued
-      # far in the future that haven't been migrated to the ToggleTopicClosed
-      # job.
-    end
-
-  end
-end
diff --git a/app/jobs/regular/download_profile_background_from_url.rb b/app/jobs/regular/download_profile_background_from_url.rb
new file mode 100644
index 00000000000..43414db9d11
--- /dev/null
+++ b/app/jobs/regular/download_profile_background_from_url.rb
@@ -0,0 +1,28 @@
+module Jobs
+
+  class DownloadProfileBackgroundFromUrl < 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)
+
+      begin
+        UserProfile.import_url_for_user(
+          url,
+          user,
+          is_card_background: args[:is_card_background],
+        )
+      rescue Discourse::InvalidParameters => e
+        raise e unless e.message == 'url'
+      end
+    end
+
+  end
+
+end
diff --git a/app/jobs/regular/emit_web_hook_event.rb b/app/jobs/regular/emit_web_hook_event.rb
index f58b558ebb1..db90dd04019 100644
--- a/app/jobs/regular/emit_web_hook_event.rb
+++ b/app/jobs/regular/emit_web_hook_event.rb
@@ -2,8 +2,13 @@ require 'excon'
 
 module Jobs
   class EmitWebHookEvent < Jobs::Base
+    PING_EVENT = 'ping'.freeze
+
     def execute(args)
-      [:web_hook_id, :event_type].each do |key|
+      %i{
+        web_hook_id
+        event_type
+      }.each do |key|
         raise Discourse::InvalidParameters.new(key) unless args[key].present?
       end
 
@@ -19,8 +24,8 @@ module Jobs
         return if web_hook.category_ids.present? && (!args[:category_id].present? ||
           !web_hook.category_ids.include?(args[:category_id]))
 
-        event_type = args[:event_type].to_s
-        return unless self.send("setup_#{event_type}", args)
+        raise Discourse::InvalidParameters.new(:payload) unless args[:payload].present?
+        args[:payload] = JSON.parse(args[:payload])
       end
 
       web_hook_request(args, web_hook)
@@ -32,31 +37,12 @@ module Jobs
       Guardian.new(Discourse.system_user)
     end
 
-    def setup_post(args)
-      post = Post.find_by(id: args[:post_id])
-      return if post.blank?
-      args[:payload] = WebHookPostSerializer.new(post, scope: guardian, root: false).as_json
-    end
-
-    def setup_topic(args)
-      topic_view = (TopicView.new(args[:topic_id], Discourse.system_user) rescue nil)
-      return if topic_view.blank?
-      args[:payload] = WebHookTopicViewSerializer.new(topic_view, scope: guardian, root: false).as_json
-    end
-
-    def setup_user(args)
-      user = User.find_by(id: args[:user_id])
-      return if user.blank?
-      args[:payload] = WebHookUserSerializer.new(user, scope: guardian, root: false).as_json
-    end
-
     def ping_event?(event_type)
-      event_type.to_s == 'ping'.freeze
+      PING_EVENT == event_type.to_s
     end
 
     def build_web_hook_body(args, web_hook)
       body = {}
-      guardian = Guardian.new(Discourse.system_user)
       event_type = args[:event_type].to_s
 
       if ping_event?(event_type)
@@ -66,7 +52,6 @@ module Jobs
       end
 
       new_body = Plugin::Filter.apply(:after_build_web_hook_body, self, body)
-
       MultiJson.dump(new_body)
     end
 
@@ -97,7 +82,7 @@ module Jobs
           'Content-Length' => body.bytesize,
           'Content-Type' => content_type,
           'Host' => uri.host,
-          'User-Agent' => "Discourse/" + Discourse::VERSION::STRING,
+          'User-Agent' => "Discourse/#{Discourse::VERSION::STRING}",
           'X-Discourse-Instance' => Discourse.base_url,
           'X-Discourse-Event-Id' => web_hook_event.id,
           'X-Discourse-Event-Type' => args[:event_type]
@@ -106,7 +91,7 @@ module Jobs
         headers['X-Discourse-Event'] = args[:event_name].to_s if args[:event_name].present?
 
         if web_hook.secret.present?
-          headers['X-Discourse-Event-Signature'] = "sha256=" + OpenSSL::HMAC.hexdigest("sha256", web_hook.secret, body)
+          headers['X-Discourse-Event-Signature'] = "sha256=#{OpenSSL::HMAC.hexdigest("sha256", web_hook.secret, body)}"
         end
 
         now = Time.zone.now
diff --git a/app/jobs/regular/export_csv_file.rb b/app/jobs/regular/export_csv_file.rb
index 5eca7dd91b5..2ebfb75df7d 100644
--- a/app/jobs/regular/export_csv_file.rb
+++ b/app/jobs/regular/export_csv_file.rb
@@ -1,5 +1,6 @@
 require 'csv'
 require_dependency 'system_message'
+require_dependency 'upload_creator'
 
 module Jobs
 
@@ -31,12 +32,20 @@ module Jobs
 
       file_name_prefix = if @entity == "user_archive"
         "#{@entity.split('_').join('-')}-#{@current_user.username}-#{Time.now.strftime("%y%m%d-%H%M%S")}"
+      elsif @entity == "report" && @extra[:name].present?
+        "#{@extra[:name].split('_').join('-')}-#{Time.now.strftime("%y%m%d-%H%M%S")}"
       else
         "#{@entity.split('_').join('-')}-#{Time.now.strftime("%y%m%d-%H%M%S")}"
       end
 
-      file = UserExport.create(file_name: file_name_prefix, user_id: @current_user.id)
-      file_name = "#{file_name_prefix}-#{file.id}.csv"
+      export_title = if @entity == "report" && @extra[:name].present?
+        I18n.t("reports.#{@extra[:name]}.title")
+      else
+        @entity.split('_').join(' ').titleize
+      end
+
+      user_export = UserExport.create(file_name: file_name_prefix, user_id: @current_user.id)
+      file_name = "#{file_name_prefix}-#{user_export.id}.csv"
       absolute_path = "#{UserExport.base_directory}/#{file_name}"
 
       # ensure directory exists
@@ -50,8 +59,33 @@ module Jobs
 
       # compress CSV file
       system('gzip', '-5', absolute_path)
+
+      # create upload
+      download_link = nil
+      compressed_file_path = "#{absolute_path}.gz"
+      file_size = number_to_human_size(File.size(compressed_file_path))
+
+      if File.exist?(compressed_file_path)
+        File.open(compressed_file_path) do |file|
+          upload = UploadCreator.new(
+            file,
+            File.basename(compressed_file_path),
+            type: 'csv_export',
+            for_export: 'true'
+          ).create_for(@current_user.id)
+
+          if upload.persisted?
+            user_export.update_columns(upload_id: upload.id)
+            download_link = upload.url
+          else
+            Rails.logger.warn("Failed to upload the file #{Discourse.base_uri}/export_csv/#{file_name}.gz")
+          end
+        end
+        File.delete(compressed_file_path)
+      end
+
     ensure
-      notify_user(file_name, absolute_path)
+      notify_user(download_link, file_name, file_size, export_title)
     end
 
     def user_archive_export
@@ -142,12 +176,18 @@ module Jobs
     def report_export
       return enum_for(:report_export) unless block_given?
 
-      @extra[:start_date] = @extra[:start_date].to_date if @extra[:start_date].is_a?(String)
-      @extra[:end_date] = @extra[:end_date].to_date if @extra[:end_date].is_a?(String)
+      @extra[:start_date] = @extra[:start_date].to_date.beginning_of_day if @extra[:start_date].is_a?(String)
+      @extra[:end_date] = @extra[:end_date].to_date.end_of_day if @extra[:end_date].is_a?(String)
       @extra[:category_id] = @extra[:category_id].present? ? @extra[:category_id].to_i : nil
       @extra[:group_id] = @extra[:group_id].present? ? @extra[:group_id].to_i : nil
+
+      report_hash = {}
       Report.find(@extra[:name], @extra).data.each do |row|
-        yield [row[:x].to_s(:db), row[:y].to_s(:db)]
+        report_hash[row[:x].to_s] = row[:y].to_s
+      end
+
+      (@extra[:start_date].to_date..@extra[:end_date].to_date).each do |date|
+        yield [date.to_s(:db), report_hash.fetch(date.to_s, 0)]
       end
     end
 
@@ -319,15 +359,16 @@ module Jobs
         screened_url_array
       end
 
-      def notify_user(file_name, absolute_path)
+      def notify_user(download_link, file_name, file_size, export_title)
         if @current_user
-          if file_name.present? && File.exists?("#{absolute_path}.gz")
+          if download_link.present?
             SystemMessage.create_from_system_user(
               @current_user,
               :csv_export_succeeded,
-              download_link: "#{Discourse.base_uri}/export_csv/#{file_name}.gz",
+              download_link: download_link,
               file_name: "#{file_name}.gz",
-              file_size: number_to_human_size(File.size("#{absolute_path}.gz"))
+              file_size: file_size,
+              export_title: export_title
             )
           else
             SystemMessage.create_from_system_user(@current_user, :csv_export_failed)
diff --git a/app/jobs/regular/notify_category_change.rb b/app/jobs/regular/notify_category_change.rb
new file mode 100644
index 00000000000..ed8a55c7f7a
--- /dev/null
+++ b/app/jobs/regular/notify_category_change.rb
@@ -0,0 +1,15 @@
+require_dependency "post_alerter"
+
+module Jobs
+  class NotifyCategoryChange < Jobs::Base
+    def execute(args)
+      post = Post.find_by(id: args[:post_id])
+
+      if post&.topic
+        post_alerter = PostAlerter.new
+        post_alerter.notify_post_users(post, User.where(id: args[:notified_user_ids]))
+        post_alerter.notify_first_post_watchers(post, post_alerter.category_watchers(post.topic))
+      end
+    end
+  end
+end
diff --git a/app/jobs/regular/post_alert.rb b/app/jobs/regular/post_alert.rb
index 6fb5fb06164..6f5fc2523c9 100644
--- a/app/jobs/regular/post_alert.rb
+++ b/app/jobs/regular/post_alert.rb
@@ -4,9 +4,12 @@ module Jobs
   class PostAlert < Jobs::Base
 
     def execute(args)
-      # maybe it was removed by the time we are making the post
-      post = Post.where(id: args[:post_id]).first
-      PostAlerter.post_created(post, args[:options] || {}) if post && post.topic
+      post = Post.find_by(id: args[:post_id])
+      if post&.topic
+        opts = args[:options] || {}
+        new_record = true == args[:new_record]
+        PostAlerter.new(opts).after_save_post(post, new_record)
+      end
     end
 
   end
diff --git a/app/jobs/regular/process_post.rb b/app/jobs/regular/process_post.rb
index 88e340501a4..6c8b4e7d2f9 100644
--- a/app/jobs/regular/process_post.rb
+++ b/app/jobs/regular/process_post.rb
@@ -17,7 +17,7 @@ module Jobs
         cooking_options = args[:cooking_options] || {}
         cooking_options[:topic_id] = post.topic_id
         recooked = post.cook(post.raw, cooking_options.symbolize_keys)
-        post.update_column(:cooked, recooked)
+        post.update_columns(cooked: recooked, baked_at: Time.zone.now, baked_version: Post::BAKED_VERSION)
       end
 
       cp = CookedPostProcessor.new(post, args)
diff --git a/app/jobs/regular/publish_topic_to_category.rb b/app/jobs/regular/publish_topic_to_category.rb
index a98f0dddff9..713f5d87bfc 100644
--- a/app/jobs/regular/publish_topic_to_category.rb
+++ b/app/jobs/regular/publish_topic_to_category.rb
@@ -1,3 +1,5 @@
+require_dependency 'topic_publisher'
+
 module Jobs
   class PublishTopicToCategory < Jobs::Base
     def execute(args)
@@ -7,19 +9,9 @@ module Jobs
       topic = topic_timer.topic
       return if topic.blank?
 
-      TopicTimestampChanger.new(timestamp: Time.zone.now, topic: topic).change! do
-        if topic.private_message?
-          topic = TopicConverter.new(topic, Discourse.system_user)
-            .convert_to_public_topic(topic_timer.category_id)
-        else
-          topic.change_category_to_id(topic_timer.category_id)
-        end
-
-        topic.update_columns(visible: true)
-        topic_timer.trash!(Discourse.system_user)
+      TopicTimer.transaction do
+        TopicPublisher.new(topic, Discourse.system_user, topic_timer.category_id).publish!
       end
-
-      MessageBus.publish("/topic/#{topic.id}", reload_topic: true, refresh_stream: true)
     end
   end
 end
diff --git a/app/jobs/regular/pull_hotlinked_images.rb b/app/jobs/regular/pull_hotlinked_images.rb
index b920c60590c..ce88cd6546e 100644
--- a/app/jobs/regular/pull_hotlinked_images.rb
+++ b/app/jobs/regular/pull_hotlinked_images.rb
@@ -24,7 +24,7 @@ module Jobs
           follow_redirect: true
         )
       rescue
-        if (retries -= 1) > 0
+        if (retries -= 1) > 0 && !Rails.env.test?
           sleep 1
           retry
         end
@@ -47,9 +47,9 @@ module Jobs
 
       downloaded_urls = {}
 
-      large_images = JSON.parse(post.custom_fields[Post::LARGE_IMAGES].presence || "[]") rescue []
-      broken_images = JSON.parse(post.custom_fields[Post::BROKEN_IMAGES].presence || "[]") rescue []
-      downloaded_images = JSON.parse(post.custom_fields[Post::DOWNLOADED_IMAGES].presence || "{}") rescue {}
+      large_images = JSON.parse(post.custom_fields[Post::LARGE_IMAGES].presence || "[]")
+      broken_images = JSON.parse(post.custom_fields[Post::BROKEN_IMAGES].presence || "[]")
+      downloaded_images = JSON.parse(post.custom_fields[Post::DOWNLOADED_IMAGES].presence || "{}")
 
       has_new_large_image  = false
       has_new_broken_image = false
@@ -62,7 +62,9 @@ module Jobs
         if is_valid_image_url(src)
           begin
             # have we already downloaded that file?
-            unless downloaded_images.include?(src) || large_images.include?(src) || broken_images.include?(src)
+            schemeless_src = remove_scheme(original_src)
+
+            unless downloaded_images.include?(schemeless_src) || large_images.include?(schemeless_src) || broken_images.include?(schemeless_src)
               if hotlinked = download(src)
                 if File.size(hotlinked.path) <= @max_size
                   filename = File.basename(URI.parse(src).path)
@@ -70,17 +72,17 @@ module Jobs
                   upload = UploadCreator.new(hotlinked, filename, origin: src).create_for(post.user_id)
                   if upload.persisted?
                     downloaded_urls[src] = upload.url
-                    downloaded_images[src.sub(/^https?:/i, "")] = upload.id
+                    downloaded_images[remove_scheme(src)] = upload.id
                     has_downloaded_image = true
                   else
                     log(:info, "Failed to pull hotlinked image for post: #{post_id}: #{src} - #{upload.errors.full_messages.join("\n")}")
                   end
                 else
-                  large_images << original_src.sub(/^https?:/i, "")
+                  large_images << remove_scheme(original_src)
                   has_new_large_image = true
                 end
               else
-                broken_images << original_src.sub(/^https?:/i, "")
+                broken_images << remove_scheme(original_src)
                 has_new_broken_image = true
               end
             end
@@ -170,6 +172,11 @@ module Jobs
       )
     end
 
+    private
+
+      def remove_scheme(src)
+        src.sub(/^https?:/i, "")
+      end
   end
 
 end
diff --git a/app/jobs/regular/send_push_notification.rb b/app/jobs/regular/send_push_notification.rb
new file mode 100644
index 00000000000..355e2465cbf
--- /dev/null
+++ b/app/jobs/regular/send_push_notification.rb
@@ -0,0 +1,8 @@
+module Jobs
+  class SendPushNotification < Jobs::Base
+    def execute(args)
+      user = User.find_by(id: args[:user_id])
+      PushNotificationPusher.push(user, args[:payload]) if user
+    end
+  end
+end
diff --git a/app/jobs/regular/toggle_topic_closed.rb b/app/jobs/regular/toggle_topic_closed.rb
index dab5d65190e..7a77f024896 100644
--- a/app/jobs/regular/toggle_topic_closed.rb
+++ b/app/jobs/regular/toggle_topic_closed.rb
@@ -16,6 +16,7 @@ module Jobs
 
       if Guardian.new(user).can_close?(topic)
         topic.update_status('autoclosed', state, user)
+        topic.inherit_auto_close_from_category if state == false
       end
     end
   end
diff --git a/app/jobs/regular/update_username.rb b/app/jobs/regular/update_username.rb
new file mode 100644
index 00000000000..c59275b7164
--- /dev/null
+++ b/app/jobs/regular/update_username.rb
@@ -0,0 +1,166 @@
+module Jobs
+  class UpdateUsername < Jobs::Base
+
+    sidekiq_options queue: 'low'
+
+    def execute(args)
+      @user_id = args[:user_id]
+      @old_username = args[:old_username]
+      @new_username = args[:new_username]
+      @avatar_img = PrettyText.avatar_img(args[:avatar_template], "tiny")
+
+      @raw_mention_regex = /(?:(?<![\w`_])|(?<=_))@#{@old_username}(?:(?![\w\-\.])|(?=[\-\.](?:\s|$)))/i
+      @raw_quote_regex = /(\[quote\s*=\s*["'']?)#{@old_username}(\,?[^\]]*\])/i
+
+      cooked_username = PrettyText::Helpers.format_username(@old_username)
+      @cooked_mention_username_regex = /^@#{cooked_username}$/i
+      @cooked_mention_user_path_regex = /^\/u(?:sers)?\/#{cooked_username}$/i
+      @cooked_quote_username_regex = /(?<=\s)#{cooked_username}(?=:)/i
+
+      update_posts
+      update_revisions
+      update_notifications
+      update_post_custom_fields
+    end
+
+    def update_posts
+      Post.with_deleted.where(post_conditions("posts.id"), post_condition_args).find_each do |post|
+        begin
+          post.raw = update_raw(post.raw)
+          post.cooked = update_cooked(post.cooked)
+
+          # update without running validations and hooks
+          post.update_columns(raw: post.raw, cooked: post.cooked)
+
+          SearchIndexer.index(post, force: true) if post.topic
+        rescue => e
+          Discourse.warn_exception(e, message: "Failed to update post with id #{post.id}")
+        end
+      end
+    end
+
+    def update_revisions
+      PostRevision.where(post_conditions("post_revisions.post_id"), post_condition_args).find_each do |revision|
+        begin
+          if revision.modifications.key?("raw") || revision.modifications.key?("cooked")
+            revision.modifications["raw"]&.map! { |raw| update_raw(raw) }
+            revision.modifications["cooked"]&.map! { |cooked| update_cooked(cooked) }
+            revision.save!
+          end
+        rescue => e
+          Discourse.warn_exception(e, message: "Failed to update post revision with id #{revision.id}")
+        end
+      end
+    end
+
+    def update_notifications
+      params = {
+        user_id: @user_id,
+        old_username: @old_username,
+        new_username: @new_username
+      }
+
+      Notification.exec_sql(<<~SQL, params)
+        UPDATE notifications
+        SET data = (data :: JSONB ||
+                    jsonb_strip_nulls(
+                        jsonb_build_object(
+                            'original_username', CASE data :: JSONB ->> 'original_username'
+                                                 WHEN :old_username
+                                                   THEN :new_username
+                                                 ELSE NULL END,
+                            'display_username', CASE data :: JSONB ->> 'display_username'
+                                                WHEN :old_username
+                                                  THEN :new_username
+                                                ELSE NULL END,
+                            'username', CASE data :: JSONB ->> 'username'
+                                        WHEN :old_username
+                                          THEN :new_username
+                                        ELSE NULL END,
+                            'username2', CASE data :: JSONB ->> 'username2'
+                                        WHEN :old_username
+                                          THEN :new_username
+                                        ELSE NULL END
+                        )
+                    )) :: JSON
+        WHERE data ILIKE '%' || :old_username || '%'
+      SQL
+    end
+
+    def update_post_custom_fields
+      PostCustomField.exec_sql(<<~SQL, old_username: @old_username, new_username: @new_username)
+        UPDATE post_custom_fields
+        SET value = :new_username
+        WHERE name = 'action_code_who' AND value = :old_username
+      SQL
+    end
+
+  protected
+
+    def post_conditions(post_id_column)
+      <<~SQL
+        EXISTS(
+            SELECT 1
+            FROM user_actions AS a
+            WHERE a.target_post_id = #{post_id_column} AND
+                  a.action_type = :mentioned AND
+                  a.user_id = :user_id
+        ) OR EXISTS(
+            SELECT 1
+            FROM quoted_posts AS q
+              JOIN posts AS p ON (q.quoted_post_id = p.id)
+            WHERE q.post_id = #{post_id_column} AND
+              p.user_id = :user_id
+        )
+      SQL
+    end
+
+    def post_condition_args
+      { mentioned: UserAction::MENTION, user_id: @user_id }
+    end
+
+    def update_raw(raw)
+      raw.gsub(@raw_mention_regex, "@#{@new_username}")
+        .gsub(@raw_quote_regex, "\\1#{@new_username}\\2")
+    end
+
+    # Uses Nokogiri instead of rebake, because it works for posts and revisions
+    # and there is no reason to invalidate oneboxes, run the post analyzer etc.
+    # when only the username changes.
+    def update_cooked(cooked)
+      doc = Nokogiri::HTML.fragment(cooked)
+
+      doc.css("a.mention").each do |a|
+        a.content = a.content.gsub(@cooked_mention_username_regex, "@#{@new_username}")
+        a["href"] = a["href"].gsub(@cooked_mention_user_path_regex, "/u/#{@new_username}") if a["href"]
+      end
+
+      doc.css("aside.quote").each do |aside|
+        next unless div = aside.at_css("div.title")
+
+        username_replaced = false
+
+        div.children.each do |child|
+          if child.text?
+            content = child.content
+            username_replaced = content.gsub!(@cooked_quote_username_regex, @new_username).present?
+            child.content = content if username_replaced
+          end
+        end
+
+        if username_replaced || quotes_correct_user?(aside)
+          div.at_css("img.avatar")&.replace(@avatar_img)
+        end
+      end
+
+      doc.to_html
+    end
+
+    def quotes_correct_user?(aside)
+      Post.where(
+        topic_id: aside["data-topic"],
+        post_number: aside["data-post"]
+      ).pluck(:user_id).first == @user_id
+    end
+  end
+end
diff --git a/app/jobs/regular/user_email.rb b/app/jobs/regular/user_email.rb
index 0eeea9ecbb5..ac7e1d58d09 100644
--- a/app/jobs/regular/user_email.rb
+++ b/app/jobs/regular/user_email.rb
@@ -6,6 +6,8 @@ module Jobs
   # Asynchronously send an email to a user
   class UserEmail < Jobs::Base
 
+    sidekiq_options queue: 'low'
+
     def execute(args)
       raise Discourse::InvalidParameters.new(:user_id) unless args[:user_id].present?
       raise Discourse::InvalidParameters.new(:type)    unless args[:type].present?
diff --git a/app/jobs/scheduled/clean_up_crawler_stats.rb b/app/jobs/scheduled/clean_up_crawler_stats.rb
new file mode 100644
index 00000000000..816e91f0fd2
--- /dev/null
+++ b/app/jobs/scheduled/clean_up_crawler_stats.rb
@@ -0,0 +1,26 @@
+module Jobs
+
+  class CleanUpCrawlerStats < Jobs::Scheduled
+    every 1.day
+
+    def execute(args)
+      WebCrawlerRequest.where('date < ?', WebCrawlerRequest.max_record_age.ago).delete_all
+
+      # keep count of only the top user agents
+      WebCrawlerRequest.exec_sql <<~SQL
+        WITH ranked_requests AS (
+          SELECT row_number() OVER (ORDER BY count DESC) as row_number, id
+            FROM web_crawler_requests
+           WHERE date = '#{1.day.ago.strftime("%Y-%m-%d")}'
+        )
+        DELETE FROM web_crawler_requests
+        WHERE id IN (
+          SELECT ranked_requests.id
+            FROM ranked_requests
+           WHERE row_number > #{WebCrawlerRequest.max_records_per_day}
+        )
+      SQL
+    end
+  end
+
+end
diff --git a/app/jobs/scheduled/clean_up_uploads.rb b/app/jobs/scheduled/clean_up_uploads.rb
index e2b9353edee..75d53dd2839 100644
--- a/app/jobs/scheduled/clean_up_uploads.rb
+++ b/app/jobs/scheduled/clean_up_uploads.rb
@@ -40,6 +40,7 @@ module Jobs
         .joins("LEFT JOIN categories c ON c.uploaded_logo_id = uploads.id OR c.uploaded_background_id = uploads.id")
         .joins("LEFT JOIN custom_emojis ce ON ce.upload_id = uploads.id")
         .joins("LEFT JOIN theme_fields tf ON tf.upload_id = uploads.id")
+        .joins("LEFT JOIN user_exports ue ON ue.upload_id = uploads.id")
         .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")
@@ -47,6 +48,7 @@ module Jobs
         .where("c.uploaded_logo_id IS NULL AND c.uploaded_background_id IS NULL")
         .where("ce.upload_id IS NULL")
         .where("tf.upload_id IS NULL")
+        .where("ue.upload_id IS NULL")
 
       result = result.where("uploads.url NOT IN (?)", ignore_urls) if ignore_urls.present?
 
diff --git a/app/jobs/scheduled/dashboard_stats.rb b/app/jobs/scheduled/dashboard_stats.rb
index 9556bd7ea1a..d475075c4df 100644
--- a/app/jobs/scheduled/dashboard_stats.rb
+++ b/app/jobs/scheduled/dashboard_stats.rb
@@ -14,6 +14,8 @@ module Jobs
         GroupMessage.create(Group[:admins].name, :dashboard_problems, limit_once_per: 7.days.to_i)
       end
 
+      # TODO: decide if we want to keep caching this every 30 minutes
+      AdminDashboardNextData.refresh_stats
       AdminDashboardData.refresh_stats
     end
   end
diff --git a/app/jobs/scheduled/enqueue_digest_emails.rb b/app/jobs/scheduled/enqueue_digest_emails.rb
index 23db70d4e52..98a78878941 100644
--- a/app/jobs/scheduled/enqueue_digest_emails.rb
+++ b/app/jobs/scheduled/enqueue_digest_emails.rb
@@ -1,6 +1,5 @@
 module Jobs
 
-  # A daily job that will enqueue digest emails to be sent to users
   class EnqueueDigestEmails < Jobs::Scheduled
     every 30.minutes
 
diff --git a/app/jobs/scheduled/ensure_db_consistency.rb b/app/jobs/scheduled/ensure_db_consistency.rb
index c86e5c31996..03060c5d3eb 100644
--- a/app/jobs/scheduled/ensure_db_consistency.rb
+++ b/app/jobs/scheduled/ensure_db_consistency.rb
@@ -15,6 +15,8 @@ module Jobs
       Badge.ensure_consistency!
       CategoryUser.ensure_consistency!
       UserOption.ensure_consistency!
+      Tag.ensure_consistency!
+      CategoryTagStat.ensure_consistency!
     end
   end
 end
diff --git a/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb
index c3db40fbf0f..5a2803b7206 100644
--- a/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb
+++ b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb
@@ -33,8 +33,6 @@ module Jobs
     end
 
     def scores
-      scores = {}
-
       current_owners = UserBadge.where(badge_id: Badge::NewUserOfTheMonth).pluck(:user_id)
       current_owners = [-1] if current_owners.blank?
 
@@ -44,49 +42,47 @@ module Jobs
       sql = <<~SQL
         SELECT u.id,
           SUM(CASE
-               WHEN pa.id IS NOT NULL THEN
-                 CASE
-                   WHEN liked_by.id <= 0 THEN 0.0
-                   WHEN liked_by.admin OR liked_by.moderator THEN 2.0
-                   WHEN liked_by.trust_level = 0 THEN 0.1
-                   WHEN liked_by.trust_level = 1 THEN 0.25
-                   WHEN liked_by.trust_level = 2 THEN 1.0
-                   WHEN liked_by.trust_level = 3 THEN 1.5
-                   WHEN liked_by.trust_level = 4 THEN 2.0
-                   ELSE 1.0
-                 END
-               ELSE 0
-              END) / COUNT(DISTINCT p.id) AS score
+              WHEN pa.id IS NOT NULL THEN
+                CASE
+                WHEN liked_by.id <= 0         THEN 0.0
+                WHEN liked_by.admin           THEN 3.0
+                WHEN liked_by.moderator       THEN 3.0
+                WHEN liked_by.trust_level = 4 THEN 2.0
+                WHEN liked_by.trust_level = 3 THEN 1.5
+                WHEN liked_by.trust_level = 2 THEN 1.0
+                WHEN liked_by.trust_level = 1 THEN 0.25
+                WHEN liked_by.trust_level = 0 THEN 0.1
+                ELSE 1.0
+                END
+              ELSE 0
+              END) / (5 + COUNT(DISTINCT p.id)) AS score
         FROM users AS u
-        INNER JOIN user_stats AS us ON u.id = us.user_id
-        LEFT OUTER JOIN posts AS p ON p.user_id = u.id
-        LEFT OUTER JOIN post_actions AS pa ON
-          pa.post_id = p.id AND pa.post_action_type_id = :like
-        LEFT OUTER JOIN users AS liked_by ON liked_by.id = pa.user_id
-        LEFT OUTER JOIN topics AS t ON t.id = p.topic_id
-        WHERE u.active AND
-          u.id > 0 AND
-          NOT(u.admin) AND
-          NOT(u.moderator) AND
-          t.archetype <> '#{Archetype.private_message}' AND
-          u.created_at >= CURRENT_TIMESTAMP - '1 month'::INTERVAL AND
-          u.id NOT IN (#{current_owners.join(',')})
+        INNER JOIN user_stats        AS us       ON u.id = us.user_id
+        LEFT OUTER JOIN posts        AS p        ON p.user_id = u.id
+        LEFT OUTER JOIN post_actions AS pa       ON pa.post_id = p.id AND pa.post_action_type_id = #{PostActionType.types[:like]}
+        LEFT OUTER JOIN users        AS liked_by ON liked_by.id = pa.user_id
+        LEFT OUTER JOIN topics       AS t        ON t.id = p.topic_id
+        WHERE u.active
+          AND u.id > 0
+          AND u.id NOT IN (#{current_owners.join(',')})
+          AND NOT u.staged
+          AND NOT u.admin
+          AND NOT u.moderator
+          AND u.suspended_at IS NULL
+          AND u.suspended_till IS NULL
+          AND u.created_at >= CURRENT_TIMESTAMP - '1 month'::INTERVAL
+          AND t.archetype <> '#{Archetype.private_message}'
+          AND t.deleted_at IS NULL
+          AND p.deleted_at IS NULL
         GROUP BY u.id
         HAVING COUNT(DISTINCT p.id) > 1
-          AND COUNT(DISTINCT p.topic_id) > 1
-          AND COUNT(pa.id) > 1
+           AND COUNT(DISTINCT p.topic_id) > 1
+           AND COUNT(pa.id) > 1
         ORDER BY score DESC
-        LIMIT :max_awarded
+        LIMIT #{MAX_AWARDED}
       SQL
 
-      User.exec_sql(
-        sql,
-        like: PostActionType.types[:like],
-        max_awarded: MAX_AWARDED
-      ).each do |row|
-        scores[row['id'].to_i] = row['score'].to_f
-      end
-      scores
+      User.exec_sql(sql).map { |r| [r['id'].to_i, r['score'].to_f] }.to_h
     end
 
   end
diff --git a/app/jobs/scheduled/poll_feed.rb b/app/jobs/scheduled/poll_feed.rb
index 2f885c69a28..494fcf2a706 100644
--- a/app/jobs/scheduled/poll_feed.rb
+++ b/app/jobs/scheduled/poll_feed.rb
@@ -3,9 +3,6 @@
 #
 require 'digest/sha1'
 require 'excon'
-require 'rss'
-require_dependency 'feed_item_accessor'
-require_dependency 'feed_element_installer'
 require_dependency 'final_destination'
 require_dependency 'post_creator'
 require_dependency 'post_revisor'
@@ -27,12 +24,25 @@ module Jobs
     end
 
     def poll_feed
+      ensure_rss_loaded
+      # defer loading rss
       feed = Feed.new
       import_topics(feed.topics)
     end
 
     private
 
+    @@rss_loaded = false
+
+    # rss lib is very expensive memory wise, no need to load it till it is needed
+    def ensure_rss_loaded
+      return if @@rss_loaded
+      require 'rss'
+      require_dependency 'feed_item_accessor'
+      require_dependency 'feed_element_installer'
+      @@rss_loaded = true
+    end
+
     def not_polled_recently?
       $redis.set(
         'feed-polled-recently',
diff --git a/app/jobs/scheduled/purge_inactive.rb b/app/jobs/scheduled/purge_unactivated.rb
similarity index 70%
rename from app/jobs/scheduled/purge_inactive.rb
rename to app/jobs/scheduled/purge_unactivated.rb
index 21417bef216..992b1bddc88 100644
--- a/app/jobs/scheduled/purge_inactive.rb
+++ b/app/jobs/scheduled/purge_unactivated.rb
@@ -1,5 +1,5 @@
 module Jobs
-  class PurgeInactive < Jobs::Scheduled
+  class PurgeUnactived < Jobs::Scheduled
     every 1.day
 
     def execute(args)
diff --git a/app/jobs/scheduled/reindex_search.rb b/app/jobs/scheduled/reindex_search.rb
index e354b36d007..0e9768d2922 100644
--- a/app/jobs/scheduled/reindex_search.rb
+++ b/app/jobs/scheduled/reindex_search.rb
@@ -1,7 +1,7 @@
 module Jobs
   # if locale changes or search algorithm changes we may want to reindex stuff
   class ReindexSearch < Jobs::Scheduled
-    every 1.day
+    every 2.hours
 
     def execute(args)
       rebuild_problem_topics
@@ -38,13 +38,14 @@ module Jobs
       end
     end
 
-    def rebuild_problem_posts(limit = 10000)
+    def rebuild_problem_posts(limit = 20000)
       post_ids = load_problem_post_ids(limit)
 
       post_ids.each do |id|
-        post = Post.find_by(id: id)
         # could be deleted while iterating through batch
-        SearchIndexer.index(post, force: true) if post
+        if post = Post.find_by(id: id)
+          SearchIndexer.index(post, force: true)
+        end
       end
     end
 
@@ -67,6 +68,7 @@ module Jobs
                 WHERE pd.post_id IS NULL
                 )', SiteSetting.default_locale, Search::INDEX_VERSION)
         .limit(limit)
+        .order('posts.id DESC')
         .pluck(:id)
     end
 
diff --git a/app/jobs/scheduled/tl3_promotions.rb b/app/jobs/scheduled/tl3_promotions.rb
index 94c3d42fc7a..ce78290eae9 100644
--- a/app/jobs/scheduled/tl3_promotions.rb
+++ b/app/jobs/scheduled/tl3_promotions.rb
@@ -21,13 +21,22 @@ module Jobs
       end
 
       # Promotions
-      User.real.where(
-        trust_level: TrustLevel[2],
-        manual_locked_trust_level: nil,
-        group_locked_trust_level: nil
-      ).where.not(id: demoted_user_ids).find_each do |u|
+      User.real.not_suspended.where(
+          trust_level: TrustLevel[2],
+          manual_locked_trust_level: nil,
+          group_locked_trust_level: nil
+        ).where.not(id: demoted_user_ids)
+        .joins(:user_stat)
+        .where("user_stats.days_visited >= ?", SiteSetting.tl3_requires_days_visited)
+        .where("user_stats.topic_reply_count >= ?", SiteSetting.tl3_requires_topics_replied_to)
+        .where("user_stats.topics_entered >= ?", SiteSetting.tl3_requires_topics_viewed_all_time)
+        .where("user_stats.posts_read_count >= ?", SiteSetting.tl3_requires_posts_read_all_time)
+        .where("user_stats.likes_given >= ?", SiteSetting.tl3_requires_likes_given)
+        .where("user_stats.likes_received >= ?", SiteSetting.tl3_requires_likes_received)
+        .find_each do |u|
         Promotion.new(u).review_tl2
       end
+
     end
   end
 
diff --git a/app/jobs/scheduled/unsilence_users.rb b/app/jobs/scheduled/unsilence_users.rb
new file mode 100644
index 00000000000..c609894fd52
--- /dev/null
+++ b/app/jobs/scheduled/unsilence_users.rb
@@ -0,0 +1,11 @@
+module Jobs
+  class UnsilenceUsers < Jobs::Scheduled
+    every 15.minutes
+
+    def execute(args)
+      User.where("silenced_till IS NOT NULL AND silenced_till < now()").find_each do |user|
+        UserSilencer.unsilence(user, Discourse.system_user)
+      end
+    end
+  end
+end
diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index 236acc0dabd..5e8a60af06b 100644
--- a/app/mailers/user_notifications.rb
+++ b/app/mailers/user_notifications.rb
@@ -12,17 +12,17 @@ class UserNotifications < ActionMailer::Base
   include Email::BuildEmailHelper
 
   def signup(user, opts = {})
-    build_email(user.email,
-                template: "user_notifications.signup",
-                locale: user_locale(user),
-                email_token: opts[:email_token])
+    build_user_email_token_by_template(
+      "user_notifications.signup",
+      user,
+      opts[:email_token]
+    )
   end
 
   def signup_after_approval(user, opts = {})
     build_email(user.email,
                 template: 'user_notifications.signup_after_approval',
                 locale: user_locale(user),
-                email_token: opts[:email_token],
                 new_user_tips: I18n.t('system_messages.usage_tips.text_body_template', base_url: Discourse.base_url, locale: locale))
   end
 
@@ -34,38 +34,51 @@ class UserNotifications < ActionMailer::Base
   end
 
   def confirm_old_email(user, opts = {})
-    build_email(user.email,
-                template: "user_notifications.confirm_old_email",
-                locale: user_locale(user),
-                email_token: opts[:email_token])
+    build_user_email_token_by_template(
+      "user_notifications.confirm_old_email",
+      user,
+      opts[:email_token]
+    )
   end
 
   def confirm_new_email(user, opts = {})
-    build_email(user.email,
-                template: "user_notifications.confirm_new_email",
-                locale: user_locale(user),
-                email_token: opts[:email_token])
+    build_user_email_token_by_template(
+      "user_notifications.confirm_new_email",
+      user,
+      opts[:email_token]
+    )
   end
 
   def forgot_password(user, opts = {})
-    build_email(user.email,
-                template: user.has_password? ? "user_notifications.forgot_password" : "user_notifications.set_password",
-                locale: user_locale(user),
-                email_token: opts[:email_token])
+    build_user_email_token_by_template(
+      user.has_password? ? "user_notifications.forgot_password" : "user_notifications.set_password",
+      user,
+      opts[:email_token]
+    )
+  end
+
+  def email_login(user, opts = {})
+    build_user_email_token_by_template(
+      "user_notifications.email_login",
+      user,
+      opts[:email_token]
+    )
   end
 
   def admin_login(user, opts = {})
-    build_email(user.email,
-                template: "user_notifications.admin_login",
-                locale: user_locale(user),
-                email_token: opts[:email_token])
+    build_user_email_token_by_template(
+      "user_notifications.admin_login",
+      user,
+      opts[:email_token]
+    )
   end
 
   def account_created(user, opts = {})
-    build_email(user.email,
-                template: "user_notifications.account_created",
-                locale: user_locale(user),
-                email_token: opts[:email_token])
+    build_user_email_token_by_template(
+      "user_notifications.account_created",
+      user,
+      opts[:email_token]
+    )
   end
 
   def account_silenced(user, opts = nil)
@@ -107,6 +120,15 @@ class UserNotifications < ActionMailer::Base
     )
   end
 
+  def account_second_factor_disabled(user, opts = {})
+    build_email(
+      user.email,
+      template: 'user_notifications.account_second_factor_disabled',
+      locale: user_locale(user),
+      email: user.email
+    )
+  end
+
   def short_date(dt)
     if dt.year == Time.now.year
       I18n.l(dt, format: :short_no_year)
@@ -245,6 +267,7 @@ class UserNotifications < ActionMailer::Base
     opts[:use_site_subject] = true
     opts[:add_re_to_subject] = true
     opts[:show_category_in_subject] = false
+    opts[:show_group_in_subject] = true if SiteSetting.group_in_subject
 
     # We use the 'user_posted' event when you are emailed a post in a PM.
     opts[:notification_type] = 'posted'
@@ -359,6 +382,7 @@ class UserNotifications < ActionMailer::Base
       use_site_subject: opts[:use_site_subject],
       add_re_to_subject: opts[:add_re_to_subject],
       show_category_in_subject: opts[:show_category_in_subject],
+      show_group_in_subject: opts[:show_group_in_subject],
       notification_type: notification_type,
       use_invite_template: opts[:use_invite_template],
       user: user
@@ -397,7 +421,7 @@ class UserNotifications < ActionMailer::Base
     end
 
     # category name
-    category = Topic.find_by(id: post.topic_id).category
+    category = Topic.find_by(id: post.topic_id)&.category
     if opts[:show_category_in_subject] && post.topic_id && category && !category.uncategorized?
       show_category_in_subject = category.name
 
@@ -409,6 +433,33 @@ class UserNotifications < ActionMailer::Base
       show_category_in_subject = nil
     end
 
+    if post.topic.private_message?
+      subject_pm =
+        if opts[:show_group_in_subject] && group = post.topic.allowed_groups&.first
+          if group.full_name
+            "[#{group.full_name}] "
+          else
+            "[#{group.name}] "
+          end
+        else
+          I18n.t('subject_pm')
+        end
+
+      participants = "#{I18n.t("user_notifications.pm_participants")} "
+      participant_list = []
+      post.topic.allowed_groups.each do |group|
+        participant_list.push "[#{group.name} (#{group.users.count})](#{Discourse.base_url}/groups/#{group.name})"
+      end
+      post.topic.allowed_users.each do |user|
+        if SiteSetting.prioritize_username_in_ux?
+          participant_list.push "[#{user.username}](#{Discourse.base_url}/u/#{user.username_lower})"
+        else
+          participant_list.push "[#{user.name.blank? ? user.username : user.name}](#{Discourse.base_url}/u/#{user.username_lower})"
+        end
+      end
+      participants += participant_list.join(", ")
+    end
+
     if SiteSetting.private_email?
       title = I18n.t("system_messages.private_topic_title", id: post.topic_id)
     end
@@ -510,6 +561,8 @@ class UserNotifications < ActionMailer::Base
       add_re_to_subject: add_re_to_subject,
       show_category_in_subject: show_category_in_subject,
       private_reply: post.topic.private_message?,
+      subject_pm: subject_pm,
+      participants: participants,
       include_respond_instructions: !(user.suspended? || user.staged?),
       template: template,
       site_description: SiteSetting.site_description,
@@ -533,6 +586,15 @@ class UserNotifications < ActionMailer::Base
 
   private
 
+  def build_user_email_token_by_template(template, user, email_token)
+    build_email(
+      user.email,
+      template: template,
+      locale: user_locale(user),
+      email_token: email_token
+    )
+  end
+
   def build_summary_for(user)
     @site_name       = SiteSetting.email_prefix.presence || SiteSetting.title # used by I18n
     @user            = user
diff --git a/app/models/admin_dashboard_data.rb b/app/models/admin_dashboard_data.rb
index 57a4394c27d..797e3176ebe 100644
--- a/app/models/admin_dashboard_data.rb
+++ b/app/models/admin_dashboard_data.rb
@@ -21,6 +21,7 @@ class AdminDashboardData
 
   PRIVATE_MESSAGE_REPORTS ||= [
     'user_to_user_private_messages',
+    'user_to_user_private_messages_with_replies',
     'system_private_messages',
     'notify_moderators_private_messages',
     'notify_user_private_messages',
@@ -39,6 +40,10 @@ class AdminDashboardData
   end
   class << self; attr_reader :problem_syms, :problem_blocks, :problem_messages; end
 
+  def initialize(opts = {})
+    @opts = opts
+  end
+
   def problems
     problems = []
     AdminDashboardData.problem_syms.each do |sym|
@@ -90,7 +95,7 @@ class AdminDashboardData
       'dashboard.poll_pop3_auth_error'
     ]
 
-    add_problem_check :rails_env_check, :host_names_check,
+    add_problem_check :rails_env_check, :host_names_check, :force_https_check,
                       :ram_check, :google_oauth2_config_check,
                       :facebook_config_check, :twitter_config_check,
                       :github_config_check, :s3_config_check, :image_magick_check,
@@ -112,8 +117,8 @@ class AdminDashboardData
     'dash-stats'
   end
 
-  def self.fetch_problems
-    AdminDashboardData.new.problems
+  def self.fetch_problems(opts = {})
+    AdminDashboardData.new(opts).problems
   end
 
   def self.problem_message_check(i18n_key)
@@ -234,4 +239,9 @@ class AdminDashboardData
     I18n.t('dashboard.missing_mailgun_api_key')
   end
 
+  def force_https_check
+    return unless @opts[:check_force_https]
+    I18n.t('dashboard.force_https_warning') unless SiteSetting.force_https
+  end
+
 end
diff --git a/app/models/admin_dashboard_next_data.rb b/app/models/admin_dashboard_next_data.rb
new file mode 100644
index 00000000000..335087925f8
--- /dev/null
+++ b/app/models/admin_dashboard_next_data.rb
@@ -0,0 +1,42 @@
+class AdminDashboardNextData
+  include StatsCacheable
+
+  REPORTS = %w{
+    page_view_total_reqs
+    visits
+    time_to_first_response
+    likes
+    flags
+    user_to_user_private_messages_with_replies
+  }
+
+  def initialize(opts = {})
+    @opts = opts
+  end
+
+  def self.fetch_stats
+    AdminDashboardNextData.new.as_json
+  end
+
+  def self.stats_cache_key
+    'dash-next-stats'
+  end
+
+  def as_json(_options = nil)
+    @json ||= {
+      reports: AdminDashboardNextData.reports(REPORTS),
+      last_backup_taken_at: last_backup_taken_at,
+      updated_at: Time.zone.now.as_json
+    }
+  end
+
+  def last_backup_taken_at
+    if last_backup = Backup.all.last
+      File.ctime(last_backup.path).utc
+    end
+  end
+
+  def self.reports(source)
+    source.map { |type| Report.find(type).as_json }
+  end
+end
diff --git a/app/models/application_request.rb b/app/models/application_request.rb
index f13e7275a7b..1e4459f681d 100644
--- a/app/models/application_request.rb
+++ b/app/models/application_request.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 class ApplicationRequest < ActiveRecord::Base
+
   enum req_type: %i(http_total
                     http_2xx
                     http_background
@@ -12,41 +13,12 @@ class ApplicationRequest < ActiveRecord::Base
                     page_view_logged_in_mobile
                     page_view_anon_mobile)
 
-  cattr_accessor :autoflush, :autoflush_seconds, :last_flush
-  # auto flush if backlog is larger than this
-  self.autoflush = 2000
-
-  # auto flush if older than this
-  self.autoflush_seconds = 5.minutes
-  self.last_flush = Time.now.utc
+  include CachedCounting
 
   def self.increment!(type, opts = nil)
-    key = redis_key(type)
-    val = $redis.incr(key).to_i
-
-    # readonly mode it is going to be 0, skip
-    return if val == 0
-
-    # 3.days, see: https://github.com/rails/rails/issues/21296
-    $redis.expire(key, 259200)
-
-    autoflush = (opts && opts[:autoflush]) || self.autoflush
-    if autoflush > 0 && val >= autoflush
-      write_cache!
-      return
-    end
-
-    if (Time.now.utc - last_flush).to_i > autoflush_seconds
-      write_cache!
-    end
+    perform_increment!(redis_key(type), opts)
   end
 
-  GET_AND_RESET = <<~LUA
-    local val = redis.call('get', KEYS[1])
-    redis.call('set', KEYS[1], '0')
-    return val
-  LUA
-
   def self.write_cache!(date = nil)
     if date.nil?
       write_cache!(Time.now.utc)
@@ -58,13 +30,9 @@ class ApplicationRequest < ActiveRecord::Base
 
     date = date.to_date
 
-    # this may seem a bit fancy but in so it allows
-    # for concurrent calls without double counting
     req_types.each do |req_type, _|
-      key = redis_key(req_type, date)
+      val = get_and_reset(redis_key(req_type, date))
 
-      namespaced_key = $redis.namespace_key(key)
-      val = $redis.without_namespace.eval(GET_AND_RESET, keys: [namespaced_key]).to_i
       next if val == 0
 
       id = req_id(date, req_type)
diff --git a/app/models/badge.rb b/app/models/badge.rb
index a2f17409a7b..60da562949d 100644
--- a/app/models/badge.rb
+++ b/app/models/badge.rb
@@ -219,6 +219,10 @@ class Badge < ActiveRecord::Base
     Slug.for(self.display_name, '-')
   end
 
+  def manually_grantable?
+    query.blank? && !system?
+  end
+
   protected
 
     def ensure_not_system
@@ -236,7 +240,7 @@ end
 # Table name: badges
 #
 #  id                :integer          not null, primary key
-#  name              :string(255)      not null
+#  name              :string           not null
 #  description       :text
 #  badge_type_id     :integer          not null
 #  grant_count       :integer          default(0), not null
@@ -244,7 +248,7 @@ end
 #  updated_at        :datetime         not null
 #  allow_title       :boolean          default(FALSE), not null
 #  multiple_grant    :boolean          default(FALSE), not null
-#  icon              :string(255)      default("fa-certificate")
+#  icon              :string           default("fa-certificate")
 #  listable          :boolean          default(TRUE)
 #  target_posts      :boolean          default(FALSE)
 #  query             :text
@@ -259,5 +263,6 @@ end
 #
 # Indexes
 #
-#  index_badges_on_name  (name) UNIQUE
+#  index_badges_on_badge_type_id  (badge_type_id)
+#  index_badges_on_name           (name) UNIQUE
 #
diff --git a/app/models/badge_grouping.rb b/app/models/badge_grouping.rb
index f1201e72140..4fdcef66e3a 100644
--- a/app/models/badge_grouping.rb
+++ b/app/models/badge_grouping.rb
@@ -22,7 +22,7 @@ end
 # Table name: badge_groupings
 #
 #  id          :integer          not null, primary key
-#  name        :string(255)      not null
+#  name        :string           not null
 #  description :text
 #  position    :integer          not null
 #  created_at  :datetime         not null
diff --git a/app/models/badge_type.rb b/app/models/badge_type.rb
index 4648e3ad58e..b1d6e91edd9 100644
--- a/app/models/badge_type.rb
+++ b/app/models/badge_type.rb
@@ -12,7 +12,7 @@ end
 # Table name: badge_types
 #
 #  id         :integer          not null, primary key
-#  name       :string(255)      not null
+#  name       :string           not null
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
 #
diff --git a/app/models/category.rb b/app/models/category.rb
index 2589903c2c5..4d042500afd 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -23,9 +23,6 @@ class Category < ActiveRecord::Base
   has_many :category_featured_topics
   has_many :featured_topics, through: :category_featured_topics, source: :topic
 
-  has_many :category_featured_users
-  has_many :featured_users, through: :category_featured_users, source: :user
-
   has_many :category_groups, dependent: :destroy
   has_many :groups, through: :category_groups
 
@@ -57,12 +54,17 @@ class Category < ActiveRecord::Base
 
   after_destroy :reset_topic_ids_cache
   after_destroy :publish_category_deletion
+  after_destroy :remove_site_settings
 
   after_create :delete_category_permalink
 
   after_update :rename_category_definition, if: :saved_change_to_name?
   after_update :create_category_permalink, if: :saved_change_to_slug?
 
+  after_commit :trigger_category_created_event, on: :create
+  after_commit :trigger_category_updated_event, on: :update
+  after_commit :trigger_category_destroyed_event, on: :destroy
+
   belongs_to :parent_category, class_name: 'Category'
   has_many :subcategories, class_name: 'Category', foreign_key: 'parent_category_id'
 
@@ -199,7 +201,7 @@ SQL
     t.delete_topic_timer(TopicTimer.types[:close])
     t.save!(validate: false)
     update_column(:topic_id, t.id)
-    t.posts.create(raw: post_template, user: user)
+    t.posts.create(raw: description || post_template, user: user)
   end
 
   def topic_url
@@ -253,6 +255,15 @@ SQL
     MessageBus.publish('/categories', { categories: ActiveModel::ArraySerializer.new([self]).as_json }, group_ids: group_ids)
   end
 
+  def remove_site_settings
+    SiteSetting.all_settings.each do |s|
+      if s[:type] == 'category' && s[:value].to_i == self.id
+        SiteSetting.send("#{s[:setting]}=", '')
+      end
+    end
+
+  end
+
   def publish_category_deletion
     MessageBus.publish('/categories', deleted_categories: [self.id])
   end
@@ -314,6 +325,30 @@ SQL
     end
   end
 
+  def self.resolve_permissions(permissions)
+    read_restricted = true
+
+    everyone = Group::AUTO_GROUPS[:everyone]
+    full = CategoryGroup.permission_types[:full]
+
+    mapped = permissions.map do |group, permission|
+      group_id = Group.group_id_from_param(group)
+      permission = CategoryGroup.permission_types[permission] unless permission.is_a?(Integer)
+
+      [group_id, permission]
+    end
+
+    mapped.each do |group, permission|
+      if group == everyone && permission == full
+        return [false, []]
+      end
+
+      read_restricted = false if group == everyone
+    end
+
+    [read_restricted, mapped]
+  end
+
   def allowed_tags=(tag_names_arg)
     DiscourseTagging.add_or_create_tags_by_name(self, tag_names_arg, unlimited: true)
   end
@@ -372,41 +407,14 @@ SQL
     self.update_attributes(latest_topic_id: latest_topic_id, latest_post_id: latest_post_id)
   end
 
-  def self.resolve_permissions(permissions)
-    read_restricted = true
-
-    everyone = Group::AUTO_GROUPS[:everyone]
-    full = CategoryGroup.permission_types[:full]
-
-    mapped = permissions.map do |group, permission|
-      group = group.id if group.is_a?(Group)
-
-      # subtle, using Group[] ensures the group exists in the DB
-      group = Group[group.to_sym].id unless group.is_a?(Integer)
-      permission = CategoryGroup.permission_types[permission] unless permission.is_a?(Integer)
-
-      [group, permission]
-    end
-
-    mapped.each do |group, permission|
-      if group == everyone && permission == full
-        return [false, []]
-      end
-
-      read_restricted = false if group == everyone
-    end
-
-    [read_restricted, mapped]
-  end
-
   def self.query_parent_category(parent_slug)
     self.where(slug: parent_slug, parent_category_id: nil).pluck(:id).first ||
     self.where(id: parent_slug.to_i).pluck(:id).first
   end
 
   def self.query_category(slug_or_id, parent_category_id)
-    self.where(slug: slug_or_id, parent_category_id: parent_category_id).includes(:featured_users).first ||
-    self.where(id: slug_or_id.to_i, parent_category_id: parent_category_id).includes(:featured_users).first
+    self.where(slug: slug_or_id, parent_category_id: parent_category_id).first ||
+    self.where(id: slug_or_id.to_i, parent_category_id: parent_category_id).first
   end
 
   def self.find_by_email(email)
@@ -504,6 +512,17 @@ SQL
   def subcategory_list_includes_topics?
     subcategory_list_style.end_with?("with_featured_topics")
   end
+
+  %i{
+    category_created
+    category_updated
+    category_destroyed
+  }.each do |event|
+    define_method("trigger_#{event}_event") do
+      DiscourseEvent.trigger(event, self)
+      true
+    end
+  end
 end
 
 # == Schema Information
@@ -521,7 +540,7 @@ end
 #  topics_year                   :integer          default(0)
 #  topics_month                  :integer          default(0)
 #  topics_week                   :integer          default(0)
-#  slug                          :string(255)      not null
+#  slug                          :string           not null
 #  description                   :text
 #  text_color                    :string(6)        default("FFFFFF"), not null
 #  read_restricted               :boolean          default(FALSE), not null
@@ -534,7 +553,7 @@ end
 #  posts_year                    :integer          default(0)
 #  posts_month                   :integer          default(0)
 #  posts_week                    :integer          default(0)
-#  email_in                      :string(255)
+#  email_in                      :string
 #  email_in_allow_strangers      :boolean          default(FALSE)
 #  topics_day                    :integer          default(0)
 #  posts_day                     :integer          default(0)
@@ -542,7 +561,6 @@ end
 #  name_lower                    :string(50)       not null
 #  auto_close_based_on_last_post :boolean          default(FALSE)
 #  topic_template                :text
-#  suppress_from_homepage        :boolean          default(FALSE)
 #  contains_messages             :boolean
 #  sort_order                    :string
 #  sort_ascending                :boolean
@@ -556,10 +574,12 @@ end
 #  subcategory_list_style        :string(50)       default("rows_with_featured_topics")
 #  default_top_period            :string(20)       default("all")
 #  mailinglist_mirror            :boolean          default(FALSE), not null
+#  suppress_from_latest          :boolean          default(FALSE)
+#  minimum_required_tags         :integer          default(0)
 #
 # Indexes
 #
-#  index_categories_on_email_in            (email_in) UNIQUE
-#  index_categories_on_forum_thread_count  (topic_count)
-#  unique_index_categories_on_name         ((COALESCE(parent_category_id, '-1'::integer)), name) UNIQUE
+#  index_categories_on_email_in     (email_in) UNIQUE
+#  index_categories_on_topic_count  (topic_count)
+#  unique_index_categories_on_name  (COALESCE(parent_category_id, '-1'::integer), name) UNIQUE
 #
diff --git a/app/models/category_featured_user.rb b/app/models/category_featured_user.rb
deleted file mode 100644
index 638af792135..00000000000
--- a/app/models/category_featured_user.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-class CategoryFeaturedUser < ActiveRecord::Base
-  belongs_to :category
-  belongs_to :user
-
-  def self.max_featured_users
-    5
-  end
-
-  def self.feature_users_in(category_or_category_id)
-    category_id =
-      if category_or_category_id.is_a?(Integer)
-        category_or_category_id
-      else
-        category_or_category_id.id
-      end
-
-    # Figure out most recent posters in the category
-    most_recent_user_ids = exec_sql "
-      SELECT x.user_id
-      FROM (
-        SELECT DISTINCT ON (p.user_id) p.user_id AS user_id,
-               p.created_at AS created_at
-        FROM posts AS p
-        INNER JOIN topics AS ft ON ft.id = p.topic_id
-        WHERE ft.category_id = :category_id
-        AND p.user_id IS NOT NULL
-        ORDER BY p.user_id, p.created_at DESC
-      ) AS x
-      ORDER BY x.created_at DESC
-      LIMIT :max_featured_users;
-    ", category_id: category_id, max_featured_users: max_featured_users
-
-    user_ids = most_recent_user_ids.map { |uc| uc['user_id'].to_i }
-    current = CategoryFeaturedUser.where(category_id: category_id).order(:id).pluck(:user_id)
-
-    return if current == user_ids
-
-    transaction do
-      CategoryFeaturedUser.where(category_id: category_id).delete_all
-
-      user_ids.each do |user_id|
-        create(category_id: category_id, user_id: user_id)
-      end
-    end
-
-  end
-
-end
-
-# == Schema Information
-#
-# Table name: category_featured_users
-#
-#  id          :integer          not null, primary key
-#  category_id :integer
-#  user_id     :integer
-#  created_at  :datetime         not null
-#  updated_at  :datetime         not null
-#
-# Indexes
-#
-#  index_category_featured_users_on_category_id_and_user_id  (category_id,user_id) UNIQUE
-#
diff --git a/app/models/category_group.rb b/app/models/category_group.rb
index 849fcba0260..ca7a8ec8500 100644
--- a/app/models/category_group.rb
+++ b/app/models/category_group.rb
@@ -5,7 +5,7 @@ class CategoryGroup < ActiveRecord::Base
   delegate :name, to: :group, prefix: true
 
   def self.permission_types
-    @permission_types ||= Enum.new(:full, :create_post, :readonly)
+    @permission_types ||= Enum.new(full: 1, create_post: 2, readonly: 3)
   end
 
 end
diff --git a/app/models/category_list.rb b/app/models/category_list.rb
index ccc23d88b65..76511d5b8bc 100644
--- a/app/models/category_list.rb
+++ b/app/models/category_list.rb
@@ -72,7 +72,6 @@ class CategoryList
         subcategories: [:topic_only_relative_url]
       ).secured(@guardian)
 
-      @categories = @categories.where(suppress_from_homepage: false) if @options[:is_homepage]
       @categories = @categories.where("categories.parent_category_id = ?", @options[:parent_category_id].to_i) if @options[:parent_category_id].present?
 
       if SiteSetting.fixed_category_positions
diff --git a/app/models/category_page_style.rb b/app/models/category_page_style.rb
index fe82ea95db0..d45376ad1f1 100644
--- a/app/models/category_page_style.rb
+++ b/app/models/category_page_style.rb
@@ -11,6 +11,7 @@ class CategoryPageStyle < EnumSiteSetting
       { name: 'category_page_style.categories_only', value: 'categories_only' },
       { name: 'category_page_style.categories_with_featured_topics', value: 'categories_with_featured_topics' },
       { name: 'category_page_style.categories_and_latest_topics', value: 'categories_and_latest_topics' },
+      { name: 'category_page_style.categories_and_top_topics', value: 'categories_and_top_topics' },
     ]
   end
 
diff --git a/app/models/category_tag.rb b/app/models/category_tag.rb
index 20ab52d7bc2..507d13e3845 100644
--- a/app/models/category_tag.rb
+++ b/app/models/category_tag.rb
@@ -10,8 +10,8 @@ end
 #  id          :integer          not null, primary key
 #  category_id :integer          not null
 #  tag_id      :integer          not null
-#  created_at  :datetime
-#  updated_at  :datetime
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
 #
 # Indexes
 #
diff --git a/app/models/category_tag_group.rb b/app/models/category_tag_group.rb
index 3c642d39649..c262539b961 100644
--- a/app/models/category_tag_group.rb
+++ b/app/models/category_tag_group.rb
@@ -10,8 +10,8 @@ end
 #  id           :integer          not null, primary key
 #  category_id  :integer          not null
 #  tag_group_id :integer          not null
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #
 # Indexes
 #
diff --git a/app/models/category_tag_stat.rb b/app/models/category_tag_stat.rb
new file mode 100644
index 00000000000..8aff0447c8d
--- /dev/null
+++ b/app/models/category_tag_stat.rb
@@ -0,0 +1,80 @@
+class CategoryTagStat < ActiveRecord::Base
+  belongs_to :category
+  belongs_to :tag
+
+  def self.topic_moved(topic, from_category_id, to_category_id)
+    if from_category_id
+      self.where(tag_id: topic.tags.map(&:id), category_id: from_category_id)
+        .where('topic_count > 0')
+        .update_all('topic_count = topic_count - 1')
+    end
+
+    if to_category_id
+      sql = <<~SQL
+        UPDATE #{self.table_name}
+           SET topic_count = topic_count + 1
+         WHERE tag_id in (:tag_ids)
+           AND category_id = :category_id
+     RETURNING tag_id
+      SQL
+
+      tag_ids = topic.tags.map(&:id)
+      updated_tag_ids = self.exec_sql(sql, tag_ids: tag_ids, category_id: to_category_id).map { |row| row['tag_id'] }
+
+      (tag_ids - updated_tag_ids).each do |tag_id|
+        CategoryTagStat.create!(tag_id: tag_id, category_id: to_category_id, topic_count: 1)
+      end
+    end
+  end
+
+  def self.topic_deleted(topic)
+    topic_moved(topic, topic.category_id, nil)
+  end
+
+  def self.topic_recovered(topic)
+    topic_moved(topic, nil, topic.category_id)
+  end
+
+  def self.ensure_consistency!
+    self.update_topic_counts
+  end
+
+  # Recalculate all topic counts if they got out of sync
+  def self.update_topic_counts
+    CategoryTagStat.exec_sql <<~SQL
+      UPDATE category_tag_stats stats
+      SET topic_count = x.topic_count
+      FROM (
+        SELECT COUNT(topics.id) AS topic_count,
+               tags.id AS tag_id,
+               topics.category_id as category_id
+        FROM tags
+        INNER JOIN topic_tags ON tags.id = topic_tags.tag_id
+        INNER JOIN topics ON topics.id = topic_tags.topic_id
+               AND topics.deleted_at IS NULL
+               AND topics.category_id IS NOT NULL
+        GROUP BY tags.id, topics.category_id
+      ) x
+      WHERE stats.tag_id = x.tag_id
+        AND stats.category_id = x.category_id
+        AND x.topic_count <> stats.topic_count
+    SQL
+  end
+end
+
+# == Schema Information
+#
+# Table name: category_tag_stats
+#
+#  id          :integer          not null, primary key
+#  category_id :integer          not null
+#  tag_id      :integer          not null
+#  topic_count :integer          default(0), not null
+#
+# Indexes
+#
+#  index_category_tag_stats_on_category_id                  (category_id)
+#  index_category_tag_stats_on_category_id_and_tag_id       (category_id,tag_id) UNIQUE
+#  index_category_tag_stats_on_category_id_and_topic_count  (category_id,topic_count)
+#  index_category_tag_stats_on_tag_id                       (tag_id)
+#
diff --git a/app/models/child_theme.rb b/app/models/child_theme.rb
index 6e101bd8aae..e4eb2d0ef7f 100644
--- a/app/models/child_theme.rb
+++ b/app/models/child_theme.rb
@@ -10,8 +10,8 @@ end
 #  id              :integer          not null, primary key
 #  parent_theme_id :integer
 #  child_theme_id  :integer
-#  created_at      :datetime
-#  updated_at      :datetime
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
 #
 # Indexes
 #
diff --git a/app/models/color_scheme.rb b/app/models/color_scheme.rb
index dbe60b1c766..8b55f896eb6 100644
--- a/app/models/color_scheme.rb
+++ b/app/models/color_scheme.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency 'distributed_cache'
 
 class ColorScheme < ActiveRecord::Base
@@ -43,12 +45,7 @@ class ColorScheme < ActiveRecord::Base
 
   alias_method :colors, :color_scheme_colors
 
-  before_save do
-    if self.id
-      self.version += 1
-    end
-  end
-
+  before_save :bump_version
   after_save :publish_discourse_stylesheet
   after_save :dump_hex_cache
   after_destroy :dump_hex_cache
@@ -113,12 +110,12 @@ class ColorScheme < ActiveRecord::Base
 
   def self.lookup_hex_for_name(name)
     enabled_color_scheme = Theme.where(key: SiteSetting.default_theme_key).first&.color_scheme
-    (enabled_color_scheme || base).colors.find { |c| c.name == name }.try(:hex) || :nil
+    (enabled_color_scheme || base).colors.find { |c| c.name == name }.try(:hex) || "nil"
   end
 
   def self.hex_for_name(name)
     hex_cache[name] ||= lookup_hex_for_name(name)
-    hex_cache[name] == :nil ? nil : hex_cache[name]
+    hex_cache[name] == "nil" ? nil : hex_cache[name]
   end
 
   def colors=(arr)
@@ -180,6 +177,12 @@ class ColorScheme < ActiveRecord::Base
     self.class.hex_cache.clear
   end
 
+  def bump_version
+    if self.id
+      self.version += 1
+    end
+  end
+
 end
 
 # == Schema Information
@@ -187,7 +190,7 @@ end
 # Table name: color_schemes
 #
 #  id             :integer          not null, primary key
-#  name           :string(255)      not null
+#  name           :string           not null
 #  version        :integer          default(1), not null
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null
diff --git a/app/models/color_scheme_color.rb b/app/models/color_scheme_color.rb
index 39a7b51eec6..51e0c4ae8d0 100644
--- a/app/models/color_scheme_color.rb
+++ b/app/models/color_scheme_color.rb
@@ -9,8 +9,8 @@ end
 # Table name: color_scheme_colors
 #
 #  id              :integer          not null, primary key
-#  name            :string(255)      not null
-#  hex             :string(255)      not null
+#  name            :string           not null
+#  hex             :string           not null
 #  color_scheme_id :integer          not null
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
diff --git a/app/models/concerns/cached_counting.rb b/app/models/concerns/cached_counting.rb
new file mode 100644
index 00000000000..867c8fb250e
--- /dev/null
+++ b/app/models/concerns/cached_counting.rb
@@ -0,0 +1,69 @@
+module CachedCounting
+  extend ActiveSupport::Concern
+
+  included do
+    class << self
+      attr_accessor :autoflush, :autoflush_seconds, :last_flush
+    end
+
+    # auto flush if backlog is larger than this
+    self.autoflush = 2000
+
+    # auto flush if older than this
+    self.autoflush_seconds = 5.minutes
+
+    self.last_flush = Time.now.utc
+  end
+
+  class_methods do
+    def perform_increment!(key, opts = nil)
+      val = $redis.incr(key).to_i
+
+      # readonly mode it is going to be 0, skip
+      return if val == 0
+
+      # 3.days, see: https://github.com/rails/rails/issues/21296
+      $redis.expire(key, 259200)
+
+      autoflush = (opts && opts[:autoflush]) || self.autoflush
+      if autoflush > 0 && val >= autoflush
+        write_cache!
+        return
+      end
+
+      if (Time.now.utc - last_flush).to_i > autoflush_seconds
+        write_cache!
+      end
+    end
+
+    def write_cache!(date = nil)
+      raise NotImplementedError
+    end
+
+    GET_AND_RESET = <<~LUA
+      local val = redis.call('get', KEYS[1])
+      redis.call('set', KEYS[1], '0')
+      return val
+    LUA
+
+    # this may seem a bit fancy but in so it allows
+    # for concurrent calls without double counting
+    def get_and_reset(key)
+      namespaced_key = $redis.namespace_key(key)
+      val = $redis.without_namespace.eval(GET_AND_RESET, keys: [namespaced_key]).to_i
+      $redis.expire(key, 259200) # SET removes expiry, so set it again
+      val
+    end
+
+    def request_id(query_params, retries = 0)
+      id = where(query_params).pluck(:id).first
+      id ||= create!(query_params.merge(count: 0)).id
+    rescue # primary key violation
+      if retries == 0
+        request_id(query_params, 1)
+      else
+        raise
+      end
+    end
+  end
+end
diff --git a/app/models/concerns/has_custom_fields.rb b/app/models/concerns/has_custom_fields.rb
index 519f8deb510..a2bc01b254d 100644
--- a/app/models/concerns/has_custom_fields.rb
+++ b/app/models/concerns/has_custom_fields.rb
@@ -6,7 +6,7 @@ module HasCustomFields
     def self.append_field(target, key, value, types)
       if target.has_key?(key)
         target[key] = [target[key]] if !target[key].is_a? Array
-        target[key] << cast_custom_field(key, value, types)
+        target[key] << cast_custom_field(key, value, types, _return_array = false)
       else
         target[key] = cast_custom_field(key, value, types)
       end
@@ -28,16 +28,26 @@ module HasCustomFields
       types[key]
     end
 
-    def self.cast_custom_field(key, value, types)
+    def self.cast_custom_field(key, value, types, return_array = true)
       return value unless type = get_custom_field_type(types, key)
 
-      case type
-      when :boolean then !!CUSTOM_FIELD_TRUE.include?(value)
-      when :integer then value.to_i
-      when :json    then ::JSON.parse(value)
-      else
-        value
+      array = nil
+
+      if Array === type
+        type = type[0]
+        array = true if return_array
       end
+
+      result =
+        case type
+        when :boolean then !!CUSTOM_FIELD_TRUE.include?(value)
+        when :integer then value.to_i
+        when :json    then ::JSON.parse(value)
+        else
+          value
+        end
+
+      array ? [result] : result
     end
   end
 
@@ -155,6 +165,20 @@ module HasCustomFields
     !@custom_fields || @custom_fields_orig == @custom_fields
   end
 
+  # `upsert_custom_fields` will only insert/update existing fields, and will not
+  # delete anything. It is safer under concurrency and is recommended when
+  # you just want to attach fields to things without maintaining a specific
+  # set of fields.
+  def upsert_custom_fields(fields)
+    fields.each do |k, v|
+      row_count = _custom_fields.where(name: k).update_all(value: v)
+      if row_count == 0
+        _custom_fields.create!(name: k, value: v)
+      end
+      custom_fields[k] = v
+    end
+  end
+
   def save_custom_fields(force = false)
     if force || !custom_fields_clean?
       dup = @custom_fields.dup
diff --git a/app/models/concerns/second_factor_manager.rb b/app/models/concerns/second_factor_manager.rb
new file mode 100644
index 00000000000..9dd00b61582
--- /dev/null
+++ b/app/models/concerns/second_factor_manager.rb
@@ -0,0 +1,40 @@
+module SecondFactorManager
+  extend ActiveSupport::Concern
+
+  def totp
+    self.create_totp
+    ROTP::TOTP.new(self.user_second_factor.data, issuer: SiteSetting.title)
+  end
+
+  def create_totp(opts = {})
+    if !self.user_second_factor
+      self.create_user_second_factor!({
+        method: UserSecondFactor.methods[:totp],
+        data: ROTP::Base32.random_base32
+      }.merge(opts))
+    end
+  end
+
+  def totp_provisioning_uri
+    self.totp.provisioning_uri(self.email)
+  end
+
+  def authenticate_totp(token)
+    totp = self.totp
+    last_used = 0
+
+    if self.user_second_factor.last_used
+      last_used = self.user_second_factor.last_used.to_i
+    end
+
+    authenticated = !token.blank? && totp.verify_with_drift_and_prior(token, 30, last_used)
+    self.user_second_factor.update!(last_used: DateTime.now) if authenticated
+    !!authenticated
+  end
+
+  def totp_enabled?
+    !!(self&.user_second_factor&.enabled?) &&
+      !SiteSetting.enable_sso &&
+      SiteSetting.enable_local_logins
+  end
+end
diff --git a/app/models/discourse_single_sign_on.rb b/app/models/discourse_single_sign_on.rb
index 3b976a57b37..9cc89bbcdc1 100644
--- a/app/models/discourse_single_sign_on.rb
+++ b/app/models/discourse_single_sign_on.rb
@@ -57,7 +57,8 @@ class DiscourseSingleSignOn < SingleSignOn
     end
 
     # ensure it's not staged anymore
-    user.staged = false
+    user.unstage
+    user.save
 
     # if the user isn't new or it's attached to the SSO record we might be overriding username or email
     unless user.new_record?
@@ -106,7 +107,33 @@ class DiscourseSingleSignOn < SingleSignOn
 
   private
 
+  def synchronize_groups(user)
+    names = (groups || "").split(",").map(&:downcase)
+    ids = Group.where('LOWER(NAME) in (?) AND NOT automatic', names).pluck(:id)
+
+    group_users = GroupUser
+      .where('group_id IN (SELECT id FROM groups WHERE NOT automatic)')
+      .where(user_id: user.id)
+
+    delete_group_users = group_users
+    if ids.length > 0
+      delete_group_users = group_users.where('group_id NOT IN (?)', ids)
+    end
+    delete_group_users.destroy_all
+
+    ids -= group_users.where('group_id IN (?)', ids).pluck(:group_id)
+
+    ids.each do |group_id|
+      GroupUser.create(group_id: group_id, user_id: user.id)
+    end
+  end
+
   def apply_group_rules(user)
+    if SiteSetting.sso_overrides_groups
+      synchronize_groups(user)
+      return
+    end
+
     if add_groups
       split = add_groups.split(",").map(&:downcase)
       if split.length > 0
@@ -130,49 +157,71 @@ class DiscourseSingleSignOn < SingleSignOn
   end
 
   def match_email_or_create_user(ip_address)
-    unless user = User.find_by_email(email)
-      try_name = name.presence
-      try_username = username.presence
+    # Use a mutex here to counter SSO requests that are sent at the same time w
+    # the same email payload
+    DistributedMutex.synchronize("discourse_single_sign_on_#{email}") do
+      unless user = User.find_by_email(email)
+        try_name = name.presence
+        try_username = username.presence
 
-      user_params = {
-        email: email,
-        name: try_name || User.suggest_name(try_username || email),
-        username: UserNameSuggester.suggest(try_username || try_name || email),
-        ip_address: ip_address
-      }
+        user_params = {
+          primary_email: UserEmail.new(email: email, primary: true),
+          name: try_name || User.suggest_name(try_username || email),
+          username: UserNameSuggester.suggest(try_username || try_name || email),
+          ip_address: ip_address
+        }
 
-      user = User.create!(user_params)
+        user = User.create!(user_params)
 
-      if SiteSetting.verbose_sso_logging
-        Rails.logger.warn("Verbose SSO log: New User (user_id: #{user.id}) Created with #{user_params}")
+        if SiteSetting.verbose_sso_logging
+          Rails.logger.warn("Verbose SSO log: New User (user_id: #{user.id}) Params: #{user_params} User Params: #{user.attributes} User Errors: #{user.errors.full_messages} Email: #{user.primary_email.attributes} Email Error: #{user.primary_email.errors.full_messages}")
+        end
       end
-    end
 
-    if user
-      if sso_record = user.single_sign_on_record
-        sso_record.last_payload = unsigned_payload
-        sso_record.external_id = external_id
-      else
-        if avatar_url.present?
-          Jobs.enqueue(:download_avatar_from_url,
-            url: avatar_url,
-            user_id: user.id,
-            override_gravatar: SiteSetting.sso_overrides_avatar
+      if user
+        if sso_record = user.single_sign_on_record
+          sso_record.last_payload = unsigned_payload
+          sso_record.external_id = external_id
+        else
+          if avatar_url.present?
+            Jobs.enqueue(:download_avatar_from_url,
+              url: avatar_url,
+              user_id: user.id,
+              override_gravatar: SiteSetting.sso_overrides_avatar
+            )
+          end
+
+          if profile_background_url.present?
+            Jobs.enqueue(:download_profile_background_from_url,
+              url: profile_background_url,
+              user_id: user.id,
+              is_card_background: false
+            )
+          end
+
+          if card_background_url.present?
+            Jobs.enqueue(:download_profile_background_from_url,
+              url: card_background_url,
+              user_id: user.id,
+              is_card_background: true
+            )
+          end
+
+          user.create_single_sign_on_record!(
+            last_payload: unsigned_payload,
+            external_id: external_id,
+            external_username: username,
+            external_email: email,
+            external_name: name,
+            external_avatar_url: avatar_url,
+            external_profile_background_url: profile_background_url,
+            external_card_background_url: card_background_url
           )
         end
-
-        user.create_single_sign_on_record!(
-          last_payload: unsigned_payload,
-          external_id: external_id,
-          external_username: username,
-          external_email: email,
-          external_name: name,
-          external_avatar_url: avatar_url
-        )
       end
-    end
 
-    user
+      user
+    end
   end
 
   def change_external_attributes_and_override(sso_record, user)
@@ -181,8 +230,12 @@ class DiscourseSingleSignOn < SingleSignOn
       user.active = false if require_activation
     end
 
-    if SiteSetting.sso_overrides_username && user.username != username && username.present?
-      user.username = UserNameSuggester.suggest(username || name || email, user.username)
+    if SiteSetting.sso_overrides_username? && username.present?
+      if user.username.downcase == username.downcase
+        user.username = username # there may be a change of case
+      elsif user.username != username
+        user.username = UserNameSuggester.suggest(username || name || email, user.username)
+      end
     end
 
     if SiteSetting.sso_overrides_name && user.name != name && name.present?
@@ -199,10 +252,36 @@ class DiscourseSingleSignOn < SingleSignOn
       end
     end
 
+    profile_background_missing = user.user_profile.profile_background.blank? || Upload.get_from_url(user.user_profile.profile_background).blank?
+    if (profile_background_missing || SiteSetting.sso_overrides_profile_background) && profile_background_url.present?
+      profile_background_changed = sso_record.external_profile_background_url != profile_background_url
+      if profile_background_changed || profile_background_missing
+        Jobs.enqueue(:download_profile_background_from_url,
+            url: profile_background_url,
+            user_id: user.id,
+            is_card_background: false
+        )
+      end
+    end
+
+    card_background_missing = user.user_profile.card_background.blank? || Upload.get_from_url(user.user_profile.card_background).blank?
+    if (card_background_missing || SiteSetting.sso_overrides_profile_background) && card_background_url.present?
+      card_background_changed = sso_record.external_card_background_url != card_background_url
+      if card_background_changed || card_background_missing
+        Jobs.enqueue(:download_profile_background_from_url,
+            url: card_background_url,
+            user_id: user.id,
+            is_card_background: true
+        )
+      end
+    end
+
     # change external attributes for sso record
     sso_record.external_username = username
     sso_record.external_email = email
     sso_record.external_name = name
     sso_record.external_avatar_url = avatar_url
+    sso_record.external_profile_background_url = profile_background_url
+    sso_record.external_card_background_url = card_background_url
   end
 end
diff --git a/app/models/draft.rb b/app/models/draft.rb
index 48bd38ce13b..be412cc72a3 100644
--- a/app/models/draft.rb
+++ b/app/models/draft.rb
@@ -59,7 +59,7 @@ end
 #
 #  id         :integer          not null, primary key
 #  user_id    :integer          not null
-#  draft_key  :string(255)      not null
+#  draft_key  :string           not null
 #  data       :text             not null
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
diff --git a/app/models/draft_sequence.rb b/app/models/draft_sequence.rb
index 863b00aa700..460556d004d 100644
--- a/app/models/draft_sequence.rb
+++ b/app/models/draft_sequence.rb
@@ -33,7 +33,7 @@ end
 #
 #  id        :integer          not null, primary key
 #  user_id   :integer          not null
-#  draft_key :string(255)      not null
+#  draft_key :string           not null
 #  sequence  :integer          not null
 #
 # Indexes
diff --git a/app/models/email_log.rb b/app/models/email_log.rb
index c17878c93d6..0fafa1bcc04 100644
--- a/app/models/email_log.rb
+++ b/app/models/email_log.rb
@@ -74,8 +74,8 @@ end
 # Table name: email_logs
 #
 #  id             :integer          not null, primary key
-#  to_address     :string(255)      not null
-#  email_type     :string(255)      not null
+#  to_address     :string           not null
+#  email_type     :string           not null
 #  user_id        :integer
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null
@@ -83,16 +83,19 @@ end
 #  post_id        :integer
 #  topic_id       :integer
 #  skipped        :boolean          default(FALSE)
-#  skipped_reason :string(255)
+#  skipped_reason :string
 #  bounce_key     :string
 #  bounced        :boolean          default(FALSE), not null
 #  message_id     :string
 #
 # Indexes
 #
+#  idx_email_logs_user_created_filtered        (user_id,created_at)
 #  index_email_logs_on_created_at              (created_at)
 #  index_email_logs_on_message_id              (message_id)
+#  index_email_logs_on_post_id                 (post_id)
 #  index_email_logs_on_reply_key               (reply_key)
 #  index_email_logs_on_skipped_and_created_at  (skipped,created_at)
+#  index_email_logs_on_topic_id                (topic_id)
 #  index_email_logs_on_user_id_and_created_at  (user_id,created_at)
 #
diff --git a/app/models/email_token.rb b/app/models/email_token.rb
index 2338108ac4f..2a10dd4e234 100644
--- a/app/models/email_token.rb
+++ b/app/models/email_token.rb
@@ -94,8 +94,8 @@ end
 #
 #  id         :integer          not null, primary key
 #  user_id    :integer          not null
-#  email      :string(255)      not null
-#  token      :string(255)      not null
+#  email      :string           not null
+#  token      :string           not null
 #  confirmed  :boolean          default(FALSE), not null
 #  expired    :boolean          default(FALSE), not null
 #  created_at :datetime         not null
diff --git a/app/models/embeddable_host.rb b/app/models/embeddable_host.rb
index b76a6725b84..c6f0effbbe1 100644
--- a/app/models/embeddable_host.rb
+++ b/app/models/embeddable_host.rb
@@ -12,7 +12,10 @@ class EmbeddableHost < ActiveRecord::Base
   def self.record_for_url(uri)
 
     if uri.is_a?(String)
-      uri = URI(UrlHelper.escape_uri(uri)) rescue nil
+      uri = begin
+        URI(UrlHelper.escape_uri(uri))
+      rescue URI::InvalidURIError
+      end
     end
     return false unless uri.present?
 
@@ -40,7 +43,11 @@ class EmbeddableHost < ActiveRecord::Base
     # Work around IFRAME reload on WebKit where the referer will be set to the Forum URL
     return true if url&.starts_with?(Discourse.base_url)
 
-    uri = URI(UrlHelper.escape_uri(url)) rescue nil
+    uri = begin
+      URI(UrlHelper.escape_uri(url))
+    rescue URI::InvalidURIError
+    end
+
     uri.present? && record_for_url(uri).present?
   end
 
@@ -60,10 +67,10 @@ end
 # Table name: embeddable_hosts
 #
 #  id             :integer          not null, primary key
-#  host           :string(255)      not null
+#  host           :string           not null
 #  category_id    :integer          not null
-#  created_at     :datetime
-#  updated_at     :datetime
+#  created_at     :datetime         not null
+#  updated_at     :datetime         not null
 #  path_whitelist :string
 #  class_name     :string
 #
diff --git a/app/models/emoji.rb b/app/models/emoji.rb
index dd01b21ed84..0112fbe8e4b 100644
--- a/app/models/emoji.rb
+++ b/app/models/emoji.rb
@@ -25,6 +25,10 @@ class Emoji
     Discourse.cache.fetch(cache_key("aliases_emojis")) { db['aliases'] }
   end
 
+  def self.searchAliases
+    Discourse.cache.fetch(cache_key("search_aliases_emojis")) { db['searchAliases'] }
+  end
+
   def self.custom
     Discourse.cache.fetch(cache_key("custom_emojis")) { load_custom }
   end
@@ -59,7 +63,7 @@ class Emoji
   end
 
   def self.clear_cache
-    %w{custom standard aliases all tonable}.each do |key|
+    %w{custom standard aliases search_aliases all tonable}.each do |key|
       Discourse.cache.delete(cache_key("#{key}_emojis"))
     end
   end
diff --git a/app/models/facebook_user_info.rb b/app/models/facebook_user_info.rb
index 7b099e03bb8..eb996113106 100644
--- a/app/models/facebook_user_info.rb
+++ b/app/models/facebook_user_info.rb
@@ -9,13 +9,13 @@ end
 #  id               :integer          not null, primary key
 #  user_id          :integer          not null
 #  facebook_user_id :integer          not null
-#  username         :string(255)
-#  first_name       :string(255)
-#  last_name        :string(255)
-#  email            :string(255)
-#  gender           :string(255)
-#  name             :string(255)
-#  link             :string(255)
+#  username         :string
+#  first_name       :string
+#  last_name        :string
+#  email            :string
+#  gender           :string
+#  name             :string
+#  link             :string
 #  created_at       :datetime         not null
 #  updated_at       :datetime         not null
 #  avatar_url       :string
diff --git a/app/models/github_user_info.rb b/app/models/github_user_info.rb
index c79a3b0e913..8e776f33ab1 100644
--- a/app/models/github_user_info.rb
+++ b/app/models/github_user_info.rb
@@ -8,7 +8,7 @@ end
 #
 #  id             :integer          not null, primary key
 #  user_id        :integer          not null
-#  screen_name    :string(255)      not null
+#  screen_name    :string           not null
 #  github_user_id :integer          not null
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null
diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb
index fabc777690f..c81430d2cd5 100644
--- a/app/models/global_setting.rb
+++ b/app/models/global_setting.rb
@@ -85,6 +85,10 @@ class GlobalSetting
       end) == :true
   end
 
+  def self.s3_bucket_name
+    @s3_bucket_name ||= s3_bucket.downcase.split("/")[0]
+  end
+
   # for testing
   def self.reset_s3_cache!
     @use_s3 = nil
@@ -92,7 +96,21 @@ class GlobalSetting
 
   def self.database_config
     hash = { "adapter" => "postgresql" }
-    %w{pool connect_timeout timeout socket host port username password replica_host replica_port}.each do |s|
+
+    %w{
+      pool
+      connect_timeout
+      timeout
+      socket
+      host
+      backup_host
+      port
+      backup_port
+      username
+      password
+      replica_host
+      replica_port
+    }.each do |s|
       if val = self.send("db_#{s}")
         hash[s] = val
       end
@@ -103,6 +121,8 @@ class GlobalSetting
     hostnames = [ hostname ]
     hostnames << backup_hostname if backup_hostname.present?
 
+    hostnames << URI.parse(cdn_url).host if cdn_url.present?
+
     hash["host_names"] = hostnames
     hash["database"] = db_name
 
diff --git a/app/models/google_user_info.rb b/app/models/google_user_info.rb
index 26f3dda50dc..343fe9945fd 100644
--- a/app/models/google_user_info.rb
+++ b/app/models/google_user_info.rb
@@ -8,15 +8,15 @@ end
 #
 #  id             :integer          not null, primary key
 #  user_id        :integer          not null
-#  google_user_id :string(255)      not null
-#  first_name     :string(255)
-#  last_name      :string(255)
-#  email          :string(255)
-#  gender         :string(255)
-#  name           :string(255)
-#  link           :string(255)
-#  profile_link   :string(255)
-#  picture        :string(255)
+#  google_user_id :string           not null
+#  first_name     :string
+#  last_name      :string
+#  email          :string
+#  gender         :string
+#  name           :string
+#  link           :string
+#  profile_link   :string
+#  picture        :string
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null
 #
diff --git a/app/models/group.rb b/app/models/group.rb
index a86d60c5812..1a895775ded 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -35,16 +35,21 @@ class Group < ActiveRecord::Base
   after_save :expire_cache
   after_destroy :expire_cache
 
+  after_commit :trigger_group_created_event, on: :create
+  after_commit :trigger_group_updated_event, on: :update
+  after_commit :trigger_group_destroyed_event, on: :destroy
+
   def expire_cache
     ApplicationSerializer.expire_cache_fragment!("group_names")
   end
 
   validate :name_format_validator
-  validates :name, presence: true, uniqueness: { case_sensitive: false }
+  validates :name, presence: true
   validate :automatic_membership_email_domains_format_validator
   validate :incoming_email_validator
   validate :can_allow_membership_requests, if: :allow_membership_requests
   validates :flair_url, url: true, if: Proc.new { |g| g.flair_url && g.flair_url[0, 3] != 'fa-' }
+  validate :validate_grant_trust_level, if: :will_save_change_to_grant_trust_level?
 
   AUTO_GROUPS = {
     everyone: 0,
@@ -81,8 +86,8 @@ class Group < ActiveRecord::Base
   validates :mentionable_level, inclusion: { in: ALIAS_LEVELS.values }
   validates :messageable_level, inclusion: { in: ALIAS_LEVELS.values }
 
-  scope :visible_groups, ->(user) {
-    groups = Group.order(name: :asc).where("groups.id > 0")
+  scope :visible_groups, Proc.new { |user, order|
+    groups = Group.order(order || "name ASC").where("groups.id > 0")
 
     unless user&.admin
       sql = <<~SQL
@@ -192,6 +197,7 @@ class Group < ActiveRecord::Base
       .references(:posts, :topics, :category)
       .where(user_id: user_ids)
       .where('topics.archetype <> ?', Archetype.private_message)
+      .where('topics.visible')
       .where(post_type: Post.types[:regular])
 
     if opts[:category_id].present?
@@ -281,13 +287,13 @@ class Group < ActiveRecord::Base
     remove_subquery =
       case name
       when :admins
-        "SELECT id FROM users WHERE NOT admin"
+        "SELECT id FROM users WHERE id <= 0 OR NOT admin"
       when :moderators
-        "SELECT id FROM users WHERE NOT moderator"
+        "SELECT id FROM users WHERE id <= 0 OR NOT moderator"
       when :staff
-        "SELECT id FROM users WHERE NOT admin AND NOT moderator"
+        "SELECT id FROM users WHERE id <= 0 OR (NOT admin AND NOT moderator)"
       when :trust_level_0, :trust_level_1, :trust_level_2, :trust_level_3, :trust_level_4
-        "SELECT id FROM users WHERE trust_level < #{id - 10}"
+        "SELECT id FROM users WHERE id <= 0 OR trust_level < #{id - 10}"
       end
 
     exec_sql <<-SQL
@@ -301,15 +307,15 @@ class Group < ActiveRecord::Base
     insert_subquery =
       case name
       when :admins
-        "SELECT id FROM users WHERE admin"
+        "SELECT id FROM users WHERE id > 0 AND admin"
       when :moderators
-        "SELECT id FROM users WHERE moderator"
+        "SELECT id FROM users WHERE id > 0 AND moderator"
       when :staff
-        "SELECT id FROM users WHERE moderator OR admin"
+        "SELECT id FROM users WHERE id > 0 AND (moderator OR admin)"
       when :trust_level_1, :trust_level_2, :trust_level_3, :trust_level_4
-        "SELECT id FROM users WHERE trust_level >= #{id - 10}"
+        "SELECT id FROM users WHERE id > 0 AND trust_level >= #{id - 10}"
       when :trust_level_0
-        "SELECT id FROM users"
+        "SELECT id FROM users WHERE id > 0"
       end
 
     exec_sql <<-SQL
@@ -433,6 +439,15 @@ class Group < ActiveRecord::Base
     end
   end
 
+  # given something that might be a group name, id, or record, return the group id
+  def self.group_id_from_param(group_param)
+    return group_param.id if group_param.is_a?(Group)
+    return group_param if group_param.is_a?(Integer)
+
+    # subtle, using Group[] ensures the group exists in the DB
+    Group[group_param.to_sym].id
+  end
+
   def self.builtin
     Enum.new(:moderators, :admins, :trust_level_1, :trust_level_2)
   end
@@ -534,6 +549,16 @@ class Group < ActiveRecord::Base
       if user_attributes.present?
         User.where(id: user_ids).update_all(user_attributes)
       end
+
+      # update group user count
+      Group.exec_sql <<-SQL.squish
+        UPDATE groups g
+        SET user_count =
+          (SELECT COUNT(gu.user_id)
+           FROM group_users gu
+           WHERE gu.group_id = g.id)
+        WHERE g.id = #{self.id};
+      SQL
     end
 
     if self.grant_trust_level.present?
@@ -550,11 +575,45 @@ class Group < ActiveRecord::Base
     STAFF_GROUPS.include?(self.name.to_sym)
   end
 
+  def self.member_of(groups, user)
+    groups.joins(
+      "LEFT JOIN group_users gu ON gu.group_id = groups.id
+    ").where("gu.user_id = ?", user.id)
+  end
+
+  def self.owner_of(groups, user)
+    self.member_of(groups, user).where("gu.owner")
+  end
+
+  %i{
+    group_created
+    group_updated
+    group_destroyed
+  }.each do |event|
+    define_method("trigger_#{event}_event") do
+      DiscourseEvent.trigger(event, self)
+      true
+    end
+  end
+
   protected
 
     def name_format_validator
       self.name.strip!
-      UsernameValidator.perform_validation(self, 'name')
+
+      UsernameValidator.perform_validation(self, 'name') || begin
+        name_lower = self.name.downcase
+
+        if self.will_save_change_to_name? && self.name_was&.downcase != name_lower
+          existing = Group.exec_sql(
+            User::USERNAME_EXISTS_SQL, username: name_lower
+          ).values.present?
+
+          if existing
+            errors.add(:name, I18n.t("activerecord.errors.messages.taken"))
+          end
+        end
+      end
     end
 
     def automatic_membership_email_domains_format_validator
@@ -633,6 +692,15 @@ class Group < ActiveRecord::Base
 
   private
 
+    def validate_grant_trust_level
+      unless TrustLevel.valid?(self.grant_trust_level)
+        self.errors.add(:base, I18n.t(
+          'groups.errors.grant_trust_level_not_valid',
+          trust_level: self.grant_trust_level
+        ))
+      end
+    end
+
     def can_allow_membership_requests
       valid = true
 
@@ -661,7 +729,7 @@ end
 # Table name: groups
 #
 #  id                                 :integer          not null, primary key
-#  name                               :string(255)      not null
+#  name                               :string           not null
 #  created_at                         :datetime         not null
 #  updated_at                         :datetime         not null
 #  automatic                          :boolean          default(FALSE), not null
@@ -669,7 +737,7 @@ end
 #  automatic_membership_email_domains :text
 #  automatic_membership_retroactive   :boolean          default(FALSE)
 #  primary_group                      :boolean          default(FALSE), not null
-#  title                              :string(255)
+#  title                              :string
 #  grant_trust_level                  :integer
 #  incoming_email                     :string
 #  has_messages                       :boolean          default(FALSE), not null
diff --git a/app/models/group_archived_message.rb b/app/models/group_archived_message.rb
index 91d2062cae5..778a3944c18 100644
--- a/app/models/group_archived_message.rb
+++ b/app/models/group_archived_message.rb
@@ -2,17 +2,21 @@ class GroupArchivedMessage < ActiveRecord::Base
   belongs_to :user
   belongs_to :topic
 
-  def self.move_to_inbox!(group_id, topic_id)
+  def self.move_to_inbox!(group_id, topic)
+    topic_id = topic.id
     GroupArchivedMessage.where(group_id: group_id, topic_id: topic_id).destroy_all
     trigger(:move_to_inbox, group_id, topic_id)
     MessageBus.publish("/topic/#{topic_id}", { type: "move_to_inbox" }, group_ids: [group_id])
+    publish_topic_tracking_state(topic)
   end
 
-  def self.archive!(group_id, topic_id)
+  def self.archive!(group_id, topic)
+    topic_id = topic.id
     GroupArchivedMessage.where(group_id: group_id, topic_id: topic_id).destroy_all
     GroupArchivedMessage.create!(group_id: group_id, topic_id: topic_id)
     trigger(:archive_message, group_id, topic_id)
     MessageBus.publish("/topic/#{topic_id}", { type: "archived" }, group_ids: [group_id])
+    publish_topic_tracking_state(topic)
   end
 
   def self.trigger(event, group_id, topic_id)
@@ -23,6 +27,13 @@ class GroupArchivedMessage < ActiveRecord::Base
     end
   end
 
+  private
+
+    def self.publish_topic_tracking_state(topic)
+      TopicTrackingState.publish_private_message(
+        topic, group_archive: true
+      )
+    end
 end
 
 # == Schema Information
@@ -32,8 +43,8 @@ end
 #  id         :integer          not null, primary key
 #  group_id   :integer          not null
 #  topic_id   :integer          not null
-#  created_at :datetime
-#  updated_at :datetime
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
 #
 # Indexes
 #
diff --git a/app/models/group_mention.rb b/app/models/group_mention.rb
index 30eb647ebc8..3cef10dd735 100644
--- a/app/models/group_mention.rb
+++ b/app/models/group_mention.rb
@@ -10,8 +10,8 @@ end
 #  id         :integer          not null, primary key
 #  post_id    :integer
 #  group_id   :integer
-#  created_at :datetime
-#  updated_at :datetime
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
 #
 # Indexes
 #
diff --git a/app/models/group_user.rb b/app/models/group_user.rb
index 53569330128..5840b536649 100644
--- a/app/models/group_user.rb
+++ b/app/models/group_user.rb
@@ -82,15 +82,8 @@ class GroupUser < ActiveRecord::Base
       .includes(:group)
       .maximum("groups.grant_trust_level")
 
-    if highest_level.nil?
-      # If the user no longer has a group with a trust level,
-      # unlock them, start at 0 and consider promotions.
-      user.update!(group_locked_trust_level: nil)
-      Promotion.recalculate(user)
-    else
-      user.update!(group_locked_trust_level: highest_level)
-      user.change_trust_level!(highest_level)
-    end
+    user.update!(group_locked_trust_level: highest_level)
+    Promotion.recalculate(user)
   end
 
 end
diff --git a/app/models/incoming_email.rb b/app/models/incoming_email.rb
index be5bfdce60a..b355235d267 100644
--- a/app/models/incoming_email.rb
+++ b/app/models/incoming_email.rb
@@ -5,7 +5,24 @@ class IncomingEmail < ActiveRecord::Base
 
   scope :errored,  -> { where("NOT is_bounce AND error IS NOT NULL") }
 
-  scope :addressed_to, -> (email) { where('incoming_emails.to_addresses ILIKE :email OR incoming_emails.cc_addresses ILIKE :email', email: "%#{email}%") }
+  scope :addressed_to, -> (email) do
+    where(<<~SQL, email: "%#{email}%")
+      incoming_emails.to_addresses ILIKE :email OR
+      incoming_emails.cc_addresses ILIKE :email
+    SQL
+  end
+
+  scope :addressed_to_user, ->(user) do
+    where(<<~SQL, user_id: user.id)
+      EXISTS(
+          SELECT 1
+          FROM user_emails
+          WHERE user_emails.user_id = :user_id AND
+                (incoming_emails.to_addresses ILIKE '%' || user_emails.email || '%' OR
+                 incoming_emails.cc_addresses ILIKE '%' || user_emails.email || '%')
+      )
+    SQL
+  end
 end
 
 # == Schema Information
diff --git a/app/models/incoming_link.rb b/app/models/incoming_link.rb
index 0b7e7c0ed63..0cc748a9a30 100644
--- a/app/models/incoming_link.rb
+++ b/app/models/incoming_link.rb
@@ -20,6 +20,7 @@ class IncomingLink < ActiveRecord::Base
       u = User.select(:id).find_by(username_lower: username.downcase)
       user_id = u.id if u
     end
+    ip_address = opts[:ip_address]
 
     if opts[:referer].present?
       begin
@@ -38,6 +39,7 @@ class IncomingLink < ActiveRecord::Base
         .pluck(:id).first
 
       cid = current_user ? (current_user.id) : (nil)
+      ip_address = nil if cid
 
       unless cid && cid == user_id
 
@@ -45,7 +47,7 @@ class IncomingLink < ActiveRecord::Base
                user_id: user_id,
                post_id: post_id,
                current_user_id: cid,
-               ip_address: opts[:ip_address]) if post_id
+               ip_address: ip_address) if post_id
 
       end
     end
diff --git a/app/models/incoming_links_report.rb b/app/models/incoming_links_report.rb
index cf28011b8d4..897bf3e50ac 100644
--- a/app/models/incoming_links_report.rb
+++ b/app/models/incoming_links_report.rb
@@ -1,6 +1,6 @@
 class IncomingLinksReport
 
-  attr_accessor :type, :data, :y_titles
+  attr_accessor :type, :data, :y_titles, :start_date, :limit
 
   def initialize(type)
     @type = type
@@ -14,7 +14,8 @@ class IncomingLinksReport
       title: I18n.t("reports.#{self.type}.title"),
       xaxis: I18n.t("reports.#{self.type}.xaxis"),
       ytitles: self.y_titles,
-      data: self.data
+      data: self.data,
+      start_date: start_date
     }
   end
 
@@ -24,6 +25,10 @@ class IncomingLinksReport
 
     # Load the report
     report = IncomingLinksReport.new(type)
+
+    report.start_date = _opts[:start_date] || 30.days.ago
+    report.limit = _opts[:limit].to_i if _opts[:limit]
+
     send(report_method, report)
     report
   end
@@ -33,8 +38,8 @@ class IncomingLinksReport
     report.y_titles[:num_clicks] = I18n.t("reports.#{report.type}.num_clicks")
     report.y_titles[:num_topics] = I18n.t("reports.#{report.type}.num_topics")
 
-    num_clicks = link_count_per_user
-    num_topics = topic_count_per_user
+    num_clicks = link_count_per_user(start_date: report.start_date)
+    num_topics = topic_count_per_user(start_date: report.start_date)
     user_id_lookup = User.where(username: num_clicks.keys).select(:id, :username).inject({}) { |sum, v| sum[v.username] = v.id; sum; }
     report.data = []
     num_clicks.each_key do |username|
@@ -43,19 +48,19 @@ class IncomingLinksReport
     report.data = report.data.sort_by { |x| x[:num_clicks] }.reverse[0, 10]
   end
 
-  def self.per_user
-    @per_user_query ||= IncomingLink
-      .where('incoming_links.created_at > ? AND incoming_links.user_id IS NOT NULL', 30.days.ago)
+  def self.per_user(start_date:)
+    @per_user_query ||= public_incoming_links
+      .where('incoming_links.created_at > ? AND incoming_links.user_id IS NOT NULL', start_date)
       .joins(:user)
       .group('users.username')
   end
 
-  def self.link_count_per_user
-    per_user.count
+  def self.link_count_per_user(start_date:)
+    per_user(start_date: start_date).count
   end
 
-  def self.topic_count_per_user
-    per_user.joins(:post).count("DISTINCT posts.topic_id")
+  def self.topic_count_per_user(start_date:)
+    per_user(start_date: start_date).joins(:post).count("DISTINCT posts.topic_id")
   end
 
   # Return top 10 domains that brought traffic to the site within the last 30 days
@@ -64,7 +69,7 @@ class IncomingLinksReport
     report.y_titles[:num_topics] = I18n.t("reports.#{report.type}.num_topics")
     report.y_titles[:num_users] = I18n.t("reports.#{report.type}.num_users")
 
-    num_clicks = link_count_per_domain
+    num_clicks = link_count_per_domain(start_date: report.start_date)
     num_topics = topic_count_per_domain(num_clicks.keys)
     report.data = []
     num_clicks.each_key do |domain|
@@ -73,16 +78,18 @@ class IncomingLinksReport
     report.data = report.data.sort_by { |x| x[:num_clicks] }.reverse[0, 10]
   end
 
-  def self.link_count_per_domain(limit = 10)
-    IncomingLink.where('incoming_links.created_at > ?', 30.days.ago)
+  def self.link_count_per_domain(limit: 10, start_date:)
+    public_incoming_links
+      .where('incoming_links.created_at > ?', start_date)
       .joins(incoming_referer: :incoming_domain)
       .group('incoming_domains.name')
       .order('count_all DESC')
-      .limit(limit).count
+      .limit(limit)
+      .count
   end
 
   def self.per_domain(domains)
-    IncomingLink
+    public_incoming_links
       .joins(incoming_referer: :incoming_domain)
       .where('incoming_links.created_at > ? AND incoming_domains.name IN (?)', 30.days.ago, domains)
       .group('incoming_domains.name')
@@ -90,28 +97,34 @@ class IncomingLinksReport
 
   def self.topic_count_per_domain(domains)
     # COUNT(DISTINCT) is slow
-    per_domain(domains).joins(:post).count("DISTINCT posts.topic_id")
+    per_domain(domains).count("DISTINCT posts.topic_id")
   end
 
   def self.report_top_referred_topics(report)
     report.y_titles[:num_clicks] = I18n.t("reports.#{report.type}.num_clicks")
-    num_clicks = link_count_per_topic
-    num_clicks = num_clicks.to_a.sort_by { |x| x[1] }.last(10).reverse # take the top 10
+    num_clicks = link_count_per_topic(start_date: report.start_date)
+    num_clicks = num_clicks.to_a.sort_by { |x| x[1] }.last(report.limit || 10).reverse
     report.data = []
     topics = Topic.select('id, slug, title').where('id in (?)', num_clicks.map { |z| z[0] })
     num_clicks.each do |topic_id, num_clicks_element|
       topic = topics.find { |t| t.id == topic_id }
       if topic
-        report.data << { topic_id: topic_id, topic_title: topic.title, topic_slug: topic.slug, num_clicks: num_clicks_element }
+        report.data << { topic_id: topic_id, topic_title: topic.title, topic_url: topic.relative_url, num_clicks: num_clicks_element }
       end
     end
     report.data
   end
 
-  def self.link_count_per_topic
-    IncomingLink.joins(:post)
-      .where('incoming_links.created_at > ? AND topic_id IS NOT NULL', 30.days.ago)
+  def self.link_count_per_topic(start_date:)
+    public_incoming_links
+      .where('incoming_links.created_at > ? AND topic_id IS NOT NULL', start_date)
       .group('topic_id')
       .count
   end
+
+  def self.public_incoming_links
+    IncomingLink
+      .joins(post: :topic)
+      .where("topics.archetype = ?", Archetype.default)
+  end
 end
diff --git a/app/models/invite.rb b/app/models/invite.rb
index b9fcb44e247..0065d69c479 100644
--- a/app/models/invite.rb
+++ b/app/models/invite.rb
@@ -32,7 +32,7 @@ class Invite < ActiveRecord::Base
   def user_doesnt_already_exist
     @email_already_exists = false
     return if email.blank?
-    user = User.find_by_email(email)
+    user = Invite.find_user_by_email(email)
 
     if user && user.id != self.user_id
       @email_already_exists = true
@@ -102,7 +102,7 @@ class Invite < ActiveRecord::Base
     custom_message = opts[:custom_message]
     lower_email = Email.downcase(email)
 
-    if user = User.find_by_email(lower_email)
+    if user = find_user_by_email(lower_email)
       extend_permissions(topic, user, invited_by) if topic
       raise UserExists.new I18n.t("invite.user_exists", email: lower_email, username: user.username)
     end
@@ -139,7 +139,7 @@ class Invite < ActiveRecord::Base
       end
     else
       if topic && topic.category && Guardian.new(invited_by).can_invite_to?(topic)
-        group_ids = topic.category.groups.pluck(:id) - invite.invited_groups.pluck(:group_id)
+        group_ids = topic.category.groups.where(automatic: false).pluck(:id) - invite.invited_groups.pluck(:group_id)
         group_ids.each { |group_id| invite.invited_groups.create!(group_id: group_id) }
       end
     end
@@ -150,6 +150,10 @@ class Invite < ActiveRecord::Base
     invite
   end
 
+  def self.find_user_by_email(email)
+    User.with_email(email).where(staged: false).first
+  end
+
   def self.get_group_ids(group_names)
     group_ids = []
     if group_names
@@ -258,7 +262,7 @@ end
 #
 #  id             :integer          not null, primary key
 #  invite_key     :string(32)       not null
-#  email          :string(255)
+#  email          :string
 #  invited_by_id  :integer          not null
 #  user_id        :integer
 #  redeemed_at    :datetime
diff --git a/app/models/invite_redeemer.rb b/app/models/invite_redeemer.rb
index 37a37a978c4..904bf56bb07 100644
--- a/app/models/invite_redeemer.rb
+++ b/app/models/invite_redeemer.rb
@@ -8,12 +8,6 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
       end
     end
 
-    # If `invite_passthrough_hours` is defined, allow them to re-use the invite link
-    # to login again.
-    if invite.redeemed_at && invite.redeemed_at >= SiteSetting.invite_passthrough_hours.hours.ago
-      return invited_user
-    end
-
     nil
   end
 
@@ -26,7 +20,16 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
     end
     available_name = name || available_username
 
-    user = User.new(email: invite.email, username: available_username, name: available_name, active: true, trust_level: SiteSetting.default_invitee_trust_level)
+    user_params = {
+      email: invite.email,
+      username: available_username,
+      name: available_name,
+      active: true,
+      trust_level: SiteSetting.default_invitee_trust_level
+    }
+
+    user = User.unstage(user_params)
+    user = User.new(user_params) if user.nil?
 
     if !SiteSetting.must_approve_users? || (SiteSetting.must_approve_users? && invite.invited_by.staff?)
       user.approved = true
@@ -91,7 +94,7 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
   end
 
   def get_existing_user
-    User.where(admin: false).find_by_email(invite.email)
+    User.where(admin: false, staged: false).find_by_email(invite.email)
   end
 
   def add_to_private_topics_if_invited
diff --git a/app/models/locale_site_setting.rb b/app/models/locale_site_setting.rb
index b38b5f85ac1..ae3c02d3ccd 100644
--- a/app/models/locale_site_setting.rb
+++ b/app/models/locale_site_setting.rb
@@ -7,9 +7,12 @@ class LocaleSiteSetting < EnumSiteSetting
   end
 
   def self.values
-    supported_locales.map do |l|
-      lang = language_names[l] || language_names[l[0..1]]
-      { name: lang ? lang['nativeName'] : l, value: l }
+    @values ||= supported_locales.map do |locale|
+      lang = language_names[locale] || language_names[locale.split("_")[0]]
+      {
+        name: lang ? lang['nativeName'] : locale,
+        value: locale
+      }
     end
   end
 
@@ -19,43 +22,41 @@ class LocaleSiteSetting < EnumSiteSetting
     return @language_names if @language_names
 
     @lock.synchronize do
-      @language_names ||= YAML.load(File.read(File.join(Rails.root, 'config', 'locales', 'names.yml')))
+      @language_names ||= begin
+        names = YAML.load(File.read(File.join(Rails.root, 'config', 'locales', 'names.yml')))
+
+        DiscoursePluginRegistry.locales.each do |locale, options|
+          if !names.key?(locale) && options[:name] && options[:nativeName]
+            names[locale] = { "name" => options[:name], "nativeName" => options[:nativeName] }
+          end
+        end
+
+        names
+      end
     end
   end
 
   def self.supported_locales
     @lock.synchronize do
       @supported_locales ||= begin
-        app_client_files = Dir.glob(
+        locales = Dir.glob(
           File.join(Rails.root, 'config', 'locales', 'client.*.yml')
-        )
+        ).map { |x| x.split('.')[-2] }
 
-        unless ignore_plugins?
-          app_client_files += Dir.glob(
-            File.join(Rails.root, 'plugins', '*', 'config', 'locales', 'client.*.yml')
-          )
-        end
-
-        app_client_files.map { |x| x.split('.')[-2] }
-          .uniq
-          .select { |locale| valid_locale?(locale) }
-          .sort
+        locales += DiscoursePluginRegistry.locales.keys
+        locales.uniq.sort
       end
     end
   end
 
-  def self.valid_locale?(locale)
-    assets = Rails.configuration.assets
-
-    assets.precompile.grep(/locales\/#{locale}(?:\.js)?/).present? &&
-      (Dir.glob(File.join(Rails.root, 'app', 'assets', 'javascripts', 'locales', "#{locale}.js.erb")).present? ||
-        Dir.glob(File.join(Rails.root, 'plugins', '*', 'assets', 'locales', "#{locale}.js.erb")).present?)
+  def self.reset!
+    @lock.synchronize do
+      @values = @language_names = @supported_locales = nil
+    end
   end
 
-  def self.ignore_plugins?
-    Rails.env.test? && ENV['LOAD_PLUGINS'] != "1"
+  def self.fallback_locale(locale)
+    plugin_locale = DiscoursePluginRegistry.locales[locale.to_s]
+    plugin_locale ? plugin_locale[:fallbackLocale]&.to_sym : nil
   end
-
-  private_class_method :valid_locale?
-  private_class_method :ignore_plugins?
 end
diff --git a/app/models/muted_user.rb b/app/models/muted_user.rb
index 59f8089c6f7..1ba464105d0 100644
--- a/app/models/muted_user.rb
+++ b/app/models/muted_user.rb
@@ -10,8 +10,8 @@ end
 #  id            :integer          not null, primary key
 #  user_id       :integer          not null
 #  muted_user_id :integer          not null
-#  created_at    :datetime
-#  updated_at    :datetime
+#  created_at    :datetime         not null
+#  updated_at    :datetime         not null
 #
 # Indexes
 #
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 48e3293c5c2..8e213851bc7 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -58,27 +58,24 @@ class Notification < ActiveRecord::Base
   end
 
   def self.mark_posts_read(user, topic_id, post_numbers)
-    count = Notification
-      .where(user_id: user.id,
-             topic_id: topic_id,
-             post_number: post_numbers,
-             read: false)
-      .update_all("read = 't'")
-
-    if count > 0
-      user.publish_notifications_state
-    end
-
-    count
+    Notification
+      .where(
+        user_id: user.id,
+        topic_id: topic_id,
+        post_number: post_numbers,
+        read: false
+      )
+      .update_all(read: true)
   end
 
   def self.read(user, notification_ids)
-    count = Notification.where(user_id: user.id)
-      .where(id: notification_ids)
-      .where(read: false)
+    Notification
+      .where(
+        id: notification_ids,
+        user_id: user.id,
+        read: false
+      )
       .update_all(read: true)
-
-    user.publish_notifications_state if count > 0
   end
 
   def self.interesting_after(min_date)
@@ -202,7 +199,11 @@ class Notification < ActiveRecord::Base
   protected
 
   def refresh_notification_count
-    user.publish_notifications_state
+    begin
+      user.reload.publish_notifications_state
+    rescue ActiveRecord::RecordNotFound
+      # happens when we delete a user
+    end
   end
 
   def send_email
diff --git a/app/models/oauth2_user_info.rb b/app/models/oauth2_user_info.rb
index 7ce0cace41d..5b27d0cf710 100644
--- a/app/models/oauth2_user_info.rb
+++ b/app/models/oauth2_user_info.rb
@@ -9,10 +9,10 @@ end
 #
 #  id         :integer          not null, primary key
 #  user_id    :integer          not null
-#  uid        :string(255)      not null
-#  provider   :string(255)      not null
-#  email      :string(255)
-#  name       :string(255)
+#  uid        :string           not null
+#  provider   :string           not null
+#  email      :string
+#  name       :string
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
 #
diff --git a/app/models/optimized_image.rb b/app/models/optimized_image.rb
index addf554b0f9..d25f40e30dc 100644
--- a/app/models/optimized_image.rb
+++ b/app/models/optimized_image.rb
@@ -9,11 +9,22 @@ class OptimizedImage < ActiveRecord::Base
   # BUMP UP if optimized image algorithm changes
   VERSION = 1
 
+  def self.lock(upload_id, width, height)
+    @hostname ||= `hostname`.strip rescue "unknown"
+    # note, the extra lock here ensures we only optimize one image per machine
+    # this can very easily lead to runaway CPU so slowing it down is beneficial
+    DistributedMutex.synchronize("optimized_image_host_#{@hostname}") do
+      DistributedMutex.synchronize("optimized_image_#{upload_id}_#{width}_#{height}") do
+        yield
+      end
+    end
+  end
+
   def self.create_for(upload, width, height, opts = {})
     return unless width > 0 && height > 0
     return if upload.try(:sha1).blank?
 
-    DistributedMutex.synchronize("optimized_image_#{upload.id}_#{width}_#{height}") do
+    lock(upload.id, width, height) do
       # do we already have that thumbnail?
       thumbnail = find_by(upload_id: upload.id, width: width, height: height)
 
@@ -75,7 +86,7 @@ class OptimizedImage < ActiveRecord::Base
 
       # make sure we remove the cached copy from external stores
       if Discourse.store.external?
-        external_copy.try(:close!) rescue nil
+        external_copy&.close
       end
 
       thumbnail
@@ -282,15 +293,15 @@ class OptimizedImage < ActiveRecord::Base
           DbHelper.remap(previous_url, optimized_image.url)
           # remove the old file (when local)
           unless external
-            FileUtils.rm(path, force: true) rescue nil
+            FileUtils.rm(path, force: true)
           end
         rescue => e
           problems << { optimized_image: optimized_image, ex: e }
           # just ditch the optimized image if there was any errors
           optimized_image.destroy
         ensure
-          file.try(:unlink) rescue nil
-          file.try(:close) rescue nil
+          file&.unlink
+          file&.close
         end
       end
     end
@@ -310,7 +321,7 @@ end
 #  width     :integer          not null
 #  height    :integer          not null
 #  upload_id :integer          not null
-#  url       :string(255)      not null
+#  url       :string           not null
 #
 # Indexes
 #
diff --git a/app/models/permalink.rb b/app/models/permalink.rb
index 4bfaa5a9cd5..6b3799a554a 100644
--- a/app/models/permalink.rb
+++ b/app/models/permalink.rb
@@ -37,7 +37,7 @@ class Permalink < ActiveRecord::Base
       end
 
       if regex.length > 1
-        [Regexp.new(regex[1..-1]), sub[1..-1] || ""] rescue nil
+        [Regexp.new(regex[1..-1]), sub[1..-1] || ""]
       end
 
     end
@@ -101,8 +101,8 @@ end
 #  topic_id     :integer
 #  post_id      :integer
 #  category_id  :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #  external_url :string(1000)
 #
 # Indexes
diff --git a/app/models/plugin_store_row.rb b/app/models/plugin_store_row.rb
index db1d9d3fdab..d9bb1c05db6 100644
--- a/app/models/plugin_store_row.rb
+++ b/app/models/plugin_store_row.rb
@@ -6,9 +6,9 @@ end
 # Table name: plugin_store_rows
 #
 #  id          :integer          not null, primary key
-#  plugin_name :string(255)      not null
-#  key         :string(255)      not null
-#  type_name   :string(255)      not null
+#  plugin_name :string           not null
+#  key         :string           not null
+#  type_name   :string           not null
 #  value       :text
 #
 # Indexes
diff --git a/app/models/post.rb b/app/models/post.rb
index 8312129479f..142066cead5 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -48,7 +48,7 @@ class Post < ActiveRecord::Base
   has_many :post_details
 
   has_many :post_revisions
-  has_many :revisions, foreign_key: :post_id, class_name: 'PostRevision'
+  has_many :revisions, -> { order(:number) }, foreign_key: :post_id, class_name: 'PostRevision'
 
   has_many :user_actions, foreign_key: :target_post_id
 
@@ -164,7 +164,7 @@ class Post < ActiveRecord::Base
     }.merge(options)
 
     if Topic.visible_post_types.include?(post_type)
-      if topic.archetype == Archetype.private_message
+      if topic.private_message?
         user_ids = User.where('admin or moderator').pluck(:id)
         user_ids |= topic.allowed_users.pluck(:id)
         MessageBus.publish(channel, msg, user_ids: user_ids)
@@ -222,7 +222,13 @@ class Post < ActiveRecord::Base
     @post_analyzers[raw_hash] ||= PostAnalyzer.new(raw, topic_id)
   end
 
-  %w{raw_mentions linked_hosts image_count attachment_count link_count raw_links}.each do |attr|
+  %w{raw_mentions
+    linked_hosts
+    image_count
+    attachment_count
+    link_count
+    raw_links
+    has_oneboxes?}.each do |attr|
     define_method(attr) do
       post_analyzer.send(attr)
     end
@@ -400,6 +406,10 @@ class Post < ActiveRecord::Base
     Post.excerpt(cooked, maxlength, options)
   end
 
+  def excerpt_for_topic
+    Post.excerpt(cooked, 220, strip_links: true)
+  end
+
   def is_first_post?
     post_number.blank? ?
       topic.try(:highest_post_number) == 0 :
@@ -475,20 +485,21 @@ class Post < ActiveRecord::Base
     problems = []
     Post.where('baked_version IS NULL OR baked_version < ?', BAKED_VERSION)
       .order('id desc')
-      .limit(limit).each do |p|
+      .limit(limit).pluck(:id).each do |id|
       begin
-        p.rebake!
+        post = Post.find(id)
+        post.rebake!
       rescue => e
-        problems << { post: p, ex: e }
+        problems << { post: post, ex: e }
 
-        attempts = p.custom_fields["rebake_attempts"].to_i
+        attempts = post.custom_fields["rebake_attempts"].to_i
 
         if attempts > 3
-          p.update_columns(baked_version: BAKED_VERSION)
+          post.update_columns(baked_version: BAKED_VERSION)
           Discourse.warn_exception(e, message: "Can not rebake post# #{p.id} after 3 attempts, giving up")
         else
-          p.custom_fields["rebake_attempts"] = attempts + 1
-          p.save_custom_fields
+          post.custom_fields["rebake_attempts"] = attempts + 1
+          post.save_custom_fields
         end
 
       end
@@ -520,16 +531,17 @@ class Post < ActiveRecord::Base
     return if user_id == new_user.id
 
     edit_reason = I18n.with_locale(SiteSetting.default_locale) do
-      I18n.t('change_owner.post_revision_text',
-             old_user: (self.user.username_lower rescue nil) || I18n.t('change_owner.deleted_user'),
-             new_user: new_user.username_lower
+      I18n.t(
+        'change_owner.post_revision_text',
+        old_user: self.user&.username_lower || I18n.t('change_owner.deleted_user'),
+        new_user: new_user.username_lower
       )
     end
 
     revise(
       actor,
       { raw: self.raw, user_id: new_user.id, edit_reason: edit_reason },
-      bypass_bump: true, skip_revision: skip_revision
+      bypass_bump: true, skip_revision: skip_revision, skip_validations: true
     )
 
     if post_number == topic.highest_post_number
@@ -670,26 +682,39 @@ class Post < ActiveRecord::Base
 
   MAX_REPLY_LEVEL ||= 1000
 
-  def reply_ids(guardian = nil)
-    replies = Post.exec_sql("
+  def reply_ids(guardian = nil, only_replies_to_single_post: true)
+    builder = SqlBuilder.new(<<~SQL, Post)
       WITH RECURSIVE breadcrumb(id, level) AS (
         SELECT :post_id, 0
         UNION
         SELECT reply_id, level + 1
-          FROM post_replies, breadcrumb
-         WHERE post_id = id
-           AND post_id <> reply_id
-           AND level < #{MAX_REPLY_LEVEL}
+        FROM post_replies AS r
+          JOIN breadcrumb AS b ON (r.post_id = b.id)
+        WHERE r.post_id <> r.reply_id
+              AND b.level < :max_reply_level
       ), breadcrumb_with_count AS (
-        SELECT id, level, COUNT(*)
-          FROM post_replies, breadcrumb
-         WHERE reply_id = id
-           AND reply_id <> post_id
-         GROUP BY id, level
+          SELECT
+            id,
+            level,
+            COUNT(*) AS count
+          FROM post_replies AS r
+            JOIN breadcrumb AS b ON (r.reply_id = b.id)
+          WHERE r.reply_id <> r.post_id
+          GROUP BY id, level
       )
-      SELECT id, level FROM breadcrumb_with_count WHERE level > 0 AND count = 1 ORDER BY id
-    ", post_id: id).to_a
+      SELECT id, level
+      FROM breadcrumb_with_count
+      /*where*/
+      ORDER BY id
+    SQL
 
+    builder.where("level > 0")
+
+    # ignore posts that aren't replies to exactly one post
+    # for example it skips a post when it contains 2 quotes (which are replies) from different posts
+    builder.where("count = 1") if only_replies_to_single_post
+
+    replies = builder.exec(post_id: id, max_reply_level: MAX_REPLY_LEVEL).to_a
     replies.map! { |r| { id: r["id"].to_i, level: r["level"].to_i } }
 
     secured_ids = Post.secured(guardian).where(id: replies.map { |r| r[:id] }).pluck(:id).to_set
@@ -734,6 +759,10 @@ class Post < ActiveRecord::Base
     UserActionCreator.log_post(self)
   end
 
+  def locked?
+    locked_by_id.present?
+  end
+
   private
 
   def parse_quote_into_arguments(quote)
@@ -752,7 +781,7 @@ class Post < ActiveRecord::Base
   end
 
   def create_reply_relationship_with(post)
-    return if post.nil?
+    return if post.nil? || self.deleted_at.present?
     post_reply = post.post_replies.new(reply_id: id)
     if post_reply.save
       if Topic.visible_post_types.include?(self.post_type)
@@ -803,7 +832,7 @@ end
 #  notify_user_count       :integer          default(0), not null
 #  like_score              :integer          default(0), not null
 #  deleted_by_id           :integer
-#  edit_reason             :string(255)
+#  edit_reason             :string
 #  word_count              :integer
 #  version                 :integer          default(1), not null
 #  cook_method             :integer          default(1), not null
@@ -816,8 +845,9 @@ end
 #  via_email               :boolean          default(FALSE), not null
 #  raw_email               :text
 #  public_version          :integer          default(1), not null
-#  action_code             :string(255)
+#  action_code             :string
 #  image_url               :string
+#  locked_by_id            :integer
 #
 # Indexes
 #
diff --git a/app/models/post_action.rb b/app/models/post_action.rb
index 617d0c72b3b..479091d8afc 100644
--- a/app/models/post_action.rb
+++ b/app/models/post_action.rb
@@ -52,13 +52,22 @@ class PostAction < ActiveRecord::Base
   end
 
   def self.update_flagged_posts_count
-    posts_flagged_count = PostAction.active
+    flagged_relation = PostAction.active
       .flags
       .joins(post: :topic)
       .where('posts.deleted_at' => nil)
       .where('topics.deleted_at' => nil)
       .where('posts.user_id > 0')
-      .count('DISTINCT posts.id')
+      .group("posts.id")
+
+    if SiteSetting.min_flags_staff_visibility > 1
+      flagged_relation = flagged_relation
+        .having("count(*) >= ?", SiteSetting.min_flags_staff_visibility)
+    end
+
+    posts_flagged_count = flagged_relation
+      .pluck("posts.id")
+      .count
 
     $redis.set('posts_flagged_count', posts_flagged_count)
     user_ids = User.staff.pluck(:id)
@@ -154,6 +163,8 @@ SQL
     end
 
     DiscourseEvent.trigger(:confirmed_spam_post, post) if trigger_spam
+    DiscourseEvent.trigger(:flag_reviewed, post)
+    DiscourseEvent.trigger(:flag_agreed, actions.first) if actions.first.present?
 
     update_flagged_posts_count
   end
@@ -186,6 +197,8 @@ SQL
     end
 
     Post.with_deleted.where(id: post.id).update_all(cached)
+    DiscourseEvent.trigger(:flag_reviewed, post)
+    DiscourseEvent.trigger(:flag_disagreed, actions.first) if actions.first.present?
 
     update_flagged_posts_count
   end
@@ -203,6 +216,8 @@ SQL
       action.add_moderator_post_if_needed(moderator, :deferred, delete_post)
     end
 
+    DiscourseEvent.trigger(:flag_reviewed, post)
+    DiscourseEvent.trigger(:flag_deferred, actions.first) if actions.first.present?
     update_flagged_posts_count
   end
 
@@ -230,7 +245,7 @@ SQL
     title = I18n.t("post_action_types.#{post_action_type}.email_title", title: post.topic.title, locale: SiteSetting.default_locale)
     body = I18n.t("post_action_types.#{post_action_type}.email_body", message: opts[:message], link: "#{Discourse.base_url}#{post.url}", locale: SiteSetting.default_locale)
     warning = opts[:is_warning] if opts[:is_warning].present?
-    title = title.truncate(255, separator: /\s/)
+    title = title.truncate(SiteSetting.max_topic_title_length, separator: /\s/)
 
     opts = {
       archetype: Archetype.private_message,
@@ -302,7 +317,12 @@ SQL
         BadgeGranter.queue_badge_grant(Badge::Trigger::PostAction, post_action: post_action)
       end
     end
-    GivenDailyLike.increment_for(user.id)
+
+    if post_action && PostActionType.notify_flag_type_ids.include?(post_action_type_id)
+      DiscourseEvent.trigger(:flag_created, post_action)
+    end
+
+    GivenDailyLike.increment_for(user.id) if post_action_type_id == PostActionType.types[:like]
 
     # agree with other flags
     if staff_took_action
@@ -339,7 +359,7 @@ SQL
     if action = finder.first
       action.remove_act!(user)
       action.post.unhide! if action.staff_took_action
-      GivenDailyLike.decrement_for(user.id)
+      GivenDailyLike.decrement_for(user.id) if post_action_type_id == PostActionType.types[:like]
     end
   end
 
@@ -360,7 +380,7 @@ SQL
   end
 
   def is_flag?
-    !!PostActionType.flag_types[post_action_type_id]
+    !!PostActionType.notify_flag_types[post_action_type_id]
   end
 
   def is_private_message?
@@ -392,7 +412,7 @@ SQL
   end
 
   before_create do
-    post_action_type_ids = is_flag? ? PostActionType.flag_types_without_custom.values : post_action_type_id
+    post_action_type_ids = is_flag? ? PostActionType.notify_flag_types.values : post_action_type_id
     raise AlreadyActed if PostAction.where(user_id: user_id)
         .where(post_id: post_id)
         .where(post_action_type_id: post_action_type_ids)
@@ -538,7 +558,8 @@ SQL
   end
 
   def self.auto_hide_if_needed(acting_user, post, post_action_type)
-    return if post.hidden
+    return if post.hidden?
+    return if (!acting_user.staff?) && post.user.staff?
 
     if post_action_type == :spam &&
        acting_user.has_trust_level?(TrustLevel[3]) &&
@@ -564,6 +585,8 @@ SQL
       reason = guess_hide_reason(post)
     end
 
+    hiding_again = post.hidden_at.present?
+
     post.hidden = true
     post.hidden_at = Time.zone.now
     post.hidden_reason_id = reason
@@ -576,10 +599,13 @@ SQL
       options = {
         url: post.url,
         edit_delay: SiteSetting.cooldown_minutes_after_hiding_posts,
-        flag_reason: I18n.t("flag_reasons.#{post_action_type}"),
+        flag_reason: I18n.t("flag_reasons.#{post_action_type}", locale: SiteSetting.default_locale),
       }
 
-      Jobs.enqueue_in(5.seconds, :send_system_message, user_id: post.user.id, message_type: :post_hidden, message_options: options)
+      Jobs.enqueue_in(5.seconds, :send_system_message,
+                      user_id: post.user.id,
+                      message_type: hiding_again ? :post_hidden_again : :post_hidden,
+                      message_options: options)
     end
   end
 
diff --git a/app/models/post_analyzer.rb b/app/models/post_analyzer.rb
index 0d6c2120aef..5d069c72eb9 100644
--- a/app/models/post_analyzer.rb
+++ b/app/models/post_analyzer.rb
@@ -13,6 +13,13 @@ class PostAnalyzer
     @found_oneboxes
   end
 
+  def has_oneboxes?
+    return false unless @raw.present?
+
+    cooked_stripped
+    found_oneboxes?
+  end
+
   # What we use to cook posts
   def cook(raw, opts = {})
     cook_method = opts[:cook_method]
@@ -24,7 +31,7 @@ class PostAnalyzer
       cooked = PrettyText.cook(raw, opts)
     end
 
-    result = Oneboxer.apply(cooked, topic_id: @topic_id) do |url, _|
+    result = Oneboxer.apply(cooked) do |url|
       @found_oneboxes = true
       Oneboxer.invalidate(url) if opts[:invalidate_oneboxes]
       Oneboxer.cached_onebox(url)
@@ -104,10 +111,9 @@ class PostAnalyzer
     return @raw_links if @raw_links.present?
 
     @raw_links = []
-
-    cooked_stripped.css("a[href]").each do |l|
+    cooked_stripped.css("a").each do |l|
       # Don't include @mentions in the link count
-      next if l['href'].blank? || link_is_a_mention?(l)
+      next if link_is_a_mention?(l)
       @raw_links << l['href'].to_s
     end
 
@@ -124,7 +130,7 @@ class PostAnalyzer
     def cooked_stripped
       @cooked_stripped ||= begin
         doc = Nokogiri::HTML.fragment(cook(@raw, topic_id: @topic_id))
-        doc.css("pre, code, aside.quote, .onebox, .elided").remove
+        doc.css("pre .mention, aside.quote > .title, aside.quote .mention, .onebox, .elided").remove
         doc
       end
     end
diff --git a/app/models/post_custom_field.rb b/app/models/post_custom_field.rb
index 999500de527..1eedcc88486 100644
--- a/app/models/post_custom_field.rb
+++ b/app/models/post_custom_field.rb
@@ -15,6 +15,7 @@ end
 #
 # Indexes
 #
+#  idx_post_custom_fields_akismet                (post_id)
 #  index_post_custom_fields_on_name_and_value    (name, "left"(value, 200))
 #  index_post_custom_fields_on_post_id_and_name  (post_id,name)
 #
diff --git a/app/models/post_detail.rb b/app/models/post_detail.rb
index 8f888516732..c43219749cc 100644
--- a/app/models/post_detail.rb
+++ b/app/models/post_detail.rb
@@ -11,8 +11,8 @@ end
 #
 #  id         :integer          not null, primary key
 #  post_id    :integer
-#  key        :string(255)
-#  value      :string(255)
+#  key        :string
+#  value      :string
 #  extra      :text
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
diff --git a/app/models/post_mover.rb b/app/models/post_mover.rb
index 42e8ad42b5f..14a41879eca 100644
--- a/app/models/post_mover.rb
+++ b/app/models/post_mover.rb
@@ -47,7 +47,7 @@ class PostMover
     notify_users_that_posts_have_moved
     update_statistics
     update_user_actions
-    set_last_post_user_id(destination_topic)
+    update_last_post_stats
 
     if moving_all_posts
       @original_topic.update_status('closed', true, @user)
@@ -96,6 +96,7 @@ class PostMover
       via_email: post.via_email,
       raw_email: post.raw_email,
       skip_validations: true,
+      created_at: post.created_at,
       guardian: Guardian.new(user)
     )
 
@@ -127,7 +128,8 @@ class PostMover
       update[:reply_to_user_id] = nil
     end
 
-    post.update(update)
+    post.attributes = update
+    post.save(validate: false)
 
     move_incoming_emails(post, post)
     move_email_logs(post, post)
@@ -180,9 +182,13 @@ class PostMover
     move_type_str = PostMover.move_types[@move_type].to_s
 
     message = I18n.with_locale(SiteSetting.default_locale) do
-      I18n.t("move_posts.#{move_type_str}_moderator_post",
-             count: posts.length,
-             topic_link: "[#{destination_topic.title}](#{destination_topic.relative_url})")
+      I18n.t(
+        "move_posts.#{move_type_str}_moderator_post",
+        count: posts.length,
+        topic_link: posts.first.is_first_post? ?
+          "[#{destination_topic.title}](#{destination_topic.relative_url})" :
+          "[#{destination_topic.title}](#{posts.first.url})"
+      )
     end
 
     original_topic.add_moderator_post(
@@ -204,9 +210,15 @@ class PostMover
     end
   end
 
-  def set_last_post_user_id(topic)
-    user_id = topic.posts.last.user_id rescue nil
-    return if user_id.nil?
-    topic.update_attribute :last_post_user_id, user_id
+  def update_last_post_stats
+    post = destination_topic.posts.where.not(post_type: Post.types[:whisper]).last
+    if post && post_ids.include?(post.id)
+      attrs = {}
+      attrs[:last_posted_at] = post.created_at
+      attrs[:last_post_user_id] = post.user_id
+      attrs[:bumped_at] = post.created_at unless post.no_bump
+      attrs[:updated_at] = 'now()'
+      destination_topic.update_columns(attrs)
+    end
   end
 end
diff --git a/app/models/post_search_data.rb b/app/models/post_search_data.rb
index e890e875473..58940e693b9 100644
--- a/app/models/post_search_data.rb
+++ b/app/models/post_search_data.rb
@@ -9,7 +9,7 @@ end
 #  post_id     :integer          not null, primary key
 #  search_data :tsvector
 #  raw_data    :text
-#  locale      :string(255)
+#  locale      :string
 #  version     :integer          default(0)
 #
 # Indexes
diff --git a/app/models/post_stat.rb b/app/models/post_stat.rb
index ec293b66636..9de208b538d 100644
--- a/app/models/post_stat.rb
+++ b/app/models/post_stat.rb
@@ -11,8 +11,8 @@ end
 #  drafts_saved                 :integer
 #  typing_duration_msecs        :integer
 #  composer_open_duration_msecs :integer
-#  created_at                   :datetime
-#  updated_at                   :datetime
+#  created_at                   :datetime         not null
+#  updated_at                   :datetime         not null
 #
 # Indexes
 #
diff --git a/app/models/post_timing.rb b/app/models/post_timing.rb
index b32c80ccfcc..54ed9bbefcf 100644
--- a/app/models/post_timing.rb
+++ b/app/models/post_timing.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+#
 require_dependency 'archetype'
 
 class PostTiming < ActiveRecord::Base
@@ -76,7 +78,7 @@ class PostTiming < ActiveRecord::Base
   MAX_READ_TIME_PER_BATCH = 60 * 1000.0
 
   def self.process_timings(current_user, topic_id, topic_time, timings, opts = {})
-    current_user.user_stat.update_time_read!
+    UserStat.update_time_read!(current_user.id)
 
     max_time_per_post = ((Time.now - current_user.created_at) * 1000.0)
     max_time_per_post = MAX_READ_TIME_PER_BATCH if max_time_per_post > MAX_READ_TIME_PER_BATCH
@@ -103,8 +105,7 @@ class PostTiming < ActiveRecord::Base
     end
 
     if join_table.length > 0
-      sql = <<SQL
-
+      sql = <<~SQL
       UPDATE post_timings t
       SET msecs = t.msecs + x.msecs
       FROM (#{join_table.join(" UNION ALL ")}) x
@@ -117,7 +118,16 @@ SQL
       result = exec_sql(sql)
       result.type_map = SqlBuilder.pg_type_map
       existing = Set.new(result.column_values(0))
-      new_posts_read = timings.size - existing.size if Topic.where(id: topic_id, archetype: Archetype.default).exists?
+
+      sql = <<~SQL
+      SELECT 1 FROM topics
+      WHERE deleted_at IS NULL AND
+        archetype = 'regular' AND
+        id = :topic_id
+      SQL
+
+      is_regular = Post.exec_sql(sql, topic_id: topic_id).cmd_tuples == 1
+      new_posts_read = timings.size - existing.size if is_regular
 
       timings.each_with_index do |(post_number, time), index|
         unless existing.include?(index)
diff --git a/app/models/push_subscription.rb b/app/models/push_subscription.rb
new file mode 100644
index 00000000000..00dc2176bb4
--- /dev/null
+++ b/app/models/push_subscription.rb
@@ -0,0 +1,14 @@
+class PushSubscription < ActiveRecord::Base
+  belongs_to :user
+end
+
+# == Schema Information
+#
+# Table name: push_subscriptions
+#
+#  id         :integer          not null, primary key
+#  user_id    :integer          not null
+#  data       :string           not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
diff --git a/app/models/queued_post.rb b/app/models/queued_post.rb
index 50f2997541b..b91d3af3de2 100644
--- a/app/models/queued_post.rb
+++ b/app/models/queued_post.rb
@@ -77,6 +77,9 @@ class QueuedPost < ActiveRecord::Base
 
       unless created_post && creator.errors.blank?
         raise StandardError.new(creator.errors.full_messages.join(" "))
+      else
+        # Log post approval
+        StaffActionLogger.new(approved_by).log_post_approved(created_post)
       end
     end
 
@@ -121,7 +124,7 @@ end
 # Table name: queued_posts
 #
 #  id             :integer          not null, primary key
-#  queue          :string(255)      not null
+#  queue          :string           not null
 #  state          :integer          not null
 #  user_id        :integer          not null
 #  raw            :text             not null
@@ -131,8 +134,8 @@ end
 #  approved_at    :datetime
 #  rejected_by_id :integer
 #  rejected_at    :datetime
-#  created_at     :datetime
-#  updated_at     :datetime
+#  created_at     :datetime         not null
+#  updated_at     :datetime         not null
 #
 # Indexes
 #
diff --git a/app/models/quoted_post.rb b/app/models/quoted_post.rb
index ecfe19e73d3..c6d24675f5b 100644
--- a/app/models/quoted_post.rb
+++ b/app/models/quoted_post.rb
@@ -10,7 +10,8 @@ class QuotedPost < ActiveRecord::Base
     doc = Nokogiri::HTML.fragment(post.cooked)
 
     uniq = {}
-    ids = []
+
+    exec_sql("DELETE FROM quoted_posts WHERE post_id = :post_id", post_id: post.id)
 
     doc.css("aside.quote[data-topic]").each do |a|
       topic_id = a['data-topic'].to_i
@@ -22,34 +23,26 @@ class QuotedPost < ActiveRecord::Base
 
       begin
         # It would be so much nicer if we used post_id in quotes
-        results = exec_sql "INSERT INTO quoted_posts(post_id, quoted_post_id, created_at, updated_at)
-                 SELECT :post_id, p.id, current_timestamp, current_timestamp
-                 FROM posts p
-                 LEFT JOIN quoted_posts q on q.post_id = :post_id AND q.quoted_post_id = p.id
-                 WHERE post_number = :post_number AND
-                       topic_id = :topic_id AND
-                       q.id IS NULL
-                 RETURNING quoted_post_id
-        ", post_id: post.id, post_number: post_number, topic_id: topic_id
-
-        results = results.to_a
-        ids << results[0]["quoted_post_id"].to_i if results.length > 0
+        exec_sql(<<~SQL, post_id: post.id, post_number: post_number, topic_id: topic_id)
+          INSERT INTO quoted_posts (post_id, quoted_post_id, created_at, updated_at)
+            SELECT :post_id, p.id, current_timestamp, current_timestamp
+            FROM posts p
+              LEFT JOIN quoted_posts q on q.post_id = :post_id AND q.quoted_post_id = p.id
+            WHERE post_number = :post_number AND
+                  topic_id = :topic_id AND
+                  q.id IS NULL
+        SQL
       rescue ActiveRecord::RecordNotUnique, PG::UniqueViolation
         # it's fine
       end
     end
 
-    if ids.length > 0
-      exec_sql "DELETE FROM quoted_posts WHERE post_id = :post_id AND quoted_post_id NOT IN (:ids)",
-          post_id: post.id, ids: ids
-    end
-
     # simplest place to add this code
     reply_quoted = false
 
     if post.reply_to_post_number
       reply_post_id = Post.where(topic_id: post.topic_id, post_number: post.reply_to_post_number).pluck(:id).first
-      reply_quoted = !!(reply_post_id && ids.include?(reply_post_id))
+      reply_quoted = reply_post_id.present? && QuotedPost.where(post_id: post.id, quoted_post_id: reply_post_id).count > 0
     end
 
     if reply_quoted != post.reply_quoted
diff --git a/app/models/remote_theme.rb b/app/models/remote_theme.rb
index 3030b4aa22d..f817a090a7a 100644
--- a/app/models/remote_theme.rb
+++ b/app/models/remote_theme.rb
@@ -1,4 +1,5 @@
-require_dependency 'git_importer'
+require_dependency 'theme_store/git_importer'
+require_dependency 'theme_store/tgz_importer'
 require_dependency 'upload_creator'
 
 class RemoteTheme < ActiveRecord::Base
@@ -7,8 +8,32 @@ class RemoteTheme < ActiveRecord::Base
 
   has_one :theme
 
-  def self.import_theme(url, user = Discourse.system_user)
-    importer = GitImporter.new(url)
+  def self.update_tgz_theme(filename, user: Discourse.system_user)
+    importer = ThemeStore::TgzImporter.new(filename)
+    importer.import!
+
+    theme_info = JSON.parse(importer["about.json"])
+
+    theme = Theme.find_by(name: theme_info["name"])
+    theme ||= Theme.new(user_id: user&.id || -1, name: theme_info["name"])
+
+    remote_theme = new
+    remote_theme.theme = theme
+    remote_theme.remote_url = ""
+    remote_theme.update_from_remote(importer, skip_update: true)
+
+    theme.save!
+    theme
+  ensure
+    begin
+      importer.cleanup!
+    rescue => e
+      Rails.logger.warn("Failed cleanup remote path #{e}")
+    end
+  end
+
+  def self.import_theme(url, user = Discourse.system_user, private_key: nil)
+    importer = ThemeStore::GitImporter.new(url, private_key: private_key)
     importer.import!
 
     theme_info = JSON.parse(importer["about.json"])
@@ -17,6 +42,7 @@ class RemoteTheme < ActiveRecord::Base
     remote_theme = new
     theme.remote_theme = remote_theme
 
+    remote_theme.private_key = private_key
     remote_theme.remote_url = importer.url
     remote_theme.update_from_remote(importer)
 
@@ -31,19 +57,19 @@ class RemoteTheme < ActiveRecord::Base
   end
 
   def update_remote_version
-    importer = GitImporter.new(remote_url)
+    importer = ThemeStore::GitImporter.new(remote_url, private_key: private_key)
     importer.import!
     self.updated_at = Time.zone.now
     self.remote_version, self.commits_behind = importer.commits_since(remote_version)
   end
 
-  def update_from_remote(importer = nil)
+  def update_from_remote(importer = nil, skip_update: false)
     return unless remote_url
     cleanup = false
 
     unless importer
       cleanup = true
-      importer = GitImporter.new(remote_url)
+      importer = ThemeStore::GitImporter.new(remote_url, private_key: private_key)
       importer.import!
     end
 
@@ -76,6 +102,8 @@ class RemoteTheme < ActiveRecord::Base
     end
 
     Theme.targets.keys.each do |target|
+      next if target == :settings
+
       ALLOWED_FIELDS.each do |field|
         lookup =
           if field == "scss"
@@ -91,12 +119,18 @@ class RemoteTheme < ActiveRecord::Base
       end
     end
 
+    settings_yaml = importer["settings.yaml"] || importer["settings.yml"]
+    theme.set_field(target: :settings, name: "yaml", value: settings_yaml)
+
     self.license_url ||= theme_info["license_url"]
     self.about_url ||= theme_info["about_url"]
-    self.remote_updated_at = Time.zone.now
-    self.remote_version = importer.version
-    self.local_version = importer.version
-    self.commits_behind = 0
+
+    if !skip_update
+      self.remote_updated_at = Time.zone.now
+      self.remote_version = importer.version
+      self.local_version = importer.version
+      self.commits_behind = 0
+    end
 
     update_theme_color_schemes(theme, theme_info["color_schemes"])
 
@@ -120,9 +154,10 @@ class RemoteTheme < ActiveRecord::Base
   end
 
   def update_theme_color_schemes(theme, schemes)
-    return if schemes.blank?
+    missing_scheme_names = Hash[*theme.color_schemes.pluck(:name, :id).flatten]
 
-    schemes.each do |name, colors|
+    schemes&.each do |name, colors|
+      missing_scheme_names.delete(name)
       existing = theme.color_schemes.find_by(name: name)
       if existing
         existing.colors.each do |c|
@@ -140,7 +175,13 @@ class RemoteTheme < ActiveRecord::Base
         end
       end
     end
+
+    if missing_scheme_names.length > 0
+      ColorScheme.where(id: missing_scheme_names.values).delete_all
+      # we may have stuff pointed at the incorrect scheme?
+    end
   end
+
 end
 
 # == Schema Information
@@ -155,6 +196,7 @@ end
 #  license_url       :string
 #  commits_behind    :integer
 #  remote_updated_at :datetime
-#  created_at        :datetime
-#  updated_at        :datetime
+#  created_at        :datetime         not null
+#  updated_at        :datetime         not null
+#  private_key       :text
 #
diff --git a/app/models/report.rb b/app/models/report.rb
index 83f046cc36d..87452154cb4 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -2,7 +2,10 @@ require_dependency 'topic_subtype'
 
 class Report
 
-  attr_accessor :type, :data, :total, :prev30Days, :start_date, :end_date, :category_id, :group_id
+  attr_accessor :type, :data, :total, :prev30Days, :start_date,
+                :end_date, :category_id, :group_id, :labels, :async,
+                :prev_period, :facets, :limit, :processing, :average, :percent,
+                :higher_is_better
 
   def self.default_days
     30
@@ -10,31 +13,70 @@ class Report
 
   def initialize(type)
     @type = type
-    @start_date ||= 1.month.ago.beginning_of_day
+    @start_date ||= Report.default_days.days.ago.beginning_of_day
     @end_date ||= Time.zone.now.end_of_day
+    @average = false
+    @percent = false
+    @higher_is_better = true
+  end
+
+  def self.cache_key(report)
+    (+"reports:") <<
+    [
+      report.type,
+      report.category_id,
+      report.start_date.to_date.strftime("%Y%m%d"),
+      report.end_date.to_date.strftime("%Y%m%d"),
+      report.group_id,
+      report.facets,
+      report.limit
+    ].map(&:to_s).join(':')
+  end
+
+  def self.clear_cache
+    Discourse.cache.keys("reports:*").each do |key|
+      Discourse.cache.redis.del(key)
+    end
   end
 
   def as_json(options = nil)
+    description = I18n.t("reports.#{type}.description", default: "")
+
     {
      type: type,
      title: I18n.t("reports.#{type}.title"),
      xaxis: I18n.t("reports.#{type}.xaxis"),
      yaxis: I18n.t("reports.#{type}.yaxis"),
+     description: description.presence ? description : nil,
      data: data,
-     total: total,
-     start_date: start_date,
-     end_date: end_date,
+     start_date: start_date&.iso8601,
+     end_date: end_date&.iso8601,
      category_id: category_id,
      group_id: group_id,
-     prev30Days: self.prev30Days
-    }
+     prev30Days: self.prev30Days,
+     report_key: Report.cache_key(self),
+     labels: labels,
+     processing: self.processing,
+     average: self.average,
+     percent: self.percent,
+     higher_is_better: self.higher_is_better
+    }.tap do |json|
+      json[:total] = total if total
+      json[:prev_period] = prev_period if prev_period
+      json[:prev30Days] = self.prev30Days if self.prev30Days
+      json[:limit] = self.limit if self.limit
+
+      if type == 'page_view_crawler_reqs'
+        json[:related_report] = Report.find('web_crawlers', start_date: start_date, end_date: end_date)&.as_json
+      end
+    end
   end
 
   def Report.add_report(name, &block)
     singleton_class.instance_eval { define_method("report_#{name}", &block) }
   end
 
-  def self.find(type, opts = nil)
+  def self._get(type, opts = nil)
     opts ||= {}
 
     # Load the report
@@ -43,6 +85,27 @@ class Report
     report.end_date = opts[:end_date] if opts[:end_date]
     report.category_id = opts[:category_id] if opts[:category_id]
     report.group_id = opts[:group_id] if opts[:group_id]
+    report.facets = opts[:facets] || [:total, :prev30Days]
+    report.limit = opts[:limit] if opts[:limit]
+    report.processing = false
+    report.average = opts[:average] if opts[:average]
+    report.percent = opts[:percent] if opts[:percent]
+    report.higher_is_better = opts[:higher_is_better] if opts[:higher_is_better]
+
+    report
+  end
+
+  def self.find_cached(type, opts = nil)
+    report = _get(type, opts)
+    Discourse.cache.read(cache_key(report))
+  end
+
+  def self.cache(report, duration)
+    Discourse.cache.write(Report.cache_key(report), report.as_json, force: true, expires_in: duration)
+  end
+
+  def self.find(type, opts = nil)
+    report = _get(type, opts)
     report_method = :"report_#{type}"
 
     if respond_to?(report_method)
@@ -67,7 +130,7 @@ class Report
       end
 
     report.data = []
-    data.where('date >= ? AND date <= ?', report.start_date.to_date, report.end_date.to_date)
+    data.where('date >= ? AND date <= ?', report.start_date, report.end_date)
       .order(date: :asc)
       .group(:date)
       .sum(:count)
@@ -75,11 +138,12 @@ class Report
       report.data << { x: date, y: count }
     end
 
-    report.total      = data.sum(:count)
-    report.prev30Days = data.where('date >= ? AND date <= ?',
-                                               (report.start_date - 31.days).to_date,
-                                               (report.end_date - 31.days).to_date)
-      .sum(:count)
+    report.total = data.sum(:count)
+
+    report.prev30Days = data.where(
+        'date >= ? AND date < ?',
+        (report.start_date - 31.days), report.start_date
+      ).sum(:count)
   end
 
   def self.report_visits(report)
@@ -99,13 +163,106 @@ class Report
       basic_report_about report, User.real, :count_by_signup_date, report.start_date, report.end_date, report.group_id
       add_counts report, User.real, 'users.created_at'
     else
+
       report_about report, User.real, :count_by_signup_date
     end
   end
 
+  def self.report_new_contributors(report)
+    report.data = []
+
+    data = User.real.count_by_first_post(report.start_date, report.end_date)
+
+    if report.facets.include?(:prev30Days)
+      prev30DaysData = User.real.count_by_first_post(report.start_date - 30.days, report.start_date)
+      report.prev30Days = prev30DaysData.sum { |k, v| v }
+    end
+
+    if report.facets.include?(:total)
+      report.total = User.real.count_by_first_post
+    end
+
+    if report.facets.include?(:prev_period)
+      prev_period_data = User.real.count_by_first_post(report.start_date - (report.end_date - report.start_date), report.start_date)
+      report.prev_period = prev_period_data.sum { |k, v| v }
+    end
+
+    data.each do |key, value|
+      report.data << { x: key, y: value }
+    end
+  end
+
+  def self.report_daily_engaged_users(report)
+    report.average = true
+
+    report.data = []
+
+    data = UserAction.count_daily_engaged_users(report.start_date, report.end_date)
+
+    if report.facets.include?(:prev30Days)
+      prev30DaysData = UserAction.count_daily_engaged_users(report.start_date - 30.days, report.start_date)
+      report.prev30Days = prev30DaysData.sum { |k, v| v }
+    end
+
+    if report.facets.include?(:total)
+      report.total = UserAction.count_daily_engaged_users
+    end
+
+    if report.facets.include?(:prev_period)
+      prev_data = UserAction.count_daily_engaged_users(report.start_date - (report.end_date - report.start_date), report.start_date)
+
+      prev = prev_data.sum { |k, v| v }
+      if prev > 0
+        prev = prev / ((report.end_date - report.start_date) / 1.day)
+      end
+      report.prev_period = prev
+    end
+
+    data.each do |key, value|
+      report.data << { x: key, y: value }
+    end
+  end
+
+  def self.report_dau_by_mau(report)
+    report.average = true
+    report.percent = true
+
+    data_points = UserVisit.count_by_active_users(report.start_date, report.end_date)
+
+    report.data = []
+
+    compute_dau_by_mau = Proc.new { |data_point|
+      if data_point["mau"] == 0
+        0
+      else
+        ((data_point["dau"].to_f / data_point["mau"].to_f) * 100).ceil(2)
+      end
+    }
+
+    dau_avg = Proc.new { |start_date, end_date|
+      data_points = UserVisit.count_by_active_users(start_date, end_date)
+      if !data_points.empty?
+        sum = data_points.sum { |data_point| compute_dau_by_mau.call(data_point) }
+        (sum.to_f / data_points.count.to_f).ceil(2)
+      end
+    }
+
+    data_points.each do |data_point|
+      report.data << { x: data_point["date"], y: compute_dau_by_mau.call(data_point) }
+    end
+
+    if report.facets.include?(:prev_period)
+      report.prev_period = dau_avg.call(report.start_date - (report.end_date - report.start_date), report.start_date)
+    end
+
+    if report.facets.include?(:prev30Days)
+      report.prev30Days = dau_avg.call(report.start_date - 30.days, report.start_date)
+    end
+  end
+
   def self.report_profile_views(report)
-    start_date = report.start_date.to_date
-    end_date = report.end_date.to_date
+    start_date = report.start_date
+    end_date = report.end_date
     basic_report_about report, UserProfileView, :profile_views_by_day, start_date, end_date, report.group_id
 
     report.total = UserProfile.sum(:views)
@@ -127,6 +284,7 @@ class Report
   end
 
   def self.report_time_to_first_response(report)
+    report.higher_is_better = false
     report.data = []
     Topic.time_to_first_response_per_day(report.start_date, report.end_date, category_id: report.category_id).each do |r|
       report.data << { x: Date.parse(r["date"]), y: r["hours"].to_f.round(2) }
@@ -155,25 +313,46 @@ class Report
 
   def self.basic_report_about(report, subject_class, report_method, *args)
     report.data = []
+
     subject_class.send(report_method, *args).each do |date, count|
       report.data << { x: date, y: count }
     end
   end
 
   def self.add_counts(report, subject_class, query_column = 'created_at')
-    report.total      = subject_class.count
-    report.prev30Days = subject_class.where("#{query_column} >= ? and #{query_column} < ?", report.start_date - 30.days, report.start_date).count
+    if report.facets.include?(:prev_period)
+      report.prev_period = subject_class
+        .where("#{query_column} >= ? and #{query_column} < ?",
+          (report.start_date - (report.end_date - report.start_date)),
+          report.start_date).count
+    end
+
+    if report.facets.include?(:total)
+      report.total      = subject_class.count
+    end
+
+    if report.facets.include?(:prev30Days)
+      report.prev30Days = subject_class
+        .where("#{query_column} >= ? and #{query_column} < ?",
+          report.start_date - 30.days,
+          report.start_date).count
+    end
   end
 
   def self.report_users_by_trust_level(report)
     report.data = []
-    User.real.group('trust_level').count.each do |level, count|
-      report.data << { x: level.to_i, y: count }
+
+    User.real.group('trust_level').count.sort.each do |level, count|
+      key = TrustLevel.levels[level.to_i]
+      url = Proc.new { |key| "/admin/users/list/#{key}" }
+      report.data << { url: url.call(key), key: key, x: level.to_i, y: count }
     end
   end
 
   # Post action counts:
   def self.report_flags(report)
+    report.higher_is_better = false
+
     basic_report_about report, PostAction, :flag_count_by_date, report.start_date, report.end_date, report.category_id
     countable = PostAction.where(post_action_type_id: PostActionType.flag_types_without_custom.values)
     countable = countable.joins(post: :topic).where("topics.category_id = ?", report.category_id) if report.category_id
@@ -201,14 +380,20 @@ class Report
   # Private messages counts:
 
   def self.private_messages_report(report, topic_subtype)
-    basic_report_about report, Post, :private_messages_count_per_day, report.start_date, report.end_date, topic_subtype
-    add_counts report, Post.private_posts.with_topic_subtype(topic_subtype), 'posts.created_at'
+    basic_report_about report, Topic, :private_message_topics_count_per_day, report.start_date, report.end_date, topic_subtype
+    add_counts report, Topic.private_messages.with_subtype(topic_subtype), 'topics.created_at'
   end
 
   def self.report_user_to_user_private_messages(report)
     private_messages_report report, TopicSubtype.user_to_user
   end
 
+  def self.report_user_to_user_private_messages_with_replies(report)
+    topic_subtype = TopicSubtype.user_to_user
+    basic_report_about report, Post, :private_messages_count_per_day, report.start_date, report.end_date, topic_subtype
+    add_counts report, Post.private_posts.with_topic_subtype(topic_subtype), 'posts.created_at'
+  end
+
   def self.report_system_private_messages(report)
     private_messages_report report, TopicSubtype.system_message
   end
@@ -224,4 +409,77 @@ class Report
   def self.report_notify_user_private_messages(report)
     private_messages_report report, TopicSubtype.notify_user
   end
+
+  def self.report_web_crawlers(report)
+    report.data = WebCrawlerRequest.where('date >= ? and date <= ?', report.start_date, report.end_date)
+      .limit(200)
+      .order('sum_count DESC')
+      .group(:user_agent).sum(:count)
+      .map { |ua, count| { x: ua, y: count } }
+  end
+
+  def self.report_users_by_type(report)
+    report.data = []
+
+    label = Proc.new { |x| I18n.t("reports.users_by_type.xaxis_labels.#{x}") }
+    url = Proc.new { |key| "/admin/users/list/#{key}" }
+
+    admins = User.real.admins.count
+    report.data << { url: url.call("admins"), icon: "shield", key: "admins", x: label.call("admin"), y: admins } if admins > 0
+
+    moderators = User.real.moderators.count
+    report.data << { url: url.call("moderators"), icon: "shield", key: "moderators", x: label.call("moderator"), y: moderators } if moderators > 0
+
+    suspended = User.real.suspended.count
+    report.data << { url: url.call("suspended"), icon: "ban", key: "suspended", x: label.call("suspended"), y: suspended } if suspended > 0
+
+    silenced = User.real.silenced.count
+    report.data << { url: url.call("silenced"), icon: "ban", key: "silenced", x: label.call("silenced"), y: silenced } if silenced > 0
+  end
+
+  def self.report_top_referred_topics(report)
+    report.labels = [I18n.t("reports.top_referred_topics.xaxis"),
+      I18n.t("reports.top_referred_topics.num_clicks")]
+    result = IncomingLinksReport.find(:top_referred_topics, start_date: 7.days.ago, limit: report.limit)
+    report.data = result.data
+  end
+
+  def self.report_trending_search(report)
+    report.data = []
+
+    select_sql = <<~SQL
+      lower(term) term,
+      COUNT(*) AS searches,
+      SUM(CASE
+               WHEN search_result_id IS NOT NULL THEN 1
+               ELSE 0
+           END) AS click_through,
+      COUNT(DISTINCT ip_address) AS unique_searches
+    SQL
+
+    trends = SearchLog.select(select_sql)
+      .where('created_at > ?  AND created_at <= ?', report.start_date, report.end_date)
+      .group('lower(term)')
+      .order('unique_searches DESC, click_through ASC, term ASC')
+      .limit(report.limit || 20).to_a
+
+    report.labels = [:term, :searches, :click_through].map { |key|
+      I18n.t("reports.trending_search.labels.#{key}")
+    }
+
+    trends.each do |trend|
+      ctr =
+        if trend.click_through == 0 || trend.searches == 0
+          0
+        else
+          trend.click_through.to_f / trend.searches.to_f
+        end
+
+      report.data << {
+        term: trend.term,
+        unique_searches: trend.unique_searches,
+        ctr: (ctr * 100).ceil(1).to_s + "%"
+      }
+    end
+  end
 end
diff --git a/app/models/screened_email.rb b/app/models/screened_email.rb
index 74c0c9593e9..a0dec7f12f1 100644
--- a/app/models/screened_email.rb
+++ b/app/models/screened_email.rb
@@ -67,7 +67,7 @@ end
 # Table name: screened_emails
 #
 #  id            :integer          not null, primary key
-#  email         :string(255)      not null
+#  email         :string           not null
 #  action_type   :integer          not null
 #  match_count   :integer          default(0), not null
 #  last_match_at :datetime
@@ -77,6 +77,6 @@ end
 #
 # Indexes
 #
-#  index_blocked_emails_on_email          (email) UNIQUE
-#  index_blocked_emails_on_last_match_at  (last_match_at)
+#  index_screened_emails_on_email          (email) UNIQUE
+#  index_screened_emails_on_last_match_at  (last_match_at)
 #
diff --git a/app/models/screened_ip_address.rb b/app/models/screened_ip_address.rb
index f0e51ab0456..60871eaba43 100644
--- a/app/models/screened_ip_address.rb
+++ b/app/models/screened_ip_address.rb
@@ -10,11 +10,21 @@ class ScreenedIpAddress < ActiveRecord::Base
   default_action :block
 
   validates :ip_address, ip_address_format: true, presence: true
+  after_validation :check_for_match
 
   def self.watch(ip_address, opts = {})
     match_for_ip_address(ip_address) || create(opts.slice(:action_type).merge(ip_address: ip_address))
   end
 
+  def check_for_match
+    unless self.errors[:ip_address].present?
+      matched = self.class.match_for_ip_address(self.ip_address)
+      if matched && matched.action_type == self.action_type
+        self.errors.add(:ip_address, :ip_address_already_screened)
+      end
+    end
+  end
+
   # In Rails 4.0.0, validators are run to handle invalid assignments to inet columns (as they should).
   # In Rails 4.0.1, an exception is raised before validation happens, so we need this hack for
   # inet/cidr columns:
diff --git a/app/models/screened_url.rb b/app/models/screened_url.rb
index be97e0d8426..47e6e949db6 100644
--- a/app/models/screened_url.rb
+++ b/app/models/screened_url.rb
@@ -42,8 +42,8 @@ end
 # Table name: screened_urls
 #
 #  id            :integer          not null, primary key
-#  url           :string(255)      not null
-#  domain        :string(255)      not null
+#  url           :string           not null
+#  domain        :string           not null
 #  action_type   :integer          not null
 #  match_count   :integer          default(0), not null
 #  last_match_at :datetime
diff --git a/app/models/search_log.rb b/app/models/search_log.rb
index d91b1ae7a1a..80068d3414b 100644
--- a/app/models/search_log.rb
+++ b/app/models/search_log.rb
@@ -19,42 +19,59 @@ class SearchLog < ActiveRecord::Base
     )
   end
 
+  def self.redis_key(ip_address:, user_id: nil)
+    if user_id
+      "__SEARCH__LOG_#{user_id}"
+    else
+      "__SEARCH__LOG_#{ip_address}"
+    end
+  end
+
+  # for testing
+  def self.clear_debounce_cache!
+    $redis.keys("__SEARCH__LOG_*").each do |k|
+      $redis.del(k)
+    end
+  end
+
   def self.log(term:, search_type:, ip_address:, user_id: nil)
 
+    return [:error] if term.blank?
+
     search_type = search_types[search_type]
     return [:error] unless search_type.present? && ip_address.present?
 
-    update_sql = <<~SQL
-      UPDATE search_logs
-      SET term = :term,
-        created_at = :created_at
-      WHERE created_at > :timeframe AND
-        position(term IN :term) = 1 AND
-        ((:user_id IS NULL AND ip_address = :ip_address) OR
-          (user_id = :user_id))
-      RETURNING id
-    SQL
+    key = redis_key(user_id: user_id, ip_address: ip_address)
 
-    rows = exec_sql(
-      update_sql,
-      term: term,
-      created_at: Time.zone.now,
-      timeframe: 5.seconds.ago,
-      user_id: user_id,
-      ip_address: ip_address
-    )
+    result = nil
 
-    if rows.cmd_tuples == 0
-      result = create(
+    if existing = $redis.get(key)
+      id, old_term = existing.split(",", 2)
+
+      if term.start_with?(old_term)
+        where(id: id.to_i).update_all(
+          created_at: Time.zone.now,
+          term: term
+        )
+
+        result = [:updated, id.to_i]
+      end
+    end
+
+    if !result
+      log = self.create!(
         term: term,
         search_type: search_type,
         ip_address: ip_address,
         user_id: user_id
       )
-      [:created, result.id]
-    else
-      [:updated, rows[0]['id'].to_i]
+
+      result = [:created, log.id]
     end
+
+    $redis.setex(key, 5, "#{result[1]},#{term}")
+
+    result
   end
 
   def self.term_details(term, period = :weekly, search_type = :all)
@@ -77,7 +94,10 @@ class SearchLog < ActiveRecord::Base
     return {
       type: "search_log_term",
       title: I18n.t("search_logs.graph_title"),
-      data: details
+      start_date: start_of(period),
+      end_date: Time.zone.now,
+      data: details,
+      period: period.to_s
     }
   end
 
diff --git a/app/models/shared_draft.rb b/app/models/shared_draft.rb
new file mode 100644
index 00000000000..a8a1b93b89e
--- /dev/null
+++ b/app/models/shared_draft.rb
@@ -0,0 +1,20 @@
+class SharedDraft < ActiveRecord::Base
+  belongs_to :topic
+  belongs_to :category
+end
+
+# == Schema Information
+#
+# Table name: shared_drafts
+#
+#  topic_id    :integer          not null
+#  category_id :integer          not null
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#  id          :integer          not null, primary key
+#
+# Indexes
+#
+#  index_shared_drafts_on_category_id  (category_id)
+#  index_shared_drafts_on_topic_id     (topic_id) UNIQUE
+#
diff --git a/app/models/single_sign_on_record.rb b/app/models/single_sign_on_record.rb
index f6acfa9ddce..1ceeacf5d6d 100644
--- a/app/models/single_sign_on_record.rb
+++ b/app/models/single_sign_on_record.rb
@@ -8,16 +8,18 @@ end
 #
 # Table name: single_sign_on_records
 #
-#  id                  :integer          not null, primary key
-#  user_id             :integer          not null
-#  external_id         :string(255)      not null
-#  last_payload        :text             not null
-#  created_at          :datetime         not null
-#  updated_at          :datetime         not null
-#  external_username   :string(255)
-#  external_email      :string(255)
-#  external_name       :string(255)
-#  external_avatar_url :string(1000)
+#  id                              :integer          not null, primary key
+#  user_id                         :integer          not null
+#  external_id                     :string           not null
+#  last_payload                    :text             not null
+#  created_at                      :datetime         not null
+#  updated_at                      :datetime         not null
+#  external_username               :string
+#  external_email                  :string
+#  external_name                   :string
+#  external_avatar_url             :string(1000)
+#  external_profile_background_url :string
+#  external_card_background_url    :string
 #
 # Indexes
 #
diff --git a/app/models/site.rb b/app/models/site.rb
index 9d90b2c1bc3..b3001e49d9f 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -71,8 +71,8 @@ class Site
     end
   end
 
-  def suppressed_from_homepage_category_ids
-    categories.select { |c| c.suppress_from_homepage == true }.map(&:id)
+  def suppressed_from_latest_category_ids
+    categories.select { |c| c.suppress_from_latest == true }.map(&:id)
   end
 
   def archetypes
diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb
index 46951fa3798..ec8b8e76244 100644
--- a/app/models/site_setting.rb
+++ b/app/models/site_setting.rb
@@ -38,7 +38,7 @@ class SiteSetting < ActiveRecord::Base
   end
 
   def self.private_message_title_length
-    min_private_message_title_length..max_topic_title_length
+    min_personal_message_title_length..max_topic_title_length
   end
 
   def self.post_length
@@ -50,7 +50,7 @@ class SiteSetting < ActiveRecord::Base
   end
 
   def self.private_message_post_length
-    min_private_message_post_length..max_post_length
+    min_personal_message_post_length..max_post_length
   end
 
   def self.top_menu_items
@@ -133,7 +133,7 @@ class SiteSetting < ActiveRecord::Base
     end
 
     def self.absolute_base_url
-      bucket = SiteSetting.enable_s3_uploads ? Discourse.store.s3_bucket_name : GlobalSetting.s3_bucket
+      bucket = SiteSetting.enable_s3_uploads ? Discourse.store.s3_bucket_name : GlobalSetting.s3_bucket_name
 
       # cf. http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region
       if SiteSetting.Upload.s3_region == "us-east-1"
@@ -150,6 +150,11 @@ class SiteSetting < ActiveRecord::Base
     SiteSetting::Upload
   end
 
+  def self.shared_drafts_enabled?
+    c = SiteSetting.shared_drafts_category
+    c.present? && c.to_i != SiteSetting.uncategorized_category_id.to_i
+  end
+
 end
 
 # == Schema Information
@@ -157,7 +162,7 @@ end
 # Table name: site_settings
 #
 #  id         :integer          not null, primary key
-#  name       :string(255)      not null
+#  name       :string           not null
 #  data_type  :integer          not null
 #  value      :text
 #  created_at :datetime         not null
diff --git a/app/models/stylesheet_cache.rb b/app/models/stylesheet_cache.rb
index 0d318ce0db0..08b98c30859 100644
--- a/app/models/stylesheet_cache.rb
+++ b/app/models/stylesheet_cache.rb
@@ -43,11 +43,11 @@ end
 # Table name: stylesheet_cache
 #
 #  id         :integer          not null, primary key
-#  target     :string(255)      not null
-#  digest     :string(255)      not null
+#  target     :string           not null
+#  digest     :string           not null
 #  content    :text             not null
-#  created_at :datetime
-#  updated_at :datetime
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
 #  theme_id   :integer          default(-1), not null
 #  source_map :text
 #
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 7d5b4f4139a..46ef77bde7b 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -16,24 +16,46 @@ class Tag < ActiveRecord::Base
 
   after_save :index_search
 
-  COUNT_ARG = "topics.id"
+  after_commit :trigger_tag_created_event, on: :create
+  after_commit :trigger_tag_updated_event, on: :update
+  after_commit :trigger_tag_destroyed_event, on: :destroy
 
-  # 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 = Tag.joins("LEFT JOIN topic_tags ON tags.id = topic_tags.tag_id")
-      .joins("LEFT JOIN topics ON topics.id = topic_tags.topic_id AND topics.deleted_at IS NULL")
-      .group("tags.id, tags.name")
-      .order('count_topics_id DESC')
-    q = q.limit(opts[:limit]) if opts[:limit]
-    q
+  def self.ensure_consistency!
+    update_topic_counts
   end
 
-  def self.category_tags_by_count_query(category, opts = {})
-    tags_by_count_query(opts).where("tags.id in (select tag_id from category_tags where category_id = ?)", category.id)
-      .where("topics.category_id = ?", category.id)
+  def self.update_topic_counts
+    Tag.exec_sql <<~SQL
+      UPDATE tags t
+         SET topic_count = x.topic_count
+        FROM (
+             SELECT COUNT(topics.id) AS topic_count, tags.id AS tag_id
+               FROM tags
+          LEFT JOIN topic_tags ON tags.id = topic_tags.tag_id
+          LEFT JOIN topics ON topics.id = topic_tags.topic_id
+                          AND topics.deleted_at IS NULL
+                          AND topics.archetype != 'private_message'
+           GROUP BY tags.id
+        ) x
+       WHERE x.tag_id = t.id
+         AND x.topic_count <> t.topic_count
+    SQL
+
+    Tag.exec_sql <<~SQL
+      UPDATE tags t
+         SET pm_topic_count = x.pm_topic_count
+        FROM (
+             SELECT COUNT(topics.id) AS pm_topic_count, tags.id AS tag_id
+               FROM tags
+          LEFT JOIN topic_tags ON tags.id = topic_tags.tag_id
+          LEFT JOIN topics ON topics.id = topic_tags.topic_id
+                          AND topics.deleted_at IS NULL
+                          AND topics.archetype = 'private_message'
+           GROUP BY tags.id
+        ) x
+       WHERE x.tag_id = t.id
+         AND x.pm_topic_count <> t.pm_topic_count
+    SQL
   end
 
   def self.top_tags(limit_arg: nil, category: nil, guardian: nil)
@@ -44,13 +66,51 @@ class Tag < ActiveRecord::Base
       scope_category_ids &= ([category.id] + category.subcategories.pluck(:id))
     end
 
-    tags = DiscourseTagging.filter_allowed_tags(
-      tags_by_count_query(limit: limit).where("topics.category_id in (?)", scope_category_ids),
-      nil, # Don't pass guardian. You might not be able to use some tags, but should still be able to see where they've been used.
-      category: category
-    )
+    return [] if scope_category_ids.empty?
 
-    tags.count(COUNT_ARG).map { |name, _| name }
+    filter_sql = guardian&.is_staff? ? '' : " AND tags.id NOT IN (#{DiscourseTagging.hidden_tags_query.select(:id).to_sql})"
+
+    tag_names_with_counts = Tag.exec_sql <<~SQL
+      SELECT tags.name as tag_name, SUM(stats.topic_count) AS sum_topic_count
+        FROM category_tag_stats stats
+        JOIN tags ON stats.tag_id = tags.id AND stats.topic_count > 0
+       WHERE stats.category_id in (#{scope_category_ids.join(',')})
+       #{filter_sql}
+    GROUP BY tags.name
+    ORDER BY sum_topic_count DESC, tag_name ASC
+       LIMIT #{limit}
+    SQL
+
+    tag_names_with_counts.map { |row| row['tag_name'] }
+  end
+
+  def self.pm_tags(limit_arg: nil, guardian: nil, allowed_user: nil)
+    return [] if allowed_user.blank? || !(guardian || Guardian.new).can_tag_pms?
+    limit = limit_arg || SiteSetting.max_tags_in_filter_list
+    user_id = allowed_user.id
+
+    tag_names_with_counts = Tag.exec_sql <<~SQL
+      SELECT tags.name, COUNT(topics.id) AS topic_count
+        FROM tags
+        JOIN topic_tags ON tags.id = topic_tags.tag_id
+        JOIN topics ON topics.id = topic_tags.topic_id
+                   AND topics.deleted_at IS NULL
+                   AND topics.archetype = 'private_message'
+       WHERE topic_tags.topic_id IN (
+          SELECT topic_id
+            FROM topic_allowed_users
+           WHERE user_id = #{user_id}
+           UNION
+          SELECT tg.topic_id
+            FROM topic_allowed_groups tg
+            JOIN group_users gu ON gu.user_id = #{user_id}
+                               AND gu.group_id = tg.group_id
+       )
+       GROUP BY tags.name
+       LIMIT #{limit}
+    SQL
+
+    tag_names_with_counts.map { |t| { id: t['name'], text: t['name'], count: t['topic_count'] } }
   end
 
   def self.include_tags?
@@ -64,17 +124,29 @@ class Tag < ActiveRecord::Base
   def index_search
     SearchIndexer.index(self)
   end
+
+  %i{
+    tag_created
+    tag_updated
+    tag_destroyed
+  }.each do |event|
+    define_method("trigger_#{event}_event") do
+      DiscourseEvent.trigger(event, self)
+      true
+    end
+  end
 end
 
 # == Schema Information
 #
 # Table name: tags
 #
-#  id          :integer          not null, primary key
-#  name        :string           not null
-#  topic_count :integer          default(0), not null
-#  created_at  :datetime
-#  updated_at  :datetime
+#  id             :integer          not null, primary key
+#  name           :string           not null
+#  topic_count    :integer          default(0), not null
+#  created_at     :datetime         not null
+#  updated_at     :datetime         not null
+#  pm_topic_count :integer          default(0), not null
 #
 # Indexes
 #
diff --git a/app/models/tag_group.rb b/app/models/tag_group.rb
index 772d9036272..5a5a74af02f 100644
--- a/app/models/tag_group.rb
+++ b/app/models/tag_group.rb
@@ -5,9 +5,15 @@ class TagGroup < ActiveRecord::Base
   has_many :tags, through: :tag_group_memberships
   has_many :category_tag_groups, dependent: :destroy
   has_many :categories, through: :category_tag_groups
+  has_many :tag_group_permissions, dependent: :destroy
 
   belongs_to :parent_tag, class_name: 'Tag'
 
+  before_create :init_permissions
+  before_save :apply_permissions
+
+  attr_accessor :permissions
+
   def tag_names=(tag_names_arg)
     DiscourseTagging.add_or_create_tags_by_name(self, tag_names_arg, unlimited: true)
   end
@@ -21,6 +27,58 @@ class TagGroup < ActiveRecord::Base
       end
     end
   end
+
+  def permissions=(permissions)
+    @permissions = TagGroup.resolve_permissions(permissions)
+  end
+
+  def self.resolve_permissions(permissions)
+    everyone_group_id = Group::AUTO_GROUPS[:everyone]
+    full = TagGroupPermission.permission_types[:full]
+
+    mapped = permissions.map do |group, permission|
+      group_id = Group.group_id_from_param(group)
+      permission = TagGroupPermission.permission_types[permission] unless permission.is_a?(Integer)
+      [group_id, permission]
+    end
+  end
+
+  def init_permissions
+    unless tag_group_permissions.present? || @permissions
+      tag_group_permissions.build(
+        group_id: Group::AUTO_GROUPS[:everyone],
+        permission_type: TagGroupPermission.permission_types[:full]
+      )
+    end
+  end
+
+  def apply_permissions
+    if @permissions
+      tag_group_permissions.destroy_all
+      @permissions.each do |group_id, permission_type|
+        tag_group_permissions.build(group_id: group_id, permission_type: permission_type)
+      end
+      @permissions = nil
+    end
+  end
+
+  def self.visible(guardian)
+    if guardian.is_staff?
+      TagGroup
+    else
+      filter_sql = <<~SQL
+        (
+          id IN (SELECT tag_group_id FROM category_tag_groups WHERE category_id IN (?))
+        ) OR (
+          id NOT IN (SELECT tag_group_id FROM category_tag_groups)
+          AND
+          id IN (SELECT tag_group_id FROM tag_group_permissions WHERE group_id = ?)
+        )
+      SQL
+
+      TagGroup.where(filter_sql, guardian.allowed_category_ids, Group::AUTO_GROUPS[:everyone])
+    end
+  end
 end
 
 # == Schema Information
@@ -29,8 +87,8 @@ end
 #
 #  id            :integer          not null, primary key
 #  name          :string           not null
-#  created_at    :datetime
-#  updated_at    :datetime
+#  created_at    :datetime         not null
+#  updated_at    :datetime         not null
 #  parent_tag_id :integer
 #  one_per_topic :boolean          default(FALSE)
 #
diff --git a/app/models/tag_group_membership.rb b/app/models/tag_group_membership.rb
index 76e9be22c36..3bc5610e278 100644
--- a/app/models/tag_group_membership.rb
+++ b/app/models/tag_group_membership.rb
@@ -10,8 +10,8 @@ end
 #  id           :integer          not null, primary key
 #  tag_id       :integer          not null
 #  tag_group_id :integer          not null
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #
 # Indexes
 #
diff --git a/app/models/tag_group_permission.rb b/app/models/tag_group_permission.rb
new file mode 100644
index 00000000000..f2a27c1c872
--- /dev/null
+++ b/app/models/tag_group_permission.rb
@@ -0,0 +1,26 @@
+# Who can see and use tags belonging to a tag group.
+class TagGroupPermission < ActiveRecord::Base
+  belongs_to :tag_group
+  belongs_to :group
+
+  def self.permission_types
+    @permission_types ||= Enum.new(full: 1, readonly: 3)
+  end
+end
+
+# == Schema Information
+#
+# Table name: tag_group_permissions
+#
+#  id              :integer          not null, primary key
+#  tag_group_id    :integer          not null
+#  group_id        :integer          not null
+#  permission_type :integer          default(1), not null
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#
+# Indexes
+#
+#  index_tag_group_permissions_on_group_id      (group_id)
+#  index_tag_group_permissions_on_tag_group_id  (tag_group_id)
+#
diff --git a/app/models/tag_user.rb b/app/models/tag_user.rb
index 52db737cb5e..d54b787c405 100644
--- a/app/models/tag_user.rb
+++ b/app/models/tag_user.rb
@@ -161,8 +161,8 @@ end
 #  tag_id             :integer          not null
 #  user_id            :integer          not null
 #  notification_level :integer          not null
-#  created_at         :datetime
-#  updated_at         :datetime
+#  created_at         :datetime         not null
+#  updated_at         :datetime         not null
 #
 # Indexes
 #
diff --git a/app/models/theme.rb b/app/models/theme.rb
index 5fc90241d9b..5dfcd54b3e9 100644
--- a/app/models/theme.rb
+++ b/app/models/theme.rb
@@ -1,13 +1,17 @@
 require_dependency 'distributed_cache'
 require_dependency 'stylesheet/compiler'
 require_dependency 'stylesheet/manager'
+require_dependency 'theme_settings_parser'
+require_dependency 'theme_settings_manager'
 
 class Theme < ActiveRecord::Base
 
   @cache = DistributedCache.new('theme')
 
+  belongs_to :user
   belongs_to :color_scheme
   has_many :theme_fields, dependent: :destroy
+  has_many :theme_settings, dependent: :destroy
   has_many :child_theme_relation, class_name: 'ChildTheme', foreign_key: 'parent_theme_id', dependent: :destroy
   has_many :child_themes, through: :child_theme_relation, source: :child_theme
   has_many :color_schemes
@@ -23,8 +27,16 @@ class Theme < ActiveRecord::Base
   end
 
   after_save do
-    changed_colors.each(&:save!)
+    color_schemes = {}
+    changed_colors.each do |color|
+      color.save!
+      color_schemes[color.color_scheme_id] ||= color.color_scheme
+    end
+
+    color_schemes.values.each(&:save!)
+
     changed_colors.clear
+
     changed_fields.each(&:save!)
     changed_fields.clear
 
@@ -34,11 +46,13 @@ class Theme < ActiveRecord::Base
     @included_themes = nil
 
     remove_from_cache!
+    clear_cached_settings!
     notify_scheme_change if saved_change_to_color_scheme_id?
   end
 
   after_destroy do
     remove_from_cache!
+    clear_cached_settings!
     if SiteSetting.default_theme_key == self.key
       Theme.clear_default!
     end
@@ -72,7 +86,7 @@ class Theme < ActiveRecord::Base
     if keys = @cache["user_theme_keys"]
       return keys
     end
-    @cache["theme_keys"] = Set.new(
+    @cache["user_theme_keys"] = Set.new(
       Theme
       .where('user_selectable OR key = ?', SiteSetting.default_theme_key)
       .pluck(:key)
@@ -122,7 +136,11 @@ class Theme < ActiveRecord::Base
   end
 
   def self.targets
-    @targets ||= Enum.new(common: 0, desktop: 1, mobile: 2)
+    @targets ||= Enum.new(common: 0, desktop: 1, mobile: 2, settings: 3)
+  end
+
+  def self.lookup_target(target_id)
+    self.targets.invert[target_id]
   end
 
   def notify_scheme_change(clear_manager_cache = true)
@@ -288,6 +306,56 @@ class Theme < ActiveRecord::Base
     child_themes.reload
     save!
   end
+
+  def settings
+    field = theme_fields.where(target_id: Theme.targets[:settings], name: "yaml").first
+    return [] unless field && field.error.nil?
+
+    settings = []
+    ThemeSettingsParser.new(field).load do |name, default, type, opts|
+      settings << ThemeSettingsManager.create(name, default, type, self, opts)
+    end
+    settings
+  end
+
+  def cached_settings
+    Rails.cache.fetch("settings_for_theme_#{self.key}", expires_in: 30.minutes) do
+      hash = {}
+      self.settings.each do |setting|
+        hash[setting.name] = setting.value
+      end
+      hash
+    end
+  end
+
+  def clear_cached_settings!
+    Rails.cache.delete("settings_for_theme_#{self.key}")
+  end
+
+  def included_settings
+    hash = {}
+
+    self.included_themes.each do |theme|
+      hash.merge!(theme.cached_settings)
+    end
+
+    hash.merge!(self.cached_settings)
+    hash
+  end
+
+  def self.settings_for_client(key)
+    theme = Theme.find_by(key: key)
+    return {}.to_json unless theme
+
+    theme.included_settings.to_json
+  end
+
+  def update_setting(setting_name, new_value)
+    target_setting = settings.find { |setting| setting.name == setting_name }
+    raise Discourse::NotFound unless target_setting
+
+    target_setting.value = new_value
+  end
 end
 
 # == Schema Information
@@ -295,9 +363,9 @@ end
 # Table name: themes
 #
 #  id               :integer          not null, primary key
-#  name             :string(255)      not null
+#  name             :string           not null
 #  user_id          :integer          not null
-#  key              :string(255)      not null
+#  key              :string           not null
 #  created_at       :datetime         not null
 #  updated_at       :datetime         not null
 #  compiler_version :integer          default(0), not null
diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb
index 386b0fb903a..eb87ce5f14e 100644
--- a/app/models/theme_field.rb
+++ b/app/models/theme_field.rb
@@ -1,3 +1,5 @@
+require_dependency 'theme_settings_parser'
+
 class ThemeField < ActiveRecord::Base
 
   belongs_to :upload
@@ -7,7 +9,8 @@ class ThemeField < ActiveRecord::Base
                         scss: 1,
                         theme_upload_var: 2,
                         theme_color_var: 3,
-                        theme_var: 4)
+                        theme_var: 4,
+                        yaml: 5)
   end
 
   def self.theme_var_type_ids
@@ -21,10 +24,28 @@ class ThemeField < ActiveRecord::Base
 
   belongs_to :theme
 
+  def settings(source)
+
+    settings = {}
+
+    theme.cached_settings.each do |k, v|
+      if source.include?("settings.#{k}")
+        settings[k] = v
+      end
+    end
+
+    if settings.length > 0
+      "let settings = #{settings.to_json};"
+    else
+      ""
+    end
+  end
+
   def transpile(es6_source, version)
     template = Tilt::ES6ModuleTranspilerTemplate.new {}
     wrapped = <<PLUGIN_API_JS
 Discourse._registerPluginCode('#{version}', api => {
+  #{settings(es6_source)}
   #{es6_source}
 });
 PLUGIN_API_JS
@@ -38,9 +59,17 @@ PLUGIN_API_JS
     doc = Nokogiri::HTML.fragment(html)
     doc.css('script[type="text/x-handlebars"]').each do |node|
       name = node["name"] || node["data-template-name"] || "broken"
+
       is_raw = name =~ /\.raw$/
+      setting_helpers = ''
+      theme.cached_settings.each do |k, v|
+        val = v.is_a?(String) ? "\"#{v.gsub('"', "\\u0022")}\"" : v
+        setting_helpers += "{{theme-setting-injector #{is_raw ? "" : "context=this"} key=\"#{k}\" value=#{val}}}\n"
+      end
+      hbs_template = setting_helpers + node.inner_html
+
       if is_raw
-        template = "requirejs('discourse-common/lib/raw-handlebars').template(#{Barber::Precompiler.compile(node.inner_html)})"
+        template = "requirejs('discourse-common/lib/raw-handlebars').template(#{Barber::Precompiler.compile(hbs_template)})"
         node.replace <<COMPILED
           <script>
             (function() {
@@ -49,7 +78,7 @@ PLUGIN_API_JS
           </script>
 COMPILED
       else
-        template = "Ember.HTMLBars.template(#{Barber::Ember::Precompiler.compile(node.inner_html)})"
+        template = "Ember.HTMLBars.template(#{Barber::Ember::Precompiler.compile(hbs_template)})"
         node.replace <<COMPILED
           <script>
             (function() {
@@ -77,11 +106,54 @@ COMPILED
     [doc.to_s, errors&.join("\n")]
   end
 
+  def validate_yaml!
+    return unless self.name == "yaml"
+
+    errors = []
+    begin
+      ThemeSettingsParser.new(self).load do |name, default, type, opts|
+        setting = ThemeSetting.new(name: name, data_type: type, theme: theme)
+        translation_key = "themes.settings_errors"
+
+        if setting.invalid?
+          setting.errors.details.each_pair do |attribute, _errors|
+            _errors.each do |hash|
+              errors << I18n.t("#{translation_key}.#{attribute}_#{hash[:error]}", name: name)
+            end
+          end
+        end
+
+        if default.nil?
+          errors << I18n.t("#{translation_key}.default_value_missing", name: name)
+        end
+
+        if (min = opts[:min]) && (max = opts[:max])
+          unless ThemeSetting.value_in_range?(default, (min..max), type)
+            errors << I18n.t("#{translation_key}.default_out_range", name: name)
+          end
+        end
+
+        unless ThemeSetting.acceptable_value_for_type?(default, type)
+          errors << I18n.t("#{translation_key}.default_not_match_type", name: name)
+        end
+      end
+    rescue ThemeSettingsParser::InvalidYaml => e
+      errors << e.message
+    end
+
+    self.error = errors.join("\n").presence unless self.destroyed?
+    if will_save_change_to_error?
+      update_columns(error: self.error)
+    end
+  end
+
   def self.guess_type(name)
     if html_fields.include?(name.to_s)
       types[:html]
     elsif scss_fields.include?(name.to_s)
       types[:scss]
+    elsif name.to_s === "yaml"
+      types[:yaml]
     end
   end
 
@@ -121,7 +193,7 @@ COMPILED
                                     )
         self.error = nil unless error.nil?
       rescue SassC::SyntaxError => e
-        self.error = e.message
+        self.error = e.message unless self.destroyed?
       end
 
       if will_save_change_to_error?
@@ -143,6 +215,8 @@ COMPILED
   after_commit do
     ensure_baked!
     ensure_scss_compiles!
+    validate_yaml!
+    theme.clear_cached_settings!
 
     Stylesheet::Manager.clear_theme_cache! if self.name.include?("scss")
 
@@ -162,8 +236,8 @@ end
 #  name             :string(30)       not null
 #  value            :text             not null
 #  value_baked      :text
-#  created_at       :datetime
-#  updated_at       :datetime
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
 #  compiler_version :integer          default(0), not null
 #  error            :string
 #  upload_id        :integer
diff --git a/app/models/theme_setting.rb b/app/models/theme_setting.rb
new file mode 100644
index 00000000000..782d2148649
--- /dev/null
+++ b/app/models/theme_setting.rb
@@ -0,0 +1,66 @@
+class ThemeSetting < ActiveRecord::Base
+  belongs_to :theme
+
+  validates_presence_of :name, :theme
+  validates :data_type, numericality: { only_integer: true }
+  validates :name, length: { maximum: 255 }
+
+  after_save do
+    theme.clear_cached_settings!
+    theme.remove_from_cache!
+    theme.theme_fields.update_all(value_baked: nil)
+  end
+
+  def self.types
+    @types ||= Enum.new(integer: 0, float: 1, string: 2, bool: 3, list: 4, enum: 5)
+  end
+
+  def self.acceptable_value_for_type?(value, type)
+    case type
+    when self.types[:integer]
+      value.is_a?(Integer)
+    when self.types[:float]
+      value.is_a?(Integer) || value.is_a?(Float)
+    when self.types[:bool]
+      value.is_a?(TrueClass) || value.is_a?(FalseClass)
+    when self.types[:list]
+      value.is_a?(String)
+    else
+      true
+    end
+  end
+
+  def self.value_in_range?(value, range, type)
+    if type == self.types[:integer] || type == self.types[:float]
+      range.include? value
+    elsif type == self.types[:string]
+      range.include? value.to_s.length
+    end
+  end
+
+  def self.guess_type(value)
+    case value
+    when Integer
+      types[:integer]
+    when Float
+      types[:float]
+    when String
+      types[:string]
+    when TrueClass, FalseClass
+      types[:bool]
+    end
+  end
+end
+
+# == Schema Information
+#
+# Table name: theme_settings
+#
+#  id         :integer          not null, primary key
+#  name       :string(255)      not null
+#  data_type  :integer          not null
+#  value      :text
+#  theme_id   :integer          not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
diff --git a/app/models/topic.rb b/app/models/topic.rb
index 3561ffbc5b0..78cc39584ef 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -31,7 +31,7 @@ class Topic < ActiveRecord::Base
   def_delegator :notifier, :mute!, :notify_muted!
   def_delegator :notifier, :toggle_mute, :toggle_mute
 
-  attr_accessor :allowed_user_ids, :tags_changed
+  attr_accessor :allowed_user_ids, :tags_changed, :includes_destination_category
 
   DiscourseEvent.on(:site_setting_saved) do |site_setting|
     if site_setting.name.to_s == "slug_generation_method" && site_setting.saved_change_to_value?
@@ -54,14 +54,20 @@ class Topic < ActiveRecord::Base
   end
 
   def trash!(trashed_by = nil)
-    update_category_topic_count_by(-1) if deleted_at.nil?
+    if deleted_at.nil?
+      update_category_topic_count_by(-1)
+      CategoryTagStat.topic_deleted(self) if self.tags.present?
+    end
     super(trashed_by)
     update_flagged_posts_count
     self.topic_embed.trash! if has_topic_embed?
   end
 
   def recover!
-    update_category_topic_count_by(1) unless deleted_at.nil?
+    unless deleted_at.nil?
+      update_category_topic_count_by(1)
+      CategoryTagStat.topic_recovered(self) if self.tags.present?
+    end
     super
     update_flagged_posts_count
     unless (topic_embed = TopicEmbed.with_deleted.find_by_topic_id(id)).nil?
@@ -78,6 +84,7 @@ class Topic < ActiveRecord::Base
                     topic_title_length: true,
                     censored_words: true,
                     quality_title: { unless: :private_message? },
+                    max_emojis: true,
                     unique_among: { unless: Proc.new { |t| (SiteSetting.allow_duplicate_topic_titles? || t.private_message?) },
                                     message: :has_already_been_used,
                                     allow_blank: true,
@@ -92,7 +99,7 @@ class Topic < ActiveRecord::Base
             if: Proc.new { |t|
               (t.new_record? || t.category_id_changed?) &&
               !SiteSetting.allow_uncategorized_topics &&
-              (t.archetype.nil? || t.archetype == Archetype.default) &&
+              (t.archetype.nil? || t.regular?) &&
               (!t.user_id || !t.user.staff?)
             }
 
@@ -122,11 +129,13 @@ class Topic < ActiveRecord::Base
   has_many :allowed_users, through: :topic_allowed_users, source: :user
   has_many :queued_posts
 
-  has_many :topic_tags, dependent: :destroy
-  has_many :tags, through: :topic_tags
+  has_many :topic_tags
+  has_many :tags, through: :topic_tags, dependent: :destroy # dependent destroy applies to the topic_tags records
   has_many :tag_users, through: :tags
 
   has_one :top_topic
+  has_one :shared_draft, dependent: :destroy
+
   belongs_to :user
   belongs_to :last_poster, class_name: 'User', foreign_key: :last_post_user_id
   belongs_to :featured_user1, class_name: 'User', foreign_key: :featured_user1_id
@@ -182,6 +191,8 @@ class Topic < ActiveRecord::Base
     where("topics.category_id IS NULL OR topics.category_id IN (SELECT id FROM categories WHERE #{condition[0]})", condition[1])
   }
 
+  scope :with_subtype, ->(subtype) { where('topics.subtype = ?', subtype) }
+
   attr_accessor :ignore_category_auto_close
   attr_accessor :skip_callbacks
 
@@ -216,16 +227,27 @@ class Topic < ActiveRecord::Base
       ApplicationController.banner_json_cache.clear
     end
 
-    if tags_changed
-      TagUser.auto_watch(topic_id: id)
-      TagUser.auto_track(topic_id: id)
-      self.tags_changed = false
+    if tags_changed || saved_change_to_attribute?(:category_id)
+
+      SearchIndexer.queue_post_reindex(self.id)
+
+      if tags_changed
+        TagUser.auto_watch(topic_id: id)
+        TagUser.auto_track(topic_id: id)
+        self.tags_changed = false
+      end
     end
 
     SearchIndexer.index(self)
     UserActionCreator.log_topic(self)
   end
 
+  after_update do
+    if saved_changes[:category_id] && self.tags.present?
+      CategoryTagStat.topic_moved(self, *saved_changes[:category_id])
+    end
+  end
+
   def initialize_default_values
     self.bumped_at ||= Time.now
     self.last_post_user_id ||= user_id
@@ -247,7 +269,7 @@ class Topic < ActiveRecord::Base
   end
 
   def advance_draft_sequence
-    if archetype == Archetype.private_message
+    if self.private_message?
       DraftSequence.next!(user, Draft::NEW_PRIVATE_MESSAGE)
     else
       DraftSequence.next!(user, Draft::NEW_TOPIC)
@@ -255,7 +277,7 @@ class Topic < ActiveRecord::Base
   end
 
   def ensure_topic_has_a_category
-    if category_id.nil? && (archetype.nil? || archetype == Archetype.default)
+    if category_id.nil? && (archetype.nil? || self.regular?)
       self.category_id = SiteSetting.uncategorized_category_id
     end
   end
@@ -310,7 +332,7 @@ class Topic < ActiveRecord::Base
 
   def limit_private_messages_per_day
     return unless private_message?
-    apply_per_day_rate_limit_for("pms", :max_private_messages_per_day)
+    apply_per_day_rate_limit_for("pms", :max_personal_messages_per_day)
   end
 
   def self.fancy_title(title)
@@ -424,6 +446,7 @@ class Topic < ActiveRecord::Base
     @post_numbers = nil
     @public_topic_timer = nil
     @private_topic_timer = nil
+    @is_category_topic = nil
     super(options)
   end
 
@@ -435,24 +458,21 @@ class Topic < ActiveRecord::Base
     ((Time.zone.now - created_at) / 1.minute).round
   end
 
-  def has_meta_data_boolean?(key)
-    meta_data_string(key) == 'true'
-  end
-
-  def meta_data_string(key)
-    custom_fields[key.to_s]
-  end
-
   def self.listable_count_per_day(start_date, end_date, category_id = nil)
-    result = listable_topics.where('created_at >= ? and created_at <= ?', start_date, end_date)
+    result = listable_topics.where("topics.created_at >= ? AND topics.created_at <= ?", start_date, end_date)
+    result = result.group('date(topics.created_at)').order('date(topics.created_at)')
     result = result.where(category_id: category_id) if category_id
-    result.group('date(created_at)').order('date(created_at)').count
+    result.count
   end
 
   def private_message?
     archetype == Archetype.private_message
   end
 
+  def regular?
+    self.archetype == Archetype.default
+  end
+
   MAX_SIMILAR_BODY_LENGTH ||= 200
 
   def self.similar_to(title, raw, user = nil)
@@ -461,7 +481,7 @@ class Topic < ActiveRecord::Base
 
     search_data = "#{title} #{raw[0...MAX_SIMILAR_BODY_LENGTH]}".strip
     filter_words = Search.prepare_data(search_data)
-    ts_query = Search.ts_query(filter_words, nil, "|")
+    ts_query = Search.ts_query(term: filter_words, joiner: "|")
 
     candidates = Topic
       .visible
@@ -497,7 +517,7 @@ class Topic < ActiveRecord::Base
 
   def update_status(status, enabled, user, opts = {})
     TopicStatusUpdater.new(self, user).update!(status, enabled, opts)
-    DiscourseEvent.trigger(:topic_status_updated, self.id, status, enabled)
+    DiscourseEvent.trigger(:topic_status_updated, self, status, enabled)
   end
 
   # Atomically creates the next post number
@@ -643,12 +663,22 @@ SQL
 
       if self.category_id != new_category.id
         self.update!(category_id: new_category.id)
-        Category.where(id: old_category.id).update_all("topic_count = topic_count - 1") if old_category
+
+        if old_category
+          Category
+            .where(id: old_category.id)
+            .update_all("topic_count = topic_count - 1")
+        end
 
         # when a topic changes category we may have to start watching it
         # if we happen to have read state for it
         CategoryUser.auto_watch(category_id: new_category.id, topic_id: self.id)
         CategoryUser.auto_track(category_id: new_category.id, topic_id: self.id)
+
+        if post = self.ordered_posts.first
+          notified_user_ids = [post.user_id, post.last_editor_id].uniq
+          Jobs.enqueue(:notify_category_change, post_id: post.id, notified_user_ids: notified_user_ids)
+        end
       end
 
       Category.where(id: new_category.id).update_all("topic_count = topic_count + 1")
@@ -748,14 +778,14 @@ SQL
 
     last_post = posts.order('post_number desc').where('not hidden AND posts.deleted_at IS NULL').first
     if last_post
-      # ensure all the notifications are out
-      PostAlerter.new.after_save_post(last_post)
+      Jobs.enqueue(:post_alert, post_id: last_post.id)
       add_small_action(user, "invited_group", group.name)
 
       group_id = group.id
 
       group.users.where(
-        "group_users.notification_level > ?", NotificationLevels.all[:muted]
+        "group_users.notification_level > ? AND user_id != ?",
+        NotificationLevels.all[:muted], user.id
       ).find_each do |u|
 
         u.notifications.create!(
@@ -774,62 +804,58 @@ SQL
     true
   end
 
-  # Invite a user to the topic by username or email. Returns success/failure
   def invite(invited_by, username_or_email, group_ids = nil, custom_message = nil)
-    user = User.find_by_username_or_email(username_or_email)
+    target_user = User.find_by_username_or_email(username_or_email)
+    guardian = Guardian.new(invited_by)
 
-    if private_message?
-      # If the user exists, add them to the message.
-      raise UserExists.new I18n.t("topic_invite.user_exists") if user.present? && topic_allowed_users.where(user_id: user.id).exists?
-
-      if user && topic_allowed_users.create!(user_id: user.id)
-        # Create a small action message
-        add_small_action(invited_by, "invited_user", user.username)
-
-        # Notify the user they've been invited
-        user.notifications.create(notification_type: Notification.types[:invited_to_private_message],
-                                  topic_id: id,
-                                  post_number: 1,
-                                  data: { topic_title: title,
-                                          display_username: invited_by.username }.to_json)
-        return true
-      end
+    if target_user && topic_allowed_users.where(user_id: target_user.id).exists?
+      raise UserExists.new(I18n.t("topic_invite.user_exists"))
     end
 
-    if username_or_email =~ /^.+@.+$/ && Guardian.new(invited_by).can_invite_via_email?(self)
-      RateLimiter.new(invited_by, "topic-invitations-per-day", SiteSetting.max_topic_invitations_per_day, 1.day.to_i).performed!
+    return true if target_user && invite_existing_muted?(target_user, invited_by)
 
-      if user.present?
-        # add existing users
-        Invite.extend_permissions(self, user, invited_by)
+    if private_message? && target_user && !guardian.can_send_private_message?(target_user)
+      raise UserExists.new(I18n.t("activerecord.errors.models.topic.attributes.base.cant_send_pm"))
+    end
 
-        # Notify the user they've been invited
-        user.notifications.create(notification_type: Notification.types[:invited_to_topic],
-                                  topic_id: id,
-                                  post_number: 1,
-                                  data: { topic_title: title,
-                                          display_username: invited_by.username }.to_json)
-        return true
+    if target_user && private_message? && topic_allowed_users.create!(user_id: target_user.id)
+      rate_limit_topic_invitation(invited_by)
+      add_small_action(invited_by, "invited_user", target_user.username)
+
+      create_invite_notification!(
+        target_user,
+        Notification.types[:invited_to_private_message],
+        invited_by.username
+      )
+
+      true
+    elsif username_or_email =~ /^.+@.+$/ && guardian.can_invite_via_email?(self)
+
+      if target_user
+        rate_limit_topic_invitation(invited_by)
+        Invite.extend_permissions(self, target_user, invited_by)
+
+        create_invite_notification!(
+          target_user,
+          Notification.types[:invited_to_topic],
+          invited_by.username
+        )
       else
-        # NOTE callers expect an invite object if an invite was sent via email
         invite_by_email(invited_by, username_or_email, group_ids, custom_message)
       end
-    else
-      raise UserExists.new I18n.t("topic_invite.user_exists") if user.present? && topic_allowed_users.where(user_id: user.id).exists?
 
-      if user && topic_allowed_users.create!(user_id: user.id)
-        RateLimiter.new(invited_by, "topic-invitations-per-day", SiteSetting.max_topic_invitations_per_day, 1.day.to_i).performed!
+      true
+    elsif target_user &&
+          rate_limit_topic_invitation(invited_by) &&
+          topic_allowed_users.create!(user_id: target_user.id)
 
-        # Notify the user they've been invited
-        user.notifications.create(notification_type: Notification.types[:invited_to_topic],
-                                  topic_id: id,
-                                  post_number: 1,
-                                  data: { topic_title: title,
-                                          display_username: invited_by.username }.to_json)
-        return true
-      else
-        false
-      end
+      create_invite_notification!(
+        target_user,
+        Notification.types[:invited_to_topic],
+        invited_by.username
+      )
+
+      true
     end
   end
 
@@ -837,6 +863,26 @@ SQL
     Invite.invite_by_email(email, invited_by, self, group_ids, custom_message)
   end
 
+  def invite_existing_muted?(target_user, invited_by)
+    if invited_by.id &&
+       MutedUser.where(user_id: target_user.id, muted_user_id: invited_by.id)
+           .joins(:muted_user)
+           .where('NOT admin AND NOT moderator')
+           .exists?
+      return true
+    end
+
+    if TopicUser.where(
+         topic: self,
+         user: target_user,
+         notification_level: TopicUser.notification_levels[:muted]
+        ).exists?
+      return true
+    end
+
+    false
+  end
+
   def email_already_exists_for?(invite)
     invite.email_already_exists && private_message?
   end
@@ -972,10 +1018,6 @@ SQL
     Topic.relative_url(id, slug, post_number)
   end
 
-  def unsubscribe_url
-    "#{url}/unsubscribe"
-  end
-
   def clear_pin_for(user)
     return unless user.present?
     TopicUser.change(user.id, id, cleared_pinned_at: Time.now)
@@ -986,11 +1028,16 @@ SQL
     TopicUser.change(user.id, id, cleared_pinned_at: nil)
   end
 
-  def update_pinned(status, global = false, pinned_until = nil)
-    pinned_until = Time.parse(pinned_until) rescue nil
+  def update_pinned(status, global = false, pinned_until = "")
+    pinned_until ||= ''
+
+    pinned_until = begin
+      Time.parse(pinned_until)
+    rescue ArgumentError
+    end
 
     update_columns(
-      pinned_at: status ? Time.now : nil,
+      pinned_at: status ? Time.zone.now : nil,
       pinned_globally: global,
       pinned_until: pinned_until
     )
@@ -1068,19 +1115,17 @@ SQL
       end
     else
       utc = Time.find_zone("UTC")
-      is_timestamp = time.is_a?(String)
-      now = utc.now
+      is_float = (Float(time) rescue nil)
 
-      if is_timestamp && time.include?("-") && timestamp = utc.parse(time)
+      if is_float
+        num_hours = time.to_f
+        topic_timer.execute_at = num_hours.hours.from_now if num_hours > 0
+      else
+        timestamp = utc.parse(time)
+        raise Discourse::InvalidParameters unless timestamp
         # a timestamp in client's time zone, like "2015-5-27 12:00"
         topic_timer.execute_at = timestamp
-        topic_timer.errors.add(:execute_at, :invalid) if timestamp < now
-      else
-        num_hours = time.to_f
-
-        if num_hours > 0
-          topic_timer.execute_at = num_hours.hours.from_now
-        end
+        topic_timer.errors.add(:execute_at, :invalid) if timestamp < utc.now
       end
     end
 
@@ -1130,19 +1175,31 @@ SQL
   def message_archived?(user)
     return false unless user && user.id
 
-    sql = <<SQL
-SELECT 1 FROM topic_allowed_groups tg
-JOIN group_archived_messages gm
-      ON gm.topic_id = tg.topic_id AND
-         gm.group_id = tg.group_id
-  WHERE tg.group_id IN (SELECT g.group_id FROM group_users g WHERE g.user_id = :user_id)
-    AND tg.topic_id = :topic_id
+    # tricky query but this checks to see if message is archived for ALL groups you belong to
+    # OR if you have it archived as a user explicitly
 
-UNION ALL
+    sql = <<~SQL
+    SELECT 1
+    WHERE
+      (
+      SELECT count(*) FROM topic_allowed_groups tg
+      JOIN group_archived_messages gm
+            ON gm.topic_id = tg.topic_id AND
+               gm.group_id = tg.group_id
+        WHERE tg.group_id IN (SELECT g.group_id FROM group_users g WHERE g.user_id = :user_id)
+          AND tg.topic_id = :topic_id
+      ) =
+      (
+        SELECT case when count(*) = 0 then -1 else count(*) end FROM topic_allowed_groups tg
+        WHERE tg.group_id IN (SELECT g.group_id FROM group_users g WHERE g.user_id = :user_id)
+          AND tg.topic_id = :topic_id
+      )
 
-SELECT 1 FROM topic_allowed_users tu
-JOIN user_archived_messages um ON um.user_id = tu.user_id AND um.topic_id = tu.topic_id
-WHERE tu.user_id = :user_id AND tu.topic_id = :topic_id
+      UNION ALL
+
+      SELECT 1 FROM topic_allowed_users tu
+      JOIN user_archived_messages um ON um.user_id = tu.user_id AND um.topic_id = tu.topic_id
+      WHERE tu.user_id = :user_id AND tu.topic_id = :topic_id
 SQL
 
     User.exec_sql(sql, user_id: user.id, topic_id: id).to_a.length > 0
@@ -1276,6 +1333,14 @@ SQL
     MiniSuffix.domain(URI.parse(URI.encode(self.featured_link)).hostname)
   end
 
+  def self.private_message_topics_count_per_day(start_date, end_date, topic_subtype)
+    private_messages.with_subtype(topic_subtype).where('topics.created_at >= ? AND topics.created_at <= ?', start_date, end_date).group('date(topics.created_at)').order('date(topics.created_at)').count
+  end
+
+  def is_category_topic?
+    @is_category_topic ||= Category.exists?(topic_id: self.id.to_i)
+  end
+
   private
 
   def update_category_topic_count_by(num)
@@ -1292,6 +1357,28 @@ SQL
     RateLimiter.new(user, "#{key}-per-day", SiteSetting.send(method_name), 1.day.to_i)
   end
 
+  def create_invite_notification!(target_user, notification_type, username)
+    target_user.notifications.create!(
+      notification_type: notification_type,
+      topic_id: self.id,
+      post_number: 1,
+      data: {
+        topic_title: self.title,
+        display_username: username
+      }.to_json
+    )
+  end
+
+  def rate_limit_topic_invitation(invited_by)
+    RateLimiter.new(
+      invited_by,
+      "topic-invitations-per-day",
+      SiteSetting.max_topic_invitations_per_day,
+      1.day.to_i
+    ).performed!
+
+    true
+  end
 end
 
 # == Schema Information
@@ -1299,7 +1386,7 @@ end
 # Table name: topics
 #
 #  id                        :integer          not null, primary key
-#  title                     :string(255)      not null
+#  title                     :string           not null
 #  last_posted_at            :datetime
 #  created_at                :datetime         not null
 #  updated_at                :datetime         not null
@@ -1314,7 +1401,7 @@ end
 #  avg_time                  :integer
 #  deleted_at                :datetime
 #  highest_post_number       :integer          default(0), not null
-#  image_url                 :string(255)
+#  image_url                 :string
 #  like_count                :integer          default(0), not null
 #  incoming_link_count       :integer          default(0), not null
 #  category_id               :integer
@@ -1325,15 +1412,15 @@ end
 #  bumped_at                 :datetime         not null
 #  has_summary               :boolean          default(FALSE), not null
 #  vote_count                :integer          default(0), not null
-#  archetype                 :string(255)      default("regular"), not null
+#  archetype                 :string           default("regular"), not null
 #  featured_user4_id         :integer
 #  notify_moderators_count   :integer          default(0), not null
 #  spam_count                :integer          default(0), not null
 #  pinned_at                 :datetime
 #  score                     :float
 #  percent_rank              :float            default(1.0), not null
-#  subtype                   :string(255)
-#  slug                      :string(255)
+#  subtype                   :string
+#  slug                      :string
 #  deleted_by_id             :integer
 #  participant_count         :integer          default(1)
 #  word_count                :integer
@@ -1349,7 +1436,7 @@ end
 #  idx_topics_front_page                   (deleted_at,visible,archetype,category_id,id)
 #  idx_topics_user_id_deleted_at           (user_id)
 #  idxtopicslug                            (slug)
-#  index_forum_threads_on_bumped_at        (bumped_at)
+#  index_topics_on_bumped_at               (bumped_at)
 #  index_topics_on_created_at_and_visible  (created_at,visible)
 #  index_topics_on_id_and_deleted_at       (id,deleted_at)
 #  index_topics_on_lower_title             (lower((title)::text))
diff --git a/app/models/topic_converter.rb b/app/models/topic_converter.rb
index 5ebe6516250..76704a7a8ce 100644
--- a/app/models/topic_converter.rb
+++ b/app/models/topic_converter.rb
@@ -24,6 +24,7 @@ class TopicConverter
       @topic.archetype = Archetype.default
       @topic.save
       update_user_stats
+      update_category_topic_count_by(1)
 
       # TODO: Every post in a PRIVATE MESSAGE looks the same: each is a UserAction::NEW_PRIVATE_MESSAGE.
       #       So we need to remove all those user actions and re-log all the posts.
@@ -46,10 +47,11 @@ class TopicConverter
 
   def convert_to_private_message
     Topic.transaction do
+      update_category_topic_count_by(-1)
       @topic.category_id = nil
       @topic.archetype = Archetype.private_message
       add_allowed_users
-      @topic.save
+      @topic.save!
       watch_topic(topic)
     end
     @topic
@@ -77,7 +79,7 @@ class TopicConverter
       user.user_stat.post_count -= 1
       user.user_stat.save!
     end
-    @topic.topic_allowed_users.build(user_id: @user.id)
+    @topic.topic_allowed_users.build(user_id: @user.id) unless @topic.topic_allowed_users.where(user_id: @user.id).exists?
     # update topics count
     @topic.user.user_stat.topic_count -= 1
     @topic.user.user_stat.save!
@@ -92,4 +94,10 @@ class TopicConverter
     end
   end
 
+  def update_category_topic_count_by(num)
+    if @topic.category_id.present?
+      Category.where(['id = ?', @topic.category_id]).update_all("topic_count = topic_count " + (num > 0 ? '+' : '') + "#{num}")
+    end
+  end
+
 end
diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb
index 8e3071ea4c8..42d078e0033 100644
--- a/app/models/topic_embed.rb
+++ b/app/models/topic_embed.rb
@@ -48,11 +48,17 @@ class TopicEmbed < ActiveRecord::Base
       Topic.transaction do
         eh = EmbeddableHost.record_for_url(url)
 
+        cook_method = if SiteSetting.embed_support_markdown
+          Post.cook_methods[:regular]
+        else
+          Post.cook_methods[:raw_html]
+        end
+
         creator = PostCreator.new(user,
                                   title: title,
                                   raw: absolutize_urls(url, contents),
                                   skip_validations: true,
-                                  cook_method: Post.cook_methods[:raw_html],
+                                  cook_method: cook_method,
                                   category: eh.try(:category_id))
         post = creator.create
         if post.present?
@@ -67,7 +73,13 @@ class TopicEmbed < ActiveRecord::Base
       post = embed.post
       # Update the topic if it changed
       if post && post.topic && content_sha1 != embed.content_sha1
-        post.revise(user, { raw: absolutize_urls(url, contents) }, skip_validations: true, bypass_rate_limiter: true)
+        post_revision_args = {
+          raw: absolutize_urls(url, contents),
+          user_id: user.id,
+          title: title,
+        }
+
+        post.revise(user, post_revision_args, skip_validations: true, bypass_rate_limiter: true)
         embed.update_column(:content_sha1, content_sha1)
       end
     end
@@ -183,7 +195,7 @@ class TopicEmbed < ActiveRecord::Base
 
   def self.topic_id_for_embed(embed_url)
     embed_url = normalize_url(embed_url).sub(/^https?\:\/\//, '')
-    TopicEmbed.where("embed_url ~* '^https?://#{embed_url}$'").pluck(:topic_id).first
+    TopicEmbed.where("embed_url ~* '^https?://#{Regexp.escape(embed_url)}$'").pluck(:topic_id).first
   end
 
   def self.first_paragraph_from(html)
diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb
index a55cd5ca487..40fbcab8010 100644
--- a/app/models/topic_link.rb
+++ b/app/models/topic_link.rb
@@ -115,7 +115,14 @@ SQL
 
       PrettyText
         .extract_links(post.cooked)
-        .map { |u| [u, URI.parse(u.url)] rescue nil }
+        .map do |u|
+          uri = begin
+            URI.parse(u.url)
+          rescue URI::Error
+          end
+
+          [u, uri]
+        end
         .reject { |_, p| p.nil? || "mailto".freeze == p.scheme }
         .uniq { |_, p| p }
         .each do |link, parsed|
@@ -284,16 +291,16 @@ end
 #  reflection    :boolean          default(FALSE)
 #  clicks        :integer          default(0), not null
 #  link_post_id  :integer
-#  title         :string(255)
+#  title         :string
 #  crawled_at    :datetime
 #  quote         :boolean          default(FALSE), not null
 #  extension     :string(10)
 #
 # Indexes
 #
-#  index_forum_thread_links_on_forum_thread_id                      (topic_id)
-#  index_forum_thread_links_on_forum_thread_id_and_post_id_and_url  (topic_id,post_id,url) UNIQUE
-#  index_topic_links_on_extension                                   (extension)
-#  index_topic_links_on_link_post_id_and_reflection                 (link_post_id,reflection)
-#  index_topic_links_on_post_id                                     (post_id)
+#  index_topic_links_on_extension                    (extension)
+#  index_topic_links_on_link_post_id_and_reflection  (link_post_id,reflection)
+#  index_topic_links_on_post_id                      (post_id)
+#  index_topic_links_on_topic_id                     (topic_id)
+#  unique_post_links                                 (topic_id,post_id,url) UNIQUE
 #
diff --git a/app/models/topic_link_click.rb b/app/models/topic_link_click.rb
index 3afce0bfbd5..422c974bfdc 100644
--- a/app/models/topic_link_click.rb
+++ b/app/models/topic_link_click.rb
@@ -7,7 +7,6 @@ class TopicLinkClick < ActiveRecord::Base
   belongs_to :user
 
   validates_presence_of :topic_link_id
-  validates_presence_of :ip_address
 
   WHITELISTED_REDIRECT_HOSTNAMES = Set.new(%W{www.youtube.com youtu.be})
 
@@ -16,7 +15,10 @@ class TopicLinkClick < ActiveRecord::Base
     url = args[:url][0...TopicLink.max_url_length]
     return nil if url.blank?
 
-    uri = URI.parse(url) rescue nil
+    uri = begin
+      URI.parse(url)
+    rescue URI::InvalidURIError
+    end
 
     urls = Set.new
     urls << url
@@ -43,7 +45,11 @@ class TopicLinkClick < ActiveRecord::Base
     # add a cdn link
     if uri
       if Discourse.asset_host.present?
-        cdn_uri = URI.parse(Discourse.asset_host) rescue nil
+        cdn_uri = begin
+          URI.parse(Discourse.asset_host)
+        rescue URI::InvalidURIError
+        end
+
         if cdn_uri && cdn_uri.hostname == uri.hostname && uri.path.starts_with?(cdn_uri.path)
           is_cdn_link = true
           urls << uri.path[cdn_uri.path.length..-1]
@@ -51,7 +57,11 @@ class TopicLinkClick < ActiveRecord::Base
       end
 
       if SiteSetting.Upload.s3_cdn_url.present?
-        cdn_uri = URI.parse(SiteSetting.Upload.s3_cdn_url) rescue nil
+        cdn_uri = begin
+          URI.parse(SiteSetting.Upload.s3_cdn_url)
+        rescue URI::InvalidURIError
+        end
+
         if cdn_uri && cdn_uri.hostname == uri.hostname && uri.path.starts_with?(cdn_uri.path)
           is_cdn_link = true
           path = uri.path[cdn_uri.path.length..-1]
@@ -97,6 +107,7 @@ class TopicLinkClick < ActiveRecord::Base
     rate_key = "link-clicks:#{link.id}:#{args[:user_id] || args[:ip]}"
     if $redis.setnx(rate_key, "1")
       $redis.expire(rate_key, 1.day.to_i)
+      args[:ip] = nil if args[:user_id]
       create!(topic_link_id: link.id, user_id: args[:user_id], ip_address: args[:ip])
     end
 
@@ -114,9 +125,9 @@ end
 #  user_id       :integer
 #  created_at    :datetime         not null
 #  updated_at    :datetime         not null
-#  ip_address    :inet             not null
+#  ip_address    :inet
 #
 # Indexes
 #
-#  index_forum_thread_link_clicks_on_forum_thread_link_id  (topic_link_id)
+#  by_link  (topic_link_id)
 #
diff --git a/app/models/topic_list.rb b/app/models/topic_list.rb
index 375659dc5c8..5aae90f7782 100644
--- a/app/models/topic_list.rb
+++ b/app/models/topic_list.rb
@@ -26,16 +26,21 @@ class TopicList
     end
   end
 
-  attr_accessor :more_topics_url,
-                :prev_topics_url,
-                :draft,
-                :draft_key,
-                :draft_sequence,
-                :filter,
-                :for_period,
-                :per_page,
-                :tags,
-                :current_user
+  attr_accessor(
+    :more_topics_url,
+    :prev_topics_url,
+    :draft,
+    :draft_key,
+    :draft_sequence,
+    :filter,
+    :for_period,
+    :per_page,
+    :top_tags,
+    :current_user,
+    :tags,
+    :shared_drafts,
+    :category
+  )
 
   def initialize(filter, current_user, topics, opts = nil)
     @filter = filter
@@ -46,9 +51,13 @@ class TopicList
     if @opts[:category]
       @category = Category.find_by(id: @opts[:category_id])
     end
+
+    if @opts[:tags]
+      @tags = Tag.where(id: @opts[:tags]).all
+    end
   end
 
-  def tags
+  def top_tags
     opts = @category ? { category: @category } : {}
     opts[:guardian] = Guardian.new(@current_user)
     Tag.top_tags(opts)
diff --git a/app/models/topic_search_data.rb b/app/models/topic_search_data.rb
index 641d79246c6..ddf065327be 100644
--- a/app/models/topic_search_data.rb
+++ b/app/models/topic_search_data.rb
@@ -8,7 +8,7 @@ end
 #
 #  topic_id    :integer          not null, primary key
 #  raw_data    :text
-#  locale      :string(255)      not null
+#  locale      :string           not null
 #  search_data :tsvector
 #  version     :integer          default(0)
 #
diff --git a/app/models/topic_tag.rb b/app/models/topic_tag.rb
index f8dc3cfee01..22edeebad0c 100644
--- a/app/models/topic_tag.rb
+++ b/app/models/topic_tag.rb
@@ -1,6 +1,38 @@
 class TopicTag < ActiveRecord::Base
   belongs_to :topic
-  belongs_to :tag, counter_cache: "topic_count"
+  belongs_to :tag
+
+  after_create do
+    if topic
+      if topic.archetype == Archetype.private_message
+        tag.increment!(:pm_topic_count)
+      else
+        tag.increment!(:topic_count)
+
+        if topic.category_id
+          if stat = CategoryTagStat.find_by(tag_id: tag_id, category_id: topic.category_id)
+            stat.increment!(:topic_count)
+          else
+            CategoryTagStat.create(tag_id: tag_id, category_id: topic.category_id, topic_count: 1)
+          end
+        end
+      end
+    end
+  end
+
+  after_destroy do
+    if topic
+      if topic.archetype == Archetype.private_message
+        tag.decrement!(:pm_topic_count)
+      else
+        if topic.category_id && stat = CategoryTagStat.find_by(tag_id: tag_id, category: topic.category_id)
+          stat.topic_count == 1 ? stat.destroy : stat.decrement!(:topic_count)
+        end
+
+        tag.decrement!(:topic_count)
+      end
+    end
+  end
 end
 
 # == Schema Information
@@ -10,8 +42,8 @@ end
 #  id         :integer          not null, primary key
 #  topic_id   :integer          not null
 #  tag_id     :integer          not null
-#  created_at :datetime
-#  updated_at :datetime
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
 #
 # Indexes
 #
diff --git a/app/models/topic_timer.rb b/app/models/topic_timer.rb
index 160f6c40a7d..39f882dbafa 100644
--- a/app/models/topic_timer.rb
+++ b/app/models/topic_timer.rb
@@ -157,8 +157,8 @@ end
 #  based_on_last_post :boolean          default(FALSE), not null
 #  deleted_at         :datetime
 #  deleted_by_id      :integer
-#  created_at         :datetime
-#  updated_at         :datetime
+#  created_at         :datetime         not null
+#  updated_at         :datetime         not null
 #  category_id        :integer
 #  public_type        :boolean          default(TRUE)
 #
diff --git a/app/models/topic_tracking_state.rb b/app/models/topic_tracking_state.rb
index a7d48758ba3..61b3fab8710 100644
--- a/app/models/topic_tracking_state.rb
+++ b/app/models/topic_tracking_state.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # this class is used to mirror unread and new status back to end users
 # in JavaScript there is a mirror class that is kept in-sync using the mssage bus
 # the allows end users to always know which topics have unread posts in them
@@ -8,6 +10,8 @@ class TopicTrackingState
   include ActiveModel::SerializerSupport
 
   CHANNEL = "/user-tracking"
+  UNREAD_MESSAGE_TYPE = "unread".freeze
+  LATEST_MESSAGE_TYPE = "latest".freeze
 
   attr_accessor :user_id,
                 :topic_id,
@@ -18,6 +22,7 @@ class TopicTrackingState
                 :notification_level
 
   def self.publish_new(topic)
+    return unless topic.regular?
 
     message = {
       topic_id: topic.id,
@@ -39,14 +44,13 @@ class TopicTrackingState
   end
 
   def self.publish_latest(topic, staff_only = false)
-    return unless topic.archetype == "regular"
+    return unless topic.regular?
 
     message = {
       topic_id: topic.id,
-      message_type: "latest",
+      message_type: LATEST_MESSAGE_TYPE,
       payload: {
         bumped_at: topic.bumped_at,
-        topic_id: topic.id,
         category_id: topic.category_id,
         archetype: topic.archetype
       }
@@ -61,7 +65,12 @@ class TopicTrackingState
     MessageBus.publish("/latest", message.as_json, group_ids: group_ids)
   end
 
+  def self.unread_channel_key(user_id)
+    "/unread/#{user_id}"
+  end
+
   def self.publish_unread(post)
+    return unless post.topic.regular?
     # TODO at high scale we are going to have to defer this,
     #   perhaps cut down to users that are around in the last 7 days as well
 
@@ -79,19 +88,18 @@ class TopicTrackingState
 
       message = {
         topic_id: post.topic_id,
-        message_type: "unread",
+        message_type: UNREAD_MESSAGE_TYPE,
         payload: {
           last_read_post_number: tu.last_read_post_number,
           highest_post_number: post.post_number,
           created_at: post.created_at,
-          topic_id: post.topic_id,
           category_id: post.topic.category_id,
           notification_level: tu.notification_level,
           archetype: post.topic.archetype
         }
       }
 
-      MessageBus.publish("/unread/#{tu.user_id}", message.as_json, group_ids: group_ids)
+      MessageBus.publish(self.unread_channel_key(tu.user_id), message.as_json, group_ids: group_ids)
     end
 
   end
@@ -101,10 +109,7 @@ class TopicTrackingState
 
     message = {
       topic_id: topic.id,
-      message_type: "recover",
-      payload: {
-        topic_id: topic.id,
-      }
+      message_type: "recover"
     }
 
     MessageBus.publish("/recover", message.as_json, group_ids: group_ids)
@@ -116,17 +121,13 @@ class TopicTrackingState
 
     message = {
       topic_id: topic.id,
-      message_type: "delete",
-      payload: {
-        topic_id: topic.id,
-      }
+      message_type: "delete"
     }
 
     MessageBus.publish("/delete", message.as_json, group_ids: group_ids)
   end
 
   def self.publish_read(topic_id, last_read_post_number, user_id, notification_level = nil)
-
     highest_post_number = Topic.where(id: topic_id).pluck(:highest_post_number).first
 
     message = {
@@ -140,8 +141,7 @@ class TopicTrackingState
       }
     }
 
-    MessageBus.publish("/unread/#{user_id}", message.as_json, user_ids: [user_id])
-
+    MessageBus.publish(self.unread_channel_key(user_id), message.as_json, user_ids: [user_id])
   end
 
   def self.treat_as_new_topic_clause
@@ -175,8 +175,7 @@ class TopicTrackingState
     sql << report_raw_sql(topic_id: topic_id, skip_new: true, skip_order: true, staff: user.staff?)
 
     SqlBuilder.new(sql)
-      .map_exec(TopicTrackingState, user_id: user.id, topic_id: topic_id)
-
+      .map_exec(TopicTrackingState, user_id: user.id, topic_id: topic_id, min_new_topic_date: Time.at(SiteSetting.min_new_topics_time).to_datetime)
   end
 
   def self.report_raw_sql(opts = nil)
@@ -196,7 +195,8 @@ class TopicTrackingState
       if opts && opts[:skip_new]
         "1=0"
       else
-        TopicQuery.new_filter(Topic, "xxx").where_clause.send(:predicates).join(" AND ").gsub!("'xxx'", treat_as_new_topic_clause)
+        TopicQuery.new_filter(Topic, "xxx").where_clause.send(:predicates).join(" AND ").gsub!("'xxx'", treat_as_new_topic_clause) +
+          " AND topics.created_at > :min_new_topic_date"
       end
 
     select = (opts && opts[:select]) || "
@@ -208,7 +208,7 @@ class TopicTrackingState
            c.id AS category_id,
            tu.notification_level"
 
-    sql = <<SQL
+    sql = +<<SQL
     SELECT #{select}
     FROM topics
     JOIN users u on u.id = :user_id
@@ -246,4 +246,54 @@ SQL
     sql
   end
 
+  def self.publish_private_message(topic, archive_user_id: nil,
+                                          post: nil,
+                                          group_archive: false)
+
+    return unless topic.private_message?
+    channels = {}
+
+    allowed_user_ids = topic.allowed_users.pluck(:id)
+
+    if post && allowed_user_ids.include?(post.user_id)
+      channels["/private-messages/sent"] = [post.user_id]
+    end
+
+    if archive_user_id
+      user_ids = [archive_user_id]
+
+      [
+        "/private-messages/archive",
+        "/private-messages/inbox",
+        "/private-messages/sent",
+      ].each do |channel|
+        channels[channel] = user_ids
+      end
+    end
+
+    if channels.except("/private-messages/sent").blank?
+      channels["/private-messages/inbox"] = allowed_user_ids
+    end
+
+    topic.allowed_groups.each do |group|
+      group_user_ids = group.users.pluck(:id)
+      next if group_user_ids.blank?
+      group_channels = []
+      group_channels << "/private-messages/group/#{group.name.downcase}"
+      group_channels << "#{group_channels.first}/archive" if group_archive
+      group_channels.each { |channel| channels[channel] = group_user_ids }
+    end
+
+    message = {
+      topic_id: topic.id
+    }
+
+    channels.each do |channel, user_ids|
+      MessageBus.publish(
+        channel,
+        message.as_json,
+        user_ids: user_ids
+      )
+    end
+  end
 end
diff --git a/app/models/topic_user.rb b/app/models/topic_user.rb
index 1d5618fbaf2..a6cff083ded 100644
--- a/app/models/topic_user.rb
+++ b/app/models/topic_user.rb
@@ -187,15 +187,41 @@ SQL
       end
 
       unless attrs[:notification_level]
-        auto_track_after = UserOption.where(user_id: user_id).pluck(:auto_track_topics_after_msecs).first
-        auto_track_after ||= SiteSetting.default_other_auto_track_topics_after_msecs
+        if Topic.private_messages.where(id: topic_id).exists? &&
+           Notification.where(
+             user_id: user_id,
+             topic_id: topic_id,
+             notification_type: Notification.types[:invited_to_private_message]
+           ).exists?
 
-        if auto_track_after >= 0 && auto_track_after <= (attrs[:total_msecs_viewed].to_i || 0)
-          attrs[:notification_level] ||= notification_levels[:tracking]
+          group_notification_level = Group
+            .joins("LEFT OUTER JOIN group_users gu ON gu.group_id = groups.id AND gu.user_id = #{user_id}")
+            .joins("LEFT OUTER JOIN topic_allowed_groups tag ON tag.topic_id = #{topic_id}")
+            .where("gu.id IS NOT NULL AND tag.id IS NOT NULL")
+            .pluck(:default_notification_level)
+            .first
+
+          if group_notification_level.present?
+            attrs[:notification_level] = group_notification_level
+          else
+            attrs[:notification_level] = notification_levels[:watching]
+          end
+        else
+          auto_track_after = UserOption.where(user_id: user_id).pluck(:auto_track_topics_after_msecs).first
+          auto_track_after ||= SiteSetting.default_other_auto_track_topics_after_msecs
+
+          if auto_track_after >= 0 && auto_track_after <= (attrs[:total_msecs_viewed].to_i || 0)
+            attrs[:notification_level] ||= notification_levels[:tracking]
+          end
         end
       end
 
-      TopicUser.create(attrs.merge!(user_id: user_id, topic_id: topic_id, first_visited_at: now , last_visited_at: now))
+      TopicUser.create!(attrs.merge!(
+        user_id: user_id,
+        topic_id: topic_id,
+        first_visited_at: now ,
+        last_visited_at: now
+      ))
     end
 
     def track_visit!(topic_id, user_id)
@@ -474,6 +500,6 @@ end
 #
 # Indexes
 #
-#  index_forum_thread_users_on_forum_thread_id_and_user_id  (topic_id,user_id) UNIQUE
-#  index_topic_users_on_user_id_and_topic_id                (user_id,topic_id) UNIQUE
+#  index_topic_users_on_topic_id_and_user_id  (topic_id,user_id) UNIQUE
+#  index_topic_users_on_user_id_and_topic_id  (user_id,topic_id) UNIQUE
 #
diff --git a/app/models/translation_override.rb b/app/models/translation_override.rb
index 4c2ac9b82ca..52b959ad5b7 100644
--- a/app/models/translation_override.rb
+++ b/app/models/translation_override.rb
@@ -21,58 +21,79 @@ class TranslationOverride < ActiveRecord::Base
 
     data = { value: value }
     if key.end_with?('_MF')
-      data[:compiled_js] = JsLocaleHelper.compile_message_format(locale, value)
+      _, filename = JsLocaleHelper.find_message_format_locale([locale], false)
+      data[:compiled_js] = JsLocaleHelper.compile_message_format(filename, locale, value)
     end
 
     translation_override = find_or_initialize_by(params)
     params.merge!(data) if translation_override.new_record?
-    i18n_changed if translation_override.update(data)
+    i18n_changed([key]) if translation_override.update(data)
     translation_override
   end
 
   def self.revert!(locale, *keys)
     TranslationOverride.where(locale: locale, translation_key: keys).delete_all
-    i18n_changed
+    i18n_changed(keys)
   end
 
+  def self.i18n_changed(keys)
+    I18n.reload!
+    MessageBus.publish('/i18n-flush', refresh: true)
+
+    keys.flatten.each do |key|
+      return if expire_cache(key)
+    end
+  end
+
+  def self.expire_cache(key)
+    if key.starts_with?('post_action_types.')
+      ApplicationSerializer.expire_cache_fragment!("post_action_types_#{I18n.locale}")
+    elsif key.starts_with?('topic_flag_types.')
+      ApplicationSerializer.expire_cache_fragment!("post_action_flag_types_#{I18n.locale}")
+    else
+      return false
+    end
+
+    Site.clear_anon_cache!
+    true
+  end
+
+  private_class_method :i18n_changed
+  private_class_method :expire_cache
+
   private
 
-    def self.i18n_changed
-      I18n.reload!
-      MessageBus.publish('/i18n-flush', refresh: true)
+  def check_interpolation_keys
+    original_text = I18n.overrides_disabled do
+      I18n.backend.send(:lookup, self.locale, self.translation_key)
     end
 
-    def check_interpolation_keys
-      original_text = I18n.overrides_disabled do
-        I18n.backend.send(:lookup, self.locale, self.translation_key)
+    if original_text
+      original_interpolation_keys = I18nInterpolationKeysFinder.find(original_text)
+      new_interpolation_keys = I18nInterpolationKeysFinder.find(value)
+
+      custom_interpolation_keys = []
+
+      CUSTOM_INTERPOLATION_KEYS_WHITELIST.select do |key, value|
+        if self.translation_key.start_with?(key)
+          custom_interpolation_keys = value
+        end
       end
 
-      if original_text
-        original_interpolation_keys = I18nInterpolationKeysFinder.find(original_text)
-        new_interpolation_keys = I18nInterpolationKeysFinder.find(value)
+      invalid_keys = (original_interpolation_keys | new_interpolation_keys) -
+        original_interpolation_keys -
+        custom_interpolation_keys
 
-        custom_interpolation_keys = []
+      if invalid_keys.present?
+        self.errors.add(:base, I18n.t(
+          'activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys',
+          keys: invalid_keys.join(', ')
+        ))
 
-        CUSTOM_INTERPOLATION_KEYS_WHITELIST.select do |key, value|
-          if self.translation_key.start_with?(key)
-            custom_interpolation_keys = value
-          end
-        end
-
-        invalid_keys = (original_interpolation_keys | new_interpolation_keys) -
-          original_interpolation_keys -
-          custom_interpolation_keys
-
-        if invalid_keys.present?
-          self.errors.add(:base, I18n.t(
-            'activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys',
-            keys: invalid_keys.join(', ')
-          ))
-
-          return false
-        end
+        return false
       end
     end
+  end
 
 end
 
diff --git a/app/models/trust_level3_requirements.rb b/app/models/trust_level3_requirements.rb
index 6307e563b07..ac63e5ae6aa 100644
--- a/app/models/trust_level3_requirements.rb
+++ b/app/models/trust_level3_requirements.rb
@@ -2,6 +2,19 @@
 # the Leader (3) trust level.
 class TrustLevel3Requirements
 
+  class PenaltyCounts
+    attr_reader :silenced, :suspended
+
+    def initialize(row)
+      @silenced = row['silence_count'] || 0
+      @suspended = row['suspend_count'] || 0
+    end
+
+    def total
+      @silenced + @suspended
+    end
+  end
+
   include ActiveModel::Serialization
 
   LOW_WATER_MARK = 0.9
@@ -26,36 +39,42 @@ class TrustLevel3Requirements
 
   def requirements_met?
     return false if trust_level_locked
-    !@user.suspended? &&
-    days_visited >= min_days_visited &&
-    num_topics_replied_to >= min_topics_replied_to &&
-    topics_viewed >= min_topics_viewed &&
-    posts_read >= min_posts_read &&
-    num_flagged_posts <= max_flagged_posts &&
-    num_flagged_by_users <= max_flagged_by_users &&
-    topics_viewed_all_time >= min_topics_viewed_all_time &&
-    posts_read_all_time >= min_posts_read_all_time &&
-    num_likes_given >= min_likes_given &&
-    num_likes_received >= min_likes_received &&
-    num_likes_received_users >= min_likes_received_users &&
-    num_likes_received_days >= min_likes_received_days
+
+    (!@user.suspended?) &&
+      (!@user.silenced?) &&
+      penalty_counts.total == 0 &&
+      days_visited >= min_days_visited &&
+      num_topics_replied_to >= min_topics_replied_to &&
+      topics_viewed >= min_topics_viewed &&
+      posts_read >= min_posts_read &&
+      num_flagged_posts <= max_flagged_posts &&
+      num_flagged_by_users <= max_flagged_by_users &&
+      topics_viewed_all_time >= min_topics_viewed_all_time &&
+      posts_read_all_time >= min_posts_read_all_time &&
+      num_likes_given >= min_likes_given &&
+      num_likes_received >= min_likes_received &&
+      num_likes_received_users >= min_likes_received_users &&
+      num_likes_received_days >= min_likes_received_days
   end
 
   def requirements_lost?
     return false if trust_level_locked
+
     @user.suspended? ||
-    days_visited < min_days_visited * LOW_WATER_MARK ||
-    num_topics_replied_to < min_topics_replied_to * LOW_WATER_MARK ||
-    topics_viewed < min_topics_viewed * LOW_WATER_MARK ||
-    posts_read < min_posts_read * LOW_WATER_MARK ||
-    num_flagged_posts > max_flagged_posts ||
-    num_flagged_by_users > max_flagged_by_users ||
-    topics_viewed_all_time < min_topics_viewed_all_time ||
-    posts_read_all_time < min_posts_read_all_time ||
-    num_likes_given < min_likes_given * LOW_WATER_MARK ||
-    num_likes_received < min_likes_received * LOW_WATER_MARK ||
-    num_likes_received_users < min_likes_received_users * LOW_WATER_MARK ||
-    num_likes_received_days < min_likes_received_days * LOW_WATER_MARK
+      @user.silenced? ||
+      penalty_counts.total > 0 ||
+      days_visited < min_days_visited * LOW_WATER_MARK ||
+      num_topics_replied_to < min_topics_replied_to * LOW_WATER_MARK ||
+      topics_viewed < min_topics_viewed * LOW_WATER_MARK ||
+      posts_read < min_posts_read * LOW_WATER_MARK ||
+      num_flagged_posts > max_flagged_posts ||
+      num_flagged_by_users > max_flagged_by_users ||
+      topics_viewed_all_time < min_topics_viewed_all_time ||
+      posts_read_all_time < min_posts_read_all_time ||
+      num_likes_given < min_likes_given * LOW_WATER_MARK ||
+      num_likes_received < min_likes_received * LOW_WATER_MARK ||
+      num_likes_received_users < min_likes_received_users * LOW_WATER_MARK ||
+      num_likes_received_days < min_likes_received_days * LOW_WATER_MARK
   end
 
   def time_period
@@ -74,6 +93,38 @@ class TrustLevel3Requirements
     @user.user_visits.where("visited_at > ? and posts_read > 0", time_period.days.ago).count
   end
 
+  def penalty_counts
+    args = {
+      user_id: @user.id,
+      silence_user: UserHistory.actions[:silence_user],
+      unsilence_user: UserHistory.actions[:unsilence_user],
+      suspend_user: UserHistory.actions[:suspend_user],
+      unsuspend_user: UserHistory.actions[:unsuspend_user]
+    }
+
+    sql = <<~SQL
+      SELECT SUM(
+          CASE
+            WHEN action = :silence_user THEN 1
+            WHEN action = :unsilence_user THEN -1
+            ELSE 0
+          END
+        ) AS silence_count,
+        SUM(
+          CASE
+            WHEN action = :suspend_user THEN 1
+            WHEN action = :unsuspend_user THEN -1
+            ELSE 0
+          END
+        ) AS suspend_count
+      FROM user_histories AS uh
+      WHERE uh.target_user_id = :user_id
+        AND uh.action IN (:silence_user, :unsilence_user, :suspend_user, :unsuspend_user)
+    SQL
+
+    PenaltyCounts.new(UserHistory.exec_sql(sql, args).first)
+  end
+
   def min_days_visited
     SiteSetting.tl3_requires_days_visited
   end
diff --git a/app/models/twitter_user_info.rb b/app/models/twitter_user_info.rb
index 42d4f4d83cf..a57608a4684 100644
--- a/app/models/twitter_user_info.rb
+++ b/app/models/twitter_user_info.rb
@@ -8,10 +8,11 @@ end
 #
 #  id              :integer          not null, primary key
 #  user_id         :integer          not null
-#  screen_name     :string(255)      not null
+#  screen_name     :string           not null
 #  twitter_user_id :integer          not null
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
+#  email           :string(1000)
 #
 # Indexes
 #
diff --git a/app/models/unsubscribe_key.rb b/app/models/unsubscribe_key.rb
index 6cc8b7f25f4..967d8f34a13 100644
--- a/app/models/unsubscribe_key.rb
+++ b/app/models/unsubscribe_key.rb
@@ -30,8 +30,8 @@ end
 #
 #  key                  :string(64)       not null, primary key
 #  user_id              :integer          not null
-#  created_at           :datetime
-#  updated_at           :datetime
+#  created_at           :datetime         not null
+#  updated_at           :datetime         not null
 #  unsubscribe_key_type :string
 #  topic_id             :integer
 #  post_id              :integer
diff --git a/app/models/upload.rb b/app/models/upload.rb
index 4d2e396a064..754e5d7f69a 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -17,6 +17,7 @@ class Upload < ActiveRecord::Base
   attr_accessor :for_group_message
   attr_accessor :for_theme
   attr_accessor :for_private_message
+  attr_accessor :for_export
 
   validates_presence_of :filesize
   validates_presence_of :original_filename
@@ -77,12 +78,16 @@ class Upload < ActiveRecord::Base
   def self.get_from_url(url)
     return if url.blank?
     # we store relative urls, so we need to remove any host/cdn
-    url = url.sub(Discourse.asset_host, "") if Discourse.asset_host.present?
+    url = url.sub(Discourse.asset_host, "") if Discourse.asset_host.present? && Discourse.asset_host != SiteSetting.Upload.s3_cdn_url
     # when using s3, we need to replace with the absolute base url
     url = url.sub(SiteSetting.Upload.s3_cdn_url, Discourse.store.absolute_base_url) if SiteSetting.Upload.s3_cdn_url.present?
 
     # always try to get the path
-    uri = URI(url) rescue nil
+    uri = begin
+      URI(URI.unescape(url))
+    rescue URI::InvalidURIError, URI::InvalidComponentError
+    end
+
     url = uri.path if uri.try(:scheme)
 
     Upload.find_by(url: url)
@@ -96,7 +101,7 @@ class Upload < ActiveRecord::Base
       local_store = FileStore::LocalStore.new
 
       scope = Upload.where("url NOT LIKE '%/original/_X/%'").order(id: :desc)
-      scope.limit(limit) if limit
+      scope = scope.limit(limit) if limit
 
       scope.each do |upload|
         begin
@@ -134,13 +139,13 @@ class Upload < ActiveRecord::Base
           DbHelper.remap(previous_url, upload.url)
           # remove the old file (when local)
           unless external
-            FileUtils.rm(path, force: true) rescue nil
+            FileUtils.rm(path, force: true)
           end
         rescue => e
           problems << { upload: upload, ex: e }
         ensure
-          file.try(:unlink) rescue nil
-          file.try(:close) rescue nil
+          file&.unlink
+          file&.close
         end
       end
     end
@@ -156,11 +161,11 @@ end
 #
 #  id                :integer          not null, primary key
 #  user_id           :integer          not null
-#  original_filename :string(255)      not null
+#  original_filename :string           not null
 #  filesize          :integer          not null
 #  width             :integer
 #  height            :integer
-#  url               :string(255)      not null
+#  url               :string           not null
 #  created_at        :datetime         not null
 #  updated_at        :datetime         not null
 #  sha1              :string(40)
diff --git a/app/models/user.rb b/app/models/user.rb
index 28dc1e85522..90f5064c8f4 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -18,6 +18,7 @@ class User < ActiveRecord::Base
   include Searchable
   include Roleable
   include HasCustomFields
+  include SecondFactorManager
 
   # TODO: Remove this after 7th Jan 2018
   self.ignored_columns = %w{email}
@@ -49,6 +50,11 @@ class User < ActiveRecord::Base
   has_many :email_change_requests, dependent: :destroy
   has_many :directory_items, dependent: :delete_all
   has_many :user_auth_tokens, dependent: :destroy
+
+  has_many :group_users, dependent: :destroy
+  has_many :groups, through: :group_users
+  has_many :secure_categories, through: :groups, source: :categories
+
   has_many :user_emails, dependent: :destroy
 
   has_one :primary_email, -> { where(primary: true)  }, class_name: 'UserEmail', dependent: :destroy
@@ -60,21 +66,21 @@ class User < ActiveRecord::Base
   has_one :github_user_info, dependent: :destroy
   has_one :google_user_info, dependent: :destroy
   has_one :oauth2_user_info, dependent: :destroy
+  has_one :instagram_user_info, dependent: :destroy
+  has_one :user_second_factor, dependent: :destroy
   has_one :user_stat, dependent: :destroy
   has_one :user_profile, dependent: :destroy, inverse_of: :user
   has_one :single_sign_on_record, dependent: :destroy
   belongs_to :approved_by, class_name: 'User'
   belongs_to :primary_group, class_name: 'Group'
 
-  has_many :group_users, dependent: :destroy
-  has_many :groups, through: :group_users
-  has_many :secure_categories, through: :groups, source: :categories
-
   has_many :muted_user_records, class_name: 'MutedUser'
   has_many :muted_users, through: :muted_user_records
 
   has_one :api_key, dependent: :destroy
 
+  has_many :push_subscriptions, dependent: :destroy
+
   belongs_to :uploaded_avatar, class_name: 'Upload'
 
   has_many :acting_group_histories, dependent: :destroy, foreign_key: :acting_user_id, class_name: 'GroupHistory'
@@ -130,7 +136,9 @@ class User < ActiveRecord::Base
   # set to true to optimize creation and save for imports
   attr_accessor :import_mode
 
-  scope :with_email, ->(email) { joins(:user_emails).where(user_emails: { email: email }) }
+  scope :with_email, ->(email) do
+    joins(:user_emails).where("lower(user_emails.email) IN (?)", email)
+  end
 
   scope :human_users, -> { where('users.id > 0') }
 
@@ -153,6 +161,37 @@ class User < ActiveRecord::Base
   scope :not_suspended, -> { where('suspended_till IS NULL OR suspended_till <= ?', Time.zone.now) }
   scope :activated, -> { where(active: true) }
 
+  scope :filter_by_username, ->(filter) do
+    if filter.is_a?(Array)
+      where('username_lower ~* ?', "(#{filter.join('|')})")
+    else
+      where('username_lower ILIKE ?', "%#{filter}%")
+    end
+  end
+
+  scope :filter_by_username_or_email, ->(filter) do
+    if filter =~ /.+@.+/
+      # probably an email so try the bypass
+      if user_id = UserEmail.where("lower(email) = ?", filter.downcase).pluck(:user_id).first
+        return where('users.id = ?', user_id)
+      end
+    end
+
+    users = joins(:primary_email)
+
+    if filter.is_a?(Array)
+      users.where(
+        'username_lower ~* :filter OR lower(user_emails.email) SIMILAR TO :filter',
+        filter: "(#{filter.join('|')})"
+      )
+    else
+      users.where(
+        'username_lower ILIKE :filter OR lower(user_emails.email) ILIKE :filter',
+        filter: "%#{filter}%"
+      )
+    end
+  end
+
   module NewTopicDuration
     ALWAYS = -1
     LAST_VISIT = -2
@@ -169,7 +208,8 @@ class User < ActiveRecord::Base
   def self.username_available?(username, email = nil)
     lower = username.downcase
     return false if reserved_username?(lower)
-    return true  if !User.exists?(username_lower: lower)
+    return true  if User.exec_sql(User::USERNAME_EXISTS_SQL, username: lower).count == 0
+
     # staged users can use the same username since they will take over the account
     email.present? && User.joins(:user_emails).exists?(staged: true, username_lower: lower, user_emails: { primary: true, email: email })
   end
@@ -218,6 +258,7 @@ class User < ActiveRecord::Base
   end
 
   EMAIL = %r{([^@]+)@([^\.]+)}
+  FROM_STAGED = "from_staged".freeze
 
   def self.new_from_params(params)
     user = User.new
@@ -228,9 +269,27 @@ class User < ActiveRecord::Base
     user
   end
 
-  def self.suggest_name(email)
-    return "" if email.blank?
-    email[/\A[^@]+/].tr(".", " ").titleize
+  def unstage
+    if self.staged
+      self.staged = false
+      self.custom_fields[FROM_STAGED] = true
+      self.notifications.destroy_all
+      DiscourseEvent.trigger(:user_unstaged, self)
+    end
+  end
+
+  def self.unstage(params)
+    if user = User.where(staged: true).with_email(params[:email].strip.downcase).first
+      params.each { |k, v| user.send("#{k}=", v) }
+      user.active = false
+      user.unstage
+    end
+    user
+  end
+
+  def self.suggest_name(string)
+    return "" if string.blank?
+    (string[/\A[^@]+/].presence || string[/[^@]+\z/]).tr(".", " ").titleize
   end
 
   def self.find_by_username_or_email(username_or_email)
@@ -318,14 +377,15 @@ class User < ActiveRecord::Base
 
   def unread_notifications_of_type(notification_type)
     # perf critical, much more efficient than AR
-    sql = "
-       SELECT COUNT(*) FROM notifications n
-       LEFT JOIN topics t ON n.topic_id = t.id
-       WHERE
-        t.deleted_at IS NULL AND
-        n.notification_type = :type AND
-        n.user_id = :user_id AND
-        NOT read"
+    sql = <<~SQL
+        SELECT COUNT(*)
+          FROM notifications n
+     LEFT JOIN topics t ON t.id = n.topic_id
+         WHERE t.deleted_at IS NULL
+           AND n.notification_type = :type
+           AND n.user_id = :user_id
+           AND NOT read
+    SQL
 
     User.exec_sql(sql, user_id: id, type: notification_type).getvalue(0, 0).to_i
   end
@@ -335,24 +395,25 @@ class User < ActiveRecord::Base
   end
 
   def unread_notifications
-    @unread_notifications ||=
-      begin
-        # perf critical, much more efficient than AR
-        sql = "
-           SELECT COUNT(*) FROM notifications n
-           LEFT JOIN topics t ON n.topic_id = t.id
-           WHERE
-            t.deleted_at IS NULL AND
-            n.notification_type <> :pm AND
-            n.user_id = :user_id AND
-            NOT read AND
-            n.id > :seen_notification_id"
+    @unread_notifications ||= begin
+      # perf critical, much more efficient than AR
+      sql = <<~SQL
+          SELECT COUNT(*)
+            FROM notifications n
+       LEFT JOIN topics t ON t.id = n.topic_id
+           WHERE t.deleted_at IS NULL
+             AND n.notification_type <> :pm
+             AND n.user_id = :user_id
+             AND n.id > :seen_notification_id
+             AND NOT read
+      SQL
 
-        User.exec_sql(sql, user_id: id,
-                           seen_notification_id: seen_notification_id,
-                           pm:  Notification.types[:private_message])
-          .getvalue(0, 0).to_i
-      end
+      User.exec_sql(sql,
+        user_id: id,
+        seen_notification_id: seen_notification_id,
+        pm:  Notification.types[:private_message]
+    ).getvalue(0, 0).to_i
+    end
   end
 
   def total_unread_notifications
@@ -372,7 +433,7 @@ class User < ActiveRecord::Base
 
   def read_first_notification?
     if (trust_level > TrustLevel[1] ||
-        created_at < TRACK_FIRST_NOTIFICATION_READ_DURATION.seconds.ago)
+        (first_seen_at.present? && first_seen_at < TRACK_FIRST_NOTIFICATION_READ_DURATION.seconds.ago))
 
       return true
     end
@@ -381,8 +442,7 @@ class User < ActiveRecord::Base
   end
 
   def publish_notifications_state
-    # publish last notification json with the message so we
-    # can apply an update
+    # publish last notification json with the message so we can apply an update
     notification = notifications.visible.order('notifications.id desc').first
     json = NotificationSerializer.new(notification).as_json if notification
 
@@ -418,17 +478,17 @@ class User < ActiveRecord::Base
       [id.to_i, read]
     end
 
-    MessageBus.publish("/notification/#{id}",
-                       { unread_notifications: unread_notifications,
-                         unread_private_messages: unread_private_messages,
-                         total_unread_notifications: total_unread_notifications,
-                         read_first_notification: read_first_notification?,
-                         last_notification: json,
-                         recent: recent,
-                         seen_notification_id: seen_notification_id
-                       },
-                       user_ids: [id] # only publish the notification to this user
-    )
+    payload = {
+      unread_notifications: unread_notifications,
+      unread_private_messages: unread_private_messages,
+      total_unread_notifications: total_unread_notifications,
+      read_first_notification: read_first_notification?,
+      last_notification: json,
+      recent: recent,
+      seen_notification_id: seen_notification_id,
+    }
+
+    MessageBus.publish("/notification/#{id}", payload, user_ids: [id])
   end
 
   # A selection of people to autocomplete on @mention
@@ -724,12 +784,15 @@ class User < ActiveRecord::Base
   end
 
   def email_confirmed?
-    email_tokens.where(email: email, confirmed: true).present? || email_tokens.empty?
+    email_tokens.where(email: email, confirmed: true).present? ||
+    email_tokens.empty? ||
+    single_sign_on_record&.external_email == email
   end
 
   def activate
     if email_token = self.email_tokens.active.where(email: self.email).first
-      EmailToken.confirm(email_token.token)
+      user = EmailToken.confirm(email_token.token)
+      self.update!(active: true) if user.nil?
     else
       self.update!(active: true)
     end
@@ -744,8 +807,7 @@ class User < ActiveRecord::Base
   end
 
   def readable_name
-    return "#{name} (#{username})" if name.present? && name != username
-    username
+    name.present? && name != username ? "#{name} (#{username})" : username
   end
 
   def badge_count
@@ -776,14 +838,33 @@ class User < ActiveRecord::Base
     (tl_badge + other_badges).take(limit)
   end
 
-  def self.count_by_signup_date(start_date, end_date, group_id = nil)
-    result = where('users.created_at >= ? AND users.created_at <= ?', start_date, end_date)
+  def self.count_by_signup_date(start_date = nil, end_date = nil, group_id = nil)
+    result = self
+
+    if start_date && end_date
+      result = result.group("date(users.created_at)")
+      result = result.where("users.created_at >= ? AND users.created_at <= ?", start_date, end_date)
+      result = result.order('date(users.created_at)')
+    end
 
     if group_id
       result = result.joins("INNER JOIN group_users ON group_users.user_id = users.id")
       result = result.where("group_users.group_id = ?", group_id)
     end
-    result.group('date(users.created_at)').order('date(users.created_at)').count
+
+    result.count
+  end
+
+  def self.count_by_first_post(start_date = nil, end_date = nil)
+    result = joins('INNER JOIN user_stats AS us ON us.user_id = users.id')
+
+    if start_date && end_date
+      result = result.group("date(us.first_post_created_at)")
+      result = result.where("us.first_post_created_at > ? AND us.first_post_created_at < ?", start_date, end_date)
+      result = result.order("date(us.first_post_created_at)")
+    end
+
+    result.count
   end
 
   def secure_category_ids
@@ -870,7 +951,8 @@ class User < ActiveRecord::Base
     result << "Twitter(#{twitter_user_info.screen_name})"               if twitter_user_info
     result << "Facebook(#{facebook_user_info.username})"                if facebook_user_info
     result << "Google(#{google_user_info.email})"                       if google_user_info
-    result << "Github(#{github_user_info.screen_name})"                 if github_user_info
+    result << "GitHub(#{github_user_info.screen_name})"                 if github_user_info
+    result << "Instagram(#{instagram_user_info.screen_name})"           if instagram_user_info
     result << "#{oauth2_user_info.provider}(#{oauth2_user_info.email})" if oauth2_user_info
 
     user_open_ids.each do |oid|
@@ -954,7 +1036,7 @@ class User < ActiveRecord::Base
   end
 
   def set_automatic_groups
-    return unless active && email_confirmed? && !staged
+    return if !active || staged || !email_confirmed?
 
     Group.where(automatic: false)
       .where("LENGTH(COALESCE(automatic_membership_email_domains, '')) > 0")
@@ -973,11 +1055,11 @@ class User < ActiveRecord::Base
     primary_email.email
   end
 
-  def email=(email)
+  def email=(new_email)
     if primary_email
-      new_record? ? primary_email.email = email : primary_email.update(email: email)
+      new_record? ? primary_email.email = new_email : primary_email.update(email: new_email)
     else
-      build_primary_email(email: email)
+      self.primary_email = UserEmail.new(email: new_email, user: self, primary: true)
     end
   end
 
@@ -987,6 +1069,10 @@ class User < ActiveRecord::Base
       self.user_stat&.time_read
   end
 
+  def from_staged?
+    custom_fields[User::FROM_STAGED]
+  end
+
   protected
 
   def badge_grant
@@ -1064,11 +1150,25 @@ class User < ActiveRecord::Base
     self.username_lower = username.downcase
   end
 
+  USERNAME_EXISTS_SQL = <<~SQL
+  (SELECT users.id AS user_id FROM users
+  WHERE users.username_lower = :username)
+
+  UNION ALL
+
+  (SELECT groups.id AS group_id FROM groups
+  WHERE lower(groups.name) = :username)
+  SQL
+
   def username_validator
     username_format_validator || begin
       lower = username.downcase
-      existing = User.find_by(username_lower: lower)
-      if will_save_change_to_username? && existing && existing.id != self.id
+
+      existing = User.exec_sql(
+        USERNAME_EXISTS_SQL, username: lower
+      ).to_a.first
+
+      if will_save_change_to_username? && existing.present? && existing["user_id"] != self.id
         errors.add(:username, I18n.t(:'user.username.unique'))
       end
     end
@@ -1078,8 +1178,7 @@ class User < ActiveRecord::Base
     if SiteSetting.must_approve_users
       Jobs.enqueue(:critical_user_email,
         type: :signup_after_approval,
-        user_id: id,
-        email_token: email_tokens.first.token
+        user_id: id
       )
     end
   end
@@ -1101,22 +1200,22 @@ class User < ActiveRecord::Base
     end
   end
 
-  # Delete unactivated accounts (without verified email) that are over a week old
   def self.purge_unactivated
     return [] if SiteSetting.purge_unactivated_users_grace_period_days <= 0
 
-    to_destroy = User.where(active: false)
-      .joins('INNER JOIN user_stats AS us ON us.user_id = users.id')
-      .where("created_at < ?", SiteSetting.purge_unactivated_users_grace_period_days.days.ago)
-      .where('NOT admin AND NOT moderator')
-      .limit(200)
-
     destroyer = UserDestroyer.new(Discourse.system_user)
-    to_destroy.each do |u|
+
+    User
+      .where(active: false)
+      .where("created_at < ?", SiteSetting.purge_unactivated_users_grace_period_days.days.ago)
+      .where("NOT admin AND NOT moderator")
+      .where("NOT EXISTS (SELECT 1 FROM topic_allowed_users WHERE user_id = users.id LIMIT 1)")
+      .limit(200)
+      .find_each do |user|
       begin
-        destroyer.destroy(u, context: I18n.t(:purge_reason))
+        destroyer.destroy(user, context: I18n.t(:purge_reason))
       rescue Discourse::InvalidAccess, UserDestroyer::PostsExistError
-        # if for some reason the user can't be deleted, continue on to the next one
+        # keep going
       end
     end
   end
@@ -1157,7 +1256,7 @@ end
 #  username                  :string(60)       not null
 #  created_at                :datetime         not null
 #  updated_at                :datetime         not null
-#  name                      :string(255)
+#  name                      :string
 #  seen_notification_id      :integer          default(0), not null
 #  last_posted_at            :datetime
 #  password_hash             :string(64)
@@ -1179,10 +1278,10 @@ end
 #  flag_level                :integer          default(0), not null
 #  ip_address                :inet
 #  moderator                 :boolean          default(FALSE)
-#  title                     :string(255)
+#  title                     :string
 #  uploaded_avatar_id        :integer
-#  primary_group_id          :integer
 #  locale                    :string(10)
+#  primary_group_id          :integer
 #  registration_ip_address   :inet
 #  staged                    :boolean          default(FALSE), not null
 #  first_seen_at             :datetime
diff --git a/app/models/user_action.rb b/app/models/user_action.rb
index 02123a1d444..f36c034b0ec 100644
--- a/app/models/user_action.rb
+++ b/app/models/user_action.rb
@@ -1,4 +1,5 @@
 class UserAction < ActiveRecord::Base
+
   belongs_to :user
   belongs_to :target_post, class_name: "Post"
   belongs_to :target_topic, class_name: "Topic"
@@ -119,6 +120,20 @@ SQL
 
   end
 
+  def self.count_daily_engaged_users(start_date = nil, end_date = nil)
+    result = select(:user_id)
+      .distinct
+      .where(action_type: [LIKE, NEW_TOPIC, REPLY, NEW_PRIVATE_MESSAGE])
+
+    if start_date && end_date
+      result = result.group('date(created_at)')
+      result = result.where('created_at > ? AND created_at < ?', start_date, end_date)
+      result = result.order('date(created_at)')
+    end
+
+    result.count
+  end
+
   def self.stream_item(action_id, guardian)
     stream(action_id: action_id, guardian: guardian).first
   end
@@ -197,6 +212,7 @@ SQL
         p.hidden,
         p.post_type,
         p.action_code,
+        pc.value AS action_code_who,
         p.edit_reason,
         t.category_id
       FROM user_actions as a
@@ -207,6 +223,7 @@ SQL
       JOIN users pu on pu.id = COALESCE(p.user_id, t.user_id)
       JOIN users au on au.id = a.user_id
       LEFT JOIN categories c on c.id = t.category_id
+      LEFT JOIN post_custom_fields pc ON pc.post_id = a.target_post_id AND pc.name = 'action_code_who'
       /*where*/
       /*order_by*/
       /*offset*/
@@ -428,9 +445,9 @@ end
 #
 # Indexes
 #
-#  idx_unique_rows                           (action_type,user_id,target_topic_id,target_post_id,acting_user_id) UNIQUE
-#  idx_user_actions_speed_up_user_all        (user_id,created_at,action_type)
-#  index_actions_on_acting_user_id           (acting_user_id)
-#  index_actions_on_user_id_and_action_type  (user_id,action_type)
-#  index_user_actions_on_target_post_id      (target_post_id)
+#  idx_unique_rows                                (action_type,user_id,target_topic_id,target_post_id,acting_user_id) UNIQUE
+#  idx_user_actions_speed_up_user_all             (user_id,created_at,action_type)
+#  index_user_actions_on_acting_user_id           (acting_user_id)
+#  index_user_actions_on_target_post_id           (target_post_id)
+#  index_user_actions_on_user_id_and_action_type  (user_id,action_type)
 #
diff --git a/app/models/user_api_key.rb b/app/models/user_api_key.rb
index 39f8d4a80f9..dc1edca2d60 100644
--- a/app/models/user_api_key.rb
+++ b/app/models/user_api_key.rb
@@ -70,8 +70,8 @@ end
 #  key              :string           not null
 #  application_name :string           not null
 #  push_url         :string
-#  created_at       :datetime
-#  updated_at       :datetime
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
 #  revoked_at       :datetime
 #  scopes           :text             default([]), not null, is an Array
 #
diff --git a/app/models/user_archived_message.rb b/app/models/user_archived_message.rb
index 36c3ccd1ac4..1edd3863c48 100644
--- a/app/models/user_archived_message.rb
+++ b/app/models/user_archived_message.rb
@@ -2,7 +2,9 @@ class UserArchivedMessage < ActiveRecord::Base
   belongs_to :user
   belongs_to :topic
 
-  def self.move_to_inbox!(user_id, topic_id)
+  def self.move_to_inbox!(user_id, topic)
+    topic_id = topic.id
+
     return if (TopicUser.where(
       user_id: user_id,
       topic_id: topic_id,
@@ -12,13 +14,16 @@ class UserArchivedMessage < ActiveRecord::Base
     UserArchivedMessage.where(user_id: user_id, topic_id: topic_id).destroy_all
     trigger(:move_to_inbox, user_id, topic_id)
     MessageBus.publish("/topic/#{topic_id}", { type: "move_to_inbox" }, user_ids: [user_id])
+    publish_topic_tracking_state(topic, user_id)
   end
 
-  def self.archive!(user_id, topic_id)
+  def self.archive!(user_id, topic)
+    topic_id = topic.id
     UserArchivedMessage.where(user_id: user_id, topic_id: topic_id).destroy_all
     UserArchivedMessage.create!(user_id: user_id, topic_id: topic_id)
     trigger(:archive_message, user_id, topic_id)
     MessageBus.publish("/topic/#{topic_id}", { type: "archived" }, user_ids: [user_id])
+    publish_topic_tracking_state(topic, user_id)
   end
 
   def self.trigger(event, user_id, topic_id)
@@ -28,6 +33,14 @@ class UserArchivedMessage < ActiveRecord::Base
       DiscourseEvent.trigger(event, user: user, topic: topic)
     end
   end
+
+  private
+
+    def self.publish_topic_tracking_state(topic, user_id)
+      TopicTrackingState.publish_private_message(
+        topic, archive_user_id: user_id
+      )
+    end
 end
 
 # == Schema Information
@@ -37,8 +50,8 @@ end
 #  id         :integer          not null, primary key
 #  user_id    :integer          not null
 #  topic_id   :integer          not null
-#  created_at :datetime
-#  updated_at :datetime
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
 #
 # Indexes
 #
diff --git a/app/models/user_auth_token.rb b/app/models/user_auth_token.rb
index 5597d523679..57eeaca8882 100644
--- a/app/models/user_auth_token.rb
+++ b/app/models/user_auth_token.rb
@@ -4,6 +4,9 @@ require 'digest/sha1'
 class UserAuthToken < ActiveRecord::Base
   belongs_to :user
 
+  # TODO 2019: remove this line
+  self.ignored_columns = ["legacy"]
+
   ROTATE_TIME = 10.minutes
   # used when token did not arrive at client
   URGENT_ROTATE_TIME = 1.minute
@@ -48,9 +51,8 @@ class UserAuthToken < ActiveRecord::Base
     expire_before = SiteSetting.maximum_session_age.hours.ago
 
     user_token = find_by("(auth_token = :token OR
-                          prev_auth_token = :token OR
-                          (auth_token = :unhashed_token AND legacy)) AND rotated_at > :expire_before",
-                          token: token, unhashed_token: unhashed_token, expire_before: expire_before)
+                          prev_auth_token = :token) AND rotated_at > :expire_before",
+                          token: token, expire_before: expire_before)
 
     if !user_token
 
@@ -180,11 +182,10 @@ end
 #  prev_auth_token :string           not null
 #  user_agent      :string
 #  auth_token_seen :boolean          default(FALSE), not null
-#  legacy          :boolean          default(FALSE), not null
 #  client_ip       :inet
 #  rotated_at      :datetime         not null
-#  created_at      :datetime
-#  updated_at      :datetime
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
 #  seen_at         :datetime
 #
 # Indexes
diff --git a/app/models/user_avatar.rb b/app/models/user_avatar.rb
index a247bb47529..4774df14f32 100644
--- a/app/models/user_avatar.rb
+++ b/app/models/user_avatar.rb
@@ -35,7 +35,7 @@ class UserAvatar < ActiveRecord::Base
           upload = UploadCreator.new(tempfile, 'gravatar.png', origin: gravatar_url, type: "avatar").create_for(user_id)
 
           if gravatar_upload_id != upload.id
-            gravatar_upload.try(:destroy!) rescue nil
+            gravatar_upload&.destroy!
             self.gravatar_upload = upload
             save!
           end
diff --git a/app/models/user_badge.rb b/app/models/user_badge.rb
index 71a065e0e0b..53979ec9cf8 100644
--- a/app/models/user_badge.rb
+++ b/app/models/user_badge.rb
@@ -49,4 +49,5 @@ end
 #  index_user_badges_on_badge_id_and_user_id              (badge_id,user_id)
 #  index_user_badges_on_badge_id_and_user_id_and_post_id  (badge_id,user_id,post_id) UNIQUE
 #  index_user_badges_on_badge_id_and_user_id_and_seq      (badge_id,user_id,seq) UNIQUE
+#  index_user_badges_on_user_id                           (user_id)
 #
diff --git a/app/models/user_email.rb b/app/models/user_email.rb
index 426d2fe8289..101eddcd5c5 100644
--- a/app/models/user_email.rb
+++ b/app/models/user_email.rb
@@ -7,12 +7,13 @@ class UserEmail < ActiveRecord::Base
 
   before_validation :strip_downcase_email
 
-  validates :email, presence: true, uniqueness: true
-
+  validates :email, presence: true
   validates :email, email: true, format: { with: EmailValidator.email_regex },
                     if: :validate_email?
 
-  validates :primary, uniqueness: { scope: [:user_id] }
+  validates :primary, uniqueness: { scope: [:user_id] }, if: :user_id
+  validate :user_id_not_changed, if: :primary
+  validate :unique_email
 
   private
 
@@ -27,6 +28,20 @@ class UserEmail < ActiveRecord::Base
     return false if self.skip_validate_email
     email_changed?
   end
+
+  def unique_email
+    if self.will_save_change_to_email? && self.class.where("lower(email) = ?", email).exists?
+      self.errors.add(:email, :taken)
+    end
+  end
+
+  def user_id_not_changed
+    if self.will_save_change_to_user_id? && self.persisted?
+      self.errors.add(:user_id, I18n.t(
+        'active_record.errors.model.user_email.attributes.user_id.reassigning_primary_email')
+      )
+    end
+  end
 end
 
 # == Schema Information
@@ -37,8 +52,8 @@ end
 #  user_id    :integer          not null
 #  email      :string(513)      not null
 #  primary    :boolean          default(FALSE), not null
-#  created_at :datetime
-#  updated_at :datetime
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
 #
 # Indexes
 #
diff --git a/app/models/user_export.rb b/app/models/user_export.rb
index 20269d9b926..10314c029b5 100644
--- a/app/models/user_export.rb
+++ b/app/models/user_export.rb
@@ -1,10 +1,5 @@
 class UserExport < ActiveRecord::Base
 
-  def self.get_download_path(filename)
-    path = File.join(UserExport.base_directory, filename)
-    File.exists?(path) ? path : nil
-  end
-
   def self.remove_old_exports
     UserExport.where('created_at < ?', 2.days.ago).find_each do |expired_export|
       file_name = "#{expired_export.file_name}-#{expired_export.id}.csv.gz"
@@ -26,8 +21,9 @@ end
 # Table name: user_exports
 #
 #  id         :integer          not null, primary key
-#  file_name  :string(255)      not null
+#  file_name  :string           not null
 #  user_id    :integer          not null
-#  created_at :datetime
-#  updated_at :datetime
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#  upload_id  :integer
 #
diff --git a/app/models/user_field.rb b/app/models/user_field.rb
index 6183f63401a..77c1f3383de 100644
--- a/app/models/user_field.rb
+++ b/app/models/user_field.rb
@@ -16,12 +16,12 @@ end
 # Table name: user_fields
 #
 #  id                :integer          not null, primary key
-#  name              :string(255)      not null
-#  field_type        :string(255)      not null
-#  created_at        :datetime
-#  updated_at        :datetime
+#  name              :string           not null
+#  field_type        :string           not null
+#  created_at        :datetime         not null
+#  updated_at        :datetime         not null
 #  editable          :boolean          default(FALSE), not null
-#  description       :string(255)      not null
+#  description       :string           not null
 #  required          :boolean          default(TRUE), not null
 #  show_on_profile   :boolean          default(FALSE), not null
 #  position          :integer          default(0)
diff --git a/app/models/user_field_option.rb b/app/models/user_field_option.rb
index 2b3036fa40d..a4412553425 100644
--- a/app/models/user_field_option.rb
+++ b/app/models/user_field_option.rb
@@ -7,7 +7,7 @@ end
 #
 #  id            :integer          not null, primary key
 #  user_field_id :integer          not null
-#  value         :string(255)      not null
-#  created_at    :datetime
-#  updated_at    :datetime
+#  value         :string           not null
+#  created_at    :datetime         not null
+#  updated_at    :datetime         not null
 #
diff --git a/app/models/user_history.rb b/app/models/user_history.rb
index d2f7f25a947..f500d831793 100644
--- a/app/models/user_history.rb
+++ b/app/models/user_history.rb
@@ -16,95 +16,129 @@ class UserHistory < ActiveRecord::Base
   before_save :set_admin_only
 
   def self.actions
-    @actions ||= Enum.new(delete_user: 1,
-                          change_trust_level: 2,
-                          change_site_setting: 3,
-                          change_theme: 4,
-                          delete_theme: 5,
-                          checked_for_custom_avatar: 6, # not used anymore
-                          notified_about_avatar: 7,
-                          notified_about_sequential_replies: 8,
-                          notified_about_dominating_topic: 9,
-                          suspend_user: 10,
-                          unsuspend_user: 11,
-                          facebook_no_email: 12,
-                          grant_badge: 13,
-                          revoke_badge: 14,
-                          auto_trust_level_change: 15,
-                          check_email: 16,
-                          delete_post: 17,
-                          delete_topic: 18,
-                          impersonate: 19,
-                          roll_up: 20,
-                          change_username: 21,
-                          custom: 22,
-                          custom_staff: 23,
-                          anonymize_user: 24,
-                          reviewed_post: 25,
-                          change_category_settings: 26,
-                          delete_category: 27,
-                          create_category: 28,
-                          change_site_text: 29,
-                          silence_user: 30,
-                          unsilence_user: 31,
-                          grant_admin: 32,
-                          revoke_admin: 33,
-                          grant_moderation: 34,
-                          revoke_moderation: 35,
-                          backup_create: 36,
-                          rate_limited_like: 37, # not used anymore
-                          revoke_email: 38,
-                          deactivate_user: 39,
-                          wizard_step: 40,
-                          lock_trust_level: 41,
-                          unlock_trust_level: 42,
-                          activate_user: 43,
-                          change_readonly_mode: 44,
-                          backup_download: 45,
-                          backup_destroy: 46,
-                          notified_about_get_a_room: 47,
-                          change_name: 48)
+    @actions ||= Enum.new(
+      delete_user: 1,
+      change_trust_level: 2,
+      change_site_setting: 3,
+      change_theme: 4,
+      delete_theme: 5,
+      checked_for_custom_avatar: 6, # not used anymore
+      notified_about_avatar: 7,
+      notified_about_sequential_replies: 8,
+      notified_about_dominating_topic: 9,
+      suspend_user: 10,
+      unsuspend_user: 11,
+      facebook_no_email: 12,
+      grant_badge: 13,
+      revoke_badge: 14,
+      auto_trust_level_change: 15,
+      check_email: 16,
+      delete_post: 17,
+      delete_topic: 18,
+      impersonate: 19,
+      roll_up: 20,
+      change_username: 21,
+      custom: 22,
+      custom_staff: 23,
+      anonymize_user: 24,
+      reviewed_post: 25,
+      change_category_settings: 26,
+      delete_category: 27,
+      create_category: 28,
+      change_site_text: 29,
+      silence_user: 30,
+      unsilence_user: 31,
+      grant_admin: 32,
+      revoke_admin: 33,
+      grant_moderation: 34,
+      revoke_moderation: 35,
+      backup_create: 36,
+      rate_limited_like: 37, # not used anymore
+      revoke_email: 38,
+      deactivate_user: 39,
+      wizard_step: 40,
+      lock_trust_level: 41,
+      unlock_trust_level: 42,
+      activate_user: 43,
+      change_readonly_mode: 44,
+      backup_download: 45,
+      backup_destroy: 46,
+      notified_about_get_a_room: 47,
+      change_name: 48,
+      post_locked: 49,
+      post_unlocked: 50,
+      check_personal_message: 51,
+      disabled_second_factor: 52,
+      post_edit: 53,
+      topic_published: 54,
+      recover_topic: 55,
+      post_approved: 56,
+      create_badge: 57,
+      change_badge: 58,
+      delete_badge: 59,
+      removed_silence_user: 60,
+      removed_suspend_user: 61,
+      removed_unsilence_user: 62,
+      removed_unsuspend_user: 63,
+    )
   end
 
   # Staff actions is a subset of all actions, used to audit actions taken by staff users.
   def self.staff_actions
-    @staff_actions ||= [:delete_user,
-                        :change_trust_level,
-                        :change_site_setting,
-                        :change_theme,
-                        :delete_theme,
-                        :change_site_text,
-                        :suspend_user,
-                        :unsuspend_user,
-                        :grant_badge,
-                        :revoke_badge,
-                        :check_email,
-                        :delete_post,
-                        :delete_topic,
-                        :impersonate,
-                        :roll_up,
-                        :change_username,
-                        :custom_staff,
-                        :anonymize_user,
-                        :reviewed_post,
-                        :change_category_settings,
-                        :delete_category,
-                        :create_category,
-                        :silence_user,
-                        :unsilence_user,
-                        :grant_admin,
-                        :revoke_admin,
-                        :grant_moderation,
-                        :revoke_moderation,
-                        :backup_create,
-                        :revoke_email,
-                        :deactivate_user,
-                        :lock_trust_level,
-                        :unlock_trust_level,
-                        :activate_user,
-                        :change_readonly_mode,
-                        :backup_download,
-                        :backup_destroy]
+    @staff_actions ||= [
+      :delete_user,
+      :change_trust_level,
+      :change_site_setting,
+      :change_theme,
+      :delete_theme,
+      :change_site_text,
+      :suspend_user,
+      :unsuspend_user,
+      :removed_suspend_user,
+      :removed_unsuspend_user,
+      :grant_badge,
+      :revoke_badge,
+      :check_email,
+      :delete_post,
+      :delete_topic,
+      :impersonate,
+      :roll_up,
+      :change_username,
+      :custom_staff,
+      :anonymize_user,
+      :reviewed_post,
+      :change_category_settings,
+      :delete_category,
+      :create_category,
+      :silence_user,
+      :unsilence_user,
+      :removed_silence_user,
+      :removed_unsilence_user,
+      :grant_admin,
+      :revoke_admin,
+      :grant_moderation,
+      :revoke_moderation,
+      :backup_create,
+      :revoke_email,
+      :deactivate_user,
+      :lock_trust_level,
+      :unlock_trust_level,
+      :activate_user,
+      :change_readonly_mode,
+      :backup_download,
+      :backup_destroy,
+      :post_locked,
+      :post_unlocked,
+      :check_personal_message,
+      :disabled_second_factor,
+      :post_edit,
+      :topic_published,
+      :recover_topic,
+      :post_approved,
+      :create_badge,
+      :change_badge,
+      :delete_badge,
+    ]
   end
 
   def self.staff_action_ids
@@ -176,23 +210,23 @@ end
 #  details        :text
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null
-#  context        :string(255)
-#  ip_address     :string(255)
-#  email          :string(255)
+#  context        :string
+#  ip_address     :string
+#  email          :string
 #  subject        :text
 #  previous_value :text
 #  new_value      :text
 #  topic_id       :integer
 #  admin_only     :boolean          default(FALSE)
 #  post_id        :integer
-#  custom_type    :string(255)
+#  custom_type    :string
 #  category_id    :integer
 #
 # Indexes
 #
-#  index_staff_action_logs_on_action_and_id                  (action,id)
-#  index_staff_action_logs_on_subject_and_id                 (subject,id)
-#  index_staff_action_logs_on_target_user_id_and_id          (target_user_id,id)
 #  index_user_histories_on_acting_user_id_and_action_and_id  (acting_user_id,action,id)
+#  index_user_histories_on_action_and_id                     (action,id)
 #  index_user_histories_on_category_id                       (category_id)
+#  index_user_histories_on_subject_and_id                    (subject,id)
+#  index_user_histories_on_target_user_id_and_id             (target_user_id,id)
 #
diff --git a/app/models/user_open_id.rb b/app/models/user_open_id.rb
index 183f2414823..188a04ef150 100644
--- a/app/models/user_open_id.rb
+++ b/app/models/user_open_id.rb
@@ -11,8 +11,8 @@ end
 #
 #  id         :integer          not null, primary key
 #  user_id    :integer          not null
-#  email      :string(255)      not null
-#  url        :string(255)      not null
+#  email      :string           not null
+#  url        :string           not null
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
 #  active     :boolean          not null
diff --git a/app/models/user_option.rb b/app/models/user_option.rb
index e882e4ccf3f..828ac58c602 100644
--- a/app/models/user_option.rb
+++ b/app/models/user_option.rb
@@ -27,7 +27,7 @@ class UserOption < ActiveRecord::Base
     self.mailing_list_mode_frequency = SiteSetting.default_email_mailing_list_mode_frequency
     self.email_direct = SiteSetting.default_email_direct
     self.automatically_unpin_topics = SiteSetting.default_topics_automatic_unpin
-    self.email_private_messages = SiteSetting.default_email_private_messages
+    self.email_private_messages = SiteSetting.default_email_personal_messages
     self.email_previous_replies = SiteSetting.default_email_previous_replies
     self.email_in_reply_to = SiteSetting.default_email_in_reply_to
 
diff --git a/app/models/user_profile.rb b/app/models/user_profile.rb
index d10b63f034d..11ebf37cb52 100644
--- a/app/models/user_profile.rb
+++ b/app/models/user_profile.rb
@@ -1,4 +1,9 @@
+require_dependency 'upload_creator'
 class UserProfile < ActiveRecord::Base
+
+  # TODO: remove this after Nov 1, 2018
+  self.ignored_columns = %w{card_image_badge_id}
+
   belongs_to :user, inverse_of: :user_profile
 
   validates :bio_raw, length: { maximum: 3000 }
@@ -12,7 +17,6 @@ class UserProfile < ActiveRecord::Base
 
   validate :website_domain_validator, if: Proc.new { |c| c.new_record? || c.website_changed? }
 
-  belongs_to :card_image_badge, class_name: 'Badge'
   has_many :user_profile_views, dependent: :destroy
 
   BAKED_VERSION = 1
@@ -75,6 +79,36 @@ class UserProfile < ActiveRecord::Base
     update_columns(bio_cooked: cooked, bio_cooked_version: BAKED_VERSION)
   end
 
+  def self.import_url_for_user(background_url, user, options = nil)
+    tempfile = FileHelper.download(
+      background_url,
+      max_file_size: SiteSetting.max_image_size_kb.kilobytes,
+      tmp_file_name: "sso-profile-background",
+      follow_redirect: true
+    )
+
+    return unless tempfile
+
+    ext = FastImage.type(tempfile).to_s
+    tempfile.rewind
+
+    is_card_background = !options || options[:is_card_background]
+    type = is_card_background ? "card_background" : "profile_background"
+
+    upload = UploadCreator.new(tempfile, "external-profile-background." + ext, origin: background_url, type: type).create_for(user.id)
+
+    if (is_card_background)
+      user.user_profile.upload_card_background(upload)
+    else
+      user.user_profile.upload_profile_background(upload)
+    end
+
+  rescue Net::ReadTimeout, OpenURI::HTTPError
+    # skip saving, we are not connected to the net
+  ensure
+    tempfile.close! if tempfile && tempfile.respond_to?(:close!)
+  end
+
   protected
 
   def trigger_badges
@@ -106,7 +140,10 @@ class UserProfile < ActiveRecord::Base
     allowed_domains = SiteSetting.user_website_domains_whitelist
     return if (allowed_domains.blank? || self.website.blank?)
 
-    domain = URI.parse(self.website).host
+    domain = begin
+      URI.parse(self.website).host
+    rescue URI::InvalidURIError
+    end
     self.errors.add :base, (I18n.t('user.website.domain_not_allowed', domains: allowed_domains.split('|').join(", "))) unless allowed_domains.split('|').include?(domain)
   end
 
@@ -117,16 +154,15 @@ end
 # Table name: user_profiles
 #
 #  user_id              :integer          not null, primary key
-#  location             :string(255)
-#  website              :string(255)
+#  location             :string
+#  website              :string
 #  bio_raw              :text
 #  bio_cooked           :text
-#  dismissed_banner_key :integer
 #  profile_background   :string(255)
+#  dismissed_banner_key :integer
 #  bio_cooked_version   :integer
 #  badge_granted_title  :boolean          default(FALSE)
 #  card_background      :string(255)
-#  card_image_badge_id  :integer
 #  views                :integer          default(0), not null
 #
 # Indexes
diff --git a/app/models/user_profile_view.rb b/app/models/user_profile_view.rb
index 716b26c07c3..237318a101c 100644
--- a/app/models/user_profile_view.rb
+++ b/app/models/user_profile_view.rb
@@ -1,5 +1,5 @@
 class UserProfileView < ActiveRecord::Base
-  validates_presence_of :user_profile_id, :ip_address, :viewed_at
+  validates_presence_of :user_profile_id, :viewed_at
 
   belongs_to :user_profile
 
@@ -9,6 +9,7 @@ class UserProfileView < ActiveRecord::Base
     if user_id
       return if user_id < 1
       redis_key << ":user-#{user_id}"
+      ip = nil
     else
       redis_key << ":ip-#{ip}"
     end
@@ -59,13 +60,12 @@ end
 #  id              :integer          not null, primary key
 #  user_profile_id :integer          not null
 #  viewed_at       :datetime         not null
-#  ip_address      :inet             not null
+#  ip_address      :inet
 #  user_id         :integer
 #
 # Indexes
 #
 #  index_user_profile_views_on_user_id          (user_id)
 #  index_user_profile_views_on_user_profile_id  (user_profile_id)
-#  unique_profile_view_ip                       (viewed_at,ip_address,user_profile_id) UNIQUE
-#  unique_profile_view_user                     (viewed_at,user_id,user_profile_id) UNIQUE
+#  unique_profile_view_user_or_ip               (viewed_at,user_id,ip_address,user_profile_id) UNIQUE
 #
diff --git a/app/models/user_search.rb b/app/models/user_search.rb
index 8a2013b5b50..a9eceda1e9a 100644
--- a/app/models/user_search.rb
+++ b/app/models/user_search.rb
@@ -49,7 +49,7 @@ class UserSearch
 
     if @term.present?
       if SiteSetting.enable_names? && @term !~ /[_\.-]/
-        query = Search.ts_query(@term, "simple")
+        query = Search.ts_query(term: @term, ts_config: "simple")
 
         users = users.includes(:user_search_data)
           .references(:user_search_data)
diff --git a/app/models/user_second_factor.rb b/app/models/user_second_factor.rb
new file mode 100644
index 00000000000..0ffa9717d52
--- /dev/null
+++ b/app/models/user_second_factor.rb
@@ -0,0 +1,23 @@
+class UserSecondFactor < ActiveRecord::Base
+  belongs_to :user
+
+  def self.methods
+    @methods ||= Enum.new(
+      totp: 1,
+    )
+  end
+end
+
+# == Schema Information
+#
+# Table name: user_second_factors
+#
+#  id         :integer          not null, primary key
+#  user_id    :integer          not null
+#  method     :integer          not null
+#  data       :string           not null
+#  enabled    :boolean          default(FALSE), not null
+#  last_used  :datetime
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
diff --git a/app/models/user_stat.rb b/app/models/user_stat.rb
index 8e7b3da43b5..cf9ab05e2ca 100644
--- a/app/models/user_stat.rb
+++ b/app/models/user_stat.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class UserStat < ActiveRecord::Base
 
   belongs_to :user
@@ -68,42 +69,44 @@ class UserStat < ActiveRecord::Base
 
   MAX_TIME_READ_DIFF = 100
   # attempt to add total read time to user based on previous time this was called
-  def update_time_read!
-    if last_seen = last_seen_cached
+  def self.update_time_read!(id)
+    if last_seen = last_seen_cached(id)
       diff = (Time.now.to_f - last_seen.to_f).round
       if diff > 0 && diff < MAX_TIME_READ_DIFF
         update_args = ["time_read = time_read + ?", diff]
-        UserStat.where(user_id: id, time_read: time_read).update_all(update_args)
+        UserStat.where(user_id: id).update_all(update_args)
         UserVisit.where(user_id: id, visited_at: Time.zone.now.to_date).update_all(update_args)
       end
     end
-    cache_last_seen(Time.now.to_f)
+    cache_last_seen(id, Time.now.to_f)
+  end
+
+  def update_time_read!
+    UserStat.update_time_read!(id)
   end
 
   def reset_bounce_score!
     update_columns(reset_bounce_score_after: nil, bounce_score: 0)
   end
 
+  def self.last_seen_key(id)
+    # frozen
+    -"user-last-seen:#{id}"
+  end
+
+  def self.last_seen_cached(id)
+    $redis.get(last_seen_key(id))
+  end
+
+  def self.cache_last_seen(id, val)
+    $redis.set(last_seen_key(id), val)
+  end
+
   protected
 
   def trigger_badges
     BadgeGranter.queue_badge_grant(Badge::Trigger::UserChange, user: self.user)
   end
-
-  private
-
-  def last_seen_key
-    @last_seen_key ||= "user-last-seen:#{id}"
-  end
-
-  def last_seen_cached
-    $redis.get(last_seen_key)
-  end
-
-  def cache_last_seen(val)
-    $redis.set(last_seen_key, val)
-  end
-
 end
 
 # == Schema Information
diff --git a/app/models/user_visit.rb b/app/models/user_visit.rb
index c0f5a464529..52bd2fab9c6 100644
--- a/app/models/user_visit.rb
+++ b/app/models/user_visit.rb
@@ -1,5 +1,4 @@
 class UserVisit < ActiveRecord::Base
-
   def self.counts_by_day_query(start_date, end_date, group_id = nil)
     result = where('visited_at >= ? and visited_at <= ?', start_date.to_date, end_date.to_date)
 
@@ -11,6 +10,28 @@ class UserVisit < ActiveRecord::Base
     result.group(:visited_at).order(:visited_at)
   end
 
+  def self.count_by_active_users(start_date, end_date)
+    sql = <<SQL
+      WITH dau AS (
+        SELECT date_trunc('day', user_visits.visited_at)::DATE AS date,
+               count(distinct user_visits.user_id) AS dau
+        FROM user_visits
+        WHERE user_visits.visited_at::DATE >= :start_date::DATE AND user_visits.visited_at <= :end_date::DATE
+        GROUP BY date_trunc('day', user_visits.visited_at)::DATE
+        ORDER BY date_trunc('day', user_visits.visited_at)::DATE
+      )
+
+      SELECT date, dau,
+        (SELECT count(distinct user_visits.user_id)
+          FROM user_visits
+          WHERE user_visits.visited_at::DATE BETWEEN dau.date - 29 AND dau.date
+        ) AS mau
+      FROM dau
+SQL
+
+    UserVisit.exec_sql(sql, start_date: start_date, end_date: end_date).to_a
+  end
+
   # A count of visits in a date range by day
   def self.by_day(start_date, end_date, group_id = nil)
     counts_by_day_query(start_date, end_date, group_id).count
diff --git a/app/models/user_warning.rb b/app/models/user_warning.rb
index dd89c7f9957..612406ac0e9 100644
--- a/app/models/user_warning.rb
+++ b/app/models/user_warning.rb
@@ -12,8 +12,8 @@ end
 #  topic_id      :integer          not null
 #  user_id       :integer          not null
 #  created_by_id :integer          not null
-#  created_at    :datetime
-#  updated_at    :datetime
+#  created_at    :datetime         not null
+#  updated_at    :datetime         not null
 #
 # Indexes
 #
diff --git a/app/models/watched_word.rb b/app/models/watched_word.rb
index d9af0071de1..73a3f661166 100644
--- a/app/models/watched_word.rb
+++ b/app/models/watched_word.rb
@@ -31,11 +31,12 @@ class WatchedWord < ActiveRecord::Base
   scope :by_action, -> { order("action ASC, word ASC") }
 
   def self.normalize_word(w)
-    w.strip.downcase.squeeze('*')
+    w.strip.squeeze('*')
   end
 
   def self.create_or_update_word(params)
-    w = find_or_initialize_by(word: normalize_word(params[:word]))
+    new_word = normalize_word(params[:word])
+    w = WatchedWord.where("word ILIKE ?", new_word).first || WatchedWord.new(word: new_word)
     w.action_key = params[:action_key] if params[:action_key]
     w.action = params[:action] if params[:action]
     w.save
@@ -59,8 +60,8 @@ end
 #  id         :integer          not null, primary key
 #  word       :string           not null
 #  action     :integer          not null
-#  created_at :datetime
-#  updated_at :datetime
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
 #
 # Indexes
 #
diff --git a/app/models/web_crawler_request.rb b/app/models/web_crawler_request.rb
new file mode 100644
index 00000000000..8f082222d82
--- /dev/null
+++ b/app/models/web_crawler_request.rb
@@ -0,0 +1,90 @@
+class WebCrawlerRequest < ActiveRecord::Base
+  include CachedCounting
+
+  # auto flush if older than this
+  self.autoflush_seconds = 1.hour
+
+  cattr_accessor :max_record_age, :max_records_per_day
+
+  # only keep the top records based on request count
+  self.max_records_per_day = 200
+
+  # delete records older than this
+  self.max_record_age = 30.days
+
+  def self.increment!(user_agent, opts = nil)
+    ua_list_key = user_agent_list_key
+    $redis.sadd(ua_list_key, user_agent)
+    $redis.expire(ua_list_key, 259200) # 3.days
+
+    perform_increment!(redis_key(user_agent), opts)
+  end
+
+  def self.write_cache!(date = nil)
+    if date.nil?
+      write_cache!(Time.now.utc)
+      write_cache!(Time.now.utc.yesterday)
+      return
+    end
+
+    self.last_flush = Time.now.utc
+
+    date = date.to_date
+    ua_list_key = user_agent_list_key(date)
+
+    while user_agent = $redis.spop(ua_list_key)
+      val = get_and_reset(redis_key(user_agent, date))
+
+      next if val == 0
+
+      self.where(id: req_id(date, user_agent)).update_all(["count = count + ?", val])
+    end
+  rescue Redis::CommandError => e
+    raise unless e.message =~ /READONLY/
+    nil
+  end
+
+  def self.clear_cache!(date = nil)
+    if date.nil?
+      clear_cache!(Time.now.utc)
+      clear_cache!(Time.now.utc.yesterday)
+      return
+    end
+
+    ua_list_key = user_agent_list_key(date)
+
+    while user_agent = $redis.spop(ua_list_key)
+      $redis.del redis_key(user_agent, date)
+    end
+
+    $redis.del(ua_list_key)
+  end
+
+  protected
+
+  def self.user_agent_list_key(time = Time.now.utc)
+    "crawl_ua_list:#{time.strftime('%Y%m%d')}"
+  end
+
+  def self.redis_key(user_agent, time = Time.now.utc)
+    "crawl_req:#{time.strftime('%Y%m%d')}:#{user_agent}"
+  end
+
+  def self.req_id(date, user_agent)
+    request_id(date: date, user_agent: user_agent)
+  end
+end
+
+# == Schema Information
+#
+# Table name: web_crawler_requests
+#
+#  id         :integer          not null, primary key
+#  date       :date             not null
+#  user_agent :string           not null
+#  count      :integer          default(0), not null
+#
+# Indexes
+#
+#  index_web_crawler_requests_on_date_and_user_agent  (date,user_agent) UNIQUE
+#
diff --git a/app/models/web_hook.rb b/app/models/web_hook.rb
index de0db8bbf97..c2c016741e6 100644
--- a/app/models/web_hook.rb
+++ b/app/models/web_hook.rb
@@ -30,30 +30,72 @@ class WebHook < ActiveRecord::Base
     [WebHookEventType.find(WebHookEventType::POST)]
   end
 
-  def self.find_by_type(type)
-    WebHook.where(active: true)
-      .joins(:web_hook_event_types)
-      .where("web_hooks.wildcard_web_hook = ? OR web_hook_event_types.name = ?", true, type.to_s)
-      .uniq
-  end
-
-  def self.enqueue_hooks(type, opts = {})
-    find_by_type(type).each do |w|
-      Jobs.enqueue(:emit_web_hook_event, opts.merge(web_hook_id: w.id, event_type: type.to_s))
-    end
-  end
-
-  def self.enqueue_topic_hooks(event, topic, user = nil)
-    WebHook.enqueue_hooks(:topic, topic_id: topic.id, category_id: topic&.category_id, event_name: event.to_s)
-  end
-
-  def self.enqueue_post_hooks(event, post, user = nil)
-    WebHook.enqueue_hooks(:post, post_id: post.id, category_id: post&.topic&.category_id, event_name: event.to_s)
-  end
-
   def strip_url
     self.payload_url = (payload_url || "").strip.presence
   end
+
+  def self.active_web_hooks(type)
+    WebHook.where(active: true)
+      .joins(:web_hook_event_types)
+      .where("web_hooks.wildcard_web_hook = ? OR web_hook_event_types.name = ?", true, type.to_s)
+      .distinct
+  end
+
+  def self.enqueue_hooks(type, opts = {})
+    active_web_hooks(type).each do |web_hook|
+      Jobs.enqueue(:emit_web_hook_event, opts.merge(
+        web_hook_id: web_hook.id, event_type: type.to_s
+      ))
+    end
+  end
+
+  def self.enqueue_object_hooks(type, object, event, serializer = nil)
+    if active_web_hooks(type).exists?
+      serializer ||= "WebHook#{type.capitalize}Serializer".constantize
+
+      WebHook.enqueue_hooks(type,
+        event_name: event.to_s,
+        payload: serializer.new(object,
+          scope: self.guardian,
+          root: false
+        ).to_json
+      )
+    end
+  end
+
+  def self.enqueue_topic_hooks(event, topic)
+    if active_web_hooks('topic').exists?
+      topic_view = TopicView.new(topic.id, Discourse.system_user)
+
+      WebHook.enqueue_hooks(:topic,
+        category_id: topic&.category_id,
+        event_name: event.to_s,
+        payload: WebHookTopicViewSerializer.new(topic_view,
+          scope: self.guardian,
+          root: false
+        ).to_json
+      )
+    end
+  end
+
+  def self.enqueue_post_hooks(event, post)
+    if active_web_hooks('post').exists?
+      WebHook.enqueue_hooks(:post,
+        category_id: post&.topic&.category_id,
+        event_name: event.to_s,
+        payload: WebHookPostSerializer.new(post,
+          scope: self.guardian,
+          root: false
+        ).to_json
+      )
+    end
+  end
+
+  private
+
+    def self.guardian
+      @guardian ||= Guardian.new(Discourse.system_user)
+    end
 end
 
 # == Schema Information
@@ -69,6 +111,6 @@ end
 #  wildcard_web_hook    :boolean          default(FALSE), not null
 #  verify_certificate   :boolean          default(TRUE), not null
 #  active               :boolean          default(FALSE), not null
-#  created_at           :datetime
-#  updated_at           :datetime
+#  created_at           :datetime         not null
+#  updated_at           :datetime         not null
 #
diff --git a/app/models/web_hook_event.rb b/app/models/web_hook_event.rb
index dc3e56d28ba..204efba8aaf 100644
--- a/app/models/web_hook_event.rb
+++ b/app/models/web_hook_event.rb
@@ -36,8 +36,8 @@ end
 #  response_headers :string
 #  response_body    :text
 #  duration         :integer          default(0)
-#  created_at       :datetime
-#  updated_at       :datetime
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
 #
 # Indexes
 #
diff --git a/app/models/web_hook_event_type.rb b/app/models/web_hook_event_type.rb
index d3596bfdaf5..7d6d595566f 100644
--- a/app/models/web_hook_event_type.rb
+++ b/app/models/web_hook_event_type.rb
@@ -2,6 +2,10 @@ class WebHookEventType < ActiveRecord::Base
   TOPIC = 1
   POST = 2
   USER = 3
+  GROUP = 4
+  CATEGORY = 5
+  TAG = 6
+  FLAG = 7
 
   has_and_belongs_to_many :web_hooks
 
diff --git a/app/serializers/admin_detailed_user_serializer.rb b/app/serializers/admin_detailed_user_serializer.rb
index 8cc9316cb5d..e0ad2abcfc7 100644
--- a/app/serializers/admin_detailed_user_serializer.rb
+++ b/app/serializers/admin_detailed_user_serializer.rb
@@ -25,7 +25,9 @@ class AdminDetailedUserSerializer < AdminUserSerializer
              :user_fields,
              :bounce_score,
              :reset_bounce_score_after,
-             :can_view_action_logs
+             :can_view_action_logs,
+             :second_factor_enabled,
+             :can_disable_second_factor
 
   has_one :approved_by, serializer: BasicUserSerializer, embed: :objects
   has_one :api_key, serializer: ApiKeySerializer, embed: :objects
@@ -34,6 +36,14 @@ class AdminDetailedUserSerializer < AdminUserSerializer
   has_one :tl3_requirements, serializer: TrustLevel3RequirementsSerializer, embed: :objects
   has_many :groups, embed: :object, serializer: BasicGroupSerializer
 
+  def second_factor_enabled
+    object.totp_enabled?
+  end
+
+  def can_disable_second_factor
+    object&.id != scope.user.id
+  end
+
   def can_revoke_admin
     scope.can_revoke_admin?(object)
   end
diff --git a/app/serializers/admin_plugin_serializer.rb b/app/serializers/admin_plugin_serializer.rb
index 6a00ded3745..b1150714968 100644
--- a/app/serializers/admin_plugin_serializer.rb
+++ b/app/serializers/admin_plugin_serializer.rb
@@ -5,7 +5,9 @@ class AdminPluginSerializer < ApplicationSerializer
              :url,
              :admin_route,
              :enabled,
-             :enabled_setting
+             :enabled_setting,
+             :is_official,
+             :enabled_setting_filter
 
   def id
     object.metadata.name
@@ -27,12 +29,20 @@ class AdminPluginSerializer < ApplicationSerializer
     object.enabled?
   end
 
+  def include_enabled_setting?
+    enabled_setting.present?
+  end
+
   def enabled_setting
     object.enabled_site_setting
   end
 
-  def include_enabled_setting?
-    enabled_setting.present?
+  def include_enabled_setting_filter?
+    object.enabled_site_setting_filter.present?
+  end
+
+  def enabled_setting_filter
+    object.enabled_site_setting_filter
   end
 
   def include_url?
@@ -51,4 +61,8 @@ class AdminPluginSerializer < ApplicationSerializer
   def include_admin_route?
     admin_route.present?
   end
+
+  def is_official
+    Plugin::Metadata::OFFICIAL_PLUGINS.include?(object.name)
+  end
 end
diff --git a/app/serializers/admin_user_list_serializer.rb b/app/serializers/admin_user_list_serializer.rb
index e4a95b3efb1..32021dad747 100644
--- a/app/serializers/admin_user_list_serializer.rb
+++ b/app/serializers/admin_user_list_serializer.rb
@@ -25,7 +25,8 @@ class AdminUserListSerializer < BasicUserSerializer
              :silenced,
              :silenced_till,
              :time_read,
-             :staged
+             :staged,
+             :second_factor_enabled
 
   [:days_visited, :posts_read_count, :topics_entered, :post_count].each do |sym|
     attributes sym
@@ -115,4 +116,12 @@ class AdminUserListSerializer < BasicUserSerializer
     SiteSetting.must_approve_users
   end
 
+  def include_second_factor_enabled?
+    object.totp_enabled?
+  end
+
+  def second_factor_enabled
+    true
+  end
+
 end
diff --git a/app/serializers/badge_serializer.rb b/app/serializers/badge_serializer.rb
index d3bbd873390..3f7929b328c 100644
--- a/app/serializers/badge_serializer.rb
+++ b/app/serializers/badge_serializer.rb
@@ -1,7 +1,7 @@
 class BadgeSerializer < ApplicationSerializer
   attributes :id, :name, :description, :grant_count, :allow_title,
              :multiple_grant, :icon, :image, :listable, :enabled, :badge_grouping_id,
-             :system, :long_description, :slug, :has_badge
+             :system, :long_description, :slug, :has_badge, :manually_grantable?
 
   has_one :badge_type
 
diff --git a/app/serializers/basic_category_serializer.rb b/app/serializers/basic_category_serializer.rb
index 01a088976ee..4149a32cf26 100644
--- a/app/serializers/basic_category_serializer.rb
+++ b/app/serializers/basic_category_serializer.rb
@@ -24,7 +24,8 @@ class BasicCategorySerializer < ApplicationSerializer
              :num_featured_topics,
              :default_view,
              :subcategory_list_style,
-             :default_top_period
+             :default_top_period,
+             :minimum_required_tags
 
   has_one :uploaded_logo, embed: :object, serializer: CategoryUploadSerializer
   has_one :uploaded_background, embed: :object, serializer: CategoryUploadSerializer
diff --git a/app/serializers/basic_group_serializer.rb b/app/serializers/basic_group_serializer.rb
index a09bce0d3ba..26fb3ea2dec 100644
--- a/app/serializers/basic_group_serializer.rb
+++ b/app/serializers/basic_group_serializer.rb
@@ -24,7 +24,9 @@ class BasicGroupSerializer < ApplicationSerializer
              :allow_membership_requests,
              :full_name,
              :default_notification_level,
-             :membership_request_template
+             :membership_request_template,
+             :is_group_user,
+             :is_group_owner
 
   def include_display_name?
     object.automatic
@@ -40,17 +42,41 @@ class BasicGroupSerializer < ApplicationSerializer
     staff?
   end
 
-  def include_has_messages
-    staff?
+  def include_has_messages?
+    staff? || scope.can_see_group_messages?(object)
   end
 
-  def include_bio_raw
-    staff?
+  def include_bio_raw?
+    staff? || (include_is_group_owner? && is_group_owner)
+  end
+
+  def include_is_group_user?
+    user_group_ids.present?
+  end
+
+  def is_group_user
+    user_group_ids.include?(object.id)
+  end
+
+  def include_is_group_owner?
+    owner_group_ids.present?
+  end
+
+  def is_group_owner
+    owner_group_ids.include?(object.id)
   end
 
   private
 
-  def staff?
-    @staff ||= scope.is_staff?
-  end
+    def staff?
+      @staff ||= scope.is_staff?
+    end
+
+    def user_group_ids
+      @options[:user_group_ids]
+    end
+
+    def owner_group_ids
+      @options[:owner_group_ids]
+    end
 end
diff --git a/app/serializers/category_serializer.rb b/app/serializers/category_serializer.rb
index 3c5f98a97bf..ee7b593b03a 100644
--- a/app/serializers/category_serializer.rb
+++ b/app/serializers/category_serializer.rb
@@ -9,7 +9,7 @@ class CategorySerializer < BasicCategorySerializer
              :email_in,
              :email_in_allow_strangers,
              :mailinglist_mirror,
-             :suppress_from_homepage,
+             :suppress_from_latest,
              :all_topics_wiki,
              :can_delete,
              :cannot_delete_reason,
@@ -29,7 +29,7 @@ class CategorySerializer < BasicCategorySerializer
         }
       end
       if perms.length == 0 && !object.read_restricted
-        perms << { permission_type: CategoryGroup.permission_types[:full], group_name: :everyone }
+        perms << { permission_type: CategoryGroup.permission_types[:full], group_name: Group[:everyone]&.name.presence || :everyone }
       end
       perms
     end
@@ -72,7 +72,7 @@ class CategorySerializer < BasicCategorySerializer
     scope && scope.can_edit?(object)
   end
 
-  def include_suppress_from_homepage?
+  def include_suppress_from_latest?
     scope && scope.can_edit?(object)
   end
 
diff --git a/app/serializers/concerns/topic_tags_mixin.rb b/app/serializers/concerns/topic_tags_mixin.rb
new file mode 100644
index 00000000000..c2dc1254d22
--- /dev/null
+++ b/app/serializers/concerns/topic_tags_mixin.rb
@@ -0,0 +1,18 @@
+module TopicTagsMixin
+  def self.included(klass)
+    klass.attributes :tags
+  end
+
+  def include_tags?
+    scope.can_see_tags?(topic)
+  end
+
+  def tags
+    # Calling method `pluck` along with `includes` causing N+1 queries
+    DiscourseTagging.filter_visible(topic.tags, scope).map(&:name)
+  end
+
+  def topic
+    object.is_a?(Topic) ? object : object.topic
+  end
+end
diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb
index 46fa8fe05ce..37395c5b8b2 100644
--- a/app/serializers/current_user_serializer.rb
+++ b/app/serializers/current_user_serializer.rb
@@ -39,7 +39,13 @@ class CurrentUserSerializer < BasicUserSerializer
              :seen_notification_id,
              :primary_group_id,
              :primary_group_name,
-             :can_create_topic
+             :can_create_topic,
+             :can_post_link,
+             :external_id
+
+  def can_post_link
+    scope.can_post_link?
+  end
 
   def can_create_topic
     scope.can_create_topic?(nil)
@@ -192,4 +198,11 @@ class CurrentUserSerializer < BasicUserSerializer
     object.primary_group&.name.present?
   end
 
+  def external_id
+    object&.single_sign_on_record&.external_id
+  end
+
+  def include_external_id?
+    SiteSetting.enable_sso
+  end
 end
diff --git a/app/serializers/incoming_email_details_serializer.rb b/app/serializers/incoming_email_details_serializer.rb
index d147215a393..f67f9fcb1e8 100644
--- a/app/serializers/incoming_email_details_serializer.rb
+++ b/app/serializers/incoming_email_details_serializer.rb
@@ -33,14 +33,19 @@ class IncomingEmailDetailsSerializer < ApplicationSerializer
   end
 
   def subject
-    @mail.subject.presence || "(no subject)"
+    @mail.subject.presence || I18n.t("emails.incoming.no_subject")
   end
 
   def body
     body   = @mail.text_part.decoded rescue nil
     body ||= @mail.html_part.decoded rescue nil
     body ||= @mail.body.decoded      rescue nil
-    body.strip.truncate_words(100, escape: false)
+
+    return I18n.t("emails.incoming.no_body") if body.blank?
+
+    body.encode("utf-8", invalid: :replace, undef: :replace, replace: "")
+      .strip
+      .truncate_words(100, escape: false)
   end
 
 end
diff --git a/app/serializers/penalty_counts_serializer.rb b/app/serializers/penalty_counts_serializer.rb
new file mode 100644
index 00000000000..94f5722ee0d
--- /dev/null
+++ b/app/serializers/penalty_counts_serializer.rb
@@ -0,0 +1,15 @@
+class PenaltyCountsSerializer < ApplicationSerializer
+  attributes :silenced, :suspended, :total
+
+  def total
+    object.silenced + object.suspended
+  end
+
+  def silenced
+    object.silenced
+  end
+
+  def suspended
+    object.suspended
+  end
+end
diff --git a/app/serializers/post_revision_serializer.rb b/app/serializers/post_revision_serializer.rb
index 11b13677f4e..e8c7e9f16ee 100644
--- a/app/serializers/post_revision_serializer.rb
+++ b/app/serializers/post_revision_serializer.rb
@@ -160,11 +160,15 @@ class PostRevisionSerializer < ApplicationSerializer
   end
 
   def tags_changes
-    { previous: previous["tags"], current: current["tags"] }
+    changes = {
+      previous: filter_visible_tags(previous["tags"]),
+      current: filter_visible_tags(current["tags"])
+    }
+    changes[:previous] == changes[:current] ? nil : changes
   end
 
   def include_tags_changes?
-    SiteSetting.tagging_enabled && previous["tags"] != current["tags"]
+    scope.can_see_tags?(topic) && previous["tags"] != current["tags"]
   end
 
   protected
@@ -197,18 +201,11 @@ class PostRevisionSerializer < ApplicationSerializer
 
       # Retrieve any `tracked_topic_fields`
       PostRevisor.tracked_topic_fields.each_key do |field|
-        if topic.respond_to?(field)
-          latest_modifications[field.to_s] = [topic.send(field)]
-        end
+        latest_modifications[field.to_s] = [topic.send(field)] if topic.respond_to?(field)
       end
 
-      if SiteSetting.topic_featured_link_enabled
-        latest_modifications["featured_link"] = [post.topic.featured_link]
-      end
-
-      if SiteSetting.tagging_enabled
-        latest_modifications["tags"] = [post.topic.tags.map(&:name)]
-      end
+      latest_modifications["featured_link"] = [post.topic.featured_link] if SiteSetting.topic_featured_link_enabled
+      latest_modifications["tags"] = [topic.tags.pluck(:name)] if scope.can_see_tags?(topic)
 
       post_revisions << PostRevision.new(
         number: post_revisions.last.number + 1,
@@ -257,4 +254,13 @@ class PostRevisionSerializer < ApplicationSerializer
       object.user || Discourse.system_user
     end
 
+    def filter_visible_tags(tags)
+      if tags.is_a?(Array) && tags.size > 0
+        @hidden_tag_names ||= DiscourseTagging.hidden_tag_names(scope)
+        tags - @hidden_tag_names
+      else
+        tags
+      end
+    end
+
 end
diff --git a/app/serializers/post_serializer.rb b/app/serializers/post_serializer.rb
index d756ee1dd31..e66fa720fd6 100644
--- a/app/serializers/post_serializer.rb
+++ b/app/serializers/post_serializer.rb
@@ -69,7 +69,8 @@ class PostSerializer < BasicPostSerializer
              :is_auto_generated,
              :action_code,
              :action_code_who,
-             :last_wiki_edit
+             :last_wiki_edit,
+             :locked
 
   def initialize(object, opts)
     super(object, opts)
@@ -81,7 +82,7 @@ class PostSerializer < BasicPostSerializer
   end
 
   def topic_slug
-    object.topic && object.topic.slug
+    topic&.slug
   end
 
   def include_topic_title?
@@ -97,15 +98,15 @@ class PostSerializer < BasicPostSerializer
   end
 
   def topic_title
-    object.topic.title
+    topic&.title
   end
 
   def topic_html_title
-    object.topic.fancy_title
+    topic&.fancy_title
   end
 
   def category_id
-    object.topic.category_id
+    topic&.category_id
   end
 
   def moderator?
@@ -354,6 +355,15 @@ class PostSerializer < BasicPostSerializer
     include_action_code? && action_code_who.present?
   end
 
+  def locked
+    true
+  end
+
+  # Only show locked posts to the users who made the post and staff
+  def include_locked?
+    object.locked? && (yours || scope.is_staff?)
+  end
+
   def last_wiki_edit
     object.revisions.last.updated_at
   end
@@ -364,8 +374,18 @@ class PostSerializer < BasicPostSerializer
     object.revisions.size > 0
   end
 
+  def include_hidden_reason_id?
+    object.hidden
+  end
+
   private
 
+    def topic
+      @topic = object.topic
+      @topic ||= Topic.with_deleted.find(object.topic_id) if scope.is_staff?
+      @topic
+    end
+
     def post_actions
       @post_actions ||= (@topic_view&.all_post_actions || {})[object.id]
     end
diff --git a/app/serializers/search_topic_list_item_serializer.rb b/app/serializers/search_topic_list_item_serializer.rb
index abe002899a3..29640c13d05 100644
--- a/app/serializers/search_topic_list_item_serializer.rb
+++ b/app/serializers/search_topic_list_item_serializer.rb
@@ -1,12 +1,5 @@
 class SearchTopicListItemSerializer < ListableTopicSerializer
-  attributes :tags,
-    :category_id
+  include TopicTagsMixin
 
-  def include_tags?
-    SiteSetting.tagging_enabled
-  end
-
-  def tags
-    object.tags.map(&:name)
-  end
+  attributes :category_id
 end
diff --git a/app/serializers/single_sign_on_record_serializer.rb b/app/serializers/single_sign_on_record_serializer.rb
index a70591531fe..d2e35119b15 100644
--- a/app/serializers/single_sign_on_record_serializer.rb
+++ b/app/serializers/single_sign_on_record_serializer.rb
@@ -3,5 +3,7 @@ class SingleSignOnRecordSerializer < ApplicationSerializer
              :last_payload, :created_at,
              :updated_at, :external_username,
              :external_email, :external_name,
-             :external_avatar_url
+             :external_avatar_url,
+             :external_profile_background_url,
+             :external_card_background_url
 end
diff --git a/app/serializers/site_serializer.rb b/app/serializers/site_serializer.rb
index 850a8dd8dd3..bd52b8d2e2d 100644
--- a/app/serializers/site_serializer.rb
+++ b/app/serializers/site_serializer.rb
@@ -4,29 +4,33 @@ require_dependency 'wizard/builder'
 
 class SiteSerializer < ApplicationSerializer
 
-  attributes :default_archetype,
-             :notification_types,
-             :post_types,
-             :groups,
-             :filters,
-             :periods,
-             :top_menu_items,
-             :anonymous_top_menu_items,
-             :uncategorized_category_id, # this is hidden so putting it here
-             :is_readonly,
-             :disabled_plugins,
-             :user_field_max_length,
-             :suppressed_from_homepage_category_ids,
-             :post_action_types,
-             :topic_flag_types,
-             :can_create_tag,
-             :can_tag_topics,
-             :tags_filter_regexp,
-             :top_tags,
-             :wizard_required,
-             :topic_featured_link_allowed_category_ids,
-             :user_themes,
-             :censored_words
+  attributes(
+    :default_archetype,
+    :notification_types,
+    :post_types,
+    :groups,
+    :filters,
+    :periods,
+    :top_menu_items,
+    :anonymous_top_menu_items,
+    :uncategorized_category_id, # this is hidden so putting it here
+    :is_readonly,
+    :disabled_plugins,
+    :user_field_max_length,
+    :suppressed_from_latest_category_ids,
+    :post_action_types,
+    :topic_flag_types,
+    :can_create_tag,
+    :can_tag_topics,
+    :can_tag_pms,
+    :tags_filter_regexp,
+    :top_tags,
+    :wizard_required,
+    :topic_featured_link_allowed_category_ids,
+    :user_themes,
+    :censored_words,
+    :shared_drafts_category_id
+  )
 
   has_many :categories, serializer: BasicCategorySerializer, embed: :objects
   has_many :trust_levels, embed: :objects
@@ -106,11 +110,15 @@ class SiteSerializer < ApplicationSerializer
   end
 
   def can_create_tag
-    SiteSetting.tagging_enabled && scope.can_create_tag?
+    scope.can_create_tag?
   end
 
   def can_tag_topics
-    SiteSetting.tagging_enabled && scope.can_tag_topics?
+    scope.can_tag_topics?
+  end
+
+  def can_tag_pms
+    scope.can_tag_pms?
   end
 
   def include_tags_filter_regexp?
@@ -148,4 +156,13 @@ class SiteSerializer < ApplicationSerializer
   def censored_words
     WordWatcher.words_for_action(:censor).join('|')
   end
+
+  def shared_drafts_category_id
+    SiteSetting.shared_drafts_category.to_i
+  end
+
+  def include_shared_drafts_category_id?
+    scope.can_create_shared_draft?
+  end
+
 end
diff --git a/app/serializers/suggested_topic_serializer.rb b/app/serializers/suggested_topic_serializer.rb
index a0817917f5b..a2dcdef6b17 100644
--- a/app/serializers/suggested_topic_serializer.rb
+++ b/app/serializers/suggested_topic_serializer.rb
@@ -1,4 +1,5 @@
 class SuggestedTopicSerializer < ListableTopicSerializer
+  include TopicTagsMixin
 
   # need to embed so we have users
   # front page json gets away without embedding
@@ -7,21 +8,13 @@ class SuggestedTopicSerializer < ListableTopicSerializer
     has_one :user, serializer: BasicUserSerializer, embed: :objects
   end
 
-  attributes :archetype, :like_count, :views, :category_id, :tags, :featured_link
+  attributes :archetype, :like_count, :views, :category_id, :featured_link, :featured_link_root_domain
   has_many :posters, serializer: SuggestedPosterSerializer, embed: :objects
 
   def posters
     object.posters || []
   end
 
-  def include_tags?
-    SiteSetting.tagging_enabled
-  end
-
-  def tags
-    object.tags.map(&:name)
-  end
-
   def include_featured_link?
     SiteSetting.topic_featured_link_enabled
   end
@@ -29,4 +22,8 @@ class SuggestedTopicSerializer < ListableTopicSerializer
   def featured_link
     object.featured_link
   end
+
+  def include_featured_link_root_domain?
+    SiteSetting.topic_featured_link_enabled && object.featured_link
+  end
 end
diff --git a/app/serializers/tag_group_serializer.rb b/app/serializers/tag_group_serializer.rb
index 62858aff200..47db578ce82 100644
--- a/app/serializers/tag_group_serializer.rb
+++ b/app/serializers/tag_group_serializer.rb
@@ -1,5 +1,5 @@
 class TagGroupSerializer < ApplicationSerializer
-  attributes :id, :name, :tag_names, :parent_tag_name, :one_per_topic
+  attributes :id, :name, :tag_names, :parent_tag_name, :one_per_topic, :permissions
 
   def tag_names
     object.tags.map(&:name).sort
@@ -8,4 +8,17 @@ class TagGroupSerializer < ApplicationSerializer
   def parent_tag_name
     [object.parent_tag.try(:name)].compact
   end
+
+  def permissions
+    @permissions ||= begin
+      h = {}
+      object.tag_group_permissions.joins(:group).includes(:group).order("groups.name").each do |tgp|
+        h[tgp.group.name] = tgp.permission_type
+      end
+      if h.size == 0
+        h['everyone'] = TagGroupPermission.permission_types[:full]
+      end
+      h
+    end
+  end
 end
diff --git a/app/serializers/tag_serializer.rb b/app/serializers/tag_serializer.rb
index 206a0256fa7..9f050800295 100644
--- a/app/serializers/tag_serializer.rb
+++ b/app/serializers/tag_serializer.rb
@@ -1,3 +1,3 @@
 class TagSerializer < ApplicationSerializer
-  attributes :id, :name
+  attributes :id, :name, :topic_count
 end
diff --git a/app/serializers/theme_serializer.rb b/app/serializers/theme_serializer.rb
index 78532e399a9..4938b5fac99 100644
--- a/app/serializers/theme_serializer.rb
+++ b/app/serializers/theme_serializer.rb
@@ -24,11 +24,7 @@ class ThemeFieldSerializer < ApplicationSerializer
   end
 
   def target
-    case object.target_id
-    when 0 then "common"
-    when 1 then "desktop"
-    when 2 then "mobile"
-    end
+    Theme.lookup_target(object.target_id)&.to_s
   end
 
   def include_error?
@@ -60,7 +56,9 @@ class RemoteThemeSerializer < ApplicationSerializer
 end
 
 class ThemeSerializer < ChildThemeSerializer
-  attributes :color_scheme, :color_scheme_id, :user_selectable, :remote_theme_id
+  attributes :color_scheme, :color_scheme_id, :user_selectable, :remote_theme_id, :settings
+
+  has_one :user, serializer: UserNameSerializer, embed: :object
 
   has_many :theme_fields, serializer: ThemeFieldSerializer, embed: :objects
   has_many :child_themes, serializer: ChildThemeSerializer, embed: :objects
@@ -69,6 +67,10 @@ class ThemeSerializer < ChildThemeSerializer
   def child_themes
     object.child_themes.order(:name)
   end
+
+  def settings
+    object.settings.map { |setting| ThemeSettingsSerializer.new(setting, root: false) }
+  end
 end
 
 class ThemeFieldWithEmbeddedUploadsSerializer < ThemeFieldSerializer
@@ -94,4 +96,8 @@ end
 
 class ThemeWithEmbeddedUploadsSerializer < ThemeSerializer
   has_many :theme_fields, serializer: ThemeFieldWithEmbeddedUploadsSerializer, embed: :objects
+
+  def include_settings?
+    false
+  end
 end
diff --git a/app/serializers/theme_settings_serializer.rb b/app/serializers/theme_settings_serializer.rb
new file mode 100644
index 00000000000..cb3aa20794b
--- /dev/null
+++ b/app/serializers/theme_settings_serializer.rb
@@ -0,0 +1,35 @@
+class ThemeSettingsSerializer < ApplicationSerializer
+  attributes :setting, :type, :default, :value, :description, :valid_values
+
+  def setting
+    object.name
+  end
+
+  def type
+    object.type_name
+  end
+
+  def default
+    object.default
+  end
+
+  def value
+    object.value
+  end
+
+  def description
+    object.description
+  end
+
+  def valid_values
+    object.choices
+  end
+
+  def include_valid_values?
+    object.type == ThemeSetting.types[:enum]
+  end
+
+  def include_description?
+    object.description.present?
+  end
+end
diff --git a/app/serializers/topic_list_item_serializer.rb b/app/serializers/topic_list_item_serializer.rb
index 0ce4f4cd500..1f77b45d751 100644
--- a/app/serializers/topic_list_item_serializer.rb
+++ b/app/serializers/topic_list_item_serializer.rb
@@ -1,4 +1,5 @@
 class TopicListItemSerializer < ListableTopicSerializer
+  include TopicTagsMixin
 
   attributes :views,
              :like_count,
@@ -10,7 +11,6 @@ class TopicListItemSerializer < ListableTopicSerializer
              :pinned_globally,
              :bookmarked_post_numbers,
              :liked_post_numbers,
-             :tags,
              :featured_link,
              :featured_link_root_domain
 
@@ -29,6 +29,16 @@ class TopicListItemSerializer < ListableTopicSerializer
     posters.find { |poster| poster.user.id == object.last_post_user_id }.try(:user).try(:username)
   end
 
+  def category_id
+
+    # If it's a shared draft, show the destination topic instead
+    if object.includes_destination_category && object.shared_draft
+      return object.shared_draft.category_id
+    end
+
+    object.category_id
+  end
+
   def participants
     object.participants_summary || []
   end
@@ -66,14 +76,6 @@ class TopicListItemSerializer < ListableTopicSerializer
     object.association(:first_post).loaded?
   end
 
-  def include_tags?
-    SiteSetting.tagging_enabled
-  end
-
-  def tags
-    object.tags.map(&:name)
-  end
-
   def include_featured_link?
     SiteSetting.topic_featured_link_enabled
   end
diff --git a/app/serializers/topic_list_serializer.rb b/app/serializers/topic_list_serializer.rb
index 039a15342bd..6ee27854ca8 100644
--- a/app/serializers/topic_list_serializer.rb
+++ b/app/serializers/topic_list_serializer.rb
@@ -7,14 +7,22 @@ class TopicListSerializer < ApplicationSerializer
              :draft_sequence,
              :for_period,
              :per_page,
-             :tags
+             :top_tags,
+             :tags,
+             :shared_drafts
 
   has_many :topics, serializer: TopicListItemSerializer, embed: :objects
+  has_many :shared_drafts, serializer: TopicListItemSerializer, embed: :objects
+  has_many :tags, serializer: TagSerializer, embed: :objects
 
   def can_create_topic
     scope.can_create?(Topic)
   end
 
+  def include_shared_drafts?
+    object.shared_drafts.present?
+  end
+
   def include_for_period?
     for_period.present?
   end
@@ -23,7 +31,11 @@ class TopicListSerializer < ApplicationSerializer
     object.more_topics_url.present? && (object.topics.size == object.per_page)
   end
 
-  def include_tags?
+  def include_top_tags?
     Tag.include_tags?
   end
+
+  def include_tags?
+    SiteSetting.tagging_enabled && object.tags.present?
+  end
 end
diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb
index 839a9311346..44479aa7e0a 100644
--- a/app/serializers/topic_view_serializer.rb
+++ b/app/serializers/topic_view_serializer.rb
@@ -4,6 +4,7 @@ require_dependency 'new_post_manager'
 class TopicViewSerializer < ApplicationSerializer
   include PostStreamSerializerMixin
   include SuggestedTopicsMixin
+  include TopicTagsMixin
   include ApplicationHelper
 
   def self.attributes_from_topic(*list)
@@ -35,7 +36,6 @@ class TopicViewSerializer < ApplicationSerializer
                         :deleted_at,
                         :pending_posts_count,
                         :user_id,
-                        :pm_with_non_human_user?,
                         :featured_link,
                         :featured_link_root_domain,
                         :pinned_globally,
@@ -49,6 +49,7 @@ class TopicViewSerializer < ApplicationSerializer
              :unpinned,
              :pinned,
              :details,
+             :current_post_number,
              :highest_post_number,
              :last_read_post_number,
              :last_read_post_id,
@@ -60,12 +61,13 @@ class TopicViewSerializer < ApplicationSerializer
              :chunk_size,
              :bookmarked,
              :message_archived,
-             :tags,
              :topic_timer,
              :private_topic_timer,
              :unicode_title,
              :message_bus_last_id,
-             :participant_count
+             :participant_count,
+             :destination_category_id,
+             :pm_with_non_human_user,
 
   # TODO: Split off into proper object / serializer
   def details
@@ -171,6 +173,14 @@ class TopicViewSerializer < ApplicationSerializer
     object.topic_user.present?
   end
 
+  def current_post_number
+    [object.post_number, object.highest_post_number].min
+  end
+
+  def include_current_post_number?
+    object.highest_post_number.present?
+  end
+
   def highest_post_number
     object.highest_post_number
   end
@@ -238,10 +248,6 @@ class TopicViewSerializer < ApplicationSerializer
     scope.is_staff? && NewPostManager.queue_enabled?
   end
 
-  def include_tags?
-    SiteSetting.tagging_enabled
-  end
-
   def topic_timer
     TopicTimerSerializer.new(object.topic.public_topic_timer, root: false)
   end
@@ -255,10 +261,6 @@ class TopicViewSerializer < ApplicationSerializer
     TopicTimerSerializer.new(timer, root: false)
   end
 
-  def tags
-    object.topic.tags.map(&:name)
-  end
-
   def include_featured_link?
     SiteSetting.topic_featured_link_enabled
   end
@@ -279,10 +281,24 @@ class TopicViewSerializer < ApplicationSerializer
     private_message?(object.topic)
   end
 
+  def pm_with_non_human_user
+    object.topic.pm_with_non_human_user?
+  end
+
   def participant_count
     object.participant_count
   end
 
+  def destination_category_id
+    object.topic.shared_draft.category_id
+  end
+
+  def include_destination_category_id?
+    scope.can_create_shared_draft? &&
+      object.topic.category_id == SiteSetting.shared_drafts_category.to_i &&
+      object.topic.shared_draft.present?
+  end
+
   private
 
     def private_message?(topic)
diff --git a/app/serializers/trust_level3_requirements_serializer.rb b/app/serializers/trust_level3_requirements_serializer.rb
index 7d489236a7d..371619ccc05 100644
--- a/app/serializers/trust_level3_requirements_serializer.rb
+++ b/app/serializers/trust_level3_requirements_serializer.rb
@@ -1,4 +1,9 @@
+require_dependency 'penalty_counts_serializer'
+
 class TrustLevel3RequirementsSerializer < ApplicationSerializer
+
+  has_one :penalty_counts, embed: :object, serializer: PenaltyCountsSerializer
+
   attributes :time_period,
              :requirements_met,
              :requirements_lost,
diff --git a/app/serializers/user_action_serializer.rb b/app/serializers/user_action_serializer.rb
index c6abea6a5ce..2aec75ceede 100644
--- a/app/serializers/user_action_serializer.rb
+++ b/app/serializers/user_action_serializer.rb
@@ -26,6 +26,7 @@ class UserActionSerializer < ApplicationSerializer
              :hidden,
              :post_type,
              :action_code,
+             :action_code_who,
              :edit_reason,
              :category_id,
              :closed,
@@ -79,4 +80,12 @@ class UserActionSerializer < ApplicationSerializer
     object.topic_archived
   end
 
+  def include_action_code_who?
+    action_code_who.present?
+  end
+
+  def action_code_who
+    object.action_code_who
+  end
+
 end
diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb
index 30bb1038c6f..f7b56ebf4bf 100644
--- a/app/serializers/user_serializer.rb
+++ b/app/serializers/user_serializer.rb
@@ -72,13 +72,13 @@ class UserSerializer < BasicUserSerializer
              :primary_group_flair_url,
              :primary_group_flair_bg_color,
              :primary_group_flair_color,
-             :staged
+             :staged,
+             :second_factor_enabled
 
   has_one :invited_by, embed: :object, serializer: BasicUserSerializer
   has_many :groups, embed: :object, serializer: BasicGroupSerializer
   has_many :group_users, embed: :object, serializer: BasicGroupUserSerializer
   has_many :featured_user_badges, embed: :ids, serializer: UserBadgeSerializer, root: :user_badges
-  has_one  :card_badge, embed: :object, serializer: BadgeSerializer
   has_one :user_option, embed: :object, serializer: UserOptionSerializer
 
   def include_user_option?
@@ -106,8 +106,6 @@ class UserSerializer < BasicUserSerializer
                      :custom_avatar_upload_id,
                      :custom_avatar_template,
                      :has_title_badges,
-                     :card_image_badge,
-                     :card_image_badge_id,
                      :muted_usernames,
                      :mailing_list_posts_per_day,
                      :can_change_bio,
@@ -145,6 +143,14 @@ class UserSerializer < BasicUserSerializer
       (scope.is_staff? && object.staged?)
   end
 
+  def include_second_factor_enabled?
+    (object&.id == scope.user&.id) || scope.is_staff?
+  end
+
+  def second_factor_enabled
+    object.totp_enabled?
+  end
+
   def can_change_bio
     !(SiteSetting.enable_sso && SiteSetting.sso_overrides_bio)
   end
@@ -162,10 +168,6 @@ class UserSerializer < BasicUserSerializer
     keys.length > 0 ? keys : nil
   end
 
-  def card_badge
-    object.user_profile.card_image_badge
-  end
-
   def bio_raw
     object.user_profile.bio_raw
   end
@@ -179,7 +181,11 @@ class UserSerializer < BasicUserSerializer
   end
 
   def website_name
-    uri = URI(website.to_s) rescue nil
+    uri = begin
+      URI(website.to_s)
+    rescue URI::InvalidURIError
+    end
+
     return if uri.nil? || uri.host.nil?
     uri.host.sub(/^www\./, '') + uri.path
   end
@@ -188,22 +194,6 @@ class UserSerializer < BasicUserSerializer
     website.present?
   end
 
-  def card_image_badge_id
-    object.user_profile.card_image_badge.try(:id)
-  end
-
-  def include_card_image_badge_id?
-    card_image_badge_id.present?
-  end
-
-  def card_image_badge
-    object.user_profile.card_image_badge.try(:image)
-  end
-
-  def include_card_image_badge?
-    card_image_badge.present?
-  end
-
   def profile_background
     object.user_profile.profile_background
   end
@@ -349,22 +339,36 @@ class UserSerializer < BasicUserSerializer
     User.system_avatar_template(object.username)
   end
 
+  def include_gravatar_avatar_upload_id?
+    object.user_avatar&.gravatar_upload_id
+  end
+
   def gravatar_avatar_upload_id
-    object.user_avatar.try(:gravatar_upload_id)
+    object.user_avatar.gravatar_upload_id
+  end
+
+  def include_gravatar_avatar_template?
+    include_gravatar_avatar_upload_id?
   end
 
   def gravatar_avatar_template
-    return unless gravatar_upload_id = object.user_avatar.try(:gravatar_upload_id)
-    User.avatar_template(object.username, gravatar_upload_id)
+    User.avatar_template(object.username, object.user_avatar.gravatar_upload_id)
+  end
+
+  def include_custom_avatar_upload_id?
+    object.user_avatar&.custom_upload_id
   end
 
   def custom_avatar_upload_id
-    object.user_avatar.try(:custom_upload_id)
+    object.user_avatar.custom_upload_id
+  end
+
+  def include_custom_avatar_template?
+    include_custom_avatar_upload_id?
   end
 
   def custom_avatar_template
-    return unless custom_upload_id = object.user_avatar.try(:custom_upload_id)
-    User.avatar_template(object.username, custom_upload_id)
+    User.avatar_template(object.username, object.user_avatar.custom_upload_id)
   end
 
   def has_title_badges
diff --git a/app/serializers/web_hook_category_serializer.rb b/app/serializers/web_hook_category_serializer.rb
new file mode 100644
index 00000000000..57b979e0ce7
--- /dev/null
+++ b/app/serializers/web_hook_category_serializer.rb
@@ -0,0 +1,13 @@
+class WebHookCategorySerializer < CategorySerializer
+
+  %i{
+    can_edit
+    notification_level
+    available_groups
+  }.each do |attr|
+    define_method("include_#{attr}?") do
+      false
+    end
+  end
+
+end
diff --git a/app/serializers/web_hook_flag_serializer.rb b/app/serializers/web_hook_flag_serializer.rb
new file mode 100644
index 00000000000..847ae810e3d
--- /dev/null
+++ b/app/serializers/web_hook_flag_serializer.rb
@@ -0,0 +1,41 @@
+class WebHookFlagSerializer < ApplicationSerializer
+  attributes :id,
+             :post,
+             :flag_type,
+             :created_by,
+             :created_at,
+             :resolved_at,
+             :resolved_by
+
+  def post
+    WebHookPostSerializer.new(object.post, scope: scope, root: false).as_json
+  end
+
+  def flag_type
+    object.post_action_type_key
+  end
+
+  def include_post?
+    object.post.present?
+  end
+
+  def created_by
+    object.user && object.user.username
+  end
+
+  def resolved_at
+    object.disposed_at
+  end
+
+  def include_resolved_at?
+    object.disposed_at.present?
+  end
+
+  def resolved_by
+    User.find(object.disposed_by_id).username
+  end
+
+  def include_resolved_by?
+    object.disposed_by_id.present?
+  end
+end
diff --git a/app/serializers/web_hook_group_serializer.rb b/app/serializers/web_hook_group_serializer.rb
new file mode 100644
index 00000000000..66264abcaf2
--- /dev/null
+++ b/app/serializers/web_hook_group_serializer.rb
@@ -0,0 +1,12 @@
+class WebHookGroupSerializer < BasicGroupSerializer
+
+  %i{
+    is_group_user
+    is_group_owner
+  }.each do |attr|
+    define_method("include_#{attr}?") do
+      false
+    end
+  end
+
+end
diff --git a/app/serializers/web_hook_post_serializer.rb b/app/serializers/web_hook_post_serializer.rb
index 5d79ef5f483..455c1383e7c 100644
--- a/app/serializers/web_hook_post_serializer.rb
+++ b/app/serializers/web_hook_post_serializer.rb
@@ -1,4 +1,7 @@
 class WebHookPostSerializer < PostSerializer
+
+  attributes :topic_posts_count
+
   def include_topic_title?
     true
   end
@@ -9,9 +12,20 @@ class WebHookPostSerializer < PostSerializer
     can_delete
     can_recover
     can_wiki
+    actions_summary
+    can_view_edit_history
+    yours
+    primary_group_flair_url
+    primary_group_flair_bg_color
+    primary_group_flair_color
   }.each do |attr|
     define_method("include_#{attr}?") do
       false
     end
   end
+
+  def topic_posts_count
+    object.topic ? object.topic.posts_count : 0
+  end
+
 end
diff --git a/app/serializers/web_hook_topic_view_serializer.rb b/app/serializers/web_hook_topic_view_serializer.rb
index 75c99aeb14a..1aa71ccfd19 100644
--- a/app/serializers/web_hook_topic_view_serializer.rb
+++ b/app/serializers/web_hook_topic_view_serializer.rb
@@ -1,11 +1,36 @@
 require_dependency 'pinned_check'
 
 class WebHookTopicViewSerializer < TopicViewSerializer
-  def include_post_stream?
-    false
+  attributes :created_by,
+             :last_poster
+
+  %i{
+    post_stream
+    timeline_lookup
+    pm_with_non_human_user
+    draft
+    draft_key
+    draft_sequence
+    message_bus_last_id
+    suggested_topics
+    has_summary
+    actions_summary
+    current_post_number
+    chunk_size
+    topic_timer
+    private_topic_timer
+    details
+  }.each do |attr|
+    define_method("include_#{attr}?") do
+      false
+    end
   end
 
-  def include_timeline_lookup?
-    false
+  def created_by
+    BasicUserSerializer.new(object.topic.user, scope: scope, root: false)
+  end
+
+  def last_poster
+    BasicUserSerializer.new(object.topic.last_poster, scope: scope, root: false)
   end
 end
diff --git a/app/serializers/web_hook_user_serializer.rb b/app/serializers/web_hook_user_serializer.rb
index 8ddd71c8e6c..d715e4b0252 100644
--- a/app/serializers/web_hook_user_serializer.rb
+++ b/app/serializers/web_hook_user_serializer.rb
@@ -1,9 +1,45 @@
 class WebHookUserSerializer < UserSerializer
+  attributes :external_id
+
   # remove staff attributes
   def staff_attributes(*attrs)
   end
 
+  %i{
+    can_edit
+    can_edit_username
+    can_edit_email
+    can_edit_name
+    can_send_private_messages
+    can_send_private_message_to_user
+    uploaded_avatar_id
+    has_title_badges
+    bio_cooked
+    custom_fields
+    can_be_deleted
+    can_delete_all_posts
+    system_avatar_upload_id
+    gravatar_avatar_upload_id
+    custom_avatar_upload_id
+    can_change_bio
+    user_api_keys
+    group_users
+  }.each do |attr|
+    define_method("include_#{attr}?") do
+      false
+    end
+  end
+
   def include_email?
     scope.is_admin?
   end
+
+  def include_external_id?
+    scope.is_admin? && object.single_sign_on_record
+  end
+
+  def external_id
+    object.single_sign_on_record.external_id
+  end
+
 end
diff --git a/app/services/anonymous_shadow_creator.rb b/app/services/anonymous_shadow_creator.rb
index 7cb27438a6d..d28f89e2103 100644
--- a/app/services/anonymous_shadow_creator.rb
+++ b/app/services/anonymous_shadow_creator.rb
@@ -13,6 +13,7 @@ class AnonymousShadowCreator
     return unless user
     return unless SiteSetting.allow_anonymous_posting
     return if user.trust_level < SiteSetting.anonymous_posting_min_trust_level
+    return if SiteSetting.must_approve_users? && !user.approved?
 
     if (shadow_id = user.custom_fields["shadow_id"].to_i) > 0
       shadow = User.find_by(id: shadow_id)
@@ -35,11 +36,14 @@ class AnonymousShadowCreator
       shadow = User.create!(
         password: SecureRandom.hex,
         email: "#{SecureRandom.hex}@anon.#{Discourse.current_hostname}",
+        skip_email_validation: true,
         name: username, # prevents error when names are required
         username: username,
         active: true,
         trust_level: 1,
         manual_locked_trust_level: 1,
+        approved: true,
+        approved_at: 1.day.ago,
         created_at: 1.day.ago # bypass new user restrictions
       )
 
diff --git a/app/services/destroy_task.rb b/app/services/destroy_task.rb
new file mode 100644
index 00000000000..86768a79f7e
--- /dev/null
+++ b/app/services/destroy_task.rb
@@ -0,0 +1,90 @@
+## Because these methods are meant to be called from a rake task
+#   we are capturing all log output into a log array to return
+#   to the rake task rather than using `puts` statements.
+class DestroyTask
+  def self.destroy_topics(category)
+    c = Category.find_by_slug(category)
+    log = []
+    return "A category with the slug: #{category} could not be found" if c.nil?
+    topics = Topic.where(category_id: c.id, pinned_at: nil).where.not(user_id: -1)
+    log << "There are #{topics.count} topics to delete in #{category} category"
+    topics.each do |topic|
+      log << "Deleting #{topic.slug}..."
+      first_post = topic.ordered_posts.first
+      if first_post.nil?
+        return log << "Topic.ordered_posts.first was nil"
+      end
+      system_user = User.find(-1)
+      log << PostDestroyer.new(system_user, first_post).destroy
+    end
+    log
+  end
+
+  def self.destroy_topics_all_categories
+    categories = Category.all
+    log = []
+    categories.each do |c|
+      log << destroy_topics(c.slug)
+    end
+    log
+  end
+
+  def self.destroy_private_messages
+    pms = Topic.where(archetype: "private_message")
+    current_user = User.find(-1) #system
+    log = []
+    pms.each do |pm|
+      log << "Destroying #{pm.slug} pm"
+      first_post = pm.ordered_posts.first
+      log << PostDestroyer.new(current_user, first_post).destroy
+    end
+    log
+  end
+
+  def self.destroy_groups
+    groups = Group.where(automatic: false)
+    log = []
+    groups.each do |group|
+      log << "destroying group: #{group.id}"
+      log << group.destroy
+    end
+    log
+  end
+
+  def self.destroy_users
+    log = []
+    users = User.where(admin: false, id: 1..Float::INFINITY)
+    log << "There are #{users.count} users to delete"
+    options = {}
+    options[:delete_posts] = true
+    current_user = User.find(-1) #system
+    users.each do |user|
+      begin
+        if UserDestroyer.new(current_user).destroy(user, options)
+          log << "#{user.username} deleted"
+        else
+          log << "#{user.username} not deleted"
+        end
+      rescue UserDestroyer::PostsExistError
+        raise Discourse::InvalidAccess.new("User #{user.username} has #{user.post_count} posts, so can't be deleted.")
+      rescue NoMethodError
+        log << "#{user.username} could not be deleted"
+      end
+    end
+    log
+  end
+
+  def self.destroy_stats
+    ApplicationRequest.destroy_all
+    IncomingLink.destroy_all
+    UserVisit.destroy_all
+    UserProfileView.destroy_all
+    user_profiles = UserProfile.all
+    user_profiles.each do |user_profile|
+      user_profile.views = 0
+      user_profile.save!
+    end
+    PostAction.unscoped.destroy_all
+    EmailLog.destroy_all
+  end
+end
diff --git a/app/services/handle_chunk_upload.rb b/app/services/handle_chunk_upload.rb
index de5bf7837de..75362e54e59 100644
--- a/app/services/handle_chunk_upload.rb
+++ b/app/services/handle_chunk_upload.rb
@@ -42,8 +42,11 @@ class HandleChunkUpload
     tmp_directory   = @params[:tmp_directory]
 
     # delete destination files
-    File.delete(upload_path) rescue nil
-    File.delete(tmp_upload_path) rescue nil
+    begin
+      File.delete(upload_path)
+      File.delete(tmp_upload_path)
+    rescue Errno::ENOENT
+    end
 
     # merge all the chunks
     File.open(tmp_upload_path, "a") do |file|
@@ -59,7 +62,10 @@ class HandleChunkUpload
     FileUtils.mv(tmp_upload_path, upload_path, force: true)
 
     # remove tmp directory
-    FileUtils.rm_rf(tmp_directory) rescue nil
+    begin
+      FileUtils.rm_rf(tmp_directory)
+    rescue Errno::ENOENT
+    end
   end
 
 end
diff --git a/app/services/notification_emailer.rb b/app/services/notification_emailer.rb
index 9b593f3a177..099b2030b4a 100644
--- a/app/services/notification_emailer.rb
+++ b/app/services/notification_emailer.rb
@@ -72,6 +72,14 @@ class NotificationEmailer
     end
 
     def enqueue_private(type, delay = private_delay)
+
+      if notification.user.user_option.nil?
+        # this can happen if we roll back user creation really early
+        # or delete user
+        # bypass this pm
+        return
+      end
+
       return unless notification.user.user_option.email_private_messages?
       perform_enqueue(type, delay)
     end
@@ -91,7 +99,7 @@ class NotificationEmailer
     end
 
     def private_delay
-      SiteSetting.private_email_time_window_seconds
+      SiteSetting.personal_email_time_window_seconds
     end
 
     def post_type
diff --git a/app/services/post_action_notifier.rb b/app/services/post_action_notifier.rb
index 345e6aa735a..cc42feec420 100644
--- a/app/services/post_action_notifier.rb
+++ b/app/services/post_action_notifier.rb
@@ -13,7 +13,7 @@ class PostActionNotifier
   end
 
   def self.refresh_like_notification(post, read)
-    return unless post && post.user_id
+    return unless post && post.user_id && post.topic
 
     usernames = post.post_actions.where(post_action_type_id: PostActionType.types[:like])
       .joins(:user)
@@ -41,7 +41,6 @@ class PostActionNotifier
   end
 
   def self.post_action_deleted(post_action)
-
     return if @disabled
 
     # We only care about deleting post actions for now
@@ -69,7 +68,6 @@ class PostActionNotifier
   end
 
   def self.post_action_created(post_action)
-
     return if @disabled
 
     # We only notify on likes for now
@@ -89,7 +87,6 @@ class PostActionNotifier
   end
 
   def self.after_create_post_revision(post_revision)
-
     return if @disabled
 
     post = post_revision.post
@@ -97,6 +94,7 @@ class PostActionNotifier
     return unless post
     return if post_revision.user.blank?
     return if post_revision.user_id == post.user_id
+    return if post.topic.blank?
     return if post.topic.private_message?
     return if SiteSetting.disable_edit_notifications && post_revision.user_id == Discourse::SYSTEM_USER_ID
 
@@ -109,4 +107,17 @@ class PostActionNotifier
     )
   end
 
+  def self.after_post_unhide(post, flaggers)
+    return if @disabled || post.last_editor.blank? || flaggers.blank?
+
+    flaggers.each do |flagger|
+      alerter.create_notification(
+        flagger,
+        Notification.types[:edited],
+        post,
+        display_username: post.last_editor.username,
+        acting_user_id: post.last_editor.id
+      )
+    end
+  end
 end
diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb
index 63e33aa67b3..476856253b8 100644
--- a/app/services/post_alerter.rb
+++ b/app/services/post_alerter.rb
@@ -3,8 +3,7 @@ require_dependency 'user_action_creator'
 
 class PostAlerter
   def self.post_created(post, opts = {})
-    alerter = PostAlerter.new(opts)
-    alerter.after_save_post(post, true)
+    PostAlerter.new(opts).after_save_post(post, true)
     post
   end
 
@@ -38,32 +37,37 @@ class PostAlerter
     allowed_group_users(post)
   end
 
+  def only_allowed_users(users, post)
+    users.select { |u| allowed_users(post).include?(u) || allowed_group_users(post).include?(u) }
+  end
+
   def notify_about_reply?(post)
     post.post_type == Post.types[:regular] || post.post_type == Post.types[:whisper]
   end
 
   def after_save_post(post, new_record = false)
-    notified = [post.user]
+    notified = [post.user, post.last_editor].uniq
 
     # mentions (users/groups)
     mentioned_groups, mentioned_users = extract_mentions(post)
 
     if mentioned_groups || mentioned_users
       mentioned_opts = {}
+      editor = post.last_editor
+
       if post.last_editor_id != post.user_id
         # Mention comes from an edit by someone else, so notification should say who added the mention.
-        editor = post.last_editor
         mentioned_opts = { user_id: editor.id, original_username: editor.username, display_username: editor.username }
       end
 
       expand_group_mentions(mentioned_groups, post) do |group, users|
-        notify_non_pm_users(users - notified, :group_mentioned, post, mentioned_opts.merge(group: group))
-        notified += users
+        users = only_allowed_users(users, post) if editor.id < 0
+        notified += notify_users(users - notified, :group_mentioned, post, mentioned_opts.merge(group: group))
       end
 
       if mentioned_users
-        notify_non_pm_users(mentioned_users - notified, :mentioned, post, mentioned_opts)
-        notified += mentioned_users
+        mentioned_users = only_allowed_users(mentioned_users, post) if editor.id < 0
+        notified += notify_users(mentioned_users - notified, :mentioned, post, mentioned_opts)
       end
     end
 
@@ -71,51 +75,22 @@ class PostAlerter
     reply_to_user = post.reply_notification_target
 
     if new_record && reply_to_user && !notified.include?(reply_to_user) && notify_about_reply?(post)
-      notify_non_pm_users(reply_to_user, :replied, post)
-      notified += [reply_to_user]
+      notified += notify_non_pm_users(reply_to_user, :replied, post)
     end
 
     # quotes
     quoted_users = extract_quoted_users(post)
-    notify_non_pm_users(quoted_users - notified, :quoted, post)
-    notified += quoted_users
+    notified += notify_non_pm_users(quoted_users - notified, :quoted, post)
 
     # linked
     linked_users = extract_linked_users(post)
-    notify_non_pm_users(linked_users - notified, :linked, post)
-    notified += linked_users
+    notified += notify_non_pm_users(linked_users - notified, :linked, post)
 
     # private messages
     if new_record
       if post.topic.private_message?
-        # users that aren't part of any mentioned groups
-        users = directly_targeted_users(post)
-        DiscourseEvent.trigger(:before_create_notifications_for_users, users, post)
-        users.each do |user|
-          notification_level = TopicUser.get(post.topic, user).try(:notification_level)
-          if notified.include?(user) || notification_level == TopicUser.notification_levels[:watching] || user.staged?
-            create_notification(user, Notification.types[:private_message], post)
-          end
-        end
-        # users that are part of all mentionned groups
-        users = indirectly_targeted_users(post)
-        DiscourseEvent.trigger(:before_create_notifications_for_users, users, post)
-        users.each do |user|
-          # only create a notification when watching the group
-          notification_level = TopicUser.get(post.topic, user).try(:notification_level)
-
-          if notification_level == TopicUser.notification_levels[:watching]
-            create_notification(user, Notification.types[:private_message], post)
-          elsif notification_level == TopicUser.notification_levels[:tracking]
-            if notified.include?(user)
-              create_notification(user, Notification.types[:private_message], post)
-            else
-              notify_group_summary(user, post)
-            end
-          end
-        end
+        notify_pm_users(post, reply_to_user, notified)
       elsif post.post_type == Post.types[:regular]
-        # If it's not a private message and it's not an automatic post caused by a moderator action, notify the users
         notify_post_users(post, notified)
       end
     end
@@ -126,38 +101,44 @@ class PostAlerter
       topic = post.topic
 
       if topic.present?
-        cat_watchers = topic.category_users
-          .where(notification_level: CategoryUser.notification_levels[:watching_first_post])
-          .pluck(:user_id)
-
-        tag_watchers = topic.tag_users
-          .where(notification_level: TagUser.notification_levels[:watching_first_post])
-          .pluck(:user_id)
-
-        group_ids = topic.allowed_groups.pluck(:group_id)
-        group_watchers = GroupUser.where(group_id: group_ids,
-                                         notification_level: GroupUser.notification_levels[:watching_first_post])
-          .pluck(:user_id)
-
-        watchers = [cat_watchers, tag_watchers, group_watchers].flatten
-
+        watchers = category_watchers(topic) + tag_watchers(topic) + group_watchers(topic)
         notify_first_post_watchers(post, watchers)
       end
     end
   end
 
+  def group_watchers(topic)
+    GroupUser.where(
+      group_id: topic.allowed_groups.pluck(:group_id),
+      notification_level: GroupUser.notification_levels[:watching_first_post]
+    ).pluck(:user_id)
+  end
+
+  def tag_watchers(topic)
+    topic.tag_users
+      .where(notification_level: TagUser.notification_levels[:watching_first_post])
+      .pluck(:user_id)
+  end
+
+  def category_watchers(topic)
+    topic.category_users
+      .where(notification_level: CategoryUser.notification_levels[:watching_first_post])
+      .pluck(:user_id)
+  end
+
   def notify_first_post_watchers(post, user_ids)
     return if user_ids.blank?
-
     user_ids.uniq!
 
+    warn_if_not_sidekiq
+
     # Don't notify the OP
     user_ids -= [post.user_id]
-
     users = User.where(id: user_ids)
+
     DiscourseEvent.trigger(:before_create_notifications_for_users, users, post)
-    users.each do |u|
-      create_notification(u, Notification.types[:watching_first_post], post)
+    users.each do |user|
+      create_notification(user, Notification.types[:watching_first_post], post)
     end
   end
 
@@ -193,14 +174,19 @@ class PostAlerter
     unread_posts(user, topic).count
   end
 
-  def destroy_notifications(user, type, topic)
+  def destroy_notifications(user, types, topic)
     return if user.blank?
     return unless Guardian.new(user).can_see?(topic)
 
-    user.notifications.where(notification_type: type,
-                             topic_id: topic.id).destroy_all
-    # HACK so notification counts sync up correctly
-    user.reload
+    User.transaction do
+      user.notifications.where(
+        notification_type: types,
+        topic_id: topic.id
+      ).destroy_all
+
+      # Reload so notification counts sync up correctly
+      user.reload
+    end
   end
 
   NOTIFIABLE_TYPES = [:mentioned, :replied, :quoted, :posted, :linked, :private_message, :group_mentioned].map { |t|
@@ -223,7 +209,6 @@ class PostAlerter
   end
 
   def notify_group_summary(user, post)
-
     @group_stats ||= {}
     stats = (@group_stats[post.topic_id] ||= group_stats(post.topic))
     return unless stats
@@ -263,12 +248,9 @@ class PostAlerter
   end
 
   def should_notify_like?(user, notification)
-
     return true if user.user_option.like_notification_frequency == UserOption.like_notification_frequency_type[:always]
-
     return true if user.user_option.like_notification_frequency == UserOption.like_notification_frequency_type[:first_time_and_daily] && notification.created_at < 1.day.ago
-
-    return false
+    false
   end
 
   def should_notify_previous?(user, notification, opts)
@@ -349,9 +331,7 @@ class PostAlerter
     collapsed = false
 
     if COLLAPSED_NOTIFICATION_TYPES.include?(type)
-      COLLAPSED_NOTIFICATION_TYPES.each do |t|
-        destroy_notifications(user, t, post.topic)
-      end
+      destroy_notifications(user, COLLAPSED_NOTIFICATION_TYPES, post.topic)
       collapsed = true
     end
 
@@ -402,18 +382,19 @@ class PostAlerter
     end
 
     # Create the notification
-    user.notifications.create(notification_type: type,
-                              topic_id: post.topic_id,
-                              post_number: post.post_number,
-                              post_action_id: opts[:post_action_id],
-                              data: notification_data.to_json,
-                              skip_send_email: skip_send_email)
+    created = user.notifications.create!(
+      notification_type: type,
+      topic_id: post.topic_id,
+      post_number: post.post_number,
+      post_action_id: opts[:post_action_id],
+      data: notification_data.to_json,
+      skip_send_email: skip_send_email
+    )
 
-   if !existing_notification && NOTIFIABLE_TYPES.include?(type) && !user.suspended?
-     # we may have an invalid post somehow, dont blow up
-     post_url = original_post.url rescue nil
-     if post_url
-       payload = {
+    if created.id && !existing_notification && NOTIFIABLE_TYPES.include?(type) && !user.suspended?
+      post_url = original_post.url
+      if post_url
+        payload = {
          notification_type: type,
          post_number: original_post.post_number,
          topic_title: original_post.topic.title,
@@ -421,14 +402,15 @@ class PostAlerter
          excerpt: original_post.excerpt(400, text_entities: true, strip_links: true, remap_emoji: true),
          username: original_username,
          post_url: post_url
-       }
+        }
 
         MessageBus.publish("/notification-alert/#{user.id}", payload, user_ids: [user.id])
         push_notification(user, payload)
         DiscourseEvent.trigger(:post_notification_alert, user, payload)
-     end
-   end
+      end
+    end
 
+    created.id ? created : nil
   end
 
   def contains_email_address?(addresses, user)
@@ -437,10 +419,16 @@ class PostAlerter
   end
 
   def push_notification(user, payload)
+    if user.push_subscriptions.exists?
+      Jobs.enqueue(:send_push_notification, user_id: user.id, payload: payload)
+    end
+
     if SiteSetting.allow_user_api_key_scopes.split("|").include?("push") && SiteSetting.allowed_user_api_push_urls.present?
       clients = user.user_api_keys
-        .where("('push' = ANY(scopes) OR 'notifications' = ANY(scopes)) AND push_url IS NOT NULL AND position(push_url in ?) > 0 AND revoked_at IS NULL",
-                  SiteSetting.allowed_user_api_push_urls)
+        .where("('push' = ANY(scopes) OR 'notifications' = ANY(scopes))")
+        .where("push_url IS NOT NULL")
+        .where("position(push_url IN ?) > 0", SiteSetting.allowed_user_api_push_urls)
+        .where("revoked_at IS NULL")
         .pluck(:client_id, :push_url)
 
       if clients.length > 0
@@ -495,61 +483,115 @@ class PostAlerter
 
   # Notify a bunch of users
   def notify_non_pm_users(users, type, post, opts = {})
+    return [] if post.topic&.private_message?
 
-    return if post.topic.try(:private_message?)
+    notify_users(users, type, post, opts)
+  end
 
+  def notify_users(users, type, post, opts = {})
     users = [users] unless users.is_a?(Array)
+    users = users.reject { |u| u.staged? } if post.topic&.private_message?
+
+    warn_if_not_sidekiq
 
     DiscourseEvent.trigger(:before_create_notifications_for_users, users, post)
     users.each do |u|
       create_notification(u, Notification.types[type], post, opts)
     end
+
+    users
+  end
+
+  def notify_pm_users(post, reply_to_user, notified)
+    return unless post.topic
+
+    warn_if_not_sidekiq
+
+    # users that aren't part of any mentioned groups
+    users = directly_targeted_users(post).reject { |u| notified.include?(u) }
+    DiscourseEvent.trigger(:before_create_notifications_for_users, users, post)
+    users.each do |user|
+      notification_level = TopicUser.get(post.topic, user)&.notification_level
+      if reply_to_user == user || notification_level == TopicUser.notification_levels[:watching] || user.staged?
+        create_notification(user, Notification.types[:private_message], post)
+      end
+    end
+
+    # users that are part of all mentionned groups
+    users = indirectly_targeted_users(post).reject { |u| notified.include?(u) }
+    DiscourseEvent.trigger(:before_create_notifications_for_users, users, post)
+    users.each do |user|
+      case TopicUser.get(post.topic, user)&.notification_level
+      when TopicUser.notification_levels[:watching]
+        # only create a notification when watching the group
+        create_notification(user, Notification.types[:private_message], post)
+      when TopicUser.notification_levels[:tracking]
+        notify_group_summary(user, post)
+      end
+    end
   end
 
   def notify_post_users(post, notified)
     return unless post.topic
 
-    condition = <<SQL
+    warn_if_not_sidekiq
 
-    id IN (
-      SELECT user_id FROM topic_users
-        WHERE notification_level = :watching AND topic_id = :topic_id
+    condition = <<~SQL
+      id IN (
+        SELECT user_id
+          FROM topic_users
+         WHERE notification_level = :watching
+           AND topic_id = :topic_id
 
-      UNION ALL
+         UNION
 
-      SELECT cu.user_id FROM category_users cu
-      LEFT JOIN topic_users tu ON tu.user_id = cu.user_id AND tu.topic_id = :topic_id
-      WHERE cu.notification_level = :watching AND cu.category_id = :category_id AND tu.user_id IS NULL
+        SELECT cu.user_id
+          FROM category_users cu
+     LEFT JOIN topic_users tu ON tu.user_id = cu.user_id
+                             AND tu.topic_id = :topic_id
+         WHERE cu.notification_level = :watching
+           AND cu.category_id = :category_id
+           AND tu.user_id IS NULL
 
-      /*tags*/
-    )
-SQL
+        /*tags*/
+      )
+    SQL
 
     tag_ids = post.topic.topic_tags.pluck('topic_tags.tag_id')
-    if tag_ids.present?
-      condition.sub! "/*tags*/", <<SQL
-      UNION ALL
 
-      SELECT tag_users.user_id FROM tag_users
-      LEFT JOIN topic_users tu ON tu.user_id = tag_users.user_id AND tu.topic_id = :topic_id
-      WHERE tag_users.notification_level = :watching AND tag_users.tag_id IN (:tag_ids) AND tu.user_id IS NULL
-SQL
+    if tag_ids.present?
+      condition.sub! "/*tags*/", <<~SQL
+        UNION
+
+        SELECT tag_users.user_id
+          FROM tag_users
+     LEFT JOIN topic_users tu ON tu.user_id = tag_users.user_id
+                             AND tu.topic_id = :topic_id
+         WHERE tag_users.notification_level = :watching
+           AND tag_users.tag_id IN (:tag_ids)
+           AND tu.user_id IS NULL
+      SQL
     end
 
     notify = User.where(condition,
-                          watching: TopicUser.notification_levels[:watching],
-                          topic_id: post.topic_id,
-                          category_id: post.topic.category_id,
-                          tag_ids: tag_ids
-                       )
+      watching: TopicUser.notification_levels[:watching],
+      topic_id: post.topic_id,
+      category_id: post.topic.category_id,
+      tag_ids: tag_ids
+    )
 
     exclude_user_ids = notified.map(&:id)
     notify = notify.where("id NOT IN (?)", exclude_user_ids) if exclude_user_ids.present?
 
     DiscourseEvent.trigger(:before_create_notifications_for_users, notify, post)
-    notify.each do |user|
+    notify.pluck(:id).each do |user_id|
+      user = User.find_by(id: user_id)
       create_notification(user, Notification.types[:posted], post)
     end
   end
 
+  def warn_if_not_sidekiq
+    Rails.logger.warn("PostAlerter.#{caller_locations(1, 1)[0].label} was called outside of sidekiq") unless Sidekiq.server?
+  end
+
 end
diff --git a/app/services/post_owner_changer.rb b/app/services/post_owner_changer.rb
index f419289faa0..df318659dad 100644
--- a/app/services/post_owner_changer.rb
+++ b/app/services/post_owner_changer.rb
@@ -11,18 +11,23 @@ class PostOwnerChanger
   end
 
   def change_owner!
-    ActiveRecord::Base.transaction do
-      @post_ids.each do |post_id|
-        post = Post.with_deleted.where(id: post_id, topic_id: @topic.id).first
-        next if post.blank?
-        @topic.user = @new_owner if post.is_first_post?
+    @post_ids.each do |post_id|
+      next unless post = Post.with_deleted.find_by(id: post_id, topic_id: @topic.id)
 
-        if post.user == nil
-          @topic.recover! if post.is_first_post?
-        end
-        post.topic = @topic
-        post.set_owner(@new_owner, @acting_user, @skip_revision)
-        PostAction.remove_act(@new_owner, post, PostActionType.types[:like])
+      if post.is_first_post?
+        @topic.user = @new_owner
+        @topic.recover! if post.user.nil?
+      end
+
+      post.topic = @topic
+      post.set_owner(@new_owner, @acting_user, @skip_revision)
+      PostAction.remove_act(@new_owner, post, PostActionType.types[:like])
+
+      level = post.is_first_post? ? :watching : :tracking
+      TopicUser.change(@new_owner.id, @topic.id, notification_level: NotificationLevels.topic_levels[level])
+
+      if post == @topic.posts.order("post_number DESC").where("NOT hidden AND posts.deleted_at IS NULL").first
+        @topic.last_poster = @new_owner
       end
 
       @topic.update_statistics
@@ -31,7 +36,7 @@ class PostOwnerChanger
         first_post_created_at: @new_owner.reload.posts.order('created_at ASC').first&.created_at
       )
 
-      @topic.save!
+      @topic.save!(validate: false)
     end
   end
 end
diff --git a/app/services/push_notification_pusher.rb b/app/services/push_notification_pusher.rb
new file mode 100644
index 00000000000..204e3f668be
--- /dev/null
+++ b/app/services/push_notification_pusher.rb
@@ -0,0 +1,90 @@
+require_dependency 'webpush'
+
+class PushNotificationPusher
+  def self.push(user, payload)
+    subscriptions(user).each do |subscription|
+      subscription = JSON.parse(subscription.data)
+
+      message = {
+        title: I18n.t(
+          "discourse_push_notifications.popup.#{Notification.types[payload[:notification_type]]}",
+          site_title: SiteSetting.title,
+          topic: payload[:topic_title],
+          username: payload[:username]
+        ),
+        body: payload[:excerpt],
+        badge: get_badge,
+        icon: ActionController::Base.helpers.image_url("push-notifications/#{Notification.types[payload[:notification_type]]}.png"),
+        tag: "#{Discourse.current_hostname}-#{payload[:topic_id]}",
+        base_url: Discourse.base_url,
+        url: payload[:post_url],
+        hide_when_active: true
+      }
+      send_notification user, subscription, message
+    end
+  end
+
+  def self.subscriptions(user)
+    user.push_subscriptions
+  end
+
+  def self.clear_subscriptions(user)
+    user.push_subscriptions.clear
+  end
+
+  def self.subscribe(user, subscription, send_confirmation)
+    data = subscription.to_json
+    subscriptions = PushSubscription.where(user: user, data: data)
+    subscriptions_count = subscriptions.count
+
+    if subscriptions_count > 1
+      subscriptions.destroy_all
+      PushSubscription.create!(user: user, data: data)
+    elsif subscriptions_count == 0
+      PushSubscription.create!(user: user, data: data)
+    end
+
+    if send_confirmation == "true"
+      message = {
+        title: I18n.t("discourse_push_notifications.popup.confirm_title",
+                      site_title: SiteSetting.title),
+        body: I18n.t("discourse_push_notifications.popup.confirm_body"),
+        icon:  ActionController::Base.helpers.image_url("push-notifications/check.png"),
+        badge: get_badge,
+        tag: "#{Discourse.current_hostname}-subscription"
+      }
+
+      send_notification user, subscription, message
+    end
+  end
+
+  def self.unsubscribe(user, subscription)
+    PushSubscription.find_by(user: user, data: subscription.to_json)&.destroy!
+  end
+
+  protected
+
+  def self.get_badge
+    return !SiteSetting.push_notifications_icon_url.blank? ?
+             SiteSetting.push_notifications_icon_url :
+             ActionController::Base.helpers.image_url("push-notifications/discourse.png")
+  end
+
+  def self.send_notification(user, subscription, message)
+    begin
+      response = Webpush.payload_send(
+        endpoint: subscription["endpoint"],
+        message: message.to_json,
+        p256dh: subscription.dig("keys", "p256dh"),
+        auth: subscription.dig("keys", "auth"),
+        vapid: {
+          subject: Discourse.base_url,
+          public_key: SiteSetting.vapid_public_key,
+          private_key: SiteSetting.vapid_private_key
+        }
+      )
+    rescue Webpush::InvalidSubscription => e
+      unsubscribe user, subscription
+    end
+  end
+end
diff --git a/app/services/random_topic_selector.rb b/app/services/random_topic_selector.rb
index 4aaa7d3343f..a484c91be15 100644
--- a/app/services/random_topic_selector.rb
+++ b/app/services/random_topic_selector.rb
@@ -6,9 +6,6 @@ class RandomTopicSelector
   def self.backfill(category = nil)
     exclude = category&.topic_id
 
-    # don't leak private categories into the "everything" group
-    user = category ? CategoryFeaturedTopic.fake_admin : nil
-
     options = {
       per_page: category ? category.num_featured_topics : 3,
       visible: true,
@@ -16,9 +13,20 @@ class RandomTopicSelector
     }
 
     options[:except_topic_ids] = [category.topic_id] if exclude
-    options[:category] = category.id if category
 
-    query = TopicQuery.new(user, options)
+    if category
+      options[:category] = category.id
+      # NOTE: at the moment this site setting scopes tightly to a category (excluding subcats)
+      # this is done so we don't populate a junk cache
+      if SiteSetting.limit_suggested_to_category
+        options[:no_subcategories] = true
+      end
+
+      # don't leak private categories into the "everything" group
+      options[:guardian] = Guardian.new(CategoryFeaturedTopic.fake_admin)
+    end
+
+    query = TopicQuery.new(nil, options)
 
     results = query.latest_results.order('RANDOM()')
       .where(closed: false, archived: false)
@@ -83,4 +91,8 @@ class RandomTopicSelector
     "random_topic_cache_#{category&.id}"
   end
 
+  def self.clear_cache!
+    $redis.delete_prefixed(cache_key)
+  end
+
 end
diff --git a/app/services/search_indexer.rb b/app/services/search_indexer.rb
index fdf6b506690..35ccd7a378b 100644
--- a/app/services/search_indexer.rb
+++ b/app/services/search_indexer.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency 'search'
 
 class SearchIndexer
@@ -14,111 +15,152 @@ class SearchIndexer
     HtmlScrubber.scrub(html)
   end
 
-  def self.update_index(table, id, raw_data)
-    raw_data = Search.prepare_data(raw_data, :index)
-
-    table_name = "#{table}_search_data"
-    foreign_key = "#{table}_id"
-
+  def self.inject_extra_terms(raw)
     # insert some extra words for I.am.a.word so "word" is tokenized
     # I.am.a.word becomes I.am.a.word am a word
-    search_data = raw_data.gsub(/[^[:space:]]*[\.]+[^[:space:]]*/) do |with_dot|
+    raw.gsub(/[^[:space:]]*[\.]+[^[:space:]]*/) do |with_dot|
       split = with_dot.split(".")
       if split.length > 1
-        with_dot + (" " << split[1..-1].join(" "))
+        with_dot + ((+" ") << split[1..-1].join(" "))
       else
         with_dot
       end
     end
+  end
+
+  def self.update_index(table: , id: , raw_data:)
+    search_data = raw_data.map do |data|
+      inject_extra_terms(Search.prepare_data(data || "", :index))
+    end
+
+    table_name = "#{table}_search_data"
+    foreign_key = "#{table}_id"
 
     # for user login and name use "simple" lowercase stemmer
     stemmer = table == "user" ? "simple" : Search.ts_config
 
+    ranked_index = <<~SQL
+      setweight(to_tsvector('#{stemmer}', coalesce(:a,'')), 'A') ||
+      setweight(to_tsvector('#{stemmer}', coalesce(:b,'')), 'B') ||
+      setweight(to_tsvector('#{stemmer}', coalesce(:c,'')), 'C') ||
+      setweight(to_tsvector('#{stemmer}', coalesce(:d,'')), 'D')
+    SQL
+
+    indexed_data = search_data.select { |d| d.length > 0 }.join(' ')
+
+    params = {
+      a: search_data[0],
+      b: search_data[1],
+      c: search_data[2],
+      d: search_data[3],
+      raw_data: indexed_data,
+      id: id,
+      locale: SiteSetting.default_locale,
+      version: Search::INDEX_VERSION
+    }
+
     # Would be nice to use AR here but not sure how to execut Postgres functions
     # when inserting data like this.
-    rows = Post.exec_sql_row_count("UPDATE #{table_name}
-                                   SET
-                                      raw_data = :raw_data,
-                                      locale = :locale,
-                                      search_data = TO_TSVECTOR('#{stemmer}', :search_data),
-                                      version = :version
-                                   WHERE #{foreign_key} = :id",
-                                    raw_data: raw_data,
-                                    search_data: search_data,
-                                    id: id,
-                                    locale: SiteSetting.default_locale,
-                                    version: Search::INDEX_VERSION)
+    rows = Post.exec_sql_row_count(<<~SQL, params)
+       UPDATE #{table_name}
+       SET
+          raw_data = :raw_data,
+          locale = :locale,
+          search_data = #{ranked_index},
+          version = :version
+       WHERE #{foreign_key} = :id
+    SQL
+
     if rows == 0
-      Post.exec_sql("INSERT INTO #{table_name}
-                    (#{foreign_key}, search_data, locale, raw_data, version)
-                    VALUES (:id, TO_TSVECTOR('#{stemmer}', :search_data), :locale, :raw_data, :version)",
-                                    raw_data: raw_data,
-                                    search_data: search_data,
-                                    id: id,
-                                    locale: SiteSetting.default_locale,
-                                    version: Search::INDEX_VERSION)
+      Post.exec_sql(<<~SQL, params)
+        INSERT INTO #{table_name}
+        (#{foreign_key}, search_data, locale, raw_data, version)
+        VALUES (:id, #{ranked_index}, :locale, :raw_data, :version)
+      SQL
     end
   rescue
-    # don't allow concurrency to mess up saving a post
+    # TODO is there any way we can safely avoid this?
+    # best way is probably pushing search indexer into a dedicated process so it no longer happens on save
+    # instead in the post processor
   end
 
   def self.update_topics_index(topic_id, title, cooked)
-    search_data = title.dup << " " << scrub_html_for_search(cooked)[0...Topic::MAX_SIMILAR_BODY_LENGTH]
-    update_index('topic', topic_id, search_data)
+    scrubbed_cooked = scrub_html_for_search(cooked)[0...Topic::MAX_SIMILAR_BODY_LENGTH]
+
+    # a bit inconsitent that we use title as A and body as B when in
+    # the post index body is C
+    update_index(table: 'topic', id: topic_id, raw_data: [title, scrubbed_cooked])
   end
 
-  def self.update_posts_index(post_id, cooked, title, category)
-    search_data = scrub_html_for_search(cooked) << " " << title.dup.force_encoding('UTF-8')
-    search_data << " " << category if category
-    update_index('post', post_id, search_data)
+  def self.update_posts_index(post_id, title, category, tags, cooked)
+    update_index(table: 'post', id: post_id, raw_data: [title, category, tags, scrub_html_for_search(cooked)])
   end
 
   def self.update_users_index(user_id, username, name)
-    search_data = username.dup << " " << (name || "")
-    update_index('user', user_id, search_data)
+    update_index(table: 'user', id: user_id, raw_data: [username, name])
   end
 
   def self.update_categories_index(category_id, name)
-    update_index('category', category_id, name)
+    update_index(table: 'category', id: category_id, raw_data: [name])
   end
 
   def self.update_tags_index(tag_id, name)
-    update_index('tag', tag_id, name)
+    update_index(table: 'tag', id: tag_id, raw_data: [name])
+  end
+
+  def self.queue_post_reindex(topic_id)
+    return if @disabled
+
+    ActiveRecord::Base.exec_sql(<<~SQL, topic_id: topic_id)
+      UPDATE post_search_data
+      SET version = 0
+      WHERE post_id IN (SELECT id FROM posts WHERE topic_id = :topic_id)
+    SQL
   end
 
   def self.index(obj, force: false)
     return if @disabled
 
-    if obj.class == Post && (obj.saved_change_to_cooked? || force)
-      if obj.topic
-        category_name = obj.topic.category.name if obj.topic.category
-        SearchIndexer.update_posts_index(obj.id, obj.cooked, obj.topic.title, category_name)
-        SearchIndexer.update_topics_index(obj.topic_id, obj.topic.title, obj.cooked) if obj.is_first_post?
+    category_name, tag_names = nil
+    topic = nil
+
+    if Topic === obj
+      topic = obj
+    elsif Post === obj
+      topic = obj.topic
+    end
+
+    category_name = topic.category&.name if topic
+    tag_names = topic.tags.pluck(:name).join(' ') if topic
+
+    if Post === obj && (obj.saved_change_to_cooked? || force)
+      if topic
+        SearchIndexer.update_posts_index(obj.id, topic.title, category_name, tag_names, obj.cooked)
+        SearchIndexer.update_topics_index(topic.id, topic.title, obj.cooked) if obj.is_first_post?
       else
         Rails.logger.warn("Orphan post skipped in search_indexer, topic_id: #{obj.topic_id} post_id: #{obj.id} raw: #{obj.raw}")
       end
     end
 
-    if obj.class == User && (obj.saved_change_to_username? || obj.saved_change_to_name? || force)
+    if User === obj && (obj.saved_change_to_username? || obj.saved_change_to_name? || force)
       SearchIndexer.update_users_index(obj.id, obj.username_lower || '', obj.name ? obj.name.downcase : '')
     end
 
-    if obj.class == Topic && (obj.saved_change_to_title? || force)
+    if Topic === obj && (obj.saved_change_to_title? || force)
       if obj.posts
         post = obj.posts.find_by(post_number: 1)
         if post
-          category_name = obj.category.name if obj.category
-          SearchIndexer.update_posts_index(post.id, post.cooked, obj.title, category_name)
+          SearchIndexer.update_posts_index(post.id, obj.title, category_name, tag_names, post.cooked)
           SearchIndexer.update_topics_index(obj.id, obj.title, post.cooked)
         end
       end
     end
 
-    if obj.class == Category && (obj.saved_change_to_name? || force)
+    if Category === obj && (obj.saved_change_to_name? || force)
       SearchIndexer.update_categories_index(obj.id, obj.name)
     end
 
-    if obj.class == Tag && (obj.saved_change_to_name? || force)
+    if Tag === obj && (obj.saved_change_to_name? || force)
       SearchIndexer.update_tags_index(obj.id, obj.name)
     end
   end
@@ -127,14 +169,14 @@ class SearchIndexer
     attr_reader :scrubbed
 
     def initialize
-      @scrubbed = ""
+      @scrubbed = +""
     end
 
     def self.scrub(html)
       me = new
       parser = Nokogiri::HTML::SAX::Parser.new(me)
       begin
-        copy = "<div>"
+        copy = +"<div>"
         copy << html unless html.nil?
         copy << "</div>"
         parser.parse(html) unless html.nil?
@@ -154,6 +196,11 @@ class SearchIndexer
         scrubbed << attributes["title"]
         scrubbed << " "
       end
+      if attributes["data-youtube-title"]
+        scrubbed << " "
+        scrubbed << attributes["data-youtube-title"]
+        scrubbed << " "
+      end
     end
 
     def characters(string)
diff --git a/app/services/site_settings_task.rb b/app/services/site_settings_task.rb
new file mode 100644
index 00000000000..a25fc9c5a44
--- /dev/null
+++ b/app/services/site_settings_task.rb
@@ -0,0 +1,38 @@
+class SiteSettingsTask
+  def self.export_to_hash
+    site_settings = SiteSetting.all_settings
+    h = {}
+    site_settings.each do |site_setting|
+      h.store(site_setting[:setting].to_s, site_setting[:value])
+    end
+    h
+  end
+
+  def self.import(yml)
+    h = SiteSettingsTask.export_to_hash
+    counts = { updated: 0, not_found: 0, errors: 0 }
+    log = []
+
+    site_settings = YAML::load(yml)
+    site_settings.each do |site_setting|
+      key = site_setting[0]
+      val = site_setting[1]
+      if h.has_key?(key)
+        if val != h[key] #only update if different
+          begin
+            result = SiteSetting.set_and_log(key, val)
+            log << "Changed #{key} FROM: #{result.previous_value} TO: #{result.new_value}"
+            counts[:updated] += 1
+          rescue => e
+            log << "ERROR: #{e.message}"
+            counts[:errors] += 1
+          end
+        end
+      else
+        log << "NOT FOUND: existing site setting not found for #{key}"
+        counts[:not_found] += 1
+      end
+    end
+    return log, counts
+  end
+end
diff --git a/app/services/staff_action_logger.rb b/app/services/staff_action_logger.rb
index 924bed26efc..07a47a4c48d 100644
--- a/app/services/staff_action_logger.rb
+++ b/app/services/staff_action_logger.rb
@@ -1,3 +1,5 @@
+require_dependency 'staff_message_format'
+
 # Responsible for logging the actions of admins and moderators.
 class StaffActionLogger
 
@@ -10,11 +12,16 @@ class StaffActionLogger
     raise Discourse::InvalidParameters.new(:admin) unless @admin && @admin.is_a?(User)
   end
 
+  USER_FIELDS ||= %i{id username name created_at trust_level last_seen_at last_emailed_at}
+
   def log_user_deletion(deleted_user, opts = {})
     raise Discourse::InvalidParameters.new(:deleted_user) unless deleted_user && deleted_user.is_a?(User)
-    UserHistory.create(params(opts).merge(action: UserHistory.actions[:delete_user],
-                                          ip_address: deleted_user.ip_address.to_s,
-                                          details: [:id, :username, :name, :created_at, :trust_level, :last_seen_at, :last_emailed_at].map { |x| "#{x}: #{deleted_user.send(x)}" }.join("\n")))
+    details = USER_FIELDS.map { |x| "#{x}: #{deleted_user.send(x)}" }.join("\n")
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:delete_user],
+      ip_address: deleted_user.ip_address.to_s,
+      details: details
+    ))
   end
 
   def log_custom(custom_type, details = nil)
@@ -31,7 +38,7 @@ class StaffActionLogger
     attrs[:action] = UserHistory.actions[:custom_staff]
     attrs[:custom_type] = custom_type
 
-    UserHistory.create(attrs)
+    UserHistory.create!(attrs)
   end
 
   def log_post_deletion(deleted_post, opts = {})
@@ -52,53 +59,89 @@ class StaffActionLogger
       "raw: #{deleted_post.raw}"
     ]
 
-    UserHistory.create(params(opts).merge(action: UserHistory.actions[:delete_post],
-                                          post_id: deleted_post.id,
-                                          details: details.join("\n")))
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:delete_post],
+      post_id: deleted_post.id,
+      details: details.join("\n")
+    ))
   end
 
-  def log_topic_deletion(deleted_topic, opts = {})
-    raise Discourse::InvalidParameters.new(:deleted_topic) unless deleted_topic && deleted_topic.is_a?(Topic)
+  def log_topic_delete_recover(topic, action = "delete_topic", opts = {})
+    raise Discourse::InvalidParameters.new(:topic) unless topic && topic.is_a?(Topic)
 
-    user = deleted_topic.user ? "#{deleted_topic.user.username} (#{deleted_topic.user.name})" : "(deleted user)"
+    user = topic.user ? "#{topic.user.username} (#{topic.user.name})" : "(deleted user)"
 
     details = [
-      "id: #{deleted_topic.id}",
-      "created_at: #{deleted_topic.created_at}",
+      "id: #{topic.id}",
+      "created_at: #{topic.created_at}",
       "user: #{user}",
-      "title: #{deleted_topic.title}"
+      "title: #{topic.title}"
     ]
 
-    if first_post = deleted_topic.ordered_posts.first
+    if first_post = topic.ordered_posts.with_deleted.first
       details << "raw: #{first_post.raw}"
     end
 
-    UserHistory.create(params(opts).merge(action: UserHistory.actions[:delete_topic],
-                                          topic_id: deleted_topic.id,
-                                          details: details.join("\n")))
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[action.to_sym],
+      topic_id: topic.id,
+      details: details.join("\n")
+    ))
   end
 
   def log_trust_level_change(user, old_trust_level, new_trust_level, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user && user.is_a?(User)
     raise Discourse::InvalidParameters.new(:old_trust_level) unless TrustLevel.valid? old_trust_level
     raise Discourse::InvalidParameters.new(:new_trust_level) unless TrustLevel.valid? new_trust_level
-    UserHistory.create!(params(opts).merge(action: UserHistory.actions[:change_trust_level],
-                                           target_user_id: user.id,
-                                           details: "old trust level: #{old_trust_level}\nnew trust level: #{new_trust_level}"))
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:change_trust_level],
+      target_user_id: user.id,
+      details: "old trust level: #{old_trust_level}\nnew trust level: #{new_trust_level}"
+    ))
   end
 
   def log_lock_trust_level(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user && user.is_a?(User)
-    UserHistory.create!(params(opts).merge(action: UserHistory.actions[user.manual_locked_trust_level.nil? ? :unlock_trust_level : :lock_trust_level],
-                                           target_user_id: user.id))
+    action = UserHistory.actions[user.manual_locked_trust_level.nil? ? :unlock_trust_level : :lock_trust_level]
+    UserHistory.create!(params(opts).merge(
+      action: action,
+      target_user_id: user.id
+    ))
+  end
+
+  def log_topic_published(topic, opts = {})
+    raise Discourse::InvalidParameters.new(:topic) unless topic && topic.is_a?(Topic)
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:topic_published],
+      topic_id: topic.id)
+    )
+  end
+
+  def log_post_lock(post, opts = {})
+    raise Discourse::InvalidParameters.new(:post) unless post && post.is_a?(Post)
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[opts[:locked] ? :post_locked : :post_unlocked],
+      post_id: post.id)
+    )
+  end
+
+  def log_post_edit(post, opts = {})
+    raise Discourse::InvalidParameters.new(:post) unless post && post.is_a?(Post)
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:post_edit],
+      post_id: post.id,
+      details: "#{opts[:old_raw]}\n\n---\n\n#{post.raw}"
+    ))
   end
 
   def log_site_setting_change(setting_name, previous_value, new_value, opts = {})
     raise Discourse::InvalidParameters.new(:setting_name) unless setting_name.present? && SiteSetting.respond_to?(setting_name)
-    UserHistory.create(params(opts).merge(action: UserHistory.actions[:change_site_setting],
-                                          subject: setting_name,
-                                          previous_value: previous_value,
-                                          new_value: new_value))
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:change_site_setting],
+      subject: setting_name,
+      previous_value: previous_value,
+      new_value: new_value
+    ))
   end
 
   def theme_json(theme)
@@ -130,48 +173,57 @@ class StaffActionLogger
 
     old_json, new_json = strip_duplicates(old_json, new_json)
 
-    UserHistory.create(params(opts).merge(action: UserHistory.actions[:change_theme],
-                                          subject: new_theme.name,
-                                          previous_value: old_json,
-                                          new_value: new_json))
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:change_theme],
+      subject: new_theme.name,
+      previous_value: old_json,
+      new_value: new_json
+    ))
   end
 
   def log_theme_destroy(theme, opts = {})
     raise Discourse::InvalidParameters.new(:theme) unless theme
-    UserHistory.create(params(opts).merge(action: UserHistory.actions[:delete_theme],
-                                          subject: theme.name,
-                                          previous_value: theme_json(theme)))
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:delete_theme],
+      subject: theme.name,
+      previous_value: theme_json(theme)
+    ))
   end
 
   def log_site_text_change(subject, new_text = nil, old_text = nil, opts = {})
     raise Discourse::InvalidParameters.new(:subject) unless subject.present?
-    UserHistory.create!(params(opts).merge(action: UserHistory.actions[:change_site_text],
-                                           subject: subject,
-                                           previous_value: old_text,
-                                           new_value: new_text))
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:change_site_text],
+      subject: subject,
+      previous_value: old_text,
+      new_value: new_text
+    ))
   end
 
   def log_username_change(user, old_username, new_username, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create(params(opts).merge(action: UserHistory.actions[:change_username],
-                                          target_user_id: user.id,
-                                          previous_value: old_username,
-                                          new_value: new_username))
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:change_username],
+      target_user_id: user.id,
+      previous_value: old_username,
+      new_value: new_username
+    ))
   end
 
   def log_name_change(user_id, old_name, new_name, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user_id
-    UserHistory.create(params(opts).merge(action: UserHistory.actions[:change_name],
-                                          target_user_id: user_id,
-                                          previous_value: old_name,
-                                          new_value: new_name))
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:change_name],
+      target_user_id: user_id,
+      previous_value: old_name,
+      new_value: new_name
+    ))
   end
 
   def log_user_suspend(user, reason, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
 
-    details = (reason || '').dup
-    details << "\n\n#{opts[:message]}" if opts[:message].present?
+    details = StaffMessageFormat.new(:suspend, reason, opts[:message]).format
 
     args = params(opts).merge(
       action: UserHistory.actions[:suspend_user],
@@ -179,50 +231,96 @@ class StaffActionLogger
       details: details
     )
     args[:post_id] = opts[:post_id] if opts[:post_id]
-    UserHistory.create(args)
+    UserHistory.create!(args)
   end
 
   def log_user_unsuspend(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create(params(opts).merge(action: UserHistory.actions[:unsuspend_user],
-                                          target_user_id: user.id))
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:unsuspend_user],
+      target_user_id: user.id
+    ))
+  end
+
+  BADGE_FIELDS ||= %i{id name description long_description icon image badge_type_id
+    badge_grouping_id query allow_title multiple_grant listable target_posts
+    enabled auto_revoke show_posts system}
+
+  def log_badge_creation(badge)
+    raise Discourse::InvalidParameters.new(:badge) unless badge
+    details = BADGE_FIELDS.map { |f| [f, badge.send(f)] }.select { |f, v| v.present? }.map { |f, v| "#{f}: #{v}" }
+    UserHistory.create!(params.merge(
+      action: UserHistory.actions[:create_badge],
+      details: details.join("\n")
+    ))
+  end
+
+  def log_badge_change(badge)
+    raise Discourse::InvalidParameters.new(:badge) unless badge
+    details = ["id: #{badge.id}"]
+    badge.previous_changes.each { |f, values| details << "#{f}: #{values[1]}" if BADGE_FIELDS.include?(f.to_sym) }
+    UserHistory.create!(params.merge(
+      action: UserHistory.actions[:change_badge],
+      details: details.join("\n")
+    ))
+  end
+
+  def log_badge_deletion(badge)
+    raise Discourse::InvalidParameters.new(:badge) unless badge
+    details = BADGE_FIELDS.map { |f| [f, badge.send(f)] }.select { |f, v| v.present? }.map { |f, v| "#{f}: #{v}" }
+    UserHistory.create!(params.merge(
+      action: UserHistory.actions[:delete_badge],
+      details: details.join("\n")
+    ))
   end
 
   def log_badge_grant(user_badge, opts = {})
     raise Discourse::InvalidParameters.new(:user_badge) unless user_badge
-    UserHistory.create(params(opts).merge(action: UserHistory.actions[:grant_badge],
-                                          target_user_id: user_badge.user_id,
-                                          details: user_badge.badge.name))
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:grant_badge],
+      target_user_id: user_badge.user_id,
+      details: user_badge.badge.name
+    ))
   end
 
   def log_badge_revoke(user_badge, opts = {})
     raise Discourse::InvalidParameters.new(:user_badge) unless user_badge
-    UserHistory.create(params(opts).merge(action: UserHistory.actions[:revoke_badge],
-                                          target_user_id: user_badge.user_id,
-                                          details: user_badge.badge.name))
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:revoke_badge],
+      target_user_id: user_badge.user_id,
+      details: user_badge.badge.name
+    ))
   end
 
   def log_check_email(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create(params(opts).merge(action: UserHistory.actions[:check_email],
-                                          target_user_id: user.id))
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:check_email],
+      target_user_id: user.id
+    ))
   end
 
   def log_show_emails(users, opts = {})
     return if users.blank?
-    UserHistory.create(params(opts).merge(action: UserHistory.actions[:check_email],
-                                          details: users.map { |u| "[#{u.id}] #{u.username}" }.join("\n")))
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:check_email],
+      details: users.map { |u| "[#{u.id}] #{u.username}" }.join("\n")
+    ))
   end
 
   def log_impersonate(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create(params(opts).merge(action: UserHistory.actions[:impersonate],
-                                          target_user_id: user.id))
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:impersonate],
+      target_user_id: user.id
+    ))
   end
 
   def log_roll_up(subnets, opts = {})
-    UserHistory.create(params(opts).merge(action: UserHistory.actions[:roll_up],
-                                          details: subnets.join(", ")))
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:roll_up],
+      details: subnets.join(", ")
+    ))
   end
 
   def log_category_settings_change(category, category_params, old_permissions = nil)
@@ -235,12 +333,14 @@ class StaffActionLogger
     end
 
     changed_attributes.each do |key, value|
-      UserHistory.create(params.merge(action: UserHistory.actions[:change_category_settings],
-                                      category_id: category.id,
-                                      context: category.url,
-                                      subject: key,
-                                      previous_value: value[0],
-                                      new_value: value[1]))
+      UserHistory.create!(params.merge(
+        action: UserHistory.actions[:change_category_settings],
+        category_id: category.id,
+        context: category.url,
+        subject: key,
+        previous_value: value[0],
+        new_value: value[1]
+      ))
     end
   end
 
@@ -257,10 +357,12 @@ class StaffActionLogger
       details << "parent_category: #{parent_category.name}"
     end
 
-    UserHistory.create(params.merge(action: UserHistory.actions[:delete_category],
-                                    category_id: category.id,
-                                    details: details.join("\n"),
-                                    context: category.url))
+    UserHistory.create!(params.merge(
+      action: UserHistory.actions[:delete_category],
+      category_id: category.id,
+      details: details.join("\n"),
+      context: category.url
+    ))
   end
 
   def log_category_creation(category)
@@ -271,103 +373,157 @@ class StaffActionLogger
       "name: #{category.name}"
     ]
 
-    UserHistory.create(params.merge(action: UserHistory.actions[:create_category],
-                                    details: details.join("\n"),
-                                    category_id: category.id,
-                                    context: category.url))
+    UserHistory.create!(params.merge(
+      action: UserHistory.actions[:create_category],
+      details: details.join("\n"),
+      category_id: category.id,
+      context: category.url
+    ))
   end
 
   def log_silence_user(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
 
-    UserHistory.create(
-      params(opts).merge(
-        action: UserHistory.actions[:silence_user],
-        target_user_id: user.id,
-        details: opts[:details]
-      )
+    create_args = params(opts).merge(
+      action: UserHistory.actions[:silence_user],
+      target_user_id: user.id,
+      details: opts[:details]
     )
+    create_args[:post_id] = opts[:post_id] if opts[:post_id]
+
+    UserHistory.create!(create_args)
   end
 
   def log_unsilence_user(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create(params(opts).merge(action: UserHistory.actions[:unsilence_user],
-                                          target_user_id: user.id))
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:unsilence_user],
+      target_user_id: user.id
+    ))
+  end
+
+  def log_disable_second_factor_auth(user, opts = {})
+    raise Discourse::InvalidParameters.new(:user) unless user
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:disabled_second_factor],
+      target_user_id: user.id
+    ))
   end
 
   def log_grant_admin(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create(params(opts).merge(action: UserHistory.actions[:grant_admin],
-                                          target_user_id: user.id))
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:grant_admin],
+      target_user_id: user.id
+    ))
   end
 
   def log_revoke_admin(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create(params(opts).merge(action: UserHistory.actions[:revoke_admin],
-                                          target_user_id: user.id))
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:revoke_admin],
+      target_user_id: user.id
+    ))
   end
 
   def log_grant_moderation(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create(params(opts).merge(action: UserHistory.actions[:grant_moderation],
-                                          target_user_id: user.id))
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:grant_moderation],
+      target_user_id: user.id
+    ))
   end
 
   def log_revoke_moderation(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create(params(opts).merge(action: UserHistory.actions[:revoke_moderation],
-                                          target_user_id: user.id))
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:revoke_moderation],
+      target_user_id: user.id
+    ))
   end
 
   def log_backup_create(opts = {})
-    UserHistory.create(params(opts).merge(action: UserHistory.actions[:backup_create],
-                                          ip_address: @admin.ip_address.to_s))
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:backup_create],
+      ip_address: @admin.ip_address.to_s
+    ))
   end
 
   def log_backup_download(backup, opts = {})
     raise Discourse::InvalidParameters.new(:backup) unless backup
-    UserHistory.create(params(opts).merge(action: UserHistory.actions[:backup_download],
-                                          ip_address: @admin.ip_address.to_s,
-                                          details: backup.filename))
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:backup_download],
+      ip_address: @admin.ip_address.to_s,
+      details: backup.filename
+    ))
   end
 
   def log_backup_destroy(backup, opts = {})
     raise Discourse::InvalidParameters.new(:backup) unless backup
-    UserHistory.create(params(opts).merge(action: UserHistory.actions[:backup_destroy],
-                                          ip_address: @admin.ip_address.to_s,
-                                          details: backup.filename))
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:backup_destroy],
+      ip_address: @admin.ip_address.to_s,
+      details: backup.filename
+    ))
   end
 
   def log_revoke_email(user, reason, opts = {})
-    UserHistory.create(params(opts).merge(action: UserHistory.actions[:revoke_email],
-                                          target_user_id: user.id,
-                                          details: reason))
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:revoke_email],
+      target_user_id: user.id,
+      details: reason
+    ))
   end
 
   def log_user_deactivate(user, reason, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create(params(opts).merge(action: UserHistory.actions[:deactivate_user],
-                                          target_user_id: user.id,
-                                          details: reason))
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:deactivate_user],
+      target_user_id: user.id,
+      details: reason
+    ))
   end
 
   def log_user_activate(user, reason, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create(params(opts).merge(action: UserHistory.actions[:activate_user],
-                                          target_user_id: user.id,
-                                          details: reason))
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:activate_user],
+      target_user_id: user.id,
+      details: reason
+    ))
   end
 
   def log_wizard_step(step, opts = {})
     raise Discourse::InvalidParameters.new(:step) unless step
-    UserHistory.create(params(opts).merge(action: UserHistory.actions[:wizard_step],
-                                          context: step.id))
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:wizard_step],
+      context: step.id
+    ))
   end
 
   def log_change_readonly_mode(state)
-    UserHistory.create(params.merge(action: UserHistory.actions[:change_readonly_mode],
-                                    previous_value: !state,
-                                    new_value: state))
+    UserHistory.create!(params.merge(
+      action: UserHistory.actions[:change_readonly_mode],
+      previous_value: !state,
+      new_value: state
+    ))
+  end
+
+  def log_check_personal_message(topic, opts = {})
+    raise Discourse::InvalidParameters.new(:topic) unless topic && topic.is_a?(Topic)
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:check_personal_message],
+      topic_id: topic.id,
+      context: topic.relative_url
+    ))
+  end
+
+  def log_post_approved(post, opts = {})
+    raise Discourse::InvalidParameters.new(:post) unless post && post.is_a?(Post)
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:post_approved],
+      post_id: post.id
+    ))
   end
 
   private
diff --git a/app/services/user_action_creator.rb b/app/services/user_action_creator.rb
index 7b1c92562bb..6d4b917bb89 100644
--- a/app/services/user_action_creator.rb
+++ b/app/services/user_action_creator.rb
@@ -85,7 +85,7 @@ class UserActionCreator
     return unless model.user_id
 
     row = {
-      action_type: model.archetype == Archetype.private_message ? UserAction::NEW_PRIVATE_MESSAGE : UserAction::NEW_TOPIC,
+      action_type: model.private_message? ? UserAction::NEW_PRIVATE_MESSAGE : UserAction::NEW_TOPIC,
       user_id: model.user_id,
       acting_user_id: model.user_id,
       target_topic_id: model.id,
@@ -94,7 +94,7 @@ class UserActionCreator
     }
 
     UserAction.remove_action!(row.merge(
-      action_type: model.archetype == Archetype.private_message ? UserAction::NEW_TOPIC : UserAction::NEW_PRIVATE_MESSAGE
+      action_type: model.private_message? ? UserAction::NEW_TOPIC : UserAction::NEW_PRIVATE_MESSAGE
     ))
 
     rows = [row]
diff --git a/app/services/user_anonymizer.rb b/app/services/user_anonymizer.rb
index dbd58624bff..7184f1ac87b 100644
--- a/app/services/user_anonymizer.rb
+++ b/app/services/user_anonymizer.rb
@@ -1,21 +1,27 @@
 class UserAnonymizer
-  def initialize(user, actor = nil)
+
+  attr_reader :user_history
+
+  # opts:
+  #   anonymize_ip  - an optional new IP to update their logs with
+  def initialize(user, actor = nil, opts = nil)
     @user = user
     @actor = actor
+    @user_history = nil
+    @opts = opts || {}
   end
 
-  def self.make_anonymous(user, actor = nil)
-    self.new(user, actor).make_anonymous
+  def self.make_anonymous(user, actor = nil, opts = nil)
+    self.new(user, actor, opts).make_anonymous
   end
 
   def make_anonymous
     User.transaction do
-      prev_email = @user.email
-      prev_username = @user.username
+      @prev_email = @user.email
+      @prev_username = @user.username
 
-      if !UsernameChanger.change(@user, make_anon_username)
-        raise "Failed to change username"
-      end
+      @user.update_attribute(:uploaded_avatar_id, nil)
+      raise "Failed to change username" unless UsernameChanger.change(@user, make_anon_username)
 
       @user.reload
       @user.password = SecureRandom.hex
@@ -23,7 +29,9 @@ class UserAnonymizer
       @user.name = SiteSetting.full_name_required ? @user.username : nil
       @user.date_of_birth = nil
       @user.title = nil
-      @user.uploaded_avatar_id = nil
+
+      anonymize_ips(@opts[:anonymize_ip]) if @opts.has_key?(:anonymize_ip)
+
       @user.save
 
       options = @user.user_option
@@ -45,23 +53,61 @@ class UserAnonymizer
       @user.facebook_user_info.try(:destroy)
       @user.single_sign_on_record.try(:destroy)
       @user.oauth2_user_info.try(:destroy)
+      @user.instagram_user_info.try(:destroy)
       @user.user_open_ids.find_each { |x| x.destroy }
       @user.api_key.try(:destroy)
 
-      UserHistory.create(action: UserHistory.actions[:anonymize_user],
-                         target_user_id: @user.id,
-                         acting_user_id: @actor ? @actor.id : @user.id,
-                         email: prev_email,
-                         details: "username: #{prev_username}")
+      history_details = {
+        action: UserHistory.actions[:anonymize_user],
+        target_user_id: @user.id,
+        acting_user_id: @actor ? @actor.id : @user.id,
+      }
+
+      if SiteSetting.log_anonymizer_details?
+        history_details[:email] = @prev_email
+        history_details[:details] = "username: #{@prev_username}"
+      end
+
+      @user_history = UserHistory.create(history_details)
     end
+
+    DiscourseEvent.trigger(:user_anonymized, user: @user, opts: @opts)
     @user
   end
 
-  def make_anon_username
-    100.times do
-      new_username = "anon#{(SecureRandom.random_number * 100000000).to_i}"
-      return new_username unless User.where(username_lower: new_username).exists?
+  private
+
+    def make_anon_username
+      100.times do
+        new_username = "anon#{(SecureRandom.random_number * 100000000).to_i}"
+        return new_username unless User.where(username_lower: new_username).exists?
+      end
+      raise "Failed to generate an anon username"
     end
-    raise "Failed to generate an anon username"
+
+  def ip_where(column = 'user_id')
+    ["#{column} = :user_id AND ip_address IS NOT NULL", user_id: @user.id]
   end
+
+  def anonymize_ips(new_ip)
+    @user.ip_address = new_ip
+    @user.registration_ip_address = new_ip
+
+    IncomingLink.where(ip_where('current_user_id')).update_all(ip_address: new_ip)
+    ScreenedEmail.where(email: @prev_email).update_all(ip_address: new_ip)
+    SearchLog.where(ip_where).update_all(ip_address: new_ip)
+    TopicLinkClick.where(ip_where).update_all(ip_address: new_ip)
+    TopicViewItem.where(ip_where).update_all(ip_address: new_ip)
+    UserHistory.where(ip_where('acting_user_id')).update_all(ip_address: new_ip)
+    UserProfileView.where(ip_where).update_all(ip_address: new_ip)
+
+    # UserHistory for delete_user logs the user's IP. Note this is quite ugly but we don't
+    # have a better way of querying on details right now.
+    UserHistory.where(
+      "action = :action AND details LIKE 'id: #{@user.id}\n%'",
+      action: UserHistory.actions[:delete_user]
+    ).update_all(ip_address: new_ip)
+
+  end
+
 end
diff --git a/app/services/user_authenticator.rb b/app/services/user_authenticator.rb
index cd75e931220..b53c5de8b95 100644
--- a/app/services/user_authenticator.rb
+++ b/app/services/user_authenticator.rb
@@ -21,7 +21,10 @@ class UserAuthenticator
   end
 
   def finish
-    authenticator.after_create_account(@user, @session) if authenticator
+    if authenticator
+      authenticator.after_create_account(@user, @session)
+      confirm_email
+    end
     @session = nil
   end
 
@@ -30,11 +33,18 @@ class UserAuthenticator
   end
 
   def authenticated?
-    @session && @session[:email] == @user.email && @session[:email_valid]
+    @session && @session[:email]&.downcase == @user.email.downcase && @session[:email_valid].to_s == "true"
   end
 
   private
 
+  def confirm_email
+    if authenticated?
+      EmailToken.confirm(@user.email_tokens.first.token)
+      @user.set_automatic_groups
+    end
+  end
+
   def authenticator
     if authenticator_name
       @authenticator ||= @authenticator_finder.find_authenticator(authenticator_name)
diff --git a/app/services/user_merger.rb b/app/services/user_merger.rb
new file mode 100644
index 00000000000..d745bc0e7cc
--- /dev/null
+++ b/app/services/user_merger.rb
@@ -0,0 +1,392 @@
+class UserMerger
+  def initialize(source_user, target_user)
+    @source_user = source_user
+    @target_user = target_user
+  end
+
+  def merge!
+    update_username
+    move_posts
+    update_user_ids
+    merge_given_daily_likes
+    merge_post_timings
+    merge_user_visits
+    update_site_settings
+    merge_user_attributes
+
+    DiscourseEvent.trigger(:merging_users, @source_user, @target_user)
+    update_user_stats
+
+    delete_source_user
+    delete_source_user_references
+  end
+
+  protected
+
+  def update_username
+    Jobs::UpdateUsername.new.execute(user_id: @source_user.id,
+                                     old_username: @source_user.username,
+                                     new_username: @target_user.username,
+                                     avatar_template: @target_user.avatar_template)
+  end
+
+  def move_posts
+    posts = Post.with_deleted
+      .where(user_id: @source_user.id)
+      .order(:topic_id, :post_number)
+      .pluck(:topic_id, :id)
+
+    last_topic_id = nil
+    post_ids = []
+
+    posts.each do |current_topic_id, current_post_id|
+      if last_topic_id != current_topic_id && post_ids.any?
+        change_post_owner(last_topic_id, post_ids)
+        post_ids = []
+      end
+
+      last_topic_id = current_topic_id
+      post_ids << current_post_id
+    end
+
+    change_post_owner(last_topic_id, post_ids) if post_ids.any?
+  end
+
+  def change_post_owner(topic_id, post_ids)
+    PostOwnerChanger.new(
+      topic_id: topic_id,
+      post_ids: post_ids,
+      new_owner: @target_user,
+      acting_user: Discourse.system_user,
+      skip_revision: true
+    ).change_owner!
+  end
+
+  def merge_given_daily_likes
+    sql = <<~SQL
+      INSERT INTO given_daily_likes AS g (user_id, likes_given, given_date, limit_reached)
+        SELECT
+          :target_user_id                AS user_id,
+          COUNT(1)                       AS likes_given,
+          a.created_at::DATE             AS given_date,
+          COUNT(1) >= :max_likes_per_day AS limit_reached
+        FROM post_actions AS a
+        WHERE a.user_id = :target_user_id
+              AND a.deleted_at IS NULL
+              AND EXISTS(
+                  SELECT 1
+                  FROM given_daily_likes AS g
+                  WHERE g.user_id = :source_user_id AND a.created_at::DATE = g.given_date
+              )
+        GROUP BY given_date
+      ON CONFLICT (user_id, given_date)
+        DO UPDATE
+          SET likes_given = EXCLUDED.likes_given,
+            limit_reached = EXCLUDED.limit_reached
+    SQL
+
+    GivenDailyLike.exec_sql(sql,
+                            source_user_id: @source_user.id,
+                            target_user_id: @target_user.id,
+                            max_likes_per_day: SiteSetting.max_likes_per_day,
+                            action_type_id: PostActionType.types[:like])
+  end
+
+  def merge_post_timings
+    update_user_id(:post_timings, conditions: ["x.topic_id = y.topic_id",
+                                               "x.post_number = y.post_number"])
+    sql = <<~SQL
+      UPDATE post_timings AS t
+      SET msecs = t.msecs + s.msecs
+      FROM post_timings AS s
+      WHERE t.user_id = :target_user_id AND s.user_id = :source_user_id
+            AND t.topic_id = s.topic_id AND t.post_number = s.post_number
+    SQL
+
+    PostTiming.exec_sql(sql, source_user_id: @source_user.id, target_user_id: @target_user.id)
+  end
+
+  def merge_user_visits
+    update_user_id(:user_visits, conditions: "x.visited_at = y.visited_at")
+
+    sql = <<~SQL
+      UPDATE user_visits AS t
+      SET posts_read = t.posts_read + s.posts_read,
+        mobile       = t.mobile OR s.mobile,
+        time_read    = t.time_read + s.time_read
+      FROM user_visits AS s
+      WHERE t.user_id = :target_user_id AND s.user_id = :source_user_id
+            AND t.visited_at = s.visited_at
+    SQL
+
+    UserVisit.exec_sql(sql, source_user_id: @source_user.id, target_user_id: @target_user.id)
+  end
+
+  def update_site_settings
+    SiteSetting.all_settings(true).each do |setting|
+      if setting[:type] == "username" && setting[:value] == @source_user.username
+        SiteSetting.set_and_log(setting[:setting], @target_user.username)
+      end
+    end
+  end
+
+  def update_user_stats
+    # topics_entered
+    UserStat.exec_sql(<<~SQL, target_user_id: @target_user.id)
+      UPDATE user_stats
+      SET topics_entered = (
+        SELECT COUNT(topic_id)
+        FROM topic_views
+        WHERE user_id = :target_user_id
+      )
+      WHERE user_id = :target_user_id
+    SQL
+
+    # time_read and days_visited
+    UserStat.exec_sql(<<~SQL, target_user_id: @target_user.id)
+      UPDATE user_stats
+      SET time_read  = COALESCE(x.time_read, 0),
+        days_visited = COALESCE(x.days_visited, 0)
+      FROM (
+             SELECT
+               SUM(time_read) AS time_read,
+               COUNT(1)       AS days_visited
+             FROM user_visits
+             WHERE user_id = :target_user_id
+           ) AS x
+      WHERE user_id = :target_user_id
+    SQL
+
+    # posts_read_count
+    UserStat.exec_sql(<<~SQL, target_user_id: @target_user.id)
+      UPDATE user_stats
+      SET posts_read_count = (
+        SELECT COUNT(1)
+        FROM post_timings AS pt
+        WHERE pt.user_id = :target_user_id AND EXISTS(
+            SELECT 1
+            FROM topics AS t
+            WHERE t.archetype = 'regular' AND t.deleted_at IS NULL
+        ))
+      WHERE user_id = :target_user_id
+    SQL
+
+    # likes_given, likes_received, new_since, read_faq, first_post_created_at
+    UserStat.exec_sql(<<~SQL, source_user_id: @source_user.id, target_user_id: @target_user.id)
+      UPDATE user_stats AS t
+      SET likes_given         = t.likes_given + s.likes_given,
+        likes_received        = t.likes_received + s.likes_received,
+        new_since             = LEAST(t.new_since, s.new_since),
+        read_faq              = LEAST(t.read_faq, s.read_faq),
+        first_post_created_at = LEAST(t.first_post_created_at, s.first_post_created_at)
+      FROM user_stats AS s
+      WHERE t.user_id = :target_user_id AND s.user_id = :source_user_id
+    SQL
+  end
+
+  def merge_user_attributes
+    User.exec_sql(<<~SQL, source_user_id: @source_user.id, target_user_id: @target_user.id)
+      UPDATE users AS t
+      SET created_at              = LEAST(t.created_at, s.created_at),
+        updated_at                = LEAST(t.updated_at, s.updated_at),
+        seen_notification_id      = GREATEST(t.seen_notification_id, s.seen_notification_id),
+        last_posted_at            = GREATEST(t.last_seen_at, s.last_seen_at),
+        last_seen_at              = GREATEST(t.last_seen_at, s.last_seen_at),
+        admin                     = t.admin OR s.admin,
+        last_emailed_at           = GREATEST(t.last_emailed_at, s.last_emailed_at),
+        trust_level               = GREATEST(t.trust_level, s.trust_level),
+        previous_visit_at         = GREATEST(t.previous_visit_at, s.previous_visit_at),
+        date_of_birth             = COALESCE(t.date_of_birth, s.date_of_birth),
+        ip_address                = COALESCE(t.ip_address, s.ip_address),
+        moderator                 = t.moderator OR s.moderator,
+        title                     = COALESCE(t.title, s.title),
+        primary_group_id          = COALESCE(t.primary_group_id, s.primary_group_id),
+        registration_ip_address   = COALESCE(t.registration_ip_address, s.registration_ip_address),
+        first_seen_at             = LEAST(t.first_seen_at, s.first_seen_at),
+        group_locked_trust_level  = GREATEST(t.group_locked_trust_level, s.group_locked_trust_level),
+        manual_locked_trust_level = GREATEST(t.manual_locked_trust_level, s.manual_locked_trust_level)
+      FROM users AS s
+      WHERE t.id = :target_user_id AND s.id = :source_user_id
+    SQL
+
+    UserProfile.exec_sql(<<~SQL, source_user_id: @source_user.id, target_user_id: @target_user.id)
+      UPDATE user_profiles AS t
+      SET location           = COALESCE(t.location, s.location),
+        website              = COALESCE(t.website, s.website),
+        bio_raw              = COALESCE(t.bio_raw, s.bio_raw),
+        bio_cooked           = COALESCE(t.bio_cooked, s.bio_cooked),
+        bio_cooked_version   = COALESCE(t.bio_cooked_version, s.bio_cooked_version),
+        profile_background   = COALESCE(t.profile_background, s.profile_background),
+        dismissed_banner_key = COALESCE(t.dismissed_banner_key, s.dismissed_banner_key),
+        badge_granted_title  = t.badge_granted_title OR s.badge_granted_title,
+        card_background      = COALESCE(t.card_background, s.card_background),
+        views                = t.views + s.views
+      FROM user_profiles AS s
+      WHERE t.user_id = :target_user_id AND s.user_id = :source_user_id
+    SQL
+  end
+
+  def update_user_ids
+    Category.where(user_id: @source_user.id).update_all(user_id: @target_user.id)
+
+    update_user_id(:category_users, conditions: ["x.category_id = y.category_id"])
+
+    update_user_id(:developers)
+
+    update_user_id(:draft_sequences, conditions: "x.draft_key = y.draft_key")
+    update_user_id(:drafts, conditions: "x.draft_key = y.draft_key")
+
+    EmailLog.where(user_id: @source_user.id).update_all(user_id: @target_user.id)
+
+    GroupHistory.where(acting_user_id: @source_user.id).update_all(acting_user_id: @target_user.id)
+    GroupHistory.where(target_user_id: @source_user.id).update_all(target_user_id: @target_user.id)
+
+    update_user_id(:group_users, conditions: "x.group_id = y.group_id")
+
+    IncomingEmail.where(user_id: @source_user.id).update_all(user_id: @target_user.id)
+
+    IncomingLink.where(user_id: @source_user.id).update_all(user_id: @target_user.id)
+    IncomingLink.where(current_user_id: @source_user.id).update_all(current_user_id: @target_user.id)
+
+    Invite.with_deleted.where(user_id: @source_user.id).update_all(user_id: @target_user.id)
+    Invite.with_deleted.where(invited_by_id: @source_user.id).update_all(invited_by_id: @target_user.id)
+    Invite.with_deleted.where(deleted_by_id: @source_user.id).update_all(deleted_by_id: @target_user.id)
+
+    update_user_id(:muted_users, conditions: "x.muted_user_id = y.muted_user_id")
+    update_user_id(:muted_users, user_id_column_name: "muted_user_id", conditions: "x.user_id = y.user_id")
+
+    Notification.where(user_id: @source_user.id).update_all(user_id: @target_user.id)
+
+    update_user_id(:post_actions, conditions: ["x.post_id = y.post_id",
+                                               "x.post_action_type_id = y.post_action_type_id",
+                                               "x.targets_topic = y.targets_topic"])
+
+    PostAction.where(deleted_by_id: @source_user.id).update_all(deleted_by_id: @target_user.id)
+    PostAction.where(deferred_by_id: @source_user.id).update_all(deferred_by_id: @target_user.id)
+    PostAction.where(agreed_by_id: @source_user.id).update_all(agreed_by_id: @target_user.id)
+    PostAction.where(disagreed_by_id: @source_user.id).update_all(disagreed_by_id: @target_user.id)
+
+    PostRevision.where(user_id: @source_user.id).update_all(user_id: @target_user.id)
+
+    Post.with_deleted.where(deleted_by_id: @source_user.id).update_all(deleted_by_id: @target_user.id)
+    Post.with_deleted.where(last_editor_id: @source_user.id).update_all(last_editor_id: @target_user.id)
+    Post.with_deleted.where(locked_by_id: @source_user.id).update_all(locked_by_id: @target_user.id)
+    Post.with_deleted.where(reply_to_user_id: @source_user.id).update_all(reply_to_user_id: @target_user.id)
+
+    QueuedPost.where(user_id: @source_user.id).update_all(user_id: @target_user.id)
+    QueuedPost.where(approved_by_id: @source_user.id).update_all(approved_by_id: @target_user.id)
+    QueuedPost.where(rejected_by_id: @source_user.id).update_all(rejected_by_id: @target_user.id)
+
+    SearchLog.where(user_id: @source_user.id).update_all(user_id: @target_user.id)
+
+    update_user_id(:tag_users, conditions: "x.tag_id = y.tag_id")
+
+    Theme.where(user_id: @source_user.id).update_all(user_id: @target_user.id)
+
+    update_user_id(:topic_allowed_users, conditions: "x.topic_id = y.topic_id")
+
+    TopicEmbed.with_deleted.where(deleted_by_id: @source_user.id).update_all(deleted_by_id: @target_user.id)
+
+    TopicLink.where(user_id: @source_user.id).update_all(user_id: @target_user.id)
+    TopicLinkClick.where(user_id: @source_user.id).update_all(user_id: @target_user.id)
+
+    TopicTimer.with_deleted.where(deleted_by_id: @source_user.id).update_all(deleted_by_id: @target_user.id)
+
+    update_user_id(:topic_timers, conditions: ["x.status_type = y.status_type",
+                                               "x.topic_id = y.topic_id",
+                                               "y.deleted_at IS NULL"])
+
+    update_user_id(:topic_users, conditions: "x.topic_id = y.topic_id")
+
+    update_user_id(:topic_views, conditions: "x.topic_id = y.topic_id")
+
+    Topic.with_deleted.where(deleted_by_id: @source_user.id).update_all(deleted_by_id: @target_user.id)
+
+    UnsubscribeKey.where(user_id: @source_user.id).update_all(user_id: @target_user.id)
+
+    Upload.where(user_id: @source_user.id).update_all(user_id: @target_user.id)
+
+    update_user_id(:user_archived_messages, conditions: "x.topic_id = y.topic_id")
+
+    update_user_id(:user_actions,
+                   user_id_column_name: "user_id",
+                   conditions: ["x.action_type = y.action_type",
+                                "x.target_topic_id IS NOT DISTINCT FROM y.target_topic_id",
+                                "x.target_post_id IS NOT DISTINCT FROM y.target_post_id",
+                                "(x.acting_user_id IN (:source_user_id, :target_user_id) OR x.acting_user_id IS NOT DISTINCT FROM y.acting_user_id)"])
+    update_user_id(:user_actions,
+                   user_id_column_name: "acting_user_id",
+                   conditions: ["x.action_type = y.action_type",
+                                "x.user_id = y.user_id",
+                                "x.target_topic_id IS NOT DISTINCT FROM y.target_topic_id",
+                                "x.target_post_id IS NOT DISTINCT FROM y.target_post_id"])
+
+    update_user_id(:user_badges, conditions: ["x.badge_id = y.badge_id",
+                                              "x.seq = y.seq",
+                                              "x.post_id IS NOT DISTINCT FROM y.post_id"])
+
+    UserBadge.where(granted_by_id: @source_user.id).update_all(granted_by_id: @target_user.id)
+
+    update_user_id(:user_custom_fields, conditions: "x.name = y.name")
+
+    update_user_id(:user_emails, conditions: "x.email = y.email OR y.primary = false", updates: '"primary" = false')
+
+    UserExport.where(user_id: @source_user.id).update_all(user_id: @target_user.id)
+
+    UserHistory.where(target_user_id: @source_user.id).update_all(target_user_id: @target_user.id)
+    UserHistory.where(acting_user_id: @source_user.id).update_all(acting_user_id: @target_user.id)
+
+    UserProfileView.where(user_profile_id: @source_user.id).update_all(user_profile_id: @target_user.id)
+    UserProfileView.where(user_id: @source_user.id).update_all(user_id: @target_user.id)
+
+    UserWarning.where(user_id: @source_user.id).update_all(user_id: @target_user.id)
+    UserWarning.where(created_by_id: @source_user.id).update_all(created_by_id: @target_user.id)
+
+    User.where(approved_by_id: @source_user.id).update_all(approved_by_id: @target_user.id)
+  end
+
+  def delete_source_user
+    @source_user.reload
+    @source_user.update_attribute(:admin, false)
+    UserDestroyer.new(Discourse.system_user).destroy(@source_user)
+  end
+
+  def delete_source_user_references
+    Developer.where(user_id: @source_user.id).delete_all
+    DraftSequence.where(user_id: @source_user.id).delete_all
+    GivenDailyLike.where(user_id: @source_user.id).delete_all
+    MutedUser.where(user_id: @source_user.id).or(MutedUser.where(muted_user_id: @source_user.id)).delete_all
+    UserAuthTokenLog.where(user_id: @source_user.id).delete_all
+    UserAvatar.where(user_id: @source_user.id).delete_all
+    UserAction.where(acting_user_id: @source_user.id).delete_all
+  end
+
+  def update_user_id(table_name, opts = {})
+    builder = update_user_id_sql_builder(table_name, opts)
+    builder.exec(source_user_id: @source_user.id, target_user_id: @target_user.id)
+  end
+
+  def update_user_id_sql_builder(table_name, opts = {})
+    user_id_column_name = opts[:user_id_column_name] || :user_id
+    conditions = Array.wrap(opts[:conditions])
+    updates = Array.wrap(opts[:updates])
+
+    builder = SqlBuilder.new(<<~SQL)
+      UPDATE #{table_name} AS x
+      /*set*/
+      WHERE x.#{user_id_column_name} = :source_user_id AND NOT EXISTS(
+          SELECT 1
+          FROM #{table_name} AS y
+          /*where*/
+      )
+    SQL
+
+    builder.set("#{user_id_column_name} = :target_user_id")
+    updates.each { |u| builder.set(u) }
+
+    builder.where("y.#{user_id_column_name} = :target_user_id")
+    conditions.each { |c| builder.where(c) }
+
+    builder
+  end
+end
diff --git a/app/services/user_silencer.rb b/app/services/user_silencer.rb
index 9858c75f9da..dcd56e42fc0 100644
--- a/app/services/user_silencer.rb
+++ b/app/services/user_silencer.rb
@@ -1,3 +1,5 @@
+require_dependency 'staff_message_format'
+
 class UserSilencer
 
   attr_reader :user_history
@@ -21,19 +23,36 @@ class UserSilencer
       if @user.save
         message_type = @opts[:message] || :silenced_by_staff
 
-        details = (@opts[:reason] || '').dup
-        details << "\n\n#{@opts[:message_body]}" if @opts[:message_body].present?
+        details = StaffMessageFormat.new(
+          :silence,
+          @opts[:reason],
+          @opts[:message_body]
+        ).format
 
         context = "#{message_type}: '#{post.topic&.title rescue ''}' #{@opts[:reason]}"
         SystemMessage.create(@user, message_type)
 
         if @by_user
+          log_params = { context: context, details: details }
+          log_params[:post_id] = @opts[:post_id].to_i if @opts[:post_id]
+
           @user_history = StaffActionLogger.new(@by_user).log_silence_user(
             @user,
-            context: context,
-            details: details
+            log_params
           )
         end
+
+        DiscourseEvent.trigger(
+          :user_silenced,
+          user: @user,
+          silenced_by: @by_user,
+          reason: @opts[:reason],
+          message: @opts[:message_body],
+          user_history: @user_history,
+          post_id: @opts[:post_id],
+          silenced_till: @user.silenced_till,
+          silenced_at: DateTime.now
+        )
         return true
       end
     else
diff --git a/app/services/user_updater.rb b/app/services/user_updater.rb
index 305f96fddc1..ade3e97db9f 100644
--- a/app/services/user_updater.rb
+++ b/app/services/user_updater.rb
@@ -62,8 +62,13 @@ class UserUpdater
     user.locale = attributes.fetch(:locale) { user.locale }
     user.date_of_birth = attributes.fetch(:date_of_birth) { user.date_of_birth }
 
-    if guardian.can_grant_title?(user)
-      user.title = attributes.fetch(:title) { user.title }
+    if attributes[:title] &&
+      attributes[:title] != user.title &&
+      guardian.can_grant_title?(user, attributes[:title])
+      user.title = attributes[:title]
+      if user.badges.where(name: user.title).exists?
+        user_profile.badge_granted_title = true
+      end
     end
 
     CATEGORY_IDS.each do |attribute, level|
@@ -73,7 +78,9 @@ class UserUpdater
     end
 
     TAG_NAMES.each do |attribute, level|
-      TagUser.batch_set(user, level, attributes[attribute])
+      if attributes.has_key?(attribute)
+        TagUser.batch_set(user, level, attributes[attribute]&.split(',') || [])
+      end
     end
 
     save_options = false
diff --git a/app/services/username_changer.rb b/app/services/username_changer.rb
index a81f089415c..e5df339c12e 100644
--- a/app/services/username_changer.rb
+++ b/app/services/username_changer.rb
@@ -1,7 +1,10 @@
+require_dependency 'jobs/regular/update_username'
+
 class UsernameChanger
 
   def initialize(user, new_username, actor = nil)
     @user = user
+    @old_username = user.username
     @new_username = new_username
     @actor = actor
   end
@@ -10,14 +13,31 @@ class UsernameChanger
     self.new(user, new_username, actor).change
   end
 
-  def change
-    if @actor && @user.username != @new_username
-      StaffActionLogger.new(@actor).log_username_change(@user, @user.username, @new_username)
+  def change(asynchronous: true)
+    if @actor && @old_username != @new_username
+      StaffActionLogger.new(@actor).log_username_change(@user, @old_username, @new_username)
     end
 
-    # future work: update mentions and quotes
-
     @user.username = @new_username
-    @user.save
+    if @user.save
+
+      args = {
+        user_id: @user.id,
+        old_username: @old_username,
+        new_username: @new_username,
+        avatar_template: @user.avatar_template
+      }
+
+      if asynchronous
+        Jobs.enqueue(:update_username, args)
+      else
+        Jobs::UpdateUsername.new.execute(args)
+      end
+
+      return true
+    end
+
+    false
   end
+
 end
diff --git a/app/views/clicks/track.html.erb b/app/views/clicks/track.html.erb
new file mode 100644
index 00000000000..b0b1de890b7
--- /dev/null
+++ b/app/views/clicks/track.html.erb
@@ -0,0 +1,4 @@
+<div class="container redirection-warning">
+  <p><%= I18n.t("redirect_warning") %></p>
+  <p><%= sanitize link_to params[:url], params[:url] %></p>
+</div>
diff --git a/app/views/common/_discourse_javascript.html.erb b/app/views/common/_discourse_javascript.html.erb
index 3ee86fa4d41..150c88f3fea 100644
--- a/app/views/common/_discourse_javascript.html.erb
+++ b/app/views/common/_discourse_javascript.html.erb
@@ -42,13 +42,15 @@
     Discourse.BaseUri = '<%= Discourse::base_uri %>';
     Discourse.Environment = '<%= Rails.env %>';
     Discourse.SiteSettings = ps.get('siteSettings');
+    Discourse.ThemeSettings = ps.get('themeSettings');
     Discourse.LetterAvatarVersion = '<%= LetterAvatar.version %>';
     Discourse.MarkdownItURL = '<%= asset_url('markdown-it-bundle.js') %>';
+    Discourse.ServiceWorkerURL = Discourse.Environment != "development" ? '<%= Rails.application.assets_manifest.assets['service-worker.js'] %>' : 'service-worker.js';
     I18n.defaultLocale = '<%= SiteSetting.default_locale %>';
     Discourse.start();
     Discourse.set('assetVersion','<%= Discourse.assets_digest %>');
     Discourse.Session.currentProp("disableCustomCSS", <%= loading_admin? %>);
-    <%- if params["safe_mode"] %>
+    <%- if guardian.can_enable_safe_mode? && params["safe_mode"] %>
     Discourse.Session.currentProp("safe_mode", <%= normalized_safe_mode.inspect.html_safe %>);
     <%- end %>
     Discourse.HighlightJSPath = <%= HighlightJs.path.inspect.html_safe %>;
diff --git a/app/views/common/_google_tag_manager_body.html.erb b/app/views/common/_google_tag_manager_body.html.erb
new file mode 100644
index 00000000000..6c98df81176
--- /dev/null
+++ b/app/views/common/_google_tag_manager_body.html.erb
@@ -0,0 +1,4 @@
+<!-- Google Tag Manager (noscript) -->
+<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=<%= SiteSetting.gtm_container_id %>"
+height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+<!-- End Google Tag Manager (noscript) -->
diff --git a/app/views/common/_google_tag_manager.html.erb b/app/views/common/_google_tag_manager_head.html.erb
similarity index 58%
rename from app/views/common/_google_tag_manager.html.erb
rename to app/views/common/_google_tag_manager_head.html.erb
index dca75352a06..2320f2c7b02 100644
--- a/app/views/common/_google_tag_manager.html.erb
+++ b/app/views/common/_google_tag_manager_head.html.erb
@@ -2,10 +2,10 @@
 dataLayer = [<%= google_tag_manager_json %>];
 </script>
 
-<noscript><iframe src="//www.googletagmanager.com/ns.html?id=<%= SiteSetting.gtm_container_id %>"
-height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+<!-- Google Tag Manager -->
 <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
 new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
 j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-'//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
 })(window,document,'script','dataLayer','<%= SiteSetting.gtm_container_id %>');</script>
+<!-- End Google Tag Manager -->
diff --git a/app/views/common/_second_factor_text_field.html.erb b/app/views/common/_second_factor_text_field.html.erb
new file mode 100644
index 00000000000..ad6d61c3979
--- /dev/null
+++ b/app/views/common/_second_factor_text_field.html.erb
@@ -0,0 +1 @@
+<%= text_field_tag(:second_factor_token, nil, autofocus: true, pattern: '[0-9]{6}', maxlength: 6, type: 'tel') %>
diff --git a/app/views/email/notification.html.erb b/app/views/email/notification.html.erb
index 5809973d56b..cfd7fa69404 100644
--- a/app/views/email/notification.html.erb
+++ b/app/views/email/notification.html.erb
@@ -31,6 +31,11 @@
   <% end %>
 
   <div class='footer'>%{respond_instructions}</div>
+  <% if post.topic.private_message? %>
+    <div class='undecorated-link-footer footer'>
+      %{participants}
+    </div>
+  <% end %>
   <div class='footer'>%{unsubscribe_instructions}</div>
 
 </div>
diff --git a/app/views/embed/comments.html.erb b/app/views/embed/comments.html.erb
index 23f69584fed..3c26b1b32d1 100644
--- a/app/views/embed/comments.html.erb
+++ b/app/views/embed/comments.html.erb
@@ -25,9 +25,9 @@
             <span class='title'><%= post.user.title %></span>
           <%- end %>
         </h3>
-        <%= get_html(post.cooked) %>
+        <%= get_html(post) %>
 
-        <%- if post.reply_count > 0 %>
+        <%- if post.reply_count > 0 && post.replies.exists? %>
           <%- if post.reply_count == 1 %>
             <%= link_to I18n.t('embed.replies', count: post.reply_count), post.full_url, 'data-link-to-post' => post.replies.first.id.to_s, :class => 'post-replies button' %>
           <% else %>
diff --git a/app/views/finish_installation/register.html.erb b/app/views/finish_installation/register.html.erb
index 8fa60e3e380..cf6457da3d2 100644
--- a/app/views/finish_installation/register.html.erb
+++ b/app/views/finish_installation/register.html.erb
@@ -51,9 +51,3 @@
 <%- else -%>
   <p><%= raw(t 'finish_installation.register.no_emails') %></p>
 <%- end %>
-
-<script>
-  (function() {
-    $('select').select2({ width: '400px' });
-  })();
-</script>
diff --git a/app/views/groups/show.html.erb b/app/views/groups/show.html.erb
new file mode 100644
index 00000000000..cc250d46849
--- /dev/null
+++ b/app/views/groups/show.html.erb
@@ -0,0 +1,3 @@
+<% content_for :head do %>
+  <%= raw crawlable_meta_data(title: @title, description: @description_meta) %>
+<% end %>
diff --git a/app/views/invites/show.html.erb b/app/views/invites/show.html.erb
index cc4b0acc1e7..125a9c775ef 100644
--- a/app/views/invites/show.html.erb
+++ b/app/views/invites/show.html.erb
@@ -1,7 +1,7 @@
 <div id='simple-container'>
   <%if flash[:error]%>
     <div class='alert alert-error'>
-      <%=flash[:error]%>
+      <%=flash[:error].html_safe%>
     </div>
   <%end%>
 </div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 4eb4c3f275e..58fff0c1a15 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -36,7 +36,7 @@
     <%- end %>
 
     <%- if staff? %>
-      <script src="<%= Discourse.base_uri %>/extra-locales/admin"></script>
+      <script src="<%= ExtraLocalesController.url('admin') %>"></script>
       <%= preload_script "admin" %>
     <%- end %>
 
@@ -44,6 +44,7 @@
       <%= raw theme_lookup("head_tag") %>
     <%- end %>
 
+    <%= render_google_tag_manager_head_code %>
     <%= render_google_universal_analytics_code %>
     <link rel="manifest" href="<%= Discourse.base_uri %>/manifest.json">
 
@@ -60,10 +61,7 @@
   </head>
 
   <body class="<%= body_classes %>">
-    <%= render_google_tag_manager_code %>
-
-    <div class='debug-eyeline'></div>
-
+    <%= render_google_tag_manager_body_code %>
     <noscript data-path="<%= request.env['PATH_INFO'] %>">
       <%= render partial: 'header' %>
       <div id="main-outlet" class="wrap">
diff --git a/app/views/qunit/index.html.erb b/app/views/qunit/index.html.erb
new file mode 100644
index 00000000000..1ada1ae1638
--- /dev/null
+++ b/app/views/qunit/index.html.erb
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>QUnit Test Runner</title>
+    <%= stylesheet_link_tag "qunit" %>
+    <%= stylesheet_link_tag "test_helper" %>
+    <%= javascript_include_tag "qunit" %>
+    <%= javascript_include_tag "test_helper" %>
+    <%= csrf_meta_tags %>
+  </head>
+  <body>
+    <div id="qunit"></div>
+    <div id="qunit-fixture"></div>
+  </body>
+</html>
diff --git a/app/views/robots_txt/index.erb b/app/views/robots_txt/index.erb
index 0b6c8922fea..71ca94baa7b 100644
--- a/app/views/robots_txt/index.erb
+++ b/app/views/robots_txt/index.erb
@@ -1,29 +1,18 @@
-# See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
+<%= @robots_info[:header] %>
+<% if Discourse.base_uri.present? %>
+# This robots.txt file is not used. Please append the content below in the robots.txt file located at the root
+<% end %>
 #
-User-agent: *
-Disallow: /auth/cas
-Disallow: /auth/facebook/callback
-Disallow: /auth/twitter/callback
-Disallow: /auth/google/callback
-Disallow: /auth/yahoo/callback
-Disallow: /auth/github/callback
-Disallow: /auth/cas/callback
-Disallow: /assets/browser-update*.js
-Disallow: /users/
-Disallow: /u/
-Disallow: /badges/
-Disallow: /search
-Disallow: /search/
-Disallow: /tags
-Disallow: /tags/
-Disallow: /email/
-Disallow: /session
-Disallow: /session/
-Disallow: /admin
-Disallow: /admin/
-Disallow: /user-api-key
-Disallow: /user-api-key/
-Disallow: /*?api_key*
-Disallow: /*?*api_key*
+<% @robots_info[:agents].each do |agent| %>
+User-agent: <%= agent[:name] %>
+<%- if agent[:delay] -%>
+Crawl-delay: <%= agent[:delay] %>
+<%- end -%>
+<% agent[:disallow].each do |path| %>
+Disallow: <%= path %>
+<% end %>
+
+
+<% end %>
 
 <%= server_plugin_outlet "robots_txt_index" %>
diff --git a/app/views/robots_txt/no_index.erb b/app/views/robots_txt/no_index.erb
index 09e665facdf..7697afcf260 100644
--- a/app/views/robots_txt/no_index.erb
+++ b/app/views/robots_txt/no_index.erb
@@ -1,4 +1,4 @@
 # See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
 #
 User-agent: *
-Disallow: /
+Disallow: <%= Discourse.base_uri + "/" %>
diff --git a/app/views/session/email_login.html.erb b/app/views/session/email_login.html.erb
new file mode 100644
index 00000000000..a0f390df785
--- /dev/null
+++ b/app/views/session/email_login.html.erb
@@ -0,0 +1,30 @@
+<%if @error%>
+  <div class='alert alert-error'>
+    <%= @error %>
+  </div>
+<%end%>
+
+<%if @second_factor_required%>
+  <div style="display: flex;">
+    <div style="margin: auto;">
+      <%= form_tag(method: "post") do%>
+        <h2><%=t "login.second_factor_title" %></h2>
+        <%= label_tag(:second_factor_token, t("login.second_factor_description")) %>
+        <div><%= render 'common/second_factor_text_field' %></div>
+        <%= submit_tag(t("submit"), class: "btn btn-large btn-primary") %>
+      <%end%>
+    </div>
+  </div>
+<%end%>
+
+<% content_for :title do %><%=t "email_login.title" %><% end %>
+
+<%- content_for(:no_ember_head) do %>
+  <meta name="referrer" content="no-referrer">
+  <%= preload_script "ember_jquery" %>
+  <%= render_google_universal_analytics_code %>
+<%- end %>
+
+<%- content_for(:head) do %>
+  <meta name="referrer" content="no-referrer">
+<%- end %>
diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb
index 41f18eeb7b7..cc250d46849 100644
--- a/app/views/tags/index.html.erb
+++ b/app/views/tags/index.html.erb
@@ -1,24 +1,3 @@
-<% if crawler_layout? %>
-
-<% content_for :title do %><%=t "tags.title" %> - <%= SiteSetting.title %><% end %>
-
-<h1><%=t "tags.title" %></h1>
-
-<div class='tags-list' itemscope itemtype='http://schema.org/ItemList'>
-  <% @tags.each do |tag| %>
-    <div itemprop='itemListElement' itemscope itemtype='http://schema.org/ListItem'>
-      <meta itemprop='url' content='<%= "#{Discourse.base_url}/tags/#{tag[:id]}" %>'>
-      <a href='<%= "#{Discourse.base_url}/tags/#{tag[:id]}" %>' itemprop='item'>
-        <span itemprop='name'>
-          <%= tag[:text] %>
-        </span>
-      </a>
-    </div>
-  <% end %>
-</div>
-
-<% end %>
-
 <% content_for :head do %>
   <%= raw crawlable_meta_data(title: @title, description: @description_meta) %>
 <% end %>
diff --git a/app/views/users/activate_account.html.erb b/app/views/users/activate_account.html.erb
index b481df62aee..2bf9393135f 100644
--- a/app/views/users/activate_account.html.erb
+++ b/app/views/users/activate_account.html.erb
@@ -17,26 +17,18 @@
 
 <script language="javascript">
   (function() {
-    function activateAccount() {
-      $('#activate-account-button').prop('disabled', true);
-      $.ajax("<%= path "/u/hp" %>").then(function(hp) {
-        $('#password_confirmation').val(hp.value);
-        $('#challenge').val(hp.challenge.split("").reverse().join(""));
-        $('#activate-account-form').submit();
-      }).fail(function() {
-        $('#activate-account-button').prop('disabled', false);
+    setTimeout(function() {
+      var $activateButton = $('#activate-account-button');
+      $activateButton.on('click', function() {
+        $activateButton.prop('disabled', true);
+        $.ajax("<%= path "/u/hp" %>").then(function(hp) {
+          $('#password_confirmation').val(hp.value);
+          $('#challenge').val(hp.challenge.split("").reverse().join(""));
+          $('#activate-account-form').submit();
+        }).fail(function() {
+          $activateButton.prop('disabled', false);
+        });
       });
-    }
-
-    var t0 = new Date().getTime();
-    $('#activate-account-button').on('click', function() {
-      var diff = new Date().getTime() - t0;
-
-      // Ensure the form has been visible for a few ms before allowing the
-      // user to submit.
-      if (diff > 50) {
-        activateAccount();
-      }
-    });
+    }, 50);
   })();
 </script>
diff --git a/app/views/users/admin_login.html.erb b/app/views/users/admin_login.html.erb
index 9b40e951ec7..23049440715 100644
--- a/app/views/users/admin_login.html.erb
+++ b/app/views/users/admin_login.html.erb
@@ -5,6 +5,15 @@
   <body>
     <% if @message %>
       <%= @message %>
+      <% if @error %><p><%= @error %></p><% end %>
+
+      <% if @second_factor_required %>
+        <%=form_tag({}, method: :put) do %>
+          <%= label_tag(:second_factor_token, t('login.second_factor_description')) %>
+          <%= render 'common/second_factor_text_field' %><br><br>
+          <%= submit_tag t('submit')%>
+        <% end %>
+      <% end %>
     <% else %>
       <%=form_tag({}, method: :put) do %>
         <%= label_tag(:email, t('admin_login.email_input')) %>
diff --git a/app/views/users_email/confirm.html.erb b/app/views/users_email/confirm.html.erb
index 0538ddfaac3..35877cd95d0 100644
--- a/app/views/users_email/confirm.html.erb
+++ b/app/views/users_email/confirm.html.erb
@@ -7,6 +7,17 @@
     <h2><%= t 'change_email.confirmed' %></h2>
     <br>
     <a class="btn" href="/"><%= t('change_email.please_continue', site_name: SiteSetting.title) %></a>
+  <% elsif @update_result == :invalid_second_factor%>
+    <h2><%= t('login.second_factor_title') %></h2>
+    <br>
+    <%=form_tag({}, method: :put) do %>
+      <%= label_tag(:second_factor_token, t('login.second_factor_description')) %>
+      <%= text_field_tag(:second_factor_token, nil, autofocus: true) %><br>
+      <% if @show_invalid_second_factor_error %>
+        <div class='alert alert-error'><%= t('login.invalid_second_factor_code') %></div>
+      <% end %>
+      <%= submit_tag t('submit'), class: "btn btn-primary" %>
+    <% end %>
   <% else %>
     <div class='alert alert-error'>
       <%=t 'change_email.already_done' %>
diff --git a/app/views/wizard/qunit.html.erb b/app/views/wizard/qunit.html.erb
index 4e6e7a3a59f..561a2ade044 100644
--- a/app/views/wizard/qunit.html.erb
+++ b/app/views/wizard/qunit.html.erb
@@ -8,7 +8,7 @@
     <%= javascript_include_tag "qunit" %>
     <%= javascript_include_tag "wizard/test/test_helper" %>
     <%= csrf_meta_tags %>
-    <script src="/extra-locales/wizard"></script>
+    <script src="<%= ExtraLocalesController.url("wizard") %>"></script>
   </head>
   <body>
     <div id="qunit"></div>
diff --git a/bin/docker/boot_dev b/bin/docker/boot_dev
index 0a80ac638a7..781f0567a3d 100755
--- a/bin/docker/boot_dev
+++ b/bin/docker/boot_dev
@@ -38,7 +38,7 @@ echo "Using data in:   ${DATA_DIR}"
 
 mkdir -p "${DATA_DIR}"
 
-docker run -d -p 1080:1080 -p 3000:3000 -v "$DATA_DIR:/shared/postgres_data" -v "$SOURCE_DIR:/src" --hostname=discourse --name=discourse_dev --restart=always discourse/discourse_dev:release /sbin/boot
+docker run -d -p 1080:1080 -p 3000:3000 -v "$DATA_DIR:/shared/postgres_data:delegated" -v "$SOURCE_DIR:/src:delegated" --hostname=discourse --name=discourse_dev --restart=always discourse/discourse_dev:release /sbin/boot
 
 if [ "${initialize}" = "initialize" ]; then
     echo "Installing gems..."
diff --git a/bin/docker/reset_db b/bin/docker/reset_db
index 038cfd236ea..22ee77d1f23 100755
--- a/bin/docker/reset_db
+++ b/bin/docker/reset_db
@@ -1,8 +1,11 @@
 #!/bin/bash
-SCRIPTPATH=$(cd "$(dirname "$0")"; pwd -P)
+SCRIPTPATH=$(cd "$(dirname "$0")" >/dev/null; pwd -P)
 SOURCE_DIR=$(cd "$SCRIPTPATH" && cd ../.. && pwd -P)
 DATA_DIR=$SOURCE_DIR/data/postgres
 
 # Should this also run /etc/runit/1.d/ensure_database, or will that
-# happen automatically?
+# happen automatically? -- It will happen, but restarting the container is required
 docker run -it -v $DATA_DIR:/shared/postgres_data discourse/dev /bin/bash -c "rm -fr /shared/postgres_data/*"
+docker restart discourse_dev
+echo "Creating admin user..."
+"${SCRIPTPATH}/rake" admin:create
diff --git a/bin/docker/shutdown_dev b/bin/docker/shutdown_dev
index 557ccfe9dff..672299efb00 100755
--- a/bin/docker/shutdown_dev
+++ b/bin/docker/shutdown_dev
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker rm -f discourse_dev
+docker stop discourse_dev && docker rm discourse_dev
diff --git a/config/application.rb b/config/application.rb
index 7ca36a951a5..93efe887026 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,3 +1,16 @@
+# frozen_string_literal: true
+
+begin
+  if !RUBY_VERSION.match?(/^2\.[456]/)
+    STDERR.puts "Discourse requires Ruby 2.4.0 or up"
+    exit 1
+  end
+rescue
+  # no String#match?
+  STDERR.puts "Discourse requires Ruby 2.4.0 or up"
+  exit 1
+end
+
 require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 
@@ -73,6 +86,11 @@ module Discourse
 
     config.assets.paths += %W(#{config.root}/config/locales #{config.root}/public/javascripts)
 
+    if Rails.env == "development" || Rails.env == "test"
+      config.assets.paths << "#{config.root}/test/javascripts"
+      config.assets.paths << "#{config.root}/test/stylesheets"
+    end
+
     # Allows us to skip minifincation on some files
     config.assets.skip_minification = []
 
@@ -127,13 +145,14 @@ module Discourse
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [
-        :password,
-        :pop3_polling_password,
-        :api_key,
-        :s3_secret_access_key,
-        :twitter_consumer_secret,
-        :facebook_app_secret,
-        :github_client_secret
+      :password,
+      :pop3_polling_password,
+      :api_key,
+      :s3_secret_access_key,
+      :twitter_consumer_secret,
+      :facebook_app_secret,
+      :github_client_secret,
+      :second_factor_token,
     ]
 
     # Enable the asset pipeline
@@ -153,13 +172,16 @@ module Discourse
     # for some reason still seeing it in Rails 4
     config.middleware.delete Rack::Lock
 
+    # wrong place in middleware stack AND request tracker handles it
+    config.middleware.delete Rack::Runtime
+
     # ETags are pointless, we are dynamically compressing
     # so nginx strips etags, may revisit when mainline nginx
     # supports etags (post 1.7)
     config.middleware.delete Rack::ETag
 
-    # route all exceptions via our router
-    config.exceptions_app = self.routes
+    require 'middleware/discourse_public_exceptions'
+    config.exceptions_app = Middleware::DiscoursePublicExceptions.new(Rails.public_path)
 
     # Our templates shouldn't start with 'discourse/templates'
     config.handlebars.templates_root = 'discourse/templates'
@@ -183,12 +205,19 @@ module Discourse
     config.ember.handlebars_location = "#{Rails.root}/vendor/assets/javascripts/handlebars.js"
 
     require 'auth'
-    Discourse.activate_plugins! unless Rails.env.test? && ENV['LOAD_PLUGINS'] != "1"
 
     if GlobalSetting.relative_url_root.present?
       config.relative_url_root = GlobalSetting.relative_url_root
     end
 
+    if Rails.env == "test"
+      if ENV['LOAD_PLUGINS'] == "1"
+        Discourse.activate_plugins!
+      end
+    else
+      Discourse.activate_plugins!
+    end
+
     require_dependency 'stylesheet/manager'
 
     config.after_initialize do
diff --git a/config/boot.rb b/config/boot.rb
index 929f1a62fe0..ba9f61acee3 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -10,15 +10,21 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
 require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
 
-if ENV['RAILS_ENV'] != 'production'
-  require 'bootsnap'
+if ENV['RAILS_ENV'] != 'production' && ENV['RAILS_ENV'] != 'profile'
+  begin
+    require 'bootsnap'
+  rescue LoadError
+    # not a strong requirement
+  end
 
-  Bootsnap.setup(
-    cache_dir:            'tmp/cache', # Path to your cache
-    load_path_cache:      true,        # Should we optimize the LOAD_PATH with a cache?
-    autoload_paths_cache: true,        # Should we optimize ActiveSupport autoloads with cache?
-    disable_trace:        false,       # Sets `RubyVM::InstructionSequence.compile_option = { trace_instruction: false }`
-    compile_cache_iseq:   true,        # Should compile Ruby code into ISeq cache?
-    compile_cache_yaml:   false        # Skip YAML cache for now, cause we were seeing issues with it
-  )
+  if defined? Bootsnap
+    Bootsnap.setup(
+      cache_dir:            'tmp/cache', # Path to your cache
+      load_path_cache:      true,        # Should we optimize the LOAD_PATH with a cache?
+      autoload_paths_cache: true,        # Should we optimize ActiveSupport autoloads with cache?
+      disable_trace:        false,       # Sets `RubyVM::InstructionSequence.compile_option = { trace_instruction: false }`
+      compile_cache_iseq:   true,        # Should compile Ruby code into ISeq cache?
+      compile_cache_yaml:   false        # Skip YAML cache for now, cause we were seeing issues with it
+    )
+  end
 end
diff --git a/config/discourse_defaults.conf b/config/discourse_defaults.conf
index 2945e772364..7715cb29273 100644
--- a/config/discourse_defaults.conf
+++ b/config/discourse_defaults.conf
@@ -30,9 +30,16 @@ db_socket =
 # This is set to blank so it tries to use sockets first
 db_host =
 
+# host address for db server when taking a backup via `pg_dump`
+# Defaults to `db_host` if not configured
+db_backup_host =
+
 # port running db server, no need to set it
 db_port =
 
+# db server port to use when taking a backup via `pg_dump`
+db_backup_port = 5432
+
 # database name running discourse
 db_name = discourse
 
@@ -176,7 +183,22 @@ max_user_api_reqs_per_day = 2880
 
 max_admin_api_reqs_per_key_per_minute = 60
 
-max_requests_per_ip_per_minute = 200
-max_requests_per_ip_per_10_seconds = 50
-# global rate limiter will simply warn if the limit is exceeded, can be warn, block or none
-max_requests_per_ip_mode = none
+max_reqs_per_ip_per_minute = 200
+max_reqs_per_ip_per_10_seconds = 50
+
+# applies to asset type routes (avatars/css and so on)
+max_asset_reqs_per_ip_per_10_seconds = 200
+
+# global rate limiter will simply warn if the limit is exceeded, can be warn+block, warn, block or none
+max_reqs_per_ip_mode = none
+
+# bypass rate limiting any IP resolved as a private IP
+max_reqs_rate_limit_on_private = false
+
+# logged in DoS protection
+
+# protection will only trigger for requests that queue longer than this amount
+force_anonymous_min_queue_seconds = 1
+# only trigger anon if we see more than N requests for this path in last 10 seconds
+force_anonymous_min_per_10_seconds = 3
+
diff --git a/config/environments/development.rb b/config/environments/development.rb
index d9c10db2e8a..94a96f10848 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -52,7 +52,7 @@ Discourse::Application.configure do
     config.developer_emails = emails.split(",").map(&:downcase).map(&:strip)
   end
 
-  if defined?(Rails::Server) || defined?(Puma)
+  if defined?(Rails::Server) || defined?(Puma) || defined?(Unicorn)
     require 'stylesheet/watcher'
     STDERR.puts "Starting CSS change watcher"
     @watcher = Stylesheet::Watcher.watch
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 2397915f3a3..7a6f94612a2 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -10,12 +10,15 @@ Discourse::Application.configure do
   # Configure static asset server for tests with Cache-Control for performance
   config.public_file_server.enabled = true
 
-  # Show full error reports and disable caching
-  config.consider_all_requests_local       = true
+  # don't consider reqs local so we can properly handle exceptions like we do in prd
+  config.consider_all_requests_local       = false
+
+  # disable caching
   config.action_controller.perform_caching = false
 
-  # Raise exceptions instead of rendering exception templates
-  config.action_dispatch.show_exceptions = false
+  # production has "show exceptions" on so we better have it
+  # in test as well
+  config.action_dispatch.show_exceptions = true
 
   # Disable request forgery protection in test environment
   config.action_controller.allow_forgery_protection = false
@@ -47,12 +50,16 @@ Discourse::Application.configure do
     config.log_level = :fatal
   end
 
+  if defined? RspecErrorTracker
+    config.middleware.insert_after ActionDispatch::Flash, RspecErrorTracker
+  end
+
   config.after_initialize do
     SiteSetting.defaults.tap do |s|
       s.set_regardless_of_locale(:s3_upload_bucket, 'bucket')
       s.set_regardless_of_locale(:min_post_length, 5)
       s.set_regardless_of_locale(:min_first_post_length, 5)
-      s.set_regardless_of_locale(:min_private_message_post_length, 10)
+      s.set_regardless_of_locale(:min_personal_message_post_length, 10)
       s.set_regardless_of_locale(:crawl_images, false)
       s.set_regardless_of_locale(:download_remote_images_to_local, false)
       s.set_regardless_of_locale(:unique_posts_mins, 0)
diff --git a/config/initializers/004-message_bus.rb b/config/initializers/004-message_bus.rb
index fabada48a02..137dff182c5 100644
--- a/config/initializers/004-message_bus.rb
+++ b/config/initializers/004-message_bus.rb
@@ -10,9 +10,25 @@ end
 def setup_message_bus_env(env)
   return if env["__mb"]
 
+  extra_headers = {
+    "Access-Control-Allow-Origin" => Discourse.base_url_no_prefix,
+    "Access-Control-Allow-Methods" => "GET, POST",
+    "Access-Control-Allow-Headers" => "X-SILENCE-LOGGER, X-Shared-Session-Key, Dont-Chunk, Discourse-Visible"
+  }
+
   host = RailsMultisite::ConnectionManagement.host(env)
   RailsMultisite::ConnectionManagement.with_hostname(host) do
-    user = CurrentUser.lookup_from_env(env)
+    user = nil
+    begin
+      user = CurrentUser.lookup_from_env(env)
+    rescue Discourse::InvalidAccess => e
+      # this is bad we need to remove the cookie
+      if e.opts[:delete_cookie].present?
+        extra_headers['Set-Cookie'] = '_t=del; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT'
+      end
+    rescue => e
+      Discourse.warn_exception(e, message: "Unexpected error in Message Bus")
+    end
     user_id = user && user.id
     is_admin = !!(user && user.admin?)
     group_ids = if is_admin
@@ -22,13 +38,12 @@ def setup_message_bus_env(env)
       user.groups.pluck('groups.id')
     end
 
+    if env[Auth::DefaultCurrentUserProvider::BAD_TOKEN]
+      extra_headers['Discourse-Logged-Out'] = '1'
+    end
+
     hash = {
-      extra_headers:
-        {
-          "Access-Control-Allow-Origin" => Discourse.base_url_no_prefix,
-          "Access-Control-Allow-Methods" => "GET, POST",
-          "Access-Control-Allow-Headers" => "X-SILENCE-LOGGER, X-Shared-Session-Key, Dont-Chunk, Discourse-Visible"
-        },
+      extra_headers: extra_headers,
       user_id: user_id,
       group_ids: group_ids,
       is_admin: is_admin,
@@ -65,7 +80,7 @@ MessageBus.on_middleware_error do |env, e|
   if Discourse::InvalidAccess === e
     [403, {}, ["Invalid Access"]]
   elsif RateLimiter::LimitExceeded === e
-    [429, {}, [e.description]]
+    [429, { 'Retry-After' => e.available_in }, [e.description]]
   end
 end
 
diff --git a/config/initializers/006-mini_profiler.rb b/config/initializers/006-mini_profiler.rb
index 8a0ceb8a1a8..737e3bbb0dc 100644
--- a/config/initializers/006-mini_profiler.rb
+++ b/config/initializers/006-mini_profiler.rb
@@ -25,6 +25,7 @@ if defined?(Rack::MiniProfiler)
 
   skip = [
     /^\/message-bus/,
+    /^\/extra-locales/,
     /topics\/timings/,
     /assets/,
     /\/user_avatar\//,
diff --git a/config/initializers/009-omniauth.rb b/config/initializers/009-omniauth.rb
index 90feb34426b..0e58b14b8c1 100644
--- a/config/initializers/009-omniauth.rb
+++ b/config/initializers/009-omniauth.rb
@@ -1,14 +1,7 @@
 require "openssl"
 require "openid_redis_store"
 
-# if you need to test this and are having ssl issues see:
-#  http://stackoverflow.com/questions/6756460/openssl-error-using-omniauth-specified-ssl-path-but-didnt-work
-# OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE if Rails.env.development?
-
-Rails.application.config.middleware.use OmniAuth::Builder do
-  Discourse.authenticators.each do |authenticator|
-    authenticator.register_middleware(self)
-  end
-end
+require "middleware/omniauth_bypass_middleware"
+Rails.application.config.middleware.use Middleware::OmniauthBypassMiddleware
 
 OmniAuth.config.logger = Rails.logger
diff --git a/config/initializers/012-web_hook_events.rb b/config/initializers/012-web_hook_events.rb
index ad5d94dcce1..671fbd56b7a 100644
--- a/config/initializers/012-web_hook_events.rb
+++ b/config/initializers/012-web_hook_events.rb
@@ -1,25 +1,38 @@
-%i(topic_destroyed topic_recovered).each do |event|
-  DiscourseEvent.on(event) do |topic, user|
-    WebHook.enqueue_topic_hooks(event, topic, user)
+%i(
+  topic_destroyed
+  topic_recovered
+).each do |event|
+  DiscourseEvent.on(event) do |topic, _|
+    WebHook.enqueue_topic_hooks(event, topic)
   end
 end
 
-DiscourseEvent.on(:topic_created) do |topic, _, user|
-  WebHook.enqueue_topic_hooks(:topic_created, topic, user)
+DiscourseEvent.on(:topic_status_updated) do |topic, status|
+  WebHook.enqueue_topic_hooks("topic_#{status}_status_updated", topic)
 end
 
-%i(post_created
-   post_destroyed
-   post_recovered).each do |event|
+DiscourseEvent.on(:topic_created) do |topic, _, _|
+  WebHook.enqueue_topic_hooks(:topic_created, topic)
+end
 
-  DiscourseEvent.on(event) do |post, _, user|
-    WebHook.enqueue_post_hooks(event, post, user)
+%i(
+  post_created
+  post_destroyed
+  post_recovered
+).each do |event|
+  DiscourseEvent.on(event) do |post, _, _|
+    WebHook.enqueue_post_hooks(event, post)
   end
 end
 
 DiscourseEvent.on(:post_edited) do |post, topic_changed|
-  WebHook.enqueue_post_hooks(:post_edited, post)
-  WebHook.enqueue_topic_hooks(:topic_edited, post.topic) if post.is_first_post? && topic_changed
+  if post.topic
+    WebHook.enqueue_post_hooks(:post_edited, post)
+
+    if post.is_first_post? && topic_changed
+      WebHook.enqueue_topic_hooks(:topic_edited, post.topic)
+    end
+  end
 end
 
 %i(
@@ -30,6 +43,47 @@ end
   user_updated
 ).each do |event|
   DiscourseEvent.on(event) do |user|
-    WebHook.enqueue_hooks(:user, user_id: user.id, event_name: event.to_s)
+    WebHook.enqueue_object_hooks(:user, user, event)
+  end
+end
+
+%i(
+  group_created
+  group_updated
+  group_destroyed
+).each do |event|
+  DiscourseEvent.on(event) do |group|
+    WebHook.enqueue_object_hooks(:group, group, event)
+  end
+end
+
+%i(
+  category_created
+  category_updated
+  category_destroyed
+).each do |event|
+  DiscourseEvent.on(event) do |category|
+    WebHook.enqueue_object_hooks(:category, category, event)
+  end
+end
+
+%i(
+  tag_created
+  tag_updated
+  tag_destroyed
+).each do |event|
+  DiscourseEvent.on(event) do |tag|
+    WebHook.enqueue_object_hooks(:tag, tag, event, TagSerializer)
+  end
+end
+
+%i(
+  flag_created
+  flag_agreed
+  flag_disagreed
+  flag_deferred
+).each do |event|
+  DiscourseEvent.on(event) do |flag|
+    WebHook.enqueue_object_hooks(:flag, flag, event)
   end
 end
diff --git a/config/initializers/014-rails_multisite.rb b/config/initializers/014-rails_multisite.rb
index fba7ec79dab..630b07ff805 100644
--- a/config/initializers/014-rails_multisite.rb
+++ b/config/initializers/014-rails_multisite.rb
@@ -12,8 +12,8 @@ end
 
 if Rails.configuration.multisite
   Rails.configuration.middleware.swap(
-    RailsMultisite::ConnectionManagement,
-    RailsMultisite::ConnectionManagement,
+    RailsMultisite::Middleware,
+    RailsMultisite::Middleware,
     RailsMultisite::DiscoursePatches.config
   )
 end
diff --git a/config/initializers/100-i18n.rb b/config/initializers/100-i18n.rb
index 37a0dd050cc..0f5df274eeb 100644
--- a/config/initializers/100-i18n.rb
+++ b/config/initializers/100-i18n.rb
@@ -1,7 +1,10 @@
 # order: after 02-freedom_patches.rb
 
 require 'i18n/backend/discourse_i18n'
+require 'i18n/backend/fallback_locale_list'
+
 I18n.backend = I18n::Backend::DiscourseI18n.new
+I18n.fallbacks = I18n::Backend::FallbackLocaleList.new
 I18n.config.missing_interpolation_argument_handler = proc { throw(:exception) }
 I18n.init_accelerator!
 
diff --git a/config/initializers/100-push-notifications.rb b/config/initializers/100-push-notifications.rb
new file mode 100644
index 00000000000..50f580c3883
--- /dev/null
+++ b/config/initializers/100-push-notifications.rb
@@ -0,0 +1,13 @@
+require_dependency 'webpush'
+
+if SiteSetting.vapid_public_key.blank? || SiteSetting.vapid_private_key.blank? || SiteSetting.vapid_public_key_bytes.blank?
+  vapid_key = Webpush.generate_key
+  SiteSetting.vapid_public_key = vapid_key.public_key
+  SiteSetting.vapid_private_key = vapid_key.private_key
+end
+
+SiteSetting.vapid_public_key_bytes = Base64.urlsafe_decode64(SiteSetting.vapid_public_key).bytes.join("|")
+
+DiscourseEvent.on(:user_logged_out) do |user|
+  PushNotificationPusher.clear_subscriptions(user)
+end
diff --git a/config/initializers/100-sidekiq.rb b/config/initializers/100-sidekiq.rb
index a45ec085f77..f361c9fdeef 100644
--- a/config/initializers/100-sidekiq.rb
+++ b/config/initializers/100-sidekiq.rb
@@ -13,6 +13,9 @@ Sidekiq.configure_server do |config|
 end
 
 if Sidekiq.server?
+  # defer queue should simply run in sidekiq
+  Scheduler::Defer.async = false
+
   # warm up AR
   RailsMultisite::ConnectionManagement.each_connection do
     (ActiveRecord::Base.connection.tables - %w[schema_migrations]).each do |table|
diff --git a/config/initializers/100-lograge.rb b/config/initializers/101-lograge.rb
similarity index 76%
rename from config/initializers/100-lograge.rb
rename to config/initializers/101-lograge.rb
index a1089a7b273..650a046039d 100644
--- a/config/initializers/100-lograge.rb
+++ b/config/initializers/101-lograge.rb
@@ -8,6 +8,13 @@ if (Rails.env.production? && SiteSetting.logging_provider == 'lograge') || ENV["
   Rails.application.configure do
     config.lograge.enabled = true
 
+    Lograge.ignore(lambda do |event|
+      # this is our hijack magic status,
+      # no point logging this cause we log again
+      # direct from hijack
+      event.payload[:status] == 418
+    end)
+
     config.lograge.custom_payload do |controller|
       begin
         username =
@@ -26,7 +33,7 @@ if (Rails.env.production? && SiteSetting.logging_provider == 'lograge') || ENV["
 
         {
           ip: ip,
-          username: username,
+          username: username
         }
       rescue => e
         Rails.logger.warn("Failed to append custom payload: #{e.message}\n#{e.backtrace.join("\n")}")
@@ -46,7 +53,7 @@ if (Rails.env.production? && SiteSetting.logging_provider == 'lograge') || ENV["
           database: RailsMultisite::ConnectionManagement.current_db,
         }
 
-        if data = Thread.current[:_method_profiler]
+        if data = (Thread.current[:_method_profiler] || event.payload[:timings])
           sql = data[:sql]
 
           if sql
@@ -60,6 +67,13 @@ if (Rails.env.production? && SiteSetting.logging_provider == 'lograge') || ENV["
             output[:redis] = redis[:duration] * 1000
             output[:redis_calls] = redis[:calls]
           end
+
+          net = data[:net]
+
+          if net
+            output[:net] = net[:duration] * 1000
+            output[:net_calls] = net[:calls]
+          end
         end
 
         output
@@ -80,6 +94,11 @@ if (Rails.env.production? && SiteSetting.logging_provider == 'lograge') || ENV["
       config.lograge.logger = DiscourseLogstashLogger.logger(
         uri: ENV['LOGSTASH_URI'], type: :rails
       )
+
+      # Remove ActiveSupport::Logger from the chain and replace with Lograge's
+      # logger
+      Rails.logger.instance_variable_get(:@chained).pop
+      Rails.logger.chain(config.lograge.logger)
     end
   end
 end
diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index e6ac8182f4c..dc6b70b1853 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -16,12 +16,12 @@ ar:
           format: '%n %u'
           units:
             byte:
-              zero: بايت
-              one: بايت
-              two: بايت
               few: بايت
               many: بايت
+              one: بايت
               other: بايت
+              two: بايت
+              zero: بايت
             gb: غ.بايت
             kb: ك.بايت
             mb: م.بايت
@@ -47,130 +47,130 @@ ar:
       tiny:
         half_a_minute: "< دقيقة"
         less_than_x_seconds:
-          zero: "< 0 ثانية"
-          one: "< 1 ثانية"
-          two: "< ثانيتين"
-          few: "< %{count}ث"
-          many: "< %{count}ث"
-          other: "< %{count}ث"
+          few: < %{count}ث
+          many: < %{count}ث
+          one: < 1 ثانية
+          other: < %{count}ث
+          two: < ثانيتين
+          zero: < 0 ثانية
         x_seconds:
-          zero: "%{count}ث"
-          one: "%{count}ث"
-          two: "%{count}ث"
-          few: "%{count}ث"
-          many: "%{count}ث"
-          other: "%{count}ث"
+          few: '%{count}ث'
+          many: '%{count}ث'
+          one: '%{count}ث'
+          other: '%{count}ث'
+          two: '%{count}ث'
+          zero: '%{count}ث'
         x_minutes:
-          zero: "%{count}د"
-          one: "%{count}د"
-          two: "%{count}د"
-          few: "%{count}د"
-          many: "%{count}د"
-          other: "%{count}د"
+          few: '%{count}د'
+          many: '%{count}د'
+          one: '%{count}د'
+          other: '%{count}د'
+          two: '%{count}د'
+          zero: '%{count}د'
         about_x_hours:
-          zero: "%{count}س"
-          one: "%{count}س"
-          two: "%{count}س"
-          few: "%{count}س"
-          many: "%{count}س"
-          other: "%{count}س"
+          few: '%{count}س'
+          many: '%{count}س'
+          one: '%{count}س'
+          other: '%{count}س'
+          two: '%{count}س'
+          zero: '%{count}س'
         x_days:
-          zero: "%{count}ي"
-          one: "%{count}ي"
-          two: "%{count}ي"
-          few: "%{count}ي"
-          many: "%{count}ي"
-          other: "%{count}ي"
+          few: '%{count}ي'
+          many: '%{count}ي'
+          one: '%{count}ي'
+          other: '%{count}ي'
+          two: '%{count}ي'
+          zero: '%{count}ي'
         about_x_years:
-          zero: "%{count}ع"
-          one: "%{count}ع"
-          two: "%{count}ع"
-          few: "%{count}ع"
-          many: "%{count}ع"
-          other: "%{count}ع"
+          few: '%{count}ع'
+          many: '%{count}ع'
+          one: '%{count}ع'
+          other: '%{count}ع'
+          two: '%{count}ع'
+          zero: '%{count}ع'
         over_x_years:
-          zero: "> %{count}ع"
-          one: "> %{count}ع"
-          two: "> %{count}ع"
-          few: "> %{count}ع"
-          many: "> %{count}ع"
-          other: "> %{count}ع"
+          few: '> %{count}ع'
+          many: '> %{count}ع'
+          one: '> %{count}ع'
+          other: '> %{count}ع'
+          two: '> %{count}ع'
+          zero: '> %{count}ع'
         almost_x_years:
-          zero: "%{count}ع"
-          one: "%{count}ع"
-          two: "%{count}ع"
-          few: "%{count}ع"
-          many: "%{count}ع"
-          other: "%{count}ع"
+          few: '%{count}ع'
+          many: '%{count}ع'
+          one: '%{count}ع'
+          other: '%{count}ع'
+          two: '%{count}ع'
+          zero: '%{count}ع'
         date_month: "[في] D MMM"
         date_year: "[في] MMM YYYY"
       medium:
         x_minutes:
-          zero: "أقل من دقيقة"
-          one: "دقيقة واحدة"
-          two: "دقيقتان"
-          few: "%{count} دقائق"
-          many: "%{count} دقيقة"
-          other: "%{count} دقيقة"
+          few: '%{count} دقائق'
+          many: '%{count} دقيقة'
+          one: دقيقة واحدة
+          other: '%{count} دقيقة'
+          two: دقيقتان
+          zero: أقل من دقيقة
         x_hours:
-          zero: "أقل من ساعة"
-          one: "ساعة واحدة"
-          two: "ساعتان"
-          few: "%{count} ساعات"
-          many: "%{count} ساعة"
-          other: "%{count} ساعة"
+          few: '%{count} ساعات'
+          many: '%{count} ساعة'
+          one: ساعة واحدة
+          other: '%{count} ساعة'
+          two: ساعتان
+          zero: أقل من ساعة
         x_days:
-          zero: "أقل من يوم"
-          one: "يوم واحد"
-          two: "يومان"
-          few: "%{count} أيام"
-          many: "%{count} يوما"
-          other: "%{count} يوم"
+          few: '%{count} أيام'
+          many: '%{count} يوما'
+          one: يوم واحد
+          other: '%{count} يوم'
+          two: يومان
+          zero: أقل من يوم
         date_year: "D MMM، YYYY"
       medium_with_ago:
         x_minutes:
-          zero: "قبل أقل من دقيقة"
-          one: "قبل دقيقة واحدة"
-          two: "قبل دقيقتين"
-          few: "قبل %{count} دقائق"
-          many: "قبل %{count} دقيقة"
-          other: "قبل %{count} دقيقة"
+          few: قبل %{count} دقائق
+          many: قبل %{count} دقيقة
+          one: قبل دقيقة واحدة
+          other: قبل %{count} دقيقة
+          two: قبل دقيقتين
+          zero: قبل أقل من دقيقة
         x_hours:
-          zero: "قبل أقل من ساعة"
-          one: "قبل ساعة واحدة"
-          two: "قبل ساعتين"
-          few: "قبل %{count} ساعات"
-          many: "قبل %{count} ساعة"
-          other: "قبل %{count} ساعة"
+          few: قبل %{count} ساعات
+          many: قبل %{count} ساعة
+          one: قبل ساعة واحدة
+          other: قبل %{count} ساعة
+          two: قبل ساعتين
+          zero: قبل أقل من ساعة
         x_days:
-          zero: "قبل أقل من يوم"
-          one: "قبل يوم واحد"
-          two: "قبل يومين"
-          few: "قبل %{count} أيام"
-          many: "قبل %{count} يوما"
-          other: "قبل %{count} يوما"
+          few: قبل %{count} أيام
+          many: قبل %{count} يوما
+          one: قبل يوم واحد
+          other: قبل %{count} يوما
+          two: قبل يومين
+          zero: قبل أقل من يوم
       later:
         x_days:
-          zero: "بعد أقل من يوم"
-          one: "بعد يوم واحد"
-          two: "بعد يومين"
-          few: "بعد %{count} أيام"
-          many: "بعد %{count} يوما"
-          other: "بعد %{count} يوم"
+          few: بعد %{count} أيام
+          many: بعد %{count} يوما
+          one: بعد يوم واحد
+          other: بعد %{count} يوم
+          two: بعد يومين
+          zero: بعد أقل من يوم
         x_months:
-          zero: "بعد أقل من شهر"
-          one: "بعد شهر واحد"
-          two: "بعد شهرين"
-          few: "بعد %{count} أشهر"
-          many: "بعد %{count} شهرا"
-          other: "بعد %{count} شهر"
+          few: بعد %{count} أشهر
+          many: بعد %{count} شهرا
+          one: بعد شهر واحد
+          other: بعد %{count} شهر
+          two: بعد شهرين
+          zero: بعد أقل من شهر
         x_years:
-          zero: "بعد أقل من عام"
-          one: "بعد عام واحدة"
-          two: "بعد عامين"
-          few: "بعد %{count}  عام"
-          many: "بعد %{count}  عام"
-          other: "بعد %{count} عام"
+          few: بعد %{count}  عام
+          many: بعد %{count}  عام
+          one: بعد عام واحدة
+          other: بعد %{count} عام
+          two: بعد عامين
+          zero: بعد أقل من عام
       previous_month: 'الشهر السابق'
       next_month: 'الشهر التالي'
       placeholder: التاريخ
@@ -184,10 +184,11 @@ ar:
       email: 'شارك هذا الرابط علي بريد إلكتروني'
     action_codes:
       public_topic: "أجعل هذا الموضوع عامًّا %{when}"
-      private_topic: "جعل هذا الموضوع خاصًّا %{when}"
+      private_topic: "تحويل هذا الموضوع إلى رسالة شخصية %{when}"
       split_topic: "قسَم هذا الموضوع %{when}"
       invited_user: "دُعي %{who} %{when}"
       invited_group: "دُعي %{who} %{when}"
+      user_left: "%{who}أزال نفسه من هذه الرسالة %{when}"
       removed_user: "اُقصي %{who} %{when}"
       removed_group: "اُقصي %{who} %{when}"
       autoclosed:
@@ -214,8 +215,6 @@ ar:
     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 ساعة القادمة."
     themes:
       default_description: "افتراضى"
     s3:
@@ -239,6 +238,7 @@ ar:
     not_implemented: "لم تُنجز هذه الخاصية بعد، عذرا."
     no_value: "لا"
     yes_value: "نعم"
+    submit: "أرسل"
     generic_error: "نأسف، حدث عطل ما."
     generic_error_with_reason: "حدث عطل ما: %{error}"
     sign_up: "أنشأ حسابا"
@@ -251,12 +251,12 @@ ar:
     show_help: "خيارات"
     links: "روابط"
     links_lowercase:
-      zero: "الروابط"
-      one: "الروابط"
-      two: "الروابط"
-      few: "الروابط"
-      many: "الروابط"
-      other: "روابط"
+      few: الروابط
+      many: الروابط
+      one: الروابط
+      other: روابط
+      two: الروابط
+      zero: الروابط
     faq: "الأسئلة الشائعة"
     guidelines: "القواعد العامة"
     privacy_policy: "سياسة الخصوصية "
@@ -280,12 +280,12 @@ ar:
     max_of_count: "أقصى عدد هو {{count}}"
     alternation: "أو"
     character_count:
-      zero: "لا محارف"
-      one: "محرف واحد"
-      two: "محرفان"
-      few: "{{count}} محارف"
-      many: "{{count}} محرفا"
-      other: "{{count}} حرف"
+      few: '{{count}} محارف'
+      many: '{{count}} محرفا'
+      one: محرف واحد
+      other: '{{count}} حرف'
+      two: محرفان
+      zero: لا محارف
     suggested_topics:
       title: "الموضوعات المقترحة"
       pm_title: "رسائل مقترحة "
@@ -297,8 +297,6 @@ ar:
       our_moderators: "المشرفين"
       stat:
         all_time: "منذ التأسيس"
-        last_7_days: "آخر 7 أيام "
-        last_30_days: "آخر 30 يوما"
       like_count: "الإعجابات"
       topic_count: "الموضوعات"
       post_count: "المنشورات"
@@ -319,28 +317,6 @@ ar:
       last_read: "هذا آخر منشور قرأته، انقر لوضع علامة مرجعية علية"
       remove: "أزل العلامة المرجعية"
       confirm_clear: "أمتأكد من إزالة كل العلامات لمرجعية من هذا الموضوع؟"
-    topic_count_latest:
-      zero: "لا مواضيع جديدة أو محدّثة."
-      one: "موضوع واحد جديد أو محدّث."
-      two: "موضوعان جديدان أو محدّثان."
-      few: "{{count}} مواضيع جديدة أو محدّثة."
-      many: "{{count}} موضوعا جديدا أو محدّثا."
-      other: "{{count}} موضوع جديد أو محدث."
-    topic_count_unread:
-      zero: "لا مواضيع غير مقروءة"
-      one: "موضوع واحد غير مقروء."
-      two: "موضوعان غير مقروءان."
-      few: "{{count}} مواضيع غير مقروءة."
-      many: "{{count}} موضوعا غير مقروء."
-      other: "{{count}} موضوع غير مقروء."
-    topic_count_new:
-      zero: "لا مواضيع جديدة."
-      one: "موضوع واحد جديد."
-      two: "موضوعان جديدان."
-      few: "{{count}} مواضيع جديدة."
-      many: "{{count}} موضوعا جديدا."
-      other: "{{count}} موضوع جديد."
-    click_to_show: "انقر للعرض."
     preview: "معاينة"
     cancel: "ألغِ"
     save: "احفظ التعديلات"
@@ -350,8 +326,10 @@ ar:
     uploading: "يرفع..."
     uploading_filename: "يرفع {{filename}}..."
     uploaded: "رُفع!"
+    pasting: "جاري النسخ"
     enable: "فعّل"
     disable: "عطّل"
+    continue: "استمر"
     undo: "تراجع"
     revert: "اعكس"
     failed: "فشل"
@@ -376,24 +354,24 @@ ar:
       cancel: "ألغِ"
       view_pending: "اعرض المنشورات المعلّقة"
       has_pending_posts:
-        zero: "ليس في هذا الموضوع <b>أيّة</b> مشاركات تحتاج مراجعة"
-        one: "في هذا الموضوع <b>مشاركة واحدة</b> تحتاج مراجعة"
-        two: "في هذا الموضوع <b>مشاركتين</b> تحتاج مراجعة"
-        few: "في هذا الموضوع <b>{{count}}</b> مشاركات تحتاج مراجعة"
-        many: "في هذا الموضوع <b>{{count}}</b> مشاركة تحتاج مراجعة"
-        other: "في هذا الموضوع <b>{{count}}</b> منشور يحتاج إلي مراجعة"
+        few: في هذا الموضوع <b>{{count}}</b> مشاركات تحتاج مراجعة
+        many: في هذا الموضوع <b>{{count}}</b> مشاركة تحتاج مراجعة
+        one: في هذا الموضوع <b>مشاركة واحدة</b> تحتاج مراجعة
+        other: في هذا الموضوع <b>{{count}}</b> منشور يحتاج إلي مراجعة
+        two: في هذا الموضوع <b>مشاركتين</b> تحتاج مراجعة
+        zero: ليس في هذا الموضوع <b>أيّة</b> مشاركات تحتاج مراجعة
       confirm: "احفظ التعديلات"
       delete_prompt: "أمتأكد من حذف <b>%{username}</b>؟ ستُحذف كل منشوراتة وسيُمنع بريده الإلكتروني وعنوان الـ IP."
       approval:
         title: "المنشور يحتاج موافقة"
         description: "لقد وصلنا منشورك ولكنة يحتاج موافقة المشرف قبل ظهورها. نرجو منك الصبر."
         pending_posts:
-          zero: "<strong>لا</strong> مشاركات معلّقة."
-          one: "لديك <strong>مشاركة واحدة</strong> معلّقة."
-          two: "لديك <strong>مشاركتين</strong> معلّقتين."
-          few: "لديك <strong>{{count}}</strong> مشاركات معلّقة."
-          many: "لديك <strong>{{count}}</strong> مشاركة معلّقة."
-          other: "لديك <strong>{{count}}</strong> منشور معلّق."
+          few: لديك <strong>{{count}}</strong> مشاركات معلّقة.
+          many: لديك <strong>{{count}}</strong> مشاركة معلّقة.
+          one: لديك <strong>مشاركة واحدة</strong> معلّقة.
+          other: لديك <strong>{{count}}</strong> منشور معلّق.
+          two: لديك <strong>مشاركتين</strong> معلّقتين.
+          zero: <strong>لا</strong> مشاركات معلّقة.
         ok: "حسنا"
     user_action:
       user_posted_topic: "نشر <a href='{{userUrl}}'>{{user}}</a> <a href='{{topicUrl}}'>الموضوع</a>"
@@ -427,12 +405,12 @@ ar:
       posts_read: "المقروءة"
       posts_read_long: "المنشورات المقروءة"
       total_rows:
-        zero: "لا أعضاء"
-        one: "عضو واحد"
-        two: "عضوان"
-        few: "%{count} أعضاء"
-        many: "%{count} عضوًا"
-        other: "%{count} عضو"
+        few: '%{count} أعضاء'
+        many: '%{count} عضوًا'
+        one: عضو واحد
+        other: '%{count} عضو'
+        two: عضوان
+        zero: لا أعضاء
     group_histories:
       actions:
         change_group_setting: "تغيير إعدادات المجموعة"
@@ -441,22 +419,30 @@ ar:
         make_user_group_owner: "تعيين كمالك"
         remove_user_as_group_owner: "سحب صلاحية المالك"
     groups:
-      logs:
-        title: "السجلات"
-        when: "حين"
-        action: "إجراء"
-        acting_user: "العضو المسؤول"
-        target_user: "العضو المستهدف"
-        subject: "الموضوع"
-        details: "التفاصيل"
-        from: "من"
-        to: "إلى"
-      edit:
-        title: 'تعديل المجموعة'
+      add_members:
+        title: "أضف أعضاء"
+        usernames: "أسماء المستخدمين"
+      manage:
+        title: 'إدارة'
+        name: 'الإسم'
         full_name: 'الإسم الكامل'
         add_members: "إضافة أعضاء"
-        delete_member_confirm: "إزالة '%{username}' من المجموعة '%{group}'؟"
-      name_placeholder: "اسم المجموعة، بدون مسافات. يتبع قواعد اسم المستخدم"
+        profile:
+          title: الملف الشخصي
+        interaction:
+          title: تفاعل
+          posting: نشر
+          notification: اشعار
+        membership:
+          title: العضوية
+          access: صلاحية
+        logs:
+          title: "السّجلّات"
+          when: "متى"
+          action: "إجراء"
+          subject: "الموضوع"
+          from: "من"
+          to: "إلى"
       public_admission: "السماح للاعضاء بالانضمام إلى المجموعة بحرية (يتطلب أن تكون المجموعة مرئية للجميع )"
       public_exit: "السماح للأعضاء بمغادرة المجموعة بحرية"
       empty:
@@ -467,13 +453,9 @@ ar:
         topics: "لا موضوعات من أعضاء هذه المجموعة."
         logs: "لا سجلّات لهذه المجموعة."
       add: "أضف"
-      join: "انضم للمجموعة"
-      leave: "غادر المجموعة"
-      request: "اطلب الانضمام للمجموعة"
+      join: "انضم"
+      leave: "غادر"
       message: "رسالة"
-      automatic_group: مجموعة تلقائية
-      closed_group: مجموعة مغلقة
-      is_group_user: "أنت عضو في هذه المجموعة"
       allow_membership_requests: "السماح للأعضاء بأرسال طلب انضمام لمدراء المجموعة"
       membership_request_template: "لوحة مخصص تظهر للأعضاء عندما يرسلون طلب عضوية"
       membership_request:
@@ -482,33 +464,37 @@ ar:
         reason: "دع مدراء المجموعة يعرفون لماذا انت تنتمي لهذه المجموعة"
       membership: "العضوية"
       name: "الاسم"
-      user_count: "عدد اﻷعضاء"
+      user_count: "الأعضاء"
       bio: "عن المجموعة"
-      selector_placeholder: "أضف أعضاء"
+      selector_placeholder: "أدخل اسم المستخدم"
       owner: "المالك"
       index:
         title: "المجموعات"
+        all: "كل المجموعات"
         empty: "لا توجد مجموعات ظاهرة"
+        automatic: "تلقائي"
+        my_groups: "مجموعاتي"
+        group_type: "نوع المجموعة"
+        is_group_user: "عضو"
+        is_group_owner: "المالك"
       title:
-        zero: "مجموعة"
-        one: "مجموعة"
-        two: "مجموعتان"
-        few: "المجموعات"
-        many: "المجموعات"
-        other: "المجموعات"
+        few: المجموعات
+        many: المجموعات
+        one: مجموعة
+        other: المجموعات
+        two: مجموعتان
+        zero: مجموعة
       activity: "النشاط"
-      members: "الأعضاء"
+      members:
+        title: "الأعضاء"
+        filter_placeholder: "اسم المستخدم"
+        remove_owner: "حذف كمالك"
+        owner: "المالك"
       topics: "الموضوعات"
       posts: "المنشورات"
       mentions: "الإشارات"
       messages: "الرسائل"
       notification_level: "المستوى الأفتراضي لإشعارات رسائل المجموعة"
-      visibility_levels:
-        title: "من يستطيع رؤية هذه المجموعة؟"
-        public: "الكل"
-        members: "مالكي المجموعة و الأعضاء و المديرين"
-        staff: "مالكي المجموعة و طاقم العمل"
-        owners: "مالكي المجموعة و المديرين"
       alias_levels:
         mentionable: "من يستطيع @الاشارة الى هذه المجموعة؟"
         messageable: "من يستطيع ارسال رسالة الى هذه المجموعة؟"
@@ -517,9 +503,6 @@ ar:
         mods_and_admins: "المدراء والمشرفون فقط"
         members_mods_and_admins: "أعضاء المجموعة والمدراء والمشرفون فقط"
         everyone: "الكل"
-      trust_levels:
-        title: "مستوى الثقة الذي يُعطى للأعضاء آليا عندما يضافون:"
-        none: "لا شيء"
       notifications:
         watching:
           title: "مُراقب"
@@ -544,23 +527,21 @@ ar:
       flair_color_placeholder: "(إختياري) اللون بترميز Hexadecimal"
       flair_preview_icon: "معاينة الأيقونة"
       flair_preview_image: "معاينة الصورة"
-      flair_note: "ملحوظة: الصورة المميزة سوف تظهر فقط لمجموعة العضو الرئيسية."
     user_action_groups:
-      '1': "الإعجابات المعطاة"
-      '2': "الإعجابات المتلقاة"
-      '3': "العلامات المرجعية"
-      '4': "الموضوعات"
-      '5': "الردود"
-      '6': "الردود"
-      '7': "الإشارات"
-      '9': "الاقتباسات"
-      '11': "التعديلات"
-      '12': "العناصر المرسلة"
-      '13': "البريد الوارد"
-      '14': "قيد الانتظار"
+      "1": "الإعجابات المعطاة"
+      "2": "الإعجابات المتلقاة"
+      "3": "العلامات المرجعية"
+      "4": "الموضوعات"
+      "5": "الردود"
+      "6": "الردود"
+      "7": "الإشارات"
+      "9": "الاقتباسات"
+      "11": "التعديلات"
+      "12": "العناصر المرسلة"
+      "13": "البريد الوارد"
+      "14": "قيد الانتظار"
     categories:
       all: "كل الأقسام"
-      all_subcategories: "الكل"
       no_subcategory: "لا شيء"
       category: "قسم"
       category_list: "أعرض قائمة الأقسام"
@@ -579,19 +560,19 @@ ar:
       toggle_ordering: "تبديل التحكم في الترتيب"
       subcategories: "أقسام فرعية"
       topic_sentence:
-        zero: "لا مواضيع"
-        one: "موضوع واحد"
-        two: "موضوعان"
-        few: "%{count} مواضيع"
-        many: "%{count} موضوعًا"
-        other: "%{count} موضوع"
+        few: '%{count} مواضيع'
+        many: '%{count} موضوعًا'
+        one: موضوع واحد
+        other: '%{count} موضوع'
+        two: موضوعان
+        zero: لا مواضيع
       topic_stat_sentence:
-        zero: "لا مواضيع جديدة في ال%{unit} الماضي."
-        one: "موضوع واحد جديد في ال%{unit} الماضي."
-        two: "موضوعان جديدان في ال%{unit} الماضي."
-        few: "%{count} مواضيع جديدة في ال%{unit} الماضي."
-        many: "%{count} موضوعًا جديدًا في ال%{unit} الماضي."
-        other: "%{count} موضوع جديد في ال%{unit} الماضي."
+        few: '%{count} مواضيع جديدة في ال%{unit} الماضي.'
+        many: '%{count} موضوعًا جديدًا في ال%{unit} الماضي.'
+        one: موضوع واحد جديد في ال%{unit} الماضي.
+        other: '%{count} موضوع جديد في ال%{unit} الماضي.'
+        two: موضوعان جديدان في ال%{unit} الماضي.
+        zero: لا مواضيع جديدة في ال%{unit} الماضي.
     ip_lookup:
       title: جدول عناوين الIP
       hostname: اسم المضيف
@@ -626,6 +607,7 @@ ar:
       activity_stream: "النّشاط"
       preferences: " التّفضيلات"
       expand_profile: "توسيع"
+      collapse_profile: "إخفاء"
       bookmarks: "العلامات المرجعية"
       bio: "معلومات عنّي"
       invited_by: "مدعو بواسطة"
@@ -633,7 +615,6 @@ ar:
       notifications: "الإشعارات"
       statistics: "الأحصائيات"
       desktop_notifications:
-        label: "إشعارات سطح المكتب"
         not_supported: "نأسف، لا يدعم المتصفّح الإشعارات."
         perm_default: "فعّل الإشعارات"
         perm_denied_btn: "رُفض التّصريح"
@@ -648,7 +629,6 @@ ar:
       disable_jump_reply: "لا تنتقل إلى منشوري بعد النشر"
       dynamic_favicon: "أظهر عدد الموضوعات الجديدة/المحدّثة في أيقونة المتصفح"
       theme_default_on_all_devices: "اجعل هذة الواجهة افتراضية على جميع اجهزتي"
-      allow_private_messages: "السماح للأعضاء الاخرين بإرسال رسالة خاصة لي"
       external_links_in_new_tab: "فتح الروابط الخارجية في تبويب جديد"
       enable_quoting: "فعل خاصية إقتباس النصوص المظللة"
       change: "غيّر"
@@ -692,7 +672,6 @@ ar:
       delete_account: "أحذف الحسابي"
       delete_account_confirm: "أمتأكّد من حذف حسابك للأبد؟ هذا إجراء لا عودة فيه!"
       deleted_yourself: "حُذف حسابك بنجاح."
-      delete_yourself_not_allowed: "لا يمكنك حذف حسابك الآن. راسل أحد المدراء لحذف حسابك."
       unread_message_count: "الرسائل"
       admin_delete: "أحذف"
       users: "الأعضاء"
@@ -707,6 +686,7 @@ ar:
       undo_revoke_access: "ايقاف سحب صلاحيات الوصول"
       api_approved: "موافق عليه:"
       theme: "الواجهة"
+      home: "الصفحة الرئيسية الافتراضية"
       staff_counters:
         flags_given: "البلاغات المفيدة"
         flagged_posts: "المنشورات المبلغ عنها "
@@ -724,6 +704,7 @@ ar:
         move_to_archive: "الارشيف"
         failed_to_move: "فشل في نقل الرسائل المحددة (ربما يكون اتصالك ضعيفاً)"
         select_all: "تحديد الكل"
+        tags: "الأوسمة"
       preferences_nav:
         account: "الحساب"
         profile: "الملف الشخصي"
@@ -741,6 +722,9 @@ ar:
         set_password: " إعادة تعين كلمة المرور"
         choose_new: "اختر كلمة المرور الجديدة"
         choose: "اختر كلمة المرور"
+      second_factor:
+        label: "كود"
+        show_key_description: "أضف يدويا"
       change_about:
         title: "تعديل عني"
         error: "حدث عطل أثناء تغيير هذه القيمة."
@@ -781,12 +765,12 @@ ar:
         authenticated: "تم توثيق بريدك الإلكتروني بواسطة {{provider}}"
         frequency_immediately: "سيتم ارسال رسالة الكترونية فورا في حال أنك لم تقرأ الرسائل السابقة التي كنا نرسلها لك."
         frequency:
-          zero: "سنراسلك على بريدك فقط في حال لم تزر الموقع منذ {{count}} دقيقة."
-          one: "سنراسلك على بريدك فقط في حال لم تزر الموقع منذ {{count}} دقيقة."
-          two: "سنراسلك على بريدك فقط في حال لم تزر الموقع منذ {{count}} دقيقة."
-          few: "سنراسلك على بريدك فقط في حال لم تزر الموقع منذ {{count}} دقيقة."
-          many: "سنراسلك على بريدك فقط في حال لم تزر الموقع منذ {{count}} دقيقة."
-          other: "سنراسلك على بريدك فقط في حال لم تزر الموقع منذ {{count}} دقيقة."
+          few: سنراسلك على بريدك فقط في حال لم تزر الموقع منذ {{count}} دقيقة.
+          many: سنراسلك على بريدك فقط في حال لم تزر الموقع منذ {{count}} دقيقة.
+          one: سنراسلك على بريدك فقط في حال لم تزر الموقع منذ {{count}} دقيقة.
+          other: سنراسلك على بريدك فقط في حال لم تزر الموقع منذ {{count}} دقيقة.
+          two: سنراسلك على بريدك فقط في حال لم تزر الموقع منذ {{count}} دقيقة.
+          zero: سنراسلك على بريدك فقط في حال لم تزر الموقع منذ {{count}} دقيقة.
       name:
         title: "الاسم"
         instructions: "اسمك الكامل (اختياريّ)"
@@ -817,8 +801,6 @@ ar:
       created: "انضم"
       log_out: "سجل خروج"
       location: "الموقع الجغرافي"
-      card_badge:
-        title: "شارة بطاقة العضو"
       website: "الموقع الكتروني"
       email_settings: "البريد الإلكتروني"
       like_notification_frequency:
@@ -872,14 +854,13 @@ ar:
         title: "الدّعوات"
         user: "المستخدمين المدعويين"
         sent: "تم الإرسال"
-        none: "لا توجد دعوات معلقة لعرضها."
         truncated:
-          zero: "لا يوجد دعوات لعرضها."
-          one: "عرض الدعوة الأولى."
-          two: "عرض الدعوتان الأولتان."
-          few: "عرض الدعوات الأولية."
-          many: "عرض الدعوات {{count}} الأولى."
-          other: "عرض الدعوات  {{count}} الأولى."
+          few: عرض الدعوات الأولية.
+          many: عرض الدعوات {{count}} الأولى.
+          one: عرض الدعوة الأولى.
+          other: عرض الدعوات  {{count}} الأولى.
+          two: عرض الدعوتان الأولتان.
+          zero: لا يوجد دعوات لعرضها.
         redeemed: "دعوات محررة"
         redeemed_tab: "محررة"
         redeemed_tab_with_count: "({{count}}) محررة"
@@ -924,41 +905,42 @@ ar:
         title: "ملخص"
         stats: "إحصائيات"
         time_read: "وقت القراءة"
+        recent_time_read: "وقت القراءة الحديث"
         topic_count:
-          zero: "عدد المواضيع المنشأة"
-          one: "عدد المواضيع المنشأة"
-          two: "عدد المواضيع المنشأة"
-          few: "عدد المواضيع المنشأة"
-          many: "عدد المواضيع المنشأة"
-          other: "عدد المواضيع المنشأة"
+          few: عدد المواضيع المنشأة
+          many: عدد المواضيع المنشأة
+          one: عدد المواضيع المنشأة
+          other: عدد المواضيع المنشأة
+          two: عدد المواضيع المنشأة
+          zero: عدد المواضيع المنشأة
         post_count:
-          zero: "المنشورات المنشأة"
-          one: "المنشورات المنشأة"
-          two: "المنشورات المنشأة"
-          few: "المنشورات المنشأة"
-          many: "المنشورات المنشأة"
-          other: "المنشورات المنشأة"
+          few: المنشورات المنشأة
+          many: المنشورات المنشأة
+          one: المنشورات المنشأة
+          other: المنشورات المنشأة
+          two: المنشورات المنشأة
+          zero: المنشورات المنشأة
         days_visited:
-          zero: "أيّام الزّيارة"
-          one: "أيّام الزّيارة"
-          two: "أيّام الزّيارة"
-          few: "أيّام الزّيارة"
-          many: "أيّام الزّيارة"
-          other: "أيام الزيارة"
+          few: أيّام الزّيارة
+          many: أيّام الزّيارة
+          one: أيّام الزّيارة
+          other: أيام الزيارة
+          two: أيّام الزّيارة
+          zero: أيّام الزّيارة
         posts_read:
-          zero: "المنشورات المقروءة"
-          one: "المنشورات المقروءة"
-          two: "المنشورات المقروءة"
-          few: "المنشورات المقروءة"
-          many: "المنشورات المقروءة"
-          other: "المنشورات المقروءة"
+          few: المنشورات المقروءة
+          many: المنشورات المقروءة
+          one: المنشورات المقروءة
+          other: المنشورات المقروءة
+          two: المنشورات المقروءة
+          zero: المنشورات المقروءة
         bookmark_count:
-          zero: "العلامات المرجعية"
-          one: "العلامات المرجعية"
-          two: "العلامات المرجعية"
-          few: "العلامات المرجعية"
-          many: "العلامات المرجعية"
-          other: "العلامات المرجعية"
+          few: العلامات المرجعية
+          many: العلامات المرجعية
+          one: العلامات المرجعية
+          other: العلامات المرجعية
+          two: العلامات المرجعية
+          zero: العلامات المرجعية
         top_replies: "أفضل الردود"
         no_replies: "لا يوجد ردود بعد."
         more_replies: "ردود أخرى"
@@ -1026,12 +1008,12 @@ ar:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> وصل الحد الاقصي لإعدادت الموقع %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> يتجاوز الحد الاقصي لإعدادت الموقع %{siteSettingRate}."
       rate:
-        zero: "خطا واحد / %{duration}"
-        one: "خطا واحد / %{duration}"
-        two: "%{count} خطا / %{duration}"
-        few: "%{count} خطا / %{duration}"
-        many: "%{count} خطا /%{duration}"
-        other: "%{count} خطا /%{duration}"
+        few: '%{count} خطا / %{duration}'
+        many: '%{count} خطا /%{duration}'
+        one: خطا واحد / %{duration}
+        other: '%{count} خطا /%{duration}'
+        two: '%{count} خطا / %{duration}'
+        zero: خطا واحد / %{duration}
     learn_more: "اطّلع على المزيد..."
     all_time: 'المجموع'
     all_time_desc: 'عدد المواضيع المنشأة'
@@ -1049,12 +1031,12 @@ ar:
     time_read: المقروءة
     last_reply_lowercase: آخر رد
     replies_lowercase:
-      zero: الردود
-      one: الردود
-      two: الردود
       few: الردود
       many: الردود
+      one: الردود
       other: الردود
+      two: الردود
+      zero: الردود
     signup_cta:
       sign_up: "إنشاء حساب"
       hide_session: "ذكرني غدا"
@@ -1103,6 +1085,8 @@ ar:
       help: "لم يصل البريد؟ تفحص مجلد السبام<p>لست متأكداً اي عنوان بريد الكتروني قمت بأستخدامة؟ قم بأدخال عنوان البريد الالكتروني و سنعلمك ان كان موجوداً هنا</p><p> ان لم يعد بأمكانك الوصول الى البريد الالكتروني في حسابك, رجاء اتصل بـ <a href='/about'>طاقم الدعم الخاص بنا</a></p>"
       button_ok: "حسنا"
       button_help: "مساعدة"
+    email_login:
+      button_label: "مع البريد الإلكتروني"
     login:
       title: "تسجيل دخول"
       username: "اسم المستخدم"
@@ -1220,12 +1204,12 @@ ar:
       similar_topics: "موضوعك يشابه..."
       drafts_offline: "مسودات محفوظة "
       group_mentioned:
-        zero: "الإشارة إلى {{group}} تعني <a href='{{group_link}}'>عدم إخطار أحد</a>. أمتأكّد؟"
-        one: "الإشارة إلى {{group}} تعني إخطار <a href='{{group_link}}'>شخص واحد</a>. أمتأكّد؟"
-        two: "الإشارة إلى {{group}} تعني إخطار <a href='{{group_link}}'>شخصين</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>– أمتأكد من ذلك؟"
+        few: الإشارة إلى {{group}} تعني إخطار <a href='{{group_link}}'>{{count}} أشخاص</a>. أمتأكّد؟
+        many: الإشارة إلى {{group}} تعني إخطار <a href='{{group_link}}'>{{count}} شخصًا</a>. أمتأكّد؟
+        one: الإشارة إلى {{group}} تعني إخطار <a href='{{group_link}}'>شخص واحد</a>. أمتأكّد؟
+        other: بالإشارة إلى {{group}} تعني إشعار<a href='{{group_link}}'>{{count}} شخص</a>– أمتأكد من ذلك؟
+        two: الإشارة إلى {{group}} تعني إخطار <a href='{{group_link}}'>شخصين</a>. أمتأكّد؟
+        zero: الإشارة إلى {{group}} تعني <a href='{{group_link}}'>عدم إخطار أحد</a>. أمتأكّد؟
       cannot_see_mention:
         category: "لقد قمت بالإشارة إلي {{username}} لكن لن يتم إشعارهم لأن ليس لديهم صلاحية الوصول لهذا القسم. عليك ان تقوم باضافتهم لمجموعة لديها حق الوصول لهذا القسم."
         private: "لقد قمت بالإشارة إلي {{username}} لكن لن يتم إشعارهم لأن ليس لديهم صلاحية الوصول لهذه الرسالة الخاصة. عليك ان تقوم باضافتهم إلي هذة الرسالة."
@@ -1306,12 +1290,12 @@ ar:
       liked: "<span>{{username}}</span>{{description}} "
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        zero: "<span>{{username}}, {{username2}}</span> {{description}}"
-        one: "<span>{{username}}, {{username2}} و وواحد اخر</span> {{description}}"
-        two: "<span>{{username}}, {{username2}} و اثنين اخرون</span> {{description}}"
-        few: "<span>{{username}}, {{username2}} و {{count}} اخرون</span> {{description}}"
-        many: "<span>{{username}}, {{username2}} و {{count}} اخرون</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} و {{count}} اخرون</span> {{description}}"
+        few: <span>{{username}}, {{username2}} و {{count}} اخرون</span> {{description}}
+        many: <span>{{username}}, {{username2}} و {{count}} اخرون</span> {{description}}
+        one: <span>{{username}}, {{username2}} و وواحد اخر</span> {{description}}
+        other: <span>{{username}}, {{username2}} و {{count}} اخرون</span> {{description}}
+        two: <span>{{username}}, {{username2}} و اثنين اخرون</span> {{description}}
+        zero: <span>{{username}}, {{username2}}</span> {{description}}
       private_message: "<span>{{username}}</span> {{description}}"
       invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
       invited_to_topic: "<span>{{username}}</span> {{description}}"
@@ -1322,35 +1306,18 @@ ar:
       topic_reminder: "<span>{{username}}</span>{{description}} "
       watching_first_post: "<span>موضوع جديد</span> {{description}}"
       group_message_summary:
-        zero: "لا يوجد رسائل في صندوق رسائل {{group_name}} "
-        one: "رسالة واحدة في صندوق رسائل {{group_name}} "
-        two: "{{count}} رسالة في صندوق رسائل {{group_name}} "
-        few: "{{count}} رسالة في صندوق رسائل {{group_name}} "
-        many: "{{count}} رسالة في صندوق رسائل {{group_name}} "
-        other: "{{count}} رسالة في صندوق رسائل {{group_name}} "
-      alt:
-        mentioned: "أُشير إليك من"
-        quoted: "أُقتبس كلامك من"
-        replied: "مجاب"
-        posted: "منشور من"
-        edited: "تم تعديل منشورك من"
-        liked: "أُعجب بمنشورك"
-        private_message: "رسالة خاصة من"
-        invited_to_private_message: "تمت دعوتك لرسالة خاصة من "
-        invited_to_topic: "تمت دعوتك لموضوع من "
-        invitee_accepted: "قبلت دعوتك من"
-        moved_post: "منشورك نقل بواسطة"
-        linked: "وضع رابطا لمنشورك"
-        granted_badge: "تم منح الوسام"
-        group_message_summary: "رسائل صندوق المجموعة"
-        topic_reminder: "تذكير"
+        few: '{{count}} رسالة في صندوق رسائل {{group_name}} '
+        many: '{{count}} رسالة في صندوق رسائل {{group_name}} '
+        one: 'رسالة واحدة في صندوق رسائل {{group_name}} '
+        other: '{{count}} رسالة في صندوق رسائل {{group_name}} '
+        two: '{{count}} رسالة في صندوق رسائل {{group_name}} '
+        zero: 'لا يوجد رسائل في صندوق رسائل {{group_name}} '
       popup:
         mentioned: 'أشار {{username}} إليك في "{{topic}}" - {{site_title}}'
         group_mentioned: 'أشار {{username}} إليك في "{{topic}}" - {{site_title}}'
         quoted: 'اقتبس {{username}} كلامك في "{{topic}}" - {{site_title}}'
         replied: 'ردّ {{username}} عليك في "{{topic}}" - {{site_title}}'
         posted: 'نشر {{username}} في "{{topic}}" - {{site_title}}'
-        private_message: 'أرسل {{username}} إليك رسالة خاصة في "{{topic}}" - {{site_title}}'
         linked: '{{username}} وضع رابطا لمنشورك في "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "أضف صورة"
@@ -1458,12 +1425,12 @@ ar:
         notification_level: "الاشعارات"
         choose_new_category: "اختر القسم الجديد للموضوعات:"
         selected:
-          zero: "لم تحدد شيئا."
-          one: "حددت موضوع <b>واحد</b>."
-          two: "حددت <b>موضوعين</b>."
-          few: "حددت <b>{{count}}</b> مواضيع."
-          many: "حددت <b>{{count}}</b> موضوعا."
-          other: "حددت <b>{{count}}</b> موضوع."
+          few: حددت <b>{{count}}</b> مواضيع.
+          many: حددت <b>{{count}}</b> موضوعا.
+          one: حددت موضوع <b>واحد</b>.
+          other: حددت <b>{{count}}</b> موضوع.
+          two: حددت <b>موضوعين</b>.
+          zero: لم تحدد شيئا.
         change_tags: "غيّر الأوسمة"
         append_tags: "اضف الأوسمة"
         choose_new_tags: "اختر أوسمة جديدة لهذه الموضوعات:"
@@ -1495,16 +1462,13 @@ ar:
         bookmarks: "لا يوجد موضوعات عليها علامة مرجعية اخري."
         search: "لا يوجد نتائج بحث أخرى."
     topic:
-      unsubscribe:
-        stop_notifications: "انت الأن تستقبل اشعارات اقل عن<strong>{{title}}</strong>"
-        change_notification_state: "حالة اشعاراتك الحالية هي "
       filter_to:
-        zero: "لا يوجد منشورات في الموضوع"
-        one: "منشور واحد في الموضوع"
-        two: "منشورين في الموضوع"
-        few: "{{count}} منشور في الموضوع"
-        many: "{{count}} منشور في الموضوع"
-        other: "{{count}} منشور في الموضوع"
+        few: '{{count}} منشور في الموضوع'
+        many: '{{count}} منشور في الموضوع'
+        one: منشور واحد في الموضوع
+        other: '{{count}} منشور في الموضوع'
+        two: منشورين في الموضوع
+        zero: لا يوجد منشورات في الموضوع
       create: 'موضوع جديد'
       create_long: 'كتابة موضوع جديد'
       private_message: 'أرسل رسالة خاصة'
@@ -1514,23 +1478,25 @@ ar:
       move_to_inbox:
         title: 'انقل إلى البريد الوارد'
         help: 'انقل الرسالة للبريد الوارد'
+      edit_message:
+        title: 'تحرير رسالة'
       list: 'الموضوعات'
       new: 'موضوع جديد'
       unread: 'غير مقروء'
       new_topics:
-        zero: 'لا مواضيع جديدة'
-        one: 'موضوع واحد جديد'
-        two: 'موضوعان جديدان'
         few: '{{count}} مواضيع جديدة'
         many: '{{count}} موضوعًا جديدًا'
+        one: موضوع واحد جديد
         other: '{{count}} موضوع جديد'
+        two: موضوعان جديدان
+        zero: لا مواضيع جديدة
       unread_topics:
-        zero: 'لا مواضيع غير مقروءة'
-        one: 'موضوع واحد غير مقروء'
-        two: 'موضوعان غير مقروءان'
         few: '{{count}} مواضيع غير مقروءة'
         many: '{{count}} موضوعًا غير مقروء'
+        one: موضوع واحد غير مقروء
         other: '{{count}} موضوع غير مقروء'
+        two: موضوعان غير مقروءان
+        zero: لا مواضيع غير مقروءة
       title: 'الموضوع'
       invalid_access:
         title: "الموضوع خاص"
@@ -1543,33 +1509,33 @@ ar:
         title: "لم يُعثر على الموضوع"
         description: "عذرا، لم نجد هذا الموضوع. ربما أزاله أحد المشرفين؟"
       total_unread_posts:
-        zero: "لا يوجد منشورات غير مقروء في هذا الموضوع"
-        one: "لديك منشور واحد غير مقروء في هذا الموضوع"
-        two: "لديك {{count}} منشور غير مقروء في هذا الموضوع"
-        few: "لديك {{count}} منشور غير مقروء في هذا الموضوع"
-        many: "لديك {{count}} منشور غير مقروء في هذا الموضوع"
-        other: "لديك {{count}} منشور غير مقروء في هذا الموضوع"
+        few: لديك {{count}} منشور غير مقروء في هذا الموضوع
+        many: لديك {{count}} منشور غير مقروء في هذا الموضوع
+        one: لديك منشور واحد غير مقروء في هذا الموضوع
+        other: لديك {{count}} منشور غير مقروء في هذا الموضوع
+        two: لديك {{count}} منشور غير مقروء في هذا الموضوع
+        zero: لا يوجد منشورات غير مقروء في هذا الموضوع
       unread_posts:
-        zero: "لا مشاركات قديمة غير مقروءة في هذا الموضوع"
-        one: "لديك مشاركة واحدة قديمة غير مقروءة في هذا الموضوع"
-        two: "لديك مشاركتين قديمتين غير مقروءتين في هذا الموضوع"
-        few: "لديك {{count}} مشاركات قديمة غير مقروءة في هذا الموضوع"
-        many: "لديك {{count}} مشاركة قديمة غير مقروءة في هذا الموضوع"
-        other: "لديك {{count}} مشاركة قديمة غير مقروءة في هذا الموضوع"
+        few: لديك {{count}} مشاركات قديمة غير مقروءة في هذا الموضوع
+        many: لديك {{count}} مشاركة قديمة غير مقروءة في هذا الموضوع
+        one: لديك مشاركة واحدة قديمة غير مقروءة في هذا الموضوع
+        other: لديك {{count}} مشاركة قديمة غير مقروءة في هذا الموضوع
+        two: لديك مشاركتين قديمتين غير مقروءتين في هذا الموضوع
+        zero: لا مشاركات قديمة غير مقروءة في هذا الموضوع
       new_posts:
-        zero: "لا يوجد منشورات جديد في هذا الموضوع منذ اخر مرة قرأته"
-        one: "هناك منشور واحد جديد في هذا الموضوع منذ اخر مرة قرأته"
-        two: "هناك منشورين جديدين في هذا الموضوع منذ اخر مرة قرأته"
-        few: "هناك {{count}} منشور جديد في هذا الموضوع منذ اخر مرة قرأته"
-        many: "هناك {{count}} منشور جديد في هذا الموضوع منذ اخر مرة قرأته"
-        other: "هناك {{count}} منشور جديد في هذا الموضوع منذ اخر مرة قرأته"
+        few: هناك {{count}} منشور جديد في هذا الموضوع منذ اخر مرة قرأته
+        many: هناك {{count}} منشور جديد في هذا الموضوع منذ اخر مرة قرأته
+        one: هناك منشور واحد جديد في هذا الموضوع منذ اخر مرة قرأته
+        other: هناك {{count}} منشور جديد في هذا الموضوع منذ اخر مرة قرأته
+        two: هناك منشورين جديدين في هذا الموضوع منذ اخر مرة قرأته
+        zero: لا يوجد منشورات جديد في هذا الموضوع منذ اخر مرة قرأته
       likes:
-        zero: "لا إعجابات في هذا الموضوع"
-        one: "هناك إعجاب واحد في هذا الموضوع"
-        two: "هناك إعجابين في هذا الموضوع"
-        few: "هناك {{count}} إعجابات في هذا الموضوع"
-        many: "هناك {{count}} إعجابا في هذا الموضوع"
-        other: "هناك {{count}} إعجاب في هذا الموضوع"
+        few: هناك {{count}} إعجابات في هذا الموضوع
+        many: هناك {{count}} إعجابا في هذا الموضوع
+        one: هناك إعجاب واحد في هذا الموضوع
+        other: هناك {{count}} إعجاب في هذا الموضوع
+        two: هناك إعجابين في هذا الموضوع
+        zero: لا إعجابات في هذا الموضوع
       back_to_list: "عد إلى قائمة الموضوعات"
       options: "خيارات الموضوعات"
       show_links: "اظهر الروابط في هذا الموضوع"
@@ -1597,6 +1563,7 @@ ar:
         next_week: "الاسبوع القادم"
         next_month: "الشهر القادم"
         one_year: "سنة واحدة"
+        forever: "للأبد"
         pick_date_and_time: "اختر التاريخ والوقت"
         set_based_on_last_post: "اغلقة بناء علي اخر منشور"
       publish_to_category:
@@ -1625,12 +1592,12 @@ ar:
         auto_reminder: "سوف يتم تذكيرك بهذا الموضوع %{timeLeft}."
       auto_close_title: 'إعدادات الإغلاق الآلي'
       auto_close_immediate:
-        zero: "اخر منشور بهذا الموضوع نشر بالفعل منذ اقل من ساعة, لذا سيتم غلق الموضوع الأن."
-        one: "اخر منشور بهذا الموضوع نشر بالفعل منذ ساعة واحدة, لذا سيتم غلق الموضوع الأن."
-        two: "اخر منشور بهذا الموضوع نشر بالفعل منذ ساعتين, لذا سيتم غلق الموضوع الأن."
-        few: "اخر منشور بهذا الموضوع نشر بالفعل منذ %{count} ساعة, لذا سيتم غلق الموضوع الأن."
-        many: "اخر منشور بهذا الموضوع نشر بالفعل منذ %{count} ساعة, لذا سيتم غلق الموضوع الأن."
-        other: "اخر منشور بهذا الموضوع نشر بالفعل منذ %{count} ساعة, لذا سيتم غلق الموضوع الأن."
+        few: اخر منشور بهذا الموضوع نشر بالفعل منذ %{count} ساعة, لذا سيتم غلق الموضوع الأن.
+        many: اخر منشور بهذا الموضوع نشر بالفعل منذ %{count} ساعة, لذا سيتم غلق الموضوع الأن.
+        one: اخر منشور بهذا الموضوع نشر بالفعل منذ ساعة واحدة, لذا سيتم غلق الموضوع الأن.
+        other: اخر منشور بهذا الموضوع نشر بالفعل منذ %{count} ساعة, لذا سيتم غلق الموضوع الأن.
+        two: اخر منشور بهذا الموضوع نشر بالفعل منذ ساعتين, لذا سيتم غلق الموضوع الأن.
+        zero: اخر منشور بهذا الموضوع نشر بالفعل منذ اقل من ساعة, لذا سيتم غلق الموضوع الأن.
       timeline:
         back: "الرجوع"
         back_description: "عد إلى آخر منشور غير مقروء"
@@ -1651,21 +1618,21 @@ ar:
         title: غير معدل الاشعارات التي تصلك من هذا الموضوع
         reasons:
           mailing_list_mode: "وضع القائمة البريدية لديك مفعّل، لذلك ستصلك إشعارات بالردود على هذا الموضوع عبر البريد الإلكتروني."
-          '3_10': 'ستصلك إشعارات لأنك تراقب وسما يحملة هذا الموضوع.'
-          '3_6': 'ستصلك إشعارات لأنك تراقب هذا القسم.'
-          '3_5': 'ستصلك إشعارات لأنك تحولت لمراقبة هذا الموضوع آليا.'
-          '3_2': 'ستصلك إشعارات لأنك تراقب هذا الموضوع.'
-          '3_1': 'ستصلك إشعارات لأنك أنشأت هذا الموضوع.'
-          '3': 'ستصلك إشعارات لأنك تراقب هذا الموضوع.'
-          '2_8': 'سوف تشاهد عداد للردود الجديدة لانك تتابع هذا القسم.'
-          '2_4': 'سوف تشاهد عداد للردود الجديدة لانك قمت بالمشاركة برد في هذا الموضوع.'
-          '2_2': 'سوف تشاهد عداد للردود الجديدة لانك تتابع هذا الموضوع.'
-          '2': 'سوف تشاهد عداد للردود الجديدة لأنّك <a href="/u/{{username}}/preferences">قرأت هذا الموضوع</a>.'
-          '1_2': 'سيصلك إشعار إن أشار أحد إلى @اسمك أو رد عليك.'
-          '1': 'سيصلك إشعار إن أشار أحد إلى @اسمك أو رد عليك.'
-          '0_7': 'لن يصلك أي إشعار يخص هذا القسم.'
-          '0_2': 'لن يصلك أي إشعار يخص هذا الموضوع بناء على طلبك.'
-          '0': 'لن يصلك أي إشعار يخص هذا الموضوع بناء على طلبك.'
+          "3_10": 'ستصلك إشعارات لأنك تراقب وسما يحملة هذا الموضوع.'
+          "3_6": 'ستصلك إشعارات لأنك تراقب هذا القسم.'
+          "3_5": 'ستصلك إشعارات لأنك تحولت لمراقبة هذا الموضوع آليا.'
+          "3_2": 'ستصلك إشعارات لأنك تراقب هذا الموضوع.'
+          "3_1": 'ستصلك إشعارات لأنك أنشأت هذا الموضوع.'
+          "3": 'ستصلك إشعارات لأنك تراقب هذا الموضوع.'
+          "2_8": 'سوف تشاهد عداد للردود الجديدة لانك تتابع هذا القسم.'
+          "2_4": 'سوف تشاهد عداد للردود الجديدة لانك قمت بالمشاركة برد في هذا الموضوع.'
+          "2_2": 'سوف تشاهد عداد للردود الجديدة لانك تتابع هذا الموضوع.'
+          "2": 'سوف تشاهد عداد للردود الجديدة لأنّك <a href="/u/{{username}}/preferences">قرأت هذا الموضوع</a>.'
+          "1_2": 'سيصلك إشعار إن أشار أحد إلى @اسمك أو رد عليك.'
+          "1": 'سيصلك إشعار إن أشار أحد إلى @اسمك أو رد عليك.'
+          "0_7": 'لن يصلك أي إشعار يخص هذا القسم.'
+          "0_2": 'لن يصلك أي إشعار يخص هذا الموضوع بناء على طلبك.'
+          "0": 'لن يصلك أي إشعار يخص هذا الموضوع بناء على طلبك.'
         watching_pm:
           title: "مُراقب"
           description: "سيصلك إشعار لكل رد جديد علي هذه الرسالة، وسيظهر عداد للردود الجديدة."
@@ -1705,7 +1672,6 @@ ar:
         visible: "إضاف إلي القائمة"
         reset_read: "تصفير بيانات القراءة"
         make_public: "اجعل الموضوع للعموم"
-        make_private: "اجعل الرسالة خاصة"
       feature:
         pin: "تثبيت الموضوع"
         unpin: "إلغاء تثبيت الموضوع"
@@ -1738,12 +1704,12 @@ ar:
         pin_validation: "التاريخ مطلوب لتثبيت هذا الموضوع."
         not_pinned: "لا يوجد موضوعات مثبتة في {{categoryLink}}."
         already_pinned:
-          zero: "المواضيع مثبتة حالياً في {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          one: "المواضيع مثبتة حالياً في {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
-          two: "المواضيع مثبتة حالياً في {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          few: "المواضيع مثبتة حالياً في {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          many: "المواضيع مثبتة حالياً في {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "الموضوعات مثبتة حالياً في {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          few: 'المواضيع مثبتة حالياً في {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          many: 'المواضيع مثبتة حالياً في {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: 'المواضيع مثبتة حالياً في {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'الموضوعات مثبتة حالياً في {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          two: 'المواضيع مثبتة حالياً في {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          zero: 'المواضيع مثبتة حالياً في {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         pin_globally: "اعرض هذا الموضوع أعلى كل قوائم الموضوعات حتى"
         confirm_pin_globally: "لديك {{count}} موضوع مثبت علي عموم الموقع مما قد يشكل عبئ على الأعضاء الجدد و الزوار. هل أنت واثق أنك تريد تثبيت موضوع أخر على عموم الموقع؟"
         unpin_globally: "أزل هذا الموضوع من أعلى كل قوائم الموضوعات."
@@ -1751,12 +1717,12 @@ ar:
         global_pin_note: "يمكن للاعضاء إذالة تثبيت الموضوع لأنفسهم. "
         not_pinned_globally: "لا يوجد موضوعات مثبتة للعموم."
         already_pinned_globally:
-          zero: "الموضوعات المثبتة علي عموم الموقع حاليا: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          one: "الموضوعات المثبتة علي عموم الموقع حاليا: <strong class='badge badge-notification unread'>1</strong>"
-          two: "الموضوعات المثبتة علي عموم الموقع حاليا: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          few: "الموضوعات المثبتة علي عموم الموقع حاليا: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          many: "الموضوعات المثبتة علي عموم الموقع حاليا: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "الموضوعات المثبتة علي عموم الموقع حاليا: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          few: 'الموضوعات المثبتة علي عموم الموقع حاليا: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          many: 'الموضوعات المثبتة علي عموم الموقع حاليا: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: 'الموضوعات المثبتة علي عموم الموقع حاليا: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'الموضوعات المثبتة علي عموم الموقع حاليا: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          two: 'الموضوعات المثبتة علي عموم الموقع حاليا: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          zero: 'الموضوعات المثبتة علي عموم الموقع حاليا: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         make_banner: "اجعل هذا الموضوع إعلانا يظهر أعلى كل الصفحات."
         remove_banner: "أزل الإعلان الذي يظهر أعلى كل الصفحات."
         banner_note: "الأعضاء يستطيعون تجاهل الموضوع المثبت كإعلان بإغلاقه. لا تمكن تعيين اكثر من موضوع في نفس الوقت كإعلان."
@@ -1793,12 +1759,12 @@ ar:
       login_reply: 'عليك تسجيل الدخول للرد'
       filters:
         n_posts:
-          zero: "لا يوجد منشورات"
-          one: "منشور واحد"
-          two: "منشوران"
-          few: "{{count}} منشور"
-          many: "{{count}} منشور"
-          other: "{{count}} منشور"
+          few: '{{count}} منشور'
+          many: '{{count}} منشور'
+          one: منشور واحد
+          other: '{{count}} منشور'
+          two: منشوران
+          zero: لا يوجد منشورات
         cancel: "إزالة الترشيح"
       split_topic:
         title: "نقل الى موضوع جديد"
@@ -1806,23 +1772,23 @@ ar:
         topic_name: "اسم الموضوع الجديد"
         error: "حدث عطل أثناء نقل المنشورات إلى موضوع جديد."
         instructions:
-          zero: "أنت على وشك انشاء موضوع جديد, ولم تقم باختيار أي منشور لتعبئته."
-          one: "أنت على وشك انشاء موضوع جديد وتعبئته بمنشورم اخترتة."
-          two: "أنت على وشك انشاء موضوع جديد وتعبئته منشورين اخترتهما."
-          few: "أنت على وشك انشاء موضوع جديد وتعبئته بـ <b>{{count}}</b> منشور اخترتة."
-          many: "أنت على وشك انشاء موضوع جديد وتعبئته بـ <b>{{count}}</b> منشور اخترتة."
-          other: "أنت على وشك انشاء موضوع جديد وتعبئته بـ <b>{{count}}</b> منشور اخترتة."
+          few: أنت على وشك انشاء موضوع جديد وتعبئته بـ <b>{{count}}</b> منشور اخترتة.
+          many: أنت على وشك انشاء موضوع جديد وتعبئته بـ <b>{{count}}</b> منشور اخترتة.
+          one: أنت على وشك انشاء موضوع جديد وتعبئته بمنشورم اخترتة.
+          other: أنت على وشك انشاء موضوع جديد وتعبئته بـ <b>{{count}}</b> منشور اخترتة.
+          two: أنت على وشك انشاء موضوع جديد وتعبئته منشورين اخترتهما.
+          zero: أنت على وشك انشاء موضوع جديد, ولم تقم باختيار أي منشور لتعبئته.
       merge_topic:
         title: "نقل الى موضوع موجود"
         action: "نقل الى موضوع موجود"
         error: "حدث عطل أثناء نقل المنشورات إلى الموضوع ذاك."
         instructions:
-          zero: "لم يتم اختيار أي منشورات لنقلها !"
-          one: "الرجاء اختيار الموضوع الذي تود نقل منشور واحد إليه."
-          two: "الرجاء اختيار الموضوع الذي تود نقل منشورين إليه."
-          few: "الرجاء اختيار الموضوع الذي تود نقل الـ<b>{{count}}</b> منشور إليه."
-          many: "الرجاء اختيار الموضوع الذي تود نقل الـ<b>{{count}}</b> منشور إليه."
-          other: "الرجاء اختيار الموضوع الذي تود نقل الـ<b>{{count}}</b> منشور إليه."
+          few: الرجاء اختيار الموضوع الذي تود نقل الـ<b>{{count}}</b> منشور إليه.
+          many: الرجاء اختيار الموضوع الذي تود نقل الـ<b>{{count}}</b> منشور إليه.
+          one: الرجاء اختيار الموضوع الذي تود نقل منشور واحد إليه.
+          other: الرجاء اختيار الموضوع الذي تود نقل الـ<b>{{count}}</b> منشور إليه.
+          two: الرجاء اختيار الموضوع الذي تود نقل منشورين إليه.
+          zero: لم يتم اختيار أي منشورات لنقلها !
       merge_posts:
         title: "ادمج المنشورات المحدّدة"
         action: "ادمج المنشورات المحددة"
@@ -1834,13 +1800,12 @@ ar:
         label: "الكاتب الجديد للمنشورات"
         placeholder: "اسم مستخدم الكاتب الجديد"
         instructions:
-          zero: "لم يتم تحديد أي منشورات!"
-          one: "الرجاء اختيار المالك الجديد لمنشور نُشر بواسطة <b>{{old_user}}</b>."
-          two: "الرجاء اختيار المالك الجديد لمنشورين نُشروا بواسطة <b>{{old_user}}</b>."
-          few: "الرجاء اختيار المالك الجديد لـ {{count}} منشور نُشر بواسطة <b>{{old_user}}</b>."
-          many: "الرجاء اختيار المالك الجديد لـ {{count}} منشور نُشر بواسطة <b>{{old_user}}</b>."
-          other: "الرجاء اختيار الكاتب الجديد لـ {{count}} منشور نُشر بواسطة <b>{{old_user}}</b>."
-        instructions_warn: "ملاحطة لن يتم نقل الاشعارت القديمة الخاصة بالمنشور للكاتب الجديد <br>تحذير:لن يتم نقل اي بيانات عن المنشور للكاتب الجديد. استعملها بحذر."
+          few: الرجاء اختيار المالك الجديد لـ {{count}} منشور نُشر بواسطة <b>{{old_user}}</b>.
+          many: الرجاء اختيار المالك الجديد لـ {{count}} منشور نُشر بواسطة <b>{{old_user}}</b>.
+          one: الرجاء اختيار المالك الجديد لمنشور نُشر بواسطة <b>{{old_user}}</b>.
+          other: الرجاء اختيار الكاتب الجديد لـ {{count}} منشور نُشر بواسطة <b>{{old_user}}</b>.
+          two: الرجاء اختيار المالك الجديد لمنشورين نُشروا بواسطة <b>{{old_user}}</b>.
+          zero: لم يتم تحديد أي منشورات!
       change_timestamp:
         title: "غير تاريخ النشر..."
         action: "غير تاريخ النشر..."
@@ -1855,15 +1820,13 @@ ar:
         select_all: حدد الكل
         deselect_all: أزل تحديد الكل
         description:
-          zero: لم تحدّد أي منشورات.
-          one: لقد حدّدت منشور<b>واحد</b>.
-          two: لقد حدّدت <b>منشورين</b>.
           few: لقد حدّدت <b>{{count}}</b> منشور.
           many: لقد حدّدت <b>{{count}}</b> منشور.
+          one: لقد حدّدت منشور<b>واحد</b>.
           other: لقد حدّدت <b>{{count}}</b> منشور.
+          two: لقد حدّدت <b>منشورين</b>.
+          zero: لم تحدّد أي منشورات.
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "اقتبس"
       edit_reason: "السبب:"
       post_number: "المنشور {{number}}"
@@ -1876,50 +1839,50 @@ ar:
       show_full: "عرض كامل المنشور"
       show_hidden: 'اعرض المحتوى المخفيّ.'
       deleted_by_author:
-        zero: "(سحب الكاتب المنشور، سيحذف آليًّا الأن ما لم يُبلّغ عنه)"
-        one: "(سحب الكاتب المنشور، سيحذف آليًّا خلال ساعة واحدة ما لم يُبلّغ عنه)"
-        two: "(سحب الكاتب المنشور، سيحذف آليًّا خلال %{count} ساعة ما لم يُبلّغ عنه)"
-        few: "(سحب الكاتب المنشور، سيحذف آليًّا خلال %{count} ساعة ما لم يُبلّغ عنه)"
-        many: "(سحب الكاتب المنشور، سيحذف آليًّا خلال %{count} ساعة ما لم يُبلّغ عنه)"
-        other: "(سحب الكاتب المنشور، سيحذف آليًّا خلال %{count} ساعة ما لم يُبلّغ عنه)"
+        few: (سحب الكاتب المنشور، سيحذف آليًّا خلال %{count} ساعة ما لم يُبلّغ عنه)
+        many: (سحب الكاتب المنشور، سيحذف آليًّا خلال %{count} ساعة ما لم يُبلّغ عنه)
+        one: (سحب الكاتب المنشور، سيحذف آليًّا خلال ساعة واحدة ما لم يُبلّغ عنه)
+        other: (سحب الكاتب المنشور، سيحذف آليًّا خلال %{count} ساعة ما لم يُبلّغ عنه)
+        two: (سحب الكاتب المنشور، سيحذف آليًّا خلال %{count} ساعة ما لم يُبلّغ عنه)
+        zero: (سحب الكاتب المنشور، سيحذف آليًّا الأن ما لم يُبلّغ عنه)
       expand_collapse: "إظهار/إخفاء"
       gap:
-        zero: "لا يوجد ردود مخفية"
-        one: "اعرض رد واحد مخفي"
-        two: "اعرض ال‍ {{count}} رد مخفي"
-        few: "اعرض ال‍ {{count}} رد مخفي"
-        many: "اعرض ال‍ {{count}} رد مخفي"
-        other: "اعرض ال‍ {{count}} رد مخفي"
+        few: اعرض ال‍ {{count}} رد مخفي
+        many: اعرض ال‍ {{count}} رد مخفي
+        one: اعرض رد واحد مخفي
+        other: اعرض ال‍ {{count}} رد مخفي
+        two: اعرض ال‍ {{count}} رد مخفي
+        zero: لا يوجد ردود مخفية
       unread: "المنشور غير مقروء"
       has_replies:
-        zero: "لا ردود"
-        one: "رد واحد"
-        two: "{{count}} رد"
-        few: "{{count}} رد"
-        many: "{{count}} رد"
-        other: "{{count}} رد"
+        few: '{{count}} رد'
+        many: '{{count}} رد'
+        one: رد واحد
+        other: '{{count}} رد'
+        two: '{{count}} رد'
+        zero: لا ردود
       has_likes:
-        zero: "لا إعجابات"
-        one: "إعجاب واحد"
-        two: "{{count}} إعجاب"
-        few: "{{count}} إعجاب"
-        many: "{{count}} إعجاب"
-        other: "{{count}} إعجاب"
+        few: '{{count}} إعجاب'
+        many: '{{count}} إعجاب'
+        one: إعجاب واحد
+        other: '{{count}} إعجاب'
+        two: '{{count}} إعجاب'
+        zero: لا إعجابات
       has_likes_title:
-        zero: "{{count}} عضو اعجب بهذا المشروع"
-        one: "عضو واحد اعجب بهذا المشروع"
-        two: "{{count}} عضو اعجب بهذا المشروع"
-        few: "{{count}} عضو اعجب بهذا المشروع"
-        many: "{{count}} عضو اعجب بهذا المشروع"
-        other: "{{count}} عضو اعجب بهذا المشروع"
+        few: '{{count}} عضو اعجب بهذا المشروع'
+        many: '{{count}} عضو اعجب بهذا المشروع'
+        one: عضو واحد اعجب بهذا المشروع
+        other: '{{count}} عضو اعجب بهذا المشروع'
+        two: '{{count}} عضو اعجب بهذا المشروع'
+        zero: '{{count}} عضو اعجب بهذا المشروع'
       has_likes_title_only_you: "اعجبك هذا المنشور"
       has_likes_title_you:
-        zero: "لم يعجب احد غيرك بهذا المنشور"
-        one: "انت و عضو واحد غيرك اعجبكم هذا المنشور."
-        two: "انت و عضوين غيرك اعجبكم هذا المنشور."
-        few: "انت و {{count}} غيرك اعجبكم هذا المنشور."
-        many: "انت و {{count}} غيرك اعجبكم هذا المنشور."
-        other: "انت و {{count}} غيرك اعجبكم هذا المنشور."
+        few: انت و {{count}} غيرك اعجبكم هذا المنشور.
+        many: انت و {{count}} غيرك اعجبكم هذا المنشور.
+        one: انت و عضو واحد غيرك اعجبكم هذا المنشور.
+        other: انت و {{count}} غيرك اعجبكم هذا المنشور.
+        two: انت و عضوين غيرك اعجبكم هذا المنشور.
+        zero: لم يعجب احد غيرك بهذا المنشور
       errors:
         create: "عذرا، حدثت مشكلة اثناء إنشاء منشورك. من فضلك حاول مجددا."
         edit: "عذرا، حدثت مشكلة اثناء تعديل منشورك. من فضلك حاول مجددا."
@@ -1993,126 +1956,126 @@ ar:
           vote: "لقد صوّت على هذا المنشور"
         by_you_and_others:
           off_topic:
-            zero: "أنت أبلّغت بأن هذا المنشور خارج الموضوع."
-            one: "أنت وشخص اخر أبلّغتما بأن هذا المنشور خارج الموضوع."
-            two: "أنت و {{count}} آخرون أبلغتم بأن هذا المنشور خارج الموضوع"
-            few: "أنت و {{count}} آخرون أبلغتم بأن هذا المنشور خارج الموضوع"
-            many: "أنت و {{count}} آخرون أبلغتم بأن هذا المنشور خارج الموضوع"
-            other: "أنت و {{count}} آخرون أبلغتم بأن هذا المنشور خارج الموضوع"
+            few: أنت و {{count}} آخرون أبلغتم بأن هذا المنشور خارج الموضوع
+            many: أنت و {{count}} آخرون أبلغتم بأن هذا المنشور خارج الموضوع
+            one: أنت وشخص اخر أبلّغتما بأن هذا المنشور خارج الموضوع.
+            other: أنت و {{count}} آخرون أبلغتم بأن هذا المنشور خارج الموضوع
+            two: أنت و {{count}} آخرون أبلغتم بأن هذا المنشور خارج الموضوع
+            zero: أنت أبلّغت بأن هذا المنشور خارج الموضوع.
           spam:
-            zero: "أنت أبلّغت بأن هذا هذا المنشور سبام."
-            one: "أنت وشخص آخر أبلّغتما بأن هذا المنشور سبام."
-            two: "أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور سبام."
-            few: "أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور سبام."
-            many: "أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور سبام."
-            other: "أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور سبام."
+            few: أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور سبام.
+            many: أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور سبام.
+            one: أنت وشخص آخر أبلّغتما بأن هذا المنشور سبام.
+            other: أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور سبام.
+            two: أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور سبام.
+            zero: أنت أبلّغت بأن هذا هذا المنشور سبام.
           inappropriate:
-            zero: "أنت أبلّغت بأن هذا المنشور غير لائق."
-            one: "أنت و شخص آخر أبلّغتما بأن هذا المنشور غير لائق."
-            two: "أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور غير لائق."
-            few: "أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور غير لائق."
-            many: "أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور غير لائق."
-            other: "أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور غير لائق."
+            few: أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور غير لائق.
+            many: أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور غير لائق.
+            one: أنت و شخص آخر أبلّغتما بأن هذا المنشور غير لائق.
+            other: أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور غير لائق.
+            two: أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور غير لائق.
+            zero: أنت أبلّغت بأن هذا المنشور غير لائق.
           notify_moderators:
-            zero: "أنت أبلّغت المشرفين  عن هذا المنشور."
-            one: "أنت و شخص آخر أبلّغتما المشرفين عن هذا المنشور."
-            two: "أنت و {{count}} آخرون أبلّغتم المشرفين عن هذا المنشور."
-            few: "أنت و {{count}} آخرون أبلّغتم المشرفين عن هذا المنشور."
-            many: "أنت و {{count}} آخرون أبلّغتم المشرفين عن هذا المنشور."
-            other: "أنت و {{count}} آخرون أبلّغتم المشرفين عن هذا المنشور."
+            few: أنت و {{count}} آخرون أبلّغتم المشرفين عن هذا المنشور.
+            many: أنت و {{count}} آخرون أبلّغتم المشرفين عن هذا المنشور.
+            one: أنت و شخص آخر أبلّغتما المشرفين عن هذا المنشور.
+            other: أنت و {{count}} آخرون أبلّغتم المشرفين عن هذا المنشور.
+            two: أنت و {{count}} آخرون أبلّغتم المشرفين عن هذا المنشور.
+            zero: أنت أبلّغت المشرفين  عن هذا المنشور.
           notify_user:
-            zero: "أنت أرسلت رسالة لهذا العضو."
-            one: "أنت و شخص اخر ارسلتما رسالة لهذا العضو."
-            two: "أنت و {{count}} آخرون ارسلتم رسالة لهذا العضو."
-            few: "أنت و {{count}} آخرون ارسلتم رسالة لهذا العضو."
-            many: "أنت و {{count}} آخرون ارسلتم رسالة لهذا العضو."
-            other: "أنت و {{count}} آخرون ارسلتم رسالة لهذا العضو."
+            few: أنت و {{count}} آخرون ارسلتم رسالة لهذا العضو.
+            many: أنت و {{count}} آخرون ارسلتم رسالة لهذا العضو.
+            one: أنت و شخص اخر ارسلتما رسالة لهذا العضو.
+            other: أنت و {{count}} آخرون ارسلتم رسالة لهذا العضو.
+            two: أنت و {{count}} آخرون ارسلتم رسالة لهذا العضو.
+            zero: أنت أرسلت رسالة لهذا العضو.
           bookmark:
-            zero: "أنت وضعت علامة مرجعية علي هذا المنشور"
-            one: "أنت و شخص آخر وضعتما علامة مرجعية علي هذا المنشور"
-            two: "أنت و {{count}} آخرون وضعتم علامة مرجعية علي هذا المنشور"
-            few: "أنت و {{count}} آخرون وضعتم علامة مرجعية علي هذا المنشور"
-            many: "أنت و {{count}} آخرون وضعتم علامة مرجعية علي هذا المنشور"
-            other: "أنت و {{count}} آخرون وضعتم علامة مرجعية علي هذا المنشور"
+            few: أنت و {{count}} آخرون وضعتم علامة مرجعية علي هذا المنشور
+            many: أنت و {{count}} آخرون وضعتم علامة مرجعية علي هذا المنشور
+            one: أنت و شخص آخر وضعتما علامة مرجعية علي هذا المنشور
+            other: أنت و {{count}} آخرون وضعتم علامة مرجعية علي هذا المنشور
+            two: أنت و {{count}} آخرون وضعتم علامة مرجعية علي هذا المنشور
+            zero: أنت وضعت علامة مرجعية علي هذا المنشور
           like:
-            zero: "أنت اعجبت بهذا المنشور"
-            one: "أنت و شخص آخر اعجبتما بهذا المنشور"
-            two: "أنت و {{count}} آخرون اعجبتم بهذا المنشور"
-            few: "أنت و {{count}} آخرون اعجبتم بهذا المنشور"
-            many: "أنت و {{count}} آخرون اعجبتم بهذا المنشور"
-            other: "أنت و {{count}} آخرون اعجبتم بهذا المنشور"
+            few: أنت و {{count}} آخرون اعجبتم بهذا المنشور
+            many: أنت و {{count}} آخرون اعجبتم بهذا المنشور
+            one: أنت و شخص آخر اعجبتما بهذا المنشور
+            other: أنت و {{count}} آخرون اعجبتم بهذا المنشور
+            two: أنت و {{count}} آخرون اعجبتم بهذا المنشور
+            zero: أنت اعجبت بهذا المنشور
           vote:
-            zero: "أنت صوت علي هذا المنشور"
-            one: "أنت و شخص آخر صوتما علي هذا المنشور"
-            two: "أنت و {{count}} آخرون صوتم علي هذا المنشور"
-            few: "أنت و {{count}} آخرون صوتم علي هذا المنشور"
-            many: "أنت و {{count}} آخرون صوتم علي هذا المنشور"
-            other: "أنت و {{count}} آخرون صوتم علي هذا المنشور"
+            few: أنت و {{count}} آخرون صوتم علي هذا المنشور
+            many: أنت و {{count}} آخرون صوتم علي هذا المنشور
+            one: أنت و شخص آخر صوتما علي هذا المنشور
+            other: أنت و {{count}} آخرون صوتم علي هذا المنشور
+            two: أنت و {{count}} آخرون صوتم علي هذا المنشور
+            zero: أنت صوت علي هذا المنشور
         by_others:
           off_topic:
-            zero: "لم يبلغ احد بأن هذا المنشور خارج الموضوع"
-            one: "عضو واحد أبلغ بأن هذا المنشور خارج الموضوع"
-            two: "{{count}} عضو أبلغ بأن هذا المنشور خارج الموضوع"
-            few: "{{count}} عضو أبلغ بأن هذا المنشور خارج الموضوع"
-            many: "{{count}} عضو أبلغ بأن هذا المنشور خارج الموضوع"
-            other: "{{count}} عضو أبلغ بأن هذا المنشور خارج الموضوع"
+            few: '{{count}} عضو أبلغ بأن هذا المنشور خارج الموضوع'
+            many: '{{count}} عضو أبلغ بأن هذا المنشور خارج الموضوع'
+            one: عضو واحد أبلغ بأن هذا المنشور خارج الموضوع
+            other: '{{count}} عضو أبلغ بأن هذا المنشور خارج الموضوع'
+            two: '{{count}} عضو أبلغ بأن هذا المنشور خارج الموضوع'
+            zero: لم يبلغ احد بأن هذا المنشور خارج الموضوع
           spam:
-            zero: "لم يبلّغ احد بأن هذا المنشور سبام."
-            one: "عضو واحد أبلّغ بأن هذا المنشور سبام."
-            two: "{{count}} عضو أبلّغ بأن هذا المنشور سبام."
-            few: "{{count}} عضو أبلّغ بأن هذا المنشور سبام."
-            many: "{{count}} عضو أبلّغ بأن هذا المنشور سبام."
-            other: "{{count}} عضو أبلّغ بأن هذا المنشور سبام."
+            few: '{{count}} عضو أبلّغ بأن هذا المنشور سبام.'
+            many: '{{count}} عضو أبلّغ بأن هذا المنشور سبام.'
+            one: عضو واحد أبلّغ بأن هذا المنشور سبام.
+            other: '{{count}} عضو أبلّغ بأن هذا المنشور سبام.'
+            two: '{{count}} عضو أبلّغ بأن هذا المنشور سبام.'
+            zero: لم يبلّغ احد بأن هذا المنشور سبام.
           inappropriate:
-            zero: "لم يبلغ احد بأن هذا المنشور غير لائق."
-            one: "عضو واحد أبلّغ بأن هذا المنشور غير لائق."
-            two: "{{count}} عضو أبلّغ بأن هذا المنشور غير لائق."
-            few: "{{count}} عضو أبلّغ بأن هذا المنشور غير لائق."
-            many: "{{count}} عضو أبلّغ بأن هذا المنشور غير لائق."
-            other: "{{count}} عضو أبلّغ بأن هذا المنشور غير لائق."
+            few: '{{count}} عضو أبلّغ بأن هذا المنشور غير لائق.'
+            many: '{{count}} عضو أبلّغ بأن هذا المنشور غير لائق.'
+            one: عضو واحد أبلّغ بأن هذا المنشور غير لائق.
+            other: '{{count}} عضو أبلّغ بأن هذا المنشور غير لائق.'
+            two: '{{count}} عضو أبلّغ بأن هذا المنشور غير لائق.'
+            zero: لم يبلغ احد بأن هذا المنشور غير لائق.
           notify_moderators:
-            zero: "لم يبلغ احد المشرفين عن هذا المنشور"
-            one: "عضو واحد أبلّغ المشرفين عن هذا المنشور"
-            two: "{{count}} عضو أبلّغ المشرفين عن هذا المنشور"
-            few: "{{count}} عضو أبلّغ المشرفين عن هذا المنشور"
-            many: "{{count}} عضو أبلّغ المشرفين عن هذا المنشور"
-            other: "{{count}} عضو أبلّغ المشرفين عن هذا المنشور"
+            few: '{{count}} عضو أبلّغ المشرفين عن هذا المنشور'
+            many: '{{count}} عضو أبلّغ المشرفين عن هذا المنشور'
+            one: عضو واحد أبلّغ المشرفين عن هذا المنشور
+            other: '{{count}} عضو أبلّغ المشرفين عن هذا المنشور'
+            two: '{{count}} عضو أبلّغ المشرفين عن هذا المنشور'
+            zero: لم يبلغ احد المشرفين عن هذا المنشور
           notify_user:
-            zero: "لم يرسل احد رسالة لهذا العضو"
-            one: "عضو واحد ارسل رسالة لهذا العضو"
-            two: "{{count}} عضو ارسل رسالة لهذا العضو"
-            few: "{{count}} عضو ارسل رسالة لهذا العضو"
-            many: "{{count}} عضو ارسل رسالة لهذا العضو"
-            other: "{{count}} عضو ارسل رسالة لهذا العضو"
+            few: '{{count}} عضو ارسل رسالة لهذا العضو'
+            many: '{{count}} عضو ارسل رسالة لهذا العضو'
+            one: عضو واحد ارسل رسالة لهذا العضو
+            other: '{{count}} عضو ارسل رسالة لهذا العضو'
+            two: '{{count}} عضو ارسل رسالة لهذا العضو'
+            zero: لم يرسل احد رسالة لهذا العضو
           bookmark:
-            zero: "لم يضع احد علامة مرجعية علي هذا المنشور"
-            one: "عضو واحد وضع علامة مرجعية علي هذا المنشور"
-            two: "{{count}} عضو وضع علامة مرجعية علي هذا المنشور"
-            few: "{{count}} عضو وضع علامة مرجعية علي هذا المنشور"
-            many: "{{count}} عضو وضع علامة مرجعية علي هذا المنشور"
-            other: "{{count}} عضو وضع علامة مرجعية علي هذا المنشور"
+            few: '{{count}} عضو وضع علامة مرجعية علي هذا المنشور'
+            many: '{{count}} عضو وضع علامة مرجعية علي هذا المنشور'
+            one: عضو واحد وضع علامة مرجعية علي هذا المنشور
+            other: '{{count}} عضو وضع علامة مرجعية علي هذا المنشور'
+            two: '{{count}} عضو وضع علامة مرجعية علي هذا المنشور'
+            zero: لم يضع احد علامة مرجعية علي هذا المنشور
           like:
-            zero: "لم يعجب احد بهذا المنشور"
-            one: "عضو واحد اعجب بهذا المنشور"
-            two: "{{count}} عضو اعجب بهذا المنشور"
-            few: "{{count}} عضو اعجب بهذا المنشور"
-            many: "{{count}} عضو اعجب بهذا المنشور"
-            other: "{{count}} عضو اعجب بهذا المنشور"
+            few: '{{count}} عضو اعجب بهذا المنشور'
+            many: '{{count}} عضو اعجب بهذا المنشور'
+            one: عضو واحد اعجب بهذا المنشور
+            other: '{{count}} عضو اعجب بهذا المنشور'
+            two: '{{count}} عضو اعجب بهذا المنشور'
+            zero: لم يعجب احد بهذا المنشور
           vote:
-            zero: "لم يصوت احد علي هذا المنشور"
-            one: "عضو واحد صوت علي هذا المنشور"
-            two: "{{count}} عضو صوت علي هذا المنشور"
-            few: "{{count}} عضو صوت علي هذا المنشور"
-            many: "{{count}} عضو صوت علي هذا المنشور"
-            other: "{{count}} عضو صوت علي هذا المنشور"
+            few: '{{count}} عضو صوت علي هذا المنشور'
+            many: '{{count}} عضو صوت علي هذا المنشور'
+            one: عضو واحد صوت علي هذا المنشور
+            other: '{{count}} عضو صوت علي هذا المنشور'
+            two: '{{count}} عضو صوت علي هذا المنشور'
+            zero: لم يصوت احد علي هذا المنشور
       merge:
         confirm:
-          zero: "لا يوجد منشورات لدمجها"
-          one: "هل انت متاكد انك تريد دمج هذا المنشور؟"
-          two: "هل انت متاكد انك تريد دمج هذان المنشوران؟"
-          few: "هل انت متاكد انك تريد دمج الـ {{count}} منشور؟"
-          many: "هل انت متاكد انك تريد دمج الـ {{count}} منشور؟"
-          other: "هل انت متاكد انك تريد دمج الـ {{count}} منشور؟"
+          few: هل انت متاكد انك تريد دمج الـ {{count}} منشور؟
+          many: هل انت متاكد انك تريد دمج الـ {{count}} منشور؟
+          one: هل انت متاكد انك تريد دمج هذا المنشور؟
+          other: هل انت متاكد انك تريد دمج الـ {{count}} منشور؟
+          two: هل انت متاكد انك تريد دمج هذان المنشوران؟
+          zero: لا يوجد منشورات لدمجها
       revisions:
         controls:
           first: "أول مراجعة"
@@ -2194,7 +2157,6 @@ ar:
       email_in_allow_strangers: "قبول بريد إلكتروني من زوار لا يملكون حسابات"
       email_in_disabled: "عُطّل إرسال المشاركات عبر البريد الإلكترونيّ من إعدادات الموقع. لتفعيل نشر المشاركات الجديدة عبر البريد،"
       email_in_disabled_click: 'قم بتفعيل خيار "email in" في الإعدادات'
-      suppress_from_homepage: "امنع هذا القسم من الظهور في الصفحة الرئيسية."
       show_subcategory_list: "أظهر الأقسام الفرعية فوق الموضوعات من هذا القسم."
       num_featured_topics: "عدد الموضوعات المعروضة في صفحة الأقسام:"
       subcategory_num_featured_topics: "عدد الموضوعات المُميزة في صفحة القسم الرئيسي."
@@ -2268,26 +2230,26 @@ ar:
       custom_placeholder_notify_moderators: "يمكنك تزودنا بمعلومات أكثر عن سبب عدم ارتياحك إلي هذا المنشور؟ زودنا ببعض الروابط و الأمثلة قدر الإمكان."
       custom_message:
         at_least:
-          zero: "لا تُدخل أيّ محرف"
-          one: "أدخل حرف واحد على الأقل"
-          two: "أدخل {{count}} احرف على الأقل"
-          few: "أدخل {{count}} احرف على الأقل"
-          many: "أدخل {{count}} احرف على الأقل"
-          other: "أدخل {{count}} احرف على الأقل"
+          few: أدخل {{count}} احرف على الأقل
+          many: أدخل {{count}} احرف على الأقل
+          one: أدخل حرف واحد على الأقل
+          other: أدخل {{count}} احرف على الأقل
+          two: أدخل {{count}} احرف على الأقل
+          zero: لا تُدخل أيّ محرف
         more:
-          zero: "{{count}} حرف متبقي علي الحد الادني..."
-          one: "حرف واحد متبقي علي الحد الادني..."
-          two: "{{count}} حرف متبقي علي الحد الادني..."
-          few: "{{count}} حرف متبقي علي الحد الادني..."
-          many: "{{count}} حرف متبقي علي الحد الادني..."
-          other: "{{count}} حرف متبقي علي الحد الادني..."
+          few: '{{count}} حرف متبقي علي الحد الادني...'
+          many: '{{count}} حرف متبقي علي الحد الادني...'
+          one: حرف واحد متبقي علي الحد الادني...
+          other: '{{count}} حرف متبقي علي الحد الادني...'
+          two: '{{count}} حرف متبقي علي الحد الادني...'
+          zero: '{{count}} حرف متبقي علي الحد الادني...'
         left:
-          zero: "{{count}} حرف متبقي علي الحد الاقصي..."
-          one: "حرف واحد متبقي علي الحد الاقصي..."
-          two: "{{count}} حرف متبقي علي الحد الاقصي..."
-          few: "{{count}} حرف متبقي علي الحد الاقصي..."
-          many: "{{count}} حرف متبقي علي الحد الاقصي..."
-          other: "{{count}} حرف متبقي علي الحد الاقصي..."
+          few: '{{count}} حرف متبقي علي الحد الاقصي...'
+          many: '{{count}} حرف متبقي علي الحد الاقصي...'
+          one: حرف واحد متبقي علي الحد الاقصي...
+          other: '{{count}} حرف متبقي علي الحد الاقصي...'
+          two: '{{count}} حرف متبقي علي الحد الاقصي...'
+          zero: '{{count}} حرف متبقي علي الحد الاقصي...'
     flagging_topic:
       title: "شكرا لمساعدتنا في ابقاء المجمتع متحضر"
       action: "التبليغ عن الموضوع"
@@ -2298,21 +2260,21 @@ ar:
       links_title: "روابط مشهورة"
       links_shown: "أظهر روابط أخرى..."
       clicks:
-        zero: "لا نقرات"
-        one: "نقرة واحدة"
-        two: "نقرتان"
-        few: "%{count} نقرات"
-        many: "%{count} نقرة"
-        other: "%{count} نقرة"
+        few: '%{count} نقرات'
+        many: '%{count} نقرة'
+        one: نقرة واحدة
+        other: '%{count} نقرة'
+        two: نقرتان
+        zero: لا نقرات
     post_links:
       about: "وسّع المزيد من الروابط في هذه المشاركة"
       title:
-        zero: "لا شيء آخر"
-        one: "واحدة أخرى"
-        two: "إثنتان أخريتان"
-        few: "%{count} أخرى"
-        many: "%{count} أخرى"
-        other: "%{count} أكثر"
+        few: '%{count} أخرى'
+        many: '%{count} أخرى'
+        one: واحدة أخرى
+        other: '%{count} أكثر'
+        two: إثنتان أخريتان
+        zero: لا شيء آخر
     topic_statuses:
       warning:
         help: "هذا تحذير رسمي."
@@ -2346,38 +2308,38 @@ ar:
     original_post: "المنشور الاصلي"
     views: "المشاهدات"
     views_lowercase:
-      zero: "المشاهدات"
-      one: "المشاهدات"
-      two: "المشاهدات"
-      few: "المشاهدات"
-      many: "المشاهدات"
-      other: "المشاهدات"
+      few: المشاهدات
+      many: المشاهدات
+      one: المشاهدات
+      other: المشاهدات
+      two: المشاهدات
+      zero: المشاهدات
     replies: "الردود"
     views_long:
-      zero: "تم مشاهدة هذا الموضوع {{number}} مرة"
-      one: "تم مشاهدة هذا الموضوع مرة واحدة"
-      two: "تم مشاهدة هذا الموضوع {{number}} مرة"
-      few: "تم مشاهدة هذا الموضوع {{number}} مرة"
-      many: "تم مشاهدة هذا الموضوع {{number}} مرة"
-      other: "تم مشاهدة هذا الموضوع {{number}} مرة"
+      few: تم مشاهدة هذا الموضوع {{number}} مرة
+      many: تم مشاهدة هذا الموضوع {{number}} مرة
+      one: تم مشاهدة هذا الموضوع مرة واحدة
+      other: تم مشاهدة هذا الموضوع {{number}} مرة
+      two: تم مشاهدة هذا الموضوع {{number}} مرة
+      zero: تم مشاهدة هذا الموضوع {{number}} مرة
     activity: "النشاط"
     likes: "اعجابات"
     likes_lowercase:
-      zero: "اﻹعجابات"
-      one: "اﻹعجابات"
-      two: "اﻹعجابات"
-      few: "اﻹعجابات"
-      many: "اﻹعجابات"
-      other: "اﻹعجابات"
+      few: اﻹعجابات
+      many: اﻹعجابات
+      one: اﻹعجابات
+      other: اﻹعجابات
+      two: اﻹعجابات
+      zero: اﻹعجابات
     likes_long: "هناك {{number}} اعجابات في هذا الموضوع"
     users: "الأعضاء"
     users_lowercase:
-      zero: "عضو"
-      one: "عضو واحد"
-      two: "عضوين"
-      few: "الأعضاء"
-      many: "الأعضاء"
-      other: "الأعضاء"
+      few: الأعضاء
+      many: الأعضاء
+      one: عضو واحد
+      other: الأعضاء
+      two: عضوين
+      zero: عضو
     category_title: "قسم"
     history: "تاريخ"
     changed_by: "الكاتب {{author}}"
@@ -2391,12 +2353,12 @@ ar:
       latest:
         title: "الأخيرة"
         title_with_count:
-          zero: "الأخيرة ({{count}})"
-          one: "الأخيرة ({{count}})"
-          two: "الأخيرة ({{count}})"
-          few: "الأخيرة ({{count}})"
-          many: "الأخيرة ({{count}})"
-          other: "الأخيرة ({{count}})"
+          few: الأخيرة ({{count}})
+          many: الأخيرة ({{count}})
+          one: الأخيرة ({{count}})
+          other: الأخيرة ({{count}})
+          two: الأخيرة ({{count}})
+          zero: الأخيرة ({{count}})
         help: "الموضوعات التي بها منشورات حديثة"
       hot:
         title: "نَشط"
@@ -2414,37 +2376,37 @@ ar:
       unread:
         title: "غير المقروءة"
         title_with_count:
-          zero: "غير المقروءة ({{count}})"
-          one: "غير المقروءة ({{count}})"
-          two: "غير المقروءة ({{count}})"
-          few: "غير المقروءة ({{count}})"
-          many: "غير المقروءة ({{count}})"
-          other: "غير المقروءة ({{count}})"
+          few: غير المقروءة ({{count}})
+          many: غير المقروءة ({{count}})
+          one: غير المقروءة ({{count}})
+          other: غير المقروءة ({{count}})
+          two: غير المقروءة ({{count}})
+          zero: غير المقروءة ({{count}})
         help: "الموضوعات التي تتابعها (أو تراقبها) والتي فيها منشورات غير مقروءة"
         lower_title_with_count:
-          zero: "1 غير مقررء "
-          one: "1 غير مقروء"
-          two: "{{count}} غير مقروء "
-          few: "{{count}} غير مقروء "
-          many: "{{count}} غير مقروء"
-          other: "{{count}} غير مقروء"
+          few: '{{count}} غير مقروء '
+          many: '{{count}} غير مقروء'
+          one: 1 غير مقروء
+          other: '{{count}} غير مقروء'
+          two: '{{count}} غير مقروء '
+          zero: '1 غير مقررء '
       new:
         lower_title_with_count:
-          zero: "لا جديد"
-          one: "1 جديد"
-          two: "{{count}} جديد"
-          few: "{{count}} جديد"
-          many: "{{count}} جديد"
-          other: "{{count}} جديدة"
+          few: '{{count}} جديد'
+          many: '{{count}} جديد'
+          one: 1 جديد
+          other: '{{count}} جديدة'
+          two: '{{count}} جديد'
+          zero: لا جديد
         lower_title: "الجديدة"
         title: "الجديدة"
         title_with_count:
-          zero: "الجديدة ({{count}})"
-          one: "الجديدة ({{count}})"
-          two: "الجديدة ({{count}})"
-          few: "الجديدة ({{count}})"
-          many: "الجديدة ({{count}})"
-          other: "الجديدة ({{count}})"
+          few: الجديدة ({{count}})
+          many: الجديدة ({{count}})
+          one: الجديدة ({{count}})
+          other: الجديدة ({{count}})
+          two: الجديدة ({{count}})
+          zero: الجديدة ({{count}})
         help: "المواضيع المنشأة في الأيّام القليلة الماضية"
       posted:
         title: "منشوراتي"
@@ -2455,12 +2417,12 @@ ar:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          zero: "{{categoryName}} ({{count}})"
-          one: "{{categoryName}} ({{count}})"
-          two: "{{categoryName}} ({{count}})"
-          few: "{{categoryName}} ({{count}})"
-          many: "{{categoryName}} ({{count}})"
-          other: "{{categoryName}} ({{count}})"
+          few: '{{categoryName}} ({{count}})'
+          many: '{{categoryName}} ({{count}})'
+          one: '{{categoryName}} ({{count}})'
+          other: '{{categoryName}} ({{count}})'
+          two: '{{categoryName}} ({{count}})'
+          zero: '{{categoryName}} ({{count}})'
         help: "آخر الموضوعات في قسم {{categoryName}}"
       top:
         title: "الأكثر مُشاهدة"
@@ -2544,40 +2506,39 @@ ar:
         print: '<b>ctrl</b>+<b>p</b> طباعة الموضوع'
     badges:
       earned_n_times:
-        zero: "لم تمنح هذه الشارة ابدا"
-        one: "مُنحت هذة الشارة مرة واحدة"
-        two: "مُنحت هذة الشارة مرتان"
-        few: "مُنحت هذه الشارة %{count} مرة"
-        many: "مُنحت هذه الشارة %{count} مرة"
-        other: "مُنحت هذه الشارة %{count} مرة"
+        few: مُنحت هذه الشارة %{count} مرة
+        many: مُنحت هذه الشارة %{count} مرة
+        one: مُنحت هذة الشارة مرة واحدة
+        other: مُنحت هذه الشارة %{count} مرة
+        two: مُنحت هذة الشارة مرتان
+        zero: لم تمنح هذه الشارة ابدا
       granted_on: "ممنوح منذ %{date}"
       others_count: "عدد من حصل علي نفس الشارة (%{count})"
       title: الشارات
       allow_title: "يمكنك استخدام هذة الشارة كلقب"
       multiple_grant: "يُمكن ان تُمنح هذة الشارة اكثر من مرة"
       badge_count:
-        zero: "لا شارات"
-        one: "شارة واحدة"
-        two: "شارتان"
-        few: "%{count} شارة"
-        many: "%{count} شارة"
-        other: "%{count} شارة"
+        few: '%{count} شارة'
+        many: '%{count} شارة'
+        one: شارة واحدة
+        other: '%{count} شارة'
+        two: شارتان
+        zero: لا شارات
       more_badges:
-        zero: "بدون شارات"
-        one: "شارة واحدة اكثر"
-        two: "شارتان اكثر"
-        few: "+%{count} اكثر"
-        many: "+%{count} اكثر"
-        other: "+%{count} اكثر"
+        few: +%{count} اكثر
+        many: +%{count} اكثر
+        one: شارة واحدة اكثر
+        other: +%{count} اكثر
+        two: شارتان اكثر
+        zero: بدون شارات
       granted:
-        zero: "لا يوجد ممنوحين"
-        one: "ممنوح واحد"
-        two: "%{count} ممنوح"
-        few: "%{count} ممنوح."
-        many: "%{count} ممنوح."
-        other: "%{count} ممنوح."
+        few: '%{count} ممنوح.'
+        many: '%{count} ممنوح.'
+        one: ممنوح واحد
+        other: '%{count} ممنوح.'
+        two: '%{count} ممنوح'
+        zero: لا يوجد ممنوحين
       select_badge_for_title: اختر شارة لتستخدمها كلقب لك.
-      none: "لا شئ"
       badge_grouping:
         getting_started:
           name: الاساسية
@@ -2606,12 +2567,12 @@ ar:
       tags: "الأوسمة"
       delete_tag: "احذف الوسم"
       delete_confirm:
-        zero: "هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من {{count}} موضوع؟"
-        one: "هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من موضوع واحد؟"
-        two: "هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من {{count}} موضوع؟"
-        few: "هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من {{count}} موضوع؟"
-        many: "هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من {{count}} موضوع؟"
-        other: "هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من {{count}} موضوع؟"
+        few: هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من {{count}} موضوع؟
+        many: هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من {{count}} موضوع؟
+        one: هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من موضوع واحد؟
+        other: هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من {{count}} موضوع؟
+        two: هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من {{count}} موضوع؟
+        zero: هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من {{count}} موضوع؟
       delete_confirm_no_topics: "هل أنت متاكد انك تريد حذف هذا الوسم؟"
       rename_tag: "أعد تسمية الوسم"
       rename_instructions: "اختر اسما جديدا للوسم:"
@@ -2628,19 +2589,15 @@ ar:
       notifications:
         watching:
           title: "مُراقب"
-          description: "ستتابع بشكل تلقائي جديد هذه الأقسام. سيتم إشعارك بكل منشور او موضوع، بالإضافة لذلك سيتم عرض عدد  المنشورات الغير مقروءة و الجديدة بجانب الموضوع."
         watching_first_post:
           title: "يُراقب فيه أول مشاركة"
-          description: "ستستقبل إشعارًا لأوّل مشاركة في كلّ موضوع في هذا الوسم."
         tracking:
           title: "مُتابع"
-          description: "ستتابع آليا كل مواضيع هذا الوسم. سيظهر عدّاد للمشاركات غير المقروءة والجديدة بجانب الموضوع."
         regular:
           title: "موضوع عادي"
           description: "ستستقبل إشعارًا إن أشار أحد إلى @اسمك أو ردّ على مشاركتك."
         muted:
           title: "مكتوم"
-          description: "لن تستقبل أيّ إشعار لأيّ موضوع جديد في هذا الوسم، ولن تظهر هذه المواضيع في لسان المواضيع غير المقروءة."
       groups:
         title: "مجموعات الأوسمة"
         about: "ضع الأوسمة في مجموعات ليسهل عليك إدارتها."
@@ -2722,8 +2679,6 @@ ar:
         reports:
           today: "اليوم"
           yesterday: "امس"
-          last_7_days: "اخر ٧ ايام "
-          last_30_days: "اخر ٣٠ يوم"
           all_time: "كل الوقت"
           7_days_ago: "منذ ٧ ايام"
           30_days_ago: "منذ ٣٠ يوم"
@@ -2744,7 +2699,6 @@ ar:
         topics: "الموشوعات المبلغ عنها "
         agree: "أوافق"
         agree_title: "أكد هذا البلاغ كونه صحيح وصالح"
-        defer_flag_title: "ازل هذا البلاغ، لا يتطلب منك إجراء في الوقت الحالي."
         delete: "احذف"
         delete_title: "احذف المنشور المرتبط بهذا البلاغ"
         delete_post_defer_flag_title: "احذف المنشور. اذا كان المنشور الاول, احذف الموضوع"
@@ -2790,13 +2744,20 @@ ar:
           notify_user: "مخصص"
           notify_moderators: "مخصص"
       groups:
+        new:
+          name:
+            available: "اسم المجموعة متاح"
+            not_available: "اسم المجموعة غير متاح"
+            blank: "يجب تحديد اسم للمجموعة"
+        bulk_add:
+          title: "أضافة متعددة للمجموعة"
+          complete_users_not_added: "هؤلاء الأعضاء لن يتم اضافتهم (تأكد من أن لديهم حسابات)"
+        name_placeholder: "اسم المجموعة، بدون مسافات، كما هو الحال مع أسماء المستخدمين"
         primary: "المجموعة الأساسية"
         no_primary: "(لا يوجد مجموعة أساسية)"
         title: "مجموعات"
         edit: "تعديل المجموعة"
         refresh: "تحديث"
-        new: "جديد"
-        selector_placeholder: "أدخل اسم المستخدم"
         about: "عدل عضوية المجموعة وأسماءها هنا"
         group_members: "أعضاء المجموعة"
         delete: "احذف"
@@ -2804,22 +2765,10 @@ ar:
         delete_failed: "تعذّر حذف المجموعة. إن كانت مجموعة آليّة، فلا يمكن تدميرها."
         delete_owner_confirm: "هل تريد إزالة صلاحيات الإدارة من '%{username} ؟"
         add: "اضافة"
-        add_members: "اضافة اعضاء"
         custom: "مخصص"
-        bulk_complete: "تمت إضافة الاعضاء إلى المجموعة."
-        bulk_complete_users_not_added: "هؤلاء الاعضاء لم يتم اضافتهم (تأكد انهم يملكون حساب)"
-        bulk: "إضافة متعددة إلى المجموعة"
-        bulk_paste: "الصق قائمة بأسماء الاعضاء أو عناوين البريد الإلكتروني، واحد لكل سطر:"
-        bulk_select: "(اختر مجموعة)"
         automatic: "تلقائي"
-        automatic_membership_email_domains: "المستخدمين الذين يمتلكون بريد الالكتروني عنوانه مطابق للعنوان الذي في القائمة سيتم تلقائيا اضافتهم للمجموعة."
-        automatic_membership_retroactive: "تطبيق نفس قاعدة عنوان البريد الإلكتروني لإضافة الاعضاء المسجلين الحاليين"
-        default_title: "العنوان الافتراضي لكل أعضاء هذه المجموعة"
-        primary_group: "تعيين تلقائيا كمجموعة أساسية"
         group_owners: الملّاك
         add_owners: اضف ملّاكً
-        incoming_email: "تعيين بريد إلكتروني خاص:"
-        incoming_email_placeholder: "يرجى إدخال بريد الكتروني فعّال."
         none_selected: "اختر مجموعة للبدء"
         no_custom_groups: "انشئ مجموعة جديدة مخصصة"
       api:
@@ -2873,12 +2822,12 @@ ar:
         events:
           none: "لا يوجد أحداث مماثلة"
           incoming:
-            zero: "لا أحداث جديدة."
-            one: "هناك حدث واحد جديد."
-            two: "هناك حدثان جديدان."
-            few: "هناك {{count}} أحداث جديدة."
-            many: "هناك {{count}} حدثًا جديدًا."
-            other: "هناك {{count}} حدث جديد."
+            few: هناك {{count}} أحداث جديدة.
+            many: هناك {{count}} حدثًا جديدًا.
+            one: هناك حدث واحد جديد.
+            other: هناك {{count}} حدث جديد.
+            two: هناك حدثان جديدان.
+            zero: لا أحداث جديدة.
           request: "طلب"
           response: "الرد"
           headers: "الرؤوس"
@@ -2926,7 +2875,6 @@ ar:
           label: "رفع"
           title: "رفع نسخة احتياطية لهذه الحالة."
           uploading: "يرفع..."
-          success: "تم رفع '{{filename}}' بنجاح."
           error: "حصلت مشكلة أثناء رفع '{{filename}}': {{message}}"
         operations:
           is_running: "هناك عمليّة تجري حاليًّا..."
@@ -2939,7 +2887,6 @@ ar:
             label: "أجرِ نسخ احتياطي"
             title: "أنشئ نسخة احتياطية"
             confirm: "أتريد إجراء نسخة احتياطية جديدة؟"
-            without_uploads: "نعم (لا تضمن الملفات)"
           download:
             label: "حمل"
             title: "أرسل بريدًا إلكترونيا فيه رابط التحميل"
@@ -3308,19 +3255,19 @@ ar:
           suspect: 'المريبون'
         approved: "موافقة؟"
         approved_selected:
-          zero: "وافق المستخدم"
-          one: "وافق المستخدم"
-          two: " وافق المستخدمين ({{count}})"
-          few: " وافق المستخدمين ({{count}})"
-          many: " وافق المستخدمين ({{count}})"
-          other: " وافق المستخدمين ({{count}})"
+          few: ' وافق المستخدمين ({{count}})'
+          many: ' وافق المستخدمين ({{count}})'
+          one: وافق المستخدم
+          other: ' وافق المستخدمين ({{count}})'
+          two: ' وافق المستخدمين ({{count}})'
+          zero: وافق المستخدم
         reject_selected:
-          zero: "رفض المستخدمين"
-          one: "رفض المستخدم"
-          two: "رفض المستخدمين ({{count}})"
-          few: "رفض المستخدمين ({{count}})"
-          many: "رفض المستخدمين ({{count}})"
-          other: "رفض المستخدمين ({{count}})"
+          few: رفض المستخدمين ({{count}})
+          many: رفض المستخدمين ({{count}})
+          one: رفض المستخدم
+          other: رفض المستخدمين ({{count}})
+          two: رفض المستخدمين ({{count}})
+          zero: رفض المستخدمين
         titles:
           active: 'الأعضاء النشطون'
           new: 'الأعضاء الجدد'
@@ -3336,19 +3283,19 @@ ar:
           suspended: 'أعضاء موقوفين'
           suspect: 'الأعضاء المريبون'
         reject_successful:
-          zero: "رفض بنجاح 1 عضو"
-          one: "رفض بنجاح 1 عضو"
-          two: "رفض بنجاح %{count} عضو."
-          few: "رفض بنجاح %{count} عضو."
-          many: "رفض بنجاح %{count} عضو."
-          other: "رفض بنجاح %{count} عضو."
+          few: رفض بنجاح %{count} عضو.
+          many: رفض بنجاح %{count} عضو.
+          one: رفض بنجاح 1 عضو
+          other: رفض بنجاح %{count} عضو.
+          two: رفض بنجاح %{count} عضو.
+          zero: رفض بنجاح 1 عضو
         reject_failures:
-          zero: "فشل لرفض 1 عضو."
-          one: "فشل لرفض 1 عضو."
-          two: "فشل لرفض %{count} عضو."
-          few: "فشل لرفض %{count} عضو."
-          many: "فشل لرفض %{count} عضو."
-          other: "فشل لرفض %{count} عضو."
+          few: فشل لرفض %{count} عضو.
+          many: فشل لرفض %{count} عضو.
+          one: فشل لرفض 1 عضو.
+          other: فشل لرفض %{count} عضو.
+          two: فشل لرفض %{count} عضو.
+          zero: فشل لرفض 1 عضو.
         not_verified: "لم يتم التحقق"
         check_email:
           title: "اكشف عنوان البريد الإلكتروني لهذا العضو"
@@ -3416,26 +3363,38 @@ ar:
         delete_forbidden_because_staff: "لا يمكن حذف المدراء والمشرفين."
         delete_posts_forbidden_because_staff: "لا يمكن حذف جميع المشاركات للمدراء والمشرفين.  "
         delete_forbidden:
-          zero: "لا يمكن حذف مَن لديه مشاركات. احذف كل المشاركات أولا قبل حذف المستخدم. (المشاركات الآن لا يمكن حذفها.)"
-          one: "لا يمكن حذف مَن لديه مشاركات. احذف كل المشاركات أولا قبل حذف المستخدم. (المشاركات الأقدم من يوم واحد لا يمكن حذفها.)"
-          two: "لا يمكن حذف مَن لديه مشاركات. احذف كل المشاركات أولا قبل حذف المستخدم. (المشاركات الأقدم من يومين لا يمكن حذفها.)"
-          few: "لا يمكن حذف مَن لديه مشاركات. احذف كل المشاركات أولا قبل حذف المستخدم. (المشاركات الأقدم من %{count} أيام لا يمكن حذفها.)"
-          many: "لا يمكن حذف مَن لديه مشاركات. احذف كل المشاركات أولا قبل حذف المستخدم. (المشاركات الأقدم من %{count} يوما لا يمكن حذفها.)"
-          other: "لا يمكن حذف مَن لديه مشاركات. احذف كل المشاركات أولا قبل حذف المستخدم. (المشاركات الأقدم من %{count} يوم لا يمكن حذفها.)"
+          few: لا يمكن حذف مَن لديه مشاركات. احذف كل المشاركات أولا قبل حذف المستخدم. (المشاركات الأقدم من %{count} أيام لا يمكن حذفها.)
+          many: لا يمكن حذف مَن لديه مشاركات. احذف كل المشاركات أولا قبل حذف المستخدم. (المشاركات الأقدم من %{count} يوما لا يمكن حذفها.)
+          one: لا يمكن حذف مَن لديه مشاركات. احذف كل المشاركات أولا قبل حذف المستخدم. (المشاركات الأقدم من يوم واحد لا يمكن حذفها.)
+          other: لا يمكن حذف مَن لديه مشاركات. احذف كل المشاركات أولا قبل حذف المستخدم. (المشاركات الأقدم من %{count} يوم لا يمكن حذفها.)
+          two: لا يمكن حذف مَن لديه مشاركات. احذف كل المشاركات أولا قبل حذف المستخدم. (المشاركات الأقدم من يومين لا يمكن حذفها.)
+          zero: لا يمكن حذف مَن لديه مشاركات. احذف كل المشاركات أولا قبل حذف المستخدم. (المشاركات الآن لا يمكن حذفها.)
         cant_delete_all_posts:
-          zero: "لا تستطيع حذف جميع المشاركات. (The delete_user_max_post_age setting.)"
-          one: "لا تستطيع حذف جميع المشاركات. بعض المشاركات أقدم من يوم. (The delete_user_max_post_age setting.)"
-          two: "لا تستطيع حذف جميع المشاركات. بعض المشاركات أقدم من يومين. (The delete_user_max_post_age setting.)"
-          few: "لا تستطيع حذف جميع المشاركات. بعض المشاركات أقدم من أيام قليلة. (The delete_user_max_post_age setting.)"
-          many: "لا تستطيع حذف جميع المشاركات. بعض المشاركات أقدم من أيام %{count}. (The delete_user_max_post_age setting.)"
-          other: "لا تستطيع حذف جميع المشاركات. بعض المشاركات أقدم من %{count} أيام. (The delete_user_max_post_age setting.)"
+          few: لا تستطيع حذف جميع المشاركات. بعض المشاركات أقدم من أيام قليلة. (The delete_user_max_post_age setting.)
+          many: لا تستطيع حذف جميع المشاركات. بعض المشاركات أقدم من أيام %{count}. (The delete_user_max_post_age setting.)
+          one: لا تستطيع حذف جميع المشاركات. بعض المشاركات أقدم من يوم. (The delete_user_max_post_age setting.)
+          other: لا تستطيع حذف جميع المشاركات. بعض المشاركات أقدم من %{count} أيام. (The delete_user_max_post_age setting.)
+          two: لا تستطيع حذف جميع المشاركات. بعض المشاركات أقدم من يومين. (The delete_user_max_post_age setting.)
+          zero: لا تستطيع حذف جميع المشاركات. (The delete_user_max_post_age setting.)
         cant_delete_all_too_many_posts:
-          zero: "لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركة.\n(delete_all_posts_max)"
-          one: "لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركة.\n(delete_all_posts_max)"
-          two: "لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركتين.\n(delete_all_posts_max)"
-          few: "لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركات.\n(delete_all_posts_max)"
-          many: "لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركة.\n(delete_all_posts_max)"
-          other: "لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركة.\n(delete_all_posts_max)"
+          few: 'لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركات.
+
+            (delete_all_posts_max)'
+          many: 'لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركة.
+
+            (delete_all_posts_max)'
+          one: 'لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركة.
+
+            (delete_all_posts_max)'
+          other: 'لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركة.
+
+            (delete_all_posts_max)'
+          two: 'لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركتين.
+
+            (delete_all_posts_max)'
+          zero: 'لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركة.
+
+            (delete_all_posts_max)'
         delete_confirm: "أمتأكّد من حذف هذا المستخدم؟ لا عودة في هذا!"
         delete_and_block: "احذفه و<b>امنع</b> بريده وعنوان IP"
         delete_dont_block: "فقط احذفه"
@@ -3543,10 +3502,7 @@ ar:
         recommended: "نوصيك بتخصيص النص التالي ليلائم احتياجاتك:"
         show_overriden: 'اظهر التجاوزات فقط'
       site_settings:
-        show_overriden: 'اظهر فقط الاعدادات المعدلة'
         title: 'الإعدادات'
-        reset: 'إعادة تعيين'
-        none: 'لا شيء'
         no_results: "لا نتائج."
         clear_filter: "مسح"
         add_url: "اضافة رابط"
@@ -3568,6 +3524,7 @@ ar:
           developer: 'المطورون'
           embedding: "تضمين"
           legal: "الأمور القانونية"
+          api: 'API'
           user_api: 'API المستخدمين'
           uncategorized: 'أخرى'
           backups: "النُسخ الإحتياطية"
@@ -3580,7 +3537,7 @@ ar:
       badges:
         title: الشارات
         new_badge: شارة جديدة
-        new: 'جديد '
+        new: "جديد "
         name: الإسم
         badge: الشارة
         display_name: إسم العرض
@@ -3590,7 +3547,7 @@ ar:
         badge_grouping: المجموعة
         badge_groupings:
           modal_title: تجميع الشارات
-        granted_by: 'ممنوح بواسطة '
+        granted_by: "ممنوح بواسطة "
         granted_at: ممنوح في
         reason_help: ( رابط إلى منشور أو موضوع )
         save: حفظ
@@ -3608,12 +3565,11 @@ ar:
         no_badges: لا يوجد أي شارة يمكن منحها.
         none_selected: "حدد شارة للبدء"
         allow_title: اسمح للشارة أن تستخدم كلقب.
-        multiple_grant: 'يمكن منحها عدة مرات. '
+        multiple_grant: "يمكن منحها عدة مرات. "
         listable: اظهار الشارة في صفحة الشارات العامة
         enabled: تفعيل الشارة
         icon: أيقونة
         image: صورة
-        icon_help: "استخدم اسم ايقونة منFont Awesome أو عنوانًا URL إلى صورة"
         query: إستعلام عن شارة (SQL)
         target_posts: إستعلام عن المنشورات
         auto_revoke: إلغاء الاستعلام اليومي
@@ -3637,18 +3593,18 @@ ar:
             text: "هناك عينات ممنوحة ضائعة. حدث هذا عندما أعادت شارة الإستعلام user IDs أو post IDs التي لم تكن موجودة. هذا ربما بسبب نتيجة غير متوقعة في وقت لاحق - رجائا أنقر مرتين للتأكد من إستعلامك-"
           no_grant_count: "لا توجد اوسمه لتمنح "
           grant_count:
-            zero: "<b>%{count}</b> وساما لتمنح ."
-            one: "وسام واحد ليتم منحه ."
-            two: "وسامين ليتم منحهما ."
-            few: "<b>%{count}</b> أوسمة لتمنح ."
-            many: "<b>%{count}</b> وساما لتمنح ."
-            other: "<b>%{count}</b> وساما لتمنح ."
+            few: <b>%{count}</b> أوسمة لتمنح .
+            many: <b>%{count}</b> وساما لتمنح .
+            one: وسام واحد ليتم منحه .
+            other: <b>%{count}</b> وساما لتمنح .
+            two: وسامين ليتم منحهما .
+            zero: <b>%{count}</b> وساما لتمنح .
           sample: "أمثلة:"
           grant:
-            with: <span class="username">%{username}</span>
-            with_post: <span class="username">%{أسم المستخدم}</span> لهذه المشاركة %{link}
-            with_post_time: <span class="username">%{أسم المستخدم}</span> لهذه المشاركة %{link} at <span class="time">%{time}</span>
-            with_time: <span class="username">%{أسم المستخدم}</span> في <span class="time">%{time}</span>
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{أسم المستخدم}</span> لهذه المشاركة %{link}"
+            with_post_time: "<span class=\"username\">%{أسم المستخدم}</span> لهذه المشاركة %{link} at <span class=\"time\">%{time}</span>"
+            with_time: "<span class=\"username\">%{أسم المستخدم}</span> في <span class=\"time\">%{time}</span>"
       emoji:
         title: "الوجه التعبيري"
         help: "أضف رموز تعبيرية جديدة التي سوف تكون متاحة للكل . (PROTIP: drag & drop multiple files at once)"
diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml
new file mode 100644
index 00000000000..4b98759095c
--- /dev/null
+++ b/config/locales/client.bg.yml
@@ -0,0 +1,2730 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+bg:
+  js:
+    number:
+      format:
+        separator: "."
+        delimiter: ", "
+      human:
+        storage_units:
+          format: '%n %u'
+          units:
+            byte:
+              one: Байт
+              other: Байта
+            gb: ГБ
+            kb: КБ
+            mb: МБ
+            tb: ТБ
+      short:
+        thousands: "{{number}}k "
+        millions: "{{number}}M "
+    dates:
+      time: "h:mm a"
+      timeline_date: "MMM YYYY"
+      long_no_year: "D MMM h:mm a"
+      long_no_year_no_time: "D MMM"
+      full_no_year_no_time: "Do MMMM"
+      long_with_year: "MMM D, YYYY h:mm a"
+      long_with_year_no_time: "MMM D, YYYY"
+      full_with_year_no_time: "MMMM Do, YYYY "
+      long_date_with_year: "MMM D, 'YY LT"
+      long_date_without_year: "MMM D, LT"
+      long_date_with_year_without_time: "MMM D, 'YY"
+      long_date_without_year_with_linebreak: "MMM D <br/>LT"
+      long_date_with_year_with_linebreak: "MMM D, 'YY <br/>LT"
+      wrap_ago: "преди %{date}"
+      tiny:
+        half_a_minute: "< 1 мин."
+        less_than_x_seconds:
+          one: < 1сек
+          other: < %{count}сек
+        x_seconds:
+          one: 1сек
+          other: '%{count}сек'
+        x_minutes:
+          one: 1мин
+          other: '%{count}мин'
+        about_x_hours:
+          one: 1ч
+          other: '%{count}ч'
+        x_days:
+          one: 1д
+          other: '%{count}д'
+        about_x_years:
+          one: 1г
+          other: '%{count}г'
+        over_x_years:
+          one: '> 1г'
+          other: '> %{count}г'
+        almost_x_years:
+          one: 1г
+          other: '%{count}г'
+        date_month: "MMM D"
+        date_year: "MMM 'YY"
+      medium:
+        x_minutes:
+          one: 1 минута
+          other: '%{count} минути'
+        x_hours:
+          one: 1 час
+          other: '%{count} часа'
+        x_days:
+          one: 1 ден
+          other: '%{count} дни'
+        date_year: "MMM D, 'YY"
+      medium_with_ago:
+        x_minutes:
+          one: преди 1 минута
+          other: преди %{count}  минути
+        x_hours:
+          one: преди 1 час
+          other: преди %{count} часа
+        x_days:
+          one: преди 1 ден
+          other: преди %{count} дни
+      later:
+        x_days:
+          one: 1 ден по-късно
+          other: '%{count} дни по-късно'
+        x_months:
+          one: 1 месец по-късно
+          other: '%{count} месеца по-късно'
+        x_years:
+          one: 1 година по-късно
+          other: '%{count} години по-късно'
+      previous_month: 'Предишен месец'
+      next_month: 'Следващ месец'
+      placeholder: дата
+    share:
+      topic: 'споделете връзка към тази тема'
+      post: 'публикации #%{postNumber}'
+      close: 'затвори'
+      twitter: 'споделете тази връзка в Twitter'
+      facebook: 'споделете тази връзка във Facebook'
+      google+: 'споделете тази връзка в Google+'
+      email: 'изпратете тази връзка с имейл'
+    action_codes:
+      public_topic: "направи тази тема публична на %{when}"
+      private_topic: "направи тази тема персонално съобщение%{when}"
+      split_topic: "раздели тази тема %{when}"
+      invited_user: "покани %{who} %{when}"
+      invited_group: "покани %{who} на %{when}"
+      user_left: "%{who}напусна чата %{when}"
+      removed_user: "изтри %{who} %{when}"
+      removed_group: "изтри %{who} на %{when}"
+      autoclosed:
+        enabled: 'затворена %{when}'
+        disabled: 'отворена %{when}'
+      closed:
+        enabled: 'затворена %{when}'
+        disabled: 'отворена %{when}'
+      archived:
+        enabled: 'архивирана %{when}'
+        disabled: 'разархивирана %{when}'
+      pinned:
+        enabled: 'закована  %{when}'
+        disabled: 'откована  %{when}'
+      pinned_globally:
+        enabled: 'закована глобално  %{when}'
+        disabled: 'откована  %{when}'
+      visible:
+        enabled: 'добавена в списъка  %{when}'
+        disabled: 'премахната от списъка  %{when}'
+    topic_admin_menu: "администриране на темата"
+    emails_are_disabled: "Всички изходящи имейли са изцяло забранени от администратора. Няма да бъдат изпращани никакви имейл известия."
+    bootstrap_mode_enabled: "За да помогнем със стартирането на вашия нов сайт по-лесно поставихме сайта в  \"стартиращо режим\". Всички нови потребители ще получат ниво на доверие 1 и ще имат активирани дневни известия за активноста във форума. Този режим ще бъде автоматично спрян когато бройката регистрирани потребители стигне %{min_users} ."
+    themes:
+      default_description: "По подразбиране"
+    s3:
+      regions:
+        ap_northeast_1: "Азия (Токио)"
+        ap_northeast_2: "Азия (Сеул)"
+        ap_south_1: "Азия (Мумбай)"
+        ap_southeast_1: "Азия (Сингапур)"
+        ap_southeast_2: "Океания (Сидни)"
+        cn_north_1: "Китай (Пекин)"
+        eu_central_1: "EU (Франкфурт)"
+        eu_west_1: "EU (Ирландия)"
+        sa_east_1: "Южна Америка (Сао Паоло)"
+        us_east_1: "US East (Из. Вирджиния)"
+        us_gov_west_1: "AWS GovCloud (САЩ)"
+        us_west_1: "US West (С. Калифорния)"
+        us_west_2: "US West (Орегон)"
+    edit: 'редактирайте заглавието и категорията на тази тема'
+    not_implemented: "Тази функционалност все още не е добавена."
+    no_value: "Не"
+    yes_value: "Да"
+    submit: "Изпрати"
+    generic_error: "Съжаляваме, възникна грешка."
+    generic_error_with_reason: "Грешка: %{error}"
+    sign_up: "Регистрация"
+    log_in: "Вход"
+    age: "Години"
+    joined: "Присъединен"
+    admin_title: "Админ"
+    flags_title: "Сигнали"
+    show_more: "покажи повече"
+    show_help: "опции"
+    links: "Връзки"
+    links_lowercase:
+      one: Линк
+      other: Линкове
+    faq: "FAQ"
+    guidelines: "Насоки"
+    privacy_policy: "Декларация за поверителност"
+    privacy: "Поверителност"
+    terms_of_service: "Правила за ползване"
+    mobile_view: "Мобилен изглед"
+    desktop_view: "Десктоп изглед"
+    you: "Вие"
+    or: "или"
+    now: "преди малко"
+    read_more: 'прочетете повече'
+    more: "Повече"
+    less: "По-малко"
+    never: "никога"
+    every_30_minutes: "на всеки 30 минути"
+    every_hour: "на всеки час"
+    daily: "ежедневно"
+    weekly: "седмично"
+    every_two_weeks: "на всеки две седмици"
+    every_three_days: "На всеки три дни"
+    max_of_count: "максимално от {{count}}"
+    alternation: "или"
+    character_count:
+      one: '{{count}} символ'
+      other: '{{count}} символа'
+    suggested_topics:
+      title: "Подобни теми"
+      pm_title: "Предложени съобщения"
+    about:
+      simple_title: "Относно"
+      title: "За %{title}"
+      stats: "Статистика на сайта"
+      our_admins: "Нашите админи"
+      our_moderators: "Нашите модератори"
+      stat:
+        all_time: "От началото"
+      like_count: "Харесвания"
+      topic_count: "Теми"
+      post_count: "Публикации"
+      user_count: "Потребители"
+      active_user_count: "Активни потребители"
+      contact: "Свържете се с нас"
+      contact_info: "В случай на критичен или спешен въпрос засягащ този сайт, моля свържете се с нас на адрес %{contact_email}."
+    bookmarked:
+      title: "Отметка"
+      clear_bookmarks: "Изчисти отметките"
+      help:
+        bookmark: "Щракнете за да добавите в отметки първата публикация в тази тема"
+        unbookmark: "Щракнете тук за да изтриите всички отметки в тази тема"
+    bookmarks:
+      not_logged_in: "съжаляваме, трябва да сте логнат, за да добавяте отметки"
+      created: "Вие добавихте тази публикация в отметки"
+      not_bookmarked: "тази публикация е прочетена, добавете я в отметки"
+      last_read: "това е последната публикация която прочетохте, добавете я в отметки"
+      remove: "Премахнете отметката"
+      confirm_clear: "Сигурен ли сте, че искате да премахните всичките отметки от тази тема ?"
+    preview: "преглед"
+    cancel: "прекрати"
+    save: "Запазете промените"
+    saving: "Запазва се..."
+    saved: "Запазено!"
+    upload: "Качване"
+    uploading: "Качва се..."
+    uploading_filename: "Качва се {{filename}}..."
+    uploaded: "Качено!"
+    enable: "Позволи"
+    disable: "Деактивиране"
+    continue: "Напред"
+    undo: "Отмени"
+    revert: "Върни"
+    failed: "Провалени"
+    switch_to_anon: "Влез в Анонимен режим. "
+    switch_from_anon: "Излез от Анонимен режим."
+    banner:
+      close: "Премахнете банера"
+      edit: "Редактирай този банер >>"
+    choose_topic:
+      none_found: "Няма нови теми."
+      title:
+        search: "Търсене на тема по име, url адрес или id номер:"
+        placeholder: "Въведете заглавието на темата тук"
+    queue:
+      topic: "Тема:"
+      approve: 'Одобри'
+      reject: 'Отхвърли'
+      delete_user: 'Изтрий потребител'
+      title: "Чакащи одобрение"
+      none: "Няма публикации за преглед"
+      edit: "Редактирай"
+      cancel: "Прекрати"
+      view_pending: "Покажи предстоящите публикации"
+      has_pending_posts:
+        one: Тази тема има <b>1</b> публикация чакаща одобрение
+        other: Тази тема има  <b>{{count}}</b> публикации които чакат одобрение
+      confirm: "Запази промените"
+      delete_prompt: "Сигурни ли сте, че искате да изтриете <b>%{username}</b>? Така ще бъдат изтрити всички постове асоциирани с потребителя и ще бъде блокиран email адреса и IP адреса му."
+      approval:
+        title: "Публикацията изисква одобрение"
+        description: "Ние получихме вашата публикация, но тя трябва да бъде одобрена от модератора преди да бъде показана. Моля, проявете търпение."
+        pending_posts:
+          one: Вие имате  <strong>1</strong> чакаща публикация
+          other: Вие имате <strong>{{count}}</strong> чакащи публикации
+        ok: "ОК"
+    user_action:
+      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> публикува <a href='{{topicUrl}}'>тази тема</a>"
+      you_posted_topic: "<a href='{{userUrl}}'>Вие</a> публикувахте <a href='{{topicUrl}}'>тази тема</a>"
+      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> отговори на <a href='{{postUrl}}'>{{post_number}}</a>"
+      you_replied_to_post: "<a href='{{userUrl}}'>Вие</a> отговорихте на <a href='{{postUrl}}'>{{post_number}}</a>"
+      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> отговори в <a href='{{topicUrl}}'>тази тема</a>"
+      you_replied_to_topic: "<a href='{{userUrl}}'>Вие</a> отговорихте в <a href='{{topicUrl}}'>тази тема</a>"
+      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> спомена <a href='{{user2Url}}'>{{another_user}}</a>"
+      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> <a href='{{user2Url}}'>Ви</a> спомена"
+      you_mentioned_user: "<a href='{{user1Url}}'>Вие</a> споменахте <a href='{{user2Url}}'>{{another_user}}</a>"
+      posted_by_user: "Публикувано от <a href='{{userUrl}}'>{{user}}</a>"
+      posted_by_you: "Публикувано от <a href='{{userUrl}}'>вас</a>"
+      sent_by_user: "Изпратено от <a href='{{userUrl}}'>{{user}}</a>"
+      sent_by_you: "Изпратено от <a href='{{userUrl}}'>Вас</a>"
+    directory:
+      filter_name: "филтър по потребитилско име"
+      title: "Потребители"
+      likes_given: "Дадени"
+      likes_received: "Получени"
+      topics_entered: "Видяни"
+      topics_entered_long: "Видяни теми"
+      time_read: "Време за прочитане"
+      topic_count: "Теми"
+      topic_count_long: "Създадени теми"
+      post_count: "Отговори"
+      post_count_long: "Публикувани отговори"
+      no_results: "Няма намерени резултати."
+      days_visited: "Посещения"
+      days_visited_long: "Посетени дни"
+      posts_read: "Прочетени"
+      posts_read_long: "Прочетени публикации"
+      total_rows:
+        one: 1 потребител
+        other: '%{count} потребители'
+    group_histories:
+      actions:
+        change_group_setting: "Промени настройки"
+        add_user_to_group: "Добави потребител"
+        remove_user_from_group: "Премахни потребител"
+        make_user_group_owner: "Превърни в собственик"
+        remove_user_as_group_owner: "Премахни като собственик"
+    groups:
+      add_members:
+        title: "Добавете потребители"
+        usernames: "Потебителско име"
+      manage:
+        title: 'Управление'
+        name: 'Име'
+        full_name: 'Пълно име'
+        add_members: "Добавете потребители"
+        delete_member_confirm: "Премахнете '%{username}'  от група  '%{group}' ?"
+        profile:
+          title: Профил
+        interaction:
+          posting: Публикуване
+          notification: Известие
+        membership:
+          title: Членство
+          access: Достъп
+        logs:
+          title: "Логове"
+          when: "Кога"
+          action: "Действие"
+          from: "От"
+          to: "До"
+      public_admission: "Разрешено е на потребителите да се присъединяват към групата свободно (Изисква се публично видима група)"
+      public_exit: "Разрешено е на потребителите да напуската групата свободно"
+      empty:
+        posts: "Няма публикации от членове на тази група."
+        members: "Няма членове в тази група."
+        mentions: "Няма споменавания на тази група."
+        messages: "Няма съобщения за тази група."
+        topics: "Няма теми от членове на тази група."
+        logs: "Няма журнал за тази група."
+      add: "Добави"
+      join: "Влизане"
+      leave: "Напусни"
+      request: "Заявка"
+      message: "Съобщение"
+      membership: "Членство"
+      name: "Име"
+      user_count: "Потребители"
+      bio: "Относно групата"
+      owner: "собственик"
+      index:
+        title: "Групи"
+        all: "Всички групи"
+        empty: "Няма видими групи."
+        close_groups: "Затворени групи"
+        closed: "Затворена"
+        public: "Публични"
+        private: "Затворени"
+        is_group_owner: "Собественик"
+      activity: "Активност"
+      topics: "Теми"
+      posts: "Публикации"
+      mentions: "Споменавания"
+      messages: "Съобщения"
+      notification_level: "Nиво на уведомяване по подразбиране за груповите съобщения"
+      alias_levels:
+        mentionable: "Кой може да @mention (споменава) тази група?"
+        messageable: "Кой може да изпраща съобщения към тази група?"
+        nobody: "Никой"
+        only_admins: "Само администратори"
+        mods_and_admins: "Само модератори и администратори"
+        members_mods_and_admins: "Само членове, модератори и администратори"
+        everyone: "Всички"
+      notifications:
+        watching:
+          title: "Наблюдава"
+          description: "Вие бъдете уведомени за всеки нов пост във всяко съобщение, както и за броя на новите съобщения."
+        watching_first_post:
+          title: "Следейки за първа публикация"
+          description: "Вие ще бъдете уведомявани само за първата публикация във всяка нова тема в тази група."
+        tracking:
+          title: "Проследяване"
+          description: "Ще бъдете уведомени, ако някой ви спомене чрез @name или ви отговори, както и на броя на новите ви съобщения ще бъдат показани."
+        regular:
+          title: "Нормален"
+          description: "Ще бъдете уведомени, ако някой ви споменава чрез @name или ви отговори."
+        muted:
+          title: "Заглушен"
+          description: "Вие никога няма да бъде уведомен за нито една нова тема в тази група."
+      flair_url: "Добавка към аватара"
+      flair_url_placeholder: "(По желание) Адрес към снимка или Font Awesome клас"
+      flair_bg_color: "Фон на добавка към аватара"
+      flair_bg_color_placeholder: "(По желание) Шестнадесетична стойност на цвят"
+      flair_color: "Цвят на добавка към аватар"
+      flair_color_placeholder: "(По желание) Шестнадесетична стойност на цвят"
+      flair_preview_icon: "Икона за прегледа"
+      flair_preview_image: "Снимка за преглед"
+    user_action_groups:
+      "1": "Дадени харесвания"
+      "2": "Получени харесвания"
+      "3": "Отметки"
+      "4": "Теми"
+      "5": "Отговори"
+      "6": "Отговори"
+      "7": "Споменавания"
+      "9": "Цитати"
+      "11": "Редакции"
+      "12": "Изпратени"
+      "13": "Кутия"
+      "14": "Чакащи"
+    categories:
+      all: "всички категории"
+      all_subcategories: "всички %{categoryName}"
+      no_subcategory: "без подкатегория"
+      category: "Категории"
+      category_list: "Покажи списък с категориите"
+      reorder:
+        title: "Пренареди Категориите"
+        title_long: "Реорганизирай списъка с категориите"
+        fix_order: "Коригирай Позициите"
+        fix_order_tooltip: "Не всички категории имат уникален номер на позицията, което може да доведе до неочаквани резултати."
+        save: "Запази реда"
+        apply_all: "Приложи"
+        position: "Позиция"
+      posts: "Публикации"
+      topics: "Теми"
+      latest: "Последни"
+      latest_by: "последни от"
+      toggle_ordering: "включете контрол на подредбата"
+      subcategories: "Подкатегории"
+      topic_sentence:
+        one: 1 тема
+        other: '%{count} теми'
+      topic_stat_sentence:
+        one: '%{count} нова тема в последните %{unit}.'
+        other: '%{count} нови теми в последните %{unit}.'
+    ip_lookup:
+      title: Търсене по IP адрес
+      hostname: Хост
+      location: Локация
+      location_not_found: (неизвестно)
+      organisation: Организация
+      phone: Телефон
+      other_accounts: "Други профили с този IP адрес:"
+      delete_other_accounts: "Изтрий %{count}"
+      username: "Потребителско име"
+      trust_level: "TL"
+      read_time: "Време за прочитане"
+      topics_entered: "добавени теми"
+      post_count: "# публикации"
+      confirm_delete_other_accounts: "Сигурни ли сте, че искате да изтриете тези профили?"
+    user_fields:
+      none: "(изберете опция)"
+    user:
+      said: "{{username}}:"
+      profile: "Профил"
+      mute: "Заглуши"
+      edit: "Редактирай настройките"
+      download_archive:
+        confirm: "Сигурни ли сте, че искате да свалите своите публикации?"
+        success: "Свалянето е инициирано, ще бъдете уведомени чрез съобщение когато процесът е завършен."
+        rate_limit_error: "Публикации могат да бъдат сваляни веднъж дневно, моля опитайте отново утре."
+      new_private_message: "Ново Съобщение"
+      private_message: "Съобщение"
+      private_messages: "Съобщения"
+      activity_stream: "Активност"
+      preferences: "Настройки"
+      expand_profile: "Разшири"
+      bookmarks: "Отметки"
+      bio: "За мен"
+      invited_by: "Поканен от"
+      trust_level: "Ниво на доверие"
+      notifications: "Известия"
+      statistics: "Статистика"
+      desktop_notifications:
+        label: "Известявания в реално време"
+        not_supported: "Известията не се поддържат от този браузър. Съжаляваме."
+        perm_default: "Включване на Известията"
+        perm_denied_btn: "Разрешението е отказано"
+        perm_denied_expl: "Вие сте забранили известията. Моля разрешете ги чрез настройките на браузъра си."
+        disable: "Деактивиране на Известията"
+        enable: "Активиране на Известията"
+        each_browser_note: "Забележка: Трябва да промените тази настройка при всички браузъри, които използвате."
+        consent_prompt: "Искате ли известявания в реално време, когато хората отговарят на вашите публикации?"
+      dismiss_notifications: "Отмени всички"
+      dismiss_notifications_tooltip: "Маркирайте всички непрочетени известия, като прочетени"
+      first_notification: "Вашето първо известие! Изберете го за да започнете."
+      disable_jump_reply: "Не отивай към моята публикация след като отговоря"
+      dynamic_favicon: "Покажи броя на новите / обновени теми в иконата на брузъра"
+      external_links_in_new_tab: "Отваряй всички външни връзки в нов раздел."
+      enable_quoting: "Включи отговор с цитат при маркиран текст."
+      change: "промени"
+      moderator: "{{user}} е модератор"
+      admin: "{{user}} е админ"
+      moderator_tooltip: "Този потребител е модератор"
+      admin_tooltip: "Този потребител е админ"
+      suspended_notice: "Този потребител е отстранен до {{date}}."
+      suspended_reason: "Причина:"
+      github_profile: "Github"
+      email_activity_summary: "Сумарна активност"
+      mailing_list_mode:
+        label: "Режим Бюлетин"
+        enabled: "Включи режим Бюлетин"
+        individual: "Изпращане на email за всяка нова публикация"
+        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: "Вие няма да бъдете уведомен за нови теми в тези категории, и те няма да се показват в \"последни\"."
+      no_category_access: "Като модератор имате ограничен достъп до категориите, запазването е изключено."
+      delete_account: "Изтрий моя профил"
+      delete_account_confirm: "Сигурни ли сте, че искате да изтриете вашия акаунт? Акаунтът не може да бъде възстановен !"
+      deleted_yourself: "Вашият профил беше изтрит успешно."
+      delete_yourself_not_allowed: "Моля, свържете се с член на персонала, ако искате профилът Ви да бъде изтрит."
+      unread_message_count: "Съобщения"
+      admin_delete: "Изтрий"
+      users: "Потребители"
+      muted_users: "Заглушен"
+      muted_users_instructions: "Забрани всички съобщения от тези потребители"
+      muted_topics_link: "Покажете заглушените теми"
+      watched_topics_link: "Покажи наблюдаваните теми"
+      tracked_topics_link: "Покажи следените теми"
+      automatically_unpin_topics: "Автоматично отключете темите когато стигнете най-долу на форума."
+      apps: "Приложения"
+      revoke_access: "Прекратяване на достъпа"
+      undo_revoke_access: "Отмяна прекратяване на достъпа"
+      api_approved: "Одобрени:"
+      staff_counters:
+        flags_given: "полезни сигнали"
+        flagged_posts: "публикации със сигнали"
+        deleted_posts: "изтрити публикации"
+        suspensions: "отстранявания"
+        warnings_received: "предупреждения"
+      messages:
+        all: "Всички"
+        inbox: "Входяща кутия"
+        sent: "Изпратени"
+        archive: "Архив"
+        groups: "Моите групи"
+        bulk_select: "Изберете съобщения"
+        move_to_inbox: "Премести във входящи"
+        move_to_archive: "Архив"
+        failed_to_move: "Грешка при преместването на съобщенията (може би интернета ви спря?)"
+        select_all: "Избери всички"
+        tags: "Етикети"
+      preferences_nav:
+        account: "Профил"
+        notifications: "Известия"
+        tags: "Етикети"
+        apps: "Апликации"
+      change_password:
+        success: "(имейлът е изпратен)"
+        in_progress: "(изпраща се имейл)"
+        error: "(грешка)"
+        action: "Изпратете имейл за смяна на паролата"
+        set_password: "Задайте парола"
+        choose_new: "Избери нова парола"
+        choose: "Избери парола"
+      second_factor:
+        title: "Двуфакторно удостоверяване"
+        disable: "Деактивирайте двуфакторното удостоверяване"
+        confirm_password_description: "Моля, потвърдете паролата за да продължите"
+        label: "Код"
+      change_about:
+        title: "Смяна на За мен"
+        error: "Имаше грешка при промяна на тази стойност."
+      change_username:
+        title: "Смяна на потребителското име."
+        confirm: "Ако смените вашето потребителско име, всички предишни цитати и @име споменавания ще бъдат повредени . Сигурни ли сте, че искате да продължите?"
+        taken: "Съжаляваме, това потребителско име е заето."
+        invalid: "Потребителското име не е валидно. Трябва да включва само цифри и букви"
+      change_email:
+        title: "Смяна на Имейла"
+        taken: "Съжаляваме, този имейл адрес не е свободен."
+        error: "Получи се грешка при смяната на адреса. Вероятно адресът вече е зает?"
+        success: "Изпратихме съобщение на този адрес. Моля, следвайте инструкциите за потвърждаване."
+        success_staff: "Изпратихме съобщение на този адрес. Моля, следвайте инструкциите за потвърждаване."
+      change_avatar:
+        title: "Сменете аватара на вашия профил "
+        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, базиран на"
+        gravatar_title: "Промени вашият аватар на сайта на Граватар"
+        refresh_gravatar_title: "Опреснете Gravatar"
+        letter_based: "Системен аватар"
+        uploaded_avatar: "Собствено изображение"
+        uploaded_avatar_empty: "Добавете собствено изображение"
+        upload_title: "Качете изображение"
+        upload_picture: "Качи изображение"
+        image_is_not_a_square: "Внимание: изрязахмеИзрязахме вашата снимка,снимка защото не е с квадратна форма."
+        cache_notice: "Вие успешно сменихте снимката на вашия профил, но ще отнеме известно време докато се актуализира."
+      change_profile_background:
+        title: "Фон на профила"
+        instructions: "Фонът на профила ще бъде центриран и ще има ширина по подразбиране 850 пиксела."
+      change_card_background:
+        title: "Потребителски фон"
+        instructions: "Фонът ще бъде центриран и ще има дължина 590 пиксела."
+      email:
+        title: "Имейл"
+        instructions: "не се показва публично"
+        ok: "Ще Ви изпратим имейл за потвърждение."
+        invalid: "Моля, въведете валиден имейл адрес"
+        authenticated: "Вашият имейл беше потвърден от {{provider}}."
+        frequency_immediately: "Ще ви изпратим мейл веднага, ако не сте прочели поста за който сме ви писали."
+        frequency:
+          one: Ние ще ви изпратим имейл само ако не сме ви виждали през последната минута.
+          other: Ние ще ви изпратим имейл само ако не сме ви виждали през последните {{count}} минути.
+      name:
+        title: "Име"
+        instructions: "вашето пълно име (опционално)"
+        instructions_required: "Вашето пълно име"
+        too_short: "Името е твърде кратко."
+        ok: "Вашето име изглежда добре"
+      username:
+        title: "Потребителско име"
+        instructions: "уникално, без интервали"
+        short_instructions: "Хора могат да Ви споменават като @{{username}}"
+        available: "Вашето потребителско име е свободно"
+        not_available: "Не е налично. Пробвайте с {{suggestion}}?"
+        not_available_no_suggestion: "Не е наличен!"
+        too_short: "Потребителското име е твърде кратко"
+        too_long: "Потребителското име е твърде дълго"
+        checking: "Проверяваме дали потребителското име е свободно..."
+        prefilled: "Имейлът съвпада с това потребителско име"
+      locale:
+        title: "Език на интерфейса"
+        instructions: "Езикът на потребителския интерфейс, ще бъде променен, след като презаредите страницата."
+        default: "(по подразбиране)"
+      password_confirmation:
+        title: "Паролата отново"
+      last_posted: "Последна публикация"
+      last_emailed: "Последен имейл"
+      last_seen: "Видян"
+      created: "Присъединен"
+      log_out: "Изход"
+      location: "Локация"
+      website: "Уеб сайт"
+      email_settings: "Имейл "
+      like_notification_frequency:
+        title: "Информирай ме когато е харесан"
+        always: "Винаги"
+        first_time_and_daily: "За първи път пост е харесан и през деня"
+        first_time: "За първи път пост е харесан"
+        never: "Никога"
+      email_previous_replies:
+        title: "Добави последните отговори в края на мейлите"
+        unless_emailed: "освен ако не е изпратен вече"
+        always: "винаги"
+        never: "никога"
+      email_digests:
+        title: "Когато не посещавам страницата, да се изпраща имейл дайджест с новости:"
+        every_30_minutes: "на всеки 30 минути"
+        every_hour: "почасово"
+        daily: "дневно"
+        every_three_days: "На всеки три дни"
+        weekly: "седмично"
+        every_two_weeks: "На всеки две седмици"
+      include_tl0_in_digests: "Включи мненията от нови потребители в обобщените имейли"
+      email_in_reply_to: "Включи откъс от отговора на поста в мейлите"
+      email_direct: "Изпращайте ми имейл, когато някой ме цитира, отговаря на моите публикации, цитира моето @потребителско_име или ме кани да се присъединя към тема."
+      email_private_messages: "Изпращай ми имейл, когато някой ми изпрати съобщение"
+      email_always: "Изпращай ми имейл известия, дори когато съм активен на сайта"
+      other_settings: "Други"
+      categories_settings: "Категории"
+      new_topic_duration:
+        label: "Отбелязване на темите като нови, когато"
+        not_viewed: "Аз все още не съм ги видял"
+        last_here: "създадени след последното ми посещение"
+        after_1_day: "създадени през последния ден"
+        after_2_days: "създадени през последните 2 дни"
+        after_1_week: "създадени през последната седмица"
+        after_2_weeks: "създадени през последните 2 седмици"
+      auto_track_topics: "Автоматично следи темите които съм въвел"
+      auto_track_options:
+        never: "никога"
+        immediately: "веднага"
+        after_30_seconds: "след 30 секунди"
+        after_1_minute: "след 1 минута"
+        after_2_minutes: "след 2 минути"
+        after_3_minutes: "след 3 минути"
+        after_4_minutes: "след 4 минути"
+        after_5_minutes: "след 5 минути"
+        after_10_minutes: "след 10 минути"
+      invited:
+        search: "търсете покани"
+        title: "Покани"
+        user: "Поканени потребители"
+        sent: "Изпрати"
+        truncated:
+          one: Показване на първата покана.
+          other: Показване на пъврите {{count}} покани.
+        redeemed: "Взети покани"
+        redeemed_tab: "Взети"
+        redeemed_tab_with_count: "Взети ({{count}})"
+        redeemed_at: "Взети"
+        pending: "Изчакващи покани"
+        pending_tab: "Чакащи"
+        pending_tab_with_count: "Чакащи ({{count}})"
+        topics_entered: "Прегледани теми"
+        posts_read_count: "Прочетени публикации"
+        expired: "Тази покана е изтекла."
+        rescind: "Премахване"
+        rescinded: "Поканата е премахната"
+        reinvite: "Изпратете отново"
+        reinvite_all: "Препрати всички покани"
+        reinvited: "Поканата е изпратена отново"
+        reinvited_all: "Всички покани са препратени!"
+        time_read: "Време за прочитане"
+        days_visited: "Дни Посетена"
+        account_age_days: "Период на акаунта в дни"
+        create: "Изпрати покана"
+        generate_link: "Копирай Връзката-Покана"
+        bulk_invite:
+          text: "Групова покана чрез файл"
+          success: "Файлът е качен успешно. Ще бъдете информирани чрез съобщение, когато процесът завърши."
+      password:
+        title: "Парола"
+        too_short: "Вашата парола е твърде кратка."
+        common: "Вашата парола е твърде разпространена."
+        same_as_username: "Вашата парола е същата като вашето потребителско име."
+        same_as_email: "Вашата парола е същата като вашия email."
+        ok: "Вашата парола изглежда добре."
+        instructions: "поне %{count}знака"
+      summary:
+        title: "Сумарно"
+        stats: "Статистика"
+        time_read: "Време за прочитане"
+        topic_count:
+          one: Създадена тема
+          other: Създадени теми
+        post_count:
+          one: Създадена публикация
+          other: 'Създадени публикации '
+        days_visited:
+          one: Посетен ден
+          other: Посетени дни
+        posts_read:
+          one: Прочетена публикация
+          other: 'Прочетени публикации '
+        bookmark_count:
+          one: маркер
+          other: маркери
+        top_replies: "Най-отговаряни"
+        no_replies: "Все още няма отговори."
+        more_replies: "Още отговори"
+        top_topics: "Най-добри теми"
+        no_topics: "Все още няма теми."
+        more_topics: "Още теми"
+        top_badges: "С най-много значки"
+        no_badges: "Все още няма значки."
+        more_badges: "Още значки"
+        top_links: "Най-добри връзки"
+        no_links: "Все още няма линкове."
+        most_liked_by: "По най-харесвани"
+        most_liked_users: "Най-харесвани"
+        most_replied_to_users: "По най-отговаряни"
+        no_likes: "Все още няма харесвания."
+      associated_accounts: "Логвания"
+      ip_address:
+        title: "Последен IP адрес."
+      registration_ip_address:
+        title: "IP адрес при регистрацията."
+      avatar:
+        title: "Аватар"
+        header_title: "профил, съобщения, отметки и предпочитания"
+      title:
+        title: "Заглавие"
+      filters:
+        all: "Всички"
+      stream:
+        posted_by: "Публикувано от"
+        sent_by: "Изпратено от"
+        private_message: "Съобщение"
+        the_topic: "темата"
+    loading: "Зарежда се..."
+    errors:
+      prev_page: "докато се зареждаше"
+      reasons:
+        network: "Грешка при свързване"
+        server: "Грешка в сървъра"
+        forbidden: "Достъпът е ограничен"
+        unknown: "Грешка"
+        not_found: "Страницата не е намерена"
+      desc:
+        network: "Моля проверете вашата връзка"
+        network_fixed: "Изглежда се е върнала."
+        server: "Грешка: {{status}}"
+        forbidden: "Няматe права да виждате това."
+        not_found: "Опаа, приложението опита да зареди URL, който не съществува."
+        unknown: "Нещо се обърка."
+      buttons:
+        back: "Назад"
+        again: "Опитайте отново"
+        fixed: "Заредете страницата"
+    close: "Затвори"
+    assets_changed_confirm: "Страницата беше обновена. Презаредете, за да видите последната версия."
+    logout: "Вие бяхте отписан."
+    refresh: "Опресни"
+    read_only_mode:
+      enabled: "Сайта е в режим само за четене. Моля продължете да разглеждате, но отгавяне, харесване и всичко останали опции са спряни за сега."
+      login_disabled: "Влизането е изключено докато страницата е в мод само за четене."
+      logout_disabled: "Излизане от сайта е временно спряно, докато е пуснат режим \"само за четене\"."
+    too_few_topics_and_posts_notice: "Нека да започнем <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>дискусията сега!</a> В момента има <strong>%{currentTopics} / %{requiredTopics}</strong> теми и <strong>%{currentPosts} / %{requiredPosts}</strong> постове. Новите посетители се нуждаят от теми за разговор, за да има на какво да четат и да отговарят."
+    too_few_topics_notice: "Нека да започнем <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>дискусията сега!</a>В момента има <strong>%{currentTopics} / %{requiredTopics}</strong> теми. Новите посетители се нуждаят от теми за разговор, за да има на какво да четат и да отговарят."
+    too_few_posts_notice: "Нека да започнем <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>дискусията сега!</a> В момента има <strong>%{currentPosts} / %{requiredPosts}</strong> постове. Новите посетители се нуждаят от теми за разговор, за да има на какво да четат и да отговарят."
+    logs_error_rate_notice:
+      rate:
+        one: 1 грешка/%{duration}
+        other: '%{count} грешки/%{duration}'
+    learn_more: "научете повече..."
+    all_time: 'общо'
+    all_time_desc: 'общо създадени теми'
+    year: 'година'
+    year_desc: 'теми създадени през последните 365 дни'
+    month: 'месец'
+    month_desc: 'теми създадени през последните 30 дни'
+    week: 'седмица'
+    week_desc: 'теми създадени през последните 7 дни'
+    day: 'ден'
+    first_post: Първа публикация
+    mute: Заглушаване
+    unmute: Премахване на заглушаване
+    last_reply_lowercase: последен отговор
+    replies_lowercase:
+      one: отговор
+      other: отговори
+    signup_cta:
+      sign_up: "Регистрирай се"
+      hide_session: "Напомни ми утре"
+      hide_forever: "не благодаря"
+      hidden_for_session: "Добре, Ще ви питам отново утре. През това време можете да използвате бутона \"Влизане\" или да си създадете нов потребител."
+      intro: "Здравей здравей! :heart_eyes: Изглежда че ти е харесала дискусията тук, но все още не си се регистрирал като потребител."
+      value_prop: "Когато си създадете акаунт, ние ще запомним това което сте чели, така че винаги можете да се върнете където сте спрели. Можете също така да получавате известия, тук и по електронната поща, когато има нови мнения. Вие може да харесвате постовете и да ги споделяте с любов. :heartbeat:"
+    summary:
+      enabled_description: "В момента гледате резюме на тази тема: най-интересните публикации определени от общността."
+      description: "Има <b>{{replyCount}}</b> отговора."
+      description_time: "В момента има <b>{{replyCount}}</b> отговора прочетени за <b>{{readingTime}} минути</b>."
+      enable: 'Обобщи Тази Тема'
+      disable: 'Покажи всички публикации'
+    deleted_filter:
+      enabled_description: "Тази тема има изтрити публикации, които са скрити."
+      disabled_description: "Изтритите публикации в тази тема са показани."
+      enable: "Скрий изтритите публикации"
+      disable: "Покажи изтритите публикации"
+    private_message_info:
+      title: "Съобщение"
+      invite: "Поканете други..."
+      remove_allowed_user: "Сигурни ли сте, че искате да премахнете {{name}} от това съобщение?"
+      remove_allowed_group: "Сигурни ли сте, че искате да премахнете {{name}} от това съобщение?"
+    email: 'Имейл'
+    username: 'Потребителско име'
+    last_seen: 'Видяно'
+    created: 'Създадено'
+    created_lowercase: 'създадено'
+    trust_level: 'Ниво на доверие'
+    search_hint: 'потребителско име, имейл или IP адрес'
+    create_account:
+      disclaimer: "С регистрацията си се съгласявате с <a href='{{privacy_link}}'> политиката за повелителност</a> и <a href='{{tos_link}}'>условията за ползване</a>."
+      title: "Създай нов профил"
+      failed: "Нещо се случи, вероятно вече има регистрация с този имейл адрес, опитайте с линка за забравена парола."
+    forgot_password:
+      title: "Възстановяване на парола"
+      action: "Забравих си паролата"
+      invite: "Въведете вашето потребителско име или имейл и ние ще Ви изпратим имейл за смяна на паролата."
+      reset: "Смяна на паролата"
+      complete_username: "Ако профилът съвпада с потребителското име <b>%{username}</b>, трябва да получите имейл с инструкции, как да си смените паролата. "
+      complete_email: "Ако профилът съвпада с <b>%{email}</b>, трябва да получите имейл с инструкции, как да си смените паролата. "
+      complete_username_found: "Намерихме профил който съвпада с потребителското име <b>%{username}</b>, трябва да получите имейл с инструкции как да смените паролата."
+      complete_email_found: "Намерихме профил който съвпада с <b>%{email}</b>, трябва да получите имейл с инструкции как да смените паролата."
+      complete_username_not_found: "Няма профил, който да съвпада с потребителскоto име <b>%{username}</b>"
+      complete_email_not_found: "Няма акаунт който да съвпада с <b>%{email}</b>"
+    login:
+      title: "Вход"
+      username: "Потребител"
+      password: "Парола"
+      email_placeholder: "имейл или потребителско име"
+      caps_lock_warning: "Включен е Caps Lock"
+      error: "Непозната грешка"
+      rate_limit: "Моля, изчакайте, преди да се опитате да влезете отново."
+      blank_username_or_password: "Моля, въведете Вашия имейл или потребителско име и парола."
+      reset_password: 'Смяна на парола'
+      logging_in: "Влизане..."
+      or: "Или"
+      authenticating: "Оторизация..."
+      awaiting_approval: "Вашия акаунт все още не е одобрен от администратора. Ще получите известие, когато това се случи."
+      requires_invite: "Съжаляваме, този форум е достъпен само с покани."
+      not_activated: "Не може да влезете. Изпратихме имейл за активация на <b>{{sentTo}}</b>. Моля, следвайте инструкциите в имейла, за да активирате профила."
+      not_allowed_from_ip_address: "Не може да влезете от този IP адрес."
+      admin_not_allowed_from_ip_address: "Не може да влезете като админ от този IP адрес."
+      resend_activation_email: "Натиснете тук, за да изпратите повторен имейл за активация."
+      omniauth_disallow_totp: "Профилът ви има активирано удостоверяване с два фактора. Моля, влезте с паролата си."
+      sent_activation_email_again: "Изпратихме имейл за активация на <b>{{currentEmail}}</b>. Може да изминат няколко минути докато пристигне. Не забравяйте да проверите Вашата спам папка."
+      to_continue: "Моля влезте"
+      preferences: "Трябва да сте влезли, за да можете да променяте потребителските си настройки."
+      forgot: "Не си спомням подробности за профила ми"
+      google:
+        title: "с Google"
+        message: "Удостоверяване с Google (проверете за блокирани на поп-ъп прозорци) "
+      google_oauth2:
+        title: "с Google"
+        message: "Удостоверяване с Google (проверете за блокирани на поп-ъп прозорци)"
+      twitter:
+        title: "с Twitter"
+        message: "Удостоверяване с Twitter (уверете се, pop up блокерите не са разрешени)"
+      instagram:
+        title: "чрез Instagram"
+        message: "Удостоверява се връзка с Instagram (уверете се, че поп-блокерите не са включени)"
+      facebook:
+        title: "със Facebook"
+        message: "Удостоверяване със Facebook (проверете за блокирани на поп-ъп прозорци)"
+      yahoo:
+        title: "с Yahoo"
+        message: "Удостоверяване с Yahoo (уверете се, pop up блокерите не са разрешени)"
+      github:
+        title: " с Github"
+        message: "Удостоверяване с Github (уверете се, pop up блокерите не са разрешени)"
+    invites:
+      success: "Профилът ви е създаден и вече сте влезли в него."
+      name_label: "Име"
+    emoji_set:
+      google: "Google"
+      twitter: "Twitter"
+      win10: "Win10"
+    shortcut_modifier_key:
+      shift: 'Shift'
+      ctrl: 'Ctrl'
+      alt: 'Alt'
+    select_kit:
+      default_header_text: Изберете...
+      filter_placeholder: "Търсене ... "
+    emoji_picker:
+      filter_placeholder: Търсене на имотикони
+    composer:
+      emoji: "Емошънка :)"
+      more_emoji: "още..."
+      options: "Опции"
+      whisper: "шепот"
+      unlist: "скрити"
+      add_warning: "Това е официално предупреждение."
+      toggle_whisper: "Включи шепот"
+      posting_not_on_topic: "На коя тема искате да отговорите ?"
+      saving_draft_tip: "записване..."
+      saved_draft_tip: "запазено"
+      saved_local_draft_tip: "запазено локално"
+      similar_topics: "Вашата тема е подобна на..."
+      drafts_offline: "чернови офлайн"
+      error:
+        title_missing: "Заглавието е задължително"
+        title_too_short: "Заглавието трябва да е минимум {{min}} символа"
+        title_too_long: "Заглавието не може да е повече от {{max}} символа"
+        post_missing: "Публикацията не може да е празна"
+        post_length: "Публикацията трябва да е най-малко {{min}} символа."
+        try_like: 'Опитвали ли сте <i class="fa fa-heart"></i> бутона?'
+        category_missing: "Трябва да изберете категория"
+        tags_missing: "Трябва да изберете поне %{count} етикети."
+      save_edit: "Запази редакцията"
+      reply_original: "Отговори на Оригинална Тема"
+      reply_here: "Отговори тук"
+      reply: "Отговорете"
+      cancel: "Прекрати"
+      create_topic: "Създай тема"
+      create_pm: "Съобщение"
+      title: "Или натиснете Ctrl+Enter"
+      users_placeholder: "Добави потребител"
+      title_placeholder: "За какво става дума в дискусията с едно изречение?"
+      title_or_link_placeholder: "Напишете заглавие или поставете линк тук"
+      edit_reason_placeholder: "защо редактирате ?"
+      show_edit_reason: "(причина за редакцията)"
+      reply_placeholder: "Пиши тук. Използвай Markdown, BBCode, или HTML за форматиране. Издърпайте или поставете изображенията."
+      view_new_post: "Вижте публикацията."
+      saving: "Запаметяване"
+      saved: "Запазено!"
+      saved_draft: "Публикацията е налична като чернова. Изберете, за да продължите."
+      uploading: "Качва се..."
+      show_preview: 'покажи прегледa &raquo;'
+      hide_preview: '&laquo; скрий прегледa'
+      quote_post_title: "Цитирай цялата публикация"
+      bold_title: "Удебелен"
+      bold_text: "удебелен текст"
+      italic_title: "Италик"
+      italic_text: "Подчертан текст"
+      link_title: "Хипервръзка"
+      link_description: "добави описание на връзката тук"
+      link_dialog_title: "Добави хипервръзка"
+      link_optional_text: "заглавие по избор"
+      link_url_placeholder: "http://example.com"
+      quote_title: "Текстов блок"
+      quote_text: "Текстов блок"
+      code_title: "Форматиран текст"
+      code_text: "Избутай текста с 4 интервала"
+      paste_code_text: "въведете или поставете кода тук"
+      upload_title: "Качване"
+      upload_description: "причина за качването"
+      olist_title: "Номериран списък"
+      ulist_title: "Списък с водещи символи"
+      list_item: "Списък"
+      help: "Помощ с Markdown"
+      modal_ok: "Ок"
+      modal_cancel: "Отмени"
+      cant_send_pm: "Съжеляваме, но неможете да изпращате съобщения до %{username}."
+      admin_options_title: "Допълнителни настройки за тази тема"
+    notifications:
+      title: "уведомления за @name споменавания, отговори на вашите публикации и теми, лични съобщения, и т.н."
+      none: "В момента не могат да бъдат заредени уведомленията."
+      empty: "Няма намерени нотификации."
+      more: "виж стари известия"
+      total_flagged: "всички публикации със сигнал"
+      popup:
+        mentioned: '{{username}} ви спомена в "{{topic}}" - {{site_title}}'
+        group_mentioned: '{{username}} ви спомена в  "{{topic}}" - {{site_title}}'
+        quoted: '{{username}} ви цитира в "{{topic}}" - {{site_title}}'
+        replied: '{{username}} ви отговори в "{{topic}}" - {{site_title}}'
+        posted: '{{username}} публикува в "{{topic}}" - {{site_title}}'
+        linked: '{{username}} прикачи вашата публикация от "{{topic}}" - {{site_title}}'
+        confirm_title: 'Включени известявания - %{site_title}'
+        confirm_body: 'Успех! Известяването е включено.'
+    upload_selector:
+      title: "Добавете изображение"
+      title_with_attachments: "Добавете изображение или файл"
+      from_my_computer: "От моето устройство"
+      from_the_web: "От мрежата"
+      remote_tip: "линк към изображение"
+      remote_tip_with_attachments: "връзка към картинка или файл {{authorized_extensions}}"
+      local_tip: "изберете изображения от вашето устройство"
+      local_tip_with_attachments: "изберете картинки или файлове от вашето устройство {{authorized_extensions}}"
+      hint: "(за да ги качите също можете да ги провлачите и пуснете в редактора)"
+      hint_for_supported_browsers: "вие можете винаги да привлачите или поставите картинки върху вашия редактора"
+      uploading: "Качване "
+      select_file: "Избери файл"
+      image_link: "адресът, на който ще бъде показано вашето изображение "
+    search:
+      sort_by: "Сортирай по"
+      relevance: "Приложимост"
+      latest_post: "Последен пост"
+      most_viewed: "Най-четени"
+      most_liked: "Най-харесвани"
+      select_all: "Избери Всички "
+      clear_all: "Изчисти Всички"
+      too_short: "Думата за търсене е твърде кратка."
+      title: "търсете по тема, пост, потребител или категория"
+      full_page_title: "търсене на теми или публикации"
+      no_results: "Няма резултати  "
+      no_more_results: "Не са намерени резултати."
+      searching: "Търсене ... "
+      post_format: "#{{post_number}} от {{username}} "
+      results_page: "Резултати от търсенето на '{{term}}'"
+      more_results: "Има повече резултати. Моля, прецизирайте търсенето си."
+      or_search_google: "Или вместо това опитайте търсене с Гугъл:"
+      search_google: "Опитайте вместо това търсене с Гугъл:"
+      search_google_title: "Търсене в този сайт"
+      context:
+        user: "Търсете публикация от @{{username}}"
+        category: "Търсене за категория #{{category}}"
+        topic: "Търсете тази тема"
+        private_messages: "Търси съобщения"
+      advanced:
+        title: Разширено търсене
+        posted_by:
+          label: Публикувано от
+        in_group:
+          label: В група
+        with_badge:
+          label: Със значка
+        filters:
+          likes: Аз харесах
+          posted: Аз публикувах в
+          watching: Аз наблюдавам
+          tracking: Аз следя
+          first: е първата публикация
+          pinned: са закачени
+          unpinned: не са закачени
+          all_tags: Всички по-горни етикети
+        post:
+          time:
+            label: Публикувано
+            before: преди
+            after: след
+    hamburger_menu: "Отиди към друг списък с теми или друга категория "
+    new_item: "нови"
+    go_back: 'Назад '
+    not_logged_in_user: 'Потребителска страница с история на текущата дейност и предпочитания'
+    current_user: 'Отиди към потребителската страница '
+    topics:
+      new_messages_marker: "последно посещение"
+      bulk:
+        select_all: "Селектирай всички"
+        clear_all: "Изчисти всички"
+        unlist_topics: "Непоказани теми"
+        reset_read: "Изчисти прочетеното  "
+        delete: "Изтрий темите"
+        dismiss: "Отмени"
+        dismiss_read: "Отхвърли всички непрочетени"
+        dismiss_button: "Отмени..."
+        dismiss_tooltip: "Отхвърляне само новите мнения или спрете да следите теми"
+        also_dismiss_topics: "Спрете проследяване тези теми, така че те никога да не се появяват като непрочетени отново"
+        dismiss_new: "Премахни новите "
+        toggle: "Включв./Изкл. избор на няколко теми"
+        actions: "Групови действия "
+        close_topics: "Затвори темите"
+        archive_topics: "Архивирай темите"
+        notification_level: "Известия"
+        choose_new_category: "Избери нова категория за тези теми:"
+        selected:
+          one: Вие сте избрали <b>1</b> тема.
+          other: Вие сте избрали <b>{{count}}</b> теми.
+        change_tags: "Замени етикетите"
+        append_tags: "Добави етикетите"
+        choose_new_tags: "Избери нови етикети за тези теми:"
+        choose_append_tags: "Избери нови етикети, които да се добавят към тези теми:"
+        changed_tags: "Етикетите на тези теми бяха сменени."
+      none:
+        unread: "Нямате непрочетени теми."
+        new: "Нямате нови теми."
+        read: "Все още не сте прочели нито една тема."
+        posted: "Все още не сте публикували нито една тема."
+        latest: "Няма повече теми в Последни. Това е тъжно."
+        hot: "Няма горещи теми."
+        bookmarks: "Все още нямате теми в Отметки."
+        category: "Няма теми в категория {{category}}."
+        top: "Няма топ теми."
+        search: "Няма резултати от търсенето."
+        educate:
+          new: '<p>Непрочетените теми се появяват тук.</p><p>По подразбиране темите се считат за непрочетени и ще показват бройката <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"> нови</span>  ако са създадени през последните 2 дни.</p><p> Моля посетете вашите <a href="%{userPrefsUrl}">настройки</a> за да промените това.</p>'
+          unread: '<p>Вашите непрочетени теми са тук.</p><p>По подразбиране, темите се считат за непрочетени и ще им се показва брояч <span class="badge new-posts badge-notification">1</span> ако вие:</p><ul><li>Сте създали тема</li><li>Отговорили на тема</li><li>Прочели темата преди повече от 4 минути</li></ul><p>Или ако са изрично определени в темата да бъдат проследявани и гледани чрез контрол на уведомление в долната част на всяка тема.
+
+            </p><p>За да промените това, влезте във <a href="%{userPrefsUrl}">вашите настройки от тук.</a></p>'
+      bottom:
+        latest: "Няма повече теми в Последни."
+        hot: "Няма повече теми в горещи."
+        posted: "Няма повече публикувани теми."
+        read: "Няма повече прочетени теми."
+        new: "Няма повече нови теми."
+        unread: "Няма повече непрочетени теми."
+        category: "Няма повече теми в {{category}}"
+        top: "Няма повече топ теми."
+        bookmarks: "Няма теми в Отметки"
+        search: "Няма повече резултати от търсенето"
+    topic:
+      create: 'Нова тема'
+      create_long: 'Създайте нова тема'
+      open_draft: "Довърши ревизия"
+      private_message: 'Започни съобщение'
+      archive_message:
+        help: 'Преместете съобщението в архив'
+        title: 'Архив'
+      move_to_inbox:
+        title: 'Премести във входящи'
+        help: 'Премести съобщението обратно във входящи'
+      list: 'Теми'
+      new: 'нова тема'
+      unread: 'непрочетено'
+      new_topics:
+        one: 1 нова тема
+        other: '{{count}} нови теми'
+      unread_topics:
+        one: 1 непрочетена тема
+        other: '{{count}} непрочетени теми'
+      title: 'Тема'
+      invalid_access:
+        title: "Темата е частна"
+        description: "Съжаляваме, нямате достъп до тази тема !"
+        login_required: "Трябва да се логнат, за да видите темата."
+      server_error:
+        title: "Темата не може да бъде заредена."
+        description: "Съжаляваме, темата не може да бъде заредена, вероятно се дължи на проблеми с връзката. Моля, опитайте отново. Ако проблемът все още съществува, моля да ни уведомите."
+      not_found:
+        title: "Темата не е намерена"
+        description: "Темата не може да бъде открита. Възможно ли е да е премахната от модератор?"
+      total_unread_posts:
+        one: имате 1 непрочетено мнение в тази тема
+        other: ' Вие имате {{count}} непрочетени мнения в тази тема'
+      unread_posts:
+        one: Вие имате 1 непрочетено старо мнение в тази тема
+        other: Вие имате {{count}} непрочетени стари мнения в тази тема
+      new_posts:
+        one: има 1 нова публикация в темата от последното Ви посещение на темата
+        other: от последното Ви посещение в темата до сега има {{count}} нови публикации
+      likes:
+        one: има 1 харесване в тази тема
+        other: има {{count}} харесвания в тази тема
+      back_to_list: "Назад към Списъка с теми"
+      options: "Настройки на темата"
+      show_links: "покажи връзките в тази тема"
+      toggle_information: "Показване / скриване на подробна информация за дадена тема "
+      read_more_in_category: "Искате да прочетете повече ? Разгледайте други теми в {{catLink}} или {{latestLink}}."
+      read_more: "Искате да прочетете повече ? {{catLink}} или {{latestLink}}."
+      read_more_MF: "Ето { UNREAD, plural, =0 {} one { <a href='/unread'>1 непрочетено</a> } other { <a href='/unread'># непрочетено </a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='/new'>1 нова </a> тема} other { {BOTH, select, true{and } false {are } other{}} <a href='/new'># теми </a>} } напомняне, или {CATEGORY, select, true {потърски други теми в {catLink}} погрешен {{latestLink}} other {}}"
+      browse_all_categories: Прегледай всички категории
+      view_latest_topics: виж последните теми
+      suggest_create_topic: "Защо не създадете тема ?"
+      jump_reply_up: към по ранен отговор
+      jump_reply_down: към по-късен отговор
+      deleted: "Темата беше изтрита"
+      auto_update_input:
+        none: "Избери времева рамка"
+        later_today: "По-късно днес"
+        tomorrow: "Утре"
+        later_this_week: "По-късно тази седмица"
+        this_weekend: "Този уикенд"
+        next_week: "Следваща седмица"
+        two_weeks: "Две седмиц"
+        next_month: "Следващия месец"
+        three_months: "Три месеца"
+        six_months: "Шест месеца"
+        one_year: "Една година"
+        forever: "Завинаги"
+      auto_close_title: 'Настройки за автоматично затваряне'
+      timeline:
+        back: "Назад"
+      progress:
+        title: прогрес на темата
+        go_top: "горе"
+        go_bottom: "долу"
+        go: "go"
+        jump_bottom: "към последната публикация"
+        jump_bottom_with_number: "отиди на публикация %{post_number}"
+        total: всички публикации
+        current: текуща публикация
+      notifications:
+        reasons:
+          "3_10": 'Ще получавате известия, защото наблюдавате таг на тази тема.'
+          "3_6": 'Ще получавате известия, защото наблюдавате тази категория'
+          "3_5": 'Ще получавате известия, защото започнахте да наблюдавате тази тема автоматично.'
+          "3_2": 'Ще получавате известия, защото наблюдавате тази тема.'
+          "3_1": 'Ще получавате известия, защото създадохте тази тема.'
+          "3": 'Ще получавате известия, защото наблюдавате тази тема.'
+          "1_2": 'Ще ви уведобим, ако някой ви отговори или спомене вашето @име'
+          "1": 'Ще ви уведобим, ако някой ви отговори или спомене вашето @име'
+          "0_7": 'Вие игнорирате всички известия в тази категория.'
+          "0_2": 'Вие игнорирате всички известия за тази тема.'
+          "0": 'Вие игнорирате всички известия за тази тема.'
+        watching_pm:
+          title: "Наблюдавай"
+          description: "Вие ще бъдете информиран за всеки нов отговор на това съобщение, също така ще се показва и броя на новите отговори"
+        watching:
+          title: "Наблюдаване"
+          description: "Вие ще бъдете информиран за всеки нов отговор в тази тема, също така ще се показва и броя на новите отговори"
+        tracking_pm:
+          title: "Следене"
+          description: "Броят на новите отговори ще присъства в това съобщение. Вие ще бъдете информиран ако някой ви отговори или спомене вашето @име."
+        tracking:
+          title: "Следене"
+          description: "Броя на новите отговори ще присъства в тази тема. Вие ще бъдете информиран ако някой ви отговори или спомене вашето @име."
+        regular:
+          title: "Нормален"
+          description: "Ще ви уведобим, ако някой ви отговори или спомене вашето @име"
+        regular_pm:
+          title: "Нормален"
+          description: "Вие ще бъдете информиран ако някой ви отговори или спомене вашето @име"
+        muted_pm:
+          title: "Заглуши"
+          description: "Няма да бъдете уведомени за нищо свързано с това съобщение."
+        muted:
+          title: "Заглушен"
+          description: "Вие никога няма да бъде уведомен за нещо по тази тема, и то няма да се появи в най-новата."
+      actions:
+        recover: "Възстанови темата"
+        delete: "Изтрий темата"
+        open: "Отвори темата"
+        close: "Изчисти темата"
+        multi_select: "Избери публикации..."
+        pin: "Закови темата..."
+        unpin: "Откови темата..."
+        unarchive: "Разархивирай темата"
+        archive: "Архивирай темата"
+        invisible: "Премахни от списъците"
+        visible: "Включи в списъците"
+        reset_read: "Изчисти прочетените данни "
+        make_public: "Направи темата публична"
+      feature:
+        pin: "Закови темата"
+        unpin: "Отгови темата"
+        pin_globally: "Закови темата глобално"
+        make_banner: "Банер тема"
+        remove_banner: "Премахни банер тема"
+      clear_pin:
+        title: "Изчисти пин "
+        help: "Изчисти пиннатия статус на тази тема така, че тя повече да не се появява в горната част на Вашият списък с теми."
+      share:
+        title: 'Споделяне'
+        help: 'споделете връзка към тази тема'
+      flag_topic:
+        title: 'Сигнал'
+        help: 'скрито сигнализирайте за публикацията, за да ѝ бъде обърнато внимание или изпратете скрито известие за нея'
+        success_message: 'Успешно сигнализирахте за тази тема.'
+      feature_topic:
+        title: "Фокусирай тази тема"
+        pin: "Тази тема да се появява в горната част на {{categoryLink}} категорията докато"
+        confirm_pin: "Вие вече имате {{count}} заковани теми. Прекалено много заковани теми може да объркат новите и анонимни потребители. Сигурни ли сте че искате да заковете още една тема към тази категория ?"
+        unpin: "Премахни тази тема от началото на категория {{categoryLink}}"
+        unpin_until: "Премахни тази тема от горната част на {{categoryLink}} категорията или изчакай докато <strong>%{until}</strong>."
+        pin_note: "Потребителите могат да отковат тази тема индивидуално само за тях"
+        pin_validation: "Необходимо е да се избере дата, за да може да се закачи темата."
+        not_pinned: "Няма закачени теми в {{categoryLink}}."
+        already_pinned:
+          one: 'Темата е закачена в {{categoryLink}}: <strong class=''badge badge-notification unread''>е 1</strong>'
+          other: 'Темите закачени в {{categoryLink}}: <strong class=''badge badge-notification unread''>са {{count}}</strong>'
+        pin_globally: "Тази тема да се появява в горната част на всички списъци докато"
+        confirm_pin_globally: "Вие вече имате {{count}} глобално заковани теми. Прекалено много заковани теми може да объркат новите и анонимни потребители. Сигурни ли сте че искате да заковете още една тема глобално към тази категория ?"
+        unpin_globally: "Премахни тази тема от началото на списъците с теми."
+        unpin_globally_until: "Премахни тази тема от горната част на списъка с теми или изчакай докато <strong>%{until}</strong>."
+        global_pin_note: "Потребителите могат да отговат темата индивидуално само за тях."
+        not_pinned_globally: "Няма никакви закачени теми."
+        already_pinned_globally:
+          one: 'Темата закачена глобално е: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Темите закачени глобално: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+        make_banner: "Направете тази тема на банер който ще присъства в началото на всички страници"
+        remove_banner: "Премахнете този банер който се появява в началото на всички страници"
+        banner_note: "Потребителите могат да откажат банера като го затворят. Само една тема може да бъде банер в едно и също време."
+        no_banner_exists: "Няма блокирани теми."
+        banner_exists: "<strong class='badge badge-notification unread'> е</strong> тема за банер."
+      inviting: "Покана..."
+      invite_private:
+        title: 'Покани за съобщение'
+        email_or_username: "Имейл адрес или Потребителско име"
+        email_or_username_placeholder: "имейл адрес или потребителско име"
+        action: "Покана"
+        success: "Поканихте този потребител да се включи в това  съобщение."
+        error: "Получи се грешка при поканата на този потребител."
+        group_name: "име на групата"
+      controls: "Контрол на темата"
+      invite_reply:
+        title: 'Покана'
+        username_placeholder: "потребителско име"
+        action: 'Изпрати покана'
+        help: 'поканете другите да се присъединят към тази тема чрез имейл или уведомление'
+        to_forum: "Изпратихме кратък имейл, който позволява на Вашия приятел, да се включи в разговора, само с едно натискане върху връзката. Не се изисква вход в системата."
+        sso_enabled: "Въведете потребителското име на човека който желаете да поканите към в тема."
+        to_topic_blank: "Въведете потребителско име или имейл адрес на човека който желаете да поканите към тази тема."
+        to_topic_email: "Вие въведохте имейл адрес. Ние ще изпратим имейл чрез която вашият приятел може да отговори веднака на тази тема."
+        to_topic_username: "Въведохте потребителско име. Ние ще изпратим напомняне с връзка която го кани в тази тема."
+        to_username: "Въведете потребителското име на човека който искате да поканите. Ние ще му изпратим напомняне с връзка която го кани в тази тема."
+        email_placeholder: 'name@example.com'
+        success_email: "Изпратихте покана на <b>{{emailOrUsername}}</b>. Ще Ви уведомим, когато поканата е използвана. Проверявайте раздела с покани на Вашата потребителска страница, за да следите на Вашите покани."
+        success_username: "Ние поканихме този потребител да се присъедини темата."
+        error: "Съжаляваме, не можем да поканим този човек. Вероятно вече е потребител? ( Поканите са ограничени)"
+      login_reply: 'Влезте, за да отговорите '
+      filters:
+        n_posts:
+          one: 1 публикация
+          other: '{{count}} публикации'
+        cancel: "Премахни филтъра"
+      split_topic:
+        title: "Премести в нова тема"
+        action: "премести в нова тема"
+        topic_name: "Име на новата тема"
+        error: "Възникна грешка при преместването на публикацията в нова тема."
+        instructions:
+          one: На път сте да създадете нова тема и да я запълните с публикацията която избрахте.
+          other: На път сте да създадете нова тема и да я запълните с <b>{{count}}</b> избрани публикации.
+      merge_topic:
+        title: "Преместете в съществуваща тема."
+        action: "преместете в съществуваща тема."
+        error: "Възникна грешка при преместване мнения в тази тема."
+        instructions:
+          one: 'Моля изберете тема в която искате да преместите тази публикация. '
+          other: 'Моля, изберете тема, в която искате да преместите тези <b>{{count}}</b> публикации.    '
+      change_owner:
+        title: "Смени собственика на публикацията."
+        action: "смени собственика"
+        error: "Възникна грешка при смяната на собственика"
+        label: "Нов собственик на публикациите"
+        placeholder: "име на новия собственик"
+        instructions:
+          one: Моля изберете нов собственик на публикацията от  <b>{{old_user}}</b>.
+          other: 'Моля, изберете новият собственик на {{count}} публикации от <b>{{old_user}}</b>. '
+        instructions_warn: "Имайте предвид, че известията към тази публикация няма да бъдат прехвърлени  със задна дата към новия потребител."
+      change_timestamp:
+        action: "смени времевия показател"
+        invalid_timestamp: "Времевия показател неможе да бъде в бъдещето."
+        error: "Грешка при смяната на времевия показател."
+        instructions: "Моля, изберете ново заглавие на темата. Публикациите в темата ще бъдат актуализирани, за да имат една и съща времева разлика."
+      multi_select:
+        select: 'избери'
+        selected: 'избрани ({{count}})'
+        delete: "изтрий избраните "
+        cancel: прекрати избирането
+        select_all: "избери всички "
+        deselect_all: "премахване на всички "
+        description:
+          one: Вие избрахте <b>1</b> публикация.
+          other: 'Вие избрахте <b>{{count}}</b> публикации. '
+    post:
+      edit_reason: "Причина: "
+      post_number: "публикация {{number}} "
+      last_edited_on: "публикацията последно е редактирана на "
+      reply_as_new_topic: "Отговори като свързана тема"
+      continue_discussion: "Продължаване на дискусията от {{postLink}}: "
+      follow_quote: "отиди на цитираната публикация "
+      show_full: "Покажи цялата публикация"
+      show_hidden: 'Виж скритото съдържание.'
+      deleted_by_author:
+        one: (публикация оттеглена от автора, ще бъде автоматично изтрита след %{count} час, освен, ако не бъде сигнализирана)
+        other: '(публикация оттеглена от автора, ще бъде автоматично изтрита след %{count} часа, освен, ако не бъде сигнализирана) '
+      expand_collapse: "разшири/намали "
+      gap:
+        one: покажи 1 скрит отговор
+        other: покажи {{count}} скрити отговора
+      unread: "Публикацията е непрочетена"
+      has_replies:
+        one: '{{count}} Отговор'
+        other: '{{count}} Отговори'
+      has_likes:
+        one: '{{count}} Харесване'
+        other: '{{count}} Харесвания'
+      has_likes_title:
+        one: 1 човек харесва тази публикация
+        other: '{{count}} човека харесват тази публикация'
+      has_likes_title_only_you: "вие харесахте този пост"
+      has_likes_title_you:
+        one: вие и още 1 човек сте харесали този пост
+        other: вие и {{count}} човека сте харесали този пост
+      errors:
+        create: "При създаването на Вашата публикация се получи грешка. Моля, опитайте отново."
+        edit: "Съжаляваме, възникна грешка при редактирането на публикацията. Моля, опитайте отново. "
+        upload: "Съжаляваме, възникна грешка при качването на този файл. Моля, опитайте отново."
+        too_many_uploads: "Съжаляваме, не можете да качвате повече от един файл наведнъж."
+        image_upload_not_allowed_for_new_user: "Съжаляваме, новите потребители не могат да качват снимки."
+        attachment_upload_not_allowed_for_new_user: "Съжаляваме, новите потребители не могат да прикачват файлове."
+        attachment_download_requires_login: "Съжаляваме, трябва да сте логнат, за да може да сваляте прикачените файлове."
+      abandon:
+        confirm: "Сигурни ли сте, че искате да напуснете тази публикация?"
+        no_value: "Не, запази"
+        yes_value: "Да, напусни"
+      via_email: "тази публикация пристига чрез имейл"
+      whisper: "този пост е отбелязан като таен за модераторите"
+      archetypes:
+        save: 'Запазете опциите'
+      few_likes_left: "Благодарим за споделянето на любовта Ви! Вие имате право на само още няколко харесвания за днес."
+      controls:
+        reply: "започни отговор на тази публикация"
+        like: "харесай тази публикация"
+        has_liked: "Вие харесахте тази публикация"
+        undo_like: "премахни харесването"
+        edit: "редактирай тази публикация"
+        edit_anonymous: "Съжаляваме, но трябва да сте логнат, за да редактирате. "
+        flag: "скрито сигнализирайте за публикацията, за да ѝ бъде обърнато внимание или изпратете скрито известие за нея"
+        delete: "изтрий тази публикация"
+        undelete: "възстановете тази публикация"
+        share: "сподели връзка към публикацията"
+        more: "Повече"
+        admin: "действия на админа на публикации"
+        wiki: "Направи Wiki съобщение"
+        unwiki: "Премахни Wiki съобщение"
+        convert_to_moderator: "Добави цвят за екипа "
+        revert_to_regular: "Премахни цвета на екипа "
+        rebake: "Прегенерирай HTML "
+        unhide: "Покажи "
+        change_owner: "Смени Правомощията"
+      actions:
+        flag: 'Сигнал'
+        undo:
+          off_topic: "Отмени сигнала"
+          spam: "Отмени сигнала "
+          inappropriate: "Отмени сигнала"
+          bookmark: "Отмени отметката"
+          like: "Отмен харесването "
+          vote: "Отмени гласуването "
+        people:
+          off_topic: "отбелязан като оф-топик"
+          spam: "отбелязан като спам"
+          inappropriate: "отбелязан като неприемлив"
+          notify_moderators: "съобщено на модераторите"
+          notify_user: "изпрати съобщение"
+          bookmark: "маркирай това"
+          like: "хареса това"
+          vote: "гласува за това"
+        by_you:
+          off_topic: "Маркирахте това като извън темата"
+          spam: "Маркирахте това като спам"
+          inappropriate: "Маркирахте това като неприлично"
+          notify_moderators: "Маркирахте това за модерация"
+          notify_user: "Изпратихте лично съобщение на този потребител"
+          bookmark: "Сложихте тази публикация в Отметки"
+          like: "Вие харесахте това"
+          vote: "Гласувахте за тази публикация"
+        by_you_and_others:
+          off_topic:
+            one: Вие и още 1 човек маркирахте това извън темата
+            other: Вие и още {{count}} човека маркирахте това извън темата
+          spam:
+            one: Вие и още 1 човек маркирахте това като спам
+            other: Вие и още {{count}} човека маркирахте това като спам
+          inappropriate:
+            one: Вие и още 1 човек маркирахте това като неприлично
+            other: Вие и още {{count}} човека маркирахте това като неприлично
+          notify_moderators:
+            one: Вие и още 1 човек маркирахте това за модерация
+            other: Вие и още {{count}} човека маркирахте това за модерация
+          notify_user:
+            one: Вие и още 1 човек изпратихте лично съобщение на този потребител
+            other: Вие и още {{count}} човека изпратихте лично съобщение на този потребител
+          bookmark:
+            one: Вие и още 1 човек сложихте тази публикация отметки
+            other: Вие и още {{count}} човека сложихте тази публикация в Отметки
+          like:
+            one: Вие и още 1 човек харесвате това
+            other: Вие и още {{count}} човека харесахте това
+          vote:
+            one: Вие и още 1 човек гласувахте за тази публикация
+            other: Вие и още {{count}} човека гласувахте за тази публикация
+        by_others:
+          off_topic:
+            one: 1 човек маркира това като извън темата
+            other: '{{count}} човека маркираха това като извън темата'
+          spam:
+            one: 1 човек маркира това като спам
+            other: '{{count}} човека маркираха това като спам'
+          inappropriate:
+            one: 1 човек маркира това като неприлично
+            other: '{{count}} човека маркираха това като неприлично'
+          notify_moderators:
+            one: 1 човек маркира това за модерация
+            other: '{{count}} човека маркираха това за модерация'
+          notify_user:
+            one: 1 човек изпрати съобщение на този потребител
+            other: '{{count}} човека изпратиха лично съобщение на този потребител'
+          bookmark:
+            one: 1 човек сложи този публикация в отметки
+            other: '{{count}} човека сложиха този публикация в отметки'
+          like:
+            one: 1 човек харесва тази публикация
+            other: '{{count}} човека харесват тази публикация'
+          vote:
+            one: 1 човек гласува за тази публикация
+            other: '{{count}} човека гласуваха за тази публикация'
+      revisions:
+        controls:
+          first: "Първа ревизия"
+          previous: "Предишна ревизия"
+          next: "Следваща ревизия"
+          last: "Последна ревизия"
+          hide: "Скрий ревизията"
+          show: "Покажи ревизията"
+          revert: "Връщане към тази редакция"
+          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> <i class='fa fa-arrows-h'></i> <strong>{{current}}</strong> / {{total}}"
+        displays:
+          inline:
+            title: "Покажи съобщение с включени допълнения и заличавания. "
+          side_by_side:
+            title: "Покажи разликите side-by-side  "
+          side_by_side_markdown:
+            title: "Покажи разликите на неподправения източник side-by-side "
+    category:
+      can: 'can&hellip;'
+      none: '(без категория)'
+      all: 'Всички категории'
+      choose: 'Изберете категория&hellip; '
+      edit: 'редкация '
+      edit_long: "Редакция"
+      view: 'Покажи темите в категория '
+      general: 'Основни'
+      settings: 'Настройки'
+      topic_template: "Шаблон на темата"
+      tags: "Етикети"
+      tags_allowed_tags: "Само тези етикети са позволени да се използват в тази категория:"
+      tags_allowed_tag_groups: "Само етикети от тези групи да се използват в тази категория:"
+      tags_placeholder: "(По желание) списък на позволените етикети"
+      delete: 'Изтрий категорията'
+      create: 'Нова категория'
+      create_long: 'Създай нова категория'
+      save: 'Запази категорията'
+      slug: 'Описателно име за URL '
+      slug_placeholder: '(Опционално) пунктирани думи за url '
+      creation_error: Възникна грешка при създаването на категория.
+      save_error: Възникна грешка при запазването на категорията.
+      name: "Име на категорията"
+      description: "Описание"
+      topic: "предмет на категорията"
+      logo: "Изображение за категория "
+      background_image: "Изображение за фон на категорията "
+      badge_colors: "Цветове на значките"
+      background_color: "Цвят на фона"
+      foreground_color: "Цвят на преден план"
+      name_placeholder: "Максимум една или две думи"
+      color_placeholder: "Някакъв уеб цвят "
+      delete_confirm: "Сигурни ли сте, че искате да изтриете тази категория? "
+      delete_error: "Възникна грешка по време на изтриването на категорията. "
+      list: "Списък Категории "
+      no_description: "Моля, добавете описание за тази категория. "
+      change_in_category_topic: "Редактирай Описанието "
+      already_used: 'Този цвят вече е използван за друга категория. '
+      security: "Сигурност"
+      special_warning: "Внимание: Тази категория е предварително семена категория и настройките й за сигурност не могат да се променят. Ако не искате да използвате тази категория, изтрийте темата си, вместо да я местите в категорията по предназначение."
+      images: "Изображения"
+      email_in: "Персонализиран входящ имейл адрес: "
+      email_in_allow_strangers: "Приемай имейли от анонимни потребители, които нямат регистрация"
+      email_in_disabled: "Публикуването на нови теми чрез имейл е забранено от настройките на сайта.  За да разрешите публикуването на нови теми чрез имейл,"
+      email_in_disabled_click: 'разрешете "email in" настройката '
+      allow_badges_label: "Разрешете използването на значки в тази категория. "
+      edit_permissions: "Редакция на достъпа"
+      add_permission: "Добави позволение "
+      this_year: "тази година "
+      position: "позиция "
+      default_position: "Позиция по подразбиране "
+      position_disabled: "Категорията ще се показва в ред на активност. За да контролирате реда на категориите в списъците, "
+      position_disabled_click: 'Разреши "fixed category positions" настройка '
+      minimum_required_tags: 'Минимален брой етикети на тема'
+      parent: "Главна категория"
+      notifications:
+        watching:
+          title: "Наблюдаване"
+          description: "Вие ще наблюдавате всички нови теми в тези категории. Ще бъдете информирани за всеки нов пост във всяка тема, и броят на отговорите ще ви бъде показан."
+        watching_first_post:
+          title: "Наблюдаване на Първа Публикация"
+        tracking:
+          title: "Следене"
+        regular:
+          title: "Нормален"
+          description: "Ще ви уведобим, ако някой ви отговори или спомене вашето @име"
+        muted:
+          title: "Заглушени"
+          description: "Вие никога няма да бъде уведомен за нови теми в тези категории, и те няма да се появят в най-нови."
+      sort_options:
+        likes: "Харесвания"
+        views: "Преглеждания"
+        posts: "Публикации"
+        activity: "Активност"
+        posters: "Автори"
+        category: "Категория"
+        created: "Създадени"
+      sort_ascending: 'В възходящ ред'
+      sort_descending: 'В низходящ ред'
+      subcategory_list_styles:
+        rows: "Редове"
+        rows_with_featured_topics: "Редове с представени теми"
+        boxes: "Кутии"
+        boxes_with_featured_topics: "Кутии с представени теми"
+    flagging:
+      title: 'Благодарим ви, че помагате да поддържаме дискусията цивилизована!'
+      action: 'Сигнализирай публикацията '
+      take_action: "Предприеми действие "
+      notify_action: 'Съобщение'
+      official_warning: 'Официално предупреждение'
+      delete_spammer: "Изтрий спамера "
+      yes_delete_spammer: "Да, изтрий спамера"
+      ip_address_missing: "(N/A)"
+      hidden_email_address: "(скрит)"
+      submit_tooltip: "Пусни скрит сигнал"
+      take_action_tooltip: "Достигнете границата от сигнали веднага, вместо да чакате за още сигнали от общността"
+      cant: "Не може да сигнализирате за тази публикация в момента."
+      notify_staff: 'Съобщи лично на екипа'
+      formatted_name:
+        off_topic: "Не е по темата"
+        inappropriate: "Неподходяща е"
+        spam: "Съдържа спам"
+      custom_placeholder_notify_user: "Бъдете точни, конструктивни и учтиви."
+      custom_placeholder_notify_moderators: "Споделете ни какви точно са Вашите притеснения и ако е възможно ни дайте съответните връзки или примери, които имат отношение по темата."
+    flagging_topic:
+      title: "Благодарим ви, че помагате да поддържаме дискусията цивилизована."
+      action: "Сигнализирай темата"
+      notify_action: "Съобщение"
+    topic_map:
+      title: "Резюме на темата"
+      participants_title: "Чести автори"
+      links_title: "Популярни връзки"
+      links_shown: "покажи повече адреси..."
+      clicks:
+        one: 1 кликване
+        other: '%{count} кликвания'
+    topic_statuses:
+      warning:
+        help: "Това е официално предупреждение."
+      bookmarked:
+        help: "Сложихте тази публикация в Отметки"
+      locked:
+        help: "Тази тема е затворена; в нея не може да бъде публикувано."
+      archived:
+        help: "Тази тема е архивирана; не може да бъде променяна."
+      locked_and_archived:
+        help: "Тази тема е затворена и архивирана; тя вече не приема нови отговори и не може да се променя"
+      unpinned:
+        title: "Откована"
+        help: "Тази тема е откована за Вас, тя ще се показва в стандартен ред "
+      pinned_globally:
+        title: "Закована глобално"
+        help: "Тази тема е глобално закована; тя ще се покаже в горната част на най-новите и в нейната категория"
+      pinned:
+        title: "Закована"
+        help: "Тази тема е закована за Вас, тя ще се показва в началото на категорията "
+      invisible:
+        help: "Тази тема е скрита; не се появява в списъка с теми и може да бъде достъпна само с директен линк."
+    posts: "Публикации"
+    posts_long: "има {{number}} публикации в тази тема"
+    posts_likes_MF: |
+      Тази тема има {count, plural, one {1 reply} other {# replies}} {ratio, select,
+      low {with a high like to post ratio}
+      med {with a very high like to post ratio}
+      high {with an extremely high like to post ratio}
+      other {}}
+    original_post: "Оригинална публикация"
+    views: "Прегледи"
+    views_lowercase:
+      one: преглед
+      other: прегледи
+    replies: "Отговори"
+    activity: "Активност"
+    likes: "Харесвания"
+    likes_lowercase:
+      one: харесване
+      other: харесвания
+    likes_long: "има {{number}} харесвания в тази тема"
+    users: "Потребители"
+    users_lowercase:
+      one: потребител
+      other: потребители
+    category_title: "Категория"
+    history: "История"
+    changed_by: "от {{author}}"
+    raw_email:
+      title: "Входяща поща"
+      not_available: "Не е наличен!"
+    categories_list: "Списък с категории"
+    filters:
+      with_topics: "%{filter} теми"
+      with_category: "%{filter} %{category} теми"
+      latest:
+        title: "Последни"
+        title_with_count:
+          one: Последен (1)
+          other: Последни ({{count}})
+        help: "теми със скорошни публикации"
+      hot:
+        title: "Горещи"
+        help: "Селекция от най-горещите теми"
+      read:
+        title: "Прочети"
+        help: "прочетени теми по реда на прочитане"
+      search:
+        title: "Търсене"
+        help: "търси във всички теми"
+      categories:
+        title: "Категории"
+        title_in: "Категория - {{categoryName}}"
+        help: "всички теми групирани по категория"
+      unread:
+        title: "Непрочетени"
+        title_with_count:
+          one: Непрочетен (1)
+          other: Непрочетени ({{count}})
+        help: "теми които гледате или следите, с непрочетени публикации"
+        lower_title_with_count:
+          one: 1 непрочетен
+          other: '{{count}} непрочетени'
+      new:
+        lower_title_with_count:
+          one: 1 нов
+          other: '{{count}} нови'
+        lower_title: "нови"
+        title: "Нов"
+        title_with_count:
+          one: Нов (1)
+          other: Нови ({{count}})
+        help: "теми създадени през последните няколко дни"
+      posted:
+        title: "Моите публикации"
+        help: "теми в които сте публикували"
+      bookmarks:
+        title: "Отметки"
+        help: "теми, които сте отбелязали в Отметки"
+      category:
+        title: "{{categoryName}}"
+        title_with_count:
+          one: '{{categoryName}} (1)'
+          other: '{{categoryName}} ({{count}})'
+        help: "последни теми в категория {{categoryName}}"
+      top:
+        title: "Топ"
+        help: "Най-активни теми в последната година, месец, седмица или ден"
+        all:
+          title: "От началото"
+        yearly:
+          title: "Годишно"
+        quarterly:
+          title: "Тримесечно"
+        monthly:
+          title: "Месечно"
+        weekly:
+          title: "Седмично"
+        daily:
+          title: "Дневно"
+        all_time: "От началото"
+        this_year: "Година"
+        this_quarter: "Тримесечие"
+        this_month: "Месец"
+        this_week: "Седмица"
+        today: "Днес"
+        other_periods: "виж отгоре"
+    browser_update: 'За съжаление, <a href="http://www.discourse.org/faq/#browser">вашият браузър е твърде стар, за да работи с този сайт</a>. Моля, <a href="http://browsehappy.com">обновете вашия браузър</a>.'
+    permission_types:
+      full: "Създай / Отговори / Виж"
+      create_post: "Отговари / Виж"
+      readonly: "Виж"
+    lightbox:
+      download: "изтегли"
+    keyboard_shortcuts_help:
+      title: 'Бързи клавиши'
+      jump_to:
+        title: 'Премини към'
+      navigation:
+        title: 'Навигация'
+        up_down: '<b>k</b>/<b>j</b> Преместване на селекцията &uarr; &darr;'
+        open: '<b>o</b> or <b>Enter</b> Отворяне на избраната тема'
+        next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> Следваща/Предишна секция '
+      application:
+        title: 'Приложение'
+        create: '<b>c</b> Създайте нова тема'
+        notifications: '<b>n</b> Отворяне на известията'
+        hamburger_menu: '<b>=</b> Отворяне на хамбургерното менюто'
+        user_profile_menu: '<b>p</b> Отваряне на потребителското меню'
+        show_incoming_updated_topics: '<b>.</b> Показване на обновените теми'
+        search: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Отписване'
+        help: '<b>?</b> Помощ с клавиатурата '
+        dismiss_new_posts: '<b>x</b>, <b>r</b> Отхвърляне на Нова/Публикации'
+        dismiss_topics: '<b>x</b>, <b>t</b> Отхвърляне на темите'
+        log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Отписване'
+      composing:
+        title: 'Съставяне'
+        return: '<b>shift</b>+<b>c</b> Връщане към редактора'
+      actions:
+        title: 'Действия'
+        share_post: '<b>s</b> Споделете публикация'
+        reply_topic: '<b>shift</b>+<b>r</b> Отговорете на тема'
+        reply_post: '<b>r</b> Отговорете на публикация'
+        mark_watching: '<b>m</b>, <b>w</b> Наблюдаване на темата'
+    badges:
+      title: Значки
+      allow_title: "Може да използвате тази значка като титла."
+      successfully_granted: "Успешно дадохте %{badge}на %{username}"
+      badge_grouping:
+        trust_level:
+          name: Ниво на Доверие
+    tagging:
+      all_tags: "Всички тагове"
+      other_tags: "Други тагове"
+      selector_all_tags: "всички тагове"
+      selector_no_tags: "няма тагове"
+      changed: "променени тагове:"
+      tags: "Тагове"
+      choose_for_topic: "етикети по желание"
+      delete_tag: "Изтрийте таг"
+      manage_groups_description: "Дефинирай групи за организране на етикетите"
+      notifications:
+        watching:
+          title: "Наблюдаване"
+          description: "Вие автоматично ще следите всички теми с този таг. Ще бъдете информиран за всички нови публикации и теми, и броят на непрочетените и новите публикации ще бъде показан до съответната тема. "
+        watching_first_post:
+          title: "Наблюдаване на първа публикация"
+          description: "Ще бъдете уведомени за първата публикация във всяка нова тема с този етикет."
+        tracking:
+          title: "Следене"
+          description: "Автоматично ще следите всички теми с този етикет. Броя на непрочетените и новите публикации ще се появява до темата."
+        regular:
+          title: "Редовен"
+          description: "Ще бъдете уведомен, ако някой спомене вашето @име или отговори на Ваша публикация."
+        muted:
+          title: "Заглушен"
+          description: "Няма да бъдете уведомявани относно нови теми с този етикет и те няма да се появяват в 'непрочетени'. "
+      groups:
+        title: "Групи етикети"
+        about: "Добавете етикетите към групи за да управлявате по-лесно."
+        tags_label: "Етикети в тази група:"
+        parent_tag_description: "Етикетите от тази група не могат да бъдат използвани, освен ако го има родителският етикет"
+        everyone_can_use: "Етикетите могат да се използват от всички"
+        usable_only_by_staff: "Етикетите са видими за всички, но само персонал може да ги използва"
+        visible_only_to_staff: "Етикетите са видими само за персонала"
+      topics:
+        none:
+          search: "Няма резултати от търсенето."
+        bottom:
+          read: "Няма повече прочетени теми."
+          new: "Няма повече нови теми."
+          unread: "Няма повече непрочетени теми."
+          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:
+      title: 'Discourse Админ'
+      moderator: 'Модератор'
+      dashboard:
+        title: "Работен плот"
+        last_updated: "Последно обновяване на плота"
+        version: "Версия"
+        up_to_date: "Вие сте с последна версия!"
+        critical_available: "Налична е важна актуализация."
+        updates_available: "Налична е актуализация."
+        please_upgrade: "Моля, обновете!"
+        no_check_performed: "Не е направена проверка за нова версия. Убедете се, че sidekiq работи."
+        stale_data: "Скоро не е правена проверка за нова версия. Убедете се, че sidekiq работи."
+        version_check_pending: "Изглежда, че скоро сте обновили версията. Това е чудесно!"
+        installed_version: "Инсталирани"
+        latest_version: "Последни"
+        problems_found: " Открити са някои проблеми при Вашата инсталация на Discourse:"
+        last_checked: "Последна проверка"
+        refresh_problems: "Обнови"
+        no_problems: "Не бяха открити проблеми."
+        moderators: 'Модератори:'
+        admins: 'Админи:'
+        suspended: 'Отстранени:'
+        private_messages_short: "Съобщения"
+        private_messages_title: "Съобщения"
+        mobile_title: "Мобилен"
+        space_free: "{{size}} свободни"
+        uploads: "качвания"
+        backups: "бекъпи"
+        traffic_short: "Трафик"
+        traffic: "Приложение уеб заявки"
+        show_traffic_report: "Покажи детайлен репорт на трафика"
+        reports:
+          today: "Днес"
+          yesterday: "Вчера"
+          all_time: "От началото"
+          7_days_ago: "Преди 7 дни"
+          30_days_ago: "Преди 30 дни"
+          all: "Всички"
+          view_table: "таблица"
+          refresh_report: "Обнови доклада"
+          start_date: "Начална дата"
+          end_date: "Крайна дата"
+          groups: "Всички групи"
+      commits:
+        latest_changes: "Последни промени: моля обновявайте често! "
+        by: "от"
+      flags:
+        title: "Сигнали"
+        agree: "Съгласен"
+        agree_title: "Потвърдете този сигнал като валиден и коректен"
+        agree_flag_hide_post_title: "Скрий тази публикация и автоматично изпрати съобщение към потребителия спешно да я редактира."
+        agree_flag_restore_post: "Съгласен (възстанови публикацията) "
+        agree_flag_restore_post_title: "Възстанови тази публикация така че всички потребители да могат да я виждат."
+        agree_flag_suspend: "Преустанови потребител"
+        delete: "Изтрий"
+        delete_title: "Изтрий публикацията, за която се отнася този сигнал."
+        delete_post_defer_flag_title: "Изтрий публикацията; ако е първа, изтрий темата"
+        delete_post_agree_flag_title: "Изтрий публикацията; ако е първа, изтрий темата"
+        delete_flag_modal_title: "Изтрий и..."
+        delete_spammer: "Изтрий спамера "
+        delete_spammer_title: "Премахни потребителя и всички негови теми и публикации."
+        disagree_flag_unhide_post: "Не съм съгласен (покажи публикация) "
+        disagree_flag_unhide_post_title: "Премахни сигнала от тази публикация и я направи отново видима"
+        disagree_flag: "Не съм съгласен "
+        disagree_flag_title: "Отхвърли този сигнал като неправилен и невалиден"
+        clear_topic_flags: "Готово"
+        clear_topic_flags_title: "Темата е проверена и проблемите са разрешени. Натиснете Готово, за да премахнете сигнала. "
+        more: "(още отговори...) "
+        dispositions:
+          agreed: "съгласен"
+          disagreed: "не съм съгласен"
+        flagged_by: "Сигнализирано от"
+        resolved_by: "Разрешено от "
+        took_action: "Предприеми действие "
+        system: "Система "
+        error: "Нещо се обърка"
+        reply_message: "Отговори"
+        topic_flagged: "Има сигнал за тази <strong>тема/strong>."
+        visit_topic: "Посети темата за предприемане на действия "
+        was_edited: "Публикацията беше редактирана след първия сигнал"
+        previous_flags_count: "За тази публикация беше сигнализирано {{count}} пъти"
+      groups:
+        manage:
+          interaction:
+            visibility: Видимост
+            visibility_levels:
+              public: "Всички"
+          membership:
+            trust_level: Ниво на Доверие
+            trust_levels_title: "Нивото на доверие, което се предоставя автоматично на членовете, когато бъдат добавени:"
+        primary: "Главна група"
+        no_primary: "(няма главна група)"
+        title: "Групи"
+        edit: "Редакция на групи"
+        refresh: "Обнови"
+        about: "Редактирайте членството в групата и имената.  "
+        group_members: "Членове на групата"
+        delete: "Изтрий"
+        delete_confirm: "Изтрий тази група?"
+        delete_failed: "Не можете да изтриете група. Ако това е автоматична група, тя не може да бъде премахната."
+        delete_owner_confirm: "Махни шефските права на '%{username}'?"
+        add: "Добави "
+        custom: "По избор"
+        automatic: "Автоматично"
+        group_owners: Собственици
+        add_owners: Добави собственик
+      api:
+        generate_master: "Генерирай главен API ключ"
+        none: "Няма активни API ключове в момента."
+        user: "Потребител"
+        title: "API"
+        key: "API ключ"
+        generate: "Генраирай"
+        regenerate: "Регенерирай"
+        revoke: "Анулирай"
+        confirm_regen: "Сигурни ли сте, че искате да замените текущия API ключ с нов ? "
+        confirm_revoke: "Сигурни ли сте, че искате да анулирате този ключ? "
+        info_html: "Вашият API ключ ще ви разреши да създавате и обновявате темите чрез JSON извиквания. "
+        all_users: "Всички потребители"
+        note_html: "Запазете този ключ <strong>secret</strong>, всички потребители които го имат ще може да правят публикации от всеки потребител. "
+      web_hooks:
+        save: "Запази"
+        destroy: "Изтрий"
+        description: "Описание"
+        post_event:
+          details: "Когато има нов отговор, редакция, изтриване или възстановяване."
+      plugins:
+        title: "Приставки"
+        installed: "Инсталирани приставки"
+        name: "Име"
+        none_installed: "Нямате инсталирани приставки."
+        version: "Версия"
+        enabled: "Да е включен?"
+        is_enabled: "Y "
+        not_enabled: "N "
+        change_settings: "Промени Настройките"
+        change_settings_short: "Настройки"
+        howto: "Как да инсталирам софтуерни приставки?"
+      backups:
+        title: "Бекъп"
+        menu:
+          backups: "Бекъпи"
+          logs: "Логове"
+        none: "Не е наличен бекъп."
+        read_only:
+          enable:
+            title: "Включване на read-only режим"
+            label: "Включване на read-only"
+            confirm: "Сигурни ли сте, че искате да включите режим read-only"
+          disable:
+            title: "Изключване на read-only режим"
+            label: "Изключване на read-only"
+        logs:
+          none: "Все още няма логове..."
+        columns:
+          filename: "Име на файла"
+          size: "Размер"
+        upload:
+          label: "Качи"
+          title: "Качи бекъп за тази инстанция"
+          uploading: "Качва се..."
+          error: "Появи се грешка при качването на  '{{filename}}': {{message}}"
+        operations:
+          is_running: "В момента се изпълнява задача..."
+          failed: "Задачата се провали. Моля проверете логовете."
+          cancel:
+            label: "Прекрати"
+            title: "Прекрати моментната задача"
+            confirm: "Сигурни ли сте, че искате да прекратите моментната задача?"
+          backup:
+            label: "Бекъп"
+            title: "Създай бекъп"
+            confirm: "Искате ли да започнете нов бекъп?"
+          download:
+            label: "Изтегли"
+          destroy:
+            title: "Премахни бекъпа"
+            confirm: "Сигурни ли сте, че искате да унищожите бекъпа?"
+          restore:
+            is_disabled: "Възстановяването е забранено от настройките на сайта. "
+            label: "Възстанови "
+            title: "Възстанови  бекъпа"
+            confirm: "Вигурен ли си, че искаш да възтановиш този бекъп?"
+          rollback:
+            label: "Върни старата "
+            title: "Върни базата към последното ѝ работещо състояние"
+            confirm: "Сигурен ли си, че искаш да върнеш базата до предишното и работещо състояние?"
+      export_csv:
+        success: "Експорта е стартиран, Вие ще бъдете информирани чрез лично съобщение когато процесът завърши."
+        failed: "Експорта се провали. Моля, проверете логовете. "
+        button_text: "Експорт "
+        button_title:
+          user: "Експортирайте списъка с потребители в CSV файл. "
+          staff_action: "Експортирайте пълния списък с действия на екипа в CSV файл. "
+          screened_email: "Експортирайте пълния прегледан имейл лист в CSV файл."
+          screened_ip: "Експортирайте пълния прегледан IP лист в CSV файл. "
+          screened_url: "Експортирайте пълният прегледан URL лист в CSV файл. "
+      export_json:
+        button_text: "Експорт"
+      invite:
+        button_text: "Изпрати поканите"
+        button_title: "Изпрати поканите"
+      customize:
+        title: "Персонализация"
+        long_title: "Персонализация на сайта"
+        preview: "преглед"
+        save: "Запази"
+        new: "Нов"
+        new_style: "Нов стил"
+        import: "Импорт"
+        delete: "Изтрий"
+        about: "Променете CSS стиловете и HTML хедърите на сайта. Добавете нова настройка за да започнете."
+        color: "Цвят"
+        opacity: "Прозрачност"
+        copy: "Копирай"
+        email_templates:
+          title: "Мейл шаблони"
+          subject: "Тема"
+          multiple_subjects: "Този мейл шаблон има няколко теми."
+          body: "Тяло"
+          none_selected: "Избери мейл шаблон за да започнеш редактирането."
+          revert: "Върни промените"
+          revert_confirm: "Сигурен ли си, че искаш да върнеш промените?"
+        colors:
+          title: "Цветове"
+          long_title: "Цветови схеми"
+          new_name: "Нова цветова схема"
+          copy_name_prefix: "Копие на"
+          delete_confirm: "Изтриване на тази цветова схема?"
+          undo: "отмени"
+          undo_title: "Върнете промените направени на този цвят до последно запазените."
+          revert: "върни"
+          revert_title: "Върни този цвят до стандартните настройки."
+          primary:
+            name: 'главен'
+            description: 'Повече от текстовете, икони и граници '
+          secondary:
+            name: 'второстепенен'
+            description: 'Основен цвят на фона и цвят на някой бутони.'
+          tertiary:
+            name: 'трети'
+            description: 'Връзки, някои бутони, известия и цветове за акцентиране.'
+          quaternary:
+            name: "четвърти"
+            description: "Връзки за навигация."
+          header_background:
+            name: "Фон на хедъра"
+            description: "Цвят на фона на хедъра на сайта."
+          header_primary:
+            name: "главен хедър"
+            description: "Текстове и икони в хедъра на сайта."
+          highlight:
+            name: 'подчертаване'
+            description: 'Фонов цвят на подчертани елементи на страницата, като публикации и теми.'
+          danger:
+            name: 'опасност'
+            description: 'Цвят за подчертаване на действия, като изтриване на темата.'
+          success:
+            name: 'успех'
+            description: 'Използва се за индикация при успешно действие.'
+          love:
+            name: 'любов'
+            description: "Цвят на бутона харесвам. "
+      email:
+        title: "Имейли"
+        settings: "Настройки"
+        templates: "Шаблони"
+        preview_digest: "Преглед на справочника"
+        sending_test: "Изпраща се тестов имейл..."
+        error: "<b>ГРЕШКА</b> - %{server_error}"
+        test_error: "Проблем при изпращането на пробния имейл. Моля, проверете настройките на имейла, вижте дали хостът не блокира имейл връзката и пробвайте отново."
+        sent: "Изпрати"
+        skipped: "Пропусни"
+        received: "Получени"
+        rejected: "Отхвърлени"
+        sent_at: "Изпратен в "
+        time: "Време "
+        user: "Потребител "
+        email_type: "Тип Имейл"
+        to_address: "До адрес "
+        test_email_address: "имейл адрес за тест "
+        send_test: "Изпрати тестов имейл "
+        sent_test: "изпратено!"
+        delivery_method: "Метод за доставяне "
+        preview_digest_desc: "Преглед на съдържанието на имейлите, изпратени до неактивните потребители."
+        refresh: "Опресни"
+        format: "Формат"
+        html: "html"
+        text: "текст"
+        last_seen_user: "Последно видян потребител: "
+        no_result: "Не са намерени резултати за резюмиране."
+        reply_key: "Ключов отговор "
+        skipped_reason: "Пропусни причина "
+        incoming_emails:
+          from_address: "От"
+          to_addresses: "До"
+          cc_addresses: "Cc"
+          subject: "Тема"
+          error: "Грешка"
+          none: "Няма намерени входящи писма"
+          modal:
+            title: "Детайли за входящо писмо"
+            error: "Грешка"
+            headers: "Хедъри"
+            subject: "Тема"
+            body: "Тяло"
+            rejection_message: "Отхвърлено писмо"
+          filters:
+            from_placeholder: "from@example.com"
+            to_placeholder: "to@example.com"
+            cc_placeholder: "cc@example.com"
+            subject_placeholder: "Тема..."
+            error_placeholder: "Грешка"
+        logs:
+          none: "Няма налични логове "
+          filters:
+            title: "Филтер"
+            user_placeholder: "потребителско име "
+            address_placeholder: "name@example.com"
+            type_placeholder: "дайджест, регистрация"
+            reply_key_placeholder: "reply key "
+            skipped_reason_placeholder: "причина"
+      logs:
+        title: "Логове"
+        action: "Действия"
+        created_at: "Създадени"
+        last_match_at: "Последно съвпадение"
+        match_count: "Съвпадения"
+        ip_address: "IP "
+        topic_id: "Тема ID "
+        post_id: "Публикация ID "
+        category_id: "ID на категорията"
+        delete: 'Изтрий'
+        edit: 'Редактирай'
+        save: 'Запази '
+        screened_actions:
+          block: "Блокирай "
+          do_nothing: "Не прави нищо "
+        staff_actions:
+          title: "Действия на персонала"
+          clear_filters: "Покажи всичко  "
+          staff_user: "Член на персонала"
+          target_user: "Целеви потребител "
+          subject: "Тема "
+          when: "Кога "
+          context: "Контекст "
+          details: "Детайли "
+          previous_value: "Предишни"
+          new_value: "Нови "
+          diff: "Разлика "
+          show: "Покажи "
+          modal_title: "Детайли"
+          no_previous: "Няма предишна стойност. "
+          deleted: "Няма нова стойност. Записът беше изтрит. "
+          actions:
+            delete_user: "изтрий потребител "
+            change_trust_level: "променете нивото на доверие "
+            change_username: "Смяна на потребителкото име"
+            change_site_setting: "промени настройките на сайта "
+            change_site_text: "промени текста на сайта"
+            suspend_user: "отстрани потребител "
+            unsuspend_user: "Върни отстранения потребител "
+            grant_badge: "присъедини значка "
+            revoke_badge: "премахни значка "
+            check_email: "провери имейл "
+            delete_topic: "изтрий темата "
+            recover_topic: "възстанови темата"
+            delete_post: "изтрий публикацията "
+            impersonate: "представи "
+            anonymize_user: "анинимизирай потребител"
+            roll_up: "върнете IP blocks"
+            change_category_settings: "промени настройките на категорията"
+            delete_category: "изтрий категория"
+            create_category: "създай директория"
+            silence_user: "заглуши потребителя"
+            grant_admin: "направи админ"
+            revoke_admin: "премахни админ"
+            grant_moderation: "позволи модерация"
+            revoke_moderation: "отмени модерация"
+            backup_create: "Създай бекъп"
+            deleted_tag: "изтрит таг"
+            renamed_tag: "преименуван таг"
+            lock_trust_level: "заключи нивото на доверие"
+            unlock_trust_level: "отключи нивото на доверие"
+            activate_user: "активиране на потребителя"
+            deactivate_user: "деактивиране на потребителя"
+            backup_download: "сваляне на архивираното копие"
+            reviewed_post: "прегледал поста"
+            post_locked: "публикацията е заключена"
+            post_unlocked: "публикацията е отключена"
+            check_personal_message: "провери лично съобщение"
+            disabled_second_factor: "деактивиране на двуфакторното удостоверяване"
+            topic_published: "темата е пубикувана"
+            post_approved: "публикацията е одобрена"
+            create_badge: "създай значка"
+            change_badge: "промени значката"
+            delete_badge: "изтрий значката"
+        screened_emails:
+          title: "Проверени имейли"
+          description: "Когато някой се опита да създаде нов профил, следните имейл адреси ще бъдат проверени и регистрацията ще бъде отказана или ще бъде предприето друго действие."
+          email: "Имейл адрес"
+          actions:
+            allow: "Позволи"
+        screened_urls:
+          title: "Проверени URL-та"
+          description: "Адресите тук са използвани от потребители, идентифицирани като спамери."
+          url: "URL"
+          domain: "Домейн"
+        screened_ips:
+          title: "Проверени IP-та"
+          description: 'IP-та, които са наблюдавани. Използвайте "Позволи", за да ги сложите в  списъка с разрешени. '
+          delete_confirm: "Сигурни ли сте, че искате да премахнете правилото за %{ip_address}? "
+          roll_up_confirm: "Сигурни ли сте, че искате да обедените често проверените IP адреси в подмрежи?"
+          rolled_up_some_subnets: "Успешно групирани IP бан записи към следните подмрежи: %{subnets}. "
+          rolled_up_no_subnet: "Няма нищо за обединяване. "
+          actions:
+            block: "Блокирай"
+            do_nothing: "Позволи"
+            allow_admin: "Разреши Админ "
+          form:
+            label: "Нов:"
+            ip_address: "IP адрес"
+            add: "Добави"
+            filter: "Търсене"
+          roll_up:
+            text: "Свиване"
+            title: "Създава нов бан на подмрежа ако има най-малко 'min_ban_entries_for_roll_up' записи. "
+        search_logs:
+          title: "Търсене в логовете"
+          term: "Термин"
+          searches: "Търсения"
+          click_through: "Посещения"
+          unique: "Уникални"
+          unique_title: "уникални потребители извършващи търсенето"
+          types:
+            full_page: "Пълна страница"
+        logster:
+          title: "Логове с грешки"
+      watched_words:
+        title: "Наблюдавани думи"
+        search: "търсене"
+        clear_filter: "Изчисти"
+        show_words: "покажи думите"
+        actions:
+          block: 'Блокирай '
+          censor: 'Цензуриране'
+          require_approval: 'Изисквай одобрение'
+          flag: 'Сигнализиране'
+      impersonate:
+        title: "Представи"
+        help: "Използвайте този инструмент, за да предоставите потребителски профили за отстраняване на грешките. Трябва да излезете когато приключите."
+        not_found: "Този потребител не може да бъде намерен."
+        invalid: "Съжаляваме, не може да се представяте като този потребител."
+      users:
+        title: 'Потребители'
+        create: 'Добави админ'
+        last_emailed: "Последен имейл"
+        not_found: "Съжаляваме, това потребителско име не съществува при нас."
+        id_not_found: "Съжаляваме, това потребителско име не съществува при нас. "
+        active: "Активен"
+        show_emails: "Покажи имейла"
+        nav:
+          new: "Нови"
+          active: "Активни"
+          pending: "Чакащи"
+          staff: 'Персонал'
+          suspended: 'Отстранени'
+          suspect: 'Съмнителен '
+        approved: "Одобрен?"
+        approved_selected:
+          one: одобрен потребител
+          other: одобрени потребители  ({{count}})
+        reject_selected:
+          one: отхвърлен потребител
+          other: отхвърлени потребители ({{count}})
+        titles:
+          active: 'Активни потребители'
+          new: 'Нови потребители'
+          pending: 'Чакащи потребители'
+          newuser: 'Потребители с Ниво на доверие 0 (нов)'
+          basic: 'Потребители с Ниво на доверие 1 (основен)'
+          member: 'Потребители с Ниво за сигурност 2 (Членове)'
+          regular: 'Потребители с Ниво за сигурност 3 (Редовни)'
+          leader: 'Потребители с Ниво  на доверие 4 (лидер)'
+          staff: "Персонал "
+          admins: 'Админи'
+          moderators: 'Модератори'
+          suspended: 'Отстранени'
+          suspect: 'Съмнителни потребители '
+        reject_successful:
+          one: Отхвърлите 1 потребител.
+          other: Успешно отхвърлите %{count} потребителя.
+        reject_failures:
+          one: Не успяхте да отхвърлите 1 потребител.
+          other: Не успяхте да отхвърлите %{count} юзъра
+        not_verified: "Непроверен "
+        check_email:
+          title: "Разкрий имейла на този потребител"
+          text: "Покажи"
+      user:
+        suspend_failed: "Нещо се обърка при отстраняването на този потребител {{error}}"
+        unsuspend_failed: "Нещо се обърка при отстраняването на този потребител {{error}} "
+        suspend_duration: "За колко време потребителят ще бъде отстранен?"
+        suspend_reason_label: "Защо отстранявате? Този текст <b>ще бъде видим за всички</b> на профилната страница на потребителя и ще се показва на потребителя, когато направи опит да се логне. Бъдете кратки."
+        suspend_reason: "Причина"
+        suspended_by: "Отстранен от"
+        delete_all_posts: "Изтрий всички публикации. "
+        moderator: "Модератор? "
+        admin: "Админ? "
+        suspended: "Отстранен? "
+        staged: "Поставен?"
+        show_admin_profile: "Админ"
+        refresh_browsers: "Принудително опресняване на браузъра "
+        refresh_browsers_message: "Съобщението е изпратено до всички клиенти! "
+        show_public_profile: "Покажи публичния профил "
+        impersonate: 'Представени '
+        ip_lookup: "IP търсене "
+        log_out: "Изход "
+        logged_out: "Потребителя беше разлогнат от всички устройства "
+        revoke_admin: 'Анулирай Админ '
+        grant_admin: 'Грант Админ  '
+        revoke_moderation: 'Отстрани модерирането '
+        grant_moderation: 'Грант Модерация'
+        unsuspend: 'Върнат'
+        suspend: 'Отстрани '
+        reputation: Репутация
+        permissions: "Позволения "
+        activity: Активност
+        like_count: "Харесвания Дадени / Получени "
+        last_100_days: 'В последните 100 дни '
+        private_topics_count: Частни теми
+        posts_read_count: "Прочетени публикации "
+        post_count: "Създадени публикации "
+        topics_entered: "Прегледани теми "
+        flags_given_count: "Дадени сигнали "
+        flags_received_count: "Получени сигнали "
+        warnings_received_count: "Получени предупреждения "
+        flags_given_received_count: 'Сигнали Дадени / Получени '
+        approve: 'Одобри '
+        approved_by: "одобрено от "
+        approve_success: "Потребителят е одобрен и е изпратен имейл с инструкции за активиране. "
+        approve_bulk_success: "Готово! Всички избрани потребители бяха одобрени и информирани. "
+        time_read: "Време за прочитане "
+        anonymize: "Анинимизирай потребител"
+        anonymize_confirm: "Сигурни ли сте че искате да анонимизирате този акаунт? Това ще промени потребителското име, имейл адреса и информацията в профила."
+        anonymize_yes: "Да, анонимизирай този профил"
+        anonymize_failed: "Възникна грешка по време на анонимизирането на профила."
+        delete: "Изтрий потребител "
+        delete_forbidden_because_staff: "Админите и модераторите не могат да бъдат изтрити."
+        delete_posts_forbidden_because_staff: "Не могат да бъдат изтрити всички постове на администратори и модератори."
+        delete_forbidden:
+          one: Не може да изтривате потребители които имат публикации. Първо изтрийте всички публикации на този потребител и опитайте отново. (Публикации по стари от %{count} ден не може да бъдат изтривани)
+          other: 'Не може да изтривате потребители, които имат публикации. Първо изтрийте всички публикации на този потребител и опитайте отново. (Публикации по стари от %{count} дни не могат да бъдат изтрити.) '
+        cant_delete_all_posts:
+          one: Не може да изтриете всички публикации. Някои публикации са по стари от %{count} ден. (delete_user_max_post_age настройката)
+          other: 'Не може да изтриете всички публикации. Някои публикации са по стари от %{count} дни. (delete_user_max_post_age настройката) '
+        cant_delete_all_too_many_posts:
+          one: Не може да изтриете всички публикации защото този потребител има 1 публикация. (delete_all_posts_max)
+          other: 'Не може да изтриете всички публикации, защото този потребител има повече от %{count} публикации.(delete_all_posts_max) '
+        delete_confirm: "Сигурни ли сте, че искате да изтриете този потребител. Това е необратимо!"
+        delete_and_block: "Изтрийте и <b>блокирайте</b> този имейл и IP адрес "
+        delete_dont_block: "Изтрий само "
+        deleted: "Потребителя беше изтрит. "
+        delete_failed: "Възникна грешка при изтриването на този потребител. Първо се уверете, че всички негови публикации са изтрити и опитайте отново."
+        send_activation_email: "Изпрати активационен имейл "
+        activation_email_sent: "Изпратен е активационен имейл. "
+        send_activation_email_failed: "Възникна проблем при изпращането на друг активационен имейл. %{error} "
+        activate: "Активирай профила"
+        activate_failed: "Възникна проблем с активирането на потребителя. "
+        deactivate_account: "Деактивирай профила"
+        deactivate_failed: "Възникна проблем при деактивирането на потребителя. "
+        deactivate_explanation: "Деактивирания потребител трябва повторно да валидира неговия имейл. "
+        suspended_explanation: "Отстраненитят потребител не може да се логва . "
+        trust_level_change_failed: "Възникна проблем с промяната на потребителското ниво на доверие. "
+        suspend_modal_title: "Отстрани потребител"
+        trust_level_2_users: "Потребители с Ниво на доверие 2"
+        trust_level_3_requirements: "Изисквания за Ниво на доверие 3"
+        trust_level_locked_tip: "Нивото на доверие е заключено, системата не може да   насърчава или понижава потребителя "
+        trust_level_unlocked_tip: "Нивото на доверие е отключено, системата може да насърчава или понижава потребителя "
+        lock_trust_level: "Заключете системата с нива на доверие"
+        unlock_trust_level: "Отклчете системата с нива"
+        tl3_requirements:
+          title: "Изисквания за Ниво на доверие 3"
+          value_heading: "Стойност"
+          requirement_heading: "Изисквания"
+          visits: "Посещения "
+          days: "дни "
+          topics_replied_to: "Теми отговорени до"
+          topics_viewed: "Прегледани теми "
+          topics_viewed_all_time: "Прегледани теми (през цялото време) "
+          posts_read: "Прочетени публикации "
+          posts_read_all_time: "Прочетени публикации (през цялото време) "
+          flagged_posts: "Маркирани публикации "
+          flagged_by_users: "Потребители които сигнализират "
+          likes_given: "Дадени харесвания "
+          likes_received: "Получени харесвания "
+          likes_received_days: "Получени харесвания: уникални дни "
+          likes_received_users: "Получени харесвания: уникални потребители "
+          qualifies: "Отговаря на изискванията за Ниво на доверие 3. "
+          does_not_qualify: "Не отговаря на изискванията за Ниво на доверие 3. "
+          will_be_promoted: "Скоро ще се насърчава. "
+          will_be_demoted: "Скоро ще бъде понижен. "
+          on_grace_period: "В момента, в промоционален гратисен период, няма да бъде понижен. "
+          locked_will_not_be_promoted: "Нивото на доверие е заключено. Никога няма да се насърчава. "
+          locked_will_not_be_demoted: "Нивото на доверие е заключено. Никога няма да се понижават. "
+        sso:
+          title: "Single Sign On"
+          external_id: "Външно ID "
+          external_username: "Потребителско име"
+          external_name: "Име "
+          external_email: "Имейл "
+          external_avatar_url: "URL до аватара"
+      user_fields:
+        title: "User Fields"
+        help: "Добавете поле, което потребителите ще могат да попълват."
+        create: "Създай поле"
+        untitled: "Untitled"
+        name: "Име на полето"
+        type: "Вид на полето"
+        description: "Описание на полето"
+        save: "Запази"
+        edit: "Редактирай"
+        delete: "Изтрий"
+        cancel: "Прекрати"
+        delete_confirm: "Сигурни ли сте, че искате да изтриете това потребителско поле?"
+        options: "Опции"
+        required:
+          title: "Да се изисква при регистрация?"
+          enabled: "задължително"
+          disabled: "по желание"
+        editable:
+          title: "Да се редактира след регистрация?"
+          enabled: "може да се редактира"
+          disabled: "Текстово поле"
+        show_on_profile:
+          title: "Покажи на публичния профил?"
+          enabled: "показано на профила"
+          disabled: "не се показва на профила"
+        show_on_user_card:
+          title: "Показване в потребителската карта?"
+          enabled: "показано в потребителската карта"
+          disabled: "не е показано в потребителската карта"
+        field_types:
+          text: 'Текстово поле'
+          confirm: 'Потвърждение'
+          dropdown: "Падащо"
+      site_text:
+        description: "Можете да персонализирате всеки текст от вашия форум. Моля, започнете, като търсите по-долу:"
+        search: "Търсене на текст които искате да редактирате"
+        title: 'Текстово съдържание. '
+        edit: 'промени'
+        revert: "Върни промените"
+        revert_confirm: "Сигурен ли си, че искаш да върнеш промените?"
+        go_back: "Към търсачката"
+        recommended: "За вашите нужди, Ви препоръчваме да редактирате следният текст:"
+        show_overriden: 'Избери само презаписаните'
+      settings:
+        show_overriden: 'Показване само на презаписаните'
+        reset: 'изчисти'
+      site_settings:
+        title: 'Настройки'
+        no_results: "Няма резултати"
+        more_than_30_results: "Има повече от 30 резултата. Моля, прецизирайте търсенето си или изберете категория."
+        clear_filter: "Изчисти"
+        add_url: "добавяне на URL"
+        add_host: "добави хост"
+        categories:
+          all_results: 'Всички'
+          required: 'Задъжителни'
+          basic: 'Основни'
+          users: 'Потребители'
+          posting: 'Публикуване'
+          email: 'Имейл'
+          files: 'Файлове'
+          trust: 'Нива на доверие'
+          security: 'Сигурност'
+          onebox: "Onebox"
+          seo: 'SEO'
+          spam: 'Спам'
+          rate_limits: 'Лимити'
+          developer: 'Разработчик'
+          embedding: "Ембедване"
+          legal: "Правни"
+          uncategorized: 'Други'
+          backups: "Бекъп"
+          login: "Логване"
+          plugins: "Приставки"
+          user_preferences: "Потребителски Настройки"
+          tags: "Етикети"
+          search: "Търсене"
+          groups: "Групи"
+      badges:
+        title: Значки
+        new_badge: Нова значка
+        new: Нова
+        name: Име
+        badge: Значка
+        display_name: Име
+        description: Описание
+        long_description: Дълго описание
+        badge_type: Тип на значката
+        badge_grouping: Група
+        badge_groupings:
+          modal_title: Групи значки
+        granted_by: Присъдена от
+        granted_at: Присъдена на
+        reason_help: (Връзка към публикация или тема)
+        save: Запази
+        delete: Изтрий
+        delete_confirm: "Искате ли да изтриете тази значка?"
+        revoke: Анулирай
+        reason: Причина
+        expand: Разширяване &hellip;
+        revoke_confirm: "Сигурни ли сте, че искате да анулирате значката?"
+        edit_badges: Редактирай значката
+        grant_badge: Присъдени значка
+        granted_badges: Присъединени значки
+        grant: Присъдете
+        no_user_badges: "%{name} няма присъдени значки."
+        no_badges: Няма значки които биха могли да се присъдят.
+        none_selected: "Изберете значка за да започнете."
+        allow_title: Позволете значките да бъдат ползвани като титли.
+        multiple_grant: Може да бъде присъдена няколко пъти
+        listable: Показвай значката на страницата със значки
+        enabled: Разрешете значката
+        icon: Икона
+        image: Изображение
+        query: Badge Query (SQL)
+        target_posts: "Запитване за насочени публикации "
+        auto_revoke: Пусни заявката за отмяна ежедневно
+        show_posts: " Покажи съобщението, заради което е дадена значката, на страницата със значките "
+        trigger: "Тригер "
+        trigger_type:
+          none: "Обнови дневно "
+          post_action: "Когато потребителят въздейства върху публикация"
+          post_revision: "Когато потребителят редактира или създава публикация"
+          trust_level_change: "Когато потребителят променя Нивото на доверие"
+          user_change: "Когато потребителят е редактиран или създаден "
+          post_processed: "След като публикацията се преработи"
+        preview:
+          link_text: "Покажи спечелените значки "
+          plan_text: "Преглед с query plan "
+          modal_title: "Преглед на заявките за значки"
+          sql_error_header: "Възникна грешка със заявката. "
+          error_help: "Покажи следните линкове за помощ със заявките за значки. "
+          bad_count_warning:
+            header: "ВНИМАНИЕ!"
+            text: "Открити са примери за несъществуващи награди. Това може да се случи когато заявката за бадж се връща при несъществуващо потребителско име или съобщение. Това може да доведе до неочаквани резултати - моля проверете вашата заявка отново."
+          no_grant_count: "Няма значки за закачане."
+          grant_count:
+            one: <b>1</b> значка за закачане.
+            other: <b>%{count}</b> значки за закачане.
+          sample: "Образец: "
+          grant:
+            with: "<span class=\"username\">%{username}</span> "
+            with_post: "<span class=\"username\">%{username}</span> за публикации в %{link} "
+            with_post_time: "<span class=\"username\">%{username}</span> за публикация %{link} в <span class=\"time\">%{time}</span> "
+            with_time: "<span class=\"username\">%{username}</span> в <span class=\"time\">%{time}</span>  "
+      emoji:
+        title: "Емотикони "
+        help: "Добави нови емотикони, които ще бъдат достъпни до всички. (Съвет: Може да дръпнете и пуснете много файлове наведнъж). "
+        add: "Добави нова емотикона "
+        name: "Име "
+        image: "Изображение "
+        delete_confirm: "Сигурни ли сте че искате да изтриете тази :%{name}% емотикона? "
+      embedding:
+        get_started: "Ако искате да внедрите Discourse в друг сайт, започнете с добавянето на хоста му."
+        confirm_delete: "Сигурни ли сте, че искате да изтриете този хост?"
+        sample: "Използвайте следния HTML код в сайта си, за да създадете и вградите discourse теми. Сменете <b>REPLACE_ME</b> с URL адреса на страницата която искате да вградите."
+        title: "Ембедване"
+        host: "Позволени хостове"
+        edit: "редактирай"
+        category: "Пост в Категорията"
+        add_host: "Добави Хост"
+        settings: "Настройки за Ембедване"
+        feed_settings: "Feed настройки"
+        feed_description: "Чрез RSS/ATOM вие може да подобрите възможностите на Discourse да внедри вашето съдържание."
+        crawling_settings: "Crawler настройки"
+        crawling_description: "Когато Discourse създаде теми за вашите мнения и ако RSS / ATOM емисия не присъства, тя ще се опита да направи разбор на съдържанието от вашия HTML. Понякога това може да бъде предизвикателство за извличане на съдържанието ви, така че ние предоставяме възможността да се определи като CSS правила и да се направи екстракцията по-лесно."
+        embed_by_username: "Потребител за създаване на темата"
+        embed_post_limit: "Максимален брой публикации за вграждане."
+        embed_username_key_from_feed: "Ключ за изтегляне на discourse потребителя от feed-а"
+        embed_truncate: "Изтрий вградените постове"
+        embed_whitelist_selector: "Избор на CSS елементи които са разрешени за вграждане"
+        embed_blacklist_selector: "Избор на CSS елементи които не са разрешени за вграждане"
+        feed_polling_enabled: "Внеси постове чреч RSS/ATOM"
+        feed_polling_url: "URL адрес на RSS/ATOM връзката"
+        save: "Запамети настройките за вграждане"
+      permalink:
+        title: "Постоянни адреси"
+        url: "URL"
+        topic_id: "Тема ID "
+        topic_title: "Тема"
+        post_id: "Публикация ID "
+        post_title: "Публикация"
+        category_id: "Категория ID"
+        category_title: "Категория"
+        external_url: "Външен URL"
+        delete_confirm: "Сигурни ли сте, че искате да изриете този постоянен адрес?"
+        form:
+          label: "Нов:"
+          add: "Добави"
+          filter: "Търсене (URL или външно URL)"
+  wizard_js:
+    wizard:
+      done: "Готово"
+      back: "Назад"
+      next: "Напред"
+      upload: "Качване"
+      uploading: "Качва се..."
+      quit: "Може би по-късно"
+      invites:
+        add_user: "добавяне"
+        roles:
+          admin: "Администратор"
+          moderator: "Модератор"
+          regular: "Обикновен потребител"
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index 2658bab5132..e1f8f0737e4 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -16,8 +16,8 @@ bs_BA:
           format: '%n %u'
           units:
             byte:
-              one: Bajt
               few: Bajta
+              one: Bajt
               other: Bajta
             gb: GB
             kb: KB
@@ -44,61 +44,62 @@ bs_BA:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: "< 1 sekunda"
-          few: "< %{count} sekundi"
-          other: "< %{count} sekundi"
+          few: < %{count} sekundi
+          one: < 1 sekunda
+          other: < %{count} sekundi
         x_seconds:
-          one: "1 sekunda"
-          few: "%{count} sekundi"
-          other: "%{count} sekundi"
+          few: '%{count} sekundi'
+          one: 1 sekunda
+          other: '%{count} sekundi'
         x_minutes:
-          one: "minutu"
-          few: "minuta"
-          other: "%{count} minuta"
+          few: minuta
+          one: minutu
+          other: '%{count} minuta'
         date_month: "MMM D"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: "1 minuta"
-          few: "Par minuta"
-          other: "%{count} minuta"
+          few: Par minuta
+          one: 1 minuta
+          other: '%{count} minuta'
         x_hours:
-          one: "1 sahat"
-          few: "Par sahati"
-          other: "%{count} sahati"
+          few: Par sahati
+          one: 1 sahat
+          other: '%{count} sati'
         x_days:
-          one: "1 dan"
-          few: "Par dana"
-          other: "%{count} dana"
+          few: Par dana
+          one: 1 dan
+          other: '%{count} dana'
         date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
-          one: "Prije 1 minutu"
-          few: "Prije par minuta"
-          other: "%{count} minuta prije"
+          few: Prije par minuta
+          one: Prije 1 minutu
+          other: '%{count} minuta prije'
         x_hours:
-          one: "Prije 1 sahat "
-          few: "Prije par sahati"
-          other: "%{count} sahati prije"
+          few: Prije par sahati
+          one: 'Prije 1 sahat '
+          other: '%{count} sati prije'
         x_days:
-          one: "prije 1 dan "
-          few: "Prije par dana "
-          other: "%{count} dana prije"
+          few: 'Prije par dana '
+          one: 'prije 1 dan '
+          other: '%{count} dana prije'
       later:
         x_days:
-          one: "Prije 1 dan"
-          few: "Prije par dana"
-          other: "%{count} dana prije"
+          few: Prije par dana
+          one: Prije 1 dan
+          other: '%{count} dana prije'
         x_months:
-          one: "Prije 1 mjesec"
-          few: "Prije par mjeseci"
-          other: "%{count} mjeseci prije"
+          few: Prije par mjeseci
+          one: Prije 1 mjesec
+          other: '%{count} mjeseci prije'
         x_years:
-          one: "Prije 1 godinu"
-          few: "Prije par godina"
-          other: "%{count} godine/a prije"
+          few: Prije par godina
+          one: Prije 1 godinu
+          other: '%{count} godine/a prije'
       previous_month: 'Prošli mjesec'
       next_month: 'Sljedeći mjesec'
+      placeholder: datum
     share:
       topic: 'podijeli link ka ovoj temi'
       post: 'podijeli link ka ovom postu #%{postNumber}'
@@ -109,7 +110,6 @@ bs_BA:
       email: 'pošalji ovaj link na email'
     action_codes:
       public_topic: "postavio ovu temu kao javno %{when}"
-      private_topic: "postavio ovu temu kao privatno %{when}"
       split_topic: "podjeli ovu temu %{when}"
       invited_user: "pozvan %{who} %{when}"
       invited_group: "pozvan %{who} %{when}"
@@ -135,8 +135,6 @@ bs_BA:
         disabled: 'sklonjen %{when}'
     topic_admin_menu: "topic admin actions"
     emails_are_disabled: "Sve odlazeće email poruke su globalno onemogućene od strane administratora. Niti jedna notifikacija bilo kakve vrste neće biti poslana."
-    bootstrap_mode_enabled: "Kako bi lakše lansirali svoj novi sajt, trenutno ste u bootstrap modu. Svi novi korisnici će dobiti razinu povjerenja 1 i imati uključen sistematizovani dnevni e-mail pregleda promjena. Naknadno će biti automatski isključeno nakon što ukupan broj korisnika pređe brojku od %{min_users}."
-    bootstrap_mode_disabled: "Bootstrap mod će biti ugašen u sljedećih 24 sata."
     s3:
       regions:
         ap_northeast_1: "Azija Pacifik (Tokio)"
@@ -168,10 +166,10 @@ bs_BA:
     show_help: "opcije"
     links: "Linkovi"
     links_lowercase:
-      one: "Link"
-      few: "Link"
-      other: "Linkovi"
-    faq: "Upoznavanje Foruma"
+      few: Link
+      one: Link
+      other: Linkovi
+    faq: "Česta pitanja"
     guidelines: "Guidelines"
     privacy_policy: "Privacy Policy"
     privacy: "Privacy"
@@ -194,9 +192,9 @@ bs_BA:
     max_of_count: "maksimalno {{count}}"
     alternation: "ili"
     character_count:
-      one: "{{count}} karakter"
-      few: "{{count}} karaktera"
-      other: "{{count}} karaktera"
+      few: '{{count}} karaktera'
+      one: '{{count}} karakter'
+      other: '{{count}} karaktera'
     suggested_topics:
       title: "Savetujemo Teme"
       pm_title: "Preporučene Poruke"
@@ -208,8 +206,6 @@ bs_BA:
       our_moderators: "Naši Moderatori"
       stat:
         all_time: "Svih Vremena"
-        last_7_days: "Zadnjih 7 Dana"
-        last_30_days: "Zadnjih 30 dana"
       like_count: "Broj Lajkova"
       topic_count: "Broj Tema"
       post_count: "Broj Postova"
@@ -230,19 +226,6 @@ bs_BA:
       last_read: "this is the last post you've read; click to bookmark it"
       remove: "Remove Bookmark"
       confirm_clear: "Jeste li sigurni da želite očistiti sve bookmarke iz ove kategorije?"
-    topic_count_latest:
-      one: "{{count}} nova ili tema sa editovanim postom."
-      few: "{{count}} novih ili tema sa editovanim postovima."
-      other: "{{count}} novih ili tema sa editovanim postovima."
-    topic_count_unread:
-      one: "{{count}} nepročitana tema."
-      few: "{{count}} nepročitanih tema."
-      other: "{{count}} nepročitanih tema."
-    topic_count_new:
-      one: "{{count}} nova tema."
-      few: "{{count}} novih tema."
-      other: "{{count}} novih tema."
-    click_to_show: "Klikni da pokažeš."
     preview: "pregledaj"
     cancel: "otkaži"
     save: "Sačuvaj Promjene"
@@ -278,18 +261,18 @@ bs_BA:
       cancel: "Odustani"
       view_pending: "Vidi postove na čekanju"
       has_pending_posts:
-        one: "Ova tema ima <b>1</b> post koji čeka odobrenje"
-        few: "Ova tema ima <b>{{count}}</b> postova koji čekaju odobrenje"
-        other: "Ova tema ima <b>{{count}}</b> postova koji čekaju odobrenje"
+        few: Ova tema ima <b>{{count}}</b> postova koji čekaju odobrenje
+        one: Ova tema ima <b>1</b> post koji čeka odobrenje
+        other: Ova tema ima <b>{{count}}</b> postova koji čekaju odobrenje
       confirm: "Sačuvaj promjene"
       delete_prompt: "Da li ste sigurni da želite da izbrišete <b>%{username}</b> nalog? Ovo će ukloniti svaku objavu tog naloga, te blokirati korisnikovu email adresu kao i njegov IP."
       approval:
         title: "Post treba odobrenje"
         description: "Primili smo Vaš novi post ali on treba biti odobren od strane moderatora prije nego bude javno dostupan. Molimo budite strpljivi."
         pending_posts:
-          one: "Imate <strong>1</strong> post na čekanju."
-          few: "Imate <strong>{{count}}</strong> postova na čekanju."
-          other: "Imate <strong>{{count}}</strong> postova na čekanju."
+          few: Imate <strong>{{count}}</strong> postova na čekanju.
+          one: Imate <strong>1</strong> post na čekanju.
+          other: Imate <strong>{{count}}</strong> postova na čekanju.
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> posted <a href='{{topicUrl}}'>the topic</a>"
@@ -323,9 +306,9 @@ bs_BA:
       posts_read: "Čitaj"
       posts_read_long: "Pročitano postova"
       total_rows:
-        one: "%{count} korisnik"
-        few: "%{count} korisnika"
-        other: "%{count} korisnika"
+        few: '%{count} korisnika'
+        one: '%{count} korisnik'
+        other: '%{count} korisnika'
     group_histories:
       actions:
         change_group_setting: "Promjeni grupne postavke"
@@ -334,22 +317,22 @@ bs_BA:
         make_user_group_owner: "Napravi vlasnika"
         remove_user_as_group_owner: "Ukloni vlasnika"
     groups:
-      logs:
-        title: "Logovi"
-        when: "Kad"
-        action: "Akcija"
-        acting_user: "Trenutni korisnik"
-        target_user: "Ciljani korisnik"
-        subject: "Subjekt"
-        details: "Detalji"
-        from: "Od"
-        to: "Za"
-      edit:
-        title: 'Preimenuj Grupu'
+      manage:
+        name: 'Ime'
         full_name: 'Puno ime'
-        add_members: "Dodaj Članove"
-        delete_member_confirm: "Ukloni '%{username}' iz '%{group}' grupe?"
-      name_placeholder: "Ime grupe, bez razmaka, ista pravila kao za korisničko ime"
+        add_members: "Dodaj članove"
+        delete_member_confirm: "Ukloni '%{username}' iz grupe '%{group}'?"
+        profile:
+          title: Profil
+        interaction:
+          title: Interakcija
+          posting: Objavljivanje
+          notification: Obavijest
+        membership:
+          title: Članstvo
+          access: Pristup
+        logs:
+          title: "Dnevnički zapisi"
       empty:
         posts: "Ne postoje postovi člana ove grupe."
         members: "Nema članova u grupi."
@@ -358,23 +341,14 @@ bs_BA:
         topics: "Nema novih tema od strane članova ove grupe."
         logs: "Nema novih logova za ovu grupu."
       add: "Dodaj"
-      join: "Pridruži se grupi"
-      leave: "Napusti grupu"
-      request: "Zahtjevaj pristup grupi"
-      automatic_group: Automatska grupa
-      closed_group: Zatvorena grupa
-      is_group_user: "Vi ste član ove grupe"
       membership: "Članstvo"
       name: "Ime"
-      user_count: "Broj članova"
       bio: "O grupi"
-      selector_placeholder: "Dodaj članove"
       owner: "vlasnik"
       index:
         title: "Grupe"
         empty: "Vidljive grupe još ne postoje."
       activity: "Aktivnost"
-      members: "Članovi"
       topics: "Teme"
       posts: "Postovi"
       mentions: "Spomenuto"
@@ -385,9 +359,6 @@ bs_BA:
         mods_and_admins: "Samo moderatori i Admini"
         members_mods_and_admins: "Samo članovi grupe, moderatori i admini"
         everyone: "Svatko"
-      trust_levels:
-        title: "Razina povjerenja je automatski dodijeljena članovima kada su postavljeni: "
-        none: "Ništa"
       notifications:
         watching:
           title: "Posmatram"
@@ -412,23 +383,21 @@ bs_BA:
       flair_color_placeholder: "(Opciono) Hex broj boje"
       flair_preview_icon: "Preview ikona"
       flair_preview_image: "Preview slika"
-      flair_note: "Obavještenje: Sposobnosti će biti prikazane samo za korisnike primarne grupe."
     user_action_groups:
-      '1': "Dati Lajkovi"
-      '2': "Dobijeni Lajkovi"
-      '3': "Sačuvano"
-      '4': "Teme"
-      '5': "Postovi"
-      '6': "Odgovori"
-      '7': "Spemenute"
-      '9': "Citirane"
-      '11': "Izmjenjene"
-      '12': "Poslato"
-      '13': "Inbox"
-      '14': "Na čekanju."
+      "1": "Dati Lajkovi"
+      "2": "Dobijeni Lajkovi"
+      "3": "Sačuvano"
+      "4": "Teme"
+      "5": "Postovi"
+      "6": "Odgovori"
+      "7": "Spemenute"
+      "9": "Citirane"
+      "11": "Izmjenjene"
+      "12": "Poslato"
+      "13": "Inbox"
+      "14": "Na čekanju."
     categories:
       all: "Sve kategorije"
-      all_subcategories: "sve"
       no_subcategory: "nijedna"
       category: "Kategorija"
       category_list: "Prikaži listu kategorija"
@@ -485,7 +454,6 @@ bs_BA:
       notifications: "Obaviještenja"
       statistics: "Statistika"
       desktop_notifications:
-        label: "Desktop notifikacije"
         not_supported: "Notifikacije nisu podržane na ovom browseru."
         perm_default: "Upali notifikacije"
         perm_denied_btn: "Zabranje pristup"
@@ -539,7 +507,6 @@ bs_BA:
       delete_account: "Delete My Account"
       delete_account_confirm: "Are you sure you want to permanently delete your account? This action cannot be undone!"
       deleted_yourself: "Your account has been deleted successfully."
-      delete_yourself_not_allowed: "You cannot delete your account right now. Contact an admin to do delete your account for you."
       unread_message_count: "Poruke"
       admin_delete: "Izbriši"
       users: "Korisnici"
@@ -617,9 +584,9 @@ bs_BA:
         authenticated: "Your email has been authenticated by {{provider}}."
         frequency_immediately: "Slati ćemo vam e-mail obavijesti odmah na novo, ukoliko niste pročitali sadržaj koji smo vam prvobitno e-mailom poslali."
         frequency:
-          one: "Poslaćemo ti email samo u slučaju da te nismo vidjeli u zadnjoj minuti."
-          few: "Poslaćemo ti email samo u slučaju da te nismo vidjeli u zadnjih {{count}} minuta."
-          other: "Poslaćemo ti email samo u slučaju da te nismo vidjeli u zadnjih {{count}} minuta."
+          few: Poslaćemo ti email samo u slučaju da te nismo vidjeli u zadnjih {{count}} minuta.
+          one: Poslaćemo ti email samo u slučaju da te nismo vidjeli u zadnjoj minuti.
+          other: Poslaćemo ti email samo u slučaju da te nismo vidjeli u zadnjih {{count}} minuta.
       name:
         title: "Ime"
         instructions: "vaše puno ime (opciono)"
@@ -650,8 +617,6 @@ bs_BA:
       created: "Registrovan"
       log_out: "Izloguj se"
       location: "Lokacija"
-      card_badge:
-        title: "Bedž Korisničke kartice"
       website: "Sajt"
       email_settings: "Email"
       like_notification_frequency:
@@ -705,7 +670,6 @@ bs_BA:
         title: "Pozivnice"
         user: "Pozvan Korisnik"
         sent: "poslano"
-        none: "Nema poziva na čekanju"
         redeemed: "Redeemed Invites"
         redeemed_tab: "Iskorišteno"
         redeemed_tab_with_count: "Iskorišteno ({{count}})"
@@ -1018,28 +982,12 @@ bs_BA:
       empty: "Nema obavještenja."
       more: "pogledaj starija obaviještenja"
       total_flagged: "ukupno opomenutih postova"
-      alt:
-        mentioned: "Spomenut od"
-        quoted: "Citiran od"
-        replied: "Odgovoreno"
-        posted: "Post od"
-        edited: "Editujte vaš post"
-        liked: "Vole vaš post"
-        private_message: "Privatna poruka od"
-        invited_to_private_message: "Pozvani na privatnu poruku od "
-        invited_to_topic: "Pozvani na temu od"
-        invitee_accepted: "Pozivnica prihvaćena od"
-        moved_post: "Vaša objava je premještena od strane "
-        linked: "Link ka vašoj objavi"
-        granted_badge: "Bedž odobren"
-        group_message_summary: "Poruke u grupnom sandučetu"
       popup:
         mentioned: '{{username}} vas je spomenuo/la u "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} vas je spomenuo/la u "{{topic}}" - {{site_title}}'
         quoted: '{{username}} vas je citirao/la u "{{topic}}" - {{site_title}}'
         replied: '{{username}} vam je odgovorio/la u "{{topic}}" - {{site_title}}'
         posted: '{{username}} je objavio/la "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} vam je poslao/la privatnu poruku u "{{topic}}" - {{site_title}}'
         linked: '{{username}} je linkao/la vašu objavu "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Dodaj sliku"
@@ -1157,9 +1105,6 @@ bs_BA:
         bookmarks: "Nema više bookmark-ovanih tema."
         search: "Nema više rezultata pretrage."
     topic:
-      unsubscribe:
-        stop_notifications: "Sad će te dobijati manje obavještenja za <strong>{{title}}</strong>"
-        change_notification_state: "Vaše trenutno stanje obavještenja je"
       create: 'Započni Temu'
       create_long: 'Započni novu Temu'
       private_message: 'Započni privatnu konverzaciju'
@@ -1192,7 +1137,7 @@ bs_BA:
       read_more_MF: "There { UNREAD, plural, =0 {} one { is <a href='/unread'>1 unread</a> } other { are <a href='/unread'># unread</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='/new'>1 new</a> topic} other { {BOTH, select, true{and } false {are } other{}} <a href='/new'># new</a> topics} } remaining, or {CATEGORY, select, true {browse other topics in {catLink}} false {{latestLink}} other {}}."
       browse_all_categories: Pogledajte sve Kategorije
       view_latest_topics: pogledaj posljednje teme
-      suggest_create_topic: Zašto ne kreirati novu temu?
+      suggest_create_topic: "Zašto ne kreirati novu temu?"
       jump_reply_up: jump to earlier reply
       jump_reply_down: jump to later reply
       deleted: "Ova tema je obrisana"
@@ -1228,17 +1173,17 @@ bs_BA:
         title: izmijenite učestalost dobijanja obavještenja o ovoj temi
         reasons:
           mailing_list_mode: "Imate uključenu mail listu, stoga će te biti obavještavani o odgovorima na ovu temu preko e-maila."
-          '3_10': 'Dobijat će te obavijesti jer pratite tag na ovoj temi.'
-          '3_6': 'Dobijat ćete notifikacije zato što motrite ovu temu.'
-          '3_5': 'Dobijat ćete notifikacije zato što motrite temu automatski.'
-          '3_2': 'Dobijat ćete notifikacije zato što pratite ovu temu.'
-          '3_1': 'Dobijat ćete notifikacije zato što ste kreirali ovu temu.'
-          '3': 'Dobijat ćete notifikacije zato što motrite ovu temu.'
-          '1_2': 'Dobiti ćete notifikaciju kada neko spomene tvoje @name ili odgovori na tvoj post.'
-          '1': 'Dobiti ćete notifikaciju kada neko spomene tvoje @name ili odgovori na tvoj post.'
-          '0_7': 'Ignorišete sve notifikacije u ovoj kategoriji.'
-          '0_2': 'Ignorišete sve notifikacije u ovoj temi.'
-          '0': 'Ignorišete sve notifikacije u ovoj temi.'
+          "3_10": 'Dobijat će te obavijesti jer pratite tag na ovoj temi.'
+          "3_6": 'Dobijat ćete notifikacije zato što motrite ovu temu.'
+          "3_5": 'Dobijat ćete notifikacije zato što motrite temu automatski.'
+          "3_2": 'Dobijat ćete notifikacije zato što pratite ovu temu.'
+          "3_1": 'Dobijat ćete notifikacije zato što ste kreirali ovu temu.'
+          "3": 'Dobijat ćete notifikacije zato što motrite ovu temu.'
+          "1_2": 'Dobiti ćete notifikaciju kada neko spomene tvoje @name ili odgovori na tvoj post.'
+          "1": 'Dobiti ćete notifikaciju kada neko spomene tvoje @name ili odgovori na tvoj post.'
+          "0_7": 'Ignorišete sve notifikacije u ovoj kategoriji.'
+          "0_2": 'Ignorišete sve notifikacije u ovoj temi.'
+          "0": 'Ignorišete sve notifikacije u ovoj temi.'
         watching_pm:
           title: "Motrenje"
           description: "Bit ćete obavješteni o svakom novom odgovoru u ovoj poruci, te će biti prikazan broj novih odgovora."
@@ -1277,7 +1222,6 @@ bs_BA:
         visible: "Make Listed"
         reset_read: "Reset Read Data"
         make_public: "Napiši temu javno"
-        make_private: "Napiši privatnu poruku"
       feature:
         pin: "Prikači temu"
         unpin: "Otkači temu"
@@ -1367,7 +1311,6 @@ bs_BA:
         error: "There was an error changing the ownership of the posts."
         label: "New Owner of Posts"
         placeholder: "username of new owner"
-        instructions_warn: "Note that any notifications about this post will not be transferred to the new user retroactively.<br>Warning: Currently, no post-dependent data is transferred over to the new user. Use with caution."
       change_timestamp:
         action: "izmijeni vrijeme"
         invalid_timestamp: "Vrijeme ne može biti u budućnosti."
@@ -1593,15 +1536,15 @@ bs_BA:
         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"
+          few: '{{count}} nova'
+          one: 1 novi
+          other: '{{count}} novih'
         lower_title: "nova"
         title: "Novo"
         title_with_count:
-          one: "Novo (1)"
-          few: "Novo ({{count}})"
-          other: "Novo ({{count}})"
+          few: Novo ({{count}})
+          one: Novo (1)
+          other: Novo ({{count}})
         help: "teme kreirane u zadnjih nekoliko dana"
       posted:
         title: "Moji Odgovori"
@@ -1628,6 +1571,8 @@ bs_BA:
       full: "Kreiraj / Odgovori / Vidi"
       create_post: "Odgovori / Vidi"
       readonly: "Vidi"
+    keyboard_shortcuts_help:
+      title: 'Kratice tipkovnice'
   admin_js:
     type_to_filter: "kucaj da sortiraš..."
     admin:
@@ -1663,8 +1608,6 @@ bs_BA:
         reports:
           today: "Today"
           yesterday: "Yesterday"
-          last_7_days: "Last 7 Days"
-          last_30_days: "Last 30 Days"
           all_time: "All Time"
           7_days_ago: "7 Days Ago"
           30_days_ago: "30 Days Ago"
@@ -1677,7 +1620,6 @@ bs_BA:
         title: "Opomene"
         agree: "Slažem se"
         agree_title: "Confirm this flag as valid and correct"
-        defer_flag_title: "Remove this flag; it requires no action at this time."
         delete: "Delete"
         delete_title: "Delete the post this flag refers to."
         delete_post_defer_flag_title: "Delete post; if the first post, delete the topic"
@@ -1711,8 +1653,6 @@ bs_BA:
         title: "Groups"
         edit: "Edit Groups"
         refresh: "Refresh"
-        new: "New"
-        selector_placeholder: "add users"
         about: "Edit your group membership and names here"
         group_members: "Group members"
         delete: "Delete"
@@ -1760,7 +1700,6 @@ bs_BA:
           size: "Size"
         upload:
           uploading: "Uploading..."
-          success: "'{{filename}}' has successfully been uploaded."
           error: "There has been an error while uploading '{{filename}}': {{message}}"
         operations:
           is_running: "An operation is currently running..."
@@ -1771,7 +1710,6 @@ bs_BA:
           backup:
             title: "Create a backup"
             confirm: "Do you want to start a new backup?"
-            without_uploads: "Yes (do not include files)"
           destroy:
             title: "Remove the backup"
             confirm: "Are you sure you want to destroy this backup?"
@@ -2116,10 +2054,7 @@ bs_BA:
       site_text:
         title: 'Text Content'
       site_settings:
-        show_overriden: 'Only show overridden'
         title: 'Settings'
-        reset: 'reset'
-        none: 'none'
         no_results: "No results found."
         clear_filter: "Clear"
         categories:
@@ -2158,9 +2093,9 @@ bs_BA:
         granted_at: Dato na
         save: Sačuvaj
         delete: Obriši
-        delete_confirm: Are you sure you want to delete this badge?
+        delete_confirm: "Are you sure you want to delete this badge?"
         revoke: Revoke
-        revoke_confirm: Are you sure you want to revoke this badge?
+        revoke_confirm: "Are you sure you want to revoke this badge?"
         edit_badges: Edit Badges
         grant_badge: Grant Badge
         granted_badges: Granted Badges
@@ -2194,10 +2129,10 @@ bs_BA:
             text: "There are missing grant samples. This happens when the badge query returns user IDs or post IDs that do not exist. This may cause unexpected results later on - please double-check your query."
           sample: "Sample:"
           grant:
-            with: <span class="username">%{username}</span>
-            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>
+            with: "<span class=\"username\">%{username}</span>"
+            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"
         name: "Ime"
@@ -2221,7 +2156,7 @@ bs_BA:
         category_id: "ID kategorije"
         category_title: "Kategorija"
         external_url: "Vanjski URL"
-        delete_confirm: Jeste li sigurni da želite izbrisati ovaj permalink?
+        delete_confirm: "Jeste li sigurni da želite izbrisati ovaj permalink?"
         form:
           label: "Novo:"
           add: "Dodaj"
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index 39c90056492..6727ff03da3 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -27,13 +27,13 @@ ca:
         millions: "{{number}}M"
     dates:
       time: "h:mm a"
-      timeline_date: "MMM AAAA"
+      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"
-      long_with_year: "MMM D, AAAA h:mm a"
-      long_with_year_no_time: "MMM D, AAAA"
-      full_with_year_no_time: "MMMM Do, AAAA"
+      long_with_year: "MMM D, YYYY h:mm a"
+      long_with_year_no_time: "MMM D, YYYY"
+      full_with_year_no_time: "MMMM Do, YYYY"
       long_date_with_year: "MMM D, 'YY LT"
       long_date_without_year: "MMM D, LT"
       long_date_with_year_without_time: "MMM D, 'YY"
@@ -43,68 +43,68 @@ ca:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: "< 1s"
-          other: "< %{count}s"
+          one: < 1s
+          other: < %{count}s
         x_seconds:
-          one: "1s"
-          other: "%{count}s"
+          one: 1s
+          other: '%{count}s'
         less_than_x_minutes:
-          one: "< 1m"
-          other: "< %{count}m"
+          one: < 1m
+          other: < %{count}m
         x_minutes:
-          one: "1m"
-          other: "%{count}m"
+          one: 1m
+          other: '%{count}m'
         about_x_hours:
-          one: "1h"
-          other: "%{count}h"
+          one: 1h
+          other: '%{count}h'
         x_days:
-          one: "1d"
-          other: "%{count}d"
+          one: 1d
+          other: '%{count}d'
         x_months:
-          one: "1mes"
-          other: "%{count}mes"
+          one: 1mes
+          other: '%{count}mes'
         about_x_years:
-          one: "1a"
-          other: "%{count}a"
+          one: 1a
+          other: '%{count}a'
         over_x_years:
-          one: "> 1a"
-          other: "> %{count}a"
+          one: '> 1a'
+          other: '> %{count}a'
         almost_x_years:
-          one: "1a"
-          other: "%{count}a"
+          one: 1a
+          other: '%{count}a'
         date_month: "MMM D"
-        date_year: "MMM 'AA"
+        date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: "1 min"
-          other: "%{count} mins"
+          one: 1 min
+          other: '%{count} mins'
         x_hours:
-          one: "1 hora"
-          other: "%{count} hores"
+          one: 1 hora
+          other: '%{count} hores'
         x_days:
-          one: "1 dia"
-          other: "%{count} dies"
-        date_year: "MMM D, 'AA"
+          one: 1 dia
+          other: '%{count} dies'
+        date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
-          one: "fa 1 min"
-          other: "fa %{count} mins"
+          one: fa 1 min
+          other: fa %{count} mins
         x_hours:
-          one: "fa 1 hora"
-          other: "fa %{count} hores"
+          one: fa 1 hora
+          other: fa %{count} hores
         x_days:
-          one: "fa 1 dia"
-          other: "fa %{count} dies"
+          one: fa 1 dia
+          other: fa %{count} dies
       later:
         x_days:
-          one: "1 dia després"
-          other: "%{count} dies després"
+          one: 1 dia després
+          other: '%{count} dies després'
         x_months:
-          one: "1 mes després"
-          other: "%{count} mesos després"
+          one: 1 mes després
+          other: '%{count} mesos després'
         x_years:
-          one: "1 any després"
-          other: "%{count} anys després"
+          one: 1 any després
+          other: '%{count} anys després'
       previous_month: 'Mes anterior'
       next_month: 'Següent mes'
       placeholder: data
@@ -118,10 +118,10 @@ ca:
       email: 'envia aquest enllaç per correu electrònic'
     action_codes:
       public_topic: "va fer públic aquest tema %{when}"
-      private_topic: "va fer privat aquest tema %{when}"
       split_topic: "va dividir aquest tema %{when}"
       invited_user: "va invitar %{who} %{when}"
       invited_group: "va invitar %{who} %{when}"
+      user_left: "%{who} ha deixat aquest missatge %{when}"
       removed_user: "va eliminar %{who} %{when}"
       removed_group: "va eliminar %{who} %{when}"
       autoclosed:
@@ -148,8 +148,6 @@ ca:
     topic_admin_menu: "accions d'administració de tema"
     wizard_required: "Et donem la benvinguda al teu nou Discourse! Comencem amb <a href='%{url}' data-auto-route='true'>l'assistent de configuració</a> ✨"
     emails_are_disabled: "Tots els correus sortints han estat globalment inhabilitats per un administrador. No s'enviarà cap  notificació de cap tipus per correu electrònic."
-    bootstrap_mode_enabled: "Per llançar el teu nou lloc més fàcilment, ets en mode d'arrencada. Tots les noves persones usuàries obtindran el nivell 1 de confiança i tindran activats els avisos diaris via correu electrònic sobre actualitzacions. Es cancel·len automàticament quan el recompte total supera %{min_users} persones usuàries."
-    bootstrap_mode_disabled: "El mode <i>Bootstrap</i> es desactivarà durant les properes 24 hores."
     themes:
       default_description: "Per defecte"
     s3:
@@ -178,15 +176,15 @@ ca:
     sign_up: "Registra't"
     log_in: "Inicia sessió"
     age: "Edat"
-    joined: "T'hi has afegit"
+    joined: "Es va registrar"
     admin_title: "Admin"
     flags_title: "Avisos"
     show_more: "mostrar més"
     show_help: "opcions"
     links: "Enllaços"
     links_lowercase:
-      one: "enllaç"
-      other: "enllaços"
+      one: enllaç
+      other: enllaços
     faq: "PMF"
     guidelines: "Directrius"
     privacy_policy: "Política de privadesa"
@@ -210,8 +208,8 @@ ca:
     max_of_count: "màx de {{count}}"
     alternation: "o"
     character_count:
-      one: "{{count}} caràcter"
-      other: "{{count}} caràcters"
+      one: '{{count}} caràcter'
+      other: '{{count}} caràcters'
     suggested_topics:
       title: "Temes suggerits"
       pm_title: "Missatges proposats"
@@ -223,8 +221,6 @@ ca:
       our_moderators: "El nostre equip moderador"
       stat:
         all_time: "Sempre"
-        last_7_days: "Els darrers 7 dies"
-        last_30_days: "Els darrers 30 dies"
       like_count: "M'agrades"
       topic_count: "Temes"
       post_count: "Publicacions"
@@ -245,16 +241,6 @@ ca:
       last_read: "aquesta és la darrera publicació que has llegit; clica per marcar-la com a preferit"
       remove: "Elimina Preferit"
       confirm_clear: "Segur que vols eliminar tots els preferits d'aquest tema?"
-    topic_count_latest:
-      one: "{{count}} tema nou o actualitzat."
-      other: "{{count}} temes nous o actualitzats."
-    topic_count_unread:
-      one: "{{count}} tema sense llegir."
-      other: "{{count}} temes sense llegir."
-    topic_count_new:
-      one: "{{count}} nou tema."
-      other: "{{count}} nous temes."
-    click_to_show: "Clica per mostrar-ho"
     preview: "previsualitza"
     cancel: "cancel·la"
     save: "Desa els canvis"
@@ -291,16 +277,16 @@ ca:
       cancel: "Cancel·la"
       view_pending: "mira publicacions pendents"
       has_pending_posts:
-        one: "Aquest tema té <b>1</b> publicació esperant l'aprovació"
-        other: "Aquest tema té <b>{{count}}</b> publicacions esperant l'aprovació"
+        one: Aquest tema té <b>1</b> publicació esperant l'aprovació
+        other: Aquest tema té <b>{{count}}</b> publicacions esperant l'aprovació
       confirm: "Desa els canvis"
       delete_prompt: "Segur que vols esborrar <b>%{username}</b>? Això eliminarà totes les seves publicacions i blocarà el correu electrònic i l'adreça IP."
       approval:
         title: "La publicació necessita ser aprovada"
         description: "Hem rebut la teva nova publicació, però cal que sigui aprovada per una persona moderadora abans d'aparèixer. Si us plau, una mica de paciència."
         pending_posts:
-          one: "Tens <strong>1</strong> publicació pendent."
-          other: "Tens <strong>{{count}}</strong> publicacions pendents."
+          one: Tens <strong>1</strong> publicació pendent.
+          other: Tens <strong>{{count}}</strong> publicacions pendents.
         ok: "D'acord"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> va enviar <a href='{{topicUrl}}'>el tema</a>"
@@ -334,8 +320,8 @@ ca:
       posts_read: "Llegit"
       posts_read_long: "Publicacions llegides"
       total_rows:
-        one: "1 persona usuària"
-        other: "%{count} persones usuàries"
+        one: 1 persona usuària
+        other: '%{count} persones usuàries'
     group_histories:
       actions:
         change_group_setting: "Canvia la configuració del grup"
@@ -344,22 +330,6 @@ ca:
         make_user_group_owner: "Crea persona propietària"
         remove_user_as_group_owner: "Elimina persona propietària"
     groups:
-      logs:
-        title: "Registres"
-        when: "Quan"
-        action: "Acció"
-        acting_user: "Persona usuària activa"
-        target_user: "Persona usuària destinatària"
-        subject: "Tema"
-        details: "Detalls"
-        from: "De"
-        to: "A"
-      edit:
-        title: 'Edita grup'
-        full_name: 'Nom complet'
-        add_members: "Afegeix membres"
-        delete_member_confirm: "Elimina '%{username}' del '%{group}' grup?"
-      name_placeholder: "Nom del grup, sense espais, igual que la regla del nom de la identitat"
       empty:
         posts: "No hi ha publicacions de membres d'aquest grup."
         members: "No hi ha membres a aquest grup."
@@ -368,43 +338,28 @@ ca:
         topics: "No hi ha temes de membres d'aquest grup."
         logs: "No hi ha registres per a aquest grup."
       add: "Afegegix"
-      join: "Uneix-te al grup"
-      leave: "Abandona el grup"
-      request: "Demana afegir-te al grup"
       message: "Missatge"
-      automatic_group: Grup Automàtic
-      closed_group: Grup Tancat
-      is_group_user: "Ets membre d'aquest grup"
       membership: "Afiliació"
       name: "Nom"
-      user_count: "Quantitat de membres"
       bio: "Sobre el Grup"
-      selector_placeholder: "Afegeix membres"
       owner: "propietari"
       index:
         title: "Grups"
         empty: "No hi ha grups visibles"
       title:
-        one: "Grup"
-        other: "Grups"
+        one: Grup
+        other: Grups
       activity: "Activitat"
-      members: "Membres"
       topics: "Temes"
       posts: "Publicacions"
       mentions: "Mencions"
       messages: "Missatges"
-      visibility_levels:
-        title: "Qui pot veure aquest grup?"
-        public: "Tothom"
       alias_levels:
         nobody: "Ningú"
         only_admins: "Només persones administradores"
         mods_and_admins: "Només persones moderadores o administradores"
         members_mods_and_admins: "Només mebres de grups, persones moderadores i administradores"
         everyone: "Tothom"
-      trust_levels:
-        title: "El nivell de confiança atorgat automàticament a membres quan s'afegeixen:"
-        none: "Cap"
       notifications:
         watching:
           title: "Mirant"
@@ -429,23 +384,22 @@ ca:
       flair_color_placeholder: "(Opcional) Valor de color Hex"
       flair_preview_icon: "Vista prèvia d'icona"
       flair_preview_image: "Vista prèvia d'imatge"
-      flair_note: "Nota: l'adornament només es mostrarà per a un grup primari de persones usuàries."
     user_action_groups:
-      '1': "Donats"
-      '2': "Rebuts"
-      '3': "Preferits"
-      '4': "Temes"
-      '5': "Respostes"
-      '6': "Reaccions"
-      '7': "Mencions"
-      '9': "Cites"
-      '11': "Edicions"
-      '12': "Elements enviats"
-      '13': "Safata d'entrada"
-      '14': "Pendents"
+      "1": "Donats"
+      "2": "Rebuts"
+      "3": "Preferits"
+      "4": "Temes"
+      "5": "Respostes"
+      "6": "Reaccions"
+      "7": "Mencions"
+      "9": "Cites"
+      "11": "Edicions"
+      "12": "Elements enviats"
+      "13": "Safata d'entrada"
+      "14": "Pendents"
     categories:
       all: "totes les categories"
-      all_subcategories: "tot"
+      all_subcategories: "Tot a %{categoryName}"
       no_subcategory: "cap"
       category: "Categoria"
       category_list: "Mostra la llista de categories"
@@ -464,11 +418,11 @@ ca:
       toggle_ordering: "alterna el control de l'ordre"
       subcategories: "Subcategories"
       topic_sentence:
-        one: "1 tema"
-        other: "%{count} temes"
+        one: 1 tema
+        other: '%{count} temes'
       topic_stat_sentence:
-        one: "%{count} nou tema als passats %{unit}."
-        other: "%{count} nous temes als passats %{unit}."
+        one: '%{count} nou tema als passats %{unit}.'
+        other: '%{count} nous temes als passats %{unit}.'
     ip_lookup:
       title: Explora adreça IP
       hostname: Nom d'amfitrió
@@ -492,6 +446,7 @@ ca:
       mute: "Silenci"
       edit: "Editar preferències"
       download_archive:
+        button_text: "Descarrega tot"
         confirm: "Segur que vols descarregat les teves publicacions?"
         success: "Descàrrega inciada, quan el procés s'acabi t'ho notificarem amb un missatge."
         rate_limit_error: "Les publicacions es poden descarregar un cop al dia, si us plau torna a provar-ho demà."
@@ -508,7 +463,6 @@ ca:
       notifications: "Notificacions"
       statistics: "Estats"
       desktop_notifications:
-        label: "Notificacions d'escriptori"
         not_supported: "Aquest navegador no suporta les notificacions. Disculpa."
         perm_default: "Apaga les notificacions"
         perm_denied_btn: "Permís denegat"
@@ -560,10 +514,10 @@ ca:
       watched_first_post_tags_instructions: "Et notificarem la primera publicació per cada nou tema a aquestes etqieuetes."
       muted_categories: "Silenciades"
       muted_categories_instructions: "No et notificarem res sobre nous temes amb aquestes categories i no apareixeran a les darreres.."
+      no_category_access: "Com a moderador/a tens accés limitat a la categoria. Desar està inhabilitat."
       delete_account: "Esborra el meu compte"
       delete_account_confirm: "Segur que vols esborrar el teu compte permanentment? Aquesta acció no es pot desfer!"
       deleted_yourself: "El teu compte ha estat esborrat amb èxit."
-      delete_yourself_not_allowed: "No pots esborrar el teu compte ara mateix. Posa't en contacte amb la persona administradora per fer-ho."
       unread_message_count: "Missatges"
       admin_delete: "Esborra"
       users: "Persones usuàries"
@@ -650,8 +604,8 @@ ca:
         authenticated: "El teu correu electrònic ha estat autenticat per {{provider}}"
         frequency_immediately: "T'enviarem un correu electrònic immediatament si no has llegit el que t'hem fet arribar."
         frequency:
-          one: "Només t'enviarem un correu electrònic si no t'hem vist en el darrer minut."
-          other: "Només t'enviarem un correu electrònic si no t'hem vist en els darrers {{count}} minuts."
+          one: Només t'enviarem un correu electrònic si no t'hem vist en el darrer minut.
+          other: Només t'enviarem un correu electrònic si no t'hem vist en els darrers {{count}} minuts.
       name:
         title: "Nom"
         instructions: "el teu nom complet (opcional)"
@@ -682,8 +636,6 @@ ca:
       created: "Es va regsitrar"
       log_out: "Sortir"
       location: "Ubicació"
-      card_badge:
-        title: "Targeta distintiva de persona usuària"
       website: "Lloc web"
       email_settings: "Correu electrònic"
       like_notification_frequency:
@@ -737,10 +689,9 @@ ca:
         title: "Invitacions"
         user: "Persona usuària convidada"
         sent: "Enviat"
-        none: "No hi ha invitacions pendents per mostrar"
         truncated:
-          one: "Mostrant la primera invitació."
-          other: "Mostrant les primeres {{count}} invitacions."
+          one: Mostrant la primera invitació.
+          other: Mostrant les primeres {{count}} invitacions.
         redeemed: "Invitacions recuperades"
         redeemed_tab: "Recuperada"
         redeemed_tab_with_count: "Recuperades ({{count}})"
@@ -782,26 +733,26 @@ ca:
         stats: "Estadístiques"
         time_read: "temps de lectura"
         topic_count:
-          one: "tema creat"
-          other: "temes creats"
+          one: tema creat
+          other: temes creats
         post_count:
-          one: "publicació creada"
-          other: "publicacions creades"
+          one: publicació creada
+          other: publicacions creades
         likes_given:
-          one: "donada"
-          other: "donada"
+          one: donada
+          other: donada
         likes_received:
-          one: "Rebuda"
-          other: "Rebudes"
+          one: Rebuda
+          other: Rebudes
         days_visited:
-          one: "dia visitat"
-          other: "dies visitats"
+          one: dia visitat
+          other: dies visitats
         posts_read:
-          one: "publicació llegida"
-          other: "publicacions llegides"
+          one: publicació llegida
+          other: publicacions llegides
         bookmark_count:
-          one: "preferit"
-          other: "preferits"
+          one: preferit
+          other: preferits
         top_replies: "Principals respostes"
         no_replies: "Encara sense respostes"
         more_replies: "Més respostes"
@@ -869,8 +820,8 @@ ca:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> ha arribat al límit de configuració de %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> ha superat el límit de configuració de %{siteSettingRate}."
       rate:
-        one: "1 error/%{duration}"
-        other: "%{count} errors/%{duration}"
+        one: 1 error/%{duration}
+        other: '%{count} errors/%{duration}'
     learn_more: "saber-ne més..."
     all_time: 'total'
     all_time_desc: 'total de temes creats'
@@ -1026,8 +977,8 @@ ca:
       similar_topics: "El teu tema és semblant a..."
       drafts_offline: "esborranys fora de línia"
       group_mentioned:
-        one: "En mencionar {{group}}, estàs a punt de notificar-ho a <a href='{{group_link}}'>{{count}} aquesta persona</a> – Segur?"
-        other: "En mencionar {{group}}, estàs a punt de notificar-ho a <a href='{{group_link}}'>{{count}} aquestes persones</a> – Segur?"
+        one: En mencionar {{group}}, estàs a punt de notificar-ho a <a href='{{group_link}}'>{{count}} aquesta persona</a> – Segur?
+        other: En mencionar {{group}}, estàs a punt de notificar-ho a <a href='{{group_link}}'>{{count}} aquestes persones</a> – Segur?
       cannot_see_mention:
         category: "Has mencionat {{username}} però no es notificarà res perquè aquesta gent no gaudeix d'accés a aquesta categoria. Et caldrà afegir-la a un grup que tingui accés a aquesta categoria."
         private: "Has mencionat {{username}} però no es notificarà res perquè aquesta gent no pot veure aquest missatge. Et caldrà convidar aquesta gent a aquest Missatge Personal."
@@ -1092,6 +1043,10 @@ ca:
         body: "Ara mateix aquest missatge només s'està enviant a la teva bústia!"
       admin_options_title: "Configuracions opcionals de l'equip per a aquest tema"
     notifications:
+      tooltip:
+        regular:
+          one: 1 notificació no vista
+          other: '{{count}} notificacions no vistes'
       title: "notificacions de mencions via @nom, respostes a les teves entrades, missatges, etc"
       none: "Impossible carregar ara mateix les notificacions"
       empty: "No s'hi han trobat notificacions."
@@ -1099,29 +1054,13 @@ ca:
       total_flagged: "total publicacions amb bandera"
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
-      alt:
-        mentioned: "Mencionat per"
-        quoted: "Citat per"
-        replied: "Respost"
-        posted: "Publicat per"
-        edited: "Edita la teva publicació per"
-        liked: "Ha agradat la teva publicació"
-        private_message: "Missatge privat de"
-        invited_to_private_message: "Ha convidat a un missatge privat de"
-        invited_to_topic: "Ha convidat a un tema de"
-        invitee_accepted: "Invitació acceptada per"
-        moved_post: "La teva publicació ha estat moguda per"
-        linked: "Enllaç a la teva publicació"
-        granted_badge: "Distintiu atorgat"
-        group_message_summary: "Missatges a la bústia d'entrada del grup"
       popup:
         mentioned: '{{username}} t''ha mencionat a "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} t''ha mencionat a "{{topic}}" - {{site_title}}'
         quoted: '{{username}} t''ha citat a "{{topic}}" - {{site_title}}'
         replied: '{{username}} t''ha respost a "{{topic}}" - {{site_title}}'
         posted: '{{username}} publicat a "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} t''ha enviat un missatge privat a "{{topic}}" - {{site_title}}'
-        linked: 'A {{username}} li ha agradat la teva publicació de "{{topic}}" - {{site_title}}'
+        linked: '{{username}} ha enllaçat la teva entrada en "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Afegeix una imatge"
       title_with_attachments: "Afegeix una imatge o arxiu"
@@ -1199,7 +1138,7 @@ ca:
         select_all: "Selecciona-ho tot"
         clear_all: "Neteja-ho tot"
         unlist_topics: "Desllista temes"
-        reset_read: "Reinicia la la lectura"
+        reset_read: "Restableix llegit"
         delete: "Esborra temes"
         dismiss: "Descarta-ho"
         dismiss_read: "Descarta tots els llegits"
@@ -1209,14 +1148,16 @@ ca:
         dismiss_new: "Descarta'n els nous"
         toggle: "canvia la selecció massiva de temes"
         actions: "Accions massives"
+        change_category: "Defineix la Categoria"
         close_topics: "Tanca temes"
         archive_topics: "Arxiva temes"
+        notification_level: "Notificacions"
         choose_new_category: "Tria la nova categoria per als temes:"
         selected:
-          one: "Has triat <b>1</b> tema."
-          other: "Has triat <b>{{count}}</b> temes."
-        change_tags: "Reemplaçar Etiquetes"
-        append_tags: "Annexar Etiquetes"
+          one: Has triat <b>1</b> tema.
+          other: Has triat <b>{{count}}</b> temes.
+        change_tags: "Reemplaça Etiquetes"
+        append_tags: "Annexa Etiquetes"
         choose_new_tags: "Tria noves etiquetes per a aquests temes:"
         choose_append_tags: "Escollir noves etiquetes per annexar a aquest topics:"
         changed_tags: "Les etiquetes d'aquests temes han estat canviades."
@@ -1246,12 +1187,9 @@ ca:
         bookmarks: "No hi ha més temes marcats com a preferits."
         search: "No hi ha més resultats de la cerca."
     topic:
-      unsubscribe:
-        stop_notifications: "Ara rebràs menys alertes per a <strong>{{title}}</strong>"
-        change_notification_state: "L'estat actual d'alerta és"
       filter_to:
-        one: "1 publicació al tema"
-        other: "{{count}} publicacions al tema"
+        one: 1 publicació al tema
+        other: '{{count}} publicacions al tema'
       create: 'Nou tema'
       create_long: 'Crea un tema nou'
       private_message: 'Comença un missatge'
@@ -1265,10 +1203,10 @@ ca:
       new: 'nou tema'
       unread: 'sense llegir'
       new_topics:
-        one: '1 tema nou'
+        one: 1 tema nou
         other: '{{count}} temes nous '
       unread_topics:
-        one: '1 tema sense llegir'
+        one: 1 tema sense llegir
         other: '{{count}} temes sense llegir'
       title: 'Tema'
       invalid_access:
@@ -1282,17 +1220,17 @@ ca:
         title: "Tema no trobat"
         description: "Disculpa, no hem pogut trobar aquest tema. Que potser ha estat esborrat per una persona moderadora?"
       total_unread_posts:
-        one: "tens 1 missatge sense llegir a aquest tema"
-        other: "tens {{count}} missatges sense llegir a aquest tema"
+        one: tens 1 missatge sense llegir a aquest tema
+        other: tens {{count}} missatges sense llegir a aquest tema
       unread_posts:
-        one: "tens 1 publicació antiga sense llegir a aquest tema"
-        other: "tens {{count}} publicacions antigues sense llegir a aquest tema"
+        one: tens 1 publicació antiga sense llegir a aquest tema
+        other: tens {{count}} publicacions antigues sense llegir a aquest tema
       new_posts:
-        one: "hi ha 1 nova publicació a aquest tema des de la teva darrera lectura"
-        other: "hi ha {{count}} noves publicacions a aquest tema des de la teva darrera lectura"
+        one: hi ha 1 nova publicació a aquest tema des de la teva darrera lectura
+        other: hi ha {{count}} noves publicacions a aquest tema des de la teva darrera lectura
       likes:
-        one: "hi ha 1 <i>M'agrada</i> a aquest tema"
-        other: "hi ha {{count}} m'agrades en aquest tema"
+        one: hi ha 1 M'agrada a aquest tema
+        other: hi ha {{count}} m'agrades en aquest tema
       back_to_list: "Torna al llistat de temes"
       options: "Opcions de tema"
       show_links: "mostra enllaços dins d'aquest tema"
@@ -1302,14 +1240,21 @@ ca:
       read_more_MF: "Hi ha { UNREAD, plural, =0 {} one { <a href='/unread'>1 no llegit</a> } other { <a href='/unread'># no llegits</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{i } false {i } other{}} <a href='/new'>1 nou</a> topic} other { {BOTH, select, true{i } false {són } other{}} <a href='/new'># nous</a> topics} } restants, o {CATEGORY, select, true {navega altres temes a {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Navega per totes les categories
       view_latest_topics: mostra els darrers temes
-      suggest_create_topic: Per què no crear un tema?
+      suggest_create_topic: "Per què no crear un tema?"
       jump_reply_up: salta a la resposta anterior
       jump_reply_down: salta a la darrera resposta
       deleted: "El tema ha estat esborrat"
+      auto_update_input:
+        next_month: "El mes següent"
+        three_months: "Tres mesos"
+        six_months: "Sis mesos"
+        one_year: "Un any"
+      status_update_notice:
+        auto_publish_to_category: "Aquest tema serà publicat a la categoria <a href=%{categoryUrl}>#%{categoryName}</a>%{timeLeft}"
       auto_close_title: 'Configuració del tancament automàtic'
       auto_close_immediate:
-        one: "La darrera publicació al tema ja té 1 hora, per això el tema es tancarà immediatament."
-        other: "La darrera publicació al tema ja té %{count} hores, per això el tema es tancarà immediatament."
+        one: La darrera publicació al tema ja té 1 hora, per això el tema es tancarà immediatament.
+        other: La darrera publicació al tema ja té %{count} hores, per això el tema es tancarà immediatament.
       timeline:
         back: "Enrere"
         back_description: "Torna a la teva darrera publicació sense llegir"
@@ -1330,17 +1275,21 @@ ca:
         title: canvia la freqüència d'alertes que reps sobre aquest tema
         reasons:
           mailing_list_mode: "Tens activat el mode de llista de correu, així et notificarem les respostes a aquest tema per correu electrònic."
-          '3_10': 'Rebràs alertes perquè estàs mirant una etiqueta sobre aquest tema.'
-          '3_6': 'Rebràs alertes perquè estàs mirant aquesta categoria.'
-          '3_5': 'Rebràs alertes perquè has començat a veure aquest tema automàticament.'
-          '3_2': 'Rebràs alertes perquè estàs mirant aquest tema.'
-          '3_1': 'Rebràs alertes perquè has creat aquest tema.'
-          '3': 'Rebràs alertes perquè estàs mirant aquest tema.'
-          '1_2': 'Només se''t notificarà si algú menciona el teu @nom o contesta la teva entrada.'
-          '1': 'Se''t notificarà si algú menciona el teu @nom o contesta la teva entrada.'
-          '0_7': 'No estàs fent cas de les alertes d''aquesta categoria.'
-          '0_2': 'No estàs fent cas de les alertes d''aquest tema.'
-          '0': 'No estàs fent cas de les alertes sobre aquest tema.'
+          "3_10": 'Rebràs alertes perquè estàs mirant una etiqueta sobre aquest tema.'
+          "3_6": 'Rebràs alertes perquè estàs mirant aquesta categoria.'
+          "3_5": 'Rebràs alertes perquè has començat a veure aquest tema automàticament.'
+          "3_2": 'Rebràs alertes perquè estàs mirant aquest tema.'
+          "3_1": 'Rebràs alertes perquè has creat aquest tema.'
+          "3": 'Rebràs alertes perquè estàs mirant aquest tema.'
+          "2_8": 'Rebràs notificacions, perquè estàs seguint aquesta categoria.'
+          "2_4": 'Rebràs notificacions, perquè has escrit una resposta a aquest tema.'
+          "2_2": 'Rebràs notificacions, perquè estàs seguint aquest tema.'
+          "2": 'Rebràs notificacions, perquè has <a href="/users/{{username}}/preferences">llegit aquest tema</a>.'
+          "1_2": 'Només se''t notificarà si algú menciona el teu @nom o contesta la teva entrada.'
+          "1": 'Se''t notificarà si algú menciona el teu @nom o contesta la teva entrada.'
+          "0_7": 'No estàs fent cas de les alertes d''aquesta categoria.'
+          "0_2": 'No estàs fent cas de les alertes d''aquest tema.'
+          "0": 'No estàs fent cas de les alertes sobre aquest tema.'
         watching_pm:
           title: "Vigilant-lo"
           description: "Et notificarem cada resposta nova a aquest missatge i et mostrarem un nou recompte de respostes."
@@ -1377,9 +1326,8 @@ ca:
         archive: "Arxiva tema"
         invisible: "Desllista"
         visible: "Fes llistats"
-        reset_read: "Reinicia la lectura de dades"
+        reset_read: "Restableix dades de lectura"
         make_public: "Fes públic el tema"
-        make_private: "Fes un missatge privat"
       feature:
         pin: "Clava tema"
         unpin: "Desclava tema"
@@ -1412,8 +1360,8 @@ ca:
         pin_validation: "Cal una data per clavar aquest tema."
         not_pinned: "No hi ha temes clavats a {{categoryLink}}."
         already_pinned:
-          one: "Temes clavats a hores d'ara{{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
-          other: "Temes clavats a hores d'ara{{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: 'Temes clavats a hores d''ara{{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Temes clavats a hores d''ara{{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         pin_globally: "Fes que aquest tema aparegui al començament de tots fins "
         confirm_pin_globally: "Ja has arribat globalment a {{count}} temes clavats. Massa temes clavats poden carregar les persones usuàries noves o anònimes. Segur que vols clavar un altre tema globalment?"
         unpin_globally: "Eiimina aquest tema del principi del començament de tots."
@@ -1421,8 +1369,8 @@ ca:
         global_pin_note: "Individualment, les mateixes persones usuàries poden desclavar el tema."
         not_pinned_globally: "No hi ha temes clavats globalment."
         already_pinned_globally:
-          one: "Temes globalment clavats a hores d'ara{{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
-          other: "Temes globalment clavats a hores d'ara{{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: 'Temes globalment clavats a hores d''ara{{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Temes globalment clavats a hores d''ara{{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         make_banner: "Fes que aquest tema aparegui emmarcat al començament de totes les pàgines."
         remove_banner: "Eiimina el marc que apareix al començament de totes les pàgines."
         banner_note: "Les persones usuàries poden descartar el marc en tancar-lo. Només es pot emmarcar un tema en qualsevol moment."
@@ -1458,8 +1406,8 @@ ca:
       login_reply: 'Identifica''t per respondre'
       filters:
         n_posts:
-          one: "1 publicació"
-          other: "{{count}} publicacions"
+          one: 1 publicació
+          other: '{{count}} publicacions'
         cancel: "Filtre remot"
       split_topic:
         title: "Mou a un nou tema"
@@ -1467,15 +1415,15 @@ ca:
         topic_name: "Nom del nou tema"
         error: "Hi ha hagut una errada en moure publicacions a aquest nou tema."
         instructions:
-          one: "Estàs a punt de crear un nou tema i difondre'l amb la publicació que has triat."
-          other: "Estàs a punt de crear un nou tema i difondre'l amb les <b>{{count}}</b> publicacions que has triat."
+          one: Estàs a punt de crear un nou tema i difondre'l amb la publicació que has triat.
+          other: Estàs a punt de crear un nou tema i difondre'l amb les <b>{{count}}</b> publicacions que has triat.
       merge_topic:
         title: "Mou a un tema existent"
         action: "mou a un tema existent"
         error: "Hi ha hagut una errada en moure publicacions a aquest tema."
         instructions:
-          one: "Si us plau, tria el tema al qual t'agradaria moure aquesta publicació."
-          other: "Si us plau, tria el tema al qual t'agradaria moure aquestes <b>{{count}}</b> publicacions."
+          one: Si us plau, tria el tema al qual t'agradaria moure aquesta publicació.
+          other: Si us plau, tria el tema al qual t'agradaria moure aquestes <b>{{count}}</b> publicacions.
       merge_posts:
         title: "Uneix les publicacions seleccionades"
         action: "uneix les publicacions seleccionades"
@@ -1487,9 +1435,8 @@ ca:
         label: "Nova persona propietària de les publicacions"
         placeholder: "identitat de la nova persona propietària"
         instructions:
-          one: "Si us plau, selecciona la nova persona propietària de la publicació per <b>{{old_user}}</b>."
-          other: "Si us plau, selecciona la nova persona propietària de les {{count}} publicacions per <b>{{old_user}}</b>."
-        instructions_warn: "Fixa't que qualsevol alerta sobre aquesta publicació no serà transferida a la nova persona usuària retroactivament. <br>Atenció: hores d'ara, no hi ha dades post-dependents transferides a la nova persona usuària. Fes-ho servir amb prudència."
+          one: Si us plau, selecciona la nova persona propietària de la publicació per <b>{{old_user}}</b>.
+          other: Si us plau, selecciona la nova persona propietària de les {{count}} publicacions per <b>{{old_user}}</b>.
       change_timestamp:
         action: "canvia la marca de temps"
         invalid_timestamp: "La hi haurà marca en el futur."
@@ -1506,8 +1453,6 @@ ca:
           one: Has seleccionat <b>1</b> publicació
           other: Has seleccionat <b>{{count}}</b> publicacions.
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Cita"
       edit_reason: "Motiu:"
       post_number: "publicació {{number}}"
@@ -1520,26 +1465,26 @@ ca:
       show_full: "Mostra la publicació sencera"
       show_hidden: 'Mostra el contingut amagat.'
       deleted_by_author:
-        one: "(publicació retirada per la persona autora, s'esborrarà automàticament en 1 hora, si no és marcada amb bandera)"
-        other: "(publicació retirada per la persona autora, s'esborrarà automàticament en %{count} hores, si no és marcada amb bandera)"
+        one: (publicació retirada per la persona autora, s'esborrarà automàticament en 1 hora, si no és marcada amb bandera)
+        other: (publicació retirada per la persona autora, s'esborrarà automàticament en %{count} hores, si no és marcada amb bandera)
       expand_collapse: "eixampla/contrau"
       gap:
-        one: "mira 1 resposta amagada"
-        other: "mira {{count}} respostes amagades"
+        one: mira 1 resposta amagada
+        other: mira {{count}} respostes amagades
       unread: "Publicació no llegida"
       has_replies:
-        one: "{{count}} Resposta"
-        other: "{{count}} Respostes"
+        one: '{{count}} Resposta'
+        other: '{{count}} Respostes'
       has_likes:
-        one: "{{count}}  <i>M'agrada</i>"
-        other: "{{count}} M'agrades"
+        one: '{{count}}  M''agrada'
+        other: '{{count}} M''agrades'
       has_likes_title:
-        one: "La publicació agrada a 1 persona"
-        other: "La publicació agrada a {{count}} persones"
+        one: La publicació agrada a 1 persona
+        other: La publicació agrada a {{count}} persones
       has_likes_title_only_you: "t'ha agradat aquesta publicació"
       has_likes_title_you:
-        one: "La publicació t'agrada a tu i a 1 persona"
-        other: "La publicació t'agrada a tu i a {{count}} persones"
+        one: La publicació t'agrada a tu i a 1 persona
+        other: La publicació t'agrada a tu i a {{count}} persones
       errors:
         create: "Disculpa, s'ha produït una errada en crear la teva publicació. Si us plau, torna-ho a provar."
         edit: "Disculpa, s'ha produït una errada en editar la teva publicació. Si us plau, torna-ho a provar."
@@ -1612,54 +1557,54 @@ ca:
           vote: "Has votat per aquesta publicació"
         by_you_and_others:
           off_topic:
-            one: "Tu i 1 altra persona més heu marcat això amb bandera de fora de context"
-            other: "Tu i {{count}} persones més heu marcat això amb bandera de fora de context"
+            one: Tu i 1 altra persona més heu marcat això amb bandera de fora de context
+            other: Tu i {{count}} persones més heu marcat això amb bandera de fora de context
           spam:
-            one: "Tu i 1 persona més heu marcat això amb bandera de brossa"
-            other: "Tu i {{count}} persones més heu marcat això amb bandera de brossa"
+            one: Tu i 1 persona més heu marcat això amb bandera de brossa
+            other: Tu i {{count}} persones més heu marcat això amb bandera de brossa
           inappropriate:
-            one: "Tu i 1 persona més heu marcat això amb bandera d'inapropiat"
-            other: "Tu i {{count}} persones més heu marcat això amb bandera d'inapropiat"
+            one: Tu i 1 persona més heu marcat això amb bandera d'inapropiat
+            other: Tu i {{count}} persones més heu marcat això amb bandera d'inapropiat
           notify_moderators:
-            one: "Tu i 1 persona més heu marcat això amb bandera per moderar"
-            other: "Tu i {{count}} persones més heu marcat això amb bandera per moderar"
+            one: Tu i 1 persona més heu marcat això amb bandera per moderar
+            other: Tu i {{count}} persones més heu marcat això amb bandera per moderar
           notify_user:
-            one: "Tu i 1 persona més li heu enviat un missatge"
-            other: "Tu i {{count}} persones més li heu enviat un missatge"
+            one: Tu i 1 persona més li heu enviat un missatge
+            other: Tu i {{count}} persones més li heu enviat un missatge
           bookmark:
-            one: "Tu i 1 persona més heu marcat aquesta publicació com a preferit"
-            other: "Tu i {{count}} persones més heu marcat aquesta publicació com a preferit"
+            one: Tu i 1 persona més heu marcat aquesta publicació com a preferit
+            other: Tu i {{count}} persones més heu marcat aquesta publicació com a preferit
           like:
-            one: "Aquesta publicació us ha agradat a tu i a 1 persona més"
-            other: "Aquesta publicació us ha agradat a tu i a {{count}} persones més"
+            one: Aquesta publicació us ha agradat a tu i a 1 persona més
+            other: Aquesta publicació us ha agradat a tu i a {{count}} persones més
           vote:
-            one: "Tu i 1 persona més heu votat per aquesta publicació"
-            other: "Tu i {{count}} persones més heu votat per aquesta publicació"
+            one: Tu i 1 persona més heu votat per aquesta publicació
+            other: Tu i {{count}} persones més heu votat per aquesta publicació
         by_others:
           off_topic:
-            one: "1 person ha marcat aquesta publicació amb bandera de fora de context"
-            other: "{{count}} persones han marcat aquesta publicació amb bandera de fora de context"
+            one: 1 person ha marcat aquesta publicació amb bandera de fora de context
+            other: '{{count}} persones han marcat aquesta publicació amb bandera de fora de context'
           spam:
-            one: "1 persona ha marcat aquesta publicació amb bandera de brossa"
-            other: "{{count}} persones han marcat aquesta publicació amb bandera de brossa"
+            one: 1 persona ha marcat aquesta publicació amb bandera de brossa
+            other: '{{count}} persones han marcat aquesta publicació amb bandera de brossa'
           inappropriate:
-            one: "1 persona ha marcat aquesta publicació amb bandera d'inapropiat"
-            other: "{{count}} persones han marcat aquesta publicació amb bandera d'inapropiat"
+            one: 1 persona ha marcat aquesta publicació amb bandera d'inapropiat
+            other: '{{count}} persones han marcat aquesta publicació amb bandera d''inapropiat'
           notify_moderators:
-            one: "1 persona ha marcat aquesta publicació per moderar"
-            other: "{{count}} persones han marcat aquesta publicació per moderar"
+            one: 1 persona ha marcat aquesta publicació per moderar
+            other: '{{count}} persones han marcat aquesta publicació per moderar'
           notify_user:
-            one: "1 ha enviat un missatge a aquesta persona"
-            other: "{{count}} han enviat un missatge a aquesta persona"
+            one: 1 ha enviat un missatge a aquesta persona
+            other: '{{count}} han enviat un missatge a aquesta persona'
           bookmark:
-            one: "1 persona ha marcat aquesta publicació com a preferit"
-            other: "{{count}} persones han marcat aquesta publicació com a preferit"
+            one: 1 persona ha marcat aquesta publicació com a preferit
+            other: '{{count}} persones han marcat aquesta publicació com a preferit'
           like:
-            one: "això ha agradat a 1 persona"
-            other: "això ha agradat a {{count}} persones"
+            one: això ha agradat a 1 persona
+            other: això ha agradat a {{count}} persones
           vote:
-            one: "1 persona ha votat per aquesta publicació"
-            other: "{{count}} persones han votat per aquesta publicació"
+            one: 1 persona ha votat per aquesta publicació
+            other: '{{count}} persones han votat per aquesta publicació'
       revisions:
         controls:
           first: "Primera revisió"
@@ -1694,6 +1639,8 @@ ca:
       settings: 'Configuracions'
       topic_template: "Plantilla de tema"
       tags: "Etiquetes"
+      tags_allowed_tags: "Permet l'ús de només aquestes etiquetes en aquesta categoria:"
+      tags_allowed_tag_groups: "Permet només l'ús d'etiquetes d'aquests grups en aquesta categoria:"
       tags_placeholder: "Llista (opcional) d'etiquetes permeses"
       tag_groups_placeholder: "Llista (opcional) d'etiquetes de grup permeses"
       topic_featured_link_allowed: "Permet enllaços destacats dins aquesta categoria"
@@ -1728,9 +1675,11 @@ ca:
       email_in_allow_strangers: "Accepta correus des de persones usuàries anònimes sense compte"
       email_in_disabled: "Les publicacions des del correu electrònic estan desactivades a les preferències del lloc. Per activar les publicacions des del correu electrònic, "
       email_in_disabled_click: 'activa l''opció "email in".'
-      suppress_from_homepage: "Suprimeix aquesta categoria des de la pàgina principal."
+      mailinglist_mirror: "La categoria replica una llista de correu"
       show_subcategory_list: "Mostrar les publicacions de les subcategories llistades a continuació d'aquesta categoria."
+      subcategory_num_featured_topics: "Nombre de temes destacats en la pàgina mare de la categoria:"
       all_topics_wiki: "Fes nou temes de wiki per defecte."
+      subcategory_list_style: "Estil de llista de la subcategoria:"
       allow_badges_label: "Permet concedir distintius dins aquesta categoria"
       edit_permissions: "Edita permisos"
       add_permission: "Afegeix permisos"
@@ -1791,14 +1740,14 @@ ca:
       custom_placeholder_notify_moderators: "Deixa'ns saber que t'amoïna i passa'ns tants enllaços rellevants i exemples com sigui possible."
       custom_message:
         at_least:
-          one: "introdueix almenys 1 caràcter"
-          other: "introdueix almenys {{count}} caràcters"
+          one: introdueix almenys 1 caràcter
+          other: introdueix almenys {{count}} caràcters
         more:
-          one: "1 per anar..."
-          other: "{{count}} per anar..."
+          one: 1 per anar...
+          other: '{{count}} per anar...'
         left:
-          one: "1 restant"
-          other: "{{count}} restants"
+          one: 1 restant
+          other: '{{count}} restants'
     flagging_topic:
       title: "Gràcies per ajudar-nos a mantenir polida la nostra comunitat!"
       action: "Marca el tema amb bandera "
@@ -1809,13 +1758,13 @@ ca:
       links_title: "Enllaços populars"
       links_shown: "mostra més enllaços..."
       clicks:
-        one: "1 clic"
-        other: "%{count} clics"
+        one: 1 clic
+        other: '%{count} clics'
     post_links:
       about: "eixampla més enllaços per a aquesta publicació"
       title:
-        one: "1 més"
-        other: "%{count} més"
+        one: 1 més
+        other: '%{count} més'
     topic_statuses:
       warning:
         help: "Aquest és un avís oficial."
@@ -1849,22 +1798,22 @@ ca:
     original_post: "Publicació original"
     views: "Vistes"
     views_lowercase:
-      one: "vista"
-      other: "vistes"
+      one: vista
+      other: vistes
     replies: "Respostes"
     views_long:
-      one: "aquest tema ha estat vist 1 cop"
-      other: "aquest tema ha estat vist {{number}} cops"
+      one: aquest tema ha estat vist 1 cop
+      other: aquest tema ha estat vist {{number}} cops
     activity: "Activitat"
     likes: "Ha agradat"
     likes_lowercase:
-      one: "agrada"
-      other: "Agrada"
+      one: agrada
+      other: Agrada
     likes_long: "aquest tema ha agradat {{number}} cops"
     users: "Persones usuàries"
     users_lowercase:
-      one: "persona usuària"
-      other: "persones usuàries"
+      one: persona usuària
+      other: persones usuàries
     category_title: "Categoria"
     history: "Història"
     changed_by: "per {{author}}"
@@ -1877,8 +1826,8 @@ ca:
       latest:
         title: "Darrers"
         title_with_count:
-          one: "Darrer (1)"
-          other: "Darrers ({{count}})"
+          one: Darrer (1)
+          other: Darrers ({{count}})
         help: "temes amb publicacions recents"
       hot:
         title: "Candent"
@@ -1896,21 +1845,21 @@ ca:
       unread:
         title: "No llegits"
         title_with_count:
-          one: "No llegit (1)"
-          other: "No llegits ({{count}})"
+          one: No llegit (1)
+          other: No llegits ({{count}})
         help: "temes que estàs mirant o seguint amb publicacions no llegides"
         lower_title_with_count:
-          one: "1 no llegit"
-          other: "{{count}} no llegits"
+          one: 1 no llegit
+          other: '{{count}} no llegits'
       new:
         lower_title_with_count:
-          one: "1 nou"
-          other: "{{count}} nous"
+          one: 1 nou
+          other: '{{count}} nous'
         lower_title: "nou"
         title: "Nous"
         title_with_count:
-          one: "Nou (1)"
-          other: "Nous ({{count}})"
+          one: Nou (1)
+          other: Nous ({{count}})
         help: "temes creats durant els darrers dies"
       posted:
         title: "Les meves publicacions"
@@ -1921,8 +1870,8 @@ ca:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: "{{categoryName}} (1)"
-          other: "{{categoryName}} ({{count}})"
+          one: '{{categoryName}} (1)'
+          other: '{{categoryName}} ({{count}})'
         help: "darrers temes a la categoria {{categoryName}} "
       top:
         title: "Més actius"
@@ -2006,22 +1955,21 @@ ca:
         print: '<b>ctrl</b>+<b>p</b> Imprimeix tema'
     badges:
       earned_n_times:
-        one: "Ha rebut distintiu 1 cop"
-        other: "Ha rebut distintiu %{count} cops"
+        one: Ha rebut distintiu 1 cop
+        other: Ha rebut distintiu %{count} cops
       granted_on: "Concedit %{date}"
       others_count: "Altres amb aquest distintiu (%{count})"
       title: Distintius
       badge_count:
-        one: "1 Distintiu"
-        other: "%{count} Distintius"
+        one: 1 Distintiu
+        other: '%{count} Distintius'
       more_badges:
-        one: "+1 Més"
-        other: "+%{count} Més"
+        one: +1 Més
+        other: +%{count} Més
       granted:
-        one: "1 concedit"
-        other: "%{count} concedits"
+        one: 1 concedit
+        other: '%{count} concedits'
       select_badge_for_title: Tria un distintiu per fer-lo servir com al teu títol
-      none: "<none>"
       badge_grouping:
         getting_started:
           name: Començant
@@ -2064,19 +2012,15 @@ ca:
       notifications:
         watching:
           title: "Mirant"
-          description: "Miraràs automàticament tots els temes amb aquesta etiqueta. Et notificarem totes les noves publicacions i els nous temes, així com un recompte de noves publicacions que apareixerà al costat del tema."
         watching_first_post:
           title: "Mirant la primera publicació"
-          description: "Només et notificarem la primera publicació per cada nou tema amb aquesta etiqueta."
         tracking:
           title: "Seguint"
-          description: "Seguiràs automàticament tots els temes amb aquesta etiqueta. Apareixerà al costat del tema un recompte de publicacions noves i no llegides."
         regular:
           title: "Ordinari"
           description: "Rebràs alertes si una persona menciona el teu @nom o respon la teva publicació."
         muted:
           title: "Silenciat"
-          description: "No et notificarem res sobre nous temes amb aquesta etiqueta i no apareixeran a la teva pestanya de no llegits."
       groups:
         title: "Grups d'etiquetes"
         about: "Afegeix etiquetes a grups per gestionar-ho més fàcilment."
@@ -2158,8 +2102,6 @@ ca:
         reports:
           today: "Avui"
           yesterday: "Ahir"
-          last_7_days: "Els darrers 7 dies"
-          last_30_days: "Els darrers 30 dies"
           all_time: "Sempre"
           7_days_ago: "Fa 7 dies"
           30_days_ago: "Fa 30 dies"
@@ -2177,7 +2119,6 @@ ca:
         title: "Avisos"
         agree: "D'acord"
         agree_title: "Confirma aquesta bandera com a vàlida i correcta"
-        defer_flag_title: "Esborra aquesta bandera; no necessita cap acció hores d'ara."
         delete: "Esborra"
         delete_title: "Esborra la publicació a la qual es refereix aquesta bandera."
         delete_post_defer_flag_title: "Esborra la publicació; si és la primera publicació, esborra el tema"
@@ -2211,8 +2152,6 @@ ca:
         title: "Grups"
         edit: "Edita grups"
         refresh: "Actualitza"
-        new: "Nou"
-        selector_placeholder: "escriu nom de persona usuària"
         about: "Edita aquí la teva pertinença de grup i noms"
         group_members: "Membres de grup"
         delete: "Esborra"
@@ -2220,21 +2159,10 @@ ca:
         delete_failed: "Impossible esborrar aquest grup. Si és un grup automàtic, no pot ser destruït."
         delete_owner_confirm: "Esborra privilegis propietaris per a '%{username}'?"
         add: "Afegegix"
-        add_members: "Afegeix membres"
         custom: "Personalitza"
-        bulk_complete: "Les persones usuàries s'han afegit al grup."
-        bulk: "Afegeix a grup massivament"
-        bulk_paste: "Enganxa una llista de persones o correus, un per línia:"
-        bulk_select: "(tria un grup)"
         automatic: "Automàtic"
-        automatic_membership_email_domains: "Les persones registrades amb un domini de correu que coincideix amb un de la llista s'afegiran automàticament a aquest grup:"
-        automatic_membership_retroactive: "Aplica la mateixa regla de domini de correu per afegir persones registrades existents"
-        default_title: "Títol per defecte per a totes les persones a aquest grup"
-        primary_group: "Estableix automàticament com a grup primari"
         group_owners: Persones propietàries
         add_owners: Afegeix persones propietàries
-        incoming_email: "Personalitza l'adreça de correu electrònic entrant:"
-        incoming_email_placeholder: "introdueix una adreça de correu electrònic"
       api:
         generate_master: "Genera una clau mestra API"
         none: "No hi ha claus API actives ara mateix"
@@ -2297,11 +2225,11 @@ ca:
           none: "No hi ha esdeveniments relacionats"
           redeliver: "Relliura"
           incoming:
-            one: "Hi ha un nou esdeveniment."
-            other: "Hi ha {{count}} esdeveniments nous."
+            one: Hi ha un nou esdeveniment.
+            other: Hi ha {{count}} esdeveniments nous.
           completed_in:
-            one: "Completat en 1 segon."
-            other: "Completat en {{count}} segons."
+            one: Completat en 1 segon.
+            other: Completat en {{count}} segons.
           request: "Sol·licita"
           response: "Reacció"
           redeliver_confirm: "Segur que vols tornar a lliurar la mateixa càrrega útil?"
@@ -2352,7 +2280,6 @@ ca:
           label: "Carrega"
           title: "Carrega una còpia de seguretat a aquesta instància"
           uploading: "Carregant..."
-          success: "S'ha carregat '{{filename}}' amb èxit."
           error: "S'ha produït un error en carregar '{{filename}}': {{message}}"
         operations:
           is_running: "Ara hi ha una operació en marxa..."
@@ -2365,7 +2292,6 @@ ca:
             label: "Còpia de seguretat"
             title: "Crea una còpia de seguretat"
             confirm: "Vols iniciar una nova còpia de seguretat?"
-            without_uploads: "Sí (no hi incloguis fitxers)"
           download:
             label: "Descarrega"
           destroy:
@@ -2639,11 +2565,11 @@ ca:
           suspect: 'Sospita'
         approved: "Aprovat?"
         approved_selected:
-          one: "Aprova persona usuària"
-          other: "Aprova persones usuàries ({{count}})"
+          one: Aprova persona usuària
+          other: Aprova persones usuàries ({{count}})
         reject_selected:
-          one: "Refusa persona usuària"
-          other: "Refusa persones usuàries ({{count}})"
+          one: Refusa persona usuària
+          other: Refusa persones usuàries ({{count}})
         titles:
           active: 'Persones usuàries actives'
           new: 'Nova persones usuàries'
@@ -2659,11 +2585,11 @@ ca:
           suspended: 'Persones usuàries suspeses'
           suspect: 'Persones usuàries sospitoses'
         reject_successful:
-          one: "1 persona usuària refusada amb èxit"
-          other: "%{count} persones usuàries refusades amb èxit"
+          one: 1 persona usuària refusada amb èxit
+          other: '%{count} persones usuàries refusades amb èxit'
         reject_failures:
-          one: "Ha fallat en refusar 1 persona usuària."
-          other: "Ha fallat en refusar %{count} persones usuàries."
+          one: Ha fallat en refusar 1 persona usuària.
+          other: Ha fallat en refusar %{count} persones usuàries.
         not_verified: "No verificat"
         check_email:
           title: "Mostra correu electrònic d'aquesta persona"
@@ -2722,14 +2648,14 @@ ca:
         delete_forbidden_because_staff: "No es poden esborrar les persones administradores i moderadores."
         delete_posts_forbidden_because_staff: "No es poden esborrar totes les publicacions de les persones administradores i moderadores."
         delete_forbidden:
-          one: "No es poden esborrar les persones usuàries si tenen publicacions. Esborra totes les publicacions abans d'eliminar una persona usuària. (No es poden esborrar les publicacions amb més d'%{count} dia)"
-          other: "No es poden esborrar les persones usuàries si tenen publicacions. Esborra totes les publicacions abans d'eliminar una persona usuària. (No es poden esborrar les publicacions amb més de %{count} dies)"
+          one: No es poden esborrar les persones usuàries si tenen publicacions. Esborra totes les publicacions abans d'eliminar una persona usuària. (No es poden esborrar les publicacions amb més d'%{count} dia)
+          other: No es poden esborrar les persones usuàries si tenen publicacions. Esborra totes les publicacions abans d'eliminar una persona usuària. (No es poden esborrar les publicacions amb més de %{count} dies)
         cant_delete_all_posts:
-          one: "No es poden esborrar totes les publicacions. Algunes publicacions tenen més d'%{count} dia. (La configuració delete_user_max_post_age)"
-          other: "No es poden esborrar totes les publicacions. Algunes publicacions tenen més de %{count} dies. (La configuració delete_user_max_post_age)"
+          one: No es poden esborrar totes les publicacions. Algunes publicacions tenen més d'%{count} dia. (La configuració delete_user_max_post_age)
+          other: No es poden esborrar totes les publicacions. Algunes publicacions tenen més de %{count} dies. (La configuració delete_user_max_post_age)
         cant_delete_all_too_many_posts:
-          one: "No es poden esborrar totes les publicacions perquè la persona usuària té més d'1 publicació.  (delete_all_posts_max)"
-          other: "No es poden esborrar totes les publicacions perquè la persona usuària té més de %{count} publicacions.  (delete_all_posts_max)"
+          one: No es poden esborrar totes les publicacions perquè la persona usuària té més d'1 publicació.  (delete_all_posts_max)
+          other: No es poden esborrar totes les publicacions perquè la persona usuària té més de %{count} publicacions.  (delete_all_posts_max)
         delete_confirm: "Segur que vols esborrar aquesta persona? Això és permanent!"
         delete_and_block: "Esborra i <b>bloca</i> aquest correu electrònic i adreça IP"
         delete_dont_block: "Només esborra"
@@ -2764,8 +2690,8 @@ ca:
         tl3_requirements:
           title: "Requisits per al nivell de confiança 3"
           table_title:
-            one: "durant el darrer dia:"
-            other: "durant els darrers %{count} dies:"
+            one: 'durant el darrer dia:'
+            other: 'durant els darrers %{count} dies:'
           value_heading: "Valor"
           requirement_heading: "Requisit"
           visits: "Visites"
@@ -2840,10 +2766,7 @@ ca:
         recommended: "Recomanem personalitzar el següent text segons les teves necessitats:"
         show_overriden: 'Només mostra anul·lat'
       site_settings:
-        show_overriden: 'Només mostra anul·lat'
         title: 'Configuració'
-        reset: 'restableix'
-        none: 'cap'
         no_results: "Sense resultats"
         clear_filter: "Neteja"
         add_url: "afegeix URL"
@@ -2892,11 +2815,11 @@ ca:
         reason_help: (Un enllaç a una publicació o un tema)
         save: Desa
         delete: Esborra
-        delete_confirm: Segur que vols esborrar aquest distintiu?
+        delete_confirm: "Segur que vols esborrar aquest distintiu?"
         revoke: Revoca
         reason: Motiu
-        expand: 'Expandeix &hellip; '
-        revoke_confirm: Segur que vols revocar aquest distintiu?
+        expand: "Expandeix &hellip; "
+        revoke_confirm: "Segur que vols revocar aquest distintiu?"
         edit_badges: Edita distintius
         grant_badge: Atorga distintiu
         granted_badges: Distintius concedits
@@ -2910,7 +2833,6 @@ ca:
         enabled: Activa distintiu
         icon: Icona
         image: Imatge
-        icon_help: "Fes servir la classe Font Awesome o una URL a una imatge"
         query: Consulta distintius (SQL)
         target_posts: La consulta apunta les publicacions
         auto_revoke: Executa la consulta diària de revocacions
@@ -2934,14 +2856,14 @@ ca:
             text: "Hi ha mostres perdudes de concessions. Això passa quan la consulta de distintius retorna ID de persona usuària o de publicacions que no existeixen. Després això pot provocar resultats inesperats - si us plau, torna a revisar la teva consulta."
           no_grant_count: "No hi ha distintius per assignar."
           grant_count:
-            one: "<b>1</b> distintiu per assignar."
-            other: "<b>%{count}</b> distintius per assignar."
+            one: <b>1</b> distintiu per assignar.
+            other: <b>%{count}</b> distintius per assignar.
           sample: "Exemple:"
           grant:
-            with: <span class="username">%{username}</span>
-            with_post: <span class="username">%{username}</span> per a publicació dins %{link}
-            with_post_time: <span class="username">%{username}</span> per a publicació dins %{link} a <span class="time">%{time}</span>
-            with_time: <span class="username">%{username}</span> a <span class="time">%{time}</span>
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span> per a publicació dins %{link}"
+            with_post_time: "<span class=\"username\">%{username}</span> per a publicació dins %{link} a <span class=\"time\">%{time}</span>"
+            with_time: "<span class=\"username\">%{username}</span> a <span class=\"time\">%{time}</span>"
       emoji:
         title: "Emoji"
         help: "Afegeix un nou emoji que serà disponible per a tothom. (GRAN CONSELL: arrossega i deixa anar molts fitxers d'un sol cop)"
@@ -2985,7 +2907,7 @@ ca:
         category_id: "ID de categoria"
         category_title: "Categoria"
         external_url: "URL externa"
-        delete_confirm: Segur que vols esborrar aquest enllaç permanent?
+        delete_confirm: "Segur que vols esborrar aquest enllaç permanent?"
         form:
           label: "Nou:"
           add: "Afegegix"
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index 2681c52dfc1..67e5c43984c 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -16,8 +16,9 @@ cs:
           format: '%n %u'
           units:
             byte:
-              one: bajt
               few: bajty
+              many: bajtů
+              one: bajt
               other: bajtů
             gb: GB
             kb: kB
@@ -44,81 +45,109 @@ cs:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: "< 1s"
-          few: "< %{count}s"
-          other: "< %{count}s"
+          few: < %{count}s
+          many: < %{count}s
+          one: < 1s
+          other: < %{count}s
         x_seconds:
-          one: "1s"
-          few: "%{count}s"
-          other: "%{count}s"
+          few: '%{count}s'
+          many: '%{count}s'
+          one: 1s
+          other: '%{count}s'
+        less_than_x_minutes:
+          few: < %{count}m
+          many: < %{count}m
+          one: < 1m
+          other: < %{count}m
         x_minutes:
-          one: "1m"
-          few: "%{count}m"
-          other: "%{count}m"
+          few: '%{count}m'
+          many: '%{count}m'
+          one: 1m
+          other: '%{count}m'
         about_x_hours:
-          one: "1h"
-          few: "%{count}h"
-          other: "%{count}h"
+          few: '%{count}h'
+          many: '%{count}h'
+          one: 1h
+          other: '%{count}h'
         x_days:
-          one: "1d"
-          few: "%{count}d"
-          other: "%{count}d"
+          few: '%{count}d'
+          many: '%{count}d'
+          one: 1d
+          other: '%{count}d'
+        x_months:
+          few: '%{count} měsíce'
+          many: '%{count} měsíců'
+          one: 1 měsíc
+          other: '%{count} měsíců'
         about_x_years:
-          one: "1r"
-          few: "%{count}r"
-          other: "%{count}let"
+          few: '%{count}r'
+          many: '%{count}let'
+          one: 1r
+          other: '%{count}let'
         over_x_years:
-          one: "> 1r"
-          few: "> %{count}r"
-          other: "> %{count}let"
+          few: '> %{count}r'
+          many: '> %{count}let'
+          one: '> 1r'
+          other: '> %{count}let'
         almost_x_years:
-          one: "1r"
-          few: "%{count}r"
-          other: "%{count}let"
+          few: '%{count}r'
+          many: '%{count}let'
+          one: 1r
+          other: '%{count}let'
         date_month: "D. MMMM"
         date_year: "MMMM YYYY"
       medium:
         x_minutes:
-          one: "1 minuta"
-          few: "%{count} minuty"
-          other: "%{count} minut"
+          few: '%{count} minuty'
+          many: '%{count} minut'
+          one: 1 minuta
+          other: '%{count} minut'
         x_hours:
-          one: "1 hodina"
-          few: "%{count} hodiny"
-          other: "%{count} hodin"
+          few: '%{count} hodiny'
+          many: '%{count} hodin'
+          one: 1 hodina
+          other: '%{count} hodin'
         x_days:
-          one: "1 den"
-          few: "%{count} dny"
-          other: "%{count} dní"
+          few: '%{count} dny'
+          many: '%{count} dní'
+          one: 1 den
+          other: '%{count} dní'
         date_year: "D. M. YYYY"
       medium_with_ago:
         x_minutes:
-          one: "před 1 minutou"
-          few: "před %{count} minutami"
-          other: "před %{count} minutami"
+          few: před %{count} minutami
+          many: před %{count} minutami
+          one: před 1 minutou
+          other: před %{count} minutami
         x_hours:
-          one: "před 1 hodinou"
-          few: "před %{count} hodinami"
-          other: "před %{count} hodinami"
+          few: před %{count} hodinami
+          many: před %{count} hodinami
+          one: před 1 hodinou
+          other: před %{count} hodinami
         x_days:
-          one: "před 1 dnem"
-          few: "před %{count} dny"
-          other: "před %{count} dny"
+          few: před %{count} dny
+          many: před %{count} dny
+          one: před 1 dnem
+          other: před %{count} dny
       later:
         x_days:
-          one: "za 1 den"
-          few: "za %{count} dny"
-          other: "za %{count} dní"
+          few: za %{count} dny
+          many: o %{count} dní později
+          one: za 1 den
+          other: o %{count} dní později
         x_months:
-          one: "za 1 měsíc"
-          few: "za %{count} měsíce"
-          other: "za %{count} měsíců"
+          few: za %{count} měsíce
+          many: o %{count} měsíců později
+          one: za 1 měsíc
+          other: o %{count} měsíců později
         x_years:
-          one: "za 1 rok"
-          few: "za %{count} roků"
-          other: "za %{count} let"
+          few: za %{count} roků
+          many: o %{count} let později
+          one: za 1 rok
+          other: o %{count} let později
       previous_month: 'Předchozí měsíc'
       next_month: 'Další měsíc'
+      placeholder: datum
     share:
       topic: 'sdílet odkaz na toto téma'
       post: 'příspěvek #%{postNumber}'
@@ -129,10 +158,11 @@ cs:
       email: 'odeslat odkaz emailem'
     action_codes:
       public_topic: "Téma zveřejněno %{when}"
-      private_topic: "Téma změněno na soukromé %{when}"
-      split_topic: "rozděl toto téma %{when}"
+      private_topic: "Téma změněno na osobní zprávu %{when}"
+      split_topic: "rozdělil toto téma %{when}"
       invited_user: "%{who} pozván %{when}"
       invited_group: "%{who} pozvána %{when}"
+      user_left: "%{who} se odstranil z této zpráy %{when}"
       removed_user: "%{who} smazán %{when}"
       removed_group: "%{who} smazána %{when}"
       autoclosed:
@@ -148,16 +178,18 @@ cs:
         enabled: 'připnuto %{when}'
         disabled: 'odepnuto %{when}'
       pinned_globally:
-        enabled: 'globálně přinuto %{when}'
+        enabled: 'globálně připnuto %{when}'
         disabled: 'odepnuto %{when}'
       visible:
         enabled: 'uvedeno %{when}'
         disabled: 'neuvedeno %{when}'
       banner:
         enabled: 'vytvořil(a) tento banner %{when}. Bude se zobrazovat nahoře na každé stránce, dokud nebude uživatelem odmítnut.'
+        disabled: 'odstranil(a) tento banner %{when}. Už se nebude zobrazovat na každé stránce nahoře.'
     topic_admin_menu: "akce administrátora tématu"
+    wizard_required: "Vítejte ve vašem novém Discourse! Začněte s <a href='%{url}' data-auto-route='true'>nastavením pomocí průvodce</a> ✨"
     emails_are_disabled: "Všechny odchozí emaily byly administrátorem vypnuty. Žádné odchozí emaily nebudou odeslány."
-    bootstrap_mode_enabled: "Aby se váš web jednodušeji rozjel, nachází se v režimu bootstrap. Všichni noví uživatelé začínají s důveryhodností 1 a mají povolené denní odesílání souhrnných emailů. Tento režim se automaticky vypne, jakmile počet registrovaných uživatelů překročí %{min_users}."
+    bootstrap_mode_enabled: "Aby se váš web jednodušeji rozjel, nachází se v režimu bootstrap. Všichni noví uživatelé začínají s důveryhodností 1 a mají povolené denní odesílání souhrnných emailů. Tento režim se automaticky vypne, jakmile se zaregistruje alespoň %{min_users} uživatelů."
     bootstrap_mode_disabled: "Režim bootstrap bude deaktivován v následujících 24 hodinách."
     themes:
       default_description: "Výchozí"
@@ -174,6 +206,7 @@ cs:
         eu_west_2: "EU (Londýn)"
         sa_east_1: "Jižní Amerika (Sao Paulo)"
         us_east_1: "Východ USA (S. Virginie)"
+        us_east_2: "Východ USA (Ohio)"
         us_gov_west_1: "AWS GovCloud (USA)"
         us_west_1: "Západ USA (S. Kalifornie)"
         us_west_2: "Západ USA (Oregon)"
@@ -181,6 +214,7 @@ cs:
     not_implemented: "Tato funkce ještě nebyla naprogramována, omlouváme se."
     no_value: "Ne"
     yes_value: "Ano"
+    submit: "Odeslat"
     generic_error: "Bohužel nastala chyba."
     generic_error_with_reason: "Nastala chyba: %{error}"
     sign_up: "Registrace"
@@ -193,9 +227,10 @@ cs:
     show_help: "možnosti"
     links: "Odkazy"
     links_lowercase:
-      one: "odkaz"
-      few: "odkazy"
-      other: "odkazů"
+      few: odkazy
+      many: odkazů
+      one: odkaz
+      other: odkazů
     faq: "FAQ"
     guidelines: "Pokyny"
     privacy_policy: "Ochrana soukromí"
@@ -219,9 +254,10 @@ cs:
     max_of_count: "max z"
     alternation: "nebo"
     character_count:
-      one: "{{count}} znak"
-      few: "{{count}} znaky"
-      other: "{{count}} znaků"
+      few: '{{count}} znaky'
+      many: '{{count}} znaků'
+      one: '{{count}} znak'
+      other: '{{count}} znaků'
     suggested_topics:
       title: "Doporučená témata"
       pm_title: "Doporučené zprávy"
@@ -233,8 +269,6 @@ cs:
       our_moderators: "Naši Moderátoři"
       stat:
         all_time: "Za celou dobu"
-        last_7_days: "Posledních 7 dní"
-        last_30_days: "Posledních 30 dní"
       like_count: "Líbí se"
       topic_count: "Témata"
       post_count: "Příspěvky"
@@ -256,18 +290,20 @@ cs:
       remove: "Odstranit záložku"
       confirm_clear: "Opravdu chcete odstranit všechny záložky z tohoto tématu?"
     topic_count_latest:
-      one: "{{count}} nové nebo upravené téma."
-      few: "{{count}} nová nebo upravená témata."
-      other: "{{count}} nových nebo upravených témat."
+      few: Zobrazit {{count}} nová nebo upravená témata
+      many: Zobrazit {{count}} nových nebo upravených témat
+      one: Zobrazit {{count}} nové nebo upravené téma
+      other: Zobrazit {{count}} nových nebo upravených témat
     topic_count_unread:
-      one: "{{count}} nepřečtené téma."
-      few: "{{count}} nepřečtená témata."
-      other: "{{count}} nepřečtených témat."
+      few: Zobrazit {{count}} nepřečtená témata
+      many: Zobrazit {{count}} nepřečtených témat
+      one: Zobrazit {{count}} nepřečtené téma
+      other: Zobrazit {{count}} nepřečtených témat
     topic_count_new:
-      one: "{{count}} nové téma."
-      few: "{{count}} nová témata."
-      other: "{{count}} nových témat."
-    click_to_show: "Klikněte pro zobrazení."
+      few: Zobrazit {{count}} nová témata
+      many: Zobrazit {{count}} nových témat
+      one: Zobrazit {{count}} nové téma
+      other: Zobrazit {{count}} nových témat
     preview: "ukázka"
     cancel: "zrušit"
     save: "Uložit změny"
@@ -277,8 +313,10 @@ cs:
     uploading: "Nahrávám..."
     uploading_filename: "Nahrávání {{filename}}..."
     uploaded: "Nahráno!"
+    pasting: "Vkládám..."
     enable: "Zapnout"
     disable: "Vypnout"
+    continue: "Pokračovat"
     undo: "Zpět"
     revert: "Vrátit"
     failed: "Selhání"
@@ -296,25 +334,27 @@ cs:
       topic: "Téma:"
       approve: 'Schválit'
       reject: 'Odmítnout'
-      delete_user: 'Smažat uživatele'
+      delete_user: 'Smazat uživatele'
       title: "Potřebuje schválení"
       none: "Žádné příspěvky ke kontrole."
       edit: "Upravit"
       cancel: "Zrušit"
       view_pending: "zobrazit příspěvky čekající na schválení"
       has_pending_posts:
-        one: "Toto téma má 1 příspěvek, který čeká na schválení."
-        few: "Toto téma má <b>{{count}}</b> příspěvky, které čekají na schválení."
-        other: "Toto téma má <b>{{count}}</b> příspěvků, které čekají na schválení."
+        few: Toto téma má <b>{{count}}</b> příspěvky, které čekají na schválení.
+        many: Toto téma má <b>{{count}}</b> příspěvků, které čekají na schválení.
+        one: Toto téma má 1 příspěvek, který čeká na schválení.
+        other: Toto téma má <b>{{count}}</b> příspěvků, které čekají na schválení.
       confirm: "Uložit změny"
       delete_prompt: "Jste si jistí, že chcete smazat uživatele <b>%{username}</b>? Tímto smažete všechny jejich příspěvky a zablokujete jejich emailovou a IP addresu."
       approval:
         title: "Příspěvek potřebuje schválení"
         description: "Obdrželi jsme váš příspěvek, ale musí být před zveřejněním schválen moderátorem. Buďte trpěliví."
         pending_posts:
-          one: "Máte <strong>1</strong> příspěvek ke schválení."
-          few: "Máte <strong>{{count}}</strong> příspěvků ke schválení."
-          other: "Máte <strong>{{count}}</strong> příspěvků ke schválení."
+          few: Máte <strong>{{count}}</strong> příspěvků ke schválení.
+          many: Máte <strong>{{count}}</strong> příspěvků ke schválení.
+          one: Máte <strong>1</strong> příspěvek ke schválení.
+          other: Máte <strong>{{count}}</strong> příspěvků ke schválení.
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> zaslal <a href='{{topicUrl}}'>téma</a>"
@@ -348,9 +388,10 @@ cs:
       posts_read: "Přečteno"
       posts_read_long: "Příspěvků přečteno"
       total_rows:
-        one: "1 uživatel"
-        few: "%{count} uživatelé"
-        other: "%{count} uživatelů"
+        few: '%{count} uživatelé'
+        many: '%{count} uživatelů'
+        one: 1 uživatel
+        other: '%{count} uživatelů'
     group_histories:
       actions:
         change_group_setting: "Změnit nastavení skupiny"
@@ -359,56 +400,101 @@ cs:
         make_user_group_owner: "Udělej vlastníkem"
         remove_user_as_group_owner: "Odstraň vlastníka"
     groups:
-      logs:
-        title: "Logy"
-        when: "Když"
-        action: "Akce"
-        target_user: "Cílový uživatel"
-        subject: "Předmět"
-        details: "Detail"
-        from: "Od"
-        to: "Komu"
-      edit:
-        title: 'Editovat skupinu'
-        full_name: 'Celé jméno'
+      add_members:
+        title: "Přidat členy"
+        description: "Spravovat členství v této skupině"
+        usernames: "Uživatelská jména"
+      manage:
+        title: 'Spravovat'
+        name: 'Název'
+        full_name: 'Celé název'
         add_members: "Přidat členy"
-        delete_member_confirm: "Odstranit '%{username}' ze skupiny '%{group}'?"
-      name_placeholder: "Název skupiny, bez mezer, stejná pravidla jako pro uživatelská jména"
+        delete_member_confirm: "Odstranit '%{username}' ze '%{group}' skupiny?"
+        profile:
+          title: Profil
+        membership:
+          title: Členství
+          access: Přístup
+        logs:
+          title: "Logy"
+          when: "Když"
+          action: "Akce"
+          target_user: "Cílový uživatel"
+          subject: "Předmět"
+          from: "Od"
+      public_admission: "Povolit uživatelům volný přístup do skupiny (skupina musí být veřejně viditelná)"
+      public_exit: "Povolit uživatelům volně opustit skupinu"
+      empty:
+        posts: "V této skupině není od žádného člena ani jeden příspěvek."
+        members: "V této skupině není žádny uživatel."
+        mentions: "O této skupině nepadla žádná zmínka."
+        messages: "Pro tuto skupinu není žádná zpráva."
+        topics: "V této skupině není od žádného člena ani jedno téma."
+        logs: "Pro tuto skupinu neexistují žádné logy."
       add: "Přidat"
       join: "Přidat se ke skupině"
       leave: "Opustit skupinu"
       request: "Požádat o členství ve skupině"
-      automatic_group: Automatická skupina
-      closed_group: Uzavřená skupina
-      is_group_user: "Jsi členem této skupiny"
+      message: "Zpráva"
+      allow_membership_requests: "Povolit uživatelům odeslat žádost o členství vlastníkům skupin"
+      membership_request_template: "Šablona, která se uživatelům zobrazí při odesílání žádosti o členství"
+      membership_request:
+        submit: "Odeslat požadavek"
+        title: "Žádost o členství v @%{group_name}"
+        reason: "Informovat vlastníky skupiny proč patříte do této skupiny"
       membership: "Členství"
       name: "Název"
-      user_count: "Počet členů"
+      group_name: "Název skupiny"
+      user_count: "Uživatelé"
       bio: "O skupině"
-      selector_placeholder: "Přidat členy"
+      selector_placeholder: "zadejte uživatelské jméno"
       owner: "Vlastník"
       index:
         title: "Skupiny"
+        all: "Všechny skupiny"
         empty: "Žádné viditelné skupiny."
+        filter: "Filtrovat podle typu skupiny"
+        owner_groups: "Skupiny, jejichž jsem majitelem"
+        close_groups: "Uzavřené skupiny"
+        automatic_groups: "Automatické skupiny"
+        automatic: "Automatické"
+        closed: "Uzavřeno"
+        public: "Veřejné"
+        private: "Soukromé"
+        public_groups: "Veřejné skupiny"
+        automatic_group: Automatická skupina
+        close_group: Zavřít skupinu
+        my_groups: "Moje skupiny"
+        group_type: "Typ skupiny"
+        is_group_user: "Člen"
+        is_group_owner: "Vlastník"
+      title:
+        few: Skupiny
+        many: Skupin
+        one: Skupina
+        other: Skupin
       activity: "Aktivita"
-      members: "Členové"
+      members:
+        title: "Členové"
+        filter_placeholder_admin: "uživatelské jméno nebo email"
+        filter_placeholder: "uživatelské jméno"
+        remove_member: "Odstranit člena"
+        remove_member_description: "Odstranit <b>%{username}</b> z této skupiny"
+        make_owner: "Udělej vlastníkem"
+        owner: "Vlastník"
       topics: "Témata"
       posts: "Odpovědi"
       mentions: "Zmínění"
       messages: "Zprávy"
-      visibility_levels:
-        title: "Kdo vidí tuto skupinu?"
-        public: "Všichni"
-        members: "Vlastníci skupiny, členové a správci"
+      notification_level: "Výchozí úroveň upozornění pro zprávy ze skupiny"
       alias_levels:
+        mentionable: "Kdo může @zmiňovat tuto skupinu?"
+        messageable: "Kdo může psát zprávy do této skupinu?"
         nobody: "Nikdo"
         only_admins: "Pouze správci"
         mods_and_admins: "Pouze moderátoři a správci"
         members_mods_and_admins: "Pouze členové skupiny, moderátoři a správci"
         everyone: "Kdokoliv"
-      trust_levels:
-        title: "Automaticky přidělená úroveň důvěryhodnosti členům když jsou přidáni: "
-        none: "Žádná"
       notifications:
         watching:
           title: "Hlídané"
@@ -420,29 +506,35 @@ cs:
           title: "Sledování"
           description: "Budete informováni pokud někdo zmíní vaše @jméno nebo odpoví na váš příspěvek a zobrazí se vám počet nových odpovědí."
         regular:
-          title: "Normalní"
+          title: "Normální"
           description: "Budete informováni pokud někdo zmíní vaše @jméno nebo odpoví na váš příspěvek."
         muted:
           title: "Ztišený"
           description: "Nikdy nedostanete oznámení o nových tématech v této skupině."
+      flair_url: "Avatar Flair obrázek"
+      flair_url_placeholder: "(Volitelné) URL obrázku nebo třída Font Awesome "
+      flair_bg_color: "Avatar Flair barva pozadí"
+      flair_bg_color_placeholder: "(Volitelné) Hex kód barvy"
+      flair_color: "Avatar Flair barva"
+      flair_color_placeholder: "(Volitelné) Hex kód barvy"
       flair_preview_icon: "Náhled ikony"
       flair_preview_image: "Náhled obrázku"
     user_action_groups:
-      '1': "Rozdaných 'líbí se'"
-      '2': "Obdržených 'líbí se'"
-      '3': "Záložky"
-      '4': "Témata"
-      '5': "Odpovědi"
-      '6': "Odezva"
-      '7': "Zmínění"
-      '9': "Citace"
-      '11': "Editace"
-      '12': "Odeslané zprávy"
-      '13': "Přijaté zprávy"
-      '14': "Čeká na schválení"
+      "1": "Rozdaných 'líbí se'"
+      "2": "Obdržených 'líbí se'"
+      "3": "Záložky"
+      "4": "Témata"
+      "5": "Odpovědi"
+      "6": "Odezva"
+      "7": "Zmínění"
+      "9": "Citace"
+      "11": "Editace"
+      "12": "Odeslané zprávy"
+      "13": "Přijaté zprávy"
+      "14": "Čeká na schválení"
     categories:
       all: "všechny kategorie"
-      all_subcategories: "vše"
+      all_subcategories: "všechny v %{categoryName}"
       no_subcategory: "žádné"
       category: "Kategorie"
       category_list: "Zobrazit seznam kategorií"
@@ -461,13 +553,15 @@ cs:
       toggle_ordering: "Přepnout editaci pořadí"
       subcategories: "Podkategorie"
       topic_sentence:
-        one: "1 téma"
-        few: "%{count} témata"
-        other: "%{count} témat"
+        few: '%{count} témata'
+        many: '%{count} témat'
+        one: 1 téma
+        other: '%{count} témat'
       topic_stat_sentence:
-        one: "%{count} nové téma za posledních %{unit}."
-        few: "%{count} nová témata za posledních %{unit}."
-        other: "%{count} nových témat za posledních %{unit}."
+        few: '%{count} nová témata za posledních %{unit}.'
+        many: '%{count} nových témat za posledních %{unit}.'
+        one: '%{count} nové téma za posledních %{unit}.'
+        other: '%{count} nových témat za posledních %{unit}.'
     ip_lookup:
       title: Vyhledávání podle IP adresy
       hostname: Hostname
@@ -476,13 +570,14 @@ cs:
       organisation: Organizace
       phone: Telefon
       other_accounts: "Další účty s touto IP adresou:"
-      delete_other_accounts: "Smazat"
+      delete_other_accounts: "Smazat %{count}"
       username: "uživatelské jméno"
       trust_level: "Důvěra"
       read_time: "čas k přečtení"
       topics_entered: "témat zadáno"
       post_count: "počet příspěvků"
       confirm_delete_other_accounts: "Určitě chcete smazat tyto účty?"
+      powered_by: "běží na <a href='https://ipinfo.io'>ipinfo.io</a>"
     user_fields:
       none: "(zvolit možnost)"
     user:
@@ -501,6 +596,7 @@ cs:
       activity_stream: "Aktivita"
       preferences: "Nastavení"
       expand_profile: "Rozšířit"
+      collapse_profile: "Sbalit"
       bookmarks: "Záložky"
       bio: "O mně"
       invited_by: "Pozvánka od"
@@ -508,7 +604,6 @@ cs:
       notifications: "Oznámení"
       statistics: "Statistiky"
       desktop_notifications:
-        label: "Upozornění na desktopu"
         not_supported: "Tento prohlížeč nepodporuje upozornění. Omlouváme se."
         perm_default: "Vypnout upozornění."
         perm_denied_btn: "Povolení zamítnuto"
@@ -516,12 +611,14 @@ cs:
         disable: "Vypnout upozornění"
         enable: "Povolit upozornění"
         each_browser_note: "Poznámka: Musíš změnit tuto volbu v každém prohlížeči, který používáš."
-      dismiss: 'Odbýt'
-      dismiss_notifications: "Odbýt vše"
+      dismiss: 'Označit jako přečtené'
+      dismiss_notifications: "Označit vše jako přečtené"
       dismiss_notifications_tooltip: "Označit všechny nepřečtené notifikace jako přečtené"
       first_notification: "Vaše první notifikace! Klikněte zde a začněte."
       disable_jump_reply: "Po odpovědi nepřeskakovat na nový příspěvek"
       dynamic_favicon: "Zobrazit počet nových témat v ikoně prohlížeče"
+      theme_default_on_all_devices: "Nastavit tento motiv jako výchozí na všech mých zařízeních"
+      allow_private_messages: "Povolit ostatním uživatelům, aby mi mohli zasílat osobní zprávy"
       external_links_in_new_tab: "Otevírat všechny externí odkazy do nové záložky"
       enable_quoting: "Povolit odpověď s citací z označeného textu"
       change: "změnit"
@@ -529,7 +626,9 @@ cs:
       admin: "{{user}} je administrátor"
       moderator_tooltip: "Tento uživatel je moderátor"
       admin_tooltip: "Tento uživatel je admi"
+      silenced_tooltip: "Tento uživatel je ztišen."
       suspended_notice: "Uživatel je suspendován do {{date}}."
+      suspended_permanently: "Tento uživatel je suspendován."
       suspended_reason: "Důvod: "
       github_profile: "Github"
       email_activity_summary: "Souhrn aktivit"
@@ -560,10 +659,10 @@ cs:
       watched_first_post_tags_instructions: "Budete informováni o prvním novém příspěvku v každém novém tématu s těmito štítky."
       muted_categories: "Ztišené"
       muted_categories_instructions: "Budeš přijímat upornění na nová témata v těchto kategoriích a ty se neobjeví v aktuálních."
+      no_category_access: "Jako moderátor máte omezený přístup ke kategorii bez možnosti ukládat změny."
       delete_account: "Smazat můj účet"
       delete_account_confirm: "Jste si jisti, že chcete trvale odstranit svůj účet? Tuto akci nelze vrátit zpět!"
       deleted_yourself: "Váš účet byl úspěšně odstraněn."
-      delete_yourself_not_allowed: "Váš účet teď nejde odstranit. Obraťte se na správce aby váš účet smazal za vás."
       unread_message_count: "Zprávy"
       admin_delete: "Smazat"
       users: "Uživatelé"
@@ -571,10 +670,15 @@ cs:
       muted_users_instructions: "Umlčet všechny notifikace od těchto uživatelů."
       muted_topics_link: "Ukázat utlumená témata"
       watched_topics_link: "Ukázat hlídaná témata"
+      tracked_topics_link: "Ukázat sledovaná témata"
       automatically_unpin_topics: "Atomaticky odepni téma jakmile se dostanu na konec."
       apps: "Aplikace"
       revoke_access: "Odebrat přístup"
+      undo_revoke_access: "Zrušit odebrání přístupu"
       api_approved: "Schváleno:"
+      theme: "Motiv"
+      home: "Výchozí domovská stránka"
+      staged: "Staged"
       staff_counters:
         flags_given: "užitečná nahlášení"
         flagged_posts: "nahlášených příspěvků"
@@ -592,6 +696,7 @@ cs:
         move_to_archive: "Archivovat"
         failed_to_move: "Nepodařilo se přesunout vybrané zprávy (možná vám spadlo připojení)"
         select_all: "Vybrat vše"
+        tags: "Štítek"
       preferences_nav:
         account: "Účet"
         profile: "Profil"
@@ -609,6 +714,11 @@ cs:
         set_password: "Nastavit heslo"
         choose_new: "Zvolte si nové heslo"
         choose: "Vyber si heslo"
+      second_factor:
+        title: "Dvoufázové přihlašování"
+        label: "Kód"
+        disable_description: "Zadejte prosím ověřovací kód z vaší aplikace"
+        show_key_description: "Vložit ručně"
       change_about:
         title: "Změna o mně"
         error: "Došlo k chybě při pokusu změnit tuto hodnotu."
@@ -622,18 +732,20 @@ cs:
         taken: "Tato emailová adresa není k dispozici."
         error: "Nastala chyba při změně emailové adresy. Není tato adresa již používaná?"
         success: "Na zadanou adresu jsme zaslali email. Následujte, prosím, instrukce v tomto emailu."
+        success_staff: "Na vaši aktuální adresu jsme zaslali email. Následujte prosím instrukce v tomto emailu."
       change_avatar:
         title: "Změňte si svůj profilový obrázek"
         gravatar: "Založeno na <a href='//gravatar.com/emails' target='_blank'>Gravatar</a>u"
         gravatar_title: "Změňte si avatar na webových stránkách Gravatar"
+        gravatar_failed: "Nelze načíst Gravatar. Je nějaký Gravatar přiřazen k této e-mailové adrese?"
         refresh_gravatar_title: "Obnovit Gravatar"
         letter_based: "Systémem přidělený profilový obrázek"
         uploaded_avatar: "Vlastní obrázek"
         uploaded_avatar_empty: "Přidat vlastní obrázek"
         upload_title: "Nahrát obrázek"
         upload_picture: "Nahrát obrázek"
-        image_is_not_a_square: "Varování: Ořízli jsme váš avatar; šířka a délka nebyla stejná."
-        cache_notice: "Úspěšně jsi si vyměnil profilovou fotku, ale chvíli může trvat, než se zobrazí kvůli ukládání v mezipaměti prohlížeče. "
+        image_is_not_a_square: "Varování: Ořízli jsme váš obrázek; šířka a délka nebyla stejná."
+        cache_notice: "Úspěšně jste změnili váš profilový obrázek, ale chvíli může trvat, než se zobrazí kvůli ukládání v mezipaměti prohlížeče. "
       change_profile_background:
         title: "Pozadí profilu"
         instructions: "Pozadí profilu je zarovnáno doprostřed a má výchozí šířku 850px."
@@ -642,14 +754,16 @@ cs:
         instructions: "Obrázky pozadí jsou zarovnány a mají výchozí šířku 590px. "
       email:
         title: "Emailová adresa"
+        instructions: "není veřejný"
         ok: "Pro potvrzení vám pošleme email."
         invalid: "Zadejte prosím správnou emailovou adresu"
         authenticated: "Vaše emailová adresa byla autorizována přes službu {{provider}}."
         frequency_immediately: "Pokud jste obsah dosud nečetli, pošleme vám ho ihned emailem."
         frequency:
-          one: "Email vám zašleme pouze pokud jste se neukázali během poslední minuty."
-          few: "Email vám zašleme pouze pokud jste se neukázali během posledních {{count}} minut."
-          other: "Email vám zašleme pouze pokud jste se neukázali během posledních {{count}} minut."
+          few: Email vám zašleme pouze pokud jste se neukázali během posledních {{count}} minut.
+          many: Email vám zašleme pouze pokud jste se neukázali během posledních {{count}} minut.
+          one: Email vám zašleme pouze pokud jste se neukázali během poslední minuty.
+          other: Email vám zašleme pouze pokud jste se neukázali během posledních {{count}} minut.
       name:
         title: "Jméno"
         instructions: "vaše celé jméno (nepovinné)"
@@ -680,8 +794,6 @@ cs:
       created: "Účet vytvořen"
       log_out: "Odhlásit se"
       location: "Lokace"
-      card_badge:
-        title: "User Card Badge"
       website: "Webová stránka"
       email_settings: "Emailová upozornění"
       like_notification_frequency:
@@ -735,11 +847,12 @@ cs:
         title: "Pozvánky"
         user: "Pozvaný uživatel"
         sent: "Odeslané"
-        none: "Nemáte žádně nevyřízené pozvánky na zobrazení."
+        none: "Nejsou žádné pozvánky k zobrazení."
         truncated:
-          one: "Zobrazena první pozvánka."
-          few: "Zobrazeno prvních {{count}} pozvánek."
-          other: "Zobrazeno prvních {{count}} pozvánek."
+          few: Zobrazeno prvních {{count}} pozvánek.
+          many: Zobrazeno prvních {{count}} pozvánek.
+          one: Zobrazena první pozvánka.
+          other: Zobrazeno prvních {{count}} pozvánek.
         redeemed: "Uplatněné pozvánky"
         redeemed_tab: "Uplatněno"
         redeemed_tab_with_count: "Vyřízeno ({{count}})"
@@ -754,8 +867,10 @@ cs:
         rescinded: "Pozvánka odstraněna"
         rescind_all: "Odstranit všechny pozvánky"
         rescinded_all: "Všechny pozvánky odstraněny!"
+        rescind_all_confirm: "Opravdu chcete odstranit všechny pozvánky?"
         reinvite: "Znovu poslat pozvánku"
         reinvite_all: "Znovu poslat všechny pozvánky"
+        reinvite_all_confirm: "Opravdu chcete znovu poslat všechny pozvánky?"
         reinvited: "Pozvánka byla opětovně odeslána."
         reinvited_all: "Všechny pozvánky byly opětovně odeslány!"
         time_read: "Čas čtení"
@@ -763,10 +878,13 @@ cs:
         account_age_days: "Stáří účtu ve dnech"
         create: "Poslat pozvánku"
         generate_link: "Zkopírovat odkaz na pozvánku"
+        link_generated: "Odkaz pozvánky byl úspěšně vygenerován!"
+        valid_for: "Odkaz pozvánky je platný pouze pro tuto emailovou adresu: %{email}"
         bulk_invite:
-          none: "Nikoho jsi zatím nepozval. Odešli individuální pozvánky, případně <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>nahrej CSV soubor</a> a pozvi tak několik lidí najednou."
+          none: "Nikoho jste zatím nepozval. Můžete poslat individuální pozvánky, případně <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>nahrát CSV soubor</a> a pozvat tak několik lidí najednou."
           text: "Hromadné pozvání s pomocí souboru"
           success: "Nahrání souboru proběhlo úspěšně. O dokončení celého procesu budete informování pomocí zprávy."
+          error: "Omlouváme se, soubor by měl být ve formátu CSV."
       password:
         title: "Heslo"
         too_short: "Vaše heslo je příliš krátké."
@@ -779,26 +897,47 @@ cs:
         title: "Souhrn"
         stats: "Statistiky"
         time_read: "načteno"
+        recent_time_read: "poslední čas čtení"
         topic_count:
-          one: "téma vytvořeno"
-          few: "témata vytvořena"
-          other: "témat vytvořeno"
+          few: témata vytvořena
+          many: témat vytvořeno
+          one: téma vytvořeno
+          other: témat vytvořeno
         post_count:
-          one: "příspěvek vytvořen"
-          few: "příspěvky vytvořeny"
-          other: "příspěvků vytvořeno"
+          few: příspěvky vytvořeny
+          many: příspěvků vytvořeno
+          one: příspěvek vytvořen
+          other: příspěvků vytvořeno
+        likes_given:
+          few: dány
+          many: dáno
+          one: dán
+          other: dáno
+        likes_received:
+          few: obdrženy
+          many: obdrženo
+          one: obdržen
+          other: obdrženo
         days_visited:
-          one: "den navštíven"
-          few: "dny navštíveno"
-          other: "dní navštíveno"
+          few: dny navštíveno
+          many: dní navštíveno
+          one: den navštíven
+          other: dní navštíveno
+        topics_entered:
+          few: zobrazeny témata
+          many: zobrazeno témat
+          one: zobrazeno téma
+          other: zobrazeno témat
         posts_read:
-          one: "přečten příspěvek"
-          few: "přečteny příspěvky"
-          other: "přečteno příspěvků"
+          few: přečteny příspěvky
+          many: přečteno příspěvků
+          one: přečten příspěvek
+          other: přečteno příspěvků
         bookmark_count:
-          one: "záložka"
-          few: "záložky"
-          other: "záložek"
+          few: záložky
+          many: záložek
+          one: záložka
+          other: záložek
         top_replies: "Nejnovější příspěvky"
         no_replies: "Zatím žádné odpovědi."
         more_replies: "Více odpovědí"
@@ -824,6 +963,7 @@ cs:
         header_title: "profil, zprávy, záložky a nastavení"
       title:
         title: "Titul"
+        none: "(žádný)"
       filters:
         all: "Všechno"
       stream:
@@ -859,13 +999,17 @@ cs:
       enabled: "Tato stránka je v režimu jen pro čtení. Prosim pokračujte v prohlížení, ale odpovídání a ostatní operace jsou momentálně vypnuté."
       login_disabled: "Přihlášení je zakázáno jelikož je stránka v režimu jen pro čtení."
       logout_disabled: "Odhlášení je zakázáno zatímco je stránka v režimu jen pro čtení."
+    too_few_topics_and_posts_notice: "<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>Začněme tuto diskusi!</a> V současné době tu je <strong>%{currentTopics} / %{requiredTopics}</strong> témat a <strong>%{currentPosts} / %{requiredPosts}</strong> příspěvků. Noví návštěvníci potřebují číst nějaké příspěvky a reagovat na ně."
+    too_few_topics_notice: "<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>Začněme tuto diskusi!</a> V současné době tu je <strong>%{currentTopics} / %{requiredTopics}</strong> témat. Noví návštěvníci potřebují číst nějaké příspěvky a reagovat na ně."
+    too_few_posts_notice: "<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>Začněme tuto diskusi!</a> V současné době tu je <strong>%{currentPosts}/%{requiredPosts}</strong> příspěvků. Noví návštěvníci potřebují číst nějaké příspěvky a reagovat na ně."
     logs_error_rate_notice:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> dosáhlo limitu stránky, který je %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> přesahuje limit stránky, který je %{siteSettingRate}."
       rate:
-        one: "1 chyba/%{duration}"
-        few: "%{count} chyby/%{duration}"
-        other: "%{count} chyb/%{duration}"
+        few: '%{count} chyby/%{duration}'
+        many: '%{count} chyb/%{duration}'
+        one: 1 chyba/%{duration}
+        other: '%{count} chyb/%{duration}'
     learn_more: "více informací..."
     all_time: 'celkem'
     all_time_desc: 'témat vytvořeno'
@@ -879,10 +1023,16 @@ cs:
     first_post: První příspěvek
     mute: Ignorovat
     unmute: Zrušit ignorování
+    last_post: Přispěl
+    time_read: Přečteno
+    time_read_recently: '%{time_read}nedávno'
+    time_read_tooltip: '%{time_read}celkový čas čtení'
+    time_read_recently_tooltip: '%{time_read}celkový čas čtení (%{recent_time_read}za posledních 60 dnů)'
     last_reply_lowercase: poslední odpověď
     replies_lowercase:
-      one: odpověď
       few: odpovědi
+      many: odpovědí
+      one: odpověď
       other: odpovědí
     signup_cta:
       sign_up: "Registrovat se"
@@ -904,7 +1054,8 @@ cs:
       disable: "Zobrazit smazané příspěvky"
     private_message_info:
       title: "Zpráva"
-      invite: "pozvat účastníka"
+      invite: "Pozvat další..."
+      leave_message: "Opravdu chcete opustit tuto zprávu?"
       remove_allowed_user: "Určitě chcete odstranit {{name}} z této zprávy?"
       remove_allowed_group: "Opravdu chcete odstranit {{name}} z této zprávy?"
     email: 'Email'
@@ -915,6 +1066,7 @@ cs:
     trust_level: 'Důvěryhodnost'
     search_hint: 'uživatelské jméno, email nebo IP adresa'
     create_account:
+      disclaimer: "Registrací souhlasíš s <a href='{{privacy_link}}'>podmínkami soukromí</a> a <a href='{{tos_link}}'>podmínkami užívání</a>."
       title: "Vytvořit nový účet"
       failed: "Něco se nepovedlo, možná je tato e-mailová adresa již použita. Zkuste použít formulář pro obnovení hesla."
     forgot_password:
@@ -928,32 +1080,44 @@ cs:
       complete_email_found: "Byl nalezen účet odpovídající emailu <b>%{email}</b>. Za chvilku obdržíte email s instrukcemi jak přenastavit vaše heslo."
       complete_username_not_found: "Nebyl nalezen účet s uživatelským jménem <b>%{username}</b>"
       complete_email_not_found: "Nebyl nalezen účet s odpovídající emailu <b>%{email}</b>"
+      help: "Nepříšel email? Nezapomeňte nejprve zkontrolovat složku spam. <p>Nevíte, kterou e-mailovou adresu jste použili? Zadejte e-mailovou adresu a my vás budeme informovat, pokud zde existuje.</p> <p>Pokud již nemáte přístup k e-mailové adrese ve vašem účtu, kontaktujte prosím <a href='/about'>naši ochotnou redakci</a></p>."
       button_ok: "OK"
       button_help: "Nápověda"
+    email_login:
+      button_label: "přes email"
+      complete_username_not_found: "Nebyl nalezen účet s uživatelským jménem <b>%{username}</b>"
+      complete_email_not_found: "Nebyl nalezen účet s emailem <b>%{email}</b>"
     login:
       title: "Přihlásit se"
       username: "Uživatel"
       password: "Heslo"
+      second_factor_title: "Dvoufázové přihlašování"
       email_placeholder: "emailová adresa nebo uživatelské jméno"
       caps_lock_warning: "zapnutý Caps Lock"
       error: "Neznámá chyba"
       rate_limit: "Počkejte před dalším pokusem se přihlásit."
+      blank_username: "Zadejte vaši emailovou adresu a uživatelské jméno."
       blank_username_or_password: "Vyplňte prosím email nebo uživatelské jméno, a heslo."
       reset_password: 'Resetovat heslo'
       logging_in: "Přihlašuji..."
       or: "Nebo"
       authenticating: "Autorizuji..."
+      awaiting_activation: "Váš účet nyní čeká na aktivaci, použijte odkaz pro zapomenuté heslo, jestli chcete, abychom vám zaslali další aktivační email."
       awaiting_approval: "Váš účet zatím nebyl schválen členem redakce. Až se tak stane, budeme vás informovat emailem."
       requires_invite: "Promiňte, toto fórum je pouze pro zvané."
       not_activated: "Ještě se nemůžete přihlásit. Zaslali jsme vám aktivační email v <b>{{sentTo}}</b>. Prosím následujte instrukce v tomto emailu, abychom mohli váš účet aktivovat."
       not_allowed_from_ip_address: "Z této IP adresy se nemůžete přihlásit."
       admin_not_allowed_from_ip_address: "Z této IP adresy se nemůžete přihlásit jako administrátor."
       resend_activation_email: "Klikněte sem pro zaslání aktivačního emailu."
+      resend_title: "Znovu odeslat aktivační email"
+      change_email: "Změnit emailovou adresu"
+      provide_new_email: "Zadejte novou adresu na kterou chcete zaslat potvrzovací email."
       submit_new_email: "Aktualizovat emailovou adresu"
       sent_activation_email_again: "Zaslali jsme vám další aktivační email na <b>{{currentEmail}}</b>. Může trvat několik minut, než vám dorazí. Zkontrolujte také vaši složku s nevyžádanou pošlou."
       to_continue: "Přihlaš se, prosím"
       preferences: "Pro to, aby jsi mohl měnit své uživatelské nastavení, se musíš přihlásit."
       forgot: "Nevybavuju si podrobnosti svého účtu"
+      not_approved: "Váš účet zatím nebyl schválen. Až se tak stane, obdržíte oznámení emailem a budete se moci přihlásit."
       google:
         title: "přes Google"
         message: "Autentizuji přes Google (ujistěte se, že nemáte zablokovaná popup okna)"
@@ -979,6 +1143,8 @@ cs:
       accept_title: "Pozvání"
       welcome_to: "Vítejte na %{site_name}!"
       invited_by: "Pozvání od:"
+      social_login_available: "Budete se moci také přihlásit pomocí libovolné sociální sítě používající tento email."
+      your_email: "Emailová adresa vašeho účtu je <b>%{email}</b>."
       accept_invite: "Přijmout pozvání"
       success: "Váš účet byl vytvořen a nyní jste přihlášeni."
       name_label: "Jméno"
@@ -992,15 +1158,46 @@ cs:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+      google_classic: "Google Classic"
       facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "Pouze kategorie"
       categories_with_featured_topics: "Kategorie a vybrané příspěvky"
       categories_and_latest_topics: "Kategorie a nejnovější témata"
+      categories_and_top_topics: "Kategorie a populární témata"
     shortcut_modifier_key:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    select_kit:
+      default_header_text: Vybrat…
+      no_content: Nebyly nalezeny žádné výsledky
+      filter_placeholder: Hledat...
+      create: "Vytvořit: '{{content}}'"
+    emoji_picker:
+      filter_placeholder: Hledat emoji
+      people: Lidé
+      nature: Příroda
+      food: Jídlo
+      activity: Činnosti
+      travel: Cestování
+      objects: Objekty
+      celebration: Slavení
+      custom: Vlastní emoji
+      recent: Nedávno použité
+      default_tone: Bez barvy pleti
+      light_tone: Světlá pleť
+      medium_light_tone: Krémově světlá pleť
+      medium_tone: Mírně hnědá pleť
+      medium_dark_tone: Hnědá pleť
+      dark_tone: Černá pleť
+    shared_drafts:
+      title: "Sdílené koncepty"
+      notice: "Toto téma uvidí pouze uživatelé, kteří mohou vidět kategorii <b>{{category}}</b>"
+      destination_category: "Cílová kategorie"
+      publish: "Zveřejnit sdílený koncept"
+      confirm_publish: "Určitě chceš zveřejnit tento koncept?"
+      publishing: "Zveřejňuji téma..."
     composer:
       emoji: "Smajlíky :)"
       more_emoji: "více..."
@@ -1017,10 +1214,16 @@ cs:
       saved_local_draft_tip: "uloženo lokálně"
       similar_topics: "Podobná témata"
       drafts_offline: "koncepty offline"
+      group_mentioned_limit: "<b>Varování!</b> Zmínili jste <a href='{{group_link}}'>{{group}}</a>, ale protože má tato skupina více členů než je administrátorem nastavený limit maximálního počtu {{max}} uživatelů, kteří mohou být informováni, nebude informován nikdo."
       group_mentioned:
-        one: "Zmíněním {{group}}, upozorníš <a href='{{group_link}}'>1 člověka</a> – jste si jistý/á?"
-        few: "Zmíněním {{group}}, upozorníš <a href='{{group_link}}'>{{count}} lidi</a> – jste si jistý/á?"
-        other: "Zmíněním {{group}}, upozorníš <a href='{{group_link}}'>{{count}} lidí</a> – jste si jistý/á?"
+        few: Zmíněním {{group}}, upozorníš <a href='{{group_link}}'>{{count}} lidi</a> – jste si jistý/á?
+        many: Zmíněním {{group}}, upozorníš <a href='{{group_link}}'>{{count}} lidí</a> – jste si jistý/á?
+        one: Zmíněním {{group}}, upozorníš <a href='{{group_link}}'>1 člověka</a> – jste si jistý/á?
+        other: Zmíněním {{group}}, upozorníš <a href='{{group_link}}'>{{count}} lidí</a> – jste si jistý/á?
+      cannot_see_mention:
+        category: "Zmínili jste uživatele {{username}}, ale oznámení se mu nepošle, protože nemá přístup do této kategorie. Budete jej muset přidat do skupiny, která má přístup do této kategorie."
+        private: "Zmínili jste uživatele {{username}}, ale oznámení se mu nepošle, protože tuto osobní zprávu nevidí. Musíte ho pozvat do této osobní konverzace."
+      duplicate_link: "Zdá se, že odkaz na <b>{{domain}}</b> už uvedl v tomto tématu <b>@ {{username}}</b> v <a href='{{post_url}}'>odpovědi {{ago}}</a> - opravdu chcete odkaz poslat znovu?"
       error:
         title_missing: "Název musí být vyplněn"
         title_too_short: "Název musí být dlouhý alespoň {{min}} znaků"
@@ -1036,13 +1239,18 @@ cs:
       cancel: "Zrušit"
       create_topic: "Vytvořit téma"
       create_pm: "Zpráva"
+      create_whisper: "Šeptat"
+      create_shared_draft: "Vytvořit sdílený koncept"
       title: "Nebo zmáčkněte Ctrl+Enter"
       users_placeholder: "Přidat uživatele"
       title_placeholder: "O čem je ve zkratce tato diskuze?"
       title_or_link_placeholder: "Sem vložte název téma"
       edit_reason_placeholder: "proč byla nutná úprava?"
       show_edit_reason: "(přidat důvod úpravy)"
-      reply_placeholder: "Piš tady. Pro formátování používej Markdown, BBCode nebo HTML. Přetáhni nebo vlož obrázky."
+      topic_featured_link_placeholder: "Zadej odkaz ukázaný názvem"
+      remove_featured_link: "Odstranit odkaz z tématu."
+      reply_placeholder: "Pište sem. Můžete použít Markdown, BBCode nebo HTML. Obrázky nahrajte přetáhnutím nebo vložením ze schránky."
+      reply_placeholder_no_images: "Pište sem. Můžete použít Markdown, BBCode nebo HTML."
       view_new_post: "Zobrazit váš nový příspěvek."
       saving: "Ukládám"
       saved: "Uloženo!"
@@ -1072,7 +1280,10 @@ cs:
       olist_title: "Číslovaný seznam"
       ulist_title: "Odrážkový seznam"
       list_item: "Položka seznam"
+      toggle_direction: "Přepnout směr"
       help: "Nápověda pro Markdown"
+      collapse: "minimalizovat panel editoru"
+      abandon: "zavřít editor a zahodit koncept"
       modal_ok: "OK"
       modal_cancel: "Zrušit"
       cant_send_pm: "Bohužel, nemůžete poslat zprávu uživateli %{username}."
@@ -1080,27 +1291,71 @@ cs:
         title: "Zapomněl/a jste přidat přijemce?"
         body: "Nyní tuto zprávu posíláte pouze sám/sama sobě!"
       admin_options_title: "Volitelné redakční nastavení tématu"
+      composer_actions:
+        reply_to_post:
+          label: "Odpovědět na příspěvek %{postNumber} od %{postUsername}"
+          desc: Odpovědět na konkrétní příspěvek
+        reply_as_new_topic:
+          label: Odpovědět v propojeném tématu
+          desc: Vytvořit nové téma propojené s tímto tématem
+        reply_as_private_message:
+          label: Nová zpráva
+          desc: Vytvořit novou osobní zprávu
+        reply_to_topic:
+          label: Odpovědět na téma
+          desc: "Odpovědět na téma, ale ne na konkrétní příspěvek"
+        toggle_whisper:
+          label: Přepnout šeptání
+          desc: Šeptání vidí pouze redaktoři
+        create_topic:
+          label: "Nové téma"
+        shared_draft:
+          label: "Sdílený koncept"
+          desc: "Navrhnout téma, které uvidí pouze redakce"
     notifications:
+      tooltip:
+        regular:
+          few: '{{count}} nepřečtená upozornění'
+          many: '{{count}} nepřečtených upozornění'
+          one: 1 nepřečtene upozornění
+          other: '{{count}} nepřečtených upozornění'
+        message:
+          few: '{{count}} nepřečtené zprávy'
+          many: '{{count}} nepřečtených zpráv'
+          one: 1 nepřečtená zpráva
+          other: '{{count}} nepřečtených zpráv'
       title: "oznámení o zmínkách pomocí @name, odpovědi na vaše příspěvky a témata, zprávy, atd."
       none: "Notifikace nebylo možné načíst."
       empty: "Žádné upozornění nenalezeny."
       more: "zobrazit starší oznámení"
       total_flagged: "celkem nahlášeno příspěvků"
-      alt:
-        mentioned: "Zmíněno"
-        quoted: "Citováno"
-        replied: "Odpověděl"
-        posted: "Příspěvek od"
-        edited: "Editovat váš příspěvek od"
-        liked: "Líbil se tvůj příspěvek"
-        private_message: "Soukromá zpráva od"
-        invited_to_private_message: "Pozván k soukromé zprávě od"
-        invited_to_topic: "Pozván k tématu od"
-        invitee_accepted: "Pozvánka přijata od"
-        moved_post: "Tvůj příspěvek přesunul"
-        linked: "Odkaz na tvůj příspěvek"
-        granted_badge: "Odznak přidělen"
-        group_message_summary: "Zprávy ve skupinové schránce"
+      mentioned: "<span>{{username}}</span> {{description}}"
+      group_mentioned: "<span>{{username}}</span> {{description}}"
+      quoted: "<span>{{username}}</span> {{description}}"
+      replied: "<span>{{username}}</span> {{description}}"
+      posted: "<span>{{username}}</span> {{description}}"
+      edited: "<span>{{username}}</span> {{description}}"
+      liked: "<span>{{username}}</span> {{description}}"
+      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      liked_many:
+        few: <span>{{username}}, {{username2}} a {{count}} další</span> {{description}}
+        many: <span>{{username}}, {{username2}} a {{count}} dalších</span> {{description}}
+        one: <span>{{username}}, {{username2}} a 1 další</span> {{description}}
+        other: <span>{{username}}, {{username2}} a {{count}} dalších</span> {{description}}
+      private_message: "<span>{{username}}</span> {{description}}"
+      invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
+      invited_to_topic: "<span>{{username}}</span> {{description}}"
+      invitee_accepted: "<span>{{username}}</span> přijal vaše pozvání"
+      moved_post: "<span>{{username}}</span> přesunul {{description}}"
+      linked: "<span>{{username}}</span> {{description}}"
+      granted_badge: "Získáno '{{description}}'"
+      topic_reminder: "<span>{{username}}</span> {{description}}"
+      watching_first_post: "<span>Nové téma</span> {{description}}"
+      group_message_summary:
+        few: '{{count}} zprávy ve schránce skupiny {{group_name}}'
+        many: '{{count}} zpráv ve schránce skupiny {{group_name}}'
+        one: '{{count}} zpráva ve schránce skupiny {{group_name}}'
+        other: '{{count}} zpráv ve schránce skupiny {{group_name}}'
       popup:
         mentioned: '{{username}} vás zmínil v "{{topic}}" - {{site_title}}'
         group_mentioned: 'Uživatel {{username}} vás zmínil v "{{topic}}" - {{site_title}}'
@@ -1123,6 +1378,7 @@ cs:
       uploading: "Nahrávám"
       select_file: "Vyberte soubor"
       image_link: "adresa na kterou má váš obrázek odkazovat"
+      default_image_alt_text: obrázek
     search:
       sort_by: "Seřadil"
       relevance: "Relevance"
@@ -1134,10 +1390,19 @@ cs:
       clear_all: "Vymazat vše"
       too_short: "Hledaný výraz je příliš krátký."
       title: "vyhledávat témata, příspěvky, uživatele nebo kategorie"
+      full_page_title: "vyhledávat témata nebo příspěvky"
       no_results: "Nenalezeny žádné výsledky."
       no_more_results: "Nenalezeny žádné další výsledky."
       searching: "Hledám ..."
       post_format: "#{{post_number}} od {{username}}"
+      results_page: "Výsledky hledání pro '{{term}}'"
+      more_results: "Existuje více výsledků. Prosím zpřesněte kritéria vyhledávání."
+      cant_find: "Nemůžete najít, co hledáte?"
+      start_new_topic: "Možná vytvořte nové téma?"
+      or_search_google: "Nebo zkuste vyhledávat pomocí Google:"
+      search_google: "Zkuste vyhledávat pomocí Google:"
+      search_google_button: "Google"
+      search_google_title: "Hledat na tomto webu"
       context:
         user: "Vyhledat příspěvky od @{{username}}"
         category: "Hledat v kategorii #{{category}}"
@@ -1146,21 +1411,31 @@ cs:
       advanced:
         title: Pokročilé hledání
         posted_by:
-          label: Zaslal
+          label: Od uživatele
+        in_category:
+          label: V kategorii
         in_group:
           label: Ve skupině
         with_badge:
           label: S odznakem
+        with_tags:
+          label: Se štítkem
         filters:
-          likes: líbí se mi
+          label: "Pouze v tématech/příspěvcích, které"
+          likes: se mi líbí
           posted: Přidal jsem příspěvek
           watching: Sleduji
           tracking: Sleduji.
+          private: v mých zprávách
+          bookmarks: Mám v záložkách
           first: jsou první příspěvek v tématu
           pinned: jsou připnuty
           unpinned: nejsou připnuty
+          seen: která jsem četl
           unseen: jsem nečetl
           wiki: jsou wiki
+          images: včetně obrázků
+          all_tags: Všechny uvedené štítky
         statuses:
           label: Kde příspěvky
           open: jsou otevřeny
@@ -1181,19 +1456,20 @@ cs:
     not_logged_in_user: 'stránka uživatele s přehledem o aktuální činnosti a nastavení'
     current_user: 'jít na vaši uživatelskou stránku'
     topics:
-      new_messages_marker: "poslední navštívení"
+      new_messages_marker: "poslední návštěva"
       bulk:
         select_all: "Vybrat vše"
         clear_all: "Zrušit vše"
         unlist_topics: "Odebrat témata ze seznamu"
+        relist_topics: "Znovunačíst seznam témat"
         reset_read: "reset přečteného"
         delete: "Smazat témata"
-        dismiss: "Odbýt"
-        dismiss_read: "Odbýt všechna nepřečtená"
-        dismiss_button: "Odbýt..."
-        dismiss_tooltip: "Odbýt jen nové příspěvky nebo přestat sledovat témata"
+        dismiss: "Označit jako přečtené"
+        dismiss_read: "Označit všechno nepřečtené jako přečtené"
+        dismiss_button: "Označit jako přečtené..."
+        dismiss_tooltip: "Označit jako přečtené jen nové příspěvky nebo přestat sledovat témata"
         also_dismiss_topics: "Přestat sledovat tyto témata, takže se mi znovu nezobrazí jako nepřečtená"
-        dismiss_new: "Odbýt nová"
+        dismiss_new: "Označit jako přečtené vše nové"
         toggle: "hromadný výběr témat"
         actions: "Hromadné akce"
         change_category: "Nastavit kategorii"
@@ -1202,12 +1478,14 @@ cs:
         notification_level: "Upozornění"
         choose_new_category: "Zvolte novou kategorii pro témata:"
         selected:
-          one: "Vybrali jste <b>1</b> téma."
-          few: "Vybrali jste <b>{{count}}</b> témata."
-          other: "Vybrali jste <b>{{count}}</b> témat."
+          few: Vybrali jste <b>{{count}}</b> témata.
+          many: Vybrali jste <b>{{count}}</b> témat.
+          one: Vybrali jste <b>1</b> téma.
+          other: Vybrali jste <b>{{count}}</b> témat.
         change_tags: "Zaměnit štítky"
         append_tags: "Přidat štítky"
         choose_new_tags: "Zvolte nové tagy pro témata:"
+        choose_append_tags: "Zvolte nové tagy, které se mají přiřadit k těmto tématům:"
         changed_tags: "Tagy témat byly změněny."
       none:
         unread: "Nemáte žádná nepřečtená témata."
@@ -1235,15 +1513,14 @@ cs:
         bookmarks: "Žádná další oblíbená témata nejsou k dispozici."
         search: "There are no more search results."
     topic:
-      unsubscribe:
-        stop_notifications: "Budete dostávat méně upozornění pro <strong>{{title}}</strong>"
-        change_notification_state: "Váš momentální stav oznámení je"
       filter_to:
-        one: "1 příspěvek v tématu"
-        few: "{{count}} příspěvky v tématu"
-        other: "{{count}} příspěvků v tématu"
+        few: '{{count}} příspěvky v tématu'
+        many: '{{count}} příspěvků v tématu'
+        one: 1 příspěvek v tématu
+        other: '{{count}} příspěvků v tématu'
       create: 'Nové téma'
       create_long: 'Vytvořit nové téma'
+      open_draft: "Otevřít koncept"
       private_message: 'Vytvořit zprávu'
       archive_message:
         help: 'Přesunout zprávy do archívu'
@@ -1251,16 +1528,21 @@ cs:
       move_to_inbox:
         title: 'Přesunout do Přijaté'
         help: 'Přesunout zprávu zpět do Přijaté'
+      edit_message:
+        help: 'Upravit první příspěvek zprávy'
+        title: 'upravit zprávu'
       list: 'Témata'
       new: 'nové téma'
       unread: 'nepřečtený'
       new_topics:
-        one: '1 nové téma'
         few: '{{count}} nová témata'
+        many: '{{count}} nových témat'
+        one: 1 nové téma
         other: '{{count}} nových témat'
       unread_topics:
-        one: '1 nepřečtené téma'
         few: '{{count}} nepřečtená témata'
+        many: '{{count}} nepřečtených témat'
+        one: 1 nepřečtené téma
         other: '{{count}} nepřečtených témat'
       title: 'Téma'
       invalid_access:
@@ -1274,39 +1556,92 @@ cs:
         title: "Téma nenalezeno"
         description: "Bohužel se nám nepovedlo najít toto téma. Nebylo odstraněno moderátorem?"
       total_unread_posts:
-        one: "máte 1 nepřečtený příspěvek v tomto tématu"
-        few: "máte {{count}} nepřečtené příspěvky v tomto tématu."
-        other: "máte {{count}} nepřečtených příspěvků v tomto tématu."
+        few: máte {{count}} nepřečtené příspěvky v tomto tématu.
+        many: máte {{count}} nepřečtených příspěvků v tomto tématu.
+        one: máte 1 nepřečtený příspěvek v tomto tématu
+        other: máte {{count}} nepřečtených příspěvků v tomto tématu.
       unread_posts:
-        one: "máte 1 nepřečtený příspěvěk v tomto tématu"
-        few: "máte {{count}} nepřečtené příspěvky v tomto tématu"
-        other: "máte {{count}} nepřečtených příspěvků v tomto tématu"
+        few: máte {{count}} nepřečtené příspěvky v tomto tématu
+        many: máte {{count}} nepřečtených příspěvků v tomto tématu
+        one: máte 1 nepřečtený příspěvěk v tomto tématu
+        other: máte {{count}} nepřečtených příspěvků v tomto tématu
       new_posts:
-        one: "je zde 1 nový příspěvek od doby, kdy jste toto téma naposledy četli"
-        few: "jsou zde {{count}} nové příspěvky od doby, kdy jste toto téma naposledy četli"
-        other: "je zde {{count}} nových příspěvků od doby, kdy jste toto téma naposledy četli"
+        few: jsou zde {{count}} nové příspěvky od doby, kdy jste toto téma naposledy četli
+        many: je zde {{count}} nových příspěvků od doby, kdy jste toto téma naposledy četli
+        one: je zde 1 nový příspěvek od doby, kdy jste toto téma naposledy četli
+        other: je zde {{count}} nových příspěvků od doby, kdy jste toto téma naposledy četli
       likes:
-        one: "v tomto tématu je jedno 'líbí se'"
-        few: "v tomto tématu tématu je {{count}} 'líbí se'"
-        other: "v tomto tématu tématu je {{count}} 'líbí se'"
+        few: v tomto tématu tématu je {{count}} 'líbí se'
+        many: v tomto tématu tématu je {{count}} 'líbí se'
+        one: v tomto tématu je jedno 'líbí se'
+        other: v tomto tématu tématu je {{count}} 'líbí se'
       back_to_list: "Zpátky na seznam témat"
       options: "Možnosti"
       show_links: "zobrazit odkazy v tomto tématu"
       toggle_information: "zobrazit/skrýt detaily tématu"
       read_more_in_category: "Chcete si toho přečíst víc? Projděte si témata v {{catLink}} nebo {{latestLink}}."
       read_more: "Chcete si přečíst další informace? {{catLink}} nebo {{latestLink}}."
-      read_more_MF: "{ UNREAD, plural, =0 {} one { Je tu <a href='/unread'>1 nepřečtené</a> } other { Je tu <a href='/unread'># nepřečtených</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='/new'>1  nové</a> téma} other { {BOTH, select, true{and } false {are } other{}} <a href='/new'># nových</a> témat} } remaining, nebo {CATEGORY, select, true {si projděte ostatní témata v kategorii {catLink}} false {{latestLink}} other {}}"
+      read_more_MF: "{ UNREAD, plural, =0 {} one { Zbývá <a href='/unread'>1 nepřečtené</a> téma } other { Je tu <a href='/unread'># nepřečtených</a> témat } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='/new'>1  nové</a> téma} other { {BOTH, select, true{and } false {are } other{}} <a href='/new'># nových</a> témat} }, nebo {CATEGORY, select, true {zobrazit další témata v kategorii {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Projděte všechny kategorie
       view_latest_topics: zobrazte si populární témata
-      suggest_create_topic: Co takhle založit nové téma?
+      suggest_create_topic: "Co takhle založit nové téma?"
       jump_reply_up: přejít na předchozí odpověď
       jump_reply_down: přejít na následující odpověď
       deleted: "Téma bylo smazáno"
+      topic_status_update:
+        title: "Časovač tématu"
+        save: "Nastavit časovač "
+        num_of_hours: "Počet hodin:"
+        remove: "Odstranit časovač"
+        publish_to: "Publikovat v:"
+        when: "Když:"
+        public_timer_types: "Časovače tématu "
+        private_timer_types: uživatelské časovače témat
+      auto_update_input:
+        none: "Vyberte časové období"
+        later_today: "Později během dnešního dne"
+        tomorrow: "Zítra"
+        later_this_week: "Později během tohoto týdne"
+        this_weekend: "Tento týden"
+        next_week: "Další týden"
+        two_weeks: "Dva týdny"
+        next_month: "Další měsíc"
+        three_months: "Tři měsíce"
+        six_months: "Šest měsíců"
+        one_year: "Jeden rok"
+        forever: "Navždy"
+        pick_date_and_time: "Vyberte datum a čas"
+        set_based_on_last_post: "Zavřít na základě posledního příspěvku"
+      publish_to_category:
+        title: "Naplánovat publikování"
+      temp_open:
+        title: "Otevřít dočasně"
+      auto_reopen:
+        title: "Automaticky otevřít téma"
+      temp_close:
+        title: "Zavřít dočasně"
+      auto_close:
+        title: "Automaticky zavřít téma"
+        label: "Automaticky zavřít téma za:"
+        error: "Prosím zadejte platnou hodnotu."
+        based_on_last_post: "Neuzavírejte téma dokud poslední příspěvek v tomto tématu není alespoň takto starý."
+      auto_delete:
+        title: "automaticky smazat téma"
+      reminder:
+        title: "Připomeň mi"
+      status_update_notice:
+        auto_open: "Toto téma se automaticky otevře %{timeLeft}."
+        auto_close: "Toto téma se automaticky zavře %{timeLeft}."
+        auto_publish_to_category: "Toto téma bude zveřejněno v <a href=%{categoryUrl}>%{categoryName}</a>%{timeLeft}# ."
+        auto_close_based_on_last_post: "Toto téma se zavře %{duration} po poslední odpovědi."
+        auto_delete: "Toto téma bude automaticky smazáno %{timeLeft}."
+        auto_reminder: "Toto téma ti připomeneme %{timeLeft}."
       auto_close_title: 'Nastavení automatického zavření'
       auto_close_immediate:
-        one: "Poslední příspěvek v témetu je již 1 hodinu starý, takže toto téma bude okamžitě uzavřeno."
-        few: "Poslední příspěvek v témetu je již %{count} hodiny starý, takže toto téma bude okamžitě uzavřeno."
-        other: "Poslední příspěvek v témetu je již %{count} hodin starý, takže toto téma bude okamžitě uzavřeno."
+        few: Poslední příspěvek v témetu je již %{count} hodiny starý, takže toto téma bude okamžitě uzavřeno.
+        many: Poslední příspěvek v témetu je již %{count} hodin starý, takže toto téma bude okamžitě uzavřeno.
+        one: Poslední příspěvek v témetu je již 1 hodinu starý, takže toto téma bude okamžitě uzavřeno.
+        other: Poslední příspěvek v témetu je již %{count} hodin starý, takže toto téma bude okamžitě uzavřeno.
       timeline:
         back: "Zpět"
         back_description: "Přejít na poslední nepřečtený příspěvek"
@@ -1324,19 +1659,24 @@ cs:
         total: celkem příspěvků
         current: aktuální příspěvek
       notifications:
-        title: změňte, jak často budete upozornění na toto téma
+        title: "změňte, jak často budete upozornění na toto téma"
         reasons:
-          '3_10': 'Budete dostávat oznámení, protože hlídáte štítek na tomto tématu.'
-          '3_6': 'Budete dostávat oznámení, protože hlídáte tuhle kategorii.'
-          '3_5': 'Budete dostávat oznámení, protože jste tohle téma automaticky začali hlídat.'
-          '3_2': 'Budete dostávat oznámení, protože hlídáte toto téma.'
-          '3_1': 'Budete dostávat oznámení, protože jste autorem totoho tématu.'
-          '3': 'Budete dostávat oznámení, protože hlídáte toto téma.'
-          '1_2': 'Budete informováni pokud někdo zmíní vaše @jméno nebo odpoví na váš příspěvek.'
-          '1': 'Budete informováni pokud někdo zmíní vaše @jméno nebo odpoví na váš příspěvek.'
-          '0_7': 'Ignorujete všechna oznámení v této kategorii.'
-          '0_2': 'Ignorujete všechna oznámení z tohoto tématu.'
-          '0': 'Ignorujete všechna oznámení z tohoto tématu.'
+          mailing_list_mode: "Máš povolený mailový seznam, takže budeš upozorňován na odpovědi k tomuto tématu přes e.mail."
+          "3_10": 'Budete dostávat oznámení, protože hlídáte štítek na tomto tématu.'
+          "3_6": 'Budete dostávat oznámení, protože hlídáte tuhle kategorii.'
+          "3_5": 'Budete dostávat oznámení, protože jste tohle téma automaticky začali hlídat.'
+          "3_2": 'Budete dostávat oznámení, protože hlídáte toto téma.'
+          "3_1": 'Budete dostávat oznámení, protože jste autorem totoho tématu.'
+          "3": 'Budete dostávat oznámení, protože hlídáte toto téma.'
+          "2_8": 'Uvidíte počet nových odpovědí, jelikož sledujete tuto kategorii.'
+          "2_4": 'Uvidíte počet nových odpovědí, jelikož jste přispěli do tohoto tématu.'
+          "2_2": 'Uvidíte počet nových odpovědí, jelikož sledujete toto téma.'
+          "2": 'Uvidíte počet nových odpovědí, protože <a href="/u/{{username}}/preferences">jste četl(a) toto téma</a>.'
+          "1_2": 'Budete informováni pokud někdo zmíní vaše @jméno nebo odpoví na váš příspěvek.'
+          "1": 'Budete informováni pokud někdo zmíní vaše @jméno nebo odpoví na váš příspěvek.'
+          "0_7": 'Ignorujete všechna oznámení v této kategorii.'
+          "0_2": 'Ignorujete všechna oznámení z tohoto tématu.'
+          "0": 'Ignorujete všechna oznámení z tohoto tématu.'
         watching_pm:
           title: "Hlídání"
           description: "Budete informováni o každém novém příspěvku v této zprávě. Vedle názvu tématu se objeví počet nepřečtených příspěvků."
@@ -1367,6 +1707,7 @@ cs:
         open: "Otevřít téma"
         close: "Zavřít téma"
         multi_select: "Zvolte příspěvky…"
+        timed_update: "Nastavit časovač tématu..."
         pin: "Připevnit téma"
         unpin: "Odstranit připevnění"
         unarchive: "Navrátit z archivu"
@@ -1375,7 +1716,7 @@ cs:
         visible: "Zviditelnit"
         reset_read: "Vynulovat počet čtení"
         make_public: "Vytvořit Veřejné Téma"
-        make_private: "Vytvořit Soukromou zprávu"
+        make_private: "Vytvořit soukromou zprávu "
       feature:
         pin: "Připevnit téma"
         unpin: "Odstranit připevnění"
@@ -1384,6 +1725,7 @@ cs:
         remove_banner: "Remove Banner Topic"
       reply:
         title: 'Odpovědět'
+        help: 'Začít psát odpověď na toto téma'
       clear_pin:
         title: "Odstranit připnutí"
         help: "Odebere připnutí tohoto tématu, takže se již nebude zobrazovat na vrcholu seznamu témat"
@@ -1407,9 +1749,10 @@ cs:
         pin_validation: "Pro připíchnutí tohoto tématu je třeba datum."
         not_pinned: "V kategorii {{categoryLink}} nejsou žádná připnutá témata."
         already_pinned:
-          one: "Připevněné téma v {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          few: "Připevněná témata v {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "Připevněná témata v {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          few: 'Připevněná témata v {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          many: 'Připevněná témata v {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: 'Připevněné téma v {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          other: 'Připevněná témata v {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         pin_globally: "Zobrazit toto téma na vrcholu seznamu všech témat dokud"
         confirm_pin_globally: "Již máte {{count}} globálně připevněných příspěvků. Příliš mnoho připevněných příspěvků může zatěžovat nové nebo anonymní uživatele. Určitě chcete připevnit další téma globálně?"
         unpin_globally: "Odstranit toto téma z vrcholu všech seznamů s tématy."
@@ -1417,9 +1760,10 @@ cs:
         global_pin_note: "Uživatelé mohou odepnout téma sami pro sebe."
         not_pinned_globally: "Nemáte žádná globálně připevněná témata."
         already_pinned_globally:
-          one: "V současnosti globálně připevněná témata: <strong class='badge badge-notification unread'>1</strong>"
-          few: "V současnosti globálně připevněná témata: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "V současnosti globálně připevněná témata: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          few: 'V současnosti globálně připevněná témata: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          many: 'V současnosti globálně připevněná témata: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: 'V současnosti globálně připevněná témata: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'V současnosti globálně připevněná témata: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         make_banner: "Udělat z tohoto tématu banner, který se zobrazí na vrcholu všech stránek."
         remove_banner: "Odstranit banner, který se zobrazuje na vrcholu všech stránek."
         banner_note: "Uživatelé mohou odmítnout banner jeho zavřením. V jeden moment může být pouze jedno téma jako banner."
@@ -1452,12 +1796,14 @@ cs:
         success_email: "Zaslali jsme pozvánku na <b>{{emailOrUsername}}</b>. Upozorníme vás až bude pozvánka použita. Své pozvánky můžete sledovat v tabulce pozvánek na svém uživatelském profilu."
         success_username: "Pozvali jsme zadaného uživatele, aby se zúčastnil tématu."
         error: "Bohužel se nepodařilo pozvat tuto osobu. Možná už byla pozvána? (Počet opakovaných pozvánek je omezen)."
+        success_existing_email: "Uživatel s e-mailem<b>{{emailOrUsername}}</b> již existuje. Pozvali jsme ho, aby se zúčastnil tohoto tématu."
       login_reply: 'Přihlaste se, chcete-li odpovědět'
       filters:
         n_posts:
-          one: "Je zobrazen pouze 1 příspěvek"
-          few: "Jsou zobrazeny pouze {{count}} příspěvky"
-          other: "Je zobrazeno pouze {{count}} příspěvků"
+          few: Jsou zobrazeny pouze {{count}} příspěvky
+          many: Je zobrazeno pouze {{count}} příspěvků
+          one: Je zobrazen pouze 1 příspěvek
+          other: Je zobrazeno pouze {{count}} příspěvků
         cancel: "Zrušit filtr"
       split_topic:
         title: "Rozdělit téma"
@@ -1465,17 +1811,19 @@ cs:
         topic_name: "Název nového tématu:"
         error: "Bohužel nastala chyba při rozdělování tématu."
         instructions:
-          one: "Chystáte se vytvořit nové téma a naplnit ho příspěvkem, který jste označili."
-          few: "Chystate se vytvořit noté téma a naplnit ho <b>{{count}}</b> příspěvky, které jste označili."
-          other: "Chystate se vytvořit noté téma a naplnit ho <b>{{count}}</b> příspěvky, které jste označili."
+          few: Chystate se vytvořit noté téma a naplnit ho <b>{{count}}</b> příspěvky, které jste označili.
+          many: Chystate se vytvořit noté téma a naplnit ho <b>{{count}}</b> příspěvky, které jste označili.
+          one: Chystáte se vytvořit nové téma a naplnit ho příspěvkem, který jste označili.
+          other: Chystate se vytvořit noté téma a naplnit ho <b>{{count}}</b> příspěvky, které jste označili.
       merge_topic:
         title: "Sloučit téma"
         action: "do jiného tématu"
         error: "Bohužel nastala chyba při slučování tématu."
         instructions:
-          one: "Prosím, vyberte téma, do kterého chcete příspěvek přesunout."
-          few: "Prosím, vyberte téma, do kterého chcete tyto <b>{{count}}</b> příspěvky přesunout."
-          other: "Prosím, vyberte téma, do kterého chcete těchto <b>{{count}}</b> příspěvků přesunout."
+          few: Prosím, vyberte téma, do kterého chcete tyto <b>{{count}}</b> příspěvky přesunout.
+          many: Prosím, vyberte téma, do kterého chcete těchto <b>{{count}}</b> příspěvků přesunout.
+          one: Prosím, vyberte téma, do kterého chcete příspěvek přesunout.
+          other: Prosím, vyberte téma, do kterého chcete těchto <b>{{count}}</b> příspěvků přesunout.
       merge_posts:
         title: "Sluč vybrané příspěvky"
         action: "sluč vybrané příspěvky"
@@ -1487,11 +1835,12 @@ cs:
         label: "Nový autor příspěvků"
         placeholder: "uživatelské jméno nového autora"
         instructions:
-          one: "Vyberte prosím nového autora příspěvku od <b>{{old_user}}</b>."
-          few: "Vyberte prosím nového autora {{count}} příspěvků od <b>{{old_user}}</b>."
-          other: "Vyberte prosím nového autora {{count}} příspěvků od <b>{{old_user}}</b>."
-        instructions_warn: "Poznámka: Žádná upozornění na tento příspěvek nebudou zpětně přenesena na nového uživatele.<br>Varování: V současné chvíli, žádná data svázaná s příspěvkem nebudou přenesena na nového uživatele. Používejte opatrně."
+          few: Vyberte prosím nového autora {{count}} příspěvků od <b>{{old_user}}</b>.
+          many: Vyberte prosím nového autora {{count}} příspěvků od <b>{{old_user}}</b>.
+          one: Vyberte prosím nového autora příspěvku od <b>{{old_user}}</b>.
+          other: Vyberte prosím nového autora {{count}} příspěvků od <b>{{old_user}}</b>.
       change_timestamp:
+        title: "Změnit časové razítko..."
         action: "změnit časovou značku"
         invalid_timestamp: "Časová značka nemůže být v budoucnosti."
         error: "Nastala chyba při změně časové značky tématu."
@@ -1499,54 +1848,75 @@ cs:
       multi_select:
         select: 'vybrat'
         selected: 'vybráno ({{count}})'
+        select_post:
+          label: 'označit'
+          title: 'Přidat příspěvek do výběru'
+        selected_post:
+          label: 'vybrané'
+          title: 'Kliknutím odstraníte příspěvek z výběru'
+        select_replies:
+          label: 'vybrat +odpovědi'
+          title: 'Přidej příspěvek a všechny jeho odpovědi do výběru'
+        select_below:
+          label: 'vybrat +níže'
+          title: 'Přidat příspěvek a vše po něm do výběru'
         delete: smazat označené
         cancel: zrušit označování
         select_all: vybrat vše
         deselect_all: zrušit výběr
         description:
-          one: Máte označen <b>1</b> příspěvek.
           few: Máte označeny <b>{{count}}</b> příspěvky.
+          many: Máte označeno <b>{{count}}</b> příspěvků.
+          one: Máte označen <b>1</b> příspěvek.
           other: Máte označeno <b>{{count}}</b> příspěvků.
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Cituj"
+      edit: "<i class='fa fa-pencil'></i>{{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Důvod: "
       post_number: "příspěvek č. {{number}}"
       wiki_last_edited_on: "wiki naposledy upravena"
       last_edited_on: "příspěvek naposledy upraven"
       reply_as_new_topic: "Odpovědět v propojeném tématu"
+      reply_as_new_private_message: "Odpověď poslat jako zprávu stejným příjemcům. "
       continue_discussion: "Pokračující diskuze z {{postLink}}:"
       follow_quote: "přejít na citovaný příspěvek"
       show_full: "Zobrazit celý příspěvek"
       show_hidden: 'Zobraz skrytý obsah.'
       deleted_by_author:
-        one: "(post withdrawn by author, will be automatically deleted in %{count} hour unless flagged)"
-        few: "(post withdrawn by author, will be automatically deleted in %{count} hours unless flagged)"
-        other: "(post withdrawn by author, will be automatically deleted in %{count} hours unless flagged)"
+        few: (post withdrawn by author, will be automatically deleted in %{count} hours unless flagged)
+        many: (post withdrawn by author, will be automatically deleted in %{count} hours unless flagged)
+        one: (post withdrawn by author, will be automatically deleted in %{count} hour unless flagged)
+        other: (post withdrawn by author, will be automatically deleted in %{count} hours unless flagged)
+      collapse: "kolaps"
       expand_collapse: "rozbalit/sbalit"
+      locked: "Personál znemožnil upravování na tomto příspěvku"
       gap:
-        one: "zobrazit 1 skrytou odpověď"
-        few: "zobrazit {{count}} skryté odpovědi"
-        other: "zobrazit {{count}} skrytých odpovědí"
+        few: zobrazit {{count}} skryté odpovědi
+        many: zobrazit {{count}} skrytých odpovědí
+        one: zobrazit 1 skrytou odpověď
+        other: zobrazit {{count}} skrytých odpovědí
       unread: "Příspěvek je nepřečtený."
       has_replies:
-        one: "{{count}} odpověď"
-        few: "{{count}} odpovědi"
-        other: "{{count}} odpovědí"
+        few: '{{count}} odpovědi'
+        many: '{{count}} odpovědí'
+        one: '{{count}} odpověď'
+        other: '{{count}} odpovědí'
       has_likes:
-        one: "{{count}} líbí se mi"
-        few: "{{count}} líbí se mi"
-        other: "{{count}} líbí se mi"
+        few: '{{count}} líbí se mi'
+        many: '{{count}} líbí se mi'
+        one: '{{count}} líbí se mi'
+        other: '{{count}} líbí se mi'
       has_likes_title:
-        one: "1 člověku se líbí tento příspěvek"
-        few: "{{count}} lidem se líbí tento příspěvek"
-        other: "{{count}} lidem se líbí tento příspěvek"
+        few: '{{count}} lidem se líbí tento příspěvek'
+        many: '{{count}} lidem se líbí tento příspěvek'
+        one: 1 člověku se líbí tento příspěvek
+        other: '{{count}} lidem se líbí tento příspěvek'
       has_likes_title_only_you: "tento příspěvek se mi líbí"
       has_likes_title_you:
-        one: "vám a 1 dalšímu člověku se tento příspěvek líbí"
-        few: "vám a {{count}} dalším lidem se tento příspěvek líbí"
-        other: "vám a {{count}} dalším lidem se tento příspěvek líbí"
+        few: vám a {{count}} dalším lidem se tento příspěvek líbí
+        many: vám a {{count}} dalším lidem se tento příspěvek líbí
+        one: vám a 1 dalšímu člověku se tento příspěvek líbí
+        other: vám a {{count}} dalším lidem se tento příspěvek líbí
       errors:
         create: "Bohužel nastala chyba při vytváření příspěvku. Prosím zkuste to znovu."
         edit: "Bohužel nastala chyba při editaci příspěvku. Prosím zkuste to znovu."
@@ -1554,6 +1924,7 @@ cs:
         file_too_large: "Soubor, který se snažíte nahrát, je bohužel příliš velký (maximální velikost je {{max_size_kb}}kb). Co třeba jej nahrát na cloudovou službu a nasdílet sem odkaz?"
         too_many_uploads: "Bohužel, najednou smíte nahrát jen jeden soubor."
         too_many_dragged_and_dropped_files: "Bohužel, najednou smíte nahrát jen 10 souborů."
+        upload_not_authorized: "Bohužel, soubor, který se snažíš nahrát, není povolený (povolená rozšíření:  {{authorized_extensions}}). "
         image_upload_not_allowed_for_new_user: "Bohužel, noví uživatelé nemohou nahrávat obrázky."
         attachment_upload_not_allowed_for_new_user: "Bohužel, noví uživatelé nemohou nahrávat přílohy."
         attachment_download_requires_login: "Omlouváme se, ale pro stáhnutí přílohy musíte být přihlášen."
@@ -1568,7 +1939,7 @@ cs:
         about: "toto je wiki příspěvek"
       archetypes:
         save: 'Uložit nastavení'
-      few_likes_left: "Díky za šíření lásky! Zbývá ti pro dnešek už jen několi \"líbí se\"."
+      few_likes_left: "Díky za šíření lásky! Zbývá ti pro dnešek už jen několik málo lajků."
       controls:
         reply: "otevře okno pro sepsání odpovědi na tento příspěvek"
         like: "to se mi líbí"
@@ -1582,6 +1953,19 @@ cs:
         undelete: "obnovit příspěvek"
         share: "sdílet odkaz na tento příspěvek"
         more: "Více"
+        delete_replies:
+          confirm: "Chceš také smazat odpovědi k tomuto příspěvku? "
+          direct_replies:
+            few: Ano a další přímé odpovědi
+            many: Ano a další {{count}} odpovědi
+            one: Ano a 1 přímá odpověď
+            other: Ano a další {{count}} odpovědi
+          all_replies:
+            few: Ano a dalších {{count}} odpovědí
+            many: Ano a dalších {{count}} odpovědí
+            one: Ano a další 1 odpověď
+            other: Ano a dalších {{count}} odpovědí
+          just_the_post: "Ne, pouze tento příspěvek"
         admin: "post admin actions"
         wiki: "Vytvořte Wiki"
         unwiki: "Odtraňte Wiki"
@@ -1590,8 +1974,18 @@ cs:
         rebake: "Obnovit HTML"
         unhide: "Odkrýt"
         change_owner: "Změna autora"
+        grant_badge: "Udělit odznak"
+        lock_post: "Uzamknout příspěvek "
+        lock_post_description: "Zabránit přispěvatelům v úpravách tohoto příspěvku"
+        unlock_post: "Odemknout příspěvek"
+        unlock_post_description: "Dovolit přispěvatelům úpravy tohoto příspěvku"
       actions:
         flag: 'Nahlásit'
+        defer_flags:
+          few: Ignorovat nahlášení
+          many: Ignorovat nahlášení
+          one: Ignorovat nahlášení
+          other: Ignorovat nahlášení
         undo:
           off_topic: "Zrušit nahlášení"
           spam: "Zrušit nahlášení"
@@ -1607,6 +2001,11 @@ cs:
           notify_user: "odeslal zprávu"
           bookmark: "záložka přidána"
           like: "se líbí"
+          like_capped:
+            few: a {{count}} dalším se to líbí
+            many: a {{count}} dalším se to líbí
+            one: a jednomu dalšímu se to líbí
+            other: a {{count}} dalším se to líbí
           vote: "hlasoval pro tento příspěvek"
         by_you:
           off_topic: "Označili jste tento příspěvek jako off-topic"
@@ -1619,75 +2018,98 @@ cs:
           vote: "Hlasovali jste pro tento příspěvek"
         by_you_and_others:
           off_topic:
-            one: "Vy a 1 další člověk jste označili tento příspěvek jako off-topic"
-            few: "Vy a {{count}} další lidé jste označili tento příspěvek jako off-topic"
-            other: "Vy a {{count}} dalších lidí jste označili tento příspěvek jako off-topic"
+            few: Vy a {{count}} další lidé jste označili tento příspěvek jako off-topic
+            many: Vy a {{count}} dalších lidí jste označili tento příspěvek jako off-topic
+            one: Vy a 1 další člověk jste označili tento příspěvek jako off-topic
+            other: Vy a {{count}} dalších lidí jste označili tento příspěvek jako off-topic
           spam:
-            one: "Vy a 1 další člověk jste označili tento příspěvek jako spam"
-            few: "Vy a {{count}} další lidé jste označili tento příspěvek jako spam"
-            other: "Vy a {{count}} dalších lidí jste označili tento příspěvek jako spam"
+            few: Vy a {{count}} další lidé jste označili tento příspěvek jako spam
+            many: Vy a {{count}} dalších lidí jste označili tento příspěvek jako spam
+            one: Vy a 1 další člověk jste označili tento příspěvek jako spam
+            other: Vy a {{count}} dalších lidí jste označili tento příspěvek jako spam
           inappropriate:
-            one: "Vy a 1 další člověk jste označili tento příspěvek jako nevhodný"
-            few: "Vy a {{count}} další lidé jste označili tento příspěvek jako nevhodný"
-            other: "Vy a {{count}} dalších lidí jste označili tento příspěvek jako nevhodný"
+            few: Vy a {{count}} další lidé jste označili tento příspěvek jako nevhodný
+            many: Vy a {{count}} dalších lidí jste označili tento příspěvek jako nevhodný
+            one: Vy a 1 další člověk jste označili tento příspěvek jako nevhodný
+            other: Vy a {{count}} dalších lidí jste označili tento příspěvek jako nevhodný
           notify_moderators:
-            one: "Vy a 1 další člověk jste nahlásili tento příspěvek"
-            few: "Vy a {{count}} další lidé jste nahlásili tento příspěvek"
-            other: "Vy a {{count}} dalších lidí jste nahlásili tento příspěvek"
+            few: Vy a {{count}} další lidé jste nahlásili tento příspěvek
+            many: Vy a {{count}} dalších lidí jste nahlásili tento příspěvek
+            one: Vy a 1 další člověk jste nahlásili tento příspěvek
+            other: Vy a {{count}} dalších lidí jste nahlásili tento příspěvek
           notify_user:
-            one: "Vy a 1 další uživatel jste poslali zprávu tomuto uživateli"
-            few: "Vy a {{count}} ostatní lidé jste poslali zprávu tomuto uživateli"
-            other: "Vy a {{count}} ostatních lidí jste poslali zprávu tomuto uživateli"
+            few: Vy a {{count}} ostatní lidé jste poslali zprávu tomuto uživateli
+            many: Vy a {{count}} ostatních lidí jste poslali zprávu tomuto uživateli
+            one: Vy a 1 další uživatel jste poslali zprávu tomuto uživateli
+            other: Vy a {{count}} ostatních lidí jste poslali zprávu tomuto uživateli
           bookmark:
-            one: "Vy a 1 další člověk jste si přidali tento příspěvek do záložek"
-            few: "Vy a {{count}} další lidé jste si přidali tento příspěvek do záložek"
-            other: "Vy a {{count}} dalších lidí si přidali tento příspěvek do záložek"
+            few: Vy a {{count}} další lidé jste si přidali tento příspěvek do záložek
+            many: Vy a {{count}} dalších lidí si přidali tento příspěvek do záložek
+            one: Vy a 1 další člověk jste si přidali tento příspěvek do záložek
+            other: Vy a {{count}} dalších lidí si přidali tento příspěvek do záložek
           like:
-            one: "Vám a 1 dalšímu člověku se tento příspěvek líbí"
-            few: "Vám a {{count}} dalším lidem se tento příspěvek líbí"
-            other: "Vám a {{count}} dalším lidem se tento příspěvek líbí"
+            few: Vám a {{count}} dalším lidem se tento příspěvek líbí
+            many: Vám a {{count}} dalším lidem se tento příspěvek líbí
+            one: Vám a 1 dalšímu člověku se tento příspěvek líbí
+            other: Vám a {{count}} dalším lidem se tento příspěvek líbí
           vote:
-            one: "Vy a 1 další člověk jste hlasovali pro tento příspěvek"
-            few: "Vy a {{count}} další lidé jste hlasovali pro tento příspěvek"
-            other: "Vy a {{count}} dalších lidí jste hlasovali pro tento příspěvek"
+            few: Vy a {{count}} další lidé jste hlasovali pro tento příspěvek
+            many: Vy a {{count}} dalších lidí jste hlasovali pro tento příspěvek
+            one: Vy a 1 další člověk jste hlasovali pro tento příspěvek
+            other: Vy a {{count}} dalších lidí jste hlasovali pro tento příspěvek
         by_others:
           off_topic:
-            one: "1 člověk označil tento příspěvek jako off-topic"
-            few: "{{count}} lidé označili tento příspěvek jako off-topic"
-            other: "{{count}} lidí označilo tento příspěvek jako off-topic"
+            few: '{{count}} lidé označili tento příspěvek jako off-topic'
+            many: '{{count}} lidí označilo tento příspěvek jako off-topic'
+            one: 1 člověk označil tento příspěvek jako off-topic
+            other: '{{count}} lidí označilo tento příspěvek jako off-topic'
           spam:
-            one: "1 člověk označil tento příspěvek jako spam"
-            few: "{{count}} lidé označili tento příspěvek jako spam"
-            other: "{{count}} lidí označilo tento příspěvek jako spam"
+            few: '{{count}} lidé označili tento příspěvek jako spam'
+            many: '{{count}} lidí označilo tento příspěvek jako spam'
+            one: 1 člověk označil tento příspěvek jako spam
+            other: '{{count}} lidí označilo tento příspěvek jako spam'
           inappropriate:
-            one: "1 člověk označil tento příspěvek jako nevhodný"
-            few: "{{count}} lidé označili tento příspěvek jako nevhodný"
-            other: "{{count}} lidí označilo tento příspěvek jako nevhodný"
+            few: '{{count}} lidé označili tento příspěvek jako nevhodný'
+            many: '{{count}} lidí označilo tento příspěvek jako nevhodný'
+            one: 1 člověk označil tento příspěvek jako nevhodný
+            other: '{{count}} lidí označilo tento příspěvek jako nevhodný'
           notify_moderators:
-            one: "1 člověk nahlásil tento příspěvek"
-            few: "{{count}} lidé nahlásili tento příspěvek"
-            other: "{{count}} lidí nahlásilo tento příspěvek"
+            few: '{{count}} lidé nahlásili tento příspěvek'
+            many: '{{count}} lidí nahlásilo tento příspěvek'
+            one: 1 člověk nahlásil tento příspěvek
+            other: '{{count}} lidí nahlásilo tento příspěvek'
           notify_user:
-            one: "1 člověk poslal zprávu tomuto uživateli"
-            few: "{{count}} lidé poslali zprávu tomuto uživateli"
-            other: "{{count}} lidí poslalo zprávu tomuto uživateli"
+            few: '{{count}} lidé poslali zprávu tomuto uživateli'
+            many: '{{count}} lidí poslalo zprávu tomuto uživateli'
+            one: 1 člověk poslal zprávu tomuto uživateli
+            other: '{{count}} lidí poslalo zprávu tomuto uživateli'
           bookmark:
-            one: "1 člověk si přidal tento příspěvek do záložek"
-            few: "{{count}} lidé si přidali tento příspěvek do záložek"
-            other: "{{count}} lidí si přidalo tento příspěvek do záložek"
+            few: '{{count}} lidé si přidali tento příspěvek do záložek'
+            many: '{{count}} lidí si přidalo tento příspěvek do záložek'
+            one: 1 člověk si přidal tento příspěvek do záložek
+            other: '{{count}} lidí si přidalo tento příspěvek do záložek'
           like:
-            one: "1 člověku se tento příspěvek líbí"
-            few: "{{count}} lidem se tento příspěvek líbí"
-            other: "{{count}} lidem se tento příspěvek líbí"
+            few: '{{count}} lidem se tento příspěvek líbí'
+            many: '{{count}} lidem se tento příspěvek líbí'
+            one: 1 člověku se tento příspěvek líbí
+            other: '{{count}} lidem se tento příspěvek líbí'
           vote:
-            one: "1 člověk hlasoval pro tento příspěvek"
-            few: "{{count}} lidé hlasovali pro tento příspěvek"
-            other: "{{count}} lidí hlasovalo pro tento příspěvek"
+            few: '{{count}} lidé hlasovali pro tento příspěvek'
+            many: '{{count}} lidí hlasovalo pro tento příspěvek'
+            one: 1 člověk hlasoval pro tento příspěvek
+            other: '{{count}} lidí hlasovalo pro tento příspěvek'
+      delete:
+        confirm:
+          few: 'Jsi si jistý, že chceš smazat tyto všechny {{count}} příspěvky? '
+          many: 'Jsi si jistý, že chceš smazat tyto všechny {{count}} příspěvky? '
+          one: Jsi si jistý, že chceš smazat tento příspěvek?
+          other: 'Jsi si jistý, že chceš smazat tyto všechny {{count}} příspěvky? '
       merge:
         confirm:
-          one: "Opravdu chceš sloučit tyto příspěvky?"
-          few: "Opravdu chceš sloučit {{count}} příspěvky?"
-          other: "Opravdu chceš sloučit {{count}} příspěvků?"
+          few: Opravdu chceš sloučit {{count}} příspěvky?
+          many: Opravdu chceš sloučit {{count}} příspěvků?
+          one: Opravdu chceš sloučit tyto příspěvky?
+          other: Opravdu chceš sloučit {{count}} příspěvků?
       revisions:
         controls:
           first: "První revize"
@@ -1709,8 +2131,12 @@ cs:
             button: 'HTML'
           side_by_side_markdown:
             title: "Show the raw source diffs side-by-side"
+            button: 'původní'
       raw_email:
         displays:
+          raw:
+            title: "Ukázat původní email"
+            button: 'původní'
           text_part:
             title: "Ukázat textovou část emailu"
             button: 'Text'
@@ -1729,8 +2155,11 @@ cs:
       settings: 'Nastavení'
       topic_template: "Šablona tématu"
       tags: "Štítky"
+      tags_allowed_tags: "Povolit pouze tyto štítky k používání v této kategorii:"
+      tags_allowed_tag_groups: "Pouze povolené štítky z těchto skupin mohou být používané v této kategorii:"
       tags_placeholder: "(Volitelné) seznam dovolených štítků"
       tag_groups_placeholder: "(Volitelné) seznam dovolených skupin štítků"
+      topic_featured_link_allowed: "Povolit zobrazené odkazy v této kategorii"
       delete: 'Smazat kategorii'
       create: 'Nová kategorie'
       create_long: 'Vytvořit novou kategorii'
@@ -1762,7 +2191,16 @@ cs:
       email_in_allow_strangers: "Přijímat emaily i od neregistrovaných uživatelů"
       email_in_disabled: "Přidávání nových témat před email je zakázáno v Nastavení fóra. K povolení nových témat přes email,"
       email_in_disabled_click: 'povolit nastavení "email in"'
-      suppress_from_homepage: "Potlač tuto kategorii na domovské stránce."
+      mailinglist_mirror: "Kategorie kopíruje mailing list"
+      suppress_from_latest: "Potlač tuto kategorii na nejnovějších tématech."
+      show_subcategory_list: "Ukázat seznam podkategorií nad tématy v této kategorii."
+      num_featured_topics: "Počet témat, která se zobrazují na stránce kategorie "
+      subcategory_num_featured_topics: "Počet zobrazených témat na stránce nadřazené kategorie:"
+      all_topics_wiki: "Vytvořit nové wiki témat ve výchozím nastavení."
+      subcategory_list_style: "Styl seznamu podkategorií: "
+      sort_order: "Seznam témat seřazený podle: "
+      default_view: "Výchozí seznam témat: "
+      default_top_period: "Výchozí hlavní doba:"
       allow_badges_label: "Povolit používání odznaků v této kategorii"
       edit_permissions: "Upravit oprávnění"
       add_permission: "Přidat oprávnění"
@@ -1802,6 +2240,9 @@ cs:
       sort_descending: 'Sestupně'
       subcategory_list_styles:
         rows: "Řady"
+        rows_with_featured_topics: "Řádky s vybranými tématy"
+        boxes: "Boxy "
+        boxes_with_featured_topics: "Boxy s vybranými tématy"
     flagging:
       title: 'Děkujeme, že pomáháte udržovat komunitu zdvořilou!'
       action: 'Nahlásit příspěvek'
@@ -1825,17 +2266,20 @@ cs:
       custom_placeholder_notify_moderators: "Sdělte nám, co vás přesně trápí a kde to bude možné, tak nám poskytněte související odkazy a příklady."
       custom_message:
         at_least:
-          one: "zadejte alespoň 1 znak"
-          few: "zadejte alespoň {{count}} znaky"
-          other: "zadejte alespoň {{count}} znaků"
+          few: zadejte alespoň {{count}} znaky
+          many: zadejte alespoň {{count}} znaků
+          one: zadejte alespoň 1 znak
+          other: zadejte alespoň {{count}} znaků
         more:
-          one: "ještě 1..."
-          few: "ještě {{count}}..."
-          other: "ještě {{count}}..."
+          few: ještě {{count}}...
+          many: ještě {{count}}...
+          one: ještě 1...
+          other: ještě {{count}}...
         left:
-          one: "1 zbývá"
-          few: "{{count}} zbývají"
-          other: "{{count}} zbývá"
+          few: '{{count}} zbývají'
+          many: '{{count}} zbývá'
+          one: 1 zbývá
+          other: '{{count}} zbývá'
     flagging_topic:
       title: "Děkujeme, že pomáháte udržovat komunitu zdvořilou!"
       action: "Nahlásit téma"
@@ -1846,15 +2290,17 @@ cs:
       links_title: "Populární odkazy"
       links_shown: "zobrazit více odkazů..."
       clicks:
-        one: "1 kliknutí"
-        few: "%{count} kliknutí"
-        other: "%{count} kliknutí"
+        few: '%{count} kliknutí'
+        many: '%{count} kliknutí'
+        one: 1 kliknutí
+        other: '%{count} kliknutí'
     post_links:
       about: "expandovat více odkazů v tomto příspěvku"
       title:
-        one: "1 více"
-        few: "%{count} více"
-        other: "%{count} více"
+        few: '%{count} více'
+        many: '%{count} více'
+        one: 1 více
+        other: '%{count} více'
     topic_statuses:
       warning:
         help: "Toto je oficiální varování."
@@ -1881,45 +2327,55 @@ cs:
     posts_long: "v tomto tématu je {{number}} příspěvků"
     posts_likes_MF: |
       Toto téma má {count, plural, one {1 příspěvek} other {# příspěvků}} {ratio, select,
-      low {s velkým poměrem líbí se na příspěvek}
-      med {s velmi velkým poměrem líbí se na příspěvek}
-      high {s extrémně velkým poměrem líbí se na příspěvek}
+      low {s vysokým počtem lajků}
+      med {s velmi vysokým počtem lajků}
+      high {s extrémně vysokým počtem lajků}
       other {}}
     original_post: "Původní příspěvek"
     views: "Zobrazení"
     views_lowercase:
-      one: "zobrazení"
-      few: "zobrazení"
-      other: "zobrazení"
+      few: zobrazení
+      many: zobrazení
+      one: zobrazení
+      other: zobrazení
     replies: "Odpovědi"
+    views_long:
+      few: Toto téma bylo zobrazeno {{number}} krát
+      many: Toto téma bylo zobrazeno {{number}} krát
+      one: Toto téma bylo zobrazeno 1 krát
+      other: Toto téma bylo zobrazeno {{number}} krát
     activity: "Aktivita"
     likes: "Líbí se"
     likes_lowercase:
-      one: "líbí se"
-      few: "líbí se"
-      other: "líbí se"
-    likes_long: "v tomto tématu je {{number}} 'líbí se'"
+      few: líbí se
+      many: líbí se
+      one: líbí se
+      other: líbí se
+    likes_long: "v tomto tématu je {{number}} \"Líbí se\""
     users: "Účastníci"
     users_lowercase:
-      one: "uživatel"
-      few: "uživatelé"
-      other: "uživatelů"
+      few: uživatelé
+      many: uživatelů
+      one: uživatel
+      other: uživatelů
     category_title: "Kategorie"
     history: "Historie"
     changed_by: "od uživatele {{author}}"
     raw_email:
+      title: "Příchozí email"
       not_available: "Není k dispozici!"
     categories_list: "Seznam kategorií"
     filters:
       with_topics: "%{filter} témata"
       with_category: "%{filter} %{category} témata"
       latest:
-        title: "Nejaktuálnější"
+        title: "Aktuální"
         title_with_count:
-          one: "Nedávné (1)"
-          few: "Nedávná ({{count}})"
-          other: "Nedávná ({{count}})"
-        help: "nejaktuálnější témata"
+          few: Nedávná ({{count}})
+          many: Nedávná ({{count}})
+          one: Nedávné (1)
+          other: Nedávná ({{count}})
+        help: "aktuální témata"
       hot:
         title: "Populární"
         help: "populární témata z poslední doby"
@@ -1936,25 +2392,29 @@ cs:
       unread:
         title: "Nepřečtená"
         title_with_count:
-          one: "Nepřečtená (1)"
-          few: "Nepřečtená ({{count}})"
-          other: "Nepřečtená ({{count}})"
+          few: Nepřečtená ({{count}})
+          many: Nepřečtená ({{count}})
+          one: Nepřečtená (1)
+          other: Nepřečtená ({{count}})
         help: "témata, která sledujete nebo hlídáte, s nepřečtenými příspěvky"
         lower_title_with_count:
-          one: "{{count}} nepřečtené"
-          few: "{{count}} nepřečtených"
-          other: "{{count}} nepřečtených"
+          few: '{{count}} nepřečtených'
+          many: '{{count}} nepřečtených'
+          one: '{{count}} nepřečtené'
+          other: '{{count}} nepřečtených'
       new:
         lower_title_with_count:
-          one: "1 nové"
-          few: "{{count}} nová"
-          other: "{{count}} nových"
+          few: '{{count}} nová'
+          many: '{{count}} nových'
+          one: 1 nové
+          other: '{{count}} nových'
         lower_title: "nové"
         title: "Nová"
         title_with_count:
-          one: "Nové"
-          few: "Nová ({{count}})"
-          other: "Nová ({{count}})"
+          few: Nová ({{count}})
+          many: Nová ({{count}})
+          one: Nové
+          other: Nová ({{count}})
         help: "témata vytvořená za posledních několik dní"
       posted:
         title: "Mé příspěvky"
@@ -1965,9 +2425,10 @@ cs:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: "{{categoryName}} ({{count}})"
-          few: "{{categoryName}} ({{count}})"
-          other: "{{categoryName}} ({{count}})"
+          few: '{{categoryName}} ({{count}})'
+          many: '{{categoryName}} ({{count}})'
+          one: '{{categoryName}} ({{count}})'
+          other: '{{categoryName}} ({{count}})'
         help: "populární témata v kategorii {{categoryName}}"
       top:
         title: "Nejlepší"
@@ -2025,10 +2486,14 @@ cs:
         hamburger_menu: '<b>=</b> Otevře hamburgerové menu'
         user_profile_menu: '<b>p</b> Otevře uživatelské menu'
         show_incoming_updated_topics: '<b>.</b> Ukáže aktualizovaná témata'
+        search: '<b>/</b> nebo <b>ctrl</b>+<b>alt</b>+<b>f</b>Vyhledávání'
         help: '<b>?</b> Otevře seznam klávesových zkratek'
-        dismiss_new_posts: '<b>x</b>, <b>r</b> Odbýt nové/příspěvky'
-        dismiss_topics: '<b>x</b>, <b>t</b> Odbýt témata'
+        dismiss_new_posts: '<b>x</b>, <b>r</b> Označit jako přečtené nové/příspěvky'
+        dismiss_topics: '<b>x</b>, <b>t</b> Označit témata jako přečtená'
         log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Odhlásit se'
+      composing:
+        title: 'Skládání'
+        return: '<b>shift</b>+<b>c</b>návrat ke skládání'
       actions:
         title: 'Akce'
         bookmark_topic: 'Přidat záložku na téma'
@@ -2045,30 +2510,42 @@ cs:
         edit: '<b>e</b> Upravit příspěvek'
         delete: '<b>d</b> Smazat příspěvek'
         mark_muted: '<b>m</b>, <b>m</b> Ztišit téma'
+        mark_regular: '<b>m</b>, <b>r</b>Obvyklé (výchozí) téma'
         mark_tracking: '<b>m</b>, <b>t</b> Sledovat téma'
         mark_watching: '<b>m</b>, <b>w</b> Hlídat téma'
         print: '<b>ctrl</b>+<b>p</b> Vytiskni téma'
     badges:
+      earned_n_times:
+        few: Získal tento odznak krát
+        many: Získal tento odznak %{count} krát
+        one: Získal tento odznak krát
+        other: Získal tento odznak %{count} krát
       granted_on: "Získán %{date}"
       others_count: "Ostatní s tímto odznakem (%{count})"
       title: Odznaky
+      allow_title: "Tento odznak můžeš použít jako titul"
+      multiple_grant: "Toto si můžeš zasloužit několikrát"
       badge_count:
-        one: "1 odznak"
-        few: "%{count} odznaky"
-        other: "%{count} odznaků"
+        few: '%{count} odznaky'
+        many: '%{count} odznaků'
+        one: 1 odznak
+        other: '%{count} odznaků'
       more_badges:
-        one: "+1 další"
-        few: "+%{count} další"
-        other: "+%{count} dalších"
+        few: +%{count} další
+        many: +%{count} dalších
+        one: +1 další
+        other: +%{count} dalších
       granted:
-        one: "1 přidělen"
-        few: "%{count} přidělen"
-        other: "%{count} přidělen"
-      select_badge_for_title: Vyberte odznak, který chcete použít jako svůj titul
-      none: "<none>"
+        few: '%{count} přidělen'
+        many: '%{count} přidělen'
+        one: 1 přidělen
+        other: '%{count} přidělen'
+      select_badge_for_title: "Vyberte odznak, který chcete použít jako svůj titul"
+      none: "(žádný)"
+      successfully_granted: "Úspěšně přidělený %{badge}uživateli%{username}"
       badge_grouping:
         getting_started:
-          name: Jak začít?
+          name: "Jak začít?"
         community:
           name: Komunita
         trust_level:
@@ -2088,11 +2565,19 @@ cs:
       </p>
     tagging:
       all_tags: "Všechny štítky"
+      other_tags: "Ostatní štítky "
       selector_all_tags: "všechny štítky"
       selector_no_tags: "bez štítků"
       changed: "změněné štítky:"
       tags: "Štítky"
+      choose_for_topic: "volitelné štítky"
       delete_tag: "Smaž štítek"
+      delete_confirm:
+        few: Jsi si jist, že chceš smazat tento štítek a odstranit ho z {{count}} témat, kterým je přiřazen?
+        many: Jsi si jist, že chceš smazat tento štítek a odstranit ho z {{count}} témat, kterým je přiřazen?
+        one: Jsi si jist, že chceš smazat tento štítek a odstranit ho z tématu, kterému je přiřazen?
+        other: Jsi si jist, že chceš smazat tento štítek a odstranit ho z {{count}} témat, kterým je přiřazen?
+      delete_confirm_no_topics: "Opravdu chceš smazat tento štítek? "
       rename_tag: "Přejmenovat štítek"
       rename_instructions: "Vyber název nového štítku:"
       sort_by: "Seřadit dle:"
@@ -2108,18 +2593,15 @@ cs:
       notifications:
         watching:
           title: "Hlídání"
-          description: "Budete automaticky hlídat všechna nová témata s těmito štítky. Na všechny nové příspěvky a témata budete upozorněni. Počet nových příspěvků se zobrazí vedle tématu."
         watching_first_post:
           title: "Hlídané první příspěvky"
-          description: "Budete informováni pouze o prvním příspěvku v každém novém tématu s tímto štítkem."
         tracking:
           title: "Sledování"
-          description: "Všechna nová témata pro tento štítek budou automaticky sledovaná. Počet nepřečtených a nových příspěvků se zobrazí vedle tématu."
         regular:
+          title: "Běžný"
           description: "Budete informováni pokud někdo zmíní vaše @jméno nebo odpoví na váš příspěvek."
         muted:
           title: "Ztišené"
-          description: "Nebudete upozorněni na žádná nová témata pro tento štítek a ani se nebudou zobrazovat jako nepřečtené."
       groups:
         title: "Skupiny štítků"
         about: "Přidej štítky do skupin pro přehlednost"
@@ -2128,10 +2610,12 @@ cs:
         parent_tag_label: "Nadřazený štítek:"
         parent_tag_placeholder: "Volitelné"
         parent_tag_description: "Štítky z této skupiny nemohou být použity pokud není přítomen nadřazený štítek."
+        one_per_topic_label: "Omezit na jeden štítek k tématu z této skupiny"
         new_name: "Nová skupina štítků"
         save: "Uložit"
         delete: "Smazat"
         confirm_delete: "Jste si jistí, že chcete smazat tuto skupinu štítků?"
+        visible_only_to_staff: "Štítky vidí pouze redaktoři"
       topics:
         none:
           unread: "Nemáte žádná nepřečtená témata."
@@ -2158,6 +2642,9 @@ cs:
       custom_message_link: "vlastní zprávu"
       custom_message_placeholder: "Vložte vlastní zprávu"
       custom_message_template_forum: "Ahoj! Měl by se připojit na toto fórum!"
+      custom_message_template_topic: "Ahoj, myslím si, že by se ti mohlo tohle téma líbit!"
+    safe_mode:
+      enabled: "Bezpečný režim je povolený, k jeho zakázání zavři toto okno prohlížeče"
   admin_js:
     type_to_filter: "text pro filtrování..."
     admin:
@@ -2182,6 +2669,7 @@ cs:
         no_problems: "Nenalezeny žádné problémy."
         moderators: 'Moderátoři:'
         admins: 'Administrátoři:'
+        silenced: 'Ztišený:'
         suspended: 'Zakázáno:'
         private_messages_short: "Zpráv"
         private_messages_title: "Zprávy"
@@ -2191,12 +2679,12 @@ cs:
         backups: "zálohy"
         traffic_short: "Provoz"
         traffic: "Webové požadavky na aplikaci"
+        page_views: "Zobrazení stránky "
+        page_views_short: "Zobrazení stránky "
         show_traffic_report: "Zobrazit detailní zprávu o provozu"
         reports:
           today: "Dnes"
           yesterday: "Včera"
-          last_7_days: "Týden"
-          last_30_days: "Měsíc"
           all_time: "Za celou dobu"
           7_days_ago: "Týden"
           30_days_ago: "Měsíc"
@@ -2212,12 +2700,29 @@ cs:
         by: "od"
       flags:
         title: "Nahlášení"
+        active_posts: "Nahlášené příspěvky "
+        old_posts: "Dříve nahlášené příspěvky"
+        topics: "Nahlášená témata"
+        moderation_history: "Historie moderování"
         agree: "Schválit"
         agree_title: "Potvrdit toto hlášení jako právoplatné a korektní"
-        defer_flag_title: "Odstranit nahlášení; teď nevyžaduje žádné opatření."
+        agree_flag_hide_post: "Schovat příspěvek"
+        agree_flag_hide_post_title: "Schovat tento příspěvek a automaticky poslat uživateli zprávu, aby ho urychleně upravil."
+        agree_flag_restore_post: "Souhlasit a odstranit příspěvek"
+        agree_flag_restore_post_title: "Obnov příspěvek, aby ho mohli vidět všichni ostatní uživatelé."
+        agree_flag_suspend: "Pozastavit uživatele"
+        agree_flag_suspend_title: "Schválit nahlášení a pozastavit uživatele."
+        agree_flag_silence: "Ztišit uživatele"
+        agree_flag_silence_title: "Schválit nahlášení a ztišit uživatele."
+        agree_flag: "Uchovat příspěvek"
+        agree_flag_title: "Schválit nahlášení a zanechat příspěvek nepozměněný. "
+        ignore_flag: "ignorovat"
+        ignore_flag_title: "Odstranit nahlášení; Nyní nevyžaduje žádné opatření."
         delete: "Smazat"
         delete_title: "Smazat příspěvek, na který toto hlášení odkazuje."
+        delete_post_defer_flag: "Smazat příspěvek a ignorovat nahlášení"
         delete_post_defer_flag_title: "Smazat příspěvek; pokud je to první příspěvek, tak smazat téma"
+        delete_post_agree_flag: "Smazat příspěvek a Schválit nahlášení"
         delete_post_agree_flag_title: "Smazat příspěvek; pokud je to první příspěvek, tak smazat téma"
         delete_flag_modal_title: "Smazat a..."
         delete_spammer: "Odstranit spamera"
@@ -2229,49 +2734,97 @@ cs:
         clear_topic_flags: "Hotovo"
         clear_topic_flags_title: "The topic has been investigated and issues have been resolved. Click Done to remove the flags."
         more: "(více odpovědí...)"
+        suspend_user: "Zakázat uživatele"
+        suspend_user_title: "Pozastavit uživatele za tento příspěvek"
+        replies:
+          few: '[%{count} odpovědi]'
+          many: '[%{count} odpovědí]'
+          one: '[1 odpověď]'
+          other: '[%{count} odpovědí]'
         dispositions:
           agreed: "schváleno"
           disagreed: "neschváleno"
+          deferred: "ignorovaný "
         flagged_by: "Nahlásil"
         resolved_by: "Vyřešeno"
         took_action: "Zakročit"
         system: "Systémové soukromé zprávy"
         error: "Něco se pokazilo"
         reply_message: "Odpovědět"
+        no_results: "Nejsou zde žádné nahlášené příspěvky."
         topic_flagged: "Tohle <strong>téma</strong> bylo označeno."
+        show_full: "Zobrazit celý příspěvek"
         visit_topic: "Zobrazit téma pro přijmutí opatření."
         was_edited: "Příspěvek byl upraven po prvním nahlášení"
         previous_flags_count: "Tento příspěvek byl již nahlášen {{count}} krát."
+        show_details: "Ukázat detail nahlášení"
+        details: "podrobnosti"
+        flagged_topics:
+          topic: "Téma"
+          type: "Typ"
+          users: "Uživatelé"
+          last_flagged: "Naposledy nahlášený"
+        short_names:
+          off_topic: "mimo téma"
+          inappropriate: "nevhodný"
+          spam: "spam"
+          notify_user: "Přizpůsobené"
+          notify_moderators: "přizpůsobené"
       groups:
+        new:
+          title: "Nová skupina"
+          create: "Vytvořit"
+          name:
+            too_short: "Název skupiny je moc krátký"
+            too_long: "Název skupiny je moc dlouhý"
+            checking: "Zjišťuji, zda je jméno skupiny volné..."
+            available: "Název skupiny je k dispozici"
+            not_available: "Název skupiny není k dispozici"
+            blank: "Název skupiny nemůže být prázdný"
+        bulk_add:
+          title: "Hromadné přidání do skupiny"
+          complete_users_not_added: "Tito uživatelé nebyli přidáni (ujistěte se, že mají účet):"
+          paste: "Vložte seznam uživatelských jmen a e-mailů, jeden záznam na řádek:"
+        manage:
+          interaction:
+            email: Email
+            incoming_email: "Vlastní příchozí emailová adresa"
+            incoming_email_placeholder: "zadejte emailovou adresu"
+            visibility: Viditelnost
+            visibility_levels:
+              title: "Kdo vidí tuto skupinu?"
+              public: "Všichni"
+              members: "Vlastníci skupiny, členové a správci"
+              staff: "Vlastníci a redaktoři skupiny"
+              owners: "Vlastníci a správci skupiny"
+          membership:
+            automatic: Automatické
+            trust_level: Věrohodnost
+            trust_levels_title: "Automaticky přidělená věrohodnost členům když jsou přidáni: "
+            automatic_membership_email_domains: "Uživatelé zaregistrovaní s emailem jehož doména se přesně shoduje s jednou z tohoto seznamu budou automaticky přidáni to této skupiny:"
+            automatic_membership_retroactive: "Aplikovat stejné doménové pravidlo na už existující uživatele"
+            primary_group: "Automaticky nastavit jako hlavní skupinu"
+        name_placeholder: "Název skupiny, bez mezer, stejná pravidla jako pro uživatelská jména"
         primary: "Hlavní skupina"
         no_primary: "(žádná hlavní skupina)"
         title: "Skupiny"
         edit: "Upravit skupiny"
         refresh: "Obnovit"
-        new: "Nová"
-        selector_placeholder: "zadejte uživatelské jméno"
         about: "Zde můžete upravit názvy skupin a členství"
         group_members: "Členové skupiny"
         delete: "Smazat"
-        delete_confirm: "Smazat toto skupiny?"
+        delete_confirm: "Smazat tuto skupinu?"
         delete_failed: "Unable to delete group. If this is an automatic group, it cannot be destroyed."
         delete_owner_confirm: "Odstranit vlastnickou výsadu od '%{username}'?"
         add: "Přidat"
-        add_members: "Přidat členy"
         custom: "Přizpůsobené"
-        bulk_complete: "Uživatelé byli přidáni do skupiny."
-        bulk: "Hromadné přidání do skupiny"
-        bulk_paste: "Vlož seznam uživatelských jmen a e-mailů, jeden záznam na řádek"
-        bulk_select: "(vyber skupinu)"
         automatic: "Automatické"
-        automatic_membership_email_domains: "Uživatelé zaregistrovaní s emailem jehož doména se přesně shoduje s jednou z tohoto seznamu budou automaticky přidáni to této skupiny:"
-        automatic_membership_retroactive: "Aplikovat stejné doménové pravidlo na už existující uživatele"
-        default_title: "Výchozí popis pro všechny uživatele této skupiny"
-        primary_group: "Automaticky nastavit jako hlavní skupinu"
+        default_title: "Výchozí popis"
+        default_title_description: "bude aplikováno na všechny uživatele ve skupině"
         group_owners: Vlastníci
         add_owners: Přidat vlastníky
-        incoming_email: "Vlastní příchozí emailová adresa"
-        incoming_email_placeholder: "zadej emailovou adresu"
+        none_selected: "Vyber si skupinu, abys mohl začít"
+        no_custom_groups: "Vytvořit novou vlastní skupinu"
       api:
         generate_master: "Vygenerovat Master API Key"
         none: "Nejsou tu žádné aktivní API klíče."
@@ -2288,34 +2841,77 @@ cs:
         note_html: "Uchovejte tento klíč <strong>v bezpečí</strong>, každý, kdo má tento klíč, může libovolně vytvářet příspěvky na fóru i za ostatní uživatele."
       web_hooks:
         title: "Webhooks"
+        none: "Právě tu nejsou žádné webhooks."
+        instruction: "Webhooks umožňuje Discoursu upozornit na externí služby pokud se na vaší stránce děje nějaká údálost. Pokud je wehook zaplý, bude žádost o příspěvek poslaná na uvedené URL adresy."
+        detailed_instruction: "Pokud nastane vybraná událost, žádost o příspěvek bude odeslána na uvedené URL."
         new: "Nový Webhook"
         create: "Vytvoř"
         save: "Uložit"
         destroy: "Smazat"
         description: "Popis"
+        controls: "Správa"
         go_back: "Zpět na seznam"
+        payload_url: "Payload URL"
         payload_url_placeholder: "https://example.com/postreceive"
+        warn_local_payload_url: "Zdá se, že se snažíš nastavit webhook k lokální url. Doručená událost na lokální adresu může způsobit vedlejší účinek nebo neočekávané chování. Chceš pokračovat? "
+        secret_invalid: "Heslo nesmí obsahovat žádné prázdné znaky."
+        secret_too_short: "Heslo by mělo mít alespoň 12 znaků."
+        secret_placeholder: "Volitelný řetězec využívaný k vytvoření podpisu"
+        event_type_missing: "Musíš nastavit minimálně jeden typ události."
         content_type: "Typ obsahu"
+        secret: "Heslo"
+        event_chooser: "Které události by měly spustit tento webhook?"
         wildcard_event: "Pošli mi vše."
+        individual_event: "Vyber individuální události."
+        verify_certificate: "Zkontroluj TLS certifikát payload URL "
         active: "Aktivní"
+        active_notice: "Pokud nastane událost, doručíme o ní data."
+        categories_filter_instructions: "Relevantní webhooky budou spuštěny pouze tehdy, pokud událost souvisí se stanovenými kategoriemi. Nechte prázdné místo pro spuštění webhooků pro všechny kategorie. "
+        categories_filter: "Spuštěné kategorie"
+        groups_filter_instructions: "Relevantní webhooky budou spuštěny pouze tehdy, pokud událost souvisí se specifikovanými skupinami. Nechte prázdné pro spuštění webhooků pro všechny skupiny."
+        groups_filter: "Spuštěné skupiny"
+        delete_confirm: "Smazat tento webhook? "
+        topic_event:
+          name: "Téma události "
+          details: "Pokud je zde nové téma, reviduj, změň nebo smaž. "
+        post_event:
+          name: "Zveřejnit událost"
+          details: "Pokud je zde nová odpověď, uprav, smaž nebo odeber."
+        user_event:
+          name: "Uživatelské události"
+          details: "Pokud se uživatel přihlásí, odhlásí, je vytvořený, schválen nebo aktualizovaný."
         delivery_status:
+          title: "Stav doručení"
           inactive: "Neaktivní"
+          failed: "Neúspěšný"
+          successful: "Úspěšný"
         events:
+          none: "Nejsou zde žádné související události."
+          redeliver: "Znovu dodat"
           incoming:
-            one: "1 nová událost"
-            few: "{{count}} nové události"
-            other: "{{count}} nových událostí"
+            few: '{{count}} nové události'
+            many: '{{count}} nových událostí'
+            one: 1 nová událost
+            other: '{{count}} nových událostí'
           completed_in:
-            one: "Dokončen za 1 sekundu."
-            few: "Dokončen za {{count}} sekundy."
-            other: "Dokončen za {{count}} sekund."
+            few: Dokončen za {{count}} sekundy.
+            many: Dokončen za {{count}} sekund.
+            one: Dokončen za 1 sekundu.
+            other: Dokončen za {{count}} sekund.
           request: "Požadavek"
           response: "Odezva"
+          redeliver_confirm: "Jsi si jistý, že chceš znovu doručit stejný payload?"
           headers: "Hlavičky"
+          payload: "Payload"
           body: "Tělo"
+          go_list: "Přejít na seznam"
           go_details: "Editovat webhook"
+          go_events: "Přejít na události"
           ping: "Ping"
+          status: "Stavový kód"
           event_id: "ID"
+          timestamp: "Vytvořený"
+          completion: "čas dokončení"
           actions: "Akce"
       plugins:
         title: "Pluginy"
@@ -2352,7 +2948,7 @@ cs:
           label: "Nahrát"
           title: "Nahrát zálohu do téhle instance"
           uploading: "Nahrávání..."
-          success: "'{{filename}}' has successfully been uploaded."
+          success: "'{{filename}}' byl úspěšně nahraný. Soubor je nyní zpracováván a do minuty bude ukázán v seznamu. "
           error: "There has been an error while uploading '{{filename}}': {{message}}"
         operations:
           is_running: "An operation is currently running..."
@@ -2365,9 +2961,10 @@ cs:
             label: "Záloha"
             title: "Vytvořit zálohu"
             confirm: "Chcete začít novou zálohu?"
-            without_uploads: "Ano (nepřikládej soubory)"
           download:
             label: "Stáhnout"
+            title: "Poslat e-mail s odkazem ke stažení"
+            alert: "Odkaz ke stažení tohoto zálohování ti byl poslaný e-mailem"
           destroy:
             title: "Odstranit zálohu"
             confirm: "Are you sure you want to destroy this backup?"
@@ -2379,6 +2976,7 @@ cs:
           rollback:
             label: "Rollback"
             title: "Rollback the database to previous working state"
+            confirm: "Jsi si jistý, že chceš vrátit databázi zpět do předchozího funkčního stavu?"
       export_csv:
         success: "Export byl spuštěn. O dokončení celého procesu budete informování pomocí zprávy."
         failed: "Exportování selhalo. Prosím zkontrolujte logy."
@@ -2398,17 +2996,20 @@ cs:
         title: "Přizpůsobení"
         long_title: "Přizpůsobení webu"
         preview: "náhled"
+        explain_preview: "Náhled stránky s povoleným motivem"
         save: "Uložit"
         new: "Nové"
         new_style: "Nový styl"
         import: "Import"
         delete: "Smazat"
+        delete_confirm: "Smazat tento motiv? "
         about: "Změn CSS styly a hlavičky HTML na stránkách. Přidej přizpůsobení na začátek."
         color: "Barva"
         opacity: "Neprůhlednost"
         copy: "Kopírovat"
         copy_to_clipboard: "Kopírovat do schránky"
         copied_to_clipboard: "Zkopírováno do schránky"
+        copy_to_clipboard_error: "Při kopírování dat do schránky došlo k chybě"
         theme_owner: "není editovatelné, vlastněno:"
         email_templates:
           title: "Šablona emailu"
@@ -2419,14 +3020,85 @@ cs:
           revert: "Vrátit změny"
           revert_confirm: "Opravdu chcete vrátit změny?"
         theme:
+          import_theme: "importovat motiv "
           customize_desc: "Přizpůsobit:"
+          title: "Motivy"
+          long_title: "Změnit barvy, CSS a HTML obsahy na vaší stránce"
           edit: "Upravit"
+          edit_confirm: "Toto je vzdálené téma, pokud upravíš CSS/HTML tvoje změny budou vymazány při dalším updatu motivu."
+          common: "společný"
+          desktop: "Desktop"
           mobile: "Mobilní verze"
+          settings: "Nastavení"
           preview: "Náhled"
+          is_default: "Motiv je ve výchozím nastavení povolený"
+          user_selectable: "Motiv může být zvolen uživatelem"
           color_scheme: "Barevné schéma"
+          color_scheme_select: "Vybrat barvy motivu"
+          custom_sections: "vlastí sekce:"
+          theme_components: "Komponenty motivu"
+          uploads: "nahrání"
+          no_uploads: "Můžeš nahrát položku spojenou s tvým motivem jako jsou fonty a obrázky."
+          add_upload: "Přidat nahrávání "
+          upload_file_tip: "Vybrat položku k nahrání (png, woff2, etc...)"
+          variable_name: "Název SCSS var:"
+          upload: "Nahrát"
+          child_themes_check: "Motiv zahrnuje jiné dětské motivy"
+          css_html: "Vlastí CSS/HTML"
+          edit_css_html: "Upravit CSS/HTML"
+          edit_css_html_help: "Neupravil jsi CSS nebo HTML"
+          delete_upload_confirm: "Smazat toto nahrávání?  (Motiv CSS by mohl přestat fungovat!)"
+          import_web_tip: "Úložiště obsahující motiv"
+          import_file_tip: ".dcstyle.json soubor obsahující motiv"
+          is_private: "Motiv je v soukromém git úložišti"
+          public_key: "Přidělit přístup k repo následujícím veřejným klíčem:"
+          about_theme: "O motivu "
+          license: "Licence"
+          component_of: "Motiv je součástí: "
+          update_to_latest: "Aktualizovat na nejnovější"
+          check_for_updates: "kontrola aktualizací"
+          updating: "Aktualizace..."
+          up_to_date: "Motiv je aktuální, naposledy zkontrolováno: "
+          add: "Přidat"
+          theme_settings: "Nastavení motivu"
+          no_settings: "Tento motiv nemá nastavení"
+          commits_behind:
+            few: Motiv je {{count}} zavázaný!
+            many: Motivy jsou {{count}} zavázané!
+            one: Motiv je {{count}} zavázaný!
+            other: Motivy jsou {{count}} zavázané!
+          scss:
+            text: "CSS"
+            title: "Vložit vlastní CSS, akceptujeme všechny platné CSS a SCSS styly."
+          header:
+            text: "Hlavička"
+            title: "Vložit HTML k zobrazení v záhlaví stránky"
+          after_header:
+            text: "Za Hlavičkou"
+            title: "vlož HTML k zobrazení všech stránek po záhlaví"
+          footer:
+            text: "Patička"
+            title: "vložit HTML k zobrazení na zápatí stránky "
+          embedded_scss:
+            text: "Vloženo CSS"
+            title: "Zadat vlastní CSS k doručení s vloženou verzí kometářů"
+          head_tag:
+            text: "</head>"
+            title: "HTML které bude vloženo před</head> štítkem"
+          body_tag:
+            text: "</body>"
+            title: "HTML, který bude vložený před </body>štítek"
+          yaml:
+            text: "YAML"
+            title: "Definovat nastavení motivu ve formátu YAML"
         colors:
+          select_base:
+            title: "Vyberte základní barvu"
+            description: "Základní schéma: "
           title: "Barvy"
+          edit: "Upravit barevná schémata"
           long_title: "Barevná schémata"
+          about: "Upravit barvy užívané tvým motivem. Vytvořit nové barevné schéma na začátek."
           new_name: "Nové barevné schéma"
           copy_name_prefix: "Kopie"
           delete_confirm: "Chcete smazat toto barevné schéma?"
@@ -2463,7 +3135,7 @@ cs:
             description: 'Používá se pro indikaci úspěšné akce.'
           love:
             name: 'láska'
-            description: "Barva tlačítka Like."
+            description: "Barva tlačítka \"Líbí se\"."
       email:
         title: "Emaily"
         settings: "Nastavení"
@@ -2474,6 +3146,7 @@ cs:
         test_error: "Nastal problém při odesílání testovacího emailu. Zkontroluj si, prosím, své mailové nastavení, ověř, že hosting neblokuje mailové spojení a zkus to znova."
         sent: "Odeslané"
         skipped: "Přeskočené"
+        bounced: "vrácený"
         received: "Obdržených"
         rejected: "Odmítnutých"
         sent_at: "Odesláno"
@@ -2487,12 +3160,14 @@ cs:
         delivery_method: "Způsob doručení"
         preview_digest_desc: "Zobraz náhled mailů se souhrnem posílaným neaktivním uživatelúm."
         refresh: "Aktualizovat"
+        send_digest_label: "Poslat tento výsledek k:"
         send_digest: "Poslat"
         sending_email: "Posílám email..."
         format: "Formát"
         html: "html"
         text: "text"
         last_seen_user: "Uživatel byl naposled přítomen:"
+        no_result: "Nenalezeny žádné výsledky souhrnu."
         reply_key: "Klíč pro odpověď"
         skipped_reason: "Důvod přeskočení"
         incoming_emails:
@@ -2524,6 +3199,15 @@ cs:
             type_placeholder: "souhrn, registrace..."
             reply_key_placeholder: "klíč pro odpověď"
             skipped_reason_placeholder: "důvod"
+      moderation_history:
+        performed_by: "Provedeno uživatelem"
+        no_results: "Není k dispozici žádná historie akcí moderátorů."
+        actions:
+          delete_user: "smazání uživatele"
+          suspend_user: "zakázání uživatele"
+          silence_user: "ztišení uživatele"
+          delete_post: "smazání příspěku"
+          delete_topic: "smazání tématu"
       logs:
         title: "Logy a filtry"
         action: "Akce"
@@ -2563,6 +3247,8 @@ cs:
             change_trust_level: "z. důvěryhodnosti"
             change_username: "Změnit uživatelské jméno"
             change_site_setting: "změna nastavení"
+            change_theme: "změna vzhledu"
+            delete_theme: "smazání vzhledu"
             change_site_text: "změnit text webu"
             suspend_user: "suspendovat uživatele"
             unsuspend_user: "zrušit suspendování"
@@ -2570,12 +3256,16 @@ cs:
             revoke_badge: "vzít odznak"
             check_email: "zkontrolujte email"
             delete_topic: "smazat téma"
+            recover_topic: "Obnovit smazané téma"
             delete_post: "smazat příspěvek"
             impersonate: "vydávat se za uživatele"
             anonymize_user: "anonymní uživatel"
+            roll_up: "rozbalit zablokované IP "
             change_category_settings: "změnit nastavení kategorie"
             delete_category: "smazat kategorii"
             create_category: "vytvořit kategorii"
+            silence_user: "ztišení uživatele"
+            unsilence_user: "Odmlčet uživatele"
             grant_admin: "udělit administrátorská práva"
             revoke_admin: "odebrat administrátorská práva"
             grant_moderation: "udělit moderátorská práva"
@@ -2584,10 +3274,20 @@ cs:
             deleted_tag: "smazaný štítek"
             renamed_tag: "přejmenovaný štítek"
             revoke_email: "Odebrat email"
+            lock_trust_level: "Zamknout úroveň důvěryhodnosti"
+            unlock_trust_level: "Odemknout úroveň důvěryhodnosti"
             activate_user: "aktivovat uživatele"
             deactivate_user: "deaktivovat uživatele"
+            change_readonly_mode: "změnit režim jen pro čtení"
             backup_download: "stáhnout zálohu"
             backup_destroy: "smazat zálohu"
+            reviewed_post: "recenzovaný příspěvek"
+            custom_staff: "plugin vlastní akce"
+            post_locked: "uzamčení příspěvku"
+            post_edit: "upravit příspěvek"
+            post_unlocked: "odemčení příspěvku"
+            check_personal_message: "zkontrolovat soukromou zprávu"
+            disabled_second_factor: "Vypnout dvoufázové přihlašování"
         screened_emails:
           title: "Filtrované emaily"
           description: "Při registraci nového účtu budou konzultovány následujíci adresy. Při shodě bude registrace zablokována, nebo bude provedena jiná akce."
@@ -2603,6 +3303,9 @@ cs:
           title: "Filtrované IP"
           description: 'Sledované IP adresy. Zvolte „Povolit“ pro přidání IP adresy do whitelistu.'
           delete_confirm: "Are you sure you want to remove the rule for %{ip_address}?"
+          roll_up_confirm: "Určitě chcete rolovat běžně screenované IP adresy do podsítí? "
+          rolled_up_some_subnets: "Úspěšně vyrolován IP ban k přístupu do těchto podsítí: %{subnets}."
+          rolled_up_no_subnet: "Není zde nic ke srolování."
           actions:
             block: "Zablokovat"
             do_nothing: "Povolit"
@@ -2612,10 +3315,55 @@ cs:
             ip_address: "IP adresa"
             add: "Přidat"
             filter: "Vyhledat"
+          roll_up:
+            text: "srolovat "
+            title: "Vytvoří ban k přístupu do podsítě, pokud existují alespoň: 'min_ban_entries_for_roll_up' vstupy."
+        search_logs:
+          title: "Vyhledat přihlášení"
+          term: "Období"
+          searches: "Vyhledávání"
+          click_through: "kliknutí "
+          unique: "Unikátní"
+          unique_title: "Unikátní uživatel provádějící vyhledávání"
+          types:
+            all_search_types: "Vyhledávat všechny typy"
+            header: "Hlavička"
+            full_page: "Celá stránka"
+            click_through_only: "Všechny (pouze kliknutí)"
+          header_search_results: "Výsledky hlavního vyhledávání "
         logster:
           title: "Chybové záznamy"
+      watched_words:
+        title: "Sledovaná slova"
+        search: "hledat"
+        clear_filter: "Zrušit"
+        show_words: "zobrazit slova"
+        word_count:
+          few: '%{count} slova'
+          many: '%{count} slov'
+          one: 1 slovo
+          other: '%{count} slov'
+        actions:
+          block: 'Zablokovat'
+          censor: 'Cenzurovat '
+          require_approval: 'Vyžádat schválení'
+          flag: 'Nahlášení'
+        action_descriptions:
+          block: 'Zabránit přidání příspěvků obsahující tato slova. Uživatel uvidí chybovou hlášku ve chvíli, kdy se pokusí odeslat svůj příspěvek.'
+          censor: 'Povolit příspěvky obsahující tato slova, ale nahradit je symboly, které skryjí cenzurovaná slova.'
+          require_approval: 'Příspěvky obsahující tato slova budou vyžadovat schválení zaměstnanců před schválením.'
+          flag: 'Povolit příspěvky obsahující tato slova, ale oflagovat je jako nevhodně, aby je mohli moderátoři kontrolovat.'
+        form:
+          label: 'Nové slovo:'
+          placeholder: 'celé slovo nebo* jako zástupný znak'
+          placeholder_regexp: "obvyklý výraz"
+          add: 'přidat'
+          success: 'Úspěch'
+          upload: "Nahrát"
+          upload_successful: "Nahráno úspěšně. Slova byla přidána "
       impersonate:
         title: "Přihlásit se jako"
+        help: "Použijte tento nástroj k přihlášení za jiného uživatele pro ladící a vývojové potřeby. Po dokončení se budete muset odhlásit."
         not_found: "Tento uživatel nebyl nalezen."
         invalid: "Bohužel, za tohoto uživatele se nemůžete vydávat."
       users:
@@ -2632,16 +3380,19 @@ cs:
           pending: "Čeká na schválení"
           staff: 'Redakce'
           suspended: 'Zakázaní'
+          silenced: 'Ztišený'
           suspect: 'Podezřelí'
         approved: "Schválen?"
         approved_selected:
-          one: "schválit uživatele"
-          few: "schválit uživatele ({{count}})"
-          other: "schválit uživatele ({{count}})"
+          few: schválit uživatele ({{count}})
+          many: schválit uživatele ({{count}})
+          one: schválit uživatele
+          other: schválit uživatele ({{count}})
         reject_selected:
-          one: "reject user"
-          few: "reject users ({{count}})"
-          other: "reject users ({{count}})"
+          few: reject users ({{count}})
+          many: reject users ({{count}})
+          one: reject user
+          other: reject users ({{count}})
         titles:
           active: 'Aktivní uživatelé'
           new: 'Noví uživatelé'
@@ -2654,16 +3405,19 @@ cs:
           staff: "Redakce"
           admins: 'Administrátoři'
           moderators: 'Moderátoři'
+          silenced: 'Ztišený úživatel'
           suspended: 'Zakázaní uživatelé'
           suspect: 'Podezřelí uživatelé'
         reject_successful:
-          one: "Successfully rejected 1 user."
-          few: "Successfully rejected %{count} users."
-          other: "Successfully rejected %{count} users."
+          few: Successfully rejected %{count} users.
+          many: Successfully rejected %{count} users.
+          one: Successfully rejected 1 user.
+          other: Successfully rejected %{count} users.
         reject_failures:
-          one: "Failed to reject 1 user."
-          few: "Failed to reject %{count} users."
-          other: "Failed to reject %{count} users."
+          few: Failed to reject %{count} users.
+          many: Failed to reject %{count} users.
+          one: Failed to reject 1 user.
+          other: Failed to reject %{count} users.
         not_verified: "Neověřeno"
         check_email:
           title: "Odhal emailovou adresu tohoto uživatele"
@@ -2673,35 +3427,63 @@ cs:
         unsuspend_failed: "Nastala chyba při povolování uživatele {{error}}"
         suspend_duration: "Jak dlouho má zákaz platit? (dny)"
         suspend_reason_label: "Why are you suspending? This text <b>will be visible to everyone</b> on this user's profile page, and will be shown to the user when they try to log in. Keep it short."
+        suspend_reason_hidden_label: "Důvod zablokování? Tento text se zobrazí uživateli ve chvíli, kdy se pokusí přihlásit. Udržuj ho krátký."
         suspend_reason: "Reason"
+        suspend_reason_placeholder: "Důvod vyloučení"
+        suspend_message: "e-mailová zpráva"
+        suspend_message_placeholder: "Případě poskytněte více informací o pozastavení, které budou poslány na uživatelův email."
         suspended_by: "Suspended by"
+        silence_reason: "Důvod"
+        silenced_by: "Ztišený uživatelem"
+        silence_modal_title: "ztišit uživatele"
+        silence_duration: "Na jak dlouhou dobu bude uživatel umlčený? "
+        silence_reason_label: "Proč umlčuješ tohoto uživatele?"
+        silence_reason_placeholder: "Důvod ztišení "
+        silence_message: "e-mailová zpráva"
+        silence_message_placeholder: "()"
+        suspended_until: "(až %{until})"
+        cant_suspend: "Tento uživatel nemůže být suspendován"
         delete_all_posts: "Smazat všechny příspěvky"
+        penalty_post_actions: "Co chceš dělat s připojeným příspěvkem? "
+        penalty_post_delete: "Smazat příspěvek"
+        penalty_post_edit: "Upravit příspěvek"
+        penalty_post_none: "Nic nedělat"
         delete_all_posts_confirm_MF: "Chystáte se smazat {POSTS, plural, one {1 příspěvek} other {# příspěvků}} and {TOPICS, plural, one {1 téma} other {# témat}}. Jste si jistí?"
+        silence: "Ztišit"
+        unsilence: "odmlčet "
+        silenced: "Ztišený? "
         moderator: "Moderátor?"
         admin: "Administrátor?"
         suspended: "Zakázán?"
+        staged: "Staged?"
         show_admin_profile: "Administrace"
         refresh_browsers: "Vynutit obnovení prohlížeče"
         refresh_browsers_message: "Zpráva odeslána všem klientům!"
         show_public_profile: "Zobrazit veřejný profil"
         impersonate: 'Vydávat se za uživatele'
+        action_logs: "Logy akcí"
         ip_lookup: "Vyhledávání IP adresy"
         log_out: "Odhlásit se"
         logged_out: "Uživatel byl odhlášen na všech zařízeních."
         revoke_admin: 'Odebrat administrátorská práva'
         grant_admin: 'Udělit administrátorská práva'
+        grant_admin_confirm: "Odeslali jsme ti e-mail, abychom ověřili nového správce. Prosím otevři ho a následuj instrukce."
         revoke_moderation: 'Odebrat moderátorská práva'
         grant_moderation: 'Udělit moderátorská práva'
         unsuspend: 'Povolit'
         suspend: 'Zakázat'
+        show_flags_received: "Ukázat obdržená nahlášení"
+        flags_received_by: "Nahlášení obdrženo od %{username}"
+        flags_received_none: "Tento uživatel neobdržel žádné nahlášení."
         reputation: Reputace
         permissions: Oprávnění
         activity: Aktivita
-        like_count: Rozdaných / obdržených 'líbí se'
+        like_count: Rozdaných / obdržených "Líbí se"
         last_100_days: 'Za posledních 100 dní'
         private_topics_count: Počet soukromých témat
         posts_read_count: Přečteno příspěvků
         post_count: Vytvořeno příspěvků
+        second_factor_enabled: Dvoufázové přihlašování povoleno
         topics_entered: Témat zobrazeno
         flags_given_count: Uděleno nahlášení
         flags_received_count: Přijato nahlášení
@@ -2720,17 +3502,20 @@ cs:
         delete_forbidden_because_staff: "Správci ani moderátoři nemůžou být odstraněni."
         delete_posts_forbidden_because_staff: "Nemohu smazat všechny příspěvky administrátorů a moderátorů."
         delete_forbidden:
-          one: "Uživatelé nemůžou být smazáni pokud mají příspěvky. Před smazáním uživatele smažte všechny jeho příspěvky. (Příspěvky starší než den nemůžou být smazány.)"
-          few: "Uživatelé nemůžou být smazáni pokud mají příspěvky. Před smazáním uživatele smažte všechny jeho příspěvky. (Příspěvky starší než %{count} dny nemůžou být smazány.)"
-          other: "Uživatelé nemůžou být smazáni pokud mají příspěvky. Před smazáním uživatele smažte všechny jeho příspěvky. (Příspěvky starší než %{count} dnů nemůžou být smazány.)"
+          few: Uživatelé nemůžou být smazáni pokud mají příspěvky. Před smazáním uživatele smažte všechny jeho příspěvky. (Příspěvky starší než %{count} dny nemůžou být smazány.)
+          many: Uživatelé nemůžou být smazáni pokud mají příspěvky. Před smazáním uživatele smažte všechny jeho příspěvky. (Příspěvky starší než %{count} dnů nemůžou být smazány.)
+          one: Uživatelé nemůžou být smazáni pokud mají příspěvky. Před smazáním uživatele smažte všechny jeho příspěvky. (Příspěvky starší než den nemůžou být smazány.)
+          other: Uživatelé nemůžou být smazáni pokud mají příspěvky. Před smazáním uživatele smažte všechny jeho příspěvky. (Příspěvky starší než %{count} dnů nemůžou být smazány.)
         cant_delete_all_posts:
-          one: "Všechny příspěvky nelze smazat. Některé příspěvky jsou starší než %{count} den. (Nastavení delete_user_max_post_age.)"
-          few: "Všechny příspěvky nelze smazat. Některé příspěvky jsou starší než %{count} dny. (Nastavení delete_user_max_post_age.)"
-          other: "Všechny příspěvky nelze smazat. Některé příspěvky jsou starší než %{count} dní. (Nastavení delete_user_max_post_age.)"
+          few: Všechny příspěvky nelze smazat. Některé příspěvky jsou starší než %{count} dny. (Nastavení delete_user_max_post_age.)
+          many: Všechny příspěvky nelze smazat. Některé příspěvky jsou starší než %{count} dní. (Nastavení delete_user_max_post_age.)
+          one: Všechny příspěvky nelze smazat. Některé příspěvky jsou starší než %{count} den. (Nastavení delete_user_max_post_age.)
+          other: Všechny příspěvky nelze smazat. Některé příspěvky jsou starší než %{count} dní. (Nastavení delete_user_max_post_age.)
         cant_delete_all_too_many_posts:
-          one: "Nelze smazat všechny příspěvky, protože uživatel má více než 1 příspěvek. (delete_all_posts_max)"
-          few: "Nelze smazat všechny příspěvky, protože uživatel má více než %{count} příspěvky. (delete_all_posts_max)"
-          other: "Nelze smazat všechny příspěvky, protože uživatel má více než %{count} příspěvků. (delete_all_posts_max)"
+          few: Nelze smazat všechny příspěvky, protože uživatel má více než %{count} příspěvky. (delete_all_posts_max)
+          many: Nelze smazat všechny příspěvky, protože uživatel má více než %{count} příspěvků. (delete_all_posts_max)
+          one: Nelze smazat všechny příspěvky, protože uživatel má více než 1 příspěvek. (delete_all_posts_max)
+          other: Nelze smazat všechny příspěvky, protože uživatel má více než %{count} příspěvků. (delete_all_posts_max)
         delete_confirm: "Jste si jistí, že chcete smazat tohoto uživatele? Tato akce je nevratná!"
         delete_and_block: "Smaž a <b>blokuj</b> tento email a IP adresu."
         delete_dont_block: "Pouze smazat"
@@ -2743,12 +3528,23 @@ cs:
         activate_failed: "Nasstal problém při aktivování tohoto uživatele."
         deactivate_account: "Deaktivovat účet"
         deactivate_failed: "Nastal problém při deaktivování tohoto uživatele."
+        unsilence_failed: 'Nastal problém se zrušením ztišení uživatele.'
+        silence_failed: 'Nastal problém při ztišování uživatele. '
+        silence_confirm: 'Jste si jistí, že chcete ztišit tohoto uživatele? Nebude mít oprávnění vytvářet žádné příspěvky a témata.'
+        silence_accept: 'Ano, umlčet tohoto uživatele'
         bounce_score: "Bounce skóre"
         reset_bounce_score:
           label: "obnovit výchozí"
           title: "Resetovat bounce skóre zpět na 0"
+        visit_profile: "Navštívit <a href='%{url}'>preferované stránky tohoto uživatel</a>k upravení jeho profilu"
         deactivate_explanation: "Uživatel bude muset znovu potvrdit emailovou adresu."
         suspended_explanation: "Zakázaný uživatel se nemůže přihlásit."
+        silence_explanation: "Ztišený uživatel nemůže přispívat nebo začínat témata."
+        staged_explanation: "Staged uživatel může přispívat pouze emailem ve specifikovaných tématech."
+        bounce_score_explanation:
+          none: "V poslední době se z tohoto e-mailu nevrátily žádné zprávy."
+          some: "Některé zprávy se v poslední době z tohoto emailu vrátily."
+          threshold_reached: "Obdrženo příliš mnoho vrácených emailů z tohoto účtu."
         trust_level_change_failed: "Nastal problém při změně důveryhodnosti uživatele."
         suspend_modal_title: "Suspend User"
         trust_level_2_users: "Uživatelé důvěryhodnosti 2"
@@ -2760,9 +3556,10 @@ cs:
         tl3_requirements:
           title: "Požadavky pro důvěryhodnost 3"
           table_title:
-            one: "V posledním dnu:"
-            few: "Za posledních %{count} dny:"
-            other: "Za posledních %{count} dní:"
+            few: 'Za posledních %{count} dny:'
+            many: 'Za posledních %{count} dní:'
+            one: 'V posledním dnu:'
+            other: 'Za posledních %{count} dní:'
           value_heading: "Hodnota"
           requirement_heading: "Požadavek"
           visits: "Návštěv"
@@ -2821,6 +3618,7 @@ cs:
         show_on_user_card:
           title: "Zobrazit na kartě uživatele?"
           enabled: "zobrazeno na kartě uživatele"
+          disabled: "Nezobrazeno na kartě uživatele"
         field_types:
           text: 'Text Field'
           confirm: 'Potvrzení'
@@ -2835,11 +3633,12 @@ cs:
         go_back: "Zpět na hledání"
         recommended: "Doporučujeme uzpůsobit následující text tak, aby vám vyhovoval:"
         show_overriden: 'Zobrazit pouze změněná nastavení'
+      settings:
+        show_overriden: 'Zobrazit pouze přepsané'
+        reset: 'resetovat'
+        none: 'žádný'
       site_settings:
-        show_overriden: 'Zobrazit pouze změněná nastavení'
         title: 'Nastavení'
-        reset: 'obnovit výchozí'
-        none: 'žádné'
         no_results: "Nenalezeny žádné výsledky."
         clear_filter: "Zrušit"
         add_url: "přidat URL"
@@ -2861,6 +3660,7 @@ cs:
           developer: 'Vývojáři'
           embedding: "Embedding"
           legal: "Právní záležitosti"
+          api: 'API'
           user_api: 'Uživatelské API'
           uncategorized: 'Ostatní'
           backups: "Zálohy"
@@ -2888,17 +3688,17 @@ cs:
         reason_help: (Odkaz na příspěvek nebo téma)
         save: Uložit
         delete: Smazat
-        delete_confirm: Určitě chcete tento oznak smazat?
+        delete_confirm: "Určitě chcete tento oznak smazat?"
         revoke: zrušit
         reason: Důvod
         expand: Rozevřít &hellip;
-        revoke_confirm: Určitě chcete tento odznak odejmout?
+        revoke_confirm: "Určitě chcete tento odznak odejmout?"
         edit_badges: Upravit odznaky
         grant_badge: Udělit odznak
         granted_badges: Udělené odznaky
         grant: Udělit
         no_user_badges: "%{name} nezískal žádné oznaky."
-        no_badges: Nejsou tu žádné odznaky, které by se dali rozdat.
+        no_badges: "Nejsou tu žádné odznaky, které by se dali rozdat."
         none_selected: "Vyberte odznak, abyste mohli začít"
         allow_title: Povolit užití odzanku jako titul
         multiple_grant: Může být přiděleno několikrát
@@ -2906,8 +3706,10 @@ cs:
         enabled: Povolit odznaky
         icon: Ikona
         image: Obrázek
-        icon_help: "Použijte buď Font Awesome nebo URL k obrázku."
         query: Dotaz na odznak (SQL)
+        target_posts: Zeptat se na cílový příspěvek
+        auto_revoke: Denně spouštět zrušení dotazu
+        show_posts: Ukázat příspěvek získávající odznak na stránce s odznaky.
         trigger: Spouštěč
         trigger_type:
           none: "Aktualizujte denně"
@@ -2915,6 +3717,7 @@ cs:
           post_revision: "Když uživatel upraví nebo vytvoří příspěvek"
           trust_level_change: "Když uživatel změní důvěryhodnost"
           user_change: "Když je uživatel upraven nebo vytvořen"
+          post_processed: "Po zpracování příspěvku"
         preview:
           link_text: "Náhled udělených odznaků"
           plan_text: "Náhled s plánem dotazu"
@@ -2923,17 +3726,19 @@ cs:
           error_help: "Prohlédněte si následující odkazy, které vám zodpoví dotazy o odznacích."
           bad_count_warning:
             header: "VAROVÁNÍ!"
+            text: "Chybí přidělení vzorků. To se stane pokud dotazový odznak vrátí ID uživatele nebo ID příspěvků, které neexistují. Může to později způsobit neočekávané výsledky - prosím zkontrolujte svůj dotaz."
           no_grant_count: "Žádné odznaky k udělení."
           grant_count:
-            one: "<b>1</b> odznak k udělení."
-            few: "<b>%{count}</b> odznaků k udělení."
-            other: "<b>%{count}</b> odznaků k udělení."
+            few: <b>%{count}</b> odznaků k udělení.
+            many: <b>%{count}</b> odznaků k udělení.
+            one: <b>1</b> odznak k udělení.
+            other: <b>%{count}</b> odznaků k udělení.
           sample: "Příklad:"
           grant:
-            with: <span class="username">%{username}</span>
-            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>
+            with: "<span class=\"username\">%{username}</span>"
+            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:
         title: "Emoji"
         help: "Vložte nové emoji, které bude dostupné pro všechny na fóru. (Protip: můžete přetáhnout několik souborů najednou.)"
@@ -2947,17 +3752,27 @@ cs:
         sample: "Abyste vytvořili a zabudovali témata z discourse, použijte následující HTML kód na vašem webu. Nahraď <b>REPLACE_ME</b> celkovým URL stránky, do které je zabudováváš."
         title: "Zabudování"
         host: "Povolené hosty"
+        class_name: "název třídy"
+        path_whitelist: "Path Whitelist "
         edit: "upravit"
         category: "Příspěvek do kategorie"
         add_host: "Přidat host"
         settings: "Nastavení zabudování"
         feed_settings: "Nastavení odebírání"
+        feed_description: "Poskytování RSS/ATOM zdroje pro vaše stránky pomůže zlepšit schopnost Discoursu importovat váš obsah."
         crawling_settings: "Nastavení procházení"
+        crawling_description: " Discourse vytvoří téma pro tvůj příspěvek, pokud není k dispozici žádný RSS/ATOM zdroj, pokusí se o rozbor vašeho obsahu mimo vaše HTML. Občas může být náročné vybírat obsah, takže jsme schopní upřesnit CSS pravidla, abychom usnadnili vytažení."
         embed_by_username: "Uživatelské jméno pro vytvářéní témat"
         embed_post_limit: "Maximální počet příspěvků k zabudování"
+        embed_username_key_from_feed: "Klíč pro smazání uživatelského jména z feedu"
+        embed_title_scrubber: "Běžný výraz užívaný k vyčištění názvů příspěvků"
         embed_truncate: "Useknout zabudované příspěvky"
+        embed_whitelist_selector: "Volba CSS pro prvky, které jsou povoleny ve vložení."
+        embed_blacklist_selector: "Volba CSS pro prvky, které jsou odstraněny z vložení."
         embed_classname_whitelist: "Povolená jména CSS tříd"
         feed_polling_enabled: "Importovat příspěvky pomocí RSS/ATOM"
+        feed_polling_url: "URL adresa RSS/ATOM kanálu pro procházení"
+        feed_polling_frequency_mins: "Frekvece feed pollingu (v minutách)"
         save: "Uložit nastavení zabudování"
       permalink:
         title: "Trvalé odkazy"
@@ -2969,7 +3784,7 @@ cs:
         category_id: "ID kategorie"
         category_title: "Kategorie"
         external_url: "Externí URL"
-        delete_confirm: Opravdu chcete smazat tento trvalý odkaz?
+        delete_confirm: "Opravdu chcete smazat tento trvalý odkaz?"
         form:
           label: "Nové:"
           add: "Přidat"
@@ -2983,6 +3798,11 @@ cs:
       upload: "Nahrát"
       uploading: "Nahrává se..."
       quit: "Možná později"
+      staff_count:
+        few: Vaše komunita má %{count} členy v redakci.
+        many: Vaše komunita má %{count} členů v redakci.
+        one: Jste jediným členem v redakci vaší komunity.
+        other: Vaše komunita má %{count} členů v redakci.
       invites:
         add_user: "přidat"
         none_added: "Nepozvali jste nikoho z redakce. Určitě chcete pokračovat?"
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index a2e70cf9a94..15d5ac6282e 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -43,62 +43,62 @@ da:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: "< 1s"
-          other: "< %{count}s"
+          one: < 1s
+          other: < %{count}s
         x_seconds:
-          one: "1s"
-          other: "%{count}s"
+          one: 1s
+          other: '%{count}s'
         x_minutes:
-          one: "1m"
-          other: "%{count}m"
+          one: 1m
+          other: '%{count}m'
         about_x_hours:
-          one: "1t"
-          other: "%{count}t"
+          one: 1t
+          other: '%{count}t'
         x_days:
-          one: "1d"
-          other: "%{count}d"
+          one: 1d
+          other: '%{count}d'
         about_x_years:
-          one: "1å"
-          other: "%{count}å"
+          one: 1å
+          other: '%{count}å'
         over_x_years:
-          one: "> 1å"
-          other: "> %{count}å"
+          one: '> 1å'
+          other: '> %{count}å'
         almost_x_years:
-          one: "1å"
-          other: "%{count}å"
+          one: 1å
+          other: '%{count}å'
         date_month: "MMM D"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: "1 min"
-          other: "%{count} min"
+          one: 1 min
+          other: '%{count} min'
         x_hours:
-          one: "1 time"
-          other: "%{count} timer"
+          one: 1 time
+          other: '%{count} timer'
         x_days:
-          one: "1 dag"
-          other: "%{count} dage"
+          one: 1 dag
+          other: '%{count} dage'
         date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
-          one: "1 min siden"
-          other: "%{count} min siden"
+          one: 1 min siden
+          other: '%{count} min siden'
         x_hours:
-          one: "1 time siden"
-          other: "%{count} timer siden"
+          one: 1 time siden
+          other: '%{count} timer siden'
         x_days:
-          one: "1 dag siden"
-          other: "%{count} dage siden"
+          one: 1 dag siden
+          other: '%{count} dage siden'
       later:
         x_days:
-          one: "1 dag senere"
-          other: "%{count} dage senere"
+          one: 1 dag senere
+          other: '%{count} dage senere'
         x_months:
-          one: "1 måned senere"
-          other: "%{count} måneder senere"
+          one: 1 måned senere
+          other: '%{count} måneder senere'
         x_years:
-          one: "1 år senere"
-          other: "%{count} år senere"
+          one: 1 år senere
+          other: '%{count} år senere'
       previous_month: 'Forrige måned'
       next_month: 'Næste måned'
     share:
@@ -111,7 +111,6 @@ da:
       email: 'send dette link i en e-mail'
     action_codes:
       public_topic: "offentliggjorde dette emne %{when}"
-      private_topic: "gjorde dette emne privat %{when}"
       split_topic: "del dette emne op %{when}"
       invited_user: "Inviterede %{who} %{when}"
       invited_group: "inviterede %{who} %{when}"
@@ -141,8 +140,6 @@ da:
     topic_admin_menu: "administrationshandlinger på emne"
     wizard_required: "Velkommen til din nye Discourse! Lad os komme i gang med <a href='%{url}' data-auto-route='true'>konfigurationsguiden</a> ✨"
     emails_are_disabled: "Alle udgående emails er blevet deaktiveret globalt af en administrator. Ingen emailnotifikationer af nogen slags vil blive sendt."
-    bootstrap_mode_enabled: "For at gøre det nemmere at lancere dit nye website, er du i bootstrap tilstand. Alle nye brugere vil blive tildelt niveau 1 og daglige email updateringer vil være slået til. Dette vil blive automatisk slået fra når total antal brugere overskrider %{min_users} brugere."
-    bootstrap_mode_disabled: "Bootstrap tilstand vil blive deaktiveret indenfor de næste 24 timer."
     themes:
       default_description: "Standard"
     s3:
@@ -178,8 +175,8 @@ da:
     show_help: "indstillinger"
     links: "Links"
     links_lowercase:
-      one: "link"
-      other: "links"
+      one: link
+      other: links
     faq: "FAQ"
     guidelines: "Retningslinier"
     privacy_policy: "Privatlivspolitik"
@@ -203,8 +200,8 @@ da:
     max_of_count: "max af {{count}}"
     alternation: "eller"
     character_count:
-      one: "{{count}} tegn"
-      other: "{{count}} tegn"
+      one: '{{count}} tegn'
+      other: '{{count}} tegn'
     suggested_topics:
       title: "Foreslåede emner"
       pm_title: "Foreslåede beskeder"
@@ -216,8 +213,6 @@ da:
       our_moderators: "Vores Moderatorer"
       stat:
         all_time: "Alt"
-        last_7_days: "De sidste 7 Dage"
-        last_30_days: "De sidste 30 dage"
       like_count: "Synes godt om"
       topic_count: "Emner"
       post_count: "Indlæg"
@@ -238,16 +233,6 @@ da:
       last_read: "Dette er det seneste indlæg, du har læst; klik for at bogmærke det"
       remove: "Fjern bogmærke"
       confirm_clear: "Er du sikker på du vil slette alle bogmærker fra dette emne?"
-    topic_count_latest:
-      one: "{{count}} nyt eller opdateret emne."
-      other: "{{count}} nye eller opdaterede emner."
-    topic_count_unread:
-      one: "{{count}} ulæst emne."
-      other: "{{count}} ulæste emner."
-    topic_count_new:
-      one: "{{count}} nyt indlæg"
-      other: "{{count}} nye indlæg."
-    click_to_show: "Klik for at se."
     preview: "forhåndsvising"
     cancel: "annullér"
     save: "Gem ændringer"
@@ -283,16 +268,16 @@ da:
       cancel: "Annuller"
       view_pending: "vis afventende indlæg"
       has_pending_posts:
-        one: "Det emne har <b>1</b> indlæg der afventer godkendelse"
-        other: "Dette emne har <b>{{count}}</b> indlæg der afventer godkendelse"
+        one: Det emne har <b>1</b> indlæg der afventer godkendelse
+        other: Dette emne har <b>{{count}}</b> indlæg der afventer godkendelse
       confirm: "Gem ændringer"
       delete_prompt: "Er du sikker på at du vil slette <b>%{username}</b>? Det fjerner alle indlæg og blokerer email og IP-adresse."
       approval:
         title: "Indlæg afventer godkendelse"
         description: "Vi har modtaget dit indlæg, men det skal først godkendes af en moderator. Hav venligst tålmodighed."
         pending_posts:
-          one: "Du har <strong>1</strong> afventende indlæg."
-          other: "Du har <strong>{{count}}</strong> afventende indlæg."
+          one: Du har <strong>1</strong> afventende indlæg.
+          other: Du har <strong>{{count}}</strong> afventende indlæg.
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> oprettede <a href='{{topicUrl}}'>emnet</a>"
@@ -326,8 +311,8 @@ da:
       posts_read: "Læste"
       posts_read_long: "Indlæg læst"
       total_rows:
-        one: "1 bruger"
-        other: "%{count} brugere"
+        one: 1 bruger
+        other: '%{count} brugere'
     group_histories:
       actions:
         change_group_setting: "Skift gruppe indstilling"
@@ -336,22 +321,6 @@ da:
         make_user_group_owner: "Gør til ejer"
         remove_user_as_group_owner: "Fjern ejer"
     groups:
-      logs:
-        title: "Logs"
-        when: "Når"
-        action: "Handling"
-        acting_user: "Fungerende bruger"
-        target_user: "Målbruger"
-        subject: "Emne"
-        details: "Detaljer"
-        from: "Fra"
-        to: "Til"
-      edit:
-        title: 'Redigér Gruppe'
-        full_name: 'Fulde Navn'
-        add_members: "Tilføj Medlemmer"
-        delete_member_confirm: "Fjern '%{username}' fra '%{group}' gruppen?"
-      name_placeholder: "Gruppenavn uden mellemrum, samme som reglen for brugernavn"
       public_admission: "Tillad brugere frit at tilmelde sig gruppen (Kræver at det er en offentlig synlig gruppe)"
       public_exit: "Tillad brugere frit at forlade gruppen"
       empty:
@@ -362,13 +331,7 @@ da:
         topics: "Der er ingen emner skrevet af medlemmer i denne gruppe."
         logs: "Der er ingen logning for denne gruppe."
       add: "Tilføj"
-      join: "Bliv medlem af gruppen"
-      leave: "Forlad gruppen"
-      request: "Anmod om indmeldelse i gruppen"
       message: "Besked"
-      automatic_group: Automatisk gruppe
-      closed_group: Lukket gruppe
-      is_group_user: "Du er medlem af denne gruppe"
       allow_membership_requests: "Tillad at brugere sender medlemsanmodninger til gruppeejere"
       membership_request_template: "Brugerdefineret skabelon, der skal vises til brugere, når der sendes en medlemskabsanmodning"
       membership_request:
@@ -377,26 +340,17 @@ da:
         reason: "Fortæl gruppeejerne, hvorfor du tilhører denne gruppe"
       membership: "Medlemskab"
       name: "Navn"
-      user_count: "Antal medlemmer"
       bio: "Om Grupper"
-      selector_placeholder: "Tilføj medlemmer"
       owner: "ejer"
       index:
         title: "Grupper"
         empty: "Der er ingen synlige grupper"
       activity: "Aktivitet"
-      members: "Medlemmer"
       topics: "Emner"
       posts: "Indlæg"
       mentions: "Omtaler"
       messages: "Beskeder"
       notification_level: "Standard notifikationsniveau for gruppebeskeder"
-      visibility_levels:
-        title: "Hvem kan se denne gruppe?"
-        public: "Alle"
-        members: "Gruppeejer, medlemmer og admins"
-        staff: "Gruppeejer og hjælpeteam"
-        owners: "Gruppeejer og admins"
       alias_levels:
         mentionable: "Hvem kan @gruppenavn denne gruppe?"
         messageable: "Hvem kan sende en besked til denne gruppe?"
@@ -405,9 +359,6 @@ da:
         mods_and_admins: "Kun moderatore og administratore"
         members_mods_and_admins: "Kun gruppe medlemmer, moderatore og administratore"
         everyone: "Alle"
-      trust_levels:
-        title: "Tillidsniveau der automatisk tildeles medlemmer når de oprettes:"
-        none: "Ingen"
       notifications:
         watching:
           title: "Kigger"
@@ -432,23 +383,21 @@ da:
       flair_color_placeholder: "(Valgfrit) Hex farveværdi"
       flair_preview_icon: "Forhåndsvisning af ikonet"
       flair_preview_image: "Forhåndsvisning af billede"
-      flair_note: "Bemærk: Flair vil kun blive vist for en brugers primære gruppe."
     user_action_groups:
-      '1': "Likes givet"
-      '2': "Likes modtaget"
-      '3': "Bogmærker"
-      '4': "Emner"
-      '5': "Svar"
-      '6': "Svar"
-      '7': "Referencer"
-      '9': "Citater"
-      '11': "Ændringer"
-      '12': "Sendte indlæg"
-      '13': "Indbakke"
-      '14': "Afventer"
+      "1": "Likes givet"
+      "2": "Likes modtaget"
+      "3": "Bogmærker"
+      "4": "Emner"
+      "5": "Svar"
+      "6": "Svar"
+      "7": "Referencer"
+      "9": "Citater"
+      "11": "Ændringer"
+      "12": "Sendte indlæg"
+      "13": "Indbakke"
+      "14": "Afventer"
     categories:
       all: "alle kategorier"
-      all_subcategories: "Alle"
       no_subcategory: "ingen"
       category: "Kategori"
       category_list: "Vis liste over kategorier"
@@ -467,11 +416,11 @@ da:
       toggle_ordering: "vis/skjul rækkefølgeskifter"
       subcategories: "Underkategorier:"
       topic_sentence:
-        one: "1 emne"
-        other: "%{count} emner"
+        one: 1 emne
+        other: '%{count} emner'
       topic_stat_sentence:
-        one: "%{count} nyt emne i den/det seneste %{unit}."
-        other: "%{count} nye emner i den/det seneste %{unit}."
+        one: '%{count} nyt emne i den/det seneste %{unit}.'
+        other: '%{count} nye emner i den/det seneste %{unit}.'
     ip_lookup:
       title: IP-adresse opslag
       hostname: Værtsnavn
@@ -512,7 +461,6 @@ da:
       notifications: "Underretninger"
       statistics: "Statistik"
       desktop_notifications:
-        label: "Desktop-notifikationer"
         not_supported: "Notifikationer understøttes ikke af denne browser. Beklager."
         perm_default: "Slå notifikationer til"
         perm_denied_btn: "Tilladelse nægtet"
@@ -527,7 +475,6 @@ da:
       disable_jump_reply: "Ikke hop til mit indlæg efter jeg svarer"
       dynamic_favicon: "Vis nyt / opdateret emnetal på browserikon"
       theme_default_on_all_devices: "Gør dette til mit standard design på alle mine enheder"
-      allow_private_messages: "Tillad andre brugere at sende mig private beskeder"
       external_links_in_new_tab: "Åbn alle eksterne links i en ny fane"
       enable_quoting: "Tillad citering af markeret tekst"
       change: "skift"
@@ -572,7 +519,6 @@ da:
       delete_account: "Slet min konto"
       delete_account_confirm: "Er du sikker på du vil slette din konto permanent? Dette kan ikke fortrydes!"
       deleted_yourself: "Din konto er nu slettet."
-      delete_yourself_not_allowed: "Du kan ikke slette din konto lige nu. Kontakt en administrator for at få din konto slettet."
       unread_message_count: "Beskeder"
       admin_delete: "Slet"
       users: "Brugere"
@@ -661,8 +607,8 @@ da:
         authenticated: "Din email er blevet bekræftet af {{provider}}"
         frequency_immediately: "Vi sender dig en email med det samme, hvis du ikke har læst den ting vi emailer dig om."
         frequency:
-          one: "Vi sender dig kun email, hvis vi ikke har set dig i det seneste minut."
-          other: "Vi sender dig kun email. hvis vi ikke har set dig i de sidste {{count}} minutter."
+          one: Vi sender dig kun email, hvis vi ikke har set dig i det seneste minut.
+          other: Vi sender dig kun email. hvis vi ikke har set dig i de sidste {{count}} minutter.
       name:
         title: "Navn"
         instructions: "Dit fulde navn (valgfrit)"
@@ -693,8 +639,6 @@ da:
       created: "Oprettet"
       log_out: "Log ud"
       location: "Sted"
-      card_badge:
-        title: "Brugerkort-Badge"
       website: "Site"
       email_settings: "E-mail"
       like_notification_frequency:
@@ -748,10 +692,9 @@ da:
         title: "Invitationer"
         user: "Inviteret bruger"
         sent: "Sendt"
-        none: "Der er ingen afventende invitationer."
         truncated:
-          one: "Viser den første invitation."
-          other: "Viser de første {{count}} invitationer."
+          one: Viser den første invitation.
+          other: Viser de første {{count}} invitationer.
         redeemed: "Brugte invitationer"
         redeemed_tab: "Indløst"
         redeemed_tab_with_count: "Indløst ({{count}})"
@@ -796,20 +739,20 @@ da:
         stats: "Statistik"
         time_read: "læsetid"
         topic_count:
-          one: "emne oprettet"
-          other: "emner oprettet"
+          one: emne oprettet
+          other: emner oprettet
         post_count:
-          one: "Indlæg oprettet"
-          other: "Indlæg oprettet"
+          one: Indlæg oprettet
+          other: Indlæg oprettet
         days_visited:
-          one: "dag besøgt"
-          other: "dage besøgt"
+          one: dag besøgt
+          other: dage besøgt
         posts_read:
-          one: "Indlæg læst"
-          other: "Indlæg læst"
+          one: Indlæg læst
+          other: Indlæg læst
         bookmark_count:
-          one: "bogmærke"
-          other: "bogmærker"
+          one: bogmærke
+          other: bogmærker
         top_replies: "Top svar"
         no_replies: "Ingen svar, endnu."
         more_replies: "Flere svar"
@@ -877,8 +820,8 @@ da:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> nåede grænse for konfiguration af sitet på %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> overskred grænse for konfiguration af sitet på %{siteSettingRate}."
       rate:
-        one: "1 fejl/%{duration}"
-        other: "%{count} fejl/%{duration}"
+        one: 1 fejl/%{duration}
+        other: '%{count} fejl/%{duration}'
     learn_more: "Læs mere…"
     all_time: 'i alt'
     all_time_desc: 'emner oprettet i alt'
@@ -1031,8 +974,8 @@ da:
       similar_topics: "Dit emne minder om…"
       drafts_offline: "kladder offline"
       group_mentioned:
-        one: "Ved at nævne {{group}} sender du en notifikation til <a href='{{group_link}}'>1 person</a> - vil du fortsætte?"
-        other: "Ved at nævne {{group}} sender du en notifikation til <a href='{{group_link}}'>{{count}} personer</a> - vil du fortsætte?"
+        one: Ved at nævne {{group}} sender du en notifikation til <a href='{{group_link}}'>1 person</a> - vil du fortsætte?
+        other: Ved at nævne {{group}} sender du en notifikation til <a href='{{group_link}}'>{{count}} personer</a> - vil du fortsætte?
       cannot_see_mention:
         category: "Du nævnte {{username}}, men de vil ikke blive notificeret fordi de ikke har adgang til denne kategori. Du vil være nødt til at tilføje dem til en gruppe, der har adgang til kategori."
         private: "Du nævnte {{username}}, men de vil ikke blive notificeret fordi de ikke er i stand til at se denne personlige besked. Du vil være nødt til at invitere dem til denne personlige besked."
@@ -1102,28 +1045,12 @@ da:
       empty: "Ingen notifikationer fundet."
       more: "se ældre notifikationer"
       total_flagged: "total markerede indlæg"
-      alt:
-        mentioned: "Nævnt af"
-        quoted: "Citeret af"
-        replied: "Svaret"
-        posted: "Indlæg af"
-        edited: "Rediger dit indlæg af"
-        liked: "Likede dit indlæg"
-        private_message: "Privat besked fra"
-        invited_to_private_message: "Inviteret til en privat besked fra"
-        invited_to_topic: "Inviteret til et indlæg fra"
-        invitee_accepted: "Invitation accepteret af"
-        moved_post: "Dit indlæg blev flyttet af"
-        linked: "Link til dit indlæg"
-        granted_badge: "Badge tildelt"
-        group_message_summary: "Besker i gruppens indbakke"
       popup:
         mentioned: '{{username}} nævnte dig i "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} nævnte dig i "{{topic}}" - {{site_title}}'
         quoted: '{{username}} citerede dig i "{{topic}}" - {{site_title}}'
         replied: '{{username}} svarede dig i "{{topic}}" - {{site_title}}'
         posted: '{{username}} skrev i "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} sendte dig en privat besked i "{{topic}}" - {{site_title}}'
         linked: '{{username}} linkede til dit indlæg fra "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Indsæt billede"
@@ -1216,8 +1143,8 @@ da:
         archive_topics: "Arkiver Emner"
         choose_new_category: "Vælg den nye kategori for emnerne:"
         selected:
-          one: "Du har valgt <b>1</b> indlæg."
-          other: "Du har valgt <b>{{count}}</b> indlæg."
+          one: Du har valgt <b>1</b> indlæg.
+          other: Du har valgt <b>{{count}}</b> indlæg.
         change_tags: "Erstat Tags"
         append_tags: "Tilføj Tags"
         choose_new_tags: "Vælg nye tags for dette emne"
@@ -1249,12 +1176,9 @@ da:
         bookmarks: "Der er ikke flere bogmærkede emner."
         search: "Der er ikke flere søgeresultater."
     topic:
-      unsubscribe:
-        stop_notifications: "Du vil nu modtage færre notifikationer for <strong>{{title}}</strong>"
-        change_notification_state: "Din nuværende notifikationstilstand er"
       filter_to:
-        one: "1 indlæg i emnet"
-        other: "{{count}} indlæg i emnet"
+        one: 1 indlæg i emnet
+        other: '{{count}} indlæg i emnet'
       create: 'Nyt emne'
       create_long: 'Opret et nyt emne i debatten'
       private_message: 'Start en besked'
@@ -1268,10 +1192,10 @@ da:
       new: 'nyt emne'
       unread: 'ulæste'
       new_topics:
-        one: '1 nyt emne'
+        one: 1 nyt emne
         other: '{{count}} nye emner'
       unread_topics:
-        one: '1 ulæst emne'
+        one: 1 ulæst emne
         other: '{{count}} ulæste emner'
       title: 'Emne'
       invalid_access:
@@ -1285,17 +1209,17 @@ da:
         title: "Emnet findes ikke"
         description: "Beklager, vi kunne ikke finde det emne i databasen. Måske er det blevet fjernet af moderator?"
       total_unread_posts:
-        one: "der er {{count}} indlæg du ikke har læst i dette emne"
-        other: "der er {{count}} indlæg du ikke har læst i dette emne"
+        one: der er {{count}} indlæg du ikke har læst i dette emne
+        other: der er {{count}} indlæg du ikke har læst i dette emne
       unread_posts:
-        one: "der er 1 indlæg du ikke har læst i dette emne"
-        other: "der er {{count}} indlæg du ikke har læst i dette emne"
+        one: der er 1 indlæg du ikke har læst i dette emne
+        other: der er {{count}} indlæg du ikke har læst i dette emne
       new_posts:
-        one: "der er kommet 1 nyt indlæg i dette emne siden du læste det sidst"
-        other: "der er kommet {{count}} nye indlæg i dette emne siden du læste det sidst"
+        one: der er kommet 1 nyt indlæg i dette emne siden du læste det sidst
+        other: der er kommet {{count}} nye indlæg i dette emne siden du læste det sidst
       likes:
-        one: "der er ét like i dette emne"
-        other: "der er {{count}} likes i dette emne"
+        one: der er ét like i dette emne
+        other: der er {{count}} likes i dette emne
       back_to_list: "Tilbage til emneoversigt"
       options: "Emneindstillinger"
       show_links: "vis links i dette emne"
@@ -1305,7 +1229,7 @@ da:
       read_more_MF: "Der { UNREAD, plural, =0 {} one { er <a href='/unread'>1 ulæst</a> } other { er <a href='/unread'># ulæste</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='/new'>1 new</a> topic} other { {BOTH, select, true{and } false {are } other{}} <a href='/new'># new</a> topics} } tilbage, eller {CATEGORY, select, true {kig på andre emner i {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Vis alle kategorier
       view_latest_topics: vis seneste emner
-      suggest_create_topic: Hvorfor ikke oprette et emne?
+      suggest_create_topic: "Hvorfor ikke oprette et emne?"
       jump_reply_up: hop til tidligere svar
       jump_reply_down: hop til senere svar
       deleted: "Emnet er blevet slettet"
@@ -1343,8 +1267,8 @@ da:
         auto_close_based_on_last_post: "Emnet vil lukke %{duration} efter det sidste svar."
       auto_close_title: 'Indstillinger for automatisk lukning'
       auto_close_immediate:
-        one: "Seneste indlæg i emnet er allerede 1 time gammelt så emnet bliver lukket med det samme."
-        other: "Seneste indlæg i emnet er allerede %{hours} timer gammelt så emnet bliver lukket med det samme."
+        one: Seneste indlæg i emnet er allerede 1 time gammelt så emnet bliver lukket med det samme.
+        other: Seneste indlæg i emnet er allerede %{hours} timer gammelt så emnet bliver lukket med det samme.
       timeline:
         back: "Tilbage"
         back_description: "Tilbage til dit seneste ulæste indlæg"
@@ -1365,21 +1289,21 @@ da:
         title: skift hvor ofte du vil blive notificeret om dette emne
         reasons:
           mailing_list_mode: "Du har maillist mode slået til, så du bliver notificeret omkring svar på dette emne via e-mail"
-          '3_10': 'Du får notifikationer fordi du overvåger et tag på dette emne'
-          '3_6': 'Du får notifikationer fordi du overvåger denne kategori.'
-          '3_5': 'Du får notifikationer fordi du overvåger dette emne automatisk.'
-          '3_2': 'Du får notifikationer fordi du overvåger dette emne.'
-          '3_1': 'Du får notifikationer fordi du oprettede dette emne.'
-          '3': 'Du får notifikationer fordi du overvåger dette emne.'
-          '2_8': 'Du vil se antallet af nye svar, fordi du følger denne kategori.'
-          '2_4': 'Du vil se antallet af nye svar, fordi du indsendte et svar for dette emne.'
-          '2_2': 'Du vil se antallet af nye svar, fordi du følger dette emne.'
-          '2': 'Du vil se antallet af nye svar, fordi du <a href="/u/{{username}}/preferences">læste dette emne</a>.'
-          '1_2': 'Du vil modtage en notifikation hvis nogen nævner dit @name eller svarer dig.'
-          '1': 'Du vil modtage en notifikation hvis nogen nævner dit @name eller svarer dig.'
-          '0_7': 'Du ignorerer alle notifikationer i denne kategori.'
-          '0_2': 'Du får ingen notifikationer for dette emne.'
-          '0': 'Du får ingen notifikationer for dette emne.'
+          "3_10": 'Du får notifikationer fordi du overvåger et tag på dette emne'
+          "3_6": 'Du får notifikationer fordi du overvåger denne kategori.'
+          "3_5": 'Du får notifikationer fordi du overvåger dette emne automatisk.'
+          "3_2": 'Du får notifikationer fordi du overvåger dette emne.'
+          "3_1": 'Du får notifikationer fordi du oprettede dette emne.'
+          "3": 'Du får notifikationer fordi du overvåger dette emne.'
+          "2_8": 'Du vil se antallet af nye svar, fordi du følger denne kategori.'
+          "2_4": 'Du vil se antallet af nye svar, fordi du indsendte et svar for dette emne.'
+          "2_2": 'Du vil se antallet af nye svar, fordi du følger dette emne.'
+          "2": 'Du vil se antallet af nye svar, fordi du <a href="/u/{{username}}/preferences">læste dette emne</a>.'
+          "1_2": 'Du vil modtage en notifikation hvis nogen nævner dit @name eller svarer dig.'
+          "1": 'Du vil modtage en notifikation hvis nogen nævner dit @name eller svarer dig.'
+          "0_7": 'Du ignorerer alle notifikationer i denne kategori.'
+          "0_2": 'Du får ingen notifikationer for dette emne.'
+          "0": 'Du får ingen notifikationer for dette emne.'
         watching_pm:
           title: "Følger"
           description: "Du vil modtage en notifikation for hvert nyt svar i denne besked, og en optælling af nye svar vil blive vist."
@@ -1419,7 +1343,6 @@ da:
         visible: "Går listet"
         reset_read: "Glem hvilke emner jeg har læst"
         make_public: "Gør til offentligt emne"
-        make_private: "Gør til privat besked"
       feature:
         pin: "Fastgør Emne"
         unpin: "Fjern Fastgøring af Emne"
@@ -1452,8 +1375,8 @@ da:
         pin_validation: "Der skal angives en dato for at fastgøre dette emne"
         not_pinned: "Der er ingen fastgjorte emner i {{categoryLink}}."
         already_pinned:
-          one: "Emner fastgjort i {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
-          other: "Emner fastgjort i {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: 'Emner fastgjort i {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Emner fastgjort i {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         pin_globally: "Fastgør dette emne til toppen af alle emnelister indtil"
         confirm_pin_globally: "Du har allerede {{count}} globalt fastgjorte emner. For mange fastgjorte emner kan være irriterende for nye og anonyme brugere. Er du sikker på du vil fastgøre et emne mere globalt?"
         unpin_globally: "Fjern dette emne fra toppen af alle emne lister."
@@ -1461,8 +1384,8 @@ da:
         global_pin_note: "Brugere kan unpinne emnet individuelt."
         not_pinned_globally: "Der er ingen globalt fastgjorte emner."
         already_pinned_globally:
-          one: "Globalt fastgjorte emner: <strong class='badge badge-notification unread'>1</strong>"
-          other: "Globalt fastgjorte emner: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: 'Globalt fastgjorte emner: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Globalt fastgjorte emner: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         make_banner: "Gør dette emne til en banner, der kommer til at stå i toppen på alle sider."
         remove_banner: "Fjern banneret, der står på toppen af alle sider."
         banner_note: "Brugere kan fjernet banneret ved at lukke det. Kun én banner kan være aktiv ad gangen."
@@ -1498,8 +1421,8 @@ da:
       login_reply: 'Log ind for at svare'
       filters:
         n_posts:
-          one: "1 indlæg"
-          other: "{{count}} indlæg"
+          one: 1 indlæg
+          other: '{{count}} indlæg'
         cancel: "Fjern filter"
       split_topic:
         title: "Flyt til nyt emne"
@@ -1507,15 +1430,15 @@ da:
         topic_name: "Navn på nyt emne"
         error: "Der opstod en fejl under flytningen af indlæg til det nye emne."
         instructions:
-          one: "Du er ved at oprette et nyt emne med det valgte indlæg."
-          other: "Du er ved at oprette et nyt emne med de <b>{{count}}</b> valgte indlæg."
+          one: Du er ved at oprette et nyt emne med det valgte indlæg.
+          other: Du er ved at oprette et nyt emne med de <b>{{count}}</b> valgte indlæg.
       merge_topic:
         title: "Flyt til eksisterende emne"
         action: "flyt til eksisterende emne"
         error: "Der opstod en fejl under flytningen af indlæg til emnet."
         instructions:
-          one: "Vælg venligst det emne som indlægget skal flyttes til."
-          other: "Vælg venligst det emne som de  <b>{{count}}</b> indlæg skal flyttes til."
+          one: Vælg venligst det emne som indlægget skal flyttes til.
+          other: Vælg venligst det emne som de  <b>{{count}}</b> indlæg skal flyttes til.
       merge_posts:
         title: "Flet valgte indlæg"
         action: "flet valgte indlæg"
@@ -1527,9 +1450,8 @@ da:
         label: "Ny ejer af emner"
         placeholder: "brugernavn på ny ejer"
         instructions:
-          one: "Vælg den nye ejer af indlægget, oprindeligt skrevet af <b>{{old_user}}</b>."
-          other: "Vælg den nye ejer af {{count}} indlæg, oprindeligt skrevet af <b>{{old_user}}</b>."
-        instructions_warn: "Bemærk at tidligere notifikationer på dette emne vil ikke blive overført til den nye bruger.\n<br>Advarsel: På nuværende tidspunkt, vil ingen data der er afhængig af dette indlæg blive overført til den nye bruger. Brug forsigtigt."
+          one: Vælg den nye ejer af indlægget, oprindeligt skrevet af <b>{{old_user}}</b>.
+          other: Vælg den nye ejer af {{count}} indlæg, oprindeligt skrevet af <b>{{old_user}}</b>.
       change_timestamp:
         title: "Tilpas tidsstempel..."
         action: "ret tidsstempel"
@@ -1547,8 +1469,6 @@ da:
           one: Du har valgt <b>1</b> indlæg.
           other: Du har valgt <b>{{count}}</b> indlæg.
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Citér"
       edit_reason: "Reason: "
       post_number: "indlæg {{number}}"
@@ -1561,26 +1481,26 @@ da:
       show_full: "Vis hele emnet"
       show_hidden: 'Vist skjult indhold.'
       deleted_by_author:
-        one: "(indlæg trukket tilbage af forfatteren, slettes automatisk om %{count} time med mindre det bliver flaget)"
-        other: "(indlæg trukket tilbage af forfatteren, slettes automatisk om %{count} timer med mindre det bliver flaget)"
+        one: (indlæg trukket tilbage af forfatteren, slettes automatisk om %{count} time med mindre det bliver flaget)
+        other: (indlæg trukket tilbage af forfatteren, slettes automatisk om %{count} timer med mindre det bliver flaget)
       expand_collapse: "fold ud/ind"
       gap:
-        one: "se 1 udeladt indlæg "
-        other: "se {{count}} udeladte indlæg "
+        one: 'se 1 udeladt indlæg '
+        other: 'se {{count}} udeladte indlæg '
       unread: "Indlæg er ulæst"
       has_replies:
-        one: "{{count}} svar"
-        other: "{{count}} svar"
+        one: '{{count}} svar'
+        other: '{{count}} svar'
       has_likes:
-        one: "{{count}} like"
-        other: "{{count}} likes"
+        one: '{{count}} like'
+        other: '{{count}} likes'
       has_likes_title:
-        one: "1 likede dette indlæg"
-        other: "{{count}} likede dette indlæg"
+        one: 1 likede dette indlæg
+        other: '{{count}} likede dette indlæg'
       has_likes_title_only_you: "du likede dette indlæg"
       has_likes_title_you:
-        one: "du og 1 anden likede dette indlæg"
-        other: "du og {{count}} andre likede dette indlæg"
+        one: du og 1 anden likede dette indlæg
+        other: du og {{count}} andre likede dette indlæg
       errors:
         create: "Beklager, der opstod en fejl under oprettelsen af dit indlæg. Prøv venligst igen."
         edit: "Beklager, der opstrod en fejl under redigeringen af dit indlæg. Prøv venligst igen."
@@ -1653,54 +1573,54 @@ da:
           vote: "Du stemte for dette indlæg"
         by_you_and_others:
           off_topic:
-            one: "Du og 1 anden flagede dette som off-topic"
-            other: "Du og {{count}} andre flagede dette som off-topic"
+            one: Du og 1 anden flagede dette som off-topic
+            other: Du og {{count}} andre flagede dette som off-topic
           spam:
-            one: "Du og 1 anden flagede dette som spam"
-            other: "Du og {{count}} andre flagede dette som spam"
+            one: Du og 1 anden flagede dette som spam
+            other: Du og {{count}} andre flagede dette som spam
           inappropriate:
-            one: "Du og 1 anden flagede dettes om upasende"
-            other: "Du og {{count}} andre flagede dettes om upasende"
+            one: Du og 1 anden flagede dettes om upasende
+            other: Du og {{count}} andre flagede dettes om upasende
           notify_moderators:
-            one: "Du og 1 anden flagede dette til moderation"
-            other: "Du og {{count}} andre flagede dette til moderation"
+            one: Du og 1 anden flagede dette til moderation
+            other: Du og {{count}} andre flagede dette til moderation
           notify_user:
-            one: "Dig og en anden har sendt en besked til denne bruger"
-            other: "Dig og {{count}} andre har sendt en besked til denne bruger"
+            one: Dig og en anden har sendt en besked til denne bruger
+            other: Dig og {{count}} andre har sendt en besked til denne bruger
           bookmark:
-            one: "Du og 1 anden bogmærkede dette indlæg"
-            other: "Du og {{count}} andre bogmærkede dette indlæg"
+            one: Du og 1 anden bogmærkede dette indlæg
+            other: Du og {{count}} andre bogmærkede dette indlæg
           like:
-            one: "Du og 1 anden liker dette"
-            other: "Du og {{count}} andre liker dette"
+            one: Du og 1 anden liker dette
+            other: Du og {{count}} andre liker dette
           vote:
-            one: "Du og 1 anden stemte for dette indlæg"
-            other: "Du og {{count}} andre stemte for dette indlæg"
+            one: Du og 1 anden stemte for dette indlæg
+            other: Du og {{count}} andre stemte for dette indlæg
         by_others:
           off_topic:
-            one: "1 person flagede dette som off-topic"
-            other: "{{count}} personer flagede dette som off-topic"
+            one: 1 person flagede dette som off-topic
+            other: '{{count}} personer flagede dette som off-topic'
           spam:
-            one: "1 person flagede dette som spam"
-            other: "{{count}} personer flagede dette som spam"
+            one: 1 person flagede dette som spam
+            other: '{{count}} personer flagede dette som spam'
           inappropriate:
-            one: "1 person flagede dette som upassende"
-            other: "{{count}} personer flagede dette som upassende"
+            one: 1 person flagede dette som upassende
+            other: '{{count}} personer flagede dette som upassende'
           notify_moderators:
-            one: "1 person flagede dette til moderation"
-            other: "{{count}} personer flagede dette til moderation"
+            one: 1 person flagede dette til moderation
+            other: '{{count}} personer flagede dette til moderation'
           notify_user:
-            one: "1 person har sendt en besked til denne bruger"
-            other: "{{count}} har sendt en besked til denne bruger"
+            one: 1 person har sendt en besked til denne bruger
+            other: '{{count}} har sendt en besked til denne bruger'
           bookmark:
-            one: "1 person bogmærkede dette indlæg"
-            other: "{{count}} personer bogmærkede dette indlæg"
+            one: 1 person bogmærkede dette indlæg
+            other: '{{count}} personer bogmærkede dette indlæg'
           like:
-            one: "1 person liker dette"
-            other: "{{count}} personer liker dette"
+            one: 1 person liker dette
+            other: '{{count}} personer liker dette'
           vote:
-            one: "1 person stemte for dette indlæg"
-            other: "{{count}} personer stemte for dette indlæg"
+            one: 1 person stemte for dette indlæg
+            other: '{{count}} personer stemte for dette indlæg'
       revisions:
         controls:
           first: "Første udgave"
@@ -1780,7 +1700,6 @@ da:
       email_in_allow_strangers: "Accepter emails fra ikke oprettede brugere"
       email_in_disabled: "Nye emner via email er deaktiveret i Site opsætning. For at aktivere oprettelse af nye emner via email,"
       email_in_disabled_click: 'aktiver "email ind" indstilligen.'
-      suppress_from_homepage: "Undertryk denne kategori fra hjemmesiden"
       show_subcategory_list: "Vis oversigt med subkategorier ovenover emner i denne kategori."
       num_featured_topics: "Antal emner som skal vises på siden med kategorier:"
       subcategory_num_featured_topics: "Antal af fremhævede emner på siden for den overordnede kategori:"
@@ -1854,14 +1773,14 @@ da:
       custom_placeholder_notify_moderators: "Lad os vide præcis hvad du er bekymret over og giv relevante links og eksempler hvor det er muligt."
       custom_message:
         at_least:
-          one: "indtast mindst 1 tegn"
-          other: "indtast mindst {{count}} tegn"
+          one: indtast mindst 1 tegn
+          other: indtast mindst {{count}} tegn
         more:
-          one: "1 mere..."
-          other: "{{count}} mere..."
+          one: 1 mere...
+          other: '{{count}} mere...'
         left:
-          one: "1 tilbage"
-          other: "{{count}} tilbage"
+          one: 1 tilbage
+          other: '{{count}} tilbage'
     flagging_topic:
       title: "Tak fordi du hjælper med at holde vores forum civiliseret!"
       action: "Rapporter emne"
@@ -1872,13 +1791,13 @@ da:
       links_title: "Populære Links"
       links_shown: "vis flere links..."
       clicks:
-        one: "1 klik"
-        other: "%{count} klik"
+        one: 1 klik
+        other: '%{count} klik'
     post_links:
       about: "udvid flere links for dette indlæg"
       title:
-        one: "1 mere"
-        other: "%{count} flere"
+        one: 1 mere
+        other: '%{count} flere'
     topic_statuses:
       warning:
         help: "Dette er en officiel advarsel."
@@ -1912,22 +1831,22 @@ da:
     original_post: "Oprindeligt indlæg"
     views: "Visninger"
     views_lowercase:
-      one: "visning"
-      other: "visninger"
+      one: visning
+      other: visninger
     replies: "Svar"
     views_long:
-      one: "emnet er læst 1 gang"
-      other: "emnet er læst {{number}} gange"
+      one: emnet er læst 1 gang
+      other: emnet er læst {{number}} gange
     activity: "Aktivitet"
     likes: "Likes"
     likes_lowercase:
-      one: "like"
-      other: "likes"
+      one: like
+      other: likes
     likes_long: "der er {{number}} likes i dette emne"
     users: "Deltagere"
     users_lowercase:
-      one: "bruger"
-      other: "brugere"
+      one: bruger
+      other: brugere
     category_title: "Kategori"
     history: "Historik"
     changed_by: "af {{author}}"
@@ -1941,8 +1860,8 @@ da:
       latest:
         title: "Seneste"
         title_with_count:
-          one: "Seneste (1)"
-          other: "Seneste ({{count}})"
+          one: Seneste (1)
+          other: Seneste ({{count}})
         help: "de seneste emner"
       hot:
         title: "Populære"
@@ -1960,21 +1879,21 @@ da:
       unread:
         title: "Ulæst"
         title_with_count:
-          one: "Ulæst (1)"
-          other: "Ulæste ({{count}})"
+          one: Ulæst (1)
+          other: Ulæste ({{count}})
         help: "emner du følger med i lige nu med ulæste indlæg"
         lower_title_with_count:
-          one: "1 ulæst"
-          other: "{{count}} ulæste"
+          one: 1 ulæst
+          other: '{{count}} ulæste'
       new:
         lower_title_with_count:
-          one: "1 ny"
-          other: "{{count}} nye"
+          one: 1 ny
+          other: '{{count}} nye'
         lower_title: "Ny"
         title: "Nye"
         title_with_count:
-          one: "Nye (1)"
-          other: "Nye ({{count}})"
+          one: Nye (1)
+          other: Nye ({{count}})
         help: "Emner oprettet i de seneste par dage"
       posted:
         title: "Mine indlæg"
@@ -1985,8 +1904,8 @@ da:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: "{{categoryName}} (1)"
-          other: "{{categoryName}} ({{count}})"
+          one: '{{categoryName}} (1)'
+          other: '{{categoryName}} ({{count}})'
         help: "populære emner i kategorien {{categoryName}}"
       top:
         title: "Top"
@@ -2070,22 +1989,21 @@ da:
         print: '<b>ctrl</b>+<b>p</b> Print emne'
     badges:
       earned_n_times:
-        one: "Blev tildelt dette badge 1 gang"
-        other: "Blev tildelt dette badge %{count} gange"
+        one: Blev tildelt dette badge 1 gang
+        other: Blev tildelt dette badge %{count} gange
       granted_on: "Tildelt %{date}"
       others_count: "Andre med dette badge (%{count})"
       title: Badges
       badge_count:
-        one: "1 Badge"
-        other: "%{count} Badges"
+        one: 1 Badge
+        other: '%{count} Badges'
       more_badges:
-        one: "+1 Mere"
-        other: "+%{count} Flere"
+        one: +1 Mere
+        other: +%{count} Flere
       granted:
-        one: "1 tildelt"
-        other: "%{count} tildelt"
-      select_badge_for_title: Vælg en badge, du vil bruge som din titel
-      none: "<ingen>"
+        one: 1 tildelt
+        other: '%{count} tildelt'
+      select_badge_for_title: "Vælg en badge, du vil bruge som din titel"
       badge_grouping:
         getting_started:
           name: Sådan kommer du i gang
@@ -2128,19 +2046,15 @@ da:
       notifications:
         watching:
           title: "Overvåger"
-          description: "Du vil automatisk overvåge alle emner med dette tag. Du vil blive notificeret om alle nye indlæg og emner. Samtidig vil antallet af ulæste indlæg også vises ved siden af emnet."
         watching_first_post:
           title: "Overvåger første indlæg"
-          description: "Du vil kun blive notificeret om det første indlæg under hvert nyt emne i dette tag."
         tracking:
           title: "Følger"
-          description: "Du vil automatisk følge alle emner i dette tag. Et antal af ulæste og nye indlæg vil vises ved siden af emnet."
         regular:
           title: "Almindeligt"
           description: "Du vil blive notificeret if nogen nævner dit You will be notified if someone mentions your @name or replies to your post."
         muted:
           title: "Lydløs"
-          description: "Du vil ikke modtage beskeder af nogen slags vedrørende nye emner i dette tag, og de vil ikke fremgå i din fane med ulæste."
       groups:
         title: "Tag grupper"
         about: "Tilføj tags til grupper for nemmere håndtering."
@@ -2222,8 +2136,6 @@ da:
         reports:
           today: "I dag"
           yesterday: "I går"
-          last_7_days: "Seneste 7 dage"
-          last_30_days: "Seneste 30 dage"
           all_time: "Altid"
           7_days_ago: "7 dage siden"
           30_days_ago: "30 dage siden"
@@ -2241,7 +2153,6 @@ da:
         title: "Flag"
         agree: "Enig"
         agree_title: "Bekræft dette flag er gyldigt og korrekt"
-        defer_flag_title: "Fjern dette flag; Det kræver ingen handling på nuværende tidspunkt."
         delete: "Slet"
         delete_title: "Slet det indlæg, som flaget refererer til."
         delete_post_defer_flag_title: "Slet indlægget; hvis det er det første, så slet hele emnet"
@@ -2275,8 +2186,6 @@ da:
         title: "Grupper"
         edit: "Redigér grupper"
         refresh: "Genindlæs"
-        new: "Nye"
-        selector_placeholder: "indtast brugernavn"
         about: "Redigér gruppemedlemsskaber og gruppenavne her"
         group_members: "Gruppe medlemmer"
         delete: "Slet"
@@ -2284,22 +2193,10 @@ da:
         delete_failed: "Kan ikke slette gruppen. Hvis dette er en automatisk gruppe, kan den ikke ødelægges."
         delete_owner_confirm: "Fjern ejer-privilegier for '%{username}'?"
         add: "Tilføj"
-        add_members: "Tilføj medlemmer"
         custom: "Brugerdefineret"
-        bulk_complete: "Brugerne er tilføjet gruppen."
-        bulk_complete_users_not_added: "Disse brugere blev ikke tilføjet (sørg for at sikre, at de har en konto):"
-        bulk: "Tilføj mange brugere til gruppe"
-        bulk_paste: "Indsæt en liste brugerne eller emails, én per linje:"
-        bulk_select: "(vælg en gruppe)"
         automatic: "Automatisk"
-        automatic_membership_email_domains: "Brugere der registrerer med et email domæne der præcist matcher et på denne liste, vil automatisk blive tilføjet til denne gruppe:"
-        automatic_membership_retroactive: "Brug denne email domæne regel til at tilføje brugere der allerede er registrerede brugere"
-        default_title: "Standard titel for alle brugere i denne gruppe"
-        primary_group: "Sæt automatisk som primær gruppe"
         group_owners: Ejere
         add_owners: Tilføj ejere
-        incoming_email: "Brugerdefineret indkommende email"
-        incoming_email_placeholder: "indtast email"
         none_selected: "Vælg en gruppe for at komme i gang"
         no_custom_groups: "Opret en ny brugerdefineret gruppe"
       api:
@@ -2364,11 +2261,11 @@ da:
           none: "Der er ingen relaterede events."
           redeliver: "Genfremsend"
           incoming:
-            one: "Der er et nyt event."
-            other: "Der er {{count}} nye events."
+            one: Der er et nyt event.
+            other: Der er {{count}} nye events.
           completed_in:
-            one: "Fuldført på 1 sekund."
-            other: "Fuldført på {{count}} sekunder."
+            one: Fuldført på 1 sekund.
+            other: Fuldført på {{count}} sekunder.
           request: "Forespørgsel"
           response: "Svar"
           redeliver_confirm: "Er du sikker på at du vil genfremsende det samme payload?"
@@ -2419,7 +2316,6 @@ da:
           label: "Upload"
           title: "Upload en backup til denne instans"
           uploading: "Uploader..."
-          success: "'{{filename}}' er blevet uploaded."
           error: "Der skete en fejl da filen '{{filename}}' blev forsøgt uploaded: {{message}}"
         operations:
           is_running: "Der kører allerede en operation..."
@@ -2432,7 +2328,6 @@ da:
             label: "Backup"
             title: "Start backup"
             confirm: "Vil du starte en ny backup?"
-            without_uploads: "Ja (inkluder ikke filer)"
           download:
             label: "Download"
             title: "Send e-mail med downloadlink"
@@ -2773,11 +2668,11 @@ da:
           suspect: 'Mistænkt'
         approved: "Godkendt?"
         approved_selected:
-          one: "godkend bruger"
-          other: "godkend brugere ({{count}})"
+          one: godkend bruger
+          other: godkend brugere ({{count}})
         reject_selected:
-          one: "afvis bruger"
-          other: "afvis brugere ({{count}})"
+          one: afvis bruger
+          other: afvis brugere ({{count}})
         titles:
           active: 'Aktive brugere'
           new: 'Nye brugere'
@@ -2793,11 +2688,11 @@ da:
           suspended: 'Suspenderede brugere'
           suspect: 'Mistænkte brugere'
         reject_successful:
-          one: "Afviste 1 bruger."
-          other: "Afviste %{count} brugere."
+          one: Afviste 1 bruger.
+          other: Afviste %{count} brugere.
         reject_failures:
-          one: "Kunne ikke afvise 1 bruger."
-          other: "Kunne ikke afvise %{count} brugere."
+          one: Kunne ikke afvise 1 bruger.
+          other: Kunne ikke afvise %{count} brugere.
         not_verified: "Ikke verificeret"
         check_email:
           title: "Vis denne brugers email adresse"
@@ -2857,14 +2752,14 @@ da:
         delete_forbidden_because_staff: "Admins og moderatorer kan ikke slettes."
         delete_posts_forbidden_because_staff: "Kan ikke slette alle indlæg fra administratorer og moderatorer."
         delete_forbidden:
-          one: "Brugere kan ikke slettes hvis de har oprettet sig for mere end %{count} dag siden, eller hvis de har oprettet indlæg. Slet alle indlæg før du forsøger at slette en bruger."
-          other: "Brugere kan ikke slettes hvis de har oprettet sig for mere end %{count} dage siden, eller hvis de har oprettet indlæg. Slet alle indlæg før du forsøger at slette en bruger."
+          one: Brugere kan ikke slettes hvis de har oprettet sig for mere end %{count} dag siden, eller hvis de har oprettet indlæg. Slet alle indlæg før du forsøger at slette en bruger.
+          other: Brugere kan ikke slettes hvis de har oprettet sig for mere end %{count} dage siden, eller hvis de har oprettet indlæg. Slet alle indlæg før du forsøger at slette en bruger.
         cant_delete_all_posts:
-          one: "Kan ikke slette alle indlæg. Der er indlæg der er over %{count} dag gamle. (Juster delete_user_max_post_age indstillingen.)"
-          other: "Kan ikke slette alle indlæg. Der er indlæg der er over %{count} dage gamle. (Juster delete_user_max_post_age indstillingen.)"
+          one: Kan ikke slette alle indlæg. Der er indlæg der er over %{count} dag gamle. (Juster delete_user_max_post_age indstillingen.)
+          other: Kan ikke slette alle indlæg. Der er indlæg der er over %{count} dage gamle. (Juster delete_user_max_post_age indstillingen.)
         cant_delete_all_too_many_posts:
-          one: "Kan ikke slette alle indlæg fordi denne bruger har flere end 1 indlæg. (delete_all_posts_max indstillingen)"
-          other: "Kan ikke slette alle indlæg fordi denne bruger har flere end %{count} indlæg. (delete_all_posts_max indstillingen)"
+          one: Kan ikke slette alle indlæg fordi denne bruger har flere end 1 indlæg. (delete_all_posts_max indstillingen)
+          other: Kan ikke slette alle indlæg fordi denne bruger har flere end %{count} indlæg. (delete_all_posts_max indstillingen)
         delete_confirm: "Er du SIKKER på at du slette denne bruger? Det er permanent! "
         delete_and_block: "Slet og <b>bloker</b> denne email og IP-adresse"
         delete_dont_block: "Slet kun"
@@ -2899,8 +2794,8 @@ da:
         tl3_requirements:
           title: "Krav for fortrolighedsniveau 3"
           table_title:
-            one: "I den sidste dag"
-            other: "I de sidste %{count} dage:"
+            one: I den sidste dag
+            other: 'I de sidste %{count} dage:'
           value_heading: "værdi"
           requirement_heading: "Obligatoriske"
           visits: "Besøg"
@@ -2975,10 +2870,7 @@ da:
         recommended: "Vi anbefaler ændringer i følgende tekst:"
         show_overriden: 'Vis kun tilsidesatte'
       site_settings:
-        show_overriden: 'Vis kun tilsidesatte'
         title: 'Indstillinger'
-        reset: 'nulstil'
-        none: 'ingen'
         no_results: "Ingen resultater fundet."
         clear_filter: "Ryd"
         add_url: "tilføj URL"
@@ -3027,17 +2919,17 @@ da:
         reason_help: (Et link til et indlæg eller et emne)
         save: Gem
         delete: Slet
-        delete_confirm: Er du sikker på du vil slette denne badge ?
+        delete_confirm: "Er du sikker på du vil slette denne badge ?"
         revoke: Fratag
         reason: Grund
         expand: Fold ud &hellip;
-        revoke_confirm: Er du sikker på du vil fratage brugeren denne badge ?
+        revoke_confirm: "Er du sikker på du vil fratage brugeren denne badge ?"
         edit_badges: Rediger Badges
         grant_badge: Tildel Badge
         granted_badges: Tildelte Badges
         grant: Givet
         no_user_badges: "%{name} had ikke feet nogen badges."
-        no_badges: Der er ikke nogen badges, der kan tildeles.
+        no_badges: "Der er ikke nogen badges, der kan tildeles."
         none_selected: "Vælg et badge for at komme igang"
         allow_title: Tillad at bruge denne badge som titel
         multiple_grant: Kan gives flere gange
@@ -3045,7 +2937,6 @@ da:
         enabled: Aktiver badge
         icon: Icon
         image: Billede
-        icon_help: "Bruge enten en \"Font Awesome\" klasse eller URL til et billede"
         query: Badge Forespørgesel (SQL)
         target_posts: Forespørg mål indlæg
         auto_revoke: Kør tilbagekaldelses forespørgsel hver dag
@@ -3069,14 +2960,14 @@ da:
             text: "Der mangler tildelinger. Dette sker når en SQL query returnerer bruger ID'er eller indlægs IS'er der ikke eksisterer. Dette kan give uventede resultater senere - vær venlig at dobbelt checke din SQL query."
           no_grant_count: "Ingen badges til tildeling."
           grant_count:
-            one: "<b>1</b> badge til tildeling."
-            other: "<b>%{count}</b> badges til tildeling."
+            one: <b>1</b> badge til tildeling.
+            other: <b>%{count}</b> badges til tildeling.
           sample: "Eksempel:"
           grant:
-            with: <span class="username">%{username}</span>
-            with_post: <span class="username">%{username}</span> for indlæg i %{link}
-            with_post_time: <span class="username">%{username}</span> for indlæg i %{link} klokken <span class="time">%{time}</span>
-            with_time: <span class="username">%{username}</span> klokken <span class="time">%{time}</span>
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span> for indlæg i %{link}"
+            with_post_time: "<span class=\"username\">%{username}</span> for indlæg i %{link} klokken <span class=\"time\">%{time}</span>"
+            with_time: "<span class=\"username\">%{username}</span> klokken <span class=\"time\">%{time}</span>"
       emoji:
         title: "Emoji"
         help: "Tilføj en ny emoji, som vil være tilgængelig for alle. (PROTIP: drag & drop flere filer på én gang)"
@@ -3120,7 +3011,7 @@ da:
         category_id: "Kategori ID"
         category_title: "Kategori"
         external_url: "Ekstern URL"
-        delete_confirm: Er du sikker på at du vil slette dette permalink?
+        delete_confirm: "Er du sikker på at du vil slette dette permalink?"
         form:
           label: "Ny:"
           add: "Tilføj"
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 34969a65bed..f44debdd798 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -43,68 +43,68 @@ de:
       tiny:
         half_a_minute: "< 1min"
         less_than_x_seconds:
-          one: "< 1s"
-          other: "< %{count}s"
+          one: < 1s
+          other: < %{count}s
         x_seconds:
-          one: "1s"
-          other: "%{count}s"
+          one: 1s
+          other: '%{count}s'
         less_than_x_minutes:
-          one: "< 1 Min."
-          other: "< %{count} Min."
+          one: < 1 Min.
+          other: < %{count} Min.
         x_minutes:
-          one: "1min"
-          other: "%{count}min"
+          one: 1min
+          other: '%{count}min'
         about_x_hours:
-          one: "1h"
-          other: "%{count}h"
+          one: 1h
+          other: '%{count}h'
         x_days:
-          one: "1d"
-          other: "%{count}d"
+          one: 1d
+          other: '%{count}d'
         x_months:
-          one: "1 Monat"
-          other: "%{count}Monate"
+          one: 1 Monat
+          other: '%{count}m'
         about_x_years:
-          one: "1a"
-          other: "%{count}a"
+          one: 1a
+          other: '%{count}a'
         over_x_years:
-          one: "> 1a"
-          other: "> %{count}a"
+          one: '> 1a'
+          other: '> %{count}a'
         almost_x_years:
-          one: "1a"
-          other: "%{count}a"
+          one: 1a
+          other: '%{count}a'
         date_month: "D. MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: "1 Minute"
-          other: "%{count} Minuten"
+          one: 1 Minute
+          other: '%{count} Minuten'
         x_hours:
-          one: "1 Stunde"
-          other: "%{count} Stunden"
+          one: 1 Stunde
+          other: '%{count} Stunden'
         x_days:
-          one: "1 Tag"
-          other: "%{count} Tage"
+          one: 1 Tag
+          other: '%{count} Tage'
         date_year: "D. MMM 'YY"
       medium_with_ago:
         x_minutes:
-          one: "vor einer Minute"
-          other: "vor %{count} Minuten"
+          one: vor einer Minute
+          other: vor %{count} Minuten
         x_hours:
-          one: "vor einer Stunde"
-          other: "vor %{count} Stunden"
+          one: vor einer Stunde
+          other: vor %{count} Stunden
         x_days:
-          one: "vor einem Tag"
-          other: "vor %{count} Tagen"
+          one: vor einem Tag
+          other: vor %{count} Tagen
       later:
         x_days:
-          one: "einen Tag später"
-          other: "%{count} Tage später"
+          one: einen Tag später
+          other: '%{count} Tage später'
         x_months:
-          one: "einen Monat später"
-          other: "%{count} Monate später"
+          one: einen Monat später
+          other: '%{count} Monate später'
         x_years:
-          one: "ein Jahr später"
-          other: "%{count} Jahre später"
+          one: ein Jahr später
+          other: '%{count} Jahre später'
       previous_month: 'Vormonat'
       next_month: 'Nächster Monat'
       placeholder: Datum
@@ -118,7 +118,7 @@ de:
       email: 'diesen Link per E-Mail senden'
     action_codes:
       public_topic: "hat das Thema %{when} öffentlich gemacht"
-      private_topic: "hat das Thema %{when} privat gemacht"
+      private_topic: "hat dieses Thema in eine Nachricht umgewandelt %{when}"
       split_topic: "Thema aufgeteilt, %{when}"
       invited_user: "%{who} eingeladen, %{when}"
       invited_group: "%{who} eingeladen, %{when}"
@@ -149,8 +149,8 @@ de:
     topic_admin_menu: "Thema administrieren"
     wizard_required: "Willkommen bei deinem neuen Discourse! Lass uns mit dem <a href='%{url}' data-auto-route='true'>Setup-Assistenten</a> ✨ starten"
     emails_are_disabled: "Die ausgehende E-Mail-Kommunikation wurde von einem Administrator global deaktiviert. Es werden keinerlei Benachrichtigungen per E-Mail verschickt."
-    bootstrap_mode_enabled: "Damit du mit deiner Seite einfacher loslegen kannst, befindest du dich im Starthilfe-Modus. Alle neuen Benutzer erhalten die Vertrauensstufe 1 und bekommen eine tägliche E-Mail-Zusammenfassung. Der Modus wird automatisch deaktiviert, sobald sich mindestens %{min_users} Benutzer angemeldet haben."
-    bootstrap_mode_disabled: "Der Starthilfe-Modus wird innerhalb der nächsten 24 Stunden deaktiviert."
+    bootstrap_mode_enabled: "Damit du mit deiner Seite einfacher loslegen kannst, befindest du dich im Starthilfe-Modus. Alle neuen Benutzer erhalten die Vertrauensstufe 1 und bekommen eine tägliche E-Mail-Zusammenfassung. Der Modus wird automatisch deaktiviert, sobald die Gesamtanzahl der Benutzer den Wert %{min_users} überschreitet."
+    bootstrap_mode_disabled: "Starthilfe-Modus wird in den nächsten 24 Stunden deaktiviert."
     themes:
       default_description: "Standard"
     s3:
@@ -166,7 +166,7 @@ de:
         eu_west_2: "EU (London)"
         sa_east_1: "Südamerika (São Paulo)"
         us_east_1: "USA Ost (Nord-Virginia)"
-        us_east_2: "USA West (Ohio)"
+        us_east_2: "USA Ost (Ohio)"
         us_gov_west_1: "AWS GovCloud (USA)"
         us_west_1: "USA West (Nordkalifornien)"
         us_west_2: "USA West (Oregon)"
@@ -174,6 +174,7 @@ de:
     not_implemented: "Entschuldige, diese Funktion wurde noch nicht implementiert!"
     no_value: "Nein"
     yes_value: "Ja"
+    submit: "Absenden"
     generic_error: "Entschuldige, es ist ein Fehler aufgetreten."
     generic_error_with_reason: "Ein Fehler ist aufgetreten: %{error}"
     sign_up: "Registrieren"
@@ -186,8 +187,8 @@ de:
     show_help: "Erweiterte Suche"
     links: "Links"
     links_lowercase:
-      one: "Link"
-      other: "Links"
+      one: Link
+      other: Links
     faq: "FAQ"
     guidelines: "Richtlinien"
     privacy_policy: "Datenschutzrichtlinie"
@@ -211,8 +212,8 @@ de:
     max_of_count: "von max. {{count}}"
     alternation: "oder"
     character_count:
-      one: "{{count}} Zeichen"
-      other: "{{count}} Zeichen"
+      one: '{{count}} Zeichen'
+      other: '{{count}} Zeichen'
     suggested_topics:
       title: "Vorgeschlagene Themen"
       pm_title: "Vorgeschlagene Nachrichten"
@@ -224,8 +225,8 @@ de:
       our_moderators: "Unsere Moderatoren"
       stat:
         all_time: "Gesamt"
-        last_7_days: "Letzte 7 Tage"
-        last_30_days: "Letzte 30 Tage"
+        last_7_days: "Letzte 7"
+        last_30_days: "Letzte 30"
       like_count: "Likes"
       topic_count: "Themen"
       post_count: "Beiträge"
@@ -247,15 +248,14 @@ de:
       remove: "Lesezeichen entfernen"
       confirm_clear: "Bist du sicher, dass du alle Lesezeichen in diesem Thema entfernen möchtest?"
     topic_count_latest:
-      one: "{{count}} neues oder geändertes Thema."
-      other: "{{count}} neue oder geänderte Themen."
+      one: Zeige {{count}} neues oder aktualisiertes Thema
+      other: Zeige {{count}} neue oder aktualisierte Themen
     topic_count_unread:
-      one: "{{count}} ungelesenes Thema."
-      other: "{{count}} ungelesene Themen."
+      one: Zeige {{count}} ungelesenes Thema
+      other: Zeige {{count}} ungelesene Themen
     topic_count_new:
-      one: "{{count}} neues Thema."
-      other: "{{count}} neue Themen."
-    click_to_show: "Klicke zum Anzeigen."
+      one: Zeige {{count}} neues Thema
+      other: Zeige {{count}} neue Themen
     preview: "Vorschau"
     cancel: "Abbrechen"
     save: "Speichern"
@@ -268,6 +268,7 @@ de:
     pasting: "Einfügen..."
     enable: "Aktivieren"
     disable: "Deaktivieren"
+    continue: "Weiter"
     undo: "Rückgängig machen"
     revert: "Verwerfen"
     failed: "Fehlgeschlagen"
@@ -292,16 +293,16 @@ de:
       cancel: "Abbrechen"
       view_pending: "ausstehende Beiträge anzeigen"
       has_pending_posts:
-        one: "Dieses Thema hat <b>einen</b> Beitrag, der genehmigt werden muss"
-        other: "Dieses Thema hat <b>{{count}}</b> Beiträge, die genehmigt werden müssen"
+        one: Dieses Thema hat <b>einen</b> Beitrag, der genehmigt werden muss
+        other: Dieses Thema hat <b>{{count}}</b> Beiträge, die genehmigt werden müssen
       confirm: "Speichern"
       delete_prompt: "Möchtest du wirklich <b>%{username}</b> löschen? Damit werden alle Beiträge des Benutzers entfernt und dessen E-Mail- und IP-Adresse geblockt."
       approval:
         title: "Beitrag muss genehmigt werden"
         description: "Wir haben deinen neuen Beitrag erhalten. Dieser muss allerdings zunächst durch einen Moderator freigeschaltet werden. Bitte habe etwas Geduld. "
         pending_posts:
-          one: "Du hast <strong>1</strong> ausstehenden Beitrag."
-          other: "Du hast <strong>{{count}}</strong> ausstehende Beiträge."
+          one: Du hast <strong>1</strong> ausstehenden Beitrag.
+          other: Du hast <strong>{{count}}</strong> ausstehende Beiträge.
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> hat <a href='{{topicUrl}}'>das Thema</a> verfasst"
@@ -335,8 +336,8 @@ de:
       posts_read: "Gelesen"
       posts_read_long: "Gelesene Beiträge"
       total_rows:
-        one: "1 Benutzer"
-        other: "%{count} Benutzer"
+        one: 1 Benutzer
+        other: '%{count} Benutzer'
     group_histories:
       actions:
         change_group_setting: "Gruppeneinstellung ändern"
@@ -345,22 +346,35 @@ de:
         make_user_group_owner: "Zum Eigentümer machen"
         remove_user_as_group_owner: "Eigentümerrechte entziehen"
     groups:
-      logs:
-        title: "Protokolle"
-        when: "Wann"
-        action: "Aktion"
-        acting_user: "Benutzer der Aktion"
-        target_user: "Betroffener Benutzer"
-        subject: "Gegenstand"
-        details: "Details"
-        from: "Von"
-        to: "An"
-      edit:
-        title: 'Gruppe bearbeiten'
+      add_members:
+        title: "Mitglieder hinzufügen"
+        description: "Verwalte die Mitgliedschaft in dieser Gruppe"
+        usernames: "Benutzernamen"
+      manage:
+        title: 'Verwalten'
+        name: 'Name'
         full_name: 'Vollständiger Name'
         add_members: "Mitglieder hinzufügen"
-        delete_member_confirm: "'%{username}' aus der Gruppe '%{group}' entfernen?"
-      name_placeholder: "Gruppenname, keine Leerzeichen, gleiche Regel wie beim Benutzernamen"
+        delete_member_confirm: "Entferne „%{username}“ aus der Gruppe „%{group}“?"
+        profile:
+          title: Profi
+        interaction:
+          title: Interaktion
+          posting: Beiträge
+          notification: Benachrichtigung
+        membership:
+          title: Mitgliedschaft
+          access: Zugriff
+        logs:
+          title: "Protokoll"
+          when: "Wann"
+          action: "Aktion"
+          acting_user: "Ausführender Benutzer"
+          target_user: "Betroffener Benutzer"
+          subject: "Betreff"
+          details: "Details"
+          from: "Von"
+          to: "An"
       public_admission: "Erlaube Benutzern, die Gruppe eigenständig zu betreten (Erfordert, dass die Gruppe öffentlich sichtbar ist)"
       public_exit: "Erlaube Benutzern, die Gruppe eigenständig zu verlassen"
       empty:
@@ -371,13 +385,10 @@ de:
         topics: "Es gibt keine Themen von Mitgliedern dieser Gruppe."
         logs: "Es gibt keine Protokolleinträge für diese Gruppe."
       add: "Hinzufügen"
-      join: "Gruppe beitreten"
-      leave: "Gruppe verlassen"
-      request: "Gruppenbeitritt beantragen"
+      join: "Beitreten"
+      leave: "Verlassen"
+      request: "Anfrage"
       message: "Nachricht"
-      automatic_group: Automatische Gruppe
-      closed_group: Geschlossene Gruppe
-      is_group_user: "Du bist ein Mitglied in dieser Gruppe."
       allow_membership_requests: "Erlaube Benutzern, eine Mitgliedschaftsanfrage an Gruppen-Eigentümer zu senden."
       membership_request_template: "Benutzerdefinierte Vorlage, das Benutzern angezeigt wird, die eine Mitgliedschaftsanfrage senden"
       membership_request:
@@ -386,40 +397,58 @@ de:
         reason: "Lass’ die Gruppenbesitzer wissen, warum du in diese Gruppe gehörst"
       membership: "Mitgliedschaft"
       name: "Name"
-      user_count: "Anzahl der Mitglieder"
+      group_name: "Gruppenname"
+      user_count: "Benutzer"
       bio: "Über die Gruppe"
-      selector_placeholder: "Mitglieder hinzufügen"
+      selector_placeholder: "Benutzernamen eingeben"
       owner: "Eigentümer"
       index:
         title: "Gruppen"
+        all: "Alle Gruppen"
         empty: "Es gibt keine sichtbaren Gruppen."
+        filter: "Filtern nach Art der Gruppe"
+        owner_groups: "Gruppen, deren Eigentümer ich bin"
+        close_groups: "Geschlossene Gruppe"
+        automatic_groups: "Automatische Gruppen"
+        automatic: "Automatisch"
+        closed: "Geschlossen"
+        public: "Öffentlich"
+        private: "Geheim"
+        public_groups: "Öffentliche Gruppen"
+        automatic_group: Automatische Gruppe
+        close_group: Gruppe schließen
+        my_groups: "Meine Gruppen"
+        group_type: "Art der Gruppe"
+        is_group_user: "Mitglied"
+        is_group_owner: "Eigentümer"
       title:
-        one: "Gruppe"
-        other: "Gruppen"
+        one: Gruppe
+        other: Gruppen
       activity: "Aktivität"
-      members: "Mitglieder"
+      members:
+        title: "Mitglieder"
+        filter_placeholder_admin: "Benutzername oder E-Mail-Adresse"
+        filter_placeholder: "Benutzername"
+        remove_member: "Mitglied entfernen"
+        remove_member_description: "Entferne <b>%{username}</b> aus dieser Gruppe"
+        make_owner: "Als Eigentümer hinzufügen"
+        make_owner_description: "Füge <b>%{username}</b> als Eigentümer dieser Gruppe hinzu"
+        remove_owner: "Als Eigentümer entfernen"
+        remove_owner_description: "Entferne <b>%{username}</b> als Eigentümer dieser Gruppe"
+        owner: "Eigentümer"
       topics: "Themen"
       posts: "Beiträge"
       mentions: "Erwähnungen"
       messages: "Nachrichten"
       notification_level: "Standard-Benachrichtigungsstufe für Gruppen-Nachrichten"
-      visibility_levels:
-        title: "Wer kann diese Gruppe sehen?"
-        public: "Alle"
-        members: "Gruppenbesitzer, Mitglieder und Admins"
-        staff: "Gruppenbesitzer und Team"
-        owners: "Gruppenbesitzer und Admins"
       alias_levels:
         mentionable: "Wer kann diese Gruppe @erwähnen?"
-        messageable: "Wer cann dieser Gruppe eine Nachricht schicken?"
+        messageable: "Wer kann dieser Gruppe eine Nachricht schicken?"
         nobody: "Niemand"
         only_admins: "Nur Administratoren"
         mods_and_admins: "Nur Moderatoren und Administratoren"
         members_mods_and_admins: "Nur Gruppenmitglieder, Moderatoren und Administratoren"
         everyone: "Jeder"
-      trust_levels:
-        title: "Vertrauensstufe, die neuen Mitgliedern automatisch verliehen wird:"
-        none: "keine"
       notifications:
         watching:
           title: "Beobachten"
@@ -444,23 +473,22 @@ de:
       flair_color_placeholder: "(Optoinal) Hex-Farbwert"
       flair_preview_icon: "Vorschau-Icon"
       flair_preview_image: "Vorschaubild"
-      flair_note: "Hinweise: Ein Avatar-Hintergrund wird nur für die Hauptgruppe eines Benutzers angezeigt."
     user_action_groups:
-      '1': "Abgegebene Likes"
-      '2': "Erhaltene Likes"
-      '3': "Lesezeichen"
-      '4': "Themen"
-      '5': "Beiträge"
-      '6': "Antworten"
-      '7': "Erwähnungen"
-      '9': "Zitate"
-      '11': "Änderungen"
-      '12': "Gesendete Objekte"
-      '13': "Posteingang"
-      '14': "Ausstehend"
+      "1": "Abgegebene Likes"
+      "2": "Erhaltene Likes"
+      "3": "Lesezeichen"
+      "4": "Themen"
+      "5": "Beiträge"
+      "6": "Antworten"
+      "7": "Erwähnungen"
+      "9": "Zitate"
+      "11": "Änderungen"
+      "12": "Gesendete Objekte"
+      "13": "Posteingang"
+      "14": "Ausstehend"
     categories:
       all: "Alle Kategorien"
-      all_subcategories: "alle"
+      all_subcategories: "alle in %{categoryName}"
       no_subcategory: "keine"
       category: "Kategorie"
       category_list: "Kategorieliste anzeigen"
@@ -479,11 +507,11 @@ de:
       toggle_ordering: "Reihenfolge ändern"
       subcategories: "Unterkategorien"
       topic_sentence:
-        one: "1 Thema"
-        other: "%{count} Themen"
+        one: 1 Thema
+        other: '%{count} Themen'
       topic_stat_sentence:
-        one: "1 neues Thema seit 1 %{unit}."
-        other: "%{count} neue Themen seit 1 %{unit}."
+        one: 1 neues Thema seit 1 %{unit}.
+        other: '%{count} neue Themen seit 1 %{unit}.'
     ip_lookup:
       title: IP-Adressen-Abfrage
       hostname: Hostname
@@ -518,6 +546,7 @@ de:
       activity_stream: "Aktivität"
       preferences: "Einstellungen"
       expand_profile: "Erweitern"
+      collapse_profile: "Zuklappen"
       bookmarks: "Lesezeichen"
       bio: "Über mich"
       invited_by: "Eingeladen von"
@@ -525,14 +554,15 @@ de:
       notifications: "Benachrichtigungen"
       statistics: "Statistiken"
       desktop_notifications:
-        label: "Desktop-Benachrichtigungen"
+        label: "Live-Benachrichtigungen"
         not_supported: "Dieser Browser unterstützt leider keine Benachrichtigungen."
         perm_default: "Benachrichtigungen einschalten"
         perm_denied_btn: "Zugriff verweigert"
         perm_denied_expl: "Du hast das Anzeigen von Benachrichtigungen verboten. Aktiviere die Benachrichtigungen über deine Browser-Einstellungen."
         disable: "Benachrichtigungen deaktivieren"
         enable: "Benachrichtigungen aktivieren"
-        each_browser_note: "Hinweis: Du musst diese Einstellung in jedem von dir verwendeten Browser ändern."
+        each_browser_note: "Hinweis: Du musst diese Einstellung in jedem Browser einzeln ändern."
+        consent_prompt: "Möchtest du Live-Benachrichtigungen erhalten, wenn jemand auf deine Beiträge antwortet?"
       dismiss: 'Alles gelesen'
       dismiss_notifications: "Alles gelesen"
       dismiss_notifications_tooltip: "Alle ungelesenen Benachrichtigungen als gelesen markieren"
@@ -540,7 +570,7 @@ de:
       disable_jump_reply: "Springe nicht zu meinem Beitrag, nachdem ich geantwortet habe"
       dynamic_favicon: "Zeige die Anzahl der neuen und geänderten Themen im Browser-Symbol an"
       theme_default_on_all_devices: "Übernehme dieses Theme für alle meine Geräte."
-      allow_private_messages: "Erlaube anderen Benutzern, mir Nachrichten zu schicken"
+      allow_private_messages: "Anderen Benutzern erlauben, mir persönliche Nachrichten zu schicken"
       external_links_in_new_tab: "Öffne alle externen Links in einem neuen Tab"
       enable_quoting: "Aktiviere Zitatantwort mit dem hervorgehobenen Text"
       change: "ändern"
@@ -564,9 +594,10 @@ de:
         individual_no_echo: "Sende für alle fremden Beträge eine Email"
         many_per_day: "Sende mir für jeden neuen Beitrag eine E-Mail (etwa {{dailyEmailEstimate}} pro Tag)"
         few_per_day: "Sende mir für jeden neuen Beitrag eine E-Mail (etwa 2 pro Tag)"
+        warning: "Mailinglisten-Modus aktiviert. Einstellungen zur Benachrichtigung per E-Mail werden nicht berücksichtigt."
       tag_settings: "Schlagwörter"
       watched_tags: "Beobachtet"
-      watched_tags_instructions: "Du wirst automatisch alle neuen Themen imit diesen Schlagwörtern beobachten. Du wirst über alle neuen Beiträge und Themen benachrichtigt und die Anzahl der neuen Antworten wird bei den betroffenen Themen angezeigt."
+      watched_tags_instructions: "Du wirst automatisch alle neuen Themen mit diesen Schlagwörtern beobachten. Du wirst über alle neuen Beiträge und Themen benachrichtigt und die Anzahl der neuen Antworten wird bei den betroffenen Themen angezeigt."
       tracked_tags: "Verfolgt"
       tracked_tags_instructions: "Du wirst automatisch alle Themen mit diesen Schlagwörtern verfolgen. Die Anzahl der neuen Antworten wird bei den betroffenen Themen angezeigt."
       muted_tags: "Stummgeschaltet"
@@ -585,12 +616,12 @@ de:
       delete_account: "Lösche mein Benutzerkonto"
       delete_account_confirm: "Möchtest du wirklich dein Benutzerkonto permanent löschen? Diese Aktion kann nicht rückgängig gemacht werden!"
       deleted_yourself: "Dein Benutzerkonto wurde erfolgreich gelöscht."
-      delete_yourself_not_allowed: "Du kannst im Moment dein Benutzerkonto nicht löschen. Kontaktiere einen Administrator, um dein Benutzerkonto löschen zu lassen."
+      delete_yourself_not_allowed: "Bitte kontaktiere das Team, wenn du möchtest, dass dein Konto gelöscht wird."
       unread_message_count: "Nachrichten"
       admin_delete: "Löschen"
       users: "Benutzer"
       muted_users: "Stummgeschaltet"
-      muted_users_instructions: "Alle Benachrichtigungen von diesem Benutzer unterdrücken."
+      muted_users_instructions: "Benachrichtigungen von diesen Benutzern werden unterdrückt."
       muted_topics_link: "Zeige stummgeschaltete Themen"
       watched_topics_link: "Zeige beobachtete Themen"
       tracked_topics_link: "Zeige verfolgte Themen"
@@ -619,6 +650,7 @@ de:
         move_to_archive: "Archivieren"
         failed_to_move: "Die ausgewählten Nachrichten konnten nicht verschoben werden. Vielleicht gibt es ein Netzwerkproblem."
         select_all: "Alle auswählen"
+        tags: "Schlagwörter"
       preferences_nav:
         account: "Konto"
         profile: "Profil"
@@ -636,6 +668,19 @@ de:
         set_password: "Passwort ändern"
         choose_new: "Wähle ein neues Passwort"
         choose: "Wähle ein Passwort"
+      second_factor:
+        title: "Zwei-Faktor-Authentifizierung"
+        disable: "Zwei-Faktor-Authentifizierung deaktivieren"
+        enable: "<a href>Zwei-Faktor-Authentifizierung</a> aktivieren, um das Benutzerkonto besser zu schützen"
+        confirm_password_description: "Bitte bestätige dein Passwort um fortzufahren"
+        label: "Code"
+        enable_description: |
+          Scanne diesen QR-Code in einer unterstützten App (<a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target="_blank">Android</a> – <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8" target="_blank">iOS</a> – <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a>) und gib’ deinen Authentifizierungscode ein.
+        disable_description: "Bitte gib den Authentifizierungscode aus deiner App ein."
+        show_key_description: "Manuell eingeben"
+        extended_description: |
+          Zwei-Faktor-Authentifizierung (2FA) sichert dein Konto zusätzlich ab, indem sie zusätzlich zu deinem Passwort einen einmalig gültigen Code anfordert. Codes können auf <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target='_blank'>Android</a>-, <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8">iOS</a>- und <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a>-Geräten generiert werden.
+        oauth_enabled_warning: "Beachte bitte, dass soziale Anmelde-Methoden deaktiviert werden, sobald die Zwei-Faktor-Authentifizierung für dein Konto aktiviert ist."
       change_about:
         title: "„Über mich“ ändern"
         error: "Beim Ändern dieses Wertes ist ein Fehler aufgetreten."
@@ -677,8 +722,8 @@ de:
         authenticated: "Deine E-Mail-Adresse wurde von {{provider}} bestätigt"
         frequency_immediately: "Wir werden dir sofort eine E-Mail senden, wenn du die betroffenen Inhalte noch nicht gelesen hast."
         frequency:
-          one: "Wir werden dir nur dann eine E-Mail senden, wenn wir dich nicht innerhalb der letzten Minute gesehen haben."
-          other: "Wir werden dir nur dann eine E-Mail senden, wenn wir dich nicht innerhalb der letzten {{count}} Minuten gesehen haben."
+          one: Wir werden dir nur dann eine E-Mail senden, wenn wir dich nicht innerhalb der letzten Minute gesehen haben.
+          other: Wir werden dir nur dann eine E-Mail senden, wenn wir dich nicht innerhalb der letzten {{count}} Minuten gesehen haben.
       name:
         title: "Name"
         instructions: "dein vollständiger Name (optional)"
@@ -709,15 +754,13 @@ de:
       created: "Mitglied seit"
       log_out: "Abmelden"
       location: "Wohnort"
-      card_badge:
-        title: "Benutzerkarten-Abzeichen"
       website: "Website"
       email_settings: "E-Mail"
       like_notification_frequency:
         title: "Benachrichtigung für erhaltene Likes anzeigen"
         always: "immer"
-        first_time_and_daily: "erster Like eines Beitrags und täglich"
-        first_time: "nur erster Like eines Beitrags"
+        first_time_and_daily: "für den ersten Like sowie maximal täglich"
+        first_time: "nur für den ersten Like eines Beitrags"
         never: "nie"
       email_previous_replies:
         title: "Füge vorherige Beiträge ans Ende von E-Mails an"
@@ -740,14 +783,14 @@ de:
       other_settings: "Andere"
       categories_settings: "Kategorien"
       new_topic_duration:
-        label: "Themen als neu ansehen, wenn"
+        label: "Themen als neu anzeigen, wenn"
         not_viewed: "ich diese noch nicht betrachtet habe"
         last_here: "seit meinem letzten Besuch erstellt"
         after_1_day: "innerhalb des letzten Tages erstellt"
         after_2_days: "in den letzten 2 Tagen erstellt"
         after_1_week: "in der letzten Woche erstellt"
         after_2_weeks: "in den letzten 2 Wochen erstellt"
-      auto_track_topics: "Betrachteten Themen automatisch folgen"
+      auto_track_topics: "Betrachtete Themen automatisch folgen"
       auto_track_options:
         never: "nie"
         immediately: "sofort"
@@ -764,10 +807,10 @@ de:
         title: "Einladungen"
         user: "Eingeladener Benutzer"
         sent: "Gesendet"
-        none: "Es gibt keine ausstehenden Einladungen."
+        none: "Keine Einladungen anzuzeigen."
         truncated:
-          one: "Zeige die erste Einladung."
-          other: "Zeige die ersten {{count}} Einladungen."
+          one: Zeige die erste Einladung.
+          other: Zeige die ersten {{count}} Einladungen.
         redeemed: "Angenommene Einladungen"
         redeemed_tab: "Angenommen"
         redeemed_tab_with_count: "Angenommen ({{count}})"
@@ -814,29 +857,29 @@ de:
         time_read: "Lesezeit"
         recent_time_read: "aktuelle Lesezeit"
         topic_count:
-          one: "Thema erstellt"
-          other: "Themen erstellt"
+          one: Thema erstellt
+          other: Themen erstellt
         post_count:
-          one: "Beitrag erstellt"
-          other: "Beiträge erstellt"
+          one: Beitrag erstellt
+          other: Beiträge erstellt
         likes_given:
-          one: "gegeben"
-          other: "gegeben"
+          one: gegeben
+          other: gegeben
         likes_received:
-          one: "vergeben"
-          other: "vergeben"
+          one: vergeben
+          other: erhalten
         days_visited:
-          one: "Tag vorbeigekommen"
-          other: "Tage vorbeigekommen"
+          one: Tag vorbeigekommen
+          other: Tage vorbeigekommen
         topics_entered:
-          one: "betrachtetes Thema"
-          other: "betrachtete Themen"
+          one: betrachtetes Thema
+          other: betrachtete Themen
         posts_read:
-          one: "Beitrag gelesen"
-          other: "Beiträge gelesen"
+          one: Beitrag gelesen
+          other: Beiträge gelesen
         bookmark_count:
-          one: "Lesezeichen"
-          other: "Lesezeichen"
+          one: Lesezeichen
+          other: Lesezeichen
         top_replies: "Die besten Beiträge"
         no_replies: "Noch keine Antworten."
         more_replies: "weitere Beiträge"
@@ -862,6 +905,7 @@ de:
         header_title: "Profil. Nachrichten, Lesezeichen und Einstellungen"
       title:
         title: "Titel"
+        none: "(keiner)"
       filters:
         all: "Alle"
       stream:
@@ -904,8 +948,8 @@ de:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> hat die eingestellte Grenze für die Site von %{siteSettingRate} erreicht."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> hat die eingestellte Grenze für die Site von %{siteSettingRate} überschritten."
       rate:
-        one: "ein Fehler/%{duration}"
-        other: "%{count} Fehler/%{duration}"
+        one: ein Fehler/%{duration}
+        other: '%{count} Fehler/%{duration}'
     learn_more: "mehr erfahren…"
     all_time: 'gesamt'
     all_time_desc: 'Erstellte Themen'
@@ -977,14 +1021,26 @@ de:
       help: "E-Mail nicht angekommen? Bitte prüfe zuerst deinen Spam-Ordner. <p>Nicht sicher, welche E-Mail-Adresse du verwendet hast? Gib eine E-Mail-Adresse ein und wir werden dir sagen, ob sie hier existiert.</p><p>Falls du keinen Zugriff mehr auf die hinterlegte E-Mail-Adresse deines Kontos hast, kontaktiere bitte <a href='/about'>unser hilfsbereites Team. </a></p>"
       button_ok: "OK"
       button_help: "Hilfe"
+    email_login:
+      link_label: "Sende mir einen Anmeldelink"
+      button_label: "über E-Mail"
+      complete_username: "Sofern ein Benutzerkonto mit dem Benutzername <b>%{username}</b> existiert, solltest du in Kürze eine E-Mail mit einem Anmeldelink erhalten."
+      complete_email: "Sofern ein Benutzerkonto für <b>%{email}</b> existiert, solltest du in Kürze eine E-Mail mit einem Anmeldelink erhalten."
+      complete_username_found: "Wir haben ein Benutzerkonto mit dem Benutzername <b>%{username}</b> gefunden, du solltest in Kürze einen Anmeldelink erhalten."
+      complete_email_found: "Wir haben ein Benutzerkonto für <b>%{email}</b> erhalten, du solltest in Kürze einen Anmeldelink erhalten."
+      complete_username_not_found: "Es existiert kein Benutzerkonto mit dem Benutzername <b>%{username}</b>."
+      complete_email_not_found: "Es existiert kein Benutzerkonto für <b>%{email}</b>."
     login:
       title: "Anmelden"
       username: "Benutzername"
       password: "Passwort"
+      second_factor_title: "Zwei-Faktor-Authentifizierung"
+      second_factor_description: "Bitte gib den Authentifizierungscode aus deiner App ein:"
       email_placeholder: "E-Mail oder Benutzername"
       caps_lock_warning: "Feststelltaste ist aktiviert"
       error: "Unbekannter Fehler"
       rate_limit: "Warte bitte ein wenig, bevor du erneut versuchst dich anzumelden."
+      blank_username: "Bitte gib deine E-Mail-Adresse oder deinen Benutzernamen ein."
       blank_username_or_password: "Bitte gib deine E-Mail-Adresse oder deinen Benutzernamen und dein Passwort ein."
       reset_password: 'Passwort zurücksetzen'
       logging_in: "Anmeldung läuft…"
@@ -997,6 +1053,7 @@ de:
       not_allowed_from_ip_address: "Von dieser IP-Adresse darfst du dich nicht anmelden."
       admin_not_allowed_from_ip_address: "Von dieser IP-Adresse darfst du dich nicht als Administrator anmelden."
       resend_activation_email: "Klicke hier, um eine neue Aktivierungsmail zu schicken."
+      omniauth_disallow_totp: "Für dein Benutzerkonto ist die Zwei-Faktor-Authentifizierung aktiviert. Bitte melde dich mit deinem Passwort an."
       resend_title: "Aktivierungsmail erneut senden"
       change_email: "E-Mail-Adresse ändern"
       provide_new_email: "Gib’ eine neue Adresse an und wir senden deine Bestätigungsmail erneut."
@@ -1052,15 +1109,24 @@ de:
       categories_only: "nur Kategorien"
       categories_with_featured_topics: "Kategorien mit empfohlenen Themen"
       categories_and_latest_topics: "Kategorien und aktuelle Themen"
+      categories_and_top_topics: "Kategorien und angesagte Themen"
     shortcut_modifier_key:
       shift: 'Umschalt'
       ctrl: 'Strg'
       alt: 'Alt'
+    conditional_loading_section:
+      loading: Wird geladen…
     select_kit:
       default_header_text: Auswählen…
       no_content: Keine Treffer gefunden
       filter_placeholder: Suchen…
-      create: "Erstelle {{content}}"
+      create: "Erstelle: '{{content}}'"
+      max_content_reached:
+        one: Du kannst nur einen Eintrag auswählen.
+        other: Du kannst nur {{count}} Einträge auswählen.
+      min_content_not_reached:
+        one: Wähle mindestens einen Eintrag aus.
+        other: Wähle mindestens {{count}} Einträge aus.
     emoji_picker:
       filter_placeholder: Emoji suchen
       people: Personen
@@ -1078,6 +1144,13 @@ de:
       medium_tone: Mittlere Hautfarbe
       medium_dark_tone: Mittel-dunkle Hautfarbe
       dark_tone: Dunkle Hautfarbe
+    shared_drafts:
+      title: "Gemeinsame Vorlagen"
+      notice: "Das Thema ist nur sichtbar für die, die die <b>{{category}}</b>-Kategorie sehen können."
+      destination_category: "Ziel-Kategorie"
+      publish: "Gemeinsame Vorlage veröffentlichen"
+      confirm_publish: "Bist du sicher, dass du diese Vorlage veröffentlichten möchtest?"
+      publishing: "Thema wird veröffentlicht..."
     composer:
       emoji: "Emoji :)"
       more_emoji: "mehr…"
@@ -1096,8 +1169,8 @@ de:
       drafts_offline: "Entwürfe offline"
       group_mentioned_limit: "<b>Warnung!</b> Du erwähnst <a href='{{group_link}}'>{{group}}</a>, aber diese Gruppe hat mehr Mitglieder als der Administrator als die maximale Anzahl von {{max}} Benutzern eingestellt hat, die gleichzeitig erwähnt werden können. Keiner davon wird benachrichtigt."
       group_mentioned:
-        one: "Indem du {{group}} erwähnst, bist du dabei, <a href='{{group_link}}'>eine Person</a> zu benachrichtigen – bist du dir sicher?"
-        other: "Indem du {{group}} erwähnst, bist du dabei, <a href='{{group_link}}'>{{count}} Personen</a> zu benachrichtigen – bist du dir sicher?"
+        one: Indem du {{group}} erwähnst, bist du dabei, <a href='{{group_link}}'>eine Person</a> zu benachrichtigen – bist du dir sicher?
+        other: Indem du {{group}} erwähnst, bist du dabei, <a href='{{group_link}}'>{{count}} Personen</a> zu benachrichtigen – bist du dir sicher?
       cannot_see_mention:
         category: "Du hast {{username}} erwähnt, aber diese Person wird nicht benachrichtigt da sie keinen Zugriff auf diese Kategorie hat. Füge sie einer Gruppe hinzu die Zugriff auf diese Kategorie hat."
         private: "Du hast {{username}} erwähnt, aber diese Person wird nicht benachrichtigt da sie diese persönliche Nachricht nicht sehen kann. Lade sie zu dieser PM ein."
@@ -1110,6 +1183,7 @@ de:
         post_length: "Beitrag muss mindestens {{min}} Zeichen lang sein"
         try_like: 'Hast du schon die <i class="fa fa-heart"></i> Schaltfläche ausprobiert?'
         category_missing: "Du musst eine Kategorie auswählen"
+        tags_missing: "Du musst mindestens %{count} Schlagwörter wählen."
       save_edit: "Speichern"
       reply_original: "Auf das ursprünglichen Thema antworten"
       reply_here: "Hier antworten"
@@ -1118,6 +1192,8 @@ de:
       create_topic: "Thema erstellen"
       create_pm: "Nachricht"
       create_whisper: "Flüstern"
+      create_shared_draft: "Erstelle gemeinsame Vorlage"
+      edit_shared_draft: "Gemeinsame Vorlage bearbeiten"
       title: "Oder drücke Strg+Eingabetaste"
       users_placeholder: "Benutzer hinzufügen"
       title_placeholder: "Um was geht es in dieser Diskussion? Schreib einen kurzen Satz."
@@ -1127,6 +1203,8 @@ de:
       topic_featured_link_placeholder: "Gib einen Link, der mit dem Titel angezeigt wird."
       remove_featured_link: "Link aus Thema entfernen."
       reply_placeholder: "Schreib hier. Verwende Markdown, BBCode oder HTML zur Formatierung. Füge Bilder ein oder ziehe sie herein."
+      reply_placeholder_no_images: "Schreib hier. Verwende Markdown, BBCode oder HTML zur Formatierung."
+      reply_placeholder_choose_category: "Du musst eine Kategorie auswählen, bevor du hier schreiben kannst."
       view_new_post: "Sieh deinen neuen Beitrag an."
       saving: "Wird gespeichert"
       saved: "Gespeichert!"
@@ -1141,9 +1219,9 @@ de:
       italic_label: "K"
       italic_title: "Betonung"
       italic_text: "Betonter Text"
-      link_title: "Hyperlink"
+      link_title: "Link"
       link_description: "gib hier eine Link-Beschreibung ein"
-      link_dialog_title: "Hyperlink einfügen"
+      link_dialog_title: "Link einfügen"
       link_optional_text: "Optionaler Titel"
       link_url_placeholder: "http://example.com"
       quote_title: "Zitat"
@@ -1154,8 +1232,9 @@ de:
       upload_title: "Upload"
       upload_description: "gib hier eine Beschreibung des Uploads ein"
       olist_title: "Nummerierte Liste"
-      ulist_title: "Liste mit Aufzählungszeichen"
+      ulist_title: "Liste"
       list_item: "Listenelement"
+      toggle_direction: "Schreibrichtung wechseln"
       help: "Hilfe zur Markdown-Formatierung"
       collapse: "Editor minimieren"
       abandon: "Editor schließen und Entwurf verwerfen"
@@ -1166,14 +1245,35 @@ de:
         title: "Hast du vergessen Empfänger hinzuzufügen?"
         body: "Im Augenblick wird diese Nachricht nur an dich selbst gesendet!"
       admin_options_title: "Optionale Team-Einstellungen für dieses Thema"
+      composer_actions:
+        reply_to_post:
+          label: "Antworte auf Beitrag %{postNumber} von %{postUsername}"
+          desc: Antworte auf einen bestimmten Beitrag
+        reply_as_new_topic:
+          label: Antworte als verknüpftes Thema
+          desc: "Erstelle ein neues Thema, das auf dieses Thema verweist"
+        reply_as_private_message:
+          label: Neue Nachricht
+          desc: Erstelle eine neue Nachricht
+        reply_to_topic:
+          label: Antworte auf Thema
+          desc: "Antworte auf das Thema, nicht auf einen bestimmten Beitrag"
+        toggle_whisper:
+          label: Flüstermodus umschalten
+          desc: Geflüster ist nur für Team-Mitglieder sichtbar
+        create_topic:
+          label: "Neues Thema"
+        shared_draft:
+          label: "Gemeinsame Vrolage"
+          desc: "Entwerfe ein Thema, das nur für das Team sichtbar ist."
     notifications:
       tooltip:
         regular:
-          one: "1 nicht gesehene Benachrichtigung"
-          other: "{{count}} nicht gesehene Benachrichtigungen"
+          one: 1 nicht gesehene Benachrichtigung
+          other: '{{count}} nicht gesehene Benachrichtigungen'
         message:
-          one: "1 ungelesene Nachricht"
-          other: "{{count}} ungelesene Nachrichten"
+          one: 1 ungelesene Nachricht
+          other: '{{count}} ungelesene Nachrichten'
       title: "Benachrichtigung über @Name-Erwähnungen, Antworten auf deine Beiträge und Themen, Nachrichten, usw."
       none: "Die Benachrichtigungen können derzeit nicht geladen werden."
       empty: "Keine Benachrichtigungen gefunden."
@@ -1188,44 +1288,30 @@ de:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} und jemand anderes</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} und {{count}} andere</span> {{description}}"
+        one: <span>{{username}}, {{username2}} und jemand anderes</span> {{description}}
+        other: <span>{{username}}, {{username2}} und {{count}} andere</span> {{description}}
       private_message: "<span>{{username}}</span> {{description}}"
       invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
       invited_to_topic: "<span>{{username}}</span> {{description}}"
       invitee_accepted: "<span>{{username}}</span> hat deine Einladung angenommen"
       moved_post: "<span>{{username}}</span> hat {{description}} verschoben"
       linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "Hat '{{description}}' verliehen bekommen"
+      granted_badge: "Du hast '{{description}}' verliehen bekommen"
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>New Topic</span> {{description}}"
       group_message_summary:
-        one: "{{count}} Nachricht in deinem {{group_name}} Posteingang"
-        other: "{{count}} Nachrichten in deinem {{group_name}} Posteingang"
-      alt:
-        mentioned: "Erwähnt von"
-        quoted: "Zitiert von"
-        replied: "Geantwortet"
-        posted: "Beitrag von"
-        edited: "Beitrag bearbeitet von"
-        liked: "Gefällt dein Beitrag"
-        private_message: "Nachricht von"
-        invited_to_private_message: "Zu Unterhaltung eingeladen von"
-        invited_to_topic: "Zu Thema eingeladen von"
-        invitee_accepted: "Einladung angenommen von"
-        moved_post: "Dein Beitrag wurde verschoben von"
-        linked: "Link zu deinem Beitrag"
-        granted_badge: "Abzeichen erhalten"
-        group_message_summary: "Nachrichten im Gruppenpostfach"
-        topic_reminder: "Eine Erinnerung"
+        one: '{{count}} Nachricht in deinem {{group_name}} Posteingang'
+        other: '{{count}} Nachrichten in deinem {{group_name}} Posteingang'
       popup:
         mentioned: '{{username}} hat dich in "{{topic}}" - {{site_title}} erwähnt'
         group_mentioned: '{{username}} hat dich in "{{topic}}" - {{site_title}} erwähnt'
         quoted: '{{username}} hat dich in "{{topic}}" - {{site_title}} zitiert'
         replied: '{{username}} hat dir in "{{topic}}" - {{site_title}} geantwortet'
         posted: '{{username}} hat in "{{topic}}" - {{site_title}} einen Beitrag verfasst'
-        private_message: '{{username}} hat dir in "{{topic}}" - {{site_title}} eine Nachricht geschickt'
+        private_message: '{{username}} hat dir eine Nachricht geschickt in „{{topic}}“ – {{site_title}}'
         linked: '{{username}} hat in "{{topic}}" - {{site_title}} einen Beitrag von dir verlinkt'
+        confirm_title: 'Benachrichtigungen aktiviert – %{site_title}'
+        confirm_body: 'Erfolgreich! Benachrichtigungen wurden aktiviert.'
     upload_selector:
       title: "Ein Bild hinzufügen"
       title_with_attachments: "Ein Bild oder eine Datei hinzufügen"
@@ -1252,9 +1338,10 @@ de:
       clear_all: "Auswahl aufheben"
       too_short: "Der Suchbegriff ist zu kurz."
       result_count:
-        one: "1 Ergebnis für <span class='term'>{{term}}</span>"
-        other: "{{count}}{{plus}} Ergebnisse für <span class='term'>{{term}}</span>"
+        one: <span>1 Ergebnis für </span><span class='term'>{{term}}</span>
+        other: <span>{{count}}{{plus}} Ergebnisse für </span><span class='term'>{{term}}</span>
       title: "suche nach Themen, Beiträgen, Benutzern oder Kategorien"
+      full_page_title: "suche nach Themen oder Beiträgen"
       no_results: "Keine Ergebnisse gefunden."
       no_more_results: "Es wurde keine weiteren Ergebnisse gefunden."
       searching: "Suche …"
@@ -1285,11 +1372,12 @@ de:
         with_tags:
           label: Mit dem Schlagwort
         filters:
-          label: 'Themen/Beiträge einschränken:'
-          likes: Themen/Beiträge, die mir gefallen
+          label: "Themen/Beiträge einschränken:"
+          title: mit Treffer im Titel
+          likes: "Themen/Beiträge, die mir gefallen"
           posted: Themen mit Beiträgen von mir
-          watching: Themen, die ich beobachte
-          tracking: Themen, denen ich folge
+          watching: "Themen, die ich beobachte"
+          tracking: "Themen, denen ich folge"
           private: Beiträge in meinen Unterhaltungen
           bookmarks: Themen/Beiträge mit Lesezeichen
           first: Erste Beiträge in Themen
@@ -1301,7 +1389,7 @@ de:
           images: Mit Bild(ern)
           all_tags: Enthält alle Schlagwörter
         statuses:
-          label: 'Themen einschränken:'
+          label: "Themen einschränken:"
           open: Offene Themen
           closed: Geschlossene Themen
           archived: Archivierte Themen
@@ -1311,7 +1399,7 @@ de:
           count:
             label: Themen mit … oder mehr Beiträgen
           time:
-            label: 'Zeitraum einschränken:'
+            label: "Zeitraum einschränken:"
             before: Beiträge vor dem
             after: Beiträge nach dem
     hamburger_menu: "zu einer anderen Themenliste oder Kategorie wechseln"
@@ -1342,8 +1430,8 @@ de:
         notification_level: "Benachrichtigungen"
         choose_new_category: "Neue Kategorie für die gewählten Themen:"
         selected:
-          one: "Du hast <b>ein</b> Thema ausgewählt."
-          other: "Du hast <b>{{count}}</b> Themen ausgewählt."
+          one: Du hast <b>ein</b> Thema ausgewählt.
+          other: Du hast <b>{{count}}</b> Themen ausgewählt.
         change_tags: "Schlagwörter ersetzen"
         append_tags: "Schlagwörter hinzufügen"
         choose_new_tags: "Neue Schlagwörter für die gewählten Themen wählen:"
@@ -1375,14 +1463,12 @@ de:
         bookmarks: "Das waren alle Themen mit Lesezeichen."
         search: "Es gibt keine weiteren Suchergebnisse."
     topic:
-      unsubscribe:
-        stop_notifications: "Du wirst in Zukunft weniger Benachrichtigungen für <strong>{{title}}</strong> erhalten"
-        change_notification_state: "Dein aktueller Benachrichtigungsstatus ist"
       filter_to:
-        one: "1 Beitrag im Thema"
-        other: "{{count}} Beiträge im Thema"
+        one: 1 Beitrag im Thema
+        other: '{{count}} Beiträge im Thema'
       create: 'Neues Thema'
       create_long: 'Ein neues Thema erstellen'
+      open_draft: "Entwurf öffnen"
       private_message: 'Eine Unterhaltung beginnen'
       archive_message:
         help: 'Nachricht ins Archiv verschieben'
@@ -1390,14 +1476,17 @@ de:
       move_to_inbox:
         title: 'In Posteingang verschieben'
         help: 'Nachricht in den Posteingang zurück verschieben'
+      edit_message:
+        help: 'Bearbeite ersten Beitrag dieser Nachricht'
+        title: 'Nachricht bearbeiten'
       list: 'Themen'
       new: 'neues Thema'
       unread: 'ungelesen'
       new_topics:
-        one: '1 neues Thema'
+        one: 1 neues Thema
         other: '{{count}} neue Themen'
       unread_topics:
-        one: '1 ungelesenes Thema'
+        one: 1 ungelesenes Thema
         other: '{{count}} ungelesene Themen'
       title: 'Thema'
       invalid_access:
@@ -1411,17 +1500,17 @@ de:
         title: "Thema nicht gefunden"
         description: "Entschuldige, wir konnten dieses Thema nicht finden. Wurde es vielleicht von einem Moderator entfernt?"
       total_unread_posts:
-        one: "du hast einen ungelesenen Beitrag in diesem Thema"
-        other: "du hast {{count}} ungelesene Beiträge in diesem Thema"
+        one: du hast einen ungelesenen Beitrag in diesem Thema
+        other: du hast {{count}} ungelesene Beiträge in diesem Thema
       unread_posts:
-        one: "Du hast einen ungelesenen, alten Beitrag zu diesem Thema"
-        other: "Du hast {{count}} ungelesene, alte Beiträge zu diesem Thema"
+        one: Du hast einen ungelesenen, alten Beitrag zu diesem Thema
+        other: Du hast {{count}} ungelesene, alte Beiträge zu diesem Thema
       new_posts:
-        one: "Es gibt einen neuen Beitrag zu diesem Thema seit du es das letzte Mal gelesen hast"
-        other: "Es gibt {{count}} neue Beiträge zu diesem Thema seit du es das letzte Mal gelesen hast"
+        one: Es gibt einen neuen Beitrag zu diesem Thema seit du es das letzte Mal gelesen hast
+        other: Es gibt {{count}} neue Beiträge zu diesem Thema seit du es das letzte Mal gelesen hast
       likes:
-        one: "Es gibt ein Like in diesem Thema"
-        other: "Es gibt {{count}} Likes in diesem Thema"
+        one: Es gibt ein Like in diesem Thema
+        other: Es gibt {{count}} Likes in diesem Thema
       back_to_list: "Zurück zur Themenliste"
       options: "Themen-Optionen"
       show_links: "zeige Links innerhalb dieses Themas"
@@ -1431,7 +1520,7 @@ de:
       read_more_MF: "Du {UNREAD, plural, =0 {} one {hast <a href='/unread'>ein ungelesenes</a> Thema } other {hast <a href='/unread'># ungelesene</a> Themen } } {NEW, plural, =0 {} one { {BOTH, select, true{und } false {hast } other{}} <a href='/new'>ein neues</a> Thema} other { {BOTH, select, true{und } false {hast } other{}} <a href='/new'># neue</a> Themen} }. Oder {CATEGORY, select, true {entdecke andere Themen in {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Alle Kategorien durchsehen
       view_latest_topics: aktuelle Themen anzeigen
-      suggest_create_topic: Möchtest du ein neues Thema erstellen?
+      suggest_create_topic: "Möchtest du ein neues Thema erstellen?"
       jump_reply_up: zur vorherigen Antwort springen
       jump_reply_down: zur nachfolgenden Antwort springen
       deleted: "Das Thema wurde gelöscht"
@@ -1485,8 +1574,8 @@ de:
         auto_reminder: "Du wirst über dieses Thema erinnert %{timeLeft}."
       auto_close_title: 'Automatisches Schließen'
       auto_close_immediate:
-        one: "Der letzte Beitrag in diesem Thema ist bereits eine Stunde alt. Das Thema wird daher sofort geschlossen."
-        other: "Der letzte Beitrag in diesem Thema ist bereits %{count} Stunden alt. Das Thema wird daher sofort geschlossen."
+        one: Der letzte Beitrag in diesem Thema ist bereits eine Stunde alt. Das Thema wird daher sofort geschlossen.
+        other: Der letzte Beitrag in diesem Thema ist bereits %{count} Stunden alt. Das Thema wird daher sofort geschlossen.
       timeline:
         back: "Zurück"
         back_description: "Gehe zurück zum letzten ungelesenen Beitrag"
@@ -1507,21 +1596,21 @@ de:
         title: Ändere wie häufig du zu diesem Thema benachrichtigt wirst
         reasons:
           mailing_list_mode: "Du hast den Mailinglisten-Modus aktiviert, daher wirst du über Antworten zu diesem Thema per E-Mail benachrichtigt"
-          '3_10': 'Du wirst Benachrichtigungen erhalten, weil du ein Schlagwort an diesem Thema beobachtest.'
-          '3_6': 'Du wirst Benachrichtigungen erhalten, weil du diese Kategorie beobachtest.'
-          '3_5': 'Du wirst Benachrichtigungen erhalten, weil dieses Thema automatisch von dir beobachtet wird.'
-          '3_2': 'Du wirst Benachrichtigungen erhalten, weil du dieses Thema beobachtest.'
-          '3_1': 'Du wirst Benachrichtigungen erhalten, weil du dieses Thema erstellt hast.'
-          '3': 'Du wirst Benachrichtigungen erhalten, weil du dieses Thema beobachtest.'
-          '2_8': 'Du wirst eine Anzahl neuer Antworten sehen, weil du diese Kategorie verfolgst.'
-          '2_4': 'Du wirst eine Anzahl neuer Antworten sehen, weil du einen Beitrag in diesem Thema geschrieben hast.'
-          '2_2': 'Du wirst eine Anzahl neuer Antworten sehen, weil du dieses Thema verfolgst.'
-          '2': 'Du wirst eine Anzahl neuer Antworten sehen, weil du <a href="/u/{{username}}/preferences">dieses Thema gelesen hast</a>.'
-          '1_2': 'Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet.'
-          '1': 'Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet.'
-          '0_7': 'Du ignorierst alle Benachrichtigungen dieser Kategorie.'
-          '0_2': 'Du ignorierst alle Benachrichtigungen dieses Themas.'
-          '0': 'Du ignorierst alle Benachrichtigungen dieses Themas.'
+          "3_10": 'Du wirst Benachrichtigungen erhalten, weil du ein Schlagwort an diesem Thema beobachtest.'
+          "3_6": 'Du wirst Benachrichtigungen erhalten, weil du diese Kategorie beobachtest.'
+          "3_5": 'Du wirst Benachrichtigungen erhalten, weil dieses Thema automatisch von dir beobachtet wird.'
+          "3_2": 'Du wirst Benachrichtigungen erhalten, weil du dieses Thema beobachtest.'
+          "3_1": 'Du wirst Benachrichtigungen erhalten, weil du dieses Thema erstellt hast.'
+          "3": 'Du wirst Benachrichtigungen erhalten, weil du dieses Thema beobachtest.'
+          "2_8": 'Du wirst eine Anzahl neuer Antworten sehen, weil du diese Kategorie verfolgst.'
+          "2_4": 'Du wirst eine Anzahl neuer Antworten sehen, weil du einen Beitrag in diesem Thema geschrieben hast.'
+          "2_2": 'Du wirst eine Anzahl neuer Antworten sehen, weil du dieses Thema verfolgst.'
+          "2": 'Du wirst eine Anzahl neuer Antworten sehen, weil du <a href="/u/{{username}}/preferences">dieses Thema gelesen hast</a>.'
+          "1_2": 'Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet.'
+          "1": 'Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet.'
+          "0_7": 'Du ignorierst alle Benachrichtigungen dieser Kategorie.'
+          "0_2": 'Du ignorierst alle Benachrichtigungen dieses Themas.'
+          "0": 'Du ignorierst alle Benachrichtigungen dieses Themas.'
         watching_pm:
           title: "Beobachten"
           description: "Du wirst über jeden neuen Beitrag in dieser Unterhaltung benachrichtigt und die Anzahl der neuen Beiträge wird angezeigt."
@@ -1561,7 +1650,7 @@ de:
         visible: "Sichtbar machen"
         reset_read: "„Gelesen“ zurücksetzen"
         make_public: "Umwandeln in öffentliches Thema"
-        make_private: "Umwandeln in Nachricht"
+        make_private: "in Nachricht umwandeln"
       feature:
         pin: "Thema anheften"
         unpin: "Thema loslösen"
@@ -1594,8 +1683,8 @@ de:
         pin_validation: "Ein Datum wird benötigt um diesen Beitrag anzuheften."
         not_pinned: "Es sind in {{categoryLink}} keine Themen angeheftet."
         already_pinned:
-          one: "Momentan in {{categoryLink}} angeheftete Themen: <strong class='badge badge-notification unread'>1</strong>"
-          other: "Momentan in {{categoryLink}} angeheftete Themen: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: 'Momentan in {{categoryLink}} angeheftete Themen: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Momentan in {{categoryLink}} angeheftete Themen: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         pin_globally: "Dieses Thema am Anfang aller Themenlisten anzeigen bis"
         confirm_pin_globally: "Es gibt bereits {{count}} global angeheftete Themen. Zu viele angeheftete Themen könnten neue und unbekannte Benutzer leicht überwältigen. Willst du wirklich noch ein weiteres Thema global anheften?"
         unpin_globally: "Dieses Thema vom Anfang aller Themenlisten loslösen."
@@ -1603,8 +1692,8 @@ de:
         global_pin_note: "Benutzer können das Thema für sich selbst loslösen."
         not_pinned_globally: "Es sind keine Themen global angeheftet."
         already_pinned_globally:
-          one: "Momentan global angeheftete Themen: <strong class='badge badge-notification unread'>1</strong>"
-          other: "Momentan global angeheftete Themen: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: 'Momentan global angeheftete Themen: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Momentan global angeheftete Themen: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         make_banner: "Macht das Thema zu einem Ankündigungsbanner, welcher am Anfang aller Seiten angezeigt wird."
         remove_banner: "Entfernt das Ankündigungsbanner vom Anfang aller Seiten."
         banner_note: "Benutzer können das Ankündigungsbanner schließen und so für sich selbst dauerhaft ausblenden. Es kann zu jeder Zeit höchstens ein Thema ein Banner sein."
@@ -1641,8 +1730,8 @@ de:
       login_reply: 'Anmelden, um zu antworten'
       filters:
         n_posts:
-          one: "1 Beitrag"
-          other: "{{count}} Beiträge"
+          one: 1 Beitrag
+          other: '{{count}} Beiträge'
         cancel: "Filter entfernen"
       split_topic:
         title: "In neues Thema verschieben"
@@ -1650,15 +1739,15 @@ de:
         topic_name: "Bezeichnung des neuen Themas"
         error: "Beim Verschieben der Beiträge ins neue Thema ist ein Fehler aufgetreten."
         instructions:
-          one: "Du bist dabei, ein neues Thema zu erstellen und den ausgewählten Beitrag dorthin zu verschieben."
-          other: "Du bist dabei, ein neues Thema zu erstellen und die <b>{{count}}</b> ausgewählten Beiträge dorthin zu verschieben."
+          one: Du bist dabei, ein neues Thema zu erstellen und den ausgewählten Beitrag dorthin zu verschieben.
+          other: Du bist dabei, ein neues Thema zu erstellen und die <b>{{count}}</b> ausgewählten Beiträge dorthin zu verschieben.
       merge_topic:
         title: "In ein vorhandenes Thema verschieben"
         action: "in ein vorhandenes Thema verschieben"
         error: "Beim Verschieben der Beiträge in das Thema ist ein Fehler aufgetreten."
         instructions:
-          one: "Bitte wähle das Thema, in welches du den Beitrag verschieben möchtest."
-          other: "Bitte wähle das Thema, in welches du die <b>{{count}}</b> Beiträge verschieben möchtest."
+          one: Bitte wähle das Thema, in welches du den Beitrag verschieben möchtest.
+          other: Bitte wähle das Thema, in welches du die <b>{{count}}</b> Beiträge verschieben möchtest.
       merge_posts:
         title: "Ausgewählte Beiträge zusammenführen"
         action: "ausgewählte Beiträge zusammenführen"
@@ -1670,9 +1759,9 @@ de:
         label: "Neuer Eigentümer der Beiträge"
         placeholder: "Benutzername des neuen Eigentümers"
         instructions:
-          one: "Bitte wähle den neuen Eigentümer für den Beitrag von <b>{{old_user}}</b>."
-          other: "Bitte wähle den neuen Eigentümer für {{count}} Beiträge von <b>{{old_user}}</b>."
-        instructions_warn: "Bitte beachte, dass alle Benachrichtigungen für diesen Beitrag nicht rückwirkend auf den neuen Benutzer übertragen werden.<br>Warnung: Aktuell werden keine Daten, die mit dem Beitrag zusammenhängen an den neuen Benutzer übertragen. Mit Bedacht verwenden."
+          one: Bitte wähle den neuen Eigentümer für den Beitrag von <b>{{old_user}}</b>.
+          other: Bitte wähle den neuen Eigentümer für {{count}} Beiträge von <b>{{old_user}}</b>.
+        instructions_warn: "Bitte beachte, dass alle Benachrichtigungen für diesen Beitrag nicht rückwirkend auf den neuen Benutzer übertragen werden."
       change_timestamp:
         title: "Zeitstempel ändern…"
         action: "Erstelldatum ändern"
@@ -1702,8 +1791,6 @@ de:
           one: Du hast <b>1</b> Beitrag ausgewählt.
           other: Du hast <b>{{count}}</b> Beiträge ausgewählt.
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Zitat"
       edit: "<i class='fa fa-pencil'></i> {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Grund: "
@@ -1717,26 +1804,28 @@ de:
       show_full: "Zeige ganzen Beitrag"
       show_hidden: 'Versteckte Inhalte anzeigen.'
       deleted_by_author:
-        one: "(Beitrag wurde vom Autor zurückgezogen und wird automatisch in %{count} Stunde gelöscht, sofern dieser Beitrag nicht gemeldet wird)"
-        other: "(Beitrag wurde vom Autor zurückgezogen und wird automatisch in %{count} Stunden gelöscht, sofern dieser Beitrag nicht gemeldet wird)"
+        one: (Beitrag wurde vom Autor zurückgezogen und wird automatisch in %{count} Stunde gelöscht, sofern dieser Beitrag nicht gemeldet wird)
+        other: (Beitrag wurde vom Autor zurückgezogen und wird automatisch in %{count} Stunden gelöscht, sofern dieser Beitrag nicht gemeldet wird)
+      collapse: "zuklappen"
       expand_collapse: "erweitern/minimieren"
+      locked: "Ein Team-Mitglied hat diesen Beitrag für die weitere Bearbeitung gesperrt"
       gap:
-        one: "einen versteckten Beitrag anzeigen"
-        other: "{{count}} versteckte Beiträge anzeigen"
+        one: einen versteckten Beitrag anzeigen
+        other: '{{count}} versteckte Beiträge anzeigen'
       unread: "Beitrag ist ungelesen"
       has_replies:
-        one: "{{count}} Antwort"
-        other: "{{count}} Antworten"
+        one: '{{count}} Antwort'
+        other: '{{count}} Antworten'
       has_likes:
-        one: "{{count}} Like"
-        other: "{{count}} Likes"
+        one: '{{count}} Like'
+        other: '{{count}} Likes'
       has_likes_title:
-        one: "dieser Beitrag gefällt 1 Person"
-        other: "dieser Beitrag gefällt {{count}} Personen"
+        one: dieser Beitrag gefällt 1 Person
+        other: dieser Beitrag gefällt {{count}} Personen
       has_likes_title_only_you: "dir gefällt dieser Beitrag"
       has_likes_title_you:
-        one: "dir und einer weiteren Person gefällt dieser Beitrag"
-        other: "dir und {{count}} weiteren Personen gefällt dieser Beitrag"
+        one: dir und einer weiteren Person gefällt dieser Beitrag
+        other: dir und {{count}} weiteren Personen gefällt dieser Beitrag
       errors:
         create: "Entschuldige, es gab einen Fehler beim Anlegen des Beitrags. Bitte versuche es noch einmal."
         edit: "Entschuldige, es gab einen Fehler beim Bearbeiten des Beitrags. Bitte versuche es noch einmal."
@@ -1776,11 +1865,11 @@ de:
         delete_replies:
           confirm: "Möchtest du auch die Antworten auf diese Beiträge löschen?"
           direct_replies:
-            one: "Ja, und eine direkte Antwort"
-            other: "Ja, und {{count}} direkte Antworten"
+            one: Ja, und eine direkte Antwort
+            other: Ja, und {{count}} direkte Antworten
           all_replies:
-            one: "Ja, und eine Antwort"
-            other: "Ja, und {{count}} Antworten"
+            one: Ja, und eine Antwort
+            other: Ja, und {{count}} Antworten
           just_the_post: "Nein, nur diesen Beitrag"
         admin: "Administrative Aktionen"
         wiki: "Wiki erstellen"
@@ -1790,11 +1879,16 @@ de:
         rebake: "HTML erneuern"
         unhide: "Einblenden"
         change_owner: "Eigentümer ändern"
+        grant_badge: "Abzeichen verleihen"
+        lock_post: "Beitrag sperren"
+        lock_post_description: "verhindern, dass der Autor den Beitrag bearbeitet"
+        unlock_post: "Beitrag entsperren"
+        unlock_post_description: "erlaube, dass der Autor den Beitrag bearbeitet"
       actions:
         flag: 'Melden'
         defer_flags:
-          one: "Meldung ignorieren"
-          other: "Meldungen ignorieren"
+          one: Meldung ignorieren
+          other: Meldungen ignorieren
         undo:
           off_topic: "Meldung widerrufen"
           spam: "Meldung widerrufen"
@@ -1811,8 +1905,8 @@ de:
           bookmark: "hat/haben ein Lesezeichen gesetzt"
           like: "gefällt dies"
           like_capped:
-            one: "und {{count}} anderen gefällt das"
-            other: "und {{count}} anderen gefällt das"
+            one: und {{count}} anderen gefällt das
+            other: und {{count}} anderen gefällt das
           vote: "hat/haben dafür gestimmt"
         by_you:
           off_topic: "Du hast das als „am Thema vorbei“ gemeldet"
@@ -1825,62 +1919,62 @@ de:
           vote: "Du hast für diesen Beitrag gestimmt"
         by_you_and_others:
           off_topic:
-            one: "Du und eine weitere Person haben das als „am Thema vorbei“ gemeldet"
-            other: "Du und {{count}} weitere Personen haben das als „am Thema vorbei“ gemeldet"
+            one: Du und eine weitere Person haben das als „am Thema vorbei“ gemeldet
+            other: Du und {{count}} weitere Personen haben das als „am Thema vorbei“ gemeldet
           spam:
-            one: "Du und eine weitere Person haben das als Spam gemeldet"
-            other: "Du und {{count}} weitere Personen haben das als Spam gemeldet"
+            one: Du und eine weitere Person haben das als Spam gemeldet
+            other: Du und {{count}} weitere Personen haben das als Spam gemeldet
           inappropriate:
-            one: "Du und eine weitere Person haben das als Unangemessen gemeldet"
-            other: "Du und {{count}} weitere Personen haben das als Unangemessen gemeldet"
+            one: Du und eine weitere Person haben das als Unangemessen gemeldet
+            other: Du und {{count}} weitere Personen haben das als Unangemessen gemeldet
           notify_moderators:
-            one: "Du und eine weitere Person haben dies den Moderatoren gemeldet"
-            other: "Du und {{count}} weitere Personen haben dies den Moderatoren gemeldet"
+            one: Du und eine weitere Person haben dies den Moderatoren gemeldet
+            other: Du und {{count}} weitere Personen haben dies den Moderatoren gemeldet
           notify_user:
-            one: "Du und eine weitere Person haben diesem Benutzer eine Nachricht gesendet"
-            other: "Du und {{count}} weitere Personen haben diesem Benutzer eine Nachricht gesendet"
+            one: Du und eine weitere Person haben diesem Benutzer eine Nachricht gesendet
+            other: Du und {{count}} weitere Personen haben diesem Benutzer eine Nachricht gesendet
           bookmark:
-            one: "Du und eine weitere Person haben bei diesem Beitrag ein Lesezeichen gesetzt"
-            other: "Du und {{count}} weitere Personen haben bei diesem Beitrag ein Lesezeichen gesetzt"
+            one: Du und eine weitere Person haben bei diesem Beitrag ein Lesezeichen gesetzt
+            other: Du und {{count}} weitere Personen haben bei diesem Beitrag ein Lesezeichen gesetzt
           like:
-            one: "Dir und einer weiteren Person gefällt dieser Beitrag"
-            other: "Dir und {{count}} weiteren Personen gefällt dieser Beitrag"
+            one: Dir und einer weiteren Person gefällt dieser Beitrag
+            other: Dir und {{count}} weiteren Personen gefällt dieser Beitrag
           vote:
-            one: "Du und eine weitere Person haben für diesen Beitrag gestimmt"
-            other: "Du und {{count}} weitere Personen haben für diesen Beitrag gestimmt"
+            one: Du und eine weitere Person haben für diesen Beitrag gestimmt
+            other: Du und {{count}} weitere Personen haben für diesen Beitrag gestimmt
         by_others:
           off_topic:
-            one: "Eine Person hat das als „am Thema vorbei“ gemeldet"
-            other: "{{count}} Personen haben das als „am Thema vorbei“ gemeldet"
+            one: Eine Person hat das als „am Thema vorbei“ gemeldet
+            other: '{{count}} Personen haben das als „am Thema vorbei“ gemeldet'
           spam:
-            one: "Eine Person hat das als Spam gemeldet"
-            other: "{{count}} Personen haben das als Spam gemeldet"
+            one: Eine Person hat das als Spam gemeldet
+            other: '{{count}} Personen haben das als Spam gemeldet'
           inappropriate:
-            one: "Eine Person hat das als Unangemessen gemeldet"
-            other: "{{count}} Personen haben das als Unangemessen gemeldet"
+            one: Eine Person hat das als Unangemessen gemeldet
+            other: '{{count}} Personen haben das als Unangemessen gemeldet'
           notify_moderators:
-            one: "Eine Person hat dies den Moderatoren gemeldet"
-            other: "{{count}} Personen haben dies den Moderatoren gemeldet"
+            one: Eine Person hat dies den Moderatoren gemeldet
+            other: '{{count}} Personen haben dies den Moderatoren gemeldet'
           notify_user:
-            one: "Eine Person hat diesem Benutzer eine Nachricht gesendet"
-            other: "{{count}} Personen haben diesem Benutzer eine Nachricht gesendet"
+            one: Eine Person hat diesem Benutzer eine Nachricht gesendet
+            other: '{{count}} Personen haben diesem Benutzer eine Nachricht gesendet'
           bookmark:
-            one: "Eine Person hat bei diesem Beitrag ein Lesezeichen gesetzt"
-            other: "{{count}} Personen haben bei diesem Beitrag ein Lesezeichen gesetzt"
+            one: Eine Person hat bei diesem Beitrag ein Lesezeichen gesetzt
+            other: '{{count}} Personen haben bei diesem Beitrag ein Lesezeichen gesetzt'
           like:
-            one: "Einer Person gefällt dieser Beitrag"
-            other: "{{count}} Personen gefällt dieser Beitrag"
+            one: Einer Person gefällt dieser Beitrag
+            other: '{{count}} Personen gefällt dieser Beitrag'
           vote:
-            one: "Eine Person hat für diesen Beitrag gestimmt"
-            other: "{{count}} Personen haben für diesen Beitrag gestimmt"
+            one: Eine Person hat für diesen Beitrag gestimmt
+            other: '{{count}} Personen haben für diesen Beitrag gestimmt'
       delete:
         confirm:
-          one: "Möchtest du wirklich diesen Beitrag löschen?"
-          other: "Möchtest du wirklich diese {{count}} Beiträge löschen?"
+          one: Möchtest du wirklich diesen Beitrag löschen?
+          other: Möchtest du wirklich diese {{count}} Beiträge löschen?
       merge:
         confirm:
-          one: "Möchtest du diese Beiträge wirklich zusammenführen?"
-          other: "Möchtest du diese {{count}} Beiträge wirklich zusammenführen?"
+          one: Möchtest du diese Beiträge wirklich zusammenführen?
+          other: Möchtest du diese {{count}} Beiträge wirklich zusammenführen?
       revisions:
         controls:
           first: "Erste Überarbeitung"
@@ -1963,7 +2057,7 @@ de:
       email_in_disabled: "Das Erstellen von neuen Themen per E-Mail ist in den Website-Einstellungen deaktiviert. Um das Erstellen von neuen Themen per E-Mail zu erlauben,"
       email_in_disabled_click: 'aktiviere die Einstellung „email in“.'
       mailinglist_mirror: "Kategorie spiegelt eine Mailingliste"
-      suppress_from_homepage: "Löse diese Kategorie von der Startseite."
+      suppress_from_latest: "Unterdrücke die Kategorie bei den aktuellen Themen"
       show_subcategory_list: "Zeige Liste von Unterkategorien oberhalb von Themen in dieser Kategorie"
       num_featured_topics: "Anzahl der Themen, die auf der Kategorien-Seite angezeigt werden"
       subcategory_num_featured_topics: "Anzahl beworbener Themen, die auf der Seite der übergeordneten Kategorie angezeigt werden:"
@@ -1980,6 +2074,7 @@ de:
       default_position: "Standardposition"
       position_disabled: "Kategorien werden in der Reihenfolge der Aktivität angezeigt. Um die Reihenfolge von Kategorien in Listen zu steuern,"
       position_disabled_click: 'aktiviere die Einstellung „fixed category positions“.'
+      minimum_required_tags: 'Minimal Anzahl an Schlagwörtern, die ein Thema erfordert'
       parent: "Übergeordnete Kategorie"
       notifications:
         watching:
@@ -2037,14 +2132,14 @@ de:
       custom_placeholder_notify_moderators: "Bitte lass uns wissen, was genau dich beunruhigt. Verweise, wenn möglich, auf relevante Links und Beispiele."
       custom_message:
         at_least:
-          one: "gib mindestens ein Zeichen ein"
-          other: "gib mindestens {{count}} Zeichen ein"
+          one: gib mindestens ein Zeichen ein
+          other: gib mindestens {{count}} Zeichen ein
         more:
-          one: "eine weitere…"
-          other: "{{count}} weitere…"
+          one: eine weitere…
+          other: '{{count}} weitere…'
         left:
-          one: "eine übrig"
-          other: "{{count}} übrig"
+          one: eine übrig
+          other: '{{count}} übrig'
     flagging_topic:
       title: "Danke für deine Mithilfe!"
       action: "Thema melden"
@@ -2055,13 +2150,13 @@ de:
       links_title: "Beliebte Links"
       links_shown: "mehr Links anzeigen…"
       clicks:
-        one: "1 Klick"
-        other: "%{count} Klicks"
+        one: 1 Klick
+        other: '%{count} Klicks'
     post_links:
       about: "weitere Links für diesen Beitrag aufklappen"
       title:
-        one: "ein weiterer"
-        other: "%{count} weitere"
+        one: ein weiterer
+        other: '%{count} weitere'
     topic_statuses:
       warning:
         help: "Dies ist eine offizielle Warnung."
@@ -2091,22 +2186,22 @@ de:
     original_post: "Original-Beitrag"
     views: "Aufrufe"
     views_lowercase:
-      one: "Aufruf"
-      other: "Aufrufe"
+      one: Aufruf
+      other: Aufrufe
     replies: "Antworten"
     views_long:
-      one: "dieses Thema wurde 1-mal betrachtet"
-      other: "dieses Thema wurde {{number}}-mal betrachtet"
+      one: dieses Thema wurde 1-mal betrachtet
+      other: dieses Thema wurde {{number}}-mal betrachtet
     activity: "Aktivität"
     likes: "Likes"
     likes_lowercase:
-      one: "Like"
-      other: "Likes"
+      one: Like
+      other: Likes
     likes_long: "es gibt {{number}} Likes in diesem Thema"
     users: "Benutzer"
     users_lowercase:
-      one: "Benutzer"
-      other: "Benutzer"
+      one: Benutzer
+      other: Benutzer
     category_title: "Kategorie"
     history: "Verlauf"
     changed_by: "von {{author}}"
@@ -2120,8 +2215,8 @@ de:
       latest:
         title: "Aktuell"
         title_with_count:
-          one: "Aktuell (1)"
-          other: "Aktuell ({{count}})"
+          one: Aktuell (1)
+          other: Aktuell ({{count}})
         help: "die zuletzt geänderten Themen"
       hot:
         title: "Beliebt"
@@ -2139,21 +2234,21 @@ de:
       unread:
         title: "Ungelesen"
         title_with_count:
-          one: "Ungelesen (1)"
-          other: "Ungelesen ({{count}})"
+          one: Ungelesen (1)
+          other: Ungelesen ({{count}})
         help: "Themen mit ungelesenen Beiträgen, die du derzeit beobachtest oder verfolgst"
         lower_title_with_count:
-          one: "1 ungelesenes"
-          other: "{{count}} ungelesene"
+          one: 1 ungelesenes
+          other: '{{count}} ungelesene'
       new:
         lower_title_with_count:
-          one: "1 neues"
-          other: "{{count}} neue"
+          one: 1 neues
+          other: '{{count}} neue'
         lower_title: "neu"
         title: "Neu"
         title_with_count:
-          one: "Neu (1)"
-          other: "Neu ({{count}})"
+          one: Neu (1)
+          other: Neu ({{count}})
         help: "Themen, die in den letzten paar Tagen erstellt wurden"
       posted:
         title: "Meine Beiträge"
@@ -2164,8 +2259,8 @@ de:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: "{{categoryName}} (1)"
-          other: "{{categoryName}} ({{count}})"
+          one: '{{categoryName}} (1)'
+          other: '{{categoryName}} ({{count}})'
         help: "aktuelle Themen in der Kategorie {{categoryName}}"
       top:
         title: "Angesagt"
@@ -2228,6 +2323,9 @@ de:
         dismiss_new_posts: '<b>x</b>, <b>r</b> Neue/ausgewählte Beiträge ausblenden'
         dismiss_topics: '<b>x</b>, <b>t</b> Themen ausblenden'
         log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Abmelden'
+      composing:
+        title: 'Schreiben'
+        return: '<b>shift</b>+<b>c</b> Zurück zum Editor'
       actions:
         title: 'Aktionen'
         bookmark_topic: '<b>f</b> Lesezeichen hinzufügen/entfernen'
@@ -2250,24 +2348,25 @@ de:
         print: '<b>strg</b>+<b>p</b> Thema ausdrucken'
     badges:
       earned_n_times:
-        one: "Abzeichen 1-mal erhalten"
-        other: "Abzeichen %{count}-mal erhalten"
+        one: Abzeichen 1-mal erhalten
+        other: Abzeichen %{count}-mal erhalten
       granted_on: "Verliehen %{date}"
       others_count: "Andere mit diesem Abzeichen (%{count})"
       title: Abzeichen
       allow_title: "Du kannst dieses Abzeichen als Titel verwenden"
       multiple_grant: "Du kannst dieses Abzeichen mehrmals verliehen bekommen"
       badge_count:
-        one: "1 Abzeichen"
-        other: "%{count} Abzeichen"
+        one: 1 Abzeichen
+        other: '%{count} Abzeichen'
       more_badges:
-        one: "+1 weiteres"
-        other: "+%{count} weitere"
+        one: +1 weiteres
+        other: +%{count} weitere
       granted:
-        one: "1-mal verliehen"
-        other: "%{count}-mal verliehen"
+        one: 1-mal verliehen
+        other: '%{count}-mal verliehen'
       select_badge_for_title: Wähle ein Abzeichen als deinen Titel aus
-      none: "<keines>"
+      none: "(keine)"
+      successfully_granted: "%{badge} erfolgreich verliehen an %{username}"
       badge_grouping:
         getting_started:
           name: Erste Schritte
@@ -2290,6 +2389,7 @@ de:
       </p>
     tagging:
       all_tags: "Alle Schlagwörter"
+      other_tags: "Sonstige Schlagwörter"
       selector_all_tags: "Alle Schlagwörter"
       selector_no_tags: "keine Schlagwörter"
       changed: "Geänderte Schlagwörter:"
@@ -2297,8 +2397,8 @@ de:
       choose_for_topic: "optionale Schlagwörter"
       delete_tag: "Schlagwört löschen"
       delete_confirm:
-        one: "Bist du sicher, dass du dieses Schlagwort löschen und von einem zugeordneten Thema entfernen möchtest?"
-        other: "Bist du sicher, dass du dieses Schlagwort löschen und von {{count}} zugeordneten Themen entfernen möchtest?"
+        one: Bist du sicher, dass du dieses Schlagwort löschen und von einem zugeordneten Thema entfernen möchtest?
+        other: Bist du sicher, dass du dieses Schlagwort löschen und von {{count}} zugeordneten Themen entfernen möchtest?
       delete_confirm_no_topics: "Bist du sicher, dass du dieses Schlagwort löschen möchtest?"
       rename_tag: "Schlagwort umbenennen"
       rename_instructions: "Neuen Namen für das Schlagwort wählen:"
@@ -2341,6 +2441,9 @@ de:
         save: "Speichern"
         delete: "Löschen"
         confirm_delete: "Möchtest du wirklich diese Schlagwort-Gruppe löschen?"
+        everyone_can_use: "Schlagwörter können von jedem verwendet werden"
+        usable_only_by_staff: "Schlagwörter sind für jeden sichtbar, aber nur das Team kann sie benutzen"
+        visible_only_to_staff: "Schlagwörter sind nur für das Team sichtbar"
       topics:
         none:
           unread: "Du hast keine ungelesenen Themen."
@@ -2368,6 +2471,7 @@ de:
       custom_message_placeholder: "Gib deine persönliche Nachricht ein"
       custom_message_template_forum: "Hey, du solltest diesem Forum beitreten!"
       custom_message_template_topic: "Hey, ich dachte, dir könnte dieses Thema gefallen!"
+    forced_anonymous: "Aufgrund einer außergewöhnlichen Last wird dies vorübergehend so angezeigt, wie es ein nicht angemeldeter Benutzer sehen würde."
     safe_mode:
       enabled: "Der geschützte Modus ist aktiviert. Schliesse das Browserfenster um ihn zu verlassen."
   admin_js:
@@ -2378,6 +2482,8 @@ de:
       dashboard:
         title: "Übersicht"
         last_updated: "Übersicht zuletzt aktualisiert:"
+        find_old: "Suchst du das alte Dashboard?"
+        old_link: "besuche es hier"
         version: "Version"
         up_to_date: "Du verwendest die neueste Version!"
         critical_available: "Ein kritisches Update ist verfügbar."
@@ -2402,16 +2508,21 @@ de:
         space_free: "{{size}} frei"
         uploads: "Uploads"
         backups: "Backups"
+        lastest_backup: "Letztes: %{date}"
         traffic_short: "Traffic"
         traffic: "Web Requests der Applikation"
         page_views: "Seitenaufrufe"
         page_views_short: "Seitenaufrufe"
         show_traffic_report: "Zeige detaillierten Traffic-Bericht"
+        community_health: Community-Gesundheit
+        whats_new_in_discourse: "Was ist neu in Discourse?"
+        activity_metrics: Aktivitätsmetriken
         reports:
+          trend_title: "%{percent} Veränderung. Aktuell %{current}, war %{prev} in vorherigem Zeitraum."
           today: "Heute"
           yesterday: "Gestern"
-          last_7_days: "Letzte 7 Tage"
-          last_30_days: "Letzte 30 Tage"
+          last_7_days: "Letzte 7"
+          last_30_days: "Letzte 30"
           all_time: "Gesamt"
           7_days_ago: "vor 7 Tagen"
           30_days_ago: "vor 30 Tagen"
@@ -2422,6 +2533,10 @@ de:
           start_date: "Startdatum"
           end_date: "Enddatum"
           groups: "Alle Gruppen"
+          disabled: "Dieser Bericht ist deaktiviert"
+          trending_search:
+            more: '<a href="/admin/logs/search_logs">Suchprotokoll</a>'
+            disabled: 'Der Bericht über beliebte Suchen ist deaktiviert. Aktiviere <a href="/admin/site_settings/category/all_results?filter=log%20search%20queries">Suchanfragen protokollieren</a>, um die Daten zu erheben.'
       commits:
         latest_changes: "Letzte Änderungen: bitte häufig updaten!"
         by: "von"
@@ -2433,14 +2548,18 @@ de:
         moderation_history: "Moderationshistorie"
         agree: "Zustimmen"
         agree_title: "Meldung bestätigen, weil diese gültig und richtig ist"
-        agree_flag_hide_post: "Zustimmen und Beitrag verstecken"
+        agree_flag_hide_post: "Beitrag verstecken"
         agree_flag_hide_post_title: "Verstecke diesen Beitrag und sende dem Benutzer/der Benutzerin eine Nachricht mit der Bitte, ihn zu bearbeiten."
         agree_flag_restore_post: "Zustimmen und Beitrag wiederherstellen"
         agree_flag_restore_post_title: "Beitrag wiederherstellen, sodass alle Benutzer/-innen ihn sehen können."
-        agree_flag: "Zustimmen und Beitrag behalten"
+        agree_flag_suspend: "Benutzer bannen"
+        agree_flag_suspend_title: "Meldung zustimmen und Benutzer bannen."
+        agree_flag_silence: "Benutzer stummschalten"
+        agree_flag_silence_title: "Meldung zustimmen und Benutzer stummschalten."
+        agree_flag: "Beitrag behalten"
         agree_flag_title: "Meldung zustimmen und den Beitrag unbearbeitet lassen."
-        defer_flag: "Ignorieren"
-        defer_flag_title: "Entferne diese Meldung. Derzeit besteht kein Handlungsbedarf."
+        ignore_flag: "Ignorieren"
+        ignore_flag_title: "Entferne diese Meldung. Derzeit besteht kein Handlungsbedarf."
         delete: "Löschen"
         delete_title: "Lösche den Beitrag, auf den diese Meldung verweist."
         delete_post_defer_flag: "Beitrag löschen und Meldung ignorieren"
@@ -2459,6 +2578,12 @@ de:
         more: "(weitere Antworten…)"
         suspend_user: "Benutzer sperren"
         suspend_user_title: "Benutzer für diesen Beitrag sperren"
+        replies:
+          one: '[1 Antwort]'
+          other: '[%{count} Antworten]'
+        delete_replies:
+          one: Auch die %{count} Antwort auf diesen Beitrag löschen?
+          other: Auch die %{count} Antworten auf diesen Beitrag löschen?
         dispositions:
           agreed: "zugestimmt"
           disagreed: "abgelehnt"
@@ -2482,6 +2607,7 @@ de:
           type: "Art"
           users: "Benutzer"
           last_flagged: "Zuletzt gemeldet"
+          no_results: "Es gibt keine gemeldeten Themen."
         short_names:
           off_topic: "off-topic"
           inappropriate: "unangemessen"
@@ -2489,13 +2615,48 @@ de:
           notify_user: "benutzerdefiniert"
           notify_moderators: "benutzerdefiniert"
       groups:
+        new:
+          title: "Neue Gruppe"
+          create: "Erstellen"
+          name:
+            too_short: "Gruppenname ist zu kurz"
+            too_long: "Gruppenname ist zu lang"
+            checking: "Verfügbarkeit des Gruppennamens wird geprüft..."
+            available: "Gruppenname ist verfügbar"
+            not_available: "Gruppenname ist nicht verfügbar"
+            blank: "Gruppenname darf nicht leer sein"
+        bulk_add:
+          title: "Mehrere der Gruppe hinzufügen"
+          complete_users_not_added: "Diese Benutzer wurden nicht hinzugefügt (stelle sicher, dass sie ein Konto haben):"
+          paste: "Füge eine Liste an Benutzernamen oder E-Mail-Adressen ein (ein Eintrag je Zeile):"
+        add_members:
+          as_owner: "Mache Benutzer zu Eigentümern dieser Gruppe"
+        manage:
+          interaction:
+            email: E-Mail
+            incoming_email: "Benutzerdefinierte Adresse für eingehende E-Mails"
+            incoming_email_placeholder: "E-Mail-Adresse eingeben"
+            visibility: Sichtbarkeit
+            visibility_levels:
+              title: "Wer kann diese Gruppe sehen?"
+              public: "Jeder"
+              members: "Gruppenbesitzer, Mitglieder und Admins"
+              staff: "Gruppenbesitzer und Team"
+              owners: "Gruppenbesitzer und Admins"
+          membership:
+            automatic: Automatisch
+            trust_level: Vertrauensstufe
+            trust_levels_title: "Vertrauensstufe, die neuen Mitgliedern automatisch verliehen wird:"
+            trust_levels_none: "Keine"
+            automatic_membership_email_domains: "Benutzer, deren E-Mail-Domain mit einem der folgenden Listeneinträge genau übereinstimmt, werden automatisch zu dieser Gruppe hinzugefügt:"
+            automatic_membership_retroactive: "Diese Regel auch auf existierende Benutzer anwenden, um diese zur Gruppe hinzuzufügen."
+            primary_group: "Automatisch als Hauptgruppe festlegen"
+        name_placeholder: "Gruppenname, keine Leerzeichen, gleiche Regel wie beim Benutzernamen"
         primary: "Hauptgruppe"
         no_primary: "(keine Hauptgruppe)"
         title: "Gruppen"
         edit: "Gruppen bearbeiten"
         refresh: "Aktualisieren"
-        new: "Neu"
-        selector_placeholder: "Benutzername eingeben"
         about: "Hier kannst du Gruppenzugehörigkeiten und Gruppennamen bearbeiten."
         group_members: "Gruppenmitglieder"
         delete: "Löschen"
@@ -2503,22 +2664,12 @@ de:
         delete_failed: "Gruppe konnte nicht gelöscht werden. Wenn dies eine automatische Gruppe ist, kann sie nicht gelöscht werden."
         delete_owner_confirm: "Eigentümerrechte für '%{username}' entfernen?"
         add: "Hinzufügen"
-        add_members: "Mitglieder hinzufügen"
         custom: "Benutzerdefiniert"
-        bulk_complete: "Die Benutzer wurden der Gruppe hinzugefügt."
-        bulk_complete_users_not_added: "Diese Benutzer wurden nicht hinzugefügt (stelle sicher, dass sie ein Konto haben):"
-        bulk: "Mehrere der Gruppe hinzufügen"
-        bulk_paste: "Füge eine Liste an Benutzernamen oder E-Mail-Adressen ein (ein Eintrag je Zeile):"
-        bulk_select: "(wähle eine Gruppe aus)"
         automatic: "Automatisch"
-        automatic_membership_email_domains: "Benutzer, deren E-Mail-Domain mit einem der folgenden Listeneinträge genau übereinstimmt, werden automatisch zu dieser Gruppe hinzugefügt:"
-        automatic_membership_retroactive: "Diese Regel auch auf existierende Benutzer anwenden, um diese zur Gruppe hinzuzufügen."
-        default_title: "Standardtitel für alle Benutzer in dieser Gruppe"
-        primary_group: "Automatisch als primäre Gruppe festlegen"
+        default_title: "Standard-Titel"
+        default_title_description: "wird auf alle Benutzer in der Gruppe angewendet"
         group_owners: Eigentümer
         add_owners: Eigentümer hinzufügen
-        incoming_email: "Benutzerdefinierte Adresse für eingehende E-Mails"
-        incoming_email_placeholder: "E-Mail-Adresse eingeben"
         none_selected: "Wähle eine Gruppe, um loszulegen"
         no_custom_groups: "Erstelle eine neue benutzerdefinierte Gruppe"
       api:
@@ -2576,6 +2727,18 @@ de:
         user_event:
           name: "Benutzer Ereignis"
           details: "Wenn sich ein Benutzer anmeldet, abmeldet, erstellt, genehmigt oder aktualisiert wird."
+        group_event:
+          name: "Gruppen-Ereignis"
+          details: "Wenn eine Gruppe erstellt, aktualisiert oder gelöscht wird."
+        category_event:
+          name: "Kategorie-Ereignis"
+          details: "Wenn eine Kategorie erstellt, aktualisiert oder gelöscht wird."
+        tag_event:
+          name: "Schlagwort-Ereignis"
+          details: "Wenn ein Schlagwort erstellt, aktualisiert oder gelöscht wird."
+        flag_event:
+          name: "Meldung-Ereignis"
+          details: "Wenn eine Meldung erstellt, akzeptiert, abgelehnt oder ignoriert wird."
         delivery_status:
           title: "Versandstatus"
           inactive: "Inaktiv"
@@ -2585,11 +2748,11 @@ de:
           none: "Es gibt keine verwandten Ereignisse."
           redeliver: "Neu zustellen"
           incoming:
-            one: "Es gibt ein neues Ereignis"
-            other: "Es gibt {{count}} neue Ereignisse."
+            one: Es gibt ein neues Ereignis
+            other: Es gibt {{count}} neue Ereignisse.
           completed_in:
-            one: "In 1 Sekunde fertiggestellt."
-            other: "In {{count}} Sekunden fertiggestellt."
+            one: In 1 Sekunde fertiggestellt.
+            other: In {{count}} Sekunden fertiggestellt.
           request: "Request"
           response: "Response"
           redeliver_confirm: "Bist du sicher dass du denselben Payload noch einmal übertragen möchtest?"
@@ -2617,6 +2780,7 @@ de:
         change_settings: "Einstellungen ändern"
         change_settings_short: "Einstellungen"
         howto: "Wie installiere ich Plug-ins?"
+        official: "Offizielles Plugin"
       backups:
         title: "Backups"
         menu:
@@ -2640,7 +2804,7 @@ de:
           label: "Hochladen"
           title: "Eine Sicherung zu dieser Instanz hochladen"
           uploading: "Wird hochgeladen…"
-          success: "'{{filename}}' wurde erfolgreich hochgeladen."
+          success: "'{{filename}}' wurd erfolgreich hochgeladen. Die Datei wird nun verarbeitet. Es kann bis zu einer Minute dauern, bis sie in der Liste erscheint."
           error: "Beim Hochladen der Datei '{{filename}}' ist ein Fehler aufgetreten: {{message}}"
         operations:
           is_running: "Ein Vorgang läuft gerade…"
@@ -2722,6 +2886,7 @@ de:
           common: "Gemeinsam"
           desktop: "Desktop"
           mobile: "Mobil"
+          settings: "Einstellungen"
           preview: "Vorschau"
           is_default: "Theme ist standardmäßig aktiviert"
           user_selectable: "Theme kann von Benutzern ausgewählt werden"
@@ -2734,6 +2899,11 @@ de:
           add_upload: "Upload hinzufügen"
           upload_file_tip: "Wähle einen hochzuladenen Medieninhalt aus (png, woff2, usw.)"
           variable_name: "SCSS Variablen-Name:"
+          variable_name_invalid: "Ungültiger Variablenname. Nur alphanumerische Zeichen sind erlaubt. Muss mit einem Buchstaben beginnen. Muss eindeutig sein."
+          variable_name_error:
+            invalid_syntax: "Ungültiger Variablenname. Nur alphanumerische Zeichen erlaubt. Muss mit einem Buchstaben beginnen."
+            no_overwrite: "Ungültiger Variablenname. Darf keine existierende Variable überschreiben."
+            must_be_unique: "Ungültiger Variablenname. Muss eindeutig sein."
           upload: "Hochladen"
           child_themes_check: "Theme beinhaltet andere Kinder-Themes"
           css_html: "Benutzerdefiniertes CSS/HTML"
@@ -2742,6 +2912,8 @@ de:
           delete_upload_confirm: "Upload löschen? (Theme-CSS funktioniert eventuell nicht mehr!)"
           import_web_tip: "Repository mit dem Theme"
           import_file_tip: ".dcstyle.json Datei mit dem Theme"
+          is_private: "Theme ist in einem privaten Git-Repository"
+          public_key: "Gewähre dem folgenden öffentlichen Schlüssel den Zugriff auf das Repository:"
           about_theme: "Über das Theme"
           license: "Lizenz"
           component_of: "Theme ist eine Komponente von:"
@@ -2750,9 +2922,11 @@ de:
           updating: "Wird aktualisiert..."
           up_to_date: "Theme ist aktuell, zuletzt geprüft:"
           add: "Hinzufügen"
+          theme_settings: "Theme-Einstellungen"
+          no_settings: "Dieses Theme hat keine Einstellungen."
           commits_behind:
-            one: "Theme liegt 1 Commit zurück!"
-            other: "Theme liegt {{count}} Commits zurück!"
+            one: Theme liegt 1 Commit zurück!
+            other: Theme liegt {{count}} Commits zurück!
           scss:
             text: "CSS"
             title: "Gib benutzerdefiniertes CSS ein, wir akzeptieren alle gültigen CSS und SCSS-Stile"
@@ -2774,6 +2948,9 @@ de:
           body_tag:
             text: "</body>"
             title: "HTML, das vor dem </body>-Befehl eingefügt wird"
+          yaml:
+            text: "YAML"
+            title: "Definiere Theme-Einstellungen im YAML-Format"
         colors:
           select_base:
             title: "Wähle Basis-Farbschema"
@@ -2843,7 +3020,7 @@ de:
         delivery_method: "Versandmethode"
         preview_digest_desc: "Vorschau der Neuigkeiten, die als E-Mail an inaktive Nutzer gesendet werden."
         refresh: "Aktualisieren"
-        send_digest_label: "Sende das Ergebnis nach:"
+        send_digest_label: "Sende das Ergebnis an:"
         send_digest: "Senden"
         sending_email: "Sende Email..."
         format: "Format"
@@ -2935,10 +3112,13 @@ de:
             change_site_text: "Text ändern"
             suspend_user: "Benutzer sperren"
             unsuspend_user: "Benutzer entsperren"
+            removed_suspend_user: "Benutzer sperren (entfernt)"
+            removed_unsuspend_user: "Benutzer entsperren (entfernt)"
             grant_badge: "Abzeichen verleihen"
             revoke_badge: "Abzeichen entziehen"
             check_email: "E-Mail abrufen"
             delete_topic: "Thema löschen"
+            recover_topic: "Löschen rückgängig machen"
             delete_post: "Beitrag löschen"
             impersonate: "Nutzersicht"
             anonymize_user: "Benutzer anonymisieren"
@@ -2948,6 +3128,8 @@ de:
             create_category: "Kategorie erstellen"
             silence_user: "Benutzer stummschalten"
             unsilence_user: "Benutzer nicht mehr stummschalten"
+            removed_silence_user: "Benutzer stummschalten (entfernt)"
+            removed_unsilence_user: "Benutzer nicht mehr stummschalten (entfernt)"
             grant_admin: "Administration gewähren"
             revoke_admin: "Administration entziehen"
             grant_moderation: "Moderation gewähren"
@@ -2965,6 +3147,16 @@ de:
             backup_destroy: "Backup löschen"
             reviewed_post: "Geprüfter Beitrag"
             custom_staff: "plugin-spezifische Aktion"
+            post_locked: "Beitrag gesperrt"
+            post_edit: "Beitrag bearbeitet"
+            post_unlocked: "Beitrag entsperrt"
+            check_personal_message: "Nachrichten geprüft"
+            disabled_second_factor: "Zwei-Faktor-Authentifizierung deaktiviert"
+            topic_published: "Thema veröffentlicht"
+            post_approved: "Beitrag genehmigt"
+            create_badge: "Abzeichen erstellen"
+            change_badge: "Abzeichen ändern"
+            delete_badge: "Abzeichen löschen"
         screened_emails:
           title: "Gefilterte E-Mails"
           description: "Wenn jemand ein Konto erstellt, werden die folgenden E-Mail-Adressen überprüft und es wird die Anmeldung blockiert oder eine andere Aktion ausgeführt."
@@ -2996,7 +3188,7 @@ de:
             text: "Zusammenfassen"
             title: "Erzeugt neue Einträge zum Blockieren von Subnetzen, wenn mindestens 'min_ban_entries_for_roll_up' Einträge vorhanden sind."
         search_logs:
-          title: "Protokolle durchsuchen"
+          title: "Suchprotokolle"
           term: "Suchbegriff"
           searches: "Suchen"
           click_through: "Durchklicken"
@@ -3007,6 +3199,7 @@ de:
             header: "Überschrift"
             full_page: "Desktop-Seite"
             click_through_only: "Alle (nur durcklicken)"
+          header_search_results: "Suchergebnis-Kopfzeile"
         logster:
           title: "Fehlerprotokolle"
       watched_words:
@@ -3015,8 +3208,8 @@ de:
         clear_filter: "Zurücksetzen"
         show_words: "Wörter anzeigen"
         word_count:
-          one: "1 Wort"
-          other: "%{count} Wörter"
+          one: 1 Wort
+          other: '%{count} Wörter'
         actions:
           block: 'Blockieren'
           censor: 'Zensieren'
@@ -3025,7 +3218,7 @@ de:
         action_descriptions:
           block: 'Verhindert, dass Beiträge mit diesen Wörtern abgeschickt werden. Benutzer werden eine Fehlermeldung sehen, wenn sie ihren Beitrag abschicken.'
           censor: 'Erlaube Beiträge mit diesen Wörtern, aber ersetze sie mit Zeichen, die die zensierten Wörter verstecken.'
-          require_approval: 'Beitärge mit diesen Wörtern werden eine Genehmigung vom Team erfordern, bevor sie sichtbar sind.'
+          require_approval: 'Beiträge mit diesen Wörtern werden eine Genehmigung vom Team erfordern, bevor sie sichtbar sind.'
           flag: 'Erlaube Beiträge mit diesen Wörtern, aber markiere sie als unangemessen, damit Moderatoren sie überprüfen können.'
         form:
           label: 'Neues Wort:'
@@ -3033,6 +3226,7 @@ de:
           placeholder_regexp: "regulärer Ausdruck"
           add: 'Hinzufügen'
           success: 'Erfolg'
+          exists: 'Existiert bereits'
           upload: "Hochladen"
           upload_successful: "Hochladen erfolgreich. Wörter wurden hinzugefügt."
       impersonate:
@@ -3056,13 +3250,14 @@ de:
           suspended: 'Gesperrt'
           silenced: 'Stummgeschaltet'
           suspect: 'Verdächtig'
+          staged: 'Vorbereitet'
         approved: "Genehmigt?"
         approved_selected:
-          one: "Benutzer genehmigen"
-          other: "Benutzer genehmigen ({{count}})"
+          one: Benutzer genehmigen
+          other: Benutzer genehmigen ({{count}})
         reject_selected:
-          one: "Benutzer ablehnen"
-          other: "Benutzer ablehnen ({{count}})"
+          one: Benutzer ablehnen
+          other: Benutzer ablehnen ({{count}})
         titles:
           active: 'Aktive Benutzer'
           new: 'Neue Benutzer'
@@ -3078,12 +3273,13 @@ de:
           silenced: 'Stummgeschaltete Benutzer'
           suspended: 'Gesperrte Benutzer'
           suspect: 'Verdächtige Benutzer'
+          staged: 'Vorbereite Benutzer'
         reject_successful:
-          one: "Erfolgreich 1 Benutzer abgelehnt."
-          other: "Erfolgreich %{count} Benutzer abgelehnt."
+          one: Erfolgreich 1 Benutzer abgelehnt.
+          other: Erfolgreich %{count} Benutzer abgelehnt.
         reject_failures:
-          one: "Konnte 1 Benutzer nicht ablehnen."
-          other: "Konnte %{count} Benutzer nicht ablehnen."
+          one: Konnte 1 Benutzer nicht ablehnen.
+          other: Konnte %{count} Benutzer nicht ablehnen.
         not_verified: "Nicht überprüft"
         check_email:
           title: "E-Mail-Adresse des Benutzers anzeigen"
@@ -3110,6 +3306,14 @@ de:
         suspended_until: "(bis %{until})"
         cant_suspend: "Der Benutzer kann nicht gesperrt werden."
         delete_all_posts: "Lösche alle Beiträge"
+        penalty_post_actions: "Was möchtest du mit dem zugehörigen Beitrag machen?"
+        penalty_post_delete: "Beitrag löschen"
+        penalty_post_edit: "Beitrag bearbeiten"
+        penalty_post_none: "Nichts tun"
+        penalty_count: "Anzahl der Strafen"
+        clear_penalty_history:
+          title: "Lösche die Strafenhistorie"
+          description: "Benutzer mit Strafen können TL3 nicht erreichen"
         delete_all_posts_confirm_MF: "Du wirst {POSTS, plural, one {einen Beitrag} other {# Beiträge}} und {TOPICS, plural, one {ein Thema} other {# Themen}} löschen. Bist du dir sicher?"
         silence: "Stummschalten"
         unsilence: "Stummschaltung aufheben"
@@ -3134,6 +3338,9 @@ de:
         grant_moderation: 'Moderationsrechte vergeben'
         unsuspend: 'Entsperren'
         suspend: 'Sperren'
+        show_flags_received: "Erhaltene Meldungen anzeigen"
+        flags_received_by: "Erhaltene Meldungen von %{username}"
+        flags_received_none: "Dieser Benutzer hat noch keine Meldungen erhalten."
         reputation: Reputation
         permissions: Berechtigungen
         activity: Aktivität
@@ -3142,6 +3349,7 @@ de:
         private_topics_count: Private Themen
         posts_read_count: Gelesene Beiträge
         post_count: Erstelle Beiträge
+        second_factor_enabled: Zwei-Faktor-Authentifizierung aktiviert
         topics_entered: Betrachtete Themen
         flags_given_count: Gemachte Meldungen
         flags_received_count: Erhaltene Meldungen
@@ -3160,17 +3368,18 @@ de:
         delete_forbidden_because_staff: "Administratoren und Moderatoren können nicht gelöscht werden."
         delete_posts_forbidden_because_staff: "Löschen aller Beiträge von Administratoren und Moderatoren ist nicht möglich."
         delete_forbidden:
-          one: "Benutzer können nicht gelöscht werden, wenn diese Beiträge haben. Lösche zuerst all dessen Beiträge, bevor du versuchst einen Benutzer zu löschen. (Beiträge, die älter als %{count} Tag sind, können nicht gelöscht werden.)"
-          other: "Benutzer können nicht gelöscht werden, wenn diese Beiträge haben. Lösche zuerst all dessen Beiträge, bevor du versuchst einen Benutzer zu löschen. (Beiträge, die älter als %{count} Tage sind, können nicht gelöscht werden.)"
+          one: Benutzer können nicht gelöscht werden, wenn diese Beiträge haben. Lösche zuerst all dessen Beiträge, bevor du versuchst einen Benutzer zu löschen. (Beiträge, die älter als %{count} Tag sind, können nicht gelöscht werden.)
+          other: Benutzer können nicht gelöscht werden, wenn diese Beiträge haben. Lösche zuerst all dessen Beiträge, bevor du versuchst einen Benutzer zu löschen. (Beiträge, die älter als %{count} Tage sind, können nicht gelöscht werden.)
         cant_delete_all_posts:
-          one: "Nicht alle Beiträge können gelöscht werden. Einige Beiträge sind älter als %{count} Tag (die „delete_user_max_post_age“ Einstellung)."
-          other: "Nicht alle Beiträge können gelöscht werden. Einige Beiträge sind älter als %{count} Tage (die „delete_user_max_post_age“ Einstellung)."
+          one: Nicht alle Beiträge können gelöscht werden. Einige Beiträge sind älter als %{count} Tag (die „delete_user_max_post_age“ Einstellung).
+          other: Nicht alle Beiträge können gelöscht werden. Einige Beiträge sind älter als %{count} Tage (die „delete_user_max_post_age“ Einstellung).
         cant_delete_all_too_many_posts:
-          one: "Nicht alle Beiträge konnten gelöscht werden, da der Benutzer mehr als 1 Beitrag hat (die „delete_all_posts_max“ Einstellung)."
-          other: "Nicht alle Beiträge konnten gelöscht werden, da der Benutzer mehr als %{count} Beiträge hat (die „delete_all_posts_max“ Einstellung)."
+          one: Nicht alle Beiträge konnten gelöscht werden, da der Benutzer mehr als 1 Beitrag hat (die „delete_all_posts_max“ Einstellung).
+          other: Nicht alle Beiträge konnten gelöscht werden, da der Benutzer mehr als %{count} Beiträge hat (die „delete_all_posts_max“ Einstellung).
         delete_confirm: "Bist du dir SICHER, dass du diesen Benutzer löschen willst? Dies kann nicht rückgängig gemacht werden!"
         delete_and_block: "Löschen und diese E-Mail-Adresse und IP-Adresse <b>blockieren</b>"
         delete_dont_block: "Nur löschen"
+        deleting_user: "Benutzer wird gelöscht…"
         deleted: "Der Benutzer wurde gelöscht."
         delete_failed: "Beim Löschen des Benutzers ist ein Fehler aufgetreten. Stelle sicher, dass dieser Benutzer keine Beiträge mehr hat."
         send_activation_email: "Aktivierungsmail senden"
@@ -3208,8 +3417,8 @@ de:
         tl3_requirements:
           title: "Anforderungen für Vertrauensstufe 3"
           table_title:
-            one: "Innerhalb des letzten Tages:"
-            other: "In den letzten %{count} Tagen:"
+            one: 'Innerhalb des letzten Tages:'
+            other: 'In den letzten %{count} Tagen:'
           value_heading: "Wert"
           requirement_heading: "Anforderung"
           visits: "Aufrufe"
@@ -3225,6 +3434,8 @@ de:
           likes_received: "Erhaltene Likes"
           likes_received_days: "Erhaltene Likes: eindeutige Tage"
           likes_received_users: "Erhaltene Likes: eindeutige Benutzer"
+          suspended: "Gesperrt (insgesamt)"
+          silenced: "Stummgeschaltet (insgesamt)"
           qualifies: "Erfüllt die Anforderungen für Vertrauensstufe 3."
           does_not_qualify: "Erfüllt nicht die Anforderungen für Vertrauensstufe 3."
           will_be_promoted: "Wird bald befördert werden."
@@ -3283,12 +3494,14 @@ de:
         go_back: "Zurück zur Suche"
         recommended: "Wir empfehlen, dass du den folgenden Text an deine Bedürfnisse anpasst:"
         show_overriden: 'Nur geänderte Texte anzeigen'
-      site_settings:
-        show_overriden: 'Nur geänderte Einstellungen anzeigen'
-        title: 'Einstellungen'
+      settings:
+        show_overriden: 'Nur geänderte anzeigen'
         reset: 'zurücksetzen'
         none: 'keine'
+      site_settings:
+        title: 'Einstellungen'
         no_results: "Keine Ergebnisse gefunden."
+        more_than_30_results: "Es gibt mehr als 30 Ergebnisse. Bitte grenze deine Suche weiter ein oder wähle eine Kategorie aus."
         clear_filter: "Filter zurücksetzen"
         add_url: "URL hinzufügen"
         add_host: "Host hinzufügen"
@@ -3337,11 +3550,11 @@ de:
         reason_help: (ein Link zu einem Beitrag oder Thema)
         save: Speichern
         delete: Löschen
-        delete_confirm: Möchtest du wirklich dieses Abzeichen löschen?
+        delete_confirm: "Möchtest du wirklich dieses Abzeichen löschen?"
         revoke: Entziehen
         reason: Grund
         expand: Erweitern &hellip;
-        revoke_confirm: Möchtest du wirklich dieses Abzeichen entziehen?
+        revoke_confirm: "Möchtest du wirklich dieses Abzeichen entziehen?"
         edit_badges: Abzeichen bearbeiten
         grant_badge: Abzeichen verleihen
         granted_badges: Verliehene Abzeichen
@@ -3355,7 +3568,8 @@ de:
         enabled: Abzeichen aktivieren
         icon: Symbol
         image: Bild
-        icon_help: "Benutze eine Font Awesome class oder die URL eines Bildes"
+        icon_help: "Benutze eine Font Awesome class"
+        image_help: "Gebe die URL eines Bildes ein (überschreibt Symbol Feld wenn beide aktiv sind)"
         query: Abzeichen-Abfrage (SQL)
         target_posts: Abfrage betrifft Beiträge
         auto_revoke: Führe die Abfrage zum Widerruf täglich aus
@@ -3379,14 +3593,14 @@ de:
             text: "Es fehlen Beispieldaten. Das passiert, wenn die Abzeichen-Abfrage IDs von Benutzern oder Beiträgen liefert, die nicht existieren. Das kann in weiterer Folge zu unerwarteten Ergebnissen führen. Bitte überprüfe nochmals deine Abfrage."
           no_grant_count: "Es werden keine Abzeichen verliehen."
           grant_count:
-            one: "Es wird <b>1</b> Abzeichen verliehen."
-            other: "Es werden <b>%{count}</b> Abzeichen verliehen."
+            one: Es wird <b>1</b> Abzeichen verliehen.
+            other: Es werden <b>%{count}</b> Abzeichen verliehen.
           sample: "Beispiel:"
           grant:
-            with: <span class="username">%{username}</span>
-            with_post: <span class="username">%{username}</span> für Beitrag in %{link}
-            with_post_time: <span class="username">%{username}</span> für Beitrag in %{link} um <span class="time">%{time}</span>
-            with_time: <span class="username">%{username}</span> um <span class="time">%{time}</span>
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span> für Beitrag in %{link}"
+            with_post_time: "<span class=\"username\">%{username}</span> für Beitrag in %{link} um <span class=\"time\">%{time}</span>"
+            with_time: "<span class=\"username\">%{username}</span> um <span class=\"time\">%{time}</span>"
       emoji:
         title: "Emoji"
         help: "Neues Emoji hinzufügen, das für alle verfügbar sein wird. (Tipp: per Drag & Drop kannst du gleichzeitig mehrere Dateien hinzufügen)"
@@ -3432,7 +3646,7 @@ de:
         category_id: "Kategorie-ID"
         category_title: "Kategorie"
         external_url: "Externe URL"
-        delete_confirm: Möchtest du wirklich diesen Permanentlink löschen?
+        delete_confirm: "Möchtest du wirklich diesen Permanentlink löschen?"
         form:
           label: "Neu:"
           add: "Hinzufügen"
@@ -3447,8 +3661,8 @@ de:
       uploading: "Hochladen..."
       quit: "Vielleicht später"
       staff_count:
-        one: "Deine Community hat ein Team-Mitglied (du)."
-        other: "Deine Community hat %{count} Team-Mitglieder, einschließlich dir."
+        one: Deine Community hat ein Team-Mitglied (du).
+        other: Deine Community hat %{count} Team-Mitglieder, einschließlich dir.
       invites:
         add_user: "Hinzufügen"
         none_added: "Du hast bisher kein Team eingeladen. Möchtest du wirklich fortfahren?"
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index 0e4da15cb91..4a71ab2ec84 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -43,68 +43,68 @@ el:
       tiny:
         half_a_minute: "< 1λ"
         less_than_x_seconds:
-          one: "< 1δ"
-          other: "< %{count}δ"
+          one: < 1δ
+          other: < %{count}δ
         x_seconds:
-          one: "1δ"
-          other: "%{count}δ"
+          one: 1δ
+          other: '%{count}δ'
         less_than_x_minutes:
-          one: "< 1λ"
-          other: "< %{count}λ"
+          one: < 1λ
+          other: < %{count}λ
         x_minutes:
-          one: "1λ"
-          other: "%{count}λ"
+          one: 1λ
+          other: '%{count}λ'
         about_x_hours:
-          one: "1ώ"
-          other: "%{count}ώ"
+          one: 1ώ
+          other: '%{count}ώ'
         x_days:
-          one: "1η"
-          other: "%{count}η"
+          one: 1η
+          other: '%{count}η'
         x_months:
-          one: "1μην"
-          other: "%{count}μην"
+          one: 1μην
+          other: '%{count}μην'
         about_x_years:
-          one: "1χ"
-          other: "%{count}έ"
+          one: 1χ
+          other: '%{count}έ'
         over_x_years:
-          one: "> 1χ"
-          other: "> %{count}έ"
+          one: '> 1χ'
+          other: '> %{count}έ'
         almost_x_years:
-          one: "1χ"
-          other: "%{count}έ"
+          one: 1χ
+          other: '%{count}έ'
         date_month: "DD MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: "1 λεπτό"
-          other: "%{count} λεπτά"
+          one: 1 λεπτό
+          other: '%{count} λεπτά'
         x_hours:
-          one: "1 ώρα"
-          other: "%{count} ώρες"
+          one: 1 ώρα
+          other: '%{count} ώρες'
         x_days:
-          one: "1 ημέρα"
-          other: "%{count} ημέρες"
+          one: 1 ημέρα
+          other: '%{count} ημέρες'
         date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
-          one: "πριν από 1 λεπτό "
-          other: "πριν από %{count} λεπτά"
+          one: 'πριν από 1 λεπτό '
+          other: πριν από %{count} λεπτά
         x_hours:
-          one: "πριν από 1 ώρα"
-          other: "πριν από %{count} ώρες"
+          one: πριν από 1 ώρα
+          other: πριν από %{count} ώρες
         x_days:
-          one: "πριν από 1 ημέρα"
-          other: "πριν από %{count} ημέρες"
+          one: πριν από 1 ημέρα
+          other: πριν από %{count} ημέρες
       later:
         x_days:
-          one: "1 μέρα μετά"
-          other: "%{count} μέρες μετά"
+          one: 1 μέρα μετά
+          other: '%{count} μέρες μετά'
         x_months:
-          one: "ένα μήνα μετά"
-          other: "%{count} μήνες μετά"
+          one: ένα μήνα μετά
+          other: '%{count} μήνες μετά'
         x_years:
-          one: "ενα χρόνο μετά"
-          other: "%{count} χρόνια μετά"
+          one: ενα χρόνο μετά
+          other: '%{count} χρόνια μετά'
       previous_month: 'Προηγούμενος μήνας'
       next_month: 'Επόμενος μήνας'
       placeholder: ημερομηνία
@@ -118,7 +118,6 @@ el:
       email: 'στείλε αυτόν τον σύνδεσμο με email'
     action_codes:
       public_topic: "έκανε το νήμα δημόσιο στις %{when}"
-      private_topic: "έκανε το νήμα ιδιωτικό στις %{when}"
       split_topic: "διαχώρισε αυτό το νήμα %{when}"
       invited_user: "προσκάλεσε τον χρήστη %{who} στις %{when}"
       invited_group: "προσκάλεσε την ομάδα %{who} στις %{when}"
@@ -148,8 +147,6 @@ el:
     topic_admin_menu: "εργαλεία διαχείρισης νήματος"
     wizard_required: "Καλώς ήλθατε στο νέο σας Discourse! Ας αρχίσουμε με τον <a href='%{url}' data-auto-route='true'>οδηγό εγκατάστασης</a> ✨"
     emails_are_disabled: "Τα εξερχόμενα emails έχουν απενεργοποιηθεί καθολικά από κάποιον διαχειριστή. Δε θα σταλεί κανένα email."
-    bootstrap_mode_enabled: "Για να κάνουμε την έναρξη της νέα σας ιστοσελίδας ευκολότερη, βρίσκεστε σε λειτουργία εκκίνησης. Όλοι οι νέοι χρήστες θα χορηγούνται επίπεδο εμπιστοσύνης 1 και θα έχουν τις καθημερινές συνοπτικές ενημερώσεις μέσω email ενεργοποιημένες. Αυτό θα απενεργοποιηθεί αυτόματα όταν ο συνολικός αριθμός των χρηστών ξεπεράσει τους %{min_users} χρήστες."
-    bootstrap_mode_disabled: "Η λειτουργία εκκίνησης θα απενεργοποιηθεί αυτόματα στις επόμενες 24 ώρες."
     themes:
       default_description: "Προεπιλογή"
     s3:
@@ -185,8 +182,8 @@ el:
     show_help: "επιλογές"
     links: "Σύνδεσμοι"
     links_lowercase:
-      one: "Σύνδεσμος"
-      other: "σύνδεσμοι"
+      one: Σύνδεσμος
+      other: σύνδεσμοι
     faq: "Συχνές ερωτήσεις"
     guidelines: "Οδηγίες"
     privacy_policy: "Πολιτική Ιδιωτικότητας"
@@ -210,8 +207,8 @@ el:
     max_of_count: "μέγιστο {{count}}"
     alternation: "ή"
     character_count:
-      one: "{{count}} χαρακτήρα"
-      other: "{{count}} χαρακτήρες"
+      one: '{{count}} χαρακτήρα'
+      other: '{{count}} χαρακτήρες'
     suggested_topics:
       title: "Προτεινόμενα Νήματα"
       pm_title: "Προτεινόμενα Μηνύματα"
@@ -223,8 +220,6 @@ el:
       our_moderators: "Οι συντονιστές μας"
       stat:
         all_time: "Συνολικά"
-        last_7_days: "Τελευταίες 7 Ημέρες"
-        last_30_days: "Τελευταίες 30 Ημέρες"
       like_count: "Αρέσει"
       topic_count: "Νήματα"
       post_count: "Αναρτήσεις"
@@ -245,16 +240,6 @@ el:
       last_read: "αυτή είναι η τελευταία ανάρτηση που διάβασες, πάτησε για να προστεθεί σελιδοδείκτης"
       remove: "Αφαίρεση Σελιδοδείκτη"
       confirm_clear: "Είστε σίγουρος ότι θέλετε να αφαιρεθούν όλοι οι σελιδοδείκτες από αυτό το νήμα;"
-    topic_count_latest:
-      one: "{{count}} νέο ή ενημερωμένο νήμα"
-      other: "{{count}} νέα ή ενημερωμένα νήματα."
-    topic_count_unread:
-      one: "{{count}} αδιάβαστο νήμα."
-      other: "{{count}} αδιάβαστα νήματα."
-    topic_count_new:
-      one: "{{count}} νέο νήμα."
-      other: "{{count}} νέα νήματα."
-    click_to_show: "Κλικ εδώ για να τα δεις."
     preview: "προεπισκόπιση"
     cancel: "ακύρωση"
     save: "Αποθήκευση Αλλαγών"
@@ -290,16 +275,16 @@ el:
       cancel: "Ακύρωση"
       view_pending: "προβολή εκκρεμών αναρτήσεων"
       has_pending_posts:
-        one: "Αυτό το θέμα έχει <b>1</b> ανάρτηση που αναμένει έγκριση"
-        other: "Αυτό το νήμα έχει <b>{{count}}</b> αναρτήσεις που αναμένουν έγκριση"
+        one: Αυτό το θέμα έχει <b>1</b> ανάρτηση που αναμένει έγκριση
+        other: Αυτό το νήμα έχει <b>{{count}}</b> αναρτήσεις που αναμένουν έγκριση
       confirm: "Αποθήκευση Αλλαγών"
       delete_prompt: "Είστε σίγουρος πως θέλετε να διαγράψετε τον/την <b>%{username}</b>; Αυτό θα διαγράψει όλες τις αναρτήσεις και θα μπλοκάρει την διεύθυνση email καθώς και την IP διεύθυνση."
       approval:
         title: "Απαιτείται Έγκριση Ανάρτησης"
         description: "Λάβαμε την ανάρτησή σου, αλλά πρέπει πρώτα να εγκριθεί από έναν συντονιστή πριν εμφανιστεί. Παρακαλώ περιμένετε."
         pending_posts:
-          one: "Έχεις <strong>1</strong> εκκρεμή ανάρτηση."
-          other: "Έχετε <strong>{{count}}</strong> εκκρεμείς αναρτήσεις."
+          one: Έχεις <strong>1</strong> εκκρεμή ανάρτηση.
+          other: Έχετε <strong>{{count}}</strong> εκκρεμείς αναρτήσεις.
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> ανάρτησε <a href='{{topicUrl}}'>το νήμα </a>"
@@ -333,8 +318,8 @@ el:
       posts_read: "Διαβασμένο"
       posts_read_long: "Διαβασμένες Αναρτήσεις"
       total_rows:
-        one: "1 χειριστής"
-        other: "%{count} χρήστες"
+        one: 1 χειριστής
+        other: '%{count} χρήστες'
     group_histories:
       actions:
         change_group_setting: "Αλλαγή ρυθμίσεων ομάδας"
@@ -343,22 +328,6 @@ el:
         make_user_group_owner: "Κάνε ιδιοκτήτη"
         remove_user_as_group_owner: "Απέσυρε ιδιοκτήτη"
     groups:
-      logs:
-        title: "Logs"
-        when: "Πότε"
-        action: "Ενέργεια"
-        acting_user: "Ενέργεια από"
-        target_user: "Αποδέκτης"
-        subject: "Θέμα"
-        details: "Λεπτομέρειες"
-        from: "Από"
-        to: "Προς"
-      edit:
-        title: 'Επεξεργασία Ομάδας'
-        full_name: 'Πλήρες Όνομα'
-        add_members: "Προσθήκη Μελών"
-        delete_member_confirm: "Να αφαιρεθεί ο/η '%{username}' από την ομάδα '%{group}' ;"
-      name_placeholder: "Όνομα ομάδας, χωρίς κενά, ίδιοι κανόνες με τους κανόνες για το όνομα χρήστη"
       public_admission: "Επίτρεψε στους χρήστες να προσχωρήσουν στην ομάδα (Απαιτεί δημόσια ορατή ομάδα)"
       public_exit: "Επίτρεψε στους χρήστες να αποχωρήσουν από την ομάδα"
       empty:
@@ -369,13 +338,7 @@ el:
         topics: "Δεν υπάρχουν νήματα από μέλη της ομάδας."
         logs: "Δεν υπάρχουν logs για αυτή την ομάδα."
       add: "Προσθήκη"
-      join: "Συμμετοχή στην Ομάδα"
-      leave: "Αποχώρηση από την Ομάδα"
-      request: "Αίτημα Συμμετοχής στην Ομάδα"
       message: "Μήνυμα"
-      automatic_group: Αυτόματη Ομάδα
-      closed_group: Κλειστή Ομάδα
-      is_group_user: "Είσαι μέλος αυτής της ομάδας"
       allow_membership_requests: "Επιτρέψτε στα μέλη να στέλνουν αιτήματα συμμετοχής στους ιδιοκτήτες ομάδων"
       membership_request_template: "Προσαρμοσμένο πρότυπο που θα εμφανίζεται στους χρήστες όταν αποστέλλεται αίτημα συμμετοχής"
       membership_request:
@@ -384,29 +347,20 @@ el:
         reason: "Ενημέρωσε τους ιδιοκτήτες της ομάδας για τον λόγο που θέλεις να συμμετέχεις σε αυτήν"
       membership: "Συνδρομή"
       name: "Όνομα"
-      user_count: "Αριθμός Μελών"
       bio: "Σχετικά με την Ομάδα"
-      selector_placeholder: "Προσθήκη μελών"
       owner: "ιδιοκτήτης"
       index:
         title: "Ομάδες"
         empty: "Δεν υπάρχουν ορατές ομάδες."
       title:
-        one: "Ομάδα"
-        other: "Ομάδες"
+        one: Ομάδα
+        other: Ομάδες
       activity: "Δραστηριότητα"
-      members: "Μέλη"
       topics: "Νήματα"
       posts: "Αναρτήσεις"
       mentions: "Αναφορές"
       messages: "Μηνύματα"
       notification_level: "Προκαθορισμένο επίπεδο ειδοποιήσεων για μηνύματα ομάδων"
-      visibility_levels:
-        title: "Ποιος μπορεί να δει αυτή την ομάδα;"
-        public: "Όλοι"
-        members: "Ιδιοκτήτες ομάδας, μέλη και διαχειριστές"
-        staff: "Ιδιοκτήτες ομάδας και συνεργάτες"
-        owners: "Ιδιοκτήτες ομάδας και διαχειριστές"
       alias_levels:
         mentionable: "Ποιός μπορεί να @αναφέρει αυτή την ομάδα;"
         messageable: "Ποιός μπορεί να στείλει μήνυμα σε αυτή την ομάδα;"
@@ -415,9 +369,6 @@ el:
         mods_and_admins: "Μόνο συντονιστές και διαχειριστές"
         members_mods_and_admins: "Μόνο τα μέλη της ομάδας, οι συντονιστές και οι διαχειριστές"
         everyone: "Όλοι"
-      trust_levels:
-        title: "Επίπεδο εμπιστοσύνης που δίνεται αυτόματα στα μέλη όταν προστίθενται:"
-        none: "Κανένα"
       notifications:
         watching:
           title: "Επιτηρείται"
@@ -442,23 +393,21 @@ el:
       flair_color_placeholder: "(Προαιρετικό) Τιμή χρώματος Hex"
       flair_preview_icon: "Εικονίδιο Προεπισκόπησης"
       flair_preview_image: "Εικόνα Προεπισκόπησης"
-      flair_note: "Σημείωση: Το Flair θα εμφανιστεί μονο για την κύρια ομάδα του χρήστη"
     user_action_groups:
-      '1': "Αρέσει που Έδωσα"
-      '2': "Αρέσει που Έλαβα"
-      '3': "Σελιδοδείκτες"
-      '4': "Νήματα"
-      '5': "Απαντήσεις"
-      '6': "Αποκρίσεις"
-      '7': "Αναφορές"
-      '9': "Παραθέσεις"
-      '11': "Επεξεργασίες"
-      '12': "Απεσταλμένα"
-      '13': "Εισερχόμενα"
-      '14': "Εκκρεμή"
+      "1": "Αρέσει που Έδωσα"
+      "2": "Αρέσει που Έλαβα"
+      "3": "Σελιδοδείκτες"
+      "4": "Νήματα"
+      "5": "Απαντήσεις"
+      "6": "Αποκρίσεις"
+      "7": "Αναφορές"
+      "9": "Παραθέσεις"
+      "11": "Επεξεργασίες"
+      "12": "Απεσταλμένα"
+      "13": "Εισερχόμενα"
+      "14": "Εκκρεμή"
     categories:
       all: "όλες οι κατηγορίες"
-      all_subcategories: "όλα"
       no_subcategory: "κανένα"
       category: "Κατηγορία"
       category_list: "Εμφάνισε τη λίστα κατηγοριών"
@@ -477,11 +426,11 @@ el:
       toggle_ordering: "εναλλαγή ταξινόμησης"
       subcategories: "Υποκατηγορίες"
       topic_sentence:
-        one: "1 θέμα"
-        other: "%{count} νήματα"
+        one: 1 θέμα
+        other: '%{count} νήματα'
       topic_stat_sentence:
-        one: "%{count} νέο νήμα στα τελευταία %{unit}."
-        other: "%{count} νέα νήματα στα τελευταία %{unit}."
+        one: '%{count} νέο νήμα στα τελευταία %{unit}.'
+        other: '%{count} νέα νήματα στα τελευταία %{unit}.'
     ip_lookup:
       title: Αναζήτηση Διεύθυνσης IP
       hostname: Hostname
@@ -523,7 +472,6 @@ el:
       notifications: "Ειδοποιήσεις"
       statistics: "Στατιστικά"
       desktop_notifications:
-        label: "Ειδοποιήσεις Επιφάνειας Εργασίας"
         not_supported: "Οι ειδοποιήσεις δεν υποστηρίζονται από αυτό το πρόγραμμα περιήγησης. Λυπάμαι."
         perm_default: "Ενεργοποίησε τις Ειδοποιήσεις"
         perm_denied_btn: "Η άδεια απορρίφθηκε"
@@ -538,7 +486,6 @@ el:
       disable_jump_reply: "Να μην εστιάζεται η ανάρτηση μου αφού απαντήσω"
       dynamic_favicon: "Δείξε τον αριθμό νέων/ενημερωμένων νημάτων στο εικονίδιο του προγράμματος περιήγησης"
       theme_default_on_all_devices: "Αυτό να γίνει το προεπιλεγμένο θέμα σε όλες μου τις συσκευές"
-      allow_private_messages: "Επίτρεψε στους χρήστες να μου στέλνουν προσωπικά μηνύματα"
       external_links_in_new_tab: "Άνοιγε όλους τους εξωτερικούς συνδέσμους σε νέα καρτέλα"
       enable_quoting: "Το κείμενο που επισημαίνεται να παρατίθεται στην απάντηση "
       change: "αλλαγή"
@@ -583,7 +530,6 @@ el:
       delete_account: "Διαγραφή Λογαριασμού"
       delete_account_confirm: "Είσαι σίγουρος πως θέλεις να διαγράψεις μόνιμα τον λογαριασμό σου; Αυτή η πράξη είναι μη αναστρέψιμη!"
       deleted_yourself: "Ο λογαριασμός σου διαγράφηκε."
-      delete_yourself_not_allowed: "Δεν μπορείς να διαγράψεις τον λογαριασμό σου αυτή την στιγμή. Επικοινώνησε με έναν διαχειριστή για να τον διαγράψει αυτός για σένα."
       unread_message_count: "Μηνύματα"
       admin_delete: "Διαγραφή"
       users: "Χρήστες"
@@ -651,6 +597,7 @@ el:
         title: "Αλλαγή της φωτογραφίας του προφίλ σου"
         gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, που βασίζεται σε"
         gravatar_title: "Άλλαξε το άβατάρ σου στην ιστοσελίδα Gravatar "
+        gravatar_failed: "Δεν μπόρεσε να ληφθεί το Gravatar. Υπάρχει κάποιο συνδεδεμένο με αυτό το email;"
         refresh_gravatar_title: "Ανανέωσε το Gravatar σου"
         letter_based: "Εικόνα προφίλ που ανέθεσε το σύστημα"
         uploaded_avatar: "Προσαρμοσμένη εικόνα"
@@ -673,8 +620,8 @@ el:
         authenticated: "Η διεύθυνση email σου ταυτοποιήθηκε από τον πάροχο {{provider}}"
         frequency_immediately: "Θα σου στείλουμε αμέσως email, εάν δεν έχεις διαβάσει αυτό για το οποίο σου στέλνουμε το μήνυμα."
         frequency:
-          one: "Θα σου στείλουμε ηλεκτρονικό μήνυμα μόνο εάν δε σε έχουμε δει το τελευταίο λεπτό."
-          other: "Θα σου στείλουμε ηλεκτρονικό μήνυμα μόνο εάν δεν σε έχουμε δει τα τελευταία {{count}} λεπτά."
+          one: Θα σου στείλουμε ηλεκτρονικό μήνυμα μόνο εάν δε σε έχουμε δει το τελευταίο λεπτό.
+          other: Θα σου στείλουμε ηλεκτρονικό μήνυμα μόνο εάν δεν σε έχουμε δει τα τελευταία {{count}} λεπτά.
       name:
         title: "Όνομα"
         instructions: "το ονοματεπώνυμό σου (προαιρετικό)"
@@ -705,8 +652,6 @@ el:
       created: "Μέλος από"
       log_out: "Αποσύνδεση"
       location: "Τοποθεσία"
-      card_badge:
-        title: "Παράσημο Καρτέλας Χρήστη"
       website: "Ιστοσελίδα"
       email_settings: "Email"
       like_notification_frequency:
@@ -760,10 +705,9 @@ el:
         title: "Προσκλήσεις"
         user: "Προσκεκλημένος Χρήστης"
         sent: "Απεσταλμένα"
-        none: "Δεν υπάρχουν προσκλήσεις σε εκκρεμότητα για προβολή."
         truncated:
-          one: "Δείχνοντας την πρώτη πρόσκληση."
-          other: "Προβάλονται οι πρώτες {{count}} προσκλήσεις."
+          one: Δείχνοντας την πρώτη πρόσκληση.
+          other: Προβάλονται οι πρώτες {{count}} προσκλήσεις.
         redeemed: "Αποδεκτές Προσκλήσεις"
         redeemed_tab: "Αποδεκτές"
         redeemed_tab_with_count: "Αποδεκτές ({{count}})"
@@ -810,29 +754,29 @@ el:
         time_read: "χρόνος ανάγνωσης"
         recent_time_read: "πρόσφατος χρόνος ανάγνωσης"
         topic_count:
-          one: "δημιουργημένο θέμα"
-          other: "δημιουργημένα θέματα"
+          one: δημιουργημένο θέμα
+          other: δημιουργημένα θέματα
         post_count:
-          one: "δημιουργημένη ανάρτηση"
-          other: "δημιουργημένες αναρτήσεις"
+          one: δημιουργημένη ανάρτηση
+          other: δημιουργημένες αναρτήσεις
         likes_given:
-          one: "δόθηκε"
-          other: "δόθηκαν"
+          one: δόθηκε
+          other: δόθηκαν
         likes_received:
-          one: "ελήφθη"
-          other: "ελήφθησαν"
+          one: ελήφθη
+          other: ελήφθησαν
         days_visited:
-          one: "ημέρα επίσκεψης"
-          other: "ημέρες επίσκεψης"
+          one: ημέρα επίσκεψης
+          other: ημέρες επίσκεψης
         topics_entered:
-          one: "νήμα προβλήθηκε"
-          other: "νήματα προβλήθηκαν"
+          one: νήμα προβλήθηκε
+          other: νήματα προβλήθηκαν
         posts_read:
-          one: "διαβασμένη ανάρτηση"
-          other: "διαβασμένες αναρτήσεις"
+          one: διαβασμένη ανάρτηση
+          other: διαβασμένες αναρτήσεις
         bookmark_count:
-          one: "σελιδοδείκτης"
-          other: "σελιδοδείκτες"
+          one: σελιδοδείκτης
+          other: σελιδοδείκτες
         top_replies: "Κορυφαίες Απαντήσεις"
         no_replies: "Καμία απάντηση ακόμα."
         more_replies: "Περισσότερες Απαντήσεις"
@@ -900,8 +844,8 @@ el:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> έχει φτάσει το όριο των ρυθμίσεων της ιστοσελίδας το οποίο είναι %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> - <a href='%{url}' target='_blank'>%{rate}</a> υπερβαίνει το όριο των ρυθμίσεων της ιστοσελίδας το οποίο είναι %{siteSettingRate}."
       rate:
-        one: "1 σφάλματα/%{duration}"
-        other: "%{count} σφάλματα/%{duration}"
+        one: 1 σφάλματα/%{duration}
+        other: '%{count} σφάλματα/%{duration}'
     learn_more: "μάθε περισσότερα..."
     all_time: 'σύνολο'
     all_time_desc: 'συνολικά δημιουργημένα νήματα'
@@ -1056,7 +1000,6 @@ el:
       default_header_text: Επιλογή...
       no_content: Δεν βρέθηκαν αποτελέσματα
       filter_placeholder: Αναζήτηση...
-      create: "Δημιουργία {{content}}"
     emoji_picker:
       filter_placeholder: Αναζήτηση για emoji
       people: Άνθρωποι
@@ -1091,8 +1034,8 @@ el:
       similar_topics: "Το νήμα σας είναι παρόμοιο με ..."
       drafts_offline: "τοπικά πρόχειρα"
       group_mentioned:
-        one: "Αναφέροντας {{group}}, πρόκειται να λάβει ειδοποίηση <a href='{{group_link}}'> 1 άτομο</a> - είσαι βέβαιος;"
-        other: "Αναφέροντας το {{group}}, πρόκειται να ειδοποίησεις <a href='{{group_link}}'>{{count}} μέλη</a> - είσαι σίγουρος;"
+        one: Αναφέροντας {{group}}, πρόκειται να λάβει ειδοποίηση <a href='{{group_link}}'> 1 άτομο</a> - είσαι βέβαιος;
+        other: Αναφέροντας το {{group}}, πρόκειται να ειδοποίησεις <a href='{{group_link}}'>{{count}} μέλη</a> - είσαι σίγουρος;
       cannot_see_mention:
         category: "Ανέφερες το {{username}} αλλά δε θα λάβουν ειδοποίηση, επειδή δεν έχουν πρόσβαση σε αυτή την κατηγορία. Θα πρέπει να τους προσθέσεις σε μια ομάδα που έχει πρόσβαση σε αυτή την κατηγορία."
         private: "Ανέφερες {{username}} αλλά δεν θα λάβουν ειδοποίηση, επειδή δεν μπορούν να δουν αυτό το προσωπικό μήνυμα. Πρέπει να τους προσκαλέσεις σε αυτό το ΠΜ."
@@ -1173,8 +1116,8 @@ el:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} και 1 ακόμα</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} και {{count}} ακόμα</span> {{description}}"
+        one: <span>{{username}}, {{username2}} και 1 ακόμα</span> {{description}}
+        other: <span>{{username}}, {{username2}} και {{count}} ακόμα</span> {{description}}
       private_message: "<span>{{username}}</span> {{description}}"
       invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
       invited_to_topic: "<span>{{username}}</span> {{description}}"
@@ -1185,30 +1128,14 @@ el:
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>Νέο Νήμα</span> {{description}}"
       group_message_summary:
-        one: "{{count}} μήνυμα στα εισερχόμενα της ομάδας {{group_name}}"
-        other: "{{count}} μηνύματα στα εισερχόμενα της ομάδας {{group_name}} "
-      alt:
-        mentioned: "Αναφέρθηκε από"
-        quoted: "Παράθεση από "
-        replied: "Απαντήθηκε"
-        posted: "Ανάρτηση από"
-        edited: "Επεξεργασία της ανάρτησής σου από"
-        liked: "Η ανάρτησή σου έχει \"μου αρέσει\""
-        private_message: "Προσωπικό μήνυμα από"
-        invited_to_private_message: "Προσκλήθηκε σε προσωπικό μήνυμα από"
-        invited_to_topic: "Προσκλήθηκε στο νήμα από"
-        invitee_accepted: "Η πρόσκληση έγινε δεκτή από"
-        moved_post: "Η ανάρτησή σου μετακινήθηκε από"
-        linked: "Σύνδεση στην ανάρτησή σου"
-        granted_badge: "Χορηγήθηκε παράσημο"
-        group_message_summary: "Μηνύματα στα εισερχόμενα ομάδας"
+        one: '{{count}} μήνυμα στα εισερχόμενα της ομάδας {{group_name}}'
+        other: '{{count}} μηνύματα στα εισερχόμενα της ομάδας {{group_name}} '
       popup:
         mentioned: '{{username}} σε ανέφερε στο "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} σε ανέφερε στο "{{topic}}" - {{site_title}}'
         quoted: '{{username}} σε παράθεσε στο "{{topic}}" - {{site_title}}'
         replied: '{{username}} σου απάντησε στο "{{topic}}" - {{site_title}}'
         posted: '{{username}} ανάρτησε στο "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} σου έστειλε ένα προσωπικό μήνυμα στο "{{topic}}" - {{site_title}}'
         linked: '{{username}} έκανε μια σύνδεση στην ανάρτηση που έκανες στο νήμα "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Προσθήκη εικόνας"
@@ -1269,7 +1196,7 @@ el:
           pinned: είναι καρφιτσωμένα
           unpinned: δεν είναι καρφιτσωμένα
           unseen: δεν διάβασα
-          wiki: ' είναι βίκι'
+          wiki: " είναι βίκι"
         statuses:
           label: Τα οποία νήματα
           open: είναι ανοιχτά
@@ -1312,8 +1239,8 @@ el:
         notification_level: "Ειδοποιήσεις"
         choose_new_category: "Διάλεξε νέα κατηγορία για τα νήματα:"
         selected:
-          one: "Έχεις διαλέξει <b>1</b> νήμα."
-          other: "Έχεις διαλέξει <b>{{count}}</b> νήματα."
+          one: Έχεις διαλέξει <b>1</b> νήμα.
+          other: Έχεις διαλέξει <b>{{count}}</b> νήματα.
         change_tags: "Αντικατάσταση Ετικετών "
         append_tags: "Προσάρτηση Ετικετών "
         choose_new_tags: "Επίλεξε καινούριες ετικέτες για αυτά τα νήματα:"
@@ -1345,12 +1272,9 @@ el:
         bookmarks: "Δεν υπάρχουν άλλα νήματα με σελιδοδείκτη."
         search: "Δεν υπάρχουν άλλα αποτελέσματα για αυτή την αναζήτηση."
     topic:
-      unsubscribe:
-        stop_notifications: "Τώρα θα λαμβάνεις λιγότερες ειδοποιήσεις για <strong>{{title}}</strong>"
-        change_notification_state: "Η τρέχουσα κατάσταση των ειδοποιήσεων σου είναι"
       filter_to:
-        one: "1 δημοσίευση σε νήματα"
-        other: "{{count}} αναρτήσεις σε νήματα"
+        one: 1 δημοσίευση σε νήματα
+        other: '{{count}} αναρτήσεις σε νήματα'
       create: 'Νέο Νήμα'
       create_long: 'Δημιουργία νέου Νήματος'
       private_message: 'Στείλε ένα προσωπικό μήνυμα'
@@ -1364,10 +1288,10 @@ el:
       new: 'νέο νήμα'
       unread: 'αδιάβαστο'
       new_topics:
-        one: '1 νέο νήμα'
+        one: 1 νέο νήμα
         other: '{{count}} νέα νήματα'
       unread_topics:
-        one: '1 μη αναγνωσμένο νήμα'
+        one: 1 μη αναγνωσμένο νήμα
         other: '{{count}} αδιάβαστα νήματα'
       title: 'Νήμα'
       invalid_access:
@@ -1381,17 +1305,17 @@ el:
         title: "Το νήμα δεν βρέθηκε."
         description: "Συγνώμη, δεν μπορέσαμε να βρούμε αυτό το νήμα συζήτησης. Μήπως έχει αφαιρεθεί από κάποιον συντονιστή;"
       total_unread_posts:
-        one: "έχεις 1 αδιάβαστη ανάρτηση σε αυτό το νήμα"
-        other: "έχεις {{count}} αδιάβαστες αναρτήσεις σε αυτό το νήμα"
+        one: έχεις 1 αδιάβαστη ανάρτηση σε αυτό το νήμα
+        other: έχεις {{count}} αδιάβαστες αναρτήσεις σε αυτό το νήμα
       unread_posts:
-        one: "έχεις 1 αδιάβαστη παλιά ανάρτηση σε αυτό το νήμα"
-        other: "έχεις {{count}} αδιάβαστες παλιές αναρτήσεις σε αυτό το νήμα"
+        one: έχεις 1 αδιάβαστη παλιά ανάρτηση σε αυτό το νήμα
+        other: έχεις {{count}} αδιάβαστες παλιές αναρτήσεις σε αυτό το νήμα
       new_posts:
-        one: "υπάρχει 1 νέα ανάρτηση σε αυτό το νήμα από την τελευταία φορά που το διάβασες"
-        other: "υπάρχουν {{count}} νέες αναρτήσεις σε αυτό το νήμα από την τελευταία φορά που το διάβασες"
+        one: υπάρχει 1 νέα ανάρτηση σε αυτό το νήμα από την τελευταία φορά που το διάβασες
+        other: υπάρχουν {{count}} νέες αναρτήσεις σε αυτό το νήμα από την τελευταία φορά που το διάβασες
       likes:
-        one: "υπάρχει 1 «Μου αρέσει» σε αυτό το νήμα"
-        other: "υπάρχουν {{count}} «μου αρέσει» σε αυτό το νήμα"
+        one: υπάρχει 1 «Μου αρέσει» σε αυτό το νήμα
+        other: υπάρχουν {{count}} «μου αρέσει» σε αυτό το νήμα
       back_to_list: "Επιστροφή στη Λίστα Νημάτων"
       options: "Ρυθμίσεις Νήματος"
       show_links: "εμφάνιση συνδέσμων εντός του νήματος"
@@ -1455,8 +1379,8 @@ el:
         auto_reminder: "Θα λάβεις υπενθύμιση σχετικά με αυτό το νήμα σε %{timeLeft}."
       auto_close_title: 'Ρυθμίσεις για το αυτόματο κλείσιμο'
       auto_close_immediate:
-        one: "Η τελευταία δημοσίευση στο νήμα είναι ήδη 1 ώρα παλιό, έτσι το νήμα θα κλείσει αμέσως."
-        other: "Η τελευταία ανάρτηση είναι ήδη %{count} ώρες παλιά, έτσι το νήμα θα κλείσει αμέσως."
+        one: Η τελευταία δημοσίευση στο νήμα είναι ήδη 1 ώρα παλιό, έτσι το νήμα θα κλείσει αμέσως.
+        other: Η τελευταία ανάρτηση είναι ήδη %{count} ώρες παλιά, έτσι το νήμα θα κλείσει αμέσως.
       timeline:
         back: "Πίσω"
         back_description: "Πήγαινε πίσω στην τελευταία μη αναγνωσμένη ανάρτηση"
@@ -1477,21 +1401,21 @@ el:
         title: άλλαξε το πόσο συχνά ειδοποιείσαι για αυτό το θέμα
         reasons:
           mailing_list_mode: "Έχεις ενεργοποιημένη τη λειτουργία λίστας αποδεκτών αλληλογραφίας, έτσι θα λαμβάνεις ενημερώσεις για τις απαντήσεις για το νήμα μέσω email."
-          '3_10': 'Θα λαμβάνεις ειδοποιήσεις επειδή επιτηρείς μια ετικέτα σε αυτό το νήμα.'
-          '3_6': 'Θα λαμβάνεις ειδοποιήσεις επειδή επιτηρείς αυτήν την κατηγορία.'
-          '3_5': 'Θα λαμβάνεις ειδοποιήσεις επειδή ξεκίνησες να επιτηρείς αυτόματα αυτό το νήμα.'
-          '3_2': 'Θα λαμβάνεις ειδοποιήσεις επειδή επιτηρείς αυτό το νήμα.'
-          '3_1': 'Θα λαμβάνεις ειδοποιήσεις επειδή δημιούργησες αυτό το νήμα.'
-          '3': 'Θα λαμβάνεις ειδοποιήσεις επειδή επιτηρείς αυτό το νήμα.'
-          '2_8': 'Θα βλέπεις έναν μετρητή νέων απαντήσεων επειδή παρακολουθείς αυτήν την κατηγορία.'
-          '2_4': 'Θα βλέπεις έναν μετρητή νέων απαντήσεων επειδή απάντησες σε αυτό το νήμα.'
-          '2_2': 'Θα βλέπεις έναν μετρητή νέων απαντήσεων επειδή παρακολουθείς αυτό το νήμα.'
-          '2': 'Θα βλέπεις έναν μετρητή νέων απαντήσεων επειδή <a href="/u/{{username}}/preferences">διάβασες αυτό το νήμα</a>.'
-          '1_2': 'Θα λαμβάνεις ειδοποιήσεις εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε εσένα.'
-          '1': 'Θα λαμβάνεις ειδοποιήσεις εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε εσένα.'
-          '0_7': 'Αγνοείς όλες τις ειδοποιήσεις αυτής της κατηγορίας.'
-          '0_2': 'Αγνοείς όλες τις ειδοποιήσεις αυτού του νήματος.'
-          '0': 'Αγνοείς όλες τις ειδοποιήσεις αυτού του νήματος.'
+          "3_10": 'Θα λαμβάνεις ειδοποιήσεις επειδή επιτηρείς μια ετικέτα σε αυτό το νήμα.'
+          "3_6": 'Θα λαμβάνεις ειδοποιήσεις επειδή επιτηρείς αυτήν την κατηγορία.'
+          "3_5": 'Θα λαμβάνεις ειδοποιήσεις επειδή ξεκίνησες να επιτηρείς αυτόματα αυτό το νήμα.'
+          "3_2": 'Θα λαμβάνεις ειδοποιήσεις επειδή επιτηρείς αυτό το νήμα.'
+          "3_1": 'Θα λαμβάνεις ειδοποιήσεις επειδή δημιούργησες αυτό το νήμα.'
+          "3": 'Θα λαμβάνεις ειδοποιήσεις επειδή επιτηρείς αυτό το νήμα.'
+          "2_8": 'Θα βλέπεις έναν μετρητή νέων απαντήσεων επειδή παρακολουθείς αυτήν την κατηγορία.'
+          "2_4": 'Θα βλέπεις έναν μετρητή νέων απαντήσεων επειδή απάντησες σε αυτό το νήμα.'
+          "2_2": 'Θα βλέπεις έναν μετρητή νέων απαντήσεων επειδή παρακολουθείς αυτό το νήμα.'
+          "2": 'Θα βλέπεις έναν μετρητή νέων απαντήσεων επειδή <a href="/u/{{username}}/preferences">διάβασες αυτό το νήμα</a>.'
+          "1_2": 'Θα λαμβάνεις ειδοποιήσεις εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε εσένα.'
+          "1": 'Θα λαμβάνεις ειδοποιήσεις εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε εσένα.'
+          "0_7": 'Αγνοείς όλες τις ειδοποιήσεις αυτής της κατηγορίας.'
+          "0_2": 'Αγνοείς όλες τις ειδοποιήσεις αυτού του νήματος.'
+          "0": 'Αγνοείς όλες τις ειδοποιήσεις αυτού του νήματος.'
         watching_pm:
           title: "Επιτηρείται"
           description: "Θα λαμβάνεις ειδοποιήσεις για κάθε νέα απάντηση σε αυτό το μήνυμα και ένας μετρητής νέων απαντήσεων θα εμφανίζεται."
@@ -1531,7 +1455,6 @@ el:
         visible: "Εμφάνιση Νήματος"
         reset_read: "Μηδενισμός Διαβασμένων"
         make_public: "Κάνε Δημόσιο το Νήμα"
-        make_private: "Κάνε Προσωπικό Μήνυμα"
       feature:
         pin: "Καρφίτσωμα Νήματος"
         unpin: "Ξεκαρφίτσωμα Νήματος"
@@ -1564,8 +1487,8 @@ el:
         pin_validation: "Απαιτείται ημερομηνία για να καρφιτσώσεις το νήμα."
         not_pinned: "Δεν υπάρχουν νήματα καρφιτσωμένα σε {{categoryLink}}."
         already_pinned:
-          one: "Νήμα καρφιτσωμένο σε {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
-          other: "Νήματα καρφιτσωμένα σε {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: 'Νήμα καρφιτσωμένο σε {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Νήματα καρφιτσωμένα σε {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         pin_globally: "Εμφάνισε αυτό το νήμα στην κορυφή όλων των λιστών νημάτων μέχρι"
         confirm_pin_globally: "Υπάρχουν ήδη {{count}} καθολικά καρφιτσωμένα νήματα. Τόσα πολλά καρφιτσωμένα νήματα μπορεί να είναι υπερβολικός φόρτος για νέους και ανώνυμους χρήστες. Θες στ' αλήθεια να καρφιτσώσεις καθολικά ακόμη ένα νήμα;"
         unpin_globally: "Αφαίρεσε αυτό το νήμα από την κορυφή όλων των λίστων νημάτων"
@@ -1573,8 +1496,8 @@ el:
         global_pin_note: "Οι χρήστες μπορούν να ξεκαρφιτσώσουν το νήμα ο καθένας για τον εαυτό του."
         not_pinned_globally: "Δεν υπάρχουν καθολικά καρφιτσωμένα νήματα."
         already_pinned_globally:
-          one: "Πρόσφατα καθολικά καρφιτσωμένα νήματα:<strong class='badge badge-notification unread'>1</strong>"
-          other: "Πρόσφατα καθολικά καρφιτσωμένα νήματα: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: Πρόσφατα καθολικά καρφιτσωμένα νήματα:<strong class='badge badge-notification unread'>1</strong>
+          other: 'Πρόσφατα καθολικά καρφιτσωμένα νήματα: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         make_banner: "Αυτό το νήμα να γίνει νήμα ανακοίνωσης και να εμφανίζεται στην κορυφή όλων των σελίδων."
         remove_banner: "Αφαίρεσε το νήμα ανακοίνωσης το οποίο εμφανίζεται στην κορυφή όλων των σελίδων."
         banner_note: "Οι χρήστες μπορούν να κλείσουν την ανακοίνωση έτσι ώστε να μην εμφανίζεται σε αυτούς. Ένα μόνο νήμα μπορεί να είναι νήμα ανακοίνωσης κάθε φορά."
@@ -1611,8 +1534,8 @@ el:
       login_reply: 'Συνδέσου για να απαντήσεις'
       filters:
         n_posts:
-          one: "1 ανάρτηση"
-          other: "{{count}} αναρτήσεις"
+          one: 1 ανάρτηση
+          other: '{{count}} αναρτήσεις'
         cancel: "Αφαίρεση φίλτρου"
       split_topic:
         title: "Μεταφορά σε Νέο Νήμα "
@@ -1620,15 +1543,15 @@ el:
         topic_name: "Τίτλος Νέου Νήματος"
         error: "Παρουσιάστηκε σφάλμα κατά τη μεταφορά των αναρτήσεων στο νέο νήμα."
         instructions:
-          one: "Ετοιμάζεσαι να δημιουργήσεις ένα νέο νήμα και να μεταφέρεις σε αυτό την επιλεγμένη ανάρτηση."
-          other: "Ετοιμάζεσαι να δημιουργήσεις ένα νέο νήμα και να μεταφέρεις σε αυτό τις <b>{{count}}</b> επιλεγμένες αναρτήσεις."
+          one: Ετοιμάζεσαι να δημιουργήσεις ένα νέο νήμα και να μεταφέρεις σε αυτό την επιλεγμένη ανάρτηση.
+          other: Ετοιμάζεσαι να δημιουργήσεις ένα νέο νήμα και να μεταφέρεις σε αυτό τις <b>{{count}}</b> επιλεγμένες αναρτήσεις.
       merge_topic:
         title: "Μεταφορά σε Υφιστάμενο Νήμα"
         action: "μεταφορά σε υφιστάμενο νήμα"
         error: "Παρουσιάστηκε σφάλμα κατά τη μεταφορά των αναρτήσεων σε αυτό το νήμα. "
         instructions:
-          one: "Παρακαλώ επίλεξε το νήμα στο οποίο θέλεις να μεταφέρεις την ανάρτηση."
-          other: "Παρακαλώ επίλεξε το νήμα στο οποίο θέλεις να μεταφέρεις τις <b>{{count}}</b> αυτές αναρτήσεις."
+          one: Παρακαλώ επίλεξε το νήμα στο οποίο θέλεις να μεταφέρεις την ανάρτηση.
+          other: Παρακαλώ επίλεξε το νήμα στο οποίο θέλεις να μεταφέρεις τις <b>{{count}}</b> αυτές αναρτήσεις.
       merge_posts:
         title: "Συγχώνευσε Επιλεγμένες Αναρτήσεις"
         action: "συγχώνευσε επιλεγμένες αναρτήσεις"
@@ -1640,9 +1563,8 @@ el:
         label: "Νέος Ιδιοκτήτης των Αναρτήσεων"
         placeholder: "όνομα χρήστη του νέου ιδιοκτήτη"
         instructions:
-          one: "Παρακαλώ επίλεξε τον νέο ιδιοκτήτη της ανάρτησης του <b>{{old_user}}</b>."
-          other: "Παρακαλώ επίλεξε τον νέο ιδιοκτήτη των {{count}} αναρτήσεων του <b>{{old_user}}</b>."
-        instructions_warn: "Τυχόν ειδοποιήσεις σχετικές με την ανάρτηση δεν θα μεταφερθούν στον νέο χρήστη.<br>Προειδοποίηση: Στην παρούσα φάση κανένα δεδομένο σχετικό με την ανάρτηση δε θα μεταφερθεί στο νέο χρήστη. Χρησιμοποίησέ το με προσοχή."
+          one: Παρακαλώ επίλεξε τον νέο ιδιοκτήτη της ανάρτησης του <b>{{old_user}}</b>.
+          other: Παρακαλώ επίλεξε τον νέο ιδιοκτήτη των {{count}} αναρτήσεων του <b>{{old_user}}</b>.
       change_timestamp:
         title: "Αλλαγή Χρονοσήμανσης..."
         action: "αλλαγή χρονοσήμανσης"
@@ -1660,8 +1582,6 @@ el:
           one: Έχεις επιλέξει <b>1</b> ανάρτηση.
           other: Έχεις επιλέξει <b>{{count}}</b> αναρτήσεις.
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Παράθεση"
       edit_reason: "Αιτία:"
       post_number: "ανάρτηση {{number}}"
@@ -1674,26 +1594,26 @@ el:
       show_full: "Δείξε Πλήρη Ανάρτηση "
       show_hidden: 'Δείξε το κρυφό περιεχόμενο.'
       deleted_by_author:
-        one: "(η ανάρτηση ανακλήθηκε από το συγγραφέα της και θα σβηστεί αυτόματα σε %{count} ώρα, εκτός και αν κάποιος την επισημάνει στους συντοντιστές)"
-        other: "(η ανάρτηση ανακλήθηκε από το συγγραφέα της και θα σβηστεί αυτόματα σε %{count} ώρες, εκτός και αν κάποιος την επισημάνει στους συντοντιστές)"
+        one: (η ανάρτηση ανακλήθηκε από το συγγραφέα της και θα σβηστεί αυτόματα σε %{count} ώρα, εκτός και αν κάποιος την επισημάνει στους συντοντιστές)
+        other: (η ανάρτηση ανακλήθηκε από το συγγραφέα της και θα σβηστεί αυτόματα σε %{count} ώρες, εκτός και αν κάποιος την επισημάνει στους συντοντιστές)
       expand_collapse: "επέκταση/σύμπτυξη"
       gap:
-        one: "δες 1 κρυφή απάντηση"
-        other: "δες {{count}} κρυφές απαντήσεις"
+        one: δες 1 κρυφή απάντηση
+        other: δες {{count}} κρυφές απαντήσεις
       unread: "Η ανάρτηση δεν έχει διαβαστεί"
       has_replies:
-        one: "{{count}} Απάντηση"
-        other: "{{count}} Απαντήσεις"
+        one: '{{count}} Απάντηση'
+        other: '{{count}} Απαντήσεις'
       has_likes:
-        one: "{{count}} \"Μου αρέσουν\""
-        other: "{{count}} \"Μου αρέσει\""
+        one: '{{count}} "Μου αρέσουν"'
+        other: '{{count}} "Μου αρέσει"'
       has_likes_title:
-        one: "1 άτομο πάτησε \"μου αρέσει\" στη δημοσίευση"
-        other: "{{count}} άτομα πάτησαν \"Μου αρέσει\" στην ανάρτηση"
+        one: 1 άτομο πάτησε "μου αρέσει" στη δημοσίευση
+        other: '{{count}} άτομα πάτησαν "Μου αρέσει" στην ανάρτηση'
       has_likes_title_only_you: "σου αρέσει αυτή η ανάρτηση"
       has_likes_title_you:
-        one: "εσύ και 1 άλλο άτομο πάτησε \"Μου αρέσει\" στη δημοσίευση"
-        other: "εσύ και {{count}} ακόμα άτομα πατήσατε \"Μου αρέσει\" στην ανάρτηση"
+        one: εσύ και 1 άλλο άτομο πάτησε "Μου αρέσει" στη δημοσίευση
+        other: εσύ και {{count}} ακόμα άτομα πατήσατε "Μου αρέσει" στην ανάρτηση
       errors:
         create: "Λυπούμαστε, παρουσιάστηκε σφάλμα κατά την δημιουργία της ανάρτησης. Προσπάθησε πάλι."
         edit: "Λυπούμαστε, παρουσιάστηκε σφάλμα κατά την επεξεργασία της ανάρτησης. Προσπάθησε πάλι."
@@ -1741,8 +1661,8 @@ el:
       actions:
         flag: 'Επισήμανση'
         defer_flags:
-          one: "Αγνόηση επισήμανσης"
-          other: "Αγνόηση επισημάνσεων"
+          one: Αγνόηση επισήμανσης
+          other: Αγνόηση επισημάνσεων
         undo:
           off_topic: "Αναίρεση σήμανσης"
           spam: "Αναίρεση σήμανσης"
@@ -1759,8 +1679,8 @@ el:
           bookmark: "έβαλαν σελιδοδείκτη"
           like: "άρεσαν αυτό"
           like_capped:
-            one: "και {{count}} άλλος το άρεσε αυτό "
-            other: "και {{count}} άλλοι το άρεσαν αυτό "
+            one: 'και {{count}} άλλος το άρεσε αυτό '
+            other: 'και {{count}} άλλοι το άρεσαν αυτό '
           vote: "ψήφισαν για αυτό"
         by_you:
           off_topic: "Το επισήμανες σαν εκτός θέματος"
@@ -1773,58 +1693,58 @@ el:
           vote: "Ψήφισες για αυτή την ανάρτηση"
         by_you_and_others:
           off_topic:
-            one: "Εσύ και 1 ακόμα το επισημάνατε ως εκτός θέματος "
-            other: "Εσύ και {{count}} ακόμα το επισημάνατε ως εκτός θέματος "
+            one: 'Εσύ και 1 ακόμα το επισημάνατε ως εκτός θέματος '
+            other: 'Εσύ και {{count}} ακόμα το επισημάνατε ως εκτός θέματος '
           spam:
-            one: "Εσύ και 1 ακόμα το επισημάνατε ως ανεπιθύμητο  "
-            other: "Εσύ και {{count}} ακόμα το επισημάνατε ως ανεπιθύμητο  "
+            one: 'Εσύ και 1 ακόμα το επισημάνατε ως ανεπιθύμητο  '
+            other: 'Εσύ και {{count}} ακόμα το επισημάνατε ως ανεπιθύμητο  '
           inappropriate:
-            one: "Εσύ και 1 ακόμα το επισημάνατε ως ανάρμοστο"
-            other: "Εσύ και {{count}} ακόμα το επισημάνατε ως ανάρμοστο"
+            one: Εσύ και 1 ακόμα το επισημάνατε ως ανάρμοστο
+            other: Εσύ και {{count}} ακόμα το επισημάνατε ως ανάρμοστο
           notify_moderators:
-            one: "Εσύ και 1 ακόμα το επισημάνατε στους συντονιστές"
-            other: "Εσύ και {{count}} ακόμα το επισημάνατε στους συντονιστές"
+            one: Εσύ και 1 ακόμα το επισημάνατε στους συντονιστές
+            other: Εσύ και {{count}} ακόμα το επισημάνατε στους συντονιστές
           notify_user:
-            one: "Εσύ και 1 ακόμα στείλατε ένα μήνυμα σε αυτόν τον χρήστη"
-            other: "Εσύ και {{count}} ακόμα στείλατε ένα μήνυμα σε αυτόν τον χρήστη"
+            one: Εσύ και 1 ακόμα στείλατε ένα μήνυμα σε αυτόν τον χρήστη
+            other: Εσύ και {{count}} ακόμα στείλατε ένα μήνυμα σε αυτόν τον χρήστη
           bookmark:
-            one: "Εσύ και 1 ακόμα τοποθετήσατε σελιδοδείκτη στην ανάρτηση"
-            other: "Εσύ και {{count}} ακόμα τοποθετήσατε σελιδοδείκτη στην ανάρτηση"
+            one: Εσύ και 1 ακόμα τοποθετήσατε σελιδοδείκτη στην ανάρτηση
+            other: Εσύ και {{count}} ακόμα τοποθετήσατε σελιδοδείκτη στην ανάρτηση
           like:
-            one: "Εσένα και 1 ακόμα σας άρεσε"
-            other: "Εσένα και {{count}} ακόμα σας άρεσε"
+            one: Εσένα και 1 ακόμα σας άρεσε
+            other: Εσένα και {{count}} ακόμα σας άρεσε
           vote:
-            one: "Εσύ και 1 ακόμα ψηφίσατε για την ανάρτηση"
-            other: "Εσύ και {{count}} ακόμα ψηφίσατε για την ανάρτηση"
+            one: Εσύ και 1 ακόμα ψηφίσατε για την ανάρτηση
+            other: Εσύ και {{count}} ακόμα ψηφίσατε για την ανάρτηση
         by_others:
           off_topic:
-            one: "Ένα άτομο το επισήμανε ως εκτός θέματος"
-            other: "{{count}} άτομα το επισημάνανε ως εκτός θέματος"
+            one: Ένα άτομο το επισήμανε ως εκτός θέματος
+            other: '{{count}} άτομα το επισημάνανε ως εκτός θέματος'
           spam:
-            one: "Ένα άτομο το επισήμανε ως ανεπιθύμητο"
-            other: "{{count}} άτομα το επισημάνανε ως ανεπιθύμητο"
+            one: Ένα άτομο το επισήμανε ως ανεπιθύμητο
+            other: '{{count}} άτομα το επισημάνανε ως ανεπιθύμητο'
           inappropriate:
-            one: "Ένα άτομο το επισήμανε ως ανάρμοστο"
-            other: "{{count}} άτομα το επισημάνανε ως ανάρμοστο"
+            one: Ένα άτομο το επισήμανε ως ανάρμοστο
+            other: '{{count}} άτομα το επισημάνανε ως ανάρμοστο'
           notify_moderators:
-            one: "Ένα άτομο το επισήμανε στους συντονιστές"
-            other: "{{count}} άτομα το επισημάνανε στους συντονιστές"
+            one: Ένα άτομο το επισήμανε στους συντονιστές
+            other: '{{count}} άτομα το επισημάνανε στους συντονιστές'
           notify_user:
-            one: "1 πρόσωπο έστειλε ένα μήνυμα σε αυτόν τον χρήστη"
-            other: "{{count}} άτομα έστειλαν ένα μήνυμα σε αυτόν τον χρήστη"
+            one: 1 πρόσωπο έστειλε ένα μήνυμα σε αυτόν τον χρήστη
+            other: '{{count}} άτομα έστειλαν ένα μήνυμα σε αυτόν τον χρήστη'
           bookmark:
-            one: "Ένα άτομο τοποθέτησε σελιδοδείκτη στην ανάρτηση"
-            other: "{{count}} άτομα τοποθέτησαν σελιδοδείκτη στην ανάρτηση"
+            one: Ένα άτομο τοποθέτησε σελιδοδείκτη στην ανάρτηση
+            other: '{{count}} άτομα τοποθέτησαν σελιδοδείκτη στην ανάρτηση'
           like:
-            one: "Σε ένα άτομο άρεσε η ανάρτηση"
-            other: "Σε {{count}} άτομα άρεσε η ανάρτηση"
+            one: Σε ένα άτομο άρεσε η ανάρτηση
+            other: Σε {{count}} άτομα άρεσε η ανάρτηση
           vote:
-            one: "Ένα άτομο ψήφισε για την ανάρτηση"
-            other: "{{count}} άτομα ψήφισαν για την ανάρτηση"
+            one: Ένα άτομο ψήφισε για την ανάρτηση
+            other: '{{count}} άτομα ψήφισαν για την ανάρτηση'
       merge:
         confirm:
-          one: "Είσαι σίγουρος πως θέλεις να συγχωνεύσεις αυτές τις δημοσιεύσεις;"
-          other: "Είσαι σίγουρος πως θέλεις να συγχωνεύσεις αυτές τις {{count}} αναρτήσεις;"
+          one: Είσαι σίγουρος πως θέλεις να συγχωνεύσεις αυτές τις δημοσιεύσεις;
+          other: Είσαι σίγουρος πως θέλεις να συγχωνεύσεις αυτές τις {{count}} αναρτήσεις;
       revisions:
         controls:
           first: "Πρώτη αναθεώρηση"
@@ -1906,7 +1826,6 @@ el:
       email_in_allow_strangers: "Αποδοχή emails από ανώνυμους χρήστες χωρίς λογαριασμό"
       email_in_disabled: "Η δημιουργία νέων νημάτων μέσω email είναι απενεργοποιημένη στις ρυθμίσεις ιστοσελίδας. Για να επιτραπεί η δημιουργία νέων νημάτων μέσω email,"
       email_in_disabled_click: 'ενεργοποίησε τη ρύθμιση «εισερχόμενα email».'
-      suppress_from_homepage: "Αποσιώπηση αυτής της κατηγορίας από την αρχική σελίδα."
       show_subcategory_list: "Προβολή λίστας υποκατηγοριών πάνω απο τα νήματα αυτής της κατηγορίας "
       num_featured_topics: "Αριθμός νημάτων που εμφανίζονται στην σελίδα κατηγοριών:"
       subcategory_num_featured_topics: "Αριθμός προτεινόμενων νημάτων στην σελίδα της γονικής κατηγορίας:"
@@ -1980,14 +1899,14 @@ el:
       custom_placeholder_notify_moderators: "Παρακαλούμε πες τι ακριβως είναι αυτό που σε ανησυχεί. Αν είναι δυνατό, παράπεμψε σε σχετικούς συνδέσμους και παραδείγματα."
       custom_message:
         at_least:
-          one: "βάλε τουλάχιστον 1 χαρακτήρα"
-          other: "γράψε τουλάχιστον {{count}} χαρακτήρες"
+          one: βάλε τουλάχιστον 1 χαρακτήρα
+          other: γράψε τουλάχιστον {{count}} χαρακτήρες
         more:
-          one: "1 να πας..."
-          other: "{{count}} ακόμα..."
+          one: 1 να πας...
+          other: '{{count}} ακόμα...'
         left:
-          one: "1 απομένει"
-          other: "{{count}} απομένουν"
+          one: 1 απομένει
+          other: '{{count}} απομένουν'
     flagging_topic:
       title: "Ευχαριστούμε για τη συνεισφρορά σου..."
       action: "Επισήμανση Νήματος"
@@ -1998,13 +1917,13 @@ el:
       links_title: "Δημοφιλείς Σύνδεσμοι"
       links_shown: "εμφάνισε περισσότερους συνδέσμους..."
       clicks:
-        one: "1 κλικ"
-        other: "%{count} κλικ"
+        one: 1 κλικ
+        other: '%{count} κλικ'
     post_links:
       about: "ανάπτυξε περισσότερους συνδέσμους για αυτή την ανάρτηση"
       title:
-        one: "1 περισσότερο"
-        other: "%{count} περισσότερα"
+        one: 1 περισσότερο
+        other: '%{count} περισσότερα'
     topic_statuses:
       warning:
         help: "Αυτή είναι μια επίσημη προειδοποίηση."
@@ -2038,22 +1957,22 @@ el:
     original_post: "Αρχική Ανάρτηση"
     views: "Προβολές"
     views_lowercase:
-      one: "προβολή"
-      other: "προβολές"
+      one: προβολή
+      other: προβολές
     replies: "Απαντήσεις"
     views_long:
-      one: "αυτό το νήμα έχει προβληθεί 1 φορά"
-      other: "αυτό το νήμα έχει προβληθεί {{number}} φορές"
+      one: αυτό το νήμα έχει προβληθεί 1 φορά
+      other: αυτό το νήμα έχει προβληθεί {{number}} φορές
     activity: "Δραστηριότητα"
     likes: "«Μου αρέσει»"
     likes_lowercase:
-      one: "μου αρέσει"
-      other: "μου αρέσει"
+      one: μου αρέσει
+      other: μου αρέσει
     likes_long: "υπάρχουν {{number}} «μου αρέσει» σε αυτό το νήμα"
     users: "Χρήστες"
     users_lowercase:
-      one: "χρήστης"
-      other: "χρήστες"
+      one: χρήστης
+      other: χρήστες
     category_title: "Κατηγορία"
     history: "Ιστορικό"
     changed_by: "του/της {{author}}"
@@ -2067,8 +1986,8 @@ el:
       latest:
         title: "Τελευταία"
         title_with_count:
-          one: "Τελευταία (1)"
-          other: "Τελευταία ({{count}})"
+          one: Τελευταία (1)
+          other: Τελευταία ({{count}})
         help: "νήματα με πρόσφατες αναρτήσεις"
       hot:
         title: "Δημοφιλή"
@@ -2086,21 +2005,21 @@ el:
       unread:
         title: "Αδιάβαστα"
         title_with_count:
-          one: "Μη αναγνωσμένα (1)"
-          other: "Αδιάβαστα ({{count}})"
+          one: Μη αναγνωσμένα (1)
+          other: Αδιάβαστα ({{count}})
         help: "νήματα που επιτηρείς ή παρακολουθείς και που έχουν αδιάβαστες αναρτήσεις"
         lower_title_with_count:
-          one: "1 μη αναγνωσμένο"
-          other: "{{count}} αδιάβαστα"
+          one: 1 μη αναγνωσμένο
+          other: '{{count}} αδιάβαστα'
       new:
         lower_title_with_count:
-          one: "1 νέο"
-          other: "{{count}} νέα"
+          one: 1 νέο
+          other: '{{count}} νέα'
         lower_title: "νέα"
         title: "Νέα"
         title_with_count:
-          one: "Νέα (1)"
-          other: "Νέα ({{count}})"
+          one: Νέα (1)
+          other: Νέα ({{count}})
         help: "νήματα που δημιουργήθηκαν τις προηγούμενες μέρες"
       posted:
         title: "Οι αναρτήσεις μου"
@@ -2111,8 +2030,8 @@ el:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: "{{categoryName}} (1)"
-          other: "{{categoryName}} ({{count}})"
+          one: '{{categoryName}} (1)'
+          other: '{{categoryName}} ({{count}})'
         help: "τελευταία νήματα στην κατηγορία {{categoryName}} "
       top:
         title: "Κορυφαία"
@@ -2197,24 +2116,23 @@ el:
         print: '<b>ctrl</b>+<b>p</b> Εκτύπωση νήματος'
     badges:
       earned_n_times:
-        one: "Κέρδισε αυτό το παράσημο 1 φορά"
-        other: "Κέρδισε αυτό το παράσημο %{count} φορές"
+        one: Κέρδισε αυτό το παράσημο 1 φορά
+        other: Κέρδισε αυτό το παράσημο %{count} φορές
       granted_on: "Χορηγήθηκε στις %{date}"
       others_count: "Άλλοι με αυτό το παράσημο (%{count})"
       title: Παράσημα
       allow_title: "Μπορείς να χρησιμοποιήσεις αυτό το παράσημο σαν τίτλο"
       multiple_grant: "Μπορείς να το κερδίσεις πολλές φορές"
       badge_count:
-        one: "1 Παράσημο"
-        other: "%{count} Παράσημα"
+        one: 1 Παράσημο
+        other: '%{count} Παράσημα'
       more_badges:
-        one: "+1 Περισσότερα"
-        other: "+%{count} Περισσότερα"
+        one: +1 Περισσότερα
+        other: +%{count} Περισσότερα
       granted:
-        one: "1 χορηγήθηκε"
-        other: "%{count} χορηγήθηκε"
+        one: 1 χορηγήθηκε
+        other: '%{count} χορηγήθηκε'
       select_badge_for_title: Επίλεξε ένα παράσημο για να χρησιμοποιήσεις ως τίτλο
-      none: "<none>"
       badge_grouping:
         getting_started:
           name: Ξεκινώντας
@@ -2243,8 +2161,8 @@ el:
       tags: "Ετικέτες"
       delete_tag: "Αφαίρεση Ετικέτας"
       delete_confirm:
-        one: "Είσαι βέβαιος πως θέλεις να διαγράψεις αυτήν την ετικέτα και να την αφαιρέσεις από το 1 νήμα στο οποίο είναι προσαρτημένη;"
-        other: "Είσαι βέβαιος πως θέλεις να διαγράψεις αυτήν την ετικέτα και να την αφαιρέσεις από τα {{count}} νήματα στα οποία είναι προσαρτημένη;"
+        one: Είσαι βέβαιος πως θέλεις να διαγράψεις αυτήν την ετικέτα και να την αφαιρέσεις από το 1 νήμα στο οποίο είναι προσαρτημένη;
+        other: Είσαι βέβαιος πως θέλεις να διαγράψεις αυτήν την ετικέτα και να την αφαιρέσεις από τα {{count}} νήματα στα οποία είναι προσαρτημένη;
       delete_confirm_no_topics: "Είσαι βέβαιος πως θέλεις να διαγράψεις αυτήν την ετικέτα;"
       rename_tag: "Μετονομασία Ετικέτας"
       rename_instructions: "Επίλεξε ένα καινούριο όνομα για την ετικέτα:"
@@ -2261,19 +2179,15 @@ el:
       notifications:
         watching:
           title: "Επιτηρείται"
-          description: "Θα επιτηρείς αυτόματα όλα τα νήματα με αυτή την ετικέτα. Θα λαμβάνεις ειδοποιήσεις για όλες τις νέες αναρτήσεις και νήματα και ένας μετρητής αδιάβαστων και νέων αναρτήσεων θα εμφανίζεται επίσης δίπλα στο νήμα."
         watching_first_post:
           title: "Επιτήρηση Πρώτης Ανάρτησης"
-          description: "Θα λαμβάνεις ειδοποιήσεις για την πρώτη ανάρτηση για κάθε νέο νήμα με αυτή την ετικέτα."
         tracking:
           title: "Παρακολουθείται"
-          description: "Θα παρακολουθείς αυτόματα όλα τα νήματα με αυτή την ετικέτα. Ένας μετρητής αδιάβαστων αναρτήσεων θα εμφανίζεται δίπλα στο νήμα."
         regular:
           title: "Τακτικός"
           description: "Θα λαμβάνεις ειδοποίηση εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε αυτή τη ανάρτηση."
         muted:
           title: "Σίγαση"
-          description: "Δε θα λαμβάνεις ειδοποιήσεις για νέα νήματα με αυτή την ετικέτα και δε θα εμφανίζονται στην καρτέλα με τα αδιάβαστα."
       groups:
         title: "Ομάδες Ετικετών"
         about: "Πρόσθεσε ετικέτες σε ομάδες για να τις διαχειριστείς με περισσότερη ευκολία."
@@ -2356,8 +2270,6 @@ el:
         reports:
           today: "Σήμερα"
           yesterday: "Χτες"
-          last_7_days: "Τελευταίες 7 μέρες"
-          last_30_days: "Τελευταίες 30 μέρες"
           all_time: "Συνολικά"
           7_days_ago: "Πριν από 7 μέρες"
           30_days_ago: "Πριν από 30 μέρες"
@@ -2378,14 +2290,10 @@ el:
         topics: "Επισημασμένα Νήματα"
         agree: "Συμφωνώ"
         agree_title: "Επιβεβαίωσε αυτή τη σήμανση ως έγκυρη και σωστή"
-        agree_flag_hide_post: "Αποδοχή και απόκρυψη ανάρτησης"
         agree_flag_hide_post_title: "Κρύψε αυτή την ανάρτηση και αυτόματα στείλε στον χρήστη ένα μήνυμα που θα τους προτρέπει να το επεξεργαστούν."
         agree_flag_restore_post: "Αποδοχή και επαναφορά ανάρτησης"
         agree_flag_restore_post_title: "Επαναφορά της ανάρτησης ώστε όλοι οι χρήστες να μπορούν να το δουν."
-        agree_flag: "Αποδοχή και διατήρηση της ανάρτησης"
         agree_flag_title: "Αποδοχή επισήμανσης και διατήρηση της ανάρτησης αμετάβλητης."
-        defer_flag: "Αγνόηση"
-        defer_flag_title: "Αφαίρεσε αυτή την επισήμανση. Δεν χρειάζεται να γίνει κάποια ενέργεια αυτή τη στιγμή"
         delete: "Διαγραφή"
         delete_title: "Διέγραψε την ανάρτηση στην οποία αναφέρεται αυτή η επισήμανση."
         delete_post_defer_flag: "Διαγραφή ανάρτησης και αγνόηση επισήμανσης"
@@ -2439,8 +2347,6 @@ el:
         title: "Ομάδες"
         edit: "Επεξεργασία Ομάδων"
         refresh: "Ανανέωση "
-        new: "Νέα"
-        selector_placeholder: "εισαγωγή ονόματος χρήστη"
         about: "Επεξεργασία των μελών και των ονομάτων της ομάδας εδώ"
         group_members: "Μέλη ομάδας"
         delete: "Διαγραφή"
@@ -2448,22 +2354,10 @@ el:
         delete_failed: "Δεν είναι δυνατή η διαγραφή της ομάδας. Αν αυτή είναι μια αυτόματη ομάδα, δεν μπορεί να σβηστεί."
         delete_owner_confirm: "Αφαίρεσε το προνόμιο του ιδιοκτήτη για '%{username}';"
         add: "Προσθήκη"
-        add_members: "Προσθήκη μελών"
         custom: "Προσαρμοσμένο"
-        bulk_complete: "Οι χρήστες έχουν προστεθεί στην ομάδα."
-        bulk_complete_users_not_added: "Αυτοί οι χρήστες δεν προστέθηκαν (βεβαιώσου ότι έχουν λογαριασμό χρήστη):"
-        bulk: "Μαζική Προσθήκη σε Ομάδα"
-        bulk_paste: "Κάνε επικόλληση μια λίστα με ονόματα χρηστών η διευθύνσεις email, ένα σε κάθε σειρά:"
-        bulk_select: "(επέλεξε μια ομάδα)"
         automatic: "Αυτόματα"
-        automatic_membership_email_domains: "Οι χρήστης των οποίων το email domain ταιριάζει με κάποιο από αυτά της λίστας, θα προστίθενται αυτόματα σε αυτή την ομάδα:"
-        automatic_membership_retroactive: "Εφάρμοσε αυτόν τον κανόνα και σε υπάρχοντες χρήστες, για να τους προσθέσεις στην ομάδα:"
-        default_title: "Προκαθορισμένος τίτλος για όλους τους χρήστες αυτής της ομάδας"
-        primary_group: "Να οριστεί αυτόματα σαν η κύρια ομάδα"
         group_owners: Ιδιοκτήτες
         add_owners: Προσθήκη ιδιοκτητών
-        incoming_email: "Προσαρμοσμένη διεύθυνση email για εισερχόμενα μηνύματα"
-        incoming_email_placeholder: "πρόσθεσε διεύθυνση email"
         none_selected: "Επίλεξε ομάδα για να ξεκινήσεις"
         no_custom_groups: "Δημιουργία νέας προσαρμοσμένης ομάδας"
       api:
@@ -2529,11 +2423,11 @@ el:
           none: "Δεν υπάρχουν σχετικά γεγονότα."
           redeliver: "Διανομή ξανά"
           incoming:
-            one: "Υπάρχει μία καινούρια εκδήλωση."
-            other: "Υπάρχουν {{count}} καινούρια γεγονότα."
+            one: Υπάρχει μία καινούρια εκδήλωση.
+            other: Υπάρχουν {{count}} καινούρια γεγονότα.
           completed_in:
-            one: "Ολοκληρώνεται σε 1 δευτερόλεπτο."
-            other: "Ολοκληρώθηκε σε {{count}} δευτερόλεπτα."
+            one: Ολοκληρώνεται σε 1 δευτερόλεπτο.
+            other: Ολοκληρώθηκε σε {{count}} δευτερόλεπτα.
           request: "Αίτημα"
           response: "Απάντηση"
           redeliver_confirm: "Είστε σιγουρος/η ότι θέλετε να παραδώσετε εκ νέου το ίδιο payload;"
@@ -2584,7 +2478,6 @@ el:
           label: "Ανέβασμα"
           title: "Ανέβασε ένα αντίγραφο ασφαλείας για αυτό το στιγμιότυπο"
           uploading: "Ανεβαίνει..."
-          success: "Το '{{filename}}' ανέβηκε επιτυχώς."
           error: "Παρουσιάστηκε ένα σφάλμα κατά το ανέβασμα του '{{filename}}': {{message}}"
         operations:
           is_running: "Αυτή τη στιγμή εκτελείται μια λειτουργία..."
@@ -2597,7 +2490,6 @@ el:
             label: "Αντίγραφο ασφαλείας"
             title: "Δημιουργία αντίγραφου ασφαλείας"
             confirm: "Θέλεις να ξεκινήσεις τη δημιουργία ενός νέου αντίγραφου ασφαλείας;"
-            without_uploads: "Ναι (χωρίς τα αρχεία)"
           download:
             label: "Κατέβασμα"
             title: "Αποστολή email με σύνδεσμο λήψης"
@@ -2695,8 +2587,8 @@ el:
           up_to_date: "Το θέμα είναι ενημερωμένο, τελευταίος έλεγχος:"
           add: "Προσθήκη"
           commits_behind:
-            one: "Το θέμα είναι 1 έκδοση πίσω!"
-            other: "Το θέμα είναι {{count}} εκδόσεις πίσω!"
+            one: Το θέμα είναι 1 έκδοση πίσω!
+            other: Το θέμα είναι {{count}} εκδόσεις πίσω!
           scss:
             text: "CSS"
             title: "Καταχώρησε custom CSS, γίνονται δεκτά όλα τα valid CSS και SCSS styles"
@@ -2943,8 +2835,8 @@ el:
         clear_filter: "Καθαρισμός"
         show_words: "προβολή λέξεων"
         word_count:
-          one: "1 λέξη"
-          other: "%{count} λέξεις"
+          one: 1 λέξη
+          other: '%{count} λέξεις'
         actions:
           block: 'Αποκλεισμός'
           censor: 'Λογοκρισία'
@@ -2986,11 +2878,11 @@ el:
           suspect: 'Ύποπτο'
         approved: "Εγκεκριμένο;"
         approved_selected:
-          one: "έγκριση χρήστη"
-          other: "έγκριση χρηστών ({{count}})"
+          one: έγκριση χρήστη
+          other: έγκριση χρηστών ({{count}})
         reject_selected:
-          one: "απόρριψη χρήστη"
-          other: "απόρριψη χρηστών ({{count}})"
+          one: απόρριψη χρήστη
+          other: απόρριψη χρηστών ({{count}})
         titles:
           active: 'Ενεργοί Χρήστες'
           new: 'Νέοι Χρήστες'
@@ -3007,11 +2899,11 @@ el:
           suspended: 'Αποβλημένοι Χρήστες'
           suspect: 'Ύποπτοι χρήστες'
         reject_successful:
-          one: "Επιτυχώς απορρίφθηκε 1 χρήστης."
-          other: "Επιτυχώς απορρίφθησαν %{count} χρήστες."
+          one: Επιτυχώς απορρίφθηκε 1 χρήστης.
+          other: Επιτυχώς απορρίφθησαν %{count} χρήστες.
         reject_failures:
-          one: "Αποτυχία απόρριψης 1 χρήστη."
-          other: "Αποτυχία απόρριψης %{count}χρήστες."
+          one: Αποτυχία απόρριψης 1 χρήστη.
+          other: Αποτυχία απόρριψης %{count}χρήστες.
         not_verified: "Μη επαληθευμένος"
         check_email:
           title: "Εμφάνισε το email αυτού του χρήστη"
@@ -3088,14 +2980,14 @@ el:
         delete_forbidden_because_staff: "Οι διαχειριστές και οι συντονιστές δεν μπορούν να διαγραφούν."
         delete_posts_forbidden_because_staff: "Δεν μπορείς να διαγράψεις όλες τις αναρτήσεις διαχειριστών και συντονιστών."
         delete_forbidden:
-          one: "Οι χρήστες δεν γίνεται να διαγραφούν εάν έχουν αναρτήσεις. Σβήσε όλες τις αναρτήσεις του πριν διαγράψεις το χρήστη. (Δεν γίνεται να σβηστούν αναρτήσεις που είναι παλαιότερες από %{count} ημέρα)"
-          other: "Οι χρήστες δεν γίνεται να διαγραφούν εάν έχουν αναρτήσεις. Σβήσε όλες τις αναρτήσεις τους πριν τους διαγράψεις. (Δεν γίνεται να σβηστούν αναρτήσεις που είναι παλαιότερες από %{count} ημέρες)"
+          one: Οι χρήστες δεν γίνεται να διαγραφούν εάν έχουν αναρτήσεις. Σβήσε όλες τις αναρτήσεις του πριν διαγράψεις το χρήστη. (Δεν γίνεται να σβηστούν αναρτήσεις που είναι παλαιότερες από %{count} ημέρα)
+          other: Οι χρήστες δεν γίνεται να διαγραφούν εάν έχουν αναρτήσεις. Σβήσε όλες τις αναρτήσεις τους πριν τους διαγράψεις. (Δεν γίνεται να σβηστούν αναρτήσεις που είναι παλαιότερες από %{count} ημέρες)
         cant_delete_all_posts:
-          one: "Δεν γίνεται να σβήσεις όλες τις αναρτήσεις. Κάποιες αναρτήσεις είναι παλαιότερες από %{count} ημέρα. (Η ρύθμιση «delete_user_max_post_age setting»)"
-          other: "Δεν γίνεται να σβήσεις όλες τις αναρτήσεις. Κάποιες αναρτήσεις είναι παλαιότερες από %{count} ημέρες. (Η ρύθμιση «delete_user_max_post_age setting»)"
+          one: Δεν γίνεται να σβήσεις όλες τις αναρτήσεις. Κάποιες αναρτήσεις είναι παλαιότερες από %{count} ημέρα. (Η ρύθμιση «delete_user_max_post_age setting»)
+          other: Δεν γίνεται να σβήσεις όλες τις αναρτήσεις. Κάποιες αναρτήσεις είναι παλαιότερες από %{count} ημέρες. (Η ρύθμιση «delete_user_max_post_age setting»)
         cant_delete_all_too_many_posts:
-          one: "Δεν γίνεται να σβήσεις όλες τις αναρτήσεις επειδή ο χρήστης έχει περισσότερες από %{count} αναρτήσεις. (Η ρύθμιση «delete_all_posts_max»)"
-          other: "Δεν γίνεται να σβήσεις όλες τις αναρτήσεις επειδή ο χρήστης έχει περισσότερες από %{count} αναρτήσεις. (Η ρύθμιση «delete_all_posts_max»)"
+          one: Δεν γίνεται να σβήσεις όλες τις αναρτήσεις επειδή ο χρήστης έχει περισσότερες από %{count} αναρτήσεις. (Η ρύθμιση «delete_all_posts_max»)
+          other: Δεν γίνεται να σβήσεις όλες τις αναρτήσεις επειδή ο χρήστης έχει περισσότερες από %{count} αναρτήσεις. (Η ρύθμιση «delete_all_posts_max»)
         delete_confirm: "Είσαι ΣΙΓΟΥΡΟΣ ότι θέλεις να διαγράψεις αυτό το χρήστη; Αυτό δεν μπορεί να αναιρεθεί!"
         delete_and_block: "Σβήσε και <b>απόκλεισε</b> αυτή την διεύθυνση email και τη διεύθυνση IP  "
         delete_dont_block: "Μόνο διαγραφή"
@@ -3136,8 +3028,8 @@ el:
         tl3_requirements:
           title: "Προϋποθέσεις για το επίπεδο εμπιστοσύνης 3"
           table_title:
-            one: "Την τελευταία μέρα:"
-            other: "Τις τελευταίες %{count} μέρες:"
+            one: 'Την τελευταία μέρα:'
+            other: 'Τις τελευταίες %{count} μέρες:'
           value_heading: "Τιμή"
           requirement_heading: "Προϋπόθεση"
           visits: "Επισκέψεις"
@@ -3212,10 +3104,7 @@ el:
         recommended: "Σου προτείνουμε να προσαρμόσεις το ακόλουθο κείμενο στις ανάγκες σου:"
         show_overriden: 'Δείξε μόνο αυτά που άλλαξαν'
       site_settings:
-        show_overriden: 'Δείξε μόνο αυτά που άλλαξαν'
         title: 'Ρυθμίσεις'
-        reset: 'επαναφορά'
-        none: 'κανένα'
         no_results: "Δεν βρέθηκαν αποτελέσματα."
         clear_filter: "Καθάρισμα φίλτρου"
         add_url: "προσθήκη URL"
@@ -3283,7 +3172,6 @@ el:
         enabled: Ενεργοποίηση παράσημου
         icon: Σύμβολο
         image: Εικόνα
-        icon_help: "Χρησιμοποίησε είτε μια κλάση Font Awesome ή το URL μιας εικόνας"
         query: Ερώτηση παράσημου (SQL)
         target_posts: Το ερώτημα αφορά αναρτήσεις
         auto_revoke: Τρέξε καθημερινά το ερώτημα για την ανάκληση
@@ -3307,14 +3195,14 @@ el:
             text: "Λείπουν δεδομένα για το υπόδειγμα. Αυτό συμβαίνει όταν το ερώτημα παρασήμων επιστρέφει δεδομένα για αναρτήσεις ή χρήστες που δεν υπάρχουν. Αυτό μπορεί να έχει ανεπιθύμητα αποτελέσματα αργότερα. Παρακαλούμε έλεγξε ξανά το ερώτημά σου."
           no_grant_count: "Δεν θα αποδοθεί κανένα παράσημο"
           grant_count:
-            one: "<b>1</b> παράσημο για να αποδοθεί"
-            other: "<b>%{count}</b> παράσημα για να αποδοθούν"
+            one: <b>1</b> παράσημο για να αποδοθεί
+            other: <b>%{count}</b> παράσημα για να αποδοθούν
           sample: "Δείγμα:"
           grant:
-            with: <span class="username">%{username}</span>
-            with_post: <span class="username">%{username}</span> για την ανάρτηση στο %{link}
-            with_post_time: <span class="username">%{username}</span> για την ανάρτηση στο %{link} στις <span class="time">%{time}</span>
-            with_time: <span class="username">%{username}</span> στις <span class="time">%{time}</span>
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span> για την ανάρτηση στο %{link}"
+            with_post_time: "<span class=\"username\">%{username}</span> για την ανάρτηση στο %{link} στις <span class=\"time\">%{time}</span>"
+            with_time: "<span class=\"username\">%{username}</span> στις <span class=\"time\">%{time}</span>"
       emoji:
         title: "Emoji"
         help: "Πρόσθεσε ένα νέο emoji που θα είναι διαθέσιμο σε όλους. (Συμβουλή: μπορείς να σύρεις πολλά αρχεία ταυτόχρονα)"
@@ -3375,8 +3263,8 @@ el:
       uploading: "Ανεβαίνει..."
       quit: "Ίσως αργότερα"
       staff_count:
-        one: "Η κοινότητα έχει 1 συνεργάτη (εσένα). "
-        other: "Η κοινότητά σας έχει %{count} συνεργάτες, μαζί με σένα."
+        one: 'Η κοινότητα έχει 1 συνεργάτη (εσένα). '
+        other: Η κοινότητά σας έχει %{count} συνεργάτες, μαζί με σένα.
       invites:
         add_user: "προσθήκη"
         none_added: "Δεν έχεις προσκαλέσει συνεργάτες. Είσαι βέβαιος πως θέλεις να συνεχίσεις;"
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 88c4b93c1e4..e433e46f120 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -145,7 +145,7 @@ en:
 
     action_codes:
       public_topic: "made this topic public %{when}"
-      private_topic: "made this topic private %{when}"
+      private_topic: "made this topic a personal message %{when}"
       split_topic: "split this topic %{when}"
       invited_user: "invited %{who} %{when}"
       invited_group: "invited %{who} %{when}"
@@ -179,8 +179,8 @@ en:
     wizard_required: "Welcome to your new Discourse! Let’s get started with <a href='%{url}' data-auto-route='true'>the setup wizard</a> ✨"
     emails_are_disabled: "All outgoing email has been globally disabled by an administrator. No email notifications of any kind will be sent."
 
-    bootstrap_mode_enabled: "To make launching your new site easier, you are in bootstrap mode. All new users will be granted trust level 1 and have daily email digest updates enabled. This will be automatically turned off when total user count exceeds %{min_users} users."
-    bootstrap_mode_disabled: "Bootstrap mode will be disabled in next 24 hours."
+    bootstrap_mode_enabled: "To make launching your new site easier, you are in bootstrap mode. All new users will be granted trust level 1 and have daily email digest updates enabled. This will be automatically turned off when %{min_users} users have joined."
+    bootstrap_mode_disabled: "Bootstrap mode will be disabled within 24 hours."
 
     themes:
       default_description: "Default"
@@ -207,6 +207,7 @@ en:
     not_implemented: "That feature hasn't been implemented yet, sorry!"
     no_value: "No"
     yes_value: "Yes"
+    submit: "Submit"
     generic_error: "Sorry, an error has occurred."
     generic_error_with_reason: "An error occurred: %{error}"
     sign_up: "Sign Up"
@@ -259,8 +260,8 @@ en:
       our_moderators: "Our Moderators"
       stat:
         all_time: "All Time"
-        last_7_days: "Last 7 Days"
-        last_30_days: "Last 30 Days"
+        last_7_days: "Last 7"
+        last_30_days: "Last 30"
       like_count: "Likes"
       topic_count: "Topics"
       post_count: "Posts"
@@ -285,18 +286,17 @@ en:
       confirm_clear: "Are you sure you want to clear all the bookmarks from this topic?"
 
     topic_count_latest:
-      one: "{{count}} new or updated topic."
-      other: "{{count}} new or updated topics."
+      one: "See {{count}} new or updated topic"
+      other: "See {{count}} new or updated topics"
 
     topic_count_unread:
-      one: "{{count}} unread topic."
-      other: "{{count}} unread topics."
+      one: "See {{count}} unread topic"
+      other: "See {{count}} unread topics"
 
     topic_count_new:
-      one: "{{count}} new topic."
-      other: "{{count}} new topics."
+      one: "See {{count}} new topic"
+      other: "See {{count}} new topics"
 
-    click_to_show: "Click to show."
     preview: "preview"
     cancel: "cancel"
 
@@ -313,6 +313,7 @@ en:
 
     enable: "Enable"
     disable: "Disable"
+    continue: "Continue"
     undo: "Undo"
     revert: "Revert"
     failed: "Failed"
@@ -402,22 +403,35 @@ en:
         remove_user_as_group_owner: "Revoke owner"
 
     groups:
-      logs:
-        title: "Logs"
-        when: "When"
-        action: "Action"
-        acting_user: "Acting user"
-        target_user: "Target user"
-        subject: "Subject"
-        details: "Details"
-        from: "From"
-        to: "To"
-      edit:
-        title: 'Edit Group'
+      add_members:
+        title: "Add Members"
+        description: "Manage the membership of this group"
+        usernames: "Usernames"
+      manage:
+        title: 'Manage'
+        name: 'Name'
         full_name: 'Full Name'
         add_members: "Add Members"
         delete_member_confirm: "Remove '%{username}' from the '%{group}' group?"
-      name_placeholder: "Group name, no spaces, same as username rule"
+        profile:
+          title: Profile
+        interaction:
+          title: Interaction
+          posting: Posting
+          notification: Notification
+        membership:
+          title: Membership
+          access: Access
+        logs:
+          title: "Logs"
+          when: "When"
+          action: "Action"
+          acting_user: "Acting user"
+          target_user: "Target user"
+          subject: "Subject"
+          details: "Details"
+          from: "From"
+          to: "To"
       public_admission: "Allow users to join the group freely (Requires publicly visible group)"
       public_exit: "Allow users to leave the group freely"
       empty:
@@ -428,45 +442,62 @@ en:
         topics: "There are no topics by members of this group."
         logs: "There are no logs for this group."
       add: "Add"
-      join: "Join Group"
-      leave: "Leave Group"
-      request: "Request to Join Group"
+      join: "Join"
+      leave: "Leave"
+      request: "Request"
       message: "Message"
-      automatic_group: Automatic Group
-      closed_group: Closed Group
-      is_group_user: "You are a member of this group"
       allow_membership_requests: "Allow users to send membership requests to group owners"
       membership_request_template: "Custom template to display to users when sending a membership request"
       membership_request:
         submit: "Submit Request"
         title: "Request to join @%{group_name}"
         reason: "Let the group owners know why you belong in this group"
-
       membership: "Membership"
       name: "Name"
-      user_count: "Number of Members"
+      group_name: "Group name"
+      user_count: "Users"
       bio: "About Group"
-      selector_placeholder: "Add members"
+      selector_placeholder: "enter username"
       owner: "owner"
       index:
         title: "Groups"
+        all: "All Groups"
         empty: "There are no visible groups."
+        filter: "Filter by group type"
+        owner_groups: "Groups I am an owner of"
+        close_groups: "Closed Groups"
+        automatic_groups: "Automatic Groups"
+        automatic: "Automatic"
+        closed: "Closed"
+        public: "Public"
+        private: "Private"
+        public_groups: "Public Groups"
+        automatic_group: Automatic Group
+        close_group: Close Group
+        my_groups: "My Groups"
+        group_type: "Group type"
+        is_group_user: "Member"
+        is_group_owner: "Owner"
       title:
         one: "Group"
         other: "Groups"
       activity: "Activity"
-      members: "Members"
+      members:
+        title: "Members"
+        filter_placeholder_admin: "username or email"
+        filter_placeholder: "username"
+        remove_member: "Remove Member"
+        remove_member_description: "Remove <b>%{username}</b> from this group"
+        make_owner: "Make Owner"
+        make_owner_description: "Make <b>%{username}</b> an owner of this group"
+        remove_owner: "Remove as Owner"
+        remove_owner_description: "Remove <b>%{username}</b> as an owner of this group"
+        owner: "Owner"
       topics: "Topics"
       posts: "Posts"
       mentions: "Mentions"
       messages: "Messages"
       notification_level: "Default notification level for group messages"
-      visibility_levels:
-        title: "Who can see this group?"
-        public: "Everyone"
-        members: "Group owners, members and admins"
-        staff: "Group owners and staff"
-        owners: "Group owners and admins"
       alias_levels:
         mentionable: "Who can @mention this group?"
         messageable: "Who can message this group?"
@@ -475,9 +506,6 @@ en:
         mods_and_admins: "Only moderators and Admins"
         members_mods_and_admins: "Only group members, moderators and admins"
         everyone: "Everyone"
-      trust_levels:
-        title: "Trust level automatically granted to members when they're added:"
-        none: "None"
       notifications:
         watching:
           title: "Watching"
@@ -502,7 +530,6 @@ en:
       flair_color_placeholder: "(Optional) Hex color value"
       flair_preview_icon: "Preview Icon"
       flair_preview_image: "Preview Image"
-      flair_note: "Note: Flair will only show for a user's primary group."
 
     user_action_groups:
       "1": "Likes Given"
@@ -520,7 +547,7 @@ en:
 
     categories:
       all: "all categories"
-      all_subcategories: "all"
+      all_subcategories: "all in %{categoryName}"
       no_subcategory: "none"
       category: "Category"
       category_list: "Display category list"
@@ -581,6 +608,7 @@ en:
       activity_stream: "Activity"
       preferences: "Preferences"
       expand_profile: "Expand"
+      collapse_profile: "Collapse"
       bookmarks: "Bookmarks"
       bio: "About me"
       invited_by: "Invited By"
@@ -588,7 +616,7 @@ en:
       notifications: "Notifications"
       statistics: "Stats"
       desktop_notifications:
-        label: "Desktop Notifications"
+        label: "Live Notifications"
         not_supported: "Notifications are not supported on this browser. Sorry."
         perm_default: "Turn On Notifications"
         perm_denied_btn: "Permission Denied"
@@ -598,6 +626,7 @@ en:
         enable: "Enable Notifications"
         currently_disabled: ""
         each_browser_note: "Note: You have to change this setting on every browser you use."
+        consent_prompt: "Do you want live notifications when people reply to your posts?"
       dismiss: 'Dismiss'
       dismiss_notifications: "Dismiss All"
       dismiss_notifications_tooltip: "Mark all unread notifications as read"
@@ -605,7 +634,7 @@ en:
       disable_jump_reply: "Don't jump to my post after I reply"
       dynamic_favicon: "Show new / updated topic count on browser icon"
       theme_default_on_all_devices: "Make this my default theme on all my devices"
-      allow_private_messages: "Allow other users to send me private messages"
+      allow_private_messages: "Allow other users to send me personal messages"
       external_links_in_new_tab: "Open all external links in a new tab"
       enable_quoting: "Enable quote reply for highlighted text"
       change: "change"
@@ -629,6 +658,7 @@ en:
         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)"
+        warning: "Mailing list mode enabled. Email notification settings are overridden."
       tag_settings: "Tags"
       watched_tags: "Watched"
       watched_tags_instructions: "You will automatically watch all topics with these tags. You will be notified of all new posts and topics, and a count of new posts will also appear next to the topic."
@@ -651,7 +681,7 @@ en:
       delete_account: "Delete My Account"
       delete_account_confirm: "Are you sure you want to permanently delete your account? This action cannot be undone!"
       deleted_yourself: "Your account has been deleted successfully."
-      delete_yourself_not_allowed: "You cannot delete your account right now. Contact an admin to do delete your account for you."
+      delete_yourself_not_allowed: "Please contact a staff member if you wish your account to be deleted."
       unread_message_count: "Messages"
       admin_delete: "Delete"
       users: "Users"
@@ -687,6 +717,7 @@ en:
         move_to_archive: "Archive"
         failed_to_move: "Failed to move selected messages (perhaps your network is down)"
         select_all: "Select All"
+        tags: "Tags"
 
       preferences_nav:
         account: "Account"
@@ -707,6 +738,20 @@ en:
         choose_new: "Choose a new password"
         choose: "Choose a password"
 
+      second_factor:
+        title: "Two Factor Authentication"
+        disable: "Disable two factor authentication"
+        enable: "Enable <a href>two factor authentication</a> for enhanced account security"
+        confirm_password_description: "Please confirm your password to continue"
+        label: "Code"
+        enable_description: |
+          Scan this QR code in a supported app (<a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target="_blank">Android</a> – <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8" target="_blank">iOS</a> – <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a>) and enter your authentication code.
+        disable_description: "Please enter the authentication code from your app"
+        show_key_description: "Enter manually"
+        extended_description: |
+          Two factor authentication adds extra security to your account by requiring a one-time token in addition to your password. Tokens can be generated on <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target='_blank'>Android</a>, <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8">iOS</a>, and <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a> devices.
+        oauth_enabled_warning: "Please note that social logins will be disabled once two factor authentication has been enabled on your account."
+
       change_about:
         title: "Change About Me"
         error: "There was an error changing this value."
@@ -790,8 +835,6 @@ en:
       created: "Joined"
       log_out: "Log Out"
       location: "Location"
-      card_badge:
-        title: "User Card Badge"
 
       website: "Web Site"
       email_settings: "Email"
@@ -852,7 +895,7 @@ en:
         title: "Invites"
         user: "Invited User"
         sent: "Sent"
-        none: "There are no pending invites to display."
+        none: "No invites to display."
         truncated:
           one: "Showing the first invite."
           other: "Showing the first {{count}} invites."
@@ -954,6 +997,7 @@ en:
         header_title: "profile, messages, bookmarks and preferences"
       title:
         title: "Title"
+        none: "(none)"
 
       filters:
         all: "All"
@@ -1083,14 +1127,28 @@ en:
       help: "Email not arriving? Be sure to check your spam folder first.<p>Not sure which email address you used? Enter an email address and we’ll let you know if it exists here.</p><p>If you no longer have access to the email address on your account, please contact <a href='/about'>our helpful staff.</a></p>"
       button_ok: "OK"
       button_help: "Help"
+
+    email_login:
+      link_label: "Email me a login link"
+      button_label: "with email"
+      complete_username: "If an account matches the username <b>%{username}</b>, you should receive an email with a login link shortly."
+      complete_email: "If an account matches <b>%{email}</b>, you should receive an email with a login link shortly."
+      complete_username_found: "We found an account that matches the username <b>%{username}</b>, you should receive an email with a login link shortly."
+      complete_email_found: "We found an account that matches <b>%{email}</b>, you should receive an email with a login link shortly."
+      complete_username_not_found: "No account matches the username <b>%{username}</b>"
+      complete_email_not_found: "No account matches <b>%{email}</b>"
+
     login:
       title: "Log In"
       username: "User"
       password: "Password"
+      second_factor_title: "Two Factor Authentication"
+      second_factor_description: "Please enter the authentication code from your app:"
       email_placeholder: "email or username"
       caps_lock_warning: "Caps Lock is on"
       error: "Unknown error"
       rate_limit: "Please wait before trying to log in again."
+      blank_username: "Please enter your email or username."
       blank_username_or_password: "Please enter your email or username, and password."
       reset_password: 'Reset Password'
       logging_in: "Signing In..."
@@ -1103,6 +1161,7 @@ en:
       not_allowed_from_ip_address: "You can't login from that IP address."
       admin_not_allowed_from_ip_address: "You can't log in as admin from that IP address."
       resend_activation_email: "Click here to send the activation email again."
+      omniauth_disallow_totp: "Your account has two factor authentication enabled. Please log in with your password."
 
       resend_title: "Resend Activation Email"
       change_email: "Change Email Address"
@@ -1163,17 +1222,27 @@ en:
       categories_only: "Categories Only"
       categories_with_featured_topics: "Categories with Featured Topics"
       categories_and_latest_topics: "Categories and Latest Topics"
+      categories_and_top_topics: "Categories and Top Topics"
 
     shortcut_modifier_key:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
 
+    conditional_loading_section:
+      loading: Loading...
+
     select_kit:
       default_header_text: Select...
       no_content: No matches found
       filter_placeholder: Search...
-      create: "Create {{content}}"
+      create: "Create: '{{content}}'"
+      max_content_reached:
+        one: "You can only select {{count}} item."
+        other: "You can only select {{count}} items."
+      min_content_not_reached:
+        one: "Select at least {{count}} item."
+        other: "Select at least {{count}} items."
 
     emoji_picker:
       filter_placeholder: Search for emoji
@@ -1193,6 +1262,14 @@ en:
       medium_dark_tone: Medium dark skin tone
       dark_tone: Dark skin tone
 
+    shared_drafts:
+      title: "Shared Drafts"
+      notice: "This topic is only visible to those who can see the <b>{{category}}</b> category."
+      destination_category: "Destination Category"
+      publish: "Publish Shared Draft"
+      confirm_publish: "Are you sure you want to publish this draft?"
+      publishing: "Publishing Topic..."
+
     composer:
       emoji: "Emoji :)"
       more_emoji: "more..."
@@ -1228,6 +1305,7 @@ en:
         post_length: "Post must be at least {{min}} characters"
         try_like: 'Have you tried the <i class="fa fa-heart"></i> button?'
         category_missing: "You must choose a category"
+        tags_missing: "You must choose at least {{count}} tags"
 
       save_edit: "Save Edit"
       reply_original: "Reply on Original Topic"
@@ -1237,6 +1315,8 @@ en:
       create_topic: "Create Topic"
       create_pm: "Message"
       create_whisper: "Whisper"
+      create_shared_draft: "Create Shared Draft"
+      edit_shared_draft: "Edit Shared Draft"
       title: "Or press Ctrl+Enter"
 
       users_placeholder: "Add a user"
@@ -1247,6 +1327,8 @@ en:
       topic_featured_link_placeholder: "Enter link shown with title."
       remove_featured_link: "Remove link from topic."
       reply_placeholder: "Type here. Use Markdown, BBCode, or HTML to format. Drag or paste images."
+      reply_placeholder_no_images: "Type here. Use Markdown, BBCode, or HTML to format."
+      reply_placeholder_choose_category: "You must select a category before typing here."
       view_new_post: "View your new post."
       saving: "Saving"
       saved: "Saved!"
@@ -1277,6 +1359,7 @@ en:
       olist_title: "Numbered List"
       ulist_title: "Bulleted List"
       list_item: "List item"
+      toggle_direction: "Toggle Direction"
       help: "Markdown Editing Help"
       collapse: "minimize the composer panel"
       abandon: "close composer and discard draft"
@@ -1289,6 +1372,28 @@ en:
 
       admin_options_title: "Optional staff settings for this topic"
 
+      composer_actions:
+        reply_to_post:
+          label: Reply to post %{postNumber} by %{postUsername}
+          desc: Reply to a specific post
+        reply_as_new_topic:
+          label: Reply as linked topic
+          desc: Create a new topic linked to this topic
+        reply_as_private_message:
+          label: New message
+          desc: Create a new personal message
+        reply_to_topic:
+          label: Reply to topic
+          desc: Reply to the topic, not any specific post
+        toggle_whisper:
+          label: Toggle whisper
+          desc: Whispers are only visible to staff members
+        create_topic:
+          label: "New Topic"
+        shared_draft:
+          label: "Shared Draft"
+          desc: "Draft a topic that will only be visible to staff"
+
     notifications:
       tooltip:
         regular:
@@ -1327,31 +1432,16 @@ en:
           one: "{{count}} message in your {{group_name}} inbox"
           other: "{{count}} messages in your {{group_name}} inbox"
 
-      alt:
-        mentioned: "Mentioned by"
-        quoted: "Quoted by"
-        replied: "Replied"
-        posted: "Post by"
-        edited: "Edit your post by"
-        liked: "Liked your post"
-        private_message: "Private message from"
-        invited_to_private_message: "Invited to a private message from"
-        invited_to_topic: "Invited to a topic from"
-        invitee_accepted: "Invite accepted by"
-        moved_post: "Your post was moved by"
-        linked: "Link to your post"
-        granted_badge: "Badge granted"
-        group_message_summary: "Messages in group inbox"
-        topic_reminder: "A reminder"
-
       popup:
         mentioned: '{{username}} mentioned you in "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} mentioned you in "{{topic}}" - {{site_title}}'
         quoted: '{{username}} quoted you in "{{topic}}" - {{site_title}}'
         replied: '{{username}} replied to you in "{{topic}}" - {{site_title}}'
         posted: '{{username}} posted in "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} sent you a private message in "{{topic}}" - {{site_title}}'
+        private_message: '{{username}} sent you a personal message in "{{topic}}" - {{site_title}}'
         linked: '{{username}} linked to your post from "{{topic}}" - {{site_title}}'
+        confirm_title: 'Notifications enabled - %{site_title}'
+        confirm_body: 'Success! Notifications have been enabled.'
 
     upload_selector:
       title: "Add an image"
@@ -1380,9 +1470,10 @@ en:
       clear_all: "Clear All"
       too_short: "Your search term is too short."
       result_count:
-        one: "1 result for <span class='term'>{{term}}</span>"
-        other: "{{count}}{{plus}} results for <span class='term'>{{term}}</span>"
+        one: "<span>1 result for</span><span class='term'>{{term}}</span>"
+        other: "<span>{{count}}{{plus}} results for</span><span class='term'>{{term}}</span>"
       title: "search topics, posts, users, or categories"
+      full_page_title: "search topics or posts"
       no_results: "No results found."
       no_more_results: "No more results found."
       searching: "Searching ..."
@@ -1416,6 +1507,7 @@ en:
           label: Tagged
         filters:
           label: Only return topics/posts...
+          title: Matching in title only
           likes: I liked
           posted: I posted in
           watching: I'm watching
@@ -1509,14 +1601,12 @@ en:
         search: "There are no more search results."
 
     topic:
-      unsubscribe:
-        stop_notifications: "You will now receive less notifications for <strong>{{title}}</strong>"
-        change_notification_state: "Your current notification state is "
       filter_to:
         one: "1 post in topic"
         other: "{{count}} posts in topic"
       create: 'New Topic'
       create_long: 'Create a new Topic'
+      open_draft: "Open Draft"
       private_message: 'Start a message'
       archive_message:
         help: 'Move message to your archive'
@@ -1524,6 +1614,9 @@ en:
       move_to_inbox:
         title: 'Move to Inbox'
         help: 'Move message back to Inbox'
+      edit_message:
+        help: 'Edit first post of the message'
+        title: 'Edit Message'
       list: 'Topics'
       new: 'new topic'
       unread: 'unread'
@@ -1718,7 +1811,7 @@ en:
         visible: "Make Listed"
         reset_read: "Reset Read Data"
         make_public: "Make Public Topic"
-        make_private: "Make Private Message"
+        make_private: "Make Personal Message"
 
       feature:
         pin: "Pin Topic"
@@ -1847,7 +1940,7 @@ en:
         instructions:
           one: "Please choose the new owner of the post by <b>{{old_user}}</b>."
           other: "Please choose the new owner of the {{count}} posts by <b>{{old_user}}</b>."
-        instructions_warn: "Note that any notifications about this post will not be transferred to the new user retroactively.<br>Warning: Currently, no post-dependent data is transferred over to the new user. Use with caution."
+        instructions_warn: "Note that any notifications about this post will not be transferred to the new user retroactively."
 
       change_timestamp:
         title: "Change Timestamp..."
@@ -1880,8 +1973,6 @@ en:
           other: "You have selected <b>{{count}}</b> posts."
 
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Quote"
       edit: "<i class='fa fa-pencil'></i> {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Reason: "
@@ -1897,7 +1988,9 @@ en:
       deleted_by_author:
         one: "(post withdrawn by author, will be automatically deleted in %{count} hour unless flagged)"
         other: "(post withdrawn by author, will be automatically deleted in %{count} hours unless flagged)"
+      collapse: "collapse"
       expand_collapse: "expand/collapse"
+      locked: "a staff member has locked this post from being edited"
       gap:
         one: "view 1 hidden reply"
         other: "view {{count}} hidden replies"
@@ -1978,6 +2071,11 @@ en:
         rebake: "Rebuild HTML"
         unhide: "Unhide"
         change_owner: "Change Ownership"
+        grant_badge: "Grant Badge"
+        lock_post: "Lock Post"
+        lock_post_description: "prevent the poster from editing this post"
+        unlock_post: "Unlock Post"
+        unlock_post_description: "allow the poster to edit this post"
 
       actions:
         flag: 'Flag'
@@ -2157,7 +2255,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.'
       mailinglist_mirror: "Category mirrors a mailing list"
-      suppress_from_homepage: "Suppress this category from the homepage."
+      suppress_from_latest: "Suppress category from latest topics."
       show_subcategory_list: "Show subcategory list above topics in this category."
       num_featured_topics: "Number of topics shown on the categories page:"
       subcategory_num_featured_topics: "Number of featured topics on parent category's page:"
@@ -2174,6 +2272,7 @@ en:
       default_position: "Default Position"
       position_disabled: "Categories will be displayed in order of activity. To control the order of categories in lists, "
       position_disabled_click: 'enable the "fixed category positions" setting.'
+      minimum_required_tags: 'Minimum number of tags required in a topic:'
       parent: "Parent Category"
       notifications:
         watching:
@@ -2442,6 +2541,9 @@ en:
         dismiss_new_posts: '<b>x</b>, <b>r</b> Dismiss New/Posts'
         dismiss_topics: '<b>x</b>, <b>t</b> Dismiss Topics'
         log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Log Out'
+      composing:
+        title: 'Composing'
+        return: '<b>shift</b>+<b>c</b> Return to composer'
       actions:
         title: 'Actions'
         bookmark_topic: '<b>f</b> Toggle bookmark topic'
@@ -2482,7 +2584,8 @@ en:
         one:   "1 granted"
         other: "%{count} granted"
       select_badge_for_title: Select a badge to use as your title
-      none: "<none>"
+      none: "(none)"
+      successfully_granted: "Successfully granted %{badge} to %{username}"
       badge_grouping:
         getting_started:
           name: Getting Started
@@ -2507,6 +2610,7 @@ en:
 
     tagging:
       all_tags: "All Tags"
+      other_tags: "Other Tags"
       selector_all_tags: "all tags"
       selector_no_tags: "no tags"
       changed: "tags changed:"
@@ -2534,19 +2638,19 @@ en:
       notifications:
         watching:
           title: "Watching"
-          description: "You will automatically watch all topics in this tag. You will be notified of all new posts and topics, plus the count of unread and new posts will also appear next to the topic."
+          description: "You will automatically watch all topics with this tag. You will be notified of all new posts and topics, plus the count of unread and new posts will also appear next to the topic."
         watching_first_post:
           title: "Watching First Post"
-          description: "You will only be notified of the first post in each new topic in this tag."
+          description: "You will only be notified of the first post in each new topic with this tag."
         tracking:
           title: "Tracking"
-          description: "You will automatically track all topics in this tag. A count of unread and new posts will appear next to the topic."
+          description: "You will automatically track all topics with this tag. A count of unread and new posts will appear next to the topic."
         regular:
           title: "Regular"
           description: "You will be notified if someone mentions your @name or replies to your post."
         muted:
           title: "Muted"
-          description: "You will not be notified of anything about new topics in this tag, and they will not appear on your unread tab."
+          description: "You will not be notified of anything about new topics with this tag, and they will not appear on your unread tab."
 
       groups:
         title: "Tag Groups"
@@ -2561,6 +2665,9 @@ en:
         save: "Save"
         delete: "Delete"
         confirm_delete: "Are you sure you want to delete this tag group?"
+        everyone_can_use: "Tags can be used by everyone"
+        usable_only_by_staff: "Tags are visible to everyone, but only staff can use them"
+        visible_only_to_staff: "Tags are visible only to staff"
 
       topics:
         none:
@@ -2591,10 +2698,11 @@ en:
       custom_message_template_forum: "Hey, you should join this forum!"
       custom_message_template_topic: "Hey, I thought you might enjoy this topic!"
 
+    forced_anonymous: "Due to extreme load, this is temporarily being shown to everyone as a logged out user would see it."
+
     safe_mode:
       enabled: "Safe mode is enabled, to exit safe mode close this browser window"
 
-
   # This section is exported to the javascript for i18n in the admin section
   admin_js:
     type_to_filter: "type to filter..."
@@ -2606,6 +2714,8 @@ en:
       dashboard:
         title: "Dashboard"
         last_updated: "Dashboard last updated:"
+        find_old: "Looking for the old dashboard?"
+        old_link: "visit it here"
         version: "Version"
         up_to_date: "You're up to date!"
         critical_available: "A critical update is available."
@@ -2630,17 +2740,22 @@ en:
         space_free: "{{size}} free"
         uploads: "uploads"
         backups: "backups"
+        lastest_backup: "Latest: %{date}"
         traffic_short: "Traffic"
         traffic: "Application web requests"
         page_views: "Pageviews"
         page_views_short: "Pageviews"
         show_traffic_report: "Show Detailed Traffic Report"
+        community_health: Community health
+        whats_new_in_discourse: What’s new in Discourse?
+        activity_metrics: Activity Metrics
 
         reports:
+          trend_title: "%{percent} change. Currently %{current}, was %{prev} in previous period."
           today: "Today"
           yesterday: "Yesterday"
-          last_7_days: "Last 7 Days"
-          last_30_days: "Last 30 Days"
+          last_7_days: "Last 7"
+          last_30_days: "Last 30"
           all_time: "All Time"
           7_days_ago: "7 Days Ago"
           30_days_ago: "30 Days Ago"
@@ -2651,6 +2766,10 @@ en:
           start_date: "Start Date"
           end_date: "End Date"
           groups: "All groups"
+          disabled: "This report is disabled"
+          trending_search:
+            more: '<a href="/admin/logs/search_logs">Search logs</a>'
+            disabled: 'Trending search report is disabled. Enable <a href="/admin/site_settings/category/all_results?filter=log%20search%20queries">log search queries</a> to collect data.'
 
       commits:
         latest_changes: "Latest changes: please update often!"
@@ -2665,14 +2784,19 @@ en:
 
         agree: "Agree"
         agree_title: "Confirm this flag as valid and correct"
-        agree_flag_hide_post: "Agree and Hide Post"
+        agree_flag_hide_post: "Hide Post"
         agree_flag_hide_post_title: "Hide this post and automatically send the user a message urging them to edit it."
         agree_flag_restore_post: "Agree and Restore Post"
         agree_flag_restore_post_title: "Restore the post so that all users can see it."
-        agree_flag: "Agree and Keep Post"
+        agree_flag_suspend: "Suspend User"
+        agree_flag_suspend_title: "Agree with flag and suspend the user."
+        agree_flag_silence: "Silence User"
+        agree_flag_silence_title: "Agree with flag and silence the user."
+
+        agree_flag: "Keep Post"
         agree_flag_title: "Agree with flag and keep the post unchanged."
-        defer_flag: "Ignore"
-        defer_flag_title: "Remove this flag; it requires no action at this time."
+        ignore_flag: "Ignore"
+        ignore_flag_title: "Remove this flag; it requires no action at this time."
         delete: "Delete"
         delete_title: "Delete the post this flag refers to."
         delete_post_defer_flag: "Delete Post and Ignore flag"
@@ -2691,6 +2815,12 @@ en:
         more: "(more replies...)"
         suspend_user: "Suspend User"
         suspend_user_title: "Suspend user for this post"
+        replies:
+          one: "[1 reply]"
+          other: "[%{count} replies]"
+        delete_replies:
+          one: "Also delete the %{count} reply to this post?"
+          other: "Also delete the %{count} replies to this post?"
 
         dispositions:
           agreed: "agreed"
@@ -2717,6 +2847,7 @@ en:
           type: "Type"
           users: "Users"
           last_flagged: "Last Flagged"
+          no_results: "There are no flagged topics."
 
         short_names:
           off_topic: "off-topic"
@@ -2726,13 +2857,48 @@ en:
           notify_moderators: "custom"
 
       groups:
+        new:
+          title: "New Group"
+          create: "Create"
+          name:
+            too_short: "Group name is too short"
+            too_long: "Group name is too long"
+            checking: "Checking group name availability..."
+            available: "Group name is available"
+            not_available: "Group name is not available"
+            blank: "Group name cannot be blank"
+        bulk_add:
+          title: "Bulk Add to Group"
+          complete_users_not_added: "These users were not added (make sure they have an account):"
+          paste: "Paste a list of usernames or emails, one per line:"
+        add_members:
+          as_owner: "Set user(s) as owner(s) of this group"
+        manage:
+          interaction:
+            email: Email
+            incoming_email: "Custom incoming email address"
+            incoming_email_placeholder: "enter email address"
+            visibility: Visibility
+            visibility_levels:
+              title: "Who can see this group?"
+              public: "Everyone"
+              members: "Group owners, members and admins"
+              staff: "Group owners and staff"
+              owners: "Group owners and admins"
+          membership:
+            automatic: Automatic
+            trust_level: Trust Level
+            trust_levels_title: "Trust level automatically granted to members when they're added:"
+            trust_levels_none: "None"
+            automatic_membership_email_domains: "Users who register with an email domain that exactly matches one in this list will be automatically added to this group:"
+            automatic_membership_retroactive: "Apply the same email domain rule to add existing registered users"
+            primary_group: "Automatically set as primary group"
+        name_placeholder: "Group name, no spaces, same as username rule"
         primary: "Primary Group"
         no_primary: "(no primary group)"
         title: "Groups"
         edit: "Edit Groups"
         refresh: "Refresh"
-        new: "New"
-        selector_placeholder: "enter username"
         about: "Edit your group membership and names here"
         group_members: "Group members"
         delete: "Delete"
@@ -2740,22 +2906,12 @@ en:
         delete_failed: "Unable to delete group. If this is an automatic group, it cannot be destroyed."
         delete_owner_confirm: "Remove owner privilege for '%{username}'?"
         add: "Add"
-        add_members: "Add members"
         custom: "Custom"
-        bulk_complete: "The users have been added to the group."
-        bulk_complete_users_not_added: "These users were not added (make sure they have an account):"
-        bulk: "Bulk Add to Group"
-        bulk_paste: "Paste a list of usernames or emails, one per line:"
-        bulk_select: "(select a group)"
         automatic: "Automatic"
-        automatic_membership_email_domains: "Users who register with an email domain that exactly matches one in this list will be automatically added to this group:"
-        automatic_membership_retroactive: "Apply the same email domain rule to add existing registered users"
-        default_title: "Default title for all users in this group"
-        primary_group: "Automatically set as primary group"
+        default_title: "Default title"
+        default_title_description: "will be applied to all users in the group"
         group_owners: Owners
         add_owners: Add owners
-        incoming_email: "Custom incoming email address"
-        incoming_email_placeholder: "enter email address"
         none_selected: "Select a group to get started"
         no_custom_groups: "Create a new custom group"
 
@@ -2815,6 +2971,18 @@ en:
         user_event:
           name: "User Event"
           details: "When a user logs in, logs out, is created, approved or updated."
+        group_event:
+          name: "Group Event"
+          details: "When a group is created, updated or destroyed."
+        category_event:
+          name: "Category Event"
+          details: "When a category is created, updated or destroyed."
+        tag_event:
+          name: "Tag Event"
+          details: "When a tag is created, updated or destroyed."
+        flag_event:
+          name: "Flag Event"
+          details: "When a flag is created, agreed, disagreed or ignored."
         delivery_status:
           title: "Delivery Status"
           inactive: "Inactive"
@@ -2856,6 +3024,7 @@ en:
         change_settings: "Change Settings"
         change_settings_short: "Settings"
         howto: "How do I install plugins?"
+        official: "Official Plugin"
 
       backups:
         title: "Backups"
@@ -2880,7 +3049,7 @@ en:
           label: "Upload"
           title: "Upload a backup to this instance"
           uploading: "Uploading..."
-          success: "'{{filename}}' has successfully been uploaded."
+          success: "'{{filename}}' has successfully been uploaded. The file is now being processed and will take up to a minute to show up in the list."
           error: "There has been an error while uploading '{{filename}}': {{message}}"
         operations:
           is_running: "An operation is currently running..."
@@ -2893,7 +3062,7 @@ en:
             label: "Backup"
             title: "Create a backup"
             confirm: "Do you want to start a new backup?"
-            without_uploads: "Yes (do not include files)"
+            without_uploads: "Yes (do not include uploads)"
           download:
             label: "Download"
             title: "Send email with download link"
@@ -2966,6 +3135,7 @@ en:
           common: "Common"
           desktop: "Desktop"
           mobile: "Mobile"
+          settings: "Settings"
           preview: "Preview"
           is_default: "Theme is enabled by default"
           user_selectable: "Theme can be selected by users"
@@ -2978,6 +3148,11 @@ en:
           add_upload: "Add Upload"
           upload_file_tip: "Choose an asset to upload (png, woff2, etc...)"
           variable_name: "SCSS var name:"
+          variable_name_invalid: "Invalid variable name. Only alphanumeric allowed. Must start with a letter. Must be unique."
+          variable_name_error:
+            invalid_syntax: "Invalid variable name. Only alphanumeric allowed. Must start with a letter."
+            no_overwrite: "Invalid variable name. Must not overwrite an existing variable."
+            must_be_unique: "Invalid variable name. Must be unique."
           upload: "Upload"
           child_themes_check: "Theme includes other child themes"
           css_html: "Custom CSS/HTML"
@@ -2986,6 +3161,8 @@ en:
           delete_upload_confirm: "Delete this upload? (Theme CSS may stop working!)"
           import_web_tip: "Repository containing theme"
           import_file_tip: ".dcstyle.json file containing theme"
+          is_private: "Theme is in a private git repository"
+          public_key: "Grant the following public key access to the repo:"
           about_theme: "About Theme"
           license: "License"
           component_of: "Theme is a component of:"
@@ -2994,6 +3171,8 @@ en:
           updating: "Updating..."
           up_to_date: "Theme is up-to-date, last checked:"
           add: "Add"
+          theme_settings: "Theme Settings"
+          no_settings: "This theme has no settings."
           commits_behind:
             one: "Theme is 1 commit behind!"
             other: "Theme is {{count}} commits behind!"
@@ -3018,6 +3197,9 @@ en:
           body_tag:
             text: "</body>"
             title: "HTML that will be inserted before the </body> tag"
+          yaml:
+            text: "YAML"
+            title: "Define theme settings in YAML format"
         colors:
           select_base:
             title: "Select base color scheme"
@@ -3182,10 +3364,13 @@ en:
             change_site_text: "change site text"
             suspend_user: "suspend user"
             unsuspend_user: "unsuspend user"
+            removed_suspend_user: "suspend user (removed)"
+            removed_unsuspend_user: "unsuspend user (removed)"
             grant_badge: "grant badge"
             revoke_badge: "revoke badge"
             check_email: "check email"
             delete_topic: "delete topic"
+            recover_topic: "un-delete topic"
             delete_post: "delete post"
             impersonate: "impersonate"
             anonymize_user: "anonymize user"
@@ -3195,6 +3380,8 @@ en:
             create_category: "create category"
             silence_user: "silence user"
             unsilence_user: "unsilence user"
+            removed_silence_user: "silence user (removed)"
+            removed_unsilence_user: "unsilence user (removed)"
             grant_admin: "grant admin"
             revoke_admin: "revoke admin"
             grant_moderation: "grant moderation"
@@ -3212,6 +3399,16 @@ en:
             backup_destroy: "destroy backup"
             reviewed_post: "reviewed post"
             custom_staff: "plugin custom action"
+            post_locked: "post locked"
+            post_edit: "post edit"
+            post_unlocked: "post unlocked"
+            check_personal_message: "check personal message"
+            disabled_second_factor: "disable Two Factor Authentication"
+            topic_published: "topic published"
+            post_approved: "post approved"
+            create_badge: "create badge"
+            change_badge: "change badge"
+            delete_badge: "delete badge"
         screened_emails:
           title: "Screened Emails"
           description: "When someone tries to create a new account, the following email addresses will be checked and the registration will be blocked, or some other action performed."
@@ -3254,6 +3451,7 @@ en:
             header: "Header"
             full_page: "Full Page"
             click_through_only: "All (click through only)"
+          header_search_results: "Header Search Results"
         logster:
           title: "Error Logs"
 
@@ -3281,6 +3479,7 @@ en:
           placeholder_regexp: "regular expression"
           add: 'Add'
           success: 'Success'
+          exists: 'Already exists'
           upload: "Upload"
           upload_successful: "Upload successful. Words have been added."
 
@@ -3306,6 +3505,7 @@ en:
           suspended: 'Suspended'
           silenced: 'Silenced'
           suspect: 'Suspect'
+          staged: 'Staged'
         approved: "Approved?"
         approved_selected:
           one: "approve user"
@@ -3328,6 +3528,7 @@ en:
           silenced: 'Silenced Users'
           suspended: 'Suspended Users'
           suspect: 'Suspect Users'
+          staged: 'Staged Users'
         reject_successful:
           one: "Successfully rejected 1 user."
           other: "Successfully rejected %{count} users."
@@ -3361,6 +3562,14 @@ en:
         suspended_until: "(until %{until})"
         cant_suspend: "This user cannot be suspended."
         delete_all_posts: "Delete all posts"
+        penalty_post_actions: "What would you like to do with the associated post?"
+        penalty_post_delete: "Delete the post"
+        penalty_post_edit: "Edit the post"
+        penalty_post_none: "Do nothing"
+        penalty_count: "Penalty Count"
+        clear_penalty_history:
+          title: "Clear Penalty History"
+          description: "users with penalties cannot reach TL3"
 
         # keys ending with _MF use message format, see https://meta.discourse.org/t/message-format-support-for-localization/7035 for details
         delete_all_posts_confirm_MF: "You are about to delete {POSTS, plural, one {1 post} other {# posts}} and {TOPICS, plural, one {1 topic} other {# topics}}. Are you sure?"
@@ -3387,6 +3596,9 @@ en:
         grant_moderation: 'Grant Moderation'
         unsuspend: 'Unsuspend'
         suspend: 'Suspend'
+        show_flags_received: "Show Flags Received"
+        flags_received_by: "Flags Received by %{username}"
+        flags_received_none: "This user has not received any flags."
         reputation: Reputation
         permissions: Permissions
         activity: Activity
@@ -3395,6 +3607,7 @@ en:
         private_topics_count: Private Topics
         posts_read_count: Posts Read
         post_count: Posts Created
+        second_factor_enabled: Two Factor Authentication Enabled
         topics_entered: Topics Viewed
         flags_given_count: Flags Given
         flags_received_count: Flags Received
@@ -3424,6 +3637,7 @@ en:
         delete_confirm: "Are you SURE you want to delete this user? This is permanent!"
         delete_and_block: "Delete and <b>block</b> this email and IP address"
         delete_dont_block: "Delete only"
+        deleting_user: "Deleting user..."
         deleted: "The user was deleted."
         delete_failed: "There was an error deleting that user. Make sure all posts are deleted before trying to delete the user."
         send_activation_email: "Send Activation Email"
@@ -3479,6 +3693,8 @@ en:
           likes_received: "Likes Received"
           likes_received_days: "Likes Received: unique days"
           likes_received_users: "Likes Received: unique users"
+          suspended: "Suspended (all time)"
+          silenced: "Silenced (all time)"
           qualifies: "Qualifies for trust level 3."
           does_not_qualify: "Doesn't qualify for trust level 3."
           will_be_promoted: "Will be promoted soon."
@@ -3541,12 +3757,14 @@ en:
         recommended: "We recommend customizing the following text to suit your needs:"
         show_overriden: 'Only show overridden'
 
-      site_settings:
+      settings: # used by theme and site settings
         show_overriden: 'Only show overridden'
-        title: 'Settings'
         reset: 'reset'
         none: 'none'
+      site_settings:
+        title: 'Settings'
         no_results: "No results found."
+        more_than_30_results: "There are more than 30 results. Please refine your search or select a category."
         clear_filter: "Clear"
         add_url: "add URL"
         add_host: "add host"
@@ -3614,7 +3832,8 @@ en:
         enabled: Enable badge
         icon: Icon
         image: Image
-        icon_help: "Use either a Font Awesome class or URL to an image"
+        icon_help: "Use a Font Awesome class"
+        image_help: "Enter the URL of the image (overrides icon field if both are set)"
         query: Badge Query (SQL)
         target_posts: Query targets posts
         auto_revoke: Run revocation query daily
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index f38923daae3..c3d635e8fdc 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -43,68 +43,68 @@ es:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: "< 1s"
-          other: "< %{count}s"
+          one: < 1s
+          other: < %{count}s
         x_seconds:
-          one: "1s"
-          other: "%{count}s"
+          one: 1s
+          other: '%{count}s'
         less_than_x_minutes:
-          one: "< 1m"
-          other: "< %{count}m"
+          one: < 1m
+          other: < %{count}m
         x_minutes:
-          one: "1m"
-          other: "%{count}m"
+          one: 1m
+          other: '%{count}m'
         about_x_hours:
-          one: "1h"
-          other: "%{count}h"
+          one: 1h
+          other: '%{count}h'
         x_days:
-          one: "1d"
-          other: "%{count}d"
+          one: 1d
+          other: '%{count}d'
         x_months:
-          one: "1 mes"
-          other: "%{count}meses"
+          one: 1 mes
+          other: '%{count}meses'
         about_x_years:
-          one: "1a"
-          other: "%{count}a"
+          one: 1a
+          other: '%{count}a'
         over_x_years:
-          one: "> 1a"
-          other: "> %{count}a"
+          one: '> 1a'
+          other: '> %{count}a'
         almost_x_years:
-          one: "1a"
-          other: "%{count}a"
+          one: 1a
+          other: '%{count}a'
         date_month: "D MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: "1 minuto"
-          other: "%{count} mins"
+          one: 1 minuto
+          other: '%{count} mins'
         x_hours:
-          one: "1 hora"
-          other: "%{count} horas"
+          one: 1 hora
+          other: '%{count} horas'
         x_days:
-          one: "1 día"
-          other: "%{count} días"
+          one: 1 día
+          other: '%{count} días'
         date_year: "D MMM, 'YY"
       medium_with_ago:
         x_minutes:
-          one: "hace 1 minuto"
-          other: "hace %{count} minutos"
+          one: hace 1 minuto
+          other: hace %{count} minutos
         x_hours:
-          one: "hace 1 hora"
-          other: "hace %{count} horas"
+          one: hace 1 hora
+          other: hace %{count} horas
         x_days:
-          one: "hace 1 día"
-          other: "hace %{count} días"
+          one: hace 1 día
+          other: hace %{count} días
       later:
         x_days:
-          one: "1 día después"
-          other: "%{count} días después"
+          one: 1 día después
+          other: '%{count} días después'
         x_months:
-          one: "%{count} mes después"
-          other: "%{count} meses después"
+          one: '%{count} mes después'
+          other: '%{count} meses después'
         x_years:
-          one: "%{count} año después"
-          other: "%{count} años después"
+          one: '%{count} año después'
+          other: '%{count} años después'
       previous_month: 'Mes anterior'
       next_month: 'Próximo mes'
       placeholder: fecha
@@ -118,11 +118,11 @@ es:
       email: 'comparte este enlace por email'
     action_codes:
       public_topic: "hizo este tema público %{when}"
-      private_topic: "hizo este tema privado %{when}"
+      private_topic: "hizo este tema un mensaje personal %{when}"
       split_topic: "separó este tema %{when}"
       invited_user: "invitó a %{who} %{when}"
       invited_group: "invitó a %{who} %{when}"
-      user_left: "%{who} se han eliminado de este mensaje %{when}"
+      user_left: "%{who} se eliminó a sí mismo de este mensaje %{when}"
       removed_user: "eliminó a %{who} %{when}"
       removed_group: "eliminó a %{who} %{when}"
       autoclosed:
@@ -149,8 +149,8 @@ es:
     topic_admin_menu: "acciones de administrador para el tema"
     wizard_required: "¡Bienvenido a tu nuevo Discourse! Empezaremos con <a href='%{url}' data-auto-route='true'>el asistente de configuración</a>  ✨"
     emails_are_disabled: "Todos los emails salientes han sido desactivados por un administrador. No se enviará ninguna notificación por email."
-    bootstrap_mode_enabled: "Para lanzar tu nuevo sitio más fácilmente, estás en modo de arranque. A todos los nuevos usuarios se les concederá el nivel 1 de confianza y recibirán resúmenes diarios por email. Esto se desactivará automáticamente cuando el número total de usuarios exceda los %{min_users}."
-    bootstrap_mode_disabled: "El modo de arranque se desactivará en las próximas 24 horas."
+    bootstrap_mode_enabled: "Para lanzar tu nuevo sitio más fácilmente, estás en modo Bootstrap. A todos los nuevos usuarios se les concederá el nivel 1 de confianza y recibirán resúmenes diarios por email. Esto se desactivará automáticamente cuando el número total de usuarios exceda los %{min_users}."
+    bootstrap_mode_disabled: "El modo Bootstrap se inhabilitará en 24 horas."
     themes:
       default_description: "Por defecto"
     s3:
@@ -174,6 +174,7 @@ es:
     not_implemented: "Esta característica no ha sido implementada aún, ¡lo sentimos!"
     no_value: "No"
     yes_value: "Sí"
+    submit: "Enviar"
     generic_error: "Lo sentimos, ha ocurrido un error."
     generic_error_with_reason: "Ha ocurrido un error: %{error}"
     sign_up: "Registrarse"
@@ -186,8 +187,8 @@ es:
     show_help: "opciones"
     links: "Enlaces"
     links_lowercase:
-      one: "enlace"
-      other: "enlaces"
+      one: enlace
+      other: enlaces
     faq: "FAQ"
     guidelines: "Directrices"
     privacy_policy: "Política de Privacidad"
@@ -211,8 +212,8 @@ es:
     max_of_count: "máximo de {{count}}"
     alternation: "o"
     character_count:
-      one: "{{count}} carácter"
-      other: "{{count}} caracteres"
+      one: '{{count}} carácter'
+      other: '{{count}} caracteres'
     suggested_topics:
       title: "Temas Sugeridos"
       pm_title: "Mensajes sugeridos"
@@ -224,8 +225,8 @@ es:
       our_moderators: "Nuestros Moderadores"
       stat:
         all_time: "Todo el tiempo"
-        last_7_days: "Últimos 7 días"
-        last_30_days: "Últimos 30 días"
+        last_7_days: "Últimos 7"
+        last_30_days: "Últimos 30"
       like_count: "Me gusta"
       topic_count: "Temas"
       post_count: "Posts"
@@ -247,15 +248,14 @@ es:
       remove: "Eliminar marcador"
       confirm_clear: "¿Seguro que deseas borrar todos los marcadores de este tema?"
     topic_count_latest:
-      one: "Un tema nuevo o actualizado."
-      other: "{{count}} temas nuevos o actualizados."
+      one: Ver {{count}} tema nuevo o actualizado
+      other: Ver {{count}} temas nuevos o actualizados
     topic_count_unread:
-      one: "Un tema sin leer."
-      other: "{{count}} temas sin leer."
+      one: Ver {{count}} tema sin leer
+      other: Ver {{count}} temas sin leer
     topic_count_new:
-      one: "Un nuevo tema."
-      other: "{{count}} nuevos temas."
-    click_to_show: "Clic para mostrar."
+      one: Ver {{count}} tema nuevo
+      other: Ver {{count}} temas nuevos
     preview: "vista previa"
     cancel: "cancelar"
     save: "Guardar cambios"
@@ -265,9 +265,10 @@ es:
     uploading: "Subiendo..."
     uploading_filename: "Subiendo {{filename}}..."
     uploaded: "¡Subido!"
-    pasting: "Copiando..."
+    pasting: "Pegando..."
     enable: "Activar"
     disable: "Desactivar"
+    continue: "Continuar"
     undo: "Deshacer"
     revert: "Revertir"
     failed: "Falló"
@@ -292,16 +293,16 @@ es:
       cancel: "Cancelar"
       view_pending: "ver posts pendientes"
       has_pending_posts:
-        one: "Este tema tiene <b>1</b> post esperando aprobación"
-        other: "Este tema tiene <b>{{count}}</b> posts esperando aprobación"
+        one: Este tema tiene <b>1</b> post esperando aprobación
+        other: Este tema tiene <b>{{count}}</b> posts esperando aprobación
       confirm: "Guardar cambios"
       delete_prompt: "¿Seguro que quieres eliminar a <b>%{username}</b>? Se eliminarán todos sus posts y se bloqueará su email y dirección IP."
       approval:
         title: "El post necesita aprobación"
         description: "Hemos recibido tu nuevo post pero necesita ser aprobado por un moderador antes de aparecer. Por favor, ten paciencia."
         pending_posts:
-          one: "Tienes <strong>1</strong> post pendiente."
-          other: "Tienes <strong>{{count}}</strong> posts pendientes."
+          one: Tienes <strong>1</strong> post pendiente.
+          other: Tienes <strong>{{count}}</strong> posts pendientes.
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> publicó <a href='{{topicUrl}}'>el tema</a>"
@@ -335,8 +336,8 @@ es:
       posts_read: "Leídos"
       posts_read_long: "Posts leídos"
       total_rows:
-        one: "1 usuario"
-        other: "%{count} usuarios"
+        one: 1 usuario
+        other: '%{count} usuarios'
     group_histories:
       actions:
         change_group_setting: "Cambiar ajustes de grupo"
@@ -345,22 +346,35 @@ es:
         make_user_group_owner: "Convertir en dueño"
         remove_user_as_group_owner: "Quitar de dueño"
     groups:
-      logs:
-        title: "Registros"
-        when: "Cuándo"
-        action: "Acción"
-        acting_user: "Usuario que actuó"
-        target_user: "Usuario objetivo"
-        subject: "Asunto"
-        details: "Detalles"
-        from: "De"
-        to: "A"
-      edit:
-        title: 'Editar grupo'
-        full_name: 'Nombre completo'
+      add_members:
+        title: "Añadir miembros"
+        description: "Administrar la membresía de éste grupo"
+        usernames: "Nombres de usuario"
+      manage:
+        title: 'Gestionar'
+        name: 'Nombre'
+        full_name: 'Nombre Completo'
         add_members: "Añadir miembros"
         delete_member_confirm: "¿Quitar a '%{username}' del grupo '%{group}'?"
-      name_placeholder: "Nombre del grupo, sin espacios, igual que los nombres de usuarios"
+        profile:
+          title: Perfil
+        interaction:
+          title: Interacción
+          posting: Publicar
+          notification: Notificación
+        membership:
+          title: Membresía
+          access: Acceso
+        logs:
+          title: "Registros"
+          when: "Cuándo"
+          action: "Acción"
+          acting_user: "Usuario que actuó"
+          target_user: "Usuario objetivo"
+          subject: "Asunto"
+          details: "Detalles"
+          from: "Desde"
+          to: "Para"
       public_admission: "Permitir a los usuarios unirse al grupo cuando quieran (Requiere que el grupo sea visible)"
       public_exit: "Permitir a los usuarios dejar el grupo libremente"
       empty:
@@ -371,13 +385,10 @@ es:
         topics: "No hay temas de miembros de este grupo."
         logs: "No hay registros para este grupo."
       add: "Añadir"
-      join: "Unirse al grupo"
-      leave: "Salir del grupo"
-      request: "Solicitar unirse al grupo"
+      join: "Unirse"
+      leave: "Abandonar"
+      request: "Solicitar"
       message: "Mensaje"
-      automatic_group: Grupo automático
-      closed_group: Grupo cerrado
-      is_group_user: "Eres miembro de este grupo"
       allow_membership_requests: "Permitir a los usuarios solicitudes para ser miembro a los dueños del grupo"
       membership_request_template: "Template personalizado para mostrar a los usuarios cuando envían una solicitud de membresía"
       membership_request:
@@ -386,29 +397,50 @@ es:
         reason: "Permitir a los propietarios del grupo saber por qué perteneces a este grupo"
       membership: "Membresía"
       name: "Nombre"
-      user_count: "Número de miembros"
+      group_name: "Nombre del Grupo"
+      user_count: "Usuarios"
       bio: "Acerca del grupo"
-      selector_placeholder: "Añadir miembros"
+      selector_placeholder: "ingresar username"
       owner: "propietario"
       index:
         title: "Grupos"
+        all: "Todos los Grupos"
         empty: "No hay grupos visibles."
+        filter: "Filtrar por tipo de grupo"
+        owner_groups: "Grupos en los que soy propietario"
+        close_groups: "Grupos Cerrados"
+        automatic_groups: "Grupos Automáticos"
+        automatic: "Automáticos"
+        closed: "Cerrados"
+        public: "Públicos"
+        private: "Privados"
+        public_groups: "Grupos Públicos"
+        automatic_group: Grupo Automático
+        close_group: Cerrar Grupo
+        my_groups: "Mis Grupos"
+        group_type: "Grupo tipo"
+        is_group_user: "Miembro"
+        is_group_owner: "Propietario"
       title:
-        one: "Grupo"
-        other: "Grupos"
+        one: Grupo
+        other: Grupos
       activity: "Actividad"
-      members: "Miembros"
+      members:
+        title: "Miembros"
+        filter_placeholder_admin: "usuario o email"
+        filter_placeholder: "usuario"
+        remove_member: "Quitar Miembro"
+        remove_member_description: "Quitar <b>%{username}</b> de este grupo"
+        make_owner: "Convertir a Propietario"
+        make_owner_description: "Convertir a <b>%{username}</b> en propietario de este grupo"
+        remove_owner: "Quitar como Propietario"
+        remove_owner_description: "Quitar a <b>%{username}</b> como propietario de este grupo"
+        owner: "Propietario"
       topics: "Temas"
       posts: "Posts"
       mentions: "Menciones"
       messages: "Mensajes"
       notification_level: "Nivel de notificación por defecto para mensajes en grupo"
-      visibility_levels:
-        title: "¿Quién puede ver este grupo?"
-        public: "Todos"
-        members: "Propietarios del grupo, miembros y administradores"
-        staff: "Propietarios del grupo, y staff"
-        owners: "Propietarios del grupo y administradores"
       alias_levels:
         mentionable: "¿Quién puede @mencionar este grupo?"
         messageable: "¿Quién puede mensajear este grupo?"
@@ -417,9 +449,6 @@ es:
         mods_and_admins: "Solo moderadores y administradores"
         members_mods_and_admins: "Solo miembros del grupo, moderadores y administradores"
         everyone: "Todos"
-      trust_levels:
-        title: "Nivel de confianza entregado automáticamente a miembros cuando son añadidos:"
-        none: "Ninguno"
       notifications:
         watching:
           title: "Vigilando"
@@ -444,23 +473,22 @@ es:
       flair_color_placeholder: "(Opcional) Valor del color en hexadecimal"
       flair_preview_icon: "Previsualización del icono"
       flair_preview_image: "Previsualización de la imagen"
-      flair_note: "Nota: el sub-avatar solo se mostrará para el grupo primario del usuario."
     user_action_groups:
-      '1': "'Me gusta' Dados"
-      '2': "'Me gusta' Recibidos"
-      '3': "Marcadores"
-      '4': "Temas"
-      '5': "Posts"
-      '6': "Respuestas"
-      '7': "Menciones"
-      '9': "Citas"
-      '11': "Ediciones"
-      '12': "Elementos Enviados"
-      '13': "Bandeja de entrada"
-      '14': "Pendiente"
+      "1": "'Me gusta' Dados"
+      "2": "'Me gusta' Recibidos"
+      "3": "Marcadores"
+      "4": "Temas"
+      "5": "Posts"
+      "6": "Respuestas"
+      "7": "Menciones"
+      "9": "Citas"
+      "11": "Ediciones"
+      "12": "Elementos Enviados"
+      "13": "Bandeja de entrada"
+      "14": "Pendiente"
     categories:
       all: "Categorías"
-      all_subcategories: "todas"
+      all_subcategories: "todo en %{categoryName}"
       no_subcategory: "ninguna"
       category: "Categoría"
       category_list: "Mostrar lista de categorías"
@@ -479,11 +507,11 @@ es:
       toggle_ordering: "activar orden"
       subcategories: "Subcategorías"
       topic_sentence:
-        one: "1 tema"
-        other: "%{count} temas"
+        one: 1 tema
+        other: '%{count} temas'
       topic_stat_sentence:
-        one: "%{count} tema nuevo en los últimos %{unit}."
-        other: "%{count} temas nuevos en los últimos %{unit}."
+        one: '%{count} tema nuevo en los últimos %{unit}.'
+        other: '%{count} temas nuevos en los últimos %{unit}.'
     ip_lookup:
       title: Búsqueda de Direcciones IP
       hostname: Nombre del host
@@ -518,6 +546,7 @@ es:
       activity_stream: "Actividad"
       preferences: "Preferencias"
       expand_profile: "Expandir"
+      collapse_profile: "Contraer"
       bookmarks: "Marcadores"
       bio: "Acerca de mí"
       invited_by: "Invitado Por"
@@ -525,7 +554,7 @@ es:
       notifications: "Notificaciones"
       statistics: "Estadísticas"
       desktop_notifications:
-        label: "Notificaciones de escritorio"
+        label: "Notificaciones en Vivo"
         not_supported: "Las notificaciones no están disponibles en este navegador. Lo sentimos."
         perm_default: "Activar notificaciones"
         perm_denied_btn: "Permiso denegado"
@@ -533,6 +562,7 @@ es:
         disable: "Desactivar notificaciones"
         enable: "Activar notificaciones"
         each_browser_note: "Nota: Tendrás que cambiar esta opción para cada navegador que uses."
+        consent_prompt: "¿Quieres recibir notificaciones en vivo cuando alguien responde a tus mensajes?"
       dismiss: 'Descartar'
       dismiss_notifications: "Descartar todos"
       dismiss_notifications_tooltip: "Marcar todas las notificaciones no leídas como leídas"
@@ -540,7 +570,7 @@ es:
       disable_jump_reply: "No dirigirme a mi post cuando responda"
       dynamic_favicon: "Mostrar contador de temas nuevos/actualizados en el favicon"
       theme_default_on_all_devices: "Hacer éste mi theme por defecto en todos mis dispositivos"
-      allow_private_messages: "Permitir a otros usuarios enviarme mensajes privados"
+      allow_private_messages: "Permitir que otros usuarios me envíen mensajes privados"
       external_links_in_new_tab: "Abrir todos los enlaces externos en una nueva pestaña"
       enable_quoting: "Activar respuesta citando el texto resaltado"
       change: "cambio"
@@ -564,6 +594,7 @@ es:
         individual_no_echo: "Envíame un email por cada nuevo post excepto los publicados por mí"
         many_per_day: "Enviarme un email por cada nuevo post (unos {{dailyEmailEstimate}} por día)"
         few_per_day: "Enviarme un email por cada nuevo post (unos 2 por día)"
+        warning: "Modo de lista de correo habilitado. La configuración de notificación de correo electrónico está anulada."
       tag_settings: "Etiquetas"
       watched_tags: "Vigiladas"
       watched_tags_instructions: "Vigilarás automáticamente todos los temas con estas etiquetas. Se te notificará de todos los nuevos posts y temas y aparecerá un contador de nuevos posts al lado del tema."
@@ -585,7 +616,7 @@ es:
       delete_account: "Borrar Mi Cuenta"
       delete_account_confirm: "¿Estás seguro que quieres borrar permanentemente tu cuenta? ¡Esta acción no puede ser revertida!"
       deleted_yourself: "Tu cuenta ha sido borrada exitosamente."
-      delete_yourself_not_allowed: "No puedes borrar tu cuenta en este momento. Contacta a un administrador para borrar tu cuenta en tu nombre."
+      delete_yourself_not_allowed: "Por favor contactar a un miembro del staff si deseas que tu cuenta sea borrada."
       unread_message_count: "Mensajes"
       admin_delete: "Eliminar"
       users: "Usuarios"
@@ -619,6 +650,7 @@ es:
         move_to_archive: "Archivar"
         failed_to_move: "No se han podido mover los mensajes seleccionados (puede haber problemas de conexión)"
         select_all: "Seleccionar todo"
+        tags: "Etiquetas"
       preferences_nav:
         account: "Cuenta"
         profile: "Perfil"
@@ -636,6 +668,19 @@ es:
         set_password: "Establecer contraseña"
         choose_new: "Escoge una nueva contraseña"
         choose: "Escoge una contraseña"
+      second_factor:
+        title: "Autenticación Dos Factores"
+        disable: "Inhabilitar Autenticación Dos Factores"
+        enable: "Hablita <a href>two factor authentication</a> para mejorar la seguridad de la cuenta"
+        confirm_password_description: "Por favor confirma tu contraseña para continuar"
+        label: "Código"
+        enable_description: |
+          Escanee el siguiente código QR en una aplicación soportada (<a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target='_blank'>Android</a> – <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8" target="_blank">iOS</a> – <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a>) e ingresa tu código de autenticación.
+        disable_description: "Por favor ingrese el código de autenticación desde su aplicación"
+        show_key_description: "Ingrese Manualmente"
+        extended_description: |
+          La Autenticación de Dos Factores agrega un paso de seguridad adicional en tu cuenta al inicio de sesión al requerir un token de un solo uso además de su contraseña. Estos tokens pueden ser generados en dispositivos <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target='_blank'>Android</a>, <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8">iOS</a>, y <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a>.
+        oauth_enabled_warning: "Por favor ten en cuenta que los accesos a través de redes sociales serán inhabilitados si habilitas el factor de autenticación en dos pasos de tu cuenta."
       change_about:
         title: "Cambiar 'Acerca de mí'"
         error: "Hubo un error al cambiar este valor."
@@ -677,8 +722,8 @@ es:
         authenticated: "Tu dirección de correo ha sido autenticada por {{provider}}"
         frequency_immediately: "Te enviaremos un email inmediatamente si no has leído aquello que vamos a enviarte."
         frequency:
-          one: "Sólo te enviaremos emails si no te hemos visto en el último minuto."
-          other: "Sólo te enviaremos si no te hemos visto en los últimos {{count}} minutos."
+          one: Sólo te enviaremos emails si no te hemos visto en el último minuto.
+          other: Sólo te enviaremos si no te hemos visto en los últimos {{count}} minutos.
       name:
         title: "Nombre"
         instructions: "tu nombre completo (opcional)"
@@ -709,8 +754,6 @@ es:
       created: "Creado el"
       log_out: "Cerrar sesión"
       location: "Ubicación"
-      card_badge:
-        title: "Distintivo de Tarjeta de Usuario"
       website: "Sitio Web"
       email_settings: "E-mail"
       like_notification_frequency:
@@ -764,10 +807,10 @@ es:
         title: "Invitaciones"
         user: "Invitar Usuario"
         sent: "Enviadas"
-        none: "No hay ninguna invitación pendiente que mostrar."
+        none: "Sin invitaciones para mostrar."
         truncated:
-          one: "Mostrando la primera invitación."
-          other: "Mostrando las primeras {{count}} invitaciones."
+          one: Mostrando la primera invitación.
+          other: Mostrando las primeras {{count}} invitaciones.
         redeemed: "Invitaciones aceptadas"
         redeemed_tab: "Usado"
         redeemed_tab_with_count: "Aceptadas ({{count}})"
@@ -814,29 +857,29 @@ es:
         time_read: "tiempo de lectura"
         recent_time_read: "tiempo de lectura reciente"
         topic_count:
-          one: "tema creado"
-          other: "temas creados"
+          one: tema creado
+          other: temas creados
         post_count:
-          one: "post publicado"
-          other: "posts publicados"
+          one: post publicado
+          other: posts publicados
         likes_given:
-          one: "dado"
-          other: "dados"
+          one: dado
+          other: dados
         likes_received:
-          one: "recibido"
-          other: "recibidos"
+          one: recibido
+          other: recibidos
         days_visited:
-          one: "día visitado"
-          other: "días visitados"
+          one: día visitado
+          other: días visitados
         topics_entered:
-          one: "tema visto"
-          other: "temas vistos"
+          one: tema visto
+          other: temas vistos
         posts_read:
-          one: "post leído"
-          other: "posts leídos"
+          one: post leído
+          other: posts leídos
         bookmark_count:
-          one: "marcador"
-          other: "marcadores"
+          one: marcador
+          other: marcadores
         top_replies: "Respuestas top"
         no_replies: "No hay respuestas aún."
         more_replies: "Más respuestas"
@@ -862,6 +905,7 @@ es:
         header_title: "perfil, mensajes, marcadores y preferencias"
       title:
         title: "Título"
+        none: "(ninguna)"
       filters:
         all: "Todos"
       stream:
@@ -904,8 +948,8 @@ es:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> alcanzó el límite establecido en las opciones del sitio del %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> excedió el límite establecido en las opciones del sitio del %{siteSettingRate}."
       rate:
-        one: "1 error/%{duration}"
-        other: "%{count} errores/%{duration}"
+        one: 1 error/%{duration}
+        other: '%{count} errores/%{duration}'
     learn_more: "saber más..."
     all_time: 'total'
     all_time_desc: 'temas creados total'
@@ -977,14 +1021,26 @@ es:
       help: "¿No llegó el email? Asegúrese de chequear primero su carpeta de correo no deseado. <p>¿No estás seguro de qué email usaste? Ingrese su email y le avisaremos si existe aquí.</p><p>Si no tienes acceso al email de tu cuenta, por favor contacta <a href='/about'>a nuestro staff.</a></p>"
       button_ok: "OK"
       button_help: "Ayuda"
+    email_login:
+      link_label: "Enviar me un enlace para ingresar"
+      button_label: "con email"
+      complete_username: "Si una cuenta coincide con el nombre de usuario <b>%{username}</b>, deberías recibir un email con un enlace de ingreso muy pronto."
+      complete_email: "Si una cuenta coincide con <b>%{email}</b>, deberías recibir un email con un enlace de ingreso muy pronto."
+      complete_username_found: "Encontramos una cuenta que coincide con el nombre de usuario <b>%{username}</b>, deberías recibir un email con un enlace de ingreso muy pronto."
+      complete_email_found: "Encontramos una cuenta que coincide con <b>%{email}</b>, deberías recibir un email con un enlace de ingreso muy pronto."
+      complete_username_not_found: "Ninguna cuenta coincide el nombre de usuario <b>%{username}</b>"
+      complete_email_not_found: "Ninguna cuenta coincide con <b>%{email}</b>"
     login:
       title: "Iniciar Sesión"
       username: "Usuario"
       password: "Contraseña"
+      second_factor_title: "Autenticación Dos Factores"
+      second_factor_description: "Por favor ingrese el código de autenticación desde su aplicación:"
       email_placeholder: "dirección de e-mail o nombre de usuario"
       caps_lock_warning: "Está activado Bloqueo de Mayúsculas"
       error: "Error desconocido"
       rate_limit: "Por favor, espera un poco antes de volver a intentar iniciar sesión."
+      blank_username: "Por favor ingresa tu email o nombre de usuario."
       blank_username_or_password: "Por favor, introducir tu e-mail o usuario, y tu contraseña."
       reset_password: 'Restablecer Contraseña'
       logging_in: "Iniciando Sesión..."
@@ -997,6 +1053,7 @@ es:
       not_allowed_from_ip_address: "No puedes iniciar sesión desde esa dirección IP."
       admin_not_allowed_from_ip_address: "No puedes iniciar sesión como admin desde esta dirección IP."
       resend_activation_email: "Has clic aquí para enviar el email de activación nuevamente."
+      omniauth_disallow_totp: "Tu cuenta tiene habilitado la autenticación de dos factores. Por favor ingresa con tu contraseña."
       resend_title: "Volver a enviar email de activación"
       change_email: "Cambiar dirección de email"
       provide_new_email: "Poner un nuevo email, y te reenviaremos una confirmación de email."
@@ -1052,24 +1109,33 @@ es:
       categories_only: "Sólo categorías"
       categories_with_featured_topics: "Categorías y temas destacados"
       categories_and_latest_topics: "Categorías y temas recientes"
+      categories_and_top_topics: "Categorías y Temas Top"
     shortcut_modifier_key:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    conditional_loading_section:
+      loading: Cargando...
     select_kit:
       default_header_text: Seleccionar...
       no_content: Ninguna coincidencia encontrada
       filter_placeholder: Buscar...
-      create: "Crear {{content}}"
+      create: "Crear: '{{content}}'"
+      max_content_reached:
+        one: Puedes seleccionar únicamente {{count}} item.
+        other: Puedes seleccionar únicamente {{count}} items.
+      min_content_not_reached:
+        one: Seleccionar al menos {{count}} item.
+        other: Seleccionar al menos {{count}} items.
     emoji_picker:
       filter_placeholder: Buscar emoji
-      people: People
-      nature: Nature
-      food: Food
-      activity: Activity
-      travel: Travel
-      objects: Objects
-      celebration: Celebration
+      people: Personas
+      nature: Naturaleza
+      food: Comida
+      activity: Actividad
+      travel: Viajes
+      objects: Objetos
+      celebration: Celebraciones
       custom: Emojis personalizados
       recent: Recientemente usados
       default_tone: Sin tono de piel
@@ -1078,6 +1144,13 @@ es:
       medium_tone: Tono de piel medio
       medium_dark_tone: Tono de piel medio oscuro
       dark_tone: Tono de piel oscuro
+    shared_drafts:
+      title: "Borradores Compartidos"
+      notice: "Este tema es visible solamente por quienes pueden ver la categoría <b>{{category}}</b>."
+      destination_category: "Categoría de Destino"
+      publish: "Publicar Borrador Compartido"
+      confirm_publish: "¿Estás seguro que quieres publicar este borrador?"
+      publishing: "Publicando Tema..."
     composer:
       emoji: "Emoji :)"
       more_emoji: "más..."
@@ -1094,10 +1167,10 @@ es:
       saved_local_draft_tip: "guardado localmente"
       similar_topics: "Tu tema es similar a..."
       drafts_offline: "borradores offline"
-      group_mentioned_limit: "<b>¡Advertencia!</b> Has mencionado <a href='{{group_link}}'>{{group}}</a>, pero este grupo tiene más miembros que el límite de menciones fijado por los administradores, que es de {{max}} usuarios. No se notificará a nadie."
+      group_mentioned_limit: "<b>¡Advertencia!</b> Has mencionado <a href='{{group_link}}'>{{group}}</a>, sin embargo este grupo tiene más miembros que el límite máximo de {{max}} usuarios configurado por el administrador para hacer menciones. Nadie será notificado. "
       group_mentioned:
-        one: "Al mencionar a {{group}}, estás a punto de notificar a <a href='{{group_link}}'>1 persona</a> – ¿seguro que quieres hacerlo?"
-        other: "Al mencionar a {{group}}, estás a punto de notificar a <a href='{{group_link}}'>{{count}} personas</a> – ¿seguro que quieres hacerlo?"
+        one: Al mencionar a {{group}}, estás a punto de notificar a <a href='{{group_link}}'>1 persona</a> – ¿seguro que quieres hacerlo?
+        other: Al mencionar a {{group}}, estás a punto de notificar a <a href='{{group_link}}'>{{count}} personas</a> – ¿seguro que quieres hacerlo?
       cannot_see_mention:
         category: "Mencionaste a {{username}} pero no será notificado porque no tiene acceso a esta categoría. Necesitarás añadirlo a un grupo para que tenga acceso a esta categoría."
         private: "Mencionaste a {{username}} pero no se les notificará porque no pueden ver este mensaje personal. Necesitarás invitarlos a este MP."
@@ -1110,6 +1183,7 @@ es:
         post_length: "El post debe tener por lo menos {{min}} caracteres."
         try_like: '¿Has probado el botón de <i class="fa fa-heart"></i>?'
         category_missing: "Debes escoger una categoría."
+        tags_missing: "Debes seleccionar al menos {{count}} etiquetas"
       save_edit: "Guardar edición"
       reply_original: "Responder en el Tema Original"
       reply_here: "Responder Aquí"
@@ -1118,6 +1192,8 @@ es:
       create_topic: "Crear tema"
       create_pm: "Mensaje"
       create_whisper: "Susurrar"
+      create_shared_draft: "Crear Borrador Compartido"
+      edit_shared_draft: "Editar Borrador Compartido"
       title: "O pulsa Ctrl+Intro"
       users_placeholder: "Añadir usuario"
       title_placeholder: "En una frase breve, ¿de qué trata este tema?"
@@ -1127,6 +1203,8 @@ es:
       topic_featured_link_placeholder: "Introduce el enlace mostrado con el título."
       remove_featured_link: "Eliminar enlace del tema."
       reply_placeholder: "Escribe aquí. Usa Markdown, BBCode o HTML para darle formato. Arrastra o pega imágenes."
+      reply_placeholder_no_images: "Escribe aquí. Usa Markdown, BBCode, o HTML para darle formato al texto."
+      reply_placeholder_choose_category: "Debe seleccionar una categoría antes de escribir aquí."
       view_new_post: "Ver tu nuevo post."
       saving: "Guardando"
       saved: "¡Guardado!"
@@ -1156,6 +1234,7 @@ es:
       olist_title: "Lista numerada"
       ulist_title: "Lista con viñetas"
       list_item: "Lista de ítems"
+      toggle_direction: "Alternar dirección"
       help: "Ayuda de Edición con Markdown"
       collapse: "minimizar el panel de edición"
       abandon: "cerrar el editor y descartar borrador"
@@ -1166,14 +1245,35 @@ es:
         title: "¿Olvidaste añadir destinatarios?"
         body: "¡Vas a enviarte este mensaje a ti mismo!"
       admin_options_title: "Opciones de moderación para este tema"
+      composer_actions:
+        reply_to_post:
+          label: "Responder al post %{postNumber} de %{postUsername}"
+          desc: Responder a un post específico
+        reply_as_new_topic:
+          label: Responder como tema enlazado
+          desc: Crear un nuevo tema enlazado a este tema
+        reply_as_private_message:
+          label: Nuevo mensaje
+          desc: Crear un nuevo mensaje personal
+        reply_to_topic:
+          label: Responder al tema
+          desc: "Responder a este tema, no a un mensaje específico"
+        toggle_whisper:
+          label: Mostrar/Ocultar Susurros
+          desc: Susurros son solo visibles para miembros del staff
+        create_topic:
+          label: "Crear tema"
+        shared_draft:
+          label: "Borrador Compartido"
+          desc: "Haz borrador al tema que será visible únicamente por el staff"
     notifications:
       tooltip:
         regular:
-          one: "1 notificación sin leer"
-          other: "{{count}} notificaciones no leídas"
+          one: 1 notificación sin leer
+          other: '{{count}} notificaciones no leídas'
         message:
-          one: "1 mensaje sin leer"
-          other: "{{count}} mensajes sin leer"
+          one: 1 mensaje sin leer
+          other: '{{count}} mensajes sin leer'
       title: "notificaciones por menciones a tu @nombre, respuestas a tus posts y temas, mensajes, etc"
       none: "No se han podido cargar las notificaciones."
       empty: "No se han encontrado notificaciones."
@@ -1188,8 +1288,8 @@ es:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} and 1 mas</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} y otros {{count}} </span> {{description}}"
+        one: <span>{{username}}, {{username2}} and 1 mas</span> {{description}}
+        other: <span>{{username}}, {{username2}} y otros {{count}} </span> {{description}}
       private_message: "<span>{{username}}</span> {{description}}"
       invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
       invited_to_topic: "<span>{{username}}</span> {{description}}"
@@ -1200,32 +1300,18 @@ es:
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>Nuevo Tema</span> {{description}}"
       group_message_summary:
-        one: "{{count}} mensaje en tu bandeja de {{group_name}}"
-        other: "{{count}} mensajes en tu bandeja de {{group_name}} "
-      alt:
-        mentioned: "Mencionado por"
-        quoted: "Citado por"
-        replied: "Respondido"
-        posted: "Publicado por"
-        edited: "Editado tu post por"
-        liked: "Gustado tu post"
-        private_message: "Mensaje privado de"
-        invited_to_private_message: "Invitado a un mensaje privado de"
-        invited_to_topic: "Invitado a un tema de"
-        invitee_accepted: "Invitación aceptada por"
-        moved_post: "Tu post fue eliminado por"
-        linked: "Enlace a tu post"
-        granted_badge: "Distintivo concedido"
-        group_message_summary: "Mensajes en la bandeja del grupo"
-        topic_reminder: "Un recordatorio"
+        one: '{{count}} mensaje en tu bandeja de {{group_name}}'
+        other: '{{count}} mensajes en tu bandeja de {{group_name}} '
       popup:
         mentioned: '{{username}} te mencionó en "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} te ha mencionado en "{{topic}}" - {{site_title}}'
         quoted: '{{username}} te citó en "{{topic}}" - {{site_title}}'
         replied: '{{username}} te respondió en "{{topic}}" - {{site_title}}'
         posted: '{{username}} publicó en "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} te envió un mensaje privado en "{{topic}}" - {{site_title}}'
+        private_message: '{{username}} le envió un mensaje personal en "{{topic}}" - {{site_title}}'
         linked: '{{username}} enlazó tu publicación desde "{{topic}}" - {{site_title}}'
+        confirm_title: 'Notificaciones habilitadas - %{site_title}'
+        confirm_body: '¡Éxito! Las notificaciones han sido habilitadas.'
     upload_selector:
       title: "Añadir imagen"
       title_with_attachments: "Añadir una imagen o archivo"
@@ -1252,9 +1338,10 @@ es:
       clear_all: "Limpiar todo"
       too_short: "El término de búsqueda es demasiado corto."
       result_count:
-        one: "1 resultado para <span class='term'>{{term}}</span>"
-        other: "{{count}}{{plus}} resultados para <span class='term'>{{term}}</span>"
+        one: <span>1 resultado para</span><span class='term'>{{term}}</span>
+        other: <span>{{count}}{{plus}} resultados para </span><span class='term'>{{term}}</span>
       title: "buscar temas, posts, usuarios o categorías"
+      full_page_title: "buscar temas o posts"
       no_results: "No se ha encontrado ningún resultado."
       no_more_results: "No se encontraron más resultados."
       searching: "Buscando ..."
@@ -1286,6 +1373,7 @@ es:
           label: Etiquetado
         filters:
           label: Sólo devolver temas/mensajes...
+          title: Coincide el título únicamente
           likes: Me han gustado
           posted: He publicado en ellos
           watching: Estoy vigilando
@@ -1342,8 +1430,8 @@ es:
         notification_level: "Notificaciones"
         choose_new_category: "Elige una nueva categoría para los temas:"
         selected:
-          one: "Has seleccionado <b>1</b> tema."
-          other: "Has seleccionado <b>{{count}}</b> temas."
+          one: Has seleccionado <b>1</b> tema.
+          other: Has seleccionado <b>{{count}}</b> temas.
         change_tags: "Cambiar etiquetas"
         append_tags: "Agregar etiquetas"
         choose_new_tags: "Elige nuevas etiquetas para estos temas:"
@@ -1375,14 +1463,12 @@ es:
         bookmarks: "No hay más temas guardados en marcadores."
         search: "No hay más resultados de búsqueda."
     topic:
-      unsubscribe:
-        stop_notifications: "Ahora recibirás menos notificaciones desde <strong>{{title}}</strong>"
-        change_notification_state: "El estado actual de notificación para ti es"
       filter_to:
-        one: "1 post en el tema"
-        other: "{{count}} posts en el tema"
+        one: 1 post en el tema
+        other: '{{count}} posts en el tema'
       create: 'Crear tema'
       create_long: 'Crear un nuevo tema'
+      open_draft: "Abrir Borrador"
       private_message: 'Empezar un mensaje'
       archive_message:
         help: 'Archivar mensaje'
@@ -1390,14 +1476,17 @@ es:
       move_to_inbox:
         title: 'Mover a la bandeja de entrada'
         help: 'Restaurar mensaje a la bandeja de entrada'
+      edit_message:
+        help: 'Editar el primer post del mensaje'
+        title: 'Editar Mensaje'
       list: 'Temas'
       new: 'nuevo tema'
       unread: 'sin leer'
       new_topics:
-        one: '1 tema nuevo'
+        one: 1 tema nuevo
         other: '{{count}} temas nuevos'
       unread_topics:
-        one: '1 tema sin leer'
+        one: 1 tema sin leer
         other: '{{count}} temas sin leer'
       title: 'Tema'
       invalid_access:
@@ -1411,17 +1500,17 @@ es:
         title: "Tema no encontrado"
         description: "Lo sentimos, no pudimos encontrar ese tema. ¿Tal vez fue eliminado por un moderador?"
       total_unread_posts:
-        one: "tienes 1 publicación sin leer en este tema"
-        other: "tienes {{count}} publicaciones sin leer en este tema"
+        one: tienes 1 publicación sin leer en este tema
+        other: tienes {{count}} publicaciones sin leer en este tema
       unread_posts:
-        one: "tienes 1 post antiguo sin leer en este tema"
-        other: "tienes {{count}} posts antiguos sin leer en este tema"
+        one: tienes 1 post antiguo sin leer en este tema
+        other: tienes {{count}} posts antiguos sin leer en este tema
       new_posts:
-        one: "hay 1 nuevo post en este tema desde la última vez que lo leíste"
-        other: "hay {{count}} posts nuevos en este tema desde la última vez que lo leíste"
+        one: hay 1 nuevo post en este tema desde la última vez que lo leíste
+        other: hay {{count}} posts nuevos en este tema desde la última vez que lo leíste
       likes:
-        one: "este tema le gusta a 1 persona"
-        other: "este tema les gusta a {{count}} personas"
+        one: este tema le gusta a 1 persona
+        other: este tema les gusta a {{count}} personas
       back_to_list: "Volver a la Lista de Temas"
       options: "Opciones del Tema"
       show_links: "mostrar enlaces dentro de este tema"
@@ -1431,7 +1520,7 @@ es:
       read_more_MF: "Hay { UNREAD, plural, =0 {} one { <a href='/unread'>1 no leído</a> } other { <a href='/unread'># no leídos</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{y } false { } other{}} <a href='/new'>1 nuevo</a> tema} other { {BOTH, select, true{y } false { } other{}} <a href='/new'># nuevos</a> temas} } restantes, o {CATEGORY, select, true {explora otros temas en {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Ver todas las categorías
       view_latest_topics: ver los temas recientes
-      suggest_create_topic: ¿Por qué no creas un tema?
+      suggest_create_topic: "¿Por qué no creas un tema?"
       jump_reply_up: saltar a la primera respuesta
       jump_reply_down: saltar a la última respuesta
       deleted: "El tema ha sido borrado"
@@ -1485,8 +1574,8 @@ es:
         auto_reminder: "Te recordaremos sobre este tema %{timeLeft}."
       auto_close_title: 'Configuración de auto-cerrado'
       auto_close_immediate:
-        one: "El último post se publicó hace 1 hora, por lo que el tema se cerrará inmediatamente."
-        other: "El último post se publicó hace %{count} horas, por lo que el tema se cerrará inmediatamente."
+        one: El último post se publicó hace 1 hora, por lo que el tema se cerrará inmediatamente.
+        other: El último post se publicó hace %{count} horas, por lo que el tema se cerrará inmediatamente.
       timeline:
         back: "Volver"
         back_description: "Volver al último post sin leer"
@@ -1507,21 +1596,21 @@ es:
         title: cambiar con qué frecuencia se te notifica de este tema
         reasons:
           mailing_list_mode: "El modo lista de correo se encuentra activado, por lo que se te notificará de las respuestas a este tema vía email."
-          '3_10': 'Recibirás notificaciones porque estás vigilando una etiqueta de este tema.'
-          '3_6': 'Recibirás notificaciones porque estás vigilando esta categoría.'
-          '3_5': 'Recibirás notificaciones porque has empezado a vigilar este tema automáticamente.'
-          '3_2': 'Recibirás notificaciones porque estás vigilando este tema.'
-          '3_1': 'Recibirás notificaciones porque creaste este tema.'
-          '3': 'Recibirás notificaciones porque estás vigilando este tema.'
-          '2_8': 'Tú verás la cuenta de nuevas respuestas porque estás siguiendo esta categoría.'
-          '2_4': 'Tú verás la cuenta de nuevas respuestas porque has publicado una respuesta en este tema.'
-          '2_2': 'Tú verás la cuenta de nuevas respuestas porque estás siguiendo este tema.'
-          '2': 'Tú verás la cuenta de nuevas respuestas porque has <a href="/u/{{username}}/preferences">leído este tema</a>.'
-          '1_2': 'Se te notificará solo si alguien menciona tu @nombre o te responde a un post.'
-          '1': 'Se te notificará si alguien menciona tu @nombre o te responde a un post.'
-          '0_7': 'Estás ignorando todas las notificaciones en esta categoría.'
-          '0_2': 'Estás ignorando todas las notificaciones en este tema.'
-          '0': 'Estás ignorando todas las notificaciones en este tema.'
+          "3_10": 'Recibirás notificaciones porque estás vigilando una etiqueta de este tema.'
+          "3_6": 'Recibirás notificaciones porque estás vigilando esta categoría.'
+          "3_5": 'Recibirás notificaciones porque has empezado a vigilar este tema automáticamente.'
+          "3_2": 'Recibirás notificaciones porque estás vigilando este tema.'
+          "3_1": 'Recibirás notificaciones porque creaste este tema.'
+          "3": 'Recibirás notificaciones porque estás vigilando este tema.'
+          "2_8": 'Tú verás la cuenta de nuevas respuestas porque estás siguiendo esta categoría.'
+          "2_4": 'Tú verás la cuenta de nuevas respuestas porque has publicado una respuesta en este tema.'
+          "2_2": 'Tú verás la cuenta de nuevas respuestas porque estás siguiendo este tema.'
+          "2": 'Tú verás la cuenta de nuevas respuestas porque has <a href="/u/{{username}}/preferences">leído este tema</a>.'
+          "1_2": 'Se te notificará solo si alguien menciona tu @nombre o te responde a un post.'
+          "1": 'Se te notificará si alguien menciona tu @nombre o te responde a un post.'
+          "0_7": 'Estás ignorando todas las notificaciones en esta categoría.'
+          "0_2": 'Estás ignorando todas las notificaciones en este tema.'
+          "0": 'Estás ignorando todas las notificaciones en este tema.'
         watching_pm:
           title: "Vigilar"
           description: "Se te notificará de cada nuevo post en este mensaje y se mostrará un contador de nuevos posts."
@@ -1561,7 +1650,7 @@ es:
         visible: "Hacer visible"
         reset_read: "Restablecer datos de lectura"
         make_public: "Convertir en tema público"
-        make_private: "Convertir en Mensaje Privado"
+        make_private: "Crear Mensaje Personal"
       feature:
         pin: "Destacar tema"
         unpin: "Dejar de destacar tema"
@@ -1594,8 +1683,8 @@ es:
         pin_validation: "Es obligatorio especificar una fecha para destacar este tema."
         not_pinned: "No hay temas destacados en {{categoryLink}}."
         already_pinned:
-          one: "Hay <strong class='badge badge-notification unread'>un tema</strong> destacado actualmente en {{categoryLink}}. "
-          other: "Temas destacados actualmente en {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: 'Hay <strong class=''badge badge-notification unread''>un tema</strong> destacado actualmente en {{categoryLink}}. '
+          other: 'Temas destacados actualmente en {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         pin_globally: "Hacer que este tema aparezca en el top de todas las listas de temas hasta"
         confirm_pin_globally: "Hay ya {{count}} temas destacados globalmente. Que haya demasiados temas destacados puede resultar engorroso para los usuarios nuevos y anónimos. ¿Seguro que quieres destacar otro tema de forma global?"
         unpin_globally: "Eliminar este tema de la parte superior de todas las listas de temas."
@@ -1603,8 +1692,8 @@ es:
         global_pin_note: "Los usuarios pueden desanclar el tema de forma individual por sí mismos."
         not_pinned_globally: "No hay temas destacados globalmente."
         already_pinned_globally:
-          one: "Actualmente hay <strong class='badge badge-notification unread'>1</strong> tema destacado globalmente."
-          other: "Temas destacados globalmente: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: Actualmente hay <strong class='badge badge-notification unread'>1</strong> tema destacado globalmente.
+          other: 'Temas destacados globalmente: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         make_banner: "Hacer de este tema una pancarta que aparece en la parte superior de todas las páginas."
         remove_banner: "Retire la pancarta que aparece en la parte superior de todas las páginas."
         banner_note: "Los usuarios pueden descartar la pancarta cerrándola. Sólo un tema puede ser una pancarta en cualquier momento dado."
@@ -1641,8 +1730,8 @@ es:
       login_reply: 'Inicia Sesión para Responder'
       filters:
         n_posts:
-          one: "1 post"
-          other: "{{count}} posts"
+          one: 1 post
+          other: '{{count}} posts'
         cancel: "Quitar filtro"
       split_topic:
         title: "Mover a un tema nuevo"
@@ -1650,15 +1739,15 @@ es:
         topic_name: "Nombre del tema nuevo"
         error: "Hubo un error moviendo los posts al nuevo tema"
         instructions:
-          one: "Estas a punto de crear un tema nuevo y rellenarlo con el post que has seleccionado."
-          other: "Estas a punto de crear un tema nuevo y rellenarlo con los <b>{{count}}</b> posts que has seleccionado."
+          one: Estas a punto de crear un tema nuevo y rellenarlo con el post que has seleccionado.
+          other: Estas a punto de crear un tema nuevo y rellenarlo con los <b>{{count}}</b> posts que has seleccionado.
       merge_topic:
         title: "Mover a un tema existente"
         action: "mover a un tema existente"
         error: "Hubo un error moviendo los posts a ese tema"
         instructions:
-          one: "Por favor escoge el tema al que quieres mover ese post."
-          other: "Por favor escoge el tema al que quieres mover esos <b>{{count}}</b> posts."
+          one: Por favor escoge el tema al que quieres mover ese post.
+          other: Por favor escoge el tema al que quieres mover esos <b>{{count}}</b> posts.
       merge_posts:
         title: "Unir posts seleccionados"
         action: "unir posts seleccionados"
@@ -1670,9 +1759,9 @@ es:
         label: "Nuevo dueño de los posts"
         placeholder: "nombre de usuario del nuevo dueño"
         instructions:
-          one: "Por favor escoge el nuevo dueño del {{count}} post de <b>{{old_user}}</b>."
-          other: "Por favor escoge el nuevo dueño de los {{count}} posts de <b>{{old_user}}</b>."
-        instructions_warn: "Ten en cuenta que las notificaciones sobre este post no serán transferidas al nuevo usuario de forma retroactiva.<br>Aviso: actualmente, los datos que no dependen del post son transferidos al nuevo usuario. Usar con precaución."
+          one: Por favor escoge el nuevo dueño del {{count}} post de <b>{{old_user}}</b>.
+          other: Por favor escoge el nuevo dueño de los {{count}} posts de <b>{{old_user}}</b>.
+        instructions_warn: "Tenga en cuenta que cualquier notificación sobre esta publicación no se transferirá al nuevo usuario de forma retroactiva."
       change_timestamp:
         title: "Cambiar Timestamp..."
         action: "cambiar timestamp"
@@ -1684,16 +1773,16 @@ es:
         selected: 'seleccionado ({{count}})'
         select_post:
           label: 'seleccionar'
-          title: 'Añadir mensaje a la selección'
+          title: 'Agregar post a la selección'
         selected_post:
           label: 'seleccionado'
-          title: 'Haz clic para quitar el mensaje de la selección'
+          title: 'Clic para eliminar post de la selección'
         select_replies:
-          label: 'seleccionar +respuestas'
-          title: 'Añadir mensaje y todas sus respuestas a la selección'
+          label: 'seleccionar más respuestas'
+          title: 'Agregar post y todas sus respuestas a la selección'
         select_below:
-          label: 'Seleccionar +abajo'
-          title: 'Añdir mensaje y todos los de debajo a la selección'
+          label: 'seleccionar +debajo'
+          title: 'Agregar post y todo despues del mismo a la selección'
         delete: eliminar seleccionado
         cancel: cancelar selección
         select_all: seleccionar todo
@@ -1702,10 +1791,8 @@ es:
           one: Has seleccionado <b>1</b> post.
           other: Has seleccionado <b>{{count}}</b> posts.
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Citar"
-      edit: "<i class='fa fa-pencil'></i>{{link}} {{replyAvatar}} {{username}} "
+      edit: "<i class='fa fa-pencil'></i> {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Motivo:"
       post_number: "post {{number}}"
       wiki_last_edited_on: "wiki editada por última vez"
@@ -1717,26 +1804,28 @@ es:
       show_full: "Mostrar todo el post"
       show_hidden: 'Ver el contenido oculto.'
       deleted_by_author:
-        one: "(post retirado por el autor. Será borrado automáticamente en %{count} hora si no es reportado)"
-        other: "(post retirado por el autor. Será borrado automáticamente en %{count} horas si no es reportado)"
+        one: (post retirado por el autor. Será borrado automáticamente en %{count} hora si no es reportado)
+        other: (post retirado por el autor. Será borrado automáticamente en %{count} horas si no es reportado)
+      collapse: "contraer"
       expand_collapse: "expandir/contraer"
+      locked: "un miembro del personal ha bloqueado esta publicación para que no se edite"
       gap:
-        one: "ver 1 post oculto"
-        other: "ver {{count}} posts ocultos"
+        one: ver 1 post oculto
+        other: ver {{count}} posts ocultos
       unread: "Post sin leer"
       has_replies:
-        one: "{{count}} Respuesta"
-        other: "{{count}} Respuestas"
+        one: '{{count}} Respuesta'
+        other: '{{count}} Respuestas'
       has_likes:
-        one: "{{count}} Me gusta"
-        other: "{{count}} Me gusta"
+        one: '{{count}} Me gusta'
+        other: '{{count}} Me gusta'
       has_likes_title:
-        one: "1 persona le ha dado Me gusta a este post"
-        other: "{{count}} personas le han dado Me gusta a este post"
+        one: 1 persona le ha dado Me gusta a este post
+        other: '{{count}} personas le han dado Me gusta a este post'
       has_likes_title_only_you: "te ha gustado este mensaje"
       has_likes_title_you:
-        one: "A tí y a una persona le ha gustado este mensaje"
-        other: "A tí y a otros {{count}} les han gustado este mensaje"
+        one: A tí y a una persona le ha gustado este mensaje
+        other: A tí y a otros {{count}} les han gustado este mensaje
       errors:
         create: "Lo sentimos, hubo un error al crear tu post. Por favor, inténtalo de nuevo."
         edit: "Lo sentimos, hubo un error al editar tu post. Por favor, inténtalo de nuevo."
@@ -1774,14 +1863,14 @@ es:
         share: "comparte un enlace a este post"
         more: "Más"
         delete_replies:
-          confirm: "¿También quieres borrar las respuestas a este mensaje?"
+          confirm: "¿Quieres eliminar también las respuestas a este post?"
           direct_replies:
-            one: "Sí, y 1 respuesta direct"
-            other: "Sí, y {{count}} respuestas directas"
+            one: Si, y 1 respuesta directa
+            other: Si, y {{count}} respuestas directas
           all_replies:
-            one: "Sí, y 1 respuesta"
-            other: "Sí, y {{count}} respuestas"
-          just_the_post: "No, solo este mensaje"
+            one: Sí, y 1 respuesta
+            other: Sí, y todas las {{count}} respuestas
+          just_the_post: "No, solo este post"
         admin: "acciones de administrador para el post"
         wiki: "Formato wiki"
         unwiki: "Deshacer formato wiki"
@@ -1790,11 +1879,16 @@ es:
         rebake: "Reconstruir HTML"
         unhide: "Deshacer ocultar"
         change_owner: "Cambiar dueño"
+        grant_badge: "Condecer distintivo"
+        lock_post: "Bloquear Post"
+        lock_post_description: "evitar que el usuario que publicó edite esta publicación"
+        unlock_post: "Desbloquear Post"
+        unlock_post_description: "permitir al usuario que publicó, editar este post"
       actions:
         flag: 'Reportar'
         defer_flags:
-          one: "Ignorar reporte"
-          other: "Ignorar reportes"
+          one: Ignorar reporte
+          other: Ignorar reportes
         undo:
           off_topic: "Deshacer reporte"
           spam: "Deshacer reporte"
@@ -1811,8 +1905,8 @@ es:
           bookmark: "guardó esto en marcadores"
           like: "le gustó esto"
           like_capped:
-            one: "y {{count}} otro le gustó esto"
-            other: "y {{count}} otros les gustó esto"
+            one: y {{count}} otro le gustó esto
+            other: y {{count}} otros les gustó esto
           vote: "votó por esto"
         by_you:
           off_topic: "Has reportado esto como off-topic"
@@ -1825,62 +1919,62 @@ es:
           vote: "Has votado este post"
         by_you_and_others:
           off_topic:
-            one: "Tú y otro usuarios habéis reportado esto como off-topic"
-            other: "Tú y otros {{count}} usuarios habéis reportado esto como off-topic"
+            one: Tú y otro usuarios habéis reportado esto como off-topic
+            other: Tú y otros {{count}} usuarios habéis reportado esto como off-topic
           spam:
-            one: "Tú y otro usuario habéis reportado esto como off-topic"
-            other: "Tú y otros {{count}} usuarios habéis reportado esto como spam"
+            one: Tú y otro usuario habéis reportado esto como off-topic
+            other: Tú y otros {{count}} usuarios habéis reportado esto como spam
           inappropriate:
-            one: "Tú y otro usuario habéis reportado esto como inapropiado"
-            other: "Tú y otros {{count}} usuarios habéis reportado esto como inapropiado"
+            one: Tú y otro usuario habéis reportado esto como inapropiado
+            other: Tú y otros {{count}} usuarios habéis reportado esto como inapropiado
           notify_moderators:
-            one: "Tú y otro usuario habéis reportado esto para moderar"
-            other: "Tú y otros {{count}} usuarios habéis reportado esto para moderar"
+            one: Tú y otro usuario habéis reportado esto para moderar
+            other: Tú y otros {{count}} usuarios habéis reportado esto para moderar
           notify_user:
-            one: "Tú y otra persona habéis enviado un mensaje a este usuario"
-            other: "Tú y otras {{count}} personas habéis enviado un mensaje a este usuario"
+            one: Tú y otra persona habéis enviado un mensaje a este usuario
+            other: Tú y otras {{count}} personas habéis enviado un mensaje a este usuario
           bookmark:
-            one: "Tú y otro usuario habéis marcado este post"
-            other: "Tú y otros {{count}} usuarios habéis marcado este post"
+            one: Tú y otro usuario habéis marcado este post
+            other: Tú y otros {{count}} usuarios habéis marcado este post
           like:
-            one: "A ti y a otro usuario os ha gustado esto"
-            other: "A ti y a otros {{count}} usuarios os ha gustado esto"
+            one: A ti y a otro usuario os ha gustado esto
+            other: A ti y a otros {{count}} usuarios os ha gustado esto
           vote:
-            one: "Tú y otro usuario habéis votado este post"
-            other: "Tú y otros {{count}} habéis votado este post"
+            one: Tú y otro usuario habéis votado este post
+            other: Tú y otros {{count}} habéis votado este post
         by_others:
           off_topic:
-            one: "1 usuario ha reportado esto como off-topic"
-            other: "{{count}} usuarios han reportado esto como off-topic"
+            one: 1 usuario ha reportado esto como off-topic
+            other: '{{count}} usuarios han reportado esto como off-topic'
           spam:
-            one: "1 usuario ha reportado esto como spam"
-            other: "{{count}} usuarios han reportado esto como spam"
+            one: 1 usuario ha reportado esto como spam
+            other: '{{count}} usuarios han reportado esto como spam'
           inappropriate:
-            one: "1 usuario ha reportado esto como inapropiado"
-            other: "{{count}} usuarios han reportado esto como inapropiado"
+            one: 1 usuario ha reportado esto como inapropiado
+            other: '{{count}} usuarios han reportado esto como inapropiado'
           notify_moderators:
-            one: "1 usuario ha reportado esto para que sea moderado"
-            other: "{{count}} usuarios han reportado esto para que sea moderado"
+            one: 1 usuario ha reportado esto para que sea moderado
+            other: '{{count}} usuarios han reportado esto para que sea moderado'
           notify_user:
-            one: "1 persona ha enviado un mensaje a este usuario"
-            other: "{{count}} personas han enviado un mensaje a este usuario"
+            one: 1 persona ha enviado un mensaje a este usuario
+            other: '{{count}} personas han enviado un mensaje a este usuario'
           bookmark:
-            one: "Una persona ha marcado este post"
-            other: "{{count}} han marcado este post"
+            one: Una persona ha marcado este post
+            other: '{{count}} han marcado este post'
           like:
-            one: "A 1 persona le gusta esto"
-            other: "A {{count}} personas les gusta esto"
+            one: A 1 persona le gusta esto
+            other: A {{count}} personas les gusta esto
           vote:
-            one: "Una persona ha votado este post"
-            other: "{{count}} personas votaron este post"
+            one: Una persona ha votado este post
+            other: '{{count}} personas votaron este post'
       delete:
         confirm:
-          one: "¿Seguro que quieres borrar 1 mensaje?"
-          other: "¿Seguro que quieres borrar {{count}} mensajes?"
+          one: ¿Estás seguro que quieres eliminar ese post?
+          other: ¿Estás seguro que quieres eliminar esos {{count}} posts?
       merge:
         confirm:
-          one: "Seguro que quieres unir esos posts?"
-          other: "Seguro que quieres unir esos {{count}} posts?"
+          one: Seguro que quieres unir esos posts?
+          other: Seguro que quieres unir esos {{count}} posts?
       revisions:
         controls:
           first: "Primera revisión"
@@ -1962,8 +2056,8 @@ es:
       email_in_allow_strangers: "Aceptar emails de usuarios anónimos sin cuenta"
       email_in_disabled: "La posibilidad de publicar nuevos temas por email está deshabilitada en los ajustes del sitio. Para habilitar la publicación de nuevos temas por email,"
       email_in_disabled_click: 'activa la opción "email in".'
-      mailinglist_mirror: "La categoría refleja una lista de correo"
-      suppress_from_homepage: "Ocultar categoría de la página de inicio."
+      mailinglist_mirror: "Categoría refleja una lista de correo"
+      suppress_from_latest: "Ocultar la categoría de los últimos temas."
       show_subcategory_list: "Mostrar la lista de subcategorías arriba de la lista de temas en esta categoría."
       num_featured_topics: "Número de temas a mostrar en la página de categorías:"
       subcategory_num_featured_topics: "Número de temas destacados a mostrar en la página superior de categorías:"
@@ -1980,6 +2074,7 @@ es:
       default_position: "Posición predeterminada"
       position_disabled: "Las Categorías se mostrarán por orden de actividad. Para controlar el orden en que aparecen en las listas,"
       position_disabled_click: 'activa la opción "fixed category positions".'
+      minimum_required_tags: 'Número mínimo de etiquetas requeridas en un tema:'
       parent: "Categoría primaria"
       notifications:
         watching:
@@ -2037,14 +2132,14 @@ es:
       custom_placeholder_notify_moderators: "Haznos saber qué te preocupa específicamente y, siempre que sea posible, añade enlaces y ejemplos relevantes."
       custom_message:
         at_least:
-          one: "introduce al menos un carácter"
-          other: "introduce al menos {{count}} caracteres"
+          one: introduce al menos un carácter
+          other: introduce al menos {{count}} caracteres
         more:
-          one: "1 más..."
-          other: "{{count}} más..."
+          one: 1 más...
+          other: '{{count}} más...'
         left:
-          one: "1 restante"
-          other: "{{count}} restantes"
+          one: 1 restante
+          other: '{{count}} restantes'
     flagging_topic:
       title: "¡Gracias por ayudar a mantener una comunidad civilizada!"
       action: "Reportar tema"
@@ -2055,13 +2150,13 @@ es:
       links_title: "Enlaces populares"
       links_shown: "mostrar más enlaces..."
       clicks:
-        one: "1 clic"
-        other: "%{count} clics"
+        one: 1 clic
+        other: '%{count} clics'
     post_links:
       about: "expandir los demás enlaces de este post"
       title:
-        one: "1 más"
-        other: "%{count} más"
+        one: 1 más
+        other: '%{count} más'
     topic_statuses:
       warning:
         help: "Ésta es una advertencia oficial."
@@ -2095,22 +2190,22 @@ es:
     original_post: "Post Original"
     views: "Visitas"
     views_lowercase:
-      one: "visita"
-      other: "visitas"
+      one: visita
+      other: visitas
     replies: "Respuestas"
     views_long:
-      one: "este tema se ha visto 1 vez"
-      other: "este tema se ha visto {{number}} veces"
+      one: este tema se ha visto 1 vez
+      other: este tema se ha visto {{number}} veces
     activity: "Actividad"
     likes: "Likes"
     likes_lowercase:
-      one: "me gusta"
-      other: "me gusta"
+      one: me gusta
+      other: me gusta
     likes_long: "este tema tiene {{number}} me gusta"
     users: "Usuarios"
     users_lowercase:
-      one: "usuario"
-      other: "usuarios"
+      one: usuario
+      other: usuarios
     category_title: "Categoría"
     history: "Historia"
     changed_by: "por {{author}}"
@@ -2124,8 +2219,8 @@ es:
       latest:
         title: "Recientes"
         title_with_count:
-          one: "Reciente (1)"
-          other: "Recientes ({{count}})"
+          one: Reciente (1)
+          other: Recientes ({{count}})
         help: "temas con posts recientes"
       hot:
         title: "Candente"
@@ -2143,21 +2238,21 @@ es:
       unread:
         title: "Sin leer"
         title_with_count:
-          one: "Sin leer (1)"
-          other: "Sin leer ({{count}})"
+          one: Sin leer (1)
+          other: Sin leer ({{count}})
         help: "temas que estás vigilando o siguiendo actualmente con posts no leídos"
         lower_title_with_count:
-          one: "{{count}} sin leer"
-          other: "{{count}} sin leer"
+          one: '{{count}} sin leer'
+          other: '{{count}} sin leer'
       new:
         lower_title_with_count:
-          one: "1 tema nuevo"
-          other: "{{count}} temas nuevos"
+          one: 1 tema nuevo
+          other: '{{count}} temas nuevos'
         lower_title: "nuevo"
         title: "Nuevo"
         title_with_count:
-          one: "Nuevos ({{count}})"
-          other: "Nuevos ({{count}})"
+          one: Nuevos ({{count}})
+          other: Nuevos ({{count}})
         help: "temas publicados en los últimos días"
       posted:
         title: "Mis posts"
@@ -2168,8 +2263,8 @@ es:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: "{{categoryName}} (1)"
-          other: "{{categoryName}} ({{count}})"
+          one: '{{categoryName}} (1)'
+          other: '{{categoryName}} ({{count}})'
         help: "temas recientes en la categoría {{categoryName}}"
       top:
         title: "Top"
@@ -2232,6 +2327,9 @@ es:
         dismiss_new_posts: '<b>x</b>, <b>r</b> Descartar Nuevos/Posts'
         dismiss_topics: '<b>x</b>, <b>t</b> Descartar temas'
         log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Cerrar sesión'
+      composing:
+        title: 'Redactando'
+        return: '<b>shift</b>+<b>c</b> Regresar al editor'
       actions:
         title: 'Acciones'
         bookmark_topic: '<b>f</b> Guardar/Quitar el tema de marcadores'
@@ -2254,24 +2352,25 @@ es:
         print: '<b>ctrl</b>+<b>p</b> Imprimir tema'
     badges:
       earned_n_times:
-        one: "Ganó este distintivo 1 vez"
-        other: "Ganó este distintivo %{count} veces"
+        one: Ganó este distintivo 1 vez
+        other: Ganó este distintivo %{count} veces
       granted_on: "Concedido hace: %{date}"
       others_count: "Otras personas con este distintivo (%{count})"
       title: Distintivos
       allow_title: "Puedes usar este distintivo como título"
       multiple_grant: "Puedes ganar esto varias veces"
       badge_count:
-        one: "1 Distintivo"
-        other: "%{count} distintivos"
+        one: 1 Distintivo
+        other: '%{count} distintivos'
       more_badges:
-        one: "+1 Más"
-        other: "+%{count} Más"
+        one: +1 Más
+        other: +%{count} Más
       granted:
-        one: "1 concedido"
-        other: "%{count} concedidos"
+        one: 1 concedido
+        other: '%{count} concedidos'
       select_badge_for_title: Seleccionar una distinción para utilizar como tu título
-      none: "<none>"
+      none: "(ninguna)"
+      successfully_granted: "Concedido exitosamente %{badge} a %{username}"
       badge_grouping:
         getting_started:
           name: Primeros pasos
@@ -2294,6 +2393,7 @@ es:
       </p>
     tagging:
       all_tags: "Etiquetas"
+      other_tags: "Otras Etiquetas"
       selector_all_tags: "etiquetas"
       selector_no_tags: "sin etiquetas"
       changed: "etiquetas cambiadas:"
@@ -2301,8 +2401,8 @@ es:
       choose_for_topic: "etiquetas opcionales"
       delete_tag: "Eliminar etiqueta"
       delete_confirm:
-        one: "¿Estás seguro de querer borrar esta etiqueta y eliminarla de 1 tema asignado?"
-        other: "¿Estás seguro de querer borrar esta etiqueta y eliminarla de {{count}} temas asignados?"
+        one: ¿Estás seguro de querer borrar esta etiqueta y eliminarla de 1 tema asignado?
+        other: ¿Estás seguro de querer borrar esta etiqueta y eliminarla de {{count}} temas asignados?
       delete_confirm_no_topics: "¿Estás seguro de querer borrar esta etiqueta?"
       rename_tag: "Renombrar etiqueta"
       rename_instructions: "Elige un nuevo nombre para la etiqueta:"
@@ -2319,13 +2419,13 @@ es:
       notifications:
         watching:
           title: "Vigilar"
-          description: "Vigilarás todos los temas en esta etiqueta. Se te notificará de todos los nuevos temas y posts, y además aparecerá el contador de posts sin leer y nuevos posts al lado del tema."
+          description: "Vigilarás automáticamente todos los temas en esta etiqueta. Se te notificará de todos los nuevos temas y posts, y además aparecerá el contador de posts sin leer y nuevos posts al lado del tema."
         watching_first_post:
           title: "Vigilar Primer Post"
-          description: "Se te notificará del primer post de cada nuevo tema en esta etiqueta."
+          description: "Se te notificará únicamente en el primer post de cada nuevo tema con esta etiqueta."
         tracking:
           title: "Seguir"
-          description: "Seguirás automáticamente todos los temas en esta etiqueta. Aparecerá un contador de posts sin leer y nuevos posts al lado del tema."
+          description: "Seguirás automáticamente todos los temas con esta etiqueta. Aparecerá un contador de posts sin leer y nuevos posts al lado del tema."
         regular:
           title: "Normal"
           description: "Se te notificará solo si alguien te menciona con tu @usuario o responde a algún post tuyo."
@@ -2345,6 +2445,9 @@ es:
         save: "Guardar"
         delete: "Eliminar"
         confirm_delete: "¿Seguro que quieres eliminar este grupo de etiquetas?"
+        everyone_can_use: "Etiquetas pueden ser usadas por cualquiera"
+        usable_only_by_staff: "Etiquetas son visibles para todos, pero solo el staff puede usarlas"
+        visible_only_to_staff: "Etiquetas son visibles únicamente para el staff"
       topics:
         none:
           unread: "No hay temas que sigas y que no hayas leído ya."
@@ -2372,6 +2475,7 @@ es:
       custom_message_placeholder: "Introducir un mensaje personalizado"
       custom_message_template_forum: "Hey, ¡quizá deberías unirte a este foro!"
       custom_message_template_topic: "¡Hey, he pensado que este tema te va a encantar!"
+    forced_anonymous: "Debido a la carga extrema, esto se muestra temporalmente a todos, ya que un usuario desconectado lo vería."
     safe_mode:
       enabled: "El modo seguro está activado, para salir del modo seguro cierra esta ventana del navegador"
   admin_js:
@@ -2382,6 +2486,8 @@ es:
       dashboard:
         title: "Panel"
         last_updated: "Panel actualizado el:"
+        find_old: "¿Buscando el antiguo dashboard?"
+        old_link: "lo visitas aquí"
         version: "Versión"
         up_to_date: "¡Estás al día!"
         critical_available: "Actualización crítica disponible."
@@ -2406,16 +2512,21 @@ es:
         space_free: "{{size}} libre"
         uploads: "subidas"
         backups: "backups"
+        lastest_backup: "Recientes: %{date}"
         traffic_short: "Tráfico"
         traffic: "Peticiones web de la app"
         page_views: "Páginas vistas"
         page_views_short: "Páginas vistas"
         show_traffic_report: "Mostrar informe detallado del tráfico"
+        community_health: Salud de la Comunidad
+        whats_new_in_discourse: "¿Qué hay de nuevo en Discourse?"
+        activity_metrics: Métricas de Actividad
         reports:
+          trend_title: "%{percent} de cambio. Actualmente %{current}, era %{prev} en el periodo previo."
           today: "Hoy"
           yesterday: "Ayer"
-          last_7_days: "Últimos 7 días"
-          last_30_days: "Últimos 30 días"
+          last_7_days: "Últimos 7"
+          last_30_days: "Últimos 30"
           all_time: "Todo el tiempo"
           7_days_ago: "Hace 7 días"
           30_days_ago: "Hace 30 días"
@@ -2426,6 +2537,10 @@ es:
           start_date: "Desde fecha"
           end_date: "Hasta fecha"
           groups: "Todos los grupos"
+          disabled: "Este reporte está inhabilitado"
+          trending_search:
+            more: '<a href="/admin/logs/search_logs">Buscar logs</a>'
+            disabled: 'El reporte de Tendencias de Búsquedas está inhabilitado. Habilita el <a href="/admin/site_settings/category/all_results?filter=log%20search%20queries">log consultas de búsquedas</a> para colectar datos.'
       commits:
         latest_changes: "Cambios recientes: ¡actualiza a menudo!"
         by: "por"
@@ -2434,17 +2549,21 @@ es:
         active_posts: "Posts Reportados"
         old_posts: "Post reportados antiguos"
         topics: "Temas Reportados"
-        moderation_history: "Histórico de moderación"
+        moderation_history: "Historia de Moderación"
         agree: "De acuerdo"
         agree_title: "Confirmar esta indicación como válido y correcto."
-        agree_flag_hide_post: "Coincidir y Ocultar Mensaje"
+        agree_flag_hide_post: "Esconder Post"
         agree_flag_hide_post_title: "Ocultar este post y enviar automáticamente un mensaje al usuario para que lo edite de forma urgente"
         agree_flag_restore_post: "Coincidir y Restaurar Mensaje"
         agree_flag_restore_post_title: "Restaurar el post para que todos los usuarios puedan verlo."
-        agree_flag: "Estar de acuerdo y mantener post"
+        agree_flag_suspend: "Suspender Usuario"
+        agree_flag_suspend_title: "Estar de acuerdo con el reporte y suspender el usuario."
+        agree_flag_silence: "Silenciar Usuario"
+        agree_flag_silence_title: "Estar de acuerdo con el reporte y silenciar el usuario."
+        agree_flag: "Mantener Post"
         agree_flag_title: "Estar de acuerdo con el reporte y mantener la publicación intacta."
-        defer_flag: "Ignorar"
-        defer_flag_title: "Eliminar este indicador; no es necesaria ninguna acción en este momento."
+        ignore_flag: "Ignorar"
+        ignore_flag_title: "Eliminar este reporte; no requiere ninguna acción en este momento."
         delete: "Eliminar"
         delete_title: "Eliminar el post referido por este indicador."
         delete_post_defer_flag: "Eliminar post e ignorar reporte"
@@ -2463,6 +2582,12 @@ es:
         more: "(más respuestas...)"
         suspend_user: "Suspender Usuario"
         suspend_user_title: "Suspender usuario de este post"
+        replies:
+          one: '[1 respuesta]'
+          other: '[%{count} respuestas]'
+        delete_replies:
+          one: ¿También borrar %{count} respuesta a este post?
+          other: ¿También borrar las %{count} respuestas a este post?
         dispositions:
           agreed: "coincidió"
           disagreed: "no coincidió"
@@ -2486,6 +2611,7 @@ es:
           type: "Tipo"
           users: "Usuarios"
           last_flagged: "Último reporte"
+          no_results: "No hay temas reportados."
         short_names:
           off_topic: "off-topic"
           inappropriate: "inapropiado"
@@ -2493,13 +2619,48 @@ es:
           notify_user: "personalizado"
           notify_moderators: "personalizado"
       groups:
+        new:
+          title: "Grupo Nuevo"
+          create: "Crear"
+          name:
+            too_short: "Nombre del grupo es muy corto"
+            too_long: "Nombre del grupo es muy largo"
+            checking: "Verificando disponibilidad del nombre del grupo..."
+            available: "Nombre del grupo está disponible"
+            not_available: "Nombre del grupo no está disponible"
+            blank: "Nombre del grupo no puede estar vacío"
+        bulk_add:
+          title: "Añadir al grupo en masa"
+          complete_users_not_added: "Estos usuarios no fueron agregados (asegurar que ellos tengan una cuenta):"
+          paste: "Pega una lista de nombres de usuario o emails, uno por línea:"
+        add_members:
+          as_owner: "Convertir usuario(s) como propietario(s) de este grupo"
+        manage:
+          interaction:
+            email: Email
+            incoming_email: "Emails entrantes personalizados"
+            incoming_email_placeholder: "introducir dirección de email"
+            visibility: Visibilidad
+            visibility_levels:
+              title: "¿Quién puede ver este grupo?"
+              public: "Todos"
+              members: "Propietarios del grupo, miembros y administradores"
+              staff: "Propietarios del grupo, y staff"
+              owners: "Propietarios del grupo y administradores"
+          membership:
+            automatic: Automático
+            trust_level: Nivel de Confianza
+            trust_levels_title: "Nivel de confianza entregado automáticamente a miembros cuando son añadidos:"
+            trust_levels_none: "Ninguno"
+            automatic_membership_email_domains: "Los usuarios que se registren con un dominio de e-mail que esté en esta lista serán automáticamente añadidos a este grupo:"
+            automatic_membership_retroactive: "Aplicar la misma regla de dominio de email para usuarios registrados existentes "
+            primary_group: "Establecer automáticamente como grupo principal"
+        name_placeholder: "Nombre del grupo, sin espacios, igual que los nombres de usuarios"
         primary: "Grupo principal"
         no_primary: "(ningún grupo principal)"
         title: "Grupos"
         edit: "Editar grupos"
         refresh: "Actualizar"
-        new: "Nuevo"
-        selector_placeholder: "introduce nombre de usuario"
         about: "Edita los aquí los nombres de los grupos y sus miembros"
         group_members: "Miembros del grupo"
         delete: "Borrar"
@@ -2507,22 +2668,12 @@ es:
         delete_failed: "No se pudo borrar el grupo. Si este es un grupo automático, no se puede destruir."
         delete_owner_confirm: "¿Quitar privilegios de propietario para '%{username}'?"
         add: "Añadir"
-        add_members: "Añadir miembros"
         custom: "Personalizado"
-        bulk_complete: "Los usuarios han sido añadidos al grupo."
-        bulk_complete_users_not_added: "Estos usuarios no fueron agregados (asegurar que ellos tengan una cuenta):"
-        bulk: "Añadir al grupo en masa"
-        bulk_paste: "Pega una lista de nombres de usuario o emails, uno por línea:"
-        bulk_select: "(selecciona un grupo)"
         automatic: "Automático"
-        automatic_membership_email_domains: "Los usuarios que se registren con un dominio de e-mail que esté en esta lista serán automáticamente añadidos a este grupo:"
-        automatic_membership_retroactive: "Aplicar la misma regla de dominio de email para usuarios registrados existentes "
-        default_title: "Título por defecto para todos los miembros en este grupo"
-        primary_group: "Establecer automáticamente como grupo principal"
+        default_title: "Título por defecto"
+        default_title_description: "será aplicado a todos los usuarios en el grupo"
         group_owners: Propietarios
         add_owners: Añadir propietarios
-        incoming_email: "Correos electrónicos entrantes personalizados"
-        incoming_email_placeholder: "introducir dirección de email"
         none_selected: "Selecciona un grupo para empezar"
         no_custom_groups: "Crear un nuevo grupo personalizado"
       api:
@@ -2579,7 +2730,19 @@ es:
           details: "Cuando se publique, edite, elimine o recupere una respuesta."
         user_event:
           name: "Evento de usuario"
-          details: "Cuando un usuario inicia sesión, la cierra o es creado, aprobado o actualizado."
+          details: "Cuando un usuario ingresa, sale, es creado, aprobado o actualizado."
+        group_event:
+          name: "Evento de Grupo"
+          details: "Cuando un grupo es creado, actualizado o destruido."
+        category_event:
+          name: "Evento de Categoría"
+          details: "Cuando una categoría es creada, actualizada o destruida."
+        tag_event:
+          name: "Evento de Etiqueta"
+          details: "Cuando una etiqueta es creada, actualizada o destruida."
+        flag_event:
+          name: "Reportar Evento"
+          details: "Cuando un reporte es creado, de acuerdo, en desacuerdo, o ignorado."
         delivery_status:
           title: "Estado de entrega"
           inactive: "Inactivo"
@@ -2589,11 +2752,11 @@ es:
           none: "No hay eventos relacionados."
           redeliver: "Reenviar"
           incoming:
-            one: "Hay un nuevo evento."
-            other: "Hay {{count}} nuevos eventos."
+            one: Hay un nuevo evento.
+            other: Hay {{count}} nuevos eventos.
           completed_in:
-            one: "Completado en 1 segundo."
-            other: "Completado en {{count}} segundos."
+            one: Completado en 1 segundo.
+            other: Completado en {{count}} segundos.
           request: "Petición"
           response: "Respuesta"
           redeliver_confirm: "¿Seguro que quieres reenviar el mismo payload?"
@@ -2621,6 +2784,7 @@ es:
         change_settings: "Cambiar preferencias"
         change_settings_short: "Ajustes"
         howto: "¿Cómo instalo plugins?"
+        official: "Plugin Oficial"
       backups:
         title: "Copia de seguridad"
         menu:
@@ -2644,7 +2808,7 @@ es:
           label: "Subir"
           title: "Subir un backup a esta instancia"
           uploading: "Subiendo..."
-          success: "El archivo '{{filename}}' se ha subido correctamente."
+          success: "'{{filename}}' ha sido exitosamente subido. El archivo se procesará ahora y tomará hasta un minuto para ser mostrado en la lista."
           error: "Ha ocurrido un error al subir el archivo '{{filename}}': {{message}}"
         operations:
           is_running: "Actualmente una operación se está procesando..."
@@ -2726,6 +2890,7 @@ es:
           common: "Común"
           desktop: "Escritorio"
           mobile: "Móvil"
+          settings: "Ajustes"
           preview: "Vista previa"
           is_default: "Theme habilitado por defecto"
           user_selectable: "Theme puede ser seleccionado por usuarios"
@@ -2738,6 +2903,11 @@ es:
           add_upload: "Agregar Subido"
           upload_file_tip: "Selecciona un archivo a subir (png, woff2, etc...)"
           variable_name: "Nombre de variable SCSS:"
+          variable_name_invalid: "Nombre de variable inválido. Alfanuméricos permitidos únicamente. Debe comenzar con una letra. Debe ser único."
+          variable_name_error:
+            invalid_syntax: "Nombre de variable inválido. Sólo alfanuméricos permitidos. Debe comenzar con una letra."
+            no_overwrite: "Nombre de variable inválido. No debe sobrescribir una variable existente. "
+            must_be_unique: "Nombre de variable inválido. Debe ser único."
           upload: "Subir"
           child_themes_check: "Theme incluye otros themes hijos"
           css_html: "Personalizar CSS/HTML"
@@ -2746,6 +2916,8 @@ es:
           delete_upload_confirm: "Borrar este upload? (El theme CSS puede dejar de funcionar!)"
           import_web_tip: "Repositorio que contiene el theme"
           import_file_tip: "archivo .dcstyle.json que contiene el theme"
+          is_private: "El theme está en un repositorio privado de git"
+          public_key: "Conceda la siguiente clave pública de acceso para el repositorio:"
           about_theme: "Acerca del Theme"
           license: "Licencia"
           component_of: "Theme es un componente de:"
@@ -2754,9 +2926,11 @@ es:
           updating: "Actualizando..."
           up_to_date: "Theme actualizado, última verificación:"
           add: "Agregar"
+          theme_settings: "Ajustes del Theme"
+          no_settings: "Este theme no tiene ajustes."
           commits_behind:
-            one: "Theme está 1 commit detrás!"
-            other: "Theme está {{count}} commits detrás!"
+            one: Theme está 1 commit detrás!
+            other: Theme está {{count}} commits detrás!
           scss:
             text: "CSS"
             title: "Ingresa tu CSS, aceptamos estilos válidos de CSS y SCSS"
@@ -2778,6 +2952,9 @@ es:
           body_tag:
             text: "</body>"
             title: "HTML que será insertado antes del tag </body>"
+          yaml:
+            text: "YAML"
+            title: "Definir ajustes al theme en formato YAML"
         colors:
           select_base:
             title: "Selecciona esquema base de color"
@@ -2888,13 +3065,13 @@ es:
             skipped_reason_placeholder: "motivo"
       moderation_history:
         performed_by: "Realizado por"
-        no_results: "Histórico de moderación no disponible."
+        no_results: "No hay historia de moderación disponible."
         actions:
-          delete_user: "Usuario eliminado"
-          suspend_user: "Usuario suspendido"
-          silence_user: "Usuario silenciado"
-          delete_post: "Post eliminado"
-          delete_topic: "Tema eliminado"
+          delete_user: "Usuario Borrado"
+          suspend_user: "Usuario Suspendido"
+          silence_user: "Usuario Silenciado"
+          delete_post: "Post Borrado"
+          delete_topic: "Tema Borrado"
       logs:
         title: "Logs"
         action: "Acción"
@@ -2939,10 +3116,13 @@ es:
             change_site_text: "cambiar textos"
             suspend_user: "suspender usuario"
             unsuspend_user: "desbloquear usuario"
+            removed_suspend_user: "suspender usuario (eliminado)"
+            removed_unsuspend_user: "no-suspender usuario (eliminado)"
             grant_badge: "conceder distintivo"
             revoke_badge: "revocar distintivo"
             check_email: "comprobar e-mail"
             delete_topic: "eliminar tema"
+            recover_topic: "recuperar tema"
             delete_post: "eliminar post"
             impersonate: "impersonar"
             anonymize_user: "anonimizar usuario"
@@ -2952,6 +3132,8 @@ es:
             create_category: "crear categoría"
             silence_user: "silenciar usuario"
             unsilence_user: "no-silenciar usuario"
+            removed_silence_user: "silenciar usuario (eliminado)"
+            removed_unsilence_user: "no-silenciar usuario (eliminado)"
             grant_admin: "conceder administración"
             revoke_admin: "revocar administración"
             grant_moderation: "conceder moderación"
@@ -2969,6 +3151,16 @@ es:
             backup_destroy: "destruir copia de seguridad"
             reviewed_post: "posts revisados"
             custom_staff: "acción personalizada por plugin"
+            post_locked: "post bloqueado"
+            post_edit: "editar post"
+            post_unlocked: "post desbloqueado"
+            check_personal_message: "revisar mensaje personal"
+            disabled_second_factor: "inhabilitar Autenticación Dos Factores"
+            topic_published: "tema publicado"
+            post_approved: "post aprobado"
+            create_badge: "crear distintivo"
+            change_badge: "cambiar distintivo"
+            delete_badge: "borrar distintivo"
         screened_emails:
           title: "Correos bloqueados"
           description: "Cuando alguien trata de crear una cuenta nueva, los siguientes correos serán revisados y el registro será bloqueado, o alguna otra acción será realizada."
@@ -3000,17 +3192,18 @@ es:
             text: "Agrupar"
             title: "Crea un nuevo rango de entradas para banear si hay al menos 'min_ban_entries_for_roll_up' entradas."
         search_logs:
-          title: "Logs de búsqueda"
+          title: "Buscar Logs"
           term: "Término"
           searches: "Búsquedas"
-          click_through: "Click Through"
+          click_through: "A través del clic"
           unique: "Único"
           unique_title: "usuarios únicos realizando la búsqueda"
           types:
             all_search_types: "Todos los tipos de búsqueda"
             header: "Encabezado"
             full_page: "Página Completa"
-            click_through_only: "Todo (solo entrados)"
+            click_through_only: "Todo (a través del clic únicamente)"
+          header_search_results: "Resultados de búsqueda de encabezado"
         logster:
           title: "Registros de errores"
       watched_words:
@@ -3019,8 +3212,8 @@ es:
         clear_filter: "Limpiar"
         show_words: "mostrar palabras"
         word_count:
-          one: "1 palabra"
-          other: "%{count} palabras"
+          one: 1 palabra
+          other: '%{count} palabras'
         actions:
           block: 'Bloquear'
           censor: 'Censurar'
@@ -3037,6 +3230,7 @@ es:
           placeholder_regexp: "regular expression"
           add: 'Agregar'
           success: 'Terminado'
+          exists: 'Ya existe'
           upload: "Subir"
           upload_successful: "Subida completada. Las palabras han sido agregadas."
       impersonate:
@@ -3060,13 +3254,14 @@ es:
           suspended: 'Suspendidos'
           silenced: 'Silenciado'
           suspect: 'Sospechoso'
+          staged: 'Temporal'
         approved: "Aprobado/s?"
         approved_selected:
-          one: "aprobar usuario"
-          other: "aprobar ({{count}}) usuarios"
+          one: aprobar usuario
+          other: aprobar ({{count}}) usuarios
         reject_selected:
-          one: "rechazar usuario"
-          other: "rechazar ({{count}}) usuarios"
+          one: rechazar usuario
+          other: rechazar ({{count}}) usuarios
         titles:
           active: 'Usuarios activos'
           new: 'Usuarios nuevos'
@@ -3082,12 +3277,13 @@ es:
           silenced: 'Usuarios Silenciados'
           suspended: 'Usuarios suspendidos'
           suspect: 'Usuarios sospechados'
+          staged: 'Usuarios Temporales'
         reject_successful:
-          one: "1 usuario rechazado con éxito."
-          other: "%{count} usuarios rechazados con éxito."
+          one: 1 usuario rechazado con éxito.
+          other: '%{count} usuarios rechazados con éxito.'
         reject_failures:
-          one: "Error al rechazar 1 usuario."
-          other: "Error al rechazar %{count} usuarios."
+          one: Error al rechazar 1 usuario.
+          other: Error al rechazar %{count} usuarios.
         not_verified: "No verificado"
         check_email:
           title: "Revelar la dirección de e-mail de este usuario"
@@ -3114,6 +3310,14 @@ es:
         suspended_until: "(hasta %{until})"
         cant_suspend: "Este usuario no puede ser suspendido."
         delete_all_posts: "Eliminar todos los posts"
+        penalty_post_actions: "¿Qué te gustaría hacer con la publicación asociada?"
+        penalty_post_delete: "Borrar el post"
+        penalty_post_edit: "Editar el post"
+        penalty_post_none: "Nada"
+        penalty_count: "Contador de Faltas"
+        clear_penalty_history:
+          title: "Borrar Historial de Faltas"
+          description: "usuarios con faltas no pueden alcanzar NC3"
         delete_all_posts_confirm_MF: "Estás a punto de eliminar {POSTS, plural, one {1 post} other {# posts}} y {TOPICS, plural, one {1 topic} other {# topics}}. ¿Seguro?"
         silence: "Silenciar"
         unsilence: "No silenciar"
@@ -3138,6 +3342,9 @@ es:
         grant_moderation: 'Conceder moderación'
         unsuspend: 'Quitar suspensión'
         suspend: 'Suspender'
+        show_flags_received: "Mostrar Reportes Recibidos"
+        flags_received_by: "Reportes Recibidos por %{username}"
+        flags_received_none: "Este usuario no ha recibido ningún reporte."
         reputation: Reputación
         permissions: Permisos
         activity: Actividad
@@ -3146,6 +3353,7 @@ es:
         private_topics_count: Temas privados
         posts_read_count: Posts leídos
         post_count: Posts publicados
+        second_factor_enabled: Autenticación de Dos Factores Habilitada
         topics_entered: Temas vistos
         flags_given_count: Reportes enviados
         flags_received_count: Reportes recibidos
@@ -3164,17 +3372,18 @@ es:
         delete_forbidden_because_staff: "Administradores y moderadores no pueden ser eliminados"
         delete_posts_forbidden_because_staff: "No se pueden eliminar todos los posts de admins y moderadores."
         delete_forbidden:
-          one: "Los usuarios no se pueden borrar si han sido registrados hace más de %{count} día, o si tienen publicaciones. Borra todas publicaciones antes de tratar de borrar un usuario."
-          other: "Los usuarios no se pueden borrar si han sido registrados hace más de %{count} días, o si tienen publicaciones. Borra todas publicaciones antes de tratar de borrar un usuario."
+          one: Los usuarios no se pueden borrar si han sido registrados hace más de %{count} día, o si tienen publicaciones. Borra todas publicaciones antes de tratar de borrar un usuario.
+          other: Los usuarios no se pueden borrar si han sido registrados hace más de %{count} días, o si tienen publicaciones. Borra todas publicaciones antes de tratar de borrar un usuario.
         cant_delete_all_posts:
-          one: "No se pueden eliminar todos los posts. Algunos tienen más de %{count} día de antigüedad. (Ver la opción delete_user_max_post_age )"
-          other: "No se pueden eliminar todos los posts. Algunos tienen más de %{count} días de antigüedad. (Ver la opción delete_user_max_post_age )"
+          one: No se pueden eliminar todos los posts. Algunos tienen más de %{count} día de antigüedad. (Ver la opción delete_user_max_post_age )
+          other: No se pueden eliminar todos los posts. Algunos tienen más de %{count} días de antigüedad. (Ver la opción delete_user_max_post_age )
         cant_delete_all_too_many_posts:
-          one: "No se pueden eliminar todos los posts porque el usuario tiene más de 1 post. (Ver la opción delete_all_posts_max)"
-          other: "No se pueden eliminar todos los posts porque el usuario tiene más de %{count} posts. (Ver la opción delete_all_posts_max)"
+          one: No se pueden eliminar todos los posts porque el usuario tiene más de 1 post. (Ver la opción delete_all_posts_max)
+          other: No se pueden eliminar todos los posts porque el usuario tiene más de %{count} posts. (Ver la opción delete_all_posts_max)
         delete_confirm: "Estás SEGURO que quieres borrar este usuario? Esta acción es permanente!"
         delete_and_block: "Eliminar y <b>bloquear</b> este correo y esta dirección IP"
         delete_dont_block: "Eliminar solo."
+        deleting_user: "Eliminando usuario..."
         deleted: "El usuario fue borrado."
         delete_failed: "Ha habido un error al borrar ese usuario. Asegúrate que todos las publicaciones han sido borrados antes de tratando de borrar este usuario."
         send_activation_email: "Enviar correo de activación"
@@ -3212,8 +3421,8 @@ es:
         tl3_requirements:
           title: "Requerimientos para el nivel de confianza 3"
           table_title:
-            one: "En el último día:"
-            other: "En los últimos %{count} días:"
+            one: 'En el último día:'
+            other: 'En los últimos %{count} días:'
           value_heading: "Valor"
           requirement_heading: "Requerimiento"
           visits: "Visitas"
@@ -3229,6 +3438,8 @@ es:
           likes_received: "Likes recibidos"
           likes_received_days: "'Me gusta' Recibidos: días únicos"
           likes_received_users: "'Me gusta' Recibidos: usuarios únicos."
+          suspended: "Suspendidos (todo el tiempo)"
+          silenced: "Silenciados (todo el tiempo)"
           qualifies: "Califica para el nivel de confianza 3."
           does_not_qualify: "No califica para el nivel de confianza 3."
           will_be_promoted: "Será promovido pronto."
@@ -3287,12 +3498,14 @@ es:
         go_back: "Volver a la búsqueda"
         recommended: "Recomendamos personalizar los siguientes textos para que se ajusten a tus necesidades:"
         show_overriden: 'Sólo mostrar textos editados'
-      site_settings:
-        show_overriden: 'Sólo mostrar lo personalizado'
-        title: 'Ajustes del sitio'
+      settings:
+        show_overriden: 'Solo mostrar anulados'
         reset: 'restablecer'
-        none: 'ninguno'
+        none: 'ninguna'
+      site_settings:
+        title: 'Ajustes del sitio'
         no_results: "Ningún resultado encontrado"
+        more_than_30_results: "Hay más de 30 resultados. Por favor, refina tu búsqueda o selecciona una categoría."
         clear_filter: "Limpiar filtro"
         add_url: "añadir URL"
         add_host: "añadir host"
@@ -3341,11 +3554,11 @@ es:
         reason_help: (Enlace a un post o tema)
         save: Guardar
         delete: Borrar
-        delete_confirm: ¿Estás seguro de que quieres eliminar este distintivo?
+        delete_confirm: "¿Estás seguro de que quieres eliminar este distintivo?"
         revoke: Revocar
         reason: Motivo
         expand: Expandir &hellip;
-        revoke_confirm: ¿Estás seguro de que quieres revocar este distintivo?
+        revoke_confirm: "¿Estás seguro de que quieres revocar este distintivo?"
         edit_badges: Editar distintivos
         grant_badge: Condecer distintivo
         granted_badges: Distintivos concedidos
@@ -3359,7 +3572,8 @@ es:
         enabled: Activar distintivo
         icon: Icono
         image: Imagen
-        icon_help: "Usa ya sea una clase Font Awesome o una URL a la imagen"
+        icon_help: "Usa una clase de Font Awesome"
+        image_help: "Ingrese la URL de la imagen (anula el campo del icono si ambos están configurados)"
         query: Consulta (SQL) para otorgar el distintivo
         target_posts: La consulta tiene como objetivo posts
         auto_revoke: Ejecutar diariamente la consulta de revocación
@@ -3383,14 +3597,14 @@ es:
             text: "Faltan algunas muestras a la hora de conceder el distintivo. Esto ocurre cuando la query del distintivo devuelve IDs de usuarios o de posts que no existen. Esto podría causar resultados inesperados más tarde - por favor, revisa de nuevo tu query."
           no_grant_count: "No hay distintivos para asignar."
           grant_count:
-            one: "<b>%{count}</b> distintivos para conceder."
-            other: "<b>%{count}</b> distintivos para conceder."
+            one: <b>%{count}</b> distintivos para conceder.
+            other: <b>%{count}</b> distintivos para conceder.
           sample: "Ejemplo:"
           grant:
-            with: <span class="username">%{username}</span>
-            with_post: <span class="username">%{username}</span> por publicar en %{link}
-            with_post_time: <span class="username">%{username}</span> por publicar en %{link} el <span class="time">%{time}</span>
-            with_time: <span class="username">%{username}</span> el <span class="time">%{time}</span>
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span> por publicar en %{link}"
+            with_post_time: "<span class=\"username\">%{username}</span> por publicar en %{link} el <span class=\"time\">%{time}</span>"
+            with_time: "<span class=\"username\">%{username}</span> el <span class=\"time\">%{time}</span>"
       emoji:
         title: "Emoji"
         help: "Añade nuevos emojis que estarán disponibles para todos. (CONSEJO: arrasta varios archivos a la vez)"
@@ -3436,7 +3650,7 @@ es:
         category_id: "Id de la categoría"
         category_title: "Categoría"
         external_url: "URL externa"
-        delete_confirm: ¿Seguro que quieres eliminar este enlace permanente?
+        delete_confirm: "¿Seguro que quieres eliminar este enlace permanente?"
         form:
           label: "Nuevo:"
           add: "Añadir"
@@ -3451,8 +3665,8 @@ es:
       uploading: "Subiendo..."
       quit: "Tal vez más tarde"
       staff_count:
-        one: "Tu comunidad tiene 1 staff (tú). "
-        other: "Tu comunidad tiene %{count} staff, incluyéndote."
+        one: 'Tu comunidad tiene 1 staff (tú). '
+        other: Tu comunidad tiene %{count} staff, incluyéndote.
       invites:
         add_user: "añadir"
         none_added: "No has invitado a nadie como staff. ¿Seguro que quieres continuar?"
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index 1a5134206b6..43241f1897d 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -43,64 +43,71 @@ et:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: "< 1s"
-          other: "< %{count}s"
+          one: < 1s
+          other: < %{count}s
         x_seconds:
-          one: "1s"
-          other: "%{count}s"
+          one: 1s
+          other: '%{count}s'
+        less_than_x_minutes:
+          one: < 1m
+          other: < %{count}m
         x_minutes:
-          one: "1m"
-          other: "%{count}m"
+          one: 1m
+          other: '%{count}m'
         about_x_hours:
-          one: "1h"
-          other: "%{count}h"
+          one: 1h
+          other: '%{count}h'
         x_days:
-          one: "1p"
-          other: "%{count}p"
+          one: 1p
+          other: '%{count}p'
+        x_months:
+          one: 1kuu
+          other: '%{count}kuud'
         about_x_years:
-          one: "1a"
-          other: "%{count}a"
+          one: 1a
+          other: '%{count}a'
         over_x_years:
-          one: "> 1a"
-          other: "> %{count}a"
+          one: '> 1a'
+          other: '> %{count}a'
         almost_x_years:
-          one: "1a"
-          other: "%{count}a"
+          one: 1a
+          other: '%{count}a'
         date_month: "D. MMMM"
         date_year: "MMMM 'YY"
       medium:
         x_minutes:
-          one: "1 min"
-          other: "%{count} min"
+          one: 1 min
+          other: '%{count} min'
         x_hours:
-          one: "1 tund"
-          other: "%{count} tundi"
+          one: 1 tund
+          other: '%{count} tundi'
         x_days:
-          one: "1 päev"
-          other: "%{count} päeva"
+          one: 1 päev
+          other: '%{count} päeva'
         date_year: "D. MMMM, 'YY"
       medium_with_ago:
         x_minutes:
-          one: "1 min tagasi"
-          other: "%{count} min tagasi"
+          one: 1 min tagasi
+          other: '%{count} min tagasi'
         x_hours:
-          one: "1 tund tagasi"
-          other: "%{count} tundi tagasi"
+          one: 1 tund tagasi
+          other: '%{count} tundi tagasi'
         x_days:
-          one: "1 päev tagasi"
-          other: "%{count} päeva tagasi"
+          one: 1 päev tagasi
+          other: '%{count} päeva tagasi'
       later:
         x_days:
-          one: "1 päev hiljem"
-          other: "%{count} päeva hiljem"
+          one: 1 päev hiljem
+          other: '%{count} päeva hiljem'
         x_months:
-          one: "1 kuu hiljem"
-          other: "%{count} kuud hiljem"
+          one: 1 kuu hiljem
+          other: '%{count} kuud hiljem'
         x_years:
-          one: "1 aasta hiljem"
-          other: "%{count} aastat hiljem"
+          one: 1 aasta hiljem
+          other: '%{count} aastat hiljem'
       previous_month: 'Eelmine Kuu'
       next_month: 'Järgmine Kuu'
+      placeholder: kuupäev
     share:
       topic: 'jaga teema viidet'
       post: 'post nr%{postNumber}'
@@ -111,7 +118,6 @@ et:
       email: 'Jaga viidet meiliga'
     action_codes:
       public_topic: "muutsin selle teema avalikuks %{when}"
-      private_topic: "muutsin selle teema privaatseks %{when}"
       split_topic: "poolita teema %{when} juurest"
       invited_user: "kutsutud %{who} %{when}"
       invited_group: "kutsusin %{who} %{when}"
@@ -137,8 +143,8 @@ et:
         disabled: 'eemaldatud %{when}'
     topic_admin_menu: "teema admintegevused"
     emails_are_disabled: "Kõik väljuvad meilid on administraatori poolt blokeeritud. Ühtegi teavitust meili teel ei saadeta."
-    bootstrap_mode_enabled: "Oma uue saidi lansseerimise hõlbustamiseks oled käivitusrežiimil. Kõik uued kasutajad saavad usaldustaseme 1 ja nende igapäevased kokkuvõtvad teavitused meili teel on aktiveeritud. See lülitub automaatselt välja kui kasutajate koguarv ületab %{min_users} piiri."
-    bootstrap_mode_disabled: "Käivitusrežiim lülitub välja järgmise 24 tunni jooksul."
+    themes:
+      default_description: "Vaikimisi"
     s3:
       regions:
         ap_northeast_1: "Aasia ja Vaikne ookean (Tokyo)"
@@ -149,8 +155,10 @@ et:
         cn_north_1: "Hiina (Beijing)"
         eu_central_1: "EL (Frankfurt)"
         eu_west_1: "EL (Iirimaa)"
+        eu_west_2: "EU (London)"
         sa_east_1: "Lõuna-Ameerika (Sao Paulo)"
         us_east_1: "US Ida (N. Virginia)"
+        us_east_2: "US Ida (Ohio)"
         us_gov_west_1: "AWS GovCloud (US)"
         us_west_1: "US Lääs (N. California)"
         us_west_2: "US Lääs (Oregon)"
@@ -158,6 +166,7 @@ et:
     not_implemented: "Seda omadust pole veel rakendatud, vabandame!"
     no_value: "Ei"
     yes_value: "Jah"
+    submit: "Saada"
     generic_error: "Vabandust, tekkis viga."
     generic_error_with_reason: "Tekkis viga: %{error}"
     sign_up: "Liitu"
@@ -170,8 +179,8 @@ et:
     show_help: "võimalused"
     links: "Viited"
     links_lowercase:
-      one: "viide"
-      other: "viited"
+      one: viide
+      other: viited
     faq: "KKK"
     guidelines: "Juhised"
     privacy_policy: "Privaatsuspoliitika"
@@ -195,8 +204,8 @@ et:
     max_of_count: "maksimum {{count}}-st"
     alternation: "või"
     character_count:
-      one: "{{count}} sümbol"
-      other: "{{count}} sümbolit"
+      one: '{{count}} sümbol'
+      other: '{{count}} sümbolit'
     suggested_topics:
       title: "Soovitatud teemad"
       pm_title: "Soovitatud sõnumid"
@@ -208,8 +217,6 @@ et:
       our_moderators: "Meie moderaatorid"
       stat:
         all_time: "Alates algusest"
-        last_7_days: "Viimased 7 päeva"
-        last_30_days: "Viimased 30 päeva"
       like_count: "Meeldimisi"
       topic_count: "Teemad"
       post_count: "Postitused"
@@ -230,16 +237,6 @@ et:
       last_read: "see on viimane Sinu loetud postitus; kliki järjehoidja lisamiseks"
       remove: "Eemalda järjehoidja"
       confirm_clear: "Oled kindel, et soovid selle teema kõik järjehoidjad eemaldada?"
-    topic_count_latest:
-      one: "{{count}} uus või täiendatud teema."
-      other: "{{count}} uut või täiendatud teemat."
-    topic_count_unread:
-      one: "{{count}} lugemata teema."
-      other: "{{count}} lugemata teemat."
-    topic_count_new:
-      one: "{{count}} uus teema."
-      other: "{{count}} uut teemat."
-    click_to_show: "Kliki kuvamiseks."
     preview: "eelvaade"
     cancel: "tühista"
     save: "Salvesta muudatused"
@@ -249,6 +246,7 @@ et:
     uploading: "Laen üles..."
     uploading_filename: "Laen üles {{filename}}..."
     uploaded: "Üles laetud!"
+    pasting: "Asetamine..."
     enable: "Võimalda"
     disable: "Tõkesta"
     undo: "Ennista"
@@ -275,16 +273,16 @@ et:
       cancel: "Tühista"
       view_pending: "vaata kinnitamata postitusi"
       has_pending_posts:
-        one: "<b>1</b> postitus selles teemas ootab kinnitamist"
-        other: "<b>{{count}}</b> postitust selles teemas ootavad kinnitamist"
+        one: <b>1</b> postitus selles teemas ootab kinnitamist
+        other: <b>{{count}}</b> postitust selles teemas ootavad kinnitamist
       confirm: "Salvesta muudatused"
       delete_prompt: "Oled kindel, et soovid <b>%{username}</b> kustutada? Sellega kaasneb tema kõigi postituste kustutamine ja meili- ning IP-aadresside blokeerimine."
       approval:
         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: "Sul on <strong>1</strong> kinnitamata postitus."
-          other: "Sul on <strong>{{count}}</strong> kinnitamata postitust."
+          one: Sul on <strong>1</strong> kinnitamata postitus.
+          other: Sul on <strong>{{count}}</strong> kinnitamata postitust.
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> postitas <a href='{{topicUrl}}'>selle teema</a>"
@@ -318,8 +316,8 @@ et:
       posts_read: "Loetud"
       posts_read_long: "Positusi loetud"
       total_rows:
-        one: "1 kasutaja"
-        other: "%{count} kasutajat"
+        one: 1 kasutaja
+        other: '%{count} kasutajat'
     group_histories:
       actions:
         change_group_setting: "Muuda grupi sätteid"
@@ -328,22 +326,7 @@ et:
         make_user_group_owner: "Määra omanikuks"
         remove_user_as_group_owner: "Eemalda omanik"
     groups:
-      logs:
-        title: "Logid"
-        when: "Millal"
-        action: "Tegevus"
-        acting_user: "Tegev kasutaja"
-        target_user: "Sihtkasutaja"
-        subject: "Teema"
-        details: "Detailid"
-        from: "Kellelt"
-        to: "Kellele"
-      edit:
-        title: 'Muuda gruppi'
-        full_name: 'Täisnimi'
-        add_members: "Lisa liikmed"
-        delete_member_confirm: "Eemalda '%{username}' grupist '%{group}'?"
-      name_placeholder: "Grupi nimi, tühikuteta, vastab kasutajanime reeglitele"
+      public_exit: "Luba kasutajatel vabalt grupist lahkuda"
       empty:
         posts: "Selle grupi liikmetelt ei ole postitusi."
         members: "Sellel grupil liikmed puuduvad."
@@ -352,36 +335,32 @@ et:
         topics: "Selle grupi liikmetelt ei ole teemasid."
         logs: "Sellele grupile logid puuduvad."
       add: "Lisa"
-      join: "Liitu grupiga"
-      leave: "Lahku grupist"
-      request: "Taotle liitumist grupiga"
-      automatic_group: Automaatne grupp
-      closed_group: Suletud grupp
-      is_group_user: "Oled selle grupi liige"
+      message: "Sõnum"
+      membership_request:
+        submit: "Saada päring"
       membership: "Liikmelisus"
       name: "Nimi"
-      user_count: "Liikmete arv"
       bio: "Grupist"
-      selector_placeholder: "Lisa liikmeid"
+      selector_placeholder: "sisesta kasutajanimi"
       owner: "omanik"
       index:
         title: "Grupid"
         empty: "Ühtegi nähtavat gruppi pole."
+      title:
+        one: Grupp
+        other: Grupid
       activity: "Tegevused"
-      members: "Liikmed"
       topics: "Teemat"
       posts: "Postitused"
       mentions: "Mainimisi"
       messages: "Sõnumid"
       alias_levels:
+        messageable: "Kes saab sellele grupile sõnumeid saata?"
         nobody: "Mitte keegi"
         only_admins: "Vaid adminid"
         mods_and_admins: "Vaid moderaatorid ja adminnid"
         members_mods_and_admins: "Vaid grupi liikmed, moderaatorid ja adminnid"
         everyone: "Igaüks"
-      trust_levels:
-        title: "Liikmetele peale lisamist automaatselt omistatud usaldustase:"
-        none: "Puudub"
       notifications:
         watching:
           title: "Vaatlen"
@@ -406,23 +385,21 @@ et:
       flair_color_placeholder: "(Valikuline) Värvi väärtus heksakoodis"
       flair_preview_icon: "Ikooni eelvaatlus"
       flair_preview_image: "Pildi eelvaatlus"
-      flair_note: "Märkus: Andekus kuvatakse vaid kasutaja põhigrupi jaoks."
     user_action_groups:
-      '1': "Meeldimisi antud"
-      '2': "Meeldimisi saadud"
-      '3': "Järjehoidjat"
-      '4': "Teemat"
-      '5': "Vastust"
-      '6': "Reaktsioone"
-      '7': "Mainimisi"
-      '9': "Tsitaate"
-      '11': "Redaktsioone"
-      '12': "Saatmisi"
-      '13': "Postkast"
-      '14': "Ootel"
+      "1": "Meeldimisi antud"
+      "2": "Meeldimisi saadud"
+      "3": "Järjehoidjat"
+      "4": "Teemat"
+      "5": "Vastust"
+      "6": "Reaktsioone"
+      "7": "Mainimisi"
+      "9": "Tsitaate"
+      "11": "Redaktsioone"
+      "12": "Saatmisi"
+      "13": "Postkast"
+      "14": "Ootel"
     categories:
       all: "kõik foorumid"
-      all_subcategories: "kõik"
       no_subcategory: "mitte ükski"
       category: "Foorum"
       category_list: "Kuva foorumid"
@@ -441,11 +418,11 @@ et:
       toggle_ordering: "lülita järjestus"
       subcategories: "Alamfoorumid"
       topic_sentence:
-        one: "1 teema"
-        other: "%{count} teemat"
+        one: 1 teema
+        other: '%{count} teemat'
       topic_stat_sentence:
-        one: "%{count} uus teema viimase %{unit} jooksul."
-        other: "%{count} uut teemat viimase %{unit} jooksul."
+        one: '%{count} uus teema viimase %{unit} jooksul.'
+        other: '%{count} uut teemat viimase %{unit} jooksul.'
     ip_lookup:
       title: IP-aadressi Otsing
       hostname: Hostinimi
@@ -469,6 +446,7 @@ et:
       mute: "Vaigista"
       edit: "Muuda Eelistusi"
       download_archive:
+        button_text: "Laadi kõik alla"
         confirm: "Oled kindel, et soovid enda postitused alla laadida?"
         success: "Allalaadimine käivitatud. Protsessi lõppemisel saadetakse Sulle teade."
         rate_limit_error: "Postitusi saab alla laadida üks kord ööpäevas. Palun proovi homme uuesti."
@@ -485,7 +463,6 @@ et:
       notifications: "Teavitused"
       statistics: "Statistika"
       desktop_notifications:
-        label: "Töölaua teavitused"
         not_supported: "See brauser ei toeta teavitusi. Kahju."
         perm_default: "Lülita teavitused sisse"
         perm_denied_btn: "Pole lubatud"
@@ -493,11 +470,14 @@ et:
         disable: "Keela teavitused"
         enable: "Luba teavitused"
         each_browser_note: "Märkus: see säte tuleb muuta igas kasutusel olevas brauseris."
+      dismiss: 'Ignoreeri'
       dismiss_notifications: "Ignoreeri kõiki"
       dismiss_notifications_tooltip: "Märgi kõik lugemata teavitused loetuks"
       first_notification: "Sinu esimene teavitus! Vali see et alustada."
       disable_jump_reply: "Ära hüppa minu postitusse peale vastamist"
       dynamic_favicon: "Kuva uute / muudetud teemade arvu brauseri ikoonil"
+      theme_default_on_all_devices: "Tee see minu vaikimisi kujunduseks kõigil seadmetel"
+      allow_private_messages: "Luba teistel kasutajatel mulle privaatsõnumeid saata"
       external_links_in_new_tab: "Ava kõik välisviited uuel sakil"
       enable_quoting: "Luba esiletõstetud tekstile tsitaadiga vastata"
       change: "muuda"
@@ -505,7 +485,9 @@ et:
       admin: "{{user}} on admin"
       moderator_tooltip: "See kasutaja on moderaator"
       admin_tooltip: "See kasutaja on admin"
+      silenced_tooltip: "See kasutaja on vaigistatud"
       suspended_notice: "Selle kasutaja ligipääs on ajutiselt peatatud kuni {{date}}."
+      suspended_permanently: "Selle kasutaja konto on peatatud."
       suspended_reason: "Põhjus:"
       github_profile: "Github"
       email_activity_summary: "Tegevuste kokkuvõte"
@@ -539,7 +521,6 @@ et:
       delete_account: "Kustuta minu konto"
       delete_account_confirm: "Kas oled kindel, et soovid oma konto jäädavalt kustutada? Seda toimingut ei ole võimalik tagasi võtta!"
       deleted_yourself: "Konto on edukalt kustutatud."
-      delete_yourself_not_allowed: "Sa ei saa hetkel oma kontot kustutada. Võta ühendust administraatoriga et ta teeks seda sinu eest."
       unread_message_count: "Sõnumid"
       admin_delete: "Kustuta"
       users: "Kasutajad"
@@ -547,11 +528,14 @@ et:
       muted_users_instructions: "Summuta kõik teavitused nendelt kasutajatelt."
       muted_topics_link: "Näita vaigistatud teemasid"
       watched_topics_link: "Näita vaatlusaluseid teemasid"
+      tracked_topics_link: "Näita jälgitud teemasid"
       automatically_unpin_topics: "Eemalda lõppu jõudmisel teemadelt automaatselt esiletõstmise märgistus."
       apps: "Äpid"
       revoke_access: "Tühista ligipääs"
       undo_revoke_access: "Tühista ligipääsu tühistamine"
       api_approved: "Heakskiidetud:"
+      theme: "Teema"
+      home: "aikimisi avaleht"
       staff_counters:
         flags_given: "kasulikud tähised"
         flagged_posts: "tähistatud postitused"
@@ -569,6 +553,16 @@ et:
         move_to_archive: "Arhiiv"
         failed_to_move: "Valitud sõnumite teisaldamine ebaõnnestus (võrguühendus võib olla häiritud)"
         select_all: "Vali kõik"
+        tags: "Sildid"
+      preferences_nav:
+        account: "Konto"
+        profile: "Profiil"
+        emails: "E-post"
+        notifications: "Teavitused"
+        categories: "Kategooriad"
+        tags: "Sildid"
+        interface: "Kasutajaliides"
+        apps: "Äpid"
       change_password:
         success: "(meil saadetud)"
         in_progress: "(saadan meili)"
@@ -616,8 +610,8 @@ et:
         authenticated: "Sinu meil on autenditud {{provider}} poolt"
         frequency_immediately: "Saadame sulle kohe meili, kui sa ei ole seda lugenud, mille kohta meili saatsime."
         frequency:
-          one: "Saadame meili vaid siis, kui pole sind viimase minuti jooksul näinud."
-          other: "Saadame meili vaid siis, kui pole Sind viimase {{count}} minuti jooksul näinud."
+          one: Saadame meili vaid siis, kui pole sind viimase minuti jooksul näinud.
+          other: Saadame meili vaid siis, kui pole Sind viimase {{count}} minuti jooksul näinud.
       name:
         title: "Nimi"
         instructions: "sinu täisnimi (mittekohustuslik)"
@@ -648,8 +642,6 @@ et:
       created: "Liitus"
       log_out: "Logi välja"
       location: "Asukoht"
-      card_badge:
-        title: "Kasutajakaardi märgis"
       website: "Veebileht"
       email_settings: "Meiliaadress"
       like_notification_frequency:
@@ -703,10 +695,10 @@ et:
         title: "kutsed"
         user: "Kutsutud kasutaja"
         sent: "Saadetud"
-        none: "Ühtegi ootel kutset ei ole kuvada"
+        none: "Pole ühtegi kutset, mida näidata."
         truncated:
-          one: "Näitan esimest kutset."
-          other: "Näitan esimest {{count}} kutset."
+          one: Näitan esimest kutset.
+          other: Näitan esimest {{count}} kutset.
         redeemed: "Lunastatud kutsed"
         redeemed_tab: "Lunastatud"
         redeemed_tab_with_count: "Lunastatud ({{count}})"
@@ -719,8 +711,12 @@ et:
         expired: "See kutse on aegunud."
         rescind: "Eemalda"
         rescinded: "Kutse eemaldatud"
+        rescind_all: "Eemalda kõik kutsed"
+        rescinded_all: "Kõik kutsed on eemaldatud!"
+        rescind_all_confirm: "Oled sa kindel, et soovid kõiki kutseid eemaldada?"
         reinvite: "Saada kutse uuesti"
         reinvite_all: "Saada kõik kutsed uuesti"
+        reinvite_all_confirm: "Oled sa kindel, et soovid kõik kutsed uuesti saata?"
         reinvited: "Kutse uuesti saadetud"
         reinvited_all: "Kõik kutsed uuesti saadetud"
         time_read: "Lugemise aeg"
@@ -748,20 +744,26 @@ et:
         stats: "Statistika"
         time_read: "lugemise aeg"
         topic_count:
-          one: "teema loodud"
-          other: "teemat loodud"
+          one: teema loodud
+          other: teemat loodud
         post_count:
-          one: "postitus loodud"
-          other: "postitust loodud"
+          one: postitus loodud
+          other: postitust loodud
+        likes_given:
+          one: antud
+          other: antud
+        likes_received:
+          one: saadud
+          other: saadud
         days_visited:
-          one: "päev külastatud"
-          other: "päevi külastatud"
+          one: päev külastatud
+          other: päevi külastatud
         posts_read:
-          one: "postitus loetud"
-          other: "postitust loetud"
+          one: postitus loetud
+          other: postitust loetud
         bookmark_count:
-          one: "järjehoidja"
-          other: "järjehoidjad"
+          one: järjehoidja
+          other: järjehoidjad
         top_replies: "Parimad vastused"
         no_replies: "Veel ei ole vastuseid."
         more_replies: "Veel vastuseid"
@@ -829,8 +831,8 @@ et:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> on saavutanud saidi sätetes kehtestatud limiidi %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> ületab saidi sätetes kehtestatud limiiti %{siteSettingRate}."
       rate:
-        one: "1 viga/%{duration}"
-        other: "%{count} viga/%{duration}"
+        one: 1 viga/%{duration}
+        other: '%{count} viga/%{duration}'
     learn_more: "uuri veel..."
     all_time: 'kokku'
     all_time_desc: 'kokku teemasid loodud'
@@ -844,6 +846,7 @@ et:
     first_post: Esimene postitus
     mute: Vaigista
     unmute: Tühista vaigistus
+    last_post: Postitatud
     last_reply_lowercase: viimane vastus
     replies_lowercase:
       one: vastus
@@ -893,6 +896,8 @@ et:
       complete_email_found: "Leidsime konto, mille omaniku meiliaadress on <b>%{email}</b>, peaksid varsti saama meili koos parooli uuendamise juhistega."
       complete_username_not_found: "Kasutajanimele <b>%{username}</b> ei vasta ükski konto"
       complete_email_not_found: "Meiliaadressile <b>%{email}</b> ei vasta ükski konto"
+      button_ok: "OK"
+      button_help: "Abi"
     login:
       title: "Logi sisse"
       username: "Kasutaja"
@@ -912,6 +917,8 @@ et:
       not_allowed_from_ip_address: "Sellelt IP-aadressilt ei saa sisse logida."
       admin_not_allowed_from_ip_address: "Sellelt IP-aadressilt ei saa adminina sisse logida."
       resend_activation_email: "Selleks, et aktiveerimise meili uuesti saata, klikka siia."
+      change_email: "Muuda e-posti aadressi"
+      submit_new_email: "Uuenda e-posti aadressi"
       sent_activation_email_again: "Saatsime sulle aktiveerimise meili aadressile <b>{{currentEmail}}</b>. Selle kohalejõudmine võib võtta mõne minuti; kontrolli kindlasti ka spämmikausta."
       to_continue: "Palun logi sisse"
       preferences: "Oma kasutajaeelistuste muutmiseks pead olema sisse logitud."
@@ -946,6 +953,9 @@ et:
       your_email: "Teie konto meiliaadress on <b>%{email}</b>."
       accept_invite: "Võta kutse vastu"
       success: "Teie konto on loodud ning olete nüüd sisse logitud."
+      name_label: "Nimi"
+      password_label: "Määra parool"
+      optional_description: "(valikuline)"
     password_reset:
       continue: "Edasi saidile %{site_name}"
     emoji_set:
@@ -954,6 +964,8 @@ et:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+      google_classic: "Google klassikaline"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "Ainult foorumid"
       categories_with_featured_topics: "Foorumid esiletõstetud teemadega"
@@ -962,12 +974,34 @@ et:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    select_kit:
+      default_header_text: Vali...
+      no_content: Midagi ei leitud
+      filter_placeholder: Otsi...
+    emoji_picker:
+      filter_placeholder: Otsi emojit
+      people: Inimesed
+      nature: Loodus
+      food: Toit
+      activity: Tegevused
+      travel: Reisimine
+      objects: Objektid
+      celebration: Tähistamine
+      custom: Kohandatud emoji
+      recent: Viimati kasutatud
+      default_tone: Nahatooni pole
+      light_tone: Hele nahatoon
+      medium_light_tone: Keskmiselt hele nahatoon
+      medium_tone: Keskmine nahatoon
+      medium_dark_tone: Keskmiselt tume nahatoon
+      dark_tone: Tume nahatoon
     composer:
       emoji: "Emoji :)"
       more_emoji: "veel..."
       options: "Võimalused"
       whisper: "sosista"
       unlist: "eemaldatud"
+      blockquote_text: "Tsitaat"
       add_warning: "See on ametlik hoiatus."
       toggle_whisper: "Lülita sosistamine ümber"
       toggle_unlisted: "Lülita eemaldamine ümber"
@@ -978,8 +1012,8 @@ et:
       similar_topics: "Sinu teema sarnaneb..."
       drafts_offline: "mustandid vallasrežiimis"
       group_mentioned:
-        one: "Mainides {{group}}, oled teavitamas <a href='{{group_link}}'>1 inimest</a> – oled selles kindel?"
-        other: "Mainides {{group}}, oled teavitamas <a href='{{group_link}}'>{{count}} inimest</a> – oled selles kindel?"
+        one: Mainides {{group}}, oled teavitamas <a href='{{group_link}}'>1 inimest</a> – oled selles kindel?
+        other: Mainides {{group}}, oled teavitamas <a href='{{group_link}}'>{{count}} inimest</a> – oled selles kindel?
       cannot_see_mention:
         category: "Mainisid kasutajat {{username}} kuid teda ei teavitata, kuna tal puudub juurdepääs siia foorumisse. Lisa ta gruppi, kellel on siia foorumisse ligipääs."
         private: "Mainisid kasutajat {{username}} kuid teda ei teavitata, kuna tal puudub juurdepääs käesoleva privaatsõnumi juurde. Kutsu ta seda privaatsõnumit vaatama."
@@ -998,6 +1032,7 @@ et:
       cancel: "Tühista"
       create_topic: "Loo teema"
       create_pm: "Sõnum"
+      create_whisper: "Sosistamine"
       title: "Või vajuta Ctrl+Enter"
       users_placeholder: "Lisa kasutaja"
       title_placeholder: "Kuidas seda vestlust ühe lausega kirjeldada?"
@@ -1005,6 +1040,7 @@ et:
       edit_reason_placeholder: "miks sa seda muudad?"
       show_edit_reason: "(lisa muutmise põhjus)"
       topic_featured_link_placeholder: "Järgi pealkirjas näidatud viidet."
+      remove_featured_link: "Eemalda teemast link."
       reply_placeholder: "Kirjuta siia. Kujundamiseks kasuta Markdown, BBCode, või HTML-i. Pildid võid siia lohistada või kleepida."
       view_new_post: "Vaata oma uut postitust."
       saving: "Salvestan"
@@ -1044,33 +1080,40 @@ et:
         body: "Hetkel saadetakse see sõnum vaid sulle endale!"
       admin_options_title: "Meeskonna valikulised sätted selle teema jaoks"
     notifications:
+      tooltip:
+        regular:
+          one: 1 nägemata teavitus
+          other: '{{count}} nägemata teavitust'
+        message:
+          one: 1 lugemata sõnum
+          other: '{{count}} lugemata sõnumit'
       title: "teavitused @name mainimiste, oma postitustele ja teemadele vastamiste, sõnumite, jne kohta"
       none: "Hetkel ei saa teavitusi laadida."
       empty: "Teavitusi ei leitud."
       more: "vaata vanemaid teavitusi"
       total_flagged: "tähistatud postitusi kokku"
-      alt:
-        mentioned: "Mainis"
-        quoted: "Tsiteeris"
-        replied: "Vastas"
-        posted: "Postitas"
-        edited: "Muuda oma postitust"
-        liked: "Sinu postitus meeldis"
-        private_message: "Privaatsõnum"
-        invited_to_private_message: "Privaatsõnumit kutsus lugema"
-        invited_to_topic: "Teemasse kutsus"
-        invitee_accepted: "Kutse võttis vastu"
-        moved_post: "Sinu postituse liigutas"
-        linked: "Viide sinu postitusele"
-        granted_badge: "Märgis antud"
-        group_message_summary: "Sõnumeid grupi postkastis"
+      mentioned: "<span>{{username}}</span> {{description}}"
+      group_mentioned: "<span>{{username}}</span> {{description}}"
+      quoted: "<span>{{username}}</span> {{description}}"
+      replied: "<span>{{username}}</span> {{description}}"
+      posted: "<span>{{username}}</span> {{description}}"
+      edited: "<span>{{username}}</span> {{description}}"
+      liked: "<span>{{username}}</span> {{description}}"
+      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      private_message: "<span>{{username}}</span> {{description}}"
+      invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
+      invited_to_topic: "<span>{{username}}</span> {{description}}"
+      invitee_accepted: "<span>{{username}}</span> võttis su kutse vastu"
+      moved_post: "<span>{{username}}</span> moved {{description}}"
+      linked: "<span>{{username}}</span> {{description}}"
+      topic_reminder: "<span>{{username}}</span> {{description}}"
+      watching_first_post: "<span>New Topic</span> {{description}}"
       popup:
         mentioned: '{{username}} mainis Sind teemas "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} mainis Sind teemas "{{topic}}" - {{site_title}}'
         quoted: '{{username}} tsiteeris Sind teemas "{{topic}}" - {{site_title}}'
         replied: '{{username}} vastas Sulle teemas "{{topic}}" - {{site_title}}'
         posted: '{{username}} postitas teemasse "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} saatis Sulle privaatsõnumi teemas "{{topic}}" - {{site_title}}'
         linked: '{{username}} viitas Sinu postitusele teemas "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Lisa pilt"
@@ -1086,10 +1129,12 @@ et:
       uploading: "Laen üles"
       select_file: "Vali fail"
       image_link: "viide millele Su pilt hakkab osutama"
+      default_image_alt_text: pilt
     search:
       sort_by: "Järjesta"
       relevance: "Asjakohasus"
       latest_post: "Viimane postitus"
+      latest_topic: "Vimanse teema"
       most_viewed: "Enim vaadatud"
       most_liked: "Enim meeldinud"
       select_all: "Vali kõik"
@@ -1100,6 +1145,8 @@ et:
       no_more_results: "Rohkem vasteid pole."
       searching: "Otsin..."
       post_format: "postituse nr{{post_number}} tegi {{username}}"
+      search_google_button: "Google"
+      search_google_title: "Otsi sellelt saidilt"
       context:
         user: "Otsi kasutaja @{{username}} postitusi"
         category: "Otsi #{{category}} foorumist"
@@ -1109,19 +1156,28 @@ et:
         title: Täpsem otsing
         posted_by:
           label: Postitaja
+        in_category:
+          label: Liigitatud
         in_group:
           label: Grupis
         with_badge:
           label: Märgisega
+        with_tags:
+          label: Sildistatud
         filters:
           likes: mulle meeldisid
           posted: sisaldavad minu postitust
           watching: on minu vaatlemise nimekirjas
           tracking: on minu jälgimise nimekirjas
+          private: Minu sõnumites
+          bookmarks: Minu järjehoidjates
           first: on teema esimesed postitused
           pinned: on esile tõstetud
           unpinned: ei ole esile tõstetud
+          seen: Minu loetud
+          unseen: Minu poolt lugemata
           wiki: on wiki
+          all_tags: Kõik ülevalolevad sildid
         statuses:
           label: Kus teemad
           open: on avatud
@@ -1157,12 +1213,14 @@ et:
         dismiss_new: "Ignoreeri uusi"
         toggle: "lülita teemade massiline ära märkimine ümber"
         actions: "Masstoimingud"
+        change_category: "Määra kategooria"
         close_topics: "Sulge Teemad"
         archive_topics: "Arhiveeri Teemad"
+        notification_level: "Teavitus"
         choose_new_category: "Vali teemadele uus foorum:"
         selected:
-          one: "Märkisid ära <b>1</b> teema."
-          other: "Märkisid ära <b>{{count}}</b> teemat."
+          one: Märkisid ära <b>1</b> teema.
+          other: Märkisid ära <b>{{count}}</b> teemat.
         change_tags: "Asenda sildid"
         append_tags: "Lisa sildid"
         choose_new_tags: "Vali teemadele uued sildid:"
@@ -1194,12 +1252,9 @@ et:
         bookmarks: "Rohkem järjehoidjaga teemasid pole."
         search: "Rohkem otsingutulemusi pole."
     topic:
-      unsubscribe:
-        stop_notifications: "Sulle saabub nüüd <strong>{{title}}</strong> kohta vähem teavitusi"
-        change_notification_state: "Sinu teavituste olek on"
       filter_to:
-        one: "1 postitus teemas"
-        other: "{{count}} postitust teemas"
+        one: 1 postitus teemas
+        other: '{{count}} postitust teemas'
       create: 'Uus teema'
       create_long: 'Loo uus teema'
       private_message: 'Alusta sõnumit'
@@ -1213,10 +1268,10 @@ et:
       new: 'uus teema'
       unread: 'lugemata'
       new_topics:
-        one: '1 uus teema'
+        one: 1 uus teema
         other: '{{count}} uut teemat'
       unread_topics:
-        one: '1 lugemata teema'
+        one: 1 lugemata teema
         other: '{{count}} lugemata teemat'
       title: 'Teema'
       invalid_access:
@@ -1230,17 +1285,17 @@ et:
         title: "Teemat ei leitud"
         description: "Vabanda, meil ei õnnestunud seda teemat leida. Võimalik, et moderaator eemaldas selle?"
       total_unread_posts:
-        one: "Sul on selles teemas 1 lugemata postitus"
-        other: "Sul on selles teemas {{count}} lugemata postitust"
+        one: Sul on selles teemas 1 lugemata postitus
+        other: Sul on selles teemas {{count}} lugemata postitust
       unread_posts:
-        one: "Sul on selles teemas 1 lugemata vana postitus"
-        other: "Sul on selles teemas {{count}} lugemata vana postitust"
+        one: Sul on selles teemas 1 lugemata vana postitus
+        other: Sul on selles teemas {{count}} lugemata vana postitust
       new_posts:
-        one: "selles teemas on 1 uus postitus Sinu viimasest külastusest"
-        other: "selles teemas on {{count}} uut postitust Sinu viimasest külastusest"
+        one: selles teemas on 1 uus postitus Sinu viimasest külastusest
+        other: selles teemas on {{count}} uut postitust Sinu viimasest külastusest
       likes:
-        one: "selles teemas on 1 meeldimine"
-        other: "selles teemas on {{count}} meeldimist"
+        one: selles teemas on 1 meeldimine
+        other: selles teemas on {{count}} meeldimist
       back_to_list: "Tagasi Teemade Loendisse"
       options: "Teema Suvandid"
       show_links: "näita viiteid selles teemas"
@@ -1250,14 +1305,39 @@ et:
       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 {loe teisi teemasid {catLink} alafoorumis} false {{latestLink}} other {}}"
       browse_all_categories: Vaata kõiki foorumeid
       view_latest_topics: vaata värskeid teemasid
-      suggest_create_topic: Teeks äkki teema?
+      suggest_create_topic: "Teeks äkki teema?"
       jump_reply_up: hüppa varasema vastuse juurde
       jump_reply_down: hüppa hilisema vastuse juurde
       deleted: "See teema on kustutatud"
+      topic_status_update:
+        title: "Teema taimer"
+        save: "Määra taimer"
+        num_of_hours: "Tundide arv:"
+        remove: "Eemalda taimer"
+        publish_to: "Avalda:"
+        when: "Millal:"
+        public_timer_types: Teemade taimerid
+        private_timer_types: Kasutaja teema taimer
+      auto_update_input:
+        none: "Vali ajavahemik"
+        later_today: "Täna hiljem"
+        tomorrow: "Homme"
+        later_this_week: "iljem sel nädalal"
+        this_weekend: "Sellel nädalavahetusel"
+        next_week: "Järgmisel nädalal"
+        two_weeks: "Kahe nädala pärast"
+        next_month: "Järgmisel kuul"
+        three_months: "Kolme kuu pärast"
+        six_months: "Kuue kuu pärast"
+        one_year: "Aasta pärast"
+        forever: "Igavesti"
+        pick_date_and_time: "Vali kuupäev ja kellaaeg"
+      reminder:
+        title: "Tuleta mulle meelde"
       auto_close_title: 'Automaatse sulgumise sätted'
       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."
+        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"
@@ -1278,17 +1358,17 @@ et:
         title: muuda kui tihti sind sellest teemast teavitatakse
         reasons:
           mailing_list_mode: "Sul on aktiveeritud postiloendi režiim, seega teavitatakse sind vastustest siia teemasse meili teel."
-          '3_10': 'Sulle saabuvad teavitused, kuna jälgid selle teemaga seotud silti.'
-          '3_6': 'Sulle saabuvad teavitused, kuna vaatled seda foorumit.'
-          '3_5': 'Sulle saabuvad teavitused kuna hakkasid seda teemat automaatselt jälgima.'
-          '3_2': 'Sulle saabuvad teavitused kuna jälgid seda teemat.'
-          '3_1': 'Sulle saabuvad teavitused kuna lõid selle teema.'
-          '3': 'Sulle saabuvad teavitused kuna jälgid seda teemat.'
-          '1_2': 'Sind teavitatakse, kui keegi Teie @name mainib või Teile vastab.'
-          '1': 'Sind teavitatakse, kui keegi Sinu @name mainib või Sulle vastab.'
-          '0_7': 'Eirad kõiki teavitusi selles foorumis.'
-          '0_2': 'Eirad kõiki teavitusi selle teema kohta.'
-          '0': 'Eirad kõiki teavitusi selles foorumis.'
+          "3_10": 'Sulle saabuvad teavitused, kuna jälgid selle teemaga seotud silti.'
+          "3_6": 'Sulle saabuvad teavitused, kuna vaatled seda foorumit.'
+          "3_5": 'Sulle saabuvad teavitused kuna hakkasid seda teemat automaatselt jälgima.'
+          "3_2": 'Sulle saabuvad teavitused kuna jälgid seda teemat.'
+          "3_1": 'Sulle saabuvad teavitused kuna lõid selle teema.'
+          "3": 'Sulle saabuvad teavitused kuna jälgid seda teemat.'
+          "1_2": 'Sind teavitatakse, kui keegi Teie @name mainib või Teile vastab.'
+          "1": 'Sind teavitatakse, kui keegi Sinu @name mainib või Sulle vastab.'
+          "0_7": 'Eirad kõiki teavitusi selles foorumis.'
+          "0_2": 'Eirad kõiki teavitusi selle teema kohta.'
+          "0": 'Eirad kõiki teavitusi selles foorumis.'
         watching_pm:
           title: "Vaatlemine"
           description: "Saad teavituse iga uue vastuse kohta sellele sõnumile koos uute vastuste koguarvu näitamisega."
@@ -1327,7 +1407,6 @@ et:
         visible: "Avalda teemade nimekirjas"
         reset_read: "Nulli andmed teema lugemise kohta"
         make_public: "Loo avalik teema"
-        make_private: "Loo privaatsõnum"
       feature:
         pin: "Tõsta teema esile"
         unpin: "Eemalda teema esiletõstmine"
@@ -1360,8 +1439,8 @@ et:
         pin_validation: "Selle teema esiletõstmiseks on kuupäev nõutav."
         not_pinned: "Liigis {{categoryLink}} ei ole ühtegi esiletõstetud teemat."
         already_pinned:
-          one: "Liigis {{categoryLink}} hetkel kinnitatud teemad: <strong class='badge badge-notification unread'>1</strong>"
-          other: "Liigis {{categoryLink}} hetkel esiletõstetud teemad: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: 'Liigis {{categoryLink}} hetkel kinnitatud teemad: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Liigis {{categoryLink}} hetkel esiletõstetud teemad: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         pin_globally: "Lisa see teema kõikide teemaloetelude tippu kuni"
         confirm_pin_globally: "Sul on juba {{count}} igal pool esiletõstetud teemat. Liiga palju esiletõstetud teemasid võib olla uutele või anonüümsetele kasutajatele koormav. Kas soovid kindlasti selles foorumis veel ühe teema igal pool esile tõsta?"
         unpin_globally: "Eemalda see teema kõikide teemaloetelude tipust."
@@ -1369,8 +1448,8 @@ et:
         global_pin_note: "Kasutajad saavad teema esiletõstmise enda jaoks individuaalselt eemaldada."
         not_pinned_globally: "Ühtegi igal pool esiletõstetud teemat pole."
         already_pinned_globally:
-          one: "Hetkel globaalselt kinnitatud teemad: <strong class='badge badge-notification unread'>1</strong>"
-          other: "Igal pool esiletõstetud teemad hetkel: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: 'Hetkel globaalselt kinnitatud teemad: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Igal pool esiletõstetud teemad hetkel: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         make_banner: "Tee sellest teemast bänner mis on nähtav iga lehe päises."
         remove_banner: "Eemalda bänner kõikide lehtede päistest."
         banner_note: "Kasutajad saavad bänneri peita sulgemise teel. Korraga võib bänneriks olla ainult üks teema."
@@ -1406,8 +1485,8 @@ et:
       login_reply: 'Vastamiseks logi sisse'
       filters:
         n_posts:
-          one: "1 postitus"
-          other: "{{count}} postitust"
+          one: 1 postitus
+          other: '{{count}} postitust'
         cancel: "Eemalda filter"
       split_topic:
         title: "Liiguta uue teema alla"
@@ -1415,15 +1494,15 @@ et:
         topic_name: "Uue teema nimi"
         error: "Postituste uude teemasse liigutamisel tekkis viga."
         instructions:
-          one: "Oled loomas uut teemat ja lisamas sinna just valitud postitust."
-          other: "Oled loomas uut teemat ja lisamas sinna valitud <b>{{count}}</b> postitust."
+          one: Oled loomas uut teemat ja lisamas sinna just valitud postitust.
+          other: Oled loomas uut teemat ja lisamas sinna valitud <b>{{count}}</b> postitust.
       merge_topic:
         title: "Liiguta olemasolevasse teemasse"
         action: "liiguta olemasolevasse teemasse"
         error: "Postituste sellesse teemasse liigutamisel tekkis viga."
         instructions:
-          one: "Vali teema, kuhu soovid selle postituse liigutada."
-          other: "Vali teema, kuhu soovid need <b>{{count}}</b> postitust liigutada."
+          one: Vali teema, kuhu soovid selle postituse liigutada.
+          other: Vali teema, kuhu soovid need <b>{{count}}</b> postitust liigutada.
       merge_posts:
         title: "Ühenda valitud postitused"
         action: "ühenda valitud postitused"
@@ -1435,9 +1514,8 @@ et:
         label: "Postituste uus omanik"
         placeholder: "uue omaniku kasutajanimi"
         instructions:
-          one: "Palun vali <b>{{old_user}}</b> postitusele uus omanik."
-          other: "Palun vali <b>{{old_user}}</b> {{count}} postitusele uus omanik."
-        instructions_warn: "Pane tähele, et ühtegi teavitust selle postituse kohta ei kanta uuele kasutajale üle tagasiulatuvalt.<br>Hoiatus: Hetkel ei kanta uuele kasutajale üle mingeid postitustest sõltuvaid andmeid. Kasuta ettevaatlikult."
+          one: Palun vali <b>{{old_user}}</b> postitusele uus omanik.
+          other: Palun vali <b>{{old_user}}</b> {{count}} postitusele uus omanik.
       change_timestamp:
         action: "muuda ajatemplit"
         invalid_timestamp: "Ajatempel ei saa olla tulevikus."
@@ -1446,6 +1524,10 @@ et:
       multi_select:
         select: 'vali'
         selected: 'valitud ({{count}})'
+        select_post:
+          label: 'vali'
+        selected_post:
+          label: 'valitud'
         delete: kustuta valitud
         cancel: tühista valimine
         select_all: vali kõik
@@ -1454,8 +1536,6 @@ et:
           one: Oled valinud <b>1</b> postituse.
           other: Oled valinud <b>{{count}}</b> postitust.
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Tsitaat"
       edit_reason: "Põhjus:"
       post_number: "postitus {{number}}"
@@ -1468,26 +1548,26 @@ et:
       show_full: "Näita kogu postitust"
       show_hidden: 'Vaata peidetud vastust'
       deleted_by_author:
-        one: "(autori poolt tagasivõetud postitus kustutatakse automaatselt %{count} tunni pärast, kui ei ole tähistatud)"
-        other: "(autori poolt tagasivõetud postitus kustutatakse automaatselt %{count} tunni pärast, kui ei ole tähistatud)"
+        one: (autori poolt tagasivõetud postitus kustutatakse automaatselt %{count} tunni pärast, kui ei ole tähistatud)
+        other: (autori poolt tagasivõetud postitus kustutatakse automaatselt %{count} tunni pärast, kui ei ole tähistatud)
       expand_collapse: "laienda/ahenda"
       gap:
-        one: "vaata 1 peidetud vastust"
-        other: "vaata {{count}} peidetud vastust"
+        one: vaata 1 peidetud vastust
+        other: vaata {{count}} peidetud vastust
       unread: "Postitus on lugemata"
       has_replies:
-        one: "{{count}} vastus"
-        other: "{{count}} vastust"
+        one: '{{count}} vastus'
+        other: '{{count}} vastust'
       has_likes:
-        one: "{{count}} meeldimine"
-        other: "{{count}} meeldimist"
+        one: '{{count}} meeldimine'
+        other: '{{count}} meeldimist'
       has_likes_title:
-        one: "Ühele meeldis see postitus"
-        other: "{{count}}-le meeldis see postitus"
+        one: Ühele meeldis see postitus
+        other: '{{count}}-le meeldis see postitus'
       has_likes_title_only_you: "Sulle see postitus meeldis"
       has_likes_title_you:
-        one: "Sulle ja veel ühele inimesele see postitus meeldis"
-        other: "Sulle ja veel {{count}} inimesele see postitus meeldis"
+        one: Sulle ja veel ühele inimesele see postitus meeldis
+        other: Sulle ja veel {{count}} inimesele see postitus meeldis
       errors:
         create: "Vabandame, postituse loomisel tekkis viga. Palun proovi uuesti."
         edit: "Vabandame, postituse redigeerimisel tekkis viga. Palun proovi uuesti."
@@ -1517,12 +1597,15 @@ et:
         has_liked: "oled sellele postitusele oma meeldimise andnud"
         undo_like: "tühista meeldimise andmine"
         edit: "muuda seda postitust"
+        edit_action: "Muuda"
         edit_anonymous: "Vabandame, kuid selle postituse muutmiseks pead olema sisse logitud."
         flag: "tähista see postitus privaatselt kui tähelepanu vajav või saada selle kohta privaatne teavitus"
         delete: "kustuta see postitus"
         undelete: "ennista see postitus"
         share: "jaga viidet sellele postitusele"
         more: "Veel"
+        delete_replies:
+          just_the_post: "Ei, ainult see postitus"
         admin: "postituse administreerimise tegevused"
         wiki: "Loo Wiki"
         unwiki: "Eemalda Wiki"
@@ -1560,54 +1643,54 @@ et:
           vote: "Hääletasid selle postituse poolt"
         by_you_and_others:
           off_topic:
-            one: "Sina ja 1 teine kasutaja tähistasite selle kui teemavälise"
-            other: "Sina ja {{count}} teist kasutajat tähistasite selle kui teemavälise"
+            one: Sina ja 1 teine kasutaja tähistasite selle kui teemavälise
+            other: Sina ja {{count}} teist kasutajat tähistasite selle kui teemavälise
           spam:
-            one: "Sina ja 1 teine kasutaja tähistasite selle kui spämmi"
-            other: "Sina ja {{count}} teist kasutajat tähistasite selle kui spämmi"
+            one: Sina ja 1 teine kasutaja tähistasite selle kui spämmi
+            other: Sina ja {{count}} teist kasutajat tähistasite selle kui spämmi
           inappropriate:
-            one: "Sina ja 1 teine kasutaja tähistasite selle kui sobimatu"
-            other: "Sina ja {{count}} teist kasutajat tähistasite selle kui sobimatu"
+            one: Sina ja 1 teine kasutaja tähistasite selle kui sobimatu
+            other: Sina ja {{count}} teist kasutajat tähistasite selle kui sobimatu
           notify_moderators:
-            one: "Sina ja 1 teine kasutaja tähistasite selle modereerimiseks"
-            other: "Sina ja {{count}} teist kasutajat tähistasite selle modereerimiseks"
+            one: Sina ja 1 teine kasutaja tähistasite selle modereerimiseks
+            other: Sina ja {{count}} teist kasutajat tähistasite selle modereerimiseks
           notify_user:
-            one: "Sina ja 1 teine kasutaja saatsite sellele kasutajale sõnumi"
-            other: "Sina ja {{count}} teist kasutajat saatsite sellele kasutajale sõnumi"
+            one: Sina ja 1 teine kasutaja saatsite sellele kasutajale sõnumi
+            other: Sina ja {{count}} teist kasutajat saatsite sellele kasutajale sõnumi
           bookmark:
-            one: "Sina ja 1 teine kasutaja lisasite sellele postitusele järjehoidja"
-            other: "Sina ja {{count}} teist kasutajat lisasite sellele postitusele järjehoidja"
+            one: Sina ja 1 teine kasutaja lisasite sellele postitusele järjehoidja
+            other: Sina ja {{count}} teist kasutajat lisasite sellele postitusele järjehoidja
           like:
-            one: "Sina ja 1 teine kasutaja märkisite selle kui meeldiva"
-            other: "Sina ja {{count}} teist kasutajat märkisite selle kui meeldiva"
+            one: Sina ja 1 teine kasutaja märkisite selle kui meeldiva
+            other: Sina ja {{count}} teist kasutajat märkisite selle kui meeldiva
           vote:
-            one: "Sina ja 1 teine kasutaja hääletasite selle postituse poolt"
-            other: "Sina ja {{count}} teist kasutajat hääletasite selle postituse poolt"
+            one: Sina ja 1 teine kasutaja hääletasite selle postituse poolt
+            other: Sina ja {{count}} teist kasutajat hääletasite selle postituse poolt
         by_others:
           off_topic:
-            one: "1 kasutaja tähistas selle kui teemavälise"
-            other: "{{count}} kasutajat tähistasid selle kui teemavälise"
+            one: 1 kasutaja tähistas selle kui teemavälise
+            other: '{{count}} kasutajat tähistasid selle kui teemavälise'
           spam:
-            one: "1 kasutaja tähistas selle kui spämmi"
-            other: "{{count}} kasutajat tähistas selle kui spämmi"
+            one: 1 kasutaja tähistas selle kui spämmi
+            other: '{{count}} kasutajat tähistas selle kui spämmi'
           inappropriate:
-            one: "1 kasutaja tähistas selle kui sobimatu"
-            other: "{{count}} kasutajat tähistas selle kui sobimatu"
+            one: 1 kasutaja tähistas selle kui sobimatu
+            other: '{{count}} kasutajat tähistas selle kui sobimatu'
           notify_moderators:
-            one: "1 kasutaja tähistas selle modereerimiseks"
-            other: "{{count}} kasutajat tähistasid selle modereerimiseks"
+            one: 1 kasutaja tähistas selle modereerimiseks
+            other: '{{count}} kasutajat tähistasid selle modereerimiseks'
           notify_user:
-            one: "1 kasutaja saatis sellele kasutajale sõnumi"
-            other: "{{count}} kasutajat saatsid sellele kasutajale sõnumi"
+            one: 1 kasutaja saatis sellele kasutajale sõnumi
+            other: '{{count}} kasutajat saatsid sellele kasutajale sõnumi'
           bookmark:
-            one: "1 kasutaja lisas sellele postitusele järjehoidja"
-            other: "{{count}} kasutajat lisasid sellele postitusele järjehoidja"
+            one: 1 kasutaja lisas sellele postitusele järjehoidja
+            other: '{{count}} kasutajat lisasid sellele postitusele järjehoidja'
           like:
-            one: "ühele see meeldis"
-            other: "{{count}}-le see meeldis"
+            one: ühele see meeldis
+            other: '{{count}}-le see meeldis'
           vote:
-            one: "1 kasutaja hääletas selle postituse poolt"
-            other: "{{count}} kasutajat hääletasid selle postituse poolt"
+            one: 1 kasutaja hääletas selle postituse poolt
+            other: '{{count}} kasutajat hääletasid selle postituse poolt'
       revisions:
         controls:
           first: "Esimene redaktsioon"
@@ -1630,6 +1713,12 @@ et:
           side_by_side_markdown:
             title: "Näita töötlemata lähteandmete erinevusi kõrvuti"
             button: 'Töötlemata'
+      raw_email:
+        displays:
+          text_part:
+            button: 'Tekst'
+          html_part:
+            button: 'HTML'
     category:
       can: 'saab&hellip; '
       none: '(foorum puudub)'
@@ -1676,7 +1765,6 @@ et:
       email_in_allow_strangers: "Aktsepteeri meile kontota anonüümsetelt kasutajatelt"
       email_in_disabled: "Uute teemade avamine meili teel on saidi sätetes välja lülitatud. Avamiseks"
       email_in_disabled_click: 'aktiveeri säte "sissetulev meil".'
-      suppress_from_homepage: "Eemalda see foorum avalehelt."
       show_subcategory_list: "Näita selles foorumis alamfoorumite nimekirja teemadest üleval pool."
       all_topics_wiki: "Tee uued teemad vaikimisi wikideks."
       allow_badges_label: "Luba selles foorumis autasustamist märgistega"
@@ -1739,14 +1827,14 @@ et:
       custom_placeholder_notify_moderators: "Anna meile teada, mis Sulle täpsemalt muret teeb ja võimalusel lisa asjassepuutuvaid viiteid ning näiteid."
       custom_message:
         at_least:
-          one: "sisesta vähemalt 1 sümbol"
-          other: "sisesta vähemalt {{count}} sümbolit"
+          one: sisesta vähemalt 1 sümbol
+          other: sisesta vähemalt {{count}} sümbolit
         more:
-          one: "1 veel"
-          other: "{{count}} veel..."
+          one: 1 veel
+          other: '{{count}} veel...'
         left:
-          one: "1 jäänud"
-          other: "{{count}} jäänud"
+          one: 1 jäänud
+          other: '{{count}} jäänud'
     flagging_topic:
       title: "Täname, et aitad meie kogukonna viisakust säilitada!"
       action: "Tähista teema"
@@ -1757,13 +1845,13 @@ et:
       links_title: "Populaarsed viited"
       links_shown: "kuva veel viiteid..."
       clicks:
-        one: "1 klikk"
-        other: "%{count} klikki"
+        one: 1 klikk
+        other: '%{count} klikki'
     post_links:
       about: "laienda veel selles postuses olevaid viiteid"
       title:
-        one: "1 veel"
-        other: "%{count} veel"
+        one: 1 veel
+        other: '%{count} veel'
     topic_statuses:
       warning:
         help: "See on ametlik hoiatus."
@@ -1797,22 +1885,22 @@ et:
     original_post: "Algne postitus"
     views: "Vaatamisi"
     views_lowercase:
-      one: "vaatamine"
-      other: "vaatamisi"
+      one: vaatamine
+      other: vaatamisi
     replies: "Vastuseid"
     views_long:
-      one: "seda teemat on vaadatud 1 kord"
-      other: "seda teemat on vaadatud {{number}} korda"
+      one: seda teemat on vaadatud 1 kord
+      other: seda teemat on vaadatud {{number}} korda
     activity: "Aktiivsus"
     likes: "Meeldimisi"
     likes_lowercase:
-      one: "meeldimine"
-      other: "meeldimisi"
+      one: meeldimine
+      other: meeldimisi
     likes_long: "selles teemas on {{number}} meeldimist"
     users: "Kasutajad"
     users_lowercase:
-      one: "kasutaja"
-      other: "kasutajad"
+      one: kasutaja
+      other: kasutajad
     category_title: "Foorum"
     history: "Ajalugu"
     changed_by: "autor {{author}}"
@@ -1825,8 +1913,8 @@ et:
       latest:
         title: "Värskeimad"
         title_with_count:
-          one: "Värskeim (1)"
-          other: "Värskeimad ({{count}})"
+          one: Värskeim (1)
+          other: Värskeimad ({{count}})
         help: "teemad hiljutiste postitustega"
       hot:
         title: "Kuum"
@@ -1844,21 +1932,21 @@ et:
       unread:
         title: "Lugemata"
         title_with_count:
-          one: "Lugemata (1)"
-          other: "Lugemata ({{count}})"
+          one: Lugemata (1)
+          other: Lugemata ({{count}})
         help: "teemad, mida vaatled või jälgid koos lugemata postitustega"
         lower_title_with_count:
-          one: "1 lugemata"
-          other: "{{count}} lugemata"
+          one: 1 lugemata
+          other: '{{count}} lugemata'
       new:
         lower_title_with_count:
-          one: "1 uus"
-          other: "{{count}} uut"
+          one: 1 uus
+          other: '{{count}} uut'
         lower_title: "uus"
         title: "Uus"
         title_with_count:
-          one: "Uus (1)"
-          other: "Uusi ({{count}})"
+          one: Uus (1)
+          other: Uusi ({{count}})
         help: "viimase paari päeva jooksul loodud teemad"
       posted:
         title: "Minu"
@@ -1869,8 +1957,8 @@ et:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: "{{categoryName}} (1)"
-          other: "{{categoryName}} ({{count}})"
+          one: '{{categoryName}} (1)'
+          other: '{{categoryName}} ({{count}})'
         help: "värskeimad teemad foorumis {{categoryName}}"
       top:
         title: "Juhtivad"
@@ -1956,22 +2044,22 @@ et:
         print: '<b>ctrl</b>+<b>p</b> Prindi teema'
     badges:
       earned_n_times:
-        one: "Teenis selle märgise 1 kord"
-        other: "Teenis selle märgise %{count} korda"
+        one: Teenis selle märgise 1 kord
+        other: Teenis selle märgise %{count} korda
       granted_on: "Märgistatud %{date}"
       others_count: "Teised selle märgisega (%{count})"
       title: Märgised
       badge_count:
-        one: "1 märgis"
-        other: "%{count} märgist"
+        one: 1 märgis
+        other: '%{count} märgist'
       more_badges:
-        one: "+1 veel"
-        other: "+%{count} veel"
+        one: +1 veel
+        other: +%{count} veel
       granted:
-        one: "1 lubatud"
-        other: "%{count} lubatud"
-      select_badge_for_title: Vali märgis, mida kasutada oma pealkirjana
-      none: "<pole ühtegi>"
+        one: 1 lubatud
+        other: '%{count} lubatud'
+      select_badge_for_title: "Vali märgis, mida kasutada oma pealkirjana"
+      none: "(pole)"
       badge_grouping:
         getting_started:
           name: Alustamine
@@ -1998,6 +2086,7 @@ et:
       selector_no_tags: "sildid puuduvad"
       changed: "muudetud sildid:"
       tags: "Sildid"
+      choose_for_topic: "valikulised sildid"
       delete_tag: "Kustuta silt"
       rename_tag: "Nimeta silt ümber"
       rename_instructions: "Vali sildile uus nimi:"
@@ -2014,19 +2103,15 @@ et:
       notifications:
         watching:
           title: "Vaatlen"
-          description: "Sa vaatled kõiki selle sildiga teemasid automaatselt. Sind teavitatakse kõigist uutest postitustest ja teemadest, koos lugemata ja uute postituste arvuga teema pealkirja kõrval."
         watching_first_post:
           title: "Vaatan esimest postitust"
-          description: "Sind teavitatakse vaid esimesest postitusest igas uues selle sildiga teemas."
         tracking:
           title: "Jälgin"
-          description: "Sa jälgid kõiki selle sildiga uusi teemasid. Lugemata ja uute postituste arv on näha teema pealkirja kõrval."
         regular:
           title: "Tavaline"
           description: "Sind teavitatakse, kui keegi Sinu @name mainib või vastab Sinu positusele."
         muted:
           title: "Vaigistatud"
-          description: "Sind ei teavitata ühestki uuest selle sildiga teemast, samuti ei ilmu nad lugemata postituste sakil."
       groups:
         title: "Siltide grupid"
         about: "Hõlpsamaks haldamiseks lisa sildid gruppidesse."
@@ -2093,6 +2178,7 @@ et:
         no_problems: "Probleeme ei tuvastatud."
         moderators: 'Moderaatorid:'
         admins: 'Adminnid:'
+        silenced: 'Vaigistatud:'
         suspended: 'Peatatud:'
         private_messages_short: "Sõnumid"
         private_messages_title: "Sõnumid"
@@ -2108,8 +2194,6 @@ et:
         reports:
           today: "Täna"
           yesterday: "Eile"
-          last_7_days: "Viimased 7 päeva"
-          last_30_days: "Viimased 30 päeva"
           all_time: "Alates algusest"
           7_days_ago: "7 päeva tagasi"
           30_days_ago: "30 päeva tagasi"
@@ -2125,9 +2209,10 @@ et:
         by: "autor"
       flags:
         title: "Lipud"
+        active_posts: "Tähistatud postitused"
+        old_posts: "Vanad tähistatud postitused"
         agree: "Nõustun"
         agree_title: "Kinnita see tähis kui korrektne ja kehtiv"
-        defer_flag_title: "Eemalda see tähis: praegu ei ole vaja sekkuda."
         delete: "Kustuta"
         delete_title: "Kustuta postitus, millele see tähis viitab."
         delete_post_defer_flag_title: "Kustuta postitus; kui on ainus, kustuta teema"
@@ -2155,14 +2240,24 @@ et:
         visit_topic: "Reageerimiseks külasta teemat"
         was_edited: "Postitust on peale esimest tähist muudetud"
         previous_flags_count: "Seda postitust on tähistatud juba {{count}} korda."
+        details: "üksikasjad"
+        flagged_topics:
+          topic: "Teema"
+          type: "Tüüp"
+          users: "Kasutajad"
+          last_flagged: "Hiljuti tähistatud"
+        short_names:
+          off_topic: "teemaväline"
+          inappropriate: "kohatu"
+          spam: "spämm"
+          notify_user: "kohandatud"
+          notify_moderators: "kohandatud"
       groups:
         primary: "Peamine grupp"
         no_primary: "(peamine grupp puudub)"
         title: "Grupid"
         edit: "Muuda gruppe"
         refresh: "Värskenda"
-        new: "Uus"
-        selector_placeholder: "sisesta kasutajanimi"
         about: "Siin saad muuta oma grupi liikmelisust ja nimesid"
         group_members: "Grupi liikmed"
         delete: "Kustuta"
@@ -2170,21 +2265,12 @@ et:
         delete_failed: "Ei suuda kustutada seda gruppi. Kui see on automaatne grupp, ei saa seda hävitada."
         delete_owner_confirm: "Eemaldan kasutajalt '%{username}' omaniku õigused?"
         add: "Lisa"
-        add_members: "Lisa liikmeid"
         custom: "Individuaalne"
-        bulk_complete: "Kasutajad lisati gruppi."
-        bulk: "Lisa massina gruppi"
-        bulk_paste: "Kleebi kas"
-        bulk_select: "(vali grupp)"
         automatic: "Automaatne"
-        automatic_membership_email_domains: "Kasutajad, kes registreeruvad meiliaadressiga, mille domeen ühtib täpselt mõnega sellest loetelust, lisatakse siia gruppi automaatselt:"
-        automatic_membership_retroactive: "Olemasolevate registreeritud kasutajate lisamiseks rakenda sama meiliaadressi domeeni reeglit"
-        default_title: "Vaikimisi tiitel kõigile kasutajatele siin grupis"
-        primary_group: "Muuda automaatselt peamiseks grupiks"
         group_owners: Omanikud
         add_owners: Lisa omanikke
-        incoming_email: "Individuaalne sissetuleva meili aadress"
-        incoming_email_placeholder: "sisesta meiliaadress"
+        none_selected: "Vali alustamiseks grupp"
+        no_custom_groups: "Loo uus kohandatud grupp"
       api:
         generate_master: "Genereeri API peavõti"
         none: "Hetkel aktiivsed API võtmed puuduvad."
@@ -2247,11 +2333,11 @@ et:
           none: "Ühtegi seotud sündmust pole."
           redeliver: "Saada uuesti"
           incoming:
-            one: "On tekkinud uus sündmus."
-            other: "On tekkinud {{count}} uut sündmust."
+            one: On tekkinud uus sündmus.
+            other: On tekkinud {{count}} uut sündmust.
           completed_in:
-            one: "Lõpetatud 1 sekundiga."
-            other: "Lõpetatud {{count}} sekundiga."
+            one: Lõpetatud 1 sekundiga.
+            other: Lõpetatud {{count}} sekundiga.
           request: "Päring"
           response: "Vastus"
           redeliver_confirm: "Oled kindel, et soovid sama kasulikku lasti uuesti saata?"
@@ -2302,7 +2388,6 @@ et:
           label: "Lae üles"
           title: "Lae varukoopia üles sellesse instantsi"
           uploading: "Laen üles..."
-          success: "'{{filename}}' üleslaadimine õnnestus."
           error: "Faili '{{filename}}' üleslaadimisel tekkis viga: {{message}}"
         operations:
           is_running: "Toiming on hetkel pooleli..."
@@ -2315,7 +2400,6 @@ et:
             label: "Varukoopia"
             title: "Loo varukoopia"
             confirm: "Kas Sa soovid alustada uut varukoopiat?"
-            without_uploads: "Jah (ära kaasa faile)"
           download:
             label: "Lae alla"
           destroy:
@@ -2354,10 +2438,13 @@ et:
         new_style: "Uus stiil"
         import: "Impordi"
         delete: "Kustuta"
+        delete_confirm: "Kustutan selle teema?"
         about: "Muuda saidi CSS laadilehed ja HTML päised. Alustamiseks lisa kohandus."
         color: "Värv"
         opacity: "Läbipaistvus"
         copy: "Kopeeri"
+        copy_to_clipboard: "Kopeeri lõikelauale"
+        copied_to_clipboard: "Kopeeritud lõikelauale"
         email_templates:
           title: "Meilimallid"
           subject: "Teema"
@@ -2366,6 +2453,37 @@ et:
           none_selected: "Redigeerimise alustamiseks vali meili mall."
           revert: "Loobu muudatustest"
           revert_confirm: "Oled kindel, et soovid oma muudatustest loobuda?"
+        theme:
+          import_theme: "Impordi teema"
+          customize_desc: "Kohanda:"
+          title: "Kujundused"
+          edit: "Muuda"
+          common: "Tavaline"
+          desktop: "Töölaud"
+          mobile: "Mobiil"
+          preview: "Eelvaade"
+          is_default: "Kujundus on vaikimisi sisse lülitatud"
+          color_scheme: "Värvid"
+          theme_components: "Kujunduse osad"
+          uploads: "Üleslaadimised"
+          add_upload: "Lisa üleslaadimine"
+          upload: "Laadi üles"
+          about_theme: "Kujunduse info"
+          license: "Litsents"
+          updating: "Uuendamine..."
+          add: "Lisa"
+          scss:
+            text: "CSS"
+          header:
+            text: "Päis"
+          after_header:
+            text: "Pärast päist"
+          footer:
+            text: "Jalus"
+          head_tag:
+            text: "</head>"
+          body_tag:
+            text: "</body>"
         colors:
           title: "Värvid"
           long_title: "Värvistikud"
@@ -2469,6 +2587,13 @@ et:
             type_placeholder: "ülevaade, registreerimine..."
             reply_key_placeholder: "vastuse võti"
             skipped_reason_placeholder: "põhjus"
+      moderation_history:
+        actions:
+          delete_user: "Kasutaja on kustutatud"
+          suspend_user: "Kasutaja konto on peatatud"
+          silence_user: "Kasutaja on vaigistatud"
+          delete_post: "Postitus on kustutatud"
+          delete_topic: "Teema on kustutatud"
       logs:
         title: "Logid"
         action: "Tegevus"
@@ -2486,6 +2611,8 @@ et:
           block: "blokeeri"
           do_nothing: "ära tee midagi"
         staff_actions:
+          all: "kõik"
+          filter: "Filter:"
           title: "Tiimi tegevused"
           clear_filters: "Näita kõike"
           staff_user: "Meeskonnaliige"
@@ -2506,6 +2633,8 @@ et:
             change_trust_level: "muuda usaldustaset"
             change_username: "muuda kasutajanime"
             change_site_setting: "muuda saidi sätet"
+            change_theme: "muuda kujundust"
+            delete_theme: "kustuta kujundus"
             change_site_text: "muuda saidi teksti"
             suspend_user: "peata kasutaja"
             unsuspend_user: "taasluba kasutaja"
@@ -2520,6 +2649,8 @@ et:
             change_category_settings: "muuda foorumi sätteid"
             delete_category: "kustuta foorum"
             create_category: "loo foorum"
+            silence_user: "vaigista kasutaja"
+            unsilence_user: "eemalda kasutajalt vaigistus"
             grant_admin: "anna admin-õigus"
             revoke_admin: "võta admin-õigus ära"
             grant_moderation: "anna modereerimisõigus"
@@ -2565,8 +2696,32 @@ et:
           roll_up:
             text: "Koonda kokku"
             title: "Loob uue bännitud alamvõrgu koondsissekande kui on kogunenud vähemalt 'min_ban_entries_for_roll_up' aadressi."
+        search_logs:
+          title: "Otsingu logid"
+          term: "Termin"
+          searches: "Otsingud"
+          click_through: "Kliki läbi"
+          unique: "Unikaalne"
+          types:
+            all_search_types: "Kõik otsinguliigid"
+            header: "Päis"
         logster:
           title: "Vealogid"
+      watched_words:
+        title: "Vaadatud sõnad"
+        search: "otsi"
+        clear_filter: "Tühjenda"
+        actions:
+          block: 'Blokeeri'
+          censor: 'Tsenseeri'
+          require_approval: 'Nõua heakskiitu'
+          flag: 'Tähista'
+        form:
+          label: 'Uus sõna:'
+          placeholder_regexp: "regulaaravaldis"
+          add: 'isa'
+          success: 'Korras'
+          upload: "Laadi üles"
       impersonate:
         title: "Kehasta"
         help: "Kasuta seda töövahendit kasutajakonto ülevõtmiseks silumise eesmärgil. Tühistamiseks pead välja logima."
@@ -2586,14 +2741,15 @@ et:
           pending: "Ootel"
           staff: 'Meeskond'
           suspended: 'Peatatud'
+          silenced: 'Vaigistatud'
           suspect: 'Kahtlane'
         approved: "Heakskiidetud?"
         approved_selected:
-          one: "kiida heaks kasutaja"
-          other: "kiida heaks ({{count}}) kasutajat"
+          one: kiida heaks kasutaja
+          other: kiida heaks ({{count}}) kasutajat
         reject_selected:
-          one: "lükka tagasi kasutaja"
-          other: "lükka tagasi ({{count}}) kasutajat"
+          one: lükka tagasi kasutaja
+          other: lükka tagasi ({{count}}) kasutajat
         titles:
           active: 'Aktiivsed kasutajad'
           new: 'Uued kasutajad'
@@ -2606,14 +2762,15 @@ et:
           staff: "Meeskond"
           admins: 'Admin-kasutajad'
           moderators: 'Moderaatorid'
+          silenced: 'Vaigistatud kasutajad'
           suspended: 'Peatatud kasutajad'
           suspect: 'Kahtlased kasutajad'
         reject_successful:
-          one: "Tagasi lükatud 1 kasutaja."
-          other: "Edukalt tagasi lükatud %{count} kasutajat."
+          one: Tagasi lükatud 1 kasutaja.
+          other: Edukalt tagasi lükatud %{count} kasutajat.
         reject_failures:
-          one: "Ei õnnestunud tagasi lükata 1 kasutaja."
-          other: "Ei õnnestunud tagasi lükata %{count} kasutajat."
+          one: Ei õnnestunud tagasi lükata 1 kasutaja.
+          other: Ei õnnestunud tagasi lükata %{count} kasutajat.
         not_verified: "Ei ole kontrollitud"
         check_email:
           title: "Näita selle kasutaja meiliaadressi"
@@ -2624,9 +2781,17 @@ et:
         suspend_duration: "Kauaks see kasutaja peatatakse?"
         suspend_reason_label: "Peatamise põhjus? See tekst <b>on nähtav kõigile</b> selle kasutaja profiililehel, samuti kuvatakse kasutajale, kui ta üritab sisse logida. Tee lühidalt."
         suspend_reason: "Põhjus"
+        suspend_reason_placeholder: "Peatamise põhjus"
         suspended_by: "Peatati kasutaja poolt"
+        silence_reason: "Põhjus"
+        silenced_by: "Vaigistaja"
+        silence_modal_title: "Vaigista kasutaja"
+        silence_reason_placeholder: "Vaigistamise põhjus"
         delete_all_posts: "Kustuta kõik postitused"
         delete_all_posts_confirm_MF: "Sa oled kustutamas {POSTS, plural, one {1 post} other {# posts}} and {TOPICS, plural, one {1 topic} other {# topics}}. Oled Sa kindel?"
+        silence: "Vaigista"
+        unsilence: "Eemalda vaigistud"
+        silenced: "Vaigistatud?"
         moderator: "Moderaator?"
         admin: "Admin?"
         suspended: "Peatatud?"
@@ -2672,14 +2837,14 @@ et:
         delete_forbidden_because_staff: "Admine ja moderaatoreid ei saa kustutada."
         delete_posts_forbidden_because_staff: "Ei saa kustutada adminide ja moderaatorite kõiki postitusi."
         delete_forbidden:
-          one: "Kasutajaid ei saa kustutada, kui neil on postitusi. Kustuta kõik postitused enne kasutaja kustutamist. (Postitusi vanemaid, kui %{count} päev ei saa kustutada.)"
-          other: "Kasutajaid ei saa kustutada, kui neil on postitusi. Kustuta kõik postitused enne kasutaja kustutamist. (Postitusi vanemaid, kui %{count} päeva ei saa kustutada.)"
+          one: Kasutajaid ei saa kustutada, kui neil on postitusi. Kustuta kõik postitused enne kasutaja kustutamist. (Postitusi vanemaid, kui %{count} päev ei saa kustutada.)
+          other: Kasutajaid ei saa kustutada, kui neil on postitusi. Kustuta kõik postitused enne kasutaja kustutamist. (Postitusi vanemaid, kui %{count} päeva ei saa kustutada.)
         cant_delete_all_posts:
-          one: "Ei saa kustutada kõiki postitusi. Osa postitusi on vanemad, kui  %{count} päev. (delete_user_max_post_age säte.) "
-          other: "Ei saa kustutada kõiki postitusi. Osa postitusi on vanemad, kui  %{count} päeva. (delete_user_max_post_age säte.) "
+          one: 'Ei saa kustutada kõiki postitusi. Osa postitusi on vanemad, kui  %{count} päev. (delete_user_max_post_age säte.) '
+          other: 'Ei saa kustutada kõiki postitusi. Osa postitusi on vanemad, kui  %{count} päeva. (delete_user_max_post_age säte.) '
         cant_delete_all_too_many_posts:
-          one: "Ei saa kustutada kõiki postitusi, sest kasutajal on rohkem, kui  1 postitus. (delete_all_posts_max)"
-          other: "Ei saa kustutada kõiki postitusi, sest kasutajal on rohkem, kui  %{count} postitust. (delete_all_posts_max)"
+          one: Ei saa kustutada kõiki postitusi, sest kasutajal on rohkem, kui  1 postitus. (delete_all_posts_max)
+          other: Ei saa kustutada kõiki postitusi, sest kasutajal on rohkem, kui  %{count} postitust. (delete_all_posts_max)
         delete_confirm: "Oled Sa KINDEL, et soovid kustutada seda kasutajat? See kustutamine on lõplik!"
         delete_and_block: "Kustuta ja <b>blokeeri</b> see meiliaadress ja  IP-aadress"
         delete_dont_block: "Kustuta vaid"
@@ -2714,8 +2879,8 @@ et:
         tl3_requirements:
           title: "Usaldustaseme 3 nõuded"
           table_title:
-            one: "viimase päeva jooksul:"
-            other: "viimase %{count} päeva jooksul:"
+            one: 'viimase päeva jooksul:'
+            other: 'viimase %{count} päeva jooksul:'
           value_heading: "Väärtus"
           requirement_heading: "Nõue"
           visits: "Külastusi"
@@ -2790,10 +2955,7 @@ et:
         recommended: "Soovitame järgnevat teksti oma vajadustele vastavalt kohandada:"
         show_overriden: 'Näita vaid käsitsi muudetuid'
       site_settings:
-        show_overriden: 'Näita vaid käsitsi muudetuid'
         title: 'Sätted'
-        reset: 'lähtesta'
-        none: 'mitte ükski'
         no_results: "Ei leidnud midagi."
         clear_filter: "Puhasta"
         add_url: "lisa URL"
@@ -2815,6 +2977,7 @@ et:
           developer: 'Arendaja'
           embedding: "Manustamised"
           legal: "Õiguslik"
+          api: 'API'
           user_api: 'Kasutaja API'
           uncategorized: 'Muu'
           backups: "Varukoopiad"
@@ -2842,17 +3005,17 @@ et:
         reason_help: (Viide postitusele või teemale)
         save: Salvesta
         delete: Kustuta
-        delete_confirm: Oled kindel, et soovid selle märgist kustutada?
-        revoke: 'Tühista '
+        delete_confirm: "Oled kindel, et soovid selle märgist kustutada?"
+        revoke: "Tühista "
         reason: Põhjus
         expand: Näita &hellip;
-        revoke_confirm: Oled kindel, et soovid seda märgist eemaldada?
+        revoke_confirm: "Oled kindel, et soovid seda märgist eemaldada?"
         edit_badges: Muuda märgiseid
         grant_badge: Anna märgis
         granted_badges: Antud märgised
         grant: Määra
         no_user_badges: "%{name} ei ole saanud veel ühtegi märgist."
-        no_badges: Ei ole ühtegi märgist, mida saaks anda.
+        no_badges: "Ei ole ühtegi märgist, mida saaks anda."
         none_selected: "Vali märgis, et alustada"
         allow_title: Luba märgise kasutamist tiitlina
         multiple_grant: Võib olla määratud mitmeid kordi
@@ -2860,11 +3023,10 @@ et:
         enabled: Luba märgis
         icon: Ikoon
         image: Pilt
-        icon_help: "Kasuta kas Font Awesome klassi või URL-viidet pildile"
         query: Märgise päring (SQL)
         target_posts: Päri sihtmärkide postitusi
         auto_revoke: Jooksuta tühistamispäringut igapäevaselt
-        show_posts: Näita märgistuste lehel postitust, millega anti märgistus
+        show_posts: "Näita märgistuste lehel postitust, millega anti märgistus"
         trigger: Päästik
         trigger_type:
           none: "Uuenda igapäevaselt"
@@ -2884,14 +3046,14 @@ et:
             text: "Märgise andmise eksemplare on puudu. See juhtub, kui märgiste päring tagastab olematuid kasutaja või postisuse ID-sid. Sellega võivad hiljem kaasneda ettearvamatud tagajärjed - palun kontrolli oma päringut."
           no_grant_count: "Ei ole märgiseid, mida määrata."
           grant_count:
-            one: "<b>1</b> märgis, mida määrata."
-            other: "<b>%{count}</b> märgist, mida määrata."
+            one: <b>1</b> märgis, mida määrata.
+            other: <b>%{count}</b> märgist, mida määrata.
           sample: "Näidis:"
           grant:
-            with: <span class="username">%{username}</span>
-            with_post: <span class="username">%{username}</span> postitusele %{link}
-            with_post_time: <span class="username">%{username}</span> postitusele %{link} ajal <span class="time">%{time}</span>
-            with_time: <span class="username">%{username}</span> ajal <span class="time">%{time}</span>
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span> postitusele %{link}"
+            with_post_time: "<span class=\"username\">%{username}</span> postitusele %{link} ajal <span class=\"time\">%{time}</span>"
+            with_time: "<span class=\"username\">%{username}</span> ajal <span class=\"time\">%{time}</span>"
       emoji:
         title: "Emotikon"
         help: "Lisa uued emotikonid kõigile kasutamiseks. (PRO-vihje: pukseeri korraga mitu faili)"
@@ -2905,6 +3067,7 @@ et:
         sample: "Kasuta järgnevat HTML koodi oma saidil, et luua ja lisada/sängitada discourse teemad oma saidile. Asenda <b>REPLACE_ME</b> kanoonilise lehe URL-viitega, kuhu Sa seda lisad."
         title: "Sängitamine"
         host: "Lubatud hostid"
+        class_name: "Klassi nimi"
         path_whitelist: "Lubatud aadressiosad"
         edit: "muuda"
         category: "Postita foorumisse"
@@ -2935,7 +3098,7 @@ et:
         category_id: "Foorumi ID"
         category_title: "Foorum"
         external_url: "Väline URL"
-        delete_confirm: Oled Sa kindel, et soovid seda püsiviidet kustutada?
+        delete_confirm: "Oled Sa kindel, et soovid seda püsiviidet kustutada?"
         form:
           label: "Uus"
           add: "Lisa"
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index 7db29db301c..de01c65607c 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -16,6 +16,7 @@ fa_IR:
           format: '%n %u'
           units:
             byte:
+              one: بایت
               other: بایت
             gb: گیگابایت
             kb: کیلوبایت
@@ -42,47 +43,71 @@ fa_IR:
       tiny:
         half_a_minute: "< 1 دقیقه"
         less_than_x_seconds:
-          other: "< %{count} ثانیه"
+          one: < %{count} ثانیه
+          other: < %{count} ثانیه
         x_seconds:
-          other: "%{count} ثانیه"
+          one: '%{count} ثانیه'
+          other: '%{count} ثانیه'
+        less_than_x_minutes:
+          one: < %{count} دقیقه
+          other: < %{count} دقیقه
         x_minutes:
-          other: "%{count} دقیقه"
+          one: '%{count} دقیقه'
+          other: '%{count} دقیقه'
         about_x_hours:
-          other: "%{count} ساعت"
+          one: '%{count} ساعت'
+          other: '%{count} ساعت'
         x_days:
-          other: "%{count} روز"
+          one: '%{count} روز'
+          other: '%{count} روز'
+        x_months:
+          one: '%{count} ماه'
+          other: '%{count} ماه'
         about_x_years:
-          other: "%{count} سال"
+          one: '%{count} سال'
+          other: '%{count} سال'
         over_x_years:
-          other: "> %{count} سال"
+          one: '> %{count} سال'
+          other: '> %{count} سال'
         almost_x_years:
-          other: "%{count} سال"
+          one: '%{count} سال'
+          other: '%{count} سال'
         date_month: "MMM D"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          other: "%{count} دقیقه"
+          one: '%{count} دقیقه'
+          other: '%{count} دقیقه'
         x_hours:
-          other: "%{count} ساعت"
+          one: '%{count} ساعت'
+          other: '%{count} ساعت'
         x_days:
-          other: "%{count} روز"
+          one: '%{count} روز'
+          other: '%{count} روز'
         date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
-          other: "%{count} دقیقه پیش"
+          one: '%{count} دقیقه پیش'
+          other: '%{count} دقیقه پیش'
         x_hours:
-          other: "%{count} ساعت پیش"
+          one: '%{count} ساعت پیش'
+          other: '%{count} ساعت پیش'
         x_days:
-          other: "%{count} روز پیش"
+          one: '%{count} روز پیش'
+          other: '%{count} روز پیش'
       later:
         x_days:
-          other: "%{count} روز بعد"
+          one: '%{count} روز بعد'
+          other: '%{count} روز بعد'
         x_months:
-          other: "%{count} ماه بعد"
+          one: '%{count} ماه بعد'
+          other: '%{count} ماه بعد'
         x_years:
-          other: "%{count} سال بعد"
+          one: '%{count} سال بعد'
+          other: '%{count} سال بعد'
       previous_month: 'ماه قبل'
       next_month: 'ماه بعد'
+      placeholder: تاریخ
     share:
       topic: 'پیوندی به این موضوع را به اشتراک بگذارید'
       post: 'ارسال #%{postNumber}'
@@ -93,10 +118,11 @@ fa_IR:
       email: 'این پیوند را با ایمیل بفرستید'
     action_codes:
       public_topic: "این موضوع در %{when}  عمومی شده"
-      private_topic: "این موضوع در %{when}  خصوصی شده"
+      private_topic: "این موضوع در %{when}  یک پیغام خصوصی شده"
       split_topic: "این موضوع  %{when} جدا شد "
       invited_user: "%{who} در %{when} دعوت شده"
       invited_group: "%{who} در %{when} دعوت شده"
+      user_left: "%{who}%{when} خود را از این پیغام حذف کرد."
       removed_user: "%{who} در %{when} حذف شد"
       removed_group: "%{who} در %{when} حذف شد"
       autoclosed:
@@ -123,7 +149,7 @@ fa_IR:
     topic_admin_menu: "اقدامات مدیریت موضوع"
     wizard_required: "به دیسکورس خوش آمدید! برای شروع نصب <a href='%{url}' data-auto-route='true'>کلیک کنید</a> ✨"
     emails_are_disabled: "تمام ایمیل های خروجی بصورت کلی توسط مدیر قطع شده است. هیچگونه ایمیل اگاه سازی ارسال نخواهد شد."
-    bootstrap_mode_enabled: "برای راه‌اندازی راحت‌تر، حالت خود‌راه‌انداز فعال شده. به تمام کاربران سطح اعتماد 1 اعطا می‌شود و ایمیل خلاصه روزانه به صورت پیشفرض فعال می‌شود. این امکان وقتی تعداد کاربران  از %{min_users}  بیشتر شود، غیر فعال خواهد شد."
+    bootstrap_mode_enabled: "برای راه‌اندازی راحت‌تر سایت جدید، حالت خود‌راه‌انداز فعال شده. به تمام کاربران سطح اعتماد 1 اعطا می‌شود و ایمیل خلاصه روزانه به صورت پیشفرض برای ایشان فعال می‌شود. این امکان بصورت خودکار وقتی تعداد کاربران  از %{min_users}  بیشتر شود، غیر فعال خواهد شد."
     bootstrap_mode_disabled: "حالت خود راه انداز در 24 ساعت آینده غیر‌فعال خواهد شد."
     themes:
       default_description: "پیش‌فرض"
@@ -148,6 +174,7 @@ fa_IR:
     not_implemented: "آن ویژگی هنوز به کار گرفته نشده، متأسفیم!"
     no_value: "خیر"
     yes_value: "بله"
+    submit: "ثبت"
     generic_error: "متأسفیم، خطایی روی داده."
     generic_error_with_reason: "خطایی روی داد: %{error}"
     sign_up: "ثبت نام"
@@ -160,7 +187,8 @@ fa_IR:
     show_help: "گزینه‌ها"
     links: "پیوندها"
     links_lowercase:
-      other: "پیوندها"
+      one: پیوندها
+      other: پیوندها
     faq: "پرسش‌های متداول"
     guidelines: "راهنماها"
     privacy_policy: "سیاست حفظ حریم خصوصی"
@@ -184,7 +212,8 @@ fa_IR:
     max_of_count: "حداکثر {{count}}"
     alternation: "یا"
     character_count:
-      other: "{{count}} نویسه"
+      one: '{{count}} نویسه'
+      other: '{{count}} نویسه'
     suggested_topics:
       title: "موضوعات پیشنهادی"
       pm_title: "پیام‌های پیشنهادی"
@@ -196,8 +225,6 @@ fa_IR:
       our_moderators: "مدیران ما"
       stat:
         all_time: "کل"
-        last_7_days: "7 روز اخیر"
-        last_30_days: "30 روز گذشته"
       like_count: "پسند‌ها "
       topic_count: "موضوعات"
       post_count: "نوشته‌ها"
@@ -219,12 +246,14 @@ fa_IR:
       remove: "پاک کردن نشانک"
       confirm_clear: "آیا مطمئنید که می‌خواهید همه نشانک ها را از این موضوع پاک کنید؟"
     topic_count_latest:
-      other: "{{count}} موضوع تازه یا به‌ روز شده."
+      one: '{{count}} موضوع تازه یا به‌ روز شده.'
+      other: '{{count}} موضوع تازه یا به‌ روز شده.'
     topic_count_unread:
-      other: "{{count}} موضوع خوانده نشده."
+      one: خواندن {{count}} موضوعات خوانده نشده
+      other: خواندن {{count}} موضوعات خوانده نشده
     topic_count_new:
-      other: "{{count}} موضوع جدید."
-    click_to_show: "برای نمایش کلیک کنید."
+      one: مشاهده {{count}} موضوعات جدید
+      other: مشاهده {{count}} موضوعات جدید
     preview: "پیش‌نمایش"
     cancel: "لغو"
     save: "ذخیره سازی تغییرات"
@@ -234,8 +263,10 @@ fa_IR:
     uploading: "در حال بارگذاری..."
     uploading_filename: "بارگذاری {{filename}}..."
     uploaded: "بارگذاری شد!"
+    pasting: "چسباندن..."
     enable: "فعال کردن"
     disable: "ازکاراندازی"
+    continue: "ادامه"
     undo: "بی‌اثر کردن"
     revert: "برگشت"
     failed: "ناموفق"
@@ -260,14 +291,16 @@ fa_IR:
       cancel: "لغو کردن"
       view_pending: "مشاهده نوشته‌های در انتظار "
       has_pending_posts:
-        other: "این موضوع دارای <b>{{count}}</b> نوشته‌ی در انتظار تایید است"
+        one: این موضوع دارای <b>{{count}}</b> نوشته‌ی در انتظار تایید است
+        other: این موضوع دارای <b>{{count}}</b> نوشته‌ی در انتظار تایید است
       confirm: "ذخیره تغییرات"
       delete_prompt: "آیا از حذف <b>%{username}</b> اطمینان دارید؟ این عمل باعث حذف شدن تمامی نوشته های او و همینطور باعث مسدود شدن IP و ایمیل آن‌ها نیز می شود."
       approval:
         title: "نوشته نیاز به تایید دارد"
         description: "ما نوشته شما را دریافت کرده ایم ولی قبل از نمایش نیاز به تایید آن توسط یکی از مدیران است. لطفا صبر داشته باشید."
         pending_posts:
-          other: "شما دارای  <strong>{{count}}</strong>  نوشته در انتظار هستید "
+          one: 'شما دارای  <strong>{{count}}</strong>  نوشته در انتظار هستید '
+          other: 'شما دارای  <strong>{{count}}</strong>  نوشته در انتظار هستید '
         ok: "باشه"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> <a href='{{topicUrl}}'>یک موضوع</a> ایجاد کرد"
@@ -301,7 +334,8 @@ fa_IR:
       posts_read: "خواندن"
       posts_read_long: "نوشته‌های خوانده شده"
       total_rows:
-        other: "%{count} کاربر"
+        one: '%{count} کاربر'
+        other: '%{count} کاربر'
     group_histories:
       actions:
         change_group_setting: "تغییر تنظیمات گروه"
@@ -310,22 +344,30 @@ fa_IR:
         make_user_group_owner: "مدیر کردن"
         remove_user_as_group_owner: "لغو مالکیت"
     groups:
-      logs:
-        title: "گزارش‌ها"
-        when: "چه زمانی"
-        action: "عمل"
-        acting_user: "کاربر اجرایی"
-        target_user: "کاربر مقصد"
-        subject: "موضوع"
-        details: "جزئیات"
-        from: "از"
-        to: "به"
-      edit:
-        title: 'ویرایش گروه'
-        full_name: 'نام و نام خانوادگی'
+      add_members:
+        title: "افزودن اعضا"
+        description: "مدیریت عضویت کاربران در این گروه"
+        usernames: "نام های کاربری"
+      manage:
+        title: 'مدیریت'
+        name: 'نام'
+        full_name: 'نام کامل'
         add_members: "افزودن اعضا"
         delete_member_confirm: "کاربر '%{username}' از گروه '%{group}' حذف شود؟"
-      name_placeholder: "در نام گروه نمی توان از فاصله استفاده کرد، مانند قوانین نامگذاری نام کاربری"
+        profile:
+          title: مشخصات کاربر
+        interaction:
+          title: تراکنش
+          posting: در حال نوشتن
+          notification: اعلان‌ها
+        membership:
+          title: عضویت
+          access: دسترسی
+        logs:
+          title: "گزارش‌ها"
+          action: "اقدام"
+          details: "جزئیات"
+          from: "از طرف"
       empty:
         posts: "در این گروه هیچ نوشته ای توسط کاربران ارسال نشده."
         members: "این گروه هیچ عضوی ندارد"
@@ -334,50 +376,33 @@ fa_IR:
         topics: "در این گروه هیچ موضوعی توسط اعضای آن ایجاد نشده."
         logs: "هیچ گزارشی برای این گروه موجود نیست."
       add: "افزودن"
-      join: "پیوستن به گروه"
-      leave: "ترک گروه"
-      request: "درخواست پیوستن به گروه"
       message: "پیام"
-      automatic_group: گروه خودکار
-      closed_group: گروه بسته شده
-      is_group_user: "شما عضو این گروه هستید"
       allow_membership_requests: "اجازه ارسال درخواست عضویت در گروه به کاربران"
       membership_request:
         submit: "ارسال درخواست"
         title: "درخواست پیوستن به @%{group_name}"
       membership: "عضویت"
       name: "نام"
-      user_count: "تعداد اعضا"
       bio: "درباره گروه"
-      selector_placeholder: "افزودن عضو"
       owner: "مالک"
       index:
         title: "گروه‌ها"
         empty: "هیچ گروه قابل نمایشی وجود ندارد."
       title:
-        other: "گروه ها"
+        one: گروه ها
+        other: گروه ها
       activity: "فعالیت"
-      members: "اعضا"
       topics: "موضوعات"
       posts: "نوشته‌ها"
       mentions: "اشاره‌ها"
       messages: "پیام‌ها"
       notification_level: "سطح آگاه‌سازی پیش‌فرض برای پیام‌های گروهی"
-      visibility_levels:
-        title: "چه کسی می‌تواند این گروه را ببیند؟"
-        public: "همه"
-        members: "صاحبان گروه، اعضا، و مدیران"
-        staff: "صاحبان گروه و کارکنان"
-        owners: "صاحبان گروه و مدیران"
       alias_levels:
         nobody: "هیچ‌کس"
         only_admins: "فقط مدیران ارشد"
         mods_and_admins: "فقط مدیران و مدیران ارشد"
         members_mods_and_admins: "تنها اعضای گروه، مدیران ومدیران ارشد"
         everyone: "همه"
-      trust_levels:
-        title: "سطح اعتماد به صورت خودکار به اعضایی که اضافه می‌شوند داده می‌شود:"
-        none: "هیچ کدام"
       notifications:
         watching:
           title: "در حال مشاهده"
@@ -402,23 +427,21 @@ fa_IR:
       flair_color_placeholder: "(اختیاری) کد HEX رنگ"
       flair_preview_icon: "پیش‌نمایش آیکن"
       flair_preview_image: "پیش‌نمایش تصویر"
-      flair_note: "نکته:‌ خصیصه فقط برای گروه اصلی کاربر نمایش داده می‌شود."
     user_action_groups:
-      '1': "پسندهای داده شده"
-      '2': "پسندهای دریافت شده"
-      '3': "نشانک‌ها"
-      '4': "موضوعات"
-      '5': "پاسخ‌ها"
-      '6': "واکنش‌ها"
-      '7': "اشاره‌ها"
-      '9': "نقل‌قول‌ها"
-      '11': "ویرایش‌ها"
-      '12': "موارد ارسال شده"
-      '13': "صندوق دریافت"
-      '14': "در انتظار"
+      "1": "پسندهای داده شده"
+      "2": "پسندهای دریافت شده"
+      "3": "نشانک‌ها"
+      "4": "موضوعات"
+      "5": "پاسخ‌ها"
+      "6": "واکنش‌ها"
+      "7": "اشاره‌ها"
+      "9": "نقل‌قول‌ها"
+      "11": "ویرایش‌ها"
+      "12": "موارد ارسال شده"
+      "13": "صندوق دریافت"
+      "14": "در انتظار"
     categories:
       all: "همه‌ی دسته‌بندی‌ها"
-      all_subcategories: "همه"
       no_subcategory: "هیچی"
       category: "دسته‌بندی"
       category_list: "نمایش فهرست دسته‌بندی"
@@ -437,9 +460,11 @@ fa_IR:
       toggle_ordering: "ضامن کنترل مرتب سازی"
       subcategories: "دسته‌‌بندی‌های فرزند"
       topic_sentence:
-        other: "%{count} موضوع"
+        one: '%{count} موضوع'
+        other: '%{count} موضوع'
       topic_stat_sentence:
-        other: "%{count} موضوع تازه در %{unit} گذشته."
+        one: '%{count} موضوع تازه در %{unit} گذشته.'
+        other: '%{count} موضوع تازه در %{unit} گذشته.'
     ip_lookup:
       title: جستجوی نشانی IP
       hostname: نام میزبان
@@ -480,7 +505,6 @@ fa_IR:
       notifications: "آگاه‌سازی‌ها"
       statistics: "وضعیت"
       desktop_notifications:
-        label: "اعلانات میز‌کار"
         not_supported: "اعلانات بر روی این مرورگر پشتیبانی نمیشوند. با عرض پوزش."
         perm_default: "فعال کردن اعلانات"
         perm_denied_btn: "دسترسی رد شد"
@@ -536,7 +560,6 @@ fa_IR:
       delete_account: "حساب‌کاربری من را پاک کن"
       delete_account_confirm: "آیا مطمئنید که می‌خواهید شناسه‌تان را برای همیشه پاک کنید؟ برگشتی در کار نیست!"
       deleted_yourself: "حساب‌ کاربری شما با موفقیت حذف شد."
-      delete_yourself_not_allowed: "در حال حاضر شما نمی‌توانید حساب کاربری خود را حذف کنید. به این منظور  با یکی از مدیران برای پاک کردن حسابتان تماس بگیرید."
       unread_message_count: "پیام‌ها"
       admin_delete: "پاک کردن"
       users: "کاربران"
@@ -624,7 +647,8 @@ fa_IR:
         authenticated: "ایمیل شما توسط {{provider}} تصدیق شد"
         frequency_immediately: "اگر به سرعت چیزی را که برایتان ارسال نکردیم نخوانده باشید، بلافاصله برایتان ایمیل ارسال می‌کنیم."
         frequency:
-          other: "ما فقط در صورتی برای شما ایمیل میفرستیم که در {{count}} دقیقه آخر شما را ندیده باشیم."
+          one: ما فقط در صورتی برای شما ایمیل میفرستیم که در {{count}} دقیقه آخر شما را ندیده باشیم.
+          other: ما فقط در صورتی برای شما ایمیل میفرستیم که در {{count}} دقیقه آخر شما را ندیده باشیم.
       name:
         title: "نام"
         instructions: "نام و نام‌خانوادگی شما (اختیاری)"
@@ -655,8 +679,6 @@ fa_IR:
       created: "عضو شده"
       log_out: "خروج"
       location: "موقعیت"
-      card_badge:
-        title: "کارت نشان کاربر"
       website: "تارنما"
       email_settings: "ایمیل"
       like_notification_frequency:
@@ -710,9 +732,9 @@ fa_IR:
         title: "دعوت‌ها"
         user: "کاربر دعوت شده"
         sent: "ارسال شده"
-        none: "هیچ دعوت در انتظاری برای نمایش موجود نیست."
         truncated:
-          other: "نمایش {{count}} دعوت اول."
+          one: نمایش {{count}} دعوت اول.
+          other: نمایش {{count}} دعوت اول.
         redeemed: "دعوت‌نامه‌های استفاده شده"
         redeemed_tab: "استفاده شده"
         redeemed_tab_with_count: "({{count}}) استفاده شده"
@@ -758,15 +780,20 @@ fa_IR:
         stats: "آمار"
         time_read: " زمان خواندن"
         topic_count:
-          other: "موضوعات ساخته شدند"
+          one: موضوعات ساخته شدند
+          other: موضوعات ساخته شدند
         post_count:
-          other: "نوشته‌ها ساخته شدند"
+          one: نوشته‌ها ساخته شدند
+          other: نوشته‌ها ساخته شدند
         days_visited:
-          other: "روز‌هایی که بازدید شده"
+          one: روز‌هایی که بازدید شده
+          other: روز‌هایی که بازدید شده
         posts_read:
-          other: "نوشته‌های خوانده شده"
+          one: نوشته‌های خوانده شده
+          other: نوشته‌های خوانده شده
         bookmark_count:
-          other: "نشانک‌ها"
+          one: نشانک‌ها
+          other: نشانک‌ها
         top_replies: "بالا‌ترین پاسخ‌ها"
         no_replies: "بدون پاسخ"
         more_replies: "پاسخ‌های بیشتر"
@@ -834,7 +861,8 @@ fa_IR:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> به حد مجاز از %{siteSettingRate} رسیده است."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> از حد مجاز %{siteSettingRate} فراتر رفته است"
       rate:
-        other: "%{count} خطا/%{duration}"
+        one: '%{count} خطا/%{duration}'
+        other: '%{count} خطا/%{duration}'
     learn_more: "بیشتر بدانید..."
     all_time: 'مجموع'
     all_time_desc: 'مجموع موضوعات ایجاد شده'
@@ -850,6 +878,7 @@ fa_IR:
     unmute: صدادار
     last_reply_lowercase: آخرین پاسخ
     replies_lowercase:
+      one: 'پاسخ‌ها '
       other: 'پاسخ‌ها '
     signup_cta:
       sign_up: "ثبت نام"
@@ -1001,7 +1030,8 @@ fa_IR:
       similar_topics: "موضوع شما شبیه است به..."
       drafts_offline: "پیش نویس آفلاین"
       group_mentioned:
-        other: "با اشاره  به {{group}}، به <a href='{{group_link}}'>{{count}} نفر</a> اطلاعیه ارسال می‌شود. مطمئن هستید؟"
+        one: با اشاره  به {{group}}، به <a href='{{group_link}}'>{{count}} نفر</a> اطلاعیه ارسال می‌شود. مطمئن هستید؟
+        other: با اشاره  به {{group}}، به <a href='{{group_link}}'>{{count}} نفر</a> اطلاعیه ارسال می‌شود. مطمئن هستید؟
       cannot_see_mention:
         category: "شما به {{username}} اشاره کردید ولی ایشان به دلیل نداشتن دسترسی به این دسته‌بندی، مطلع نخواهند شد. برای دسترسی باید آن‌ها را به گروهی که به این دسته‌بندی دسترسی دارند اضافه کنید."
         private: "شما به {{username}} اشاره کردید ولی به دلیل نداشتن دسترسی به این پیام خصوصی مطلع نخواهند شد. برای دسترسی باید آن‌ها را به این پیام خصوصی دعوت کنید."
@@ -1027,6 +1057,7 @@ fa_IR:
       edit_reason_placeholder: "چرا ویرایش می‌کنید؟"
       show_edit_reason: "(افزودن دلیل ویرایش)"
       topic_featured_link_placeholder: "پیوندی که با عنوان نمایش داده می‌شود را وارد کنید."
+      remove_featured_link: "حذف لینک از موضوع"
       reply_placeholder: "اینجا بنویسید. از Markdown, BBCode و یا HTML برای قالب‌بندی متن استفاده کنید. عکس ها را بکشید و یا بچسبانید کنید."
       view_new_post: "نوشته جدیدتان را ببینید."
       saving: "در‌حال ذخیره"
@@ -1058,6 +1089,8 @@ fa_IR:
       ulist_title: "فهرست نقطه‌ای"
       list_item: "فهرست موارد"
       help: "راهنمای ویرایش با Markdown"
+      collapse: "کوچک سازی پنل نوشتن"
+      abandon: "پنل نوشتن را ببند و پیش‌نویس را حذف کن"
       modal_ok: "تایید"
       modal_cancel: "لغو"
       cant_send_pm: "متاسفانه , شما نمیتوانید به %{username}  پیام بفرستید."
@@ -1066,33 +1099,24 @@ fa_IR:
         body: "در حال حاضر این پیام فقط به خود شما ارسال می‌شود!"
       admin_options_title: "تنظیمات اختیاری مدیران برای این موضوع"
     notifications:
+      tooltip:
+        regular:
+          one: '{{count}} اعلان دیده نشده'
+          other: '{{count}} اعلان دیده نشده'
+        message:
+          one: '{{count}} خوانده نشده'
+          other: '{{count}} خوانده نشده'
       title: "اطلاع رسانی با اشاره به @نام، پاسخ ها به نوشته‌های شما و موضوعات شما، پیام‌های شما و ..."
       none: "قادر به بارگیری اعلان‌ها در این زمان نیستیم."
       empty: "اعلانی پیدا نشد."
       more: "نمایش اعلان‌های قدیمی‌تر"
       total_flagged: "همه‌ی نوشته‌های پرچم خورده"
-      alt:
-        mentioned: "اشاره شده توسط"
-        quoted: "نقل‌قول شده توسط"
-        replied: "پاسخ داده شد"
-        posted: "نوشته شده توسط"
-        edited: "نوشته‌تان را ویرایش کنید توسط"
-        liked: "ارسال شما را پسندید"
-        private_message: "پیام خصوصی از"
-        invited_to_private_message: "دعوت شد به یک پیام خصوصی توسط"
-        invited_to_topic: "دعوت شده به یک موضوع توسط"
-        invitee_accepted: "دعوت قبول شد توسط"
-        moved_post: "نوشته‌ی شما منتقل شد توسط"
-        linked: "پیوند به ارسال شما"
-        granted_badge: "نشان اعطا شد"
-        group_message_summary: "پیام‌های صندوق ورودی گروه"
       popup:
         mentioned: '{{username}} در "{{topic}}" - {{site_title}} به شما اشاره کرد'
         group_mentioned: '{{username}} به شما در "{{topic}}" - {{site_title}} اشاره نمود'
         quoted: '{{username}} از شما در "{{topic}}" - {{site_title}} نقل قول کرد '
         replied: '{{username}} در "{{topic}}" - {{site_title}} به شما پاسخ داد'
         posted: '{{username}} در "{{topic}}" - {{site_title}} مطلبی نوشت'
-        private_message: '{{username}} یک پیام خصوصی در "{{topic}}" - {{site_title}} به شما فرستاد'
         linked: '{{username}} در "{{topic}}" - {{site_title}} به نوشته‌ی شما پیوندی قرار داد'
     upload_selector:
       title: "افزودن تصویر"
@@ -1188,7 +1212,8 @@ fa_IR:
         notification_level: "اعلان‌ها"
         choose_new_category: "یک دسته‌بندی جدید برای موضوع انتخاب نمایید"
         selected:
-          other: "شما <b>{{count}}</b> موضوع را انتخاب کرده اید."
+          one: شما <b>{{count}}</b> موضوع را انتخاب کرده اید.
+          other: شما <b>{{count}}</b> موضوع را انتخاب کرده اید.
         change_tags: "جایگزینی برچسب‌ها"
         append_tags: "افزودن برچسب‌ها"
         choose_new_tags: "انتخاب برچسب‌های جدید برای این موضوعات:"
@@ -1220,11 +1245,9 @@ fa_IR:
         bookmarks: "موضوع نشانک‌گذاری شده‌ی دیگری وجود ندارد."
         search: "نتیجه‌ی جستجوی دیگری وجود ندارد"
     topic:
-      unsubscribe:
-        stop_notifications: "حالا شما اعلانات کمتری برای <strong>{{title}}</strong> دریافت می‌کنید"
-        change_notification_state: "وضعیت فعلی اعلانات شما این هست"
       filter_to:
-        other: "{{count}} نوشته در این موضوع وجود دارد"
+        one: '{{count}} نوشته در این موضوع وجود دارد'
+        other: '{{count}} نوشته در این موضوع وجود دارد'
       create: 'موضوع جدید'
       create_long: 'ساخت یک موضوع جدید'
       private_message: 'شروع یک پیام'
@@ -1238,8 +1261,10 @@ fa_IR:
       new: 'موضوع جدید'
       unread: 'خوانده نشده'
       new_topics:
+        one: '{{count}} موضوعات جدید'
         other: '{{count}} موضوعات جدید'
       unread_topics:
+        one: '{{count}} موضوع خوانده نشده'
         other: '{{count}} موضوع خوانده نشده'
       title: 'موضوع'
       invalid_access:
@@ -1253,13 +1278,17 @@ fa_IR:
         title: "موضوع پیدا نشد"
         description: "متأسفیم، نتوانستیم آن موضوع را پیدا کنیم. شاید یکی از همکاران آن را پاک کرده؟"
       total_unread_posts:
-        other: "شما {{count}} نوشته‌ی خوانده نشده در این موضوع دارید"
+        one: شما {{count}} نوشته‌ی خوانده نشده در این موضوع دارید
+        other: شما {{count}} نوشته‌ی خوانده نشده در این موضوع دارید
       unread_posts:
-        other: "شما {{count}} نوشته‌ی خوانده نشده قدیمی در این موضوع دارید"
+        one: شما {{count}} نوشته‌ی خوانده نشده قدیمی در این موضوع دارید
+        other: شما {{count}} نوشته‌ی خوانده نشده قدیمی در این موضوع دارید
       new_posts:
-        other: "{{count}} نوشته‌ی جدید از آخرین خواندن شما در این موضوع وجود دارد"
+        one: '{{count}} نوشته‌ی جدید از آخرین خواندن شما در این موضوع وجود دارد'
+        other: '{{count}} نوشته‌ی جدید از آخرین خواندن شما در این موضوع وجود دارد'
       likes:
-        other: "{{count}} پسند به این موضوع داده شده است"
+        one: '{{count}} پسند به این موضوع داده شده است'
+        other: '{{count}} پسند به این موضوع داده شده است'
       back_to_list: "بازگشت به فهرست موضوعات"
       options: "گزینه‌های موضوع"
       show_links: "نمایش پیوندهای درون این موضوع"
@@ -1314,7 +1343,8 @@ fa_IR:
         auto_reminder: "درباره این موضوع به شما یادآوری خواهد شد %{timeLeft}."
       auto_close_title: 'تنظیمات بستن خوکار'
       auto_close_immediate:
-        other: "از آخرین نوشته این موضوع %{count} ساعت گذشته، بنابراین موضوع بسته می‌شود."
+        one: از آخرین نوشته این موضوع %{count} ساعت گذشته، بنابراین موضوع بسته می‌شود.
+        other: از آخرین نوشته این موضوع %{count} ساعت گذشته، بنابراین موضوع بسته می‌شود.
       timeline:
         back: "بازگشت"
         back_description: "بازگشت به اولین نوشته‌ی خوانده نشده"
@@ -1335,21 +1365,21 @@ fa_IR:
         title: بازه زمانی آگاه‌سازی از این موضوع را تغییر دهید
         reasons:
           mailing_list_mode: "حالت ایمیلی فعال است، بنابراین از پاسخ‌های موضوع با ایمیل مطلع خواهید شد."
-          '3_10': 'به دلیل مشاهده‌ی یک برچسب در این موضوع، از رویداد‌های آن آگاه خواهید شد.'
-          '3_6': 'به دلیل مشاهده‌ی این دسته‌بندی، اعلان دریافت خواهید کرد.'
-          '3_5': 'به دلیل مشاهده‌ی این موضوع به صورت خودکار اعلان دریافت خواهید کرد.'
-          '3_2': 'به دلیل مشاهده‌ی موضوع اعلان دریافت خواهید کرد.'
-          '3_1': 'از آنجا که این موضوع را ساخته‌اید، از رویدادهای آن آگاه خواهید شد.'
-          '3': 'از آنجا که این موضوع را مشاهده می‌کنید، از رویدادهای آن آگاه خواهید شد.'
-          '2_8': 'به دلیل ارسال پیگیری این دسته‌بندی، پاسخ‌های جدید موضوع را خواهید دید.'
-          '2_4': 'به دلیل ارسال نوشته در این موضوع، پاسخ‌های جدید آن را خواهید دید.'
-          '2_2': 'به دلیل پیگیری این موضوع، تعداد پاسخ‌های جدید را خواهید دید.'
-          '2': 'شما به دلیل <a href="/u/{{username}}/preferences">خواندن این موضوع</a>. تعداد پاسخ‌های جدید آن را خواهید دید.'
-          '1_2': 'در صورتی که فردی با @نام به شما اشاره کند یا پاسخی دهد به شما اطلاع داده خواهد شد.'
-          '1': 'در صورتی که فردی با @نام به شما اشاره کند یا پاسخی دهد، به شما اطلاع داده خواهد شد.'
-          '0_7': 'شما تمام اعلان‌های این دسته‌بندی را نادیده گرفته اید'
-          '0_2': 'شما تمام اعلان‌های این موضوع را نادیده گرفته اید'
-          '0': 'شما تمام اعلان‌های این موضوع را نادیده گرفته اید'
+          "3_10": 'به دلیل مشاهده‌ی یک برچسب در این موضوع، از رویداد‌های آن آگاه خواهید شد.'
+          "3_6": 'به دلیل مشاهده‌ی این دسته‌بندی، اعلان دریافت خواهید کرد.'
+          "3_5": 'به دلیل مشاهده‌ی این موضوع به صورت خودکار اعلان دریافت خواهید کرد.'
+          "3_2": 'به دلیل مشاهده‌ی موضوع اعلان دریافت خواهید کرد.'
+          "3_1": 'از آنجا که این موضوع را ساخته‌اید، از رویدادهای آن آگاه خواهید شد.'
+          "3": 'از آنجا که این موضوع را مشاهده می‌کنید، از رویدادهای آن آگاه خواهید شد.'
+          "2_8": 'به دلیل ارسال پیگیری این دسته‌بندی، پاسخ‌های جدید موضوع را خواهید دید.'
+          "2_4": 'به دلیل ارسال نوشته در این موضوع، پاسخ‌های جدید آن را خواهید دید.'
+          "2_2": 'به دلیل پیگیری این موضوع، تعداد پاسخ‌های جدید را خواهید دید.'
+          "2": 'شما به دلیل <a href="/u/{{username}}/preferences">خواندن این موضوع</a>. تعداد پاسخ‌های جدید آن را خواهید دید.'
+          "1_2": 'در صورتی که فردی با @نام به شما اشاره کند یا پاسخی دهد به شما اطلاع داده خواهد شد.'
+          "1": 'در صورتی که فردی با @نام به شما اشاره کند یا پاسخی دهد، به شما اطلاع داده خواهد شد.'
+          "0_7": 'شما تمام اعلان‌های این دسته‌بندی را نادیده گرفته اید'
+          "0_2": 'شما تمام اعلان‌های این موضوع را نادیده گرفته اید'
+          "0": 'شما تمام اعلان‌های این موضوع را نادیده گرفته اید'
         watching_pm:
           title: "در حال مشاهده"
           description: "هر پاسخ جدید به این پیام به اطلاع شما خواهد رسید، و تعداد پاسخ‌های جدید نیز نمایش داده خواهد شد."
@@ -1389,7 +1419,6 @@ fa_IR:
         visible: "وارد کردن به فهرست"
         reset_read: "تنظیم مجدد خواندن داده ها"
         make_public: "ایجاد موضوع عمومی"
-        make_private: "ایجاد پیام خصوصی"
       feature:
         pin: "سنجاق زدن موضوع"
         unpin: "برداشتن سنجاق موضوع"
@@ -1422,7 +1451,8 @@ fa_IR:
         pin_validation: "برای سنجاق کردن این موضوع نیاز به یک تاریخ معین است."
         not_pinned: "هیچ موضوعی در {{categoryLink}} سنجاق نشده."
         already_pinned:
-          other: "موضوعاتی که در حال حاضر در {{categoryLink}} سنجاق شده اند: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: 'موضوعاتی که در حال حاضر در {{categoryLink}} سنجاق شده اند: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          other: 'موضوعاتی که در حال حاضر در {{categoryLink}} سنجاق شده اند: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         pin_globally: "نمایش این موضوع در بالای فهرست همه موضوعات تا وقتی که"
         confirm_pin_globally: "شما قبلا این موضوع {{count}} را بصورت سراسری سنجاق زده‌اید. تعداد زیاد موضوع های سنجاق شده برای کاربران جدید و ناشناس می تواند سخت باشد. آیا از سنجاق کردن موضوعات به‌صورت سراری اطمینان دارید؟  "
         unpin_globally: "حذف این موضوع از بالای لیست همه‌ی موضوعات."
@@ -1430,7 +1460,8 @@ fa_IR:
         global_pin_note: "کاربران می توانند موضوع را بصورت جداگانه برای خود از سنجاق در بیاورند"
         not_pinned_globally: "هیچ موضوعی به صورت سراسری سنجاق نشده."
         already_pinned_globally:
-          other: "موضوعاتی که در حال حاضر به صورت سراسری سنجاق شده‌اند: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: 'موضوعاتی که در حال حاضر به صورت سراسری سنجاق شده‌اند: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          other: 'موضوعاتی که در حال حاضر به صورت سراسری سنجاق شده‌اند: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         make_banner: "این موضوع را در وارد بنر کن که در تمام صفحات در بالای صفحه نشان داده شود"
         remove_banner: "حذف بنری که از بالای تمام صفحات نمایش داده می شود. "
         banner_note: "کاربران می توانند سر‌صفحه را با بستن آنها رد کنند. فقط یک موضوع را می توان در یک زمان به سر‌صفحه تبدیل کرد."
@@ -1466,7 +1497,8 @@ fa_IR:
       login_reply: 'برای پاسخ دادن وارد شوید'
       filters:
         n_posts:
-          other: "{{count}} نوشته"
+          one: '{{count}} نوشته'
+          other: '{{count}} نوشته'
         cancel: "حذف فیلتر"
       split_topic:
         title: "انتقال به موضوع جدید"
@@ -1474,13 +1506,15 @@ fa_IR:
         topic_name: "نام موضوع جدید"
         error: "یک مشکل در انتقال نوشته‌ها به موضوع جدید پیش آمد."
         instructions:
-          other: "شما در حال ایجاد موضوع جدید و افزودن <b>{{count}}</b> نوشته انتخاب شده به آن هستید."
+          one: شما در حال ایجاد موضوع جدید و افزودن <b>{{count}}</b> نوشته انتخاب شده به آن هستید.
+          other: شما در حال ایجاد موضوع جدید و افزودن <b>{{count}}</b> نوشته انتخاب شده به آن هستید.
       merge_topic:
         title: "انتقال به موضوع موجود"
         action: "انتقال به موضوع موجود"
         error: "یک خطا در انتقال نوشته‌ها به آن موضوع وجود داشت."
         instructions:
-          other: "لطفاً موضوعی را که قصد دارید تا  <b>{{count}}</b> نوشته‌ را به آن انتقال دهید، انتخاب نمایید."
+          one: لطفاً موضوعی را که قصد دارید تا  <b>{{count}}</b> نوشته‌ را به آن انتقال دهید، انتخاب نمایید.
+          other: لطفاً موضوعی را که قصد دارید تا  <b>{{count}}</b> نوشته‌ را به آن انتقال دهید، انتخاب نمایید.
       merge_posts:
         title: "ادغام نوشته‌های انتخاب شده"
         action: "ادغام نوشته‌های انتخاب شده"
@@ -1492,8 +1526,8 @@ fa_IR:
         label: "مالک جدید نوشته‌ها "
         placeholder: "نام‌کاربری مالک جدید"
         instructions:
-          other: "لطفا مالک جدید را برای این {{count}}  نوشته‌ی  <b>{{old_user}}</b>  انتخاب کنید."
-        instructions_warn: "نکته، هر گونه اعلان برای این نوشته همانند سابق برای کاربر جدید فرستاده نمی شود. <br> اخطار: در‌حال‌حاضر٬‌ هیچگونه اطلاعات قبلی به کاربر جدید فرستاده نشده. با احتیاط استفاده شود. "
+          one: لطفا مالک جدید را برای این {{count}}  نوشته‌ی  <b>{{old_user}}</b>  انتخاب کنید.
+          other: لطفا مالک جدید را برای این {{count}}  نوشته‌ی  <b>{{old_user}}</b>  انتخاب کنید.
       change_timestamp:
         title: "تغییر زمان"
         action: "تغییر زمان"
@@ -1508,10 +1542,9 @@ fa_IR:
         select_all: انتخاب همه
         deselect_all: عدم انتخاب همه
         description:
+          one: شما <b>{{count}}</b> نوشته انتخاب کرده اید
           other: شما <b>{{count}}</b> نوشته انتخاب کرده اید
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "نقل‌قول"
       edit_reason: "دلیل:"
       post_number: "نوشته {{number}}"
@@ -1524,20 +1557,26 @@ fa_IR:
       show_full: "نمایش کامل نوشته"
       show_hidden: 'نمایش محتوای پنهان'
       deleted_by_author:
-        other: "(نوشته های ارسال شده توسط نویسنده،بصورت خودکار در %{count} ساعت حذف می شود مگر اینکه پرچم شود)"
+        one: (نوشته های ارسال شده توسط نویسنده،بصورت خودکار در %{count} ساعت حذف می شود مگر اینکه پرچم شود)
+        other: (نوشته های ارسال شده توسط نویسنده،بصورت خودکار در %{count} ساعت حذف می شود مگر اینکه پرچم شود)
       expand_collapse: "باز کردن/بستن"
       gap:
-        other: "{{count}} پاسخ پنهان را مشاهده کنید"
+        one: '{{count}} پاسخ پنهان را مشاهده کنید'
+        other: '{{count}} پاسخ پنهان را مشاهده کنید'
       unread: "نوشته‌ی خوانده نشده"
       has_replies:
-        other: "{{count}} پاسخ"
+        one: '{{count}} پاسخ'
+        other: '{{count}} پاسخ'
       has_likes:
-        other: "{{count}} پسند"
+        one: '{{count}} پسند'
+        other: '{{count}} پسند'
       has_likes_title:
-        other: "{{count}} کاربر این مورد را پسندیده‌اند"
+        one: '{{count}} کاربر این مورد را پسندیده‌اند'
+        other: '{{count}} کاربر این مورد را پسندیده‌اند'
       has_likes_title_only_you: "شما این نوشته را پسندیده‌اید"
       has_likes_title_you:
-        other: "شما و {{count}} شخص دیگر این نوشته را پسندیده‌اید"
+        one: شما و {{count}} شخص دیگر این نوشته را پسندیده‌اید
+        other: شما و {{count}} شخص دیگر این نوشته را پسندیده‌اید
       errors:
         create: "متأسفیم، در ایجاد نوشته‌ی شما خطایی روی داد. لطفاً دوباره تلاش کنید."
         edit: "متأسفیم، در ویرایش نوشته‌ی شما خطایی روی داد. لطفاً دوباره تلاش کنید."
@@ -1610,38 +1649,54 @@ fa_IR:
           vote: "شما به این نوشته رأی دادید"
         by_you_and_others:
           off_topic:
-            other: "شما و {{count}} کاربر دیگر این مورد را خارج از بحث گزارش کردید"
+            one: شما و {{count}} کاربر دیگر این مورد را خارج از بحث گزارش کردید
+            other: شما و {{count}} کاربر دیگر این مورد را خارج از بحث گزارش کردید
           spam:
-            other: "شما و {{count}} کاربر دیگر این مورد را هرزنامه گزارش کردید"
+            one: شما و {{count}} کاربر دیگر این مورد را هرزنامه گزارش کردید
+            other: شما و {{count}} کاربر دیگر این مورد را هرزنامه گزارش کردید
           inappropriate:
-            other: "شما و {{count}} کاربر دیگر این مورد را نامناسب گزارش کردید"
+            one: شما و {{count}} کاربر دیگر این مورد را نامناسب گزارش کردید
+            other: شما و {{count}} کاربر دیگر این مورد را نامناسب گزارش کردید
           notify_moderators:
-            other: "شما و {{count}} کاربر دیگر این مورد را برای بررسی گزارش کردید"
+            one: شما و {{count}} کاربر دیگر این مورد را برای بررسی گزارش کردید
+            other: شما و {{count}} کاربر دیگر این مورد را برای بررسی گزارش کردید
           notify_user:
-            other: "شما و {{count}} افراد دیگر به این کاربر پیام فرستاده اید"
+            one: شما و {{count}} افراد دیگر به این کاربر پیام فرستاده اید
+            other: شما و {{count}} افراد دیگر به این کاربر پیام فرستاده اید
           bookmark:
-            other: "شما و {{count}} کاربر دیگر روی این نوشته نشانک گذاشتید"
+            one: شما و {{count}} کاربر دیگر روی این نوشته نشانک گذاشتید
+            other: شما و {{count}} کاربر دیگر روی این نوشته نشانک گذاشتید
           like:
-            other: "شما و {{count}} کاربر دیگر این مورد را پسند کردید"
+            one: شما و {{count}} کاربر دیگر این مورد را پسند کردید
+            other: شما و {{count}} کاربر دیگر این مورد را پسند کردید
           vote:
-            other: "شما و {{count}} کاربر دیگر به این نوشته رأی دادید"
+            one: شما و {{count}} کاربر دیگر به این نوشته رأی دادید
+            other: شما و {{count}} کاربر دیگر به این نوشته رأی دادید
         by_others:
           off_topic:
-            other: "{{count}} کاربر ین مورد را خارج از بحث گزارش کردند"
+            one: '{{count}} کاربر ین مورد را خارج از بحث گزارش کردند'
+            other: '{{count}} کاربر ین مورد را خارج از بحث گزارش کردند'
           spam:
-            other: "{{count}} کاربر ین مورد را هرزنامه گزارش کردند"
+            one: '{{count}} کاربر ین مورد را هرزنامه گزارش کردند'
+            other: '{{count}} کاربر ین مورد را هرزنامه گزارش کردند'
           inappropriate:
-            other: "{{count}} کاربر این مورد را نامناسب گزارش کردند"
+            one: '{{count}} کاربر این مورد را نامناسب گزارش کردند'
+            other: '{{count}} کاربر این مورد را نامناسب گزارش کردند'
           notify_moderators:
-            other: "{{count}} کاربر این مورد را برای بررسی گزارش کردند"
+            one: '{{count}} کاربر این مورد را برای بررسی گزارش کردند'
+            other: '{{count}} کاربر این مورد را برای بررسی گزارش کردند'
           notify_user:
-            other: "{{count}} ارسال پیام به این کاربر"
+            one: '{{count}} ارسال پیام به این کاربر'
+            other: '{{count}} ارسال پیام به این کاربر'
           bookmark:
-            other: "{{count}} کاربر روی این نوشته نشانک گذاشتند"
+            one: '{{count}} کاربر روی این نوشته نشانک گذاشتند'
+            other: '{{count}} کاربر روی این نوشته نشانک گذاشتند'
           like:
-            other: "{{count}} کاربر این مورد را پسند کردند"
+            one: '{{count}} کاربر این مورد را پسند کردند'
+            other: '{{count}} کاربر این مورد را پسند کردند'
           vote:
-            other: "{{count}} کاربر به این نوشته رأی دادند"
+            one: '{{count}} کاربر به این نوشته رأی دادند'
+            other: '{{count}} کاربر به این نوشته رأی دادند'
       revisions:
         controls:
           first: "بازبینی نخست"
@@ -1721,7 +1776,6 @@ fa_IR:
       email_in_allow_strangers: "تایید ایمیل ها از کاربران ناشناس  بدون حساب کاربری"
       email_in_disabled: "ارسال موضوعات جدید با ایمیل در تنظیمات سایت غیر فعال است. برای فعال سازی  موضوعات جدید را با ایمیل ارسال کنید،"
       email_in_disabled_click: 'فعال کردن تنظیمات "email in".'
-      suppress_from_homepage: "برداشتن این دسته‌بندی از صفحه اصلی."
       show_subcategory_list: "تعداد دسته‌بندی‌های فرزند که بالای موضوعات این دسته‌بندی نمایش داده می‌شوند."
       num_featured_topics: "تعداد موضوعاتی که در صفحه دسته‌بندی نمایش داده می‌شوند:"
       subcategory_num_featured_topics: "تعداد موضوعات برجسته که در دسته‌بندی مادر نمایش داده می‌شوند:"
@@ -1795,11 +1849,14 @@ fa_IR:
       custom_placeholder_notify_moderators: "به ما اجازه دهید بدانیم شما در مورد چه چیز آن نگران هستید، و تا جای ممکن از پیوند‌ها و مثال‌های مرتبط استفاده کنید."
       custom_message:
         at_least:
-          other: "حداقل  {{count}} نویسه وارد کنید"
+          one: حداقل  {{count}} نویسه وارد کنید
+          other: حداقل  {{count}} نویسه وارد کنید
         more:
-          other: "{{count}} نیاز است..."
+          one: '{{count}} نیاز است...'
+          other: '{{count}} نیاز است...'
         left:
-          other: "{{count}} باقی مانده"
+          one: '{{count}} باقی مانده'
+          other: '{{count}} باقی مانده'
     flagging_topic:
       title: "تشکر برای کمک به جامعه مدنی انجمن ما!"
       action: "پرچم‌گذاری موضوع"
@@ -1810,11 +1867,13 @@ fa_IR:
       links_title: "لینک‌های محبوب"
       links_shown: "نمایش لینک‌های بیشتر..."
       clicks:
-        other: "%{count} کلیک"
+        one: '%{count} کلیک'
+        other: '%{count} کلیک'
     post_links:
       about: "توسعه پیوند‌های بیشتر برای این نوشته"
       title:
-        other: "%{count} بیشتر"
+        one: '%{count} بیشتر'
+        other: '%{count} بیشتر'
     topic_statuses:
       warning:
         help: "این یک هشدار رسمی است."
@@ -1848,18 +1907,22 @@ fa_IR:
     original_post: "نوشته اصلی"
     views: "نمایش‌ها"
     views_lowercase:
-      other: "بازدیدها"
+      one: بازدیدها
+      other: بازدیدها
     replies: "پاسخ‌ها"
     views_long:
-      other: "این موضوع {{number}} بار دیده شده"
+      one: این موضوع {{number}} بار دیده شده
+      other: این موضوع {{number}} بار دیده شده
     activity: "فعالیت"
     likes: "پسندها"
     likes_lowercase:
-      other: "پسند‌ها"
+      one: پسند‌ها
+      other: پسند‌ها
     likes_long: "{{number}} پسند در این موضوع وجود دارد"
     users: "کاربران"
     users_lowercase:
-      other: "کاربران"
+      one: کاربران
+      other: کاربران
     category_title: "دسته"
     history: "تاریخچه"
     changed_by: "توسط {{author}}"
@@ -1873,7 +1936,8 @@ fa_IR:
       latest:
         title: "آخرین"
         title_with_count:
-          other: "آخرین ({{count}})"
+          one: آخرین ({{count}})
+          other: آخرین ({{count}})
         help: "موضوعات با نوشته‌های تازه"
       hot:
         title: "داغ"
@@ -1891,17 +1955,21 @@ fa_IR:
       unread:
         title: "خوانده‌ نشده‌"
         title_with_count:
-          other: " ({{count}}) خوانده‌ نشده‌"
+          one: ' ({{count}}) خوانده‌ نشده‌'
+          other: ' ({{count}}) خوانده‌ نشده‌'
         help: "موضوعاتی که در حال حاضر مشاهده می کنید یا دنبال می کنید با نوشته های خوانده نشده"
         lower_title_with_count:
-          other: "{{count}} خوانده نشده"
+          one: '{{count}} خوانده نشده'
+          other: '{{count}} خوانده نشده'
       new:
         lower_title_with_count:
-          other: "{{count}} تازه"
+          one: '{{count}} تازه'
+          other: '{{count}} تازه'
         lower_title: "جدید"
         title: "جدید"
         title_with_count:
-          other: "({{count}}) جدید"
+          one: ({{count}}) جدید
+          other: ({{count}}) جدید
         help: "موضوعات  ایجاد شده در چند روز گذشته"
       posted:
         title: "نوشته‌های من"
@@ -1912,7 +1980,8 @@ fa_IR:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          other: "{{categoryName}} ({{count}})"
+          one: '{{categoryName}} ({{count}})'
+          other: '{{categoryName}} ({{count}})'
         help: "موضوعات تازه در دستهٔ {{categoryName}}"
       top:
         title: "برترین‌ها"
@@ -1996,20 +2065,23 @@ fa_IR:
         print: '<b>ctrl</b>+<b>p</b> چاپ موضوع'
     badges:
       earned_n_times:
-        other: "این مدال را %{count} بار به دست آورده"
+        one: این مدال را %{count} بار به دست آورده
+        other: این مدال را %{count} بار به دست آورده
       granted_on: "اعطا شده %{date}"
       others_count: "سایرین با این مدال (%{count})"
       title: نشان‌ها
       allow_title: "می‌توانید از این نشان برای عنوان کاربری استفاده کنید"
       multiple_grant: "می‌توانید این را چند بار به‌دست آورید"
       badge_count:
-        other: "%{count} نشان"
+        one: '%{count} نشان'
+        other: '%{count} نشان'
       more_badges:
-        other: "+%{count} بیشتر"
+        one: +%{count} بیشتر
+        other: +%{count} بیشتر
       granted:
-        other: "%{count} اعطا شده"
+        one: '%{count} اعطا شده'
+        other: '%{count} اعطا شده'
       select_badge_for_title: انتخاب یک نشان برای استفاده در عنوان خود
-      none: "<none>"
       badge_grouping:
         getting_started:
           name: شروع
@@ -2052,19 +2124,15 @@ fa_IR:
       notifications:
         watching:
           title: "در حال مشاهده"
-          description: "شما به صورت خودکار تمام موضوعات این برچسب را مشاهده خواهید کرد. درباره‌ی نوشته‌ها و موضوعات جدید آگاه خواهید شد، به علاوه تعداد نوشته‌های خوانده نشده کنار موضوع نمایش داده خواهد شد."
         watching_first_post:
           title: "در حال مشاهده اولین نوشته"
-          description: "شما فقط برای اولین نوشته‌ی هر موضوع جدید در این برچسب مطلع خواهید شد."
         tracking:
           title: "پیگیری"
-          description: "به صورت خودکار در تمامی موضوعات این برچسب را پیگیری می‌کنید. تعداد نوشته‌های خوانده نشده کنار موضوع نمایش داده می‌شود."
         regular:
           title: "عادی"
           description: "اگر کسی به صورت @نام به شما اشاره کند، به شما اطلاع داده خواهد شد."
         muted:
           title: "بی‌صدا شد"
-          description: "از موضوعات جدید در این برچسب مطلع نخواهید شد و در تب مطالب خوانده نشده‌ها نیز نمایش داده نمی‌شوند."
       groups:
         title: "برچسب گروه‌ها"
         about: "برای مدیریت راحت‌تر گروه‌ها به آن‌ها برچسب اضافه کنید."
@@ -2146,8 +2214,6 @@ fa_IR:
         reports:
           today: "امروز"
           yesterday: "دیروز"
-          last_7_days: "7 روز اخیر"
-          last_30_days: "30 روز اخیر"
           all_time: "همیشه"
           7_days_ago: "7 روز پیش"
           30_days_ago: "30 روز پیش"
@@ -2165,8 +2231,6 @@ fa_IR:
         title: "پرچم‌ها"
         agree: "موافقت کردن"
         agree_title: "تایید این پرچم به عنوان معتبر و صحیح"
-        defer_flag: "چشم پوشی"
-        defer_flag_title: "حذف این پرچم; بدون نیاز به اقدام در این زمان"
         delete: "حذف"
         delete_title: "نوشته‌ای که پرچم به آن اشاره دارد حذف کن."
         delete_post_defer_flag_title: "حذف نوشته; اگر اولین نوشته است، موضوع را حذف نمایید."
@@ -2200,8 +2264,6 @@ fa_IR:
         title: "گروه‌ها"
         edit: "ویرایش گروه‌ها"
         refresh: "تازه کردن"
-        new: "جدید"
-        selector_placeholder: "نام کاربری را وارد نمایید ."
         about: "عضویت و نام‌های گروه را در اینجا ویرایش کنید"
         group_members: "اعضای گروه"
         delete: "حذف"
@@ -2209,22 +2271,10 @@ fa_IR:
         delete_failed: "قادر به حذف گروه نیستیم. اگر این یک گروه خودکار است، نمی توان آن را از بین برد."
         delete_owner_confirm: "حذف حق مالکیت برای '%{username}'؟"
         add: "اضافه کردن"
-        add_members: "اضافه کردن عضو"
         custom: "سفارشی"
-        bulk_complete: "کاربران به گروه اضافه شدند."
-        bulk_complete_users_not_added: "این کاربران اضافه نشدند (مطمئن شوید که حساب عضو هستند)"
-        bulk: "اضافه کردن تعداد زیادی به گروه"
-        bulk_paste: "یک لیست از نام های کاربری و یا ایمیل ها وارد کنید, در هر خط فقط یکی:"
-        bulk_select: "(یک گروه انتخاب کنید)"
         automatic: "خودکار"
-        automatic_membership_email_domains: " کاربرانی که با ایمیل  دامنه ثبت نام کرده اند،دقیقا شبیه دامنه های لیست، بصورت خودکار به این گروه اضافه می شوند :"
-        automatic_membership_retroactive: "درخواست همان قاعده دامنه ایمیل برای اضافه کردن برای کاربران ثبت نام کرده"
-        default_title: "عنوان را پیش فرض کن برای تمام اعضا در این گروه"
-        primary_group: "بطور خودکار به گروه اصلی تبدیل شد"
         group_owners: مالکین
         add_owners: افزودن مالک
-        incoming_email: "آدرس ایمیل های دریافتی سفارشی"
-        incoming_email_placeholder: "آدرس ایمیل را وارد کنید"
         none_selected: "برای شروع یک گروه انتخاب کنید"
         no_custom_groups: "ایجاد گروه سفارشی"
       api:
@@ -2290,9 +2340,11 @@ fa_IR:
           none: "رویداد مشابهی وجود ندارد"
           redeliver: "تحویل مجدد"
           incoming:
-            other: "{{count}} رویداد جدید جود دارد."
+            one: '{{count}} رویداد جدید جود دارد.'
+            other: '{{count}} رویداد جدید جود دارد.'
           completed_in:
-            other: "در {{count}} ثانیه کامل شد."
+            one: در {{count}} ثانیه کامل شد.
+            other: در {{count}} ثانیه کامل شد.
           request: "درخواست"
           response: "پاسخ"
           redeliver_confirm: "آیا از تحویل مجدد payload اطمینان دارید؟"
@@ -2343,7 +2395,6 @@ fa_IR:
           label: "بار گذاری"
           title: "آپلود یک نسخه پشتیبان برای نمونه"
           uploading: "در حال بار گذاری ..."
-          success: "'{{filename}}' با موفقیت بارگذاری شد."
           error: "هنگام آپلود خطایی رخ می دهد '{{filename}}': {{message}}"
         operations:
           is_running: "عملیاتی در جریان است..."
@@ -2356,7 +2407,6 @@ fa_IR:
             label: "پشتیبان گیری"
             title: "ساخت یک پشتیبان"
             confirm: "آیا می خواهید یک پشیبان گیری جدید را آغاز نمایید ؟"
-            without_uploads: "بله (فایل ها را شامل نمی شود)"
           download:
             label: "دانلود"
             title: "ارسال ایمیل با لینک دانلود"
@@ -2705,9 +2755,11 @@ fa_IR:
           suspect: 'مشکوک'
         approved: "تایید شده ؟"
         approved_selected:
-          other: "({{count}}) کاربر تایید شده"
+          one: ({{count}}) کاربر تایید شده
+          other: ({{count}}) کاربر تایید شده
         reject_selected:
-          other: "({{count}}) کاربر رد شده"
+          one: ({{count}}) کاربر رد شده
+          other: ({{count}}) کاربر رد شده
         titles:
           active: 'کاربران فعال'
           new: 'کاربران تازه'
@@ -2723,9 +2775,11 @@ fa_IR:
           suspended: 'کاربران تعلیق شده'
           suspect: 'کاربران مشکوک'
         reject_successful:
-          other: "%{count} کاربر با موفقیت رد شدند"
+          one: '%{count} کاربر با موفقیت رد شدند'
+          other: '%{count} کاربر با موفقیت رد شدند'
         reject_failures:
-          other: "رد %{count} کاربر ناموفق بود"
+          one: رد %{count} کاربر ناموفق بود
+          other: رد %{count} کاربر ناموفق بود
         not_verified: "تایید نشده"
         check_email:
           title: "ایمیل این کاربران را قابل رویت کن"
@@ -2759,7 +2813,7 @@ fa_IR:
         grant_moderation: 'اعطای مدیریت'
         unsuspend: 'خارج کردن از تعلیق'
         suspend: 'تعلیق'
-        reputation: ' اعتبار'
+        reputation: " اعتبار"
         permissions: دسترسی‌ها
         activity: فعالیت
         like_count: پسند‌های اعطایی / دریافتی
@@ -2767,7 +2821,7 @@ fa_IR:
         private_topics_count: موضوعات خصوصی
         posts_read_count: نوشته‌های خوانده شده
         post_count: نوشته‌های ایجاد شده
-        topics_entered: ' موضوعات بازدید شده'
+        topics_entered: " موضوعات بازدید شده"
         flags_given_count: پرچم‌های داده شده
         flags_received_count: پرچم‌های دریافت شده
         warnings_received_count: اخطار‌های دریافت شده
@@ -2785,11 +2839,14 @@ fa_IR:
         delete_forbidden_because_staff: "مدیران ارشد و مدیران را نمی‌توانید پاک کنید"
         delete_posts_forbidden_because_staff: "نمی توان همه‌ی نوشته‌های مدیران ارشد و مدیران را حذف کرد"
         delete_forbidden:
-          other: "کاربرانی را که  دارای موضوع  هستند نمی‌توانید  پاک کنید. پیش از تلاش برای پاک کردن کاربر، ابتدا همه‌ی موضوعاتش را پاک کنید. (موضوعات که بیش از %{count} روز پیش فرستاده شده باشند، نمی‌توانند پاک شوند.)"
+          one: کاربرانی را که  دارای موضوع  هستند نمی‌توانید  پاک کنید. پیش از تلاش برای پاک کردن کاربر، ابتدا همه‌ی موضوعاتش را پاک کنید. (موضوعات که بیش از %{count} روز پیش فرستاده شده باشند، نمی‌توانند پاک شوند.)
+          other: کاربرانی را که  دارای موضوع  هستند نمی‌توانید  پاک کنید. پیش از تلاش برای پاک کردن کاربر، ابتدا همه‌ی موضوعاتش را پاک کنید. (موضوعات که بیش از %{count} روز پیش فرستاده شده باشند، نمی‌توانند پاک شوند.)
         cant_delete_all_posts:
-          other: "نمی توان همه‌ی نوشته‌ها را حذف کرد. برخی نوشته ها قدیمی‌تر از %{count} هستند. (در delete_user_max_post_age setting.)"
+          one: نمی توان همه‌ی نوشته‌ها را حذف کرد. برخی نوشته ها قدیمی‌تر از %{count} هستند. (در delete_user_max_post_age setting.)
+          other: نمی توان همه‌ی نوشته‌ها را حذف کرد. برخی نوشته ها قدیمی‌تر از %{count} هستند. (در delete_user_max_post_age setting.)
         cant_delete_all_too_many_posts:
-          other: "نمی توان همه نوشته ها را خذف کرد. چون تعداد کاربران از %{count} تعداد نوشته ها بیشتر است.(delete_all_posts_max)"
+          one: نمی توان همه نوشته ها را خذف کرد. چون تعداد کاربران از %{count} تعداد نوشته ها بیشتر است.(delete_all_posts_max)
+          other: نمی توان همه نوشته ها را خذف کرد. چون تعداد کاربران از %{count} تعداد نوشته ها بیشتر است.(delete_all_posts_max)
         delete_confirm: "آیا مطمئن هستید که می خواهید این کاربر را حذف کنید ؟ اثر این کار دائمی است."
         delete_and_block: "آدرس IP و ایمیل را حذف و <b>مسدود</b>کن."
         delete_dont_block: "فقط حذف"
@@ -2824,7 +2881,8 @@ fa_IR:
         tl3_requirements:
           title: "شرایط لازم برای سطح اعتماد 3."
           table_title:
-            other: "در %{count} روز گذشته"
+            one: در %{count} روز گذشته
+            other: در %{count} روز گذشته
           value_heading: "مقدار"
           requirement_heading: "نیازمندی‌ها"
           visits: "بازدیدها"
@@ -2898,11 +2956,10 @@ fa_IR:
         go_back: "بازگشت به جستجو"
         recommended: "ما پیشنهاد میکنیم این متن را بر اساس نیاز های خود ویرایش کنید:"
         show_overriden: 'تنها بازنویسی‌شده‌ها را نمایش بده'
-      site_settings:
-        show_overriden: 'تنها بازنویسی‌شده‌ها را نمایش بده'
-        title: 'تنظیمات'
+      settings:
         reset: 'بازنشانی'
-        none: 'هیچ کدام'
+      site_settings:
+        title: 'تنظیمات'
         no_results: "چیزی یافت نشد."
         clear_filter: "واضح"
         add_url: "اضافه کردن URL"
@@ -2952,7 +3009,7 @@ fa_IR:
         save: ذخیره
         delete: حذف
         delete_confirm: آیا مطمئنید که می‌خواهید این نشان را حذف کنید؟
-        revoke: 'ابطال '
+        revoke: "ابطال "
         reason: دلیل
         expand: گستردن hellip&;
         revoke_confirm: آیا مطمئنید که می‌خواهید این نشان را حذف کنید؟
@@ -2969,7 +3026,6 @@ fa_IR:
         enabled: فعالسازی نشان
         icon: آیکن
         image: تصویر
-        icon_help: "استفاده از یک کلاس Font Awesome  یا URL به یک تصویر"
         query: پرس جوی نشان (SQL)
         target_posts: پرس‌و‌جوی نوشته‌های هدف
         auto_revoke: اجرای روزانه پروس‌و‌جوی لغو
@@ -2993,13 +3049,14 @@ fa_IR:
             text: "نمونه اعطای گم شده وجود دارد. این اتفاق زمانی می افتد که پرس‌و‌جو شناسه کاربر یا شناسه نوشته که وجود ندارد را برمی گرداند. این ممکن است باعث خیلی از نتایج غیر منتظره بعد از آن شود - لطفا  پرسش‌و‌پاسخ دوباره بررسی کنید."
           no_grant_count: "هیچ نشانی برای اختصاص دادن وجود ندارد."
           grant_count:
-            other: "<b>%{count}</b> نشان‌هایی که قرار است اختصاص داده شود."
+            one: <b>%{count}</b> نشان‌هایی که قرار است اختصاص داده شود.
+            other: <b>%{count}</b> نشان‌هایی که قرار است اختصاص داده شود.
           sample: "نمونه:"
           grant:
-            with: <span class="username">%{username}</span>
-            with_post: <span class="username">%{username}</span> برای نوشته در %{link}
-            with_post_time: <span class="username">%{username}</span> برای نوشته %{link} در <span class="time">%{time}</span>
-            with_time: <span class="username">%{username}</span> در <span class="time">%{time}</span>
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span> برای نوشته در %{link}"
+            with_post_time: "<span class=\"username\">%{username}</span> برای نوشته %{link} در <span class=\"time\">%{time}</span>"
+            with_time: "<span class=\"username\">%{username}</span> در <span class=\"time\">%{time}</span>"
       emoji:
         title: "شکلک"
         help: "اضافه کردن شکلک های جدید که در دسترس همگان خواهد بود.(PROTIP: کشیدن و رها کردن چند فایل در یک بار)"
@@ -3060,7 +3117,8 @@ fa_IR:
       uploading: "در حال بار گذاری..."
       quit: "شاید بعدا"
       staff_count:
-        other: "انجمن شما %{count} کارکن، شامل خودتان، دارد."
+        one: انجمن شما %{count} کارکن، شامل خودتان، دارد.
+        other: انجمن شما %{count} کارکن، شامل خودتان، دارد.
       invites:
         add_user: "اضافه کردن"
         none_added: "هیچ کدام از همکاران را دعوت نکردید. ادامه می‌دهید؟"
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index ef7000ef8ad..93afc7b6cc9 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -43,68 +43,68 @@ fi:
       tiny:
         half_a_minute: "< 1 min"
         less_than_x_seconds:
-          one: "< 1 s"
-          other: "< %{count} s"
+          one: < 1 s
+          other: < %{count} s
         x_seconds:
-          one: "1 s"
-          other: "%{count} s"
+          one: 1 s
+          other: '%{count} s'
         less_than_x_minutes:
-          one: "< 1 min"
-          other: "< %{count}min"
+          one: < 1 min
+          other: < %{count}min
         x_minutes:
-          one: "1 min"
-          other: "%{count} min"
+          one: 1 min
+          other: '%{count} min'
         about_x_hours:
-          one: "1 t"
-          other: "%{count} t"
+          one: 1 t
+          other: '%{count} t'
         x_days:
-          one: "1 pv"
-          other: "%{count} pv"
+          one: 1 pv
+          other: '%{count} pv'
         x_months:
-          one: "1 kk"
-          other: "%{count} kk"
+          one: 1 kk
+          other: '%{count} kk'
         about_x_years:
-          one: "1 v"
-          other: "%{count} v"
+          one: 1 v
+          other: '%{count} v'
         over_x_years:
-          one: "> 1 v"
-          other: "> %{count} v"
+          one: '> 1 v'
+          other: '> %{count} v'
         almost_x_years:
-          one: "1 v"
-          other: "%{count} v"
+          one: 1 v
+          other: '%{count} v'
         date_month: "D. MMM"
         date_year: "MMM -YY"
       medium:
         x_minutes:
-          one: "1 minuutti"
-          other: "%{count} minuuttia"
+          one: 1 minuutti
+          other: '%{count} minuuttia'
         x_hours:
-          one: "tunti"
-          other: "%{count} tuntia"
+          one: tunti
+          other: '%{count} tuntia'
         x_days:
-          one: "1 päivä"
-          other: "%{count} päivää"
+          one: 1 päivä
+          other: '%{count} päivää'
         date_year: "MMMM YYYY"
       medium_with_ago:
         x_minutes:
-          one: "minuutti sitten"
-          other: "%{count} minuuttia sitten"
+          one: minuutti sitten
+          other: '%{count} minuuttia sitten'
         x_hours:
-          one: "tunti sitten"
-          other: "%{count} tuntia sitten"
+          one: tunti sitten
+          other: '%{count} tuntia sitten'
         x_days:
-          one: "1 päivä sitten"
-          other: "%{count} päivää sitten"
+          one: 1 päivä sitten
+          other: '%{count} päivää sitten'
       later:
         x_days:
-          one: "1 päivä myöhemmin"
-          other: "%{count} päivää myöhemmin"
+          one: 1 päivä myöhemmin
+          other: '%{count} päivää myöhemmin'
         x_months:
-          one: "1 kuukausi myöhemmin"
-          other: "%{count} kuukautta myöhemmin"
+          one: 1 kuukausi myöhemmin
+          other: '%{count} kuukautta myöhemmin'
         x_years:
-          one: "1 vuosi myöhemmin"
-          other: "%{count} vuotta myöhemmin"
+          one: 1 vuosi myöhemmin
+          other: '%{count} vuotta myöhemmin'
       previous_month: 'Edellinen kuukausi'
       next_month: 'Seuraava kuukausi'
       placeholder: päivämäärä
@@ -118,7 +118,7 @@ fi:
       email: 'lähetä tämä linkki sähköpostissa'
     action_codes:
       public_topic: "teki ketjusta julkisen %{when}"
-      private_topic: "teki ketjusta yksityisen %{when}"
+      private_topic: "muutti ketjun yksityiskeskusteluksi %{when}"
       split_topic: "pilkkoi tämän ketjun %{when}"
       invited_user: "kutsui käyttäjän %{who} %{when}"
       invited_group: "kutsui käyttäjän %{who} %{when}"
@@ -149,7 +149,7 @@ fi:
     topic_admin_menu: "ketjun ylläpitotoimet"
     wizard_required: "Tervetuloa uuteen Discourseesi! Aloitetaan <a href='%{url}' data-auto-route='true'>ohjattu asennus</a> ✨"
     emails_are_disabled: "Ylläpitäjä on estänyt kaiken lähtevän sähköpostiliikenteen. Mitään sähköposti-ilmoituksia ei lähetetä."
-    bootstrap_mode_enabled: "Jotta uuden palsta käynnistäminen olisi helpompaa, on sivusto asetettu aloitustilaan. Kaikki uudet käyttäjät siirretään automaattisesti luottamustasolle 1 ja heille lähetetään sähköpostitiivistelmät päivittäin. Tämä tila poistetaan automaattisesti, kun käyttäjien määrä ylittää %{min_users}."
+    bootstrap_mode_enabled: "Jotta uuden palstan vauhtiin saaminen olisi helpompaa, sivusto on aloitustilassa. Kaikki uudet käyttäjät saavat luottamustason 1 ja heille lähetetään sähköpostitiivistelmät päivittäin. Tila poistetaan automaattisesti, kun %{min_users}käyttäjää on liittynyt."
     bootstrap_mode_disabled: "Aloitustila poistetaan seuraavan 24 tunnin aikana."
     themes:
       default_description: "Oletus"
@@ -174,6 +174,7 @@ fi:
     not_implemented: "Tätä toimintoa ei ole vielä toteutettu, pahoittelut!"
     no_value: "Ei"
     yes_value: "Kyllä"
+    submit: "Lähetä"
     generic_error: "On tapahtunut virhe."
     generic_error_with_reason: "Tapahtui virhe: %{error}"
     sign_up: "Luo tili"
@@ -186,12 +187,12 @@ fi:
     show_help: "valinnat"
     links: "Linkit"
     links_lowercase:
-      one: "linkki"
-      other: "linkit"
+      one: linkki
+      other: linkit
     faq: "UKK"
     guidelines: "Ohjeet"
-    privacy_policy: "Rekisteriseloste"
-    privacy: "Yksityisyys"
+    privacy_policy: "Tietosuojaseloste"
+    privacy: "Tietosuoja"
     terms_of_service: "Käyttöehdot"
     mobile_view: "Mobiilinäkymä"
     desktop_view: "Työpöytänäkymä"
@@ -211,8 +212,8 @@ fi:
     max_of_count: "korkeintaan {{count}}"
     alternation: "tai"
     character_count:
-      one: "{{count}} merkki"
-      other: "{{count}} merkkiä"
+      one: '{{count}} merkki'
+      other: '{{count}} merkkiä'
     suggested_topics:
       title: "Ketjuehdotuksia"
       pm_title: "Keskusteluehdotuksia"
@@ -224,8 +225,8 @@ fi:
       our_moderators: "Valvojat"
       stat:
         all_time: "Yhteensä"
-        last_7_days: "7 päivän aikana"
-        last_30_days: "30 päivän aikana"
+        last_7_days: "Viimeiset 7"
+        last_30_days: "Viimeiset 30"
       like_count: "Tykkäyksiä"
       topic_count: "Ketjuja"
       post_count: "Viestejä"
@@ -247,15 +248,14 @@ fi:
       remove: "Poista kirjanmerkki"
       confirm_clear: "Oletko varma, että haluat poistaa kaikki kirjanmerkit tässä ketjussa?"
     topic_count_latest:
-      one: "{{count}} uusi tai päivittynyt ketju."
-      other: "{{count}} uutta tai päivittynyttä ketjua."
+      one: Katso {{count}} uusi tai päivittynyt ketju
+      other: Katso {{count}} uutta tai päivittynyttä ketjua
     topic_count_unread:
-      one: "{{count}} ketju lukematta."
-      other: "{{count}} ketjua lukematta."
+      one: Näytä {{count}} lukematon ketju
+      other: Näytä {{count}} lukematonta ketjua
     topic_count_new:
-      one: "{{count}} uusi ketju."
-      other: "{{count}} uutta ketjua."
-    click_to_show: "Klikkaa niin näet."
+      one: Näytä {{count}} uusi ketju
+      other: Näytä {{count}} uutta ketjua
     preview: "esikatselu"
     cancel: "peruuta"
     save: "Tallenna muutokset"
@@ -268,6 +268,7 @@ fi:
     pasting: "Liitetään..."
     enable: "Ota käyttöön"
     disable: "Poista käytöstä"
+    continue: "Jatka"
     undo: "Peru"
     revert: "Palauta"
     failed: "Epäonnistui"
@@ -292,16 +293,16 @@ fi:
       cancel: "Peruuta"
       view_pending: "Tarkastele odottavia viestejä"
       has_pending_posts:
-        one: "<b>1</b> viesti ketjussa odottaa hyväksyntää"
-        other: "<b>{{count}}</b> viestiä ketjussa odottaa hyväksyntää"
+        one: <b>1</b> viesti ketjussa odottaa hyväksyntää
+        other: <b>{{count}}</b> viestiä ketjussa odottaa hyväksyntää
       confirm: "Tallenna muutokset"
       delete_prompt: "Haluatko todella poistaa käyttäjän <b>%{username}</b>? Kaikki hänen kirjoittamansa viestit poistetaan. Lisäksi hänen sähköposti- ja IP-osoitteillensa laitetaan esto."
       approval:
         title: "Viesti odottaa hyväksyntää"
         description: "Viestisi saapui perille, mutta valvojan on vielä hyväksyttävä se, jotta se näkyy sivustolla. Ole kärsivällinen."
         pending_posts:
-          one: "Sinulla on <strong>1</strong> odottava viesti."
-          other: "Sinulla on <strong>{{count}}</strong> odottavaa viestiä."
+          one: Sinulla on <strong>1</strong> odottava viesti.
+          other: Sinulla on <strong>{{count}}</strong> odottavaa viestiä.
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> kirjoitti <a href='{{topicUrl}}'>ketjuun</a>"
@@ -335,8 +336,8 @@ fi:
       posts_read: "Luetut"
       posts_read_long: "Luettuja viestejä"
       total_rows:
-        one: "1 käyttäjä"
-        other: "%{count} käyttäjää"
+        one: 1 käyttäjä
+        other: '%{count} käyttäjää'
     group_histories:
       actions:
         change_group_setting: "Muuta ryhmän asetusta"
@@ -345,22 +346,30 @@ fi:
         make_user_group_owner: "Myönnä isännyys"
         remove_user_as_group_owner: "Peru isännyys"
     groups:
-      logs:
-        title: "Lokit"
-        when: "Milloin"
-        action: "Toiminta"
-        acting_user: "Toimiva käyttäjä"
-        target_user: "Kohdekäyttäjä"
-        subject: "Aihe"
-        details: "Yksityiskohdat"
-        from: "Lähettäjä"
-        to: "Vastaanottaja"
-      edit:
-        title: 'Muuta ryhmää'
-        full_name: 'Täysimittainen nimi'
+      add_members:
+        title: "Lisää jäseniä"
+        description: "Hallinnoi ryhmän jäsenyyksiä"
+        usernames: "Käyttäjänimet"
+      manage:
+        title: 'Hallinnoi'
+        name: 'Nimi'
+        full_name: 'Täysmittainen nimi'
         add_members: "Lisää jäseniä"
         delete_member_confirm: "Poista '%{username}' ryhmästä '%{group}'?"
-      name_placeholder: "Ryhmän nimi. Ei välilyöntejä, samat säännöt kuin käyttäjänimillä"
+        profile:
+          title: Profiili
+        interaction:
+          title: Vuorovaikutus
+        logs:
+          title: "Lokit"
+          when: "Milloin"
+          action: "Toimi"
+          acting_user: "Toimija"
+          target_user: "Kohdekäyttäjä"
+          subject: "Aihe"
+          details: "Yksityiskohdat"
+          from: "Mistä"
+          to: "Minne"
       public_admission: "Salli käyttäjien liittyä ryhmään vapaasti (Ryhmän täytyy olla julkinen)"
       public_exit: "Salli käyttäjien poistua ryhmästä vapaasti"
       empty:
@@ -371,13 +380,10 @@ fi:
         topics: "Ryhmän jäsenet eivät ole aloittaneet ketjuja."
         logs: "Ryhmälle ei ole lokitietoja."
       add: "Lisää"
-      join: "Liity ryhmään"
-      leave: "Poistu ryhmästä"
-      request: "Hae ryhmään"
+      join: "Liity"
+      leave: "Poistu"
+      request: "Pyyntö"
       message: "Viesti"
-      automatic_group: Automaattinen ryhmä
-      closed_group: Suljettu ryhmä
-      is_group_user: "Olet tämän ryhmän jäsen"
       allow_membership_requests: "Salli käyttäjän lähettää jäsenhakemuksia ryhmien isännille"
       membership_request_template: "Viestipohja, joka näytetään käyttäjälle, kun hän lähettää jäsenhakemusta ryhmään."
       membership_request:
@@ -386,29 +392,50 @@ fi:
         reason: "Kerro ryhmän isännille, miksi haluat kuulua tähän ryhmään"
       membership: "Jäsenyys"
       name: "Nimi"
-      user_count: "Jäsenmäärä"
+      group_name: "Ryhmän nimi"
+      user_count: "Käyttäjät"
       bio: "Tietoa ryhmästä"
-      selector_placeholder: "Lisää jäseniä"
+      selector_placeholder: "syötä käyttäjänimi"
       owner: "isäntä"
       index:
         title: "Ryhmät"
+        all: "Kaikki ryhmät"
         empty: "Näkyvillä olevia ryhmiä ei ole."
+        filter: "Suodata ryhmän tyypin mukaan"
+        owner_groups: "Ryhmät joiden isäntä olen"
+        close_groups: "Suljetut ryhmät"
+        automatic_groups: "Automaattiset ryhmät"
+        automatic: "Automaattinen"
+        closed: "Suljettu"
+        public: "Julkinen"
+        private: "Yksityinen"
+        public_groups: "Julkiset ryhmät"
+        automatic_group: Automaattinen ryhmä
+        close_group: Sulje ryhmä
+        my_groups: "Minun ryhmäni"
+        group_type: "Ryhmän tyyppi"
+        is_group_user: "Jäsen"
+        is_group_owner: "Isäntä"
       title:
-        one: "Ryhmä"
-        other: "Ryhmät"
+        one: Ryhmä
+        other: Ryhmät
       activity: "Toiminta"
-      members: "Jäsenet"
+      members:
+        title: "Jäsenet"
+        filter_placeholder_admin: "käyttäjänimi tai sähköposti"
+        filter_placeholder: "käyttäjänimi"
+        remove_member: "Poista jäsen"
+        remove_member_description: "Poista <b>%{username}</b> ryhmästä"
+        make_owner: "Myönnä isännyys"
+        make_owner_description: "Tee käyttäjästä <b>%{username}</b> ryhmän isäntä"
+        remove_owner: "Peru isännyys"
+        remove_owner_description: "Peru käyttäjältä <b>%{username}</b> ryhmän isännyys"
+        owner: "Isäntä"
       topics: "Ketjut"
       posts: "Viestit"
       mentions: "Maininnat"
       messages: "Viestit"
       notification_level: "Ryhmäviestien oletusilmoitusasetus"
-      visibility_levels:
-        title: "Ketkä näkevät tämän ryhmän?"
-        public: "Kaikk"
-        members: "Ryhmän isännät, jäsenet ja ylläpitäjät"
-        staff: "Ryhmän isännät ja henkilökunta"
-        owners: "Ryhmän isännät ja ylläpitäjät"
       alias_levels:
         mentionable: "Ketkä voivat @mainita ryhmän?"
         messageable: "Ketkä voivat lähettää ryhmälle viestin?"
@@ -417,16 +444,13 @@ fi:
         mods_and_admins: "Vain ylläpitäjät ja valvojat"
         members_mods_and_admins: "Vain ryhmän jäsenet, valvojat ja ylläpitäjät"
         everyone: "Kaikki"
-      trust_levels:
-        title: "Luottamustaso, joka annetaan automaattisesti lisättäessä tähän ryhmään:"
-        none: "Ei mitään"
       notifications:
         watching:
           title: "Tarkkailussa"
           description: "Saat ilmoituksen uusista viesteistä jokaisessa viestiketjussa, ja uusien vastausten lukumäärä näytetään."
         watching_first_post:
           title: "Uudet ketjut tarkkailussa"
-          description: "Saat ilmoituksen vain ketjujen ensimmäisistä viesteistä tässä ryhmässä."
+          description: "Saat ilmoituksen vain ketjunaloituksista tässä ryhmässä."
         tracking:
           title: "Seurannassa"
           description: "Saat ilmoituksen, jos joku mainitsee @nimesi tai vastaa sinulle, ja uusien vastausten lukumäärä näytetään."
@@ -444,23 +468,22 @@ fi:
       flair_color_placeholder: "(Valinnainen) värin Hex-arvo"
       flair_preview_icon: "Ikonin esikatselu"
       flair_preview_image: "Kuvan esikatselu"
-      flair_note: "Huom. Käyttäjän ensisijainen ryhmä määrää pinssin."
     user_action_groups:
-      '1': "Annetut tykkäykset"
-      '2': "Saadut tykkäykset"
-      '3': "Kirjanmerkit"
-      '4': "Ketjut"
-      '5': "Vastaukset"
-      '6': "Vastaukset"
-      '7': "Maininnat"
-      '9': "Lainaukset"
-      '11': "Muokkaukset"
-      '12': "Lähetetyt"
-      '13': "Postilaatikko"
-      '14': "Odottaa"
+      "1": "Annetut tykkäykset"
+      "2": "Saadut tykkäykset"
+      "3": "Kirjanmerkit"
+      "4": "Ketjut"
+      "5": "Vastaukset"
+      "6": "Vastaukset"
+      "7": "Maininnat"
+      "9": "Lainaukset"
+      "11": "Muokkaukset"
+      "12": "Lähetetyt"
+      "13": "Postilaatikko"
+      "14": "Odottaa"
     categories:
       all: "kaikki alueet"
-      all_subcategories: "kaikki"
+      all_subcategories: "koko %{categoryName} -alue"
       no_subcategory: "vain pääalue"
       category: "Alue"
       category_list: "Näytä alueet"
@@ -479,11 +502,11 @@ fi:
       toggle_ordering: "vaihda järjestystä"
       subcategories: "Tytäralueet"
       topic_sentence:
-        one: "1 ketju"
-        other: "%{count} ketjua"
+        one: 1 ketju
+        other: '%{count} ketjua'
       topic_stat_sentence:
-        one: "%{count} uusi ketju viimeisen %{unit} aikana."
-        other: "%{count} uutta ketjua viimeisen %{unit} aikana."
+        one: '%{count} uusi ketju viimeisen %{unit} aikana.'
+        other: '%{count} uutta ketjua viimeisen %{unit} aikana.'
     ip_lookup:
       title: IP-osoitteen haku
       hostname: Isäntänimi
@@ -518,6 +541,7 @@ fi:
       activity_stream: "Toiminta"
       preferences: "Asetukset"
       expand_profile: "Laajenna"
+      collapse_profile: "Supista"
       bookmarks: "Kirjanmerkit"
       bio: "Tietoa minusta"
       invited_by: "Kutsuja"
@@ -525,7 +549,7 @@ fi:
       notifications: "Ilmoitukset"
       statistics: "Tilastot"
       desktop_notifications:
-        label: "Työpöytäilmoitukset"
+        label: "Live-ilmoitukset"
         not_supported: "Tämä selain ei tue ilmoituksia, pahoittelut."
         perm_default: "Näytä ilmoituksia"
         perm_denied_btn: "Ei oikeuksia"
@@ -533,6 +557,7 @@ fi:
         disable: "Poista ilmoitukset käytöstä"
         enable: "Näytä ilmoituksia"
         each_browser_note: "Huom: Asetus on säädettävä erikseen jokaisessa selaimessa, jota käytät."
+        consent_prompt: "Haluatko liveilmoituksia kun muut vastaavat viesteihisi?"
       dismiss: 'Unohda'
       dismiss_notifications: "Unohda kaikki"
       dismiss_notifications_tooltip: "Merkitse kaikki lukemattomat ilmoitukset luetuiksi"
@@ -540,7 +565,7 @@ fi:
       disable_jump_reply: "Älä siirry uuteen viestiini lähetettyäni sen"
       dynamic_favicon: "Näytä uusien / päivittyneiden ketjujen määrä selaimen ikonissa"
       theme_default_on_all_devices: "Tee tästä oletusteema kaikille laitteilleni"
-      allow_private_messages: "Salli muiden lähettää minulle yksityisviestejä"
+      allow_private_messages: "Salli toisten käyttäjien lähettää minulle yksityisviestejä"
       external_links_in_new_tab: "Avaa sivuston ulkopuoliset linkit uudessa välilehdessä"
       enable_quoting: "Ota käyttöön viestin lainaaminen tekstiä valitsemalla"
       change: "vaihda"
@@ -565,6 +590,7 @@ fi:
         individual_no_echo: "Lähetä sähköposti jokaisesta uudesta viestistä lukuun ottamatta omiani"
         many_per_day: "Lähetä minulle sähköpostia jokaisesta uudesta viestistä (noin {{dailyEmailEstimate}} päivässä)"
         few_per_day: "Lähetä minulle sähköpostia jokaisesta uudesta viestistä (noin 2 päivässä)"
+        warning: "Postituslistatila käytössä. Sähköposti-ilmoitusasetukset syrjäytetty."
       tag_settings: "Tunnisteet"
       watched_tags: "Tarkkailtavat"
       watched_tags_instructions: "Ketjut joilla on joku näistä tunnisteista asetetaan automaattisesti tarkkailuun. Saat ilmoituksen kaikista uusista viesteistä ja ketjuista, ja uusien viestien lukumäärä näytetään ketjun otsikon vieressä. "
@@ -586,7 +612,7 @@ fi:
       delete_account: "Poista tilini"
       delete_account_confirm: "Oletko varma, että haluat lopullisesti poistaa käyttäjätilisi? Tätä toimintoa ei voi perua!"
       deleted_yourself: "Käyttäjätilisi on poistettu."
-      delete_yourself_not_allowed: "Et voi poistaa käyttäjätiliäsi juuti nyt. Sinun tulee pyytää ylläpitäjää poistamaan tilisi."
+      delete_yourself_not_allowed: "Ota yhteyttä henkilökuntaan jos haluat että tilisi poistetaan."
       unread_message_count: "Viestit"
       admin_delete: "Poista"
       users: "Käyttäjät"
@@ -620,6 +646,7 @@ fi:
         move_to_archive: "Arkisto"
         failed_to_move: "Viestien siirto epäonnistui (vika saattaa olla internetyhteydessäsi)"
         select_all: "Valitse kaikki"
+        tags: "Tunnisteet"
       preferences_nav:
         account: "Tili"
         profile: "Profiili"
@@ -637,6 +664,18 @@ fi:
         set_password: "Aseta salasana"
         choose_new: "Valitse uusi salasana"
         choose: "Valitse salasana"
+      second_factor:
+        title: "Kaksivaiheinen tunnistautuminen"
+        disable: "Poista kaksivaiheinen tunnistautuminen käytöstä"
+        confirm_password_description: "Jatka vahvistamalla salasanasi"
+        label: "Koodi"
+        enable_description: |
+          Skannaa QR-koodi laitteellesi sopivalla sovelluksella (<a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target="_blank">Android</a> – <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8" target="_blank">iOS</a> – <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a>) ja syötä tunnistautumiskoodi.
+        disable_description: "Syötä sovelluksen tarjoama tunnistautumiskoodi"
+        show_key_description: "Syötä manuaalisesti"
+        extended_description: |
+          Kaksivaiheinen tunnistautuminen lisää tilisi tietoturvaa vaatimalla kertakäyttöisen koodin salasanan lisäksi. Koodeja voi luoda <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target='_blank'>Android</a>, <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8">iOS</a> ja <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a> -laitteilla.
+        oauth_enabled_warning: "Huomioi, ettet voi kirjautua some-tilien avulla, jos kaksivaiheinen tunnistautuminen on käytössä."
       change_about:
         title: "Muokkaa kuvaustasi"
         error: "Arvon muuttamisessa tapahtui virhe."
@@ -678,8 +717,8 @@ fi:
         authenticated: "{{provider}} on todentanut sähköpostiosoitteesi"
         frequency_immediately: "Saat sähköpostia välittömästi, jollet ole jo lukenut asiaa, jota sähköpostiviesti koskee."
         frequency:
-          one: "Lähetämme sähköpostia vain, jos emme ole nähneet sinua edellisen  minuutin aikana."
-          other: "Lähetämme sähköpostia vain, jos emme ole nähneet sinua edellisen {{count}} minuutin aikana."
+          one: Lähetämme sähköpostia vain, jos emme ole nähneet sinua edellisen  minuutin aikana.
+          other: Lähetämme sähköpostia vain, jos emme ole nähneet sinua edellisen {{count}} minuutin aikana.
       name:
         title: "Nimi"
         instructions: "koko nimesi (valinnainen)"
@@ -710,8 +749,6 @@ fi:
       created: "Liittynyt"
       log_out: "Kirjaudu ulos"
       location: "Sijainti"
-      card_badge:
-        title: "Ansiomerkki käyttäjäkortissa"
       website: "Nettisivu"
       email_settings: "Sähköposti"
       like_notification_frequency:
@@ -765,10 +802,10 @@ fi:
         title: "Kutsut"
         user: "Kutsuttu käyttäjä"
         sent: "Lähetetty"
-        none: "Avoimia kutsuja ei ole."
+        none: "Ei kutsuja, joita näyttää."
         truncated:
-          one: "Näytetään ensimmäinen kutsu."
-          other: "Näytetään ensimmäiset {{count}} kutsua."
+          one: Näytetään ensimmäinen kutsu.
+          other: Näytetään ensimmäiset {{count}} kutsua.
         redeemed: "Hyväksytyt kutsut"
         redeemed_tab: "Hyväksytyt"
         redeemed_tab_with_count: "Hyväksytyt ({{count}})"
@@ -815,29 +852,29 @@ fi:
         time_read: "lukenut palstaa"
         recent_time_read: "lukenut hiljattain"
         topic_count:
-          one: "avattu ketju"
-          other: "aloitettua ketjua"
+          one: avattu ketju
+          other: aloitettua ketjua
         post_count:
-          one: "kirjoitettu viesti"
-          other: "kirjoitettua viestiä"
+          one: kirjoitettu viesti
+          other: kirjoitettua viestiä
         likes_given:
-          one: "annettu"
-          other: "annettu"
+          one: annettu
+          other: annettu
         likes_received:
-          one: "saatu"
-          other: "saatu"
+          one: saatu
+          other: saatu
         days_visited:
-          one: "päivänä vieraillut"
-          other: "päivänä vieraillut"
+          one: päivänä vieraillut
+          other: päivänä vieraillut
         topics_entered:
-          one: "ketjua lukenut"
-          other: "ketjua lukenut"
+          one: ketjua lukenut
+          other: ketjua lukenut
         posts_read:
-          one: "luettu viesti"
-          other: "luettua viestiä"
+          one: luettu viesti
+          other: luettua viestiä
         bookmark_count:
-          one: "kirjanmerkki"
-          other: "kirjanmerkkiä"
+          one: kirjanmerkki
+          other: kirjanmerkkiä
         top_replies: "Parhaat viestit"
         no_replies: "Ei vastauksia toistaiseksi."
         more_replies: "Lisää viestejä"
@@ -863,6 +900,7 @@ fi:
         header_title: "profiili, viestit, kirjanmerkit ja asetukset"
       title:
         title: "Titteli"
+        none: "(ei mitään)"
       filters:
         all: "Kaikki"
       stream:
@@ -905,8 +943,8 @@ fi:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> saavutti sivuston asetuksissa määritellyn rajan %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> ylittää sivuston asetuksissa määritellyn rajan %{siteSettingRate}."
       rate:
-        one: "1 virhe/%{duration}"
-        other: "%{count} virhettä/%{duration}"
+        one: 1 virhe/%{duration}
+        other: '%{count} virhettä/%{duration}'
     learn_more: "opi lisää..."
     all_time: 'yhteensä'
     all_time_desc: 'ketjuja aloitettu yhteensä'
@@ -961,7 +999,7 @@ fi:
     trust_level: 'Luottamustaso'
     search_hint: 'käyttäjätunnus, sähköposti tai IP-osoite'
     create_account:
-      disclaimer: "Rekisteröitymällä hyväksyt sivuston <a href='{{privacy_link}}'>rekisteriselosteen</a> ja <a href='{{tos_link}}'>käyttöehdot</a>."
+      disclaimer: "Rekisteröitymällä hyväksyt sivuston <a href='{{privacy_link}}'>tietosuojaselosteen</a> ja <a href='{{tos_link}}'>käyttöehdot</a>."
       title: "Luo uusi tunnus"
       failed: "Jotain meni pieleen. Ehkäpä tämä sähköpostiosoite on jo rekisteröity, kokeile salasana unohtui -linkkiä."
     forgot_password:
@@ -978,14 +1016,26 @@ fi:
       help: "Eikö sähköposti saavu? Ensiksi tarkasta roskapostikansiosi.<p>Etkö ole varma sähköpostiosoitteesta? Syötä sähköpostiosoite niin saat tietää onko sillä luotu tunnusta.</p><p>Jos et enää hallitse sähköpostiosoitettasi, ota yhteyttä <a href='/about'>avuliaaseen henkilökuntaamme.</a></p>"
       button_ok: "OK"
       button_help: "Apua"
+    email_login:
+      link_label: "Lähetä minulle kirjautumislinkki"
+      button_label: "sähköpostitse"
+      complete_username: "Jos on olemassa käyttäjätili käyttäjänimellä <b>%{username}</b>, kirjautumislinkin sisältävän sähköpostiviestin pitäisi saapua sinulle tuota pikaa."
+      complete_email: "Jos on olemassa käyttäjätili sähköpostiosoitteella <b>%{email}</b>, kirjautumislinkin sisältävän sähköpostiviestin pitäisi saapua sinulle tuota pikaa."
+      complete_username_found: "Käyttäjätili käyttäjänimellä <b>%{username}</b> löytyi. Kirjautumislinkin sisältävän sähköpostiviestin pitäisi saapua sinulle tuota pikaa."
+      complete_email_found: "Käyttäjätili sähköpostiosoitteella <b>%{email}</b> löytyi. Kirjautumislinkin sisältävän sähköpostiviestin pitäisi saapua sinulle tuota pikaa."
+      complete_username_not_found: "Ei löytynyt käyttäjänimeä <b>%{username}</b>"
+      complete_email_not_found: "Ei löytynyt sähköpostiosoitetta <b>%{email}</b>"
     login:
       title: "Kirjaudu"
       username: "Käyttäjä"
       password: "Salasana"
+      second_factor_title: "Kaksivaiheinen tunnistautuminen"
+      second_factor_description: "Syötä sovelluksen antama todennuskoodi:"
       email_placeholder: "sähköposti tai käyttäjätunnus"
       caps_lock_warning: "Caps Lock on päällä"
       error: "Tuntematon virhe"
       rate_limit: "Odota hetki ennen kuin yrität kirjautua uudelleen."
+      blank_username: "Syötä sähköpostiosoitteesi tai käyttäjänimesi."
       blank_username_or_password: "Kirjoita sähköpostiosoite tai käyttäjänimi ja salasana."
       reset_password: 'Uusi salasana'
       logging_in: "Kirjaudutaan..."
@@ -998,6 +1048,7 @@ fi:
       not_allowed_from_ip_address: "Kirjautuminen estetty tästä IP-osoitteesta."
       admin_not_allowed_from_ip_address: "Et voi kirjautua ylläpitäjänä tästä IP-osoitteesta."
       resend_activation_email: "Klikkaa tästä lähettääksesi vahvistusviestin uudelleen."
+      omniauth_disallow_totp: "Käyttäjätilisi käyttää kaksivaiheista tunnistautumista. Kirjaudu salasanasi avulla."
       resend_title: "Lähetä aktivointisähköposti uudelleen"
       change_email: "Vaihda sähköpostiosoitetta"
       provide_new_email: "Anna uusi osoite niin lähetämme sinulle vahvistamissähköpostin."
@@ -1053,15 +1104,24 @@ fi:
       categories_only: "Vain alueet"
       categories_with_featured_topics: "Alueet, joiden yhteydessä ketjuja"
       categories_and_latest_topics: "Alueet ja tuoreimmat ketjut"
+      categories_and_top_topics: "Alueet ja huiput ketjut"
     shortcut_modifier_key:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    conditional_loading_section:
+      loading: Ladataan...
     select_kit:
       default_header_text: Valitse...
       no_content: Ei osumia
       filter_placeholder: Hae...
-      create: "Luo {{content}}"
+      create: "Luo: '{{content}}'"
+      max_content_reached:
+        one: Voit valita vain {{count}} kohteen.
+        other: Voit valita enintään {{count}} kohdetta.
+      min_content_not_reached:
+        one: Valitse ainakin {{count}} kohde.
+        other: Valitse ainakin {{count}} kohdetta.
     emoji_picker:
       filter_placeholder: Etsi emojia
       people: Ihmiset
@@ -1079,6 +1139,13 @@ fi:
       medium_tone: Ruskea ihonväri
       medium_dark_tone: Tummanruskea ihonväri
       dark_tone: Tumma ihonväri
+    shared_drafts:
+      title: "Jaetut luonnokset"
+      notice: "Tämä ketju näkyy vain niille, jotka näkevät <b>{{category}}</b> -alueen."
+      destination_category: "Kohdealue"
+      publish: "Julkaise jaettu luonnos"
+      confirm_publish: "Haluatko varmasti julkaista luonnoksen?"
+      publishing: "Julkaistaan ketjua..."
     composer:
       emoji: "Emoji :)"
       more_emoji: "lisää..."
@@ -1095,9 +1162,10 @@ fi:
       saved_local_draft_tip: "tallennettu omalla koneella"
       similar_topics: "Tämä ketju vaikuttaa samalta kuin.."
       drafts_offline: "offline luonnokset"
+      group_mentioned_limit: "<b>Varoitus!</b> Mainitsit ryhmän <a href='{{group_link}}'>{{group}}</a>, mutta ylläpitäjä on määrittänyt mainintojen enimmäismääräksi {{max}} käyttäjää, minkä tämän ryhmän jäsenmäärä ylittää. Kukaan ei saa ilmoitusta. "
       group_mentioned:
-        one: "Jos mainitset ryhmän {{group}},  <a href='{{group_link}}'>1 käyttäjä</a> saa ilmoituksen – oletko varma?"
-        other: "Jos mainitset ryhmän {{group}}, <a href='{{group_link}}'>{{count}} käyttäjää</a> saa ilmoituksen – oletko varma?"
+        one: Jos mainitset ryhmän {{group}},  <a href='{{group_link}}'>1 käyttäjä</a> saa ilmoituksen – oletko varma?
+        other: Jos mainitset ryhmän {{group}}, <a href='{{group_link}}'>{{count}} käyttäjää</a> saa ilmoituksen – oletko varma?
       cannot_see_mention:
         category: "Mainitsit käyttäjän {{username}} mutta hän ei saa ilmoitusta, koska hänellä ei ole pääsyä tälle alueelle. Hänet tulee lisätä ryhmään, jolla on pääsy alueelle."
         private: "Mainitsit käyttäjän {{username}} mutta hän ei saa ilmoitusta, koska hän ei näe tätä yksityiskeskustelua. Hänet tulee kutsua tähän yksityiskeskusteluun."
@@ -1110,6 +1178,7 @@ fi:
         post_length: "Viestissä täytyy olla vähintään {{min}} merkkiä"
         try_like: 'Oletko jo kokeillut <i class="fa fa-heart"></i>-nappia?'
         category_missing: "Sinun täytyy valita viestille alue"
+        tags_missing: "Valitse vähintään {{count}} tunnistetta"
       save_edit: "Tallenna"
       reply_original: "Vastaa alkuperäiseen ketjuun"
       reply_here: "Vastaa tänne"
@@ -1118,6 +1187,8 @@ fi:
       create_topic: "Aloita ketju"
       create_pm: "Viesti"
       create_whisper: "Kuiskaa"
+      create_shared_draft: "Luo jaettu luonnos"
+      edit_shared_draft: "Muokkaa jaettua luonnosta"
       title: "Tai paina Ctrl+Enter"
       users_placeholder: "Lisää käyttäjä"
       title_placeholder: "Kuvaile lyhyesti mistä tässä ketjussa on kyse?"
@@ -1127,6 +1198,8 @@ fi:
       topic_featured_link_placeholder: "Tähän linkki, joka näytetään otsikon yhteydessä."
       remove_featured_link: "Poista ketjulinkki"
       reply_placeholder: "Kirjoita tähän. Käytä Markdownia, BBCodea tai HTML:ää muotoiluun. Raahaa tai liitä kuvia."
+      reply_placeholder_no_images: "Kirjoita tähän. Muotoile Markdown, BBCode tai HTML-syntaksilla."
+      reply_placeholder_choose_category: "Valitse alue ennen kuin kirjoitat tähän."
       view_new_post: "Katsele uutta viestiäsi."
       saving: "Tallennetaan"
       saved: "Tallennettu!"
@@ -1156,6 +1229,7 @@ fi:
       olist_title: "Numeroitu lista"
       ulist_title: "Luettelomerkillinen luettelo"
       list_item: "Listan alkio"
+      toggle_direction: "Vaihda suuntaa"
       help: "Markdown apu"
       collapse: "pienennä kirjoitusalue"
       abandon: "sulje kirjoitusalue ja poista luonnos"
@@ -1166,14 +1240,35 @@ fi:
         title: "Unohditko lisätä vastaanottajia?"
         body: "Olet lähettämässä viestiä vain itsellesi!"
       admin_options_title: "Tämän ketjun vain henkilökunnalle näytettävät asetukset"
+      composer_actions:
+        reply_to_post:
+          label: "Vastaus käyttäjän %{postUsername} viestiin %{postNumber}"
+          desc: Vastaa tiettyyn viestiin
+        reply_as_new_topic:
+          label: Vastaa sivuavassa ketjussa
+          desc: "Aloita uusi, tähän ketjuun linkittyvä ketju"
+        reply_as_private_message:
+          label: Uusi viesti
+          desc: Aloita uusi yksityiskeskustelu
+        reply_to_topic:
+          label: Vastaa ketjuun
+          desc: Vastaa ketjuun muttei mihinkään tiettyyn viestiin
+        toggle_whisper:
+          label: Kuiskaus päälle/pois
+          desc: Kuiskaukset näkyvät vain henkilökuntalaisille
+        create_topic:
+          label: "Uusi ketju"
+        shared_draft:
+          label: "Jaettu luonnos"
+          desc: "Luonnostele ketju, joka näkyy vain henkilökunnalle"
     notifications:
       tooltip:
         regular:
-          one: "Uusi ilmoitus"
-          other: "{{count}} uutta ilmoitusta"
+          one: Uusi ilmoitus
+          other: '{{count}} uutta ilmoitusta'
         message:
-          one: "Uusi yksityisviesti"
-          other: "{{count}} uutta yksityisviestiä"
+          one: Uusi yksityisviesti
+          other: '{{count}} uutta yksityisviestiä'
       title: "ilmoitukset @nimeen viittauksista, vastauksista omiin viesteihin ja ketjuihin, viesteistä ym."
       none: "Ilmoitusten lataaminen ei onnistunut."
       empty: "Ilmoituksia ei löydetty."
@@ -1188,8 +1283,8 @@ fi:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} ja 1 muu</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} ja {{count}} muuta</span> {{description}}"
+        one: <span>{{username}}, {{username2}} ja 1 muu</span> {{description}}
+        other: <span>{{username}}, {{username2}} ja {{count}} muuta</span> {{description}}
       private_message: "<span>{{username}}</span> {{description}}"
       invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
       invited_to_topic: "<span>{{username}}</span> {{description}}"
@@ -1200,32 +1295,18 @@ fi:
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>Uusi ketju</span> {{description}}"
       group_message_summary:
-        one: "{{count}} viesti ryhmän {{group_name}} saapuneissa"
-        other: "{{count}} viestiä ryhmän {{group_name}} saapuneissa"
-      alt:
-        mentioned: "Mainitsija"
-        quoted: "Lainaaja"
-        replied: "Vastasi"
-        posted: "Kirjoittaja"
-        edited: "Viestieäsi muokkasi"
-        liked: "Viestistäsi tykkäsi"
-        private_message: "Yksityisviesti lähettäjältä"
-        invited_to_private_message: "Kutsu yksityisviestiin käyttäjältä"
-        invited_to_topic: "Kutsu ketjuun käyttäjältä"
-        invitee_accepted: "Kutsun hyväksyi"
-        moved_post: "Viestisi siirsi"
-        linked: "Linkki viestiisi"
-        granted_badge: "Ansiomerkki myönnetty"
-        group_message_summary: "Viestejä ryhmän saapuneissa viesteissä."
-        topic_reminder: "Muistutus"
+        one: '{{count}} viesti ryhmän {{group_name}} saapuneissa'
+        other: '{{count}} viestiä ryhmän {{group_name}} saapuneissa'
       popup:
         mentioned: '{{username}} mainitsi sinut ketjussa "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} mainitsi sinut ketjussa "{{topic}}" - {{site_title}}'
         quoted: '{{username}} lainasi sinua ketjussa "{{topic}}" - {{site_title}}'
         replied: '{{username}} vastasi sinulle ketjussa "{{topic}}" - {{site_title}}'
         posted: '{{username}} vastasi ketjuun "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} lähetti sinulle yksityisviestin ketjussa "{{topic}}" - {{site_title}}'
+        private_message: '{{username}} lähetti sinulle yksityisviestin keskustelussa "{{topic}}" - {{site_title}}'
         linked: '{{username}} linkitti viestiisi ketjusta "{{topic}}" - {{site_title}}'
+        confirm_title: 'Ilmoitukset käytössä - %{site_title}'
+        confirm_body: 'Onnistui! Ilmoitukset ovat nyt käytössä.'
     upload_selector:
       title: "Lisää kuva"
       title_with_attachments: "Lisää kuva tai tiedosto"
@@ -1251,7 +1332,11 @@ fi:
       select_all: "Valitse kaikki"
       clear_all: "Tyhjennä kaikki"
       too_short: "Hakusana on liian lyhyt."
+      result_count:
+        one: <span>1 tulos haulle</span><span class='term'>{{term}}</span>
+        other: <span>{{count}}{{plus}} tulosta haulle</span><span class='term'>{{term}}</span>
       title: "etsi ketjuja, viestejä, käyttäjiä tai alueita"
+      full_page_title: "etsi ketjuja tai viestejä"
       no_results: "Ei tuloksia."
       no_more_results: "Enempää tuloksia ei löytynyt."
       searching: "Etsitään ..."
@@ -1283,6 +1368,7 @@ fi:
           label: Ketjulla on tunniste
         filters:
           label: Tuloksiin vain ketjuja/viestejä...
+          title: Etsi vain otsikoista
           likes: joista olen tykännyt
           posted: joihin olen kirjoittanut
           watching: joita tarkkailen
@@ -1339,8 +1425,8 @@ fi:
         notification_level: "Ilmoitukset"
         choose_new_category: "Valitse uusi alue ketjuille:"
         selected:
-          one: "Olet valinnut <b>yhden</b> ketjun."
-          other: "Olet valinnut <b>{{count}}</b> ketjua."
+          one: Olet valinnut <b>yhden</b> ketjun.
+          other: Olet valinnut <b>{{count}}</b> ketjua.
         change_tags: "Korvaa tunnisteet"
         append_tags: "Lisää tunnisteita"
         choose_new_tags: "Valitse tunnisteet näille ketjuille:"
@@ -1372,14 +1458,12 @@ fi:
         bookmarks: "Merkattuja ketjuja ei ole enempää."
         search: "Hakutuloksia ei ole enempää."
     topic:
-      unsubscribe:
-        stop_notifications: "Saat tästä lähtien vähemmän ilmoituksia aiheesta <strong>{{title}}</strong>"
-        change_notification_state: "Nykyinen ilmoitusasetuksesti on"
       filter_to:
-        one: "1 viesti ketjussa"
-        other: "{{count}} viestiä ketjussa"
+        one: 1 viesti ketjussa
+        other: '{{count}} viestiä ketjussa'
       create: 'Uusi ketju'
       create_long: 'Aloita uusi ketju'
+      open_draft: "Avaa luonnos"
       private_message: 'Luo viesti'
       archive_message:
         help: 'Siirrä viesti arkistoosi'
@@ -1387,14 +1471,17 @@ fi:
       move_to_inbox:
         title: 'Siirrä saapuneisiin'
         help: 'Siirrä takaisin saapuneisiin.'
+      edit_message:
+        help: 'Muokkaa keskustelun ensimmäistä viestiä'
+        title: 'Muokkaa viestiä'
       list: 'Ketjut'
       new: 'uusi ketju'
       unread: 'lukematta'
       new_topics:
-        one: '1 uusi ketju'
+        one: 1 uusi ketju
         other: '{{count}} uutta ketjua'
       unread_topics:
-        one: '1 ketju lukematta'
+        one: 1 ketju lukematta
         other: '{{count}} ketjua lukematta'
       title: 'Aihe'
       invalid_access:
@@ -1408,17 +1495,17 @@ fi:
         title: "Ketjua ei löytynyt"
         description: "Pahoittelut, ketjua ei löytynyt. Ehkäpä valvoja on siirtänyt sen muualle?"
       total_unread_posts:
-        one: "sinulla on 1 lukematon viesti tässä ketjussa"
-        other: "sinulla on {{count}} lukematonta viestiä tässä ketjussa"
+        one: sinulla on 1 lukematon viesti tässä ketjussa
+        other: sinulla on {{count}} lukematonta viestiä tässä ketjussa
       unread_posts:
-        one: "yksi vanha viesti on lukematta tässä ketjussa"
-        other: "{{count}} vanhaa viestiä on lukematta tässä ketjussa"
+        one: yksi vanha viesti on lukematta tässä ketjussa
+        other: '{{count}} vanhaa viestiä on lukematta tässä ketjussa'
       new_posts:
-        one: "tähän ketjuun on tullut yksi uusi viesti sen jälkeen, kun edellisen kerran luit sen"
-        other: "tähän ketjuun on tullut {{count}} uutta viestiä sen jälkeen, kun edellisen kerran luit sen"
+        one: tähän ketjuun on tullut yksi uusi viesti sen jälkeen, kun edellisen kerran luit sen
+        other: tähän ketjuun on tullut {{count}} uutta viestiä sen jälkeen, kun edellisen kerran luit sen
       likes:
-        one: "tässä ketjussa on yksi tykkäys"
-        other: "tässä ketjussa on {{count}} tykkäystä"
+        one: tässä ketjussa on yksi tykkäys
+        other: tässä ketjussa on {{count}} tykkäystä
       back_to_list: "Takaisin ketjulistaan"
       options: "Ketjun asetukset"
       show_links: "näytä tämän ketjun linkit"
@@ -1428,7 +1515,7 @@ fi:
       read_more_MF: "Sinulla on { UNREAD, plural, =0 {} one { <a href='/unread'>1 ketju</a>, jossa on viestejä } other { <a href='/unread'># ketjua</a>, joissa on viestejä }} { NEW, plural, =0 {} one { {BOTH, select, true{ja } false { } other{}} <a href='/new'>1 uusi</a> ketju} other { {BOTH, select, true{ja } false { } other{}} <a href='/new'># uutta ketjua</a>} } lukematta. Tai {CATEGORY, select, true {selaile aluetta {catLink}} false {katsele {latestLink}.} other {}}"
       browse_all_categories: Selaa keskustelualueita
       view_latest_topics: tuoreimpia ketjuja
-      suggest_create_topic: Jospa aloittaisit uuden ketjun?
+      suggest_create_topic: "Jospa aloittaisit uuden ketjun?"
       jump_reply_up: hyppää aiempaan vastaukseen
       jump_reply_down: hyppää myöhempään vastaukseen
       deleted: "Tämä ketju on poistettu"
@@ -1482,8 +1569,8 @@ fi:
         auto_reminder: "Sinua muistutetaan tästä ketjusta %{timeLeft}."
       auto_close_title: 'Automaattisen sulkemisen asetukset'
       auto_close_immediate:
-        one: "Ketjun viimeisin viesti on jo tunnin vanha, joten ketju suljetaan heti."
-        other: "Ketjun viimeisin viesti on jo %{hours} tuntia vanha, joten ketju suljetaan heti."
+        one: Ketjun viimeisin viesti on jo tunnin vanha, joten ketju suljetaan heti.
+        other: Ketjun viimeisin viesti on jo %{hours} tuntia vanha, joten ketju suljetaan heti.
       timeline:
         back: "Takaisin"
         back_description: "Siirry takaisin ensimmäiseen lukemattomaan viestiin"
@@ -1501,24 +1588,24 @@ fi:
         total: yhteensä viestejä
         current: tämänhetkinen viesti
       notifications:
-        title: muuta sitä, kuinka usein saat muistutuksia tästä ketjusta
+        title: "muuta sitä, kuinka usein saat muistutuksia tästä ketjusta"
         reasons:
           mailing_list_mode: "Olet postituslistatilassa, joten saat sähköpostia tähän ketjuun lähetyistä vastauksista."
-          '3_10': 'Saat ilmoituksia, koska tarkkailet tähän ketjuun liittyvää tunnistetta.'
-          '3_6': 'Saat ilmoituksia, koska olet asettanut tämän alueen tarkkailuun.'
-          '3_5': 'Saat ilmoituksia, koska ketju on asetettu tarkkailuun automaattisesti.'
-          '3_2': 'Saat ilmoituksia, koska olet asettanut ketjun tarkkailuun.'
-          '3_1': 'Saat ilmoituksia, koska aloitit tämän ketjun.'
-          '3': 'Saat ilmoituksia, koska olet asettanut ketjun tarkkailuun.'
-          '2_8': 'Näet uusien vastausten määrän, koska olet asettanut tämän alueen seurantaan.'
-          '2_4': 'Näet uusien vastausten määrän, koska olet kirjoittanut ketjuun.'
-          '2_2': 'Näet uusien vastausten määrän, koska olet asettanut ketjun seurantaan.'
-          '2': 'Näet uusien vastausten määrän, koska <a href="/u/{{username}}/preferences">luit ketjua aiemmin</a>.'
-          '1_2': 'Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle.'
-          '1': 'Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle.'
-          '0_7': 'Et saa mitään ilmoituksia tältä alueelta.'
-          '0_2': 'Et saa mitään ilmoituksia tästä ketjusta.'
-          '0': 'Et saa mitään ilmoituksia tästä ketjusta.'
+          "3_10": 'Saat ilmoituksia, koska tarkkailet tähän ketjuun liittyvää tunnistetta.'
+          "3_6": 'Saat ilmoituksia, koska olet asettanut tämän alueen tarkkailuun.'
+          "3_5": 'Saat ilmoituksia, koska ketju on asetettu tarkkailuun automaattisesti.'
+          "3_2": 'Saat ilmoituksia, koska olet asettanut ketjun tarkkailuun.'
+          "3_1": 'Saat ilmoituksia, koska aloitit tämän ketjun.'
+          "3": 'Saat ilmoituksia, koska olet asettanut ketjun tarkkailuun.'
+          "2_8": 'Näet uusien vastausten määrän, koska olet asettanut tämän alueen seurantaan.'
+          "2_4": 'Näet uusien vastausten määrän, koska olet kirjoittanut ketjuun.'
+          "2_2": 'Näet uusien vastausten määrän, koska olet asettanut ketjun seurantaan.'
+          "2": 'Näet uusien vastausten määrän, koska <a href="/u/{{username}}/preferences">luit ketjua aiemmin</a>.'
+          "1_2": 'Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle.'
+          "1": 'Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle.'
+          "0_7": 'Et saa mitään ilmoituksia tältä alueelta.'
+          "0_2": 'Et saa mitään ilmoituksia tästä ketjusta.'
+          "0": 'Et saa mitään ilmoituksia tästä ketjusta.'
         watching_pm:
           title: "Tarkkaile"
           description: "Saat ilmoituksen kaikista uusista vastauksista tässä viestiketjussa ja uusien vastausten lukumäärä näytetään."
@@ -1558,7 +1645,7 @@ fi:
         visible: "Näytä listauksissa"
         reset_read: "Poista tieto lukemisista"
         make_public: "Tee ketjusta julkinen"
-        make_private: "Tee ketjusta yksityinen"
+        make_private: "Muuta yksityiskeskusteluksi"
       feature:
         pin: "Kiinnitä ketju"
         unpin: "Poista ketjun kiinnitys"
@@ -1591,8 +1678,8 @@ fi:
         pin_validation: "Päivämäärä vaaditaan kiinnittämään tämä ketju"
         not_pinned: "Alueella {{categoryLink}} ei ole kiinnitettyjä ketjuja."
         already_pinned:
-          one: "Kiinnitettyjä ketjuja alueella {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
-          other: "Alueelle {{categoryLink}} kiinnitettyjä ketjuja: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: 'Kiinnitettyjä ketjuja alueella {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Alueelle {{categoryLink}} kiinnitettyjä ketjuja: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         pin_globally: "Kiinnitä tämä ketju kaikkien alueiden ylimmäiseksi, kunnes"
         confirm_pin_globally: "Olet kiinnittänyt jo {{count}} ketjua kaikille alueille. Liian monta kiinnitettyä ketjua voi olla liian suuri taakka uusille ja kirjautumattomille käyttäjille. Oletko varma, että haluat kiinnittä vielä uuden ketjun kaikille alueille?"
         unpin_globally: "Älä enää pidä tätä ketjua kaikkien alueiden ylimmäisenä."
@@ -1600,8 +1687,8 @@ fi:
         global_pin_note: "Käyttäjät voivat poistaa ketjun kiinnityksen itseltään."
         not_pinned_globally: "Yhtään ketjua ei ole kiinnitetty koko palstalle."
         already_pinned_globally:
-          one: "Koko palstalle kiinnitettyjä ketjuja: <strong class='badge badge-notification unread'>1</strong>"
-          other: "Koko palstalle kiinnitettyjä ketjuja: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: 'Koko palstalle kiinnitettyjä ketjuja: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Koko palstalle kiinnitettyjä ketjuja: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         make_banner: "Tee tästä ketjusta banneri, joka näytetään kaikkien sivujen ylimmäisenä."
         remove_banner: "Poista banneri, joka näytetään kaikkien sivujen ylimmäisenä."
         banner_note: "Käyttäjät voivat piilottaa bannerin sulkemalla sen. Vain yksi ketju kerrallaan voi olla banneri."
@@ -1638,8 +1725,8 @@ fi:
       login_reply: 'Kirjaudu sisään vastataksesi'
       filters:
         n_posts:
-          one: "1 viesti"
-          other: "{{count}} viestiä"
+          one: 1 viesti
+          other: '{{count}} viestiä'
         cancel: "Poista suodatin"
       split_topic:
         title: "Siirrä uuteen ketjuun"
@@ -1647,15 +1734,15 @@ fi:
         topic_name: "Uuden ketjun otsikko"
         error: "Viestien siirtämisessä uuteen ketjuun tapahtui virhe."
         instructions:
-          one: "Olet luomassa uutta ketjua valitsemastasi viestistä."
-          other: "Olet aloittamassa uutta ketjua valitsemistasi <b>{{count}}</b> viestistä."
+          one: Olet luomassa uutta ketjua valitsemastasi viestistä.
+          other: Olet aloittamassa uutta ketjua valitsemistasi <b>{{count}}</b> viestistä.
       merge_topic:
         title: "Siirrä olemassa olevaan ketjuun"
         action: "siirrä olemassa olevaan ketjuun"
         error: "Viestien siirtämisessä ketjuun tapahtui virhe."
         instructions:
-          one: "Valitse ketju, johon haluat siirtää valitun viestin."
-          other: "Valitse ketju, johon haluat siirtää valitut <b>{{count}}</b> viestiä."
+          one: Valitse ketju, johon haluat siirtää valitun viestin.
+          other: Valitse ketju, johon haluat siirtää valitut <b>{{count}}</b> viestiä.
       merge_posts:
         title: "Yhdistä valitut viestit"
         action: "yhdistä valitut viestit"
@@ -1667,9 +1754,9 @@ fi:
         label: "Viestin uusi omistaja"
         placeholder: "uuden omistajan käyttäjätunnus"
         instructions:
-          one: "Valitse uusi omistaja viestille käyttäjältä <b>{{old_user}}</b>."
-          other: "Valitse uusi omistaja {{count}} viestille käyttäjältä <b>{{old_user}}</b>."
-        instructions_warn: "Huomaa, että viestin ilmoitukset eivät siirry uudelle käyttäjälle automaattisesti. <br> Varoitus: Tällä hetkellä mikään viestikohtainen data ei siirry uudelle käyttäjälle. Käytä varoen."
+          one: Valitse uusi omistaja viestille käyttäjältä <b>{{old_user}}</b>.
+          other: Valitse uusi omistaja {{count}} viestille käyttäjältä <b>{{old_user}}</b>.
+        instructions_warn: "Huomioi, ettei viestiin liittyviä ilmoituksia siirretä viestin uudelle omistajalle näin jälkikäteen."
       change_timestamp:
         title: "Muuta aikaleimaa..."
         action: "muuta aikaleimaa"
@@ -1699,8 +1786,6 @@ fi:
           one: Olet valinnut <b>yhden</b> viestin.
           other: Olet valinnut <b>{{count}}</b> viestiä.
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Lainaa"
       edit: "<i class='fa fa-pencil'></i> {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Syy:"
@@ -1714,26 +1799,28 @@ fi:
       show_full: "Näytä koko viesti"
       show_hidden: 'Näytä piilotettu sisältö.'
       deleted_by_author:
-        one: "(kirjoittaja on perunut viestin ja se poistetaan automaattisesti tunnin kuluttua, paitsi jos se liputetaan)"
-        other: "(kirjoittaja on perunut viestin ja se poistetaan automaattisesti %{count} tunnin kuluttua, paitsi jos se liputetaan)"
+        one: (kirjoittaja on perunut viestin ja se poistetaan automaattisesti tunnin kuluttua, paitsi jos se liputetaan)
+        other: (kirjoittaja on perunut viestin ja se poistetaan automaattisesti %{count} tunnin kuluttua, paitsi jos se liputetaan)
+      collapse: "kutista"
       expand_collapse: "laajenna/pienennä"
+      locked: "henkilökunnan jäsen on estänyt tämän viestin muokkaamisen"
       gap:
-        one: "näytä 1 piilotettu vastaus"
-        other: "näytä {{count}} piilotettua vastausta"
+        one: näytä 1 piilotettu vastaus
+        other: näytä {{count}} piilotettua vastausta
       unread: "Viesti on lukematta"
       has_replies:
-        one: "{{count}} vastaus"
-        other: "{{count}} vastausta"
+        one: '{{count}} vastaus'
+        other: '{{count}} vastausta'
       has_likes:
-        one: "{{count}} tykkäys"
-        other: "{{count}} tykkäystä"
+        one: '{{count}} tykkäys'
+        other: '{{count}} tykkäystä'
       has_likes_title:
-        one: "1 käyttäjä tykkäsi tästä viestistä"
-        other: "{{count}} käyttäjää tykkäsi tästä viestistä"
+        one: 1 käyttäjä tykkäsi tästä viestistä
+        other: '{{count}} käyttäjää tykkäsi tästä viestistä'
       has_likes_title_only_you: "tykkäsit tästä viestistä"
       has_likes_title_you:
-        one: "Sinä ja yksi toinen tykkäsi tästä viestistä"
-        other: "Sinä ja {{count}} muuta tykkäsi tästä viestistä"
+        one: Sinä ja yksi toinen tykkäsi tästä viestistä
+        other: Sinä ja {{count}} muuta tykkäsi tästä viestistä
       errors:
         create: "Pahoittelut, viestin luonti ei onnistunut. Ole hyvä ja yritä uudelleen."
         edit: "Pahoittelut, viestin muokkaus ei onnistunut. Ole hyvä ja yritä uudelleen."
@@ -1773,11 +1860,11 @@ fi:
         delete_replies:
           confirm: "Haluatko poistaa myös tähän viestiin liittyvät vastaukset?"
           direct_replies:
-            one: "Kyllä, ja yksi suora vastaus"
-            other: "Kyllä, ja {{count}} suoraa vastausta"
+            one: Kyllä, ja yksi suora vastaus
+            other: Kyllä, ja {{count}} suoraa vastausta
           all_replies:
-            one: "Kyllä, ja yksi vastaus"
-            other: "Kyllä, ja kaikki {{count}} vastausta"
+            one: Kyllä, ja yksi vastaus
+            other: Kyllä, ja kaikki {{count}} vastausta
           just_the_post: "Ei, vain tämä viesti"
         admin: "viestin ylläpitotoimet"
         wiki: "Tee wiki"
@@ -1787,11 +1874,16 @@ fi:
         rebake: "Tee HTML uudelleen"
         unhide: "Poista piilotus"
         change_owner: "Vaihda omistajuutta"
+        grant_badge: "Myönnä ansiomerkki"
+        lock_post: "Lukitse viesti"
+        lock_post_description: "estä kirjoittajaa muokkaamasta tätä viestiä"
+        unlock_post: "Vapauta viesti"
+        unlock_post_description: "salli kirjoittajan muokata viestiä"
       actions:
         flag: 'Liputa'
         defer_flags:
-          one: "Sivuuta lippu"
-          other: "Sivuuta liput"
+          one: Sivuuta lippu
+          other: Sivuuta liput
         undo:
           off_topic: "Peru lippu"
           spam: "Peru lippu"
@@ -1808,8 +1900,8 @@ fi:
           bookmark: "lisäsi tämän kirjanmerkkeihin"
           like: "tykkäsi tästä"
           like_capped:
-            one: "ja {{count}} muu tykkäsi tästä"
-            other: "ja {{count}} muuta tykkäsi tästä"
+            one: ja {{count}} muu tykkäsi tästä
+            other: ja {{count}} muuta tykkäsi tästä
           vote: "äänesti tätä"
         by_you:
           off_topic: "Liputit tämän eksyvän aiheesta"
@@ -1822,62 +1914,62 @@ fi:
           vote: "Olet äänestänyt tätä viestiä"
         by_you_and_others:
           off_topic:
-            one: "Sinä ja toinen käyttäjä liputitte tämän eksyvän aiheesta"
-            other: "Sinä ja {{count}} muuta liputitte tämän eksyvän aiheesta"
+            one: Sinä ja toinen käyttäjä liputitte tämän eksyvän aiheesta
+            other: Sinä ja {{count}} muuta liputitte tämän eksyvän aiheesta
           spam:
-            one: "Sinä ja toinen käyttäjä liputitte tämän roskapostiksi"
-            other: "Sinä ja {{count}} muuta liputitte tämän roskapostiksi"
+            one: Sinä ja toinen käyttäjä liputitte tämän roskapostiksi
+            other: Sinä ja {{count}} muuta liputitte tämän roskapostiksi
           inappropriate:
-            one: "Sinä ja toinen käyttäjä liputitte tämän sopimattomaksi"
-            other: "Sinä ja {{count}} muuta liputitte tämän sopimattomaksi"
+            one: Sinä ja toinen käyttäjä liputitte tämän sopimattomaksi
+            other: Sinä ja {{count}} muuta liputitte tämän sopimattomaksi
           notify_moderators:
-            one: "Sinä ja toinen käyttäjä liputitte tämän valvojille tiedoksi"
-            other: "Sinä ja {{count}} muuta liputitte tämän valvojille tiedoksi"
+            one: Sinä ja toinen käyttäjä liputitte tämän valvojille tiedoksi
+            other: Sinä ja {{count}} muuta liputitte tämän valvojille tiedoksi
           notify_user:
-            one: "Sinä ja toinen käyttäjä lähetitte tälle käyttäjälle yksityisviestin"
-            other: "Sinä ja {{count}} muuta lähetitte tälle käyttäjälle viestin"
+            one: Sinä ja toinen käyttäjä lähetitte tälle käyttäjälle yksityisviestin
+            other: Sinä ja {{count}} muuta lähetitte tälle käyttäjälle viestin
           bookmark:
-            one: "Sinä ja toinen käyttäjä lisäsitte tämän kirjanmerkkeihinne"
-            other: "Sinä ja {{count}} muuta lisäsitte tämän kirjanmerkkeihinne"
+            one: Sinä ja toinen käyttäjä lisäsitte tämän kirjanmerkkeihinne
+            other: Sinä ja {{count}} muuta lisäsitte tämän kirjanmerkkeihinne
           like:
-            one: "Sinä ja toinen käyttäjä tykkäsitte tästä"
-            other: "Sinä ja {{count}} muuta tykkäsitte tästä"
+            one: Sinä ja toinen käyttäjä tykkäsitte tästä
+            other: Sinä ja {{count}} muuta tykkäsitte tästä
           vote:
-            one: "Sinä ja toinen käyttäjä äänestitte tätä viestiä"
-            other: "Sinä ja {{count}} muuta äänestitte tätä viestiä"
+            one: Sinä ja toinen käyttäjä äänestitte tätä viestiä
+            other: Sinä ja {{count}} muuta äänestitte tätä viestiä
         by_others:
           off_topic:
-            one: "Yksi liputti tämän eksyvän aiheesta"
-            other: "{{count}} käyttäjää liputtivat tämän eksyvän aiheesta"
+            one: Yksi liputti tämän eksyvän aiheesta
+            other: '{{count}} käyttäjää liputtivat tämän eksyvän aiheesta'
           spam:
-            one: "yksi käyttäjä liputti tämän roskapostiksi"
-            other: "{{count}} käyttäjää liputti tämän roskapostiksi"
+            one: yksi käyttäjä liputti tämän roskapostiksi
+            other: '{{count}} käyttäjää liputti tämän roskapostiksi'
           inappropriate:
-            one: "yksi liputti tämän sopimattomaksi"
-            other: "{{count}} käyttäjää liputti tämän sopimattomaksi"
+            one: yksi liputti tämän sopimattomaksi
+            other: '{{count}} käyttäjää liputti tämän sopimattomaksi'
           notify_moderators:
-            one: "yksi käyttäjä liputti tämän tiedoksi valvojalle"
-            other: "{{count}} käyttäjää liputti tämän tiedoksi valvojalle"
+            one: yksi käyttäjä liputti tämän tiedoksi valvojalle
+            other: '{{count}} käyttäjää liputti tämän tiedoksi valvojalle'
           notify_user:
-            one: "1 henkilö lähetti tälle käyttäjälle yksityisviestin"
-            other: "{{count}} henkilöä on lähettänyt tälle käyttäjälle yksityisviestin"
+            one: 1 henkilö lähetti tälle käyttäjälle yksityisviestin
+            other: '{{count}} henkilöä on lähettänyt tälle käyttäjälle yksityisviestin'
           bookmark:
-            one: "yksi käyttäjä lisäsi tämän viestin kirjanmerkkeihinsä"
-            other: "{{count}} käyttäjää lisäsi tämän veistin kirjanmerkkeihinsä"
+            one: yksi käyttäjä lisäsi tämän viestin kirjanmerkkeihinsä
+            other: '{{count}} käyttäjää lisäsi tämän veistin kirjanmerkkeihinsä'
           like:
-            one: "yksi käyttäjä tykkäsi tästä"
-            other: "{{count}} käyttäjää tykkäsi tästä"
+            one: yksi käyttäjä tykkäsi tästä
+            other: '{{count}} käyttäjää tykkäsi tästä'
           vote:
-            one: "yksi käyttäjä äänesti tätä viestiä"
-            other: "{{count}} käyttäjää äänesti tätä viestiä"
+            one: yksi käyttäjä äänesti tätä viestiä
+            other: '{{count}} käyttäjää äänesti tätä viestiä'
       delete:
         confirm:
-          one: "Oletko varma, että haluat poistaa viestin?"
-          other: "Oletko varma, että haluat poistaa {{count}} viestiä?"
+          one: Oletko varma, että haluat poistaa viestin?
+          other: Oletko varma, että haluat poistaa {{count}} viestiä?
       merge:
         confirm:
-          one: "Oletko varma, että haluat yhdistää nämä viestit?"
-          other: "Oletko varma, että haluat yhdistää nämä {{count}} viestiä?"
+          one: Oletko varma, että haluat yhdistää nämä viestit?
+          other: Oletko varma, että haluat yhdistää nämä {{count}} viestiä?
       revisions:
         controls:
           first: "Ensimmäinen revisio"
@@ -1960,7 +2052,7 @@ fi:
       email_in_disabled: "Uusien ketjujen aloittaminen sähköpostitse on otettu pois käytöstä sivuston asetuksissa. Salliaksesi uusien ketjujen luomisen sähköpostilla, "
       email_in_disabled_click: 'ota käyttöön "email in" asetus.'
       mailinglist_mirror: "Alue jäljittelee postituslistaa"
-      suppress_from_homepage: "Vaimenna alue kotisivulta."
+      suppress_from_latest: "Vaimenna alue Tuoreimmat-näkymästä"
       show_subcategory_list: "Näytä lista tytäralueista ketjujen yläpuolella tällä alueella."
       num_featured_topics: "Kuinka monta ketjua näytetään Keskustelualueet-sivulla:"
       subcategory_num_featured_topics: "Kuinka monta ketjua näytetään emoalueen sivulla:"
@@ -1977,6 +2069,7 @@ fi:
       default_position: "Oletuspaikka"
       position_disabled: "Alueet näytetään aktiivisuusjärjestyksessä. Muokataksesi järjestystä,"
       position_disabled_click: 'ota käyttöön "pysyvä aluejärjestys" asetuksista.'
+      minimum_required_tags: 'Kuinka monta tunnistetta ketjulla täytyy vähintään olla:'
       parent: "Emoalue"
       notifications:
         watching:
@@ -1984,7 +2077,7 @@ fi:
           description: "Tarkkailet kaikkia ketjuja näillä alueilla. Saat ilmoituksen jokaisesta uudesta viestistä missä tahansa ketjussa, ja uusien vastausten määrä näytetään."
         watching_first_post:
           title: "Tarkkaile uusia ketjuja"
-          description: "Saat ilmoituksen näillä alueilla aloitetuista ketjuista."
+          description: "Saat ilmoituksen vain ketjunaloituksista näillä alueilla."
         tracking:
           title: "Seuraa"
           description: "Seuraat kaikkia ketjuja näillä alueilla. Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle, ja uusien vastausten määrä näytetään."
@@ -2034,14 +2127,14 @@ fi:
       custom_placeholder_notify_moderators: "Kerro ymmärrettävästi ja selvästi, mistä olet huolestunut ja lisää viestiin oleelliset esimerkit ja linkit, jos mahdollista."
       custom_message:
         at_least:
-          one: "syötä vähintään 1 merkki"
-          other: "syötä vähintään {{count}} merkkiä"
+          one: syötä vähintään 1 merkki
+          other: syötä vähintään {{count}} merkkiä
         more:
-          one: "Vielä 1..."
-          other: "Vielä {{count}}..."
+          one: Vielä 1...
+          other: Vielä {{count}}...
         left:
-          one: "1 jäljellä"
-          other: "{{count}} jäljellä"
+          one: 1 jäljellä
+          other: '{{count}} jäljellä'
     flagging_topic:
       title: "Kiitos avustasi yhteisön hyväksi!"
       action: "Liputa ketju"
@@ -2052,13 +2145,13 @@ fi:
       links_title: "Suositut linkit"
       links_shown: "näytä enemmän linkkejä..."
       clicks:
-        one: "1 klikkaus"
-        other: "%{count} klikkausta"
+        one: 1 klikkaus
+        other: '%{count} klikkausta'
     post_links:
       about: "laajenna lisää linkkejä tähän viestiin"
       title:
-        one: "1 lisää"
-        other: "%{count} lisää"
+        one: 1 lisää
+        other: '%{count} lisää'
     topic_statuses:
       warning:
         help: "Tämä on virallinen varoitus."
@@ -2092,22 +2185,22 @@ fi:
     original_post: "Aloitusviesti"
     views: "Katseluita"
     views_lowercase:
-      one: "katselu"
-      other: "katselut"
+      one: katselu
+      other: katselut
     replies: "Vastauksia"
     views_long:
-      one: "ketjua on katseltu yhden kerran"
-      other: "ketjua on katseltu {{number}} kertaa"
+      one: ketjua on katseltu yhden kerran
+      other: ketjua on katseltu {{number}} kertaa
     activity: "Toiminta"
     likes: "Tykkäykset"
     likes_lowercase:
-      one: "tykkäys"
-      other: "tykkäykset"
+      one: tykkäys
+      other: tykkäykset
     likes_long: "tässä ketjussa on {{number}} tykkäystä"
     users: "Käyttäjät"
     users_lowercase:
-      one: "käyttäjä"
-      other: "käyttäjät"
+      one: käyttäjä
+      other: käyttäjät
     category_title: "Alue"
     history: "Historia"
     changed_by: "käyttäjältä {{author}}"
@@ -2121,8 +2214,8 @@ fi:
       latest:
         title: "Tuoreimmat"
         title_with_count:
-          one: "Tuoreimmat (1)"
-          other: "Tuoreimmat ({{count}})"
+          one: Tuoreimmat (1)
+          other: Tuoreimmat ({{count}})
         help: "ketjut, joissa on viimeaikaisia viestejä"
       hot:
         title: "Kuuma"
@@ -2140,21 +2233,21 @@ fi:
       unread:
         title: "Lukematta"
         title_with_count:
-          one: "Lukematta (1)"
-          other: "Lukematta ({{count}})"
+          one: Lukematta (1)
+          other: Lukematta ({{count}})
         help: "ketjut, joita seuraat tai tarkkailet tällä hetkellä ja joissa on lukemattomia viestejä"
         lower_title_with_count:
-          one: "1 lukematta"
-          other: "{{count}} lukematta"
+          one: 1 lukematta
+          other: '{{count}} lukematta'
       new:
         lower_title_with_count:
-          one: "1 uusi"
-          other: "{{count}} uutta"
+          one: 1 uusi
+          other: '{{count}} uutta'
         lower_title: "uusi"
         title: "Uudet"
         title_with_count:
-          one: "Uudet (1)"
-          other: "Uudet ({{count}})"
+          one: Uudet (1)
+          other: Uudet ({{count}})
         help: "viime päivinä aloitetut ketjut"
       posted:
         title: "Viestini"
@@ -2165,8 +2258,8 @@ fi:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: "{{categoryName}} (1)"
-          other: "{{categoryName}} ({{count}})"
+          one: '{{categoryName}} (1)'
+          other: '{{categoryName}} ({{count}})'
         help: "Tuoreimmat alueella {{categoryName}}"
       top:
         title: "Huiput"
@@ -2224,11 +2317,14 @@ fi:
         hamburger_menu: '<b>=</b> Avaa hampurilaisvalikko'
         user_profile_menu: '<b>p</b> Avaa käyttäjävalikko'
         show_incoming_updated_topics: '<b>.</b> Näytä päivttyneet ketjut'
-        search: '<b>/</b> or <b>ctrl</b>+<b>alt</b>+<b>f</b> Haku'
+        search: '<b>/</b> tai <b>ctrl</b>+<b>alt</b>+<b>f</b> Haku'
         help: '<b>?</b> Näytä näppäimistöoikotiet'
         dismiss_new_posts: '<b>x</b>, <b>r</b> Unohda Uudet/Viestit'
         dismiss_topics: '<b>x</b>, <b>t</b> Unohda ketjut'
         log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Kirjaudu ulos'
+      composing:
+        title: 'Kirjoittaminen'
+        return: '<b>shift</b>+<b>c</b> Palaa viestikenttään'
       actions:
         title: 'Toiminnot'
         bookmark_topic: '<b>f</b> Aseta kirjanmerkkeihin/poista'
@@ -2251,24 +2347,25 @@ fi:
         print: '<b>ctrl</b>+<b>p</b> Tulosta ketju'
     badges:
       earned_n_times:
-        one: "Ansaitsi tämän ansiomerkin yhden kerran"
-        other: "Ansaitsi tämän ansiomerkin %{count} kertaa"
+        one: Ansaitsi tämän ansiomerkin yhden kerran
+        other: Ansaitsi tämän ansiomerkin %{count} kertaa
       granted_on: "Myönnetty %{date}"
       others_count: "Muita, joilla on tämä ansiomerkki (%{count})"
       title: Ansiomerkit
       allow_title: "Voit käyttää tätä ansiomerkkiä tittelinä"
       multiple_grant: "Voit ansaita tämän useasti"
       badge_count:
-        one: "1 ansiomerkki"
-        other: "%{count} ansiomerkkiä"
+        one: 1 ansiomerkki
+        other: '%{count} ansiomerkkiä'
       more_badges:
-        one: "+1 Lisää"
-        other: "+%{count} Lisää"
+        one: +1 Lisää
+        other: +%{count} Lisää
       granted:
-        one: "1 myönnetty"
-        other: "%{count} myönnettyä"
+        one: 1 myönnetty
+        other: '%{count} myönnettyä'
       select_badge_for_title: Valitse tittelisi ansiomerkeistä
-      none: "<ei mitään>"
+      none: "(ei mitään)"
+      successfully_granted: "Ansiomerkin %{badge} myöntäminen käyttäjälle %{username} onnistui"
       badge_grouping:
         getting_started:
           name: Ensiaskeleet
@@ -2291,6 +2388,7 @@ fi:
       </p>
     tagging:
       all_tags: "Kaikki tunnisteet"
+      other_tags: "Muut tunnisteet"
       selector_all_tags: "kaikki tunnisteet"
       selector_no_tags: "ei tunnisteita"
       changed: "muutetut tunnisteet"
@@ -2298,8 +2396,8 @@ fi:
       choose_for_topic: "valinnaiset tunnisteet"
       delete_tag: "Poista tunniste"
       delete_confirm:
-        one: "Haluatko varmasti poistaa tunnisteen, mikä poistaa sen myös yhdeltä ketjulta, jolla tunniste on?"
-        other: "Haluatko varmasti poistaa tunnisteen, mikä poistaa sen myös {{count}} ketjulta, joilla tunniste on?"
+        one: Haluatko varmasti poistaa tunnisteen, mikä poistaa sen myös yhdeltä ketjulta, jolla tunniste on?
+        other: Haluatko varmasti poistaa tunnisteen, mikä poistaa sen myös {{count}} ketjulta, joilla tunniste on?
       delete_confirm_no_topics: "Haluatko varmasti poistaa tunnisteen?"
       rename_tag: "Uudelleennimeä tunniste"
       rename_instructions: "Valitse uusi nimi tälle tunnisteelle:"
@@ -2316,19 +2414,19 @@ fi:
       notifications:
         watching:
           title: "Tarkkaile"
-          description: "Ketjut, joilla on tämä tunniste, asetetaan automaattisesti tarkkailuun. Saat ilmoituksen kaikista uusista viesteistä ja ketjuista, ja uusien ja lukemattomien viestien lukumäärä näytetään ketjujen yhteydessä. "
+          description: "Ketjut joilla on tämä tunniste asetetaan automaattisesti tarkkailuun. Saat ilmoituksen kaikista uusista viesteistä ja ketjuista ja uusien viestien lukumäärä näytetään ketjun otsikon vieressä.\n "
         watching_first_post:
           title: "Tarkkaile uusia ketjuja"
-          description: "Saat ilmoituksen aloitetuista ketjuista, joilla on joku näistä tunnisteista."
+          description: "Saat ilmoituksen vain ketjunaloituksista, jolla on tämä tunniste."
         tracking:
           title: "Seuraa"
-          description: "Seuraat kaikkia ketjuja, joilla on tämä tunniste. Lukemattomien ja uusien viestien lukumäärä näytetään ketjun yhteydessä."
+          description: "Seuraat automaattisesti ketjuja joilla on tämä tunniste. Uusien ja lukemattomien viestien lukumäärä näytetään ketjun yhteydessä."
         regular:
           title: "Tavallinen"
           description: "Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa viestiisi."
         muted:
           title: "Vaimennettu"
-          description: "Et saa ilmoituksia uusista viesteistä tällä tunnisteella, eivätkä ne näy Lukematta-välilehdellä"
+          description: "Et saa ilmoituksia ketjusta, jolla on tämä tunniste, eivätkä ne näy lukemattomissa."
       groups:
         title: "Tunnisteryhmät"
         about: "Lisää tunnisteita ryhmiin, jotta niitä on helpompi hallita"
@@ -2342,6 +2440,9 @@ fi:
         save: "Tallenna"
         delete: "Poista"
         confirm_delete: "Oletko varma, että haluat poistaa tämän tunnisteryhmän?"
+        everyone_can_use: "Kuka vain voi käyttää tunnisteita"
+        usable_only_by_staff: "Tunnisteet näkyvät kaikille, mutta vain henkilökunta voi käyttää niitä"
+        visible_only_to_staff: "Tunnisteet näkyvät vain henkilökunnalle"
       topics:
         none:
           unread: "Sinulla ei ole lukemattomia ketjuja."
@@ -2369,6 +2470,7 @@ fi:
       custom_message_placeholder: "Kirjoita henkilökohtainen viestisi"
       custom_message_template_forum: "Hei, sinun pitäisi liittyä tälle palstalle!"
       custom_message_template_topic: "Hei, ajattelin, että voisit tykätä tästä ketjusta!"
+    forced_anonymous: "Rajun kuormituksen vuoksi tämä näytetään väliaikaisesti kaikille niin kuin uloskirjautunut käyttäjä näkee sen."
     safe_mode:
       enabled: "Vikasietotila on nyt päällä, sulje selainikkuna lopettaaksesi"
   admin_js:
@@ -2379,6 +2481,8 @@ fi:
       dashboard:
         title: "Hallintapaneeli"
         last_updated: "Hallintapaneeli on päivitetty viimeksi:"
+        find_old: "Haeskeletko vanhaa hallintapaneelia?"
+        old_link: "katsele sitä tästä"
         version: "Versio"
         up_to_date: "Sivusto on ajan tasalla!"
         critical_available: "Kriittinen päivitys on saatavilla."
@@ -2403,16 +2507,21 @@ fi:
         space_free: "{{size}} vapaata"
         uploads: "lataukset"
         backups: "varmuuskopiot"
+        lastest_backup: "Viimeisin: %{date}"
         traffic_short: "Liikenne"
         traffic: "Sovelluksen web-pyynnöt"
         page_views: "Sivunkatselut"
         page_views_short: "Sivunkatselut"
         show_traffic_report: "Näytä yksityiskohtainen liikenneraportti"
+        community_health: Yhteisön elinvoima
+        whats_new_in_discourse: "Mitä uutta Discoursessa?"
+        activity_metrics: Aktiivisuusmittareita
         reports:
+          trend_title: "%{percent} muutos. Nyt %{current}, viime jaksossa %{prev}."
           today: "Tänään"
           yesterday: "Eilen"
-          last_7_days: "Edellisenä 7 päivänä"
-          last_30_days: "Edellisenä 30 päivänä"
+          last_7_days: "Viimeiset 7"
+          last_30_days: "Viimeiset 30"
           all_time: "Kaikilta ajoilta"
           7_days_ago: "7 päivää sitten"
           30_days_ago: "30 päivää sitten"
@@ -2423,6 +2532,10 @@ fi:
           start_date: "Alkupäivämäärä"
           end_date: "Loppupäivämäärä"
           groups: "Kaikki ryhmät"
+          disabled: "Raportti ei ole käytössä"
+          trending_search:
+            more: '<a href="/admin/logs/search_logs">Hakulokit</a>'
+            disabled: 'Trendaavat haut eivät ole käytössä. Kerää dataa ottamalla käyttöön asetus <a href="/admin/site_settings/category/all_results?filter=log%20search%20queries">log search queries</a>.'
       commits:
         latest_changes: "Viimeisimmät muutokset: päivitä usein!"
         by: "käyttäjältä"
@@ -2434,14 +2547,18 @@ fi:
         moderation_history: "Valvontahistoria"
         agree: "Ole samaa mieltä"
         agree_title: "Vahvista, että lippu on annettu oikeasta syystä"
-        agree_flag_hide_post: "Ole samaa mieltä ja piilota viesti"
+        agree_flag_hide_post: "Piilota viesti"
         agree_flag_hide_post_title: "Piilota viesti ja lähetä automaattinen yksityisviesti, joka kehottaa käyttäjää muokkaamaan viestiä."
         agree_flag_restore_post: "Ole samaa mieltä ja palauta viesti"
         agree_flag_restore_post_title: "Palauta viesti niin että kaikki käyttäjät näkevät sen."
-        agree_flag: "Ole samaa mieltä ja säilytä viesti"
+        agree_flag_suspend: "Hyllytä käyttäjä"
+        agree_flag_suspend_title: "Ole samaa mieltä lipun kanssa ja hyllytä käyttäjä."
+        agree_flag_silence: "Hiljennä käyttäjä"
+        agree_flag_silence_title: "Ole samaa mieltä lipun kanssa ja hiljennä käyttäjä."
+        agree_flag: "Säilytä viesti"
         agree_flag_title: "Ole samaa mieltä lipun kanssa ja pidä viesti ennallaan"
-        defer_flag: "Sivuuta"
-        defer_flag_title: "Poista lippu; se ei vaadi toimenpiteitä tällä hetkellä."
+        ignore_flag: "Sivuuta"
+        ignore_flag_title: "Poista tämä lippu; toimenpiteitä ei tarvita juuri nyt."
         delete: "Poista"
         delete_title: "Poista viesti, johon lippu viittaa."
         delete_post_defer_flag: "Poista viesti ja sivuuta lippu"
@@ -2460,6 +2577,12 @@ fi:
         more: "(lisää vastauksia...)"
         suspend_user: "Hyllytä käyttäjä"
         suspend_user_title: "Hyllytä käyttäjä tämän viestin vuoksi"
+        replies:
+          one: '[1 vastaus]'
+          other: '[%{count} vastausta]'
+        delete_replies:
+          one: Poista myös viestiin liittyvä %{count} vastaus?
+          other: Poista myös viestiin liittyvät %{count} vastausta?
         dispositions:
           agreed: "samaa mieltä"
           disagreed: "eri mieltä"
@@ -2483,6 +2606,7 @@ fi:
           type: "Tyyppi"
           users: "Käyttäjät"
           last_flagged: "Viimeksi liputettu"
+          no_results: "Ei ole liputettuja ketjuja."
         short_names:
           off_topic: "eksyy aiheesta"
           inappropriate: "sopimaton"
@@ -2490,13 +2614,47 @@ fi:
           notify_user: "mukautettu"
           notify_moderators: "mukautettu"
       groups:
+        new:
+          title: "Uusi ryhmä"
+          create: "Luo"
+          name:
+            too_short: "Ryhmän nimi on liian lyhyt"
+            too_long: "Ryhmän nimi on liian pitkä"
+            checking: "Tarkistetaan onko ryhmän nimi käytettävissä..."
+            available: "Ryhmän nimi on käytettävissä"
+            not_available: "Ryhmän nimi ei ole käytettävissä"
+            blank: "Ryhmällä on oltava nimi"
+        bulk_add:
+          title: "Liitä ryhmään useita"
+          complete_users_not_added: "Näitä käyttäjiä ei liitetty (varmistu että heillä on käyttäjätili):"
+          paste: "Liitä luettelo käyttäjänimistä tai sähköposteista, yksi per rivi:"
+        add_members:
+          as_owner: "Tee käyttäjistä ryhmän isäntiä"
+        manage:
+          interaction:
+            email: Sähköposti
+            incoming_email_placeholder: "syötä sähköpostiosoite"
+            visibility: Näkyvyys
+            visibility_levels:
+              title: "Kuka näkee ryhmän?"
+              public: "Kaikki"
+              members: "Ryhmän isännät, jäsenet ja ylläpitäjät"
+              staff: "Ryhmän isännät ja henkilökunta"
+              owners: "Ryhmän isännät ja ylläpitäjät"
+          membership:
+            automatic: Automaattinen
+            trust_level: Luottamustaso
+            trust_levels_title: "Luottamustaso joka automaattisesti myönnetään käyttäjälle, kun hänet liitetään:"
+            trust_levels_none: "Ei mitään"
+            automatic_membership_email_domains: "Käyttäjä, joka rekisteröityy sähköpostiverkkotunnuksella joka täsmää tähän luetteloon, liitetään ryhmään automaattisesti:"
+            automatic_membership_retroactive: "Liitä olemassaolevia rekisteröityneitä käyttäjiä soveltaen samaa sähköpostiverkkotunnussääntöä "
+            primary_group: "Aseta automaattisesti ensisijaiseksi ryhmäksi"
+        name_placeholder: "Ryhmän nimi, ei välilyöntejä, samat säännöt kuin käyttäjänimillä"
         primary: "Ensisijainen ryhmä"
         no_primary: "(ei ensisijaista ryhmää)"
         title: "Ryhmät"
         edit: "Muokkaa ryhmiä"
         refresh: "Lataa uudelleen"
-        new: "Uusi"
-        selector_placeholder: "syötä käyttäjätunnus"
         about: "Muokkaa ryhmien jäsenyyksiä ja nimiä täällä"
         group_members: "Ryhmään kuuluvat"
         delete: "Poista"
@@ -2504,22 +2662,12 @@ fi:
         delete_failed: "Ryhmän poistaminen ei onnistu. Jos tämä on automaattinen ryhmä, sitä ei voi poistaa."
         delete_owner_confirm: "Poista omistajan etuudet käyttäjältä '%{username}'?"
         add: "Lisää"
-        add_members: "Lisää jäseniä"
         custom: "Mukautetut"
-        bulk_complete: "Käyttäjät on lisätty ryhmään."
-        bulk_complete_users_not_added: "Näitä käyttäjiä ei lisätty (varmista, että tilit ovat olemassa):"
-        bulk: "Lisää ryhmään useita"
-        bulk_paste: "Liitä lista käyttäjänimistä tai sähköpostiosoitteista, yksi per rivi:"
-        bulk_select: "(valitse ryhmä)"
         automatic: "Automaattiset"
-        automatic_membership_email_domains: "Käyttäjät, jotka luovat tunnuksen sähköpostiosoitteella, jonka verkkotunnus on tällä listalla, lisätään tähän ryhmään:"
-        automatic_membership_retroactive: "Lisää jo olemassa olevat käyttäjät käyttäen samaa sääntöä verkkotunnuksista"
-        default_title: "Tämä ryhmän jäsenten oletustitteli"
-        primary_group: "Aseta automaattisesti ensisijaiseksi ryhmäksi"
+        default_title: "Oletustitteli"
+        default_title_description: "annetaan kaikille ryhmän jäsenille"
         group_owners: Omistajat
         add_owners: Lisää omistajia
-        incoming_email: "Saapuvan sähköpostin osoite"
-        incoming_email_placeholder: "aseta sähköpostiosoite"
         none_selected: "Aloita valitsemalla ryhmä"
         no_custom_groups: "Luo uusi mukautettu ryhmä"
       api:
@@ -2576,6 +2724,19 @@ fi:
           details: "Luodaan uusi vastaus, muokataan, poistetaan tai palautetaan."
         user_event:
           name: "Käyttäjätapahtuma"
+          details: "Kun käyttäjä kirjautuu sisään tai ulos, tai käyttäjä luodaan, hyväksytään tai päivittyy."
+        group_event:
+          name: "Ryhmätapahtuma"
+          details: "Kun ryhmä luodaan, päivitetään tai poistetaan."
+        category_event:
+          name: "Aluetapahtuma"
+          details: "Kun alue luodaan, päivitetään tai poistetaan."
+        tag_event:
+          name: "Tunnistetapahtuma"
+          details: "Kun tunniste luodaan, päivitetään tai poistetaan."
+        flag_event:
+          name: "Lipputapahtuma"
+          details: "Kun lippu luodaan tai sen kanssa ollaan yhtä tai eri mieltä tai se sivuutetaan."
         delivery_status:
           title: "Toimituksen tila"
           inactive: "Ei toiminnassa"
@@ -2585,11 +2746,11 @@ fi:
           none: "Liittyviä tapahtumia ei ole."
           redeliver: "Toimita uudelleen"
           incoming:
-            one: "Yksi uusi tapahtuma."
-            other: "{{count}} uutta tapahtumaa."
+            one: Yksi uusi tapahtuma.
+            other: '{{count}} uutta tapahtumaa.'
           completed_in:
-            one: "Suoritettiin 1 sekunnissa."
-            other: "Suoritettiin {{count}} sekunnissa."
+            one: Suoritettiin 1 sekunnissa.
+            other: Suoritettiin {{count}} sekunnissa.
           request: "Pyyntö"
           response: "Vastaus"
           redeliver_confirm: "Oletko varma, että haluat toimittaa uudelleen saman tietosisällön?"
@@ -2617,6 +2778,7 @@ fi:
         change_settings: "Asetukset"
         change_settings_short: "Asetukset"
         howto: "Kuinka asennan lisäosia?"
+        official: "Virallinen lisäosa"
       backups:
         title: "Varmuuskopiot"
         menu:
@@ -2640,7 +2802,7 @@ fi:
           label: "Lähetä"
           title: "Lataa varmuuskopio tälle koneelle"
           uploading: "Lähettää..."
-          success: "Tiedosto '{{filename}}' on lähetetty onnistuneesti."
+          success: "'{{filename}}' tallennettiin onnistuneesti. TIedostoa vielä työstetään ja voi mennä minuutti ennen kuin se näkyy luettelossa."
           error: "Tiedoston '{{filename}}' lähetyksen aikana tapahtui virhe: {{message}}"
         operations:
           is_running: "Operaatiota suoritetaan parhaillaan..."
@@ -2653,7 +2815,7 @@ fi:
             label: "Varmuuskopioi"
             title: "Luo varmuuskopio"
             confirm: "Haluatko luoda uuden varmuuskopion?"
-            without_uploads: "Kyllä (älä sisällytä tiedostoja)"
+            without_uploads: "Kyllä (älä sisällytä ladattuja tiedostoja)"
           download:
             label: "Lataa"
             title: "Lähetä sähköposti, jossa on latauslinkki"
@@ -2722,6 +2884,7 @@ fi:
           common: "Yhteiset"
           desktop: "Työpöytä"
           mobile: "Mobiili"
+          settings: "Asetukset"
           preview: "Esikatselu"
           is_default: "Teema on käytössä oletuksena"
           user_selectable: "Teema on tarjolla käyttäjille"
@@ -2733,6 +2896,11 @@ fi:
           no_uploads: "Voit ladata teemaasi liitteitä kuten fontteja ja kuvia"
           add_upload: "Lisää tiedosto"
           upload_file_tip: "Valitse ladattava tiedosto (png, woff2 jne.)"
+          variable_name_invalid: "Muuttujan nimi ei kelpaa. Vain aakkosnumeeriset sallittu. Täytyy alkaa kirjaimella. Täytyy olla uniikki."
+          variable_name_error:
+            invalid_syntax: "Muuttujan nimi ei kelpaa - Vain aakkosnumeeriset sallittu. Täytyy alkaa kirjaimella."
+            no_overwrite: "Muuttujan nimi ei kelpaa. Nimi on toisen muuttujan käytössä."
+            must_be_unique: "Muuttujan nimi ei kelpaa. Täytyy olla uniikki."
           upload: "Lataa"
           child_themes_check: "Teemaan kuuluu tytärteemoja"
           css_html: "Mukautettu CSS/HTML"
@@ -2741,6 +2909,7 @@ fi:
           delete_upload_confirm: "Poista ladattu tiedosto? (Teeman CSS voi lakata toimimasta!)"
           import_web_tip: "Tietovarasto, jossa teema on"
           import_file_tip: ".dcstyle.json-tiedosto, jossa teema on"
+          is_private: "Teema in yksityisessä git-tietovarastossa"
           about_theme: "Tietoa teemasta"
           license: "Lisenssi"
           component_of: "Teema on osa teemaa:"
@@ -2749,9 +2918,11 @@ fi:
           updating: "Päivitetään..."
           up_to_date: "Teema on ajan tasalla, viimeksi tarkastettu:"
           add: "Lisää"
+          theme_settings: "Teeman asetukset"
+          no_settings: "Teemalla ei ole asetuksia."
           commits_behind:
-            one: "Teema on yhden muutoksen perässä!"
-            other: "Teema on {{count}} muutosta perässä!"
+            one: Teema on yhden muutoksen perässä!
+            other: Teema on {{count}} muutosta perässä!
           scss:
             text: "CSS"
             title: "Lisää mukautettua CSS:ää, hyväksymme käyvät CSS- ja SCSS-tyylit"
@@ -2772,6 +2943,9 @@ fi:
           body_tag:
             text: "</body>"
             title: "HTML, joka sijoitetaan ennen </body>-symbolia"
+          yaml:
+            text: "YAML"
+            title: "Määritä teeman asetukset YAML-muodossa"
         colors:
           select_base:
             title: "Valitse perusvärimalli"
@@ -2937,6 +3111,7 @@ fi:
             revoke_badge: "peru ansiomerkki"
             check_email: "tarkista sähköposti"
             delete_topic: "poista ketju"
+            recover_topic: "peruuta ketjun poisto"
             delete_post: "poista viesti"
             impersonate: "esiinny käyttäjänä"
             anonymize_user: "anonymisoi käyttäjä"
@@ -2963,6 +3138,16 @@ fi:
             backup_destroy: "tuhoa varmuuskopio"
             reviewed_post: "arvioi viestin"
             custom_staff: "lisäosan mukautettu toiminto"
+            post_locked: "viesti lukittu"
+            post_edit: "viestin muokkaus"
+            post_unlocked: "viesti vapautettu"
+            check_personal_message: "katso yksityisviesti"
+            disabled_second_factor: "poista kaksivaiheinen tunnistautuminen"
+            topic_published: "ketju julkaistu"
+            post_approved: "viesti hyväksytty"
+            create_badge: "luo ansiomerkki"
+            change_badge: "muuta ansiomerkkiä"
+            delete_badge: "poista ansiomerkki"
         screened_emails:
           title: "Seulottavat sähköpostiosoitteet"
           description: "Uuden käyttäjätunnuksen luonnin yhteydessä annettua sähköpostiosoitetta verrataan alla olevaan listaan ja tarvittaessa tunnuksen luonti joko estetään tai suoritetaan muita toimenpiteitä."
@@ -3012,8 +3197,8 @@ fi:
         clear_filter: "Tyhjennä"
         show_words: "näytä sanat"
         word_count:
-          one: "1 sana"
-          other: "%{count} sanaa"
+          one: 1 sana
+          other: '%{count} sanaa'
         actions:
           block: 'Estä'
           censor: 'Sensuroi'
@@ -3055,11 +3240,11 @@ fi:
           suspect: 'Epäilty'
         approved: "Hyväksytty?"
         approved_selected:
-          one: "hyväksy käyttäjä"
-          other: "hyväksy käyttäjiä ({{count}})"
+          one: hyväksy käyttäjä
+          other: hyväksy käyttäjiä ({{count}})
         reject_selected:
-          one: "torju käyttäjä"
-          other: "torju ({{count}}) käyttäjää"
+          one: torju käyttäjä
+          other: torju ({{count}}) käyttäjää
         titles:
           active: 'Viimeksi aktiiviset käyttäjät'
           new: 'Uudet käyttäjät'
@@ -3076,11 +3261,11 @@ fi:
           suspended: 'Hyllytetyt käyttäjät'
           suspect: 'Epäillyt käyttäjät'
         reject_successful:
-          one: "Yksi käyttäjä torjuttiin."
-          other: "({{count}}) käyttäjää torjuttiin."
+          one: Yksi käyttäjä torjuttiin.
+          other: ({{count}}) käyttäjää torjuttiin.
         reject_failures:
-          one: "Yhden käyttäjän torjuminen epäonnistui."
-          other: "({{count}}) käyttäjän torjuminen epäonnistui."
+          one: Yhden käyttäjän torjuminen epäonnistui.
+          other: ({{count}}) käyttäjän torjuminen epäonnistui.
         not_verified: "Todentamaton"
         check_email:
           title: "Paljasta tämän käyttäjän sähköpostiosoite"
@@ -3121,7 +3306,7 @@ fi:
         show_public_profile: "Näytä julkinen profiili"
         impersonate: 'Esiinny käyttäjänä'
         action_logs: "Toimintaloki"
-        ip_lookup: "IP haku"
+        ip_lookup: "IP-haku"
         log_out: "Kirjaa ulos"
         logged_out: "Käyttäjä on kirjautunut ulos kaikilla laitteilla"
         revoke_admin: 'Peru ylläpitäjän oikeudet'
@@ -3157,14 +3342,14 @@ fi:
         delete_forbidden_because_staff: "Ylläpitäjiä ja valvojia ei voi poistaa."
         delete_posts_forbidden_because_staff: "Ylläpitäjien ja valvojien kaikkia viestejä ei voi poistaa."
         delete_forbidden:
-          one: "Käyttäjiä ei voi poistaa jos heillä on kirjoitettuja viestejä. Poista ensin viestit ennen käyttäjätilin poistamista. (Vanhempia viestejä, kuin %{count} päivä ei voi poistaa)"
-          other: "Käyttäjää ei voi poistaa jos hänellä on kirjoitettuja viestejä. Poista viestit ennen käyttäjätilin poistamista. (Yli %{count} päivää vanhoja viestejä ei voi poistaa.)"
+          one: Käyttäjiä ei voi poistaa jos heillä on kirjoitettuja viestejä. Poista ensin viestit ennen käyttäjätilin poistamista. (Vanhempia viestejä, kuin %{count} päivä ei voi poistaa)
+          other: Käyttäjää ei voi poistaa jos hänellä on kirjoitettuja viestejä. Poista viestit ennen käyttäjätilin poistamista. (Yli %{count} päivää vanhoja viestejä ei voi poistaa.)
         cant_delete_all_posts:
-          one: "Kaikkia viestejä ei voi poistaa. Jotkin viestit ovat enemmän kuin %{count} päivän vanhoja. (Asetus delete_user_max_post_age)"
-          other: "Kaikkia viestejä ei voi poistaa. Jotkin viestit ovat enemmän kuin %{count} päivää vanhoja. (Asetus delete_user_max_post_age)"
+          one: Kaikkia viestejä ei voi poistaa. Jotkin viestit ovat enemmän kuin %{count} päivän vanhoja. (Asetus delete_user_max_post_age)
+          other: Kaikkia viestejä ei voi poistaa. Jotkin viestit ovat enemmän kuin %{count} päivää vanhoja. (Asetus delete_user_max_post_age)
         cant_delete_all_too_many_posts:
-          one: "Kaikkia viestejä ei voi poistaa, koska käyttäjällä on enemmän kuin 1 viesti. (delete_all_posts_max)"
-          other: "Kaikkia viestejä ei voi poistaa, koska käyttäjällä on enemmän kuin %{count} viestiä. (delete_all_posts_max)"
+          one: Kaikkia viestejä ei voi poistaa, koska käyttäjällä on enemmän kuin 1 viesti. (delete_all_posts_max)
+          other: Kaikkia viestejä ei voi poistaa, koska käyttäjällä on enemmän kuin %{count} viestiä. (delete_all_posts_max)
         delete_confirm: "Oletko VARMA, että haluat poistaa tämän käyttäjän? Toiminto on lopullinen!"
         delete_and_block: "Poista ja <b>estä</b> tämä sähköposti ja IP-osoite."
         delete_dont_block: "Ainoastaan poista"
@@ -3205,8 +3390,8 @@ fi:
         tl3_requirements:
           title: "Vaatimukset luottamustasolle 3."
           table_title:
-            one: "Viimeisimmän päivän aikana"
-            other: "Viimeisimpien %{count} päivän aikana:"
+            one: Viimeisimmän päivän aikana
+            other: 'Viimeisimpien %{count} päivän aikana:'
           value_heading: "Arvo"
           requirement_heading: "Vaatimus"
           visits: "Vierailua"
@@ -3281,10 +3466,7 @@ fi:
         recommended: "On suositeltavaa muokata seuraavaa tekstiä tarpeidesi mukaan:"
         show_overriden: 'Näytä vain muokatut'
       site_settings:
-        show_overriden: 'Näytä vain muokatut'
         title: 'Asetukset'
-        reset: 'nollaa'
-        none: 'ei mitään'
         no_results: "Ei tuloksia."
         clear_filter: "Tyhjennä"
         add_url: "Lisää URL"
@@ -3334,11 +3516,11 @@ fi:
         reason_help: (Linkki viestiin tai ketjuun)
         save: Tallenna
         delete: Poista
-        delete_confirm: Oletko varma, että haluat poistaa tämän ansiomerkin?
+        delete_confirm: "Oletko varma, että haluat poistaa tämän ansiomerkin?"
         revoke: Peruuta
         reason: Syy
         expand: Laajenna &hellip;
-        revoke_confirm: Oletko varma, että haluat peruuttaa ansiomerkin?
+        revoke_confirm: "Oletko varma, että haluat peruuttaa ansiomerkin?"
         edit_badges: Muokkaa ansiomerkkejä
         grant_badge: Myönnä ansiomerkki
         granted_badges: Myönnetyt ansiomerkit
@@ -3352,7 +3534,6 @@ fi:
         enabled: Ota ansiomerkki käyttöön
         icon: Ikoni
         image: Kuva
-        icon_help: "Käytä joko Font Awesome -luokkaa tai kuvan URL-osoitetta"
         query: Ansiomerkkien haku tietokannasta (SQL)
         target_posts: Tietokantakyselyn kohdeviestit
         auto_revoke: Aja kumoamis-ajo päivittäin
@@ -3376,14 +3557,14 @@ fi:
             text: "Myöntöjen näytteitä puuttuu. Tämä tapahtuu, kun ansiomerkin kysely palauttaa käyttäjä-ID:n tai viesti-ID:n, jota ei ole olemassa. Tämä voi johtaa odottamattomiin seurauksiin myöhemmin - tarkista kysely uudestaan."
           no_grant_count: "Ei ansiomerkkejä myönnettäväksi"
           grant_count:
-            one: "<b>1</b> ansiomerkki odottaa myöntämistä."
-            other: "<b>%{count}</b> ansiomerkkiä odottaa myöntämistä."
+            one: <b>1</b> ansiomerkki odottaa myöntämistä.
+            other: <b>%{count}</b> ansiomerkkiä odottaa myöntämistä.
           sample: "Esimerkki:"
           grant:
-            with: <span class="username">%{username}</span>
-            with_post: <span class="username">%{username}</span> viestille ketjussa %{link}
-            with_post_time: <span class="username">%{username}</span> viestille ketjussa %{link} <span class="time">%{time}</span>
-            with_time: <span class="username">%{username}</span> <span class="time">%{time}</span>
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span> viestille ketjussa %{link}"
+            with_post_time: "<span class=\"username\">%{username}</span> viestille ketjussa %{link} <span class=\"time\">%{time}</span>"
+            with_time: "<span class=\"username\">%{username}</span> <span class=\"time\">%{time}</span>"
       emoji:
         title: "Emoji"
         help: "Lisää uusi emoji joka on kaikkien käytettävissä. (Voit raahata useita tiedostoja kerralla)"
@@ -3429,7 +3610,7 @@ fi:
         category_id: "Alueen ID"
         category_title: "Alue"
         external_url: "Ulkoinen URL"
-        delete_confirm: Oletko varma, että haluat poistaa tämän ikilinkin?
+        delete_confirm: "Oletko varma, että haluat poistaa tämän ikilinkin?"
         form:
           label: "Uusi:"
           add: "Lisää"
@@ -3444,8 +3625,8 @@ fi:
       uploading: "Ladataan..."
       quit: "Ehkä myöhemmin"
       staff_count:
-        one: "Henkilökuntalaisia on 1 (eli sinä)"
-        other: "Henkilökuntalaisia on %{count}, sinä mukaan lukien."
+        one: Henkilökuntalaisia on 1 (eli sinä)
+        other: Henkilökuntalaisia on %{count}, sinä mukaan lukien.
       invites:
         add_user: "lisää"
         none_added: "Et ole kutsunut lainkaan henkilökuntaa. Haluatko todella jatkaa?"
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index b91eda1c6ed..b4281f937bc 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -43,68 +43,68 @@ fr:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: "< 1s"
-          other: "< %{count}s"
+          one: < 1s
+          other: < %{count}s
         x_seconds:
-          one: "1s"
-          other: "%{count}s"
+          one: 1s
+          other: '%{count}s'
         less_than_x_minutes:
-          one: "< 1m"
-          other: "< %{count}m"
+          one: < 1m
+          other: < %{count}m
         x_minutes:
-          one: "1m"
-          other: "%{count}m"
+          one: 1m
+          other: '%{count}m'
         about_x_hours:
-          one: "1h"
-          other: "%{count}h"
+          one: 1h
+          other: '%{count}h'
         x_days:
-          one: "1j"
-          other: "%{count}j"
+          one: 1j
+          other: '%{count}j'
         x_months:
-          one: "1 mois"
-          other: "%{count} mois"
+          one: 1 mois
+          other: '%{count} mois'
         about_x_years:
-          one: "1a"
-          other: "%{count}a"
+          one: 1a
+          other: '%{count}a'
         over_x_years:
-          one: "> 1a"
-          other: "> %{count}a"
+          one: '> 1a'
+          other: '> %{count}a'
         almost_x_years:
-          one: "1a"
-          other: "%{count}a"
+          one: 1a
+          other: '%{count}a'
         date_month: "D MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: "1 min"
-          other: "%{count} mins"
+          one: 1 min
+          other: '%{count} mins'
         x_hours:
-          one: "1 heure"
-          other: "%{count} heures"
+          one: 1 heure
+          other: '%{count} heures'
         x_days:
-          one: "1 jour"
-          other: "%{count} jours"
+          one: 1 jour
+          other: '%{count} jours'
         date_year: "D MMM 'YY"
       medium_with_ago:
         x_minutes:
-          one: "il y a 1 min"
-          other: "il y a %{count} mins"
+          one: il y a 1 min
+          other: il y a %{count} mins
         x_hours:
-          one: "il y a 1 heure"
-          other: "il y a %{count} heures"
+          one: il y a 1 heure
+          other: il y a %{count} heures
         x_days:
-          one: "il y a 1 jour"
-          other: "il y a %{count} jours"
+          one: il y a 1 jour
+          other: il y a %{count} jours
       later:
         x_days:
-          one: "1 jour plus tard"
-          other: "%{count} jours plus tard"
+          one: 1 jour plus tard
+          other: '%{count} jours plus tard'
         x_months:
-          one: "1 mois plus tard"
-          other: "%{count} mois plus tard"
+          one: 1 mois plus tard
+          other: '%{count} mois plus tard'
         x_years:
-          one: "1 année plus tard"
-          other: "%{count} années plus tard"
+          one: 1 année plus tard
+          other: '%{count} années plus tard'
       previous_month: 'Mois précédent'
       next_month: 'Mois suivant'
       placeholder: date
@@ -118,7 +118,7 @@ fr:
       email: 'envoyer ce lien dans un courriel'
     action_codes:
       public_topic: "a rendu ce sujet public %{when}"
-      private_topic: "a rendu ce sujet privé %{when}"
+      private_topic: "a rendu ce sujet message direct %{when}"
       split_topic: "a scindé ce sujet %{when}"
       invited_user: "a invité %{who} %{when}"
       invited_group: "a invité %{who} %{when}"
@@ -147,9 +147,9 @@ fr:
         enabled: 'a mis à la une %{when}. Il sera affiché en haut de chaque page jusqu’à ce qu''il soit ignoré par un utilisateur.'
         disabled: 'a supprimé de la une %{when}. Il ne sera plus affiché en haut de chaque page.'
     topic_admin_menu: "actions d'administration sur le sujet"
-    wizard_required: "Bienvenue sur votre nouveau Discourse ! Démarrons pas <a href='%{url}' data-auto-route='true'>l'assistant de configuration</a> ✨"
+    wizard_required: "Bienvenue sur votre nouveau Discourse ! Démarrons par <a href='%{url}' data-auto-route='true'>l'assistant de configuration</a> ✨"
     emails_are_disabled: "Le courriel sortant a été désactivé par un administrateur. Aucune notification courriel ne sera envoyée."
-    bootstrap_mode_enabled: "Pour rendre le lancement de votre site plus facile, vous êtes en mode 'bootstrap'. Tout nouveau utilisateur sera accordé le niveau de confirance 1 et aura les résumés par courriel hebdomadaires activés. Ceci cessera d'être le cas lorsque le nombre d'utilisateurs dépassera %{min_users}."
+    bootstrap_mode_enabled: "Pour rendre le lancement de votre site plus facile, vous êtes en mode 'bootstrap'. Tout nouveau utilisateur sera accordé le niveau de confiance 1 et aura les résumés par courriel hebdomadaires activés. Ceci cessera d'être le cas lorsque %{min_users} utilisateurs auront rejoints le site."
     bootstrap_mode_disabled: "Le mode Bootstrap sera désactivé dans les prochaines 24 heures."
     themes:
       default_description: "Par défaut"
@@ -174,6 +174,7 @@ fr:
     not_implemented: "Cette fonctionnalité n'a pas encore été implémentée, désolé."
     no_value: "Non"
     yes_value: "Oui"
+    submit: "Envoyer"
     generic_error: "Désolé, une erreur est survenue."
     generic_error_with_reason: "Une erreur est survenue : %{error}"
     sign_up: "S'inscrire"
@@ -186,8 +187,8 @@ fr:
     show_help: "options"
     links: "Liens"
     links_lowercase:
-      one: "lien"
-      other: "liens"
+      one: lien
+      other: liens
     faq: "FAQ"
     guidelines: "Charte"
     privacy_policy: "Politique de confidentialité"
@@ -211,8 +212,8 @@ fr:
     max_of_count: "maximum sur {{count}}"
     alternation: "ou"
     character_count:
-      one: "{{count}} caractère"
-      other: "{{count}} caractères"
+      one: '{{count}} caractère'
+      other: '{{count}} caractères'
     suggested_topics:
       title: "À lire ensuite"
       pm_title: "À lire ensuite"
@@ -224,8 +225,8 @@ fr:
       our_moderators: "Nos modérateurs"
       stat:
         all_time: "Depuis toujours"
-        last_7_days: "Les 7 derniers jours"
-        last_30_days: "Les 30 derniers jours"
+        last_7_days: "Derniers 7"
+        last_30_days: "Derniers 30"
       like_count: "J'aime"
       topic_count: "Sujets"
       post_count: "Nombre de messages"
@@ -247,15 +248,14 @@ fr:
       remove: "Retirer le signet"
       confirm_clear: "Êtes-vous sûr de vouloir retirer tous les signets de ce sujet ?"
     topic_count_latest:
-      one: "{{count}} sujet récent."
-      other: "{{count}} sujets récents."
+      one: Voir {{count}} sujet récent ou mis à jour.
+      other: Voir {{count}} sujets récents ou mis à jour
     topic_count_unread:
-      one: "{{count}} sujet non lu."
-      other: "{{count}} sujets non lus."
+      one: Voir {{count}} sujet non lu
+      other: Voir {{count}} sujets non lus
     topic_count_new:
-      one: "{{count}} nouveau sujet."
-      other: "{{count}} nouveaux sujets."
-    click_to_show: "Cliquez pour afficher."
+      one: Voir {{count}} nouveau sujet
+      other: Voir {{count}} nouveaux sujets
     preview: "prévisualiser"
     cancel: "annuler"
     save: "Sauvegarder"
@@ -268,6 +268,7 @@ fr:
     pasting: "Coller..."
     enable: "Activer"
     disable: "Désactiver"
+    continue: "Poursuivre"
     undo: "Annuler"
     revert: "Rétablir"
     failed: "Échec"
@@ -292,16 +293,16 @@ fr:
       cancel: "Annuler"
       view_pending: "voir les messages en attente"
       has_pending_posts:
-        one: "Ce sujet a <b>1</b> message en attente de validation"
-        other: "Ce sujet a <b>{{count}}</b> messages en attente de validation"
+        one: Ce sujet a <b>1</b> message en attente de validation
+        other: Ce sujet a <b>{{count}}</b> messages en attente de validation
       confirm: "Sauvegarder"
       delete_prompt: "Êtes-vous sûr de vouloir supprimer <b>%{username}</b> ? Cela supprimera tous ses messages et bloquera son courriel et son adresse IP."
       approval:
         title: "Ce message doit être approuvé"
         description: "Votre nouveau message a bien été envoyé, mais il doit être approuvé par un modérateur avant d'apparaître publiquement. Merci de votre patience."
         pending_posts:
-          one: "Vous avez <strong>un</strong> message en attente."
-          other: "Vous avez <strong>{{count}}</strong> messages en attente."
+          one: Vous avez <strong>un</strong> message en attente.
+          other: Vous avez <strong>{{count}}</strong> messages en attente.
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> a démarré <a href='{{topicUrl}}'>le sujet</a>"
@@ -335,8 +336,8 @@ fr:
       posts_read: "Lus"
       posts_read_long: "Messages lus"
       total_rows:
-        one: "1 utilisateur"
-        other: "%{count} utilisateurs"
+        one: 1 utilisateur
+        other: '%{count} utilisateurs'
     group_histories:
       actions:
         change_group_setting: "Changer les paramètres du groupe"
@@ -345,22 +346,35 @@ fr:
         make_user_group_owner: "Rendre propriétaire"
         remove_user_as_group_owner: "Retirer le propriétaire"
     groups:
-      logs:
-        title: "Journaux"
-        when: "Quand"
-        action: "Action"
-        acting_user: "Utilisateur agissant"
-        target_user: "Utilisateur cible"
-        subject: "Sujet"
-        details: "Détails"
-        from: "De"
-        to: "À"
-      edit:
-        title: 'Modifier le groupe'
+      add_members:
+        title: "Ajouter membres"
+        description: "Gérer les membres de ce groupe"
+        usernames: "Pseudos"
+      manage:
+        title: 'Gérer'
+        name: 'Nom'
         full_name: 'Nom complet'
         add_members: "Ajouter des membres"
         delete_member_confirm: "Supprimer %{username} du groupe « %{group} » ?"
-      name_placeholder: "Nom du groupe, sans espaces, même règle que pour les pseudos"
+        profile:
+          title: Profil
+        interaction:
+          title: Intéraction
+          posting: Contribution
+          notification: Notification
+        membership:
+          title: Adhésion
+          access: Accès
+        logs:
+          title: "Journaux"
+          when: "Quand"
+          action: "Action"
+          acting_user: "Utilisateur agissant"
+          target_user: "Utilisateur cible"
+          subject: "Sujet"
+          details: "Détails"
+          from: "From"
+          to: "À"
       public_admission: "Autoriser les utilisateurs à rejoindre le groupe librement (nécessite que le groupe soit visible)"
       public_exit: "Autoriser les utilisateurs à quitter librement le groupe"
       empty:
@@ -371,44 +385,62 @@ fr:
         topics: "Il n'y a aucun sujet par des membres de ce groupe."
         logs: "Il n'y a aucun journal pour ce groupe."
       add: "Ajouter"
-      join: "Rejoindre le groupe"
-      leave: "Quitter le groupe"
-      request: "Demander à rejoindre le groupe"
+      join: "Rejoindre"
+      leave: "Quitter"
+      request: "Requête"
       message: "Message"
-      automatic_group: Groupe automatique
-      closed_group: Groupe fermé
-      is_group_user: "Vous êtes membre de ce groupe"
       allow_membership_requests: "Autoriser les utilisateurs à envoyer des demandes d'adhésion aux propriétaires de groupe"
       membership_request_template: "Modèle personnalisé à afficher aux utilisateurs lors de l'envoi d'une demande d'adhésion"
       membership_request:
         submit: "Soumettre la demande"
-        title: "Demander à rejoindre %{group_name}"
+        title: "Demander à rejoindre @%{group_name}"
         reason: "Expliquez au propriétaire du groupe pourquoi vous avez votre place dans ce groupe"
       membership: "Adhésion"
       name: "Nom"
-      user_count: "Nombre de membres"
+      group_name: "Nom du groupe"
+      user_count: "Utilisateurs"
       bio: "À propos du groupe"
-      selector_placeholder: "Ajouter des membres"
+      selector_placeholder: "saisir pseudo"
       owner: "propriétaire"
       index:
         title: "Groupes"
+        all: "Tous les groupes"
         empty: "Il n'y a aucun groupe visible."
+        filter: "Filtrer par type de groupe"
+        owner_groups: "Groupes dont je suis propriétaire"
+        close_groups: "Groupes fermés"
+        automatic_groups: "Groupes automatiques"
+        automatic: "Automatique"
+        closed: "Fermé"
+        public: "Public"
+        private: "Privé"
+        public_groups: "Groupes publics"
+        automatic_group: Groupe automatique
+        close_group: Fermer groupe
+        my_groups: "Mes groupes"
+        group_type: "Type de groupe"
+        is_group_user: "Membre"
+        is_group_owner: "Propriétaire"
       title:
-        one: "Groupe"
-        other: "Groupes"
+        one: Groupe
+        other: Groupes
       activity: "Activité"
-      members: "Membres"
+      members:
+        title: "Membres"
+        filter_placeholder_admin: "pseudo ou courriel"
+        filter_placeholder: "pseudo"
+        remove_member: "Enlever membre"
+        remove_member_description: "Enlever <b>%{username}</b> de ce groupe"
+        make_owner: "Rendre propriétaire"
+        make_owner_description: "Rendre<b>%{username}</b> propriétaire de ce groupe"
+        remove_owner: "Enlever comme propriétaire"
+        remove_owner_description: "Enlever <b>%{username}</b> comme propriétaire de ce groupe"
+        owner: "Propriétaire"
       topics: "Sujets"
       posts: "Messages"
       mentions: "Mentions"
       messages: "Messages"
       notification_level: "Niveau de notification par défaut pour les messages de groupe"
-      visibility_levels:
-        title: "Qui peut voir ce groupe ?"
-        public: "Tout le monde"
-        members: "Propriétaires du groupe, membres et administrateurs"
-        staff: "Propriétaires du groupe et responsables"
-        owners: "Propriétaires du groupe et administrateurs"
       alias_levels:
         mentionable: "Qui peut @mentionner ce groupe ?"
         messageable: "Qui peut envoyer un message à ce groupe ?"
@@ -417,9 +449,6 @@ fr:
         mods_and_admins: "Seulement les modérateurs et les administrateurs "
         members_mods_and_admins: "Seulement les membres du groupe, les modérateurs et les administrateurs "
         everyone: "Tout le monde"
-      trust_levels:
-        title: "Niveau de confiance automatiquement attribué lorsque les membres sont ajoutés :"
-        none: "Aucun"
       notifications:
         watching:
           title: "Surveiller"
@@ -444,23 +473,22 @@ fr:
       flair_color_placeholder: "(Facultatif) Couleur en héxadécimal"
       flair_preview_icon: "Prévisualiser l'icône"
       flair_preview_image: "Prévisualiser l'image"
-      flair_note: "Note : la vignette d'avatar sera uniquement affichée pour le groupe principal d'un utilisateur."
     user_action_groups:
-      '1': "J'aime donnés"
-      '2': "J'aime reçus"
-      '3': "Signets"
-      '4': "Sujets"
-      '5': "Réponses"
-      '6': "Réponses"
-      '7': "Mentions"
-      '9': "Citations"
-      '11': "Modifications"
-      '12': "Éléments envoyés"
-      '13': "Boîte de réception"
-      '14': "En attente"
+      "1": "J'aime donnés"
+      "2": "J'aime reçus"
+      "3": "Signets"
+      "4": "Sujets"
+      "5": "Réponses"
+      "6": "Réponses"
+      "7": "Mentions"
+      "9": "Citations"
+      "11": "Modifications"
+      "12": "Éléments envoyés"
+      "13": "Boîte de réception"
+      "14": "En attente"
     categories:
       all: "toutes les catégories"
-      all_subcategories: "toutes"
+      all_subcategories: "tout dans %{categoryName}"
       no_subcategory: "aucune"
       category: "Catégorie"
       category_list: "Afficher la liste des catégories"
@@ -479,11 +507,11 @@ fr:
       toggle_ordering: "modifier le mode du tri"
       subcategories: "Sous-catégories"
       topic_sentence:
-        one: "1 sujet"
-        other: "%{count} sujets"
+        one: 1 sujet
+        other: '%{count} sujets'
       topic_stat_sentence:
-        one: "%{count} nouveau sujet par %{unit}."
-        other: "%{count} nouveaux sujets par %{unit}."
+        one: '%{count} nouveau sujet par %{unit}.'
+        other: '%{count} nouveaux sujets par %{unit}.'
     ip_lookup:
       title: Rechercher l'adresse IP
       hostname: Nom de l'hôte
@@ -512,12 +540,13 @@ fr:
         confirm: "Êtes-vous sûr de vouloir télécharger vos messages ?"
         success: "Le téléchargement a démarré ; vous serez notifié par message lorsqu'il est terminé."
         rate_limit_error: "Les messages peuvent être téléchargés une fois par jour, veuillez ressayer demain."
-      new_private_message: "Créer un message privé"
-      private_message: "Message privé"
-      private_messages: "Messages privés"
+      new_private_message: "Créer un message direct"
+      private_message: "Message direct"
+      private_messages: "Messages directs"
       activity_stream: "Activité"
       preferences: "Préférences"
       expand_profile: "Développer"
+      collapse_profile: "Réduire"
       bookmarks: "Signets"
       bio: "À propos de moi"
       invited_by: "Invité par"
@@ -525,7 +554,7 @@ fr:
       notifications: "Notifications"
       statistics: "Statistiques"
       desktop_notifications:
-        label: "Notifications de bureau"
+        label: "Notifications actives"
         not_supported: "Les notifications ne sont pas supportées avec ce navigateur. Désolé."
         perm_default: "Activer les notifications"
         perm_denied_btn: "Permission refusée"
@@ -533,6 +562,7 @@ fr:
         disable: "Désactiver les notifications"
         enable: "Activer les notifications"
         each_browser_note: "Note : Vous devez changer ce paramètre sur chaque navigateur que vous utilisez."
+        consent_prompt: "Souhaitez-vous recevoir des notifications actives quand on répond à vos messages ?"
       dismiss: 'Ignorer'
       dismiss_notifications: "Tout ignorer"
       dismiss_notifications_tooltip: "Marquer les notifications comme lues"
@@ -540,7 +570,7 @@ fr:
       disable_jump_reply: "Ne pas aller à mon nouveau message après avoir répondu"
       dynamic_favicon: "Faire apparaître le nombre de sujets récemment créés ou mis à jour sur l'icône navigateur"
       theme_default_on_all_devices: "En faire mon thème par défaut sur tous mes périphériques"
-      allow_private_messages: "Autoriser les autres utilisateurs à m'envoyer des messages privés"
+      allow_private_messages: "Permettre les autres utilisateurs de m'envoyer des messages directs"
       external_links_in_new_tab: "Ouvrir tous les liens externes dans un nouvel onglet"
       enable_quoting: "Proposer de citer le texte sélectionné"
       change: "modifier"
@@ -585,7 +615,7 @@ fr:
       delete_account: "Supprimer mon compte"
       delete_account_confirm: "Êtes-vous sûr de vouloir supprimer définitivement votre compte ? Cette action ne peut pas être annulée !"
       deleted_yourself: "Votre compte a été supprimé avec succès."
-      delete_yourself_not_allowed: "Vous ne pouvez pas supprimer votre compte maintenant. Contactez un administrateur pour faire supprimer votre compte pour vous."
+      delete_yourself_not_allowed: "Veuiller contacter un responsable si vous souhaiter faire supprimer votre compte."
       unread_message_count: "Messages"
       admin_delete: "Supprimer"
       users: "Utilisateurs"
@@ -601,7 +631,7 @@ fr:
       api_approved: "Approuvé :"
       theme: "Thème"
       home: "Page d'accueil par défaut"
-      staged: "En attente"
+      staged: "Distant"
       staff_counters:
         flags_given: "signalements utiles"
         flagged_posts: "messages signalés"
@@ -619,6 +649,7 @@ fr:
         move_to_archive: "Archiver"
         failed_to_move: "Impossible de déplacer les messages sélectionnés (peut-être que votre connexion est coupée)"
         select_all: "Tout sélectionner"
+        tags: "Tags"
       preferences_nav:
         account: "Compte"
         profile: "Profil"
@@ -636,6 +667,19 @@ fr:
         set_password: "Définir le mot de passe"
         choose_new: "Choisissez un nouveau mot de passe"
         choose: "Choisissez un mot de passe"
+      second_factor:
+        title: "Authentification à deux facteurs"
+        disable: "Désactiver l'authentification à deux facteurs"
+        confirm_password_description: "Merci de confirmer votre mot de passe pour continuer"
+        label: "Code"
+        enable_description: |
+          Scanner ce code QR dans une app (<a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target="_blank">Android</a> – <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8" target="_blank">iOS</a> – <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a>) et saisir votre code d'authentification.
+        disable_description: "Veuillez saisir le code d'authentification de votre app"
+        show_key_description: "Saisi manuel"
+        extended_description: |
+          L'authentification à deux facteurs ajoute une sécurité supplémentaire à votre compte en exigeant un jeton unique en
+          plus de votre mot de passe. Les jetons peuvent être générés sur les appareils <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target='_blank'>Android</a>, <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8">iOS</a>, et <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a>.
+        oauth_enabled_warning: "Veuillez noter que les connexions sociales seront désactivées une fois que l'authentification à deux facteurs aura été activée sur votre compte."
       change_about:
         title: "Modifier À propos de moi"
         error: "Il y a eu une erreur lors de la modification de cette valeur."
@@ -677,8 +721,8 @@ fr:
         authenticated: "Votre adresse de courriel a été authentifiée par {{provider}}"
         frequency_immediately: "Nous vous enverrons un courriel immédiatement si vous n'avez pas lu le contenu en question."
         frequency:
-          one: "Nous vous enverrons des courriels seulement si nous ne vous avons pas vu sur le site dans la dernière minute."
-          other: "Nous vous enverrons des courriels seulement si nous ne vous avons pas vu sur le site dans les dernières {{count}} minutes."
+          one: Nous vous enverrons des courriels seulement si nous ne vous avons pas vu sur le site dans la dernière minute.
+          other: Nous vous enverrons des courriels seulement si nous ne vous avons pas vu sur le site dans les dernières {{count}} minutes.
       name:
         title: "Nom d'utilisateur"
         instructions: "votre nom complet (facultatif)"
@@ -709,8 +753,6 @@ fr:
       created: "Inscrit"
       log_out: "Se déconnecter"
       location: "Localisation"
-      card_badge:
-        title: "Badge pour la carte de l'utilisateur"
       website: "Site internet"
       email_settings: "Courriel"
       like_notification_frequency:
@@ -735,7 +777,7 @@ fr:
       include_tl0_in_digests: "Inclure les contributions des nouveaux utilisateurs dans les résumés par courriel"
       email_in_reply_to: "Inclure un extrait du message auquel il a été répondu dans les courriels"
       email_direct: "M'envoyer un courriel quand quelqu'un me cite, répond à mon message ou mentionne mon @pseudo ou m'invite à rejoindre un sujet"
-      email_private_messages: "M'envoyer un courriel quand quelqu'un m'envoie un message privé"
+      email_private_messages: "M'envoyer un courriel quand quelqu'un m'envoie un message direct"
       email_always: "Recevoir des notifications par email même lorsque je suis actif sur le site"
       other_settings: "Autre"
       categories_settings: "Catégories"
@@ -766,8 +808,8 @@ fr:
         sent: "Envoyé"
         none: "Il n'y a pas d'invitations en attente à afficher."
         truncated:
-          one: "Afficher la première invitation."
-          other: "Afficher les {{count}} premières invitations."
+          one: Afficher la première invitation.
+          other: Afficher les {{count}} premières invitations.
         redeemed: "Invitations acceptées"
         redeemed_tab: "Utilisées"
         redeemed_tab_with_count: "Invitations acceptées ({{count}})"
@@ -798,7 +840,7 @@ fr:
         bulk_invite:
           none: "Vous n'avez encore invité personne. Envoyez des invitations individuelles ou à plusieurs personnes en même temps en <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>envoyant un fichier CSV.</a>"
           text: "Invitation massive depuis un fichier"
-          success: "Le fichier a été correctement importé. Vous serez notifié par message privé lorsque le traitement sera terminé."
+          success: "Le fichier a été correctement importé. Vous serez notifié par message direct lorsque le traitement sera terminé."
           error: "Désolé, le fichier doit être au format CSV."
       password:
         title: "Mot de passe"
@@ -814,29 +856,29 @@ fr:
         time_read: "de lecture"
         recent_time_read: "temps de lecture récent"
         topic_count:
-          one: "sujets créés"
-          other: "sujets créés"
+          one: sujets créés
+          other: sujets créés
         post_count:
-          one: "message créé"
-          other: "messages créés"
+          one: message créé
+          other: messages créés
         likes_given:
-          one: "donné"
-          other: "donnés"
+          one: donné
+          other: donnés
         likes_received:
-          one: "reçu"
-          other: "reçus"
+          one: reçu
+          other: reçus
         days_visited:
-          one: "jour visité"
-          other: "jours visités"
+          one: jour visité
+          other: jours visités
         topics_entered:
-          one: "sujet vu"
-          other: "sujets vus"
+          one: sujet vu
+          other: sujets vus
         posts_read:
-          one: "message lu"
-          other: "messages lus"
+          one: message lu
+          other: messages lus
         bookmark_count:
-          one: "signet"
-          other: "signets"
+          one: signet
+          other: signets
         top_replies: "Meilleures réponses"
         no_replies: "Pas encore de réponses."
         more_replies: "Plus de réponses"
@@ -852,7 +894,7 @@ fr:
         most_liked_users: "A le plus aimé"
         most_replied_to_users: "A le plus répondu à"
         no_likes: "Pas encore de J'aime."
-      associated_accounts: "Connexions"
+      associated_accounts: "Identifiants"
       ip_address:
         title: "Dernières adresses IP"
       registration_ip_address:
@@ -862,12 +904,13 @@ fr:
         header_title: "profil, messages, signets et préférences"
       title:
         title: "Titre"
+        none: "(aucun)"
       filters:
         all: "Tous"
       stream:
         posted_by: "Rédigé par"
         sent_by: "Envoyé par"
-        private_message: "message privé"
+        private_message: "message direct"
         the_topic: "le sujet"
     loading: "Chargement…"
     errors:
@@ -904,8 +947,8 @@ fr:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> a atteint la limite de %{siteSettingRate} définie dans les paramètres du site."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> a dépassé la limite de %{siteSettingRate} définie dans les paramètres du site."
       rate:
-        one: "1 erreur/%{duration}"
-        other: "%{count} erreurs/%{duration}"
+        one: 1 erreur/%{duration}
+        other: '%{count} erreurs/%{duration}'
     learn_more: "en savoir plus…"
     all_time: 'total'
     all_time_desc: 'nombre total de sujets créés'
@@ -947,11 +990,11 @@ fr:
       enable: "Cacher les messages supprimés"
       disable: "Afficher les messages supprimés"
     private_message_info:
-      title: "Message privé"
+      title: "Message direct"
       invite: "Inviter d'autres utilisateurs…"
       leave_message: "Êtes-vous sûr de vouloir quitter cette conversation ?"
-      remove_allowed_user: "Êtes-vous sûr de vouloir supprimer {{name}} de ce message privé ?"
-      remove_allowed_group: "Êtes-vous sûr de vouloir supprimer {{name}} de ce message privé ?"
+      remove_allowed_user: "Êtes-vous sûr de vouloir supprimer {{name}} de ce message direct ?"
+      remove_allowed_group: "Êtes-vous sûr de vouloir supprimer {{name}} de ce message direct ?"
     email: 'Courriel'
     username: 'Pseudo'
     last_seen: 'Vu'
@@ -977,14 +1020,26 @@ fr:
       help: "Le courriel n'est pas arrivé ? Pensez bien à vérifier dans votre dossier de spam.<p>Vous n'êtes pas sûr de l'adresse électronique que vous avez utilisée ? Saisissez ici une adresse électronique, et nous vous dirons si elle existe ici.</p><p>Si vous n'avez plus accès à l'adresse électronique de votre compte, merci de contacter <a href='/about'>nos responsables serviables.</a></p>"
       button_ok: "OK"
       button_help: "Aide"
+    email_login:
+      link_label: "M'envoyer un lien de connexion par courriel"
+      button_label: "par courriel"
+      complete_username: "Si un compte correspond au pseudo <b>%{username}</b>, vous devriez recevoir rapidement un courriel avec un lien pour vous connecter."
+      complete_email: "Si un compte correspond à l'adresse de courriel <b>%{email}</b>, vous devriez recevoir rapidement un courriel avec un lien pour vous connecter."
+      complete_username_found: "Nous avons trouvé un compte correspond au pseudo <b>%{username}</b>, vous devriez recevoir rapidement un courriel avec un lien pour vous connecter."
+      complete_email_found: "Nous avons trouvé un compte correspond au courriel <b>%{email}</b>, vous devriez recevoir rapidement un courriel avec un lien pour vous connecter."
+      complete_username_not_found: "Aucun compte ne correspond au pseudo <b>%{username}</b>"
+      complete_email_not_found: "Aucun compte ne correspond à <b>%{email}</b>"
     login:
       title: "Se connecter"
       username: "Utilisateur"
       password: "Mot de passe"
+      second_factor_title: "Authentification à deux facteurs"
+      second_factor_description: "Veuillez saisir le code d'authentification de votre app :"
       email_placeholder: "courriel ou pseudo"
       caps_lock_warning: "Majuscules vérrouillées"
       error: "Erreur inconnue"
       rate_limit: "Merci de patienter avant de vous reconnecter."
+      blank_username: "Merci de saisir votre courriel ou pseudo."
       blank_username_or_password: "Merci de saisir votre courriel ou pseudo, et mot de passe."
       reset_password: 'Réinitialiser le mot de passe'
       logging_in: "Connexion en cours…"
@@ -997,6 +1052,7 @@ fr:
       not_allowed_from_ip_address: "Vous ne pouvez pas vous connecter depuis cette adresse IP."
       admin_not_allowed_from_ip_address: "Vous ne pouvez pas vous connecter comme administrateur depuis cette adresse IP."
       resend_activation_email: "Cliquez ici pour envoyer à nouveau le courriel d'activation."
+      omniauth_disallow_totp: "L'authentification à deux facteurs est activée sur votre compte. Veuillez vous connecter avec votre mot de passe."
       resend_title: "Renvoyer le courriel d'activation"
       change_email: "Changer l'adresse de courriel"
       provide_new_email: "Donnez une nouvelle adresse et nous allons renvoyer votre courriel de confirmation."
@@ -1050,17 +1106,26 @@ fr:
       facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "Catégories seules"
-      categories_with_featured_topics: "Catégories et sujets sélectionnés"
+      categories_with_featured_topics: "Catégories avec sujets à la une"
       categories_and_latest_topics: "Catégories et sujets récents"
+      categories_and_top_topics: "Catégories et meilleurs sujets"
     shortcut_modifier_key:
       shift: 'Maj'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    conditional_loading_section:
+      loading: Chargement…
     select_kit:
       default_header_text: Sélectionner…
       no_content: Aucune correspondance trouvée
       filter_placeholder: Rechercher...
-      create: "Créer {{content}}"
+      create: "Créer : '{{content}}'"
+      max_content_reached:
+        one: Vous ne pouvez séléctionner que {{count}} élément.
+        other: Vous ne pouvez séléctionner que {{count}} éléments.
+      min_content_not_reached:
+        one: Séléctionner au moins {{count}} élément.
+        other: Séléctionner au moins {{count}} éléments.
     emoji_picker:
       filter_placeholder: Chercher un emoji
       people: Personnes
@@ -1078,6 +1143,13 @@ fr:
       medium_tone: Teint moyen
       medium_dark_tone: Teint légèrement foncé
       dark_tone: Teint foncé
+    shared_drafts:
+      title: "Ébauches partagées"
+      notice: "Ce sujet n'est visible que pour ceux qui peuvent voir la catégorie <b>{{category}}</b>."
+      destination_category: "Catégorie déstinataire"
+      publish: "Publier ébauche partagée"
+      confirm_publish: "Êtes-vous sûr de vouloir publier cette ébauche ?"
+      publishing: "Sujet en cours de publication..."
     composer:
       emoji: "Emoji :)"
       more_emoji: "plus…"
@@ -1086,8 +1158,8 @@ fr:
       unlist: "invisible"
       blockquote_text: "Citation"
       add_warning: "Ceci est un avertissement officiel."
-      toggle_whisper: "Modifier le murmure"
-      toggle_unlisted: "Modifier la visibilité"
+      toggle_whisper: "Basculer murmure"
+      toggle_unlisted: "Basculer la visibilité"
       posting_not_on_topic: "À quel sujet voulez-vous répondre ?"
       saving_draft_tip: "sauvegarde en cours…"
       saved_draft_tip: "sauvegardé"
@@ -1096,11 +1168,11 @@ fr:
       drafts_offline: "sauvegardé hors ligne"
       group_mentioned_limit: "<b>Attention !</b> Vous avez mentionné <a href='{{group_link}}'>{{group}}</a>, cependant ce groupe a plus de membres que le nombre de mentions limite de {{max}} utilisateurs configuré par l'administrateur. Personne ne sera notifié."
       group_mentioned:
-        one: "En mentionnant {{group}}, vous êtes sur le point de notifier <a href='{{group_link}}'>1 personne</a> – êtes-vous sûr ?"
-        other: "En mentionnant {{group}}, vous êtes sur le point de notifier <a href='{{group_link}}'>{{count}} personnes</a> – êtes-vous sûr ?"
+        one: En mentionnant {{group}}, vous êtes sur le point de notifier <a href='{{group_link}}'>1 personne</a> – êtes-vous sûr ?
+        other: En mentionnant {{group}}, vous êtes sur le point de notifier <a href='{{group_link}}'>{{count}} personnes</a> – êtes-vous sûr ?
       cannot_see_mention:
         category: "Vous avez mentionné {{username}} mais il ne sera pas notifié car il n'a pas accès à cette catégorie. Vous devez ajouter cet utilisateur à un groupe ayant accès à cette catégorie."
-        private: "Vous avez mentionné {{username}} mais il ne sera pas notifié car il ne peut pas voir ce message privé. Vous devez inviter cet utilisateur à la discussion."
+        private: "Vous avez mentionné {{username}} mais il ne sera pas notifié car il ne peut pas voir ce message direct. Vous devez inviter cet utilisateur à la discussion."
       duplicate_link: "Il semblerait que votre lien vers <b>{{domain}}</b> a déjà été publié dans le sujet par <b>@{{username}}</b> dans <a href='{{post_url}}'>une réponse de {{ago}}</a> – êtes vous sûr de vouloir le publier à nouveau ?"
       error:
         title_missing: "Le titre est obligatoire."
@@ -1110,14 +1182,17 @@ fr:
         post_length: "Le message doit avoir au moins {{min}} caractères"
         try_like: 'Avez-vous essayé le bouton <i class="fa fa-heart"></i> ?'
         category_missing: "Vous devez choisir une catégorie"
+        tags_missing: "Vous devez choisir au moins {{count}} tags"
       save_edit: "Sauvegarder"
       reply_original: "Répondre sur le sujet d'origine"
       reply_here: "Répondre ici"
       reply: "Répondre"
       cancel: "Annuler"
       create_topic: "Créer le sujet"
-      create_pm: "Message privé"
+      create_pm: "Message direct"
       create_whisper: "Murmurer"
+      create_shared_draft: "Créer ébauche partagée"
+      edit_shared_draft: "Modifier ébauche partagée"
       title: "ou appuyez sur Ctrl+Entrée"
       users_placeholder: "Ajouter un utilisateur"
       title_placeholder: "Quel est le sujet en une courte phrase ?"
@@ -1127,6 +1202,8 @@ fr:
       topic_featured_link_placeholder: "Entrez un lien affiché avec le titre."
       remove_featured_link: "Retirer le lien du sujet"
       reply_placeholder: "Écrivez ici. Utilisez Markdown, BBCode, ou HTML pour mettre en forme. Glissez ou collez des images."
+      reply_placeholder_no_images: "Écrivez ici. Utilisez Markdown, BBCode, ou HTML pour mettre en forme."
+      reply_placeholder_choose_category: "Vous devez sélectionner une catégorie avant de rédiger ici."
       view_new_post: "Voir votre nouveau message."
       saving: "Sauvegarde"
       saved: "Sauvegardé !"
@@ -1156,6 +1233,7 @@ fr:
       olist_title: "Liste numérotée"
       ulist_title: "Liste à puces"
       list_item: "Élément"
+      toggle_direction: "Basculer sens"
       help: "Aide Markdown"
       collapse: "réduire le panneau d'édition"
       abandon: "fermer le panneau d'édition et supprimer le brouillon"
@@ -1166,14 +1244,35 @@ fr:
         title: "Avez-vous oublié d'ajouter des destinataires ?"
         body: "Pour le moment, ce message est uniquement envoyé à vous-même !"
       admin_options_title: "Paramètres optionnels pour ce sujet"
+      composer_actions:
+        reply_to_post:
+          label: "Réponse à message %{postNumber} par %{postUsername}"
+          desc: Répondre à un message spécifique
+        reply_as_new_topic:
+          label: Répondre à un sujet lié
+          desc: Créer un nouveau sujet lié à ce sujet
+        reply_as_private_message:
+          label: Nouveau message
+          desc: Créer un nouveau message direct
+        reply_to_topic:
+          label: Répondre au sujet
+          desc: "Répondre au sujet, pas à un message spécifique"
+        toggle_whisper:
+          label: Basculer murmure
+          desc: Les mumures ne sont visibles qu'aux responsables
+        create_topic:
+          label: "Nouveau sujet"
+        shared_draft:
+          label: "Ebauche partagée"
+          desc: "Créer ébauche d'un sujet qui ne sera visible qu'aux responsables"
     notifications:
       tooltip:
         regular:
-          one: "1 notification non vue"
-          other: "{{count}} notifications non vues"
+          one: 1 notification non vue
+          other: '{{count}} notifications non vues'
         message:
-          one: "1 message non lu"
-          other: "{{count}} messages non lus"
+          one: 1 message non lu
+          other: '{{count}} messages non lus'
       title: "notifications des mentions de votre @pseudo, des réponses à vos messages, à vos sujets, etc."
       none: "Impossible de charger les notifications pour le moment."
       empty: "Aucune notification trouvée."
@@ -1188,8 +1287,8 @@ fr:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} et 1 autre</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} et {{count}} autres</span> {{description}}"
+        one: <span>{{username}}, {{username2}} et 1 autre</span> {{description}}
+        other: <span>{{username}}, {{username2}} et {{count}} autres</span> {{description}}
       private_message: "<span>{{username}}</span> {{description}}"
       invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
       invited_to_topic: "<span>{{username}}</span> {{description}}"
@@ -1200,32 +1299,18 @@ fr:
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>Nouveau sujet</span> {{description}}"
       group_message_summary:
-        one: "{{count}} message dans la boîte de réception de {{group_name}}"
-        other: "{{count}} messages dans la boîte de réception de {{group_name}}"
-      alt:
-        mentioned: "Mentionné par"
-        quoted: "Cité par"
-        replied: "Répondu"
-        posted: "Message par"
-        edited: "Modifier votre message par"
-        liked: "A aimé votre message"
-        private_message: "Message privé de"
-        invited_to_private_message: "Invité pour un message privé par"
-        invited_to_topic: "Invité à un sujet par"
-        invitee_accepted: "Invitation acceptée par"
-        moved_post: "Votre message a été déplacé par"
-        linked: "Lien vers votre message"
-        granted_badge: "Badge attribué"
-        group_message_summary: "Messages dans la boite de réception du groupe"
-        topic_reminder: "Un rappel"
+        one: '{{count}} message dans la boîte de réception de {{group_name}}'
+        other: '{{count}} messages dans la boîte de réception de {{group_name}}'
       popup:
         mentioned: '{{username}} vous a mentionné dans « {{topic}} » - {{site_title}}'
         group_mentioned: '{{username}} vous a mentionné dans « {{topic}} » - {{site_title}}'
         quoted: '{{username}} vous a cité dans « {{topic}} » - {{site_title}}'
         replied: '{{username}} vous a répondu dans « {{topic}} » - {{site_title}}'
         posted: '{{username}} a posté dans « {{topic}} » - {{site_title}}'
-        private_message: '{{username}} vous a envoyé un message privé dans « {{topic}} » - {{site_title}}'
+        private_message: '{{username}} vous a envoyé un message direct dans « {{topic}} » - {{site_title}}'
         linked: '{{username}} a créé un lien vers votre message posté dans « {{topic}} » - {{site_title}}'
+        confirm_title: 'Notifications activées - %{site_title}'
+        confirm_body: 'Les notifications ont été activées.'
     upload_selector:
       title: "Ajouter une image"
       title_with_attachments: "Ajouter une image ou un fichier"
@@ -1252,9 +1337,10 @@ fr:
       clear_all: "Tout désélectionner"
       too_short: "Votre terme de recherche est trop court."
       result_count:
-        one: "1 résultat pour <span class='term'>{{term}}</span>"
-        other: "{{count}}{{plus}} résultats pour <span class='term'>{{term}}</span>"
+        one: <span>1 résultat pour</span><span class='term'>{{term}}</span>
+        other: <span>{{count}}{{plus}} résultats pour</span><span class='term'>{{term}}</span>
       title: "rechercher des sujets, messages, utilisateurs ou catégories"
+      full_page_title: "rechercher des sujets ou messages"
       no_results: "Aucun résultat."
       no_more_results: "Aucun résultat supplémentaire."
       searching: "Recherche en cours…"
@@ -1271,7 +1357,7 @@ fr:
         user: "Chercher dans les messages de @{{username}}"
         category: "Rechercher dans la catégorie #{{category}}"
         topic: "Rechercher dans ce sujet"
-        private_messages: "Rechercher des messages privés"
+        private_messages: "Rechercher des messages directs"
       advanced:
         title: Recherche avancée
         posted_by:
@@ -1290,7 +1376,7 @@ fr:
           posted: auxquels j'ai participé
           watching: que je surveille
           tracking: que je suis
-          private: qui sont dans mes messages privés
+          private: qui sont dans mes messages directs
           bookmarks: auxquels j'ai mis un signet
           first: qui sont les premiers messages
           pinned: qui sont épinglés
@@ -1334,7 +1420,7 @@ fr:
         dismiss_tooltip: "Ignorer les nouveaux messages ou arrêter de suivre les sujets"
         also_dismiss_topics: "Arrêter de suivre ces sujets pour qu'ils ne soient plus jamais marqués comme non lus"
         dismiss_new: "Ignorer les nouveaux"
-        toggle: "activer la sélection multiple de sujets"
+        toggle: "basculer la sélection multiple de sujets"
         actions: "Actions sur la sélection"
         change_category: "Définir la catégorie"
         close_topics: "Fermer les sujets"
@@ -1342,8 +1428,8 @@ fr:
         notification_level: "Notifications"
         choose_new_category: "Choisissez la nouvelle catégorie pour les sujets :"
         selected:
-          one: "Vous avez sélectionné <b>1</b> sujet."
-          other: "Vous avez sélectionné <b>{{count}}</b> sujets."
+          one: Vous avez sélectionné <b>1</b> sujet.
+          other: Vous avez sélectionné <b>{{count}}</b> sujets.
         change_tags: "Changer les tags"
         append_tags: "Ajouter les tags"
         choose_new_tags: "Choisir les nouveaux tags pour ces sujets :"
@@ -1375,14 +1461,12 @@ fr:
         bookmarks: "Il n'y a plus de sujets avec des signets."
         search: "Il n'y a plus de résultats à votre recherche."
     topic:
-      unsubscribe:
-        stop_notifications: "Vous recevrez moins de notifications pour <strong>{{title}}</strong>"
-        change_notification_state: "Votre statut de notification est"
       filter_to:
-        one: "1 message dans le sujet"
-        other: "{{count}} messages dans le sujet"
+        one: 1 message dans le sujet
+        other: '{{count}} messages dans le sujet'
       create: 'Créer un sujet'
       create_long: 'Créer un nouveau sujet'
+      open_draft: "Ouvrir ébauche"
       private_message: 'Écrire un message'
       archive_message:
         help: 'Déplacer le message dans votre archive'
@@ -1390,14 +1474,17 @@ fr:
       move_to_inbox:
         title: 'Déplacer dans la boîte de réception'
         help: 'Redéplacer dans la boîte de réception'
+      edit_message:
+        help: 'Modifier premier message'
+        title: 'Modifier message'
       list: 'Sujets'
       new: 'nouveau sujet'
       unread: 'non lus'
       new_topics:
-        one: '1 nouveau sujet'
+        one: 1 nouveau sujet
         other: '{{count}} nouveaux sujets'
       unread_topics:
-        one: '1 sujet non lu'
+        one: 1 sujet non lu
         other: '{{count}} sujets non lus'
       title: 'Sujet'
       invalid_access:
@@ -1411,27 +1498,27 @@ fr:
         title: "Sujet non trouvé"
         description: "Désolé, nous n'avons pas trouvé ce sujet. Peut-être a t-il été retiré par un modérateur ?"
       total_unread_posts:
-        one: "vous avez 1 message non lu dans ce sujet"
-        other: "vous avez {{count}} messages non lus dans ce sujet"
+        one: vous avez 1 message non lu dans ce sujet
+        other: vous avez {{count}} messages non lus dans ce sujet
       unread_posts:
-        one: "vous avez 1 message non lu sur ce sujet"
-        other: "vous avez {{count}} messages non lus sur ce sujet"
+        one: vous avez 1 message non lu sur ce sujet
+        other: vous avez {{count}} messages non lus sur ce sujet
       new_posts:
-        one: "il y a 1 nouveau message sur ce sujet depuis votre derniere lecture"
-        other: "il y a {{count}} nouveaux messages sur ce sujet depuis votre derniere lecture"
+        one: il y a 1 nouveau message sur ce sujet depuis votre derniere lecture
+        other: il y a {{count}} nouveaux messages sur ce sujet depuis votre derniere lecture
       likes:
-        one: "1 personne a aimé ce sujet"
-        other: "{{count}} personnes ont aimé ce sujet"
+        one: 1 personne a aimé ce sujet
+        other: '{{count}} personnes ont aimé ce sujet'
       back_to_list: "Retour à la liste des sujets"
       options: "Options du sujet"
       show_links: "afficher les liens dans ce sujet"
-      toggle_information: "afficher les détails de ce sujet"
+      toggle_information: "basculer affichage des détails de ce sujet"
       read_more_in_category: "Vous voulez en lire plus ? Découvrez d'autres sujets dans {{catLink}} ou {{latestLink}}."
       read_more: "Vous voulez en lire plus ? {{catLink}} ou {{latestLink}}."
       read_more_MF: "Il y { UNREAD, plural, =0 {} one { a <a href='/unread'>1 sujet non lu</a> } other { a <a href='/unread'># sujets non lus</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{et } false {a } other{}} <a href='/new'>1 nouveau sujet</a> } other { {BOTH, select, true{et } false {a } other{}} <a href='/new'># nouveaux sujets</a> } } restant, ou {CATEGORY, select, true {consulter les autres sujets dans {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Voir toutes les catégories
       view_latest_topics: voir les derniers sujets
-      suggest_create_topic: Pourquoi ne pas créer un sujet ?
+      suggest_create_topic: "Pourquoi ne pas créer un sujet ?"
       jump_reply_up: aller à des réponses précédentes
       jump_reply_down: allez à des réponses ultérieures
       deleted: "Ce sujet a été supprimé"
@@ -1460,7 +1547,7 @@ fr:
         pick_date_and_time: "Sélectionner une date et heure"
         set_based_on_last_post: "Fermer par rapport au dernier message"
       publish_to_category:
-        title: "Publier"
+        title: "Planifier publication"
       temp_open:
         title: "Ouvrir temporairement"
       auto_reopen:
@@ -1481,12 +1568,12 @@ fr:
         auto_close: "Ce sujet sera automatiquement fermé %{timeLeft}."
         auto_publish_to_category: "Ce sujet sera publié dans <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
         auto_close_based_on_last_post: "Ce sujet sera fermé %{duration} après la dernière réponse."
-        auto_delete: "Ce sujet sera automatiquement supprimé %{timeLeft}"
-        auto_reminder: "Vous serez rappelé sur ce sujet %{timeLeft}"
+        auto_delete: "Ce sujet sera automatiquement supprimé %{timeLeft}."
+        auto_reminder: "Vous serez rappelé sur ce sujet %{timeLeft}."
       auto_close_title: 'Paramètres de fermeture automatique'
       auto_close_immediate:
-        one: "Le dernier message dans ce sujet est déjà vieux de 1 heure donc le sujet sera immédiatement fermé."
-        other: "Le dernier message dans ce sujet est déjà vieux de %{count} heures donc le sujet sera immédiatement fermé."
+        one: Le dernier message dans ce sujet est déjà vieux de 1 heure donc le sujet sera immédiatement fermé.
+        other: Le dernier message dans ce sujet est déjà vieux de %{count} heures donc le sujet sera immédiatement fermé.
       timeline:
         back: "Retour"
         back_description: "Revenir au dernier message non lu"
@@ -1507,21 +1594,21 @@ fr:
         title: modifier la fréquence des notifications concernant ce sujet
         reasons:
           mailing_list_mode: "Vous avez activé la liste de diffusion, vous serez donc notifié des réponses à ce sujet par courriel."
-          '3_10': 'Vous recevrez des notifications car vous surveillez un tag de ce sujet.'
-          '3_6': 'Vous recevrez des notifications parce que vous surveillez cette catégorie.'
-          '3_5': 'Vous recevrez des notifications parce que vous avez commencé à surveiller ce sujet automatiquement.'
-          '3_2': 'Vous recevrez des notifications car vous surveillez ce sujet.'
-          '3_1': 'Vous recevrez des notifications car vous avez créé ce sujet.'
-          '3': 'Vous recevrez des notifications car vous surveillez ce sujet.'
-          '2_8': 'Vous verrez un compteur de nouvelles réponses car vous suivez cette catégorie.'
-          '2_4': 'Vous verrez un compteur de nouvelles réponses car vous avez répondu dans ce sujet.'
-          '2_2': 'Vous verrez un compteur de nouvelles réponses car vous suivez ce sujet.'
-          '2': 'Vous verrez un compteur de nouvelles réponses car vous <a href="/u/{{username}}/preferences">avez lu ce sujet</a>.'
-          '1_2': 'Vous serez notifié si quelqu''un mentionne votre @pseudo ou vous répond.'
-          '1': 'Vous serez notifié si quelqu''un mentionne votre @pseudo ou vous répond.'
-          '0_7': 'Vous ignorez toutes les notifications de cette catégorie.'
-          '0_2': 'Vous ignorez toutes les notifications de ce sujet.'
-          '0': 'Vous ignorez toutes les notifications de ce sujet.'
+          "3_10": 'Vous recevrez des notifications car vous surveillez un tag de ce sujet.'
+          "3_6": 'Vous recevrez des notifications parce que vous surveillez cette catégorie.'
+          "3_5": 'Vous recevrez des notifications parce que vous avez commencé à surveiller ce sujet automatiquement.'
+          "3_2": 'Vous recevrez des notifications car vous surveillez ce sujet.'
+          "3_1": 'Vous recevrez des notifications car vous avez créé ce sujet.'
+          "3": 'Vous recevrez des notifications car vous surveillez ce sujet.'
+          "2_8": 'Vous verrez un compteur de nouvelles réponses car vous suivez cette catégorie.'
+          "2_4": 'Vous verrez un compteur de nouvelles réponses car vous avez répondu dans ce sujet.'
+          "2_2": 'Vous verrez un compteur de nouvelles réponses car vous suivez ce sujet.'
+          "2": 'Vous verrez un compteur de nouvelles réponses car vous <a href="/u/{{username}}/preferences">avez lu ce sujet</a>.'
+          "1_2": 'Vous serez notifié si quelqu''un mentionne votre @pseudo ou vous répond.'
+          "1": 'Vous serez notifié si quelqu''un mentionne votre @pseudo ou vous répond.'
+          "0_7": 'Vous ignorez toutes les notifications de cette catégorie.'
+          "0_2": 'Vous ignorez toutes les notifications de ce sujet.'
+          "0": 'Vous ignorez toutes les notifications de ce sujet.'
         watching_pm:
           title: "Surveiller"
           description: "Vous serez notifié de chaque nouvelle réponse dans ce message, et le nombre de nouvelles réponses apparaîtra."
@@ -1561,7 +1648,7 @@ fr:
         visible: "Rendre visible"
         reset_read: "Réinitialiser les données de lecture"
         make_public: "Rendre le sujet public"
-        make_private: "Rendre le sujet privé"
+        make_private: "Transformer en message direct"
       feature:
         pin: "Épingler le sujet"
         unpin: "Désépingler le sujet"
@@ -1594,8 +1681,8 @@ fr:
         pin_validation: "Une date est requise pour épingler ce sujet."
         not_pinned: "Il n'y a aucun sujet épinglé dans {{categoryLink}}."
         already_pinned:
-          one: "Sujets actuellement épinglés dans {{categoryLink}} : <strong class='badge badge-notification unread'>1</strong>"
-          other: "Sujets actuellement épinglés dans {{categoryLink}} : <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: 'Sujets actuellement épinglés dans {{categoryLink}} : <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Sujets actuellement épinglés dans {{categoryLink}} : <strong class=''badge badge-notification unread''>{{count}}</strong>'
         pin_globally: "Faire apparaître ce sujet en haut de toutes les listes de sujet jusqu'à "
         confirm_pin_globally: "Vous avez déjà {{count}} sujets épinglés. Trop de sujets épinglés peut être lourd pour les nouveaux utilisateurs et les visiteurs. Êtes-vous sûr de vouloir épingler globalement un autre sujet ?"
         unpin_globally: "Enlever ce sujet du haut de toutes les listes de sujets."
@@ -1603,8 +1690,8 @@ fr:
         global_pin_note: "Les utilisateurs peuvent désépingler le sujet pour eux."
         not_pinned_globally: "Il n'y a aucun sujet épinglé globalement."
         already_pinned_globally:
-          one: "Sujets actuellement épinglés globalement : <strong class='badge badge-notification unread'>1</strong>"
-          other: "Sujets actuellement épinglés globalement : <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: 'Sujets actuellement épinglés globalement : <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Sujets actuellement épinglés globalement : <strong class=''badge badge-notification unread''>{{count}}</strong>'
         make_banner: "Mettre ce sujet à la une, il apparaîtra en haut de chaque page."
         remove_banner: "Enlever le sujet à la une qui apparaît en haut de chaque page."
         banner_note: "Les utilisateurs peuvent ignorer le sujet à la une. Seul un sujet peut être mis à la une à la fois."
@@ -1627,7 +1714,7 @@ fr:
         username_placeholder: "pseudo"
         action: 'Envoyer une invitation'
         help: 'inviter d''autres personnes sur ce sujet par email ou notifications'
-        to_forum: "Nous allons envoyer un courriel à votre ami pour lui permettre de participer au forum juste en cliquant sur un lien, sans qu'il ait à se connecter."
+        to_forum: "Nous allons envoyer un courriel à votre ami pour lui permettre de participer au forum juste en cliquant sur un lien, sans avoir à saisir un identifiant."
         sso_enabled: "Entrez le nom d'utilisateur de la personne que vous souhaitez inviter sur ce sujet."
         to_topic_blank: "Entrez le pseudo ou l'adresse email de la personne que vous souhaitez inviter sur ce sujet."
         to_topic_email: "Vous avez entré une adresse email. Nous allons envoyer une invitation à votre ami lui permettant de répondre immédiatement à ce sujet."
@@ -1641,8 +1728,8 @@ fr:
       login_reply: 'Se connecter pour répondre'
       filters:
         n_posts:
-          one: "1 message"
-          other: "{{count}} messages"
+          one: 1 message
+          other: '{{count}} messages'
         cancel: "Supprimer le filtre"
       split_topic:
         title: "Déplacer vers un nouveau sujet"
@@ -1650,15 +1737,15 @@ fr:
         topic_name: "Titre du nouveau sujet"
         error: "Il y a eu une erreur en déplaçant les messages vers un nouveau sujet."
         instructions:
-          one: "Vous êtes sur le point de créer un nouveau sujet avec le message que vous avez sélectionné."
-          other: "Vous êtes sur le point de créer un nouveau sujet avec les <b>{{count}}</b> messages que vous avez sélectionné."
+          one: Vous êtes sur le point de créer un nouveau sujet avec le message que vous avez sélectionné.
+          other: Vous êtes sur le point de créer un nouveau sujet avec les <b>{{count}}</b> messages que vous avez sélectionné.
       merge_topic:
         title: "Déplacer vers un sujet existant"
         action: "déplacer vers un sujet existant"
         error: "Il y a eu une erreur en déplaçant les messages dans ce sujet."
         instructions:
-          one: "Merci de sélectionner le sujet dans lequel vous souhaitez déplacer ce message."
-          other: "Merci de sélectionner le sujet dans lequel vous souhaitez déplacer ces <b>{{count}}</b> messages."
+          one: Merci de sélectionner le sujet dans lequel vous souhaitez déplacer ce message.
+          other: Merci de sélectionner le sujet dans lequel vous souhaitez déplacer ces <b>{{count}}</b> messages.
       merge_posts:
         title: "Fusionner les messages sélectionnés"
         action: "fusionner les messages sélectionnés"
@@ -1670,9 +1757,9 @@ fr:
         label: "Nouvel auteur des messages"
         placeholder: "pseudo du nouvel auteur"
         instructions:
-          one: "Veuillez choisir un nouvel auteur pour le message de <b>{{old_user}}</b>."
-          other: "Veuillez choisir un nouvel auteur pour les {{count}} messages de <b>{{old_user}}</b>."
-        instructions_warn: "Aucune notification à propos de ce message ne sera transférée rétroactivement au nouvel utilisateur. <br>Attention : actuellement, aucune donnée liée aux messages n'est transféré vers le nouvel utilisateur. À utiliser avec précaution."
+          one: Veuillez choisir un nouvel auteur pour le message de <b>{{old_user}}</b>.
+          other: Veuillez choisir un nouvel auteur pour les {{count}} messages de <b>{{old_user}}</b>.
+        instructions_warn: "Notez que les notifications au sujet de ce message ne seront pas transferrés au nouvel utilisateur de façon rétroactive."
       change_timestamp:
         title: "Modifier la date/heure…"
         action: "modifier la date/heure"
@@ -1689,10 +1776,10 @@ fr:
           label: 'sélectionné'
           title: 'Cliquer pour retirer le message de la sélection'
         select_replies:
-          label: 'sélectionner + les réponses'
+          label: 'sélectionner avec réponses'
           title: 'Ajouter le message et toutes ses réponses à la sélection'
         select_below:
-          label: 'sélectionner + le reste'
+          label: 'sélectionner avec suivants'
           title: 'Ajouter un message et tout ceux qui suivent à la sélection'
         delete: supprimer la sélection
         cancel: annuler la sélection
@@ -1702,14 +1789,12 @@ fr:
           one: vous avez sélectionné <b>1</b> message.
           other: Vous avez sélectionné <b>{{count}}</b> messages.
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Citer"
       edit: "<i class='fa fa-pencil'></i> {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Raison :"
       post_number: "message {{number}}"
-      wiki_last_edited_on: "Wiki dernièrement modifié le"
-      last_edited_on: "message dernièrement modifié le"
+      wiki_last_edited_on: "Wiki édité pour la dernière fois"
+      last_edited_on: "message édité pour la dernière fois"
       reply_as_new_topic: "Répondre par un nouveau sujet"
       reply_as_new_private_message: "Répondre par un nouveau message direct adressé aux mêmes destinataires"
       continue_discussion: "Suite du sujet {{postLink}} :"
@@ -1717,26 +1802,28 @@ fr:
       show_full: "Afficher le message complet"
       show_hidden: 'Afficher le contenu caché.'
       deleted_by_author:
-        one: "(message supprimé par son auteur, sera supprimé automatiquement dans %{count} heure à moins qu'il ne soit signalé)"
-        other: "(message supprimé par son auteur, sera supprimé automatiquement dans %{count} heures à moins qu'il ne soit signalé)"
+        one: (message supprimé par son auteur, sera supprimé automatiquement dans %{count} heure à moins qu'il ne soit signalé)
+        other: (message supprimé par son auteur, sera supprimé automatiquement dans %{count} heures à moins qu'il ne soit signalé)
+      collapse: "réduire"
       expand_collapse: "étendre/réduire"
+      locked: "un responsable a vérouillé ce message pour empêcher la modification"
       gap:
-        one: "voir 1 réponse cachée"
-        other: "voir {{count}} réponses cachées"
+        one: voir 1 réponse cachée
+        other: voir {{count}} réponses cachées
       unread: "Ce message est non lu"
       has_replies:
-        one: "{{count}} réponse"
-        other: "{{count}} réponses"
+        one: '{{count}} réponse'
+        other: '{{count}} réponses'
       has_likes:
-        one: "{{count}} J'aime"
-        other: "{{count}} J'aime"
+        one: '{{count}} J''aime'
+        other: '{{count}} J''aime'
       has_likes_title:
-        one: "1 personne a aimé ce message"
-        other: "{{count}} personnes ont aimé ce message"
+        one: 1 personne a aimé ce message
+        other: '{{count}} personnes ont aimé ce message'
       has_likes_title_only_you: "vous avez aimé ce message"
       has_likes_title_you:
-        one: "vous et 1 autre personne ont aimé ce message"
-        other: "vous et {{count}} autres personnes ont aimé ce message"
+        one: vous et 1 autre personne ont aimé ce message
+        other: vous et {{count}} autres personnes ont aimé ce message
       errors:
         create: "Désolé, il y a eu une erreur lors de la publication de votre message. Merci de réessayer."
         edit: "Désolé, il y a eu une erreur lors de la modification de votre message. Merci de réessayer."
@@ -1776,11 +1863,11 @@ fr:
         delete_replies:
           confirm: "Voulez-vous aussi supprimer les réponses à ce message ?"
           direct_replies:
-            one: "Oui et 1 réponse directe"
-            other: "Oui et {{count}} réponses directes"
+            one: Oui et 1 réponse directe
+            other: Oui et {{count}} réponses directes
           all_replies:
-            one: "Oui et la réponse"
-            other: "Oui et les {{count}} réponses"
+            one: Oui et la réponse
+            other: Oui et les {{count}} réponses
           just_the_post: "Non, uniquement ce message"
         admin: "actions d'administration sur le message"
         wiki: "Basculer en mode Wiki"
@@ -1790,11 +1877,16 @@ fr:
         rebake: "Reconstruire l'HTML"
         unhide: "Ré-afficher"
         change_owner: "Modifier l'auteur"
+        grant_badge: "Décerner le badge"
+        lock_post: "Vérouiller message"
+        lock_post_description: "empêcher l'utilisateur de modifier le message"
+        unlock_post: "Déverrouiller message"
+        unlock_post_description: "permettre l'utilisateur de modifier le message"
       actions:
         flag: 'Signaler'
         defer_flags:
-          one: "Ignorer le signalement"
-          other: "Ignorer les signalements"
+          one: Ignorer le signalement
+          other: Ignorer les signalements
         undo:
           off_topic: "Annuler le signalement"
           spam: "Annuler le signalement"
@@ -1811,8 +1903,8 @@ fr:
           bookmark: "signet ajouté"
           like: "a aimé ceci"
           like_capped:
-            one: "et {{count}} autre a aimé ça"
-            other: "et {{count}} autres ont aimé ça"
+            one: et {{count}} autre a aimé ça
+            other: et {{count}} autres ont aimé ça
           vote: "a voté pour ceci"
         by_you:
           off_topic: "Vous l'avez signalé comme étant hors-sujet"
@@ -1825,62 +1917,62 @@ fr:
           vote: "Vous avez voté pour ce message"
         by_you_and_others:
           off_topic:
-            one: "Vous et 1 autre personne l'avez signalé comme étant hors-sujet"
-            other: "Vous et {{count}} autres personnes l'avez signalé comme étant hors-sujet"
+            one: Vous et 1 autre personne l'avez signalé comme étant hors-sujet
+            other: Vous et {{count}} autres personnes l'avez signalé comme étant hors-sujet
           spam:
-            one: "Vous et 1 autre personne l'avez signalé comme étant du spam"
-            other: "Vous et {{count}} autres personnes l'avez signalé comme étant du spam"
+            one: Vous et 1 autre personne l'avez signalé comme étant du spam
+            other: Vous et {{count}} autres personnes l'avez signalé comme étant du spam
           inappropriate:
-            one: "Vous et 1 autre personne l'ont signalé comme inapproprié"
-            other: "Vous et {{count}} autres personnes l'ont signalé comme inapproprié"
+            one: Vous et 1 autre personne l'ont signalé comme inapproprié
+            other: Vous et {{count}} autres personnes l'ont signalé comme inapproprié
           notify_moderators:
-            one: "Vous et 1 autre personne l'ont signalé pour modération"
-            other: "Vous et {{count}} autres personnes l'ont signalé pour modération"
+            one: Vous et 1 autre personne l'ont signalé pour modération
+            other: Vous et {{count}} autres personnes l'ont signalé pour modération
           notify_user:
-            one: "1 autre personne et vous avez envoyé un message à cet utilisateur"
-            other: "{{count}} autres personnes et vous avez envoyé un message à cet utilisateur"
+            one: 1 autre personne et vous avez envoyé un message à cet utilisateur
+            other: '{{count}} autres personnes et vous avez envoyé un message à cet utilisateur'
           bookmark:
-            one: "Vous et 1 autre personne ont mis un signet à ce message"
-            other: "Vous et {{count}} autres personnes ont mis un signet à ce message"
+            one: Vous et 1 autre personne ont mis un signet à ce message
+            other: Vous et {{count}} autres personnes ont mis un signet à ce message
           like:
-            one: "Vous et 1 autre personne l'ont aimé"
-            other: "Vous et {{count}} autres personnes l'ont aimé"
+            one: Vous et 1 autre personne l'ont aimé
+            other: Vous et {{count}} autres personnes l'ont aimé
           vote:
-            one: "Vous et 1 autre personne ont voté pour"
-            other: "Vous et {{count}} autres personnes ont voté pour"
+            one: Vous et 1 autre personne ont voté pour
+            other: Vous et {{count}} autres personnes ont voté pour
         by_others:
           off_topic:
-            one: "1 personne l'a signalé comme étant hors-sujet"
-            other: "{{count}} personnes l'ont signalé comme étant hors-sujet"
+            one: 1 personne l'a signalé comme étant hors-sujet
+            other: '{{count}} personnes l''ont signalé comme étant hors-sujet'
           spam:
-            one: "1 personne a signalé ceci comme étant du spam"
-            other: "{{count}} personnes ont signalé ceci comme étant du spam"
+            one: 1 personne a signalé ceci comme étant du spam
+            other: '{{count}} personnes ont signalé ceci comme étant du spam'
           inappropriate:
-            one: "1 personne a signalé ceci comme étant inapproprié"
-            other: "{{count}} personnes ont signalé ceci comme étant inapproprié"
+            one: 1 personne a signalé ceci comme étant inapproprié
+            other: '{{count}} personnes ont signalé ceci comme étant inapproprié'
           notify_moderators:
-            one: "1 personne a signalé ceci pour modération"
-            other: "{{count}} personnes ont signalé pour modération"
+            one: 1 personne a signalé ceci pour modération
+            other: '{{count}} personnes ont signalé pour modération'
           notify_user:
-            one: "1 personne a envoyé un message à cet utilisateur"
-            other: "{{count}} personnes ont envoyé un message à cet utilisateur"
+            one: 1 personne a envoyé un message à cet utilisateur
+            other: '{{count}} personnes ont envoyé un message à cet utilisateur'
           bookmark:
-            one: "1 personne a mis un signet à ce message"
-            other: "{{count}} personnes ont mis un signet à ce message"
+            one: 1 personne a mis un signet à ce message
+            other: '{{count}} personnes ont mis un signet à ce message'
           like:
-            one: "1 personne a aimé ceci"
-            other: "{{count}} personnes ont aimé ceci"
+            one: 1 personne a aimé ceci
+            other: '{{count}} personnes ont aimé ceci'
           vote:
-            one: "1 personne a voté pour ce message"
-            other: "{{count}} personnes ont voté pour ce message"
+            one: 1 personne a voté pour ce message
+            other: '{{count}} personnes ont voté pour ce message'
       delete:
         confirm:
-          one: "Êtes-vous sûr de vouloir supprimer ce message ?"
-          other: "Êtes-vous sûr de vouloir supprimer ces {{count}} messages ?"
+          one: Êtes-vous sûr de vouloir supprimer ce message ?
+          other: Êtes-vous sûr de vouloir supprimer ces {{count}} messages ?
       merge:
         confirm:
-          one: "Êtes-vous sûr de vouloir fusionner ces messages ?"
-          other: "Êtes-vous sûr de vouloir fusionner ces {{count}} messages ?"
+          one: Êtes-vous sûr de vouloir fusionner ces messages ?
+          other: Êtes-vous sûr de vouloir fusionner ces {{count}} messages ?
       revisions:
         controls:
           first: "Première révision"
@@ -1926,11 +2018,11 @@ fr:
       settings: 'Paramètres'
       topic_template: "Modèle de sujet"
       tags: "Tags"
-      tags_allowed_tags: "N'autoriser que ces tags à être utilisés dans cette catégorie:"
-      tags_allowed_tag_groups: "N'autoriser que les tags de ces groupes à être utilisés dans cette catégorie:"
+      tags_allowed_tags: "N'autoriser que ces tags à être utilisés dans cette catégorie :"
+      tags_allowed_tag_groups: "N'autoriser que les tags de ces groupes à être utilisés dans cette catégorie :"
       tags_placeholder: "(Facultatif) liste des tags autorisés"
       tag_groups_placeholder: "(Facultatif) liste des groupes de tags autorisés"
-      topic_featured_link_allowed: "Autoriser les sujets avec lien dans cette catégorie"
+      topic_featured_link_allowed: "Autoriser les liens à la une dans cette catégorie"
       delete: 'Supprimer la catégorie'
       create: 'Nouvelle catégorie'
       create_long: 'Créer une nouvelle catégorie'
@@ -1963,10 +2055,10 @@ fr:
       email_in_disabled: "La possibilité de créer des nouveaux sujets via courriel est désactivé dans les Paramètres. Pour l'activer,"
       email_in_disabled_click: 'activer le paramètre « email in ».'
       mailinglist_mirror: "La catégorie reflète une liste de diffusion"
-      suppress_from_homepage: "Retirer cette catégorie de la page d'accueil"
+      suppress_from_latest: "Retirer cette catégorie des sujets récents."
       show_subcategory_list: "Afficher la liste des sous-catégories au dessus des sujets dans cette catégorie."
       num_featured_topics: "Nombre de sujets affichés sur la page des catégories :"
-      subcategory_num_featured_topics: "Nombre de sujets sélectionnés sur la page des catégories parentes :"
+      subcategory_num_featured_topics: "Nombre de sujets à la une sur la page de la catégorie parente :"
       all_topics_wiki: "Faire des nouveaux sujets des Wikis par défaut"
       subcategory_list_style: "Style des listes de sous-catégories :"
       sort_order: "Trier la liste de sujets par :"
@@ -1980,6 +2072,7 @@ fr:
       default_position: "Position par défaut"
       position_disabled: "Les catégories seront affichées dans l'ordre d'activité. Pour contrôler l'ordre des catégories dans la liste,"
       position_disabled_click: 'activer le paramètre "fixed category positions"'
+      minimum_required_tags: 'Nombre minimum de tags requis dans un sujet :'
       parent: "Catégorie parente"
       notifications:
         watching:
@@ -2011,9 +2104,9 @@ fr:
       sort_descending: 'Décroissant'
       subcategory_list_styles:
         rows: "Rangées"
-        rows_with_featured_topics: "Rangées avec sujets sélectionnés"
+        rows_with_featured_topics: "Rangées avec sujets à la une"
         boxes: "Boîtes"
-        boxes_with_featured_topics: "Boîtes avec sujets sélectionnés"
+        boxes_with_featured_topics: "Boîtes avec sujets à la une"
     flagging:
       title: 'Merci d''aider à garder notre communauté civilisée !'
       action: 'Signaler ce message'
@@ -2037,14 +2130,14 @@ fr:
       custom_placeholder_notify_moderators: "Dites-nous ce qui vous dérange spécifiquement, et fournissez des liens pertinents et exemples si possible."
       custom_message:
         at_least:
-          one: "saisir au moins 1 caractère"
-          other: "saisir au moins {{count}} caractères"
+          one: saisir au moins 1 caractère
+          other: saisir au moins {{count}} caractères
         more:
-          one: "1 restant…"
-          other: "{{count}} restants…"
+          one: 1 restant…
+          other: '{{count}} restants…'
         left:
-          one: "1 restant"
-          other: "{{count}} restants"
+          one: 1 restant
+          other: '{{count}} restants'
     flagging_topic:
       title: "Merci de nous aider à garder notre communauté civilisé !"
       action: "Signaler Sujet"
@@ -2055,13 +2148,13 @@ fr:
       links_title: "Liens populaires"
       links_shown: "afficher plus de liens…"
       clicks:
-        one: "1 clic"
-        other: "%{count} clics"
+        one: 1 clic
+        other: '%{count} clics'
     post_links:
       about: "développer plus de liens pour ce message"
       title:
-        one: "1 autre"
-        other: "%{count} autres "
+        one: 1 autre
+        other: '%{count} autres '
     topic_statuses:
       warning:
         help: "Ceci est un avertissement officiel."
@@ -2095,22 +2188,22 @@ fr:
     original_post: "Message original"
     views: "Vues"
     views_lowercase:
-      one: "vue"
-      other: "vues"
+      one: vue
+      other: vues
     replies: "Réponses"
     views_long:
-      one: "ce sujet a été vu 1 fois"
-      other: "ce sujet a été vu {{number}} fois"
+      one: ce sujet a été vu 1 fois
+      other: ce sujet a été vu {{number}} fois
     activity: "Activité"
     likes: "J'aime"
     likes_lowercase:
-      one: "J'aime"
-      other: "J'aime"
+      one: J'aime
+      other: J'aime
     likes_long: "il y a {{number}} J'aime dans ce sujet"
     users: "Utilisateurs"
     users_lowercase:
-      one: "utilisateur"
-      other: "utilisateurs"
+      one: utilisateur
+      other: utilisateurs
     category_title: "Catégorie"
     history: "Historique"
     changed_by: "par {{author}}"
@@ -2124,8 +2217,8 @@ fr:
       latest:
         title: "Récents"
         title_with_count:
-          one: "Récent ({{count}})"
-          other: "Récents ({{count}})"
+          one: Récent ({{count}})
+          other: Récents ({{count}})
         help: "sujets avec des messages récents"
       hot:
         title: "Populaires"
@@ -2143,21 +2236,21 @@ fr:
       unread:
         title: "Non lus"
         title_with_count:
-          one: "Non lu (1)"
-          other: "Non lus ({{count}})"
+          one: Non lu (1)
+          other: Non lus ({{count}})
         help: "sujets avec des messages non lus que vous suivez ou surveillez"
         lower_title_with_count:
-          one: "1 non lu"
-          other: "{{count}} non lus"
+          one: 1 non lu
+          other: '{{count}} non lus'
       new:
         lower_title_with_count:
-          one: "1 nouveau"
-          other: "{{count}} nouveaux"
+          one: 1 nouveau
+          other: '{{count}} nouveaux'
         lower_title: "nouveau"
         title: "Nouveaux"
         title_with_count:
-          one: "Nouveau (1)"
-          other: "Nouveaux ({{count}})"
+          one: Nouveau (1)
+          other: Nouveaux ({{count}})
         help: "sujets créés dans les derniers jours"
       posted:
         title: "Mes Messages"
@@ -2168,8 +2261,8 @@ fr:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: "{{categoryName}} (1)"
-          other: "{{categoryName}} ({{count}})"
+          one: '{{categoryName}} (1)'
+          other: '{{categoryName}} ({{count}})'
         help: "derniers sujets dans la catégorie {{categoryName}}"
       top:
         title: "Top"
@@ -2232,6 +2325,9 @@ fr:
         dismiss_new_posts: '<b>x</b>, <b>r</b> Ignorer les nouveaux messages'
         dismiss_topics: '<b>x</b>, <b>t</b> Ignorer les sujets'
         log_out: '<b>MAJ.</b>+<b>z</b> <b>MAJ.</b>+<b>z</b> Se déconnecter'
+      composing:
+        title: 'Edition'
+        return: '<b>shift</b>+<b>c</b> Revenir à l''éditeur'
       actions:
         title: 'Actions'
         bookmark_topic: '<b>f</b> Modifier le signet du sujet'
@@ -2254,24 +2350,25 @@ fr:
         print: '<b>Ctrl</b>+<b>p</b> Imprimer le sujet'
     badges:
       earned_n_times:
-        one: "A reçu ce badge 1 fois"
-        other: "A reçu ce badge %{count} fois"
+        one: A reçu ce badge 1 fois
+        other: A reçu ce badge %{count} fois
       granted_on: "Accordé le %{date}"
       others_count: "Autres utilisateurs avec ce badge (%{count})"
       title: Badges
       allow_title: "Vous pouvez utiliser ce badge comme titre"
       multiple_grant: "Vous pouvez le gagner de multiples fois"
       badge_count:
-        one: "1 badge"
-        other: "%{count} badges"
+        one: 1 badge
+        other: '%{count} badges'
       more_badges:
-        one: "+1 autre"
-        other: "+%{count} autres"
+        one: +1 autre
+        other: +%{count} autres
       granted:
-        one: "1 décerné"
-        other: "%{count} décernés"
+        one: 1 décerné
+        other: '%{count} décernés'
       select_badge_for_title: Sélectionner un badge comme titre
-      none: "<aucun>"
+      none: "(aucun)"
+      successfully_granted: "%{badge} accordé à %{username} avec succès"
       badge_grouping:
         getting_started:
           name: Initiation
@@ -2294,6 +2391,7 @@ fr:
       </p>
     tagging:
       all_tags: "Tous les tags"
+      other_tags: "Autres tags"
       selector_all_tags: "tous les tags"
       selector_no_tags: "aucun tag"
       changed: "tags modifiés :"
@@ -2301,8 +2399,8 @@ fr:
       choose_for_topic: "tags optionnels"
       delete_tag: "Supprimer le tag"
       delete_confirm:
-        one: "Êtes-vous sûr de vouloir supprimer ce tag et l'enlever de 1 sujet auquel il est assigné ?"
-        other: "Êtes-vous sûr de vouloir supprimer ce tag et l'enlever de {{count}} sujets auxquels il est assigné ?"
+        one: Êtes-vous sûr de vouloir supprimer ce tag et l'enlever de 1 sujet auquel il est assigné ?
+        other: Êtes-vous sûr de vouloir supprimer ce tag et l'enlever de {{count}} sujets auxquels il est assigné ?
       delete_confirm_no_topics: "Êtes-vous sûr de vouloir supprimer ce tag ?"
       rename_tag: "Renommer le tag"
       rename_instructions: "Choisir un nouveau nom pour ce tag :"
@@ -2345,6 +2443,9 @@ fr:
         save: "Sauvegarder"
         delete: "Supprimer"
         confirm_delete: "Êtes-vous sûr de vouloir supprimer ce groupe de tags ?"
+        everyone_can_use: "Les tags peuvent être utilisé par tout le monde"
+        usable_only_by_staff: "Les tags sont visibles à tous, mais seuls les responsables peuvent l'utiliser"
+        visible_only_to_staff: "Les tags ne sont visibles qu'aux responsables"
       topics:
         none:
           unread: "Vous n'avez aucun sujet non lu."
@@ -2372,6 +2473,7 @@ fr:
       custom_message_placeholder: "Entrez votre message personnalisé"
       custom_message_template_forum: "Hey, tu devrais rejoindre ce forum !"
       custom_message_template_topic: "Hey, je pensais que tu pourrais aimer ce sujet !"
+    forced_anonymous: "En raison de la charge extrême, ceci est temporairement montré à tout le monde comme un utilisateur déconnecté le verrait."
     safe_mode:
       enabled: "Le mode sans échec est activé ; fermez cette fenêtre de navigateur pour le quitter"
   admin_js:
@@ -2382,6 +2484,8 @@ fr:
       dashboard:
         title: "Tableau de bord"
         last_updated: "Tableau de bord actualisé le :"
+        find_old: "Vous cherchez l'ancien tableau de bord ?"
+        old_link: "retrouvez-le ici"
         version: "Version"
         up_to_date: "À jour !"
         critical_available: "Une mise à jour critique est disponible."
@@ -2406,16 +2510,21 @@ fr:
         space_free: "{{size}} libre"
         uploads: "fichiers envoyés"
         backups: "sauvegardes"
+        lastest_backup: "Plus récent: %{date}"
         traffic_short: "Trafic"
         traffic: "Requêtes Web Application"
         page_views: "Pages vues"
         page_views_short: "Pages vues"
         show_traffic_report: "Afficher le rapport de trafic détaillé"
+        community_health: Santé communautaire
+        whats_new_in_discourse: "Quoi de neuf dans Discourse ?"
+        activity_metrics: Mesures d'activité
         reports:
+          trend_title: "%{percent} modifié. Actuellement %{current}, était %{prev} pour la période précédente."
           today: "Aujourd'hui"
           yesterday: "Hier"
-          last_7_days: "Les 7 derniers jours"
-          last_30_days: "Les 30 derniers jours"
+          last_7_days: "Derniers 7"
+          last_30_days: "Derniers 30"
           all_time: "Depuis toujours"
           7_days_ago: "il y a 7 jours"
           30_days_ago: "il y a 30 jours"
@@ -2426,6 +2535,10 @@ fr:
           start_date: "Date de début"
           end_date: "Date de fin"
           groups: "Tous les groupes"
+          disabled: "Ce rapport est désactivé"
+          trending_search:
+            more: '<a href="/admin/logs/search_logs">Journal des recherches</a>'
+            disabled: 'Rapport sur les tendances de recherche désactivé. Activé <a href="/admin/site_settings/category/all_results?filter=log%20search%20queries">journalisation des recherches</a> pour collectioner les données.'
       commits:
         latest_changes: "Dernières modifications : veuillez mettre à jour régulièrement !"
         by: "par"
@@ -2437,14 +2550,18 @@ fr:
         moderation_history: "Historique de la modération"
         agree: "Accepter"
         agree_title: "Confirmer que le signalement est valide et correcte"
-        agree_flag_hide_post: "Accepter et cacher le message"
+        agree_flag_hide_post: "Cacher message"
         agree_flag_hide_post_title: "Cacher le message et envoyer automatiquement un message à l'utilisateur l'incitant à le modifier."
         agree_flag_restore_post: "Accepter et rétablir le message"
         agree_flag_restore_post_title: "Rétablir le message afin que tous les utilisateurs puissent le voir."
-        agree_flag: "Accepter et conserver le message"
+        agree_flag_suspend: "Suspendre l'utilisateur"
+        agree_flag_suspend_title: "Accepter le signalement et suspendre l'utilisateur."
+        agree_flag_silence: "Mettre l'utilisateur sous silence"
+        agree_flag_silence_title: "Accepter le signalement et mettre l'utilisateur sous silence."
+        agree_flag: "Conserver le message"
         agree_flag_title: "Accepter le signalement et conserver le message tel quel."
-        defer_flag: "Ignorer"
-        defer_flag_title: "Retirer le signalement ; il ne nécessite aucune action pour le moment."
+        ignore_flag: "Ignorer"
+        ignore_flag_title: "Retirer le signalement ; il ne nécessite aucune action pour le moment."
         delete: "Supprimer"
         delete_title: "Supprimer le message signalé."
         delete_post_defer_flag: "Supprimer le message et ignorer le signalement"
@@ -2463,6 +2580,12 @@ fr:
         more: "(plus de réponses…)"
         suspend_user: "Suspendre l'utilisateur"
         suspend_user_title: "Suspendre l'utilisateur pour ce message"
+        replies:
+          one: '[1 réponse]'
+          other: '[%{count} réponses]'
+        delete_replies:
+          one: Supprimer aussi la %{count} réponse à ce message?
+          other: Supprimer aussi les %{count}réponses à ce message?
         dispositions:
           agreed: "accepté"
           disagreed: "refusé"
@@ -2485,7 +2608,8 @@ fr:
           topic: "Sujet"
           type: "Type"
           users: "Utilisateurs"
-          last_flagged: "Dernier signalés"
+          last_flagged: "Derniers signalés"
+          no_results: "Il n'y a pas de sujets signalés."
         short_names:
           off_topic: "hors-sujet"
           inappropriate: "inapproprié"
@@ -2493,13 +2617,48 @@ fr:
           notify_user: "personnalisé"
           notify_moderators: "personnalisé"
       groups:
+        new:
+          title: "Nouveau groupe"
+          create: "Créer"
+          name:
+            too_short: "Nom de groupe trop court"
+            too_long: "Nom de groupe trop long"
+            checking: "Vérification de la disponibilité du nom de groupe…"
+            available: "Nom de groupe disponible"
+            not_available: "Nom de groupe indisponible"
+            blank: "Nom de groupe ne peut être vide"
+        bulk_add:
+          title: "Ajouter au groupe en masse"
+          complete_users_not_added: "Ces utilisateurs n'ont pas été ajoutés (vérifiez qu'ils ont un compte) :"
+          paste: "Coller une liste de pseudo ou courriel, un par ligne :"
+        add_members:
+          as_owner: "Rendre utilisateur(s) propriétaire(s) de ce groupe"
+        manage:
+          interaction:
+            email: Courriel
+            incoming_email: "Adresse de courriel entrant personnalisée"
+            incoming_email_placeholder: "Entrer une adresse de courriel"
+            visibility: Visibilité
+            visibility_levels:
+              title: "Qui peut voir ce groupe ?"
+              public: "Tout le monde"
+              members: "Propriétaires du groupe, membres et administrateurs"
+              staff: "Propriétaires du groupe et responsables"
+              owners: "Propriétaires du groupe et administrateurs"
+          membership:
+            automatic: Automatique
+            trust_level: Niveau de confiance
+            trust_levels_title: "Niveau de confiance automatiquement attribué lorsque les membres sont ajoutés :"
+            trust_levels_none: "Aucun"
+            automatic_membership_email_domains: "Les utilisateurs qui s'enregistrent avec un domaine courriel qui correspond exactement à un élément de cette liste seront automatiquement ajoutés à ce groupe:"
+            automatic_membership_retroactive: "Appliquer la même règle de domaine courriel pour les utilisateurs existants"
+            primary_group: "Définir comme groupe principal automatiquement"
+        name_placeholder: "Nom du groupe, sans espace, mêmes règles que pour les pseudos"
         primary: "Groupe principal"
         no_primary: "(pas de groupe principal)"
         title: "Groupes"
         edit: "Modifier les groupes"
         refresh: "Actualiser"
-        new: "Nouveau"
-        selector_placeholder: "entrer le pseudo"
         about: "Modifier votre adhésion et les noms ici"
         group_members: "Membres du groupe"
         delete: "Supprimer"
@@ -2507,22 +2666,12 @@ fr:
         delete_failed: "Impossible de supprimer le groupe. Si c'est un groupe automatique il ne peut être détruit."
         delete_owner_confirm: "Retirer les privilèges de propriétaire pour %{username} ?"
         add: "Ajouter"
-        add_members: "Ajouter des membres"
         custom: "Personnalisé"
-        bulk_complete: "Les utilisateurs ont été ajoutés au groupe"
-        bulk_complete_users_not_added: "Ces utilisateurs n'ont pas été ajoutés (vérifiez qu'ils ont un compte):"
-        bulk: "Ajouter au groupe en masse"
-        bulk_paste: "Coller une liste de pseudo ou courriel, un par ligne :"
-        bulk_select: "(sélectionner un groupe)"
         automatic: "Automatique"
-        automatic_membership_email_domains: "Les utilisateurs qui s'enregistrent avec un domaine courriel qui correspond exactement à un élément de cette liste seront automatiquement ajoutés à ce groupe:"
-        automatic_membership_retroactive: "Appliquer la même règle de domaine courriel pour les utilisateurs existants"
-        default_title: "Titre par défaut pour tous les utilisateurs de ce groupe"
-        primary_group: "Définir comme groupe principal automatiquement"
+        default_title: "Titre par défaut"
+        default_title_description: "sera appliqué à tous les utilisateurs du groupe"
         group_owners: Propriétaires
         add_owners: Ajouter des propriétaires
-        incoming_email: "Adresse de courriel entrant personnalisée"
-        incoming_email_placeholder: "Entrer une adresse de courriel"
         none_selected: "Sélectionnez un groupe pour commencer"
         no_custom_groups: "Créer un nouveau groupe personnalisé"
       api:
@@ -2580,6 +2729,18 @@ fr:
         user_event:
           name: "Événement d'utilisateur"
           details: "Quand un utilisateur se connecte, se déconnecte, est créé, approuvé ou mis à jour."
+        group_event:
+          name: "Événement de groupe"
+          details: "Quand un groupe est créé, mis à jour ou supprimé."
+        category_event:
+          name: "Événement de catégorie"
+          details: "Quand une catégorie est créée, mise à jour ou supprimée."
+        tag_event:
+          name: "Événement de tag"
+          details: "Quand un tag est créé, mis à jour ou supprimé."
+        flag_event:
+          name: "Evènement de signalement"
+          details: "Quand un signalement est crée, approuvé, désapprouvé ou ignoré."
         delivery_status:
           title: "État de l'envoi"
           inactive: "Inactif"
@@ -2589,11 +2750,11 @@ fr:
           none: "Il n'y aucun évènement lié."
           redeliver: "Redélivrer"
           incoming:
-            one: "Il y a un nouvel événement."
-            other: "Il y a {{count}} nouveaux événements."
+            one: Il y a un nouvel événement.
+            other: Il y a {{count}} nouveaux événements.
           completed_in:
-            one: "Terminé en 1 seconde."
-            other: "Terminé en {{count}} secondes."
+            one: Terminé en 1 seconde.
+            other: Terminé en {{count}} secondes.
           request: "Requête"
           response: "Réponse"
           redeliver_confirm: "Êtes-vous sûr de vouloir redélivrer les mêmes données ?"
@@ -2621,6 +2782,7 @@ fr:
         change_settings: "Changer les paramètres"
         change_settings_short: "Paramètres"
         howto: "Comment installer des extensions ?"
+        official: "Plugin officiel"
       backups:
         title: "Sauvegardes"
         menu:
@@ -2644,7 +2806,7 @@ fr:
           label: "Envoyer"
           title: "Envoyer une sauvegarde à cette instance"
           uploading: "Envoi en cours…"
-          success: "« {{filename}} » a été envoyé avec succès."
+          success: "« {{filename}} » a été envoyé avec succès. Le fichier est en cours de traitement et il faudra jusqu'à une minute pour qu'il apparaisse dans la liste."
           error: "Il y a eu une erreur lors de l'envoi de « {{filename}} » : {{message}}"
         operations:
           is_running: "Une opération est en cours d'exécution…"
@@ -2657,7 +2819,7 @@ fr:
             label: "Sauvegarder"
             title: "Créer une sauvegarde"
             confirm: "Voulez-vous démarrer une nouvelle sauvegarde ?"
-            without_uploads: "Oui (ne pas inclure les fichiers)"
+            without_uploads: "Oui (n'incluez pas de téléversements)"
           download:
             label: "Télécharger"
             title: "Envoyer un courriel avec un lien de téléchargement"
@@ -2699,7 +2861,7 @@ fr:
         new_style: "Nouveau style"
         import: "Importer"
         delete: "Supprimer"
-        delete_confirm: "Suprimmer ce thème ?"
+        delete_confirm: "Supprimer ce thème ?"
         about: "Modification des feuilles de styles et en-têtes de votre site. Ajouter un style personnalisé pour commencer."
         color: "Couleur"
         opacity: "Opacité"
@@ -2726,6 +2888,7 @@ fr:
           common: "Général"
           desktop: "Bureau"
           mobile: "Mobile"
+          settings: "Paramètres"
           preview: "Prévisualiser"
           is_default: "Thème activé par défaut"
           user_selectable: "Thème sélectionnable par les utilisateurs"
@@ -2737,7 +2900,12 @@ fr:
           no_uploads: "Vous pouvez envoyer des ressources associées à votre thème comme des polices ou des images"
           add_upload: "Ajouter un fichier"
           upload_file_tip: "Choisir un fichier à téléverser (png, woff2, etc.)"
-          variable_name: "Nom de variable SCSS:"
+          variable_name: "Nom de variable SCSS :"
+          variable_name_invalid: "Nom de variable invalide. Seuls les caractères alphanumériques sont autorisés. Doit commencer par une lettre. Doit être unique."
+          variable_name_error:
+            invalid_syntax: "Nom de variable invalide. Seuls les caractères alphanumériques sont autorisés. Doit commencer par une lettre."
+            no_overwrite: "Nom de variable invalide. Ne doit pas écraser une variable existante."
+            must_be_unique: "Nom de variable invalide. Doit être unique."
           upload: "Upload"
           child_themes_check: "Thème incluant d'autres thèmes"
           css_html: "CSS/HTML personnalisé"
@@ -2746,6 +2914,8 @@ fr:
           delete_upload_confirm: "Supprimer cet upload? (Le thème CSS pourrait ne plus fonctionner!)"
           import_web_tip: "Dépôt contenant le thème"
           import_file_tip: "Fichier .dcstyle.json contenant le thème"
+          is_private: "Le thème est dans un dépôt git privé"
+          public_key: "Accorder un accès dépôt à la clef publique suivante :"
           about_theme: "À propos du thème"
           license: "Licence"
           component_of: "Le thème est un composant de :"
@@ -2754,9 +2924,11 @@ fr:
           updating: "Mise à jour…"
           up_to_date: "Thème à jour, dernière vérification :"
           add: "Ajouter"
+          theme_settings: "Paramètres thème"
+          no_settings: "Ce thème n'a pas de paramètres."
           commits_behind:
-            one: "Le thème est en retard de 1 commit !"
-            other: "Le thème est en retard de {{count}} commits !"
+            one: Le thème est en retard de 1 commit !
+            other: Le thème est en retard de {{count}} commits !
           scss:
             text: "CSS"
             title: "Entrez du CSS personnalisé, nous acceptons tous les styles CSS et SCSS valides."
@@ -2778,6 +2950,9 @@ fr:
           body_tag:
             text: "</body>"
             title: "HTML qui sera inséré avant la balise </body>"
+          yaml:
+            text: "YAML"
+            title: "Définir les paramètres thème en format YAML"
         colors:
           select_base:
             title: "Sélectionner la palette de couleurs de base"
@@ -2943,6 +3118,7 @@ fr:
             revoke_badge: "retirer le badge"
             check_email: "vérifier l'adresse courriel"
             delete_topic: "supprimer le sujet"
+            recover_topic: "Annuler la suppression du sujet"
             delete_post: "supprimer le message"
             impersonate: "incarner"
             anonymize_user: "rendre l'utilisateur anonyme"
@@ -2969,6 +3145,16 @@ fr:
             backup_destroy: "détruire la sauvegarde"
             reviewed_post: "message vérifié"
             custom_staff: "action personnalisée de l'extension"
+            post_locked: "message vérouillé"
+            post_edit: "message modifié"
+            post_unlocked: "message dévérouillé"
+            check_personal_message: "contrôler messages directs"
+            disabled_second_factor: "désactiver l'authentification à deux facteurs"
+            topic_published: "sujet publié"
+            post_approved: "message approuvé"
+            create_badge: "créer un badge"
+            change_badge: "Modifier un badge"
+            delete_badge: "supprimer un badge"
         screened_emails:
           title: "Courriels affichés"
           description: "Lorsque quelqu'un essaye de créer un nouveau compte, les adresses de courriel suivantes seront vérifiées et l'inscription sera bloquée, ou une autre action sera réalisée."
@@ -3000,7 +3186,7 @@ fr:
             text: "Consolider"
             title: "Créer de nouvelles plages de sous réseaux à bannir s'il y a au moins 'min_ban_entries_for_roll_up' entrées."
         search_logs:
-          title: "Rechercher dans les journaux"
+          title: "Journaux de recherche"
           term: "Terme"
           searches: "Recherches"
           click_through: "Taux de clics"
@@ -3011,6 +3197,7 @@ fr:
             header: "Entête"
             full_page: "Page complète"
             click_through_only: "Tous (clics uniquement)"
+          header_search_results: "Résultats de recherche d'entête"
         logster:
           title: "Journal d'erreurs"
       watched_words:
@@ -3019,8 +3206,8 @@ fr:
         clear_filter: "Vider"
         show_words: "Afficher les mots"
         word_count:
-          one: "1 mot"
-          other: "%{count} mots"
+          one: 1 mot
+          other: '%{count} mots'
         actions:
           block: 'Bloquer'
           censor: 'Censurer'
@@ -3037,6 +3224,7 @@ fr:
           placeholder_regexp: "expression régulière"
           add: 'Ajouter'
           success: 'Succès'
+          exists: 'Existe déjà'
           upload: "Envoyer"
           upload_successful: "Envoi réussi. Les mots ont été ajoutés."
       impersonate:
@@ -3060,13 +3248,14 @@ fr:
           suspended: 'Suspendus'
           silenced: 'Sous silence'
           suspect: 'Suspects'
+          staged: 'Distant'
         approved: "Approuvé ?"
         approved_selected:
-          one: "approuver l'utilisateur"
-          other: "approuver les utilisateurs ({{count}})"
+          one: approuver l'utilisateur
+          other: approuver les utilisateurs ({{count}})
         reject_selected:
-          one: "utilisateur rejeté"
-          other: "utilisateurs rejetés ({{count}})"
+          one: utilisateur rejeté
+          other: utilisateurs rejetés ({{count}})
         titles:
           active: 'Utilisateurs actifs'
           new: 'Nouveaux utilisateurs'
@@ -3082,12 +3271,13 @@ fr:
           silenced: 'Utilisateurs sous silence'
           suspended: 'Utilisateurs suspendus'
           suspect: 'Utilisateurs suspects'
+          staged: 'Utilisateurs distants'
         reject_successful:
-          one: "Utilisateur rejeté avec succès."
-          other: "%{count} utilisateurs rejetés avec succès."
+          one: Utilisateur rejeté avec succès.
+          other: '%{count} utilisateurs rejetés avec succès.'
         reject_failures:
-          one: "Utilisateur dont le rejet a échoué."
-          other: "%{count} utilisateurs dont le rejet a échoué."
+          one: Utilisateur dont le rejet a échoué.
+          other: '%{count} utilisateurs dont le rejet a échoué.'
         not_verified: "Non verifié"
         check_email:
           title: "Afficher l'adresse courriel de cet utilisateur"
@@ -3114,6 +3304,10 @@ fr:
         suspended_until: "(jusqu'à %{until})"
         cant_suspend: "Cet utilisateur ne peut pas être suspendu."
         delete_all_posts: "Supprimer tous les messages"
+        penalty_post_actions: "Qu'aimeriez-vous faire du message associé ?"
+        penalty_post_delete: "Supprimer le message"
+        penalty_post_edit: "Modifier le message"
+        penalty_post_none: "Ne rien faire"
         delete_all_posts_confirm_MF: "Vous êtes sur le point de supprimer {POSTS, plural, one {1 message} other {# messages}} et {TOPICS, plural, one {1 sujet} other {# sujets}}. Êtes-vous sûr ?"
         silence: "Mettre sous silence"
         unsilence: "Ne pas mettre sous silence"
@@ -3121,7 +3315,7 @@ fr:
         moderator: "Modérateur ?"
         admin: "Administrateur ?"
         suspended: "Suspendu ?"
-        staged: "En attente ?"
+        staged: "Distant ?"
         show_admin_profile: "Administration"
         refresh_browsers: "Forcer le rafraîchissement du navigateur"
         refresh_browsers_message: "Message envoyé à tous les clients !"
@@ -3138,6 +3332,9 @@ fr:
         grant_moderation: 'Accorder les droits de modération'
         unsuspend: 'Annuler la suspension'
         suspend: 'Suspendre'
+        show_flags_received: "Afficher signalements reçus"
+        flags_received_by: "Signalements reçus par %{username}"
+        flags_received_none: "Cet utilisateur n'a pas reçu de signalement."
         reputation: Réputation
         permissions: Permissions
         activity: Activité
@@ -3146,6 +3343,7 @@ fr:
         private_topics_count: Sujets privés
         posts_read_count: Messages lus
         post_count: Messages créés
+        second_factor_enabled: Authentification à deux facteurs activée
         topics_entered: Sujets vus
         flags_given_count: Signalements effectués
         flags_received_count: Signalements reçus
@@ -3164,17 +3362,18 @@ fr:
         delete_forbidden_because_staff: "Administrateurs et modérateurs ne peuvent pas être supprimés."
         delete_posts_forbidden_because_staff: "Vous ne pouvez pas supprimer tous les messages des administrateurs et des modérateurs."
         delete_forbidden:
-          one: "Les utilisateurs ne peuvent pas être supprimés s'ils ont posté des messages Supprimer tous les messages avant d'essayer de supprimer un utilisateur. (Les messages plus vieux que %{count} jour ne peut pas être supprimé.)"
-          other: "Les utilisateurs ne peuvent pas être supprimés s'ils ont crée des messages. Supprimer tous les messages avant d'essayer de supprimer un utilisateur. (Les messages plus vieux que %{count} jours ne peuvent pas être supprimés.)"
+          one: Les utilisateurs ne peuvent pas être supprimés s'ils ont posté des messages Supprimer tous les messages avant d'essayer de supprimer un utilisateur. (Les messages plus vieux que %{count} jour ne peut pas être supprimé.)
+          other: Les utilisateurs ne peuvent pas être supprimés s'ils ont crée des messages. Supprimer tous les messages avant d'essayer de supprimer un utilisateur. (Les messages plus vieux que %{count} jours ne peuvent pas être supprimés.)
         cant_delete_all_posts:
-          one: "Impossible de supprimer tout les messages. Certains messages sont âgés de plus de  %{count} jour. (voir l'option delete_user_max_post_age)"
-          other: "Impossible de supprimer tout les messages. Certains messages sont âgés de plus de  %{count} jours. (voir l'option delete_user_max_post_age)"
+          one: Impossible de supprimer tout les messages. Certains messages sont âgés de plus de  %{count} jour. (voir l'option delete_user_max_post_age)
+          other: Impossible de supprimer tout les messages. Certains messages sont âgés de plus de  %{count} jours. (voir l'option delete_user_max_post_age)
         cant_delete_all_too_many_posts:
-          one: "Impossible de supprimer tous les messages parce que l'utilisateur a plus d'un message. (delete_all_posts_max)"
-          other: "Impossible de supprimer tous les messages parce que l'utilisateur a plus de %{count} messages. (delete_all_posts_max)"
+          one: Impossible de supprimer tous les messages parce que l'utilisateur a plus d'un message. (delete_all_posts_max)
+          other: Impossible de supprimer tous les messages parce que l'utilisateur a plus de %{count} messages. (delete_all_posts_max)
         delete_confirm: "Êtes-vous SÛR de vouloir supprimer cet utilisateur ? Cette action est irréversible !"
         delete_and_block: "Supprimer et <b>bloquer</b> cette adresse de courriel et adresse IP."
         delete_dont_block: "Supprimer uniquement"
+        deleting_user: "Suppression de l'utilisateur"
         deleted: "L'utilisateur a été supprimé."
         delete_failed: "Il y a eu une erreur lors de la suppression de l'utilisateur. Veuillez vous assurer que tous ses messages ont bien été supprimmés avant d'essayer de supprimer l'utilisateur."
         send_activation_email: "Envoyer le courriel d'activation"
@@ -3196,7 +3395,7 @@ fr:
         deactivate_explanation: "Un utilisateur désactivé doit revalider son adresse de courriel."
         suspended_explanation: "Un utilisateur suspendu ne peut pas se connecter."
         silence_explanation: "Un utilisateur mis sous silence ne peut pas créer des messages ou sujets."
-        staged_explanation: "Un utilisateur en attente ne peut envoyer des messages par courriel que pour des sujets spécifiques."
+        staged_explanation: "Un utilisateur distant ne peut envoyer des messages que par courriel et pour des sujets spécifiques."
         bounce_score_explanation:
           none: "Aucune rejet récent pour cette adresse courriel."
           some: "Quelques rejets récents pour cette adresse courriel."
@@ -3212,8 +3411,8 @@ fr:
         tl3_requirements:
           title: "Pré-requis pour le niveau de confiance 3"
           table_title:
-            one: "Lors du dernier jour :"
-            other: "Lors des %{count} derniers jours :"
+            one: 'Lors du dernier jour :'
+            other: 'Lors des %{count} derniers jours :'
           value_heading: "Valeur"
           requirement_heading: "Pré-requis"
           visits: "Visites"
@@ -3229,6 +3428,8 @@ fr:
           likes_received: "J'aime reçus"
           likes_received_days: "J'aime reçus : par jour"
           likes_received_users: "J'aime reçus : par utilisateur"
+          suspended: "Suspendu (pour toujours)"
+          silenced: "Mis sous silence (pour toujours)"
           qualifies: "Admissible au niveau de confiance 3."
           does_not_qualify: "Non admissible au niveau de confiance 3."
           will_be_promoted: "Sera bientôt promu."
@@ -3287,12 +3488,14 @@ fr:
         go_back: "Retour à la recherche"
         recommended: "Nous vous recommandons de personnaliser le texte suivant selon vos besoins :"
         show_overriden: 'Ne montrer que ce qui a été personnalisé'
-      site_settings:
-        show_overriden: 'Ne montrer que ce qui a été changé'
-        title: 'Paramètres'
+      settings:
+        show_overriden: 'Ne montrer que ce qui a été personnalisé'
         reset: 'rétablir'
-        none: 'rien'
+        none: 'aucun'
+      site_settings:
+        title: 'Paramètres'
         no_results: "Aucun résultat trouvé."
+        more_than_30_results: "Il y a plus de 30 résultats. Veuillez affiner votre recherche ou sélectionner une catégorie."
         clear_filter: "Effacer"
         add_url: "ajouter URL"
         add_host: "ajouter hôte"
@@ -3341,11 +3544,11 @@ fr:
         reason_help: (Lien vers un message ou sujet)
         save: Sauvegarder
         delete: Supprimer
-        delete_confirm: Ëtes-vous sûr de vouloir supprimer ce badge ?
+        delete_confirm: "Ëtes-vous sûr de vouloir supprimer ce badge ?"
         revoke: Retirer
         reason: Raison
         expand: Développer &hellip;
-        revoke_confirm: Êtes-vous sûr de vouloir retirer ce badge ?
+        revoke_confirm: "Êtes-vous sûr de vouloir retirer ce badge ?"
         edit_badges: Modifier les badges
         grant_badge: Décerner le badge
         granted_badges: Badges décernés
@@ -3359,7 +3562,8 @@ fr:
         enabled: Activer le badge
         icon: Icône
         image: Image
-        icon_help: "Utilisez une classe CSS Font Awesome ou une URL d'image"
+        icon_help: "Utiliser une classe de Font Awesome"
+        image_help: "Entrez l'URL de l'image (remplace le champ de l'icône si les deux sont définis)"
         query: Requête du badge (SQL)
         target_posts: Requête sur les messages
         auto_revoke: Exécuter la requête de révocation quotidiennement
@@ -3383,14 +3587,14 @@ fr:
             text: "Certains badges n'ont pas été décernés. Ceci se produit  lorsque la requête du badge retourne des identifiants d'utilisateurs ou de messages qui n’existent plus. Cela peut produire des résultats non attendus - veuillez vérifier votre requête."
           no_grant_count: "Aucun badge à assigner."
           grant_count:
-            one: "<b>1</b> badge à assigner."
-            other: "<b>%{count}</b> badges à assigner."
+            one: <b>1</b> badge à assigner.
+            other: <b>%{count}</b> badges à assigner.
           sample: "Exemple :"
           grant:
-            with: <span class="username">%{username}</span>
-            with_post: <span class="username">%{username}</span> pour son message dans %{link}
-            with_post_time: <span class="username">%{username}</span> pour son message dans %{link} à <span class="time">%{time}</span>
-            with_time: <span class="username">%{username}</span> à <span class="time">%{time}</span>
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span> pour son message dans %{link}"
+            with_post_time: "<span class=\"username\">%{username}</span> pour son message dans %{link} à <span class=\"time\">%{time}</span>"
+            with_time: "<span class=\"username\">%{username}</span> à <span class=\"time\">%{time}</span>"
       emoji:
         title: "Emoji"
         help: "Ajouter un nouvel emoji qui sera disponible pour tout le monde. (Conseil: glisser-déposer plusieurs fichiers en même temps)"
@@ -3436,7 +3640,7 @@ fr:
         category_id: "ID catégorie"
         category_title: "Catégorie"
         external_url: "URL externe"
-        delete_confirm: Êtes-vous sûr de vouloir supprimer ce permalien ?
+        delete_confirm: "Êtes-vous sûr de vouloir supprimer ce permalien ?"
         form:
           label: "Nouveau :"
           add: "Ajouter"
@@ -3451,8 +3655,8 @@ fr:
       uploading: "Envoi en cours…"
       quit: "Peut-être plus tard"
       staff_count:
-        one: "Votre communauté a 1 responsable (vous)."
-        other: "Votre communauté a %{count} responsables, dont vous."
+        one: Votre communauté a 1 responsable (vous).
+        other: Votre communauté a %{count} responsables, dont vous.
       invites:
         add_user: "ajouter"
         none_added: "Vous n'avez invité aucun responsable. Êtes-vous sûr de vouloir continuer ?"
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index 737fec28104..29828cac177 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -43,64 +43,65 @@ gl:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: "< 1s"
-          other: "< %{count}s"
+          one: < 1s
+          other: < %{count}s
         x_seconds:
-          one: "1s"
-          other: "%{count}s"
+          one: 1s
+          other: '%{count}s'
         x_minutes:
-          one: "1m"
-          other: "%{count}m"
+          one: 1m
+          other: '%{count}m'
         about_x_hours:
-          one: "1h"
-          other: "%{count}h"
+          one: 1h
+          other: '%{count}h'
         x_days:
-          one: "1d"
-          other: "%{count}d"
+          one: 1d
+          other: '%{count}d'
         about_x_years:
-          one: "1ano"
-          other: "%{count}anos"
+          one: 1ano
+          other: '%{count}anos'
         over_x_years:
-          one: "> 1ano"
-          other: "> %{count}anos"
+          one: '> 1ano'
+          other: '> %{count}anos'
         almost_x_years:
-          one: "1ano"
-          other: "%{count}anos"
+          one: 1ano
+          other: '%{count}anos'
         date_month: "D MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: "1 min"
-          other: "%{count} mins"
+          one: 1 min
+          other: '%{count} mins'
         x_hours:
-          one: "1 hora"
-          other: "%{count} horas"
+          one: 1 hora
+          other: '%{count} horas'
         x_days:
-          one: "1 día"
-          other: "%{count} días"
+          one: 1 día
+          other: '%{count} días'
         date_year: "D MMM, 'YY"
       medium_with_ago:
         x_minutes:
-          one: "Hai 1 min."
-          other: "Hai %{count} min."
+          one: Hai 1 min.
+          other: Hai %{count} min.
         x_hours:
-          one: "Hai 1 hora"
-          other: "Hai %{count} horas"
+          one: Hai 1 hora
+          other: Hai %{count} horas
         x_days:
-          one: "Hai 1 día"
-          other: "Hai %{count} días"
+          one: Hai 1 día
+          other: Hai %{count} días
       later:
         x_days:
-          one: "1 día despois"
-          other: "%{count} días despois"
+          one: 1 día despois
+          other: '%{count} días despois'
         x_months:
-          one: "1 mes despois"
-          other: "%{count} meses despois"
+          one: 1 mes despois
+          other: '%{count} meses despois'
         x_years:
-          one: "1 anos despois"
-          other: "%{count} anos despois"
+          one: 1 anos despois
+          other: '%{count} anos despois'
       previous_month: 'Mes anterior'
       next_month: 'Mes seguinte'
+      placeholder: data
     share:
       topic: 'compartir unha ligazón a este tema'
       post: 'publicación %{postNumber}'
@@ -111,7 +112,6 @@ gl:
       email: 'enviar esta ligazón nun correo electrónico'
     action_codes:
       public_topic: "fixo esta publicación pública no %{when}"
-      private_topic: "fixo esta publicación privada no %{when}"
       split_topic: "este tema dividiuse o %{when}"
       invited_user: "convidou a %{who} %{when}"
       invited_group: "invitou %{who} o %{when}"
@@ -149,6 +149,7 @@ gl:
         cn_north_1: "China (Beijing)"
         eu_central_1: "EU (Frankfurt)"
         eu_west_1: "EU (Irlanda)"
+        eu_west_2: "EU (Londres)"
         sa_east_1: "América do Sur (São Paulo)"
         us_east_1: "EE.UU. Leste (N. Virxinia)"
         us_gov_west_1: "AWS GovCloud (EE.UU)"
@@ -158,6 +159,7 @@ gl:
     not_implemented: "Sentímolo pero esta funcionalidade non se implementou aínda."
     no_value: "Non"
     yes_value: "Si"
+    submit: "Enviar"
     generic_error: "Sentímolo pero produciuse un erro."
     generic_error_with_reason: "Produciuse un erro: %{error}"
     sign_up: "Crear unha conta"
@@ -170,8 +172,8 @@ gl:
     show_help: "opcións"
     links: "Ligazóns"
     links_lowercase:
-      one: "ligazón"
-      other: "ligazóns"
+      one: ligazón
+      other: ligazóns
     faq: "FAQ"
     guidelines: "Directrices"
     privacy_policy: "Normas de confidencialidade"
@@ -195,8 +197,8 @@ gl:
     max_of_count: "máx. de {{count}}"
     alternation: "ou"
     character_count:
-      one: "{{count}} carácter"
-      other: "{{count}} caracteres"
+      one: '{{count}} carácter'
+      other: '{{count}} caracteres'
     suggested_topics:
       title: "Temas suxeridos"
       pm_title: "Mensaxes suxeridas"
@@ -208,8 +210,6 @@ gl:
       our_moderators: "Os moderadores"
       stat:
         all_time: "Todos"
-        last_7_days: "Últimos 7 días"
-        last_30_days: "Últimos 30 días"
       like_count: "Gústames"
       topic_count: "Temas"
       post_count: "Publicacións"
@@ -230,16 +230,6 @@ gl:
       last_read: "esta é a última publicación lida por ti; preme para engadila aos marcadores"
       remove: "Eliminar marcador"
       confirm_clear: "Confirmas o borrado de todos os marcadores deste tema?"
-    topic_count_latest:
-      one: "{{count}} tema novo ou actualizado."
-      other: "{{count}} temas novos ou actualizados."
-    topic_count_unread:
-      one: "{{count}} tópico sen ler."
-      other: "{{count}} temas sen ler."
-    topic_count_new:
-      one: "{{count}} tópico novo"
-      other: "{{count}} temas novos"
-    click_to_show: "Preme para amosar."
     preview: "previsualizar"
     cancel: "cancelar"
     save: "Gardar cambios"
@@ -249,6 +239,7 @@ gl:
     uploading: "Actualizando..."
     uploading_filename: "Actualizando {{filename}}..."
     uploaded: "Actualizado!"
+    pasting: "A pegar..."
     enable: "Activar"
     disable: "Desactivar"
     undo: "Desfacer"
@@ -273,16 +264,16 @@ gl:
       cancel: "Cancelar"
       view_pending: "ver as publicacións pendentes"
       has_pending_posts:
-        one: "Este tema ten <b>{{count}}</b> publicación agardando aprobación"
-        other: "Este tema ten <b>{{count}}</b> publicacións agardando aprobación."
+        one: Este tema ten <b>{{count}}</b> publicación agardando aprobación
+        other: Este tema ten <b>{{count}}</b> publicacións agardando aprobación.
       confirm: "Gardar os cambios"
       delete_prompt: "Confirmas a eliminación de <b>%{username}</b>? Eliminaranse todas as súas publicacións e bloquearase o seu correo electrónico e enderezo IP."
       approval:
         title: "A publicación necesita aprobación"
         description: "Recibimos a túa nova publicación pero cómpre que sexa aprobada por un moderador antes de aparecer. Ten paciencia."
         pending_posts:
-          one: "Tes <strong>{{count}}</strong> publicación pendente."
-          other: "Tes <strong>{{count}}</strong> publicacións pendentes."
+          one: Tes <strong>{{count}}</strong> publicación pendente.
+          other: Tes <strong>{{count}}</strong> publicacións pendentes.
         ok: "De acordo"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> publicou <a href='{{topicUrl}}'>o tema</a>"
@@ -314,14 +305,12 @@ gl:
       posts_read: "Lidas"
       posts_read_long: "Publicacións lidas"
       total_rows:
-        one: "Un usuario"
-        other: "%{count} usuarios"
+        one: Un usuario
+        other: '%{count} usuarios'
     groups:
       add: "Engadir"
-      selector_placeholder: "Engadir membros"
       owner: "propietario"
       activity: "Actividade"
-      members: "Membros"
       topics: "Temas"
       posts: "Publicacións"
       mentions: "Mencións"
@@ -332,9 +321,6 @@ gl:
         mods_and_admins: "Só moderadores e administradores"
         members_mods_and_admins: "Só membros do grupo, moderadores e administradores"
         everyone: "Todos"
-      trust_levels:
-        title: "Nivel de confianza automático concedido aos membros cando son engadidos:"
-        none: "Ningún"
       notifications:
         watching:
           title: "Ver"
@@ -349,21 +335,20 @@ gl:
           title: "Silenciado"
           description: "Non recibirás notificacións de nada relacionado con novos temas neste grupo."
     user_action_groups:
-      '1': "Gústames dados"
-      '2': "Gústames recibidos"
-      '3': "Marcadores"
-      '4': "Temas"
-      '5': "Respostas"
-      '6': "Respostas"
-      '7': "Mencións"
-      '9': "CItas"
-      '11': "Edicións"
-      '12': "Enviar elementos"
-      '13': "Caixa de entrada"
-      '14': "Pendente"
+      "1": "Gústames dados"
+      "2": "Gústames recibidos"
+      "3": "Marcadores"
+      "4": "Temas"
+      "5": "Respostas"
+      "6": "Respostas"
+      "7": "Mencións"
+      "9": "CItas"
+      "11": "Edicións"
+      "12": "Enviar elementos"
+      "13": "Caixa de entrada"
+      "14": "Pendente"
     categories:
       all: "todas as categorías"
-      all_subcategories: "todo"
       no_subcategory: "ningunha"
       category: "Categoría"
       category_list: "Amosar a lista de categorías"
@@ -382,8 +367,8 @@ gl:
       toggle_ordering: "trocar o control de ordenación"
       subcategories: "Subcategorías"
       topic_stat_sentence:
-        one: "%{count} tema novo no último %{unit}."
-        other: "%{count} temas novos no último %{unit}."
+        one: '%{count} tema novo no último %{unit}.'
+        other: '%{count} temas novos no último %{unit}.'
     ip_lookup:
       title: Busca do enderezo IP
       hostname: Nome do servidor
@@ -419,7 +404,6 @@ gl:
       notifications: "Notificacións"
       statistics: "Estatísticas"
       desktop_notifications:
-        label: "Notificacións en escritorio"
         not_supported: "Este navegador non admite notificacións. Desculpe."
         perm_default: "Acender notificacións"
         perm_denied_btn: "Permiso denegado"
@@ -447,7 +431,6 @@ gl:
       delete_account: "Eliminar a miña conta"
       delete_account_confirm: "Confirmas que queres eliminar definitivamente a túa conta? Esta acción non se pode desfacer!"
       deleted_yourself: "A túa conta acaba de ser eliminada completamente."
-      delete_yourself_not_allowed: "Non podes eliminar a túa conta neste intre. Contacta cun administrador para que este a elimine por ti. "
       unread_message_count: "Mensaxes"
       admin_delete: "Eliminar"
       users: "Usuarios"
@@ -514,8 +497,8 @@ gl:
         authenticated: "O teu enderezo de correo electrónico foi autenticado por {{provider}}"
         frequency_immediately: "Enviarémosche un correo-e axiña se non liches sobre o que che estamos a enviar."
         frequency:
-          one: "Só che eviaremos un correo-e se non te vimos no último minuto."
-          other: "Só che eviaremos un correo-e se non te vimos nos últimos {{count}} minutos."
+          one: Só che eviaremos un correo-e se non te vimos no último minuto.
+          other: Só che eviaremos un correo-e se non te vimos nos últimos {{count}} minutos.
       name:
         title: "Nome"
         instructions_required: "Nome completo"
@@ -542,8 +525,6 @@ gl:
       created: "Inscrito"
       log_out: "Saír da sesión"
       location: "Localización"
-      card_badge:
-        title: "Insignia na ficha do usuario"
       website: "Sitio web"
       email_settings: "Correo electrónico"
       like_notification_frequency:
@@ -594,10 +575,9 @@ gl:
         title: "Convites"
         user: "Usuario convidado"
         sent: "Enviado"
-        none: "Non hai convites pendentes de ver."
         truncated:
-          one: "Amosando o primeiro convite."
-          other: "Amosando os primeiros {{count}} convites."
+          one: Amosando o primeiro convite.
+          other: Amosando os primeiros {{count}} convites.
         redeemed: "Convites utilizados"
         redeemed_tab: "Utilizados"
         redeemed_tab_with_count: "Utilizados ({{count}})"
@@ -859,28 +839,12 @@ gl:
       none: "Non é posíbel cargar as notificacións neste intre"
       more: "ver notificacións anteriores"
       total_flagged: "total de publicacións denunciadas"
-      alt:
-        mentioned: "Mencionado por"
-        quoted: "Citado por"
-        replied: "Respondido"
-        posted: "Publicado por"
-        edited: "A túa publicación ediotuna"
-        liked: "Gustoulles a túa publicación"
-        private_message: "Mensaxe privada de"
-        invited_to_private_message: "Convidado a unha mensaxe privada de"
-        invited_to_topic: "Convidado a un tema de"
-        invitee_accepted: "Convite aceptado por"
-        moved_post: "A túa publicación foi movida por"
-        linked: "Ligazón á túa publicación"
-        granted_badge: "Insignias concedidas"
-        group_message_summary: "Mensaxes na caixa do grupo"
       popup:
         mentioned: '{{username}} mencionoute en "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} mencionoute en "{{topic}}" - {{site_title}}'
         quoted: '{{username}} citoute en "{{topic}}" - {{site_title}}'
         replied: '{{username}} respondeute en "{{topic}}" - {{site_title}}'
         posted: '{{username}} publicou en "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} enviouche unha mensaxe privada en "{{topic}}" - {{site_title}}'
         linked: '{{username}} ligou a túa publicación desde "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Engadir unha imaxe"
@@ -935,8 +899,8 @@ gl:
         archive_topics: "Arquivar temas"
         choose_new_category: "Seleccionar a nova categoría dos temas:"
         selected:
-          one: "Seleccionaches <b>un</b> tema."
-          other: "Seleccionaches <b>{{count}}</b> temas."
+          one: Seleccionaches <b>un</b> tema.
+          other: Seleccionaches <b>{{count}}</b> temas.
       none:
         unread: "Non tes temas sen ler."
         new: "Non tes novos temas."
@@ -963,9 +927,6 @@ gl:
         bookmarks: "Non hai máis temas marcados."
         search: "Non hai máis resultados da busca."
     topic:
-      unsubscribe:
-        stop_notifications: "Agora recibirás menos notificacións sobre <strong>{{title}}</strong>"
-        change_notification_state: "O estado actual das túas notificacións é"
       create: 'Novo tema'
       create_long: 'Crear un novo tema'
       private_message: 'Iniciar unha mensaxe'
@@ -979,10 +940,10 @@ gl:
       new: 'novo tema'
       unread: 'sen ler'
       new_topics:
-        one: 'Un tema novo'
+        one: Un tema novo
         other: '{{count}} temas novos'
       unread_topics:
-        one: 'Un tema sen ler'
+        one: Un tema sen ler
         other: '{{count}} temas sen ler'
       title: 'Tema'
       invalid_access:
@@ -996,17 +957,17 @@ gl:
         title: "Non foi posíbel atopar o tema"
         description: "Sentímolo pero non foi posíbel atopar este tema. Quizais foi eliminado por un moderador."
       total_unread_posts:
-        one: "Tes unha publicación sen ler neste tema"
-        other: "Tes {{count}} publicacións sen ler neste tema"
+        one: Tes unha publicación sen ler neste tema
+        other: Tes {{count}} publicacións sen ler neste tema
       unread_posts:
-        one: "Tes unha publicación antiga sen ler neste tema"
-        other: "Tes {{count}} publicacións antigas sen ler neste tema"
+        one: Tes unha publicación antiga sen ler neste tema
+        other: Tes {{count}} publicacións antigas sen ler neste tema
       new_posts:
-        one: "hai unha nova publicación neste tema desde a túa última lectura"
-        other: "hai {{count}} novas publicacións neste tema desde a túa última lectura"
+        one: hai unha nova publicación neste tema desde a túa última lectura
+        other: hai {{count}} novas publicacións neste tema desde a túa última lectura
       likes:
-        one: "hai un gústame neste tema"
-        other: "hai {{count}} gústames neste tema"
+        one: hai un gústame neste tema
+        other: hai {{count}} gústames neste tema
       back_to_list: "Volver á lista de temas"
       options: "Opcións de temas"
       show_links: "amosar as ligazóns cara este tema"
@@ -1016,7 +977,7 @@ gl:
       read_more_MF: "Hai { UNREAD, plural, =0 {} one { <a href='/unread'>1 sen ler</a> } other { <a href='/unread'># sen ler</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{e} false { } other{}} <a href='/new'>1 novo</a> topic} other { {BOTH, select, true{e} false { } other{}} <a href='/new'># novos</a> topics} } restantes, ou {CATEGORY, select, true {explora outros temas en {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Explorar todas as categorías
       view_latest_topics: ver últimos temas
-      suggest_create_topic: Porque non crear un tema?
+      suggest_create_topic: "Porque non crear un tema?"
       jump_reply_up: ir a unha resposta anterior
       jump_reply_down: ir a unha resposta posterior
       deleted: "Eliminouse o tema"
@@ -1032,16 +993,16 @@ gl:
         current: publicación actual
       notifications:
         reasons:
-          '3_6': 'Recibirás notificacións porque estás vendo esta categoría.'
-          '3_5': 'Recibirás notificacións porque comezaches a ver este tema automaticamente.'
-          '3_2': 'Recibirás notificacións porque estás vendo este tema.'
-          '3_1': 'Recibirás notificacións por ser o creador deste tema.'
-          '3': 'Recibirás notificacións porque estás vendo este tema.'
-          '1_2': 'Notificarémosche se alguén menciona o teu @nome ou che responde.'
-          '1': 'Notificarémosche se alguén menciona o teu @nome ou che responde.'
-          '0_7': 'Estás ignorando todas as notificacións desta categoría.'
-          '0_2': 'Estás ignorando todas as notificacións deste tema.'
-          '0': 'Estás ignorando todas as notificacións deste tema.'
+          "3_6": 'Recibirás notificacións porque estás vendo esta categoría.'
+          "3_5": 'Recibirás notificacións porque comezaches a ver este tema automaticamente.'
+          "3_2": 'Recibirás notificacións porque estás vendo este tema.'
+          "3_1": 'Recibirás notificacións por ser o creador deste tema.'
+          "3": 'Recibirás notificacións porque estás vendo este tema.'
+          "1_2": 'Notificarémosche se alguén menciona o teu @nome ou che responde.'
+          "1": 'Notificarémosche se alguén menciona o teu @nome ou che responde.'
+          "0_7": 'Estás ignorando todas as notificacións desta categoría.'
+          "0_2": 'Estás ignorando todas as notificacións deste tema.'
+          "0": 'Estás ignorando todas as notificacións deste tema.'
         watching_pm:
           title: "Ver"
           description: "Recibirás notificacións de cada resposta a esta mensaxe e aparecerá o número de novas respostas."
@@ -1105,8 +1066,8 @@ gl:
         pin_validation: "Requírese unha data para pegar este tema."
         not_pinned: "Non hai temas pegados en {{categoryLink}}."
         already_pinned:
-          one: "Temas pegados actualmente en {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
-          other: "Temas pegados actualmente en {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: 'Temas pegados actualmente en {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Temas pegados actualmente en {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         pin_globally: "Facer que este tema apareza no alto de todas as listas de temas até"
         confirm_pin_globally: "Xa tes {{count}} temas pegados globalmente. Demasiados temas pegados pode resultar pesado para usuarios novos e anónimos. Confirmas que queres pegar outro tema globalmente?"
         unpin_globally: "Eliminar este tema da banda superior de todas as listas de temas."
@@ -1114,8 +1075,8 @@ gl:
         global_pin_note: "Os usuarios poden despegar o tema por si mesmos."
         not_pinned_globally: "Non hai temas pegados globalmente."
         already_pinned_globally:
-          one: "Temas pegados globalmente neste intre: <strong class='badge badge-notification unread'>1</strong>"
-          other: "Temas pegados globalmente neste intre: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: 'Temas pegados globalmente neste intre: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Temas pegados globalmente neste intre: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         make_banner: "Facer deste tema un báner que apareza na banda superior de todas as páxinas."
         remove_banner: "Eliminar o báner que aparece na banda superior de todas as páxinas."
         banner_note: "Os usuarios poden desbotar un báner se o pechan. Unicamente pode haber un tema que sexa un báner ao mesmo tempo."
@@ -1149,8 +1110,8 @@ gl:
       login_reply: 'Inicia sesión para responder'
       filters:
         n_posts:
-          one: "Unha publicación"
-          other: "{{count}} publicacións"
+          one: Unha publicación
+          other: '{{count}} publicacións'
         cancel: "Eliminar filtro"
       split_topic:
         title: "Mover ao tema novo"
@@ -1158,15 +1119,15 @@ gl:
         topic_name: "Nome do tema novo"
         error: "Produciuse un erro movendo as publicacións ao novo tema."
         instructions:
-          one: "Vas crear un novo tema e enchelo coa publicación que seleccionaches."
-          other: "Vas crear un novo tema e enchelo coas <b>{{count}}</b> publicacións que seleccionaches."
+          one: Vas crear un novo tema e enchelo coa publicación que seleccionaches.
+          other: Vas crear un novo tema e enchelo coas <b>{{count}}</b> publicacións que seleccionaches.
       merge_topic:
         title: "Mover a un tema existente"
         action: "mover a un tema existente"
         error: "Produciuse un erro movendo publicacións nese tema."
         instructions:
-          one: "Selecciona o tema ao que queres mover esta publicación."
-          other: "Selecciona o tema ao que queres mover estas <b>{{count}}</b> publicacións."
+          one: Selecciona o tema ao que queres mover esta publicación.
+          other: Selecciona o tema ao que queres mover estas <b>{{count}}</b> publicacións.
       change_owner:
         title: "Cambiar propietario das publicacións"
         action: "cambiar propiedade"
@@ -1174,9 +1135,8 @@ gl:
         label: "Novo propietario das publicacións"
         placeholder: "nome do usuario do novo propietario"
         instructions:
-          one: "Selecciona o novo propietario da publicación de <b>{{old_user}}</b>."
-          other: "Selecciona o novo propietario das {{count}} publicacións de <b>{{old_user}}</b>."
-        instructions_warn: "Decátate que ningunha notificación sobre esta publicación se transferirá retroactivamente ao novo usuario.<br>Aviso: actualmente, non se transfire ao novo usuario ningún dato relacionado cunha publicación. Usa isto con tino."
+          one: Selecciona o novo propietario da publicación de <b>{{old_user}}</b>.
+          other: Selecciona o novo propietario das {{count}} publicacións de <b>{{old_user}}</b>.
       change_timestamp:
         action: "cambiar a marca data/hora"
         invalid_timestamp: "A marca data/hora non pode ser no futuro."
@@ -1186,15 +1146,13 @@ gl:
         select: 'seleccionar'
         selected: 'seleccionados ({{count}})'
         delete: eliminar seleccionados
-        cancel: 'cancelar selección '
+        cancel: "cancelar selección "
         select_all: seleccionar todo
         deselect_all: deseleccionar todo
         description:
           one: Seleccionaches <b>unha</b> publicación.
           other: Seleccionaches <b>{{count}}</b> publicacións.
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       edit_reason: "Razón:"
       post_number: "publicación {{number}}"
       last_edited_on: "última edición da publicación"
@@ -1204,26 +1162,26 @@ gl:
       show_full: "Amosar a publicación completa"
       show_hidden: 'Ver o contido oculto.'
       deleted_by_author:
-        one: "(as publicacións retiradas polo autor serán automaticamente eliminadas en %{count} hora, excepto que fosen denunciadas)"
-        other: "(as publicacións retiradas polo autor serán automaticamente eliminadas en %{count} horas, excepto que fosen denunciadas)"
+        one: (as publicacións retiradas polo autor serán automaticamente eliminadas en %{count} hora, excepto que fosen denunciadas)
+        other: (as publicacións retiradas polo autor serán automaticamente eliminadas en %{count} horas, excepto que fosen denunciadas)
       expand_collapse: "ampliar/reducir"
       gap:
-        one: "ver unha resposta oculta"
-        other: "ver {{count}} respostas ocultas"
+        one: ver unha resposta oculta
+        other: ver {{count}} respostas ocultas
       unread: "Publicación sen ler"
       has_replies:
-        one: "{{count}} resposta"
-        other: "{{count}} respostas"
+        one: '{{count}} resposta'
+        other: '{{count}} respostas'
       has_likes:
-        one: "{{count}} gústame"
-        other: "{{count}} gústames"
+        one: '{{count}} gústame'
+        other: '{{count}} gústames'
       has_likes_title:
-        one: "A unha persoa gustoulle esta publicación"
-        other: "A {{count}} persoas gustoulles esta publicación"
+        one: A unha persoa gustoulle esta publicación
+        other: A {{count}} persoas gustoulles esta publicación
       has_likes_title_only_you: "gustouche esta publicación"
       has_likes_title_you:
-        one: "A ti e a outro máis gustouvos esta publicación"
-        other: "A ti e a {{count}} persoas máis gustouvos esta publicación"
+        one: A ti e a outro máis gustouvos esta publicación
+        other: A ti e a {{count}} persoas máis gustouvos esta publicación
       errors:
         create: "Sentímolo pero produciuse un erro creando a publicación. Téntao de novo."
         edit: "Sentímolo pero produciuse un erro editando a publicación. Téntao de novo."
@@ -1289,54 +1247,54 @@ gl:
           vote: "Votaches esta publicación"
         by_you_and_others:
           off_topic:
-            one: "Ti e outro máis informastes disto como non relacionado"
-            other: "Ti e {{count}} máis informastes disto como non relacionado"
+            one: Ti e outro máis informastes disto como non relacionado
+            other: Ti e {{count}} máis informastes disto como non relacionado
           spam:
-            one: "Ti e outro máis denunciastes isto como spam"
-            other: "Ti e {{count}} máis denunciastes isto com spam"
+            one: Ti e outro máis denunciastes isto como spam
+            other: Ti e {{count}} máis denunciastes isto com spam
           inappropriate:
-            one: "Ti e outro máis denunciastes isto como inapropiado"
-            other: "Ti e {{count}} máis denunciastes isto como inapropiado"
+            one: Ti e outro máis denunciastes isto como inapropiado
+            other: Ti e {{count}} máis denunciastes isto como inapropiado
           notify_moderators:
-            one: "Ti e outro máis denunciastes isto para moderación"
-            other: "Ti e {{count}} máis denunciastes isto para moderación"
+            one: Ti e outro máis denunciastes isto para moderación
+            other: Ti e {{count}} máis denunciastes isto para moderación
           notify_user:
-            one: "Ti e unha persoa máis enviastes unha mensaxe a este usuario"
-            other: "Ti e {{count}} persoas máis enviastes unha mensaxe a este usuario"
+            one: Ti e unha persoa máis enviastes unha mensaxe a este usuario
+            other: Ti e {{count}} persoas máis enviastes unha mensaxe a este usuario
           bookmark:
-            one: "Ti e outra persoa marcastes esta publicación"
-            other: "Ti e {{count}} persoas máis marcastes esta publicación"
+            one: Ti e outra persoa marcastes esta publicación
+            other: Ti e {{count}} persoas máis marcastes esta publicación
           like:
-            one: "A ti e a un máis gustouvos isto"
-            other: "A ti e a {{count}} máis gustouvos isto"
+            one: A ti e a un máis gustouvos isto
+            other: A ti e a {{count}} máis gustouvos isto
           vote:
-            one: "Ti e outra persoa votastes esta publicación"
-            other: "Ti e {{count}} persoas máis votastes esta publicación"
+            one: Ti e outra persoa votastes esta publicación
+            other: Ti e {{count}} persoas máis votastes esta publicación
         by_others:
           off_topic:
-            one: "Unha persoa marcou isto como non relacionado"
-            other: "{{count}} persoas informaron disto como non relacionado"
+            one: Unha persoa marcou isto como non relacionado
+            other: '{{count}} persoas informaron disto como non relacionado'
           spam:
-            one: "Unha persoa marcou isto como spam"
-            other: "{{count}} persoas denunciaron isto como spam"
+            one: Unha persoa marcou isto como spam
+            other: '{{count}} persoas denunciaron isto como spam'
           inappropriate:
-            one: "Unha persoa denunciou isto como inapropiado"
-            other: "{{count}} persoas denunciaron isto como inapropiado"
+            one: Unha persoa denunciou isto como inapropiado
+            other: '{{count}} persoas denunciaron isto como inapropiado'
           notify_moderators:
-            one: "Unha persoa denunciou isto para moderación"
-            other: "{{count}} persoas denunciaron isto para moderación"
+            one: Unha persoa denunciou isto para moderación
+            other: '{{count}} persoas denunciaron isto para moderación'
           notify_user:
-            one: "Unha persoa enviou unha mensaxe a este usuario"
-            other: "{{count}} persoas enviaron unha mensaxe a este usuario"
+            one: Unha persoa enviou unha mensaxe a este usuario
+            other: '{{count}} persoas enviaron unha mensaxe a este usuario'
           bookmark:
-            one: "Unha persoa marcou esta publicación"
-            other: "{{count}} persoas marcaron esta publicación"
+            one: Unha persoa marcou esta publicación
+            other: '{{count}} persoas marcaron esta publicación'
           like:
-            one: "A unha persoa gustoulle isto"
-            other: "A {{count}} persoas gustoulles isto"
+            one: A unha persoa gustoulle isto
+            other: A {{count}} persoas gustoulles isto
           vote:
-            one: "Unha persoa votou por esta publicación"
-            other: "{{count}} persoas votaron por esta publicación"
+            one: Unha persoa votou por esta publicación
+            other: '{{count}} persoas votaron por esta publicación'
       revisions:
         controls:
           first: "Primeira revisión"
@@ -1396,7 +1354,6 @@ gl:
       email_in_allow_strangers: "Aceptar correos-e de usuarios anónimos sen contas"
       email_in_disabled: "A publicación de novos temas vía correo-e está desactivada nos axustes do sitio. Para activala,"
       email_in_disabled_click: 'activar o axuste «email in».'
-      suppress_from_homepage: "Retirar esta categoría da páxina de inicio."
       allow_badges_label: "Permitir adxudicar insignias nesta categoría"
       edit_permissions: "Editar permisos"
       add_permission: "Engadir permisos"
@@ -1445,8 +1402,8 @@ gl:
       participants_title: "Publicadores frecuentes"
       links_title: "Ligazóns populares"
       clicks:
-        one: "Un clic"
-        other: "%{count} clics"
+        one: Un clic
+        other: '%{count} clics'
     topic_statuses:
       warning:
         help: "Este é un aviso oficial."
@@ -1480,19 +1437,19 @@ gl:
     original_post: "Publicación orixinal"
     views: "Vistas"
     views_lowercase:
-      one: "vista"
-      other: "vistas"
+      one: vista
+      other: vistas
     replies: "Respostas"
     activity: "Actividade"
     likes: "Gústames"
     likes_lowercase:
-      one: "gústame"
-      other: "gústames"
+      one: gústame
+      other: gústames
     likes_long: "hai {{number}} gústames neste tema"
     users: "Usuarios"
     users_lowercase:
-      one: "usuario"
-      other: "usuarios"
+      one: usuario
+      other: usuarios
     category_title: "Categoría"
     history: "Historial"
     changed_by: "por {{author}}"
@@ -1505,8 +1462,8 @@ gl:
       latest:
         title: "Últimos"
         title_with_count:
-          one: "Último (1)"
-          other: "({{count}}) últimos"
+          one: Último (1)
+          other: ({{count}}) últimos
         help: "temas con publicacións recentes"
       hot:
         title: "Quentes"
@@ -1524,21 +1481,21 @@ gl:
       unread:
         title: "Sen ler"
         title_with_count:
-          one: "Un sen ler"
-          other: "({{count}}) sen ler"
+          one: Un sen ler
+          other: ({{count}}) sen ler
         help: "temas con publicacións sen ler que estás vendo ou seguindo"
         lower_title_with_count:
-          one: "Unha sen ler"
-          other: "{{count}} sen ler"
+          one: Unha sen ler
+          other: '{{count}} sen ler'
       new:
         lower_title_with_count:
-          one: "Un novo"
-          other: "{{count}} novos"
+          one: Un novo
+          other: '{{count}} novos'
         lower_title: "novo"
         title: "Novo"
         title_with_count:
-          one: "Un novo"
-          other: "({{count}}) novos"
+          one: Un novo
+          other: ({{count}}) novos
         help: "temas creados nos últimos días"
       posted:
         title: "As miñas publicacións"
@@ -1549,8 +1506,8 @@ gl:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: "{{categoryName}} (1)"
-          other: "{{categoryName}} ({{count}})"
+          one: '{{categoryName}} (1)'
+          other: '{{categoryName}} ({{count}})'
         help: "últimos temas na categoría {{categoryName}}"
       top:
         title: "Destacados"
@@ -1616,8 +1573,6 @@ gl:
         reports:
           today: "Hoxe"
           yesterday: "Onte"
-          last_7_days: "Últimos 7 días"
-          last_30_days: "Últimos 30 días"
           all_time: "Todos"
           7_days_ago: "Hai 7 días"
           30_days_ago: "Hai 30 días"
@@ -1634,7 +1589,6 @@ gl:
         title: "Denuncias"
         agree: "Aceptar"
         agree_title: "Confirmar esta denuncia como válida"
-        defer_flag_title: "Eliminar esta denuncia; non precisa medidas neste momento."
         delete: "Eliminar"
         delete_title: "Eliminar a publicación á que se refire esta denuncia."
         delete_post_defer_flag_title: "Eliminar publicación. Se é a inicial, eliminar tamén o tema"
@@ -1668,8 +1622,6 @@ gl:
         title: "Grupos"
         edit: "Editar grupos"
         refresh: "Actualizar"
-        new: "Novo"
-        selector_placeholder: "escribe o nome do usuario"
         about: "Edita aquí a túa pertenza a un grupo e nomes"
         group_members: "Membros do grupo"
         delete: "Eliminar"
@@ -1677,21 +1629,10 @@ gl:
         delete_failed: "Non é posíbel eliminar o grupo. Se este é un grupo automático, non se pode destruír."
         delete_owner_confirm: "Eliminar os privilexios de usuario de «%{username}»?"
         add: "Engadir"
-        add_members: "Engadir membros"
         custom: "Personalizar"
-        bulk_complete: "Engadíronse os usuarios ao grupo."
-        bulk: "Engadir ao grupo en bloque"
-        bulk_paste: "Pegar unha lista de nomes de usuario ou correos-e, un por liña:"
-        bulk_select: "(seleccionar un grupo)"
         automatic: "Automático"
-        automatic_membership_email_domains: "Os usuarios que se rexistraron cun dominio de correo electrónico que coincida exactamente con algún da lista engadiranse automaticamente a este grupo:"
-        automatic_membership_retroactive: "Aplicar a regra do mesmo dominio de correo electrónico para engadir os usuarios rexistrados."
-        default_title: "Título predeterminado para os usuarios deste grupo"
-        primary_group: "Estabelecer automaticamente como grupo primario"
         group_owners: Propietarios
         add_owners: Engadir propietarios
-        incoming_email: "Personalizar enderezos de correo-e entrantes"
-        incoming_email_placeholder: "introducir enderezos de correo-e"
       api:
         generate_master: "Xerar unha chave maestra da API"
         none: "Non hai chaves activas da API agora mesmo."
@@ -1733,7 +1674,6 @@ gl:
           label: "Enviar"
           title: "Subir unha copia de seguranza a esta instancia"
           uploading: "Enviando..."
-          success: "«{{filename}}» subiuse correctamente."
           error: "Produciuse un erro durante o envío de «{{filename}}»: {{message}}"
         operations:
           is_running: "Estase executando unha operación..."
@@ -1746,7 +1686,6 @@ gl:
             label: "Copia de seguranza"
             title: "Crear unha copia de seguranza"
             confirm: "Confirmas a execución dunha nova copia de seguranza?"
-            without_uploads: "Si (non incluír ficheiros)"
           download:
             label: "Descargar"
           destroy:
@@ -2003,11 +1942,11 @@ gl:
           suspect: 'Sospeitoso'
         approved: "Aprobado?"
         approved_selected:
-          one: "aprobar usuario"
-          other: "aprobar os ({{count}}) usuarios"
+          one: aprobar usuario
+          other: aprobar os ({{count}}) usuarios
         reject_selected:
-          one: "rexeitar usuario"
-          other: "rexeitar os ({{count}}) usuarios"
+          one: rexeitar usuario
+          other: rexeitar os ({{count}}) usuarios
         titles:
           active: 'Usuarios activos'
           new: 'Novos usuarios'
@@ -2023,11 +1962,11 @@ gl:
           suspended: 'Usuarios suspendidos'
           suspect: 'Usuarios sospeitosos'
         reject_successful:
-          one: "Rexeitouse un usuario correctamente."
-          other: "Rexeitáronse %{count} usuarios correctamente."
+          one: Rexeitouse un usuario correctamente.
+          other: Rexeitáronse %{count} usuarios correctamente.
         reject_failures:
-          one: "Produciuse un fallo rexeitando o usuario."
-          other: "Produciuse un fallo rexeitando os %{count} usuarios."
+          one: Produciuse un fallo rexeitando o usuario.
+          other: Produciuse un fallo rexeitando os %{count} usuarios.
         not_verified: "Sen verificar"
         check_email:
           title: "Amosar o enderezo de correo-e deste usuario"
@@ -2084,14 +2023,14 @@ gl:
         delete_forbidden_because_staff: "Non é posíbel eliminiar os administradores e moderadores."
         delete_posts_forbidden_because_staff: "Non é posíbel eliminar todas as publicacións dos administradores ou moderadores."
         delete_forbidden:
-          one: "Non é posíbel eliminar usuarios se teñen publicacións. Elimina as publicacións antes de eliminar o usuario (non é posíbel eliminar publicacións de máis de  %{count} día)"
-          other: "Non é posíbel eliminar usuarios se teñen publicacións. Elimina as publicacións antes de eliminar o usuario (non é posíbel eliminar publicacións de máis de  %{count} días)"
+          one: Non é posíbel eliminar usuarios se teñen publicacións. Elimina as publicacións antes de eliminar o usuario (non é posíbel eliminar publicacións de máis de  %{count} día)
+          other: Non é posíbel eliminar usuarios se teñen publicacións. Elimina as publicacións antes de eliminar o usuario (non é posíbel eliminar publicacións de máis de  %{count} días)
         cant_delete_all_posts:
-          one: "Non é posíbel eliminar todas as publicacións. Algunhas teñen máis de %{count} día. (o axuste delete_user_max_post_age.)"
-          other: "Non é posíbel eliminar todas as publicacións. Algunhas teñen máis de %{count} días. (o axuste delete_user_max_post_age.)"
+          one: Non é posíbel eliminar todas as publicacións. Algunhas teñen máis de %{count} día. (o axuste delete_user_max_post_age.)
+          other: Non é posíbel eliminar todas as publicacións. Algunhas teñen máis de %{count} días. (o axuste delete_user_max_post_age.)
         cant_delete_all_too_many_posts:
-          one: "Non é posíbel eliminar todas as publicacións porque o usuario ten máis dunha publicación.  (delete_all_posts_max)"
-          other: "Non é posíbel eliminar todas as publicacións porque o usuario ten máis de %{count} publicacións.  (delete_all_posts_max)"
+          one: Non é posíbel eliminar todas as publicacións porque o usuario ten máis dunha publicación.  (delete_all_posts_max)
+          other: Non é posíbel eliminar todas as publicacións porque o usuario ten máis de %{count} publicacións.  (delete_all_posts_max)
         delete_confirm: "CONFIRMAS a eliminación deste usuario? Non se poderá desfacer!"
         delete_and_block: "Eliminar e <b>bloquear</b> este correo-e e enderezo IP"
         delete_dont_block: "Só eliminar"
@@ -2186,10 +2125,7 @@ gl:
         recommended: "Recomendamos personalizar o seguinte texto para axeitalo ás túas necesidades:"
         show_overriden: 'Amosar só os cambios'
       site_settings:
-        show_overriden: 'Amosar só os cambios'
         title: 'Axustes'
-        reset: 'restabelecer'
-        none: 'ningunha'
         no_results: "Non se atoparon resultados."
         clear_filter: "Borrar"
         add_url: "engadir URL"
@@ -2233,11 +2169,11 @@ gl:
         reason_help: (Ligazón a unha publicación ou tema)
         save: Gardar
         delete: Eliminar
-        delete_confirm: Confirmas a eliminación desta insignia?
+        delete_confirm: "Confirmas a eliminación desta insignia?"
         revoke: Revogar
         reason: Razón
         expand: Expandir &hellip;
-        revoke_confirm: Confirmas a revogación desta insignia?
+        revoke_confirm: "Confirmas a revogación desta insignia?"
         edit_badges: Editar insignias
         grant_badge: Conceder insignia
         granted_badges: Insignias concedidas
@@ -2251,7 +2187,6 @@ gl:
         enabled: Activar insignia
         icon: Icona
         image: Imaxe
-        icon_help: "Usar a clase Font Awesome ou unha URL a unha imaxe"
         query: Consulta sobre insignia (SQL)
         target_posts: Consulta dirixida a mensaxes
         auto_revoke: Executar a consulta de revogación diariamente
@@ -2274,14 +2209,14 @@ gl:
             text: "Faltan algunhas mostras para a concesión da insignia. Isto acontece cando a consulta sobre insignias devolve unha ID do usuario, ou de publicacións que non existen. Pode causar resultados inesperados posteriormente. Revisa outra vez a solicitude."
           no_grant_count: "Non hai insignias para asignar."
           grant_count:
-            one: "<b>1</b> insignia para asignar."
-            other: "<b>%{count}</b> insignias para asignar."
+            one: <b>1</b> insignia para asignar.
+            other: <b>%{count}</b> insignias para asignar.
           sample: "Mostra:"
           grant:
-            with: <span class="username">%{username}</span>
-            with_post: <span class="username">%{username}</span> para publicación en %{link}
-            with_post_time: <span class="username">%{username}</span> para publicación en %{link} o <span class="time">%{time}</span>
-            with_time: <span class="username">%{username}</span> o <span class="time">%{time}</span>
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span> para publicación en %{link}"
+            with_post_time: "<span class=\"username\">%{username}</span> para publicación en %{link} o <span class=\"time\">%{time}</span>"
+            with_time: "<span class=\"username\">%{username}</span> o <span class=\"time\">%{time}</span>"
       emoji:
         title: "Emoji"
         help: "Engade novo emoji que estará dispoñíbel para todos. (Suxestión: arrastra e solta múltiples ficheiros dunha vez)"
@@ -2322,7 +2257,7 @@ gl:
         category_id: "ID da categoría"
         category_title: "Categoría"
         external_url: "URL externa"
-        delete_confirm: Confirmas a eliminación desta ligazón permanente?
+        delete_confirm: "Confirmas a eliminación desta ligazón permanente?"
         form:
           label: "Novo:"
           add: "Engadir"
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index 575aba48d9d..70861d4ae92 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -16,8 +16,10 @@ he:
           format: '%n %u'
           units:
             byte:
+              many: בתים
               one: בית
               other: בתים
+              two: בתים
             gb: ג״ב
             kb: ק״ב
             mb: מ״ב
@@ -43,62 +45,96 @@ he:
       tiny:
         half_a_minute: "פחות מדקה"
         less_than_x_seconds:
-          one: "פחות משנייה"
-          other: "פחות מ־%{count} שניות"
+          many: פחות מ־%{count} שניות
+          one: פחות משנייה
+          other: פחות מ־%{count} שניות
+          two: פחות מ־%{count} שניות
         x_seconds:
-          one: "שנייה אחת"
-          other: "%{count} שניות"
+          many: '%{count} שניות'
+          one: שנייה אחת
+          other: '%{count} שניות'
+          two: '%{count} שניות'
         x_minutes:
-          one: "דקה אחת"
-          other: "%{count} דקות"
+          many: '%{count} דקות'
+          one: דקה אחת
+          other: '%{count} דקות'
+          two: '%{count} דקות'
         about_x_hours:
-          one: "שעה אחת"
-          other: "%{count} שעות"
+          many: '%{count} שעות'
+          one: שעה אחת
+          other: '%{count} שעות'
+          two: '%{count} שעות'
         x_days:
-          one: "יום אחד"
-          other: "%{count} ימים"
+          many: '%{count} ימים'
+          one: יום אחד
+          other: '%{count} ימים'
+          two: '%{count} ימים'
         about_x_years:
-          one: "שנה אחת"
-          other: "%{count} שנים"
+          many: '%{count} שנים'
+          one: שנה אחת
+          other: '%{count} שנים'
+          two: '%{count} שנים'
         over_x_years:
-          one: "יותר משנה"
-          other: "יותר מ־%{count} שנים"
+          many: יותר מ־%{count} שנים
+          one: יותר משנה
+          other: יותר מ־%{count} שנים
+          two: יותר מ־%{count} שנים
         almost_x_years:
-          one: "שנה אחת"
-          other: "%{count} שנים"
+          many: '%{count} שנים'
+          one: שנה אחת
+          other: '%{count} שנים'
+          two: '%{count} שנים'
         date_month: "MMM D"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: "דקה אחת"
-          other: "%{count} דקות"
+          many: '%{count} דקות'
+          one: דקה אחת
+          other: '%{count} דקות'
+          two: '%{count} דקות'
         x_hours:
-          one: "שעה אחת"
-          other: "%{count} שעות"
+          many: '%{count} שעות'
+          one: שעה אחת
+          other: '%{count} שעות'
+          two: '%{count} שעות'
         x_days:
-          one: "יום אחד"
-          other: "%{count} ימים"
+          many: '%{count} ימים'
+          one: יום אחד
+          other: '%{count} ימים'
+          two: '%{count} ימים'
         date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
-          one: "לפני דקה אחת"
-          other: "לפני %{count} דקות"
+          many: לפני %{count} דקות
+          one: לפני דקה אחת
+          other: לפני %{count} דקות
+          two: לפני %{count} דקות
         x_hours:
-          one: "לפני שעה אחת"
-          other: "לפני %{count} שעות"
+          many: לפני %{count} שעות
+          one: לפני שעה אחת
+          other: לפני %{count} שעות
+          two: לפני %{count} שעות
         x_days:
-          one: "אתמול"
-          other: "לפני %{count} ימים"
+          many: לפני %{count} ימים
+          one: אתמול
+          other: לפני %{count} ימים
+          two: לפני %{count} ימים
       later:
         x_days:
-          one: "אחרי יום אחד"
-          other: "אחרי %{count} ימים"
+          many: אחרי %{count} ימים
+          one: אחרי יום אחד
+          other: אחרי %{count} ימים
+          two: אחרי %{count} ימים
         x_months:
-          one: "אחרי חודש אחד"
-          other: "אחרי %{count} חודשים"
+          many: אחרי %{count} חודשים
+          one: אחרי חודש אחד
+          other: אחרי %{count} חודשים
+          two: אחרי %{count} חודשים
         x_years:
-          one: "אחרי שנה אחת"
-          other: "אחרי %{count} שנים"
+          many: אחרי %{count} שנים
+          one: אחרי שנה אחת
+          other: אחרי %{count} שנים
+          two: אחרי %{count} שנים
       previous_month: 'חודש קודם'
       next_month: 'חודש הבא'
     share:
@@ -111,7 +147,6 @@ he:
       email: 'שליחת קישור בדוא״ל'
     action_codes:
       public_topic: "הפכו נושא זה לפומבי %{when}"
-      private_topic: "הפכו נושא זה לפרטי %{when}"
       split_topic: "פצלו נושא זה %{when}"
       invited_user: "%{who} הוזמנו ב-%{when}"
       invited_group: "הזמינו %{who} %{when}"
@@ -141,8 +176,6 @@ he:
     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 השעות הקרובות."
     themes:
       default_description: "ברירת מחדל"
     s3:
@@ -178,8 +211,10 @@ he:
     show_help: "אפשרויות"
     links: "קישורים"
     links_lowercase:
-      one: "קישור"
-      other: "קישורים"
+      many: קישורים
+      one: קישור
+      other: קישורים
+      two: קישורים
     faq: "שאלות נפוצות"
     guidelines: "הנחיות"
     privacy_policy: "מדיניות פרטיות"
@@ -203,8 +238,10 @@ he:
     max_of_count: "מקסימום של {{count}}"
     alternation: "או"
     character_count:
-      one: "תו אחד"
-      other: "{{count}} תווים"
+      many: '{{count}} תווים'
+      one: תו אחד
+      other: '{{count}} תווים'
+      two: '{{count}} תווים'
     suggested_topics:
       title: "נושאים מוצעים"
       pm_title: "הודעות מוצעות"
@@ -216,8 +253,6 @@ he:
       our_moderators: "המנחים שלנו"
       stat:
         all_time: "כל הזמנים"
-        last_7_days: "7 הימים האחרונים"
-        last_30_days: "ב-30 הימים האחרונים"
       like_count: "לייקים"
       topic_count: "נושאים"
       post_count: "פוסטים"
@@ -238,16 +273,6 @@ he:
       last_read: "זה הפוסט האחרון שקראתם, לחצו לסמן עם סימנייה"
       remove: "הסר מהמועדפים"
       confirm_clear: "האם אתם בטוחים שאתם מעוניינים לנקות את כל הסימניות מנושא זה?"
-    topic_count_latest:
-      one: " {{count}} נושא חדש או עדכון."
-      other: "{{count}} נושאים חדשים או עדכונים."
-    topic_count_unread:
-      one: "נושא שלא נקרא."
-      other: "{{count}} נושאים שלא נקראו."
-    topic_count_new:
-      one: "נושא חדש אחד."
-      other: "{{count}} נושאים חדשים."
-    click_to_show: "הקליקו כדי להציג."
     preview: "תצוגה מקדימה"
     cancel: "ביטול"
     save: "שמירת שינויים"
@@ -283,16 +308,20 @@ he:
       cancel: "ביטול"
       view_pending: "הצג פוסטים ממתינים"
       has_pending_posts:
-        one: " בנושא זה ישנו פוסט אחד הממתין לאישור"
-        other: "בנושא זה ישנם <b>{{count}}</b> פוסטים הממתינים לאישור"
+        many: בנושא זה ישנם <b>{{count}}</b> פוסטים הממתינים לאישור
+        one: ' בנושא זה ישנו פוסט אחד הממתין לאישור'
+        other: בנושא זה ישנם <b>{{count}}</b> פוסטים הממתינים לאישור
+        two: בנושא זה ישנם <b>{{count}}</b> פוסטים הממתינים לאישור
       confirm: "שמירת שינויים"
       delete_prompt: "האם אתם בטוחים שאתם מעוניינים למחוק את <b>%{username}</b>? זה ימחוק את כל הפוסטים שלהם ויחסום את המייל וכתובת ה IP שלהם."
       approval:
         title: "הפוסט זקוק לאישור"
         description: "קיבלנו את הפוסט אך נדרש אישור של מנחה לפני שהוא יוצג, אנא המתינו בסבלנות."
         pending_posts:
-          one: "יש לכם פוסט <strong>אחד</strong> שממתין."
-          other: "יש לכם <strong>{{count}}</strong> פוסטים ממתינים."
+          many: יש לכם <strong>{{count}}</strong> פוסטים ממתינים.
+          one: יש לכם פוסט <strong>אחד</strong> שממתין.
+          other: יש לכם <strong>{{count}}</strong> פוסטים ממתינים.
+          two: יש לכם <strong>{{count}}</strong> פוסטים ממתינים.
         ok: "אשר"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> פרסם <a href='{{topicUrl}}'>את הנושא</a>"
@@ -326,8 +355,10 @@ he:
       posts_read: "נקראו"
       posts_read_long: "פוסטים שנקראו"
       total_rows:
-        one: "משתמש/ת 1"
-        other: "%{count} משתמשים"
+        many: '%{count} משתמשים'
+        one: משתמש/ת 1
+        other: '%{count} משתמשים'
+        two: '%{count} משתמשים'
     group_histories:
       actions:
         change_group_setting: "שינוי הגדרות קבוצה"
@@ -336,22 +367,6 @@ he:
         make_user_group_owner: "הפיכה לבעלים"
         remove_user_as_group_owner: "שלילת בעלות"
     groups:
-      logs:
-        title: "לוגים"
-        when: "מתי"
-        action: "פעולה"
-        acting_user: "משתמשים פועלים"
-        target_user: "משתמשי מטרה"
-        subject: "נושא"
-        details: "פרטים"
-        from: "מאת"
-        to: "אל"
-      edit:
-        title: 'עריכת קבוצה'
-        full_name: 'שם מלא'
-        add_members: "הוספת חברים"
-        delete_member_confirm: "הסרת '%{username}' מהקבוצה '%{group}'?"
-      name_placeholder: "שם קבוצה, ללא רווחים, לפי הכללים של שמות משתמשים"
       public_admission: "אפשרו למשתמשים להצטרף לקבוצה בחופשיות (דורש קבוצה פומבית)"
       public_exit: "אפשרו למשתמשים לעזוב את הקבוצה בחופשיות"
       empty:
@@ -362,45 +377,27 @@ he:
         topics: "אין נושאים שנוצרו על ידי חברים של קבוצה זו."
         logs: "אין לוגים עבור קבוצה זו."
       add: "הוספה"
-      join: "הצטרפות לקבוצה"
-      leave: "עזיבת קבוצה"
-      request: "בקשה להצטרפות לקבוצה"
       message: "הודעה"
-      automatic_group: קבוצה אוטומטית
-      closed_group: קבוצה סגורה
-      is_group_user: "אתם חברים בקבוצה זו."
       allow_membership_requests: "אפשרו למשתמשים לשלוח בקשות חברות לבעלי קבוצה"
       membership: "חברות"
       name: "שם"
-      user_count: "מספר חברים"
       bio: "אודות הקבוצה"
-      selector_placeholder: "הוספת חברים וחברות"
       owner: "מנהל"
       index:
         title: "קבוצות"
         empty: "אין קבוצות נראות."
       activity: "פעילות"
-      members: "חברים"
       topics: "נושאים"
       posts: "פוסטים"
       mentions: "אזכורים"
       messages: "הודעות"
       notification_level: "ברירת מחדל של רמת התראות להודעות קבוצה"
-      visibility_levels:
-        title: "מי יכול לראות קבוצה זו?"
-        public: "כולם"
-        members: "בעלי קבוצה, חברים ואדמיניסטרטורים"
-        staff: "בעלי קבוצה וצוות"
-        owners: "בעלי קבוצה ואדמיניסטרטורים"
       alias_levels:
         nobody: "אף אחד"
         only_admins: "רק מנהלים"
         mods_and_admins: "רק מנחים ומנהלים"
         members_mods_and_admins: "רק חברי הקבוצה, מנחים ומנהלים"
         everyone: "כולם"
-      trust_levels:
-        title: "רמת אמון הניתנת אוטומטית למשתמשים כשהם נוספים:"
-        none: "ללא"
       notifications:
         watching:
           title: "במעקב"
@@ -425,23 +422,21 @@ he:
       flair_color_placeholder: "(אופציונלי) ערך הקסדצימלי של הצבע"
       flair_preview_icon: "תצוגה מקדימה של אייקון"
       flair_preview_image: "תצוגה מקדימה של תמונה"
-      flair_note: "שימו לב: פלייר יופיע רק עבור הקבוצה הראשית של משתמשים."
     user_action_groups:
-      '1': "לייקים שניתנו"
-      '2': "לייקים שהתקבלו"
-      '3': "סימניות"
-      '4': "נושאים"
-      '5': "תשובות"
-      '6': "תגובות"
-      '7': "אזכורים"
-      '9': "ציטוטים"
-      '11': "עריכות"
-      '12': "פריטים שנשלחו"
-      '13': "דואר נכנס"
-      '14': "ממתין"
+      "1": "לייקים שניתנו"
+      "2": "לייקים שהתקבלו"
+      "3": "סימניות"
+      "4": "נושאים"
+      "5": "תשובות"
+      "6": "תגובות"
+      "7": "אזכורים"
+      "9": "ציטוטים"
+      "11": "עריכות"
+      "12": "פריטים שנשלחו"
+      "13": "דואר נכנס"
+      "14": "ממתין"
     categories:
       all: "כל הקטגוריות"
-      all_subcategories: "הכל"
       no_subcategory: "ללא"
       category: "קטגוריה"
       category_list: "הצגת גשימת קטגוריות"
@@ -460,11 +455,15 @@ he:
       toggle_ordering: "שנה בקר סדר"
       subcategories: "תתי קטגוריות"
       topic_sentence:
-        one: "נושא אחד"
-        other: "%{count} נושאים"
+        many: '%{count} נושאים'
+        one: נושא אחד
+        other: '%{count} נושאים'
+        two: '%{count} נושאים'
       topic_stat_sentence:
-        one: "נושא חדש אחד ב-%{unit}."
-        other: "%{count} נושאים חדשים ב-%{unit}."
+        many: '%{count} נושאים חדשים ב-%{unit}.'
+        one: נושא חדש אחד ב-%{unit}.
+        other: '%{count} נושאים חדשים ב-%{unit}.'
+        two: '%{count} נושאים חדשים ב-%{unit}.'
     ip_lookup:
       title: חיפוש כתובת IP
       hostname: שם שרת
@@ -505,7 +504,6 @@ he:
       notifications: "התראות"
       statistics: "סטטיסטיקות"
       desktop_notifications:
-        label: "התראות לשולחן העבודה"
         not_supported: "התראות לא נתמכות בדפדפן זה. מצטערים."
         perm_default: "הפעלת התראות"
         perm_denied_btn: "הרשאות נדחו"
@@ -561,7 +559,6 @@ he:
       delete_account: "מחק את החשבון שלי"
       delete_account_confirm: "אתם בטוחים שברצונכם למחוק את החשבון? לא ניתן לבטל פעולה זו!"
       deleted_yourself: "חשבונך נמחק בהצלחה."
-      delete_yourself_not_allowed: "אתם לא יכולים למחוק את חשבונכם כרגע. צרו קשר עם מנהל כדי שימחק אותו בשבילכם."
       unread_message_count: "הודעות"
       admin_delete: "מחק"
       users: "משתמשים"
@@ -649,8 +646,10 @@ he:
         authenticated: "כתובת הדואר האלקטרוני שלך אושרה על ידי {{provider}}"
         frequency_immediately: "נשלח לכם מייל מיידית אם לא קראתם את מה ששלחנו לכם עליו מייל."
         frequency:
-          one: "נשלח אליכם דוא\"ל רק אם לא ראינו אתכם בדקה האחרונה."
-          other: "נשלח אליכם דוא\"ל רק אם לא ראינו אתכם ב{{count}} הדקות האחרונות."
+          many: נשלח אליכם דוא"ל רק אם לא ראינו אתכם ב{{count}} הדקות האחרונות.
+          one: נשלח אליכם דוא"ל רק אם לא ראינו אתכם בדקה האחרונה.
+          other: נשלח אליכם דוא"ל רק אם לא ראינו אתכם ב{{count}} הדקות האחרונות.
+          two: נשלח אליכם דוא"ל רק אם לא ראינו אתכם ב{{count}} הדקות האחרונות.
       name:
         title: "שם"
         instructions: "שמכם המלא (אופציונלי)"
@@ -681,8 +680,6 @@ he:
       created: "הצטרפו"
       log_out: "התנתקות"
       location: "מיקום"
-      card_badge:
-        title: "עיטור כרטיס משתמש/ת"
       website: "אתר"
       email_settings: "דואר אלקטרוני"
       like_notification_frequency:
@@ -736,10 +733,11 @@ he:
         title: "הזמנות"
         user: "משתמשים שהוזמנו"
         sent: "נשלח"
-        none: "אין הזמנות ממתינות להציג."
         truncated:
-          one: "מראה את ההזמנה הראשונה."
-          other: "מראה את {{count}} ההזמנות הראשונות."
+          many: מראה את {{count}} ההזמנות הראשונות.
+          one: מראה את ההזמנה הראשונה.
+          other: מראה את {{count}} ההזמנות הראשונות.
+          two: מראה את {{count}} ההזמנות הראשונות.
         redeemed: "הזמנות נוצלו"
         redeemed_tab: "נענו"
         redeemed_tab_with_count: "נוצלו ({{count}})"
@@ -785,20 +783,30 @@ he:
         stats: "סטטיסטיקות"
         time_read: "זמן קריאה"
         topic_count:
-          one: "נושא נוצר"
-          other: "נושאים נוצרו"
+          many: נושאים נוצרו
+          one: נושא נוצר
+          other: נושאים נוצרו
+          two: נושאים נוצרו
         post_count:
-          one: "פוסט נוצר"
-          other: "פוסטים נוצרו"
+          many: פוסטים נוצרו
+          one: פוסט נוצר
+          other: פוסטים נוצרו
+          two: פוסטים נוצרו
         days_visited:
-          one: "יום שבוקר"
-          other: "ימים שבוקרו"
+          many: ימים שבוקרו
+          one: יום שבוקר
+          other: ימים שבוקרו
+          two: ימים שבוקרו
         posts_read:
-          one: "פוסט נקרא"
-          other: "פוסטים נקראו"
+          many: פוסטים נקראו
+          one: פוסט נקרא
+          other: פוסטים נקראו
+          two: פוסטים נקראו
         bookmark_count:
-          one: "סימנייה"
-          other: "סימניות"
+          many: סימניות
+          one: סימנייה
+          other: סימניות
+          two: סימניות
         top_replies: "תגובות מובילות"
         no_replies: "עדיין אין תגובות."
         more_replies: "תגובות נוספות"
@@ -866,8 +874,10 @@ he:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a>הגיע לגבול הגדרות האתר של %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> עבר את הגבול של הגדרות האתר ב- %{siteSettingRate}."
       rate:
-        one: "שגיאה ל %{duration}"
-        other: "%{count} שגיאות\\%{duration}"
+        many: '%{count} שגיאות\%{duration}'
+        one: שגיאה ל %{duration}
+        other: '%{count} שגיאות\%{duration}'
+        two: '%{count} שגיאות\%{duration}'
     learn_more: "למד עוד..."
     all_time: 'סך הכל'
     all_time_desc: 'כל הנושאים שנוצרו'
@@ -883,8 +893,10 @@ he:
     unmute: בטל השתקה
     last_reply_lowercase: תגובה אחרונה
     replies_lowercase:
+      many: תגובות
       one: תגובה
       other: תגובות
+      two: תגובות
     signup_cta:
       sign_up: "הרשמה"
       hide_session: "הזכר לי מחר"
@@ -1039,8 +1051,10 @@ he:
       similar_topics: "הנושא שלך דומה ל..."
       drafts_offline: "טיוטות מנותקות"
       group_mentioned:
-        one: "על ידי אזכור {{group}}, אתם עומדים ליידע <a href='{{group_link}}'>אדם אחד</a> – אתם בטוחים?"
-        other: "על ידי אזכור {{group}}, אתם עומדים ליידע <a href='{{group_link}}'>{{count}} אנשים</a> – אתם בטוחים?"
+        many: על ידי אזכור {{group}}, אתם עומדים ליידע <a href='{{group_link}}'>{{count}} אנשים</a> – אתם בטוחים?
+        one: על ידי אזכור {{group}}, אתם עומדים ליידע <a href='{{group_link}}'>אדם אחד</a> – אתם בטוחים?
+        other: על ידי אזכור {{group}}, אתם עומדים ליידע <a href='{{group_link}}'>{{count}} אנשים</a> – אתם בטוחים?
+        two: על ידי אזכור {{group}}, אתם עומדים ליידע <a href='{{group_link}}'>{{count}} אנשים</a> – אתם בטוחים?
       cannot_see_mention:
         category: "הזכרתם את {{username}} אבל הוא/היא לא יקבלו התראה כיוון שאין להם גישה לקטגוריה זו. תצטרכו להוסיף אותם לקבוצה שיש לה גישה לקטגוריה הזו."
         private: "הזכרתם את {{username}} אבל הוא/היא לא יקבלו התראה כיוון שהם לא יכולים לראות את ההודעה הפרטית הזו. תצטרכו להזמין אותם להודעה פרטית זו."
@@ -1110,28 +1124,12 @@ he:
       empty: "לא נמצאו התראות."
       more: "הצגת התראות ישנות יותר"
       total_flagged: "סך הכל פוסטים מדוגלים"
-      alt:
-        mentioned: "הוזכר על ידי"
-        quoted: "צוטט על ידי"
-        replied: "השיב"
-        posted: "פורסם על ידי"
-        edited: "ערוך את הפוסט שלך על ידי"
-        liked: "אהב את הפוסט שלך"
-        private_message: "הודעה פרטית מ"
-        invited_to_private_message: "הזמנה להודעה פרטית מ"
-        invited_to_topic: "הוזמנת לנושא חדש מ"
-        invitee_accepted: "הזמנה התקבלה על ידי"
-        moved_post: "הפוסט שלך הוזז על ידי"
-        linked: "קישור לפוסט שלך"
-        granted_badge: "עיטור הוענק"
-        group_message_summary: "הודעות בדואר-נכנס קבוצתי"
       popup:
         mentioned: '{{username}} הזכיר/ה אותך ב{{topic}}" - {{site_title}}"'
         group_mentioned: '{{username}} הזכיר/ה אתכם ב "{{topic}}" - {{site_title}}'
         quoted: '{{username}} ציטט/ה אותך ב"{{topic}}" - {{site_title}}'
         replied: '{{username}} הגיב/ה לך ב"{{topic}}" - {{site_title}}'
         posted: '{{username}} הגיב/ה ב"{{topic}}" - {{site_title}}'
-        private_message: '{{username}} שלח/ה לך הודעה פרטית ב"{{topic}}" - {{site_title}}'
         linked: '{{username}} קישרו לפוסט שלכם מ"{{topic}}" - {{site_title}}'
     upload_selector:
       title: "הוספת תמונה"
@@ -1227,8 +1225,10 @@ he:
         notification_level: "התראות"
         choose_new_category: "בחרו את הקטגוריה עבור הנושאים:"
         selected:
-          one: "בחרתם נושא <b>אחד</b>."
-          other: "בחרתם <b>{{count}}</b> נושאים."
+          many: בחרתם <b>{{count}}</b> נושאים.
+          one: בחרתם נושא <b>אחד</b>.
+          other: בחרתם <b>{{count}}</b> נושאים.
+          two: בחרתם <b>{{count}}</b> נושאים.
         change_tags: "החלפת תגים"
         append_tags: "הוספת תגים"
         choose_new_tags: "בחרו בתגיות חדשות עבור נושאים אלו:"
@@ -1262,12 +1262,11 @@ he:
         bookmarks: "אין עוד סימניות לנושאים."
         search: "אין עוד תוצאות חיפוש"
     topic:
-      unsubscribe:
-        stop_notifications: "תקבלו פחות התראות עבור <strong>{{title}}</strong>"
-        change_notification_state: "מצב ההתראות הנוכחי שלכם הוא"
       filter_to:
-        one: "פוסט אחד בנושא"
-        other: "{{count}} פוסטים בנושא"
+        many: '{{count}} פוסטים בנושא'
+        one: פוסט אחד בנושא
+        other: '{{count}} פוסטים בנושא'
+        two: '{{count}} פוסטים בנושא'
       create: 'נושא חדש'
       create_long: 'יצירת נושא חדש'
       private_message: 'תחילת הודעה'
@@ -1281,11 +1280,15 @@ he:
       new: 'נושא חדש'
       unread: 'לא נקראו'
       new_topics:
-        one: 'נושא חדש אחד'
+        many: '{{count}} נושאים חדשים'
+        one: נושא חדש אחד
         other: '{{count}} נושאים חדשים'
+        two: '{{count}} נושאים חדשים'
       unread_topics:
-        one: '1 שלא נקרא'
+        many: '{{count}} נושאים שלא נקראו'
+        one: 1 שלא נקרא
         other: '{{count}} נושאים שלא נקראו'
+        two: '{{count}} נושאים שלא נקראו'
       title: 'נושא'
       invalid_access:
         title: "הנושא פרטי"
@@ -1298,17 +1301,25 @@ he:
         title: "הנושא לא נמצא"
         description: "סליחה, לא יכולנו למצוא את הנושא הזה. אולי הוא הוסר על ידי מנחה?"
       total_unread_posts:
-        one: "יש לכם פוסט אחד שלא נקרא בנושא זה"
-        other: "יש לכם {{count}} פוסטים שלא נקראו בנושא זה"
+        many: יש לכם {{count}} פוסטים שלא נקראו בנושא זה
+        one: יש לכם פוסט אחד שלא נקרא בנושא זה
+        other: יש לכם {{count}} פוסטים שלא נקראו בנושא זה
+        two: יש לכם {{count}} פוסטים שלא נקראו בנושא זה
       unread_posts:
-        one: "יש לכם פוסט אחד שלא נקרא בנושא הזה"
-        other: "יש לכם {{count}} פוסטים ישנים שלא נקראו בנושא הזה"
+        many: יש לכם {{count}} פוסטים ישנים שלא נקראו בנושא הזה
+        one: יש לכם פוסט אחד שלא נקרא בנושא הזה
+        other: יש לכם {{count}} פוסטים ישנים שלא נקראו בנושא הזה
+        two: יש לכם {{count}} פוסטים ישנים שלא נקראו בנושא הזה
       new_posts:
-        one: "יש פוסט אחד חדש בנושא הזה מאז שקראתם אותו לאחרונה"
-        other: "יש {{count}} פוסטים חדשים בנושא זה מאז שקראתם אותו לאחרונה"
+        many: יש {{count}} פוסטים חדשים בנושא זה מאז שקראתם אותו לאחרונה
+        one: יש פוסט אחד חדש בנושא הזה מאז שקראתם אותו לאחרונה
+        other: יש {{count}} פוסטים חדשים בנושא זה מאז שקראתם אותו לאחרונה
+        two: יש {{count}} פוסטים חדשים בנושא זה מאז שקראתם אותו לאחרונה
       likes:
-        one: "יש לייק אחד בנושא הזה"
-        other: "יש {{count}} לייקים בנושא זה"
+        many: יש {{count}} לייקים בנושא זה
+        one: יש לייק אחד בנושא הזה
+        other: יש {{count}} לייקים בנושא זה
+        two: יש {{count}} לייקים בנושא זה
       back_to_list: "חזרה לרשימת הנושאים"
       options: "אפשרויות נושא"
       show_links: "הצג קישורים בתוך הנושא הזה"
@@ -1318,7 +1329,7 @@ he:
       read_more_MF: "יש { UNREAD, plural, =0 {} one { <a href='/unread'>1 שלא נקרא</a> } other { <a href='/unread'># שלא נקראו</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{ו} false {} other{}} נושא חדש <a href='/new'>אחד</a>} other { {BOTH, select, true{ו} false {} other{}} <a href='/new'>#</a> נושאים חדשים} } נותרים, or {CATEGORY, select, true {עיין בנושאים אחרים ב {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: עיינו בכל הקטגוריות
       view_latest_topics: הצגת נושאים אחרונים
-      suggest_create_topic: למה לא ליצור נושא חדש?
+      suggest_create_topic: "למה לא ליצור נושא חדש?"
       jump_reply_up: קפיצה לתגובה קודמת
       jump_reply_down: קפיצה לתגובה מאוחרת
       deleted: "הנושא הזה נמחק"
@@ -1363,8 +1374,10 @@ he:
         auto_reminder: "אתם תתוזכרו בנוגע לנושא זה %{timeLeft}."
       auto_close_title: 'הגדרות סגירה אוטומטית'
       auto_close_immediate:
-        one: "הפוסט האחרון בנושא הוא כבר בן שעה, אז הנושא ייסגר מיידית."
-        other: "הפוסט האחרון בנושא הוא כבר בן %{count} שעות, אז הנושא ייסגר אוטומטית."
+        many: הפוסט האחרון בנושא הוא כבר בן %{count} שעות, אז הנושא ייסגר אוטומטית.
+        one: הפוסט האחרון בנושא הוא כבר בן שעה, אז הנושא ייסגר מיידית.
+        other: הפוסט האחרון בנושא הוא כבר בן %{count} שעות, אז הנושא ייסגר אוטומטית.
+        two: הפוסט האחרון בנושא הוא כבר בן %{count} שעות, אז הנושא ייסגר אוטומטית.
       timeline:
         back: "חזרה"
         back_description: "חיזרו לפוסט האחרון שלא-נקרא על-ידיכם"
@@ -1385,21 +1398,21 @@ he:
         title: שנו את תדירות ההתראות על הנושא הזה
         reasons:
           mailing_list_mode: "אתם במצב רשימת תפוצה, אז תיודעו לגבי תגובות לנושא זה באמצעות מייל."
-          '3_10': 'תקבלו התראות כיוון שאתם צופים בתג שקשור לנושא זה.'
-          '3_6': 'תקבלו התראות כיוון שאתם עוקבים אחרי קטגוריה זו.'
-          '3_5': 'תקבלו התראות כיוון שהתחלתם לעקוב אחרי הנושא הזה אוטומטית.'
-          '3_2': 'תקבלו התראות כיוון שאתם עוקבים אחרי הנושא הזה.'
-          '3_1': 'תקבלו התראות כיוון שאתם יצרתם את הנושא הזה.'
-          '3': 'תקבלו התראות כיוון שאתם עוקבים אחרי הנושא זה.'
-          '2_8': 'תראו ספירה של תגובות חדשות כיוון שאתם עוקבים אחר קטגוריה זו.'
-          '2_4': 'תראו ספירה של תגובות חדשות כיוון שפרסמתם תגובה לנושא זה.'
-          '2_2': 'תראו ספירה של תגובות חדשות כיוון שאתם עוקבים אחר נושא זה:'
-          '2': 'אתם תראו ספירה של תגובות חדשות כיוון ש<a href="/u/{{username}}/preferences">קראתם נושא זה</a>.'
-          '1_2': 'תקבלו התראה אם מישהו יזכיר את @שם_המשתמש/ת שלכם או ישיב לכם.'
-          '1': 'תקבלו התראה אם מישהו יזכיר את @שם_המשתמש/ת שלכם או ישיב לכם.'
-          '0_7': 'אתם מתעלמים מכל ההתראות בקטגוריה זו.'
-          '0_2': 'אתם מתעלמים מכל ההתראות בנושא זה.'
-          '0': 'אתם מתעלמים מכל ההתראות בנושא זה.'
+          "3_10": 'תקבלו התראות כיוון שאתם צופים בתג שקשור לנושא זה.'
+          "3_6": 'תקבלו התראות כיוון שאתם עוקבים אחרי קטגוריה זו.'
+          "3_5": 'תקבלו התראות כיוון שהתחלתם לעקוב אחרי הנושא הזה אוטומטית.'
+          "3_2": 'תקבלו התראות כיוון שאתם עוקבים אחרי הנושא הזה.'
+          "3_1": 'תקבלו התראות כיוון שאתם יצרתם את הנושא הזה.'
+          "3": 'תקבלו התראות כיוון שאתם עוקבים אחרי הנושא זה.'
+          "2_8": 'תראו ספירה של תגובות חדשות כיוון שאתם עוקבים אחר קטגוריה זו.'
+          "2_4": 'תראו ספירה של תגובות חדשות כיוון שפרסמתם תגובה לנושא זה.'
+          "2_2": 'תראו ספירה של תגובות חדשות כיוון שאתם עוקבים אחר נושא זה:'
+          "2": 'אתם תראו ספירה של תגובות חדשות כיוון ש<a href="/u/{{username}}/preferences">קראתם נושא זה</a>.'
+          "1_2": 'תקבלו התראה אם מישהו יזכיר את @שם_המשתמש/ת שלכם או ישיב לכם.'
+          "1": 'תקבלו התראה אם מישהו יזכיר את @שם_המשתמש/ת שלכם או ישיב לכם.'
+          "0_7": 'אתם מתעלמים מכל ההתראות בקטגוריה זו.'
+          "0_2": 'אתם מתעלמים מכל ההתראות בנושא זה.'
+          "0": 'אתם מתעלמים מכל ההתראות בנושא זה.'
         watching_pm:
           title: "עוקב"
           description: "תקבלו התראה על כל תגובה חדשה בהודעה זו. בנוסף מספר התגובות שלא נקראו יופיעו ליד ההודעה."
@@ -1439,7 +1452,6 @@ he:
         visible: "גילוי"
         reset_read: "אפס מידע שנקרא"
         make_public: "הפיכת הנושא לפומבי"
-        make_private: "הפיכה להודעה פרטית"
       feature:
         pin: "נעיצת נושא"
         unpin: "שחרור נעיצת נושא"
@@ -1472,8 +1484,10 @@ he:
         pin_validation: "דרוש תאריך על מנת לנעוץ את הנושא."
         not_pinned: "אין נושאים שננעצו בקטגוריה  {{categoryLink}}."
         already_pinned:
-          one: "נושא שננעצו, נכון לעכשיו בקטגוריה  {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
-          other: "נושאים ננעצו, נכון לעכשיו, בקטגוריה  {{categoryLink}}.: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          many: 'נושאים ננעצו, נכון לעכשיו, בקטגוריה  {{categoryLink}}.: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: 'נושא שננעצו, נכון לעכשיו בקטגוריה  {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'נושאים ננעצו, נכון לעכשיו, בקטגוריה  {{categoryLink}}.: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          two: 'נושאים ננעצו, נכון לעכשיו, בקטגוריה  {{categoryLink}}.: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         pin_globally: "גרמו לנושא זה להופיע בראש כל רשימות הנושאים עד"
         confirm_pin_globally: "יש לך כבר {{count}} נושאים הנעוצים באופן גלובאלי. עודף נושאים נעוצים עשוי להכביד על משתמשים חדשים או אנונימיים. האם אתם בטוחים שאתם מעוניינים לנעוץ נושא גלובאלי נוסף?"
         unpin_globally: "הסרת נושא זה מראש כל רשימות הנושאים."
@@ -1481,8 +1495,10 @@ he:
         global_pin_note: "משתמשים יכולים להסיר את הצמדת הנושא באופן עצמאי לעצמם."
         not_pinned_globally: "אין נושאים נעוצים גלובאלית."
         already_pinned_globally:
-          one: "נושאים שכרגע נעוצים גלובאלית: <strong class='badge badge-notification unread'>1</strong>"
-          other: "נושאים שכרגע נעוצים גלובאלית: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          many: 'נושאים שכרגע נעוצים גלובאלית: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: 'נושאים שכרגע נעוצים גלובאלית: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'נושאים שכרגע נעוצים גלובאלית: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          two: 'נושאים שכרגע נעוצים גלובאלית: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         make_banner: "הפכו נושא זה לבאנר אשר מופיע בראש כל העמודים."
         remove_banner: "הסרת הבאנר שמופיע בראש כל העמודים."
         banner_note: "משתמשים יכולים לבטל את הבאנר על ידי סגירתו. רק פוסט אחד יכול לשמש כבאנר בזמן נתון."
@@ -1518,8 +1534,10 @@ he:
       login_reply: 'התחברו כדי להשיב'
       filters:
         n_posts:
-          one: "פוסט אחד"
-          other: "{{count}} פוסטים"
+          many: '{{count}} פוסטים'
+          one: פוסט אחד
+          other: '{{count}} פוסטים'
+          two: '{{count}} פוסטים'
         cancel: "הסרת הסינון"
       split_topic:
         title: "העבר לנושא חדש"
@@ -1527,15 +1545,19 @@ he:
         topic_name: "שם הנושא החדש"
         error: "הייתה שגיאה בהעברת הפוסטים לנושא החדש."
         instructions:
-          one: "אתם עומדים ליצור נושא חדש ולמלא אותו עם הפוסטים שבחרתם."
-          other: "אתם עומדים ליצור נושא חדש ולמלא אותו עם <b>{{count}}</b> הפוסטים שבחרתם."
+          many: אתם עומדים ליצור נושא חדש ולמלא אותו עם <b>{{count}}</b> הפוסטים שבחרתם.
+          one: אתם עומדים ליצור נושא חדש ולמלא אותו עם הפוסטים שבחרתם.
+          other: אתם עומדים ליצור נושא חדש ולמלא אותו עם <b>{{count}}</b> הפוסטים שבחרתם.
+          two: אתם עומדים ליצור נושא חדש ולמלא אותו עם <b>{{count}}</b> הפוסטים שבחרתם.
       merge_topic:
         title: "העבר לנושא קיים"
         action: "העבר לנושא קיים"
         error: "התרחשה שגיאה בהעברת הפוסטים לנושא הזה."
         instructions:
-          one: "בבקשה בחרו נושא אליו הייתם רוצים להעביר את הפוסט."
-          other: "בבקשה בחרו את הנושא אליו תרצה להעביר את <b>{{count}}</b> הפוסטים."
+          many: בבקשה בחרו את הנושא אליו תרצה להעביר את <b>{{count}}</b> הפוסטים.
+          one: בבקשה בחרו נושא אליו הייתם רוצים להעביר את הפוסט.
+          other: בבקשה בחרו את הנושא אליו תרצה להעביר את <b>{{count}}</b> הפוסטים.
+          two: בבקשה בחרו את הנושא אליו תרצה להעביר את <b>{{count}}</b> הפוסטים.
       merge_posts:
         title: "ניזוג פוסטים שנבחרו"
         action: "מיזוג פוסטים שנבחרו"
@@ -1547,9 +1569,10 @@ he:
         label: "בעלים חדשים של פוסטים"
         placeholder: "שם המשתמש של הבעלים החדש"
         instructions:
-          one: "אנא בחר את הבעלים החדש של הפוסטים מאת <b>{{old_user}}</b>."
-          other: "אנא בחרו את הבעלים החדש של {{count}} הפוסטים מאת <b>{{old_user}}</b>."
-        instructions_warn: "יש לשים לב שהתראות על פוסט זה יועברו למשתמש החדש רטרואקטיבית.<br>זהירות: כרגע, שום מידע תלוי-פוסט אינו מועבר למשתמש החדש. השתמשו בזהירות."
+          many: אנא בחרו את הבעלים החדש של {{count}} הפוסטים מאת <b>{{old_user}}</b>.
+          one: אנא בחר את הבעלים החדש של הפוסטים מאת <b>{{old_user}}</b>.
+          other: אנא בחרו את הבעלים החדש של {{count}} הפוסטים מאת <b>{{old_user}}</b>.
+          two: אנא בחרו את הבעלים החדש של {{count}} הפוסטים מאת <b>{{old_user}}</b>.
       change_timestamp:
         title: "שינוי חותמת זמן..."
         action: "שינוי חותמת זמן"
@@ -1564,11 +1587,11 @@ he:
         select_all: בחר הכל
         deselect_all: בחר כלום
         description:
+          many: בחרתם <b>{{count}}</b> פוסטים.
           one: בחרתם פוסט אחד.
           other: בחרתם <b>{{count}}</b> פוסטים.
+          two: בחרתם <b>{{count}}</b> פוסטים.
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "ציטוט"
       edit_reason: "סיבה: "
       post_number: "פוסט {{number}}"
@@ -1581,26 +1604,38 @@ he:
       show_full: "הצגת פוסט מלא"
       show_hidden: 'הצגת תוכן מוסתר.'
       deleted_by_author:
-        one: "(הפוסט בוטל על ידי הכותבים, הוא ימחק אוטומטית בעוד %{count} שעות אלא אם יסומן בדגל)"
-        other: "(הפוסט נלקח בחזרה על ידי הכותבים, הוא ימחק אוטומטית בעוד %{count} שעות אלא אם כן הוא ידוגל)"
+        many: (הפוסט נלקח בחזרה על ידי הכותבים, הוא ימחק אוטומטית בעוד %{count} שעות אלא אם כן הוא ידוגל)
+        one: (הפוסט בוטל על ידי הכותבים, הוא ימחק אוטומטית בעוד %{count} שעות אלא אם יסומן בדגל)
+        other: (הפוסט נלקח בחזרה על ידי הכותבים, הוא ימחק אוטומטית בעוד %{count} שעות אלא אם כן הוא ידוגל)
+        two: (הפוסט נלקח בחזרה על ידי הכותבים, הוא ימחק אוטומטית בעוד %{count} שעות אלא אם כן הוא ידוגל)
       expand_collapse: "הרחב/צמצם"
       gap:
-        one: "הצג תגובה אחת שהוסתרה"
-        other: "הצגת {{count}} תגובות שהוסתרו"
+        many: הצגת {{count}} תגובות שהוסתרו
+        one: הצג תגובה אחת שהוסתרה
+        other: הצגת {{count}} תגובות שהוסתרו
+        two: הצגת {{count}} תגובות שהוסתרו
       unread: "הפוסט טרם נקרא"
       has_replies:
-        one: "תגובה אחת"
-        other: "{{count}} תגובות"
+        many: '{{count}} תגובות'
+        one: תגובה אחת
+        other: '{{count}} תגובות'
+        two: '{{count}} תגובות'
       has_likes:
-        one: "לייק אחד"
-        other: "{{count}} לייקים "
+        many: '{{count}} לייקים '
+        one: לייק אחד
+        other: '{{count}} לייקים '
+        two: '{{count}} לייקים '
       has_likes_title:
-        one: "מישהו אחד אהב את התגובה הזו"
-        other: "{{count}} אנשים אהבו את התגובה הזו"
+        many: '{{count}} אנשים אהבו את התגובה הזו'
+        one: מישהו אחד אהב את התגובה הזו
+        other: '{{count}} אנשים אהבו את התגובה הזו'
+        two: '{{count}} אנשים אהבו את התגובה הזו'
       has_likes_title_only_you: "אתם אהבתם את התגובה הזו"
       has_likes_title_you:
-        one: "אתם ועוד מישהו אהבתם את הפוסט הזה"
-        other: "אתם ו {{count}} אנשים אחרים אהבתם את הפוסט הזה"
+        many: אתם ו {{count}} אנשים אחרים אהבתם את הפוסט הזה
+        one: אתם ועוד מישהו אהבתם את הפוסט הזה
+        other: אתם ו {{count}} אנשים אחרים אהבתם את הפוסט הזה
+        two: אתם ו {{count}} אנשים אחרים אהבתם את הפוסט הזה
       errors:
         create: "סליחה, הייתה שגיאה ביצירת הפוסט שלכם. אנא נסו שנית."
         edit: "סליחה, הייתה שגיאה בעריכת הפוסט שלכם. אנא נסו שנית."
@@ -1674,58 +1709,92 @@ he:
           vote: "הצבעתם לפוסט זה"
         by_you_and_others:
           off_topic:
-            one: "אתם ועוד אחד דיגלתם את זה כאוף-טופיק"
-            other: "אתם ועוד {{count}} אנשים אחרים דיגלתם את זה כאוף-טופיק"
+            many: אתם ועוד {{count}} אנשים אחרים דיגלתם את זה כאוף-טופיק
+            one: אתם ועוד אחד דיגלתם את זה כאוף-טופיק
+            other: אתם ועוד {{count}} אנשים אחרים דיגלתם את זה כאוף-טופיק
+            two: אתם ועוד {{count}} אנשים אחרים דיגלתם את זה כאוף-טופיק
           spam:
-            one: "אתם ועוד אחד דיגלתם את זה כספאם"
-            other: "אתם ועוד {{count}} אנשים אחרים דיגלתם את זה כספאם"
+            many: אתם ועוד {{count}} אנשים אחרים דיגלתם את זה כספאם
+            one: אתם ועוד אחד דיגלתם את זה כספאם
+            other: אתם ועוד {{count}} אנשים אחרים דיגלתם את זה כספאם
+            two: אתם ועוד {{count}} אנשים אחרים דיגלתם את זה כספאם
           inappropriate:
-            one: "אתם ועוד אחד דיגלתם את זה כלא ראוי"
-            other: "אתם ועוד {{count}} אנשים אחרים דיגלתם את זה כלא ראוי"
+            many: אתם ועוד {{count}} אנשים אחרים דיגלתם את זה כלא ראוי
+            one: אתם ועוד אחד דיגלתם את זה כלא ראוי
+            other: אתם ועוד {{count}} אנשים אחרים דיגלתם את זה כלא ראוי
+            two: אתם ועוד {{count}} אנשים אחרים דיגלתם את זה כלא ראוי
           notify_moderators:
-            one: "אתם ועוד אחד דיגלתם את זה עבור המנחים"
-            other: "אתם ועוד {{count}} אנשים אחרים דיגלתם את זה למנחים"
+            many: אתם ועוד {{count}} אנשים אחרים דיגלתם את זה למנחים
+            one: אתם ועוד אחד דיגלתם את זה עבור המנחים
+            other: אתם ועוד {{count}} אנשים אחרים דיגלתם את זה למנחים
+            two: אתם ועוד {{count}} אנשים אחרים דיגלתם את זה למנחים
           notify_user:
-            one: "אתם ו-1 נוסף שלחתם הודעה למשתמש הזה. "
-            other: "אתם ו{{count}} אנשים נוספים שלחתם הודעה למשתמש הזה"
+            many: אתם ו{{count}} אנשים נוספים שלחתם הודעה למשתמש הזה
+            one: 'אתם ו-1 נוסף שלחתם הודעה למשתמש הזה. '
+            other: אתם ו{{count}} אנשים נוספים שלחתם הודעה למשתמש הזה
+            two: אתם ו{{count}} אנשים נוספים שלחתם הודעה למשתמש הזה
           bookmark:
-            one: "אתה ועוד אחד סימנתם פוסט זה עם סימנייה"
-            other: "אתה ועוד {{count}} אנשים אחרים סימנתם פוסט זה עם סימנייה"
+            many: אתה ועוד {{count}} אנשים אחרים סימנתם פוסט זה עם סימנייה
+            one: אתה ועוד אחד סימנתם פוסט זה עם סימנייה
+            other: אתה ועוד {{count}} אנשים אחרים סימנתם פוסט זה עם סימנייה
+            two: אתה ועוד {{count}} אנשים אחרים סימנתם פוסט זה עם סימנייה
           like:
-            one: "אתה ועוד אחד נתתם לייק לזה"
-            other: "אתה ועוד {{count}} אנשים אחרים נתתם לייק לזה"
+            many: אתה ועוד {{count}} אנשים אחרים נתתם לייק לזה
+            one: אתה ועוד אחד נתתם לייק לזה
+            other: אתה ועוד {{count}} אנשים אחרים נתתם לייק לזה
+            two: אתה ועוד {{count}} אנשים אחרים נתתם לייק לזה
           vote:
-            one: "אתה ועוד אחד הצבעתם לפוסט זה"
-            other: "אתה ועוד {{count}} אנשים אחרים הצבעתם לפוסט זה"
+            many: אתה ועוד {{count}} אנשים אחרים הצבעתם לפוסט זה
+            one: אתה ועוד אחד הצבעתם לפוסט זה
+            other: אתה ועוד {{count}} אנשים אחרים הצבעתם לפוסט זה
+            two: אתה ועוד {{count}} אנשים אחרים הצבעתם לפוסט זה
         by_others:
           off_topic:
-            one: "אדם אחד דיגל את זה כאוף-טופיק"
-            other: "{{count}} אנשים סמנו את זה כאוף-טופיק"
+            many: '{{count}} אנשים סמנו את זה כאוף-טופיק'
+            one: אדם אחד דיגל את זה כאוף-טופיק
+            other: '{{count}} אנשים סמנו את זה כאוף-טופיק'
+            two: '{{count}} אנשים סמנו את זה כאוף-טופיק'
           spam:
-            one: "אדם אחד דיגל את זה כספאם"
-            other: "{{count}} אנשים דיגלו את זה כספאם"
+            many: '{{count}} אנשים דיגלו את זה כספאם'
+            one: אדם אחד דיגל את זה כספאם
+            other: '{{count}} אנשים דיגלו את זה כספאם'
+            two: '{{count}} אנשים דיגלו את זה כספאם'
           inappropriate:
-            one: "אדם אחד דיגל את זה כלא ראוי"
-            other: "{{count}} אנשים דיגלו את זה כלא ראוי"
+            many: '{{count}} אנשים דיגלו את זה כלא ראוי'
+            one: אדם אחד דיגל את זה כלא ראוי
+            other: '{{count}} אנשים דיגלו את זה כלא ראוי'
+            two: '{{count}} אנשים דיגלו את זה כלא ראוי'
           notify_moderators:
-            one: "אדם אחד דיגל את זה למנחים"
-            other: "{{count}} אנשים דיגלו את זה למנחים"
+            many: '{{count}} אנשים דיגלו את זה למנחים'
+            one: אדם אחד דיגל את זה למנחים
+            other: '{{count}} אנשים דיגלו את זה למנחים'
+            two: '{{count}} אנשים דיגלו את זה למנחים'
           notify_user:
-            one: "אדם אחד שלח הודעה למשתמש זה"
-            other: "{{count}} שלחו הודעה למשתמש זה"
+            many: '{{count}} שלחו הודעה למשתמש זה'
+            one: אדם אחד שלח הודעה למשתמש זה
+            other: '{{count}} שלחו הודעה למשתמש זה'
+            two: '{{count}} שלחו הודעה למשתמש זה'
           bookmark:
-            one: "אדם אחד סימן פוסט זה כמועדף"
-            other: "{{count}} אנשים סימנו פוסט זה כמועדף"
+            many: '{{count}} אנשים סימנו פוסט זה כמועדף'
+            one: אדם אחד סימן פוסט זה כמועדף
+            other: '{{count}} אנשים סימנו פוסט זה כמועדף'
+            two: '{{count}} אנשים סימנו פוסט זה כמועדף'
           like:
-            one: "אדם אחד נתן לזה לייק"
-            other: "{{count}} אנשים נתנו לזה לייק"
+            many: '{{count}} אנשים נתנו לזה לייק'
+            one: אדם אחד נתן לזה לייק
+            other: '{{count}} אנשים נתנו לזה לייק'
+            two: '{{count}} אנשים נתנו לזה לייק'
           vote:
-            one: "אדם אחד הצביע לפוסט זה"
-            other: "{{count}} אנשים הצביעו לפוסט זה"
+            many: '{{count}} אנשים הצביעו לפוסט זה'
+            one: אדם אחד הצביע לפוסט זה
+            other: '{{count}} אנשים הצביעו לפוסט זה'
+            two: '{{count}} אנשים הצביעו לפוסט זה'
       merge:
         confirm:
-          one: "האם אתם בטוחים שאתם מעוניינים למזג פוסטים אלו?"
-          other: "האם אתם בטוחים שאתם מעוניינים למזג {{count}} פוסטים אלו?"
+          many: האם אתם בטוחים שאתם מעוניינים למזג {{count}} פוסטים אלו?
+          one: האם אתם בטוחים שאתם מעוניינים למזג פוסטים אלו?
+          other: האם אתם בטוחים שאתם מעוניינים למזג {{count}} פוסטים אלו?
+          two: האם אתם בטוחים שאתם מעוניינים למזג {{count}} פוסטים אלו?
       revisions:
         controls:
           first: "מהדורה ראשונה"
@@ -1806,7 +1875,6 @@ he:
       email_in_allow_strangers: "קבלת דוא\"ל ממשתמשים אנונימיים ללא חשבונות במערכת הפורומים"
       email_in_disabled: "אפשרות הפרסום של נושאים חדשים דרך דוא\"ל נוטרלה בהגדרות האתר. כדי לאפשר פרסום באמצעות  משלוח דוא\"ל,"
       email_in_disabled_click: 'אפשרו את את ההגדרה "דוא"ל נכנס"'
-      suppress_from_homepage: "הרחיקו קטגוריה זו מהעמוד הראשי."
       show_subcategory_list: "הצגת רשימת קטגוריות משנה מעל נושאים בקטגוריה זו."
       num_featured_topics: "מספר הנושאים המוצגים בדף הקטגוריות:"
       subcategory_num_featured_topics: "מספר הנושאים המומלצים בדף קטגוריית ההורה:"
@@ -1880,14 +1948,20 @@ he:
       custom_placeholder_notify_moderators: "ספרו לנו מה בדיוק מטריד אתכם וצרפו קישורים רלוונטיים ודוגמאות במידת האפשר."
       custom_message:
         at_least:
-          one: "הכניסו לפחות תו אחד"
-          other: "הכניסו לפחות {{count}} תווים"
+          many: הכניסו לפחות {{count}} תווים
+          one: הכניסו לפחות תו אחד
+          other: הכניסו לפחות {{count}} תווים
+          two: הכניסו לפחות {{count}} תווים
         more:
-          one: "נשאר אחד"
-          other: "{{count}} נשארו..."
+          many: '{{count}} נשארו...'
+          one: נשאר אחד
+          other: '{{count}} נשארו...'
+          two: '{{count}} נשארו...'
         left:
-          one: "נותר אחד"
-          other: "{{count}} נותרו"
+          many: '{{count}} נותרו'
+          one: נותר אחד
+          other: '{{count}} נותרו'
+          two: '{{count}} נותרו'
     flagging_topic:
       title: "תודה על עזרתך לשמירה על תרבות הקהילה שלנו!"
       action: "דגלו נושא"
@@ -1898,13 +1972,17 @@ he:
       links_title: "לינקים פופלארים"
       links_shown: "הצגת קישורים נוספים..."
       clicks:
-        one: "לחיצה אחת"
-        other: "%{count} לחיצות"
+        many: '%{count} לחיצות'
+        one: לחיצה אחת
+        other: '%{count} לחיצות'
+        two: '%{count} לחיצות'
     post_links:
       about: "הרחיבו לינקים נוספים לפוסט זה"
       title:
-        one: "עוד 1"
-        other: "עוד %{count}"
+        many: עוד %{count}
+        one: עוד 1
+        other: עוד %{count}
+        two: עוד %{count}
     topic_statuses:
       warning:
         help: "זוהי אזהרה רשמית."
@@ -1938,22 +2016,30 @@ he:
     original_post: "פוסט מקורי"
     views: "צפיות"
     views_lowercase:
-      one: "צפיה"
-      other: "צפיות"
+      many: צפיות
+      one: צפיה
+      other: צפיות
+      two: צפיות
     replies: "תגובות"
     views_long:
-      one: "נושא זה נצפה פעם 1"
-      other: "נושא זה נצפה {{number}} פעמים"
+      many: נושא זה נצפה {{number}} פעמים
+      one: נושא זה נצפה פעם 1
+      other: נושא זה נצפה {{number}} פעמים
+      two: נושא זה נצפה {{number}} פעמים
     activity: "פעילות"
     likes: "לייקים"
     likes_lowercase:
-      one: "לייק"
-      other: "לייקים"
+      many: לייקים
+      one: לייק
+      other: לייקים
+      two: לייקים
     likes_long: "יש {{number}} לייקים לנושא הזה"
     users: "משתמשים"
     users_lowercase:
-      one: "משתמש"
-      other: "משתמשים"
+      many: משתמשים
+      one: משתמש
+      other: משתמשים
+      two: משתמשים
     category_title: "קטגוריה"
     history: "היסטוריה"
     changed_by: "מאת {{author}}"
@@ -1967,8 +2053,10 @@ he:
       latest:
         title: "פורסמו לאחרונה"
         title_with_count:
-          one: "האחרון (1)"
-          other: "({{count}}) פורסמו לאחרונה"
+          many: ({{count}}) פורסמו לאחרונה
+          one: האחרון (1)
+          other: ({{count}}) פורסמו לאחרונה
+          two: ({{count}}) פורסמו לאחרונה
         help: "נושאים עם תגובות לאחרונה"
       hot:
         title: "חם"
@@ -1986,21 +2074,29 @@ he:
       unread:
         title: "לא-נקראו"
         title_with_count:
-          one: "לא נקרא (1)"
-          other: "לא-נקראו ({{count}})"
+          many: לא-נקראו ({{count}})
+          one: לא נקרא (1)
+          other: לא-נקראו ({{count}})
+          two: לא-נקראו ({{count}})
         help: "נושאים שאתם כרגע צופים או עוקבים אחריהם עם פוסטים שלא נקראו"
         lower_title_with_count:
-          one: "לא נקרא (1)"
-          other: "לא-נקראו {{count}} "
+          many: 'לא-נקראו {{count}} '
+          one: לא נקרא (1)
+          other: 'לא-נקראו {{count}} '
+          two: 'לא-נקראו {{count}} '
       new:
         lower_title_with_count:
-          one: "חדש (1)"
-          other: "{{count}} חדשים"
+          many: '{{count}} חדשים'
+          one: חדש (1)
+          other: '{{count}} חדשים'
+          two: '{{count}} חדשים'
         lower_title: "חדש"
         title: "חדש"
         title_with_count:
-          one: "חדש (1)"
-          other: "חדשים ({{count}})"
+          many: חדשים ({{count}})
+          one: חדש (1)
+          other: חדשים ({{count}})
+          two: חדשים ({{count}})
         help: "נושאים שנוצרו בימים האחרונים"
       posted:
         title: "הפוסטים שלי"
@@ -2011,8 +2107,10 @@ he:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: "{{categoryName}} (1)"
-          other: "{{categoryName}} ({{count}})"
+          many: '{{categoryName}} ({{count}})'
+          one: '{{categoryName}} (1)'
+          other: '{{categoryName}} ({{count}})'
+          two: '{{categoryName}} ({{count}})'
         help: "נושאים מדוברים בקטגוריה {{categoryName}}"
       top:
         title: "מובילים"
@@ -2096,24 +2194,31 @@ he:
         print: '<b>ctrl</b>+<b>p</b> הדפסת נושא'
     badges:
       earned_n_times:
-        one: "הרוויחו עיטור זה פעם אחת"
-        other: "הרוויחו עיטור זה %{count} פעמים"
+        many: הרוויחו עיטור זה %{count} פעמים
+        one: הרוויחו עיטור זה פעם אחת
+        other: הרוויחו עיטור זה %{count} פעמים
+        two: הרוויחו עיטור זה %{count} פעמים
       granted_on: "הוענק לפני %{date}"
       others_count: "אחרים עם עיטור זה (%{count})"
       title: עיטורים
       allow_title: "אתם יכולים להשתמש בעיטור זה ככותרת"
       multiple_grant: "אתם יכולים לזכות בזאת מספר פעמים"
       badge_count:
-        one: "1 עיטורים"
-        other: "%{count} עיטורים"
+        many: '%{count} עיטורים'
+        one: 1 עיטורים
+        other: '%{count} עיטורים'
+        two: '%{count} עיטורים'
       more_badges:
-        one: "+1 נוסף"
-        other: "+%{count} נוספים"
+        many: +%{count} נוספים
+        one: +1 נוסף
+        other: +%{count} נוספים
+        two: +%{count} נוספים
       granted:
-        one: "הוענק"
-        other: "%{count} הוענקו"
+        many: '%{count} הוענקו'
+        one: הוענק
+        other: '%{count} הוענקו'
+        two: '%{count} הוענקו'
       select_badge_for_title: בחרו בעיטור לשימוש בכותרת שלכם
-      none: "<none>"
       badge_grouping:
         getting_started:
           name: מתחילים
@@ -2156,19 +2261,15 @@ he:
       notifications:
         watching:
           title: "צופים"
-          description: "אתם תצפו אוטומטית בכל הנושאים עם תג זה. אתם תיודעו לגבי כל הפוסטים החדשים והנושאים, בנוסף - הספירה של לא-נקראו ופוסטים חדשים גם תופיע ליד הנושא."
         watching_first_post:
           title: "צפייה בפוסט הראשון"
-          description: "תקבלו התראה רק על הפוסט הראשון בכל נושא חדש עם התגית הזו."
         tracking:
           title: "במעקב"
-          description: "אתם תעקבו אוטומטית אחרי כל הנושאים עם תגית זו. ספירה של לא-נקראו ופוסטים חדשים תופיע ליד הנושא."
         regular:
           title: "רגיל"
           description: "אתם תיודעו אם מישהו מזכיר את @שמכם או עונה לפוסט שלכם."
         muted:
           title: "מושתק"
-          description: "אתם תיודעו לגבי כל דבר בנוגע לנושאים חדשים עם תג זה, והם לא יופיעו בטאב ה״לא-נקראו״ שלכם."
       groups:
         title: "תייגו קבוצות"
         about: "הוסיפו תגיות לקבוצות כדי לנהל אותן ביתר קלות."
@@ -2250,8 +2351,6 @@ he:
         reports:
           today: "היום"
           yesterday: "אתמול"
-          last_7_days: "בשבעת הימים האחרונים"
-          last_30_days: "ב-30 הימים האחרונים"
           all_time: "כל הזמן"
           7_days_ago: "לפני שבעה ימים"
           30_days_ago: "לפני 30 ימים"
@@ -2269,7 +2368,6 @@ he:
         title: "דגלים"
         agree: "הסכמה"
         agree_title: "אישור דגל זה כתקין ונכון"
-        defer_flag_title: "הסרה של דגל זה; הוא אינו דורש פעולה כעת."
         delete: "מחיקה"
         delete_title: "מחיקת הפוסט שהדגל מצביע עליו."
         delete_post_defer_flag_title: "מחיקת הפוסט; אם זהו הפוסט הראשון, מחיקת הנושא"
@@ -2303,8 +2401,6 @@ he:
         title: "קבוצות"
         edit: "ערוך קבוצות"
         refresh: "רענן"
-        new: "חדש"
-        selector_placeholder: "הזינו שם משתמש/ת"
         about: "ערוך את חברות הקבוצה שלך והשמות כאן"
         group_members: "חברי הקבוצה"
         delete: "מחק"
@@ -2312,22 +2408,10 @@ he:
         delete_failed: "לא ניתן למחוק קבוצה זו. אם זו קבוצה אוטומטית, היא בלתי ניתנת למחיקה."
         delete_owner_confirm: "הסרת הרשאות מנהל עבור '%{username}'?"
         add: "הוספה"
-        add_members: "הוספת חברים וחברות"
         custom: "מותאם"
-        bulk_complete: "המשתמשים התווספו לקבוצה."
-        bulk_complete_users_not_added: "משתמשים אלו לא נוספו (וודאו שיש להם חשבון):"
-        bulk: "הוספה מרוכזת לקבוצה"
-        bulk_paste: "הדביקו רשימה של שמות משתמשים או כתובות אימייל, אחת בכל שורה:"
-        bulk_select: "(בחר קבוצה)"
         automatic: "אוטומטי"
-        automatic_membership_email_domains: "משתמשים אשר נרשמים עם מארח דוא\"ל שתואם בדיוק לאחד מהרשימה, יוספו באופן אוטומטי לקבוצה זו:"
-        automatic_membership_retroactive: "החלת כלל מארח דוא\"ל זהה כדי להוסיף משתמשים רשומים"
-        default_title: "ברירת המחדל לכל המשתמשים בקבוצה זו"
-        primary_group: "קבע כקבוצה ראשית באופן אוטומטי"
         group_owners: מנהלים
         add_owners: הוספת בעלים
-        incoming_email: "התאימו אישית כתובת מייל נכנס"
-        incoming_email_placeholder: "הכניסו כתובת מייל"
         none_selected: "בחירת קבוצה כדי להתחיל"
         no_custom_groups: "יצירת קבוצה מותאמת אישית"
       api:
@@ -2393,11 +2477,15 @@ he:
           none: "אין אירועים קשורים."
           redeliver: "שליחה מחדש"
           incoming:
-            one: "יש אירוע חדש."
-            other: "יש {{count}} ארועים חדשים."
+            many: יש {{count}} ארועים חדשים.
+            one: יש אירוע חדש.
+            other: יש {{count}} ארועים חדשים.
+            two: יש {{count}} ארועים חדשים.
           completed_in:
-            one: "הושלמו בשנייה אחת."
-            other: "הושלמו ב {{count}} שניות."
+            many: הושלמו ב {{count}} שניות.
+            one: הושלמו בשנייה אחת.
+            other: הושלמו ב {{count}} שניות.
+            two: הושלמו ב {{count}} שניות.
           request: "בקשה"
           response: "תשובה"
           redeliver_confirm: "האם אתם בטוחים שאתם רוצים לשלוח מחדש את אותו התוכן?"
@@ -2448,7 +2536,6 @@ he:
           label: "העלה"
           title: "טען גיבוי לinstance הזה"
           uploading: "מעלה..."
-          success: "'{{filename}}' הועלה בהצלחה."
           error: "הייתה שגיאה במהלך העלאת '{{filename}}': {{message}}"
         operations:
           is_running: "פעולה רצה כרגע..."
@@ -2461,7 +2548,6 @@ he:
             label: "גבוי"
             title: "צור גיבוי"
             confirm: "האם תרצו להתחיל גיבוי חדש?"
-            without_uploads: "כן (ללא הכללת קבצים)"
           download:
             label: "הורדה"
             title: "שליחת מייל עם לינק להורדה"
@@ -2559,8 +2645,10 @@ he:
           up_to_date: "התמה מעודכנת, נבדקה לאחרונה ב:"
           add: "הוספה"
           commits_behind:
-            one: "התמה נמצאת קומיט 1 מאחור!"
-            other: "התמה נמצאת {{count}} קומיטים מאחור!"
+            many: התמה נמצאת {{count}} קומיטים מאחור!
+            one: התמה נמצאת קומיט 1 מאחור!
+            other: התמה נמצאת {{count}} קומיטים מאחור!
+            two: התמה נמצאת {{count}} קומיטים מאחור!
           scss:
             text: "CSS"
             title: "עריכת CSS מותאם, אנחנו מקבלים כל סגנון CSS ו SCSS תקני"
@@ -2798,8 +2886,10 @@ he:
         clear_filter: "ניקוי"
         show_words: "הצגת מילים"
         word_count:
-          one: "מילה 1"
-          other: "%{count} מילים"
+          many: '%{count} מילים'
+          one: מילה 1
+          other: '%{count} מילים'
+          two: '%{count} מילים'
         actions:
           block: 'חסימה'
           censor: 'צינזור'
@@ -2837,11 +2927,15 @@ he:
           suspect: 'חשודים'
         approved: "מאושר?"
         approved_selected:
-          one: "אשר משתמש"
-          other: "אשרו משתמשים ({{count}})"
+          many: אשרו משתמשים ({{count}})
+          one: אשר משתמש
+          other: אשרו משתמשים ({{count}})
+          two: אשרו משתמשים ({{count}})
         reject_selected:
-          one: "דחו משתמש"
-          other: "דחו משתמשים ({{count}})"
+          many: דחו משתמשים ({{count}})
+          one: דחו משתמש
+          other: דחו משתמשים ({{count}})
+          two: דחו משתמשים ({{count}})
         titles:
           active: 'הפעל משתמשים'
           new: 'משתמשים חדשים'
@@ -2857,11 +2951,15 @@ he:
           suspended: 'משתמשים מושעים'
           suspect: 'משתמשים חשודים'
         reject_successful:
-          one: "משתמש אחד נדחה בהצלחה."
-          other: "%{count} משתמשים נדחו בהצלחה."
+          many: '%{count} משתמשים נדחו בהצלחה.'
+          one: משתמש אחד נדחה בהצלחה.
+          other: '%{count} משתמשים נדחו בהצלחה.'
+          two: '%{count} משתמשים נדחו בהצלחה.'
         reject_failures:
-          one: "דחיית משתמש נכשלה."
-          other: "דחיית %{count} משתמשים נכשלה."
+          many: דחיית %{count} משתמשים נכשלה.
+          one: דחיית משתמש נכשלה.
+          other: דחיית %{count} משתמשים נכשלה.
+          two: דחיית %{count} משתמשים נכשלה.
         not_verified: "לא מאומת"
         check_email:
           title: "חשיפת כתובת הדוא\"ל של המשתמש/ת"
@@ -2921,14 +3019,20 @@ he:
         delete_forbidden_because_staff: "לא ניתן למחוק מנהלים ומנחים."
         delete_posts_forbidden_because_staff: "לא ניתן למחוק את כל הפרסומים של מנהלי מערכת ומפקחים."
         delete_forbidden:
-          one: "לא ניתן למחוק משתמשים אם יש להם הודעות. מחקו את כל ההודעות לפני ניסיון מחיקה של משתמש. (הודעות ישנות יותר מיום אחד לא ניתן למחוק.)"
-          other: "לא ניתן למחוק משתמשים אם יש להם פוסטים. מחקו את כל הפוסטים לפני ניסיון מחיקה של משתמש. (פוסטים ישנים יותר מ-%{count} ימים לא ניתן למחוק.)"
+          many: לא ניתן למחוק משתמשים אם יש להם פוסטים. מחקו את כל הפוסטים לפני ניסיון מחיקה של משתמש. (פוסטים ישנים יותר מ-%{count} ימים לא ניתן למחוק.)
+          one: לא ניתן למחוק משתמשים אם יש להם הודעות. מחקו את כל ההודעות לפני ניסיון מחיקה של משתמש. (הודעות ישנות יותר מיום אחד לא ניתן למחוק.)
+          other: לא ניתן למחוק משתמשים אם יש להם פוסטים. מחקו את כל הפוסטים לפני ניסיון מחיקה של משתמש. (פוסטים ישנים יותר מ-%{count} ימים לא ניתן למחוק.)
+          two: לא ניתן למחוק משתמשים אם יש להם פוסטים. מחקו את כל הפוסטים לפני ניסיון מחיקה של משתמש. (פוסטים ישנים יותר מ-%{count} ימים לא ניתן למחוק.)
         cant_delete_all_posts:
-          one: "לא ניתן למחוק את כל ההודעות. חלק מההודעות ישנות יותר מ-%{count} ימים. (הגדרת delete_user_max_post_age.)"
-          other: "לא ניתן למחוק את כל הפוסטים. חלק מפוסטים ישנים יותר מ-%{count} ימים. (הגדרת delete_user_max_post_age.)"
+          many: לא ניתן למחוק את כל הפוסטים. חלק מפוסטים ישנים יותר מ-%{count} ימים. (הגדרת delete_user_max_post_age.)
+          one: לא ניתן למחוק את כל ההודעות. חלק מההודעות ישנות יותר מ-%{count} ימים. (הגדרת delete_user_max_post_age.)
+          other: לא ניתן למחוק את כל הפוסטים. חלק מפוסטים ישנים יותר מ-%{count} ימים. (הגדרת delete_user_max_post_age.)
+          two: לא ניתן למחוק את כל הפוסטים. חלק מפוסטים ישנים יותר מ-%{count} ימים. (הגדרת delete_user_max_post_age.)
         cant_delete_all_too_many_posts:
-          one: "לא ניתן למחוק את כל הפוסטים מפני שלמשתמשים יותר מפוסט אחד. (delete_all_posts_max)"
-          other: "לא ניתן למחוק את כל הפוסטים בגלל שלמשתמשים יותר מ %{count} פוסטים. (delete_all_posts_max)"
+          many: לא ניתן למחוק את כל הפוסטים בגלל שלמשתמשים יותר מ %{count} פוסטים. (delete_all_posts_max)
+          one: לא ניתן למחוק את כל הפוסטים מפני שלמשתמשים יותר מפוסט אחד. (delete_all_posts_max)
+          other: לא ניתן למחוק את כל הפוסטים בגלל שלמשתמשים יותר מ %{count} פוסטים. (delete_all_posts_max)
+          two: לא ניתן למחוק את כל הפוסטים בגלל שלמשתמשים יותר מ %{count} פוסטים. (delete_all_posts_max)
         delete_confirm: "האם אתם ב-ט-ו-ח-י-ם שאתם רוצים למחוק משתמש זה? פעולה זו קבועה ובלתי הפיכה!"
         delete_and_block: "מחיקה ו<b>חסימת</b> כתובת דוא\"ל וכתובת IP אלה"
         delete_dont_block: "מחיקה בלבד"
@@ -2964,8 +3068,10 @@ he:
         tl3_requirements:
           title: "דרישות עבור רמת אמון 3"
           table_title:
-            one: "ביום האחרון:"
-            other: "ב %{count} הימים האחרונים:"
+            many: 'ב %{count} הימים האחרונים:'
+            one: 'ביום האחרון:'
+            other: 'ב %{count} הימים האחרונים:'
+            two: 'ב %{count} הימים האחרונים:'
           value_heading: "ערך"
           requirement_heading: "דרישה"
           visits: "ביקורים"
@@ -3040,10 +3146,7 @@ he:
         recommended: "אנחנו ממליצים להתאים את הטקסט הבא כדי להתאימו לצרכים שלכם:"
         show_overriden: 'הציגו רק דרוסים'
       site_settings:
-        show_overriden: 'הצג רק הגדרות ששונו'
         title: 'הגדרות'
-        reset: 'אתחול'
-        none: 'ללא'
         no_results: "לא נמצאו תוצאות."
         clear_filter: "נקה"
         add_url: "הוספת כתובת URL"
@@ -3092,11 +3195,11 @@ he:
         reason_help: (קישור לפוסט או לנושא)
         save: שמור
         delete: מחק
-        delete_confirm: אתם בטוחים שברצונכם למחוק את העיטור הזה?
+        delete_confirm: "אתם בטוחים שברצונכם למחוק את העיטור הזה?"
         revoke: שלול
         reason: סיבה
         expand: הרחבה &hellip;
-        revoke_confirm: אתם בטוחים שברצונכם לשלול את העיטור הזה?
+        revoke_confirm: "אתם בטוחים שברצונכם לשלול את העיטור הזה?"
         edit_badges: עירכו עיטורים
         grant_badge: העניקו עיטור
         granted_badges: עיטורים שהוענקו
@@ -3110,11 +3213,10 @@ he:
         enabled: אפשרו עיטור
         icon: סמליל
         image: תמונה
-        icon_help: "השתמשו במחלקה של Font Awesome או ב-URL לתמונה"
         query: שאילתת עיטור (SQL)
         target_posts: פרסומי מטרות שאילתה
         auto_revoke: הפעלת שאילתת ביטול יומית
-        show_posts: הצגת הפוסט שגרם להענקת העיטור, בעמוד העיטורים
+        show_posts: "הצגת הפוסט שגרם להענקת העיטור, בעמוד העיטורים"
         trigger: הפעלה
         trigger_type:
           none: "רענון יומי"
@@ -3134,14 +3236,16 @@ he:
             text: "חסרות דוגמאות הענקה. זה קורה כשחיפוש עיטורים מחזיר מזהה משתמש או מזהה פוסט שאינם קיימים. זה עלול לגרום לתוצאות לא צפויות מאוחר יותר - אנא בדקו שוב את מחרוזת החיפוש שלכם."
           no_grant_count: "אין עיטורים להקצאה."
           grant_count:
-            one: "עיטור אחד להקצאה."
-            other: "<b>%{count}</b> עיטורים להקצאה."
+            many: <b>%{count}</b> עיטורים להקצאה.
+            one: עיטור אחד להקצאה.
+            other: <b>%{count}</b> עיטורים להקצאה.
+            two: <b>%{count}</b> עיטורים להקצאה.
           sample: "דוגמה:"
           grant:
-            with: <span class="username">%{username}</span>
-            with_post: <span class="username">%{username}</span> לפוסט ב %{link}
-            with_post_time: <span class="username">%{username}</span> לפוסט ב %{link} ב <span class="time">%{time}</span>
-            with_time: <span class="username">%{username}</span> ב <span class="time">%{time}</span>
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span> לפוסט ב %{link}"
+            with_post_time: "<span class=\"username\">%{username}</span> לפוסט ב %{link} ב <span class=\"time\">%{time}</span>"
+            with_time: "<span class=\"username\">%{username}</span> ב <span class=\"time\">%{time}</span>"
       emoji:
         title: "אמוג'י"
         help: "הוספת אמוג'י חדש אשר יהיה זמין לכולם. (טיפ של מקצוענים: גררו והנחיו כמה קבצים בבת אחת)"
@@ -3187,7 +3291,7 @@ he:
         category_id: "מזהה לקטגוריה"
         category_title: "קטגוריה"
         external_url: "URL חיצוני"
-        delete_confirm: אתם בטוחים שברצונכם למחוק את הלינק הקבוע?
+        delete_confirm: "אתם בטוחים שברצונכם למחוק את הלינק הקבוע?"
         form:
           label: "חדש:"
           add: "הוסף"
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index 8c6c91ca124..0baadd60066 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -25,64 +25,69 @@ id:
         thousands: "{{number}}k"
         millions: "{{number}}M"
     dates:
-      time: "j:mm a"
+      time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "BBB H j:mm a"
-      long_no_year_no_time: "BBB H"
+      long_no_year: "BBB D h:mm a"
+      long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
-      long_with_year: "BBB H, TTTT j:mm a"
-      long_with_year_no_time: "BBB H, TTTT"
+      long_with_year: "MMM D, YYYY h:mm a"
+      long_with_year_no_time: "MMM D, YYYY"
       full_with_year_no_time: "MMMM Do, YYYY"
-      long_date_with_year: "BBB H, 'TT LT"
-      long_date_without_year: "BBB H, LT"
-      long_date_with_year_without_time: "BBB H, 'TT"
-      long_date_without_year_with_linebreak: "BBB H <br/>LT"
-      long_date_with_year_with_linebreak: "BBB H, 'TT <br/>LT"
-      wrap_ago: "%{date} lalu"
+      long_date_with_year: "MMM D, 'YY LT"
+      long_date_without_year: "MMM D, LT"
+      long_date_with_year_without_time: "MMM D, 'YY"
+      long_date_without_year_with_linebreak: "MMM D <br/>LT"
+      long_date_with_year_with_linebreak: "MMM D, 'YY <br/>LT"
+      wrap_ago: "%{date} yang lalu"
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          other: "< %{count}s"
+          other: < %{count}s
         x_seconds:
-          other: "%{count}s"
+          other: '%{count}s'
+        less_than_x_minutes:
+          other: '%{count}juta'
         x_minutes:
-          other: "%{count}m"
+          other: '%{count}m'
         about_x_hours:
-          other: "%{count}h"
+          other: '%{count}h'
         x_days:
-          other: "%{count}d"
+          other: '%{count}d'
+        x_months:
+          other: '%{count}senin'
         about_x_years:
-          other: "%{count}y"
+          other: '%{count}y'
         over_x_years:
-          other: "> %{count}y"
+          other: '> %{count}y'
         almost_x_years:
-          other: "%{count}y"
-        date_month: "BBB H"
-        date_year: "BBB 'TT"
+          other: '%{count}y'
+        date_month: "MMM D"
+        date_year: "MMM 'YY"
       medium:
         x_minutes:
-          other: "%{count} menit"
+          other: '%{count} menit'
         x_hours:
-          other: "%{count} jam"
+          other: '%{count} jam'
         x_days:
-          other: "%{count} hari"
-        date_year: "BBB H, 'TT"
+          other: '%{count} hari'
+        date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
-          other: "%{count} menit yang lalu"
+          other: '%{count} menit yang lalu'
         x_hours:
-          other: "%{count} jam yang lalu"
+          other: '%{count} jam yang lalu'
         x_days:
-          other: "%{count} hari yang lalu"
+          other: '%{count} hari yang lalu'
       later:
         x_days:
-          other: "%{count} hari kemudian"
+          other: '%{count} hari kemudian'
         x_months:
-          other: "%{count} bulan kemudian"
+          other: '%{count} bulan kemudian'
         x_years:
-          other: "%{count} bulan kemudian"
+          other: '%{count} bulan kemudian'
       previous_month: 'Bulan Lalu'
       next_month: 'Bulan Depan'
+      placeholder: tanggal
     share:
       topic: 'share link ke topik ini'
       post: 'post #%{postNumber}'
@@ -93,10 +98,13 @@ id:
       email: 'kirim link ini melalui email'
     action_codes:
       public_topic: "membuat topik ini umum %{when}"
-      private_topic: "membuat topik ini pribadi %{when}"
+      private_topic: "Jadikan topik ini sebagai pesan pribadi"
       split_topic: "pisahkan topik ini %{when}"
       invited_user: "mengundang %{who} %{when}"
+      invited_group: "diundang%{who}%{when}"
+      user_left: "%{who}keluar dari percakapan ini%{when}"
       removed_user: "menghapus %{who} %{when}"
+      removed_group: "%{who}dikeluarkan %{when}"
       autoclosed:
         enabled: 'ditutup %{when}'
         disabled: 'dibuka %{when}'
@@ -117,8 +125,8 @@ id:
         disabled: 'tidak terdaftar %{when}'
     topic_admin_menu: "topik aksi admin"
     emails_are_disabled: "Semua surel yang keluar telah dinonaktifkan oleh administrator. Tidak ada pemberitahuan email yang akan dikirimkan."
-    bootstrap_mode_enabled: "Untuk meluncurkan situs baru anda lebih mudah, anda masuk pada mode bootstrap. Semua pengguna baru akan diberikan kepercayaan di level 1 dan mempunyai email harian yang aktif diperbaharui secara singkat. Secara otomatis ini akan mati ketika jumlah pengguna melampaui %{min_users} hitungan pengguna."
-    bootstrap_mode_disabled: "Mode bootstrap akan di non aktifkan pada 24 jam berikutnya."
+    themes:
+      default_description: "Asal"
     s3:
       regions:
         ap_northeast_1: "Asia Pacific (Tokyo)"
@@ -129,8 +137,10 @@ id:
         cn_north_1: "Cina (Beijing)"
         eu_central_1: "EU (Frankfurt)"
         eu_west_1: "EU (Ireland)"
+        eu_west_2: "Eropa (London)"
         sa_east_1: "South America (Sao Paulo)"
         us_east_1: "US East (N. Virginia)"
+        us_east_2: "Amerika Timur (Ohio)"
         us_gov_west_1: "AWS GovCloud (US)"
         us_west_1: "US West (N. California)"
         us_west_2: "US West (Oregon)"
@@ -150,7 +160,7 @@ id:
     show_help: "pilihan"
     links: "Tautan"
     links_lowercase:
-      other: "tautan"
+      other: tautan
     faq: "FAQ"
     guidelines: "Petunjuk"
     privacy_policy: "Kebijakan Privasi"
@@ -174,7 +184,7 @@ id:
     max_of_count: "maksimal dari {{count}}"
     alternation: "atau"
     character_count:
-      other: "{{count}} karakter"
+      other: '{{count}} karakter'
     suggested_topics:
       title: "Topik Yang Disarankan"
       pm_title: "Pesan Yang  Disarankan"
@@ -186,8 +196,6 @@ id:
       our_moderators: "Moderator Kami"
       stat:
         all_time: "Sepanjang Waktu"
-        last_7_days: "7 Hari Terakhir"
-        last_30_days: "30 Hari Terakhir"
       like_count: "Suka"
       topic_count: "Topik"
       post_count: "Pos"
@@ -208,13 +216,6 @@ id:
       last_read: "Ini adalah post terakhir yang anda baca; klik untuk menandainya"
       remove: "Hilangkan penandaan"
       confirm_clear: "Apakah anda yakin ingin membersihkan semua penandaan dari topik ini?"
-    topic_count_latest:
-      other: "{{count}} topik baru atau diperbarui."
-    topic_count_unread:
-      other: "{{count}} topik belum dibaca."
-    topic_count_new:
-      other: "{{count}} topik baru."
-    click_to_show: "Klik untuk menampilkan"
     preview: "pratinjau"
     cancel: "batal"
     save: "Simpan Perubahan"
@@ -224,9 +225,13 @@ id:
     uploading: "Mengunggah..."
     uploading_filename: "Sedang Mengunggah {{filename}}..."
     uploaded: "Sudah Diunggah!"
+    pasting: "Menempelkan..."
     enable: "Aktifkan"
     disable: "Nonaktifkan"
+    continue: "Lanjutkan"
     undo: "Batalkan perintah"
+    revert: "Dibalik"
+    failed: "Gagal"
     switch_to_anon: "Masuki Mode Anonim"
     switch_from_anon: "Keluar Mode Anonim"
     banner:
@@ -248,14 +253,14 @@ id:
       cancel: "Batal"
       view_pending: "lihat postingan tertunda"
       has_pending_posts:
-        other: "Bahasan ini <b>{{count}}</b> pesan menunggu persetujuan"
+        other: Bahasan ini <b>{{count}}</b> pesan menunggu persetujuan
       confirm: "Simpan perubahan"
       delete_prompt: "Apakah anda yakin akan menghapus <b>%{username}</b> ? Ini akan menghapus semua pesan dan memblokir email dan alamat IP. "
       approval:
         title: "Pesan Membutuhkan Persetujuan"
         description: "Kami telah menerima posting baru Anda, tetapi diperlukan persetujuan dari moderator sebelum posting tersebut tampil. Mohon kesabarannya. Terima kasih!"
         pending_posts:
-          other: "Anda mempunyai <strong>{{count}}</strong> pesan tertunda."
+          other: Anda mempunyai <strong>{{count}}</strong> pesan tertunda.
         ok: "Ya"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> memposting <a href='{{topicUrl}}'>topik</a>"
@@ -288,60 +293,81 @@ id:
       days_visited_long: "Hari yang dikunjungi"
       posts_read: "baca"
       total_rows:
-        other: "%{count} pengguna"
+        other: '%{count} pengguna'
     group_histories:
       actions:
         add_user_to_group: "Tambahkan pengguna"
         remove_user_from_group: "Hapus pengguna"
         make_user_group_owner: "Jadikan pemilik"
     groups:
-      logs:
-        action: "Aksi"
-        subject: "Subyek"
-        details: "Detil"
-        from: "Dari"
-        to: "Kepada"
-      edit:
+      add_members:
+        title: "Tambahkan Anggota"
+        usernames: "Nama Pengguna"
+      manage:
+        title: 'Mengelola'
+        name: 'Nama'
         full_name: 'Nama Lengkap'
-        add_members: "Tambah Anggota"
-        delete_member_confirm: "Hapus '%{username}' dari grup '%{group}'?"
-      name_placeholder: "Nama grup, tidak boleh menggunakan spasi, sama seperti aturan username"
+        add_members: "Menambahkan Anggota"
+        logs:
+          when: "Ketika"
+          target_user: "Target pengguna"
+          subject: "Judul"
+          details: "Detil"
+          from: "Dari"
+          to: "Kepada"
       empty:
         members: "Tidak ada anggota dalam kelompok ini."
         messages: "Tidak ada pesan untuk kelompok ini."
         topics: "Tidak ada topik oleh anggota kelompok ini."
       add: "Menambahkan"
-      join: "Gabung dengan grup"
+      join: "Gabung"
+      leave: "Keluar"
+      request: "Pinta"
       message: "Pesan"
-      automatic_group: Kelompok Otomatis
-      closed_group: Kelompok Tertutup
-      is_group_user: "Anda adalah anggota dari kelompok ini."
+      membership_request:
+        submit: "Ajukan Permintaan"
       membership: "Keanggotaan"
       name: "Nama"
-      user_count: "Jumlah Anggota"
+      group_name: "Nama grup"
+      user_count: "Pengguna"
       bio: "Tentang Kelompok"
-      selector_placeholder: "Menambahkan anggota"
+      selector_placeholder: "masukkan nama pengguna"
       owner: "pemilik"
+      index:
+        title: "Grup"
+        all: "Semua Grup"
+        close_groups: "Grup Tertutup"
+        automatic_groups: "Grup Otomatis"
+        automatic: "Otomatis"
+        closed: "Tertutup"
+        public: "Umum"
+        private: "Pribadi"
+        public_groups: "Grup Umum"
+        automatic_group: Grup Otomatis
+        close_group: Tutup Grup
+        my_groups: "Grupku"
+        group_type: "Tipe Grup"
+        is_group_user: "Anggota"
+        is_group_owner: "Pemilik"
+      title:
+        other: Grup
       activity: "Aktifitas"
-      members: "Anggota"
+      members:
+        title: "Anggota"
+        filter_placeholder_admin: "nama pengguna atau surel"
+        filter_placeholder: "nama pengguna"
+        remove_member: "Keluarkan Anggota"
+        remove_member_description: "Keluarkan <b>%{username}</b> dari grup"
+        make_owner: "Jadikan sebagai Pemilik"
       topics: "Topik-topik"
       mentions: "Balasan-balasan"
       messages: "Pesan-pesan"
-      visibility_levels:
-        title: "Siapa yang bisa melihat kelompok ini?"
-        public: "Semua orang"
-        members: "Pemilik kelompok, anggota, dan admin"
-        staff: "Pemilik kelompok dan staf"
-        owners: "Pemilik grup dan admin"
       alias_levels:
         messageable: "Siapa yang bisa mengirim pesan pada kelompok ini?"
         only_admins: "Hanya admin"
         mods_and_admins: "Hanya moderator dan Admin"
         members_mods_and_admins: "Hanya anggota grup, moderator dan admin"
         everyone: "Semua orang"
-      trust_levels:
-        title: "Tingkat kepercayaan otomatis diberikan kepada anggota ketika mereka ditambahkan:"
-        none: "Tidak ada"
       notifications:
         watching:
           title: "Melihat"
@@ -356,21 +382,20 @@ id:
           title: "meredam"
           description: "Anda tidak akan pernah diberitahu apapun tentang topik baru pada kelompok ini."
     user_action_groups:
-      '1': "Likes Diberikan"
-      '2': "Likes Diterima"
-      '3': "Markah"
-      '4': "Topik"
-      '5': "balasan"
-      '6': "tanggapan"
-      '7': "Disebutkan"
-      '9': "Kutipan"
-      '11': "Edit"
-      '12': "Item Terkirim"
-      '13': "Kotak masuk"
-      '14': "tertunda"
+      "1": "Likes Diberikan"
+      "2": "Likes Diterima"
+      "3": "Markah"
+      "4": "Topik"
+      "5": "balasan"
+      "6": "tanggapan"
+      "7": "Disebutkan"
+      "9": "Kutipan"
+      "11": "Edit"
+      "12": "Item Terkirim"
+      "13": "Kotak masuk"
+      "14": "tertunda"
     categories:
       all: "Semua kategori"
-      all_subcategories: "Semua"
       no_subcategory: "Tak ada"
       category: "Kategori"
       category_list: "Tampilan daftar kategori"
@@ -389,9 +414,9 @@ id:
       toggle_ordering: "beralih memesan kontrol"
       subcategories: "Subkategori"
       topic_sentence:
-        other: "%{count} topik"
+        other: '%{count} topik'
       topic_stat_sentence:
-        other: "%{count} topik baru dalam %{unit} terakhir."
+        other: '%{count} topik baru dalam %{unit} terakhir.'
     ip_lookup:
       title: Pencarian Alamat IP
       hostname: nama host
@@ -429,7 +454,6 @@ id:
       notifications: "Pemberitahuan"
       statistics: "Statistik"
       desktop_notifications:
-        label: "pemberitahuan dekstop"
         not_supported: "Pemberitahuan tidak didukung pada browser ini. Maaf."
         perm_default: "Aktifkan Pemberitahuan"
         perm_denied_btn: "Izin ditolak"
@@ -437,6 +461,8 @@ id:
         disable: "Tidak membolehkan Notifikasi"
         enable: "Membolehkan Notifikasi"
         each_browser_note: "Catatan : Anda  harus mengubah pengaturan ini pada setiap browser yang Anda gunakan."
+      dismiss: 'Bubar'
+      dismiss_notifications: "Bubarkan Semua"
       dismiss_notifications_tooltip: "Tandai semua notifikasi belum dibaca telah dibaca"
       disable_jump_reply: "Jangan pindah ke kiriman saya setelah saya balas"
       dynamic_favicon: "Tampilkan jumlah topik baru / pembaharuan pada icon browser."
@@ -447,7 +473,9 @@ id:
       admin: "{{user}} adalah admin"
       moderator_tooltip: "Pengguna ini adalah moderator"
       admin_tooltip: "Pengguna ini adalah admin"
+      silenced_tooltip: "Pengguna ini dibungkam"
       suspended_notice: "Pengguna ini ditangguhkan sampai {{date}}"
+      suspended_permanently: "Pengguna ini dicekal"
       suspended_reason: "Alasan:"
       github_profile: "Github"
       email_activity_summary: "Jumlah aktifitas"
@@ -456,6 +484,7 @@ id:
         enabled: "Aktifkan mode milis"
         individual: "Kirim email untuk setiap pesan baru"
         few_per_day: "Kirim saya surel untuk setiap postingan baru (sekitar 2 per hari)"
+      muted_tags: "Bisukan"
       watched_categories: "Dilihat"
       tracked_categories: "Dilacak"
       muted_categories: "Diredam"
@@ -463,7 +492,6 @@ id:
       delete_account: "Hapus Akun Saya"
       delete_account_confirm: "Apakah Anda yakin untuk menghapus akun ini secara permanen? Perintah ini tidak dapat dibatalkan!"
       deleted_yourself: "Akun Anda telah sukses dihapus."
-      delete_yourself_not_allowed: "Anda tidak dapat menghapus akun. Hubungi admin untuk menghapus akun Anda."
       unread_message_count: "Pesan"
       admin_delete: "Hapus"
       users: "Pengguna"
@@ -471,6 +499,9 @@ id:
       muted_users_instructions: "Menekan semua pemberitahuan dari semua pengguna."
       muted_topics_link: "Menampilkan topik yang diredam"
       apps: "Aplikasi"
+      api_approved: "Disetujui:"
+      theme: "Tema"
+      home: "Halaman Utama"
       staff_counters:
         deleted_posts: "menghapus posting"
         suspensions: "penangguhan"
@@ -502,6 +533,9 @@ id:
         set_password: "Atur Kata Sandi"
         choose_new: "Pilih kata sandi baru"
         choose: "Pilih kata sandi"
+      second_factor:
+        label: "Kode"
+        show_key_description: "Masukkan secara manual"
       change_about:
         title: "Ganti Tentang Saya"
         error: "Ada kesalahan saat mengganti nilai ini"
@@ -533,11 +567,12 @@ id:
         instructions: "Gambar latar belakang akan ditengahkan dan mempunyai lebar standar 590px"
       email:
         title: "Surel"
+        instructions: "Jangan pernah diperlihatkan ke khalayak umum"
         ok: "Kami akan mengirimkan surel kepada anda untuk konfirmasi"
         invalid: "Silahkan masukkan alamat email yang valid"
         authenticated: "Email anda sudah dikonfirmasi oleh {{provider}}"
         frequency:
-          other: "Kami akan mengirimkan email kepada anda jika kami tidak melihat anda selama {{count}} menit."
+          other: Kami akan mengirimkan email kepada anda jika kami tidak melihat anda selama {{count}} menit.
       name:
         title: "Name"
         instructions: "Nama lengkap anda (opsional)"
@@ -558,6 +593,7 @@ id:
       locale:
         title: "Bahasa antarmuka"
         default: "(standar)"
+        any: "apa saja"
       password_confirmation:
         title: "Kata Sandi Lagi"
       last_posted: "Tulisan Terakhir"
@@ -569,9 +605,11 @@ id:
       website: "Website"
       email_settings: "Email"
       like_notification_frequency:
+        title: "Beritahu jika disukai"
         always: "Selalu"
         never: "Tidak pernah"
       email_previous_replies:
+        unless_emailed: "kecuali sebelumnya telah dikirim"
         always: "selalu"
         never: "tidak pernah"
       email_digests:
@@ -585,6 +623,7 @@ id:
       other_settings: "Lainnya"
       categories_settings: "Kategori"
       new_topic_duration:
+        last_here: "dibuat sejak terakhir aku kesini"
         after_1_day: "dibuat hari ini"
         after_2_days: "dibuat 2 hari ini"
         after_1_week: "dibuat minggu ini"
@@ -604,6 +643,7 @@ id:
         title: "Undangan"
         user: "Pengguna yang telah diundang"
         sent: "Terkirim"
+        none: "Tidak ada undangan"
         pending: "Undangan yang tertunda"
         pending_tab: "Tertunda"
         pending_tab_with_count: "Tertunda ({{count}})"
@@ -613,6 +653,7 @@ id:
         rescind: "Hapus"
         rescinded: "Undangan dihapus"
         rescind_all: "Hapus semua undangan"
+        rescinded_all: "Semua Undnagan dibuang!"
         reinvite: "Kirim Ulang Undangan"
         reinvite_all: "Kirim ulang semua Undangan"
         reinvited: "Undangan sudah dikirim ulang"
@@ -640,22 +681,37 @@ id:
         title: "Ringkasan"
         stats: "Statistik"
         topic_count:
-          other: "topik dibuat"
+          other: topik dibuat
         post_count:
-          other: "tulisan dibuat"
+          other: tulisan dibuat
+        likes_given:
+          other: diberikan
+        likes_received:
+          other: diterima
         days_visited:
-          other: "hari berkunjung"
+          other: hari berkunjung
+        topics_entered:
+          other: topik dilihat
         top_replies: "Balasan Teratas"
         no_replies: "Belum ada balasan"
         more_replies: "Balasan lebih banyak"
         top_topics: "Topik teratas"
+        no_topics: "Belum ada topik"
+        more_topics: "Topik Lainnya"
+        top_links: "Link Teratas"
         no_links: "Belum ada tautan."
+        most_liked_by: "Banyak Disukai Oleh"
+        most_liked_users: "Paling Disukai"
+      associated_accounts: "Masuk"
       ip_address:
         title: "Alamat IP terakhir"
       registration_ip_address:
         title: "Alamat IP registrasi"
+      avatar:
+        title: "Gambar Profil"
       title:
         title: "Judul"
+        none: "(kosong)"
       filters:
         all: "Semua"
       stream:
@@ -663,6 +719,7 @@ id:
         sent_by: "Dikirimkan oleh"
         private_message: "pesan"
         the_topic: "Topik"
+    loading: "Diproses..."
     errors:
       reasons:
         network: "Gangguan Jaringan"
@@ -673,18 +730,28 @@ id:
       desc:
         network: "Harap cek koneksi internet anda"
         server: "Kode kesalahan: {{status}}"
+        forbidden: "Anda tidak diijinkan untuk melihatnya"
         unknown: "Terjadi kesalahan"
       buttons:
         back: "Kembali"
         again: "Coba Lagi"
+        fixed: "Mengakses Halaman"
     close: "Tutup"
     refresh: "Segarkan"
+    all_time: 'total'
     year: 'tahun'
     month: 'bulan'
     week: 'minggu'
     day: 'hari'
+    mute: Bisu
+    unmute: Buka Bisu
+    time_read: Dibaca
     last_reply_lowercase: balasan terakhir
+    replies_lowercase:
+      other: balas
     signup_cta:
+      sign_up: "Mendaftar"
+      hide_session: "Ingat saya besok"
       hide_forever: "tidak, terima kasih"
     summary:
       enable: 'Rangkum Topik Ini'
@@ -693,6 +760,7 @@ id:
       enable: "Sembunyikan Tulisan Terhapus"
     private_message_info:
       title: "Pesan"
+      invite: "Undang Lainnya..."
     email: 'Surel'
     username: 'Nama Pengguna'
     last_seen: 'Terlihat'
@@ -705,6 +773,10 @@ id:
     forgot_password:
       action: "Saya lupa password"
       invite: "Silahkan masukkan username atau alamat email, dan kami akan mengirimkan email untuk menentukan ulang sandi Anda."
+      button_ok: "OK"
+      button_help: "Bantuan"
+    email_login:
+      button_label: "dengan surel"
     login:
       title: "Log In"
       username: "Pengguna"
@@ -745,7 +817,6 @@ id:
       password_label: "Atur Kata Sandi"
     select_kit:
       filter_placeholder: Cari...
-      create: "Buat {{konten}}"
     emoji_picker:
       filter_placeholder: Cari emoji
       people: Orang
@@ -803,14 +874,6 @@ id:
     notifications:
       empty: "Tidak ada pemberitahuan."
       more: "lihat notifikasi sebelumnya"
-      alt:
-        mentioned: "Disebut oleh"
-        replied: "Telah dibalas"
-        posted: "Tulisan oleh"
-        private_message: "Pesan pribadi dari"
-        invited_to_private_message: "Diundang untuk pesan pribadi dari"
-        linked: "Tautkan pada tulisan anda"
-        group_message_summary: "Pesan di kotak pesan grup"
     new_item: "baru"
     topics:
       bulk:
@@ -832,13 +895,13 @@ id:
       not_found:
         title: "Tidak ada topik"
       new_posts:
-        other: "ada {{count}} posting baru di topik ini sejak terakhir Anda mengunjunginya"
+        other: ada {{count}} posting baru di topik ini sejak terakhir Anda mengunjunginya
       back_to_list: "Kembali ke Daftar Topik"
       options: "Opsi Topik"
       show_links: "tampilkan pranala dalam topik ini"
       browse_all_categories: Lihat semua kategori
       view_latest_topics: lihat topik terbaru
-      suggest_create_topic: Buat topik baru?
+      suggest_create_topic: "Buat topik baru?"
       jump_reply_up: lompat ke balasan sebelumnya
       split_topic:
         title: "Pindahkan sebagai Topik Baru"
@@ -870,11 +933,11 @@ id:
     filters:
       new:
         lower_title_with_count:
-          other: "{{count}} baru"
+          other: '{{count}} baru'
         lower_title: "baru"
         title: "Baru"
         title_with_count:
-          other: "Baru ({{count}})"
+          other: Baru ({{count}})
       category:
         help: "topik terakhir di kategori {{categoryName}}"
       top:
@@ -889,13 +952,10 @@ id:
         latest_version: "Terbaru"
         last_checked: "Terakhir dicek"
         reports:
-          last_7_days: "7 Hari Terakhir"
-          last_30_days: "30 Hari Terakhir"
           all_time: "Sepanjang Waktu"
       flags:
         system: "Sistem"
       groups:
-        new: "Baru"
         delete: "Hapus"
         delete_confirm: "Hapus grup ini?"
       backups:
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index 3b0f4455128..daa910089da 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -43,70 +43,71 @@ it:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: "< 1s"
-          other: "< %{count}s"
+          one: < 1s
+          other: < %{count}s
         x_seconds:
-          one: "1s"
-          other: "%{count}s"
+          one: 1s
+          other: '%{count}s'
         less_than_x_minutes:
-          one: "< 1m"
-          other: "< %{count}m"
+          one: < 1m
+          other: < %{count}min
         x_minutes:
-          one: "1m"
-          other: "%{count}m"
+          one: 1m
+          other: '%{count}m'
         about_x_hours:
-          one: "1h"
-          other: "%{count}h"
+          one: 1h
+          other: '%{count}h'
         x_days:
-          one: "1g"
-          other: "%{count}gg"
+          one: 1g
+          other: '%{count}gg'
         x_months:
-          one: "1mese"
-          other: "%{count}mesi"
+          one: 1 mese
+          other: '%{count}mesi'
         about_x_years:
-          one: "1a"
-          other: "%{count}a"
+          one: 1a
+          other: '%{count}a'
         over_x_years:
-          one: "> 1a"
-          other: "> %{count}a"
+          one: '> 1a'
+          other: '> %{count}a'
         almost_x_years:
-          one: "1a"
-          other: "%{count}a"
+          one: 1a
+          other: '%{count}a'
         date_month: "D MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: "1 min."
-          other: "%{count} min."
+          one: 1 min.
+          other: '%{count} min.'
         x_hours:
-          one: "1 ora"
-          other: "%{count} ore"
+          one: 1 ora
+          other: '%{count} ore'
         x_days:
-          one: "1 giorno"
-          other: "%{count} giorni"
+          one: 1 giorno
+          other: '%{count} giorni'
         date_year: "D MMM 'YY"
       medium_with_ago:
         x_minutes:
-          one: "1 minuto fa"
-          other: "%{count} minuti fa"
+          one: 1 minuto fa
+          other: '%{count} minuti fa'
         x_hours:
-          one: "1 ora fa"
-          other: "%{count} ore fa"
+          one: 1 ora fa
+          other: '%{count} ore fa'
         x_days:
-          one: "un giorno fa"
-          other: "%{count} giorni fa"
+          one: un giorno fa
+          other: '%{count} giorni fa'
       later:
         x_days:
-          one: "1 giorno dopo"
-          other: "%{count} giorni dopo"
+          one: 1 giorno dopo
+          other: '%{count} giorni dopo'
         x_months:
-          one: "1 mese dopo"
-          other: "%{count} mesi dopo"
+          one: 1 mese dopo
+          other: '%{count} mesi dopo'
         x_years:
-          one: "1 anno dopo"
-          other: "%{count} anni dopo"
+          one: 1 anno dopo
+          other: '%{count} anni dopo'
       previous_month: 'Mese Precedente'
       next_month: 'Mese Successivo'
+      placeholder: data
     share:
       topic: 'Condividi un link a questa conversazione'
       post: 'messaggio n°%{postNumber}'
@@ -121,6 +122,7 @@ it:
       split_topic: "ha separato questo argomento %{when}"
       invited_user: "Invitato %{who} %{when}"
       invited_group: "invitato %{who} %{when}"
+      user_left: "%{who}ha rimosso se stesso da questo messaggio %{when} "
       removed_user: "rimosso %{who} %{when}"
       removed_group: "cancellato %{who} %{when}"
       autoclosed:
@@ -147,7 +149,7 @@ it:
     topic_admin_menu: "azioni amministrative sull'argomento"
     wizard_required: "Benvenuto al tuo nuovo Discourse! Inizia la <a href='%{url}' data-auto-route='true'>procedura guidata di configurazione</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_enabled: "Per aiutarti ad avviare il tuo nuovo sito, adesso sei in modalità bootstrap. Tutti i nuovi utenti saranno automaticamente promossi al livello di esperienza 1 e riceveranno il riepilogo quotidiano degli aggiornamenti via email. Questa modalità sarà disattivata automaticamente quando avrai più di %{min_users}utenti iscritti."
     bootstrap_mode_disabled: "La modalità bootstrap sarà disattivata entro 24 ore."
     themes:
       default_description: "Default"
@@ -172,6 +174,7 @@ it:
     not_implemented: "Spiacenti! Questa funzione non è stata ancora implementata."
     no_value: "No"
     yes_value: "Sì"
+    submit: "Invia"
     generic_error: "Spiacenti! C'è stato un problema."
     generic_error_with_reason: "Si è verificato un errore: %{error}"
     sign_up: "Iscriviti"
@@ -184,8 +187,8 @@ it:
     show_help: "opzioni"
     links: "Link"
     links_lowercase:
-      one: "collegamento"
-      other: "collegamenti"
+      one: collegamento
+      other: collegamenti
     faq: "FAQ"
     guidelines: "Linee Guida"
     privacy_policy: "Tutela Privacy"
@@ -209,8 +212,8 @@ it:
     max_of_count: "massimo di {{count}}"
     alternation: "o"
     character_count:
-      one: "{{count}} carattere"
-      other: "{{count}} caratteri"
+      one: '{{count}} carattere'
+      other: '{{count}} caratteri'
     suggested_topics:
       title: "Discussioni Suggerite"
       pm_title: "Messaggi Suggeriti"
@@ -222,8 +225,6 @@ it:
       our_moderators: "I Nostri Moderatori"
       stat:
         all_time: "Sempre"
-        last_7_days: "ultimi 7 giorni"
-        last_30_days: "ultimi 30 giorni"
       like_count: "Mi piace"
       topic_count: "Argomenti"
       post_count: "Messaggi"
@@ -245,15 +246,14 @@ it:
       remove: "Rimuovi Segnalibro"
       confirm_clear: "Sei sicuro di voler cancellare tutti segnalibri da questo argomento?"
     topic_count_latest:
-      one: "{{count}} discussione nuova o aggiornata"
-      other: "{{count}} argomenti nuovi o aggiornati."
+      one: Visualizza {{count}} argomenti nuovi o aggiornati
+      other: Visualizza {{count}} argomenti nuovi o aggiornati.
     topic_count_unread:
-      one: "{{count}} discussione non letta."
-      other: "{{count}} argomenti non letti."
+      one: V
+      other: 'Visualizza {{count}} argomenti non letti '
     topic_count_new:
-      one: "{{count}} nuovo argomento."
-      other: "{{count}} nuovi argomenti."
-    click_to_show: "Clicca per visualizzare."
+      one: V
+      other: Visualizza {{count}} nuovi argomenti
     preview: "Anteprima"
     cancel: "annulla"
     save: "Salva modifiche"
@@ -263,8 +263,10 @@ it:
     uploading: "In caricamento..."
     uploading_filename: "Sto caricando {{filename}}..."
     uploaded: "Caricato!"
+    pasting: "Incollando..."
     enable: "Attiva"
     disable: "Disattiva"
+    continue: "Continua"
     undo: "Annulla"
     revert: "Ripristina"
     failed: "Fallito"
@@ -289,16 +291,16 @@ it:
       cancel: "Annulla"
       view_pending: "vedi messaggi in attesa"
       has_pending_posts:
-        one: "Questo argomento ha <b>1</b> messaggio in attesa di approvazione"
-        other: "Questo argomento ha <b>{{count}}</b> messaggi in attesa di approvazione"
+        one: Questo argomento ha <b>1</b> messaggio in attesa di approvazione
+        other: Questo argomento ha <b>{{count}}</b> messaggi in attesa di approvazione
       confirm: "Salva Modifiche"
       delete_prompt: "Sei sicuro di voler eliminare <b>%{username}</b>? Ciò cancellerà tutti i suoi messaggi e bloccherà il suo indirizzo email e l'indirizzo IP."
       approval:
         title: "Il messaggio è da approvare"
         description: "Abbiamo ricevuto il tuo messaggio ma prima che appaia è necessario che venga approvato da un moderatore. Per favore sii paziente."
         pending_posts:
-          one: "Hai <strong>1</strong> messaggio in attesa."
-          other: "Hai <strong>{{count}}</strong> messaggi in attesa."
+          one: Hai <strong>1</strong> messaggio in attesa.
+          other: Hai <strong>{{count}}</strong> messaggi in attesa.
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> ha pubblicato <a href='{{topicUrl}}'>l'argomento</a>"
@@ -332,8 +334,8 @@ it:
       posts_read: "Letti"
       posts_read_long: "Messaggi Letti"
       total_rows:
-        one: "1 utente"
-        other: "%{count} utenti"
+        one: 1 utente
+        other: '%{count} utenti'
     group_histories:
       actions:
         change_group_setting: "Cambia le impostazioni del gruppo"
@@ -342,22 +344,35 @@ it:
         make_user_group_owner: "Assegna proprietà"
         remove_user_as_group_owner: "Revoca proprietà"
     groups:
-      logs:
-        title: "Log"
-        when: "Quando"
-        action: "Azione"
-        acting_user: "Utente attore"
-        target_user: "Utente destinatario"
-        subject: "Oggetto"
-        details: "Dettagli"
-        from: "Da"
-        to: "A"
-      edit:
-        title: 'Modifica Gruppo'
+      add_members:
+        title: "Aggiungi Membri"
+        description: "Gestisci le iscrizioni di questo gruppo"
+        usernames: "Nomi Utente"
+      manage:
+        title: 'Gestisci'
+        name: 'Nome'
         full_name: 'Nome Completo'
         add_members: "Aggiungi Membri"
         delete_member_confirm: "Rimuovere '%{username}' dal gruppo '%{group}'?"
-      name_placeholder: "Nome del gruppo, senza spazi, stesse regole del nome utente"
+        profile:
+          title: Profilo
+        interaction:
+          title: Interazione
+          posting: Pubblicazione
+          notification: Notifica
+        membership:
+          title: Iscrizione
+          access: Accesso
+        logs:
+          title: "Log"
+          when: "Quando"
+          action: "Azione"
+          acting_user: "Utente attore"
+          target_user: "Utente destinatario"
+          subject: "Oggetto"
+          details: "Dettagli"
+          from: "Da"
+          to: "A"
       public_admission: "Consenti agli utenti di unirsi al gruppo liberamente (Richiede che il gruppo sia visibile a tutti)"
       public_exit: "Consenti agli utenti di lasciare il gruppo liberamente"
       empty:
@@ -368,13 +383,10 @@ it:
         topics: "Non ci sono argomenti da membri di questo gruppo."
         logs: "Non ci sono log per questo gruppo."
       add: "Aggiungi"
-      join: "Partecipa al Gruppo"
-      leave: "Abbandona il Gruppo"
-      request: "Richiedi di partecipare al gruppo"
+      join: "Partecipa"
+      leave: "Abbandona"
+      request: "Richiesta"
       message: "Messaggio"
-      automatic_group: Gruppo Automatico
-      closed_group: Gruppo Chiuso
-      is_group_user: "Sei un membro di questo gruppo"
       allow_membership_requests: "Permetti agli utenti di richiedere l'invito ai proprietari del gruppo"
       membership_request_template: "Template personalizzato da mostrare agli utenti quando inviano una richiesta di adesione"
       membership_request:
@@ -383,29 +395,50 @@ it:
         reason: "Spiega ai proprietari del gruppo perché vuoi entrare a far parte di questo gruppo"
       membership: "Iscrizione"
       name: "Nome"
-      user_count: "Numero di Membri"
+      group_name: "Nome gruppo"
+      user_count: "Utenti"
       bio: "Informazioni sul Gruppo"
-      selector_placeholder: "Aggiungi membri"
+      selector_placeholder: "inserisci nome utente"
       owner: "proprietario"
       index:
         title: "Gruppi"
+        all: "Tutti i gruppi"
         empty: "Non ci sono gruppi visibili."
+        filter: "Filtra per tipo di gruppo"
+        owner_groups: "Gruppi di cui sono proprietario"
+        close_groups: "Gruppi Chiusi"
+        automatic_groups: "Gruppi Automatici"
+        automatic: "Automatico"
+        closed: "Chiuso"
+        public: "Pubblico"
+        private: "Privato"
+        public_groups: "Gruppi Pubblici"
+        automatic_group: Gruppo Automatico
+        close_group: Gruppo Chiuso
+        my_groups: "I Miei Gruppi"
+        group_type: "Tipo di gruppo"
+        is_group_user: "Membro"
+        is_group_owner: "Proprietario"
       title:
-        one: "Group"
-        other: "Gruppi"
+        one: Group
+        other: Gruppi
       activity: "Attività"
-      members: "Membri"
+      members:
+        title: "Membri"
+        filter_placeholder_admin: "nome utente o email"
+        filter_placeholder: "nome utente"
+        remove_member: "Rimuovi Membro"
+        remove_member_description: "Rimuovi <b>%{username}</b> da questo gruppo"
+        make_owner: "Assegna Proprietà"
+        make_owner_description: "Fai di <b>%{username}</b> un proprietario di questo gruppo"
+        remove_owner: "Rimuovi come Proprietario"
+        remove_owner_description: "Rimuovi <b>%{username}</b>come proprietario di questo gruppo "
+        owner: "Proprietario"
       topics: "Argomenti"
       posts: "Messaggi"
       mentions: "Menzioni"
       messages: "Messaggi"
       notification_level: "Livello di notifica predefinito per i messaggi di gruppo"
-      visibility_levels:
-        title: "Chi può vedere questo gruppo?"
-        public: "Chiunque"
-        members: "Proprietari del gruppo, membri e amministratori"
-        staff: "Proprietari del gruppo e staff"
-        owners: "Proprietari del gruppo e amministratori"
       alias_levels:
         mentionable: "Chi può @menzionare questo gruppo?"
         messageable: "Chi può inviare messaggi a questo gruppo?"
@@ -414,9 +447,6 @@ it:
         mods_and_admins: "Solo i moderatori e gli amministratori"
         members_mods_and_admins: "Solo i membri del gruppo, i moderatori e gli amministratori"
         everyone: "Tutti"
-      trust_levels:
-        title: "Livello di esperienza automaticamente assegnato ai membri quando vengono aggiunti:"
-        none: "Nessuno"
       notifications:
         watching:
           title: "In osservazione"
@@ -441,23 +471,22 @@ it:
       flair_color_placeholder: "(Facoltativo) Codice esadecimale del colore"
       flair_preview_icon: "Anteprima Icona"
       flair_preview_image: "Anteprima Immagine"
-      flair_note: "Nota: Flair sarà mostrato solo per i gruppi primari dell'utente."
     user_action_groups:
-      '1': "Mi piace - Assegnati"
-      '2': "Mi piace - Ricevuti"
-      '3': "Segnalibri"
-      '4': "Argomenti"
-      '5': "Risposte"
-      '6': "Risposte"
-      '7': "Menzioni"
-      '9': "Citazioni"
-      '11': "Modifiche"
-      '12': "Inviati"
-      '13': "Posta in arrivo"
-      '14': "In Attesa"
+      "1": "Mi piace - Assegnati"
+      "2": "Mi piace - Ricevuti"
+      "3": "Segnalibri"
+      "4": "Argomenti"
+      "5": "Risposte"
+      "6": "Risposte"
+      "7": "Menzioni"
+      "9": "Citazioni"
+      "11": "Modifiche"
+      "12": "Inviati"
+      "13": "Posta in arrivo"
+      "14": "In Attesa"
     categories:
       all: "tutte le categorie"
-      all_subcategories: "tutte"
+      all_subcategories: "tutto in %{categoryName}"
       no_subcategory: "nessuno"
       category: "Categoria"
       category_list: "Visualizza l'elenco delle categorie"
@@ -476,11 +505,11 @@ it:
       toggle_ordering: "inverti l'ordinamento"
       subcategories: "Sottocategorie"
       topic_sentence:
-        one: "1 argomento"
-        other: "%{count} argomenti"
+        one: 1 argomento
+        other: '%{count} argomenti'
       topic_stat_sentence:
-        one: "%{count} nuovo argomento nell'ultimo %{unit}."
-        other: "%{count} nuovi argomenti nell'ultimo %{unit}."
+        one: '%{count} nuovo argomento nell''ultimo %{unit}.'
+        other: '%{count} nuovi argomenti nell''ultimo %{unit}.'
     ip_lookup:
       title: Ricerca Indirizzo IP
       hostname: Hostname
@@ -515,6 +544,7 @@ it:
       activity_stream: "Attività"
       preferences: "Opzioni"
       expand_profile: "Espandi"
+      collapse_profile: "Raggruppa"
       bookmarks: "Segnalibri"
       bio: "Su di me"
       invited_by: "Invitato Da"
@@ -522,7 +552,6 @@ it:
       notifications: "Notifiche"
       statistics: "Statistiche"
       desktop_notifications:
-        label: "Notifiche Desktop"
         not_supported: "Spiacenti, le notifiche non sono supportate su questo browser."
         perm_default: "Attiva Notifiche"
         perm_denied_btn: "Permesso Negato"
@@ -582,7 +611,7 @@ it:
       delete_account: "Cancella il mio account"
       delete_account_confirm: "Sei sicuro di voler cancellare il tuo account in modo permanente? Questa azione non può essere annullata!"
       deleted_yourself: "Il tuo account è stato eliminato con successo."
-      delete_yourself_not_allowed: "Non puoi eliminare il tuo account in questo momento. Contatta un amministratore e chiedigli di cancellarlo per te."
+      delete_yourself_not_allowed: "Si prega di contattare un membro dello staff se si desidera che il proprio account venga eliminato"
       unread_message_count: "Messaggi"
       admin_delete: "Cancella"
       users: "Utenti"
@@ -616,6 +645,7 @@ it:
         move_to_archive: "Archivia"
         failed_to_move: "Errore nello spostare i messaggi selezionati (forse la tua connessione non è attiva)"
         select_all: "Seleziona Tutti"
+        tags: "Etichette"
       preferences_nav:
         account: "Account"
         profile: "Profilo"
@@ -633,6 +663,18 @@ it:
         set_password: "Imposta Password"
         choose_new: "Scegli una nuova password"
         choose: "Scegli una password"
+      second_factor:
+        title: "Autenticazione a Due Fattori"
+        disable: "Disabilita l'autenticazione a due fattori"
+        confirm_password_description: "Per favore conferma la tua password per continuare"
+        label: "Codice"
+        enable_description: |
+          Esegui la scansione di questo codice QR con un'app supportata (<a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target="_blank">Android</a> – <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8" target="_blank">iOS</a> – <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a>) e inserisci il tuo codice di autenticazione.
+        disable_description: "Inserisci il codice di autenticazione dalla tua app"
+        show_key_description: "Inserisci manualmente"
+        extended_description: |
+          L'autenticazione a due fattori aggiunge ulteriore sicurezza al tuo account richiedendo un token monouso oltre alla tua password. I token possono essere generati su dispositivi <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target='_blank'>Android</a>, <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8">iOS</a> e <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a>.
+        oauth_enabled_warning: "Tieni presente che gli accessi ai social network saranno disabilitati dopo aver attivato l'autenticazione a due fattori nel tuo account."
       change_about:
         title: "Modifica i dati personali"
         error: "Si è verificato un errore durante la modifica del valore."
@@ -651,6 +693,7 @@ it:
         title: "Cambia l'immagine del tuo profilo"
         gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, basato su"
         gravatar_title: "Cambia il tuo avatar sul sito Gravatar"
+        gravatar_failed: "Impossibile recuperare il Gravatar. Ce n'è uno associato a questo indirizzo email?"
         refresh_gravatar_title: "Ricarica il tuo Gravatar"
         letter_based: "Immagine del profilo assegnata dal sistema"
         uploaded_avatar: "Immagine personalizzata"
@@ -673,8 +716,8 @@ it:
         authenticated: "{{provider}} ha autenticato la tua email"
         frequency_immediately: "Ti invieremo immediatamente una email se non hai letto ciò per cui ti stiamo scrivendo."
         frequency:
-          one: "TI invieremo un email solo se non ti avremo visto nell'ultimo minuto."
-          other: "Ti invieremo una email solo se non ti si vede da almeno {{count}} minuti."
+          one: TI invieremo un email solo se non ti avremo visto nell'ultimo minuto.
+          other: Ti invieremo una email solo se non ti si vede da almeno {{count}} minuti.
       name:
         title: "Nome"
         instructions: "il tuo nome completo (opzionale)"
@@ -705,8 +748,6 @@ it:
       created: "Membro da"
       log_out: "Disconnetti"
       location: "Località"
-      card_badge:
-        title: "Distintivo Scheda Utente"
       website: "Sito Web"
       email_settings: "Email"
       like_notification_frequency:
@@ -760,10 +801,10 @@ it:
         title: "Inviti"
         user: "Utente Invitato"
         sent: "Spedito"
-        none: "Non ci sono inviti in sospeso da visualizzare."
+        none: "Nessun invito da visualizzare."
         truncated:
-          one: "Mostro il primo invito."
-          other: "Mostro i primi {{count}} inviti."
+          one: Mostro il primo invito.
+          other: Mostro i primi {{count}} inviti.
         redeemed: "Inviti Accettati"
         redeemed_tab: "Riscattato"
         redeemed_tab_with_count: "Riscattato ({{count}})"
@@ -810,29 +851,29 @@ it:
         time_read: "tempo di lettura"
         recent_time_read: "tempo di lettura recente"
         topic_count:
-          one: "argomento creato"
-          other: "argomenti creati"
+          one: argomento creato
+          other: argomenti creati
         post_count:
-          one: "messaggio creato"
-          other: "messaggi creati"
+          one: messaggio creato
+          other: messaggi creati
         likes_given:
-          one: "assegnati"
-          other: "assegnati"
+          one: assegnati
+          other: assegnati
         likes_received:
-          one: "ricevuti"
-          other: "ricevuti"
+          one: ricevuti
+          other: ricevuti
         days_visited:
-          one: "giorno di frequenza"
-          other: "giorni di frequenza"
+          one: giorno di frequenza
+          other: giorni di frequenza
         topics_entered:
-          one: "argomenti visualizzati"
-          other: "argomenti visualizzati"
+          one: argomenti visualizzati
+          other: argomenti visualizzati
         posts_read:
-          one: "messaggio letto"
-          other: "messaggi letti"
+          one: messaggio letto
+          other: messaggi letti
         bookmark_count:
-          one: "segnalibro"
-          other: "segnalibri"
+          one: segnalibro
+          other: segnalibri
         top_replies: "Migliori Risposte"
         no_replies: "Ancora nessuna risposta."
         more_replies: "Altre Risposte"
@@ -858,6 +899,7 @@ it:
         header_title: "profilo, messaggi, segnalibri e preferenze"
       title:
         title: "Titolo"
+        none: "(nessuno)"
       filters:
         all: "Tutti"
       stream:
@@ -900,8 +942,8 @@ it:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> ha raggiunto i limiti impostati di %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> ha ecceduto i limiti impostati di  %{siteSettingRate}."
       rate:
-        one: "1 errore/%{duration}"
-        other: "%{count} errori/%{duration}"
+        one: 1 errore/%{duration}
+        other: '%{count} errori/%{duration}'
     learn_more: "per saperne di più..."
     all_time: 'totale'
     all_time_desc: 'totale argomenti creati'
@@ -973,6 +1015,12 @@ it:
       help: "Non arrivano email? Per prima cosa assicurati di controllare la cartella spam.<p>Non sei sicuro di quale indirizzo email hai usato? Inserisci un indirizzo email e ti faremo sapere se esiste.</p>Se non hai più accesso all'indirizzo email del tuo account, per favore contatta <a href='/about'>il nostro disponibile staff.</a><p>"
       button_ok: "OK"
       button_help: "Aiuto"
+    email_login:
+      link_label: "Inviami un link di accesso"
+      button_label: "con email"
+      complete_username: "Se un account corrisponde al nome utente <b>%{username}</b> , a breve dovresti ricevere un'email con un link di accesso."
+      complete_email: "Se un account corrisponde a <b>%{email}</b>, a breve dovresti ricevere un'email con un link di accesso. "
+      complete_username_found: "Abbiamo trovato un account che corrisponde al nome utente <b>%{username}</b>, dovresti ricevere un'email con un link di accesso a breve."
     login:
       title: "Connetti"
       username: "Utente"
@@ -1056,7 +1104,6 @@ it:
       default_header_text: Selezione...
       no_content: Nessun risultato trovato
       filter_placeholder: Ricerca...
-      create: "Crea {{content}}"
     emoji_picker:
       filter_placeholder: Ricerca per emoji
       people: Persone
@@ -1090,9 +1137,10 @@ it:
       saved_local_draft_tip: "salvato in locale"
       similar_topics: "Il tuo argomento è simile a..."
       drafts_offline: "bozze offline"
+      group_mentioned_limit: "<b>Attenzione!</b> Hai menzionato <a href='{{group_link}}'>{{group}}</a>, tuttavia questo gruppo ha più membri del limite per le menzioni configurato dagli amministratori di {{max}} utenti. Nessuna notifica verrà inviata. "
       group_mentioned:
-        one: "Menzionando {{group}}, verrà notificata <a href='{{group_link}}'>1 persona</a> – sei sicuro?"
-        other: "Menzionando {{group}}, verranno notificate <a href='{{group_link}}'>{{count}} persone</a> – sei sicuro?"
+        one: Menzionando {{group}}, verrà notificata <a href='{{group_link}}'>1 persona</a> – sei sicuro?
+        other: Menzionando {{group}}, verranno notificate <a href='{{group_link}}'>{{count}} persone</a> – sei sicuro?
       cannot_see_mention:
         category: "Hai menzionato {{username}} ma non verranno notificati perché non hanno accesso a questa categoria. Dovrai aggiungerli ad un gruppo che ha accesso a questa categoria."
         private: "Hai menzionato {{username}} ma non verranno notificati perché non hanno accesso a questo messaggio personale. Dovrai invitarli a questo MP."
@@ -1152,6 +1200,8 @@ it:
       ulist_title: "Elenco Puntato"
       list_item: "Elemento lista"
       help: "Aiuto Inserimento Markdown"
+      collapse: "minimizza il pannello del composer"
+      abandon: "chiudi il composer e scarta la bozza"
       modal_ok: "OK"
       modal_cancel: "Annulla"
       cant_send_pm: "Spiacenti, non puoi inviare un messaggio a %{username}."
@@ -1160,6 +1210,13 @@ it:
         body: "Per ora il messaggio sarà inviato solo a te stesso!"
       admin_options_title: "Impostazioni dello staff opzionali per l'argomento"
     notifications:
+      tooltip:
+        regular:
+          one: 1 notifica non visualizzata
+          other: '{{count}} notifiche non visualizzate'
+        message:
+          one: 1 messaggio non letto
+          other: '{{count}} messaggi non letti'
       title: "notifiche di menzioni @nome, risposte ai tuoi messaggi e argomenti ecc."
       none: "Impossibile caricare le notifiche al momento."
       empty: "Nessuna notifica trovata."
@@ -1174,8 +1231,8 @@ it:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} e {{count}} altri</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} e {{count}} altri</span> {{description}}"
+        one: <span>{{username}}, {{username2}} e {{count}} altri</span> {{description}}
+        other: <span>{{username}}, {{username2}} e {{count}} altri</span> {{description}}
       private_message: "<span>{{username}}</span> {{description}}"
       invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
       invited_to_topic: "<span>{{username}}</span> {{description}}"
@@ -1186,30 +1243,14 @@ it:
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>Nuovo Argomento</span> {{description}}"
       group_message_summary:
-        one: "{{count}} messaggi in arrivo nella casella {{group_name}}"
-        other: "{{count}} messaggi in arrivo nella casella {{group_name}}"
-      alt:
-        mentioned: "Menzionato da"
-        quoted: "Citato da"
-        replied: "Risposto"
-        posted: "Messaggio da"
-        edited: "Modifica il tuo messaggio da"
-        liked: "Ha assegnato un \"Mi piace\" al tuo messaggio"
-        private_message: "Messaggio privato da"
-        invited_to_private_message: "Invitato a un messaggio privato da"
-        invited_to_topic: "Invitato a un argomento da"
-        invitee_accepted: "Invito accettato da"
-        moved_post: "Il tuo messaggio è stato spostato da"
-        linked: "Collegamento al tuo messaggio"
-        granted_badge: "Distintivo assegnato"
-        group_message_summary: "Messaggi nel gruppo in arrivo"
+        one: '{{count}} messaggi in arrivo nella casella {{group_name}}'
+        other: '{{count}} messaggi in arrivo nella casella {{group_name}}'
       popup:
         mentioned: '{{username}} ti ha menzionato in "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} ti ha menzionato in "{{topic}}" - {{site_title}}'
         quoted: '{{username}} ti ha citato in "{{topic}}" - {{site_title}}'
         replied: '{{username}} ti ha risposto in "{{topic}}" - {{site_title}}'
         posted: '{{username}} ha pubblicato in "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} ti ha inviato un messaggio privato in "{{topic}}" - {{site_title}}'
         linked: '{{username}} ha aggiunto un collegamento a un tuo messaggio da "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Aggiungi un'immagine"
@@ -1225,6 +1266,7 @@ it:
       uploading: "In caricamento"
       select_file: "Seleziona File"
       image_link: "collegamento a cui la tua immagine punterà"
+      default_image_alt_text: immagine
     search:
       sort_by: "Ordina per"
       relevance: "Rilevanza"
@@ -1261,16 +1303,24 @@ it:
           label: Nel Gruppo
         with_badge:
           label: Con Distintivo
+        with_tags:
+          label: Con etichetta
         filters:
+          label: Mostra solamente argomenti/messaggi...
           likes: su cui ho messo "Mi Piace"
           posted: ho pubblicato in
           watching: sto osservando
           tracking: sto seguendo
+          private: Nei miei messaggi privati
+          bookmarks: Aggiunti ai segnalibri
           first: sono il primissimo post
           pinned: sono appuntati
           unpinned: non sono appuntati
+          seen: Che ho letto
           unseen: non ho letto
           wiki: sono wiki
+          images: che includono immagini
+          all_tags: Tutte le etichette sopra
         statuses:
           label: In cui gli argomenti
           open: sono aperti
@@ -1313,8 +1363,8 @@ it:
         notification_level: "Notifiche"
         choose_new_category: "Scegli la nuova categoria per gli argomenti:"
         selected:
-          one: "Hai selezionato <b>1</b> argomento."
-          other: "Hai selezionato <b>{{count}}</b> argomenti."
+          one: Hai selezionato <b>1</b> argomento.
+          other: Hai selezionato <b>{{count}}</b> argomenti.
         change_tags: "Sostituire Etichette"
         append_tags: "Aggiungi Etichette"
         choose_new_tags: "Scegli nuove etichette per i seguenti argomenti:"
@@ -1346,12 +1396,9 @@ it:
         bookmarks: "Non ci sono ulteriori argomenti nei segnalibri."
         search: "Non ci sono altri risultati di ricerca."
     topic:
-      unsubscribe:
-        stop_notifications: "Da ora riceverai meno notifiche per <strong>{{title}}</strong>"
-        change_notification_state: "Lo stato delle tue notifiche è"
       filter_to:
-        one: "1 messaggio in questo argomento"
-        other: "{{count}} messaggi in questo argomento"
+        one: 1 messaggio in questo argomento
+        other: '{{count}} messaggi in questo argomento'
       create: 'Nuovo Argomento'
       create_long: 'Crea un nuovo Argomento'
       private_message: 'Inizia a scrivere un messaggio'
@@ -1365,10 +1412,10 @@ it:
       new: 'nuovo argomento'
       unread: 'non letto'
       new_topics:
-        one: '1 nuovo argomento'
+        one: 1 nuovo argomento
         other: '{{count}} nuovi argomenti'
       unread_topics:
-        one: '1 argomento non letto'
+        one: 1 argomento non letto
         other: '{{count}} argomenti non letti'
       title: 'Argomento'
       invalid_access:
@@ -1382,17 +1429,17 @@ it:
         title: "Argomento non trovato"
         description: "Spiacenti, non abbiamo trovato l'argomento. Forse è stato rimosso da un moderatore?"
       total_unread_posts:
-        one: "c'è un post non letto in questa discussione"
-        other: "hai {{count}} messagi non letti in questo argomento"
+        one: c'è un post non letto in questa discussione
+        other: hai {{count}} messagi non letti in questo argomento
       unread_posts:
-        one: "Hai 1 vecchio messaggio non letto in questo argomento"
-        other: "hai {{count}} vecchi messaggi non letti in questo argomento"
+        one: Hai 1 vecchio messaggio non letto in questo argomento
+        other: hai {{count}} vecchi messaggi non letti in questo argomento
       new_posts:
-        one: "c'è 1 nuovo messaggio in questo argomento dalla tua ultima lettura"
-        other: "ci sono {{count}} nuovi messaggi in questo argomento dalla tua ultima lettura"
+        one: c'è 1 nuovo messaggio in questo argomento dalla tua ultima lettura
+        other: ci sono {{count}} nuovi messaggi in questo argomento dalla tua ultima lettura
       likes:
-        one: "c'è 1 \"Mi piace\" in questo argomento"
-        other: "ci sono {{count}} \"Mi piace\" in questo argomento"
+        one: c'è 1 "Mi piace" in questo argomento
+        other: ci sono {{count}} "Mi piace" in questo argomento
       back_to_list: "Torna alla Lista Argomenti"
       options: "Opzioni Argomento"
       show_links: "mostra i collegamenti in questo argomento"
@@ -1402,7 +1449,7 @@ it:
       read_more_MF: "{ UNREAD, plural, =0 {} one { C'è <a href='/unread'>1 argomento non letto</a> } other { Ci sono <a href='/unread'># argomenti non letti</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{e } false {è } other{}} <a href='/new'>1 nuovo</a> argomento} other { {BOTH, select, true{e } false {Ci sono } other{}} <a href='/new'># nuovi</a>  argomenti} } restanti, o {CATEGORY, select, true {visualizza altri argomenti in {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Scorri tutte le categorie
       view_latest_topics: visualizza gli argomenti più recenti
-      suggest_create_topic: Perché non crei un argomento?
+      suggest_create_topic: "Perché non crei un argomento?"
       jump_reply_up: passa a una risposta precedente
       jump_reply_down: passa a una risposta successiva
       deleted: "L'argomento è stato cancellato"
@@ -1456,8 +1503,8 @@ it:
         auto_reminder: "Questo argomento ti verrà ricordato %{timeLeft}."
       auto_close_title: 'Impostazioni di auto-chiusura'
       auto_close_immediate:
-        one: "L'ultimo messaggio nell'argomento ha già 1 ora, per cui l'argomento verrà chiuso immediatamente."
-        other: "L'ultimo messaggio nell'argomento ha già %{count} ore, per cui l'argomento verrà chiuso immediatamente."
+        one: L'ultimo messaggio nell'argomento ha già 1 ora, per cui l'argomento verrà chiuso immediatamente.
+        other: L'ultimo messaggio nell'argomento ha già %{count} ore, per cui l'argomento verrà chiuso immediatamente.
       timeline:
         back: "Indietro"
         back_description: "Torna indietro al tuo ultimo messaggio non letto"
@@ -1478,21 +1525,21 @@ it:
         title: cambia la frequenza con cui sarai avvertito su questo argomento
         reasons:
           mailing_list_mode: "Hai la modalità mailing list abilitata, verrai notificato delle risposte a questo argomento via email."
-          '3_10': 'Riceverai notifiche perché stai osservando un''etichetta in questo argomento.'
-          '3_6': 'Riceverai notifiche perché stai osservando questa categoria.'
-          '3_5': 'Riceverai notifiche poiché hai iniziato ad osservare questo argomento automaticamente.'
-          '3_2': 'Riceverai notifiche perché stai osservando questo argomento.'
-          '3_1': 'Riceverai notifiche perché hai creato questo argomento.'
-          '3': 'Riceverai notifiche perché stai osservando questo argomento.'
-          '2_8': 'Vedrai un conteggio delle nuove risposte perchè stai seguendo questa categoria.'
-          '2_4': 'Vedrai un conteggio delle nuove risposte perchè hai pubblicato una risposta in questo argomento.'
-          '2_2': 'Vedrai un conteggio delle nuove risposte perchè stai seguendo questo argomento.'
-          '2': 'Vedrai un conteggio delle nuove risposte perchè <a href="/u/{{username}}/preferences">hai letto questo argomento</a>'
-          '1_2': 'Riceverai notifiche se qualcuno menziona il tuo @nome o ti risponde.'
-          '1': 'Riceverai notifiche se qualcuno menziona il tuo @nome o ti risponde.'
-          '0_7': 'Stai ignorando tutte le notifiche di questa categoria.'
-          '0_2': 'Stai ignorando tutte le notifiche di questo argomento.'
-          '0': 'Stai ignorando tutte le notifiche di questo argomento.'
+          "3_10": 'Riceverai notifiche perché stai osservando un''etichetta in questo argomento.'
+          "3_6": 'Riceverai notifiche perché stai osservando questa categoria.'
+          "3_5": 'Riceverai notifiche poiché hai iniziato ad osservare questo argomento automaticamente.'
+          "3_2": 'Riceverai notifiche perché stai osservando questo argomento.'
+          "3_1": 'Riceverai notifiche perché hai creato questo argomento.'
+          "3": 'Riceverai notifiche perché stai osservando questo argomento.'
+          "2_8": 'Vedrai un conteggio delle nuove risposte perchè stai seguendo questa categoria.'
+          "2_4": 'Vedrai un conteggio delle nuove risposte perchè hai pubblicato una risposta in questo argomento.'
+          "2_2": 'Vedrai un conteggio delle nuove risposte perchè stai seguendo questo argomento.'
+          "2": 'Vedrai un conteggio delle nuove risposte perchè <a href="/u/{{username}}/preferences">hai letto questo argomento</a>'
+          "1_2": 'Riceverai notifiche se qualcuno menziona il tuo @nome o ti risponde.'
+          "1": 'Riceverai notifiche se qualcuno menziona il tuo @nome o ti risponde.'
+          "0_7": 'Stai ignorando tutte le notifiche di questa categoria.'
+          "0_2": 'Stai ignorando tutte le notifiche di questo argomento.'
+          "0": 'Stai ignorando tutte le notifiche di questo argomento.'
         watching_pm:
           title: "In osservazione"
           description: "Riceverai una notifica per ogni nuova risposta a questo messaggio, e comparirà un conteggio delle nuove risposte."
@@ -1532,7 +1579,6 @@ it:
         visible: "Rendi Visibile"
         reset_read: "Reimposta Dati Letti"
         make_public: "Rendi Argomento Pubblico"
-        make_private: "Rendi Privato il Messaggio "
       feature:
         pin: "Appunta Argomento"
         unpin: "Spunta Argomento"
@@ -1565,8 +1611,8 @@ it:
         pin_validation: "È richiesta una data per appuntare questo argomento."
         not_pinned: "Non ci sono argomenti appuntati in {{categoryLink}}."
         already_pinned:
-          one: "Argomenti attualmente appuntati in {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
-          other: "Argomenti attualmente appuntati in {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: 'Argomenti attualmente appuntati in {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Argomenti attualmente appuntati in {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         pin_globally: "Poni questo argomento in cima a tutte le liste di argomenti fino a"
         confirm_pin_globally: "Hai già {{count}} argomenti puntati globalmente. Troppi argomenti puntati potrebbero essere un peso per gli utenti nuovi o anonimi. Sicuro di voler puntare un altro argomento globalmente?"
         unpin_globally: "Togli questo argomento dalla cima degli altri argomenti."
@@ -1574,8 +1620,8 @@ it:
         global_pin_note: "Gli utenti possono spuntare gli argomenti autonomamente per loro stessi."
         not_pinned_globally: "Non ci sono argomenti appuntati globalmente."
         already_pinned_globally:
-          one: "Argomenti attualmente appuntati globalmente in {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
-          other: "Argomenti attualmente appuntati globalmente {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: 'Argomenti attualmente appuntati globalmente in {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Argomenti attualmente appuntati globalmente {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         make_banner: "Rendi questo argomento uno striscione che apparirà in cima a tutte le pagine."
         remove_banner: "Rimuovi lo striscione che appare in cima a tutte le pagine."
         banner_note: "Gli utenti possono rimuovere lo striscione chiudendolo. Solo un argomento alla volta può diventare uno striscione."
@@ -1612,8 +1658,8 @@ it:
       login_reply: 'Connettiti per Rispondere'
       filters:
         n_posts:
-          one: "1 post"
-          other: "{{count}} messaggi"
+          one: 1 post
+          other: '{{count}} messaggi'
         cancel: "Rimuovi filtro"
       split_topic:
         title: "Sposta in un nuovo argomento"
@@ -1621,15 +1667,15 @@ it:
         topic_name: "Nome Nuovo Argomento"
         error: "Si è verificato un errore spostando il messaggio nel nuovo argomento."
         instructions:
-          one: "Stai per creare un nuovo argomento riempiendolo con il messaggio che hai selezionato."
-          other: "Stai per creare un nuovo argomento riempiendolo con i <b>{{count}}</b> messaggi che hai selezionato."
+          one: Stai per creare un nuovo argomento riempiendolo con il messaggio che hai selezionato.
+          other: Stai per creare un nuovo argomento riempiendolo con i <b>{{count}}</b> messaggi che hai selezionato.
       merge_topic:
         title: "Sposta in Argomento Esistente"
         action: "sposta in un argomento esistente"
         error: "Si è verificato un errore nello spostare i messaggi nell'argomento."
         instructions:
-          one: "Per favore scegli l'argomento dove spostare il messaggio."
-          other: "Per favore scegli l'argomento di destinazione dove spostare i <b>{{count}}</b> messaggi."
+          one: Per favore scegli l'argomento dove spostare il messaggio.
+          other: Per favore scegli l'argomento di destinazione dove spostare i <b>{{count}}</b> messaggi.
       merge_posts:
         title: "Unisci Messaggi Selezionati"
         action: "unisci messaggi selezionati"
@@ -1641,9 +1687,8 @@ it:
         label: "Nuovo Proprietario dei Messaggi"
         placeholder: "nome utente del nuovo proprietario"
         instructions:
-          one: "Seleziona il nuovo proprietario del messaggio di <b>{{old_user}}</b>."
-          other: "Seleziona il nuovo proprietario dei {{count}} messaggi di <b>{{old_user}}</b>."
-        instructions_warn: "Nota che ogni notifica circa questo messaggio non verrà trasferita al nuovo utente in modo retroattivo.<br>Attenzione: al momento nessun dato messaggio-dipendente è stato trasferito al nuovo utente. Usare con cautela."
+          one: Seleziona il nuovo proprietario del messaggio di <b>{{old_user}}</b>.
+          other: Seleziona il nuovo proprietario dei {{count}} messaggi di <b>{{old_user}}</b>.
       change_timestamp:
         title: "Cambia Marca Temporale..."
         action: "cambia marca temporale"
@@ -1653,6 +1698,18 @@ it:
       multi_select:
         select: 'scegli'
         selected: 'selezionati ({{count}})'
+        select_post:
+          label: 'seleziona'
+          title: 'Aggiungi il messaggio alla selezione'
+        selected_post:
+          label: 'selezionato'
+          title: 'Clicca per rimuovere un messaggio dalla selezione'
+        select_replies:
+          label: 'seleziona +risposte'
+          title: 'Aggiungi il messaggio e tutte le risposte alla selezione'
+        select_below:
+          label: 'seleziona +seguenti'
+          title: 'Aggiungi questo messaggio e tutti quelli seguenti alla selezione'
         delete: elimina i selezionati
         cancel: annulla selezione
         select_all: seleziona tutto
@@ -1661,8 +1718,6 @@ it:
           one: Hai selezionato <b>1</b> messaggio.
           other: Hai selezionato <b>{{count}}</b> messaggi.
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Cita"
       edit_reason: "Motivo:"
       post_number: "messaggio {{number}}"
@@ -1675,26 +1730,26 @@ it:
       show_full: "Mostra Messaggio Completo"
       show_hidden: 'Visualizza contenuto nascosto.'
       deleted_by_author:
-        one: "(post eliminato dall'autore, sarà automaticamente cancellato in %{count} ore se non contrassegnato)"
-        other: "(messaggio eliminato dall'autore, verrà automaticamente cancellato in %{count} ore se non segnalato)"
+        one: (post eliminato dall'autore, sarà automaticamente cancellato in %{count} ore se non contrassegnato)
+        other: (messaggio eliminato dall'autore, verrà automaticamente cancellato in %{count} ore se non segnalato)
       expand_collapse: "espandi/raggruppa"
       gap:
-        one: "visualizza 1 risposta nascosta"
-        other: "visualizza {{count}} riposte nascoste"
+        one: visualizza 1 risposta nascosta
+        other: visualizza {{count}} riposte nascoste
       unread: "Messaggio non letto"
       has_replies:
-        one: "{{count}} Risposta"
-        other: "{{count}} Risposte"
+        one: '{{count}} Risposta'
+        other: '{{count}} Risposte'
       has_likes:
-        one: "{{count}} \"Mi piace\""
-        other: "{{count}} \"Mi piace\""
+        one: '{{count}} "Mi piace"'
+        other: '{{count}} "Mi piace"'
       has_likes_title:
-        one: "Una persona ha messo \"Mi piace\" a questo messaggio"
-        other: "{{count}} persone hanno messo \"Mi piace\" a questo messaggio"
+        one: Una persona ha messo "Mi piace" a questo messaggio
+        other: '{{count}} persone hanno messo "Mi piace" a questo messaggio'
       has_likes_title_only_you: "hai messo \"Mi piace\" a questo messaggio"
       has_likes_title_you:
-        one: "tu e un'altra persona avete messo \"Mi piace\" a questo messaggio"
-        other: "tu e altre {{count}} persone avete messo \"Mi piace\" a questo messaggio"
+        one: tu e un'altra persona avete messo "Mi piace" a questo messaggio
+        other: tu e altre {{count}} persone avete messo "Mi piace" a questo messaggio
       errors:
         create: "Spiacenti, si è verificato un errore nel creare il tuo messaggio. Prova di nuovo."
         edit: "Spiacenti, si è verificato un errore nel modificare il tuo messaggio. Prova di nuovo."
@@ -1742,8 +1797,8 @@ it:
       actions:
         flag: 'Segnala'
         defer_flags:
-          one: "Ignore flag"
-          other: "Ignora le segnalazioni"
+          one: Ignore flag
+          other: Ignora le segnalazioni
         undo:
           off_topic: "Rimuovi segnalazione"
           spam: "Rimuovi segnalazione"
@@ -1760,8 +1815,8 @@ it:
           bookmark: "l'hanno aggiunto ai segnalibri"
           like: "hanno messo \"Mi piace\""
           like_capped:
-            one: "e a {{count}} persona è piaciuto"
-            other: "e ad altre {{count}} persone è piaciuto"
+            one: e a {{count}} persona è piaciuto
+            other: e ad altre {{count}} persone è piaciuto
           vote: "hanno votato"
         by_you:
           off_topic: "L'hai segnalato come fuori tema"
@@ -1774,58 +1829,58 @@ it:
           vote: "Hai votato per questo messaggio"
         by_you_and_others:
           off_topic:
-            one: "Tu e un'altra persona lo avete contrassegnato come fuori tema"
-            other: "Tu e {{count}} altre persone lo avete contrassegnato come fuori tema"
+            one: Tu e un'altra persona lo avete contrassegnato come fuori tema
+            other: Tu e {{count}} altre persone lo avete contrassegnato come fuori tema
           spam:
-            one: "Tu e un'altra persona lo avete contrassegnato come spam"
-            other: "Tu e {{count}} altre persona lo avete contrassegnato come spam"
+            one: Tu e un'altra persona lo avete contrassegnato come spam
+            other: Tu e {{count}} altre persona lo avete contrassegnato come spam
           inappropriate:
-            one: "Tu e un'altra persona lo avete contrassegnato come non appropriato"
-            other: "Tu e  {{count}} altre persone lo avete contrassegnato come non appropriato"
+            one: Tu e un'altra persona lo avete contrassegnato come non appropriato
+            other: Tu e  {{count}} altre persone lo avete contrassegnato come non appropriato
           notify_moderators:
-            one: "Tu e un'altra persona lo avete contrassegnato per la moderazione"
-            other: "Tu e {{count}} altre persone lo avete contrassegnato per la moderazione"
+            one: Tu e un'altra persona lo avete contrassegnato per la moderazione
+            other: Tu e {{count}} altre persone lo avete contrassegnato per la moderazione
           notify_user:
-            one: "Tu e un'altra persona avete inviato un messaggio a questo utente"
-            other: "Tu e {{count}} altre persone avete inviato un messaggio a questo utente"
+            one: Tu e un'altra persona avete inviato un messaggio a questo utente
+            other: Tu e {{count}} altre persone avete inviato un messaggio a questo utente
           bookmark:
-            one: "Tu e un'altra persona avete inserito questo messaggio nei segnalibri"
-            other: "Tu e {{count}} altre persone avete inserito questo messaggio nei segnalibri"
+            one: Tu e un'altra persona avete inserito questo messaggio nei segnalibri
+            other: Tu e {{count}} altre persone avete inserito questo messaggio nei segnalibri
           like:
-            one: "A te e a un'altra persona è piaciuto"
-            other: "A te e a {{count}} altre persone è piaciuto"
+            one: A te e a un'altra persona è piaciuto
+            other: A te e a {{count}} altre persone è piaciuto
           vote:
-            one: "Tu e un'altra persona avete votato per questo messaggio"
-            other: "Tu e {{count}} altre persone avete votato per questo messaggio"
+            one: Tu e un'altra persona avete votato per questo messaggio
+            other: Tu e {{count}} altre persone avete votato per questo messaggio
         by_others:
           off_topic:
-            one: "Una persona lo ha contrassegnato come fuori tema"
-            other: "{{count}} persone lo hanno contrassegnato come fuori tema"
+            one: Una persona lo ha contrassegnato come fuori tema
+            other: '{{count}} persone lo hanno contrassegnato come fuori tema'
           spam:
-            one: "Una persona lo ha contrassegnato come spam"
-            other: "{{count}} persone lo hanno contrassegnato come spam"
+            one: Una persona lo ha contrassegnato come spam
+            other: '{{count}} persone lo hanno contrassegnato come spam'
           inappropriate:
-            one: "Una persona lo ha contrassegnato come non appropriato"
-            other: "{{count}} persone lo hanno contrassegnato come non appropriato"
+            one: Una persona lo ha contrassegnato come non appropriato
+            other: '{{count}} persone lo hanno contrassegnato come non appropriato'
           notify_moderators:
-            one: "Una persona lo ha contrassegnato per la moderazione"
-            other: "{{count}} persone lo hanno contrassegnato per la moderazione"
+            one: Una persona lo ha contrassegnato per la moderazione
+            other: '{{count}} persone lo hanno contrassegnato per la moderazione'
           notify_user:
-            one: "Una persona ha inviato un messaggio a questo utente"
-            other: "{{count}} persone hanno inviato un messaggio a questo utente"
+            one: Una persona ha inviato un messaggio a questo utente
+            other: '{{count}} persone hanno inviato un messaggio a questo utente'
           bookmark:
-            one: "Una persona ha inserito un segnalibro a questo post"
-            other: "{{count}} persone hanno inserito un segnalibro a questo post"
+            one: Una persona ha inserito un segnalibro a questo post
+            other: '{{count}} persone hanno inserito un segnalibro a questo post'
           like:
-            one: "A una persona è piaciuto"
-            other: "A {{count}} persone è piaciuto"
+            one: A una persona è piaciuto
+            other: A {{count}} persone è piaciuto
           vote:
-            one: "Una persona ha votato per questo post"
-            other: "{{count}} persone hanno votato per questo post"
+            one: Una persona ha votato per questo post
+            other: '{{count}} persone hanno votato per questo post'
       merge:
         confirm:
-          one: "Sicuro di voler unire questi messaggi?"
-          other: "Sicuro di voler unire questi {{count}} messaggi?"
+          one: Sicuro di voler unire questi messaggi?
+          other: Sicuro di voler unire questi {{count}} messaggi?
       revisions:
         controls:
           first: "Prima revisione"
@@ -1907,7 +1962,6 @@ it:
       email_in_allow_strangers: "Accetta email da utenti anonimi senza alcun account"
       email_in_disabled: "Le Impostazioni Sito non permettono di creare nuovi argomenti via email. Per abilitare la creazione di argomenti via email,"
       email_in_disabled_click: 'abilita l''impostazione "email entrante".'
-      suppress_from_homepage: "Elimina questa categoria dalla homepage."
       show_subcategory_list: "Mostra la lista delle sottocategorie sopra agli argomenti in questa categoria."
       num_featured_topics: "Numero degli argomenti mostrati nella pagina categorie:"
       subcategory_num_featured_topics: "Numero degli argomenti in evidenza nella pagina della categoria superiore"
@@ -1981,14 +2035,14 @@ it:
       custom_placeholder_notify_moderators: "Facci sapere esattamente cosa ti preoccupa, fornendo collegamenti pertinenti ed esempi ove possibile."
       custom_message:
         at_least:
-          one: "inserisci almeno 1 carattere"
-          other: "inserisci almeno {{n}} caratteri"
+          one: inserisci almeno 1 carattere
+          other: inserisci almeno {{n}} caratteri
         more:
-          one: "1 mancante..."
-          other: "{{count}} mancanti..."
+          one: 1 mancante...
+          other: '{{count}} mancanti...'
         left:
-          one: "1 mancante"
-          other: "{{count}} mancanti..."
+          one: 1 mancante
+          other: '{{count}} mancanti...'
     flagging_topic:
       title: "Grazie per aiutarci a mantenere la nostra comunità civile!"
       action: "Segnala Argomento"
@@ -1999,13 +2053,13 @@ it:
       links_title: "Collegamenti Di Successo"
       links_shown: "mostra altri collegamenti..."
       clicks:
-        one: "1 click"
-        other: "%{count} click"
+        one: 1 click
+        other: '%{count} click'
     post_links:
       about: "espandi altri collegamenti per questo messaggio"
       title:
-        one: "un altro"
-        other: "altri %{count}"
+        one: un altro
+        other: altri %{count}
     topic_statuses:
       warning:
         help: "Questo è un avvertimento ufficiale."
@@ -2035,22 +2089,22 @@ it:
     original_post: "Messaggio Originale"
     views: "Visite"
     views_lowercase:
-      one: "visita"
-      other: "visite"
+      one: visita
+      other: visite
     replies: "Risposte"
     views_long:
-      one: "questo argomento è stato visto una volta"
-      other: "questo argomento è stato visto {{number}} volte"
+      one: questo argomento è stato visto una volta
+      other: questo argomento è stato visto {{number}} volte
     activity: "Attività"
     likes: "Mi piace"
     likes_lowercase:
-      one: "mi piace"
-      other: "mi piace"
+      one: mi piace
+      other: mi piace
     likes_long: "ci sono {{number}} \"Mi piace\" in questo argomento"
     users: "Utenti"
     users_lowercase:
-      one: "utente"
-      other: "utenti"
+      one: utente
+      other: utenti
     category_title: "Categoria"
     history: "Storia"
     changed_by: "da {{author}}"
@@ -2064,8 +2118,8 @@ it:
       latest:
         title: "Ultimi"
         title_with_count:
-          one: "Ultimo (1)"
-          other: "Ultimi ({{count}})"
+          one: Ultimo (1)
+          other: Ultimi ({{count}})
         help: "argomenti con messaggi recenti"
       hot:
         title: "Caldo"
@@ -2083,21 +2137,21 @@ it:
       unread:
         title: "Non letti"
         title_with_count:
-          one: "Non letto (1)"
-          other: "Non letti ({{count}})"
+          one: Non letto (1)
+          other: Non letti ({{count}})
         help: "argomenti che stai osservando o seguendo contenenti messaggi non letti"
         lower_title_with_count:
-          one: "1 non letto"
-          other: "{{count}} non letti"
+          one: 1 non letto
+          other: '{{count}} non letti'
       new:
         lower_title_with_count:
-          one: "1 nuovo"
-          other: "{{count}} nuovi"
+          one: 1 nuovo
+          other: '{{count}} nuovi'
         lower_title: "nuovo"
         title: "Nuovi"
         title_with_count:
-          one: "Nuovo (1)"
-          other: "Nuovi ({{count}})"
+          one: Nuovo (1)
+          other: Nuovi ({{count}})
         help: "argomenti creati negli ultimi giorni"
       posted:
         title: "I miei Messaggi"
@@ -2108,8 +2162,8 @@ it:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: "{{categoryName}} (1)"
-          other: "{{categoryName}} ({{count}})"
+          one: '{{categoryName}} (1)'
+          other: '{{categoryName}} ({{count}})'
         help: "ultimi argomenti nella categoria {{categoryName}}"
       top:
         title: "Di Punta"
@@ -2194,24 +2248,23 @@ it:
         print: '<b>ctrl</b>+<b>p</b> Stampa argomento'
     badges:
       earned_n_times:
-        one: "Guadagnato questo distintivo 1 volta"
-        other: "Guadagnato questo distintivo %{count} volte"
+        one: Guadagnato questo distintivo 1 volta
+        other: Guadagnato questo distintivo %{count} volte
       granted_on: "Assegnata %{date}"
       others_count: "Altri utenti con questo distintivo (%{count})"
       title: Distintivi
       allow_title: "Puoi usare questo distintivo come qualifica"
       multiple_grant: "Puoi guadagnarlo più volte"
       badge_count:
-        one: "1 Distintivo"
-        other: "%{count} Distintivi"
+        one: 1 Distintivo
+        other: '%{count} Distintivi'
       more_badges:
-        one: "+1 altro"
-        other: "+ altri %{count}"
+        one: +1 altro
+        other: + altri %{count}
       granted:
-        one: "1 assegnato"
-        other: "%{count} assegnati"
+        one: 1 assegnato
+        other: '%{count} assegnati'
       select_badge_for_title: Seleziona un distintivo da usare come tuo titolo
-      none: "<nessuno>"
       badge_grouping:
         getting_started:
           name: Iniziali
@@ -2240,8 +2293,8 @@ it:
       tags: "Etichette"
       delete_tag: "Cancella Etichetta"
       delete_confirm:
-        one: "Sei sicuro di voler eliminare questa etichetta e rimuoverla da {{count}} argomenti a cui è assegnata?"
-        other: "Sei sicuro di voler eliminare questa etichetta e rimuoverla da {{count}} argomenti a cui è assegnata?"
+        one: Sei sicuro di voler eliminare questa etichetta e rimuoverla da 1 argomento a cui è assegnata?
+        other: Sei sicuro di voler eliminare questa etichetta e rimuoverla da {{count}} argomenti a cui è assegnata?
       delete_confirm_no_topics: "Sei sicuro di voler eliminare questa etichetta?"
       rename_tag: "Rinomina Etichetta"
       rename_instructions: "Scegli un altro nome per l'etichetta:"
@@ -2258,19 +2311,15 @@ it:
       notifications:
         watching:
           title: "In osservazione"
-          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 con questa etichetta."
         tracking:
           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 menziona il tuo @nome o risponde al tuo messaggio."
         muted:
           title: "Silenziato"
-          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."
@@ -2353,8 +2402,6 @@ it:
         reports:
           today: "Oggi"
           yesterday: "Ieri"
-          last_7_days: "Ultimi 7 Giorni"
-          last_30_days: "Ultimi 30 Giorni"
           all_time: "Di Sempre"
           7_days_ago: "7 Giorni Fa"
           30_days_ago: "30 Giorni Fa"
@@ -2375,14 +2422,10 @@ it:
         topics: "Argomenti Segnalati"
         agree: "Acconsento"
         agree_title: "Conferma che questa segnalazione è valida e corretta"
-        agree_flag_hide_post: "Accetta e Nascondi il Messaggio"
         agree_flag_hide_post_title: "Nascondi questo messaggio e invia automaticamente all'utente un messaggio privato che lo invita a modificarlo."
         agree_flag_restore_post: "Accetta e Ripristina il Messaggio"
         agree_flag_restore_post_title: "Ripristina il messaggio in modo che tutti gli utenti possano vederlo."
-        agree_flag: "Accetto e Mantieni il Messaggio"
         agree_flag_title: "Accetta la segnalazione e mantieni invariato il messaggio."
-        defer_flag: "Ignora"
-        defer_flag_title: "Rimuovi segnalazione; non è necessaria alcuna azione questa volta."
         delete: "Cancella"
         delete_title: "Cancella il messaggio a cui si riferisce la segnalazione."
         delete_post_defer_flag: "Elimina il Messaggio e Ignora la segnalazione"
@@ -2436,8 +2479,6 @@ it:
         title: "Gruppi"
         edit: "Modifica Gruppi"
         refresh: "Aggiorna"
-        new: "Nuovo"
-        selector_placeholder: "inserisci nome utente"
         about: "Modifica qui la tua appartenenza ai gruppi e i loro nomi"
         group_members: "Membri del gruppo"
         delete: "Cancella"
@@ -2445,22 +2486,10 @@ it:
         delete_failed: "Impossibile cancellare il gruppo. Se questo è un gruppo automatico, non può essere eliminato."
         delete_owner_confirm: "Rimuovere i privilegi per '%{username}'?"
         add: "Aggiungi"
-        add_members: "Aggiungi membri"
         custom: "Personalizzato"
-        bulk_complete: "Gli utenti sono stati aggiunti al gruppo."
-        bulk_complete_users_not_added: "Questi utenti non sono stati aggiunti (assicurati che abbiano un account):"
-        bulk: "Aggiunta Massiva al Gruppo"
-        bulk_paste: "Incolla una lista di nomi utente o di email, uno per riga:"
-        bulk_select: "(seleziona un gruppo)"
         automatic: "Automatico"
-        automatic_membership_email_domains: "Gli utenti che si registrano con un dominio email che corrisponde esattamente a uno presente in questa lista, saranno aggiunti automaticamente a questo gruppo:"
-        automatic_membership_retroactive: "Applica la stessa regola sul dominio email per aggiungere utenti registrati esistenti"
-        default_title: "Titolo predefinito per tutti gli utenti di questo gruppo"
-        primary_group: "Imposta automaticamente come gruppo principale"
         group_owners: Proprietari
         add_owners: Aggiungi proprietari
-        incoming_email: "Indirizzo email personalizzato"
-        incoming_email_placeholder: "inserisci l'indirizzo e-mail"
         none_selected: "Seleziona un gruppo per iniziare"
         no_custom_groups: "Crea un nuovo gruppo personalizzato"
       api:
@@ -2526,11 +2555,11 @@ it:
           none: "Non ci sono eventi correlati."
           redeliver: "Riconsegna  "
           incoming:
-            one: "C'è un nuovo evento."
-            other: "Ci sono {{count}} nuovi eventi."
+            one: C'è un nuovo evento.
+            other: Ci sono {{count}} nuovi eventi.
           completed_in:
-            one: "Compleato in 1 secondo."
-            other: "Completato in {{count}} secondi."
+            one: Compleato in 1 secondo.
+            other: Completato in {{count}} secondi.
           request: "Richiesta"
           response: "Risposta"
           redeliver_confirm: "Sicuro di voler rispedire lo stesso payload?"
@@ -2581,7 +2610,6 @@ it:
           label: "Carica"
           title: "Carica un backup su questa istanza"
           uploading: "In caricamento..."
-          success: "'{{filename}}' è stato caricato con successo."
           error: "Si è verificato un errore durante il caricamento {{filename}}': {{message}}"
         operations:
           is_running: "Un'operazione è attualmente in esecuzione..."
@@ -2594,7 +2622,6 @@ it:
             label: "Backup"
             title: "Crea un backup"
             confirm: "Vuoi creare un nuovo backup?"
-            without_uploads: "Sì (non includere i file)"
           download:
             label: "Scarica"
             title: "Invia una email con il collegamento per il download"
@@ -2692,8 +2719,8 @@ it:
           up_to_date: "Il tema è aggiornato, ultima verifica:"
           add: "Aggiungi"
           commits_behind:
-            one: "Il tema è indietro di 1 aggiornamento!"
-            other: "Il tema è indietro di {{count}} aggiornamenti!"
+            one: Il tema è indietro di 1 aggiornamento!
+            other: Il tema è indietro di {{count}} aggiornamenti!
           scss:
             text: "CSS"
             title: "Inserire il CSS personalizzato, accettiamo tutti gli stili validi di CSS e SCSSpersonalizzato"
@@ -2941,8 +2968,8 @@ it:
         clear_filter: "Pulisci"
         show_words: "mostra le parole"
         word_count:
-          one: "1 word"
-          other: "%{count} parole"
+          one: 1 word
+          other: '%{count} parole'
         actions:
           block: 'Blocca'
           censor: 'Censura'
@@ -2984,11 +3011,11 @@ it:
           suspect: 'Sospetti'
         approved: "Approvato?"
         approved_selected:
-          one: "approva l'utente"
-          other: "approva gli utenti ({{count}})"
+          one: approva l'utente
+          other: approva gli utenti ({{count}})
         reject_selected:
-          one: "rifiuta l'utente"
-          other: "rifiuta utenti ({{count}})"
+          one: rifiuta l'utente
+          other: rifiuta utenti ({{count}})
         titles:
           active: 'Utenti Attivi'
           new: 'Nuovi Utenti'
@@ -3005,11 +3032,11 @@ it:
           suspended: 'Utenti Sospesi'
           suspect: 'Utenti Sospetti'
         reject_successful:
-          one: "1 utente rifiutato."
-          other: "%{count} utenti rifiutati."
+          one: 1 utente rifiutato.
+          other: '%{count} utenti rifiutati.'
         reject_failures:
-          one: "Impossibile rifiutare 1 utente"
-          other: "Impossibile rifiutare %{count} utenti."
+          one: Impossibile rifiutare 1 utente
+          other: Impossibile rifiutare %{count} utenti.
         not_verified: "Non verificato"
         check_email:
           title: "Mostra l'indirizzo email di questo utente"
@@ -3063,7 +3090,7 @@ it:
         reputation: Reputazione
         permissions: Permessi
         activity: Attività
-        like_count: '"Mi piace" Assegnati / Ricevuti'
+        like_count: "\"Mi piace\" Assegnati / Ricevuti"
         last_100_days: 'negli ultimi 100 giorni'
         private_topics_count: Argomenti Privati
         posts_read_count: Messaggi Letti
@@ -3086,17 +3113,18 @@ it:
         delete_forbidden_because_staff: "Amministratori e moderatori non possono essere cancellati."
         delete_posts_forbidden_because_staff: "Impossibile cancellare tutti i messaggi degli amministratori e dei moderatori."
         delete_forbidden:
-          one: "Non è possibile cancellare utenti se hanno post attivi. Elimina tutti i posti prima di cancellare un utente (post più vecchi di %{count} giorni non possono essere cancellati)."
-          other: "Non è possibile cancellare utenti se hanno messaggi. Elimina tutti i messaggi prima di cancellare un utente (i messaggi più vecchi di %{count} giorni non possono essere cancellati)."
+          one: Non è possibile cancellare utenti se hanno post attivi. Elimina tutti i posti prima di cancellare un utente (post più vecchi di %{count} giorni non possono essere cancellati).
+          other: Non è possibile cancellare utenti se hanno messaggi. Elimina tutti i messaggi prima di cancellare un utente (i messaggi più vecchi di %{count} giorni non possono essere cancellati).
         cant_delete_all_posts:
-          one: "Non posso cancellare tutti i post. Alcuni sono più vecchi di %{count} giorno. (L'impostazione delete_user_max_post_age.)"
-          other: "Impossibile cancellare tutti i messaggi. Alcuni sono più vecchi di %{count} giorni. (L'impostazione delete_user_max_post_age.)"
+          one: Non posso cancellare tutti i post. Alcuni sono più vecchi di %{count} giorno. (L'impostazione delete_user_max_post_age.)
+          other: Impossibile cancellare tutti i messaggi. Alcuni sono più vecchi di %{count} giorni. (L'impostazione delete_user_max_post_age.)
         cant_delete_all_too_many_posts:
-          one: "Non posso cancellare tutti i post perché l'utente ha più di 1 post. (delete_all_posts_max.)"
-          other: "Impossibile cancellare tutti i messaggi perché l'utente ha più di %{count} messaggi. (delete_all_posts_max.)"
+          one: Non posso cancellare tutti i post perché l'utente ha più di 1 post. (delete_all_posts_max.)
+          other: Impossibile cancellare tutti i messaggi perché l'utente ha più di %{count} messaggi. (delete_all_posts_max.)
         delete_confirm: "Sei SICURO di voler eliminare questo utente? Non è possibile annullare!"
         delete_and_block: "Elimina e <b>blocca</b> questa email e indirizzo IP"
         delete_dont_block: "Elimina soltanto"
+        deleting_user: "Cancellazione utente..."
         deleted: "L'utente è stato cancellato."
         delete_failed: "Si è verificato un errore nella cancellazione dell'utente. Assicurati che tutti i messaggi siano stati cancellati prima di provare a cancellare l'utente."
         send_activation_email: "Invia Email Attivazione"
@@ -3134,8 +3162,8 @@ it:
         tl3_requirements:
           title: "Requisiti per Livello Esperienza 3"
           table_title:
-            one: "Nell'ultimo giorno:"
-            other: "Negli ultimi %{count} giorni:"
+            one: 'Nell''ultimo giorno:'
+            other: 'Negli ultimi %{count} giorni:'
           value_heading: "Valore"
           requirement_heading: "Requisito"
           visits: "Visite"
@@ -3210,10 +3238,7 @@ it:
         recommended: "Consigliamo di personalizzare il seguente testo per tue adattarlo alle necessità:"
         show_overriden: 'Mostra solo le opzioni sovrascritte'
       site_settings:
-        show_overriden: 'Mostra solo le opzioni sovrascritte'
         title: 'Impostazioni'
-        reset: 'reimposta'
-        none: 'nessuno'
         no_results: "Nessun risultato trovato."
         clear_filter: "Pulisci"
         add_url: "aggiungi URL"
@@ -3263,11 +3288,11 @@ it:
         reason_help: (Un collegamento a un messaggio o argomento)
         save: Salva
         delete: Cancella
-        delete_confirm: Sei sicuro di voler cancellare questo distintivo?
+        delete_confirm: "Sei sicuro di voler cancellare questo distintivo?"
         revoke: Revoca
         reason: Motivazione
         expand: Espandi &hellip;
-        revoke_confirm: Sei sicuro di voler revocare questo distintivo?
+        revoke_confirm: "Sei sicuro di voler revocare questo distintivo?"
         edit_badges: Modifica Distintivi
         grant_badge: Assegna Distintivo
         granted_badges: Distintivi Assegnati
@@ -3281,7 +3306,6 @@ it:
         enabled: Attiva distintivo
         icon: Icona
         image: Immagine
-        icon_help: "Usa una classe Font Awesome o la URL di un'immagine"
         query: Query Distintivo (SQL)
         target_posts: Interroga i messaggi destinazione
         auto_revoke: Avvia l'istruzione di revoca giornalmente
@@ -3305,14 +3329,14 @@ it:
             text: "Ci sono esempi di grant mancanti. Ciò accade quando la query dei distintivi ritorna ID utenti o ID messaggi inesistenti. Successivamente ciò può causare risultati inattesi - controlla bene la tua query."
           no_grant_count: "Nessun distintivo da assegnare."
           grant_count:
-            one: "<b>1</b> distintivo da assegnare."
-            other: "<b>%{count}</b> distintivi da assegnare."
+            one: <b>1</b> distintivo da assegnare.
+            other: <b>%{count}</b> distintivi da assegnare.
           sample: "Esempio:"
           grant:
-            with: <span class="username">%{username}</span>
-            with_post: <span class="username">%{username}</span> per messaggio in %{link}
-            with_post_time: <span class="username">%{username}</span> per messaggio in %{link} in data <span class="time">%{time}</span>
-            with_time: <span class="username">%{username}</span> in data <span class="time">%{time}</span>
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span> per messaggio in %{link}"
+            with_post_time: "<span class=\"username\">%{username}</span> per messaggio in %{link} in data <span class=\"time\">%{time}</span>"
+            with_time: "<span class=\"username\">%{username}</span> in data <span class=\"time\">%{time}</span>"
       emoji:
         title: "Emoji"
         help: "Aggiungi nuovi emoji da mettere a disposizione per tutti. (Suggerimento: trascina e rilascia più file in una volta sola)"
@@ -3358,7 +3382,7 @@ it:
         category_id: "ID della categoria"
         category_title: "Categoria"
         external_url: "URL esterna"
-        delete_confirm: Sei sicuro di voler cancellare questo collegamento permanente?
+        delete_confirm: "Sei sicuro di voler cancellare questo collegamento permanente?"
         form:
           label: "Nuovo:"
           add: "Aggiungi"
@@ -3373,8 +3397,8 @@ it:
       uploading: "Caricamento..."
       quit: "Forse Dopo"
       staff_count:
-        one: "Your community has 1 staff (you). "
-        other: "La tua comunità ha %{count} membri dello staff, te incluso."
+        one: 'Your community has 1 staff (you). '
+        other: La tua comunità ha %{count} membri dello staff, te incluso.
       invites:
         add_user: "aggiungi"
         none_added: "Non hai invitato nessuno dello staff. Sicuro di voler proseguire?"
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index 9083af4c3a1..12358e365f1 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -42,49 +42,49 @@ ja:
       tiny:
         half_a_minute: "1分未満"
         less_than_x_seconds:
-          other: "%{count}秒未満"
+          other: '%{count}秒未満'
         x_seconds:
-          other: "%{count}秒"
+          other: '%{count}秒'
         less_than_x_minutes:
-          other: "%{count}分以内"
+          other: '%{count}分以内'
         x_minutes:
-          other: "%{count}分"
+          other: '%{count}分'
         about_x_hours:
-          other: "%{count}時間"
+          other: '%{count}時間'
         x_days:
-          other: "%{count}日"
+          other: '%{count}日'
         x_months:
-          other: "%{count}月"
+          other: '%{count}月'
         about_x_years:
-          other: "%{count}年"
+          other: '%{count}年'
         over_x_years:
-          other: "%{count}年以上"
+          other: '%{count}年以上'
         almost_x_years:
-          other: "約%{count}年"
+          other: 約%{count}年
         date_month: "MMM Do"
         date_year: "'YY MMM"
       medium:
         x_minutes:
-          other: "%{count}分"
+          other: '%{count}分'
         x_hours:
-          other: "%{count}時間"
+          other: '%{count}時間'
         x_days:
-          other: "%{count}日"
+          other: '%{count}日'
         date_year: "YYYY年MM月D日"
       medium_with_ago:
         x_minutes:
-          other: "%{count}分前"
+          other: '%{count}分前'
         x_hours:
-          other: "%{count}時間前"
+          other: '%{count}時間前'
         x_days:
-          other: "%{count}日前"
+          other: '%{count}日前'
       later:
         x_days:
-          other: "%{count}日後"
+          other: '%{count}日後'
         x_months:
-          other: "%{count}か月後"
+          other: '%{count}か月後'
         x_years:
-          other: "%{count}年後"
+          other: '%{count}年後'
       previous_month: '前の月'
       next_month: '次の月'
       placeholder: 日付
@@ -98,7 +98,6 @@ ja:
       email: 'メールでこのリンクを送る'
     action_codes:
       public_topic: "トピックを公開しました: %{when} "
-      private_topic: "トピックを非公開にしました: %{when}"
       split_topic: "%{when} このトピックは分割されました"
       invited_user: "%{who} から招待されました: %{when}"
       invited_group: "%{when} %{who}に招待されました"
@@ -128,8 +127,7 @@ ja:
     topic_admin_menu: "トピックの管理"
     wizard_required: "Discourseへようこそ！ さあ<a href='%{url}' data-auto-route='true'>セットアップウィザード</a>から始めましょう"
     emails_are_disabled: "メールアドレスの送信は管理者によって無効化されています。全てのメール通知は行われません"
-    bootstrap_mode_enabled: "かんたんにサイトを立ち上げられるようにするため、ブートストラップモードが有効になっています。新しいユーザーは全員、トラストレベル1を付与し、毎日更新がメールで届けられます。これらの機能は総ユーザー数が%{min_users}を超えた時にオフになります。"
-    bootstrap_mode_disabled: "ブートストラップモードは24時間後に無効化されます。"
+    bootstrap_mode_disabled: "ブートストラップモードは24時間以内に無効になります。"
     themes:
       default_description: "デフォルト"
     s3:
@@ -153,6 +151,7 @@ ja:
     not_implemented: "この機能はまだ実装されていません！"
     no_value: "いいえ"
     yes_value: "はい"
+    submit: "送信"
     generic_error: "申し訳ありません、エラーが発生しました。"
     generic_error_with_reason: "エラーが発生しました: %{error}"
     sign_up: "サインアップ"
@@ -165,7 +164,7 @@ ja:
     show_help: "オプション"
     links: "リンク"
     links_lowercase:
-      other: "リンク"
+      other: リンク
     faq: "FAQ"
     guidelines: "ガイドライン"
     privacy_policy: "プライバシーポリシー"
@@ -189,7 +188,7 @@ ja:
     max_of_count: "最大 {{count}}"
     alternation: "または"
     character_count:
-      other: "{{count}}文字"
+      other: '{{count}}文字'
     suggested_topics:
       title: "関連トピック"
       pm_title: "他のメッセージ"
@@ -201,8 +200,6 @@ ja:
       our_moderators: "モデレータ"
       stat:
         all_time: "すべて"
-        last_7_days: "過去7日間"
-        last_30_days: "過去30日間"
       like_count: "いいね！"
       topic_count: "トピック"
       post_count: "投稿"
@@ -224,12 +221,11 @@ ja:
       remove: "ブックマークを削除"
       confirm_clear: "このトピックの全てのブックマークを削除してもよいですか？"
     topic_count_latest:
-      other: "{{count}}件の新規/更新トピックがあります。"
+      other: '{{count}}件の新規/更新トピックがあります。'
     topic_count_unread:
-      other: "{{count}} 個の未読トピック。"
+      other: '{{count}} 件の未読トピックがあります。'
     topic_count_new:
-      other: "{{count}} 件の新しいトピック"
-    click_to_show: "クリックして表示"
+      other: '{{count}} 件の新規トピックがあります。'
     preview: "プレビュー"
     cancel: "キャンセル"
     save: "変更を保存"
@@ -239,6 +235,7 @@ ja:
     uploading: "アップロード中..."
     uploading_filename: "{{filename}} をアップロードしています..."
     uploaded: "アップロードしました"
+    pasting: "貼り付け"
     enable: "有効にする"
     disable: "無効にする"
     undo: "取り消す"
@@ -265,14 +262,14 @@ ja:
       cancel: "キャンセル"
       view_pending: "保留になっている投稿を見る"
       has_pending_posts:
-        other: "このトピックで<b>{{count}}</b>件の投稿が承認待ちです"
+        other: このトピックで<b>{{count}}</b>件の投稿が承認待ちです
       confirm: "変更を保存"
       delete_prompt: "<b>%{username}</b> を削除してもよろしいですか? これはそのユーザーの投稿をすべて削除し、メールアドレスとIPアドレスをブロックします。"
       approval:
         title: "この投稿は承認が必要です"
         description: "新しい投稿はモデレータによる承認が必要です。しばらくお待ち下さい。"
         pending_posts:
-          other: "<strong>{{count}}</strong>件の投稿が保留中です。"
+          other: <strong>{{count}}</strong>件の投稿が保留中です。
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> が <a href='{{topicUrl}}'>トピック</a> を作成"
@@ -306,7 +303,7 @@ ja:
       posts_read: "既読"
       posts_read_long: "投稿の閲覧数"
       total_rows:
-        other: "%{count}人のユーザー"
+        other: '%{count}人のユーザー'
     group_histories:
       actions:
         change_group_setting: "グループの設定を変更"
@@ -315,22 +312,19 @@ ja:
         make_user_group_owner: "オーナーにする"
         remove_user_as_group_owner: "オーナーから削除する"
     groups:
-      logs:
-        title: "ログ"
-        when: "日時"
-        action: "アクション"
-        acting_user: "アクションしたユーザー"
-        target_user: "対象ユーザー"
-        subject: "対象"
-        details: "詳細"
-        from: "差出人"
-        to: "宛先"
-      edit:
-        title: 'グループの編集'
-        full_name: 'フルネーム'
-        add_members: "メンバーを追加"
-        delete_member_confirm: "%{group}から%{username}を削除しますか?"
-      name_placeholder: "グループネームはユーザー名と同様にスペース無し"
+      add_members:
+        title: "メンバーを追加する"
+        description: "このグループのメンバーシップを管理する"
+        usernames: "ユーザーネーム"
+      manage:
+        membership:
+          title: メンバーシップ
+          access: アクセス
+        logs:
+          title: "ログ"
+          when: "いつ"
+          action: "アクション"
+          target_user: "ターゲットユーザー"
       public_admission: "ユーザーがグループへ自由に参加できるようにする (一般公開グループである必要があります)"
       public_exit: "ユーザーがグループから自由に離脱できるようにする"
       empty:
@@ -341,13 +335,7 @@ ja:
         topics: "このグループのメンバーによるトピックはありません。"
         logs: "このグループに関するログはありません。"
       add: "追加"
-      join: "グループに参加"
-      leave: "グループから離脱"
-      request: "グループへの参加をリクエスト"
       message: "メッセージ"
-      automatic_group: 自動作成グループ
-      closed_group: クローズドグループ
-      is_group_user: "このグループのメンバーです"
       allow_membership_requests: "ユーザーがグループオーナーにメンバーシップリクエストを送信できるようにする"
       membership_request_template: "メンバーシップリクエスト送信時に表示するカスタムテンプレート"
       membership_request:
@@ -356,28 +344,19 @@ ja:
         reason: "グループに参加したい旨をグループオーナーに伝える"
       membership: "メンバーシップ"
       name: "名前"
-      user_count: "メンバー数"
       bio: "グループについて"
-      selector_placeholder: "メンバーを追加"
       owner: "オーナー"
       index:
         title: "グループ"
         empty: "表示するグループはありません。"
       title:
-        other: "グループ"
+        other: グループ
       activity: "アクティビティ"
-      members: "メンバー"
       topics: "トピック"
       posts: "投稿"
       mentions: "メンション"
       messages: "メッセージ"
       notification_level: "グループメッセージのデフォルト通知レベル"
-      visibility_levels:
-        title: "誰がこのグループを見ることができますか?"
-        public: "誰でも"
-        members: "グループのオーナー、メンバーおよび管理者"
-        staff: "グループオーナーとスタッフのみ"
-        owners: "グループオーナーと管理者のみ"
       alias_levels:
         mentionable: "誰がこのグループに@メンションを送れますか?"
         messageable: "誰がこのグループにメッセージを送れますか?"
@@ -386,9 +365,6 @@ ja:
         mods_and_admins: "管理者とモデレータのみ"
         members_mods_and_admins: "管理者、モデレータ、グループメンバーのみ"
         everyone: "だれでも"
-      trust_levels:
-        title: "以下を追加した時に自動でトラストレベルを付与する:"
-        none: "なし"
       notifications:
         watching:
           title: "ウォッチ中"
@@ -413,23 +389,21 @@ ja:
       flair_color_placeholder: "(オプション) HEXカラー値"
       flair_preview_icon: "アイコンプレビュー"
       flair_preview_image: "画像プレビュー"
-      flair_note: "アバターはユーザーのプライマリーグループにだけ表示されます。"
     user_action_groups:
-      '1': "「いいね！」 "
-      '2': "「いいね！」 された"
-      '3': "ブックマーク"
-      '4': "トピック"
-      '5': "返信"
-      '6': "反応"
-      '7': "タグ付け"
-      '9': "引用"
-      '11': "編集"
-      '12': "アイテム送信"
-      '13': "受信ボックス"
-      '14': "保留"
+      "1": "「いいね！」 "
+      "2": "「いいね！」 された"
+      "3": "ブックマーク"
+      "4": "トピック"
+      "5": "返信"
+      "6": "反応"
+      "7": "タグ付け"
+      "9": "引用"
+      "11": "編集"
+      "12": "アイテム送信"
+      "13": "受信ボックス"
+      "14": "保留"
     categories:
       all: "すべてのカテゴリ"
-      all_subcategories: "すべてのサブカテゴリ"
       no_subcategory: "サブカテゴリなし"
       category: "カテゴリ"
       category_list: "カテゴリリストを表示"
@@ -448,9 +422,9 @@ ja:
       toggle_ordering: "カテゴリの並び替えモードを切り替え"
       subcategories: "サブカテゴリ:"
       topic_sentence:
-        other: "%{count}トピック群"
+        other: '%{count}トピック群'
       topic_stat_sentence:
-        other: "過去 %{unit} 間 %{count} 個の新着トピック。"
+        other: 過去 %{unit} 間 %{count} 個の新着トピック。
     ip_lookup:
       title: IPアドレスを検索
       hostname: ホスト名
@@ -492,7 +466,6 @@ ja:
       notifications: "お知らせ"
       statistics: "統計"
       desktop_notifications:
-        label: "デスクトップ通知"
         not_supported: "申し訳ありません。そのブラウザは通知をサポートしていません。"
         perm_default: "通知を有効にする"
         perm_denied_btn: "アクセス拒否"
@@ -500,6 +473,7 @@ ja:
         disable: "通知を無効にする"
         enable: "通知を有効にする"
         each_browser_note: "注意: 利用するすべてのブラウザでこの設定を変更する必要があります"
+      dismiss: '閉じる'
       dismiss_notifications: "すべて既読にする"
       dismiss_notifications_tooltip: "全ての未読の通知を既読にします"
       first_notification: "最初の通知です! 始めるために選択してください。"
@@ -513,7 +487,9 @@ ja:
       admin: "{{user}} は管理者です"
       moderator_tooltip: "このユーザーはモデレータです"
       admin_tooltip: "このユーザーは管理者です"
+      silenced_tooltip: "このユーザーは消音状態です"
       suspended_notice: "このユーザーは {{date}} まで凍結状態です。"
+      suspended_permanently: "このユーザーは凍結されています"
       suspended_reason: "理由: "
       github_profile: "Github"
       email_activity_summary: "アクティビティの情報"
@@ -530,6 +506,8 @@ ja:
       tag_settings: "タグ"
       watched_tags: "ウォッチ中"
       watched_tags_instructions: "自動的にこれらのタグが付いた全てのトピックをウォッチします。全ての新規投稿と新規トピックが通知されまた、新規投稿数がトピックの隣に表示されます。"
+      tracked_tags: "追跡"
+      tracked_tags_instructions: "これらのタグのすべてのトピックを自動的に追跡します。 新しい投稿の数がトピックの横に表示されます。"
       muted_tags: "通知しない"
       muted_tags_instructions: "これらのタグが付いたトピックについて何も通知されず、また新着にも表示されません。"
       watched_categories: "ウォッチ中"
@@ -546,7 +524,6 @@ ja:
       delete_account: "アカウントを削除する"
       delete_account_confirm: "アカウントを削除してもよろしいですか？削除されたアカウントは復元できません。"
       deleted_yourself: "あなたのアカウントは削除されました。"
-      delete_yourself_not_allowed: "アカウントを削除できませんでした。サイトの管理者へ連絡してください。"
       unread_message_count: "メッセージ"
       admin_delete: "削除"
       users: "ユーザー"
@@ -561,6 +538,8 @@ ja:
       undo_revoke_access: "アクセス解除をやめる"
       api_approved: "承認されました:"
       theme: "テーマ"
+      home: "デフォルトホームページ"
+      staged: "段階"
       staff_counters:
         flags_given: "役に立った通報"
         flagged_posts: "通報された投稿"
@@ -635,7 +614,7 @@ ja:
         authenticated: "あなたのメールアドレスは {{provider}} によって認証されています"
         frequency_immediately: "あなたがまだ読んでいない未送信分の内容について今すぐメールを送ります。"
         frequency:
-          other: "最後に利用されてから{{count}}分以上経過した場合にメールを送ります。"
+          other: 最後に利用されてから{{count}}分以上経過した場合にメールを送ります。
       name:
         title: "名前"
         instructions: "氏名(任意)"
@@ -666,8 +645,6 @@ ja:
       created: "参加日"
       log_out: "ログアウト"
       location: "場所"
-      card_badge:
-        title: "ユーザカードバッジ"
       website: "ウェブサイト"
       email_settings: "メール"
       like_notification_frequency:
@@ -721,9 +698,8 @@ ja:
         title: "招待"
         user: "招待したユーザ"
         sent: "送信済み"
-        none: "保留中の招待はありません。"
         truncated:
-          other: "{{count}} 件の招待を表示しています。"
+          other: '{{count}} 件の招待を表示しています。'
         redeemed: "招待を確認する"
         redeemed_tab: "確認済み"
         redeemed_tab_with_count: "確認済み ({{count}})"
@@ -768,16 +744,17 @@ ja:
         title: "サマリー"
         stats: "統計"
         time_read: "読んだ時間"
+        recent_time_read: "現在のリードタイム"
         topic_count:
-          other: "つのトピックを作成"
+          other: つのトピックを作成
         post_count:
-          other: "つの投稿"
+          other: つの投稿
         days_visited:
-          other: "訪問日数"
+          other: 訪問日数
         posts_read:
-          other: "読んだ投稿"
+          other: 読んだ投稿
         bookmark_count:
-          other: "つのブックマーク"
+          other: つのブックマーク
         top_replies: "返信上位"
         no_replies: "まだ返信はありません。"
         more_replies: "その他の返信"
@@ -845,7 +822,7 @@ ja:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> はサイト設定制限 %{siteSettingRate} に到達しています。"
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> はサイト設定制限 %{siteSettingRate} を超えています。"
       rate:
-        other: "%{count} エラー/%{duration}"
+        other: '%{count} エラー/%{duration}'
     learn_more: "より詳しく..."
     all_time: '合計'
     all_time_desc: '作成されたトピックの総数'
@@ -859,6 +836,7 @@ ja:
     first_post: 最初の投稿
     mute: ミュート
     unmute: ミュート解除
+    last_post: 最終投稿
     last_reply_lowercase: 最後の返信
     replies_lowercase:
       other: 返信
@@ -914,10 +892,12 @@ ja:
       title: "ログイン"
       username: "ユーザ名"
       password: "パスワード"
+      second_factor_title: "２段階認証"
       email_placeholder: "メールアドレスかユーザ名"
       caps_lock_warning: "Caps Lockがオンになっています。"
       error: "不明なエラー"
       rate_limit: "しばらく待ってから再度ログインをお試しください。"
+      blank_username: "あなたのメールアドレスかユーザー名を入力してください。"
       blank_username_or_password: "あなたのメールアドレスかユーザ名、そしてパスワードを入力して下さい。"
       reset_password: 'パスワードをリセット'
       logging_in: "ログイン中..."
@@ -930,6 +910,7 @@ ja:
       not_allowed_from_ip_address: "このIPアドレスでログインできません"
       admin_not_allowed_from_ip_address: "そのIPアドレスからは管理者としてログインできません"
       resend_activation_email: "再度アクティベーションメールを送信するにはここをクリックしてください。"
+      omniauth_disallow_totp: "あなたのアカウントは２段階認証が有効になっています。ログインにはパスワードが必要です。"
       resend_title: "アクティベーションメールの再送"
       change_email: "メールアドレスの変更"
       provide_new_email: "新しいメールアドレスを設定します。このあと、確認のメールを送信します。"
@@ -989,6 +970,10 @@ ja:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    select_kit:
+      default_header_text: 選択...
+      no_content: 一致する項目が見つかりませんでした
+      filter_placeholder: 検索...
     emoji_picker:
       filter_placeholder: 絵文字を探す
       people: ピープル
@@ -1023,7 +1008,7 @@ ja:
       similar_topics: "このトピックに似ているものは..."
       drafts_offline: "オフラインの下書き"
       group_mentioned:
-        other: "{{group}}へのメンションで、 約<a href='{{group_link}}'>{{count}} 人</a> へ通知されます。よろしいですか？"
+        other: '{{group}}へのメンションで、 約<a href=''{{group_link}}''>{{count}} 人</a> へ通知されます。よろしいですか？'
       cannot_see_mention:
         category: "{{username}}にメンションしましたが、このカテゴリへのアクセス権がないため通知されません。このカテゴリへのアクセス権があるグループにメンバー追加してください。"
         private: "{{username}}にメンションしましたが、このパーソナルメッセージを見ることができないため通知されません。このパーソナルメッセージに招待してください。"
@@ -1050,6 +1035,7 @@ ja:
       edit_reason_placeholder: "編集する理由は何ですか?"
       show_edit_reason: "(編集理由を追加)"
       topic_featured_link_placeholder: "タイトルにリンクを入力してください。"
+      remove_featured_link: "トピックからリンクを削除する。"
       reply_placeholder: "文章を入力してください。 Markdown, BBコード, HTMLが使用出来ます。 画像はドラッグアンドドロップで貼り付けられます。"
       view_new_post: "新しい投稿を見る。"
       saving: "保存中"
@@ -1103,7 +1089,7 @@ ja:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        other: "<span>{{username}}, {{username2}} 、他 {{count}} 人</span> {{description}}"
+        other: <span>{{username}}, {{username2}} 、他 {{count}} 人</span> {{description}}
       private_message: "<span>{{username}}</span> {{description}}"
       invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
       invited_to_topic: "<span>{{username}}</span> {{description}}"
@@ -1114,29 +1100,13 @@ ja:
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>新しいトピック</span> {{description}}"
       group_message_summary:
-        other: "{{group_name}} 宛のメッセージが {{count}} 通あります"
-      alt:
-        mentioned: "メンションされました: "
-        quoted: "引用されました: "
-        replied: "リプライ"
-        posted: "投稿者 "
-        edited: "投稿の編集者: "
-        liked: "あなたの投稿をいいねしました"
-        private_message: "プライベートメッセージを受け取りました: "
-        invited_to_private_message: "プライベートメッセージへ招待されました: "
-        invited_to_topic: "トピックに招待されました: "
-        invitee_accepted: "招待が承認されました: "
-        moved_post: "投稿を移動しました: "
-        linked: "あなたの投稿にリンク"
-        granted_badge: "バッジを付与"
-        group_message_summary: "グループ宛のメッセージがあります"
+        other: '{{group_name}} 宛のメッセージが {{count}} 通あります'
       popup:
         mentioned: '"{{topic}}"で{{username}} にメンションされました - {{site_title}}'
         group_mentioned: '"{{topic}}"で{{username}} にメンションされました - {{site_title}}'
         quoted: '"{{topic}}"で{{username}}が引用しました - {{site_title}}'
         replied: '{{username}}が"{{topic}}"へ返信しました - {{site_title}}'
         posted: '{{username}} が投稿しました "{{topic}}" - {{site_title}}'
-        private_message: '"{{topic}}"で{{username}}からプライベートメッセージが届きました - {{site_title}}'
         linked: '"{{topic}}"にあるあなたの投稿に{{username}}がリンクしました - {{site_title}}'
     upload_selector:
       title: "画像のアップロード"
@@ -1237,7 +1207,7 @@ ja:
         notification_level: "通知"
         choose_new_category: "このトピックの新しいカテゴリを選択してください"
         selected:
-          other: "あなたは <b>{{count}}</b> トピックを選択しました。"
+          other: あなたは <b>{{count}}</b> トピックを選択しました。
         change_tags: "タグを付け替える"
         append_tags: "タグを追加する"
         choose_new_tags: "これらのトピックの新しいタグを選択してください"
@@ -1269,11 +1239,8 @@ ja:
         bookmarks: "ブックマーク済みのトピックはこれ以上ありません。"
         search: "検索結果は以上です。"
     topic:
-      unsubscribe:
-        stop_notifications: " <strong>{{title}}</strong>の通知を受け取らなくなります"
-        change_notification_state: "あなたへの通知状況は"
       filter_to:
-        other: "トピック内の {{count}} 件を表示"
+        other: トピック内の {{count}} 件を表示
       create: '新規トピック'
       create_long: '新しいトピックの作成'
       private_message: 'メッセージを書く'
@@ -1302,13 +1269,13 @@ ja:
         title: "トピックが見つかりませんでした"
         description: "申し訳ありませんがトピックが見つかりませんでした。モデレータによって削除された可能性があります。"
       total_unread_posts:
-        other: "このトピックに未読のポストが{{count}}つあります。"
+        other: このトピックに未読のポストが{{count}}つあります。
       unread_posts:
-        other: "このトピックに未読のポストが{{count}}つあります。"
+        other: このトピックに未読のポストが{{count}}つあります。
       new_posts:
-        other: "前回閲覧時より、このトピックに新しいポストが{{count}}個投稿されています"
+        other: 前回閲覧時より、このトピックに新しいポストが{{count}}個投稿されています
       likes:
-        other: "このトピックには{{count}}個「いいね！」がついています"
+        other: このトピックには{{count}}個「いいね！」がついています
       back_to_list: "トピックリストに戻る"
       options: "トピックオプション"
       show_links: "このトピック内のリンクを表示"
@@ -1318,7 +1285,7 @@ ja:
       read_more_MF: "{ UNREAD, plural, =0 {} one { <a href='/unread'>未読 1つ</a> } other { <a href='/unread'>未読 #つ</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{} false {} other{}} <a href='/new'>新規トピック 1つ</a>} other { {BOTH, select, true{} false {} other{}} <a href='/new'>新規トピック #つ</a>} } remaining, or {CATEGORY, select, true {{catLink}の他のトピックを読む} false {{latestLink}} other {}}"
       browse_all_categories: 全てのカテゴリを閲覧する
       view_latest_topics: 最新のトピックを見る
-      suggest_create_topic: 新しいトピックを作成しませんか?
+      suggest_create_topic: "新しいトピックを作成しませんか?"
       jump_reply_up: 以前の返信へジャンプ
       jump_reply_down: 以後の返信へジャンプ
       deleted: "トピックは削除されました"
@@ -1363,7 +1330,7 @@ ja:
         auto_reminder: "このトピックについて、%{timeLeft} 後にリマインドします。"
       auto_close_title: 'オートクローズの設定'
       auto_close_immediate:
-        other: "このトピックは最終投稿からすでに%{count}時間経過しているため、すぐにクローズされます。"
+        other: このトピックは最終投稿からすでに%{count}時間経過しているため、すぐにクローズされます。
       timeline:
         back: "戻る"
         back_description: "未読の最終投稿へ戻る"
@@ -1384,19 +1351,19 @@ ja:
         title: このトピックに関する通知頻度を変更
         reasons:
           mailing_list_mode: "メーリングリストモードになっているため、このトピックへの返信はメールで送られます。"
-          '3_10': 'このトピックのタグをウォッチしているため通知されます。'
-          '3_6': 'このカテゴリをウォッチしているため通知されます。'
-          '3_5': 'このトピックをウォッチし始めたため通知されます。'
-          '3_2': 'このトピックをウォッチしているため通知されます。'
-          '3_1': 'このトピックを作成したため通知されます。'
-          '3': 'このトピックをウォッチしているため通知されます。'
-          '2_4': 'このトピックに返信したので、新たな返信のカウント数が表示されます。'
-          '2': '<a href="/u/{{username}}/preferences">このトピックを購読中なので</a>、新たな返信のカウント数が表示されます。'
-          '1_2': '他のユーザからメンションされた場合か、メッセージ内の投稿に返信された場合に通知されます。'
-          '1': '他のユーザからメンションされた場合か、メッセージ内の投稿に返信された場合に通知されます。'
-          '0_7': 'このカテゴリに関して一切通知を受け取りません。'
-          '0_2': 'このトピックに関して一切通知を受け取りません。'
-          '0': 'このトピックに関して一切通知を受け取りません。'
+          "3_10": 'このトピックのタグをウォッチしているため通知されます。'
+          "3_6": 'このカテゴリをウォッチしているため通知されます。'
+          "3_5": 'このトピックをウォッチし始めたため通知されます。'
+          "3_2": 'このトピックをウォッチしているため通知されます。'
+          "3_1": 'このトピックを作成したため通知されます。'
+          "3": 'このトピックをウォッチしているため通知されます。'
+          "2_4": 'このトピックに返信したので、新たな返信のカウント数が表示されます。'
+          "2": '<a href="/u/{{username}}/preferences">このトピックを購読中なので</a>、新たな返信のカウント数が表示されます。'
+          "1_2": '他のユーザからメンションされた場合か、メッセージ内の投稿に返信された場合に通知されます。'
+          "1": '他のユーザからメンションされた場合か、メッセージ内の投稿に返信された場合に通知されます。'
+          "0_7": 'このカテゴリに関して一切通知を受け取りません。'
+          "0_2": 'このトピックに関して一切通知を受け取りません。'
+          "0": 'このトピックに関して一切通知を受け取りません。'
         watching_pm:
           title: "ウォッチ中"
           description: "未読件数と新しい投稿がトピックの横に表示されます。このトピックに対して新しい投稿があった場合に通知されます。"
@@ -1436,7 +1403,6 @@ ja:
         visible: "リストに表示"
         reset_read: "読み込みデータをリセット"
         make_public: "公開トピックへ変更"
-        make_private: "プライベートメッセージへ変更"
       feature:
         pin: "トピックを固定表示"
         unpin: "トピックの固定表示を解除"
@@ -1469,7 +1435,7 @@ ja:
         pin_validation: "このトピックを固定表示するためには日付を指定してください。"
         not_pinned: "{{categoryLink}}で固定表示されているトピックはありません。"
         already_pinned:
-          other: "{{categoryLink}}で固定表示されているトピック: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: '{{categoryLink}}で固定表示されているトピック: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         pin_globally: "このトピックをすべてのトピックリストのトップに表示する"
         confirm_pin_globally: "全体で既に {{count}} トピックを固定表示しています。固定表示が多すぎると、新規あるいは匿名ユーザの負担になる場合があります。このカテゴリにおいてさらに固定表示設定してもよいですか？"
         unpin_globally: "トピック一覧のトップからこのトピックを削除します"
@@ -1477,7 +1443,7 @@ ja:
         global_pin_note: "ユーザはトピックを個別に固定表示解除することができます。"
         not_pinned_globally: "全体で固定表示されているトピックはありません。"
         already_pinned_globally:
-          other: "全体で固定表示されているトピック: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: '全体で固定表示されているトピック: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         make_banner: "このトピックを全てのページのバナーに表示します"
         remove_banner: "全てのページのバナーを削除します"
         banner_note: "ユーザはバナーを閉じることができます。常に１つのトピックだけがバナー表示されます"
@@ -1514,7 +1480,7 @@ ja:
       login_reply: 'ログインして返信'
       filters:
         n_posts:
-          other: "{{count}} 件"
+          other: '{{count}} 件'
         cancel: "フィルター削除"
       split_topic:
         title: "新規トピックに移動"
@@ -1522,13 +1488,13 @@ ja:
         topic_name: "新規トピック名:"
         error: "投稿の新規トピックへの移動中にエラーが発生しました。"
         instructions:
-          other: "新たにトピックを作成し、選択した<b>{{count}}</b>個の投稿をこのトピックに移動しようとしています。"
+          other: 新たにトピックを作成し、選択した<b>{{count}}</b>個の投稿をこのトピックに移動しようとしています。
       merge_topic:
         title: "既存トピックに移動"
         action: "既存トピックに移動"
         error: "指定されたトピックへの投稿移動中にエラーが発生しました。"
         instructions:
-          other: "<b>{{count}}</b>個の投稿をどのトピックに移動するか選択してください。"
+          other: <b>{{count}}</b>個の投稿をどのトピックに移動するか選択してください。
       merge_posts:
         title: "選択した投稿を統合"
         action: "選択した投稿を統合"
@@ -1540,8 +1506,7 @@ ja:
         label: "投稿の新しいオーナー"
         placeholder: "新しい所有者のユーザ名"
         instructions:
-          other: "この {{count}} つの投稿の新しいオーナーを選択してください。（前のオーナー：<b>{{old_user}}</b>）"
-        instructions_warn: "この投稿についての通知が新しいユーザにさかのぼって移動されることはないので注意してください。<br>警告: 投稿の関連データの所有権は、新しいユーザに転送されません。 注意して使用してください。"
+          other: この {{count}} つの投稿の新しいオーナーを選択してください。（前のオーナー：<b>{{old_user}}</b>）
       change_timestamp:
         title: "タイムスタンプを変更してください。"
         action: "タイムスタンプを変更"
@@ -1558,8 +1523,6 @@ ja:
         description:
           other: <b>{{count}}</b>個の投稿を選択中。
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "引用"
       edit_reason: "理由: "
       post_number: "投稿{{number}}"
@@ -1572,20 +1535,20 @@ ja:
       show_full: "全て表示"
       show_hidden: '隠されたコンテンツを表示する'
       deleted_by_author:
-        other: "(投稿は投稿者により削除されました。何らかの通報がされていない限り、%{count}時間後に自動的に削除されます)"
+        other: (投稿は投稿者により削除されました。何らかの通報がされていない限り、%{count}時間後に自動的に削除されます)
       expand_collapse: "開く/折りたたみ"
       gap:
-        other: "{{count}}個の返信をすべて表示する"
+        other: '{{count}}個の返信をすべて表示する'
       unread: "未読の投稿"
       has_replies:
-        other: "{{count}} 件の返信"
+        other: '{{count}} 件の返信'
       has_likes:
-        other: "{{count}} 個のいいね！"
+        other: '{{count}} 個のいいね！'
       has_likes_title:
-        other: "{{count}}人のユーザがこの返信に「いいね！」しました"
+        other: '{{count}}人のユーザがこの返信に「いいね！」しました'
       has_likes_title_only_you: "あなたがいいねした投稿"
       has_likes_title_you:
-        other: "あなたと{{count}} 人の人がこの投稿に「いいね！」しました。"
+        other: あなたと{{count}} 人の人がこの投稿に「いいね！」しました。
       errors:
         create: "申し訳ありませんが、投稿中にエラーが発生しました。もう一度やり直してください。"
         edit: "申し訳ありませんが、投稿の編集中にエラーが発生しました。もう一度やり直してください。"
@@ -1657,41 +1620,41 @@ ja:
           vote: "この投稿に投票しました"
         by_you_and_others:
           off_topic:
-            other: "あなたと他{{count}}名が関係無い話題として通報しました"
+            other: あなたと他{{count}}名が関係無い話題として通報しました
           spam:
-            other: "あなたと他{{count}}名がスパム報告として通報しました"
+            other: あなたと他{{count}}名がスパム報告として通報しました
           inappropriate:
-            other: "あなたと他{{count}}名が不適切な発言として通報しました"
+            other: あなたと他{{count}}名が不適切な発言として通報しました
           notify_moderators:
-            other: "あなたと他{{count}}名がスタッフの確認が必要として通報しました"
+            other: あなたと他{{count}}名がスタッフの確認が必要として通報しました
           notify_user:
-            other: "あなたと他{{count}}人がこのユーザにメッセージを送信しました"
+            other: あなたと他{{count}}人がこのユーザにメッセージを送信しました
           bookmark:
-            other: "あなたと他{{count}}人がこの投稿をブックマークしました"
+            other: あなたと他{{count}}人がこの投稿をブックマークしました
           like:
-            other: "あなたと他{{count}}人が「いいね！」しました"
+            other: あなたと他{{count}}人が「いいね！」しました
           vote:
-            other: "あなたと他{{count}}人がこの投稿に投票しました"
+            other: あなたと他{{count}}人がこの投稿に投票しました
         by_others:
           off_topic:
-            other: "{{count}}名のユーザが関係無い話題として通報しました"
+            other: '{{count}}名のユーザが関係無い話題として通報しました'
           spam:
-            other: "{{count}}名のユーザがスパム報告として通報しました"
+            other: '{{count}}名のユーザがスパム報告として通報しました'
           inappropriate:
-            other: "{{count}}名のユーザが不適切な発言として通報しました"
+            other: '{{count}}名のユーザが不適切な発言として通報しました'
           notify_moderators:
-            other: "{{count}}名のユーザがスタッフの確認が必要として通報しました"
+            other: '{{count}}名のユーザがスタッフの確認が必要として通報しました'
           notify_user:
-            other: "{{count}} 人がこのユーザにメッセージを送信しました"
+            other: '{{count}} 人がこのユーザにメッセージを送信しました'
           bookmark:
-            other: "{{count}}人のユーザがこの投稿をブックマークしました"
+            other: '{{count}}人のユーザがこの投稿をブックマークしました'
           like:
-            other: "{{count}}人のユーザが「いいね！」しました"
+            other: '{{count}}人のユーザが「いいね！」しました'
           vote:
-            other: "{{count}}人のユーザがこのポストに投票しました"
+            other: '{{count}}人のユーザがこのポストに投票しました'
       merge:
         confirm:
-          other: "これらの{{count}}の投稿を統合したいですか?"
+          other: これらの{{count}}の投稿を統合したいですか?
       revisions:
         controls:
           first: "最初のリビジョン"
@@ -1793,6 +1756,13 @@ ja:
           description: "他のユーザからメンションされた場合や、投稿に返信された場合に通知されます。"
         muted:
           title: "ミュート中"
+      sort_options:
+        views: "表示"
+        posts: "投稿"
+        activity: "アクティビティー"
+        posters: "投稿者"
+        category: "カテゴリ"
+        created: "作成者"
     flagging:
       title: '報告していただきありがとうございます。'
       action: '投稿を通報'
@@ -1815,11 +1785,11 @@ ja:
       custom_placeholder_notify_moderators: "特にどのような問題が発生しているか記入して下さい。可能なら、関連するリンクなどを教えて下さい。"
       custom_message:
         at_least:
-          other: "少なくとも{{count}}文字入力してください"
+          other: 少なくとも{{count}}文字入力してください
         more:
-          other: "あと{{count}}文字..."
+          other: あと{{count}}文字...
         left:
-          other: "残り{{count}}文字"
+          other: 残り{{count}}文字
     flagging_topic:
       title: "報告していただきありがとうございます。"
       action: "トピックを通報"
@@ -1830,11 +1800,11 @@ ja:
       links_title: "人気のリンク"
       links_shown: "さらにリンクを表示する"
       clicks:
-        other: "%{count} クリック"
+        other: '%{count} クリック'
     post_links:
       about: "この投稿のリンクをもっと見る"
       title:
-        other: "%{count} リンク"
+        other: '%{count} リンク'
     topic_statuses:
       warning:
         help: "これは運営スタッフからの警告です。"
@@ -1868,18 +1838,18 @@ ja:
     original_post: "オリジナルの投稿"
     views: "閲覧"
     views_lowercase:
-      other: " 閲覧"
+      other: ' 閲覧'
     replies: "返信"
     views_long:
-      other: "このトピックは{{number}}回閲覧されました"
+      other: このトピックは{{number}}回閲覧されました
     activity: "アクティビティ"
     likes: "いいね！"
     likes_lowercase:
-      other: "いいね！"
+      other: いいね！
     likes_long: "このトピックには{{number}}つ「いいね！」がついています"
     users: "ユーザ"
     users_lowercase:
-      other: "ユーザ"
+      other: ユーザ
     category_title: "カテゴリ"
     history: "History"
     changed_by: "by {{author}}"
@@ -1893,7 +1863,7 @@ ja:
       latest:
         title: "最新"
         title_with_count:
-          other: "最新の投稿 ({{count}})"
+          other: 最新の投稿 ({{count}})
         help: "最新のトピック"
       hot:
         title: "ホット"
@@ -1911,17 +1881,17 @@ ja:
       unread:
         title: "未読"
         title_with_count:
-          other: "未読 ({{count}})"
+          other: 未読 ({{count}})
         help: "未読投稿のあるトピック"
         lower_title_with_count:
-          other: "{{count}} 未読"
+          other: '{{count}} 未読'
       new:
         lower_title_with_count:
-          other: "{{count}}件"
+          other: '{{count}}件'
         lower_title: "NEW"
         title: "新着"
         title_with_count:
-          other: "最新 ({{count}})"
+          other: 最新 ({{count}})
         help: "最近投稿されたトピック"
       posted:
         title: "自分の投稿"
@@ -1932,7 +1902,7 @@ ja:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          other: "{{categoryName}} ({{count}})"
+          other: '{{categoryName}} ({{count}})'
         help: "{{categoryName}} カテゴリの最新トピック"
       top:
         title: "トップ"
@@ -2019,7 +1989,7 @@ ja:
       others_count: "その他のバッジ所有者(%{count})"
       title: バッジ
       badge_count:
-        other: "%{count}個のバッジ"
+        other: '%{count}個のバッジ'
     google_search: |
       <h3>Googleで検索</h3>
       <p>
@@ -2035,12 +2005,33 @@ ja:
           title: "ウォッチ中"
         watching_first_post:
           title: "最初の投稿をウォッチする"
-          description: "このタグの新規トピックに対する最初の投稿のみ通知されます。"
+      groups:
+        parent_tag_label: "親タグ:"
+        parent_tag_placeholder: "任意"
+        save: "保存する"
+        delete: "削除する"
+        confirm_delete: "このタググループを削除してもよろしいですか？"
       topics:
         none:
+          unread: "未読のトピックはありません。"
+          new: "新着トピックはありません。"
+          read: "あなたはまだ、どのトピックも読んでいません。"
+          posted: "あなたはまだ、どのトピックにも投稿していません。"
           latest: "最新のトピックはありません。"
+          hot: "ホットなトピックはありません。"
+          bookmarks: "ブックマークしたトピックはありません。"
+          top: "トップトピックはありません。"
+          search: "検索結果はありません。"
         bottom:
           latest: "最新のトピックは以上です。"
+          hot: "ホットなトピックは以上です。"
+          posted: "投稿のあるトピックは以上です。"
+          read: "既読のトピックは以上です。"
+          new: "新着トピックは以上です。"
+          unread: "未読のトピックは以上です。"
+          top: "トップトピックは以上です。"
+          bookmarks: "ブックマーク済みのトピックは以上です。"
+          search: "検索結果は以上です。"
   admin_js:
     type_to_filter: "設定項目を検索..."
     admin:
@@ -2080,8 +2071,6 @@ ja:
         reports:
           today: "今日"
           yesterday: "昨日"
-          last_7_days: "過去7日"
-          last_30_days: "過去30日"
           all_time: "All Time"
           7_days_ago: "7日前"
           30_days_ago: "30日前"
@@ -2098,7 +2087,6 @@ ja:
         title: "通報"
         agree: "賛成する"
         agree_title: "この通報が有効で正しいことを確認してください"
-        defer_flag_title: "通報を削除します。何も行いません。"
         delete: "削除する"
         delete_title: "この通報で通報されている投稿を削除します"
         delete_post_defer_flag_title: "投稿を削除します。最初の投稿を削除した場合、トピックも削除されます。"
@@ -2129,33 +2117,24 @@ ja:
         visit_topic: "トピックを確認"
         was_edited: "最初の通報後に編集された投稿"
         previous_flags_count: "この投稿は既に {{count}} 回通報されています"
+        flagged_topics:
+          topic: "トピック"
       groups:
         primary: "プライマリーグループ"
         no_primary: "（プライマリーグループなし）"
         title: "グループ"
         edit: "グループの編集"
         refresh: "更新"
-        new: "新規"
-        selector_placeholder: "ユーザ名を入力"
         about: "グループメンバーとグループ名を編集"
         group_members: "グループメンバー"
         delete: "削除"
         delete_confirm: "このグループを削除しますか?"
         delete_failed: "グループの削除に失敗しました。自動作成グループを削除することはできません。"
         add: "追加"
-        add_members: "メンバーを追加"
         custom: "カスタム"
-        bulk: "グループに一括追加"
-        bulk_paste: "1行ごとにユーザ名またはメールアドレスを貼り付けてください:"
-        bulk_select: "(グループを選択)"
         automatic: "自動で作成されたグループ"
-        automatic_membership_email_domains: "リスト内のメールアドレスのドメインに正確に一致したユーザは自動的にグループに追加される"
-        automatic_membership_retroactive: "同じメールアドレスドメインのルールを既に登録済みのユーザにも適用"
-        default_title: "このグループのすべてのユーザーのデフォルトタイトル"
-        primary_group: "自動的にプライマリグループとして設定"
         group_owners: オーナー
         add_owners: オーナーを追加
-        incoming_email_placeholder: "メールアドレスを入力"
       api:
         generate_master: "マスターAPIキーを生成"
         none: "現在アクティブなAPIキーが存在しません。"
@@ -2211,7 +2190,6 @@ ja:
           label: "アップロード"
           title: "このインスタンスにバックアップをアップロード"
           uploading: "アップロード中..."
-          success: "ファイル'{{filename}}' がアップロードされました。"
           error: "ファイル '{{filename}}'アップロードエラー: {{message}}"
         operations:
           is_running: "バックアップ作業を実行中..."
@@ -2224,7 +2202,6 @@ ja:
             label: "バックアップ"
             title: "バックアップを行います"
             confirm: "新しくバックアップを行ってもよろしいですか？"
-            without_uploads: "はい(ファイルは含まない)"
           download:
             label: "ダウンロード"
             title: "ダウンロードリンクをメールで送る"
@@ -2524,9 +2501,9 @@ ja:
           suspect: 'マーク中'
         approved: "承認?"
         approved_selected:
-          other: "承認ユーザ ({{count}})"
+          other: 承認ユーザ ({{count}})
         reject_selected:
-          other: "拒否ユーザ ({{count}})"
+          other: 拒否ユーザ ({{count}})
         titles:
           active: 'アクティブユーザ'
           new: '新しいユーザ'
@@ -2542,9 +2519,9 @@ ja:
           suspended: '凍結中のユーザ'
           suspect: 'マーク中のユーザ'
         reject_successful:
-          other: "%{count}人のユーザの拒否に成功しました。"
+          other: '%{count}人のユーザの拒否に成功しました。'
         reject_failures:
-          other: "%{count}人のユーザの拒否に失敗しました。"
+          other: '%{count}人のユーザの拒否に失敗しました。'
         not_verified: "検証されていません"
         check_email:
           title: "メールアドレスを表示する"
@@ -2557,6 +2534,15 @@ ja:
         suspend_reason: "理由"
         suspend_reason_placeholder: "凍結理由"
         suspended_by: "凍結したユーザ"
+        silence_reason: "理由"
+        silenced_by: "消音化したユーザ"
+        silence_duration: "ユーザーはどのくらいの間、消音化されますか？"
+        silence_reason_label: "なぜあなたはこのユーザーを消音化させますか？"
+        silence_reason_placeholder: "消音化の理由"
+        silence_message: "メールメッセージ"
+        silence_message_placeholder: "(デフォルトのメッセージを送信する場合は空白のままにします)"
+        suspended_until: "(%{until}まで)"
+        cant_suspend: "このユーザーは凍結できません。"
         delete_all_posts: "全ての投稿を削除"
         moderator: "モデレータ権限の所有"
         admin: "管理者権限の所有"
@@ -2603,11 +2589,11 @@ ja:
         delete_forbidden_because_staff: "管理者およびモデレータアカウントは削除できません。"
         delete_posts_forbidden_because_staff: "管理者、モデレータの全ての投稿は削除できません"
         delete_forbidden:
-          other: "投稿済のユーザは削除できません。ユーザを削除する前に全ての投稿を削除してください。(%{count}日以上経過した投稿は削除できません )"
+          other: 投稿済のユーザは削除できません。ユーザを削除する前に全ての投稿を削除してください。(%{count}日以上経過した投稿は削除できません )
         cant_delete_all_posts:
-          other: "全ての投稿を削除できませんでした。%{count}日以上経過した投稿があります。(設定: delete_user_max_post_age)"
+          other: '全ての投稿を削除できませんでした。%{count}日以上経過した投稿があります。(設定: delete_user_max_post_age)'
         cant_delete_all_too_many_posts:
-          other: "全ての投稿を削除できませんでした。ユーザは%{count} 件以上投稿しています。(delete_all_posts_max)"
+          other: 全ての投稿を削除できませんでした。ユーザは%{count} 件以上投稿しています。(delete_all_posts_max)
         delete_confirm: "このユーザを削除してもよろしいですか？"
         delete_and_block: "アカウントを削除し、同一メールアドレス及びIPアドレスからのサインアップを<b>ブロックします</b>"
         delete_dont_block: "削除する"
@@ -2716,10 +2702,7 @@ ja:
         recommended: "それぞれにあわせて、文章を変えることをオススメします:"
         show_overriden: '上書き部分のみ表示'
       site_settings:
-        show_overriden: '上書き部分のみ表示'
         title: '設定'
-        reset: 'デフォルトに戻す'
-        none: 'なし'
         no_results: "何も見つかりませんでした。"
         clear_filter: "クリア"
         add_url: "URL追加"
@@ -2771,7 +2754,7 @@ ja:
         delete_confirm: このバッジを削除してもよろしいですか？
         revoke: 取り消す
         reason: 理由
-        expand: '&hellipを展開'
+        expand: "&hellipを展開"
         revoke_confirm: このバッジを取り消しますか？
         edit_badges: バッジを編集する
         grant_badge: バッジを付与
@@ -2786,7 +2769,6 @@ ja:
         enabled: バッジを有効にする
         icon: アイコン
         image: 画像
-        icon_help: "Font Awesomeのクラスか画像のURLを使用してください"
         query: バッジクエリ(SQL)
         target_posts: 投稿を対象
         auto_revoke: 毎日クエリの取り消しを実行
@@ -2810,13 +2792,13 @@ ja:
             text: "There are missing grant samples. This happens when the badge query returns user IDs or post IDs that do not exist. This may cause unexpected results later on - please double-check your query."
           no_grant_count: "付与されたバッジはありません"
           grant_count:
-            other: "<b>%{count}</b>個のバッジが付与されています"
+            other: <b>%{count}</b>個のバッジが付与されています
           sample: "サンプル："
           grant:
-            with: <span class="username">%{username}</span>
-            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>
+            with: "<span class=\"username\">%{username}</span>"
+            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:
         title: "絵文字"
         help: "各ユーザが利用できる絵文字を追加します。 (ちょっとしたコツ: ドラッグアンドドロップで複数のファイルを一度にアップロードできます)"
@@ -2866,7 +2848,7 @@ ja:
       uploading: "アップロード中..."
       quit: "後で"
       staff_count:
-        other: "あなたのコミュニティには、あなたを含めて %{count} 名のスタッフがいます。"
+        other: あなたのコミュニティには、あなたを含めて %{count} 名のスタッフがいます。
       invites:
         add_user: "追加"
         none_added: "あなたはスタッフを招待していません。 続行してもよろしいですか？"
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index 581fbf42b5a..94e7cda5963 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -42,49 +42,49 @@ ko:
       tiny:
         half_a_minute: "< 1분"
         less_than_x_seconds:
-          other: "< %{count}초"
+          other: < %{count}초
         x_seconds:
-          other: "%{count}초 전"
+          other: '%{count}초 전'
         less_than_x_minutes:
-          other: "< %{count}분"
+          other: < %{count}분
         x_minutes:
-          other: "%{count}분 전"
+          other: '%{count}분 전'
         about_x_hours:
-          other: "%{count}시간"
+          other: '%{count}시간'
         x_days:
-          other: "%{count}일 전"
+          other: '%{count}일 전'
         x_months:
-          other: "%{count}달"
+          other: '%{count}달'
         about_x_years:
-          other: "%{count}년"
+          other: '%{count}년'
         over_x_years:
-          other: "> %{count}년"
+          other: '> %{count}년'
         almost_x_years:
-          other: "%{count}년"
+          other: '%{count}년'
         date_month: "MMM D"
         date_year: "'YY MMM"
       medium:
         x_minutes:
-          other: "%{count}분"
+          other: '%{count}분'
         x_hours:
-          other: "%{count}시간"
+          other: '%{count}시간'
         x_days:
-          other: "%{count}일"
+          other: '%{count}일'
         date_year: "'YY MMM D"
       medium_with_ago:
         x_minutes:
-          other: "%{count}분 전"
+          other: '%{count}분 전'
         x_hours:
-          other: "%{count}시간 전"
+          other: '%{count}시간 전'
         x_days:
-          other: "%{count}일 전"
+          other: '%{count}일 전'
       later:
         x_days:
-          other: "%{count}일 후"
+          other: '%{count}일 후'
         x_months:
-          other: "%{count}달 후"
+          other: '%{count}달 후'
         x_years:
-          other: "%{count}년 후"
+          other: '%{count}년 후'
       previous_month: '지난 달'
       next_month: '다음 달'
     share:
@@ -97,7 +97,6 @@ ko:
       email: '이메일로 공유'
     action_codes:
       public_topic: "이 토픽을 %{when} 에 공개"
-      private_topic: "이 토픽을 %{when} 에 비공개"
       split_topic: "이 토픽을 %{when}에 분리"
       invited_user: "%{who}이(가) %{when}에 초대됨"
       invited_group: "%{who} 이(가) %{when} 에 초대됨"
@@ -122,13 +121,11 @@ ko:
         enabled: '%{when} 목록에 게시'
         disabled: '%{when} 목록에서 감춤'
       banner:
-        enabled: 'made this a banner %{when}. It will appear at the top of every page until it is dismissed by the user.'
+        enabled: '%{when} 이 내용을 배너로 만드세요 . 사용자가 제거하지 않을 때 까지 배너는 모든 페이지 상단에 노출됩니다.'
         disabled: '이 배너를 제거했습니다 %{when}. 더 이상 모든 페이지의 상단에 표시되지 않습니다.'
     topic_admin_menu: "토픽 관리"
     wizard_required: "새로운 Discourse에 오신것을 환영합니다! <a href='%{url}' data-auto-route='true'>설치 마법사</a> 로 시작해봅시다✨"
     emails_are_disabled: "관리자가 이메일 송신을 전체 비활성화 했습니다. 어떤 종류의 이메일 알림도 보내지지 않습니다."
-    bootstrap_mode_enabled: "쉬운 시작을 위해 부트스트랩 모드로 구동 되었습니다. 모든 새로운 사용자에게 신뢰 수준 1이 부여되고 매일 이메일 다이제스트가 보내집니다. 이 기능은 총 사용자 수가 %{min_users}를 초과 할 때 자동으로 꺼집니다."
-    bootstrap_mode_disabled: "부트스트랩 모드는 24시간 뒤 비활성화 될 것입니다."
     themes:
       default_description: "기본값"
     s3:
@@ -164,7 +161,7 @@ ko:
     show_help: "옵션"
     links: "링크"
     links_lowercase:
-      other: "링크"
+      other: 링크
     faq: "FAQ"
     guidelines: "가이드라인"
     privacy_policy: "개인보호 정책"
@@ -188,7 +185,7 @@ ko:
     max_of_count: "최대 {{count}}"
     alternation: "또는"
     character_count:
-      other: "{{count}} 자"
+      other: '{{count}} 자'
     suggested_topics:
       title: "추천 토픽"
       pm_title: "추천 메세지"
@@ -200,8 +197,6 @@ ko:
       our_moderators: "운영자"
       stat:
         all_time: "전체"
-        last_7_days: "지난 7일"
-        last_30_days: "최근 30일"
       like_count: "좋아요"
       topic_count: "토픽"
       post_count: "게시글"
@@ -222,13 +217,6 @@ ko:
       last_read: "마지막으로 읽으신 게시물입니다. 즐겨찾기에 추가하려면 클릭하세요."
       remove: "북마크 삭제"
       confirm_clear: "정말로 이 토픽의 모든 북마크를 제거할까요?"
-    topic_count_latest:
-      other: "{{count}}개의 새 토픽이나 업데이트된 토픽"
-    topic_count_unread:
-      other: "{{count}}개의 읽지 않은 토픽"
-    topic_count_new:
-      other: "{{count}}개의 새로운 토픽"
-    click_to_show: "보려면 클릭하세요."
     preview: "미리보기"
     cancel: "취소"
     save: "변경사항 저장"
@@ -264,14 +252,14 @@ ko:
       cancel: "취소"
       view_pending: "대기중인 게시글"
       has_pending_posts:
-        other: "이 토픽에는 <b>{{count}}</b>개의 승인 대기중인 포스트가 있습니다"
+        other: 이 토픽에는 <b>{{count}}</b>개의 승인 대기중인 포스트가 있습니다
       confirm: "변경사항 저장"
       delete_prompt: "정말로 <b>%{username}</b>; 회원을 삭제하시겠습니까? 게시글이 모두 삭제되고 IP와 이메일이 차단됩니다."
       approval:
         title: "게시글 승인 필요"
         description: "새로운 게시글이 있습니다. 그러나 이 게시글이 보여지려면 운영자의 승인이 필요합니다."
         pending_posts:
-          other: "대기중인 게시글이 <strong>{{count}}</strong>개 있습니다."
+          other: 대기중인 게시글이 <strong>{{count}}</strong>개 있습니다.
         ok: "확인"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a>님이 <a href='{{topicUrl}}'>토픽</a>을 게시했습니다"
@@ -305,7 +293,7 @@ ko:
       posts_read: "읽음"
       posts_read_long: "게시글 읽음"
       total_rows:
-        other: "%{count} 사용자"
+        other: '%{count} 사용자'
     group_histories:
       actions:
         change_group_setting: "그룹 설정 변경"
@@ -314,22 +302,6 @@ ko:
         make_user_group_owner: "소유자로 지정하기"
         remove_user_as_group_owner: "소유자 지정 취소하기"
     groups:
-      logs:
-        title: "로그"
-        when: "언제"
-        action: "액션"
-        acting_user: "활동하는 사용자"
-        target_user: "대상 사용자"
-        subject: "제목"
-        details: "자세한 내용"
-        from: "부터"
-        to: "까지"
-      edit:
-        title: '그룹 편집'
-        full_name: '전체 이름'
-        add_members: "구성원 추가"
-        delete_member_confirm: "'%{username}'를 '%{group}' 그룹에서 삭제하겠습니까?"
-      name_placeholder: "그룹 이름, 공백 없이 username 규칙과 동일하게 입력하세요."
       public_admission: "사용자가 그룹에 자유롭게 가입할 수 있도록 허용합니다. (그룹이 공개되어야 함)"
       public_exit: "사용자가 그룹을 자유롭게 탈퇴할 수 있도록 허용합니다."
       empty:
@@ -340,13 +312,7 @@ ko:
         topics: "이 그룹의 멤버가 작성한 토픽이 없습니다."
         logs: "이 그룹에 대한 기록이 없습니다."
       add: "추가"
-      join: "그룹 참여하기"
-      leave: "그룹 나가기"
-      request: "그룹 참여 요청하기"
       message: "메세지"
-      automatic_group: 자동 그룹
-      closed_group: 닫힌 그룹
-      is_group_user: "당신은 이 그룹의 구성원입니다."
       allow_membership_requests: "사용자가 그룹 소유자에게 가입신청을 할 수 있도록 허용합니다"
       membership_request_template: "가입 요청을 전송할 때 사용자에게 표시할 커스텀 템플릿"
       membership_request:
@@ -355,28 +321,19 @@ ko:
         reason: "그룹 소유자에게 왜 이 그룹에 속해야하는지 알립니다."
       membership: "회원제"
       name: "이름"
-      user_count: "멤버 수"
       bio: "이 그룹에 대하여"
-      selector_placeholder: "멤버 추가"
       owner: "소유자"
       index:
         title: "그룹"
         empty: "보이는 그룹이 없습니다."
       title:
-        other: "그룹"
+        other: 그룹
       activity: "활동"
-      members: "멤버"
       topics: "토픽"
       posts: "게시글"
       mentions: "멘션"
       messages: "메시지"
       notification_level: "그룹 메시지의 기본 알림 레벨"
-      visibility_levels:
-        title: "누가 이 그룹을 볼 수 있나요?"
-        public: "모두"
-        members: "그룹 소유자, 멤버, 관리자"
-        staff: "그룹 소유자와 운영진"
-        owners: "그룹 소유자와 관리자"
       alias_levels:
         mentionable: "누가 이 그룹에 @멘션을 할 수 있나요?"
         messageable: "누가 이 그룹에 메시지를 보낼 수 있나요?"
@@ -385,9 +342,6 @@ ko:
         mods_and_admins: "운영자 및 관리자만"
         members_mods_and_admins: "그룹 멤버, 운영자, 관리자만"
         everyone: "모두"
-      trust_levels:
-        title: "멤버들이 추가되면 회원등급이 자동으로 부여됩니다:"
-        none: "없음"
       notifications:
         watching:
           title: "알림 : 주시 중"
@@ -412,23 +366,21 @@ ko:
       flair_color_placeholder: "(선택사항) 16진수 컬러 값"
       flair_preview_icon: "미리보기 아이콘"
       flair_preview_image: "미리보기 이미지"
-      flair_note: "주의사항: 플레어는 사용자의 주요 그룹에만 표시됩니다."
     user_action_groups:
-      '1': "선사한 '좋아요'"
-      '2': "받은 '좋아요'"
-      '3': "북마크"
-      '4': "토픽"
-      '5': "답글"
-      '6': "응답"
-      '7': "멘션"
-      '9': "인용"
-      '11': "편집"
-      '12': "보낸 편지함"
-      '13': "받은 편지함"
-      '14': "대기"
+      "1": "선사한 '좋아요'"
+      "2": "받은 '좋아요'"
+      "3": "북마크"
+      "4": "토픽"
+      "5": "답글"
+      "6": "응답"
+      "7": "멘션"
+      "9": "인용"
+      "11": "편집"
+      "12": "보낸 편지함"
+      "13": "받은 편지함"
+      "14": "대기"
     categories:
       all: "전체 카테고리"
-      all_subcategories: "모든 하위 카테고리"
       no_subcategory: "없음"
       category: "카테고리"
       category_list: "카테고리 목록 표시"
@@ -447,9 +399,9 @@ ko:
       toggle_ordering: "정렬 컨트롤 토글"
       subcategories: "하위 카테고리"
       topic_sentence:
-        other: "%{count}개의 토픽"
+        other: '%{count}개의 토픽'
       topic_stat_sentence:
-        other: "지난 %{unit} 동안 %{count}개의 새로운 토픽이 생겼습니다."
+        other: 지난 %{unit} 동안 %{count}개의 새로운 토픽이 생겼습니다.
     ip_lookup:
       title: IP 주소 Lookup
       hostname: Hostname
@@ -491,7 +443,6 @@ ko:
       notifications: "알림"
       statistics: "통계"
       desktop_notifications:
-        label: "데스크탑 알림"
         not_supported: "안타깝게도 지금 사용하고 계시는 브라우저는 알림을 지원하지 않습니다."
         perm_default: "알림 켜기"
         perm_denied_btn: "권한 거부"
@@ -506,7 +457,6 @@ ko:
       disable_jump_reply: "댓글을 작성했을 때, 새로 작성한 댓글로 화면을 이동하지 않습니다."
       dynamic_favicon: "새 글이나 업데이트된 글 수를 브라우저 아이콘에 보이기"
       theme_default_on_all_devices: "이 테마를 모든 기기의 기본 테마로 설정합니다."
-      allow_private_messages: "다른 사용자가 개인 메시지를 보내도록 허용합니다."
       external_links_in_new_tab: "모든 외부 링크를 새 탭에 열기"
       enable_quoting: "강조 표시된 텍스트에 대한 알림을 사용합니다"
       change: "변경"
@@ -551,7 +501,6 @@ ko:
       delete_account: "내 계정 삭제"
       delete_account_confirm: "정말로 계정을 삭제할까요? 이 작업은 되돌릴 수 없습니다."
       deleted_yourself: "계정이 삭제 되었습니다."
-      delete_yourself_not_allowed: "지금은 계정을 삭제할 수 없습니다. 관리자에게 연락해 주세요."
       unread_message_count: "메시지"
       admin_delete: "삭제"
       users: "회원"
@@ -642,7 +591,7 @@ ko:
         authenticated: "내 이메일이 {{provider}}에 의해 인증되었습니다."
         frequency_immediately: "만약 전송된 메일을 읽지 않았을 경우, 즉시 메일을 다시 보내드립니다."
         frequency:
-          other: "최근  {{count}}분 동안접속하지 않을 경우에만 메일이 전송됩니다."
+          other: 최근  {{count}}분 동안접속하지 않을 경우에만 메일이 전송됩니다.
       name:
         title: "이름"
         instructions: "이름 (선택사항)"
@@ -673,8 +622,6 @@ ko:
       created: "생성일"
       log_out: "로그아웃"
       location: "위치"
-      card_badge:
-        title: "사용자 카드 배지"
       website: "웹사이트"
       email_settings: "이메일"
       like_notification_frequency:
@@ -728,9 +675,8 @@ ko:
         title: "초대"
         user: "사용자 초대"
         sent: "보냄"
-        none: "승인을 기다리는 초대가 더이상 없습니다."
         truncated:
-          other: "앞 {{count}}개의 초대를 보여줍니다."
+          other: 앞 {{count}}개의 초대를 보여줍니다.
         redeemed: "초대를 받았습니다."
         redeemed_tab: "Redeemed"
         redeemed_tab_with_count: "교환된 ({{count}})"
@@ -777,21 +723,21 @@ ko:
         time_read: "읽은 시간"
         recent_time_read: "최근 읽은 시간"
         topic_count:
-          other: "작성 시간"
+          other: 작성 시간
         post_count:
-          other: "작성 시간"
+          other: 작성 시간
         likes_given:
-          other: "누름"
+          other: 누름
         likes_received:
-          other: "받음"
+          other: 받음
         days_visited:
-          other: "방문일수"
+          other: 방문일수
         topics_entered:
-          other: "토픽이 표시됨"
+          other: 토픽이 표시됨
         posts_read:
-          other: "읽은 글 갯수"
+          other: 읽은 글 갯수
         bookmark_count:
-          other: "북마크들"
+          other: 북마크들
         top_replies: "인기 댓글"
         no_replies: "아직 답글이 없습니다."
         more_replies: "답글 더 보기"
@@ -859,7 +805,7 @@ ko:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> 가 사이트 제한값 %{siteSettingRate}에 도달했습니다."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> 가 사이트 제한값 %{siteSettingRate}을 초과하였습니다."
       rate:
-        other: "%{count} 에러/%{duration}"
+        other: '%{count} 에러/%{duration}'
     learn_more: "더 배우기"
     all_time: '총'
     all_time_desc: '총 토픽'
@@ -1040,7 +986,7 @@ ko:
       similar_topics: "작성하려는 내용과 비슷한 주제들..."
       drafts_offline: "초안"
       group_mentioned:
-        other: "{{group}}을 언급하면, <a href='{{group_link}}'>{{count}} 명</a>의 회원에게 알림이 갑니다. 그렇게 할까요?"
+        other: '{{group}}을 언급하면, <a href=''{{group_link}}''>{{count}} 명</a>의 회원에게 알림이 갑니다. 그렇게 할까요?'
       cannot_see_mention:
         category: "{{username}}에게 멘션을 썼지만, 해당 사용자가 이 카테고리에 접근할 수 없기 때문에 알림이 가지 않습니다. 이 카테고리에 접근할 수 있는 그룹에 해당 멤버가 추가되어야 합니다."
         private: "{{username}}에게 멘션을 썼지만, 해당 사용자가 개인 메시지를 볼 수 없기 때문에 알림이 가지 않습니다. 이 개인 메시지에 해당 사용자를 초대해야 합니다."
@@ -1120,7 +1066,7 @@ ko:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        other: "<span>{{username}}, {{username2}} 외 {{count}} 명의 사용자가</span> {{description}}"
+        other: <span>{{username}}, {{username2}} 외 {{count}} 명의 사용자가</span> {{description}}
       private_message: "<span>{{username}}</span> {{description}}"
       invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
       invited_to_topic: "<span>{{username}}</span> {{description}}"
@@ -1131,29 +1077,13 @@ ko:
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>새 토픽</span> {{description}}"
       group_message_summary:
-        other: " {{group_name}} 사서함에 {{count}} 개의 메시지가 있습니다"
-      alt:
-        mentioned: "멘션 by"
-        quoted: "인용  by"
-        replied: "답글을 전송했습니다."
-        posted: "포스트 by"
-        edited: "당신 글이 다음 이용자에 의해 수정"
-        liked: "당신의 글을 좋아했음."
-        private_message: "다음 사람에게서온 개인 메시지"
-        invited_to_private_message: "다음 사람으로부터 개인 메시지가 초대됨"
-        invited_to_topic: "다음 사람으로부터 한 주제로 초대됨"
-        invitee_accepted: "다음 사람에 의해 초대가 수락됨."
-        moved_post: "다음 사람에 의해서 당신의 글이 이동됨"
-        linked: "당신 글로 링크하기"
-        granted_badge: "배지가 수여됨."
-        group_message_summary: "그룹 메시지함의 메시지"
+        other:  {{group_name}} 사서함에 {{count}} 개의 메시지가 있습니다
       popup:
         mentioned: '"{{topic}}" - {{site_title}}에서 {{username}} 님이 나를 멘션했습니다'
         group_mentioned: '"{{topic}}" - {{site_title}}에서 {{username}} 님이 당신을 언급했습니다'
         quoted: '"{{topic}}" - {{site_title}}에서 {{username}} 님이 나를 인용했습니다'
         replied: '"{{topic}}" - {{site_title}}에서 {{username}} 님이 내게 답글을 달았습니다'
         posted: '"{{topic}}" - {{site_title}}에서 {{username}}님이 글을 게시하였습니다'
-        private_message: '{{username}}가 비공개 메시지를 "{{topic}}" - {{site_title}} 에 작성했습니다'
         linked: '{{username}}님이  "{{topic}}" - {{site_title}}에 내 글을 링크했습니다'
     upload_selector:
       title: "이미지 추가하기"
@@ -1256,7 +1186,7 @@ ko:
         notification_level: "알림"
         choose_new_category: "주제의 새로운 카테고리를 선택"
         selected:
-          other: "<b>{{count}}</b>개의 주제가 선택되었습니다."
+          other: <b>{{count}}</b>개의 주제가 선택되었습니다.
         change_tags: "태그 교체"
         append_tags: "태그 덧붙이기"
         choose_new_tags: "이 토픽의 태그를 입력하세요:"
@@ -1288,11 +1218,8 @@ ko:
         bookmarks: "더이상 북마크한 주제가 없습니다."
         search: "더이상 검색 결과가 없습니다."
     topic:
-      unsubscribe:
-        stop_notifications: "<strong>{{title}}</strong>에 대한 알림은 이제 덜 받게 됩니다."
-        change_notification_state: "현재 당신의 알림 설정 : "
       filter_to:
-        other: "이 토픽에 {{count}}개 게시글"
+        other: 이 토픽에 {{count}}개 게시글
       create: '새 주제 만들기'
       create_long: '새로운 주제 만들기'
       private_message: '메시지 시작'
@@ -1321,13 +1248,13 @@ ko:
         title: "주제를 찾을 수 없습니다"
         description: "죄송합니다. 주제를 찾을 수 없습니다. 아마도 운영자에 의해 삭제된 것 같습니다."
       total_unread_posts:
-        other: "이 주제에 {{count}}개의 읽지 않을 게시 글이 있습니다."
+        other: 이 주제에 {{count}}개의 읽지 않을 게시 글이 있습니다.
       unread_posts:
-        other: "이 주제에 {{count}}개의 읽지 않을 게시 글이 있습니다."
+        other: 이 주제에 {{count}}개의 읽지 않을 게시 글이 있습니다.
       new_posts:
-        other: "최근 읽은 이후 {{count}}개 글이 이 주제에 작성되었습니다."
+        other: 최근 읽은 이후 {{count}}개 글이 이 주제에 작성되었습니다.
       likes:
-        other: "이 주제에 {{count}}개의 '좋아요'가 있습니다."
+        other: 이 주제에 {{count}}개의 '좋아요'가 있습니다.
       back_to_list: "주제 리스트로 돌아갑니다."
       options: "주제 옵션"
       show_links: "이 주제에서 링크를 표시합니다."
@@ -1337,7 +1264,7 @@ ko:
       read_more_MF: "읽지 않은 글 { UNREAD, plural, =0 {} one { is <a href='/unread'>1 개</a> }other { are <a href='/unread'># 개</a> } }, 새 글은 { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='/new'>1 개</a> } other { {BOTH, select, true{and } false {are } other{}} <a href='/new'># 개</a> } } 을 확인해보세요, {CATEGORY, select, true {{catLink} 카테고리의 다른 글들도 살펴보세요.} false {{latestLink}} other {}}"
       browse_all_categories: 모든 카테고리 보기
       view_latest_topics: 최신 주제 보기
-      suggest_create_topic: 새 주제를 작성 해 보실래요?
+      suggest_create_topic: "새 주제를 작성 해 보실래요?"
       jump_reply_up: 이전 답글로 이동
       jump_reply_down: 이후 답글로 이동
       deleted: "주제가 삭제되었습니다"
@@ -1388,7 +1315,7 @@ ko:
         auto_reminder: "%{timeLeft}후에 이 토픽을 다시 알려드리겠습니다."
       auto_close_title: '자동으로 닫기 설정'
       auto_close_immediate:
-        other: "주제에 마지막 게시글이 올라온 지 %{hours} 시간이 지났기 때문에 이 주제는 곧 닫힐 예정입니다."
+        other: 주제에 마지막 게시글이 올라온 지 %{hours} 시간이 지났기 때문에 이 주제는 곧 닫힐 예정입니다.
       timeline:
         back: "이전"
         back_description: "마지막으로 안읽은 게시글로 돌아가기"
@@ -1409,21 +1336,21 @@ ko:
         title: 이 토픽에 대한 알림 빈도 변경
         reasons:
           mailing_list_mode: "메일링 리스트 모드가 활성화되었기 때문에, 이 토픽의 답글을 메일을 통하여 받게 됩니다."
-          '3_10': '이 토픽의 태그를 주시하고 있기 때문에 알림을 받게 됩니다.'
-          '3_6': '이 카테고리를 보고 있어서 알림을 받게 됩니다.'
-          '3_5': '자동으로 이 글을 보고있어서 알림을 받게 됩니다.'
-          '3_2': '이 주제를 보고있어서 알림을 받게 됩니다.'
-          '3_1': '이 주제를 생성하여서 알림을 받게 됩니다.'
-          '3': '이 주제를 보고있어서 알림을 받게 됩니다.'
-          '2_8': '이 카테고리를 추적중이므로, 새로운 게시글의 수를 표시합니다.'
-          '2_4': '이 토픽에 게시글을 남겼기 때문에, 새로운 게시글의 수를 표시합니다.'
-          '2_2': '이 토픽을 추적중이므로, 새로운 게시글의 수를 표시합니다.'
-          '2': '<a href="/u/{{username}}/preferences">이 토픽을 읽었기 때문에,</a> 새로운 게시글의 수를 표시합니다.'
-          '1_2': '누군가 내 @아아디 으로 멘션했거나 내 글에 답글이 달릴 때 알림을 받게 됩니다.'
-          '1': '누군가 내 @아아디 으로 멘션했거나 내 글에 답글이 달릴 때 알림을 받게 됩니다.'
-          '0_7': '이 주제에 관한 모든 알림을 무시하고 있습니다.'
-          '0_2': '이 주제에 관한 모든 알림을 무시하고 있습니다.'
-          '0': '이 주제에 관한 모든 알림을 무시하고 있습니다.'
+          "3_10": '이 토픽의 태그를 주시하고 있기 때문에 알림을 받게 됩니다.'
+          "3_6": '이 카테고리를 보고 있어서 알림을 받게 됩니다.'
+          "3_5": '자동으로 이 글을 보고있어서 알림을 받게 됩니다.'
+          "3_2": '이 주제를 보고있어서 알림을 받게 됩니다.'
+          "3_1": '이 주제를 생성하여서 알림을 받게 됩니다.'
+          "3": '이 주제를 보고있어서 알림을 받게 됩니다.'
+          "2_8": '이 카테고리를 추적중이므로, 새로운 게시글의 수를 표시합니다.'
+          "2_4": '이 토픽에 게시글을 남겼기 때문에, 새로운 게시글의 수를 표시합니다.'
+          "2_2": '이 토픽을 추적중이므로, 새로운 게시글의 수를 표시합니다.'
+          "2": '<a href="/u/{{username}}/preferences">이 토픽을 읽었기 때문에,</a> 새로운 게시글의 수를 표시합니다.'
+          "1_2": '누군가 내 @아아디 으로 멘션했거나 내 글에 답글이 달릴 때 알림을 받게 됩니다.'
+          "1": '누군가 내 @아아디 으로 멘션했거나 내 글에 답글이 달릴 때 알림을 받게 됩니다.'
+          "0_7": '이 주제에 관한 모든 알림을 무시하고 있습니다.'
+          "0_2": '이 주제에 관한 모든 알림을 무시하고 있습니다.'
+          "0": '이 주제에 관한 모든 알림을 무시하고 있습니다.'
         watching_pm:
           title: "알림 : 주시 중"
           description: "이 메시지에 새로운 답글이 있을 때 알림을 받게 되며 새로운 답글의 개수는 표시됩니다."
@@ -1463,7 +1390,6 @@ ko:
         visible: "목록에 넣기"
         reset_read: "값 재설정"
         make_public: "공개 토픽으로 만들기"
-        make_private: "비공개 메시지 만들기"
       feature:
         pin: "주제 고정"
         unpin: "주제 고정 취소"
@@ -1496,7 +1422,7 @@ ko:
         pin_validation: "주제를 고정하려면 날짜를 지정해야 합니다."
         not_pinned: " {{categoryLink}} 카테고리에 고정된 주제가 없습니다."
         already_pinned:
-          other: "{{categoryLink}}에 고정된 주제 개수: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: '{{categoryLink}}에 고정된 주제 개수: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         pin_globally: "모든 주제 목록 상단 고정 until"
         confirm_pin_globally: "이미 {{count}}개의 주제가 전체 공지로 고정되어 있습니다. 너무 많은 주제가 고정되어 있으면 새로운 사용자나 익명사용자에게 부담이 될 수 있습니다. 정말로 이 주제를 전체 공지로 고정하겠습니까?"
         unpin_globally: "모든 주제 목록 상단에서 이 주제를 제거"
@@ -1504,7 +1430,7 @@ ko:
         global_pin_note: "개별적으로 사용자가 주제 고정을 취소할 수 있습니다."
         not_pinned_globally: "전체 공지된 주제가 없습니다."
         already_pinned_globally:
-          other: "전체 공지된 주제 개수: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: '전체 공지된 주제 개수: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         make_banner: "이 주제를 모든 페이지의 상단에 나타나는 배너로 만들기"
         remove_banner: "모든 페이지에서 나타나는 배너에서 제거"
         banner_note: "사용자는 배너를 닫음으로써 배너를 나타나지 않게 할 수 있습니다. 단지 어떤 기간동안 딱 하나의 주제만이 배너로 지정 가능합니다."
@@ -1541,7 +1467,7 @@ ko:
       login_reply: '로그인하고 답글 쓰기'
       filters:
         n_posts:
-          other: "{{count}} 글"
+          other: '{{count}} 글'
         cancel: "필터 제거"
       split_topic:
         title: "새로운 주제로 이동"
@@ -1549,13 +1475,13 @@ ko:
         topic_name: "새로운 주제 이름"
         error: "새로운 주제로 이동시키는데 문제가 발생하였습니다."
         instructions:
-          other: "새로운 주제를 생성하여, 선택한 <b>{{count}}</b>개의 글로 채우려고 합니다."
+          other: 새로운 주제를 생성하여, 선택한 <b>{{count}}</b>개의 글로 채우려고 합니다.
       merge_topic:
         title: "이미 있는 주제로 옮기기"
         action: "이미 있는 주제로 옮기기"
         error: "이 주제를 이동시키는데 문제가 발생하였습니다."
         instructions:
-          other: " <b>{{count}}</b>개의 글을 옮길 주제를 선택해주세요."
+          other: ' <b>{{count}}</b>개의 글을 옮길 주제를 선택해주세요.'
       merge_posts:
         title: "선택한 게시글 합치기"
         action: "선택한 게시글 합치기"
@@ -1567,8 +1493,7 @@ ko:
         label: "글의 새로운 작성자"
         placeholder: "새로운 작성자의 아이디"
         instructions:
-          other: "<b>{{old_user}}</b>(이)가 작성한 글의 새로운 작성자를 선택해주세요."
-        instructions_warn: "이 글에 대한 알림이 새 사용자에게 자동으로 이전되지 않습니다.\n<br>경고: 글과 연관된 데이터가 새로운 사용자로 이전되지 않습니다. 주의해서 사용하세요."
+          other: <b>{{old_user}}</b>(이)가 작성한 글의 새로운 작성자를 선택해주세요.
       change_timestamp:
         title: "타임스탬프 변경하기..."
         action: "타임스탬프 변경"
@@ -1585,8 +1510,6 @@ ko:
         description:
           other: <b>{{count}}</b>개의 개시글을 선택하셨어요.
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "인용하기"
       edit_reason: "Reason: "
       post_number: "{{number}}번째 글"
@@ -1599,20 +1522,20 @@ ko:
       show_full: "전체 글 보기"
       show_hidden: '숨겨진 내용을 표시'
       deleted_by_author:
-        other: "(작성자에 의해 취소된 글입니다. 글이 신고된 것이 아닌 한 %{count} 시간 뒤에 자동으로 삭제됩니다)"
+        other: (작성자에 의해 취소된 글입니다. 글이 신고된 것이 아닌 한 %{count} 시간 뒤에 자동으로 삭제됩니다)
       expand_collapse: "확장/축소"
       gap:
-        other: "{{count}}개의 숨겨진 답글 보기"
+        other: '{{count}}개의 숨겨진 답글 보기'
       unread: "읽지 않은 포스트"
       has_replies:
-        other: "{{count}} 답글"
+        other: '{{count}} 답글'
       has_likes:
-        other: "{{count}} 좋아요"
+        other: '{{count}} 좋아요'
       has_likes_title:
-        other: "{{count}}명이 이 글을 좋아합니다"
+        other: '{{count}}명이 이 글을 좋아합니다'
       has_likes_title_only_you: "당신이 이 글을 좋아합니다."
       has_likes_title_you:
-        other: "당신 외  {{count}}명이 이 글을 좋아합니다"
+        other: 당신 외  {{count}}명이 이 글을 좋아합니다
       errors:
         create: "죄송합니다. 글을 만드는 동안 오류가 발생했습니다. 다시 시도하십시오."
         edit: "죄송합니다. 글을 수정하는 중에 오류가 발생했습니다. 다시 시도하십시오."
@@ -1686,41 +1609,41 @@ ko:
           vote: "이 글에 투표했습니다"
         by_you_and_others:
           off_topic:
-            other: "당신 외 {{count}}명이 주제에서 벗어났다고 신고했습니다"
+            other: 당신 외 {{count}}명이 주제에서 벗어났다고 신고했습니다
           spam:
-            other: "당신 외 {{count}}명이 스팸이라고 신고했습니다"
+            other: 당신 외 {{count}}명이 스팸이라고 신고했습니다
           inappropriate:
-            other: "당신 외 {{count}}명이 부적절한 컨텐츠라고 신고했습니다"
+            other: 당신 외 {{count}}명이 부적절한 컨텐츠라고 신고했습니다
           notify_moderators:
-            other: "당신 외 {{count}}명이 운영자에게 알렸습니다"
+            other: 당신 외 {{count}}명이 운영자에게 알렸습니다
           notify_user:
-            other: "당신 외 {{count}}명이 글쓴이에게 메시지를 보냈습니다"
+            other: 당신 외 {{count}}명이 글쓴이에게 메시지를 보냈습니다
           bookmark:
-            other: "당신 외 {{count}}명이 북마크 했습니다"
+            other: 당신 외 {{count}}명이 북마크 했습니다
           like:
-            other: "당신 외 {{count}}명이 좋아합니다"
+            other: 당신 외 {{count}}명이 좋아합니다
           vote:
-            other: "당신 외 {{count}}명이 이 글에 투표했습니다"
+            other: 당신 외 {{count}}명이 이 글에 투표했습니다
         by_others:
           off_topic:
-            other: "{{count}}명이 주제에서 벗어났다고 신고했습니다"
+            other: '{{count}}명이 주제에서 벗어났다고 신고했습니다'
           spam:
-            other: "{{count}}명의 스팸이라고 신고했습니다"
+            other: '{{count}}명의 스팸이라고 신고했습니다'
           inappropriate:
-            other: "{{count}}명이 부적절한 컨텐츠라고 신고했습니다"
+            other: '{{count}}명이 부적절한 컨텐츠라고 신고했습니다'
           notify_moderators:
-            other: "{{count}}명이 운영자에게 알렸습니다"
+            other: '{{count}}명이 운영자에게 알렸습니다'
           notify_user:
-            other: "{{count}}명이 글쓴이에게 메시지를 보냈습니다"
+            other: '{{count}}명이 글쓴이에게 메시지를 보냈습니다'
           bookmark:
-            other: "{{count}}명이 북마크했습니다"
+            other: '{{count}}명이 북마크했습니다'
           like:
-            other: "{{count}}명이 좋아합니다"
+            other: '{{count}}명이 좋아합니다'
           vote:
-            other: "{{count}}명이 이 글에 투표했습니다"
+            other: '{{count}}명이 이 글에 투표했습니다'
       merge:
         confirm:
-          other: "정말로 이 {{count}}개의 게시글을 합칠까요?"
+          other: 정말로 이 {{count}}개의 게시글을 합칠까요?
       revisions:
         controls:
           first: "초판"
@@ -1802,7 +1725,6 @@ ko:
       email_in_allow_strangers: "계정이 없는 익명 유저들에게 이메일을 받습니다."
       email_in_disabled: "이메일로 새 주제 작성하기 기능이 비활성화되어 있습니다. 사이트 설정에서 '이메일로 새 주제 작성하기'를 활성화 해주세요."
       email_in_disabled_click: '"email in" 활성화'
-      suppress_from_homepage: "홈페이지에서 이 카테고리를 감춥니다."
       show_subcategory_list: "하위 카테고리 목록을 토픽위에 표시하기."
       num_featured_topics: "이 카테고리 페이지에 표시되는 토픽의 수:"
       subcategory_num_featured_topics: "부모 카테고리 페이지에 표시되는 주요 토픽의 수:"
@@ -1876,11 +1798,11 @@ ko:
       custom_placeholder_notify_moderators: "구체적으로 회원님이 걱정하는 내용과 가능한 모든 관련된 링크를 제공해주세요."
       custom_message:
         at_least:
-          other: "최소 {{count}}자 이상 입력하세요"
+          other: 최소 {{count}}자 이상 입력하세요
         more:
-          other: "{{count}} 남았습니다"
+          other: '{{count}} 남았습니다'
         left:
-          other: "{{count}} 남았습니다"
+          other: '{{count}} 남았습니다'
     flagging_topic:
       title: "우리 커뮤니티 질서를 지키는데 도와주셔서 감사합니다!"
       action: "주제 신고하기"
@@ -1891,11 +1813,11 @@ ko:
       links_title: "인기 링크"
       links_shown: "더 많은 링크보기..."
       clicks:
-        other: "%{count}번 클릭"
+        other: '%{count}번 클릭'
     post_links:
       about: "이 게시글의 링크 더 보기"
       title:
-        other: "%{count} more"
+        other: '%{count} more'
     topic_statuses:
       warning:
         help: "공식적인 주의입니다."
@@ -1929,18 +1851,18 @@ ko:
     original_post: "원본 글"
     views: "조회수"
     views_lowercase:
-      other: "조회"
+      other: 조회
     replies: "답변"
     views_long:
-      other: "이 토픽은 {{number}}번 조회되었습니다."
+      other: 이 토픽은 {{number}}번 조회되었습니다.
     activity: "활동"
     likes: "좋아요"
     likes_lowercase:
-      other: "좋아요"
+      other: 좋아요
     likes_long: "이 주제에 {{number}}개의 '좋아요'가 있습니다."
     users: "사용자"
     users_lowercase:
-      other: "사용자"
+      other: 사용자
     category_title: "카테고리"
     history: "기록"
     changed_by: "{{author}}에 의해"
@@ -1954,7 +1876,7 @@ ko:
       latest:
         title: "최근글"
         title_with_count:
-          other: "최근글 ({{count}})"
+          other: 최근글 ({{count}})
         help: "가장 최근 주제"
       hot:
         title: "인기 있는 글"
@@ -1972,17 +1894,17 @@ ko:
       unread:
         title: "읽지 않은 글"
         title_with_count:
-          other: "읽지 않은 글 ({{count}})"
+          other: 읽지 않은 글 ({{count}})
         help: "지켜보거나 추적 중인 읽지 않은 주제"
         lower_title_with_count:
-          other: "{{count}} unread"
+          other: '{{count}} unread'
       new:
         lower_title_with_count:
-          other: "{{count}} new"
+          other: '{{count}} new'
         lower_title: "new"
         title: "새글"
         title_with_count:
-          other: "새글 ({{count}})"
+          other: 새글 ({{count}})
         help: "며칠 내에 만들어진 주제"
       posted:
         title: "내 글"
@@ -1993,7 +1915,7 @@ ko:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          other: "{{categoryName}} ({{count}})"
+          other: '{{categoryName}} ({{count}})'
         help: "{{categoryName}}카테고리의 최신 주제"
       top:
         title: "인기글"
@@ -2078,20 +2000,19 @@ ko:
         print: '<b>ctrl</b>+<b>p</b> 토픽 인쇄하기'
     badges:
       earned_n_times:
-        other: "이 배지를 %{count}번 받았습니다"
+        other: 이 배지를 %{count}번 받았습니다
       granted_on: "%{date} 에 수여함"
       others_count: "(%{count})명의 사용자가 이 배지를 가지고 있습니다"
       title: 배지
       allow_title: "이 배지는 타이틀로 사용할 수 있습니다"
       multiple_grant: "이 배지는 중복해서 취득할 수 있습니다"
       badge_count:
-        other: "%{count}개의 배지"
+        other: '%{count}개의 배지'
       more_badges:
-        other: "+%{count}개 이상"
+        other: +%{count}개 이상
       granted:
-        other: "%{count}개 수여됨"
+        other: '%{count}개 수여됨'
       select_badge_for_title: 타이틀로 사용할 배지 선택하기
-      none: "<none>"
       badge_grouping:
         getting_started:
           name: 시작하기
@@ -2120,7 +2041,7 @@ ko:
       tags: "태그"
       delete_tag: "태그 삭제"
       delete_confirm:
-        other: "정말로 이 태그를 삭제하고 이 태그가 붙은 {{count}} 개의 토픽에서 태그를 제거할까요?"
+        other: 정말로 이 태그를 삭제하고 이 태그가 붙은 {{count}} 개의 토픽에서 태그를 제거할까요?
       delete_confirm_no_topics: "정말로 이 태그를 삭제할까요?"
       rename_tag: "태그 이름변경"
       rename_instructions: "새로운 태그의 이름을 입력하세요:"
@@ -2137,19 +2058,15 @@ ko:
       notifications:
         watching:
           title: "주시중"
-          description: "이 태그가 붙은 토픽들을 주시하도록 자동으로 설정됩니다. 새로운 게시글이나 토픽에 대하여 알림을 받게되며 토픽 옆에 새로운 게시글의 수가 표시됩니다."
         watching_first_post:
           title: "첫 게시글 주시중"
-          description: "이 태그가 달린 신규 토픽에 대해서만 알림을 받게 됩니다."
         tracking:
           title: "추적중"
-          description: "이 태그가 달려 있는 모든 토픽을 추적합니다. 읽지 않은 글과 새로운 게시글 수가 나타납니다."
         regular:
           title: "일반"
           description: "누군가 당신의 @아이디 로 언급했거나 당신의 글에 답글이 달릴 때 알림을 받게 됩니다."
         muted:
           title: "알림끔"
-          description: "이 태그를 달고 새로 작성되는 토픽에 대한 알림을 받지 않습니다. '읽지 않은'탭에서도 보이지 않게 됩니다."
       groups:
         title: "태그 그룹"
         about: "태그 관리를 쉽게하려면 그룹에 태그를 추가하세요."
@@ -2205,8 +2122,8 @@ ko:
         critical_available: "중요 업데이트를 사용할 수 있습니다."
         updates_available: "업데이트를 사용할 수 있습니다."
         please_upgrade: "업그레이드하세요."
-        no_check_performed: "A check for updates has not been performed. Ensure sidekiq is running."
-        stale_data: "A check for updates has not been performed lately. Ensure sidekiq is running."
+        no_check_performed: "업데이트 확인이 수행되지 않았습니다. sidekiq가 실행 중인지 확인하십시오."
+        stale_data: "최근 업데이트 확인이 수행되지 않았습니다. sidekiq가 실행 중인지 확인하십시오."
         version_check_pending: "최근에 업데이트 되었군요! 환상적입니다!!"
         installed_version: "설치됨"
         latest_version: "최근"
@@ -2231,8 +2148,6 @@ ko:
         reports:
           today: "오늘"
           yesterday: "어제"
-          last_7_days: "최근 7일"
-          last_30_days: "최근 30일"
           all_time: "모든 시간"
           7_days_ago: "7일"
           30_days_ago: "30일"
@@ -2253,7 +2168,6 @@ ko:
         topics: "신고된 토픽"
         agree: "동의"
         agree_title: "이 신고가 올바르고 타당함을 확인합니다"
-        defer_flag_title: "신고 제거하기. 별도추가조치는 더이상 필요없습니다"
         delete: "삭제"
         delete_title: "신고에서 멘션된 글 삭제하기"
         delete_post_defer_flag_title: "글을 삭제하고 첫번째 글이면 주제 삭제하기"
@@ -2303,8 +2217,6 @@ ko:
         title: "그룹"
         edit: "그룹 수정"
         refresh: "새로고침"
-        new: "새로운"
-        selector_placeholder: "아이디를 입력하세요"
         about: "회원과 이름을 변경"
         group_members: "그룹 멤버"
         delete: "삭제"
@@ -2312,22 +2224,10 @@ ko:
         delete_failed: "이것은 자동으로 생성된 그룹입니다. 삭제할 수 없습니다."
         delete_owner_confirm: "'%{username}' 님에게서 소유자권한을 제거할까요?"
         add: "추가"
-        add_members: "사용자 추가하기"
         custom: "Custom"
-        bulk_complete: "회원들이 그룹에 추가되었습니다."
-        bulk_complete_users_not_added: "이 사용자는 추가되지 않았습니다(계정이 있는지 확인해보세요):"
-        bulk: "그룹에 한꺼번에 추가하기"
-        bulk_paste: "한 줄당 하나씩 아이디 또는 이메일 리스트를 붙여넣기 하세요."
-        bulk_select: "(그룹을 선택하세요)"
         automatic: "자동화"
-        automatic_membership_email_domains: "이 목록의 있는 항목과 사용자들이  등록한 이메일 도메인이 일치할때 이 그룹에 포함"
-        automatic_membership_retroactive: "이미 등록된 사용자에게 같은 이메일 도메인 규칙 적용하기"
-        default_title: "이 그룹의 모든 사용자를 위한 기본 제목"
-        primary_group: "Automatically set as primary group"
         group_owners: 소유자
         add_owners: 소유자 추가하기
-        incoming_email: "사용자 설정 수신 이메일 주소"
-        incoming_email_placeholder: "이메일 주소를 입력하세요"
         none_selected: "시작할 그룹을 선택하세요"
         no_custom_groups: "사용자 설정 그룹 만들기"
       api:
@@ -2393,9 +2293,9 @@ ko:
           none: "연관된 이벤트가 없습니다"
           redeliver: "재발송"
           incoming:
-            other: "{{count}}개의 새로운 이벤트가 있습니다."
+            other: '{{count}}개의 새로운 이벤트가 있습니다.'
           completed_in:
-            other: "{{count}}초 후에 완료됩니다."
+            other: '{{count}}초 후에 완료됩니다.'
           request: "요청"
           response: "응답"
           redeliver_confirm: "정말로 동일한 payload를 재발송하기를 원하십니까?"
@@ -2446,7 +2346,6 @@ ko:
           label: "업로드"
           title: "백업을 업로드"
           uploading: "업로드 중..."
-          success: "'{{filename}}' 파일이 성공적으로 업로드 되었습니다."
           error: "'{{filename}}' 파일 업로드중 에러가 발생하였습니다. ({{message}})"
         operations:
           is_running: "실행 중입니다."
@@ -2459,7 +2358,6 @@ ko:
             label: "백업"
             title: "백업 생성"
             confirm: "새로운 백업을 시작할까요?"
-            without_uploads: "예 (파일을 포함하지 않음)"
           download:
             label: "다운로드"
             title: "다운로드 링크를 붙여서 이메일 보내기"
@@ -2557,7 +2455,7 @@ ko:
           up_to_date: "테마가 최신입니다, 마지막으로 체크한 일시:"
           add: "추가"
           commits_behind:
-            other: "테마가 {{count}} 개 커밋 뒤쳐졌습니다!"
+            other: 테마가 {{count}} 개 커밋 뒤쳐졌습니다!
           scss:
             text: "CSS"
             title: "커스텀 CSS를 입력하세요. 형식에 맞는 CSS 와 SCSS 스타일을 지원합니다."
@@ -2797,7 +2695,7 @@ ko:
         clear_filter: "지우기"
         show_words: "단어 보이기"
         word_count:
-          other: "%{count}개 단어"
+          other: '%{count}개 단어'
         actions:
           block: '차단'
           censor: '가리기'
@@ -2838,9 +2736,9 @@ ko:
           suspect: '의심스러운 사용자'
         approved: "승인?"
         approved_selected:
-          other: "승인한 사용자 ({{count}}명)"
+          other: 승인한 사용자 ({{count}}명)
         reject_selected:
-          other: "거부한 사용자 ({{count}}명)"
+          other: 거부한 사용자 ({{count}}명)
         titles:
           active: '활동적인 회원'
           new: '신규회원'
@@ -2856,9 +2754,9 @@ ko:
           suspended: '접근 금지된 사용자들'
           suspect: '의심스러운 사용자들'
         reject_successful:
-          other: "성공적으로 ${count}명의 사용자를 거절하였습니다."
+          other: 성공적으로 ${count}명의 사용자를 거절하였습니다.
         reject_failures:
-          other: "%{count}명의 사용자를 거부하는데 실패했습니다."
+          other: '%{count}명의 사용자를 거부하는데 실패했습니다.'
         not_verified: "확인되지 않은"
         check_email:
           title: "사용자의 이메일 주소 표시"
@@ -2924,11 +2822,11 @@ ko:
         delete_forbidden_because_staff: "관리자 및 운영자 계정은 삭제할 수 없습니다."
         delete_posts_forbidden_because_staff: "관리자와 운영자의 글은 삭제할 수 없습니다."
         delete_forbidden:
-          other: "사용자가 작성한 글이 있으면 사용자를 삭제 할 수 없습니다. 사용자를 삭제 하기 전에 사용자가 작성한 글을 모두 삭제해야 합니다. (%{count}일 이전에 작성한 글은 삭제할 수 없습니다.)"
+          other: 사용자가 작성한 글이 있으면 사용자를 삭제 할 수 없습니다. 사용자를 삭제 하기 전에 사용자가 작성한 글을 모두 삭제해야 합니다. (%{count}일 이전에 작성한 글은 삭제할 수 없습니다.)
         cant_delete_all_posts:
-          other: "전체글을 삭제할 수 없습니다. 몇개의 글은 %{count}일 이전에 작성되었습니다. (The delete_user_max_post_age setting.)"
+          other: 전체글을 삭제할 수 없습니다. 몇개의 글은 %{count}일 이전에 작성되었습니다. (The delete_user_max_post_age setting.)
         cant_delete_all_too_many_posts:
-          other: "이 사용자는 %{count}개 이상 글을 작성하였기 때문에 모든 글을 삭제 할 수 없습니다. (delete_all_posts_max 설정참고)"
+          other: 이 사용자는 %{count}개 이상 글을 작성하였기 때문에 모든 글을 삭제 할 수 없습니다. (delete_all_posts_max 설정참고)
         delete_confirm: "정말 이 사용자를 삭제하시겠습니다? 삭제하면 복구 할 수 없습니다."
         delete_and_block: "이 이메일과 IP주소를 삭제하고 차단하기"
         delete_dont_block: "삭제만 하기"
@@ -2964,7 +2862,7 @@ ko:
         tl3_requirements:
           title: "3등급 회원이 되기 위한 자격"
           table_title:
-            other: "최근 %{count} 일 간:"
+            other: '최근 %{count} 일 간:'
           value_heading: "값"
           requirement_heading: "자격요건"
           visits: "방문횟수"
@@ -3039,10 +2937,7 @@ ko:
         recommended: "다음의 텍스트를 요구에 맞게 편집하는 것을 권장:"
         show_overriden: 'Override 된 설정만 보여주기'
       site_settings:
-        show_overriden: '수정된 것만 표시'
         title: '사이트 설정'
-        reset: '기본값으로 재설정'
-        none: '없음'
         no_results: "No results found."
         clear_filter: "Clear"
         add_url: "URL 추가"
@@ -3091,11 +2986,11 @@ ko:
         reason_help: (토픽이나 포스트로 가는 링크)
         save: 저장
         delete: 삭제
-        delete_confirm: 정말로 이 배지를 삭제할까요?
+        delete_confirm: "정말로 이 배지를 삭제할까요?"
         revoke: 회수
         reason: 이유
         expand: 확장 &hellip;
-        revoke_confirm: 정말로 이 배지를 회수할까요?
+        revoke_confirm: "정말로 이 배지를 회수할까요?"
         edit_badges: 배지 수정
         grant_badge: 배지 부여
         granted_badges: 부여된 배지
@@ -3109,7 +3004,6 @@ ko:
         enabled: 배지 기능 사용
         icon: 아이콘
         image: 이미지
-        icon_help: "이미지 주소로 Font Awesome 클래스 또는 URL을 사용합니다"
         query: 배지 쿼리(SQL)
         target_posts: 글들을 대상으로 하는 쿼리
         auto_revoke: 회수 쿼리를 매일 실행
@@ -3133,13 +3027,13 @@ ko:
             text: "사라진 배지 샘플이 있습니다. 배지 query가 존재하지 않는 user ID나 post ID를 반환할 경우 발생합니다. 예상하지 못한 결과를 일으킬 수 있으니 query를 다시 한번 확인하세요."
           no_grant_count: "할당된 배지가 없습니다."
           grant_count:
-            other: "<b>%{count}</b>개의 배지가 할당됨."
+            other: <b>%{count}</b>개의 배지가 할당됨.
           sample: "샘플:"
           grant:
-            with: <span class="username">%{username}</span>
-            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>
+            with: "<span class=\"username\">%{username}</span>"
+            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:
         title: "이모지"
         help: "모든 사람이 쓸 수 있는 이모지를 추가합니다. (팁: 여러개 파일을 한 번에 드래그 & 드롭할 수 있어요)"
@@ -3185,7 +3079,7 @@ ko:
         category_id: "카테고리 ID"
         category_title: "카테고리"
         external_url: "외부 URL"
-        delete_confirm: 정말로 이 고유 링크를 삭제하시겠습니까?
+        delete_confirm: "정말로 이 고유 링크를 삭제하시겠습니까?"
         form:
           label: "새로운:"
           add: "추가"
@@ -3200,7 +3094,7 @@ ko:
       uploading: "업로드 중..."
       quit: "아마도 다음에"
       staff_count:
-        other: "커뮤니티에는 당신을 포함한 %{count}명의 스탭이 있습니다."
+        other: 커뮤니티에는 당신을 포함한 %{count}명의 스탭이 있습니다.
       invites:
         add_user: "추가"
         none_added: "관리자에게 초대되지 않았습니다. 계속하시겠습니까?"
diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml
index f3e61363c7b..a08b942a20f 100644
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@@ -16,9 +16,9 @@ lv:
           format: '%n %u'
           units:
             byte:
-              zero: baiti
               one: baits
               other: baiti
+              zero: baiti
             gb: GB
             kb: KB
             mb: MB
@@ -44,81 +44,82 @@ lv:
       tiny:
         half_a_minute: "< 1 m"
         less_than_x_seconds:
-          zero: "< 0 s"
-          one: "< 1 s"
-          other: "< %{count} s"
+          one: < 1 s
+          other: < %{count} s
+          zero: < 0 s
         x_seconds:
-          zero: "0 s"
-          one: "1 s"
-          other: "%{count} s"
+          one: 1 s
+          other: '%{count} s'
+          zero: 0 s
         x_minutes:
-          zero: "0 m"
-          one: "1 m"
-          other: "%{count} m"
+          one: 1 m
+          other: '%{count} m'
+          zero: 0 m
         about_x_hours:
-          zero: "0 h"
-          one: "1 h"
-          other: "%{count} h"
+          one: 1 h
+          other: '%{count} h'
+          zero: 0 h
         x_days:
-          zero: "0 d"
-          one: "1 d"
-          other: "%{count} d"
+          one: 1 d
+          other: '%{count} d'
+          zero: 0 d
         about_x_years:
-          zero: "0 g"
-          one: "1 g"
-          other: "%{count} g"
+          one: 1 g
+          other: '%{count} g'
+          zero: 0 g
         over_x_years:
-          zero: "> 0 g"
-          one: "> 1 g"
-          other: "> %{count} g"
+          one: '> 1 g'
+          other: '> %{count} g'
+          zero: '> 0 g'
         almost_x_years:
-          zero: "0 g"
-          one: "1 g"
-          other: "%{count} g"
+          one: 1 g
+          other: '%{count} g'
+          zero: 0 g
         date_month: "MMM D"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          zero: "0 minūtes"
-          one: "1 minūtes"
-          other: "%{count} minūtes"
+          one: 1 minūtes
+          other: '%{count} minūtes'
+          zero: 0 minūtes
         x_hours:
-          zero: "0 stundas"
-          one: "1 stunda"
-          other: "%{count} stundas"
+          one: 1 stunda
+          other: '%{count} stundas'
+          zero: 0 stundas
         x_days:
-          zero: "0 dienas"
-          one: "1 diena"
-          other: "%{count} dienas"
+          one: 1 diena
+          other: '%{count} dienas'
+          zero: 0 dienas
         date_year: "D MMM, YYYY"
       medium_with_ago:
         x_minutes:
-          zero: "pirms 0 minūtēm"
-          one: "pirms 1 minūtes"
-          other: "pirms %{count} minūtēm"
+          one: pirms 1 minūtes
+          other: pirms %{count} minūtēm
+          zero: pirms 0 minūtēm
         x_hours:
-          zero: "pirms 0 stundām"
-          one: "pirms 1 stundas"
-          other: "pirms %{count} stundām"
+          one: pirms 1 stundas
+          other: pirms %{count} stundām
+          zero: pirms 0 stundām
         x_days:
-          zero: "pirms 0 dienām"
-          one: "pirms 1 dienas"
-          other: "pirms %{count} dienām"
+          one: pirms 1 dienas
+          other: pirms %{count} dienām
+          zero: pirms 0 dienām
       later:
         x_days:
-          zero: "pēc 0 dienām"
-          one: "pēc 1 dienas"
-          other: "pēc %{count} dienām"
+          one: pēc 1 dienas
+          other: pēc %{count} dienām
+          zero: pēc 0 dienām
         x_months:
-          zero: "pēc 0 mēnešiem"
-          one: "pēc 1 mēneša"
-          other: "pēc %{count} mēnešiem"
+          one: pēc 1 mēneša
+          other: pēc %{count} mēnešiem
+          zero: pēc 0 mēnešiem
         x_years:
-          zero: "pēc 0 gadiem"
-          one: "pēc 1 gada"
-          other: "pēc %{count} gadiem"
+          one: pēc 1 gada
+          other: pēc %{count} gadiem
+          zero: pēc 0 gadiem
       previous_month: 'Iepriekšējais mēnesis'
       next_month: 'Nākamais mēnesis'
+      placeholder: datums
     share:
       topic: 'padalīties ar saiti uz šo tēmu'
       post: 'ieraksts #%{postNumber}'
@@ -129,7 +130,6 @@ lv:
       email: 'nosūtīt šo saiti e-pastā'
     action_codes:
       public_topic: "padarīja tēmu publisku %{when}"
-      private_topic: "padarīja šo tēmu privātu %{when}"
       split_topic: "sadalīja šo tēmu %{when}"
       invited_user: "uzaicināja %{who} %{when}"
       invited_group: "uzaicināja %{who} %{when}"
@@ -159,8 +159,6 @@ lv:
     topic_admin_menu: "tēmas pārvaldīšana"
     wizard_required: "Laipni lūgti jūsu jaunajā Discourse! Sāksim ar <a href='%{url}' data-auto-route='true'>uzstādīšanas palīgu</a> ✨"
     emails_are_disabled: "Administrators ir globāli izslēdzis visus izejošos e-pastus. Netiks nosūtīti nekāda veida paziņojumi."
-    bootstrap_mode_enabled: "Lai atvieglotu jūsu jaunās vietnes iedarbināšanu, esat sāknēšanas režīmā. Visiem jauniem lietotājiem būs piešķirts 1. uzticības līmenis un aktivizēts katras dienas kopsavilkums e-pastā. Tas automātiski izslēgsies, kad kopējais lietotāju skaits pārsniegs %{min_users} lietotājus."
-    bootstrap_mode_disabled: "Sāknēšanas režīms tiks izslēgts nākamo 24 stundu laikā."
     themes:
       default_description: "Noklusējums"
     s3:
@@ -184,6 +182,7 @@ lv:
     not_implemented: "Šī funkcionalitāte vēl nav ieviesta, atvainojiet!"
     no_value: "Nē"
     yes_value: "Jā"
+    submit: "Iesniegt"
     generic_error: "Atvainojiet, ir notikusi kļūda."
     generic_error_with_reason: "Notikusi kļūda: %{error}"
     sign_up: "Reģistrēties"
@@ -196,9 +195,9 @@ lv:
     show_help: "iespējas"
     links: "Saites"
     links_lowercase:
-      zero: "saite"
-      one: "saite"
-      other: "saites"
+      one: saite
+      other: saites
+      zero: saite
     faq: "BUJ"
     guidelines: "Vadlīnijas"
     privacy_policy: "Privātuma politika"
@@ -222,9 +221,9 @@ lv:
     max_of_count: "ne vairāk kā {{count}}"
     alternation: "vai"
     character_count:
-      zero: "{{count}} zīmes"
-      one: "{{count}} zīme"
-      other: "{{count}} zīmes"
+      one: '{{count}} zīme'
+      other: '{{count}} zīmes'
+      zero: '{{count}} zīmes'
     suggested_topics:
       title: "Ieteiktās tēmas"
       pm_title: "Ieteiktās ziņas"
@@ -236,8 +235,6 @@ lv:
       our_moderators: "Mūsu moderatori"
       stat:
         all_time: "Visi"
-        last_7_days: "Pēdējās 7 dienas"
-        last_30_days: "Pēdējās 30 dienas"
       like_count: "Atzinības"
       topic_count: "Tēmas"
       post_count: "Ieraksti"
@@ -258,19 +255,6 @@ lv:
       last_read: "šis ir pēdējais ieraksts, ko lasīji; klikšķini, lai pievienotu grāmatzīmēm"
       remove: "Noņemt grāmatzīmi"
       confirm_clear: "Vai esi pārliecināts, ka vēlies noņemt visas grāmatzīmes šajā tēmā?"
-    topic_count_latest:
-      zero: "{{count}} jaunas vai papildinātas tēmas."
-      one: "{{count}} jauna vai papildināta tēma."
-      other: "{{count}} jaunas vai papildinātas tēmas."
-    topic_count_unread:
-      zero: "{{count}} nelasītas tēmas."
-      one: "{{count}} nelasīta tēma."
-      other: "{{count}} nelasītas tēmas."
-    topic_count_new:
-      zero: "{{count}} jaunas tēmas."
-      one: "{{count}} jauna tēma."
-      other: "{{count}} jaunas tēmas."
-    click_to_show: "Noklikšķiniet, lai parādītu."
     preview: "priekšskatījums"
     cancel: "atcelt"
     save: "Saglabāt izmaiņas"
@@ -306,18 +290,18 @@ lv:
       cancel: "Atcelt"
       view_pending: "aplūkot vēl nepārbaudītos ierakstus"
       has_pending_posts:
-        zero: "Šai tēmā nav ierakstu, kuri gaida apstiprinājumu"
-        one: "Šai tēmā ir <b>{{count}}</b> ieraksts, kurš gaida apstiprinājumu"
-        other: "Šai tēmā ir <b>{{count}}</b> ieraksti, kuri gaida apstiprinājumu"
+        one: Šai tēmā ir <b>{{count}}</b> ieraksts, kurš gaida apstiprinājumu
+        other: Šai tēmā ir <b>{{count}}</b> ieraksti, kuri gaida apstiprinājumu
+        zero: Šai tēmā nav ierakstu, kuri gaida apstiprinājumu
       confirm: "Saglabāt izmaiņas"
       delete_prompt: "Vai tiešām vēlaties dzēst <b>%{username}</b>? Tas izdzēsīs visus lietotāja ierakstus un bloķēs e-pastu un IP adresi."
       approval:
         title: "Ieraksts gaida apstiprinājumu"
         description: "Mēs saņēmām jūsu ierakstu, taču vispirms to jāapstiprina moderatoram. Lūdzu, esiet pacietīgi."
         pending_posts:
-          zero: "Šai tēmā nav ierakstu, kuri gaida gaida apstiprinājumu."
-          one: "Šai tēmā ir <strong>1</strong> ieraksts, kurš gaida apstiprinājumu."
-          other: "Šai temā ir <strong>{{count}}</strong> ieraksti, kuri gaida apstiprinājumu."
+          one: Šai tēmā ir <strong>1</strong> ieraksts, kurš gaida apstiprinājumu.
+          other: Šai temā ir <strong>{{count}}</strong> ieraksti, kuri gaida apstiprinājumu.
+          zero: Šai tēmā nav ierakstu, kuri gaida gaida apstiprinājumu.
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> pievienoja ierakstus <a href='{{topicUrl}}'>tēmai</a>"
@@ -351,9 +335,9 @@ lv:
       posts_read: "Lasīts"
       posts_read_long: "Lasītie ieraksti"
       total_rows:
-        zero: "Nav lietotāju"
-        one: "1 lietotājs"
-        other: "%{count} lietotāji"
+        one: 1 lietotājs
+        other: '%{count} lietotāji'
+        zero: Nav lietotāju
     group_histories:
       actions:
         change_group_setting: "Mainīt grupas iestatījumus"
@@ -362,22 +346,6 @@ lv:
         make_user_group_owner: "Padarīt par īpašnieku"
         remove_user_as_group_owner: "Noņemt īpašnieka tiesības"
     groups:
-      logs:
-        title: "Žurnāls"
-        when: "Kad"
-        action: "Darbība"
-        acting_user: "Lietotājs, kas veica darbību"
-        target_user: "Mērķa lietotājs"
-        subject: "Tēma"
-        details: "Papildus informācija"
-        from: "No"
-        to: "Kam"
-      edit:
-        title: 'Labot grupu'
-        full_name: 'Pilns vārds'
-        add_members: "Pievienot dalībniekus"
-        delete_member_confirm: "Izņemt '%{username}' no grupas '%{group}'?"
-      name_placeholder: "Grupas nosaukums, bez atstarpēm, tādi paši noteikumi kā lietotāja vārdam"
       public_admission: "Atļaut lietotājiem brīvi pievienoties grupai (šai grupai jābūt publiski redzamai)"
       public_exit: "Ļaut lietotājiem brīvi pamest grupu"
       empty:
@@ -388,45 +356,27 @@ lv:
         topics: "Grupas dalībnieki nav izveidojuši nevienu tēmu."
         logs: "Par šo grupu nav žurnāla ierakstu."
       add: "Pievienot"
-      join: "Pievienoties grupai"
-      leave: "Pamest grupu"
-      request: "Pieprasīt pievienošanu grupai"
       message: "Ziņa"
-      automatic_group: Automātiska grupa
-      closed_group: Slēgta grupa
-      is_group_user: "Jūs esat šīs grupas dalībnieks"
       allow_membership_requests: "Ļauj lietotājiem sūtīt dalības pieprasījumus grupu īpašniekiem"
       membership: "Piederība"
       name: "Vārds"
-      user_count: "Dalībnieku skaits"
       bio: "Par grupu"
-      selector_placeholder: "Pievienot dalībniekus"
       owner: "īpašnieks"
       index:
         title: "Grupas"
         empty: "Nav redzamu grupu."
       activity: "Aktivitāte"
-      members: "Dalībnieki"
       topics: "Tēmas"
       posts: "Ieraksti"
       mentions: "Pieminēšanas"
       messages: "Ziņas"
       notification_level: "Noklusējuma līmenis paziņojumiem par jaunām grupas ziņām"
-      visibility_levels:
-        title: "Kas var redzēt grupu?"
-        public: "Ikviens"
-        members: "Grupu īpašnieki, biedri un administratori"
-        staff: "Grupu īpašnieki un personāls"
-        owners: "Grupu īpašnieki un administratori"
       alias_levels:
         nobody: "Neviens"
         only_admins: "Tikai administratori"
         mods_and_admins: "Tikai moderatori un administratori"
         members_mods_and_admins: "Tikai grupu biedri, moderatori un administratori"
         everyone: "Ikviens"
-      trust_levels:
-        title: "Uzticamības līmenis, ko automātiski piešķir visiem dalībniekiem pievienošanas brīdī:"
-        none: "Nav"
       notifications:
         watching:
           title: "Skatās"
@@ -451,23 +401,21 @@ lv:
       flair_color_placeholder: "(Neobligāti) Heksadecimālā krāsas vērtība"
       flair_preview_icon: "Priekšskatījuma ikona"
       flair_preview_image: "Priekšskatījuma attēls"
-      flair_note: "Piezīme: attēls parādīsies tikai lietotāja primārai grupai."
     user_action_groups:
-      '1': "Veiktās atzinības"
-      '2': "Saņemtās atzinības"
-      '3': "Grāmatzīmes"
-      '4': "Tēmas"
-      '5': "Atbildes"
-      '6': "Reakcijas"
-      '7': "Pieminēšanas"
-      '9': "Citāti"
-      '11': "Labojumi"
-      '12': "Nosūtne"
-      '13': "Iesūtne"
-      '14': "Gaida apstiprinājumu"
+      "1": "Veiktās atzinības"
+      "2": "Saņemtās atzinības"
+      "3": "Grāmatzīmes"
+      "4": "Tēmas"
+      "5": "Atbildes"
+      "6": "Reakcijas"
+      "7": "Pieminēšanas"
+      "9": "Citāti"
+      "11": "Labojumi"
+      "12": "Nosūtne"
+      "13": "Iesūtne"
+      "14": "Gaida apstiprinājumu"
     categories:
       all: "visas sadaļas"
-      all_subcategories: "viss"
       no_subcategory: "nekas"
       category: "Sadaļa"
       category_list: "Parādīt sadaļu sarakstu"
@@ -486,13 +434,13 @@ lv:
       toggle_ordering: "mainīt secības kontroli"
       subcategories: "Apakšsadaļas"
       topic_sentence:
-        zero: "Nav tēmu"
-        one: "1 tēma"
-        other: "%{count} tēmas"
+        one: 1 tēma
+        other: '%{count} tēmas'
+        zero: Nav tēmu
       topic_stat_sentence:
-        zero: "Nav jaunu tēmu."
-        one: "%{count} jauna tēma pēdējā %{unit}."
-        other: "%{count} jaunas tēmas pēdējā %{unit}."
+        one: '%{count} jauna tēma pēdējā %{unit}.'
+        other: '%{count} jaunas tēmas pēdējā %{unit}.'
+        zero: Nav jaunu tēmu.
     ip_lookup:
       title: IP adreses meklēšana
       hostname: Resursdatora nosaukums
@@ -533,7 +481,6 @@ lv:
       notifications: "Paziņojumi"
       statistics: "Statistika"
       desktop_notifications:
-        label: "Darbvirsmas paziņojumi"
         not_supported: "Atvainojiet, bet šī pārlūkprogramma neatbalsta paziņojumus."
         perm_default: "Ieslēgt paziņojumus"
         perm_denied_btn: "Piekļuve liegta"
@@ -589,7 +536,6 @@ lv:
       delete_account: "Izdzēst manu profilu"
       delete_account_confirm: "Vai esat drošs, ka vēlaties neatgriezeniski dzēst savu profilu? Šo darbību nevar atcelt!"
       deleted_yourself: "Jūsu profils ir veiksmīgi izdzēsts."
-      delete_yourself_not_allowed: "Pašlaik jūs nevarat izdzēst savu profilu. Lūdzu sazinieties ar administratoru, lai izdzēstu jūsu profilu."
       unread_message_count: "Ziņas"
       admin_delete: "Dzēst"
       users: "Lietotāji"
@@ -677,9 +623,9 @@ lv:
         authenticated: "Jūsu e-pastu autentificēja {{provider}}"
         frequency_immediately: "Mēs nekavējoties sūtīsim jums epastu par jaunām neizlasītām ziņām."
         frequency:
-          zero: "Mēs sūtīsim jums e-pastu tikai tad, ja nebūsim jūs redzējuši pēdējo {{count}} minūšu laikā."
-          one: "Mēs sūtīsim jums e-pastu tikai tad, ja nebūsim jūs redzējuši pēdējās minūtes laikā."
-          other: "Mēs sūtīsim jums e-pastu tikai tad, ja nebūsim jūs redzējuši pēdējo {{count}} minūšu laikā."
+          one: Mēs sūtīsim jums e-pastu tikai tad, ja nebūsim jūs redzējuši pēdējās minūtes laikā.
+          other: Mēs sūtīsim jums e-pastu tikai tad, ja nebūsim jūs redzējuši pēdējo {{count}} minūšu laikā.
+          zero: Mēs sūtīsim jums e-pastu tikai tad, ja nebūsim jūs redzējuši pēdējo {{count}} minūšu laikā.
       name:
         title: "Vārds"
         instructions: "jūsu pilnais vārds (neobligāti)"
@@ -710,8 +656,6 @@ lv:
       created: "Pievienojās"
       log_out: "Iziet"
       location: "Atrašanās vieta"
-      card_badge:
-        title: "Lietotāja kartiņas žetons"
       website: "Tīmekļa vietne"
       email_settings: "E-pasts"
       like_notification_frequency:
@@ -765,11 +709,10 @@ lv:
         title: "Ielūgumi"
         user: "Ielūgtie lietotāji"
         sent: "Nosūtīts"
-        none: "Ielūgumu, kas gaidītu apstiprinājumu, nav."
         truncated:
-          zero: "Nav ielūgumu."
-          one: "Pirmais ielūgums."
-          other: "Pirmie {{count}} ielūgumi."
+          one: Pirmais ielūgums.
+          other: Pirmie {{count}} ielūgumi.
+          zero: Nav ielūgumu.
         redeemed: "Pieņemtie ielūgumi"
         redeemed_tab: "Pieņemti"
         redeemed_tab_with_count: "Pieņemti ({{count}})"
@@ -815,25 +758,25 @@ lv:
         stats: "Statistika"
         time_read: "lasīšanas laiks"
         topic_count:
-          zero: "nav izveidotu tēmu"
-          one: "viena tēma izveidota"
-          other: "izveidotās tēmas"
+          one: viena tēma izveidota
+          other: izveidotās tēmas
+          zero: nav izveidotu tēmu
         post_count:
-          zero: "ierakstu izveidoti"
-          one: "ieraksts izveidots"
-          other: "izveidotie ieraksti"
+          one: ieraksts izveidots
+          other: izveidotie ieraksti
+          zero: ierakstu izveidoti
         days_visited:
-          zero: "apmeklētas dienas"
-          one: " apmeklēta diena"
-          other: "apmeklējuma dienas"
+          one: ' apmeklēta diena'
+          other: apmeklējuma dienas
+          zero: apmeklētas dienas
         posts_read:
-          zero: "ierakstu izlasīti"
-          one: "ieraksts izlasīts"
-          other: "izlasītie ieraksti"
+          one: ieraksts izlasīts
+          other: izlasītie ieraksti
+          zero: ierakstu izlasīti
         bookmark_count:
-          zero: "atzīmes"
-          one: "atzīme"
-          other: "grāmatzīmes"
+          one: atzīme
+          other: grāmatzīmes
+          zero: atzīmes
         top_replies: "Labākās atbildes"
         no_replies: "Vēl nav atbilžu."
         more_replies: "Vairāk atbilžu"
@@ -901,9 +844,9 @@ lv:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> sasniegts vietnes limits %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> pārsniegts vietnes limits %{siteSettingRate}."
       rate:
-        zero: "nav kļūdu"
-        one: "%{count} kļūda/%{duration}"
-        other: "%{count} kļūdas/%{duration}"
+        one: '%{count} kļūda/%{duration}'
+        other: '%{count} kļūdas/%{duration}'
+        zero: nav kļūdu
     learn_more: "uzzināt vairāk..."
     all_time: 'kopā'
     all_time_desc: 'pavisam izveidotas tēmas'
@@ -919,9 +862,9 @@ lv:
     unmute: Pārtraukt klusināšanu
     last_reply_lowercase: pēdējā atbilde
     replies_lowercase:
-      zero: atbildes
       one: atbilde
       other: atbildes
+      zero: atbildes
     signup_cta:
       sign_up: "Pierakstīties"
       hide_session: "Atgādināt man rīt"
@@ -1083,9 +1026,9 @@ lv:
       similar_topics: "Jūsu tēma ir līdzīga..."
       drafts_offline: "lokāls melnraksts"
       group_mentioned:
-        zero: "Pieminot {{group}}, neviens nesaņems paziņojumu, jo grupa ir tukša."
-        one: "Pieminot {{group}}, šis cilvēks saņems paziņojumu – esat pārliecināti?"
-        other: "Pieminot {{group}}, šiem <a href='{{group_link}}'>{{count}} cilvēki</a> saņems paziņojumu – esat pārliecināti?"
+        one: Pieminot {{group}}, šis cilvēks saņems paziņojumu – esat pārliecināti?
+        other: Pieminot {{group}}, šiem <a href='{{group_link}}'>{{count}} cilvēki</a> saņems paziņojumu – esat pārliecināti?
+        zero: Pieminot {{group}}, neviens nesaņems paziņojumu, jo grupa ir tukša.
       cannot_see_mention:
         category: "Jūs pieminējāt {{username}}, kas ir bez piekļuves šai sadaļai un tāpēc nesaņems nekādu paziņojumu. Lai to izlabotu, pievieno viņus grupai ar pieeju šai sadaļai."
         private: "Jūsu pieminējāt {{username}}, kas neredzēs šo privāto ziņu un tāpēc nesaņems nekādu paziņojumu. Lai to izlabotu, pievieno viņus šai ziņai."
@@ -1156,28 +1099,12 @@ lv:
       empty: "Nav atrasti paziņojumi."
       more: "skatīt senākus paziņojumus"
       total_flagged: "pavisam ieraksti ar sūdzībam"
-      alt:
-        mentioned: "Pieminēja"
-        quoted: "Citēja"
-        replied: "Atbildēja"
-        posted: "Ieraksts"
-        edited: "Korektētēja"
-        liked: "Pauda atzinību jūsu ierakstam"
-        private_message: "Privāta ziņa no"
-        invited_to_private_message: "Ielūgums uz privāto ziņu no"
-        invited_to_topic: "Ielūgums uz tēmu no"
-        invitee_accepted: "Ielūgumu pieņēma "
-        moved_post: "Jūsu ierakstu pārvietoja"
-        linked: "Saite uz jūsu ierakstu"
-        granted_badge: "Žetonu piešķīra"
-        group_message_summary: "Ziņas grupas iesūtnē"
       popup:
         mentioned: '{{username}} pieminēja jūs "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} pieminēja jūs "{{topic}}" - {{site_title}}'
         quoted: '{{username}} citēja jūs "{{topic}}" - {{site_title}}'
         replied: '{{username}} atbildēja jums "{{topic}}" - {{site_title}}'
         posted: '{{username}} ierakstīja "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} nosūtīja jums privātu ziņu "{{topic}}" - {{site_title}}'
         linked: '{{username}} ievietoja saiti uz jūsu ierakstu no "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Pievienot attēlu"
@@ -1274,9 +1201,9 @@ lv:
         notification_level: "Paziņojumi"
         choose_new_category: "Izvēlēties jaunu sadaļu šīm tēmām:"
         selected:
-          zero: "Jūs izvēlējāties <b>0.</b> tēmas."
-          one: "Jūs izvēlējāties <b>1.</b> tēmu."
-          other: "Jūs izvēlējāties <b>{{count}}</b> tēmas."
+          one: Jūs izvēlējāties <b>1.</b> tēmu.
+          other: Jūs izvēlējāties <b>{{count}}</b> tēmas.
+          zero: Jūs izvēlējāties <b>0.</b> tēmas.
         change_tags: "Aizvietot tagus"
         append_tags: "Pievienot tagus"
         choose_new_tags: "Izvēlēties jaunus tagus šīm tēmām:"
@@ -1308,13 +1235,10 @@ lv:
         bookmarks: "Vairāk grāmatzīmēs ievietoto tēmu nav. "
         search: "Nekas netika atrasts."
     topic:
-      unsubscribe:
-        stop_notifications: "Tagad saņemsi mazāk paziņojumus no <strong>{{title}}</strong>"
-        change_notification_state: "Tavs šī brīža paziņojumu statuss ir"
       filter_to:
-        zero: "tēmā ziņu nav"
-        one: "1 ziņa tēmā"
-        other: "{{count}} ziņas tēmā"
+        one: 1 ziņa tēmā
+        other: '{{count}} ziņas tēmā'
+        zero: tēmā ziņu nav
       create: 'Jauna tēma'
       create_long: 'Izveidot jaunu tēmu '
       private_message: 'Rakstīt ziņu '
@@ -1328,13 +1252,13 @@ lv:
       new: 'Jauna tēma'
       unread: 'nelasīti'
       new_topics:
-        zero: 'Jaunu tēmu nav'
-        one: '1 jauna tēma'
+        one: 1 jauna tēma
         other: '{{count}} jaunas tēmas '
+        zero: Jaunu tēmu nav
       unread_topics:
-        zero: 'Nelasītu tēmu nav'
-        one: '1 nelasīta tēma'
+        one: 1 nelasīta tēma
         other: '{{count}} nelasītas tēmas'
+        zero: Nelasītu tēmu nav
       title: 'Tēma'
       invalid_access:
         title: "Šī tēma ir privāta "
@@ -1347,21 +1271,21 @@ lv:
         title: "Tēma nav atrasta "
         description: "Atvainojiet, šo tēmu neatradām. Varbūt to noņēma moderators? "
       total_unread_posts:
-        zero: "Tev šajā tēmā nav neizlasītu ziņojumu"
-        one: "Tev šajā tēmā ir 1 neizlasīts ziņojums"
-        other: "Tev šajā tēmā ir {{count}} neizlasītu ziņojumu "
+        one: Tev šajā tēmā ir 1 neizlasīts ziņojums
+        other: 'Tev šajā tēmā ir {{count}} neizlasītu ziņojumu '
+        zero: Tev šajā tēmā nav neizlasītu ziņojumu
       unread_posts:
-        zero: "Tev šajā tēmā nav vecu neizlasītu ziņojumu"
-        one: "Tev šajā tēmā ir 1 vecs neizlasīts ziņojums"
-        other: "Tev šajā tēmā ir {{count}} vecu neizlasītu ziņojumu. "
+        one: Tev šajā tēmā ir 1 vecs neizlasīts ziņojums
+        other: 'Tev šajā tēmā ir {{count}} vecu neizlasītu ziņojumu. '
+        zero: Tev šajā tēmā nav vecu neizlasītu ziņojumu
       new_posts:
-        zero: "Šajā tēmā nav jaunu nelasītu ziņojumu"
-        one: "Šajā tēmā ir 1 jauns nelasīts ziņojums"
-        other: "Šajā tēmā ir {{count}} jauni nelasīti ziņojumi"
+        one: Šajā tēmā ir 1 jauns nelasīts ziņojums
+        other: Šajā tēmā ir {{count}} jauni nelasīti ziņojumi
+        zero: Šajā tēmā nav jaunu nelasītu ziņojumu
       likes:
-        zero: "Šai tēmai nav \"patīk\""
-        one: "Šai tēmai ir viens \"patīk\""
-        other: "Šai tēmā ir {{count}} atzinības"
+        one: Šai tēmai ir viens "patīk"
+        other: Šai tēmā ir {{count}} atzinības
+        zero: Šai tēmai nav "patīk"
       back_to_list: "Atpakaļ pie tēmu saraksta "
       options: "Tēmas iestatījumi "
       show_links: "rādīt saites šajā tēmā"
@@ -1371,9 +1295,9 @@ lv:
       read_more_MF: "{ UNREAD, plural, =0 {} one { Palikusi <a href='/unread'>1 nelasīta</a> } other { Palikušas <a href='/unread'># nelasītas</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='/new'>1 jauna</a> tēma} other { {BOTH, select, true{and } false {are } other{}} <a href='/new'># jaunas</a> tēmas} } remaining, or {CATEGORY, select, true {pārlūkot citas tēmas iekš {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Pārlūkot visas sadaļas
       view_latest_topics: Skatīt jaunākās tēmas
-      suggest_create_topic: 'Kādēļ gan neizveidot jaunu tēmu? '
+      suggest_create_topic: "Kādēļ gan neizveidot jaunu tēmu? "
       jump_reply_up: pāriet uz agrāku atbildi
-      jump_reply_down: 'pāriet uz vēlāku atbildi '
+      jump_reply_down: "pāriet uz vēlāku atbildi "
       deleted: "Tēma ir dzēsta "
       topic_status_update:
         save: "Uzstādīt taimeri "
@@ -1416,9 +1340,9 @@ lv:
         auto_reminder: "Jums atgādinās par šo tēmu pēc %{timeLeft}."
       auto_close_title: 'Automātiskās slēgšanas iestatījumi'
       auto_close_immediate:
-        zero: "Pēdējais ieraksts tēmā ir %{count} stundas vecs, tāpēc tēma tiks slēgta nekavējoties."
-        one: "Pēdējais ieraksts tēmā ir 1 stundu vecs, tāpēc tēma tiks slēgta nekavējoties."
-        other: "Pēdējais ieraksts tēmā ir %{count} stundas vecs, tāpēc tēma tiks slēgta nekavējoties."
+        one: Pēdējais ieraksts tēmā ir 1 stundu vecs, tāpēc tēma tiks slēgta nekavējoties.
+        other: Pēdējais ieraksts tēmā ir %{count} stundas vecs, tāpēc tēma tiks slēgta nekavējoties.
+        zero: Pēdējais ieraksts tēmā ir %{count} stundas vecs, tāpēc tēma tiks slēgta nekavējoties.
       timeline:
         back: "Atpakaļ"
         back_description: "Atgriezties pie pēdējā nelasītā ieraksta"
@@ -1436,24 +1360,24 @@ lv:
         total: kopējais ierakstu skaits
         current: šis ieraksts
       notifications:
-        title: izmainīt to, cik bieži jūs saņemsiet paziņojumus par šo temu
+        title: "izmainīt to, cik bieži jūs saņemsiet paziņojumus par šo temu"
         reasons:
           mailing_list_mode: "Jums ir ieslēgts vēstkopas ieraksts, tāpēc par atbildēm šai tēmā ziņosim e-pastā."
-          '3_10': 'Jūs saņemsiet paziņojumus, jo novērojat tagu, kas ir šai tēmai.'
-          '3_6': 'Jūs saņemsiet paziņojumus, jo novērojat šo sadaļu.'
-          '3_5': 'Jūs saņemsiet paziņojumus, jo sākāt novērot šo tēmu automātiski.'
-          '3_2': 'Jūs saņemsiet paziņojumus, jo novērojat šo tēmu.'
-          '3_1': 'Jūs saņemsiet paziņojumus, jo izveidojāt šo tēmu.'
-          '3': 'Jūs saņemsiet paziņojumus, jo jūs novērojat šo tēmu.'
-          '2_8': 'Jūs redzēsiet jauno atbilžu skaitu, jo sekojat šai sadaļai.'
-          '2_4': 'Jūs redzēsiet jauno atbilžu skaitu, jo atbildējāt šajā tēmā.'
-          '2_2': 'Jūs redzēsiet jauno atbilžu skaitu, jo jūs sekojat šai tēmai.'
-          '2': 'Jūs redzēsiet jauno atbilžu skaitu, jo jūs <a href="/u/{{username}}/preferences">lasījāt šo tēmu</a>.'
-          '1_2': 'Jūs saņemsiet paziņojumu, ja kāds pieminēs jūsu vārdu paziņos, ja @pseidonīmu vai atbildēs jums.'
-          '1': 'Jūs saņemsiet paziņojumu, ja kāds pieminēs jūsu vārdu paziņos, ja @pseidonīmu vai atbildēs jums.'
-          '0_7': 'Nesaņemt nekādus paziņojumus par šo sadaļu.'
-          '0_2': 'Nesaņemt nekādus paziņojumus par šo tēmu.'
-          '0': 'Nesaņemt nekādus paziņojumus par šo tēmu.'
+          "3_10": 'Jūs saņemsiet paziņojumus, jo novērojat tagu, kas ir šai tēmai.'
+          "3_6": 'Jūs saņemsiet paziņojumus, jo novērojat šo sadaļu.'
+          "3_5": 'Jūs saņemsiet paziņojumus, jo sākāt novērot šo tēmu automātiski.'
+          "3_2": 'Jūs saņemsiet paziņojumus, jo novērojat šo tēmu.'
+          "3_1": 'Jūs saņemsiet paziņojumus, jo izveidojāt šo tēmu.'
+          "3": 'Jūs saņemsiet paziņojumus, jo jūs novērojat šo tēmu.'
+          "2_8": 'Jūs redzēsiet jauno atbilžu skaitu, jo sekojat šai sadaļai.'
+          "2_4": 'Jūs redzēsiet jauno atbilžu skaitu, jo atbildējāt šajā tēmā.'
+          "2_2": 'Jūs redzēsiet jauno atbilžu skaitu, jo jūs sekojat šai tēmai.'
+          "2": 'Jūs redzēsiet jauno atbilžu skaitu, jo jūs <a href="/u/{{username}}/preferences">lasījāt šo tēmu</a>.'
+          "1_2": 'Jūs saņemsiet paziņojumu, ja kāds pieminēs jūsu vārdu paziņos, ja @pseidonīmu vai atbildēs jums.'
+          "1": 'Jūs saņemsiet paziņojumu, ja kāds pieminēs jūsu vārdu paziņos, ja @pseidonīmu vai atbildēs jums.'
+          "0_7": 'Nesaņemt nekādus paziņojumus par šo sadaļu.'
+          "0_2": 'Nesaņemt nekādus paziņojumus par šo tēmu.'
+          "0": 'Nesaņemt nekādus paziņojumus par šo tēmu.'
         watching_pm:
           title: "Novērot"
           description: "Jums paziņos par katru jaunu atbildi šai ziņai un rādīs jauno atbilžu skaitu."
@@ -1493,7 +1417,6 @@ lv:
         visible: "Atgriezt tēmu sarakstos"
         reset_read: "Atstatīt visu kā nelasītu"
         make_public: "Izveidot publisku tēmu"
-        make_private: "Izveidot privātu ziņu"
       feature:
         pin: "Piespraust tēmu"
         unpin: "Atspraust tēmu"
@@ -1526,9 +1449,9 @@ lv:
         pin_validation: "Lai piespraustu šo tēmu, ir nepieciešams datums."
         not_pinned: "Sadaļā {{categoryLink}} nav piespraustu tēmu."
         already_pinned:
-          zero: "Sadaļā {{categoryLink}} šobrīd nav piespraustu tēmu"
-          one: "Sadaļā {{categoryLink}} šobrīd piesprausta {{count}} tēma"
-          other: "Sadaļā {{categoryLink}} šobrīd piespraustas <strong class='badge badge-notification unread'>{{count}}</strong> tēmas"
+          one: Sadaļā {{categoryLink}} šobrīd piesprausta {{count}} tēma
+          other: Sadaļā {{categoryLink}} šobrīd piespraustas <strong class='badge badge-notification unread'>{{count}}</strong> tēmas
+          zero: Sadaļā {{categoryLink}} šobrīd nav piespraustu tēmu
         pin_globally: "Likt šai tēmai parādīties visu tēmu sarakstu augšgalos līdz"
         confirm_pin_globally: "Jums jau ir {{count}} globāli piespraustas tēmas. Pārāk daudz piespraustu tēmu ir apgrūtinājums jauniem un anonīmiem lietotājiem. Vai jūs esat drošs, ka vēlaties globāli piespraust vēl vienu tēmu."
         unpin_globally: "Noņemt šo tēmu no visu tēmu sarakstu augšgaliem."
@@ -1536,9 +1459,9 @@ lv:
         global_pin_note: "Lietotāji var atspraust tēmu, katrs sev personīgi."
         not_pinned_globally: "Nav nevienas globāli piespraustas tēmas."
         already_pinned_globally:
-          zero: "Šobrīd globāli piespraustas <strong class='badge badge-notification unread'>{{count}}</strong> tēmas"
-          one: "Šobrīd globāli piesprausta <strong class='badge badge-notification unread'>1</strong> tēma"
-          other: "Šobrīd globāli piespraustas <strong class='badge badge-notification unread'>{{count}}</strong> tēmas"
+          one: Šobrīd globāli piesprausta <strong class='badge badge-notification unread'>1</strong> tēma
+          other: Šobrīd globāli piespraustas <strong class='badge badge-notification unread'>{{count}}</strong> tēmas
+          zero: Šobrīd globāli piespraustas <strong class='badge badge-notification unread'>{{count}}</strong> tēmas
         make_banner: "Pārveidot šo tēmu par baneri, kas parādīsies visu lapu augšpusē."
         remove_banner: "Noņemt baneri, kas parādās visu lapu augšpusē."
         banner_note: "Lietotāji var noņemt baneri, aizverot to. Jebkurā brīdī tikai viena tēma var būt par baneri."
@@ -1575,9 +1498,9 @@ lv:
       login_reply: 'Lai atbildētu, ienāc forumā'
       filters:
         n_posts:
-          zero: "{{count}} ieraksti"
-          one: "1 ieraksts"
-          other: "{{count}} ieraksti"
+          one: 1 ieraksts
+          other: '{{count}} ieraksti'
+          zero: '{{count}} ieraksti'
         cancel: "Noņemt filtru"
       split_topic:
         title: "Pārvietot uz jaunu tēmu"
@@ -1585,17 +1508,17 @@ lv:
         topic_name: "Jaunās tēmas nosaukums"
         error: "Pārvietojot ierakstus uz jauno tēmu, notika kļūda."
         instructions:
-          zero: "Jūs tūlīt izveidosiet jaunu tēmu bez ierakstiem."
-          one: "Jūs tūlīt izveidosiet jaunu tēmu ar izvēlēto ierakstu."
-          other: "Jūs tūlīt izveidosiet jaunu tēmu un aizpildīsiet to ar <b>{{count}}</b> izvēlētajiem ierakstiem."
+          one: Jūs tūlīt izveidosiet jaunu tēmu ar izvēlēto ierakstu.
+          other: Jūs tūlīt izveidosiet jaunu tēmu un aizpildīsiet to ar <b>{{count}}</b> izvēlētajiem ierakstiem.
+          zero: Jūs tūlīt izveidosiet jaunu tēmu bez ierakstiem.
       merge_topic:
         title: "Pārvietot uz esošu tēmu"
         action: "pārvietot uz esošu tēmu"
         error: "Pārvietojot ierakstus uz šo tēmu, notika kļūda."
         instructions:
-          zero: "Lūdzu izvēlieties tēmu, uz kuru vēlaties pārvietot šos ierakstus."
-          one: "Lūdzu izvēlieties tēmu, uz kuru vēlaties pārvietot šo ierakstu."
-          other: "Lūdzu izvēlieties tēmu, uz kuru vēlaties pārvietot šos <b>{{count}}</b> ierakstus."
+          one: Lūdzu izvēlieties tēmu, uz kuru vēlaties pārvietot šo ierakstu.
+          other: Lūdzu izvēlieties tēmu, uz kuru vēlaties pārvietot šos <b>{{count}}</b> ierakstus.
+          zero: Lūdzu izvēlieties tēmu, uz kuru vēlaties pārvietot šos ierakstus.
       merge_posts:
         title: "Apvienot izvēlētos ierakstus"
         action: "apvienot izvēlētos ierakstus"
@@ -1607,10 +1530,9 @@ lv:
         label: "Jaunais ierakstu īpašnieks"
         placeholder: "jaunā īpašnieka lietotājvārds"
         instructions:
-          zero: "Lūdzu, izvēlieties jauno īpašnieku <b>{{old_user}}</b> ierakstiem."
-          one: "Lūdzu, izvēlieties jauno īpašnieku <b>{{old_user}}</b> ierakstam."
-          other: "Lūdzu, izvēlieties jauno īpašnieku {{count}} <b>{{old_user}}</b> ierakstiem."
-        instructions_warn: "Ņemiet vērā, ka pagātnes paziņojumi par šo ieraksti netiks pārsūtīti jaunajam lietotājam. Uzmanību: šobrīd nekādi no ieraksta atkarīgi dati netiek pārsūtīti jaunajam lietotājam. Lietojiet uzmanīgi."
+          one: Lūdzu, izvēlieties jauno īpašnieku <b>{{old_user}}</b> ierakstam.
+          other: Lūdzu, izvēlieties jauno īpašnieku {{count}} <b>{{old_user}}</b> ierakstiem.
+          zero: Lūdzu, izvēlieties jauno īpašnieku <b>{{old_user}}</b> ierakstiem.
       change_timestamp:
         title: "Nomainīt laika zīmogu..."
         action: "nomainīt laika zīmogu"
@@ -1625,12 +1547,10 @@ lv:
         select_all: izvēlēties visu
         deselect_all: visiem noņemt izvēli
         description:
-          zero: Jūs esat izvēlējies <b>0</b> ierakstu.
           one: Jūs esat izvēlējies <b>1</b> ierakstu.
           other: Jūs esat izvēlējies <b>{{count}}</b> ierakstus.
+          zero: Jūs esat izvēlējies <b>0</b> ierakstu.
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Citāts"
       edit_reason: "Iemesls:"
       post_number: "ieraksts {{number}}"
@@ -1643,32 +1563,32 @@ lv:
       show_full: "Parādīt visu ierakstu"
       show_hidden: 'Skatīt slēpto saturu.'
       deleted_by_author:
-        zero: "(autors atcēlis ierakstu, tas tiks automātiski dzēsts pēc %{count} stundām, ja neviens nav ziņojis par to)"
-        one: "(autors atcēlis ierakstu, tas tiks automātiski dzēsts pēc %{count} stundas, ja neviens nav ziņojis par to)"
-        other: "(autors atcēlis ierakstu, tas tiks automātiski dzēsts pēc %{count} stundām, ja neviens nav ziņojis par to)"
+        one: (autors atcēlis ierakstu, tas tiks automātiski dzēsts pēc %{count} stundas, ja neviens nav ziņojis par to)
+        other: (autors atcēlis ierakstu, tas tiks automātiski dzēsts pēc %{count} stundām, ja neviens nav ziņojis par to)
+        zero: (autors atcēlis ierakstu, tas tiks automātiski dzēsts pēc %{count} stundām, ja neviens nav ziņojis par to)
       expand_collapse: "paplašināt/minimizēt"
       gap:
-        zero: "apslēpt {{count}} slēptās atbildes"
-        one: "aplūjot 1 slēpto atbildi"
-        other: "aplūkot {{count}} slēptās atbildes"
+        one: aplūjot 1 slēpto atbildi
+        other: aplūkot {{count}} slēptās atbildes
+        zero: apslēpt {{count}} slēptās atbildes
       unread: "Ieraksts nav lasīts"
       has_replies:
-        zero: "{{count}} atbildes"
-        one: "{{count}} atbilde"
-        other: "{{count}} atbildes"
+        one: '{{count}} atbilde'
+        other: '{{count}} atbildes'
+        zero: '{{count}} atbildes'
       has_likes:
-        zero: "{{count}} atzinības"
-        one: "{{count}} atzinība"
-        other: "{{count}} atzinības"
+        one: '{{count}} atzinība'
+        other: '{{count}} atzinības'
+        zero: '{{count}} atzinības'
       has_likes_title:
-        zero: "{{count}} cilvēkiem patika šis ieraksts"
-        one: "1 cilvēkam patika šis ieraksts"
-        other: "{{count}} cilvēkiem patika šis ieraksts"
+        one: 1 cilvēkam patika šis ieraksts
+        other: '{{count}} cilvēkiem patika šis ieraksts'
+        zero: '{{count}} cilvēkiem patika šis ieraksts'
       has_likes_title_only_you: "jums patika šis ieraksts"
       has_likes_title_you:
-        zero: "jums patika šis ieraksts"
-        one: "jums un 1 citam cilvēkam patika šis ieraksts"
-        other: "jums un {{count}} citiem cilvēkiem patika šis ieraksts"
+        one: jums un 1 citam cilvēkam patika šis ieraksts
+        other: jums un {{count}} citiem cilvēkiem patika šis ieraksts
+        zero: jums patika šis ieraksts
       errors:
         create: "Atvainojiet, izveidojot jūsu ierakstu, notika kļūda. Lūdzu, mēģiniet vēlreiz."
         edit: "Atvainojiet, rediģējot jūsu ierakstu, notika kļūda. Lūdzu, mēģiniet vēlreiz."
@@ -1742,75 +1662,75 @@ lv:
           vote: "Jūs nobalsojāt par šo ierakstu"
         by_you_and_others:
           off_topic:
-            zero: "Jūs un {{count}} citi cilvēki ziņoja par šo kā novirzīšanos no tēmas"
-            one: "Jūs un 1 cits cilvēks ziņoja par šo kā novirzīšanos no tēmas"
-            other: "Jūs un {{count}} citi cilvēki ziņoja par šo kā novirzīšanos no tēmas"
+            one: Jūs un 1 cits cilvēks ziņoja par šo kā novirzīšanos no tēmas
+            other: Jūs un {{count}} citi cilvēki ziņoja par šo kā novirzīšanos no tēmas
+            zero: Jūs un {{count}} citi cilvēki ziņoja par šo kā novirzīšanos no tēmas
           spam:
-            zero: "Jūs un {{count}} citi cilvēki ziņoja par šo kā spamu"
-            one: "Jūs un 1 cits cilvēks ziņoja par šo kā spamu"
-            other: "Jūs un {{count}} citi cilvēki ziņoja par šo kā spamu"
+            one: Jūs un 1 cits cilvēks ziņoja par šo kā spamu
+            other: Jūs un {{count}} citi cilvēki ziņoja par šo kā spamu
+            zero: Jūs un {{count}} citi cilvēki ziņoja par šo kā spamu
           inappropriate:
-            zero: "Jūs un {{count}} citi cilvēki ziņoja par šo kā nepiedienīgu"
-            one: "Jūs un 1 cits cilvēks ziņoja par šo kā nepiedienīgu"
-            other: "Jūs un {{count}} citi cilvēki ziņoja par šo kā nepiedienīgu"
+            one: Jūs un 1 cits cilvēks ziņoja par šo kā nepiedienīgu
+            other: Jūs un {{count}} citi cilvēki ziņoja par šo kā nepiedienīgu
+            zero: Jūs un {{count}} citi cilvēki ziņoja par šo kā nepiedienīgu
           notify_moderators:
-            zero: "Jūs un {{count}} citi cilvēki ziņoja par šo moderācijai"
-            one: "Jūs un 1 cits cilvēks ziņoja par šo moderācijai"
-            other: "Jūs un {{count}} citi cilvēki ziņoja par šo moderācijai"
+            one: Jūs un 1 cits cilvēks ziņoja par šo moderācijai
+            other: Jūs un {{count}} citi cilvēki ziņoja par šo moderācijai
+            zero: Jūs un {{count}} citi cilvēki ziņoja par šo moderācijai
           notify_user:
-            zero: "Jūs un {{count}} citi cilvēki nosūtīja ziņu šim lietotājam"
-            one: "Jūs un 1 cits cilvēks nosūtīja ziņu šim lietotājam"
-            other: "Jūs un {{count}} citi cilvēki nosūtīja ziņu šim lietotājam"
+            one: Jūs un 1 cits cilvēks nosūtīja ziņu šim lietotājam
+            other: Jūs un {{count}} citi cilvēki nosūtīja ziņu šim lietotājam
+            zero: Jūs un {{count}} citi cilvēki nosūtīja ziņu šim lietotājam
           bookmark:
-            zero: "Jūs un {{count}} citi cilvēki pievienoja šo ierakstu grāmatzīmēm"
-            one: "Jūs un 1 cits cilvēks pievienoja šo ierakstu grāmatzīmēm"
-            other: "Jūs un {{count}} citi cilvēki pievienoja šo ierakstu grāmatzīmēm"
+            one: Jūs un 1 cits cilvēks pievienoja šo ierakstu grāmatzīmēm
+            other: Jūs un {{count}} citi cilvēki pievienoja šo ierakstu grāmatzīmēm
+            zero: Jūs un {{count}} citi cilvēki pievienoja šo ierakstu grāmatzīmēm
           like:
-            zero: "Jūs un {{count}} citiem cilvēkiem patika šis"
-            one: "Jūs un 1 citam cilvēkam patika šis"
-            other: "Jūs un {{count}} citiem cilvēkiem patika šis"
+            one: Jūs un 1 citam cilvēkam patika šis
+            other: Jūs un {{count}} citiem cilvēkiem patika šis
+            zero: Jūs un {{count}} citiem cilvēkiem patika šis
           vote:
-            zero: "Jūs un {{count}} citi cilvēki nobalsoja par šo ierakstu"
-            one: "Jūs un 1 cits cilvēks nobalsoja par šo ierakstu"
-            other: "Jūs un {{count}} citi cilvēki nobalsoja par šo ierakstu"
+            one: Jūs un 1 cits cilvēks nobalsoja par šo ierakstu
+            other: Jūs un {{count}} citi cilvēki nobalsoja par šo ierakstu
+            zero: Jūs un {{count}} citi cilvēki nobalsoja par šo ierakstu
         by_others:
           off_topic:
-            zero: "{{count}} cilvēki ziņoja par šo kā novirzīšanos no tēmas"
-            one: "1 cilvēks ziņoja par šo kā novirzīšanos no tēmas"
-            other: "{{count}} cilvēki ziņoja par šo kā novirzīšanos no tēmas"
+            one: 1 cilvēks ziņoja par šo kā novirzīšanos no tēmas
+            other: '{{count}} cilvēki ziņoja par šo kā novirzīšanos no tēmas'
+            zero: '{{count}} cilvēki ziņoja par šo kā novirzīšanos no tēmas'
           spam:
-            zero: "{{count}} cilvēki ziņoja par šo kā spamu"
-            one: "1 cilvēks ziņoja par šo kā spamu"
-            other: "{{count}} cilvēki ziņoja par šo kā spamu"
+            one: 1 cilvēks ziņoja par šo kā spamu
+            other: '{{count}} cilvēki ziņoja par šo kā spamu'
+            zero: '{{count}} cilvēki ziņoja par šo kā spamu'
           inappropriate:
-            zero: "{{count}} cilvēki ziņoja par šo kā nepiedienīgu"
-            one: "1 cilvēks ziņoja par šo kā nepiedienīgu"
-            other: "{{count}} cilvēki ziņoja par šo kā nepiedienīgu"
+            one: 1 cilvēks ziņoja par šo kā nepiedienīgu
+            other: '{{count}} cilvēki ziņoja par šo kā nepiedienīgu'
+            zero: '{{count}} cilvēki ziņoja par šo kā nepiedienīgu'
           notify_moderators:
-            zero: "{{count}} cilvēki ziņoja par šo moderācijai"
-            one: "1 cilvēks ziņoja par šo moderācijai"
-            other: "{{count}} cilvēki ziņoja par šo moderācijai"
+            one: 1 cilvēks ziņoja par šo moderācijai
+            other: '{{count}} cilvēki ziņoja par šo moderācijai'
+            zero: '{{count}} cilvēki ziņoja par šo moderācijai'
           notify_user:
-            zero: "{{count}} cilvēki nosūtīja ziņu šim lietotājam"
-            one: "1 cilvēks nosūtīja ziņu šim lietotājam"
-            other: "{{count}} cilvēki nosūtīja ziņu šim lietotājam"
+            one: 1 cilvēks nosūtīja ziņu šim lietotājam
+            other: '{{count}} cilvēki nosūtīja ziņu šim lietotājam'
+            zero: '{{count}} cilvēki nosūtīja ziņu šim lietotājam'
           bookmark:
-            zero: "{{count}} cilvēki pievienoja šo ierakstu grāmatzīmēm"
-            one: "1 cilvēks pievienoja šo ierakstu grāmatzīmēm"
-            other: "{{count}} cilvēki pievienoja šo ierakstu grāmatzīmēm"
+            one: 1 cilvēks pievienoja šo ierakstu grāmatzīmēm
+            other: '{{count}} cilvēki pievienoja šo ierakstu grāmatzīmēm'
+            zero: '{{count}} cilvēki pievienoja šo ierakstu grāmatzīmēm'
           like:
-            zero: "{{count}} cilvēkiem patika šis"
-            one: "1 cilvēkam patika šis"
-            other: "{{count}} cilvēkiem patika šis"
+            one: 1 cilvēkam patika šis
+            other: '{{count}} cilvēkiem patika šis'
+            zero: '{{count}} cilvēkiem patika šis'
           vote:
-            zero: "{{count}} cilvēki balsoja par šo ierakstu"
-            one: "1 cilvēks balsoja par šo ierakstu"
-            other: "{{count}} cilvēki balsoja par šo ierakstu"
+            one: 1 cilvēks balsoja par šo ierakstu
+            other: '{{count}} cilvēki balsoja par šo ierakstu'
+            zero: '{{count}} cilvēki balsoja par šo ierakstu'
       merge:
         confirm:
-          zero: "Vai jūs esat drošs, ka vēlaties apvienot šos {{count}} ierakstus?"
-          one: "Vai jūs esat drošs, ka vēlaties apvienot šos ierakstus?"
-          other: "Vai jūs esat drošs, ka vēlaties apvienot šos {{count}} ierakstus?"
+          one: Vai jūs esat drošs, ka vēlaties apvienot šos ierakstus?
+          other: Vai jūs esat drošs, ka vēlaties apvienot šos {{count}} ierakstus?
+          zero: Vai jūs esat drošs, ka vēlaties apvienot šos {{count}} ierakstus?
       revisions:
         controls:
           first: "Pirmā versija"
@@ -1858,8 +1778,8 @@ lv:
       create: 'Jauna sadaļa'
       create_long: 'Izveidot jaunu sadaļu'
       save: 'Saglabāt sadaļu'
-      creation_error: Izveidojot šo sadaļu, notika kļūda.
-      save_error: Saglabājot šo sadaļu, notika kļūda.
+      creation_error: "Izveidojot šo sadaļu, notika kļūda."
+      save_error: "Saglabājot šo sadaļu, notika kļūda."
       name: "Sadaļas nosaukums"
       description: "Apraksts"
       topic: "sadaļas tema"
@@ -1881,7 +1801,6 @@ lv:
       images: "Attēli"
       email_in_allow_strangers: "Pieņemt e-pastus no anonīmiem lietotājiem bez profiliem"
       email_in_disabled: "Jaunu tēmu ievietošana, izmantojot e-pastu, ir atcelta foruma iestatījumos. Lai atļautu ievietot jaunas tēmas, izmantojot e-pastu,"
-      suppress_from_homepage: "Nerādīt šo sadaļu mājas lapā."
       show_subcategory_list: "Rādīt apakšsadaļu sarakstu virs tēmām šai sadaļā."
       num_featured_topics: "Sadaļu lapā parādīto tēmu skaits:"
       all_topics_wiki: "Pārveidot jaunās tēmas par wiki pēc noklusējuma."
@@ -1953,17 +1872,17 @@ lv:
       custom_placeholder_notify_moderators: "Ļaujiet mums uzzināt, kādu problēmu saredzat, un sniedziet būtiskās saites un piemērus, ja iespējams."
       custom_message:
         at_least:
-          zero: "ievadiet vismaz {{count}} simbolus"
-          one: "ievadiet vismaz 1 simbolu"
-          other: "ievadiet vismaz {{count}} simbolus"
+          one: ievadiet vismaz 1 simbolu
+          other: ievadiet vismaz {{count}} simbolus
+          zero: ievadiet vismaz {{count}} simbolus
         more:
-          zero: "vēl {{count}}..."
-          one: "vēl 1"
-          other: "vēl {{count}}..."
+          one: vēl 1
+          other: vēl {{count}}...
+          zero: vēl {{count}}...
         left:
-          zero: "palikuši {{count}}"
-          one: "palicis 1"
-          other: "palikuši {{count}}"
+          one: palicis 1
+          other: palikuši {{count}}
+          zero: palikuši {{count}}
     flagging_topic:
       title: "Paldies, ka palīdzat uzturēt mūsu forumu civilizētu!"
       action: "Ziņot par tēmu"
@@ -1974,14 +1893,14 @@ lv:
       links_title: "Populāras saites"
       links_shown: "parādīt papildus saites..."
       clicks:
-        zero: "%{count} klikšķi"
-        one: "1 klikšķis"
-        other: "%{count} klikšķi"
+        one: 1 klikšķis
+        other: '%{count} klikšķi'
+        zero: '%{count} klikšķi'
     post_links:
       title:
-        zero: "vēl %{count}"
-        one: "vēl 1"
-        other: "vēl %{count}"
+        one: vēl 1
+        other: vēl %{count}
+        zero: vēl %{count}
     topic_statuses:
       warning:
         help: "Šis ir oficiāls brīdinājums."
@@ -2015,26 +1934,26 @@ lv:
     original_post: "Oriģinālais ieraksts"
     views: "Skatījumi"
     views_lowercase:
-      zero: "skatījumi"
-      one: "skatījums"
-      other: "skatījumi"
+      one: skatījums
+      other: skatījumi
+      zero: skatījumi
     replies: "Atbildes"
     views_long:
-      zero: "šo tēmu ir apskatījuši {{number}} reizes"
-      one: "šo tēmu ir apskatījuši 1 reizi"
-      other: "šo tēmu ir apskatījuši {{number}} reizes"
+      one: šo tēmu ir apskatījuši 1 reizi
+      other: šo tēmu ir apskatījuši {{number}} reizes
+      zero: šo tēmu ir apskatījuši {{number}} reizes
     activity: "Aktivitāte"
     likes: "Patīk"
     likes_lowercase:
-      zero: "atzinības"
-      one: "atzinība"
-      other: "atzinības"
+      one: atzinība
+      other: atzinības
+      zero: atzinības
     likes_long: "šajā tēmā ir {{number}} atzinības"
     users: "Lietotāji"
     users_lowercase:
-      zero: "lietotāji"
-      one: "lietotājs"
-      other: "lietotāji"
+      one: lietotājs
+      other: lietotāji
+      zero: lietotāji
     category_title: "Sadaļa"
     history: "Vēsture"
     changed_by: "{{author}}"
@@ -2048,9 +1967,9 @@ lv:
       latest:
         title: "Pēdējie"
         title_with_count:
-          zero: "Pēdējie ({{count}})"
-          one: "Pēdējais (1)"
-          other: "Pēdējie ({{count}})"
+          one: Pēdējais (1)
+          other: Pēdējie ({{count}})
+          zero: Pēdējie ({{count}})
         help: "tēmas ar neseniem ierakstiem"
       hot:
         title: "Populārs"
@@ -2068,25 +1987,25 @@ lv:
       unread:
         title: "Nelasīts"
         title_with_count:
-          zero: "Nelasīti ({{count}})"
-          one: "Nelasīts (1)"
-          other: "Nelasīti ({{count}})"
+          one: Nelasīts (1)
+          other: Nelasīti ({{count}})
+          zero: Nelasīti ({{count}})
         help: "tēmas, kuras novērojat vai kurām sekojat, ar nelasītiem ierakstiem"
         lower_title_with_count:
-          zero: "{{count}} nelasītas"
-          one: "1 nelasīta"
-          other: "{{count}} nelasītas"
+          one: 1 nelasīta
+          other: '{{count}} nelasītas'
+          zero: '{{count}} nelasītas'
       new:
         lower_title_with_count:
-          zero: "{{count}} jaunas"
-          one: "1 jauna"
-          other: "{{count}} jaunas"
+          one: 1 jauna
+          other: '{{count}} jaunas'
+          zero: '{{count}} jaunas'
         lower_title: "jaunie"
         title: "Jaunie"
         title_with_count:
-          zero: "Jaunie ({{count}})"
-          one: "Jauns (1)"
-          other: "Jaunie ({{count}})"
+          one: Jauns (1)
+          other: Jaunie ({{count}})
+          zero: Jaunie ({{count}})
         help: "pēdējās dažās dienās izveidotās tēmas"
       posted:
         title: "Mani ieraksti"
@@ -2097,9 +2016,9 @@ lv:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          zero: "{{categoryName}} ({{count}})"
-          one: "{{categoryName}} (1)"
-          other: "{{categoryName}} ({{count}})"
+          one: '{{categoryName}} (1)'
+          other: '{{categoryName}} ({{count}})'
+          zero: '{{categoryName}} ({{count}})'
         help: "pēdējās tēmas sadaļā {{categoryName}}"
       top:
         title: "Populārākās"
@@ -2182,24 +2101,23 @@ lv:
         print: '<b>ctrl</b>+<b>p</b> Drukāt tēmu'
     badges:
       earned_n_times:
-        zero: "Nopelnīja šo žetonu %{count} reizes"
-        one: "Nopelnīja šo žetonu 1 reizi"
-        other: "Nopelnīja šo žetonu %{count} reizes"
+        one: Nopelnīja šo žetonu 1 reizi
+        other: Nopelnīja šo žetonu %{count} reizes
+        zero: Nopelnīja šo žetonu %{count} reizes
       granted_on: "Piešķirts %{date}"
       others_count: "Citi ar šo žetonu (%{count})"
       title: Žetoni
       allow_title: "Jūs varat izmantot šo žetonu kā titulu"
       multiple_grant: "Jūs esat nopelnījis šo vairākkārt"
       badge_count:
-        zero: "%{count} žetoni"
-        one: "1 žetons"
-        other: "%{count} žetoni"
+        one: 1 žetons
+        other: '%{count} žetoni'
+        zero: '%{count} žetoni'
       granted:
-        zero: "%{count} piešķirti"
-        one: "1 piešķirts"
-        other: "%{count} piešķirti"
-      select_badge_for_title: Izvēlieties žetonu, ko lietot kā jūsu titulu
-      none: "<none>"
+        one: 1 piešķirts
+        other: '%{count} piešķirti'
+        zero: '%{count} piešķirti'
+      select_badge_for_title: "Izvēlieties žetonu, ko lietot kā jūsu titulu"
       badge_grouping:
         getting_started:
           name: Uzsākt darbu
@@ -2242,19 +2160,15 @@ lv:
       notifications:
         watching:
           title: "Novērošana"
-          description: "Jūs automātiski sekosiet visām tēmām ar šiem tagiem. Jums paziņos par visiem jauniem ierakstiem un tēmām, kā arī blakus tēmai parādīsies nelasīto un jauno ierakstu skaits."
         watching_first_post:
           title: "Pirmā ieraksta novērošana"
-          description: "Jums paziņos tikai par pirmo ierakstu katrā jaunā tēmā ar šo tagu."
         tracking:
           title: "Sekošana"
-          description: "Jūs automātiski sekosiet visām tēmām ar šiem tagiem. Blakus tēmai parādīsies nelasīto un jauno ierakstu skaits."
         regular:
           title: "Regulārs"
           description: "Jums paziņos, ja kāds pieminēs jūsu @lietotājvārdu vai atbildēs uz jūsu ierakstu."
         muted:
           title: "Klusināts"
-          description: "Jums neko neziņos par jaunām tēmā ar šo tagu, un tās neparādīsies jūsu cilnē ar neizlasīto."
       groups:
         title: "Tagu grupas"
         about: "Pievieno tagus grupām, lai vieglāk tos pārvaldītu."
@@ -2335,8 +2249,6 @@ lv:
         reports:
           today: "Šodien"
           yesterday: "Vakar"
-          last_7_days: "Pēdējās 7 dienās"
-          last_30_days: "Pēdējās 30 dienās"
           all_time: "Vienmēr"
           7_days_ago: "Pirms 7 dienām"
           30_days_ago: "Pirms 30 dienām"
@@ -2354,7 +2266,6 @@ lv:
         title: "Sūdzības"
         agree: "Piekrist"
         agree_title: "Apstiprināt šo ziņojumu kā pamatotu un korektu"
-        defer_flag_title: "Dzēst šo sūdzību; šoreiz nav jāveic nekādas darbības."
         delete: "Dzēst"
         delete_title: "Dzēst ierakstu, par ko ir šī sūdzība."
         delete_post_defer_flag_title: "Dzēst ierakstu; ja tas ir tēmas pirmais ieraksts, dzēst arī tēmu"
@@ -2388,8 +2299,6 @@ lv:
         title: "Grupas"
         edit: "Labot grupas"
         refresh: "Pārlādēt"
-        new: "Jauns"
-        selector_placeholder: "ievadi lietotājvārdu"
         about: "Labot jūsu piederīgu grupām un to nosaukumus"
         group_members: "Grupas biedri"
         delete: "Dzēst"
@@ -2397,21 +2306,9 @@ lv:
         delete_failed: "Neizdevās izdzēst grupu. Ja šī ir automātiski izveidota grupa, to nav iespējams iznīcināt."
         delete_owner_confirm: "Noņemt lietotāja privilēģijas '%{username}'?"
         add: "Pievienot"
-        add_members: "Pievienot biedrus"
-        bulk_complete: "Šie lietotāji ir pievienoti grupai."
-        bulk_complete_users_not_added: "Šie lietotāji nav pievienoti (pārliecinieties, ka viņiem ir profili):"
-        bulk: "Pievienot grupai vairākus"
-        bulk_paste: "Kopēt lietotājvārdu vai e-pastu sarakstu, vienu katrā rindiņā:"
-        bulk_select: "(izvēlēties grupu)"
         automatic: "Automātiski"
-        automatic_membership_email_domains: "Lietotāji, kas reģistrējas ar e-pasta domēnu, kas precīzi sakrīt ar kādu no šī saraksta, tiks automātiski pievienoti šai grupai:"
-        automatic_membership_retroactive: "Izmantot viena e-pasta domēna noteikumu, lai pievienotu esošus lietotājus"
-        default_title: "Noklusējuma apzīmējums visiem lietotājiem šajā grupā"
-        primary_group: "Automātiski padarīt par galveno grupu"
         group_owners: Īpašnieki
         add_owners: Pievienot īpašniekus
-        incoming_email: "Īpašas ienākošā e-pasta adreses"
-        incoming_email_placeholder: "ievadi e-pasta adresi"
         none_selected: "Izvēlēties grupu, lai uzsāktu"
         no_custom_groups: "Izveidot jaunu specifisku grupu"
       api:
@@ -2463,13 +2360,13 @@ lv:
           none: "Nav saistītu notikumu."
           redeliver: "Atkārtot piegādi"
           incoming:
-            zero: "Ir {{count}} jauni notikumi."
-            one: "Ir viens jauns notikums."
-            other: "Ir {{count}} notikumi."
+            one: Ir viens jauns notikums.
+            other: Ir {{count}} notikumi.
+            zero: Ir {{count}} jauni notikumi.
           completed_in:
-            zero: "Pabeigts {{count}} sekundēs."
-            one: "Pabeigts 1 sekundē."
-            other: "Pabeigts {{count}} sekundēs."
+            one: Pabeigts 1 sekundē.
+            other: Pabeigts {{count}} sekundēs.
+            zero: Pabeigts {{count}} sekundēs.
           request: "Pieprasījums"
           response: "Atbilde"
           body: "Ķermenis"
@@ -2515,7 +2412,6 @@ lv:
           label: "Augšupielādēt"
           title: "Augšupielādēt rezerves kopiju uz šo instanci"
           uploading: "Augšupielādē..."
-          success: "'{{filename}}' ir veiksmīgi augšupielādēts."
           error: "Augšupielādējot '{{filename}}', notika kļūda: {{message}}"
         operations:
           failed: "{{operation}} neizdevās. Lūdzu pārbaudīt žurnāla ierakstus."
@@ -2527,7 +2423,6 @@ lv:
             label: "Rezerves kopija"
             title: "Izveidot rezerves kopiju"
             confirm: "Vai jūs vēlaties uzsākt jaunas rezerves kopijas veidošanu?"
-            without_uploads: "Jā (neiekļaut failus)"
           download:
             label: "Lejuplādēt"
             title: "Nosūtīt e-pastu ar lejuplādes saiti"
@@ -2792,9 +2687,9 @@ lv:
         clear_filter: "Notīrīt"
         show_words: "parādīt vārdus"
         word_count:
-          zero: "%{count} vārdi"
-          one: "1 vārds"
-          other: "%{count} vārdi"
+          one: 1 vārds
+          other: '%{count} vārdi'
+          zero: '%{count} vārdi'
         actions:
           block: 'Bloķēt'
           censor: 'Cenzēt'
@@ -2833,13 +2728,13 @@ lv:
           suspect: 'Novērot'
         approved: "Apstiprināt?"
         approved_selected:
-          zero: "Apstiprināt lietotāju"
-          one: "Apstiprināt lietotāju"
-          other: "Apstiprināt lietotājus ({{count}})"
+          one: Apstiprināt lietotāju
+          other: Apstiprināt lietotājus ({{count}})
+          zero: Apstiprināt lietotāju
         reject_selected:
-          zero: "Atteikt lietotāju"
-          one: "Atteikt lietotāju"
-          other: "Atteikt lietotājus ({{count}})"
+          one: Atteikt lietotāju
+          other: Atteikt lietotājus ({{count}})
+          zero: Atteikt lietotāju
         titles:
           active: 'Aktīvi lietotāji'
           new: 'Jauni lietotāji'
@@ -2855,13 +2750,13 @@ lv:
           suspended: 'Atceltie lietotāji'
           suspect: 'Novēroti (suspect) lietotāji'
         reject_successful:
-          zero: "Veiksmīgi atteikts 1 lietotājs."
-          one: "Veiksmīgi atteikts 1 lietotājs."
-          other: "Veiksmīgi atteikts %{count} lietotājs."
+          one: Veiksmīgi atteikts 1 lietotājs.
+          other: Veiksmīgi atteikts %{count} lietotājs.
+          zero: Veiksmīgi atteikts 1 lietotājs.
         reject_failures:
-          zero: "Neizdevās atteikt 1 lietotāju."
-          one: "Neizdevās atteikt 1 lietotāju."
-          other: "Neizdevās atteikt %{count} lietotājus."
+          one: Neizdevās atteikt 1 lietotāju.
+          other: Neizdevās atteikt %{count} lietotājus.
+          zero: Neizdevās atteikt 1 lietotāju.
         not_verified: "Nav apstiprināts"
         check_email:
           title: "Atklāt šī lietotāja e-pasta adresi"
@@ -2898,7 +2793,7 @@ lv:
         reputation: Reputācija
         permissions: Atļaujas / Pieejas
         activity: Aktivitāte
-        like_count: '"Patīk" doti / saņemti'
+        like_count: "\"Patīk\" doti / saņemti"
         last_100_days: 'Pēdējās 100 dienās'
         private_topics_count: Privātas tēmas
         posts_read_count: Ieraksti izlasīti
@@ -2921,17 +2816,17 @@ lv:
         delete_forbidden_because_staff: "Administratori un moderatori nevar tikt dzēsti."
         delete_posts_forbidden_because_staff: "Nevar izdzēst visus administratoru un moderatoru ierakstus."
         delete_forbidden:
-          zero: "Lietotāji nevar tikt dzēsti ja viņiem ir ieraksti. Izdzēs visus ierakstus pirms dzēs lietotāju. (ieraksti vecāki kā %{count} dienas nevar tikt izdzēsti.)"
-          one: "Lietotāji nevar tikt dzēsti ja viņiem ir ieraksti. Izdzēs visus ierakstus pirms dzēs lietotāju. (ieraksti vecāki kā %{count} dienas nevar tikt izdzēsti.)"
-          other: "Lietotāji nevar tikt dzēsti ja viņiem ir ieraksti. Izdzēs visus ierakstus pirms dzēs lietotāju. (ieraksti vecāki kā %{count} dienas nevar tikt izdzēsti.)"
+          one: Lietotāji nevar tikt dzēsti ja viņiem ir ieraksti. Izdzēs visus ierakstus pirms dzēs lietotāju. (ieraksti vecāki kā %{count} dienas nevar tikt izdzēsti.)
+          other: Lietotāji nevar tikt dzēsti ja viņiem ir ieraksti. Izdzēs visus ierakstus pirms dzēs lietotāju. (ieraksti vecāki kā %{count} dienas nevar tikt izdzēsti.)
+          zero: Lietotāji nevar tikt dzēsti ja viņiem ir ieraksti. Izdzēs visus ierakstus pirms dzēs lietotāju. (ieraksti vecāki kā %{count} dienas nevar tikt izdzēsti.)
         cant_delete_all_posts:
-          zero: "Nevar izdzēst visus ierakstus. Daži ieraksti ir vecāki kā %{count} dienas. (The delete_user_max_post_age setting.)"
-          one: "Nevar izdzēst visus ierakstus. Daži ieraksti ir vecāki kā %{count} dienas. (The delete_user_max_post_age setting.)"
-          other: "Nevar izdzēst visus ierakstus. Daži ieraksti ir vecāki kā %{count} dienas. (The delete_user_max_post_age setting.)"
+          one: Nevar izdzēst visus ierakstus. Daži ieraksti ir vecāki kā %{count} dienas. (The delete_user_max_post_age setting.)
+          other: Nevar izdzēst visus ierakstus. Daži ieraksti ir vecāki kā %{count} dienas. (The delete_user_max_post_age setting.)
+          zero: Nevar izdzēst visus ierakstus. Daži ieraksti ir vecāki kā %{count} dienas. (The delete_user_max_post_age setting.)
         cant_delete_all_too_many_posts:
-          zero: "Nevar dzēst visus ierakstus jo lietotājam ir vairāk kā 1 ieraksts. (delete_all_posts_max)"
-          one: "Nevar dzēst visus ierakstus jo lietotājam ir vairāk kā 1 ieraksts. (delete_all_posts_max)"
-          other: "Nevar dzēst visus ierakstus jo lietotājam ir vairāk kā %{count} ieraksti. (delete_all_posts_max)"
+          one: Nevar dzēst visus ierakstus jo lietotājam ir vairāk kā 1 ieraksts. (delete_all_posts_max)
+          other: Nevar dzēst visus ierakstus jo lietotājam ir vairāk kā %{count} ieraksti. (delete_all_posts_max)
+          zero: Nevar dzēst visus ierakstus jo lietotājam ir vairāk kā 1 ieraksts. (delete_all_posts_max)
         delete_confirm: "Vai esi drošs, ka vēlies dzēst šo lietotāju? Šis ir neatgriezeniski."
         delete_and_block: "Dzēst un <b>bloķēt</b> e-pastu un IP adresi"
         delete_dont_block: "Tikai Dzēst"
@@ -2967,9 +2862,9 @@ lv:
         tl3_requirements:
           title: "Prasības uzticības 3. līmenim"
           table_title:
-            zero: "Pēdējā dienā:"
-            one: "Pēdējā dienā:"
-            other: "Pēdējās %{count} dienās:"
+            one: 'Pēdējā dienā:'
+            other: 'Pēdējās %{count} dienās:'
+            zero: 'Pēdējā dienā:'
           value_heading: "Vērtība"
           requirement_heading: "Prasības"
           visits: "Apmeklējumi"
@@ -3044,10 +2939,7 @@ lv:
         recommended: "Iesakām pielāgot šo tekstu jūsu vajadzībām:"
         show_overriden: 'Rādīt tikai aizstātos'
       site_settings:
-        show_overriden: 'Rādīt tikai aizstātos'
         title: 'Iestatījumi'
-        reset: 'atiestatīt'
-        none: 'nekas'
         no_results: "Nekas nav atrasts."
         clear_filter: "Noņemt"
         add_url: "Pievienot URL"
@@ -3096,17 +2988,17 @@ lv:
         reason_help: (Saite uz ierakstu vai tēmu)
         save: Saglabāt
         delete: Dzēst
-        delete_confirm: Vai tiešām vēlies dzēst šo žetonu?
+        delete_confirm: "Vai tiešām vēlies dzēst šo žetonu?"
         revoke: Atsaukt
         reason: Pamatojums
         expand: Paplašināt &hellip;
-        revoke_confirm: Vai tiešām vēlies atsaukt šo žetonu?
+        revoke_confirm: "Vai tiešām vēlies atsaukt šo žetonu?"
         edit_badges: Labot Žetonus
         grant_badge: Piešķirt Žetonu
         granted_badges: Piešķirtie Žetoni
         grant: Piešķirt
         no_user_badges: "%{name} nav piešķirts neviens žetons."
-        no_badges: Nav žetonu, kas var tikt piešķirti.
+        no_badges: "Nav žetonu, kas var tikt piešķirti."
         none_selected: "Izvēlieties žetonu, lai sāktu"
         allow_title: Atļaut žetonam parādīties titulā
         multiple_grant: Var tikt piešķirts vairākas reizes
@@ -3114,7 +3006,6 @@ lv:
         enabled: Atļaut žetonu
         icon: Ikona
         image: Bilde
-        icon_help: "Izmanto vainu Fontu klasi vai URL uz bildi"
         query: Vaicājums Žetons  (SQL)
         target_posts: Vaicājums ir vērsts uz ierakstiem
         auto_revoke: Palaist anulēšanas vaicājumu ikdienā
@@ -3138,15 +3029,15 @@ lv:
             text: "(There are missing grant samples. This happens when the badge query returns user IDs or post IDs that do not exist. This may cause unexpected results later on - please double-check your query.)"
           no_grant_count: "Nav peišķiramu žetonu."
           grant_count:
-            zero: "<b>%{count}</b> Žetons nav piešķirts."
-            one: "<b>%{count}</b> Žetons nav piešķirts."
-            other: "<b>%{count}</b> Žetoni nav piešķirti."
+            one: <b>%{count}</b> Žetons nav piešķirts.
+            other: <b>%{count}</b> Žetoni nav piešķirti.
+            zero: <b>%{count}</b> Žetons nav piešķirts.
           sample: "Paraugs:"
           grant:
-            with: <span class="username">%{username}</span>
-            with_post: <span class="username">%{username}</span> ieraksti %{link}
-            with_post_time: <span class="username">%{username}</span> ieraksti %{link} pulksten <span class="time">%{time}</span>
-            with_time: <span class="username">%{username}</span> <span class="time">%{time}</span>
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span> ieraksti %{link}"
+            with_post_time: "<span class=\"username\">%{username}</span> ieraksti %{link} pulksten <span class=\"time\">%{time}</span>"
+            with_time: "<span class=\"username\">%{username}</span> <span class=\"time\">%{time}</span>"
       emoji:
         title: "Smaidiņi"
         help: "Pievienot jaunu smaidiņu, kas būs pieejams visiem."
@@ -3192,7 +3083,7 @@ lv:
         category_id: "Kategorijas ID"
         category_title: "Kategorija"
         external_url: "Ārējs URL"
-        delete_confirm: Vai tiešām vēlies dzēst šo ierakstu?
+        delete_confirm: "Vai tiešām vēlies dzēst šo ierakstu?"
         form:
           label: "Jauns:"
           add: "Pievienot"
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 122535a6aba..2b2fc3e3be4 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -9,8 +9,8 @@ nb_NO:
   js:
     number:
       format:
-        separator: "."
-        delimiter: ","
+        separator: ","
+        delimiter: " "
       human:
         storage_units:
           format: '%n %u'
@@ -43,68 +43,68 @@ nb_NO:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: "< 1s"
-          other: "< %{count}s"
+          one: < 1s
+          other: < %{count}s
         x_seconds:
-          one: "1s"
-          other: "%{count}s"
+          one: 1s
+          other: '%{count}s'
         less_than_x_minutes:
-          one: "< 1m"
-          other: "< %{count}m"
+          one: < 1m
+          other: < %{count}m
         x_minutes:
-          one: "1m"
-          other: "%{count}m"
+          one: 1m
+          other: '%{count}m'
         about_x_hours:
-          one: "1t"
-          other: "%{count}t"
+          one: 1t
+          other: '%{count}t'
         x_days:
-          one: "1d"
-          other: "%{count}d"
+          one: 1d
+          other: '%{count}d'
         x_months:
-          one: "1mnd"
-          other: "%{count}mnd"
+          one: 1mnd
+          other: '%{count}mnd'
         about_x_years:
-          one: "1år"
-          other: "%{count}år"
+          one: 1år
+          other: '%{count}år'
         over_x_years:
-          one: "> 1år"
-          other: "> %{count}år"
+          one: '> 1år'
+          other: '> %{count}år'
         almost_x_years:
-          one: "1år"
-          other: "%{count}år"
+          one: 1år
+          other: '%{count}år'
         date_month: "D MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: "1 minutt"
-          other: "%{count} minutter"
+          one: 1 minutt
+          other: '%{count} minutter'
         x_hours:
-          one: "1 time"
-          other: "%{count} timer"
+          one: 1 time
+          other: '%{count} timer'
         x_days:
-          one: "1 dag"
-          other: "%{count} dager"
+          one: 1 dag
+          other: '%{count} dager'
         date_year: "D. MMM, 'YY"
       medium_with_ago:
         x_minutes:
-          one: "1 minutt siden"
-          other: "%{count} minutter siden"
+          one: 1 minutt siden
+          other: '%{count} minutter siden'
         x_hours:
-          one: "1 time siden"
-          other: "%{count} timer siden"
+          one: 1 time siden
+          other: '%{count} timer siden'
         x_days:
-          one: "1 dag siden"
-          other: "%{count} dager siden"
+          one: 1 dag siden
+          other: '%{count} dager siden'
       later:
         x_days:
-          one: "1 dag senere"
-          other: "%{count} dager senere"
+          one: 1 dag senere
+          other: '%{count} dager senere'
         x_months:
-          one: "1 måned senere"
-          other: "%{count} måneder senere"
+          one: 1 måned senere
+          other: '%{count} måneder senere'
         x_years:
-          one: "1 år senere"
-          other: "%{count} år senere"
+          one: 1 år senere
+          other: '%{count} år senere'
       previous_month: 'Forrige måned'
       next_month: 'Neste måned'
       placeholder: dato
@@ -118,11 +118,11 @@ nb_NO:
       email: 'del denne lenken i en e-post'
     action_codes:
       public_topic: "gjorde dette emnet offentlig %{when}"
-      private_topic: "gjorde dette emnet privat %{when}"
-      split_topic: "splittet dette emnet %{when}"
+      private_topic: "gjorde dette emnet til en personlig melding %{when}"
+      split_topic: "del opp dette emnet %{when}"
       invited_user: "inviterte %{who} %{when}"
       invited_group: "inviterte %{who} %{when}"
-      user_left: "%{who} fjernet seg fra denne meldingen %{when}"
+      user_left: "%{who} fjernet seg selv fra denne meldingen %{when}"
       removed_user: "fjernet %{who} %{when}"
       removed_group: "fjernet %{who} %{when}"
       autoclosed:
@@ -133,7 +133,7 @@ nb_NO:
         disabled: 'åpnet %{when}'
       archived:
         enabled: 'arkivert %{when}'
-        disabled: 'fjernet fra arkiv %{when}'
+        disabled: 'arkivering opphevet %{when}'
       pinned:
         enabled: 'festet %{when}'
         disabled: 'feste fjernet %{when}'
@@ -144,13 +144,13 @@ nb_NO:
         enabled: 'gjort synlig %{when}'
         disabled: 'skjult %{when}'
       banner:
-        enabled: 'laget dette banneret %{when}. Det vil vises på toppen av hver side til brukeren lukker det.'
-        disabled: 'Fjernet dette banneret %{when}. Det vil ikke lenger vises på toppen av hver side.'
-    topic_admin_menu: "admin-handlinger for emne"
+        enabled: 'gjorde dette til et banner %{when}. Det vil vises på toppen av hver side inntil brukeren lukker det.'
+        disabled: 'fjernet dette banneret %{when}. Det vil ikke lenger vises på toppen av hver side.'
+    topic_admin_menu: "administratorhandlinger for emne"
     wizard_required: "Velkommen til ditt nye Discourse! Kom i gang med <a href='%{url}' data-auto-route='true'>oppstartsveiviseren</a> ✨"
     emails_are_disabled: "All utgående e-post har blitt deaktivert globalt av en administrator. Ingen e-postvarslinger vil bli sendt."
-    bootstrap_mode_enabled: "For å gjøre det enklere å lansere det nye nettstedet ditt er det i bootstrap-modus. Alle nye brukere vil få tillitsnivå 1 og få daglige oppdateringer på e-post aktivert. Dette vil automatisk bli slått av når antallet brukere overstiger %{min_users}."
-    bootstrap_mode_disabled: "Bootstrap modus vil bli deaktivert i løpet av de neste 24 timene."
+    bootstrap_mode_enabled: "For å gjøre lansering av siden enklere er den nå i oppstartsmodus. Alle nye brukere vil få tillitsnivå 1 og daglige oppsummeringer på e-post aktivert. Oppstartsmodus vil bli slått av når antall brukere overstiger %{min_users}."
+    bootstrap_mode_disabled: "Oppstartsmodus vil bli deaktivert i løpet av 24 timer."
     themes:
       default_description: "Forvalg"
     s3:
@@ -170,10 +170,11 @@ nb_NO:
         us_gov_west_1: "AWS GovCloud (USA)"
         us_west_1: "USA vest (N. California)"
         us_west_2: "USA vest (Oregon)"
-    edit: 'rediger tittelen og kategorien til dette emnet'
-    not_implemented: "Beklager, denne funksjonen har ikke blitt implementert enda."
+    edit: 'endre tittelen og kategorien til dette emnet'
+    not_implemented: "Beklager, den funksjonen er ikke blitt implementert enda."
     no_value: "Nei"
     yes_value: "Ja"
+    submit: "Send inn"
     generic_error: "Beklager, det har oppstått en feil."
     generic_error_with_reason: "Det oppstod et problem: %{error}"
     sign_up: "Registrer deg"
@@ -186,8 +187,8 @@ nb_NO:
     show_help: "alternativer"
     links: "Lenker"
     links_lowercase:
-      one: "link"
-      other: "lenker"
+      one: link
+      other: lenker
     faq: "O-S-S"
     guidelines: "Retningslinjer"
     privacy_policy: "Personvernerklæring"
@@ -211,8 +212,8 @@ nb_NO:
     max_of_count: "maksimum av {{count}}"
     alternation: "eller"
     character_count:
-      one: "{{count}} tegn"
-      other: "{{count}} tegn"
+      one: '{{count}} tegn'
+      other: '{{count}} tegn'
     suggested_topics:
       title: "Anbefalte emner"
       pm_title: "Anbefalte meldinger"
@@ -224,8 +225,8 @@ nb_NO:
       our_moderators: "Våre moderatorer"
       stat:
         all_time: "Gjennom tidene"
-        last_7_days: "Siste 7 dager"
-        last_30_days: "Siste 30 dager"
+        last_7_days: "Siste 7"
+        last_30_days: "Siste 30"
       like_count: "Likes"
       topic_count: "Emner"
       post_count: "Innlegg"
@@ -242,20 +243,19 @@ nb_NO:
     bookmarks:
       not_logged_in: "beklager, du må være innlogget for å kunne bokmerke innlegg"
       created: "du har bokmerket dette innlegget"
-      not_bookmarked: "du har lest dette innlegget, trykk for å bokmerke det"
-      last_read: "dette er det siste innlegget du har lest, trykk for å bokmerke det"
+      not_bookmarked: "du har lest dette innlegget; klikk for å bokmerke det"
+      last_read: "dette er det siste innlegget du har lest; klikk for å bokmerke det"
       remove: "Fjern bokmerke"
       confirm_clear: "Er du sikker på at du vil fjerne alle bokmerkene fra dette emnet?"
     topic_count_latest:
-      one: "{{count}} nytt eller oppdatert emne"
-      other: "{{count}} nye eller oppdaterte emner"
+      one: Se {{count}} nytt eller oppdatert emne
+      other: Se {{count}} nye eller oppdaterte emner
     topic_count_unread:
-      one: "{{count}} ulest emne"
-      other: "{{count}} uleste emner"
+      one: Se {{count}} ulest emne
+      other: Se {{count}} uleste emner
     topic_count_new:
-      one: "{{count}} nytt emne"
-      other: "{{count}} nye emner"
-    click_to_show: "Klikk for å vise"
+      one: Se {{count}} nytt emne
+      other: Se {{count}} nye emner
     preview: "forhåndsvisning"
     cancel: "avbryt"
     save: "Lagre endringer"
@@ -268,48 +268,49 @@ nb_NO:
     pasting: "Limer inn…"
     enable: "Aktiver"
     disable: "Deaktiver"
+    continue: "Fortsett"
     undo: "Angre"
     revert: "Reverser"
     failed: "Mislykket"
     switch_to_anon: "Start inkognitomodus"
     switch_from_anon: "Avslutt inkognitomodus"
     banner:
-      close: "Fjern dette banneret"
+      close: "Fjern dette banneret."
       edit: "Endre dette banneret >>"
     choose_topic:
       none_found: "Ingen emner funnet."
       title:
-        search: "Søk etter et emne ved navn, URL eller ID:"
-        placeholder: "skriv emnetittelen her"
+        search: "Søk etter et emne med navn, URL eller ID:"
+        placeholder: "skriv tittelen på emnet her"
     queue:
       topic: "Emne:"
       approve: 'Godkjenn'
       reject: 'Avvis'
       delete_user: 'Slett bruker'
       title: "Trenger godkjenning"
-      none: "Det er ingen innlegg som må evalueres."
+      none: "Det finnes ingen innlegg som må evalueres."
       edit: "Rediger"
       cancel: "Avbryt"
       view_pending: "vis ventende innlegg"
       has_pending_posts:
-        one: "Dette emnet har <b>1</b> innlegg som venter på godkjenning"
-        other: "Dette emnet har <b>{{count}}</b> innlegg som venter på godkjenning"
+        one: Dette emnet har <b>1</b> innlegg som venter på godkjenning
+        other: Dette emnet har <b>{{count}}</b> innlegg som venter på godkjenning
       confirm: "Lagre endringer"
-      delete_prompt: "Er du sikker du ønsker å slette <b>%{username}</b>? Dette vil fjerne alle brukerens innlegg og blokkere brukerens epost- og IP-adresse."
+      delete_prompt: "Er du sikker på at du ønsker å slette <b>%{username}</b>? Dette vil fjerne alle innlegg og blokkere e-post- og IP-addressen til vedkommende."
       approval:
         title: "Innlegg trenger godkjenning"
         description: "Vi har mottatt ditt nye innlegg men det krever godkjenning av en moderator før det vises. Ha tålmod."
         pending_posts:
-          one: "Du har <strong>1</strong> innlegg som venter på godkjenning."
-          other: "Du har <strong>{{count}}</strong> innlegg som venter på godkjenning."
+          one: Du har <strong>1</strong> innlegg som venter på godkjenning.
+          other: Du har <strong>{{count}}</strong> innlegg som venter på godkjenning.
         ok: "OK"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> postet <a href='{{topicUrl}}'>emnet</a>"
-      you_posted_topic: "<a href='{{userUrl}}'>Du</a> postet <a href='{{topicUrl}}'>emnet</a>"
+      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> opprettet <a href='{{topicUrl}}'>emnet</a>"
+      you_posted_topic: "<a href='{{userUrl}}'>Du</a> opprettet <a href='{{topicUrl}}'>emnet</a>"
       user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> besvarte <a href='{{postUrl}}'>{{post_number}}</a>"
       you_replied_to_post: "<a href='{{userUrl}}'>Du</a> besvarte <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> besvarte <a href='{{topicUrl}}'>emnet</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Du</a> besvarte <a href='{{topicUrl}}'>emnet</a>"
+      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> svarte på <a href='{{topicUrl}}'>emnet</a>"
+      you_replied_to_topic: "<a href='{{userUrl}}'>Du</a> svarte på <a href='{{topicUrl}}'>emnet</a>"
       user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> nevnte <a href='{{user2Url}}'>{{another_user}}</a>"
       user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> nevnte <a href='{{user2Url}}'>deg</a>"
       you_mentioned_user: "<a href='{{user1Url}}'>Du</a> nevnte <a href='{{user2Url}}'>{{another_user}}</a>"
@@ -318,15 +319,15 @@ nb_NO:
       sent_by_user: "Sendt av <a href='{{userUrl}}'>{{user}}</a>"
       sent_by_you: "Sendt av <a href='{{userUrl}}'>deg</a>"
     directory:
-      filter_name: "filtrer etter navn"
+      filter_name: "filtrer etter brukernavn"
       title: "Brukere"
       likes_given: "Gitt"
       likes_received: "Mottatt"
       topics_entered: "Lest"
-      topics_entered_long: "Emner Sett"
+      topics_entered_long: "Emner Vist"
       time_read: "Tid lest"
       topic_count: "Emner"
-      topic_count_long: "Emner startet"
+      topic_count_long: "Emner opprettet"
       post_count: "Svar"
       post_count_long: "Svar"
       no_results: "Ingen treff"
@@ -335,49 +336,59 @@ nb_NO:
       posts_read: "Lest"
       posts_read_long: "Innlegg lest"
       total_rows:
-        one: "1 bruker"
-        other: "%{count} brukere"
+        one: 1 bruker
+        other: '%{count} brukere'
     group_histories:
       actions:
         change_group_setting: "Endre gruppeinnstillinger"
         add_user_to_group: "Legg til bruker"
         remove_user_from_group: "Slett bruker"
         make_user_group_owner: "Gjør til eier"
-        remove_user_as_group_owner: "Fjern som eier"
+        remove_user_as_group_owner: "Trekk tilbake eierstatus"
     groups:
-      logs:
-        title: "Logger"
-        when: "Når"
-        action: "Handling"
-        acting_user: "Utførende bruker"
-        target_user: "Målbruker"
-        subject: "Emne"
-        details: "Detaljer"
-        from: "Fra"
-        to: "Til"
-      edit:
-        title: 'Rediger gruppe'
+      add_members:
+        title: "Legg til medlemmer"
+        description: "Endre medlemskapet i denne gruppen"
+        usernames: "Brukernavn"
+      manage:
+        title: 'Behandle'
+        name: 'Navn'
         full_name: 'Fullt navn'
         add_members: "Legg til medlemmer"
         delete_member_confirm: "Fjern '%{username}' fra gruppen '%{group}'?"
-      name_placeholder: "Gruppenavn, ingen mellomrom, samme regler som for brukernavn"
+        profile:
+          title: Profil
+        interaction:
+          title: Interaksjon
+          posting: Publisering
+          notification: Varsling
+        membership:
+          title: Medlemskap
+          access: Tilgang
+        logs:
+          title: "Logger"
+          when: "Når"
+          action: "Handling"
+          acting_user: "Utførende bruker"
+          target_user: "Målbruker"
+          subject: "Emne"
+          details: "Detaljer"
+          from: "Fra"
+          to: "Til"
       public_admission: "Tillat brukere å ta del i gruppen fritt (krever offentlig synlig gruppe)"
       public_exit: "Tillat brukere å fritt forlate gruppen"
       empty:
-        posts: "Det er ingen innlegg av medlemmer i denne gruppen."
-        members: "Det er ingen medlemmer av denne gruppen."
+        posts: "Det finnes ingen innlegg av medlemmer i denne gruppen."
+        members: "Det finnes ingen medlemmer av denne gruppen."
         mentions: "Denne gruppen har aldri blitt nevnt."
-        messages: "Det er ingen meldinger til denne gruppen."
-        topics: "Det er ingen emner av medlemmer av denne gruppen."
-        logs: "Det er ingen logger for denne gruppen."
+        messages: "Det finnes ingen meldinger til denne gruppen."
+        topics: "Det finnes ingen emner opprettet av medlemmer av denne gruppen."
+        logs: "Det finnes ingen logger for denne gruppen."
       add: "Legg til"
-      join: "Bli medlem av gruppe"
-      leave: "Forlat gruppe"
-      request: "Be om gruppemedlemskap"
+      join: "Bli medlem"
+      leave: "Forlat"
+      request: "Forespørsel"
       message: "Melding"
-      automatic_group: Automatisk gruppe
-      closed_group: Lukket gruppe
-      is_group_user: "Du er medlem av denne gruppen"
       allow_membership_requests: "Tillat brukere å sende forespørsler om medlemskap av gruppen til eiere"
       membership_request_template: "Egendefinert mal å vise brukere når du sender en medlemskapsforespørsel."
       membership_request:
@@ -386,29 +397,50 @@ nb_NO:
         reason: "La gruppeeierne vite hvorfor du ønsker å ta del i denne gruppen"
       membership: "Medlemskap"
       name: "Navn"
-      user_count: "Antall medlemmer"
+      group_name: "Gruppenavn"
+      user_count: "Brukere"
       bio: "Om gruppe"
-      selector_placeholder: "Legg til medlemmer"
+      selector_placeholder: "oppgi brukernavn"
       owner: "eier"
       index:
         title: "Grupper"
-        empty: "Det er ingen synlige grupper"
+        all: "Alle grupper"
+        empty: "Det finnes ingen synlige grupper"
+        filter: "Filtrer etter gruppetype"
+        owner_groups: "Grupper jeg eier"
+        close_groups: "Lukkede grupper"
+        automatic_groups: "Automatiske grupper"
+        automatic: "Automatisk"
+        closed: "Lukket"
+        public: "Offentlig"
+        private: "Privat"
+        public_groups: "Offentlige grupper"
+        automatic_group: Automatisk gruppe
+        close_group: Lukk gruppe
+        my_groups: "Mine grupper"
+        group_type: "Gruppetype"
+        is_group_user: "Medlem"
+        is_group_owner: "Eier"
       title:
-        one: "Gruppe"
-        other: "Grupper"
+        one: Gruppe
+        other: Grupper
       activity: "Aktivitet"
-      members: "Medlemmer"
+      members:
+        title: "Medlemmer"
+        filter_placeholder_admin: "brukernavn eller e-post"
+        filter_placeholder: "brukernavn"
+        remove_member: "Fjern medlem"
+        remove_member_description: "Fjern <b>%{username}</b> fra denne gruppen"
+        make_owner: "Gjør til eier"
+        make_owner_description: "Gjør <b>%{username}</b> til eier av denne gruppen"
+        remove_owner: "Fjern som eier"
+        remove_owner_description: "Fjern <b>%{username}</b> som eier av denne gruppen"
+        owner: "Eier"
       topics: "Emner"
       posts: "Innlegg"
       mentions: "Omtalelser"
       messages: "Meldinger"
       notification_level: "Forvalgt merknadsnivå for gruppemeldinger"
-      visibility_levels:
-        title: "Hvem kan se denne gruppen?"
-        public: "Alle"
-        members: "Gruppeeiere, medlemmer og administratorer"
-        staff: "Gruppemedlemmer og personale"
-        owners: "Gruppeeiere og administratorer"
       alias_levels:
         mentionable: "Hvem kan @nevne denne gruppen?"
         messageable: "Hvem kan sende meldinger til denne gruppen?"
@@ -417,9 +449,6 @@ nb_NO:
         mods_and_admins: "Kun moderatorer og administratorer"
         members_mods_and_admins: "Kun gruppemedlemmer, moderatorer og administratorer"
         everyone: "Alle"
-      trust_levels:
-        title: "Tillitsnivå som automatisk gis til nye medlemmer når de legges til:"
-        none: "ingen"
       notifications:
         watching:
           title: "Følger"
@@ -429,13 +458,13 @@ nb_NO:
           description: "Du vil bare bli varslet om det første innlegget i hvert nye emne i denne gruppen."
         tracking:
           title: "Overvåker"
-          description: "Du vil få beskjeddersom nevner @navnet_ditt eller svarer deg, og antallet nye svar vil bli vist."
+          description: "Du vil få beskjeddersom nevner @navnet ditt eller svarer deg, og antallet nye svar vil bli vist."
         regular:
           title: "Normal"
-          description: "Du vil bli varslet hvis noen nevner ditt @navn eller svarer deg."
+          description: "Du vil bli varslet hvis noen nevner @navnet ditt eller svarer deg."
         muted:
           title: "Ignorert"
-          description: "Du vil aldri bli varslet om noe angående nye emner i denne gruppen."
+          description: "Du vil aldri bli varslet om noe vedrørende nye emner i denne gruppen."
       flair_url: "Bilde for gruppetilhørighet på avatar"
       flair_url_placeholder: "(Valgfritt) Font Awesome-klasse eller URL til bilde"
       flair_bg_color: "Bakgrunnsfarge for gruppetilhørighetsbilde på avatar"
@@ -444,23 +473,22 @@ nb_NO:
       flair_color_placeholder: "(Valgfritt) Fargekode som hex-verdi"
       flair_preview_icon: "Forhåndsvis ikon"
       flair_preview_image: "Forhåndsvis bilde"
-      flair_note: "Merk: Bilde for gruppetilhørighet på avatar vil bare vises for brukerens primære gruppe."
     user_action_groups:
-      '1': "Likes tildelt"
-      '2': "Likes mottatt"
-      '3': "Bokmerker"
-      '4': "Emner"
-      '5': "Svar"
-      '6': "Svar"
-      '7': "Omtalelser"
-      '9': "Sitater"
-      '11': "Redigeringer"
-      '12': "Sendte elementer"
-      '13': "Innboks"
-      '14': "Venter"
+      "1": "Likes tildelt"
+      "2": "Likes mottatt"
+      "3": "Bokmerker"
+      "4": "Emner"
+      "5": "Svar"
+      "6": "Svar"
+      "7": "Omtalelser"
+      "9": "Sitater"
+      "11": "Redigeringer"
+      "12": "Sendte elementer"
+      "13": "Innboks"
+      "14": "Venter"
     categories:
       all: "Alle"
-      all_subcategories: "alle"
+      all_subcategories: "alle i %{categoryName}"
       no_subcategory: "ingen"
       category: "Kategori"
       category_list: "Vis kategoriliste"
@@ -476,14 +504,14 @@ nb_NO:
       topics: "Emner"
       latest: "Siste"
       latest_by: "siste av"
-      toggle_ordering: "veksle rekkefølge"
+      toggle_ordering: "Slå på/av styring av sortering"
       subcategories: "Underkategorier"
       topic_sentence:
-        one: "1 emne"
-        other: "%{count} nye emner"
+        one: 1 emne
+        other: '%{count} emner'
       topic_stat_sentence:
-        one: "%{count} nytt emner de siste %{unit}."
-        other: "%{count} nye emner de siste %{unit}."
+        one: '%{count} nytt emne de siste %{unit}.'
+        other: '%{count} nye emner de siste %{unit}.'
     ip_lookup:
       title: Slå opp IP-adresse
       hostname: Vertsnavn
@@ -496,7 +524,7 @@ nb_NO:
       username: "brukernavn"
       trust_level: "TN"
       read_time: "lesetid"
-      topics_entered: "emner laget"
+      topics_entered: "emner åpnet"
       post_count: "# innlegg"
       confirm_delete_other_accounts: "Er du sikker på at du vil slette disse kontoene?"
       powered_by: "drevet av <a href='https://ipinfo.io'>ipinfo.io</a>"
@@ -509,7 +537,7 @@ nb_NO:
       edit: "Rediger innstillinger"
       download_archive:
         button_text: "Last ned alle"
-        confirm: "Er du sikker på at du vil laste ned dine innlegg?"
+        confirm: "Er du sikker på at du vil laste ned innleggene dine?"
         success: "Nedlasting iverksatt. Du vil bli varslet med en melding når prosessen er fullført."
         rate_limit_error: "Innlegg kan lastes ned en gang om dagen, prøv igjen i morgen."
       new_private_message: "Ny Melding"
@@ -518,6 +546,7 @@ nb_NO:
       activity_stream: "Aktivitet"
       preferences: "Innstillinger"
       expand_profile: "Utvid"
+      collapse_profile: "Fold sammen"
       bookmarks: "Bokmerker"
       bio: "Om meg"
       invited_by: "Invitert av"
@@ -525,7 +554,7 @@ nb_NO:
       notifications: "Varsler"
       statistics: "Statistikk"
       desktop_notifications:
-        label: "Skrivebordsvarslinger"
+        label: "Skrivebordsvarsler"
         not_supported: "Varsler er ikke støttet på denne nettleseren. Beklager."
         perm_default: "Slå på varslinger"
         perm_denied_btn: "Tillatelse avslått"
@@ -533,14 +562,15 @@ nb_NO:
         disable: "Slå av varslinger"
         enable: "Slå på varslinger"
         each_browser_note: "Merk: Du må endre denne innstillinger for hver nettleser du bruker."
+        consent_prompt: "Ønsker du å motta skrivebordsvarsler når andre svarer på dine innlegg?"
       dismiss: 'Avslå'
-      dismiss_notifications: "Avslå alt"
+      dismiss_notifications: "Forkast alle"
       dismiss_notifications_tooltip: "Merk alle uleste varslinger som lest"
       first_notification: "Ditt første varsel! Velg det for å komme i gang."
       disable_jump_reply: "Ikke hopp til ditt nye innlegg etter svar"
-      dynamic_favicon: "Vis antall nye / oppdaterte emner på nettleser ikonet"
+      dynamic_favicon: "Vis antall nye / oppdaterte emner på nettleserikonet"
       theme_default_on_all_devices: "Gjør dette til forvalgt drakt på alle mine enheter"
-      allow_private_messages: "Tillat andre brukere å sende meg private meldinger"
+      allow_private_messages: "Tillat andre brukere å sende meg personlige meldinger"
       external_links_in_new_tab: "Åpne alle eksterne lenker i ny fane"
       enable_quoting: "Aktiver svar med sitat for uthevet tekst"
       change: "Endre"
@@ -548,9 +578,9 @@ nb_NO:
       admin: "{{user}} er en admin"
       moderator_tooltip: "Denne brukeren er en moderator"
       admin_tooltip: "Denne brukeren er en administrator"
-      silenced_tooltip: "Brukeren er forstummet"
-      suspended_notice: "Denne brukeren er bannlyst til {{date}}."
-      suspended_permanently: "Brukeren er bannlyst."
+      silenced_tooltip: "Denne brukeren er dempet"
+      suspended_notice: "Denne brukeren er utestengt til {{date}}."
+      suspended_permanently: "Denne brukeren er utestengt."
       suspended_reason: "Begrunnelse:"
       github_profile: "Github"
       email_activity_summary: "Oppsummering av aktivitet"
@@ -564,15 +594,16 @@ nb_NO:
         individual_no_echo: "Send en e-post for hvert nye innlegg bortsett fra mine egne"
         many_per_day: "Send meg en e-post for hvert nye innlegg (rundt {{dailyEmailEstimate}} per deg)"
         few_per_day: "Send meg en e-post for hvert nye innlegg (rundt to ganger om dagen)"
+        warning: "E-postlistemodus er aktivert. Instillinger for e-postvarslinger blir overstyrt."
       tag_settings: "Stikkord"
       watched_tags: "Fulgt"
-      watched_tags_instructions: "Du vil automatisk følge alle emner med disse stikkordene. Du vil bli varslet om alle nye innlegg og emner, og tallet på nye innlegg til også vises ved siden av emnet."
+      watched_tags_instructions: "Du vil automatisk følge alle emner som har disse stikkordene. Du vil bli varslet om alle nye innlegg og emner, og antallet nye innlegg til også vises ved siden av emnet."
       tracked_tags: "Overvåkes"
-      tracked_tags_instructions: "Du vil automatisk overvåke alle emner med disse stikkordene. Tallet på nye innlegg vil vises ved siden av emnet."
+      tracked_tags_instructions: "Du vil automatisk overvåke alle emner som har disse stikkordene. Antallet nye innlegg vil vises ved siden av emnet."
       muted_tags: "Ignorert"
-      muted_tags_instructions: "Du vil ikke bli varslet om noe med tanke på nye emner med disse stikkordene, og de vil ikke vises i siste."
+      muted_tags_instructions: "Du vil ikke bli varslet om noe vedrørende nye emner som har disse stikkordene, og de vil ikke vises i siste."
       watched_categories: "Fulgt"
-      watched_categories_instructions: "Du vil automatisk følge alle emner i disse kategoriene. Du vil bli varslet om alle nye innlegg og emner, og tallet på nye innlegg vil vises ved siden av emnet."
+      watched_categories_instructions: "Du vil automatisk følge alle emnene i disse kategoriene. Du vil bli varslet om alle nye innlegg og emner, og antallet nye innlegg vil vises ved siden av emnet."
       tracked_categories: "Overvåkes"
       tracked_categories_instructions: "Du vil automatisk overvåke alle emner i disse kategoriene. Tallet på nye innlegg vil vises ved siden av emnet."
       watched_first_post_categories: "Følger første innlegg"
@@ -580,12 +611,12 @@ nb_NO:
       watched_first_post_tags: "Følger første innlegg"
       watched_first_post_tags_instructions: "Du vil bli varslet om det første innlegget i hvert nye emne med disse stikkordene."
       muted_categories: "Ignorert"
-      muted_categories_instructions: "Du vil ikke bli varslet om noe med tanke på nye emner i disse kategoriene, og de vil ikke vises i siste."
+      muted_categories_instructions: "Du vil ikke bli varslet om noe som omhandler nye emner i disse kategoriene, og de vil ikke vises i siste."
       no_category_access: "Som moderator har du begrenset kategoritilgang, lagring er avskrudd."
       delete_account: "Slett kontoen min"
       delete_account_confirm: "Er du sikker på at du vil slette kontoen din permanent? Denne handlingen kan ikke angres!"
       deleted_yourself: "Slettingen av din konto har vært vellykket."
-      delete_yourself_not_allowed: "Kontoen din kan ikke slettes akkurat nå. Kontakt en administrator til å slette kontoen for deg."
+      delete_yourself_not_allowed: "Vennligst kontakt et medlem av staben hvis du ønsker at kontoen din skal slettes."
       unread_message_count: "Meldinger"
       admin_delete: "Slett"
       users: "Brukere"
@@ -593,11 +624,11 @@ nb_NO:
       muted_users_instructions: "Skjul alle varsler fra denne brukeren"
       muted_topics_link: "Vis ignorerte emner"
       watched_topics_link: "Vis fulgte emner"
-      tracked_topics_link: "Vis fulgte emner"
-      automatically_unpin_topics: "Automatisk fjern feste for emner når jeg når bunnen."
+      tracked_topics_link: "Vis overvåkede emner"
+      automatically_unpin_topics: "Fjern feste for et emne automatisk når jeg når bunnen."
       apps: "Programmer"
       revoke_access: "Trekk tilbake tilgang"
-      undo_revoke_access: "Angre \"trekk tilbake tilgang\""
+      undo_revoke_access: "Angre tilbaketrekking av tilgang"
       api_approved: "Godkjent:"
       theme: "Drakt"
       home: "Forvalgt hjemmeside"
@@ -615,10 +646,11 @@ nb_NO:
         archive: "Arkiver"
         groups: "Mine grupper"
         bulk_select: "Velg meldinger"
-        move_to_inbox: "Flytt til inboks"
+        move_to_inbox: "Flytt til innboks"
         move_to_archive: "Arkiver"
         failed_to_move: "Kunne ikke flytte valgte meldinger (kanskje nettforbindelsen din er nede)"
         select_all: "Velg alle"
+        tags: "Stikkord"
       preferences_nav:
         account: "Konto"
         profile: "Profil"
@@ -636,6 +668,18 @@ nb_NO:
         set_password: "Sett passord"
         choose_new: "Velg et nytt passord"
         choose: "Velg et passord"
+      second_factor:
+        title: "Totrinnsverifisering"
+        disable: "Skru av totrinnsverifisering"
+        confirm_password_description: "Bekreft passordet ditt for å fortsette"
+        label: "Kode"
+        enable_description: |
+          Les av denne QR-koden med en støttet app (<a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target="_blank">Android</a>–<a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8" target="_blank">iOS</a>–<a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a>) og skriv inn autentiseringskoden din.
+        disable_description: "Vennligst oppgi autentiseringskoden fra appen"
+        show_key_description: "Skriv inn manuelt"
+        extended_description: |
+          Tofaktor autentisering øker sikkerheten for kontoen din ved at den krever en unik engangskode i tillegg til passordet. Kodene kan genereres med en <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target='_blank'>Android</a>,<a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8">iOS</a> eller <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a> enhet.
+        oauth_enabled_warning: "Vær oppmerksom på at sosiale login-metoder deaktiveres når tofaktor autentisering er aktivert på kontoen din."
       change_about:
         title: "Rediger om meg"
         error: "Det oppstod en feil ved endring av denne verdien."
@@ -647,7 +691,7 @@ nb_NO:
       change_email:
         title: "Endre e-postadresse"
         taken: "Beklager, den e-postadressen er ikke tilgjengelig."
-        error: "Det oppsto en feil ved endring av din e-postadresse. Kanskje den adressen allerede er i bruk?"
+        error: "Det oppstod en feil ved endring av din e-postadresse. Kanskje den adressen allerede er i bruk?"
         success: "Vi har sendt en e-post til den adressen. Følg instruksjonene i meldingen."
         success_staff: "Vi har sendt en e-post til den gjeldende adressen. Følg bekreftelsesinstruksjonene."
       change_avatar:
@@ -677,8 +721,8 @@ nb_NO:
         authenticated: "Din e-post har blitt autentisert av {{provider}}"
         frequency_immediately: "Vi sender deg umiddelbart en e-post hvis du ikke har lest det vi sender e-post om."
         frequency:
-          one: "Vi sender deg bare e-post hvis vi ikke har sett deg deg det siste minuttet."
-          other: "Vi sender deg bare e-post hvis vi ikke har sett deg de siste {{count}}  minuttene."
+          one: Vi sender deg bare e-post hvis vi ikke har sett deg deg det siste minuttet.
+          other: Vi sender deg bare e-post hvis vi ikke har sett deg de siste {{count}}  minuttene.
       name:
         title: "Navn"
         instructions: "ditt fulle navn (valgfritt)"
@@ -709,8 +753,6 @@ nb_NO:
       created: "Medlem fra"
       log_out: "Logg ut"
       location: "Sted"
-      card_badge:
-        title: "Brukerkort-merke"
       website: "Nettsted"
       email_settings: "E-post"
       like_notification_frequency:
@@ -734,7 +776,7 @@ nb_NO:
         every_two_weeks: "annenhver uke"
       include_tl0_in_digests: "Inkluder innhold fra nye brukere i oppsummerings-eposter"
       email_in_reply_to: "Inkluder et utdrag i e-poster av innlegget man svarer på"
-      email_direct: "Motta en e-post når noen siterer meg, svarer på innlegget mitt, nevner @brukernavnet mitt eller inviterer meg til et emne"
+      email_direct: "Send meg en e-post når noen siterer meg, svarer på innlegget mitt, nevner @brukernavnet mitt eller inviterer meg til et emne"
       email_private_messages: "Motta en e-post når noen sender meg en melding"
       email_always: "Send meg varsler på e-post selv når jeg er aktiv på nettstedet"
       other_settings: "Annet"
@@ -758,16 +800,16 @@ nb_NO:
         after_4_minutes: "etter 4 minutt"
         after_5_minutes: "etter 5 minutt"
         after_10_minutes: "etter 10 minutt"
-      notification_level_when_replying: "Når jeg publiserer noe i et emner, sett det emnet til"
+      notification_level_when_replying: "Når jeg skriver noe i et emne, sett emnet som"
       invited:
         search: "skriv for å søke etter invitasjoner…"
         title: "invitasjoner"
         user: "Invitert bruker"
         sent: "Sendt"
-        none: "Det er ingen ventende invitasjoner å vise."
+        none: "Ingen invitasjoner å vise."
         truncated:
-          one: "Viser den første invitasjonen."
-          other: "Viser de {{count}} første invitisajonene."
+          one: Viser den første invitasjonen.
+          other: Viser de {{count}} første invitisajonene.
         redeemed: "Løs inn invitasjoner"
         redeemed_tab: "Brukt"
         redeemed_tab_with_count: "Innløste ({{count}})"
@@ -775,7 +817,7 @@ nb_NO:
         pending: "Ventende invitasjoner"
         pending_tab: "På vent"
         pending_tab_with_count: "Ventende ({{count}})"
-        topics_entered: "Emner vist"
+        topics_entered: "Emner Vist"
         posts_read_count: "Innlegg lest"
         expired: "Denne invitasjonen har utløpt"
         rescind: "Fjern"
@@ -796,7 +838,7 @@ nb_NO:
         link_generated: "Invitasjonslenke har blitt generert!"
         valid_for: "Invitasjonslenke er kun gyldig for denne e-postadressen: %{email}"
         bulk_invite:
-          none: "Du har ikke invitert noen enda. Sende enkeltsående invitasjoner, eller inviter mange samtidig ved å <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>laste opp ei CSV-fil</a>."
+          none: "Du har ikke invitert noen ennå. Sende enkeltsående invitasjoner, eller inviter mange samtidig ved å <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>laste opp ei CSV-fil</a>."
           text: "Masseinvitasjon fra fil"
           success: "Filen er lastet opp, du vil motta en melding når prosessesen er ferdig"
           error: "Beklager, fila må være i CSV-format."
@@ -814,44 +856,44 @@ nb_NO:
         time_read: "lesetid"
         recent_time_read: "nylig lesetid"
         topic_count:
-          one: "emne opprettet"
-          other: "emner opprettet"
+          one: emne opprettet
+          other: emner opprettet
         post_count:
-          one: "innlegg skrevet"
-          other: "innlegg skrevet"
+          one: innlegg skrevet
+          other: innlegg skrevet
         likes_given:
-          one: "gitt"
-          other: "gitt"
+          one: gitt
+          other: gitt
         likes_received:
-          one: "mottatt"
-          other: "mottatt"
+          one: mottatt
+          other: mottatt
         days_visited:
-          one: "dag besøkt"
-          other: "dager besøkt"
+          one: dag besøkt
+          other: dager besøkt
         topics_entered:
-          one: "emne vist"
-          other: "emner vist"
+          one: emne vist
+          other: emner vist
         posts_read:
-          one: "innlegg lest"
-          other: "innlegg lest"
+          one: innlegg lest
+          other: innlegg lest
         bookmark_count:
-          one: "bokmerke"
-          other: "bokmerker"
+          one: bokmerke
+          other: bokmerker
         top_replies: "Mest Populære Svar"
-        no_replies: "Ingen svar enda."
+        no_replies: "Ingen svar ennå."
         more_replies: "Flere svar"
-        top_topics: "Mest Populære Emner"
+        top_topics: "Mest populære emner"
         no_topics: "Ingen emner enda."
         more_topics: "Flere Emner"
         top_badges: "Toppmerker"
-        no_badges: "Ingen merker enda."
+        no_badges: "Ingen merker ennå."
         more_badges: "Flere merker"
         top_links: "Topplenker"
         no_links: "Ingen lenker enda"
         most_liked_by: "Mest likt av"
         most_liked_users: "Mest likt"
         most_replied_to_users: "Mest besvart"
-        no_likes: "Ingen likes her enda."
+        no_likes: "Ingen likes her ennå."
       associated_accounts: "Innloggingsforsøk"
       ip_address:
         title: "Siste IP-adresse"
@@ -862,6 +904,7 @@ nb_NO:
         header_title: "Profil, meldinger, bokmerker og innstillinger"
       title:
         title: "Tittel"
+        none: "(ingen)"
       filters:
         all: "Alle"
       stream:
@@ -882,7 +925,7 @@ nb_NO:
         network: "Sjekk nettverkstilkoblingen din"
         network_fixed: "Ser ut som om den er tilbake."
         server: "Feilkode: {{status}}"
-        forbidden: "Du har ikke tilgang til dette."
+        forbidden: "Du har ikke tilgang til å se det."
         not_found: "Oisann, programmet forsøkte å laste inn en URL som ikke eksisterer."
         unknown: "Noe gikk galt."
       buttons:
@@ -890,22 +933,22 @@ nb_NO:
         again: "Prøv igjen"
         fixed: "Last side"
     close: "Lukk"
-    assets_changed_confirm: "Dette nettstedet ble nettopp oppdatert. Gjenoppfrisk nå for siste versjon?"
+    assets_changed_confirm: "Dette nettstedet ble nettopp oppdatert. Last inn siden på nytt nå for siste versjon?"
     logout: "Du ble logget ut"
     refresh: "Refresh"
     read_only_mode:
-      enabled: "Dette nettstedet er i lesemodus. Fortsett gjerne, men du kan ikke svare, gi likes eller utføre andre handlinger som er slått av."
+      enabled: "Dette nettstedet er i lesemodus. Fortsett gjerne å lese, men du kan ikke svare, gi likes eller utføre andre handlinger som er slått av."
       login_disabled: "Innlogging er deaktivert mens nettsiden er i skrivebeskyttet modus."
       logout_disabled: "Du kan ikke logge ut når nettstedet er i lese-modus."
-    too_few_topics_and_posts_notice: "La oss  <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>få i gang diskusjonen.</a> Det finnes for øyeblikket <strong>%{currentTopics} / %{requiredTopics}</strong> emner og <strong>%{currentPosts} / %{requiredPosts}</strong> innlegg. Nye brukere trenger noen samtaler å lese og svare på."
-    too_few_topics_notice: "La oss  <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>få i gang diskusjonen.</a> Det finnes for øyeblikket <strong>%{currentTopics} / %{requiredTopics}</strong> emner. Nye brukere trenger noen samtaler å lese og svare på."
-    too_few_posts_notice: "La oss  <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>få i gang diskusjonen.</a> Det finnes for øyeblikket <strong>%{currentPosts} / %{requiredPosts}</strong> innlegg. Nye brukere trenger noen samtaler å lese og svare på."
+    too_few_topics_and_posts_notice: "La oss <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>dra i gang diskusjonen!</a> Det finnes for øyeblikket <strong>%{currentTopics} / %{requiredTopics}</strong> emner og <strong>%{currentPosts} / %{requiredPosts}</strong> svar. Nye besøkende trenger noen samtaler å lese og svare på."
+    too_few_topics_notice: "La oss <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>dra i gang diskusjonen!</a> Det finnes for øyeblikket <strong>%{currentTopics} / %{requiredTopics}</strong> emner. Nye besøkende trenger noen samtaler å lese og svare på."
+    too_few_posts_notice: "La oss <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>få i gang diskusjonen.</a> Det finnes for øyeblikket <strong>%{currentPosts} / %{requiredPosts}</strong> svar. Nye besøkende trenger noen samtaler å lese og svare på."
     logs_error_rate_notice:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> nådde innstillingsgrensen satt i %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> overstiger innstillingsgrensen satt i %{siteSettingRate}."
       rate:
-        one: "1 feil/%{duration}"
-        other: "%{count} feil/%{duration}"
+        one: 1 feil/%{duration}
+        other: '%{count} feil/%{duration}'
     learn_more: "lær mer…"
     all_time: 'totalt'
     all_time_desc: 'totalt antall emner opprettet'
@@ -933,16 +976,16 @@ nb_NO:
       hide_session: "Spør meg igjen i morgen"
       hide_forever: "nei takk"
       hidden_for_session: "OK, jeg spør igjen i morgen. Du kan også registrere en konto når du vil!"
-      intro: "Hei du! :heart_eyes: Det ser ut som du følger diskusjonen, men ikke har registrert deg enda."
+      intro: "Hei du! :heart_eyes: Det ser ut som du følger diskusjonen, men ikke har registrert deg ennå."
       value_prop: "Når du registrerer deg husker vi hvor langt du har lest, så du starter på riktig sted neste gang du åpner en tråd. Du får også varsler, her og på e-post når det skjer ting i diskusjonene du vil følge. I tillegg kan du like innlegg :heartbeat:"
     summary:
-      enabled_description: "Du ser for øyeblikket en oppsummering av dette emnet: De mest interessante innleggene ifølge fellesskapet."
-      description: "Det er <b>{{replyCount}}</b> svar."
-      description_time: "Det er <b>{{replyCount}}</b> svar med en forventet lesetid på <b>{{readingTime}} minutter</b>."
+      enabled_description: "Du ser for øyeblikket en oppsummering av dette emnet: de mest interessante innleggene ifølge brukerne."
+      description: "Det finnes <b>{{replyCount}}</b> svar."
+      description_time: "Det finnes <b>{{replyCount}}</b> svar med en forventet lesetid på <b>{{readingTime}} minutter</b>."
       enable: 'Oppsummer dette emnet'
       disable: 'Vis alle innlegg'
     deleted_filter:
-      enabled_description: "Dette emnet inneholder slettede innlegg som har blitt skjult."
+      enabled_description: "Dette emnet inneholder slettede innlegg, som er blitt skjult."
       disabled_description: "Slettede innlegg i emnet vises."
       enable: "Skjul slettede innlegg"
       disable: "Vis slettede innlegg"
@@ -954,7 +997,7 @@ nb_NO:
       remove_allowed_group: "Vil du virkelig fjerne {{name}} fra denne meldingen?"
     email: 'E-post'
     username: 'Brukernavn'
-    last_seen: 'Sist sett'
+    last_seen: 'Sett'
     created: 'Opprettet'
     created_lowercase: 'opprettet'
     trust_level: 'Tillitsnivå'
@@ -977,17 +1020,29 @@ nb_NO:
       help: "Fikk du ikke e-posten? Sjekk søppelposten din først.<p>Er du ikke sikker på hvilken e-postadresse du brukte. Skriv inn adressen her og vi vil fortelle deg om den finnes her.</p><p>Hvis du ikke lenger har tilgang til e-postadressen på kontoen din, kontakt <a href='/about'>vår hjelpfulle stab.</a></p>"
       button_ok: "OK"
       button_help: "Hjelp"
+    email_login:
+      link_label: "Send meg lenke til innlogging via e-post"
+      button_label: "med e-post"
+      complete_username: "Hvis en konto matcher brukernavnet <b>%{username}</b>, vil du snart motta en e-post med en lenke som logger deg inn."
+      complete_email: "Hvis en konto matcher <b>%{email}</b>, vil du snart motta en e-post med en lenke som logger deg inn."
+      complete_username_found: "Vi fant en konto som matcher brukernavnet <b>%{username}</b>, du vil snart motta en e-post med lenke for innlogging."
+      complete_email_found: "Vi fant en konto som matcher <b>%{email}</b>, du vil snart motta en e-post med lenke for innlogging."
+      complete_username_not_found: "Ingen konto har med brukernavnet <b>%{username}</b> er registrert"
+      complete_email_not_found: "Ingen konto med e-postadressen <b>%{email}</b> er registrert"
     login:
       title: "Logg Inn"
       username: "Bruker"
       password: "Passord"
+      second_factor_title: "Totrinnsverifisering"
+      second_factor_description: "Skriv inn verifiseringskoden fra din app:"
       email_placeholder: "e-postadresse eller brukernavn"
       caps_lock_warning: "Caps Lock er på"
       error: "Ukjent feil"
       rate_limit: "Vent litt før du logger inn igjen."
+      blank_username: "Vennligst oppgi din e-post eller brukernavn."
       blank_username_or_password: "Oppgi din e-postadresse eller brukernavn og ditt passord."
       reset_password: 'Nullstill passord'
-      logging_in: "Logger på…"
+      logging_in: "Logger inn…"
       or: "Eller"
       authenticating: "Autentiserer…"
       awaiting_activation: "Din konto avventer aktivering. Bruk lenken for glemt passord for å sende en ny e-post for aktivering."
@@ -997,15 +1052,16 @@ nb_NO:
       not_allowed_from_ip_address: "Du kan ikke logge inn fra den IP-adressen."
       admin_not_allowed_from_ip_address: "Du kan ikke logge inn som administrator fra den IP-adressen."
       resend_activation_email: "Klikk her for å sende e-posten for aktivering igjen."
+      omniauth_disallow_totp: "Kontoen din har tofaktor autentisering aktivert. Vennligst logg inn med passordet ditt."
       resend_title: "Send aktivterings-e-post på nytt"
       change_email: "Endre e-postadresse"
       provide_new_email: "Oppgi en ny adresse og vi vil sende din aktiverings-e-post på nytt."
       submit_new_email: "Oppdater e-postadresse"
-      sent_activation_email_again: "Vi sendte deg en ny e-post for aktivering på <b>{{currentEmail}}</b>. Det kan ta noen minutter før den kommer fram; sørg for at du sjekker nettsøppel om du ikke finner den."
+      sent_activation_email_again: "Vi sendte deg en ny aktiverings-e-post på <b>{{currentEmail}}</b>. Det kan ta noen minutter før den kommer frem; ikke glem å sjekke søppelpostmappen."
       to_continue: "Logg inn"
       preferences: "Du må være innlogget for å endre brukerinnstillinger."
       forgot: "I husker ikke mine kontodetaljer"
-      not_approved: "Kontoen din har ikke blitt godkjent enda. Du vil få beskjed via e-post når du er klar til å logge inn."
+      not_approved: "Kontoen din har ikke blitt godkjent ennå. Du vil få beskjed via e-post når du er klar til å logge inn."
       google:
         title: "med Google"
         message: "Autentiserer med Google (sørg for at du tillater oppsprettsvindu)"
@@ -1017,7 +1073,7 @@ nb_NO:
         message: "Autentiserer med Twitter (sørg for at du tillater oppsprettsvindu)"
       instagram:
         title: "med Instagram"
-        message: "Logger på med Instagram. Sørg for at du ikke har programvare som blokkerer forgrunnsvinduer."
+        message: "Logger inn med Instagram. Sørg for at du ikke har programvare som blokkerer forgrunnsvinduer."
       facebook:
         title: "med Facebook"
         message: "Autentiserer med Facebook (sørg for at du tillater oppsprettsvindu)"
@@ -1031,7 +1087,7 @@ nb_NO:
       accept_title: "Invitasjon"
       welcome_to: "Velkommen til %{site_name}!"
       invited_by: "Du ble invitert av:"
-      social_login_available: "Du vil også kunne logge inn med enhver annen sosial innloggingstjeneste ved bruk av den e-posten."
+      social_login_available: "Du vil også kunne logge inn med hvilken som helst annen sosial innloggingstjeneste ved bruk av den e-posten."
       your_email: "E-postadressen tilknyttet din konto er <b>%{email}</b>."
       accept_invite: "Godta invitasjon"
       success: "Kontoen din har blitt opprettet og du er nå logget inn."
@@ -1050,17 +1106,26 @@ nb_NO:
       facebook_messenger: "Facebook Meldingstjeneste"
     category_page_style:
       categories_only: "Kun kategorier"
-      categories_with_featured_topics: "Kategorier med framhevede emner"
-      categories_and_latest_topics: "Kategorier og siste emner"
+      categories_with_featured_topics: "Kategorier med Fremhevede Emner"
+      categories_and_latest_topics: "Kategorier og Siste Emner"
+      categories_and_top_topics: "Kategorier og Toppemner"
     shortcut_modifier_key:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    conditional_loading_section:
+      loading: Laster…
     select_kit:
       default_header_text: Velg…
       no_content: Ingen treff funnet
       filter_placeholder: Søk…
-      create: "Opprett {{content}}"
+      create: "Opprett: {{content}}"
+      max_content_reached:
+        one: Du kan kun velge {{count}} gjenstand.
+        other: Du kan kun velge {{count}} gjenstander.
+      min_content_not_reached:
+        one: Velg minst {{count}} element.
+        other: Velg minst {{count}} elementer.
     emoji_picker:
       filter_placeholder: Søk etter emoji
       people: Folk
@@ -1078,6 +1143,13 @@ nb_NO:
       medium_tone: Middels hudtone
       medium_dark_tone: Middels mørk hudtone
       dark_tone: Mørk hudtone
+    shared_drafts:
+      title: "Delte kladder"
+      notice: "Dette emnet er kun synlig for dem som kan se <b>{{category}}</b>-kategorien."
+      destination_category: "Målkategori"
+      publish: "Publiser delt kladd"
+      confirm_publish: "Er du sikker på at du vil publisere denne kladden?"
+      publishing: "Publiserer Emne…"
     composer:
       emoji: "Emoji :)"
       more_emoji: "mer…"
@@ -1086,7 +1158,7 @@ nb_NO:
       unlist: "skjult"
       blockquote_text: "Sitatramme"
       add_warning: "Dette er en offisiell advarsel."
-      toggle_whisper: "Veksle hvisking"
+      toggle_whisper: "Slå på/av hvisking"
       toggle_unlisted: "Skjul eller gjør synlig"
       posting_not_on_topic: "Du svarer på emnet \"{{title}}\", men for øyeblikket ser du på et annet emne."
       saving_draft_tip: "lagrer…"
@@ -1096,12 +1168,12 @@ nb_NO:
       drafts_offline: "utkast offline"
       group_mentioned_limit: "<b>Warning!</b> Du varslet <a href='{{group_link}}'>{{group}}</a>, dog har denne gruppen flere medlemmer en administratoren har satt opp som grense for varseling, {{max}} brukere. Ingen vil bli varslet."
       group_mentioned:
-        one: "Ved å nevne {{group}}, er du i ferd med å henvende deg til <a href='{{group_link}}'>{{count}} én person</a> – er du sikker?"
-        other: "Ved å nevne {{group}}, er du i ferd med å henvende deg til <a href='{{group_link}}'>{{count}} folk</a> – er du sikker?"
+        one: Ved å nevne {{group}}, er du i ferd med å henvende deg til <a href='{{group_link}}'>{{count}} én person</a> – er du sikker?
+        other: Ved å nevne {{group}}, er du i ferd med å henvende deg til <a href='{{group_link}}'>{{count}} folk</a> – er du sikker?
       cannot_see_mention:
-        category: "Du nevnte {{username}}, men de vil ikke ikke bli varslet fordi de ikke hara tilgang til denne kategorien. Du må legge dem til en gruppe som har tilgang til denne kategorien."
-        private: "Du nevnte {{username}}, men de vil ikke bli varslet fordi de ikke kan se denne samtalen. Du må invitere dem til samtalen."
-      duplicate_link: "Det ser ut til at <b>{{domain}}</b> allerede finnes som innlegg om emnet av <b>@{{username}}</b> i <a href='{{post_url}}'>et svar {{ago}}</a> – er du sikker på at du vil gjenta det?"
+        category: "Du nevnte {{username}}, men de vil ikke ikke bli varslet fordi de ikke har tilgang til denne kategorien. Du må legge dem til en gruppe som har tilgang til denne kategorien."
+        private: "Du nevnte {{username}}, men de vil ikke bli varslet fordi de ikke kan se denne samtalen. Du må invitere dem til denne private samtalen."
+      duplicate_link: "Det ser ut til at lenken din til <b>{{domain}}</b> allerede ble publisert i emnet av <b>@{{username}}</b> i <a href='{{post_url}}'>et svar {{ago}}</a>. Er du sikker på at du vil publisere den igjen?"
       error:
         title_missing: "Tittel er påkrevd"
         title_too_short: "Tittel må være på minst {{min}} tegn"
@@ -1110,14 +1182,17 @@ nb_NO:
         post_length: "Innlegget må være på minst {{min}} tegn"
         try_like: 'Har du prøvd <i class="fa fa-heart"></i> knappen?'
         category_missing: "Du må velge en kategori"
+        tags_missing: "Du må velge minst {{count}} stikkord"
       save_edit: "Lagre endring"
-      reply_original: "Besvar det originale emnet"
+      reply_original: "Svar på det Opprinnelige Emnet"
       reply_here: "Svar her"
       reply: "Svar"
       cancel: "Avbryt"
-      create_topic: "Opprett emne"
+      create_topic: "Opprett Emne"
       create_pm: "Melding"
       create_whisper: "Hvisk"
+      create_shared_draft: "Opprett delt kladd"
+      edit_shared_draft: "Rediger Delt Utkast"
       title: "Eller trykk Ctrl+Enter"
       users_placeholder: "Legg til en bruker"
       title_placeholder: "Oppsummert i en setning, hva handler denne diskusjonen om?"
@@ -1125,8 +1200,10 @@ nb_NO:
       edit_reason_placeholder: "hvorfor endrer du?"
       show_edit_reason: "(legg till endringsbegrunnelse)"
       topic_featured_link_placeholder: "Skriv inn lenke vist med tittel."
-      remove_featured_link: "Fjern lenken fra emnet."
+      remove_featured_link: "Fjern lenke fra emnet."
       reply_placeholder: "Skriv her. Bruk Markdown, BBCode eller HTML for å formattere. Dra og slipp bilder."
+      reply_placeholder_no_images: "Skriv her. Bruk Markdown, BBkode, eller HTML for å formatere."
+      reply_placeholder_choose_category: "Du må velge en kategori før du skriver her."
       view_new_post: "Se ditt nye innlegg."
       saving: "Lagrer"
       saved: "Lagret!"
@@ -1156,6 +1233,7 @@ nb_NO:
       olist_title: "Nummerert liste"
       ulist_title: "Kulepunktliste"
       list_item: "Listeelement"
+      toggle_direction: "Skift retning"
       help: "Hjelp for redigering i Markdown"
       collapse: "minimer redigeringspanelet"
       abandon: "lukk redigeringspanel og forkast utkast"
@@ -1166,15 +1244,36 @@ nb_NO:
         title: "Glemte du å legge til mottagere?"
         body: "Nå sender du denne meldingen bare til deg selv!"
       admin_options_title: "Valgfrie emne-instillinger for stab"
+      composer_actions:
+        reply_to_post:
+          label: "Svar på innlegg %{postNumber} av %{postUsername}"
+          desc: Svar på et spesifikt innlegg
+        reply_as_new_topic:
+          label: Svar med lenket emne
+          desc: Opprette nytt emne lenket til dette emnet
+        reply_as_private_message:
+          label: Ny melding
+          desc: Opprett en ny personlig melding
+        reply_to_topic:
+          label: Svar på emnet
+          desc: "Svar på emnet, ikke et spesifikt innlegg "
+        toggle_whisper:
+          label: Veksle visking
+          desc: Hvisking er kun synlig for stab
+        create_topic:
+          label: "Nytt Emne"
+        shared_draft:
+          label: "Delt kladd"
+          desc: "Lag et emneutkast som kun er synlig for staben"
     notifications:
       tooltip:
         regular:
-          one: "Én usett merknad"
-          other: "{{count}} usette merknader"
+          one: Én usett merknad
+          other: '{{count}} usette merknader'
         message:
-          one: "Én ulest melding"
-          other: "{{count}} uleste meldinger"
-      title: "varsler om at ditt @navn blir nevnt, svar på dine innlegg, emner, meldinger, osv"
+          one: Én ulest melding
+          other: '{{count}} uleste meldinger'
+      title: "varsler om at @navnet ditt blir nevnt, svar på dine innlegg og emner, meldinger, osv"
       none: "Notifikasjoner er ikke tilgjengelig for øyeblikket."
       empty: "Ingen varsler funnet."
       more: "se gamle varsler"
@@ -1188,8 +1287,8 @@ nb_NO:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} og én annen</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} og {{count}} andre</span> {{description}}"
+        one: <span>{{username}}, {{username2}} og én annen</span> {{description}}
+        other: <span>{{username}}, {{username2}} og {{count}} andre</span> {{description}}
       private_message: "<span>{{username}}</span> {{description}}"
       invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
       invited_to_topic: "<span>{{username}}</span> {{description}}"
@@ -1198,34 +1297,20 @@ nb_NO:
       linked: "<span>{{username}}</span> {{description}}"
       granted_badge: "Gjorde seg fortjent til '{{description}}'"
       topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>Nytt emne</span> {{description}}"
+      watching_first_post: "<span>Nytt Emne</span> {{description}}"
       group_message_summary:
-        one: "{{count}} melding i din {{group_name}} innboks"
-        other: "{{count}} meldinger i din {{group_name}} innboks"
-      alt:
-        mentioned: "Nevnt av"
-        quoted: "Sitert av"
-        replied: "Svart"
-        posted: "Innlegg av"
-        edited: "Rediger ditt innlegg innen"
-        liked: "Likte innlegget ditt"
-        private_message: "Privat melding fra"
-        invited_to_private_message: "Invitert til privat korrespondanse av"
-        invited_to_topic: "Invitert til et emne fra"
-        invitee_accepted: "Invitiasjon akseptert av"
-        moved_post: "Ditt innlegg ble flyttet av"
-        linked: "Link til innlegget ditt"
-        granted_badge: "Merke innvilget"
-        group_message_summary: "Meldinger i gruppeinnboks"
-        topic_reminder: "En påminnelse"
+        one: '{{count}} melding i din {{group_name}} innboks'
+        other: '{{count}} meldinger i din innboks for {{group_name}}'
       popup:
         mentioned: '{{username}} nevnte deg i "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} nevnte deg i "{{topic}}" - {{site_title}}'
         quoted: '{{username}} siterte deg i "{{topic}}" - {{site_title}}'
         replied: '{{username}} svarte deg i "{{topic}}" - {{site_title}}'
-        posted: '{{username}} skrev i "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} sendte deg en privat melding: "{{topic}}" - {{site_title}}'
-        linked: '{{username}} lenket til ditt innlegg i "{{topic}}" - {{site_title}}'
+        posted: '{{username}} skrev noe i "{{topic}}" - {{site_title}}'
+        private_message: '{{username}} sendte deg en personlig melding i "{{topic}}" - {{site_title}}'
+        linked: '{{username}} lenket til innlegget ditt i "{{topic}}" - {{site_title}}'
+        confirm_title: 'Varslinger aktivert - %{site_title}'
+        confirm_body: 'Suksess! Varslinger er nå aktivert.'
     upload_selector:
       title: "Legg til bilde"
       title_with_attachments: "Legg til et bilde eller en fil"
@@ -1245,21 +1330,25 @@ nb_NO:
       sort_by: "Sorter etter"
       relevance: "Relevanse"
       latest_post: "Siste innlegg"
-      latest_topic: "Siste emne"
+      latest_topic: "Siste Emne"
       most_viewed: "Mest Lest"
       most_liked: "Mest Likt"
       select_all: "Velg alle"
       clear_all: "Fjern Alle"
       too_short: "Din søketekst er for kort."
+      result_count:
+        one: <span>1 resultat for</span><span class='term'>{{term}}</span>
+        other: <span>{{count}}{{plus}} resultater for</span><span class='term'>{{term}}</span>
       title: "søk etter emner, innlegg, brukere eller kategorier"
+      full_page_title: "søk etter emner eller innlegg"
       no_results: "Ingen resultater funnet."
       no_more_results: "Ingen flere resultater funnet."
       searching: "Søker…"
       post_format: "#{{post_number}} av {{username}}"
       results_page: "Søkeresultater for \"{{term}}\""
-      more_results: "Det er flere resultater. Begrens søket ditt."
+      more_results: "Det finnes flere resultater. Begrens søket ditt."
       cant_find: "Finner du ikke det du leter etter?"
-      start_new_topic: "Kanskje du ønsker å starte et nytt emne?"
+      start_new_topic: "Kanskje du kan starte et nytt emne?"
       or_search_google: "Eller prøv å søke på Google istedenfor:"
       search_google: "Prøv å søke på Google istedenfor:"
       search_google_button: "Google"
@@ -1282,7 +1371,8 @@ nb_NO:
         with_tags:
           label: Merket
         filters:
-          label: Kun kom med emner/innlegg…
+          label: Vis bare emner/innlegg…
+          title: Kun treff i titler
           likes: Jeg likte
           posted: jeg skrev innlegg i
           watching: Jeg følger
@@ -1296,9 +1386,9 @@ nb_NO:
           unseen: Jeg har ikke lest
           wiki: er wiki
           images: inkluder bilde(r)
-          all_tags: Alle ovennevnte stikkord
+          all_tags: Alle stikkord nevnt ovenfor
         statuses:
-          label: Der emner
+          label: Hvor emner
           open: er åpen
           closed: er lukket
           archived: er arkivert
@@ -1311,7 +1401,7 @@ nb_NO:
             label: Skrevet
             before: før
             after: etter
-    hamburger_menu: "gå til en annen emneliste eller kategori"
+    hamburger_menu: "gå til en annen liste over emner eller en annen kategori"
     new_item: "ny"
     go_back: 'gå tilbake'
     not_logged_in_user: 'brukerside med oppsummering av nåværende aktivtet og preferanser.'
@@ -1321,126 +1411,127 @@ nb_NO:
       bulk:
         select_all: "Velg alle"
         clear_all: "Fjern alle"
-        unlist_topics: "Avlist emner"
-        relist_topics: "List opp emner på nytt"
+        unlist_topics: "Fjern Emner fra Lister"
+        relist_topics: "Før opp igjen Emner i Lister"
         reset_read: "Nullstill lest"
-        delete: "Slett emne"
+        delete: "Slett Emner"
         dismiss: "Avslå"
-        dismiss_read: "Merk alle som lest"
-        dismiss_button: "Avslå…"
-        dismiss_tooltip: "Avslå bare nye innlegg eller slutt å overvåke emner"
+        dismiss_read: "Forkast alle uleste"
+        dismiss_button: "Forkast…"
+        dismiss_tooltip: "Forkast kun nye innlegg eller slutt å overvåke emner"
         also_dismiss_topics: "Slutt å overvåke disse emnene slik at de aldri igjen vises til meg som ulest"
-        dismiss_new: "Lest"
-        toggle: "Veksle mellom massevelging av emner"
+        dismiss_new: "Forkast nye"
+        toggle: "slå på/av massevelging av emner"
         actions: "Massehandlinger"
         change_category: "Velg kategori"
         close_topics: "Lukk Emner"
-        archive_topics: "Arkiverte emner"
+        archive_topics: "Arkiver Emner"
         notification_level: "Varsler"
         choose_new_category: "Velg den nye kategorien for emnene:"
         selected:
-          one: "Du har valgt <b>1</b> emne."
-          other: "Du har valgt <b>{{count}}</b> emner."
+          one: Du har valgt <b>1</b> emne.
+          other: Du har valgt <b>{{count}}</b> emner.
         change_tags: "Erstatt stikkord"
         append_tags: "Legg til stikkord"
-        choose_new_tags: "Velg nye stikkord for disse emnene:"
-        choose_append_tags: "Velg nye stikkord å legge til disse emnene:"
-        changed_tags: "Stikkordene på disse innleggene ble endret."
+        choose_new_tags: "Velg nye stikkord for følgende emner:"
+        choose_append_tags: "Velg nye stikkord å legge til følgende emner:"
+        changed_tags: "Stikkordene for de valgte emnene ble endret."
       none:
-        unread: "Du har ingen uleste emner å lese."
+        unread: "Du har ingen uleste emner."
         new: "Du har ingen nye emner å lese."
         read: "Du har ikke lest noen emner enda."
-        posted: "Du har ikke sendt inn innlegg i noen emner enda."
-        latest: "Det finnes ingen siste emner. Det var synd."
-        hot: "Det er ingen populære emner."
-        bookmarks: "Du har ingen bokmerkede emner."
-        category: "Det er ingen {{category}}-emner."
-        top: "Det er ingen populære emner."
-        search: "Det er ingen søkeresultater"
+        posted: "Du har ikke skrevet innlegg i noen emner enda."
+        latest: "Det finnes ingen siste emner. Det er sørgelig."
+        hot: "Det finnes ingen populære emner."
+        bookmarks: "Du har ingen bokmerkede emner enda."
+        category: "Det finnes ingen {{category}}-emner."
+        top: "Det finnes ingen populære emner."
+        search: "Det finnes ingen søkeresultater"
         educate:
-          new: '<p>Dine nye emner vil komme til syne her.</p><p>Som forvalg anses emner som nye og viser en<span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">ny</span>indikator hvis de be opprettet i løpet av de siste to dagene.</p><p>Gå til <a href="%{userPrefsUrl}">innstillinger</a> for å endre dette.</p>'
-          unread: '<p>Dine uleste emner vil vises her.</p><p>Som forvalg anses emner for å være ulest og vil vise ulest-tall <span class="badge new-posts badge-notification">1</span> dersom du:</p><ul><li>Opprettet emnet</li><li>Svarte på emnet</li><li>Leste emnet i mer enn 4 minutter</li></ul><p>Eller dersom du uttrykkelig har satt emnet som overvåkes eller sett via varselkontrollen nederst i hvert emne.</p><p>Gå til<a href="%{userPrefsUrl}">innstillingene</a> dine for å endre dette.</p>'
+          new: '<p>Dine nye emner vil vises her.</p><p>Som forvalg anses emner som nye og viser en<span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">ny</span>-indikator hvis de be opprettet i løpet av de siste 2 dagene.</p><p>Gå til <a href="%{userPrefsUrl}">innstillinger</a> for å endre dette.</p>'
+          unread: '<p>Dine uleste emner vil vises her.</p><p>Som forvalg anses emner som ulest og vil vise ulest-tall <span class="badge new-posts badge-notification">1</span> dersom du:</p><ul><li>Opprettet emnet</li><li>Svarte på emnet</li><li>Leste emnet i mer enn 4 minutter</li></ul><p>Eller dersom du uttrykkelig har satt emnet som overvåkes eller følges via varselkontrollen nederst i hvert emne.</p><p>Gå til<a href="%{userPrefsUrl}">innstillingene</a> dine for å endre dette.</p>'
       bottom:
-        latest: "Det er ingen siste emner igjen å lese."
-        hot: "Det er ingen populære emner igjen å lese."
-        posted: "Det er ingen emner med innlegg igjen å lese."
-        read: "Det er ingen leste emner igjen å lese."
-        new: "Det er ingen nye emner igjen å lese."
-        unread: "Det er ingen uleste emner igjen å lese."
-        category: "Det er ingen {{category}}-emner igjen."
-        top: "Det er ingen flere populære emner."
-        bookmarks: "Det er ingen bokmerkede emner."
-        search: "Det er ingen flere søkeresultater"
+        latest: "Det finnes ingen flere siste emner."
+        hot: "Det finnes ingen flere populære emner."
+        posted: "Det finnes ingen flere emner med innlegg."
+        read: "Det finnes ingen flere leste emner."
+        new: "Det finnes ingen flere nye emner."
+        unread: "Det finnes ingen flere uleste emner."
+        category: "Det finnes ingen {{category}}-emner igjen."
+        top: "Det finnes ingen flere populære emner."
+        bookmarks: "Det finnes ingen flere bokmerkede emner."
+        search: "Det finnes ingen flere søkeresultater"
     topic:
-      unsubscribe:
-        stop_notifications: "Du vil nå få færre varsler for <strong>{{title}}</strong>"
-        change_notification_state: "Din nåværende varslingsstatus er"
       filter_to:
-        one: "1 innlegg i emne"
-        other: "{{count}} innlegg i emne"
-      create: 'Nytt emne'
-      create_long: 'Opprett et nytt emne'
+        one: 1 innlegg i emnet
+        other: '{{count}} innlegg i emnet'
+      create: 'Nytt Emne'
+      create_long: 'Opprett et nytt Emne'
+      open_draft: "Åpne Utkast"
       private_message: 'Begynn en melding'
       archive_message:
         help: 'Flytt meldinger til arkivet ditt'
         title: 'Arkiver'
       move_to_inbox:
-        title: 'Flytt til Inbox'
-        help: 'Flytt meldingen tilbake til Inbox'
+        title: 'Flytt til innboks'
+        help: 'Flytt melding tilbake til innboks'
+      edit_message:
+        help: 'Rediger første innlegg i meldingen'
+        title: 'Rediger melding'
       list: 'Emner'
       new: 'nytt emne'
       unread: 'ulest'
       new_topics:
-        one: 'Ett nytt emne'
+        one: Ett nytt emne
         other: '{{count}} nye emner'
       unread_topics:
-        one: 'Ett ulest emne'
+        one: Ett ulest emne
         other: '{{count}} uleste emner'
       title: 'Emne'
       invalid_access:
         title: "Emnet er privat"
         description: "Beklager, du har ikke tilgang til det emnet!"
-        login_required: "Du må være logget inn for å lese dette emnet."
+        login_required: "Du må være innlogget for å lese det emnet."
       server_error:
-        title: "Emnet kunne ikke bli behandlet"
-        description: "Beklager, vi kunne ikke behandle det emnet, muligens på grunn av et tilkoblingsproblem. Prøv igjen. Om problemet vedvarer, fortell oss om det."
+        title: "Emnet kunne ikke lastes inn."
+        description: "Beklager, vi kunne ikke laste inn det emnet, muligens på grunn av et tilkoblingsproblem. Prøv igjen. Dersom problemet vedvarer, gi beskjed til oss."
       not_found:
-        title: "Emnet kunne ikke bli funnet"
-        description: "Beklager, vi kunne ikke finne det emnet. Kanskjer det ble fjernet av en moderator?"
+        title: "Fant ikke emnet"
+        description: "Beklager, vi kunne ikke finne det emnet. Kanskje det ble fjernet av en moderator?"
       total_unread_posts:
-        one: "du har 1 ulest innlegg i dette emnet"
-        other: "du har {{count}} uleste innlegg i dette emnet"
+        one: du har 1 ulest innlegg i dette emnet
+        other: du har {{count}} uleste innlegg i dette emnet
       unread_posts:
-        one: "du har 1 ulest gammelt innlegg i dette emnet"
-        other: "du har {{count}} uleste gamle innlegg i dette emnet"
+        one: du har 1 ulest gammelt innlegg i dette emnet
+        other: du har {{count}} uleste gamle innlegg i dette emnet
       new_posts:
-        one: "Det er 1 nytt innlegg i dette emnet siden sist du leste det"
-        other: "Det er {{count}} nye innlegg i dette emnet siden sist du leste det"
+        one: det er 1 nytt innlegg i dette emnet siden sist du leste det
+        other: det er {{count}} nye innlegg i dette emnet siden sist du leste det
       likes:
-        one: "det er én like i dette emnet"
-        other: "det er {{number}} likes i dette emnet"
-      back_to_list: "Tilbake til emnelisten"
-      options: "Valg for emner"
+        one: det er én like i dette emnet
+        other: det er {{number}} likes i dette emnet
+      back_to_list: "Tilbake til Listen over Emner"
+      options: "Valg for Emner"
       show_links: "vis lenker i dette emnet"
-      toggle_information: "vis/skjul emnedetaljer"
-      read_more_in_category: "Vil du lese mer? Bla gjennom andre emner i {{catLink}} eller {{latestLink}}."
+      toggle_information: "vis/skjul detaljer for emnet"
+      read_more_in_category: "Vil du lese mer? Les andre emner i {{catLink}} eller {{latestLink}}."
       read_more: "Vil du lese mer? {{catLink}} eller {{latestLink}}."
-      read_more_MF: "There { UNREAD, plural, =0 {} one { is <a href='/unread'>1 unread</a> } other { are <a href='/unread'># unread</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='/new'>1 new</a> topic} other { {BOTH, select, true{and } false {are } other{}} <a href='/new'># new</a> topics} } remaining, or {CATEGORY, select, true {browse other topics in {catLink}} false {{latestLink}} other {}}"
+      read_more_MF: "Det { UNREAD, plural, =0 {} one { er <a href='/unread'>1 ulest</a> } other { finnes <a href='/unread'># uleste</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{og } false {finnes } other{}} <a href='/new'>1 nytt</a> emne} other { {BOTH, select, true{og } false {er } other{}} <a href='/new'># nye</a> emner} } igjen, eller {CATEGORY, select, true {se andre emner i {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Se alle kategorier
       view_latest_topics: se siste emner
-      suggest_create_topic: Hvorfor ikke opprette et emne?
+      suggest_create_topic: "Kanskje du kan lage et nytt emne?"
       jump_reply_up: hopp til tidligere svar
       jump_reply_down: hopp til senere svar
-      deleted: "Emnet har blitt slettet"
+      deleted: "Emnet ble slettet"
       topic_status_update:
-        title: "Sett emneutløp"
-        save: "Sett utløp"
+        title: "Tidsbestemt handling for emne"
+        save: "Sett opp tidsbestemt handling"
         num_of_hours: "Antall timer:"
-        remove: "Fjern utløp"
+        remove: "Fjern tidsbestemt handling"
         publish_to: "Publiser til:"
         when: "Når:"
-        public_timer_types: Emneutløp
-        private_timer_types: Brukerstyrte emneutløp
+        public_timer_types: Tidsbestemte handlinger for emne
+        private_timer_types: Brukerstyrte tidsbestemte handlinger for emne
       auto_update_input:
         none: "Velg et tidsrom"
         later_today: "Senere i dag"
@@ -1461,35 +1552,35 @@ nb_NO:
       temp_open:
         title: "Åpne midlertidig"
       auto_reopen:
-        title: "Auto-åpning av emne"
+        title: "Automatisk åpning av emne"
       temp_close:
         title: "Lukk midlertidig"
       auto_close:
-        title: "Auto-lukk emne"
-        label: "Tidsbolk for autolukking av emne:"
+        title: "Automatisk lukking av emne"
+        label: "Tidsrom for automatisk lukking av emne:"
         error: "Skriv inn en gyldig verdi."
         based_on_last_post: "Ikke lukk før det siste innlegget i emnet er minst så gammelt."
       auto_delete:
-        title: "Auto-slett emne"
+        title: "Automatisk sletting av emne"
       reminder:
         title: "Påminn meg"
       status_update_notice:
-        auto_open: "Dette emnet vil automatisk åpnes %{timeLeft}."
-        auto_close: "Dette emnet vil automatisk lukkes %{timeLeft}."
-        auto_publish_to_category: "Dette emnet vil bli publisert til <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
+        auto_open: "Dette emnet vil åpnes automatisk %{timeLeft}."
+        auto_close: "Dette emnet vil lukkes automatisk %{timeLeft}."
+        auto_publish_to_category: "Dette emnet vil bli opprettet i <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
         auto_close_based_on_last_post: "Dette emnet vil bli lukket %{duration} etter det siste innlegget."
-        auto_delete: "Dette emnet vil automatisk slettes %{timeLeft}."
+        auto_delete: "Dette emnet vil bli automatisk slettet %{timeLeft}."
         auto_reminder: "Du vil bli påminnet om dette emnet %{timeLeft}."
       auto_close_title: 'Auto-lukk innstillinger'
       auto_close_immediate:
-        one: "Det siste innlegget i emnet er allerede en time gammelt, så emnet vil stenges umiddelbart."
-        other: "Det siste innlegget i emnet er allerede %{count} timer gammelt, så emnet vil stenges umiddelbart."
+        one: Det siste innlegget i emnet er allerede en time gammelt, så emnet vil stenges umiddelbart.
+        other: Det siste innlegget i emnet er allerede %{count} timer gammelt, så emnet vil stenges umiddelbart.
       timeline:
         back: "Tilbake"
         back_description: "Gå tilbake til forrige uleste innlegg"
         replies_short: "%{current} / %{total}"
       progress:
-        title: emneframgang
+        title: fremgang i emne
         go_top: "topp"
         go_bottom: "bunn"
         go: "gå"
@@ -1503,110 +1594,110 @@ nb_NO:
       notifications:
         title: endre hvor ofte du blir varslet om dette emnet
         reasons:
-          mailing_list_mode: "Du har slått på e-postlistemodus, så du vil bli varslet på e-post om svar på dette emnet."
-          '3_10': 'Du vil motta varsler fordi du følger et stikkord for dette emnet'
-          '3_6': 'Du vil motta varsler fordi du følger denne kategorien'
-          '3_5': 'Du vil motta varsler fordi du startet å følge dette emnet automatisk.'
-          '3_2': 'Du vil motta varsler fordi du følger dette emnet.'
-          '3_1': 'Du vil motta varsler fordi du opprettet dette emnet.'
-          '3': 'Du vil motta varsler fordi du følger dette emnet.'
-          '2_8': 'Du vil se antall nye svar fordi du følger denne kategorien.'
-          '2_4': 'Du vil se antall nye svar fordi du skrev et svar til dette emnet.'
-          '2_2': 'Du vil se antall nye svar fordi du følger dette emnet.'
-          '2': 'Du vil se antall nye svar fordi du <a href="/u/{{username}}/preferences">leste dette emnet</a>.'
-          '1_2': 'Du vil bli varslet om noen nevner ditt @navn eller svarer på ditt innlegg.'
-          '1': 'Du vil bli varslet om noen nevner ditt @navn eller svarer på ditt innlegg.'
-          '0_7': 'Du ignorerer alle varsler i denne kategorien.'
-          '0_2': 'Du ignorerer alle varsler på dette emnet.'
-          '0': 'Du ignorerer alle varsler på dette emnet.'
+          mailing_list_mode: "Du har e-postlistemodus påslått, så du vil bli varslet på e-post om nye svar i dette emnet."
+          "3_10": 'Du vil motta varsler fordi du følger et stikkord for dette emnet.'
+          "3_6": 'Du vil motta varsler fordi du følger denne kategorien'
+          "3_5": 'Du vil motta varsler fordi du startet å følge dette emnet automatisk.'
+          "3_2": 'Du vil motta varsler fordi du følger dette emnet.'
+          "3_1": 'Du vil motta varsler fordi du opprettet dette emnet.'
+          "3": 'Du vil motta varsler fordi du følger dette emnet.'
+          "2_8": 'Du vil se antall nye svar fordi du følger denne kategorien.'
+          "2_4": 'Du vil se antall nye svar fordi du skrev et svar i dette emnet.'
+          "2_2": 'Du vil se antall nye svar fordi du overvåker dette emnet.'
+          "2": 'Du vil se antall nye svar fordi du <a href="/u/{{username}}/preferences">leste dette emnet</a>.'
+          "1_2": 'Du vil bli varslet om noen nevner @navnet ditt eller svarer på innlegget ditt.'
+          "1": 'Du vil bli varslet om noen nevner @navnet ditt eller svarer på innlegget ditt.'
+          "0_7": 'Du ignorerer alle varsler i denne kategorien.'
+          "0_2": 'Du ignorerer alle varsler om dette emnet.'
+          "0": 'Du ignorerer alle varsler om dette emnet.'
         watching_pm:
           title: "Følger"
           description: "Du vil bli varslet om hvert nye innlegg i denne meldingen. Antall nye tilbakemeldinger vil også bli vist. "
         watching:
           title: "Følger"
-          description: "Du vil bli varslet om hvert nye innlegg i dette emnet. Antall nye tilbakemeldinger vil også bli vist. "
+          description: "Du vil bli varslet om hvert nytt innlegg i dette emnet, og antall nye svar vil også bli vist."
         tracking_pm:
           title: "Overvåker"
           description: "Antall nye tilbakemeldinger vil bli vist for denne meldingen. Du vil bli varslet om noen nevner ditt @name eller svarer på din melding. "
         tracking:
           title: "Overvåker"
-          description: "Antall nye svar vil bli vist for dette emnet. Du vil bli varslet om noen nevner ditt @name eller svarer på ditt innlegg.. "
+          description: "Antall nye svar vil bli vist for dette emnet. Du vil bli varslet dersom noen nevner @navnet ditt eller svarer på innlegget ditt."
         regular:
           title: "Normal"
-          description: "Du vil bli varslet om noen nevner ditt @navn eller svarer på ditt innlegg."
+          description: "Du vil bli varslet om noen nevner @navnet ditt eller svarer på innlegget ditt."
         regular_pm:
           title: "Normal"
-          description: "Du vil bli varslet om noen nevner ditt @navn eller svarer på ditt innlegg."
+          description: "Du vil bli varslet om noen nevner @navnet ditt eller svarer på innlegget ditt."
         muted_pm:
           title: "Ignorert"
-          description: "Du vil ikke få varslinger om noe i denne meldingnen. "
+          description: "Du vil aldri bli varslet om noe vedrørende denne meldingnen. "
         muted:
           title: "Ignorert"
-          description: "Du vil bli varslet om alt som har med dette emnet og gjøre, og det vil ikke vises i siste."
+          description: "Du vil aldri bli varslet om noe vedrørende dette emnet, og det vil ikke vises i siste."
       actions:
-        recover: "Gjenopprett emne"
-        delete: "Slett emne"
-        open: "Åpne emne"
-        close: "Lukk emne"
+        recover: "Gjenopprett Emne"
+        delete: "Slett Emne"
+        open: "Åpne Emne"
+        close: "Lukk Emne"
         multi_select: "Velg innlegg…"
-        timed_update: "Sett emneutløp…"
-        pin: "Fest emnet…"
-        unpin: "Løsne emne…"
+        timed_update: "Sett opp tidsbestemt handling for emne…"
+        pin: "Fest Emne…"
+        unpin: "Løsne Emne…"
         unarchive: "Opphev arkivering av emne"
-        archive: "Arkiver emne"
-        invisible: "Skjul emnet"
+        archive: "Arkiver Emne"
+        invisible: "Skjul"
         visible: "Gjør synlig"
         reset_read: "Tilbakestill lesedata"
-        make_public: "Gjør emnet offentlig"
-        make_private: "Gjør om til privat melding"
+        make_public: "Gjør til Offentlig Emne"
+        make_private: "Opprett personlig melding"
       feature:
-        pin: "Fest emnet"
-        unpin: "Løsne emnet"
-        pin_globally: "Fest emnet globalt"
+        pin: "Fest Emne"
+        unpin: "Løsne Emne"
+        pin_globally: "Fest Emne Globalt"
         make_banner: "Banneremne"
-        remove_banner: "Fjern banneremne"
+        remove_banner: "Fjern Banneremne"
       reply:
         title: 'Svar'
-        help: 'begynn å forfatte et svar i dette emnet'
+        help: 'begynn å skrive et svar i dette emnet'
       clear_pin:
-        title: "Løsne emne"
-        help: "Løsne feste-statusen til dette emnet slik at det ikke lenger vises på toppen av din emneliste"
+        title: "Løsne"
+        help: "Fjern festet-statusen til dette emnet slik at det ikke lenger vises øverst i listen din over emner"
       share:
         title: 'Del'
         help: 'del en lenke til dette emnet'
       print:
         title: 'Skriv ut'
-        help: 'Åpne en utskriftsvennlig utgave av dette emnet.'
+        help: 'Åpne en utskriftsvennlig utgave av dette emnet'
       flag_topic:
         title: 'Rapporter'
         help: 'rapporter dette innlegget privat eller send et privat varsel om det'
-        success_message: 'Du har rapportert dette emnet'
+        success_message: 'Du har rapportert dette emnet.'
       feature_topic:
-        title: "Fremhev dette emnet"
-        pin: "La dette emnet få stå på toppen av {{categoryLink}} kategorien til"
-        confirm_pin: "Du har allerede {{count}} festede emner. For mange festede emner kan være et problem for nye og anonyme brukere. Er du sikker på at du ønsker å feste enda et emne i denne kategorien?"
-        unpin: "Fjern dette emnet fra toppen av {{categoryLink}} kategorien."
-        unpin_until: "Fjern dette emnet fra toppen av {{categoryLink}} kategorien, eller vent til <strong>%{until}</strong>."
-        pin_note: "Brukere kan selv fjerne festet for dette emnet."
+        title: "Fremhev denne emnet"
+        pin: "La dette emnet vises øverst i {{categoryLink}}-kategorien frem til"
+        confirm_pin: "Du har allerede {{count}} festede emner. For mange festede emner kan være slitsomt for nye og anonyme brukere. Er du sikker på at du ønsker å feste enda et emne i denne kategorien?"
+        unpin: "Fjern dette emnet fra toppen av {{categoryLink}}-kategorien."
+        unpin_until: "Fjern dette emnet fra toppen av {{categoryLink}}-kategorien, eller vent til <strong>%{until}</strong>."
+        pin_note: "Brukere kan fjerne festet for emnet individuelt for seg selv."
         pin_validation: "En dato kreves for å feste dette emnet."
-        not_pinned: "Det er ingen festede emner i {{categoryLink}}."
+        not_pinned: "Det finnes ingen festede emner i {{categoryLink}}."
         already_pinned:
-          one: "Emner for øyeblikket låst i {{categoryLink}}: <strong class='badge badge-notification unread'>Ett</strong>"
-          other: "Emne for øyeblikket låst i {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-        pin_globally: "Få dette emnet til å figurere på toppen av alle emnelistene til"
-        confirm_pin_globally: "Du har allerede {{count}} globalt festede emner. For mange festede emner kan bli en byrde for nye og anonyme brukere. Er du sikker på at du vil feste enda et emne globalt? "
-        unpin_globally: "Fjern dette emnet fra toppen av alle emnelister. "
-        unpin_globally_until: "Fjern dette emnet fra toppen av alle emnelister eller vent til <strong>%{until}</strong>."
-        global_pin_note: "Brukere kan fjerne festet for emnet for seg selv"
-        not_pinned_globally: "Det er ingen festede emner globalt."
+          one: 'Emner som er festet i {{categoryLink}} for øyeblikket: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Emner som er festet i {{categoryLink}} for øyeblikket: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+        pin_globally: "La dette emnet vises øverst i alle listene over emner inntil"
+        confirm_pin_globally: "Du har allerede {{count}} globalt festede emner. For mange festede emner kan være slitsomt for nye og anonyme brukere. Er du sikker på at du vil feste enda et emne globalt? "
+        unpin_globally: "Fjern dette emnet fra toppen av alle lister over emner."
+        unpin_globally_until: "Fjern dette emnet fra toppen av alle lister over emner eller vent til <strong>%{until}</strong>."
+        global_pin_note: "Brukere kan fjerne festet for emnet individuelt for seg selv."
+        not_pinned_globally: "Det finnes ingen globalt festede emner."
         already_pinned_globally:
-          one: "Emner for øyeblikket festet globalt: <strong class='badge badge-notification unread'>1</strong>"
-          other: "Dette enmnet er festet globalt: <strong class='badge badge-notification unread'>{{count}}</strong>"
-        make_banner: "Gjør dette emnet til et banner som dukker opp på toppen av alle sider."
-        remove_banner: "Fjern banneret som dukker opp på toppen av alle sider. "
-        banner_note: "Brukere kan fjerne banneret ved å lukke det. Kun et emne kan være banner på en og samme tid. "
-        no_banner_exists: "Det er ingen banneremner. "
-        banner_exists: "Det <strong class='badge badge-notification unread'>er</strong> for øyeblikket et banneremne. "
+          one: 'Emner som er festet globalt for øyeblikket: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Emner som er festet globalt for øyeblikket: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+        make_banner: "Gjør dette emnet til et banner som vises øverst på alle sider."
+        remove_banner: "Fjern banneret som vises øverst alle sider. "
+        banner_note: "Brukere kan fjerne banneret ved å lukke det. Kun ett emne kan være valgt som banner av gangen."
+        no_banner_exists: "Det er ikke valgt et banneremne. "
+        banner_exists: "Det <strong class='badge badge-notification unread'>finnes</strong> et banneremne allerede."
       inviting: "Inviterer…"
       automatically_add_to_groups: "Denne invitasjonen inkluderer også tilgang til disse gruppene:"
       invite_private:
@@ -1614,11 +1705,11 @@ nb_NO:
         email_or_username: "Invitertes e-post eller brukernavn."
         email_or_username_placeholder: "e-postadresse eller brukernavn"
         action: "Inviter"
-        success: "Vi har invitert denne brukeren til å delta i denne meldingen."
-        success_group: "Vi har invitert denne gruppen til å delta i denne meldingen."
+        success: "Vi har invitert den brukeren til å delta i denne meldingen."
+        success_group: "Vi har invitert den gruppen til å delta i denne meldingen."
         error: "Beklager, det oppstod en feil ved å invitere den brukeren."
         group_name: "gruppenavn"
-      controls: "Emnefunksjoner"
+      controls: "Handlinger for Emne"
       invite_reply:
         title: 'Inviter'
         username_placeholder: "brukernavn"
@@ -1626,36 +1717,36 @@ nb_NO:
         help: 'Inviter andre til dette emnet via e-post eller varsler'
         to_forum: "Vi sender en kortfattet e-post som gjør det mulig for en venn å umiddelbart registreres ved å klikke på en lenke. Ingen innlogging er nødvendig."
         sso_enabled: "Oppgi brukernavnet til personen du ønsker å invitere til dette emnet."
-        to_topic_blank: "Oppgi brukernavnet eller e-post-adressen til personen du ønsker å invitere til dette emnet."
-        to_topic_email: "Du har oppgitt en e-postadresse. Vi vil sende invitasjonen som lar vennen din svare på dette emnet umiddelbart."
-        to_topic_username: "Du har oppgitt et brukernavn. Vi sender et varsel med en link som inviterer dem til dette emnet."
-        to_username: "Oppgi brukernavnet til personen du ønsker å invitere. Vi sender et varsel med en lenke som inviterer dem til dette emnet."
+        to_topic_blank: "Oppgi brukernavnet eller e-postadressen til personen du ønsker å invitere til dette emnet."
+        to_topic_email: "Du har oppgitt en e-postadresse. Vi vil sende en invitasjon som lar vennen din svare på dette emnet umiddelbart."
+        to_topic_username: "Du har oppgitt et brukernavn. Vi sender et varsel med en lenke som inviterer dem til dette emnet."
+        to_username: "Oppgi brukernavnet til personen du ønsker å invitere. Vi sender et varsel med en lenke som inviterer vedkommende til dette emnet."
         email_placeholder: 'navn@example.com'
         success_email: "Vi har sendt ut en invitasjon til <b>{{emailOrUsername}}</b>. Vi varsler deg når invitasjonen er godtatt. Sjekk invitiasjonsfanen på brukersiden din for å beholde oversikten over invitasjonene dine."
-        success_username: "Vi har invitert brukeren til å delta i dette emnet."
-        error: "Beklager, vi kunne ikke invitere den brukeren. De har muligens allerede blitt invitert?"
-        success_existing_email: "En bruker med e-posten <b>{{emailOrUsername}}</b> finnes allerede. Vi har invitert den brukeren til å ta del i emnet."
+        success_username: "Vi har invitert den valgte brukeren til å delta i dette emnet."
+        error: "Beklager, vi kunne ikke invitere den brukeren. Vedkommende har muligens allerede blitt invitert? (Antall invitasjoner er begrenset)"
+        success_existing_email: "En bruker med e-postadressen <b>{{emailOrUsername}}</b> finnes allerede. Vi har invitert brukeren til å delta i dette emnet."
       login_reply: 'Logg Inn for å svare'
       filters:
         n_posts:
-          one: "1 innlegg"
-          other: "{{count}} innlegg"
+          one: 1 innlegg
+          other: '{{count}} innlegg'
         cancel: "Fjern filter"
       split_topic:
-        title: "Del opp emne"
-        action: "del opp emne"
-        topic_name: "Nytt emnenavn:"
-        error: "Det oppsto en feil ved deling av dette emnet."
+        title: "Flytt til Nytt Emne"
+        action: "flytt til nytt emne"
+        topic_name: "Nytt Navn på Emne"
+        error: "Det oppstod en feil ved flytting av innlegg til det nye emnet."
         instructions:
-          one: "Du er i ferd med å lage et nytt emne basert på innlegget du har valgt.."
-          other: "Du er i ferd med å lage et nytt emne basert på <b>{{count}}</b> innlegg du har valgt."
+          one: Du er i ferd med å opprette et nytt emne basert på innlegget du har valgt..
+          other: Du er i ferd med å opprette et nytt emne og fylle det med de <b>{{count}}</b> innleggene du har valgt.
       merge_topic:
-        title: "Slå sammen emne"
-        action: "slå sammen emne"
-        error: "Det oppsto en feil ved sammenslåing av dette emnet."
+        title: "Flytt til Eksisterende Emne"
+        action: "flytt til eksisterende emne"
+        error: "Det oppstod en feil ved flytting av innlegg til det valgte emnet."
         instructions:
-          one: "Velg det emnet du vil flytte det innlegget til."
-          other: "Velg emnet du vil flytte de <b>{{count}}</b> innleggene til."
+          one: Velg emnet du vil flytte dette innlegget til.
+          other: Velg emnet du vil flytte de <b>{{count}}</b> innleggene til.
       merge_posts:
         title: "Slå sammen valgte innlegg"
         action: "slå sammen valgte innlegg"
@@ -1663,19 +1754,19 @@ nb_NO:
       change_owner:
         title: "Endre innleggenes eier"
         action: "Endre eierskap"
-        error: "Det oppsto en feil ved endring av eierskap til innleggene."
+        error: "Det oppstod en feil ved endring av eierskap til innleggene."
         label: "Innleggenes nye eier"
         placeholder: "den nye eierens brukernavn"
         instructions:
-          one: "Velg den nye eieren til innlegget av <b>{{old_user}}</b>."
-          other: "Velg den nye eieren til {{count}} innlegg av  <b>{{old_user}}</b>."
-        instructions_warn: "Merk at ingen varsler om dette innlegget vil overføres til den nye eieren i etterkant.<br>Advarsel: For øyeblikket blir ingen innleggsavhengige data overført til den nye brukeren. Bruk med omhu."
+          one: Velg den nye eieren til innlegget av <b>{{old_user}}</b>.
+          other: Velg den nye eieren til {{count}} innlegg av  <b>{{old_user}}</b>.
+        instructions_warn: "Merk at varslinger bakover i tid for dette innlegget ikke vil bli overført til den nye brukeren."
       change_timestamp:
         title: "Endre tidsstempel…"
         action: "endre tidsstempel"
-        invalid_timestamp: "Tidsstempel kan ikke være i framtiden."
+        invalid_timestamp: "Tidsstempel kan ikke være i fremtiden."
         error: "Det oppstod en feil ved endring av tidsstempel for emnet."
-        instructions: "Velg et nytt tidsstempel for emnet. Innlegg i emnet blir oppdatert med samme tidsforksjell."
+        instructions: "Vennligst velg det nye tidsstempelet for emnet. Innlegg i emnet blir oppdatert med samme tidsforskjell."
       multi_select:
         select: 'velg'
         selected: 'valgte ({{count}})'
@@ -1699,41 +1790,41 @@ nb_NO:
           one: Du har valgt <b>1</b> innlegg.
           other: Du har valgt <b>{{count}}</b> innlegg.
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Sitat"
       edit: "<i class='fa fa-pencil'></i> {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Begrunnelse:"
       post_number: "innlegg {{number}}"
       wiki_last_edited_on: "wikien sist redigert"
       last_edited_on: "innlegg sist redigert"
-      reply_as_new_topic: "Svar med lenket emne"
+      reply_as_new_topic: "Svar med lenket Emne"
       reply_as_new_private_message: "Svar som ny melding til de samme mottakerne"
       continue_discussion: "Fortsetter diskusjonen fra {{postLink}}:"
       follow_quote: "gå til det siterte innlegget"
       show_full: "Vis hele innlegget"
       show_hidden: 'Se skjult innhold'
       deleted_by_author:
-        one: "(innlegg som er trukket tilbake av forfatter, blir automatisk slettet etter % {count} time, med mindre de blir flagget)"
-        other: "(innlegg trukket tilbake av forfatter, blir automatisk slettet etter %{count} timer, med mindre det blir rapportert)"
+        one: (innlegg som er trukket tilbake av forfatter, blir automatisk slettet etter % {count} time, med mindre de blir flagget)
+        other: (innlegg trukket tilbake av forfatter, blir automatisk slettet etter %{count} timer, med mindre det blir rapportert)
+      collapse: "fold sammen"
       expand_collapse: "utvid/vis"
+      locked: "et stabsmedlem har låst dette innlegget fra å bli endret"
       gap:
-        one: "vis 1 skjult svar"
-        other: "vis {{count}} skjulte svar"
+        one: vis 1 skjult svar
+        other: vis {{count}} skjulte svar
       unread: "Innlegget er ulest"
       has_replies:
-        one: "{{count}} svar"
-        other: "{{count}} svar"
+        one: '{{count}} svar'
+        other: '{{count}} svar'
       has_likes:
-        one: "{{count}} like"
-        other: "{{count}} likes"
+        one: '{{count}} like'
+        other: '{{count}} likes'
       has_likes_title:
-        one: "{{count}} bruker likte dette innlegget"
-        other: "{{count}} brukere likte dette innlegget"
+        one: '{{count}} bruker likte dette innlegget'
+        other: '{{count}} brukere likte dette innlegget'
       has_likes_title_only_you: "du likte dette innlegget"
       has_likes_title_you:
-        one: "du og 1 annen bruker likte dette innlegget"
-        other: "du og {{count}} andre likte dette innlegget"
+        one: du og 1 annen bruker likte dette innlegget
+        other: du og {{count}} andre likte dette innlegget
       errors:
         create: "Beklager, det oppstod en feil ved å publisere ditt innlegg. Prøv igjen."
         edit: "Det oppstod en feil ved redigeringen av ditt innlegg. Prøv igjen."
@@ -1744,7 +1835,7 @@ nb_NO:
         upload_not_authorized: "Beklager, filen du forsøket å laste opp er ikke tillatt. Tillatte filendelser er {{authorized_extensions}}."
         image_upload_not_allowed_for_new_user: "Beklager, nye brukere kan ikke laste opp bilder"
         attachment_upload_not_allowed_for_new_user: "Beklager, nye brukere kan ikke laste opp vedlegg."
-        attachment_download_requires_login: "Beklager, du må være logget inn for å laste ned vedlegg."
+        attachment_download_requires_login: "Beklager, du må være innlogget for å laste ned vedlegg."
       abandon:
         confirm: "Er du sikker på at du vil forlate innlegget ditt?"
         no_value: "Nei"
@@ -1773,34 +1864,39 @@ nb_NO:
         delete_replies:
           confirm: "Ønsker du å slette svarene på dette innlegget?"
           direct_replies:
-            one: "Ja, og ett direkte svar"
-            other: "Ja, og {{count}} direkte svar"
+            one: Ja, og ett direkte svar
+            other: Ja, og {{count}} direkte svar
           all_replies:
-            one: "Ja, og ett svar"
-            other: "Ja, og alle {{count}} svar"
+            one: Ja, og ett svar
+            other: Ja, og alle {{count}} svar
           just_the_post: "Nei, kun dette innlegget"
         admin: "Innleggsadministrasjon"
         wiki: "Opprett wiki"
         unwiki: "Fjern Wiki"
         convert_to_moderator: "Legg til stabsfarge"
         revert_to_regular: "Fjern stabsfarge"
-        rebake: "Gjenoppbygg HTML"
+        rebake: "Generer HTML på nytt"
         unhide: "Vis"
         change_owner: "Endre eierskap"
+        grant_badge: "Tildel merke"
+        lock_post: "Lås innlegg"
+        lock_post_description: "forhindre innleggsskriveren fra å redigere dette innlegget"
+        unlock_post: "Lås opp innlegg"
+        unlock_post_description: "tillat innleggsskriveren å redigere dette innlegget"
       actions:
         flag: 'Rapportering'
         defer_flags:
-          one: "Ignorer flagg"
-          other: "Ignorer flagg"
+          one: Ignorer flagg
+          other: Ignorer flagg
         undo:
           off_topic: "Angre rapportering"
           spam: "Angre rapportering"
           inappropriate: "Angre rapportering"
-          bookmark: "Angre bokmerke"
+          bookmark: "Angre bokmerking"
           like: "Angre liker"
           vote: "Angre stemme"
         people:
-          off_topic: "markerte dette som urelatert"
+          off_topic: "markerte dette som utenfor temaet"
           spam: "flagget dette som søppelpost"
           inappropriate: "flagget dette som upassende"
           notify_moderators: "varslet moderatorer"
@@ -1808,11 +1904,11 @@ nb_NO:
           bookmark: "bokmerket dette"
           like: "likte dette"
           like_capped:
-            one: "og {{count}} annen likte dette"
-            other: "og {{count}} andre likte dette"
+            one: og {{count}} annen likte dette
+            other: og {{count}} andre likte dette
           vote: "stemte for dette"
         by_you:
-          off_topic: "Du rapporterte dette som irrelevant"
+          off_topic: "Du rapporterte dette som utenfor temaet"
           spam: "Du rapporterte dette som spam"
           inappropriate: "Du rapporterte dette som upassende"
           notify_moderators: "Du rapporterte dette for moderering"
@@ -1822,62 +1918,62 @@ nb_NO:
           vote: "Du stemte for dette innlegget"
         by_you_and_others:
           off_topic:
-            one: "Du og 1 annen markerte dette som irrelevant"
-            other: "Du og {{count}} andre rapporterte dette som irrelevant"
+            one: Du og 1 annen markerte dette som irrelevant
+            other: Du og {{count}} andre rapporterte dette som utenfor temaet
           spam:
-            one: "Du og 1 annen markerte dette som spam"
-            other: "Du og {{count}} andre rapporterte dette som spam"
+            one: Du og 1 annen markerte dette som spam
+            other: Du og {{count}} andre rapporterte dette som spam
           inappropriate:
-            one: "Du og 1 annen markerte dette som upassende"
-            other: "Du og {{count}} andre rapporterte dette som upassende"
+            one: Du og 1 annen markerte dette som upassende
+            other: Du og {{count}} andre rapporterte dette som upassende
           notify_moderators:
-            one: "Du og 1 annen markerte dette for moderering"
-            other: "Du og {{count}} andre rapporterte dette for moderering"
+            one: Du og 1 annen markerte dette for moderering
+            other: Du og {{count}} andre rapporterte dette for moderering
           notify_user:
-            one: "Du og 1 annen bruker sendte en melding til denne brukeren"
-            other: "Du og {{count}} andre brukere har sendt en melding til denne brukeren"
+            one: Du og 1 annen bruker sendte en melding til denne brukeren
+            other: Du og {{count}} andre brukere har sendt en melding til denne brukeren
           bookmark:
-            one: "Du og 1 annen bokmerket dette innlegget"
-            other: "Du og {{count}} andre bokmerket dette innlegget"
+            one: Du og 1 annen bokmerket dette innlegget
+            other: Du og {{count}} andre bokmerket dette innlegget
           like:
-            one: "Du og 1 annen likte dette"
-            other: "Du og {{count}} andre likte dette"
+            one: Du og 1 annen likte dette
+            other: Du og {{count}} andre likte dette
           vote:
-            one: "Du og 1 annen stemte på dette innlegget"
-            other: "Du og {{count}} andre stemte på dette innlegget"
+            one: Du og 1 annen stemte på dette innlegget
+            other: Du og {{count}} andre stemte på dette innlegget
         by_others:
           off_topic:
-            one: "1 bruker markerte dette som irrelevant"
-            other: "{{count}} brukere rapporterte dette som irrelevant"
+            one: 1 bruker markerte dette som irrelevant
+            other: '{{count}} brukere rapporterte dette som irrelevant'
           spam:
-            one: "1 bruker markerte dette som spam"
-            other: "{{count}} brukere rapporterte dette som spam"
+            one: 1 bruker markerte dette som spam
+            other: '{{count}} brukere rapporterte dette som spam'
           inappropriate:
-            one: "1 bruker markerte dette som upassende"
-            other: "{{count}} brukere rapporterte dette som upassende"
+            one: 1 bruker markerte dette som upassende
+            other: '{{count}} brukere rapporterte dette som upassende'
           notify_moderators:
-            one: "1 bruker markerte dette for moderering"
-            other: "{{count}} brukere rapporterte dette for moderering"
+            one: 1 bruker markerte dette for moderering
+            other: '{{count}} brukere rapporterte dette for moderering'
           notify_user:
-            one: "1 person har sendt en melding til denne brukeren"
-            other: "{{count}} har sendt en melding til denne brukeren"
+            one: 1 person har sendt en melding til denne brukeren
+            other: '{{count}} har sendt en melding til denne brukeren'
           bookmark:
-            one: "1 bruker bokmerket dette innlegget"
-            other: "{{count}} brukere bokmerket dette innlegget"
+            one: 1 bruker bokmerket dette innlegget
+            other: '{{count}} brukere bokmerket dette innlegget'
           like:
-            one: "1 bruker likte dette"
-            other: "{{count}} brukere likte dette"
+            one: 1 bruker likte dette
+            other: '{{count}} brukere likte dette'
           vote:
-            one: "1 bruker stemte på dette innlegget"
-            other: "{{count}} brukere stemte på dette innlegget"
+            one: 1 bruker stemte på dette innlegget
+            other: '{{count}} brukere stemte på dette innlegget'
       delete:
         confirm:
-          one: "Er du sikker på at du ønsker å slette dette innlegget?"
-          other: "Er du sikker på at du ønsker å slette disse {{count}} innleggene?"
+          one: Er du sikker på at du ønsker å slette dette innlegget?
+          other: Er du sikker på at du ønsker å slette de {{count}} innleggene?
       merge:
         confirm:
-          one: "Er du sikker på at du vil flette disse postene?"
-          other: "Er du sikker på at du vil flette disse {{count}} postene?"
+          one: Er du sikker på at du vil flette disse postene?
+          other: Er du sikker på at du vil flette de {{count}} innleggene?
       revisions:
         controls:
           first: "Første versjon"
@@ -1918,15 +2014,15 @@ nb_NO:
       choose: 'Velg en katekori&hellip;'
       edit: 'rediger'
       edit_long: "Rediger"
-      view: 'Se emner i kategori'
-      general: 'Generellt'
+      view: 'Se Emner i Kategori'
+      general: 'Generelt'
       settings: 'Innstillinger'
-      topic_template: "Emnemal"
+      topic_template: "Mal for Emne"
       tags: "Stikkord"
       tags_allowed_tags: "Bare tillat disse etikettene brukt i denne kategorien:"
-      tags_allowed_tag_groups: "Bare tillat stikkord fra disse gruppene brukt i denne kategorien:"
-      tags_placeholder: "(Valgfritt) Liste over tillatte stikkord"
-      tag_groups_placeholder: "(Valgfritt) Liste over tillatte stikkordgrupper"
+      tags_allowed_tag_groups: "Bare tillat stikkord fra disse gruppene å bli brukt i denne kategorien:"
+      tags_placeholder: "(Valgfritt) liste over tillatte stikkord"
+      tag_groups_placeholder: "(Valgfritt) liste over tillatte stikkordgrupper"
       topic_featured_link_allowed: "Tillat fremhevede lenker i denne kategorien"
       delete: 'Slett kategori'
       create: 'Ny Kategori'
@@ -1938,7 +2034,7 @@ nb_NO:
       save_error: Det oppstod en feil ved lagrinen av denne kategorien.
       name: "Kategorinavn"
       description: "Beskrivelse"
-      topic: "kategori emne"
+      topic: "kategoriemne"
       logo: "Kategoribilde"
       background_image: "Kategoriens bakgrunnsbilde"
       badge_colors: "Merkefarger"
@@ -1957,17 +2053,17 @@ nb_NO:
       images: "Bilder"
       email_in: "Egendefinert innkommende e-postadresse:"
       email_in_allow_strangers: "Godta e-post fra anonyme brukere uten brukerkonto"
-      email_in_disabled: "Posting av nye emner via e-post er deaktivert i nettstedsinstillingene. For å aktivere posting av nye emner via e-post,"
+      email_in_disabled: "Publisering av nye emner via e-post er deaktivert i innstillingene for nettstedet. For å aktivere publisering av nye emner via e-post,"
       email_in_disabled_click: 'aktiver innstillingen "e-post inn".'
       mailinglist_mirror: "Kategorien gjenspeiler en e-postliste"
-      suppress_from_homepage: "Utelat denne kategorien fra hjemmesiden."
-      show_subcategory_list: "Vis underkategoriliste over emner i denne kategorien."
-      num_featured_topics: "Antall emner vist på kategori-siden:"
-      subcategory_num_featured_topics: "Antall framhevede emner på opphavets kategoriside:"
-      all_topics_wiki: "Gjør nye emner til wiki-er som forvalg."
+      suppress_from_latest: "Utelat denne kategorien fra siste emner."
+      show_subcategory_list: "Plasser listen over underkategorien i toppen av emner i denne kategorien."
+      num_featured_topics: "Antall emner som skal vises på kategori-siden:"
+      subcategory_num_featured_topics: "Antall fremhevede emner på hovedkategoriens side:"
+      all_topics_wiki: "Gjør nye emner til wiki-er som standard."
       subcategory_list_style: "Listestil for underkategorier:"
-      sort_order: "Sorter emneliste etter:"
-      default_view: "Forvalgt emneliste:"
+      sort_order: "Emneliste Sorteres Etter:"
+      default_view: "Forvalgt Emneliste:"
       default_top_period: "Forvalgt topp-periode:"
       allow_badges_label: "Tillat merker å bli tildelt i denne kategorien"
       edit_permissions: "Rediger tillatelser"
@@ -1977,11 +2073,12 @@ nb_NO:
       default_position: "Forvalgt posisjon"
       position_disabled: "Kategorier vil bli vist i henhold til aktivitet. For å styre rekkefølgen av kategorier i listen"
       position_disabled_click: 'aktiver innstillingen "faste kategoriposisjoner".'
+      minimum_required_tags: 'Minste antall stikkord som kreves for et emne:'
       parent: "Foreldrekategori"
       notifications:
         watching:
           title: "Følger"
-          description: "Du vil automatisk følge alle emnene i disse kategoriene. Du vil bli varslet om hvert nye innlegg i hvert emne, og antall nye svar vil bli vist."
+          description: "Du vil automatisk følge alle emnene i disse kategoriene. Du vil bli varslet om alle nye innlegg i hvert emne, og antall nye svar vil bli vist."
         watching_first_post:
           title: "Følger første innlegg"
           description: "Du vil bare bli varslet om det første innlegget i hvert nye emne i disse kategoriene."
@@ -1990,10 +2087,10 @@ nb_NO:
           description: "Du vil automatisk overvåke alle emner i disse kategoriene. Du vil bli varslet dersom noen nevner @navnet ditt eller svarer deg, og antallet nye svar vil bli vist."
         regular:
           title: "Normal"
-          description: "Du vil bli varslet om noen nevner ditt @navn eller svarer deg."
+          description: "Du vil bli varslet om noen nevner @navnet ditt eller svarer deg."
         muted:
           title: "Ignorert"
-          description: "Du vil aldri bli varslet om noe med tanke på nye emner i disse kategoriene, og de vil ikke vises i siste."
+          description: "Du vil aldri bli varslet om noe vedrørende nye emner i disse kategoriene, og de vil ikke vises i listen over siste."
       sort_options:
         default: "forvalg"
         likes: "Likes"
@@ -2001,16 +2098,16 @@ nb_NO:
         views: "Visninger"
         posts: "Innlegg"
         activity: "Aktivitet"
-        posters: "Bidragsytere"
+        posters: "Innleggsskrivere"
         category: "Kategori"
         created: "Opprettet"
       sort_ascending: 'Stigende'
       sort_descending: 'Synkende'
       subcategory_list_styles:
         rows: "Rader"
-        rows_with_featured_topics: "Rader med framhevede emner"
+        rows_with_featured_topics: "Rader med fremhevede emner"
         boxes: "Bokser"
-        boxes_with_featured_topics: "Bokser med framhevede emner"
+        boxes_with_featured_topics: "Bokser med fremhevede emner"
     flagging:
       title: 'Takk for at du hjelper å holde forumet ryddig!'
       action: 'Rapporter innlegg'
@@ -2018,7 +2115,7 @@ nb_NO:
       notify_action: 'Melding'
       official_warning: 'Offisiell advarsel'
       delete_spammer: "Slett spammer"
-      delete_confirm_MF: "Du er i ferd med å slette {POSTS, flere, ett {<b>1</b> innlegg} andre {<b>#</b> innlegg}} og {EMNER, flere, ett {<b>1</b> emne} andre {<b>#</b> emner}} av denne brukeren, fjern kontoen deres, blokker påmeldinger fra deres IP-adresse <b>{ip_address}</b>, og legg til deres e-postadresse <b>{email}</b> til en permanent blokkeringsliste. Er du sikker på at denne brukeren virkelig sender søppelpost?"
+      delete_confirm_MF: "Du er i ferd med å slette {POSTS, plural, one {<b>1</b> innlegg} other {<b>#</b> innlegg}} og {TOPICS, plural, one {<b>1</b> emne} other {<b>#</b> emner}} opprettet av denne brukeren, fjerne kontoen, blokkere påmeldinger fra IP-adressen <b>{ip_address}</b>, og legge til e-postadressen <b>{email}</b> til en permanent blokkeringsliste. Er du sikker på at denne brukeren virkelig sender søppelpost?"
       yes_delete_spammer: "Ja, slett spammer"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(skjult)"
@@ -2027,87 +2124,87 @@ nb_NO:
       cant: "Beklager, du kan ikke rapportere dette innlegget nå."
       notify_staff: 'Gjør stab oppmerksom på dette privat'
       formatted_name:
-        off_topic: "Det er urelatert"
+        off_topic: "Det er utenfor temaet"
         inappropriate: "Det er upassende"
         spam: "Det er reklame"
-      custom_placeholder_notify_user: "Vær spesifikk, konstruktiv og snill."
+      custom_placeholder_notify_user: "Vær spesifikk, vær konstruktiv og vær alltid snill."
       custom_placeholder_notify_moderators: "La oss vite nøyaktig hva problemet er, og del relevante lenker og eksempler hvorvidt det er mulig."
       custom_message:
         at_least:
-          one: "skriv inn minst ett tegn"
-          other: "skriv inn minst {{count}} tegn"
+          one: skriv inn minst ett tegn
+          other: skriv inn minst {{count}} tegn
         more:
-          one: "Én igjen…"
-          other: "{{count}} igjen…"
+          one: Én igjen…
+          other: '{{count}} igjen…'
         left:
-          one: "ett gjenstående"
-          other: "{{count}} gjenstående"
+          one: ett gjenstående
+          other: '{{count}} gjenstående'
     flagging_topic:
       title: "Takk for at du hjelper med å vedlikeholde god skikk i samfundet vårt!"
-      action: "Rapporter emne"
+      action: "Rapporter Emne"
       notify_action: "Melding"
     topic_map:
-      title: "Emneoppsummering"
-      participants_title: "Hyppige bidragsytere"
+      title: "Oppsummering av Emne"
+      participants_title: "Hyppige innleggsskrivere"
       links_title: "Populære Lenker"
       links_shown: "vis flere lenker…"
       clicks:
-        one: "1 klikk"
-        other: "%{count} klikk"
+        one: 1 klikk
+        other: '%{count} klikk'
     post_links:
       about: "utvid flere lenker for dette innlegget"
       title:
-        one: "Én til"
-        other: "%{count} flere"
+        one: Én til
+        other: '%{count} flere'
     topic_statuses:
       warning:
         help: "Dette er en offisiell advarsel."
       bookmarked:
-        help: "Du lagret dette emnet"
+        help: "Du bokmerket dette emnet"
       locked:
-        help: "dette emnet er låst; det aksepterer ikke lenger nye svar"
+        help: "Dette emnet er stengt; det er ikke mulig å skrive nye svar"
       archived:
-        help: "dette emnet er arkivert; det er fryst og kan ikke bli aktivert"
+        help: "Dette emnet er arkivert; det er frosset og kan ikke lenger endres"
       locked_and_archived:
-        help: "Dette emnet er lukket og akrivert; nye innlegg godtas ikke og tidligere svar kan ikke endres"
+        help: "Dette emnet er både lukket og arkivert; det er ikke mulig å skrive nye svar eller endre på det"
       unpinned:
         title: "Feste fjernet"
-        help: "Dette emnet er ikke lenger festet, det vil vises i vanlig rekkefølge"
+        help: "Denne ble løsnet for deg; den vil vises i vanlig rekkefølge"
       pinned_globally:
         title: "Globalt fastsatt"
-        help: "Emnet er festet globalt; det vil vises på toppen av seneste og i egen kategori"
+        help: "Dette emnet er festet globalt; det vil vises øverst i siste og listen for emnets kategori"
       pinned:
         title: "Fastsatt"
-        help: "Dette emnet er fastsatt for deg; det vil vises i toppen av sin kategori"
+        help: "Dette emnet er festet for deg; det vil vises øverst i sin kategori"
       invisible:
-        help: "Dette emnet er ikke synlig; det vil ikke vises i emnelister, og kan kun leses via en direktelenke"
+        help: "Dette emnet er ikke synlig; det vil ikke vises i lister over emner, og er kun tilgjengelig via en direkte lenke"
     posts: "Innlegg"
-    posts_long: "{{number}} innlegg i dette emnet"
+    posts_long: "det er {{number}} innlegg i dette emnet"
     posts_likes_MF: |
-      This topic has {count, plural, one {1 reply} other {# replies}} {ratio, select,
-      low {with a high like to post ratio}
-      med {with a very high like to post ratio}
-      high {with an extremely high like to post ratio}
+      Dette emnet har {count, plural, one {1 svar} other {# svar}} {ratio, select,
+      low {med mange likes i forhold til innlegg}
+      med {med veldig mange likes i forhold til innlegg}
+      high {med ekstremt mange likes i forhold til innlegg}
       other {}}
     original_post: "Originalt innlegg"
     views: "Visninger"
     views_lowercase:
-      one: "visninger"
-      other: "visninger"
+      one: visninger
+      other: visninger
     replies: "Svar"
     views_long:
-      one: "dette emnet er vist 1 gang"
-      other: "dette emnet er vist {{number}} ganger"
+      one: dette emnet er lest 1 gang
+      other: dette emnet er lest {{number}} ganger
     activity: "Aktivitet"
     likes: "Likes"
     likes_lowercase:
-      one: "like"
-      other: "likes"
-    likes_long: "det er {{number}} likes i dette emnet"
+      one: like
+      other: likes
+    likes_long: "det finnes {{number}} likes i dette emnet"
     users: "Deltakere"
     users_lowercase:
-      one: "bruker"
-      other: "brukere"
+      one: bruker
+      other: brukere
     category_title: "Kategori"
     history: "Historie"
     changed_by: "av {{author}}"
@@ -2121,18 +2218,18 @@ nb_NO:
       latest:
         title: "Siste"
         title_with_count:
-          one: "Siste (1)"
-          other: "Siste ({{count}})"
-        help: "de sist oppdaterte emnene"
+          one: Siste (1)
+          other: Siste ({{count}})
+        help: "emner med nylige innlegg"
       hot:
-        title: "Populære"
+        title: "Populær"
         help: "et utvalg av de mest populære emnene"
       read:
         title: "Lest"
-        help: "emner du har lest, i den rekkefølgen du har lest dem"
+        help: "emner du har lest, i den rekkefølgen du sist leste dem"
       search:
         title: "Søk"
-        help: "Søk i alle emner"
+        help: "søk i alle emner"
       categories:
         title: "Kategorier"
         title_in: "Kategori - {{categoryName}}"
@@ -2140,21 +2237,21 @@ nb_NO:
       unread:
         title: "Uleste"
         title_with_count:
-          one: "Ulest (1)"
-          other: "Ulest ({{count}})"
-        help: "emner med uleste innlegg du for øyeblikket følger eller overvåker"
+          one: Ulest (1)
+          other: Ulest ({{count}})
+        help: "emner du følger eller overvåker for øyeblikket, med uleste innlegg"
         lower_title_with_count:
-          one: "1 ulest"
-          other: "{{count}} uleste"
+          one: 1 ulest
+          other: '{{count}} uleste'
       new:
         lower_title_with_count:
-          one: "1 ny"
-          other: "{{count}} nye"
+          one: 1 ny
+          other: '{{count}} nye'
         lower_title: "ny"
         title: "Nye"
         title_with_count:
-          one: "Nye (1)"
-          other: "Nye ({{count}})"
+          one: Nye (1)
+          other: Nye ({{count}})
         help: "emner opprettet de siste dagene"
       posted:
         title: "Mine innlegg"
@@ -2165,12 +2262,12 @@ nb_NO:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: "{{categoryName}} (1)"
-          other: "{{categoryName}} ({{count}})"
+          one: '{{categoryName}} (1)'
+          other: '{{categoryName}} ({{count}})'
         help: "siste emner i {{categoryName}}-kategorien"
       top:
         title: "Aktive"
-        help: "de mest aktive emnene det siste året, den siste måneden, den siste uken eller i dag"
+        help: "de mest aktive emnene det siste året, den siste måneden, uken eller dagen "
         all:
           title: "Totalt"
         yearly:
@@ -2215,7 +2312,7 @@ nb_NO:
         jump: '<b>#</b> Gå til innlegg #'
         back: '<b>u</b> Tilbake'
         up_down: '<b>k</b>/<b>j</b> Flytt utvalg &uarr; &darr;'
-        open: '<b>o</b> or <b>Enter</b> Åpne valgt emne'
+        open: '<b>o</b> eller <b>Enter</b> Åpne valgt emne'
         next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> Neste/forrige del'
       application:
         title: 'Applikasjon'
@@ -2226,12 +2323,15 @@ nb_NO:
         show_incoming_updated_topics: '<b>.</b> Vis oppdaterte emner'
         search: '<b>/</b> eller <b>Ctrl</b>+<b>Alt</b>+<b>f</b> Søk'
         help: '<b>?</b> Åpne tastaturhjelp'
-        dismiss_new_posts: '<b>x</b>, <b>r</b> Avvis Nye/Innlegg'
-        dismiss_topics: '<b>x</b>, <b>t</b> Avvis emner'
+        dismiss_new_posts: '<b>x</b>, <b>r</b> Forkast Nye/Innlegg'
+        dismiss_topics: '<b>x</b>, <b>t</b> Forkast Emner'
         log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Logg ut'
+      composing:
+        title: 'Skriving'
+        return: '<b>shift</b>+<b>c</b> Gå tilbake til redigeringspanelet'
       actions:
         title: 'Handlinger'
-        bookmark_topic: '<b>f</b> Bokmerk emne / Fjern bokmerke'
+        bookmark_topic: '<b>f</b> Legg til/fjern bokmerke for emne'
         pin_unpin_topic: '<b>shift</b>+<b>p</b> Fest/fjern feste for emne'
         share_topic: '<b>shift</b>+<b>s</b> Del emne'
         share_post: '<b>s</b> Del innlegg'
@@ -2244,31 +2344,32 @@ nb_NO:
         bookmark: '<b>b</b> Bokmerk innlegg'
         edit: '<b>e</b> Rediger innlegg'
         delete: '<b>d</b> Slett innlegg'
-        mark_muted: '<b>m</b>, <b>m</b> Ignorer emnet'
+        mark_muted: '<b>m</b>, <b>m</b> Ignorer emne'
         mark_regular: '<b>m</b>, <b>r</b> Vanlig (forvalgt) emne'
         mark_tracking: '<b>m</b>, <b>t</b> Overvåk emne'
         mark_watching: '<b>m</b>, <b>w</b> Følg emne'
         print: '<b>ctrl</b>+<b>p</b> Skriv ut emne'
     badges:
       earned_n_times:
-        one: "Har gjort seg fortjent til dette merket"
-        other: "Har gjort seg fortjent til dette merket %{count} ganger"
+        one: Har gjort seg fortjent til dette merket
+        other: Har gjort seg fortjent til dette merket %{count} ganger
       granted_on: "Tildelt %{date}"
       others_count: "(%{count}) andre har dette merket"
       title: Merker
       allow_title: "Du kan bruke dette merket som tittel"
       multiple_grant: "Du kan oppnå dette flere ganger"
       badge_count:
-        one: "Étt merke"
-        other: "%{count} Merker"
+        one: 1 merke
+        other: '%{count} merker'
       more_badges:
-        one: "+1 mer"
-        other: "+%{count} Flere"
+        one: +1 mer
+        other: +%{count} Flere
       granted:
-        one: "ett tildelt"
-        other: "%{count} tildelt"
+        one: ett tildelt
+        other: '%{count} tildelt'
       select_badge_for_title: Velg et merke å bruke som din tittel
-      none: "<none>"
+      none: "(intet)"
+      successfully_granted: "Tildelte %{badge} til %{username}"
       badge_grouping:
         getting_started:
           name: Kom i gang
@@ -2291,6 +2392,7 @@ nb_NO:
       </p>
     tagging:
       all_tags: "Alle stikkord"
+      other_tags: "Andre stikkord"
       selector_all_tags: "alle stikkord"
       selector_no_tags: "ingen stikkord"
       changed: "stikkord endret:"
@@ -2298,8 +2400,8 @@ nb_NO:
       choose_for_topic: "valgfrie stikkord"
       delete_tag: "Slett stikkord"
       delete_confirm:
-        one: "Er du sikker på at du ønsker å slette dette stikkordet og fjerne det fra emnet det er tilknyttet?"
-        other: "Er du sikker på at du ønsker å slette dette stikkordet og fjerne det fra {{count}} emner det er tilknyttet?"
+        one: Er du sikker på at du ønsker å slette dette stikkordet og fjerne det fra emnet det er tilknyttet?
+        other: Er du sikker på at du ønsker å slette dette stikkordet og fjerne det fra {{count}} emner som er tilknyttet det?
       delete_confirm_no_topics: "Er du sikker på at du ønsker å slette dette stikkordet?"
       rename_tag: "Gi stikkord nytt navn"
       rename_instructions: "Velg et nytt navn for dette stikkordet:"
@@ -2319,56 +2421,60 @@ nb_NO:
           description: "Du vil automatisk følge alle emnene med dette stikkordet. Du vil bli varslet om alle nye innlegg og emner; i tillegg vil antallet uleste og nye innlegg vises ved siden av emnet."
         watching_first_post:
           title: "Følger første innlegg"
-          description: "Du vil bare bli varslet om det første innlegget i hvert nye emne som gjør bruk av dette stikkordet."
+          description: "Du vil bare bli varslet om det første innlegget i hvert nye emne med dette stikkordet."
         tracking:
           title: "Overvåkning"
           description: "Du vil automatisk overvåke alle emner med dette stikkordet. Antallet uleste og nye innlegg vil vises ved siden av emnet."
         regular:
           title: "Aktivt medlem"
-          description: "Du vil bli varslet hvis noen nevner ditt @navn eller svarer på ditt innlegg."
+          description: "Du vil bli varslet hvis noen nevner @navnet ditt eller svarer på innlegget ditt."
         muted:
           title: "Ignorert"
-          description: "Du vil ikke bli varslet om noe vedrørende disse emner som bruker dette stikkordet, og de vil ikke vises i din ulest-liste."
+          description: "Du vil ikke bli varslet om noe vedrørende nye emner med dette stikkordet, og de vil ikke vises i ulest-listen din."
       groups:
         title: "Stikkordgrupper"
         about: "Legg stikkord til grupper for å kunne organisere dem enklere."
         new: "Ny gruppe"
         tags_label: "Stikkord i denne gruppen:"
-        parent_tag_label: "Foreldrestikkord:"
+        parent_tag_label: "Overordnet stikkord:"
         parent_tag_placeholder: "Valgfritt"
-        parent_tag_description: "Stikkord fra denne gruppen kan ikke brukes, med mindre foreldrestikkordet er til stede."
-        one_per_topic_label: "Sett grense på ett stikkord for hvert emne for denne gruppen"
+        parent_tag_description: "Stikkord fra denne gruppen kan ikke brukes med mindre det overordnede stikkordet er til stede."
+        one_per_topic_label: "Begrens til ett stikkord fra denne gruppen per emne "
         new_name: "Ny stikkordgruppe"
         save: "Lagre"
         delete: "Slett"
         confirm_delete: "Er du sikker på at du vil slette denne stikkordgruppen?"
+        everyone_can_use: "Stikkord kan benyttes av alle"
+        usable_only_by_staff: "Stikkord er synlige for alle, men kun staben kan bruke dem"
+        visible_only_to_staff: "Stikkord er kun synlige for staben"
       topics:
         none:
           unread: "Du har ingen uleste emner."
           new: "Du har ingen nye emner."
           read: "Du har ikke lest noen emner enda."
-          posted: "Du har ikke opprettet noen emner enda."
-          latest: "Det er ingen siste emner igjen å lese."
-          hot: "Det er ingen populære emner."
-          bookmarks: "Du har ikke bokmerket noen emner enda."
-          top: "Det er ingen populære emner."
-          search: "Det er ingen søkeresultater."
+          posted: "Du har ikke skrevet noe innlegg i emner enda."
+          latest: "Det finnes ingen flere siste emner."
+          hot: "Det finnes ingen populære emner."
+          bookmarks: "Du har ikke bokmerket noen emner ennå."
+          top: "Det finnes ingen populære emner."
+          search: "Det finnes ingen søkeresultater."
         bottom:
-          latest: "Det er ingen siste emner igjen å lese."
-          hot: "Det er ingen populære emner igjen å lese."
-          posted: "Det er ingen emner med innlegg igjen å lese."
-          read: "Det er ingen leste emner igjen å lese."
-          new: "Det er ingen nye emner igjen å lese."
-          unread: "Det er ingen uleste emner igjen å lese."
-          top: "Det er ingen flere populære emner."
-          bookmarks: "Det er ingen bokmerkede emner."
-          search: "Det er ingen flere søkeresultater"
+          latest: "Det finnes ingen flere siste emner."
+          hot: "Det finnes ingen flere populære emner."
+          posted: "Det finnes ingen flere emner med innlegg."
+          read: "Det finnes ingen flere leste emner."
+          new: "Det finnes ingen flere nye emner."
+          unread: "Det finnes ingen flere uleste emner."
+          top: "Det finnes ingen flere populære emner."
+          bookmarks: "Det finnes ingen bokmerkede emner."
+          search: "Det finnes ingen flere søkeresultater"
     invite:
       custom_message: "Gjør din invitasjon litt mer personlig ved å skrive ett"
       custom_message_link: "egendefinert melding"
       custom_message_placeholder: "Skriv inn din egendefinerte melding"
       custom_message_template_forum: "Hei, du burde ta del i dette forumet!"
-      custom_message_template_topic: "Hei, jeg tenkte du fattet interesse for dette emnet!"
+      custom_message_template_topic: "Hei, jeg tenkte du ville like dette emnet!"
+    forced_anonymous: "På grunn av ekstrem belastning vises denne siden midlertidig på samme måte som om du var logget ut."
     safe_mode:
       enabled: "Sikkert modus er påskrudd, for å skru av sikkert modus, lukk dette nettleservinduet"
   admin_js:
@@ -2379,6 +2485,8 @@ nb_NO:
       dashboard:
         title: "Dashbord"
         last_updated: "Dashboardet var sist oppdatert:"
+        find_old: "Ser du etter det gamle dashbordet?"
+        old_link: "besøk det her"
         version: "Versjon"
         up_to_date: "Du har den seneste versjonen!"
         critical_available: "En kritisk oppdatering er tilgjengelig."
@@ -2395,24 +2503,29 @@ nb_NO:
         no_problems: "Ingen problemer ble funnet."
         moderators: 'Moderatorer:'
         admins: 'Adminer:'
-        silenced: 'Forstummet:'
-        suspended: 'Bannlyst:'
+        silenced: 'Dempet:'
+        suspended: 'Utestengt:'
         private_messages_short: "Meldinger"
         private_messages_title: "Meldinger"
         mobile_title: "Mobil"
         space_free: "{{size}} ledig"
         uploads: "opplastinger"
         backups: "sikkerhetskopier"
+        lastest_backup: "Siste: %{date}"
         traffic_short: "Trafikk"
         traffic: "Applikasjon webforespørsler"
         page_views: "Sidevisninger"
         page_views_short: "Sidevisninger"
         show_traffic_report: "Vis detaljert trafikkrapport"
+        community_health: Samfunnshelse
+        whats_new_in_discourse: "Hva er nytt i Discourse?"
+        activity_metrics: Aktivitetsmåling
         reports:
+          trend_title: "%{percent} endring. Nåværende %{current}, var %{prev} i forrige periode."
           today: "I dag"
           yesterday: "I går"
-          last_7_days: "Siste 7 Dager"
-          last_30_days: "Siste 30 Dager"
+          last_7_days: "Siste 7"
+          last_30_days: "Siste 30"
           all_time: "Gjennom tidene"
           7_days_ago: "7 dager siden"
           30_days_ago: "30 dager siden"
@@ -2423,25 +2536,33 @@ nb_NO:
           start_date: "Startdato"
           end_date: "Sluttdato"
           groups: "Alle grupper"
+          disabled: "Denne rapporten er deaktivert"
+          trending_search:
+            more: '<a href="/admin/logs/search_logs">Logg for søk</a>'
+            disabled: 'Rapporten for trending av søk er deaktivert. Aktiver <a href="/admin/site_settings/category/all_results?filter=log%20search%20queries">logging av søkeord</a> for å samle inn data.'
       commits:
-        latest_changes: "Siste endringer: Oppgrader ofte!"
+        latest_changes: "Siste endringer: Oppdater ofte!"
         by: "av"
       flags:
         title: "Rapporteringer"
         active_posts: "Rapporterte innlegg"
         old_posts: "Gamle rapporterte innlegg"
-        topics: "Rapporterte innlegg"
+        topics: "Rapporterte Emner"
         moderation_history: "Moderatorhistorikk"
         agree: "Godta"
         agree_title: "Bekreft at denne rapporteringen er gyldig og korrekt"
-        agree_flag_hide_post: "Samtykk og skjul innlegg"
+        agree_flag_hide_post: "Skjul innlegg"
         agree_flag_hide_post_title: "Gjem dette innlegget og send en melding til brukeren automatisk med en forespørsel om gjøre endringer."
         agree_flag_restore_post: "Samtykk og gjenopprett innlegg"
         agree_flag_restore_post_title: "Gjenopprett innlegget slik at alle brukere kan se det."
-        agree_flag: "Samtykk og behold innlegg"
+        agree_flag_suspend: "Steng ute bruker"
+        agree_flag_suspend_title: "Si deg enig med rapportering og steng ute bruker. "
+        agree_flag_silence: "Demp bruker"
+        agree_flag_silence_title: "Si deg enig med rapportering og demp bruker. "
+        agree_flag: "Behold innlegg"
         agree_flag_title: "Samtykk med flagg og behold innlegget uendret."
-        defer_flag: "Ignorer"
-        defer_flag_title: "Fjern denne rapporteringen; den krever ingen handling på dette tidspunktet."
+        ignore_flag: "Ignorer"
+        ignore_flag_title: "Fjern denne rapporteringen; den krever ingen handling på dette tidspunktet."
         delete: "Slett"
         delete_title: "Fjern innlegget denne rapporteringen refererer til."
         delete_post_defer_flag: "Slett innlegg og ingorer flagg"
@@ -2450,16 +2571,22 @@ nb_NO:
         delete_post_agree_flag_title: "Slett innlegg; hvis det er første innlegg, slett emnet"
         delete_flag_modal_title: "Slett og…"
         delete_spammer: "Slett spammer"
-        delete_spammer_title: "Fjern denne brukeren og alle innlegg og emner av brukeren."
+        delete_spammer_title: "Fjern denne brukeren og alle innlegg og emner laget av brukeren."
         disagree_flag_unhide_post: "Si deg uenig med rapportering (vis innlegg)"
         disagree_flag_unhide_post_title: "Fjern alle rapporteringer fra dette innlegget og gjør det synlig igjen"
         disagree_flag: "Si deg uenig"
         disagree_flag_title: "Benekt rapportering som ugyldig eller uriktig"
         clear_topic_flags: "Ferdig"
-        clear_topic_flags_title: "Emnet har blitt undersøkt og problemer har blitt løst. Klikk Ferdig for å fjerne rapporteringene."
+        clear_topic_flags_title: "Emnet er undersøkt og problemene ble løst. Klikk Ferdig for å fjerne rapporteringene."
         more: "(flere svar…)"
-        suspend_user: "Bannlys bruker"
-        suspend_user_title: "Bannlys bruker for dette innlegget"
+        suspend_user: "Steng ute bruker"
+        suspend_user_title: "Steng ute bruker for dette innlegget"
+        replies:
+          one: '[1 svar]'
+          other: '[%{count} svar]'
+        delete_replies:
+          one: Fjern %{count} svar i tillegg til dette innlegget?
+          other: Fjern de %{count} svarene i tillegg til dette innlegget?
         dispositions:
           agreed: "enig"
           disagreed: "uenig"
@@ -2470,7 +2597,7 @@ nb_NO:
         system: "System"
         error: "Noe gikk galt"
         reply_message: "Svar"
-        no_results: "Det er ingen rapporterte innlegg."
+        no_results: "Det finnes ingen rapporterte innlegg."
         topic_flagged: "Dette emnet har blitt rapportert."
         show_full: "vis hele innlegget"
         visit_topic: "Besøk emnet for å utføre handling"
@@ -2483,20 +2610,56 @@ nb_NO:
           type: "Type"
           users: "Brukere"
           last_flagged: "Sist rapporter"
+          no_results: "Det er ingen emner med flagg."
         short_names:
-          off_topic: "urelatert"
+          off_topic: "utenfor temaet"
           inappropriate: "upassende"
           spam: "spam"
           notify_user: "egendefinert"
           notify_moderators: "egendefinert"
       groups:
+        new:
+          title: "Ny gruppe"
+          create: "Opprett"
+          name:
+            too_short: "Gruppenavnet er for kort"
+            too_long: "Gruppenavnet er for langt"
+            checking: "Sjekker om gruppenavnet er ledig..."
+            available: "Gruppenavn tilgjengelig"
+            not_available: "Gruppenavn ikke tilgjengelig"
+            blank: "Gruppenavnet kan ikke være tomt"
+        bulk_add:
+          title: "Legg Til Fra Liste"
+          complete_users_not_added: "Disse brukerne ble ikke lagt til (sjekk om kontoen finnes):"
+          paste: "Lim inn en liste over brukernavn eller e-poster, en per linje:"
+        add_members:
+          as_owner: "Sett bruker(e) som eier(e) av denne gruppen"
+        manage:
+          interaction:
+            email: E-post
+            incoming_email: "Brukerdefinert innkommende e-postadresse"
+            incoming_email_placeholder: "velg e-postadresse"
+            visibility: Synlighet
+            visibility_levels:
+              title: "Hvem kan se denne gruppen?"
+              public: "Alle"
+              members: "Gruppeeiere, medlemmer og administratorer"
+              staff: "Gruppeeiere og stab"
+              owners: "Gruppeeiere og administratorer"
+          membership:
+            automatic: Automatisk
+            trust_level: Tillitsnivå
+            trust_levels_title: "Tillitsnivå som automatisk gis til nye medlemmer når de legges til:"
+            trust_levels_none: "Ingen"
+            automatic_membership_email_domains: "Brukere som registreres med et e-postdomene identisk med et fra denne listen vil automatisk legges til i denne gruppen:"
+            automatic_membership_retroactive: "Bruk den samme regelen på eksisterende brukere med matchende e-postdomener"
+            primary_group: "Sett som primærgruppe automatisk"
+        name_placeholder: "Gruppenavn, ingen mellomrom, samme som regel for brukernavn"
         primary: "Primærgruppe"
         no_primary: "(ingen primærgruppe)"
         title: "Grupper"
         edit: "Rediger grupper"
         refresh: "Last inn på nytt"
-        new: "Ny"
-        selector_placeholder: "oppgi brukernavn"
         about: "Rediger gruppemedlemskap og navn her."
         group_members: "Gruppemedlemmer"
         delete: "Slett"
@@ -2504,38 +2667,28 @@ nb_NO:
         delete_failed: "Unable to delete group. If this is an automatic group, it cannot be destroyed."
         delete_owner_confirm: "Frata '%{username}' eier-privilegium?"
         add: "Legg til"
-        add_members: "Legg til medlemmer"
         custom: "Egendefinert"
-        bulk_complete: "Brukeren er lagt til i gruppen."
-        bulk_complete_users_not_added: "Disse brukerne ble ikke lagt til (forsikre deg om at de har kontoer):"
-        bulk: "Legg flere til i gruppe"
-        bulk_paste: "Lim inn en liste med brukernavn eller e-postadresser, en per linje:"
-        bulk_select: "(velg en gruppe)"
         automatic: "Automatisk"
-        automatic_membership_email_domains: "Brukere som registererer seg med et e-postdomene som er det samme som et i denne listen, vil automatisk bli lagt til i denne gruppen."
-        automatic_membership_retroactive: "Benytt samme e-postdomeneregel for å legge til eksisterende brukere"
-        default_title: "Forvalgt tittel for alle brukere i denne gruppen"
-        primary_group: "Sett som primærgruppe automatisk"
+        default_title: "Standardtittel"
+        default_title_description: "vil gjelde for alle brukere i denne gruppen"
         group_owners: Eiere
         add_owners: Legg til eiere
-        incoming_email: "Egendefinert innkommende e-postadresse"
-        incoming_email_placeholder: "oppgi e-postadresse"
         none_selected: "Velg en gruppe for å komme i gang"
         no_custom_groups: "Opprett en ny egendefinert gruppe"
       api:
         generate_master: "Generer Master API-nøkkel"
-        none: "Det er ingen aktive API-nøkler akkurat nå."
+        none: "Det finnes ingen aktive API-nøkler akkurat nå."
         user: "Bruker"
         title: "API"
         key: "Nøkkel"
         generate: "Generer API-nøkkel"
         regenerate: "Regenerer API-nøkkel"
-        revoke: "Tilbakedra"
-        confirm_regen: "Er du sikker på at du vil erstatte denne API-nøkkelen med en ny?"
-        confirm_revoke: "Er du sikker på at du vil tilbakedra denne nøkkelen?"
-        info_html: "Din API-nøkkel vil tillate deg å lage og oppdatere emner ved å bruke JSON-samteler."
+        revoke: "Trekk tilbake"
+        confirm_regen: "Er du sikker på at du vil erstatte den API-nøkkelen med en ny?"
+        confirm_revoke: "Er du sikker på at du vil trekke tilbake den nøkkelen?"
+        info_html: "API-nøkkelen din vil tillate deg å lage og oppdatere emner ved å bruke JSON-kall."
         all_users: "Alle brukere"
-        note_html: "Hold denne nøkkelen <strong>hemmelig</strong>. Alle brukere som har den vil kunne opprette vilkårlige innlegg som en hvilken som helst bruker. "
+        note_html: "Hold denne nøkkelen <strong>hemmelig</strong>, alle brukere som har den, vil kunne opprette vilkårlige innlegg som hvilken som helst bruker. "
       web_hooks:
         title: "Webhooker"
         none: "Det finnes ingen webhooker for tiden."
@@ -2546,7 +2699,7 @@ nb_NO:
         save: "Lagre"
         destroy: "Slett"
         description: "Beskrivelse"
-        controls: "Kontroller"
+        controls: "Handlinger"
         go_back: "Tilbake til liste"
         payload_url: "Payload URL"
         payload_url_placeholder: "https://eksempel.no/postmottak"
@@ -2569,28 +2722,40 @@ nb_NO:
         groups_filter: "Utløse grupper"
         delete_confirm: "Slette denne webhooken?"
         topic_event:
-          name: "Emnehendelse"
-          details: "Når det et nytt, revidert, endret eller slettet emne."
+          name: "Hendelse for Emne"
+          details: "Når det finnes et nytt, revidert, endret eller slettet emne."
         post_event:
           name: "Innleggshendelse"
           details: "Når det er et nytt, redigert, slettet eller gjenopprettet innlegg."
         user_event:
           name: "Brukerhendelse"
           details: "Når en bruker logger inn, logger ut, blir opprettet, godkjent eller oppdatert."
+        group_event:
+          name: "Gruppehandling"
+          details: "Når en gruppe lages, oppdateres eller slettes."
+        category_event:
+          name: "Kategorihandling"
+          details: "Når en kategori lages, oppdateres eller slettes."
+        tag_event:
+          name: "Stikkordshandling"
+          details: "Når et stikkord lages, oppdateres eller slettes."
+        flag_event:
+          name: "Flagghandling"
+          details: "Når et flagg settes, aksepteres, avvises eller ignoreres."
         delivery_status:
           title: "Sendingsstatus"
           inactive: "Inaktiv"
           failed: "Feilet"
           successful: "Vellykket"
         events:
-          none: "Det er ingen relaterte hendelser."
+          none: "Det finnes ingen relaterte hendelser."
           redeliver: "Send på nytt"
           incoming:
-            one: "Det er en ny hendelse."
-            other: "Det er {{count}} nye hendelser."
+            one: Det finnes en ny hendelse.
+            other: Det finnes {{count}} nye hendelser.
           completed_in:
-            one: "Ferdig på 1 sekund."
-            other: "Ferdig på {{count}} sekunder."
+            one: Ferdig på 1 sekund.
+            other: Ferdig på {{count}} sekunder.
           request: "Forespørsel"
           response: "Svar"
           redeliver_confirm: "Er du sikker på at du vil sende samme payload på nytt?"
@@ -2618,12 +2783,13 @@ nb_NO:
         change_settings: "Endre instillinger"
         change_settings_short: "Innstillinger"
         howto: "Hvordan installerer jeg utvidelser?"
+        official: "Offisiell Plugin"
       backups:
-        title: "Sikkerhetskopieringer"
+        title: "Sikkerhetskopier"
         menu:
-          backups: "Sikkerhetskopieringer"
+          backups: "Sikkerhetskopier"
           logs: "Logger"
-        none: "Ingen sikkerhetskopiering er tilgjengelig."
+        none: "Ingen sikkerhetskopi er tilgjengelig."
         read_only:
           enable:
             title: "Aktiver skrivebeskyttet modus"
@@ -2641,8 +2807,8 @@ nb_NO:
           label: "Last opp"
           title: "Last opp en sikkerhetskopi til denne instansen"
           uploading: "Laster opp…"
-          success: "'{{filename}}' har blitt lastet opp."
-          error: "Det oppsto en feil ved opplastingen av '{{filename}}': {{message}}"
+          success: "Opplastingen av '{{filename}}' var vellykket. Filen blir nå bearbeidet og det vil ta opp til et minutt før den dukker opp i listen."
+          error: "Det oppstod en feil ved opplastingen av '{{filename}}': {{message}}"
         operations:
           is_running: "En prosess pågår…"
           failed: " {{operation}} mislyktes. Undersøk loggene."
@@ -2652,15 +2818,15 @@ nb_NO:
             confirm: "Er du sikker på at du vil avbryte denne operasjonen?"
           backup:
             label: "Sikkerhetskopi"
-            title: "Opprett en sikkerhetskopiering"
+            title: "Opprett en sikkerhetskopi"
             confirm: "Vil du starte en ny sikkerhetskopiering?"
-            without_uploads: "Ja (ikke inkluder filer)"
+            without_uploads: "Ja (ikke inkluderer opplastinger)"
           download:
             label: "Last ned"
             title: "Send e-post med nedlastingslenke"
-            alert: "En lenke til nedlasting av denne sikkerhetskopien har blitt sendt til deg per e-post."
+            alert: "En lenke for nedlasting av denne sikkerhetskopien er blitt sendt til deg på e-post."
           destroy:
-            title: "Fjern sikkerhetskopi"
+            title: "Fjern sikkerhetskopien"
             confirm: "Er du sikker på at du vil slette denne sikkerhetskopien"
           restore:
             is_disabled: "Gjenoppretting er deaktivert i nettstedsinnstillingene."
@@ -2708,7 +2874,7 @@ nb_NO:
         email_templates:
           title: "E-postmaler"
           subject: "Emne"
-          multiple_subjects: "Denne e-postmalen har flerfoldige emner."
+          multiple_subjects: "Denne e-postmalen har flere emner."
           body: "Meldingstekst"
           none_selected: "Velg en e-postmal for å begynne å redigere."
           revert: "Tilbakestill endringer"
@@ -2723,6 +2889,7 @@ nb_NO:
           common: "Vanlig"
           desktop: "Skrivebord"
           mobile: "Mobil"
+          settings: "Innstillinger"
           preview: "Forhåndsvis"
           is_default: "Drakt påskrudd som forvalg"
           user_selectable: "Drakten kan velges av brukerne"
@@ -2735,6 +2902,11 @@ nb_NO:
           add_upload: "Legg til opplasting"
           upload_file_tip: "Velg en effekt å laste opp (PNG, WOFF2, osv…)"
           variable_name: "Variabelnavn for SCSS:"
+          variable_name_invalid: "Ugyldig variabelnavn. Kun alfanumeriske tegn tillatt. Må starte med en bokstav. Må være unikt. "
+          variable_name_error:
+            invalid_syntax: "Ugyldig variabelnavn. Kun alfanumeriske tegn tillatt. Må starte med en bokstav."
+            no_overwrite: "Ugyldig variabelnavn. Kan ikke overskrive en eksisterende variabel."
+            must_be_unique: "Ugyldig variabelnavn. Må være unikt."
           upload: "Last opp"
           child_themes_check: "Drakten inneholder andre underdrakter"
           css_html: "Egendefinert CSS/HTML"
@@ -2743,6 +2915,8 @@ nb_NO:
           delete_upload_confirm: "Slett denne opplastingen? (Draktens CSS kan slutte å virke!)"
           import_web_tip: "Pakkebrønn inneholdende drakt"
           import_file_tip: ".dcstyle.json-fil inneholdende drakt"
+          is_private: "Drakten er i et privat git repository"
+          public_key: "Gi den følgende public keyen tilgang til repoet:"
           about_theme: "Om drakt"
           license: "Lisens"
           component_of: "Drakten er en del av:"
@@ -2751,9 +2925,11 @@ nb_NO:
           updating: "Oppdaterer…"
           up_to_date: "Drakten er oppdatert, sist sjekket:"
           add: "Legg til"
+          theme_settings: "Draktinnstillinger"
+          no_settings: "Denne drakten har ingen innstillinger."
           commits_behind:
-            one: "Drakten er én utgave foreldet!"
-            other: "Drakten er {{count}} utgaver foreldet!"
+            one: Drakten er én utgave foreldet!
+            other: Drakten er {{count}} utgaver foreldet!
           scss:
             text: "CSS"
             title: "Skriv inn egendefinert CSS, alle gyldige CSS- og SCSS-stiler godtas"
@@ -2775,6 +2951,9 @@ nb_NO:
           body_tag:
             text: "</body>"
             title: "HTML som vil bli smettet inn før </body>-taggen"
+          yaml:
+            text: "YAML"
+            title: "Definer draktinnstillinger i YAML-format"
         colors:
           select_base:
             title: "Velg hovedpalett"
@@ -2810,7 +2989,7 @@ nb_NO:
             description: "Tekst og ikoner i nettstedets hode."
           highlight:
             name: 'utheving'
-            description: 'Bakgrunnsfarge på uthevede elementer på siden, som innlegg og emner.'
+            description: 'Bakgrunnsfargen på uthevede elementer på siden, slik som innlegg og emner.'
           danger:
             name: 'fare'
             description: 'Uthevingsfarge for handlinger som sletting av innlegg og emner.'
@@ -2827,7 +3006,7 @@ nb_NO:
         preview_digest: "Forhåndsvis oppsummering"
         sending_test: "Sender e-post for testing"
         error: "<b>ERROR</b> - %{server_error}"
-        test_error: "Det oppsto et problem ved utsendelse av e-post for testing. Sjekk e-postinnstillinger nøye, sjekk at verten ikke blokkerer e-posttilkoblinger, og prøv igjen."
+        test_error: "Det oppstod et problem ved utsendelse av e-post for testing. Sjekk e-postinnstillinger nøye, sjekk at verten ikke blokkerer e-posttilkoblinger, og prøv igjen."
         sent: "Sendt"
         skipped: "Hoppet over"
         bounced: "Tilbakesendt"
@@ -2842,7 +3021,7 @@ nb_NO:
         send_test: "Send e-post for testing"
         sent_test: "sendt!"
         delivery_method: "Leveringsmetode"
-        preview_digest_desc: "Forhåndsvis innholde i føljetong-e-postene som sendes til inaktive brukere."
+        preview_digest_desc: "Forhåndsvis innholde i oppsummerings-e-postene som sendes til inaktive brukere."
         refresh: "Refresh"
         send_digest_label: "Send dette resultatet til:"
         send_digest: "Send"
@@ -2850,8 +3029,8 @@ nb_NO:
         format: "Format"
         html: "html"
         text: "tekst"
-        last_seen_user: "Bruker sist sett:"
-        no_result: "Ingen resultater funnet for føljetong."
+        last_seen_user: "Bruker sett sist:"
+        no_result: "Ingen resultater funnet for oppsummering."
         reply_key: "Svar-ID"
         skipped_reason: "Hopp over grunn"
         incoming_emails:
@@ -2888,10 +3067,10 @@ nb_NO:
         no_results: "Ingen moderatorhistorikk tilgjengelig."
         actions:
           delete_user: "Bruker slettet"
-          suspend_user: "Bruker suspendert"
-          silence_user: "Bruker forstummet"
+          suspend_user: "Bruker utestengt"
+          silence_user: "Bruker dempet"
           delete_post: "Innlegg slettet"
-          delete_topic: "Emne slettet"
+          delete_topic: "Emne Slettet"
       logs:
         title: "Logger"
         action: "Handling"
@@ -2934,12 +3113,13 @@ nb_NO:
             change_theme: "bytt drakt"
             delete_theme: "slett drakt"
             change_site_text: "endre sidens tekst"
-            suspend_user: "bannlys bruker"
-            unsuspend_user: "gjeninnsett bruker"
+            suspend_user: "steng ute bruker"
+            unsuspend_user: "Opphev utestenging av bruker"
             grant_badge: "tildel merke"
-            revoke_badge: "tilbakedra merke"
+            revoke_badge: "trekk tilbake merke"
             check_email: "sjekk e-post"
             delete_topic: "slett emne"
+            recover_topic: "angre sletting av emne"
             delete_post: "slett innlegg"
             impersonate: "overta brukerkonto"
             anonymize_user: "anonymiser bruker"
@@ -2947,16 +3127,16 @@ nb_NO:
             change_category_settings: "endre kategori-innstillinger"
             delete_category: "slett kategori"
             create_category: "opprett kategori"
-            silence_user: "forstum bruker"
-            unsilence_user: "fjern forstumming av bruker"
+            silence_user: "demp bruker"
+            unsilence_user: "opphev demping av bruker"
             grant_admin: "innvilg admin"
-            revoke_admin: "tilbakekall admin"
+            revoke_admin: "trekk tilbake administrering"
             grant_moderation: "innvilg moderering"
-            revoke_moderation: "tilbakekall moderering"
+            revoke_moderation: "trekk tilbake moderering"
             backup_create: "opprett sikkerhetskopi"
             deleted_tag: "slettet stikkord"
             renamed_tag: "stikkord med nytt navn"
-            revoke_email: "tilbakekall e-post"
+            revoke_email: "trekk tilbake e-post"
             lock_trust_level: "lås tillitsnivå"
             unlock_trust_level: "lås opp tillitsnivå"
             activate_user: "aktiver bruker"
@@ -2966,6 +3146,16 @@ nb_NO:
             backup_destroy: "ødelegg sikkerhetskopi"
             reviewed_post: "gjennomsett innlegg"
             custom_staff: "egendefinert handling for programtillegg"
+            post_locked: "innlegg låst"
+            post_edit: "innlegg redigert"
+            post_unlocked: "innlegg opplåst"
+            check_personal_message: "sjekk personlig melding"
+            disabled_second_factor: "deaktiver totrinnsverifisering"
+            topic_published: "emne publisert"
+            post_approved: "innlegg godkjent"
+            create_badge: "lag merke"
+            change_badge: "endre merke"
+            delete_badge: "slett merke"
         screened_emails:
           title: "Kontrollerte e-poster"
           description: "Når noen forsøker å lage en ny konto, vil de følgende e-postadressene bli sjekket, og registreringen vil bli blokkert, eller en annen handling vil bli utført."
@@ -2974,7 +3164,7 @@ nb_NO:
             allow: "Tillat"
         screened_urls:
           title: "Kontrollerte URL-er"
-          description: "Disse URLene ble brukt i innlegg av brukere som har blitt identifisert som spammere."
+          description: "Disse URL-ene forekom i innlegg av brukere som har blitt identifisert som spammere."
           url: "URL"
           domain: "Domene"
         screened_ips:
@@ -3008,6 +3198,7 @@ nb_NO:
             header: "Hode"
             full_page: "Full side"
             click_through_only: "Alle (kun klikk gjennom)"
+          header_search_results: "Hode-søkeresultater"
         logster:
           title: "Feillogg"
       watched_words:
@@ -3016,17 +3207,17 @@ nb_NO:
         clear_filter: "Tøm"
         show_words: "vis ord"
         word_count:
-          one: "ett ord"
-          other: "%{count} ord"
+          one: ett ord
+          other: '%{count} ord'
         actions:
           block: 'Blokker'
           censor: 'Sensurer'
           require_approval: 'Krev godkjenning'
           flag: 'Flagg'
         action_descriptions:
-          block: 'Forhindre innlegg som inneholder disse ordene fra å bli postet. Brukeren vil se en feilmelding når vedkommende prøver å sende inn innlegget sitt.'
+          block: 'Forhindre innlegg som inneholder disse ordene, fra å bli opprettet. Brukeren vil se en feilmelding når vedkommende prøver å opprette innlegget sitt.'
           censor: 'Tillat innlegg som inneholder disse ordene, men erstatt dem med bokstaver som skjuler de sensurerte ordene.'
-          require_approval: 'Det kreves at innlegg som inneholder disse ordene godkjennes av staben før de kan ses.'
+          require_approval: 'Innlegg som inneholder disse ordene, vil måtte godkjennes av staben før de kan bli sett.'
           flag: 'Tillat innlegg som inneholder disse ordene, men flagg dem som upassende slik at moderatorer kan se over dem.'
         form:
           label: 'Nytt ord:'
@@ -3034,6 +3225,7 @@ nb_NO:
           placeholder_regexp: "regulært uttrykk"
           add: 'Legg til'
           success: 'Suksess'
+          exists: 'Eksisterer fra før'
           upload: "Last opp"
           upload_successful: "Opplastet. Ord lagt til."
       impersonate:
@@ -3046,7 +3238,7 @@ nb_NO:
         create: 'Legg til admin-bruker'
         last_emailed: "Sist kontaktet"
         not_found: "Beklager, det brukernavner eksisterer ikke i systemet vårt."
-        id_not_found: "Denne brukerID-en eksisterer ikke i vårt system."
+        id_not_found: "Beklager, den bruker-ID-en eksisterer ikke i systemet vårt."
         active: "Aktiv"
         show_emails: "Vis e-poster"
         nav:
@@ -3054,21 +3246,22 @@ nb_NO:
           active: "Aktiv"
           pending: "Ventende"
           staff: 'Stab'
-          suspended: 'Bannlyst'
-          silenced: 'Forstummet'
+          suspended: 'Utestengt'
+          silenced: 'Dempet'
           suspect: 'Mistenkt'
+          staged: 'Arrangert'
         approved: "Godkjent?"
         approved_selected:
-          one: "godkjenn bruker"
-          other: "godkjenn brukere ({{count}})"
+          one: godkjenn bruker
+          other: godkjenn brukere ({{count}})
         reject_selected:
-          one: "avvis bruker"
-          other: "avvis brukere ({{count}})"
+          one: avvis bruker
+          other: avvis brukere ({{count}})
         titles:
           active: 'Aktive brukere'
           new: 'Nye brukere'
           pending: 'Brukere som venter på evaluering'
-          newuser: 'Brukere på tillitsnivå 0 (Ny Bruker)'
+          newuser: 'Brukere på tillitsnivå 0 (Ny bruker)'
           basic: 'Brukere på tillitsnivå 1 (Juniormedlem)'
           member: 'Brukere på tillitsnivå 2 (Medlem)'
           regular: 'Brukere på tillitsnivå 3 (Aktivt medlem)'
@@ -3076,48 +3269,53 @@ nb_NO:
           staff: "Stab"
           admins: 'Admin-brukere'
           moderators: 'Moderatorer'
-          silenced: 'Forstummede brukere'
-          suspended: 'Bannlyste brukere'
+          silenced: 'Dempede brukere'
+          suspended: 'Utestengte brukere'
           suspect: 'Mistenkte brukere'
+          staged: 'Arrangerte Brukere'
         reject_successful:
-          one: "Avvist 1 bruker."
-          other: "Avviste %{count} brukere."
+          one: Avvist 1 bruker.
+          other: Avviste %{count} brukere.
         reject_failures:
-          one: "Kunne ikke avvise 1 bruker."
-          other: "Kunne ikke avvise %{count} brukere."
+          one: Kunne ikke avvise 1 bruker.
+          other: Kunne ikke avvise %{count} brukere.
         not_verified: "Uverifisert"
         check_email:
           title: "Vis denne brukerens e-postadresse"
           text: "Vis"
       user:
-        suspend_failed: "Noe gikk galt ved bannlysing av denne brukeren {{error}}"
-        unsuspend_failed: "Noe gikk galt ved gjeninnsetting av denne brukeren {{error}}"
-        suspend_duration: "Hvor lenge vil du bannlyse denne brukeren? (dager)"
-        suspend_reason_label: "Hvorfor vil du bannlyse? Denne teksten <b>vil være synlig for alle</b> på denne brukerens profilside, og blir vist til brukeren om de skulle forsøke å logge inn. Fatt deg i korthet."
-        suspend_reason_hidden_label: "Hvorfor vil du bannlyse? Denne teksten vil bli vist til brukeren når vedkommende prøver å logge inn. Fatt deg i korthet."
+        suspend_failed: "Noe gikk galt ved utestenging av denne brukeren {{error}}"
+        unsuspend_failed: "Noe gikk galt ved opphevelse av utestenging av denne brukeren {{error}}"
+        suspend_duration: "Hvor lenge skal brukeren være utestengt? (dager)"
+        suspend_reason_label: "Hvorfor stenger du ute brukeren? Denne teksten <b>vil være synlig for alle</b> på denne brukerens profilside og vil bli vist til brukeren når vedkommende forsøker å logge inn. Fatt deg i korthet."
+        suspend_reason_hidden_label: "Hvorfor stenger du ute brukeren? Denne teksten vil bli vist til brukeren når vedkommende prøver å logge inn. Fatt deg i korthet."
         suspend_reason: "Begrunnelse"
         suspend_reason_placeholder: "Bannlysningsgrunn"
         suspend_message: "E-postmelding"
         suspend_message_placeholder: "Alternativt, kan du detaljere bannlysningen og det vil bli sendt per e-post til brukeren."
-        suspended_by: "Bannlyst av"
+        suspended_by: "Utestengt av"
         silence_reason: "Grunn"
-        silenced_by: "Forstummet av"
-        silence_modal_title: "Forstum bruker"
-        silence_duration: "Hvor lenge vil du forstumme denne brukeren?"
+        silenced_by: "Dempet av"
+        silence_modal_title: "Demp bruker"
+        silence_duration: "Hvor lenge skal brukeren dempes?"
         silence_reason_label: "Hvorfor forstummer du denne brukeren?"
-        silence_reason_placeholder: "Grunn til forstumming"
+        silence_reason_placeholder: "Årsak til demping"
         silence_message: "E-postmelding"
         silence_message_placeholder: "(la stå tom for forvalgt melding)"
         suspended_until: "(til %{until})"
-        cant_suspend: "Brukeren kan ikke bannlyses."
+        cant_suspend: "Brukeren kan ikke utestenges."
         delete_all_posts: "Slett alle innlegg"
-        delete_all_posts_confirm_MF: "Du er i ferd med å slette {INNLEGG, flertall, ett {ett innlegg} andre {# innlegg}} og {INNLEGG, flertall, ett {ett emne} andre {# emner}}. Er du sikker?"
-        silence: "Forstum"
-        unsilence: "Fjern forstumming"
-        silenced: "Forstummet?"
+        penalty_post_actions: "Hva ønsker du å gjøre med det assosierte innlegg"
+        penalty_post_delete: "Slett innlegget"
+        penalty_post_edit: "Rediger innlegget"
+        penalty_post_none: "ikke gjør noe"
+        delete_all_posts_confirm_MF: "Du er i ferd med å slette {POSTS, plural, one {1 innlegg} other {# innlegg}} og {TOPICS, plural, one {1 emne} other {# emner}}. Er du sikker?"
+        silence: "Demp"
+        unsilence: "Opphev demping"
+        silenced: "Dempet?"
         moderator: "Moderator?"
         admin: "Admin?"
-        suspended: "Bannlyst?"
+        suspended: "Utestengt?"
         staged: "Arrangert?"
         show_admin_profile: "Admin"
         refresh_browsers: "Tving gjenoffrisking av nettleser"
@@ -3128,22 +3326,26 @@ nb_NO:
         ip_lookup: "IP Lookup"
         log_out: "Logg ut"
         logged_out: "Brukeren ble logget ut på alle enheter"
-        revoke_admin: 'Tilbakedra admin'
+        revoke_admin: 'Trekk tilbake administrering'
         grant_admin: 'Innvilg admin'
         grant_admin_confirm: "Vi har sendt deg en e-post for å bekrefte den nye administratoren. Følg instruksjonene i meldingen."
-        revoke_moderation: 'Tilbakedra moderering'
+        revoke_moderation: 'Trekk tilbake moderering'
         grant_moderation: 'Innvilg moderering'
-        unsuspend: 'Gjeninnsett'
-        suspend: 'Bannlyst'
+        unsuspend: 'Opphev utestenging'
+        suspend: 'Utestengt'
+        show_flags_received: "Vis mottatte rapporteringer"
+        flags_received_by: "Flagg mottatt av %{username}"
+        flags_received_none: "Denne brukeren har ikke mottatt noen rapporteringer."
         reputation: Rykte
         permissions: Tillatelser
         activity: Aktivitet
         like_count: Likes tildelt / mottatt
         last_100_days: 'de siste 100 dagene'
-        private_topics_count: Private emner
+        private_topics_count: Private Emner
         posts_read_count: Innlegg lest
         post_count: Innlegg skrevet
-        topics_entered: Emner vist
+        second_factor_enabled: totrinnsverifisering aktivert
+        topics_entered: Emner Lest
         flags_given_count: Rapporteringer tildelt
         flags_received_count: Rapporteringer mottatt
         warnings_received_count: Advarsler mottatt
@@ -3161,17 +3363,18 @@ nb_NO:
         delete_forbidden_because_staff: "Administratorer og moderatorer kan ikke slettes."
         delete_posts_forbidden_because_staff: "Kan ikke slette alle innlegg av administratorer og moderatorer."
         delete_forbidden:
-          one: "Brukere kan ikke slettes om de har innlegg. Slett alle brukerens innlegg før bruker kan slettes. (Innlegg eldre enn %{count} dag kan ikke slettes.)"
-          other: "Brukere kan ikke slettes om de har innlegg. Slett alle brukerens innlegg før bruker kan slettes. (Innlegg eldre enn %{count} dager kan ikke slettes.)"
+          one: Brukere kan ikke slettes om de har innlegg. Slett alle brukerens innlegg før bruker kan slettes. (Innlegg eldre enn %{count} dag kan ikke slettes.)
+          other: Brukere kan ikke slettes om de har innlegg. Slett alle innlegg før du forsøker å slette en bruker. (Innlegg eldre enn %{count} dager kan ikke slettes.)
         cant_delete_all_posts:
-          one: "Kan ikke slette alle innlegg. Noen innlegg er eldre enn %{count} dag gammel. (Innstillingen delete_user_max_post_age.)"
-          other: "Kan ikke slette alle innlegg. Noen innlegg er eldre enn %{count} dager gamle. (Innstillingen delete_user_max_post_age.)"
+          one: Kan ikke slette alle innlegg. Noen innlegg er eldre enn %{count} dag gammel. (Innstillingen delete_user_max_post_age.)
+          other: Kan ikke slette alle innlegg. Noen innlegg er eldre enn %{count} dager gamle. (Innstillingen delete_user_max_post_age.)
         cant_delete_all_too_many_posts:
-          one: "Kan ikke slette alle innlegg fordi brukeren har mer enn 1 innlegg. (delete_all_posts_max)"
-          other: "Kan ikke slette alle innlegg fordi brukeren har mer enn %{count} innlegg. (delete_all_posts_max)"
+          one: Kan ikke slette alle innlegg fordi brukeren har mer enn 1 innlegg. (delete_all_posts_max)
+          other: Kan ikke slette alle innlegg fordi brukeren har mer enn %{count} innlegg. (delete_all_posts_max)
         delete_confirm: "Er du HELT SIKKER på at du vil slette denne brukeren? Denne handlingen er permanent!"
         delete_and_block: "Slett og <b>blokker</b> denne e-post- og IP-adressen"
         delete_dont_block: "Bare slett"
+        deleting_user: "Sletter bruker..."
         deleted: "Brukeren ble slettet."
         delete_failed: "Det oppstod en feil ved slettingen av den brukeren. Sørg for at alle av brukerens innlegg er slettet før du prøver å slette brukeren."
         send_activation_email: "Send e-post for aktivering"
@@ -3183,23 +3386,23 @@ nb_NO:
         deactivate_failed: "Det oppstod et problem ved deaktiveringen av den brukeren."
         unsilence_failed: 'Feil ved fjerning av forstumming av bruker.'
         silence_failed: 'Feil ved forstumming av bruker.'
-        silence_confirm: 'Er du sikker på at du vil forstumme denne brukeren? Vedkommende vil ikke kunne opprette nye emner eller innlegg.'
-        silence_accept: 'Ja, forstum denne brukeren'
+        silence_confirm: 'Er du sikker på at du vil dempe denne brukeren? Vedkommende vil ikke kunne opprette nye emner eller innlegg.'
+        silence_accept: 'Ja, dem denne brukeren'
         bounce_score: "Antall tilbakesendinger"
         reset_bounce_score:
           label: "Tilbakestill"
           title: "Sett antall tilbakesendinger tilbake til 0"
-        visit_profile: "Besøk <a href='%{url}'>denne brukerinnstillingssiden</a> for å redigere profilen deres"
-        deactivate_explanation: "En deaktivert bruker må re-validere sin e-post."
-        suspended_explanation: "En bannlyst bruker kan ikke logge inn."
-        silence_explanation: "En forstummet bruker kan ikke poste eller starte emner."
-        staged_explanation: "En arrangert bruker kan bare skrive innlegg via e-post i gitte emner."
+        visit_profile: "Besøk <a href='%{url}'>denne brukerinnstillingssiden</a> for å redigere vedkommendes profil"
+        deactivate_explanation: "En deaktivert bruker må bekrefte e-postadressen sin på nytt."
+        suspended_explanation: "En utestengt bruker kan ikke logge inn."
+        silence_explanation: "En dempet bruker kan ikke skrive innlegg eller opprette emner."
+        staged_explanation: "En arrangert bruker kan bare skrive innlegg via e-post i bestemte emner."
         bounce_score_explanation:
           none: "Ingen tilbakesendinger ble mottatt nylig fra den e-posten."
           some: "Noen tilbakesendinger ble mottatt nylig fra den e-posten."
           threshold_reached: "Mottok for mange tilbakesendinger fra den e-posten."
-        trust_level_change_failed: "Det oppsto et problem ved endring av brukerens tillitsnivå."
-        suspend_modal_title: "Bannlys bruker"
+        trust_level_change_failed: "Det oppstod et problem ved endring av brukerens tillitsnivå."
+        suspend_modal_title: "Steng ute bruker"
         trust_level_2_users: "Brukere på tillitsnivå 2"
         trust_level_3_requirements: "Krav til tillitsnivå 3"
         trust_level_locked_tip: "tillitsnivå er låst, systemet vil ikke forfremme eller degradere bruker"
@@ -3209,15 +3412,15 @@ nb_NO:
         tl3_requirements:
           title: "Krav til tillitsnivå 3"
           table_title:
-            one: "Den siste dagen:"
-            other: "De siste %{count} dagene:"
+            one: 'Den siste dagen:'
+            other: 'De siste %{count} dagene:'
           value_heading: "Verdi"
           requirement_heading: "Krav"
           visits: "Besøk"
           days: "dager"
-          topics_replied_to: "Emner besvart"
-          topics_viewed: "Emner vist"
-          topics_viewed_all_time: "Emner vist (totalt)"
+          topics_replied_to: "Emner Besvart"
+          topics_viewed: "Emner Lest"
+          topics_viewed_all_time: "Emner Lest (totalt)"
           posts_read: "Innlegg lest"
           posts_read_all_time: "Innlegg lest (totalt)"
           flagged_posts: "Rapporterte innlegg"
@@ -3226,6 +3429,8 @@ nb_NO:
           likes_received: "Likes mottatt"
           likes_received_days: "Likes mottatt: Unike dager"
           likes_received_users: "Likes mottatt: Unike brukere"
+          suspended: "Suspenderte (gjennom tidene)"
+          silenced: "Dempet (gjennom tidene)"
           qualifies: "Kvalifiserer til tillitsnivå 3."
           does_not_qualify: "Kvalifiserer ikke til tillitsnivå 3."
           will_be_promoted: "Vil snart forfremmes."
@@ -3284,12 +3489,14 @@ nb_NO:
         go_back: "Tilbake til søk"
         recommended: "Skreddersøm av følgende tekst for å kle dine behov anbefales:"
         show_overriden: 'Bare vis overstyrte'
-      site_settings:
-        show_overriden: 'Bare vis overstyrte'
-        title: 'Innstillinger'
+      settings:
+        show_overriden: 'Vis kun overstyrte'
         reset: 'tilbakestill'
-        none: 'intet'
+        none: 'ingen'
+      site_settings:
+        title: 'Innstillinger'
         no_results: "Ingen treff funnet."
+        more_than_30_results: "Det er over 30 resultater. Vennligst skjerp søket eller velg en kategori."
         clear_filter: "Tøm"
         add_url: "legg til URL"
         add_host: "legg til vert"
@@ -3298,7 +3505,7 @@ nb_NO:
           required: 'Påkrevd'
           basic: 'Grunnleggende oppsett'
           users: 'Brukere'
-          posting: 'Innlegg'
+          posting: 'Publisering'
           email: 'E-post'
           files: 'Filer'
           trust: 'Tillitsnivå'
@@ -3338,16 +3545,16 @@ nb_NO:
         reason_help: (En lenke til et innlegg eller emne)
         save: Lagre
         delete: Slett
-        delete_confirm: Er du sikker på at du vil slette dette merket?
-        revoke: Tilbakedra
+        delete_confirm: "Er du sikker på at du vil slette dette merket?"
+        revoke: Trekk tilbake
         reason: Grunn
         expand: Ekspander
-        revoke_confirm: Er du sikker på at du vil tilbakedra dette merket?
+        revoke_confirm: "Er du sikker på at du vil trekke tilbake dette merket?"
         edit_badges: Rediger merker
         grant_badge: Tildel merke
         granted_badges: Tildelte merker
         grant: Tildel
-        no_user_badges: "%{name} har ikke blitt tildelt noen merker."
+        no_user_badges: "%{name} er ikke blitt tildelt noen merker."
         no_badges: Det er ingen merker som kan bli tildelt.
         none_selected: "Velg et merke for å komme i gang"
         allow_title: Tillat merke å bli benyttet som en tittel
@@ -3356,7 +3563,8 @@ nb_NO:
         enabled: Aktiver merke
         icon: Ikon
         image: Bilde
-        icon_help: "Bruk enten en Font Awesome class eller URL for et bilde"
+        icon_help: "Bruk en Font Awesome klasse"
+        image_help: "Oppgi URL for bildet (overstyrer ikonfeltet hvis begge er satt)"
         query: Spørring for merke (SQL)
         target_posts: Spørring har innlegg som mål
         auto_revoke: Kjør tilbakedragningsspørring daglig
@@ -3373,21 +3581,21 @@ nb_NO:
           link_text: "Forhåndsvis tildelte merker"
           plan_text: "Forhåndsvis med plan for spørring"
           modal_title: "Forhåndsvisning av spørring for merke"
-          sql_error_header: "Det oppsto en feil med spørringen."
+          sql_error_header: "Det oppstod en feil med spørringen."
           error_help: "Se følgende lenker for hjelp til spørringer for merker."
           bad_count_warning:
             header: "ADVARSEL!"
-            text: "Det er manglende grant samples. Dette skjer når merke-søket returnerer bruker-IDer eller innleggs-ID-er som ikke eksisterer. Dette kan føre til uventede resultater senere - dobbeltsjekk søket ditt."
+            text: "Det finnes manglende grant samples. Dette skjer når merke-søket returnerer bruker-IDer eller innleggs-ID-er som ikke eksisterer. Dette kan føre til uventede resultater senere - dobbeltsjekk søket ditt."
           no_grant_count: "Ingen merker å tildele."
           grant_count:
-            one: "<b>Ett</b> merke å tildele."
-            other: "<b>%{count}</b> merker å tildele."
+            one: <b>Ett</b> merke å tildele.
+            other: <b>%{count}</b> merker å tildele.
           sample: "Eksempel:"
           grant:
-            with: <span class="username">%{username}</span>
-            with_post: <span class="username">%{username}</span> for innlegg i %{link}
-            with_post_time: <span class="username">%{username}</span> for innlegg i %{link} - <span class="time">%{time}</span>
-            with_time: <span class="username">%{username}</span> - <span class="time">%{time}</span>
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span> for innlegg i %{link}"
+            with_post_time: "<span class=\"username\">%{username}</span> for innlegg i %{link} - <span class=\"time\">%{time}</span>"
+            with_time: "<span class=\"username\">%{username}</span> - <span class=\"time\">%{time}</span>"
       emoji:
         title: "Emoji"
         help: "Legg til en ny emoji som vil være tilgjengelig for alle. (PROFFTIPS: Dra og slipp flere filer samtidig)"
@@ -3398,7 +3606,7 @@ nb_NO:
       embedding:
         get_started: "Hvis du vil bygge inn Discourse på en annen nettside, begynn med å legge til dens vert."
         confirm_delete: "Er du sikker på at du vil slette den verten?"
-        sample: "Bruk følgende HTML-kode på siden din for å bygge inn Discourse-emner. Erstatt <b>ERSTATT_MEG</b> med kanonisk nettadresse fra siden du bygger den inn i."
+        sample: "Bruk følgende HTML-kode på siden din for å bygge inn Discourse-emner. Erstatt <b>ERSTATT_MEG</b> med riktig nettadresse til siden du bygger den inn i."
         title: "Innbygging"
         host: "Tillatte verter"
         class_name: "Klassenavn"
@@ -3408,11 +3616,11 @@ nb_NO:
         add_host: "Legg til vert"
         settings: "Innbyggingsinnstillinger"
         feed_settings: "Informasjonskanals-innstillinger"
-        feed_description: "Å tilby en RSS/ATOM-informasjonskanal for din side kan forbedre Discourse sin evne til å importere ditt innhold."
+        feed_description: "Å tilby en RSS/ATOM-strøm for nettstedet ditt kan forbedre Discourses evne til å importere innholdet ditt."
         crawling_settings: "Innstillinger for søkeroboter"
-        crawling_description: "Når Discourse oppretter emner for dine innlegg, og ingen RSS/ATOM-informasjonskanal finnes, vil den prøve å tolke innholdet ditt fra din HTML-kode. Noen ganger kan det være utfordrende å hente ut innhold, så muligheten til å oppgi CSS-regler er der for å gjøre uthentingen enklere."
-        embed_by_username: "Brukernavn for emneopprettelse"
-        embed_post_limit: "Maksimalt antall innlegg som skal bygges inn"
+        crawling_description: "Dersom Discourse oppretter emner for innleggene dine og ingen RSS/ATOM-informasjonskanal finnes, vil det prøve å tolke innholdet ditt ut fra HTML-koden din. Noen ganger kan det være utfordrende å hente ut innhold, så muligheten til å oppgi CSS-regler er der for å gjøre uthentingen enklere."
+        embed_by_username: "Brukernavn for opprettelse av emne"
+        embed_post_limit: "Maksimalt antall innlegg å bygge inn"
         embed_username_key_from_feed: "Nøkkel for å hente Discourse-brukernavn fra informasjonskanal"
         embed_title_scrubber: "Regulære uttrykk brukt til å finne og korrigere feil i titler"
         embed_truncate: "Forkort de innebygde innleggene"
@@ -3433,7 +3641,7 @@ nb_NO:
         category_id: "Kategori-ID"
         category_title: "Kategori"
         external_url: "Ekstern URL"
-        delete_confirm: Er du sikker du vil slette denne permalenken?
+        delete_confirm: "Er du sikker på at du vil slette denne permalenken?"
         form:
           label: "Ny:"
           add: "Legg til"
@@ -3448,12 +3656,12 @@ nb_NO:
       uploading: "Laster opp…"
       quit: "Kanskje senere"
       staff_count:
-        one: "Din gemenskap har ett stabsmedlem (deg)."
-        other: "Din gemenskap har %{count} stab, inkludert deg selv."
+        one: Din gemenskap har ett stabsmedlem (deg).
+        other: ' Ditt fellesskap har %{count} stab, inkludert deg selv.'
       invites:
         add_user: "legg til"
         none_added: "Du har ikke invitert noen til staben. Er du sikker på at du vil fortsette?"
         roles:
           admin: "Administrator"
           moderator: "Moderator"
-          regular: "Regelmessig bruker"
+          regular: "Aktivt medlem"
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index c5bfc95ea30..22e43611a4e 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -43,64 +43,65 @@ nl:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: "< 1s"
-          other: "< %{count}s"
+          one: < 1s
+          other: < %{count}s
         x_seconds:
-          one: "1s"
-          other: "%{count}s"
+          one: 1s
+          other: '%{count}s'
         x_minutes:
-          one: "1m"
-          other: "%{count}m"
+          one: 1m
+          other: '%{count}m'
         about_x_hours:
-          one: "1u"
-          other: "%{count}u"
+          one: 1u
+          other: '%{count}u'
         x_days:
-          one: "1d"
-          other: "%{count}d"
+          one: 1d
+          other: '%{count}d'
         about_x_years:
-          one: "1j"
-          other: "%{count}j"
+          one: 1j
+          other: '%{count}j'
         over_x_years:
-          one: "> 1j"
-          other: "> %{count}j"
+          one: '> 1j'
+          other: '> %{count}j'
         almost_x_years:
-          one: "1j"
-          other: "%{count}j"
+          one: 1j
+          other: '%{count}j'
         date_month: "D MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: "1 min"
-          other: "%{count} min"
+          one: 1 min
+          other: '%{count} min'
         x_hours:
-          one: "1 uur"
-          other: "%{count} uur"
+          one: 1 uur
+          other: '%{count} uur'
         x_days:
-          one: "1 dag"
-          other: "%{count} dagen"
+          one: 1 dag
+          other: '%{count} dagen'
         date_year: "D MMM 'YY"
       medium_with_ago:
         x_minutes:
-          one: "1 min geleden"
-          other: "%{count} min geleden"
+          one: 1 min geleden
+          other: '%{count} min geleden'
         x_hours:
-          one: "1 uur geleden"
-          other: "%{count} uur geleden"
+          one: 1 uur geleden
+          other: '%{count} uur geleden'
         x_days:
-          one: "1 dag geleden"
-          other: "%{count} dagen geleden"
+          one: 1 dag geleden
+          other: '%{count} dagen geleden'
       later:
         x_days:
-          one: "1 dag later"
-          other: "%{count} dagen later"
+          one: 1 dag later
+          other: '%{count} dagen later'
         x_months:
-          one: "1 maand later"
-          other: "%{count} maanden later"
+          one: 1 maand later
+          other: '%{count} maanden later'
         x_years:
-          one: "1 jaar later"
-          other: "%{count} jaar later"
+          one: 1 jaar later
+          other: '%{count} jaar later'
       previous_month: 'Vorige maand'
       next_month: 'Volgende maand'
+      placeholder: datum
     share:
       topic: 'een koppeling naar dit topic delen'
       post: 'bericht #%{postNumber}'
@@ -111,7 +112,6 @@ nl:
       email: 'deze koppeling delen via e-mail'
     action_codes:
       public_topic: "heeft dit topic openbaar gemaakt op %{when}"
-      private_topic: "heeft dit topic als privé gemarkeerd op %{when}"
       split_topic: "heeft dit topic gesplitst op %{when}"
       invited_user: "heeft %{who} uitgenodigd op %{when}"
       invited_group: "heeft %{who} uitgenodigd op %{when}"
@@ -141,8 +141,6 @@ nl:
     topic_admin_menu: "beheeracties voor topic"
     wizard_required: "Welkom bij je nieuwe Discourse! Laten we beginnen met <a href='%{url}' data-auto-route='true'>de configuratiewizard</a> ✨"
     emails_are_disabled: "Alle uitgaande e-mail is uitgeschakeld door een beheerder. Er zal geen enkele e-mailmelding worden verstuurd."
-    bootstrap_mode_enabled: "Om het lanceren van je website makkelijker te maken, bevind je je in bootstrapmodus. Aan alle nieuwe gebruikers wordt vertrouwensniveau 1 toegekend en dagelijkse e-mailsamenvattingen zijn voor hen ingeschakeld. Dit wordt automatisch uitgeschakeld wanneer het totale gebruikersaantal %{min_users} gebruikers overschrijdt."
-    bootstrap_mode_disabled: "De bootstrapmodus zal in de komende 24 uur worden uitgeschakeld."
     themes:
       default_description: "Standaard"
     s3:
@@ -166,6 +164,7 @@ nl:
     not_implemented: "Deze functie is helaas nog niet beschikbaar, sorry!"
     no_value: "Nee"
     yes_value: "Ja"
+    submit: "Verstuur"
     generic_error: "Sorry, er is iets fout gegaan."
     generic_error_with_reason: "Er is iets fout gegaan: %{error}"
     sign_up: "Registreren"
@@ -178,8 +177,8 @@ nl:
     show_help: "opties"
     links: "Koppelingen"
     links_lowercase:
-      one: "koppeling"
-      other: "koppelingen"
+      one: koppeling
+      other: koppelingen
     faq: "FAQ"
     guidelines: "Richtlijnen"
     privacy_policy: "Privacybeleid"
@@ -203,8 +202,8 @@ nl:
     max_of_count: "maximaal {{count}}"
     alternation: "of"
     character_count:
-      one: "{{count}} teken"
-      other: "{{count}} tekens"
+      one: '{{count}} teken'
+      other: '{{count}} tekens'
     suggested_topics:
       title: "Aanbevolen topics"
       pm_title: "Voorgestelde berichten"
@@ -216,8 +215,6 @@ nl:
       our_moderators: "Onze moderators"
       stat:
         all_time: "Sinds het begin"
-        last_7_days: "Afgelopen 7 dagen"
-        last_30_days: "Afgelopen 30 dagen"
       like_count: "Likes"
       topic_count: "Topics"
       post_count: "Berichten"
@@ -238,16 +235,6 @@ nl:
       last_read: "dit is het laatste bericht dat je hebt gelezen; klik om er een bladwijzer voor te maken"
       remove: "Bladwijzer verwijderen"
       confirm_clear: "Weet je zeker dat je alle bladwijzers van dit topic wilt verwijderen?"
-    topic_count_latest:
-      one: "{{count}} nieuwe of aangepaste discussie."
-      other: "{{count}} nieuwe of bijgewerkte topics."
-    topic_count_unread:
-      one: "{{count}} ongelezen topic."
-      other: "{{count}} ongelezen topics."
-    topic_count_new:
-      one: "{{count}} nieuw topic."
-      other: "{{count}} nieuwe topics."
-    click_to_show: "Klik om te bekijken."
     preview: "voorbeeld"
     cancel: "annuleer"
     save: "Wijzigingen opslaan"
@@ -259,6 +246,7 @@ nl:
     uploaded: "Geupload!"
     enable: "Inschakelen"
     disable: "Uitschakelen"
+    continue: "Doorgaan"
     undo: "Ongedaan maken"
     revert: "Terugzetten"
     failed: "Mislukt"
@@ -283,16 +271,16 @@ nl:
       cancel: "Annuleren"
       view_pending: "wachtende berichten bekijken"
       has_pending_posts:
-        one: "Dit topic bevat <b>1</b> bericht dat op goedkeuring wacht"
-        other: "Dit topic bevat <b>{{count}}</b> berichten die op goedkeuring wachten"
+        one: Dit topic bevat <b>1</b> bericht dat op goedkeuring wacht
+        other: Dit topic bevat <b>{{count}}</b> berichten die op goedkeuring wachten
       confirm: "Wijzigingen opslaan"
       delete_prompt: "Weet u zeker dat u <b>%{username}</b> wilt verwijderen? Dit verwijdert alle berichten en blokkeert het e-mailadres en IP-nummer van de gebruiker."
       approval:
         title: "Bericht heeft goedkeuring nodig"
         description: "We hebben uw nieuwe bericht ontvangen, maar dit moet eerst door een moderator worden goedgekeurd voordat het zichtbaar wordt. Heb geduld."
         pending_posts:
-          one: "U hebt <strong>1</strong> wachtend bericht."
-          other: "U hebt <strong>{{count}}</strong> wachtende berichten."
+          one: U hebt <strong>1</strong> wachtend bericht.
+          other: U hebt <strong>{{count}}</strong> wachtende berichten.
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> heeft <a href='{{topicUrl}}'>het topic</a> geplaatst"
@@ -326,8 +314,8 @@ nl:
       posts_read: "Gelezen"
       posts_read_long: "Berichten gelezen"
       total_rows:
-        one: "1 gebruiker"
-        other: "%{count} gebruikers"
+        one: 1 gebruiker
+        other: '%{count} gebruikers'
     group_histories:
       actions:
         change_group_setting: "Groepsinstelling wijzigen"
@@ -336,22 +324,15 @@ nl:
         make_user_group_owner: "Eigenaar maken"
         remove_user_as_group_owner: "Eigenaar intrekken"
     groups:
-      logs:
-        title: "Logboeken"
-        when: "Wanneer"
-        action: "Actie"
-        acting_user: "Uitvoerende gebruiker"
-        target_user: "Doelgebruiker"
-        subject: "Onderwerp"
-        details: "Details"
-        from: "Van"
-        to: "Tot"
-      edit:
-        title: 'Groep bewerken'
+      manage:
+        name: 'Naam'
         full_name: 'Volledige naam'
         add_members: "Leden toevoegen"
-        delete_member_confirm: "'%{username}' uit de groep '%{group}' verwijderen?"
-      name_placeholder: "Groepsnaam, geen spaties, hetzelfde als gebruikersnaamregel"
+        profile:
+          title: Profiel
+        logs:
+          from: "Van"
+          to: "Naar"
       public_admission: "Gebruikers toestaan om vrij aan de groep deel te nemen (Groep moet hiervoor zichtbaar zijn)"
       public_exit: "Gebruikers toestaan om vrij de groep te verlaten"
       empty:
@@ -362,13 +343,8 @@ nl:
         topics: "Er zijn geen topics van leden van deze groep."
         logs: "Er zijn geen logs voor deze groep."
       add: "Toevoegen"
-      join: "Deelnemen aan groep"
-      leave: "Groep verlaten"
-      request: "Verzoek voor deelname aan groep"
+      leave: "Verlaat"
       message: "Bericht"
-      automatic_group: Automatische groep
-      closed_group: Besloten groep
-      is_group_user: "U bent een lid van deze groep"
       allow_membership_requests: "Gebruikers toestaan om lidmaatschapsverzoeken naar groepseigenaren te sturen"
       membership_request_template: "Aangepaste template om aan gebruikers te laten zien bij het sturen van een lidmaatschap verzoek"
       membership_request:
@@ -377,29 +353,32 @@ nl:
         reason: "Laat de groepbeheerders weten waarom je in deze groep hoort"
       membership: "Lidmaatschap"
       name: "Naam"
-      user_count: "Aantal leden"
+      user_count: "Gebruikers"
       bio: "Over groep"
-      selector_placeholder: "Leden toevoegen"
       owner: "eigenaar"
       index:
         title: "Groepen"
         empty: "Er zijn geen zichtbare groepen."
+        automatic: "Automatisch"
+        closed: "Gesloten"
+        public: "Openbaar"
+        private: "Privaat"
+        public_groups: "Publieke groepen"
+        my_groups: "Mijn groepen"
+        is_group_user: "Lid"
+        is_group_owner: "Eigenaar"
       title:
-        one: "Groep"
-        other: "Groepen"
+        one: Groep
+        other: Groepen
       activity: "Activiteit"
-      members: "Leden"
+      members:
+        filter_placeholder_admin: "gebruikersnaam of e-mail, e-mailadres"
+        filter_placeholder: "gebruikersnaam"
       topics: "Topics"
       posts: "Berichten"
       mentions: "Vermeldingen"
       messages: "Berichten"
       notification_level: "Standaard meldingsniveau voor groepsberichten"
-      visibility_levels:
-        title: "Voor wie is deze groep zichtbaar?"
-        public: "Iedereen"
-        members: "Groepseigenaars, -beheerders en -leden"
-        staff: "Groepseigenaars en -personeel"
-        owners: "Groepeigenaars en -beheerders"
       alias_levels:
         mentionable: "Wie kan deze groep taggen?"
         messageable: "Wie kan deze groep een bericht sturen?"
@@ -408,9 +387,6 @@ nl:
         mods_and_admins: "Alleen moderators en beheerders"
         members_mods_and_admins: "Alleen groepsleden, moderators en beheerders"
         everyone: "Iedereen"
-      trust_levels:
-        title: "Vertrouwensniveau dat automatisch aan nieuwe gebruikers wordt toegekend:"
-        none: "Geen"
       notifications:
         watching:
           title: "In de gaten houden"
@@ -435,23 +411,21 @@ nl:
       flair_color_placeholder: "(Optioneel) Hex-kleurwaarde"
       flair_preview_icon: "Pictogramvoorbeeld"
       flair_preview_image: "Afbeeldingsvoorbeeld"
-      flair_note: "Opmerking: flair is alleen zichtbaar voor de primaire groep van een gebruiker."
     user_action_groups:
-      '1': "Gegeven likes"
-      '2': "Ontvangen likes"
-      '3': "Favorieten"
-      '4': "Topics"
-      '5': "Antwoorden"
-      '6': "Reacties"
-      '7': "Vermeldingen"
-      '9': "Citaten"
-      '11': "Bewerkingen"
-      '12': "Verzonden items"
-      '13': "Inbox"
-      '14': "In wachtrij"
+      "1": "Gegeven likes"
+      "2": "Ontvangen likes"
+      "3": "Favorieten"
+      "4": "Topics"
+      "5": "Antwoorden"
+      "6": "Reacties"
+      "7": "Vermeldingen"
+      "9": "Citaten"
+      "11": "Bewerkingen"
+      "12": "Verzonden items"
+      "13": "Inbox"
+      "14": "In wachtrij"
     categories:
       all: "Alle categorieën"
-      all_subcategories: "alle"
       no_subcategory: "geen"
       category: "Categorie"
       category_list: "Categorielijst weergeven"
@@ -470,11 +444,11 @@ nl:
       toggle_ordering: "sorteermethode omschakelen"
       subcategories: "Subcategorieën"
       topic_sentence:
-        one: "1 topic"
-        other: "%{count} topics"
+        one: 1 topic
+        other: '%{count} topics'
       topic_stat_sentence:
-        one: "%{count} nieuw topic in de afgelopen %{unit}."
-        other: "%{count} nieuwe topics in de afgelopen %{unit}."
+        one: '%{count} nieuw topic in de afgelopen %{unit}.'
+        other: '%{count} nieuwe topics in de afgelopen %{unit}.'
     ip_lookup:
       title: IP-adres zoeken
       hostname: Hostnaam
@@ -509,6 +483,7 @@ nl:
       activity_stream: "Activiteit"
       preferences: "Voorkeuren"
       expand_profile: "Uitvouwen"
+      collapse_profile: "Samenvouwen"
       bookmarks: "Favorieten"
       bio: "Over mij"
       invited_by: "Uitgenodigd door"
@@ -516,7 +491,6 @@ nl:
       notifications: "Meldingen"
       statistics: "Statistieken "
       desktop_notifications:
-        label: "Bureaubladmeldingen"
         not_supported: "Meldingen worden in deze browser niet ondersteund. Sorry."
         perm_default: "Meldingen inschakelen"
         perm_denied_btn: "Toestemming geweigerd"
@@ -524,6 +498,7 @@ nl:
         disable: "Meldingen uitschakelen"
         enable: "Meldingen inschakelen"
         each_browser_note: "Opmerking: u moet deze instelling in elke browser die u gebruikt wijzigen."
+      dismiss: 'Negeren'
       dismiss_notifications: "Alle verwijderen"
       dismiss_notifications_tooltip: "Alle ongelezen meldingen markeren als gelezen"
       first_notification: "Uw eerste melding! Selecteer deze om te beginnen."
@@ -573,7 +548,6 @@ nl:
       delete_account: "Mijn account verwijderen"
       delete_account_confirm: "Weet u zeker dat u uw account definitief wilt verwijderen? Deze actie kan niet ongedaan worden gemaakt!"
       deleted_yourself: "Uw account is met succes verwijderd."
-      delete_yourself_not_allowed: "U kunt uw account nu niet verwijderen. Neem contact op met een beheerder om uw account te laten verwijderen."
       unread_message_count: "Berichten"
       admin_delete: "Verwijderen"
       users: "Gebruikers"
@@ -622,6 +596,8 @@ nl:
         set_password: "Wachtwoord instellen"
         choose_new: "Kies een nieuw wachtwoord"
         choose: "Kies een wachtwoord"
+      second_factor:
+        label: "Code"
       change_about:
         title: "Over mij wijzigen"
         error: "Er is een fout opgetreden bij het wijzigen van deze waarde."
@@ -662,8 +638,8 @@ nl:
         authenticated: "Uw e-mailadres is geauthenticeerd door {{provider}}"
         frequency_immediately: "Als u de inhoud in kwestie nog niet hebt gelezen, sturen we u direct een e-mail."
         frequency:
-          one: "We sturen alleen een e-mail als we u de laatste minuut niet hebben gezien."
-          other: "We sturen alleen een e-mail als we u de laatste {{count}} minuten niet hebben gezien."
+          one: We sturen alleen een e-mail als we u de laatste minuut niet hebben gezien.
+          other: We sturen alleen een e-mail als we u de laatste {{count}} minuten niet hebben gezien.
       name:
         title: "Naam"
         instructions: "uw volledige naam (optioneel)"
@@ -694,8 +670,6 @@ nl:
       created: "Lid sinds"
       log_out: "Afmelden"
       location: "Locatie"
-      card_badge:
-        title: "Badge van gebruikersprofiel"
       website: "Website"
       email_settings: "E-mail"
       like_notification_frequency:
@@ -749,10 +723,9 @@ nl:
         title: "Uitnodigingen"
         user: "Uitgenodigde gebruiker"
         sent: "Verzonden"
-        none: "Er zijn geen uitstaande uitnodigingen om weer te geven."
         truncated:
-          one: "De eerste uitnodiging wordt getoond."
-          other: "De eerste {{count}} uitnodigingen worden getoond."
+          one: De eerste uitnodiging wordt getoond.
+          other: De eerste {{count}} uitnodigingen worden getoond.
         redeemed: "Verzilverde uitnodigingen"
         redeemed_tab: "Verzilverd"
         redeemed_tab_with_count: "Verzilverd ({{count}})"
@@ -798,26 +771,26 @@ nl:
         stats: "Statistieken "
         time_read: "leestijd"
         topic_count:
-          one: "Onderwerp gemaakt"
-          other: "topics gemaakt"
+          one: Onderwerp gemaakt
+          other: topics gemaakt
         post_count:
-          one: "bericht gemaakt"
-          other: "berichten gemaakt"
+          one: bericht gemaakt
+          other: berichten gemaakt
         likes_given:
-          one: "gegeven"
-          other: "gegeven"
+          one: gegeven
+          other: gegeven
         likes_received:
-          one: "ontvangen"
-          other: "ontvangen"
+          one: ontvangen
+          other: ontvangen
         days_visited:
-          one: "dag bezocht"
-          other: "dagen bezocht"
+          one: dag bezocht
+          other: dagen bezocht
         posts_read:
-          one: "bericht gelezen"
-          other: "berichten gelezen"
+          one: bericht gelezen
+          other: berichten gelezen
         bookmark_count:
-          one: "favoriet"
-          other: "bladwijzers"
+          one: favoriet
+          other: bladwijzers
         top_replies: "Topantwoorden"
         no_replies: "Nog geen antwoorden."
         more_replies: "Meer antwoorden"
@@ -885,8 +858,8 @@ nl:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> heeft de limiet voor de website-instelling van %{siteSettingRate} bereikt."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> heeft de limiet voor de website-instelling van %{siteSettingRate} overschreden."
       rate:
-        one: "1 fout/%{duration}"
-        other: "%{count} fouten/%{duration}"
+        one: 1 fout/%{duration}
+        other: '%{count} fouten/%{duration}'
     learn_more: "meer info..."
     all_time: 'totaal'
     all_time_desc: 'aantal aangemaakte topics'
@@ -900,6 +873,7 @@ nl:
     first_post: Eerste bericht
     mute: Negeren
     unmute: Tonen
+    time_read: Gelezen
     last_reply_lowercase: laatste antwoord
     replies_lowercase:
       one: antwoord
@@ -1065,8 +1039,8 @@ nl:
       similar_topics: "Uw topic lijkt op..."
       drafts_offline: "concepten offline"
       group_mentioned:
-        one: "Door {{group}} te vermelden, gaat u <a href='{{group_link}}'>1 persoon</a> op de hoogte brengen – weet u dit zeker?"
-        other: "Door {{group}} te vermelden, gaat u <a href='{{group_link}}'>{{count}} personen</a> op de hoogte brengen – weet u dit zeker?"
+        one: Door {{group}} te vermelden, gaat u <a href='{{group_link}}'>1 persoon</a> op de hoogte brengen – weet u dit zeker?
+        other: Door {{group}} te vermelden, gaat u <a href='{{group_link}}'>{{count}} personen</a> op de hoogte brengen – weet u dit zeker?
       cannot_see_mention:
         category: "U hebt {{username}} genoemd, maar de gebruiker ontvangt geen melding, omdat hij of zij geen toegang heeft tot deze categorie. U dient de gebruiker toe te voegen aan een groep die toegang heeft tot deze categorie."
         private: "U hebt {{username}} genoemd, maar de gebruiker ontvangt geen melding, omdat hij of zij dit persoonlijke bericht niet kan zien. U dient de gebruiker voor dit PB uit te nodigen."
@@ -1146,8 +1120,8 @@ nl:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} en 1 anderen</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} en {{count}} anderen</span> {{description}}"
+        one: <span>{{username}}, {{username2}} en 1 anderen</span> {{description}}
+        other: <span>{{username}}, {{username2}} en {{count}} anderen</span> {{description}}
       private_message: "<span>{{username}}</span> {{description}}"
       invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
       invited_to_topic: "<span>{{username}}</span> {{description}}"
@@ -1158,30 +1132,14 @@ nl:
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>Nieuw Topic</span> {{description}}"
       group_message_summary:
-        one: "{{count}} bericht in je Postvak IN voor {{group_name}}"
-        other: "{{count}} berichten in je Postvak IN voor {{group_name}}"
-      alt:
-        mentioned: "Genoemd door"
-        quoted: "Geciteerd door"
-        replied: "Beantwoord"
-        posted: "Geplaatst door"
-        edited: "Uw bericht bewerkt door"
-        liked: "Heeft uw bericht geliket"
-        private_message: "Privébericht van"
-        invited_to_private_message: "Uitgenodigd voor een privébericht van"
-        invited_to_topic: "Uitgenodigd voor een topic door"
-        invitee_accepted: "Uitnodiging geaccepteerd door"
-        moved_post: "Uw bericht is verplaatst door"
-        linked: "Koppeling naar uw bericht"
-        granted_badge: "Badge toegekend"
-        group_message_summary: "Berichten in groepspostvak"
+        one: '{{count}} bericht in je Postvak IN voor {{group_name}}'
+        other: '{{count}} berichten in je Postvak IN voor {{group_name}}'
       popup:
         mentioned: '{{username}} heeft u genoemd in ''{{topic}}'' - {{site_title}}'
         group_mentioned: '{{username}} heeft u genoemd in ''{{topic}}'' - {{site_title}}'
         quoted: '{{username}} heeft u geciteerd in ''{{topic}}'' - {{site_title}}'
         replied: '{{username}} heeft op u geantwoord in ''{{topic}}'' - {{site_title}}'
         posted: '{{username}} heeft een bericht geplaatst in ''{{topic}}'' - {{site_title}}'
-        private_message: '{{username}} heeft u een privébericht gestuurd in ''{{topic}}'' - {{site_title}}'
         linked: '{{username}} heeft een koppeling naar uw bericht geplaatst vanaf ''{{topic}}'' - {{site_title}}'
     upload_selector:
       title: "Een afbeelding toevoegen"
@@ -1284,8 +1242,8 @@ nl:
         notification_level: "Meldingen"
         choose_new_category: "Kies de nieuwe categorie voor de topics:"
         selected:
-          one: "U hebt <b>1</b> topic geselecteerd."
-          other: "U hebt <b>{{count}}</b> topics geselecteerd."
+          one: U hebt <b>1</b> topic geselecteerd.
+          other: U hebt <b>{{count}}</b> topics geselecteerd.
         change_tags: "Tags vervangen"
         append_tags: "Tags toevoegen"
         choose_new_tags: "Kies nieuwe tags voor deze topics:"
@@ -1317,12 +1275,9 @@ nl:
         bookmarks: "Er zijn geen topics met bladwijzers meer."
         search: "Er zijn geen zoekresultaten meer."
     topic:
-      unsubscribe:
-        stop_notifications: "U ontvangt nu minder meldingen voor <strong>{{title}}</strong>"
-        change_notification_state: "Uw huidige meldingsstatus is"
       filter_to:
-        one: "1 bericht in topic"
-        other: "{{count}} berichten in topic"
+        one: 1 bericht in topic
+        other: '{{count}} berichten in topic'
       create: 'Nieuw topic'
       create_long: 'Een nieuw topic maken'
       private_message: 'Een bericht sturen'
@@ -1336,10 +1291,10 @@ nl:
       new: 'nieuw topic'
       unread: 'ongelezen'
       new_topics:
-        one: '1 nieuw topic'
+        one: 1 nieuw topic
         other: '{{count}} nieuwe topics'
       unread_topics:
-        one: '1 ongelezen topic'
+        one: 1 ongelezen topic
         other: '{{count}} ongelezen topics'
       title: 'Topic'
       invalid_access:
@@ -1353,17 +1308,17 @@ nl:
         title: "Topic niet gevonden"
         description: "Sorry, we konden het opgevraagde topic niet vinden. Misschien is het verwijderd door een moderator?"
       total_unread_posts:
-        one: "u hebt 1 ongelezen bericht in dit topic"
-        other: "u hebt {{count}} ongelezen berichten in dit topic"
+        one: u hebt 1 ongelezen bericht in dit topic
+        other: u hebt {{count}} ongelezen berichten in dit topic
       unread_posts:
-        one: "u hebt 1 ongelezen bericht in dit topic"
-        other: "u hebt {{count}} ongelezen berichten in dit topic"
+        one: u hebt 1 ongelezen bericht in dit topic
+        other: u hebt {{count}} ongelezen berichten in dit topic
       new_posts:
-        one: "er is 1 nieuw bericht in dit topic sinds u het voor het laatst hebt gelezen"
-        other: "er zijn {{count}} nieuwe berichten in dit topic sinds u het voor het laatst hebt gelezen"
+        one: er is 1 nieuw bericht in dit topic sinds u het voor het laatst hebt gelezen
+        other: er zijn {{count}} nieuwe berichten in dit topic sinds u het voor het laatst hebt gelezen
       likes:
-        one: "er is 1 like in dit topic"
-        other: "er zijn {{likes}} likes in dit topic"
+        one: er is 1 like in dit topic
+        other: er zijn {{likes}} likes in dit topic
       back_to_list: "Terug naar topiclijst"
       options: "Topic-opties"
       show_links: "koppelingen binnen dit topic tonen"
@@ -1373,7 +1328,7 @@ nl:
       read_more_MF: "Er { UNREAD, plural, =0 {} one { is <a href='/unread'>1 ongelezen</a> } other { zijn <a href='/unread'># ongelezen</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='/new'>1 nieuw</a> topic} other { {BOTH, select, true{and } false {zijn } other{}} <a href='/new'># nieuwe</a> topics} } over, of {CATEGORY, select, true {blader door andere topics in {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Alle categorieën bekijken
       view_latest_topics: nieuwste topics bekijken
-      suggest_create_topic: Waarom maakt u geen topic aan?
+      suggest_create_topic: "Waarom maakt u geen topic aan?"
       jump_reply_up: naar eerder antwoord springen
       jump_reply_down: naar later antwoord springen
       deleted: "Het topic is verwijderd"
@@ -1423,8 +1378,8 @@ nl:
         auto_reminder: "U zult %{timeLeft} aan dit topic herinnerd worden."
       auto_close_title: 'Instellingen voor automatisch sluiten'
       auto_close_immediate:
-        one: "Het laatste bericht in dit topic is al 1 uur oud, dus het topic zal meteen worden gesloten."
-        other: "Het laatste bericht in dit topic is al %{count} uur oud, dus het topic zal meteen worden gesloten."
+        one: Het laatste bericht in dit topic is al 1 uur oud, dus het topic zal meteen worden gesloten.
+        other: Het laatste bericht in dit topic is al %{count} uur oud, dus het topic zal meteen worden gesloten.
       timeline:
         back: "Terug"
         back_description: "Terug naar uw laatste ongelezen bericht"
@@ -1445,21 +1400,21 @@ nl:
         title: wijzigen hoe vaak u meldingen over dit topic ontvangt
         reasons:
           mailing_list_mode: "U hebt de mailinglijstmodus ingeschakeld, dus u ontvangt meldingen over antwoorden op dit topic via e-mail."
-          '3_10': 'U ontvangt meldingen, omdat u een tag in dit topic in de gaten houdt.'
-          '3_6': 'U ontvangt meldingen, omdat u deze categorie in de gaten houdt.'
-          '3_5': 'U ontvangt meldingen, omdat u dit topic automatisch in de gaten houdt.'
-          '3_2': 'U ontvangt meldingen, omdat u dit topic in de gaten houdt.'
-          '3_1': 'U ontvangt meldingen, omdat u dit topic hebt aangemaakt.'
-          '3': 'U ontvangt meldingen, omdat u dit topic in de gaten houdt.'
-          '2_8': 'U ziet het aantal nieuwe antwoorden, omdat u deze categorie volgt.'
-          '2_4': 'U ziet het aantal nieuwe antwoorden, omdat u een antwoord in dit topic hebt geplaatst.'
-          '2_2': 'U ziet het aantal nieuwe antwoorden, omdat u dit topic volgt.'
-          '2': 'U ziet het aantal nieuwe antwoorden, omdat u <a href="/u/{{username}}/preferences">dit topic hebt gelezen</a>.'
-          '1_2': 'U ontvangt een melding als iemand uw @naam noemt of een bericht van u beantwoordt.'
-          '1': 'U ontvangt een melding als iemand uw @naam noemt of een bericht van u beantwoordt.'
-          '0_7': 'U negeert alle meldingen in deze categorie.'
-          '0_2': 'U negeert alle meldingen in dit topic.'
-          '0': 'U negeert alle meldingen in dit topic.'
+          "3_10": 'U ontvangt meldingen, omdat u een tag in dit topic in de gaten houdt.'
+          "3_6": 'U ontvangt meldingen, omdat u deze categorie in de gaten houdt.'
+          "3_5": 'U ontvangt meldingen, omdat u dit topic automatisch in de gaten houdt.'
+          "3_2": 'U ontvangt meldingen, omdat u dit topic in de gaten houdt.'
+          "3_1": 'U ontvangt meldingen, omdat u dit topic hebt aangemaakt.'
+          "3": 'U ontvangt meldingen, omdat u dit topic in de gaten houdt.'
+          "2_8": 'U ziet het aantal nieuwe antwoorden, omdat u deze categorie volgt.'
+          "2_4": 'U ziet het aantal nieuwe antwoorden, omdat u een antwoord in dit topic hebt geplaatst.'
+          "2_2": 'U ziet het aantal nieuwe antwoorden, omdat u dit topic volgt.'
+          "2": 'U ziet het aantal nieuwe antwoorden, omdat u <a href="/u/{{username}}/preferences">dit topic hebt gelezen</a>.'
+          "1_2": 'U ontvangt een melding als iemand uw @naam noemt of een bericht van u beantwoordt.'
+          "1": 'U ontvangt een melding als iemand uw @naam noemt of een bericht van u beantwoordt.'
+          "0_7": 'U negeert alle meldingen in deze categorie.'
+          "0_2": 'U negeert alle meldingen in dit topic.'
+          "0": 'U negeert alle meldingen in dit topic.'
         watching_pm:
           title: "In de gaten houden"
           description: "U ontvangt een melding voor elk nieuw antwoord op dit bericht, en het aantal nieuwe antwoorden wordt weergegeven."
@@ -1499,7 +1454,6 @@ nl:
         visible: "Zichtbaar maken"
         reset_read: "Leesgegevens herinitialiseren"
         make_public: "Topic openbaar maken"
-        make_private: "Nieuw privébericht"
       feature:
         pin: "Topic vastmaken"
         unpin: "Topic losmaken"
@@ -1532,8 +1486,8 @@ nl:
         pin_validation: "Er is een datum vereist om dit topic vast te maken."
         not_pinned: "Er zijn geen topics vastgemaakt in {{categoryLink}}."
         already_pinned:
-          one: "Momenteel vastgemaakte topics in {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
-          other: "Momenteel vastgemaakte topics in {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>."
+          one: 'Momenteel vastgemaakte topics in {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Momenteel vastgemaakte topics in {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>.'
         pin_globally: "Dit topic bovenaan in alle topiclijsten laten verschijnen tot"
         confirm_pin_globally: "U hebt al {{count}} globaal vastgemaakte topics. Te veel vastgemaakte topics kunnen storend zijn voor nieuwe en anonieme gebruikers. Weet u zeker dat u nog een topic globaal wilt vastmaken?"
         unpin_globally: "Verwijder dit topic uit de bovenkant van alle topiclijsten."
@@ -1541,8 +1495,8 @@ nl:
         global_pin_note: "Gebruikers kunnen het topic individueel voor zichzelf losmaken."
         not_pinned_globally: "Er zijn geen globaal vastgemaakte topics."
         already_pinned_globally:
-          one: "Momenteel globaal vastgemaakte topics: <strong class='badge badge-notification unread'>1</strong>"
-          other: "Momenteel globaal vastgemaakte topics: <strong class='badge badge-notification unread'>{{count}}</strong>."
+          one: 'Momenteel globaal vastgemaakte topics: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Momenteel globaal vastgemaakte topics: <strong class=''badge badge-notification unread''>{{count}}</strong>.'
         make_banner: "Dit topic omzetten naar een banner die bovenaan alle pagina's verschijnt"
         remove_banner: "De banner die bovenaan alle pagina's verschijnt verwijderen"
         banner_note: "Gebruikers kunnen de banner negeren door deze te sluiten. Er kan maar één bannertopic tegelijk bestaan."
@@ -1579,8 +1533,8 @@ nl:
       login_reply: 'Meld u aan om te antwoorden'
       filters:
         n_posts:
-          one: "1 bericht"
-          other: "{{count}} berichten"
+          one: 1 bericht
+          other: '{{count}} berichten'
         cancel: "Filter verwijderen"
       split_topic:
         title: "Verplaatsen naar nieuw topic"
@@ -1588,15 +1542,15 @@ nl:
         topic_name: "Naam van nieuw topic"
         error: "Er is een fout opgetreden bij het verplaatsen van berichten naar het nieuwe topic."
         instructions:
-          one: "U gaat een nieuw topic aanmaken en met het geselecteerde bericht vullen."
-          other: "U gaat een nieuw topic aanmaken en met de <b>{{count}}</b> geselecteerde berichten vullen."
+          one: U gaat een nieuw topic aanmaken en met het geselecteerde bericht vullen.
+          other: U gaat een nieuw topic aanmaken en met de <b>{{count}}</b> geselecteerde berichten vullen.
       merge_topic:
         title: "Verplaatsen naar bestaand topic"
         action: "verplaatsen naar bestaand topic"
         error: "Er is een fout opgetreden bij het verplaatsen van berichten naar dat topic."
         instructions:
-          one: "Selecteer het topic waarnaar u dat bericht wilt verplaatsen."
-          other: "Selecteer het topic waarnaar u de <b>{{count}}</b> berichten wilt verplaatsen."
+          one: Selecteer het topic waarnaar u dat bericht wilt verplaatsen.
+          other: Selecteer het topic waarnaar u de <b>{{count}}</b> berichten wilt verplaatsen.
       merge_posts:
         title: "Geselecteerde berichten samenvoegen"
         action: "geselecteerde berichten samenvoegen"
@@ -1608,9 +1562,8 @@ nl:
         label: "Nieuwe eigenaar van berichten"
         placeholder: "gebruikersnaam van nieuwe eigenaar"
         instructions:
-          one: "Kies de nieuwe eigenaar van het bericht door <b>{{old_user}}</b>."
-          other: "Kies de nieuwe eigenaar van de {{count}} berichten door <b>{{old_user}}</b>."
-        instructions_warn: "Let er op dat meldingen over dit bericht niet met terugwerkende kracht aan de nieuwe gebruiker worden overgedragen. <br>Waarschuwing: momenteel worden geen berichtafhankelijke gegevens aan de nieuwe gebruiker overgedragen. Wees dus voorzichtig met het gebruik hiervan."
+          one: Kies de nieuwe eigenaar van het bericht door <b>{{old_user}}</b>.
+          other: Kies de nieuwe eigenaar van de {{count}} berichten door <b>{{old_user}}</b>.
       change_timestamp:
         title: "Tijdstempel wijzigen..."
         action: "tijdstempel wijzigen"
@@ -1628,8 +1581,6 @@ nl:
           one: U hebt <b>1</b> bericht geselecteerd.
           other: U hebt <b>{{count}}</b> berichten geselecteerd.
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Citeren"
       edit_reason: "Reden: "
       post_number: "bericht {{number}}"
@@ -1642,26 +1593,27 @@ nl:
       show_full: "Volledige bericht tonen"
       show_hidden: 'Verborgen inhoud bekijken'
       deleted_by_author:
-        one: "(bericht ingetrokken door de schrijver, wordt over %{count} uur automatisch verwijderd, tenzij gemarkeerd)"
-        other: "(bericht ingetrokken door de schrijver, wordt over %{count} uur automatisch verwijderd, tenzij gemarkeerd)"
+        one: (bericht ingetrokken door de schrijver, wordt over %{count} uur automatisch verwijderd, tenzij gemarkeerd)
+        other: (bericht ingetrokken door de schrijver, wordt over %{count} uur automatisch verwijderd, tenzij gemarkeerd)
+      collapse: "samenvouwen"
       expand_collapse: "uitvouwen/samenvouwen"
       gap:
-        one: "1 verborgen antwoord weergeven"
-        other: "{{count}} verborgen antwoorden weergeven"
+        one: 1 verborgen antwoord weergeven
+        other: '{{count}} verborgen antwoorden weergeven'
       unread: "Bericht is ongelezen"
       has_replies:
-        one: "{{count}} antwoord"
-        other: "{{count}} antwoorden"
+        one: '{{count}} antwoord'
+        other: '{{count}} antwoorden'
       has_likes:
-        one: "{{count}} like"
-        other: "{{count}} likes"
+        one: '{{count}} like'
+        other: '{{count}} likes'
       has_likes_title:
-        one: "1 persoon heeft dit bericht geliket"
-        other: "{{count}} personen hebben dit bericht geliket"
+        one: 1 persoon heeft dit bericht geliket
+        other: '{{count}} personen hebben dit bericht geliket'
       has_likes_title_only_you: "u hebt dit bericht geliket"
       has_likes_title_you:
-        one: "u en 1 andere persoon hebben dit bericht geliket"
-        other: "u en {{count}} andere personen hebben dit bericht geliket"
+        one: u en 1 andere persoon hebben dit bericht geliket
+        other: u en {{count}} andere personen hebben dit bericht geliket
       errors:
         create: "Sorry, er is een fout opgetreden bij het plaatsen van uw bericht. Probeer het opnieuw."
         edit: "Sorry, er is een fout opgetreden bij het bewerken van uw bericht. Probeer het opnieuw."
@@ -1735,58 +1687,58 @@ nl:
           vote: "U hebt op dit bericht gestemd"
         by_you_and_others:
           off_topic:
-            one: "U en 1 andere persoon hebben dit als off-topic gemarkeerd"
-            other: "U en {{count}} andere personen hebben dit als off-topic gemarkeerd"
+            one: U en 1 andere persoon hebben dit als off-topic gemarkeerd
+            other: U en {{count}} andere personen hebben dit als off-topic gemarkeerd
           spam:
-            one: "U en 1 andere persoon hebben dit als spam gemarkeerd"
-            other: "U en {{count}} andere personen hebben dit als spam gemarkeerd"
+            one: U en 1 andere persoon hebben dit als spam gemarkeerd
+            other: U en {{count}} andere personen hebben dit als spam gemarkeerd
           inappropriate:
-            one: "U en 1 andere persoon hebben dit als ongepast gemarkeerd"
-            other: "U en {{count}} andere personen hebben dit als ongepast gemarkeerd"
+            one: U en 1 andere persoon hebben dit als ongepast gemarkeerd
+            other: U en {{count}} andere personen hebben dit als ongepast gemarkeerd
           notify_moderators:
-            one: "U en 1 andere persoon hebben dit voor moderatie gemarkeerd"
-            other: "U en {{count}} andere personen hebben dit voor moderatie gemarkeerd"
+            one: U en 1 andere persoon hebben dit voor moderatie gemarkeerd
+            other: U en {{count}} andere personen hebben dit voor moderatie gemarkeerd
           notify_user:
-            one: "U en 1 andere persoon hebben een bericht naar deze gebruiker gestuurd"
-            other: "U en {{count}} andere personen hebben een bericht naar deze gebruiker gestuurd"
+            one: U en 1 andere persoon hebben een bericht naar deze gebruiker gestuurd
+            other: U en {{count}} andere personen hebben een bericht naar deze gebruiker gestuurd
           bookmark:
-            one: "U en 1 andere persoon hebben een bladwijzer voor dit bericht gemaakt"
-            other: "U en {{count}} andere personen hebben een bladwijzer voor dit bericht gemaakt"
+            one: U en 1 andere persoon hebben een bladwijzer voor dit bericht gemaakt
+            other: U en {{count}} andere personen hebben een bladwijzer voor dit bericht gemaakt
           like:
-            one: "U en 1 andere persoon hebben dit geliket"
-            other: "U en {{count}} andere personen hebben dit geliket"
+            one: U en 1 andere persoon hebben dit geliket
+            other: U en {{count}} andere personen hebben dit geliket
           vote:
-            one: "U en 1 andere persoon hebben op dit bericht gestemd"
-            other: "U en {{count}} andere personen hebben op dit bericht gestemd"
+            one: U en 1 andere persoon hebben op dit bericht gestemd
+            other: U en {{count}} andere personen hebben op dit bericht gestemd
         by_others:
           off_topic:
-            one: "1 persoon heeft dit als off-topic gemarkeerd"
-            other: "{{count}} personen hebben dit als off-topic gemarkeerd"
+            one: 1 persoon heeft dit als off-topic gemarkeerd
+            other: '{{count}} personen hebben dit als off-topic gemarkeerd'
           spam:
-            one: "1 persoon heeft dit als spam gemarkeerd"
-            other: "{{count}} personen hebben dit als spam gemarkeerd"
+            one: 1 persoon heeft dit als spam gemarkeerd
+            other: '{{count}} personen hebben dit als spam gemarkeerd'
           inappropriate:
-            one: "1 persoon heeft dit als ongepast gemarkeerd"
-            other: "{{count}} personen hebben dit als ongepast gemarkeerd"
+            one: 1 persoon heeft dit als ongepast gemarkeerd
+            other: '{{count}} personen hebben dit als ongepast gemarkeerd'
           notify_moderators:
-            one: "1 persoon heeft dit voor moderatie gemarkeerd"
-            other: "{{count}} personen hebben dit voor moderatie gemarkeerd"
+            one: 1 persoon heeft dit voor moderatie gemarkeerd
+            other: '{{count}} personen hebben dit voor moderatie gemarkeerd'
           notify_user:
-            one: "1 persoon stuurde een bericht naar deze gebruiker"
-            other: "{{count}} stuurden een bericht naar deze gebruiker"
+            one: 1 persoon stuurde een bericht naar deze gebruiker
+            other: '{{count}} stuurden een bericht naar deze gebruiker'
           bookmark:
-            one: "1 persoon heeft een bladwijzer voor dit bericht gemaakt"
-            other: "{{count}} personen hebben een bladwijzer voor dit bericht gemaakt"
+            one: 1 persoon heeft een bladwijzer voor dit bericht gemaakt
+            other: '{{count}} personen hebben een bladwijzer voor dit bericht gemaakt'
           like:
-            one: "1 persoon heeft dit geliket"
-            other: "{{count}} personen hebben dit geliket"
+            one: 1 persoon heeft dit geliket
+            other: '{{count}} personen hebben dit geliket'
           vote:
-            one: "1 persoon heeft op dit bericht gestemd"
-            other: "{{count}} personen hebben op dit bericht gestemd"
+            one: 1 persoon heeft op dit bericht gestemd
+            other: '{{count}} personen hebben op dit bericht gestemd'
       merge:
         confirm:
-          one: "Weet je zeker dat je die berichten wilt samenvoegen?"
-          other: "Weet je zeker dat je die {{count}} berichten wilt samenvoegen?"
+          one: Weet je zeker dat je die berichten wilt samenvoegen?
+          other: Weet je zeker dat je die {{count}} berichten wilt samenvoegen?
       revisions:
         controls:
           first: "Eerste revisie"
@@ -1868,7 +1820,6 @@ nl:
       email_in_allow_strangers: "E-mails van anonieme gebruikers zonder account accepteren"
       email_in_disabled: "Het plaatsen van nieuwe topics via e-mail is uitgeschakeld in de webite-instellingen. Om het plaatsen van nieuwe topics via e-mail mogelijk te maken, "
       email_in_disabled_click: 'schakelt u de instelling ''e-mail in'' in.'
-      suppress_from_homepage: "Deze categorie op de startpagina negeren"
       show_subcategory_list: "Subcategorielijsten boven topics tonen in deze categorie"
       num_featured_topics: "Aantal getoonde topics op de categoriepagina:"
       subcategory_num_featured_topics: "Aantal aanbevolen topics op pagina van bovenliggende categorie:"
@@ -1942,14 +1893,14 @@ nl:
       custom_placeholder_notify_moderators: "Laat ons met name weten waar u zich zorgen om maakt, en stuur relevante koppelingen en voorbeelden mee waar mogelijk."
       custom_message:
         at_least:
-          one: "voer minstens 1 teken in"
-          other: "voer minstens {{count}} tekens in"
+          one: voer minstens 1 teken in
+          other: voer minstens {{count}} tekens in
         more:
-          one: "1 teken te gaan..."
-          other: "{{count}} tekens te gaan..."
+          one: 1 teken te gaan...
+          other: '{{count}} tekens te gaan...'
         left:
-          one: "1 resterend"
-          other: "{{count}} resterend"
+          one: 1 resterend
+          other: '{{count}} resterend'
     flagging_topic:
       title: "Bedankt voor het beleefd houden van onze gemeenschap!"
       action: "Topic markeren"
@@ -1960,13 +1911,13 @@ nl:
       links_title: "Populaire koppelingen"
       links_shown: "meer koppelingen tonen..."
       clicks:
-        one: "1 klik"
-        other: "%{count} klikken"
+        one: 1 klik
+        other: '%{count} klikken'
     post_links:
       about: "meer koppelingen voor dit bericht uitvouwen"
       title:
-        one: "nog 1"
-        other: "nog %{count}"
+        one: nog 1
+        other: nog %{count}
     topic_statuses:
       warning:
         help: "Dit is een officiële waarschuwing."
@@ -2000,22 +1951,22 @@ nl:
     original_post: "Oorspronkelijke bericht"
     views: "Weergaven"
     views_lowercase:
-      one: "weergave"
-      other: "weergaven"
+      one: weergave
+      other: weergaven
     replies: "Antwoorden"
     views_long:
-      one: "dit topic is 1 keer bekeken"
-      other: "dit topic is {{number}} keer bekeken"
+      one: dit topic is 1 keer bekeken
+      other: dit topic is {{number}} keer bekeken
     activity: "Activiteit"
     likes: "Likes"
     likes_lowercase:
-      one: "like"
-      other: "likes"
+      one: like
+      other: likes
     likes_long: "er zijn {{count}} likes in dit topic"
     users: "Gebruikers"
     users_lowercase:
-      one: "gebruiker"
-      other: "gebruikers"
+      one: gebruiker
+      other: gebruikers
     category_title: "Categorie"
     history: "Geschiedenis"
     changed_by: "door {{author}}"
@@ -2029,8 +1980,8 @@ nl:
       latest:
         title: "Nieuwste"
         title_with_count:
-          one: "Nieuwste (1)"
-          other: "Nieuwste ({{count}})"
+          one: Nieuwste (1)
+          other: Nieuwste ({{count}})
         help: "topics met recente berichten"
       hot:
         title: "Populair"
@@ -2048,21 +1999,21 @@ nl:
       unread:
         title: "Ongelezen"
         title_with_count:
-          one: "Ongelezen (1)"
-          other: "Ongelezen ({{count}})"
+          one: Ongelezen (1)
+          other: Ongelezen ({{count}})
         help: "topics die u momenteel in de gaten houdt of volgt met ongelezen berichten"
         lower_title_with_count:
-          one: "1 ongelezen"
-          other: "{{count}} ongelezen"
+          one: 1 ongelezen
+          other: '{{count}} ongelezen'
       new:
         lower_title_with_count:
-          one: "1 nieuw"
-          other: "{{count}} nieuw"
+          one: 1 nieuw
+          other: '{{count}} nieuw'
         lower_title: "nieuw"
         title: "Nieuw"
         title_with_count:
-          one: "Nieuw (1)"
-          other: "Nieuw ({{count}})"
+          one: Nieuw (1)
+          other: Nieuw ({{count}})
         help: "in de afgelopen paar dagen aangemaakte topics"
       posted:
         title: "Mijn berichten"
@@ -2073,8 +2024,8 @@ nl:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: "{{categoryName}} (1)"
-          other: "{{categoryName}} ({{count}})"
+          one: '{{categoryName}} (1)'
+          other: '{{categoryName}} ({{count}})'
         help: "nieuwste topics in de categorie {{categoryName}}"
       top:
         title: "Top"
@@ -2158,24 +2109,23 @@ nl:
         print: '<b>ctrl</b>+<b>p</b> Topic afdrukken'
     badges:
       earned_n_times:
-        one: "Deze badge is 1 keer verdiend"
-        other: "Deze badge is %{count} keer verdiend"
+        one: Deze badge is 1 keer verdiend
+        other: Deze badge is %{count} keer verdiend
       granted_on: "Toegekend op %{date}"
       others_count: "Anderen met deze badge (%{count})"
       title: Badges
       allow_title: "U kunt deze badge als een titel gebruiken"
       multiple_grant: "U kunt dit meerdere keren verdienen"
       badge_count:
-        one: "1 badge"
-        other: "%{count} badges"
+        one: 1 badge
+        other: '%{count} badges'
       more_badges:
-        one: "+nog 1"
-        other: "+nog %{count}"
+        one: +nog 1
+        other: +nog %{count}
       granted:
-        one: "1 toegekend"
-        other: "%{count} toegekend"
+        one: 1 toegekend
+        other: '%{count} toegekend'
       select_badge_for_title: Kies een badge om als uw titel te gebruiken
-      none: "<geen>"
       badge_grouping:
         getting_started:
           name: Aan de slag
@@ -2204,8 +2154,8 @@ nl:
       tags: "Tags"
       delete_tag: "Tag verwijderen"
       delete_confirm:
-        one: "Weet je zeker dat je deze tag wilt verwijderen en loskoppelen van 1 topic waar het aan toegewezen is?"
-        other: "Weet je zeker dat je deze tag wilt verwijderen en loskoppelen van {{count}} topics waar het aan toegewezen is?"
+        one: Weet je zeker dat je deze tag wilt verwijderen en loskoppelen van 1 topic waar het aan toegewezen is?
+        other: Weet je zeker dat je deze tag wilt verwijderen en loskoppelen van {{count}} topics waar het aan toegewezen is?
       delete_confirm_no_topics: "Weet je zeker dat je deze tag wilt verwijderen?"
       rename_tag: "Tag hernoemen"
       rename_instructions: "Kies een nieuwe naam voor de tag:"
@@ -2222,19 +2172,15 @@ nl:
       notifications:
         watching:
           title: "In de gaten houden"
-          description: "U houdt automatisch alle nieuwe topics met deze tag in de gaten. U ontvangt meldingen bij alle nieuwe berichten en topics, en het aantal ongelezen en nieuwe berichten verschijnt ook naast het topic."
         watching_first_post:
           title: "Eerste bericht in de gaten houden."
-          description: "U ontvangt alleen een melding van het eerste bericht in elk nieuw topic met deze tag."
         tracking:
           title: "Volgen"
-          description: "U volgt automatisch alle topics met deze tag. Het aantal ongelezen en nieuwe berichten verschijnt naast het topic."
         regular:
           title: "Normaal"
           description: "U ontvangt een melding wanneer iemand uw @naam noemt of een bericht van uw beantwoordt."
         muted:
           title: "Genegeerd"
-          description: "U ontvangt geen meldingen over nieuwe topics met deze tag, en ze verschijnen niet in uw tabblad met ongelezen berichten."
       groups:
         title: "Tag-groepen"
         about: "Tags aan groepen toevoegen om deze makkelijker te beheren."
@@ -2316,8 +2262,6 @@ nl:
         reports:
           today: "Vandaag"
           yesterday: "Gisteren"
-          last_7_days: "Afgelopen 7 dagen"
-          last_30_days: "Afgelopen 30 dagen"
           all_time: "Sinds het begin"
           7_days_ago: "7 dagen geleden"
           30_days_ago: "30 dagen geleden"
@@ -2338,7 +2282,6 @@ nl:
         topics: "Gemarkeerde Topics"
         agree: "Akkoord"
         agree_title: "Bevestig dat deze melding geldig en correct is"
-        defer_flag_title: "Deze melding verwijderen; er is nu geen actie nodig."
         delete: "Verwijderen"
         delete_title: "Het bericht waarnaar deze melding verwijst verwijderen."
         delete_post_defer_flag_title: "Bericht verwijderen; als dit het eerste bericht is, het topic verwijderen"
@@ -2382,8 +2325,6 @@ nl:
         title: "Groepen"
         edit: "Groepen bewerken"
         refresh: "Vernieuwen"
-        new: "Nieuw"
-        selector_placeholder: "voer gebruikersnaam in"
         about: "Bewerk hier uw groepslidmaatschap en namen"
         group_members: "Groepsleden"
         delete: "Verwijderen"
@@ -2391,22 +2332,10 @@ nl:
         delete_failed: "Kan groep niet verwijderen. Als dit een automatische groep is, kan deze niet worden verwijderd."
         delete_owner_confirm: "Eigenaarsprivileges van '% {username}' verwijderen?"
         add: "Toevoegen"
-        add_members: "Leden toevoegen"
         custom: "Aangepast"
-        bulk_complete: "De gebruikers zijn aan de groep toegevoegd."
-        bulk_complete_users_not_added: "Deze gebruikers zijn niet toegevoegd (controleer of ze een account hebben):"
-        bulk: "Bulk toevoegen aan groep"
-        bulk_paste: "Plak een lijst van gebruikersnamen of e-mailadressen, één per regel:"
-        bulk_select: "(selecteer een groep)"
         automatic: "Automatisch"
-        automatic_membership_email_domains: "Gebruikers die zich met een e-maildomein registeren dat precies overeenkomt met een domein in deze lijst worden automatisch aan deze groep toegevoegd:"
-        automatic_membership_retroactive: "Dezelfde e-maildomeinregel toepassen voor het toevoegen van bestaande geregistreerde gebruikers"
-        default_title: "Standaardtitel voor alle gebruikers in deze groep"
-        primary_group: "Automatisch instellen als primaire groep"
         group_owners: Eigenaren
         add_owners: Eigenaren toevoegen
-        incoming_email: "Aangepast adres voor inkomende e-mail"
-        incoming_email_placeholder: "voer e-mailadres in"
         none_selected: "Selecteer een groep om te beginnen"
         no_custom_groups: "Een nieuwe aangepaste groep maken"
       api:
@@ -2472,11 +2401,11 @@ nl:
           none: "Er zijn geen verwante gebeurtenissen."
           redeliver: "Opnieuw afleveren"
           incoming:
-            one: "Er is een nieuwe gebeurtenis."
-            other: "Er zijn {{count}} nieuwe gebeurtenissen."
+            one: Er is een nieuwe gebeurtenis.
+            other: Er zijn {{count}} nieuwe gebeurtenissen.
           completed_in:
-            one: "Voltooid in 1 seconde."
-            other: "Voltooid in {{count}} seconden."
+            one: Voltooid in 1 seconde.
+            other: Voltooid in {{count}} seconden.
           request: "Aanvraag"
           response: "Antwoord"
           redeliver_confirm: "Weet u zeker dat u dezelfde payload opnieuw wilt afleveren?"
@@ -2527,7 +2456,6 @@ nl:
           label: "Uploaden"
           title: "Een back-up naar deze instantie uploaden"
           uploading: "Uploaden..."
-          success: "'{{filename}}' is geupload."
           error: "Er is een fout opgetreden bij het uploaden van '{{filename}}': {{message}}"
         operations:
           is_running: "Er wordt al een bewerking uitgevoerd..."
@@ -2540,7 +2468,6 @@ nl:
             label: "Back-up maken"
             title: "Een back-up maken"
             confirm: "Wilt u een nieuwe back-up starten?"
-            without_uploads: "Ja (geen bestanden bijvoegen)"
           download:
             label: "Downloaden"
             title: "E-mail met downloadkoppeling verzenden"
@@ -2638,8 +2565,8 @@ nl:
           up_to_date: "Thema is up-to-date, laatst gecontroleerd:"
           add: "Toevoegen"
           commits_behind:
-            one: "Thema loopt 1 commit achter!"
-            other: "Thema loopt {{count}} commits achter!"
+            one: Thema loopt 1 commit achter!
+            other: Thema loopt {{count}} commits achter!
           scss:
             text: "CSS"
             title: "Voer aangepaste CSS in; we accepteren alle geldige CSS- en SCSS-stijlen"
@@ -2878,8 +2805,8 @@ nl:
         clear_filter: "Wis"
         show_words: "laat woorden zien"
         word_count:
-          one: "1 woord"
-          other: "%{count} woorden"
+          one: 1 woord
+          other: '%{count} woorden'
         actions:
           block: 'Blokkeren'
           censor: 'Censuur'
@@ -2920,11 +2847,11 @@ nl:
           suspect: 'Verdacht'
         approved: "Goedgekeurd?"
         approved_selected:
-          one: "gebruiker goedkeuren"
-          other: "gebruikers goedkeuren ({{count}})"
+          one: gebruiker goedkeuren
+          other: gebruikers goedkeuren ({{count}})
         reject_selected:
-          one: "gebruiker weigeren"
-          other: "gebruikers weigeren ({{count}})"
+          one: gebruiker weigeren
+          other: gebruikers weigeren ({{count}})
         titles:
           active: 'Actieve gebruikers'
           new: 'Nieuwe gebruikers'
@@ -2940,11 +2867,11 @@ nl:
           suspended: 'Geschorste gebruikers'
           suspect: 'Verdachte gebruikers'
         reject_successful:
-          one: "Er is 1 gebruiker geweigerd."
-          other: "Er zijn %{count} gebruikers geweigerd."
+          one: Er is 1 gebruiker geweigerd.
+          other: Er zijn %{count} gebruikers geweigerd.
         reject_failures:
-          one: "Het weigeren van 1 gebruiker is niet gelukt."
-          other: "Het weigeren van %{count} gebruikers is niet gelukt."
+          one: Het weigeren van 1 gebruiker is niet gelukt.
+          other: Het weigeren van %{count} gebruikers is niet gelukt.
         not_verified: "Niet geverifieerd"
         check_email:
           title: "E-mailadres van deze gebruiker tonen"
@@ -3010,14 +2937,14 @@ nl:
         delete_forbidden_because_staff: "Beheerders en moderators kunnen niet worden verwijderd."
         delete_posts_forbidden_because_staff: "Kan niet alle berichten van beheerders en moderators verwijderen."
         delete_forbidden:
-          one: "Gebruikers kunnen niet worden verwijderd als ze berichten hebben geplaatst. Verwijder alle berichten voordat u een gebruiker probeert te verwijderen. (Berichten ouder dan %{count} dag kunnen niet worden verwijderd.)"
-          other: "Gebruikers kunnen niet worden verwijderd als ze berichten hebben geplaatst. Verwijder alle berichten voordat u een gebruiker probeert te verwijderen. (Berichten ouder dan %{count} dagen kunnen niet worden verwijderd.)"
+          one: Gebruikers kunnen niet worden verwijderd als ze berichten hebben geplaatst. Verwijder alle berichten voordat u een gebruiker probeert te verwijderen. (Berichten ouder dan %{count} dag kunnen niet worden verwijderd.)
+          other: Gebruikers kunnen niet worden verwijderd als ze berichten hebben geplaatst. Verwijder alle berichten voordat u een gebruiker probeert te verwijderen. (Berichten ouder dan %{count} dagen kunnen niet worden verwijderd.)
         cant_delete_all_posts:
-          one: "Kan niet alle berichten verwijderen. Sommige berichten zijn ouder dan %{count} dag. (De instelling delete_user_max_post_age.)"
-          other: "Kan niet alle berichten verwijderen. Sommige berichten zijn ouder dan %{count} dagen. (De instelling delete_user_max_post_age.)"
+          one: Kan niet alle berichten verwijderen. Sommige berichten zijn ouder dan %{count} dag. (De instelling delete_user_max_post_age.)
+          other: Kan niet alle berichten verwijderen. Sommige berichten zijn ouder dan %{count} dagen. (De instelling delete_user_max_post_age.)
         cant_delete_all_too_many_posts:
-          one: "Kan niet alle berichten verwijderen, omdat de gebruiker meer dan 1 bericht heeft geplaatst. (delete_all_posts_max)"
-          other: "Kan niet alle berichten verwijderen, omdat de gebruiker meer dan %{count} berichten heeft geplaatst. (delete_all_posts_max)"
+          one: Kan niet alle berichten verwijderen, omdat de gebruiker meer dan 1 bericht heeft geplaatst. (delete_all_posts_max)
+          other: Kan niet alle berichten verwijderen, omdat de gebruiker meer dan %{count} berichten heeft geplaatst. (delete_all_posts_max)
         delete_confirm: "Weet je ZEKER dat je deze gebruiker wil verwijderen? Dit is definitief!"
         delete_and_block: "Dit e-mail- en IP-adres verwijderen en <b>blokkeren</b>"
         delete_dont_block: "Alleen verwijderen"
@@ -3053,8 +2980,8 @@ nl:
         tl3_requirements:
           title: "Vereisten voor vertrouwensniveau 3"
           table_title:
-            one: "De afgelopen dag:"
-            other: "In de afgelopen %{count} dagen:"
+            one: 'De afgelopen dag:'
+            other: 'In de afgelopen %{count} dagen:'
           value_heading: "Waarde"
           requirement_heading: "Vereiste"
           visits: "Bezoeken"
@@ -3129,10 +3056,7 @@ nl:
         recommended: "We raden aan de volgende tekst naar wens aan te passen:"
         show_overriden: 'Alleen overschreven tekst tonen'
       site_settings:
-        show_overriden: 'Alleen overschreven instellingen tonen'
         title: 'Instellingen'
-        reset: 'standaardinstellingen'
-        none: 'geen'
         no_results: "Geen resultaten gevonden."
         clear_filter: "Wis"
         add_url: "URL toevoegen"
@@ -3154,6 +3078,7 @@ nl:
           developer: 'Ontwikkelaar'
           embedding: "Embedden"
           legal: "Juridisch"
+          api: 'API'
           user_api: 'Gebruikers-API'
           uncategorized: 'Overige'
           backups: "Backups"
@@ -3181,11 +3106,11 @@ nl:
         reason_help: (een link naar een bericht of topic)
         save: Bewaar
         delete: Verwijder
-        delete_confirm: Weet u zeker dat u deze badge wilt verwijderen?
+        delete_confirm: "Weet u zeker dat u deze badge wilt verwijderen?"
         revoke: Intrekken
         reason: Reden
         expand: Uitvouwen &hellip;
-        revoke_confirm: Weet u zeker dat u deze badge wilt intrekken?
+        revoke_confirm: "Weet u zeker dat u deze badge wilt intrekken?"
         edit_badges: Badges bewerken
         grant_badge: Badge toekennen
         granted_badges: Toegekende badges
@@ -3199,7 +3124,6 @@ nl:
         enabled: Badge inschakelen
         icon: Pictogram
         image: Afbeelding
-        icon_help: "Gebruik ofwel een Font Awesome-klasse of een URL naar een afbeelding"
         query: Badgequery (SQL)
         target_posts: Geassocieerde berichten opvragen
         auto_revoke: Intrekkingsquery dagelijks uitvoeren
@@ -3223,14 +3147,14 @@ nl:
             text: "Er ontbreken toekenningsvoorbeelden. Dit gebeurt als de badgequery gebruikers- of bericht-ID's retourneert die niet bestaan. Dit kan later tot onverwachte resultaten leiden - controleer uw query."
           no_grant_count: "Geen badges om toe te wijzen."
           grant_count:
-            one: "Er is <b>1</b> badge om toe te wijzen."
-            other: "Er zijn <b>%{count}</b> badges om toe te wijzen."
+            one: Er is <b>1</b> badge om toe te wijzen.
+            other: Er zijn <b>%{count}</b> badges om toe te wijzen.
           sample: "Voorbeeld:"
           grant:
-            with: <span class="username">%{username}</span>
-            with_post: <span class="username">%{username}</span> voor bericht in %{link}
-            with_post_time: <span class="username">%{username}</span> voor bericht in %{link} om <span class="time">%{time}</span>
-            with_time: <span class="username">%{username}</span> om <span class="time">%{time}</span>
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span> voor bericht in %{link}"
+            with_post_time: "<span class=\"username\">%{username}</span> voor bericht in %{link} om <span class=\"time\">%{time}</span>"
+            with_time: "<span class=\"username\">%{username}</span> om <span class=\"time\">%{time}</span>"
       emoji:
         title: "Emoji"
         help: "Nieuwe emoji toevoegen die voor iedereen beschikbaar zal zijn. (PROTIP: versleep meerdere bestanden tegelijk)"
@@ -3276,7 +3200,7 @@ nl:
         category_id: "Categorie-ID"
         category_title: "Categorie"
         external_url: "Externe URL"
-        delete_confirm: Weet je zeker dat je deze permalink wil verwijderen?
+        delete_confirm: "Weet je zeker dat je deze permalink wil verwijderen?"
         form:
           label: "Nieuw:"
           add: "Toevoegen"
@@ -3291,8 +3215,8 @@ nl:
       uploading: "Uploaden..."
       quit: "Misschien later"
       staff_count:
-        one: "Jouw community heeft 1 personeelslids (jij)."
-        other: "Jouw community heeft %{count} personeelsleden, inclusief jij."
+        one: Jouw community heeft 1 personeelslids (jij).
+        other: Jouw community heeft %{count} personeelsleden, inclusief jij.
       invites:
         add_user: "toevoegen"
         none_added: "Je hebt geen stafleden uitgenodigd. Weet je zeker dat je verder wilt gaan?"
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index 3bbb08e58b8..c562f0d794a 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -16,9 +16,9 @@ pl_PL:
           format: '%n %u'
           units:
             byte:
-              one: bajt
               few: bajty
               many: bajtów
+              one: bajt
               other: bajtów
             gb: GB
             kb: KB
@@ -45,103 +45,109 @@ pl_PL:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: "< 1s"
-          few: "< %{count}s"
-          many: "< %{count}s"
-          other: "< %{count}s"
+          few: < %{count}s
+          many: < %{count}s
+          one: < 1s
+          other: < %{count}s
         x_seconds:
-          one: "1s"
-          few: "%{count}s"
-          many: "%{count}s"
-          other: "%{count}s"
+          few: '%{count}s'
+          many: '%{count}s'
+          one: 1s
+          other: '%{count}s'
+        less_than_x_minutes:
+          few: < %{count} min
+          many: '< %{count} min '
+          one: < 1 min
+          other: '< %{count} min '
         x_minutes:
-          one: "1m"
-          few: "%{count}m"
-          many: "%{count}m"
-          other: "%{count}m"
+          few: '%{count}m'
+          many: '%{count}m'
+          one: 1m
+          other: '%{count}m'
         about_x_hours:
-          one: "1h"
-          few: "%{count}h"
-          many: "%{count}h"
-          other: "%{count}h"
+          few: '%{count}h'
+          many: '%{count}h'
+          one: 1h
+          other: '%{count}h'
         x_days:
-          one: "1d"
-          few: "%{count}d"
-          many: "%{count}d"
-          other: "%{count}d"
+          few: '%{count}d'
+          many: '%{count}d'
+          one: 1d
+          other: '%{count}d'
         x_months:
-          one: "1mies"
-          few: "%{count}mies"
-          many: "%{count}mies"
-          other: "%{count}mies"
+          few: '%{count}mies'
+          many: '%{count}mies'
+          one: 1mies
+          other: '%{count}mies'
         about_x_years:
-          one: "1r"
-          few: "%{count}r"
-          many: "%{count}r"
-          other: "%{count}r"
+          few: '%{count}r'
+          many: '%{count}r'
+          one: 1r
+          other: '%{count}r'
         over_x_years:
-          one: "> 1r"
-          few: "> %{count}r"
-          many: "> %{count}r"
-          other: "> %{count}r"
+          few: '> %{count}r'
+          many: '> %{count}r'
+          one: '> 1r'
+          other: '> %{count}r'
         almost_x_years:
-          one: "1r"
-          few: "%{count}r"
-          many: "%{count}r"
-          other: "%{count}r"
+          few: '%{count}r'
+          many: '%{count}r'
+          one: 1r
+          other: '%{count}r'
         date_month: "D MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: "1 minuta"
-          few: "%{count} minuty"
-          many: "%{count} minut"
-          other: "%{count} minut"
+          few: '%{count} minuty'
+          many: '%{count} minut'
+          one: 1 minuta
+          other: '%{count} minut'
         x_hours:
-          one: "1 godzina"
-          few: "%{count} godziny"
-          many: "%{count} godzin"
-          other: "%{count} godzin"
+          few: '%{count} godziny'
+          many: '%{count} godzin'
+          one: 1 godzina
+          other: '%{count} godzin'
         x_days:
-          one: "1 dzień"
-          few: "%{count} dni"
-          many: "%{count} dni"
-          other: "%{count} dni"
+          few: '%{count} dni'
+          many: '%{count} dni'
+          one: 1 dzień
+          other: '%{count} dni'
         date_year: "D MMM 'YY"
       medium_with_ago:
         x_minutes:
-          one: "minutę temu"
-          few: "%{count} minuty temu"
-          many: "%{count} minut temu"
-          other: "%{count} minut temu"
+          few: '%{count} minuty temu'
+          many: '%{count} minut temu'
+          one: minutę temu
+          other: '%{count} minut temu'
         x_hours:
-          one: "godzinę temu"
-          few: "%{count} godziny temu"
-          many: "%{count} godzin temu"
-          other: "%{count} godzin temu"
+          few: '%{count} godziny temu'
+          many: '%{count} godzin temu'
+          one: godzinę temu
+          other: '%{count} godzin temu'
         x_days:
-          one: "wczoraj"
-          few: "%{count} dni temu"
-          many: "%{count} dni temu"
-          other: "%{count} dni temu"
+          few: '%{count} dni temu'
+          many: '%{count} dni temu'
+          one: wczoraj
+          other: '%{count} dni temu'
       later:
         x_days:
-          one: "1 dzień później"
-          few: "%{count} dni później"
-          many: "%{count} dni później"
-          other: "%{count} dni później"
+          few: '%{count} dni później'
+          many: '%{count} dni później'
+          one: 1 dzień później
+          other: '%{count} dni później'
         x_months:
-          one: "1 miesiąc później"
-          few: "%{count} miesiące później"
-          many: "%{count} miesięcy później"
-          other: "%{count} miesięcy później"
+          few: '%{count} miesiące później'
+          many: '%{count} miesięcy później'
+          one: 1 miesiąc później
+          other: '%{count} miesięcy później'
         x_years:
-          one: "1 rok później"
-          few: "%{count} lata później"
-          many: "%{count} lat później"
-          other: "%{count} lat później"
+          few: '%{count} lata później'
+          many: '%{count} lat później'
+          one: 1 rok później
+          other: '%{count} lat później'
       previous_month: 'Poprzedni miesiąc'
       next_month: 'Następny miesiąc'
+      placeholder: data
     share:
       topic: 'udostępnij odnośnik do tego tematu'
       post: 'wpis #%{postNumber}'
@@ -152,10 +158,10 @@ pl_PL:
       email: 'wyślij ten odnośnik przez email'
     action_codes:
       public_topic: "Upublicznij ten temat %{when}"
-      private_topic: "Uprywatnij ten temat %{when}"
       split_topic: "podziel ten temat %{when}"
       invited_user: "%{who} został zaproszony %{when}"
       invited_group: "%{who} został zaproszony %{when}"
+      user_left: "%{who} usunął siebie z tej konwersacji %{when}"
       removed_user: "%{who} został usunięty %{when}"
       removed_group: "%{who} został usunięty %{when}"
       autoclosed:
@@ -177,13 +183,11 @@ pl_PL:
         enabled: 'wylistowanie %{when}'
         disabled: 'odlistowanie %{when}'
       banner:
-        enabled: 'Ten temat został ustawiony jako baner %{when}. Będzie widoczny na górze każdej strony, póki nie zostanie ukryty przez użytkownika.'
+        enabled: 'Ten temat został ustawiony jako baner . Będzie widoczny na górze każdej strony, póki nie zostanie ukryty przez użytkownika.'
         disabled: 'Ten temat nie jest już banerem. Nie będzie dalej wyświetlany na górze każdej strony.'
     topic_admin_menu: "akcje administratora"
-    wizard_required: "Witaj na Twoim na nowym forum opartym na Discourse! Rozpocznij konfigurację w <a href='%{url}' data-auto-route='true'>panelu konfiguracyjnym</a> ✨"
+    wizard_required: "Witaj na Twoim na nowym forum Discourse! Zacznijmy od <a href='%{url}' data-auto-route='true'>kreatora ustawień</a> ✨"
     emails_are_disabled: "Wysyłanie e-maili zostało globalnie wyłączone przez administrację. Powiadomienia e-mail nie będą dostarczane."
-    bootstrap_mode_enabled: "Aby ułatwić uruchomienie Twojego nowego serwisu, znajdujesz się w trybie bootstrap. Wszyscy nowi użytkownicy otrzymają 1. poziom zaufania i będą otrzymywać codzienne podsumowania drogą mailową. To się zmieni, gdy liczba użytkowników przekroczy liczbę %{min_users}."
-    bootstrap_mode_disabled: "Tryb Bootstrap zostanie wyłączony w ciągu najbliższych 24 godzin."
     themes:
       default_description: "Domyślny"
     s3:
@@ -207,6 +211,7 @@ pl_PL:
     not_implemented: "Bardzo nam przykro, ale ta funkcja nie została jeszcze zaimplementowana."
     no_value: "Nie"
     yes_value: "Tak"
+    submit: "Prześlij"
     generic_error: "Przepraszamy, wystąpił błąd."
     generic_error_with_reason: "Wystąpił błąd: %{error}"
     sign_up: "Rejestracja"
@@ -219,10 +224,10 @@ pl_PL:
     show_help: "opcje"
     links: "Odnośniki"
     links_lowercase:
-      one: "link"
-      few: "linki"
-      many: "linków"
-      other: "linków"
+      few: linki
+      many: linków
+      one: link
+      other: linków
     faq: "FAQ"
     guidelines: "Przewodnik"
     privacy_policy: "Polityka prywatności"
@@ -246,10 +251,10 @@ pl_PL:
     max_of_count: "max z {{count}}"
     alternation: "lub"
     character_count:
-      one: "1 znak"
-      few: "{{count}} znaki"
-      many: "{{count}} znaków"
-      other: "{{count}} znaków"
+      few: '{{count}} znaki'
+      many: '{{count}} znaków'
+      one: 1 znak
+      other: '{{count}} znaków'
     suggested_topics:
       title: "Sugerowane tematy"
       pm_title: "sugerowane wiadomości"
@@ -261,8 +266,8 @@ pl_PL:
       our_moderators: "Moderatoratorzy"
       stat:
         all_time: "Ogółem"
-        last_7_days: "Ostatnich 7 dni"
-        last_30_days: "Ostatnie 30 dni"
+        last_7_days: "Ostatnie 7"
+        last_30_days: "Ostatnie 30"
       like_count: "Lajki"
       topic_count: "Tematy"
       post_count: "Wpisy"
@@ -284,21 +289,20 @@ pl_PL:
       remove: "Usuń zakładkę"
       confirm_clear: "Czy na pewno chcesz usunąć wszystkie zakładki ustawione w tym temacie?"
     topic_count_latest:
-      one: "{{count}} nowy lub zaktualizowany temat"
-      few: "{{count}} nowe lub zaktualizowane tematy"
-      many: "{{count}} nowych lub zaktualizowanych tematów"
-      other: "{{count}} nowych lub zaktualizowanych tematów"
+      few: Zobacz {{count}} nowe albo zaktualizowane tematy
+      many: Zobacz {{count}} nowych albo zaktualizowanych tematów
+      one: Zobacz {{count}} nowy albo zaktualizowany temat
+      other: Zobacz {{count}} nowych albo zaktualizowanych tematów
     topic_count_unread:
-      one: "{{count}} nieprzeczytany temat."
-      few: "{{count}} nieprzeczytane tematy."
-      many: "{{count}} nieprzeczytanych tematów."
-      other: "{{count}} nieprzeczytanych tematów."
+      few: Zobacz {{count}} nieprzeczytane tematy
+      many: Zobacz {{count}} nieprzeczytanych tematów
+      one: Zobacz {{count}} nieprzeczytany temat
+      other: Zobacz {{count}} nieprzeczytanych tematów
     topic_count_new:
-      one: "{{count}} nowy temat."
-      few: "{{count}} nowe tematy."
-      many: "{{count}} nowych tematów."
-      other: "{{count}} nowych tematów."
-    click_to_show: "Kliknij aby zobaczyć."
+      few: Zobacz {{count}} nowe tematy
+      many: Zobacz {{count}} nowych tematów
+      one: Zobacz {{count}} nowy temat
+      other: Zobacz {{count}} nowych tematów
     preview: "podgląd"
     cancel: "anuluj"
     save: "Zapisz zmiany"
@@ -311,6 +315,7 @@ pl_PL:
     pasting: "Wklejanie..."
     enable: "Włącz"
     disable: "Wyłącz"
+    continue: "Kontynuuj"
     undo: "Cofnij"
     revert: "Przywróć"
     failed: "Niepowodzenie"
@@ -335,20 +340,20 @@ pl_PL:
       cancel: "Anuluj"
       view_pending: "wyświetl oczekujące wpisy"
       has_pending_posts:
-        one: "Ten temat posiada <b>1</b> wpis oczekujący na akceptację"
-        few: "Ten temat posiada <b>{{count}}</b> wpisy oczekujące na akceptację"
-        many: "Ten temat posiada <b>{{count}}</b> wpisów oczekujących na akceptację"
-        other: "Ten temat posiada <b>{{count}}</b> wpisów oczekujących na akceptację"
+        few: Ten temat posiada <b>{{count}}</b> wpisy oczekujące na akceptację
+        many: Ten temat posiada <b>{{count}}</b> wpisów oczekujących na akceptację
+        one: Ten temat posiada <b>1</b> wpis oczekujący na akceptację
+        other: Ten temat posiada <b>{{count}}</b> wpisów oczekujących na akceptację
       confirm: "Zapisz zmiany"
       delete_prompt: "Czy na pewno chcesz usunąć <b>%{username}</b>? To spowoduje usunięcie wszystkich wiadomości, zablokowanie adresu e-mail i adresu IP tego użytkownika."
       approval:
         title: "Wpis wymaga zatwierdzenia"
         description: "Twój nowy wpis został umieszczony w kolejce i pojawi się po zatwierdzeniu przez moderatora. Prosimy o cierpliwość."
         pending_posts:
-          one: "Posiadasz <strong>1</strong> oczekujący wpis."
-          few: "Posiadasz <strong>{{count}}</strong> oczekujące wpisy."
-          many: "Posiadasz <strong>{{count}}</strong> oczekujących wpisów."
-          other: "Posiadasz <strong>{{count}}</strong> oczekujących wpisów."
+          few: Posiadasz <strong>{{count}}</strong> oczekujące wpisy.
+          many: Posiadasz <strong>{{count}}</strong> oczekujących wpisów.
+          one: Posiadasz <strong>1</strong> oczekujący wpis.
+          other: Posiadasz <strong>{{count}}</strong> oczekujących wpisów.
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> tworzy <a href='{{topicUrl}}'>temat</a>"
@@ -382,10 +387,10 @@ pl_PL:
       posts_read: "Przeczytane"
       posts_read_long: "Przeczytane wpisy"
       total_rows:
-        one: "1 użytkownik"
-        few: "%{count} użytkownicy"
-        many: "%{count} użytkowników"
-        other: "%{count} użytkowników"
+        few: '%{count} użytkownicy'
+        many: '%{count} użytkowników'
+        one: 1 użytkownik
+        other: '%{count} użytkowników'
     group_histories:
       actions:
         change_group_setting: "Zmień ustawienia grupy"
@@ -394,22 +399,31 @@ pl_PL:
         make_user_group_owner: "Nadaj prawa właściciela"
         remove_user_as_group_owner: "Usuń prawa właściciela"
     groups:
-      logs:
-        title: "Logi"
-        when: "Kiedy"
-        action: "Akcja"
-        acting_user: "Uczestniczący użytkownik "
-        target_user: "Wybrany użytkownik"
-        subject: "Temat"
-        details: "Szczegóły"
-        from: "Od"
-        to: "Do"
-      edit:
-        title: 'Edytuj grupę'
+      add_members:
+        title: "Dodaj członków"
+        usernames: "Nazwy użytkowników"
+      manage:
+        title: 'Zarządzaj'
+        name: 'Nazwa'
         full_name: 'Pełna nazwa'
-        add_members: "Dodaj użytkowników"
-        delete_member_confirm: "Czy usunąć użytkownika '%{username}' z grupy '%{group}'?"
-      name_placeholder: "Nazwa grupy, bez spacji, takie same zasady jak przy nazwie użytkownika"
+        add_members: "Dodaj członków"
+        delete_member_confirm: "Usunąć '%{username}' z grupy '%{group}'?"
+        profile:
+          title: Profil
+        interaction:
+          title: Interakcja
+          notification: Powiadomienie
+        membership:
+          title: Członkostwo
+          access: Dostęp
+        logs:
+          title: "Logi"
+          when: "Kiedy"
+          action: "Akcja"
+          subject: "Temat"
+          details: "Szczegóły"
+          from: "Od"
+          to: "Do"
       public_admission: "Zezwól wszystkim użytkownikom na dołączanie do tej grupy (widoczność grupy musi być ustawiona na publiczną)"
       public_exit: "Zezwól wszystkim użytkownikom na opuszczanie tej grupy"
       empty:
@@ -420,13 +434,9 @@ pl_PL:
         topics: "Nie ma wątków stworzonych przez użytkowników tej grupy"
         logs: "Nie ma logów dla tej grupy"
       add: "Dodaj"
-      join: "Dołącz do grupy"
-      leave: "Opuść grupę"
-      request: "Żądanie dołączenia do grupy"
+      join: "Dołącz"
+      leave: "Opuść"
       message: "Wiadomość"
-      automatic_group: Automatyczna grupa
-      closed_group: Zamknięta grupa
-      is_group_user: "Jesteś członkiem tej grupy"
       allow_membership_requests: "Zezwól użytkownikom na wysyłanie zaproszeń do właścicieli grupy."
       membership_request_template: "Wyświetl niestandardowy szablon użytkownikom, w momencie wysyłania wniosku o członkostwo."
       membership_request:
@@ -435,31 +445,48 @@ pl_PL:
         reason: "Poinformuj właścicieli grupy dlaczego do niej należysz."
       membership: "Członkostwo"
       name: "Nazwa"
-      user_count: "Ilość użytkowników"
+      group_name: "Nazwa grupy"
+      user_count: "Użytkownicy"
       bio: "O grupie"
-      selector_placeholder: "Dodaj członków"
+      selector_placeholder: "podaj nazwę użytkownika"
       owner: "właściciel"
       index:
         title: "Grupy"
+        all: "Wszystkie grupy"
         empty: "Nie ma widocznych grup"
+        owner_groups: "Grupy, które do mnie należą"
+        close_groups: "Zamknięte grupy"
+        closed: "Zamknięta"
+        public: "Publiczna"
+        private: "Prywatna"
+        public_groups: "Publiczne grupy"
+        close_group: Zamknij grupę
+        my_groups: "Moje grupy"
+        group_type: "Rodzaj grupy"
+        is_group_user: "Członek"
+        is_group_owner: "Właściciel"
       title:
-        one: "Grupa"
-        few: "Grupy"
-        many: "Grup"
-        other: "Grup"
+        few: Grupy
+        many: Grup
+        one: Grupa
+        other: Grup
       activity: "Aktywność"
-      members: "Członkowie"
+      members:
+        title: "Członkowie"
+        filter_placeholder_admin: "nazwa użytkownika lub adres e-mail"
+        filter_placeholder: "nazwa użytkownika"
+        remove_member: "Usuń członka"
+        remove_member_description: "Usuń <b>%{username}</b> z tej grupy"
+        make_owner: "Uczyń właścicielem"
+        make_owner_description: "Uczyń <b>%{username}</b> właścicielem tej grupy"
+        remove_owner: "Usuń z funkcji właściciela"
+        remove_owner_description: "Usuń <b>%{username}</b> z funkcji właściciela tej grupy"
+        owner: "Właściciel"
       topics: "Tematy"
       posts: "Wpisów"
       mentions: "Wzmianki"
       messages: "Wiadomości"
       notification_level: "Domyślny poziom powiadomień dla wiadomości grupy."
-      visibility_levels:
-        title: "Kto może widzieć grupę?"
-        public: "Wszyscy"
-        members: "Właściciele grupy, członkowie i administratorzy"
-        staff: "Właściciele grupy i zespół"
-        owners: "Właściciele grupy i administratorzy"
       alias_levels:
         mentionable: "Kto może @wspomnieć tę grupę?"
         messageable: "Kto może wysyłać wiadomości do tej grupy?"
@@ -468,9 +495,6 @@ pl_PL:
         mods_and_admins: "Tylko moderatorzy i administratorzy"
         members_mods_and_admins: "Tylko członkowie grupy, moderatorzy i administratorzy"
         everyone: "Wszyscy"
-      trust_levels:
-        title: "Domyślny poziom zaufania przyznawany nowych użytkownikom:"
-        none: "Brak"
       notifications:
         watching:
           title: "Obserwowanie"
@@ -495,23 +519,22 @@ pl_PL:
       flair_color_placeholder: "(Opcjonalne) Kolor w formacie Hex"
       flair_preview_icon: "Podgląd ikony"
       flair_preview_image: "Podgląd obrazka"
-      flair_note: "Uwaga: Będzie wyświetlana jedynie odznaka grupy głównej użytkownika "
     user_action_groups:
-      '1': "Przyznane lajki"
-      '2': "Otrzymane lajki"
-      '3': "Zakładki"
-      '4': "Tematy"
-      '5': "Odpowiedzi"
-      '6': "Odpowiedzi"
-      '7': "Wzmianki"
-      '9': "Cytaty"
-      '11': "Edycje"
-      '12': "Wysłane"
-      '13': "Skrzynka odbiorcza"
-      '14': "Oczekujące"
+      "1": "Przyznane lajki"
+      "2": "Otrzymane lajki"
+      "3": "Zakładki"
+      "4": "Tematy"
+      "5": "Odpowiedzi"
+      "6": "Odpowiedzi"
+      "7": "Wzmianki"
+      "9": "Cytaty"
+      "11": "Edycje"
+      "12": "Wysłane"
+      "13": "Skrzynka odbiorcza"
+      "14": "Oczekujące"
     categories:
       all: "wszystkie kategorie"
-      all_subcategories: "wszystkie"
+      all_subcategories: "wszystkie w %{categoryName}"
       no_subcategory: "żadne"
       category: "Kategoria"
       category_list: "Wyświetl listę kategorii"
@@ -530,15 +553,15 @@ pl_PL:
       toggle_ordering: "przełącz kolejność kontroli"
       subcategories: "Podkategorie"
       topic_sentence:
-        one: "1 temat"
-        few: "Kilka tematów"
-        many: "%{count} tematów"
-        other: "%{count} tematów"
+        few: Kilka tematów
+        many: '%{count} tematów'
+        one: 1 temat
+        other: '%{count} tematów'
       topic_stat_sentence:
-        one: "ostatni %{unit}: %{count} nowy temat."
-        few: "ostatni %{unit}: %{count} nowe tematy."
-        many: "ostatni %{unit}: %{count} nowych tematów."
-        other: "ostatni %{unit}: %{count} nowych tematów."
+        few: 'ostatni %{unit}: %{count} nowe tematy.'
+        many: 'ostatni %{unit}: %{count} nowych tematów.'
+        one: 'ostatni %{unit}: %{count} nowy temat.'
+        other: 'ostatni %{unit}: %{count} nowych tematów.'
     ip_lookup:
       title: Wyszukiwanie adresu IP
       hostname: Nazwa hosta
@@ -573,6 +596,7 @@ pl_PL:
       activity_stream: "Aktywność"
       preferences: "Ustawienia"
       expand_profile: "Rozwiń"
+      collapse_profile: "Zwiń"
       bookmarks: "Zakładki"
       bio: "O mnie"
       invited_by: "Zaproszono przez"
@@ -580,7 +604,7 @@ pl_PL:
       notifications: "Powiadomienia"
       statistics: "Statystyki"
       desktop_notifications:
-        label: "Powiadomienia systemowe"
+        label: "Natychmiastowe powiadomienia"
         not_supported: "Powiadomienia nie są wspierane przez tę przeglądarkę. Przepraszamy."
         perm_default: "Włącz powiadomienia"
         perm_denied_btn: "Brak uprawnień"
@@ -588,14 +612,15 @@ pl_PL:
         disable: "Wyłącz powiadomienia"
         enable: "Włącz powiadomienia"
         each_browser_note: "Uwaga: to ustawienie musisz zmienić w każdej przeglądarce której używasz."
+        consent_prompt: "Czy chcesz otrzymywać natychmiastowe powiadomienia, gdy ktoś odpowie na twój post?"
       dismiss: 'Odrzuć'
       dismiss_notifications: "Odrzuć wszystkie"
       dismiss_notifications_tooltip: "Oznacz wszystkie powiadomienia jako przeczytane"
       first_notification: "Twoje pierwsze powiadomienie! Kliknij aby zacząć."
       disable_jump_reply: "Po odpowiedzi nie przechodź do nowego wpisu"
       dynamic_favicon: "Pokazuj licznik powiadomień na karcie jako dynamiczny favicon"
-      theme_default_on_all_devices: "Ustaw ten motyw jako domyślny na wszystkich moich urządzeniach"
-      allow_private_messages: "Zezwól aby użytkownicy wysyłali mi wiadomości prywatne"
+      theme_default_on_all_devices: "Ustaw jako mój domyślny motyw na wszystkich urządzeniach"
+      allow_private_messages: "Pozwól innym użytkownikom wysyłać do mnie prywatne wiadomości"
       external_links_in_new_tab: "Otwieraj wszystkie zewnętrzne odnośniki w nowej karcie"
       enable_quoting: "Włącz cytowanie zaznaczonego tekstu"
       change: "zmień"
@@ -639,7 +664,7 @@ pl_PL:
       delete_account: "Usuń moje konto"
       delete_account_confirm: "Czy na pewno chcesz usunąć swoje konto? To nieodwracalne!"
       deleted_yourself: "Twoje konto zostało usunięte."
-      delete_yourself_not_allowed: "Nie możesz usunąć swojego konta w tej chwili. Skontaktuj się z administratorem, by usunął Twoje konto za Ciebie."
+      delete_yourself_not_allowed: "Skontaktuj się z członkiem ekipy jeśli chcesz, aby twoje konto zostało usunięte."
       unread_message_count: "Wiadomości"
       admin_delete: "Usuń"
       users: "Użytkownicy"
@@ -672,6 +697,7 @@ pl_PL:
         move_to_archive: "Archiwum"
         failed_to_move: "Nie udało się przenieść zaznaczonych wiadomości (prawdopodobnie wystąpił problem z Twoim połączeniem)"
         select_all: "Zaznacz wszystko"
+        tags: "Tagi"
       preferences_nav:
         account: "Konto"
         profile: "Profil"
@@ -689,6 +715,17 @@ pl_PL:
         set_password: "Ustaw hasło"
         choose_new: "Wyberz nowe hasło"
         choose: "Wybierz hasło"
+      second_factor:
+        title: "Dwuskładnikowe uwierzytelnianie"
+        disable: "Wyłącz dwuskładnikowe uwierzytelnianie"
+        confirm_password_description: "Potwierdź swoje hasło, aby kontynuować"
+        label: "Kod"
+        enable_description: |
+          Zeskanuj ten kod QR za pomocą wspieranej aplikacji (<a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target="_blank">Android</a> – <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8" target="_blank">iOS</a>– <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a>) i podaj swój kod uwierzytelniający.
+        disable_description: "Podaj kod uwierzytelniający ze swojej aplikacji"
+        show_key_description: "Wpisz ręcznie"
+        extended_description: |
+          Dwuskładnikowe uwierzytelnianie zwiększa bezpieczeństwo twojego konta dzięki wymogowi podawanie jednorazowego tokenu oprócz twego hasła przy każdej próbie zalogowania. Tokeny można generować na urządzeniach z systemem <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target='_blank'>Android</a>, <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8">iOS</a> lub <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a>.
       change_about:
         title: "Zmień O mnie"
         error: "Wystąpił błąd podczas zmiany tej wartości."
@@ -729,10 +766,10 @@ pl_PL:
         authenticated: "Twój email został potwierdzony przez {{provider}}"
         frequency_immediately: "Wyślemy powiadomienie jeśli wskazana rzecz nie została jeszcze przez Ciebie przeczytana."
         frequency:
-          one: "Otrzymasz e-mail tylko jeśli nie widzieliśmy Cię w ciągu ostatniej minuty."
-          few: "Otrzymasz e-mail tylko jeśli nie widzieliśmy Cię w ciągu ostatnich {{count}} minut."
-          many: "Otrzymasz e-mail tylko jeśli nie widzieliśmy Cię w ciągu ostatnich {{count}} minut."
-          other: "Otrzymasz e-mail tylko jeśli nie widzieliśmy Cię w ciągu ostatnich {{count}} minut."
+          few: Otrzymasz e-mail tylko jeśli nie widzieliśmy Cię w ciągu ostatnich {{count}} minut.
+          many: Otrzymasz e-mail tylko jeśli nie widzieliśmy Cię w ciągu ostatnich {{count}} minut.
+          one: Otrzymasz e-mail tylko jeśli nie widzieliśmy Cię w ciągu ostatniej minuty.
+          other: Otrzymasz e-mail tylko jeśli nie widzieliśmy Cię w ciągu ostatnich {{count}} minut.
       name:
         title: "Pełna nazwa"
         instructions: "twoja pełna nazwa (opcjonalnie)"
@@ -763,8 +800,6 @@ pl_PL:
       created: "Dołączył"
       log_out: "Wyloguj"
       location: "Lokalizacja"
-      card_badge:
-        title: "Odznaka karty użytkownika"
       website: "Strona internetowa"
       email_settings: "Email"
       like_notification_frequency:
@@ -818,12 +853,12 @@ pl_PL:
         title: "Zaproszenia"
         user: "Zaproszony(-a) użytkownik(-czka)"
         sent: "Wysłane"
-        none: "Nie ma żadnych zaproszeń do wyświetlenia."
+        none: "Brak zaproszeń do wyświetlenia."
         truncated:
-          one: "Wyświetlanie pierwszego zaproszenia."
-          few: "Wyświetlanie {{count}} pierwszych zaproszeń."
-          many: "Wyświetlanie {{count}} pierwszych zaproszeń."
-          other: "Wyświetlanie {{count}} pierwszych zaproszeń."
+          few: Wyświetlanie {{count}} pierwszych zaproszeń.
+          many: Wyświetlanie {{count}} pierwszych zaproszeń.
+          one: Wyświetlanie pierwszego zaproszenia.
+          other: Wyświetlanie {{count}} pierwszych zaproszeń.
         redeemed: "Cofnięte zaproszenia"
         redeemed_tab: "Przyjęte"
         redeemed_tab_with_count: "Zrealizowane ({{count}})"
@@ -869,40 +904,45 @@ pl_PL:
         stats: "Statystyki"
         time_read: "czas odczytu"
         topic_count:
-          one: "utworzono temat"
-          few: "utworzono tematów"
-          many: "utworzono tematy"
-          other: "utworzono tematy"
+          few: utworzono tematów
+          many: utworzono tematy
+          one: utworzono temat
+          other: utworzono tematy
         post_count:
-          one: "utworzono post"
-          few: "utworzonych postów"
-          many: "utworzono posty"
-          other: "utworzono posty"
+          few: utworzonych postów
+          many: utworzono posty
+          one: utworzono post
+          other: utworzono posty
         likes_given:
-          one: "dano"
-          few: "dano"
-          many: "dano"
-          other: "dano"
+          few: dano
+          many: dano
+          one: dano
+          other: dano
         likes_received:
-          one: "otrzymano"
-          few: "otrzymano"
-          many: "otrzymano"
-          other: "otrzymano"
+          few: otrzymano
+          many: otrzymano
+          one: otrzymano
+          other: otrzymano
         days_visited:
-          one: "dzień odwiedzin"
-          few: "dni odwiedzin"
-          many: "dni odwiedzin"
-          other: "dni odwiedzin"
+          few: dni odwiedzin
+          many: dni odwiedzin
+          one: dzień odwiedzin
+          other: dni odwiedzin
+        topics_entered:
+          few: przeczytane tematy
+          many: przeczytane tematy
+          one: przeczytany temat
+          other: przeczytane tematy
         posts_read:
-          one: "przeczytany post"
-          few: "przeczytanych postów"
-          many: "przeczytane posty"
-          other: "przeczytane posty"
+          few: przeczytanych postów
+          many: przeczytane posty
+          one: przeczytany post
+          other: przeczytane posty
         bookmark_count:
-          one: "zakładka"
-          few: "zakładki"
-          many: "zakładki"
-          other: "zakładki"
+          few: zakładki
+          many: zakładki
+          one: zakładka
+          other: zakładki
         top_replies: "Najlepsze odpowiedzi"
         no_replies: "Póki co brak odpowiedzi."
         more_replies: "Więcej odpowiedzi"
@@ -928,6 +968,7 @@ pl_PL:
         header_title: "profil, wiadomości, zakładki i ustawienia"
       title:
         title: "Tytuł"
+        none: "(brak)"
       filters:
         all: "Wszystkie"
       stream:
@@ -970,10 +1011,10 @@ pl_PL:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> osiągnął ustawiony limit %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> przekroczył ustawiony limit %{siteSettingRate}."
       rate:
-        one: "1 błąd/%{duration}"
-        few: "%{count} błędy/%{duration}"
-        many: "%{count} błędów/%{duration}"
-        other: "%{count} błędów/%{duration}"
+        few: '%{count} błędy/%{duration}'
+        many: '%{count} błędów/%{duration}'
+        one: 1 błąd/%{duration}
+        other: '%{count} błędów/%{duration}'
     learn_more: "dowiedz się więcej…"
     all_time: 'łącznie'
     all_time_desc: 'łącznie utworzonych tematów'
@@ -991,9 +1032,9 @@ pl_PL:
     time_read: Przeczytane
     last_reply_lowercase: ostatnia odpowiedź
     replies_lowercase:
-      one: odpowiedź
       few: odpowiedzi
       many: odpowiedzi
+      one: odpowiedź
       other: odpowiedzi
     signup_cta:
       sign_up: "Rejestracja"
@@ -1047,10 +1088,13 @@ pl_PL:
       title: "Logowanie"
       username: "Użytkownik"
       password: "Hasło"
+      second_factor_title: "Dwuskładnikowe uwierzytelnianie"
+      second_factor_description: "Podaj kod uwierzytelniający ze swojej aplikacji:"
       email_placeholder: "adres email lub nazwa użytkownika"
       caps_lock_warning: "Caps Lock jest włączony"
       error: "Nieznany błąd"
       rate_limit: "Poczekaj, zanim ponowisz próbę logowania."
+      blank_username: "Podaj swój adres e-mail lub nazwę użytkownika."
       blank_username_or_password: "Podaj swój email lub nazwę użytkownika i hasło"
       reset_password: 'Resetuj hasło'
       logging_in: "Uwierzytelnianie…"
@@ -1118,15 +1162,28 @@ pl_PL:
       categories_only: "Tylko kategorie"
       categories_with_featured_topics: "Kategorie z wybranymi tematami"
       categories_and_latest_topics: "Kategorie i ostatnie tematy"
+      categories_and_top_topics: "Kategorie i najlepsze tematy"
     shortcut_modifier_key:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    conditional_loading_section:
+      loading: Ładowanie...
     select_kit:
       default_header_text: Wybierz...
       no_content: Nie znaleziono dopasowań
       filter_placeholder: Wyszukiwanie...
-      create: "Utwórz {{content}}"
+      create: "Stwórz: '{{content}}'"
+      max_content_reached:
+        few: Może wybrać tylko {{count}} elementy.
+        many: Możesz wybrać tylko {{count}} elementów.
+        one: Możesz wybrać tylko jeden element.
+        other: Możesz wybrać tylko {{count}} elementów.
+      min_content_not_reached:
+        few: Wybierz co najmniej {{count}} elementy.
+        many: Wybierz co najmniej {{count}} elementów.
+        one: Wybierz co najmniej jeden element.
+        other: Wybierz co najmniej {{count}} elementów.
     emoji_picker:
       filter_placeholder: Szukaj emoji
       people: Ludzie
@@ -1144,6 +1201,10 @@ pl_PL:
       medium_tone: Średni kolor skóry
       medium_dark_tone: Średnio ciemny kolor skóry
       dark_tone: Ciemny kolor skóry
+    shared_drafts:
+      notice: "Ten temat jest widoczny tylko użytkowników mających dostęp do kategorii <b>{{category}}</b>."
+      destination_category: "Kategoria docelowa"
+      publishing: "Publikowanie tematu..."
     composer:
       emoji: "Emoji :)"
       more_emoji: "więcej…"
@@ -1161,10 +1222,10 @@ pl_PL:
       similar_topics: "Twój temat jest podobny do…"
       drafts_offline: "szkice offline"
       group_mentioned:
-        one: "Wspominając {{group}}, powiadomisz <a href='{{group_link}}'>1 osobę</a> – czy jesteś pewien?"
-        few: "Wspominając {{group}}, powiadomisz <a href='{{group_link}}'>{{count}} osoby</a> – czy jesteś pewien?"
-        many: "Wspominając {{group}}, powiadomisz <a href='{{group_link}}'>{{count}} osób</a> – czy jesteś pewien?"
-        other: "Wspominając {{group}}, powiadomisz <a href='{{group_link}}'>{{count}} osób</a> –czy jesteś pewien?"
+        few: Wspominając {{group}}, powiadomisz <a href='{{group_link}}'>{{count}} osoby</a> – czy jesteś pewien?
+        many: Wspominając {{group}}, powiadomisz <a href='{{group_link}}'>{{count}} osób</a> – czy jesteś pewien?
+        one: Wspominając {{group}}, powiadomisz <a href='{{group_link}}'>1 osobę</a> – czy jesteś pewien?
+        other: Wspominając {{group}}, powiadomisz <a href='{{group_link}}'>{{count}} osób</a> –czy jesteś pewien?
       cannot_see_mention:
         category: "Wspomniałeś o {{username}} lecz nie zostaną oni powiadomieni ponieważ nie mają dostępu do tej kategorii. Dodaj ich do grupy która ma dostęp do tej kategorii."
         private: "Wspomniałeś o {{username}} lecz nie zostaną powiadomieni ponieważ nie mogą odczytać tej wiadomości . Będziesz musiał ich zaprosić do odczytania tej wiadomości "
@@ -1177,6 +1238,7 @@ pl_PL:
         post_length: "Wpis musi zawierać przynajmniej {{min}} znaków"
         try_like: 'Może warto użyć przycisku <i class="fa fa-heart"></i>?'
         category_missing: "Musisz wybrać kategorię"
+        tags_missing: "Musisz wybrać co najmniej {{count}} tagów"
       save_edit: "Zapisz zmiany"
       reply_original: "Odpowiedz na Oryginalny Temat"
       reply_here: "Odpowiedz tutaj"
@@ -1233,15 +1295,15 @@ pl_PL:
     notifications:
       tooltip:
         regular:
-          one: "1 nieprzeczytane powiadomienie"
-          few: "Nieprzeczytanych powiadomień: {{count}}"
-          many: "Nieprzeczytanych powiadomień: {{count}}"
-          other: "Nieprzeczytanych powiadomień: {{count}}"
+          few: 'Nieprzeczytanych powiadomień: {{count}}'
+          many: 'Nieprzeczytanych powiadomień: {{count}}'
+          one: 1 nieprzeczytane powiadomienie
+          other: 'Nieprzeczytanych powiadomień: {{count}}'
         message:
-          one: "Nieodczytane wiadomości: {{count}}"
-          few: "Nieodczytane wiadomości: {{count}}"
-          many: "Nieodczytane wiadomości: {{count}}"
-          other: "Nieodczytane wiadomości: 1"
+          few: 'Nieodczytane wiadomości: {{count}}'
+          many: 'Nieodczytane wiadomości: {{count}}'
+          one: 'Nieodczytane wiadomości: {{count}}'
+          other: 'Nieodczytane wiadomości: 1'
       title: "powiadomienia o wywołanej @nazwie, odpowiedzi do twoich wpisów i tematów, prywatne wiadomości, itp"
       none: "Nie udało się załadować listy powiadomień."
       empty: "Nie znaleziono powiadomień."
@@ -1256,10 +1318,10 @@ pl_PL:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} i 1 inna osoba</span> {{description}}"
-        few: "<span>{{username}}, {{username2}} i {{count}} inne osoby</span> {{description}}"
-        many: "<span>{{username}}, {{username2}} i {{count}} innych osób</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} i {{count}} innych osób</span> {{description}}"
+        few: <span>{{username}}, {{username2}} i {{count}} inne osoby</span> {{description}}
+        many: <span>{{username}}, {{username2}} i {{count}} innych osób</span> {{description}}
+        one: <span>{{username}}, {{username2}} i 1 inna osoba</span> {{description}}
+        other: <span>{{username}}, {{username2}} i {{count}} innych osób</span> {{description}}
       private_message: "<span>{{username}}</span> {{description}}"
       invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
       invited_to_topic: "<span>{{username}}</span> {{description}}"
@@ -1270,33 +1332,16 @@ pl_PL:
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>Nowy temat</span> {{description}}"
       group_message_summary:
-        one: "masz {{count}} wiadomość w skrzynce odbiorczej {{group_name}}"
-        few: "masz {{count}} wiadomości w skrzynce odbiorczej {{group_name}}"
-        many: "masz {{count}} wiadomości w skrzynce odbiorczej {{group_name}}"
-        other: "masz {{count}} wiadomości w skrzynce odbiorczej {{group_name}}"
-      alt:
-        mentioned: "Wywołanie przez"
-        quoted: "Cytowanie przez"
-        replied: "Odpowiedź"
-        posted: "Autor wpisu"
-        edited: "Edycja twojego wpisu"
-        liked: "Lajk twojego wpisu"
-        private_message: "Prywatna wiadomość od"
-        invited_to_private_message: "Zaproszenie do prywatnej wiadomości od"
-        invited_to_topic: "Zaproszenie do tematu od"
-        invitee_accepted: "Zaproszenie zaakceptowane przez"
-        moved_post: "Twój wpis został przeniesiony przez"
-        linked: "Linkownie do twojego wpisu"
-        granted_badge: "Przyznanie odznaki"
-        group_message_summary: "Wiadomości w grupowej skrzynce odbiorczej"
-        topic_reminder: "Przypomnienie"
+        few: masz {{count}} wiadomości w skrzynce odbiorczej {{group_name}}
+        many: masz {{count}} wiadomości w skrzynce odbiorczej {{group_name}}
+        one: masz {{count}} wiadomość w skrzynce odbiorczej {{group_name}}
+        other: masz {{count}} wiadomości w skrzynce odbiorczej {{group_name}}
       popup:
         mentioned: '{{username}} wspomina o tobie w "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} wspomniał o Tobie w "{{topic}}" - {{site_title}}'
         quoted: '{{username}} cytuje cie w "{{topic}}" - {{site_title}}'
         replied: '{{username}} odpowiada na twój wpis w "{{topic}}" - {{site_title}}'
         posted: '{{username}} pisze w "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} wysyła ci prywatną wiadomość w "{{topic}}" - {{site_title}}'
         linked: '{{username}} linkuje do twojego wpisu z "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Dodaj obraz"
@@ -1358,7 +1403,7 @@ pl_PL:
           tracking: Śledzę
           private: W moich wiadomościach
           bookmarks: Dodałeś do zakładek
-          first: 'tylko najnowsze posty '
+          first: "tylko najnowsze posty "
           pinned: są przypięte
           unpinned: są nie przypięte
           seen: Przeczytałem
@@ -1408,10 +1453,10 @@ pl_PL:
         notification_level: "Powiadomienia"
         choose_new_category: "Wybierz nową kategorię dla tematów:"
         selected:
-          one: "Zaznaczono <b>1</b> temat."
-          few: "Zaznaczono <b>{{count}}</b> tematy."
-          many: "Zaznaczono <b>{{count}}</b> tematów."
-          other: "Zaznaczono <b>{{count}}</b> tematów."
+          few: Zaznaczono <b>{{count}}</b> tematy.
+          many: Zaznaczono <b>{{count}}</b> tematów.
+          one: Zaznaczono <b>1</b> temat.
+          other: Zaznaczono <b>{{count}}</b> tematów.
         change_tags: "Zmień tagi"
         append_tags: "Dodaj tagi"
         choose_new_tags: "Wybierz nowe tagi dla tych tematów:"
@@ -1443,14 +1488,11 @@ pl_PL:
         bookmarks: "Nie ma więcej zakładek."
         search: "Nie znaleziono więcej wyników."
     topic:
-      unsubscribe:
-        stop_notifications: "Będziesz otrzymywać mniej powiadomień o <strong>{{title}}</strong>"
-        change_notification_state: "Twój aktualny stan powiadomień to"
       filter_to:
-        one: "1 post w temacie"
-        few: "{{count}} posty w temacie"
-        many: "{{count}} postów w temacie"
-        other: "{{count}} postów w temacie"
+        few: '{{count}} posty w temacie'
+        many: '{{count}} postów w temacie'
+        one: 1 post w temacie
+        other: '{{count}} postów w temacie'
       create: 'Nowy temat'
       create_long: 'Utwórz nowy temat'
       private_message: 'Napisz wiadomość'
@@ -1464,14 +1506,14 @@ pl_PL:
       new: 'nowy temat'
       unread: 'nieprzeczytane'
       new_topics:
-        one: '1 nowy temat'
         few: '{{count}} nowe tematy'
         many: '{{count}} nowych tematów'
+        one: 1 nowy temat
         other: '{{count}} nowych tematów'
       unread_topics:
-        one: '1 nieprzeczytany temat'
         few: '{{count}} nieprzeczytane tematy'
         many: '{{count}} nieprzeczytanych tematów'
+        one: 1 nieprzeczytany temat
         other: '{{count}} nieprzeczytanych tematów'
       title: 'Temat'
       invalid_access:
@@ -1485,25 +1527,25 @@ pl_PL:
         title: "Temat nie został znaleziony"
         description: "Przepraszamy, ale temat nie został znaleziony. Możliwe, że został usunięty przez moderatora?"
       total_unread_posts:
-        one: "masz 1 nieprzeczytany wpis w tym temacie"
-        few: "masz {{count}} nieprzeczytane wpisy w tym temacie"
-        many: "masz {{count}} nieprzeczytanych wpisów w tym temacie"
-        other: "masz {{count}} nieprzeczytanych wpisów w tym temacie"
+        few: masz {{count}} nieprzeczytane wpisy w tym temacie
+        many: masz {{count}} nieprzeczytanych wpisów w tym temacie
+        one: masz 1 nieprzeczytany wpis w tym temacie
+        other: masz {{count}} nieprzeczytanych wpisów w tym temacie
       unread_posts:
-        one: "masz 1 nieprzeczytany wpis w tym temacie"
-        few: "masz {{count}} nieprzeczytane wpisy w tym temacie"
-        many: "masz {{count}} nieprzeczytanych wpisów w tym temacie"
-        other: "masz {{count}} nieprzeczytanych wpisów w tym temacie"
+        few: masz {{count}} nieprzeczytane wpisy w tym temacie
+        many: masz {{count}} nieprzeczytanych wpisów w tym temacie
+        one: masz 1 nieprzeczytany wpis w tym temacie
+        other: masz {{count}} nieprzeczytanych wpisów w tym temacie
       new_posts:
-        one: "od Twoich ostatnich odwiedzin pojawił się 1 nowy wpis"
-        few: "od Twoich ostatnich odwiedzin pojawiły się {{count}} nowe wpisy"
-        many: "od Twoich ostatnich odwiedzin pojawiło się {{count}} nowych wpisów"
-        other: "od Twoich ostatnich odwiedzin pojawiło się {{count}} nowych wpisów"
+        few: od Twoich ostatnich odwiedzin pojawiły się {{count}} nowe wpisy
+        many: od Twoich ostatnich odwiedzin pojawiło się {{count}} nowych wpisów
+        one: od Twoich ostatnich odwiedzin pojawił się 1 nowy wpis
+        other: od Twoich ostatnich odwiedzin pojawiło się {{count}} nowych wpisów
       likes:
-        one: "temat zawiera 1 lajk"
-        few: "temat zawiera {{count}} lajki"
-        many: "temat zawiera {{count}} lajków"
-        other: "temat zawiera {{count}} lajków"
+        few: temat zawiera {{count}} lajki
+        many: temat zawiera {{count}} lajków
+        one: temat zawiera 1 lajk
+        other: temat zawiera {{count}} lajków
       back_to_list: "Wróć do Listy Tematów"
       options: "Opcje tematu"
       show_links: "pokaż odnośniki z tego tematu"
@@ -1513,7 +1555,7 @@ pl_PL:
       read_more_MF: "Masz do zobaczenia { UNREAD, plural, =0 {} one { is <a href='/unread'>1 nieprzeczytany</a> } other { are <a href='/unread'># nieprzeczytanych</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='/new'>1 nowy</a> temat} other { {BOTH, select, true{and } false {are } other{}} <a href='/new'># nowych</a> tematów} }, lub {CATEGORY, select, true {przeglądaj inne tematy w {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Przeglądaj wszystkie kategorie
       view_latest_topics: pokaż aktualne tematy
-      suggest_create_topic: Może rozpoczniesz temat?
+      suggest_create_topic: "Może rozpoczniesz temat?"
       jump_reply_up: przeskocz do wcześniejszej odpowiedzi
       jump_reply_down: przeskocz do późniejszej odpowiedzi
       deleted: "Temat został usunięty"
@@ -1564,10 +1606,10 @@ pl_PL:
         auto_reminder: "Otrzymasz przypomnienie o tym temacie %{timeLeft}."
       auto_close_title: 'Ustawienia automatycznego zamykania'
       auto_close_immediate:
-        one: "Ostatni wpis w tym temacie został zamieszczony 1 godzinę temu, więc zostanie on natychmiastowo zamknięty."
-        few: "Ostatni wpis w tym temacie został zamieszczony %{hours} godziny temu, więc zostanie on natychmiastowo zamknięty."
-        many: "Ostatni wpis w tym temacie został zamieszczony %{count} godzin temu, więc zostanie on natychmiastowo zamknięty."
-        other: "Ostatni wpis w tym temacie został zamieszczony %{hours} godzin temu, więc zostanie on natychmiastowo zamknięty."
+        few: Ostatni wpis w tym temacie został zamieszczony %{hours} godziny temu, więc zostanie on natychmiastowo zamknięty.
+        many: Ostatni wpis w tym temacie został zamieszczony %{count} godzin temu, więc zostanie on natychmiastowo zamknięty.
+        one: Ostatni wpis w tym temacie został zamieszczony 1 godzinę temu, więc zostanie on natychmiastowo zamknięty.
+        other: Ostatni wpis w tym temacie został zamieszczony %{hours} godzin temu, więc zostanie on natychmiastowo zamknięty.
       timeline:
         back: "Wstecz"
         back_description: "Wróć do ostatniego nieprzeczytanego postu"
@@ -1588,21 +1630,21 @@ pl_PL:
         title: Ustaw jak często chcesz być powiadamiany o tym temacie
         reasons:
           mailing_list_mode: "Masz włączony tryb powiadomień mailowych, więc będziesz otrzymywał powiadomienia o nowych odpowiedziach w tym temacie  za pośrednictwem poczty e-mail"
-          '3_10': 'Będziesz otrzymywał powiadomienia, ponieważ temat zawiera obserwowany przez Ciebie tag'
-          '3_6': 'Będziesz otrzymywać powiadomienia o każdym nowym wpisie i temacie, ponieważ obserwujesz tę kategorię.'
-          '3_5': 'Będziesz otrzymywać powiadomienia o każdym nowym wpisie, ponieważ włączono automatyczne obserwowanie tego tematu.'
-          '3_2': 'Będziesz otrzymywać powiadomienia o każdym nowym wpisie, ponieważ obserwujesz ten temat.'
-          '3_1': 'Będziesz otrzymywać powiadomienia, ponieważ jesteś autorem tego tematu.'
-          '3': 'Będziesz otrzymywać powiadomienia o każdym nowym wpisie, ponieważ obserwujesz ten temat.'
-          '2_8': 'Widzisz ilość nowych odpowiedzi, ponieważ śledzisz kategorię wątku.'
-          '2_4': 'Widzisz ilość nowych odpowiedzi, ponieważ wypowiedziałeś się w tym wątku.'
-          '2_2': 'Widzisz ilość nowych odpowiedzi, ponieważ śledzisz ten wątek.'
-          '2': 'Widzisz ilość nowych odpowiedzi, ponieważ przeczytałeś <a href="/u/{{username}}/preferences">ten wątek</a>.'
-          '1_2': 'Dostaniesz powiadomienie jedynie, gdy ktoś wspomni twoją @nazwę lub odpowie na twój wpis.'
-          '1': 'Dostaniesz powiadomienie jedynie, gdy ktoś wspomni twoją @nazwę lub odpowie na twój wpis.'
-          '0_7': 'Ignorujesz wszystkie powiadomienia z tej kategorii.'
-          '0_2': 'Ignorujesz wszystkie powiadomienia w tym temacie.'
-          '0': 'Ignorujesz wszystkie powiadomienia w tym temacie.'
+          "3_10": 'Będziesz otrzymywał powiadomienia, ponieważ temat zawiera obserwowany przez Ciebie tag'
+          "3_6": 'Będziesz otrzymywać powiadomienia o każdym nowym wpisie i temacie, ponieważ obserwujesz tę kategorię.'
+          "3_5": 'Będziesz otrzymywać powiadomienia o każdym nowym wpisie, ponieważ włączono automatyczne obserwowanie tego tematu.'
+          "3_2": 'Będziesz otrzymywać powiadomienia o każdym nowym wpisie, ponieważ obserwujesz ten temat.'
+          "3_1": 'Będziesz otrzymywać powiadomienia, ponieważ jesteś autorem tego tematu.'
+          "3": 'Będziesz otrzymywać powiadomienia o każdym nowym wpisie, ponieważ obserwujesz ten temat.'
+          "2_8": 'Widzisz ilość nowych odpowiedzi, ponieważ śledzisz kategorię wątku.'
+          "2_4": 'Widzisz ilość nowych odpowiedzi, ponieważ wypowiedziałeś się w tym wątku.'
+          "2_2": 'Widzisz ilość nowych odpowiedzi, ponieważ śledzisz ten wątek.'
+          "2": 'Widzisz ilość nowych odpowiedzi, ponieważ przeczytałeś <a href="/u/{{username}}/preferences">ten wątek</a>.'
+          "1_2": 'Dostaniesz powiadomienie jedynie, gdy ktoś wspomni twoją @nazwę lub odpowie na twój wpis.'
+          "1": 'Dostaniesz powiadomienie jedynie, gdy ktoś wspomni twoją @nazwę lub odpowie na twój wpis.'
+          "0_7": 'Ignorujesz wszystkie powiadomienia z tej kategorii.'
+          "0_2": 'Ignorujesz wszystkie powiadomienia w tym temacie.'
+          "0": 'Ignorujesz wszystkie powiadomienia w tym temacie.'
         watching_pm:
           title: "Obserwuj wszystko"
           description: "Dostaniesz powiadomienie o każdym nowym wpisie w tej dyskusji. Liczba nowych wpisów pojawi się obok jej tytułu na liście wiadomości."
@@ -1642,7 +1684,6 @@ pl_PL:
         visible: "Ustaw jako widoczny"
         reset_read: "Zresetuj przeczytane dane"
         make_public: "Upublicznij temat"
-        make_private: "Utwórz prywatną wiadomość"
       feature:
         pin: "Przypnij temat"
         unpin: "Odepnij temat"
@@ -1675,10 +1716,10 @@ pl_PL:
         pin_validation: "Przypięcie tego tematu wymaga podania daty."
         not_pinned: "Brak przypiętych tematów w {{categoryLink}}."
         already_pinned:
-          one: "Tematy przypięte w {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
-          few: "Tematy przypięte w {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          many: "Tematy przypięte w {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "Tematy przypięte w {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          few: 'Tematy przypięte w {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          many: 'Tematy przypięte w {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: 'Tematy przypięte w {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Tematy przypięte w {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         pin_globally: "Wyróżnij ten temat przypinając go na górze wszystkich list do"
         confirm_pin_globally: "Czy na pewno chcesz globalnie przypiąć kolejny temat? Masz już {{count}} przypiętych tematów -- zbyt wiele może obniżyć czytelność innych aktywnych tematów."
         unpin_globally: "Usuń wyróżnienie dla tego tematu odpinając go z początku wszystkich list."
@@ -1686,10 +1727,10 @@ pl_PL:
         global_pin_note: "Użytkownicy mogą przypinać tematy dla samych siebie."
         not_pinned_globally: "Brak przypiętych globalnie tematów."
         already_pinned_globally:
-          one: "Tematy przypięte globalnie: <strong class='badge badge-notification unread'>1</strong>."
-          few: "Tematy przypięte globalnie: <strong class='badge badge-notification unread'>{{count}}</strong>."
-          many: "Tematy przypięte globalnie: <strong class='badge badge-notification unread'>{{count}}</strong>."
-          other: "Tematy przypięte globalnie: <strong class='badge badge-notification unread'>{{count}}</strong>."
+          few: 'Tematy przypięte globalnie: <strong class=''badge badge-notification unread''>{{count}}</strong>.'
+          many: 'Tematy przypięte globalnie: <strong class=''badge badge-notification unread''>{{count}}</strong>.'
+          one: 'Tematy przypięte globalnie: <strong class=''badge badge-notification unread''>1</strong>.'
+          other: 'Tematy przypięte globalnie: <strong class=''badge badge-notification unread''>{{count}}</strong>.'
         make_banner: "Ustaw ten temat jako baner wyświetlany na górze każdej strony."
         remove_banner: "Usuń ten temat jako baner wyświetlany na górze każdej strony."
         banner_note: "Użytkownicy mogą usunąć baner zamykając go przyciskiem. Tylko jeden temat może być banerem w danej chwili."
@@ -1726,10 +1767,10 @@ pl_PL:
       login_reply: 'Zaloguj się, aby odpowiedzieć'
       filters:
         n_posts:
-          one: "1 wpis"
-          few: "{{count}} wpisy"
-          many: "{{count}} wpisów"
-          other: "{{count}} wpisów"
+          few: '{{count}} wpisy'
+          many: '{{count}} wpisów'
+          one: 1 wpis
+          other: '{{count}} wpisów'
         cancel: "Usuń filtr"
       split_topic:
         title: "Przenieś do nowego tematu"
@@ -1737,19 +1778,19 @@ pl_PL:
         topic_name: "Nazwa Nowego Tematu"
         error: "Wystąpił błąd podczas przenoszenia wpisów do nowego tematu."
         instructions:
-          one: "Masz zamiar utworzyć nowy temat, składający się z wybranego przez ciebie wpisu."
-          few: "Masz zamiar utworzyć nowy temat, składający się z <b>{{count}}</b> wybranych przez ciebie wpisów."
-          many: "Masz zamiar utworzyć nowy temat, składający się z <b>{{count}}</b> wybranych przez ciebie wpisów."
-          other: "Masz zamiar utworzyć nowy temat, składający się z <b>{{count}}</b> wybranych przez ciebie wpisów."
+          few: Masz zamiar utworzyć nowy temat, składający się z <b>{{count}}</b> wybranych przez ciebie wpisów.
+          many: Masz zamiar utworzyć nowy temat, składający się z <b>{{count}}</b> wybranych przez ciebie wpisów.
+          one: Masz zamiar utworzyć nowy temat, składający się z wybranego przez ciebie wpisu.
+          other: Masz zamiar utworzyć nowy temat, składający się z <b>{{count}}</b> wybranych przez ciebie wpisów.
       merge_topic:
         title: "Przenieś do Istniejącego Tematu"
         action: "przenieś do istniejącego tematu"
         error: "Wystąpił błąd podczas przenoszenia wpisów do danego tematu."
         instructions:
-          one: "Wybierz temat, do którego chcesz przenieś ten wpis."
-          few: "Wybierz temat, do którego chcesz przenieść wybrane <b>{{count}}</b> wpisy."
-          many: "Wybierz temat, do którego chcesz przenieść <b>{{count}}</b> wybranych wpisów."
-          other: "Wybierz temat, do którego chcesz przenieść <b>{{count}}</b> wybranych wpisów."
+          few: Wybierz temat, do którego chcesz przenieść wybrane <b>{{count}}</b> wpisy.
+          many: Wybierz temat, do którego chcesz przenieść <b>{{count}}</b> wybranych wpisów.
+          one: Wybierz temat, do którego chcesz przenieś ten wpis.
+          other: Wybierz temat, do którego chcesz przenieść <b>{{count}}</b> wybranych wpisów.
       merge_posts:
         title: "Scal wybrane posty"
         action: "scal wybrane posty"
@@ -1761,11 +1802,10 @@ pl_PL:
         label: "Nowy właściciel wpisów"
         placeholder: "nazwa nowego właściciela"
         instructions:
-          one: "Wybierz nowego właściciela wpisu autorstwa <b>{{old_user}}</b>."
-          few: "Wybierz nowego właściciela dla {{count}} wpisów autorstwa <b>{{old_user}}</b>."
-          many: "Wybierz nowego właściciela dla {{count}} wpisów autorstwa <b>{{old_user}}</b>."
-          other: "Wybierz nowego właściciela dla {{count}} wpisów autorstwa <b>{{old_user}}</b>."
-        instructions_warn: "Przeszłe powiadomienia dla tego wpisu nie zostaną przypisane do nowego użytkownika. <br>Uwaga: Aktualnie, żadne dane uzależnione od wpisu nie są przenoszone do nowego użytkownika. Zachowaj ostrożność."
+          few: Wybierz nowego właściciela dla {{count}} wpisów autorstwa <b>{{old_user}}</b>.
+          many: Wybierz nowego właściciela dla {{count}} wpisów autorstwa <b>{{old_user}}</b>.
+          one: Wybierz nowego właściciela wpisu autorstwa <b>{{old_user}}</b>.
+          other: Wybierz nowego właściciela dla {{count}} wpisów autorstwa <b>{{old_user}}</b>.
       change_timestamp:
         title: "zmień znacznik czasu"
         action: "zmień znacznik czasu"
@@ -1786,13 +1826,11 @@ pl_PL:
         select_all: zaznacz wszystkie
         deselect_all: odznacz wszystkie
         description:
-          one: Wybrano <b>1</b> wpis.
           few: Wybrano <b>{{count}}</b> wpisy.
           many: Wybrano <b>{{count}}</b> wpisów.
+          one: Wybrano <b>1</b> wpis.
           other: Wybrano <b>{{count}}</b> wpisów.
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Cytuj"
       edit_reason: "Powód"
       post_number: "wpis {{number}}"
@@ -1805,38 +1843,38 @@ pl_PL:
       show_full: "Pokaż pełny wpis"
       show_hidden: 'Zobacz ukrytą zawartość.'
       deleted_by_author:
-        one: "(wpis wycofany przez autora, zostanie automatycznie usunięty za %{count} godzinę, chyba że zostanie oflagowany) "
-        few: "(wpis wycofany przez autora, zostanie automatycznie usunięty za %{count} godziny, chyba że zostanie oflagowany) "
-        many: "(wpis wycofany przez autora, zostanie automatycznie usunięty za %{count} godzin, chyba że zostanie oflagowany) "
-        other: "(wpis wycofany przez autora, zostanie automatycznie usunięty za %{count} godzin, chyba że zostanie oflagowany) "
+        few: '(wpis wycofany przez autora, zostanie automatycznie usunięty za %{count} godziny, chyba że zostanie oflagowany) '
+        many: '(wpis wycofany przez autora, zostanie automatycznie usunięty za %{count} godzin, chyba że zostanie oflagowany) '
+        one: '(wpis wycofany przez autora, zostanie automatycznie usunięty za %{count} godzinę, chyba że zostanie oflagowany) '
+        other: '(wpis wycofany przez autora, zostanie automatycznie usunięty za %{count} godzin, chyba że zostanie oflagowany) '
       expand_collapse: "rozwiń/zwiń"
       gap:
-        one: "pokaż 1 ukrytą odpowiedź"
-        few: "pokaż {{count}} ukryte odpowiedzi"
-        many: "pokaż {{count}} ukrytych odpowiedzi"
-        other: "pokaż {{count}} ukrytych odpowiedzi"
+        few: pokaż {{count}} ukryte odpowiedzi
+        many: pokaż {{count}} ukrytych odpowiedzi
+        one: pokaż 1 ukrytą odpowiedź
+        other: pokaż {{count}} ukrytych odpowiedzi
       unread: "Nieprzeczytany wpis"
       has_replies:
-        one: "{{count}} odpowiedź"
-        few: "{{count}} odpowiedzi"
-        many: "{{count}} odpowiedzi"
-        other: "{{count}} odpowiedzi"
+        few: '{{count}} odpowiedzi'
+        many: '{{count}} odpowiedzi'
+        one: '{{count}} odpowiedź'
+        other: '{{count}} odpowiedzi'
       has_likes:
-        one: "{{count}} lajk"
-        few: "{{count}} lajki"
-        many: "{{count}} lajków"
-        other: "{{count}} lajków"
+        few: '{{count}} lajki'
+        many: '{{count}} lajków'
+        one: '{{count}} lajk'
+        other: '{{count}} lajków'
       has_likes_title:
-        one: "1 osoba lajkuje ten wpis"
-        few: "{{count}} osoby lajkują ten wpis"
-        many: "{{count}} osób lajkuje ten wpis"
-        other: "{{count}} osób lajkuje ten wpis"
+        few: '{{count}} osoby lajkują ten wpis'
+        many: '{{count}} osób lajkuje ten wpis'
+        one: 1 osoba lajkuje ten wpis
+        other: '{{count}} osób lajkuje ten wpis'
       has_likes_title_only_you: "lajkowany wpis"
       has_likes_title_you:
-        one: "ty i 1 inna osoba lajkuje ten wpis"
-        few: "ty i {{count}} inne osoby lajkują ten wpis"
-        many: "ty i {{count}} innych osób lajkuje ten wpis"
-        other: "ty i {{count}} innych osób lajkuje ten wpis"
+        few: ty i {{count}} inne osoby lajkują ten wpis
+        many: ty i {{count}} innych osób lajkuje ten wpis
+        one: ty i 1 inna osoba lajkuje ten wpis
+        other: ty i {{count}} innych osób lajkuje ten wpis
       errors:
         create: "Przepraszamy, podczas tworzenia twojego wpisu wystąpił błąd. Spróbuj ponownie."
         edit: "Przepraszamy, podczas edytowania twojego wpisu wystąpił błąd. Spróbuj ponownie."
@@ -1886,10 +1924,10 @@ pl_PL:
       actions:
         flag: 'Oflaguj'
         defer_flags:
-          one: "Ignoruj flagę"
-          few: "Ignoruj oflagowanie"
-          many: "Ignoruj flagi"
-          other: "Ignoruj flagi"
+          few: Ignoruj oflagowanie
+          many: Ignoruj flagi
+          one: Ignoruj flagę
+          other: Ignoruj flagi
         undo:
           off_topic: "Cofnij flagę"
           spam: "Cofnij flagę"
@@ -1917,92 +1955,92 @@ pl_PL:
           vote: "Zagłosowano na ten wpis"
         by_you_and_others:
           off_topic:
-            one: "Ty i 1 inna osoba oznaczyliście to jako nie-na-temat."
-            few: "Ty i {{count}} inne osoby oznaczyliście to jako nie-na-temat."
-            many: "Ty i {{count}} innych osób oznaczyliście to jako nie-na-temat."
-            other: "Ty i {{count}} innych osób oznaczyliście to jako nie-na-temat."
+            few: Ty i {{count}} inne osoby oznaczyliście to jako nie-na-temat.
+            many: Ty i {{count}} innych osób oznaczyliście to jako nie-na-temat.
+            one: Ty i 1 inna osoba oznaczyliście to jako nie-na-temat.
+            other: Ty i {{count}} innych osób oznaczyliście to jako nie-na-temat.
           spam:
-            one: "Ty i 1 inna osoba oflagowaliście to jako spam."
-            few: "Ty i {{count}} inne osoby oflagowaliście to jako spam."
-            many: "Ty i {{count}} innych osób oflagowaliście to jako spam."
-            other: "Ty i {{count}} innych osób oflagowaliście to jako spam."
+            few: Ty i {{count}} inne osoby oflagowaliście to jako spam.
+            many: Ty i {{count}} innych osób oflagowaliście to jako spam.
+            one: Ty i 1 inna osoba oflagowaliście to jako spam.
+            other: Ty i {{count}} innych osób oflagowaliście to jako spam.
           inappropriate:
-            one: "Ty i 1 inna osoba oflagowaliście to jako niewłaściwe."
-            few: "Ty i {{count}} inne osoby oflagowaliście to jako niewłaściwe."
-            many: "Ty i {{count}} innych osób oflagowaliście to jako niewłaściwe."
-            other: "Ty i {{count}} innych osób oflagowaliście to jako niewłaściwe."
+            few: Ty i {{count}} inne osoby oflagowaliście to jako niewłaściwe.
+            many: Ty i {{count}} innych osób oflagowaliście to jako niewłaściwe.
+            one: Ty i 1 inna osoba oflagowaliście to jako niewłaściwe.
+            other: Ty i {{count}} innych osób oflagowaliście to jako niewłaściwe.
           notify_moderators:
-            one: "Ty i 1 inna osoba oflagowaliście to do moderacji."
-            few: "Ty i {{count}} inne osoby oflagowaliście to do moderacji."
-            many: "Ty i {{count}} innych osób oflagowaliście to do moderacji."
-            other: "Ty i {{count}} innych osób oflagowaliście to do moderacji."
+            few: Ty i {{count}} inne osoby oflagowaliście to do moderacji.
+            many: Ty i {{count}} innych osób oflagowaliście to do moderacji.
+            one: Ty i 1 inna osoba oflagowaliście to do moderacji.
+            other: Ty i {{count}} innych osób oflagowaliście to do moderacji.
           notify_user:
-            one: "Ty i 1 inna osoba wysłaliście wiadomość do tego użytkownika"
-            few: "Ty i {{count}} inne osoby wysłaliście wiadomość do tego użytkownika"
-            many: "Ty i {{count}} innych osób wysłaliście wiadomość do tego użytkownika"
-            other: "Ty i {{count}} innych osób wysłaliście wiadomość do tego użytkownika"
+            few: Ty i {{count}} inne osoby wysłaliście wiadomość do tego użytkownika
+            many: Ty i {{count}} innych osób wysłaliście wiadomość do tego użytkownika
+            one: Ty i 1 inna osoba wysłaliście wiadomość do tego użytkownika
+            other: Ty i {{count}} innych osób wysłaliście wiadomość do tego użytkownika
           bookmark:
-            one: "Ty i 1 inna osoba dodaliście ten wpis do zakładek."
-            few: "Ty i {{count}} inne osoby dodaliście ten wpis do zakładek."
-            many: "Ty i {{count}} innych osób dodaliście ten wpis do zakładek."
-            other: "Ty i {{count}} innych osób dodaliście ten wpis do zakładek."
+            few: Ty i {{count}} inne osoby dodaliście ten wpis do zakładek.
+            many: Ty i {{count}} innych osób dodaliście ten wpis do zakładek.
+            one: Ty i 1 inna osoba dodaliście ten wpis do zakładek.
+            other: Ty i {{count}} innych osób dodaliście ten wpis do zakładek.
           like:
-            one: "Ty i 1 inna osoba lajkujecie to."
-            few: "Ty i {{count}} inne osoby lajkują to."
-            many: "Ty i {{count}} innych osób lajkuje to."
-            other: "Ty i {{count}} innych osób lajkuje to."
+            few: Ty i {{count}} inne osoby lajkują to.
+            many: Ty i {{count}} innych osób lajkuje to.
+            one: Ty i 1 inna osoba lajkujecie to.
+            other: Ty i {{count}} innych osób lajkuje to.
           vote:
-            one: "Ty i 1 inna osoba zagłosowaliście za tym wpisem"
-            few: "Ty i {{count}} inne osoby zagłosowaliście za tym wpisem"
-            many: "Ty i {{count}} innych osób zagłosowaliście za tym wpisem"
-            other: "Ty i {{count}} innych osób zagłosowaliście za tym wpisem"
+            few: Ty i {{count}} inne osoby zagłosowaliście za tym wpisem
+            many: Ty i {{count}} innych osób zagłosowaliście za tym wpisem
+            one: Ty i 1 inna osoba zagłosowaliście za tym wpisem
+            other: Ty i {{count}} innych osób zagłosowaliście za tym wpisem
         by_others:
           off_topic:
-            one: "1 osoba oflagowała to jako nie-na-temat"
-            few: "{{count}} osoby oflagowały to jako nie-na-temat"
-            many: "{{count}} osób oflagowało to jako nie-na-temat"
-            other: "{{count}} osób oflagowało to jako nie-na-temat"
+            few: '{{count}} osoby oflagowały to jako nie-na-temat'
+            many: '{{count}} osób oflagowało to jako nie-na-temat'
+            one: 1 osoba oflagowała to jako nie-na-temat
+            other: '{{count}} osób oflagowało to jako nie-na-temat'
           spam:
-            one: "1 osoba oflagowała to jako spam"
-            few: "{{count}} osoby oflagowały to jako spam"
-            many: "{{count}} osób oflagowało to jako spam"
-            other: "{{count}} osób oflagowało to jako spam"
+            few: '{{count}} osoby oflagowały to jako spam'
+            many: '{{count}} osób oflagowało to jako spam'
+            one: 1 osoba oflagowała to jako spam
+            other: '{{count}} osób oflagowało to jako spam'
           inappropriate:
-            one: "1 osoba oflagowała to jako niewłaściwe"
-            few: "{{count}} osoby oflagowały to jako niewłaściwe"
-            many: "{{count}} osób oflagowało to jako niewłaściwe"
-            other: "{{count}} osób oflagowało to jako niewłaściwe"
+            few: '{{count}} osoby oflagowały to jako niewłaściwe'
+            many: '{{count}} osób oflagowało to jako niewłaściwe'
+            one: 1 osoba oflagowała to jako niewłaściwe
+            other: '{{count}} osób oflagowało to jako niewłaściwe'
           notify_moderators:
-            one: "1 osoba oflagowała to do moderacji"
-            few: "{{count}} osoby oflagowały to do moderacji"
-            many: "{{count}} osób oflagowało to do moderacji"
-            other: "{{count}} osób oflagowało to do moderacji"
+            few: '{{count}} osoby oflagowały to do moderacji'
+            many: '{{count}} osób oflagowało to do moderacji'
+            one: 1 osoba oflagowała to do moderacji
+            other: '{{count}} osób oflagowało to do moderacji'
           notify_user:
-            one: "1 osoba wysłała wiadomość do tego użytkownika"
-            few: "{{count}} osoby wysłały wiadomość do tego użytkownika"
-            many: "{{count}} osób wysłało wiadomość do tego użytkownika"
-            other: "{{count}} osób wysłało wiadomość do tego użytkownika"
+            few: '{{count}} osoby wysłały wiadomość do tego użytkownika'
+            many: '{{count}} osób wysłało wiadomość do tego użytkownika'
+            one: 1 osoba wysłała wiadomość do tego użytkownika
+            other: '{{count}} osób wysłało wiadomość do tego użytkownika'
           bookmark:
-            one: "1 osoba dodała ten wpis do zakładek"
-            few: "{{count}} osoby dodały ten wpis do zakładek"
-            many: "{{count}} osób dodało ten wpis do zakładek"
-            other: "{{count}} osób dodało ten wpis do zakładek"
+            few: '{{count}} osoby dodały ten wpis do zakładek'
+            many: '{{count}} osób dodało ten wpis do zakładek'
+            one: 1 osoba dodała ten wpis do zakładek
+            other: '{{count}} osób dodało ten wpis do zakładek'
           like:
-            one: "1 osoba lajkuje to"
-            few: "{{count}} osoby lajkują to"
-            many: "{{count}} osób lajkuje to"
-            other: "{{count}} osób lajkuje to"
+            few: '{{count}} osoby lajkują to'
+            many: '{{count}} osób lajkuje to'
+            one: 1 osoba lajkuje to
+            other: '{{count}} osób lajkuje to'
           vote:
-            one: "1 osoba zagłosowała za tym wpisem"
-            few: "{{count}} osoby zagłosowały za tym wpisem"
-            many: "{{count}} osób zagłosowało za tym wpisem"
-            other: "{{count}} osób zagłosowało za tym wpisem"
+            few: '{{count}} osoby zagłosowały za tym wpisem'
+            many: '{{count}} osób zagłosowało za tym wpisem'
+            one: 1 osoba zagłosowała za tym wpisem
+            other: '{{count}} osób zagłosowało za tym wpisem'
       merge:
         confirm:
-          one: "Czy na pewno chcesz połączyć te posty?"
-          few: "Czy na pewno chcesz połączyć te {{count}} postów?"
-          many: "Czy na pewno chcesz połączyć te {{count}} postów?"
-          other: "Czy na pewno chcesz połączyć te {{count}} postów?"
+          few: Czy na pewno chcesz połączyć te {{count}} postów?
+          many: Czy na pewno chcesz połączyć te {{count}} postów?
+          one: Czy na pewno chcesz połączyć te posty?
+          other: Czy na pewno chcesz połączyć te {{count}} postów?
       revisions:
         controls:
           first: "Pierwsza wersja"
@@ -2084,7 +2122,6 @@ pl_PL:
       email_in_allow_strangers: "Akceptuj wiadomości email od anonimowych, nieposiadających kont użytkowników "
       email_in_disabled: "Tworzenie nowych tematów emailem jest wyłączone w ustawieniach serwisu. "
       email_in_disabled_click: 'Kliknij tu, aby włączyć.'
-      suppress_from_homepage: "Nie wyświetlaj tej kategorii na stronie głównej."
       show_subcategory_list: "Pokaż listę subkategorii powyżej tematów w tej kategorii."
       num_featured_topics: "Liczba wątków do wyświetlenia na stronie kategorii:"
       subcategory_num_featured_topics: "Liczba wątków do wyświetlenia na stronie kategorii:"
@@ -2158,20 +2195,20 @@ pl_PL:
       custom_placeholder_notify_moderators: "Dlaczego ten wpis wymaga uwagi moderatora? Opisz co konkretnie Cię zaniepokoiło i jeśli to możliwe umieść odpowiednie odnośniki."
       custom_message:
         at_least:
-          one: "wprowadź co najmniej 1 znak"
-          few: "wprowadź co najmniej {{count}} znaki"
-          many: "wprowadź co najmniej {{count}} znaków"
-          other: "wprowadź co najmniej {{count}} znaków"
+          few: wprowadź co najmniej {{count}} znaki
+          many: wprowadź co najmniej {{count}} znaków
+          one: wprowadź co najmniej 1 znak
+          other: wprowadź co najmniej {{count}} znaków
         more:
-          one: " pozostał 1"
-          few: "pozostały {{count}}"
-          many: "pozostało {{count}}"
-          other: "pozostało {{count}} "
+          few: pozostały {{count}}
+          many: pozostało {{count}}
+          one: ' pozostał 1'
+          other: 'pozostało {{count}} '
         left:
-          one: "1 pozostał"
-          few: "{{count}} pozostało"
-          many: "{{count}} pozostało"
-          other: "{{count}} pozostało"
+          few: '{{count}} pozostało'
+          many: '{{count}} pozostało'
+          one: 1 pozostał
+          other: '{{count}} pozostało'
     flagging_topic:
       title: "Dziękujemy za pomoc w utrzymaniu porządku w naszej społeczności!"
       action: "Zgłoś temat"
@@ -2182,17 +2219,17 @@ pl_PL:
       links_title: "Popularne linki"
       links_shown: "pokaż więcej linków..."
       clicks:
-        one: "1 kliknięcie"
-        few: "%{count} kliknięć"
-        many: "%{count} kliknięć"
-        other: "%{count} kliknięć"
+        few: '%{count} kliknięć'
+        many: '%{count} kliknięć'
+        one: 1 kliknięcie
+        other: '%{count} kliknięć'
     post_links:
       about: "rozwiń więcej linków dla tego wpisu"
       title:
-        one: "jeszcze 1"
-        few: "%{count} jeszcze"
-        many: "%{count} jeszcze"
-        other: "%{count} jeszcze"
+        few: '%{count} jeszcze'
+        many: '%{count} jeszcze'
+        one: jeszcze 1
+        other: '%{count} jeszcze'
     topic_statuses:
       warning:
         help: "To jest oficjalne ostrzeżenie."
@@ -2226,30 +2263,30 @@ pl_PL:
     original_post: "Oryginalny wpis"
     views: "Odsłony"
     views_lowercase:
-      one: "odsłona"
-      few: "odsłony"
-      many: "odsłon"
-      other: "odsłon"
+      few: odsłony
+      many: odsłon
+      one: odsłona
+      other: odsłon
     replies: "Odpowiedzi"
     views_long:
-      one: "ten temat był przeglądany 1 raz"
-      few: "ten temat był przeglądany {{number}} razy"
-      many: "ten temat był przeglądany {{number}} razy"
-      other: "ten temat był przeglądany {{number}} razy"
+      few: ten temat był przeglądany {{number}} razy
+      many: ten temat był przeglądany {{number}} razy
+      one: ten temat był przeglądany 1 raz
+      other: ten temat był przeglądany {{number}} razy
     activity: "Aktywność"
     likes: "Lajki"
     likes_lowercase:
-      one: "lajk"
-      few: "lajki"
-      many: "lajków"
-      other: "lajków"
+      few: lajki
+      many: lajków
+      one: lajk
+      other: lajków
     likes_long: "jest {{number}} lajków w tym temacie"
     users: "Użytkownicy"
     users_lowercase:
-      one: "użytkownik"
-      few: "użytkownicy"
-      many: "użytkowników"
-      other: "użytkowników"
+      few: użytkownicy
+      many: użytkowników
+      one: użytkownik
+      other: użytkowników
     category_title: "Kategoria"
     history: "Historia"
     changed_by: "przez {{author}}"
@@ -2263,10 +2300,10 @@ pl_PL:
       latest:
         title: "Aktualne"
         title_with_count:
-          one: "Aktualne (1)"
-          few: "Aktualne ({{count}})"
-          many: "Aktualne ({{count}})"
-          other: "Aktualne ({{count}})"
+          few: Aktualne ({{count}})
+          many: Aktualne ({{count}})
+          one: Aktualne (1)
+          other: Aktualne ({{count}})
         help: "tematy z ostatnimi wpisami"
       hot:
         title: "Gorące"
@@ -2284,29 +2321,29 @@ pl_PL:
       unread:
         title: "Nieprzeczytane"
         title_with_count:
-          one: "Nieprzeczytane (1)"
-          few: "Nieprzeczytane ({{count}})"
-          many: "Nieprzeczytane ({{count}})"
-          other: "Nieprzeczytane ({{count}})"
+          few: Nieprzeczytane ({{count}})
+          many: Nieprzeczytane ({{count}})
+          one: Nieprzeczytane (1)
+          other: Nieprzeczytane ({{count}})
         help: "obserwowane lub śledzone tematy z nieprzeczytanymi wpisami"
         lower_title_with_count:
-          one: "1 nieprzeczytany"
-          few: "{{count}} nieprzeczytane"
-          many: "{{count}} nieprzeczytanych"
-          other: "{{count}} nieprzeczytanych"
+          few: '{{count}} nieprzeczytane'
+          many: '{{count}} nieprzeczytanych'
+          one: 1 nieprzeczytany
+          other: '{{count}} nieprzeczytanych'
       new:
         lower_title_with_count:
-          one: "1 nowa"
-          few: "{{count}} nowe"
-          many: "{{count}} nowych"
-          other: "{{count}} nowych"
+          few: '{{count}} nowe'
+          many: '{{count}} nowych'
+          one: 1 nowa
+          other: '{{count}} nowych'
         lower_title: "nowe"
         title: "Nowe"
         title_with_count:
-          one: "Nowe (1)"
-          few: "Nowe ({{count}})"
-          many: "Nowe ({{count}})"
-          other: "Nowe ({{count}})"
+          few: Nowe ({{count}})
+          many: Nowe ({{count}})
+          one: Nowe (1)
+          other: Nowe ({{count}})
         help: "tematy dodane w ciągu ostatnich kilku dni"
       posted:
         title: "Wysłane"
@@ -2317,10 +2354,10 @@ pl_PL:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: "{{categoryName}} (1)"
-          few: "{{categoryName}} ({{count}})"
-          many: "{{categoryName}} ({{count}})"
-          other: "{{categoryName}} ({{count}})"
+          few: '{{categoryName}} ({{count}})'
+          many: '{{categoryName}} ({{count}})'
+          one: '{{categoryName}} (1)'
+          other: '{{categoryName}} ({{count}})'
         help: "najnowsze tematy w kategorii {{categoryName}}"
       top:
         title: "Popularne"
@@ -2405,32 +2442,31 @@ pl_PL:
         print: '<b>ctrl</b>+<b>p</b> Drukuj temat'
     badges:
       earned_n_times:
-        one: "Otrzymano tą odznakę 1 raz"
-        few: "Otrzymano tą odznakę %{count} razy"
-        many: "Otrzymano tą odznakę %{count} razy"
-        other: "Otrzymano tą odznakę %{count} razy"
+        few: Otrzymano tą odznakę %{count} razy
+        many: Otrzymano tą odznakę %{count} razy
+        one: Otrzymano tą odznakę 1 raz
+        other: Otrzymano tą odznakę %{count} razy
       granted_on: "Przyznano %{date}"
       others_count: "Inni użytkownicy z tą odznaką (%{count})"
       title: Odznaki
       allow_title: "Możesz użyc tej odznaki jako tytułu"
       multiple_grant: "Możesz zdobyć tą odznakę wiele razy"
       badge_count:
-        one: "1 odznaka"
-        few: "%{count} odznak"
-        many: "%{count} odznak"
-        other: "%{count} odznak"
+        few: '%{count} odznak'
+        many: '%{count} odznak'
+        one: 1 odznaka
+        other: '%{count} odznak'
       more_badges:
-        one: "+1 więcej"
-        few: "+%{count} więcej"
-        many: "+%{count} więcej"
-        other: "+%{count} więcej"
+        few: +%{count} więcej
+        many: +%{count} więcej
+        one: +1 więcej
+        other: +%{count} więcej
       granted:
-        one: "1 przyznany"
-        few: "%{count} przyznanych"
-        many: "%{count} przyznanych"
-        other: "%{count} przyznanych"
+        few: '%{count} przyznanych'
+        many: '%{count} przyznanych'
+        one: 1 przyznany
+        other: '%{count} przyznanych'
       select_badge_for_title: Wybierz odznakę do użycia jako twój tytuł
-      none: "<brak>"
       badge_grouping:
         getting_started:
           name: Pierwsze kroki
@@ -2474,19 +2510,15 @@ pl_PL:
       notifications:
         watching:
           title: "Obserwowane"
-          description: "Będziesz automatycznie śledzić wszystkie tematy oznaczone tym tagiem, będziesz otrzymywać powiadomienia o każdym nowym wpisie i temacie, a liczba nieprzeczytanych i nowych wpisów będzie wyświetlana obok tytułów na liście tematów."
         watching_first_post:
           title: "Oglądasz pierwszy post"
-          description: "Zostaniesz powiadomiony tylko o pierwszym wpisie oznaczonym tym tagiem."
         tracking:
           title: "Śledzenie"
-          description: "Będziesz automatycznie śledzić wszystkie wpisy oznaczone tym tagiem. Liczba nieprzeczytanych i nowych wpisów będzie wyświetlana obok tytułów na liście tematów."
         regular:
           title: "Normalny"
           description: "Dostaniesz powiadomienie, gdy ktoś ci odpowie lub wspomni twoją @nazwę."
         muted:
           title: "Wyciszony"
-          description: "Nie otrzymasz powiadomień o nowych tematach oznaczonych tym tagiem i nie będą się one pojawiać na karcie Nieprzeczytane."
       groups:
         title: "Tagi grup"
         about: "Dodaj etykiety do grup aby zarządzać nimi łatwiej."
@@ -2568,8 +2600,6 @@ pl_PL:
         reports:
           today: "Dzisiaj"
           yesterday: "Wczoraj"
-          last_7_days: "Ostatnie 7 dni"
-          last_30_days: "Ostatnie 30 dni"
           all_time: "Przez cały czas"
           7_days_ago: "7 dni temu"
           30_days_ago: "30 dni temu"
@@ -2591,11 +2621,7 @@ pl_PL:
         moderation_history: "Historia moderacji"
         agree: "Potwierdź"
         agree_title: "Potwierdź to zgłoszenie jako uzasadnione i poprawne"
-        agree_flag_hide_post: "Potwierdź i ukryj post"
         agree_flag_restore_post: "Potwierdź i przywróć post"
-        agree_flag: "Potwierdź i zachowaj post"
-        defer_flag: "Ignoruj"
-        defer_flag_title: "Usunięcie flagi z twojej listy, nie wymaga dalszych działań."
         delete: "Usuń"
         delete_title: "Usuń wpis do którego odnosi się flaga."
         delete_post_defer_flag: "Usuń post i ignoruj flagę"
@@ -2647,8 +2673,6 @@ pl_PL:
         title: "Grupy"
         edit: "Edytuj grupy"
         refresh: "Odśwież"
-        new: "Nowa"
-        selector_placeholder: "nazwa użytkownika"
         about: "Tu możesz edytować przypisania do grup oraz ich nazwy"
         group_members: "Członkowie grupy"
         delete: "Usuń"
@@ -2656,22 +2680,10 @@ pl_PL:
         delete_failed: "Nie można usunąć grupy. Jeżeli jest to grupa automatyczna, nie może zostać zniszczona."
         delete_owner_confirm: "Usunąć status właściciela dla  '%{username}'?"
         add: "Dodaj"
-        add_members: "Dodaj członków"
         custom: "Niestandardowe"
-        bulk_complete: "Użytkownicy zostali dodani do wskazanej grupy."
-        bulk_complete_users_not_added: "Podani użytkownicy nie mogą zostać dodani (Sprawdź, czy stworzyli konto):"
-        bulk: "Dodaj więcej do grupy"
-        bulk_paste: "Podaj listę nazw użytkowników lub adresów e-mail,  każdy w oddzielnej linii:"
-        bulk_select: "(wybierz grupę)"
         automatic: "Automatyczne"
-        automatic_membership_email_domains: "Użytkownicy rejestrujący się przy pomocy adresu z tej listy zostaną automatycznie przypisani do tej grupy."
-        automatic_membership_retroactive: "Zastosuj tę regułę domenową do już istniejących użytkowników."
-        default_title: "Domyślny tytuł użytkowników należących do tej grupy"
-        primary_group: "Automatycznie ustawiaj jako główną grupę"
         group_owners: Właściciele
         add_owners: Dodaj właścicieli
-        incoming_email: "Niestandardowy adres poczty przychodzącej"
-        incoming_email_placeholder: "podaj adres e-mail"
         none_selected: "Wybierz grupę, aby rozpocząć"
         no_custom_groups: "Utwórz nową grupę"
       api:
@@ -2737,15 +2749,15 @@ pl_PL:
           none: "Brak powiązanych wydarzeń."
           redeliver: "Dostarcz ponownie"
           incoming:
-            one: "Istnieje nowe wydarzenie "
-            few: "Istnieją {{count}} nowe wydarzenia. "
-            many: "Istnieje {{count}} nowych wydarzeń."
-            other: "Istnieje {{count}} nowych wydarzeń. "
+            few: 'Istnieją {{count}} nowe wydarzenia. '
+            many: Istnieje {{count}} nowych wydarzeń.
+            one: 'Istnieje nowe wydarzenie '
+            other: 'Istnieje {{count}} nowych wydarzeń. '
           completed_in:
-            one: "Ukończono w 1 sekundę."
-            few: "Ukończono w {{count}} sekundy."
-            many: "Ukończono w {{count}} sekund."
-            other: "Ukończono w {{count}} sekund."
+            few: Ukończono w {{count}} sekundy.
+            many: Ukończono w {{count}} sekund.
+            one: Ukończono w 1 sekundę.
+            other: Ukończono w {{count}} sekund.
           request: "Żądanie"
           response: "Odpowiedź"
           redeliver_confirm: "Czy jesteś pewien, że chcesz dostarczyć ponownie tą samą zawartość?"
@@ -2796,7 +2808,6 @@ pl_PL:
           label: "Wyślij"
           title: "Wyślij kopię zapasową do tej instancji"
           uploading: "Wysyłanie…"
-          success: "'{{filename}}' został pomyślnie przesłany."
           error: "Podczas przesyłania pliku wystąpił błąd '{{filename}}': {{message}}"
         operations:
           is_running: "Proces jest w trakcie działania…"
@@ -2809,7 +2820,6 @@ pl_PL:
             label: "Kopia zapasowa"
             title: "Wykonaj kopię zapasową"
             confirm: "Czy chcesz wykonać kopię zapasową?"
-            without_uploads: "Tak (bez załączników)"
           download:
             label: "Pobierz"
             title: "Wyślij email z linkiem do pobrania"
@@ -2907,10 +2917,10 @@ pl_PL:
           up_to_date: "Motyw jest aktualny. Ostatnio sprawdzano:"
           add: "Dodaj"
           commits_behind:
-            one: "Motyw jest 1 aktualizację w tyle!"
-            few: "Motyw jest {{count}} aktualizacji w tyle!"
-            many: "Motyw jest {{count}} aktualizacji w tyle!"
-            other: "Motyw jest {{count}} aktualizacji w tyle!"
+            few: Motyw jest {{count}} aktualizacji w tyle!
+            many: Motyw jest {{count}} aktualizacji w tyle!
+            one: Motyw jest 1 aktualizację w tyle!
+            other: Motyw jest {{count}} aktualizacji w tyle!
           scss:
             text: "CSS"
             title: "Wstaw własny CSS, przyjmujemy wszystkie prawidłowe style CSS i SCSS"
@@ -3170,10 +3180,10 @@ pl_PL:
         clear_filter: "Wyczyść"
         show_words: "pokaż słowa"
         word_count:
-          one: "1 słowo"
-          few: "%{count} słówa"
-          many: "%{count} słów"
-          other: "%{count} słów"
+          few: '%{count} słówa'
+          many: '%{count} słów'
+          one: 1 słowo
+          other: '%{count} słów'
         actions:
           block: 'Zablokuj'
           censor: 'Cenzuruj'
@@ -3215,15 +3225,15 @@ pl_PL:
           suspect: 'Podejrzani'
         approved: "Zatwierdzam?"
         approved_selected:
-          one: "zatwierdź użytkownika"
-          few: "zatwierdź użytkowników ({{count}})"
-          many: "zatwierdź użytkowników ({{count}})"
-          other: "zatwierdź użytkowników ({{count}})"
+          few: zatwierdź użytkowników ({{count}})
+          many: zatwierdź użytkowników ({{count}})
+          one: zatwierdź użytkownika
+          other: zatwierdź użytkowników ({{count}})
         reject_selected:
-          one: "odrzuć użytkownika(-czkę)"
-          few: "odrzuć użytkowników ({{count}})"
-          many: "odrzuć użytkowników ({{count}})"
-          other: "odrzuć użytkowników ({{count}})"
+          few: odrzuć użytkowników ({{count}})
+          many: odrzuć użytkowników ({{count}})
+          one: odrzuć użytkownika(-czkę)
+          other: odrzuć użytkowników ({{count}})
         titles:
           active: 'Aktywni użytkownicy'
           new: 'Nowi użytkownicy'
@@ -3240,15 +3250,15 @@ pl_PL:
           suspended: 'Zawieszone konta'
           suspect: 'Podejrzani użytkownicy'
         reject_successful:
-          one: "Odrzucenie 1 użytkownika(-czki) powiodło się."
-          few: "Odrzucenie %{count} użytkowników powiodło się."
-          many: "Odrzucenie %{count} użytkowników powiodło się."
-          other: "Odrzucenie %{count} użytkowników powiodło się."
+          few: Odrzucenie %{count} użytkowników powiodło się.
+          many: Odrzucenie %{count} użytkowników powiodło się.
+          one: Odrzucenie 1 użytkownika(-czki) powiodło się.
+          other: Odrzucenie %{count} użytkowników powiodło się.
         reject_failures:
-          one: "Odrzucenie 1 użytkownika(-czki) nie powiodło się."
-          few: "Odrzucenie %{count} użytkowników powiodło się."
-          many: "Odrzucenie %{count} użytkowników nie powiodło się."
-          other: "Odrzucenie %{count} użytkowników nie powiodło się."
+          few: Odrzucenie %{count} użytkowników powiodło się.
+          many: Odrzucenie %{count} użytkowników nie powiodło się.
+          one: Odrzucenie 1 użytkownika(-czki) nie powiodło się.
+          other: Odrzucenie %{count} użytkowników nie powiodło się.
         not_verified: "Niezweryfikowany"
         check_email:
           title: "Wyświetl adres email tego użytkownika"
@@ -3324,20 +3334,20 @@ pl_PL:
         delete_forbidden_because_staff: "Administratorzy i moderatorzy nie mogą zostać usunięci."
         delete_posts_forbidden_because_staff: "Nie można usunąć wszystkich wpisów administratorów i moderatorów."
         delete_forbidden:
-          one: "Użytkownik nie może zostać usunięty jeśli posiada wpisy. Usuń wszystkie jego wpisy przed usunięciem użytkownika. (Nie można usunąć wpisów starszych niż %{count} dzień.)"
-          few: "Użytkownik nie może zostać usunięty jeśli posiada wpisy. Usuń wszystkie jego wpisy przed usunięciem użytkownika. (Nie można usunąć wpisów starszych niż %{count} dni.)"
-          many: "Użytkownik nie może zostać usunięty jeśli posiada wpisy. Usuń wszystkie jego wpisy przed usunięciem użytkownika. (Nie można usunąć wpisów starszych niż %{count} dni.)"
-          other: "Użytkownik nie może zostać usunięty jeśli posiada wpisy. Usuń wszystkie jego wpisy przed usunięciem użytkownika. (Nie można usunąć wpisów starszych niż %{count} dni.)"
+          few: Użytkownik nie może zostać usunięty jeśli posiada wpisy. Usuń wszystkie jego wpisy przed usunięciem użytkownika. (Nie można usunąć wpisów starszych niż %{count} dni.)
+          many: Użytkownik nie może zostać usunięty jeśli posiada wpisy. Usuń wszystkie jego wpisy przed usunięciem użytkownika. (Nie można usunąć wpisów starszych niż %{count} dni.)
+          one: Użytkownik nie może zostać usunięty jeśli posiada wpisy. Usuń wszystkie jego wpisy przed usunięciem użytkownika. (Nie można usunąć wpisów starszych niż %{count} dzień.)
+          other: Użytkownik nie może zostać usunięty jeśli posiada wpisy. Usuń wszystkie jego wpisy przed usunięciem użytkownika. (Nie można usunąć wpisów starszych niż %{count} dni.)
         cant_delete_all_posts:
-          one: "Nie można usunąć wszystkich postów. Część z nich ma więcej niż 1 dzień. (Ustawienie delete_user_max_post_age)"
-          few: "Nie można usunąć wszystkich postów. Część z nich ma więcej niż %{count} dni. (Ustawienie delete_user_max_post_age)"
-          many: "Nie można usunąć wszystkich wpisów. Część z nich ma więcej niż %{count} dni. (Ustawienie delete_user_max_post_age.)"
-          other: "Nie można usunąć wszystkich wpisów. Część z nich ma więcej niż %{count} dni. (Ustawienie delete_user_max_post_age.)"
+          few: Nie można usunąć wszystkich postów. Część z nich ma więcej niż %{count} dni. (Ustawienie delete_user_max_post_age)
+          many: Nie można usunąć wszystkich wpisów. Część z nich ma więcej niż %{count} dni. (Ustawienie delete_user_max_post_age.)
+          one: Nie można usunąć wszystkich postów. Część z nich ma więcej niż 1 dzień. (Ustawienie delete_user_max_post_age)
+          other: Nie można usunąć wszystkich wpisów. Część z nich ma więcej niż %{count} dni. (Ustawienie delete_user_max_post_age.)
         cant_delete_all_too_many_posts:
-          one: "Nie można usunąć wszystkich postów, ponieważ użytkownik ma więcej niż 1 post. (delete_all_posts_max)"
-          few: "Nie można usunąć wszystkich postów, ponieważ użytkownik ma ich więcej niż %{count}. (delete_all_posts_max)"
-          many: "Nie można usunąć wszystkich wpisów, ponieważ użytkownik ma ich więcej niż %{count}. (delete_all_posts_max)"
-          other: "Nie można usunąć wszystkich wpisów, ponieważ użytkownik ma ich więcej niż %{count}. (delete_all_posts_max)"
+          few: Nie można usunąć wszystkich postów, ponieważ użytkownik ma ich więcej niż %{count}. (delete_all_posts_max)
+          many: Nie można usunąć wszystkich wpisów, ponieważ użytkownik ma ich więcej niż %{count}. (delete_all_posts_max)
+          one: Nie można usunąć wszystkich postów, ponieważ użytkownik ma więcej niż 1 post. (delete_all_posts_max)
+          other: Nie można usunąć wszystkich wpisów, ponieważ użytkownik ma ich więcej niż %{count}. (delete_all_posts_max)
         delete_confirm: "Czy NA PEWNO chcesz usunąć tego użytkownika? Będzie to nieodwracalne!"
         delete_and_block: "Usuń i <b>zablokuj</b> ten email oraz adres IP"
         delete_dont_block: "Tylko usuń"
@@ -3376,10 +3386,10 @@ pl_PL:
         tl3_requirements:
           title: "Wymagania dla osiągnięcia 3. poziomu zaufania"
           table_title:
-            one: "W ciągu ostatniego dnia:"
-            few: "W ciągu ostatnich %{count} dni:"
-            many: "W ciągu ostatnich %{count} dni:"
-            other: "W ciągu ostatnich %{count} dni:"
+            few: 'W ciągu ostatnich %{count} dni:'
+            many: 'W ciągu ostatnich %{count} dni:'
+            one: 'W ciągu ostatniego dnia:'
+            other: 'W ciągu ostatnich %{count} dni:'
           value_heading: "Wartość"
           requirement_heading: "Wymaganie"
           visits: "Odwiedziny"
@@ -3454,10 +3464,7 @@ pl_PL:
         recommended: "Zalecamy zmianę poniższego tekstu, aby lepiej odpowiadał Twoim potrzebom:"
         show_overriden: 'Pokaż tylko nadpisane'
       site_settings:
-        show_overriden: 'Pokaż tylko nadpisane'
         title: 'Ustawienia'
-        reset: 'przywróć domyślne'
-        none: 'żadne'
         no_results: "Brak wyników wyszukiwania"
         clear_filter: "Wyczyść"
         add_url: "dodaj URL"
@@ -3507,17 +3514,17 @@ pl_PL:
         reason_help: (Link do wpisu lub tematu)
         save: Zapisz
         delete: Usuń
-        delete_confirm: Czy na pewno chcesz usunąć tę odznakę?
+        delete_confirm: "Czy na pewno chcesz usunąć tę odznakę?"
         revoke: Odbierz
         reason: Powód
         expand: Rozwiń &hellip;
-        revoke_confirm: Czy na pewno chcesz odebrać tę odznakę?
+        revoke_confirm: "Czy na pewno chcesz odebrać tę odznakę?"
         edit_badges: Edytuj odznaki
         grant_badge: Przyznaj odznakę
         granted_badges: Przyznane odznaki
         grant: Przyznaj
         no_user_badges: "%{name} nie otrzymał żadnych odznak."
-        no_badges: Nie ma odznak, które można by było przyznać.
+        no_badges: "Nie ma odznak, które można by było przyznać."
         none_selected: "Wybierz odznakę, aby rozpocząć"
         allow_title: Pozwól wykorzystywać odznakę jako tytuł
         multiple_grant: Może być przyznana wielokrotnie
@@ -3525,11 +3532,10 @@ pl_PL:
         enabled: Włącz odznakę
         icon: Ikona
         image: Grafika
-        icon_help: "Użyj jednej z klas Font Awesome lub adresu URL do grafiki"
-        query: 'Zapytanie odznaki (SQL) '
+        query: "Zapytanie odznaki (SQL) "
         target_posts: Wpisy powiązane z odznaką
         auto_revoke: Codziennie uruchamiaj zapytanie odbierające odznakę
-        show_posts: 'Wyświetlaj wpisy odpowiedzialne za przyznanie odznaki na jej stronie '
+        show_posts: "Wyświetlaj wpisy odpowiedzialne za przyznanie odznaki na jej stronie "
         trigger: Aktywacja
         trigger_type:
           none: "Automatycznie, raz dziennie"
@@ -3549,16 +3555,16 @@ pl_PL:
             text: "Brakuje przykładowych wyników. Zapytanie odznaki zwraca nieistniejące ID użytkowników lub wpisów. Może to spowodować nieoczekiwane rezultaty w przyszłości – sprawdź ponownie swoje zapytanie. "
           no_grant_count: "Brak odznak do przyznania."
           grant_count:
-            one: "<b>1</b> odznaka do przyznania."
-            few: "<b>%{count}</b> odznaki do przyznania."
-            many: "<b>%{count}</b> odznak do przyznania."
-            other: "<b>%{count}</b> odznak do przyznania."
+            few: <b>%{count}</b> odznaki do przyznania.
+            many: <b>%{count}</b> odznak do przyznania.
+            one: <b>1</b> odznaka do przyznania.
+            other: <b>%{count}</b> odznak do przyznania.
           sample: "Podgląd:"
           grant:
-            with: <span class="username">%{username}</span>
-            with_post: <span class="username">%{username}</span> za wpis w %{link}
-            with_post_time: <span class="username">%{username}</span> za wpis w %{link} o <span class="time">%{time}</span>
-            with_time: <span class="username">%{username}</span> o <span class="time">%{time}</span>
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span> za wpis w %{link}"
+            with_post_time: "<span class=\"username\">%{username}</span> za wpis w %{link} o <span class=\"time\">%{time}</span>"
+            with_time: "<span class=\"username\">%{username}</span> o <span class=\"time\">%{time}</span>"
       emoji:
         title: "Emoji"
         help: "Dodawanie nowych emoji.  (PROTIP: przeciągnij i upuść wiele plików)"
@@ -3604,7 +3610,7 @@ pl_PL:
         category_id: "ID kategorii"
         category_title: "Kategoria"
         external_url: "Zewnętrzny URL"
-        delete_confirm: Czy na pewno chcesz usunąć ten permalink?
+        delete_confirm: "Czy na pewno chcesz usunąć ten permalink?"
         form:
           label: "Nowy:"
           add: "Dodaj"
@@ -3619,10 +3625,10 @@ pl_PL:
       uploading: "Wysyłanie…"
       quit: "Może później"
       staff_count:
-        one: "W twojej społeczności jest 1 członek załogi (Ty)."
-        few: "W twojej społeczności jest %{count} członków załogi, w tym Ty."
-        many: "W twojej społeczności jest %{count} członków załogi, w tym Ty."
-        other: "W twojej społeczności jest %{count}członków załogi, w tym  Ty."
+        few: W twojej społeczności jest %{count} członków załogi, w tym Ty.
+        many: W twojej społeczności jest %{count} członków załogi, w tym Ty.
+        one: W twojej społeczności jest 1 członek załogi (Ty).
+        other: W twojej społeczności jest %{count}członków załogi, w tym  Ty.
       invites:
         add_user: "dodaj"
         none_added: "Nie zaprosiłeś nikogo. Czy na pewno chcesz kontynuować?"
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index 08e25bb8196..0ba161c9c9d 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -43,78 +43,80 @@ pt:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: "< 1s"
-          other: "< %{count}s"
+          one: < 1s
+          other: < %{count}s
         x_seconds:
-          one: "1s"
-          other: "%{count}s"
+          one: 1s
+          other: '%{count}s'
         x_minutes:
-          one: "1m"
-          other: "%{count}m"
+          one: 1m
+          other: '%{count}m'
         about_x_hours:
-          one: "1h"
-          other: "%{count}h"
+          one: 1h
+          other: '%{count}h'
         x_days:
-          one: "1d"
-          other: "%{count}d"
+          one: 1d
+          other: '%{count}d'
         about_x_years:
-          one: "1a"
-          other: "%{count}a"
+          one: 1a
+          other: '%{count}a'
         over_x_years:
-          one: "> 1a"
-          other: "> %{count}a"
+          one: '> 1a'
+          other: '> %{count}a'
         almost_x_years:
-          one: "1a"
-          other: "%{count}a"
+          one: 1a
+          other: '%{count}a'
         date_month: "DD MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: "1 minuto"
-          other: "%{count} minutos"
+          one: 1 minuto
+          other: '%{count} minutos'
         x_hours:
-          one: "1 hora"
-          other: "%{count} horas"
+          one: 1 hora
+          other: '%{count} horas'
         x_days:
-          one: "1 dia"
-          other: "%{count} dias"
+          one: 1 dia
+          other: '%{count} dias'
         date_year: "DD MMM, 'YY"
       medium_with_ago:
         x_minutes:
-          one: "1 minuto atrás"
-          other: "%{count} minutos atrás"
+          one: 1 minuto atrás
+          other: '%{count} minutos atrás'
         x_hours:
-          one: "1 hora atrás"
-          other: "%{count} horas atrás"
+          one: 1 hora atrás
+          other: '%{count} horas atrás'
         x_days:
-          one: "1 dia atrás"
-          other: "%{count} dias atrás"
+          one: 1 dia atrás
+          other: '%{count} dias atrás'
       later:
         x_days:
-          one: "1 dia mais tarde"
-          other: "%{count} dias mais tarde"
+          one: 1 dia mais tarde
+          other: '%{count} dias mais tarde'
         x_months:
-          one: "1 mês mais tarde"
-          other: "%{count} meses mais tarde"
+          one: 1 mês mais tarde
+          other: '%{count} meses mais tarde'
         x_years:
-          one: "1 ano mais tarde"
-          other: "%{count} anos mais tarde"
+          one: 1 ano mais tarde
+          other: '%{count} anos mais tarde'
       previous_month: 'Mês Anterior'
       next_month: 'Mês Seguinte'
+      placeholder: data
     share:
-      topic: 'partilhar uma ligação para este tópico'
+      topic: 'partilhar uma hiperligação para este tópico'
       post: 'publicação #%{postNumber}'
       close: 'fechar'
-      twitter: 'partilhar esta ligação no Twitter'
-      facebook: 'partilhar esta ligação no Facebook'
-      google+: 'partilhar esta ligação no Google+'
-      email: 'enviar esta ligação por email'
+      twitter: 'partilhar esta hiperligação no Twitter'
+      facebook: 'partilhar esta hiperligação no Facebook'
+      google+: 'partilhar esta hiperligação no Google+'
+      email: 'enviar esta hiperligação por e-mail'
     action_codes:
       public_topic: "tornei este tópico publico %{when}"
-      private_topic: "tornei este tópico privado %{when}"
+      private_topic: "tornou este tópico numa mensagem privada %{when}"
       split_topic: "dividir este tópico %{when}"
       invited_user: "convidou %{who} %{when}"
       invited_group: "convidou %{who} %{when}"
+      user_left: "%{who} removeram-se desta mensagem %{when}"
       removed_user: "removeu %{who} %{when}"
       removed_group: "removeu %{who} %{when}"
       autoclosed:
@@ -127,21 +129,22 @@ pt:
         enabled: 'arquivado %{when}'
         disabled: 'removido do arquivo %{when}'
       pinned:
-        enabled: 'fixado %{when}'
+        enabled: 'afixado %{when}'
         disabled: 'desafixado %{when}'
       pinned_globally:
-        enabled: 'fixado globalmente %{when}'
+        enabled: 'afixado globalmente %{when}'
         disabled: 'desafixado %{when}'
       visible:
         enabled: 'listado %{when}'
         disabled: 'removido da lista %{when}'
+      banner:
+        enabled: 'tornou isto numa faixa %{when}. Esta irá aparecer no topo de cada página até que seja rejeitada pelo utilizador.'
+        disabled: 'removeu esta faixa %{when}. Esta não irá aparecer no topo de cada página.'
     topic_admin_menu: "Ações administrativas dos Tópicos"
     wizard_required: "Bem-vindo ao seu novo Discourse! Vamos começar com <a href='%{url}' data-auto-route='true'>o assistente de configuração</a> ✨"
     emails_are_disabled: "Todos os envios de e-mail foram globalmente desativados por um administrador. Nenhum e-mail de notificação será enviado."
-    bootstrap_mode_enabled: "Para facilitar o lançamento do seu novo sítio mais fácil, encontra-se agora em modo de inicialização. Qualquer utilizador novo terá nível de confiança 1 e resumos de email diários ligados. Este modo será automaticamente desligado quando o número total de utilizadores ultrapassar %{min_users}."
-    bootstrap_mode_disabled: "Modo de inicialização será desligado dentro das próximas 24 horas."
     themes:
-      default_description: "Predefinido"
+      default_description: "Predefinição"
     s3:
       regions:
         ap_northeast_1: "Ásia-Pacífico (Tóquio)"
@@ -174,8 +177,8 @@ pt:
     show_help: "opções"
     links: "Hiperligações"
     links_lowercase:
-      one: "ligação"
-      other: "hiperligações"
+      one: ligação
+      other: hiperligações
     faq: "FAQ"
     guidelines: "Orientações"
     privacy_policy: "Política de Privacidade"
@@ -199,8 +202,8 @@ pt:
     max_of_count: "máximo de {{count}}"
     alternation: "ou"
     character_count:
-      one: "{{count}} caracter"
-      other: "{{count}} caracteres"
+      one: '{{count}} caracter'
+      other: '{{count}} caracteres'
     suggested_topics:
       title: "Tópicos Sugeridos"
       pm_title: "Mensagens Sugeridas"
@@ -212,8 +215,6 @@ pt:
       our_moderators: "Os Nossos Moderadores"
       stat:
         all_time: "Sempre"
-        last_7_days: "Últimos 7 Dias"
-        last_30_days: "Últimos 30 Dias"
       like_count: "Gostos"
       topic_count: "Tópicos"
       post_count: "Publicações"
@@ -234,16 +235,6 @@ pt:
       last_read: "esta foi a última publicação que leu; clique para adicioná-la aos marcadores"
       remove: "Remover Marcador"
       confirm_clear: "Tem a certeza que pretende eliminar todos os marcadores deste tópico?"
-    topic_count_latest:
-      one: "{{count}} tópico novo ou atualizado."
-      other: "{{count}} tópicos novos ou atualizados."
-    topic_count_unread:
-      one: "{{count}} tópico não lido."
-      other: "{{count}} tópicos não lidos."
-    topic_count_new:
-      one: "{{count}} novo tópico."
-      other: "{{count}} novos tópicos."
-    click_to_show: "Clique para mostrar."
     preview: "pré-visualizar"
     cancel: "cancelar"
     save: "Guardar alterações"
@@ -279,16 +270,16 @@ pt:
       cancel: "Cancelar"
       view_pending: "ver publicações pendentes"
       has_pending_posts:
-        one: "Este tópico tem <b>1</b> publicação à espera de aprovação"
-        other: "Este tópico tem <b>{{count}}</b> publicações à espera de aprovação"
+        one: Este tópico tem <b>1</b> publicação à espera de aprovação
+        other: Este tópico tem <b>{{count}}</b> publicações à espera de aprovação
       confirm: "Guardar Alterações"
-      delete_prompt: "Tem a certeza que deseja eliminar <b>%{username}</b>? Isto irá remover todas as suas publicações e bloquear os seus emails e endereços IP."
+      delete_prompt: "Tem a certeza que pretende eliminar <b>%{username}</b>? Isto irá remover todas as publicações, bloquear os e-mails e endereços de IP deste utilizador."
       approval:
         title: "A Publicação Necessita de Aprovação"
         description: "Recebemos a sua nova publicação mas necessita de ser aprovada pelo moderador antes de aparecer. Por favor seja paciente."
         pending_posts:
-          one: "Tem <strong>1</strong> publicação pendente."
-          other: "Tem <strong>{{count}}</strong> publicações pendentes."
+          one: Tem <strong>1</strong> publicação pendente.
+          other: Tem <strong>{{count}}</strong> publicações pendentes.
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> publicou <a href='{{topicUrl}}'>o tópico</a>"
@@ -322,8 +313,8 @@ pt:
       posts_read: "Ler"
       posts_read_long: "Publicações Lidas"
       total_rows:
-        one: "1 utilizador"
-        other: "%{count} utilizadores"
+        one: 1 utilizador
+        other: '%{count} utilizadores'
     group_histories:
       actions:
         change_group_setting: "Mudar configuração do grupo"
@@ -332,22 +323,6 @@ pt:
         make_user_group_owner: "Tornar dono"
         remove_user_as_group_owner: "Remover dono"
     groups:
-      logs:
-        title: "Registos"
-        when: "Quando"
-        action: "Ação"
-        acting_user: "Utlizador ator"
-        target_user: "Utilizador alvo"
-        subject: "Assunto"
-        details: "Detalhes"
-        from: "De"
-        to: "Para"
-      edit:
-        title: 'Editar Grupo'
-        full_name: 'Nome Completo'
-        add_members: "Adicionar membros"
-        delete_member_confirm: "Remover '%{username}' do grupo '%{group}'?"
-      name_placeholder: "Nome do grupo, sem espaços, com as mesmas regras do nome de utilizador"
       public_exit: "Permitir que os utilizadores deixem o grupo livremente"
       empty:
         posts: "Não existem publicações por membros deste grupo."
@@ -357,13 +332,7 @@ pt:
         topics: "Não existem tópicos por membros deste grupo."
         logs: "Não existem registos para este grupo."
       add: "Adicionar"
-      join: "Aderir ao Grupo"
-      leave: "Deixar o Grupo"
-      request: "Pedir para Aderir ao Grupo"
       message: "Mensagem"
-      automatic_group: Grupo Automático
-      closed_group: Grupo fechado
-      is_group_user: "É um membro deste grupo"
       allow_membership_requests: "Permitir que os utilizadores enviem pedidos de adesão aos donos do grupo"
       membership_request:
         submit: "Submeter Pedido"
@@ -371,35 +340,23 @@ pt:
         reason: "Permita que os donos de grupo saibam porque é que pertence a este grupo"
       membership: "Adesão"
       name: "Nome"
-      user_count: "Número de Membros"
       bio: "Sobre o Grupo"
-      selector_placeholder: "Adicionar membros"
       owner: "proprietário"
       index:
         title: "Grupos"
         empty: "Não existem grupos visíveis."
       activity: "Atividade"
-      members: "Membros"
       topics: "Tópicos"
       posts: "Publicações"
       mentions: "Menções"
       messages: "Mensagens"
       notification_level: "Nível de notificação predefinido para mensagens de grupo"
-      visibility_levels:
-        title: "Quem pode ver este grupo?"
-        public: "Toda a gente"
-        members: "Donos do grupo, membros e administradores"
-        staff: "Donos do grupo e equipa"
-        owners: "Donos do grupo e administradores"
       alias_levels:
         nobody: "Ninguém"
         only_admins: "Apenas administradores"
         mods_and_admins: "Apenas moderadores e Administradores"
         members_mods_and_admins: "Apenas membros do grupo, moderadores e administradores"
         everyone: "Todos"
-      trust_levels:
-        title: "Nível de confiança concedido automaticamente a membros quando são adicionados:"
-        none: "Nenhum"
       notifications:
         watching:
           title: "A vigiar"
@@ -424,21 +381,20 @@ pt:
       flair_preview_icon: "Pré-visualizar Ícone"
       flair_preview_image: "Pré-visualizar Imagem"
     user_action_groups:
-      '1': "Gostos Dados"
-      '2': "Gostos Recebidos"
-      '3': "Marcadores"
-      '4': "Tópicos"
-      '5': "Respostas"
-      '6': "Respostas"
-      '7': "Menções"
-      '9': "Citações"
-      '11': "Edições"
-      '12': "Itens Enviados"
-      '13': "Caixa de Entrada"
-      '14': "Pendente"
+      "1": "Gostos Dados"
+      "2": "Gostos Recebidos"
+      "3": "Marcadores"
+      "4": "Tópicos"
+      "5": "Respostas"
+      "6": "Respostas"
+      "7": "Menções"
+      "9": "Citações"
+      "11": "Edições"
+      "12": "Itens Enviados"
+      "13": "Caixa de Entrada"
+      "14": "Pendente"
     categories:
       all: "todas as categorias"
-      all_subcategories: "todas"
       no_subcategory: "nenhuma"
       category: "Categoria"
       category_list: "Exibir lista de categorias"
@@ -457,11 +413,11 @@ pt:
       toggle_ordering: "alternar o controlo de ordenação"
       subcategories: "Subcategorias"
       topic_sentence:
-        one: "1 tópico"
-        other: "%{count} tópicos"
+        one: 1 tópico
+        other: '%{count} tópicos'
       topic_stat_sentence:
-        one: "%{count} novo tópico no passado %{unit}."
-        other: "%{count} novos tópicos no passado %{unit}."
+        one: '%{count} novo tópico no passado %{unit}.'
+        other: '%{count} novos tópicos no passado %{unit}.'
     ip_lookup:
       title: Pesquisa de Endereço IP
       hostname: Nome do Servidor
@@ -503,7 +459,6 @@ pt:
       notifications: "Notificações"
       statistics: "Estatísticas"
       desktop_notifications:
-        label: "Notificações de Desktop"
         not_supported: "Não são suportadas notificações neste navegador. Desculpe."
         perm_default: "Ligar Notificações"
         perm_denied_btn: "Permissão Negada"
@@ -557,7 +512,6 @@ pt:
       delete_account: "Eliminar A Minha Conta"
       delete_account_confirm: "Tem a certeza que pretende eliminar a sua conta de forma permanente? Esta ação não pode ser desfeita!"
       deleted_yourself: "A sua conta foi eliminada com sucesso."
-      delete_yourself_not_allowed: "Neste momento não pode eliminar a sua conta. Contacte um administrador para que este elimine a sua conta por si."
       unread_message_count: "Mensagens"
       admin_delete: "Apagar"
       users: "Utilizadores"
@@ -565,7 +519,7 @@ pt:
       muted_users_instructions: "Suprimir todas as notificações destes utilizadores."
       muted_topics_link: "Mostrar tópicos silenciados"
       watched_topics_link: "Mostrar tópicos vigiados"
-      tracked_topics_link: "Mostrar tópicos monitorizados"
+      tracked_topics_link: "Mostrar tópicos seguidos"
       automatically_unpin_topics: "Desafixar tópicos automaticamente quando eu chegar ao final."
       apps: "Aplicações"
       revoke_access: "Rescindir Acesso"
@@ -646,8 +600,8 @@ pt:
         authenticated: "O seu email foi autenticado por {{provider}}"
         frequency_immediately: "Enviar-lhe-emos um email imediatamente caso não leia o que lhe estamos a enviar."
         frequency:
-          one: "Só iremos enviar-lhe um email se não o tivermos visto no último minuto."
-          other: "Só iremos enviar-lhe um email se não o tivermos visto nos últimos {{count}} minutos."
+          one: Só iremos enviar-lhe um email se não o tivermos visto no último minuto.
+          other: Só iremos enviar-lhe um email se não o tivermos visto nos últimos {{count}} minutos.
       name:
         title: "Nome"
         instructions: "o seu nome completo (opcional)"
@@ -657,86 +611,84 @@ pt:
       username:
         title: "Nome de Utilizador"
         instructions: "único, sem espaços, curto"
-        short_instructions: "Podem mencioná-lo como @{{username}}"
+        short_instructions: "As pessoas podem mencioná-lo como {{username}}"
         available: "O seu nome de utilizador está disponível"
         not_available: "Não está disponível. Tente {{suggestion}}?"
         not_available_no_suggestion: "Indisponível"
-        too_short: "O seu nome de utilizador é demasiado curto"
-        too_long: "O seu nome de utilizador é demasiado longo"
+        too_short: "O seu nome de utilizador é muito curto"
+        too_long: "O seu nome de utilizador é muito longo"
         checking: "A verificar a disponibilidade do nome de utilizador..."
-        prefilled: "Email corresponde com o nome de utilizador registado"
+        prefilled: "O e-mail corresponde com este nome de utilizador registado"
       locale:
         title: "Idioma da Interface"
-        instructions: "Idioma da interface de utilizador. Será alterado quando atualizar a página."
-        default: "(pré-definido)"
+        instructions: "O idioma da interface do utilizador. Este será alterado quando recarregar a página."
+        default: "(predefinição)"
         any: "qualquer"
       password_confirmation:
         title: "Palavra-passe Novamente"
       last_posted: "Última Publicação"
-      last_emailed: "Último Email"
+      last_emailed: "Último Enviado por Mensagem"
       last_seen: "Visto"
       created: "Juntou-se"
-      log_out: "Sair"
+      log_out: "Terminar Sessão"
       location: "Localização"
-      card_badge:
-        title: "Distintivo de Cartão de Utilizador"
-      website: "Sítio da Internet"
-      email_settings: "Email"
+      website: "Site da Web"
+      email_settings: "E-mail"
       like_notification_frequency:
         title: "Notificar quando alguém gostar"
         always: "Sempre"
-        first_time_and_daily: "Na primeira vez que a publicação é gostada e diariamente"
-        first_time: "A primeira vez que uma publicação é gostada."
+        first_time_and_daily: "Na primeira vez que alguém gostar de uma publicação e diariamente"
+        first_time: "Na primeira vez que alguém gostar de uma publicação"
         never: "Nunca"
       email_previous_replies:
-        title: "Incluir respostas prévias no fundo do email."
-        unless_emailed: "a não ser quê previamente enviado"
+        title: "Incluir as respostas anteriores no fundo das mensagens"
+        unless_emailed: "a não ser que já tenha sido enviado anteriormente"
         always: "sempre"
         never: "nunca"
       email_digests:
-        title: "Quando eu não vier aqui, mandar-me um email de resumo de tópicos e respostas populares."
+        title: "Quando eu não vier aqui, enviar-me uma mensagem resumo dos tópicos e respostas populares"
         every_30_minutes: "a cada 30 minutos"
-        every_hour: "A cada hora"
+        every_hour: "de hora em hora"
         daily: "diariamente"
         every_three_days: "a cada três dias"
         weekly: "semanalmente"
         every_two_weeks: "a cada duas semanas"
-      include_tl0_in_digests: "Incluir conteúdo de novos utilizadores nos emails de resumo"
-      email_in_reply_to: "Incluir um excerto da publicação respondida nos emails"
-      email_direct: "Enviar-me um email quando alguém me citar, responder às minhas publicações, mencionar o meu @nome-de-utilizador, ou convidar-me para um tópico"
-      email_private_messages: "Enviar-me um email quando alguém me envia uma mensagem"
-      email_always: "Enviar-me notificações de email mesmo quando estou ativo no sítio"
+      include_tl0_in_digests: "Incluir o conteúdo dos novos utilizadores nas mensagens de resumo"
+      email_in_reply_to: "Incluir um excerto de resposta para publicar nas mensgaens"
+      email_direct: "Enviar-me uma mensagem quando alguém me citar, responder às minhas publicações, menciona o meu @nome-de-utilizador, ou convida-me para um tópico"
+      email_private_messages: "Enviar-me uma mensagem quando alguém me envia uma mensagem"
+      email_always: "Enviar-me notificações por e-mail mesmo quando eu estou ativo no site"
       other_settings: "Outros"
       categories_settings: "Categorias"
       new_topic_duration:
         label: "Considerar tópicos como novos quando"
-        not_viewed: "Ainda não os vi"
-        last_here: "criado desde a última vez que aqui estive"
+        not_viewed: "Eu ainda não os vi"
+        last_here: "criado desde a última vez que eu estive aqui"
         after_1_day: "criado no último dia"
         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: "Seguir automaticamente os tópicos em que eu entro"
+      auto_track_topics: "Seguir automaticamente os tópicos em que eu participo"
       auto_track_options:
         never: "nunca"
         immediately: "imediatamente"
-        after_30_seconds: "após 30 segundos"
-        after_1_minute: "após 1 minuto"
-        after_2_minutes: "após 2 minutos"
-        after_3_minutes: "após 3 minutos"
-        after_4_minutes: "após 4 minutos"
-        after_5_minutes: "após 5 minutos"
-        after_10_minutes: "após 10 minutos"
-      notification_level_when_replying: "Quando eu respondo num tópico, por esse tópico como"
+        after_30_seconds: "depois de 30 segundos"
+        after_1_minute: "depois de 1 minuto"
+        after_2_minutes: "depois de 2 minutos"
+        after_3_minutes: "depois de 3 minutos"
+        after_4_minutes: "depois de 4 minutos"
+        after_5_minutes: "depois de 5 minutos"
+        after_10_minutes: "depois de 10 minutos"
+      notification_level_when_replying: "Quando eu publico num tópico, coloque esse tópico como"
       invited:
-        search: "digite para procurar convites..."
+        search: "digite para pesquisar por convites..."
         title: "Convites"
-        user: "Utilizadores Convidados"
+        user: "Utilizador Convidado"
         sent: "Enviado"
-        none: "Não há convites pendentes para mostrar."
+        none: "Sem convites para exibir."
         truncated:
-          one: "A exibir o primeiro convite."
-          other: "A exibir os primeiros {{count}} convites."
+          one: A exibir o primeiro convite.
+          other: A exibir os primeiros {{count}} convites.
         redeemed: "Convites Resgatados"
         redeemed_tab: "Resgatado"
         redeemed_tab_with_count: "Resgatados ({{count}})"
@@ -748,11 +700,11 @@ pt:
         posts_read_count: "Publicações Lidas"
         expired: "Este convite expirou."
         rescind: "Remover"
-        rescinded: "Convite Removido"
+        rescinded: "Convite removido"
         rescind_all: "Remover todos os Convites"
         rescinded_all: "Todos os Convites removidos!"
         rescind_all_confirm: "Tem a certeza que deseja remover todos os convites?"
-        reinvite: "Reenviar convite"
+        reinvite: "Reenviar Convite"
         reinvite_all: "Reenviar todos os Convites"
         reinvite_all_confirm: "Tem a certeza que deseja reenviar todos os convites?"
         reinvited: "Convite reenviado"
@@ -761,60 +713,71 @@ pt:
         days_visited: "Dias Visitados"
         account_age_days: "Idade da conta, em dias"
         create: "Enviar um Convite"
-        generate_link: "Copiar Ligação do Convite"
-        link_generated: "Ligação de convite gerada com sucesso!"
-        valid_for: "Ligação de convite é válida apenas para este endereço de email:  %{email}"
+        generate_link: "Copiar Hiperligação do Convite"
+        link_generated: "Hiperligação do convite gerada com sucesso!"
+        valid_for: "A hiperligação do convite é válida apenas para este endereço de e-mail:  %{email}"
         bulk_invite:
-          text: "Convite em massa a partir de ficheiro"
-          success: "Ficheiro carregado corretamente, será notificado via mensagem assim que o processo esteja concluído."
+          none: "Ainda não convidou ninguém aqui. Envie convites individuais, ou convide muitas pessoas de uma vez só, <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>enviando um ficheiro CSV</a>."
+          text: "Convite em série a partir do 'Ficheiro'"
+          success: "Ficheiro enviado corretamente, será notificado via mensagem quando o processo estiver concluído."
           error: "Desculpe, o ficheiro deverá estar no formato CSV."
       password:
         title: "Palavra-passe"
         too_short: "A sua palavra-passe é muito curta."
-        common: "Essa palavra-passe é demasiado comum."
+        common: "Essa palavra-passe é muito comum."
         same_as_username: "A sua palavra-passe é a mesma que o seu nome de utilizador."
-        same_as_email: "A sua palavra-passe é a mesma que o seu email."
-        ok: "A sua palavra-passe parece correta."
+        same_as_email: "A sua palavra-passe é a mesma que o seu e-mail."
+        ok: "A sua palavra-passe parece estar bem."
         instructions: "pelo menos %{count} carateres"
       summary:
-        title: "Sumário"
+        title: "Resumo"
         stats: "Estatísticas"
-        time_read: "Tempo de leitura"
+        time_read: "tempo de leitura"
+        recent_time_read: "tempo de leitura recente"
         topic_count:
-          one: "Tópico criado"
-          other: "Tópicos criados"
+          one: Tópico criado
+          other: tópicos criados
         post_count:
-          one: "publicação criada"
-          other: "publicações criadas"
+          one: publicação criada
+          other: publicações criadas
+        likes_given:
+          one: dado
+          other: dados
+        likes_received:
+          one: recebido
+          other: recebidos
         days_visited:
-          one: "dia visitado"
-          other: "dias visitados"
+          one: dia visitado
+          other: dias visitados
+        topics_entered:
+          one: tópico visualizado
+          other: tópicos visualizados
         posts_read:
-          one: "publicação lida"
-          other: "publicações lidas"
+          one: publicação lida
+          other: publicações lidas
         bookmark_count:
-          one: "marcador"
-          other: "marcadores"
-        top_replies: "Respostas de Topo"
-        no_replies: "Nenhuma resposta ainda."
+          one: marcador
+          other: marcadores
+        top_replies: "Melhores Respostas"
+        no_replies: "Ainda sem respostas."
         more_replies: "Mais Respostas"
         top_topics: "Melhores Tópicos"
-        no_topics: "Nenhum tópico ainda."
+        no_topics: "Ainda sem tópicos."
         more_topics: "Mais Tópicos"
         top_badges: "Melhores Distintivos"
-        no_badges: "Nenhuma distintivo ainda."
+        no_badges: "Ainda sem distintivos."
         more_badges: "Mais Distintivos"
-        top_links: "Melhores hiperligações"
-        no_links: "Não há nenhuma ligação ainda."
-        most_liked_by: "Por mais apreciados"
+        top_links: "Melhores Hiperligações"
+        no_links: "Ainda sem hiperligações."
+        most_liked_by: "Por mais gostados"
         most_liked_users: "Mais Gostados"
         most_replied_to_users: "Mais Respondidos"
-        no_likes: "Nenhum gostos ainda."
-      associated_accounts: "Contas associadas"
+        no_likes: "Ainda sem gostos."
+      associated_accounts: "Sessões"
       ip_address:
-        title: "Último endereço IP"
+        title: "Último Endereço de IP"
       registration_ip_address:
-        title: "Endereço IP de registo"
+        title: "Endereço de IP de Registo"
       avatar:
         title: "Imagem de Perfil"
         header_title: "perfil, mensagens, marcadores e preferências"
@@ -837,33 +800,33 @@ pt:
         unknown: "Erro"
         not_found: "Página Não Encontrada"
       desc:
-        network: "Por favor verifique a sua ligação."
+        network: "Por favor, verifique a sua ligação."
         network_fixed: "Parece que está de volta."
-        server: "Código de Erro: {{status}}"
-        forbidden: "Não tem permissão para visualizar isso."
-        not_found: "Oops, a aplicação tentou carregar um URL que não existe."
-        unknown: "Algo correu mal."
+        server: "Código de erro: {{status}}"
+        forbidden: "Não está autorizado para ver isso."
+        not_found: "Ups, a aplicação tentou carregar um URL que não existe."
+        unknown: "Correu algo de errado."
       buttons:
         back: "Voltar Atrás"
         again: "Tentar Novamente"
         fixed: "Carregar Página"
     close: "Fechar"
-    assets_changed_confirm: "Este sítio foi atualizado. Recarregar agora para a versão mais recente?"
-    logout: "A sua sessão estava encerrada."
+    assets_changed_confirm: "Este site acabou se ser atualizado. Recarregar agora para a versão mais recente?"
+    logout: "A sua sessão foi encerrada."
     refresh: "Atualizar"
     read_only_mode:
-      enabled: "Este sítio encontra-se no modo só de leitura. Por favor continue a navegar mas responder, dar gostos e outras acções estão de momento  desativadas."
-      login_disabled: "A função de início de sessão está desativada enquanto o sítio se encontrar no modo só de leitura."
-      logout_disabled: "A função de término de sessão está desativada enquanto o sítio se encontrar no modo só de leitura."
-    too_few_topics_and_posts_notice: "Vamos <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>começar esta discussão!</a> Atualmente existem <strong>%{currentTopics} / %{requiredTopics}</strong> tópicos e <strong>%{currentPosts} / %{requiredPosts}</strong> respostas. Novos visitantes precisam de conversações para ler e a que responder."
-    too_few_topics_notice: "Vamos <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>começar esta discussão!</a> Atualmente existem <strong>%{currentTopics} / %{requiredTopics}</strong> tópios. Novos visitantes precisam de algumas conversações para ler e responder a."
-    too_few_posts_notice: "Vamos <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>começar esta discussão!</a> Atualmente existem <strong>%{currentPosts} / %{requiredPosts}</strong> respostas. Novos visitantes precisam de algumas conversações para ler e a que responder."
+      enabled: "Este site está no modo só de leitura. Por favor, continue a navegar, mas responder, gostar e outras ações estão de momento desativadas."
+      login_disabled: "Enquanto o site se encontrar no modo só de leitura, a opção de iniciar a sessão está desativada."
+      logout_disabled: "Enquanto o site se encontrar no modo só de leitura, a opção de terminar a sessão está desativada."
+    too_few_topics_and_posts_notice: "Vamos <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>começar esta discussão!</a> Atualmente existem <strong>%{currentTopics} / %{requiredTopics}</strong> tópicos e <strong>%{currentPosts} / %{requiredPosts}</strong> respostas. Os novos visitantes precisam de algumas conversações para poderem ler e responder."
+    too_few_topics_notice: "Vamos <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>começar esta discussão!</a> Atualmente existem <strong>%{currentTopics} / %{requiredTopics}</strong> tópios. Os novos visitantes precisam de algumas conversações para poderem ler e responder."
+    too_few_posts_notice: "Vamos <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>começar esta discussão!</a> Atualmente existem <strong>%{currentPosts} / %{requiredPosts}</strong> respostas. Os novos visitantes precisam de algumas conversações para poderem ler e responder."
     logs_error_rate_notice:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> atingiu o limite definido nas configurações do site de %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> excede o limite definido nas configurações do site de %{siteSettingRate}."
       rate:
-        one: "1 erro/%{duration}"
-        other: "%{count} erros/%{duration}"
+        one: 1 erro/%{duration}
+        other: '%{count} erros/%{duration}'
     learn_more: "saber mais..."
     all_time: 'total'
     all_time_desc: 'total de tópicos criados'
@@ -876,7 +839,12 @@ pt:
     day: 'dia'
     first_post: Primeira publicação
     mute: Silenciar
-    unmute: Desactivar silenciamento
+    unmute: Desativar silêncio
+    last_post: Publicado
+    time_read: Lido
+    time_read_recently: '%{time_read} recentemente'
+    time_read_tooltip: '%{time_read} tempo total lido'
+    time_read_recently_tooltip: '%{time_read} tempo total lido (%{recent_time_read} nos últimos 60 dias)'
     last_reply_lowercase: última resposta
     replies_lowercase:
       one: resposta
@@ -884,101 +852,113 @@ pt:
     signup_cta:
       sign_up: "Inscrever-se"
       hide_session: "Lembrar-me amanhã"
-      hide_forever: "não obrigado"
-      hidden_for_session: "OK, Irei perguntar-lhe amanhã. Pode sempre usar 'Iniciar Sessão' para criar uma conta, também."
-      intro: "Olá! :heart_eyes: Parece que está a gostar da discussão, mas não está inscrito para uma conta."
-      value_prop: "Quando cria uma conta, nós lembramo-nos exatamente do que leu, por isso volta sempre ao sítio onde ficou. Também recebe notificações, aqui ou por email, sempre que novas publicações são feitas. E pode gostar de publicações para partilhar o amor. :heartbeat:"
+      hide_forever: "não, obrigado"
+      hidden_for_session: "Está bem, eu irei perguntar-lhe amanhã. Pode utilizar sempre 'Iniciar a Sessão' para também criar uma conta."
+      intro: "Olá! :heart_eyes: parece que está a gostar da discussão, mas não está inscrito para uma conta."
+      value_prop: "Quando cria uma conta, nós lembramos exatamente o que leu, por isso, volta sempre ao sítio onde ficou. Também recebe notificações, aqui ou via e-mail, sempre que são criadas novas publicações. E pode gostar de publicações para partilhar o amor. :heartbeat:"
     summary:
       enabled_description: "Está a ver um resumo deste tópico: as respostas mais interessantes são determinadas pela comunidade."
       description: "Existem <b>{{replyCount}}</b> respostas."
       description_time: "Existem <b>{{replyCount}}</b> respostas com um tempo de leitura estimado de <b>{{readingTime}} minutos</b>."
       enable: 'Resumir Este Tópico'
-      disable: 'Mostrar Todas As Respostas'
+      disable: 'Mostrar Todas As Publicações'
     deleted_filter:
       enabled_description: "Este tópico contém respostas eliminadas, que foram ocultadas."
-      disabled_description: "Respostas eliminadas no tópico são exibidas."
-      enable: "Ocultar Respostas Eliminadas"
-      disable: "Exibir Respostas Eliminadas"
+      disabled_description: "As publicações eliminadas no tópico são exibidas."
+      enable: "Ocultar Publicações Eliminadas"
+      disable: "Mostrar Publicações Eliminadas"
     private_message_info:
       title: "Mensagem"
       invite: "Convidar Outros..."
+      leave_message: "Quer mesmo deixar esta mensagem?"
       remove_allowed_user: "Deseja mesmo remover {{name}} desta mensagem?"
       remove_allowed_group: "Deseja mesmo remover {{name}} desta mensagem?"
-    email: 'Email'
+    email: 'E-mail'
     username: 'Nome de utilizador'
     last_seen: 'Visto'
     created: 'Criado'
     created_lowercase: 'criado'
     trust_level: 'Nível de Confiança'
-    search_hint: 'nome de utilizador, email ou endereço de IP'
+    search_hint: 'nome de utilizador, e-mail ou endereço de IP'
     create_account:
-      disclaimer: "Ao registrar-se, aceita a <a href='{{privacy_link}}'>política de privacidade</a> e os <a href='{{tos_link}}'>termos de serviço</a>."
+      disclaimer: "Ao registar-se, concorda com a <a href='{{privacy_link}}'>política de privacidade</a> e os <a href='{{tos_link}}'>termos de serviço</a>."
       title: "Criar Nova Conta"
-      failed: "Ocorreu um erro, talvez este email já esteja registado, tente usar a ligação \"Esqueci-me da Palavra-passe\"."
+      failed: "Ocorreu algo de errado, este e-mail já pode estar registado. Tente utilizar a hiperligação \"Esqueci-me da Palavra-passe\"."
     forgot_password:
       title: "Repor Palavra-Passe"
-      action: "Esqueci-me da minha palavra-passe"
-      invite: "Insira o seu nome de utilizador ou endereço de email, e enviar-lhe-emos um email para refazer a sua palavra-passe."
+      action: "Eu esqueci-me da minha palavra-passe"
+      invite: "Insira o seu nome de utilizador ou o endereço de e-mail, e nós iremos enviar-lhe uma mensagem para repor a sua palavra-passe."
       reset: "Repor Palavra-passe"
-      complete_username: "Se uma conta corresponder ao nome de utilizador <b>%{username}</b>, deverá receber em pouco tempo um email com instruções para repor a sua palavra-passe."
-      complete_email: "Se uma conta corresponder <b>%{email}</b>, deverá receber em pouco tempo um email com instruções para repor a sua palavra-passe."
-      complete_username_found: "Encontrámos uma conta correspondente ao nome de utilizador <b>%{username}</b>, deverá receber em pouco tempo um email com instruções para repor a sua palavra-passe."
-      complete_email_found: "Encontrámos uma conta correspondente a <b>%{email}</b>, deverá receber em breve um email com instruções para repor a sua palavra-passe."
-      complete_username_not_found: "Não existe nenhuma conta correspondente ao nome de utilizador <b>%{username}</b>"
-      complete_email_not_found: "Não existe nenhuma conta correspondente a <b>%{email}</b>"
+      complete_username: "Se uma conta corresponder ao nome de utilizador <b>%{username}</b>, deverá receber em pouco tempo uma mensagem com as instruções para repor a sua palavra-passe."
+      complete_email: "Se uma conta corresponder com<b>%{email}</b>, deverá receber em pouco tempo uma mensagem com as instruções para repor a sua palavra-passe."
+      complete_username_found: "Nós encontrámos uma conta que corresponde ao nome de utilizador <b>%{username}</b>, deverá receber em pouco tempo uma mensagem com as instruções para repor a sua palavra-passe."
+      complete_email_found: "Nós encontrámos uma conta que corresponde com <b>%{email}</b>, deverá receber em breve uma mensagem com as instruções para repor a sua palavra-passe."
+      complete_username_not_found: "Nenhuma conta correspondente com o nome de utilizador <b>%{username}</b>"
+      complete_email_not_found: "Nenhuma conta correspondente com <b>%{email}</b>"
+      help: "A mensagem não chega? Certifique-se de que verifica primeiro a sua pasta de spam.<p>Não tem a certeza de qual o endereço de e-mail que utilizou? Digite um endereço de e-mail e nós iremos dizer-lhe se ele existe aqui.</p><p>Se já não tiver acesso ao endereço de e-mail da sua conta, por favor, contacte <a href='/about'>a nossa equipa de apoio.</a></p>"
       button_ok: "CONFIRMAR"
       button_help: "Ajuda"
+    email_login:
+      button_label: "com e-mail"
+      complete_username_not_found: "Nenhuma conta correspondente com o nome de utilizador <b>%{username}</b>"
+      complete_email_not_found: "Nenhuma conta correspondente com <b>%{email}</b>"
     login:
-      title: "Entrar"
+      title: "Iniciar a Sessão"
       username: "Utilizador"
       password: "Palavra-passe"
-      email_placeholder: "email ou nome de utilizador"
-      caps_lock_warning: "Caps Lock está ligado"
+      email_placeholder: "e-mail ou nome de utilizador"
+      caps_lock_warning: "Caps Lock está ligada"
       error: "Erro desconhecido"
-      rate_limit: "Por favor espere antes de tentar iniciar sessão novamente."
-      blank_username_or_password: "Por favor insira o seu email ou nome de utilizador, e palavra-passe."
+      rate_limit: "Por favor, aguarde antes de tentar iniciar a sessão novamente."
+      blank_username: "Por favor, insira o seu e-mail ou nome de utilizador."
+      blank_username_or_password: "Por favor, insira o seu e-mail ou nome de utilizador, e a palavra-passe."
       reset_password: 'Repor Palavra-passe'
-      logging_in: "A iniciar sessão..."
+      logging_in: "A iniciar a sessão..."
       or: "Ou"
       authenticating: "A autenticar..."
-      awaiting_approval: "A sua conta ainda não foi aprovada por um membro do pessoal. Receberá um email quando a sua conta for aprovada."
-      requires_invite: "Pedimos desculpa, o acesso a este fórum é permitido somente por convite de outro membro."
-      not_activated: "Ainda não pode iniciar sessão. Enviámos anteriormente um email de ativação para o endereço <b>{{sentTo}}</b>. Por favor siga as instruções contidas nesse email para ativar a sua conta."
-      not_allowed_from_ip_address: "Não pode iniciar sessão a partir desse endereço IP."
-      admin_not_allowed_from_ip_address: "Não pode iniciar sessão como administrador a partir desse endereço IP."
-      resend_activation_email: "Clique aqui para enviar o email de ativação novamente."
+      awaiting_activation: "A sua conta está a aguardar ativação. Utilize a hiperligação \"Esqueci-me da Palavra-passe\" para pedir uma nova mensagem de ativação."
+      awaiting_approval: "A sua conta ainda não foi aprovada por um membro da equipa. Nós Iremos enviar uma mensagem quando esta for aprovada."
+      requires_invite: "Desculpe, o acesso a este fórum é apenas através de convite."
+      not_activated: "Ainda não pode iniciar a sessão. Nós enviámos anteriormente uma mensagem de ativação para o seu endereço <b>{{sentTo}}</b>. Por favor, siga as instruções contidas nessa mensagem para ativar a sua conta."
+      not_allowed_from_ip_address: "Não pode iniciar a sessão a partir desse endereço de IP."
+      admin_not_allowed_from_ip_address: "Não pode iniciar a sessão como administrador a partir desse endereço de IP."
+      resend_activation_email: "Clique aqui para enviar novamente a mensagem de ativação."
       resend_title: "Reenviar Mensagem de Ativação"
       change_email: "Alterar Endereço de E-mail"
+      provide_new_email: "Forneça um novo endereço e nós iremos reenviar a sua mensagem de confirmação."
       submit_new_email: "Atualizar Endereço de E-mail"
-      sent_activation_email_again: "Enviámos mais um email de ativação para o endereço <b>{{currentEmail}}</b>. Pode ser que demore alguns minutos; certifique-se que verifica a sua pasta de spam ou lixo."
-      to_continue: "Por favor Inicie Sessão"
-      preferences: "Necessita de ter sessão iniciada para alterar as suas preferências de utilizador."
-      forgot: "Não me recordo dos detalhes da minha conta"
+      sent_activation_email_again: "Nós enviámos outra mensagem de ativação para o seu endereço <b>{{currentEmail}}</b>. Esta pode demorar alguns minutos para a receber; certifique-se que verifica a sua pasta de spam."
+      to_continue: "Por favor, inicie a sessão"
+      preferences: "Necessita de ter a sessão iniciada para alterar as suas preferências de utilizador."
+      forgot: "Eu não me lembro dos detalhes da minha conta"
+      not_approved: "A sua conta ainda não foi aprovada. Será notificado por mensagem quando estiver pronto para iniciar a sessão."
       google:
         title: "com Google"
-        message: "A autenticar com Google (certifique-se de que os bloqueadores de popup estão desativados)"
+        message: "A autenticar com Google (certifique-se de que os bloqueadores de janela estão desativados)"
       google_oauth2:
         title: "com Google"
-        message: "A autenticar com Google (certifique-se de que os bloqueadores de popup estão desativados)"
+        message: "A autenticar com Google (certifique-se de que os bloqueadores de janela estão desativados)"
       twitter:
         title: "com Twitter"
-        message: "A autenticar com Twitter (certifique-se de que os bloqueadores de popup estão desativados)"
+        message: "A autenticar com Twitter (certifique-se de que os bloqueadores de janela estão desativados)"
       instagram:
         title: "com Instagram"
-        message: "A autenticar com Instagram (certifique-se de que os bloqueadores de popup estão desativados)"
+        message: "A autenticar com Instagram (certifique-se de que os bloqueadores de janela estão desativados)"
       facebook:
         title: "com Facebook"
-        message: "A autenticar com o Facebook (certifique-se de que os bloqueadores de popup estão desativados)"
+        message: "A autenticar com o Facebook (certifique-se de que os bloqueadores de janela estão desativados)"
       yahoo:
         title: "com Yahoo"
-        message: "A autenticar com Yahoo (certifique-se de que os bloqueadores de popup estão desativados)"
+        message: "A autenticar com Yahoo (certifique-se de que os bloqueadores de janela estão desativados)"
       github:
         title: "com GitHub"
-        message: "A autenticar com GitHub (certifique-se de que os bloqueadores de popup estão desativados)"
+        message: "A autenticar com GitHub (certifique-se de que os bloqueadores de janela estão desativados)"
     invites:
       accept_title: "Convite"
       welcome_to: "Bem-vindo a %{site_name}!"
       invited_by: "Foi convidado por:"
+      social_login_available: "Também irá poder iniciar a sessão com qualquer credencial das redes sociais, utilizando esse e-mail."
+      your_email: "O seu endereço de e-mail da conta é <b>%{email}</b>."
       accept_invite: "Aceitar Convite"
       success: "A sua conta foi criada e está agora com a sessão iniciada."
       name_label: "Nome"
@@ -987,7 +967,7 @@ pt:
     password_reset:
       continue: "Continuar para %{site_name}"
     emoji_set:
-      apple_international: "Apple/International"
+      apple_international: "Apple/Internacional"
       google: "Google"
       twitter: "Twitter"
       emoji_one: "Emoji One"
@@ -998,10 +978,16 @@ pt:
       categories_only: "Apenas Categorias"
       categories_with_featured_topics: "Categorias com Tópicos Destacados"
       categories_and_latest_topics: "Categorias e Tópicos Recentes"
+      categories_and_top_topics: "Categorias e Melhores Tópicos"
     shortcut_modifier_key:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    select_kit:
+      default_header_text: Selecionar...
+      no_content: Não foram encontradas correspondências
+      filter_placeholder: Pesquisar...
+      create: "Criar: '{{content}}'"
     emoji_picker:
       filter_placeholder: Pesquisar por emoji
       people: Pessoas
@@ -1019,6 +1005,7 @@ pt:
       options: "Opções"
       whisper: "susurro"
       unlist: "não listado"
+      blockquote_text: "Bloco de Citação"
       add_warning: "Este é um aviso oficial."
       toggle_whisper: "Alternar Sussuro"
       toggle_unlisted: "Alternar Não Listado"
@@ -1027,44 +1014,48 @@ pt:
       saved_draft_tip: "guardado"
       saved_local_draft_tip: "guardado localmente"
       similar_topics: "O seu tópico é similar a..."
-      drafts_offline: "rascunhos offline"
+      drafts_offline: "rascunhos off-line"
       group_mentioned:
-        one: "Ao usar {{group}}, estará a notificar <a href='{{group_link}}'>1 pessoa</a> – tem a certeza?"
-        other: "Ao usar {{group}}, estará a notificar <a href='{{group_link}}'>{{count}} pessoas</a> – tem a certeza?"
+        one: Ao usar {{group}}, estará a notificar <a href='{{group_link}}'>1 pessoa</a> – tem a certeza?
+        other: Ao mencionar {{group}}, estará a notificar <a href='{{group_link}}'>{{count}} pessoas</a> – tem a certeza?
       cannot_see_mention:
-        category: "Mencionou {{username}}  mas este não será notificado porque não têm acesso a esta categoria. Terá de os adicionar a um grupo que tenho acesso a esta categoria."
-        private: "Mencionou {{username}} mas estes não serão notificados porque não conseguem ver esta mensagem privada.  Terá de os convidar para esta MP."
+        category: "Mencionou {{username}} , mas este não será notificado porque não têm acesso a esta categoria. Terá de os adicionar a um grupo que tenha acesso a esta categoria."
+        private: "Mencionou {{username}}, mas este não será notificado porque não consegue ver esta mensagem privada. Terá de o convidar para esta MP."
+      duplicate_link: "Parce que a sua hiperligação para <b>{{domain}}</b> já foi publicada neste tópico por <b>@{{username}}</b> numa <a href='{{post_url}}'>resposta {{ago}}</a> – tem a certeza que a quer publicar novamente?"
       error:
         title_missing: "O título é obrigatório"
-        title_too_short: "O título tem que ter pelo menos {{min}} caracteres."
-        title_too_long: "O tíítulo não pode conter mais do que {{max}} caracteres."
+        title_too_short: "O título tem que ter pelo menos {{min}} carateres."
+        title_too_long: "O título não pode conter mais do que {{max}} carateres."
         post_missing: "A publicação não pode estar vazia"
-        post_length: "A publicação tem que ter pelo menos {{min}} caracteres"
+        post_length: "A publicação tem que ter pelo menos {{min}} carateres"
         try_like: 'Já tentou o botão <i class="fa fa-heart"></i>?'
-        category_missing: "Tem que escolher uma categoria"
-      save_edit: "Guardar alterações"
+        category_missing: "Tem de escolher uma categoria"
+      save_edit: "Guardar Edição"
       reply_original: "Responder no Tópico Original"
       reply_here: "Responda Aqui"
       reply: "Responder"
       cancel: "Cancelar"
       create_topic: "Criar Tópico"
       create_pm: "Mensagem"
+      create_whisper: "Sussurro"
       title: "Ou prima Ctrl+Enter"
       users_placeholder: "Adicionar um utilizador"
       title_placeholder: "Numa breve frase, de que se trata esta discussão?"
       title_or_link_placeholder: "Digite o título, ou cole aqui uma hiperligação"
       edit_reason_placeholder: "Porque está a editar?"
-      show_edit_reason: "(adicione a razão para a edição)"
-      topic_featured_link_placeholder: "Inserir ligação mostrada com o título."
+      show_edit_reason: "(adicione motivo da edição)"
+      topic_featured_link_placeholder: "Inserir hiperligação mostrada com o título."
+      remove_featured_link: "Remover hiperligação do tópico."
       reply_placeholder: "Digite aqui. Utilize Markdown, BBCode, ou HTML para formatar. Arraste ou cole imagens."
-      view_new_post: "Ver a sua nova publicação"
+      reply_placeholder_no_images: "Digite aqui. Utilize Markdown, BBCode, ou HTML para formatar."
+      view_new_post: "Ver a sua nova publicação."
       saving: "A Guardar"
       saved: "Guardado!"
       saved_draft: "Rascunho da publicação em progresso. Selecione para continuar."
-      uploading: "A carregar…"
+      uploading: "A enviar…"
       show_preview: 'mostrar pré-visualização &raquo;'
-      hide_preview: '&laquo; esconder pré-visualização'
-      quote_post_title: "Citar publicação inteira"
+      hide_preview: '&laquo; ocultar pré-visualização'
+      quote_post_title: "Citar toda a publicação"
       bold_label: "B"
       bold_title: "Negrito"
       bold_text: "texto em negrito"
@@ -1072,49 +1063,81 @@ pt:
       italic_title: "Itálico"
       italic_text: "texto em itálico"
       link_title: "Hiperligação"
-      link_description: "digite a descrição da ligação aqui"
-      link_dialog_title: "Inserir Ligação"
+      link_description: "insira aqui a descrição da hiperligação"
+      link_dialog_title: "Inserir Hiperligação"
       link_optional_text: "título opcional"
       link_url_placeholder: "http://example.com"
       quote_title: "Bloco de Citação"
       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"
+      code_text: "Indentar texto pré-formatado até 4 espaços"
+      paste_code_text: "digite ou cole aqui o código"
+      upload_title: "Enviar"
+      upload_description: "digite aqui a descrição do ficheiro a enviar"
       olist_title: "Lista numerada"
       ulist_title: "Lista de items"
       list_item: "Item da Lista"
+      toggle_direction: "Alternar Direção"
       help: "Ajuda de Edição Markdown"
-      modal_ok: "OK"
+      collapse: "minimizar o painel de composição"
+      abandon: "fechar painel de composição e rejeitar rascunho"
+      modal_ok: "CONFIRMAR"
       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"
+        title: "Esqueceu-se de adicionar os destinatários?"
+        body: "De momento esta mensagem está a ser enviada apenas para si!"
+      admin_options_title: "Configurações opcionais da equipa para este tópico"
+      composer_actions:
+        reply_to_post:
+          label: "Responder à publicação %{postNumber} de %{postUsername}"
+          desc: Responder a uma publicação específica
+        reply_as_new_topic:
+          label: Responder como tópico relacionado
+          desc: Crie um novo tópico relacionado com este tópico
+        reply_as_private_message:
+          label: Nova mensagem
+          desc: Crie uma nova mensagem privada
+        reply_to_topic:
+          label: Responder ao tópico
+          desc: "Responder ao tópico, não a uma publicação especifica"
+        toggle_whisper:
+          label: Alternar sussurro
+          desc: Os sussurros são apenas  visíveis para os membros da equipa
+        create_topic:
+          label: "Novo Tópico"
     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."
+      tooltip:
+        regular:
+          one: Uma notificação não visualizada
+          other: '{{count}} notificações não visualizadas'
+        message:
+          one: Uma mensagem não lida
+          other: '{{count}} mensagens não lidas'
+      title: "notificações de menções de @name, respostas às suas publicações e tópicos, mensagens, etc"
+      none: "De momento, não é possível carregar as notificações."
+      empty: "Não foram encontradas notificações."
       more: "ver notificações antigas"
-      total_flagged: "total de publicações denunciadas"
-      alt:
-        mentioned: "Mencionado por"
-        quoted: "Citado por"
-        replied: "Respondido"
-        posted: "Publicado por"
-        edited: "Edição da sua publicação por"
-        liked: "Gostou da sua publicação"
-        private_message: "Mensagem privada de"
-        invited_to_private_message: "Convidado para uma mensagem privada de"
-        invited_to_topic: "Convidado para um tópico de"
-        invitee_accepted: "Convite aceite por"
-        moved_post: "A sua publicação foi movida por"
-        linked: "Ligação para a sua publicação"
-        granted_badge: "Distintivo concedido"
-        group_message_summary: "Mensagens na caixa de entrada do seu grupo"
+      total_flagged: "total de publicações sinalizadas"
+      mentioned: "<span>{{username}}</span> {{description}}"
+      group_mentioned: "<span>{{username}}</span> {{description}}"
+      quoted: "<span>{{username}}</span> {{description}}"
+      replied: "<span>{{username}}</span> {{description}}"
+      posted: "<span>{{username}}</span> {{description}}"
+      edited: "<span>{{username}}</span> {{description}}"
+      liked: "<span>{{username}}</span> {{description}}"
+      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      liked_many:
+        one: <span>{{username}}, {{username2}} e 1 outro</span> {{description}}
+        other: <span>{{username}}, {{username2}} e {{count}} outros</span> {{description}}
+      private_message: "<span>{{username}}</span> {{description}}"
+      invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
+      invited_to_topic: "<span>{{username}}</span> {{description}}"
+      invitee_accepted: "<span>{{username}}</span> aceitou o seu convite"
+      moved_post: "<span>{{username}}</span> movido {{description}}"
+      linked: "<span>{{username}}</span> {{description}}"
+      topic_reminder: "<span>{{username}}</span> {{description}}"
+      watching_first_post: "<span>Novo Tópico</span> {{description}}"
       popup:
         mentioned: '{{username}} mencionou-o em "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} mencionou-o em "{{topic}}" - {{site_title}}'
@@ -1127,30 +1150,31 @@ pt:
       title: "Adicionar uma imagem"
       title_with_attachments: "Adicionar uma imagem ou um ficheiro"
       from_my_computer: "Do meu dispositivo "
-      from_the_web: "Da internet"
-      remote_tip: "ligação para imagem"
-      remote_tip_with_attachments: "ligação para imagem ou ficheiro {{authorized_extensions}}"
-      local_tip: "selecionar imagens do seu dispositivo"
+      from_the_web: "Da Web"
+      remote_tip: "hiperligação para a imagem"
+      remote_tip_with_attachments: "hiperligação para a imagem ou ficheiro {{authorized_extensions}}"
+      local_tip: "selecionar imagens a partir do seu dispositivo"
       local_tip_with_attachments: "selecionar imagens ou ficheiros a partir do seu dispositivo {{authorized_extensions}}"
-      hint: "(pode também arrastar o ficheiro para o editor para fazer o carregamento)"
-      hint_for_supported_browsers: "pode também arrastar e largar ou colar imagens no editor"
-      uploading: "A carregar"
+      hint: "(também pode arrastar e largar o ficheiro para o editor para o enviar)"
+      hint_for_supported_browsers: "também pode arrastar e largar ou colar as imagens no editor"
+      uploading: "A enviar"
       select_file: "Selecionar Ficheiro"
-      image_link: "ligação da imagem irá apontar para"
+      image_link: "hiperligação da imagem irá apontar para"
+      default_image_alt_text: imagem
     search:
       sort_by: "Ordenar por"
       relevance: "Relevância"
       latest_post: "Publicação Mais Recente"
-      latest_topic: "Tópico Recente"
-      most_viewed: "Mais Visto"
+      latest_topic: "Tópico Mais Recente"
+      most_viewed: "Mais Visualizado"
       most_liked: "Mais Gostos"
       select_all: "Selecionar Tudo"
-      clear_all: "Remover Tudo"
-      too_short: "O seu termo de pesquisa é demasiado curto."
-      title: "pesquisar tópicos, publicações, utilizadores, ou categorias"
-      no_results: "Não foi encontrado nenhum resultado."
-      no_more_results: "Mais nenhum resultado encontrado."
-      searching: "A procurar..."
+      clear_all: "Limpar Tudo"
+      too_short: "O seu termo de pesquisa é muito curto."
+      title: "pesquisar por tópicos, publicações, utilizadores, ou categorias"
+      no_results: "Não foram encontrados resultados."
+      no_more_results: "Não foram encontrados mais resultados."
+      searching: "A pesquisar..."
       post_format: "#{{post_number}} por {{username}}"
       context:
         user: "Procurar publicações por @{{username}}"
@@ -1217,8 +1241,8 @@ pt:
         notification_level: "Notificações"
         choose_new_category: "Escolha a nova categoria para os tópicos:"
         selected:
-          one: "Selecionou  <b>1</b> tópico."
-          other: "Selecionou <b>{{count}}</b> tópicos."
+          one: Selecionou  <b>1</b> tópico.
+          other: Selecionou <b>{{count}}</b> tópicos.
         change_tags: "Substituir Etiquetas"
         append_tags: "Anexar Etiquetas"
         choose_new_tags: "Escolha novas etiquetas para estes tópicos:"
@@ -1249,12 +1273,9 @@ pt:
         bookmarks: "Não há mais tópicos marcados."
         search: "Não há mais resultados na pesquisa."
     topic:
-      unsubscribe:
-        stop_notifications: "Irá passar a receber menos notificações para <strong>{{title}}</strong>"
-        change_notification_state: "O seu estado de notificação atual é"
       filter_to:
-        one: "1 publicação no tópico"
-        other: "{{count}} publicações no tópico"
+        one: 1 publicação no tópico
+        other: '{{count}} publicações no tópico'
       create: 'Novo Tópico'
       create_long: 'Criar um novo Tópico'
       private_message: 'Iniciar uma mensagem'
@@ -1268,10 +1289,10 @@ pt:
       new: 'novo tópico'
       unread: 'não lido'
       new_topics:
-        one: '1 novo tópico'
+        one: 1 novo tópico
         other: '{{count}} novos tópicos.'
       unread_topics:
-        one: '1 tópico não lido'
+        one: 1 tópico não lido
         other: '{{count}} tópicos não lidos'
       title: 'Tópico'
       invalid_access:
@@ -1285,17 +1306,17 @@ pt:
         title: "Tópico não encontrado"
         description: "Pedimos desculpa, não foi possível encontrar esse tópico. Talvez tenha sido removido por um moderador?"
       total_unread_posts:
-        one: "tem 1 publicação não lida neste tópico"
-        other: "tem {{count}} publicações não lidas neste tópico"
+        one: tem 1 publicação não lida neste tópico
+        other: tem {{count}} publicações não lidas neste tópico
       unread_posts:
-        one: "tem 1 publicação antiga não lida neste tópico"
-        other: "tem {{count}} publicações antigas não lidas neste tópico"
+        one: tem 1 publicação antiga não lida neste tópico
+        other: tem {{count}} publicações antigas não lidas neste tópico
       new_posts:
-        one: "existe 1 nova publicação neste tópico desde a sua última leitura"
-        other: "existem {{count}} novas publicações neste tópico desde a sua última leitura"
+        one: existe 1 nova publicação neste tópico desde a sua última leitura
+        other: existem {{count}} novas publicações neste tópico desde a sua última leitura
       likes:
-        one: "existe 1 gosto neste tópico"
-        other: "existem {{count}} gostos neste tópico"
+        one: existe 1 gosto neste tópico
+        other: existem {{count}} gostos neste tópico
       back_to_list: "Voltar à lista de Tópicos"
       options: "Opções do Tópico"
       show_links: "mostrar hiperligações dentro deste tópico"
@@ -1305,7 +1326,7 @@ pt:
       read_more_MF: "{ UNREAD, plural, =0 {} one { Existe <a href='/unread'>1 não lido </a> } other { Existem <a href='/unread'># não lidos</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{e } false {existe } other{}} <a href='/new'>1 novo</a> tópico} other { {BOTH, select, true{e } false {existem } other{}} <a href='/new'># novos</a> tópicos} } restantes, ou {CATEGORY, select, true {pesquise outros tópicos em {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Pesquisar em todas as categorias
       view_latest_topics: ver os tópicos mais recentes
-      suggest_create_topic: Porque não começar um tópico?
+      suggest_create_topic: "Porque não começar um tópico?"
       jump_reply_up: avançar para resposta mais recente
       jump_reply_down: avançar para resposta mais antiga
       deleted: "Este tópico foi eliminado"
@@ -1323,8 +1344,8 @@ pt:
         title: "Lembrar-me"
       auto_close_title: 'Configurações para Fechar Automaticamente'
       auto_close_immediate:
-        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."
+        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"
@@ -1345,17 +1366,17 @@ pt:
         title: mudar quão frequentemente é notificado sobre este tópico
         reasons:
           mailing_list_mode: "Tem o modo de lista de distribuição 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.'
-          '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.'
-          '0_7': 'Está a ignorar todas as notificações nesta categoria.'
-          '0_2': 'Está a ignorar todas as notificações para este tópico.'
-          '0': 'Está a ignorar todas as notificações para este tópico.'
+          "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.'
+          "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.'
+          "0_7": 'Está a ignorar todas as notificações nesta categoria.'
+          "0_2": 'Está a ignorar todas as notificações para este tópico.'
+          "0": 'Está a ignorar todas as notificações para este tópico.'
         watching_pm:
           title: "A vigiar"
           description: "Será notificado de cada nova resposta nesta mensagem, e uma contagem de novas respostas será exibida."
@@ -1394,7 +1415,6 @@ pt:
         visible: "Tornar Listado"
         reset_read: "Repor Data de Leitura"
         make_public: "Criar tópico publico"
-        make_private: "Criar mensagem privada"
       feature:
         pin: "Fixar Tópico"
         unpin: "Desafixar Tópico"
@@ -1426,8 +1446,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 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>"
+          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."
@@ -1435,8 +1455,8 @@ 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 afixados globalmente: <strong class='badge badge-notification unread'>1</strong>"
-          other: "Tópicos atualmente afixados 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."
@@ -1472,8 +1492,8 @@ pt:
       login_reply: 'Iniciar sessão para Responder'
       filters:
         n_posts:
-          one: "1 publicação"
-          other: "{{count}} publicações"
+          one: 1 publicação
+          other: '{{count}} publicações'
         cancel: "Remover filtro"
       split_topic:
         title: "Mover para um Novo Tópico"
@@ -1481,15 +1501,15 @@ pt:
         topic_name: "Nome do Novo Tópico"
         error: "Ocorreu um erro ao mover as publicações para um novo tópico."
         instructions:
-          one: "Está prestes a criar um novo tópico e populá-lo com a publicação que selecionou."
-          other: "Está prestes a criar um novo tópico e populá-lo com as <b>{{count}}</b> publicações que selecionou."
+          one: Está prestes a criar um novo tópico e populá-lo com a publicação que selecionou.
+          other: Está prestes a criar um novo tópico e populá-lo com as <b>{{count}}</b> publicações que selecionou.
       merge_topic:
         title: "Mover para Tópico Existente"
         action: "mover para tópico existente"
         error: "Ocorreu um erro ao mover as publicações para esse tópico."
         instructions:
-          one: "Por favor selecione o tópico para o qual gostaria de mover esta publicação."
-          other: "Por favor selecione o tópico para o qual gostaria de mover estas <b>{{count}}</b> publicações."
+          one: Por favor selecione o tópico para o qual gostaria de mover esta publicação.
+          other: Por favor selecione o tópico para o qual gostaria de mover estas <b>{{count}}</b> publicações.
       merge_posts:
         title: "Juntar Publicações Selecionadas"
         action: "juntar publicações selecionadas"
@@ -1501,9 +1521,8 @@ pt:
         label: "Novo Dono das Publicações"
         placeholder: "nome de utilizador do novo proprietário"
         instructions:
-          one: "Por favor seleccione o novo dono da publicação de <b>{{old_user}}</b>."
-          other: "Por favor selecione o novo dono das {{count}} publicações de <b>{{old_user}}</b>."
-        instructions_warn: "Note que quaisquer notificações relacionadas com esta publicação serão transferidas retroativamente para o novo utilizador. <br>Aviso: Atualmente nenhum dado dependente da publicação é transferido para o novo utilizador. Usar com cautela."
+          one: Por favor seleccione o novo dono da publicação de <b>{{old_user}}</b>.
+          other: Por favor selecione o novo dono das {{count}} publicações de <b>{{old_user}}</b>.
       change_timestamp:
         action: "alterar selo temporal"
         invalid_timestamp: "O selo temporal não pode ser no futuro."
@@ -1514,14 +1533,12 @@ pt:
         selected: '({{count}}) selecionados'
         delete: eliminar selecionados
         cancel: cancelar seleção
-        select_all: 'selecionar tudo '
+        select_all: "selecionar tudo "
         deselect_all: desmarcar tudo
         description:
           one: Selecionou <b>1</b> publicação.
           other: Selecionou <b>{{count}}</b> publicações.
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Citar"
       edit_reason: "Motivo:"
       post_number: "publicação {{number}}"
@@ -1532,26 +1549,26 @@ pt:
       show_full: "Mostrar Publicação Completa"
       show_hidden: 'Ver conteúdo ocultado.'
       deleted_by_author:
-        one: "(publicação retraída pelo autor, será removida automaticamente em %{count} hora a não ser que esteja denunciada)"
-        other: "(publicação retraída pelo autor, será eliminada automaticamente em %{count} horas a não ser que esteja denunciada)"
+        one: (publicação retraída pelo autor, será removida automaticamente em %{count} hora a não ser que esteja denunciada)
+        other: (publicação retraída pelo autor, será eliminada automaticamente em %{count} horas a não ser que esteja denunciada)
       expand_collapse: "expandir/colapsar"
       gap:
-        one: "ver 1 resposta oculta"
-        other: "ver {{count}} respostas ocultas"
+        one: ver 1 resposta oculta
+        other: ver {{count}} respostas ocultas
       unread: "Publicação não lida"
       has_replies:
-        one: "{{count}} Resposta"
-        other: "{{count}} Respostas"
+        one: '{{count}} Resposta'
+        other: '{{count}} Respostas'
       has_likes:
-        one: "{{count}} Gosto"
-        other: "{{count}} Gostos"
+        one: '{{count}} Gosto'
+        other: '{{count}} Gostos'
       has_likes_title:
-        one: "1 pessoa gostou desta publicação"
-        other: "{{count}} pessoas gostaram desta publicação"
+        one: 1 pessoa gostou desta publicação
+        other: '{{count}} pessoas gostaram desta publicação'
       has_likes_title_only_you: "você gostou desta publicação"
       has_likes_title_you:
-        one: "você e 1 outra pessoa gostaram desta publicação"
-        other: "você e {{count}} outras pessoas gostaram desta publicação"
+        one: você e 1 outra pessoa gostaram desta publicação
+        other: você e {{count}} outras pessoas gostaram desta publicação
       errors:
         create: "Pedimos desculpa, ocorreu um erro ao criar a sua publicação. Por favor, tente novamente."
         edit: "Pedimos desculpa, ocorreu um erro ao editar a sua publicação. Por favor, tente novamente."
@@ -1621,54 +1638,54 @@ pt:
           vote: "Votou nesta publicação"
         by_you_and_others:
           off_topic:
-            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"
+            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 denunciou isto como spam"
-            other: "Para além de si, {{count}} pessoas denunciaram 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 denunciou isto como inapropriado"
-            other: "Para além de si, {{count}} pessoas denunciaram 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 denunciou isto para moderação"
-            other: "Para além de si, {{count}} pessoas denunciaram 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"
+            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
           bookmark:
-            one: "Para além de si, 1 pessoa adicionou um marcador a esta publicação"
-            other: "Para além de si, {{count}} adicionaram um marcador a esta publicação"
+            one: Para além de si, 1 pessoa adicionou um marcador a esta publicação
+            other: Para além de si, {{count}} adicionaram um marcador a esta publicação
           like:
-            one: "Para além de si, 1 pessoa gostou disto"
-            other: "Para além de si, {{count}} pessoas gostaram disto"
+            one: Para além de si, 1 pessoa gostou disto
+            other: Para além de si, {{count}} pessoas gostaram disto
           vote:
-            one: "Para além de si, 1 pessoa votou nesta publicação"
-            other: "Para além de si, {{count}} pessoas votaram nesta publicação"
+            one: Para além de si, 1 pessoa votou nesta publicação
+            other: Para além de si, {{count}} pessoas votaram nesta publicação
         by_others:
           off_topic:
-            one: "1 pessoa denunciou isto como fora de contexto"
-            other: "{{count}} pessoas denunciaram 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 denunciou isto como spam"
-            other: "{{count}} pessoas denunciaram isto como spam"
+            one: 1 pessoa denunciou isto como spam
+            other: '{{count}} pessoas denunciaram isto como spam'
           inappropriate:
-            one: "1 pessoa denunciou isto como impróprio"
-            other: "{{count}} pessoas denunciaram isto como inapropriado"
+            one: 1 pessoa denunciou isto como impróprio
+            other: '{{count}} pessoas denunciaram isto como inapropriado'
           notify_moderators:
-            one: "1 pessoa denunciou isto para moderação"
-            other: "{{count}} pessoas denunciaram 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"
+            one: 1 pessoa enviou uma mensagem a este utilizador
+            other: '{{count}} enviaram uma mensagem a este utilizador'
           bookmark:
-            one: "1 pessoa adicionou um marcador a esta publicação"
-            other: "{{count}} pessoas adicionaram um marcador a esta publicação"
+            one: 1 pessoa adicionou um marcador a esta publicação
+            other: '{{count}} pessoas adicionaram um marcador a esta publicação'
           like:
-            one: "1 pessoa gostou disto"
-            other: "{{count}} pessoas gostaram disto"
+            one: 1 pessoa gostou disto
+            other: '{{count}} pessoas gostaram disto'
           vote:
-            one: "1 pessoa votou nesta publicação"
-            other: "{{count}} pessoas votaram nesta publicação"
+            one: 1 pessoa votou nesta publicação
+            other: '{{count}} pessoas votaram nesta publicação'
       revisions:
         controls:
           first: "Primeira revisão"
@@ -1736,7 +1753,6 @@ pt:
       email_in_allow_strangers: "Aceitar emails de utilizadores anónimos sem conta"
       email_in_disabled: "Publicar novos tópicos através do email está desactivado nas Configurações do Sítio. Para permitir a publicação de novos tópicos através do email,"
       email_in_disabled_click: 'ative a definição "email em".'
-      suppress_from_homepage: "Suprimir esta categoria da página principal."
       allow_badges_label: "Permitir a atribuição de distintivos nesta categoria"
       edit_permissions: "Editar Permissões"
       add_permission: "Adicionar Permissões"
@@ -1781,7 +1797,7 @@ pt:
       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?"
+      delete_confirm_MF: "Está prestes a eliminar {POSTS, plural, one {<b>1</b> publicação} outras {<b>#</b> publicações}} e {TOPICS, plural, one {<b>1</b> tópico} outros {<b>#</b> tópicos}}  deste utilizador, remover a conta do mesmo, bloquear registos a partir do endereço de IP <b>{ip_address}</b> correspondente, e adicionar o endereço de e-mail <b>{email}</b> dos mesmos 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)"
@@ -1797,14 +1813,14 @@ pt:
       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"
+          one: insira pelo menos 1 caráter
+          other: insira pelo menos {{count}} carateres
         more:
-          one: "1 a seguir..."
-          other: "{{count}} a seguir..."
+          one: 1 a seguir...
+          other: '{{count}} a seguir...'
         left:
-          one: "1 restante"
-          other: "{{count}} restantes"
+          one: 1 restante
+          other: '{{count}} restantes'
     flagging_topic:
       title: "Obrigado por ajudar a manter a nossa comunidade cívica!"
       action: "Denunciar Tópico"
@@ -1815,13 +1831,13 @@ pt:
       links_title: "Hiperligações Populares"
       links_shown: "mostrar mais ligações..."
       clicks:
-        one: "1 clique"
-        other: "%{count} cliques"
+        one: 1 clique
+        other: '%{count} cliques'
     post_links:
       about: "expandir mais ligações para esta publicação"
       title:
-        one: "1 mais"
-        other: "%{count} mais"
+        one: 1 mais
+        other: '%{count} mais'
     topic_statuses:
       warning:
         help: "Este é um aviso oficial."
@@ -1855,19 +1871,19 @@ pt:
     original_post: "Publicação Original"
     views: "Vistas"
     views_lowercase:
-      one: "vista"
-      other: "vistas"
+      one: vista
+      other: vistas
     replies: "Respostas"
     activity: "Atividade"
     likes: "Gostos"
     likes_lowercase:
-      one: "gosto"
-      other: "gostos"
+      one: gosto
+      other: gostos
     likes_long: "existem {{number}} gostos neste tópico"
     users: "Utilizadores"
     users_lowercase:
-      one: "utilizador"
-      other: "utilizadores"
+      one: utilizador
+      other: utilizadores
     category_title: "Categoria"
     history: "Histórico"
     changed_by: "por {{author}}"
@@ -1880,8 +1896,8 @@ pt:
       latest:
         title: "Recente"
         title_with_count:
-          one: "Recente (1)"
-          other: "Recentes ({{count}})"
+          one: Recente (1)
+          other: Recentes ({{count}})
         help: "tópicos com publicações recentes"
       hot:
         title: "Quente"
@@ -1899,21 +1915,21 @@ pt:
       unread:
         title: "Não Lido"
         title_with_count:
-          one: "Não Lido (1)"
-          other: "Não Lidos ({{count}})"
+          one: Não Lido (1)
+          other: Não Lidos ({{count}})
         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"
+          one: 1 não lido
+          other: '{{count}} não lidos'
       new:
         lower_title_with_count:
-          one: "1 novo"
-          other: "{{count}} novos"
+          one: 1 novo
+          other: '{{count}} novos'
         lower_title: "novo"
         title: "Novo"
         title_with_count:
-          one: "Novo (1)"
-          other: "Novos ({{count}})"
+          one: Novo (1)
+          other: Novos ({{count}})
         help: "tópicos criados nos últimos dias"
       posted:
         title: "As Minhas publicações"
@@ -1924,8 +1940,8 @@ pt:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: "{{categoryName}} (1)"
-          other: "{{categoryName}} ({{count}})"
+          one: '{{categoryName}} (1)'
+          other: '{{categoryName}} ({{count}})'
         help: "tópicos recentes na categoria {{categoryName}}"
       top:
         title: "Os Melhores"
@@ -2009,22 +2025,21 @@ pt:
         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"
+        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
       badge_count:
-        one: "1 Distintivo"
-        other: "%{count} Distintivos"
+        one: 1 Distintivo
+        other: '%{count} Distintivos'
       more_badges:
-        one: "+1 Mais"
-        other: "+%{count} Mais"
+        one: +1 Mais
+        other: +%{count} Mais
       granted:
-        one: "1 concedido"
-        other: "%{count} concedidos"
+        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
@@ -2067,19 +2082,15 @@ pt:
       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."
@@ -2159,8 +2170,6 @@ pt:
         reports:
           today: "Hoje"
           yesterday: "Ontem"
-          last_7_days: "Últimos 7 Dias"
-          last_30_days: "Últimos 30 Dias"
           all_time: "Desde Sempre"
           7_days_ago: "7 Dias Atrás"
           30_days_ago: "30 Dias Atrás"
@@ -2178,7 +2187,6 @@ pt:
         title: "Denúncias"
         agree: "Aceitar"
         agree_title: "Confirmar esta denúncia como válida e correta"
-        defer_flag_title: "Remover esta denúncia; não requer qualquer ação de momento."
         delete: "Eliminar"
         delete_title: "Eliminar a publicação associada a esta denúncia."
         delete_post_defer_flag_title: "Eliminar publicação; se é a primeira do tópico então eliminar o tópico"
@@ -2212,8 +2220,6 @@ pt:
         title: "Grupos"
         edit: "Editar Grupos"
         refresh: "Atualizar"
-        new: "Novo"
-        selector_placeholder: "insira o nome de utilizador"
         about: "Editar aqui a sua participação e nomes no grupo"
         group_members: "Membros do grupo"
         delete: "Eliminar"
@@ -2221,21 +2227,10 @@ pt:
         delete_failed: "Impossível eliminar grupo. Se se trata de um grupo automático, não pode ser eliminado."
         delete_owner_confirm: "Remover privilégios do proprietário para '%{username}'?"
         add: "Adicionar"
-        add_members: "Adicionar membros"
         custom: "Personalizar"
-        bulk_complete: "Os utilizadores foram adicionados ao grupo."
-        bulk: "Adicionar ao Grupo em Massa"
-        bulk_paste: "Colar uma lista de nomes de utilizador ou emails, um por linha:"
-        bulk_select: "(selecionar um grupo)"
         automatic: "Automático"
-        automatic_membership_email_domains: "Utilizadores que registem um domínio de email que corresponde exactamente a algum desta lista irão ser automaticamente adicionados a este grupo:"
-        automatic_membership_retroactive: "Aplicar a mesma regra de domínio de email para adicionar utilizadores registados existentes"
-        default_title: "Título padrão para todos os utilizadores neste grupo"
-        primary_group: "Definir automaticamente como grupo primário"
         group_owners: Proprietários
         add_owners: Adicionar proprietários
-        incoming_email: "Endereço de email de entrada personalizado"
-        incoming_email_placeholder: "introduza o endereço de email"
       api:
         generate_master: "Gerar Chave Mestra API "
         none: "Não existem chaves API ativas neste momento."
@@ -2297,11 +2292,11 @@ pt:
           none: "Não há eventos relacionados."
           redeliver: "Re-entregar."
           incoming:
-            one: "Existe 1 evento novo."
-            other: "Existem {{count}} eventos novos."
+            one: Existe 1 evento novo.
+            other: Existem {{count}} eventos novos.
           completed_in:
-            one: "Completado em 1 segundos."
-            other: "Completado em {{count}} segundo."
+            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?"
@@ -2352,7 +2347,6 @@ pt:
           label: "Carregar"
           title: "Carregar uma cópia de segurança para esta instância"
           uploading: "A carregar…"
-          success: "'{{filename}}' foi carregado com sucesso."
           error: "Verificou-se um erro no carregamento de '{{filename}}': {{message}}"
         operations:
           is_running: "Existe atualmente uma operação em execução..."
@@ -2365,7 +2359,6 @@ pt:
             label: "Fazer Cópia de segurança"
             title: "Criar uma cópia de segurança"
             confirm: "Deseja criar uma nova cópia de segurança?"
-            without_uploads: "Sim (não incluir ficheiros)"
           download:
             label: "Transferir"
             title: "Enviar mensagem com hiperligação de transferência"
@@ -2465,7 +2458,7 @@ pt:
         preview_digest: "Pré-visualizar Resumo"
         sending_test: "A enviar Email de teste..."
         error: "<b>ERRO</b> - %{server_error}"
-        test_error: "Occorreu um problema no envio do email de teste. Por favor verifique novamente as suas definições de email, verifique se o seu host não está a bloquear conexões de email, e tente novamente."
+        test_error: "Ocorreu um problema no envio da mensagem de teste. Por favor, verifique novamente as suas configurações de e-mail, verifique se o seu hospedeiro não está a bloquear as ligações de e-mail, e tente novamente."
         sent: "Enviado"
         skipped: "Ignorado"
         bounced: "Redirecionado"
@@ -2568,7 +2561,7 @@ pt:
             delete_post: "eliminar publicação"
             impersonate: "personificar"
             anonymize_user: "tornar utilizador anónimo"
-            roll_up: "agregar blocos IP"
+            roll_up: "agregar blocos de IP"
             change_category_settings: "alterar configurações de categoria"
             delete_category: "eliminar categoria"
             create_category: "criar categoria"
@@ -2583,7 +2576,7 @@ pt:
             backup_download: "transferir cópia de segurança"
         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."
+          description: "Quando alguém tenta criar uma nova conta, os seguintes endereços de e-mail serão verificados e o registo será bloqueado, ou outra ação executada."
           email: "Endereço de Email"
           actions:
             allow: "Permitir"
@@ -2613,6 +2606,9 @@ pt:
             title: "Cria interdições de sub-redes se existir pelo menos 'min_ban_entries_for_roll_up' entradas."
         logster:
           title: "Registo de Erros em Logs"
+      watched_words:
+        actions:
+          block: 'Bloquear'
       impersonate:
         title: "Personificar"
         help: "Utilize este ferramenta de forma a personificar uma conta de utilizador para fins de depuração. Terá de encerrar a sessão assim que terminar."
@@ -2635,11 +2631,11 @@ pt:
           suspect: 'Suspeito'
         approved: "Aprovado?"
         approved_selected:
-          one: "aprovar utilizador"
-          other: "aprovar utilizadores ({{count}})"
+          one: aprovar utilizador
+          other: aprovar utilizadores ({{count}})
         reject_selected:
-          one: "rejeitar utilizador"
-          other: "rejeitar utilizadores ({{count}})"
+          one: rejeitar utilizador
+          other: rejeitar utilizadores ({{count}})
         titles:
           active: 'Utilizadores Ativos'
           new: 'Utilizadores Novos'
@@ -2655,11 +2651,11 @@ pt:
           suspended: 'Utilizadores Suspensos'
           suspect: 'Utilizadores Suspeitos'
         reject_successful:
-          one: "1 utilizador foi rejeitado com sucesso."
-          other: "%{count} utilizadores foram rejeitados com sucesso."
+          one: 1 utilizador foi rejeitado com sucesso.
+          other: '%{count} utilizadores foram rejeitados com sucesso.'
         reject_failures:
-          one: "Falha ao rejeitar 1 utilizador."
-          other: "Falha ao rejeitar %{count} utilizadores."
+          one: Falha ao rejeitar 1 utilizador.
+          other: Falha ao rejeitar %{count} utilizadores.
         not_verified: "Não verificado"
         check_email:
           title: "Revelar o endereço de email deste utilizador"
@@ -2717,16 +2713,16 @@ pt:
         delete_forbidden_because_staff: "Administradores e moderadores não podem ser eliminados."
         delete_posts_forbidden_because_staff: "Não é possível eliminar todas as publicações dos administradores e moderadores."
         delete_forbidden:
-          one: "Utilizadores não podem ser eliminados se tiverem publicações. Apague todas as publicações antes de eliminar o utilizador. (Publicações com mais de %{count} dia de existência não podem ser eliminadas.)"
-          other: "Utilizadores não podem ser eliminados se tiverem publicações. Apague todas as publicações antes de eliminar o utilizador. (Publicações com mais de %{count} dias de existência não podem ser eliminadas.)"
+          one: Utilizadores não podem ser eliminados se tiverem publicações. Apague todas as publicações antes de eliminar o utilizador. (Publicações com mais de %{count} dia de existência não podem ser eliminadas.)
+          other: Utilizadores não podem ser eliminados se tiverem publicações. Apague todas as publicações antes de eliminar o utilizador. (Publicações com mais de %{count} dias de existência não podem ser eliminadas.)
         cant_delete_all_posts:
-          one: "Não é possível eliminar todas as publicações. Algumas publicações existem há mais de %{count} dia. (A configuração delete_user_max_post_age.)"
-          other: "Não é possível eliminar todas as publicações. Algumas publicações existem há mais de %{count} dias. (A configuração delete_user_max_post_age.)"
+          one: Não é possível eliminar todas as publicações. Algumas publicações existem há mais de %{count} dia. (A configuração delete_user_max_post_age.)
+          other: Não é possível eliminar todas as publicações. Algumas publicações existem há mais de %{count} dias. (A configuração delete_user_max_post_age.)
         cant_delete_all_too_many_posts:
-          one: "Não é possível eliminar todas as publicações porque o utilizador tem mais de 1 publicações. (delete_all_posts_max)"
-          other: "Não é possível eliminar todas as publicações porque o utilizador tem mais de %{count} publicações. (delete_all_posts_max)"
+          one: Não é possível eliminar todas as publicações porque o utilizador tem mais de 1 publicações. (delete_all_posts_max)
+          other: Não é possível eliminar todas as publicações porque o utilizador tem mais de %{count} publicações. (delete_all_posts_max)
         delete_confirm: "Tem a CERTEZA que deseja eliminar este utilizador? Esta ação é permanente!"
-        delete_and_block: "Eliminar e <b>bloquear<b> este endereço de email e IP"
+        delete_and_block: "Eliminar e <b>bloquear<b> este e-mail e endereço de IP"
         delete_dont_block: "Apenas eliminar"
         deleted: "O utilizador foi eliminado."
         delete_failed: "Ocorreu um erro ao eliminar o utilizador. Certifique-se de que todas as suas publicações foram apagadas antes de tentar eliminá-lo."
@@ -2759,8 +2755,8 @@ pt:
         tl3_requirements:
           title: "Requisitos para o Nível de Confiança 3"
           table_title:
-            one: "Nos último dia:"
-            other: "Nos últimos %{count}  dias:"
+            one: 'Nos último dia:'
+            other: 'Nos últimos %{count}  dias:'
           value_heading: "Valor"
           requirement_heading: "Requisito"
           visits: "Visitas"
@@ -2835,10 +2831,7 @@ pt:
         recommended: "Recomendamos personalizar o seguinte texto para que se aplique às suas necessidades."
         show_overriden: 'Apenas mostrar valores alterados'
       site_settings:
-        show_overriden: 'Apenas mostrar valores alterados'
         title: 'Configurações'
-        reset: 'repor'
-        none: 'nenhum'
         no_results: "Não foi encontrado nenhum resultado."
         clear_filter: "Remover"
         add_url: "adicionar URL"
@@ -2886,11 +2879,11 @@ pt:
         reason_help: (Uma ligação para uma publicação ou tópico)
         save: Guardar
         delete: Apagar
-        delete_confirm: Tem a certeza que quer eliminar este distintivo?
+        delete_confirm: "Tem a certeza que quer eliminar este distintivo?"
         revoke: Revogar
         reason: Motivo
         expand: Expandir &hellip;
-        revoke_confirm: Tem a certeza que quer revogar este distintivo?
+        revoke_confirm: "Tem a certeza que quer revogar este distintivo?"
         edit_badges: Editar Distintivos
         grant_badge: Conceder Distintivo
         granted_badges: Distintivos Concedidos
@@ -2904,10 +2897,9 @@ pt:
         enabled: Ativar distintivos
         icon: Ícone
         image: Imagem
-        icon_help: "Use uma classe Font Awesome ou um URL para uma imagem"
-        query: '"Query" de Distintivo (SQL)'
-        target_posts: '"Query" direcionada a publicações'
-        auto_revoke: 'Executar diariamente a "query" de revogação '
+        query: "\"Query\" de Distintivo (SQL)"
+        target_posts: "\"Query\" direcionada a publicações"
+        auto_revoke: "Executar diariamente a \"query\" de revogação "
         show_posts: Mostrar publicações de concessão de distintivo na página de distintivos
         trigger: Acionar
         trigger_type:
@@ -2928,14 +2920,14 @@ pt:
             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."
-            other: "<b>%{count}</b> distintivos a atribuir."
+            one: <b>1</b> distintivo a atribuir.
+            other: <b>%{count}</b> distintivos a atribuir.
           sample: "Amostra:"
           grant:
-            with: <span class="username">%{username}</span>
-            with_post: <span class="username">%{username}</span> pela publicação em %{link}
-            with_post_time: <span class="username">%{username}</span> pela publicação em %{link} às <span class="time">%{time}</span>
-            with_time: <span class="username">%{username}</span> às <span class="time">%{time}</span>
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span> pela publicação em %{link}"
+            with_post_time: "<span class=\"username\">%{username}</span> pela publicação em %{link} às <span class=\"time\">%{time}</span>"
+            with_time: "<span class=\"username\">%{username}</span> às <span class=\"time\">%{time}</span>"
       emoji:
         title: "Emoji"
         help: "Adicionar novo emoji que irá estar disponível para todos. (PROTIP: arraste múltiplos ficheiros de uma só vez)"
@@ -2979,7 +2971,7 @@ pt:
         category_id: "ID da Categoria"
         category_title: "Categoria"
         external_url: "URL Externo"
-        delete_confirm: Tem a certeza que deseja eliminar esta ligação permanente?
+        delete_confirm: "Tem a certeza que deseja eliminar esta ligação permanente?"
         form:
           label: "Novo:"
           add: "Adicionar"
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index b6a8c9da672..f2a47859d68 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -43,62 +43,62 @@ pt_BR:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: "< 1s"
-          other: "< %{count}s"
+          one: < 1s
+          other: < %{count}s
         x_seconds:
-          one: "1s"
-          other: "%{count}s"
+          one: 1s
+          other: '%{count}s'
         x_minutes:
-          one: "1m"
-          other: "%{count}m"
+          one: 1m
+          other: '%{count}m'
         about_x_hours:
-          one: "1h"
-          other: "%{count}h"
+          one: 1h
+          other: '%{count}h'
         x_days:
-          one: "1d"
-          other: "%{count}d"
+          one: 1d
+          other: '%{count}d'
         about_x_years:
-          one: "1a"
-          other: "%{count}a"
+          one: 1a
+          other: '%{count}a'
         over_x_years:
-          one: "> 1a"
-          other: "> %{count}a"
+          one: '> 1a'
+          other: '> %{count}a'
         almost_x_years:
-          one: "1a"
-          other: "%{count}a"
+          one: 1a
+          other: '%{count}a'
         date_month: "MMM D"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: "1 minuto"
-          other: "%{count} minutos"
+          one: 1 minuto
+          other: '%{count} minutos'
         x_hours:
-          one: "1 hora"
-          other: "%{count} horas"
+          one: 1 hora
+          other: '%{count} horas'
         x_days:
-          one: "1 dia"
-          other: "%{count} dias"
+          one: 1 dia
+          other: '%{count} dias'
         date_year: "MMM D, YY"
       medium_with_ago:
         x_minutes:
-          one: "1 minuto atrás"
-          other: "%{count} minutos atrás"
+          one: 1 minuto atrás
+          other: '%{count} minutos atrás'
         x_hours:
-          one: "1 hora atrás"
-          other: "%{count} horas atrás"
+          one: 1 hora atrás
+          other: '%{count} horas atrás'
         x_days:
-          one: "1 dia atrás"
-          other: "%{count} dias atrás"
+          one: 1 dia atrás
+          other: '%{count} dias atrás'
       later:
         x_days:
-          one: "1 dia depois"
-          other: "%{count} dias depois"
+          one: 1 dia depois
+          other: '%{count} dias depois'
         x_months:
-          one: "1 mês depois"
-          other: "%{count} meses depois"
+          one: 1 mês depois
+          other: '%{count} meses depois'
         x_years:
-          one: "1 ano depois"
-          other: "%{count} anos depois"
+          one: 1 ano depois
+          other: '%{count} anos depois'
       previous_month: 'Mês Anterior'
       next_month: 'Mês Seguinte'
     share:
@@ -111,7 +111,6 @@ pt_BR:
       email: 'enviar esse link para um email'
     action_codes:
       public_topic: "tornou este tópico público em %{when}"
-      private_topic: "tornou este tópico privado em %{when}"
       split_topic: "dividiu este tópico %{when}"
       invited_user: "convidou %{who} %{when}"
       invited_group: "convidou %{who} %{when}"
@@ -141,8 +140,6 @@ pt_BR:
     topic_admin_menu: "ações administrativas do tópico"
     wizard_required: "Bem vindo ao seu novo Discourse! Vamos começar com o <a href='%{url}' data-auto-route='true'>assistente de configuração</a> ✨"
     emails_are_disabled: "Todo o envio de email foi globalmente desabilitado por algum administrador. Nenhum email de notificações de qualquer tipo será enviado."
-    bootstrap_mode_enabled: "Para facilitar o lançamento do seu novo site, você esta no modo de inicialização. A todos os novos usuários, será concedido o nível de confiança 1 e eles terão o resumo diário de atualizações por email ativado. Isso será automaticamente desativado quando a contagem total de usuários exceder %{min_users} usuários."
-    bootstrap_mode_disabled: "O modo de inicialização será desativado nas próximas 24 horas."
     themes:
       default_description: "Padrão"
     s3:
@@ -178,8 +175,8 @@ pt_BR:
     show_help: "opções"
     links: "Links"
     links_lowercase:
-      one: "link"
-      other: "links"
+      one: link
+      other: links
     faq: "FAQ"
     guidelines: "Orientações"
     privacy_policy: "Política de Privacidade"
@@ -203,8 +200,8 @@ pt_BR:
     max_of_count: "max de {{count}}"
     alternation: "ou"
     character_count:
-      one: "{{count}} caracter"
-      other: "{{count}} caracteres"
+      one: '{{count}} caracter'
+      other: '{{count}} caracteres'
     suggested_topics:
       title: "Tópicos sugeridos"
       pm_title: "Mensagens Sugeridas"
@@ -216,8 +213,6 @@ pt_BR:
       our_moderators: "Nossos moderadores"
       stat:
         all_time: "Desde o começo"
-        last_7_days: "Últimos 7 dias"
-        last_30_days: "Últimos 30 dias"
       like_count: "Curtidas"
       topic_count: "Tópicos"
       post_count: "Mensagens"
@@ -238,16 +233,6 @@ pt_BR:
       last_read: "este é a última resposta que você leu; clique para favoritar."
       remove: "Remover favorito"
       confirm_clear: "Tem certeza que deseja apagar todos os atalhos deste tópico?"
-    topic_count_latest:
-      one: "{{count}} tópico novo ou atualizado."
-      other: "{{count}} tópicos novos ou atualizados."
-    topic_count_unread:
-      one: "{{count}} tópico não lido."
-      other: "{{count}} tópicos não lidos."
-    topic_count_new:
-      one: "{{count}} novo tópico."
-      other: "{{count}} novos tópicos."
-    click_to_show: "Clique para mostrar."
     preview: "pré-visualização"
     cancel: "cancelar"
     save: "Salvar mudanças"
@@ -284,16 +269,16 @@ pt_BR:
       cancel: "Cancelar"
       view_pending: "ver mensagens pendentes"
       has_pending_posts:
-        one: "Este tópico tem <b>1</b> mensagem aguardando aprovação"
-        other: "Este tópico tem <b>{{count}}</b> mensagens aguardando aprovação"
+        one: Este tópico tem <b>1</b> mensagem aguardando aprovação
+        other: Este tópico tem <b>{{count}}</b> mensagens aguardando aprovação
       confirm: "Salvar Mudanças"
       delete_prompt: "Você tem certeza que quer deletar <b>%{username}</b>? Esta ação irá remover todas as suas postagens e bloquear seu email e endereço IP."
       approval:
         title: "Aprovação Necessária da Mensagem"
         description: "Nós recebemos sua nova postagem mas é necessário que seja aprovada por um moderador antes de ser exibida. Por favor tenha paciência."
         pending_posts:
-          one: "Você tem <strong>1</strong> mensagem pendente."
-          other: "Você tem <strong>{{count}}</strong> mensagens pendentes."
+          one: Você tem <strong>1</strong> mensagem pendente.
+          other: Você tem <strong>{{count}}</strong> mensagens pendentes.
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> postou <a href='{{topicUrl}}'>o tópico</a>"
@@ -327,8 +312,8 @@ pt_BR:
       posts_read: "Lidos"
       posts_read_long: "Postagens Lidas"
       total_rows:
-        one: "1 usuário"
-        other: "%{count} usuários"
+        one: 1 usuário
+        other: '%{count} usuários'
     group_histories:
       actions:
         change_group_setting: "Alterar configurações do grupo"
@@ -337,22 +322,6 @@ pt_BR:
         make_user_group_owner: "Tornar proprietário"
         remove_user_as_group_owner: "Revogar proprietário"
     groups:
-      logs:
-        title: "Registros"
-        when: "Quando"
-        action: "Ação"
-        acting_user: "Usuário atuando"
-        target_user: "Usuário destino"
-        subject: "Assunto"
-        details: "Detalhes"
-        from: "De"
-        to: "Para"
-      edit:
-        title: 'Editar Grupo'
-        full_name: 'Nome Completo'
-        add_members: "Adicionar Membros"
-        delete_member_confirm: "Remover '%{username}' do grupo '%{group}'?"
-      name_placeholder: "Nome do grupo, sem espaços, regras iguais ao nome de usuário"
       public_admission: "Permitir que os usuários se juntem ao grupo livremente (Requer grupo visível ao público)"
       public_exit: "Permitir que os usuários deixem o grupo livremente"
       empty:
@@ -363,36 +332,24 @@ pt_BR:
         topics: "Não há tópicos de membros deste grupo."
         logs: "Não há registros para este grupo."
       add: "Adicionar"
-      join: "Entrar no Grupo"
-      leave: "Sair do Grupo"
-      request: "Pedir para Entrar no Grupo"
       message: "Mensagem"
-      automatic_group: Grupo Automático
-      closed_group: Grupo Fechado
-      is_group_user: "Você é membro deste grupo"
       allow_membership_requests: "Permitir usuários enviar pedidos de adesão a proprietários de grupos"
       membership_request:
         submit: "Enviar Pedido"
         title: "Pedir para entrar no grupo @%{group_name}"
       membership: "Adesão"
       name: "Nom"
-      user_count: "Número de Membros"
       bio: "Sobre o Grupo"
-      selector_placeholder: "Adicionar membros"
       owner: "proprietário"
       index:
         title: "Grupos"
         empty: "Não há grupos visíveis."
       activity: "Atividade"
-      members: "Membros"
       topics: "Tópicos"
       posts: "Mensagens"
       mentions: "Menções"
       messages: "Mensagens"
       notification_level: "Nível de notificação padrão para mensagens de grupo"
-      visibility_levels:
-        title: "Quem pode ver este grupo?"
-        public: "Todo mundo"
       alias_levels:
         mentionable: "Quem pode @mencionar este grupo?"
         messageable: "Quem pode enviar mensagens a este grupo?"
@@ -401,9 +358,6 @@ pt_BR:
         mods_and_admins: "Somente moderadores e Administradores"
         members_mods_and_admins: "Somente membros do grupo, moderadores e administradores"
         everyone: "Todos"
-      trust_levels:
-        title: "Nível de Confiança automaticamente concedido aos membros quando eles são incluídos"
-        none: "Nenhum"
       notifications:
         watching:
           title: "Observando"
@@ -428,23 +382,21 @@ pt_BR:
       flair_color_placeholder: "(Opcional) Valor em hexadecimal da cor"
       flair_preview_icon: "Pré-visualizar Ícone"
       flair_preview_image: "Pré-visualizar Imagem"
-      flair_note: "Nota: o Flair somente será exibido para o grupo primário do usuário."
     user_action_groups:
-      '1': "Curtidas dadas"
-      '2': "Curtidas recebidas"
-      '3': "Favoritos"
-      '4': "Tópicos"
-      '5': "Respostas"
-      '6': "Respostas"
-      '7': "Menções"
-      '9': "Citações"
-      '11': "Edições"
-      '12': "Itens enviados"
-      '13': "Caixa de Entrada"
-      '14': "Pendente"
+      "1": "Curtidas dadas"
+      "2": "Curtidas recebidas"
+      "3": "Favoritos"
+      "4": "Tópicos"
+      "5": "Respostas"
+      "6": "Respostas"
+      "7": "Menções"
+      "9": "Citações"
+      "11": "Edições"
+      "12": "Itens enviados"
+      "13": "Caixa de Entrada"
+      "14": "Pendente"
     categories:
       all: "todas as categorias"
-      all_subcategories: "todos"
       no_subcategory: "nenhum"
       category: "Categoria"
       category_list: "Exibir lista de categorias."
@@ -463,11 +415,11 @@ pt_BR:
       toggle_ordering: "alternar controle de ordenação"
       subcategories: "Subcategorias"
       topic_sentence:
-        one: "1 tópico"
-        other: "%{count} tópicos"
+        one: 1 tópico
+        other: '%{count} tópicos'
       topic_stat_sentence:
-        one: "%{count} novo tópico nos últimos %{unit}."
-        other: "%{count} novos tópicos nos últimos %{unit}."
+        one: '%{count} novo tópico nos últimos %{unit}.'
+        other: '%{count} novos tópicos nos últimos %{unit}.'
     ip_lookup:
       title: Pesquisa do endereço de IP
       hostname: Nome do host
@@ -508,7 +460,6 @@ pt_BR:
       notifications: "Notificações"
       statistics: "Estatísticas"
       desktop_notifications:
-        label: "Notificações de Área de Trabalho"
         not_supported: "Notificações não são suportadas nesse browser. Desculpe-nos."
         perm_default: "Habilitar Notificações"
         perm_denied_btn: "Permissão Negada"
@@ -523,7 +474,6 @@ pt_BR:
       disable_jump_reply: "Não pular para o meu tópico depois que eu respondo"
       dynamic_favicon: "Exibir ícone no navegador de tópicos novos / atualizados."
       theme_default_on_all_devices: "Definir este tema como padrão em todos os meus dispositivos"
-      allow_private_messages: "Permitir que outros usuários me mandem mensagens privadas"
       external_links_in_new_tab: "Abrir todos os links externos em uma nova aba"
       enable_quoting: "Ativar resposta citando o texto destacado"
       change: "alterar"
@@ -566,7 +516,6 @@ pt_BR:
       delete_account: "Excluir Minha Conta"
       delete_account_confirm: "Tem certeza de que deseja excluir permanentemente a sua conta? Essa ação não pode ser desfeita!"
       deleted_yourself: "Sua conta foi excluída com sucesso."
-      delete_yourself_not_allowed: "Você não pode excluir a sua conta agora. Contate um administrador para apagar a sua conta para você."
       unread_message_count: "Mensagens"
       admin_delete: "Apagar"
       users: "Usuários"
@@ -655,8 +604,8 @@ pt_BR:
         authenticated: "Seu email foi autenticado por {{provider}}"
         frequency_immediately: "Não se preocupe, caso você não leia uma mensagem, enviaremos um email para você."
         frequency:
-          one: "Nós apenas te enviaremos email se não o tivermos visto no último minuto."
-          other: "Nós apenas te enviaremos email se não o tivermos visto nos últimos {{count}} minutos."
+          one: Nós apenas te enviaremos email se não o tivermos visto no último minuto.
+          other: Nós apenas te enviaremos email se não o tivermos visto nos últimos {{count}} minutos.
       name:
         title: "Nome"
         instructions: "seu nome completo (opcional)"
@@ -687,8 +636,6 @@ pt_BR:
       created: "Entrou"
       log_out: "Sair"
       location: "Localização"
-      card_badge:
-        title: "Cartão de emblemas do usuário"
       website: "Web Site"
       email_settings: "Email"
       like_notification_frequency:
@@ -745,10 +692,9 @@ pt_BR:
         title: "Convites"
         user: "Usuários convidados"
         sent: "Enviado"
-        none: "Não existem convites pendentes para exibir."
         truncated:
-          one: "Mostrando os primeiro convite."
-          other: "Mostrando os primeiros {{count}} convites."
+          one: Mostrando os primeiro convite.
+          other: Mostrando os primeiros {{count}} convites.
         redeemed: "Convites usados"
         redeemed_tab: "Resgatado"
         redeemed_tab_with_count: "Resgatado ({{count}})"
@@ -794,20 +740,20 @@ pt_BR:
         stats: "Estatísticas"
         time_read: "tempo de leitura"
         topic_count:
-          one: "tópico criado"
-          other: "tópicos criados"
+          one: tópico criado
+          other: tópicos criados
         post_count:
-          one: "post criado"
-          other: "posts criados"
+          one: post criado
+          other: posts criados
         days_visited:
-          one: "dia visitado"
-          other: "dias visitados"
+          one: dia visitado
+          other: dias visitados
         posts_read:
-          one: "post lido"
-          other: "posts lidos"
+          one: post lido
+          other: posts lidos
         bookmark_count:
-          one: "favorito"
-          other: "favoritos"
+          one: favorito
+          other: favoritos
         top_replies: "Mais Respondidos"
         no_replies: "Nenhuma resposta ainda."
         more_replies: "Mais Respostas"
@@ -875,8 +821,8 @@ pt_BR:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> alcançou a configuração limite do site de %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> excedeu a configuração limite do site de %{siteSettingRate}."
       rate:
-        one: "1 erro/%{duration}"
-        other: "%{count} erros/%{duration}"
+        one: 1 erro/%{duration}
+        other: '%{count} erros/%{duration}'
     learn_more: "aprenda mais..."
     all_time: 'total'
     all_time_desc: 'total de tópicos criados'
@@ -1049,8 +995,8 @@ pt_BR:
       similar_topics: "Seu tópico é parecido com..."
       drafts_offline: "rascunhos offline"
       group_mentioned:
-        one: "Ao mencionar {{group}}, você está prester a notifcar <a href='{{group_link}}'>1 pessoa</a> – tem certeza?"
-        other: "Ao mencionar {{group}}, você está prestes a notificar <a href='{{group_link}}'>{{count}} pessoas</a> – tem certeza?"
+        one: Ao mencionar {{group}}, você está prester a notifcar <a href='{{group_link}}'>1 pessoa</a> – tem certeza?
+        other: Ao mencionar {{group}}, você está prestes a notificar <a href='{{group_link}}'>{{count}} pessoas</a> – tem certeza?
       cannot_see_mention:
         category: "Você mencionou {{username}}, porém ele(a) não será notificado(a), pois não tem acesso a essa categoria. Você deverá adicioná-lo(a) ao grupo que tem acesso à categoria."
         private: "Você mencionou {{username}}, porém ele(a) não será notificado(a), pois não pode ver essa mensagem pessoal. Você deverá convidá-lo(a) para essa MP."
@@ -1139,29 +1085,12 @@ pt_BR:
       granted_badge: "Adquiriu '{{description}}'"
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>Novo Tópico</span> {{description}}"
-      alt:
-        mentioned: "Mencionado por"
-        quoted: "Citado por"
-        replied: "Respondido"
-        posted: "Mensagem por"
-        edited: "Edição na sua mensagem por"
-        liked: "Curtiu sua mensagem"
-        private_message: "Mensagem privada de"
-        invited_to_private_message: "Convidou para uma mensagem privada"
-        invited_to_topic: "Convite para um tópico de"
-        invitee_accepted: "Convite aceito por"
-        moved_post: "Seu tópico foi movido por"
-        linked: "Link para sua mensagem"
-        granted_badge: "Emblema concedido"
-        group_message_summary: "Mensagens na caixa de entrada do grupo"
-        topic_reminder: "Um lembrete"
       popup:
         mentioned: '{{username}} mencionou você em "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} mencionou você em "{{topic}}" - {{site_title}}'
         quoted: '{{username}} citou você em "{{topic}}" - {{site_title}}'
         replied: '{{username}} respondeu para você em "{{topic}}" - {{site_title}}'
         posted: '{{username}} postou em "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} enviou uma mensagem particular para você em "{{topic}}" - {{site_title}}'
         linked: '{{username}} linkou o seu post de "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Adicionar uma imagem"
@@ -1260,8 +1189,8 @@ pt_BR:
         notification_level: "Notificações"
         choose_new_category: "Escolha a nova categoria para os tópicos:"
         selected:
-          one: "Você selecionou <b>1</b> tópico."
-          other: "Você selecionou <b>{{count}}</b> tópicos."
+          one: Você selecionou <b>1</b> tópico.
+          other: Você selecionou <b>{{count}}</b> tópicos.
         change_tags: "Substituir marcadores"
         append_tags: "Adicionar Etiquetas"
         choose_new_tags: "Escolha novas tags para esses tópicos:"
@@ -1293,12 +1222,9 @@ pt_BR:
         bookmarks: "Não há mais tópicos nos favoritos."
         search: "Não existem mais resultados."
     topic:
-      unsubscribe:
-        stop_notifications: "Você agora vai receber menos notificações de <strong>{{title}}</strong>"
-        change_notification_state: "Seu estado de notificação atual é"
       filter_to:
-        one: "1 publicação no tópico"
-        other: "{{count}} publicações no tópico"
+        one: 1 publicação no tópico
+        other: '{{count}} publicações no tópico'
       create: 'Novo tópico'
       create_long: 'Criar um novo tópico'
       private_message: 'Iniciar uma mensagem'
@@ -1312,10 +1238,10 @@ pt_BR:
       new: 'novo tópico'
       unread: 'não lido'
       new_topics:
-        one: '1 tópico novo'
+        one: 1 tópico novo
         other: '{{count}} novos tópicos'
       unread_topics:
-        one: '1 tópico não lido'
+        one: 1 tópico não lido
         other: '{{count}} tópicos não lidos'
       title: 'Tópico'
       invalid_access:
@@ -1329,17 +1255,17 @@ pt_BR:
         title: "Tópico não encontrado"
         description: "Desculpe, não foi possível encontrar esse tópico. Talvez ele tenha sido apagado?"
       total_unread_posts:
-        one: "você tem {{count}} post não lido neste tópico"
-        other: "você tem {{count}} posts não lidos neste tópico"
+        one: você tem {{count}} post não lido neste tópico
+        other: você tem {{count}} posts não lidos neste tópico
       unread_posts:
-        one: "você possui 1 resposta antiga que não foi lida neste tópico"
-        other: "você possui {{count}} respostas antigas que não foram lidas neste tópico"
+        one: você possui 1 resposta antiga que não foi lida neste tópico
+        other: você possui {{count}} respostas antigas que não foram lidas neste tópico
       new_posts:
-        one: "há 1 nova resposta neste tópico desde a sua última leitura"
-        other: "há {{count}} novas respostas neste tópico desde a sua última leitura"
+        one: há 1 nova resposta neste tópico desde a sua última leitura
+        other: há {{count}} novas respostas neste tópico desde a sua última leitura
       likes:
-        one: "há 1 curtida neste tópico"
-        other: "há {{count}} curtidas neste tópico"
+        one: há 1 curtida neste tópico
+        other: há {{count}} curtidas neste tópico
       back_to_list: "Voltar a lista dos tópicos"
       options: "Opções do tópico"
       show_links: "mostrar links dentro desse tópico"
@@ -1349,7 +1275,7 @@ pt_BR:
       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?
+      suggest_create_topic: "Que tal criar um tópico?"
       jump_reply_up: pular para a resposta mais recente
       jump_reply_down: pular para a resposta mais antiga
       deleted: "Este tópico foi apagado"
@@ -1393,8 +1319,8 @@ pt_BR:
         auto_delete: "Este tópico será automaticamente apagado %{timeLeft}."
       auto_close_title: 'Configurações para fechar automaticamente'
       auto_close_immediate:
-        one: "A última publicação no tópico já tem 1 hora, portanto ele será fechado imediatamente."
-        other: "A última publicação no tópico já tem %{count} horas, portanto ele será fechado imediatamente."
+        one: A última publicação no tópico já tem 1 hora, portanto ele será fechado imediatamente.
+        other: A última publicação no tópico já tem %{count} horas, portanto ele será fechado imediatamente.
       timeline:
         back: "Voltar"
         back_description: "Volte para a sua última postagem não lida"
@@ -1415,17 +1341,17 @@ pt_BR:
         title: altere a frequência de notificações deste tópico
         reasons:
           mailing_list_mode: "Você está com o modo de lista de discussão ativado, portanto será notificado sobre as respostas deste tópico por email."
-          '3_10': 'Você receberá notificações porque está acompanhando uma etiqueta neste tópico.'
-          '3_6': 'Você receberá notificações porque você está observando esta categoria.'
-          '3_5': 'Você receberá notificações porque começou a observar este tópico automaticamente.'
-          '3_2': 'Você receberá notificações porque está observando este tópico.'
-          '3_1': 'Você receberá notificações porque criou este tópico.'
-          '3': 'Você receberá notificações porque você está observando este tópico.'
-          '1_2': 'Você será notificado se alguém mencionar o seu @nome ou responder à sua mensagem.'
-          '1': 'Você será notificado se alguém mencionar o seu @nome ou responder à sua mensagem.'
-          '0_7': 'Você está ignorando todas as notificações nessa categoria.'
-          '0_2': 'Você está ignorando todas as notificações deste tópico.'
-          '0': 'Você está ignorando todas as notificações deste tópico.'
+          "3_10": 'Você receberá notificações porque está acompanhando uma etiqueta neste tópico.'
+          "3_6": 'Você receberá notificações porque você está observando esta categoria.'
+          "3_5": 'Você receberá notificações porque começou a observar este tópico automaticamente.'
+          "3_2": 'Você receberá notificações porque está observando este tópico.'
+          "3_1": 'Você receberá notificações porque criou este tópico.'
+          "3": 'Você receberá notificações porque você está observando este tópico.'
+          "1_2": 'Você será notificado se alguém mencionar o seu @nome ou responder à sua mensagem.'
+          "1": 'Você será notificado se alguém mencionar o seu @nome ou responder à sua mensagem.'
+          "0_7": 'Você está ignorando todas as notificações nessa categoria.'
+          "0_2": 'Você está ignorando todas as notificações deste tópico.'
+          "0": 'Você está ignorando todas as notificações deste tópico.'
         watching_pm:
           title: "Observando"
           description: "Você será notificado de cada mensagem nova neste tópico. Um contador de mensagens novas e não lidas também aparecerá próximo ao tópico."
@@ -1464,7 +1390,6 @@ pt_BR:
         visible: "Tornar Visível"
         reset_read: "Repor data de leitura"
         make_public: "Transformar em Tópico Público"
-        make_private: "Transformar em Mensagem Privada"
       feature:
         pin: "Fixar Tópico"
         unpin: "Desafixar Tópico"
@@ -1497,8 +1422,8 @@ pt_BR:
         pin_validation: "Uma data é necessária para fixar este tópico."
         not_pinned: "Não existem tópicos fixados em {{categoryLink}}."
         already_pinned:
-          one: "Tópicos fixados em {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
-          other: "Tópicos fixados em {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: 'Tópicos fixados em {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Tópicos fixados em {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         pin_globally: "Fazer com que este tópico apareça no topo de todas listas de tópicos até"
         confirm_pin_globally: "Você já tem {{count}} tópicos fixados globalmente. Muitos tópicos fixados podem prejudicar usuários novos e anônimos. Tem certeza que quer fixar outro tópico globalmente?"
         unpin_globally: "Remover este tópico do inicio de todas as listas de tópicos."
@@ -1506,8 +1431,8 @@ pt_BR:
         global_pin_note: "Usuários podem desafixar o tópico individualmente para si."
         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'>{{count}}</strong>."
-          other: "Tópicos atualmente fixados globalmente: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: 'Tópicos atualmente fixados globalmente: <strong class=''badge badge-notification unread''>{{count}}</strong>.'
+          other: 'Tópicos atualmente fixados globalmente: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         make_banner: "Tornar este tópico em um banner que apareça no inicio de todas as páginas."
         remove_banner: "Remover o banner que aparece no inicio de todas as páginas."
         banner_note: "Usuários podem dispensar o banner fechando-o. Apenas um tópico pode ser colocado como banner a cada momento."
@@ -1543,8 +1468,8 @@ pt_BR:
       login_reply: 'Logar para Responder'
       filters:
         n_posts:
-          one: "1 mensagem"
-          other: "{{count}} mensagens"
+          one: 1 mensagem
+          other: '{{count}} mensagens'
         cancel: "Remover filtro"
       split_topic:
         title: "Mover para novo tópico"
@@ -1552,15 +1477,15 @@ pt_BR:
         topic_name: "Nome do tópico novo"
         error: "Houve um erro ao mover as mensagens para o novo tópico."
         instructions:
-          one: "Você está prestes a criar um novo tópico e populá-lo com a resposta que você selecionou."
-          other: "Você está prestes a criar um novo tópico e populá-lo com as <b>{{count}}</b> respostas que você selecionou."
+          one: Você está prestes a criar um novo tópico e populá-lo com a resposta que você selecionou.
+          other: Você está prestes a criar um novo tópico e populá-lo com as <b>{{count}}</b> respostas que você selecionou.
       merge_topic:
         title: "Mover para tópico já existente"
         action: "mover para tópico já existente"
         error: "Houve um erro ao mover as mensagens para aquele tópico."
         instructions:
-          one: "Por favor selecione o tópico para o qual você gostaria de mover esta resposta."
-          other: "Por favor selecione o tópico para o qual você gostaria de mover estas <b>{{count}}</b> respostas."
+          one: Por favor selecione o tópico para o qual você gostaria de mover esta resposta.
+          other: Por favor selecione o tópico para o qual você gostaria de mover estas <b>{{count}}</b> respostas.
       merge_posts:
         title: "Unificar as Mensagens Selecionadas"
         action: "unificar as mensagens selecionadas"
@@ -1572,9 +1497,8 @@ pt_BR:
         label: "Novo Autor das Mensagens"
         placeholder: "novo autor"
         instructions:
-          one: "Por favor, escolha o novo dono do post por  <b>{{old_user}}</b>."
-          other: "Por favor, escolha o novo autor dessas {{count}} mensagens que eram de <b>{{old_user}}</b>."
-        instructions_warn: "Note que qualquer notificação sobre esta mensagem não irá ser transferida para o novo usuário retroativamente.<br>Alerta: Atualmente, nenhum dado dependente da mensagem será transferido para o novo usuário. Use com cuidado."
+          one: Por favor, escolha o novo dono do post por  <b>{{old_user}}</b>.
+          other: Por favor, escolha o novo autor dessas {{count}} mensagens que eram de <b>{{old_user}}</b>.
       change_timestamp:
         action: "alterar horário"
         invalid_timestamp: "Horário não pode ser no futuro."
@@ -1591,8 +1515,6 @@ pt_BR:
           one: <b>1</b> resposta selecionada.
           other: <b>{{count}}</b> respostas selecionadas.
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Citação"
       edit_reason: "Motivo:"
       post_number: "resposta {{number}}"
@@ -1605,26 +1527,26 @@ pt_BR:
       show_full: "Exibir mensagem completa"
       show_hidden: 'Ver conteúdo escondido'
       deleted_by_author:
-        one: "(respostas abandonadas pelo autor, serão removidas automaticamente em %{count} hora a exceto se forem sinalizadas)"
-        other: "(respostas abandonadas pelo autor, serão removidas automaticamente em %{count} horas a exceto se forem sinalizadas)"
+        one: (respostas abandonadas pelo autor, serão removidas automaticamente em %{count} hora a exceto se forem sinalizadas)
+        other: (respostas abandonadas pelo autor, serão removidas automaticamente em %{count} horas a exceto se forem sinalizadas)
       expand_collapse: "expandir/encolher"
       gap:
-        one: "ver 1 resposta oculta"
-        other: "ver {{count}} respostas ocultas"
+        one: ver 1 resposta oculta
+        other: ver {{count}} respostas ocultas
       unread: "Resposta não lida"
       has_replies:
-        one: "{{count}} Resposta"
-        other: "{{count}} Respostas"
+        one: '{{count}} Resposta'
+        other: '{{count}} Respostas'
       has_likes:
-        one: "{{count}} Curtida"
-        other: "{{count}} Curtidas"
+        one: '{{count}} Curtida'
+        other: '{{count}} Curtidas'
       has_likes_title:
-        one: "{{count}} pessoa curtiu esta mensagem"
-        other: "{{count}} pessoas curtiram esta mensagem"
+        one: '{{count}} pessoa curtiu esta mensagem'
+        other: '{{count}} pessoas curtiram esta mensagem'
       has_likes_title_only_you: "você curtiu esta postagem"
       has_likes_title_you:
-        one: "você e mais 1 pessoa gostaram dessa postagem"
-        other: "você e mais {{count}} outras pessoas gostaram dessa postagem"
+        one: você e mais 1 pessoa gostaram dessa postagem
+        other: você e mais {{count}} outras pessoas gostaram dessa postagem
       errors:
         create: "Desculpe, houve um erro ao criar sua resposta. Por favor, tente outra vez."
         edit: "Desculpe, houve um erro ao editar sua resposta. Por favor, tente outra vez."
@@ -1698,54 +1620,54 @@ pt_BR:
           vote: "Você votou nesta resposta"
         by_you_and_others:
           off_topic:
-            one: "Você e mais 1 pessoa sinalizaram isto como off-topic"
-            other: "Você e mais {{count}} pessoas sinalizaram isto como off-topic"
+            one: Você e mais 1 pessoa sinalizaram isto como off-topic
+            other: Você e mais {{count}} pessoas sinalizaram isto como off-topic
           spam:
-            one: "Você e mais 1 pessoa sinalizaram isto como spam"
-            other: "Você e mais {{count}} pessoas sinalizaram isto como spam"
+            one: Você e mais 1 pessoa sinalizaram isto como spam
+            other: Você e mais {{count}} pessoas sinalizaram isto como spam
           inappropriate:
-            one: "Você e mais 1 pessoa sinalizaram isto como inapropriado"
-            other: "Você e mais {{count}} pessoas sinalizaram isto como inapropriado"
+            one: Você e mais 1 pessoa sinalizaram isto como inapropriado
+            other: Você e mais {{count}} pessoas sinalizaram isto como inapropriado
           notify_moderators:
-            one: "Você e mais 1 pessoa sinalizaram isto para moderação"
-            other: "Você e mais {{count}} pessoas sinalizaram isto para moderação"
+            one: Você e mais 1 pessoa sinalizaram isto para moderação
+            other: Você e mais {{count}} pessoas sinalizaram isto para moderação
           notify_user:
-            one: "Você e 1 outro usuário enviaram mensagens particulares para este usuário"
-            other: "Você e mais {{count}} usuários enviaram mensagens particulares para este usuário"
+            one: Você e 1 outro usuário enviaram mensagens particulares para este usuário
+            other: Você e mais {{count}} usuários enviaram mensagens particulares para este usuário
           bookmark:
-            one: "Você e mais 1 pessoa favoritaram esta resposta"
-            other: "Você e mais {{count}} favoritaram esta resposta"
+            one: Você e mais 1 pessoa favoritaram esta resposta
+            other: Você e mais {{count}} favoritaram esta resposta
           like:
-            one: "Você e mais 1 pessoa curtiu isto"
-            other: "Você e mais {{count}} pessoas curtiram isto"
+            one: Você e mais 1 pessoa curtiu isto
+            other: Você e mais {{count}} pessoas curtiram isto
           vote:
-            one: "Você e mais 1 pessoa votaram nesta resposta"
-            other: "Você e mais {{count}} pessoas votaram nesta resposta"
+            one: Você e mais 1 pessoa votaram nesta resposta
+            other: Você e mais {{count}} pessoas votaram nesta resposta
         by_others:
           off_topic:
-            one: "1 pessoa sinalizou isto como off-topic"
-            other: "{{count}} pessoas sinalizaram isto como off-topic"
+            one: 1 pessoa sinalizou isto como off-topic
+            other: '{{count}} pessoas sinalizaram isto como off-topic'
           spam:
-            one: "1 pessoa sinalizou isto como spam"
-            other: "{{count}} pessoas sinalizaram isto como spam"
+            one: 1 pessoa sinalizou isto como spam
+            other: '{{count}} pessoas sinalizaram isto como spam'
           inappropriate:
-            one: "1 pessoa sinalizou isto como inapropriado"
-            other: "{{count}} pessoas sinalizaram isto como inapropriado"
+            one: 1 pessoa sinalizou isto como inapropriado
+            other: '{{count}} pessoas sinalizaram isto como inapropriado'
           notify_moderators:
-            one: "1 pessoa sinalizou isto para moderação"
-            other: "{{count}} pessoas sinalizaram isto para moderação"
+            one: 1 pessoa sinalizou isto para moderação
+            other: '{{count}} pessoas sinalizaram isto para moderação'
           notify_user:
-            one: "1 usuário enviou mensagem particular para este usuário"
-            other: "{{count}} enviaram mensagem particular para este usuário"
+            one: 1 usuário enviou mensagem particular para este usuário
+            other: '{{count}} enviaram mensagem particular para este usuário'
           bookmark:
-            one: "1 pessoa favoritou esta resposta"
-            other: "{{count}} pessoas favoritaram esta resposta"
+            one: 1 pessoa favoritou esta resposta
+            other: '{{count}} pessoas favoritaram esta resposta'
           like:
-            one: "1 pessoa curtiu"
-            other: "{{count}} pessoas curtiram"
+            one: 1 pessoa curtiu
+            other: '{{count}} pessoas curtiram'
           vote:
-            one: "1 pessoa votou nesta resposta"
-            other: "{{count}} pessoas votaram nesta resposta"
+            one: 1 pessoa votou nesta resposta
+            other: '{{count}} pessoas votaram nesta resposta'
       revisions:
         controls:
           first: "Primeira revisão"
@@ -1825,7 +1747,6 @@ pt_BR:
       email_in_allow_strangers: "Aceitar emails de usuários anônimos sem cont"
       email_in_disabled: "Postar novos tópicos via email está desabilitado nas Configurações do Site. Para habilitar respostas em novos tópicos via email,"
       email_in_disabled_click: 'habilitar a configuração de "email em".'
-      suppress_from_homepage: "Suprimir esta categoria da página inicial."
       show_subcategory_list: "Exibir lista de subcategorias acima dos tópicos nesta categoria."
       num_featured_topics: "Número de tópicos exibidos na página de Categorias:"
       subcategory_num_featured_topics: "Número de tópicos em destaque na página da categoria pai:"
@@ -1898,14 +1819,14 @@ pt_BR:
       custom_placeholder_notify_moderators: "Deixe-nos saber especificamente com o que você está preocupado, e nos forneça links relevantes e exemplos quando possível."
       custom_message:
         at_least:
-          one: "insira pelo menos 1 caractere"
-          other: "insira pelo menos {{count}} caracteres"
+          one: insira pelo menos 1 caractere
+          other: insira pelo menos {{count}} caracteres
         more:
-          one: "Falta apenas 1..."
-          other: "Faltam {{count}}..."
+          one: Falta apenas 1...
+          other: Faltam {{count}}...
         left:
-          one: "1 restante"
-          other: "{{count}} restantes"
+          one: 1 restante
+          other: '{{count}} restantes'
     flagging_topic:
       title: "Obrigado por ajudar a manter a civilidade da nossa comunidade!"
       action: "Sinalizar Tópico"
@@ -1916,13 +1837,13 @@ pt_BR:
       links_title: "Links Populares"
       links_shown: "mostrar mais links..."
       clicks:
-        one: "1 clique"
-        other: "%{count} cliques"
+        one: 1 clique
+        other: '%{count} cliques'
     post_links:
       about: "expandir mais links para esta mensagem"
       title:
-        one: "mais 1"
-        other: "mais %{count}"
+        one: mais 1
+        other: mais %{count}
     topic_statuses:
       warning:
         help: "Este é um aviso oficial."
@@ -1956,22 +1877,22 @@ pt_BR:
     original_post: "Resposta original"
     views: "Visualizações"
     views_lowercase:
-      one: "visualizar"
-      other: "visualizações"
+      one: visualizar
+      other: visualizações
     replies: "Respostas"
     views_long:
-      one: "este tópico foi visto uma vez"
-      other: "este tópico foi visto {{number}} vezes"
+      one: este tópico foi visto uma vez
+      other: este tópico foi visto {{number}} vezes
     activity: "Atividade"
     likes: "Curtidas"
     likes_lowercase:
-      one: "like"
-      other: "likes"
+      one: like
+      other: likes
     likes_long: "há {{number}} curtidas neste tópico"
     users: "Usuários"
     users_lowercase:
-      one: "usuário"
-      other: "usuários"
+      one: usuário
+      other: usuários
     category_title: "Categoria"
     history: "Histórico"
     changed_by: "por {{author}}"
@@ -1985,8 +1906,8 @@ pt_BR:
       latest:
         title: "Recente"
         title_with_count:
-          one: "Recente (1)"
-          other: "Recentes ({{count}})"
+          one: Recente (1)
+          other: Recentes ({{count}})
         help: "tópicos com mensagens recentes"
       hot:
         title: "Quente"
@@ -2004,21 +1925,21 @@ pt_BR:
       unread:
         title: "Não lidas"
         title_with_count:
-          one: "Não lido (1)"
-          other: "Não lidos ({{count}})"
+          one: Não lido (1)
+          other: Não lidos ({{count}})
         help: "tópicos que você está observando ou monitorando com mensagens não lidas"
         lower_title_with_count:
-          one: "1 não lido"
-          other: "{{count}} não lidos"
+          one: 1 não lido
+          other: '{{count}} não lidos'
       new:
         lower_title_with_count:
-          one: "1 nova"
-          other: "{{count}} novas"
+          one: 1 nova
+          other: '{{count}} novas'
         lower_title: "nova"
         title: "Novo"
         title_with_count:
-          one: "Novo (1)"
-          other: "Novos ({{count}})"
+          one: Novo (1)
+          other: Novos ({{count}})
         help: "tópicos criados nos últimos dias"
       posted:
         title: "Minhas mensagens"
@@ -2029,8 +1950,8 @@ pt_BR:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: "{{categoryName}} (1)"
-          other: "{{categoryName}} ({{count}})"
+          one: '{{categoryName}} (1)'
+          other: '{{categoryName}} ({{count}})'
         help: "tópicos recentes na categoria {{categoryName}}"
       top:
         title: "Melhores"
@@ -2114,22 +2035,21 @@ pt_BR:
         print: '<b>ctrl</b>+<b>p</b> Imprimir tópico'
     badges:
       earned_n_times:
-        one: "Emblema adquirido 1 vez"
-        other: "Emblema adquirido %{count} vezes"
+        one: Emblema adquirido 1 vez
+        other: Emblema adquirido %{count} vezes
       granted_on: "Concedido em %{date}"
       others_count: "Outros com esse emblema (%{count})"
       title: Emblemas
       badge_count:
-        one: "1 Emblema"
-        other: "%{count} Emblemas"
+        one: 1 Emblema
+        other: '%{count} Emblemas'
       more_badges:
-        one: "+1 Mais"
-        other: "+%{count} Mais"
+        one: +1 Mais
+        other: +%{count} Mais
       granted:
-        one: "1 concedido"
-        other: "%{count} concedidos"
+        one: 1 concedido
+        other: '%{count} concedidos'
       select_badge_for_title: Selecione um emblema para usar como o seu título
-      none: "<nenhum>"
       badge_grouping:
         getting_started:
           name: Primeiros Passos
@@ -2172,19 +2092,15 @@ pt_BR:
       notifications:
         watching:
           title: "Observando"
-          description: "Você vai observar automaticamente todos os tópicos com esta etriqueta. Você será notificado de todas as novas mensagens e tópicos.  Além disso, a contagem de mensagens não lidas e novas também aparecerá ao lado do tópico."
         watching_first_post:
           title: "Observando o primeiro post"
-          description: "Você somente será notificado sobre a primeira postagem em cada novo tópico com esta etiqueta."
         tracking:
           title: "Monitorando"
-          description: "Automaticamente monitora todos tópicos com essa etiqueta. Uma contagem de posts não lidos e novos aparecerá próximo ao tópico."
         regular:
           title: "Normal"
           description: "Você será notificado se alguém mencionar o seu @nome ou responder à sua mensagem."
         muted:
           title: "Silenciado"
-          description: "Você não será notificado sobre novos tópicos com essa etiqueta e eles não vão aparecer na guia de mensagens não lidas."
       groups:
         title: "Grupos de Etiquetas"
         about: "Adicione marcadores aos grupos para gerenciá-los mais facilmente"
@@ -2267,8 +2183,6 @@ pt_BR:
         reports:
           today: "Hoje"
           yesterday: "Ontem"
-          last_7_days: "Últimos 7 Dias"
-          last_30_days: "Últimos 30 Dias"
           all_time: "Todo Tempo"
           7_days_ago: "7 Dias Atrás"
           30_days_ago: "30 Dias Atrás"
@@ -2286,8 +2200,6 @@ pt_BR:
         title: "Sinalizações"
         agree: "Concordo"
         agree_title: "Confirmar esta marcação como válida e correta"
-        defer_flag: "Ignorar"
-        defer_flag_title: "Remover esta marcação; ela não requer nenhuma ação neste momento."
         delete: "Apagar"
         delete_title: "Apagar o post ao qual a marcação se refere."
         delete_post_defer_flag_title: "Apaga a resposta; se for a primeira, apagar o tópico"
@@ -2330,8 +2242,6 @@ pt_BR:
         title: "Grupos"
         edit: "Editar Grupos"
         refresh: "Atualizar"
-        new: "Novo"
-        selector_placeholder: "digite o nome de usuário"
         about: "Editar participação no grupo e nomes aqui"
         group_members: "Membros do grupo"
         delete: "Apagar"
@@ -2339,21 +2249,10 @@ pt_BR:
         delete_failed: "Unable to delete group. If this is an automatic group, it cannot be destroyed."
         delete_owner_confirm: "Remover privilégio de proprietário de '%{username}'?"
         add: "Adicionar"
-        add_members: "Adicionar membros"
         custom: "Definidos"
-        bulk_complete: "Os usuários foram adicionados ao grupo."
-        bulk: "Adição em Massa ao Grupo"
-        bulk_paste: "Cole uma lista de usernames ou emails, um por linha:"
-        bulk_select: "(selecione um grupo)"
         automatic: "Automático"
-        automatic_membership_email_domains: "Usuários que se registram com um domínio de email que confere precisamente com algum desta lista serão automaticamente adicionados a este grupo:"
-        automatic_membership_retroactive: "Aplicar a mesma regra de domínio de email para adicionar usuários registrados"
-        default_title: "Título padrão para todos usuários nesse grupo"
-        primary_group: "Configurar automaticamente como grupo primário"
         group_owners: Prorietários
         add_owners: Adicionar proprietários
-        incoming_email: "Endereço de email de entrada personalizado"
-        incoming_email_placeholder: "Insira um endereço de email"
         none_selected: "Selecione um grupo para começar"
         no_custom_groups: "Crie um novo grupo"
       api:
@@ -2418,11 +2317,11 @@ pt_BR:
           none: "Não existem eventos relacionados."
           redeliver: "Entregar novamente"
           incoming:
-            one: "Existe um novo evento."
-            other: "Existem {{count}} novos eventos."
+            one: Existe um novo evento.
+            other: Existem {{count}} novos eventos.
           completed_in:
-            one: "Completado em 1 segundo."
-            other: "Completado em {{count}} segundos."
+            one: Completado em 1 segundo.
+            other: Completado em {{count}} segundos.
           request: "Requisição"
           response: "Resposta"
           redeliver_confirm: "Tem certeza que deseja enviar o mesmo payload novamente?"
@@ -2473,7 +2372,6 @@ pt_BR:
           label: "Enviar"
           title: "Carregar um backup para esta instância"
           uploading: "Subindo..."
-          success: "'{{filename}}' foi carregado com sucesso."
           error: "Houve um erro ao carregar '{{filename}}': {{message}}"
         operations:
           is_running: "Uma operação está sendo executada..."
@@ -2486,7 +2384,6 @@ pt_BR:
             label: "Backup"
             title: "Cria um backup"
             confirm: "Você quer iniciar um novo backup?"
-            without_uploads: "Sim (não inclua arquivos)"
           download:
             label: "Download"
             title: "Enviar email com link para download"
@@ -2789,11 +2686,11 @@ pt_BR:
           suspect: 'Suspeito'
         approved: "Aprovado?"
         approved_selected:
-          one: "aprovar usuário"
-          other: "aprovar usuários ({{count}})"
+          one: aprovar usuário
+          other: aprovar usuários ({{count}})
         reject_selected:
-          one: "rejeitar usuário"
-          other: "rejeitar usuários ({{count}})"
+          one: rejeitar usuário
+          other: rejeitar usuários ({{count}})
         titles:
           active: 'Usuários Ativos'
           new: 'Usuários Novos'
@@ -2810,11 +2707,11 @@ pt_BR:
           suspended: 'Usuários Suspensos'
           suspect: 'Usuários suspeitos'
         reject_successful:
-          one: "1 usuário foi rejeitado com sucesso."
-          other: "%{count} usuários foram rejeitados com sucesso."
+          one: 1 usuário foi rejeitado com sucesso.
+          other: '%{count} usuários foram rejeitados com sucesso.'
         reject_failures:
-          one: "Falha ao rejeitar 1 usuário."
-          other: "Falha ao rejeitar %{count} usuários."
+          one: Falha ao rejeitar 1 usuário.
+          other: Falha ao rejeitar %{count} usuários.
         not_verified: "Não verificado"
         check_email:
           title: "Mostrar endereço de email deste usuário"
@@ -2876,14 +2773,14 @@ pt_BR:
         delete_forbidden_because_staff: "Administradores e moderadores não podem ser excluidos."
         delete_posts_forbidden_because_staff: "Não posso deletar todas as mensagens de administradores e moderadores."
         delete_forbidden:
-          one: "Usuários não podem ser excluídos se eles têm mensagens. Excluir todas as mensagens antes de tentar excluir um usuário. (Mensagens mais antigas que %{count} dia não podem ser excluídas.)"
-          other: "Usuários não podem ser excluídos se eles têm mensagens. Remova todas as mensagens antes de tentar excluir um usuário. (Mensagens mais antigas que %{count} dias não podem ser excluídas.)"
+          one: Usuários não podem ser excluídos se eles têm mensagens. Excluir todas as mensagens antes de tentar excluir um usuário. (Mensagens mais antigas que %{count} dia não podem ser excluídas.)
+          other: Usuários não podem ser excluídos se eles têm mensagens. Remova todas as mensagens antes de tentar excluir um usuário. (Mensagens mais antigas que %{count} dias não podem ser excluídas.)
         cant_delete_all_posts:
-          one: "Não é possível excluir todas as mensagens. Algumas mensagens são mais antigas do que %{count} dia. (Configuração delete_user_max_post_age.)"
-          other: "Não é possível remover todas as mensagens. Algumas mensagens são mais antigas do que %{count} dias. (Configuração delete_user_max_post_age.)"
+          one: Não é possível excluir todas as mensagens. Algumas mensagens são mais antigas do que %{count} dia. (Configuração delete_user_max_post_age.)
+          other: Não é possível remover todas as mensagens. Algumas mensagens são mais antigas do que %{count} dias. (Configuração delete_user_max_post_age.)
         cant_delete_all_too_many_posts:
-          one: "Não pode remover porque o usuário tem mais de uma mensagem (delete_all_posts_max)"
-          other: "Não pode remover porque o usuário tem mais de %{count} mensagens. (delete_all_posts_max)"
+          one: Não pode remover porque o usuário tem mais de uma mensagem (delete_all_posts_max)
+          other: Não pode remover porque o usuário tem mais de %{count} mensagens. (delete_all_posts_max)
         delete_confirm: "Você tem CERTEZA de que quer deletar este usuário? Isto é permanente!"
         delete_and_block: "Deletar e <b>bloquear</b> este email e endereço IP"
         delete_dont_block: "Apagar apenas"
@@ -2919,8 +2816,8 @@ pt_BR:
         tl3_requirements:
           title: "Requisitos para o Nível de Confiança 3"
           table_title:
-            one: "No último dia:"
-            other: "Nos últimos %{count} dias:"
+            one: 'No último dia:'
+            other: 'Nos últimos %{count} dias:'
           value_heading: "Valor"
           requirement_heading: "Requisito"
           visits: "Visitas"
@@ -2995,10 +2892,7 @@ pt_BR:
         recommended: "Recomendamos a personalização do seguinte texto para se adequar as suas necessidades:"
         show_overriden: 'Apenas mostrar valores alterados'
       site_settings:
-        show_overriden: 'Exibir apenas valores alterados'
         title: 'Configurações'
-        reset: 'apagar'
-        none: 'nenhum'
         no_results: "Nenhum resultado encontrado."
         clear_filter: "Limpar"
         add_url: "adicionar URL"
@@ -3048,11 +2942,11 @@ pt_BR:
         reason_help: (Um link para uma mensagem ou tópico)
         save: Salvar
         delete: Remover
-        delete_confirm: Tem certeza de que deseja remover este emblema?
+        delete_confirm: "Tem certeza de que deseja remover este emblema?"
         revoke: Revogar
         reason: Motivo
         expand: Expandir &hellip;
-        revoke_confirm: Tem certeza de que deseja revogar este emblema?
+        revoke_confirm: "Tem certeza de que deseja revogar este emblema?"
         edit_badges: Editar Emblemas
         grant_badge: Conceder Emblema
         granted_badges: Emblemas Concedidos
@@ -3066,7 +2960,6 @@ pt_BR:
         enabled: Habilitar emblema
         icon: Ícone
         image: Imagem
-        icon_help: "Use uma classe do Font Awesome ou uma URL de uma imagem"
         query: Badge Query (SQL)
         target_posts: Consultar respostas selecionadas
         auto_revoke: Rodar revocation query todo dia
@@ -3090,14 +2983,14 @@ pt_BR:
             text: "Faltam amostras de concessão. Isso acontece quando a consulta de emblemas retorna IDs de usuários ou IDs de postagens que não existem. Isso pode causar resultados inesperados futuramente - por favor verifique novamente a sua consulta."
           no_grant_count: "Sem emblemas para serem atribuídos."
           grant_count:
-            one: "<b>1</b> emblema para ser atribuído."
-            other: "<b>%{count}</b> emblemas para serem atribuídos."
+            one: <b>1</b> emblema para ser atribuído.
+            other: <b>%{count}</b> emblemas para serem atribuídos.
           sample: "Exemplo:"
           grant:
-            with: <span class="username">%{username}</span>
-            with_post: <span class="username">%{username}</span> for post in %{link}
-            with_post_time: <span class="username">%{username}</span> por postar em %{link} às <span class="time">%{time}</span>
-            with_time: <span class="username">%{username}</span> às <span class="time">%{time}</span>
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span> for post in %{link}"
+            with_post_time: "<span class=\"username\">%{username}</span> por postar em %{link} às <span class=\"time\">%{time}</span>"
+            with_time: "<span class=\"username\">%{username}</span> às <span class=\"time\">%{time}</span>"
       emoji:
         title: "Emoji"
         help: "Adicionar novo emoji que estará disponível para todos. (DICA: arraste & solte diversos arquivos de uma vez)"
@@ -3141,7 +3034,7 @@ pt_BR:
         category_id: "ID da Categoria"
         category_title: "Categoria"
         external_url: "URL externa"
-        delete_confirm: Você tem certeza que quer apagar esse link permanente?
+        delete_confirm: "Você tem certeza que quer apagar esse link permanente?"
         form:
           label: "Novo:"
           add: "Adicionar"
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index a313c055dd3..8b495e558f2 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -16,8 +16,8 @@ ro:
           format: '%n %u'
           units:
             byte:
-              one: Byte
               few: Bytes
+              one: Byte
               other: Bytes
             gb: GB
             kb: KB
@@ -44,81 +44,90 @@ ro:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: "< 1s"
-          few: "< %{count}s"
-          other: "< %{count} s"
+          few: < %{count}s
+          one: < 1s
+          other: < %{count} s
         x_seconds:
-          one: "1s"
-          few: "%{count} s"
-          other: "%{count} s"
+          few: '%{count} s'
+          one: 1s
+          other: '%{count} s'
+        less_than_x_minutes:
+          few: < 1m
+          one: < 1m
+          other: < %{count}m
         x_minutes:
-          one: "1m"
-          few: "%{count} m"
-          other: "%{count} m"
+          few: '%{count} m'
+          one: 1m
+          other: '%{count} m'
         about_x_hours:
-          one: "1h"
-          few: "%{count} h"
-          other: "%{count} h"
+          few: '%{count} h'
+          one: 1h
+          other: '%{count} h'
         x_days:
-          one: "1z"
-          few: "%{count} z"
-          other: "%{count} z"
+          few: '%{count} z'
+          one: 1z
+          other: '%{count} z'
+        x_months:
+          few: 1mon
+          one: 1mon
+          other: '%{count}mon'
         about_x_years:
-          one: "1a"
-          few: "%{count} a"
-          other: "%{count} a"
+          few: '%{count} a'
+          one: 1a
+          other: '%{count} a'
         over_x_years:
-          one: "> 1a"
-          few: "> %{count} a"
-          other: "> %{count} a"
+          few: '> %{count} a'
+          one: '> 1a'
+          other: '> %{count} a'
         almost_x_years:
-          one: "1a"
-          few: "%{count} a"
-          other: "%{count} de a"
+          few: '%{count} a'
+          one: 1a
+          other: '%{count} de a'
         date_month: "DD MMMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: "1 min"
-          few: "%{count} min"
-          other: "%{count} de min"
+          few: '%{count} min'
+          one: 1 min
+          other: '%{count} de min'
         x_hours:
-          one: "1 oră"
-          few: "%{count} ore"
-          other: "%{count} de ore"
+          few: '%{count} ore'
+          one: 1 oră
+          other: '%{count} de ore'
         x_days:
-          one: "1 zi"
-          few: "%{count} zile"
-          other: "%{count} de zile"
+          few: '%{count} zile'
+          one: 1 zi
+          other: '%{count} de zile'
         date_year: "D MM YYYY"
       medium_with_ago:
         x_minutes:
-          one: "acum un min"
-          few: "acum %{count} min"
-          other: "acum %{count} de min"
+          few: acum %{count} min
+          one: acum un min
+          other: acum %{count} de min
         x_hours:
-          one: "acum o oră"
-          few: "acum %{count} ore"
-          other: "acum %{count} de ore"
+          few: acum %{count} ore
+          one: acum o oră
+          other: acum %{count} de ore
         x_days:
-          one: "acum o zi"
-          few: "acum %{count} zile"
-          other: "acum %{count} de zile"
+          few: acum %{count} zile
+          one: acum o zi
+          other: acum %{count} de zile
       later:
         x_days:
-          one: "După o zi"
-          few: "După %{count} zile"
-          other: "După %{count} de zile"
+          few: După %{count} zile
+          one: După o zi
+          other: După %{count} de zile
         x_months:
-          one: "O lună mai târziu"
-          few: "%{count} luni mai târziu"
-          other: "%{count} de luni mai târziu"
+          few: '%{count} luni mai târziu'
+          one: O lună mai târziu
+          other: '%{count} de luni mai târziu'
         x_years:
-          one: "După un an"
-          few: "După %{count} ani"
-          other: "După %{count} de ani"
+          few: După %{count} ani
+          one: După un an
+          other: După %{count} de ani
       previous_month: 'Luna anterioară'
       next_month: 'Luna următoare'
+      placeholder: dată
     share:
       topic: 'Distribuie un link cu acest subiect'
       post: 'Distribuie postarea #%{postNumber}'
@@ -129,10 +138,11 @@ ro:
       email: 'Drimite pe email'
     action_codes:
       public_topic: "a făcut acest subiect public %{when}"
-      private_topic: "a făcut acest subiect privat %{when}"
+      private_topic: "fă acest subiect un mesaj personal %{when}"
       split_topic: "desparte această discuție %{when}"
       invited_user: "a invitat pe %{who}  %{when}"
       invited_group: "a invitat pe %{who}  %{when}"
+      user_left: "%{who} s-a îndepărtat de la acest mesaj %{when}"
       removed_user: "a scos pe %{who}  %{when}"
       removed_group: "scos pe  %{who}  %{when}"
       autoclosed:
@@ -153,10 +163,12 @@ ro:
       visible:
         enabled: 'afișat %{when}'
         disabled: 'ascuns %{when}'
+      banner:
+        enabled: 'a creat acest banner %{when}. Va apărea la începutul fiecărei pagini până când va fi ascuns de către utilizator.'
+        disabled: 'a îndepărtat acest banner %{when}. Nu va mai apărea la începutul fiecărei pagini.'
     topic_admin_menu: "Opțiuni administrare subiect"
+    wizard_required: "Bine ai venit la noul tău Discourse! Să începem cu <a href='%{url}' data-auto-route='true'>expertul de configurare</a> ✨"
     emails_are_disabled: "Trimiterea de emailuri a fost dezactivată global de către un administrator. Nu vor fi trimise notificări email de nici un fel."
-    bootstrap_mode_enabled: "Pentru a ușura lansarea site-ului tău ești în modul bootstrap. Toți noii utilizatori vor primi nivelul de încredere 1 și vor avea activată primirea zilnică a unui email-rezumat.  Această setare va fi dezactivată automat de îndată ce numărul total de utilizatori depășește %{min_users}."
-    bootstrap_mode_disabled: "Modul bootstrap va fi dezactivat în următoarele 24 de ore."
     themes:
       default_description: "Implicit"
     s3:
@@ -169,8 +181,10 @@ ro:
         cn_north_1: "China (Beijing)"
         eu_central_1: "EU (Frankfurt)"
         eu_west_1: "EU (Irlanda)"
+        eu_west_2: "UE (Londra)"
         sa_east_1: "South America (Sao Paulo)"
         us_east_1: "US East (N. Virginia)"
+        us_east_2: "America de Est (Ohio)"
         us_gov_west_1: "AWS GovCloud (US)"
         us_west_1: "US West (N. California)"
         us_west_2: "US West (Oregon)"
@@ -178,6 +192,7 @@ ro:
     not_implemented: "Această funcționalitate nu a fost implementată încă."
     no_value: "Nu"
     yes_value: "Da"
+    submit: "Trimite"
     generic_error: "A apărut o eroare."
     generic_error_with_reason: "A apărut o eroare: %{error}"
     sign_up: "Înregistrare"
@@ -190,9 +205,9 @@ ro:
     show_help: "Opțiuni"
     links: "Adrese web"
     links_lowercase:
-      one: "link"
-      few: "link-uri"
-      other: "de link-uri"
+      few: link-uri
+      one: link
+      other: de link-uri
     faq: "Întrebări frecvente"
     guidelines: "Indicații"
     privacy_policy: "Politică de confidențialitate"
@@ -216,9 +231,9 @@ ro:
     max_of_count: "max din {{count}}"
     alternation: "sau"
     character_count:
-      one: "Un caracter"
-      few: "{{count}} caractere"
-      other: "{{count}} de caractere"
+      few: '{{count}} caractere'
+      one: Un caracter
+      other: '{{count}} de caractere'
     suggested_topics:
       title: "Subiecte sugerate"
       pm_title: "Mesaje sugerate"
@@ -230,8 +245,6 @@ ro:
       our_moderators: "Moderatori"
       stat:
         all_time: "Tot timpul"
-        last_7_days: "Ultimele 7 zile"
-        last_30_days: "Ultimele 30 de zile"
       like_count: "Aprecieri"
       topic_count: "Subiecte"
       post_count: "Postări"
@@ -253,18 +266,9 @@ ro:
       remove: "Șterge semn de carte"
       confirm_clear: "Ești sigur că dorești să ștergi toate semnele de carte din acest subiect?"
     topic_count_latest:
-      one: "{{count}} subiect nou sau actualizat."
-      few: "{{count}} subiecte noi sau actualizate."
-      other: "{{count}} de subiecte noi sau actualizate."
-    topic_count_unread:
-      one: "Un subiect necitit."
-      few: "{{count}} subiecte necitite."
-      other: "{{count}} (de) subiecte necitite."
-    topic_count_new:
-      one: "Un subiect nou."
-      few: "{{count}} subiecte noi."
-      other: "{{count}} de subiecte noi."
-    click_to_show: "Click pentru vizualizare."
+      few: '{{count}} subiecte noi sau actualizate.'
+      one: Un subiect nou sau actualizat.
+      other: '{{count}} de subiecte noi sau actualizate.'
     preview: "Previzualizează"
     cancel: "Anulează"
     save: "Salvează schimbările"
@@ -274,8 +278,10 @@ ro:
     uploading: "Se încarcă..."
     uploading_filename: "Se încarcă {{filename}}..."
     uploaded: "Încărcat!"
+    pasting: "Lipire..."
     enable: "Activează"
     disable: "Dezactivează"
+    continue: "Continuă"
     undo: "Anulează acțiunea"
     revert: "Revenire la starea inițială"
     failed: "Eșuat"
@@ -300,18 +306,18 @@ ro:
       cancel: "Anulează"
       view_pending: "Vezi postările în aşteptare"
       has_pending_posts:
-        one: "Acest subiect are <b>o</b> postare în așteptare"
-        few: "Acest subiect are <b>{{count}}</b> postări în așteptare."
-        other: "Acest subiect are <b>{{count}}</b> de postări în așteptare."
+        few: Acest subiect are <b>{{count}}</b> postări în așteptare.
+        one: Acest subiect are <b>o</b> postare în așteptare
+        other: Acest subiect are <b>{{count}}</b> de postări în așteptare.
       confirm: "Salvează schimbările"
       delete_prompt: "Ești sigur că vrei să ștergi utilizatorul <b>%{username}</b>? Vor fi șterse toate postările lui iar email-ul și IP-ul vor fi blocate."
       approval:
         title: "Necesită aprobare"
         description: "Am primit noua postare dar trebuie să fie aprobată de un moderator înainte că ea să apară pe site. Te rugăm să ai răbdare."
         pending_posts:
-          one: "Aveţi <strong>1</strong> postare în aşteptare."
-          few: "Aveţi <strong>{{count}}</strong> postări în aşteptare."
-          other: "Aveţi <strong>{{count}}</strong> (de) postări în așteptare."
+          few: Aveţi <strong>{{count}}</strong> postări în aşteptare.
+          one: Aveţi <strong>1</strong> postare în aşteptare.
+          other: Aveţi <strong>{{count}}</strong> (de) postări în așteptare.
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> a postat <a href='{{topicUrl}}'>discuția</a>"
@@ -345,9 +351,9 @@ ro:
       posts_read: "Citite"
       posts_read_long: "Postări citite"
       total_rows:
-        one: "1 utilizator"
-        few: "%{count} utilizatori"
-        other: "%{count} de utilizatori"
+        few: '%{count} utilizatori'
+        one: 1 utilizator
+        other: '%{count} de utilizatori'
     group_histories:
       actions:
         change_group_setting: "Schimbă setarea grupului"
@@ -356,22 +362,34 @@ ro:
         make_user_group_owner: "Fă proprietar"
         remove_user_as_group_owner: "Revocă proprietar"
     groups:
-      logs:
-        title: "Jurnale"
-        when: "Când"
-        action: "Acțiune"
-        acting_user: "Utilizator temporar"
-        target_user: "Utilizator țintă"
-        subject: "Subiect"
-        details: "Detalii"
-        from: "De la"
-        to: "Către"
-      edit:
-        title: 'Editează grup'
-        full_name: 'Nume complet'
+      add_members:
+        title: "Adaugă membri"
+        usernames: "Nume de utilizatori"
+      manage:
+        title: 'Gestionează'
+        name: 'Nume'
+        full_name: 'Nume și prenume'
         add_members: "Adaugă membri"
-        delete_member_confirm: "Șterge utilizatorul '%{username}' din grupul '%{group}'?"
-      name_placeholder: "Numele grupului, fără spații, la fel ca regula pentru nume utilizator"
+        delete_member_confirm: "Elimini „%{username}” din grupul „%{group}”?"
+        profile:
+          title: Profil
+        interaction:
+          title: Interacțiune
+          posting: Publicare
+          notification: Notificare
+        membership:
+          title: Abonare
+          access: Acces
+        logs:
+          title: "Jurnale"
+          when: "Când"
+          action: "țiune"
+          subject: "Subiect"
+          details: "Detalii"
+          from: "De la"
+          to: "Către"
+      public_admission: "Permite utilizatorilor să adere la grup fără restricții (Presupune ca grupul să fie vizibil)"
+      public_exit: "Permite utilizatorilor să părăsească grupul în mod liber."
       empty:
         posts: "Nu există postări ale membrilor acestui grup."
         members: "Nu există nici un membru în acest grup."
@@ -380,36 +398,71 @@ ro:
         topics: "Nu există nici un subiect creat de vreun membru al acestui grup."
         logs: "Nu există nici un jurnal pentru acest grup."
       add: "Adaugă"
-      join: "Alătură-te grupului"
-      leave: "Părăsește grupul"
-      request: "Cere să te alături grupului"
-      automatic_group: Grup automat
-      closed_group: Grup închis
-      is_group_user: "Ești membru al acestui grup"
+      join: "Alătură-te"
+      leave: "Părăsește"
+      request: "Cerere"
+      message: "Mesaj"
+      allow_membership_requests: "Permite utilizatorilor să trimită cereri de membru către proprietarul grupului."
+      membership_request_template: "Șablonul personalizat pentru a fi afișat utilizatorilor atunci când trimiteți o solicitare de membru"
+      membership_request:
+        submit: "Trimite cerere"
+        title: "Cerere de aderare @%{group_name}"
+        reason: "Aduceți la cunoștință proprietarilor grupului motivul pentru care dorești să aderi la acest grup"
       membership: "Apartenență"
       name: "Nume"
-      user_count: "Număr de membri"
+      group_name: "Nume grup"
+      user_count: "Utilizatori"
       bio: "Despre grup"
-      selector_placeholder: "Adaugă membri"
+      selector_placeholder: "introdu username"
       owner: "Proprietar"
       index:
         title: "Grupuri"
+        all: "Toate grupurile"
         empty: "Nu există nici un grup vizibil."
+        filter: "Filtrează după tipul grupului"
+        owner_groups: "Grupuri pe care le dețin"
+        close_groups: "Grupuri închise"
+        automatic_groups: "Grupuri automate"
+        automatic: "Automat"
+        closed: "Închis"
+        public: "Public"
+        private: "Privat"
+        public_groups: "Grupuri publice"
+        automatic_group: Grup automat
+        close_group: Grup închis
+        my_groups: "Grupurile mele"
+        group_type: "Tip grup"
+        is_group_user: "Membru"
+        is_group_owner: "Deținător"
+      title:
+        few: Grupuri
+        one: Grup
+        other: Grupuri
       activity: "Activitate"
-      members: "Membri"
+      members:
+        title: "Membrii"
+        filter_placeholder_admin: "nume de utilizator sau email"
+        filter_placeholder: "nume de utilizator"
+        remove_member: "Elimină membru"
+        remove_member_description: "Elimină <b>%{username}</b> din acest grup"
+        make_owner: "Fă-l deținător"
+        make_owner_description: "Fă utilizatorul <b>%{username}</b> un deținător al acestui grup"
+        remove_owner: "Elimină ca deținător"
+        remove_owner_description: "Elimină <b>%{username}</b> ca deținător al acestui grup"
+        owner: "Deținător"
       topics: "Subiecte"
       posts: "Postări"
       mentions: "Mențiuni"
       messages: "Mesaje"
+      notification_level: "Nivelul de notificare prestabilit pentru mesajele de grup"
       alias_levels:
+        mentionable: "Cine poate @menționa acest grup?"
+        messageable: "Cine poate trimite mesaje acestui grup?"
         nobody: "Nimeni"
         only_admins: "Doar adminii"
         mods_and_admins: "Doar moderatorii și adminii"
         members_mods_and_admins: "Membrii grupului, moderatorii și adminii"
         everyone: "Toată lumea"
-      trust_levels:
-        title: "Nivel de încredere acordat automat membrilor atunci când sunt adăugați:"
-        none: "Nimeni"
       notifications:
         watching:
           title: "Urmărind activ"
@@ -434,23 +487,22 @@ ro:
       flair_color_placeholder: "(Opțional) Valoarea Hex a culorii"
       flair_preview_icon: "Previzualizează iconiță"
       flair_preview_image: "Previzualizează imagine"
-      flair_note: "Observație: Elementul distinct va fi afișat doar pentru grupul principal al utilizatorului."
     user_action_groups:
-      '1': "Aprecieri date"
-      '2': "Aprecieri primite"
-      '3': "Semne de carte"
-      '4': "Subiecte"
-      '5': "Răspunsuri"
-      '6': "Răspunsuri"
-      '7': "Mențiuni"
-      '9': "Citate"
-      '11': "Editări"
-      '12': "Elemente trimise"
-      '13': "Primite"
-      '14': "În așteptare"
+      "1": "Aprecieri date"
+      "2": "Aprecieri primite"
+      "3": "Semne de carte"
+      "4": "Subiecte"
+      "5": "Răspunsuri"
+      "6": "Răspunsuri"
+      "7": "Mențiuni"
+      "9": "Citate"
+      "11": "Editări"
+      "12": "Elemente trimise"
+      "13": "Primite"
+      "14": "În așteptare"
     categories:
       all: "Toate categoriile"
-      all_subcategories: "Toate"
+      all_subcategories: "toate în %{categoryName}"
       no_subcategory: "Niciuna"
       category: "Categorie"
       category_list: "Afișează lista de categorii"
@@ -469,13 +521,13 @@ ro:
       toggle_ordering: "Comută criteriu de aranjare"
       subcategories: "Subcategorii"
       topic_sentence:
-        one: "Un subiect"
-        few: "%{count} subiecte"
-        other: "%{count} de subiecte"
+        few: '%{count} subiecte'
+        one: Un subiect
+        other: '%{count} de subiecte'
       topic_stat_sentence:
-        one: "%{count} subiect nou în %{unit}."
-        few: "%{count} subiecte noi în %{unit}."
-        other: "%{count} de subiecte noi în %{unit}."
+        few: '%{count} subiecte noi în %{unit}.'
+        one: '%{count} subiect nou în %{unit}.'
+        other: '%{count} de subiecte noi în %{unit}.'
     ip_lookup:
       title: Căutare adresă IP
       hostname: Nume gazdă
@@ -491,6 +543,7 @@ ro:
       topics_entered: "Subiecte la care particip"
       post_count: "# postări"
       confirm_delete_other_accounts: "Ești sigur că vrei să ștergi aceste conturi?"
+      powered_by: "creat de <a href='https://ipinfo.io'>ipinfo.io</a>"
     user_fields:
       none: "(alege o opțiune)"
     user:
@@ -499,6 +552,7 @@ ro:
       mute: "Silențios"
       edit: "Editează preferințe"
       download_archive:
+        button_text: "Descarcă tot"
         confirm: "Ești sigur că vrei să îți descarci postările?"
         success: "Descărcarea a început, vei fi notificat printr-un mesaj atunci când procesul se va termina."
         rate_limit_error: "Postările pot fi descărcate doar o singură dată pe zi, te rugăm să încerci din nou mâine."
@@ -508,6 +562,7 @@ ro:
       activity_stream: "Activitate"
       preferences: "Preferințe"
       expand_profile: "Extinde"
+      collapse_profile: "Colaps"
       bookmarks: "Semne de carte"
       bio: "Despre mine"
       invited_by: "Invitat de"
@@ -515,7 +570,7 @@ ro:
       notifications: "Notificări"
       statistics: "Statistici"
       desktop_notifications:
-        label: "Notificări desktop"
+        label: "Notificări live"
         not_supported: "Acest browser nu suportă notificări. Ne pare rău."
         perm_default: "Activează notificări"
         perm_denied_btn: "Notificări blocate"
@@ -523,11 +578,14 @@ ro:
         disable: "Dezactivează notificări"
         enable: "Activează notificările"
         each_browser_note: "Observație: Setările trebuie modificate pe fiecare browser utilizat."
+      dismiss: 'Înlătură'
       dismiss_notifications: "Elimină tot"
       dismiss_notifications_tooltip: "Marchează toate notificările ca citite"
       first_notification: "Prima notificare pe care ai primit-o! Selectează-o ca să continui. "
       disable_jump_reply: "Nu sări la postarea mea după ce răspund"
       dynamic_favicon: "Arată subiectele noi/actualizate în pictograma browserului."
+      theme_default_on_all_devices: "Fă această temă implicită pentru toate dispozitivele mele"
+      allow_private_messages: "Permite altor utilizatori să îmi trimită mesaje private"
       external_links_in_new_tab: "Deschide toate adresele externe într-un tab nou"
       enable_quoting: "Activează citarea răspunsurilor pentru textul selectat"
       change: "Schimbă"
@@ -535,7 +593,9 @@ ro:
       admin: "{{user}} este admin"
       moderator_tooltip: "Acest utilizator este moderator"
       admin_tooltip: "Acest utilizator este admin"
+      silenced_tooltip: "Acest utilizator este silențios"
       suspended_notice: "Acest utilizator este suspendat până la {{date}}."
+      suspended_permanently: "Acest utilizator este suspendat."
       suspended_reason: "Motiv: "
       github_profile: "Github"
       email_activity_summary: "Sumarul activității"
@@ -566,10 +626,10 @@ ro:
       watched_first_post_tags_instructions: "Vei fi notificat cu privire la prima postare din fiecare nou subiect cu aceste etichete."
       muted_categories: "Setat pe silențios"
       muted_categories_instructions: "Nu vei fi notificat despre nimic legat de noile subiecte din aceste categorii și subiectele respective nu vor apărea în lista cu cele mai recente subiecte."
+      no_category_access: "În calitate de moderator ai acces limitat la categorii, salvarea este dezactivată."
       delete_account: "Șterge-mi contul"
       delete_account_confirm: "Ești sigur că vrei să ștergi contul? Această acțiune este ireversibilă!"
       deleted_yourself: "Contul tău a fost șters cu succes."
-      delete_yourself_not_allowed: "Momentan nu îți poți șterge contul. Contactează un admin pentru a o face."
       unread_message_count: "Mesaje"
       admin_delete: "Șterge"
       users: "Utilizatori"
@@ -577,11 +637,15 @@ ro:
       muted_users_instructions: "Oprește toate notificările de la aceşti utilizatori."
       muted_topics_link: "Arată subiectele dezactivate"
       watched_topics_link: "Arată subiectele urmărite activ"
+      tracked_topics_link: "Afișează subiectele urmărite"
       automatically_unpin_topics: "Detașare automată a subiectelor când ajung la sfârșitul paginii."
       apps: "Aplicații"
       revoke_access: "Revocă accesul"
       undo_revoke_access: "Anulează revocarea accesului"
       api_approved: "Aprobate:"
+      theme: "Temă"
+      home: "Pagina inițială implicită"
+      staged: "Pus în scenă"
       staff_counters:
         flags_given: "Marcaje ajutătoare"
         flagged_posts: "Postări marcate"
@@ -599,6 +663,15 @@ ro:
         move_to_archive: "Arhivează"
         failed_to_move: "Mutarea mesajelor selectate a eșuat (poate că v-a căzut rețeaua)"
         select_all: "Selectează tot"
+      preferences_nav:
+        account: "Cont"
+        profile: "Profil"
+        emails: "Adrese de email"
+        notifications: "Notificări"
+        categories: "Categorii"
+        tags: "Etichete"
+        interface: "Interfață"
+        apps: "Aplicații"
       change_password:
         success: "(email trimis)"
         in_progress: "(se trimite email)"
@@ -620,10 +693,12 @@ ro:
         taken: "Această adresă există deja în baza de date."
         error: "A apărut o eroare la schimbarea de email. Poate această adresă este deja utilizată?"
         success: "Am trimis un email către adresa respectivă. Urmează instrucțiunile de confirmare."
+        success_staff: "Ți-am trimis un email la adresa curentă. Urmează instrucțiunile de confirmare."
       change_avatar:
         title: "Schimbă poza de profil"
         gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, bazat pe"
         gravatar_title: "Schimbă-ți avatarul de pe site-ul Gravatar."
+        gravatar_failed: "Gravatarul nu a putut fi preluat. Există unul asociat cu adresa de email respectivă?"
         refresh_gravatar_title: "Reactualizează Gravatarul"
         letter_based: "Poză de profil atribuită de sistem."
         uploaded_avatar: "Poză preferată"
@@ -640,14 +715,15 @@ ro:
         instructions: "Fundalul va fi centrat şi va avea o dimensiune standard de 590px."
       email:
         title: "Email"
+        instructions: "nu afișa niciodată către public"
         ok: "Îți vom trimite un email pentru confirmare."
         invalid: "Introduceți o adresă de email validă."
         authenticated: "Emailul a fost autentificat de către {{provider}}."
         frequency_immediately: "Vom trimite imediat un email dacă nu ai citit deja despre ce este vorba. "
         frequency:
-          one: "Vom trimite un email doar dacă nu te-am văzut în ultimul minut."
-          few: "Vom trimite un email doar dacă nu te-am văzut în ultimele {{count}} minute."
-          other: "Vom trimite un email doar dacă nu te-am văzut în ultimele {{count}} de minute."
+          few: Vom trimite un email doar dacă nu te-am văzut în ultimele {{count}} minute.
+          one: Vom trimite un email doar dacă nu te-am văzut în ultimul minut.
+          other: Vom trimite un email doar dacă nu te-am văzut în ultimele {{count}} de minute.
       name:
         title: "Nume"
         instructions: "Numele tău complet (opțional)"
@@ -656,6 +732,7 @@ ro:
         ok: "Numele tău este OK."
       username:
         title: "Nume utilizator"
+        instructions: "unic, fără spații, scurt"
         short_instructions: "Ceilalți te pot menționa ca @{{username}}."
         available: "Numele de utilizator este disponibil."
         not_available: "Nu este disponibil. Încerci {{suggestion}}?"
@@ -677,8 +754,6 @@ ro:
       created: "Înscris"
       log_out: "Ieșire"
       location: "Locație"
-      card_badge:
-        title: "Ecuson utilizator"
       website: "Website"
       email_settings: "Email"
       like_notification_frequency:
@@ -732,11 +807,11 @@ ro:
         title: "Invitații"
         user: "Utilizator invitat"
         sent: "Trimis(e)"
-        none: "Nu sunt invitații în așteptare."
+        none: "Nu există invitații."
         truncated:
-          one: "Se afișează prima invitație."
-          few: "Se afișează primele {{count}} invitații."
-          other: "Se afișează primele {{count}} de invitații."
+          few: Se afișează primele {{count}} invitații.
+          one: Se afișează prima invitație.
+          other: Se afișează primele {{count}} de invitații.
         redeemed: "Invitații acceptate"
         redeemed_tab: "Acceptate"
         redeemed_tab_with_count: "({{count}}) Acceptate"
@@ -749,8 +824,12 @@ ro:
         expired: "Această invitație a expirat."
         rescind: "Elimină"
         rescinded: "Invitație eliminată"
+        rescind_all: "Elimină toate invitațiile"
+        rescinded_all: "Toate invitațiile au fost eliminate!"
+        rescind_all_confirm: "Sigur elimini toate invitațiile?"
         reinvite: "Retrimite invitaţia"
         reinvite_all: "Retrimite toate invitațiile"
+        reinvite_all_confirm: "Sigur retrimiți toate invitațiile?"
         reinvited: "Invitaţia a fost retrimisă"
         reinvited_all: "Toate invitațiile retrimise!"
         time_read: "Timp de citire"
@@ -761,8 +840,10 @@ ro:
         link_generated: "Link de invitare generat cu succes!"
         valid_for: "Link-ul de invitare este valid doar pentru următoarele adrese de email:  %{email}"
         bulk_invite:
+          none: "Încă nu ai invitat pe nimeni. Trimite invitații indivituale sau invită mai multe persoane odată <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>uploadând un fișier CSV</a>."
           text: "Invitație multiplă din fișier"
           success: "Fișier încărcat cu succes, vei fi înștiințat printr-un mesaj când procesarea este completă."
+          error: "Scuze, fișierul trebuie să fie în format CSV."
       password:
         title: "Parolă"
         too_short: "Parola este prea scurtă."
@@ -776,25 +857,37 @@ ro:
         stats: "Statistici"
         time_read: "Timp petrecut pe site"
         topic_count:
-          one: "un subiect creat"
-          few: "subiecte create"
-          other: "de subiecte create"
+          few: subiecte create
+          one: un subiect creat
+          other: de subiecte create
         post_count:
-          one: "o postare creată"
-          few: "postări create"
-          other: "de postări create"
+          few: postări create
+          one: o postare creată
+          other: de postări create
+        likes_given:
+          few: oferite
+          one: oferit
+          other: oferite
+        likes_received:
+          few: primite
+          one: primit
+          other: primite
         days_visited:
-          one: "vizită"
-          few: "vizite"
-          other: "de vizite"
+          few: vizite
+          one: vizită
+          other: de vizite
+        topics_entered:
+          few: subiecte vizualizate
+          one: subiect vizualizat
+          other: subiecte vizualizate
         posts_read:
-          one: "postare citită"
-          few: "postări citite"
-          other: "de postări citite"
+          few: postări citite
+          one: postare citită
+          other: de postări citite
         bookmark_count:
-          one: "semn de carte"
-          few: "semne de carte"
-          other: "de semne de carte"
+          few: semne de carte
+          one: semn de carte
+          other: de semne de carte
         top_replies: "Top răspunsuri"
         no_replies: "Nici un răspuns încă."
         more_replies: "Mai multe răspunsuri"
@@ -862,9 +955,9 @@ ro:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> a atins limita admisă de %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> a depășit  limita admisă de %{siteSettingRate}."
       rate:
-        one: "o eroare/%{duration}"
-        few: "%{count} erori/%{duration}"
-        other: "%{count} de erori/%{duration}"
+        few: '%{count} erori/%{duration}'
+        one: o eroare/%{duration}
+        other: '%{count} de erori/%{duration}'
     learn_more: "află mai multe..."
     all_time: 'total'
     all_time_desc: 'total subiecte create'
@@ -878,10 +971,15 @@ ro:
     first_post: Prima postare
     mute: Blochează
     unmute: Deblochează
+    last_post: Postat
+    time_read: Citit
+    time_read_recently: '%{time_read} recent'
+    time_read_tooltip: '%{time_read} total citit'
+    time_read_recently_tooltip: '%{time_read} total citit (%{recent_time_read} în ultimele 60 de zile)'
     last_reply_lowercase: Ultimul răspuns
     replies_lowercase:
-      one: răspuns
       few: răspunsuri
+      one: răspuns
       other: de răspunsuri
     signup_cta:
       sign_up: "Înregistrare"
@@ -904,6 +1002,7 @@ ro:
     private_message_info:
       title: "Mesaj"
       invite: "Invită alte persoane..."
+      leave_message: "Sigur părăsești acest mesaj?"
       remove_allowed_user: "Chiar dorești să îl elimini pe {{name}} din acest mesaj privat?"
       remove_allowed_group: "Ești sigur că vrei să îl scoți pe {{name}} din acest mesaj?"
     email: 'Email'
@@ -928,6 +1027,9 @@ ro:
       complete_email_found: "Am găsit un cont care se potrivește cu adresa <b>%{email}</b>, vei primi un email cu instrucțiunile de resetare a parolei în cel mai scurt timp."
       complete_username_not_found: "Nici un cont nu se potriveşte cu utilizatorul <b>%{username}</b>"
       complete_email_not_found: "Nici un cont nu se potrivește cu adresa  <b>%{email}</b>"
+      help: "Email-ul nu a sosit? Asigură-te că verifici mai întâi în folderul Spam. <p>Nu ești sigur ce adresă de email folosești? Scrie adresa de email și îți vom spune dacă aceasta există.</p><p>Dacă nu mai ai acces în contul tău la adresa de email, te rog contactează <a href='/about'>echipa de ajutor.</a></p>"
+      button_ok: "Ok"
+      button_help: "Ajutor"
     login:
       title: "Autentificare cu"
       username: "Utilizator"
@@ -941,18 +1043,22 @@ ro:
       logging_in: "În curs de autentificare..."
       or: "sau"
       authenticating: "Se autentifică..."
+      awaiting_activation: "Contul tău așteaptă activarea, folosește linkul pentru recuperarea parolei pentru a primi un alt link de activare a adresei de email."
       awaiting_approval: "Contul tău nu a fost aprobat încă de un admin . Vei primi un email când se aprobă."
       requires_invite: "Ne pare rău, accesul la forum se face pe bază de invitație."
       not_activated: "Nu te poți loga încă. Am trimis anterior un email de activare pentru <b>{{sentTo}}</b>. Urmează instrucțiunile din email pentru a-ți activa contul."
       not_allowed_from_ip_address: "Nu te poți conecta cu această adresă IP."
       admin_not_allowed_from_ip_address: "Nu te poți conecta ca administrator cu această adresă IP."
       resend_activation_email: "Click aici pentru a retrimite emailul de activare."
+      resend_title: "Retrimite emailul de activare"
       change_email: "Schimbă adresa de email"
+      provide_new_email: "Furnizează o nouă adresă de email și îți vom retrimite linkul de confirmare."
       submit_new_email: "Actualizează adresa de email"
       sent_activation_email_again: "Am trimis un alt email de activare pentru tine la <b>{{currentEmail}}</b>. Poate dura câteva minute până ajunge; vezi și în secțiunea de spam a mailului."
       to_continue: "Te rog să te autentifici."
       preferences: "Trebuie să fii autentificat pentru a schimba preferințele."
       forgot: "Nu îmi amintesc detaliile contului meu."
+      not_approved: "Contul tău încă nu a fost aprobat. Vei primi notificarea prin email când ești gata de logare."
       google:
         title: "Google"
         message: "Autentificare cu Google (Verifică browserul să nu blocheze ferestrele pop-up)"
@@ -974,12 +1080,27 @@ ro:
       github:
         title: "GitHub"
         message: "Autentificare cu GitHub (Verifică browserul să nu blocheze ferestrele pop-up)"
+    invites:
+      accept_title: "Initație"
+      welcome_to: "Bine ai venit la %{site_name}!"
+      invited_by: "Ai fost invitat de:"
+      social_login_available: "De asemenea te poți loga cu un alt cont care folosește această adresă de email."
+      your_email: "Adresa de email a contului este <b>%{email}</b>."
+      accept_invite: "Acceptă invitație"
+      success: "Contul tău a fost creat și acum ești logat."
+      name_label: "Nume"
+      password_label: "Setează parolă"
+      optional_description: "(opțional)"
+    password_reset:
+      continue: "Continuă la %{site_name}"
     emoji_set:
       apple_international: "Apple/International"
       google: "Google"
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+      google_classic: "Google clasic"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "Numai categorii"
       categories_with_featured_topics: "Categorii cu subiecte promovate"
@@ -988,12 +1109,28 @@ ro:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    select_kit:
+      default_header_text: Selectează...
+      no_content: Nu s-au găsit potriviri
+      filter_placeholder: Caută...
+    emoji_picker:
+      filter_placeholder: Caută emoji
+      people: Oameni
+      nature: Natură
+      food: Mâncare
+      activity: Activitate
+      travel: Călătorie
+      objects: Obiecte
+      celebration: Sărbători
+      custom: Emojii personalizate
+      recent: Folosite recent
     composer:
       emoji: "Emoji :)"
       more_emoji: "mai multe..."
       options: "Opțiuni"
       whisper: "discret"
       unlist: "nelistat"
+      blockquote_text: "Bloc citat"
       add_warning: "Aceasta este o avertizare oficială."
       toggle_whisper: "Comută modul discret"
       toggle_unlisted: "Comută modul nelistat"
@@ -1003,10 +1140,11 @@ ro:
       saved_local_draft_tip: "salvat local"
       similar_topics: "Subiectul tău seamănă cu..."
       drafts_offline: "schiță offline"
+      group_mentioned_limit: "1Atenție!1 Ai menționat 2{{group}}2, dar acest grup are mai mulți membri decât limita de {{max}} utilizatori configurată de către administrator. Nimeni nu va fi notificat."
       group_mentioned:
-        one: "Prin menționarea {{group}}, urmează să notifici <a href='{{group_link}}'>o persoană</a> – ești sigur?"
-        few: "Prin menționarea {{group}}, urmează să notifici <a href='{{group_link}}'>{{count}}  persoane</a> – ești sigur?"
-        other: "Prin menționarea {{group}}, urmează să notifici <a href='{{group_link}}'>{{count}} de persoane</a> – ești sigur?"
+        few: Prin menționarea {{group}}, urmează să notifici <a href='{{group_link}}'>{{count}}  persoane</a> – ești sigur?
+        one: Prin menționarea {{group}}, urmează să notifici <a href='{{group_link}}'>o persoană</a> – ești sigur?
+        other: Prin menționarea {{group}}, urmează să notifici <a href='{{group_link}}'>{{count}} de persoane</a> – ești sigur?
       cannot_see_mention:
         category: "Ai menționat utilizatorii: {{username}}. Însă ei nu vor notificați pentru că nu au acces la această categorie. Va trebui să îi adaugi la într-un grup care are acces la aceasta categorie."
         private: "Ai menționat utilizatorii:  {{username}}. Însă ei nu vor fi notificați pentru că nu au posibilitatea să vadă acest mesaj personal. Va trebui să îi inviți la acest MP. "
@@ -1025,6 +1163,7 @@ ro:
       cancel: "Anulează"
       create_topic: "Creează un subiect"
       create_pm: "Mesaj"
+      create_whisper: "Șoaptă"
       title: "Sau apasă Ctrl+Enter"
       users_placeholder: "Adaugă un utilizator"
       title_placeholder: "Despre ce e vorba în acest  subiect - pe scurt?"
@@ -1062,6 +1201,7 @@ ro:
       olist_title: "Listă numerotată"
       ulist_title: "Listă cu marcatori"
       list_item: "Element listă"
+      toggle_direction: "Schimbă direcția"
       help: "Ajutor pentru formatarea cu Markdown"
       modal_ok: "Ok"
       modal_cancel: "Anulare"
@@ -1070,34 +1210,51 @@ ro:
         title: "Ai uitat să adaugi destinatari?"
         body: "În acest moment mesajul acesta nu este trimis decât către tine însuți!"
       admin_options_title: "Setări opționale pentru moderatori cu privire la acest subiect"
+      composer_actions:
+        reply_as_new_topic:
+          label: Răspunde cu link către subiect
+        reply_as_private_message:
+          label: Mesaj nou
+        reply_to_topic:
+          label: Răspunde la subiect
     notifications:
+      tooltip:
+        message:
+          few: '{{count}} mesaje necitite'
+          one: 1 mesaj necitit
+          other: '{{count}} mesaje necitite'
       title: "notificări la menționările @numelui tău, răspunsuri la postările sau subiectele tale, mesaje, etc."
       none: "Nu pot încărca notificările în acest moment."
       empty: "Nu au fost găsite notificări."
       more: "vezi notificările mai vechi"
       total_flagged: "toate postările marcate"
-      alt:
-        mentioned: "Menționat de"
-        quoted: "Citat de"
-        replied: "Răspuns"
-        posted: "Postat de"
-        edited: "Editează postarea prin"
-        liked: "V-a apreciat postarea"
-        private_message: "Mesaj privat de la"
-        invited_to_private_message: "Invitat la un mesaj privat de către"
-        invited_to_topic: "Invitat la un subiect de către"
-        invitee_accepted: "Invitație acceptată de către"
-        moved_post: "Postarea ta a fost mutată de către"
-        linked: "Link spre postarea ta"
-        granted_badge: "Ecuson acordat"
-        group_message_summary: "Mesaje în căsuța poștală a grupului"
+      mentioned: "<span>{{username}}</span> {{description}}"
+      group_mentioned: "<span>{{username}}</span> {{description}}"
+      quoted: "<span>{{username}}</span> {{description}}"
+      replied: "<span>{{username}}</span> {{description}}"
+      posted: "<span>{{username}}</span> {{description}}"
+      edited: "<span>{{username}}</span> {{description}}"
+      liked: "<span>{{username}}</span> {{description}}"
+      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      liked_many:
+        few: <span>{{username}}, {{username2}} și încă o persoană</span> {{description}}
+        one: <span>{{username}}, {{username2}} și încă o persoană</span> {{description}}
+        other: <span>{{username}}, {{username2}} și alți {{count}}</span> {{description}}
+      private_message: "<span>{{username}}</span> {{description}}"
+      invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
+      invited_to_topic: "<span>{{username}}</span> {{description}}"
+      invitee_accepted: "<span>{{username}}</span> ți-a acceptat invitația"
+      moved_post: "<span>{{username}}</span> a mutat {{description}}"
+      linked: "<span>{{username}}</span> {{description}}"
+      granted_badge: "Ai câștigat '{{description}}'"
+      topic_reminder: "<span>{{username}}</span> {{description}}"
+      watching_first_post: "<span>Subiect nou</span> {{description}}"
       popup:
         mentioned: '{{username}} te-a menţionat în "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} te-a menţionat în "{{topic}}" - {{site_title}}'
         quoted: '{{username}} te-a citat în "{{topic}}" - {{site_title}}'
         replied: '{{username}} ți-a răspuns la "{{topic}}" - {{site_title}}'
         posted: '{{username}} a postat în "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} ți-a trimis un mesaj privat în "{{topic}}" - {{site_title}}'
         linked: '{{username}} a pus un link către postarea ta din "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Adaugă o imagine"
@@ -1113,10 +1270,12 @@ ro:
       uploading: "Se încarcă"
       select_file: "Alege fișier"
       image_link: "Link-ul de la imagine va duce la"
+      default_image_alt_text: imagine
     search:
       sort_by: "Sortează după"
       relevance: "Relevanță"
       latest_post: "Cele mai recente postări"
+      latest_topic: "Ultimul subiect"
       most_viewed: "Cele mai văzute"
       most_liked: "Cele mai apreciate"
       select_all: "Selectează tot"
@@ -1127,6 +1286,11 @@ ro:
       no_more_results: "Nu s-au mai găsit alte rezultate."
       searching: "Se caută..."
       post_format: "#{{post_number}} de {{username}}"
+      results_page: "Caută rezultate pentru '{{term}}'"
+      start_new_topic: "Creează un nou subiect?"
+      or_search_google: "Sau încearcă să cauți cu Google:"
+      search_google_button: "Google"
+      search_google_title: "Caută în această pagină"
       context:
         user: "Caută postări după @{{username}}"
         category: "Caută în categoria #{{category}} "
@@ -1136,19 +1300,27 @@ ro:
         title: Căutare avansată
         posted_by:
           label: Postat de
+        in_category:
+          label: Categorie
         in_group:
           label: În grupul
         with_badge:
           label: Cu ecusonul
+        with_tags:
+          label: Etichetat
         filters:
           likes: pe care le-am apreciat
           posted: în care am postat
           watching: pe care le urmăresc activ
           tracking: le urmăresc
+          private: În mesajele mele
           first: sunt chiar pe primul loc în listă
           pinned: sunt fixate
           unpinned: nu sunt fixate
+          seen: Citesc
+          unseen: Nu am citit
           wiki: sunt wiki
+          images: include poza (pozele)
         statuses:
           label: Unde subiectele
           open: sunt deschise
@@ -1184,14 +1356,19 @@ ro:
         dismiss_new: "Anulează cele noi"
         toggle: "activează selecția multiplă a subiectelor"
         actions: "Acțiuni multiple"
+        change_category: "Alege categoria"
         close_topics: "Închide subiectele"
         archive_topics: "Arhivează subiectele"
+        notification_level: "Notificări"
         choose_new_category: "Alege o nouă categorie pentru acest subiect"
         selected:
-          one: "Ai selectat <b>un</b> subiect."
-          few: "Ai selectat <b>{{count}}</b> subiecte."
-          other: "Ai selectat <b>{{count}}</b> de subiecte."
+          few: Ai selectat <b>{{count}}</b> subiecte.
+          one: Ai selectat <b>un</b> subiect.
+          other: Ai selectat <b>{{count}}</b> de subiecte.
+        change_tags: "Înlocuiește etichete"
+        append_tags: "Adaugă etichete"
         choose_new_tags: "Alege etichete noi pentru aceste subiecte:"
+        choose_append_tags: "Alege etichete noi pentru aceste subiecte:"
         changed_tags: "Etichetele pentru aceste subiecte au fost schimbate."
       none:
         unread: "Nu sunt subiecte necitite."
@@ -1219,13 +1396,10 @@ ro:
         bookmarks: "Nu mai sunt semne de carte."
         search: "Nu mai sunt rezultate."
     topic:
-      unsubscribe:
-        stop_notifications: "Vei primi mai puține notificări pentru <strong>{{title}}</strong>"
-        change_notification_state: "Starea actuală a notificărilor tale este"
       filter_to:
-        one: "O postare în subiect"
-        few: "{{count}} postări în subiect"
-        other: "{{count}} de postări în subiect"
+        few: '{{count}} postări în subiect'
+        one: O postare în subiect
+        other: '{{count}} de postări în subiect'
       create: 'Subiect nou'
       create_long: 'Creează un subiect nou'
       private_message: 'Scrie un mesaj.'
@@ -1239,12 +1413,12 @@ ro:
       new: 'subiect nou'
       unread: 'necitit'
       new_topics:
-        one: 'Un subiect nou'
         few: '{{count}} subiecte noi'
+        one: Un subiect nou
         other: '{{count}} de subiecte noi'
       unread_topics:
-        one: 'Un subiect necitit'
         few: '{{count}} subiecte necitite'
+        one: Un subiect necitit
         other: '{{count}} de subiecte necitite'
       title: 'Subiect'
       invalid_access:
@@ -1258,42 +1432,83 @@ ro:
         title: "Subiectul nu a fost găsit"
         description: "Ne pare rău, Nu am putut găsi subiectul. Poate a fost șters de un moderator?"
       total_unread_posts:
-        one: "ai un mesaj necitit în această discuţie."
-        few: "ai {{count}} mesaje necitite în această discuţie."
-        other: "ai {{count}} de mesaje necitite în această discuţie."
+        few: ai {{count}} mesaje necitite în această discuţie.
+        one: ai un mesaj necitit în această discuţie.
+        other: ai {{count}} de mesaje necitite în această discuţie.
       unread_posts:
-        one: "ai un mesaj vechi necitit în această discuţie."
-        few: "ai {{count}} mesaje vechi necitite în această discuţie."
-        other: "ai {{count}} de mesaje vechi necitite în această discuţie."
+        few: ai {{count}} mesaje vechi necitite în această discuţie.
+        one: ai un mesaj vechi necitit în această discuţie.
+        other: ai {{count}} de mesaje vechi necitite în această discuţie.
       new_posts:
-        one: "este un mesaj nou în această discuţie de la ultima citire"
-        few: "sunt {{count}} mesaje noi în această discuţie de la ultima citire"
-        other: "sunt {{count}} de mesaje noi în această discuţie de la ultima citire"
+        few: sunt {{count}} mesaje noi în această discuţie de la ultima citire
+        one: este un mesaj nou în această discuţie de la ultima citire
+        other: sunt {{count}} de mesaje noi în această discuţie de la ultima citire
       likes:
-        one: "există o apreciere pentru această discuţie"
-        few: "sunt {{count}} aprecieri pentru această discuţie"
-        other: "sunt {{count}} de aprecieri pentru această discuţie"
+        few: sunt {{count}} aprecieri pentru această discuţie
+        one: există o apreciere pentru această discuţie
+        other: sunt {{count}} de aprecieri pentru această discuţie
       back_to_list: "Înapoi la lista de subiecte"
       options: "Opțiuni pentru subiect"
       show_links: "arată link-urile din acest subiect"
       toggle_information: "comută între detaliile subiectului"
       read_more_in_category: "Vrei să citești mai mult? Răsfoiește alte subiecte din {{catLink}} sau {{latestLink}}."
       read_more: "Vrei să citești mai multe subiecte? {{catLink}} sau {{latestLink}}."
-      read_more_MF: "{ UNREAD, plural, =0 {} one { Există <a href='/unread'>un subiect necitit</a> } other { Sunt <a href='/unread'># subiecte necitite</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{și } false {există } other{}} <a href='/new'>un subiect  nou</a>} other { {BOTH, select, true{și } false {sunt } other{}} <a href='/new'># subiecte noi</a>} } rămase, sau {CATEGORY, select, true {răsfoiți alte subiecte în {catLink}} false {{latestLink}} other {}}"
+      read_more_MF: "{ UNREAD, plural, =0 {} one { Există <a href='/unread'>un subiect necitit</a> } other { Sunt <a href='/unread'># subiecte necitite</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{și } false {există } other{}} <a href='/new'>un subiect  nou</a>} other { {BOTH, select, true{și } false {sunt } other{}} <a href='/new'># subiecte noi</a>} } rămas(e), sau {CATEGORY, select, true {răsfoiți alte subiecte în {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Răsfoiți prin toate categoriile
       view_latest_topics: arată ultimele subiecte
-      suggest_create_topic: Ce ar fi să creezi un subiect?
+      suggest_create_topic: "Ce ar fi să creezi un subiect?"
       jump_reply_up: sări la un răspuns mai vechi
       jump_reply_down: sări la un răspuns mai nou
       deleted: "Subiectul a fost șters"
+      topic_status_update:
+        title: "Temporizator subiect"
+        save: "Setează temporizator"
+        num_of_hours: "Număr de ore:"
+        remove: "Elimină temporizator"
+        publish_to: "Publică la:"
+        when: "Când:"
+        public_timer_types: Temporizatoare subiect
+      auto_update_input:
+        none: "Alege un interval de timp"
+        later_today: "Mai târziu azi"
+        tomorrow: "Mâine"
+        later_this_week: "Mai târziu săptămâna asta"
+        this_weekend: "Acest weekend"
+        next_week: "Săptămâna viitoare"
+        two_weeks: "Două săptămâni"
+        next_month: "Luna viitoare"
+        three_months: "Trei luni"
+        six_months: "6 luni"
+        one_year: "Un an"
+        forever: "Pentru totdeanua"
+        pick_date_and_time: "Alege data și ora"
+        set_based_on_last_post: "Închide pe baza ultimei postări"
+      publish_to_category:
+        title: "Programează publicarea"
+      temp_open:
+        title: "Deschide temporar"
+      auto_reopen:
+        title: "Deschide automat subiect"
+      temp_close:
+        title: "Închide temporar"
+      auto_close:
+        title: "Închide automat subiectul"
+        label: "Ore pentru închidere automată a subiectului:"
+        error: "Introduceţi o valoare validă."
+        based_on_last_post: "Nu închide până când ultima postare din subiect este măcar atât de veche."
+      auto_delete:
+        title: "Șterge automat subiect"
+      reminder:
+        title: "Amintește-mi"
       status_update_notice:
+        auto_open: "Acest subiect va fi deschis automat la %{timeLeft}."
         auto_close: "Acest subiect va fi automat închis în %{timeLeft}."
         auto_close_based_on_last_post: "Acest subiect va fi automat închis după %{duration} de la ultimul răspuns."
       auto_close_title: 'Setări de închidere automată'
       auto_close_immediate:
-        one: "Ultima postare din subiect este deja veche de o oră, așa că subiectul va fi închis imediat."
-        few: "Ultima postare din subiect este deja veche de %{count} ore, așa că subiectul va fi închis imediat."
-        other: "Ultima postare din subiect este deja veche de %{count} de ore, așa că subiectul va fi închis imediat."
+        few: Ultima postare din subiect este deja veche de %{count} ore, așa că subiectul va fi închis imediat.
+        one: Ultima postare din subiect este deja veche de o oră, așa că subiectul va fi închis imediat.
+        other: Ultima postare din subiect este deja veche de %{count} de ore, așa că subiectul va fi închis imediat.
       timeline:
         back: "Înapoi"
         back_description: "Întoarce-te la ultima ta postare necitită"
@@ -1304,6 +1519,8 @@ ro:
         go_bottom: "sfârșit"
         go: "mergi"
         jump_bottom: "sari la ultimul mesaj"
+        jump_prompt: "sari la..."
+        jump_prompt_of: "din %{count} postări"
         jump_prompt_long: "La ce postare dorești să sari?"
         jump_bottom_with_number: "sari la mesajul %{post_number}"
         total: toate postările
@@ -1312,18 +1529,19 @@ ro:
         title: schimbă frecvența cu care vei fi notificat despre acest subiect
         reasons:
           mailing_list_mode: "Ai modul mailing list activat, așa că nu vei fi notificat prin email cu privire la răspunsurile la acest subiect."
-          '3_10': 'Vei primi notificări pentru ca urmărești o etichetă de la acest subiect.'
-          '3_6': 'Vei primi notificări deoarece urmărești activ această categorie.'
-          '3_5': 'Vei primi notificări deoarece ai început să urmărești activ acest subiect, în mod automat.'
-          '3_2': 'Vei primi notificări deoarece urmărești activ acest subiect.'
-          '3_1': 'Vei primi notificări deoarece ai creat acest subiect.'
-          '3': 'Vei primi notificări deoarece urmărești activ acest subiect.'
-          '2': 'Vei vedea numărul răspunsurilor noi deoarece <a href="/u/{{username}}/preferences">citești acest subiect</a>'
-          '1_2': 'Vei fi notificat dacă cineva îți menționează @numele sau îți scrie un răspuns.'
-          '1': 'Vei fi notificat dacă cineva îți menționează @numele sau îți scrie un răspuns.'
-          '0_7': 'Ignori toate notificările din această categorie.'
-          '0_2': 'În acest moment ignori toate notificările de la acest subiect.'
-          '0': 'În acest moment ignori toate notificările de la acest subiect.'
+          "3_10": 'Vei primi notificări pentru ca urmărești o etichetă de la acest subiect.'
+          "3_6": 'Vei primi notificări deoarece urmărești activ această categorie.'
+          "3_5": 'Vei primi notificări deoarece ai început să urmărești activ acest subiect, în mod automat.'
+          "3_2": 'Vei primi notificări deoarece urmărești activ acest subiect.'
+          "3_1": 'Vei primi notificări deoarece ai creat acest subiect.'
+          "3": 'Vei primi notificări deoarece urmărești activ acest subiect.'
+          "2_2": 'Vei vedea numărul răspunsurilor noi deoarece urmărești acest subiect.'
+          "2": 'Vei vedea numărul răspunsurilor noi deoarece <a href="/u/{{username}}/preferences">citești acest subiect</a>'
+          "1_2": 'Vei fi notificat dacă cineva îți menționează @numele sau îți scrie un răspuns.'
+          "1": 'Vei fi notificat dacă cineva îți menționează @numele sau îți scrie un răspuns.'
+          "0_7": 'Ignori toate notificările din această categorie.'
+          "0_2": 'În acest moment ignori toate notificările de la acest subiect.'
+          "0": 'În acest moment ignori toate notificările de la acest subiect.'
         watching_pm:
           title: "Urmărind activ"
           description: "Numărul postărilor noi va fi arătat pentru acest mesaj și vei fi notificat pentru orice răspuns scris."
@@ -1369,6 +1587,9 @@ ro:
         pin_globally: "Promovează discuţia global"
         make_banner: "Adaugă statutul de banner"
         remove_banner: "Șterge statutul de banner"
+      reply:
+        title: 'Răspunde'
+        help: 'începe să scrii un răspuns la acest subiect'
       clear_pin:
         title: "Anulează subiect fixat"
         help: "Elimină  subiectul fixat pentru a nu mai apărea la începutul listei de subiecte."
@@ -1392,9 +1613,9 @@ ro:
         pin_validation: "Este necesară o dată pentru a putea fixa acest subiect."
         not_pinned: "Nu sunt subiecte fixate în {{categoryLink}}."
         already_pinned:
-          one: "Număr de subiecte momentan fixate în {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          few: "Număr de subiecte momentan fixate în {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "Număr de subiecte momentan fixate în {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          few: 'Număr de subiecte momentan fixate în {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: 'Număr de subiecte momentan fixate în {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          other: 'Număr de subiecte momentan fixate în {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         pin_globally: "Pune acest subiect în vârful listei tuturor subiectelor până"
         confirm_pin_globally: "Sunt {{count}} subiecte fixate la nivel global. Prea multe subiecte fixate pot fi deveni o problemă pentru utilizatorii noi sau anonimi. Ești sigur că vrei să fixezi un nou subiect la nivel global?"
         unpin_globally: "Elimină acest subiect din partea de sus a tuturor listelor de discuţii."
@@ -1402,9 +1623,9 @@ ro:
         global_pin_note: "Utilizatorii pot anula un subiect fixat doar de ei pentru ei înșiși."
         not_pinned_globally: "Nu există subiecte fixate global."
         already_pinned_globally:
-          one: "Număr de subiecte fixate la nivel global: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          few: "Număr de subiecte fixate la nivel global: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "Număr de subiecte fixate la nivel global: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          few: 'Număr de subiecte fixate la nivel global: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: 'Număr de subiecte fixate la nivel global: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          other: 'Număr de subiecte fixate la nivel global: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         make_banner: "Transformă acest subiect într-un banner care apare în partea de sus a tuturor paginilor."
         remove_banner: "Elimină mesajul banner care apare în partea de sus a fiecărei pagini."
         banner_note: "Utilizatorii pot îndepărta baner-ul închizându-l. Doar un singur mesaj poate fi folosit ca baner într-un moment dat."
@@ -1440,9 +1661,9 @@ ro:
       login_reply: 'Autentifică-te pentru a răspunde.'
       filters:
         n_posts:
-          one: "O postare"
-          few: "{{count}} postări"
-          other: "{{count}} de postări"
+          few: '{{count}} postări'
+          one: O postare
+          other: '{{count}} de postări'
         cancel: "Șterge filtre"
       split_topic:
         title: "Mutare în subiect nou."
@@ -1450,17 +1671,17 @@ ro:
         topic_name: "Numele subiectului nou"
         error: "A apărut o eroare la mutarea postărilor în subiectul nou."
         instructions:
-          one: "Vei crea o nouă discuţie care va fi populată cu postarea selectată."
-          few: "Vei crea o nouă discuţie care va fi populată cu cele <b>{{count}}</b> postări selectate."
-          other: "Vei crea o nouă discuţie care va fi populată cu cele <b>{{count}}</b> de postări selectate."
+          few: Vei crea o nouă discuţie care va fi populată cu cele <b>{{count}}</b> postări selectate.
+          one: Vei crea o nouă discuţie care va fi populată cu postarea selectată.
+          other: Vei crea o nouă discuţie care va fi populată cu cele <b>{{count}}</b> de postări selectate.
       merge_topic:
         title: "Mută în subiect deja existent"
         action: "mută în subiect deja existent"
         error: "A apărut o eroare la mutarea postărilor în acel subiect."
         instructions:
-          one: "Te rugăm să alegi subiectul unde dorești să muți acest mesaj."
-          few: "Te rugăm să alegi subiectul unde dorești să muți aceste <b>{{count}}</b>  mesaje."
-          other: "Te rugăm să alegi subiectul unde dorești să muți aceste <b>{{count}}</b> de mesaje."
+          few: Te rugăm să alegi subiectul unde dorești să muți aceste <b>{{count}}</b>  mesaje.
+          one: Te rugăm să alegi subiectul unde dorești să muți acest mesaj.
+          other: Te rugăm să alegi subiectul unde dorești să muți aceste <b>{{count}}</b> de mesaje.
       merge_posts:
         title: "Comasează postările selectate"
         action: "comasează postările selectate"
@@ -1472,10 +1693,9 @@ ro:
         label: "Noul autor al postărilor"
         placeholder: "numele de utilizator al autorului"
         instructions:
-          one: "Alege noul autor pentru mesajul postat de <b>{{old_user}}</b>."
-          few: "Alege noul autor pentru cele {{count}} mesaje postate de <b>{{old_user}}</b>."
-          other: "Alege noul autor pentru cele {{count}} de mesaje postate de <b>{{old_user}}</b>."
-        instructions_warn: "NB: nicio notificare ce privește această postare nu va fi transferabilă retroactiv către noul utilizator.<br>Avertisment: Acum, nicio informație ce depinde de postare nu va fi transferată noului utilizator. Folosește cu atenție."
+          few: Alege noul autor pentru cele {{count}} mesaje postate de <b>{{old_user}}</b>.
+          one: Alege noul autor pentru mesajul postat de <b>{{old_user}}</b>.
+          other: Alege noul autor pentru cele {{count}} de mesaje postate de <b>{{old_user}}</b>.
       change_timestamp:
         action: "schimbă data publicării"
         invalid_timestamp: "Marcajul de timp nu poate fi în viitor."
@@ -1484,53 +1704,62 @@ ro:
       multi_select:
         select: 'selectează'
         selected: 'selectate ({{count}})'
+        select_post:
+          label: 'alege'
+          title: 'Adaugă postare în selecție'
+        selected_post:
+          label: 'selectat'
+          title: 'Apasă pentru a exclude postarea din selecție'
+        select_replies:
+          label: 'selectează +răspunsuri'
+          title: 'Adaugă postarea și toate răspunsurile la selecție'
         delete: șterge selecția
         cancel: anulare selecție
         select_all: selectează tot
         deselect_all: deselectează  tot
         description:
-          one: Ai selectat <b>un</b> mesaj.
           few: Ai selectat <b>{{count}}</b> mesaje.
+          one: Ai selectat <b>un</b> mesaj.
           other: Ai selectat <b>{{count}}</b> de mesaje.
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Citează"
       edit_reason: "Motivul edit[rii: "
       post_number: "postarea {{number}}"
       last_edited_on: "postare editată ultima oară la"
       reply_as_new_topic: "Răspunde cu link către subiect"
+      reply_as_new_private_message: "Răspunde cu un mesaj nou aceluiași destinatar"
       continue_discussion: "În continuarea discuției de la {{postLink}}:"
       follow_quote: "mergi la postarea citată"
       show_full: "Arată postarea în întregime"
       show_hidden: 'Arată conținut ascuns.'
       deleted_by_author:
-        one: "(post retras de autor, va fi şters automat într-o oră, cu excepţia cazului în care mesajul este marcat)"
-        few: "(postări retrase de autor, vor fi şterse automat în %{count} ore, cu excepţia cazului în care mesajele sunt marcate)"
-        other: "(postări retrase de autor, vor fi şterse automat în %{count} de ore, cu excepţia cazului în care mesajele sunt marcate)"
+        few: (postări retrase de autor, vor fi şterse automat în %{count} ore, cu excepţia cazului în care mesajele sunt marcate)
+        one: (post retras de autor, va fi şters automat într-o oră, cu excepţia cazului în care mesajul este marcat)
+        other: (postări retrase de autor, vor fi şterse automat în %{count} de ore, cu excepţia cazului în care mesajele sunt marcate)
+      collapse: "restrânge"
       expand_collapse: "extinde/restrânge"
       gap:
-        one: "vezi un răspuns ascuns"
-        few: "vezi {{count}} răspunsuri ascunse"
-        other: "vezi {{count}} de răspunsuri ascunse"
+        few: vezi {{count}} răspunsuri ascunse
+        one: vezi un răspuns ascuns
+        other: vezi {{count}} de răspunsuri ascunse
       unread: "postarea nu a fost citită"
       has_replies:
-        one: "Un răspuns"
-        few: "{{count}} răspunsuri"
-        other: "{{count}} de răspunsuri"
+        few: '{{count}} răspunsuri'
+        one: Un răspuns
+        other: '{{count}} de răspunsuri'
       has_likes:
-        one: "O apreciere"
-        few: "{{count}} aprecieri"
-        other: "{{count}} de aprecieri"
+        few: '{{count}} aprecieri'
+        one: O apreciere
+        other: '{{count}} de aprecieri'
       has_likes_title:
-        one: "O persoană a apreciat această postare."
-        few: "{{count}} persoane au apreciat această postare."
-        other: "{{count}} de persoane au apreciat această postare."
+        few: '{{count}} persoane au apreciat această postare.'
+        one: O persoană a apreciat această postare.
+        other: '{{count}} de persoane au apreciat această postare.'
       has_likes_title_only_you: "Ai apreciat această postare."
       has_likes_title_you:
-        one: "Ai apreciat această postare împreună cu un alt utilizator."
-        few: "Ai apreciat această postare împreună cu alți {{count}} utilizatori."
-        other: "Ai apreciat această postare împreună cu alți {{count}} de utilizatori."
+        few: Ai apreciat această postare împreună cu alți {{count}} utilizatori.
+        one: Ai apreciat această postare împreună cu un alt utilizator.
+        other: Ai apreciat această postare împreună cu alți {{count}} de utilizatori.
       errors:
         create: "Ne pare rău, a apărut o eroare la creerea postării. Te rugăm să încerci iar."
         edit: "Ne pare rău, a apărut o eroare la editarea postării. Te rugăm să încerci iar."
@@ -1557,12 +1786,24 @@ ro:
         has_liked: "ai apreciat acest răspuns"
         undo_like: "anulează aprecierea"
         edit: "editează această postare"
+        edit_action: "Modifică"
         edit_anonymous: "Ne pare rău, dar trebuie să fii autentificat pentru a edita această postare."
         flag: "marchează această postare ca mesaj privat sau trimite o notificare privată despre ea către un admin/moderator"
         delete: "șterge această postare"
         undelete: "restaurează această postare"
         share: "distribuie un link către această postare"
         more: "Mai mult"
+        delete_replies:
+          confirm: "Dorești să ștergi și răspunsurile la această postare?"
+          direct_replies:
+            few: Da, și {{count}} răspunsuri directe
+            one: Da, și {{count}} răspuns direct
+            other: Da, și {{count}} răspunsuri directe
+          all_replies:
+            few: Da, și toate {{count}} răspunsurile
+            one: Da, și 1 răspuns
+            other: Da, și toate {{count}} răspunsurile
+          just_the_post: "Nu, doare această postare"
         admin: "acțiuni administrative pentru postare"
         wiki: "Fă postarea Wiki"
         unwiki: "Nu mai fă Wiki din postare"
@@ -1571,6 +1812,9 @@ ro:
         rebake: "Reconstruieşte HTML"
         unhide: "Arată"
         change_owner: "Schimbă proprietarul"
+        grant_badge: "Acordă ecuson"
+        lock_post: "Blochează postarea"
+        unlock_post: "Deblochează postarea"
       actions:
         flag: 'Marchează cu marcaj de avertizare'
         undo:
@@ -1588,6 +1832,10 @@ ro:
           notify_user: "a trimis un mesaj"
           bookmark: "a pus semn de carte la asta"
           like: "a apreciat asta"
+          like_capped:
+            few: și {{count}} alții au apreciat asta
+            one: și {{count}} altul au apreciat asta
+            other: și {{count}} alții au apreciat asta
           vote: "a votat la asta"
         by_you:
           off_topic: "Ai marcat asta cu mesaj de avertizare, ca fiind în afara subiectului"
@@ -1600,70 +1848,80 @@ ro:
           vote: "Ai votat aceasta postare"
         by_you_and_others:
           off_topic:
-            one: "Tu şi încă o persoană aţi marcat acest mesaj ca fiind în afară subiectului"
-            few: "Tu şi alte {{count}} persoane aţi marcat acest mesaj ca fiind în afara subiectului."
-            other: "Tu şi alte {{count}} de persoane aţi marcat acest mesaj ca fiind în afara subiectului."
+            few: Tu şi alte {{count}} persoane aţi marcat acest mesaj ca fiind în afara subiectului.
+            one: Tu şi încă o persoană aţi marcat acest mesaj ca fiind în afară subiectului
+            other: Tu şi alte {{count}} de persoane aţi marcat acest mesaj ca fiind în afara subiectului.
           spam:
-            one: "Tu şi încă o persoană aţi marcat acest mesaj ca spam. "
-            few: "Tu şi alte {{count}} persoane aţi marcat acest mesaj ca spam. "
-            other: "Tu şi alte {{count}} de persoane aţi marcat acest mesaj ca spam. "
+            few: 'Tu şi alte {{count}} persoane aţi marcat acest mesaj ca spam. '
+            one: 'Tu şi încă o persoană aţi marcat acest mesaj ca spam. '
+            other: 'Tu şi alte {{count}} de persoane aţi marcat acest mesaj ca spam. '
           inappropriate:
-            one: "Tu şi încă o persoană aţi marcat acest mesaj ca inadecvat. "
-            few: "Tu şi alte {{count}} persoane aţi marcat acest mesaj ca inadecvat. "
-            other: "Tu şi alte {{count}} de persoane aţi marcat acest mesaj ca inadecvat. "
+            few: 'Tu şi alte {{count}} persoane aţi marcat acest mesaj ca inadecvat. '
+            one: 'Tu şi încă o persoană aţi marcat acest mesaj ca inadecvat. '
+            other: 'Tu şi alte {{count}} de persoane aţi marcat acest mesaj ca inadecvat. '
           notify_moderators:
-            one: "Tu şi încă o persoană aţi marcat acest mesaj pentru moderare."
-            few: "Tu şi alte {{count}} persoane aţi marcat acest mesaj pentru moderare."
-            other: "Tu şi alte {{count}} de persoane aţi marcat acest mesaj pentru moderare."
+            few: Tu şi alte {{count}} persoane aţi marcat acest mesaj pentru moderare.
+            one: Tu şi încă o persoană aţi marcat acest mesaj pentru moderare.
+            other: Tu şi alte {{count}} de persoane aţi marcat acest mesaj pentru moderare.
           notify_user:
-            one: "Tu şi încă o persoană aţi trimis un mesaj către acest utilizator."
-            few: "Tu şi alte {{count}}  persoane aţi trimis un mesaj către acest utilizator."
-            other: "Tu şi alte {{count}} de persoane aţi trimis un mesaj către acest utilizator."
+            few: Tu şi alte {{count}}  persoane aţi trimis un mesaj către acest utilizator.
+            one: Tu şi încă o persoană aţi trimis un mesaj către acest utilizator.
+            other: Tu şi alte {{count}} de persoane aţi trimis un mesaj către acest utilizator.
           bookmark:
-            one: "Tu şi încă o persoană aţi pus un semn de carte pentru această postare."
-            few: "Tu şi alte {{count}} persoane aţi pus un semn de carte pentru această postare."
-            other: "Tu şi alte {{count}} de persoane aţi pus un semn de carte pentru această postare."
+            few: Tu şi alte {{count}} persoane aţi pus un semn de carte pentru această postare.
+            one: Tu şi încă o persoană aţi pus un semn de carte pentru această postare.
+            other: Tu şi alte {{count}} de persoane aţi pus un semn de carte pentru această postare.
           like:
-            one: "Tu şi încă o persoană aţi apreciat aceasta."
-            few: "Tu şi alte {{count}} persoane aţi apreciat asta."
-            other: "Tu şi alte {{count}} de persoane aţi apreciat asta."
+            few: Tu şi alte {{count}} persoane aţi apreciat asta.
+            one: Tu şi încă o persoană aţi apreciat aceasta.
+            other: Tu şi alte {{count}} de persoane aţi apreciat asta.
           vote:
-            one: "Tu şi încă o persoană aţi votat la această postare."
-            few: "Tu şi alte {{count}} persoane aţi votat la această postare."
-            other: "Tu şi alte {{count}} de persoane aţi votat la această postare."
+            few: Tu şi alte {{count}} persoane aţi votat la această postare.
+            one: Tu şi încă o persoană aţi votat la această postare.
+            other: Tu şi alte {{count}} de persoane aţi votat la această postare.
         by_others:
           off_topic:
-            one: "O persoană a marcat acesta ca fiind în afară discuţiei"
-            few: "{{count}} persoane au marcat acesta ca fiind în afară discuţiei"
-            other: "{{count}} de persoane au marcat acesta ca fiind în afară discuţiei"
+            few: '{{count}} persoane au marcat acesta ca fiind în afară discuţiei'
+            one: O persoană a marcat acesta ca fiind în afară discuţiei
+            other: '{{count}} de persoane au marcat acesta ca fiind în afară discuţiei'
           spam:
-            one: "O persoană a marcat acesta ca spam"
-            few: "{{count}} persoane au marcat acesta ca spam"
-            other: "{{count}} de persoane au marcat acesta ca spam"
+            few: '{{count}} persoane au marcat acesta ca spam'
+            one: O persoană a marcat acesta ca spam
+            other: '{{count}} de persoane au marcat acesta ca spam'
           inappropriate:
-            one: "o persoană a marcat acesta ca inadecvat"
-            few: "{{count}} persoane au marcat acesta ca inadecvat"
-            other: "{{count}} de persoane au marcat acesta ca inadecvat"
+            few: '{{count}} persoane au marcat acesta ca inadecvat'
+            one: o persoană a marcat acesta ca inadecvat
+            other: '{{count}} de persoane au marcat acesta ca inadecvat'
           notify_moderators:
-            one: "O persoană a marcat acest mesaj pentru moderare"
-            few: "{{count}} persoane au marcat acest mesaj pentru moderare"
-            other: "{{count}} de persoane au marcat acest mesaj pentru moderare"
+            few: '{{count}} persoane au marcat acest mesaj pentru moderare'
+            one: O persoană a marcat acest mesaj pentru moderare
+            other: '{{count}} de persoane au marcat acest mesaj pentru moderare'
           notify_user:
-            one: "o persoană a trimis un mesaj către acest utilizator"
-            few: "{{count}} persoane au trimis un mesaj către acest utilizator"
-            other: "{{count}} de persoane au trimis un mesaj către acest utilizator"
+            few: '{{count}} persoane au trimis un mesaj către acest utilizator'
+            one: o persoană a trimis un mesaj către acest utilizator
+            other: '{{count}} de persoane au trimis un mesaj către acest utilizator'
           bookmark:
-            one: "O persoană a pus un semn de carte la acest mesaj"
-            few: "{{count}} persoane au pus un semn de carte la acest mesaj"
-            other: "{{count}} de persoane au pus un semn de carte la acest mesaj"
+            few: '{{count}} persoane au pus un semn de carte la acest mesaj'
+            one: O persoană a pus un semn de carte la acest mesaj
+            other: '{{count}} de persoane au pus un semn de carte la acest mesaj'
           like:
-            one: "o persoană a apreciat aceasta"
-            few: "{{count}} persoane au apreciat aceasta"
-            other: "{{count}} de persoane au apreciat aceasta"
+            few: '{{count}} persoane au apreciat aceasta'
+            one: o persoană a apreciat aceasta
+            other: '{{count}} de persoane au apreciat aceasta'
           vote:
-            one: "O persoană a votat pentru acest mesaj"
-            few: "{{count}} persoane au votat pentru acest mesaj"
-            other: "{{count}} de persoane au votat pentru acest mesaj"
+            few: '{{count}} persoane au votat pentru acest mesaj'
+            one: O persoană a votat pentru acest mesaj
+            other: '{{count}} de persoane au votat pentru acest mesaj'
+      delete:
+        confirm:
+          few: Ești sigur că vrei să ștergi acele {{count}} postări?
+          one: Ești sigur că vrei să ștergi aca postare?
+          other: Ești sigur că vrei să ștergi acele {{count}} postări?
+      merge:
+        confirm:
+          few: Ești sigur că vrei să comasezi acele {{count}} postări?
+          one: Ești sigur că vrei să comasezi acele postări?
+          other: Ești sigur că vrei să comasezi acele {{count}} postări?
       revisions:
         controls:
           first: "Prima revizie"
@@ -1673,14 +1931,25 @@ ro:
           hide: "Ascunde revizia"
           show: "Afișează revizia"
           revert: "Restaurează această revizie"
+          edit_post: "Modifică postarea"
           comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> <i class='fa fa-arrows-h'></i> <strong>{{current}}</strong> / {{total}}"
         displays:
           inline:
             title: "Arată output-ul randat, cu adăugiri și ștergeri intercalate"
+            button: 'HTML'
           side_by_side:
             title: "Arată una lângă alta diferențele din output-ul randat"
+            button: 'HTML'
           side_by_side_markdown:
             title: "Arată una lângă alta diferențele din sursa brută"
+      raw_email:
+        displays:
+          text_part:
+            title: "Arată partea de text a emailului"
+            button: 'Text'
+          html_part:
+            title: "Arată partea HTML a emailului"
+            button: 'HTML'
     category:
       can: 'can&hellip; '
       none: '(nicio categorie)'
@@ -1693,6 +1962,8 @@ ro:
       settings: 'Setări'
       topic_template: "Șablon subiect"
       tags: "Etichete"
+      tags_allowed_tags: "Permite doar folosirea acestor etichete în această categorie:"
+      tags_allowed_tag_groups: "Permite doar folosirea etichetelor din aceste grupuri în această categorie:"
       tags_placeholder: "(Opțional) lista etichetelor permise"
       tag_groups_placeholder: "(Opțional) lista grupurilor de etichete permise"
       topic_featured_link_allowed: "Permite link-uri promovate în această categorie."
@@ -1727,8 +1998,9 @@ ro:
       email_in_allow_strangers: "Acceptă emailuri de la utilizatori anonimi fără cont"
       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ă."
       all_topics_wiki: "Transformă subiectele noi în wiki-uri, implicit."
+      sort_order: "Sortează lista de subiecte după:"
+      default_view: "Listă implicită de subiecte:"
       allow_badges_label: "Permite acordarea de ecusoane în această categorie"
       edit_permissions: "Editează permisiuni"
       add_permission: "Adaugă permisiune"
@@ -1766,6 +2038,9 @@ ro:
         created: "Creat"
       sort_ascending: 'Crescător'
       sort_descending: 'Descrescător'
+      subcategory_list_styles:
+        rows: "Rânduri"
+        rows_with_featured_topics: "Rânduri cu subiecte promovate"
     flagging:
       title: 'Îți mulțumim că ne ajuți să păstrăm o comunitate civilizată!'
       action: 'Marcare'
@@ -1789,17 +2064,17 @@ ro:
       custom_placeholder_notify_moderators: "Spune-ne exact ceea ce te preocupă, și dă-ne și link-uri relevante de câte ori e posibil."
       custom_message:
         at_least:
-          one: "introdu cel puțin un caracter"
-          few: "introdu cel puțin {{count}} caractere"
-          other: "introdu cel puțin {{count}} de caractere"
+          few: introdu cel puțin {{count}} caractere
+          one: introdu cel puțin un caracter
+          other: introdu cel puțin {{count}} de caractere
         more:
-          one: "încă {{count}} ..."
-          few: "încă {{count}} ..."
-          other: "încă {{count}} ..."
+          few: încă {{count}} ...
+          one: încă {{count}} ...
+          other: încă {{count}} ...
         left:
-          one: "a mai rămas {{count}} ..."
-          few: "au mai rămas {{count}} ..."
-          other: "au mai rămas {{count}} ..."
+          few: au mai rămas {{count}} ...
+          one: a mai rămas {{count}} ...
+          other: au mai rămas {{count}} ...
     flagging_topic:
       title: "Îți mulțumim că ne ajuți să păstrăm o comunitate civilizată!"
       action: "Marchează subiectul cu marcaj de avertizare"
@@ -1810,15 +2085,15 @@ ro:
       links_title: "Legături populare"
       links_shown: "arată mai multe link-uri..."
       clicks:
-        one: "1 click"
-        few: "%{count} click-uri"
-        other: "%{count} de click-uri"
+        few: '%{count} click-uri'
+        one: 1 click
+        other: '%{count} de click-uri'
     post_links:
       about: "afișează mai multe link-uri din această postare"
       title:
-        one: "mai e %{count}"
-        few: "mai sunt %{count}"
-        other: "mai sunt %{count}"
+        few: mai sunt %{count}
+        one: mai e %{count}
+        other: mai sunt %{count}
     topic_statuses:
       warning:
         help: "Aceasta este o avertizare oficială."
@@ -1846,28 +2121,28 @@ ro:
     posts_likes_MF: |
       Acest subiect are {count, plural, one {1 răspuns} other {# răspunsuri}} {ratio, select,
       jos {cu o rată înaltă de aprecieri pe postare}
-      med {cu o foarte înaltă rată de aprecieri pe postare}
+      med {cu o foarte înaltă de aprecieri pe postare}
       înalt {cu o rată extrem de înaltă de aprecieri pe postare}
       other {}}
     original_post: "Postare inițială"
     views: "Vizualizări"
     views_lowercase:
-      one: "vizualizare"
-      few: "vizualizări"
-      other: "de vizualizări"
+      few: vizualizări
+      one: vizualizare
+      other: de vizualizări
     replies: "Răspunsuri"
     activity: "Activitate"
     likes: "Aprecieri"
     likes_lowercase:
-      one: "apreciere"
-      few: "aprecieri"
-      other: "aprecieri"
+      few: aprecieri
+      one: apreciere
+      other: aprecieri
     likes_long: "sunt {{number}} (de) aprecieri în acest subiect"
     users: "Utilizatori"
     users_lowercase:
-      one: "utilizator"
-      few: "utilizatori"
-      other: "de utilizatori"
+      few: utilizatori
+      one: utilizator
+      other: de utilizatori
     category_title: "Categorie"
     history: "Istoric"
     changed_by: "de {{author}}"
@@ -1880,9 +2155,9 @@ ro:
       latest:
         title: "Cele mai recente"
         title_with_count:
-          one: "Cel mai recent (1)"
-          few: "Cele mai recente ({{count}})"
-          other: "Cele mai recente ({{count}})"
+          few: Cele mai recente ({{count}})
+          one: Cel mai recent (1)
+          other: Cele mai recente ({{count}})
         help: "subiecte cu postări recente"
       hot:
         title: "Interesant"
@@ -1900,25 +2175,25 @@ ro:
       unread:
         title: "Necitite"
         title_with_count:
-          one: "Necitit (1)"
-          few: "Necitite ({{count}})"
-          other: "Necitite ({{count}})"
+          few: Necitite ({{count}})
+          one: Necitit (1)
+          other: Necitite ({{count}})
         help: "subiecte pe care le urmărești activ sau cele pe care le urmărești și care includ postări necitite"
         lower_title_with_count:
-          one: "{{count}} necitit"
-          few: "{{count}} necitite"
-          other: "{{count}} necitite"
+          few: '{{count}} necitite'
+          one: '{{count}} necitit'
+          other: '{{count}} necitite'
       new:
         lower_title_with_count:
-          one: "{{count}} nou"
-          few: "{{count}} noi"
-          other: "{{count}} noi"
+          few: '{{count}} noi'
+          one: '{{count}} nou'
+          other: '{{count}} noi'
         lower_title: "nou"
         title: "Noi"
         title_with_count:
-          one: "Nou (1)"
-          few: "Noi ({{count}})"
-          other: "Noi ({{count}})"
+          few: Noi ({{count}})
+          one: Nou (1)
+          other: Noi ({{count}})
         help: "subiecte create în ultimele zile"
       posted:
         title: "Postările mele"
@@ -1929,9 +2204,9 @@ ro:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: "{{categoryName}} (1)"
-          few: "{{categoryName}} ({{count}})"
-          other: "{{categoryName}} ({{count}})"
+          few: '{{categoryName}} ({{count}})'
+          one: '{{categoryName}} (1)'
+          other: '{{categoryName}} ({{count}})'
         help: "subiecte recente din categoria {{categoryName}}"
       top:
         title: "Top"
@@ -2015,26 +2290,27 @@ ro:
         print: '<b>ctrl</b>+<b>p</b> Tipărire subiect'
     badges:
       earned_n_times:
-        one: "A primit acest ecuson o dată"
-        few: "A primit acest ecuson de %{count} ori"
-        other: "A primit acest ecuson de %{count} de ori"
-      granted_on: "Acordat acum %{date}"
-      others_count: "Numărul celorlalți care au acest ecuson (%{count})"
+        few: A primit acest ecuson de %{count} ori
+        one: A primit acest ecuson o dată
+        other: A primit acest ecuson de %{count} de ori
+      granted_on: "Acordat %{date}"
+      others_count: "Alții cu acest ecuson (%{count})"
       title: Ecusoane
+      multiple_grant: "Poți primi asta de mai multe ori"
       badge_count:
-        one: "%{count} ecuson"
-        few: "%{count} ecusoane"
-        other: "%{count} de ecusoane"
+        few: '%{count} ecusoane'
+        one: '%{count} ecuson'
+        other: '%{count} de ecusoane'
       more_badges:
-        one: "Încă una"
-        few: " Alte %{count}"
-        other: " Alte %{count}"
+        few: ' Alte %{count}'
+        one: Încă una
+        other: ' Alte %{count}'
       granted:
-        one: "%{count} acordat"
-        few: "%{count} acordate"
-        other: "%{count} acordate"
+        few: '%{count} acordate'
+        one: '%{count} acordat'
+        other: '%{count} acordate'
       select_badge_for_title: Selectați un ecuson pentru a-l folosi ca titlu
-      none: "<niciunul>"
+      none: "(nimic)"
       badge_grouping:
         getting_started:
           name: Cum începem
@@ -2057,11 +2333,18 @@ ro:
       </p>
     tagging:
       all_tags: "Toate etichetele"
+      other_tags: "Alte etichete"
       selector_all_tags: "toate etichetele"
       selector_no_tags: "fără etichete"
       changed: "etichete schimbate:"
       tags: "Etichete"
+      choose_for_topic: "etichete opționale"
       delete_tag: "Șterge etichetă"
+      delete_confirm:
+        few: Ești sigur că vrei să ștergi această etichetă și să o scoți din {{count}} subiecte care o folosesc?
+        one: Ești sigur că vrei să ștergi această etichetă și să o scoți dintr-un subiect care o folosește?
+        other: Ești sigur că vrei să ștergi această etichetă și să o scoți din {{count}} subiecte care o folosesc?
+      delete_confirm_no_topics: "Ești sigur că vrei să ștergi această etichetă?"
       rename_tag: "Redenumire etichetă"
       rename_instructions: "Alege un nume nou pentru etichetă:"
       sort_by: "Sortat după:"
@@ -2077,19 +2360,15 @@ ro:
       notifications:
         watching:
           title: "Urmărind activ"
-          description: "Vei urmări activ în mod automat toate subiectele cu această etichetă. Vei fi notificat cu privire la toate noile postări și subiecte, și în plus, un contor al postărilor noi și al celor necitite va apărea în dreptul subiectului."
         watching_first_post:
           title: "Urmărind activ prima postare"
-          description: "Vei fi notificat doar cu privire la prima postare din fiecare nou subiect cu această etichetă."
         tracking:
           title: "Urmărind"
-          description: "Vei urmări automat toate subiectele cu această etichetă. Un contor cu postările necitite și cu cele noi va apărea lingă subiect."
         regular:
           title: "Utilizator frecvent"
           description: "Vei fi notificat dacă cineva îți menționează @numele sau răspunde la postare."
         muted:
           title: "Silențios"
-          description: "Nu vei fi notificat cu privire la nimic legat de noile subiecte cu această etichetă și ele nu vor apărea în tab-ul cu subiecte necitite."
       groups:
         title: "Grupuri de etichete"
         about: "Adaugă etichete la grupuri pentru a le gestiona mai ușor."
@@ -2165,12 +2444,12 @@ ro:
         backups: "back-up"
         traffic_short: "Trafic"
         traffic: "Cereri web"
+        page_views: "Vizualizări"
+        page_views_short: "Vizualizări"
         show_traffic_report: "Arată raportul detaliat cu privire la trafic"
         reports:
           today: "Astăzi"
           yesterday: "Ieri"
-          last_7_days: "Din ultimele 7 zile"
-          last_30_days: "Din ultimele 30 de zile"
           all_time: "Dintotdeauna"
           7_days_ago: "Acum 7 zile"
           30_days_ago: "Acum 30 de zile"
@@ -2186,12 +2465,22 @@ ro:
         by: "de către"
       flags:
         title: "Marcaje de avertizare"
+        active_posts: "Postări marcate"
+        old_posts: "Postări marcate vechi"
+        topics: "Subiecte marcate"
+        moderation_history: "Istoric de moderare"
         agree: "De acord"
         agree_title: "Confirmă acest marcaj ca valid și corect"
-        defer_flag_title: "Scoate marcajul de avertizare; Nu necesită nicio acțiune deocamdată."
+        agree_flag_hide_post: "Ascunde postarea"
+        agree_flag_restore_post_title: "Restabilește postarea pentru astfel încât toți utilizatorii să o poată vedea."
+        agree_flag_suspend: "Suspendă utilizator"
+        agree_flag: "Păstrează postarea"
+        ignore_flag: "Ignoră"
         delete: "Șterge"
         delete_title: "Șterge postarea la care se referă marcajul de avertizare."
+        delete_post_defer_flag: "Șterge postarea și ignoră marcarea"
         delete_post_defer_flag_title: "Șterge postarea; dacă este prima, șterge subiectul"
+        delete_post_agree_flag: "Șterge postarea și aprobă marcajul de avertizare"
         delete_post_agree_flag_title: "Șterge postarea; dacă este prima, șterge subiectul"
         delete_flag_modal_title: "Șterge și..."
         delete_spammer: "Șterge spammer"
@@ -2203,9 +2492,11 @@ ro:
         clear_topic_flags: "Terminat"
         clear_topic_flags_title: "Subiectul a fost analizat iar problema rezolvată. Fă click pe Terminat pentru a înlătura marcajele."
         more: "(mai multe răspunsuri...)"
+        suspend_user: "Suspendă utilizator"
         dispositions:
           agreed: "aprobate"
           disagreed: "respinse"
+          deferred: "ignorat"
         flagged_by: "Marcat de către"
         resolved_by: "Rezolvat de "
         took_action: "A luat măsuri"
@@ -2213,17 +2504,27 @@ ro:
         error: "Ceva nu a funcționat"
         reply_message: "Răspunde"
         topic_flagged: "Aceast <strong>subiect</strong> a fost marcat cu marcaj de avertizare."
+        show_full: "arată întreaga postare"
         visit_topic: "Vizualizează subiectul pentru a acționa."
         was_edited: "Mesajul a fost editat după primul marcaj"
         previous_flags_count: "Acest mesaj a fost deja marcat de {{count}} (de) ori."
+        details: "detalii"
+        flagged_topics:
+          topic: "Subiect"
+          type: "Tip"
+          users: "Utilizatori"
+        short_names:
+          off_topic: "în afara subiectului"
+          inappropriate: "neadecvat"
+          spam: "spam"
+          notify_user: "personalizat"
+          notify_moderators: "personalizat"
       groups:
         primary: "Grup primar"
         no_primary: "(nu există grup primar)"
         title: "Grupuri"
         edit: "Editează grupuri"
         refresh: "Reîmprospătează"
-        new: "Noi"
-        selector_placeholder: "introdu nume de utilizator"
         about: "Editează aici numele și apartenența la grupuri"
         group_members: "Membrii grupului"
         delete: "Șterge"
@@ -2231,21 +2532,12 @@ ro:
         delete_failed: "Imposibil de șters grupul. Dacă este unul automat, nu se poate șterge."
         delete_owner_confirm: "Revocă dreptul de proprietar pentru '%{username}'?"
         add: "Adaugă"
-        add_members: "Adaugă membri"
         custom: "Personalizat"
-        bulk_complete: "Utilizatorii au fost adăugați în grup."
-        bulk: "Adaugă în grup mai mulți utilizatori odată"
-        bulk_paste: "Lipește o listă de utilizatori sau email-uri, câte unul pe linie:"
-        bulk_select: "(selectează un grup)"
         automatic: "Automat"
-        automatic_membership_email_domains: "Utilizatorii care se înregistrează cu un domeniu de email identic cu unul din lista asta vor fi adăugați automat în acest grup:"
-        automatic_membership_retroactive: "Aplică aceeaşi regulă pentru domeniul de email pentru a adauga utilizatorii existenţi"
-        default_title: "Titlu implicit pentru toți utilizatorii din acest grup"
-        primary_group: "Setează automat ca grup principal"
         group_owners: Proprietari
         add_owners: Adaugă proprietari
-        incoming_email: "Adresă de primire emailuri personalizată"
-        incoming_email_placeholder: "introducere adresă de email"
+        none_selected: "Alege un grup pentru a începe"
+        no_custom_groups: "Creează un nou grup personalizat"
       api:
         generate_master: "Generează cheie API principală"
         none: "Nu sunt chei API principale active deocamdată."
@@ -2277,6 +2569,7 @@ ro:
         warn_local_payload_url: "Se pare că dorești să setezi un webhook pentru un url local. Un eveniment livrat către o adresă locală ar putea avea efecte secundare și genera comportamente neașteptate. Continuă?"
         secret_invalid: "Secretul nu trebuie să aibă nici un caracter spațiu-gol."
         secret_too_short: "Secretul trebuie sa conțină cel puțin 12 caractere."
+        secret_placeholder: "Un șir de caractere opțional, folosit la generarea semnăturii"
         event_type_missing: "Va trebui să setezi cel puțin un tip de evenimente."
         content_type: "Tip conținut"
         secret: "Secret"
@@ -2307,13 +2600,13 @@ ro:
           none: "Nu există evenimente înrudite."
           redeliver: "Livrează din nou"
           incoming:
-            one: "Există un nou eveniment "
-            few: "Există {{count}}  noi evenimente."
-            other: "Există {{count}} de noi evenimente."
+            few: Există {{count}}  noi evenimente.
+            one: 'Există un nou eveniment '
+            other: Există {{count}} de noi evenimente.
           completed_in:
-            one: "Terminat într-o secundă."
-            few: "Terminat în {{count}} secunde."
-            other: "Terminat în {{count}} de secunde."
+            few: Terminat în {{count}} secunde.
+            one: Terminat într-o secundă.
+            other: Terminat în {{count}} de secunde.
           request: "Cerere"
           response: "Răspuns"
           redeliver_confirm: "Ești sigur ca vrei să livrezi din nou aceeași încărcătură?"
@@ -2364,7 +2657,6 @@ ro:
           label: "Încarcă"
           title: "Încarcă un backup în această instanță."
           uploading: "Se încarcă..."
-          success: "fișierul '{{filename}}' a fost încărcat cu succes."
           error: "A apărut o eroare la încărcarea fișierului '{{filename}}': {{message}}"
         operations:
           is_running: "O altă operație este în desfășurare..."
@@ -2377,9 +2669,10 @@ ro:
             label: "Backup"
             title: "Creează un backup"
             confirm: "Ești sigur că vei să începi o nouă operațiune de backup?"
-            without_uploads: "Da (nu include fişierele)"
           download:
             label: "Descărcare"
+            title: "Trimite email cu link de descărcare"
+            alert: "Un link pentru descărcarea acestei copii de rezervă ți-a fost trimis pe email."
           destroy:
             title: "Șterge backup-ul"
             confirm: "Ești sigur că vrei să ștergi acest backup?"
@@ -2411,15 +2704,21 @@ ro:
         title: "Personalizare"
         long_title: "Personalizările site-ului"
         preview: "previzualizare"
+        explain_preview: "Vizualizează site-ul cu această temă activată"
         save: "Salvare"
         new: "Nou"
         new_style: "Stil nou"
         import: "Importă"
         delete: "Șterge"
+        delete_confirm: "Șterge această temă"
         about: "Modifică foaia de stil CSS și header-ele HTML din site. Adaugă o personalizare pentru a începe."
         color: "Culoare"
         opacity: "Opacitate"
         copy: "Copiază"
+        copy_to_clipboard: "Copiază în clipboard"
+        copied_to_clipboard: "Copiat în clipboard"
+        copy_to_clipboard_error: "Eroare la copierea datelor în clipboard"
+        theme_owner: "Nemodificabil, deținut de:"
         email_templates:
           title: "Șabloane de emailuri"
           subject: "Subiect"
@@ -2428,8 +2727,58 @@ ro:
           none_selected: "Selectează un șablon pentru a începe editarea"
           revert: "Revocă schimbările"
           revert_confirm: "Ești sigur că vrei să revoci schimbările?"
+        theme:
+          import_theme: "Importă temă"
+          customize_desc: "Personalizează:"
+          title: "Teme"
+          long_title: "Modifică culori, CSS și conținutul HTML al site-ului"
+          edit: "Modifică"
+          common: "Comun"
+          desktop: "Desktop"
+          mobile: "Mobil"
+          preview: "Previzualizează"
+          is_default: "Tema este activată implicit"
+          user_selectable: "Tema poate fi aleasă de către utilizatori"
+          color_scheme: "Schemă de culori"
+          color_scheme_select: "Alege culorile folosite de către temă"
+          custom_sections: "Secțiuni personalizate:"
+          theme_components: "Componentele temei"
+          uploads: "Urcări"
+          variable_name: "Numele variabilei SCSS:"
+          upload: "Urcă"
+          css_html: "CSS/HTML personalizat"
+          edit_css_html: "Modifică CSS/HTML"
+          edit_css_html_help: "Nu ai modificat CSS sau HTML"
+          import_file_tip: "Fișier .dcstyle.json care conține tema"
+          about_theme: "Despre temă"
+          license: "Licență"
+          component_of: "Tema este o componentă a:"
+          update_to_latest: "Actualizat la ultima"
+          check_for_updates: "Caută actualizări"
+          updating: "Actualizare în curs..."
+          up_to_date: "Tema este actuală, ultima verificare:"
+          add: "Adaugă"
+          scss:
+            text: "CSS"
+          header:
+            text: "Antet"
+          after_header:
+            text: "După antet"
+          footer:
+            text: "Subsol"
+          embedded_scss:
+            text: "CSS încorporat"
+          head_tag:
+            text: "1"
+            title: "HTML care va fi inserat înainte de 1 tag"
+          body_tag:
+            text: "1"
         colors:
+          select_base:
+            title: "Alege schema de culori de bază"
+            description: "Schemă de bază:"
           title: "Culori"
+          edit: "Modifică scheme de culori"
           long_title: "Scheme de culori"
           new_name: "Nouă schemă de culori"
           copy_name_prefix: "Copie a"
@@ -2531,6 +2880,13 @@ ro:
             type_placeholder: "rezumat, înregistrare..."
             reply_key_placeholder: "cheie de răspuns"
             skipped_reason_placeholder: "motivul"
+      moderation_history:
+        no_results: "Niciun istoric de moderare nu e disponibil."
+        actions:
+          delete_user: "Utilizator șters"
+          suspend_user: "Utilizator suspendat"
+          delete_post: "Postare ștearsă"
+          delete_topic: "Subiect șters"
       logs:
         title: "Rapoarte"
         action: "Acțiune"
@@ -2548,6 +2904,8 @@ ro:
           block: "blochează"
           do_nothing: "nu acționa"
         staff_actions:
+          all: "tot"
+          filter: "Filtru:"
           title: "Acțiunile membrilor echipei"
           clear_filters: "Arată tot"
           staff_user: "Utilizator-membru al echipei"
@@ -2568,6 +2926,8 @@ ro:
             change_trust_level: "schimbă nivelul de încredere"
             change_username: "schimbă numele utilizatorului"
             change_site_setting: "schimbă setările site-ului"
+            change_theme: "schimbă temă"
+            delete_theme: "șterge temă"
             change_site_text: "schimbă textul site-ului"
             suspend_user: "suspendă utilizatorul"
             unsuspend_user: "reactivează utilizator"
@@ -2586,9 +2946,20 @@ ro:
             revoke_admin: "Revocă titlul de Admin"
             grant_moderation: "Acordă titlul de Moderator"
             revoke_moderation: "Revocă titlul de Moderator"
+            backup_create: "creaază copie de rezervă"
             deleted_tag: "etichetă ștearsă"
             renamed_tag: "etichetă redenumită"
             revoke_email: "revoca email"
+            lock_trust_level: "blochează nivel de încredere"
+            unlock_trust_level: "deblochează nivel de încredere"
+            activate_user: "activează utilizator"
+            deactivate_user: "dezactivează utilizator"
+            backup_download: "descarcă copie de rezervă"
+            backup_destroy: "distruge copie de rezervă"
+            reviewed_post: "postare revizuită"
+            post_locked: "postare blocată"
+            post_unlocked: "postare deblocată"
+            check_personal_message: "verifică mesaj personal"
         screened_emails:
           title: "Email-uri filtrate"
           description: "Când cineva încearcă să creeze un cont nou, următorul email va fi verificat iar înregistrarea va fi blocată, sau o altă acțiune va fi inițiată."
@@ -2619,8 +2990,28 @@ ro:
           roll_up:
             text: "Consolidează"
             title: "Crează noi înregistrari cu subrețele blocate dacă există cel puțin 'min_ban_entries_for_roll_up' înregistrări."
+        search_logs:
+          term: "Termen"
+          searches: "Căutări"
+          unique: "Unic"
+          types:
+            all_search_types: "Toate tipurile de căutare"
+            header: "Antet"
+            full_page: "Întreaga pagină"
         logster:
           title: "Raport de erori"
+      watched_words:
+        search: "caută"
+        show_words: "arată cuvinte"
+        actions:
+          block: 'Blochează'
+          censor: 'Cenzurează'
+          require_approval: 'Necesită aprobare'
+        form:
+          label: 'Cuvânt nou:'
+          add: 'Adaugă'
+          success: 'Succes'
+          upload: "Urcă"
       impersonate:
         title: "Joacă rolul utilizatorului"
         help: "Folosește această unealtă pentru a imita un cont de utilizator pentru depanare. Va trebui să te deconectezi după ce termini."
@@ -2643,13 +3034,13 @@ ro:
           suspect: 'Suspecți'
         approved: "Aprobați?"
         approved_selected:
-          one: "aprobă utilizatorul"
-          few: "aprobă utilizatorii ({{count}})"
-          other: "aprobă utilizatorii ({{count}})"
+          few: aprobă utilizatorii ({{count}})
+          one: aprobă utilizatorul
+          other: aprobă utilizatorii ({{count}})
         reject_selected:
-          one: "refuză utilizatorul"
-          few: "refuză utilizatorii ({{count}})"
-          other: "refuză utilizatorii ({{count}})"
+          few: refuză utilizatorii ({{count}})
+          one: refuză utilizatorul
+          other: refuză utilizatorii ({{count}})
         titles:
           active: 'Utilizatori activi'
           new: 'Utilizatori noi'
@@ -2665,13 +3056,13 @@ ro:
           suspended: 'Utilizatori suspendați'
           suspect: 'Utilizatori suspecţi'
         reject_successful:
-          one: "1 utilizator a fost respins cu succes."
-          few: "%{count} utilizatori au fost respinși cu succes."
-          other: "%{count} de utilizatori au fost respinși cu succes."
+          few: '%{count} utilizatori au fost respinși cu succes.'
+          one: 1 utilizator a fost respins cu succes.
+          other: '%{count} de utilizatori au fost respinși cu succes.'
         reject_failures:
-          one: "Un utilizator nu a putut fi respins."
-          few: " %{count} utilizatori nu au putut fi respinși."
-          other: "%{count} de utilizatori nu au putut fi respinși."
+          few: ' %{count} utilizatori nu au putut fi respinși.'
+          one: Un utilizator nu a putut fi respins.
+          other: '%{count} de utilizatori nu au putut fi respinși.'
         not_verified: "Neverificat"
         check_email:
           title: "Arată adresa de email a acestui utilizator"
@@ -2682,8 +3073,18 @@ ro:
         suspend_duration: "Pentru cât timp va fi suspendat utilizatorul?"
         suspend_reason_label: "Motivul suspendării? Acest text <b>va fi vizibil</b> pe pagina de profil a utilizatorului, și va fi arătat utilizatorului  atunci când încearcă să se autentifice. Încearcă să fii succint."
         suspend_reason: "Motiv"
+        suspend_message: "Mesaj email"
         suspended_by: "Suspendat de"
+        silence_reason: "Motiv"
+        silence_message: "Mesaj email"
+        silence_message_placeholder: "(lăsați necompletat pentru a trimite mesajul implicit)"
+        suspended_until: "(până la %{until})"
+        cant_suspend: "Utilizatorul nu poate fi suspendat."
         delete_all_posts: "Șterge toate postările"
+        penalty_post_actions: "Ce dorești să faci cu postarea asociată?"
+        penalty_post_delete: "Șterge postarea"
+        penalty_post_edit: "Modifică postarea"
+        penalty_post_none: "Nu face nimic"
         delete_all_posts_confirm_MF: "Ești pe cale să ștergi {POSTS, plural, one {1 postare} other {# postări}} și {TOPICS, plural, one {1 subiect} other {# subiecte}}. Ești sigur?"
         moderator: "Moderator?"
         admin: "Admin?"
@@ -2699,6 +3100,7 @@ ro:
         logged_out: "Acest utilizator a ieșit de pe toate dispozitivele"
         revoke_admin: 'Revocă titlu de admin'
         grant_admin: 'Acordă titlu de admin'
+        grant_admin_confirm: "V-am trimis un email pentru a verifica noul administrator. Vă rog să îl deschideți și să urmați instrucțiunile din el."
         revoke_moderation: 'Revocă titlu de moderator'
         grant_moderation: 'Acordă titlu de moderator'
         unsuspend: 'Reactivează'
@@ -2729,17 +3131,17 @@ ro:
         delete_forbidden_because_staff: "Adminii și moderatorii nu pot fi sterși."
         delete_posts_forbidden_because_staff: "Nu poți șterge mesajele administratorilor și moderatorilor."
         delete_forbidden:
-          one: "Utilizatorii nu pot fi șterși dacă au postări. Șterge toate postările înainte de a încerca ștergerea unui utilizator. (Postările mai vechi de 1 zi nu pot fi șterse)"
-          few: "Utilizatorii nu pot fi șterși dacă au postări. Şterge toate postările înainte de a încerca ștergerea unui utilizator. (Postările mai vechi de %{count} zile nu pot fi șterse)"
-          other: "Utilizatorii nu pot fi șterși dacă au postări. Șterge toate postările înainte de a încerca ștergerea unui utilizator. (Postările mai vechi de %{count} de zile nu pot fi șterse)"
+          few: Utilizatorii nu pot fi șterși dacă au postări. Şterge toate postările înainte de a încerca ștergerea unui utilizator. (Postările mai vechi de %{count} zile nu pot fi șterse)
+          one: Utilizatorii nu pot fi șterși dacă au postări. Șterge toate postările înainte de a încerca ștergerea unui utilizator. (Postările mai vechi de 1 zi nu pot fi șterse)
+          other: Utilizatorii nu pot fi șterși dacă au postări. Șterge toate postările înainte de a încerca ștergerea unui utilizator. (Postările mai vechi de %{count} de zile nu pot fi șterse)
         cant_delete_all_posts:
-          one: "Nu pot fi şterse toate postările. Unele postări sunt mai vechi de 1 zi. (Setarea delete_user_max_post_age)"
-          few: "Nu pot fi şterse toate postările. Unele postări sunt mai vechi de %{count} zile. (Setarea delete_user_max_post_age)"
-          other: "Nu pot fi șterse toate postările. Unele postări sunt mai vechi de %{count} de zile. (Setarea delete_user_max_post_age)"
+          few: Nu pot fi şterse toate postările. Unele postări sunt mai vechi de %{count} zile. (Setarea delete_user_max_post_age)
+          one: Nu pot fi şterse toate postările. Unele postări sunt mai vechi de 1 zi. (Setarea delete_user_max_post_age)
+          other: Nu pot fi șterse toate postările. Unele postări sunt mai vechi de %{count} de zile. (Setarea delete_user_max_post_age)
         cant_delete_all_too_many_posts:
-          one: "Nu pot fi şterse toate postările deoarece utilizatorul are mai mult de 1 postare. (Setarea delete_all_posts_max)"
-          few: "Nu pot fi şterse toate postările deoarece utilizatorul are mai mult de %{count} postări. (Setarea delete_all_posts_max)"
-          other: "Nu pot fi şterse toate postările deoarece utilizatorul are mai mult de %{count} de postări. (Setarea delete_all_posts_max)"
+          few: Nu pot fi şterse toate postările deoarece utilizatorul are mai mult de %{count} postări. (Setarea delete_all_posts_max)
+          one: Nu pot fi şterse toate postările deoarece utilizatorul are mai mult de 1 postare. (Setarea delete_all_posts_max)
+          other: Nu pot fi şterse toate postările deoarece utilizatorul are mai mult de %{count} de postări. (Setarea delete_all_posts_max)
         delete_confirm: "Ești SIGUR că vrei ștergerea acestui utilizator? Acțiunea este ireversibilă!"
         delete_and_block: "<b>Da</b>, și <b>blochează</b> viitoarele autentificări cu acest email și această adresă IP"
         delete_dont_block: "<b>Da</b>, șterge doar utilizatorul"
@@ -2774,9 +3176,9 @@ ro:
         tl3_requirements:
           title: "Cerințe pentru nivelul 3 de încredere"
           table_title:
-            one: "În ultima zi:"
-            few: "În ultimele %{count} zile:"
-            other: "În ultimele %{count} de zile:"
+            few: 'În ultimele %{count} zile:'
+            one: 'În ultima zi:'
+            other: 'În ultimele %{count} de zile:'
           value_heading: "Valoare"
           requirement_heading: "Cerință"
           visits: "Vizite"
@@ -2851,10 +3253,7 @@ ro:
         recommended: "Îți recomandăm să personalizezi următorul text pentru a se adapta nevoilor tale:"
         show_overriden: 'Arată doar ignorate'
       site_settings:
-        show_overriden: 'Arată doar pe cele ignorate'
         title: 'Setări'
-        reset: 'Resetează'
-        none: 'Nimic'
         no_results: "Nu s-au găsit rezultate."
         clear_filter: "Șterge"
         add_url: "adaugă URL"
@@ -2876,6 +3275,7 @@ ro:
           developer: 'Dezvoltator'
           embedding: "Embedding"
           legal: "Legal"
+          api: 'API'
           user_api: 'API Utilizator'
           uncategorized: 'Altele'
           backups: "Back-up"
@@ -2884,6 +3284,7 @@ ro:
           user_preferences: "Preferințe"
           tags: "Etichete"
           search: "Căutare"
+          groups: "Grupuri"
       badges:
         title: Ecusoane
         new_badge: Ecuson nou
@@ -2902,11 +3303,11 @@ ro:
         reason_help: (O legătură către o postare sau un subiect)
         save: Salvează
         delete: Șterge
-        delete_confirm: Ești sigur că vrei să ștergi acest ecuson?
+        delete_confirm: "Ești sigur că vrei să ștergi acest ecuson?"
         revoke: Revocă
         reason: Motiv
         expand: Extinde &hellip;
-        revoke_confirm: Ești sigur că vrei să revoci ecusonul?
+        revoke_confirm: "Ești sigur că vrei să revoci ecusonul?"
         edit_badges: Editează ecusoane
         grant_badge: Acordă ecuson
         granted_badges: Ecusoane acordate
@@ -2920,7 +3321,6 @@ ro:
         enabled: Activează ecuson
         icon: Pictogramă
         image: Imagine
-        icon_help: "Folosiţi o clasă de fonturi Font Awesome sau un URL pentru imagine"
         query: Interogare ecusoane (SQL)
         target_posts: Interogarea mesajelor utilizatorilor-ţintă
         auto_revoke: Pornește verificarea de revocare în fiecare zi
@@ -2944,15 +3344,15 @@ ro:
             text: "Unele șabloane lipsesc. Asta se întâmplă atunci când o interogare de ecusoane returnează user IDs sau post IDs care nu există. Asta ar putea da naștere la rezultate neașteptate mai târziu - te rugăm să verifici din nou interogarea."
           no_grant_count: "Nu există ecusoane pentru atribuire."
           grant_count:
-            one: "Un ecuson pentru atribuire."
-            few: "<b>%{count}</b> ecusoane pentru atribuire."
-            other: "<b>%{count}</b> de ecusoane pentru atribuire."
+            few: <b>%{count}</b> ecusoane pentru atribuire.
+            one: Un ecuson pentru atribuire.
+            other: <b>%{count}</b> de ecusoane pentru atribuire.
           sample: "Exemplu:"
           grant:
-            with: <span class="username">%{username}</span>
-            with_post: <span class="username">%{username}</span> pentru mesajul în %{link}
-            with_post_time: <span class="username">%{username}</span> pentru mesajul în %{link} la <span class="time">%{time}</span>
-            with_time: <span class="username">%{username}</span> la <span class="time">%{time}</span>
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span> pentru mesajul în %{link}"
+            with_post_time: "<span class=\"username\">%{username}</span> pentru mesajul în %{link} la <span class=\"time\">%{time}</span>"
+            with_time: "<span class=\"username\">%{username}</span> la <span class=\"time\">%{time}</span>"
       emoji:
         title: "Emoji"
         help: "Adaugă un nou \"emoji\" care va fi disponibil pentru toţi. (PROTIP: trage şi adaugă mai multe fişiere odată)"
@@ -2966,6 +3366,7 @@ ro:
         sample: "Folosește următorul cod HTML în site-ul tău pentru a crea și pentru a încorpora subiecte Discourse. Înlocuiește <b>ÎNLOCUIEȘTE_MĂ</b> cu URL-ul canonic al paginii pe care dorești să o încorporezi."
         title: "Embedding"
         host: "Host-uri permise"
+        class_name: "Numele clasei"
         path_whitelist: "Cale permise"
         edit: "editează"
         category: "Postează în categoria"
@@ -2996,7 +3397,7 @@ ro:
         category_id: "ID categorie"
         category_title: "Categorie"
         external_url: "URL extern"
-        delete_confirm: Ești sigur că vrei să ștergi această adresă permanentă?
+        delete_confirm: "Ești sigur că vrei să ștergi această adresă permanentă?"
         form:
           label: "Nou:"
           add: "Adaugă"
@@ -3010,6 +3411,10 @@ ro:
       upload: "Încărcare"
       uploading: "Se încarcă..."
       quit: "Poate mai târziu"
+      staff_count:
+        few: Comunitatea ta are %{count} membri cu tot cu tine.
+        one: Comunitatea ta are 1 membru (tu).
+        other: Comunitatea ta are %{count} membri cu tot cu tine.
       invites:
         add_user: "adaugă"
         none_added: "Nu ați invitat nici un membru al echipei. Ești sigur că vrei să continui?"
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 9c9298f8d07..a661e95b889 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -16,10 +16,10 @@ ru:
           format: '%n %u'
           units:
             byte:
-              one: Байт
               few: Байта
               many: Байт
-              other: Байт
+              one: Байт
+              other: Байты
             gb: ГБ
             kb: КБ
             mb: МБ
@@ -45,96 +45,106 @@ ru:
       tiny:
         half_a_minute: "< 1мин"
         less_than_x_seconds:
-          one: "< 1сек"
-          few: "< %{count}сек"
-          many: "< %{count}сек"
-          other: "< %{count}сек"
+          few: < %{count}сек
+          many: < %{count}сек
+          one: < 1сек
+          other: < %{count}сек
         x_seconds:
-          one: "1с"
-          few: "%{count}с"
-          many: "%{count}с"
-          other: "%{count}с"
+          few: '%{count}с'
+          many: '%{count}с'
+          one: 1с
+          other: '%{count}с'
+        less_than_x_minutes:
+          few: ~ 1m
+          many: '> 1m'
+          one: < 1мин
+          other: < %{count}мин
         x_minutes:
-          one: "1мин"
-          few: "%{count}мин"
-          many: "%{count}мин"
-          other: "%{count}мин"
+          few: '%{count}мин'
+          many: '%{count}мин'
+          one: 1мин
+          other: '%{count}мин'
         about_x_hours:
-          one: "1ч"
-          few: "%{count}ч"
-          many: "%{count}ч"
-          other: "%{count}ч"
+          few: '%{count}ч'
+          many: '%{count}ч'
+          one: 1ч
+          other: '%{count}ч'
         x_days:
-          one: "1д"
-          few: "%{count}д"
-          many: "%{count}д"
-          other: "%{count}д"
+          few: '%{count}д'
+          many: '%{count}д'
+          one: 1д
+          other: '%{count}д'
+        x_months:
+          few: '%{count}мес'
+          many: '%{count}мес'
+          one: 1 мес
+          other: '%{count}мес'
         about_x_years:
-          one: "1год"
-          few: "%{count}года"
-          many: "%{count}лет"
-          other: "%{count}лет"
+          few: '%{count}года'
+          many: '%{count}лет'
+          one: 1год
+          other: '%{count}лет'
         over_x_years:
-          one: "> 1 года"
-          few: "> %{count} лет"
-          many: "> %{count} лет"
-          other: "> %{count} лет"
+          few: '> %{count} лет'
+          many: '> %{count} лет'
+          one: '> 1 года'
+          other: '> %{count} лет'
         almost_x_years:
-          one: "1 год"
-          few: "%{count} года"
-          many: "%{count} лет"
-          other: "%{count} лет"
+          few: '%{count} года'
+          many: '%{count} лет'
+          one: 1 год
+          other: '%{count} лет'
         date_month: "D MMM"
         date_year: "MMM YYYY"
       medium:
         x_minutes:
-          one: "1 минута"
-          few: "%{count} минуты"
-          many: "%{count} минут"
-          other: "%{count} минут"
+          few: '%{count} минуты'
+          many: '%{count} минут'
+          one: 1 минута
+          other: '%{count} минут'
         x_hours:
-          one: "1 час"
-          few: "%{count} часа"
-          many: "%{count} часов"
-          other: "%{count} часов"
+          few: '%{count} часа'
+          many: '%{count} часов'
+          one: 1 час
+          other: '%{count} часов'
         x_days:
-          one: "1 день"
-          few: "%{count} дня"
-          many: "%{count} дней"
-          other: "%{count} дней"
+          few: '%{count} дня'
+          many: '%{count} дней'
+          one: 1 день
+          other: '%{count} дней'
         date_year: "D MMM, YYYY"
       medium_with_ago:
         x_minutes:
-          one: "1 минуту назад"
-          few: "%{count} минуты назад"
-          many: "%{count} минут назад"
-          other: "%{count} минут назад"
+          few: '%{count} минуты назад'
+          many: '%{count} минут назад'
+          one: 1 минуту назад
+          other: '%{count} минут назад'
         x_hours:
-          one: "1 час назад"
-          few: "%{count} часа назад"
-          many: "%{count} часов назад"
-          other: "%{count} часов назад"
+          few: '%{count} часа назад'
+          many: '%{count} часов назад'
+          one: 1 час назад
+          other: '%{count} часов назад'
         x_days:
-          one: "1 день назад"
-          few: "%{count} дня назад"
-          many: "%{count} дней назад"
-          other: "%{count} дней назад"
+          few: '%{count} дня назад'
+          many: '%{count} дней назад'
+          one: 1 день назад
+          other: '%{count} дней назад'
       later:
         x_days:
-          one: "1 день спустя"
-          few: "%{count} дня спустя"
-          many: "%{count} дней спустя"
-          other: "%{count} дней спустя"
+          few: '%{count} дня спустя'
+          many: '%{count} дней спустя'
+          one: 1 день спустя
+          other: '%{count} дней спустя'
         x_months:
-          one: "1 месяц спустя"
-          few: "%{count} месяца спустя"
-          many: "%{count} месяцев спустя"
-          other: "%{count} месяцев спустя"
+          few: '%{count} месяца спустя'
+          many: '%{count} месяцев спустя'
+          one: 1 месяц спустя
+          other: '%{count} месяцев спустя'
         x_years:
-          one: "1 год спустя"
-          few: "%{count} года спустя"
-          many: "%{count} лет спустя"
-          other: "%{count} лет спустя"
+          few: '%{count} года спустя'
+          many: '%{count} лет спустя'
+          one: 1 год спустя
+          other: '%{count} лет спустя'
       previous_month: 'Предыдущий месяц'
       next_month: 'Следующий месяц'
     share:
@@ -147,10 +157,11 @@ ru:
       email: 'Поделиться ссылкой по электронной почте'
     action_codes:
       public_topic: "Сделал эту тему публичной %{when}"
-      private_topic: "Сделал эту тему приватной %{when}"
+      private_topic: "сделал эту тему персональным сообщением %{when}"
       split_topic: "Разделил эту тему %{when}"
       invited_user: "Пригласил %{who} %{when}"
       invited_group: "Пригласил %{who} %{when}"
+      user_left: "%{who} удалить себя из этого сообщения %{when}"
       removed_user: "Исключил %{who} %{when}"
       removed_group: "Исключил %{who} %{when}"
       autoclosed:
@@ -173,11 +184,11 @@ ru:
         disabled: 'Исключил из списков %{when}'
       banner:
         enabled: 'создал(а) из этого баннер %{when}. Он будет виден вверху каждой страницы пока пользователь не закроет его.'
+        disabled: 'удалил это объявление %{when}. Он больше не будет отображаться в верхней части каждой страницы.'
     topic_admin_menu: "действия администратора над темой"
     wizard_required: "Добро пожаловать в ваш новый Discourse! Начните с <a href='%{url}' data-auto-route='true'>мастера настройки</a> ✨"
     emails_are_disabled: "Все исходящие письма были глобально отключены администратором. Уведомления любого вида не будут отправляться на почту."
-    bootstrap_mode_enabled: "Чтобы облегчить развитие вашего нового сайта в самом начале, был включен режим запуска. В этом режиме, всем новым пользователям будет автоматически присвоен 1й уровень доверия при регистрации и включена ежедневная почтовая рассылка сводки новостей. Режим запуска будет выключен автоматически, как только количество зарегистрированных пользователей достигнет %{min_users}."
-    bootstrap_mode_disabled: "Режим запуска будет отключен в течение 24 часов."
+    bootstrap_mode_disabled: "Режим Bootstrap будет отключён в течение 24 часов."
     themes:
       default_description: "По умолчанию"
     s3:
@@ -201,6 +212,7 @@ ru:
     not_implemented: "Извините, эта функция еще не реализована!"
     no_value: "Нет"
     yes_value: "Да"
+    submit: "Представлять"
     generic_error: "Извините, произошла ошибка."
     generic_error_with_reason: "Произошла ошибка: %{error}"
     sign_up: "Зарегистрироваться"
@@ -213,9 +225,10 @@ ru:
     show_help: "Расширенный поиск"
     links: "Ссылки"
     links_lowercase:
-      one: "ссылка"
-      few: "ссылки"
-      other: "ссылок"
+      few: ссылки
+      many: ссылок
+      one: ссылка
+      other: ссылок
     faq: "Вопрос-ответ"
     guidelines: "Руководство"
     privacy_policy: "Политика конфиденциальности"
@@ -239,10 +252,10 @@ ru:
     max_of_count: "{{count}} макс."
     alternation: "или"
     character_count:
-      one: "{{count}} буква"
-      few: "{{count}} буквы"
-      many: "{{count}} букв"
-      other: "{{count}} букв"
+      few: '{{count}} буквы'
+      many: '{{count}} букв'
+      one: '{{count}} буква'
+      other: '{{count}} букв'
     suggested_topics:
       title: "Похожие темы"
       pm_title: "Похожие сообщения"
@@ -254,8 +267,6 @@ ru:
       our_moderators: "Наши модераторы"
       stat:
         all_time: "За все время"
-        last_7_days: "Последние 7 дней"
-        last_30_days: "Последние 30 дней"
       like_count: "Симпатии"
       topic_count: "Темы"
       post_count: "Сообщения"
@@ -277,21 +288,20 @@ ru:
       remove: "Удалить закладку"
       confirm_clear: "Вы уверены, что хотите удалить все эти темы из Избранного?"
     topic_count_latest:
-      one: "1 новая или обновленная тема."
-      few: "{{count}} новые или обновленные темы."
-      many: "{{count}} новых или обновленных тем."
-      other: "{{count}} новых или обновленных тем."
+      few: Есть {{count}} новых или обновленных тем
+      many: Есть {{count}} новых или обновленных тем
+      one: Есть {{count}} новая или обновленная тема
+      other: Есть {{count}} новых или обновленных тем
     topic_count_unread:
-      one: "1 непрочитанная тема."
-      few: "{{count}} непрочитанные темы."
-      many: "{{count}} непрочитанных тем."
-      other: "{{count}} непрочитанных тем."
+      few: Посмотреть {{count}} непрочитанных тем
+      many: Посмотреть {{count}} непрочитанных тем
+      one: Посмотреть {{count}} непрочитанную тему
+      other: Посмотреть {{count}} непрочитанных тем
     topic_count_new:
-      one: "1 новая тема."
-      few: "{{count}} новые темы."
-      many: "{{count}} новых тем."
-      other: "{{count}} новых тем."
-    click_to_show: "Нажмите чтобы показать."
+      few: Посмотреть {{count}} новые темы
+      many: Посмотреть {{count}} новые темы
+      one: Посмотреть {{count}} новую тему
+      other: Посмотреть {{count}} новые темы
     preview: "предпросмотр"
     cancel: "отмена"
     save: "Сохранить"
@@ -304,6 +314,7 @@ ru:
     pasting: "Вставка..."
     enable: "Включить"
     disable: "Отключить"
+    continue: "Продолжать"
     undo: "Отменить"
     revert: "Вернуть"
     failed: "Проблема"
@@ -328,20 +339,20 @@ ru:
       cancel: "Отменить"
       view_pending: "Просмотреть сообщения в очереди"
       has_pending_posts:
-        one: "В этой теме <b>1</b> сообщение, ожидающее проверки"
-        few: "В этой теме <b>{{count}}</b> сообщения, ожидающих проверки"
-        many: "В этой теме <b>{{count}}</b> сообщений, ожидающих проверки"
-        other: "В этой теме <b>{{count}}</b> сообщений, ожидающих проверки"
+        few: В этой теме <b>{{count}}</b> сообщения, ожидающих проверки
+        many: В этой теме <b>{{count}}</b> сообщений, ожидающих проверки
+        one: В этой теме <b>1</b> сообщение, ожидающее проверки
+        other: В этой теме <b>{{count}}</b> сообщений, ожидающих проверки
       confirm: "Сохранить"
       delete_prompt: "Вы уверены, что хотите удалить <b>%{username}</b>? Это также удалит все его сообщения и заблокирует его email и IP-адрес."
       approval:
         title: "Сообщения для проверки"
         description: "Ваше сообщение отправлено, но требует проверки и утверждения модератором. Пожалуйста, будьте терпеливы."
         pending_posts:
-          one: "<strong>{{count}}</strong> сообщение ожидает одобрения."
-          few: "<strong>{{count}}</strong> сообщений ожидают одобрения."
-          many: "<strong>{{count}}</strong> сообщений ожидают одобрения."
-          other: "<strong>{{count}}</strong> сообщений ожидают одобрения."
+          few: <strong>{{count}}</strong> сообщений ожидают одобрения.
+          many: <strong>{{count}}</strong> сообщений ожидают одобрения.
+          one: <strong>{{count}}</strong> сообщение ожидает одобрения.
+          other: <strong>{{count}}</strong> сообщений ожидают одобрения.
         ok: "ОК"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> создал <a href='{{topicUrl}}'>тему</a>"
@@ -375,10 +386,10 @@ ru:
       posts_read: "Прочитано сообщений"
       posts_read_long: "Прочитано сообщений"
       total_rows:
-        one: "%{count} пользователь"
-        few: "%{count} пользователя"
-        many: "%{count} пользователей"
-        other: "%{count} пользователей"
+        few: '%{count} пользователя'
+        many: '%{count} пользователей'
+        one: '%{count} пользователь'
+        other: '%{count} пользователей'
     group_histories:
       actions:
         change_group_setting: "Настроить группу"
@@ -387,22 +398,25 @@ ru:
         make_user_group_owner: "Сделать владельцем"
         remove_user_as_group_owner: "Лишить прав владельца"
     groups:
-      logs:
-        title: "Логи"
-        when: "Когда"
-        action: "Действие"
-        acting_user: "Действующий пользователь"
-        target_user: "Целевой пользователь"
-        subject: "Тема"
-        details: "Подробности"
-        from: "От"
-        to: "Кому"
-      edit:
-        title: 'Редактировать Группу'
-        full_name: 'Полное Имя'
-        add_members: "Добавить Участников"
-        delete_member_confirm: "Удалить '%{username}' из группы '%{group}'?"
-      name_placeholder: "Название группы, без пробелов, по тем же правилам, что и для псевдонимов."
+      add_members:
+        title: "Добавить Участников"
+        usernames: "Псевдоним"
+      manage:
+        name: 'Имя'
+        full_name: 'Полное имя'
+        add_members: "Добавить участника"
+        delete_member_confirm: "Удалить '%{username}' из '%{group}' группы?"
+        profile:
+          title: Профиль
+        interaction:
+          notification: Уведомление
+        membership:
+          title: Участник
+          access: Доступ
+        logs:
+          title: "Логи"
+          when: "Когда"
+          details: "Подробности"
       public_admission: "Разрешить пользователям свободно присоединяться к группе (требуется общедоступная группа)"
       public_exit: "Разрешить пользователям свободно покидать группу"
       empty:
@@ -413,51 +427,70 @@ ru:
         topics: "Нет тем от участников этой группы."
         logs: "Нет логов для этой группы."
       add: "Добавить"
-      join: "Вступить в Группу"
-      leave: "Покинуть Группу"
-      request: "Попроситься в Группу"
+      join: "Присоединиться"
+      leave: "Покинуть"
+      request: "Запрос"
       message: "Сообщение"
-      automatic_group: Автоматическая Группа
-      closed_group: Закрытая Группа
-      is_group_user: "Вы участник этой группы"
       allow_membership_requests: "Разрешить пользователям отправлять запросы на вступление в группу владельцев"
       membership_request:
         submit: "Подтвердить запрос"
         title: "Запрос на вступление в группу %{group_name}"
       membership: "Участие"
       name: "Название"
-      user_count: "Количество Участников"
+      group_name: "Название группы"
+      user_count: "Пользователи"
       bio: "О Группе"
-      selector_placeholder: "Добавить участников"
+      selector_placeholder: "введите псевдоним"
       owner: "владелец"
       index:
         title: "Группы"
+        all: "Все Группы"
         empty: "Нет видимых групп."
+        filter: "Фильтр по типу группы"
+        owner_groups: "Группы в которых я владелец"
+        close_groups: "Закрытая группа"
+        automatic_groups: "Автоматические Группы"
+        automatic: "Автоматическая"
+        closed: "Закрыто"
+        public: "Публичный"
+        private: "Закрытый"
+        public_groups: "Публичные Группы"
+        automatic_group: Автоматическая группа
+        close_group: Закрытая группа
+        my_groups: "Мои Группы"
+        group_type: "Тип группы"
+        is_group_user: "Участник"
+        is_group_owner: "Владелец"
       title:
-        one: "Группа"
-        few: "Группы"
-        many: "Группы"
-        other: "Группы"
+        few: Группы
+        many: Группы
+        one: Группа
+        other: Группы
       activity: "Деятельность"
-      members: "Участники"
+      members:
+        title: "Участники"
+        filter_placeholder_admin: "псевдоним или e-mail"
+        filter_placeholder: "псевдоним"
+        remove_member: "Удалить Пользователя"
+        remove_member_description: "Удалить <b>%{username}</b> из группы"
+        make_owner: "Сделать Владельцем"
+        make_owner_description: "Сделать <b>%{username}</b> владельцем этой группы"
+        remove_owner: "Удалить Владельца"
+        remove_owner_description: "Удалить <b>%{username}</b> как владельца этой группы"
+        owner: "Владелец"
       topics: "Темы"
       posts: "Сообщения"
       mentions: "Упоминания"
       messages: "Сообщения"
-      visibility_levels:
-        title: "Кто может видеть эту группу?"
-        public: "Все"
-        members: "Владельцы группы, участники и администраторы"
-        owners: "Владельцы группы и администраторы"
+      notification_level: "Уровень уведомлений по умолчанию для сообщений группы"
       alias_levels:
+        mentionable: "Кто может @упоминать в этой группе?"
+        messageable: "Кто может писать сообщить в эту группу?"
         nobody: "Никто"
         only_admins: "Только администраторы"
         mods_and_admins: "Только модераторы и администраторы"
         members_mods_and_admins: "Только члены группы, модераторы и администраторы"
         everyone: "Все"
-      trust_levels:
-        title: "Уровень доверия участника при создании:"
-        none: "(Нет)"
       notifications:
         watching:
           title: "Наблюдать"
@@ -482,23 +515,21 @@ ru:
       flair_color_placeholder: "(Необязательно) Hex-код цвета"
       flair_preview_icon: "Иконка Предпросмотра"
       flair_preview_image: "Изображение Предпросмотра"
-      flair_note: "Внимание: Флаер будет показываться только основной группе пользователей."
     user_action_groups:
-      '1': "Выразил симпатий"
-      '2': "Получил симпатий"
-      '3': "Закладки"
-      '4': "Темы"
-      '5': "Сообщения"
-      '6': "Ответы"
-      '7': "Упоминания"
-      '9': "Цитаты"
-      '11': "Изменения"
-      '12': "Отправленные"
-      '13': "Входящие"
-      '14': "Ожидает одобрения"
+      "1": "Выразил симпатий"
+      "2": "Получил симпатий"
+      "3": "Закладки"
+      "4": "Темы"
+      "5": "Сообщения"
+      "6": "Ответы"
+      "7": "Упоминания"
+      "9": "Цитаты"
+      "11": "Изменения"
+      "12": "Отправленные"
+      "13": "Входящие"
+      "14": "Ожидает одобрения"
     categories:
       all: "Все разделы"
-      all_subcategories: "Все подкатегории"
       no_subcategory: "Вне подкатегорий"
       category: "Раздел"
       category_list: "Показать список разделов"
@@ -517,15 +548,15 @@ ru:
       toggle_ordering: "изменить сортировку"
       subcategories: "Подразделы"
       topic_sentence:
-        one: "1 тема"
-        few: "%{count} тем"
-        many: "%{count} тем"
-        other: "%{count} тем"
+        few: '%{count} тем'
+        many: '%{count} тем'
+        one: 1 тема
+        other: '%{count} тем'
       topic_stat_sentence:
-        one: "%{count} новая тема за предыдущий %{unit}."
-        few: "%{count} новые темы за предыдущий %{unit}."
-        many: "%{count} новых тем за предыдущий %{unit}."
-        other: "%{count} новых тем за предыдущий %{unit}."
+        few: '%{count} новые темы за предыдущий %{unit}.'
+        many: '%{count} новых тем за предыдущий %{unit}.'
+        one: '%{count} новая тема за предыдущий %{unit}.'
+        other: '%{count} новых тем за предыдущий %{unit}.'
     ip_lookup:
       title: Поиск IP адреса
       hostname: Название хоста
@@ -566,7 +597,6 @@ ru:
       notifications: "Уведомления"
       statistics: "Статистика"
       desktop_notifications:
-        label: "Оповещения"
         not_supported: "К сожалению, оповещения не поддерживаются этим браузером."
         perm_default: "Включить оповещения"
         perm_denied_btn: "Отказано в разрешении"
@@ -574,12 +604,15 @@ ru:
         disable: "Отключить оповещения"
         enable: "Включить оповещения"
         each_browser_note: "Примечание: эта настройка устанавливается в каждом браузере индивидуально."
+        consent_prompt: "Вы хотите получать уведомления в реальном времени, когда люди отвечают на ваши сообщения?"
+      dismiss: 'Отложить'
       dismiss_notifications: "Отложить все"
       dismiss_notifications_tooltip: "Пометить все непрочитанные уведомления прочитанными"
       first_notification: "Ваше первое уведомление! Выберите его, чтобы начать."
       disable_jump_reply: "Не переходить к вашему новому сообщению после ответа"
       dynamic_favicon: "Показывать количество новых / обновлённых тем на иконке сообщений"
       theme_default_on_all_devices: "Поставить этот стиль по умолчанию на всех моих устройствах"
+      allow_private_messages: "Разрешить другим пользователям отправлять мне личные сообщения"
       external_links_in_new_tab: "Открывать все внешние ссылки в новой вкладке"
       enable_quoting: "Позволить отвечать с цитированием выделенного текста"
       change: "изменить"
@@ -587,6 +620,7 @@ ru:
       admin: "{{user}} — админ"
       moderator_tooltip: "Этот пользователь модератор"
       admin_tooltip: "{{user}} — админ"
+      silenced_tooltip: "Этот пользователь отключнный"
       suspended_notice: "Пользователь заморожен до {{date}}."
       suspended_permanently: "Этот пользователь заморожен."
       suspended_reason: "Причина:"
@@ -619,10 +653,10 @@ ru:
       watched_first_post_tags_instructions: "Уведомлять только о первом сообщении в каждой новой теме с этими тегами."
       muted_categories: "Выключенные разделы"
       muted_categories_instructions: "Не уведомлять меня о новых темах в этих разделах и не показывать новые темы на странице «Непрочитанные»."
+      no_category_access: "Как модератор Вы ограничены в доступе к разделу, сохранения отклонены."
       delete_account: "Удалить мою учётную запись"
       delete_account_confirm: "Вы уверены, что хотите удалить свою учётную запись? Отменить удаление будет невозможно!"
       deleted_yourself: "Ваша учётная запись была успешно удалена."
-      delete_yourself_not_allowed: "Вы не можете сейчас удалить свою учётную запись. Попросите администратора удалить вашу учётную запись."
       unread_message_count: "Сообщения"
       admin_delete: "Удалить"
       users: "Пользователи"
@@ -637,6 +671,8 @@ ru:
       undo_revoke_access: "Отменить Лишение прав доступа"
       api_approved: "Подтверждено"
       theme: "Стиль"
+      home: "Домашняя страница по умолчанию"
+      staged: "Поэтапный"
       staff_counters:
         flags_given: "полезные жалобы"
         flagged_posts: "сообщения с жалобами"
@@ -654,6 +690,7 @@ ru:
         move_to_archive: "Архив"
         failed_to_move: "Невозможно переместить выделенные сообщения (возможно, у вас проблемы с Интернетом)"
         select_all: "Выбрать все"
+        tags: "Тэги"
       preferences_nav:
         account: "Учётная запись"
         profile: "Профиль"
@@ -671,6 +708,10 @@ ru:
         set_password: "Установить пароль"
         choose_new: "Выберите новый пароль"
         choose: "Выберите пароль"
+      second_factor:
+        title: "Двухфакторная аутентификация"
+        disable: "Отключить двухфакторную аутентификацию"
+        enable_description: "Сканируйте этот QR-код в поддерживаемом приложении (<a href=\"https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2\" target=\"_blank\">Android</a> – <a href=\"https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8\" target=\"_blank\">iOS</a> – <a href=\"https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj\" target='_blank'>Windows Phone</a>) и  введите свой код аутентификации. \n"
       change_about:
         title: "Изменить информацию обо мне"
         error: "При изменении значения произошла ошибка."
@@ -710,10 +751,10 @@ ru:
         authenticated: "Ваш адрес электронной почты подтвержден {{provider}}"
         frequency_immediately: "Получать уведомления о новых непрочитанных сообщениях незамедлительно."
         frequency:
-          one: "Мы отправим вам письмо только в том случае, если вы более {{count}} минуты находитесь оффлайн."
-          few: "Мы отправим вам письмо только в том случае, если вы не были онлайн последние {{count}} минуты."
-          many: "Мы отправим вам письмо только в том случае, если вы не были онлайн последние {{count}} минут."
-          other: "Мы отправим вам письмо только в том случае, если вы не были онлайн последние {{count}} минyт."
+          few: Мы отправим вам письмо только в том случае, если вы не были онлайн последние {{count}} минуты.
+          many: Мы отправим вам письмо только в том случае, если вы не были онлайн последние {{count}} минут.
+          one: Мы отправим вам письмо только в том случае, если вы более {{count}} минуты находитесь оффлайн.
+          other: Мы отправим вам письмо только в том случае, если вы не были онлайн последние {{count}} минyт.
       name:
         title: "Имя"
         instructions: "ваше полное имя (опционально)"
@@ -744,8 +785,6 @@ ru:
       created: "Вступил"
       log_out: "Выйти"
       location: "Местоположение"
-      card_badge:
-        title: "Иконка карточки пользователя"
       website: "Веб-сайт"
       email_settings: "E-mail"
       like_notification_frequency:
@@ -799,12 +838,11 @@ ru:
         title: "Приглашения"
         user: "Кто приглашен"
         sent: "Когда"
-        none: "Приглашения, ожидающие одобрения, отсутствуют."
         truncated:
-          one: "Первое приглашение"
-          few: "Первые {{count}} приглашения"
-          many: "Первые {{count}} приглашений"
-          other: "Первые {{count}} приглашений"
+          few: Первые {{count}} приглашения
+          many: Первые {{count}} приглашений
+          one: Первое приглашение
+          other: Первые {{count}} приглашений
         redeemed: "Принятые приглашения"
         redeemed_tab: "Принятые"
         redeemed_tab_with_count: "Принятые ({{count}})"
@@ -849,41 +887,47 @@ ru:
         title: "Сводка"
         stats: "Статистика"
         time_read: "время чтения"
+        recent_time_read: "недавнее время чтения"
         topic_count:
-          one: "тему создал"
-          few: "темы создал"
-          many: "тем создал"
-          other: "тем создал"
+          few: темы создал
+          many: тем создал
+          one: тему создал
+          other: тем создал
         post_count:
-          one: "сообщение написал"
-          few: "сообщения написал"
-          many: "сообщений написал"
-          other: "сообщений написал"
+          few: сообщения написал
+          many: сообщений написал
+          one: сообщение написал
+          other: сообщений написал
+        likes_given:
+          few: данных
+          many: данных
+          one: данный
+          other: данные
         likes_received:
-          one: "получил"
-          few: "получил"
-          many: "получил"
-          other: "получил"
+          few: получил
+          many: получил
+          one: получил
+          other: получил
         days_visited:
-          one: "день заходил"
-          few: "дня заходил"
-          many: "дней заходил"
-          other: "дней заходил"
+          few: дня заходил
+          many: дней заходил
+          one: день заходил
+          other: дней заходил
         topics_entered:
-          one: "посмотрел тему"
-          few: "посмотрел тем"
-          many: "просмотрено тем"
-          other: "просмотрено тем"
+          few: посмотрел тем
+          many: просмотрено тем
+          one: посмотрел тему
+          other: просмотрено тем
         posts_read:
-          one: "сообщение прочел"
-          few: "сообщения прочел"
-          many: "сообщений прочел"
-          other: "сообщений прочел"
+          few: сообщения прочел
+          many: сообщений прочел
+          one: сообщение прочел
+          other: сообщений прочел
         bookmark_count:
-          one: "закладка"
-          few: "закладки"
-          many: "закладок"
-          other: "закладок"
+          few: закладки
+          many: закладок
+          one: закладка
+          other: закладок
         top_replies: "Лучшие сообщения"
         no_replies: "Пока не написал ни одного сообщения."
         more_replies: "... другие сообщения"
@@ -909,6 +953,7 @@ ru:
         header_title: "профиль, сообщения, закладки и настройки"
       title:
         title: "Заголовок"
+        none: "(нет)"
       filters:
         all: "Всего"
       stream:
@@ -951,10 +996,10 @@ ru:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> достигнут установленный для сайта предел %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> превышен установленный для сайта предел %{siteSettingRate}."
       rate:
-        one: "1 ошибка/%{duration}"
-        few: "%{count} ошибок/%{duration}"
-        many: "%{count} ошибок/%{duration}"
-        other: "%{count} ошибок/%{duration}"
+        few: '%{count} ошибок/%{duration}'
+        many: '%{count} ошибок/%{duration}'
+        one: 1 ошибка/%{duration}
+        other: '%{count} ошибок/%{duration}'
     learn_more: "подробнее..."
     all_time: 'всего'
     all_time_desc: 'всего создано тем'
@@ -968,11 +1013,17 @@ ru:
     first_post: Первое сообщение
     mute: Отключить
     unmute: Включить
+    last_post: Дата
+    time_read: Прочитанные
+    time_read_recently: '%{time_read} недавно'
+    time_read_tooltip: '%{time_read} общее время чтения'
+    time_read_recently_tooltip: '%{time_read} общее время чтения (%{recent_time_read}за последние 60 дней)'
     last_reply_lowercase: последний ответ
     replies_lowercase:
-      one: ответ
       few: ответа
-      other: ответов
+      many: ответов
+      one: ответ
+      other: ответ
     signup_cta:
       sign_up: "Зарегистрироваться"
       hide_session: "Напомнить мне завтра"
@@ -994,6 +1045,7 @@ ru:
     private_message_info:
       title: "Сообщение"
       invite: "Пригласить других..."
+      leave_message: "Вы действительно хотите оставить это сообщение?"
       remove_allowed_user: "Вы действительно хотите удалить {{name}} из данного сообщения?"
       remove_allowed_group: "Вы действительно хотите удалить {{name}} из данного сообщения?"
     email: 'Email'
@@ -1021,14 +1073,20 @@ ru:
       help: "Электронное письмо не доходит? Для начала проверьте папку «Спам» вашего почтового ящика. <p>Не уверены в том, какой адрес использовали? Введите его и мы подскажем, есть ли он в нашей базе.</p><p>Если вы более не имеете доступа к связанному с вашей учётной записью адресу электронной почты, то, пожалуйста, свяжитесь с <a href='/about'>администрацией.</a></p>"
       button_ok: "ОК"
       button_help: "Помощь"
+    email_login:
+      complete_email: "Если данные аккаунта  совпадают с <b>%{email}</b>, вы должны получить электронное письмо со ссылкой для входа в систему в ближайшее время."
+      complete_email_not_found: "Нет совпадений аккаунта по  <b>%{email}</b>"
     login:
       title: "Войти"
       username: "Пользователь"
       password: "Пароль"
+      second_factor_title: "Двухфакторная аутентификация"
+      second_factor_description: "Пожалуйста, введите код аутентификации из вашего приложения:"
       email_placeholder: "E-mail или псевдоним"
       caps_lock_warning: "Caps Lock включен"
       error: "Неизвестная ошибка"
       rate_limit: "Сделайте перерыв перед очередной попыткой войти."
+      blank_username: "Введите ваш e-mail  или псевдоним."
       blank_username_or_password: "Введите ваш e-mail (или псевдоним) и пароль."
       reset_password: 'Сброс пароля'
       logging_in: "Проверка..."
@@ -1100,6 +1158,11 @@ ru:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    select_kit:
+      default_header_text: Выбрать...
+      no_content: Совпадений не найдено
+      filter_placeholder: Поиск...
+      create: "Создать: '{{content}}'"
     emoji_picker:
       filter_placeholder: Искать emoji
       people: People
@@ -1110,6 +1173,8 @@ ru:
       objects: Objects
       celebration: Celebration
       recent: Недавно использованные
+    shared_drafts:
+      title: "Общие Черновики"
     composer:
       emoji: "Смайлики :)"
       more_emoji: "еще..."
@@ -1126,11 +1191,12 @@ ru:
       saved_local_draft_tip: "Сохранено локально"
       similar_topics: "Ваша тема похожа на..."
       drafts_offline: "Черновики, сохраненные в офлайн"
+      group_mentioned_limit: "<b>Внимание!</b> Вы упомянули <a href='{{group_link}}'>{{group}}</a>, в которой больше участников, чем установленный администратором лимит упоминаний на {{max}} пользователей. Никто не получит оповещение."
       group_mentioned:
-        one: "Упоминая группу {{group}}, вы тем самым отправите уведомление <a href='{{group_link}}'>1му пользователю</a> – вы уверены?"
-        few: "Упоминая группу {{group}}, вы тем самым отправите уведомление <a href='{{group_link}}'>{{count}} пользователям</a> – вы уверены?"
-        many: "Упоминая группу {{group}}, вы тем самым отправите уведомление <a href='{{group_link}}'>{{count}} пользователям</a> – вы уверены?"
-        other: "Упоминая группу {{group}}, вы тем самым отправите уведомление <a href='{{group_link}}'>{{count}} пользователям</a> – вы уверены?"
+        few: Упоминая группу {{group}}, вы тем самым отправите уведомление <a href='{{group_link}}'>{{count}} пользователям</a> – вы уверены?
+        many: Упоминая группу {{group}}, вы тем самым отправите уведомление <a href='{{group_link}}'>{{count}} пользователям</a> – вы уверены?
+        one: Упоминая группу {{group}}, вы тем самым отправите уведомление <a href='{{group_link}}'>1му пользователю</a> – вы уверены?
+        other: Упоминая группу {{group}}, вы тем самым отправите уведомление <a href='{{group_link}}'>{{count}} пользователям</a> – вы уверены?
       cannot_see_mention:
         category: "Вы упомянули {{username}}, но они не будут уведомлены, потому что у них нет доступа к этому разделу. Вам нужно добавить их в группу, имеющую доступ к этому разделу."
         private: "Вы упомянули {{username}}, но они не будут уведомлены, потому что они не могут видеть это личное сообщение. Вам нужно пригласить их в это ЛС."
@@ -1143,6 +1209,7 @@ ru:
         post_length: "Сообщение должно быть не короче {{min}} символов"
         try_like: 'Пробовали ли вы выразить симпатию с помощью кнопки <i class="fa fa-heart"></i> ?'
         category_missing: "Нужно выбрать раздел"
+        tags_missing: "Необходимо выбрать по крайней мере {{count}} тег"
       save_edit: "Сохранить"
       reply_original: "Ответ в первоначальной теме"
       reply_here: "Ответить в текущей теме"
@@ -1150,6 +1217,8 @@ ru:
       cancel: "Отмена"
       create_topic: "Создать тему"
       create_pm: "Отправить личное сообщение"
+      create_whisper: "Внутреннее сообщение"
+      create_shared_draft: "Создать Общий Проект"
       title: "Или нажмите Ctrl+Enter"
       users_placeholder: "Добавить пользователя"
       title_placeholder: "Название: суть темы коротким предложением"
@@ -1195,28 +1264,51 @@ ru:
         title: "Забыли указать получателей?"
         body: "В списке получателей сейчас только вы сами!"
       admin_options_title: "Дополнительные настройки темы для персонала"
+      composer_actions:
+        reply_to_post:
+          label: "Ответить на сообщение %{postNumber} от %{postUsername}"
+          desc: Ответ на конкретный пост
+        reply_as_new_topic:
+          label: Ответить в новой связанной теме
+        reply_as_private_message:
+          label: Новое сообщение
+        reply_to_topic:
+          label: Ответить на тему
+          desc: "Ответ на тему, а не какой-либо конкретный пост"
+        create_topic:
+          label: "Новая тема"
+        shared_draft:
+          label: "Общий Проект"
     notifications:
+      tooltip:
+        regular:
+          few: '{{count}} невидимые уведомления'
+          many: '{{count}} невидимых уведомлений'
+          one: 1 невидимое уведомление
+          other: '{{count}} невидимые уведомления'
+        message:
+          few: '{{count}} непрочитанных сообщений'
+          many: '{{count}} непрочитанных сообщений'
+          one: 1 непрочитанное сообщение
+          other: '{{count}} непрочитанных сообщений'
       title: "уведомления об упоминании @псевдонима, ответах на ваши посты и темы, сообщения и т.д."
       none: "Уведомления не могут быть загружены."
       empty: "Уведомления не найдены."
       more: "посмотреть более ранние уведомления"
       total_flagged: "всего сообщений с жалобами"
+      mentioned: "<span>{{username}}</span> {{description}}"
+      liked_many:
+        few: <span>{{username}}, {{username2}} и {{count}} другие</span> {{description}}
+        many: <span>{{username}}, {{username2}} и {{count}} другие</span> {{description}}
+        one: <span>{{username}}, {{username2}} и 1 другой</span> {{description}}
+        other: <span>{{username}}, {{username2}} и {{count}} другие</span> {{description}}
       granted_badge: "Заслужил(а) '{{description}}'"
-      alt:
-        mentioned: "Упомянуто"
-        quoted: "Процитировано пользователем"
-        replied: "Ответил"
-        posted: "Опубликовано"
-        edited: "Изменил ваше сообщение"
-        liked: "Понравилось ваше сообщение"
-        private_message: "Личное сообщение от"
-        invited_to_private_message: "Приглашение в личную беседе от"
-        invited_to_topic: "Приглашение в тему от"
-        invitee_accepted: "Приглашение принято"
-        moved_post: "Ваша тема перенесена участником "
-        linked: "Ссылка на ваше сообщение"
-        granted_badge: "Награда получена от"
-        group_message_summary: "Входящие сообщения группы"
+      watching_first_post: "<span>Новая тема</span> {{description}}"
+      group_message_summary:
+        few: '{{count}} сообщений в вашей группе: {{group_name}} '
+        many: '{{count}} сообщений в вашей группе: {{group_name}} '
+        one: '{{count}} сообщение в вашей группе: {{group_name}} '
+        other: '{{count}} сообщений в вашей группе: {{group_name}} '
       popup:
         mentioned: '{{username}} упомянул вас в "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} упомянул вас в "{{topic}}" - {{site_title}}'
@@ -1249,6 +1341,11 @@ ru:
       select_all: "Выбрать все"
       clear_all: "Сбросить все"
       too_short: "Слишком короткое слово для поиска."
+      result_count:
+        few: <span>{{count}}{{plus}} результатов для </span><span class='term'>{{term}}</span>
+        many: <span>{{count}}{{plus}} результат для </span><span class='term'>{{term}}</span>
+        one: <span>1 результат для </span><span class='term'>{{term}}</span>
+        other: <span>{{count}}{{plus}} результатов для </span><span class='term'>{{term}}</span>
       title: "Поиск по темам, сообщениям, псевдонимам и разделам"
       no_results: "Ничего не найдено."
       no_more_results: "Больше ничего не найдено."
@@ -1258,6 +1355,8 @@ ru:
       more_results: "Найдено множество результатов. Пожалуйста, уточните, критерии поиска."
       cant_find: "Не можете найти нужную информацию?"
       start_new_topic: "Создать новую тему?"
+      search_google_button: "Google"
+      search_google_title: "Искать на этом сайте"
       context:
         user: "Искать сообщения от @{{username}}"
         category: "Искать в разделе #{{category}}"
@@ -1267,6 +1366,8 @@ ru:
         title: Расширенный поиск
         posted_by:
           label: Автор
+        in_category:
+          label: Категоризированный
         in_group:
           label: Группа
         with_badge:
@@ -1276,11 +1377,13 @@ ru:
           posted: В которых я писал
           watching: За которыми я наблюдаю
           tracking: За которыми я слежу
+          private: В моих сообщениях
           first: Только первые сообщения в темах
           pinned: Закреплены
           unpinned: Не закреплены
           unseen: Отметить непрочитанным
           wiki: Являются вики
+          all_tags: Все вышеуказанные теги
         statuses:
           label: Характеристика темы
           open: Открыта
@@ -1322,10 +1425,10 @@ ru:
         notification_level: "Уведомления"
         choose_new_category: "Выберите новый раздел для этих тем:"
         selected:
-          one: "Вы выбрали <b>{{count}}</b> тему."
-          few: "Вы выбрали <b>{{count}}</b> темы."
-          many: "Вы выбрали <b>{{count}}</b> тем."
-          other: "Вы выбрали <b>{{count}}</b> тем."
+          few: Вы выбрали <b>{{count}}</b> темы.
+          many: Вы выбрали <b>{{count}}</b> тем.
+          one: Вы выбрали <b>{{count}}</b> тему.
+          other: Вы выбрали <b>{{count}}</b> тем.
         change_tags: "Заменить теги"
         append_tags: "Добавить теги"
         choose_new_tags: "Выберите новые тэги для этих тем:"
@@ -1357,14 +1460,11 @@ ru:
         bookmarks: "Больше нет избранных тем."
         search: "Больше ничего не найдено."
     topic:
-      unsubscribe:
-        stop_notifications: "Вы будете получать меньше уведомлений для <strong>{{title}}</strong>"
-        change_notification_state: "Ваше текущее состояние уведомлений"
       filter_to:
-        one: "1 сообщение в теме"
-        few: "{{count}} сообщения в теме"
-        many: "{{count}} сообщений в теме"
-        other: "{{count}} сообщений в теме"
+        few: '{{count}} сообщения в теме'
+        many: '{{count}} сообщений в теме'
+        one: 1 сообщение в теме
+        other: '{{count}} сообщений в теме'
       create: 'Создать Тему'
       create_long: 'Создать новую тему'
       private_message: 'Новое личное соощение'
@@ -1374,18 +1474,20 @@ ru:
       move_to_inbox:
         title: 'Переместить во входящие'
         help: 'Переместить сообщение во входящие'
+      edit_message:
+        title: 'Редактировать сообщение'
       list: 'Темы'
       new: 'новая тема'
       unread: 'непрочитанно'
       new_topics:
-        one: '{{count}} новая тема'
         few: '{{count}} новых темы'
         many: '{{count}} новых тем'
+        one: '{{count}} новая тема'
         other: '{{count}} новых тем'
       unread_topics:
-        one: '{{count}} непрочитанная тема'
         few: '{{count}} непрочитанные темы'
         many: '{{count}} непрочитанных тем'
+        one: '{{count}} непрочитанная тема'
         other: '{{count}} непрочитанных тем'
       title: 'Тема'
       invalid_access:
@@ -1399,25 +1501,25 @@ ru:
         title: "Тема не найдена"
         description: "К сожалению, запрошенная тема не найдена. Возможно, она была удалена модератором."
       total_unread_posts:
-        one: "у вас {{count}} непрочитанное сообщение в этой теме"
-        few: "у вас {{count}} непрочитанных сообщения в этой теме"
-        many: "у вас {{count}} непрочитанных сообщения в этой теме"
-        other: "у вас {{count}} непрочитанных сообщения в этой теме"
+        few: у вас {{count}} непрочитанных сообщения в этой теме
+        many: у вас {{count}} непрочитанных сообщения в этой теме
+        one: у вас {{count}} непрочитанное сообщение в этой теме
+        other: у вас {{count}} непрочитанных сообщения в этой теме
       unread_posts:
-        one: "у вас {{count}} непрочитанное старое сообщение в этой теме"
-        few: "у вас {{count}} непрочитанных старых сообщения в этой теме"
-        many: "у вас {{count}} непрочитанных старых сообщений в этой теме"
-        other: "у вас {{count}} непрочитанных старых сообщений в этой теме"
+        few: у вас {{count}} непрочитанных старых сообщения в этой теме
+        many: у вас {{count}} непрочитанных старых сообщений в этой теме
+        one: у вас {{count}} непрочитанное старое сообщение в этой теме
+        other: у вас {{count}} непрочитанных старых сообщений в этой теме
       new_posts:
-        one: "в этой теме {{count}} новое сообщение с её последнего просмотра вами"
-        few: "в этой теме {{count}} новых сообщения с её последнего просмотра вами"
-        many: "в этой теме {{count}} новых сообщений с её последнего просмотра вами"
-        other: "в этой теме {{count}} новых сообщений с её последнего просмотра вами"
+        few: в этой теме {{count}} новых сообщения с её последнего просмотра вами
+        many: в этой теме {{count}} новых сообщений с её последнего просмотра вами
+        one: в этой теме {{count}} новое сообщение с её последнего просмотра вами
+        other: в этой теме {{count}} новых сообщений с её последнего просмотра вами
       likes:
-        one: "в теме {{count}} лайк"
-        few: "в теме {{count}} лайка"
-        many: "в теме {{count}} лайков"
-        other: "в теме {{count}} лайков"
+        few: в теме {{count}} лайка
+        many: в теме {{count}} лайков
+        one: в теме {{count}} лайк
+        other: в теме {{count}} лайков
       back_to_list: "Вернуться к списку тем"
       options: "Опции темы"
       show_links: "показать ссылки в теме"
@@ -1427,15 +1529,21 @@ ru:
       read_more_MF: "У вас осталось { UNREAD, plural, =0 {} one { <a href='/unread'>1 непрочитанная</a> } other { <a href='/unread'># непрочитанных</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{и } false { } other{}} <a href='/new'>1 новая</a> тема} other { {BOTH, select, true{и } false { } other{}} <a href='/new'># новых</a> тем} }, или {CATEGORY, select, true {посмотрите другие темы в разделе {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Просмотреть все разделы
       view_latest_topics: посмотреть последние темы
-      suggest_create_topic: Почему бы вам не создать новую тему?
+      suggest_create_topic: "Почему бы вам не создать новую тему?"
       jump_reply_up: перейти к более ранним ответам
       jump_reply_down: перейти к более поздним ответам
       deleted: "Тема удалена"
       auto_update_input:
+        tomorrow: "Завтра"
         later_this_week: "Позже на этой неделе"
         this_weekend: "В эти выходные"
         next_week: "На следующей неделе"
+        two_weeks: "Две недели"
         next_month: "В следующем месяце"
+        three_months: "Три месяца"
+        six_months: "Шесть месяцев"
+        one_year: "Один год"
+        forever: "Навсегда"
         pick_date_and_time: "Выбрать дату и время"
       temp_open:
         title: "Открыть на время"
@@ -1445,6 +1553,7 @@ ru:
         title: "Закрыть на время"
       auto_close:
         title: "Автоматическое закрытие темы"
+        label: "Закрыть тему через:"
         error: "Пожалуйста, введите корректное значение."
       auto_delete:
         title: "Автоматическое удаление темы"
@@ -1459,10 +1568,10 @@ ru:
         auto_reminder: "Вам придёт напоминание об этой теме через %{timeLeft}."
       auto_close_title: 'Настройки закрытия темы'
       auto_close_immediate:
-        one: "Последнее сообщение в этой теме отправлено 1 час назад, поэтому данная тема будет закрыта незамедлительно."
-        few: "Последнее сообщение в этой теме отправлено %{count} часа назад, поэтому данная тема будет закрыта незамедлительно."
-        many: "Последнее сообщение в этой теме отправлено %{count} часов назад, поэтому данная тема будет закрыта незамедлительно."
-        other: "Последнее сообщение в этой теме отправлено %{count} часов назад, поэтому данная тема будет закрыта незамедлительно."
+        few: Последнее сообщение в этой теме отправлено %{count} часа назад, поэтому данная тема будет закрыта незамедлительно.
+        many: Последнее сообщение в этой теме отправлено %{count} часов назад, поэтому данная тема будет закрыта незамедлительно.
+        one: Последнее сообщение в этой теме отправлено 1 час назад, поэтому данная тема будет закрыта незамедлительно.
+        other: Последнее сообщение в этой теме отправлено %{count} часов назад, поэтому данная тема будет закрыта незамедлительно.
       timeline:
         back: "Вернуться"
         back_description: "Перейти к последнему непрочитанному сообщению"
@@ -1483,21 +1592,21 @@ ru:
         title: изменить частоту уведомлений об этой теме
         reasons:
           mailing_list_mode: "Вы включили режим почтовой рассылки, поэтому Вы будете получать уведомления об ответах в этой теме через e-mail."
-          '3_10': 'Вы будете получать уведомления, т.к. наблюдаете за тэгом этой темы.'
-          '3_6': 'Вы будете получать уведомления, т.к. наблюдаете за этим разделом.'
-          '3_5': 'Вы будете получать уведомления, т.к. наблюдение темы началось автоматически.'
-          '3_2': 'Вы будете получать уведомления, т.к. наблюдаете за этой темой.'
-          '3_1': 'Вы будете получать уведомления, т.к. создали эту тему.'
-          '3': 'Вы будете получать уведомления, т.к. наблюдаете за темой.'
-          '2_8': 'Вы увидите количество новых ответов, т.к. следите за этим разделом.'
-          '2_4': 'Вы увидите количество новых ответов, т.к. вы размещали ответ в этой теме.'
-          '2_2': 'Вы увидите количество новых ответов, т.к. следите за этой темой.'
-          '2': 'Вы увидите количество новых ответов, т.к. <a href="/u/{{username}}/preferences">читали эту тему</a>.'
-          '1_2': 'Вы будете получать уведомления, если кто-то упомянет ваш @псевдоним или ответит вам.'
-          '1': 'Вы будете получать уведомления, если кто-то упомянет ваш @псевдоним или ответит вам.'
-          '0_7': 'Не получать уведомлений из этого раздела.'
-          '0_2': 'Не получать уведомлений по этой теме.'
-          '0': 'Не получать уведомлений по этой теме.'
+          "3_10": 'Вы будете получать уведомления, т.к. наблюдаете за тэгом этой темы.'
+          "3_6": 'Вы будете получать уведомления, т.к. наблюдаете за этим разделом.'
+          "3_5": 'Вы будете получать уведомления, т.к. наблюдение темы началось автоматически.'
+          "3_2": 'Вы будете получать уведомления, т.к. наблюдаете за этой темой.'
+          "3_1": 'Вы будете получать уведомления, т.к. создали эту тему.'
+          "3": 'Вы будете получать уведомления, т.к. наблюдаете за темой.'
+          "2_8": 'Вы увидите количество новых ответов, т.к. следите за этим разделом.'
+          "2_4": 'Вы увидите количество новых ответов, т.к. вы размещали ответ в этой теме.'
+          "2_2": 'Вы увидите количество новых ответов, т.к. следите за этой темой.'
+          "2": 'Вы увидите количество новых ответов, т.к. <a href="/u/{{username}}/preferences">читали эту тему</a>.'
+          "1_2": 'Вы будете получать уведомления, если кто-то упомянет ваш @псевдоним или ответит вам.'
+          "1": 'Вы будете получать уведомления, если кто-то упомянет ваш @псевдоним или ответит вам.'
+          "0_7": 'Не получать уведомлений из этого раздела.'
+          "0_2": 'Не получать уведомлений по этой теме.'
+          "0": 'Не получать уведомлений по этой теме.'
         watching_pm:
           title: "Наблюдать"
           description: "Уведомлять по каждому ответу на это сообщение и показывать счетчик новых непрочитанных ответов."
@@ -1537,7 +1646,6 @@ ru:
         visible: "Включить в списки"
         reset_read: "Сбросить счетчики"
         make_public: "Сделать тему публичной"
-        make_private: "Сделать тему приватной"
       feature:
         pin: "Закрепить тему"
         unpin: "Открепить тему"
@@ -1570,10 +1678,10 @@ ru:
         pin_validation: "Чтобы закрепить эту тему, требуется дата."
         not_pinned: "В разделе {{categoryLink}} нет закрепленных тем."
         already_pinned:
-          one: "Глобально закрепленных тем в разделе {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
-          few: "Глобально закрепленных тем в разделе {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          many: "Глобально закрепленных тем в разделе {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "Глобально закрепленных тем в разделе {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          few: 'Глобально закрепленных тем в разделе {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          many: 'Глобально закрепленных тем в разделе {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: 'Глобально закрепленных тем в разделе {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Глобально закрепленных тем в разделе {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         pin_globally: "Закрепить эту тему вверху всех разделов и списков тем до"
         confirm_pin_globally: "У вас уже есть глобально закрепленные темы ({{count}}). Перебор таких тем может оказаться неприятным неудобством для новичков и анонимных читателей. Вы уверены, что хотите глобально закрепить еще одну тему?"
         unpin_globally: "Отменить прикрепление этой темы вверху всех разделов и списков тем."
@@ -1581,10 +1689,10 @@ ru:
         global_pin_note: "Пользователи могут открепить тему, каждый сам для себя."
         not_pinned_globally: "Нет глобально закрепленных тем."
         already_pinned_globally:
-          one: "Глобально закрепленных тем: <strong class='badge badge-notification unread'>1</strong>"
-          few: "Глобально закрепленных тем: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          many: "Глобально закрепленных тем: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "Глобально закрепленных тем: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          few: 'Глобально закрепленных тем: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          many: 'Глобально закрепленных тем: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: 'Глобально закрепленных тем: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Глобально закрепленных тем: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         make_banner: "Превратить эту тему в объявление, которое будет отображаться вверху всех страниц."
         remove_banner: "Убрать тему-объявление, которое отображается вверху всех страниц."
         banner_note: "Пользователи могут закрывать объявление, каждый сам для себя, после чего оно больше не будет для них покываться. Только одна тема может быть сделана активным объявлением в любой момент времени."
@@ -1604,7 +1712,7 @@ ru:
       controls: "Управление темой"
       invite_reply:
         title: 'Пригласить'
-        username_placeholder: "имя пользователя"
+        username_placeholder: "псевдоним"
         action: 'Отправить приглашение'
         help: 'пригласить других в эту тему с помощью email или уведомлений'
         to_forum: "Будет отправлено короткое письмо, которое позволит вашему другу присоединиться просто кликнув по ссылке без необходимости входа на сайт."
@@ -1620,10 +1728,10 @@ ru:
       login_reply: 'Войти и ответить'
       filters:
         n_posts:
-          one: "{{count}} сообщение"
-          few: "{{count}} сообщения"
-          many: "{{count}} сообщений"
-          other: "{{count}} сообщений"
+          few: '{{count}} сообщения'
+          many: '{{count}} сообщений'
+          one: '{{count}} сообщение'
+          other: '{{count}} сообщений'
         cancel: "Отменить фильтр"
       split_topic:
         title: "Переместить в новую тему"
@@ -1631,19 +1739,19 @@ ru:
         topic_name: "Название новой темы"
         error: "Во время перемещения сообщений в новую тему возникла ошибка."
         instructions:
-          one: "Сейчас вы создадите новую тему и в неё переместится выбранное вами <b>{{count}}</b> сообщение."
-          few: "Сейчас вы создадите новую тему и в неё переместятся выбранные вами <b>{{count}}</b> сообщения."
-          many: "Сейчас вы создадите новую тему и в неё переместятся выбранные вами <b>{{count}}</b> сообщений."
-          other: "Сейчас вы создадите новую тему и в неё переместятся выбранные вами <b>{{count}}</b> сообщений."
+          few: Сейчас вы создадите новую тему и в неё переместятся выбранные вами <b>{{count}}</b> сообщения.
+          many: Сейчас вы создадите новую тему и в неё переместятся выбранные вами <b>{{count}}</b> сообщений.
+          one: Сейчас вы создадите новую тему и в неё переместится выбранное вами <b>{{count}}</b> сообщение.
+          other: Сейчас вы создадите новую тему и в неё переместятся выбранные вами <b>{{count}}</b> сообщений.
       merge_topic:
         title: "Переместить в существующую тему"
         action: "переместить в существующую тему"
         error: "Во время перемещения сообщений в тему возникла ошибка."
         instructions:
-          one: "Пожалуйста, выберите тему, в которую вы хотели бы переместить это <b>{{count}}</b> сообщение."
-          few: "Пожалуйста, выберите тему, в которую вы хотели бы переместить эти <b>{{count}}</b> сообщения."
-          many: "Пожалуйста, выберите тему, в которую вы хотели бы переместить эти <b>{{count}}</b> сообщений."
-          other: "Пожалуйста, выберите тему, в которую вы хотели бы переместить эти <b>{{count}}</b> сообщений."
+          few: Пожалуйста, выберите тему, в которую вы хотели бы переместить эти <b>{{count}}</b> сообщения.
+          many: Пожалуйста, выберите тему, в которую вы хотели бы переместить эти <b>{{count}}</b> сообщений.
+          one: Пожалуйста, выберите тему, в которую вы хотели бы переместить это <b>{{count}}</b> сообщение.
+          other: Пожалуйста, выберите тему, в которую вы хотели бы переместить эти <b>{{count}}</b> сообщений.
       merge_posts:
         title: "Соединить выделенные сообщения"
         action: "Соединить выделенные сообщения"
@@ -1655,11 +1763,10 @@ ru:
         label: "Новый владелец сообщений"
         placeholder: "псевдоним нового владельца"
         instructions:
-          one: "Пожалуйста, выберите нового владельца {{count}} сообщения от <b>{{old_user}}</b>."
-          few: "Пожалуйста, выберите нового владельца {{count}} сообщений от <b>{{old_user}}</b>."
-          many: "Пожалуйста, выберите нового владельца {{count}} сообщений от <b>{{old_user}}</b>."
-          other: "Пожалуйста, выберите нового владельца {{count}} сообщений от <b>{{old_user}}</b>."
-        instructions_warn: "Обратите внимание, что все уведомления об этом сообщении не будут переданы новому пользователю задним числом. <br>Внимание: В настоящее время никакие данные, имеющие отношение к сообщению, не передаются новому пользователю. Используйте с осторожностью."
+          few: Пожалуйста, выберите нового владельца {{count}} сообщений от <b>{{old_user}}</b>.
+          many: Пожалуйста, выберите нового владельца {{count}} сообщений от <b>{{old_user}}</b>.
+          one: Пожалуйста, выберите нового владельца {{count}} сообщения от <b>{{old_user}}</b>.
+          other: Пожалуйста, выберите нового владельца {{count}} сообщений от <b>{{old_user}}</b>.
       change_timestamp:
         title: "Изменить временную метку..."
         action: "изменить временную метку"
@@ -1669,18 +1776,26 @@ ru:
       multi_select:
         select: 'выбрать'
         selected: 'выбрано ({{count}})'
+        select_post:
+          label: 'выбрать'
+        selected_post:
+          label: 'выбранный'
+        select_replies:
+          label: 'выбрать + ответы'
+          title: 'Добавить запись и все ответы для выбора'
+        select_below:
+          label: 'выбрать + все ниже'
+          title: 'Добавить запись и все ответы для выбора'
         delete: удалить выбранные
         cancel: отменить выделение
         select_all: выбрать все
         deselect_all: снять весь выбор
         description:
-          one: Вы выбрали <b>{{count}}</b> сообщение.
           few: Вы выбрали <b>{{count}}</b> сообщения.
           many: Вы выбрали <b>{{count}}</b> сообщений.
+          one: Вы выбрали <b>{{count}}</b> сообщение.
           other: Вы выбрали <b>{{count}}</b> сообщений.
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Цитата"
       edit_reason: "Причина:"
       post_number: "сообщение {{number}}"
@@ -1693,38 +1808,38 @@ ru:
       show_full: "Показать полный текст"
       show_hidden: 'Отобразить скрытое содержимое.'
       deleted_by_author:
-        one: "(сообщение отозвано автором и будет автоматически удалено в течение %{count} часа, если только на сообщение не поступит жалоба)"
-        few: "(сообщение отозвано автором и будет автоматически удалено в течение %{count} часов, если только на сообщение не поступит жалоба)"
-        many: "(сообщение отозвано автором и будет автоматически удалено в течение %{count} часов, если только на сообщение не поступит жалоба)"
-        other: "(сообщение отозвано автором и будет автоматически удалено в течение %{count} часов, если только на сообщение не поступит жалоба)"
+        few: (сообщение отозвано автором и будет автоматически удалено в течение %{count} часов, если только на сообщение не поступит жалоба)
+        many: (сообщение отозвано автором и будет автоматически удалено в течение %{count} часов, если только на сообщение не поступит жалоба)
+        one: (сообщение отозвано автором и будет автоматически удалено в течение %{count} часа, если только на сообщение не поступит жалоба)
+        other: (сообщение отозвано автором и будет автоматически удалено в течение %{count} часов, если только на сообщение не поступит жалоба)
       expand_collapse: "развернуть/свернуть"
       gap:
-        one: "просмотреть {{count}} скрытый ответ"
-        few: "просмотреть {{count}} скрытых ответов"
-        many: "просмотреть {{count}} скрытых ответов"
-        other: "просмотреть {{count}} скрытых ответов"
+        few: просмотреть {{count}} скрытых ответов
+        many: просмотреть {{count}} скрытых ответов
+        one: просмотреть {{count}} скрытый ответ
+        other: просмотреть {{count}} скрытых ответов
       unread: "Сообщение не прочитано"
       has_replies:
-        one: "{{count}} Ответ"
-        few: "{{count}} Ответа"
-        many: "{{count}} Ответов"
-        other: "{{count}} Ответов"
+        few: '{{count}} Ответа'
+        many: '{{count}} Ответов'
+        one: '{{count}} Ответ'
+        other: '{{count}} Ответов'
       has_likes:
-        one: "{{count}} симпатия"
-        few: "{{count}} симпатии"
-        many: "{{count}} симпатий"
-        other: "{{count}} симпатий"
+        few: '{{count}} симпатии'
+        many: '{{count}} симпатий'
+        one: '{{count}} симпатия'
+        other: '{{count}} симпатий'
       has_likes_title:
-        one: "Это сообщение понравилось {{count}} человеку"
-        few: "Это сообщение понравилось {{count}} людям"
-        many: "Это сообщение понравилось {{count}} людям"
-        other: "Это сообщение понравилось {{count}} людям"
+        few: Это сообщение понравилось {{count}} людям
+        many: Это сообщение понравилось {{count}} людям
+        one: Это сообщение понравилось {{count}} человеку
+        other: Это сообщение понравилось {{count}} людям
       has_likes_title_only_you: "Вам понравилось это сообщение"
       has_likes_title_you:
-        one: "Вам и ещё 1 человеку понравилось это сообщение"
-        few: "Вам и ещё {{count}} людям понравилось это сообщение"
-        many: "Вам и ещё {{count}} людям понравилось это сообщение"
-        other: "Вам и ещё {{count}} людям понравилось это сообщение"
+        few: Вам и ещё {{count}} людям понравилось это сообщение
+        many: Вам и ещё {{count}} людям понравилось это сообщение
+        one: Вам и ещё 1 человеку понравилось это сообщение
+        other: Вам и ещё {{count}} людям понравилось это сообщение
       errors:
         create: "К сожалению, не удалось создать сообщение из-за ошибки. Попробуйте ещё раз."
         edit: "К сожалению, не удалось изменить сообщение. Попробуйте ещё раз."
@@ -1754,12 +1869,25 @@ ru:
         has_liked: "Вам понравилось это сообщение"
         undo_like: "больше не нравится"
         edit: "Изменить сообщение"
+        edit_action: "Изменить"
         edit_anonymous: "Войдите, чтобы отредактировать это сообщение."
         flag: "пожаловаться на сообщение"
         delete: "удалить сообщение"
         undelete: "отменить удаление"
         share: "поделиться ссылкой на сообщение"
         more: "Ещё"
+        delete_replies:
+          confirm: "Вы также хотите удалить ответы на этот пост?"
+          direct_replies:
+            few: Да, и {{count}} прямых ответов
+            many: Да, и {{count}} прямых ответов
+            one: Да, и 1 прямой ответ
+            other: Да, и {{count}} прямой ответ
+          all_replies:
+            few: Да, и все {{count}} ответа
+            many: Да, и все {{count}} ответы
+            one: Да, и 1 ответ
+            other: Да, и все {{count}} ответы
         admin: "действия администратора над сообщением"
         wiki: "Сделать вики-сообщением"
         unwiki: "Отменить вики-сообщение"
@@ -1785,6 +1913,11 @@ ru:
           notify_user: "отправил сообщение"
           bookmark: "добавить закладку"
           like: "понравилось это"
+          like_capped:
+            few: и {{count}} другим понравилось
+            many: и {{count}} другим понравилось
+            one: и {{count}} понравилось
+            other: и {{count}} другим понравилось
           vote: "проголосовал за это"
         by_you:
           off_topic: "Помечена вами как оффтопик"
@@ -1797,84 +1930,81 @@ ru:
           vote: "Вы проголосовали за данное сообщение"
         by_you_and_others:
           off_topic:
-            one: "Вы и ещё {{count}} человек отметили это как не относящееся к теме"
-            few: "Вы и ещё {{count}} человека отметили это как не относящееся к теме"
-            many: "Вы и ещё {{count}} человек отметили это как не относящееся к теме"
-            other: "Вы и ещё {{count}} человек отметили это как не относящееся к теме"
+            few: Вы и ещё {{count}} человека отметили это как не относящееся к теме
+            many: Вы и ещё {{count}} человек отметили это как не относящееся к теме
+            one: Вы и ещё {{count}} человек отметили это как не относящееся к теме
+            other: Вы и ещё {{count}} человек отметили это как не относящееся к теме
           spam:
-            one: "Вы и ещё {{count}} человек отметили это как спам"
-            few: "Вы и ещё {{count}} человека отметили это как спам"
-            many: "Вы и ещё {{count}} человек отметили это как спам"
-            other: "Вы и ещё {{count}} человек отметили это как спам"
+            few: Вы и ещё {{count}} человека отметили это как спам
+            many: Вы и ещё {{count}} человек отметили это как спам
+            one: Вы и ещё {{count}} человек отметили это как спам
+            other: Вы и ещё {{count}} человек отметили это как спам
           inappropriate:
-            one: "Вы и ещё {{count}} человек отметили это как неуместное"
-            few: "Вы и ещё {{count}} человека отметили это как неуместное"
-            many: "Вы и ещё {{count}} человек отметили это как неуместное"
-            other: "Вы и ещё {{count}} человек отметили это как неуместное"
+            few: Вы и ещё {{count}} человека отметили это как неуместное
+            many: Вы и ещё {{count}} человек отметили это как неуместное
+            one: Вы и ещё {{count}} человек отметили это как неуместное
+            other: Вы и ещё {{count}} человек отметили это как неуместное
           notify_moderators:
-            one: "Вы и ещё {{count}} человек отметили это как требующее модерации"
-            few: "Вы и ещё {{count}} человека отметили это как требующее модерации"
-            many: "Вы и ещё {{count}} человек отметили это как требующее модерации"
-            other: "Вы и ещё {{count}} человек отметили это как требующее модерации"
+            few: Вы и ещё {{count}} человека отметили это как требующее модерации
+            many: Вы и ещё {{count}} человек отметили это как требующее модерации
+            one: Вы и ещё {{count}} человек отметили это как требующее модерации
+            other: Вы и ещё {{count}} человек отметили это как требующее модерации
           notify_user:
-            one: "Вы и еще 1 человек отправили сообщение этому пользователю"
-            few: "Вы и еще {{count}} человека отправили сообщение этому пользователю"
-            other: "Вы и еще {{count}} человек отправили сообщение этому пользователю"
+            few: Вы и {{count}} другие люди отправили сообщение этому пользователю
+            many: Вы и {{count}} другие люди отправили сообщение этому пользователю
+            one: Вы и 1 пользователь отправили сообщение этому пользователю
+            other: Вы и {{count}} другие люди отправили сообщение этому пользователю
           bookmark:
-            one: "Вы и ещё {{count}} человек добавили это сообщение в закладки"
-            few: "Вы и ещё {{count}} человека добавили это сообщение в закладки"
-            many: "Вы и ещё {{count}} человек добавили это сообщение в закладки"
-            other: "Вы и ещё {{count}} человек добавили это сообщение в закладки"
+            few: Вы и ещё {{count}} человека добавили это сообщение в закладки
+            many: Вы и ещё {{count}} человек добавили это сообщение в закладки
+            one: Вы и ещё {{count}} человек добавили это сообщение в закладки
+            other: Вы и ещё {{count}} человек добавили это сообщение в закладки
           like:
-            one: "Вам и ещё {{count}} человеку понравилось"
-            few: "Вам и ещё {{count}} людям понравилось"
-            many: "Вам и ещё {{count}} людям понравилось"
-            other: "Вам и ещё {{count}} людям понравилось"
+            few: Вам и ещё {{count}} людям понравилось
+            many: Вам и ещё {{count}} людям понравилось
+            one: Вам и ещё {{count}} человеку понравилось
+            other: Вам и ещё {{count}} людям понравилось
           vote:
-            one: "Вы и ещё {{count}} человек проголосовали за это сообщение"
-            few: "Вы и ещё {{count}} человека проголосовали за это сообщение"
-            many: "Вы и ещё {{count}} человек проголосовали за это сообщение"
-            other: "Вы и ещё {{count}} человек проголосовали за это сообщение"
+            few: Вы и ещё {{count}} человека проголосовали за это сообщение
+            many: Вы и ещё {{count}} человек проголосовали за это сообщение
+            one: Вы и ещё {{count}} человек проголосовали за это сообщение
+            other: Вы и ещё {{count}} человек проголосовали за это сообщение
         by_others:
           off_topic:
-            one: "{{count}} человек отметил это как не относящееся к теме"
-            few: "{{count}} человека отметили это как не относящееся к теме"
-            many: "{{count}} человек отметили это как не относящееся к теме"
-            other: "{{count}} человек отметили это как не относящееся к теме"
+            few: '{{count}} человека отметили это как не относящееся к теме'
+            many: '{{count}} человек отметили это как не относящееся к теме'
+            one: '{{count}} человек отметил это как не относящееся к теме'
+            other: '{{count}} человек отметили это как не относящееся к теме'
           spam:
-            one: "{{count}} человек отметил это как спам"
-            few: "{{count}} человека отметили это как спам"
-            many: "{{count}} человек отметили это как спам"
-            other: "{{count}} человек отметили это как спам"
+            few: '{{count}} человека отметили это как спам'
+            many: '{{count}} человек отметили это как спам'
+            one: '{{count}} человек отметил это как спам'
+            other: '{{count}} человек отметили это как спам'
           inappropriate:
-            one: "{{count}} человек отметил это как неуместное"
-            few: "{{count}} человек отметили это как неуместное"
-            many: "{{count}} человек отметили это как неуместное"
-            other: "{{count}} человек отметили это как неуместное"
+            few: '{{count}} человек отметили это как неуместное'
+            many: '{{count}} человек отметили это как неуместное'
+            one: '{{count}} человек отметил это как неуместное'
+            other: '{{count}} человек отметили это как неуместное'
           notify_moderators:
-            one: "{{count}} человек отметил это как требующее модерации"
-            few: "{{count}} человека отметили это как требующее модерации"
-            many: "{{count}} человек отметили это как требующее модерации"
-            other: "{{count}} человек отметили это как требующее модерации"
-          notify_user:
-            one: "1 человек отправил сообщение этому пользователю"
-            few: "{{count}} человека отправили сообщение этому пользователю"
-            other: "{{count}} человек отправили сообщение этому пользователю"
+            few: '{{count}} человека отметили это как требующее модерации'
+            many: '{{count}} человек отметили это как требующее модерации'
+            one: '{{count}} человек отметил это как требующее модерации'
+            other: '{{count}} человек отметили это как требующее модерации'
           bookmark:
-            one: "{{count}} человек добавил это сообщение в закладки"
-            few: "{{count}} человека добавили это сообщение в закладки"
-            many: "{{count}} человек добавили это сообщение в закладки"
-            other: "{{count}} человек добавили это сообщение в закладки"
+            few: '{{count}} человека добавили это сообщение в закладки'
+            many: '{{count}} человек добавили это сообщение в закладки'
+            one: '{{count}} человек добавил это сообщение в закладки'
+            other: '{{count}} человек добавили это сообщение в закладки'
           like:
-            one: "{{count}} человеку понравилось"
-            few: "{{count}} людям понравилось"
-            many: "{{count}} людям понравилось"
-            other: "{{count}} людям понравилось"
+            few: '{{count}} людям понравилось'
+            many: '{{count}} людям понравилось'
+            one: '{{count}} человеку понравилось'
+            other: '{{count}} людям понравилось'
           vote:
-            one: "{{count}} человек проголосовал за это сообщение"
-            few: "{{count}} человека проголосовали за это сообщение"
-            many: "{{count}} человек проголосовали за это сообщение"
-            other: "{{count}} человек проголосовали за это сообщение"
+            few: '{{count}} человека проголосовали за это сообщение'
+            many: '{{count}} человек проголосовали за это сообщение'
+            one: '{{count}} человек проголосовал за это сообщение'
+            other: '{{count}} человек проголосовали за это сообщение'
       revisions:
         controls:
           first: "Начальная версия"
@@ -1921,7 +2051,7 @@ ru:
       topic_template: "Шаблон темы"
       tags: "Тэги"
       tags_allowed_tags: "Разрешить использовать в этом разделе только следующие метки:"
-      tags_allowed_tag_groups: "Разрешить использовать в этом разделе только метки из этих групп:"
+      tags_allowed_tag_groups: "Разрешить использовать в этом разделе только теги из этих групп:"
       tags_placeholder: "(Необязательно) список доступных тегов"
       tag_groups_placeholder: "(Необязательно) список доступных групп тегов"
       topic_featured_link_allowed: "Разрешить популярные ссылки в этой категории"
@@ -1956,7 +2086,6 @@ ru:
       email_in_allow_strangers: "Принимать письма от анонимных пользователей без учётных записей"
       email_in_disabled: "Создание новых тем через электронную почту отключено в настройках сайта. Чтобы разрешить создание новых тем через электронную почту,"
       email_in_disabled_click: 'активируйте настройку "email in".'
-      suppress_from_homepage: "Не отображать этот раздел на главной странице."
       show_subcategory_list: "Показывать список подразделов над списком тем  в этом разделе."
       num_featured_topics: "Количество тем на странице разделов"
       all_topics_wiki: "Создавать новые темы в вики-формате по умолчанию."
@@ -1971,6 +2100,7 @@ ru:
       default_position: "Позиция по умолчанию"
       position_disabled: "Разделы будут показаны в порядке активности. Чтобы настроить порядок разделов,"
       position_disabled_click: 'включите настройку "fixed category positions".'
+      minimum_required_tags: 'Минимальное количество тегов, требуемых в теме:'
       parent: "Родительский раздел"
       notifications:
         watching:
@@ -2003,6 +2133,8 @@ ru:
       subcategory_list_styles:
         rows: "Строки"
         rows_with_featured_topics: "Строки с обсуждаемыми темами"
+        boxes: "Блоки"
+        boxes_with_featured_topics: "Блоки с обсуждаемыми темами"
     flagging:
       title: 'Спасибо за вашу помощь в поддержании порядка!'
       action: 'Пожаловаться на сообщение'
@@ -2026,20 +2158,20 @@ ru:
       custom_placeholder_notify_moderators: "Поясните суть проблемы: на что нам следует обратить внимание. Предоставьте соответствующие ссылки, если это возможно."
       custom_message:
         at_least:
-          one: "Введите хотя бы 1 символ"
-          few: "Введите хотя бы {{count}} символа"
-          many: "Введите хотя бы {{count}} символов"
-          other: "Введите хотя бы {{count}} символов"
+          few: Введите хотя бы {{count}} символа
+          many: Введите хотя бы {{count}} символов
+          one: Введите хотя бы 1 символ
+          other: Введите хотя бы {{count}} символов
         more:
-          one: "Еще 1 символ..."
-          few: "Еще хотя бы {{count}} символа..."
-          many: "Еще хотя бы {{count}} символов..."
-          other: "Еще хотя бы {{count}} символов..."
+          few: Еще хотя бы {{count}} символа...
+          many: Еще хотя бы {{count}} символов...
+          one: Еще 1 символ...
+          other: Еще хотя бы {{count}} символов...
         left:
-          one: "Осталось не более 1 символа"
-          few: "Осталось не более {{count}} символов"
-          many: "Осталось не более {{count}} символов"
-          other: "Осталось не более {{count}} символов"
+          few: Осталось не более {{count}} символов
+          many: Осталось не более {{count}} символов
+          one: Осталось не более 1 символа
+          other: Осталось не более {{count}} символов
     flagging_topic:
       title: "Спасибо за помощь в поддержании порядка!"
       action: "Пожаловаться на тему"
@@ -2050,17 +2182,17 @@ ru:
       links_title: "Популярные ссылки"
       links_shown: "показать больше ссылок..."
       clicks:
-        one: "1 клик"
-        few: "%{count} клика"
-        many: "%{count} кликов"
-        other: "%{count} кликов"
+        few: '%{count} клика'
+        many: '%{count} кликов'
+        one: 1 клик
+        other: '%{count} кликов'
     post_links:
       about: "gjrfpf"
       title:
-        one: "ещё 1"
-        few: "ещё %{count}"
-        many: "ещё %{count}"
-        other: "ещё %{count}"
+        few: ещё %{count}
+        many: ещё %{count}
+        one: ещё 1
+        other: ещё %{count}
     topic_statuses:
       warning:
         help: "Это официальное предупреждение."
@@ -2094,27 +2226,30 @@ ru:
     original_post: "Начальное сообщение"
     views: "Просм."
     views_lowercase:
-      one: "просмотр"
-      few: "просмотра"
-      other: "просмотров"
+      few: просмотров
+      many: просмотров
+      one: просмотр
+      other: просмотров
     replies: "Ответов"
     views_long:
-      one: "тема просмотрена 1 раз"
-      few: "тема просмотрена {{number}} раза"
-      many: "тема просмотрена {{number}} раз"
-      other: "тема просмотрена {{number}} раз"
+      few: тема просмотрена {{number}} раза
+      many: тема просмотрена {{number}} раз
+      one: тема просмотрена 1 раз
+      other: тема просмотрена {{number}} раз
     activity: "Активность"
     likes: "Нрав."
     likes_lowercase:
-      one: "лайк"
-      few: "лайка"
-      other: "лайков"
+      few: симпатий
+      many: симпатий
+      one: симпатия
+      other: симпатий
     likes_long: "{{number}} лайков в теме"
     users: "Пользователи"
     users_lowercase:
-      one: "пользователь"
-      few: "пользователя"
-      other: "пользователей"
+      few: пользователя
+      many: пользователя
+      one: пользователь
+      other: пользователя
     category_title: "Раздел"
     history: "История"
     changed_by: "автором {{author}}"
@@ -2128,10 +2263,10 @@ ru:
       latest:
         title: "Последние"
         title_with_count:
-          one: "Последние (1)"
-          few: "Последние ({{count}})"
-          many: "Последние ({{count}})"
-          other: "Последние ({{count}})"
+          few: Последние ({{count}})
+          many: Последние ({{count}})
+          one: Последние (1)
+          other: Последние ({{count}})
         help: "темы с недавними сообщениями"
       hot:
         title: "Популярные"
@@ -2149,29 +2284,29 @@ ru:
       unread:
         title: "Непрочитанные"
         title_with_count:
-          one: "Непрочитанные ({{count}})"
-          few: "Непрочитанные ({{count}})"
-          many: "Непрочитанные ({{count}})"
-          other: "Непрочитанные ({{count}})"
+          few: Непрочитанные ({{count}})
+          many: Непрочитанные ({{count}})
+          one: Непрочитанные ({{count}})
+          other: Непрочитанные ({{count}})
         help: "наблюдаемые или отслеживаемые темы с непрочитанными сообщениями"
         lower_title_with_count:
-          one: "{{count}} непрочитанная"
-          few: "{{count}} непрочитанных"
-          many: "{{count}} непрочитанных"
-          other: "{{count}} непрочитанных"
+          few: '{{count}} непрочитанных'
+          many: '{{count}} непрочитанных'
+          one: '{{count}} непрочитанная'
+          other: '{{count}} непрочитанных'
       new:
         lower_title_with_count:
-          one: "{{count}} новая"
-          few: "{{count}} новых"
-          many: "{{count}} новых"
-          other: "{{count}} новых"
+          few: '{{count}} новых'
+          many: '{{count}} новых'
+          one: '{{count}} новая'
+          other: '{{count}} новых'
         lower_title: "новые"
         title: "Новые"
         title_with_count:
-          one: "Новые ({{count}})"
-          few: "Новые ({{count}})"
-          many: "Новые ({{count}})"
-          other: "Новые ({{count}})"
+          few: Новые ({{count}})
+          many: Новые ({{count}})
+          one: Новые ({{count}})
+          other: Новые ({{count}})
         help: "темы, созданные за последние несколько дней"
       posted:
         title: "Мои"
@@ -2182,10 +2317,10 @@ ru:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: "{{categoryName}} ({{count}})"
-          few: "{{categoryName}} ({{count}})"
-          many: "{{categoryName}} ({{count}})"
-          other: "{{categoryName}} ({{count}})"
+          few: '{{categoryName}} ({{count}})'
+          many: '{{categoryName}} ({{count}})'
+          one: '{{categoryName}} ({{count}})'
+          other: '{{categoryName}} ({{count}})'
         help: "последние темы в разделе {{categoryName}}"
       top:
         title: "Обсуждаемые"
@@ -2243,10 +2378,14 @@ ru:
         hamburger_menu: '<b>=</b> Открыть меню гамбургер'
         user_profile_menu: '<b>p</b> Открыть меню профиля'
         show_incoming_updated_topics: '<b>.</b> Показать обновленные темы'
+        search: '<b>/</b> или <b>ctrl</b>+<b>alt</b>+<b>f</b> Поиск'
         help: '<b>?</b> Показать сочетания клавиш'
         dismiss_new_posts: '<b>x</b>, <b>r</b> Отложить новые сообщения'
         dismiss_topics: '<b>x</b>, <b>t</b> Отложить темы'
         log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Выйти'
+      composing:
+        title: 'Редактирование'
+        return: '<b>shift</b>+<b>c</b> Вернуться в редактор'
       actions:
         title: 'Темы'
         bookmark_topic: ' <b>f</b> Добавить / удалить из заклодок'
@@ -2269,32 +2408,33 @@ ru:
         print: '<b>ctrl</b>+<b>p</b> Печатать тему'
     badges:
       earned_n_times:
-        one: "Заработал эту награду 1 раз"
-        few: "Заработали эту награду %{count} раз"
-        many: "Заработали эту награду %{count} раз"
-        other: "Заработали эту награду %{count} раз"
+        few: Заработали эту награду %{count} раз
+        many: Заработали эту награду %{count} раз
+        one: Заработал эту награду 1 раз
+        other: Заработали эту награду %{count} раз
       granted_on: "Выдана %{date}"
       others_count: "Другие с этой наградой (%{count})"
       title: Награды
       allow_title: "Вы можете использовать эту награду в качестве титула."
       multiple_grant: "Вы можете получить её несколько раз"
       badge_count:
-        one: "1 награда"
-        few: "%{count} наград"
-        many: "%{count} наград"
-        other: "%{count} наград"
+        few: '%{count} наград'
+        many: '%{count} наград'
+        one: 1 награда
+        other: '%{count} наград'
       more_badges:
-        one: "ещё +1"
-        few: "+ ещё %{count}"
-        many: "+ ещё %{count}"
-        other: "+ ещё %{count}"
+        few: + ещё %{count}
+        many: + ещё %{count}
+        one: ещё +1
+        other: + ещё %{count}
       granted:
-        one: "выдано 1"
-        few: "выдано %{count}"
-        many: "выдано %{count}"
-        other: "выдано %{count}"
+        few: выдано %{count}
+        many: выдано %{count}
+        one: выдано 1
+        other: выдано %{count}
       select_badge_for_title: Использовать награду в качестве Вашего титула
-      none: "<отсутствует>"
+      none: "(нет)"
+      successfully_granted: "Награда %{badge} успешно присвоена %{username}"
       badge_grouping:
         getting_started:
           name: Начало работы
@@ -2317,11 +2457,19 @@ ru:
       </p>
     tagging:
       all_tags: "Все теги"
+      other_tags: "Изменить теги"
       selector_all_tags: "Все теги"
       selector_no_tags: "Нет тегов"
       changed: "Теги изменены:"
       tags: "Теги"
+      choose_for_topic: "Выберите теги для этой темы (опционально)"
       delete_tag: "Удалить тег"
+      delete_confirm:
+        few: Вы действительно хотите удалить этот тэг и удалить его из {{count}} топиков, которым он присвоен?
+        many: Вы действительно хотите удалить этот тэг и удалить его из {{count}} топиков, которым он присвоен?
+        one: Вы действительно хотите удалить этот тэг и удалить его из 1 топика, которому он присвоен?
+        other: Вы действительно хотите удалить этот тэг и удалить его из {{count}} топиков, которым он присвоен?
+      delete_confirm_no_topics: "Вы действительно хотите удалить этот тэг?"
       rename_tag: "Редактировать тег"
       rename_instructions: "Выберите новое название тега:"
       sort_by: "Сортировка:"
@@ -2337,19 +2485,15 @@ ru:
       notifications:
         watching:
           title: "Наблюдать"
-          description: "Автоматически наблюдать за всеми темами с этим тегом.  Уведомлять о всех новых темах и сообщениях, а также показывать количество непрочитанных и новых сообщений рядом с названиями тем."
         watching_first_post:
           title: "Наблюдать создание тем"
-          description: "Уведомлять только о первом сообщении в каждой новой теме с этим тегом."
         tracking:
           title: "Следить"
-          description: "Автоматически следить за всеми темами с этим тегом. Показывать количество непрочитанных и новых сообщений рядом с названиями тем."
         regular:
           title: "Стандартные уведомления"
           description: "Уведомлять, только если кто-то упомянет меня по @псевдониму, или ответит на мое сообщение."
         muted:
           title: "Без уведомлений"
-          description: "Не уведомлять об обновлениях в новых темах с этим тегом и не показывать на странице «Непрочитанные»."
       groups:
         title: "Группы тегов"
         about: "Для простоты управления тегами, распределите их по группам"
@@ -2363,6 +2507,7 @@ ru:
         save: "Сохранить"
         delete: "Удалить"
         confirm_delete: "Вы уверены, что хотите удалить эту группу тегов?"
+        visible_only_to_staff: "Теги видны только персоналу"
       topics:
         none:
           unread: "Нет непрочитанных тем."
@@ -2416,6 +2561,7 @@ ru:
         no_problems: "Проблем не обнаружено."
         moderators: 'Модераторы:'
         admins: 'Администраторы:'
+        silenced: 'Отключенные:'
         suspended: 'Заморожен:'
         private_messages_short: "Сообщ."
         private_messages_title: "Сообщений"
@@ -2431,8 +2577,6 @@ ru:
         reports:
           today: "Сегодня"
           yesterday: "Вчера"
-          last_7_days: "7 дней"
-          last_30_days: "30 дней"
           all_time: "За все время"
           7_days_ago: "7 дней назад"
           30_days_ago: "30 дней назад"
@@ -2448,13 +2592,29 @@ ru:
         by: "от"
       flags:
         title: "Жалобы"
+        active_posts: "Сообщения с жалобами"
+        old_posts: "Старые сообщения с жалобами"
+        topics: "Темы с жалобами"
         moderation_history: "История модерации"
         agree: "Принять"
         agree_title: "Подтвердить корректность жалобы"
-        defer_flag_title: "Удалить эту жалобу — никаких действий на данный момент не требуется."
+        agree_flag_hide_post: "Скрыть запись"
+        agree_flag_hide_post_title: "Скрыть это сообщение и автоматически отправить пользователю личное сообщение с просьбой отредактировать его"
+        agree_flag_restore_post: "Согласиться (восстановить сообщение)"
+        agree_flag_restore_post_title: "Восстановить сообщение, чтобы все пользователи могли его видеть."
+        agree_flag_suspend: "Заморозить Пользователя"
+        agree_flag_suspend_title: "Согласиться с флагом и заблокировать пользователя."
+        agree_flag_silence: "Отключить пользователя"
+        agree_flag_silence_title: "Согласиться с флагом и отключить пользователя."
+        agree_flag: "Оставить сообщение нетронутым."
+        agree_flag_title: "Согласиться с флагом и оставить сообщение нетронутым."
+        ignore_flag: "Игнорировать"
+        ignore_flag_title: "Удалить этот флаг; в это время он не требует никаких действий."
         delete: "Удалить"
         delete_title: "Удалить обжалованное сообщение."
+        delete_post_defer_flag: "Удалить сообщение и отклонить флаг"
         delete_post_defer_flag_title: "Удалить сообщение; если это первое сообщение, удалить тему целиком"
+        delete_post_agree_flag: "Удалить сообщение и согласиться с флагом"
         delete_post_agree_flag_title: "Удалить сообщение; если это первое сообщение, удалить тему целиком"
         delete_flag_modal_title: "Удалить и..."
         delete_spammer: "Удалить спамера"
@@ -2466,27 +2626,56 @@ ru:
         clear_topic_flags: "Готово"
         clear_topic_flags_title: "Тема была просмотрена, и все проблемы были решены. Нажмите Готово, чтобы удалить все жалобы."
         more: "(ещё ответы...)"
+        suspend_user: "Заблокировать пользователя"
+        suspend_user_title: "Заблокировать пользователя за это сообщение"
+        replies:
+          few: '[%{count} ответов]'
+          many: '[%{count} ответов]'
+          one: '[1 ответ]'
+          other: '[%{count} ответов]'
+        delete_replies:
+          few: Также удалите %{count} ответов на этот пост?
+          many: Также удалите %{count} ответов на этот пост?
+          one: Также удалите %{count} ответ на этот пост?
+          other: Также удалите %{count} ответов на этот пост?
         dispositions:
           agreed: "принято"
           disagreed: "отклонено"
+          deferred: "пропущено"
         flagged_by: "Отмечено"
         resolved_by: "Разрешено"
         took_action: "Принята мера"
         system: "Системные"
         error: "что-то пошло не так"
         reply_message: "Ответить"
+        no_results: "Сообщений с жалобами нет."
         topic_flagged: "Эта <strong>тема</strong> была помечена."
+        show_full: "показать сообщение полностью"
         visit_topic: "Посетите тему чтобы принять меры"
         was_edited: "Сообщение было отредактировано после первой жалобы"
         previous_flags_count: "На это сообщение уже пожаловались {{count}} раз(а)."
+        show_details: "Показать детали жалобы"
+        details: "детали"
+        flagged_topics:
+          topic: "Тема"
+          type: "Набирать текст"
+          users: "Пользователи"
+          last_flagged: "Последняя жалоба"
+        short_names:
+          off_topic: "Не по теме"
+          inappropriate: "неприемлемый"
+          spam: "спам"
+          notify_user: "персональный"
+          notify_moderators: "персональный"
       groups:
+        manage:
+          membership:
+            automatic_membership_email_domains: "Пользователи, зарегистрированные c адресом электронной почты, который точно совпадает с доменом в этом списке, будут автоматически добавлены в эту группу: "
         primary: "Основная группа"
         no_primary: "(нет основной группы)"
         title: "Группы"
         edit: "Управление группами"
         refresh: "Обновить"
-        new: "Добавить новую"
-        selector_placeholder: "введите псевдоним"
         about: "Здесь можно редактировать группы и имена групп"
         group_members: "Участники группы"
         delete: "Удалить"
@@ -2494,22 +2683,10 @@ ru:
         delete_failed: "Невозможно удалить группу. Если группа была создана автоматически, то она не может быть удалена."
         delete_owner_confirm: "Отозвать права владельца у пользователя '%{username}'?"
         add: "Добавить"
-        add_members: "Добавить участников"
         custom: "Настраиваемые"
-        bulk_complete: "Пользователи успешно добавлены в группу."
-        bulk_complete_users_not_added: "Эти пользователи не были добавлены (убедитесь, что у них есть учётная запись):"
-        bulk: "Массовое добавление в группу"
-        bulk_paste: "Впишите список пользователей или адресов e-mail, по одному на строчку:"
-        bulk_select: "(выберите группу)"
         automatic: "Автоматические"
-        automatic_membership_email_domains: "Пользователи, которые регистрируются с доменом электронной почты из этого списка, будут автоматически добавлены в группу:"
-        automatic_membership_retroactive: "Добавить в группу уже сущетсвующих зарегестрированных пользователей по этому правилу домена электронной почты"
-        default_title: "Заголовок по умолчанию для всех пользователей в группе"
-        primary_group: "Автоматически использовать в качестве основной группы"
         group_owners: Владельцы
         add_owners: Добавить владельцев
-        incoming_email: "Специальный входящий адрес e-mail"
-        incoming_email_placeholder: "введите e-mail"
         none_selected: "Чтобы начать, выберите группу!"
         no_custom_groups: "Создать новую кастомную группу"
       api:
@@ -2566,6 +2743,7 @@ ru:
           details: "Происходит, когда сообщение создается, редактируется, удаляется или восстанавливается."
         user_event:
           name: "Событие пользователя"
+          details: "Когда пользователь входит, выходит, создается, подтверждается или изменяется."
         delivery_status:
           title: "Статус передачи"
           inactive: "Неактивна"
@@ -2575,15 +2753,15 @@ ru:
           none: "Нет связанных событий."
           redeliver: "Возврат"
           incoming:
-            one: "Есть новое событие."
-            few: "{{count}} новых события."
-            many: "{{count}} новых событий."
-            other: "{{count}} новых событий."
+            few: '{{count}} новых события.'
+            many: '{{count}} новых событий.'
+            one: Есть новое событие.
+            other: '{{count}} новых событий.'
           completed_in:
-            one: "Завершится через 1 секунду."
-            few: "Завершится через {{count}} секунд."
-            many: "Завершится через {{count}} секунд."
-            other: "Завершится через {{count}} секунд."
+            few: Завершится через {{count}} секунд.
+            many: Завершится через {{count}} секунд.
+            one: Завершится через 1 секунду.
+            other: Завершится через {{count}} секунд.
           request: "Запрос"
           response: "Ответ"
           redeliver_confirm: "Вы уверены, что хотите повторно отправить теже самые данные?"
@@ -2634,7 +2812,7 @@ ru:
           label: "Загрузить"
           title: "Загрузить копию на сервер"
           uploading: "Загрузка..."
-          success: "'{{filename}}' был успешно загружен."
+          success: "'{{filename}}' успешно загружен. Файл теперь обрабатывается и займет минуту, чтобы его строки отразились в списке."
           error: "При загрузке '{{filename}}' произошла ошибка: {{message}}"
         operations:
           is_running: "Операция в данный момент исполняется..."
@@ -2647,7 +2825,6 @@ ru:
             label: "Резервная копия"
             title: "Создать резервную копию"
             confirm: "Запустить резервное копирование?"
-            without_uploads: "Да (исключить файлы)"
           download:
             label: "Скачать"
             title: "Послать письмо со ссылкой для скачивания"
@@ -2716,6 +2893,7 @@ ru:
           common: "Общее"
           desktop: "Настольный"
           mobile: "Мобильный"
+          settings: "Настройки"
           preview: "Предпросмотр"
           is_default: "Активировать по умолчанию"
           user_selectable: "Пользователи могут выбирать стиль"
@@ -2725,8 +2903,10 @@ ru:
           theme_components: "Компоненты стиля"
           uploads: "Загрузки"
           no_uploads: "Вы можете загружать различные ресурсы для вашего стиля, такие как шрифты и изображения"
+          add_upload: "Добавить вложение"
           upload_file_tip: "Выберите файл для загрузки (png, woff2 и т.д.)"
           variable_name: "Имя переменной SCSS:"
+          upload: "Загрузить"
           child_themes_check: "Стиль включает дочерние стили"
           css_html: "Настройка CSS/HTML"
           edit_css_html: "Редактировать CSS/HTML"
@@ -2742,6 +2922,12 @@ ru:
           updating: "Обновляю..."
           up_to_date: "Стиль текущей версии, последняя проверка:"
           add: "Добавить"
+          theme_settings: "Настройки темы"
+          commits_behind:
+            few: Тема находится на {{count}} коммитов сзади!
+            many: Тема находится на {{count}} коммитов сзади!
+            one: Тема находится на 1 коммит сзади!
+            other: Тема находится на {{count}} коммитов сзади!
           scss:
             text: "CSS"
             title: "Введите CSS; допускаются все стили CSS и SCSS"
@@ -2871,6 +3057,15 @@ ru:
             type_placeholder: "дайджест, подписка..."
             reply_key_placeholder: "Ключ ответа"
             skipped_reason_placeholder: "Причина"
+      moderation_history:
+        performed_by: "Выполнено пользователем "
+        no_results: "История модерации недоступна."
+        actions:
+          delete_user: "Удалить Пользователя"
+          suspend_user: "Пользователь приостановлен"
+          silence_user: "Пользователь отключен"
+          delete_post: "Комментарий удален"
+          delete_topic: "Тема удалена"
       logs:
         title: "Логи"
         action: "Действие"
@@ -2926,6 +3121,8 @@ ru:
             change_category_settings: "изменена настройка раздела"
             delete_category: "удален раздел"
             create_category: "создан раздел"
+            silence_user: "заблокировать пользователя"
+            unsilence_user: "разблокировать пользователя"
             grant_admin: "выданы права администратора"
             revoke_admin: "отозваны права администратора"
             grant_moderation: "выданы права модератора"
@@ -2941,6 +3138,11 @@ ru:
             change_readonly_mode: "изменение режима \"только для чтения\""
             backup_download: "скачать резервную копию"
             backup_destroy: "удалить резервную копию"
+            reviewed_post: "просмотренное сообщение"
+            custom_staff: "действия в плагинах"
+            post_locked: "сообщение заблокировано"
+            post_unlocked: "сообщение разблокировано"
+            check_personal_message: "проверить личное сообщение"
         screened_emails:
           title: "Почтовые адреса"
           description: "Когда кто-то создаёт новую учётную запись, проверяется данный почтовый адрес и регистрация блокируется или производятся другие дополнительные действия."
@@ -2971,11 +3173,49 @@ ru:
           roll_up:
             text: "Группировка"
             title: "Создание новой записи бана целой подсети если уже имеется хотя бы 'min_ban_entries_for_roll_up' записей отдельных IP адресов."
+        search_logs:
+          title: "Логи поиска"
+          term: "Правило"
+          searches: "Поиски"
+          click_through: "Пролистать"
+          unique: "Уникальный"
+          unique_title: "уникальные пользователи, выполняющие поиск"
+          types:
+            all_search_types: "Все типы поиска"
+            header: "Шапка"
+            full_page: "Полная страница"
+            click_through_only: "Все (только листинг)"
+          header_search_results: "Результаты поиска по заголовкам"
         logster:
           title: "Журнал ошибок"
       watched_words:
+        title: "Отслеживаемые слова"
+        search: "поиск"
+        clear_filter: "Очистить"
+        show_words: "показать слова"
+        word_count:
+          few: '%{count}слова'
+          many: '%{count}слов'
+          one: 1 слово
+          other: '%{count}слов'
+        actions:
+          block: 'Заблокировать'
+          censor: 'Цензура'
+          require_approval: 'Требующие одобрения'
+          flag: 'Жалоба'
+        action_descriptions:
+          block: 'Запретить публикацию сообщений, содержащих эти слова. Пользователь увидит сообщение об ошибке при попытке отправить свое сообщение.'
+          censor: 'Разрешить сообщения, содержащие эти слова, но заменять их символами, которые скрывают цензурные выражения.'
+          require_approval: 'Комментарии, содержащие эти слова, будут требовать одобрения персонала, прежде чем их можно будет увидеть.'
+          flag: 'Разрешить сообщения, содержащие эти слова, но помечать их как неприемлемые, чтобы модераторы могли их оценивать.'
         form:
+          label: 'Новое слово:'
+          placeholder: 'слово целиком, звездочка (*) используется как знак подстановки '
           placeholder_regexp: "Регулярное выражение"
+          add: 'Добавить'
+          success: 'Успех'
+          upload: "Загрузить"
+          upload_successful: "Загрузка прошла успешна. Слова добавлены."
       impersonate:
         title: "Войти от имени пользователя"
         help: "Используйте этот инструмент, чтобы войти от имени пользователя. Может быть полезно для отладки. После этого необходимо выйти и зайти под своей учетной записью снова."
@@ -2995,18 +3235,19 @@ ru:
           pending: "Ожидает одобрения"
           staff: 'Персонал'
           suspended: 'Замороженные'
+          silenced: 'Отключенный'
           suspect: 'Подозрительные'
         approved: "Подтвердить?"
         approved_selected:
-          one: "подтвердить пользователя"
-          few: "подтвердить пользователей ({{count}})"
-          many: "одобрить пользователей ({{count}})"
-          other: "одобрить пользователей ({{count}})"
+          few: подтвердить пользователей ({{count}})
+          many: одобрить пользователей ({{count}})
+          one: подтвердить пользователя
+          other: одобрить пользователей ({{count}})
         reject_selected:
-          one: "отклонить пользователя"
-          few: "отклонить пользователей ({{count}})"
-          many: "отклонить пользователей ({{count}})"
-          other: "отклонить пользователей ({{count}})"
+          few: отклонить пользователей ({{count}})
+          many: отклонить пользователей ({{count}})
+          one: отклонить пользователя
+          other: отклонить пользователей ({{count}})
         titles:
           active: 'Активные пользователи'
           new: 'Новые пользователи'
@@ -3019,18 +3260,19 @@ ru:
           staff: "Персонал"
           admins: 'Администраторы'
           moderators: 'Модераторы'
+          silenced: 'Отключенные пользователи'
           suspended: 'Замороженные пользователи'
           suspect: 'Подозрительные пользователи'
         reject_successful:
-          one: "Успешно отклонён %{count} пользователь."
-          few: "Успешно отклонены %{count} пользователя."
-          many: "Успешно отклонены %{count} пользователей."
-          other: "Успешно отклонены %{count} пользователей."
+          few: Успешно отклонены %{count} пользователя.
+          many: Успешно отклонены %{count} пользователей.
+          one: Успешно отклонён %{count} пользователь.
+          other: Успешно отклонены %{count} пользователей.
         reject_failures:
-          one: "Не удалось отклонить %{count} пользователя."
-          few: "Не удалось отклонить %{count} пользователей."
-          many: "Не удалось отклонить %{count} пользователей."
-          other: "Не удалось отклонить %{count} пользователей."
+          few: Не удалось отклонить %{count} пользователей.
+          many: Не удалось отклонить %{count} пользователей.
+          one: Не удалось отклонить %{count} пользователя.
+          other: Не удалось отклонить %{count} пользователей.
         not_verified: "Не проверенные"
         check_email:
           title: "Открыть e-mail этого пользователя"
@@ -3040,11 +3282,31 @@ ru:
         unsuspend_failed: "Ошибка разморозки пользователя {{error}}"
         suspend_duration: "На сколько времени заморозить пользователя?"
         suspend_reason_label: "Причина заморозки? Данный текст <b>будет виден всем</b> на странице профиля пользователя и будет отображаться, когда пользователь пытается войти. Введите краткое описание."
+        suspend_reason_hidden_label: "Почему вы приостанавливаете пользователя? Этот текст будет показан пользователю, когда он попытается войти в систему. Будьте краткими."
         suspend_reason: "Причина"
+        suspend_reason_placeholder: "Причина приостановки"
+        suspend_message: "Сообщение почты"
+        suspend_message_placeholder: "При желании, предоставьте дополнительную информацию о приостановке, и она будет отправлена пользователю по электронной почте."
         suspended_by: "Заморожен (кем)"
+        silence_reason: "Причина"
+        silenced_by: "Отключен пользователем "
+        silence_modal_title: "Отключенный пользователь"
+        silence_duration: "Как долго пользователь будет отключен?"
+        silence_reason_label: "Почему вы собираетесь отключить пользователя?"
+        silence_reason_placeholder: "Причина отключения"
+        silence_message: "Сообщение почты"
+        silence_message_placeholder: "(оставьте незаполненным, чтобы отправить дефолтное сообщение)"
+        suspended_until: "(пока не будет %{until})"
         cant_suspend: "Этого пользователя нельзя заморозить."
         delete_all_posts: "Удалить все сообщения"
+        penalty_post_actions: "Что нужно сделать со связанным сообщением?"
+        penalty_post_delete: "Удалить сообщение"
+        penalty_post_edit: "Редактировать сообщение"
+        penalty_post_none: "Ничего не делать"
         delete_all_posts_confirm_MF: "Вы собираетесь удалить {POSTS, plural, one {1 сообщение} other {# сообщений}} и {TOPICS, plural, one {1 тему} other {# тем}}. Вы уверены?"
+        silence: "Отключить"
+        unsilence: "Подключить"
+        silenced: "Отключен?"
         moderator: "Модератор?"
         admin: "Администратор?"
         suspended: "Заморожен?"
@@ -3065,6 +3327,9 @@ ru:
         grant_moderation: 'Выдать права Модератора'
         unsuspend: 'Разморозить'
         suspend: 'Заморозить'
+        show_flags_received: "Показать полученные флаги"
+        flags_received_by: "Флаги, полученные %{username}"
+        flags_received_none: "Этот пользователь не получил никаких флагов."
         reputation: Репутация
         permissions: Права
         activity: Активность
@@ -3073,6 +3338,7 @@ ru:
         private_topics_count: Частные темы
         posts_read_count: Прочитано сообщений
         post_count: Создано сообщений
+        second_factor_enabled: Двухфакторная аутентификация включена
         topics_entered: Просмотрено тем
         flags_given_count: Отправлено жалоб
         flags_received_count: Получено жалоб
@@ -3091,20 +3357,20 @@ ru:
         delete_forbidden_because_staff: "Администраторы и модераторы не могут быть удалены"
         delete_posts_forbidden_because_staff: "Нельзя удалить все сообщения администраторов и модераторов."
         delete_forbidden:
-          one: "Пользователи не могут быть удалены, если у них есть сообщения. Перед удалением пользователя удалите все его сообщения. (Сообщения старше %{count} дня не могут быть удалены.)"
-          few: "Пользователи не могут быть удалены, если у них есть сообщения. Перед удалением пользователя удалите все его сообщения. (Сообщения старше %{count} дней не могут быть удалены.)"
-          many: "Пользователи не могут быть удалены, если у них есть сообщения. Перед удалением пользователя удалите все его сообщения. (Сообщения старше %{count} дней не могут быть удалены.)"
-          other: "Пользователи не могут быть удалены, если у них есть сообщения. Перед удалением пользователя удалите все его сообщения. (Сообщения старше %{count} дней не могут быть удалены.)"
+          few: Пользователи не могут быть удалены, если у них есть сообщения. Перед удалением пользователя удалите все его сообщения. (Сообщения старше %{count} дней не могут быть удалены.)
+          many: Пользователи не могут быть удалены, если у них есть сообщения. Перед удалением пользователя удалите все его сообщения. (Сообщения старше %{count} дней не могут быть удалены.)
+          one: Пользователи не могут быть удалены, если у них есть сообщения. Перед удалением пользователя удалите все его сообщения. (Сообщения старше %{count} дня не могут быть удалены.)
+          other: Пользователи не могут быть удалены, если у них есть сообщения. Перед удалением пользователя удалите все его сообщения. (Сообщения старше %{count} дней не могут быть удалены.)
         cant_delete_all_posts:
-          one: "Не удаётся удалить все сообщения. Некоторые сообщения старше %{count} дня. (Настройка delete_user_max_post_age.)"
-          few: "Не удаётся удалить все сообщения. Некоторые сообщения старше %{count} дней. (Настройка delete_user_max_post_age.)"
-          many: "Не удаётся удалить все сообщения. Некоторые сообщения старше %{count} дней. (Настройка delete_user_max_post_age.)"
-          other: "Не удаётся удалить все сообщения. Некоторые сообщения старше %{count} дней. (Настройка delete_user_max_post_age.)"
+          few: Не удаётся удалить все сообщения. Некоторые сообщения старше %{count} дней. (Настройка delete_user_max_post_age.)
+          many: Не удаётся удалить все сообщения. Некоторые сообщения старше %{count} дней. (Настройка delete_user_max_post_age.)
+          one: Не удаётся удалить все сообщения. Некоторые сообщения старше %{count} дня. (Настройка delete_user_max_post_age.)
+          other: Не удаётся удалить все сообщения. Некоторые сообщения старше %{count} дней. (Настройка delete_user_max_post_age.)
         cant_delete_all_too_many_posts:
-          one: "Не удаётся удалить все сообщения, потому что у пользователя более %{count} сообщения.  (Настройка delete_all_posts_max.)"
-          few: "Не удаётся удалить все сообщения, потому что у пользователя более %{count} сообщений.  (Настройка delete_all_posts_max.)"
-          many: "Не удаётся удалить все сообщения, потому что у пользователя более %{count} сообщений.  (Настройка delete_all_posts_max.)"
-          other: "Не удаётся удалить все сообщения, потому что у пользователя более %{count} сообщений.  (Настройка delete_all_posts_max.)"
+          few: Не удаётся удалить все сообщения, потому что у пользователя более %{count} сообщений.  (Настройка delete_all_posts_max.)
+          many: Не удаётся удалить все сообщения, потому что у пользователя более %{count} сообщений.  (Настройка delete_all_posts_max.)
+          one: Не удаётся удалить все сообщения, потому что у пользователя более %{count} сообщения.  (Настройка delete_all_posts_max.)
+          other: Не удаётся удалить все сообщения, потому что у пользователя более %{count} сообщений.  (Настройка delete_all_posts_max.)
         delete_confirm: "Вы УВЕРЕНЫ, что хотите удалить этого пользователя? Это действие необратимо!"
         delete_and_block: "Удалить и <b>заблокировать</b> этот e-mail и IP адрес"
         delete_dont_block: "Только удалить"
@@ -3117,12 +3383,18 @@ ru:
         activate_failed: "Во время активации пользователя произошла ошибка."
         deactivate_account: "Деактивировать"
         deactivate_failed: "Во время деактивации пользователя произошла ошибка."
+        unsilence_failed: 'При подключении этого пользователя произошла ошибка.'
+        silence_failed: 'При отключении этого пользователя произошла ошибка.'
+        silence_confirm: 'Вы уверены, что хотите отключить этого пользователя? Он не сможет создавать новые темы или сообщения.'
+        silence_accept: 'Да, отключить этого пользователя'
         bounce_score: "Возвратов Писем"
         reset_bounce_score:
           label: "Сбросить"
           title: "сбросить карму к 0"
+        visit_profile: "Посетите<a href='%{url}'>страницу настроек этого пользователя </a>, чтобы отредактировать его профиль"
         deactivate_explanation: "Дезактивированные пользователи должны заново подтвердить свой e-mail."
         suspended_explanation: "Замороженный пользователь не может войти (авторизоваться)."
+        silence_explanation: "Отключенный пользователь не может публиковать или отвечать на темы."
         staged_explanation: "Имитированный пользователь может отправлять сообщения только по эл.почте в определённые темы."
         bounce_score_explanation:
           none: "Нет возвратов полученных недавно от этой эл.почты."
@@ -3139,10 +3411,10 @@ ru:
         tl3_requirements:
           title: "Требования для 3 уровня доверия"
           table_title:
-            one: "За последний день:"
-            few: "За последние %{count} дней:"
-            many: "За последние %{count} дней:"
-            other: "За последние %{count} дней:"
+            few: 'За последние %{count} дней:'
+            many: 'За последние %{count} дней:'
+            one: 'За последний день:'
+            other: 'За последние %{count} дней:'
           value_heading: "Значение"
           requirement_heading: "Требование"
           visits: "Посещений"
@@ -3217,10 +3489,7 @@ ru:
         recommended: "Мы рекомендуем изменить следующий текст под ваши нужды:"
         show_overriden: 'Показывать только изменённые'
       site_settings:
-        show_overriden: 'Показывать только измененные'
         title: 'Настройки'
-        reset: 'Вернуть по умолчанию'
-        none: '(нет)'
         no_results: "Ничего не найдено."
         clear_filter: "Очистить"
         add_url: "Добавить URL"
@@ -3270,17 +3539,17 @@ ru:
         reason_help: (Ссылка на сообщение или тему)
         save: Сохранить
         delete: Удалить
-        delete_confirm: Вы уверены, что хотите удалить эту награду?
+        delete_confirm: "Вы уверены, что хотите удалить эту награду?"
         revoke: Отозвать
         reason: Причина
         expand: Развернуть &hellip;
-        revoke_confirm: Вы уверены, что хотите отозвать эту награду?
+        revoke_confirm: "Вы уверены, что хотите отозвать эту награду?"
         edit_badges: Редактировать награды
         grant_badge: Выдать награду
         granted_badges: Выданные награды
         grant: Выдать
         no_user_badges: "У %{name} нет ни одной награды."
-        no_badges: Нет наград, которые можно было бы выдать.
+        no_badges: "Нет наград, которые можно было бы выдать."
         none_selected: "Выберите награду в списке слева"
         allow_title: Разрешить использовать название награды в качестве титула
         multiple_grant: Может быть предоставлен несколько раз
@@ -3288,11 +3557,10 @@ ru:
         enabled: Активировать использование награды
         icon: Иконка
         image: Картинка
-        icon_help: "Используйте класс шрифта Font Awesome или ссылку на картинку"
         query: Выборка награды (SQL)
         target_posts: Выборка целевых сообщений
         auto_revoke: Запускать запрос на отзыв ежедневно
-        show_posts: Показывать сообщение, на основе которого была выдана награда, на странице наград
+        show_posts: "Показывать сообщение, на основе которого была выдана награда, на странице наград"
         trigger: Запуск
         trigger_type:
           none: "Обновлять ежедневно"
@@ -3312,16 +3580,16 @@ ru:
             text: "Обнаружены несуществующие примеры выдачи наград. Это может произойти, когда запрос возвращает несуществующие идентификаторы ID пользователей или сообщений. Это может привести к неожиданным проблемам со временем, поэтому внимательно проверьте ваш запрос."
           no_grant_count: "Нет наград для выдачи."
           grant_count:
-            one: "Будет выдана <b>%{count}</b> награда."
-            few: "<b>%{count}</b> наград будут выданы."
-            many: "<b>%{count}</b> наград будут выданы."
-            other: "<b>%{count}</b> наград будут выданы."
+            few: <b>%{count}</b> наград будут выданы.
+            many: <b>%{count}</b> наград будут выданы.
+            one: Будет выдана <b>%{count}</b> награда.
+            other: <b>%{count}</b> наград будут выданы.
           sample: "Пример:"
           grant:
-            with: <span class="username">%{username}</span>
-            with_post: <span class="username">%{username}</span> за сообщение в %{link}
-            with_post_time: <span class="username">%{username}</span> за сообщение в %{link} в <span class="time">%{time}</span>
-            with_time: <span class="username">%{username}</span> в <span class="time">%{time}</span>
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span> за сообщение в %{link}"
+            with_post_time: "<span class=\"username\">%{username}</span> за сообщение в %{link} в <span class=\"time\">%{time}</span>"
+            with_time: "<span class=\"username\">%{username}</span> в <span class=\"time\">%{time}</span>"
       emoji:
         title: "Иконки"
         help: "Добавить новые смайлики-emoji, которые будут доступны всем. (Подсказка: можно перетаскивать несколько файлов за раз)"
@@ -3335,6 +3603,7 @@ ru:
         sample: "Используйте следующий HTML-код на своём сайте, для возможности создания связанных тем. Замените <b>REPLACE_ME</b> канонической ссылкой страницы, куда производится встраивание."
         title: "Встраивание"
         host: "Разрешённые Хосты"
+        class_name: "Имя класса"
         path_whitelist: "Разрешённый Путь"
         edit: "изменить"
         category: "Опубликовать в разделе"
@@ -3354,6 +3623,7 @@ ru:
         embed_classname_whitelist: "Разрешённые CSS-классы"
         feed_polling_enabled: "Импорт сообщений через RSS/ATOM"
         feed_polling_url: "Ссылка на RSS/ATOM"
+        feed_polling_frequency_mins: "Частота опроса ленты (в минутах)"
         save: "Сохранить настройки встраивания"
       permalink:
         title: "Постоянные ссылки"
@@ -3365,7 +3635,7 @@ ru:
         category_id: "Номер раздела"
         category_title: "Раздел"
         external_url: "Внешняя ссылка"
-        delete_confirm: Удалить эту постоянную ссылку?
+        delete_confirm: "Удалить эту постоянную ссылку?"
         form:
           label: "Новая постоянная ссылка:"
           add: "Добавить"
@@ -3379,6 +3649,11 @@ ru:
       upload: "Загрузить"
       uploading: "Загрузка..."
       quit: "Может быть позже"
+      staff_count:
+        few: В вашем сообществе %{count} сотрудника, включая вас.
+        many: В вашем сообществе %{count} сотрудников, включая вас.
+        one: В вашем сообществе 1 сотрудник (это вы).
+        other: В вашем сообществе %{count} сотрудников, включая вас.
       invites:
         add_user: "добавить"
         none_added: "Вы ещё не пригласили сотрудников. Вы уверены, что хотите продолжить?"
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index b8525ef9645..960e214035c 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -16,8 +16,9 @@ sk:
           format: '%n %u'
           units:
             byte:
-              one: bajt
               few: bajtov
+              many: bajtov
+              one: bajt
               other: bajtov
             gb: GB
             kb: KB
@@ -44,79 +45,106 @@ sk:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: "< 1s"
-          few: "< %{count}s"
-          other: "< %{count}s"
+          few: < %{count}s
+          many: < %{count}s
+          one: < 1s
+          other: < %{count}s
         x_seconds:
-          one: "1s"
-          few: "1s"
-          other: "%{count}s"
+          few: 1s
+          many: '%{count}s'
+          one: 1s
+          other: '%{count}s'
+        less_than_x_minutes:
+          few: < 1m
+          many: < %{count}m
+          one: < 1m
+          other: < %{count}m
         x_minutes:
-          one: "1m"
-          few: "%{count}m"
-          other: "%{count}m"
+          few: '%{count}m'
+          many: '%{count}m'
+          one: 1m
+          other: '%{count}m'
         about_x_hours:
-          one: "1h"
-          few: "%{count}h"
-          other: "%{count}h"
+          few: '%{count}h'
+          many: '%{count}h'
+          one: 1h
+          other: '%{count}h'
         x_days:
-          one: "1d"
-          few: "%{count}d"
-          other: "%{count}d"
+          few: '%{count}d'
+          many: '%{count}d'
+          one: 1d
+          other: '%{count}d'
+        x_months:
+          few: '%{count} mesiace'
+          many: '%{count} mesiace'
+          one: '%{count} mesiac'
+          other: '%{count} mesiace'
         about_x_years:
-          one: "1r"
-          few: "%{count}r"
-          other: "%{count}r"
+          few: '%{count}r'
+          many: '%{count}r'
+          one: 1r
+          other: '%{count}r'
         over_x_years:
-          one: "> 1r"
-          few: "> %{count}r"
-          other: "> %{count}r"
+          few: '> %{count}r'
+          many: '> %{count}r'
+          one: '> 1r'
+          other: '> %{count}r'
         almost_x_years:
-          one: "1r"
-          few: "%{count}r"
-          other: "%{count}r"
+          few: '%{count}r'
+          many: '%{count}r'
+          one: 1r
+          other: '%{count}r'
         date_month: "MMM D"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: "1 minúta"
-          few: "%{count} minúty"
-          other: "%{count} minút"
+          few: '%{count} minúty'
+          many: '%{count} minút'
+          one: 1 minúta
+          other: '%{count} minút'
         x_hours:
-          one: "1 hodina"
-          few: "%{count} hodiny"
-          other: "%{count} hodín"
+          few: '%{count} hodiny'
+          many: '%{count} hodín'
+          one: 1 hodina
+          other: '%{count} hodín'
         x_days:
-          one: "1 deň"
-          few: "%{count} dni"
-          other: "%{count} dní"
+          few: '%{count} dni'
+          many: '%{count} dní'
+          one: 1 deň
+          other: '%{count} dní'
         date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
-          one: "pred 1 minútou"
-          few: "pred %{count} minútami"
-          other: "pred %{count} minútami"
+          few: pred %{count} minútami
+          many: pred %{count} minútami
+          one: pred 1 minútou
+          other: pred %{count} minútami
         x_hours:
-          one: "pred 1 hodinou"
-          few: "pred %{count} hodinami"
-          other: "pred %{count} hodinami"
+          few: pred %{count} hodinami
+          many: pred %{count} hodinami
+          one: pred 1 hodinou
+          other: pred %{count} hodinami
         x_days:
-          one: "pred 1 dňom"
-          few: "pred %{count} dňami"
-          other: "pred %{count} dňami"
+          few: pred %{count} dňami
+          many: pred %{count} dňami
+          one: pred 1 dňom
+          other: pred %{count} dňami
       later:
         x_days:
-          one: "1 deň neskôr"
-          few: "%{count} dni neskôr"
-          other: "%{count} dní neskôr"
+          few: '%{count} dni neskôr'
+          many: '%{count} dní neskôr'
+          one: 1 deň neskôr
+          other: '%{count} dní neskôr'
         x_months:
-          one: "1 mesiac neskôr"
-          few: "%{count} mesiace neskôr"
-          other: "%{count} mesiacov neskôr"
+          few: '%{count} mesiace neskôr'
+          many: '%{count} mesiacov neskôr'
+          one: 1 mesiac neskôr
+          other: '%{count} mesiacov neskôr'
         x_years:
-          one: "1 rok neskôr"
-          few: "%{count} roky neskôr"
-          other: "%{count} rokov neskôr"
+          few: '%{count} roky neskôr'
+          many: '%{count} rokov neskôr'
+          one: 1 rok neskôr
+          other: '%{count} rokov neskôr'
       previous_month: 'Predchádzajúci mesiac'
       next_month: 'Nasledujúci mesiac'
       placeholder: Dátum
@@ -130,10 +158,10 @@ sk:
       email: 'pošli odkaz emailom'
     action_codes:
       public_topic: "téma je verejná%{when}"
-      private_topic: "téma je súkromná  %{when}"
       split_topic: "rozdeľ tému %{when}"
       invited_user: "pozvaný %{who} %{when}"
       invited_group: "pozvaný %{who} %{when}"
+      user_left: "%{who}ktorí sa odobrali z tejto správy %{when}"
       removed_user: "odstránený %{who} %{when}"
       removed_group: "odstránený %{who} %{when}"
       autoclosed:
@@ -158,19 +186,22 @@ sk:
         enabled: 'Téma je odteraz baner %{when} Bude sa zobrazovať navrchu každej stránky, pokiaľ ju používateľ nezavrie.'
     topic_admin_menu: "akcie administrátora témy"
     emails_are_disabled: "Odosielanie emailov bolo globálne vypnuté administrátorom. Žiadne emailové notifikácie nebudú odoslané."
-    bootstrap_mode_enabled: "Pre zjednodušenie spustenia Vašej novej stránky sa nachádzate v zavádzacom režime. Všetci noví používatelia budú mať pridelený stupeň dôvery 1 a budú mať zapnutý denný emailový výber aktualít. Toto bude automaticky vypnuté keď celkový počet používateľov presiahne %{min_users}."
-    bootstrap_mode_disabled: "Zavádzací režim bude zrušený v priebehu nasledujúcich 24 hodín."
+    themes:
+      default_description: "Predvolené"
     s3:
       regions:
         ap_northeast_1: "Ázia Tichomorie (Tokio)"
         ap_northeast_2: "Asia Pacific (Soul)"
+        ap_south_1: "Asia Pacific (Mumbai)"
         ap_southeast_1: "Ázia Tichomorie (Singapur)"
         ap_southeast_2: "Ázia Tichomorie (Sydney)"
         cn_north_1: "Čína (Peking)"
         eu_central_1: "EU (Frankfurt)"
         eu_west_1: "EU (Írsko)"
+        eu_west_2: "EU (Londýn)"
         sa_east_1: "Južná Amerika (Sao Paulo)"
         us_east_1: "USA Východ (S. Virginia)"
+        us_east_2: "USA Východ (Ohio)"
         us_gov_west_1: "AWS GovCloud (USA)"
         us_west_1: "USA Západ (S. Kalifornia)"
         us_west_2: "USA Západ (Oregon)"
@@ -178,6 +209,7 @@ sk:
     not_implemented: "Ľutujeme, táto funkcia ešte nie je implementovaná."
     no_value: "Nie"
     yes_value: "Áno"
+    submit: "Odoslať"
     generic_error: "Ľutujeme, nastala chyba."
     generic_error_with_reason: "Nastala chyba: %{error}"
     sign_up: "Registrácia"
@@ -190,9 +222,10 @@ sk:
     show_help: "možnosti"
     links: "Odkazy"
     links_lowercase:
-      one: "odkaz"
-      few: "odkazy"
-      other: "odkazy"
+      few: odkazy
+      many: odkazy
+      one: odkaz
+      other: odkazy
     faq: "Časté otázky"
     guidelines: "Pokyny"
     privacy_policy: "Ochrana súkromia"
@@ -216,9 +249,10 @@ sk:
     max_of_count: "najviac {{count}}"
     alternation: "alebo"
     character_count:
-      one: "1 znak"
-      few: "{{count}} znakov"
-      other: "{{count}} znakov"
+      few: '{{count}} znakov'
+      many: '{{count}} znakov'
+      one: 1 znak
+      other: '{{count}} znakov'
     suggested_topics:
       title: "Odporúčané témy"
       pm_title: "Odporúčané správy"
@@ -230,8 +264,6 @@ sk:
       our_moderators: "Naši moderátori"
       stat:
         all_time: "Za celú dobu"
-        last_7_days: "Posledných 7 dní"
-        last_30_days: "Posledných 30 dní"
       like_count: "Páči sa mi"
       topic_count: "Témy"
       post_count: "Príspevky"
@@ -252,19 +284,6 @@ sk:
       last_read: "toto je posledný prečítaný príspevok, kliknite pre pridanie záložky"
       remove: "Odstrániť záložku"
       confirm_clear: "Ste si istý že chcete odstrániť všetky záložky z tejto témy?"
-    topic_count_latest:
-      one: "1 nová alebo upravená téma."
-      few: "{{count}} nové alebo upravené témy."
-      other: "{{count}} nových alebo upravených tém."
-    topic_count_unread:
-      one: "1 neprečítaná téma."
-      few: "{{count}} neprečítané témy."
-      other: "{{count}} neprečítaných tém."
-    topic_count_new:
-      one: "1 nová téma."
-      few: "{{count}} nové témy."
-      other: "{{count}} nových tém."
-    click_to_show: "Kliknite pre zobrazenie."
     preview: "náhľad"
     cancel: "zrušiť"
     save: "Uložiť zmeny"
@@ -274,8 +293,10 @@ sk:
     uploading: "Upload prebieha..."
     uploading_filename: "Nahrávám {{filename}}..."
     uploaded: "Upload úspešne dokončený."
+    pasting: "Vkladám..."
     enable: "Zapnúť"
     disable: "Vypnúť"
+    continue: "Pokračovať"
     undo: "Späť"
     revert: "Vrátiť zmeny"
     failed: "Nepodarilo sa"
@@ -300,18 +321,20 @@ sk:
       cancel: "Zrušiť"
       view_pending: "zobraziť príspevky čakajúce na schválenie"
       has_pending_posts:
-        one: "Téma má <b>{{count}}</b> príspevkov čakajúci na schválenie"
-        few: "Téma má <b>{{count}}</b> príspevky čakajúce na schválenie"
-        other: "Téma má <b>{{count}}</b> príspevkov čakajúcich na schválenie"
+        few: Téma má <b>{{count}}</b> príspevky čakajúce na schválenie
+        many: Téma má <b>{{count}}</b> príspevkov čakajúcich na schválenie
+        one: Téma má <b>{{count}}</b> príspevkov čakajúci na schválenie
+        other: Téma má <b>{{count}}</b> príspevkov čakajúcich na schválenie
       confirm: "Uložiť zmeny"
       delete_prompt: "Táto akcia zmaže všetky príspevky, zablokuje e-mail a IP adresu používateľa <b>%{username}</b>. Ste si istý, že chcete zmazať tohto používateľa? "
       approval:
         title: "Príspevok vyžaduje schválenie"
         description: "Váš príspevok sme obdžali, ale skôr než bude zverejnený musí byť schválený moderátorom. Prosíme o trpezlivosť."
         pending_posts:
-          one: "Máte <strong>1</strong> neprečítaný príspevok."
-          few: "Máte <strong>{{count}}</strong> neprečítané príspevky."
-          other: "Máte <strong>{{count}}</strong> neprečítaných príspevkov."
+          few: Máte <strong>{{count}}</strong> neprečítané príspevky.
+          many: Máte <strong>{{count}}</strong> neprečítaných príspevkov.
+          one: Máte <strong>1</strong> neprečítaný príspevok.
+          other: Máte <strong>{{count}}</strong> neprečítaných príspevkov.
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> založil <a href='{{topicUrl}}'>tému</a>"
@@ -345,9 +368,10 @@ sk:
       posts_read: "Prečítané"
       posts_read_long: "Prečítaných príspevkov"
       total_rows:
-        one: "1 používateľ"
-        few: "%{count} používatelia"
-        other: "%{count} používateľov"
+        few: '%{count} používatelia'
+        many: '%{count} používateľov'
+        one: 1 používateľ
+        other: '%{count} používateľov'
     group_histories:
       actions:
         change_group_setting: "Zmeniť nastavenia skupiny"
@@ -356,45 +380,95 @@ sk:
         make_user_group_owner: "Nastaviť ako vlastníka"
         remove_user_as_group_owner: "Odobrať vlastníka"
     groups:
-      logs:
-        title: "Záznamy"
-        when: "Kedy"
-        action: "Akcia"
-        target_user: "Cieľový používateľ"
-        subject: "Predmet"
-        details: "Detaily"
-        from: "Od"
-        to: "Komu"
-      edit:
-        title: 'Upraviť skupinu'
+      manage:
+        title: 'Spravovať'
+        name: 'Názov'
         full_name: 'Celé meno'
         add_members: "Pridať používateľov"
+        delete_member_confirm: "Odstrániť '%{username}' zo skupiny '%{group}'?"
+        profile:
+          title: Profil
+        logs:
+          title: "Záznamy"
+          when: "Kedy"
+          action: "Akcia"
+          target_user: "Cieľový používateľ"
+          subject: "Predmet"
+          details: "Detaily"
+          from: "Od"
+          to: "Komu"
+      public_admission: "Povoliť používateľom slobodne sa stať člen skupiny (kupina musí byť verejne viditeľná)"
+      public_exit: "Povoliť používateľom slobodne opustiť skupinu."
+      empty:
+        posts: "Nie sú tu žiadne príspevky od členov tejto skupiny"
+        members: "V tejto skupine niesú žiadny členovia"
+        mentions: "O tejto skupine nie sp žiadne zmienky."
+        messages: "Pre túto skupinu niesú žiadne správy"
+        topics: "Členovia tejto skupiny nezaložili žiadne témy."
+        logs: "Pre túto skupinu neexistujú žiadne logy."
       add: "Pridať"
-      closed_group: Uzavretá skupina
+      join: "Pridať sa"
+      leave: "Opustiť"
+      request: "Požiadavka"
+      message: "Správa"
+      allow_membership_requests: "Používatelia môžu posielať žiadosti o členstvo vlastníkom skupiny"
+      membership_request:
+        submit: "Odošli požiadavku"
+        title: "Požiadavka o členstvo v %{group_name}"
+        reason: "Dajte vedieť vlastníkom skupiny prečo do tejto skupiny patríte"
       membership: "Členstvo"
       name: "Meno"
-      user_count: "Počet členov"
+      group_name: "Názov skupiny"
+      user_count: "Používatelia"
       bio: "O skupine"
-      selector_placeholder: "Pridať členov"
+      selector_placeholder: "zadať používateľské meno"
       owner: "vlastník"
       index:
         title: "Skupiny"
+        all: "Všetky skupiny"
         empty: "Nenašli sa viditeľné skupiny."
+        owner_groups: "Skupiny, ktorých som vlastníkom"
+        close_groups: "Uzavreté skupina"
+        automatic_groups: "Automatické skupiny"
+        automatic: "Automaticky"
+        closed: "Zatvorené"
+        public: "Verejné"
+        private: "Súkromné"
+        public_groups: "Verejné skupiny"
+        automatic_group: Automatická skúpina
+        close_group: Uzavrieť skupinu
+        my_groups: "Moje skupiny"
+        group_type: "Typ skupiny"
+        is_group_user: "Člen"
+        is_group_owner: "Vlastník"
+      title:
+        few: Skupiny
+        many: Skupiny
+        one: Skupina
+        other: Skupiny
       activity: "Aktivita"
-      members: "Členovia"
+      members:
+        title: "Členovia"
+        filter_placeholder_admin: "používateľské meno alebo email"
+        filter_placeholder: "používateľské meno"
+        remove_member: "Odstrániť člena"
+        remove_member_description: "Odstrániť <b>%{username}</b> z tejto skupiny"
+        make_owner: "Nastaviť ako vlastníka"
+        make_owner_description: "Nastaviť <b>%{username}</b> ako vlastníka tejto skupiny"
+        remove_owner: "Odobrať ako vlastníka"
+        remove_owner_description: "Odobrať <b>%{username}</b> ako vlastníka tejto skupiny"
+        owner: "Vlastník"
       topics: "Témy"
       posts: "Príspevky"
       mentions: "Zmienky"
       messages: "Správy"
       alias_levels:
+        messageable: "Kto môže poslať správu tejto skupine?"
         nobody: "Nikto"
         only_admins: "Iba administrátori"
         mods_and_admins: "Iba moderátori a administrátori"
         members_mods_and_admins: "Iba členovia skupiny, moderátori a administrátori"
         everyone: "Každý"
-      trust_levels:
-        title: "Stupeň dôvery automaticky udelený členom po ich pridaní:"
-        none: "Žiadny"
       notifications:
         watching:
           title: "Sledovať"
@@ -411,22 +485,23 @@ sk:
         muted:
           title: "Ignorované"
           description: "Nikdy nebudete upozornení na nič ohľadom nových tém v tejto skupine."
+      flair_preview_icon: "Ikona náhľadu"
+      flair_preview_image: "Náhľad obrázku"
     user_action_groups:
-      '1': "Rozdaných 'páči sa mi'"
-      '2': "Obdržaných 'páči sa mi'"
-      '3': "Záložky"
-      '4': "Témy"
-      '5': "Odpovede"
-      '6': "Odozvy"
-      '7': "Zmienky"
-      '9': "Citácie"
-      '11': "Úpravy"
-      '12': "Odoslané správy"
-      '13': "Prijaté správy"
-      '14': "Čakajúce správy"
+      "1": "Rozdaných 'páči sa mi'"
+      "2": "Obdržaných 'páči sa mi'"
+      "3": "Záložky"
+      "4": "Témy"
+      "5": "Odpovede"
+      "6": "Odozvy"
+      "7": "Zmienky"
+      "9": "Citácie"
+      "11": "Úpravy"
+      "12": "Odoslané správy"
+      "13": "Prijaté správy"
+      "14": "Čakajúce správy"
     categories:
       all: "všetky kategórie"
-      all_subcategories: "všetky"
       no_subcategory: "žiadne"
       category: "Kategória"
       category_list: "Zobraziť zoznam kategórií"
@@ -445,13 +520,15 @@ sk:
       toggle_ordering: "zmeniť radenie"
       subcategories: "Podkategórie"
       topic_sentence:
-        one: "1 téma"
-        few: "%{count} témy"
-        other: "%{count} tém"
+        few: '%{count} témy'
+        many: '%{count} tém'
+        one: 1 téma
+        other: '%{count} tém'
       topic_stat_sentence:
-        one: "%{count} nová téma za posledných %{unit}."
-        few: "%{count} nové témy za posledných %{unit}."
-        other: "%{count} nových tém za posledných %{unit}."
+        few: '%{count} nové témy za posledných %{unit}.'
+        many: '%{count} nových tém za posledných %{unit}.'
+        one: '%{count} nová téma za posledných %{unit}.'
+        other: '%{count} nových tém za posledných %{unit}.'
     ip_lookup:
       title: Vyhľadávanie podľa IP adresy
       hostname: Hostname
@@ -475,6 +552,7 @@ sk:
       mute: "Ignorovať"
       edit: "Upraviť nastavenia"
       download_archive:
+        button_text: "Stiahnuť všetko"
         confirm: "Si si istý, že si chceš uložiť svoje príspevky na disk?"
         success: "Sťahovanie bolo spustené, o jeho ukončení budeš informovaný správou."
         rate_limit_error: "Príspevky možu byť stiahnuté len raz za deň. Skús opäť zajtra prosím."
@@ -491,7 +569,6 @@ sk:
       notifications: "Upozornenia"
       statistics: "Štatistiky"
       desktop_notifications:
-        label: "Upozornenia na pracovnej ploche"
         not_supported: "Ľutujeme, tento prehliadač nepodporuje upozornenia."
         perm_default: "Zapnúť upozornenia"
         perm_denied_btn: "Prístup zamietnutý"
@@ -499,10 +576,13 @@ sk:
         disable: "Zakázať upozornenia"
         enable: "Povoliť upozornenia"
         each_browser_note: "Poznámka: Toto nastavenie musíte zmeniť v každom používanom prehliadači."
+      dismiss: 'Zahodiť'
       dismiss_notifications: "Zahodiť všetko"
       dismiss_notifications_tooltip: "Označiť všetky neprečítané upozornenia ako prečítané"
+      first_notification: "Vaša prvé upozornenie! Vyberte ho ak chcete začať."
       disable_jump_reply: "Neskočiť na môj príspevok po odpovedi"
       dynamic_favicon: "Zobraziť počet nových/upravených tém na ikone prehliadača"
+      allow_private_messages: "Umožniť iným používateľom, aby mi posielali osobné správy"
       external_links_in_new_tab: "Otvárať všekty externé odkazy na novej karte"
       enable_quoting: "Umožniť odpoveď s citáciou z označeného textu"
       change: "zmeniť"
@@ -510,7 +590,9 @@ sk:
       admin: "{{user}} je administrátor"
       moderator_tooltip: "Tento používateľ je moderátor"
       admin_tooltip: "Tento používateľ je administrátor"
+      silenced_tooltip: "Tento používateľ je umlčaný"
       suspended_notice: "Tento  používateľ je suspendovaný do {{date}}"
+      suspended_permanently: "Tento používateľ je suspendovaný"
       suspended_reason: "Dôvod:"
       github_profile: "Github"
       email_activity_summary: "Zhrnutie aktivít"
@@ -521,6 +603,7 @@ sk:
           Toto nastavenie nahradí Zhrnutie aktivíť.<br />
           Stíšené témy a kategórie nie sú v týchto emailoch zahrnuté.
         individual: "Pošli email pri každom novom príspevku"
+        individual_no_echo: "Pošli email pri každom novom príspevku okrem vlastných."
         many_per_day: "Pošli mi email pri každom novom príspevku (cca {{dailyEmailEstimate}} denne)"
         few_per_day: "Pošli mi email pri každom novom príspevku (cca 2 denne)"
       tag_settings: "Štítky"
@@ -543,7 +626,6 @@ sk:
       delete_account: "Vymazať môj účet"
       delete_account_confirm: "Ste si istý, že chcete permanentne vymazať váš účet? Táto akcia je nenávratná."
       deleted_yourself: "Váš účet bol úspešne vymazaný."
-      delete_yourself_not_allowed: "Momentálne nie je možné vymazať váš učet. Kontaktujte administrátora a ten vám ho vymaže."
       unread_message_count: "Správy"
       admin_delete: "Vymazať"
       users: "Používatelia"
@@ -551,10 +633,13 @@ sk:
       muted_users_instructions: "Pozastaviť všetky notifikácie od týchto používateľov."
       muted_topics_link: "Zobraziť stíšené témy"
       watched_topics_link: "Zobraziť sledované témy"
+      tracked_topics_link: "Zobraziť sledované témy"
       apps: "Appky"
       revoke_access: "Odvolať prístup"
       undo_revoke_access: "Zrušiť odvolanie prístupu"
       api_approved: "Schválený:"
+      theme: "Téma"
+      staged: "Dočasný"
       staff_counters:
         flags_given: "nápomocné značky"
         flagged_posts: "označkované príspevky"
@@ -572,12 +657,29 @@ sk:
         move_to_archive: "Archív"
         failed_to_move: "Zlyhalo presunutie označených správ (možno je chyba vo vašom pripojení)"
         select_all: "Označ všetky"
+        tags: "Štítky"
+      preferences_nav:
+        account: "Účet"
+        profile: "Profil"
+        emails: "Emaily"
+        notifications: "Upozornenia"
+        categories: "Kategórie"
+        tags: "Štítky"
+        interface: "Rozhranie"
+        apps: "Aplikácie"
       change_password:
         success: "(email odoslaný)"
         in_progress: "(email sa odosiela)"
         error: "(chyba)"
         action: "Odoslať email na obnovenie hesla"
         set_password: "Nastaviť heslo"
+        choose_new: "Vyberte si nové heslo"
+        choose: "Vyberte si heslo"
+      second_factor:
+        title: "Dvojfaktorová autentifikácia"
+        disable: "Vypnúť dvojfaktorovú autentifikáciu"
+        label: "Kód"
+        show_key_description: "Vložiť ručne"
       change_about:
         title: "Upraviť O mne"
         error: "Nastala chyba pri zmene tejto hodnoty."
@@ -617,9 +719,10 @@ sk:
         authenticated: "Váš email bude autentifikovaný pomocou {{provider}}"
         frequency_immediately: "Odošleme vám email ak ste neprečítali to, čo vám posielame emailom."
         frequency:
-          one: "Odošleme vám email iba ak sme vás nevideli poslednú minútu"
-          few: "Odošleme vám email iba ak sme vás nevideli posledné {{count}} minúty."
-          other: "Odošleme vám email iba ak sme vás nevideli posledných {{count}} minút"
+          few: Odošleme vám email iba ak sme vás nevideli posledné {{count}} minúty.
+          many: Odošleme vám email iba ak sme vás nevideli posledných {{count}} minút
+          one: Odošleme vám email iba ak sme vás nevideli poslednú minútu
+          other: Odošleme vám email iba ak sme vás nevideli posledných {{count}} minút
       name:
         title: "Meno"
         instructions: "vaše celé meno (nepovinné)"
@@ -631,6 +734,7 @@ sk:
         short_instructions: "Ostatní vás môžu zmieniť ako @{{username}}"
         available: "Vaše používateľské meno je voľné"
         not_available: "Nie je k dispozícii. Skúste {{suggestion}}?"
+        not_available_no_suggestion: "Nedostupné"
         too_short: "Vaše používateľské meno je prikrátke"
         too_long: "Vaše používateľské meno je pridlhé"
         checking: "Kontrolujeme dostupnosť používateľského meno"
@@ -639,6 +743,7 @@ sk:
         title: "Jazyk rozhrania"
         instructions: "Jazyk úžívateľského rozhrania. Zmení sa po obnovení stránky."
         default: "(predvolené)"
+        any: "hocijaký"
       password_confirmation:
         title: "Heslo znova"
       last_posted: "Posledný príspevok"
@@ -647,8 +752,6 @@ sk:
       created: "Vytvorený"
       log_out: "Odhlásiť sa"
       location: "Poloha"
-      card_badge:
-        title: "Odznak karty používateľa"
       website: "Webová stránka"
       email_settings: "Email"
       like_notification_frequency:
@@ -700,11 +803,12 @@ sk:
         title: "Pozvánky"
         user: "Pozvaný používateľ"
         sent: "Odoslané"
-        none: "Nemáte žiadne čakajúce pozvánky."
+        none: "Nemáte žiadne pozvánky na zobrazenie."
         truncated:
-          one: "Zobrazuje sa prvá pozvánka."
-          few: "Zobrazujú sa prvé {{count}} pozvánky."
-          other: "Zobrazuje sa prvých {{count}} pozvánok."
+          few: Zobrazujú sa prvé {{count}} pozvánky.
+          many: Zobrazuje sa prvých {{count}} pozvánok.
+          one: Zobrazuje sa prvá pozvánka.
+          other: Zobrazuje sa prvých {{count}} pozvánok.
         redeemed: "Využité pozvánky"
         redeemed_tab: "Využité"
         redeemed_tab_with_count: "Využité ({{count}})"
@@ -717,6 +821,8 @@ sk:
         expired: "Táto pozvánka vypršala."
         rescind: "Odstrániť"
         rescinded: "Pozvánka odstránená"
+        rescind_all: "Odstrániť všetky pozvánky"
+        rescinded_all: "Všetky pozvánky odstránené!"
         reinvite: "Poslať pozvánku znovu"
         reinvite_all: "Poslať všetky pozvánky znovu"
         reinvited: "Poslať pozvánku znovu"
@@ -729,6 +835,7 @@ sk:
         bulk_invite:
           text: "Hromadná pozvánka zo súboru"
           success: "Súbor bol úspešne odoslaný. Keď sa nahrávanie dokončí, budete na to upozornený cez správu."
+          error: "Prepáčte, súbor musí byť v CSV formáte."
       password:
         title: "Heslo"
         too_short: "Vaše heslo je príliš krátke."
@@ -741,25 +848,30 @@ sk:
         stats: "Štatistiky"
         time_read: "doba čítania"
         topic_count:
-          one: "vytvorená téma"
-          few: "vytvorené témy"
-          other: "vytvorených tém"
+          few: vytvorené témy
+          many: vytvorených tém
+          one: vytvorená téma
+          other: vytvorených tém
         post_count:
-          one: "vytvorený príspevok"
-          few: "vytvorené príspevky"
-          other: "vytvorených príspevkov"
+          few: vytvorené príspevky
+          many: vytvorených príspevkov
+          one: vytvorený príspevok
+          other: vytvorených príspevkov
         days_visited:
-          one: "deň na stránke"
-          few: "dni na stránke"
-          other: "dní na stránke"
+          few: dni na stránke
+          many: dní na stránke
+          one: deň na stránke
+          other: dní na stránke
         posts_read:
-          one: "prečítaný príspevok"
-          few: "prečítané príspevky"
-          other: "prečítaných príspevkov"
+          few: prečítané príspevky
+          many: prečítaných príspevkov
+          one: prečítaný príspevok
+          other: prečítaných príspevkov
         bookmark_count:
-          one: "záložka"
-          few: "záložky"
-          other: "záložiek"
+          few: záložky
+          many: záložiek
+          one: záložka
+          other: záložiek
         top_replies: "Top odpovede"
         no_replies: "Zatiaľ žiadne odpovede."
         more_replies: "Viac odpovedí"
@@ -836,10 +948,12 @@ sk:
     first_post: Prvý príspevok
     mute: Ignorovať
     unmute: Prestať ignorovať
+    last_post: Odoslané
     last_reply_lowercase: posledná odpoveď
     replies_lowercase:
-      one: odpoveď
       few: odpovede
+      many: odpovedí
+      one: odpoveď
       other: odpovedí
     signup_cta:
       sign_up: "Registrovať sa"
@@ -884,14 +998,18 @@ sk:
       complete_email_found: "Našli sme účet priradený k <b>%{email}</b>, čoskoro dostanete e-mail s pokynmi, ako si obnoviť svoje heslo."
       complete_username_not_found: "Žiadny účet nemá priradené používateľské meno <b>%{username}</b>"
       complete_email_not_found: "Žiadny účet nie je s e-mailom  <b>%{email}</b>"
+      button_ok: "OK"
+      button_help: "Pomoc"
     login:
       title: "Prihlásenie"
       username: "Používateľ"
       password: "Heslo"
+      second_factor_title: "Dvojfaktorová autentifikácia"
       email_placeholder: "e-mail alebo používateľské meno"
       caps_lock_warning: "Caps Lock je zapnutý"
       error: "Neznáma chyba"
       rate_limit: "Pred opätovným prihlásením chvíľku počkajte."
+      blank_username: "Prosím vložte Váš email alebo používateľské meno."
       blank_username_or_password: "Zadajte prosím svoj e-mail alebo používateľské meno a heslo."
       reset_password: 'Obnoviť heslo'
       logging_in: "Prebieha prihlásenie..."
@@ -903,6 +1021,9 @@ sk:
       not_allowed_from_ip_address: "Nie je možné prihlásenie z tejto IP adresy."
       admin_not_allowed_from_ip_address: "Nie je možné prihlásenie ako admin z tejto IP adresy."
       resend_activation_email: "Kliknite sem pre opätovné odoslanie aktivačného emailu."
+      resend_title: "Znova poslať aktivačný email."
+      change_email: "Zmeniť emailovú adresu"
+      submit_new_email: "Aktualizovať emailovú adresu"
       sent_activation_email_again: "Odoslali sme vám ďalší aktivačný email na <b>{{currentEmail}}</b>. Môže trvať niekoľko minút kým príde; pre istotu si skontrolujte spamový priečinok."
       to_continue: "Prosím, prihláste sa"
       preferences: "Na zmenu používateľských nastavení musíte byť prihlásený."
@@ -932,6 +1053,9 @@ sk:
       accept_title: "Pozvánka"
       accept_invite: "Prijať pozvánku"
       success: "Váš účet bol vytvorený a ste prihlásený."
+      name_label: "Meno"
+      password_label: "Nastaviť heslo"
+      optional_description: "(nepovinné)"
     emoji_set:
       apple_international: "Apple/Medzinárodné"
       google: "Google"
@@ -945,6 +1069,15 @@ sk:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    select_kit:
+      default_header_text: Vybrať...
+      filter_placeholder: Hľadať
+    emoji_picker:
+      people: Ľudia
+      food: Jedlo
+      activity: Aktivita
+      travel: Cestovanie
+      objects: Objekty
     composer:
       emoji: "Emoji :)"
       more_emoji: "viac ..."
@@ -959,9 +1092,10 @@ sk:
       similar_topics: "Vaša téma je podobná..."
       drafts_offline: "offline koncepty"
       group_mentioned:
-        one: "Zmienením {{group}}, upozorníte <a href='{{group_link}}'>1 človeka</a> – ste si istý?"
-        few: "Zmienením {{group}}, upozorníte <a href='{{group_link}}'>{{count}} ľudí</a> – ste si istý?"
-        other: "Zmienením {{group}}, upozorníte <a href='{{group_link}}'>{{count}} ľudí</a> – ste si istý?"
+        few: Zmienením {{group}}, upozorníte <a href='{{group_link}}'>{{count}} ľudí</a> – ste si istý?
+        many: Zmienením {{group}}, upozorníte <a href='{{group_link}}'>{{count}} ľudí</a> – ste si istý?
+        one: Zmienením {{group}}, upozorníte <a href='{{group_link}}'>1 človeka</a> – ste si istý?
+        other: Zmienením {{group}}, upozorníte <a href='{{group_link}}'>{{count}} ľudí</a> – ste si istý?
       error:
         title_missing: "Názov je povinný"
         title_too_short: "Názov musí mať minimálne {{min}} znakov"
@@ -1017,34 +1151,25 @@ sk:
       modal_cancel: "Zrušiť"
       cant_send_pm: "Ľutujeme, nemôžete poslať správu používateľovi %{username}."
       admin_options_title: "Nepovinné zamestnanecké nastavenia pre túto tému"
+      composer_actions:
+        reply_as_private_message:
+          label: Nová správa
+        reply_to_topic:
+          label: Odpovedať na tému
+        create_topic:
+          label: "Nová téma"
     notifications:
       title: "oznámenia o zmienkach pomocou @meno, odpovede na Vaše príspevky a témy, správy, atď."
       none: "Notifikácie sa nepodarilo načítať"
       empty: "Žiadne upozornenia sa nenašli."
       more: "zobraziť staršie upozornenia"
       total_flagged: "označených príspevkov celkom"
-      alt:
-        mentioned: "Zmienený od"
-        quoted: "Citovaný používateľom"
-        replied: "Odpovedané"
-        posted: "Príspevok od"
-        edited: "Upravte Váš príspevok do"
-        liked: "Váš príspevok sa páčil"
-        private_message: "Súkromná správa od"
-        invited_to_private_message: "Pozvaný na súkromné správy od"
-        invited_to_topic: "Pozvaný k téme od"
-        invitee_accepted: "Pozvánka akceptovaná "
-        moved_post: "Váš príspevok bol presunutý "
-        linked: "Odkaz na váš príspevok"
-        granted_badge: "Udelený odznak"
-        group_message_summary: "Správy v skupinovej schránke"
       popup:
         mentioned: '{{username}} Vás zmienil v "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} Vás zmienil v "{{topic}}" - {{site_title}}'
         quoted: '{{username}} vás citoval v "{{topic}}" - {{site_title}}'
         replied: '{{username}} vám odpovedal v "{{topic}}" - {{site_title}}'
         posted: '{{username}} prispel v "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} vám poslal súkromnú správu v "{{topic}}" - {{site_title}}'
         linked: '{{username}} odkázal na váš príspevok z "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Pridať obrázok"
@@ -1060,10 +1185,12 @@ sk:
       uploading: "Nahrávanie"
       select_file: "Zvoľte súbor"
       image_link: "adresa na ktorú bude odkazovať váš obrázok"
+      default_image_alt_text: Obrázok
     search:
       sort_by: "Zoradiť podľa"
       relevance: "Relevancia"
       latest_post: "Najnovší príspevok"
+      latest_topic: "Posledná téma"
       most_viewed: "Najviac prezerané"
       most_liked: "Najviac sa páčia"
       select_all: "Označ všetky"
@@ -1074,6 +1201,7 @@ sk:
       no_more_results: "Nenašlo sa viac výsledkov"
       searching: "Vyhľadávam....."
       post_format: "#{{post_number}} podľa {{username}}"
+      cant_find: "Nemôžete nájsť to čo hľadáte?"
       context:
         user: "Vyhľadávanie podľa @{{username}}"
         category: "Vyhľadať kategóriu #{{category}}"
@@ -1083,20 +1211,31 @@ sk:
         title: Rozširené vyhľadávanie
         posted_by:
           label: Autor príspevku
+        in_category:
+          label: Kategorizovaný
         filters:
           likes: sa mi páčia
           posted: obsahujú môj príspevok
           watching: Sledujem
           tracking: Pozorujem
+          private: V mojich správach
+          pinned: sú pripnuté
+          unpinned: nie sú pripnuté
           unseen: som nečítal
         statuses:
           label: Kde témy
+          open: sú otvorené
           closed: uzavreté
+          archived: sú archivované
+          noreplies: majú nula odpovedí
+          single_user: obsahujú jediného používateľa
         post:
           count:
             label: Minimálny počet príspevkov
           time:
             label: Odoslané
+            before: pred
+            after: po
     hamburger_menu: "prejsť na iné témy, alebo kategórie"
     new_item: "nový"
     go_back: 'späť'
@@ -1105,6 +1244,8 @@ sk:
     topics:
       new_messages_marker: "posledná návševa"
       bulk:
+        select_all: "Vyber všetko"
+        clear_all: "Zruš všetko"
         unlist_topics: "Dôverné témy"
         reset_read: "Obnoviť prečítané"
         delete: "Zmazať témy"
@@ -1118,11 +1259,13 @@ sk:
         actions: "Hromadné akcie"
         close_topics: "Uzavrieť tému"
         archive_topics: "Archivuj témy"
+        notification_level: "Upozornenia"
         choose_new_category: "Vyberte pre tému novú kategóriu:"
         selected:
-          one: "Označíli ste <b>1</b> tému."
-          few: "Označíli ste <b>{{count}}</b> tém.y"
-          other: "Označíli ste <b>{{count}}</b> tém."
+          few: Označíli ste <b>{{count}}</b> tém.y
+          many: Označíli ste <b>{{count}}</b> tém.
+          one: Označíli ste <b>1</b> tému.
+          other: Označíli ste <b>{{count}}</b> tém.
         choose_new_tags: "Vyberte pre tému nové štítky:"
         changed_tags: "Štítky tém boli zmenené."
       none:
@@ -1151,13 +1294,11 @@ sk:
         bookmarks: "Žiadne ďalšie témy v záložkách."
         search: "Nenašlo sa viac výsledkov."
     topic:
-      unsubscribe:
-        stop_notifications: "Teraz budete dostávať menej upozornení na <strong>{{title}}</strong>"
-        change_notification_state: "Váš súčasný stav upozornení je"
       filter_to:
-        one: "1 príspevok k téme"
-        few: "{{count}} príspevky k téme"
-        other: "{{count}} príspevkov k téme"
+        few: '{{count}} príspevky k téme'
+        many: '{{count}} príspevkov k téme'
+        one: 1 príspevok k téme
+        other: '{{count}} príspevkov k téme'
       create: 'Nová téma'
       create_long: 'Vytvoriť novú tému'
       private_message: 'Vytvoríť správu'
@@ -1171,12 +1312,14 @@ sk:
       new: 'nová téma'
       unread: 'neprečítané'
       new_topics:
-        one: '1 nová téma'
         few: '{{count}} nové témy'
+        many: '{{count}} nových tém'
+        one: 1 nová téma
         other: '{{count}} nových tém'
       unread_topics:
-        one: '1 neprečítaná téma'
         few: '{{count}} neprečítané témy'
+        many: '{{count}} neprečítaných tém'
+        one: 1 neprečítaná téma
         other: '{{count}} neprečítaných tém'
       title: 'Témy'
       invalid_access:
@@ -1190,21 +1333,25 @@ sk:
         title: "Téma sa nenašla"
         description: "Ľutujeme, hľadaná téma nebola nájdená. Možno bola odstránená moderátorom?"
       total_unread_posts:
-        one: "máte 1 neprečítaný príspevok k tejto téme"
-        few: "máte {{count}} neprečítanépríspevky k tejto téme"
-        other: "máte {{count}} neprečítaných príspevkov k tejto téme"
+        few: máte {{count}} neprečítanépríspevky k tejto téme
+        many: máte {{count}} neprečítaných príspevkov k tejto téme
+        one: máte 1 neprečítaný príspevok k tejto téme
+        other: máte {{count}} neprečítaných príspevkov k tejto téme
       unread_posts:
-        one: "máte 1 starší neprečítaný príspevok k tejto téme"
-        few: "máte {{count}} staršie neprečítané príspevky k tejto téme"
-        other: "máte {{count}} starších neprečítaných príspevkov k tejto téme"
+        few: máte {{count}} staršie neprečítané príspevky k tejto téme
+        many: máte {{count}} starších neprečítaných príspevkov k tejto téme
+        one: máte 1 starší neprečítaný príspevok k tejto téme
+        other: máte {{count}} starších neprečítaných príspevkov k tejto téme
       new_posts:
-        one: "pribudol 1 nový príspevok odkedy ste čítali túto tému naposledy "
-        few: "pribudlo  {{count}}  nové príspevky odkedy ste čítali túto tému naposledy "
-        other: "pribudlo  {{count}}  nových príspevkov odkedy ste čítali túto tému naposledy "
+        few: 'pribudlo  {{count}}  nové príspevky odkedy ste čítali túto tému naposledy '
+        many: 'pribudlo  {{count}}  nových príspevkov odkedy ste čítali túto tému naposledy '
+        one: 'pribudol 1 nový príspevok odkedy ste čítali túto tému naposledy '
+        other: 'pribudlo  {{count}}  nových príspevkov odkedy ste čítali túto tému naposledy '
       likes:
-        one: "v tejto téme je jedo \"Páči sa\""
-        few: "v tejto téme je  {{count}} \"Páči sa\""
-        other: "v tejto téme je  {{count}} \"Páči sa\""
+        few: v tejto téme je  {{count}} "Páči sa"
+        many: v tejto téme je  {{count}} "Páči sa"
+        one: v tejto téme je jedo "Páči sa"
+        other: v tejto téme je  {{count}} "Páči sa"
       back_to_list: "Naspäť na zoznam tém"
       options: "Možnosti tém"
       show_links: "zobrazovať odkazy v tejto téme"
@@ -1214,15 +1361,34 @@ sk:
       read_more_MF: "Máte { UNREAD, plural, =0 {} one { <a href='/unread'>1 neprečítanú</a> } other { <a href='/unread'># neprečítané</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{a} false { } other{}} <a href='/new'>1 novú</a> tému} other { {BOTH, select, true{a } false {} other{}} <a href='/new'># nových</a> tém} } na prečítanie, prípadne {CATEGORY, select, true {si pozrite iné témy v  {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Prezrieť všetky kategórie
       view_latest_topics: zobraziť najnošie témy
-      suggest_create_topic: Čo tak vytvoriť novú tému?
+      suggest_create_topic: "Čo tak vytvoriť novú tému?"
       jump_reply_up: prejsť na predchádzajúcu odpoveď
       jump_reply_down: prejsť na nasledujúcu odpoveď
       deleted: "Téma bola vymazaná"
+      topic_status_update:
+        num_of_hours: "Počet hodín:"
+        when: "Kedy:"
+      auto_update_input:
+        tomorrow: "Zajtra"
+        this_weekend: "Tento víkend"
+        next_week: "Budúci týždeň"
+        two_weeks: "Dva týždne"
+        next_month: "Budúci mesiac"
+        three_months: "Tri mesiace"
+        six_months: "Šesť mesiacov"
+        one_year: "Jeden rok"
+        forever: "Vždy"
+        pick_date_and_time: "Vyberte dátum a čas"
+      temp_close:
+        title: "Dočasne zatvoriť"
+      reminder:
+        title: "Upozorni ma"
       auto_close_title: 'Nastavenia automatického zatvárania'
       auto_close_immediate:
-        one: "Posledný príspevok k téme je starý už 1 hodinu, takže téma bude okamžite uzavretá. "
-        few: "Posledný príspevok k téme je starý už %{hours} hodiny, takže téma bude okamžite uzavretá. "
-        other: "Posledný príspevok k téme je starý už %{hours} hodín, takže téma bude okamžite uzavretá. "
+        few: 'Posledný príspevok k téme je starý už %{hours} hodiny, takže téma bude okamžite uzavretá. '
+        many: 'Posledný príspevok k téme je starý už %{hours} hodín, takže téma bude okamžite uzavretá. '
+        one: 'Posledný príspevok k téme je starý už 1 hodinu, takže téma bude okamžite uzavretá. '
+        other: 'Posledný príspevok k téme je starý už %{hours} hodín, takže téma bude okamžite uzavretá. '
       timeline:
         back: "Späť"
       progress:
@@ -1231,23 +1397,24 @@ sk:
         go_bottom: "na spodok"
         go: "Choď"
         jump_bottom: "choď na posledný príspevok"
+        jump_prompt: "choď na..."
         jump_bottom_with_number: "choď na príspevok číslo %{post_number}"
         total: Všetkých príspevkov
         current: tento príspevok
       notifications:
         title: zmeň ako často dostávaš upozornenia o tejto téme
         reasons:
-          '3_10': 'Budete dostávať upozornenia, pretože sledujete štítok na tejto téme.'
-          '3_6': 'Budete dostávať upozornenia, pretože sledujete túto kategóriu.'
-          '3_5': 'Budete automaticky dostávať upozornenie pretože ste začali sledovať túto tému.'
-          '3_2': 'Budete dostávať upozornenia, pretože sledujete túto tému.'
-          '3_1': 'Budete dostávať upozornenia, pretože ste vytvorili túto tému.'
-          '3': 'Budete dostávať upozornenia, pretože sledujete túto tému.'
-          '1_2': 'Budete upozornený ak niekto zmieni Vaše @meno alebo Vám odpovie.'
-          '1': 'Budete upozornený ak niekto zmieni Vaše @meno alebo Vám odpovie.'
-          '0_7': 'Ignorujete všetky upozornenia v tejto kategórii.'
-          '0_2': 'Ignorujete všetky upozornenia k tejto téme.'
-          '0': 'Ignorujete všetky upozornenia k tejto téme.'
+          "3_10": 'Budete dostávať upozornenia, pretože sledujete štítok na tejto téme.'
+          "3_6": 'Budete dostávať upozornenia, pretože sledujete túto kategóriu.'
+          "3_5": 'Budete automaticky dostávať upozornenie pretože ste začali sledovať túto tému.'
+          "3_2": 'Budete dostávať upozornenia, pretože sledujete túto tému.'
+          "3_1": 'Budete dostávať upozornenia, pretože ste vytvorili túto tému.'
+          "3": 'Budete dostávať upozornenia, pretože sledujete túto tému.'
+          "1_2": 'Budete upozornený ak niekto zmieni Vaše @meno alebo Vám odpovie.'
+          "1": 'Budete upozornený ak niekto zmieni Vaše @meno alebo Vám odpovie.'
+          "0_7": 'Ignorujete všetky upozornenia v tejto kategórii.'
+          "0_2": 'Ignorujete všetky upozornenia k tejto téme.'
+          "0": 'Ignorujete všetky upozornenia k tejto téme.'
         watching_pm:
           title: "Sledovať"
           description: "Budete upozornený na každú novú odpoveď na túto správu a zobrazí sa počet nových odpovedí."
@@ -1286,7 +1453,6 @@ sk:
         visible: "Zobraziť"
         reset_read: "Zrušiť načítané údaje"
         make_public: "Spraviť verejnou témou"
-        make_private: "Spraviť súkromnou správou"
       feature:
         pin: "Pripni tému"
         unpin: "Odopni tému"
@@ -1302,6 +1468,8 @@ sk:
       share:
         title: 'Zdieľaj'
         help: 'zdieľaj odkaz na túto tému'
+      print:
+        title: 'Tlačiť'
       flag_topic:
         title: 'Označ'
         help: 'súkromne označiť túto tému do pozornosti, alebo na ňu poslať súkromne upozornenie'
@@ -1316,9 +1484,10 @@ sk:
         pin_validation: "Dátum je vyžadovaný k pripnutiu tejto témy."
         not_pinned: "V {{categoryLink}} nie sú pripnuté žiadne témy."
         already_pinned:
-          one: "Téma pripnutá k {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
-          few: "Témy pripnuté ku {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "Tém pripnutých k {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          few: 'Témy pripnuté ku {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          many: 'Tém pripnutých k {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: 'Téma pripnutá k {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Tém pripnutých k {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         pin_globally: "Zobrazuj túto tému na vrchu všetkých zoznamov tém do"
         confirm_pin_globally: "Máte už {{count}} globálne pripnutých tém. Príliš veľa pripnutých tém môže byť na príťaž pre nových a anonymných používateľov. Ste si istý že chcete pripnúť ďalšiu globálnu tému?"
         unpin_globally: "Zruš túto tému z vrcholu všetkých zoznamov tém. "
@@ -1326,9 +1495,10 @@ sk:
         global_pin_note: "Užívatelia si môžu sami odopnúť tému."
         not_pinned_globally: "Nie sú pripnuté žiadne globálne témy."
         already_pinned_globally:
-          one: "Globálne pripnutá téma : <strong class='badge badge-notification unread'>1</strong>"
-          few: "Globálne pripnuté témy : <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "Globálne pripnutých tém : <strong class='badge badge-notification unread'>{{count}}</strong>"
+          few: 'Globálne pripnuté témy : <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          many: 'Globálne pripnutých tém : <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: 'Globálne pripnutá téma : <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Globálne pripnutých tém : <strong class=''badge badge-notification unread''>{{count}}</strong>'
         make_banner: "Spraviť z tejto témy baner, ktorý sa zobrazí navrchu každej stránky."
         remove_banner: "Odstrániť baner, ktorý sa zobrazuje navrchu každej stránky."
         banner_note: "Užívatelia môžu banner kedykoľvek zrušiť. Bannerom môže byť v jednom momente len jedna téma."
@@ -1363,9 +1533,10 @@ sk:
       login_reply: 'Príhláste sa ak chcete odpovedať'
       filters:
         n_posts:
-          one: "1 príspevok"
-          few: "{{count}} príspevky"
-          other: "{{count}} príspevkov"
+          few: '{{count}} príspevky'
+          many: '{{count}} príspevkov'
+          one: 1 príspevok
+          other: '{{count}} príspevkov'
         cancel: "Zruš filter"
       split_topic:
         title: "Presuň na novú tému"
@@ -1373,17 +1544,19 @@ sk:
         topic_name: "Názov novej témy"
         error: "Nastala chyba pri presune príspevku na novú tému."
         instructions:
-          one: "Vytvárate novú tému do ktorej bude vložený príspevok, ktorý ste označili. "
-          few: "Vytvárate novú tému do ktorej bude vložených <b>{{count}}</b> príspevkov, ktoré ste označili. "
-          other: "Vytvárate novú tému do ktorej budú vložené <b>{{count}}</b> príspevky, ktoré ste označili. "
+          few: 'Vytvárate novú tému do ktorej bude vložených <b>{{count}}</b> príspevkov, ktoré ste označili. '
+          many: 'Vytvárate novú tému do ktorej budú vložené <b>{{count}}</b> príspevky, ktoré ste označili. '
+          one: 'Vytvárate novú tému do ktorej bude vložený príspevok, ktorý ste označili. '
+          other: 'Vytvárate novú tému do ktorej budú vložené <b>{{count}}</b> príspevky, ktoré ste označili. '
       merge_topic:
         title: "Presuň do existujúcej témy."
         action: "presuň do existujúcej témy"
         error: "Nastala chyba pri presune príspevku do tejto témy."
         instructions:
-          one: "Prosím vyberte tému do ktorej chcete presunúť tento príspevok."
-          few: "Prosím vyberte tému do ktorej chcete presunúť tieto <b>{{count}}</b> príspevky."
-          other: "Prosím vyberte tému do ktorej chcete presunúť týchto <b>{{count}}</b> príspevkov."
+          few: Prosím vyberte tému do ktorej chcete presunúť tieto <b>{{count}}</b> príspevky.
+          many: Prosím vyberte tému do ktorej chcete presunúť týchto <b>{{count}}</b> príspevkov.
+          one: Prosím vyberte tému do ktorej chcete presunúť tento príspevok.
+          other: Prosím vyberte tému do ktorej chcete presunúť týchto <b>{{count}}</b> príspevkov.
       merge_posts:
         title: "Spojiť označené príspevky"
         action: "spojiť označené príspevky"
@@ -1394,10 +1567,10 @@ sk:
         label: "Príspevky nového vlastníka"
         placeholder: "používateľske meno nového vlastnika"
         instructions:
-          one: "Prosím vyberte nového vlastníka  príspevku vytvoreného <b>{{old_user}}</b>."
-          few: "Prosím vyberte nového vlastníka {{count}}  príspevkov vytvorených <b>{{old_user}}</b>."
-          other: "Prosím vyberte nového vlastníka {{count}}  príspevkov vytvorených <b>{{old_user}}</b>."
-        instructions_warn: "Poznámka: Žiadne upozornenie o tomto príspevku nebude spätne zaslané novým používateľom<br>Upozornenie: Momentálne nie sú prenášané žiadne dáta vťahujúce sa k príspevku na nových užívateľov. Používajte opatrne."
+          few: Prosím vyberte nového vlastníka {{count}}  príspevkov vytvorených <b>{{old_user}}</b>.
+          many: Prosím vyberte nového vlastníka {{count}}  príspevkov vytvorených <b>{{old_user}}</b>.
+          one: Prosím vyberte nového vlastníka  príspevku vytvoreného <b>{{old_user}}</b>.
+          other: Prosím vyberte nového vlastníka {{count}}  príspevkov vytvorených <b>{{old_user}}</b>.
       change_timestamp:
         action: "nastavte časovú značku"
         invalid_timestamp: "Časová značka nemôže byť v budúcnosti. "
@@ -1406,17 +1579,20 @@ sk:
       multi_select:
         select: 'označ'
         selected: 'označených ({{count}})'
+        select_post:
+          label: 'vybrať'
+        selected_post:
+          label: 'vybraté'
         delete: zmaž označené
         cancel: zrušiť výber
         select_all: označ všetko
         deselect_all: odznač všetko
         description:
-          one: Označili ste <b>1</b> príspevok
           few: Označili ste <b>{{count}}</b> príspevky
+          many: Označili ste <b>{{count}}</b> príspevkov
+          one: Označili ste <b>1</b> príspevok
           other: Označili ste <b>{{count}}</b> príspevkov
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Citácia"
       edit_reason: "Dôvod:"
       post_number: "príspevok {{number}}"
@@ -1427,32 +1603,38 @@ sk:
       show_full: "Zobraziť celý príspevok"
       show_hidden: 'Zobraziť skrytý obsah.'
       deleted_by_author:
-        one: "(príspevky stiahnuté autorom budú automaticky zmazané za jednu hodinu pokiaľ nie sú označené)"
-        few: "(príspevky stiahnuté autorom budú automaticky zmazané za %{count} hodiny pokiaľ nie sú označené)"
-        other: "(príspevky stiahnuté autorom budú automaticky zmazané za %{count} hodín pokiaľ nie sú označené)"
+        few: (príspevky stiahnuté autorom budú automaticky zmazané za %{count} hodiny pokiaľ nie sú označené)
+        many: (príspevky stiahnuté autorom budú automaticky zmazané za %{count} hodín pokiaľ nie sú označené)
+        one: (príspevky stiahnuté autorom budú automaticky zmazané za jednu hodinu pokiaľ nie sú označené)
+        other: (príspevky stiahnuté autorom budú automaticky zmazané za %{count} hodín pokiaľ nie sú označené)
       expand_collapse: "rozbaliť/zbaliť"
       gap:
-        one: "zobraziť skrytú odpoveď"
-        few: "zobraziť {{count}} skryté odpovede"
-        other: "zobraziť {{count}} skrytých odpovedí"
+        few: zobraziť {{count}} skryté odpovede
+        many: zobraziť {{count}} skrytých odpovedí
+        one: zobraziť skrytú odpoveď
+        other: zobraziť {{count}} skrytých odpovedí
       unread: "Príspevok je neprečítaný."
       has_replies:
-        one: "{{count}} Odpoveď"
-        few: "{{count}} Odpovede"
-        other: "{{count}} Odpovedí"
+        few: '{{count}} Odpovede'
+        many: '{{count}} Odpovedí'
+        one: '{{count}} Odpoveď'
+        other: '{{count}} Odpovedí'
       has_likes:
-        one: "{{count}} \"Páči sa\""
-        few: "{{count}} \"Páči sa\""
-        other: "{{count}} \"Páči sa\""
+        few: '{{count}} "Páči sa"'
+        many: '{{count}} "Páči sa"'
+        one: '{{count}} "Páči sa"'
+        other: '{{count}} "Páči sa"'
       has_likes_title:
-        one: "Tento príspevok sa páčil jedej osobe"
-        few: "Tento príspevok sa páčil {{count}}  ľuďom"
-        other: "Tento príspevok sa páčil {{count}}  ľuďom"
+        few: Tento príspevok sa páčil {{count}}  ľuďom
+        many: Tento príspevok sa páčil {{count}}  ľuďom
+        one: Tento príspevok sa páčil jedej osobe
+        other: Tento príspevok sa páčil {{count}}  ľuďom
       has_likes_title_only_you: "tento príspevok sa Vám páči"
       has_likes_title_you:
-        one: "Tento príspevok sa páčil Vám a jednej ďalšej osobe"
-        few: "Tento príspevok sa páčil Vám a ďalším {{count}} ľuďom"
-        other: "Tento príspevok sa páčil Vám a ďalším {{count}} ľuďom"
+        few: Tento príspevok sa páčil Vám a ďalším {{count}} ľuďom
+        many: Tento príspevok sa páčil Vám a ďalším {{count}} ľuďom
+        one: Tento príspevok sa páčil Vám a jednej ďalšej osobe
+        other: Tento príspevok sa páčil Vám a ďalším {{count}} ľuďom
       errors:
         create: "Ľutujeme, pri vytváraní príspevku nastala chyba. Prosím, skúste znovu."
         edit: "Ľutujeme, pri úprave príspevku nastala chyba. Prosím, skúste znovu."
@@ -1513,70 +1695,86 @@ sk:
           vote: "Hlasoval si za tento príspevok"
         by_you_and_others:
           off_topic:
-            one: "Vy a 1 ďalšia osoba to označílo ako mimo tému"
-            few: "Vy a ďalšie {{count}} osoby to označíli ako mimo tému"
-            other: "Vy a ďalších {{count}} osôb to označílo ako mimo tému"
+            few: Vy a ďalšie {{count}} osoby to označíli ako mimo tému
+            many: Vy a ďalších {{count}} osôb to označílo ako mimo tému
+            one: Vy a 1 ďalšia osoba to označílo ako mimo tému
+            other: Vy a ďalších {{count}} osôb to označílo ako mimo tému
           spam:
-            one: "Vy a 1 ďalšia osoba to označíla ako spam"
-            few: "Vy a ďalšie {{count}} osoby to označíli ako spam"
-            other: "Vy a ďalších {{count}} osôb to označílo ako spam"
+            few: Vy a ďalšie {{count}} osoby to označíli ako spam
+            many: Vy a ďalších {{count}} osôb to označílo ako spam
+            one: Vy a 1 ďalšia osoba to označíla ako spam
+            other: Vy a ďalších {{count}} osôb to označílo ako spam
           inappropriate:
-            one: "Vy a jedna ďalšia osoba to označila ako nevhodné"
-            few: "Vy a ďalšie {{count}} osoby to označili ako nevhodné"
-            other: "Vy a ďalších {{count}} osôb to označilo ako nevhodné"
+            few: Vy a ďalšie {{count}} osoby to označili ako nevhodné
+            many: Vy a ďalších {{count}} osôb to označilo ako nevhodné
+            one: Vy a jedna ďalšia osoba to označila ako nevhodné
+            other: Vy a ďalších {{count}} osôb to označilo ako nevhodné
           notify_moderators:
-            one: "Vy a jedna ďalšia osoba to označila na moderovanie"
-            few: "Vy a ďalšie {{count}} osoby to označili na moderovanie"
-            other: "Vy a ďalších {{count}} osôb to označilo na moderovanie"
+            few: Vy a ďalšie {{count}} osoby to označili na moderovanie
+            many: Vy a ďalších {{count}} osôb to označilo na moderovanie
+            one: Vy a jedna ďalšia osoba to označila na moderovanie
+            other: Vy a ďalších {{count}} osôb to označilo na moderovanie
           notify_user:
-            one: "Vy a jedna ďalšia osoba poslala správu tomuto užívateľovi"
-            few: "Vy a ďalšie {{count}} osoby poslali správu tomuto užívateľovi"
-            other: "Vy a ďalších {{count}} osôb poslalo správu tomuto používateľovi"
+            few: Vy a ďalšie {{count}} osoby poslali správu tomuto užívateľovi
+            many: Vy a ďalších {{count}} osôb poslalo správu tomuto používateľovi
+            one: Vy a jedna ďalšia osoba poslala správu tomuto užívateľovi
+            other: Vy a ďalších {{count}} osôb poslalo správu tomuto používateľovi
           bookmark:
-            one: "Vy a jedna ďalšia osoba si vytvorilo záložku na tento príspevok"
-            few: "Vy a ďalšie {{count}} osoby si vytvorili záložku na tento príspevok"
-            other: "Vy a ďalších {{count}} osôb si vytvorilo záložku na tento príspevok"
+            few: Vy a ďalšie {{count}} osoby si vytvorili záložku na tento príspevok
+            many: Vy a ďalších {{count}} osôb si vytvorilo záložku na tento príspevok
+            one: Vy a jedna ďalšia osoba si vytvorilo záložku na tento príspevok
+            other: Vy a ďalších {{count}} osôb si vytvorilo záložku na tento príspevok
           like:
-            one: "Páči sa to Vám a jendej ďalšej osobe"
-            few: "Páči sa to Vám a ďalším {{count}} osobám"
-            other: "Páči sa to Vám a ďalším {{count}} osobám"
+            few: Páči sa to Vám a ďalším {{count}} osobám
+            many: Páči sa to Vám a ďalším {{count}} osobám
+            one: Páči sa to Vám a jendej ďalšej osobe
+            other: Páči sa to Vám a ďalším {{count}} osobám
           vote:
-            one: "Vy a jenda ďalšia osoba hlasovala za tento príspevok"
-            few: "Vy a ďalšie {{count}} osoby hlasovalo za tento príspevok"
-            other: "Vy a ďalších {{count}} osôb hlasovalo za tento príspevok"
+            few: Vy a ďalšie {{count}} osoby hlasovalo za tento príspevok
+            many: Vy a ďalších {{count}} osôb hlasovalo za tento príspevok
+            one: Vy a jenda ďalšia osoba hlasovala za tento príspevok
+            other: Vy a ďalších {{count}} osôb hlasovalo za tento príspevok
         by_others:
           off_topic:
-            one: "1 osoba to označíla ako mimo tému"
-            few: "{{count}} osoby to označíli ako mimo tému"
-            other: "{{count}} osôb to označílo ako mimo tému"
+            few: '{{count}} osoby to označíli ako mimo tému'
+            many: '{{count}} osôb to označílo ako mimo tému'
+            one: 1 osoba to označíla ako mimo tému
+            other: '{{count}} osôb to označílo ako mimo tému'
           spam:
-            one: "1 osoba to označíla ako spam"
-            few: "{{count}} osoby to označíli ako spam"
-            other: "{{count}} osôb to označílo ako spam"
+            few: '{{count}} osoby to označíli ako spam'
+            many: '{{count}} osôb to označílo ako spam'
+            one: 1 osoba to označíla ako spam
+            other: '{{count}} osôb to označílo ako spam'
           inappropriate:
-            one: "1 osoba to označila ako nevhodné"
-            few: "{{count}} osoby to označili ako nevhodné"
-            other: "{{count}} osôb to označilo ako nevhodné"
+            few: '{{count}} osoby to označili ako nevhodné'
+            many: '{{count}} osôb to označilo ako nevhodné'
+            one: 1 osoba to označila ako nevhodné
+            other: '{{count}} osôb to označilo ako nevhodné'
           notify_moderators:
-            one: "1 osoba to označila na moderovanie"
-            few: "{{count}} osoby to označili na moderovanie"
-            other: "{{count}} osôb to označilo na moderovanie"
+            few: '{{count}} osoby to označili na moderovanie'
+            many: '{{count}} osôb to označilo na moderovanie'
+            one: 1 osoba to označila na moderovanie
+            other: '{{count}} osôb to označilo na moderovanie'
           notify_user:
-            one: "1 osoba poslala správu tomuto používateľovi"
-            few: "{{count}} osoby poslali správu tomuto používateľovi"
-            other: "{{count}} osôb poslalo správu tomuto používateľovi"
+            few: '{{count}} osoby poslali správu tomuto používateľovi'
+            many: '{{count}} osôb poslalo správu tomuto používateľovi'
+            one: 1 osoba poslala správu tomuto používateľovi
+            other: '{{count}} osôb poslalo správu tomuto používateľovi'
           bookmark:
-            one: "1 osoba si vytvorila záložku na tento príspevok"
-            few: "{{count}} osoby si vytvorili záložku na tento príspevok"
-            other: "{{count}} osôb si vytvorilo záložku na tento príspevok"
+            few: '{{count}} osoby si vytvorili záložku na tento príspevok'
+            many: '{{count}} osôb si vytvorilo záložku na tento príspevok'
+            one: 1 osoba si vytvorila záložku na tento príspevok
+            other: '{{count}} osôb si vytvorilo záložku na tento príspevok'
           like:
-            one: " {{count}} osobe sa to páčilo"
-            few: " {{count}} osobám sa to páčilo"
-            other: " {{count}} osobám sa to páčilo"
+            few: ' {{count}} osobám sa to páčilo'
+            many: ' {{count}} osobám sa to páčilo'
+            one: ' {{count}} osobe sa to páčilo'
+            other: ' {{count}} osobám sa to páčilo'
           vote:
-            one: "1 osoba hlasovala za tento príspevok"
-            few: "{{count}} osoby hlasovali za tento príspevok"
-            other: "{{count}} osôb hlasovalo za tento príspevok"
+            few: '{{count}} osoby hlasovali za tento príspevok'
+            many: '{{count}} osôb hlasovalo za tento príspevok'
+            one: 1 osoba hlasovala za tento príspevok
+            other: '{{count}} osôb hlasovalo za tento príspevok'
       revisions:
         controls:
           first: "Prvá revízia"
@@ -1593,6 +1791,10 @@ sk:
             title: "Zobraziť rozdiely v generovanom výstupe vedľa seba"
           side_by_side_markdown:
             title: "Zobraziť rozdiely v pôvodnom zdroji vedľa seba"
+      raw_email:
+        displays:
+          text_part:
+            button: 'Text'
     category:
       can: 'môže &hellip; '
       none: '(Bez kategórie)'
@@ -1638,7 +1840,6 @@ sk:
       email_in_allow_strangers: "Prijímať emaily od anonymných používateľov bez účtu"
       email_in_disabled: "Vkladanie nových tém cez email je zablokované v Nastaveniach stránky. Ak chcete povoliť vkladanie nových téme cez email,"
       email_in_disabled_click: 'povoľte nastavenie "email in"'
-      suppress_from_homepage: "Pozastaviť kategóriu z domovskej stránky."
       allow_badges_label: "Povoliť získavanie odznakov v tejto kategórii"
       edit_permissions: "Upraviť práva"
       add_permission: "Pridať práva"
@@ -1663,6 +1864,8 @@ sk:
         muted:
           title: "Stíšené"
           description: "Nikdy nebudete informovaní o udalostiach v nových témach týchto kategórií. Tieto témy sa zároveň nebudú zobrazovať v zozname posledných udalostí."
+      sort_options:
+        activity: "Aktivity"
     flagging:
       title: 'Ďakujeme, že pomáhate udržiavať slušnosť v našej komunite!'
       action: 'Označ príspevok'
@@ -1685,13 +1888,15 @@ sk:
       custom_placeholder_notify_moderators: "Dajte nám vedieť, z čoho konkrétne máte obavy, a priložte príslušné odkazy a príklady, ak je to možné."
       custom_message:
         more:
-          one: "ešte 1 ..."
-          few: "ešte {{count}} ..."
-          other: "ešte {{count}} ..."
+          few: ešte {{count}} ...
+          many: ešte {{count}} ...
+          one: ešte 1 ...
+          other: ešte {{count}} ...
         left:
-          one: "1 zostáva"
-          few: "{{count}} zostávajú"
-          other: "{{count}} zostáva"
+          few: '{{count}} zostávajú'
+          many: '{{count}} zostáva'
+          one: 1 zostáva
+          other: '{{count}} zostáva'
     flagging_topic:
       title: "Ďakujeme, že pomáhate udržiavať slušnosť v našej komunite!"
       action: "Označ príspevok"
@@ -1702,14 +1907,16 @@ sk:
       links_title: "Populárne odkazy"
       links_shown: "zobraz viac odkazov..."
       clicks:
-        one: "%{count} kilk"
-        few: "%{count} kliky"
-        other: "%{count} klikov"
+        few: '%{count} kliky'
+        many: '%{count} klikov'
+        one: '%{count} kilk'
+        other: '%{count} klikov'
     post_links:
       title:
-        one: "1 ďalší"
-        few: "%{count} ďalšie"
-        other: "%{count} ďalších"
+        few: '%{count} ďalšie'
+        many: '%{count} ďalších'
+        one: 1 ďalší
+        other: '%{count} ďalších'
     topic_statuses:
       warning:
         help: "Toto je oficiálne varovanie."
@@ -1743,22 +1950,25 @@ sk:
     original_post: "Pôvodný príspevok"
     views: "Zobrazenia"
     views_lowercase:
-      one: "zobrazenie"
-      few: "zobrazenia"
-      other: "zobrazení"
+      few: zobrazenia
+      many: zobrazení
+      one: zobrazenie
+      other: zobrazení
     replies: "Odpovede"
     activity: "Aktivita"
     likes: "Páči sa mi"
     likes_lowercase:
-      one: "\"Páči sa\""
-      few: "\"Páči sa\""
-      other: "\"Páči sa\""
+      few: '"Páči sa"'
+      many: '"Páči sa"'
+      one: '"Páči sa"'
+      other: '"Páči sa"'
     likes_long: "v tejto téme je {{number}} \"Páči sa\""
     users: "Používatelia"
     users_lowercase:
-      one: "používateľ"
-      few: "používatelia"
-      other: "používateľov"
+      few: používatelia
+      many: používateľov
+      one: používateľ
+      other: používateľov
     category_title: "Kategória"
     history: "História"
     changed_by: "od {{author}}"
@@ -1771,9 +1981,10 @@ sk:
       latest:
         title: "Najnovšie"
         title_with_count:
-          one: "Posledný (1)"
-          few: "Posledné ({{count}})"
-          other: "Posledných ({{count}})"
+          few: Posledné ({{count}})
+          many: Posledných ({{count}})
+          one: Posledný (1)
+          other: Posledných ({{count}})
         help: "témy s nedávnymi príspevkami"
       hot:
         title: "Horúca"
@@ -1791,25 +2002,29 @@ sk:
       unread:
         title: "Neprečítané"
         title_with_count:
-          one: "Neprečítaná (1)"
-          few: "Neprečítané ({{count}})"
-          other: "Neprečítaných ({{count}})"
+          few: Neprečítané ({{count}})
+          many: Neprečítaných ({{count}})
+          one: Neprečítaná (1)
+          other: Neprečítaných ({{count}})
         help: "témy ktorých neprečítané príspevky v súčastnosti sledujete alebo pozorujete "
         lower_title_with_count:
-          one: "1 neprečítaná"
-          few: "{{count}} neprečítané"
-          other: "{{count}} neprečítaných"
+          few: '{{count}} neprečítané'
+          many: '{{count}} neprečítaných'
+          one: 1 neprečítaná
+          other: '{{count}} neprečítaných'
       new:
         lower_title_with_count:
-          one: "1 nová"
-          few: "{{count}} nové"
-          other: "{{count}} nových"
+          few: '{{count}} nové'
+          many: '{{count}} nových'
+          one: 1 nová
+          other: '{{count}} nových'
         lower_title: "nový"
         title: "Nové"
         title_with_count:
-          one: "Nová (1)"
-          few: "Nové ({{count}})"
-          other: "Nových ({{count}})"
+          few: Nové ({{count}})
+          many: Nových ({{count}})
+          one: Nová (1)
+          other: Nových ({{count}})
         help: "témy vytvorené za posledných pár dní"
       posted:
         title: "Moje príspevky"
@@ -1820,9 +2035,10 @@ sk:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: "{{categoryName}} ({{count}})"
-          few: "{{categoryName}} ({{count}})"
-          other: "{{categoryName}} ({{count}})"
+          few: '{{categoryName}} ({{count}})'
+          many: '{{categoryName}} ({{count}})'
+          one: '{{categoryName}} ({{count}})'
+          other: '{{categoryName}} ({{count}})'
         help: "najnovšie témy v kategórii {{categoryName}}"
       top:
         title: "Top"
@@ -1905,17 +2121,18 @@ sk:
         mark_watching: '<b>m</b>, <b>w</b> Pozorovať tému'
     badges:
       earned_n_times:
-        one: "Získal tento odkaz 1-krát"
-        few: "Získal tento odkaz %{count}-krát"
-        other: "Získal tento odkaz %{count}-krát"
+        few: Získal tento odkaz %{count}-krát
+        many: Získal tento odkaz %{count}-krát
+        one: Získal tento odkaz 1-krát
+        other: Získal tento odkaz %{count}-krát
       granted_on: "Udelený dňa %{date}"
       others_count: "Ostatní s týmto odznakom (%{count})"
       title: Odznaky
       granted:
-        one: "1 udelený"
-        few: "%{count} udelené"
-        other: "%{count} udelených"
-      none: "<žiadne>"
+        few: '%{count} udelené'
+        many: '%{count} udelených'
+        one: 1 udelený
+        other: '%{count} udelených'
       badge_grouping:
         getting_started:
           name: Začíname
@@ -1944,19 +2161,15 @@ sk:
       notifications:
         watching:
           title: "Sledovať"
-          description: "Budete automaticky sledovať všetky témy s týmto štítkom. Budete upozornený na všetky nové príspevky a témy, navyše počet neprečítaných a nových príspevok bude zobrazený pri téme."
         watching_first_post:
           title: "Sledovať prvý príspevok"
-          description: "Budete upozornený iba na prvý príspevok v každej téme s týmto štítkom."
         tracking:
           title: "Pozorovať"
-          description: "Budete automaticky pozorovať všetky témy s týmto štítkom. Počet neprečítaných a nových príspevkov sa bude zobrazovať vedľa témy."
         regular:
           title: "Bežné"
           description: "Budete upozornený ak niekto zmieni Vaše @meno alebo odpovie na Váš príspevok."
         muted:
           title: "Stíšené"
-          description: "Nebudete upozornený ohľadom nových tém s týmto štítkom a nebudú sa zobrazovať na vašej karte s neprečítanými."
       groups:
         title: "Skupiny štítkov"
         about: "Pridajte štítky do skupín, aby sa ľahšie spravovali."
@@ -2031,8 +2244,6 @@ sk:
         reports:
           today: "Dnes"
           yesterday: "Včera"
-          last_7_days: "Posledných 7 dní"
-          last_30_days: "Posledných 30 dní"
           all_time: "Za celú dobu"
           7_days_ago: "Pred 7 dňami"
           30_days_ago: "Pred 30 dňami"
@@ -2050,7 +2261,6 @@ sk:
         title: "Označenia"
         agree: "Súhlasiť"
         agree_title: "Akceptovať toto označenie ako platné a správne"
-        defer_flag_title: "Zrušíť označenie. Žiadna akcia nie je nateraz potrebná."
         delete: "Odstrániť"
         delete_title: "Zmazať príspevok na ktorý označenie odkazuje ."
         delete_post_defer_flag_title: "Zmazať prípspevok; ak ide o prvý príspevok, zmazať aj tému"
@@ -2078,14 +2288,24 @@ sk:
         visit_topic: "Navšťívte tému pre prijatie opatrení"
         was_edited: "Príspevok bol upravený po prvom označení"
         previous_flags_count: "Tento príspevok bol už označený {{count}} krát."
+        details: "detaily"
+        flagged_topics:
+          topic: "Téma"
+          type: "Typ"
+          users: "Používatelia"
+          last_flagged: "Naposledy označené"
+        short_names:
+          off_topic: "mimo tému"
+          inappropriate: "nevhodné"
+          spam: "spam"
+          notify_user: "vlastné"
+          notify_moderators: "vlastné"
       groups:
         primary: "Hlavná skupina"
         no_primary: "(bez hlavnej skupiny)"
         title: "Skupiny"
         edit: "Upraviť skupiny"
         refresh: "Obnoviť"
-        new: "Nový"
-        selector_placeholder: "zadať používateľské meno"
         about: "Tu upravíte Vaše členstvo v skupinách a mená"
         group_members: "Členovia skupiny"
         delete: "Odstrániť"
@@ -2093,21 +2313,10 @@ sk:
         delete_failed: "Nepodarilo sa zmazať skupinu. Pokiaľ je skupina automatická, nemôže byť zrušená."
         delete_owner_confirm: "Odobrať vlastnícke práva %{username}'?"
         add: "Pridať"
-        add_members: "Pridať členov"
         custom: "Vlastné"
-        bulk_complete: "Užívatelia boli pridaní do skupiny."
-        bulk: "Hromadné pridanie do skupiny"
-        bulk_paste: "Vlož zoznam používateľov alebo emailov, jeden na riadok:"
-        bulk_select: "(vyberte skupinu)"
         automatic: "Automaticky"
-        automatic_membership_email_domains: "Užívatelia, ktorí sa zaregistrovali s emailovou doménou uvedenou v zozname budú automaticky pridaní do tejto skupiny. "
-        automatic_membership_retroactive: "Použi pravidlo rovnakej emailovej domény pre pridanie registrovaných používateľov"
-        default_title: "Štandardné označenie pre všetkých používateľov v tejto skupine"
-        primary_group: "Automaticky nastav ako hlavnú skupinu"
         group_owners: Vlastníci
         add_owners: Pridať vlastníkov
-        incoming_email: "Vlastná e-mailová adresa pre príchodziu poštu"
-        incoming_email_placeholder: "zadajte emailovú adresu"
       api:
         generate_master: "Vygenerovať Master API kľúč"
         none: "V súčasnosti neexistujú žiadne aktívne API kľúče."
@@ -2122,6 +2331,13 @@ sk:
         info_html: "Váš API kľúč Vám umožní vytváranie a aktualizovanie tém prostredníctvom volaní JSON."
         all_users: "Všetci používatelia"
         note_html: "Držte tento kľúč <strong>v tajnosti</strong>, všetci užívatelia ktorí ho vlastnia môžu vytvárať ľubovoľné príspevky pod ľubovoľným používateľským menom. "
+      web_hooks:
+        create: "Vytvoriť"
+        save: "Uložiť"
+        destroy: "Vymazať"
+        description: "Popis"
+        go_back: "Späť na zoznam"
+        payload_url_placeholder: "https://example.com/postreceive"
       plugins:
         title: "Pluginy"
         installed: "Nainštalované pluginy"
@@ -2157,7 +2373,6 @@ sk:
           label: "Upload"
           title: "Nahrať zálohu do tejto inštancie"
           uploading: "Upload prebieha..."
-          success: "'{{filename}}' bol úspešne nahratý."
           error: "Počas nahrávania '{{filename}}' nastala chyba: {{message}}"
         operations:
           is_running: "Operácia práve prebieha..."
@@ -2170,7 +2385,6 @@ sk:
             label: "Záloha"
             title: "Vytvoriť zálohu"
             confirm: "Prajete si spustiť novú zálohu?"
-            without_uploads: "Áno (nezahŕňať súbory)"
           download:
             label: "Stiahnuť"
           destroy:
@@ -2426,13 +2640,15 @@ sk:
           suspect: 'Podozrivý'
         approved: "Schválený?"
         approved_selected:
-          one: "schváliť používateľa"
-          few: "schváliť ({{count}}) používateľov "
-          other: "schváliť ({{count}}) používateľov "
+          few: 'schváliť ({{count}}) používateľov '
+          many: 'schváliť ({{count}}) používateľov '
+          one: schváliť používateľa
+          other: 'schváliť ({{count}}) používateľov '
         reject_selected:
-          one: "zamietnuť používateľa"
-          few: "zamietnuť ({{count}}) používateľov "
-          other: "zamietnuť ({{count}}) používateľov "
+          few: 'zamietnuť ({{count}}) používateľov '
+          many: 'zamietnuť ({{count}}) používateľov '
+          one: zamietnuť používateľa
+          other: 'zamietnuť ({{count}}) používateľov '
         titles:
           active: 'Aktívni používatelia'
           new: 'Noví používatelia'
@@ -2448,13 +2664,15 @@ sk:
           suspended: 'Užívatelia s odobratými právami'
           suspect: 'Podozriví užívatelia'
         reject_successful:
-          one: "Úspešne zamietnutý používateľ"
-          few: "Úspešne zamietnutí %{count} používatelia"
-          other: "Úspešne zamietnutých %{count} používateľov"
+          few: Úspešne zamietnutí %{count} používatelia
+          many: Úspešne zamietnutých %{count} používateľov
+          one: Úspešne zamietnutý používateľ
+          other: Úspešne zamietnutých %{count} používateľov
         reject_failures:
-          one: "Nepodarilo sa zamietnuť 1 používateľa"
-          few: "Nepodarilo sa zamietnuť %{count} používateľov"
-          other: "Nepodarilo sa zamietnuť %{count} používateľov"
+          few: Nepodarilo sa zamietnuť %{count} používateľov
+          many: Nepodarilo sa zamietnuť %{count} používateľov
+          one: Nepodarilo sa zamietnuť 1 používateľa
+          other: Nepodarilo sa zamietnuť %{count} používateľov
         not_verified: "Neoverený"
         check_email:
           title: "Odhaliť emailovú adresu tohto používateľa"
@@ -2488,7 +2706,7 @@ sk:
         reputation: Reputácia
         permissions: Práva
         activity: Aktivita
-        like_count: '"Páči sa" Rozdané / Prijaté'
+        like_count: "\"Páči sa\" Rozdané / Prijaté"
         last_100_days: 'za posledných 100 dní'
         private_topics_count: Súkromné témy
         posts_read_count: Prečítané príspevky
@@ -2511,17 +2729,20 @@ sk:
         delete_forbidden_because_staff: "Správcovia a moderátori nemôžu byť vymazaní."
         delete_posts_forbidden_because_staff: "Nedá sa zmazať príspevky správcov a moderátorov."
         delete_forbidden:
-          one: "Užívatelia nemôžu byť vymazaní ak majú príspevky. Najprv zmažte príspevky až potom užívateľa. (Príspevky staršie ako %{count} deň nemožno zmazať)"
-          few: "Užívatelia nemôžu byť vymazaní ak majú príspevky. Najprv zmažte príspevky až potom užívateľa. (Príspevky staršie ako %{count} dni nemožno zmazať)"
-          other: "Užívatelia nemôžu byť vymazaní ak majú príspevky. Najprv zmažte príspevky až potom používateľa. (Príspevky staršie ako %{count} dní nemožno zmazať)"
+          few: Užívatelia nemôžu byť vymazaní ak majú príspevky. Najprv zmažte príspevky až potom užívateľa. (Príspevky staršie ako %{count} dni nemožno zmazať)
+          many: Užívatelia nemôžu byť vymazaní ak majú príspevky. Najprv zmažte príspevky až potom používateľa. (Príspevky staršie ako %{count} dní nemožno zmazať)
+          one: Užívatelia nemôžu byť vymazaní ak majú príspevky. Najprv zmažte príspevky až potom užívateľa. (Príspevky staršie ako %{count} deň nemožno zmazať)
+          other: Užívatelia nemôžu byť vymazaní ak majú príspevky. Najprv zmažte príspevky až potom používateľa. (Príspevky staršie ako %{count} dní nemožno zmazať)
         cant_delete_all_posts:
-          one: "Nepodarilo sa zmazať všetky príspevky. Niektoré príspevky sú staršie ako %{count} deň. (Nastavenie delete_user_max_post_age )"
-          few: "Nepodarilo sa zmazať všetky príspevky. Niektoré príspevky sú staršie ako %{count} dni. (Nastavenie delete_user_max_post_age )"
-          other: "Nepodarilo sa zmazať všetky príspevky. Niektoré príspevky sú staršie ako %{count} dní. (Nastavenie delete_user_max_post_age )"
+          few: Nepodarilo sa zmazať všetky príspevky. Niektoré príspevky sú staršie ako %{count} dni. (Nastavenie delete_user_max_post_age )
+          many: Nepodarilo sa zmazať všetky príspevky. Niektoré príspevky sú staršie ako %{count} dní. (Nastavenie delete_user_max_post_age )
+          one: Nepodarilo sa zmazať všetky príspevky. Niektoré príspevky sú staršie ako %{count} deň. (Nastavenie delete_user_max_post_age )
+          other: Nepodarilo sa zmazať všetky príspevky. Niektoré príspevky sú staršie ako %{count} dní. (Nastavenie delete_user_max_post_age )
         cant_delete_all_too_many_posts:
-          one: "Nedá sa zmazať všetky píspevky, pretože používateľ má viac ako 1 príspevok.  (delete_all_posts_max)"
-          few: "Nedá sa zmazať všetky píspevky, pretože používateľ má viac ako %{count} príspevky.  (delete_all_posts_max)"
-          other: "Nedá sa zmazať všetky píspevky, pretože používateľ má viac ako %{count} príspevkov.  (delete_all_posts_max)"
+          few: Nedá sa zmazať všetky píspevky, pretože používateľ má viac ako %{count} príspevky.  (delete_all_posts_max)
+          many: Nedá sa zmazať všetky píspevky, pretože používateľ má viac ako %{count} príspevkov.  (delete_all_posts_max)
+          one: Nedá sa zmazať všetky píspevky, pretože používateľ má viac ako 1 príspevok.  (delete_all_posts_max)
+          other: Nedá sa zmazať všetky píspevky, pretože používateľ má viac ako %{count} príspevkov.  (delete_all_posts_max)
         delete_confirm: "Ste si ISTÝ, že chcete zmazať tohoto používateľa? Už sa to nedá obnoviť!"
         delete_and_block: "Zazať a <b>zablokovať</b> tento email a IP adresu"
         delete_dont_block: "Iba vymazať"
@@ -2617,10 +2838,7 @@ sk:
         recommended: "Odporúčame prispôsobenie nasledujúceho textu podľa vašich potrieb:"
         show_overriden: 'Ukázať iba zmenené'
       site_settings:
-        show_overriden: 'Ukázať iba zmenené'
         title: 'Nastavenia'
-        reset: 'zrušiť'
-        none: 'žiadne'
         no_results: "Žiadne výsledky"
         clear_filter: "Vyčistiť"
         add_url: "pridaj URL"
@@ -2663,20 +2881,20 @@ sk:
           modal_title: Zoskupovanie odznakov
         granted_by: Udelené používateľom
         granted_at: Udelené dňa
-        reason_help: (Odkaze na príspevok, alebo tému)
+        reason_help: "(Odkaze na príspevok, alebo tému)"
         save: Uložiť
         delete: Odstrániť
-        delete_confirm: Ste si istý, že chcete zmazať tento odznak?
+        delete_confirm: "Ste si istý, že chcete zmazať tento odznak?"
         revoke: Zrušiť
         reason: Dôvod
         expand: Rozbaliť &hellip;
-        revoke_confirm: Ste si istý, že chcete obnoviť tento odznak?
+        revoke_confirm: "Ste si istý, že chcete obnoviť tento odznak?"
         edit_badges: Upraviť odznaky
         grant_badge: Udeliť odznak
         granted_badges: Udelené odznaky
         grant: Udeliť
         no_user_badges: "Používateľovi %{name} nebol udelený žiaden odznak."
-        no_badges: Nie sú žiadne odznaky, ktoré môžu byť udelené.
+        no_badges: "Nie sú žiadne odznaky, ktoré môžu byť udelené."
         none_selected: "Vyberte odznak, aby ste mohli začať"
         allow_title: Povoliť použitie odznaku namiesto názvu
         multiple_grant: Môže byť udelené viacnásobne
@@ -2684,7 +2902,6 @@ sk:
         enabled: Povoliť odznak
         icon: Ikona
         image: Obrázok
-        icon_help: "Použi buď font z triedy Awesome, alebo URL na obrázok"
         query: Požiadavka na Odznak (SQL)
         target_posts: Požiadavka cieli príspevky
         auto_revoke: Spúšťať stornovaciu požiadavku denne
@@ -2707,15 +2924,16 @@ sk:
             text: "Chýbajú ukážky práv. Toto sa stane, ak dotaz na odznak vráti ID používateľa alebo príspevku, ktorý neexistuje. Toto môže zapríčiniť neskoršie neočakávané výsledky - prosíme znovu overte Váš dotaz."
           no_grant_count: "Žiadne odznaky na pridelenie."
           grant_count:
-            one: "<b>1</b> odznak na pridelenie"
-            few: "<b>%{count}</b> odznaky na pridelenie"
-            other: "<b>%{count}</b> odznakov na pridelenie"
+            few: <b>%{count}</b> odznaky na pridelenie
+            many: <b>%{count}</b> odznakov na pridelenie
+            one: <b>1</b> odznak na pridelenie
+            other: <b>%{count}</b> odznakov na pridelenie
           sample: "Vzor:"
           grant:
-            with: <span class="username">%{username}</span>
-            with_post: <span class="username">%{username}</span> za príspevok v %{link}
-            with_post_time: <span class="username">%{username}</span> za príspevok v %{link} v čase <span class="time">%{time}</span>
-            with_time: <span class="username">%{username}</span> v čase <span class="time">%{time}</span>
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span> za príspevok v %{link}"
+            with_post_time: "<span class=\"username\">%{username}</span> za príspevok v %{link} v čase <span class=\"time\">%{time}</span>"
+            with_time: "<span class=\"username\">%{username}</span> v čase <span class=\"time\">%{time}</span>"
       emoji:
         title: "Emoji"
         help: "Pridaj nové emoji, ktoré bude dostupné pre všetkých (TIP: môžete pretiahnuť viac súborov naraz)"
@@ -2757,7 +2975,7 @@ sk:
         category_id: "ID kategórie"
         category_title: "Kategória"
         external_url: "Externá URL"
-        delete_confirm: Ste si istý, že chcete zmazať tento trvalý odkaz?
+        delete_confirm: "Ste si istý, že chcete zmazať tento trvalý odkaz?"
         form:
           label: "Nový:"
           add: "Pridať"
diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml
new file mode 100644
index 00000000000..8abdeb97e97
--- /dev/null
+++ b/config/locales/client.sl.yml
@@ -0,0 +1,1833 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sl:
+  js:
+    number:
+      format:
+        separator: "."
+        delimiter: ","
+      human:
+        storage_units:
+          format: '%n %u'
+          units:
+            gb: GB
+            kb: KB
+            mb: MB
+            tb: TB
+      short:
+        thousands: "{{number}}k"
+        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"
+      long_with_year: "MMM D, YYYY h:mm a"
+      long_with_year_no_time: "MMM D, YYYY"
+      full_with_year_no_time: "MMMM Do, YYYY"
+      long_date_with_year: "MMM D, 'YY LT"
+      long_date_without_year: "MMM D, LT"
+      long_date_with_year_without_time: "MMM D, 'YY"
+      long_date_without_year_with_linebreak: "MMM D <br/>LT"
+      long_date_with_year_with_linebreak: "MMM D, 'YY <br/>LT"
+      wrap_ago: "pred %{date}"
+      tiny:
+        half_a_minute: "< 1 min"
+        less_than_x_seconds:
+          few: < %{count} s
+          one: < %{count} s
+          other: < %{count} s
+          two: < %{count} s
+        x_seconds:
+          few: '%{count} s'
+          one: '%{count} s'
+          other: '%{count} s'
+          two: '%{count} s'
+        x_minutes:
+          few: '%{count} min'
+          one: '%{count} min'
+          other: '%{count} min'
+          two: '%{count} min'
+        about_x_hours:
+          few: '%{count} h'
+          one: '%{count} h'
+          other: '%{count} h'
+          two: '%{count} h'
+        x_days:
+          few: '%{count} d'
+          one: '%{count} d'
+          other: '%{count} d'
+          two: '%{count} d'
+        about_x_years:
+          few: '%{count} l'
+          one: '%{count} l'
+          other: '%{count} l'
+          two: '%{count} l'
+        over_x_years:
+          few: '> %{count} l'
+          one: '> %{count} l'
+          other: '> %{count} l'
+          two: '> %{count} l'
+        almost_x_years:
+          few: '%{count} l'
+          one: '%{count} l'
+          other: '%{count} l'
+          two: '%{count} l'
+        date_month: "MMM D"
+        date_year: "MMM 'YY"
+      medium:
+        x_minutes:
+          few: '%{count} minute'
+          one: '%{count} minuto'
+          other: '%{count} minut'
+          two: '%{count} minuti'
+        x_hours:
+          few: '%{count} ure'
+          one: '%{count} uro'
+          other: '%{count} ur'
+          two: '%{count} uri'
+        x_days:
+          few: '%{count} dnevi'
+          one: '%{count} dan'
+          other: '%{count} dni'
+          two: '%{count} dneva'
+        date_year: "MMM D, 'YY"
+      medium_with_ago:
+        x_minutes:
+          few: pred %{count} minutami
+          one: pred %{count} minuto
+          other: pred %{count} minutami
+          two: pred %{count} minutama
+        x_hours:
+          few: pred %{count} urami
+          one: pred %{count} uro
+          other: pred %{count} urami
+          two: pred %{count} urama
+        x_days:
+          few: pred %{count} dnevi
+          one: pred %{count} dnevom
+          other: pred %{count} dnevi
+          two: pred %{count} dnevoma
+      later:
+        x_days:
+          few: čez %{count} dneve
+          one: čez %{count} dan
+          other: čez %{count} dni
+          two: čez %{count} dneva
+        x_months:
+          few: čez %{count} mesece
+          one: čez %{count} mesec
+          other: čez %{count} mesecev
+          two: čez %{count} meseca
+        x_years:
+          few: čez %{count} leta
+          one: čez %{count} leto
+          other: čez %{count} let
+          two: čez %{count} leti
+      previous_month: 'Prejšnji mesec'
+      next_month: 'Naslednji mesec'
+      placeholder: datum
+    share:
+      topic: 'deli povezavo do te teme'
+      post: 'objava #%{postNumber}'
+      close: 'zapri'
+      twitter: 'deli povezavo na Twitterju'
+      facebook: 'deli povezao na Facebooku'
+      google+: 'deli povezavo na Google+'
+      email: 'pošlji povezavo preko e-pošte'
+    action_codes:
+      public_topic: "je naredil temo javno %{when}"
+      split_topic: "je razdelil temo %{when}"
+      invited_user: "je povabil %{who} %{when}"
+      invited_group: "je povabil %{who} %{when}"
+      user_left: "%{who}se je odstranil s tega sporočila %{when}"
+      removed_user: "je odstranil %{who} %{when}"
+      removed_group: "je odstranil %{who} %{when}"
+      autoclosed:
+        enabled: 'zaprto %{when}'
+        disabled: 'odprto %{when}'
+      closed:
+        enabled: 'zaprto %{when}'
+        disabled: 'odprto %{when}'
+      archived:
+        enabled: 'arhivirano %{when}'
+        disabled: 'odarhivirano %{when}'
+      pinned:
+        enabled: 'pripeto %{when}'
+        disabled: 'odpeto %{when}'
+      pinned_globally:
+        enabled: 'globalno pripeto %{when}'
+        disabled: 'odpeto %{when}'
+      visible:
+        enabled: 'objavljeno %{when}'
+        disabled: 'odstranjeno %{when}'
+      banner:
+        enabled: 'je ustvaril ta oglas %{when}. Pojavil se bo na vrhu vsake strani, dokler ga uporabnik ne odstrani.'
+        disabled: 'je odstranil/a ta oglas %{when}. Ne bo se več pojavljal na vrhu vsake strani.'
+    topic_admin_menu: "ukrepi administratorja teme"
+    wizard_required: "Dobrodošli v vašem novem Discoursu! Začnimo z <a href='%{url}' data-auto-route='true'>čarovnikom za nastavitve</a> ✨"
+    emails_are_disabled: "Vsa odhodna e-pošta je bila globalno onemogočena iz strani administratorja. E-poštne obvestila ne bodo poslana."
+    themes:
+      default_description: "Privzeto"
+    s3:
+      regions:
+        ap_northeast_1: "Asia Pacific (Tokyo)"
+        ap_northeast_2: "Asia Pacific (Seoul)"
+        ap_south_1: "Asia Pacific (Mumbai)"
+        ap_southeast_1: "Asia Pacific (Singapore)"
+        ap_southeast_2: "Asia Pacific (Sydney)"
+        cn_north_1: "China (Beijing)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Ireland)"
+        eu_west_2: "EU (London)"
+        sa_east_1: "South America (Sao Paulo)"
+        us_east_1: "US East (N. Virginia)"
+        us_east_2: "US East (Ohio)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "US West (N. California)"
+        us_west_2: "US West (Oregon)"
+    edit: 'uredi naslov in kategorijo te teme'
+    not_implemented: "Oprosti, ta funkcija še ni bila implementirana!"
+    no_value: "Ne"
+    yes_value: "Da"
+    generic_error: "Ups, prišlo je do napake."
+    generic_error_with_reason: "Napaka: %{error}"
+    sign_up: "Prijava"
+    log_in: "Vpis"
+    age: "Starost"
+    joined: "Pridružen"
+    admin_title: "Administrator"
+    flags_title: "Zastave"
+    show_more: "Več"
+    show_help: "možnosti"
+    links: "Povezave"
+    links_lowercase:
+      few: povezave
+      one: povezava
+      other: povezave
+      two: povezavi
+    faq: "FAQ"
+    guidelines: "Navodila"
+    privacy_policy: "Politika zasebnost"
+    privacy: "Zasebnost"
+    terms_of_service: "Pogoji storitve"
+    mobile_view: "Mobilni pogled"
+    desktop_view: "Namizni pogled"
+    you: "Ti"
+    or: "ali"
+    now: "ravnokar"
+    read_more: 'preberi več'
+    more: "Več"
+    less: "Manj"
+    never: "nikoli"
+    every_30_minutes: "vsakih 30 minut"
+    every_hour: "vsako uro"
+    daily: "dnevno"
+    weekly: "tedensko"
+    every_two_weeks: "vsaka dva tedna"
+    every_three_days: "vsake tri dni"
+    max_of_count: "največ od {{count}}"
+    alternation: "ali"
+    character_count:
+      few: '{{count}} znakov'
+      one: '{{count}} znak'
+      other: '{{count}} znakov'
+      two: '{{count}} znaka'
+    suggested_topics:
+      title: "Predlagane Teme"
+      pm_title: "Predlagana Sporočila"
+    about:
+      simple_title: "O"
+      title: "O %{title}"
+      stats: "Statistike Strani"
+      our_admins: "Naši Administratorji"
+      our_moderators: "Naši Moderatorji"
+      stat:
+        all_time: "Vse"
+      like_count: "Všečki"
+      topic_count: "Teme"
+      post_count: "Objave"
+      user_count: "Uporabniki"
+      active_user_count: "Aktivni uporabniki"
+      contact: "Kontaktirajte nas"
+      contact_info: "V primeru kritične težave glede strani nas prosim kontaktirajte na %{contact_info}."
+    bookmarked:
+      title: "Zaznamek"
+      clear_bookmarks: "Počisti zaznamke"
+      help:
+        bookmark: "Klikni, da ustvariš zaznamek prve objave v tej temi"
+        unbookmark: "Klikni za odstranitev vseh zaznamkov v tej temi"
+    bookmarks:
+      not_logged_in: "oprosti, moraš biti prijavljen za ustvarjanje zaznamkov"
+      created: "ustvarili ste zaznamek te objave"
+      not_bookmarked: "prebrali ste to objavo; klinite, da ustvarite zaznamek"
+      last_read: "to je zadnja objava katero ste prebrali; kliknite, da ustvarite zaznamek"
+      remove: "Odstrani Zaznamek"
+      confirm_clear: "Ste prepričani, da želite počistiti vse zaznamke s te teme?"
+    preview: "predogled"
+    cancel: "prekliči"
+    save: "Shrani Spremembe"
+    saving: "Shranjujem..."
+    saved: "Shranjeno!"
+    upload: "Naloži"
+    uploading: "Nalagam..."
+    uploading_filename: "Nalagam {{filename}}..."
+    uploaded: "Naloženo!"
+    pasting: "Prilepljam..."
+    enable: "Omogoči"
+    disable: "Onemogoči"
+    undo: "Razveljavi"
+    revert: "Povrni"
+    failed: "Spodletelo"
+    switch_to_anon: "Vklopi anonimni način"
+    switch_from_anon: "Izklopi anonimni način"
+    banner:
+      close: "Zavrni ta banner."
+      edit: "Uredi ta banner >>"
+    choose_topic:
+      none_found: "Nobena tema najdena."
+      title:
+        search: "Išči Temo po imenu, url ali id:"
+        placeholder: "vpiši naslov teme tukaj"
+    queue:
+      topic: "Tema:"
+      approve: 'Odobri'
+      reject: 'Zavrni'
+      delete_user: 'Izbriši uporabnika'
+      title: "Potrebuje Odobritev"
+      none: "Ni objav za pregled."
+      edit: "Uredi"
+      cancel: "Prekliči"
+      view_pending: "ogled čakajočih objav"
+      has_pending_posts:
+        few: Ta tema ima <b>{{count}}</b> objav, ki čakajo odobritev
+        one: Ta tema ima <b>1</b> objavo, ki čaka odobritev
+        other: Ta tema ima <b>{{count}}</b> objavo, ki čakajo odobritev
+        two: Ta tema ima <b>2</b> objavi, ki čakata odobritev
+      confirm: "Shrani Spremembe"
+      delete_prompt: "Ali ste prepričani, da želite izbrisati <b>%{username}</b>? To bo odstranilo vse njihove objave ter blokiralo njihov e-poštni naslov in IP naslov."
+      approval:
+        title: "Objava Potrebuje Odobritev."
+        description: "Prejeli smo vašo novo objavo vendar potrebuje odobritev iz strani moderatorja preden bo objavljena. Prosimo za potrpežljivost."
+        pending_posts:
+          few: Imate <strong>{{count}}</strong> čakajočih objav.
+          one: Imate <strong>1</strong> čakajočo objavo.
+          other: Imate <strong>{{count}}</strong> čakajočih objav.
+          two: Imate <strong>{{count}}</strong> čakajoče objave.
+        ok: "V redu"
+    user_action:
+      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> je objavil <a href='{{topicUrl}}'>temo</a>"
+      you_posted_topic: "<a href='{{userUrl}}'>Ti</a> si objavil <a href='{{topicUrl}}'>temo</a>"
+      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> je odgovoril na <a href='{{postUrl}}'>{{post_number}}</a>"
+      you_replied_to_post: "<a href='{{userUrl}}'>Ti</a> si odgovoril na <a href='{{postUrl}}'>{{post_number}}</a>"
+      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> je odgovoril na <a href='{{topicUrl}}'>temo</a>"
+      you_replied_to_topic: "<a href='{{userUrl}}'>Ti</a> si odgovoril na <a href='{{topicUrl}}'>temo</a>"
+      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> je omenil <a href='{{user2Url}}'>{{another_user}}</a>"
+      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> je omenil <a href='{{user2Url}}'>tebe</a>"
+      you_mentioned_user: "<a href='{{user1Url}}'>Ti</a> si omenil <a href='{{user2Url}}'>{{another_user}}</a>"
+      posted_by_user: "Objavleno od <a href='{{userUrl}}'>{{user}}</a>"
+      posted_by_you: "Objavljeno od <a href='{{userUrl}}'>tebe</a>"
+      sent_by_user: "Poslano od <a href='{{userUrl}}'>{{user}}</a>"
+      sent_by_you: "Poslano od <a href='{{userUrl}}'>tebe</a>"
+    directory:
+      filter_name: "filtriraj po uporabniškem imenu"
+      title: "Uporabniki"
+      likes_given: "Dano"
+      likes_received: "Prejeto"
+      topics_entered: "Ogledano"
+      topics_entered_long: "Ogledane Teme"
+      time_read: "Prebrano"
+      topic_count: "Teme"
+      topic_count_long: "Ustvarjene Teme"
+      post_count: "Odgovori"
+      post_count_long: "Objavljeni Odgovori"
+      no_results: "Noben rezultat ni bil najden."
+      days_visited: "Obiski"
+      days_visited_long: "Dni obiskov"
+      posts_read: "Prebrano"
+      posts_read_long: "Objave Prebrane"
+      total_rows:
+        few: '%{count} uporabniki'
+        one: 1 uporabnik
+        other: '%{count} uporabnikov'
+        two: '%{count} uporabnika'
+    group_histories:
+      actions:
+        change_group_setting: "Spremeni nastavitve za skupino"
+        add_user_to_group: "Dodaj uporabnika"
+        remove_user_from_group: "Odstrani uporabnika"
+        make_user_group_owner: "Spremeni v lastnika"
+        remove_user_as_group_owner: "Odstrani lastništvo"
+    groups:
+      public_admission: "Dovoli uporabnikom, da se sami pridružijo skupini (skupina mora biti javna)"
+      public_exit: "Dovoli uporabnikom da sami zapustijo skupino"
+      empty:
+        posts: "Ni objav članov skupine."
+        members: "Ta skupina nima članov."
+        mentions: "Ta skupina ni bila nikjer omenjena."
+        messages: "Ni sporočil za to skupino."
+        topics: "Člani te skupine nimajo nobene teme."
+        logs: "Dnevnik za to skupino je prazen."
+      add: "Dodaj"
+      message: "Sporočilo"
+      allow_membership_requests: "Dovoli uporabnikom, da zaprosijo za članstvo pri lastnikih skupine"
+      membership_request_template: "Predloga za prikaz uporabnikom, ko zaprosijo za članstvo"
+      membership_request:
+        submit: "Zaprosi za članstvo"
+        title: "Prošnja za pridružitev @%{group_name}"
+        reason: "Sporoči lastnikom skupine zakaj spadaš v to skupino"
+      membership: "Članstvo"
+      name: "Ime"
+      bio: "O skupini"
+      selector_placeholder: "vnesi uporabniško ime"
+      owner: "lastnik"
+      index:
+        title: "Skupine"
+        empty: "Ni javnih skupin."
+      title:
+        few: Skupin
+        one: Skupina
+        other: Skupin
+        two: Skupini
+      activity: "Aktivnost"
+      topics: "Teme"
+      posts: "Objave"
+      mentions: "Omembe"
+      messages: "Sporočila"
+      notification_level: "Privzeti nivo obvestil za sporočila skupini"
+      alias_levels:
+        mentionable: "Kdo lahko @omeni skupino?"
+        messageable: "Kdo lahko pošlje sporočilo skupini?"
+        nobody: "Nihče"
+        only_admins: "Le administratorji"
+        mods_and_admins: "Le moderatorji in administratorji"
+        members_mods_and_admins: "Le člani skupine, moderatorji in admnistratorji"
+        everyone: "Vsi"
+      notifications:
+        watching:
+          title: "Spremlja"
+          description: "Obveščeni boste o vsaki novi objavi v vsakem sporočilu in seštevek novih odgovorov bo prikazan."
+        watching_first_post:
+          title: "Opazuješ prvo objavo"
+          description: "Obveščeni boste samo ob prvi objavi v vsaki novi temi v tej skupini."
+        tracking:
+          title: "Sledi"
+          description: "Obveščeni boste, če nekdo omeni vaše @ime ali odgovori vam in seštevek novih odgovorov bo prikazan."
+        regular:
+          title: "Normalno"
+          description: "Obveščeni boste, če nekdo omeni vaše @ime ali vam odgovori."
+        muted:
+          title: "Molčeče"
+          description: "O novih temah v tej skupini ne boste obveščeni."
+      flair_bg_color_placeholder: "(Poljubno) Hex barvna vrednost"
+      flair_preview_icon: "Predogled ikone"
+      flair_preview_image: "Predogled slike"
+    user_action_groups:
+      "1": "Dani všečki"
+      "2": "Prejeti všečki"
+      "3": "Zaznamki"
+      "4": "Teme"
+      "5": "Odgovori"
+      "6": "Odzivi"
+      "7": "Omembe"
+      "9": "Citati"
+      "11": "Urejanja"
+      "12": "Poslano"
+      "13": "Prejeto"
+      "14": "Čaka odobritev"
+    categories:
+      all: "vse kategorije"
+      all_subcategories: "vse v %{categoryName}"
+      no_subcategory: "nič"
+      category: "Kategorija"
+      category_list: "Prikaži seznam kategorij"
+      reorder:
+        title: "Razvrsti Kategorije"
+        title_long: "Reorganiziraj seznam kategorij"
+        fix_order: "Fiksiraj pozicije"
+        fix_order_tooltip: "Nimajo vse kategorije unikatne številke pozicije kar lahko pripelje do nepričakovanih rezultatov."
+        save: "Shrani vrstni red"
+        apply_all: "Uporabi"
+        position: "Pozicija"
+      posts: "Objave"
+      topics: "Teme"
+      latest: "Najnovejše"
+      latest_by: "najnovejše po"
+      toggle_ordering: "preklop nadzora razvrščanja"
+      subcategories: "Pod Kategorija"
+      topic_sentence:
+        few: '%{count} tem'
+        one: 1 tema
+        other: '%{count} tem'
+        two: 1 tema
+      topic_stat_sentence:
+        few: '%{count} nove teme v preteklih %{unit}.'
+        one: '%{count} nova tema v preteklih %{unit}.'
+        other: '%{count} novih tem v preteklih %{unit}.'
+        two: '%{count} novi temi v preteklih %{unit}.'
+    ip_lookup:
+      title: Poizvedba IP naslova
+      hostname: Ime gostitelja
+      location: Lokacija
+      location_not_found: (neznano)
+      organisation: Organizacija
+      phone: Telefon
+      other_accounts: "Ostali računi s tem IP naslovom:"
+      delete_other_accounts: "Izbriši %{count}"
+      username: "uporabniško ime"
+      trust_level: "TL"
+      read_time: "čas prebiranja"
+      topics_entered: "vstop v teme"
+      post_count: "# objave"
+      confirm_delete_other_accounts: "Si prepričan, da želiš izbrisati te račune?"
+      powered_by: "podprto s strani <a href='https://ipinfo.io'>ipinfo.io</a>"
+    user_fields:
+      none: "(izberi možnost)"
+    user:
+      said: "{{username}}:"
+      profile: "Profil"
+      mute: "Molče"
+      edit: "Uredi Nastavitve"
+      download_archive:
+        button_text: "Prenesi vse"
+        confirm: "Si prepričan/a, da želiš prenesti svoje objave?"
+        success: "Prenos se je začel, obveščen/a boš s sporočilom, ki bo prenos končan."
+        rate_limit_error: "Objave so lahko prevešene enkrat dnevno, poskusi ponovno jutri."
+      new_private_message: "Novo Sporočilo"
+      private_message: "Sporočilo"
+      private_messages: "Sporočila"
+      activity_stream: "Aktivnost"
+      preferences: "Nastavitve"
+      expand_profile: "Razširi"
+      bookmarks: "Zaznamki"
+      bio: "O meni"
+      invited_by: "Povabljen od"
+      trust_level: "Nivo zaupanja"
+      notifications: "Obvestila"
+      statistics: "Statistika"
+      desktop_notifications:
+        not_supported: "Oprosti. Obvestila niso podprta s tem brekalnikom."
+        perm_default: "Vklopi Obvestila"
+        perm_denied_btn: "Dovoljenje Zavrnjeno"
+        perm_denied_expl: "Zavrnili ste dovoljenje za obvestila. Omogočite obvestila v nastavitvah vašega brskalnika."
+        disable: "Onemogoči Obvestila"
+        enable: "Omogoči Obvestila"
+        each_browser_note: "Opomba: To nastavitev morate spremeniti v vseh brskalnikih, ki jih uporabljate."
+      dismiss_notifications_tooltip: "Označi vsa neprebrana sporočila kot Prebrana"
+      disable_jump_reply: "Ne skoči na mojo objavo po tem ko odgovorim"
+      dynamic_favicon: "Pokaži števec novih /posodobljenih tem na ikoni brskalnika"
+      allow_private_messages: "Dovoli drugim uporabnikom da mi pošiljajo zasebna sporočila."
+      external_links_in_new_tab: "Odpri vse zunanje povezave v novem zavihku"
+      enable_quoting: "Omogoči odgovarjanje s citiranjem za poudarjen tekst"
+      change: "spremeni"
+      moderator: "{{user}} je moderator"
+      admin: "{{user}} je admin"
+      moderator_tooltip: "Uporabnik je moderator"
+      admin_tooltip: "Uporabnik je admin"
+      silenced_tooltip: "Ta uporabnik je utišan"
+      suspended_notice: "Ta uporabnik je suspendiran do {{date}}."
+      suspended_permanently: "Ta uporabnik je suspendiran"
+      suspended_reason: "Razlog:"
+      github_profile: "Github"
+      email_activity_summary: "Povzetek aktivnosti"
+      mailing_list_mode:
+        instructions: |
+          Ta nastavitev spremeni  povzetek aktivnosti.<br />
+          Izključene teme in kategorije niso vključene v ta obvestila.
+        individual: "Pošlji email za vsako novo objavo"
+        individual_no_echo: "Pošlji email za vsako novo objavo, razen mojih"
+      watched_categories: "Spremljano"
+      tracked_categories: "Sledena"
+      watched_first_post_tags: "Opazuješ prvo objavo"
+      muted_categories: "Zamolčano"
+      muted_categories_instructions: "O temah v teh kategorijah ne boste obveščeni in ne bodo se pojavile med najnovejšimi."
+      no_category_access: "Kot moderator imaš omejen dostop do kategorije, shranjevanje je onemogočeno"
+      delete_account: "Izbriši Moj Račun"
+      delete_account_confirm: "Si prepričan, da želiš trajno izbrisati svoj račun? Tega postopka ni mogoče razveljaviti!"
+      deleted_yourself: "Vaš račun je bil uspešno izbrisan."
+      unread_message_count: "Sporočila"
+      admin_delete: "Izbriši"
+      users: "Uporabniki"
+      muted_users: "Zamolčano"
+      muted_users_instructions: "Onemogoči vsa obvestila povezana s temi uporabniki."
+      muted_topics_link: "Pokaži zamolčane teme"
+      watched_topics_link: "Pokaži opazovane teme"
+      tracked_topics_link: "Pokaži sledene teme"
+      automatically_unpin_topics: "Samodejno odpni temo ko dosežem dno teme."
+      staff_counters:
+        flags_given: "oznake v pomoč"
+        flagged_posts: "označene objave"
+        deleted_posts: "izbrisane objave"
+        warnings_received: "opozorila"
+      messages:
+        all: "Vse"
+        inbox: "Prejeto"
+        sent: "Poslano"
+        archive: "Arhiv"
+        groups: "Moje Skupine"
+        bulk_select: "Izberi Sporočila"
+        move_to_inbox: "Premakni v Prejeto"
+        move_to_archive: "Arhiv"
+      preferences_nav:
+        profile: "Profil"
+        emails: "Emaili"
+        notifications: "Obvestila"
+        categories: "Kategorije"
+        tags: "Oznake"
+        interface: "Uporabniški vmesnik"
+        apps: "Aplikacije"
+      change_password:
+        success: "(email poslan)"
+        in_progress: "(pošiljanje emaila)"
+        error: "(napaka)"
+        action: "Pošlji sporočilo za ponastavitev gesla"
+        set_password: "Nastavi geslo"
+        choose_new: "Izberite novo geslo"
+        choose: "Izberite geslo"
+      change_about:
+        title: "Spremeni O meni"
+      change_username:
+        title: "Spremeni uporabniško ime"
+        confirm: "Če spremenite uporabniško ime, vaši obstoječi citati in omembe @imena ne bodo več  delovali. Ali ste prepričani da to želite?"
+        taken: "Oprosti, to uporabniško ime je zasedeno."
+        invalid: "Uporabniško ime ni pravilno. Vsebuje lahko samo črke in številke. Preslednica in posebni znaki niso dovoljeni."
+      change_email:
+        title: "Spremeni email"
+        taken: "Ta email ni na voljo"
+        error: "Prišlo je do napake pri menjavi emaila. Je ta email že v uporabi?"
+      change_avatar:
+        title: "Menjaj profilno sliko"
+        gravatar_title: "Spremeni svoj avatar na Gravatar strani"
+        refresh_gravatar_title: "Osveži svoj Gravatar"
+        letter_based: "Sistemsko privzeta profilna slika"
+        uploaded_avatar: "Slika po meri"
+        uploaded_avatar_empty: "Dodaj sliko po meri"
+        upload_title: "Prenesi svojo sliko"
+        upload_picture: "Prenesi sliko"
+        image_is_not_a_square: "Opozorilo: obrezali smo vašo sliko; širina in višina nista bili enaki."
+        cache_notice: "Uspešno ste menjali profilno sliko, vendar utegne zaradi brskalnikovega predpomnilnika trajati nekaj časa, da se pojavi na strani."
+      change_profile_background:
+        title: "Ozadje profila"
+        instructions: "Ozadje profila bo centrirano in imelo širino 850px."
+      change_card_background:
+        title: "Ozadje kartice uporabnika"
+      email:
+        title: "Email"
+        instructions: "nikoli ne pokaži javno"
+        invalid: "Prosim vnesite veljaven email naslov"
+      name:
+        title: "Ime"
+        instructions: "vaše polno ime (neobvezno)"
+        instructions_required: "Vaše polno ime"
+        too_short: "Ime je prekratko"
+      username:
+        title: "Uporabniško ime"
+        instructions: "unikatno, brez presledkov, kratko"
+        short_instructions: "Ljudje vas lahko omenijo kot @{{username}}"
+        available: "Vaše uporabniško ime je prosto"
+        not_available: "Ni na voljo. Poskusi {{suggestion}}?"
+        not_available_no_suggestion: "Ni na voljo"
+        too_short: "Vaše uporabniško ime je prekratko"
+        too_long: "Vaše uporabniško ime je predolgo"
+        checking: "Preverjam če je uporabniško ime  prosto..."
+        prefilled: "Email ustreza uporabniškemu imenu"
+      locale:
+        title: "Jezik vmesnika"
+        instructions: "Jezik uporabniškega vmesnika. Zamenjal se bo ko boste osvežili stran."
+        default: "(privzeto)"
+        any: "katerokoli"
+      password_confirmation:
+        title: "Geslo - ponovno"
+      last_posted: "Zadnja objava"
+      last_seen: "Viden/a"
+      created: "Pridružen/a"
+      log_out: "Izpis"
+      location: "Lokacija"
+      website: "Spletna stran"
+      email_settings: "Email"
+      like_notification_frequency:
+        title: "Obvesti o všečkih"
+        always: "Zmeraj"
+        first_time_and_daily: "Prvič ko je objava všečkana in dnevno"
+        first_time: "Prvič ko je objava všečkana"
+        never: "Nikoli"
+      email_previous_replies:
+        title: "Vključi prejšnje odgovore na koncu emailov"
+        unless_emailed: "če ni že poslano"
+        always: "zmeraj"
+        never: "nikoli"
+      email_digests:
+        title: "Kadar ne obiščem redno, mi pošljite pregled popularnih tem in objav."
+        every_30_minutes: "vsakih 30 minut"
+        every_hour: "vsako uro"
+        daily: "dnevno"
+        every_three_days: "vsake tri dni"
+        weekly: "tedensko"
+        every_two_weeks: "vsaka dva tedna"
+      include_tl0_in_digests: "V preglednih emailih vključi vsebino, ki so jo dodali novi uporabniki "
+      email_direct: "Pošlji mi email, kadar me kdo citira, odgovori na mojo objavo, omeni moje @uporabniško ime ali pa me povabi k temi"
+      email_private_messages: "Pošlji mi email, kadar prejmem sporočilo"
+      email_always: "Pošlji mi email obvestila tudi kadar sem aktivna/en na strani"
+      other_settings: "Ostalo"
+      categories_settings: "Kategorije"
+      new_topic_duration:
+        after_1_day: "ustvarjeno v zadnjem dnevu"
+        after_2_days: "ustvarjeno v zadnjih 2 dnevih"
+        after_1_week: "ustvarjeno v zadnjem tednu"
+        after_2_weeks: "ustvarjeno v zadnjih 2 tednih"
+      auto_track_options:
+        never: "nikoli"
+        immediately: "takoj"
+        after_30_seconds: "po 30 sekundah"
+        after_1_minute: "po 1 minuti"
+        after_2_minutes: "po 2 minutah"
+        after_3_minutes: "po 3 minutah"
+        after_4_minutes: "po 4 minutah"
+        after_5_minutes: "po 5 minutah"
+        after_10_minutes: "po 10 minutah"
+      invited:
+        title: "Povabila"
+        user: "Povabljen uporabnik"
+        sent: "Poslano"
+        posts_read_count: "Prebranih objav"
+        rescind: "Odstrani"
+        rescinded: "Vabilo odstranjeno"
+        rescind_all: "Odstrani vsa vabila"
+        rescinded_all: "Vsa vabila so odstranjena!"
+        rescind_all_confirm: "Ste prepričani, da želite odstraniti vsa vabila?"
+        reinvite: "Ponovno pošlji vabilo"
+        reinvite_all: "Ponovno pošlji vsa vabila"
+        reinvite_all_confirm: "Ste prepričani, da želite ponovno poslati vsa vabila?"
+        reinvited: "Vabilo ponovno poslano"
+        reinvited_all: "Vsa vabila ponovno poslana!"
+        time_read: "Čas branja"
+        account_age_days: "Starost računa v dnevih"
+        create: "Pošlji vabilo"
+      password:
+        title: "Geslo"
+        too_short: "Vaše geslo je prekratko."
+        common: "To geslo je preveč običajno."
+        same_as_username: "Vađe geslo je enako kot uporabniško ime."
+        same_as_email: "Vaše geslo je enako kot uporabniško ime."
+        ok: "Vaše geslo je videti v redu."
+      summary:
+        title: "Vsebina"
+        stats: "Statistika"
+        time_read: "čas branja"
+        recent_time_read: "nedaven čas branja"
+        post_count:
+          few: ustvarjenih objav
+          one: ustvarjena objava
+          other: ustvarjenih objav
+          two: ustvarjeni  objavi
+        topics_entered:
+          few: ogledanih tem
+          one: ogledana tema
+          other: ogledanih tem
+          two: ogledani temi
+        posts_read:
+          few: prebranih objav
+          one: prebrana objava
+          other: prebranih objav
+          two: prebrani objavi
+        top_replies: "Najboljši odgovori"
+        top_topics: "Najboljše teme"
+        no_topics: "Ni tem."
+        more_topics: "Več tem"
+        top_badges: "Najboljše značke"
+        top_links: "Najboljše povezave"
+      stream:
+        posted_by: "Objavil"
+        the_topic: "tema"
+    errors:
+      reasons:
+        forbidden: "Dostop Zavrnjen"
+        unknown: "Napaka"
+      desc:
+        server: "Oznaka napake: {{status}}"
+        unknown: "Nekaj je šlo narobe."
+      buttons:
+        back: "Nazaj"
+    close: "Zapri"
+    logout: "Bili ste odjavljeni."
+    too_few_topics_and_posts_notice: "Začnimo z  <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>diskusijo!</a> Trenutno imamo <strong>%{currentTopics} / %{requiredTopics}</strong> tem in <strong>%{currentPosts} / %{requiredPosts}</strong>  objav. Novi obiskovalci potrebujejo vsebine, ki jih lahko preberejo in se nanje odzovejo."
+    too_few_topics_notice: "Začnimo z <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>diskusijo!</a> Trenutno imamo <strong>%{currentTopics} / %{requiredTopics}</strong> tem. Novi obiskovalci  potrebujejo vsebine, ki jih lahko preberejo in se nanje odzovejo."
+    too_few_posts_notice: "Začnimo z <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>diskusijo!</a> Trenutno imamo <strong>%{currentPosts} / %{requiredPosts}</strong> objav. Novi obiskovalci potrebujejo vsebine, ki jih lahko preberejo in se nanje odzovejo."
+    all_time_desc: 'skupaj ustvarjenih tem'
+    year: 'leto'
+    year_desc: 'teme, ustvarjene v preteklih 365 dneh'
+    month_desc: 'teme, ustvarjene v preteklih 30 dneh'
+    week: 'teden'
+    week_desc: 'teme, ustvarjene v preteklih 7 dneh'
+    first_post: Prva objava
+    last_post: Objavljeno
+    replies_lowercase:
+      few: odgovorov
+      one: odgovor
+      other: odgovorov
+      two: odgovora
+    summary:
+      enabled_description: "Ogledujete si povzetek teme: najbolj zanimive objave, kot jih je določila skupnost."
+      enable: 'Pripravi povzetek teme'
+      disable: 'Prikaži vse objave'
+    deleted_filter:
+      enabled_description: "Ta tema vsebuje izbrisane objave, ki so skrite."
+      disabled_description: "Izbrisane objave so prikazane."
+      enable: "Skrij izbrisane objave"
+      disable: "Prikaži izbrisane objave"
+    username: 'Uporabniško ime'
+    search_hint: 'uporabniško ime, email ali IP naslov'
+    create_account:
+      failed: "Nekaj je šlo narobe, morda je ta email naslov že registriran, poskusite povezavo za pozabljeno geslo"
+    forgot_password:
+      title: "Ponastavitev gesla"
+      action: "Pozabil sem geslo"
+      invite: "Vpišite uporabniško ime ali email in poslali vam bomo email za ponastavitev gesla."
+      reset: "Ponastavi geslo"
+      help: "Ali elektronska pošta ne prihaja? Najprej preverite mapo z neželeno pošto.<p>Ne veste kateri elektronski naslov ste uporabili? Vpišite elektronski naslov in povedali vam bomo če obstaja pri nas.</p><p>Če nimate več dostopa do elektronskega naslova vašega računa kontaktirajte o <a href='/about'>našo ekipo.</a></p>"
+    login:
+      title: "Prijava"
+      username: "Uporabnik"
+      password: "Geslo"
+      email_placeholder: "email ali uporabniško ime"
+      blank_username_or_password: "Prosimo vpišite email ali uporabniško ime in geslo."
+      reset_password: 'Ponastavi geslo'
+      awaiting_activation: "Vaš uporabniški račun čaka aktivacijo, uporabite povezavo za pozabljeno geslo če želite prejeti še en email za aktivacijo."
+      provide_new_email: "Vpišite nov naslov in ponovno vam bomo poslali potrditveno sporočilo."
+      to_continue: "Prosimo če se prijavite"
+      preferences: "Za spremembo nastavitev morate biti prijavljeni."
+      google:
+        message: "Overjanje z Googlom (pazi, da pojavno okno ne bo preprečeno)"
+      google_oauth2:
+        message: "Overjanje z Googlom (pazi, da pojavno okno ne bo preprečeno)"
+      twitter:
+        message: "Overjanje s Twittrom (pazi, da pojavno okno ne bo preprečeno)"
+      facebook:
+        message: "Overjanje s Facebookom (pazi, da pojavno okno ne bo preprečeno)"
+      yahoo:
+        message: "Overjanje z Yahoojem (pazi, da pojavno okno ne bo preprečeno)"
+      github:
+        message: "Overjanje z GitHubom (pazi, da pojavno okno ne bo preprečeno)"
+    invites:
+      password_label: "Nastavi geslo"
+    category_page_style:
+      categories_with_featured_topics: "Kategorije z izpostavljenimi temami"
+      categories_and_latest_topics: "Kategorije in najnovejše teme"
+    emoji_picker:
+      activity: Aktivnost
+    composer:
+      cannot_see_mention:
+        category: "Omenil si uporabnika {{username}} , a ta ne bo obveščen saj nima dostopa do te kategorije. Dodati ga je potrebno v skupino ki lahko dostopa do kategorije."
+        private: "Omenili ste uporabnika {{username}} , a ta ne bo obveščen, ker ne more videti tega osebnega sporočila. Moraii ga boste povabiti v to osebno sporočilo."
+      error:
+        post_missing: "Objava ne sme biti prazna"
+        post_length: "Objava mora vsebovati vsaj {{min}} znakov"
+        category_missing: "Izbrati morate kategorijo"
+      reply_here: "Odgovori tu"
+      reply: "Odgovori"
+      create_topic: "Ustvari temo"
+      users_placeholder: "Dodaj uporabnika"
+      title_or_link_placeholder: "Na tem mestu vpiši naslov ali prilepi povezavo "
+      reply_placeholder: "Tu lahko pišeš. Možna je uporaba Markdown, BBcode ali HTML za oblikovanje. Sem lahko povlečeš ali prilepiš sliko."
+      view_new_post: "Oglej si tvojo novo objavo"
+      saved_draft: "Osnutek  objave v pripravi. Izberi za nadaljevanje."
+      quote_post_title: "Citiraj celo objavo"
+      paste_code_text: "vpiši ali prilepi kodo"
+      composer_actions:
+        toggle_whisper:
+          desc: Šepeti so vidni samo skrbnikom
+    notifications:
+      mentioned: "<span>{{username}}</span> {{description}}"
+      group_mentioned: "<span>{{username}}</span> {{description}}"
+      quoted: "<span>{{username}}</span> {{description}}"
+      replied: "<span>{{username}}</span> {{description}}"
+      posted: "<span>{{username}}</span> {{description}}"
+      edited: "<span>{{username}}</span> {{description}}"
+      liked: "<span>{{username}}</span> {{description}}"
+      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      liked_many:
+        few: <span>{{username}}, {{username2}} in {{count}} drugih</span> {{description}}
+        one: <span>{{username}}, {{username2}} in še 1</span> {{description}}
+        other: <span>{{username}}, {{username2}} in {{count}} drugih</span> {{description}}
+        two: <span>{{username}}, {{username2}} in 2 druga</span> {{description}}
+      private_message: "<span>{{username}}</span> {{description}}"
+      invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
+      invited_to_topic: "<span>{{username}}</span> {{description}}"
+      invitee_accepted: "<span>{{username}}</span> je sprejel tvoje vabilo"
+      linked: "<span>{{username}}</span> {{description}}"
+      topic_reminder: "<span>{{username}}</span> {{description}}"
+    search:
+      sort_by: "Uredi po"
+      relevance: "Relevanci"
+      latest_post: "Zadnja objava"
+      latest_topic: "Zadnja tema"
+      most_viewed: "Številu ogledov"
+      most_liked: "Številu všečkov"
+      select_all: "Izberi vse"
+      clear_all: "Počisti vse"
+      too_short: "Niz za iskanje je prekratek"
+      title: "išči po temah, objavah, uporabnikih ali kategorijah"
+      no_results: "Iskanje nima zadetkov."
+      no_more_results: "Ni več zadetkov iskanja."
+      searching: "Iščem ..."
+      post_format: "#{{post_number}} od {{username}}"
+      results_page: "Zadetki iskanja za '{{term}}'"
+      more_results: "Obstaja več zadetkov. Prosimo zožite kriterije iskanja."
+      cant_find: "Ne najdete tega kar iščete?"
+      start_new_topic: "Bi mogoče ustvarili novo temo?"
+      or_search_google: "Ali poskusite iskati z Googlom:"
+      search_google: "Poskusite iskati z Googlom:"
+      search_google_button: "Google"
+      search_google_title: "Išči po tem spletnem mestu"
+      context:
+        user: "Išči objave od @{{username}}"
+        category: "Išči po #{{category}} kategoriji"
+        topic: "Išči po tej temi"
+        private_messages: "Išči po sporočilih"
+      advanced:
+        title: Napredno iskanje
+        posted_by:
+          label: Objavil
+        in_category:
+          label: Kategorizirano
+        in_group:
+          label: V skupini
+        with_badge:
+          label: Z značko
+        with_tags:
+          label: Označeno
+        filters:
+          label: Vrni samo teme/objave...
+          likes: Ki sem jih všečkal
+          posted: Objavil sem v
+          watching: Ki jih opazujem
+          tracking: Ki jim sledim
+          private: V mojih sporočilih
+          bookmarks: Kjer sem ustvaril zaznamek
+          first: ob prvi objavi
+          pinned: so pripete
+          unpinned: niso pripete
+          seen: Ki sem jih prebral
+          unseen: Ki jih nisem prebral
+          wiki: so wiki
+          images: Vsebujejo sliko(e)
+          all_tags: Vse zgornje oznake
+        statuses:
+          label: Kjer tema
+          open: so odprte
+          closed: so zaprte
+          archived: so arhivirane
+          noreplies: nimajo nobenega odgovora
+          single_user: vključujejo samo enega uporabnika
+        post:
+          count:
+            label: Minimalno število objav
+          time:
+            label: Objavljeno
+            before: pred
+            after: po
+    hamburger_menu: "pojdi na drug seznam tem ali kategorijo"
+    not_logged_in_user: 'stran uporabnika s povzetkom trenutnih aktivnosti in nastavitev'
+    current_user: 'pojdi na svojo uporabniško stran'
+    topics:
+      new_messages_marker: "zadnji obisk"
+      bulk:
+        select_all: "Izberi vse"
+        clear_all: "Počisti vse"
+        unlist_topics: "Odstrani temo s seznama"
+        relist_topics: "Postavi temo nazaj na seznam"
+        reset_read: "Ponastavi prebrano"
+        delete: "Izbriši teme"
+        dismiss: "Zavrni"
+        dismiss_read: "Zavrni vse neprebrane"
+        dismiss_button: "Zavrni"
+        dismiss_new: "Zavrni Nove"
+        change_category: "Določi kategorijo"
+        choose_new_category: "Izberi novo kategorijo za temo:"
+      none:
+        unread: "Nimate neprebranih tem."
+        new: "Nimate novih tem."
+        latest: "Ni najnovejših tem. "
+        bookmarks: "Zaenkrat še nimate tem z zaznamki."
+        category: "Ni tem za kategorijo {{category}} ."
+        educate:
+          new: '<p>Tu se prikažejo vaše nove teme.</p><p>Privzeto se teme prikažejo kot nove in bodo imele oznako  <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">novo</span> če so bile ustvarjene v zadnjih  2 dneh.</p><p>Obiščite  <a href="%{userPrefsUrl}">nastavitve</a> če želite spremembo.</p>'
+          unread: '<p>Tu se prikažejo vaše neprebrane teme.</p><p>Privzeto se teme prikažejo kot neprebrane z prikazom števila <span class="badge new-posts badge-notification">1</span> če ste:</p><ul><li>Ustvarili temo</li><li>Odgovorili na temo</li><li>Brali temo več kot 4 minute</li></ul><p>Izrecno nastavili temo kot "Opazovano" ali "Sledeno" preko nastavitev obveščenja na dnu teme.</p><p>Pojdite na  <a href="%{userPrefsUrl}">nastavitve</a> če želite spremembo.</p>'
+      bottom:
+        latest: "Ni več najnovejših tem"
+        hot: "Ni več vročih tem."
+        posted: "Ni več objavljenih tem."
+        read: "Ni več prebranih tem."
+        new: "Ni več novih tem-"
+        unread: "Ni več neprebranih tem."
+        category: "Ni več tem v kategoriji  {{category}}."
+        top: "Ni več najboljših tem."
+        bookmarks: "Ni več tem z zaznamki."
+    topic:
+      create: 'Nova tema'
+      create_long: 'Ustvari novo temo'
+      new: 'nova tema'
+      new_topics:
+        few: '{{count}} novih tem'
+        one: 1 nova tema
+        other: '{{count}} novih  tem'
+        two: 2 novi temi
+      title: 'Tema'
+      invalid_access:
+        title: "Tema je zasebna"
+        description: "Oprostite, do te teme nimate dostopa!"
+      browse_all_categories: Brskajte po vseh kategorijah
+      view_latest_topics: poglej najnovejše teme
+      topic_status_update:
+        when: "Kdaj:"
+        private_timer_types: Časovne nastavitve uporabniških tem
+      auto_update_input:
+        none: "Izberi časovni okvir"
+        later_today: "Kasneje v dnevu"
+        tomorrow: "Jutri"
+        later_this_week: "Kasneje v tednu"
+        this_weekend: "Ta vikend"
+        next_week: "Naslednji teden"
+        two_weeks: "Dva tedna"
+        next_month: "Naslednji mesec"
+        three_months: "Tri mesece"
+        six_months: "Šest mesecev"
+        one_year: "Eno leto"
+        pick_date_and_time: "Izberi datum in čas"
+        set_based_on_last_post: "Kloniraj na podlagi zadnje objave"
+      reminder:
+        title: "Opomni me"
+      status_update_notice:
+        auto_publish_to_category: "Ta tema bo objavljena v <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
+      timeline:
+        back: "Nazaj"
+      progress:
+        go_top: "na vrh"
+        go_bottom: "dno"
+        go: "pojdi"
+        jump_bottom: "skoči na zadnjo objavo"
+        jump_prompt: "skoči na..."
+        jump_prompt_of: "od %{count} objav"
+        jump_bottom_with_number: "skoči do objave %{post_number}"
+        total: število objav
+      notifications:
+        title: spremenite kako pogosto želite biti obveščeni o tej temi
+        reasons:
+          mailing_list_mode: "Omogočen imate način seznama elektronske pošte, zato boste o tej temi obveščeni preko elektronske pošte."
+          "3_6": 'Prejemali boste obvestila ker opazujete to kategorijo.'
+          "2_8": 'Videli boste število novih odgovorov, ker sledite tej kategoriji.'
+          "2_4": 'Videli boste število novih odgovorov, ker ste objavili odgovor na to temo.'
+          "2_2": 'Videli boste število novih odgovorov, ker sledite tej temi.'
+          "2": 'Videli boste število novih odgovorov, ker ste . <a href="/u/{{username}}/preferences">prebrali to temo</a>.'
+          "0_7": 'Ignorirate vsa obvestila za to kategorijo.'
+        watching_pm:
+          title: "Opazujem"
+        watching:
+          title: "Opazujem"
+        tracking_pm:
+          title: "Sledim"
+        tracking:
+          title: "Sledim"
+        regular:
+          title: "Normalno"
+        regular_pm:
+          title: "Normalno"
+        muted_pm:
+          title: "Utišano"
+        muted:
+          title: "Utišano"
+          description: "Nikoli ne boste obveščeni o tej temi. Ta tema se ne bo pojavila med najnovejšimi."
+      actions:
+        delete: "Izbriši temo"
+        open: "Odpri temo"
+        close: "Zapri temo"
+        pin: "Pripni temo"
+        unpin: "Odpni temo"
+        archive: "Arhiviraj temo"
+        make_public: "Spremeni v javno temo"
+        make_private: "Spremeni v osebno sporočilo"
+      feature:
+        pin: "Pripni temo"
+        unpin: "Odpni temo"
+        pin_globally: "Pripni temo globalno"
+      reply:
+        title: 'Odgovori'
+        help: 'začni sestavljati odgovor na to temo'
+      clear_pin:
+        title: "Odpni temo"
+      share:
+        title: 'Deli'
+        help: 'deli povezavo do te teme'
+      print:
+        title: 'Natisni'
+        help: 'Odpri tiskalniku prilagojeno verzijo te teme'
+      flag_topic:
+        title: 'Zastavica'
+        success_message: 'Uspešno ste označili to temo.'
+      feature_topic:
+        pin: "Naj se ta tema prikaže na vrhu kategorije {{categoryLink}} do"
+        confirm_pin: "Trenutno imate  {{count}} pripetih tem. Preveč pripetih tem je lahko breme za nove in anonimne uporabnike. Ali ste prepričani da želite pripeti še eno temo v to kategorijo?"
+        pin_validation: "Datum je zahtevan, če želite pripeti to temo."
+        not_pinned: "Ni pripetih tem v {{categoryLink}}."
+        already_pinned:
+          few: 'Trenutno pripete teme v {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: 'Trenutno pripeta tema v {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          other: 'Trenutno pripete teme v {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          two: 'Trenutno pripeti temi v {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+        pin_globally: "Ta tema naj se pojavi na vrhu vseh seznamov tem do"
+        confirm_pin_globally: "Trenutno imate {{count}} globalno pripetih tem. Preveč pripetih tem je lahko breme za nove in anonimne uporabnike. Ali ste prepričani da želite pripeti še eno globalno  temo?"
+        unpin_globally: "Odstrani to temo z vrha vseh seznamov tem."
+        global_pin_note: "Uporabniki lahko sami zase odpnejo temo."
+        not_pinned_globally: "Ni globalno pripetih tem."
+        already_pinned_globally:
+          few: 'Trenutno globalno pripete teme: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: 'Trenutno globalno pripeta tema: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Trenutno globalno pripete teme: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          two: 'Trenutno globalno pripeti temi: <strong class=''badge badge-notification unread''>2</strong>'
+      invite_private:
+        title: 'Povabi k sporočilu'
+        email_or_username: "Email ali uporabniško ime vabljenega"
+        email_or_username_placeholder: "email ali uporabniško ime "
+        action: "Povabi"
+        success: "Povabili smo uporabnico/ka, da sodeluje v tem pogovoru."
+        success_group: "Povabili smo skupino, da sodeluje v tem pogovoru."
+        error: "Prišlo je do napake ob vabilu uporabnika."
+        group_name: "ime skupine"
+      invite_reply:
+        title: 'Povabi'
+        username_placeholder: "uporabniško ime"
+        action: 'Pošlji vabilo'
+      login_reply: 'Za odgovor je potrebna prijava'
+      filters:
+        cancel: "Odstrani filter"
+      split_topic:
+        title: "Prestavi v novo temo"
+        action: "prestavi v novo temo"
+        topic_name: "Ime nove teme"
+    post:
+      quote_reply: "Citiraj"
+      abandon:
+        no_value: "Ne, ohrani"
+        yes_value: "Ja, zavrži"
+      controls:
+        edit: "uredi objavo"
+        edit_action: "Uredi"
+        delete: "izbriši objavo"
+        more: "Več"
+      actions:
+        flag: 'Zastavica'
+      revisions:
+        controls:
+          edit_wiki: "Uredi wiki"
+          edit_post: "Uredi objavo"
+        displays:
+          inline:
+            button: 'HTML'
+          side_by_side:
+            button: 'HTML'
+      raw_email:
+        displays:
+          text_part:
+            button: 'Besedilo'
+          html_part:
+            button: 'HTML'
+    category:
+      none: '(brez kategorije)'
+      all: 'Vse kategorije'
+      choose: 'Izberi kategorijo&hellip;'
+      edit: 'uredi'
+      edit_long: "Uredi"
+      view: 'Poglej teme v kategoriji'
+      tags_allowed_tags: "V tej kategoriji dovoli samo te oznake:"
+      tags_allowed_tag_groups: "V tej kategoriji bodo dovoljene samo oznake teh skupin:"
+      topic_featured_link_allowed: "Dovoli najboljše povezave v tej kategoriji"
+      delete: 'Izbriši kategorijo'
+      create: 'Nova kategorija'
+      create_long: 'Ustvari novo kategorijo'
+      save: 'Shrani kategorijo'
+      slug: 'Url kategorije'
+      creation_error: Prišlo je do napake pri kreiranju kategorije.
+      save_error: Prišlo je do napake pri shranjevanju kategorije.
+      name: "Ime kategorije"
+      description: "Opis"
+      topic: "kategorija teme"
+      logo: "Logotip slika kategorije"
+      background_image: "Slika ozadja kategorije"
+      badge_colors: "Barve značk"
+      background_color: "Barva ozadja"
+      foreground_color: "Barva ospredja"
+      delete_confirm: "Ste prepričani da želite izbrisati kategorijo?"
+      delete_error: "Prišlo je do napake pri brisanju kategorije."
+      no_description: "Prosimo dodajte opis kategorije."
+      change_in_category_topic: "Uredi opis"
+      already_used: 'Ta barva je že uporabljena na drugi kategoriji.'
+      security: "Varnost"
+      special_warning: "Ta kategorija je prednastavljena, zato varnostnih nastavitev ni mogoče urejati. Če ne želite uporabljati te kategorije jo raje izbrišite kot uporabljajte v drug namen."
+      images: "Slike"
+      mailinglist_mirror: "Kategorija zrcali poštni seznam"
+      show_subcategory_list: "Prikaži seznam podkategorij nad temami za to kategorijo."
+      subcategory_num_featured_topics: "Število osrednjih tem na strani nadrejene kategorije:"
+      subcategory_list_style: "Stil seznama podkategorij:"
+      allow_badges_label: "Omogoči nagrajevanje z značkami v tej kategoriji"
+      this_year: "to leto"
+      position_disabled: "Kategorije bodo razvrščene glede na aktivnost. Za kontrolo razvrščanja kategorij na seznamih, "
+      position_disabled_click: 'omogoči nastavitev "fiksnih položajev kategorij"'
+      parent: "Nadrejena kategorija"
+      notifications:
+        regular:
+          title: "Normalno"
+        muted:
+          title: "Utišan"
+          description: "O novih temah v teh kategorijah ne boste obveščeni in ne bodo se pojavile med najnovejšimi."
+      sort_options:
+        default: "privzeto"
+        likes: "Všečki"
+        op_likes: "Všečki originalne objave"
+        views: "Ogledi"
+        posts: "Objave"
+        activity: "Aktivnost"
+        posters: "Avtorji"
+        category: "Kategorija"
+        created: "Ustvarjeno"
+      sort_ascending: 'Naraščajoče'
+      sort_descending: 'Padajoče'
+    flagging:
+      action: 'Postavi zastavico na objavo'
+      notify_action: 'Sporočilo'
+      ip_address_missing: "(N/A)"
+      hidden_email_address: "(skrito)"
+    flagging_topic:
+      action: "Postavi zastavico na objavo"
+      notify_action: "Sporočilo"
+    topic_map:
+      title: "Povzetek teme"
+      links_title: "Popularne povezave"
+    topic_statuses:
+      pinned_globally:
+        title: "Pripeto globalno"
+        help: "Ta tema je pripeta globalno; prikazala se bo na vrhu zadnjih in njene kategorije"
+      pinned:
+        title: "Pripeto"
+        help: "Ta tema je pripeta za vas; prikazala se bo na vrhu njene kategorije"
+    posts: "Objave"
+    original_post: "Izvirna objava"
+    views: "Ogledi"
+    views_lowercase:
+      few: ogledov
+      one: ogleda
+      other: ogledov
+      two: ogleda
+    replies: "Odgovori"
+    activity: "Aktivnost"
+    likes: "Všečki"
+    likes_lowercase:
+      few: všečki
+      one: všeček
+      other: všečki
+      two: všečka
+    users: "Uporabniki"
+    users_lowercase:
+      few: uporabnikov
+      one: uporabnik
+      other: uporabnikov
+      two: uporabnika
+    category_title: "Kategorija"
+    filters:
+      with_topics: "%{filter} tem"
+      with_category: "%{filter} %{category} tem"
+      latest:
+        title: "Najnovejše"
+        title_with_count:
+          few: Zadnjih ({{count}})
+          one: Zadnji (1)
+          other: Zadnjih ({{count}})
+          two: Zadnja ({{count}})
+        help: "teme z nedavnimi objavami"
+      hot:
+        title: "Vroče"
+        help: "izbira najbolj vročih tem"
+      read:
+        title: "Prebrano"
+        help: "teme, ki jih prebrali, urejene po času zadnjega  branja"
+      search:
+        title: "Iskanje"
+        help: "išči po vseh temah"
+      categories:
+        title: "Kategorije"
+        title_in: "Kategorija - {{categoryName}}"
+        help: "vse teme grupirane po kategorijah"
+      unread:
+        title: "Neprebrano"
+        title_with_count:
+          few: Neprebrani ({{count}})
+          one: Neprebrani (1)
+          other: Neprebranih ({{count}})
+          two: Neprebrani (2)
+        help: "teme, ki jih spremljate ali jim sledite z neprebranimi sporočili"
+        lower_title_with_count:
+          few: '{{count}} neprebranih'
+          one: 1 neprebran
+          other: '{{count}} neprebranih'
+          two: '{{count}} neprebrana'
+      new:
+        lower_title_with_count:
+          few: '{{count}} novih'
+          one: 1 nov
+          other: '{{count}} novih'
+          two: 2 novi
+        lower_title: "novo"
+        title: "Novo"
+        title_with_count:
+          few: Novi (1)
+          one: Novi (1)
+          other: Novi ({{count}})
+          two: Novi (1)
+        help: "teme ustvarjene v zadnjih dneh"
+      posted:
+        help: "teme v katerih ste objavljali"
+      bookmarks:
+        title: "Zaznamki"
+        help: "teme v zaznamkih"
+      category:
+        title: "{{categoryName}}"
+        title_with_count:
+          few: '{{categoryName}} ({{count}})'
+          one: '{{categoryName}} (1)'
+          other: '{{categoryName}} ({{count}})'
+          two: '{{categoryName}} ({{count}})'
+        help: "zadnje teme v kategoriji {{categoryName}}"
+      top:
+        title: "Najboljše"
+        help: "najbolj aktivne teme v zadnjem letu, mesecu, tednu ali dnevu"
+        all:
+          title: "Ves čas"
+        yearly:
+          title: "V letu"
+        quarterly:
+          title: "V četrtletju"
+        monthly:
+          title: "Mesečno"
+        weekly:
+          title: "Tedensko"
+        daily:
+          title: "Dnevno"
+        all_time: "Ves čas"
+        this_year: "Leto"
+        this_quarter: "Četrtletje"
+        this_month: "Mesec"
+        this_week: "Teden"
+        today: "Danes"
+        other_periods: "poglej najboljše"
+    keyboard_shortcuts_help:
+      jump_to:
+        top: 'Na vrh'
+      actions:
+        flag: '<b>!</b> Zastavica na objavo'
+    badges:
+      title: Značke
+    tagging:
+      filters:
+        with_category: "%{filter} %{tag} tem v %{category}"
+        untagged_with_category: "%{filter} neoznačenih tem v %{category}"
+      groups:
+        new: "Nova skupina"
+        parent_tag_placeholder: "Poljubno"
+        save: "Shrani"
+        delete: "Izbriši"
+      topics:
+        none:
+          unread: "Nimate neprebranih tem."
+          new: "Nimate novih tem."
+          bookmarks: "Zaenkrat še nimate tem z zaznamki."
+        bottom:
+          latest: "Ni več zadnjih tem."
+          hot: "Ni več vročih tem."
+          posted: "Ni več objavljenih tem."
+          read: "Ni več prebranih tem."
+          new: "Ni več novih tem-"
+          unread: "Ni več neprebranih tem."
+          top: "Ni več najboljših tem."
+          bookmarks: "Ni več tem z zaznamki."
+    invite:
+      custom_message_link: "sporočilo po meri"
+      custom_message_placeholder: "Vnesi sporočilo po meri"
+  admin_js:
+    admin:
+      title: 'Discourse Admin'
+      moderator: 'Moderator'
+      dashboard:
+        version: "Verzija"
+        installed_version: "Nameščeno"
+        latest_version: "Najnovejše"
+        moderators: 'Moderatorji:'
+        admins: 'Admini:'
+        backups: "varnostne kopije"
+        page_views: "Ogledov strani"
+        page_views_short: "Ogledov strani"
+        reports:
+          today: "Danes"
+          yesterday: "Včeraj"
+          7_days_ago: "pred 7 dnevi"
+          30_days_ago: "pred 30 dnevi"
+          view_table: "tabela"
+          view_graph: "graf"
+          start_date: "Začetni datum"
+          end_date: "Končni datum"
+      flags:
+        agree_flag_hide_post: "Skrij objavo"
+        agree_flag_suspend: "Suspendiraj uporabnika"
+        agree_flag_silence: "Utišaj uporabnika"
+        agree_flag: "Ohrani objavo"
+        ignore_flag: "Ignoriraj"
+        delete: "Izbriši"
+        delete_flag_modal_title: "Izbriši in..."
+        disagree_flag_unhide_post_title: "Odstrani zastave s te objave in naredi objavo spet vidno"
+        more: "(več odgovorov...)"
+        suspend_user: "Suspendiraj uporabnika"
+        system: "Sistem"
+        error: "Prišlo je do napake"
+        reply_message: "Odgovori"
+        show_full: "pokaži celo objavo"
+        show_details: "Pokaži podrobnosti zastave"
+        details: "podrobnosti"
+        flagged_topics:
+          topic: "Tema"
+          users: "Uporabniki"
+        short_names:
+          off_topic: "ne ustreza temi (off-topic)"
+          inappropriate: "neprimerno"
+          spam: "neželeno"
+          notify_user: "po meri"
+          notify_moderators: "po meri"
+      groups:
+        primary: "Primarna skupina"
+        no_primary: "(ni primarne skupine)"
+        title: "Skupine"
+        edit: "Uredi skupino"
+        refresh: "Osveži"
+        group_members: "Člani skupine"
+        delete: "Izbriši"
+        delete_confirm: "Izbriši skupino?"
+        add: "Dodaj"
+        custom: "Po meri"
+        automatic: "Avtomatsko"
+        group_owners: Lastniki
+        add_owners: Dodaj lastnike
+      api:
+        user: "Uporabnik"
+        title: "API"
+        key: "API ključ"
+        all_users: "Vsi uporabniki"
+      web_hooks:
+        create: "Ustvari"
+        save: "Shrani"
+        destroy: "Izbriši"
+        description: "Opis"
+        secret: "Skriven"
+        wildcard_event: "Pošlji mi vse."
+        user_event:
+          name: "Dogodek uporabnika"
+        delivery_status:
+          inactive: "Nedejaven"
+          successful: "Uspešno"
+        events:
+          timestamp: "Ustvarjeno"
+      plugins:
+        title: "Vtičniki"
+        installed: "Nameščeni vtičniki"
+        name: "Ime"
+        version: "Verzija"
+        enabled: "Vključeno?"
+        is_enabled: "Y"
+        not_enabled: "N"
+        change_settings: "Spremeni nastavitve"
+        change_settings_short: "Nastavitve"
+        howto: "Kako namestim vtičnike?"
+      backups:
+        title: "Varnostne kopije"
+        menu:
+          backups: "Varnostne kopije"
+        columns:
+          filename: "Ime datoteke"
+          size: "Velikost"
+        upload:
+          label: "Naloži"
+          uploading: "Nalagam..."
+        operations:
+          cancel:
+            label: "Prekliči"
+          backup:
+            label: "Varnostna kopija"
+            title: "Ustvari varnostno kopijo"
+            confirm: "Želite ustvariti varnostno kopijo?"
+          download:
+            label: "Naloži"
+      export_csv:
+        button_text: "Izvozi"
+      export_json:
+        button_text: "Izvozi"
+      invite:
+        button_text: "Pošlji vabilo"
+        button_title: "Pošlji vabilo"
+      customize:
+        title: "Prilagodi"
+        preview: "predogled"
+        save: "Shrani"
+        import: "Uvozi"
+        delete: "Izbriši"
+        delete_confirm: "Izbriši temo?"
+        color: "Barva"
+        opacity: "Transparentnost"
+        copy: "Kopiraj"
+        copy_to_clipboard: "Kopiraj v odložišče"
+        copied_to_clipboard: "Kopirano v odložišče"
+        copy_to_clipboard_error: "Prišlo je do napake pri kopiranju v odložišče"
+        email_templates:
+          title: "Email predloge"
+          subject: "Zadeva"
+          multiple_subjects: "Ta email predloga ima več zadev."
+          revert: "Prekliči spremembe"
+          revert_confirm: "Ste prepričani, da želite preklicati spremembe?"
+        theme:
+          import_theme: "Uvozi temo"
+          customize_desc: "Prilagodi:"
+          title: "Teme"
+          edit: "Uredi"
+          common: "Skupno"
+          desktop: "Namizno"
+          mobile: "Mobilno"
+          preview: "Predogled"
+          color_scheme: "Barvna shema"
+          uploads: "Prenosi"
+          upload: "Prenesi"
+          child_themes_check: "Tema vključuje ostale pod-teme"
+          css_html: "CSS/HTML po meri"
+          edit_css_html: "Uredi CSS/HTML"
+          edit_css_html_help: "Niste uredili še nobenega CSS ali HTML."
+          about_theme: "O temi"
+          license: "Licenca"
+          updating: "Posodabljam..."
+          add: "Dodaj"
+          scss:
+            text: "CSS"
+          head_tag:
+            text: "</head>"
+            title: "HTML, ki bo vstavljen pred </head> oznako"
+          body_tag:
+            text: "</body>"
+            title: "HTML, ki bo vstavljen pred </body> oznako"
+        colors:
+          select_base:
+            title: "Izberi osnovno barvno shemo"
+            description: "Osnovna shema:"
+          title: "Barve"
+          edit: "Uredi barvne sheme"
+          long_title: "Barvne sheme"
+          new_name: "Nova barvna shema"
+          copy_name_prefix: "Kopija od"
+          delete_confirm: "Izbriši barvno shemo?"
+          undo: "razveljavi"
+          highlight:
+            name: 'izpostavljeno'
+          danger:
+            name: 'nevarnost'
+          success:
+            name: 'uspeh'
+      email:
+        title: "Emaili"
+        settings: "Nastavitve"
+        templates: "Predloge"
+        sending_test: "Pošiljam testni email..."
+        sent: "Poslano"
+        received: "Prejeto"
+        rejected: "Zavrnjeno"
+        sent_at: "Poslano"
+        time: "Čas"
+        user: "Uporabnik"
+        logs:
+          filters:
+            user_placeholder: "uporabniško ime"
+      moderation_history:
+        actions:
+          delete_user: "Uporabnik izbrisan"
+          suspend_user: "Uporabnik suspendiran"
+          silence_user: "Uporabnik utišan"
+          delete_topic: "Tema izbrisana"
+      logs:
+        topic_id: "ID teme"
+        category_id: "ID kategorije"
+        delete: 'Izbriši'
+        edit: 'Uredi'
+        save: 'Shrani'
+        screened_actions:
+          block: "blokiraj"
+          do_nothing: "ne naredi nič"
+        staff_actions:
+          all: "vse"
+          filter: "Filter:"
+          title: "Aktivnosti skrbnikov"
+          clear_filters: "Pokaži vse"
+          when: "Kdaj"
+          context: "Kontekst"
+          details: "Podrobnosti"
+          show: "Pokaži"
+          modal_title: "Podrobnosti"
+          actions:
+            delete_user: "izbriši uporabnika"
+            change_username: "spremeni uporabniško ime"
+            change_site_setting: "spremeni nastavitve strani"
+            change_theme: "menjaj temo"
+            delete_theme: "izbriši temo"
+            suspend_user: "suspendiraj uporabnika"
+            unsuspend_user: "prekini suspenzijo uporabnika"
+            grant_badge: "podeli značko"
+            revoke_badge: "odvzemi značko"
+            check_email: "preveri email"
+            delete_topic: "izbriši temo"
+            delete_post: "izbriši objavo"
+            anonymize_user: "anonimiziraj uporabnika"
+            change_category_settings: "spremeni nastavitve kategorije"
+            delete_category: "izbriši kategorijo"
+            create_category: "ustvari  kategorijo"
+            silence_user: "utišaj uporabnika"
+            unsilence_user: "ukini utišanje uporabnika"
+            backup_create: "ustvari varnostno kopijo"
+            deleted_tag: "izbriši oznako"
+            renamed_tag: "preimenuj oznako"
+            lock_trust_level: "zakleni nivo zaupanja"
+            unlock_trust_level: "odkleni nivo zaupanja"
+            activate_user: "aktiviraj uporabnika"
+            deactivate_user: "deaktiviraj uporabnika"
+            backup_download: "Naloži varnostno kopijo"
+            backup_destroy: "Uniči varnostno kopijo"
+            post_locked: "objava zaklenjena"
+            post_unlocked: "objava odklenjena"
+            check_personal_message: "preveri osebno sporočilo"
+        screened_emails:
+          email: "Email naslov"
+          actions:
+            allow: "Dovoli"
+        screened_urls:
+          url: "URL"
+          domain: "Domena"
+        screened_ips:
+          actions:
+            block: "Blokiraj"
+            do_nothing: "Dovoli"
+            allow_admin: "Dovoli adminu"
+          form:
+            add: "Dodaj"
+        search_logs:
+          types:
+            full_page: "Cela stran"
+      watched_words:
+        search: "išči"
+        clear_filter: "Počisti"
+        show_words: "pokaži besede"
+        word_count:
+          few: '%{count} besed'
+          one: 1 beseda
+          other: '%{count} besed'
+          two: 2 besedi
+        actions:
+          block: 'Blokiraj'
+          censor: 'Cenzuriraj'
+          require_approval: 'Zahtevaj odobritev'
+          flag: 'Zastava'
+        form:
+          label: 'Nova beseda:'
+          placeholder_regexp: "Regularni izraz"
+          add: 'Dodaj'
+          success: 'Uspeh'
+          upload: "Prenesi"
+      users:
+        title: 'Uporabniki'
+        show_emails: "Pokaži emaile"
+        nav:
+          new: "Novi"
+          active: "Aktivni"
+          suspended: 'Suspendirani'
+          silenced: 'Utišani'
+        approved: "Potrjen?"
+        check_email:
+          text: "Pokaži"
+      user:
+        suspend_failed: "Nekaj je šlo narobe pri suspendiranju uporabnika {{error}}"
+        unsuspend_failed: "Nekaj je šlo narobe pri preklicu suspenza {{error}}"
+        suspend_duration: "Za kako dolgo bo uporabnik suspendiran?"
+        suspend_reason_hidden_label: "Zakaj je uporabnik suspendiran? To besedilo bo prikazano uporabniku, ko se bo poskušal vpisati. Naj bo kratko."
+        suspend_reason: "Razlog"
+        suspend_reason_placeholder: "Razlog za suspenz"
+        suspend_message: "Email sporočilo"
+        silence_reason: "Razlog"
+        silence_modal_title: "Utišaj uporabnika/co"
+        silence_duration: "Za kako dolgo bo uporabnik/ca utišan/a?"
+        silence_reason_label: "Zakaj bi rad utišal/a uporabnika/co?"
+        silence_reason_placeholder: "Razlog za utišanje"
+        silence_message: "Email sporočilo"
+        cant_suspend: "Ta uporabnik ne more biti suspendiran."
+        delete_all_posts: "Izbriši vse objave"
+        penalty_post_actions: "Kaj bi rad naredil/a z asociirano objavo?"
+        penalty_post_delete: "Izbriši objavo"
+        penalty_post_edit: "Uredi objavo"
+        penalty_post_none: "Ne naredi nič"
+        silenced: "Utišan?"
+        moderator: "Moderator?"
+        admin: "Admin?"
+        show_admin_profile: "Admin"
+        show_public_profile: "Pokaži javni profil"
+        log_out: "Izpiši"
+        grant_admin_confirm: "Poslali smo ti email za potrditev novega administratorja. Odpri ga in sledi navodilom."
+        unsuspend: 'Prekliči suspenz'
+        suspend: 'Suspendiraj'
+        show_flags_received: "Pokaži prejete zastave"
+        flags_received_by: "Zastave prejete od %{username}"
+        flags_received_none: "Ta uporabnik ni prejel nobene zastave."
+        permissions: Dovoljenja
+        activity: Aktivnost
+        like_count: Podeljeni / prejeti všečki
+        last_100_days: 'v zadnjih 100 dnevih'
+        private_topics_count: Privatne teme
+        posts_read_count: Prebrane objave
+        post_count: Ustvarjene objave
+        topics_entered: Ogledane teme
+        flags_given_count: Podeljene zastave
+        flags_received_count: Prejete zastave
+        warnings_received_count: Prejeta opozorila
+        flags_given_received_count: 'Podeljene/prejete zastave'
+        approve: 'Potrdi'
+        approved_by: "potrjen od"
+        approve_success: "Uporabnik/ca je potrjen/a, email z navodili za aktivacijo računa je bil poslan."
+        approve_bulk_success: "Uspeh! Vsi izbrani uporabniki/ce, so bili potrjeni in obveščeni."
+        time_read: "Čas branja"
+        anonymize: "Anonimiziraj uporabnika"
+        delete: "Izbriši uporabnika"
+        delete_forbidden_because_staff: "Adminov in moderatorjev se ne da izbrisati."
+        delete_confirm: "Si prepričan/a, da želiš izbrisati tega uporabnika? Sprememba bo trajna!"
+        delete_and_block: "Izbriši in <b>blokiraj</b> ta email in IP naslov"
+        deleted: "Ta uporabnik je bil izbrisan"
+        activate: "Aktiviraj račun"
+        activate_failed: "Prišlo je do napake pri aktivaciji uporabnika."
+        deactivate_account: "Deaktiviraj račun"
+        deactivate_failed: "Prišlo je do napake pri deaktivaciji uporabnika."
+        unsilence_failed: 'Prišlo je do napake pri prekinitvi utišanja uporabnika.'
+        silence_failed: 'Prišlo je do napake pri utišanju uporabnika.'
+        silence_accept: 'Ja, utišaj uporabnika/co'
+        reset_bounce_score:
+          label: "Resetiraj"
+        tl3_requirements:
+          days: "dni"
+          posts_read: "Prebrane objave"
+        sso:
+          external_username: "Uporabniško ime"
+          external_name: "Ime"
+          external_email: "Email"
+      user_fields:
+        title: "Podatki uporabnika"
+        create: "Dodaj podatek uporabnika"
+        name: "Ime polja"
+        type: "Vrsta polja"
+        description: "Opis polja"
+        save: "Shrani"
+        edit: "Uredi"
+        delete: "Izbriši"
+        cancel: "Prekliči"
+        delete_confirm: "Si prepričan/a, da želiš izbrisati to polje?"
+        options: "Možnosti"
+        required:
+          title: "Zahtevano ob prijavi?"
+          enabled: "zahtevano"
+          disabled: "ni zahtevano"
+        editable:
+          title: "Uredljivo po prijavi?"
+          enabled: "uredljivo"
+          disabled: "ni uredljivo"
+        show_on_profile:
+          title: "Prikaži na javnem profilu?"
+          enabled: "prikazano na profilu"
+          disabled: "ni prikazano na profilu"
+        show_on_user_card:
+          title: "Prikaži na uporabnikovi izkaznici?"
+          enabled: "prikazano na uporabnikovi izkaznici"
+          disabled: "ni prikazano na uporabnikovi izkaznici"
+        field_types:
+          text: 'Besedilno polje'
+          confirm: 'Potrditev'
+          dropdown: "Spustni meni"
+      site_text:
+        search: "Išči besedilo, ki bi ga rad/a uredil/a"
+        title: 'Vsebina besedila'
+        edit: 'uredi'
+      site_settings:
+        title: 'Nastavitve'
+        categories:
+          users: 'Uporabniki'
+          api: 'API'
+          uncategorized: 'Ostalo'
+          login: "Prijava"
+          user_preferences: "Nastavitve uporabnika"
+          search: "Išči"
+          groups: "Skupine"
+      badges:
+        title: Značke
+        new_badge: Nova značka
+        name: Ime
+        badge: Značka
+        description: Opis
+        badge_grouping: Skupina
+        save: Shrani
+        delete: Izbriši
+        delete_confirm: "Si prepričan/a, da želiš odstraniti to značko?"
+        revoke: Odstrani
+        reason: Razlog
+        icon: Ikona
+        trigger: Sproži
+        trigger_type:
+          none: "Posodobi dnevno"
+          post_revision: "Ko uporabnik ustvari ali uredi objavo"
+        preview:
+          bad_count_warning:
+            header: "POZOR!"
+          sample: "Primer:"
+      emoji:
+        title: "Emoji"
+        add: "Dodaj nov emoji"
+        name: "Ime"
+      embedding:
+        edit: "uredi"
+        category: "Objavi v kategorijo"
+        embed_by_username: "Uporabniško ime za kreiranje teme"
+      permalink:
+        url: "URL"
+        topic_id: "ID teme"
+        topic_title: "Tema"
+        post_id: "ID objave"
+        post_title: "Objava"
+        category_id: "ID kategorije"
+        category_title: "Kategorija"
+        external_url: "Zunanji URL"
+        delete_confirm: "Si prepričan/a, da želiš odstraniti permalink?"
+        form:
+          label: "Novo:"
+          add: "Dodaj"
+          filter: "Išči (URL ali zunanji URL)"
+  wizard_js:
+    wizard:
+      done: "Končano"
+      back: "Nazaj"
+      next: "Naprej"
+      upload: "Naloži"
+      uploading: "Nalagam..."
+      quit: "Morda kasneje"
+      invites:
+        add_user: "dodaj"
+        roles:
+          admin: "Admin"
+          moderator: "Moderator"
+          regular: "Običajni uporabnik"
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index 81b758a2b1c..901adcdefb8 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -43,62 +43,62 @@ sq:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: "< 1s"
-          other: "< %{count}s"
+          one: < 1s
+          other: < %{count}s
         x_seconds:
-          one: "1s"
-          other: "%{count}s"
+          one: 1s
+          other: '%{count}s'
         x_minutes:
-          one: "1m"
-          other: "%{count}m"
+          one: 1m
+          other: '%{count}m'
         about_x_hours:
-          one: "1o"
-          other: "%{count}o"
+          one: 1o
+          other: '%{count}o'
         x_days:
-          one: "1d"
-          other: "%{count}d"
+          one: 1d
+          other: '%{count}d'
         about_x_years:
-          one: "1v"
-          other: "%{count}v"
+          one: 1v
+          other: '%{count}v'
         over_x_years:
-          one: "> 1v"
-          other: "> %{count}v"
+          one: '> 1v'
+          other: '> %{count}v'
         almost_x_years:
-          one: "1v"
-          other: "%{count}v"
+          one: 1v
+          other: '%{count}v'
         date_month: "D MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: "1 min"
-          other: "%{count} mins"
+          one: 1 min
+          other: '%{count} mins'
         x_hours:
-          one: "1 orë"
-          other: "%{count} orë"
+          one: 1 orë
+          other: '%{count} orë'
         x_days:
-          one: "1 ditë"
-          other: "%{count} ditë"
+          one: 1 ditë
+          other: '%{count} ditë'
         date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
-          one: "1 min më parë"
-          other: "%{count} min më parë"
+          one: 1 min më parë
+          other: '%{count} min më parë'
         x_hours:
-          one: "1 orë më parë"
-          other: "%{count} orë më parë"
+          one: 1 orë më parë
+          other: '%{count} orë më parë'
         x_days:
-          one: "1 ditë më parë"
-          other: "%{count} ditë më parë"
+          one: 1 ditë më parë
+          other: '%{count} ditë më parë'
       later:
         x_days:
-          one: "1 ditë më vonë"
-          other: "%{count} ditë më vonë"
+          one: 1 ditë më vonë
+          other: '%{count} ditë më vonë'
         x_months:
-          one: "1 muaj më vonë"
-          other: "%{count} muaj më vonë"
+          one: 1 muaj më vonë
+          other: '%{count} muaj më vonë'
         x_years:
-          one: "1 vit më vonë"
-          other: "%{count} vjet më vonë"
+          one: 1 vit më vonë
+          other: '%{count} vjet më vonë'
       previous_month: 'Muaji i kaluar'
       next_month: 'Muaji i ardhshëm'
     share:
@@ -111,10 +111,10 @@ sq:
       email: 'dërgoje këtë lidhje me email'
     action_codes:
       public_topic: "e bëri këtë temë publike %{when}"
-      private_topic: "e bëri këtë temë private %{when}"
       split_topic: "ndaje këtë teme %{when}"
       invited_user: "ka ftuar %{who} %{when}"
       invited_group: "ka ftuar %{who} %{when}"
+      user_left: "u larguan nga ky mesazh"
       removed_user: "hequr %{who} %{when}"
       removed_group: "hequr %{who} %{when}"
       autoclosed:
@@ -138,7 +138,6 @@ sq:
     topic_admin_menu: "veprimet administrative mbi temën"
     wizard_required: "Mirseerdhët tek faqja juaj e re Discourse! Le t'ia nisim me <a href='%{url}' data-auto-route='true'>\"setup wizard\"</a> ✨"
     emails_are_disabled: "Emailat janë çaktivizuar globalisht nga administratori i faqes. Asnjë njoftim me email nuk do të dërgohet. "
-    bootstrap_mode_enabled: "Për të thjeshtuar nisjen e komunitetit, jeni në formatin \"bootstrap\". Të gjithë anëtarët e rinj do të kenë nivelin e besimit 1 dhe emailat e përditshëm të aktivizuar. Këto opsione do të çaktivizohen automatikisht kur numri total i anëtarëve të kalojë numrin %{min_users}."
     themes:
       default_description: "Paracaktuar"
     s3:
@@ -173,8 +172,8 @@ sq:
     show_help: "ndihmë dhe kërko me Google"
     links: "Lidhjet"
     links_lowercase:
-      one: "lidhje"
-      other: "lidhje"
+      one: lidhje
+      other: lidhje
     faq: "Pyetje të shpeshta"
     guidelines: "Udhëzimet"
     privacy_policy: "Politika e Privatësisë"
@@ -198,8 +197,8 @@ sq:
     max_of_count: "max i {{count}}"
     alternation: "ose"
     character_count:
-      one: "{{count}} shkronjë"
-      other: "{{count}} shkronja"
+      one: '{{count}} shkronjë'
+      other: '{{count}} shkronja'
     suggested_topics:
       title: "Temat e sugjeruara"
       pm_title: "Mesazhet e sugjeruara"
@@ -211,8 +210,6 @@ sq:
       our_moderators: "Moderatorët tanë"
       stat:
         all_time: "Gjithë kohës"
-        last_7_days: "7 ditët e fundit"
-        last_30_days: "30 ditët e fundit"
       like_count: "Pëlqime"
       topic_count: "Tema"
       post_count: "Postime"
@@ -233,16 +230,6 @@ sq:
       last_read: "ky është postimi i fundit që keni lexuar; klikoni për t'a shtuar tek të preferuarat"
       remove: "Hiqeni nga të prefereruarat"
       confirm_clear: "Jeni të sigurtë se doni të fshini të gjitha të preferuarat nga kjo temë?"
-    topic_count_latest:
-      one: "{{count}} temë e re ose e përditësuar."
-      other: "{{count}} tema të reja ose të përditësuara."
-    topic_count_unread:
-      one: "{{count}} temë e palexuar."
-      other: "{{count}} tema të palexuara."
-    topic_count_new:
-      one: "{{count}} temë e re."
-      other: "{{count}} tema të reja."
-    click_to_show: "Kliko për ti shfaqur."
     preview: "shiko"
     cancel: "anulo"
     save: "Ruaj ndryshimet"
@@ -278,16 +265,16 @@ sq:
       cancel: "Anulo"
       view_pending: "shiko postimet në pritje"
       has_pending_posts:
-        one: "This topic has <b>1</b> post awaiting approval"
-        other: "Kjo temë ka <b>{{count}}</b> postime që presin aprovimin"
+        one: This topic has <b>1</b> post awaiting approval
+        other: Kjo temë ka <b>{{count}}</b> postime që presin aprovimin
       confirm: "Ruaj ndryshimet"
       delete_prompt: "Vertet doni ta fshini <b>%{username}</b>? Ky veprim do të fshijë çdo postim të tyrin dhe do të bllokojë email-in dhe adresën e tyre IP."
       approval:
         title: "Postimi ka nevojë për aprovim"
         description: "Postimi juaj u morr, por duhet të aprovohet nga një moderator para se të shfaqet në faqe. Kini pak durim. "
         pending_posts:
-          one: "Ju keni <strong>1</strong> postim në pritje."
-          other: "Ju keni <strong>{{count}}</strong> postime në pritje."
+          one: Ju keni <strong>1</strong> postim në pritje.
+          other: Ju keni <strong>{{count}}</strong> postime në pritje.
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> postoi <a href='{{topicUrl}}'>temën</a>"
@@ -321,8 +308,8 @@ sq:
       posts_read: "Lexuar"
       posts_read_long: "Postimet e lexuara"
       total_rows:
-        one: "1 anëtar"
-        other: "%{count} anëtarë"
+        one: 1 anëtar
+        other: '%{count} anëtarë'
     group_histories:
       actions:
         change_group_setting: "Ndrysho parametrin e grupit"
@@ -331,38 +318,18 @@ sq:
         make_user_group_owner: "Bëje autor"
         remove_user_as_group_owner: "Hiq autorin"
     groups:
-      logs:
-        title: "Ditari"
-        when: "Kur"
-        action: "Veprimi"
-        acting_user: "Anëtari veprues"
-        target_user: "Anëtari i prekur"
-        subject: "Subjekti"
-        details: "Detaje"
-        from: "Nga"
-        to: "Për"
-      edit:
-        title: 'Redakto Grupin'
-        full_name: 'Emri i plotë'
-        add_members: "Shto anëtarë"
-        delete_member_confirm: "Do të heqësh '%{username}' nga grupi '%{group}'?"
-      name_placeholder: "Emri i grupit, pa hapësira, si username-t"
+      public_admission: "Lejo që përdoruesit të bashkohen lirisht ne grupin (Kërkon grupin e dukshëm publik)"
+      public_exit: "Lejo përdoruesit të largohen nga grupi lirshëm"
+      empty:
+        posts: "Nuk ka postime nga anëtarët e këtij grupi."
+        members: "Nuk ka anëtarë në këtë grup."
       add: "Shto"
-      join: "Bashkoju grupit"
-      leave: "Ik nga grupi"
-      request: "Kërko t'i bashkohesh grupit"
-      automatic_group: Grup automatik
-      closed_group: Grup i mbyllur
-      is_group_user: "Jeni anëtar i këtij grupi"
       name: "Emri"
-      user_count: "Numri i anëtarëve"
       bio: "Mbi grupin"
-      selector_placeholder: "Shto anëtarë"
       owner: "autori"
       index:
         title: "Grupet"
       activity: "Aktiviteti"
-      members: "Anëtarë"
       topics: "Tema"
       posts: "Postime"
       mentions: "Përmendje"
@@ -373,9 +340,6 @@ sq:
         mods_and_admins: "Vetëm moderatorët dhe adminët"
         members_mods_and_admins: "Vetëm anëtarët e grupit, moderatorët dhe adminët"
         everyone: "Të gjithë"
-      trust_levels:
-        title: "Niveli i besimit që ju akordohet automatikisht anëtarëve të grupit:"
-        none: "Asnjë"
       notifications:
         watching:
           title: "Në vëzhgim"
@@ -395,21 +359,20 @@ sq:
       flair_preview_icon: "Parashiko ikonën"
       flair_preview_image: "Parashiko imazhin"
     user_action_groups:
-      '1': "Pëlqime të dhëna"
-      '2': "Pëlqime të marra"
-      '3': "Të preferuarat"
-      '4': "Tema"
-      '5': "Përgjigje"
-      '6': "Përgjigjet"
-      '7': "Përmendje"
-      '9': "Citime"
-      '11': "Redaktime"
-      '12': "Të dërguar"
-      '13': "Inbox"
-      '14': "Në pritje"
+      "1": "Pëlqime të dhëna"
+      "2": "Pëlqime të marra"
+      "3": "Të preferuarat"
+      "4": "Tema"
+      "5": "Përgjigje"
+      "6": "Përgjigjet"
+      "7": "Përmendje"
+      "9": "Citime"
+      "11": "Redaktime"
+      "12": "Të dërguar"
+      "13": "Inbox"
+      "14": "Në pritje"
     categories:
       all: "kategoritë"
-      all_subcategories: "të gjitha"
       no_subcategory: "asnjë"
       category: "Kategori"
       category_list: "Trego listën e kategorive"
@@ -427,11 +390,11 @@ sq:
       latest_by: "e fundit nga"
       subcategories: "Nënkategori"
       topic_sentence:
-        one: "1 temë"
-        other: "%{count} tema"
+        one: 1 temë
+        other: '%{count} tema'
       topic_stat_sentence:
-        one: "%{count} temë e re gjatë %{unit} të fundit."
-        other: "%{count} tema të reja gjatë %{unit} të fundit."
+        one: '%{count} temë e re gjatë %{unit} të fundit.'
+        other: '%{count} tema të reja gjatë %{unit} të fundit.'
     ip_lookup:
       title: Shiko adresën IP
       hostname: Hostname
@@ -471,7 +434,6 @@ sq:
       notifications: "Njoftimet"
       statistics: "Statistikat"
       desktop_notifications:
-        label: "Njoftimet në desktop"
         not_supported: "Ky shfletues nuk është i aftë të ruajë njoftimet. "
         perm_default: "Aktivizo njoftimet"
         perm_denied_btn: "Nuk lejohet"
@@ -519,7 +481,6 @@ sq:
       delete_account: "Fshi llogarinë time"
       delete_account_confirm: "Jeni i sigurtë që dëshironi ta mbyllni përgjithmonë llogarinë tuaj? Ky veprim nuk mund të zhbëhet!"
       deleted_yourself: "Llogaria juaj u fshi me sukses."
-      delete_yourself_not_allowed: "Nuk mund t'a fshini llogarinë tuaj tani. Kontaktoni një admin për të fshirë llogarinë. "
       unread_message_count: "Mesazhet"
       admin_delete: "Fshi"
       users: "Anëtarët"
@@ -607,8 +568,8 @@ sq:
         authenticated: "Emaili juaj është verifikuar nga {{provider}}"
         frequency_immediately: "Do t'ju dërgojmë një email menjëherë nëse nuk e keni lexuar temën për të cilën po ju dërgojmë email."
         frequency:
-          one: "Do t'ju dërgojmë një email vetëm nëse nuk të kemi parë në faqe në minutën e fundit."
-          other: "Do t'ju dërgojmë një email vetëm nëse nuk të kemi parë në faqe në {{count}} minutat e fundit."
+          one: Do t'ju dërgojmë një email vetëm nëse nuk të kemi parë në faqe në minutën e fundit.
+          other: Do t'ju dërgojmë një email vetëm nëse nuk të kemi parë në faqe në {{count}} minutat e fundit.
       name:
         title: "Emri juaj"
         instructions: "emri i plotë (opsional)"
@@ -630,6 +591,7 @@ sq:
         title: "Gjuha e faqes"
         instructions: "Gjuha e faqes për përdoruesin. Do të ndryshojë pasi të rifreskoni faqen. "
         default: "(paracaktuar)"
+        any: "ndonjë"
       password_confirmation:
         title: "Rishkruani fjalëkalimin"
       last_posted: "Postimi i fundit"
@@ -638,8 +600,6 @@ sq:
       created: "Regjistruar"
       log_out: "Shkëputu"
       location: "Vendndodhja"
-      card_badge:
-        title: "Karta e anëtarit"
       website: "Faqja web"
       email_settings: "Email"
       like_notification_frequency:
@@ -692,10 +652,9 @@ sq:
         title: "Ftesat"
         user: "Anëtari i ftuar"
         sent: "Dërguar"
-        none: "Nuk keni asnjë ftesë në pritje. "
         truncated:
-          one: "Po afishohet ftesa e parë."
-          other: "Po afishohen {{count}} ftesat e para."
+          one: Po afishohet ftesa e parë.
+          other: Po afishohen {{count}} ftesat e para.
         redeemed: "Ftesa të Shlyera"
         redeemed_tab: "Shlyer"
         redeemed_tab_with_count: "Shlyer ({{count}})"
@@ -734,20 +693,20 @@ sq:
         stats: "Statistikat"
         time_read: "koha e leximit"
         topic_count:
-          one: "temë e krijuar"
-          other: "tema të krijuara"
+          one: temë e krijuar
+          other: tema të krijuara
         post_count:
-          one: "postim i krijuar"
-          other: "postime të krijuara"
+          one: postim i krijuar
+          other: postime të krijuara
         days_visited:
-          one: "ditë që viziton faqen"
-          other: "ditë që viziton faqen"
+          one: ditë që viziton faqen
+          other: ditë që viziton faqen
         posts_read:
-          one: "postim i lexuar"
-          other: "postime të lexuar"
+          one: postim i lexuar
+          other: postime të lexuar
         bookmark_count:
-          one: "temë e preferuar"
-          other: "tema të preferuara"
+          one: temë e preferuar
+          other: tema të preferuara
         top_replies: "Përgjigjet popullore"
         no_replies: "Nuk ka ende përgjigje."
         more_replies: "Më shumë përgjigje"
@@ -813,8 +772,8 @@ sq:
     too_few_posts_notice: "Hajt ta nisim <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>mbarë diskutimin!</a> Keni krijuar <strong>%{currentPosts} / %{requiredPosts}</strong> postime në faqe. Vizitorët e rinj të faqes kanë nevojë për diskutime në faqe. "
     logs_error_rate_notice:
       rate:
-        one: "1 gabim/%{duration}"
-        other: "%{count} gabime/%{duration}"
+        one: 1 gabim/%{duration}
+        other: '%{count} gabime/%{duration}'
     learn_more: "mëso më shumë..."
     all_time: 'total'
     all_time_desc: 'totali i temave të krijuara'
@@ -966,8 +925,8 @@ sq:
       similar_topics: "Tema juaj është e ngjashme me..."
       drafts_offline: "draftet offline"
       group_mentioned:
-        one: "By mentioning {{group}}, you are about to notify <a href='{{group_link}}'>1 person</a> – are you sure?"
-        other: "By mentioning {{group}}, you are about to notify <a href='{{group_link}}'>{{count}} people</a> – are you sure?"
+        one: By mentioning {{group}}, you are about to notify <a href='{{group_link}}'>1 person</a> – are you sure?
+        other: By mentioning {{group}}, you are about to notify <a href='{{group_link}}'>{{count}} people</a> – are you sure?
       cannot_see_mention:
         private: "Ju përmendët {{username}} , por ky anëtar nuk do të njoftohet sepse nuk kanë akses në këtë mesazh privat. Do t'ju duhet t'a ftoni anëtarin në këtë mesazh. "
       error:
@@ -1035,28 +994,12 @@ sq:
       empty: "Nuk u gjet asnjë njoftim. "
       more: "shiko njoftimet e kaluara"
       total_flagged: "totali i postimeve të sinjalizuar"
-      alt:
-        mentioned: "Përmendur nga"
-        quoted: "Cituar nga"
-        replied: "Përgjigjur"
-        posted: "Postim nga"
-        edited: "Redakto postimin tuaj"
-        liked: "Pëlqeu postimin tuaj"
-        private_message: "Mesazh privat nga"
-        invited_to_private_message: "I/e ftuar në një mesazh privat nga"
-        invited_to_topic: "I/e ftuar në temë nga"
-        invitee_accepted: "Ftesa u pranua nga"
-        moved_post: "Postimi juaj u transferua nga"
-        linked: "Lidhja drejt postimit tuaj"
-        granted_badge: "Stema u atribua"
-        group_message_summary: "Mesazhet në inboxin e grupit"
       popup:
         mentioned: '{{username}} ju përmendi në "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} ju përmendi në "{{topic}}" - {{site_title}}'
         quoted: '{{username}} ju ka cituar në "{{topic}}" - {{site_title}}'
         replied: '{{username}} ju u përgjigj në "{{topic}}" - {{site_title}}'
         posted: '{{username}} postoi në "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} ju dërgoi një mesazh privat nga "{{topic}}" - {{site_title}}'
         linked: '{{username}} vendosi një lidhje për postimin tuaj nga "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Shto një imazh"
@@ -1123,8 +1066,8 @@ sq:
         archive_topics: "Arkivo temat"
         choose_new_category: "Zgjidhni kategorinë e re për temat: "
         selected:
-          one: "Keni zgjedhur <b>1</b> temë."
-          other: "Keni zgjedhur <b>{{count}}</b> tema."
+          one: Keni zgjedhur <b>1</b> temë.
+          other: Keni zgjedhur <b>{{count}}</b> tema.
         choose_new_tags: "Zgjidh etiketa të reja për këto tema:"
         changed_tags: "Etiketat e temave u ndryshuan. "
       none:
@@ -1153,12 +1096,9 @@ sq:
         bookmarks: "Nuk ka më tema të preferuara."
         search: "Nuk ka më rezultate nga kërkimi. "
     topic:
-      unsubscribe:
-        stop_notifications: "Tani ju do të merrni më pak njoftime për <strong>{{title}}</strong>"
-        change_notification_state: "Statusi juaj i njoftimeve tani është"
       filter_to:
-        one: "1 postim në temë"
-        other: "{{count}} postime në temë"
+        one: 1 postim në temë
+        other: '{{count}} postime në temë'
       create: 'Temë e re'
       create_long: 'Hap një temë të re'
       private_message: 'Fillo një mesazh'
@@ -1172,10 +1112,10 @@ sq:
       new: 'temë e re'
       unread: 'palexuar'
       new_topics:
-        one: '1 temë e re'
+        one: 1 temë e re
         other: '{{count}} tema të reja'
       unread_topics:
-        one: '1 temë e palexuar'
+        one: 1 temë e palexuar
         other: '{{count}} tema të palexuara'
       title: 'Tema'
       invalid_access:
@@ -1189,17 +1129,17 @@ sq:
         title: "Tema nuk u gjet"
         description: "Na vjen keq, nuk e gjetëm dot temën. Mund të jetë fshirë nga një moderator... "
       total_unread_posts:
-        one: "ju keni 1 postim të palexuar në këtë temë"
-        other: "ju keni {{count}} postime të palexuara në këtë temë"
+        one: ju keni 1 postim të palexuar në këtë temë
+        other: ju keni {{count}} postime të palexuara në këtë temë
       unread_posts:
-        one: "ju keni 1 postim të vjetër të palexuar në këtë temë"
-        other: "ju keni {{count}} postime të vjetra të palexuara në këtë temë"
+        one: ju keni 1 postim të vjetër të palexuar në këtë temë
+        other: ju keni {{count}} postime të vjetra të palexuara në këtë temë
       new_posts:
-        one: "ka 1 postim të ri në këtë temë që nga hera e fundit që ishit këtu"
-        other: "ka {{count}} postime të reja në këtë temë që nga hera e fundit që ishit këtu"
+        one: ka 1 postim të ri në këtë temë që nga hera e fundit që ishit këtu
+        other: ka {{count}} postime të reja në këtë temë që nga hera e fundit që ishit këtu
       likes:
-        one: "ka 1 pëlqim në këtë temë"
-        other: "ka {{count}} pëlqime në këtë temë"
+        one: ka 1 pëlqim në këtë temë
+        other: ka {{count}} pëlqime në këtë temë
       back_to_list: "Kthehu tek lista e temave"
       options: "Opsionet e temës"
       show_links: "trego lidhjet në këtë temë"
@@ -1209,7 +1149,7 @@ sq:
       read_more_MF: "Keni { UNREAD, plural, =0 {} one { <a href='/unread'>1 shkrim të palexuar</a> } other { <a href='/unread'># shkrime të palexuara</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{dhe } false {është } other{}} <a href='/new'>1 shkrim të ri</a>} other { {BOTH, select, true{dhe } false {} other{}} <a href='/new'># shkrime të reja</a>} } akoma, ose {CATEGORY, select, true {shiko temat e tjera në kategorinë {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Shfleto kategoritë
       view_latest_topics: shiko temat më të fundit
-      suggest_create_topic: Pse nuk hapni një temë të re?
+      suggest_create_topic: "Pse nuk hapni një temë të re?"
       jump_reply_up: hidhe tek përgjigja paraardhëse
       jump_reply_down: hidhu tek përgjigja pasardhëse
       deleted: "Tema është fshirë"
@@ -1231,21 +1171,21 @@ sq:
       notifications:
         title: ndryshoni sa shpesh njoftoheni mbi këtë temë
         reasons:
-          '3_10': 'Do të merrni njoftime sepse po vëzhgoni një etiketë në këtë temë. '
-          '3_6': 'Ju do të merrni njoftime sepse jeni duke vëzhguar këtë kategori. '
-          '3_5': 'Ju do të njoftoheni duke qënë se jeni duke gjurmuar këtë temë automatikisht. '
-          '3_2': 'Ju do të njoftoheni duke qënë se jeni duke vëzhguar këtë temë. '
-          '3_1': 'Ju do të njoftoheni duke qënë se ju jeni autori i kësaj teme. '
-          '3': 'Ju do të njoftoheni duke qënë se jeni duke vëzhguar këtë temë. '
-          '2_8': 'Ju do të shikoni numrin e përgjigjeve të reja sepse jeni duke gjurmuar këtë kategori. '
-          '2_4': 'Ju do të shikoni numrin e përgjigjeve të reja sepse ju postuat një përgjigje në këtë temë. '
-          '2_2': 'Ju do të shikoni numrin e përgjigjeve të reja sepse jeni duke gjurmuar këtë temë. '
-          '2': 'Ju do të shikoni numrin e përgjigjeve të reja sepse ju <a href="/u/{{username}}/preferences">lexuat këtë temë</a>.'
-          '1_2': 'Ju do të njoftoheni nëse dikush përmend @emrin tuaj ose nëse dikush ju përgjigjet. '
-          '1': 'Ju do të njoftoheni nëse dikush përmend @emrin tuaj ose nëse dikush ju përgjigjet. '
-          '0_7': 'Ju nuk do të merrni asnjë njoftim për temat në këtë kategori. '
-          '0_2': 'Ju nuk do të merrni asnjë njoftim për këtë temë. '
-          '0': 'Ju nuk do të merrni asnjë njoftim për këtë temë. '
+          "3_10": 'Do të merrni njoftime sepse po vëzhgoni një etiketë në këtë temë. '
+          "3_6": 'Ju do të merrni njoftime sepse jeni duke vëzhguar këtë kategori. '
+          "3_5": 'Ju do të njoftoheni duke qënë se jeni duke gjurmuar këtë temë automatikisht. '
+          "3_2": 'Ju do të njoftoheni duke qënë se jeni duke vëzhguar këtë temë. '
+          "3_1": 'Ju do të njoftoheni duke qënë se ju jeni autori i kësaj teme. '
+          "3": 'Ju do të njoftoheni duke qënë se jeni duke vëzhguar këtë temë. '
+          "2_8": 'Ju do të shikoni numrin e përgjigjeve të reja sepse jeni duke gjurmuar këtë kategori. '
+          "2_4": 'Ju do të shikoni numrin e përgjigjeve të reja sepse ju postuat një përgjigje në këtë temë. '
+          "2_2": 'Ju do të shikoni numrin e përgjigjeve të reja sepse jeni duke gjurmuar këtë temë. '
+          "2": 'Ju do të shikoni numrin e përgjigjeve të reja sepse ju <a href="/u/{{username}}/preferences">lexuat këtë temë</a>.'
+          "1_2": 'Ju do të njoftoheni nëse dikush përmend @emrin tuaj ose nëse dikush ju përgjigjet. '
+          "1": 'Ju do të njoftoheni nëse dikush përmend @emrin tuaj ose nëse dikush ju përgjigjet. '
+          "0_7": 'Ju nuk do të merrni asnjë njoftim për temat në këtë kategori. '
+          "0_2": 'Ju nuk do të merrni asnjë njoftim për këtë temë. '
+          "0": 'Ju nuk do të merrni asnjë njoftim për këtë temë. '
         watching_pm:
           title: "Në vëzhgim"
           description: "Ju do të njoftoheni për çdo përgjigje të re në këtë mesazh, dhe numri i përgjigjeve të reja do të shfaqet. "
@@ -1283,7 +1223,6 @@ sq:
         invisible: "Hiqeni nga Listat"
         visible: "Listojeni"
         make_public: "Bëje temën publike"
-        make_private: "Bëje mesazh privat"
       feature:
         pin: "Ngjite temën"
         unpin: "Çngjite temën"
@@ -1313,15 +1252,15 @@ sq:
         pin_validation: "Kërkohet data për ta ngjitur këtë temë në krye."
         not_pinned: "Nuk ka tema të përzgjedhura në {{categoryLink}}."
         already_pinned:
-          one: "Temat kryesore të momentit në {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
-          other: "Temat kryesore të momentit në {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: 'Temat kryesore të momentit në {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Temat kryesore të momentit në {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         pin_globally: "Shfaqe këtë temë në krye të listës së të gjitha temave deri më"
         confirm_pin_globally: "Ju tashmë keni {{count}} tema të përzgjedhura. Shumë tema të përzgjedhura mund të bëhen barrë për përdorues të rinj dhe anonimë. A jeni i sigurtë që dëshironi ta përzgjidhni një temë tjetër të gjithanëshme?"
         global_pin_note: "Përdoruesit mund ta çngjitin këtë temë veçan sipas dëshirës."
         not_pinned_globally: "Nuk ka tema të përzgjedhura kudo."
         already_pinned_globally:
-          one: "Të gjitha temat kryesore të momentit: <strong class='badge badge-notification unread'>1</strong>"
-          other: "Të gjitha temat kryesore të momentit: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: 'Të gjitha temat kryesore të momentit: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Të gjitha temat kryesore të momentit: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         make_banner: "Ktheje këtë temë në një temë parrullë që shfaqet në krye të të gjitha faqeve."
         banner_note: "Përdoruesit mund ta heqin temën parrullë duke e mbyllur atë. Vetëm një temë mund të kthehet në parrullë në një moment të caktuar."
         no_banner_exists: "Nuk ka temë parrullë."
@@ -1353,8 +1292,8 @@ sq:
       login_reply: 'Identifikohu për t''u Përgjigjur'
       filters:
         n_posts:
-          one: "1 postim"
-          other: "{{count}} postime"
+          one: 1 postim
+          other: '{{count}} postime'
         cancel: "Hiq filtrin"
       split_topic:
         title: "Ktheje në një temë të re"
@@ -1362,15 +1301,15 @@ sq:
         topic_name: "Titulli i temës së re"
         error: "Pati një gabim gjatë transfertës drejt një teme të re."
         instructions:
-          one: "Jeni duke krijuar një temë të re dhe duke e populluar atë me postimin që keni përzgjedhur."
-          other: "Jeni duke krijuar një temë të re dhe duke e populluar atë me <b>{{count}}</b> postimet që keni përzgjedhur."
+          one: Jeni duke krijuar një temë të re dhe duke e populluar atë me postimin që keni përzgjedhur.
+          other: Jeni duke krijuar një temë të re dhe duke e populluar atë me <b>{{count}}</b> postimet që keni përzgjedhur.
       merge_topic:
         title: "Transfero tek një Temë tjetër"
         action: "transfero tek një temë tjetër"
         error: "Pati një gabim gjatë transfertës drejt një teme tjetër."
         instructions:
-          one: "Ju lutem zgjidhni një temë ku do dëshironit ta zhvendosni këtë postim."
-          other: "Ju lutem, zgjidhni një temë ku do të dëshironit të zhvendosni këto <b>{{count}}</b> postime."
+          one: Ju lutem zgjidhni një temë ku do dëshironit ta zhvendosni këtë postim.
+          other: Ju lutem, zgjidhni një temë ku do të dëshironit të zhvendosni këto <b>{{count}}</b> postime.
       merge_posts:
         title: "Bashkoni Postimet e Përzgjedhura"
         action: "bashkoni postimet e përzgjedhura"
@@ -1397,8 +1336,6 @@ sq:
           one: Keni përzgjedhur <b>1</b> postim.
           other: Keni përzgjedhur <b>{{count}}</b> postime.
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       edit_reason: "Arsyeja:"
       post_number: "postimi {{number}}"
       last_edited_on: "redaktimi i fundit u krye më"
@@ -1408,26 +1345,26 @@ sq:
       show_full: "Shfaq postimin e plotë"
       show_hidden: 'Shfaq materialin e fshehur.'
       deleted_by_author:
-        one: "(post withdrawn by author, will be automatically deleted in %{count} hour unless flagged)"
-        other: "(postim i tërhequr nga autori, do të fshihet automatikisht në %{count} orë nëse nuk sinjalizohet)"
+        one: (post withdrawn by author, will be automatically deleted in %{count} hour unless flagged)
+        other: (postim i tërhequr nga autori, do të fshihet automatikisht në %{count} orë nëse nuk sinjalizohet)
       expand_collapse: "zgjero/shkurto"
       gap:
-        one: "shiko 1 përgjigje të fshehur"
-        other: "shiko {{count}} përgjigje të fshehura"
+        one: shiko 1 përgjigje të fshehur
+        other: shiko {{count}} përgjigje të fshehura
       unread: "Postimi është i palexuar"
       has_replies:
-        one: "{{count}} Përgjigje"
-        other: "{{count}} përgjigje"
+        one: '{{count}} Përgjigje'
+        other: '{{count}} përgjigje'
       has_likes:
-        one: "{{count}} Pëlqim"
-        other: "{{count}} Pëlqime"
+        one: '{{count}} Pëlqim'
+        other: '{{count}} Pëlqime'
       has_likes_title:
-        one: "1 person pëlqeu këtë postim"
-        other: "{{count}} vetë pëlqyen këtë postim"
+        one: 1 person pëlqeu këtë postim
+        other: '{{count}} vetë pëlqyen këtë postim'
       has_likes_title_only_you: "ju pëlqeni këtë postim"
       has_likes_title_you:
-        one: "ju dhe 1 person tjetër pëlqyet këtë postim"
-        other: "ju dhe {{count}} të tjerë pëlqyen këtë postim"
+        one: ju dhe 1 person tjetër pëlqyet këtë postim
+        other: ju dhe {{count}} të tjerë pëlqyen këtë postim
       errors:
         create: "Na vjen keq, por ndodhi një gabim gjatë hapjes së temës. Provojeni përsëri."
         edit: "Na vjen keq, ndodhi një gabim gjatë redaktimit të temës. Provojeni përsëri."
@@ -1497,54 +1434,54 @@ sq:
           vote: "Votove për këtë postim"
         by_you_and_others:
           off_topic:
-            one: "Ti dhe 1 anëtar tjetër sinjalizuat këtë postim si jashtë teme"
-            other: "Ti dhe {{count}} anëtarë të tjerë sinjalizuat këtë postim si jashtë teme"
+            one: Ti dhe 1 anëtar tjetër sinjalizuat këtë postim si jashtë teme
+            other: Ti dhe {{count}} anëtarë të tjerë sinjalizuat këtë postim si jashtë teme
           spam:
-            one: "Ti dhe 1 anëtar tjetër sinjalizuat këtë postim si spam"
-            other: "Ti dhe {{count}} anëtarë të tjerë sinjalizuat këtë postim si spam"
+            one: Ti dhe 1 anëtar tjetër sinjalizuat këtë postim si spam
+            other: Ti dhe {{count}} anëtarë të tjerë sinjalizuat këtë postim si spam
           inappropriate:
-            one: "Ti dhe 1 anëtar tjetër sinjalizuat këtë postim si të papërshtatshëm"
-            other: "Ti dhe {{count}} anëtarë të tjerë sinjalizuat këtë postim si të papërshtatshëm"
+            one: Ti dhe 1 anëtar tjetër sinjalizuat këtë postim si të papërshtatshëm
+            other: Ti dhe {{count}} anëtarë të tjerë sinjalizuat këtë postim si të papërshtatshëm
           notify_moderators:
-            one: "Ti dhe 1 anëtar tjetër sinjalizuat këtë postim për moderim"
-            other: "Ti dhe {{count}} anëtarë të tjerë sinjalizuat këtë postim për moderim"
+            one: Ti dhe 1 anëtar tjetër sinjalizuat këtë postim për moderim
+            other: Ti dhe {{count}} anëtarë të tjerë sinjalizuat këtë postim për moderim
           notify_user:
-            one: "Ju dhe 1 person tjetër i dërguat një mesazh këtij përdoruesi."
-            other: "Ju dhe {{count}} persona të tjerë i dërguat një mesazh këtij përdoruesi."
+            one: Ju dhe 1 person tjetër i dërguat një mesazh këtij përdoruesi.
+            other: Ju dhe {{count}} persona të tjerë i dërguat një mesazh këtij përdoruesi.
           bookmark:
-            one: "Ti dhe 1 anëtar tjetër shtuat këtë postim tek të preferuarat tuaja"
-            other: "Ti dhe {{count}} anëtarë të tjerë shtuat këtë postim tek të preferuarat tuaja"
+            one: Ti dhe 1 anëtar tjetër shtuat këtë postim tek të preferuarat tuaja
+            other: Ti dhe {{count}} anëtarë të tjerë shtuat këtë postim tek të preferuarat tuaja
           like:
-            one: "Ju dhe 1 person tjetër pëlqyet këtë "
-            other: "Ju dhe {{count}} të tjerë pëlqyen këtë postim"
+            one: 'Ju dhe 1 person tjetër pëlqyet këtë '
+            other: Ju dhe {{count}} të tjerë pëlqyen këtë postim
           vote:
-            one: "Ti dhe 1 anëtar tjetër votuat për këtë postim"
-            other: "Ti dhe {{count}} anëtarë të tjerë votuat për këtë postim"
+            one: Ti dhe 1 anëtar tjetër votuat për këtë postim
+            other: Ti dhe {{count}} anëtarë të tjerë votuat për këtë postim
         by_others:
           off_topic:
-            one: "1 anëtar sinjalizoi këtë postim si jashtë teme"
-            other: "{{count}} anëtarë sinjalizuan këtë postim si jashtë teme"
+            one: 1 anëtar sinjalizoi këtë postim si jashtë teme
+            other: '{{count}} anëtarë sinjalizuan këtë postim si jashtë teme'
           spam:
-            one: "1 anëtar sinjalizoi këtë postim si spam"
-            other: "{{count}} anëtarë sinjalizuan këtë postim si spam"
+            one: 1 anëtar sinjalizoi këtë postim si spam
+            other: '{{count}} anëtarë sinjalizuan këtë postim si spam'
           inappropriate:
-            one: "1 anëtar sinjalizoi këtë postim si të papërshtatshëm"
-            other: "{{count}} anëtarë sinjalizuan këtë postim si të papërshtatshëm"
+            one: 1 anëtar sinjalizoi këtë postim si të papërshtatshëm
+            other: '{{count}} anëtarë sinjalizuan këtë postim si të papërshtatshëm'
           notify_moderators:
-            one: "1 anëtar sinjalizoi këtë postim për moderim"
-            other: "{{count}} anëtarë sinjalizuan këtë postim për moderim"
+            one: 1 anëtar sinjalizoi këtë postim për moderim
+            other: '{{count}} anëtarë sinjalizuan këtë postim për moderim'
           notify_user:
-            one: "1 person i dërgoi një mesazh këtij përdoruesi"
-            other: "{{count}} i dërguan një mesazh këtij përdoruesi"
+            one: 1 person i dërgoi një mesazh këtij përdoruesi
+            other: '{{count}} i dërguan një mesazh këtij përdoruesi'
           bookmark:
-            one: "1 anëtar shtoi këtë postim tek të preferuarat"
-            other: "{{count}} anëtarë shtuan këtë postim tek të preferuarat"
+            one: 1 anëtar shtoi këtë postim tek të preferuarat
+            other: '{{count}} anëtarë shtuan këtë postim tek të preferuarat'
           like:
-            one: "1 person pëlqeu këtë postim"
-            other: "{{count}} vetë pëlqyen këtë postim"
+            one: 1 person pëlqeu këtë postim
+            other: '{{count}} vetë pëlqyen këtë postim'
           vote:
-            one: "1 anëtar votoi për këtë postim"
-            other: "{{count}} anëtarë votuan për këtë postim"
+            one: 1 anëtar votoi për këtë postim
+            other: '{{count}} anëtarë votuan për këtë postim'
       revisions:
         controls:
           first: "Revizioni i parë"
@@ -1617,7 +1554,6 @@ sq:
       email_in_allow_strangers: "Prano emaila nga anëtarë anonimë pa llogari në faqe"
       email_in_disabled: "Postimi i temave të reja me email është çaktivizuar në Rregullimet e faqes. Për të aktivizuar postimet e temave të reja me email,"
       email_in_disabled_click: 'aktivizo rregullimin "email in".'
-      suppress_from_homepage: "Hiqe këtë kategori nga faqja e parë."
       allow_badges_label: "Lejo të jepen stemat në këtë kategori"
       edit_permissions: "Ndryshoni autorizimet"
       add_permission: "Shtoni autorizim"
@@ -1663,14 +1599,14 @@ sq:
       custom_placeholder_notify_moderators: "Na thoni specifikisht se çfarë ju shqetëson dhe na jepni lidhje dhe shembuj konkretë brenda mundësive. "
       custom_message:
         at_least:
-          one: "futni së paku 1 gërmë"
-          other: "futni së paku {{count}} gërma"
+          one: futni së paku 1 gërmë
+          other: futni së paku {{count}} gërma
         more:
-          one: "edhe 1 për të vazhduar..."
-          other: "edhe {{count}} për të vazhduar..."
+          one: edhe 1 për të vazhduar...
+          other: edhe {{count}} për të vazhduar...
         left:
-          one: "edhe 1 gërmë"
-          other: "edhe {{count}} gërma"
+          one: edhe 1 gërmë
+          other: edhe {{count}} gërma
     flagging_topic:
       title: "Faleminderit për ndihmën që i jepni këtij komuniteti!"
       action: "Raporto Temën"
@@ -1681,13 +1617,13 @@ sq:
       links_title: "Lidhje Aktive"
       links_shown: "trego më shumë lidhje..."
       clicks:
-        one: "1 klik"
-        other: "%{count} klikime"
+        one: 1 klik
+        other: '%{count} klikime'
     post_links:
       about: "trego më shumë lidhje për këtë postim"
       title:
-        one: "edhe 1"
-        other: "edhe %{count}"
+        one: edhe 1
+        other: edhe %{count}
     topic_statuses:
       warning:
         help: "Ky është një paralajmërim zyrtar."
@@ -1715,19 +1651,19 @@ sq:
     original_post: "Postimi Origjinal"
     views: "Shikimet"
     views_lowercase:
-      one: "shikim"
-      other: "shikime"
+      one: shikim
+      other: shikime
     replies: "Përgjigjet"
     activity: "Aktiviteti"
     likes: "Pëlqimet"
     likes_lowercase:
-      one: "pëlqim"
-      other: "pëlqime"
+      one: pëlqim
+      other: pëlqime
     likes_long: "ka {{number}} pëlqime në këtë temë"
     users: "Përdoruesit"
     users_lowercase:
-      one: "përdorues"
-      other: "përdorues"
+      one: përdorues
+      other: përdorues
     category_title: "Kategoria"
     history: "Historia"
     changed_by: "nga {{author}}"
@@ -1738,8 +1674,8 @@ sq:
       latest:
         title: "Më të fundit"
         title_with_count:
-          one: "Më të fundit (1) "
-          other: "Më të fundit ({{count}}) "
+          one: 'Më të fundit (1) '
+          other: 'Më të fundit ({{count}}) '
         help: "temat me postime të fundit"
       hot:
         title: "Të nxehta"
@@ -1757,21 +1693,21 @@ sq:
       unread:
         title: "Të palexuara"
         title_with_count:
-          one: "Të palexuara (1)"
-          other: "Të palexuara ({{count}})"
+          one: Të palexuara (1)
+          other: Të palexuara ({{count}})
         help: "topics you are currently watching or tracking with unread posts"
         lower_title_with_count:
-          one: "1 e palexuar"
-          other: "{{count}} të palexuara"
+          one: 1 e palexuar
+          other: '{{count}} të palexuara'
       new:
         lower_title_with_count:
-          one: "1 e re"
-          other: "{{count}} të reja"
+          one: 1 e re
+          other: '{{count}} të reja'
         lower_title: "e re"
         title: "Të reja"
         title_with_count:
-          one: "Të reja (1)"
-          other: "Të reja ({{count}})"
+          one: Të reja (1)
+          other: Të reja ({{count}})
         help: "temat e krijuar gjatë ditëve të fundit"
       posted:
         title: "Postimet e mia"
@@ -1782,8 +1718,8 @@ sq:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: "{{categoryName}} (1)"
-          other: "{{categoryName}} ({{count}})"
+          one: '{{categoryName}} (1)'
+          other: '{{categoryName}} ({{count}})'
         help: "temat e fundit në kategorinë {{categoryName}}"
       top:
         title: "Popullore"
@@ -1866,24 +1802,23 @@ sq:
         print: '<b>ctrl</b>+<b>p</b> Printo temën'
     badges:
       earned_n_times:
-        one: "Kjo stemë është fituar 1 herë"
-        other: "Kjo stemë është fituar %{count} herë"
+        one: Kjo stemë është fituar 1 herë
+        other: Kjo stemë është fituar %{count} herë
       granted_on: "Atribuar më %{date}"
       others_count: "Të tjerë me këtë stemë (%{count})"
       title: Stemat
       allow_title: "Mund t'a përdorësh këtë stemë si titull"
       multiple_grant: "Kjo stemë mund të fitohet disa herë"
       badge_count:
-        one: "1 stemë"
-        other: "%{count} stema"
+        one: 1 stemë
+        other: '%{count} stema'
       more_badges:
-        one: "+1 tjetër"
-        other: "+%{count} të tjera"
+        one: +1 tjetër
+        other: +%{count} të tjera
       granted:
-        one: "1 e akorduar"
-        other: "%{count} të akorduara"
+        one: 1 e akorduar
+        other: '%{count} të akorduara'
       select_badge_for_title: Zgjidhni një stemë për ta përdorur si titullin tuaj
-      none: "<asnjë>"
       badge_grouping:
         getting_started:
           name: Fillestar
@@ -1924,13 +1859,10 @@ sq:
       notifications:
         watching:
           title: "Në vëzhgim"
-          description: "Ju do të vëzhgoni automatikisht të gjitha temat nën këtë etiketë. Do të njoftoheni për çdo postim e temë të re, dhe numri i postimeve të reja të palexuara do të afishohet ngjitur me titullin e temës përgjatë listave të faqes. "
         watching_first_post:
           title: "Postimi i parë nën vëzhgim"
-          description: "Ju do të njoftoheni vetëm për postimin e parë të çdo teme nën këtë etiketë."
         tracking:
           title: "Në gjurmim"
-          description: "Ju do të gjurmoni automatikisht të gjitha temat nën këtë etiketë. Numri i përgjigjeve të palexuara do të afishohet ngjitur me titullin e temës në listat e faqes. "
         regular:
           title: "Normal"
           description: "Ju do të njoftoheni nëse dikush përmend @emrin tuaj ose i përgjigjet postimeve tuaja. "
@@ -2013,8 +1945,6 @@ sq:
         reports:
           today: "Sot"
           yesterday: "Dje"
-          last_7_days: "7 Ditët e Fundit"
-          last_30_days: "30 Ditët e Fundit"
           all_time: "Gjithë Kohës"
           7_days_ago: "7 Ditë më parë"
           30_days_ago: "30 Ditë më parë"
@@ -2031,7 +1961,6 @@ sq:
         title: "Sinjalizimet"
         agree: "Pranoj"
         agree_title: "Konfirmo këtë sinjalizim si të vlefshëm do korrekt"
-        defer_flag_title: "Hiqe këtë sinjalizim; nuk ka nevojë për veprime në këtë moment. "
         delete: "Fshij"
         delete_title: "Fshini postimin e sinjalizuar."
         delete_post_defer_flag_title: "Fshini postimin; në qoftë postim i parë, fshihet tema"
@@ -2065,8 +1994,6 @@ sq:
         title: "Grupet"
         edit: "Redakto Grup"
         refresh: "Rifresko"
-        new: "I Ri"
-        selector_placeholder: "vendos emrin e përdoruesit"
         about: "Modifiko anëtarët e grupit dhe emrin këtu"
         group_members: "Përdorues grupi"
         delete: "Fshij"
@@ -2074,12 +2001,7 @@ sq:
         delete_failed: "Nuk e fshimë dot grupin. Nëse ky është një grup automatik, nuk fshihet dot. "
         delete_owner_confirm: "Hiqe privilegjin e pronarit për '%{username}'?"
         add: "Shto"
-        add_members: "Shto Anëtar"
         custom: "Grupet e krijuara"
-        bulk_complete: "Përdoruesit iu shtuan grupit."
-        bulk: "Shto në masë tek grupi"
-        bulk_paste: "Ngjit një listë përdoruesisht ose adresash email, 1 për çdo rresht:"
-        bulk_select: "(zgjidhni një grup)"
         automatic: "Automatik"
         group_owners: Pronarët
         add_owners: Shto pronarë
@@ -2355,11 +2277,11 @@ sq:
           suspect: 'Të dyshimtë'
         approved: "Aprovuar?"
         approved_selected:
-          one: "aprovo përdoruesin"
-          other: "aprovo përdoruesit ({{count}})"
+          one: aprovo përdoruesin
+          other: aprovo përdoruesit ({{count}})
         reject_selected:
-          one: "refuzo përdoruesin"
-          other: "refuzo përdoruesit ({{count}})"
+          one: refuzo përdoruesin
+          other: refuzo përdoruesit ({{count}})
         titles:
           active: 'Përdorues Aktivë'
           new: 'Përdorues të Rinj'
@@ -2375,11 +2297,11 @@ sq:
           suspended: 'Përdorues të Pezulluar'
           suspect: 'Përdorues të Dyshimtë'
         reject_successful:
-          one: "Ju refuzuat %{count} përdorues me sukses. "
-          other: "Ju refuzuat %{count} përdoruesë me sukses. "
+          one: 'Ju refuzuat %{count} përdorues me sukses. '
+          other: 'Ju refuzuat %{count} përdoruesë me sukses. '
         reject_failures:
-          one: "Nuk arritëm të refuzojmë 1 përdorues."
-          other: "Nuk arritëm të refuzojmë %{count} përdoruesë. "
+          one: Nuk arritëm të refuzojmë 1 përdorues.
+          other: 'Nuk arritëm të refuzojmë %{count} përdoruesë. '
         not_verified: "I pa verifikuar"
         check_email:
           title: "Shfaq adresën email të këtij përdoruesi."
@@ -2463,8 +2385,8 @@ sq:
         tl3_requirements:
           title: "Kërkesat për përdorues me Nivel Besimi 3"
           table_title:
-            one: "gjatë ditës së fundit:"
-            other: "Në %{count} ditët e fundit:"
+            one: 'gjatë ditës së fundit:'
+            other: 'Në %{count} ditët e fundit:'
           value_heading: "Vlera"
           requirement_heading: "Kërkesë"
           visits: "Vizita"
@@ -2533,10 +2455,7 @@ sq:
         recommended: "Ju rekomandojmë të ndryshoni tekstin më poshtë sipas nevojave tuaja: "
         show_overriden: 'Shfaq vetëm të ndryshuarat'
       site_settings:
-        show_overriden: 'Shfaq vetëm të ndryshuarat'
         title: 'Rregullimet'
-        reset: 'rivendos'
-        none: 'asnjë'
         no_results: "Nuk u gjet asnjë rezultat."
         clear_filter: "Pastro"
         add_url: "shto URL"
@@ -2582,14 +2501,14 @@ sq:
           modal_title: Grupime Steme
         granted_by: Atribuar nga
         granted_at: Atribuar më
-        reason_help: '{një lidhje për një postim ose temë)'
+        reason_help: "{një lidhje për një postim ose temë)"
         save: Ruaj
         delete: Fshij
-        delete_confirm: Jeni i sigurtë që doni ta fshini këtë stemë?
+        delete_confirm: "Jeni i sigurtë që doni ta fshini këtë stemë?"
         revoke: Revoko
         reason: Arsye
         expand: Zgjero &hellip;
-        revoke_confirm: Jeni i sigurtë që doni ta tërhiqni këtë stemë?
+        revoke_confirm: "Jeni i sigurtë që doni ta tërhiqni këtë stemë?"
         edit_badges: Ndryshoni stemat
         grant_badge: Dhuroni Stemë
         granted_badges: Stema të atribuara
@@ -2603,7 +2522,6 @@ sq:
         enabled: Aktivizoni stemën
         icon: Ikonë
         image: Imazh
-        icon_help: "Përdor një klas FontAwesome ose URL-në e një imazhi"
         query: Query Steme (SQL)
         show_posts: Trego postimin që akordoi stemën në faqen e stemave
         trigger_type:
@@ -2615,11 +2533,11 @@ sq:
             header: "KUJDES!"
           no_grant_count: "Asnjë stemë për t'u dhënë."
           grant_count:
-            one: "<b>1</b> stemë për t'u dhënë."
-            other: "<b>%{count}</b> stema për t'u dhënë."
+            one: <b>1</b> stemë për t'u dhënë.
+            other: <b>%{count}</b> stema për t'u dhënë.
           sample: "Shëmbull:"
           grant:
-            with: <span class="username">%{username}</span>
+            with: "<span class=\"username\">%{username}</span>"
       emoji:
         title: "Emoji"
         name: "Emri"
diff --git a/config/locales/client.sr.yml b/config/locales/client.sr.yml
index c871946ff1f..9587e80bf35 100644
--- a/config/locales/client.sr.yml
+++ b/config/locales/client.sr.yml
@@ -16,8 +16,8 @@ sr:
           format: '%n %u'
           units:
             byte:
-              one: Bajt
               few: Bajta
+              one: Bajt
               other: Bajta
             gb: GB
             kb: KB
@@ -44,92 +44,92 @@ sr:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: "< %{count} s"
-          few: "< %{count} s"
-          other: "< %{count} s"
+          few: < %{count} s
+          one: < %{count} s
+          other: < %{count} s
         x_seconds:
-          one: "%{count} sek."
-          few: "%{count} sek."
-          other: "%{count} sek."
+          few: '%{count} sek.'
+          one: '%{count} sek.'
+          other: '%{count} sek.'
         less_than_x_minutes:
-          one: "< %{count}m"
-          few: "< %{count}m"
-          other: "< %{count}m"
+          few: < %{count}m
+          one: < %{count}m
+          other: < %{count}m
         x_minutes:
-          one: "%{count} min"
-          few: "%{count} min"
-          other: "%{count} min"
+          few: '%{count} min'
+          one: '%{count} min'
+          other: '%{count} min'
         about_x_hours:
-          one: "%{count}sat"
-          few: "%{count} sata"
-          other: "%{count}sati"
+          few: '%{count} sata'
+          one: '%{count} sat'
+          other: '%{count} sati'
         x_days:
-          one: "%{count} dan"
-          few: "%{count} dana"
-          other: "%{count} dana"
+          few: '%{count} dana'
+          one: '%{count} dan'
+          other: '%{count} dana'
         x_months:
-          one: "%{count} mes"
-          few: "%{count}mes"
-          other: "%{count}mes"
+          few: '%{count}mes'
+          one: '%{count} mes'
+          other: '%{count}mes'
         about_x_years:
-          one: "%{count} godina"
-          few: "%{count} godine"
-          other: "%{count} godina"
+          few: '%{count} godine'
+          one: '%{count} godina'
+          other: '%{count} godina'
         over_x_years:
-          one: "> %{count} godina"
-          few: "> %{count} godine"
-          other: "> %{count} godina"
+          few: '> %{count} godine'
+          one: '> %{count} godina'
+          other: '> %{count} godina'
         almost_x_years:
-          one: "%{count} godina"
-          few: "%{count} godine"
-          other: "%{count} godina"
+          few: '%{count} godine'
+          one: '%{count} godina'
+          other: '%{count} godina'
         date_month: "D MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: "%{count} min"
-          few: "%{count} min"
-          other: "%{count} min"
+          few: '%{count} min'
+          one: '%{count} min'
+          other: '%{count} min'
         x_hours:
-          one: "%{count} sat"
-          few: "%{count} sata"
-          other: "%{count} sati"
+          few: '%{count} sata'
+          one: '%{count} sat'
+          other: '%{count} sati'
         x_days:
-          one: "%{count} dan"
-          few: "%{count} dana"
-          other: "%{count} dana"
+          few: '%{count} dana'
+          one: '%{count} dan'
+          other: '%{count} dana'
         date_year: "D MMM 'YY"
       medium_with_ago:
         x_minutes:
-          one: "pre %{count} minut"
-          few: "pre %{count} minuta"
-          other: "pre %{count} minuta"
+          few: pre %{count} minuta
+          one: pre %{count} minut
+          other: pre %{count} minuta
         x_hours:
-          one: "pre %{count} sat"
-          few: "pre %{count} sata"
-          other: "pre %{count} sati"
+          few: pre %{count} sata
+          one: pre %{count} sat
+          other: pre %{count} sati
         x_days:
-          one: "pre %{count} dan"
-          few: "pre %{count} dana"
-          other: "pre %{count} dana"
+          few: pre %{count} dana
+          one: pre %{count} dan
+          other: pre %{count} dana
       later:
         x_days:
-          one: "%{count} dan kasnije"
-          few: "%{count} dana kasnije"
-          other: "%{count} dana kasnije"
+          few: '%{count} dana kasnije'
+          one: '%{count} dan kasnije'
+          other: '%{count} dana kasnije'
         x_months:
-          one: "%{count} mesec kasnije"
-          few: "%{count} meseca kasnije"
-          other: "%{count} meseci kasnije"
+          few: '%{count} meseca kasnije'
+          one: '%{count} mesec kasnije'
+          other: '%{count} meseci kasnije'
         x_years:
-          one: "%{count} godina kasnije"
-          few: "%{count} godine kasnije"
-          other: "%{count} godina kasnije"
+          few: '%{count} godine kasnije'
+          one: '%{count} godina kasnije'
+          other: '%{count} godina kasnije'
       previous_month: 'Prethodni mesec'
       next_month: 'Sledeći mesec'
       placeholder: datum
     share:
-      topic: 'podeli link na ovu temu'
+      topic: 'podeli link ka ovoj temi'
       post: 'poruka #%{postNumber}'
       close: 'zatvori'
       twitter: 'podeli ovaj link na Twitteru'
@@ -138,7 +138,6 @@ sr:
       email: 'podeli ovaj link preko e-pošte'
     action_codes:
       public_topic: "objavi ovu temu javno %{when}"
-      private_topic: "objavi ovu temu privatno %{when}"
       split_topic: "podeli ovu temu %{when}"
       invited_user: "pozvan %{who} %{when}"
       invited_group: "pozvan%{who}%{when}"
@@ -169,8 +168,6 @@ sr:
     topic_admin_menu: "tema admin akcije"
     wizard_required: "Dobrodošli na Vaš novi Discourse! Počnimo sa <a href='%{url}' data-auto-route='true'>instalacijom</a>"
     emails_are_disabled: "Sva odlazeća epošta je onemogućena globalno od strane administratora. Ni jedna notifikacija neće biti poslata."
-    bootstrap_mode_enabled: "Ne bi li olakšali lansiranje Vašeg novoj sajta, trenutno ste u bootstrap modu. Svim novim korisnicima će biti dodeljen nivo poverljivosti 1 i imaće omogućene dnevne e-mail preglede. Ovo će automatski biti isključeno kada ukupni broj korisnika pređe %{min_users}korisnika."
-    bootstrap_mode_disabled: "Bootstrap mod će biti isključen u naredna 24 časa."
     themes:
       default_description: "zadato"
     s3:
@@ -206,10 +203,10 @@ sr:
     show_help: "opcije"
     links: "Linkovi"
     links_lowercase:
-      one: "link"
-      few: "linkovi"
-      other: "linkovi"
-    faq: "ČPP"
+      few: linkovi
+      one: link
+      other: linkovi
+    faq: "FAQ (često postavljana pitanja)"
     guidelines: "Smernice"
     privacy_policy: "Politika Privatnosti"
     privacy: "Privatnost"
@@ -232,9 +229,9 @@ sr:
     max_of_count: "maksimalno od {{count}}"
     alternation: "ili"
     character_count:
-      one: "{{count}} karakter"
-      few: "{{count}} karaktera"
-      other: "{{count}} karaktera"
+      few: '{{count}} karaktera'
+      one: '{{count}} karakter'
+      other: '{{count}} karaktera'
     suggested_topics:
       title: "Predložene Teme"
       pm_title: "Predložene poruke"
@@ -246,8 +243,6 @@ sr:
       our_moderators: "Naši moderatori"
       stat:
         all_time: "Sve vreme"
-        last_7_days: "Posledjih 7 dana"
-        last_30_days: "Poslednjih 30 dana"
       like_count: "Sviđanja"
       topic_count: "Teme"
       post_count: "Poruka"
@@ -263,24 +258,11 @@ sr:
         unbookmark: "Klikni da bi obirsao sve markere sa ove teme"
     bookmarks:
       not_logged_in: "izvini, morate biti prijavljeni da bi markirali ovu temu"
-      created: "ti si markirao ovu poruku"
-      not_bookmarked: "ti si pročitao ovu poruku; klikni da bi je markirao"
+      created: "markirao si ovu poruku"
+      not_bookmarked: "pročitao si ovu poruku; klikni da bi je markirao (bookmark-ovao)"
       last_read: "ovo je zadnja poruka koju si pročitao; klikni da bi je markirao"
       remove: "Obriši marker"
       confirm_clear: "Jeste li sigurni da želite izbrisati sve markere sa ove teme?"
-    topic_count_latest:
-      one: "{{count}} nova ili izmenjena tema."
-      few: "{{count}} nove ili izmenjene teme."
-      other: "{{count}} novih ili izmenjenih tema."
-    topic_count_unread:
-      one: "{{count}} nepročitana tema"
-      few: "{{count}} nepročitane teme"
-      other: "{{count}} nepročitanih tema"
-    topic_count_new:
-      one: "{{count}} nova tema."
-      few: "{{count}} nove teme."
-      other: "{{count}} novih tema."
-    click_to_show: "Klikni da pogledaš"
     preview: "prikaži"
     cancel: "otkaži"
     save: "Sačuvaj izmene"
@@ -317,9 +299,9 @@ sr:
       cancel: "Otkaži"
       view_pending: "vidi poruke na čekanju"
       has_pending_posts:
-        one: "Ova tema ima <b>{{count}}</b> poruku koje čekaju na odobrenje"
-        few: "Ova tema ima <b>{{count}}</b> poruke koje čekaju na odobrenje"
-        other: "Ova tema ima <b>{{count}}</b> poruka koje čekaju na odobrenje"
+        few: Ova tema ima <b>{{count}}</b> poruke koje čekaju na odobrenje
+        one: Ova tema ima <b>{{count}}</b> poruku koje čekaju na odobrenje
+        other: Ova tema ima <b>{{count}}</b> poruka koje čekaju na odobrenje
       confirm: "Sačuvaj izmene"
       delete_prompt: "Da li si siguran da želiš obrisati <b>%{username}</b>? Ovim ćeš obrisati sve njegove postove i blokirati njegov email i IP adresu."
       approval:
@@ -358,16 +340,13 @@ sr:
       posts_read: "Pročitano"
       posts_read_long: "Postova pročitano"
       total_rows:
-        one: "{count} korisnik"
-        few: "%{count} korisnika"
-        other: "%{count} korisnika"
+        few: '%{count} korisnika'
+        one: '{count} korisnik'
+        other: '%{count} korisnika'
     groups:
-      logs:
-        action: "Akcije"
       owner: "vlasnik"
       index:
         title: "Grupe"
-      members: "Članovi"
       topics: "Teme"
       posts: "Poruka"
       mentions: "Spominjanja"
@@ -378,24 +357,21 @@ sr:
         mods_and_admins: "Samo moderatori i Administratori"
         members_mods_and_admins: "Samo članovi grupe, moderatori i administratori"
         everyone: "Svi"
-      trust_levels:
-        none: "Ništa"
       flair_bg_color_placeholder: "(Opciono) Hex vrednost boje"
     user_action_groups:
-      '1': "Sviđanja Dodata"
-      '2': "Primljena Sviđanja"
-      '3': "Markiraj"
-      '4': "Teme"
-      '5': "Odgovori"
-      '7': "Spomeni"
-      '9': "Citati"
-      '11': "Izmene"
-      '12': "Poslato"
-      '13': "Primljeno"
-      '14': "U toku"
+      "1": "Data sviđanja"
+      "2": "Dobijena sviđanja"
+      "3": "Markirano"
+      "4": "Teme"
+      "5": "Odgovori"
+      "7": "Spomeni"
+      "9": "Citati"
+      "11": "Izmene"
+      "12": "Poslato"
+      "13": "Primljeno"
+      "14": "U toku"
     categories:
       all: "sve kategorije"
-      all_subcategories: "sve"
       no_subcategory: "ništa"
       category: "Kategorija"
       reorder:
@@ -410,9 +386,9 @@ sr:
       toggle_ordering: "odredi kontrolu smera"
       subcategories: "Podkategorije"
       topic_stat_sentence:
-        one: "%{count} nova tema u poslednjih %{unit}."
-        few: "%{count} novih tema u poslednjih %{unit}."
-        other: "%{count} novih tema u poslednjih %{unit}."
+        few: '%{count} novih tema u poslednjih %{unit}.'
+        one: '%{count} nova tema u poslednjih %{unit}.'
+        other: '%{count} novih tema u poslednjih %{unit}.'
     ip_lookup:
       title: Pretraga po IP adresi
       hostname: Ime računara
@@ -428,6 +404,8 @@ sr:
       topics_entered: "tema posećeno"
       post_count: "# poruka"
       confirm_delete_other_accounts: "Jeste li sigurni da želite obrisati ove naloge?"
+    user_fields:
+      none: "(izaberi jednu od opcija)"
     user:
       said: "{{username}}:"
       profile: "Profil"
@@ -445,8 +423,6 @@ sr:
       trust_level: "Nivo poverenja"
       notifications: "Obaveštenja"
       statistics: "Statistike"
-      desktop_notifications:
-        label: "Obaveštenja na radnoj površini"
       dismiss_notifications_tooltip: "Označi sve nepročitana obavestenja kao pročitana"
       disable_jump_reply: "Ne uskači u moju poruku nakon mog odgovora"
       external_links_in_new_tab: "Otvori sve spoljne linkove u novom tabu"
@@ -466,7 +442,6 @@ sr:
       delete_account: "Obriši moj Nalog"
       delete_account_confirm: "Jeste li sigurni da želite trajno obrisati svoj nalog? Ova se akcija ne može poništiti!"
       deleted_yourself: "Vaš nalog je uspešno obrisan."
-      delete_yourself_not_allowed: "Trenutno ne možete obrisati svoj nalog. Kontaktirajte administratora da ga obriše umesto vas."
       unread_message_count: "Poruke"
       admin_delete: "Obriši"
       staff_counters:
@@ -477,11 +452,13 @@ sr:
         warnings_received: "upozorenja"
       messages:
         all: "sve"
+        archive: "Arhiviraj"
+        move_to_archive: "Arhiviraj"
       change_password:
         success: "(email je poslat)"
         in_progress: "(email se šalje)"
         error: "(greška)"
-        action: "Pošalj e-mail za povratak šifre."
+        action: "Pošalji e-mail za povratak šifre."
         set_password: "Postavi Šifru"
       change_about:
         title: "Promijeni O meni"
@@ -490,7 +467,7 @@ sr:
         taken: "Žao nam je, to je ime zauzeto."
         invalid: "Korisničko ime je nevažeće. Može sadržati samo slova i brojeve."
       change_email:
-        title: "Promijeni E-mail"
+        title: "Promeni e-mail"
         taken: "Žao nam je, taj e-mail nije dostupan"
         error: "Dogodila se greška u promeni tvog e-maila. Možda ta adresa već postoji?"
         success: "Poslali smo e-mail na tu adresu. Molimo vas sledite uputstva za potvrdu."
@@ -511,15 +488,18 @@ sr:
         instructions: "Pozadinske slike će biti centrirane i imati standardu širinu od 590px."
       email:
         title: "E-mail"
-        ok: "Poslati ćemo vam e-mail za potvrdu"
+        ok: "Poslaćemo vam e-mail za potvrdu"
         invalid: "Molimo unesite validnu e-mail adresu"
         authenticated: "E-mail vam je potvrđen od {{provider}}"
       name:
         title: "Ime"
+        instructions: "vaše ime (opciono)"
+        instructions_required: "Vaše ime"
         too_short: "Ime vam je prekratko"
         ok: "Vaše ime dobro izgleda"
       username:
         title: "Korisničko ime"
+        instructions: "jedinstveno, bez razmaka, kratko"
         short_instructions: "Ljudi vas mogu spominjati kao @{{username}}"
         available: "Vaše korisničko ime slobodno"
         not_available: "Nije dostupno. Pokušajte {{suggestion}}?"
@@ -539,8 +519,6 @@ sr:
       created: "Pridružio"
       log_out: "Odjavi se"
       location: "Lokacija"
-      card_badge:
-        title: "Značka Korisničke Kartice"
       website: "Web Stranica"
       email_settings: "E-mail"
       like_notification_frequency:
@@ -606,43 +584,44 @@ sr:
         same_as_username: "Tvoja šifra je ista kao i tvoje korisničko ime."
         same_as_email: "Tvoja šifra je ista kao i tvoj email."
         ok: "Vaša šifra izgleda dobro."
+        instructions: "najmanje %{count} karaktera"
       summary:
         title: "Rezime"
         stats: "Statistike"
         time_read: "vreme čitanja"
         recent_time_read: "vreme nedavnih čitanja"
         topic_count:
-          one: "kreirana tema"
-          few: "kreirane teme"
-          other: "kreiranih tema"
+          few: kreirane teme
+          one: kreirana tema
+          other: kreiranih tema
         post_count:
-          one: "kreiran post"
-          few: "kreirana posta"
-          other: "kreiranih postova"
+          few: kreirana posta
+          one: kreiran post
+          other: kreiranih postova
         likes_given:
-          one: "dato"
-          few: "dato"
-          other: "dato"
+          few: dato
+          one: dato
+          other: dato
         likes_received:
-          one: "primljeno"
-          few: "primljeno"
-          other: "primljeno"
+          few: primljeno
+          one: primljeno
+          other: primljeno
         days_visited:
-          one: "dan posećivao"
-          few: "dana posećivao"
-          other: "dana posećivao"
+          few: dana posećivao
+          one: dan posećivao
+          other: dana posećivao
         topics_entered:
-          one: "temu pregledao"
-          few: "tema pregledao"
-          other: "tema pregledao"
+          few: tema pregledao
+          one: temu pregledao
+          other: tema pregledao
         posts_read:
-          one: "postova pročitao"
-          few: "postova pročitao"
-          other: "postova pročitao"
+          few: postova pročitao
+          one: postova pročitao
+          other: postova pročitao
         bookmark_count:
-          one: "označena"
-          few: "označene"
-          other: "označenih"
+          few: označene
+          one: označena
+          other: označenih
         top_replies: "Top odgovori"
         no_replies: "Bez odgovora, još uvek."
         more_replies: "Još odgovora"
@@ -709,7 +688,10 @@ sr:
     first_post: Prva poruka
     mute: Utišaj
     unmute: Poništi utišanje
+    last_post: Pisao
     last_reply_lowercase: poslednji odgovor
+    signup_cta:
+      hidden_for_session: "OK, pitacu te sutra. Uvek mozes da koristis 'Uloguj se' da kreiras nalog."
     summary:
       enabled_description: "Gledate pregled ove teme: najzanimljivije poruke su odabrane od strane zajednice."
       enable: 'Sumirajte Ovu Temu'
@@ -729,7 +711,8 @@ sr:
     trust_level: 'Nivo poverenja'
     search_hint: 'korisničko ime, e-mail ili IP adresa'
     create_account:
-      title: "Napravi Novi Nalog"
+      disclaimer: "Registracijom prihvataš <a href='{{privacy_link}}'>pravila privatnosti</a> i <a href='{{tos_link}}'>uslove korišćenja</a>."
+      title: "Napravi novi nalog"
       failed: "Nešto nije u redu, možda je ovaj e-mail već registrovan, pokušajte s linkom za zaboravljenu šifru."
     forgot_password:
       action: "Zaboravio/la sam šifru"
@@ -748,6 +731,7 @@ sr:
       email_placeholder: "e-mail ili korisničko ime"
       caps_lock_warning: "Caps Lock vam je uključen"
       error: "Nepoznata greška"
+      rate_limit: "Molimo sačekajte pre nego pokušate opet da se prijavite."
       blank_username_or_password: "Molimo unesite e-mail ili korisničko ime i šifru."
       reset_password: 'Resetujte Šifru'
       logging_in: "Prijavljivanje..."
@@ -761,23 +745,26 @@ sr:
       resend_activation_email: "Pritisnite ovde da ponovno pošaljemo aktivacijski e-mail."
       sent_activation_email_again: "Poslali smo vam drugi aktivacijski e-mail na: <b>{{currentEmail}}</b>. Možda zatreba par minuta da stigne; svakako proverite nepoželjnu poštu."
       google:
-        title: "pomoću Google"
-        message: "Autentifikacija pomoću Google (isključite pop-up blokere)"
+        title: "pomoću Google-a"
+        message: "Autentifikacija pomoću Google-a (isključite pop-up blokere)"
       google_oauth2:
-        title: "pomoću Googlea"
+        title: "pomoću Google-a"
         message: "Autentifikacija pomoću Googlea (isključite pop-up blokere)"
       twitter:
-        title: "pomoću Twittera"
+        title: "pomoću Twitter-a"
         message: "Autentifikacija preko Twittera (isključite pop-up blokere)"
       facebook:
-        title: "pomoću Facebooka"
+        title: "pomoću Facebook-a"
         message: "Autentifikacija preko Facebooka (isključite pop-up blokere)"
       yahoo:
-        title: "pomoću Yahooa"
+        title: "pomoću Yahoo-a"
         message: "Autentifikacija preko Yahooa (isključite pop-up blokere)"
       github:
         title: "pomoću GitHuba"
         message: "Autentifikacija preko GitHuba (isključite pop-up blokere)"
+    invites:
+      welcome_to: "Dobrodošao na %{site_name}!"
+      success: "Tvoj nalog je kreiran i sada si ulogovan."
     emoji_set:
       google: "Google"
       twitter: "Twitter"
@@ -855,9 +842,6 @@ sr:
       empty: "Nisu pronađene notifikacije"
       more: "pogledaj starije notifikacije"
       total_flagged: "sve ukupno označenih poruka"
-      alt:
-        replied: "Odgovoreno"
-        private_message: "Privatna poruka od"
     upload_selector:
       title: "Dodaj sliku"
       title_with_attachments: "Dodaj sliku ili datoteku"
@@ -882,6 +866,9 @@ sr:
         topic: "Pretražite ovu temu"
       advanced:
         title: Napredna pretraga
+        post:
+          time:
+            before: pre
     go_back: 'idi nazad'
     not_logged_in_user: 'stranica korisnika sa sažetkom trenutnih aktivnosti i postavki'
     current_user: 'idi na korisničku stranicu'
@@ -894,12 +881,12 @@ sr:
         toggle: "uključi/isključi grupni odabir tema"
         actions: "Grupne aktivnosti"
         close_topics: "Zatvori Teme"
-        archive_topics: "Arhiviraj Teme"
+        archive_topics: "Arhiviraj teme"
         choose_new_category: "Izaberite novu kategoriju za vašu temu."
         selected:
-          one: "Odabrali ste <b>{{count}}</b> temu."
-          few: "Odabrali ste <b>{{count}}</b> tema."
-          other: "Odabrali ste <b>{{count}}</b> tema."
+          few: Odabrali ste <b>{{count}}</b> tema.
+          one: Odabrali ste <b>{{count}}</b> temu.
+          other: Odabrali ste <b>{{count}}</b> tema.
       none:
         unread: "Nemate nepročitanih tema."
         new: "Nemate novih tema."
@@ -923,17 +910,19 @@ sr:
     topic:
       create: 'Nova Tema'
       create_long: 'Otvori novu Temu'
+      archive_message:
+        title: 'Arhiviraj'
       list: 'Teme'
       new: 'nova tema'
       unread: 'nepročitano'
       new_topics:
-        one: '1 nova tema'
         few: '{{count}} nove teme'
+        one: 1 nova tema
         other: '{{count}} nove teme'
       unread_topics:
+        few: '{{count}} nepročitane tema'
         one: '{{count}} nepročitana tema'
-        few: '{{count}} nepročitanih tema'
-        other: '{{count}} nepročitane teme'
+        other: '{{count}} nepročitanih teme'
       title: 'Tema'
       invalid_access:
         title: "Tema je privatna"
@@ -946,30 +935,31 @@ sr:
         title: "Tema nije pronađena"
         description: "Žao nam je, nismo mogli pronaći temu. Možda ju je moderator uklonio?"
       total_unread_posts:
-        one: "Imate {{count}} nepročitanu poruku u ovoj temi"
-        few: "Imate {{count}} nepročitanih poruka u ovoj temi"
-        other: "Imate {{count}} nepročitanih poruka u ovoj temi"
+        few: Imate {{count}} nepročitanih poruka u ovoj temi
+        one: Imate {{count}} nepročitanu poruku u ovoj temi
+        other: Imate {{count}} nepročitanih poruka u ovoj temi
       unread_posts:
-        one: "Imate {{count}} staru nepročitanu poruku u ovoj temi"
-        few: "Imate {{count}} starih nepročitanih poruka u ovoj temi"
-        other: "Imate {{count}} starih nepročitanih poruka u ovoj temi"
+        few: Imate {{count}} starih nepročitanih poruka u ovoj temi
+        one: Imate {{count}} staru nepročitanu poruku u ovoj temi
+        other: Imate {{count}} starih nepročitanih poruka u ovoj temi
       new_posts:
-        one: "Ima {{count}} novih poruka u temi od kad ste je zadnji put pročitali"
-        few: "Ima {{count}} novih poruka u temi od kad ste je zadnji put pročitali"
-        other: "Ima {{count}} novih poruka u temi od kad ste je zadnji put pročitali"
+        few: Ima {{count}} novih poruka u temi od kad ste je zadnji put pročitali
+        one: Ima {{count}} novih poruka u temi od kad ste je zadnji put pročitali
+        other: Ima {{count}} novih poruka u temi od kad ste je zadnji put pročitali
       likes:
-        one: "Ima {{count}} sviđanja u temi"
-        few: "Ima {{count}} sviđanja u temi"
-        other: "Ima {{count}} sviđanja u temi"
+        few: Ima {{count}} sviđanja u temi
+        one: Ima {{count}} sviđanja u temi
+        other: Ima {{count}} sviđanja u temi
       back_to_list: "Nazad na listu tema"
       options: "Opcije Teme"
       show_links: "Prikaži linkove u ovoj temi"
       toggle_information: "uključi/isključi detalje teme"
       read_more_in_category: "Želite da pročitate više? Pregledaj druge teme u  {{catLink}} ili {{latestLink}}."
       read_more: "Želite da pročitate više? {{catLink}} ili {{latestLink}}."
+      read_more_MF: "There { UNREAD, plural, =0 {} one { is <a href='/unread'>1 unread</a> } other { are <a href='/unread'># unread</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='/new'>1 new</a> topic} other { {BOTH, select, true{and } false {are } other{}} <a href='/new'># new</a> topics} } remaining, or {CATEGORY, select, true {browse other topics in {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Pregledaj sve kategorije
       view_latest_topics: pogledaj najnovije teme
-      suggest_create_topic: Zašto ne otvorite temu?
+      suggest_create_topic: "Zašto ne otvorite temu?"
       jump_reply_up: skoči na raniji odgovor
       jump_reply_down: skoči na kasniji odgovor
       deleted: "Tema je obrisana"
@@ -986,14 +976,14 @@ sr:
         current: trenutna poruka
       notifications:
         reasons:
-          '3_6': 'Primaćete obaveštenja jer posmatrate ovu kategoriju.'
-          '3_5': 'Primaćete obaveštenja jer ste automatski počeli posmatrati temu.'
-          '3_2': 'Primaćete obaveštenja jer posmatrate temu.'
-          '3_1': 'Primaćete obaveštenja jer ste vi otvorili temu.'
-          '3': 'Primaćete obaveštenja jer posmatrate temu.'
-          '0_7': 'Ignorirate sva obaveštenja iz ove kategorije.'
-          '0_2': 'Ignorirate sva obaveštenja iz ove teme.'
-          '0': 'Ignorirate sva obaveštenja iz ove teme.'
+          "3_6": 'Primaćete obaveštenja jer posmatrate ovu kategoriju.'
+          "3_5": 'Primaćete obaveštenja jer ste automatski počeli posmatrati temu.'
+          "3_2": 'Primaćete obaveštenja jer posmatrate temu.'
+          "3_1": 'Primaćete obaveštenja jer ste vi otvorili temu.'
+          "3": 'Primaćete obaveštenja jer posmatrate temu.'
+          "0_7": 'Ignorirate sva obaveštenja iz ove kategorije.'
+          "0_2": 'Ignorirate sva obaveštenja iz ove teme.'
+          "0": 'Ignorirate sva obaveštenja iz ove teme.'
         watching_pm:
           title: "Posmatram"
         watching:
@@ -1017,7 +1007,6 @@ sr:
         visible: "Stavi na popis"
         reset_read: "Poništi podatke o pročitanom"
         make_public: "Napravi javnu temu"
-        make_private: "Napravi privatnu poruku"
       feature:
         pin: "Zakači temu"
       reply:
@@ -1028,7 +1017,7 @@ sr:
         help: "Ukloni status zakačenog s ove teme da se vise ne pojavljuje na vrhu liste tema"
       share:
         title: 'Podeli'
-        help: 'podeli link na ovu temu'
+        help: 'podeli link ka ovoj temi'
       print:
         title: 'Štampaj'
         help: 'Otvori verziju pogodnu za štampanje'
@@ -1055,9 +1044,9 @@ sr:
       login_reply: 'Prijavi se da bi odgovorio'
       filters:
         n_posts:
-          one: "1 poruka"
-          few: "{{count}} poruka"
-          other: "{{count}} poruka"
+          few: '{{count}} poruka'
+          one: 1 poruka
+          other: '{{count}} poruka'
         cancel: "Uklonite filter"
       split_topic:
         title: "Prebaci u Novu Temu"
@@ -1065,17 +1054,17 @@ sr:
         topic_name: "Ime Nove Teme"
         error: "Dogodila se greška pri prebacivanju poruka u novu temu."
         instructions:
-          one: "Otvorićete novu temu popunjenu s <b>{{count}}</b> poruka koje ste izabrali."
-          few: "Otvorićete novu temu popunjenu s <b>{{count}}</b> poruka koje ste izabrali."
-          other: "Otvorićete novu temu popunjenu s <b>{{count}}</b> poruka koje ste izabrali."
+          few: Otvorićete novu temu popunjenu s <b>{{count}}</b> poruka koje ste izabrali.
+          one: Otvorićete novu temu popunjenu s <b>{{count}}</b> poruka koje ste izabrali.
+          other: Otvorićete novu temu popunjenu s <b>{{count}}</b> poruka koje ste izabrali.
       merge_topic:
         title: "Prebaci u Postojeću Temu"
         action: "prebaci u postojeću temu"
         error: "Dogodili se greška prilikom prebacivanju poruka u tu temu."
         instructions:
-          one: "Molimo odaberite temu u koju želite prebaciti <b>{{count}}</b> poruka."
-          few: "Molimo odaberite temu u koju želite prebaciti <b>{{count}}</b> poruka."
-          other: "Molimo odaberite temu u koju želite prebaciti <b>{{count}}</b> poruka."
+          few: Molimo odaberite temu u koju želite prebaciti <b>{{count}}</b> poruka.
+          one: Molimo odaberite temu u koju želite prebaciti <b>{{count}}</b> poruka.
+          other: Molimo odaberite temu u koju želite prebaciti <b>{{count}}</b> poruka.
       change_owner:
         title: "promena vlasnika poruke"
         action: "promena vlasništva"
@@ -1083,10 +1072,9 @@ sr:
         label: "Novi vlasnik poruke"
         placeholder: "korisničko ime novog vlasnika"
         instructions:
-          one: "Molimo vas odaberete novog vlasnika {{count}} poruka od <b>{{old_user}}</b>."
-          few: "Molimo vas odaberete novog vlasnika {{count}} poruka od <b>{{old_user}}</b>."
-          other: "Molimo vas odaberete novog vlasnika {{count}} poruka od <b>{{old_user}}</b>."
-        instructions_warn: "Primetite da se obaveštenja o ovoj poruci neće retroaktivno preneti novom korisniku. <br> Upozorenje: Trenutno se nikakvi podaci vezani uz poruke ne prenose novom korisniku. Koristiti pažljivo."
+          few: Molimo vas odaberete novog vlasnika {{count}} poruka od <b>{{old_user}}</b>.
+          one: Molimo vas odaberete novog vlasnika {{count}} poruka od <b>{{old_user}}</b>.
+          other: Molimo vas odaberete novog vlasnika {{count}} poruka od <b>{{old_user}}</b>.
       multi_select:
         select: 'odaberi'
         selected: 'odabrano ({{count}})'
@@ -1095,8 +1083,8 @@ sr:
         select_all: odaberi sve
         deselect_all: odustani od odabira
         description:
-          one: Odabrali ste <b>{{count}}</b> poruka.
           few: Odabrali ste <b>{{count}}</b> poruka.
+          one: Odabrali ste <b>{{count}}</b> poruka.
           other: Odabrali ste <b>{{count}}</b> poruka.
     post:
       edit_reason: "Razlog:"
@@ -1108,9 +1096,9 @@ sr:
       show_full: "Prikaži Celu Poruku"
       show_hidden: 'Vidi skriven sadržaj.'
       deleted_by_author:
-        one: "(autor je povukao poruku, biće automatski obrisana za %{count} sati osim ako bude označena zastavicom)"
-        few: "(autor je povukao poruku, biće automatski obrisana za %{count} sati osim ako bude označena zastavicom)"
-        other: "(autor je povukao poruku, biće automatski obrisana za %{count} sati osim ako bude označena zastavicom)"
+        few: (autor je povukao poruku, biće automatski obrisana za %{count} sati osim ako bude označena zastavicom)
+        one: (autor je povukao poruku, biće automatski obrisana za %{count} sati osim ako bude označena zastavicom)
+        other: (autor je povukao poruku, biće automatski obrisana za %{count} sati osim ako bude označena zastavicom)
       expand_collapse: "proširi/sruši"
       unread: "Poruka je nepročitana"
       errors:
@@ -1131,14 +1119,14 @@ sr:
       controls:
         reply: "počnite sa sastavljanjem odgovora na ovu poruku"
         like: "Lajkuj ovu poruku"
-        has_liked: "Ti si lajkovao ovu poruku"
+        has_liked: "lajkovao si ovu poruku"
         undo_like: "poništi lajk"
         edit: "izmeni ovu poruku"
         edit_anonymous: "Žao nam je, morate biti prijavljeni da bi ste izmjenili ovu poruku."
         flag: "privatno označi poruku za pozornost ili pošalji privatno obaveštenje o njoj"
         delete: "obriši ovu poruku"
         undelete: "poništi brisanje poruke"
-        share: "podeli link za ovu poruku"
+        share: "podeli link ka ovoj poruci"
         more: "Više"
         admin: "admin akcije na objavi"
         wiki: "Napravi Wiki"
@@ -1166,62 +1154,62 @@ sr:
           vote: "Glasali ste za ovu poruku"
         by_you_and_others:
           off_topic:
-            one: "Ti i {{count}} drugi korisnik označili ste ovo kao van teme"
-            few: "Ti i {{count}} drugih korisnika označili ste ovo kao van teme"
-            other: "Ti i {{count}} drugih korisnika označili ste ovo kao van teme"
+            few: Ti i {{count}} drugih korisnika označili ste ovo kao van teme
+            one: Ti i {{count}} drugi korisnik označili ste ovo kao van teme
+            other: Ti i {{count}} drugih korisnika označili ste ovo kao van teme
           spam:
-            one: "Ti i {{count}} drugi korisnik označili ste ovo kao nepoželjno."
-            few: "Ti i {{count}} drugih korisnika označili ste ovo kao nepoželjno."
-            other: "Ti i {{count}} drugih korisnika označili ste ovo kao nepoželjno."
+            few: Ti i {{count}} drugih korisnika označili ste ovo kao nepoželjno.
+            one: Ti i {{count}} drugi korisnik označili ste ovo kao nepoželjno.
+            other: Ti i {{count}} drugih korisnika označili ste ovo kao nepoželjno.
           inappropriate:
-            one: "Ti i {{count}} drugi korisnik označili ste ovo kao neprikladno"
-            few: "Ti i {{count}} drugih korisnika označili ste ovo kao neprikladno"
-            other: "Ti i {{count}} drugih korisnika označili ste ovo kao neprikladno"
+            few: Ti i {{count}} drugih korisnika označili ste ovo kao neprikladno
+            one: Ti i {{count}} drugi korisnik označili ste ovo kao neprikladno
+            other: Ti i {{count}} drugih korisnika označili ste ovo kao neprikladno
           notify_moderators:
-            one: "Ti i {{count}} drugi korisnik označili ste ovo za moderatore."
-            few: "Ti i {{count}} druga korisnika označili ste ovo za moderatore."
-            other: "Ti i {{count}} druga korisnika označili ste ovo za moderatore."
+            few: Ti i {{count}} druga korisnika označili ste ovo za moderatore.
+            one: Ti i {{count}} drugi korisnik označili ste ovo za moderatore.
+            other: Ti i {{count}} druga korisnika označili ste ovo za moderatore.
           bookmark:
-            one: "Ti i {{count}} drugi korisnik ste markirali ovu objavu"
-            few: "Ti i {{count}} drugih korisnika ste markirali ovu objavu"
-            other: "Ti i {{count}} drugih korisnika ste markirali ovu objavu"
+            few: Ti i {{count}} drugih korisnika ste markirali ovu objavu
+            one: Ti i {{count}} drugi korisnik ste markirali ovu objavu
+            other: Ti i {{count}} drugih korisnika ste markirali ovu objavu
           like:
-            one: "Tebi i {{count}} drugom korisniku se ovo sviđa."
-            few: "Tebi i {{count}} drugih korisnika se ovo sviđa."
-            other: "Tebi i {{count}} drugih korisnika se ovo sviđa."
+            few: Tebi i {{count}} drugih korisnika se ovo sviđa.
+            one: Tebi i {{count}} drugom korisniku se ovo sviđa.
+            other: Tebi i {{count}} drugih korisnika se ovo sviđa.
           vote:
-            one: "Ti i {{count}} drugi korisnik ste glasali za ovu poruku"
-            few: "Ti i {{count}} drugih korisnika ste glasali za ovu poruku"
-            other: "Ti i {{count}} drugih korisnika ste glasali za ovu poruku"
+            few: Ti i {{count}} drugih korisnika ste glasali za ovu poruku
+            one: Ti i {{count}} drugi korisnik ste glasali za ovu poruku
+            other: Ti i {{count}} drugih korisnika ste glasali za ovu poruku
         by_others:
           off_topic:
-            one: "{{count}} korisnika označilo je ovo kao van teme"
-            few: "{{count}} korisnika označilo je ovo kao van teme"
-            other: "{{count}} korisnika označilo je ovo kao van teme"
+            few: '{{count}} korisnika označilo je ovo kao van teme'
+            one: '{{count}} korisnika označilo je ovo kao van teme'
+            other: '{{count}} korisnika označilo je ovo kao van teme'
           spam:
-            one: "{{count}} korisnik označilo je ovo kao nepoželjno"
-            few: "{{count}} korisnika označilo je ovo kao nepoželjno"
-            other: "{{count}} korisnika označilo je ovo kao nepoželjno"
+            few: '{{count}} korisnika označilo je ovo kao nepoželjno'
+            one: '{{count}} korisnik označilo je ovo kao nepoželjno'
+            other: '{{count}} korisnika označilo je ovo kao nepoželjno'
           inappropriate:
-            one: "{count}} korisnik označilo je ovo kao neprikladno"
-            few: "{count}} korisnika označilo je ovo kao neprikladno"
-            other: "{{count}} korisnika označilo je ovo kao neprikladno"
+            few: '{count}} korisnika označilo je ovo kao neprikladno'
+            one: '{count}} korisnik označilo je ovo kao neprikladno'
+            other: '{{count}} korisnika označilo je ovo kao neprikladno'
           notify_moderators:
-            one: "{{count}} korisnik označilo je ovo za moderatora"
-            few: "{{count}} korisnika označilo je ovo za moderatora"
-            other: "{{count}} korisnika označilo je ovo za moderatora"
+            few: '{{count}} korisnika označilo je ovo za moderatora'
+            one: '{{count}} korisnik označilo je ovo za moderatora'
+            other: '{{count}} korisnika označilo je ovo za moderatora'
           bookmark:
-            one: "{{count}} korisnik je markiralo ovu objavu"
-            few: "{{count}} korisnika je markiralo ovu objavu"
-            other: "{{count}} korisnika je markiralo ovu objavu"
+            few: '{{count}} korisnika je markiralo ovu objavu'
+            one: '{{count}} korisnik je markiralo ovu objavu'
+            other: '{{count}} korisnika je markiralo ovu objavu'
           like:
-            one: "{{count}} korisnik se ovo sviđa"
-            few: "{{count}} korisnika se ovo sviđa"
-            other: "{{count}} korisnika se ovo sviđa"
+            few: '{{count}} korisnika se ovo sviđa'
+            one: '{{count}} korisnik se ovo sviđa'
+            other: '{{count}} korisnika se ovo sviđa'
           vote:
-            one: "{{count}} korisnik je glasalo za ovu poruku"
-            few: "{{count}} korisnika je glasalo za ovu poruku"
-            other: "{{count}} korisnika je glasalo za ovu poruku"
+            few: '{{count}} korisnika je glasalo za ovu poruku'
+            one: '{{count}} korisnik je glasalo za ovu poruku'
+            other: '{{count}} korisnika je glasalo za ovu poruku'
       revisions:
         controls:
           first: "Prva revizija"
@@ -1317,9 +1305,9 @@ sr:
     topic_map:
       title: "Sažetak teme"
       clicks:
-        one: "%{count} klik"
-        few: "%{count} klikova"
-        other: "%{count} klikova"
+        few: '%{count} klikova'
+        one: '%{count} klik'
+        other: '%{count} klikova'
     topic_statuses:
       warning:
         help: "Ovo je službeno upozorenje."
@@ -1360,9 +1348,9 @@ sr:
       latest:
         title: "Poslednje"
         title_with_count:
-          one: "Poslednje ({{count}})"
-          few: "Poslednje ({{count}})"
-          other: "Poslednje ({{count}})"
+          few: Poslednje ({{count}})
+          one: Poslednje ({{count}})
+          other: Poslednje ({{count}})
         help: "teme sa nedavnim porukama"
       hot:
         title: "Vruće"
@@ -1377,25 +1365,25 @@ sr:
       unread:
         title: "Nepročitano"
         title_with_count:
-          one: "Nepročitane ({{count}})"
-          few: "Nepročitane ({{count}})"
-          other: "Nepročitane ({{count}})"
+          few: Nepročitane ({{count}})
+          one: Nepročitane ({{count}})
+          other: Nepročitane ({{count}})
         help: "teme koje trenutno posmatrate ili pratite s nepročitanim porukama"
         lower_title_with_count:
-          one: "1 nepročitana"
-          few: "{{count}} nepročitanih"
-          other: "{{count}} nepročitanih"
+          few: '{{count}} nepročitanih'
+          one: 1 nepročitana
+          other: '{{count}} nepročitanih'
       new:
         lower_title_with_count:
-          one: "1 nova"
-          few: "{{count}} novih"
-          other: "{{count}} novih"
+          few: '{{count}} novih'
+          one: 1 nova
+          other: '{{count}} novih'
         lower_title: "novo"
         title: "Novo"
         title_with_count:
-          one: "Nove (1)"
-          few: "Nove ({{count}})"
-          other: "Nove ({{count}})"
+          few: Nove ({{count}})
+          one: Nove (1)
+          other: Nove ({{count}})
         help: "teme otvorene u zadnjih par dana"
       posted:
         title: "Moje poruke"
@@ -1427,7 +1415,7 @@ sr:
         this_week: "Nedelja"
         today: "Danas"
         other_periods: "vidi top teme"
-    browser_update: 'Nažalost, <a href="http://www.discourse.org/faq/#browser">vaš  pretraživač je prestar da radi na ovoj stranici</a>. Molimo <a href="http://browsehappy.com"> nadogradite si pretraživač</a>'
+    browser_update: 'Nažalost, <a href="http://www.discourse.org/faq/#browser">vaš  pretraživač je previše zastareo da bi radio na ovoj stranici</a>. Molimo <a href="http://browsehappy.com"> ažurirajte ga na novu verziju </a>'
     permission_types:
       full: "Otvoriti / Odgovori / Pogledaj"
       create_post: "Odgovori / Pogledaj"
@@ -1462,8 +1450,6 @@ sr:
         reports:
           today: "Danas"
           yesterday: "Juče"
-          last_7_days: "Zadnjih 7 Dana"
-          last_30_days: "Zadnjih 30 Dana"
           all_time: "Oduvek"
           7_days_ago: "Pre 7 Dana"
           30_days_ago: "Pre 30 Dana"
@@ -1479,7 +1465,6 @@ sr:
         title: "Zastave"
         agree: "Slažem se"
         agree_title: "Potvrdite ovu zastavu kao validnu i tačnu"
-        defer_flag_title: "Ukloni zastavu; trenutno nema potrebe za akcijom."
         delete: "Obriši"
         delete_title: "Obriši poruku na koju ova zastava referira."
         delete_post_defer_flag_title: "Obriši poruku; ako je prva, obriši temu"
@@ -1513,17 +1498,12 @@ sr:
         title: "Grupe"
         edit: "Izmeni Grupe"
         refresh: "Osveži"
-        new: "Novo"
-        selector_placeholder: "unesite korisničko ime"
         about: "Ovde izmenite svoje članstvo u grupama i imenima grupa"
         group_members: "Članovi grupe"
         delete: "Obriši"
         delete_confirm: "Obriši ovu grupu?"
         delete_failed: "Nemoguće obrisati grupu. Ako je ovo automatska grupa, ne možete je obrisati."
         add: "Dodaj"
-        add_members: "Dodaj članove"
-        automatic_membership_email_domains: "Korisnici koji se registruju sa email domenom koja tačno odgovora jednoj na ovoj listi biće automatski dodani u ovu grupu:"
-        automatic_membership_retroactive: "Primeni isto pravilo o email domeni za dodavanje postojećih registrovanih korisnika"
       api:
         generate_master: "Generiši glavni API ključ"
         none: "Nema aktivnih API ključeva"
@@ -1551,7 +1531,6 @@ sr:
           size: "Veličina"
         upload:
           uploading: "Učitavanje..."
-          success: "'{{filename}}' je uspešno učitano."
           error: "Dogodila se greška pri učitavanju '{{filename}}': {{message}}"
         operations:
           is_running: "Operacija je trenutno u toku..."
@@ -1562,7 +1541,6 @@ sr:
           backup:
             title: "Napravi sigurnosnu kopiju"
             confirm: "Želite li pokrenuti novu sigurnosnu kopiju?"
-            without_uploads: "Da (ne uključuj datoteke)"
           destroy:
             title: "Ukloni kopiju"
             confirm: "Jeste li sigurni da želite uništiti ovu sigurnosnu kopiju?"
@@ -1746,7 +1724,7 @@ sr:
       users:
         title: 'Korisnici'
         create: 'Dodaj Administratora'
-        last_emailed: "Zadnji Email-an"
+        last_emailed: "Poslednji e-mail"
         not_found: "Žao nam je, taj korisnik ne postoji u našem sistemu."
         id_not_found: "Žao nam je, taj korisnički ID ne postoji u našem sistemu."
         active: "Aktivni"
@@ -1757,16 +1735,16 @@ sr:
           pending: "U toku"
           staff: 'Osoblje'
           suspended: 'Suspendovani'
-          suspect: 'Sumljivi'
+          suspect: 'Sumnjivi'
         approved: "Potvrđenji?"
         approved_selected:
-          one: "Potvrdi korisnika"
-          few: "Potvrdi korisnike ({{count}})"
-          other: "Potvrdi korisnike ({{count}})"
+          few: Potvrdi korisnike ({{count}})
+          one: Potvrdi korisnika
+          other: Potvrdi korisnike ({{count}})
         reject_selected:
-          one: "odbij korisnika"
-          few: "odbij korisnike ({{count}})"
-          other: "odbij korisnike ({{count}})"
+          few: odbij korisnike ({{count}})
+          one: odbij korisnika
+          other: odbij korisnike ({{count}})
         titles:
           active: 'Aktivni Korisnici'
           new: 'Novi Korisnici'
@@ -1777,15 +1755,15 @@ sr:
           admins: 'Administratori'
           moderators: 'Moderatori'
           suspended: 'Suspendovani Korisnici'
-          suspect: 'Sumljivi Korisnici'
+          suspect: 'Sumnjivi korisnici'
         reject_successful:
-          one: "Uspešno odbio %{count} koriniska."
-          few: "Uspešno odbio %{count} koriniska."
-          other: "Uspešno odbio %{count} koriniska."
+          few: Uspešno odbio %{count} koriniska.
+          one: Uspešno odbio %{count} koriniska.
+          other: Uspešno odbio %{count} koriniska.
         reject_failures:
-          one: "Neuspešno odbio %{count} korisnika."
-          few: "Neuspešno odbio %{count} korisnika."
-          other: "Neuspešno odbio %{count} korisnika."
+          few: Neuspešno odbio %{count} korisnika.
+          one: Neuspešno odbio %{count} korisnika.
+          other: Neuspešno odbio %{count} korisnika.
         not_verified: "Nije verifikovano"
         check_email:
           title: "Otkrij korisnikovu email adresu"
@@ -1810,11 +1788,11 @@ sr:
         log_out: "Odjava"
         logged_out: "Korisnik je odjavljen sa svih uređaja"
         revoke_admin: 'Poništi Administratora'
-        grant_admin: 'Dodijeli Administratora'
+        grant_admin: 'Postavi za administratora'
         revoke_moderation: 'Poništi Moderatora'
-        grant_moderation: 'Dodijeli Moderatora'
+        grant_moderation: 'Postavi za moderatora'
         unsuspend: 'Poništi suspenziju'
-        suspend: 'Suspendiraj'
+        suspend: 'Suspenduj'
         reputation: Reputacija
         permissions: Dozvole
         activity: Aktivnost
@@ -1836,17 +1814,17 @@ sr:
         delete: "Obriši Korisnika"
         delete_forbidden_because_staff: "Admini i moderatori ne mogu biti obrisani."
         delete_forbidden:
-          one: "Korisnici ne mogu biti obrisani ako imaju poruka. Obrišite sve njihove poruke pre nego pokušate obrisati korisnika. (Poruke starije od %{dana} ne mogu biti obrisane.)"
-          few: "Korisnici ne mogu biti obrisani ako imaju poruka. Obrišite sve njihove poruke pre nego pokušate obrisati korisnika. (Poruke starije od %{dana} ne mogu biti obrisane.)"
-          other: "Korisnici ne mogu biti obrisani ako imaju poruka. Obrišite sve njihove poruke pre nego pokušate obrisati korisnika. (Poruke starije od %{dana} ne mogu biti obrisane.)"
+          few: Korisnici ne mogu biti obrisani ako imaju poruka. Obrišite sve njihove poruke pre nego pokušate obrisati korisnika. (Poruke starije od %{dana} ne mogu biti obrisane.)
+          one: Korisnici ne mogu biti obrisani ako imaju poruka. Obrišite sve njihove poruke pre nego pokušate obrisati korisnika. (Poruke starije od %{dana} ne mogu biti obrisane.)
+          other: Korisnici ne mogu biti obrisani ako imaju poruka. Obrišite sve njihove poruke pre nego pokušate obrisati korisnika. (Poruke starije od %{dana} ne mogu biti obrisane.)
         cant_delete_all_posts:
-          one: "Ne možete obrisati sve poruke. Neke su starije od %{count} dana. ( delete_user_max_post_age podešavanja.)"
-          few: "Ne možete obrisati sve poruke. Neke su starije od %{count} dana. ( delete_user_max_post_age podešavanja.)"
-          other: "Ne možete obrisati sve poruke. Neke su starije od %{count} dana. ( delete_user_max_post_age podešavanja.)"
+          few: Ne možete obrisati sve poruke. Neke su starije od %{count} dana. ( delete_user_max_post_age podešavanja.)
+          one: Ne možete obrisati sve poruke. Neke su starije od %{count} dana. ( delete_user_max_post_age podešavanja.)
+          other: Ne možete obrisati sve poruke. Neke su starije od %{count} dana. ( delete_user_max_post_age podešavanja.)
         cant_delete_all_too_many_posts:
-          one: "Ne možete obrisati sve objave jer korisnik ima više od  %{count} poruka. (delete_all_posts_max)"
-          few: "Ne možete obrisati sve objave jer korisnik ima više od  %{count} poruka. (delete_all_posts_max)"
-          other: "Ne možete obrisati sve objave jer korisnik ima više od  %{count} poruka. (delete_all_posts_max)"
+          few: Ne možete obrisati sve objave jer korisnik ima više od  %{count} poruka. (delete_all_posts_max)
+          one: Ne možete obrisati sve objave jer korisnik ima više od  %{count} poruka. (delete_all_posts_max)
+          other: Ne možete obrisati sve objave jer korisnik ima više od  %{count} poruka. (delete_all_posts_max)
         delete_confirm: "Jeste li SIGURNI da želite obrisati ovog korisnika? Ovo je trajno!"
         delete_and_block: "Obriši i <b>block</b> ovaj email i IP adresu"
         delete_dont_block: "Samo obriši"
@@ -1884,8 +1862,8 @@ sr:
           flagged_by_users: "Korisnici Koji Su Označili Zastavom"
           likes_given: "Lajkova Dato"
           likes_received: "Primljeno Lajkova"
-          likes_received_days: "Lajkova Primljeno: jedinsteni dani"
-          likes_received_users: "Lajkova Primljeno: jedinstveni korisnici"
+          likes_received_days: "Lajkova dobijeno : jedinstveni dani"
+          likes_received_users: "Lajkova dobijeno: jedinstveni korisnici"
           qualifies: "Kvalifikovao se za nivo poverenja 3."
           does_not_qualify: "Ne kvalificira se za nivo poverenja 3."
           will_be_promoted: "Uskoro će biti unapređen."
@@ -1931,10 +1909,7 @@ sr:
       site_text:
         title: 'Sadžaj Teksta'
       site_settings:
-        show_overriden: 'Pokazuj samo promenjeno'
         title: 'Podešavanja'
-        reset: 'resetuj'
-        none: 'ništa'
         no_results: "Nema pronađenih rezultata."
         clear_filter: "Čisto"
         categories:
@@ -1973,9 +1948,9 @@ sr:
         granted_at: Dodeljeno Pri
         save: Sačuvaj
         delete: Obriši
-        delete_confirm: Jeste li sigurni da želite izbrisati ovu značku?
+        delete_confirm: "Jeste li sigurni da želite izbrisati ovu značku?"
         revoke: Povuci
-        revoke_confirm: Jeste li sigurni da želite povući ovu značku?
+        revoke_confirm: "Jeste li sigurni da želite povući ovu značku?"
         edit_badges: Izmeni Značke
         grant_badge: Dodeli Značku
         granted_badges: Dodeli Značke
@@ -1989,7 +1964,6 @@ sr:
         enabled: Omogući značku
         icon: Ikona
         image: Slika
-        icon_help: "Koristite ili Font Awesome klase ili URL za neku sliku"
         query: Upitnik Značke (SQL)
         target_posts: Upitnik cilja poruke
         auto_revoke: Svakodnevno pokreni upitnik o povlačenju
@@ -2012,10 +1986,10 @@ sr:
             text: "Postoje izgubljeni uzorci dodele. Ovo se dogodi kad upit značke vrati korisnički ID ili ID poruke koja ne postoji. Ovo može prouzrokovati nepredviđene probleme kasnije - molimo provjerite svoj upit."
           sample: "Uzorak:"
           grant:
-            with: <span class="username">%{username}</span>
-            with_post: <span class="username">%{username}</span> za poruku u %{link}
-            with_post_time: <span class="username">%{username}</span> za poruku u %{link} u <span class="time">%{time}</span>
-            with_time: <span class="username">%{username}</span> u <span class="time">%{time}</span>
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span> za poruku u %{link}"
+            with_post_time: "<span class=\"username\">%{username}</span> za poruku u %{link} u <span class=\"time\">%{time}</span>"
+            with_time: "<span class=\"username\">%{username}</span> u <span class=\"time\">%{time}</span>"
       emoji:
         title: "Emoji"
         help: "Dodajte nove Emoji-e koji će biti dostupni svima. (Savet:  povuci i ispusti više datoteka odjednom)"
@@ -2033,9 +2007,9 @@ sr:
       uploading: "Uploading..."
       quit: "Možda kasnije"
       staff_count:
-        one: "Tvoja zajednica ima 1 člana tima (tebe). "
-        few: "Vaša zajednica ima  %{count} članova tima, uključujući i vas."
-        other: "Vaša zajednica ima %{count} članova tima, uključujući i vas."
+        few: Vaša zajednica ima  %{count} članova tima, uključujući i vas.
+        one: 'Tvoja zajednica ima 1 člana tima (tebe). '
+        other: Vaša zajednica ima %{count} članova tima, uključujući i vas.
       invites:
         add_user: "dodaj"
         none_added: "Nikoga još niste pozvali za člana tima. Jesi li siguran da želiš da nastaviš dalje?"
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index dba0cfdc2fa..fa96845726a 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -43,62 +43,62 @@ sv:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: "< 1s"
-          other: "< %{count}s"
+          one: < 1s
+          other: < %{count}s
         x_seconds:
-          one: "1s"
-          other: "%{count}s"
+          one: 1s
+          other: '%{count}s'
         x_minutes:
-          one: "1m"
-          other: "%{count}m"
+          one: 1m
+          other: '%{count}m'
         about_x_hours:
-          one: "1h"
-          other: "%{count}h"
+          one: 1h
+          other: '%{count}h'
         x_days:
-          one: "1d"
-          other: "%{count}d"
+          one: 1d
+          other: '%{count}d'
         about_x_years:
-          one: "1å"
-          other: "%{count}å"
+          one: 1å
+          other: '%{count}å'
         over_x_years:
-          one: "> 1å"
-          other: "> %{count}å"
+          one: '> 1å'
+          other: '> %{count}å'
         almost_x_years:
-          one: "1å"
-          other: "%{count}å"
+          one: 1å
+          other: '%{count}å'
         date_month: "D MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: "1 min"
-          other: "%{count} min"
+          one: 1 min
+          other: '%{count} min'
         x_hours:
-          one: "1 timme"
-          other: "%{count} timmar"
+          one: 1 timme
+          other: '%{count} timmar'
         x_days:
-          one: "1 dag"
-          other: "%{count} dagar"
+          one: 1 dag
+          other: '%{count} dagar'
         date_year: "D MMM, 'YY"
       medium_with_ago:
         x_minutes:
-          one: "1 min sedan"
-          other: "%{count} minuter sedan"
+          one: 1 min sedan
+          other: '%{count} minuter sedan'
         x_hours:
-          one: "1 timme sedan"
-          other: "%{count} timmar sedan"
+          one: 1 timme sedan
+          other: '%{count} timmar sedan'
         x_days:
-          one: "1 dag sedan"
-          other: "%{count} dagar sedan"
+          one: 1 dag sedan
+          other: '%{count} dagar sedan'
       later:
         x_days:
-          one: "1 dag senare"
-          other: "%{count} dagar senare"
+          one: 1 dag senare
+          other: '%{count} dagar senare'
         x_months:
-          one: "1 månad senare"
-          other: "%{count} månader senare"
+          one: 1 månad senare
+          other: '%{count} månader senare'
         x_years:
-          one: "1 år senare"
-          other: "%{count} år senare"
+          one: 1 år senare
+          other: '%{count} år senare'
       previous_month: 'Föregående månad'
       next_month: 'Nästkommande månad'
       placeholder: datum
@@ -112,7 +112,7 @@ sv:
       email: 'skicka denna länk i ett e-postmeddelande'
     action_codes:
       public_topic: "gjorde det här ämnet publikt %{when}"
-      private_topic: "gjorde det här ämnet privat %{when}"
+      private_topic: "gjorde det här ämnet till ett personligt meddelande %{when}"
       split_topic: "splitta det här ämnet %{when}"
       invited_user: "bjöd in %{who} %{when}"
       invited_group: "bjöd in %{who} %{when}"
@@ -144,7 +144,7 @@ sv:
     wizard_required: "Välkommen till din nya Discourse! Låt oss komma igång genom <a href='%{url}' data-auto-route='true'>uppsättnings guiden</a> ✨"
     emails_are_disabled: "All utgående e-post har blivit globalt inaktiverad av en administratör. Inga e-postnotifikationer av något slag kommer att skickas ut."
     bootstrap_mode_enabled: "Du är i bootstrap-läge för att göra lanseringen av din nya webbplats enklare. Alla nya användare kommer att beviljas förtroendenivå 1 och få dagliga sammanfattningar skickade via e-post. Det här stängs automatiskt av när det totala antalet användare överstiger %{min_users}."
-    bootstrap_mode_disabled: "Bootstrap-läge otillgängliggörs i 24 timmar."
+    bootstrap_mode_disabled: "Bootstrap-läge stängs av om 24 timmar."
     themes:
       default_description: "Standard"
     s3:
@@ -168,6 +168,7 @@ sv:
     not_implemented: "Denna funktion har inte implementerats än, vi beklagar!"
     no_value: "Nej"
     yes_value: "Ja"
+    submit: "Skicka"
     generic_error: "Tyvärr, ett fel har inträffat."
     generic_error_with_reason: "Ett fel inträffade: %{error}"
     sign_up: "Registrera"
@@ -180,8 +181,8 @@ sv:
     show_help: "alternativ"
     links: "Länkar"
     links_lowercase:
-      one: "länk"
-      other: "länkar"
+      one: länk
+      other: länkar
     faq: "FAQ"
     guidelines: "Riktlinjer"
     privacy_policy: "Integritetspolicy"
@@ -205,8 +206,8 @@ sv:
     max_of_count: "max av {{count}}"
     alternation: "eller"
     character_count:
-      one: "{{count}} tecken"
-      other: "{{count}} tecken"
+      one: '{{count}} tecken'
+      other: '{{count}} tecken'
     suggested_topics:
       title: "Föreslagna ämnen"
       pm_title: "Föreslagna meddelanden"
@@ -218,8 +219,8 @@ sv:
       our_moderators: "Våra moderatorer"
       stat:
         all_time: "Alla dagar"
-        last_7_days: "Senaste 7 dagarna"
-        last_30_days: "Senaste 30 Dagarna"
+        last_7_days: "Senaste 7"
+        last_30_days: "Senaste 30"
       like_count: "Gillningar"
       topic_count: "Ämnen"
       post_count: "Inlägg"
@@ -241,15 +242,8 @@ sv:
       remove: "Ta bort bokmärke"
       confirm_clear: "Är du säker på att du vill radera alla bokmärken från ämnet?"
     topic_count_latest:
-      one: "{{count}} nytt eller uppdaterat ämne."
-      other: "{{count}} nya eller uppdaterade ämnen."
-    topic_count_unread:
-      one: "{{count}} oläst ämne."
-      other: "{{count}} olästa ämnen."
-    topic_count_new:
-      one: "{{count}} nytt ämne."
-      other: "{{count}} nya ämnen."
-    click_to_show: "Klicka för att visa."
+      one: Visa {{count}} nytt eller uppdaterat ämne
+      other: Visa {{count}} nya eller uppdaterade ämnen
     preview: "förhandsgranska"
     cancel: "avbryt"
     save: "Spara ändringar"
@@ -262,6 +256,7 @@ sv:
     pasting: "Klistrar in..."
     enable: "Aktivera"
     disable: "Inaktivera"
+    continue: "Fortsätt"
     undo: "Ångra"
     revert: "Återställ"
     failed: "Misslyckades"
@@ -286,16 +281,16 @@ sv:
       cancel: "Avbryt"
       view_pending: "visa väntande inlägg"
       has_pending_posts:
-        one: "Detta ämne har <b>1</b> ämne som inväntar godkännande"
-        other: "Detta ämne har <b>{{count}}</b> inlägg som inväntar godkännande"
+        one: Detta ämne har <b>1</b> ämne som inväntar godkännande
+        other: Detta ämne har <b>{{count}}</b> inlägg som inväntar godkännande
       confirm: "Spara ändringar"
       delete_prompt: "Vill du verkligen ta bort <b>%{username}</b>? Dennes alla poster kommer att tas bort samt e-post och IP-adress kommer blockeras."
       approval:
         title: "Inlägget behöver godkännande"
         description: "Vi har mottagit ditt nya inlägg men det behöver bli godkänt av en moderator innan det kan visas. Ha tålamod."
         pending_posts:
-          one: "Du har <strong>1</strong> väntande inlägg."
-          other: "Du har <strong>{{count}}</strong> väntande inlägg."
+          one: Du har <strong>1</strong> väntande inlägg.
+          other: Du har <strong>{{count}}</strong> väntande inlägg.
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> skrev <a href='{{topicUrl}}'>ämnet</a>"
@@ -329,8 +324,8 @@ sv:
       posts_read: "Läst"
       posts_read_long: "Lästa inlägg"
       total_rows:
-        one: "1 användare"
-        other: "%{count} användare"
+        one: 1 användare
+        other: '%{count} användare'
     group_histories:
       actions:
         change_group_setting: "Ändra gruppinställningar"
@@ -339,22 +334,24 @@ sv:
         make_user_group_owner: "Gör till ägare"
         remove_user_as_group_owner: "Återkalla ägare"
     groups:
-      logs:
-        title: "Loggar"
-        when: "När"
-        action: "Handling"
-        acting_user: "Agerar användare"
-        target_user: "Specifik användare"
-        subject: "Ämne"
-        details: "Detaljer"
-        from: "Från"
-        to: "Till"
-      edit:
-        title: 'Redigera grupp'
+      add_members:
+        title: "Lägg till medlemmar"
+        usernames: "Användarnamn"
+      manage:
+        title: 'Hantera'
+        name: 'Namn'
         full_name: 'Fullständigt namn'
         add_members: "Lägg till medlemmar"
-        delete_member_confirm: "Ta bort '%{username}' från gruppen '%{group}'?"
-      name_placeholder: "Gruppnamn, inga mellanslag, samma regler som för användarnamn"
+        profile:
+          title: Profil
+        interaction:
+          title: Interaktion
+          notification: Notifikation
+        membership:
+          access: Tillgång
+        logs:
+          title: "Loggar"
+          subject: "Ämne"
       empty:
         posts: "Det är inga kommentarer från medlemmar i denna grupp"
         members: "Det finns inga medlemmar i denna grupp"
@@ -363,24 +360,18 @@ sv:
         topics: "Det finns inga trådar från medlemmar av denna grupp"
         logs: "Det finns inga loggar för denna grupp"
       add: "Lägg till"
-      join: "Gå med i grupp"
-      leave: "Lämna grupp"
-      request: "Förfrågan om att gå med i grupp"
-      automatic_group: Automatisk grupp
-      closed_group: Stängd grupp
-      is_group_user: "Du är en medlem av denna grupp"
+      join: "Gå med"
+      leave: "Lämna"
       allow_membership_requests: "Tillåt användare att skicka medlemskapsförfrågan till gruppägare"
       membership: "Medlemskap"
       name: "Namn"
-      user_count: "Antal medlemmar"
       bio: "Om grupp"
-      selector_placeholder: "Lägg till medlemmar"
       owner: "ägare"
       index:
         title: "Grupper"
         empty: "Det finns inga synliga grupper"
+        is_group_user: "Medlem"
       activity: "Aktivitet"
-      members: "Medlemmar"
       topics: "Ämnen"
       posts: "Inlägg"
       mentions: "Omnämnaden"
@@ -391,9 +382,6 @@ sv:
         mods_and_admins: "Bara moderatorer och administratörer"
         members_mods_and_admins: "Bara gruppmedlemmar, moderatorer och administratörer"
         everyone: "Alla"
-      trust_levels:
-        title: "Förtroendenivå som automatiskt beviljas användare när de läggs till:"
-        none: "Inga"
       notifications:
         watching:
           title: "Bevakar"
@@ -416,21 +404,20 @@ sv:
       flair_preview_icon: "Förhandsvisa icon"
       flair_preview_image: "förhandsvisa bild"
     user_action_groups:
-      '1': "Gillningar givna"
-      '2': "Gillningar mottagna"
-      '3': "Bokmärken"
-      '4': "Ämnen"
-      '5': "Svar"
-      '6': "Svar"
-      '7': "Omnämnanden"
-      '9': "Citat"
-      '11': "Redigeringar"
-      '12': "Skickade föremål"
-      '13': "Inkorg"
-      '14': "Väntar"
+      "1": "Gillningar givna"
+      "2": "Gillningar mottagna"
+      "3": "Bokmärken"
+      "4": "Ämnen"
+      "5": "Svar"
+      "6": "Svar"
+      "7": "Omnämnanden"
+      "9": "Citat"
+      "11": "Redigeringar"
+      "12": "Skickade föremål"
+      "13": "Inkorg"
+      "14": "Väntar"
     categories:
       all: "alla kategorier"
-      all_subcategories: "alla"
       no_subcategory: "ingen"
       category: "Kategori"
       category_list: "Visa kategori-lista"
@@ -449,11 +436,11 @@ sv:
       toggle_ordering: "slå av/på sorteringskontroll"
       subcategories: "Underkategorier"
       topic_sentence:
-        one: "1 ämne"
-        other: "%{count} ämnen"
+        one: 1 ämne
+        other: '%{count} ämnen'
       topic_stat_sentence:
-        one: "%{count} nytt ämne under den senaste %{unit}."
-        other: "%{count} nya ämnen under den senaste %{unit}."
+        one: '%{count} nytt ämne under den senaste %{unit}.'
+        other: '%{count} nya ämnen under den senaste %{unit}.'
     ip_lookup:
       title: Kolla upp IP-adress
       hostname: Värdnamn
@@ -493,7 +480,6 @@ sv:
       notifications: "Notifieringar"
       statistics: "Statistik"
       desktop_notifications:
-        label: "Skrivbordsaviseringar"
         not_supported: "Aviseringar stöds inte i den här webbläsaren. Tyvärr!"
         perm_default: "Sätt på aviseringar"
         perm_denied_btn: "Behörighet saknas"
@@ -547,7 +533,6 @@ sv:
       delete_account: "Radera mitt konto"
       delete_account_confirm: "Är du säker på att du vill ta bort ditt konto permanent? Denna åtgärd kan inte ångras!"
       deleted_yourself: "Ditt konto har tagits bort."
-      delete_yourself_not_allowed: "Du kan inte ta bort ditt konto just nu. Kontakta en admin och be om att få ditt konto borttaget."
       unread_message_count: "Meddelanden"
       admin_delete: "Radera"
       users: "Användare"
@@ -625,8 +610,8 @@ sv:
         authenticated: "Din e-postadress har blivit verifierad av {{provider}}"
         frequency_immediately: "Vi kommer att skicka e-post till dig omedelbart om du inte har läst det som vi skickar e-post till dig om."
         frequency:
-          one: "Vi skickar bara e-post om du inte synts till den senaste minuten."
-          other: "Vi skickar bara e-post om du inte synts till de senaste {{count}} minuterna."
+          one: Vi skickar bara e-post om du inte synts till den senaste minuten.
+          other: Vi skickar bara e-post om du inte synts till de senaste {{count}} minuterna.
       name:
         title: "Namn"
         instructions: "ditt fullständiga namn (tillval)"
@@ -657,8 +642,6 @@ sv:
       created: "Gick med"
       log_out: "Logga ut"
       location: "Plats"
-      card_badge:
-        title: "Användarkortsbricka"
       website: "Webbplats"
       email_settings: "E-post"
       like_notification_frequency:
@@ -712,10 +695,9 @@ sv:
         title: "Inbjudningar"
         user: "Inbjuden Användare"
         sent: "Skickat"
-        none: "Det finns inga pågående inbjudningar att visa."
         truncated:
-          one: "Visar den första inbjudningen."
-          other: "Visar de första {{count}} inbjudningarna."
+          one: Visar den första inbjudningen.
+          other: Visar de första {{count}} inbjudningarna.
         redeemed: "Inlösta inbjudningar"
         redeemed_tab: "Inlöst"
         redeemed_tab_with_count: "Inlöst ({{count}})"
@@ -757,20 +739,20 @@ sv:
         stats: "Statistik"
         time_read: "lästid"
         topic_count:
-          one: "ämnet skapades"
-          other: "ämnen skapades"
+          one: ämnet skapades
+          other: ämnen skapades
         post_count:
-          one: "inlägg skapat"
-          other: "inlägg skapade"
+          one: inlägg skapat
+          other: inlägg skapade
         days_visited:
-          one: "dag besökt"
-          other: "dagar besökta"
+          one: dag besökt
+          other: dagar besökta
         posts_read:
-          one: "inlägg läst"
-          other: "inlägg lästa"
+          one: inlägg läst
+          other: inlägg lästa
         bookmark_count:
-          one: "bokmärke"
-          other: "bokmärken"
+          one: bokmärke
+          other: bokmärken
         top_replies: "Toppinlägg"
         no_replies: "Inga svar ännu."
         more_replies: "Fler svar"
@@ -838,8 +820,8 @@ sv:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> har uppnått webbplatsinställningarnas gräns på %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> har överträffat webbplatsinställningarnas gräns på %{siteSettingRate}."
       rate:
-        one: "1 fel/%{duration}"
-        other: "%{count} fel/%{duration}"
+        one: 1 fel/%{duration}
+        other: '%{count} fel/%{duration}'
     learn_more: "lär dig mer..."
     all_time: 'totalt'
     all_time_desc: 'totalt antal ämnen skapade'
@@ -910,6 +892,7 @@ sv:
       caps_lock_warning: "Caps Lock är aktiverad"
       error: "Okänt fel"
       rate_limit: "Var god vänta innan du försöker logga in igen."
+      blank_username: "Vänligen ange din mail eller ditt användarnamn"
       blank_username_or_password: "Vänligen ange din e-post eller användarnamn och lösenord."
       reset_password: 'Återställ lösenord'
       logging_in: "Loggar in..."
@@ -992,8 +975,8 @@ sv:
       similar_topics: "Ditt ämne liknar..."
       drafts_offline: "utkast offline"
       group_mentioned:
-        one: "Genom att nämna {{group}}, så kommer du att notifiera <a href='{{group_link}}'>1 person</a> – är du säker?"
-        other: "Genom att nämna {{group}}, så kommer du att notifiera <a href='{{group_link}}'>{{count}} medlemmar</a> – är du säker?"
+        one: Genom att nämna {{group}}, så kommer du att notifiera <a href='{{group_link}}'>1 person</a> – är du säker?
+        other: Genom att nämna {{group}}, så kommer du att notifiera <a href='{{group_link}}'>{{count}} medlemmar</a> – är du säker?
       cannot_see_mention:
         category: "Du nämnde {{username}} men hen kommer inte få någon notifikation för hen har inte tillgång till denna kategori. Du behöver lägga till hen till en grupp som har tillgång till den här kategorin."
         private: "Du nämnde {{username}} men hen kommer inte få någon notifikation eftersom hen inte kan se detta personliga meddelande. Du behöver bjuda in hen till detta PM."
@@ -1063,28 +1046,13 @@ sv:
       empty: "Inga notifieringar hittades."
       more: "visa äldre notifikationer"
       total_flagged: "totalt antal flaggade inlägg"
-      alt:
-        mentioned: "Omnämnd av"
-        quoted: "Citerad av"
-        replied: "Svarade"
-        posted: "Skrivet av"
-        edited: "Redigera ditt inlägg genom"
-        liked: "Gillade ditt inlägg"
-        private_message: "Privat meddelande från"
-        invited_to_private_message: "Inbjudan till ett privat meddelande från "
-        invited_to_topic: "Inbjudan till ett ämne från"
-        invitee_accepted: "Inbjudan accepterades av"
-        moved_post: "Ditt inlägg blev flyttad av"
-        linked: "Länk till ditt inlägg"
-        granted_badge: "Utmärkelse beviljad"
-        group_message_summary: "Meddelanden i din grupps inkorg"
+      granted_badge: "Förtjänade '{{description}}'"
       popup:
         mentioned: '{{username}} nämnde dig i "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} nämnde dig i "{{topic}}" - {{site_title}}'
         quoted: '{{username}} citerade dig i "{{topic}}" - {{site_title}}'
         replied: '{{username}} svarade dig i "{{topic}}" - {{site_title}}'
         posted: '{{username}} skrev i "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} skickade dig ett privat meddelande i "{{topic}}" - {{site_title}}'
         linked: '{{username}} länkade till ett inlägg du gjort från "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Lägg till en bild"
@@ -1177,8 +1145,8 @@ sv:
         archive_topics: "Arkivera ämnen"
         choose_new_category: "Välj den nya kategorin för ämnena:"
         selected:
-          one: "Du har markerat <b>1</b> ämne."
-          other: "Du har markerat <b>{{count}}</b> ämnen."
+          one: Du har markerat <b>1</b> ämne.
+          other: Du har markerat <b>{{count}}</b> ämnen.
         change_tags: "Ersätt taggar"
         append_tags: "Lägg till taggar"
         choose_new_tags: "Välj nya taggar för de här ämnena:"
@@ -1210,12 +1178,9 @@ sv:
         bookmarks: "Inga fler bokmärkta ämnen hittades."
         search: "Inga fler sökresultat hittades."
     topic:
-      unsubscribe:
-        stop_notifications: "Du kommer du att motta färre notifieringar från <strong>{{title}}</strong>"
-        change_notification_state: "Ditt aktuella notifieringstillstånd är "
       filter_to:
-        one: "1 inlägg i ämnet"
-        other: "{{count}} inlägg i ämnet"
+        one: 1 inlägg i ämnet
+        other: '{{count}} inlägg i ämnet'
       create: 'Nytt ämne'
       create_long: 'Skapa ett nytt ämne'
       private_message: 'Skriv meddelande'
@@ -1229,10 +1194,10 @@ sv:
       new: 'nytt ämne'
       unread: 'oläst'
       new_topics:
-        one: '1 nytt ämne'
+        one: 1 nytt ämne
         other: '{{count}} nya ämnen'
       unread_topics:
-        one: '1 oläst ämne'
+        one: 1 oläst ämne
         other: '{{count}} olästa ämnen'
       title: 'Ämne'
       invalid_access:
@@ -1246,17 +1211,17 @@ sv:
         title: "Ämnet hittades inte"
         description: "Tyvärr, vi kunde inte hitta det ämnet. Kanske har den tagits bort av en moderator?"
       total_unread_posts:
-        one: "du har 1 oläst inlägg i det här ämnet"
-        other: "du har {{count}} olästa inlägg i det här ämnet"
+        one: du har 1 oläst inlägg i det här ämnet
+        other: du har {{count}} olästa inlägg i det här ämnet
       unread_posts:
-        one: "du har 1 oläst gammalt inlägg i det här ämnet"
-        other: "du har {{count}} olästa gamla inlägg i det här ämnet"
+        one: du har 1 oläst gammalt inlägg i det här ämnet
+        other: du har {{count}} olästa gamla inlägg i det här ämnet
       new_posts:
-        one: "det finns 1 nytt inlägg i det här ämnet sedan du senast läste den"
-        other: "det finns {{count}} nya inlägg i det här ämnet sedan du senast läste det"
+        one: det finns 1 nytt inlägg i det här ämnet sedan du senast läste den
+        other: det finns {{count}} nya inlägg i det här ämnet sedan du senast läste det
       likes:
-        one: "det finns 1 gillning i det här ämnet"
-        other: "det finns {{count}} gillningar i det här ämnet"
+        one: det finns 1 gillning i det här ämnet
+        other: det finns {{count}} gillningar i det här ämnet
       back_to_list: "Tillbaka till ämneslistan"
       options: "Ämnesinställningar"
       show_links: "visa länkar som finns i det här ämnet"
@@ -1266,7 +1231,7 @@ sv:
       read_more_MF: "Det finns { UNREAD, plural, =0 {} one { <a href='/unread'>1 oläst</a> } other { <a href='/unread'># olästa</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{och } false {} other{}} <a href='/new'>1 nytt</a> ämne} other { {BOTH, select, true{och } false {} other{}} <a href='/new'># nya</a> ämnen} } kvar, eller {CATEGORY, select, true {bläddra bland andra ämnen i {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Bläddra bland alla kategorier
       view_latest_topics: visa senaste ämnen
-      suggest_create_topic: Varför inte skapa ett ämne?
+      suggest_create_topic: "Varför inte skapa ett ämne?"
       jump_reply_up: hoppa till tidigare svar
       jump_reply_down: hoppa till senare svar
       deleted: "Ämnet har raderats"
@@ -1293,8 +1258,8 @@ sv:
         auto_close_based_on_last_post: "Detta ämne stängs %{duration} efter sista svaret."
       auto_close_title: 'Inställningar för automatisk stängning'
       auto_close_immediate:
-        one: "Senaste inlägget i det här ämnet är redan 1 timme gammalt, så ämnet kommer att stängas omedelbart. "
-        other: "Senaste inlägget i det här ämnet är redan %{count} timmar gammal, så ämnet kommer att stängas omedelbart. "
+        one: 'Senaste inlägget i det här ämnet är redan 1 timme gammalt, så ämnet kommer att stängas omedelbart. '
+        other: 'Senaste inlägget i det här ämnet är redan %{count} timmar gammal, så ämnet kommer att stängas omedelbart. '
       timeline:
         back: "Tillbaka"
         back_description: "Gå tillbaka till det senaste olästa meddelandet"
@@ -1315,17 +1280,17 @@ sv:
         title: ändra hur ofta du får notifieringar om det här ämnet
         reasons:
           mailing_list_mode: "Du har utskicksläge aktiverat, så du kommer notifieras om inlägg till det här ämnet via e-post."
-          '3_10': 'Du kommer att ta emot notifikationer för att du bevakar en tagg i det här ämnet.'
-          '3_6': 'Du kommer att få notifikationer för att du bevakar denna kategori.'
-          '3_5': 'Du kommer att ta emot notifikationer för att du automatiskt började följa det här ämnet.'
-          '3_2': 'Du kommer att ta emot notifikationer för att du bevakar detta ämne.'
-          '3_1': 'Du kommer ta emot notifikationer för att du skapade detta ämne.'
-          '3': 'Du kommer att ta emot notifikationer för att du bevakar detta ämne.'
-          '1_2': 'Du kommer få en notifiering om någon nämner ditt @namn eller svarar på ditt inlägg.'
-          '1': 'Du kommer få en notifiering om någon nämner ditt @namn eller svarar på ditt inlägg.'
-          '0_7': 'Du ignorerar alla notifikationer i den här kategorin.'
-          '0_2': 'Du ignorerar alla notifikationer för detta ämne.'
-          '0': 'Du ignorerar alla notifikationer för detta ämne.'
+          "3_10": 'Du kommer att ta emot notifikationer för att du bevakar en tagg i det här ämnet.'
+          "3_6": 'Du kommer att få notifikationer för att du bevakar denna kategori.'
+          "3_5": 'Du kommer att ta emot notifikationer för att du automatiskt började följa det här ämnet.'
+          "3_2": 'Du kommer att ta emot notifikationer för att du bevakar detta ämne.'
+          "3_1": 'Du kommer ta emot notifikationer för att du skapade detta ämne.'
+          "3": 'Du kommer att ta emot notifikationer för att du bevakar detta ämne.'
+          "1_2": 'Du kommer få en notifiering om någon nämner ditt @namn eller svarar på ditt inlägg.'
+          "1": 'Du kommer få en notifiering om någon nämner ditt @namn eller svarar på ditt inlägg.'
+          "0_7": 'Du ignorerar alla notifikationer i den här kategorin.'
+          "0_2": 'Du ignorerar alla notifikationer för detta ämne.'
+          "0": 'Du ignorerar alla notifikationer för detta ämne.'
         watching_pm:
           title: "Bevakar"
           description: "Du kommer att få en notifiering för varje nytt svar i detta meddelande, samt en räknare med antalet nya svar."
@@ -1364,7 +1329,6 @@ sv:
         visible: "Markera listad"
         reset_read: "Återställ läsdata"
         make_public: "Skapa allmänt ämne"
-        make_private: "Skapa privat meddelande"
       feature:
         pin: "Klistra ämne"
         unpin: "Avklistra ämne"
@@ -1372,7 +1336,7 @@ sv:
         make_banner: "Gör ämne till banderoll"
         remove_banner: "Ta bort banderollämne"
       reply:
-        title: 'svara'
+        title: 'Svara'
         help: 'Börja komponera ett svar på detta ämne'
       clear_pin:
         title: "Ta bort nål"
@@ -1397,8 +1361,8 @@ sv:
         pin_validation: "Ett datum krävs för att klistra fast det här ämnet."
         not_pinned: "Det finns inga klistrade ämnen i {{categoryLink}}."
         already_pinned:
-          one: "Nuvarande antal ämnen som är klistrade i {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
-          other: "Nuvarande antal ämnen som är klistrade i {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: 'Nuvarande antal ämnen som är klistrade i {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Nuvarande antal ämnen som är klistrade i {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         pin_globally: "Gör det här ämnet synligt i toppen av alla ämneslistor tills "
         confirm_pin_globally: "Du har redan {{count}} globalt klistrade ämnen. För många klistrade ämnen kan vara störande för nya och anonyma användare. Är du säker på att du vill klistra ytterligare ett ämne globalt?"
         unpin_globally: "Ta bort detta ämne från toppen av alla ämneslistor."
@@ -1406,8 +1370,8 @@ sv:
         global_pin_note: "Användare kan avklistra ämnet individuellt för sig själva."
         not_pinned_globally: "Det finns inga globalt klistrade ämnen."
         already_pinned_globally:
-          one: "Nuvarande antal ämnen som klistrats globalt: <strong class='badge badge-notification unread'>1</strong>"
-          other: "Nuvarande antal ämnen som klistrats globalt: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: 'Nuvarande antal ämnen som klistrats globalt: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'Nuvarande antal ämnen som klistrats globalt: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         make_banner: "Gör detta ämne till en banderoll som dyker upp i toppen av alla sidor."
         remove_banner: "Ta bort banderollen som dyker upp i toppen av alla sidor."
         banner_note: "Användare kan avfärda banderollen genom att stänga den. Endast ett ämne kan agera banderoll åt gången."
@@ -1443,8 +1407,8 @@ sv:
       login_reply: 'Logga in för att svara'
       filters:
         n_posts:
-          one: "1 inlägg"
-          other: "{{count}} inlägg"
+          one: 1 inlägg
+          other: '{{count}} inlägg'
         cancel: "Ta bort filter"
       split_topic:
         title: "Flytta till nytt ämne"
@@ -1452,15 +1416,15 @@ sv:
         topic_name: "Nytt ämnesnamn"
         error: "Ett fel inträffade då inläggen skulle flyttas till det nya ämnet."
         instructions:
-          one: "Du är påväg att skapa ett nytt ämne och lägga inlägget du har valt i den."
-          other: "Du är påväg att skapa en nytt ämne och lägga de <b>{{count}}</b> inlägg du har valt i den."
+          one: Du är påväg att skapa ett nytt ämne och lägga inlägget du har valt i den.
+          other: Du är påväg att skapa en nytt ämne och lägga de <b>{{count}}</b> inlägg du har valt i den.
       merge_topic:
         title: "Flytta till befintligt ämne"
         action: "flytta till befintligt ämne"
         error: "Ett fel inträffade då inlägg skulle flyttas till det ämnet."
         instructions:
-          one: "Välj vilket ämne du vill flytta det inlägget till."
-          other: "Välj vilket ämne du vill flytta de <br>{{count}}</b> inläggen till."
+          one: Välj vilket ämne du vill flytta det inlägget till.
+          other: Välj vilket ämne du vill flytta de <br>{{count}}</b> inläggen till.
       merge_posts:
         title: "Sammanfoga markerade inlägg"
         action: "sammanfoga markerade inlägg"
@@ -1472,9 +1436,8 @@ sv:
         label: "Ny ägare av inlägg"
         placeholder: "användarnamn på den nya ägaren"
         instructions:
-          one: "Vänligen välj ny ägare till inlägget av <b>{{old_user}}</b>."
-          other: "Vänligen välj ny ägare till de {{count}} inläggen av <b>{{old_user}}</b>."
-        instructions_warn: "Notera att inga notifieringar om detta inlägg kommer överföras till den nya användaren retroaktivt.<br>Varning: Just nu överförs inga inläggskritiska data till den nya användaren. Använd med försiktighet. "
+          one: Vänligen välj ny ägare till inlägget av <b>{{old_user}}</b>.
+          other: Vänligen välj ny ägare till de {{count}} inläggen av <b>{{old_user}}</b>.
       change_timestamp:
         action: "ändra tidsstämpeln"
         invalid_timestamp: "Tidsstämpeln kan inte sättas till ett framtida datum."
@@ -1491,8 +1454,6 @@ sv:
           one: Du har markerat <b>1</b> inlägg.
           other: Du har markerat <b>{{count}}</b> inlägg.
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Citat"
       edit_reason: "Anledning:"
       post_number: "inlägg {{number}}"
@@ -1505,26 +1466,26 @@ sv:
       show_full: "Visa hela inlägget"
       show_hidden: 'Visa dolt innehåll.'
       deleted_by_author:
-        one: "(inlägg tillbakadraget av skaparen, kommer att raderas automatiskt om 1 timme om det inte flaggas)"
-        other: "(inlägg tillbakadraget av skaparen, kommer att raderas automatiskt om %{count} timmar om det inte flaggas)"
+        one: (inlägg tillbakadraget av skaparen, kommer att raderas automatiskt om 1 timme om det inte flaggas)
+        other: (inlägg tillbakadraget av skaparen, kommer att raderas automatiskt om %{count} timmar om det inte flaggas)
       expand_collapse: "utvidga/förminska"
       gap:
-        one: "visa 1 dolt svar"
-        other: "visa {{count}} dolda svar"
+        one: visa 1 dolt svar
+        other: visa {{count}} dolda svar
       unread: "Inlägget är oläst"
       has_replies:
-        one: "{{count}} svar"
-        other: "{{count}} svar"
+        one: '{{count}} svar'
+        other: '{{count}} svar'
       has_likes:
-        one: "{{count}} gillning"
-        other: "{{count}} gillningar"
+        one: '{{count}} gillning'
+        other: '{{count}} gillningar'
       has_likes_title:
-        one: "1 person gillade detta inlägg"
-        other: "{{count}} personer gillade detta inlägg"
+        one: 1 person gillade detta inlägg
+        other: '{{count}} personer gillade detta inlägg'
       has_likes_title_only_you: "du gillade det här inlägget"
       has_likes_title_you:
-        one: "du och 1 annan person gillade det här inlägget"
-        other: "du och {{count}} andra personer gillade det här inlägget"
+        one: du och 1 annan person gillade det här inlägget
+        other: du och {{count}} andra personer gillade det här inlägget
       errors:
         create: "Tyvärr, det uppstod ett fel under skapandet av ditt inlägg. Var god försök igen."
         edit: "Tyvärr, det uppstod ett fel under ändringen av ditt inlägg. Var god försök igen."
@@ -1597,54 +1558,54 @@ sv:
           vote: "Du röstade för detta inlägg"
         by_you_and_others:
           off_topic:
-            one: "Du och 1 annan flaggade detta som orelevant"
-            other: "Du och {{count}} andra personer flaggade detta som orelevant"
+            one: Du och 1 annan flaggade detta som orelevant
+            other: Du och {{count}} andra personer flaggade detta som orelevant
           spam:
-            one: "Du och 1 annan flaggade detta som spam"
-            other: "Du och {{count}} andra personer flaggade detta som spam"
+            one: Du och 1 annan flaggade detta som spam
+            other: Du och {{count}} andra personer flaggade detta som spam
           inappropriate:
-            one: "Du och 1 annan flaggade detta som olämpligt"
-            other: "Du och {{count}} andra personer flaggade detta som olämpligt"
+            one: Du och 1 annan flaggade detta som olämpligt
+            other: Du och {{count}} andra personer flaggade detta som olämpligt
           notify_moderators:
-            one: "Du och 1 annan person har flaggat detta för moderation"
-            other: "Du och {{count}} andra personer har flaggat detta för moderation"
+            one: Du och 1 annan person har flaggat detta för moderation
+            other: Du och {{count}} andra personer har flaggat detta för moderation
           notify_user:
-            one: "Du och 1 person till skickade ett meddelande till denna användare"
-            other: "Du och {{count}} andra personer skickade ett meddelande till denna användare"
+            one: Du och 1 person till skickade ett meddelande till denna användare
+            other: Du och {{count}} andra personer skickade ett meddelande till denna användare
           bookmark:
-            one: "Du och 1 annan bokmärkte detta inlägg"
-            other: "Du och {{count}} andra personer bokmärkte detta inlägg"
+            one: Du och 1 annan bokmärkte detta inlägg
+            other: Du och {{count}} andra personer bokmärkte detta inlägg
           like:
-            one: "Du och 1 annan gillade detta"
-            other: "Du och {{count}} andra personer gillade detta"
+            one: Du och 1 annan gillade detta
+            other: Du och {{count}} andra personer gillade detta
           vote:
-            one: "Du och 1 annan röstade för detta inlägg"
-            other: "Du och {{count}} andra personer röstade för detta inlägg"
+            one: Du och 1 annan röstade för detta inlägg
+            other: Du och {{count}} andra personer röstade för detta inlägg
         by_others:
           off_topic:
-            one: "1 person flaggade detta som orelevant"
-            other: "{{count}} personer flaggade detta som orelevant"
+            one: 1 person flaggade detta som orelevant
+            other: '{{count}} personer flaggade detta som orelevant'
           spam:
-            one: "1 person flaggade detta som spam"
-            other: "{{count}} personer flaggade detta som spam"
+            one: 1 person flaggade detta som spam
+            other: '{{count}} personer flaggade detta som spam'
           inappropriate:
-            one: "1 person flaggade detta som olämpligt"
-            other: "{{count}} personer flaggade detta som olämpligt"
+            one: 1 person flaggade detta som olämpligt
+            other: '{{count}} personer flaggade detta som olämpligt'
           notify_moderators:
-            one: "1 person flaggade detta för granskning"
-            other: "{{count}} personer flaggade detta för granskning"
+            one: 1 person flaggade detta för granskning
+            other: '{{count}} personer flaggade detta för granskning'
           notify_user:
-            one: "1 person skickade ett meddelande till denna användare"
-            other: "{{count}} skickade ett meddelande till denna användare"
+            one: 1 person skickade ett meddelande till denna användare
+            other: '{{count}} skickade ett meddelande till denna användare'
           bookmark:
-            one: "1 person bokmärkte detta inlägg"
-            other: "{{count}} personer bokmärkte detta inlägg"
+            one: 1 person bokmärkte detta inlägg
+            other: '{{count}} personer bokmärkte detta inlägg'
           like:
-            one: "1 person gillade detta"
-            other: "{{count}} personer gillade detta"
+            one: 1 person gillade detta
+            other: '{{count}} personer gillade detta'
           vote:
-            one: "1 person röstade för detta inlägg"
-            other: "{{count}} personer röstade för detta inlägg"
+            one: 1 person röstade för detta inlägg
+            other: '{{count}} personer röstade för detta inlägg'
       revisions:
         controls:
           first: "Första revision"
@@ -1721,7 +1682,6 @@ sv:
       email_in_allow_strangers: "Acceptera e-post från anonyma användare utan konton"
       email_in_disabled: "Att skapa nya ämnen via e-post är avaktiverat i webbplatsinställningarna. För att aktivera ämnen skapade via e-post,"
       email_in_disabled_click: 'aktivera "inkommande e-post" inställningen.'
-      suppress_from_homepage: "Undanta den här kategorin från hemsidan."
       show_subcategory_list: "Visa listan med underkategorier ovanför ämnen i denna kategori."
       num_featured_topics: "Antal ämnen som visas på sidan kategorier:"
       all_topics_wiki: "Gör nya inlägg till wikis som standard"
@@ -1791,14 +1751,14 @@ sv:
       custom_placeholder_notify_moderators: "Låt oss veta i detalj vad du är bekymrad över, och skicka med relevanta länkar och exempel om möjligt."
       custom_message:
         at_least:
-          one: "skriv åtminstone 1 tecken"
-          other: "skriv åtminstone {{count}} tecken"
+          one: skriv åtminstone 1 tecken
+          other: skriv åtminstone {{count}} tecken
         more:
-          one: "1 till..."
-          other: "{{count}} till..."
+          one: 1 till...
+          other: '{{count}} till...'
         left:
-          one: "1 kvar"
-          other: "{{count}} kvar"
+          one: 1 kvar
+          other: '{{count}} kvar'
     flagging_topic:
       title: "Tack för att du hjälper oss hålla forumet civiliserat!"
       action: "Flagga ämne"
@@ -1809,13 +1769,13 @@ sv:
       links_title: "Populära länkar"
       links_shown: "visa fler länkar..."
       clicks:
-        one: "1 klick"
-        other: "%{count} klick"
+        one: 1 klick
+        other: '%{count} klick'
     post_links:
       about: "utvidga fler länkar för det här inlägget"
       title:
-        one: "1 mer"
-        other: "%{count} mer"
+        one: 1 mer
+        other: '%{count} mer'
     topic_statuses:
       warning:
         help: "Det här är en officiell varning."
@@ -1849,22 +1809,22 @@ sv:
     original_post: "Originalinlägg"
     views: "Visningar"
     views_lowercase:
-      one: "visning"
-      other: "visningar"
+      one: visning
+      other: visningar
     replies: "Svar"
     views_long:
-      one: "detta ämnet har visats 1 gång"
-      other: "detta ämne har visats {{number}} gånger"
+      one: detta ämnet har visats 1 gång
+      other: detta ämne har visats {{number}} gånger
     activity: "Aktivitet"
     likes: "Gillningar"
     likes_lowercase:
-      one: "gillar"
-      other: "gillar"
+      one: gillar
+      other: gillar
     likes_long: "det finns {{number}} gillningar i detta ämne"
     users: "Användare"
     users_lowercase:
-      one: "användare"
-      other: "användare"
+      one: användare
+      other: användare
     category_title: "Kategori"
     history: "Historik"
     changed_by: "av {{author}}"
@@ -1878,8 +1838,8 @@ sv:
       latest:
         title: "Senaste"
         title_with_count:
-          one: "Senaste (1)"
-          other: "Senaste ({{count}})"
+          one: Senaste (1)
+          other: Senaste ({{count}})
         help: "ämnen med nya inlägg"
       hot:
         title: "Hett"
@@ -1897,21 +1857,21 @@ sv:
       unread:
         title: "Olästa"
         title_with_count:
-          one: "Oläst"
-          other: "Olästa ({{count}})"
+          one: Oläst
+          other: Olästa ({{count}})
         help: "ämnen som du bevakar eller följer med olästa inlägg"
         lower_title_with_count:
-          one: "1 oläst"
-          other: "{{count}} olästa"
+          one: 1 oläst
+          other: '{{count}} olästa'
       new:
         lower_title_with_count:
-          one: "1 ny"
-          other: "{{count}} nya"
+          one: 1 ny
+          other: '{{count}} nya'
         lower_title: "ny"
         title: "Nya"
         title_with_count:
-          one: "Ny (1)"
-          other: "Nya  ({{count}})"
+          one: Ny (1)
+          other: Nya  ({{count}})
         help: "ämnen skapade de senaste dagarna"
       posted:
         title: "Mina Inlägg"
@@ -1922,8 +1882,8 @@ sv:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: "{{categoryName}} (1)"
-          other: "{{categoryName}} ({{count}})"
+          one: '{{categoryName}} (1)'
+          other: '{{categoryName}} ({{count}})'
         help: "senaste ämnena i kategorin {{categoryName}}"
       top:
         title: "Topp"
@@ -2007,22 +1967,21 @@ sv:
         print: '<b>ctrl</b>+<b>p</b> Skriv ut ämne'
     badges:
       earned_n_times:
-        one: "Förtjänade den här utmärkelsen 1 gång"
-        other: "Förtjänade den här utmärkelsen %{count} gånger"
+        one: Förtjänade den här utmärkelsen 1 gång
+        other: Förtjänade den här utmärkelsen %{count} gånger
       granted_on: "Utfärdad %{date}"
       others_count: "Andra med den här utmärkelsen (%{count})"
       title: Utmärkelser
       badge_count:
-        one: "1 Utmärkelse"
-        other: "%{count} Utmärkelser"
+        one: 1 Utmärkelse
+        other: '%{count} Utmärkelser'
       more_badges:
-        one: "+1 Till"
-        other: "+%{count} Till"
+        one: +1 Till
+        other: +%{count} Till
       granted:
-        one: "1 utfärdad"
-        other: "%{count} utfärdade"
+        one: 1 utfärdad
+        other: '%{count} utfärdade'
       select_badge_for_title: Välj en utmärkelse att använda som din titel
-      none: "<none>"
       badge_grouping:
         getting_started:
           name: Komma igång
@@ -2065,19 +2024,15 @@ sv:
       notifications:
         watching:
           title: "Bevakar"
-          description: "Du kommer automatiskt att bevaka alla ämnen i den här taggen. Du kommer att få notifieringar om alla nya inlägg och ämnen, och en räknare över olästa och nya inlägg kommer att visas brevid ämnen."
         watching_first_post:
           title: "Bevakar första inlägget"
-          description: "Du kommer endast att bli notifierad om första inlägget i varje nytt ämne i den här taggen."
         tracking:
           title: "Bevakade"
-          description: "Du kommer automatiskt följa alla nya ämnen i den här taggen. En räknare över olästa och nya inlägg kommer att visas bredvid ämnen."
         regular:
           title: "Vanlig"
           description: "Du kommer att få en notifiering om någon nämner ditt @namn eller svarar på ditt inlägg."
         muted:
           title: "Tystad"
-          description: "Du kommer inte att få notifieringar om nya ämnen inom den här taggen, och de kommer inte att visas under din \"oläst\"-flik."
       groups:
         title: "Grupptaggar"
         about: "Lägg till taggar i grupper för att lättare hantera dem."
@@ -2159,8 +2114,6 @@ sv:
         reports:
           today: "Idag"
           yesterday: "Igår"
-          last_7_days: "De senaste 7 dagarna"
-          last_30_days: "De senaste 30 dagarna"
           all_time: "Alltid"
           7_days_ago: "7 dagar sedan"
           30_days_ago: "30 dagar sedan"
@@ -2178,7 +2131,6 @@ sv:
         title: "Flaggningar"
         agree: "Godkänn"
         agree_title: "Bekräfta att den här flaggan är giltig och korrekt"
-        defer_flag_title: "Ta bort den här flaggan; den kräver ingen åtgärd för tillfället."
         delete: "Ta bort"
         delete_title: "Ta bort inlägget som den här flaggan refererar till."
         delete_post_defer_flag_title: "Ta bort inlägg; om det är det första inlägget, ta bort ämnet"
@@ -2212,8 +2164,6 @@ sv:
         title: "Grupper"
         edit: "Redigera Grupper"
         refresh: "Uppdatera"
-        new: "Ny"
-        selector_placeholder: "ange användarnamn"
         about: "Redigera dina gruppmedlemskap och -namn här."
         group_members: "Gruppmedlemmar"
         delete: "Radera"
@@ -2221,21 +2171,10 @@ sv:
         delete_failed: "Oförmögen att ta bort grupp. Om det här är en automatisk grupp så kan den inte raderas."
         delete_owner_confirm: "Ta bort användarprivilegier för '\"{username}'?"
         add: "Lägg till"
-        add_members: "Lägg till medlemmar"
         custom: "Anpassad"
-        bulk_complete: "Användarna har lagts till i gruppen."
-        bulk: "Masstilläggning till grupp"
-        bulk_paste: "Klistra in en lista av användarnamn eller e-postadresser, en per rad:"
-        bulk_select: "(välj en grupp)"
         automatic: "Automatisk"
-        automatic_membership_email_domains: "Användare som registrerar sig med en e-post vars domän exakt matchar en domän i den här listan kommer automatiskt att bli tillagd i den här gruppen:"
-        automatic_membership_retroactive: "Använd samma regel för e-postdomän för att lägga till nya användare"
-        default_title: "Standardtitel för alla användare i denna grupp"
-        primary_group: "Automatiskt inställd som primär grupp"
         group_owners: Ägare
         add_owners: Lägg till ägare
-        incoming_email: "Egenvald inkommande e-postadress"
-        incoming_email_placeholder: "Ange e-postadress"
         none_selected: "Välj en grupp för att komma igång"
         no_custom_groups: "Skapa en egen grupp"
       api:
@@ -2299,11 +2238,11 @@ sv:
           none: "Det finns inga relaterade event."
           redeliver: "Leverera igen"
           incoming:
-            one: "Det finns ett nytt event."
-            other: "Det finns {{count}} nya event."
+            one: Det finns ett nytt event.
+            other: Det finns {{count}} nya event.
           completed_in:
-            one: "Färdigställd på 1 sekund."
-            other: "Färdigställd på {{count}} sekunder."
+            one: Färdigställd på 1 sekund.
+            other: Färdigställd på {{count}} sekunder.
           request: "Förfrågning"
           response: "Svar"
           redeliver_confirm: "Är du säker på att du vill leverera samma nyttolast igen?"
@@ -2354,7 +2293,6 @@ sv:
           label: "Ladda upp"
           title: "Ladda upp en säkerhetskopia till denna instans"
           uploading: "Laddar upp..."
-          success: "'{{filename}}' har laddats upp."
           error: "Ett fel har uppstått vid uppladdning av '{{filename}}': {{message}}"
         operations:
           is_running: "En operation körs just nu..."
@@ -2367,7 +2305,6 @@ sv:
             label: "Säkerhetskopia"
             title: "Skapa en säkerhetskopia"
             confirm: "Vill du skapa en ny säkerhetskopiering?"
-            without_uploads: "Ja (inkludera inte filer)"
           download:
             label: "Ladda ner"
             title: "Skicka mail med nedladdningslänk"
@@ -2643,11 +2580,11 @@ sv:
           suspect: 'Misstänkt'
         approved: "Godkänd?"
         approved_selected:
-          one: "godkänd användare"
-          other: "godkänd användare ({{count}})"
+          one: godkänd användare
+          other: godkänd användare ({{count}})
         reject_selected:
-          one: "avvisad användare"
-          other: "avvisade användare ({{count}})"
+          one: avvisad användare
+          other: avvisade användare ({{count}})
         titles:
           active: 'Aktiva användare'
           new: 'Nya användare'
@@ -2663,11 +2600,11 @@ sv:
           suspended: 'Avstängda användare'
           suspect: 'Misstänkta användare'
         reject_successful:
-          one: "1 användare har avvisats."
-          other: "%{count} användare har avvisats."
+          one: 1 användare har avvisats.
+          other: '%{count} användare har avvisats.'
         reject_failures:
-          one: "Avvisning av användaren misslyckades."
-          other: "Avvisning av %{count} användare misslyckades."
+          one: Avvisning av användaren misslyckades.
+          other: Avvisning av %{count} användare misslyckades.
         not_verified: "Ej verifierad"
         check_email:
           title: "Visa den här användarens e-postadress"
@@ -2727,14 +2664,14 @@ sv:
         delete_forbidden_because_staff: "Administratörer och moderatorer kan inte tas bort."
         delete_posts_forbidden_because_staff: "Kan inte ta bort alla inlägg av administratörer och moderatorer."
         delete_forbidden:
-          one: "Användare kan inte tas bort om de har inlägg. Radera alla inlägg innan du försöker ta bort en användare. (Inlägg som är äldre än %{count} dag kan ej raderas.)"
-          other: "Användare kan inte tas bort om de har inlägg. Radera alla inlägg innan du försöker ta bort en användare. (Inlägg som är äldre än %{count} dagar kan ej raderas.)"
+          one: Användare kan inte tas bort om de har inlägg. Radera alla inlägg innan du försöker ta bort en användare. (Inlägg som är äldre än %{count} dag kan ej raderas.)
+          other: Användare kan inte tas bort om de har inlägg. Radera alla inlägg innan du försöker ta bort en användare. (Inlägg som är äldre än %{count} dagar kan ej raderas.)
         cant_delete_all_posts:
-          one: "Kan inte radera alla inlägg. Några inlägg är äldre än %{count} dag gammal. (Inställningen delete_user_max_post_age)"
-          other: "Kan inte radera alla inlägg. Några inlägg är äldre än %{count} dagar gamla. (Inställningen delete_user_max_post_age)"
+          one: Kan inte radera alla inlägg. Några inlägg är äldre än %{count} dag gammal. (Inställningen delete_user_max_post_age)
+          other: Kan inte radera alla inlägg. Några inlägg är äldre än %{count} dagar gamla. (Inställningen delete_user_max_post_age)
         cant_delete_all_too_many_posts:
-          one: "Kan inte radera alla inlägg, då användaren har fler än 1 inlägg. (delete_all_posts_max)"
-          other: "Kan inte radera alla inlägg, då användaren har fler än %{count} inlägg. (delete_all_posts_max)"
+          one: Kan inte radera alla inlägg, då användaren har fler än 1 inlägg. (delete_all_posts_max)
+          other: Kan inte radera alla inlägg, då användaren har fler än %{count} inlägg. (delete_all_posts_max)
         delete_confirm: "Är du SÄKER på att du vill radera den användaren? Detta är permanent!"
         delete_and_block: "Radera och <b>blockera</b> denna e-post och IP-adress"
         delete_dont_block: "Radera enbart"
@@ -2769,8 +2706,8 @@ sv:
         tl3_requirements:
           title: "Krav för förtroendenivå 3"
           table_title:
-            one: "Den senaste dagen:"
-            other: "De senaste %{count} dagarna:"
+            one: 'Den senaste dagen:'
+            other: 'De senaste %{count} dagarna:'
           value_heading: "Värde"
           requirement_heading: "Krav"
           visits: "Besök"
@@ -2845,10 +2782,7 @@ sv:
         recommended: "Vi rekommenderar att du anpassar följande texter:"
         show_overriden: 'Visa bara överskrivna'
       site_settings:
-        show_overriden: 'Visa bara överskrivna'
         title: 'Webbplatsinställningar'
-        reset: 'återställ'
-        none: 'inget'
         no_results: "Inga resultat hittades."
         clear_filter: "Rensa"
         add_url: "lägg till URL"
@@ -2897,11 +2831,11 @@ sv:
         reason_help: (En länk till ett inlägg eller ämne)
         save: Spara
         delete: Ta bort
-        delete_confirm: Är du säker på att du vill ta bort den utmärkelsen?
+        delete_confirm: "Är du säker på att du vill ta bort den utmärkelsen?"
         revoke: Upphäv
         reason: Anledning
         expand: Utvidga &hellip;
-        revoke_confirm: Är du säker på att du vill upphäva den utmärkelsen?
+        revoke_confirm: "Är du säker på att du vill upphäva den utmärkelsen?"
         edit_badges: Redigera utmärkelser
         grant_badge: Utfärda utmärkelse
         granted_badges: Utfärdade utmärkelser
@@ -2915,7 +2849,6 @@ sv:
         enabled: Aktivera utmärkelse
         icon: Ikon
         image: Bild
-        icon_help: "Använd antingen en Font Awesome-klass eller en URL till en bild"
         query: Utmärkelsesökning (SQL)
         target_posts: Sök målets inlägg
         auto_revoke: Kör återkallelsesökning dagligen
@@ -2939,14 +2872,14 @@ sv:
             text: "Det saknas urval av beviljningar. Det händer när utmärkelsesökningen returnerar ett användar-ID eller ett inläggs-ID som inte existerar. Det kan få oväntade resultat i ett senare skede, dubblekontrollera gärna din sökning."
           no_grant_count: "Inga utmärkelser att tilldelas."
           grant_count:
-            one: "<b>1</b> utmärkelse att tilldelas."
-            other: "<b>%{count}</b> utmärkelser att tilldelas. "
+            one: <b>1</b> utmärkelse att tilldelas.
+            other: '<b>%{count}</b> utmärkelser att tilldelas. '
           sample: "Exempel:"
           grant:
-            with: <span class="username">%{username}</span>
-            with_post: <span class="username">%{username}</span> för inlägg i %{link}
-            with_post_time: <span class="username">%{username}</span> för inlägg i %{link} vid kl. <span class="time">%{time}</span>
-            with_time: <span class="username">%{username}</span> vid kl. <span class="time">%{time}</span>
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span> för inlägg i %{link}"
+            with_post_time: "<span class=\"username\">%{username}</span> för inlägg i %{link} vid kl. <span class=\"time\">%{time}</span>"
+            with_time: "<span class=\"username\">%{username}</span> vid kl. <span class=\"time\">%{time}</span>"
       emoji:
         title: "Emoji"
         help: "Lägg till en ny emoji för andra att använda. (TIPS: dra och släpp flera filer på en och samma gång)"
@@ -2990,7 +2923,7 @@ sv:
         category_id: "Kategori-ID"
         category_title: "Kategori"
         external_url: "Extern URL"
-        delete_confirm: Är du säker på att du vill ta bort den här permalänken?
+        delete_confirm: "Är du säker på att du vill ta bort den här permalänken?"
         form:
           label: "Ny:"
           add: "Lägg till"
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index befa20c4342..9b6d66cd77e 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -33,62 +33,67 @@ te:
       tiny:
         half_a_minute: "< 1ని"
         less_than_x_seconds:
-          one: "< 1సె"
-          other: "< %{count}సె"
+          one: < 1సె
+          other: < %{count}సె
         x_seconds:
-          one: "1సె"
-          other: "%{count}సె"
+          one: 1సె
+          other: '%{count}సె'
         x_minutes:
-          one: "1ని"
-          other: "%{count}ని"
+          one: 1ని
+          other: '%{count}ని'
         about_x_hours:
-          one: "1గ"
-          other: "%{count}గం"
+          one: 1గ
+          other: '%{count}గం'
         x_days:
-          one: "1రో"
-          other: "%{count}రో"
+          one: 1రో
+          other: '%{count}రో'
         about_x_years:
-          one: "1సం"
-          other: "%{count}సం"
+          one: 1సం
+          other: '%{count}సం'
         over_x_years:
-          one: "> 1సం"
-          other: "> %{count}సం"
+          one: '> 1సం'
+          other: '> %{count}సం'
         almost_x_years:
-          one: "1సం"
-          other: "%{count}సం"
+          one: 1సం
+          other: '%{count}సం'
         date_month: "MMM D"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: "1 నిమిషం"
-          other: "%{count} నిమిషాలు"
+          one: 1 నిమిషం
+          other: '%{count} నిమిషాలు'
         x_hours:
-          one: "1 గంట"
-          other: "%{count} గంటలు"
+          one: 1 గంట
+          other: '%{count} గంటలు'
         x_days:
-          one: "1 రోజు"
-          other: "%{count} రోజులు"
+          one: 1 రోజు
+          other: '%{count} రోజులు'
         date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
-          one: "1 నిమిషం ముందు"
-          other: "%{count} నిమిషాలు ముందు"
+          one: 1 నిమిషం ముందు
+          other: '%{count} నిమిషాలు ముందు'
         x_hours:
-          one: "1 గంట క్రితం"
-          other: "%{count} గంటల ముందు"
+          one: 1 గంట క్రితం
+          other: '%{count} గంటల ముందు'
         x_days:
-          one: "1 రోజు ముందు"
-          other: "%{count} రోజుల ముందు"
+          one: 1 రోజు ముందు
+          other: '%{count} రోజుల ముందు'
+      previous_month: 'గత నెల'
+      next_month: 'తరువాత నెల'
+      placeholder: తేదీ
     share:
       topic: 'ఈ విషయానికి ఒక లంకెను పంచండి'
       post: '#%{postNumber} టపా'
       close: 'మూసివేయి'
-      twitter: 'ట్విట్టరుపై లంకెను పంచు'
-      facebook: 'ఫేస్ బుక్ పై లంకెను పంచు'
-      google+: 'గూగుల్ ప్లస్ పై లంకెను పంచు'
-      email: 'ఈ లంకెను ఈమెయిల్ ద్వారా పంచు'
+      twitter: 'ఈ లింక్ ను ట్విట్టరు లో పంచుకొండి'
+      facebook: 'ఈ లింక్ ను ఫేస్ బుక్ లో పంచుకొండి'
+      google+: 'ఈ లింక్ ను గూగుల్ ప్లస్ లో పంచుకొండి'
+      email: 'ఈ లింక్ ను ఈమెయిల్ లో పంచుకొండి'
     topic_admin_menu: "విషయపు అధికార చర్యలు"
     emails_are_disabled: "బయటకు వెళ్లే అన్ని ఈమెయిల్లూ అధికారి నిశేధించాడు. ఇప్పుడు ఎటువంటి ఈమెయిల్ ప్రకటనలూ పంపవీలవదు."
+    themes:
+      default_description: "అప్రమేయ"
     edit: 'ఈ విషయపు శీర్షిక మరియు వర్గం సవరించు'
     not_implemented: "ఈ ఫీచరు ఇంకా ఇంప్లిమెటు చేయలేదు. క్షమాపణలు!"
     no_value: "లేదు"
@@ -102,10 +107,11 @@ te:
     admin_title: "అధికారి"
     flags_title: "కేతనాలు"
     show_more: "మరింత చూపు"
+    show_help: "ఐచ్చికాలు"
     links: "లంకెలు"
     links_lowercase:
-      one: "లంకె"
-      other: "లంకెలు"
+      one: లంకె
+      other: లంకెలు
     faq: "తవసం"
     guidelines: "మార్గదర్శకాలు"
     privacy_policy: "అంతరంగికతా విధానం"
@@ -120,14 +126,16 @@ te:
     more: "మరింత"
     less: "తక్కువ"
     never: "ఎప్పటికీ వద్దు"
+    every_hour: "ప్రతి గంట"
     daily: "ప్రతిరోజూ"
     weekly: "ప్రతీవారం"
     every_two_weeks: "రెండువారాలకోసారి"
     every_three_days: "ప్రతి మూడు రోజులకీ"
     max_of_count: "{{count}} గరిష్టం"
+    alternation: "లేదా"
     character_count:
-      one: "{{count}} అక్షరం"
-      other: "{{count}} అక్షరాలు"
+      one: '{{count}} అక్షరం'
+      other: '{{count}} అక్షరాలు'
     suggested_topics:
       title: "సూచించే విషయాలు"
     about:
@@ -138,8 +146,6 @@ te:
       our_moderators: "మా నిర్వాహకులు"
       stat:
         all_time: "ఆల్ టైమ్"
-        last_7_days: "గత ఏడు రోజులు"
-        last_30_days: "గత 30 రోజులు"
       like_count: "ఇష్టాలు"
       topic_count: "విషయాలు"
       post_count: "టపాలు"
@@ -158,16 +164,6 @@ te:
       not_bookmarked: "ఈ టపాను చదివారు; పేజీక ఉంచుటకు నొక్కండి"
       last_read: "మీరు చివరాఖరుగా చదివిన టపా ఇది; పేజీక ఉంచుటకు నొక్కండి"
       remove: "పేజీక తొలగించండి"
-    topic_count_latest:
-      one: "{{count}} కొత్త లేదా ఉన్నతీకరించిన విషయం"
-      other: "{{count}} కొత్త లేదా ఉన్నతీకరించిన విషయాలు"
-    topic_count_unread:
-      one: "{{count}} చదవని విషయం."
-      other: "{{count}} చదవని విషయాలు."
-    topic_count_new:
-      one: "{{count}} కొత్త విషయం."
-      other: "{{count}} కొత్త విషయాలు."
-    click_to_show: "చూపుటకు ఇక్కడ నొక్కండి"
     preview: "మునుజూపు"
     cancel: "రద్దు"
     save: "మార్పులు భద్రపరచండి"
@@ -209,7 +205,6 @@ te:
     directory:
       title: "వాడుకరులు"
     groups:
-      members: "సభ్యులు"
       posts: "టపాలు"
       alias_levels:
         nobody: "ఎవరూకాదు"
@@ -218,18 +213,17 @@ te:
         members_mods_and_admins: "కేవలం గుంపు సభ్యులు, నిర్వాహకులు మరియు అధికారులు"
         everyone: "అందరూ"
     user_action_groups:
-      '1': "ఇచ్చిన ఇష్టాలు "
-      '2': "వచ్చిన ఇష్టాలు"
-      '3': "పేజీకలు"
-      '4': "విషయాలు"
-      '7': "ప్రస్తావనలు"
-      '9': "కోట్ లు"
-      '11': "సవరణలు"
-      '12': "పంపిన అంశాలు"
-      '13': "ఇన్ బాక్స్"
+      "1": "ఇచ్చిన ఇష్టాలు "
+      "2": "వచ్చిన ఇష్టాలు"
+      "3": "పేజీకలు"
+      "4": "విషయాలు"
+      "7": "ప్రస్తావనలు"
+      "9": "కోట్ లు"
+      "11": "సవరణలు"
+      "12": "పంపిన అంశాలు"
+      "13": "ఇన్ బాక్స్"
     categories:
       all: "అన్ని వర్గాలు"
-      all_subcategories: "అన్నీ"
       no_subcategory: "ఏదీకాదు"
       category: "వర్గం"
       posts: "టపాలు"
@@ -239,8 +233,8 @@ te:
       toggle_ordering: "వరుస నియంత్రణను అటుఇటుచేయి"
       subcategories: "ఉప వర్గాలు"
       topic_stat_sentence:
-        one: "%{unit} కాలంలో %{count} ఒక కొత్త టపా."
-        other: " %{unit} గతంలో %{count} కొత్త విషయాలు."
+        one: '%{unit} కాలంలో %{count} ఒక కొత్త టపా.'
+        other: ' %{unit} గతంలో %{count} కొత్త విషయాలు.'
     ip_lookup:
       title: ఐపీ చిరునామా లుకప్
       hostname: అతిథిపేరు
@@ -287,7 +281,6 @@ te:
       delete_account: "నా ఖాతా తొలగించు"
       delete_account_confirm: "నిజ్జంగా మీరు మీ ఖాతాను శాస్వతంగా తొలగించాలనుకుంటున్నారా? ఈ చర్య రద్దుచేయలేరు సుమా! "
       deleted_yourself: "మీ ఖాతా విజయవంతంగా తొలగించబడింది. "
-      delete_yourself_not_allowed: "మీ ఖాతాను ఇప్పుడు తొలగించలేరు. మీ ఖాతాను తొలగించడానికి అధికారిని సంప్రదించండి. "
       unread_message_count: "సందేశాలు"
       admin_delete: "తొలగించు"
       users: "వాడుకరులు"
@@ -361,8 +354,6 @@ te:
       created: "చేరినది"
       log_out: "లాగవుట్"
       location: "ప్రాంతం"
-      card_badge:
-        title: "సభ్యు బ్యాడ్జి కార్డు"
       website: "వెబ్ సైటు"
       email_settings: "ఈమెయిల్"
       email_digests:
@@ -609,8 +600,8 @@ te:
         archive_topics: "విషయాలు కట్టకట్టు"
         choose_new_category: "విషయం కొరకు కొత్త వర్గం ఎంచుకొండి:"
         selected:
-          one: "మీరు <b>1</b>  విషయం ఎంచుకున్నారు."
-          other: " మీరు <b>{{count}}</b> విషయాలు ఎంచుకున్నారు."
+          one: మీరు <b>1</b>  విషయం ఎంచుకున్నారు.
+          other: ' మీరు <b>{{count}}</b> విషయాలు ఎంచుకున్నారు.'
       none:
         unread: "మీరు చదవని విషయాలు లేవు"
         new: "మీకు కొత్త విషయాలు లేవు"
@@ -638,10 +629,10 @@ te:
       new: 'కొత్త విషయం'
       unread: 'చదవని'
       new_topics:
-        one: '1 కొత్త విషయం'
+        one: 1 కొత్త విషయం
         other: '{{count}} కొత్త విషయాలు'
       unread_topics:
-        one: '1 చదవని విషయం'
+        one: 1 చదవని విషయం
         other: '{{count}} చదవని విషయాలు'
       title: 'విషయం'
       invalid_access:
@@ -655,17 +646,17 @@ te:
         title: "విషయం కనిపించలేదు"
         description: "క్షమించాలి. ఆ విషయం మేము కనుగొనలేకున్నాము. బహుశా నిర్వాహకులు దాన్ని తొలగించారేమో?"
       total_unread_posts:
-        one: "మీకు ఈ విషయంలో 1 చదవని టపా ఉంది"
-        other: "మీకు ఈ విషయంలో {{count}} చదవని టపాలు ఉన్నాయి"
+        one: మీకు ఈ విషయంలో 1 చదవని టపా ఉంది
+        other: మీకు ఈ విషయంలో {{count}} చదవని టపాలు ఉన్నాయి
       unread_posts:
-        one: "మీకు ఈ విషయంలో 1 చదవని పాత టపా ఉంది"
-        other: "మీకు ఈ విషయంలో {{count}} చదవని పాత టపాలు ఉన్నాయి"
+        one: మీకు ఈ విషయంలో 1 చదవని పాత టపా ఉంది
+        other: మీకు ఈ విషయంలో {{count}} చదవని పాత టపాలు ఉన్నాయి
       new_posts:
-        one: "మీరు చివరసారి చదివాక ఈ విషయంలో  1 కొత్త టపా వచ్చింది"
-        other: "మీరు చివరసారి చదివాక ఈ విషయంలో  {{count}} కొత్త టపాలు వచ్చాయి"
+        one: మీరు చివరసారి చదివాక ఈ విషయంలో  1 కొత్త టపా వచ్చింది
+        other: మీరు చివరసారి చదివాక ఈ విషయంలో  {{count}} కొత్త టపాలు వచ్చాయి
       likes:
-        one: "ఈ విషయానికి 1 ఇష్టం ఉంది"
-        other: "ఈ విషయానికి {{count}} ఇష్టాలు ఉన్నాయి"
+        one: ఈ విషయానికి 1 ఇష్టం ఉంది
+        other: ఈ విషయానికి {{count}} ఇష్టాలు ఉన్నాయి
       back_to_list: "విషయాల జాబితాకు మరలు"
       options: "విషయపు ఐచ్చికాలు"
       show_links: "ఈ విషయంలో లంకెలు చూపు"
@@ -674,7 +665,7 @@ te:
       read_more: "మరిన్ని చదవాలనుకుంటున్నారా? {{catLink}} లేదా {{latestLink}}."
       browse_all_categories: అన్ని వర్గాలూ జల్లించు
       view_latest_topics: తాజా విషయాలు చూడు
-      suggest_create_topic: ఓ విషయమెందుకు సృష్టించకూడదూ?
+      suggest_create_topic: "ఓ విషయమెందుకు సృష్టించకూడదూ?"
       jump_reply_up: పాత జవాబుకు వెళ్లు
       jump_reply_down: తరువాతి జవాబుకు వెళ్లు
       deleted: "ఈ విషయం తొలగించబడింది"
@@ -689,14 +680,14 @@ te:
         current: ప్రస్తుత టపా
       notifications:
         reasons:
-          '3_6': 'మీకు ప్రకటనలు వస్తాయి, ఎందుకంటే మీరు ఈ వర్గాంపై కన్నేసారు'
-          '3_5': 'మీకు ప్రకటనలు వస్తాయి, ఎందుకంటే ఈ విషయం స్వీయ కన్నేసారు. '
-          '3_2': 'మీకు ప్రకటనలు వస్తాయి, ఎందుకంటే మీరు ఈ విషయంపై కన్నేసారు.'
-          '3_1': 'మీకు ప్రకటనలు వస్తాయి ఎందుకంటే మీరు ఈ విషయాన్ని సృష్టించారు.'
-          '3': 'మీకు ప్రకటనలు వస్తాయి, ఎందుకంటే మీరు ఈ విషయంపై కన్నేసారు.'
-          '0_7': 'ఈ వర్గంలోని అన్ని ప్రకటనలనూ మీరు విస్మరిస్తున్నారు.'
-          '0_2': 'ఈ విషయంలోని అన్ని ప్రకటనలనూ మీరు విస్మరిస్తున్నారు.'
-          '0': 'ఈ విషయంలోని అన్ని ప్రకటనలనూ మీరు విస్మరిస్తున్నారు.'
+          "3_6": 'మీకు ప్రకటనలు వస్తాయి, ఎందుకంటే మీరు ఈ వర్గాంపై కన్నేసారు'
+          "3_5": 'మీకు ప్రకటనలు వస్తాయి, ఎందుకంటే ఈ విషయం స్వీయ కన్నేసారు. '
+          "3_2": 'మీకు ప్రకటనలు వస్తాయి, ఎందుకంటే మీరు ఈ విషయంపై కన్నేసారు.'
+          "3_1": 'మీకు ప్రకటనలు వస్తాయి ఎందుకంటే మీరు ఈ విషయాన్ని సృష్టించారు.'
+          "3": 'మీకు ప్రకటనలు వస్తాయి, ఎందుకంటే మీరు ఈ విషయంపై కన్నేసారు.'
+          "0_7": 'ఈ వర్గంలోని అన్ని ప్రకటనలనూ మీరు విస్మరిస్తున్నారు.'
+          "0_2": 'ఈ విషయంలోని అన్ని ప్రకటనలనూ మీరు విస్మరిస్తున్నారు.'
+          "0": 'ఈ విషయంలోని అన్ని ప్రకటనలనూ మీరు విస్మరిస్తున్నారు.'
         watching_pm:
           title: "కన్నేసారు"
         watching:
@@ -744,8 +735,8 @@ te:
       login_reply: 'జవాబివ్వడానికి లాగిన్ అవ్వండి'
       filters:
         n_posts:
-          one: "1 టపా"
-          other: "{{count}} టపాలు"
+          one: 1 టపా
+          other: '{{count}} టపాలు'
         cancel: "జల్లెడ తొలగించు"
       split_topic:
         title: "కొత్త విషయానికి జరుపు"
@@ -753,15 +744,15 @@ te:
         topic_name: "కొత్త విషయపు పేరు"
         error: "టపాలను కొత్త విషయానికి జరిపేటప్పుడు దోషం తలెత్తింది"
         instructions:
-          one: "మీరు కొత్త విషయం సృష్టించి దాన్ని మీరు ఈ  టపాతో నింపబోతున్నారు."
-          other: "మీరు కొత్త విషయం సృష్టించి దాన్ని <b>{{count}}</b>  టపాలతో నింపబోతున్నారు."
+          one: మీరు కొత్త విషయం సృష్టించి దాన్ని మీరు ఈ  టపాతో నింపబోతున్నారు.
+          other: మీరు కొత్త విషయం సృష్టించి దాన్ని <b>{{count}}</b>  టపాలతో నింపబోతున్నారు.
       merge_topic:
         title: "ఇప్పటికే ఉన్న విషయానికి జరుపు"
         action: "ఇప్పటికే ఉన్న విషయానికి జరుపు"
         error: " ఆ విషయంలోకి టపాలను జరపడంలో దోషం."
         instructions:
-          one: "ఈ  టపాలు జరపాలనుకున్న విషయాన్ని ఎంచుకోండి."
-          other: "ఈ  <b>{{count}}</b> టపాలను జరపాలనుకున్న విషయాన్ని ఎంచుకోండి."
+          one: ఈ  టపాలు జరపాలనుకున్న విషయాన్ని ఎంచుకోండి.
+          other: ఈ  <b>{{count}}</b> టపాలను జరపాలనుకున్న విషయాన్ని ఎంచుకోండి.
       change_owner:
         title: "టపాల యజమానిని మార్చండి"
         action: "యజమానిని మార్చు"
@@ -769,9 +760,8 @@ te:
         label: "టపాల కొత్త యజమాని"
         placeholder: "కొత్త యజమాని సభ్యనామం"
         instructions:
-          one: "<b>{{old_user}}</b> యొక్క టపాకు కొత్త యజమానిని ఎంచుకోండి."
-          other: "<b>{{old_user}}</b> యొక్క {{count}} టపాల కొత్త యజమానిని ఎంచుకోండి."
-        instructions_warn: "ఈ పోస్ట్ గురించిన ఏ గత ప్రకటనలైనా కొత్త వినియోగదారునికి బదిలీకావని గమనించండి.<br>హెచ్చరిక: ప్రస్తుతం,ఏ ఆధారిత సమాచారం కొత్త వినియోగదారుకి బదిలీ చేయబడదు.ముందుజాగ్రత్త తో వినియోగించండి."
+          one: <b>{{old_user}}</b> యొక్క టపాకు కొత్త యజమానిని ఎంచుకోండి.
+          other: <b>{{old_user}}</b> యొక్క {{count}} టపాల కొత్త యజమానిని ఎంచుకోండి.
       multi_select:
         select: 'ఎంచుకో'
         selected: 'ఎంచుకున్నవి  ({{count}})'
@@ -792,8 +782,8 @@ te:
       show_full: "పూర్తి టపా చూపు"
       show_hidden: 'దాగిన విషయం చూపు'
       deleted_by_author:
-        one: " (టపా రచయిత ద్వారా తొలగింపబడింది , స్వతస్సిధ్దంగా తొలగింపబ[ది %{count} కాకపోతే సమయం కేతనించలేదు)"
-        other: "(టపా రచయిత ద్వారా ఉపసంహరించబడింది , స్వతసిధ్ధంగా తొలగించబడతాయి %{count} కాకపోతే సమయం కేతనించలేదు)"
+        one: ' (టపా రచయిత ద్వారా తొలగింపబడింది , స్వతస్సిధ్దంగా తొలగింపబ[ది %{count} కాకపోతే సమయం కేతనించలేదు)'
+        other: (టపా రచయిత ద్వారా ఉపసంహరించబడింది , స్వతసిధ్ధంగా తొలగించబడతాయి %{count} కాకపోతే సమయం కేతనించలేదు)
       expand_collapse: "పెంచు/తుంచు"
       unread: "టపా చదవనిది"
       errors:
@@ -849,48 +839,48 @@ te:
           vote: "మీరు ఈ టపాకు ఓటు వేశారు"
         by_you_and_others:
           off_topic:
-            one: "మీరు మరియు ఇంకొకరు దీన్ని విషయాంతరంగా కేతనించారు. "
-            other: "మీరు మరియు [[count]] ఇతర జనులు దీన్ని విషయాంతరంగా కేతనించారు. "
+            one: 'మీరు మరియు ఇంకొకరు దీన్ని విషయాంతరంగా కేతనించారు. '
+            other: 'మీరు మరియు [[count]] ఇతర జనులు దీన్ని విషయాంతరంగా కేతనించారు. '
           spam:
-            one: "మీరు మరియు ఇంకొకరు దీన్ని స్పాముగా కేతనించారు. "
-            other: "మీరు మరియు [[count]] ఇతర జనులు దీన్ని స్పాముగా కేతనించారు. "
+            one: 'మీరు మరియు ఇంకొకరు దీన్ని స్పాముగా కేతనించారు. '
+            other: 'మీరు మరియు [[count]] ఇతర జనులు దీన్ని స్పాముగా కేతనించారు. '
           inappropriate:
-            one: "మీరు మరియు ఇంకొకరు దీన్ని అసమంజసమైనదిగా కేతనించారు. "
-            other: "మీరు మరియు [[count]] ఇతర జనులు దీన్ని అసమంజసమైనదిగా కేతనించారు. "
+            one: 'మీరు మరియు ఇంకొకరు దీన్ని అసమంజసమైనదిగా కేతనించారు. '
+            other: 'మీరు మరియు [[count]] ఇతర జనులు దీన్ని అసమంజసమైనదిగా కేతనించారు. '
           notify_moderators:
-            one: "మీరు మరియు ఇంకొకరు దీన్ని నిర్వాహకుల దృష్టికి తెచ్చారు."
-            other: "మీరు మరియు [[count]] ఇతర జనులు దీన్ని నిర్వాహకుల దృష్టికి తెచ్చారు."
+            one: మీరు మరియు ఇంకొకరు దీన్ని నిర్వాహకుల దృష్టికి తెచ్చారు.
+            other: మీరు మరియు [[count]] ఇతర జనులు దీన్ని నిర్వాహకుల దృష్టికి తెచ్చారు.
           bookmark:
-            one: "మీరు మరియు ఇంకొకరు దీనికి పేజీక ఉంచారు."
-            other: "మీరు మరియు {{count}} ఇతరులు దీనికి పేజీక ఉంచారు."
+            one: మీరు మరియు ఇంకొకరు దీనికి పేజీక ఉంచారు.
+            other: మీరు మరియు {{count}} ఇతరులు దీనికి పేజీక ఉంచారు.
           like:
-            one: "మీరు మరొకరు దీన్ని ఇష్టపడ్డారు"
-            other: "మీరు మరియు {{count}} గురు దీన్ని ఇష్టపడ్డారు"
+            one: మీరు మరొకరు దీన్ని ఇష్టపడ్డారు
+            other: మీరు మరియు {{count}} గురు దీన్ని ఇష్టపడ్డారు
           vote:
-            one: "మీరు మరియొకరు ఈ టపాకు వోటు వేసారు"
-            other: "మీరు మరియు {{count}} గురు ఈ టపాకు ఓటు వేసారు."
+            one: మీరు మరియొకరు ఈ టపాకు వోటు వేసారు
+            other: మీరు మరియు {{count}} గురు ఈ టపాకు ఓటు వేసారు.
         by_others:
           off_topic:
-            one: "ఒకరు దీన్ని విషయాంతరంగా కేతనించారు"
-            other: "{{count}} గురు దీన్ని విషయాంతరంగా కేతనించారు"
+            one: ఒకరు దీన్ని విషయాంతరంగా కేతనించారు
+            other: '{{count}} గురు దీన్ని విషయాంతరంగా కేతనించారు'
           spam:
-            one: "ఒకరు దీన్ని స్పాముగా కేతనించారు"
-            other: "{{count}} గురు దీన్ని స్పాముగా కేతనించారు"
+            one: ఒకరు దీన్ని స్పాముగా కేతనించారు
+            other: '{{count}} గురు దీన్ని స్పాముగా కేతనించారు'
           inappropriate:
-            one: "ఒకరు దీన్ని అసమంజసంగా కేతనించారు"
-            other: "{{count}} గురు దీన్ని అసమంజసంగా కేతనించారు"
+            one: ఒకరు దీన్ని అసమంజసంగా కేతనించారు
+            other: '{{count}} గురు దీన్ని అసమంజసంగా కేతనించారు'
           notify_moderators:
-            one: "ఒకరు దీన్ని నిర్వాహకుల దృష్టికి తెచ్చారు"
-            other: "{{count}} గురు దీన్ని నిర్వాహకుల దృష్టికి తెచ్చారు"
+            one: ఒకరు దీన్ని నిర్వాహకుల దృష్టికి తెచ్చారు
+            other: '{{count}} గురు దీన్ని నిర్వాహకుల దృష్టికి తెచ్చారు'
           bookmark:
-            one: "ఒకరు ఈ టపాకు పేజీక ఉంచారు"
-            other: "{{count}} గురు ఈ విషయానికి పేజీక ఉంచారు"
+            one: ఒకరు ఈ టపాకు పేజీక ఉంచారు
+            other: '{{count}} గురు ఈ విషయానికి పేజీక ఉంచారు'
           like:
-            one: "ఒకరు దీన్ని ఇష్టపడ్డారు"
-            other: "{{count}} గురు దీన్నిఇష్టపడ్డారు."
+            one: ఒకరు దీన్ని ఇష్టపడ్డారు
+            other: '{{count}} గురు దీన్నిఇష్టపడ్డారు.'
           vote:
-            one: "ఒకరు దీనికి ఓటు వేశారు"
-            other: "{{count}} గురు దీనికి ఓటు వేసారు"
+            one: ఒకరు దీనికి ఓటు వేశారు
+            other: '{{count}} గురు దీనికి ఓటు వేసారు'
       revisions:
         controls:
           first: "తొలి దిద్దుబాటు"
@@ -983,8 +973,8 @@ te:
     topic_map:
       title: "విషయ సారం"
       clicks:
-        one: "ఒక నొక్కు"
-        other: "%{count} నొక్కులు"
+        one: ఒక నొక్కు
+        other: '%{count} నొక్కులు'
     topic_statuses:
       warning:
         help: "ఇది అధికారిక హెచ్చరిక"
@@ -1090,8 +1080,6 @@ te:
         reports:
           today: "ఈరోజు"
           yesterday: "నిన్న"
-          last_7_days: "చివరి ఏడు రోజులు"
-          last_30_days: "చివరి ముప్పై రోజులు"
           all_time: "ఆల్ టైమ్"
           7_days_ago: "ఏడు రోజుల క్రితం"
           30_days_ago: "ముప్పై రోజుల క్రితం"
@@ -1107,7 +1095,6 @@ te:
         title: "కేతనాలు"
         agree: "ఒప్పుకోండి"
         agree_title: "ఈ కేతనం సరైనదిగా చెప్పండి"
-        defer_flag_title: "ఈ కేతనం తొలగించు; ఇప్పుడు ఎటువంటి చర్య అవసరంలేదు."
         delete: "తొలగించు"
         delete_title: "ఈ కేతనం వర్తించే టపా తొలగించు"
         delete_post_defer_flag_title: "టపా తొలగించు; ఇదే తొలి టపా అయితే ఈ విషయాన్ని తొలగించు"
@@ -1141,17 +1128,12 @@ te:
         title: "గుంపులు"
         edit: "గుంపులు సవరించు"
         refresh: "తాజా పరుచు"
-        new: "కొత్త"
-        selector_placeholder: "సభ్యనామం రాయండి"
         about: "మీ గుంపు మెంబర్షిప్పు మరియు పేర్లు ఇక్కడ సవరించండి"
         group_members: "గుంపు సభ్యులు"
         delete: "తొలగించు"
         delete_confirm: "ఈ గుంపును తొలగించాలనుకుంటున్నారా? "
         delete_failed: "గుంపును తొలగించలేకున్నాము. ఇది స్వీయ గుంపు అయితే దీన్ని నాశనం చేయలేరు."
         add: "కలుపు"
-        add_members: "సభ్యులను కలుపు"
-        automatic_membership_email_domains: "వినియోగదారుడు ఏ ఈ-మెయిల్ డొమైన్ తో నమోదు చేసుకున్నాడో అది ఖచ్చితంగా  ఈ జాబితాలో ఒక దానిని పోలి స్వయంసిధ్ధంగా గ్రూప్ కి కలుస్తాయి:"
-        automatic_membership_retroactive: "ఇప్పటికే నమోదిత వినియోగదారులను జోడించడానికి అదే ఇమెయిల్ డొమైన్ రూల్ వర్తిస్తుంది"
       api:
         generate_master: "మాస్టరు ఏపీఐ కీ ఉత్తపత్తించు"
         none: "ప్రస్తుతం చేతన ఏపీఐ కీలు లేవు."
@@ -1187,7 +1169,6 @@ te:
           size: "పరిమాణం"
         upload:
           uploading: "ఎగుమతవుతోంది..."
-          success: "'{{filename}}' విజయవంతంగా ఎగుమతయింది."
           error: "'{{filename}}' ఎగుమతించుటలో దోషం: {{message}}"
         operations:
           is_running: "ఒక కార్యం ప్రస్తుతం నడుస్తోంది..."
@@ -1198,7 +1179,6 @@ te:
           backup:
             title: "బ్యాకప్ సృష్టించు"
             confirm: "మీరు కొత్త బ్యాకప్ మొదలుపెట్టాలనుకుంటున్నారా?"
-            without_uploads: "అవులు (దస్త్రాలు కాకుండా)"
           destroy:
             title: "బ్యాకప్ తొలగించు"
             confirm: "మీరు నిజంగానే బ్యాకప్ ను నాశనం చేయాలనుకుంటున్నారా?"
@@ -1398,11 +1378,11 @@ te:
           suspect: 'అనుమానించు'
         approved: "అంగీకరించు"
         approved_selected:
-          one: "సభ్యుడిని అంగీకరించు"
-          other: "({{count}}) సభ్యులను అంగీకరించు"
+          one: సభ్యుడిని అంగీకరించు
+          other: ({{count}}) సభ్యులను అంగీకరించు
         reject_selected:
-          one: "సభ్యుడిని నిరాకరించు"
-          other: "({{count}}) సభ్యులను నిరాకరించు"
+          one: సభ్యుడిని నిరాకరించు
+          other: ({{count}}) సభ్యులను నిరాకరించు
         titles:
           active: 'క్రియాశీల సభ్యులు'
           new: 'కొత్త సభ్యులు'
@@ -1415,10 +1395,8 @@ te:
           suspended: 'సస్పెండయిన సభ్యులు'
           suspect: 'అనుమానిత సభ్యులు'
         reject_successful:
-          one: "వినియోగదారులు విజయవంతంగా "
-          other: "వినియోగదారులు విజయవంతంగా %{count} తిరస్కరింపబడ్డారు.."
-        reject_failures:
-          one: "వినియోగదారులు 1 ని తిరస్కరించుటలో వైఫల్యం."
+          one: 'వినియోగదారులు విజయవంతంగా '
+          other: వినియోగదారులు విజయవంతంగా %{count} తిరస్కరింపబడ్డారు..
         not_verified: "ద్రువీకరించలేదు"
         check_email:
           title: "ఈ సభ్యుని ఈమెయిల్ చూపు"
@@ -1456,8 +1434,8 @@ te:
         private_topics_count: ప్రైవేటు విషయాలు
         posts_read_count: చదివిన టపాలు
         post_count: టపాలు సృష్టించిన
-        topics_entered: 'సందర్శించిన విషయాలు '
-        flags_given_count: 'ఇచ్చిన కేతనాలు '
+        topics_entered: "సందర్శించిన విషయాలు "
+        flags_given_count: "ఇచ్చిన కేతనాలు "
         flags_received_count: వచ్చిన కేతనాలు
         warnings_received_count: అందిన హెచ్చరికలు
         flags_given_received_count: 'ఇచ్చిన కేతనాలు'
@@ -1553,10 +1531,7 @@ te:
       site_text:
         title: 'పాఠ్య కాంటెంటు'
       site_settings:
-        show_overriden: 'ప్రాబల్యం ఉన్న వాటిని మాత్రమే చూపించు'
         title: 'అమరికలు'
-        reset: 'రీసెట్'
-        none: 'ఏదీకాదు'
         no_results: "ఏ ఫలితాలూ కనిపించలేదు."
         clear_filter: "శుభ్రపరుచు"
         add_url: "URL కలుపు"
@@ -1584,7 +1559,7 @@ te:
       badges:
         title: బ్యాడ్జీలు
         new_badge: కొత్త బ్యాడ్జీ
-        new: 'కొత్త '
+        new: "కొత్త "
         name: పేరు
         badge: బ్యాడ్జీ
         display_name: ప్రదర్శించు పేరు
@@ -1598,10 +1573,10 @@ te:
         reason_help: (టపాకి లేదా విషయానికి లంకె )
         save: భద్రపరచు
         delete: తొలగించు
-        delete_confirm: మీరు నిజంగా ఈ బ్యాడ్జి తొలగించాలనుకుంటున్నారా?
+        delete_confirm: "మీరు నిజంగా ఈ బ్యాడ్జి తొలగించాలనుకుంటున్నారా?"
         revoke: రివోక్
         reason: కారణం
-        revoke_confirm: 'మీరు నిజంగా ఈ బ్యాడ్జిని రివోక్ చేయాలనుకుంటున్నారా? '
+        revoke_confirm: "మీరు నిజంగా ఈ బ్యాడ్జిని రివోక్ చేయాలనుకుంటున్నారా? "
         edit_badges: బ్యాడ్జీలు సవరించు
         grant_badge: బ్యాడ్జి ఇవ్వు
         granted_badges: ఇచ్చిన బ్యాడ్జీలు
@@ -1615,7 +1590,6 @@ te:
         enabled: బ్యాడ్జి చేతనం చేయి
         icon: ఐకాన్
         image: బొమ్మ
-        icon_help: "చిత్రానికి బ్రహ్మాండమైన ఫాంట్  లేదా URL గాని ఉపయోగించండి"
         target_posts: టపాలు లక్ష్యంగా ప్రశ్న
         show_posts: చిహ్నాల పుటలో మంజూరు అయిన చిహ్నాన్ని చూపండి
         trigger: ట్రిగ్గరు
@@ -1631,9 +1605,9 @@ te:
             header: "హెచ్చరిక!"
           sample: "నమూనా:"
           grant:
-            with: <span class="username">%{వినియోగదారు పేరు}</span>
-            with_post: <span class="username">%{username}</span> టపా కొరకు%{link}
-            with_post_time: <span class="సభ్యుల పేరు">%{username}</span> for post in %{link} at <span class="సమయం">%{time}</span>
+            with: "<span class=\"username\">%{వినియోగదారు పేరు}</span>"
+            with_post: "<span class=\"username\">%{username}</span> టపా కొరకు%{link}"
+            with_post_time: "<span class=\"సభ్యుల పేరు\">%{username}</span> for post in %{link} at <span class=\"సమయం\">%{time}</span>"
       emoji:
         title: "ఇమోజి"
         add: "కొత్త ఇమోజి కలుపు"
diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml
index 694907eaff8..f748ef0db32 100644
--- a/config/locales/client.th.yml
+++ b/config/locales/client.th.yml
@@ -42,47 +42,48 @@ th:
       tiny:
         half_a_minute: "< 1 นาที"
         less_than_x_seconds:
-          other: "< %{count} วินาที"
+          other: < %{count} วินาที
         x_seconds:
-          other: "%{count} วินาที"
+          other: '%{count} วินาที'
         x_minutes:
-          other: "%{count} นาที"
+          other: '%{count} นาที'
         about_x_hours:
-          other: "%{count} ชั่วโมง"
+          other: '%{count} ชั่วโมง'
         x_days:
-          other: "%{count} วัน"
+          other: '%{count} วัน'
         about_x_years:
-          other: "%{count} ปี"
+          other: '%{count} ปี'
         over_x_years:
-          other: "> %{count} ปี"
+          other: '> %{count} ปี'
         almost_x_years:
-          other: "%{count} ปี"
+          other: '%{count} ปี'
         date_month: "MMM D"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          other: "%{count} นาที"
+          other: '%{count} นาที'
         x_hours:
-          other: "%{count} ชั่วโมง"
+          other: '%{count} ชั่วโมง'
         x_days:
-          other: "%{count} วัน"
+          other: '%{count} วัน'
         date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
-          other: "%{count} นาทีที่แล้ว"
+          other: '%{count} นาทีที่แล้ว'
         x_hours:
-          other: "%{count} ชั่วโมงที่แล้ว"
+          other: '%{count} ชั่วโมงที่แล้ว'
         x_days:
-          other: "%{count} วันที่แล้ว"
+          other: '%{count} วันที่แล้ว'
       later:
         x_days:
-          other: "%{count} วันหลังจากนั้น"
+          other: '%{count} วันหลังจากนั้น'
         x_months:
-          other: "%{count} เดือนหลังจากนั้น"
+          other: '%{count} เดือนหลังจากนั้น'
         x_years:
-          other: "%{count} ปีหลังจากนั้น"
+          other: '%{count} ปีหลังจากนั้น'
       previous_month: 'เดือนที่แล้ว'
       next_month: 'เดือนถัดไป'
+      placeholder: วัน
     share:
       topic: 'แบ่งปันลิงก์ไปยังกระทู้นี้'
       post: 'โพส #%{postNumber}'
@@ -93,7 +94,7 @@ th:
       email: 'ส่งลิงก์นี้ทางอีเมล'
     action_codes:
       public_topic: "ทำให้กระทู้นี้เป็นสาธารณะ %{when} "
-      private_topic: "ทำให้กระทู้นี้ส่วนตัว %{when} "
+      private_topic: "ทำให้กระทู้นี้เป็นข้อความส่วนตัว"
       split_topic: "แบ่งกระทู้นี้เมื่อ %{when}"
       invited_user: "ได้เชิญ %{who} %{when}"
       invited_group: "ได้เชิญ %{who} %{when}"
@@ -117,20 +118,26 @@ th:
       visible:
         enabled: 'ถูกแสดงเมื่อ %{when}'
         disabled: 'ถูกซ่อนเมื่อ %{when}'
+      banner:
+        enabled: 'ทำให้เป็นแบนเนอร์%{when} มันจะปรากฎที่ด้านบนสุดของทุกหน้าจนกว่าจะผู้ใช้งานจะกดลบ'
+        disabled: 'ลบแบนเนอร์นี้%{when} มันจะไม่ปรากฎที่ด้านบนของหน้าใดๆ'
     topic_admin_menu: "จัดการกระทู้ "
     emails_are_disabled: "อีเมลขาออกทั้งหมดจะถูกปิดโดยผู้ดูแลระบบ ไม่มีอีเมลแจ้งเตือนใดๆจะถูกส่งออกไป"
-    bootstrap_mode_enabled: "ตอนนี้คุณอยู่ในการใช้งานแบบ Bootstrap เพื่อให้การเปิดเว็บไซต์ใหม่ง่ายขึ้น ผู้ใช้งานใหม่ทุกคนจะได้ระบบความเชื่อถือที่ 1 และจะได้รับอีเมลสรุปทุกวัน แล้วจะเลิกส่งต่อเมื่อจำนวนผู้ใช้งานทั้งหมดเกิน %{min_users} คน"
-    bootstrap_mode_disabled: "การใช้งานแบบ Bootstrap ในอีก 24 ชั่วโมง"
+    themes:
+      default_description: "ค่าเริ่มต้น"
     s3:
       regions:
         ap_northeast_1: "เอเชียแปซิฟิก (โตเกียว)"
         ap_northeast_2: "เอเชียแปซิฟิก (โซล)"
+        ap_south_1: "เอเชียแปซิฟิก (มุมไบ)"
         ap_southeast_1: "เอเชียแปซิฟิก (สิงคโปร)"
         ap_southeast_2: "เอเชียแปซิฟิก (ซิสนี่)"
+        cn_north_1: "จีน (ปักกิ่ง)"
         eu_central_1: "อียู (แฟรงก์เฟิร์ต)"
         eu_west_1: "อียู (ไอร์แลนด์)"
         sa_east_1: "อเมริกาใต้ (ซาวเปาโล)"
-        us_east_1: "อเมริกาตะวันออก (เวอร์จินเนียเหนือ)"
+        us_east_1: "สหรัฐอเมริกาซีกตะวันออก (เวอร์จิเนียเหนือ)"
+        us_east_2: "สหรัฐอเมริกาตะวันออก (โอไฮโอ)"
         us_gov_west_1: "AWS GovCloud (อเมริกา)"
         us_west_1: "อเมริกาตะวันตก (แคริฟอเนียเหนือ)"
         us_west_2: "อเมริกาตะวันตก (โอเลก้อน)"
@@ -138,6 +145,7 @@ th:
     not_implemented: "เสียใจด้วย!! คุณสมบัตินั้นยังไม่เสร็จสมบูรณ์ในตอนนี้"
     no_value: "ไม่ใช่"
     yes_value: "ใช่"
+    submit: "ตกลง"
     generic_error: "เสียใจด้วย, มีความผิดพลาดขึ้น"
     generic_error_with_reason: "มีข้อผิดพลาดเกิดขึ้น: %{error}"
     sign_up: "สมัครสมาชิก"
@@ -150,7 +158,7 @@ th:
     show_help: "ตัวเลือก"
     links: "ลิงก์"
     links_lowercase:
-      other: "ลิงค์"
+      other: ลิงค์
     faq: "ถามตอบ"
     guidelines: "คู่มือ"
     privacy_policy: "นโยบายความเป็นส่วนตัว"
@@ -174,7 +182,7 @@ th:
     max_of_count: "สูงสุดของ  {{count}}"
     alternation: "หรือ"
     character_count:
-      other: "{{count}} ตัวอักษร"
+      other: '{{count}} ตัวอักษร'
     suggested_topics:
       title: "กระทู้แนะนำ"
       pm_title: "ข้อความที่แนะนำ"
@@ -186,8 +194,6 @@ th:
       our_moderators: "พิธีกรของพวกเรา"
       stat:
         all_time: "ทุกเวลา"
-        last_7_days: "7 วันที่แล้ว"
-        last_30_days: "30 วันที่แล้ว"
       like_count: "ถูกใจ"
       topic_count: "กระทู้"
       post_count: "โพส"
@@ -208,12 +214,7 @@ th:
       remove: "ลบบุ๊คม๊าค"
       confirm_clear: "คุณแน่ใจไหม ที่จะลบบุ๊คมาร์กในกระทู้นี้ทั้งหมด"
     topic_count_latest:
-      other: "{{count}} กระทู้ใหม่หรือกระทู้อัพเดต"
-    topic_count_unread:
-      other: "{{count}} กระทู้ยังไม่อ่าน"
-    topic_count_new:
-      other: "{{count}} กระทู้ใหม่"
-    click_to_show: "กดเพื่อเปิด"
+      other: เห็น {{count}} กระทู้ใหม่ หรือที่ถูกอัพเดต
     preview: "แสดงตัวอย่าง"
     cancel: "ยกเลิก"
     save: "บันทึกการเปลี่ยนแปลง"
@@ -249,14 +250,14 @@ th:
       cancel: "ยกเลิก"
       view_pending: "ดูโพสที่กำลังรออยู่"
       has_pending_posts:
-        other: "กระทู้นี้มีโพสอีก <b>{{count}}</b> โพสที่รอบตรวจสอบอยู่"
+        other: กระทู้นี้มีโพสอีก <b>{{count}}</b> โพสที่รอบตรวจสอบอยู่
       confirm: "บันทึกการเปลี่ยนแปลง"
       delete_prompt: "คุณแน่ใจหรือว่าจะลบ <b>%{username}</b>? นี่จะทำให้เราลบโพสและบล็อกอีเมลและไอพีของคนนี้"
       approval:
         title: "โพสต์นี้ต้องได้รับการอนุมัติ"
         description: "เราได้รับโพสของคุณแล้วแต่จำเป็นต้องมีการอนุมัตโดยผู้ดูแลก่อนจึงจะปรากฎขึ้น กรุณารอสักครู่"
         pending_posts:
-          other: "คุณมี <strong>{{count}}</strong> กระทู้ที่รอการยืนยัน"
+          other: คุณมี <strong>{{count}}</strong> กระทู้ที่รอการยืนยัน
         ok: "ตกลง"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> โพส <a href='{{topicUrl}}'>กระทู้</a>"
@@ -290,55 +291,37 @@ th:
       posts_read: "อ่าน"
       posts_read_long: "อ่านโพส"
       total_rows:
-        other: "%{count} ผู้ใช้"
+        other: '%{count} ผู้ใช้'
     group_histories:
       actions:
+        change_group_setting: "แก้ไขการตั้งค่ากลุ่ม"
         add_user_to_group: "เพิ่มผู้ใช้"
         remove_user_from_group: "ลบผู้ใช้"
     groups:
-      logs:
-        acting_user: "ผู้ใช้ชั่วคราว"
-        target_user: "ผู้ใช้เป้าหมาย"
-        subject: "หัวข้อ"
-        details: "รายละเอียด"
-        from: "จาก"
-        to: "ถึง"
-      edit:
-        title: 'แก้ไขกลุ่ม'
-        full_name: 'ชื่อ-นามสกุล'
-        add_members: "เพิ่มสมาชิก"
-        delete_member_confirm: "ลบ '%{username}' ออกจาก '%{group}' กลุ่ม?"
+      public_exit: "อนุญาตให้ผู้ใช้ออกจากกลุ่มอย่างอิสระ"
       add: "เพิ่ม"
-      join: "เข้าร่วมกลุ่ม"
-      leave: "ออกจากกลุ่ม"
-      request: "ส่งคำขอเข้าร่วมกลุ่ม"
-      automatic_group: กลุ่มอัตโนมัติ
-      closed_group: กลุ่มปิด
-      is_group_user: "คุณเป็นสมาชิกของกลุ่มนี้"
+      message: "ข้อความ<br><div><br data-mce-bogus=\"1\"></div>"
       membership: "การเป็นสมาชิก"
       name: "ชื่อ"
-      user_count: "จำนวนสมาชิก"
       bio: "เกี่ยวกับกลุ่ม"
-      selector_placeholder: "เพิ่มสมาชิก"
+      selector_placeholder: "กรอกชื่อผู้ใช้"
       owner: "เจ้าของ"
       index:
         title: "กลุ่ม"
         empty: "ไม่มีกลุ่มที่เห็นได้"
       activity: "กิจกรรม"
-      members: "สมาชิก"
       topics: "กระทู้"
       posts: "โพสต์"
       mentions: "พูดถึง"
       messages: "ข้อความ"
       alias_levels:
+        mentionable: "ใครสามารถ @กล่าวถึง กลุ่มนี้"
+        messageable: "ใครสามารถส่งข้อความในกลุ่มนี้?"
         nobody: "ไม่มี"
         only_admins: "เฉพาะผู้ดูแลระบบ"
         mods_and_admins: "ผู้ดูแลระบบและผู้ตรวจสอบ"
         members_mods_and_admins: "สมาชิกกลุ่ม ผู้ดูแลกระทู้ และผู้ดูแลเว็บ"
         everyone: "ทุกคน"
-      trust_levels:
-        title: "ระดับความไว้ใจจะถูกให้ไปยังผู้ใช้โดยอัตโนมัติเมื่อพวกเขาเพิ่ม:"
-        none: "ไม่มี"
       notifications:
         watching:
           title: "กำลังดู"
@@ -355,22 +338,23 @@ th:
         muted:
           title: "ปิด"
           description: "คุณจะไม่ได้รับการแจ้งเตือนเกี่ยวกับกระทู้ใหม่ๆในกลุ่มนี้"
+      flair_preview_icon: "ไอคอนตัวอย่าง"
+      flair_preview_image: "รูปภาพตัวอย่าง"
     user_action_groups:
-      '1': "ให้ถูกใจ"
-      '2': "ได้รับการถูกใจ"
-      '3': "บุ๊คมาร์ค"
-      '4': "กระทู้"
-      '5': "ตอบ"
-      '6': "ตอบสนอง"
-      '7': "พูดถึง"
-      '9': "อ้างอิง"
-      '11': "แก้ไข"
-      '12': "รายการที่ส่งแล้ว"
-      '13': "กล่องข้อความ"
-      '14': "อยู่ระหว่างการพิจารณา"
+      "1": "ให้ถูกใจ"
+      "2": "ได้รับการถูกใจ"
+      "3": "บุ๊คมาร์ค"
+      "4": "กระทู้"
+      "5": "ตอบ"
+      "6": "ตอบสนอง"
+      "7": "พูดถึง"
+      "9": "อ้างอิง"
+      "11": "แก้ไข"
+      "12": "รายการที่ส่งแล้ว"
+      "13": "กล่องข้อความ"
+      "14": "อยู่ระหว่างการพิจารณา"
     categories:
       all: "ดูทุกหมวดหมู่"
-      all_subcategories: "ทั้งหมด"
       no_subcategory: "ไม่มี"
       category: "หมวดหมู่"
       category_list: "แสดงหมวดหมู่ทั้งหมด"
@@ -389,7 +373,7 @@ th:
       toggle_ordering: "เปลี่ยนวิธีการจัดลำดับ"
       subcategories: "หมวดหมู่ย่อย"
       topic_stat_sentence:
-        other: "%{count} กระทู้ใหม่ในเวลาที่ผ่านมา %{unit}."
+        other: '%{count} กระทู้ใหม่ในเวลาที่ผ่านมา %{unit}.'
     ip_lookup:
       title: มองหาที่อยู่ไอพี
       hostname: ชื่อโฮสต์
@@ -425,7 +409,6 @@ th:
       notifications: "การแจ้งเตือน"
       statistics: "สถิติ"
       desktop_notifications:
-        label: "การแจ้งเตือนบนเดสท๊อป"
         not_supported: "การแจ้งเตือนยังไม่สนับสนุนบนบาวเซอร์นี้ ขอโทษด้วย"
         perm_default: "เปิดการแจ้งเตือน"
         perm_denied_btn: "ไม่มีสิทธิ์เข้าถึง"
@@ -467,7 +450,6 @@ th:
       delete_account: "ลบบัญชีของคุณ"
       delete_account_confirm: "คุณแน่ใจใหม่ที่จะลบบัญชีอย่างถาวร? การกระทำนี้ไม่สามารถยกเลิกได้"
       deleted_yourself: "คุณลบบัญชีเสร็จเเรียบร้อยแล้ว"
-      delete_yourself_not_allowed: "คุณไม่สามารถลบบัญชีได้ในขณะนี้ กรุณาติดต่อผู้ดูแลระบบเพื่อลบบัญชีของคุณ"
       unread_message_count: "ข้อความ"
       admin_delete: "ลบ"
       users: "ผู้ใช้"
@@ -492,12 +474,18 @@ th:
         move_to_archive: "เก็บ"
         failed_to_move: "เกิดความผิดพลาดในการย้ายหัวข้อที่เลือก (อาจเกิดจาดเครือข่ายของคุณล่ม)"
         select_all: "เลือกทั้งหมด"
+      preferences_nav:
+        profile: "ข้อมูลผู้ใช้<br><div><br data-mce-bogus=\"1\"></div>"
+        emails: "อีเมล"
+        tags: "ป้าย"
       change_password:
         success: "(อีเมลที่ส่งแล้ว)"
         in_progress: "(กำลังส่งอีเมล)"
         error: "(ผิดพลาด)"
         action: "ส่งอีเมลรีเซ็ทรหัสผ่าน"
         set_password: "ตั้งรหัสผ่าน"
+        choose_new: "เลือกรหัสผู้ใช้ใหม่"
+        choose: "เลือกรหัสผู้ใช้"
       change_about:
         title: "เปลี่ยนข้อมูลเกี่ยวกับฉัน"
         error: "เกิดความผิดพลาดในการแก้ไขค่านี้"
@@ -535,14 +523,16 @@ th:
         authenticated: "อีเมลของคุณได้รับการยืนยันโดย {{provider}}"
         frequency_immediately: "เราจะอีเมลถึงคุณทันทีหากคุณยังไม่ได้อ่านสิ่งที่เราอีเมลหาคุณ"
         frequency:
-          other: "เราจะอีเมลหาคุณเฉพาะสิ่งที่คุณไม่ได้เห็นในช่วง {{count}} นาที"
+          other: เราจะอีเมลหาคุณเฉพาะสิ่งที่คุณไม่ได้เห็นในช่วง {{count}} นาที
       name:
         title: "ชื่อ"
+        instructions: "ชื่อเต็มของคุณ (ไม่บังคับ)"
         instructions_required: "ชื่อเต็มของคุณ"
         too_short: "ชื่อของคุณสั้นไป"
         ok: "ชื่อของคุณมีลักษณะที่ดี"
       username:
         title: "ชื่อผู้ใช้"
+        instructions: "ไม่เหมือนใคร, ไม่มีช่องว่าง, สั้น"
         short_instructions: "ผู้คนสามารถพูดถึงคุณ @{{username}}"
         available: "ชื่อผู้ใช้ของคุณสามารถใช้ได้"
         not_available: "ใช้การไม่ได้ ลอง{{suggestion}}?"
@@ -562,8 +552,6 @@ th:
       created: "สมัครสมาชิกเมื่อ"
       log_out: "ออกจากระบบ"
       location: "ที่อยู่"
-      card_badge:
-        title: "ตราประจำบัตร"
       website: "เว็บไซต์"
       email_settings: "อีเมล์"
       like_notification_frequency:
@@ -615,9 +603,8 @@ th:
         title: "เชิญชวน"
         user: "เชิญชวนผู้ใช้"
         sent: "ส่ง"
-        none: "ไม่มีคำเชิญที่รออยู่ให้แสดง"
         truncated:
-          other: "กำลังแสดงคำเชิญ {{count}} รายการแรก"
+          other: กำลังแสดงคำเชิญ {{count}} รายการแรก
         redeemed: "ยืนยันการเชิญชวน"
         redeemed_tab: "ยืนยัน"
         redeemed_tab_with_count: "ยืนยันแล้ว ({{count}})"
@@ -655,15 +642,15 @@ th:
         stats: "สถิติ"
         time_read: "เวลาอ่าน"
         topic_count:
-          other: "กระทู้สร้าง"
+          other: กระทู้สร้าง
         post_count:
-          other: "โพสถูกสร้าง"
+          other: โพสถูกสร้าง
         days_visited:
-          other: "วันที่ดู"
+          other: วันที่ดู
         posts_read:
-          other: "โพสที่อ่าน"
+          other: โพสที่อ่าน
         bookmark_count:
-          other: "บุ๊คมาร์ค"
+          other: บุ๊คมาร์ค
         top_replies: "ตอบสูงสุด"
         no_replies: "ยังไม่มีใครตอบ"
         more_replies: "การตอบอื่น"
@@ -726,7 +713,7 @@ th:
       logout_disabled: "การออกจากระบบนั้นไม่สามารถทำได้ในเวลาที่เว็บนั้นอยู่ในโหมด read only"
     logs_error_rate_notice:
       rate:
-        other: "%{count} ผิดพลาด/%{duration}"
+        other: '%{count} ผิดพลาด/%{duration}'
     learn_more: "เรียนรู้เพิ่มเติม..."
     year: 'ปี'
     year_desc: 'กระทู้ที่ถูกตั้งเมื่อ365 วันที่ผ่านมา'
@@ -902,28 +889,12 @@ th:
       none: "ไม่สามารถโหลดการแจ้งเตือนในขณะนี้"
       more: "ดูการแจ้งเตือนก่อนหน้านี้"
       total_flagged: "โพสที่ปักธงทั้งหมด"
-      alt:
-        mentioned: "ถูกพูดถึงโดย"
-        quoted: "ถูกอ้างอิงโดย"
-        replied: "ตอบแล้ว"
-        posted: "โพสโดย"
-        edited: "แก้ไขโพสของคุณโดย"
-        liked: "ได้ถูกใจโพสของคุณ"
-        private_message: "ข้อความส่วนตัวจาก"
-        invited_to_private_message: "ได้รับคำเชิญเพื่อข้อความส่วนตัวจาก"
-        invited_to_topic: "เชิญไปยังกระทู้จาก"
-        invitee_accepted: "การเชิญได้ตอบรับโดย"
-        moved_post: "โพสของคุณได้ถูกย้ายโดย"
-        linked: "ลิงค์ไปยังโพสของคุณ"
-        granted_badge: "ได้รับป้าย"
-        group_message_summary: "ข้อความในกล่องข้อความกลุ่ม"
       popup:
         mentioned: '{{username}} พูดถึงคุณใน "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} พูดถึงคุณใน "{{topic}}" - {{site_title}}'
         quoted: '{{username}} อ้างอิงถึงคุณใน "{{topic}}" - {{site_title}}'
         replied: '{{username}} ตอบคุณใน "{{topic}}" - {{site_title}}'
         posted: '{{username}} โพสท์ใน "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} ส่งข้อความส่วนตัวถึงคุณใน "{{topic}}" - {{site_title}}'
         linked: '{{username}} ลิงค์โพสของคุณจาก "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "เพิ่มรูปภาพ"
@@ -979,7 +950,7 @@ th:
         archive_topics: "คลังกระทู้"
         choose_new_category: "เลือกหมวดใหม่ให้กระทู้"
         selected:
-          other: "คุณได้เลือก <b>{{count}}</b> กระทู้"
+          other: คุณได้เลือก <b>{{count}}</b> กระทู้
       none:
         unread: "คุณไม่มีกระทู้ที่ยังไม่ได้อ่าน"
         new: "คุณไม่มีกระทู้ใหม่"
@@ -996,6 +967,8 @@ th:
         new: "ไม่มีกระทู้ใหม่"
         bookmarks: "ไม่มีบุ๊คมาร์คในหัวข้อใดอีกแล้ว"
     topic:
+      filter_to:
+        other: ' {{count}} โพสในกระทู้'
       create: 'กระทู้ใหม่'
       create_long: 'สร้างกระทู้ใหม่'
       private_message: 'สร้างข้อความใหม่'
@@ -1022,9 +995,9 @@ th:
       not_found:
         title: "ไม่พบกระทู้"
       total_unread_posts:
-        other: "คุณมี {{count}} ความคิดเห็น ที่ยังไม่ได้อ่านในกระทู้นี้"
+        other: คุณมี {{count}} ความคิดเห็น ที่ยังไม่ได้อ่านในกระทู้นี้
       unread_posts:
-        other: "คุณมี {{count}} ความคิดเห็นเก่า ที่ยังไม่ได้อ่านในกระทู้นี้"
+        other: คุณมี {{count}} ความคิดเห็นเก่า ที่ยังไม่ได้อ่านในกระทู้นี้
       back_to_list: "กลับไปที่รายชื่อกระทู้"
       show_links: "แสดงลิงค์ในกระทู้นี้"
       read_more_in_category: "ต้องการจะอ่านเพิ่มเหรอ? ลองดูกระทู้อื่นใน {{catLink}} หรือ {{latestLink}}"
@@ -1035,13 +1008,15 @@ th:
       auto_close_title: 'ปิดการตั้งค่าอัตโนมัติ'
       timeline:
         back: "กลับ"
+      progress:
+        go_top: "บน"
       notifications:
         reasons:
-          '3_2': 'คุณจะได้รับการแจ้งเตือนเพราะคุณดูกระทู้นี้'
-          '3_1': 'คุณจะได้รับการแจ้งเตือนเพราะคุณสร้างกระทู้นี้'
-          '3': 'คุณจะได้รับการแจ้งเตือนเพราะคุณดูกระทู้นี้'
-          '0_2': 'คุณไม่ต้องการรับการแจ้งเตือนของกระทู้นี้'
-          '0': 'คุณไม่ต้องการรับการแจ้งเตือนของกระทู้นี้'
+          "3_2": 'คุณจะได้รับการแจ้งเตือนเพราะคุณดูกระทู้นี้'
+          "3_1": 'คุณจะได้รับการแจ้งเตือนเพราะคุณสร้างกระทู้นี้'
+          "3": 'คุณจะได้รับการแจ้งเตือนเพราะคุณดูกระทู้นี้'
+          "0_2": 'คุณไม่ต้องการรับการแจ้งเตือนของกระทู้นี้'
+          "0": 'คุณไม่ต้องการรับการแจ้งเตือนของกระทู้นี้'
         watching_pm:
           title: "กำลังดู"
         watching:
@@ -1072,7 +1047,6 @@ th:
         visible: "ทำให้แสดงในรายชื่อ"
         reset_read: "ล้างข้อมูลวันที่"
         make_public: "ทำให้กระทู้เป็นสาธารณะ"
-        make_private: "ทำเป็นข้อความส่วนตัว"
       feature:
         pin: "ปักหมุดกระทู้"
         unpin: "ยกเลิกปักหมุดกระทู้"
@@ -1108,7 +1082,7 @@ th:
       login_reply: 'เข้าสู่ระบบเพื่อตอบ'
       filters:
         n_posts:
-          other: "{{count}} โพส"
+          other: '{{count}} โพส'
         cancel: "เอาการกรองออก"
       split_topic:
         title: "ย้ายไปหัวข้อใหม่"
@@ -1135,8 +1109,6 @@ th:
         description:
           other: คุณได้เลือก <b>{{count}}</b> โพสต์.
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       edit_reason: "เหตุผล:"
       post_number: "โพสต์ {{number}}"
       last_edited_on: "โพสแก้ไขล่าสุดเมื่อ"
@@ -1145,15 +1117,15 @@ th:
       show_full: "แสดงโพสแบบเต็ม"
       show_hidden: 'ดูเนื้อหาที่ถูกซ่อน'
       deleted_by_author:
-        other: "(โพสถูกแจ้งลบโดยเจ้าของ และจะถูกลบใน %{count} ชั่วโมงเว้นแต่จะถูกปักธง)"
+        other: (โพสถูกแจ้งลบโดยเจ้าของ และจะถูกลบใน %{count} ชั่วโมงเว้นแต่จะถูกปักธง)
       expand_collapse: "ขยาย/หด"
       unread: "โพสนี้ยังไม่ถูกอ่าน"
       has_replies:
-        other: "{{count}} ตอบ"
+        other: '{{count}} ตอบ'
       has_likes:
-        other: "{{count}} ชอบ"
+        other: '{{count}} ชอบ'
       has_likes_title:
-        other: "{{count}} ผู้คนที่ชอบโพสนี้"
+        other: '{{count}} ผู้คนที่ชอบโพสนี้'
       has_likes_title_only_you: "คุณชอบโพสนี้"
       errors:
         create: "ขอโทษ, เกิดความผิดพลาดขณะกำลังสร้างโพสของคุณ โปรดลองใหม่อีกครั้ง"
@@ -1188,10 +1160,10 @@ th:
           bookmark: "บุ๊คมาร์คโพสนี้"
         by_you_and_others:
           bookmark:
-            other: "คุณและอีก {{count}} คนได้บุ๊คมาร์คโพสนี้"
+            other: คุณและอีก {{count}} คนได้บุ๊คมาร์คโพสนี้
         by_others:
           bookmark:
-            other: "{{count}} คน ได้บุ๊คมาร์คโพสนี้"
+            other: '{{count}} คน ได้บุ๊คมาร์คโพสนี้'
     category:
       delete: 'ลบหมวดหมู่'
       delete_confirm: "คุณแน่ใจหรือว่าจะลบหมวดหมู่นี้ออก?"
@@ -1224,15 +1196,15 @@ th:
     original_post: "โพสต้นฉบับ"
     views: "ดู"
     views_lowercase:
-      other: "ดู"
+      other: ดู
     replies: "ตอบ"
     activity: "กิจกรรม"
     likes: "ชอบ"
     likes_lowercase:
-      other: "ชอบ"
+      other: ชอบ
     users: "ผู้ใช้"
     users_lowercase:
-      other: "ผู้ใช้"
+      other: ผู้ใช้
     category_title: "หมวดหมู่"
     history: "ประวัติ"
     changed_by: "โดย {{author}}"
@@ -1245,7 +1217,7 @@ th:
       latest:
         title: "ล่าสุด"
         title_with_count:
-          other: "ล่าสุด ({{count}})"
+          other: ล่าสุด ({{count}})
         help: "หัวข้อพร้อมโพสล่าสุด"
       hot:
         title: "ร้อนแรง"
@@ -1261,17 +1233,17 @@ th:
       unread:
         title: "ยังไม่อ่าน"
         title_with_count:
-          other: "ยังไม่ได้อ่าน ({{count}})"
+          other: ยังไม่ได้อ่าน ({{count}})
         help: "หัวข้อที่คุณกำลังจับตาหรือติดตามพร้อมโพสที่ยังไม่อ่าน"
         lower_title_with_count:
-          other: "{{count}} ไม่ได้อ่าน"
+          other: '{{count}} ไม่ได้อ่าน'
       new:
         lower_title_with_count:
-          other: "{{count}} ใหม่"
+          other: '{{count}} ใหม่'
         lower_title: "ใหม่"
         title: "ใหม่"
         title_with_count:
-          other: "ใหม่ ({{count}})"
+          other: ใหม่ ({{count}})
         help: "หัวข้อที่ถูกสร้างในช่วงไม่กี่วัน"
       posted:
         title: "โพสของฉัน"
@@ -1282,7 +1254,7 @@ th:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          other: "{{categoryName}} ({{count}})"
+          other: '{{categoryName}} ({{count}})'
         help: "หัวข้อล่าสุดในหมวดหมู่ {{categoryName}}"
       top:
         title: "บน"
@@ -1343,8 +1315,6 @@ th:
         reports:
           today: "วันนี้"
           yesterday: "เมื่อวาน"
-          last_7_days: "เมื่อ 7 วันที่ผ่านมา"
-          last_30_days: "เมื่อ 30 วันที่ผ่านมา"
           all_time: "ตลอดเวลา"
           7_days_ago: "7 วันที่แล้ว"
           30_days_ago: "30 วันที่แล้ว"
@@ -1385,8 +1355,6 @@ th:
         title: "กลุ่ม"
         edit: "แก้กลุ่ม"
         refresh: "รีโหลด"
-        new: "ใหม่"
-        selector_placeholder: "ชื่อผู้ใช้ใหม่"
         about: "แก้ไขสมาชิกและชื่อกลุ่มของคุณได้ที่นี่"
         group_members: "ชื่อสมาชิก"
         delete: "ลบ"
@@ -1394,11 +1362,8 @@ th:
         delete_failed: "ไม่สามารถลงกลุ่มได้ ถ้ากลุ่มนี้เป็นกลุ่มอัตโนมัติมันจะไม่สามารถถูกทำลายได้"
         delete_owner_confirm: "ลบสิทธิ์การเป็นเจ้าของ ของ '%{username}'?"
         add: "เพิ่ม"
-        add_members: "เพิ่มสมาชิก"
         group_owners: เจ้าของ
         add_owners: เพิ่มเจ้าของ
-        incoming_email: "ตั้งที่อยู่สำหรับอีเมลขาเข้า"
-        incoming_email_placeholder: "ใส่อีเมล"
       api:
         user: "ผู้ใช้"
         title: "API"
@@ -1475,9 +1440,9 @@ th:
           suspect: 'ต้องสงสัย'
         approved: "ยืนยันหรือไม่"
         approved_selected:
-          other: "ผู้ใช้งานที่ได้รับยืนยันแล้ว ({{count}})"
+          other: ผู้ใช้งานที่ได้รับยืนยันแล้ว ({{count}})
         reject_selected:
-          other: "ผู้ใช้งานที่ไม่ได้รับยืนยันแล้ว ({{count}})"
+          other: ผู้ใช้งานที่ไม่ได้รับยืนยันแล้ว ({{count}})
         titles:
           active: 'ผู้ใช้ที่ใช้งานอยู่'
           new: 'ผู้ใช้งานใหม่'
@@ -1590,8 +1555,6 @@ th:
         recommended: "เราแนะนำให้คุณแก้ไขข้อความให้ตรงกับความต้องการของคุณ:"
       site_settings:
         title: 'การตั้งค่า'
-        reset: 'ล้าง'
-        none: 'ไม่มี'
         no_results: "ไม่มีผลการค้นหา"
         clear_filter: "ล้าง"
         add_url: "เพิ่ม URL"
@@ -1641,10 +1604,10 @@ th:
             header: "อันตราย!"
           sample: "ตัวอย่าง:"
           grant:
-            with: <span class="username">%{username}</span>
-            with_post: <span class="username">%{username}</span> สำหรับโพสต์ใน %{link}
-            with_post_time: <span class="username">%{username}</span> สำหรับโพสต์ใน %{link} เมื่อ <span class="time">%{time}</span>
-            with_time: <span class="username">%{username}</span> เมื่อ <span class="time">%{time}</span>
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span> สำหรับโพสต์ใน %{link}"
+            with_post_time: "<span class=\"username\">%{username}</span> สำหรับโพสต์ใน %{link} เมื่อ <span class=\"time\">%{time}</span>"
+            with_time: "<span class=\"username\">%{username}</span> เมื่อ <span class=\"time\">%{time}</span>"
       emoji:
         title: "Emoji"
         add: "เพิ่ม Emoji ใหม่"
@@ -1671,7 +1634,7 @@ th:
         category_id: "เลขที่หมวดหมู่"
         category_title: "หมวดหมู่"
         external_url: "ลิงก์ภายนอก"
-        delete_confirm: คุณแน่ใจหรือว่าจะลบลิงค์ถาวรนี้?
+        delete_confirm: "คุณแน่ใจหรือว่าจะลบลิงค์ถาวรนี้?"
         form:
           label: "ใหม่:"
           add: "เพิ่ม"
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 90631af3f39..11e7782b048 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -16,6 +16,7 @@ tr_TR:
           format: '%n %u'
           units:
             byte:
+              one: Bayt
               other: Bayt
             gb: GB
             kb: KB
@@ -42,47 +43,71 @@ tr_TR:
       tiny:
         half_a_minute: "< 1d"
         less_than_x_seconds:
-          other: "< %{count}s"
+          one: < %{count}s
+          other: < %{count}s
         x_seconds:
-          other: "%{count}s"
+          one: '%{count}s'
+          other: '%{count}s'
+        less_than_x_minutes:
+          one: < %{count}dk
+          other: < %{count}dk
         x_minutes:
-          other: "%{count}d"
+          one: '%{count}d'
+          other: '%{count}d'
         about_x_hours:
-          other: "%{count}s"
+          one: '%{count}s'
+          other: '%{count}s'
         x_days:
-          other: "%{count}g"
+          one: '%{count}g'
+          other: '%{count}g'
+        x_months:
+          one: '%{count}ay'
+          other: '%{count}ay'
         about_x_years:
-          other: "%{count}y"
+          one: '%{count}y'
+          other: '%{count}y'
         over_x_years:
-          other: "> %{count}y"
+          one: '> %{count}y'
+          other: '> %{count}y'
         almost_x_years:
-          other: "%{count}y"
+          one: '%{count}y'
+          other: '%{count}y'
         date_month: "D MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          other: "%{count} dakika"
+          one: '%{count} dakika'
+          other: '%{count} dakika'
         x_hours:
-          other: "%{count} saat"
+          one: '%{count} saat'
+          other: '%{count} saat'
         x_days:
-          other: "%{count} gün"
+          one: '%{count} gün'
+          other: '%{count} gün'
         date_year: "D MMM, 'YY"
       medium_with_ago:
         x_minutes:
-          other: "%{count} dakika önce"
+          one: '%{count} dakika önce'
+          other: '%{count} dakika önce'
         x_hours:
-          other: "%{count} saat önce"
+          one: '%{count} saat önce'
+          other: '%{count} saat önce'
         x_days:
-          other: "%{count} gün önce"
+          one: '%{count} gün önce'
+          other: '%{count} gün önce'
       later:
         x_days:
-          other: "%{count} gün sonra"
+          one: '%{count} gün sonra'
+          other: '%{count} gün sonra'
         x_months:
-          other: "%{count} ay sonra"
+          one: '%{count} ay sonra'
+          other: '%{count} ay sonra'
         x_years:
-          other: "%{count} yıl sonra"
+          one: '%{count} yıl sonra'
+          other: '%{count} yıl sonra'
       previous_month: 'Önceki Ay'
       next_month: 'Sonraki Ay'
+      placeholder: tarih
     share:
       topic: 'bu konunun bağlantısını paylaşın'
       post: '#%{postNumber} numaralı gönderiyi paylaşın'
@@ -93,10 +118,10 @@ tr_TR:
       email: 'bu bağlantıyı e-posta ile gönderin'
     action_codes:
       public_topic: "bu konuyu %{when} herkese açık yaptı"
-      private_topic: "bu konuyu %{when} özel yaptı"
       split_topic: "bu konuyu %{when} ayırdı"
       invited_user: "%{when} %{who} davet edildi"
       invited_group: "%{who} %{when} davet edildi"
+      user_left: "%{who} bu iletiden ayrıldı %{when}"
       removed_user: "%{when} %{who} silindi"
       removed_group: "%{who} %{when} kaldırıldı"
       autoclosed:
@@ -117,11 +142,11 @@ tr_TR:
       visible:
         enabled: '%{when} listelendi'
         disabled: '%{when} listelenmedi'
+      banner:
+        enabled: 'Bu konu manşete taşınmıştır %{when}. Kullanıcı tarafından yoksayılana kadar her sayfanın en üstünde belirecektir.'
     topic_admin_menu: "konuyla alakalı yönetici eylemleri"
     wizard_required: "Yeni Discourse'unuza hoşgeldiniz!  Hadi kuruluma başlayalım! <a href='%{url}' data-auto-route='true'>Kurulum Sihirbazı</a> ✨"
     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."
     themes:
       default_description: "Varsayılan "
     s3:
@@ -145,6 +170,7 @@ tr_TR:
     not_implemented: "Bu özellik henüz geliştirilmedi, üzgünüz!"
     no_value: "Hayır"
     yes_value: "Evet"
+    submit: "Gönder"
     generic_error: "Üzgünüz, bir hata oluştu."
     generic_error_with_reason: "Bir hata oluştu: %{error}"
     sign_up: "Kayıt Ol"
@@ -157,7 +183,8 @@ tr_TR:
     show_help: "seçenekler"
     links: "Bağlantılar"
     links_lowercase:
-      other: "bağlantılar"
+      one: bağlantılar
+      other: bağlantılar
     faq: "SSS"
     guidelines: "Yönergeler"
     privacy_policy: "Gizlilik Sözleşmesi"
@@ -181,7 +208,8 @@ tr_TR:
     max_of_count: "azami {{count}}"
     alternation: "ya da"
     character_count:
-      other: "{{count}} karakter"
+      one: '{{count}} karakter'
+      other: '{{count}} karakter'
     suggested_topics:
       title: "Önerilen Konular"
       pm_title: "Önerilen İletiler"
@@ -193,8 +221,6 @@ tr_TR:
       our_moderators: "Moderatörlerimiz"
       stat:
         all_time: "Tüm Zamanlar"
-        last_7_days: "Son 7 gün"
-        last_30_days: "Son 30 gün"
       like_count: "Beğeni"
       topic_count: "Konular"
       post_count: "Gönderiler"
@@ -216,12 +242,11 @@ tr_TR:
       remove: "İmi Kaldır"
       confirm_clear: "Bu konuya ait tüm imleri kaldırmak istediğinize emin misiniz?"
     topic_count_latest:
-      other: "{{count}} yeni ya da güncellenmiş konu."
+      one: '{{count}} yeni ya da güncellenmiş konu.'
+      other: '{{count}} yeni ya da güncellenmiş konu.'
     topic_count_unread:
-      other: "{{count}} okunmamış konu."
-    topic_count_new:
-      other: "{{count}} yeni konu."
-    click_to_show: "Görüntülemek için tıklayın."
+      one: '{{count}} Okunmamış konuyu görün'
+      other: '{{count}} Okunmamış konuları görün'
     preview: "önizleme"
     cancel: "iptal"
     save: "Değişiklikleri Kaydet"
@@ -231,8 +256,10 @@ tr_TR:
     uploading: "Yükleniyor..."
     uploading_filename: "{{filemame}} yükleniyor..."
     uploaded: "Yüklendi!"
+    pasting: "Yapıştırılıyor..."
     enable: "Etkinleştir"
     disable: "Devredışı Bırak"
+    continue: "Devam et"
     undo: "Geri Al"
     revert: "Eski Haline Getir"
     failed: "Başarısız oldu"
@@ -257,14 +284,16 @@ tr_TR:
       cancel: "İptal"
       view_pending: "bekleyen gönderileri görüntüleyin"
       has_pending_posts:
-        other: "Bu konuda <b>{{count}}</b> sayıda onay bekleyen gönderi var"
+        one: Bu konuda <b>{{count}}</b> sayıda onay bekleyen gönderi var
+        other: Bu konuda <b>{{count}}</b> sayıda onay bekleyen gönderi var
       confirm: "Düzenlemeleri Kaydet"
       delete_prompt: "<b>%{username}</b> kullanıcısını silmek istediğinize emin misiniz? Bunu yaparsanız tüm gönderileri silinecek, e-posta adresi ve IP adresi engellenecek."
       approval:
         title: "Gönderi Onay Gerektirir"
         description: "Gönderinizi aldık fakat gösterilmeden önce bir moderatör tarafından onaylanması gerekiyor. Lütfen sabırlı olun."
         pending_posts:
-          other: "Bekleyen <strong>{{count}}</strong> gönderiniz bulunmaktadır."
+          one: Bekleyen <strong>{{count}}</strong> gönderiniz bulunmaktadır.
+          other: Bekleyen <strong>{{count}}</strong> gönderiniz bulunmaktadır.
         ok: "Tamam"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> <a href='{{topicUrl}}'>konuyu</a> açtı"
@@ -298,7 +327,8 @@ tr_TR:
       posts_read: "Okunmuşlar"
       posts_read_long: "Okunmuş Gönderiler"
       total_rows:
-        other: "%{count} kullanıcı"
+        one: '%{count} kullanıcı'
+        other: '%{count} kullanıcı'
     group_histories:
       actions:
         change_group_setting: "Grup ayarlarını değiştir"
@@ -307,23 +337,34 @@ tr_TR:
         make_user_group_owner: "Sahip yap"
         remove_user_as_group_owner: "Sahipliğini İptal Et"
     groups:
-      logs:
-        title: "Kayıtlar"
-        when: "Ne zaman"
-        action: "Eylem"
-        acting_user: "Temsili Kullanıcılar"
-        target_user: "Hedef Kullanıcı"
-        subject: "Konu"
-        details: "Ayrıntılar"
-        from: "Gönderen"
-        to: "Kime"
-      edit:
-        title: 'Grubu düzenle'
+      add_members:
+        title: "Üyeleri ekle"
+        usernames: "Kullanıcı adları"
+      manage:
+        title: 'Yönet'
+        name: 'İsim'
         full_name: 'Tam İsim'
         add_members: "Üyeleri ekle"
         delete_member_confirm: "'%{username}' adlı kullanıcıyı '%{group}' grubundan çıkart?"
-      name_placeholder: "Grup adı, kullanıcı adındaki gibi boşluksuz olmalı"
-      public_admission: "Kullanıcıların gruba özgürce katılmalarına izin ver (Herkese açık olarak görünür grup gerektirir)"
+        profile:
+          title: Profil
+        interaction:
+          title: Etkileşim
+          notification: Bildirim
+        membership:
+          title: Üyelik
+          access: Erişim
+        logs:
+          title: "Kayıtlar"
+          when: "Ne zaman"
+          action: "Eylem"
+          acting_user: "Temsili kullanıcı"
+          target_user: "Hedef Kullanıcı"
+          subject: "Konu"
+          details: "Ayrıntılar"
+          from: "Kimden"
+          to: "Kime"
+      public_admission: "Kullanıcıların gruba özgürce katılmalarına izin ver (grubun Herkese açık olması gerekir)"
       public_exit: "Kullanıcıların grubu özgürce terk etmesine izin ver"
       empty:
         posts: "Bu grubun üyelerinden konu yok."
@@ -333,42 +374,44 @@ tr_TR:
         topics: "Bu grubun üyeleri tarafından oluşturulmuştur başlık yoktur."
         logs: "Bu grup için log kaydı bulunmamaktadır."
       add: "Ekle"
-      join: "Gruba katıl"
-      leave: "Gruptan ayrıl"
-      request: "Gruba katılmak için istek yolla"
+      join: "Katıl"
+      leave: "Ayrıl"
+      request: "İstek"
       message: "ileti"
-      automatic_group: Otomatik Grup
-      closed_group: Kapanmış Grup
-      is_group_user: "Bu grubun bir üyesisiniz."
-      allow_membership_requests: "Kullanıcıların grup sahiplerine üyelik talepleri göndermesine izin ver"
+      allow_membership_requests: "Kullanıcılar'ın grup sahiplerine üyelik talepleri göndermesine izin ver"
       membership_request:
         submit: "İstek Gönderin"
         title: "@%{group_name}  için Katılma isteği "
         reason: "Grup sahiplerine bu gruba neden üye olduğunuzu bildirin"
       membership: "Üyelik"
       name: "İsim"
-      user_count: "Grup Sayısı"
+      group_name: "Grup adı"
+      user_count: "Kullanıcılar"
       bio: "Grup Hakkında"
-      selector_placeholder: "Üye ekle"
+      selector_placeholder: "kullanıcı adı girin"
       owner: "sahip"
       index:
         title: "Gruplar"
+        all: "Tüm Gruplar"
         empty: "Görünen hiç bir grup bulunmamaktadır."
+        filter: "Grup tipine göre filtrele"
+        close_groups: "Kapanmış Gruplar"
+        automatic_groups: "Otomatik Gruplar"
+        automatic: "Otomatik"
+        closed: "Kapanmış"
+        public: "Herkese Açık"
+        private: "Özel"
       title:
-        other: "Gruplar"
+        one: Gruplar
+        other: Gruplar
       activity: "Etkinlik"
-      members: "Üyeler"
+      members:
+        filter_placeholder_admin: "kullanıcı adı ya da e-posta"
       topics: "Konular"
       posts: "Gönderiler"
       mentions: "Bahsetmeler"
       messages: "İletiler"
       notification_level: "Grup mesajları için varsayılan bildirim düzeyi"
-      visibility_levels:
-        title: "Bu grubu kim görebilir?"
-        public: "Herkes"
-        members: "Grup sahipleri, üyeler ve yöneticiler"
-        staff: "Grup sahipleri ve yetkili"
-        owners: "Grup sahipleri ve yöneticileri"
       alias_levels:
         mentionable: "Bu gruptan kimler @bahsedebilir?"
         messageable: "Bu gruba kimler ileti gönderebilir?"
@@ -377,9 +420,6 @@ tr_TR:
         mods_and_admins: "Sadece Moderatörler ve Yöneticiler"
         members_mods_and_admins: "Sadece Grup Üyeleri, Moderatörler ve Yöneticiler"
         everyone: "Herkes"
-      trust_levels:
-        title: "Eklendiklerinde üyelere otomatik olarak güven seviyesi verilir:"
-        none: "Hiç"
       notifications:
         watching:
           title: "Gözleniyor"
@@ -404,23 +444,21 @@ tr_TR:
       flair_color_placeholder: "(İsteğe bağlı) Hex renk değeri"
       flair_preview_icon: "İkonu önizle"
       flair_preview_image: "Resimi önizle"
-      flair_note: "Not: Kabiliyet sadece bir kullanıcının birincil grubu için gösterecek."
     user_action_groups:
-      '1': "Verilen Beğeniler"
-      '2': "Alınan Beğeniler"
-      '3': "İmlenenler"
-      '4': "Konular"
-      '5': "Cevaplar"
-      '6': "Yanıtlar"
-      '7': "Bahsedenler"
-      '9': "Alıntılar"
-      '11': "Düzenlemeler"
-      '12': "Yollanmış ögeler"
-      '13': "Gelen Kutusu"
-      '14': "Bekleyen"
+      "1": "Verilen Beğeniler"
+      "2": "Alınan Beğeniler"
+      "3": "İmlenenler"
+      "4": "Konular"
+      "5": "Cevaplar"
+      "6": "Yanıtlar"
+      "7": "Bahsedenler"
+      "9": "Alıntılar"
+      "11": "Düzenlemeler"
+      "12": "Yollanmış ögeler"
+      "13": "Gelen Kutusu"
+      "14": "Bekleyen"
     categories:
       all: "tüm kategoriler"
-      all_subcategories: "hepsi"
       no_subcategory: "hiçbiri"
       category: "Kategori"
       category_list: "Kategori listesini göster"
@@ -439,9 +477,11 @@ tr_TR:
       toggle_ordering: "sıralama kontrolünü aç/kapa"
       subcategories: "Alt kategoriler"
       topic_sentence:
-        other: "%{count} konu"
+        one: '%{count} konu'
+        other: '%{count} konu'
       topic_stat_sentence:
-        other: "%{unit} beri %{count} yeni konu."
+        one: '%{unit} beri %{count} yeni konu.'
+        other: '%{unit} beri %{count} yeni konu.'
     ip_lookup:
       title: IP Adresi Ara
       hostname: Sunucu ismi
@@ -457,6 +497,7 @@ tr_TR:
       topics_entered: "açılan konular"
       post_count: "# gönderi"
       confirm_delete_other_accounts: "Bu hesapları silmek isteğinize emin misiniz?"
+      powered_by: "<a href='https://ipinfo.io'>ipinfo.io</a> tarafından güçlendirildi"
     user_fields:
       none: "(bir seçenek seçin)"
     user:
@@ -475,6 +516,7 @@ tr_TR:
       activity_stream: "Etkinlik"
       preferences: "Tercihler"
       expand_profile: "Genişlet"
+      collapse_profile: "Daralt"
       bookmarks: "İmlenenler"
       bio: "Hakkımda"
       invited_by: "Tarafından Davet Edildi"
@@ -482,7 +524,6 @@ tr_TR:
       notifications: "Bildirimler"
       statistics: "Sayıtımlar"
       desktop_notifications:
-        label: "Masaüstü Bildirimleri"
         not_supported: "Bildirimler bu tarayıcıda desteklenmiyor. Üzgünüz."
         perm_default: "Bildirimleri Etkinleştirin"
         perm_denied_btn: "Erişim İzni Reddedildi"
@@ -497,7 +538,7 @@ tr_TR:
       disable_jump_reply: "Cevapladıktan sonra gönderime atlama"
       dynamic_favicon: "Tarayıcı simgesinde yeni / güncellenen konu sayısını göster"
       theme_default_on_all_devices: "Seçilen temayı bütün cihazlarımda varsayılan yap"
-      allow_private_messages: "Diğer kullanıcıların bana özel mesaj göndermelerine izin ver"
+      allow_private_messages: "Diğer kullanıcıların bana kişisel mesaj göndermesine izin ver"
       external_links_in_new_tab: "Tüm dış bağlantıları yeni sekmede aç"
       enable_quoting: "Vurgulanan yazıyı alıntılayarak cevaplama özelliğini etkinleştir"
       change: "değiştir"
@@ -506,7 +547,7 @@ tr_TR:
       moderator_tooltip: "Bu kullanıcı bir moderatör"
       admin_tooltip: "Bu kullanıcı bir yönetici."
       silenced_tooltip: "Bu kullanıcı susturuldu"
-      suspended_notice: "Bu kullanıcı {{tarih}} tarihine kadar uzaklaştırıldı."
+      suspended_notice: "Bu kullanıcı {{date}} tarihine kadar uzaklaştırıldı."
       suspended_permanently: "Bu kullanıcı askıya alındı."
       suspended_reason: "Neden:"
       github_profile: "Github"
@@ -542,7 +583,6 @@ tr_TR:
       delete_account: "Hesabımı Sil"
       delete_account_confirm: "Hesabınızı kalıcı olarak silmek istediğinize emin misiniz? Bu eylemi geri alamazsınız!"
       deleted_yourself: "Hesabınız başarıyla silindi."
-      delete_yourself_not_allowed: "Hesabınızı şu an silemezsiniz. Hesabınızı silmesi için bir yönetici ile iletişime geçin."
       unread_message_count: "İletiler"
       admin_delete: "Sil"
       users: "Kullanıcılar"
@@ -575,6 +615,7 @@ tr_TR:
         move_to_archive: " Arşiv"
         failed_to_move: "Seçilen iletileri taşımak başarısız oldu (muhtemelen ağınız çöktü)"
         select_all: "Tümünü seç"
+        tags: "Etiketler"
       preferences_nav:
         account: "Hesap"
         profile: "Profil"
@@ -592,6 +633,15 @@ tr_TR:
         set_password: "Parola Belirle"
         choose_new: "Yeni bir parola seçiniz"
         choose: "Paralo seçiniz"
+      second_factor:
+        title: "İki Faktörlü Kimlik Doğrulama"
+        disable: "İki faktörlü kimlik doğrulamayı devre dışı bırak"
+        confirm_password_description: "Devam etmek için lütfen şifrenizi onaylayın"
+        enable_description: |
+          Desteklenen bir uygulamada bu QR kodunu tarayın (<a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target="_blank">Android</a> - <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8" target="_blank">iOS</a> - <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a>) ve kimlik doğrulama kodunuzu girin.
+        extended_description: |
+          İki faktörlü kimlik doğrulama, şifrenize ek olarak tek seferlik bir kod gerektirerek hesabınıza ek güvenlik ekler. Kodlar <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target='_blank'>Android</a>, <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8">iOS</a>, ve <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a> cihazlar üzerinde oluşturulabilir.
+        oauth_enabled_warning: "Hesabınızda iki faktörlü kimlik doğrulaması etkinleştirildikten sonra sosyal girişlerin devre dışı bırakılacağını lütfen unutmayın."
       change_about:
         title: "Hakkımda'yı Değiştir"
         error: "Bu değeri değiştirirken bir hata oluştu."
@@ -632,7 +682,8 @@ tr_TR:
         authenticated: "E-posta adresiniz {{provider}} tarafından doğrulanmıştır"
         frequency_immediately: "Eğer yollamak üzere olduğumuz şeyi okumadıysanız size direk e-posta yollayacağız."
         frequency:
-          other: "Sadece son {{count}} dakika içinde sizi görmediysek e-posta yollayacağız."
+          one: Sadece son {{count}} dakika içinde sizi görmediysek e-posta yollayacağız.
+          other: Sadece son {{count}} dakika içinde sizi görmediysek e-posta yollayacağız.
       name:
         title: "İsim"
         instructions: "tam adınız (opsiyonel)"
@@ -663,8 +714,6 @@ tr_TR:
       created: "Katıldı"
       log_out: "Oturumu Kapat"
       location: "Yer"
-      card_badge:
-        title: "Kullanıcı Kartı Rozeti"
       website: "Web Sayfası"
       email_settings: "E-posta"
       like_notification_frequency:
@@ -718,9 +767,10 @@ tr_TR:
         title: "Davetler"
         user: "Davet Edilen Kullanıcı"
         sent: "Gönderildi"
-        none: "Bekleyen davet yok."
+        none: "Gösterilecek davet yok."
         truncated:
-          other: "İlk {{count}} davet gösteriliyor."
+          one: İlk {{count}} davet gösteriliyor.
+          other: İlk {{count}} davet gösteriliyor.
         redeemed: "Kabul Edilen Davetler"
         redeemed_tab: "Kabul Edildi"
         redeemed_tab_with_count: "İtfa edilmiş ({{count}})"
@@ -766,19 +816,29 @@ tr_TR:
         stats: "Sayıtımlar"
         time_read: "okuma süresi"
         topic_count:
-          other: "oluşturulan konular"
+          one: oluşturulan konular
+          other: oluşturulan konular
         post_count:
-          other: "oluşturulan gönderiler"
+          one: oluşturulan gönderiler
+          other: oluşturulan gönderiler
         likes_given:
-          other: "verilen"
+          one: verilen
+          other: verilen
         likes_received:
-          other: "alınan"
+          one: alınan
+          other: alınan
         days_visited:
-          other: "ziyaret edilen gün"
+          one: ziyaret edilen gün
+          other: ziyaret edilen gün
+        topics_entered:
+          one: görüntülenmiş başlıklar
+          other: görüntülenmiş başlıklar
         posts_read:
-          other: "okunmuş gönderi"
+          one: okunmuş gönderi
+          other: okunmuş gönderi
         bookmark_count:
-          other: "imler"
+          one: imler
+          other: imler
         top_replies: "Başlıca Cevapları"
         no_replies: "Henüz cevap bulunmuyor."
         more_replies: "Diğer Cevapları"
@@ -804,6 +864,7 @@ tr_TR:
         header_title: "profil, iletiler, imler ve tercihler"
       title:
         title: "Başlık"
+        none: "(hiçbiri)"
       filters:
         all: "Hepsi"
       stream:
@@ -846,7 +907,8 @@ tr_TR:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> , %{siteSettingRate} 'in site ayarları limitine ulaştı."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> , %{siteSettingRate} 'in site ayarları limitini aştı."
       rate:
-        other: "%{count} hata/%{duration}"
+        one: '%{count} hata/%{duration}'
+        other: '%{count} hata/%{duration}'
     learn_more: "daha fazlasını öğren..."
     all_time: 'toplam'
     all_time_desc: 'toplam oluşturulan konu'
@@ -864,6 +926,7 @@ tr_TR:
     time_read: Okuma
     last_reply_lowercase: son cevap
     replies_lowercase:
+      one: cevap
       other: cevap
     signup_cta:
       sign_up: "Kayıt Ol"
@@ -913,14 +976,23 @@ tr_TR:
       complete_email_not_found: "Hiçbir hesap <b>%{email}</b> adresi ile eşleşmiyor"
       button_ok: "Tamam"
       button_help: "Yardım"
+    email_login:
+      button_label: "e-posta ile"
+      complete_username: "<b>%{username}</b> kullanıcı adı bir hesap ile eşleşirse, kısa bir süre içinde giriş bağlantısına sahip bir e-posta alacaksınız."
+      complete_email: "<b>%{email}</b> e-posta adresi bir hesap ile eşleşirse, kısa bir süre içinde giriş bağlantısına sahip bir e-posta alacaksınız."
+      complete_username_found: "<b>%{username}</b> kullanıcı adıyla eşleşen bir hesap bulduk, kısa bir süre içerisinde giriş bağlantısına sahip bir e-posta alacaksınız."
+      complete_email_found: "<b>%{email}</b> e-posta adresi ile eşleşen bir hesap bulduk, kısa bir süre içinde giriş bağlantısına sahip bir e-posta alacaksınız."
+      complete_email_not_found: "%{email}Hiç bir hesap bulunamadı"
     login:
       title: "Giriş Yap"
       username: "Kullanıcı"
       password: "Parola"
+      second_factor_title: "İki Faktörlü Kimlik Doğrulama"
       email_placeholder: "e-posta veya kullanıcı adı"
       caps_lock_warning: "Caps Lock açık"
       error: "Bilinmeyen hata"
       rate_limit: "Tekrar giriş yapmayı denemeden önce lütfen bekleyin."
+      blank_username: "Lütfen e-posta adresinizi ya da kullanıcı adınızı girin."
       blank_username_or_password: "Lütfen e-posta adresinizi ya da kullanıcı adınızı, ve parolanızı girin."
       reset_password: 'Parola Sıfırlama'
       logging_in: "Oturum açılıyor..."
@@ -933,6 +1005,7 @@ tr_TR:
       not_allowed_from_ip_address: "Bu IP adresiyle oturum açamazsınız."
       admin_not_allowed_from_ip_address: "Bu IP adresinden yönetici olarak oturum açamazsınız."
       resend_activation_email: "Etkinleştirme e-postasını tekrar yollamak için buraya tıklayın. "
+      omniauth_disallow_totp: "Hesabınızın iki faktör kimlik doğrulaması etkin. Lütfen şifrenizle giriş yapın."
       resend_title: "Etkinleştirme epostasını tekrar gönder"
       change_email: "Eposta adresini değiştir"
       provide_new_email: "Yeni bir e posta adresi girerek aktivasyon maili gönderin."
@@ -967,6 +1040,7 @@ tr_TR:
       accept_title: "Davet"
       welcome_to: "%{site_name} topluluğuna hoş geldiniz!"
       invited_by: "Davet gönderen:"
+      social_login_available: "Ayrıca bu eposta adresini kullanan tüm sosyal ağ girişleriyle oturum açabileceksiniz."
       your_email: "Hesap e-posta adresiniz <b>%{email}</b>."
       accept_invite: "Daveti kabul et"
       success: "Hesabınız oluşturuldu ve şimdi giriş yaptınız."
@@ -987,14 +1061,15 @@ tr_TR:
       categories_only: "Yalnızca Kategoriler"
       categories_with_featured_topics: "Kategoriler ve Öne Çıkarılan Konular"
       categories_and_latest_topics: "Kategoriler ve Son Konular"
+      categories_and_top_topics: "Kategoriler ve Popüler Konular"
     shortcut_modifier_key:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
     select_kit:
+      default_header_text: Seç...
       no_content: Hiçbir sonuç bulunamadı
       filter_placeholder: Ara...
-      create: "{{content}} oluştur"
     emoji_picker:
       filter_placeholder: Emoji ara
       people: İnsanlar
@@ -1002,11 +1077,19 @@ tr_TR:
       food: Gıda
       activity: Etkinlik
       travel: Seyahat
+      objects: Nesneler
       celebration: Kutlama
+      custom: Özel emojiler
       recent: Son zamanlarda kullanılmış
       default_tone: Cilt rengi yok
       light_tone: Açık cilt tonu
+      medium_light_tone: Orta açık cilt tonu
+      medium_tone: Orta cilt tonu
+      medium_dark_tone: Orta koyu cilt tonu
       dark_tone: Koyu cilt tonu
+    shared_drafts:
+      notice: "Bu konu, yalnızca <b>{{category}}</b> kategorisini görebilen kişiler tarafından görülebilir."
+      destination_category: "Hedef Kategori"
     composer:
       emoji: "Emoji :)"
       more_emoji: "dahası..."
@@ -1023,8 +1106,10 @@ tr_TR:
       saved_local_draft_tip: "yerele kaydedildi"
       similar_topics: "Konunuz şunlara çok benziyor..."
       drafts_offline: "çevrimdışı taslaklar"
+      group_mentioned_limit: "<b>Uyarı!</b> <a href='{{group_link}}'>{{group}}</a>'den bahsettiniz, ancak bu grubun yönetici tarafından yapılandırılmış olan maksimum {{max}} kullanıcıdan bahsetme sınırını aşan daha fazla üyesi var. Kimse haberdar edilmeyecek."
       group_mentioned:
-        other: "{{group}} hakkında konuşarak <a href='{{group_link}}'>{{count}} kişiyi</a> bilgilendirmek üzeresin, emin misin?"
+        one: '{{group}} hakkında konuşarak <a href=''{{group_link}}''>{{count}} kişiyi</a> bilgilendirmek üzeresin, emin misin?'
+        other: '{{group}} hakkında konuşarak <a href=''{{group_link}}''>{{count}} kişiyi</a> bilgilendirmek üzeresin, emin misin?'
       cannot_see_mention:
         category: "{{username}}  adlı kullanıcıdan bahsettiniz fakat Ona bildirim gönderilmeyecek çünkü bu kategoriye ulaşma izni yok. Bunun gerçekleşmesi için kişi bu gruba eklemeniz gerekmektedir."
         private: "{{username}} adlı kullanıcıdan bahsettiniz fakat Ona bildirim gönderilmeyecek çünkü bu kişisel mesaja ulaşma izni yok. Bunun gerçekleşmesi için kişiyi bu PM'ye eklemeniz gerekmektedir."
@@ -1051,7 +1136,10 @@ tr_TR:
       edit_reason_placeholder: "neden düzenleme yapıyorsunuz?"
       show_edit_reason: "(düzenleme sebebi ekle)"
       topic_featured_link_placeholder: "Başlığı olan bir link giriniz."
+      remove_featured_link: "Konudan bağlantıyı kaldır."
       reply_placeholder: "Buraya yazın. Biçimlendirmek için Markdown, BBCode ya da HTML kullanabilirsin. Resimleri sürükleyebilir ya da yapıştırabilirsin."
+      reply_placeholder_no_images: "Buraya yazın. Biçimlendirme için Markdown, BBCode ya da HTML kullanın."
+      reply_placeholder_choose_category: "Buraya yazmadan önce bir kategori seçmelisiniz."
       view_new_post: "Yeni gönderinizi görüntüleyin."
       saving: "Kaydediliyor"
       saved: "Kaydedildi!"
@@ -1082,6 +1170,8 @@ tr_TR:
       ulist_title: "Madde İşaretli Liste"
       list_item: "Liste öğesi"
       help: "Markdown Düzenleme Yardımı"
+      collapse: "yazım alanını küçült"
+      abandon: "yazım alanını kapat ve taslağı sil"
       modal_ok: "Tamam"
       modal_cancel: "İptal"
       cant_send_pm: "Üzgünüz, %{username} kullanıcısına ileti gönderemezsiniz."
@@ -1089,34 +1179,50 @@ tr_TR:
         title: "Alıcıları eklemeyi unuttun mu?"
         body: "Bu ileti şu an sadece sana gönderiliyor!"
       admin_options_title: "Bu konu için isteğe bağlı görevli ayarları"
+      composer_actions:
+        reply_as_private_message:
+          label: Özel Mesaj
+        reply_to_topic:
+          label: Cevapla
     notifications:
+      tooltip:
+        regular:
+          one: '{{count}} görülmemiş bildirim'
+          other: '{{count}} görülmemiş bildirim'
+        message:
+          one: '{{count}} okunmamış ileti'
+          other: '{{count}} okunmamış ileti'
       title: "@isim bahsedilişleri, gönderileriniz ve konularınıza verilen cevaplar, iletilerle vb. ilgili bildiriler"
       none: "Şu an için bildirimler yüklenemiyor."
       empty: "Bildirim yok."
       more: "daha eski bildirimleri görüntüle"
       total_flagged: "toplam bildirilen gönderiler"
-      alt:
-        mentioned: "Bahsedildi, şu kişi tarafından"
-        quoted: "Alıntılandı, şu kişi tarafından"
-        replied: "Cevaplandı"
-        posted: "Gönderildi, şu kişi tarafından"
-        edited: "Gönderiniz düzenlendi, şu kişi tarafından"
-        liked: "Gönderiniz beğenildi"
-        private_message: "Özel ileti, şu kişiden"
-        invited_to_private_message: "Şu kişi tarafından özel iletiyle davet edildiniz"
-        invited_to_topic: "Bir konuya davet edildiniz, şu kişi tarafından"
-        invitee_accepted: "Davet kabul edildi, şu kişi tarafından"
-        moved_post: "Gönderiniz taşındı, şu kişi tarafından"
-        linked: "Gönderinize bağlantı"
-        granted_badge: "Rozet alındı"
-        group_message_summary: "Grup gelen kutusundaki iletiler"
+      mentioned: "<span>{{username}}</span> {{description}}"
+      group_mentioned: "<span>{{username}}</span> {{description}}"
+      quoted: "<span>{{username}}</span> {{description}}"
+      replied: "<span>{{username}}</span> {{description}}"
+      posted: "<span>{{username}}</span> {{description}}"
+      edited: "<span>{{username}}</span> {{description}}"
+      liked: "<span>{{username}}</span> {{description}}"
+      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      liked_many:
+        one: <span>{{username}}, {{username2}} ve {{count}} diğer</span> {{description}}
+        other: <span>{{username}}, {{username2}} ve {{count}} diğer</span> {{description}}
+      private_message: "<span>{{username}}</span> {{description}}"
+      invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
+      invited_to_topic: "<span>{{username}}</span> {{description}}"
+      invitee_accepted: "<span>{{username}}</span> davetinizi kabul etti"
+      moved_post: "<span>{{username}}</span> {{description}} taşıdı"
+      linked: "<span>{{username}}</span> {{description}}"
+      granted_badge: "'{{description}}' kazandı"
+      topic_reminder: "<span>{{username}}</span> {{description}}"
+      watching_first_post: "<span>Yeni Konu</span> {{description}}"
       popup:
         mentioned: '{{username}}, "{{topic}}" başlıklı konuda sizden bahsetti - {{site_title}}'
         group_mentioned: '{{username}} sizden bahsetti "{{topic}}" - {{site_title}}'
         quoted: '{{username}}, "{{topic}}" başlıklı konuda sizden alıntı yaptı - {{site_title}}'
         replied: '{{username}}, "{{topic}}" başlıklı konuda size cevap verdi - {{site_title}}'
         posted: '{{username}}, "{{topic}}" başlıklı konuya yazdı - {{site_title}}'
-        private_message: '{{username}}, "{{topic}}" başlıklı konuda size özel ileti gönderdi - {{site_title}}'
         linked: '{{username}}, "{{topic}}" başlıklı konudaki gönderinize bağlantı yaptı - {{site_title}}'
     upload_selector:
       title: "Resim ekle"
@@ -1132,6 +1238,7 @@ tr_TR:
       uploading: "Yükleniyor"
       select_file: "Dosya seçin"
       image_link: "resminizin yönleneceği bağlantı"
+      default_image_alt_text: resim
     search:
       sort_by: "Sırala"
       relevance: "Alaka"
@@ -1142,12 +1249,21 @@ tr_TR:
       select_all: "Tümünü Seç"
       clear_all: "Tümünü Temizle"
       too_short: "Aradığın terim çok kısa."
+      result_count:
+        one: <span class='term'>{{term}}</span> <span>için 1 sonuç</span>
+        other: <span class='term'>{{term}}</span> için <span>{{count}} {{plus}} sonuç</span>
       title: "konu, gönderi, kullanıcı veya kategori ara"
+      full_page_title: "konu ya da gönderi ara"
       no_results: "Hiç bir sonuç bulunamadı."
       no_more_results: "Başka sonuç yok."
       searching: "Aranıyor..."
       post_format: "{{username}} tarafından #{{post_number}}"
+      results_page: "'{{term}}' için arama sonuçları"
       more_results: "Daha fazla sonuç var. Lütfen arama kriterlerini daraltın."
+      cant_find: "Aradığınızı bulamıyor musunuz?"
+      start_new_topic: "Belki de yeni bir konu oluşturmalısınız?"
+      or_search_google: "Ya da Google'la aramayı deneyin:"
+      search_google: "Google'la aramayı deneyin:"
       search_google_button: "Google"
       search_google_title: "Bu sitede ara"
       context:
@@ -1159,20 +1275,29 @@ tr_TR:
         title: Gelişmiş Arama
         posted_by:
           label: Gönderen
+        in_category:
+          label: Kategorilendirilmiş
         in_group:
           label: Şu Grupta
         with_badge:
           label: Rozetle
+        with_tags:
+          label: Etiketlenmiş
         filters:
           likes: beğendiğim
           posted: gönderide bulunduğum
           watching: gözlediğim
           tracking: takip ettiğim
+          private: İletilerimde
+          bookmarks: İmledim
           first: en ilk gönderidir.
           pinned: tutturulmuş
           unpinned: tutturulmamış
+          seen: Okudum
           unseen: Okumadım
           wiki: wiki olan
+          images: resim(ler)i dahil et
+          all_tags: Yukarıdaki tüm etiketler
         statuses:
           label: Şöyle olan konular
           open: açık
@@ -1215,10 +1340,12 @@ tr_TR:
         notification_level: "Bildirimler"
         choose_new_category: "Konular için yeni bir kategori seçin:"
         selected:
-          other: "<b>{{count}}</b> konu seçtiniz."
+          one: <b>{{count}}</b> konu seçtiniz.
+          other: <b>{{count}}</b> konu seçtiniz.
         change_tags: "Etiketleri Değiştir"
         append_tags: "Etiketleri Ekle"
         choose_new_tags: "Konular için yeni etiketler seçin:"
+        choose_append_tags: "Konulara uygulanacak yeni etiketleri seçin:"
         changed_tags: "Bu konuların etiketleri değiştirildi."
       none:
         unread: "Okunmamış konunuz yok."
@@ -1246,13 +1373,12 @@ tr_TR:
         bookmarks: "Daha fazla imlenmiş konu yok."
         search: "Daha fazla arama sonucu yok."
     topic:
-      unsubscribe:
-        stop_notifications: "Artık <strong>{{title}}</strong> için daha az bildirim alacaksınız."
-        change_notification_state: "Geçerli bildirim durumunuz"
       filter_to:
-        other: "konuda {{count}} tane gönderi var"
+        one: konuda {{count}} tane gönderi var
+        other: konuda {{count}} tane gönderi var
       create: 'Yeni Konu'
       create_long: 'Yeni bir konu oluştur'
+      open_draft: "Taslağı Aç"
       private_message: 'İleti başlat'
       archive_message:
         help: 'İletiyi arşivine taşı'
@@ -1264,8 +1390,10 @@ tr_TR:
       new: 'yeni konu'
       unread: 'okunmamış'
       new_topics:
+        one: '{{count}} yeni konu'
         other: '{{count}} yeni konu'
       unread_topics:
+        one: '{{count}} okunmamış konu'
         other: '{{count}} okunmamış konu'
       title: 'Konu'
       invalid_access:
@@ -1279,46 +1407,79 @@ tr_TR:
         title: "Konu bulunamadı."
         description: "Üzgünüz, bu konuyu bulamadık. Belki de moderatör tarafından kaldırıldı?"
       total_unread_posts:
-        other: "bu konuda {{count}} okunmamış gönderi var"
+        one: bu konuda {{count}} okunmamış gönderi var
+        other: bu konuda {{count}} okunmamış gönderi var
       unread_posts:
-        other: "bu konuda {{count}} tane okunmamış eski gönderi var"
+        one: bu konuda {{count}} tane okunmamış eski gönderi var
+        other: bu konuda {{count}} tane okunmamış eski gönderi var
       new_posts:
-        other: "bu konuda, son okumanızdan bu yana {{count}} yeni gönderi var"
+        one: bu konuda, son okumanızdan bu yana {{count}} yeni gönderi var
+        other: bu konuda, son okumanızdan bu yana {{count}} yeni gönderi var
       likes:
-        other: "bu konuda {{count}} beğeni var"
+        one: bu konuda {{count}} beğeni var
+        other: bu konuda {{count}} beğeni var
       back_to_list: "Konu listesine geri dön"
       options: "Konu Seçenekleri"
       show_links: "Bu konunun içindeki bağlantıları göster. "
       toggle_information: "konu ayrıntılarını aç/kapa"
       read_more_in_category: "Daha fazlası için {{catLink}} kategorisine göz atabilir ya da  {{latestLink}}yebilirsiniz."
       read_more: "Daha fazla okumak mı istiyorsunuz? {{catLink}} ya da {{latestLink}}."
-      read_more_MF: "Kalan { UNREAD, plural, =0 {} one { <a href='/unread'>1 okunmamış</a> } other { <a href='/unread'># okunmamış</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{ve} false {} other{}} <a href='/new'>1 yeni</a> konu} other { {BOTH, select, true{and } false {} other{}} <a href='/new'># yeni</a> konu} } var, veya {CATEGORY, select, true { {catLink}} false {{latestLink}} kategorilerindeki diğer {} konulara göz atabilirsiniz }"
+      read_more_MF: "{ UNREAD, plural, =0 {} one { <a href='/unread'>1 okunmamış mesaj</a> } other { <a href='/unread'># okunmamış mesaj</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{ve} false {} other{}} <a href='/new'>1 yeni</a> konu} other { {BOTH, select, true{ve } false {} other{}} <a href='/new'># yeni</a> konu} } var. {CATEGORY, select, true {{catLink} kategorisine} false {{latestLink}} other {}} göz atabilirsiniz."
       browse_all_categories: Bütün kategorilere göz at
       view_latest_topics: en son konuları görüntüle
-      suggest_create_topic: Konu oluşturmaya ne dersiniz?
+      suggest_create_topic: "Konu oluşturmaya ne dersiniz?"
       jump_reply_up: Daha önceki cevaba geç
       jump_reply_down: Daha sonraki cevaba geç
       deleted: "Konu silindi "
       topic_status_update:
+        title: "Konu Zamanlayıcısı"
+        save: "Zamanlayıcı Ayarla"
+        num_of_hours: "Saat değeri:"
+        remove: "Zamanlayıcıyı Kaldır"
+        publish_to: "Şuraya Yayınla:"
         when: "Ne zaman:"
         public_timer_types: Konu Zamanlayıcıları
         private_timer_types: Kullanıcı Konusu Zamanlayıcılar
       auto_update_input:
         none: "Bir zaman çerçevesi seçin"
+        later_today: "Bugünün sonlarında"
         tomorrow: "Yarın"
+        later_this_week: "Bu haftanın sonlarında"
         this_weekend: "Bu hafta sonu"
         next_week: "Gelecek hafta"
+        two_weeks: "İki Hafta"
         next_month: "Gelecek ay"
+        three_months: "Üç Ay"
+        six_months: "Altı Ay"
         one_year: "Bir Yıl"
         forever: "Sonsuza dek"
         pick_date_and_time: "Tarih ve saat seç"
+        set_based_on_last_post: "Son gönderiye göre kapat"
+      publish_to_category:
+        title: "Yayınlamayı Zamanla"
+      temp_open:
+        title: "Geçici Olarak Aç"
+      auto_reopen:
+        title: "Konuyu Otomatik Aç"
+      temp_close:
+        title: "Geçici Olarak Kapat"
       auto_close:
+        title: "Konuyu Otomatik Kapat"
+        label: "Şu kadar saat sonra konuyu otomatik kapat:"
         error: "Lütfen geçerli bir değer giriniz."
+        based_on_last_post: "Konudaki son gönderi en az bu kadar eski olmadıkça kapatma."
+      auto_delete:
+        title: "Konuyu Otomatik Sil"
       reminder:
         title: "Bana hatırlat"
+      status_update_notice:
+        auto_open: "Bu konu %{timeLeft} otomatik olarak açılacak."
+        auto_close: "Bu konu %{timeLeft} otomatik olarak kapanacak."
+        auto_publish_to_category: "Bu konu %{timeLeft} <a href=%{categoryUrl}>#%{categoryName}</a> kategorisinde yayınlanacak."
       auto_close_title: 'Otomatik Kapatma Ayarları'
       auto_close_immediate:
-        other: "Konudaki son gönderi zaten %{count} saat eski, bu yüzden konu hemen kapatılacak."
+        one: Konudaki son gönderi zaten %{count} saat eski, bu yüzden konu hemen kapatılacak.
+        other: Konudaki son gönderi zaten %{count} saat eski, bu yüzden konu hemen kapatılacak.
       timeline:
         back: "Geri"
         back_description: "Okunmamış son gönderine dön"
@@ -1339,17 +1500,21 @@ tr_TR:
         title: bu konu hakkında ne sıklıkla bildirim alacağını değiştir
         reasons:
           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.'
-          '3_2': 'Bu konuyu gözlediğiniz için bildirimlerini alacaksınız.'
-          '3_1': 'Bu konuyu siz oluşturduğunuz için bildirimlerini alacaksınız.'
-          '3': 'Bu konuyu gözlediğiniz için bildirimlerini alacaksınız.'
-          '1_2': 'Birisi @isminizden bahsederse ya da size cevap verirse bildirim alacaksınız.'
-          '1': 'Birisi @isminizden bahsederse veya size cevap verirse bildirim alacaksınız.'
-          '0_7': 'Bu kategoriye ait tüm bildirimleri görmezden geliyorsunuz.'
-          '0_2': 'Bu konuya ait tüm bildirimleri görmezden geliyorsunuz.'
-          '0': 'Bu konuya ait tüm bildirimleri görmezden geliyorsunuz.'
+          "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.'
+          "3_2": 'Bu konuyu gözlediğiniz için bildirimlerini alacaksınız.'
+          "3_1": 'Bu konuyu siz oluşturduğunuz için bildirimlerini alacaksınız.'
+          "3": 'Bu konuyu gözlediğiniz için bildirimlerini alacaksınız.'
+          "2_8": 'Bu kategoriyi takip ettiğiniz için yeni cevapların sayısını göreceksiniz.'
+          "2_4": 'Bu konuyu yanıtladığınız için yeni cevapların sayısını göreceksiniz.'
+          "2_2": 'Bu konuyu takip ettiğiniz için yeni cevapların sayısını göreceksiniz.'
+          "2": 'Yeni cevapların sayısını göreceksiniz çünkü <a href="/u/{{username}}/preferences">bu konuyu okudunuz</a>.'
+          "1_2": 'Birisi @isminizden bahsederse ya da size cevap verirse bildirim alacaksınız.'
+          "1": 'Birisi @isminizden bahsederse veya size cevap verirse bildirim alacaksınız.'
+          "0_7": 'Bu kategoriye ait tüm bildirimleri görmezden geliyorsunuz.'
+          "0_2": 'Bu konuya ait tüm bildirimleri görmezden geliyorsunuz.'
+          "0": 'Bu konuya ait tüm bildirimleri görmezden geliyorsunuz.'
         watching_pm:
           title: "Gözleniyor"
           description: "Bu iletideki her yeni gönderi için bir bildirim alacaksınız. Okunmamış ve yeni gönderilerin sayısı konunun yanında belirecek."
@@ -1380,6 +1545,7 @@ tr_TR:
         open: "Konuyu Aç"
         close: "Konuyu Kapat"
         multi_select: "Gönderileri Seç..."
+        timed_update: "Konu Zamanlayıcısı"
         pin: "Başa Tuttur..."
         unpin: "Baştan Kaldır..."
         unarchive: "Konuyu Arşivden Kaldır"
@@ -1388,7 +1554,6 @@ tr_TR:
         visible: "Görünür Yap"
         reset_read: "Görüntüleme Verilerini Sıfırla"
         make_public: "Herkese Açık Konu Yap"
-        make_private: "Özel İleti Oluştur"
       feature:
         pin: "Başa Tuttur"
         unpin: "Baştan Kaldır"
@@ -1421,7 +1586,8 @@ tr_TR:
         pin_validation: "Bu konuyu başa tutturmak için bir tarih gerekli."
         not_pinned: " {{categoryLink}} kategorisinde başa tutturulan herhangi bir konu yok."
         already_pinned:
-          other: "Şu an {{categoryLink}} kategorisinde başa tutturulan konular: <strong class='badge badge-notification unread'>{{count}}</strong>."
+          one: 'Şu an {{categoryLink}} kategorisinde başa tutturulan konular: <strong class=''badge badge-notification unread''>{{count}}</strong>.'
+          other: 'Şu an {{categoryLink}} kategorisinde başa tutturulan konular: <strong class=''badge badge-notification unread''>{{count}}</strong>.'
         pin_globally: "Şu zamana kadar bu konunun bütün konu listelerinin başında yer almasını sağla"
         confirm_pin_globally: "Zaten her yerde başa tutturulan {{count}} konunuz var. Çok fazla konuyu başa tutturmak yeni ve anonim kullanıcılara sıkıntı çektirebilir. Bir konuyu daha her yerde başa tutturmak istediğinizden emin misiniz?"
         unpin_globally: "Bu konuyu tüm konu listelerinin en üstünden kaldır."
@@ -1429,7 +1595,8 @@ tr_TR:
         global_pin_note: "Kullanıcılar kendileri için konunun başa tutturulmasını kaldırabilir."
         not_pinned_globally: "Her yerde başa tutturulan herhangi bir konu yok."
         already_pinned_globally:
-          other: "Şu an her yerde başa tutturulan konular: <strong class='badge badge-notification unread'>{{count}}</strong>."
+          one: 'Şu an her yerde başa tutturulan konular: <strong class=''badge badge-notification unread''>{{count}}</strong>.'
+          other: 'Şu an her yerde başa tutturulan konular: <strong class=''badge badge-notification unread''>{{count}}</strong>.'
         make_banner: "Bu konuyu tüm sayfaların en üstünde görünecek şekilde manşetleştir."
         remove_banner: "Tüm sayfaların en üstünde görünen manşeti kaldır."
         banner_note: "Kullanıcılar bu manşeti kapatarak yoksayabilirler. Herhangi bir zamanda sadece bir konu manşetlenebilir."
@@ -1462,10 +1629,12 @@ tr_TR:
         success_email: "<b>{{emailOrUsername}}</b> kullanıcısına davet e-postalandı. Davet kabul edildiğinde size bir bildiri göndereceğiz. Davetlerinizi takip etmek için kullanıcı sayfanızdaki davetler sekmesine göz atın."
         success_username: "Kullanıcıyı bu konuya katılması için davet ettik."
         error: "Üzgünüz, kullanıcıyı davet edemedik. Zaten davet edilmiş olabilir mi? (Davetler oran sınırlarına tabiidir.)"
+        success_existing_email: "<b>{{emailOrUsername}}</b> e-posta adresine sahip bir kullanıcı zaten var. Bu kullanıcıyı bu konuya katılmaya davet ettik."
       login_reply: 'Cevaplamak için oturum açın'
       filters:
         n_posts:
-          other: "{{count}} gönderi"
+          one: '{{count}} gönderi'
+          other: '{{count}} gönderi'
         cancel: "Filteri kaldır"
       split_topic:
         title: "Yeni Konuya Geç"
@@ -1473,13 +1642,15 @@ tr_TR:
         topic_name: "Yeni Konu Adı"
         error: "Gönderiler yeni konuya taşınırken bir hata oluştu."
         instructions:
-          other: "Yeni bir konu oluşturmak ve bu konuyu seçtiğiniz <b>{{count}}</b> gönderi ile doldurmak üzeresiniz."
+          one: Yeni bir konu oluşturmak ve bu konuyu seçtiğiniz <b>{{count}}</b> gönderi ile doldurmak üzeresiniz.
+          other: Yeni bir konu oluşturmak ve bu konuyu seçtiğiniz <b>{{count}}</b> gönderi ile doldurmak üzeresiniz.
       merge_topic:
         title: "Var Olan Bir Konuya Taşı"
         action: "var olan bir konuya taşı"
         error: "Gönderiler konuya aşınırken bir hata oluştu."
         instructions:
-          other: "Lütfen bu <b>{{count}}</b> gönderiyi taşımak istediğiniz konuyu seçin. "
+          one: 'Lütfen bu <b>{{count}}</b> gönderiyi taşımak istediğiniz konuyu seçin. '
+          other: 'Lütfen bu <b>{{count}}</b> gönderiyi taşımak istediğiniz konuyu seçin. '
       merge_posts:
         title: "Seçili Gönderileri Birleştir"
         action: "seçili gönderileri birleştir"
@@ -1491,8 +1662,8 @@ tr_TR:
         label: "Gönderilerin Yeni Sahibi"
         placeholder: "yeni sahibin kullanıcı adı"
         instructions:
-          other: "Lütfen <b>{{old_user}}</b> kullanıcısına ait {{count}} gönderinin yeni sahibini seçin."
-        instructions_warn: "Bu gönderi ile ilgili geriye dönük biriken bildirimler yeni kullanıcıya aktarılmayacak.<br>Uyarı: Şu an, yeni kullanıcıya hiç bir gönderi-tabanlı ek bilgi aktarılmıyor. Dikkatli olun."
+          one: Lütfen <b>{{old_user}}</b> kullanıcısına ait {{count}} gönderinin yeni sahibini seçin.
+          other: Lütfen <b>{{old_user}}</b> kullanıcısına ait {{count}} gönderinin yeni sahibini seçin.
       change_timestamp:
         action: "Zaman Bilgisini Değiştir"
         invalid_timestamp: "Zaman bilgisi gelecekte olamaz."
@@ -1501,15 +1672,16 @@ tr_TR:
       multi_select:
         select: 'seç'
         selected: '({{count}}) seçildi'
+        select_post:
+          label: 'seç'
         delete: seçilenleri sil
         cancel: seçimi iptal et
         select_all: hepsini seç
         deselect_all: tüm seçimi kaldır
         description:
+          one: <b>{{count}}</b> gönderi seçtiniz.
           other: <b>{{count}}</b> gönderi seçtiniz.
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Alıntı"
       edit_reason: "Neden: "
       post_number: "gönderi {{number}}"
@@ -1522,20 +1694,27 @@ tr_TR:
       show_full: "Gönderinin Tamamını Göster"
       show_hidden: 'Gizlenmiş içeriği görüntüle.'
       deleted_by_author:
-        other: "(yazarı tarafından geri alınan gönderi, bildirilmediği takdirde %{count} saat içinde otomatik olarak silinecek.)"
-      expand_collapse: "aç/kapat"
+        one: (yazarı tarafından geri alınan gönderi, bildirilmediği takdirde %{count} saat içinde otomatik olarak silinecek.)
+        other: (yazarı tarafından geri alınan gönderi, bildirilmediği takdirde %{count} saat içinde otomatik olarak silinecek.)
+      collapse: "daralt"
+      expand_collapse: "genişlet/daralt"
       gap:
-        other: "gizlenen {{count}} yorumu gör"
+        one: gizlenen {{count}} yorumu gör
+        other: gizlenen {{count}} yorumu gör
       unread: "Gönderi okunmamış"
       has_replies:
-        other: "{{count}} Cevap"
+        one: '{{count}} Cevap'
+        other: '{{count}} Cevap'
       has_likes:
-        other: "{{count}} Beğeni"
+        one: '{{count}} Beğeni'
+        other: '{{count}} Beğeni'
       has_likes_title:
-        other: "{{count}} kişi bu gönderiyi beğendi"
+        one: '{{count}} kişi bu gönderiyi beğendi'
+        other: '{{count}} kişi bu gönderiyi beğendi'
       has_likes_title_only_you: "bu gönderiyi beğendiniz"
       has_likes_title_you:
-        other: "siz ve {{count}} diğer kişi bu gönderiyi beğendi"
+        one: siz ve {{count}} diğer kişi bu gönderiyi beğendi
+        other: siz ve {{count}} diğer kişi bu gönderiyi beğendi
       errors:
         create: "Üzgünüz, gönderiniz oluşturulurken bir hata oluştu. Lütfen tekrar deneyin."
         edit: "Üzgünüz, gönderiniz düzenlenirken bir hata oluştu. Lütfen tekrar deneyin. "
@@ -1582,6 +1761,9 @@ tr_TR:
         change_owner: "Sahipliğini Değiştir"
       actions:
         flag: 'Bildir'
+        defer_flags:
+          one: Bildirimi yoksay
+          other: Bildirimleri yoksay
         undo:
           off_topic: "Bildirimi geri al"
           spam: "Bildirimi geri al"
@@ -1609,38 +1791,54 @@ tr_TR:
           vote: "Bu gönderiyi oyladınız"
         by_you_and_others:
           off_topic:
-            other: "Siz ve {{count}} diğer kişi bunu konu dışı olarak bildirdi"
+            one: Siz ve {{count}} diğer kişi bunu konu dışı olarak bildirdi
+            other: Siz ve {{count}} diğer kişi bunu konu dışı olarak bildirdi
           spam:
-            other: "Siz ve {{count}} diğer kişi bunu istenmeyen olarak bildirdi"
+            one: Siz ve {{count}} diğer kişi bunu istenmeyen olarak bildirdi
+            other: Siz ve {{count}} diğer kişi bunu istenmeyen olarak bildirdi
           inappropriate:
-            other: "Siz ve {{count}} diğer kişi bunu uygunsuz olarak bildirdi"
+            one: Siz ve {{count}} diğer kişi bunu uygunsuz olarak bildirdi
+            other: Siz ve {{count}} diğer kişi bunu uygunsuz olarak bildirdi
           notify_moderators:
-            other: "Siz ve {{count}} diğer kişi bunu denetlenmesi için bildirdi"
+            one: Siz ve {{count}} diğer kişi bunu denetlenmesi için bildirdi
+            other: Siz ve {{count}} diğer kişi bunu denetlenmesi için bildirdi
           notify_user:
-            other: "Siz ve {{count}} diğer kişi bu kullanıcıya ileti yolladı"
+            one: Siz ve {{count}} diğer kişi bu kullanıcıya ileti yolladı
+            other: Siz ve {{count}} diğer kişi bu kullanıcıya ileti yolladı
           bookmark:
-            other: "Siz ve {{count}} diğer kişi bu gönderiyi imledi"
+            one: Siz ve {{count}} diğer kişi bu gönderiyi imledi
+            other: Siz ve {{count}} diğer kişi bu gönderiyi imledi
           like:
-            other: "Siz ve {{count}} başka kişi bunu beğendi"
+            one: Siz ve {{count}} başka kişi bunu beğendi
+            other: Siz ve {{count}} başka kişi bunu beğendi
           vote:
-            other: "Siz ve {{count}} kişi bu gönderiyi oyladı"
+            one: Siz ve {{count}} kişi bu gönderiyi oyladı
+            other: Siz ve {{count}} kişi bu gönderiyi oyladı
         by_others:
           off_topic:
-            other: "{{count}} kişi bunu konu dışı olarak bildirdi"
+            one: '{{count}} kişi bunu konu dışı olarak bildirdi'
+            other: '{{count}} kişi bunu konu dışı olarak bildirdi'
           spam:
-            other: "{{count}} kişi bunu istenmeyen olarak bildirdi"
+            one: '{{count}} kişi bunu istenmeyen olarak bildirdi'
+            other: '{{count}} kişi bunu istenmeyen olarak bildirdi'
           inappropriate:
-            other: "{{count}} kişi bunu uygunsuz olarak bildirdi"
+            one: '{{count}} kişi bunu uygunsuz olarak bildirdi'
+            other: '{{count}} kişi bunu uygunsuz olarak bildirdi'
           notify_moderators:
-            other: "{{count}} kişi bunu moderasyon için bildirdi"
+            one: '{{count}} kişi bunu moderasyon için bildirdi'
+            other: '{{count}} kişi bunu moderasyon için bildirdi'
           notify_user:
-            other: "{{count}} bu kullanıcıya ileti yolladı"
+            one: '{{count}} bu kullanıcıya ileti yolladı'
+            other: '{{count}} bu kullanıcıya ileti yolladı'
           bookmark:
-            other: "{{count}} kişi bu gönderiyi imledi"
+            one: '{{count}} kişi bu gönderiyi imledi'
+            other: '{{count}} kişi bu gönderiyi imledi'
           like:
-            other: "{{count}} kişi bunu beğendi"
+            one: '{{count}} kişi bunu beğendi'
+            other: '{{count}} kişi bunu beğendi'
           vote:
-            other: "{{count}} kişi bu gönderiyi oyladı"
+            one: '{{count}} kişi bu gönderiyi oyladı'
+            other: '{{count}} kişi bu gönderiyi oyladı'
       revisions:
         controls:
           first: "İlk revizyon"
@@ -1679,6 +1877,8 @@ tr_TR:
       settings: 'Ayarlar'
       topic_template: "Konu Şablonu"
       tags: "Etiketler"
+      tags_allowed_tags: "Bu kategoride yalnızca bu etiketlerin kullanılmasına izin ver:"
+      tags_allowed_tag_groups: "Yalnızca şu gruplardaki etiketlerin bu kategoride kullanılmasına izin ver:"
       tags_placeholder: "(Seçmeli) izin verilen etiketlerin listesi"
       tag_groups_placeholder: "(Seçmeli) izin verilen etiket gruplarının listesi"
       topic_featured_link_allowed: " Featured link'lere bu kategoride izin ver"
@@ -1713,7 +1913,6 @@ tr_TR:
       email_in_allow_strangers: "Hesabı olmayan, anonim kullanıcılardan e-posta kabul et"
       email_in_disabled: "E-posta üzerinden yeni konu oluşturma özelliği Site Ayarları'nda devre dışı bırakılmış. E-posta üzerinden yeni konu oluşturma özelliğini etkinleştirmek için,"
       email_in_disabled_click: '"e-postala" ayarını etkinleştir'
-      suppress_from_homepage: "Bu kategoriyi ana sayfadan gizle"
       all_topics_wiki: "Yeni konuyu varsayılan olarak wiki yap"
       allow_badges_label: "Bu kategoride rozet verilmesine izin ver"
       edit_permissions: "İzinleri Düzenle"
@@ -1775,11 +1974,14 @@ tr_TR:
       custom_placeholder_notify_moderators: "Sizi neyin endişelendirdiğini açıklayıcı bir dille bize bildirin ve mümkün olan yerlerde konu ile alakalı bağlantıları paylaşın."
       custom_message:
         at_least:
-          other: "en azından {{count}} karakter girin"
+          one: en azından {{count}} karakter girin
+          other: en azından {{count}} karakter girin
         more:
-          other: "{{count}} daha..."
+          one: '{{count}} daha...'
+          other: '{{count}} daha...'
         left:
-          other: "{{count}} kaldı"
+          one: '{{count}} kaldı'
+          other: '{{count}} kaldı'
     flagging_topic:
       title: "Topluluğumuzun düzenli kalmasına desteğiniz için teşekkürler!"
       action: "Konuyu Bildir"
@@ -1790,11 +1992,13 @@ tr_TR:
       links_title: "Gözde Bağlantılar"
       links_shown: "daha fazla bağlantı göster..."
       clicks:
-        other: "%{count} tıklama"
+        one: '%{count} tıklama'
+        other: '%{count} tıklama'
     post_links:
       about: "bu gönderi için daha fazla bağlantı koy"
       title:
-        other: "%{count} daha"
+        one: '%{count} daha'
+        other: '%{count} daha'
     topic_statuses:
       warning:
         help: "Bu resmi bir uyarıdır."
@@ -1828,18 +2032,22 @@ tr_TR:
     original_post: "Özgün Gönderi"
     views: "Gösterim"
     views_lowercase:
-      other: "gösterim"
+      one: gösterim
+      other: gösterim
     replies: "Cevap"
     views_long:
-      other: "bu konu {{number}} defa görüntülendi"
+      one: bu konu {{number}} defa görüntülendi
+      other: bu konu {{number}} defa görüntülendi
     activity: "Etkinlik"
     likes: "Beğeni"
     likes_lowercase:
-      other: "beğeni"
+      one: beğeni
+      other: beğeni
     likes_long: "bu konuda {{number}} beğeni var"
     users: "Kullanıcı"
     users_lowercase:
-      other: "kullanıcı"
+      one: kullanıcı
+      other: kullanıcı
     category_title: "Kategori"
     history: "Geçmiş"
     changed_by: "Yazan {{author}}"
@@ -1852,7 +2060,8 @@ tr_TR:
       latest:
         title: "En son"
         title_with_count:
-          other: "En Son ({{count}})"
+          one: En Son ({{count}})
+          other: En Son ({{count}})
         help: "yakın zamanda gönderi alan konular"
       hot:
         title: "Sıcak"
@@ -1870,17 +2079,21 @@ tr_TR:
       unread:
         title: "Okunmamış"
         title_with_count:
-          other: "Okunmamış ({{count}})"
+          one: Okunmamış ({{count}})
+          other: Okunmamış ({{count}})
         help: "okunmamış gönderiler bulunan gözlediğiniz ya da takip ettiğiniz konular"
         lower_title_with_count:
-          other: "{{count}} okunmamış"
+          one: '{{count}} okunmamış'
+          other: '{{count}} okunmamış'
       new:
         lower_title_with_count:
-          other: "{{count}} yeni"
+          one: '{{count}} yeni'
+          other: '{{count}} yeni'
         lower_title: "yeni"
         title: "Yeni"
         title_with_count:
-          other: "Yeni ({{count}}) "
+          one: 'Yeni ({{count}}) '
+          other: 'Yeni ({{count}}) '
         help: "son birkaç günde oluşturulmuş konular"
       posted:
         title: "Gönderilerim"
@@ -1891,7 +2104,8 @@ tr_TR:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          other: "{{categoryName}} ({{count}})"
+          one: '{{categoryName}} ({{count}})'
+          other: '{{categoryName}} ({{count}})'
         help: "{{categoryName}} kategorisindeki en son konular"
       top:
         title: "Gözde"
@@ -1975,18 +2189,22 @@ tr_TR:
         print: '<b>ctrl</b>+<b>p</b> Konuyu yazdır'
     badges:
       earned_n_times:
-        other: "Bu rozet %{count} defa kazanılmış"
+        one: Bu rozet %{count} defa kazanılmış
+        other: Bu rozet %{count} defa kazanılmış
       granted_on: "%{date} tarihinde verildi"
       others_count: "Bu rozete sahip diğer kişiler (%{count})"
       title: Rozetler
       badge_count:
-        other: "%{count} Rozet"
+        one: '%{count} Rozet'
+        other: '%{count} Rozet'
       more_badges:
-        other: "+%{count} Daha"
+        one: +%{count} Daha
+        other: +%{count} Daha
       granted:
-        other: "%{count} izin verildi"
+        one: '%{count} izin verildi'
+        other: '%{count} izin verildi'
       select_badge_for_title: Başlık yazısı olarak kullanılacak bir rozet seçin
-      none: "<none>"
+      none: "(hiçbiri)"
       badge_grouping:
         getting_started:
           name: Başlangıç
@@ -2009,11 +2227,14 @@ tr_TR:
       </p>
     tagging:
       all_tags: "Tüm Etiketler"
+      other_tags: "Diğer Etiketler"
       selector_all_tags: "tüm etiketler"
       selector_no_tags: "etiket yok"
       changed: "değişen etiketler:"
       tags: "Etiketler"
+      choose_for_topic: "opsiyonel etiketler"
       delete_tag: "Etiketi Sil"
+      delete_confirm_no_topics: "Bu etiketi silmek istediğinize emin misiniz?"
       rename_tag: "Etiketi Yeniden Adlandır"
       rename_instructions: "Bu etiket için yeni bir ad seçin:"
       sort_by: "Sırala:"
@@ -2029,19 +2250,15 @@ tr_TR:
       notifications:
         watching:
           title: "Gözleniyor"
-          description: "Bu etiketteki tüm konuları gözleyeceksiniz. Tüm yeni gönderi ve konulardan haberdar olabilecek ve yeni gönderi sayısını da konunun yanında görebileceksiniz."
         watching_first_post:
           title: "İlk gönderi gözlemeniz"
-          description: "Bu etikette bulunan tüm konuların sadece ilk gönderilerinde bildirim alacaksınız."
         tracking:
           title: "Takip ediliyor"
-          description: "Bu etiketteki tüm konuları otomatik olarak takip ediyor olacaksınız. Okunmamış yeni gönderilerin bir kısmı konunun yanında görünecektir."
         regular:
           title: "Müdavim"
           description: "Birisi @isminizden bahsederse veya gönderinize cevap verirse bildirim alacaksınız."
         muted:
           title: "Susturuldu"
-          description: "Bu etikette beliren yeni konular hakkında bildirim almayacaksınız ve bunlar okunmamışlar sekmesinde belirmeyecek."
       groups:
         title: "Etiket Grupları"
         about: "Konuları kolayca yönetmek için onlara etiket ekleyiniz."
@@ -2123,8 +2340,6 @@ tr_TR:
         reports:
           today: "Bugün"
           yesterday: "Dün"
-          last_7_days: "Son 7 Gün"
-          last_30_days: "Son 30 Gün"
           all_time: "Tüm Zamanlar"
           7_days_ago: "7 Gün Önce"
           30_days_ago: "30 Gün Önce"
@@ -2142,8 +2357,6 @@ tr_TR:
         title: "Bildirilenler"
         agree: "Onayla"
         agree_title: "Bu bildirimi geçerli ve doğru olarak onayla"
-        defer_flag: "Yoksay"
-        defer_flag_title: "Bu bildirimi kaldır; şu an için bir şey yapmak gerekmiyor."
         delete: "Sil"
         delete_title: "Bu bildirimin ait olduğu gönderiyi sil."
         delete_post_defer_flag_title: "Gönderiyi sil; başka gönderi yoksa, konuyu da sil."
@@ -2184,13 +2397,18 @@ tr_TR:
           notify_user: "özel"
           notify_moderators: "özel"
       groups:
+        manage:
+          interaction:
+            visibility_levels:
+              members: "Grup sahipleri, üyeler ve yöneticiler"
+              owners: "Grup sahipleri ve yöneticiler"
+          membership:
+            trust_levels_none: "Hiçbiri"
         primary: "Ana Grup"
         no_primary: "(ana grup yok)"
         title: "Grup"
         edit: "Grupları Düzenle"
         refresh: "Yenile"
-        new: "Yeni"
-        selector_placeholder: "kullanıcı adı girin"
         about: "Grup üyeliğinizi ve isimleri burada düzenleyin"
         group_members: "Grup üyeleri"
         delete: "Sil"
@@ -2198,21 +2416,10 @@ tr_TR:
         delete_failed: "Grup silinemedi. Bu otomatik oluşturulmuş bir grup ise, yok edilemez."
         delete_owner_confirm: "'%{username}' için sahiplik izni kaldırılsın mı?"
         add: "Ekle"
-        add_members: "Üye ekle"
         custom: "Özel"
-        bulk_complete: "Kullanıcılar gruba eklendi."
-        bulk: "Topluca Gruba Ekle"
-        bulk_paste: "Kullanıcı adı ya da e-posta listesini yapıştırın, her satıra bir tane gelecek şekilde:"
-        bulk_select: "(bir grup seçin)"
         automatic: "Otomatik"
-        automatic_membership_email_domains: "Bu listedeki bir e-posta alan adıyla kaydolan kullanıcılar otomatik olarak bu gruba eklenecekler:"
-        automatic_membership_retroactive: "Varolan kayıtlı kullanıcıları eklemek için aynı e-posta alan adı kuralını uygula"
-        default_title: "Bu gruptaki tüm kullanıcılar için öntanımlı başlık"
-        primary_group: "Otomatik olarak ana grup yap"
         group_owners: Sahipler
         add_owners: Sahiplik ekle
-        incoming_email: "Özel gelen e-posta adresi"
-        incoming_email_placeholder: "e-posta adresi girin"
       api:
         generate_master: "Ana API Anahtarı Üret"
         none: "Şu an etkin API anahtarı bulunmuyor."
@@ -2275,9 +2482,11 @@ tr_TR:
           none: "İlgili bir olay yok."
           redeliver: "Yeniden ilet"
           incoming:
-            other: "Şu anda {{count}} yeni olay var."
+            one: Şu anda {{count}} yeni olay var.
+            other: Şu anda {{count}} yeni olay var.
           completed_in:
-            other: "{{count}} saniyede tamamlandı."
+            one: '{{count}} saniyede tamamlandı.'
+            other: '{{count}} saniyede tamamlandı.'
           request: "İstek"
           response: "Yanıt"
           redeliver_confirm: "Aynı veri yükünü tekrar iletmek istediğinize emin misiniz?"
@@ -2305,6 +2514,7 @@ tr_TR:
         change_settings: "Ayarları Değiştir"
         change_settings_short: "Ayarlar"
         howto: "Nasıl eklenti yükleyebilirim?"
+        official: "Resmi eklenti"
       backups:
         title: "Yedekler"
         menu:
@@ -2328,7 +2538,6 @@ tr_TR:
           label: "Yedek Yükle"
           title: "Bu oluşuma bir yedek yükle"
           uploading: "Yükleniyor..."
-          success: "'{{filename}}' başarıyla yüklendi."
           error: "'{{filename}}': {{message}} yüklenirken bir hata oluştu"
         operations:
           is_running: "İşlem devam ediyor..."
@@ -2341,7 +2550,6 @@ tr_TR:
             label: "Yedek Oluştur"
             title: "Yedek oluştur"
             confirm: "Yeni bir yedekleme başlatmak istiyor musunuz?"
-            without_uploads: "Evet (dosya eklemeyin)"
           download:
             label: "İndir"
           destroy:
@@ -2385,6 +2593,8 @@ tr_TR:
         color: "Renk"
         opacity: "Opaklık"
         copy: "Kopyala"
+        copy_to_clipboard: "Kopyala"
+        copied_to_clipboard: "Kopyalandı"
         email_templates:
           title: "E-posta Şablonları"
           subject: "Konu"
@@ -2589,6 +2799,7 @@ tr_TR:
             change_readonly_mode: "Salt-okunur modunu değiştir"
             backup_download: "yedeği yükle"
             backup_destroy: "yedeği sil"
+            disabled_second_factor: "İki Faktör Kimlik Doğrulaması devre dışı bırakıldı"
         screened_emails:
           title: "Taranmış E-postalar"
           description: "Biri yeni bir hesap oluşturmaya çalıştığında, aşağıdaki e-posta adresleri kontrol edilecek ve kayıt önlenecek veya başka bir eylem gerçekleşecek."
@@ -2619,16 +2830,31 @@ tr_TR:
           roll_up:
             text: "Topla"
             title: "En az 'min_ban_entries_for_roll_up' adet giriş olduğu takdirde yeni subnet engelleme girişleri yaratır."
+        search_logs:
+          searches: "Aramalar"
+          click_through: "Buraya tıklayın"
+          unique: "Benzersiz"
+          types:
+            all_search_types: "Tüm arama türleri"
+            header: "Üst kısım"
+            full_page: "Tam Sayfa"
         logster:
           title: "Hata Kayıtları"
       watched_words:
         search: "ara"
         clear_filter: "Temizle"
+        show_words: "kelimeleri göster"
+        word_count:
+          one: 1 kelime
+          other: '%{count} kelimeler'
         actions:
+          censor: 'Sansür'
+          require_approval: 'Onay gerektir'
           flag: 'Bildir'
         form:
           label: 'Yeni Kelime: '
           add: 'Ekle'
+          success: 'Başarılı'
           upload: "Yükle"
           upload_successful: "Yükleme başarılı oldu. Kelimeler eklendi."
       impersonate:
@@ -2650,12 +2876,15 @@ tr_TR:
           pending: "Bekleyen"
           staff: 'Görevli'
           suspended: 'Uzaklaştırılmış'
+          silenced: 'Susturuldu'
           suspect: 'Kuşkulanılan'
         approved: "Onaylanmış mı?"
         approved_selected:
-          other: "({{count}}) kullanıcıyı  onayla "
+          one: '({{count}}) kullanıcıyı  onayla '
+          other: '({{count}}) kullanıcıyı  onayla '
         reject_selected:
-          other: "({{count}}) kullanıcıyı reddet"
+          one: ({{count}}) kullanıcıyı reddet
+          other: ({{count}}) kullanıcıyı reddet
         titles:
           active: 'Etkin Kullanıcılar'
           new: 'Yeni Kullanıcılar'
@@ -2668,12 +2897,15 @@ tr_TR:
           staff: "Görevli"
           admins: 'Yöneticiler'
           moderators: 'Moderatörler'
+          silenced: 'Susturulmuş Kullanıcılar'
           suspended: 'Uzaklaştırılmış Kullanıcılar'
           suspect: 'Kuşkulanılan Kullanıcılar'
         reject_successful:
-          other: "Başarıyla reddedilmiş %{count}  kullanıcı."
+          one: Başarıyla reddedilmiş %{count}  kullanıcı.
+          other: Başarıyla reddedilmiş %{count}  kullanıcı.
         reject_failures:
-          other: "Reddedilemeyen %{count}  kullanıcı."
+          one: Reddedilemeyen %{count}  kullanıcı.
+          other: Reddedilemeyen %{count}  kullanıcı.
         not_verified: "Onaylanmayan"
         check_email:
           title: "Bu kullanıcının e-posta adresini ortaya çıkar"
@@ -2687,9 +2919,23 @@ tr_TR:
         suspend_reason_placeholder: "Askıya alma sebebi"
         suspend_message: "E Posta Mesajı"
         suspended_by: "Uzaklaştıran"
+        silence_reason: "Neden"
+        silenced_by: "Tarafından susturuldu"
+        silence_modal_title: "Kullanıcıyı Sustur"
+        silence_duration: "Kullanıcı ne kadar uzun bir süre için susturulacak?"
+        silence_reason_label: "Neden bu kullanıcıyı susturuyorsunuz?"
+        silence_reason_placeholder: "Susturulma sebebi"
+        silence_message: "E-posta Mesajı"
+        silence_message_placeholder: "(varsayılan mesajı göndermek için boş bırakın)"
         cant_suspend: "Bu kullanıcı askıya alınamaz."
         delete_all_posts: "Tüm gönderileri sil"
+        penalty_post_delete: "Gönderiyi sil"
+        penalty_post_edit: "Gönderiyi düzenle"
+        penalty_post_none: "Hiçbir şey yapma"
         delete_all_posts_confirm_MF: "{POSTS, plural, one {1 gönderi} other {# gönderi}} ve {TOPICS, plural, one {1 konu} other {# konu}} silmek üzeresiniz. Emin misiniz?"
+        silence: "Sustur"
+        unsilence: "Susturma"
+        silenced: "Susturuldu?"
         moderator: "Moderatör mü?"
         admin: "Yönetici mi?"
         suspended: "Uzaklaştırıldı mı?"
@@ -2705,10 +2951,12 @@ tr_TR:
         logged_out: "Kullanıcının tüm cihazlarda oturumu kapatılmış"
         revoke_admin: 'Yöneticiliğini İptal Et'
         grant_admin: 'Yönetici Yetkisi Ver'
+        grant_admin_confirm: "Yeni yöneticiyi onaylamanız için size bir e-posta gönderdik. Lütfen onaylama talimatlarını uygulayınız."
         revoke_moderation: 'Moderasyonu İptal Et'
         grant_moderation: 'Moderasyon Yetkisi Ver'
         unsuspend: 'Uzaklaştırmayı geri al'
         suspend: 'Uzaklaştır'
+        show_flags_received: "Alınan Bildirimleri Göster"
         reputation: İtibar
         permissions: İzinler
         activity: Etkinlik
@@ -2717,6 +2965,7 @@ tr_TR:
         private_topics_count: Özel Konular
         posts_read_count: Okuduğu Gönderiler
         post_count: Oluşturduğu Gönderiler
+        second_factor_enabled: İki Faktörlü Kimlik Doğrulama etkinleştirildi
         topics_entered: Görüntülediği Konular
         flags_given_count: Yapılan Bildirimler
         flags_received_count: Alınan Bildirimler
@@ -2735,14 +2984,18 @@ tr_TR:
         delete_forbidden_because_staff: "Yöneticiler ve moderatörler silinemez."
         delete_posts_forbidden_because_staff: "Yöneticiler ve moderatörlerin tüm gönderileri silinemez."
         delete_forbidden:
-          other: "Gönderisi olan kullanıcılar silinemez. Kullanıcıyı silmeden önce tüm gönderilerini silin. (%{count} günden eski gönderiler silinemez.)"
+          one: Gönderisi olan kullanıcılar silinemez. Kullanıcıyı silmeden önce tüm gönderilerini silin. (%{count} günden eski gönderiler silinemez.)
+          other: Gönderisi olan kullanıcılar silinemez. Kullanıcıyı silmeden önce tüm gönderilerini silin. (%{count} günden eski gönderiler silinemez.)
         cant_delete_all_posts:
-          other: "Tüm gönderileri silemezsiniz. Bazı gönderiler %{count} günden daha eski.  (delete_user_max_post_age ayarı.)"
+          one: Tüm gönderileri silemezsiniz. Bazı gönderiler %{count} günden daha eski.  (delete_user_max_post_age ayarı.)
+          other: Tüm gönderileri silemezsiniz. Bazı gönderiler %{count} günden daha eski.  (delete_user_max_post_age ayarı.)
         cant_delete_all_too_many_posts:
-          other: "Tüm gönderileri silemezsiniz çünkü kullanıcının %{count} 'ten daha fazla gönderisi var. (delete_all_posts_max)"
+          one: Tüm gönderileri silemezsiniz çünkü kullanıcının %{count} 'ten daha fazla gönderisi var. (delete_all_posts_max)
+          other: Tüm gönderileri silemezsiniz çünkü kullanıcının %{count} 'ten daha fazla gönderisi var. (delete_all_posts_max)
         delete_confirm: "Bu kullanıcıyı silmek istediğinize EMİN misiniz? Bu işlem geri alınamaz!"
         delete_and_block: "Sil ve bu e-posta ve IP adresini <b>engelle</b>"
         delete_dont_block: "Sadece sil"
+        deleting_user: "Kullanıcı siliniyor..."
         deleted: "Kullanıcı silinmiş."
         delete_failed: "Kullanıcı silinirken bir hata oluştu. Kullanıcıyı silmeye çalışmadan önce tüm gönderilerin silindiğinden emin olun. "
         send_activation_email: "Etkinleştirme E-postası Gönder"
@@ -2752,6 +3005,10 @@ tr_TR:
         activate_failed: "Kullanıcı etkinleştirilirken bir sorun yaşandı."
         deactivate_account: "Hesabı Pasifleştir"
         deactivate_failed: "Kullanıcı deaktive edilirken bir sorun yaşandı."
+        unsilence_failed: 'Kullanıcının susturulması kaldırılırken bir sorun yaşandı.'
+        silence_failed: 'Kullanıcı susturulurken bir sorun yaşandı.'
+        silence_confirm: 'Bu kullanıcıyı susturmak istediğinize emin misiniz? Bunu yaparsanız yeni başlık ya da gönderi oluşturamayacak.'
+        silence_accept: 'Evet, bu kullanıcıyı sustur'
         bounce_score: "Geri Sekme Skoru"
         reset_bounce_score:
           label: "Sıfırla"
@@ -2759,6 +3016,7 @@ tr_TR:
         visit_profile: "Profilini güncellemek için <a href='%{url}'>kullanıcı tercihleri sayfası</a> 'nı ziyaret edebilirsin"
         deactivate_explanation: "Deaktive edilmiş bir kullanıcı e-postasını tekrar doğrulamalı."
         suspended_explanation: "Uzaklaştırılmış kullanıcılar sistemde oturum açamaz."
+        silence_explanation: "Susturulmuş bir kullanıcı gönderi oluşturamaz veya konu başlatamaz."
         staged_explanation: "Aşamalı bir kullanıcı sadece belirli konularda e-posta ile gönderide bulunabilir."
         bounce_score_explanation:
           none: "Bu e-posta adresinden yakın zamanda hiç geri sekme alınmadı."
@@ -2775,7 +3033,8 @@ tr_TR:
         tl3_requirements:
           title: "Güven Seviyesi 3 için Gerekenler"
           table_title:
-            other: "Son %{count} günde:"
+            one: 'Son %{count} günde:'
+            other: 'Son %{count} günde:'
           value_heading: "Değer"
           requirement_heading: "Gereksinim"
           visits: "Ziyaretler"
@@ -2791,6 +3050,8 @@ tr_TR:
           likes_received: "Alınan Beğeniler"
           likes_received_days: "Alınan beğeniler: tekil günlük"
           likes_received_users: "Alınan beğeniler: tekil kullanıcı"
+          suspended: "Askıya alındı ​​(tüm zamanlar)"
+          silenced: "Susturuldu (her zaman)"
           qualifies: "Güven seviyesi 3 için yeterli."
           does_not_qualify: "Güven seviyesi 3 için yeterli değil."
           will_be_promoted: "Yakinda terfi ettirilecek."
@@ -2849,11 +3110,12 @@ tr_TR:
         go_back: "Aramaya geri dön"
         recommended: "İzleyen metni ihtiyaçlarınıza uygun şekilde özelleştirmenizi öneririz:"
         show_overriden: 'Sadece değiştirdiklerimi göster'
-      site_settings:
+      settings:
         show_overriden: 'Sadece değiştirdiklerimi göster'
-        title: 'Ayarlar'
         reset: 'sıfırla'
-        none: 'Hiçbiri'
+        none: 'hiçbiri'
+      site_settings:
+        title: 'Ayarlar'
         no_results: "Hiç sonuç bulunamadı."
         clear_filter: "Temizle"
         add_url: "URL ekle"
@@ -2875,6 +3137,7 @@ tr_TR:
           developer: 'Geliştirici'
           embedding: "Yerleştirme"
           legal: "Yasal"
+          api: 'API'
           user_api: 'Kullanıcı APIsi'
           uncategorized: 'Diğer'
           backups: "Yedekler"
@@ -2902,11 +3165,11 @@ tr_TR:
         reason_help: (Bir gönderi ya da konuya bağlantı)
         save: Kaydet
         delete: Sil
-        delete_confirm: Bu rozeti silmek istediğinize emin misiniz?
+        delete_confirm: "Bu rozeti silmek istediğinize emin misiniz?"
         revoke: İptal Et
         reason: Neden
         expand: Genişlet &hellip;
-        revoke_confirm: Bu rozeti iptal etmek istediğinize emin misiniz?
+        revoke_confirm: "Bu rozeti iptal etmek istediğinize emin misiniz?"
         edit_badges: Rozetleri Düzenle
         grant_badge: Rozet Ver
         granted_badges: Verilen Rozetler
@@ -2920,7 +3183,6 @@ tr_TR:
         enabled: Rozeti etkinleştir
         icon: İkon
         image: Görsel
-        icon_help: "Font Awesome sınıfı veya görsel URL'i kullanın"
         query: Rozet Sorgusu (SQL)
         target_posts: Sorgu gönderileri hedefliyor
         auto_revoke: Geri alma sorgusunu her gün çalıştır.
@@ -2944,13 +3206,14 @@ tr_TR:
             text: "Bazı veriliş örnekleri bulunamıyor. Bu durum, rozet sorgusundan varolmayan kullanıcı IDsi veya gönderi IDsi dönünce gerçekleşir. İleride beklenmedik sonuçlara sebep olabilir - lütfen sorgunuzu tekrar kontrol edin."
           no_grant_count: "Verilecek rozet bulunmuyor."
           grant_count:
-            other: "<b>%{count}</b> rozet verilecek."
+            one: <b>%{count}</b> rozet verilecek.
+            other: <b>%{count}</b> rozet verilecek.
           sample: "Örnek:"
           grant:
-            with: <span class="username">%{username}</span>
-            with_post: '<span class="username">%{username}</span> buradaki gönderi için %{link} '
-            with_post_time: <span class="username">%{username}</span> %{link} gönderisi için <span class="time">%{time}</span> zamanında
-            with_time: <span class="username">%{username}</span>, <span class="time">%{time}</span>
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span> buradaki gönderi için %{link} "
+            with_post_time: "<span class=\"username\">%{username}</span> %{link} gönderisi için <span class=\"time\">%{time}</span> zamanında"
+            with_time: "<span class=\"username\">%{username}</span>, <span class=\"time\">%{time}</span>"
       emoji:
         title: "Emoji"
         help: "Herkese açık yeni bir emoji ekle. (PROTIP: birden çok dosyayı tek seferde sürükleyip bırakabilirsiniz)"
@@ -2984,6 +3247,7 @@ tr_TR:
         embed_classname_whitelist: "İzin verilen CSS sınıf isimleri"
         feed_polling_enabled: "Konuları RSS/ATOM aracılığıyla içe aktar"
         feed_polling_url: "İstila etmek için RSS/ATOM beslemesi URL'i"
+        feed_polling_frequency_mins: "Besleme yoklama sıklığı (dakika cinsinden)"
         save: "Gömme Ayarlarını Kaydet"
       permalink:
         title: "Kalıcı Bağlantılar"
@@ -2995,7 +3259,7 @@ tr_TR:
         category_id: "Kategori ID"
         category_title: "Kategori"
         external_url: "Harici Bağlantı"
-        delete_confirm: Bu kalıcı bağlantıyı silmek istediğinize emin misiniz?
+        delete_confirm: "Bu kalıcı bağlantıyı silmek istediğinize emin misiniz?"
         form:
           label: "Yeni:"
           add: "Ekle"
@@ -3009,6 +3273,9 @@ tr_TR:
       upload: "Yükle"
       uploading: "Yükleniyor..."
       quit: "Belki Sonra"
+      staff_count:
+        one: Topluluğunuzda %{count} görevli üye var.
+        other: Topluluğunuzda %{count} görevli üye var.
       invites:
         add_user: "ekle"
         none_added: "Herhangi bir görevli davet etmediniz. Devam etmek istediğinize emin misiniz?"
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index d2fcdb8f6de..11b79ffd5cc 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -16,9 +16,10 @@ uk:
           format: '%n %u'
           units:
             byte:
-              one: Байт
               few: Байтів
-              other: Байтів
+              many: Байт
+              one: Байт
+              other: Байт
             gb: ГБ
             kb: КБ
             mb: МБ
@@ -33,26 +34,31 @@ uk:
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: "1 хвилина"
-          few: "%{count} хвилини"
-          other: "%{count} хвилин"
+          few: '%{count} хвилини'
+          many: '%{count} хвилин'
+          one: 1 хвилина
+          other: '%{count} хвилин'
         x_hours:
-          one: "1 година"
-          few: "%{count} години"
-          other: "%{count} годин"
+          few: '%{count} години'
+          many: '%{count} годин'
+          one: 1 година
+          other: '%{count} годин'
         x_days:
-          one: "1 день"
-          few: "%{count} дні"
-          other: "%{count} днів"
+          few: '%{count} дні'
+          many: '%{count} днів'
+          one: 1 день
+          other: '%{count} днів'
       medium_with_ago:
         x_hours:
-          one: "1 годину тому"
-          few: "годин тому: %{count}"
-          other: "%{count} годин тому"
+          few: 'годин тому: %{count}'
+          many: '%{count} годин тому'
+          one: 1 годину тому
+          other: '%{count} годин тому'
         x_days:
-          one: "1 день тому"
-          few: "днів тому: %{count}"
-          other: "%{count} днів тому"
+          few: 'днів тому: %{count}'
+          many: '%{count} днів тому'
+          one: 1 день тому
+          other: '%{count} днів тому'
       previous_month: 'Попередній місяць'
       next_month: 'Наступний місяць'
     share:
@@ -93,9 +99,10 @@ uk:
     show_help: "налаштування"
     links: "Посилання"
     links_lowercase:
-      one: "посилання"
-      few: "посилань"
-      other: "посилання"
+      few: посилань
+      many: посилання
+      one: посилання
+      other: посилання
     faq: "Часті запитання"
     guidelines: "Інструкції"
     privacy_policy: "Політика конфіденційності"
@@ -119,9 +126,10 @@ uk:
     max_of_count: "Не більше {{count}}"
     alternation: "або"
     character_count:
-      one: "{{count}} символ"
-      few: "{{count}} символи"
-      other: "{{count}} символів"
+      few: '{{count}} символи'
+      many: '{{count}} символів'
+      one: '{{count}} символ'
+      other: '{{count}} символів'
     suggested_topics:
       title: "Пропоновані теми"
     about:
@@ -132,8 +140,6 @@ uk:
       our_moderators: "Модератори"
       stat:
         all_time: "Весь час"
-        last_7_days: "Останні 7 днів"
-        last_30_days: "Останні 30 днів"
       like_count: "Вподобання"
       topic_count: "Теми"
       post_count: "Дописи:"
@@ -153,19 +159,6 @@ uk:
       last_read: "це останній допис, що ви прочитали; натисніть, щоб додати його до закладок"
       remove: "Видалити закладку"
       confirm_clear: "Ви впевнені, що хочете видалити всі закладки з цієї теми?"
-    topic_count_latest:
-      one: "{{count}} нова чи оновлена тема."
-      few: "нових чи оновлених тем: {{count}}."
-      other: "непрочитаних тем: {{count}}."
-    topic_count_unread:
-      one: "{{count}} непрочитана тема."
-      few: "непрочитаних тем: {{count}}."
-      other: "непрочитаних тем: {{count}}."
-    topic_count_new:
-      one: "{{count}} нова тема."
-      few: "нових тем {{count}}."
-      other: "нових тем: {{count}}."
-    click_to_show: "Натисніть, щоб подивитися."
     preview: "попередній перегляд"
     cancel: "скасувати"
     save: "Зберегти зміни"
@@ -229,29 +222,17 @@ uk:
       posts_read: "Прочитані"
       posts_read_long: "Повідомлень Прочитано"
       total_rows:
-        one: "%{count} користувач"
-        few: "%{count} користувачі"
-        other: "%{count} користувачів"
+        few: '%{count} користувачі'
+        many: '%{count} користувачів'
+        one: '%{count} користувач'
+        other: '%{count} користувачів'
     group_histories:
       actions:
         change_group_setting: "Змінити налаштування групи"
         add_user_to_group: "Добавити користувача"
         remove_user_from_group: "Видалити користувача"
     groups:
-      logs:
-        subject: "Тема"
-        details: "Деталі"
-        from: "Від"
-        to: "До"
-      edit:
-        title: 'Редагувати Групу'
-        full_name: 'Повне Ім''я'
-        add_members: "Добавити учасників"
-        delete_member_confirm: "Видалити '%{username}' з групи '%{group}'?"
       add: "Додати"
-      closed_group: Закрита Група
-      selector_placeholder: "Додати учасників"
-      members: "Учасники"
       topics: "Теми"
       posts: "Дописи"
       mentions: "Згадки"
@@ -268,20 +249,19 @@ uk:
         tracking:
           title: "Стежити"
     user_action_groups:
-      '1': "Вподобані"
-      '2': "Отримані вподобання"
-      '3': "Закладки"
-      '4': "Теми"
-      '5': "Відповіді"
-      '7': "Згадки"
-      '9': "Цитати"
-      '11': "Редагування"
-      '12': "Надіслані"
-      '13': "Вхідні"
-      '14': "Очікують"
+      "1": "Вподобані"
+      "2": "Отримані вподобання"
+      "3": "Закладки"
+      "4": "Теми"
+      "5": "Відповіді"
+      "7": "Згадки"
+      "9": "Цитати"
+      "11": "Редагування"
+      "12": "Надіслані"
+      "13": "Вхідні"
+      "14": "Очікують"
     categories:
       all: "всі категорії"
-      all_subcategories: "все"
       no_subcategory: "немає"
       category: "Категорія"
       reorder:
@@ -324,7 +304,6 @@ uk:
       notifications: "Сповіщення"
       statistics: "Статистика"
       desktop_notifications:
-        label: "Сповіщення"
         perm_default: "Ввімкнути сповіщення"
         perm_denied_btn: "Немає доступу"
         disable: "Вимкнути сповіщення"
@@ -351,7 +330,6 @@ uk:
       delete_account: "Видалити обліковий запис"
       delete_account_confirm: "Are you sure you want to permanently delete your account? This action cannot be undone!"
       deleted_yourself: "Your account has been deleted successfully."
-      delete_yourself_not_allowed: "You cannot delete your account right now. Contact an admin to do delete your account for you."
       unread_message_count: "Повідомлення"
       admin_delete: "Видалити"
       users: "Користувачі"
@@ -429,8 +407,6 @@ uk:
       created: "Приєднався(лась)"
       log_out: "Вийти"
       location: "Місцеположення"
-      card_badge:
-        title: "Візитка користувача"
       website: "Вебсайт"
       email_settings: "Електронна пошта"
       like_notification_frequency:
@@ -675,8 +651,6 @@ uk:
     notifications:
       more: "переглянути старіші сповіщення"
       total_flagged: "всього дописів, на які поскаржилися"
-      alt:
-        posted: "Опубліковано"
     upload_selector:
       title: "Додати зображення"
       title_with_attachments: "Додати зображення або файл"
@@ -760,7 +734,7 @@ uk:
       read_more: "Хочете почитати ще? {{catLink}} або {{latestLink}}."
       browse_all_categories: Переглянути всі категорії
       view_latest_topics: перегляньте останні теми
-      suggest_create_topic: Чому б не створити тему?
+      suggest_create_topic: "Чому б не створити тему?"
       jump_reply_up: перейти до ранішої відповіді
       jump_reply_down: перейти до пізнішої відповіді
       deleted: "Тему було видалено"
@@ -776,14 +750,14 @@ uk:
         current: поточний допис
       notifications:
         reasons:
-          '3_6': 'Ви будете отримувати сповіщення, бо Ви слідкуєте за цією категорією.'
-          '3_5': 'Ви будете отримувати сповіщення, бо Ви автоматично почали слідкувати за цією темою.'
-          '3_2': 'Ви будете отримувати сповіщення, бо Ви слідкуєте за цією темою.'
-          '3_1': 'Ви будете отримувати сповіщення, бо Ви створили цю тему.'
-          '3': 'Ви будете отримувати сповіщення, бо Ви слідкуєте за цією темою.'
-          '0_7': 'Ви ігноруєте всі сповіщення у цій категорії.'
-          '0_2': 'Ви ігноруєте всі сповіщення з цієї теми.'
-          '0': 'Ви ігноруєте всі сповіщення з цієї теми.'
+          "3_6": 'Ви будете отримувати сповіщення, бо Ви слідкуєте за цією категорією.'
+          "3_5": 'Ви будете отримувати сповіщення, бо Ви автоматично почали слідкувати за цією темою.'
+          "3_2": 'Ви будете отримувати сповіщення, бо Ви слідкуєте за цією темою.'
+          "3_1": 'Ви будете отримувати сповіщення, бо Ви створили цю тему.'
+          "3": 'Ви будете отримувати сповіщення, бо Ви слідкуєте за цією темою.'
+          "0_7": 'Ви ігноруєте всі сповіщення у цій категорії.'
+          "0_2": 'Ви ігноруєте всі сповіщення з цієї теми.'
+          "0": 'Ви ігноруєте всі сповіщення з цієї теми.'
         watching_pm:
           title: "Слідкувати"
         watching:
@@ -845,10 +819,10 @@ uk:
         label: "Новий Власник Дописів"
         placeholder: "ім'я користувача нового власника"
         instructions:
-          one: "Будь ласка, оберіть нового власника допису, що належав <b>{{old_user}}</b>."
-          few: "Будь ласка, оберіть нового власника {{count}} дописів, що належали <b>{{old_user}}</b>."
-          other: "Будь ласка, оберіть нового власника {{count}} дописів, що належали <b>{{old_user}}</b>."
-        instructions_warn: "Зверніть увагу, що будь-які повідомлення про цей допис не будуть передані новому користувачеві заднім числом.<br>Увага: В даний час залежні від допису дані не передаються по новому користувачеві. Використовуйте з обережністю."
+          few: Будь ласка, оберіть нового власника {{count}} дописів, що належали <b>{{old_user}}</b>.
+          many: Будь ласка, оберіть нового власника {{count}} дописів, що належали <b>{{old_user}}</b>.
+          one: Будь ласка, оберіть нового власника допису, що належав <b>{{old_user}}</b>.
+          other: Будь ласка, оберіть нового власника {{count}} дописів, що належали <b>{{old_user}}</b>.
       multi_select:
         select: 'вибрати'
         selected: 'вибрано ({{count}})'
@@ -857,8 +831,9 @@ uk:
         select_all: обрати усе
         deselect_all: скасувати вибір всього
         description:
-          one: Ви обрали <b>1</b> допис.
           few: 'Ви обрали дописів: <b>{{count}}</b>.'
+          many: 'Ви обрали дописів: <b>{{count}}</b>.'
+          one: Ви обрали <b>1</b> допис.
           other: 'Ви обрали дописів: <b>{{count}}</b>.'
     post:
       edit_reason: "Причина: "
@@ -1129,8 +1104,6 @@ uk:
         reports:
           today: "Сьогодні"
           yesterday: "Вчора"
-          last_7_days: "Останні 7 днів"
-          last_30_days: "Останні 30 днів"
           all_time: "Весь час"
           7_days_ago: "7 днів тому"
           30_days_ago: "30 днів тому"
@@ -1166,16 +1139,12 @@ uk:
         title: "Групи"
         edit: "Редагувати групи"
         refresh: "Оновити"
-        new: "Новий"
-        selector_placeholder: "введіть ім'я користувача"
         about: "Edit your group membership and names here"
         group_members: "Учасники групи"
         delete: "Видалити"
         delete_confirm: "Видалити цю групу?"
         delete_failed: "Не вдалося видалити групу. Якщо це - автоматична група, її неможливо знищити."
         add: "Додати"
-        add_members: "Додати учасників"
-        bulk_select: "(обрати групу)"
       api:
         generate_master: "Згенерувати Головний ключ API"
         none: "Наразі немає жодного активного ключа API."
@@ -1242,7 +1211,6 @@ uk:
         upload:
           label: "Вивантажити"
           uploading: "Вивантаження..."
-          success: "'{{filename}}' has successfully been uploaded."
           error: "There has been an error while uploading '{{filename}}': {{message}}"
         operations:
           is_running: "An operation is currently running..."
@@ -1253,7 +1221,6 @@ uk:
             confirm: "Are you sure you want to cancel the current operation?"
           backup:
             title: "Create a backup"
-            without_uploads: "Так (не включати файли)"
           download:
             label: "Завантажити"
           destroy:
@@ -1597,10 +1564,7 @@ uk:
         go_back: "Повернутись до пошуку"
         show_overriden: 'Показувати тільки перевизначені'
       site_settings:
-        show_overriden: 'Показувати тільки перевизначені'
         title: 'Налаштування'
-        reset: 'скинути'
-        none: 'none'
         no_results: "Не знайдено результатів."
         clear_filter: "Очистити"
         add_url: "додати URL"
@@ -1635,13 +1599,13 @@ uk:
         new: Новий
         name: Ім'я
         badge: Значок
-        display_name: Ім'я, що відображається
+        display_name: "Ім'я, що відображається"
         description: Опис
         long_description: Розширений опис
         badge_grouping: Група
         save: Зберегти
         delete: Видалити
-        delete_confirm: Ви впевнені, що хочете видалити цю відзнаку?
+        delete_confirm: "Ви впевнені, що хочете видалити цю відзнаку?"
         revoke: Відкликати
         reason: Причина
         edit_badges: Редагувати Значки
@@ -1649,7 +1613,7 @@ uk:
         granted_badges: Надані Значки
         grant: Надати
         no_user_badges: "%{name} не отримував жодного ."
-        no_badges: Тут немає значків, які можуть бути надані.
+        no_badges: "Тут немає значків, які можуть бути надані."
         allow_title: Дозволити використання значків як звань
         multiple_grant: Можуть бути надані декілька разів
         enabled: Включити відзнаки
@@ -1674,6 +1638,7 @@ uk:
         edit: "редагувати"
         category: "Допис у Категорію"
         add_host: "Додати Хост"
+        embed_by_username: "Ім'я користувача для створення теми"
         embed_post_limit: "Максимальна кількість дописів для вставки"
         embed_classname_whitelist: "Дозволені імена класів CSS"
         feed_polling_enabled: "Імпортувати дописи через RSS/ATOM"
@@ -1687,7 +1652,7 @@ uk:
         category_id: "ID категорії"
         category_title: "Категорія"
         external_url: "Зовнішнє посилання"
-        delete_confirm: Ви впевнені, що хочете видалити це постійне посилання?
+        delete_confirm: "Ви впевнені, що хочете видалити це постійне посилання?"
         form:
           label: "Новий:"
           add: "Додати"
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index 0b2bdf21a27..b64fc6829ba 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -9,7 +9,7 @@ ur:
   js:
     number:
       format:
-        separator: "کوئی نہیں"
+        separator: "."
         delimiter: "،"
       human:
         storage_units:
@@ -22,6 +22,9 @@ ur:
             kb: کے بی
             mb: ایم بی
             tb: ٹی بی
+      short:
+        thousands: "{{number}}k"
+        millions: "{{number}}M"
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
@@ -30,64 +33,81 @@ ur:
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
       long_with_year_no_time: "MMM D, YYYY"
-      wrap_ago: "٪{date} پہلے"
+      full_with_year_no_time: "MMMM Do, YYYY"
+      long_date_with_year: "MMM D, 'YY LT"
+      long_date_without_year: "MMM D, LT"
+      long_date_with_year_without_time: "MMM D, 'YY"
+      long_date_without_year_with_linebreak: "MMM D <br/>LT"
+      long_date_with_year_with_linebreak: "MMM D, 'YY <br/>LT"
+      wrap_ago: "%{date} قبل"
       tiny:
+        half_a_minute: "< 1منٹ"
         less_than_x_seconds:
-          one: "< 1 سیکنڈ"
-          other: "< ٪{count} سیکنڈ"
+          one: < 1 سیکنڈ
+          other: < %{count} سیکنڈ
         x_seconds:
-          one: "1 سیکنڈ"
-          other: "٪{count} سیکنڈ"
+          one: 1 سیکنڈ
+          other: '%{count} سیکنڈ'
+        less_than_x_minutes:
+          one: < 1منٹ
+          other: '< %{count}منٹ '
         x_minutes:
-          one: "1 منٹ"
-          other: "٪{count} منٹس"
+          one: 1 منٹ
+          other: '%{count} منٹس'
         about_x_hours:
-          one: "1 گھنٹا"
-          other: "٪{count} گھنٹے"
+          one: 1 گھنٹا
+          other: '%{count} گھنٹے'
         x_days:
-          one: "1 دن"
-          other: "٪{count} دن"
+          one: 1 دن
+          other: '%{count} دن'
+        x_months:
+          one: 1ماہ
+          other: '%{count}مہینے'
         about_x_years:
-          one: "1 سال"
-          other: "٪{count} سال"
+          one: 1 سال
+          other: '%{count} سال'
         over_x_years:
-          one: "> 1 سال"
-          other: "> ٪{count} سال"
+          one: '> 1 سال'
+          other: '> %{count} سال'
         almost_x_years:
-          one: "1 سال"
-          other: "٪{count} سال"
+          one: 1 سال
+          other: '%{count} سال'
+        date_month: "MMM D"
+        date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: "1 منٹ"
-          other: "%{count} منٹس"
+          one: 1 منٹ
+          other: '%{count} منٹس'
         x_hours:
-          one: "1 گھنٹا"
-          other: "%{count} گھنٹے"
+          one: 1 گھنٹا
+          other: '%{count} گھنٹے'
         x_days:
-          one: "1 دن"
-          other: "%{count} دن"
+          one: 1 دن
+          other: '%{count} دن'
+        date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
-          one: "1 منٹ قبل"
-          other: "%{count} منٹ قبل"
+          one: 1 منٹ قبل
+          other: '%{count} منٹ قبل'
         x_hours:
-          one: "1 گھنٹہ قبل "
-          other: " %{count} گھنٹے قبل "
+          one: '1 گھنٹہ قبل '
+          other: ' %{count} گھنٹے قبل '
         x_days:
-          one: "1 دن قبل"
-          other: "%{count} دن قبل"
+          one: 1 دن قبل
+          other: '%{count} دن قبل'
       later:
         x_days:
-          one: "1 دن بعد"
-          other: "%{count} دن بعد"
+          one: 1 دن بعد
+          other: '%{count} دن بعد'
         x_months:
-          one: "1 مہینے بعد"
-          other: "%{count} مہینے بعد"
+          one: 1 مہینے بعد
+          other: '%{count} مہینے بعد'
         x_years:
-          one: "1 سال بعد"
-          other: "%{count} سال بعد"
+          one: 1 سال بعد
+          other: '%{count} سال بعد'
       previous_month: 'پچھلے ماہ'
       next_month: 'اگلے ماہ'
+      placeholder: تاریخ
     share:
       topic: 'اس ٹاپک کا لنک شیئرکریں'
       post: 'پوسٹ #%{postNumber}'
@@ -95,41 +115,44 @@ ur:
       twitter: 'ٹوئٹر پر اس لنک کو شیئرکریں'
       facebook: 'فیس بک پر اس لنک کو شیئرکریں'
       google+: 'گُوگَل+ پر اس لنک کو شیئرکریں'
-      email: 'اس لنک کو ایک ای میل میں بھیجیں'
+      email: 'اس لنک کو  ای میل میں بھیجیں'
     action_codes:
-      public_topic: "اس ٹاپک کو پبلک بنایا گیا ٪{کب}"
-      private_topic: "اس ٹاپک کو پرائیویٹ بنایا گیا ٪{کب}"
-      split_topic: "اس ٹاپک کو تقسیم کیا گیا ٪{کب}"
-      invited_user: "دعوت دی ٪{کسے} ٪{کب}"
-      invited_group: "دعوت دی ٪{کسے} ٪{کب}"
-      removed_user: "ہٹایا ٪{کسے} ٪{کب}"
-      removed_group: "ہٹایا ٪{کسے} ٪{کب}"
+      public_topic: "اس ٹاپک کو پبلک بنایا گیا %{when}"
+      private_topic: "اس ٹاپک کو ذاتی پیغام بنایا گیا %{when}"
+      split_topic: "اس ٹاپک کو تقسیم کیا گیا %{when}"
+      invited_user: "دعوت دی %{who} %{when}"
+      invited_group: "دعوت دی %{who} %{when}"
+      user_left: "%{who}نے خود کواِس پیغام سے ہٹا دیا %{when} "
+      removed_user: "ہٹایا %{who} %{when}"
+      removed_group: "ہٹایا %{who} %{when}"
       autoclosed:
-        enabled: 'بند کیا ٪{کب}'
-        disabled: 'کھولا ٪{کب}'
+        enabled: 'بند کیا %{when}'
+        disabled: 'کھولا %{when}'
       closed:
-        enabled: 'بند کیا ٪{کب}'
-        disabled: 'کھولا ٪{کب}'
+        enabled: 'بند کیا %{when}'
+        disabled: 'کھولا %{when}'
       archived:
-        enabled: 'آرکائیو کیا ٪{کب}'
-        disabled: 'آرکائیو سے نکال دیا ٪{کب}'
+        enabled: 'آرکائیو کیا %{when}'
+        disabled: 'آرکائیو سے ہٹا دیا %{when}'
       pinned:
-        enabled: 'پن کر دیا ٪{کب}'
-        disabled: 'پن ہٹا دیا ٪{کب}'
+        enabled: 'پن کر دیا %{when}'
+        disabled: 'پن ہٹا دیا %{when}'
       pinned_globally:
-        enabled: 'عالمی سطح پر پن کر دیا ٪{کب}'
-        disabled: 'پن ہٹا دیا ٪{کب}'
+        enabled: 'عالمی سطح پر پن کر دیا %{when}'
+        disabled: 'پن ہٹا دیا %{when}'
       visible:
-        enabled: 'مندرج ٪{کب}'
-        disabled: 'غیر مندرج ٪{کب}'
+        enabled: 'مندرج %{when}'
+        disabled: 'غیر مندرج %{when}'
       banner:
-        enabled: 'اِس کو بینر بنا لیا ٪{when}۔ یہ ہر صفحے کے سب سے اوپر دکھایا جائے گا جب تک صارف اِسے برخاست نہیں کر دیتا۔'
-        disabled: 'اِس بینر کو ہٹا دیا ٪{when}۔  یہ اب ہر صفحے کے سب سے اوپر دکھایا نہیں جائے گا۔'
+        enabled: 'اِس کو بینر بنا لیا %{when}۔ یہ ہر صفحے کے سب سے اوپر دکھایا جائے گا جب تک صارف اِسے برخاست نہیں کر دیتا۔'
+        disabled: 'اِس بینر کو ہٹا دیا %{when}۔  یہ اب ہر صفحے کے سب سے اوپر دکھایا نہیں جائے گا۔'
     topic_admin_menu: "ٹاپک کے ایڈمن کی کارروائیاں"
     wizard_required: "اپنے نئے ڈِسکورس پر خوش آمدید! <a href='%{url}' data-auto-route='true'>سیٹ اَپ وزرڈ</a> سے آغاز کرتے ہیں۔✨"
-    emails_are_disabled: "تمام سبکدوش ہونے والے ای میل کو عالمی سطح پر ایک منتظم کی طرف سے غیر فعال کر دیا گیا ہے. کسی بھی قسم کی ای میل اطلاعات نہیں بھیجی جائیں گی۔"
-    bootstrap_mode_enabled: "آپ کی نئی ویب سائٹ شروع کرنے کو آسان بنانے کے لئے، آپ بوٹسٹریپ کے موڈ میں ہیں۔ تمام نئے صارفین کے ٹرسٹ لَیول 1 دیا گیا ہے اور روزانہ کی ای میل اپ ڈیٹس فعال کیے جا چکے ہیں۔ یہ خود کار طریقے سے غیر فعال کر دیا جائے گا جب کل صارف شمار %{min_users} سے تجاوز کر جائے گا۔"
-    bootstrap_mode_disabled: "بوٹسٹریپ کا موڈ اگلے 24 گھنٹوں میں غیر فعال کر دیا جائے گا۔"
+    emails_are_disabled: " ای میل کو منتظم کی طرف سے غیر فعال کر دیا گیا ہے. کسی بھی قسم کی ای میل  نہیں بھیجی جائیں گی۔"
+    bootstrap_mode_enabled: "آپ کی نئی ویب سائٹ شروع کرنے کو آسان بنانے کے لئے، آپ بُوٹسٹرَیپ مَوڈ میں ہیں۔ تمام نئے صارفین کے ٹرسٹ لَیول 1 دیا گیا ہے اور روزانہ کی ای میل اپ ڈیٹس فعال کیے جا چکے ہیں۔ یہ خود کار طریقے سے غیر فعال کر دیا جائے گا جب %{min_users} صارفین شمولیت اختیار کر لیں گے۔"
+    bootstrap_mode_disabled: "بُوٹسٹرَیپ مَوڈ 24 گھنٹوں کے اندر غیر فعال کر دیا جائے گا۔"
+    themes:
+      default_description: "ڈِیفالٹ"
     s3:
       regions:
         ap_northeast_1: "ایشیا پیسفک (ٹوکیو)"
@@ -140,8 +163,10 @@ ur:
         cn_north_1: "چین (بیجنگ)"
         eu_central_1: "یورپی یونین (فرینکفرٹ)"
         eu_west_1: "یورپی یونین (آئر لینڈ)"
+        eu_west_2: "یورپی یونین (لندن)"
         sa_east_1: "ایشیا پیسفک (ساؤ پالو)"
         us_east_1: "امریکی مشرق (شمالی ورجینیا)"
+        us_east_2: "امریکی مشرق (اَوہائیو)"
         us_gov_west_1: "اے ڈبلیو ایس گَو کلاوڈ (امریکہ)"
         us_west_1: "امریکی مغرب (شمالی کیلی فورنیا)"
         us_west_2: "امریکی مغرب (اوریگن)"
@@ -149,6 +174,7 @@ ur:
     not_implemented: "یہ خصوصیت ابھی تک لاگو نہیں کی گئی، معضرت!"
     no_value: "نہیں "
     yes_value: "ہاں "
+    submit: "شائع"
     generic_error: "معذرت، ایک تکنیکی خرابی کا سامنا کرنا پڑا ہے۔"
     generic_error_with_reason: "ایک تکنیکی خرابی پیش آئی: %{error}"
     sign_up: "سائن اپ"
@@ -161,8 +187,8 @@ ur:
     show_help: "اختیارات"
     links: "لنکس"
     links_lowercase:
-      one: "لنک"
-      other: "لنکس"
+      one: لنک
+      other: لنکس
     faq: "عمومی سوالات"
     guidelines: "ہدایات"
     privacy_policy: "نجی معلومات کی حفاظت پالیسی"
@@ -186,28 +212,26 @@ ur:
     max_of_count: "زیادہ سے زیادہ {{count}}"
     alternation: "یا "
     character_count:
-      one: "{{count}} حرف"
-      other: "{{count}} حروف"
+      one: '{{count}} حرف'
+      other: '{{count}} حروف'
     suggested_topics:
       title: "تجویز کیے گئے ٹاپک"
       pm_title: "تجویز کیے گئے پیغامات"
     about:
       simple_title: "بارے میں"
-      title: "٪{title} کے بارے میں"
+      title: "%{title} کے بارے میں"
       stats: "سائٹ کے اعدادوشمار"
       our_admins: "ہمارے ایڈمن"
       our_moderators: "ہمارے ماڈریٹرز"
       stat:
         all_time: "تمام اوقات"
-        last_7_days: "گزشتہ 7 دن"
-        last_30_days: "گزشتہ 30 دن"
       like_count: "لائیکس"
       topic_count: "ٹاپک"
       post_count: "پوسٹ"
       user_count: "صارفین"
       active_user_count: "متحرک صارفین"
       contact: "ہم سے رابطہ کریں"
-      contact_info: "اس سائٹ کے بارے میں کسی اہم مسئلہ یا فوری معاملہ کی صورت میں، براہ مہربانی ٪{contact_info} پر رابطہ کریں۔"
+      contact_info: "اس سائٹ کے بارے میں کسی اہم مسئلہ یا فوری معاملہ کی صورت میں، براہ مہربانی %{contact_info} پر رابطہ کریں۔"
     bookmarked:
       title: "بُک مارک"
       clear_bookmarks: "بک مارکس ختم کریں"
@@ -222,15 +246,14 @@ ur:
       remove: "بُک مارک ہٹائیں"
       confirm_clear: "کیا آپ کو یقین ہے کہ آپ اِس ٹاپک سے تمام بُک مارکس ہٹانا چاہتے ہیں؟"
     topic_count_latest:
-      one: "{{count}} نئے اور اپ ڈیٹ کیے گئے ٹاپک۔"
-      other: "{{count}} نئے اور اپ ڈیٹ کیے گئے ٹاپک۔"
+      one: '{{count}} نیا یا اَپ ڈیٹ کردہ ٹاپک دیکھیں۔'
+      other: '{{count}} نئے یا اَپ ڈیٹ کردہ ٹاپک دیکھیں۔'
     topic_count_unread:
-      one: "{{count}} نہ پڑھے گئے ٹاپک۔"
-      other: "{{count}} نہ پڑھے گئے ٹاپک۔"
+      one: '{{count}} غیر پڑھا ٹاپک دیکھیں۔'
+      other: '{{count}} غیر پڑھے ٹاپک دیکھیں۔'
     topic_count_new:
-      one: "{{count}} نئے ٹاپک۔"
-      other: "{{count}} نئے ٹاپک۔"
-    click_to_show: "ظاہر کرنے کے لئے کلک کریں۔"
+      one: '{{count}} نیا ٹاپک دیکھیں۔'
+      other: '{{count}} نئے ٹاپک دیکھیں۔'
     preview: "پیشگی دیکھنا"
     cancel: "منسوخ"
     save: "تبدیلیاں محفوظ کریں"
@@ -238,10 +261,12 @@ ur:
     saved: "محفوظ کر لیا گیا ہے!"
     upload: "اَپ لوڈ"
     uploading: "اَپ لوڈ کیا جا رہا ہے..."
-    uploading_filename: "{{فائل کا نام}} اَپ لوڈ کیا جا رہا ہے..."
+    uploading_filename: "{{filename}} اَپ لوڈ کیا جا رہا ہے..."
     uploaded: "اَپ لوڈ کیا جا چکا ہے!"
+    pasting: "پیسٹ کیا جا رہا ہے..."
     enable: "فعال کریں"
     disable: "غیر فعال کریں"
+    continue: "جاری رکھی"
     undo: "کالعدم کریں"
     revert: "رِیوَرٹ"
     failed: "عمل ناکام رہا"
@@ -266,16 +291,16 @@ ur:
       cancel: "منسوخ"
       view_pending: "زیرِاِلتوَاء پوسٹس دیکھیں"
       has_pending_posts:
-        one: "اِس ٹاپک کی <b>1</b> پوسٹس منظوری کا انتظار کر رہی ہیں"
-        other: "اِس ٹاپک کی <b>{{count}}</b> پوسٹس منظوری کا انتظار کر رہی ہیں"
+        one: اِس ٹاپک کی <b>1</b> پوسٹس منظوری کا انتظار کر رہی ہیں
+        other: اِس ٹاپک کی <b>{{count}}</b> پوسٹس منظوری کا انتظار کر رہی ہیں
       confirm: "تبدیلیاں محفوظ کریں"
       delete_prompt: "کیا آپ <b>%{username}</b> حذف کرنا چاہتے ہیں؟ اِس طرح سے اُن کی تمام پوسٹس حذف ہو جائیں گی اور  اُن کے ای میل اور IP ایڈریس کو بلاک کردیا جائے گا۔"
       approval:
         title: "پوسٹ کو منظوری کی ضرورت ہے"
         description: "ہمیں آپ کی نئی پوسٹ موصول ہو چکی ہے لیکن یہ ظاہر ہونے سے پہلے ایک منتظم سے منظور ہونا ضروری ہے۔ براہ مہربانی صبر کریں۔"
         pending_posts:
-          one: "آپ کی <strong>1</strong> پوسٹ زیر التوا ہیں۔"
-          other: "آپ کی <strong>{{count}}</strong> پوسٹس زیرِاِلتوَاء ہیں۔"
+          one: آپ کی <strong>1</strong> پوسٹ زیر التوا ہیں۔
+          other: آپ کی <strong>{{count}}</strong> پوسٹس زیرِاِلتوَاء ہیں۔
         ok: "ٹھیک"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> نے <a href='{{topicUrl}}'>ٹاپک</a> پوسٹ کیا"
@@ -309,8 +334,8 @@ ur:
       posts_read: "پڑھ لیا گیا"
       posts_read_long: "پڑھی گئیں پوسٹس"
       total_rows:
-        one: "1 صارف"
-        other: "%{count} صارفین"
+        one: 1 صارف
+        other: '%{count} صارفین'
     group_histories:
       actions:
         change_group_setting: "گروپ کی سیٹِنگ تبدیل کریں"
@@ -319,22 +344,26 @@ ur:
         make_user_group_owner: "مالک بنائیں"
         remove_user_as_group_owner: "مالک منسوخ کریں"
     groups:
-      logs:
-        title: "لاگز"
-        when: "کب"
-        action: "عمل"
-        acting_user: "عمل کرنے والا صارف"
-        target_user: "ہدف صارف"
-        subject: "موضوع"
-        details: "تفصیلات"
-        from: "سے"
-        to: "کے لئے"
-      edit:
-        title: 'گروپ میں ترمیم کریں'
+      manage:
+        title: 'مَینَیج'
+        name: 'نام'
         full_name: 'پورا نام'
-        add_members: "اراکین شامل کریں"
-        delete_member_confirm: "'٪ {username}' گروپ سے '٪ {group}' ہٹائیں؟"
-      name_placeholder: "گروپ کا نام، کوئی خالی جگہ نہیں، نامِ صارفین کے اصولوں کے مطابق"
+        add_members: "ممبران شامل کریں"
+        delete_member_confirm: "'%{username}' کو '%{group}' گروپ سے ہٹائیں؟"
+        profile:
+          title: پروفائل
+        logs:
+          title: "لاگز"
+          when: "کب"
+          action: "عمل"
+          acting_user: "عمل کرنے والا صارف"
+          target_user: "ہدف صارف"
+          subject: "موضوع"
+          details: "تفصیلات"
+          from: "سے"
+          to: "کیلئے"
+      public_admission: "صارفین کو آزادی سے گروپ میں شمولیت اختیار کرنے کی اجازت دیں (گروپ کا عوامی طور پر ظاہر ہونا لاذمی ہو)"
+      public_exit: "صارفین کو آزادانہ طور پر گروپ چھوڑنے کی اجازت دیں"
       empty:
         posts: "اس گروپ کے ارکان کی طرف سے کوئی پوسٹس نہیں ہیں۔"
         members: "اس گروپ میں کوئی ارکان ہیں۔"
@@ -343,36 +372,70 @@ ur:
         topics: "اِس گروپ کے ارکان کی طرف سے کوئی ٹاپک نہیں ہیں۔"
         logs: "اس گروپ کے لئے کوئی لاگز موجود نہیں ہیں۔"
       add: "شامل کریں"
-      join: "گروپ میں شامل ہوں"
-      leave: "گروپ چھوڑ دیں"
-      request: "گروپ میں شمولیت کیلئے درخواست کریں"
-      automatic_group: خودکار گروپ
-      closed_group: بند گروپ
-      is_group_user: "آپ اس گروپ کے رکن ہیں"
+      join: "شمولیت اختیار کریں"
+      leave: "چھوڑ دیں"
+      request: "درخواست"
+      message: "پیغام"
+      allow_membership_requests: "صارفین کو گروپ کے مالکان کو رکنیت کی درخواستیں بھیجنے کی اجازت دیں"
+      membership_request_template: "رکنیت کی درخواست بھیجنے کے دوران صارفین کیلئے ظاہر کیے جانے والی پہلے سے تیار کردہ مثال"
+      membership_request:
+        submit: "درخواست بھیجیں"
+        title: "@%{group_name} میں شمولیت کی درخواست"
+        reason: "گروپ مالکان کو بتائیے کہ آپ اس گروپ میں شامل ہونے کے کیوں مستحق ہیں"
       membership: "ممبرشپ "
       name: "نام"
-      user_count: "ممبران کی تعداد"
+      group_name: "گروپ نام"
+      user_count: "صارفین"
       bio: "گروپ کے بارے میں"
-      selector_placeholder: "ممبران شامل کریں"
+      selector_placeholder: "صارف نام درج کریں"
       owner: "مالِک"
       index:
         title: "گروپس"
+        all: "تمام گروپس"
         empty: "کوئی نظر آنے والے گروپ موجود نہیں ہیں۔"
+        filter: "گروپ قِسم کے حساب سے فِلٹر کریں"
+        owner_groups: "گروپس جن کا میں مالک ہوں"
+        close_groups: "بند گروپس"
+        automatic_groups: "خودکار گروپس"
+        automatic: "خود کار طریقے سے"
+        closed: "بند"
+        public: "عوامی"
+        private: "ذاتی"
+        public_groups: "عوامی گروپس"
+        automatic_group: خودکار گروپ
+        close_group: گروپ بند کریں
+        my_groups: "میرے گروپس"
+        group_type: "گروپ قِسم"
+        is_group_user: "ممبر"
+        is_group_owner: "مالِک"
+      title:
+        one: گروپ
+        other: گروپس
       activity: "سرگرمی"
-      members: "ممبران"
+      members:
+        title: "ممبران"
+        filter_placeholder_admin: "صارف نام یا ای میل"
+        filter_placeholder: "صارف نام"
+        remove_member: "ممبر ہٹائیں"
+        remove_member_description: "اِس گروپ سے <b>%{username}</b> کو ہٹایں"
+        make_owner: "مالک بنائیں"
+        make_owner_description: "اِس گروپ پر <b>%{username}</b> کو مالک بنائیں"
+        remove_owner: "مالک کے طور پر ہٹائیں"
+        remove_owner_description: "اِس گروپ پر سے <b>%{username}</b> کو مالک کے طور پر ہٹائیں"
+        owner: "مالِک"
       topics: "ٹاپک"
       posts: "پوسٹ"
       mentions: "ذکر"
       messages: "پیغامات"
+      notification_level: "گروپ پیغامات کیلئے اطلاعات کا پہلے سے طے شدہ لَیوَل"
       alias_levels:
+        mentionable: "کون اِس گروپ کو @زکر کرسکتا ہے؟"
+        messageable: "کون اِس گروپ کو پیغام بھیج سکتا ہے؟"
         nobody: "کوئی بھی نہیں"
         only_admins: "صرف منتظمین"
         mods_and_admins: "صرف ثالث اور منتظمین"
         members_mods_and_admins: "صرف گروپ کے اراکین، ثالث اور منتظمین"
         everyone: "ہر کوئی"
-      trust_levels:
-        title: "ممبران کو شامل کرتے وقت خود کار طریقے سے دیا جانے والا ٹرسٹ لَیول:"
-        none: "کوئی نہیں"
       notifications:
         watching:
           title: "نظر رکھی ہوئی ہے"
@@ -397,23 +460,22 @@ ur:
       flair_color_placeholder: "(اختیاری) ہیکس رنگ نمبر"
       flair_preview_icon: "آئکن کا مشاہدہ کریں"
       flair_preview_image: "تصویر کا مشاہدہ کریں"
-      flair_note: "نوٹ: فلیر صرف ایک صارف کے بنیادی گروپ کے لئے دکھایا جائے گا۔"
     user_action_groups:
-      '1': "لائیکس دیے گئے"
-      '2': "لائیکس موصول ہوے"
-      '3': "بُکمارکس"
-      '4': "ٹاپکس"
-      '5': "جوابات"
-      '6': "جوابات"
-      '7': "تذکرے"
-      '9': "اقتباسات"
-      '11': "ترامیم"
-      '12': "بھیجی گئی اشیاء"
-      '13': "اِن باکس"
-      '14': "زیرِاِلتوَاء"
+      "1": "لائیکس دیے گئے"
+      "2": "لائیکس موصول ہوے"
+      "3": "بُکمارکس"
+      "4": "ٹاپکس"
+      "5": "جوابات"
+      "6": "جوابات"
+      "7": "تذکرے"
+      "9": "اقتباسات"
+      "11": "ترامیم"
+      "12": "بھیجی گئی اشیاء"
+      "13": "اِن باکس"
+      "14": "زیرِاِلتوَاء"
     categories:
       all: "تمام زُمرَہ جات"
-      all_subcategories: "تمام"
+      all_subcategories: "%{categoryName}میں تمام "
       no_subcategory: "کوئی نہیں"
       category: "زمرہ"
       category_list: "زمرہ جات کی فہرست ظاہر کریں"
@@ -432,11 +494,11 @@ ur:
       toggle_ordering: "ترتیب کاری کا کنٹرول ٹاگل کریں"
       subcategories: "ذیلی زمرے"
       topic_sentence:
-        one: "1 ٹاپک"
-        other: "%{count} ٹاپک"
+        one: 1 ٹاپک
+        other: '%{count} ٹاپک'
       topic_stat_sentence:
-        one: "%{count} نئے موضوعات پچھلے %{unit} میں۔"
-        other: "%{count} نئے موضوعات پچھلے %{unit} میں۔"
+        one: '%{count} نئے موضوعات پچھلے %{unit} میں۔'
+        other: '%{count} نئے موضوعات پچھلے %{unit} میں۔'
     ip_lookup:
       title: IP ایڈریس کا سراغ
       hostname: ہوسٹ کا نام
@@ -452,6 +514,7 @@ ur:
       topics_entered: " داخل ہوئے ٹاپک"
       post_count: "# پوسٹ"
       confirm_delete_other_accounts: "کیا آپ واقعی یہ اکاؤنٹس حذف کرنا چاہتے ہیں؟"
+      powered_by: "<a href='https://ipinfo.io'>ipinfo.io</a> کے مرہونِ مِنَّت"
     user_fields:
       none: "(ایک آپشن منتخب کریں)"
     user:
@@ -460,6 +523,7 @@ ur:
       mute: "خاموش کردیں"
       edit: "ترجیحات میں ترمیم کردیں"
       download_archive:
+        button_text: "تمام ڈاؤن لوڈ کریں"
         confirm: "کیا آپ واقعی اپنی پوسٹس ڈاؤن لوڈ کرنا چاہتے ہیں؟"
         success: "ڈاؤن لوڈ کا آغاز کر دیا گیا ہے، عمل مکمل ہونے پر آپ کو پیغام کے ذریعے مطلع کر دیا جائے گا۔"
         rate_limit_error: "پوسٹس فی دن ایک بار ہی ڈاؤن لوڈ کی جا سکتی ہیں،  براہ مہربانی کل دوبارہ کوشش کریں۔"
@@ -469,6 +533,7 @@ ur:
       activity_stream: "سرگرمی"
       preferences: "ترجیحات"
       expand_profile: "مزید کھولیں"
+      collapse_profile: "بند کریں"
       bookmarks: "بُکمارکس"
       bio: "سائٹ کے بارے میں"
       invited_by: "کی طرف سے مدعو کیا گیا:"
@@ -476,7 +541,6 @@ ur:
       notifications: "اطلاعات"
       statistics: "اعدادوشمار"
       desktop_notifications:
-        label: "ڈیسک ٹاپ اطلاعات"
         not_supported: "نوٹیفیکیشن اس براؤزر کے لیئے غیر معاون ہیں۔ معذرت۔"
         perm_default: "اطلاعات چالو کریں"
         perm_denied_btn: "اِجازت نہیں دی گئی"
@@ -484,11 +548,14 @@ ur:
         disable: "اطلاعات غیر فعال کریں"
         enable: "اطلاعات فعال کریں"
         each_browser_note: "نوٹ: آپ کو ہر براؤزر پر اس سیٹنگ کو تبدیل کرنا ہوگا."
+      dismiss: 'بر خاست کریں'
       dismiss_notifications: "سب بر خاست کریں"
       dismiss_notifications_tooltip: "تمام بغیر پڑھی اطلاعات کو پڑھی جا چکی اطلاعات کے طور پر مارک کریں"
       first_notification: "آپ کی پہلی نوٹیفکیشن! شروع کرنے کے لئے اسے منتخب کریں۔"
       disable_jump_reply: "میرے جواب دینے کے بعد میری پوسٹ پر نہ جائیں"
       dynamic_favicon: "براؤزر آئکن پر نئے / اَپ ڈیٹ ہوئے ٹاپکس کی گنتی دکھائیں"
+      theme_default_on_all_devices: "میری تمام ڈیوائسز پر اِس کو میری ڈیفالٹ تھیم بنائیں"
+      allow_private_messages: "دوسرے صارفین کو مجھے ذاتی پیغامات بھیجنے کی اجازت دیں"
       external_links_in_new_tab: "تمام بیرونی ویب سائٹ کے لنکس ایک نئے ٹیب میں کھولیں"
       enable_quoting: "روشنی ڈالے گئے ٹَیکسٹ کے لئے اقتباسی جواب فعال کریں"
       change: "بدلیں"
@@ -496,7 +563,9 @@ ur:
       admin: "{{user}} ایک ایڈمِن ہے"
       moderator_tooltip: "یہ صارف ایک ماڈریٹر ہے"
       admin_tooltip: "یہ صارف ایک ایڈمِن ہے"
-      suspended_notice: "ہ صارف {{date}} تک معطل ہے۔"
+      silenced_tooltip: "یہ صارف خاموش کیا ہوا ہے"
+      suspended_notice: "یہ صارف {{date}} تک معطل ہے۔"
+      suspended_permanently: "یہ صارف معطل ہے۔"
       suspended_reason: "وجہ:"
       github_profile: "گِٹ حَب"
       email_activity_summary: "سرگرمی کا خلاصہ"
@@ -508,7 +577,7 @@ ur:
           خاموش کردہ ٹاپک اور زمرہ جات اِن اِیمیلز میں شامل نہیں ہیں۔
         individual: "ہر نئی پوسٹ پر ایک ای میل بھیجیں"
         individual_no_echo: "میری اپنی کے سوا، ہر نئی پوسٹ پر ایک ای میل بھیجیں"
-        many_per_day: "ہر نئی پوسٹ پر ایک ای میل بھیجیں (تقریبا {{یومیہ ای میل تخمینہ}} فی دن)"
+        many_per_day: "ہر نئی پوسٹ پر ایک ای میل بھیجیں (تقریباً {{dailyEmailEstimate}} فی دن)"
         few_per_day: "ہر نئی پوسٹ پر ایک ای میل بھیجیں (تقریبا 2 فی دن)"
       tag_settings: "ٹیگز"
       watched_tags: "دیکھا گیا"
@@ -527,10 +596,10 @@ ur:
       watched_first_post_tags_instructions: "آپ کو اِن ٹیگ والے ہر نئے ٹاپک کی پہلی پوسٹ کے بارے میں مطلع کیا جائے گا۔"
       muted_categories: "خاموش کِیا ہوا"
       muted_categories_instructions: "آپ کو اِن زمرہ جات میں موجود نئے ٹاپکس کی کسی بھی چیز کے بارے میں مطلع نہیں کیا جائے گا، اور یہ تازہ ترین میں بھی نظر نہیں آئیں گے۔"
+      no_category_access: "ایک ماڈریٹر کے طور پر آپ کو زمرہ پر محدود رسائی حاصل ہے، محفوظ کرنا غیر فعال ہے۔"
       delete_account: "میرا اکاؤنٹ حذف کریں"
       delete_account_confirm: "کیا آپ واقعی مستقل طور پر اپنا اکاؤنٹ حذف کرنا چاہتے ہیں؟ اس عمل کو کالعدم نہیں کیا جا سکتا!"
       deleted_yourself: "آپ کے اکاؤنٹ کو کامیابی سے حزف کر دیا گیا ہے۔"
-      delete_yourself_not_allowed: "آپ ابھی اپنے اکاؤنٹ کو حذف نہیں کرسکتے۔ آپ کے لئے اکاؤنٹ حزف کرنے کے لئے ایک ایڈمن سے رابطہ کریں۔"
       unread_message_count: "پیغامات"
       admin_delete: "حذف کریں"
       users: "صارفین"
@@ -538,11 +607,15 @@ ur:
       muted_users_instructions: "اِن صارفین کی طرف سے تمام اطلاعات کو روکیں۔"
       muted_topics_link: "خاموش کردیے گئے ٹاپکس دکھائیں"
       watched_topics_link: "دیکھے گئے ٹاپک ظاہر کریں"
+      tracked_topics_link: "ٹرَیک کیے گئے ٹاپک دکھائیں"
       automatically_unpin_topics: "جب میں سب سے نیچے تک پہنچوں تو خود کار طریقے سے ٹاپک سے پن ہٹایں۔"
       apps: "ایپس"
       revoke_access: "رسائی کالعدم کریں"
       undo_revoke_access: "رسائی کالعدم کو منسوخ کریں"
       api_approved: "منظورشدہ"
+      theme: "تھیم"
+      home: "ڈیفالٹ ہوم پیج"
+      staged: "سٹَیجڈ"
       staff_counters:
         flags_given: "مدد گار فلَیگ"
         flagged_posts: "فلَیگ کی گئی پوسٹس"
@@ -560,6 +633,16 @@ ur:
         move_to_archive: "آر کائیو"
         failed_to_move: "منتخب شدہ پیغامات کو منتقل کرنے میں ناکامی (شاید آپ کے نیٹ ورک بند ہے)"
         select_all: "تمام منتخب کریں"
+        tags: "ٹیگز"
+      preferences_nav:
+        account: "اکاؤنٹ"
+        profile: "پروفائل"
+        emails: "اِی مَیل"
+        notifications: "اطلاعات"
+        categories: "زُمرَہ جات"
+        tags: "ٹیگز"
+        interface: "انٹرفیس"
+        apps: "اَیپس"
       change_password:
         success: "(اِی میل بھیج دی گئ)"
         in_progress: "(اِی میل بھیجی جا رہی ہے)"
@@ -568,6 +651,18 @@ ur:
         set_password: "پاس ورڈ رکھیں"
         choose_new: "نیا پاس ورڈ منتخب کریں"
         choose: "پاس ورڈ منتخب کریں"
+      second_factor:
+        title: "دو فیکٹر توثیق"
+        disable: "دو فیکٹر توثیق غیر فعال کریں"
+        confirm_password_description: "جاری رکھنے کیلئے براہ کرم اپنے پاسوَرڈ کی تصدیق کریں"
+        label: "کَوڈ"
+        enable_description: |
+          اِس QR کَوڈ کو کسی قابل اَیپ (<a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target="_blank">اینڈرائڈ</a> – <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8" target="_blank">iOS</a>– <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>وِنڈَوز فون</a>) میں اسکَین کریں اور اپنا توثیقی کَوڈ جمع کریں۔
+        disable_description: "براہ مہربانی اپنی اَیپ میں سے توثیقی کَوڈ درج کریں"
+        show_key_description: "دستی طور پر درج کریں"
+        extended_description: |
+          دو فیکٹر توثیق پاسوَرڈ کے ساتھ ساتھ ایک دفعہ کے ٹَوکن کو مانگ کر آپ کے اکاؤنٹ کیلئے اضافی سیکورٹی شامل کرتا ہے۔ ٹَوکن <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target='_blank'>اینڈرائڈ</a>، <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8">iOS</a>، اور <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>وِنڈَوز فون</a> ڈیوائسوں پر تخلیق کیے جا سکتے ہیں۔
+        oauth_enabled_warning: "براہ مہربانی نوٹ کریں کہ ایک بار جب آپ کے اکاؤنٹ پر دو فیکٹر توثیق فعال ہو جائے تو سَوشَل لاگ اِن غیر فعال ہوجائیں گے۔"
       change_about:
         title: "\"میرے بارے میں\" تبدیل کریں"
         error: "اِس چیز کو تبدیل کرنے میں ایک خرابی کا سامنا کرنا پڑا۔"
@@ -581,10 +676,12 @@ ur:
         taken: "معذرت، یہ اِی میل دستیاب نہیں ہے۔"
         error: "آپ کا اِی میل تبدیل کرنے میں ایک خرابی کا سامنا کرنا پڑا۔ شاید یہ ایڈریس پہلے سے استعمال میں ہے؟"
         success: "ہم نے اِس ایڈریس پر ایک اِی میل بھیج دی ہے۔ براہ کرم، تصدیق کی ہدایات پر عمل کریں۔"
+        success_staff: "ہم نے آپ کے موجودہ ایڈریس پر ایک اِی میل بھیج دی ہے۔ براہ کرم، تصدیق کی ہدایات پر عمل کریں۔"
       change_avatar:
         title: "اپنے پروفائل کی تصویر تبدیل کریں"
         gravatar: "<a href='//gravatar.com/emails' target='_blank'>گَرِیوَّٹار</a>، کی بنیاد پر"
         gravatar_title: "گَرِیوَّٹار کی ویب سائٹ پر اپنے اوتار کو تبدیل کریں"
+        gravatar_failed: "گَرَیوَٹار درآمد نہیں کرایا جاسکا۔ کیا اس ای میل ایڈریس کے ساتھ ایک منسلک ہے؟ "
         refresh_gravatar_title: "اپنے گَرِیوَّٹار کو رِیفریش کریں"
         letter_based: "سسٹم تفویض کردہ پروفائل تصویر"
         uploaded_avatar: "اپنی مرضی کی تصویر"
@@ -604,11 +701,11 @@ ur:
         instructions: "کبھی بھی عوام کو نہیں دکھایا گیا"
         ok: "ہم تصدیق کے لئے آپ کو اِی میل کریں گے"
         invalid: "براہ کرم، ایک قابلِ قبول ایِ میل ایڈریس درج کریں"
-        authenticated: "آپ کے اِی میل کی توثیق کر دی گئی ہے {{فراہم کنندہ}}"
+        authenticated: "آپ کے اِی میل کی توثیق کر دی گئی ہے {{provider}}"
         frequency_immediately: "جس بارے میں ہم آپ کو اِی میل کر رہے ہیں، اگر آپ نے نہیں پڑھی ہوئی تو ہم فوری طور پر آپ کو اِی میل کریں گے۔"
         frequency:
-          one: "ہم آپ کو اِی میل کریں گے صرف اُس صور میں کہ ہم نے آپ کو گزشتہ ایک منٹ میں نہ دیکھا ہو۔"
-          other: "ہم آپ کو اِی میل کریں گے صرف اُس صور میں کہ ہم نے آپ کو گزشتہ {{count}} منٹ میں نہ دیکھا ہو۔"
+          one: ہم آپ کو اِی میل کریں گے صرف اُس صور میں کہ ہم نے آپ کو گزشتہ ایک منٹ میں نہ دیکھا ہو۔
+          other: ہم آپ کو اِی میل کریں گے صرف اُس صور میں کہ ہم نے آپ کو گزشتہ {{count}} منٹ میں نہ دیکھا ہو۔
       name:
         title: "نام"
         instructions: "آپ کا پورا نام (اختیاری)"
@@ -639,8 +736,6 @@ ur:
       created: "شمولیت اختیار کی"
       log_out: "لاگ آُوٹ"
       location: "محل وقوع"
-      card_badge:
-        title: "صارف کارڈ بیج"
       website: "وِیب سائٹ"
       email_settings: "اِی میل"
       like_notification_frequency:
@@ -694,10 +789,10 @@ ur:
         title: "دعوتیں"
         user: "مدعو کیا گیا صارف"
         sent: "بھیج دیا گیا"
-        none: "ظاہر کرنے کے لئے کوئی زیرِاِلتوَاء دعوتیں نہیں ہیں۔"
+        none: "ظاہر کرنے کے لئے کوئی دعوتیں نہیں ہیں۔"
         truncated:
-          one: "پہلی دعوت دکھائی جا رہی ہیں۔"
-          other: "پہلی {{count}} دعوتیں دکھائی جا رہی ہیں۔"
+          one: پہلی دعوت دکھائی جا رہی ہیں۔
+          other: پہلی {{count}} دعوتیں دکھائی جا رہی ہیں۔
         redeemed: "دعوتیں جِن سے فائدہ اٹھا لیا گیا ہے"
         redeemed_tab: "فائدہ اٹھا لیا گیا"
         redeemed_tab_with_count: "فائدہ اٹھا لیا گیا ({{count}})"
@@ -710,8 +805,12 @@ ur:
         expired: "اِس دعوت کی میعاد ختم ہو چکی ہے۔"
         rescind: "خارج کریں"
         rescinded: "دعوت خارج کر دی گئی"
+        rescind_all: "تمام دعوتیں منسوخ کر دیں"
+        rescinded_all: "تمام دعوتیں منسوخ کر دی گئیں!"
+        rescind_all_confirm: "کیا آپ واقعی تمام دعوتیں منسوخ کر دینا چاہتے ہیں؟"
         reinvite: "دعوت دوبارہ بھیجیں"
         reinvite_all: "تمام دعوتیں دوبارہ بھیجیں"
+        reinvite_all_confirm: "کیا آپ واقعی تمام دعوتیں دوبارہ بھیجنا چاہتے ہیں؟"
         reinvited: "دعوت دوبارہ بھیج دی گئی"
         reinvited_all: "تمام دعوتیں دوبارہ بھیج دی گئیں!"
         time_read: "پڑھنے کیلئے اِستعمال ہونے والا وقت"
@@ -720,7 +819,7 @@ ur:
         create: "ایک دعوت بھیجیں"
         generate_link: "دعوت لنک کاپی کریں"
         link_generated: "دعوت لنک کامیابی سے بن گیا!"
-        valid_for: "دعوت لنک صرف اِس اِی میل اِیڈریس کے لئے درست ہے:٪{اِیمیل}"
+        valid_for: "دعوت لنک صرف اِس اِی میل اِیڈریس کے لئے درست ہے:%{email}"
         bulk_invite:
           none: "آپ نے یہاں ابھی تک کسی کو بھی مدعو نہیں کیا۔ انفرادی طار پر دعوت نامے ارسال کریں، یا <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>ایک CSV فائل اَپ لوڈ کرکے</a> ایک وقت میں ہی بہت سے لوگوں کو دعوت دیں۔"
           text: "فائل کی مدد سے ایک وقت میں بہت سے لوگوں کو دعوت دیں"
@@ -738,21 +837,31 @@ ur:
         title: "خلاصہ"
         stats: "اعدادوشمار"
         time_read: "پڑھنے کیلئے اِستعمال ہونے والا وقت"
+        recent_time_read: "پڑھنے کیلئے اِستعمال ہونے والا حالیہ وقت"
         topic_count:
-          one: "بنایا گیا ٹاپک"
-          other: "بنائے گئے ٹاپک"
+          one: بنایا گیا ٹاپک
+          other: بنائے گئے ٹاپک
         post_count:
-          one: "بنائی گئی پوسٹ"
-          other: "بنائی گئیں پوسٹ"
+          one: بنائی گئی پوسٹ
+          other: بنائی گئیں پوسٹ
+        likes_given:
+          one: دیا گیا
+          other: دیا گیا
+        likes_received:
+          one: موصول ہوا
+          other: موصول ہوا
         days_visited:
-          one: "دن جس میں دورہ کیا گیا"
-          other: "دن جن میں دورہ کیا گیا"
+          one: دن جس میں دورہ کیا گیا
+          other: دن جن میں دورہ کیا گیا
+        topics_entered:
+          one: دیکھ لیا گیا ٹاپک
+          other: دیکھ لیے گئے ٹاپک
         posts_read:
-          one: "پڑھی گئی پوسٹ"
-          other: "پڑھی گئیں پوسٹس"
+          one: پڑھی گئی پوسٹ
+          other: پڑھی گئیں پوسٹس
         bookmark_count:
-          one: "بُک مارک"
-          other: "بُکمارکس"
+          one: بُک مارک
+          other: بُکمارکس
         top_replies: "ٹاپ جوابات"
         no_replies: "ابھی تک کوئی جوابات نہیں۔"
         more_replies: "مزید جوابات"
@@ -778,6 +887,7 @@ ur:
         header_title: "پروفائل، پیغامات، بک مارکس اور ترجیحات"
       title:
         title: "عنوان"
+        none: "(کوئی نہیں)"
       filters:
         all: "تمام"
       stream:
@@ -813,15 +923,15 @@ ur:
       enabled: "یہ سائٹ صرف پڑھنے کے مَوڈ میں ہے۔ براہِ مہربانی براؤز کرتے رہئیے، لیکن جواب دینا، لائکس دینا، اور دیگر اعمال ابھی کے لئے غیر فعال ہیں۔"
       login_disabled: "جب تک سائٹ صرف پڑھنے کے مَوڈ میں ہے لاگ اِن غیر فعال رہے گا۔"
       logout_disabled: "جب تک سائٹ صرف پڑھنے کے مَوڈ میں ہے لاگ آؤٹ غیر فعال رہے گا۔"
-    too_few_topics_and_posts_notice: "چلیں <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>اِس بحث کو شروع کریں!</a> اِس وقت اَبھی <strong>٪{موجودہ ٹاپک}/٪{درکار ٹاپک}<strong/> ٹاپک اور <strong>٪{موجودہ پوسٹ}/٪{درکار پوسٹ}<strong/> پوسٹ ہیں۔ نئے زائرین کو پڑھنے اور اُن کا جواب دینے کیلئے کچھ مکالمات کی ضرورت ہے۔"
-    too_few_topics_notice: "چلیں <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>اِس بحث کو شروع کریں!</a> اِس وقت اَبھی <strong>٪{موجودہ ٹاپک}/٪{درکار ٹاپک}<strong/> ٹاپک ہیں۔ نئے زائرین کو پڑھنے اور اُن کا جواب دینے کیلئے کچھ مکالمات کی ضرورت ہے۔"
-    too_few_posts_notice: "چلیں <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>اِس بحث کو شروع کریں!</a> اِس وقت اَبھی <strong>٪{موجودہ پوسٹ}/٪{درکار پوسٹ}<strong/> پوسٹ ہیں۔ نئے زائرین کو پڑھنے اور اُن کا جواب دینے کیلئے کچھ مکالمات کی ضرورت ہے۔"
+    too_few_topics_and_posts_notice: "چلیں <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>اِس بحث کو شروع کریں!</a> اِس وقت اَبھی <strong>%{currentTopics}/%{requiredTopics}</strong> ٹاپکس اور <strong>%{currentPosts}/%{requiredPosts}</strong> پوسٹس ہیں۔ نئے زائرین کو پڑھنے اور اُن کا جواب دینے کیلئے کچھ مکالمات کی ضرورت ہے۔"
+    too_few_topics_notice: "چلیں <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>اِس بحث کو شروع کریں!</a> اِس وقت اَبھی <strong>%{currentTopics}/%{requiredTopics}</strong> ٹاپکس ہیں۔ نئے زائرین کو پڑھنے اور اُن کا جواب دینے کیلئے کچھ مکالمات کی ضرورت ہے۔"
+    too_few_posts_notice: "چلیں <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>اِس بحث کو شروع کریں!</a> اِس وقت اَبھی <strong>%{currentPosts}/%{requiredPosts}</strong> پوسٹس ہیں۔ نئے زائرین کو پڑھنے اور اُن کا جواب دینے کیلئے کچھ مکالمات کی ضرورت ہے۔"
     logs_error_rate_notice:
-      reached: "<b>٪{relativeAge}</b> – <a href='%{url}' target='_blank'>٪{rate}</a> ٪{siteSettingRate} کی سائٹ سیٹِنگ لِمٹ تک پہنچ گئی۔"
-      exceeded: "<b>٪{relativeAge}</b> – <a href='%{url}' target='_blank'>٪{rate}</a> ٪{siteSettingRate} کی سائٹ سیٹِنگ لِمٹ سے تجاوز کر گئی۔"
+      reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> سائٹ سیٹِنگ لِمٹ %{siteSettingRate} تک پہنچ گئی۔"
+      exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> سائٹ سیٹِنگ لِمٹ %{siteSettingRate} سے تجاوز کر گئی۔"
       rate:
-        one: "1 خرابی/٪{مدت}"
-        other: "٪{count} خرابیاں/٪{duration}"
+        one: 1 خرابی/%{duration}
+        other: '%{count} خرابیاں/%{duration}'
     learn_more: "اورجانیے..."
     all_time: 'کُل'
     all_time_desc: 'کُل ٹاپک بنائے گئے'
@@ -835,6 +945,11 @@ ur:
     first_post: پہلی پوسٹ
     mute: خاموش کریں
     unmute: آواز چالو کریں
+    last_post: پوسٹ کیا
+    time_read: پڑھا
+    time_read_recently: 'حال ہی میں %{time_read}'
+    time_read_tooltip: 'کُل وقت پڑھا %{time_read}'
+    time_read_recently_tooltip: 'کُل وقت پڑھنے میں لگا %{time_read}(%{recent_time_read} گزشتہ 60 دنوں میں) '
     last_reply_lowercase: آخری جواب
     replies_lowercase:
       one: جواب
@@ -860,6 +975,7 @@ ur:
     private_message_info:
       title: "پیغام"
       invite: "دوسروں کو مدعو کریں..."
+      leave_message: "کیا آپ واقعی یہ پیغام بھیجنا چاہتے ہیں؟"
       remove_allowed_user: "کیا آپ واقعی اِس پیغام سے {{name}} ہٹانا چاہتے ہیں؟"
       remove_allowed_group: "کیا آپ واقعی اِس پیغام سے {{name}} ہٹانا چاہتے ہیں؟"
     email: 'اِی میل'
@@ -870,7 +986,7 @@ ur:
     trust_level: 'ٹرسٹ لَیول'
     search_hint: 'صارف نام، ای میل یا IP ایڈریس'
     create_account:
-      disclaimer: "رجسٹر کرنے پر آپ <{{a href='{{privacy link>زاتی معلومات کی حفاظتی پالیسی</a> اور <a href='{{tos_link}}'>سروس کی شرائط</a>۔"
+      disclaimer: "رجسٹر کرنے پر آپ <a href='{{privacy_link}}'>پرائیوِیسی پالیسی</a> اور <a href='{{tos_link}}'>سروس کی شرائط</a>سے اتفاق کرتے ہیں۔"
       title: "نیا اکاؤنٹ بنائیں"
       failed: "کچھ غلط ہو گیا، شاید یہ ای میل پہلے ہی سے رجسٹرڈ ہے، پاسورڈ بھول جانے والا لنک اِستعمال کر کے دیکھیں"
     forgot_password:
@@ -878,20 +994,35 @@ ur:
       action: "میں اپنا پاسورڈ بھول گیا"
       invite: "اپنا صارف نام یا اِی میل ایڈریس درج کریں، اور ہم آپ کو ایک پاسورڈ رِی سَیٹ ایمیل بھیج دیں گے۔"
       reset: "پاسورڈ رِی سَیٹ کریں"
-      complete_username: "اگر کوئی اکاؤنٹ username <b>٪{username}</b> سے ملتا ہو گا، تو آپ کو پاسورڈ رِی سَیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔"
-      complete_email: "اگر کوئی اکاؤنٹ <b>٪{اِیمیل}</b> سے ملتا ہو گا، تو آپ کو پاسورڈ رِی سَیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔"
-      complete_username_found: "ہمیں ایک اکاؤنٹ ملا ہے جو username <b>٪{username}</b> سے میچ کرتا ہے، آپ کو پاسورڈ رِی سَیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔"
-      complete_email_found: "ہمیں ایک اکاؤنٹ ملا ہے جو <b>٪{اِیمیل}</b> سے میچ کرتا ہے، آپ کو پاسورڈ رِی سَیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔"
-      complete_username_not_found: "کوئی اکاؤنٹ username <b>٪{username}</b> سے میچ نہیں کرتا"
-      complete_email_not_found: "کوئی اکاؤنٹ <b>٪{اِیمیل}</b> سے میچ نہیں کرتا"
+      complete_username: "اگر کوئی اکاؤنٹ <b>%{username}</b> سے میچ کرتا ہو گا، تو آپ کو پاسورڈ رِی سَیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔"
+      complete_email: "اگر کوئی اکاؤنٹ <b>%{email}</b> سے ملتا ہو گا، تو آپ کو پاسورڈ رِی سَیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔"
+      complete_username_found: "ہمیں ایک اکاؤنٹ ملا ہے جو <b>%{username}</b> سے میچ کرتا ہے، آپ کو پاسورڈ رِی سَیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔"
+      complete_email_found: "ہمیں ایک اکاؤنٹ ملا ہے جو <b>%{email}</b> سے میچ کرتا ہے، آپ کو پاسورڈ رِی سَیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔"
+      complete_username_not_found: "کوئی اکاؤنٹ <b>%{username}</b> سے میچ نہیں کرتا"
+      complete_email_not_found: "کوئی اکاؤنٹ <b>%{email}</b> سے میچ نہیں کرتا"
+      help: "ای میل نہیں موصول ہر رہی؟ اپنے سپَیم فولڈر کو پہلے چیک کرلیجیے گا۔<p>آپ کو شک ہے کہ کونیسا ای میل ایڈریس آپ نے استعمال کیا ہے؟ ایک ای میل ایڈریس درج کریں اور ہم آپ کو بتائیں گے اگر یہ ہمارے پاس موجود ہے۔</p> <p>اگر آپ کو اپنے اکاؤنٹ پر ای میل ایڈریس تک اب رسائی حاصل نہیں ہے، تو براہ کرم <a href='/about'>ہمارے مددگار اسٹاف</a> سے رابطہ کریں۔</p>"
+      button_ok: "ٹھیک ہے"
+      button_help: "مدد"
+    email_login:
+      link_label: "مجھے ایک لاگ اِن لِنک ای میل کریں"
+      button_label: "ای میل کے ساتھ"
+      complete_username: "اگر ایک اکاؤنٹ صارف نام <b>%{username}</b> سے میچ کرتا ہے، تو آپ کو جلد ہی لاگ اِن لِنک کے ساتھ ایک ای میل موصول ہو جانی چاہئے۔"
+      complete_email: "اگر ایک اکاؤنٹ <b>%{email}</b> سے میچ کرتا ہے، تو آپ کو جلد ہی لاگ اِن لِنک کے ساتھ ایک ای میل موصول ہو جانی چاہئے۔"
+      complete_username_found: "ہمیں ایک ایسا اکاؤنٹ مل گیا جو صارف نام <b>%{username}</b> سے میچ کرتا ہے، آپ کو جلد ہی لاگ اِن لِنک کے ساتھ ایک ای میل موصول ہو جانی چاہئے۔"
+      complete_email_found: "ہمیں ایک ایسا اکاؤنٹ مل گیا جو <b>%{email}</b> سے میچ کرتا ہے، آپ کو جلد ہی لاگ اِن لِنک کے ساتھ ایک ای میل موصول ہو جانی چاہئے۔"
+      complete_username_not_found: "کوئی اکاؤنٹ صارف نام <b>%{username}</b> سے میچ نہیں کرتا"
+      complete_email_not_found: "کوئی اکاؤنٹ <b>%{email}</b> سے میچ نہیں کرتا"
     login:
       title: "لاگ اِن"
       username: "صارف"
       password: "پاسورڈ"
+      second_factor_title: "دو فیکٹر توثیق"
+      second_factor_description: "براہ مہربانی اپنی اَیپ میں سے توثیقی کَوڈ درج کریں:"
       email_placeholder: "اِی میل یا صارف نام"
       caps_lock_warning: "کیپس لاک آن ہے"
       error: "نامعلوم خرابی"
       rate_limit: "دوبارہ لاگ اِن کرنے کی کوشش کرنے سے پہلے براہ کرم تھوڑا انتظار کریں۔"
+      blank_username: "براہ مہربانی اپنا اِیمیل یا صارف نام درج کریں۔"
       blank_username_or_password: "براہ مہربانی اپنا اِیمیل یا صارف نام، اور پاسورڈ درج کریں۔"
       reset_password: 'پاسورڈ رِی سَیٹ کریں'
       logging_in: "لاگ اِن ہو رہا ہے..."
@@ -904,6 +1035,11 @@ ur:
       not_allowed_from_ip_address: "آپ اِس آئی پی ایڈریس سے لاگ اِن نہیں ہو سکتے۔"
       admin_not_allowed_from_ip_address: "آپ ایڈمن کے طور پر اِس آئی پی ایڈریس سے لاگ اِن نہیں ہو سکتے۔"
       resend_activation_email: "دوبارہ ایکٹیویشن ای میل بھیجنے کے لئے یہاں کلک کریں۔"
+      omniauth_disallow_totp: "آپ کے اکاؤنٹ پر دو فیکٹر توثیق فعال ہے۔ براہ مہربانی اپنے پاسوَرڈ کے ساتھ لاگ اِن کریں۔"
+      resend_title: "ایکٹیویشن اِیمیل دوبارہ بھیجییں"
+      change_email: "اِیمیل ایڈریس تبدیل کریں"
+      provide_new_email: "ایک نیا ایڈریس فراہم کریں اور ہم آپ کی تصدیقی ای میل دوبارہ بھیجیں گے۔"
+      submit_new_email: "اِیمیل ایڈریس اَپ ڈَیٹ کریں"
       sent_activation_email_again: "ہم نے آپ کو <b>{{currentEmail}}</b> پر ایک اور ایکٹیویشن اِی میل بھیجی ہے۔ اسے پہنچنے میں چند منٹ لگ سکتے ہیں؛ اپنے سپیم فولڈر کو چیک کرنا نہ بھولیے گا۔"
       to_continue: "برائے مہربانی لاگ اِن کریں"
       preferences: "آپ کا اپنی صارف ترجیحات کو تبدیل کرنے کے لیے لاگ اِن ہونا ضروری ہے۔"
@@ -932,34 +1068,70 @@ ur:
         message: "گِٹ ہَب کے زریعے تصدیق کی جا رہی ہے (یقینی بنائیں کہ پاپ اَپ بلاکرز فعال نہیں ہیں)"
     invites:
       accept_title: "دعوت نامہ"
-      welcome_to: "{SITE_NAME}٪ پر خوش آمدید!"
+      welcome_to: "%{site_name} پر خوش آمدید!"
       invited_by: "آپ کو جن کی طرف سے مدعو کیا گیا تھا:"
       social_login_available: "آپ اِس اِیمیل کا استعمال کرتے ہوئے کسی بھی سوشل لاگ اِن کے ساتھ سائن اِن بھی کرسکیں گے۔"
-      your_email: "آپ کے اکاؤنٹ کا اِیمیل ایڈریس <b>٪{اِیمیل}</b> ہے۔"
+      your_email: "آپ کے اکاؤنٹ کا اِیمیل ایڈریس <b>%{email}</b> ہے۔"
       accept_invite: "دعوت قبول کریں"
       success: "آپ کا اکاؤنٹ بنا دیا گیا ہے اور اب آپ لاگ اِن کر سکتے ہیں۔"
+      name_label: "نام"
+      password_label: "پاس ورڈ رکھیں"
+      optional_description: "(اختیاری)"
     password_reset:
-      continue: "{SITE_NAME}٪ پر جاری رکھیں"
+      continue: "%{site_name} پر جاری رکھیں"
     emoji_set:
       apple_international: "Apple/International"
       google: "Google"
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+      google_classic: "گُوگَل کلاسِک"
+      facebook_messenger: "فَیس بُک مَیسنجر"
     category_page_style:
       categories_only: "صرف زمرہ جات"
       categories_with_featured_topics: "نمایاں ٹاپکس کے ساتھ زمرہ جات"
-      categories_and_latest_topics: "تازہ ترین ٹاپکس کے ساتھ زمرہ جات"
+      categories_and_latest_topics: "زُمرہ جات اور تازہ ترین ٹاپکس"
+      categories_and_top_topics: "زمرہ جات اور ٹاپ ٹاپکس"
     shortcut_modifier_key:
       shift: 'شفٹ'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    select_kit:
+      default_header_text: منتخب کریں...
+      no_content: کوئی میل نہیں ملے
+      filter_placeholder: تلاش کریں...
+      create: "'{{content}}' بنائیں"
+    emoji_picker:
+      filter_placeholder: اِیمَوجی تلاش کریں
+      people: لوگ
+      nature: نَیچر
+      food: کھانا
+      activity: سرگرمی
+      travel: سفر
+      objects: اشیاء
+      celebration: جشن
+      custom: اپنی مرضی کے اِیمَوجی
+      recent: حال ہی میں استعمال کیے گئے
+      default_tone: کوئی جِلد رنگ نہیں
+      light_tone: ہلکا جِلد رنگ
+      medium_light_tone: درمیانا ہلکا جِلد رنگ
+      medium_tone: درمیانا جِلد رنگ
+      medium_dark_tone: درمیانا سیاہ جِلد رنگ
+      dark_tone: سیاہ جِلد رنگ
+    shared_drafts:
+      title: "مشترکہ ڈرافٹس"
+      notice: "یہ ٹاپک صرف اُن لوگوں کیلئے نظر آتا ہے جو <b>{{category}}</b> زُمرَہ کو دیکھ سکتے ہیں۔"
+      destination_category: "مطلوبہ زُمرَہ"
+      publish: "مشترکہ ڈرافٹس شائع کریں"
+      confirm_publish: "کیا آپ واقعی اِس ڈرافٹ کو شائع کرنا چاہتے ہیں؟"
+      publishing: "ٹاپک شائع کیا جا رہا ہے..."
     composer:
       emoji: "اِیمَوجی :)"
       more_emoji: "مزید..."
       options: "اختیارات"
       whisper: "سرگوشی"
       unlist: "غیر مندرج"
+      blockquote_text: "بلاک متن"
       add_warning: "یہ ایک آفیشل انتباہ ہے۔"
       toggle_whisper: "سرگوشی ٹَوگل کریں"
       toggle_unlisted: "غیر مندرج ٹَوگل کریں"
@@ -969,12 +1141,14 @@ ur:
       saved_local_draft_tip: "مقامی طور پر محفوظ کر لیا گیا"
       similar_topics: "آپ کا ٹاپک ملتا ہے..."
       drafts_offline: "ڈرافٹس آف لائن"
+      group_mentioned_limit: "<b>انتباہ!</b> آپ نے <a href='{{group_link}}'>{{group}}</a> کا ذکر کیا ہے، تاہم اس گروپ کے ممبران کی تعداد، منتظم کی طرف سے مقرر کردہ {{max}} صارفین کے ذکر کی حد سے زیادہ ہے ۔ کسی کو بھی اطلاع نہیں دی جائے گی۔"
       group_mentioned:
-        one: "{{group}} کا ذکر کر کہ، آپ <a href='{{group_link}}'>1 شخص</a> کو مطلع کرنے لگے ہیں - کیا آپ واقعی یہ کرنا چاہتے ہیں؟"
-        other: "{{group}} کا ذکر کر کہ، آپ <a href='{{group_link}}'>{{count}} لوگوں</a> کو مطلع کرنے لگے ہیں - کیا آپ واقعی یہ کرنا چاہتے ہیں؟"
+        one: '{{group}} کا ذکر کر کہ، آپ <a href=''{{group_link}}''>1 شخص</a> کو مطلع کرنے لگے ہیں - کیا آپ واقعی یہ کرنا چاہتے ہیں؟'
+        other: '{{group}} کا ذکر کر کہ، آپ <a href=''{{group_link}}''>{{count}} لوگوں</a> کو مطلع کرنے لگے ہیں - کیا آپ واقعی یہ کرنا چاہتے ہیں؟'
       cannot_see_mention:
         category: "آپ نے {{username}} کا زکر کیا ہے لیکن چونکہ اُن کو اِس زمرے تک رسائی حاصل نہیں، اُن کو مطلع نہیں کیا جائے گا۔ آپ کو انہیں ایک ایسے گروپ میں شامل کرنے کی ضرورت ہے جسے اِس زمرے تک رسائی حاصل ہے۔"
         private: "آپ نے {{username}} کا زکر کیا ہے لیکن چونکہ وہ یہ ذاتی پیغام نہیں دیکھ سکتے اُن کو مطلع نہیں کیا جائے گا۔ آپ کو اُنہیں اِس ذاتی پیغام میں مدعو کرنے کی ضرورت ہے۔"
+      duplicate_link: "لگتا ہے کہ آپ کا <b>{{domain}}</b> لنک <b>@{{username}}</b> نے <a href='{{post_url}}'>{{ago}} کو ٹاپک میں پہلے سے ہی ایک جواب</a> میں پوسٹ کر دیا تھا - کیا آپ واقعی یہ دوبارہ پوسٹ کرنا چاہتے ہیں؟"
       error:
         title_missing: "عنوان درکار ہے"
         title_too_short: "عنوان میں کم از کم {{min}} حروف ہونا ضروری ہے"
@@ -990,6 +1164,9 @@ ur:
       cancel: "منسوخ"
       create_topic: "ٹاپک بنائیں"
       create_pm: "پیغام"
+      create_whisper: "سرگوشی"
+      create_shared_draft: "مشترکہ ڈرافٹ بنائیں"
+      edit_shared_draft: "مشترکہ ڈرافٹ ترمیم کریں"
       title: "یا Ctrl+Enter دبائیں"
       users_placeholder: "ایک صارف شامل کریں"
       title_placeholder: "ایک مختصر جملہ میں بتائیے کہ یہ بحث کس چیز کے بارے میں ہے؟"
@@ -997,7 +1174,9 @@ ur:
       edit_reason_placeholder: "آپ ترمیم کیوں کر رہے ہیں؟"
       show_edit_reason: "(ترمیم کی وجہ شامل کریں)"
       topic_featured_link_placeholder: "عنوان کے ساتھ دکھایا گیا لنک درج کریں۔"
+      remove_featured_link: "ٹاپک سے لنک ہٹا ئیں۔"
       reply_placeholder: "یہاں ٹائپ کریں۔ فارمیٹ کیلئے مارکڈائون، BBCode، یا HTML اِستعمال کریں۔ تصاویر ڈریگ یا پیسٹ کریں۔"
+      reply_placeholder_no_images: "یہاں ٹائپ کریں۔ فارمیٹ کیلئے مارکڈائون، BBCode، یا HTML اِستعمال کریں۔"
       view_new_post: "اپنے نئی پوسٹ دیکھئیے۔"
       saving: "محفوظ کیا جا رہا ہے"
       saved: "محفوظ کر لیا گیا!"
@@ -1007,8 +1186,10 @@ ur:
       hide_preview: '&laquo; پیش نظارہ چھپائیں'
       quote_post_title: "پوری پوسٹ کا اقتباس کریں"
       bold_label: "B"
+      bold_title: "گہرا"
       bold_text: "گہرا ٹَیکسٹ"
       italic_label: "I"
+      italic_title: "آئیٹیلک"
       italic_text: "زور دیا گیا ٹَیکسٹ"
       link_title: "ہائپرلِنک"
       link_description: "یہاں لِنک کی تفصیل درج کریں"
@@ -1025,35 +1206,74 @@ ur:
       olist_title: "نمبروار فہرست"
       ulist_title: "بلٹ والی لسٹ"
       list_item: "فہرست آئٹم"
+      toggle_direction: "سمت ٹَوگل کریں"
       help: "مارکڈائون ترمیم میں مدد"
+      collapse: "کمپوزر پینل کو مینِمائز کریں"
+      abandon: "کمپوزر بند اور ڈرافٹ ختم کردیں"
       modal_ok: "ٹھیک"
       modal_cancel: "منسوخ"
-      cant_send_pm: "معذرت، آپ ٪{username} کو پیغام نہیں بھیج سکتے۔"
+      cant_send_pm: "معذرت، آپ %{username} کو پیغام نہیں بھیج سکتے۔"
       yourself_confirm:
         title: "کیا آپ وصول کنندگان کو شامل کرنا بھول گئے؟"
         body: "اِس وقت یہ پیغام صرف اپنے آپ کو بھیجا جا رہا ہے!"
       admin_options_title: "اس ٹاپک کیلئے عملے کی اختیاری سیٹِنگ"
+      composer_actions:
+        reply_to_post:
+          label: "%{postUsername} کی طرف سے پوسٹ %{postNumber} کا جواب دیں"
+          desc: ایک مخصوص پوسٹ پر جواب دیں
+        reply_as_new_topic:
+          label: مُنسلِک ٹاپک کے طور پر جواب دیں
+          desc: اِس ٹاپک سے منسلک ایک نیا ٹاپک بنائیں
+        reply_as_private_message:
+          label: نیا پیغام
+          desc: نیا ذاتی پیغام بنائیں
+        reply_to_topic:
+          label: ٹاپک پر جواب دیں
+          desc: ٹاپک کا جواب دیں، نہ کہ کسی مخصوص پوسٹ کا
+        toggle_whisper:
+          label: سرگوشی ٹَوگل کریں
+          desc: سرگوشیاں صرف سٹاف اراکین کو نظر آتی ہیں
+        create_topic:
+          label: "نیا ٹاپک"
+        shared_draft:
+          label: "مشترکہ ڈرافٹ"
+          desc: "ایک ٹاپک ڈرافٹ کریں جو صرف سٹاف کو نظر آسکے"
     notifications:
+      tooltip:
+        regular:
+          one: 1 اندیکھی اطلاع
+          other: '{{count}} اندیکھی اطلاعات'
+        message:
+          one: 1 غیر پڑھا پیغام
+          other: '{{count}} غیر پڑھے پیغامات'
       title: "@نام کے ذکر، آپ کی پوسٹ اور ٹاپک پر جوابات، پیغامات، وغیرہ کی اطلاعات"
       none: "اِس وقت ویب سائٹ اطلاعات لوڈ کرنے سے قاصر ہے۔"
       empty: "کوئی اطلاعات نہیں ملیں۔"
       more: "پرانی اطلاعات دیکھیے"
       total_flagged: "کُل فلَیگ کی گئی پوسٹس"
-      alt:
-        mentioned: "کی طرف سے ذکر کیا گیا"
-        quoted: "کی طرف سے اقتباس کیا گیا"
-        replied: "جواب دیا"
-        posted: "کی طرف سے پوسٹ"
-        edited: "اِس وقت تک اپنی پوسٹ میں ترمیم کر لیں"
-        liked: "آپ کی پوسٹ کو لائیک کیا"
-        private_message: "کی طرف سے ذاتی پیغام"
-        invited_to_private_message: "کی طرف سے ذاتی پیغام کیلئے دعوت دی گئی"
-        invited_to_topic: "کی طرف سے ٹاپک کیلئے دعوت دی گئی"
-        invitee_accepted: "کی طرف سے دعوت قبول کر لی گئی"
-        moved_post: "کی طرف سے آپ کی پوسٹ منتقل کر دی گئی تھی"
-        linked: "آپ کی پوسٹ سے لنک کیا"
-        granted_badge: "بَیج عطا کیا"
-        group_message_summary: "گروپ اِن باکس میں پیغامات"
+      mentioned: "<span>{{username}}</span> {{description}}"
+      group_mentioned: "<span>{{username}}</span> {{description}}"
+      quoted: "<span>{{username}}</span> {{description}}"
+      replied: "<span>{{username}}</span> {{description}}"
+      posted: "<span>{{username}}</span> {{description}}"
+      edited: "<span>{{username}}</span> {{description}}"
+      liked: "<span>{{username}}</span> {{description}}"
+      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      liked_many:
+        one: <span>{{username2}}، {{username}} اور 1 مزید</span> {{description}}
+        other: <span>{{username2}}، {{username}} اور {{count}} مزید</span> {{description}}
+      private_message: "<span>{{username}}</span> {{description}}"
+      invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
+      invited_to_topic: "<span>{{username}}</span> {{description}}"
+      invitee_accepted: "<span>{{username}}</span>نے آپ کی دعوت قبول کرلی "
+      moved_post: "<span>{{username}}</span>نے {{description}} منتقل کر دیا"
+      linked: "<span>{{username}}</span> {{description}}"
+      granted_badge: "'{{description}}' حاصل کیا"
+      topic_reminder: "<span>{{username}}</span> {{description}}"
+      watching_first_post: "<span>نیا ٹاپک</span> {{description}}"
+      group_message_summary:
+        one: آپ کے {{group_name}} اِن باکس میں {{count}} پیغام
+        other: آپ کے {{group_name}} اِن باکس میں {{count}} پیغامات
       popup:
         mentioned: '{{username}} نے آپ کا تذکرہ "{{topic}}" میں کیا - {{site_title}}'
         group_mentioned: '{{username}} نے آپ کا تذکرہ "{{topic}}" میں کیا - {{site_title}}'
@@ -1076,10 +1296,12 @@ ur:
       uploading: "اَپ لوڈ کیا جا رہا ہے"
       select_file: "فائل منتخب کریں"
       image_link: "لنک جس سے آپ کی تصویر منسلک ہو گی"
+      default_image_alt_text: تصویر
     search:
       sort_by: "ترتیب بہ"
       relevance: "مطابقت"
       latest_post: "تازہ ترین پوسٹ"
+      latest_topic: "تازہ ترین ٹاپک"
       most_viewed: "سب سے زیادہ دیکھا گیا"
       most_liked: "سب سے زیادہ لائک کیا گیا"
       select_all: "تمام منتخب کریں"
@@ -1090,29 +1312,47 @@ ur:
       no_more_results: "کوئی اور نتائج نہیں پائے گئے۔"
       searching: "تلاش کیا جا رہا ہے ..."
       post_format: "{{username}} کی طرف سے #{{post_number}}"
+      results_page: "'{{term}}' کیلئے سرچ کے نتائج"
+      more_results: "مزید نتائج موجود ہیں۔ برائے مہربانی اپنے سرچ کے معیار کو محدود کریں۔"
+      cant_find: "آپ جو ڈھونڈ رہے تھے وہ نہیں مل سکا؟"
+      start_new_topic: "شاید ایک نیا ٹاپک شروع کریں؟"
+      or_search_google: "یا اس کے بجائے گُوگَل کے ساتھ تلاش کرنے کی کوشش کریں:"
+      search_google: "اس کے بجائے گُوگَل کے ساتھ تلاش کرنے کی کوشش کریں:"
+      search_google_button: "گُوگَل"
+      search_google_title: "اِس سائٹ میں تلاش کریں"
       context:
         user: "@{{username}} کے حساب سے پوسٹس تلاش کریں"
-        category: "#{{category}} category میں تلاش کریں"
+        category: "#{{category}} زُمرَہ میں تلاش کریں"
         topic: "اِس ٹاپک میں تلاش کریں"
         private_messages: "پیغامات میں تلاش کریں"
       advanced:
         title: اعلی درجے کی تلاشی
         posted_by:
           label: کی طرف سے پوسٹ کیا گیا
+        in_category:
+          label: زمرہ میں ڈالا گیا
         in_group:
           label: گروپ میں
         with_badge:
           label: بَیج کے ساتھ
+        with_tags:
+          label: ٹیگ ہواوا
         filters:
+          label: صرف وہ ٹاپک/پوسٹس دکھائیں جو...
           likes: جو میں نے لائیک کیے
           posted: جن میں میں نے پوسٹ کیا
           watching: جو میں دیکھ رہا ہوں
           tracking: جو میں ٹریک کر رہا ہوں
+          private: میرے پیغامات میں ہوں
+          bookmarks: میں نے بُک مارک کیے ہوے ہوں
           first: جو سب سے پہلی پوسٹ ہو
           pinned: جو پِن ہوا ہو
           unpinned: جو پِن نہ ہوا ہو
+          seen: جو میں نے پڑھ لیے ہوں
           unseen: جو میں نے نہ پڑھا ہو
           wiki: جو وِیکی ہو
+          images: تصاویر شامل کریں
+          all_tags: تمام درجِ بالا ٹیگز
         statuses:
           label: جہاں ٹاپک
           open: کھلے ہوں
@@ -1138,6 +1378,7 @@ ur:
         select_all: "تمام منتخب کریں"
         clear_all: "تمام کو صاف کریں"
         unlist_topics: "ٹاپکس کو فہرست سے ہٹائیں"
+        relist_topics: "ٹاپک دوبارہ فہرست کریں"
         reset_read: "\"پڑھ لیا گیا\" کو رِی سَیٹ کریں"
         delete: "ٹاپکس حذف کریں"
         dismiss: "بر خاست کریں"
@@ -1148,12 +1389,14 @@ ur:
         dismiss_new: "نیا برخاست کریں"
         toggle: "ٹاپکس کے بَلک انتخاب کو ٹَوگل کریں"
         actions: "بَلک عمل"
+        change_category: "زمرہ تبدیل کریں"
         close_topics: "ٹاپکس بند کریں"
         archive_topics: "ٹاپکس آر کائیو کریں"
+        notification_level: "اطلاعات"
         choose_new_category: "ٹاپکس کیلئے نئے زمرہ کا انتخاب کریں:"
         selected:
-          one: "آپ نے <b>1</b> ٹاپک منتخب کیا ہے۔"
-          other: "آپ نے <b>{{count}}</b> ٹاپک منتخب کیے ہیں۔"
+          one: آپ نے <b>1</b> ٹاپک منتخب کیا ہے۔
+          other: آپ نے <b>{{count}}</b> ٹاپک منتخب کیے ہیں۔
         change_tags: "ٹیگز بدلیں"
         append_tags: "ٹیگز میں اضافہ کریں"
         choose_new_tags: "ان ٹاپکس کیلئے نئے ٹیگز کا انتخاب کریں:"
@@ -1185,12 +1428,9 @@ ur:
         bookmarks: "مزید کوئی بک مارک کیے ہوئے ٹاپک موجود نہیں۔"
         search: "سرچ کے مزید کوئی نتائج نہیں۔"
     topic:
-      unsubscribe:
-        stop_notifications: "اب آپ کو <strong>{{title}}</strong> کیلئے کم اطلاعات موصول ہوں گی"
-        change_notification_state: "آپ کا موجودہ نوٹیفکیشن حالت ہے"
       filter_to:
-        one: "ٹاپک میں 1 پوسٹ"
-        other: "ٹاپک میں {{count}} پوسٹس"
+        one: ٹاپک میں 1 پوسٹ
+        other: ٹاپک میں {{count}} پوسٹس
       create: 'نیا ٹاپک'
       create_long: 'نیا ٹاپک بنائیں'
       private_message: 'ایک پیغام شروع کریں'
@@ -1200,14 +1440,17 @@ ur:
       move_to_inbox:
         title: 'اِنباکس میں منتقل کریں'
         help: 'پیغام واپس اِنباکس میں منتقل کریں'
+      edit_message:
+        help: 'پیغام کی پہلی اشاعت میں ترمیم کریں'
+        title: 'پیغام میں ترمیم کریں'
       list: 'ٹاپک'
       new: 'نیا ٹاپک'
       unread: 'بغیر پڑھے'
       new_topics:
-        one: '1 نیا ٹاپک'
+        one: 1 نیا ٹاپک
         other: '{{count}} نئے ٹاپک'
       unread_topics:
-        one: '1 بغیر پڑھا گیا ٹاپک'
+        one: 1 بغیر پڑھا گیا ٹاپک
         other: '{{count}} بغیر پڑھے گئے ٹاپک'
       title: 'ٹاپک'
       invalid_access:
@@ -1221,36 +1464,86 @@ ur:
         title: "ٹاپک نہیں ملا"
         description: "معزرت، ہم یہ ٹاپک نہیں ڈھونڈ سکے۔ شاید یہ کسی ماڈریٹر نے ہٹا دیا ہو؟"
       total_unread_posts:
-        one: "آپ کے پاس اِس ٹاپک میں 1 بغیر پڑھی پوسٹ موجود ہے"
-        other: "آپ کے پاس اِس ٹاپک میں {{count}} بغیر پڑھی پوسٹ موجود ہیں"
+        one: آپ کے پاس اِس ٹاپک میں 1 بغیر پڑھی پوسٹ موجود ہے
+        other: آپ کے پاس اِس ٹاپک میں {{count}} بغیر پڑھی پوسٹ موجود ہیں
       unread_posts:
-        one: "آپ کے پاس اِس ٹاپک میں 1 بغیر پڑھی پرانی پوسٹ موجود ہے"
-        other: "آپ کے پاس اِس ٹاپک میں {{count}} بغیر پڑھی پرانی پوسٹ موجود ہیں"
+        one: آپ کے پاس اِس ٹاپک میں 1 بغیر پڑھی پرانی پوسٹ موجود ہے
+        other: آپ کے پاس اِس ٹاپک میں {{count}} بغیر پڑھی پرانی پوسٹ موجود ہیں
       new_posts:
-        one: "آپ کے آخری دفع یہ ٹاپک پڑھنے کے بعد 1 نئی پوسٹ شائع ہوئی"
-        other: "آپ کے آخری دفع یہ ٹاپک پڑھنے کے بعد {{count}} نئی پوسٹ شائع ہوئیں"
+        one: آپ کے آخری دفع یہ ٹاپک پڑھنے کے بعد 1 نئی پوسٹ شائع ہوئی
+        other: آپ کے آخری دفع یہ ٹاپک پڑھنے کے بعد {{count}} نئی پوسٹ شائع ہوئیں
       likes:
-        one: "اِس ٹاپک میں 1 لائیک ہے"
-        other: "اِس ٹاپک میں {{count}} لائیکس ہیں"
+        one: اِس ٹاپک میں 1 لائیک ہے
+        other: اِس ٹاپک میں {{count}} لائیکس ہیں
       back_to_list: "واپس ٹاپک فہرست پر"
       options: "ٹاپک اختیارات"
       show_links: "اِس ٹاپک کے اندر موجود لنکس دکھایں"
       toggle_information: "ٹاپک تفصیلات ٹَوگل کریں"
       read_more_in_category: "مزید پڑھنا چاہتے ہیں؟ {{catLink}} اور {{latestLink}} میں دوسرے ٹاپک دیکھیں۔"
       read_more: "مزید پڑھنا چاہتے ہیں؟ {{catLink}} یا {{latestLink}}۔"
+      read_more_MF: "{ UNREAD, plural, =0 {} one { <a href='/unread'>1 غیر پڑھا</a> } other { <a href='/unread'># غیر پڑھے</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{اور } false {} other{}} <a href='/new'>1 نیا</a> ٹاپک} other { {BOTH, select, true{and } false {are } other{}} <a href='/new'># نئے</a> ٹاپکس} } باقی، یا {CATEGORY, select, true {میں دیگر ٹاپکس براؤز کریں {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: تمام زمرہ جات براؤز کریں
       view_latest_topics: تازہ ترین ٹاپک دیکھیے
       suggest_create_topic: کیوں نہ ایک ٹاپک بنائیں؟
       jump_reply_up: اِس سے پرانے جواب پر جائیں
       jump_reply_down: اِس سے نئے جواب پر جائیں
       deleted: "ٹاپک حذف کردیا گیا ہے"
+      topic_status_update:
+        title: "ٹاپک ٹائمر"
+        save: "ٹائمر مقرر کریں"
+        num_of_hours: "گھنٹوں کی تعداد:"
+        remove: "ٹائمر ہٹائیں"
+        publish_to: "شائع کریں:"
+        when: "کب:"
+        public_timer_types: ٹاپک ٹائمر
+        private_timer_types: صارف کے ٹاپک ٹائمر
+      auto_update_input:
+        none: "ایک ٹائم فریم منتخب کریں"
+        later_today: "آج بعد میں"
+        tomorrow: "کَل"
+        later_this_week: "اِس ہفتے بعد میں"
+        this_weekend: "اِس ہفتےکےآخر میں"
+        next_week: "اگلے ہفتے"
+        two_weeks: "دو ہفتے"
+        next_month: "اگلے ماہ"
+        three_months: "تین مہینے"
+        six_months: "چھ مہینے"
+        one_year: "ایک سال"
+        forever: "ہمیشہ کیلئے"
+        pick_date_and_time: "تاریخ اور وقت منتخب کریں"
+        set_based_on_last_post: "آخری پوسٹ کی بنیاد پر بند کریں"
+      publish_to_category:
+        title: "اشاعت شیڈول کریں"
+      temp_open:
+        title: "عارضی طور پر کھولیں"
+      auto_reopen:
+        title: "خود کار طریقے سے ٹاپک کھولیں"
+      temp_close:
+        title: "عارضی طور پر بند کریں"
+      auto_close:
+        title: "خود کار طریقے سے ٹاپک بند کریں"
+        label: "خود کار طریقے سے ٹاپک بند کرنے کے گھنٹے:"
+        error: "براہ کرم، ایک قابلِ قبول قدر درج کریں۔"
+        based_on_last_post: "بند نہ کریں جب تک ٹاپک کی آخری پوسٹ کم از کم اتنی پرانی نہ ہو۔"
+      auto_delete:
+        title: "خود کار طریقے سے ٹاپک حذف کریں"
+      reminder:
+        title: "مجھے یاد دہانی کرائیں"
+      status_update_notice:
+        auto_open: "یہ ٹاپک خود کار طریقے سے کھول دیا جائے گا %{timeLeft}۔"
+        auto_close: "یہ ٹاپک خود کار طریقے سے بند کر دیا جائے گا %{timeLeft}۔"
+        auto_publish_to_category: "یہ ٹاپک <a href=%{categoryUrl}>#%{categoryName}</a> میں شائع کر دیا جائے گا %{timeLeft}۔"
+        auto_close_based_on_last_post: "یہ ٹاپک آخری جواب کے %{duration} بعد بند ہو جائے گا۔"
+        auto_delete: "یہ ٹاپک خود کار طریقے سے حذف کر دیا جائے گا %{timeLeft}۔"
+        auto_reminder: "آپ کو اس ٹاپک کے بارے میں یاد دہانی کرائی جائے گا %{timeLeft}۔"
       auto_close_title: 'خود کار طریقے سے بند کر نے کی سیٹِنگ'
       auto_close_immediate:
-        one: "ٹاپک کی آخری پوسٹ ابھی سے 1 گھنٹا پرانی ہے، اِسلیئے ٹاپک فوری طور پر بند کر دیا جائے گا۔"
-        other: "ٹاپک کی آخری پوسٹ ابھی سے ٪{count} گھنٹے پرانی ہے، اِسلیئے ٹاپک فوری طور پر بند کر دیا جائے گا۔"
+        one: ٹاپک کی آخری پوسٹ ابھی سے 1 گھنٹا پرانی ہے، اِسلیئے ٹاپک فوری طور پر بند کر دیا جائے گا۔
+        other: ٹاپک کی آخری پوسٹ ابھی سے %{count} گھنٹے پرانی ہے، اِسلیئے ٹاپک فوری طور پر بند کر دیا جائے گا۔
       timeline:
         back: "واپس"
         back_description: "آپنی آخری بغیر پڑھی پوسٹ پر واپس جائیں"
+        replies_short: "%{current}/ %{total} "
       progress:
         title: ٹاپک پیش رَفت
         go_top: "سب سے اوپر"
@@ -1258,26 +1551,30 @@ ur:
         go: "جائیں"
         jump_bottom: "آخری پوسٹ پر جائیں"
         jump_prompt: "پر جائیں..."
-        jump_prompt_of: "٪{count} پوسٹس کے"
+        jump_prompt_of: "%{count} پوسٹس کے"
         jump_prompt_long: "کس پوسٹ پر آپ جانا پسند کریں گے؟"
-        jump_bottom_with_number: "پوسٹ ٪{post_number} پر جائیں"
+        jump_bottom_with_number: "پوسٹ %{post_number} پر جائیں"
         total: کُل پوسٹس
         current: موجودہ پوسٹ
       notifications:
         title: آپ کو اس ٹاپک کے بارے میں کتنی بار مطلع کیا جاتا ہے، تبدیل کریں
         reasons:
           mailing_list_mode: "آپ نے میلنگ لسٹ مَوڈ فعال کیا ہوا ہے، لہذا آپ کو اِی میل کے ذریعے اِس ٹاپک پر جوابات سے مطلع کردیا جائے گا۔"
-          '3_10': 'آپ کو اطلاعات موصول ہوں گی کیونکہ آپ اِس ٹاپک پر موجود ایک ٹیگ دیکھ رہے ہیں۔'
-          '3_6': 'آپ کو اطلاعات موصول ہوں گی کیونکہ آپ یہ زمرہ دیکھ رہے ہیں۔'
-          '3_5': 'آپ کو اطلاعات موصول ہوں گی کیونکہ آپ نے خودکار طریقے سے اِس ٹاپک کو دیکھنا شروع کر دیا۔'
-          '3_2': 'آپ کو اطلاعات موصول ہوں گی کیونکہ آپ اِس ٹاپک کو دیکھ رہے ہیں۔'
-          '3_1': 'آپ کو اطلاعات موصول ہوں گی کیونکہ آپ نے یہ ٹاپک بنایا ہے۔'
-          '3': 'آپ کو اطلاعات موصول ہوں گی کیونکہ آپ اِس ٹاپک کو دیکھ رہے ہیں۔'
-          '1_2': 'اگر کوئی آپ کا @نام زکر کرتا ہے یا کوئی جواب دیتا ہے تو آپ کو مطلع کر دیا جائے گا۔'
-          '1': 'اگر کوئی آپ کا @نام زکر کرتا ہے یا کوئی جواب دیتا ہے تو آپ کو مطلع کر دیا جائے گا۔'
-          '0_7': 'آپ اِس زمرہ میں تمام اطلاعات کو نظر انداز کر رہے ہیں۔'
-          '0_2': 'آپ اِس ٹاپک کی تمام اطلاعات کو نظر انداز کر رہے ہیں۔'
-          '0': 'آپ اِس ٹاپک کی تمام اطلاعات کو نظر انداز کر رہے ہیں۔'
+          "3_10": 'آپ کو اطلاعات موصول ہوں گی کیونکہ آپ اِس ٹاپک پر موجود ایک ٹیگ دیکھ رہے ہیں۔'
+          "3_6": 'آپ کو اطلاعات موصول ہوں گی کیونکہ آپ یہ زمرہ دیکھ رہے ہیں۔'
+          "3_5": 'آپ کو اطلاعات موصول ہوں گی کیونکہ آپ نے خودکار طریقے سے اِس ٹاپک کو دیکھنا شروع کر دیا۔'
+          "3_2": 'آپ کو اطلاعات موصول ہوں گی کیونکہ آپ اِس ٹاپک کو دیکھ رہے ہیں۔'
+          "3_1": 'آپ کو اطلاعات موصول ہوں گی کیونکہ آپ نے یہ ٹاپک بنایا ہے۔'
+          "3": 'آپ کو اطلاعات موصول ہوں گی کیونکہ آپ اِس ٹاپک کو دیکھ رہے ہیں۔'
+          "2_8": 'آپ نئے جوابات کا شمار دیکھ سکیں گے کیونکہ آپ اِس زمرہ کو ٹرَیک کر رہے ہیں۔'
+          "2_4": 'آپ نئے جوابات کا شمار دیکھ سکیں گے کیونکہ آپ نے اِس ٹاپک پر ایک جواب پوسٹ کیا۔'
+          "2_2": 'آپ نئے جوابات کا شمار دیکھ سکیں گے کیونکہ آپ اِس ٹاپک کو ٹرَیک کر رہے ہیں۔'
+          "2": 'آپ نئے جوابات کا شمار دیکھ سکیں گے کیونکہ آپ نے <a href="/u/{{username}}/preferences">یہ ٹاپک پڑھا ہے</a>۔'
+          "1_2": 'اگر کوئی آپ کا @نام زکر کرتا ہے یا کوئی جواب دیتا ہے تو آپ کو مطلع کر دیا جائے گا۔'
+          "1": 'اگر کوئی آپ کا @نام زکر کرتا ہے یا کوئی جواب دیتا ہے تو آپ کو مطلع کر دیا جائے گا۔'
+          "0_7": 'آپ اِس زمرہ میں تمام اطلاعات کو نظر انداز کر رہے ہیں۔'
+          "0_2": 'آپ اِس ٹاپک کی تمام اطلاعات کو نظر انداز کر رہے ہیں۔'
+          "0": 'آپ اِس ٹاپک کی تمام اطلاعات کو نظر انداز کر رہے ہیں۔'
         watching_pm:
           title: "نظر رکھی ہوئی ہے"
           description: "آپ کو اِس پیغام میں ہر نئے جواب کے بارے میں مطلع کیا جائے گا، اور نئے جوابات کی گنتی دیکھائی جائے گی۔"
@@ -1308,6 +1605,7 @@ ur:
         open: "ٹاپک کھولیں"
         close: "ٹاپک بند کریں"
         multi_select: "پوسٹس منتخب کریں..."
+        timed_update: "ٹاپک ٹائمر مقرر کریں..."
         pin: "ٹاپک پِن کریں..."
         unpin: "ٹاپک سے پِن ہٹائیں..."
         unarchive: "ٹاپک آرکائیو سے ختم کریں"
@@ -1349,8 +1647,8 @@ ur:
         pin_validation: "اس ٹاپک کو پِن کرنے کیلئے ایک تاریخ کی ضرورت ہے۔"
         not_pinned: "{{categoryLink}} میں کوئی ٹاپک پِن نہیں ہیں۔"
         already_pinned:
-          one: "فی الحال {{categoryLink}} میں پِن ہوے ٹاپک: <strong class='badge badge-notification unread'>1</strong>"
-          other: "فی الحال {{categoryLink}} میں پِن ہوے ٹاپک: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: 'فی الحال {{categoryLink}} میں پِن ہوے ٹاپک: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'فی الحال {{categoryLink}} میں پِن ہوے ٹاپک: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         pin_globally: "اِس ٹاپک کو تمام ٹاپکس کی فہرست کے سب سے اُپر ظاہر کریں جب تک کہ"
         confirm_pin_globally: "آپ کے پاس پہلے ہی سے {{count}} عالمی سطح پر پِن ہوے ٹاپک موجود ہیں۔ بہت سارے پِن ہوے ٹاپک نئے اور گمنام صارفین کے لئے ایک بوجھ ثابت ہو سکتے ہیں۔ کیا آپ واقعی عالمی سطح پر ایک اور ٹاپک پِن کرنا چاہتے ہیں؟"
         unpin_globally: "اِس ٹاپک کو تمام ٹاپکس کی فہرست کے سب سے اُپر ظاہر کرنے سے ہٹائیں"
@@ -1358,8 +1656,8 @@ ur:
         global_pin_note: "صارفین خود سے انفرادی طور پر ٹاپک سے پن ہٹا سکتے ہیں۔"
         not_pinned_globally: "کوئی ٹاپک عالمی سطح پر پِن نہیں ہوئے ہیں۔"
         already_pinned_globally:
-          one: "فی الحال عالمی سطح پر پِن ہوئے ٹاپک: <strong class='badge badge-notification unread'>1</strong>"
-          other: "فی الحال عالمی سطح پر پِن ہوئے ٹاپک: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: 'فی الحال عالمی سطح پر پِن ہوئے ٹاپک: <strong class=''badge badge-notification unread''>1</strong>'
+          other: 'فی الحال عالمی سطح پر پِن ہوئے ٹاپک: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         make_banner: "اِس ٹاپک کو ایک بَینر بنا دیں جو تمام صفحات کے سب سے اوپر ظاہر ہو۔"
         remove_banner: "بَینر ہٹا دیں جو تمام صفحات کے سب سے اوپر ظاہر ہوتا ہے۔"
         banner_note: "صارفین بینر کو بند کرکے اِسے برطرف کر سکتے ہیں۔ آیک وقت میں صرف ایک ٹاپک کو بینر بنایا جا سکتا ہے۔"
@@ -1392,11 +1690,12 @@ ur:
         success_email: "ہم نے <b>{{emailOrUsername}}</b> کو ایک دعوت نامہ اِیمیل کیا ہے۔ جب دعوت  نامہ اِستعمال ہو گا تو ہم آپ کو مطلع کریں گے۔ اپنی دعوتوں کا ٹریک رکھنے کیلئے اپنے صارف صفحہ پر دعوت ناموں والی ٹیب چیک کریں۔"
         success_username: "ہم نے اِس ٹاپک میں حصہ لینے کے لئے اُس صارف کو مدعو کیا ہے۔"
         error: "معزرت، ہم اس شخص کو دعوت نہ دے سکے۔ شاید وہ پہلے ہی مدعو کیے جا چکے ہیں؟ (دعوتیں شرح محدود ہیں)"
+        success_existing_email: "آیک صارف <b>{{emailOrUsername}}</b> والے ای میل کے ساتھ پہلے ہی موجود ہے۔ ہم نے اِس ٹاپک میں حصہ لینے کے لئے اُس صارف کو مدعو کر دیا ہے۔"
       login_reply: 'جواب دینے کیلئے لاگ اِن کریں'
       filters:
         n_posts:
-          one: "1 پوسٹ"
-          other: "{{count}} پوسٹس"
+          one: 1 پوسٹ
+          other: '{{count}} پوسٹس'
         cancel: "فِلٹر ہٹائیں"
       split_topic:
         title: "نئے ٹاپک پر منتقل کریں"
@@ -1404,15 +1703,15 @@ ur:
         topic_name: "نئے ٹاپک کا نام"
         error: "نئے ٹاپک پر پوسٹس منتقل کرنے میں ایک خرابی کا سامنا کرنا پڑا۔"
         instructions:
-          one: "آپ ایک نیا ٹاپک بنانے اور اپنی منتخب کردہ پوسٹ سے اِسے آباد کرنے والے ہیں۔"
-          other: "آپ ایک نیا ٹاپک بنانے اور اپنی منتخب کردہ <b>{{count}}</b> پوسٹس سے اِسے آباد کرنے والے ہیں۔"
+          one: آپ ایک نیا ٹاپک بنانے اور اپنی منتخب کردہ پوسٹ سے اِسے آباد کرنے والے ہیں۔
+          other: آپ ایک نیا ٹاپک بنانے اور اپنی منتخب کردہ <b>{{count}}</b> پوسٹس سے اِسے آباد کرنے والے ہیں۔
       merge_topic:
         title: "موجودہ ٹاپک میں منتقل کریں"
         action: "موجودہ ٹاپک میں منتقل کریں"
         error: "اس ٹاپک میں پوسٹس منتقل کرنے میں ایک خرابی کا سامنا کرنا پڑا۔"
         instructions:
-          one: "براہ مہربانی، وہ ٹاپک منتخب کریں جس میں آپ وہ پوسٹ منتقل کرنا چاہتے ہیں۔"
-          other: "براہ مہربانی، وہ ٹاپک منتخب کریں جس میں آپ <b>{{count}}</b> پوسٹس منتقل کرنا چاہتے ہیں۔"
+          one: براہ مہربانی، وہ ٹاپک منتخب کریں جس میں آپ وہ پوسٹ منتقل کرنا چاہتے ہیں۔
+          other: براہ مہربانی، وہ ٹاپک منتخب کریں جس میں آپ <b>{{count}}</b> پوسٹس منتقل کرنا چاہتے ہیں۔
       merge_posts:
         title: "منتخب کردہ پوسٹس کو ضم کریں"
         action: "منتخب کردہ پوسٹس کو ضم کریں"
@@ -1424,17 +1723,29 @@ ur:
         label: "پوسٹس کا نیا مالک"
         placeholder: "نئے مالک کا صارف نام"
         instructions:
-          one: "براہ مہربانی، <b>{{old_user}}</b> کی پوسٹ کے نئے مالک کو منتخب کریں۔"
-          other: "براہ مہربانی، <b>{{old_user}}</b> کی {{count}} پوسٹس کے نئے مالک کو منتخب کریں۔"
-        instructions_warn: "یاد رکھیں کہ اِس پوسٹ کے بارے میں کوئی بھی اطلاعات مؤثر بہ ماضی طور پر نئے صارف کو منتقل نہیں کی جائیں گی۔ <br>انتباہ: فی الحال، کوئی پوسٹ انحصار ڈیٹا نئے صارف کو منتقل نہیں کیا جاتا ہے۔ احتیاط سے استعمال کریں۔"
+          one: براہ مہربانی، <b>{{old_user}}</b> کی پوسٹ کے نئے مالک کو منتخب کریں۔
+          other: براہ مہربانی، <b>{{old_user}}</b> کی {{count}} پوسٹس کے نئے مالک کو منتخب کریں۔
       change_timestamp:
+        title: "ٹائمسٹیمپ تبدیل کریں..."
         action: "ٹائمسٹیمپ تبدیل کریں"
         invalid_timestamp: "ٹائمسٹیمپ مستقبل میں نہیں ہو سکتا۔"
         error: "ٹاپک کا ٹائمسٹیمپ تبدیل کرنے میں ایک خرابی کا سامنا کرنا پڑا۔"
         instructions: "براہ مہربانی ٹاپک کیلیئے نیا ٹائمسٹیمپ منتخب کریں۔ وقت کا فرق برابر رکھنے کیلیے ٹاپک میں پوسٹس کو اَپ ڈیٹ کر دیا جائے گا۔"
       multi_select:
         select: 'منتخب'
-        selected: 'منتخب کیے گئے ({{count}})'
+        selected: 'منتخب کردہ ({{count}})'
+        select_post:
+          label: 'منتخب'
+          title: 'انتخاب کیے ہوے میں پوسٹ شامل کریں'
+        selected_post:
+          label: 'منتخب کیا ہوا'
+          title: 'منتخب کیے ہوے سے پوسٹ کو ہٹانے کیلئے کلک کریں'
+        select_replies:
+          label: 'منتخب +جوابات'
+          title: 'منتخب کیے ہوے میں پوسٹ اور اِس کے تمام جوابات شامل کریں'
+        select_below:
+          label: 'منتخب+ذیل میں'
+          title: 'منتخب کیے ہوے میں پوسٹ اور اِس کے بعد تمام شامل کریں'
         delete: منتخب کیے ہوں کو حذف کریں
         cancel: انتخاب کرنا منسوخ کریں
         select_all: تمام منتخب کریں
@@ -1443,9 +1754,8 @@ ur:
           one: آپ نے <b>1</b> پوسٹ منتخب کی ہے۔
           other: آپ نے <b>{{count}}</b> پوسٹس منتخب کی ہیں۔
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "اقتباس کریں"
+      edit: "<i class='fa fa-pencil'></i>{{link}} {{replyAvatar}} {{username}} "
       edit_reason: "وجہ:"
       post_number: "پوسٹ {{number}}"
       wiki_last_edited_on: "وِکی کو آخری بار ترمیم کیا گیا"
@@ -1457,26 +1767,28 @@ ur:
       show_full: "مکمل پوسٹ دکھائیں"
       show_hidden: 'چھپایا ہوا متن دکھایں۔'
       deleted_by_author:
-        one: "(مصنف نے پوسٹ واپس لے لی، ٪{count} گھنٹے میں یہ خود کار طریقے سے حذف کر دی جائے گی الا یہ کہ اِسے فلیگ کیا گیا ہو)"
-        other: "(مصنف نے پوسٹ واپس لے لی، ٪{count} گھنٹوں میں یہ خود کار طریقے سے حذف کر دی جائے گی الا یہ کہ اِسے فلیگ کیا گیا ہو)"
+        one: (مصنف نے پوسٹ واپس لے لی، %{count} گھنٹے میں یہ خود کار طریقے سے حذف کر دی جائے گی الا یہ کہ اِسے فلیگ کیا گیا ہو)
+        other: (مصنف نے پوسٹ واپس لے لی، %{count} گھنٹوں میں یہ خود کار طریقے سے حذف کر دی جائے گی الا یہ کہ اِسے فلیگ کیا گیا ہو)
+      collapse: "بند کریں"
       expand_collapse: "کھولیں/بند کریں"
+      locked: "ایک اسٹاف کے رکن نے اِس پوسٹ کو ترمیم ہونے سے روک دیا ہے"
       gap:
-        one: "1 چھپایا ہوا جواب دیکھیں"
-        other: "{{count}} چھپائے ہوے جوابات دیکھیں"
+        one: 1 چھپایا ہوا جواب دیکھیں
+        other: '{{count}} چھپائے ہوے جوابات دیکھیں'
       unread: "پوسٹ بغیر پڑھی ہے"
       has_replies:
-        one: "{{count}} جواب"
-        other: "{{count}} جوابات"
+        one: '{{count}} جواب'
+        other: '{{count}} جوابات'
       has_likes:
-        one: "{{count}} لائیک"
-        other: "{{count}} لائیکس"
+        one: '{{count}} لائیک'
+        other: '{{count}} لائیکس'
       has_likes_title:
-        one: "1 شخص نے اِس پوسٹ کو لائیک کیا"
-        other: "{{count}} لوگوں نے اِس پوسٹ کو لائیک کیا"
+        one: 1 شخص نے اِس پوسٹ کو لائیک کیا
+        other: '{{count}} لوگوں نے اِس پوسٹ کو لائیک کیا'
       has_likes_title_only_you: " آپ نے اِس پوسٹ کو لائیک کیا"
       has_likes_title_you:
-        one: "آپ اور 1 دوسرے شخص نے اِس پوسٹ کو لائیک کیا"
-        other: "آپ اور {{count}} دوسرے لوگوں نے اِس پوسٹ کو لائیک کیا"
+        one: آپ اور 1 دوسرے شخص نے اِس پوسٹ کو لائیک کیا
+        other: آپ اور {{count}} دوسرے لوگوں نے اِس پوسٹ کو لائیک کیا
       errors:
         create: "معذرت، آپ کی پوسٹ بنانے میں ایک خرابی کا سامنا کرنا پڑا۔  براہ مہربانی دوبارہ کوشش کریں۔"
         edit: "معذرت، آپ کی پوسٹ ترمیم کرنے میں ایک خرابی کا سامنا کرنا پڑا۔  براہ مہربانی دوبارہ کوشش کریں۔"
@@ -1506,12 +1818,22 @@ ur:
         has_liked: " آپ اِس پوسٹ کو لائیک کر چکے ہیں"
         undo_like: "لائیک کالعدم کریں"
         edit: " اِس پوسٹ کو ترمیم کریں"
+        edit_action: "ترمیم"
         edit_anonymous: "معذرت، اِس پوسٹ کو ترمیم کرنے کیلیے آپ کا لاگ اِن ہونا ضروری ہے۔"
         flag: "اس پوسٹ پر توجہ کے لئے اِسے نجی طور پر فلَیگ کریں یا اس کے بارے میں ایک نجی نوٹیفکیشن بھیجیں"
         delete: "اِس پوسٹ کو حذف کریں"
         undelete: " اِس پوسٹ کو واپس لائیں"
         share: "اس پوسٹ کا لنک شیئرکریں"
         more: "مزید "
+        delete_replies:
+          confirm: "کیا آپ اِس پوسٹ پر جوابات بھی حذف کرنا چاہتے ہیں؟"
+          direct_replies:
+            one: جی ہاں، اور براہ راست 1 جواب
+            other: جی ہاں، اور براہ راست {{count}} جوابات
+          all_replies:
+            one: جی ہاں، اور 1 جواب
+            other: جی ہاں، اور تمام {{count}} جوابات
+          just_the_post: "نہیں، صرف یہ پوسٹ"
         admin: "پوسٹ ایڈمن کے ایکشن"
         wiki: "وِیکی بنائیں"
         unwiki: "وِیکی ختم کریں"
@@ -1520,8 +1842,16 @@ ur:
         rebake: "HTML دوبارہ بِلڈ کریں"
         unhide: "چھپانا ختم کریں"
         change_owner: "پوسٹس کے مالک کو تبدیل کریں"
+        grant_badge: "بَیج دیں"
+        lock_post: "پوسٹ لاک کریں"
+        lock_post_description: "شائع کرنے والے کو اِس پوسٹ میں ترمیم کرنے سے روک دیں"
+        unlock_post: "پوسٹ کھول دیں"
+        unlock_post_description: "شائع کرنے والے کو اِس پوسٹ میں ترمیم کرنے کی اجازت دیں"
       actions:
         flag: 'فلَیگ'
+        defer_flags:
+          one: فلَیگ نظر انداز کریں
+          other: فلَیگز نظر انداز کریں
         undo:
           off_topic: "فلَیگ کالعدم کریں"
           spam: "فلَیگ کالعدم کریں"
@@ -1537,6 +1867,9 @@ ur:
           notify_user: "ایک پیغام بھیجا"
           bookmark: "اِس کو بُک مارک"
           like: "اِس کو لائیک کیا"
+          like_capped:
+            one: اور {{count}} دوسرے شخص نے اِس کو لائیک کیا
+            other: اور {{count}} دوسرے لوگوں نے اِس کو لائیک کیا
           vote: "اِس کے لیے ووٹ دیا"
         by_you:
           off_topic: "آپ نے اِس کو موضوع سے ہٹ کر ہونے کے طور پر فلَیگ کیا"
@@ -1549,54 +1882,62 @@ ur:
           vote: "آپ نے اِس پوسٹ کے لیے ووٹ کیا"
         by_you_and_others:
           off_topic:
-            one: "آپ اور 1 دوسرے شخص نے اِس کو موضوع سے ہٹ کر ہونے کے طور پر فلَیگ کیا"
-            other: "آپ اور {{count}} دوسرے لوگوں نے اِس کو موضوع سے ہٹ کر ہونے کے طور پر فلَیگ کیا"
+            one: آپ اور 1 دوسرے شخص نے اِس کو موضوع سے ہٹ کر ہونے کے طور پر فلَیگ کیا
+            other: آپ اور {{count}} دوسرے لوگوں نے اِس کو موضوع سے ہٹ کر ہونے کے طور پر فلَیگ کیا
           spam:
-            one: "آپ اور 1 دوسرے شخص نے اِس کو سپَیم ہونے کے طور پر فلَیگ کیا"
-            other: "آپ اور {{count}} دوسرے لوگوں نے اِس کو سپَیم ہونے کے طور پر فلَیگ کیا"
+            one: آپ اور 1 دوسرے شخص نے اِس کو سپَیم ہونے کے طور پر فلَیگ کیا
+            other: آپ اور {{count}} دوسرے لوگوں نے اِس کو سپَیم ہونے کے طور پر فلَیگ کیا
           inappropriate:
-            one: "آپ اور 1 دوسرے شخص نے اِس کو نامناسب ہونے کے طور پر فلَیگ کیا"
-            other: "آپ اور {{count}} دوسرے لوگوں نے اِس کو نامناسب ہونے کے طور پر فلَیگ کیا"
+            one: آپ اور 1 دوسرے شخص نے اِس کو نامناسب ہونے کے طور پر فلَیگ کیا
+            other: آپ اور {{count}} دوسرے لوگوں نے اِس کو نامناسب ہونے کے طور پر فلَیگ کیا
           notify_moderators:
-            one: "آپ اور 1 دوسرے شخص نے اِس کو اعتدال کیلئے فلَیگ کیا"
-            other: "آپ اور {{count}} دوسرے لوگوں نے اِس کو اعتدال کیلئے فلَیگ کیا"
+            one: آپ اور 1 دوسرے شخص نے اِس کو اعتدال کیلئے فلَیگ کیا
+            other: آپ اور {{count}} دوسرے لوگوں نے اِس کو اعتدال کیلئے فلَیگ کیا
           notify_user:
-            one: "آپ اور 1 دوسرے شخص نے اِس صارف کو پیغام بھیجا"
-            other: "آپ اور {{count}} دوسرے لوگوں نے اِس صارف کو پیغام بھیجا"
+            one: آپ اور 1 دوسرے شخص نے اِس صارف کو پیغام بھیجا
+            other: آپ اور {{count}} دوسرے لوگوں نے اِس صارف کو پیغام بھیجا
           bookmark:
-            one: "آپ اور 1 دوسرے شخص نے اِس پوسٹ کو بُک مارک کیا"
-            other: "آپ اور {{count}} دوسرے لوگوں نے اِس پوسٹ کو بُک مارک کیا"
+            one: آپ اور 1 دوسرے شخص نے اِس پوسٹ کو بُک مارک کیا
+            other: آپ اور {{count}} دوسرے لوگوں نے اِس پوسٹ کو بُک مارک کیا
           like:
-            one: "آپ اور 1 دوسرے شخص نے اِس کو لائیک کیا"
-            other: "آپ اور {{count}} دوسرے لوگوں نے اِس کو لائیک کیا"
+            one: آپ اور 1 دوسرے شخص نے اِس کو لائیک کیا
+            other: آپ اور {{count}} دوسرے لوگوں نے اِس کو لائیک کیا
           vote:
-            one: "آپ اور 1 دوسرے شخص نے اِس پوسٹ کے لیے ووٹ کیا"
-            other: "آپ اور {{count}} دوسرے لوگوں نے اِس پوسٹ کے لیے ووٹ کیا"
+            one: آپ اور 1 دوسرے شخص نے اِس پوسٹ کے لیے ووٹ کیا
+            other: آپ اور {{count}} دوسرے لوگوں نے اِس پوسٹ کے لیے ووٹ کیا
         by_others:
           off_topic:
-            one: "1 شخص نے اِس کو موضوع سے ہٹ کر ہونے کے طور پر فلَیگ کیا"
-            other: "{{count}} لوگوں نے اِس کو موضوع سے ہٹ کر ہونے کے طور پر فلَیگ کیا"
+            one: 1 شخص نے اِس کو موضوع سے ہٹ کر ہونے کے طور پر فلَیگ کیا
+            other: '{{count}} لوگوں نے اِس کو موضوع سے ہٹ کر ہونے کے طور پر فلَیگ کیا'
           spam:
-            one: "1 شخص نے اِس کو سپَیم ہونے کے طور پر فلَیگ کیا"
-            other: "{{count}} لوگوں نے اِس کو سپَیم ہونے کے طور پر فلَیگ کیا"
+            one: 1 شخص نے اِس کو سپَیم ہونے کے طور پر فلَیگ کیا
+            other: '{{count}} لوگوں نے اِس کو سپَیم ہونے کے طور پر فلَیگ کیا'
           inappropriate:
-            one: "1 شخص نے اِس کو نامناسب ہونے کے طور پر فلَیگ کیا گیا"
-            other: "{{count}} لوگوں نے اِس کو نامناسب ہونے کے طور پر فلَیگ کیا گیا"
+            one: 1 شخص نے اِس کو نامناسب ہونے کے طور پر فلَیگ کیا گیا
+            other: '{{count}} لوگوں نے اِس کو نامناسب ہونے کے طور پر فلَیگ کیا گیا'
           notify_moderators:
-            one: "1 شخص نے اِس کو اعتدال کیلئے فلَیگ کیا"
-            other: "{{count}} لوگوں نے اِس کو اعتدال کیلئے فلَیگ کیا"
+            one: 1 شخص نے اِس کو اعتدال کیلئے فلَیگ کیا
+            other: '{{count}} لوگوں نے اِس کو اعتدال کیلئے فلَیگ کیا'
           notify_user:
-            one: "1 شخص نے اِس صارف کو پیغام بھیجا"
-            other: "{{count}} لوگوں نے اِس صارف کو پیغام بھیجا"
+            one: 1 شخص نے اِس صارف کو پیغام بھیجا
+            other: '{{count}} لوگوں نے اِس صارف کو پیغام بھیجا'
           bookmark:
-            one: "1 شخص نے اِس پوسٹ کو بُک مارک کیا"
-            other: "{{count}} لوگوں نے اِس پوسٹ کو بُک مارک کیا"
+            one: 1 شخص نے اِس پوسٹ کو بُک مارک کیا
+            other: '{{count}} لوگوں نے اِس پوسٹ کو بُک مارک کیا'
           like:
-            one: "1 شخص نے اِس کو لائیک کیا"
-            other: "{{count}} لوگوں نے اِس کو لائیک کیا"
+            one: 1 شخص نے اِس کو لائیک کیا
+            other: '{{count}} لوگوں نے اِس کو لائیک کیا'
           vote:
-            one: "1 شخص نے اِس پوسٹ کے لیے ووٹ کیا"
-            other: "{{count}} لوگوں نے اِس پوسٹ کے لیے ووٹ کیا"
+            one: 1 شخص نے اِس پوسٹ کے لیے ووٹ کیا
+            other: '{{count}} لوگوں نے اِس پوسٹ کے لیے ووٹ کیا'
+      delete:
+        confirm:
+          one: کیا آپ واقعی اُس پوسٹ کو حذف کرنا چاہتے ہیں؟
+          other: کیا آپ واقعی ان {{count}} پوسٹس کو حذف کرنا چاہتے ہیں؟
+      merge:
+        confirm:
+          one: کیا آپ واقعی ان پوسٹس کو ضم کرنا چاہتے ہیں؟
+          other: کیا آپ واقعی ان {{count}} پوسٹس کو ضم کرنا چاہتے ہیں؟
       revisions:
         controls:
           first: "پہلی رَوِیژن"
@@ -1631,6 +1972,7 @@ ur:
             title: "ای میل کے متن کا html حصہ دکھائیں"
             button: 'HTML'
     category:
+      can: 'کر سکتا ہے&hellip; '
       none: '(کوئی زمرہ نہیں)'
       all: 'تمام زُمرَہ جات'
       choose: 'ایک زمرہ منتخب کریں&hellip;'
@@ -1641,6 +1983,8 @@ ur:
       settings: 'سیٹِنگ'
       topic_template: "ٹاپک ٹَیمپلیٹ"
       tags: "ٹیگز"
+      tags_allowed_tags: "اس زُمرہ میں صرف اِن ٹیگز کے استعمال کی اجازت دیں:"
+      tags_allowed_tag_groups: "اس زُمرہ میں صرف اِن گروپس سے ٹیگز کے استعمال کی اجازت دیں:"
       tags_placeholder: "(اختیاری) اجازت والے ٹیگز کی فہرست"
       tag_groups_placeholder: "(اختیاری) اجازت والے ٹیگ گروپس کی فہرست"
       topic_featured_link_allowed: "اس زمرہ میں نمایاں لنکس کو اجازت دیں"
@@ -1675,7 +2019,8 @@ ur:
       email_in_allow_strangers: "اکاؤنٹس نہ رکھنے والے گمنام صارفین کی طرف سے اِیمیلز کو قبول کریں"
       email_in_disabled: "ویب سائٹ کی سیٹِنگ میں اِیمیل کے ذریعے نئے ٹاپک پوسٹ کرنا غیر فعال کیا ہوا ہے۔ اِیمیل کے ذریعے نئے ٹاپک شائع کرنے کو چالو کرنے کے لئے،"
       email_in_disabled_click: 'سیٹِنگ میں "اِیمیل اِن" فعال کریں۔'
-      suppress_from_homepage: "ہَوم پیج سے اِس زمرہ کو دبائیں۔"
+      mailinglist_mirror: "زُمرہ میلنگ فہرست کا عکس ہے"
+      suppress_from_latest: "تازہ ترین ٹاپکس سے زُمرہ کو دبائیں۔"
       show_subcategory_list: "اس زمرہ میں ذیلی زمرہ جات کی فہرست ٹاپکس سے مندرجہ بالا دکھائیں۔"
       num_featured_topics: "زمرہ کے صفحے پر دکھائے گئے ٹاپکس کی تعداد:"
       subcategory_num_featured_topics: "بالائی زمرہ کے صفحے پر دکھائے گئے نمایاں ٹاپکس کی تعداد:"
@@ -1733,7 +2078,7 @@ ur:
       notify_action: 'پیغام'
       official_warning: 'آفیشل انتباہ'
       delete_spammer: "سپیم کرنے والے کو حذف کریں"
-      delete_confirm_MF: "آپ اِس صارف سے {POSTS، جمع، ایک {<b>1</b> پوسٹ} دیگر {<b>#</b> پوسٹس}} اور {TOPICS، جمع، ایک {<b>1</b> ٹاپک} دیگر {<b>#</b> ٹاپکس}}  حذف کرنے، اُن کا اکائونٹ ختم کرنے، ان کے آئی پی ایڈریس <b>{ip_address}</b> سے سائن اَپ بلاک کرنے، اور اُن کے اِیمیل ایڈریس کو <b>{اِیمیل}</b> مستقل بلاک کی فہرست میں ڈالنے لگے ہیں۔ کیا آپ کو یقین ہے کہ یہ صارف واقعی ایک سپیمر ہے؟"
+      delete_confirm_MF: "آپ اِس صارف سے {POSTS, plural, one {<b>1</b> پوسٹ} other {<b>#</b> پوسٹس}} اور {TOPICS, plural, one {<b>1</b> ٹاپک} other {<b>#</b> ٹاپکس}} حذف کرنے، اُن کا اکائونٹ ختم کرنے، ان کے آئی پی ایڈریس <b>{ip_address}</b> سے سائن اَپ بلاک کرنے، اور اُن کے اِیمیل ایڈریس کو <b>{email}</b> مستقل بلاک کی فہرست میں ڈالنے لگے ہیں۔ کیا آپ کو یقین ہے کہ یہ صارف واقعی ایک سپیمر ہے؟"
       yes_delete_spammer: "جی ہاں، سپیم کرنے والے کو حذف کریں"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(مخفی)"
@@ -1749,14 +2094,14 @@ ur:
       custom_placeholder_notify_moderators: "ہمیں خاص طور پر اُس چیز کے بارے میں مطلع کریں جس سے آپ فکر مند ہیں، اور جہاں ممکن ہو سکے متعلقہ لنکس اور مثالیں فراہم کریں۔"
       custom_message:
         at_least:
-          one: "کم از کم 1 حرف درج کریں"
-          other: "کم از کم {{count}} حروف درج کریں"
+          one: کم از کم 1 حرف درج کریں
+          other: کم از کم {{count}} حروف درج کریں
         more:
-          one: "1 اور آگے بچا ہے..."
-          other: "{{count}} اور آگے بچے ہیں..."
+          one: 1 اور آگے بچا ہے...
+          other: '{{count}} اور آگے بچے ہیں...'
         left:
-          one: "1 باقی رہتا ہے..."
-          other: "{{count}} باقی رہتے ہیں..."
+          one: 1 باقی رہتا ہے...
+          other: '{{count}} باقی رہتے ہیں...'
     flagging_topic:
       title: "ہماری کمیونٹی کو مہذب رکھنے کے لئے مدد کا شکریہ!"
       action: "ٹاپک فلَیگ کریں"
@@ -1767,13 +2112,13 @@ ur:
       links_title: "مقبول لنکس"
       links_shown: "مزید لِنکس دکھایے"
       clicks:
-        one: "1 کلک"
-        other: "%{count} کلکس"
+        one: 1 کلک
+        other: '%{count} کلکس'
     post_links:
       about: "اِس پوسٹ کے لئے مزید لنکس دکھائیں"
       title:
-        one: "1 اور"
-        other: "٪{count} اور"
+        one: 1 مزید
+        other: '%{count}مزید '
     topic_statuses:
       warning:
         help: "یہ ایک آفیشل انتباہ ہے۔"
@@ -1799,30 +2144,30 @@ ur:
     posts: "پوسٹس"
     posts_long: "اِس ٹاپک میں {{number}} پوسٹس ہیں"
     posts_likes_MF: |
-      یہاِس ٹاپک کی کیا ہے {شمار، جمع، ایک {1 جواب} دیگر {# جوابات}} {تناسب، منتخب،
-      کم {لائیک پر پوسٹ کے اونچے تناسب کے ساتھ}
-      درمیانہ {لائیک پر پوسٹ کے بہت اونچے تناسب کے ساتھ}
-      اعلی {لائیک پر پوسٹ کے انتہائی اونچے تناسب کے ساتھ}
-      دیگر {}}
+      اِس ٹاپک {count, plural, one {کا 1 جواب} other {کے # جوابات ہیں}} {ratio, select,
+      low {لائیک پر پوسٹ کے اونچے تناسب کے ساتھ}
+      med {لائیک پر پوسٹ کے بہت اونچے تناسب کے ساتھ}
+      high {لائیک پر پوسٹ کے انتہائی اونچے تناسب کے ساتھ}
+      other {}}
     original_post: "اصل پوسٹ"
     views: "وِیوز"
     views_lowercase:
-      one: "وِیو"
-      other: "وِیوز"
+      one: وِیو
+      other: وِیوز
     replies: "جوابات"
     views_long:
-      one: "اِس ٹاپک کو 1 دفعہ دیکھا جا چکا ہے"
-      other: "اِس ٹاپک کو {{number}} دفعہ دیکھا جا چکا ہے"
+      one: اِس ٹاپک کو 1 دفعہ دیکھا جا چکا ہے
+      other: اِس ٹاپک کو {{number}} دفعہ دیکھا جا چکا ہے
     activity: "سرگرمی"
     likes: "لائیکس"
     likes_lowercase:
-      one: "لائیک"
-      other: "لائیکس"
+      one: لائیک
+      other: لائیکس
     likes_long: "اِس ٹاپک میں {{number}} لائیکس ہیں"
     users: "صارفین"
     users_lowercase:
-      one: "صارف"
-      other: "صارفین"
+      one: صارف
+      other: صارفین
     category_title: "زمرہ"
     history: "ہسٹری"
     changed_by: "{{author}} کی طرف سے"
@@ -1831,13 +2176,13 @@ ur:
       not_available: "دستیاب نہیں ہے!"
     categories_list: "زمرہ جات فہرست"
     filters:
-      with_topics: "٪{فلٹر} ٹاپک"
-      with_category: "٪{فلٹر} ٪{category} ٹاپک"
+      with_topics: "%{filter} ٹاپک"
+      with_category: "%{filter} %{category} ٹاپک"
       latest:
         title: "تازہ ترین"
         title_with_count:
-          one: "تازہ ترین (1)"
-          other: "تازہ ترین ({{count}})"
+          one: تازہ ترین (1)
+          other: تازہ ترین ({{count}})
         help: "حالیہ پوسٹ والے ٹاپک"
       hot:
         title: "ہاٹ"
@@ -1855,21 +2200,21 @@ ur:
       unread:
         title: "بغیر پڑھے"
         title_with_count:
-          one: "بغیر پڑھے (1)"
-          other: "بغیر پڑھے ({{count}})"
+          one: بغیر پڑھا (1)
+          other: بغیر پڑھے ({{count}})
         help: " ٹاپک جن پر فی الحال آپ نے نظر رکھی ہوئی ہے یا بغیر پڑھی پوسٹس کے ساتھ ٹریک کر رہے ہیں"
         lower_title_with_count:
-          one: "1 بغیر پڑھا ہوا"
-          other: "{{count}} بغیر پڑھے ہوئے"
+          one: 1 بغیر پڑھا ہوا
+          other: '{{count}} بغیر پڑھے ہوئے'
       new:
         lower_title_with_count:
-          one: "1 نیا"
-          other: "{{count}} نئے"
+          one: 1 نیا
+          other: '{{count}} نئے'
         lower_title: "نئے"
         title: "نیا"
         title_with_count:
-          one: "نئے (1)"
-          other: "نئے ({{count}})"
+          one: نیا (1)
+          other: نئے ({{count}})
         help: "پچھلے چند دنوں میں بنائے گئے ٹاپک"
       posted:
         title: "میری پوسٹ"
@@ -1880,8 +2225,8 @@ ur:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: "{{categoryName}} (1)"
-          other: "{{categoryName}} ({{count}})"
+          one: '{{categoryName}} (1)'
+          other: '{{categoryName}} ({{count}})'
         help: "{{categoryName}} زمرہ میں تازہ تریں ٹاپک"
       top:
         title: "سب سے اوپر"
@@ -1939,10 +2284,14 @@ ur:
         hamburger_menu: '<b>=</b> ہیمبرگر مینو کھولیں'
         user_profile_menu: '<b>p</b> صارف مینو کھولیں'
         show_incoming_updated_topics: 'اَپ ڈیٹ ہوے ٹاپک دکھائیں'
+        search: '<b>/</b>یا <b>ctrl</b>+<b>alt</b>+<b>f</b>سرچ  '
         help: '<b>?</b> کیبورڈ مدد کھولیں'
         dismiss_new_posts: '<b>x</b>، <b>r</b> برخاست کریں نئے/پوسٹس'
         dismiss_topics: '<b>x</b>، <b>t</b> ٹاپک برخاست کریں'
         log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> لاگ آوٹ'
+      composing:
+        title: 'کمپوز کرنا'
+        return: '<b>shift</b>+<b>c</b> کمپوزر پر واپس جائیں'
       actions:
         title: 'عمل'
         bookmark_topic: '<b>f</b> بُک مارک ٹاپک ٹوگل کریں'
@@ -1965,22 +2314,25 @@ ur:
         print: '<b>ctrl</b>+<b>p</b> ٹاپک پرِنٹ کریں'
     badges:
       earned_n_times:
-        one: "یہ بَیج 1 دفعہ حاصل کیا"
-        other: "یہ بَیج ٪{count} دفعہ حاصل کیا"
-      granted_on: "عطا کیا گیا ٪{date}"
-      others_count: "دوسرے جن کے پاس یہ بَیج ہے (٪{count})"
+        one: یہ بَیج 1 دفعہ حاصل کیا
+        other: یہ بَیج %{count} مرتبہ حاصل کیا
+      granted_on: "عطا کیا گیا %{date}"
+      others_count: "دوسرے جن کے پاس یہ بَیج ہے (%{count})"
       title: بَیج
+      allow_title: "آپ اِس بَیج کو عنوان کے طور پر استعمال کر سکتے ہیں"
+      multiple_grant: "آپ اِس کو ایک سے زیادہ مرتبہ حاصل کر سکتے ہیں"
       badge_count:
-        one: "1 بَیج"
-        other: "%{count} بَیج"
+        one: 1 بَیج
+        other: '%{count} بَیج'
       more_badges:
-        one: "+1 اور"
-        other: "+٪{count} اور"
+        one: +1 مزید
+        other: +%{count} مزید
       granted:
-        one: "1 عطا کیا گیا"
-        other: "%{count} عطا کیے گئے"
+        one: 1 عطا کیا گیا
+        other: '%{count} عطا کیے گئے'
       select_badge_for_title: اپنے عنوان کے طور پر استعمال کرنے کے لئے ایک بیج منتخب کریں
-      none: "<none>"
+      none: "(کوئی نہیں)"
+      successfully_granted: "%{username}کو کامیابی سے %{badge} عطا کیا"
       badge_grouping:
         getting_started:
           name: شروعات
@@ -2003,11 +2355,17 @@ ur:
       </p>
     tagging:
       all_tags: "تمام ٹیگز"
+      other_tags: "دیگر ٹیگز"
       selector_all_tags: "تمام ٹیگز"
       selector_no_tags: "کوئی ٹیگ نہیں"
       changed: "تبدیل کیے گئے ٹیگ:"
       tags: "ٹیگز"
+      choose_for_topic: "اختیاری ٹیگز"
       delete_tag: "ٹیگ حذف کریں"
+      delete_confirm:
+        one: کیا آپ واقعی اس ٹیگ کو حذف اور 1 ٹاپک، جس کو یہ آسائین ہواوا ہے، سے ہٹا دینا چاہتے ہیں؟
+        other: کیا آپ واقعی اس ٹیگ کو حذف اور {{count}} ٹاپکس، جن کو یہ آسائین ہواوا ہے، سے ہٹا دینا چاہتے ہیں؟
+      delete_confirm_no_topics: "کیا آپ واقعی اِس ٹَیگ کو حذف کرنا چاہتے ہیں؟"
       rename_tag: "ٹیگ کا نام تبدیل کریں"
       rename_instructions: "ٹیگ کے لیے نئے نام کا انتخاب کریں:"
       sort_by: "ترتیب بہ:"
@@ -2016,26 +2374,26 @@ ur:
       manage_groups: "ٹیگ گروپس کا انتظام کریں"
       manage_groups_description: "ٹیگز منظم کرنے کے گروپوں کی وضاحت کریں"
       filters:
-        without_category: "٪{فلٹر} ٪{ٹیگ} ٹاپکس"
-        with_category: "٪{فلٹر} ٪{ٹیگ} ٹاپکس ٪{category} میں"
-        untagged_without_category: "٪{فلٹر} غیر ٹیگ شدہ ٹاپک"
-        untagged_with_category: "٪{فلٹر} غیر ٹیگ شدہ ٹاپک ٪{category} میں"
+        without_category: "%{filter} %{tag} ٹاپکس"
+        with_category: "%{filter} %{tag} ٹاپکس %{category} میں"
+        untagged_without_category: "%{filter} غیر ٹیگ شدہ ٹاپک"
+        untagged_with_category: "%{filter} غیر ٹیگ شدہ ٹاپک %{category} میں"
       notifications:
         watching:
           title: "نظر رکھی ہوئی ہے"
-          description: "آپ خود کار طریقے سے اِس ٹیگ میں موجود تمام ٹاپکس پر نظر رکھیں گے۔ تمام نئی پوسٹ اور ٹاپکس کے بارے میں مطلع کیا جائے گا، اور نئی پوسٹس کی گنتی بھی ٹاپک کے ساتھ دکھائی جائے گی۔"
+          description: "آپ خود کار طریقے سے اِس ٹیگ والے تمام ٹاپکس پر نظر رکھیں گے۔ تمام نئی پوسٹ اور ٹاپکس کے بارے میں مطلع کیا جائے گا، اور نئی پوسٹس کی گنتی بھی ٹاپک کے ساتھ دکھائی جائے گی۔"
         watching_first_post:
           title: "پہلی پوسٹ پر نظر رکھی ہوئی ہے"
-          description: "آپ کو اِس ٹیگ میں ہر نئے ٹاپک کی صرف پہلی پوسٹ کے بارے میں مطلع کیا جائے گا۔"
+          description: "آپ کو اِس ٹیگ والے ہر نئے ٹاپک کی صرف پہلی پوسٹ کے بارے میں مطلع کیا جائے گا۔"
         tracking:
           title: "ٹریک کیا جا رہا"
-          description: "آپ خود کار طریقے سے اِس ٹیگ میں موجود تمام ٹاپکس کو ٹریک کریں گے۔ بغیر پڑھی اور نئی پوسٹس کی گنتی ٹاپک کے ساتھ دکھائی جائے گی۔"
+          description: "آپ خود کار طریقے سے اِس ٹیگ کے ساتھ موجود تمام ٹاپکس کو ٹریک کریں گے۔ بغیر پڑھی اور نئی پوسٹس کی گنتی ٹاپک کے ساتھ دکھائی جائے گی۔"
         regular:
           title: "معمولی"
           description: "اگر کوئی آپ کا @نام زکر کرتا ہے یا آپ کی پوسٹ پر جواب دیتا ہے تو آپ کو مطلع کر دیا جائے گا۔"
         muted:
           title: "خاموش کِیا ہوا"
-          description: "آپ کو اِس ٹیگ میں موجود نئے ٹاپکس کی کسی بھی چیز کے بارے میں مطلع نہیں کیا جائے گا، اور یہ تازہ ترین میں بھی نظر نہیں آئیں گے۔"
+          description: "آپ کو اِس ٹیگ کے ساتھ موجود نئے ٹاپکس کی کسی بھی چیز کے بارے میں مطلع نہیں کیا جائے گا، اور یہ تازہ ترین میں بھی نظر نہیں آئیں گے۔"
       groups:
         title: "ٹیگ گروپس"
         about: "زیادہ آسانی سے ٹیگز کو منظم کرنے کے لیے اُن کو گروپوں میں شامل کریں۔"
@@ -2049,6 +2407,7 @@ ur:
         save: "محفوظ کریں"
         delete: "حذف کریں"
         confirm_delete: "کیا آپ واقعی اِس ٹیگ گروپ کو حذف کرنا چاہتے ہیں؟"
+        visible_only_to_staff: "ٹیگز صرف سٹاف کو نظر آتے ہیں"
       topics:
         none:
           unread: "آپ کے پاس کوئی بغیر پڑھے ٹاپک موجود نہیں۔"
@@ -2102,11 +2461,12 @@ ur:
         no_problems: "کوئی مسائل نہیں پائے گئے۔"
         moderators: 'ماڈریٹرز:'
         admins: 'ایڈمن:'
+        silenced: 'خاموش کیو ہوئے: '
         suspended: 'معطل کردہ:'
         private_messages_short: "پغم"
         private_messages_title: "پیغامات"
         mobile_title: "موبائل"
-        space_free: "{{size}} فرِی"
+        space_free: "{{size}} فارغ"
         uploads: "اَپ لوڈز"
         backups: "بیک اَپس"
         traffic_short: "ٹریفک"
@@ -2117,8 +2477,6 @@ ur:
         reports:
           today: "آج"
           yesterday: "کَل"
-          last_7_days: "گزشتہ 7 دن"
-          last_30_days: "گزشتہ 30 دن"
           all_time: "تمام اوقات"
           7_days_ago: "7 دن پہلے"
           30_days_ago: "30 دن پہلے"
@@ -2134,12 +2492,29 @@ ur:
         by: "تک"
       flags:
         title: "فلَیگز"
+        active_posts: "فلَیگ کی گئی پوسٹس"
+        old_posts: "پرانی فلَیگ کی گئی پوسٹس"
+        topics: "فلَیگ کیے گئے ٹاپک"
+        moderation_history: "ماڈرَیشن ہِسٹری"
         agree: "اتفاق کریں"
         agree_title: "اِس فلَیگ کے درست اور صحیح ہونے کی تصدیق کریں"
-        defer_flag_title: "اس فلَیگ کو ہٹا دیں؛ اِسے اِس وقت کسی کارروائی کی ضرورت نہیں۔"
+        agree_flag_hide_post: "پوسٹ چھپائیں"
+        agree_flag_hide_post_title: "اِس پوسٹ کو چھپائیں اور خود کار طریقے سے صارف کو اِس میں ترمیم کرنے کیلئے زور ڈالنے کیلئے پیغام بھیجیں۔"
+        agree_flag_restore_post: "اتفاق کریں اور پوسٹ بحال کریں"
+        agree_flag_restore_post_title: "پوسٹ کو بحال کریں تاکہ تمام صارفین اِسے دیکھ سکیں۔"
+        agree_flag_suspend: "صارف معطل کریں"
+        agree_flag_suspend_title: "فلَیگ کے ساتھ اتفاق کریں اور صارف معطل کریں۔"
+        agree_flag_silence: "صارف خاموش کریں"
+        agree_flag_silence_title: "فلَیگ کے ساتھ اتفاق کریں اور صارف خاموش کریں۔"
+        agree_flag: "پوسٹ برقرار رکھیں"
+        agree_flag_title: "فلَیگ کے ساتھ اتفاق کریں اور پوسٹ کو ویسا ہی رہنے دیں۔"
+        ignore_flag: "نظر انداز کریں"
+        ignore_flag_title: "اس فلَیگ کو ہٹا دیں؛ اِسے اِس وقت کسی کارروائی کی ضرورت نہیں۔"
         delete: "حذف کریں"
         delete_title: "یہ فلَیگ جس پوسٹ سے متعلق ہے اُسے حذف کریں۔"
+        delete_post_defer_flag: "پوسٹ حذف اور فلَیگ نظر انداز کریں"
         delete_post_defer_flag_title: "پوسٹ حذف کریں؛ اگر پہلی پوسٹ، تو ٹاپک بھی ساتھ حذف کریں"
+        delete_post_agree_flag: "پوسٹ حذف اور فلَیگ کے ساتھ اتفاق کریں"
         delete_post_agree_flag_title: "پوسٹ حذف کریں؛ اگر پہلی پوسٹ، تو ٹاپک بھی ساتھ حذف کریں"
         delete_flag_modal_title: "حذف کریں اور..."
         delete_spammer: "سپیم کرنے والے کو حذف کریں"
@@ -2151,49 +2526,57 @@ ur:
         clear_topic_flags: "ہو گیا"
         clear_topic_flags_title: "اِس ٹاپک کی تفتیش ہو چکی ہے اور مسائل حل کر دیے گئے ہیں۔  فلَیگز کو ہٹانے کیلئے \"ہو گیا\" پر کلک کریں۔"
         more: "(مزید جوابات...)"
+        suspend_user: "صارف معطل کریں"
+        suspend_user_title: "اِس پوسٹ کی وجہ سے صارف معطل کریں"
+        replies:
+          one: '[1 جواب]'
+          other: '[%{count} جوابات]'
         dispositions:
           agreed: "اتفاق کیا"
           disagreed: "اختلاف کیا"
+          deferred: "نظر انداز کیا ہوا"
         flagged_by: "کی طرف سے فلَیگ کیا گیا"
         resolved_by: "کی طرف سے حل کیا گیا"
         took_action: "کارروائی کی"
         system: "سِسٹَم"
         error: "کچھ غلط ہو گیا"
         reply_message: "جواب"
+        no_results: "کوئی فلَیگ کی گئی پوسٹس موجود نہیں۔"
         topic_flagged: "اِس <strong>ٹاپک</strong> کو فلَیگ کر دیا گیا ہے۔"
+        show_full: "مکمل پوسٹ دکھائیں"
         visit_topic: "کارروائی کرنے کیلئے ٹاپک کو وزٹ کریں"
         was_edited: "پہلے فلَیگ کے بعد پوسٹ میں ترمیم ہوئی تھی"
         previous_flags_count: "اس پوسٹ کو پہلے ہی سے {{count}} دفعہ فلَیگ کیا جا چکا ہے۔"
+        show_details: "فلَیگ کی تفصیلات دکھائیں"
+        details: "تفصیلات"
+        flagged_topics:
+          topic: "ٹاپک"
+          type: "قِسم"
+          users: "صارفین"
+          last_flagged: "آخری دفعہ فلَیگ کیا گیا"
+        short_names:
+          off_topic: "موضوع سے ہٹ کر"
+          inappropriate: "نامناسب"
+          spam: "سپَیم"
+          notify_user: "اپنی مرضی کا"
+          notify_moderators: "اپنی مرضی کا"
       groups:
         primary: "پرائمری گروپ"
         no_primary: "(کوئی پرائمری گروپ نہیں)"
         title: "گروپس"
         edit: "گروپس میں ترمیم کریں"
         refresh: "رِیفریش"
-        new: "نیا"
-        selector_placeholder: "صارف نام درج کریں"
         about: "یہاں اپنے گروپ کی رکنیت کو اور ناموں میں ترمیم کریں"
         group_members: "گروپ کے اراکین"
         delete: "حذف کریں"
         delete_confirm: "اِس گروپ کو حذف کریں؟"
         delete_failed: "گروپ کو حذف کرنے میں ناکام۔ اگر یہ ایک خودکار گروپ ہے تو اسے ختم نہیں کیا جا سکتا۔"
-        delete_owner_confirm: "'٪{username}' کے لیے مالک کے استحقاق کو ہٹائیں؟"
+        delete_owner_confirm: "'%{username}' کے لیے مالک کے استحقاق کو ہٹائیں؟"
         add: "شامل کریں"
-        add_members: "اراکین شامل کریں"
         custom: "اپنی مرضی کا"
-        bulk_complete: "صارفین کو گروپ میں شامل کر لیا گیا ہے۔"
-        bulk: "گروپ میں کئی شامل کریں"
-        bulk_paste: "صارف ناموں اور یا اِیمیلز کی فہرست پَیسٹ کریں،  فی سطر ایک:"
-        bulk_select: "(ایک گروپ منتخب کریں)"
         automatic: "خود کار طریقے سے"
-        automatic_membership_email_domains: "جو صارفین ایک ایسے اِیمیل ڈومین کے ساتھ رجسٹر کرتے ہیں جو اِس فہرست میں سے کسی ایک سے پورا ملتا ہے، تو اُن کو خود کار طریقے سے اِس گروپ میں شامل کر دیا جائے گا:"
-        automatic_membership_retroactive: "موجودہ رجسٹرڈ صارفین کو شامل کرنے کے لئے وہی اِیمیل ڈومین اصول لاگو کریں"
-        default_title: "اِس گروپ میں تمام صارفین کے لئے پہلے سے طے شدہ عنوان"
-        primary_group: "خود کار طریقے سے پرائمری گروپ کے طور پر مقرر کریں"
         group_owners: مالکان
         add_owners: مالکان شامل کریں
-        incoming_email: "اپنی مرضی کا اِنکَمِنگ اِیمیل ایڈریس"
-        incoming_email_placeholder: "اِیمیل ایڈریس درج کریں"
         none_selected: "شروع کرنے کے لئے ایک گروپ منتخب کریں"
         no_custom_groups: "ایک نیا \"اپنی مرضی کا\" گروپ بنائیں"
       api:
@@ -2231,6 +2614,7 @@ ur:
         event_type_missing: "آپ کو کم از کم ایک واقعہ کی قسم قائم کرنا ضروری ہے۔"
         content_type: "کونٹنٹ کی قسم"
         secret: "سیکرٹ"
+        event_chooser: "کونسے واقعات اِس وَیب ھُوک٘ کو متحرک کریں؟"
         wildcard_event: "مجھے سب کچھ بھیجیں۔"
         individual_event: "انفرادی واقعات کو منتخب کریں۔"
         verify_certificate: "پَیلوڈ یو.آر.ایل. کا TLS سرٹیفکیٹ چیک کریں"
@@ -2249,6 +2633,16 @@ ur:
           details: "جب ایک نیا جواب، ترمیم، حذف یا رِِیکور کیا جائے۔"
         user_event:
           name: "صارف واقعہ"
+          details: "جب ایک صارف لاگ اِن، لاگ آؤٹ، بنایا، منظور یا اَپ ڈیٹ کیا جاتا ہے۔"
+        group_event:
+          name: "گروپ واقعہ"
+          details: "جب ایک گروپ بنایا، اَپ ڈیٹ یا ختم کیا جاتا ہے۔"
+        category_event:
+          name: "زُمرَہ واقعہ"
+          details: "جب ایک زُمرَہ بنایا، اَپ ڈیٹ یا ختم کیا جاتا ہے۔"
+        tag_event:
+          name: "ٹَیگ واقعہ"
+          details: "جب ایک ٹَیگ بنایا، اَپ ڈیٹ یا ختم کیا جاتا ہے۔"
         delivery_status:
           title: "موصول ہونے کی آگاہی"
           inactive: "غیر فعال"
@@ -2258,11 +2652,11 @@ ur:
           none: "کوئی متعلقہ واقعات موجود نہیں۔"
           redeliver: "دوبارہ ڈیلیور کریں"
           incoming:
-            one: "ایک نیا واقعہ موجود ہے۔"
-            other: "{{count}} نئے واقعات موجود ہیں۔"
+            one: ایک نیا واقعہ موجود ہے۔
+            other: '{{count}} نئے واقعات موجود ہیں۔'
           completed_in:
-            one: "1 سیکنڈ میں مکمل ہوا۔"
-            other: "{{count}} سیکنڈ میں مکمل ہوا۔"
+            one: 1 سیکنڈ میں مکمل ہوا۔
+            other: '{{count}} سیکنڈ میں مکمل ہوا۔'
           request: "ریکویسٹ"
           response: "جواب"
           redeliver_confirm: "کیا آپ واقعی وہی پَیلوڈ دوبارہ ڈیلیور کرنا چاہتے ہیں؟"
@@ -2313,7 +2707,7 @@ ur:
           label: "اَپ لوڈ"
           title: "اِس صورتحال کیلئے ایک بیک اَپ اَپ لوڈ کریں"
           uploading: "اَپ لوڈ کیا جا رہا ہے..."
-          success: "'{{filename}}' کو کامیابی سے اَپ لوڈ کر دیا گیا ہے۔"
+          success: "'{{filename}}' کامیابی سے اَپ لوڈ کردی گئی ہے۔ فائل پر اب کام جا ری ہے اور فہرست میں ظاہر ہونے کیلئے ایک منٹ تک لگ سکتا ہے۔"
           error: "اَپ لوڈ کرتے وقت ایک خرابی کا سامنا کرنا پڑا '{{filename}}': {{message}}"
         operations:
           is_running: "ایک کارروائی اِس وقت چل رہی ہے..."
@@ -2326,7 +2720,6 @@ ur:
             label: "بیک اَپ"
             title: "بیک اَپ بنائیں"
             confirm: "کیا آپ نیا بیک اَپ شروع کرنا چاہتے ہیں؟"
-            without_uploads: "جی ہاں (فائلوں کو شامل نہ کیا جائے)"
           download:
             label: "ڈاؤن لوڈ"
             title: "ڈاؤن لوڈ لنک کے ساتھ اِیمیل بھیجیں"
@@ -2362,15 +2755,21 @@ ur:
         title: "مرضی کے مطابق بنائیں"
         long_title: "ویب سائٹ کو اپنی مرضی کے حساب سے بنانے کیلئے اختیارات"
         preview: "پیشگی دیکھیں"
+        explain_preview: "اِس تِھیم کے ساتھ سائٹ ملاحظہ کریں"
         save: "محفوظ کریں"
         new: "نیا"
         new_style: "نیا سٹائل"
         import: "اِمپورٹ"
         delete: "حذف کریں"
+        delete_confirm: "اس تِھیم کو حذف کریں؟"
         about: "سائٹ پر CSS سٹائل شیٹس اور HTML ہیڈرز میں ترمیم کریں۔ شروع کرنے کیلئے ایک اِصلاح شامل کریں۔"
         color: "رنگ"
         opacity: "دھندلاپن"
         copy: "کاپی"
+        copy_to_clipboard: "کلِپ بورڈ میں کاپی کریں"
+        copied_to_clipboard: "کلِپ بورڈ میں کاپی کر لیا گیا"
+        copy_to_clipboard_error: "کلِپ بورڈ میں ڈیٹا کاپی کرنے پر خرابی کا سامنا کر نا پرا"
+        theme_owner: "ناقابلِ ترمیم، ملکیت:"
         email_templates:
           title: "اِیمیل ٹَیمپلیٹ"
           subject: "موضوع"
@@ -2379,9 +2778,85 @@ ur:
           none_selected: "ترمیم شروع کرنے کیلئے ایک  اِیمیل ٹَیمپلیٹ منتخب کریں۔"
           revert: "تبدیلیاں لوٹائیں"
           revert_confirm: "کیا آپ واقعی تبدیلیاں لوٹانا چاہتے ہیں؟"
+        theme:
+          import_theme: "تِھیم درآمد کریں"
+          customize_desc: "مرضی کے مطابق بنائیں:"
+          title: "تِھیمز"
+          long_title: "اپنی سائٹ کے رنگ، سی ایس ایس اور ایچ ٹی ایم ایل میں ترمیم کریں"
+          edit: "ترمیم"
+          edit_confirm: "یہ ایک ریمَوٹ تِھیم ہے، اگر آپ سی ایس ایس / ایچ ٹی ایم ایل میں ترمیم کرتے ہیں تو اگلی دفعہ تِھیم اَپ ڈیٹ ہونے پر یہ تبدیلیاں مٹا دی جائیں گی۔"
+          common: "عام"
+          desktop: "ڈیسک ٹاپ"
+          mobile: "موبائل"
+          settings: "ترتیبات"
+          preview: "پیشگی دیکھیں"
+          is_default: "تِھیم ڈیفالٹ کے طور پر فعال ہے"
+          user_selectable: "صارفین تِھیم کو منتخب کرسکتے ہیں"
+          color_scheme: "رنگ سکیم"
+          color_scheme_select: "تِھیم میں استعمال ہونے والے رنگ منتخب کریں"
+          custom_sections: "اپنی مرضی کے حصے:"
+          theme_components: "تِھیم کے اجزاء"
+          uploads: "اَپ لوڈز"
+          no_uploads: "آپ اپنی تِھیم کے ساتھ منسلک اثاثے، جیسے کہ فونٹ اور تصاویر، اَپ لوڈ کر سکتے ہیں"
+          add_upload: "اَپ لوڈ شامل کریں"
+          upload_file_tip: "اَپ لوڈ کرنے کے لئے اثاثہ منتخب کریں (png، woff2، وغیرہ...)"
+          variable_name: "SCSS وار نام:"
+          variable_name_invalid: "غلط وَیری اَیبل نام۔ صرف حرف و نمبر کی اجازت ہے۔ ایک حرف کے ساتھ شروع ہونا لاذمی ہے۔ منفرد ہونا لاذمی ہے۔"
+          upload: "اَپ لوڈ"
+          child_themes_check: "تِھیم میں دوسری ماتحت تِھیمز شامل ہیں"
+          css_html: "اپنی مرضی کے مطابق CSS/HTML"
+          edit_css_html: "CSS/HTML ترمیم کریں"
+          edit_css_html_help: "آپ نے کوئی بھی CSS یا HTML ترمیم نہیں کیا ہے"
+          delete_upload_confirm: "اِس اَپ لوڈ کو حذف کریں؟ (تِھیم CSS کام کرنا بند کر سکتی ہے!)"
+          import_web_tip: "رِیپَوزِٹَری میں موجود تِھیم"
+          import_file_tip: ".dcstyle.json فائل میں موجود تِھیم"
+          is_private: "تھِیم ایک ذاتی گِٹ رِیپَوزِٹَری میں ہے"
+          public_key: "رِیپَوزِٹَری کو درج ذیل پبلک کلید ایکسَیس فراہم کریں:"
+          about_theme: "تِھیم کے بارے میں"
+          license: "لائسنس"
+          component_of: "تِھیم ایک جزو ہے:"
+          update_to_latest: "تازہ ترین ورژن تک اِپ ڈَیٹ کریں"
+          check_for_updates: "اپ ڈیٹ کے لیے چیک کریں"
+          updating: "اَپ ڈَیٹ کیا جا رہا ہے..."
+          up_to_date: "تِھیم اَپ ڈَیٹ ہے، آخری دفعہ چَیک کیا:"
+          add: "شامل کریں"
+          theme_settings: "تھیم کی ترتیبات"
+          no_settings: "اِس تھیم کی کوئی ترتیبات نہیں ہیں۔"
+          commits_behind:
+            one: تِھیم 1 کَمِٹ پیچھے ہے!
+            other: تِھیم {{count}} کَمِٹس پیچھے ہے!
+          scss:
+            text: "CSS"
+            title: "اپنی مرضی کے مطابق CSS درج کریں، ہم تمام درست CSS اور SCSS سٹائلز قبول کرتے ہیں"
+          header:
+            text: "ہَیڈر"
+            title: "سائٹ ہَیڈر کے اوپر ظاہر کرنے کے لئے HTML درج کریں"
+          after_header:
+            text: "ہَیڈر کے بعد"
+            title: "تمام صفحات پر ہَیڈر کے بعد ظاہر کرنے کے لئے HTML درج کریں"
+          footer:
+            text: "فوٹر"
+            title: "صفحہ کے فوٹر پر ظاہر کرنے کے لئے HTML درج کریں"
+          embedded_scss:
+            text: "اَیمبَیڈ کیا ہوا CSS"
+            title: "تبصرے کے اَیمبَیڈ شدہ ورژن کے ساتھ فراہم کیے جانے والا اپنی مرضی کا CSS درج کریں"
+          head_tag:
+            text: "</head>"
+            title: "HTML جو </head> ٹیگ سے پہلے داخل کی جائے گی"
+          body_tag:
+            text: "</body>"
+            title: "HTML جو </body> ٹیگ سے پہلے داخل کی جائے گی"
+          yaml:
+            text: "YAML"
+            title: "تھیم ترتیبات کی وضاحت YAML فارمَیٹ میں کریں"
         colors:
+          select_base:
+            title: "بَیس رنگ سکیم منتخب کریں"
+            description: "بَیس سکیم:"
           title: "رنگ"
+          edit: "رنگ سکیمیں ترمیم کریں"
           long_title: "رنگ سکیمیں"
+          about: "اپنی تِھیمز کے استعمال کردہ رنگوں میں ترمیم کریں۔ شروع کرنے کے لئے ایک نئی سکیم بنائیں۔"
           new_name: "نئی رنگ سکیم"
           copy_name_prefix: "نقل از"
           delete_confirm: "اِس رنگ سکیم کو حذف کریں؟"
@@ -2425,7 +2900,7 @@ ur:
         templates: "ٹَیمپلیٹ"
         preview_digest: "ڈائجسٹ کا مشاہدہ کریں"
         sending_test: "ٹیسٹ اِیمیل بھیجی جا رہی ہے..."
-        error: "</b>تکنیکی خرابی<b> - ٪{server_error}"
+        error: "<b>خرابی</b> - %{server_error}"
         test_error: "ٹیسٹ اِیمیل بھیجنے میں ایک مسئلہ پیش آیا۔ اپنی میل سیٹِنگ دوبارہ چیک کریں، تصدیق کر لیں کہ آپ کا ہَوسٹ میل کنکشنوں کو بلاک تو نہیں کر رہا، اور دوبارہ کوشش کریں۔"
         sent: "بھیج دی گئی"
         skipped: "چھوڑا گیا"
@@ -2482,6 +2957,15 @@ ur:
             type_placeholder: "ڈائجسٹ، سائن اَپ..."
             reply_key_placeholder: "جواب کِی"
             skipped_reason_placeholder: "وجہ"
+      moderation_history:
+        performed_by: "کی طرف سے عمل کیا کیا"
+        no_results: "کوئی ماڈرَیشَن ہسٹری موجود نہیں ہے۔"
+        actions:
+          delete_user: "صارف حذف کر دیا گیا"
+          suspend_user: "صارف معطل کر دیا گیا"
+          silence_user: "صارف خاموش کر دیا گیا"
+          delete_post: "پوسٹ حذف کر دی گئی"
+          delete_topic: "ٹاپک حذف کر دیا گیا"
       logs:
         title: "لاگز"
         action: "عمل"
@@ -2499,6 +2983,8 @@ ur:
           block: "بلاک کریں"
           do_nothing: "کچھ نہ کریں"
         staff_actions:
+          all: "تمام"
+          filter: "فِلٹر:"
           title: "سٹاف عوامل"
           clear_filters: "سب کچھ دکھائیں"
           staff_user: "سٹاف یوزر"
@@ -2519,6 +3005,8 @@ ur:
             change_trust_level: "ٹرسٹ لَیول تبدیل کریں"
             change_username: "صارف نام تبدیل کریں"
             change_site_setting: "ویب سائٹ کی سیٹِنگ تبدیل کریں"
+            change_theme: "تِھیم تبدیل کریں"
+            delete_theme: "تِھیم حذف کریں"
             change_site_text: "سائٹ ٹَیکسٹ تبدیل کریں"
             suspend_user: "صارف معطل کریں"
             unsuspend_user: "صارف کی معطلی ختم کریں"
@@ -2526,6 +3014,7 @@ ur:
             revoke_badge: "بَیج منسوخ کریں"
             check_email: "اِیمیل چیک کریں"
             delete_topic: "ٹاپک حذف کریں"
+            recover_topic: "ٹاپک غیر حذف کریں"
             delete_post: "پوسٹ حذف کریں"
             impersonate: "نقالی"
             anonymize_user: "صارف گمنام بنائیں"
@@ -2533,6 +3022,8 @@ ur:
             change_category_settings: "زمرہ جات کی سیٹِنگ تبدیل کریں"
             delete_category: "زمرہ حذف کریں"
             create_category: "زمرہ بنائیں"
+            silence_user: "صارف خاموش کریں"
+            unsilence_user: "صارف کی خاموشی ختم کریں"
             grant_admin: "اَیڈمِن عطا کریں"
             revoke_admin: "اَیڈمِن منسوخ کریں"
             grant_moderation: "ماڈرَیشَن عطا کریں"
@@ -2548,6 +3039,14 @@ ur:
             change_readonly_mode: "صرف پڑھنے کا مَوڈ تبدیل کریں"
             backup_download: "بیک اَپ ڈاؤن لوڈ کریں"
             backup_destroy: "بیک اَپ تباہ کریں"
+            reviewed_post: "پوسٹ کا جائزہ لیا"
+            custom_staff: "پلَگ اِن کیلئے اپنی مرضی کا عمل"
+            post_locked: "پوسٹ لاک کر دی گئی"
+            post_edit: "پوسٹ ترمیم"
+            post_unlocked: "پوسٹ کھول دی گئی"
+            check_personal_message: "ذاتی پیغام چیک کریں"
+            disabled_second_factor: "دو فیکٹر توثیق غیر فعال کریں"
+            topic_published: "ٹاپک شائع کر دیا گیا"
         screened_emails:
           title: "سکرین کی گئی اِیمیلز"
           description: "جب کوئی نیا اکاؤنٹ بنانے کی کوشش کرے گا، تو مندرجہ ذیل اِیمیل ایڈریسوں کو چیک کیا جائے گا اور رجسٹریشن بلاک، یا کوئی اور کارروائی کی جائے گی۔"
@@ -2562,9 +3061,9 @@ ur:
         screened_ips:
           title: "سکرین کیے گئے IP"
           description: 'IP ایڈریس جن پر نظر رکھی ہوئی ہے۔ IP ایڈریسوں کو وائٹ لِسٹ کرنے کیلئے "اجازت دیں" کو استعمال کریں۔'
-          delete_confirm: "کیا آپ واقعی ٪{IP_ADDRESS} کیلئے اصول کو ہٹانا چاہتے ہیں؟"
+          delete_confirm: "کیا آپ واقعی %{ip_address} کیلئے اصول کو ہٹانا چاہتے ہیں؟"
           roll_up_confirm: "کیا آپ واقعی عام سکرین کیے گئے IP ایڈریسوں کو subnets میں رول اَپ کرنا چاہتے ہیں؟"
-          rolled_up_some_subnets: "کامیابی کے ساتھ IP بین اندراجات کو اِن subnets میں رول اَپ کر دیا گیا: ٪{subnets}۔"
+          rolled_up_some_subnets: "کامیابی کے ساتھ IP بین اندراجات کو اِن subnets میں رول اَپ کر دیا گیا: %{subnets}۔"
           rolled_up_no_subnet: "رول اَپ کرنے کیلئے کچھ بھی نہیں تھا۔"
           actions:
             block: "بلاک کریں"
@@ -2578,8 +3077,47 @@ ur:
           roll_up:
             text: "رول اَپ"
             title: "نئے subnet بین اندراجات بناتا ہے اگر کم از کم 'min_ban_entries_for_roll_up' اندراجات موجود ہوں۔"
+        search_logs:
+          title: "لاگز سرچ کریں"
+          term: "اصطلاح"
+          searches: "سرچز"
+          click_through: "کلِک تھرُو"
+          unique: "منفرد"
+          unique_title: "سرچ کرنے والے منفرد صارفین"
+          types:
+            all_search_types: "تمام سرچ ٹاپکس"
+            header: "ہَیڈر"
+            full_page: "مکمل پیج"
+            click_through_only: "تمام (صرف کلِک تھرُو)"
+          header_search_results: "ہیڈر کے سرچ نتائج"
         logster:
           title: "خرابیوں کے لاگز"
+      watched_words:
+        title: "نظر رکھے ہوئے الفاظ"
+        search: "سرچ"
+        clear_filter: "صاف کریں"
+        show_words: "الفاظ دکھائیں"
+        word_count:
+          one: 1 لفظ
+          other: '%{count}الفاظ '
+        actions:
+          block: 'بلاک کریں'
+          censor: 'سَینسَر'
+          require_approval: 'منظوری کی ضرورت ہے'
+          flag: 'فلَیگ'
+        action_descriptions:
+          block: 'اِن الفاظ پر مشتمل پوسٹس شائع ہونے سے روکیں۔ جب صارف اپنی پوسٹ شائع کرنے کی کوشش کرے گا تو اُسے ایک خرابی کا پیغام دکھایا جائے گا۔'
+          censor: 'اِن الفاظ پر مشتمل پوسٹس کوشائع ہونے دیں، لیکن سینسر کیے گئے الفاظ کو چھپانے والے حروف کے ساتھ تبدیل کریں۔'
+          require_approval: 'اِن الفاظ پر مشتمل پوسٹس کے نظر آنے سے پہلے اسٹاف کی طرف سے منظوری کی ضرورت ہوگی۔'
+          flag: 'اِن الفاظ پر مشتمل پوسٹس کوشائع ہونے دیں، لیکن ان کو غیر مناسب کے طور پر فلَیگ کریں تاکہ منتظمین ان کا جائزہ لے سکیں۔'
+        form:
+          label: 'نیا لفظ:'
+          placeholder: 'مکمل لفظ یا * وائلڈ کارڈ کے طور پر'
+          placeholder_regexp: "رَیگولر اَیکسپرَیشَن"
+          add: 'شامل کریں'
+          success: 'کامیابی'
+          upload: "اَپ لوڈ"
+          upload_successful: "اَپ لوڈ کامیاب ہوا۔ الفاظ شامل کردیے گئے ہیں۔"
       impersonate:
         title: "نقالی"
         help: "ڈِیبَگ مقاصد کیلئے اِس آلے کو استعمال کر کہ ایک صارف کے اکاؤنٹ کی نقالی کریں۔ کام ختم ہونے کے بعد آپ کے ایک دفعہ لاگ آؤٹ کرنا ہو گا۔"
@@ -2599,14 +3137,15 @@ ur:
           pending: "زیرِاِلتوَاء"
           staff: 'سٹاف'
           suspended: 'معطل کردہ'
+          silenced: 'خاموش کیو ہوئے'
           suspect: 'مشتبہ'
         approved: "منظورشدہ؟"
         approved_selected:
-          one: "صارف منظور کریں"
-          other: "صارفین منظور کریں ({{count}})"
+          one: صارف منظور کریں
+          other: صارفین منظور کریں ({{count}})
         reject_selected:
-          one: "صارف مسترد کریں"
-          other: "صارفین مسترد کریں ({{count}})"
+          one: صارف مسترد کریں
+          other: صارفین مسترد کریں ({{count}})
         titles:
           active: 'متحرک صارفین'
           new: 'نئے صارفین'
@@ -2619,14 +3158,15 @@ ur:
           staff: "سٹاف"
           admins: 'ایڈمِن صارفین'
           moderators: 'ماڈریٹرز'
+          silenced: 'خاموش کردہ صارفین'
           suspended: 'معطل کردہ صارفین'
           suspect: 'مشتبہ صارفین'
         reject_successful:
-          one: "کامیابی کے ساتھ 1 صارف کو مسترد کیا۔"
-          other: "کامیابی کے ساتھ ٪{count} صارفین کو مسترد کیا۔"
+          one: کامیابی کے ساتھ 1 صارف کو مسترد کیا۔
+          other: کامیابی کے ساتھ %{count} صارفین کو مسترد کیا۔
         reject_failures:
-          one: "1 صارف کو مسترد کرنے میں ناکامی۔"
-          other: "٪{count} صارفین کو مسترد کرنے میں ناکامی۔"
+          one: 1 صارف کو مسترد کرنے میں ناکامی۔
+          other: '%{count} صارفین کو مسترد کرنے میں ناکامی۔'
         not_verified: "غیر تصدیق شدہ"
         check_email:
           title: "اِس صارف کا اِیمیل ایڈریس ظاہر کریں"
@@ -2636,10 +3176,31 @@ ur:
         unsuspend_failed: "اِس صارف کی معطلی ختم کرتے ہوے کچھ غلط ہو گیا {{error}}"
         suspend_duration: "صارف کب تک معطل رہے گا؟"
         suspend_reason_label: "آپ معطل کیوں کر رہے ہیں؟ یہ ٹَیکسٹ اِس صارف کے پروفائل پیج پر <b>ہر کسی کے لیے ظاہر ہو گا</b>، اور جب صارف لاگ اِن کرنے کی کوشش کریں گے تو اُنہیں دکھایا جائے گا۔ اِسے مختصر رکھیں۔"
+        suspend_reason_hidden_label: "آپ کیوں معطل کر رہے ہیں؟ صارف جب لاگ اِن کرنے کی کوشش کرے گا تو اُسے یہ ٹیکسٹ دکھایا جائے گا۔ اِسے مختصر رکھیں۔"
         suspend_reason: "وجہ"
+        suspend_reason_placeholder: "وجہ معطلی"
+        suspend_message: "اِی مَیل پیغام"
+        suspend_message_placeholder: "اختیاریطور پر معطلی کے بارے میں مزید معلومات فراہم کریں اور یہ صارف کو ای میل کر دی جائیں گی۔"
         suspended_by: "کی طرف سے معطل کیا گیا"
+        silence_reason: "وجہ"
+        silenced_by: "جس نے خاموش کیا"
+        silence_modal_title: "صارف خاموش کریں"
+        silence_duration: "صارف کب تک خاموش رہے گا؟"
+        silence_reason_label: "آپ اِس صارف کو کیوں خاموش کر رہے ہیں؟"
+        silence_reason_placeholder: "خاموش کردینے کی وجہ"
+        silence_message: "اِی مَیل پیغام"
+        silence_message_placeholder: "(ڈیفالٹ پیغام بھیجنے کیلئے خالی چھوڑ دیں)"
+        suspended_until: "(%{until} تک)"
+        cant_suspend: "یہ صارف معطل نہیں کیا جا سکتا۔"
         delete_all_posts: "تمام پوسٹس حذف کریں"
-        delete_all_posts_confirm_MF: "آپ {POSTS، جمع، ایک {1 پوسٹ} دیگر {# posts}} اور {TOPICS، جمع، ایک {1 ٹاپک} دیگر {# topics}} حذف کرنے والے ہیں۔ کیا آپ کو یقین ہے؟"
+        penalty_post_actions: "آپ اِس مُنسلِک پوسٹ کے ساتھ کیا کرنا چاہیں گے؟"
+        penalty_post_delete: "پوسٹ حذف کریں"
+        penalty_post_edit: " پوسٹ ترمیم کریں"
+        penalty_post_none: "کچھ نہ کریں"
+        delete_all_posts_confirm_MF: "آپ {POSTS, plural, one {1 پوسٹ} other {# پوسٹس}} and {TOPICS, plural, one {1 ٹاپک} other {# ٹاپکس}} حذف کرنے والے ہیں۔ کیا آپ کو یقین ہے؟"
+        silence: "خاموش کریں"
+        unsilence: "خاموشی ختم کریں"
+        silenced: "خاموش کیا ہوا؟"
         moderator: "ماڈریٹر؟"
         admin: "ایڈمن؟"
         suspended: "معطل کردہ؟"
@@ -2655,10 +3216,14 @@ ur:
         logged_out: "صارف کو تمام ڈِیوائیسِز سے لاگ آؤٹ کر دیا گیا"
         revoke_admin: 'اَیڈمِن منسوخ کریں'
         grant_admin: 'اَیڈمِن عطا کریں'
+        grant_admin_confirm: "نئے ایڈمِنِسٹریٹر کی توثیق کیلئے ہم نے آپ کو ایک ای میل بھیجی ہے۔ براہ مہربانی اسے کھولیں اور ہدایات پر عمل کریں۔"
         revoke_moderation: 'ماڈرَیشَن منسوخ کریں'
         grant_moderation: 'ماڈرَیشَن عطا کریں'
         unsuspend: 'معطلی ختم کریں'
         suspend: 'معطل کریں'
+        show_flags_received: "ملے فلَیگز دکھائیں"
+        flags_received_by: "%{username} کو ملے فلَیگز "
+        flags_received_none: "اِس صارف کو کوئی فلَیگز نہیں ملے۔"
         reputation: ساکھ
         permissions: اجازتیں
         activity: سرگرمی
@@ -2667,6 +3232,7 @@ ur:
         private_topics_count: نِجی ٹاپک
         posts_read_count: پڑھی گئیں پوسٹس
         post_count: بنائی گئیں پوسٹس
+        second_factor_enabled: دو فیکٹر توثیق فعال کردی گئی
         topics_entered: دیکھ لیے گئے ٹاپک
         flags_given_count: فلَیگز دیے گئے
         flags_received_count: فلَیگز ملے
@@ -2685,14 +3251,14 @@ ur:
         delete_forbidden_because_staff: "اَیڈمن اور ماڈریٹرز حذف نہیں کیے جا سکتے۔"
         delete_posts_forbidden_because_staff: "اَیڈمن اور ماڈریٹرز کی تمام پوسٹس حذف نہیں کی جا سکتیں۔"
         delete_forbidden:
-          one: "اگر صارفین کی پوسٹس موجود ہوں تو اُنہیں حذف نہیں کیا جا سکتا۔ ایک صارف کو حذف کرنے کی کوشش سے پہلے تمام پوسٹس کو حذف کریں۔ (٪{count} دن سے زیادہ پرانی پوسٹس کوحذف نہیں کیا جا سکتا۔)"
-          other: "اگر صارفین کی پوسٹس موجود ہوں تو اُنہیں حذف نہیں کیا جا سکتا۔ ایک صارف کو حذف کرنے کی کوشش سے پہلے تمام پوسٹس کو حذف کریں۔ (٪{count} دن سے زیادہ پرانی پوسٹس کوحذف نہیں کیا جا سکتا۔)"
+          one: اگر صارفین کی پوسٹس موجود ہوں تو اُنہیں حذف نہیں کیا جا سکتا۔ ایک صارف کو حذف کرنے کی کوشش سے پہلے تمام پوسٹس کو حذف کریں۔ (%{count} دن سے زیادہ پرانی پوسٹس کوحذف نہیں کیا جا سکتا۔)
+          other: اگر صارفین کی پوسٹس موجود ہوں تو اُنہیں حذف نہیں کیا جا سکتا۔ ایک صارف کو حذف کرنے کی کوشش سے پہلے تمام پوسٹس کو حذف کریں۔ (%{count} دن سے زیادہ پرانی پوسٹس کوحذف نہیں کیا جا سکتا۔)
         cant_delete_all_posts:
-          one: "تمام پوسٹس کو حذف نہیں کیا جاسکتا۔ کچھ پوسٹس ٪{count} دن پرانی سے زیادہ پرانی ہیں۔(delete_user_max_post_age سیٹِنگ۔)"
-          other: "تمام پوسٹس کو حذف نہیں کیا جاسکتا۔ کچھ پوسٹس ٪{count} دن پرانی سے زیادہ پرانی ہیں۔(delete_user_max_post_age سیٹِنگ۔)"
+          one: تمام پوسٹس کو حذف نہیں کیا جاسکتا۔ کچھ پوسٹس %{count} دن پرانی سے زیادہ پرانی ہیں۔(delete_user_max_post_age سیٹِنگ۔)
+          other: تمام پوسٹس کو حذف نہیں کیا جاسکتا۔ کچھ پوسٹس %{count} دن پرانی سے زیادہ پرانی ہیں۔(delete_user_max_post_age سیٹِنگ۔)
         cant_delete_all_too_many_posts:
-          one: "تمام پوسٹس کو حذف نہیں کیا جاسکتا کیونکہ صارف کی 1 سے زیادہ پوسٹس ہیں۔ (delete_all_posts_max)"
-          other: "تمام پوسٹس کو حذف نہیں کیا جاسکتا کیونکہ صارف کی ٪{count} سے زیادہ پوسٹس ہیں۔ (delete_all_posts_max)"
+          one: تمام پوسٹس کو حذف نہیں کیا جاسکتا کیونکہ صارف کی 1 سے زیادہ پوسٹس ہیں۔ (delete_all_posts_max)
+          other: تمام پوسٹس کو حذف نہیں کیا جاسکتا کیونکہ صارف کی %{count} سے زیادہ پوسٹس ہیں۔ (delete_all_posts_max)
         delete_confirm: "کیا آپ واقعی اِس صارف کو حذف کرنا چاہتے ہیں؟ یہ مُستقِل عمل ہے!"
         delete_and_block: "اِس اِیمیل اور IP ایڈریس کو حذف اور <b>بلاک</b> کریں"
         delete_dont_block: "صرف حذف کریں"
@@ -2700,17 +3266,23 @@ ur:
         delete_failed: "اُس صارف کو حذف کرنے میں ایک مسئلہ پیش آیا۔ صارف کو حذف کرنے سے پہلے اس بات کا یقین کرلیں کہ تمام پوسٹس حذف کر دی گئی ہیں۔"
         send_activation_email: "ایکٹیویشن اِیمیل بھیجییں"
         activation_email_sent: "ایک ایکٹیویشن اِیمیل بھیج دی گئی ہے۔"
-        send_activation_email_failed: "ایک اور ایکٹیویشن اِیمیل بھیجنے میں ایک مسئلہ پیش آیا۔ ٪{error}"
+        send_activation_email_failed: "ایک اور ایکٹیویشن اِیمیل بھیجنے میں ایک مسئلہ پیش آیا۔ %{error}"
         activate: "اکاؤنٹ فعال کریں"
         activate_failed: "صارف فعال کرنے میں ایک مسئلہ پیش آیا۔"
         deactivate_account: "اکاؤنٹ غیر فعال کریں"
         deactivate_failed: "صارف کو غیر فعال کرنے میں ایک مسئلہ پیش آیا۔"
+        unsilence_failed: 'صارف کی خاموشی ختم کرنے میں ایک مسئلہ پیش آیا۔'
+        silence_failed: 'صارف کو خاموش کرنے میں ایک مسئلہ پیش آیا۔'
+        silence_confirm: 'کیا آپ واقعی اِس صارف کو خاموش کرنا چاہتے ہیں؟ وہ کوئی بھی نئے ٹاپک یا پوسٹ  نہیں بنا سکیں گے۔'
+        silence_accept: 'جی ہاں، اِس صارف کو خاموش کریں'
         bounce_score: "بائونس سکور"
         reset_bounce_score:
           label: "رِی سَیٹ"
           title: "بائونس سکور واپس 0 پر رِی سَیٹ کریں"
+        visit_profile: "اِس صارف کے پروفائل میں ترمیم کرنے کیلئے <a href='%{url}'>اِس کے ترجیحات پَیج</a> پر جائیں"
         deactivate_explanation: "ایک غیر فعال صارف کو اپنا اِیمیل دوبارہ تصدیق کرنا ضروری ہے۔"
         suspended_explanation: "کوئی معطل صارف لاگ اِن نہیں کر سکتا۔"
+        silence_explanation: "ایک خاموش کیا ہوا صارف پوسٹ شائع یا ٹاپک شروع نہیں کر سکتا۔"
         staged_explanation: "ایک سٹَیجڈ صارف صرف مخصوص ٹاپکس پر اِیمیل کے ذریعے پوسٹ کر سکتا ہے۔"
         bounce_score_explanation:
           none: "اس اِیمیل سے حال میں کوئی باؤنسِز موصول نہیں ہوئے۔"
@@ -2727,8 +3299,8 @@ ur:
         tl3_requirements:
           title: "ٹرسٹ لَیول 3 کے تقاضے"
           table_title:
-            one: "پچھلے دن میں"
-            other: "پچھلے ٪{count} دنوں میں"
+            one: پچھلے دن میں
+            other: پچھلے %{count}دنوں میں
           value_heading: "وَیلِیو"
           requirement_heading: "ضروریات"
           visits: "زائرین کی تعداد"
@@ -2802,11 +3374,12 @@ ur:
         go_back: "واپس سَرچ پر"
         recommended: "اَپنی ضروریات کے مطابق کرنے کے لئے ہم مندرجہ ذیل ٹَیکسٹ کو اپنی مرضی کے حساب سے تبدیل کرنے کی تجویز دیں گے:"
         show_overriden: 'صرف اووَر رائیڈ ہوئے دکھائیں'
-      site_settings:
+      settings:
         show_overriden: 'صرف اووَر رائیڈ ہوئے دکھائیں'
-        title: 'سیٹِنگ'
         reset: 'رِی سَیٹ'
         none: 'کوئی نہیں'
+      site_settings:
+        title: 'سیٹِنگ'
         no_results: "کوئی نتائج نہیں پائے گئے۔"
         clear_filter: "صاف کریں"
         add_url: "URL شامل کریں"
@@ -2828,6 +3401,7 @@ ur:
           developer: 'ڈیولپر'
           embedding: "اَیمبَیڈ کرنا"
           legal: "قانونی"
+          api: 'API'
           user_api: 'یُوزَر API'
           uncategorized: 'دیگر'
           backups: "بیک اَپس"
@@ -2864,7 +3438,7 @@ ur:
         grant_badge: بَیج دیں
         granted_badges: دیے گئے بَیجز
         grant: عطا کریں
-        no_user_badges: "٪{name} کو کوئی بَیج عطا نہیں کیا گیا ہے۔"
+        no_user_badges: "%{name} کو کوئی بَیج عطا نہیں کیا گیا ہے۔"
         no_badges: عطا کیے جانے کیلئے کوئی بَیج موجود نہیں ہیں۔
         none_selected: "شروع کرنے کے لئے ایک بَیج منتخب کریں"
         allow_title: عنوان کے طور پر بَیج وں کے استعمال کی اجازت دیں
@@ -2873,10 +3447,10 @@ ur:
         enabled: بَیج فعال کریں
         icon: آئیکن
         image: تصویر
-        icon_help: "تصویر کا URL یا فونٹ اَوسم کلاس استعمال کریں"
         query: بَیج قُوَیری (SQL)
         target_posts: ھدف پوسٹس کو قُوَیری کریں
         auto_revoke: روزانہ رَیوَوکَیشَن قُوَیری چلائیں
+        show_posts: بَیج صفحے پر بَیج دینے والی پوسٹ دکھائیں
         trigger: محرکات
         trigger_type:
           none: "روزانہ اَپ ڈَیٹ کریں"
@@ -2896,27 +3470,28 @@ ur:
             text: "کچھ گرانٹ سامپل لاپتہ ہیں۔ یہ اُس وقت ہوتا ہے جب بَیج قُوَیری وہ صارف IDs یا پوسٹ IDs واپس بھیجتا ہے جو موجود نہیں ہوتیں۔ یہ بعد میں غیر متوقع نتائج کا سبب بن سکتا ہے - آپ اپنی قُوَیری کو دوبارہ چیک کرلیں۔"
           no_grant_count: "کوئی بَیج تفویض کرنے کیلئے موجود نہیں۔"
           grant_count:
-            one: "تفویض  کرنے کیلئے <b>1</b> بَیج موجود ہے۔"
-            other: "تفویض  کرنے کیلئے <b>٪{count}</b> بَیج موجود ہیں۔"
+            one: تفویض  کرنے کیلئے <b>1</b> بَیج موجود ہے۔
+            other: تفویض  کرنے کیلئے <b>%{count}</b> بَیج موجود ہیں۔
           sample: "نمونہ:"
           grant:
-            with: <span class="username">٪{username}</span>
-            with_post: <span class="username">٪{username}</span> اِس ٪{لنک} میں پوسٹ کیلئے
-            with_post_time: <span class="username">٪{username}</span> <span class="time">٪{time}</span> پر اِس ٪{لنک} میں پوسٹ کیلئے
-            with_time: <span class="username">٪{username}</span> <span class="time">٪{time}</span> پر
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span> اِس %{link} میں پوسٹ کیلئے"
+            with_post_time: "<span class=\"username\">%{username}</span> <span class=\"time\">%{time}</span> پر اِس %{link} میں پوسٹ کیلئے"
+            with_time: "<span class=\"username\">%{username}</span> <span class=\"time\">%{time}</span> پر"
       emoji:
         title: "اِیمَوجی"
         help: "نئی اِیمَوجی شامل کریں جو سب کے لئے دستیاب ہوگی۔ (پیشہ وَرَانہ ٹِپ: ایک بار میں ایک سے زیادہ فائلوں کو ڈرَیگ & ڈراپ کریں)"
         add: "نئی اِیمَوجی شامل کریں"
         name: "نام"
         image: "تصویر"
-        delete_confirm: "کیا آپ واقعی :٪{name}: اِیمَوجی کو حذف کرنا چاہتے ہیں؟"
+        delete_confirm: "کیا آپ واقعی :%{name}: اِیمَوجی حذف کرنا چاہتے ہیں؟"
       embedding:
         get_started: "اگر آپ ڈِسکورس کو ایک اور ویب سائٹ پر اَیمبَیڈ کرنا چاہتے ہیں، تو ہوسٹ شامل کر کے شروع کریں۔"
         confirm_delete: "کیا آپ واقعی اس ہَوسٹ کو حذف کرنا چاہتے ہیں؟"
         sample: "ڈِسکورس ٹاپک بنانے اور اَیمبَیڈ کرنے کیلئے اپنی ویب سائٹ میں درج ذیل HTML کوڈ استعمال کریں۔ جس پیج پر آپ اسے اَیمبَیڈ کر رہے ہیں اُس کا canonical URL <b>REPLACE_ME</b> کی جگہ اِستعمال کریں۔"
         title: "اَیمبَیڈ کرنا"
         host: "اجازت یافتہ ہَوسٹ"
+        class_name: "کلاس کا نام"
         path_whitelist: "پاتھ وائِٹ لِسٹ"
         edit: "ترمیم"
         category: "زمرہ میں پوسٹ کریں"
@@ -2936,6 +3511,7 @@ ur:
         embed_classname_whitelist: "اجازت یافتہ CSS کلاسوں کے نام"
         feed_polling_enabled: "RSS / ATOM کے ذریعے پوسٹس درآمد کریں"
         feed_polling_url: "کرال کرنے کیلئے RSS / ATOM کا URL"
+        feed_polling_frequency_mins: "فیڈ پولنگ کی فریکوئینسی (منٹوں میں)"
         save: "اَیمبَیڈ کرنے کی سیٹِنگ محفوظ کریں"
       permalink:
         title: "دائمی لِنکس"
@@ -2957,10 +3533,13 @@ ur:
       done: "مکمل"
       back: "واپس"
       next: "اگلا"
-      step: "٪{total} میں سے ٪{current}"
+      step: "%{total} میں سے %{current}"
       upload: "اَپ لوڈ"
       uploading: "اَپ لوڈ کیا جا رہا ہے..."
       quit: "شاید بعد میں"
+      staff_count:
+        one: آپ کی کمیونٹی میں 1 اسٹاف کا رکن ہے (آپ)۔
+        other: آپ کی کمیونٹی میں آپ سمیت، %{count} سٹاف کے ارکان ہیں۔
       invites:
         add_user: "شامل کریں"
         none_added: "آپ نے کسی  بھی سٹاف کو مدعو نہیں کیا۔ کیا آپ واقعی آگے جانا چاہتے ہیں؟"
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index 7f14104b468..2c92ec61959 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -42,47 +42,52 @@ vi:
       tiny:
         half_a_minute: "< 1 phút"
         less_than_x_seconds:
-          other: "< %{count}s"
+          other: < %{count}s
         x_seconds:
-          other: "%{count}s"
+          other: '%{count}s'
+        less_than_x_minutes:
+          other: < %{count} phút
         x_minutes:
-          other: "%{count}m"
+          other: '%{count}m'
         about_x_hours:
-          other: "%{count}h"
+          other: '%{count}h'
         x_days:
-          other: "%{count}d"
+          other: '%{count}d'
+        x_months:
+          other: '%{count} tháng'
         about_x_years:
-          other: "%{count}y"
+          other: '%{count}y'
         over_x_years:
-          other: "> %{count}y"
+          other: '> %{count}y'
         almost_x_years:
-          other: "%{count}y"
+          other: '%{count}y'
         date_month: "MMM D"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          other: "%{count} phút"
+          other: '%{count} phút'
         x_hours:
-          other: "%{count} giờ"
+          other: '%{count} giờ'
         x_days:
-          other: "%{count} ngày"
+          other: '%{count} ngày'
         date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
-          other: " %{count} phút trước"
+          other: ' %{count} phút trước'
         x_hours:
-          other: "%{count} giờ trước"
+          other: '%{count} giờ trước'
         x_days:
-          other: "%{count} ngày trước"
+          other: '%{count} ngày trước'
       later:
         x_days:
-          other: "còn %{count} ngày"
+          other: còn %{count} ngày
         x_months:
-          other: "còn %{count} tháng"
+          other: còn %{count} tháng
         x_years:
-          other: "còn %{count} năm"
+          other: còn %{count} năm
       previous_month: 'Tháng trước'
       next_month: 'Tháng sau'
+      placeholder: ngày
     share:
       topic: 'chia sẻ chủ đề này'
       post: 'đăng #%{postNumber}'
@@ -93,10 +98,10 @@ vi:
       email: 'Gửi liên kết này qua email'
     action_codes:
       public_topic: "hiển thị chủ đề này công khai lúc %{when}"
-      private_topic: "Ẩn chủ đề này lúc %{when}"
       split_topic: "tách chủ đề này lúc %{when}"
       invited_user: "đã mời %{who} lúc %{when}"
       invited_group: "đã mời %{who} lúc %{when}"
+      user_left: "%{who}tự xóa mình khỏi tin nhắn này %{when}"
       removed_user: "xoá %{who} lúc %{when}"
       removed_group: "xoá %{who} lúc %{when}"
       autoclosed:
@@ -123,8 +128,6 @@ vi:
     topic_admin_menu: "Lựa chọn quản lí chủ đề."
     wizard_required: "Chào mừng bạn đến với Discourse! Hãy bắt đầu với <a href='%{url}' data-auto-route='true'>hướng dẫn cài đặt</a> ✨"
     emails_are_disabled: "Ban quản trị đã tắt mọi email gửi đi. Sẽ không có bất kỳ thông báo nào qua email được gửi đi."
-    bootstrap_mode_enabled: "Để đơn giản hoá quá trình triển khai, bạn đang ở trong chế độ bootstrap. Mọi người dùng mới đều có trust level 1 và sẽ nhận được email cập nhật thông tin mỗi ngày. Chế độ này sẽ tự động tắt khi số người dùng vượt qua %{min_users}."
-    bootstrap_mode_disabled: "Chế độ bootstrap sẽ bị tắt trong 24 giờ tới."
     themes:
       default_description: "Mặc định"
     s3:
@@ -160,7 +163,7 @@ vi:
     show_help: "lựa chọn"
     links: "Liên kết"
     links_lowercase:
-      other: "liên kết"
+      other: liên kết
     faq: "FAQ"
     guidelines: "Hướng dẫn"
     privacy_policy: "Chính sách về quyền riêng tư"
@@ -184,7 +187,7 @@ vi:
     max_of_count: "tối đa trong {{count}}"
     alternation: "hoặc"
     character_count:
-      other: "{{count}} ký tự"
+      other: '{{count}} ký tự'
     suggested_topics:
       title: "Chủ đề tương tự"
       pm_title: "Tin nhắn gợi ý"
@@ -196,8 +199,6 @@ vi:
       our_moderators: "Các điều hành viên"
       stat:
         all_time: "Từ trước tới nay"
-        last_7_days: "7 ngày qua"
-        last_30_days: "30 ngày vừa qua"
       like_count: "Lượt thích"
       topic_count: "Các chủ đề"
       post_count: "Các bài viết"
@@ -218,13 +219,6 @@ vi:
       last_read: "đây là bài viết cuối cùng bạn đã đọc; nhấp chuột để đánh dấu"
       remove: "Xóa dấu trang"
       confirm_clear: "Bạn có chắc muốn xóa tất cả dấu trang ở topic này?"
-    topic_count_latest:
-      other: "{{count}} chủ đề mới hoặc đã cập nhật."
-    topic_count_unread:
-      other: "{{count}} chủ đề chưa đọc."
-    topic_count_new:
-      other: "{{count}} chủ đề mới."
-    click_to_show: "Nhấp chuột để hiển thị."
     preview: "xem trước"
     cancel: "hủy"
     save: "Lưu thay đổi"
@@ -234,6 +228,7 @@ vi:
     uploading: "Đang tải lên..."
     uploading_filename: "Đang tải lên {{filename}}..."
     uploaded: "Đã tải lên!"
+    pasting: "Đang gõ"
     enable: "Kích hoạt"
     disable: "Vô hiệu hóa"
     undo: "Hoàn tác"
@@ -260,14 +255,14 @@ vi:
       cancel: "Hủy"
       view_pending: "xem bài viết đang chờ xử lý"
       has_pending_posts:
-        other: "Chủ đề này có <b>{{count}}</b> bài viết cần phê chuẩn"
+        other: Chủ đề này có <b>{{count}}</b> bài viết cần phê chuẩn
       confirm: "Lưu thay đổi"
       delete_prompt: "Bạn có chắc chắn muốn xóa <b>%{username}</b>? Thao tác này sẽ loại bỏ tất cả các bài viết của họ kèm theo khóa địa chỉ IP và email của họ."
       approval:
         title: "Bài viết cần phê duyệt"
         description: "Chúng tôi đã nhận được bài viết mới của bạn, nhưng nó cần phải được phê duyệt bởi admin trước khi được hiện. Xin hãy kiên nhẫn."
         pending_posts:
-          other: "Bạn có <strong>{{count}}</strong> bài viết đang chờ xử lý."
+          other: Bạn có <strong>{{count}}</strong> bài viết đang chờ xử lý.
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> đã đăng <a href='{{topicUrl}}'>chủ đề</a>"
@@ -301,7 +296,7 @@ vi:
       posts_read: "Đã đọc"
       posts_read_long: "Bài đăng đã đọc"
       total_rows:
-        other: "%{count} người dùng"
+        other: '%{count} người dùng'
     group_histories:
       actions:
         change_group_setting: "Đổi cài đặt nhóm"
@@ -310,22 +305,8 @@ vi:
         make_user_group_owner: "Đặt làm người sở hữu"
         remove_user_as_group_owner: "Huỷ quyền sở hữu"
     groups:
-      logs:
-        title: "Bản ghi"
-        when: "Khi"
-        action: "Hành động"
-        acting_user: "Người dùng đang hoạt động"
-        target_user: "Người dùng mục tiêu"
-        subject: "Chủ đề"
-        details: "Chi tiết"
-        from: "Từ"
-        to: "Đến"
-      edit:
-        title: 'Sửa nhóm'
-        full_name: 'Tên đầy đủ'
-        add_members: "Thêm thành viên"
-        delete_member_confirm: "Xoá  '%{username}' khỏi nhóm '%{group}' ?"
-      name_placeholder: "Tên nhóm, không có khoảng trắng, tương tự như luật đặt tên người dùng"
+      public_admission: "Cho phép Thành viên tham gia nhóm một cách tự do (nhóm hiển thị công khai)"
+      public_exit: "Cho phép Thành viên thoát khỏi nhóm một cách tự do"
       empty:
         posts: "Không có bài viết nào của các thành viên trong nhóm này"
         members: "Không có thành viên nào trong nhóm này"
@@ -334,45 +315,33 @@ vi:
         topics: "Không có chủ đề nào được gửi bởi thành viên của nhóm này."
         logs: "Không có bản ghi nào dành cho nhóm này"
       add: "Thêm"
-      join: "Tham gia nhóm"
-      leave: "Rời nhóm"
-      request: "Xin gia nhập nhóm"
       message: "Tin nh"
-      automatic_group: Nhóm tự động
-      closed_group: Nhóm kín
-      is_group_user: "Bạn là một thành viên của nhóm này"
       allow_membership_requests: "Cho phép người dùng gửi đơn xin gia nhập nhóm đến người quản lí nhóm."
+      membership_request_template: "đã tùy chỉnh để hiển thị cho người dùng khi gửi yêu cầu thành viên"
       membership_request:
         submit: "Gửi yêu c"
+        title: "Yêu cầu tham gia @%{group_name}"
+        reason: "Cho phép chủ sở hữu nhóm biết lý do bạn thuộc nhóm này"
       membership: "Thành viên"
       name: "Tên"
-      user_count: "Số lượng thành viên"
       bio: "Thông tin về nhóm"
-      selector_placeholder: "Thêm thành viên"
       owner: "chủ"
       index:
         title: "Nhóm"
         empty: "Không có nhóm công khai nào."
       title:
-        other: "Nhóm"
+        other: Nhóm
       activity: "Hoạt động"
-      members: "Các thành viên"
       topics: "Chủ đề"
       posts: "Các bài viết"
       mentions: "Được nhắc đến"
       messages: "Tin nhắn"
-      visibility_levels:
-        title: "Ai có thể xem nhóm"
-        public: "Mọi người"
       alias_levels:
         nobody: "Không ai cả"
         only_admins: "Chỉ các quản trị viên"
         mods_and_admins: "Chỉ có người điều hành và ban quản trị"
         members_mods_and_admins: "Chỉ có thành viên trong nhóm, ban điều hành, và ban quản trị"
         everyone: "Mọi người"
-      trust_levels:
-        title: "Cấp độ tin tưởng tự động tăng cho thành viên khi họ thêm:"
-        none: "Không có gì"
       notifications:
         watching:
           title: "Đang theo dõi"
@@ -397,23 +366,22 @@ vi:
       flair_color_placeholder: "(Tuỳ chọn) Giá trị mã màu Hexa"
       flair_preview_icon: "Biểu tượng xem trước"
       flair_preview_image: "Ảnh xem trước"
-      flair_note: "Ghi chú: Ảnh đại diện chỉ hiển thị cho nhóm chính của người dùng"
     user_action_groups:
-      '1': "Lượt thích"
-      '2': "Lần được thích"
-      '3': "Chỉ mục"
-      '4': "Các chủ đề"
-      '5': "Trả lời"
-      '6': "Phản hồi"
-      '7': "Được nhắc đến"
-      '9': "Lời trích dẫn"
-      '11': "Biên tập"
-      '12': "Bài đã gửi"
-      '13': "Hộp thư"
-      '14': "Đang chờ xử lý"
+      "1": "Lượt thích"
+      "2": "Lần được thích"
+      "3": "Chỉ mục"
+      "4": "Các chủ đề"
+      "5": "Trả lời"
+      "6": "Phản hồi"
+      "7": "Được nhắc đến"
+      "9": "Lời trích dẫn"
+      "11": "Biên tập"
+      "12": "Bài đã gửi"
+      "13": "Hộp thư"
+      "14": "Đang chờ xử lý"
     categories:
       all: "tất cả chuyên mục"
-      all_subcategories: "Tất cả"
+      all_subcategories: "tất cả trong %{categoryName}"
       no_subcategory: "không có gì"
       category: "Chuyên mục"
       category_list: "Hiễn thị danh sách chuyên mục"
@@ -432,9 +400,9 @@ vi:
       toggle_ordering: "chuyển lệnh kiểm soát"
       subcategories: "Phân loại phụ"
       topic_sentence:
-        other: "%{count} chủ đề"
+        other: '%{count} chủ đề'
       topic_stat_sentence:
-        other: "%{count} số lượng chủ đề mới tỏng quá khứ %{unit}."
+        other: '%{count} số lượng chủ đề mới tỏng quá khứ %{unit}.'
     ip_lookup:
       title: Tìm kiếm địa chỉ IP
       hostname: Hostname
@@ -475,7 +443,6 @@ vi:
       notifications: "Thông báo"
       statistics: "Thống kê"
       desktop_notifications:
-        label: "Desktop Notifications"
         not_supported: "Xin lỗi. Trình duyệt của bạn không hỗ trợ Notification."
         perm_default: "Mở thông báo"
         perm_denied_btn: "Không có quyền"
@@ -483,6 +450,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: 'Hủy bỏ'
       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"
       first_notification: "Thông báo đầu tiên của bạn! Chọn để bắt đầu"
@@ -529,7 +497,6 @@ vi:
       delete_account: "Xoá Tài khoản của tôi"
       delete_account_confirm: "Bạn có chắc chắn muốn xóa vĩnh viễn tài khoản của bạn? Hành động này không thể được hoàn tác!"
       deleted_yourself: "Tài khoản của bạn đã được xóa thành công."
-      delete_yourself_not_allowed: "Bạn không thể xóa tài khoản của bạn ngay bây giờ. Liên lạc với admin để làm xóa tài khoản  cho bạn."
       unread_message_count: "Tin nhắn"
       admin_delete: "Xoá"
       users: "Thành viên"
@@ -616,7 +583,7 @@ vi:
         authenticated: "Thư điện tử của bạn đã được xác nhận bởi {{provider}}"
         frequency_immediately: "Chúng tôi sẽ gửi email cho bạn ngay lập tức nếu bạn đã chưa đọc những điều chúng tôi đã gửi cho bạn qua email."
         frequency:
-          other: "Chúng tôi sẽ chỉ gửi email cho bạn nếu chúng tôi đã không nhìn thấy bạn trong {{count}} phút cuối."
+          other: Chúng tôi sẽ chỉ gửi email cho bạn nếu chúng tôi đã không nhìn thấy bạn trong {{count}} phút cuối.
       name:
         title: "Tên"
         instructions: "Tên đầy đủ của bạn (tuỳ chọn)"
@@ -647,8 +614,6 @@ vi:
       created: "Đã tham gia"
       log_out: "Log Out"
       location: "Vị trí"
-      card_badge:
-        title: "Huy hiệu của thẻ thành viên"
       website: "Web Site"
       email_settings: "Email"
       like_notification_frequency:
@@ -701,9 +666,9 @@ vi:
         title: "Lời mời"
         user: "User được mời"
         sent: "Đã gửi"
-        none: "Không có thư mời nào đang chờ để hiển thị"
+        none: "Không tìm thấy lời mời nào."
         truncated:
-          other: "Hiện {{count}} thư mời đầu tiên"
+          other: Hiện {{count}} thư mời đầu tiên
         redeemed: "Lời mời bù lại"
         redeemed_tab: "Làm lại"
         redeemed_tab_with_count: "Làm lại ({{count}})"
@@ -718,8 +683,10 @@ vi:
         rescinded: "Lời mời bị xóa"
         rescind_all: "Xóa tất cả lời m"
         rescinded_all: "Tất cả lời mời đã được xóa!"
+        rescind_all_confirm: "Bạn có muốn xóa bỏ tất cả các lời mời?"
         reinvite: "Mời lại"
         reinvite_all: "Gửi lại tất cả lời mời"
+        reinvite_all_confirm: "Bạn có chắc chắn gửi lại tất cả các lời mời?"
         reinvited: "Gửi lại lời mời"
         reinvited_all: "Tất cả lời mời đã được gửi lại"
         time_read: "Đọc thời gian"
@@ -745,16 +712,23 @@ vi:
         title: "Tóm tắt"
         stats: "Thống kê"
         time_read: "thời gian đọc"
+        recent_time_read: "đã đọc gần đây"
         topic_count:
-          other: "Chủ đề đã được tạo"
+          other: Chủ đề đã được tạo
         post_count:
-          other: "Bài viết đã được tạo"
+          other: Bài viết đã được tạo
+        likes_given:
+          other: nhận
+        likes_received:
+          other: Đã nhận
         days_visited:
-          other: "Ngày đã ghé thăm"
+          other: Ngày đã ghé thăm
+        topics_entered:
+          other: chủ đề đã xem
         posts_read:
-          other: "Bài viết đã đọc"
+          other: Bài viết đã đọc
         bookmark_count:
-          other: "Dấu trang"
+          other: Dấu trang
         top_replies: "Top trả lời"
         no_replies: "Chưa có trả lời."
         more_replies: "Thêm trả lời"
@@ -816,7 +790,7 @@ vi:
     too_few_posts_notice: "Hãy <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>bắt đầu thảo luận!</a> Hiện có <strong>%{currentPosts} / %{requiredPosts}</strong> bài viết. Khách ghé thăm cần một số chủ đề để đọc và trả lời."
     logs_error_rate_notice:
       rate:
-        other: "%{count} lỗi/%{duration}"
+        other: '%{count} lỗi/%{duration}'
     learn_more: "tìm hiểu thêm..."
     all_time: 'tổng cộng'
     all_time_desc: 'tổng số chủ đề đã tạo'
@@ -951,8 +925,8 @@ vi:
       alt: 'Alt'
     emoji_picker:
       people: Mọi ng
-      food: 'Thức '
-      activity: 'Hoạt '
+      food: "Thức "
+      activity: "Hoạt "
       objects: Vật th
     composer:
       emoji: "Emoji :)"
@@ -1032,28 +1006,12 @@ vi:
       empty: "Không có thông báo"
       more: "xem thông báo cũ hơn"
       total_flagged: "tổng số bài viết gắn cờ"
-      alt:
-        mentioned: "Được nhắc đến bởi"
-        quoted: "Trích dẫn bởi"
-        replied: "Đã trả lời"
-        posted: "Đăng bởi"
-        edited: "Bài viết của bạn được sửa bởi"
-        liked: "Bạn đã like bài viết"
-        private_message: "Tin nhắn riêng từ"
-        invited_to_private_message: "Lời mời thảo luận riêng từ"
-        invited_to_topic: "Lời mời tham gia chủ đề từ"
-        invitee_accepted: "Lời mời được chấp nhận bởi"
-        moved_post: "Bài viết của bạn đã được di chuyển bởi"
-        linked: "Liên kết đến bài viết của bạn"
-        granted_badge: "Cấp huy hiệu"
-        group_message_summary: "Tin nhắn trong hộp thư đến"
       popup:
         mentioned: '{{username}} nhắc đến bạn trong "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} nhắc đến bạn trong "{{topic}}" - {{site_title}}'
         quoted: '{{username}} trích lời bạn trong "{{topic}}" - {{site_title}}'
         replied: '{{username}} trả lời cho bạn trong "{{topic}}" - {{site_title}}'
         posted: '{{username}} gửi bài trong "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} đã gửi cho bạn một tin nhắn trong "{{topic}}" - {{site_title}}'
         linked: '{{username}} liên quan đến bài viết của bạn từ "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Thêm một ảnh"
@@ -1143,7 +1101,7 @@ vi:
         archive_topics: "Chủ đề Lưu trữ"
         choose_new_category: "Chọn chuyên mục mới cho chủ đề này:"
         selected:
-          other: "Bạn đã chọn <b>{{count}}</b> chủ đề"
+          other: Bạn đã chọn <b>{{count}}</b> chủ đề
         choose_new_tags: "Chọn thẻ mới cho các chuyên mục sau:"
       none:
         unread: "Bạn không có chủ đề nào chưa đọc."
@@ -1171,9 +1129,6 @@ vi:
         bookmarks: "Không còn thêm chủ đề được đánh dấu nào nữa."
         search: "Không có thêm kết quả tìm kiếm nào nữa."
     topic:
-      unsubscribe:
-        stop_notifications: "Từ bây giờ bạn sẽ không nhận thông báo từ <strong>{{title}}</strong>"
-        change_notification_state: "Tình trạn thông báo của bạn là"
       create: 'Chủ đề Mới'
       create_long: 'Tạo một Chủ đề mới'
       private_message: 'Bắt đầu một thông điệp'
@@ -1202,13 +1157,13 @@ vi:
         title: "Không tìm thấy chủ đề"
         description: "Xin lỗi, chúng tôi không thể tìm thấy chủ đề đó. Có lẽ nó đã bị loại bởi mod?"
       total_unread_posts:
-        other: "Bạn có {{number}} bài đăng chưa đọc trong chủ đề này"
+        other: Bạn có {{number}} bài đăng chưa đọc trong chủ đề này
       unread_posts:
-        other: "bạn có {{number}} bài đăng củ chưa đọc trong chủ đề này"
+        other: bạn có {{number}} bài đăng củ chưa đọc trong chủ đề này
       new_posts:
-        other: "có {{count}} bài đăng mới trong chủ đề này từ lần đọc cuối"
+        other: có {{count}} bài đăng mới trong chủ đề này từ lần đọc cuối
       likes:
-        other: "có {{count}} thích trong chủ để này"
+        other: có {{count}} thích trong chủ để này
       back_to_list: "Quay lại danh sách chủ đề"
       options: "Các lựa chọn chủ đề"
       show_links: "Hiển thị liên kết trong chủ đề này"
@@ -1218,7 +1173,7 @@ vi:
       read_more_MF: "Có { UNREAD, plural, =0 {} one { is <a href='/unread'>1 unread</a> } other { are <a href='/unread'># unread</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='/new'>1 new</a> topic} other { {BOTH, select, true{and } false {are } other{}} <a href='/new'># new</a> topics} } remaining, or {CATEGORY, select, true {browse other topics in {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Duyệt tất cả các hạng mục
       view_latest_topics: xem các chủ đề mới nhất
-      suggest_create_topic: Tại sao không tạo một chủ đề mới?
+      suggest_create_topic: "Tại sao không tạo một chủ đề mới?"
       jump_reply_up: nhảy đến những trả lời trước đó
       jump_reply_down: nhảy tới những trả lời sau đó
       deleted: "Chủ đề này đã bị xóa"
@@ -1258,18 +1213,18 @@ vi:
         current: bài viết hiện tại
       notifications:
         reasons:
-          '3_6': 'Bạn sẽ nhận được các tin báo bởi vì bạn đang theo dõi chuyên mục này.'
-          '3_5': 'Bạn sẽ nhận được tin báo bởi vì bạn đã bắt đầu theo dõi chủ đề này một cách tự động.'
-          '3_2': 'Bạn sẽ nhận được các tin báo bởi vì bạn đang theo dõi chủ đề này.'
-          '3_1': 'Bạn sẽ được nhận các tin báo bởi bạn đã tạo chủ để này.'
-          '3': 'Bạn sẽ nhận được các tin báo bởi vì bạn đang theo dõi chủ đề này.'
-          '2_8': 'Bạn sẽ thấy được 1 số lượng bài viết mới bởi vì bạn đang theo dấu chuyên mục này.'
-          '2': 'Bạn sẽ xem được các bài trả lời bởi vì bạn <a href="/u/{{username}}/preferences">đọc chủ đề này</a>.'
-          '1_2': 'Bạn sẽ được tin báo nếu ai đó đề cập đến @tên bạn hoặc trả lời bạn.'
-          '1': 'Bạn sẽ được tin báo nếu ai đó đề cập đến @tên bạn hoặc trả lời bạn.'
-          '0_7': 'Bạn đang bỏ qua tất cả các tin báo trong chuyên mục này.'
-          '0_2': 'Bạn đang bỏ qua tất cả các thông báo trong chủ đề này'
-          '0': 'Bạn đang bỏ qua tất cả các thông báo trong chủ đề này'
+          "3_6": 'Bạn sẽ nhận được các tin báo bởi vì bạn đang theo dõi chuyên mục này.'
+          "3_5": 'Bạn sẽ nhận được tin báo bởi vì bạn đã bắt đầu theo dõi chủ đề này một cách tự động.'
+          "3_2": 'Bạn sẽ nhận được các tin báo bởi vì bạn đang theo dõi chủ đề này.'
+          "3_1": 'Bạn sẽ được nhận các tin báo bởi bạn đã tạo chủ để này.'
+          "3": 'Bạn sẽ nhận được các tin báo bởi vì bạn đang theo dõi chủ đề này.'
+          "2_8": 'Bạn sẽ thấy được 1 số lượng bài viết mới bởi vì bạn đang theo dấu chuyên mục này.'
+          "2": 'Bạn sẽ xem được các bài trả lời bởi vì bạn <a href="/u/{{username}}/preferences">đọc chủ đề này</a>.'
+          "1_2": 'Bạn sẽ được tin báo nếu ai đó đề cập đến @tên bạn hoặc trả lời bạn.'
+          "1": 'Bạn sẽ được tin báo nếu ai đó đề cập đến @tên bạn hoặc trả lời bạn.'
+          "0_7": 'Bạn đang bỏ qua tất cả các tin báo trong chuyên mục này.'
+          "0_2": 'Bạn đang bỏ qua tất cả các thông báo trong chủ đề này'
+          "0": 'Bạn đang bỏ qua tất cả các thông báo trong chủ đề này'
         watching_pm:
           title: "Đang theo dõi"
           description: "Bạn sẽ được thông báo về từng trả lời mới trong tin nhắn này, và một số trả lời mới sẽ được hiển thị"
@@ -1338,7 +1293,7 @@ vi:
         pin_validation: "Ngày được yêu câu để gắn chủ đề này"
         not_pinned: "Không có chủ đề được ghim trong {{categoryLink}}."
         already_pinned:
-          other: "Chủ đề gần đây được ghim trong {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: 'Chủ đề gần đây được ghim trong {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         pin_globally: "Làm cho chủ đề này xuất hiện trên top của tất cả các chủ đề"
         confirm_pin_globally: "Bạn đã có {{count}} chủ đề được ghim. Ghim quá nhiều chủ đề có thể là trở ngại cho những thành viên mới và ẩn danh. Bạn có chắc chắn muốn ghim chủ đề khác?"
         unpin_globally: "Bỏ chủ đề này khỏi phần trên cùng của danh sách tất cả các chủ đề"
@@ -1346,7 +1301,7 @@ vi:
         global_pin_note: "Người dùng có thể bỏ ghim chủ đề riêng cho mình"
         not_pinned_globally: "Không có chủ đề nào được ghim."
         already_pinned_globally:
-          other: "Chủ đề gần đây được ghim trong: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: 'Chủ đề gần đây được ghim trong: <strong class=''badge badge-notification unread''>{{count}}</strong>'
         make_banner: "Đặt chủ đề này là một banner xuất hiện trên top của tất cả các trang."
         remove_banner: "Gỡ bỏ banner xuất hiện trên top của tất cả các trang."
         banner_note: "Người dùng có thể bỏ qua banner này bằng cách đóng nó. Chỉ một chủ đề có thể được đặt là banner tại một thời điểm."
@@ -1380,7 +1335,7 @@ vi:
       login_reply: 'Đăng nhập để trả lời'
       filters:
         n_posts:
-          other: "{{count}} bài viết"
+          other: '{{count}} bài viết'
         cancel: "Bỏ đièu kiện lọc"
       split_topic:
         title: "Di chuyển tới Chủ đề mới"
@@ -1388,13 +1343,13 @@ vi:
         topic_name: "Tên chủ đề mới"
         error: "Có lỗi khi di chuyển bài viết tới chủ đề mới."
         instructions:
-          other: "Bạn muốn tạo chủ đề mới và phổ biến nó với <b>{{count}}</b> bài viết đã chọn."
+          other: Bạn muốn tạo chủ đề mới và phổ biến nó với <b>{{count}}</b> bài viết đã chọn.
       merge_topic:
         title: "Di chuyển tới chủ đề đang tồn tại"
         action: "di chuyển tới chủ đề đang tồn tại"
         error: "Có lỗi khi di chuyển bài viết đến chủ đề này."
         instructions:
-          other: "Hãy chọn chủ đề bạn muốn di chuyển <b>{{count}}</b> bài viết này tới."
+          other: Hãy chọn chủ đề bạn muốn di chuyển <b>{{count}}</b> bài viết này tới.
       change_owner:
         title: "Chuyển chủ sở hữu bài viết"
         action: "chuyển chủ sở hữu"
@@ -1402,8 +1357,7 @@ vi:
         label: "Chủ sở hữ mới của Bài viết"
         placeholder: "tên đăng nhập của chủ sở hữu mới"
         instructions:
-          other: "Hãy chọn chủ sở hữu mới cho {{count}} bài viết của <b>{{old_user}}</b>."
-        instructions_warn: "Lưu ý rằng bất kỳ thông báo nào về bài viết này sẽ không được chuyển giao cho thành viên mới trở về trước.<br>Cảnh báo: Hiện không có dữ liệu bài viết phụ thuộc được chuyển giao cho thành viên mới. Hãy thận trọng!"
+          other: Hãy chọn chủ sở hữu mới cho {{count}} bài viết của <b>{{old_user}}</b>.
       change_timestamp:
         action: "đổi timestamp"
         invalid_timestamp: "Timestamp không thể trong tương lai."
@@ -1419,8 +1373,6 @@ vi:
         description:
           other: Bạn đã chọn <b>{{count}}</b> bài viết.
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Trích dẫn"
       edit_reason: "Lý do: "
       post_number: "bài viết {{number}}"
@@ -1431,20 +1383,20 @@ vi:
       show_full: "Hiển thị đầy đủ bài viết"
       show_hidden: 'Xem nội dung ẩn'
       deleted_by_author:
-        other: "(bài viết theo tác giả sẽ được xóa tự động sau %{count} giờ, trừ khi đã đánh dấu)"
+        other: (bài viết theo tác giả sẽ được xóa tự động sau %{count} giờ, trừ khi đã đánh dấu)
       expand_collapse: "mở/đóng"
       gap:
-        other: "xem {{count}} trả lời bị ẩn"
+        other: xem {{count}} trả lời bị ẩn
       unread: "Bài viết chưa đọc"
       has_replies:
-        other: "{{count}} Trả lời"
+        other: '{{count}} Trả lời'
       has_likes:
-        other: "{{count}} Thích"
+        other: '{{count}} Thích'
       has_likes_title:
-        other: "{{count}} người thích bài viết này"
+        other: '{{count}} người thích bài viết này'
       has_likes_title_only_you: "bạn đã like bài viết này"
       has_likes_title_you:
-        other: "bạn và {{count}} người khác đã like bài viết này"
+        other: bạn và {{count}} người khác đã like bài viết này
       errors:
         create: "Xin lỗi, có lỗi xảy ra khi tạo bài viết của bạn. Vui lòng thử lại."
         edit: "Xin lỗi, có lỗi xảy ra khi sửa bài viết của bạn. Vui lòng thử lại."
@@ -1513,38 +1465,38 @@ vi:
           vote: "Bạn đã bình chọn cho bài viết này"
         by_you_and_others:
           off_topic:
-            other: "Bạn và  {{count}}  người khác đã đánh dấu đây là chủ đề đóng"
+            other: Bạn và  {{count}}  người khác đã đánh dấu đây là chủ đề đóng
           spam:
-            other: "Bạn và {{count}} người khác gắn cờ nó là rác"
+            other: Bạn và {{count}} người khác gắn cờ nó là rác
           inappropriate:
-            other: "Bạn và {{count}} other người khác đã đánh dấu nó là không phù hợp"
+            other: Bạn và {{count}} other người khác đã đánh dấu nó là không phù hợp
           notify_moderators:
-            other: "Bạn và {{count}} người khác gắn cờ nó là điều tiết"
+            other: Bạn và {{count}} người khác gắn cờ nó là điều tiết
           notify_user:
-            other: "Bạn và {{count}} người khác đã gửi một tin nhắn đến người dùng này"
+            other: Bạn và {{count}} người khác đã gửi một tin nhắn đến người dùng này
           bookmark:
-            other: "Bạn và {{count}} người khác đã đánh dấu bài viết này"
+            other: Bạn và {{count}} người khác đã đánh dấu bài viết này
           like:
-            other: "Bạn và {{count}} người khác đã thích cái này"
+            other: Bạn và {{count}} người khác đã thích cái này
           vote:
-            other: "Bạn và {{count}} nười khác đã bình chọn cho bài viết này"
+            other: Bạn và {{count}} nười khác đã bình chọn cho bài viết này
         by_others:
           off_topic:
-            other: "{{count}} người đã đánh dấu nó là chủ đề đóng"
+            other: '{{count}} người đã đánh dấu nó là chủ đề đóng'
           spam:
-            other: "{{count}} người khác đánh dấu là rác"
+            other: '{{count}} người khác đánh dấu là rác'
           inappropriate:
-            other: "{{count}} người khác đã đánh dấu là không phù hợp"
+            other: '{{count}} người khác đã đánh dấu là không phù hợp'
           notify_moderators:
-            other: "{{count}} người đã đánh dấu để chờ duyệt"
+            other: '{{count}} người đã đánh dấu để chờ duyệt'
           notify_user:
-            other: "{{count}} gửi tin nhắn đến người dùng này"
+            other: '{{count}} gửi tin nhắn đến người dùng này'
           bookmark:
-            other: "{{count}} người đã đánh dấu bài viết này"
+            other: '{{count}} người đã đánh dấu bài viết này'
           like:
-            other: "{count}} người đã thích cái này"
+            other: '{count}} người đã thích cái này'
           vote:
-            other: "{{count}} người đã bình chọn cho bài viết này"
+            other: '{{count}} người đã bình chọn cho bài viết này'
       revisions:
         controls:
           first: "Sửa đổi đầu tiên"
@@ -1619,7 +1571,6 @@ vi:
       email_in_allow_strangers: "Nhận thư điện tử từ người gửi vô danh không tài khoản"
       email_in_disabled: "Tạo chủ đề mới thông qua email đã được tắt trong thiết lập. Để bật tính năng này, "
       email_in_disabled_click: 'kích hoạt thiết lập thư điện tử'
-      suppress_from_homepage: "Ngăn chặn chuyên mục này hiển thị trên trang chủ."
       allow_badges_label: "Cho phép thưởng huy hiệu trong chuyên mục này"
       edit_permissions: "Sửa quyền"
       add_permission: "Thêm quyền"
@@ -1673,9 +1624,9 @@ vi:
       custom_placeholder_notify_moderators: "Hãy cho chúng tôi biết cụ thể những gì bạn quan tâm, và cung cấp các liên kết hoặc ví dụ liên quan nếu có thể."
       custom_message:
         at_least:
-          other: "nhập ít nhất {{count}} kí tự"
+          other: nhập ít nhất {{count}} kí tự
         left:
-          other: "{{count}} còn lại"
+          other: '{{count}} còn lại'
     flagging_topic:
       title: "Cám ơn bạn đã giúp phát triển cộng đồng!"
       action: "Gắn cờ Chủ đề"
@@ -1686,10 +1637,10 @@ vi:
       links_title: "Liên kết phổ biến"
       links_shown: "hiển thị thêm liên kết..."
       clicks:
-        other: "%{count} nhấp chuột"
+        other: '%{count} nhấp chuột'
     post_links:
       title:
-        other: "%{count} thêm"
+        other: '%{count} thêm'
     topic_statuses:
       warning:
         help: "Đây là một cảnh báo chính thức."
@@ -1723,18 +1674,18 @@ vi:
     original_post: "Bài viết gốc"
     views: "Lượt xem"
     views_lowercase:
-      other: "lượt xem"
+      other: lượt xem
     replies: "Trả lời"
     views_long:
-      other: "chủ đề này đã được xem {{number}} lần"
+      other: chủ đề này đã được xem {{number}} lần
     activity: "Hoạt động"
     likes: "Lượt thích"
     likes_lowercase:
-      other: "lượt thích"
+      other: lượt thích
     likes_long: "Có {{number}} thích trong chủ đề này"
     users: "Người dùng"
     users_lowercase:
-      other: "người dùng"
+      other: người dùng
     category_title: "Danh mục"
     history: "Lịch sử"
     changed_by: "bởi {{author}}"
@@ -1747,7 +1698,7 @@ vi:
       latest:
         title: "Mới nhất"
         title_with_count:
-          other: "Mới nhất ({{count}})"
+          other: Mới nhất ({{count}})
         help: "chủ đề với bài viết gần nhất"
       hot:
         title: "Nổi bật"
@@ -1765,17 +1716,17 @@ vi:
       unread:
         title: "Chưa đọc"
         title_with_count:
-          other: "Chưa đọc ({{count}})"
+          other: Chưa đọc ({{count}})
         help: "chủ đề bạn đang xem hoặc theo dõi có bài viết chưa đọc"
         lower_title_with_count:
-          other: "{{count}} chưa đọc"
+          other: '{{count}} chưa đọc'
       new:
         lower_title_with_count:
-          other: "{{count}} mới"
+          other: '{{count}} mới'
         lower_title: "mới"
         title: "Mới"
         title_with_count:
-          other: "Mới ({{count}})"
+          other: Mới ({{count}})
         help: "chủ đề đã tạo cách đây vài ngày"
       posted:
         title: "Bài viết của tôi"
@@ -1786,7 +1737,7 @@ vi:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          other: "{{categoryName}} ({{count}})"
+          other: '{{categoryName}} ({{count}})'
         help: "Những chủ đề mới nhất trong chuyên mục{{categoryName}} "
       top:
         title: "Top"
@@ -1830,11 +1781,10 @@ vi:
         title: 'Hành động'
     badges:
       earned_n_times:
-        other: "Đã giành được huy hiệu này %{count} lần"
+        other: Đã giành được huy hiệu này %{count} lần
       title: Huy hiệu
       badge_count:
-        other: "%{count} huy hiệu"
-      none: "<none>"
+        other: '%{count} huy hiệu'
       badge_grouping:
         getting_started:
           name: Bắt đầu
@@ -1913,8 +1863,6 @@ vi:
         reports:
           today: "Hôm nay"
           yesterday: "Hôm qua"
-          last_7_days: "7 Ngày gần nhất"
-          last_30_days: "30 Ngày gần nhất"
           all_time: "Từ trước tới nay"
           7_days_ago: "7 Ngày trước"
           30_days_ago: "30 Ngày trước"
@@ -1931,7 +1879,6 @@ vi:
         title: "Gắn cờ"
         agree: "Đồng ý"
         agree_title: "Xác nhận đánh dấu này hợp lệ và chính xác"
-        defer_flag_title: "Xóa cờ này; nó yêu cầu không có hành động nào vào thời điểm này."
         delete: "Xóa"
         delete_title: "Xóa bài viết đánh dấu này đề cập đến."
         delete_post_defer_flag_title: "Xóa bài viết; nếu là bài viết đầu tiên, xóa chủ đề này"
@@ -1965,8 +1912,6 @@ vi:
         title: "Nhóm"
         edit: "Sửa nhóm"
         refresh: "Làm mới"
-        new: "Mới"
-        selector_placeholder: "nhập tên tài khoản"
         about: "Chỉnh sửa nhóm thành viên và tên của bạn ở đây"
         group_members: "Nhóm thành viên"
         delete: "Xóa"
@@ -1974,21 +1919,10 @@ vi:
         delete_failed: "Không thể xóa nhóm. Nếu đây là một nhóm tự động, nó không thể hủy bỏ."
         delete_owner_confirm: "Loại bỏ quyền sở hữu của '%{username}'?"
         add: "Thêm"
-        add_members: "Thêm thành viên"
         custom: "Tùy biến"
-        bulk_complete: "Các thành viên đã được thêm vào nhóm."
-        bulk: "Thêm vào nhóm theo lô"
-        bulk_paste: "Dán danh sách username hoặc email, mỗi mục một dòng:"
-        bulk_select: "(chọn nhóm)"
         automatic: "Tự động"
-        automatic_membership_email_domains: "Các thành viên đã đăng ký với đuôi email khớp với một trong danh sách này sẽ được tự động thêm vào nhóm:"
-        automatic_membership_retroactive: "Áp dụng quy tắc đuôi email tương tự để thêm thành viên đăng ký hiện tại"
-        default_title: "Tên mặc định cho tất cả các thành viên trong nhóm này"
-        primary_group: "Tự động cài là nhóm chính"
         group_owners: Chủ sở hữu
         add_owners: Thêm chủ sở hữu
-        incoming_email: "Tùy chỉnh địa chỉ email đến"
-        incoming_email_placeholder: "điền địa chỉ email"
       api:
         generate_master: "Tạo Master API Key"
         none: "Không có API keys nào kích hoạt lúc này."
@@ -2038,7 +1972,6 @@ vi:
           label: "Tải lên"
           title: "Tải lên bản sao lưu cho phiên bản này"
           uploading: "Đang tải lên..."
-          success: "'{{filename}}' đã tải lên thành công."
           error: "Có lõi trong quá trình tải lên '{{filename}}': {{message}}"
         operations:
           is_running: "Tác vụ đang chạy..."
@@ -2051,7 +1984,6 @@ vi:
             label: "Sao lưu"
             title: "Tạo bản sao lưu"
             confirm: "Bạn muốn bắt đầu một bản sao lưu mới?"
-            without_uploads: "Đúng (không bao gồm những tập tin)"
           download:
             label: "Tải xuống"
           destroy:
@@ -2309,9 +2241,9 @@ vi:
           suspect: 'Nghi ngờ'
         approved: "Đã duyệt?"
         approved_selected:
-          other: "duyệt tài khoản ({{count}})"
+          other: duyệt tài khoản ({{count}})
         reject_selected:
-          other: "từ chối tài khoản ({{count}})"
+          other: từ chối tài khoản ({{count}})
         titles:
           active: 'Thành viên kích hoạt'
           new: 'Thành viên mới'
@@ -2327,9 +2259,9 @@ vi:
           suspended: 'Tài khoản Tạm khóa'
           suspect: 'Tài khoản đáng ngờ'
         reject_successful:
-          other: "Từ chối thành công %{count} tài khoản."
+          other: Từ chối thành công %{count} tài khoản.
         reject_failures:
-          other: "Từ chối thất bại %{count} tài khoản."
+          other: Từ chối thất bại %{count} tài khoản.
         not_verified: "Chưa xác thực"
         check_email:
           title: "Khám phá email của tài khoản này"
@@ -2386,11 +2318,11 @@ vi:
         delete_forbidden_because_staff: "Admin và mod không thể xóa."
         delete_posts_forbidden_because_staff: "Không thể xóa tất cả bài viết của quản trị và điều hành viên."
         delete_forbidden:
-          other: "Không thể xóa tài khoản nếu họ có bài viết, hãy xóa tất cả các bài viết trước khi xóa tài khoản. (Không thể xóa các bài viết cũ hơn %{count} ngày.)"
+          other: Không thể xóa tài khoản nếu họ có bài viết, hãy xóa tất cả các bài viết trước khi xóa tài khoản. (Không thể xóa các bài viết cũ hơn %{count} ngày.)
         cant_delete_all_posts:
-          other: "Không thể xóa tất cả các bài viết, một số bài viết cũ hơn %{count} ngày. (Thiết lập delete_user_max_post_age.)"
+          other: Không thể xóa tất cả các bài viết, một số bài viết cũ hơn %{count} ngày. (Thiết lập delete_user_max_post_age.)
         cant_delete_all_too_many_posts:
-          other: "Không thể xóa tất cả các bài viết do tài khoản có hơn %{count} bài viết. (delete_all_posts_max)"
+          other: Không thể xóa tất cả các bài viết do tài khoản có hơn %{count} bài viết. (delete_all_posts_max)
         delete_confirm: "Bạn CHẮC CHẮN muốn xóa thành viên này? Nó là vĩnh viễn!"
         delete_and_block: "Xóa và <b>khóa</b> email này và địa chỉ IP"
         delete_dont_block: "Chỉ xóa"
@@ -2489,10 +2421,7 @@ vi:
         recommended: "Bạn nên tùy biến các nội dung sau đây cho phù hợp với nhu cầu:"
         show_overriden: 'Chỉ hiển thị chỗ ghi đè'
       site_settings:
-        show_overriden: 'Chỉ hiện thị đã ghi đè'
         title: 'Xác lập'
-        reset: 'trạng thái đầu'
-        none: 'không có gì'
         no_results: "Không tìm thấy kết quả."
         clear_filter: "Xóa"
         add_url: "thêm URL"
@@ -2537,11 +2466,11 @@ vi:
         reason_help: (Liên kết đến bài viết hoặc chủ đề)
         save: Lưu
         delete: Xóa
-        delete_confirm: Bạn có chắc chắn muốn xóa huy hiệu này?
+        delete_confirm: "Bạn có chắc chắn muốn xóa huy hiệu này?"
         revoke: Thu hồi
         reason: Lý do
         expand: Mở rộng &hellip;
-        revoke_confirm: Bạn có chắc chắn muốn thu hồi huy hiệu này?
+        revoke_confirm: "Bạn có chắc chắn muốn thu hồi huy hiệu này?"
         edit_badges: Sửa huy hiệu
         grant_badge: Cấp huy hiệu
         granted_badges: Cấp huy hiệu
@@ -2555,7 +2484,6 @@ vi:
         enabled: Bật huy hiệu
         icon: Biểu tượng
         image: Hình ảnh
-        icon_help: "Sử dụng Font Awesome class hoặc URL của ảnh"
         query: Truy vấn huy hiệu (SQL)
         target_posts: Truy vấn bài viết mục tiêu
         auto_revoke: Chạy truy vấn hủy bỏ hàng ngày
@@ -2579,13 +2507,13 @@ vi:
             text: "Thiếu mẫu cấp độ huy hiệu, điều này xảy ra khi truy vấn huy hiệu trả về IDs tài khoản hoặc IDs bài viết không tồn tại. Điều này có thể gây ra kết quả bất ngờ sau này - hãy kiểm tra lại truy vấn của bạn lần nữa."
           no_grant_count: "Không có huy hiệu nào được gán."
           grant_count:
-            other: "<b>%{count}</b> huy hiệu đã được gán."
+            other: <b>%{count}</b> huy hiệu đã được gán.
           sample: "Ví dụ:"
           grant:
-            with: <span class="username">%{username}</span>
-            with_post: <span class="username">%{username}</span> for post in %{link}
-            with_post_time: <span class="username">%{username}</span> viết bài trong %{link} lúc <span class="time">%{time}</span>
-            with_time: <span class="username">%{username}</span> lúc <span class="time">%{time}</span>
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span> for post in %{link}"
+            with_post_time: "<span class=\"username\">%{username}</span> viết bài trong %{link} lúc <span class=\"time\">%{time}</span>"
+            with_time: "<span class=\"username\">%{username}</span> lúc <span class=\"time\">%{time}</span>"
       emoji:
         title: "Emoji"
         help: "Thêm emoji mới có sẵn cho tất cả mọi người. (MẸO: kéo & thả nhiều file cùng lúc)"
@@ -2626,7 +2554,7 @@ vi:
         category_id: "ID Danh mục"
         category_title: "Danh mục"
         external_url: "URL Bên ngoài"
-        delete_confirm: Bạn có chắc chắn muốn xóa liên kết tĩnh này?
+        delete_confirm: "Bạn có chắc chắn muốn xóa liên kết tĩnh này?"
         form:
           label: "Mới:"
           add: "Thêm"
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index db4deb91957..61bb1bcc13a 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -42,49 +42,49 @@ zh_CN:
       tiny:
         half_a_minute: "1分钟内"
         less_than_x_seconds:
-          other: "%{count}秒内"
+          other: '%{count}秒内'
         x_seconds:
-          other: "%{count}秒前"
+          other: '%{count}秒前'
         less_than_x_minutes:
-          other: "%{count}分钟内"
+          other: '%{count}分钟内'
         x_minutes:
-          other: "%{count}分钟前"
+          other: '%{count}分钟前'
         about_x_hours:
-          other: "%{count}小时前"
+          other: '%{count}小时前'
         x_days:
-          other: "%{count}天前"
+          other: '%{count}天前'
         x_months:
-          other: "%{count} 个月"
+          other: '%{count} 个月'
         about_x_years:
-          other: "%{count}年内"
+          other: '%{count}年内'
         over_x_years:
-          other: "%{count}年前"
+          other: '%{count}年前'
         almost_x_years:
-          other: "近%{count}年"
+          other: 近%{count}年
         date_month: "MMMDo"
         date_year: "YY年MMM"
       medium:
         x_minutes:
-          other: "%{count}分钟"
+          other: '%{count}分钟'
         x_hours:
-          other: "%{count}小时"
+          other: '%{count}小时'
         x_days:
-          other: "%{count}天"
+          other: '%{count}天'
         date_year: "YY年MMM"
       medium_with_ago:
         x_minutes:
-          other: "%{count}分钟前"
+          other: '%{count}分钟前'
         x_hours:
-          other: "%{count}小时前"
+          other: '%{count}小时前'
         x_days:
-          other: "%{count}天前"
+          other: '%{count}天前'
       later:
         x_days:
-          other: "%{count}天后"
+          other: '%{count}天后'
         x_months:
-          other: "%{count}个月后"
+          other: '%{count}个月后'
         x_years:
-          other: "%{count}年后"
+          other: '%{count}年后'
       previous_month: '上个月'
       next_month: '下个月'
       placeholder: 日期
@@ -98,7 +98,6 @@ zh_CN:
       email: '在电子邮件里发送该链接'
     action_codes:
       public_topic: "于%{when}设置为公共主题"
-      private_topic: "于%{when}设置为私密主题"
       split_topic: "于%{when}分割了该主题"
       invited_user: "于%{when}邀请了%{who}"
       invited_group: "于%{when}邀请了%{who}"
@@ -129,8 +128,6 @@ zh_CN:
     topic_admin_menu: "管理主题"
     wizard_required: "欢迎来到你新安装的 Discourse！让我们开始<a href='%{url}' data-auto-route='true'>设置向导</a>✨"
     emails_are_disabled: "出站邮件已经被管理员全局禁用。将不发送任何邮件提醒。"
-    bootstrap_mode_enabled: "为方便站点准备发布，其正处于初始化模式中。所有新用户将被授予信任等级1，并为他们设置接受每日邮件摘要。初始化模式会在用户数超过 %{min_users} 个时关闭。"
-    bootstrap_mode_disabled: "初始化模式将会在24小时后关闭。"
     themes:
       default_description: "默认"
     s3:
@@ -154,6 +151,7 @@ zh_CN:
     not_implemented: "非常抱歉，这个功能仍在开发中！"
     no_value: "否"
     yes_value: "是"
+    submit: "提交"
     generic_error: "抱歉，出了点小问题。"
     generic_error_with_reason: "出错了：%{error}"
     sign_up: "注册"
@@ -166,7 +164,7 @@ zh_CN:
     show_help: "选项"
     links: "链接"
     links_lowercase:
-      other: "链接"
+      other: 链接
     faq: "常见问题"
     guidelines: "指引"
     privacy_policy: "隐私政策"
@@ -190,7 +188,7 @@ zh_CN:
     max_of_count: "不超过 {{count}}"
     alternation: "或"
     character_count:
-      other: "%{count} 个字符"
+      other: '%{count} 个字符'
     suggested_topics:
       title: "推荐主题"
       pm_title: "推荐私信"
@@ -202,8 +200,6 @@ zh_CN:
       our_moderators: "我们的版主"
       stat:
         all_time: "全部"
-        last_7_days: "7天以内"
-        last_30_days: "30天以内"
       like_count: "赞"
       topic_count: "主题"
       post_count: "帖子"
@@ -224,13 +220,6 @@ zh_CN:
       last_read: "这是你阅读过的最后一帖；点击收藏"
       remove: "取消收藏"
       confirm_clear: "你确定要清除该主题的所有收藏吗？"
-    topic_count_latest:
-      other: "{{count}} 新主题或更新的主题。"
-    topic_count_unread:
-      other: "{{count}} 未读主题。"
-    topic_count_new:
-      other: " {{count}} 个近期主题。"
-    click_to_show: "点击加载"
     preview: "预览"
     cancel: "取消"
     save: "保存更改"
@@ -267,14 +256,14 @@ zh_CN:
       cancel: "取消"
       view_pending: "查看待审核帖子"
       has_pending_posts:
-        other: "这个主题有 <b>{{count}}</b> 个帖子等待审核"
+        other: 这个主题有 <b>{{count}}</b> 个帖子等待审核
       confirm: "保存更改"
       delete_prompt: "你确定要删除<b>%{username}</b>吗？这将删除用户的所有帖子并封禁这个邮箱和 IP 地址。"
       approval:
         title: "等待审核中"
         description: "我们已经保存了你的帖子，不过帖子需要由管理员先审核才能显示。请耐心。"
         pending_posts:
-          other: "你有 <strong>{{count}}</strong> 个帖子待审核。"
+          other: 你有 <strong>{{count}}</strong> 个帖子待审核。
         ok: "确认"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a>发起了<a href='{{topicUrl}}'>该主题</a>"
@@ -308,7 +297,7 @@ zh_CN:
       posts_read: "阅读"
       posts_read_long: "阅读帖子"
       total_rows:
-        other: "%{count} 位用户"
+        other: '%{count} 位用户'
     group_histories:
       actions:
         change_group_setting: "更改小组设置"
@@ -317,22 +306,22 @@ zh_CN:
         make_user_group_owner: "设为所有者"
         remove_user_as_group_owner: "撤销所有者"
     groups:
-      logs:
-        title: "日志"
-        when: "时间"
-        action: "操作"
-        acting_user: "操作用户"
-        target_user: "目标用户"
-        subject: "主题"
-        details: "详情"
-        from: "来自"
-        to: "发至"
-      edit:
-        title: '编辑群组'
-        full_name: '群组名'
-        add_members: "增加组员"
-        delete_member_confirm: "从“%{group}”群组中移除用户“%{username}'？"
-      name_placeholder: "群组名，没有空格，和用户名一样的规则"
+      manage:
+        profile:
+          title: 个人信息
+        interaction:
+          notification: 通知
+        membership:
+          title: 成员资格
+          access: 访问
+        logs:
+          title: "日志"
+          when: "时间"
+          action: "操作"
+          subject: "主题"
+          details: "详情"
+          from: "从"
+          to: "到"
       public_admission: "允许用户自由加入小组（需要小组公开可见）"
       public_exit: "允许用户自由离开小组"
       empty:
@@ -343,13 +332,10 @@ zh_CN:
         topics: "群组的成员从未发表主题。"
         logs: "没有关于群组的日志。"
       add: "添加"
-      join: "加入群组"
-      leave: "离开群组"
-      request: "请求加入群组"
+      join: "加入"
+      leave: "离开"
+      request: "请求"
       message: "私信"
-      automatic_group: 自动群组
-      closed_group: 封闭群组
-      is_group_user: "你是该群组的一个成员"
       allow_membership_requests: "允许用户向小组拥有者发送成员请求"
       membership_request_template: "用户发送会员请求时向其显示的自定义模板"
       membership_request:
@@ -358,28 +344,32 @@ zh_CN:
         reason: "向小组拥有者说明你为何属于这个小组"
       membership: "成员资格"
       name: "群组ID"
-      user_count: "成员数目"
+      user_count: "用户"
       bio: "关于群组"
-      selector_placeholder: "添加成员"
+      selector_placeholder: "输入用户名"
       owner: "所有者"
       index:
         title: "群组"
         empty: "没有可见的群组。"
+        public: "公开"
+        private: "私密"
+        my_groups: "我的群组"
+        is_group_owner: "所有者"
       title:
-        other: "小组"
+        other: 小组
       activity: "活动"
-      members: "成员"
+      members:
+        title: "成员"
+        filter_placeholder: "用户名"
+        remove_member: "移除成员"
+        make_owner: "设为所有者"
+        remove_owner: "撤销所有者"
+        owner: "所有者"
       topics: "主题"
       posts: "帖子"
       mentions: "提及"
       messages: "私信"
       notification_level: "小组私信的默认通知等级"
-      visibility_levels:
-        title: "谁能看到这个小组？"
-        public: "所有人"
-        members: "小组创建人，成员和管理员"
-        staff: "小组创建者及工作人员"
-        owners: "小组创建者及管理员"
       alias_levels:
         mentionable: "谁能@该小组"
         messageable: "谁能私信此小组"
@@ -388,9 +378,6 @@ zh_CN:
         mods_and_admins: "版主与管理员"
         members_mods_and_admins: "组员、版主与管理员"
         everyone: "任何人"
-      trust_levels:
-        title: "这些用户加入时，将自动赋予信任等级："
-        none: "无"
       notifications:
         watching:
           title: "跟踪"
@@ -415,23 +402,21 @@ zh_CN:
       flair_color_placeholder: "（可选）十六进制色彩值"
       flair_preview_icon: "预览图标"
       flair_preview_image: "预览图片"
-      flair_note: "注意：标示将只在用户的主要群组显示"
     user_action_groups:
-      '1': "送出赞"
-      '2': "获得赞"
-      '3': "收藏"
-      '4': "主题"
-      '5': "回复"
-      '6': "回应"
-      '7': "@我的"
-      '9': "引用"
-      '11': "编辑"
-      '12': "发送"
-      '13': "收件"
-      '14': "待定"
+      "1": "送出赞"
+      "2": "获得赞"
+      "3": "收藏"
+      "4": "主题"
+      "5": "回复"
+      "6": "回应"
+      "7": "@我的"
+      "9": "引用"
+      "11": "编辑"
+      "12": "发送"
+      "13": "收件"
+      "14": "待定"
     categories:
       all: "所有分类"
-      all_subcategories: "全部"
       no_subcategory: "无"
       category: "分类"
       category_list: "显示分类列表"
@@ -450,9 +435,9 @@ zh_CN:
       toggle_ordering: "排序控制"
       subcategories: "子分类"
       topic_sentence:
-        other: "%{count} 主题"
+        other: '%{count} 主题'
       topic_stat_sentence:
-        other: "在过去一%{unit}中有 %{count} 个新主题。"
+        other: 在过去一%{unit}中有 %{count} 个新主题。
     ip_lookup:
       title: IP 地址查询
       hostname: 主机名
@@ -494,7 +479,6 @@ zh_CN:
       notifications: "通知"
       statistics: "统计"
       desktop_notifications:
-        label: "桌面通知"
         not_supported: "通知功能暂不支持该浏览器。抱歉。"
         perm_default: "启用通知"
         perm_denied_btn: "拒绝授权"
@@ -554,7 +538,6 @@ zh_CN:
       delete_account: "删除我的帐号"
       delete_account_confirm: "你真的要永久删除自己的帐号吗？删除之后无法恢复！"
       deleted_yourself: "你的帐号已被删除。"
-      delete_yourself_not_allowed: "你目前不能删除自己的帐号。联系管理员帮助你删除帐号。"
       unread_message_count: "私信"
       admin_delete: "删除"
       users: "用户"
@@ -588,6 +571,7 @@ zh_CN:
         move_to_archive: "存档"
         failed_to_move: "移动选中私信失败（可能你的网络出问题了）"
         select_all: "全选"
+        tags: "标签"
       preferences_nav:
         account: "帐号"
         profile: "个人信息"
@@ -605,6 +589,13 @@ zh_CN:
         set_password: "设置密码"
         choose_new: "输入新密码"
         choose: "输入密码"
+      second_factor:
+        title: "双重验证"
+        disable: "停用双重验证"
+        confirm_password_description: "确认密码以继续"
+        label: "编码"
+        disable_description: "请输入来自  app  的验证码"
+        show_key_description: "手动输入"
       change_about:
         title: "更改个人信息"
         error: "提交修改时出错了"
@@ -646,7 +637,7 @@ zh_CN:
         authenticated: "邮箱已经由 {{provider}} 验证了。"
         frequency_immediately: "如果你没有阅读过摘要邮件中的相关内容，将立即发送电子邮件给你。"
         frequency:
-          other: "仅在 {{count}} 分钟内没有访问时发送邮件给你。"
+          other: 仅在 {{count}} 分钟内没有访问时发送邮件给你。
       name:
         title: "昵称"
         instructions: "你的全名（可选）"
@@ -677,8 +668,6 @@ zh_CN:
       created: "加入时间"
       log_out: "登出"
       location: "地点"
-      card_badge:
-        title: "用户卡片徽章"
       website: "网址"
       email_settings: "邮箱"
       like_notification_frequency:
@@ -732,9 +721,8 @@ zh_CN:
         title: "邀请"
         user: "邀请用户"
         sent: "已发送"
-        none: "没有未接受状态的邀请。"
         truncated:
-          other: "只显示前 {{count}} 个邀请。"
+          other: 只显示前 {{count}} 个邀请。
         redeemed: "确认邀请"
         redeemed_tab: "已确认"
         redeemed_tab_with_count: "已确认（{{count}}）"
@@ -781,21 +769,21 @@ zh_CN:
         time_read: "阅读时间"
         recent_time_read: "最近阅读时间"
         topic_count:
-          other: "创建主题"
+          other: 创建主题
         post_count:
-          other: "发表帖子"
+          other: 发表帖子
         likes_given:
-          other: "送出"
+          other: 送出
         likes_received:
-          other: "收到"
+          other: 收到
         days_visited:
-          other: "访问天数"
+          other: 访问天数
         topics_entered:
-          other: "已阅主题"
+          other: 已阅主题
         posts_read:
-          other: "阅读帖子"
+          other: 阅读帖子
         bookmark_count:
-          other: "收藏"
+          other: 收藏
         top_replies: "热门回复"
         no_replies: "暂无回复。"
         more_replies: "更多回复"
@@ -863,7 +851,7 @@ zh_CN:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> 达到了站点设置中的 %{siteSettingRate}。"
       exceeded: "<b>[%{relativeAge}]</b> 目前的错误率 <a href='%{url}' target='_blank'>%{rate}</a> 已超出了站点设置中的 %{siteSettingRate}。"
       rate:
-        other: "%{count} 错误/%{duration}"
+        other: '%{count} 错误/%{duration}'
     learn_more: "了解更多..."
     all_time: '总量'
     all_time_desc: '创建的主题总量'
@@ -1017,7 +1005,6 @@ zh_CN:
       default_header_text: 选择...
       no_content: 无符合的结果
       filter_placeholder: 搜索……
-      create: "创建{{content}}"
     emoji_picker:
       filter_placeholder: 查找表情符号
       people: 人物
@@ -1052,7 +1039,7 @@ zh_CN:
       similar_topics: "你的主题有点类似于..."
       drafts_offline: "离线草稿"
       group_mentioned:
-        other: "提及 {{group}} 时，你将通知 <a href='{{group_link}}'>{{count}} 人</a> － 确定吗？"
+        other: 提及 {{group}} 时，你将通知 <a href='{{group_link}}'>{{count}} 人</a> － 确定吗？
       cannot_see_mention:
         category: "你提到了 {{username}} ，然而他们不能访问该分类，所以他们不会被通知。你需要把他们加入到能访问该分类的群组中。"
         private: "你提到了{{userrname}}，然而他们不能访问该私信，所以他们不会被通知。你需要邀请他们至私信中。"
@@ -1111,6 +1098,7 @@ zh_CN:
       olist_title: "数字列表"
       ulist_title: "符号列表"
       list_item: "列表条目"
+      toggle_direction: "切换方向"
       help: "Markdown 编辑帮助"
       collapse: "最小号编辑面板"
       abandon: "关闭编辑面板并放弃草稿"
@@ -1124,9 +1112,9 @@ zh_CN:
     notifications:
       tooltip:
         regular:
-          other: "{{count}} 个未读通知"
+          other: '{{count}} 个未读通知'
         message:
-          other: "{{count}} 条未读私信"
+          other: '{{count}} 条未读私信'
       title: "使用@提到你，回复你的内容、私信以及其他的通知"
       none: "现在无法载入通知"
       empty: "未发现通知"
@@ -1141,7 +1129,7 @@ zh_CN:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        other: "<span>{{username}}, {{username2}} 和其他 {{count}} 人</span> {{description}}"
+        other: <span>{{username}}, {{username2}} 和其他 {{count}} 人</span> {{description}}
       private_message: "<span>{{username}}</span> {{description}}"
       invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
       invited_to_topic: "<span>{{username}}</span> {{description}}"
@@ -1152,30 +1140,13 @@ zh_CN:
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>新主题</span> {{description}}"
       group_message_summary:
-        other: "{{count}} 条私信在{{group_name}}组的收件箱中"
-      alt:
-        mentioned: "被提及"
-        quoted: "被引用"
-        replied: "回复"
-        posted: "发自"
-        edited: "编辑你的帖子"
-        liked: "赞了你的帖子"
-        private_message: "私信来自"
-        invited_to_private_message: "私信邀请自"
-        invited_to_topic: "主题邀请自"
-        invitee_accepted: "介绍邀请自"
-        moved_post: "你的帖子被移动自"
-        linked: "链接至你的帖子"
-        granted_badge: "勋章授予"
-        group_message_summary: "在群组收件箱中的私信"
-        topic_reminder: "一个提醒"
+        other: '{{count}} 条私信在{{group_name}}组的收件箱中'
       popup:
         mentioned: '{{username}}在“{{topic}}”提到了你 - {{site_title}}'
         group_mentioned: '{{username}}在“{{topic}}”提到了你 - {{site_title}}'
         quoted: '{{username}}在“{{topic}}”引用了你的帖子 - {{site_title}}'
         replied: '{{username}}在“{{topic}}”回复了你 - {{site_title}}'
         posted: '{{username}}在“{{topic}}”中发布了帖子 - {{site_title}}'
-        private_message: '{{username}}在“{{topic}}”中给你发送了一个私信 - {{site_title}}'
         linked: '{{username}}在“{{topic}}”中链接了你的帖子 - {{site_title}}'
     upload_selector:
       title: "插入图片"
@@ -1290,7 +1261,7 @@ zh_CN:
         notification_level: "通知"
         choose_new_category: "选择新分类："
         selected:
-          other: "已选择 <b>{{count}}</b>个主题"
+          other: 已选择 <b>{{count}}</b>个主题
         change_tags: "替换标签"
         append_tags: "添加标签"
         choose_new_tags: "为主题选择新标签："
@@ -1322,11 +1293,8 @@ zh_CN:
         bookmarks: "没有更多收藏的主题了。"
         search: "没有更多搜索结果了。"
     topic:
-      unsubscribe:
-        stop_notifications: "你将收到更少的关于<strong>{{title}}</strong>的通知"
-        change_notification_state: "你现在的通知状态是"
       filter_to:
-        other: "本主题中的 {{count}} 帖"
+        other: 本主题中的 {{count}} 帖
       create: '发新主题'
       create_long: '创建新的主题'
       private_message: '开始发私信'
@@ -1355,13 +1323,13 @@ zh_CN:
         title: "未找到主题"
         description: "抱歉，无法找到此主题。可能已经被删除了。"
       total_unread_posts:
-        other: "这个主题中，你有 {{count}} 条未读的帖子"
+        other: 这个主题中，你有 {{count}} 条未读的帖子
       unread_posts:
-        other: "这个主题中，你有 {{count}} 条未读的帖子"
+        other: 这个主题中，你有 {{count}} 条未读的帖子
       new_posts:
-        other: "自你上一次阅读此主题后，又有 {{count}} 个新帖子发表了"
+        other: 自你上一次阅读此主题后，又有 {{count}} 个新帖子发表了
       likes:
-        other: "本主题已得到 {{number}} 个赞"
+        other: 本主题已得到 {{number}} 个赞
       back_to_list: "返回列表"
       options: "主题选项"
       show_links: "显示此主题中的链接"
@@ -1425,7 +1393,7 @@ zh_CN:
         auto_reminder: "你将在%{timeLeft}后收到该主题的提醒。"
       auto_close_title: '自动关闭设置'
       auto_close_immediate:
-        other: "主题中的最后一帖是 %{hours} 小时前发出的，所以主题将会立即关闭。"
+        other: 主题中的最后一帖是 %{hours} 小时前发出的，所以主题将会立即关闭。
       timeline:
         back: "返回"
         back_description: "回到最后一个未读帖子"
@@ -1446,21 +1414,21 @@ zh_CN:
         title: 改变你收到该主题通知的频率
         reasons:
           mailing_list_mode: "邮件列表模式已启用，将以邮件通知你关于该主题的回复。"
-          '3_10': '因为你正监看该主题上的标签，你将会收到通知。'
-          '3_6': '因为你正在监看该分类，你将会收到通知。'
-          '3_5': '因为你开始自动监看该主题，你将会收到通知。'
-          '3_2': '因为你正在监看该主题，你将会收到通知。'
-          '3_1': '因为你创建了这个主题，你将会收到通知。'
-          '3': '因为你正在监看该主题，你将会收到通知。'
-          '2_8': '因为你追踪了该分类，所以你会看到新回复的数量。'
-          '2_4': '因为你回复过该主题，所以你会看到新回复的数量。'
-          '2_2': '因为你追踪了该主题，所以你会看到新回复的数量。'
-          '2': '因为你<a href="/u/{{username}}/preferences">读过该主题</a>，所以你会看到新回复的数量。'
-          '1_2': '如果有人@你或回复你，将通知你。'
-          '1': '如果有人@你或回复你，将通知你。'
-          '0_7': '你将忽略关于该分类的所有通知。'
-          '0_2': '你将忽略关于该主题的所有通知。'
-          '0': '你将忽略关于该主题的所有通知。'
+          "3_10": '因为你正监看该主题上的标签，你将会收到通知。'
+          "3_6": '因为你正在监看该分类，你将会收到通知。'
+          "3_5": '因为你开始自动监看该主题，你将会收到通知。'
+          "3_2": '因为你正在监看该主题，你将会收到通知。'
+          "3_1": '因为你创建了这个主题，你将会收到通知。'
+          "3": '因为你正在监看该主题，你将会收到通知。'
+          "2_8": '因为你追踪了该分类，所以你会看到新回复的数量。'
+          "2_4": '因为你回复过该主题，所以你会看到新回复的数量。'
+          "2_2": '因为你追踪了该主题，所以你会看到新回复的数量。'
+          "2": '因为你<a href="/u/{{username}}/preferences">读过该主题</a>，所以你会看到新回复的数量。'
+          "1_2": '如果有人@你或回复你，将通知你。'
+          "1": '如果有人@你或回复你，将通知你。'
+          "0_7": '你将忽略关于该分类的所有通知。'
+          "0_2": '你将忽略关于该主题的所有通知。'
+          "0": '你将忽略关于该主题的所有通知。'
         watching_pm:
           title: "监看"
           description: "私信有新回复时提醒我，并显示新回复数量。"
@@ -1500,7 +1468,6 @@ zh_CN:
         visible: "取消隐藏主题"
         reset_read: "重置阅读数据"
         make_public: "设置为公共主题"
-        make_private: "设置为私信"
       feature:
         pin: "置顶主题"
         unpin: "取消置顶主题"
@@ -1533,7 +1500,7 @@ zh_CN:
         pin_validation: "置顶该主题需要一个日期。"
         not_pinned: "{{categoryLink}}没有置顶主题。"
         already_pinned:
-          other: "{{categoryLink}}分类的置顶主题数：<strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: '{{categoryLink}}分类的置顶主题数：<strong class=''badge badge-notification unread''>{{count}}</strong>'
         pin_globally: "将主题置于所有主题列表最上方至"
         confirm_pin_globally: "已有{{count}}个全局置顶主题。太多的置顶主题可能会困扰新用户和访客。确定想再全局置顶一个主题？"
         unpin_globally: "将主题从所有主题列表的最上方移除。"
@@ -1541,7 +1508,7 @@ zh_CN:
         global_pin_note: "允许用户取消全局置顶。"
         not_pinned_globally: "没有全局置顶的主题。"
         already_pinned_globally:
-          other: "全局置顶的主题数：<strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: 全局置顶的主题数：<strong class='badge badge-notification unread'>{{count}}</strong>
         make_banner: "将主题设置为出现在所有页面顶端的横幅主题。"
         remove_banner: "移除所有页面顶端的横幅主题。"
         banner_note: "用户能点击关闭隐藏横幅。且只能设置一个横幅主题。"
@@ -1578,7 +1545,7 @@ zh_CN:
       login_reply: '登录以回复'
       filters:
         n_posts:
-          other: "{{count}} 个帖子"
+          other: '{{count}} 个帖子'
         cancel: "取消过滤"
       split_topic:
         title: "拆分主题"
@@ -1586,13 +1553,13 @@ zh_CN:
         topic_name: "新主题名"
         error: "拆分主题时发生错误。"
         instructions:
-          other: "你将创建一个新的主题，并包含你选择的 <b>{{count}}</b> 个帖子。"
+          other: 你将创建一个新的主题，并包含你选择的 <b>{{count}}</b> 个帖子。
       merge_topic:
         title: "合并主题"
         action: "合并主题"
         error: "合并主题时发生错误。"
         instructions:
-          other: "请选择一个主题以便移动这 <b>{{count}}</b> 个帖子。"
+          other: 请选择一个主题以便移动这 <b>{{count}}</b> 个帖子。
       merge_posts:
         title: "合并选择的帖子"
         action: "合并选择的帖子"
@@ -1604,8 +1571,7 @@ zh_CN:
         label: "帖子的新作者"
         placeholder: "新作者的用户名"
         instructions:
-          other: "请选择<b>{{old_user}}</b>创建的 {{count}} 个帖子的新作者。"
-        instructions_warn: "要注意关于帖子的通知不会被转移给新作者。<br>警告：目前，与帖子关联的任何数据都不会转移至新用户。谨慎使用。"
+          other: 请选择<b>{{old_user}}</b>创建的 {{count}} 个帖子的新作者。
       change_timestamp:
         title: "修改时间"
         action: "修改时间"
@@ -1630,8 +1596,6 @@ zh_CN:
         description:
           other: 已选择 <b>{{count}}</b> 个帖子。
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "引用"
       edit: "<i class='fa fa-pencil'></i> {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "理由："
@@ -1645,20 +1609,21 @@ zh_CN:
       show_full: "显示所有帖子"
       show_hidden: '查看隐藏内容'
       deleted_by_author:
-        other: "（帖子被作者删除，如无标记将在 %{count} 小时后自动删除）"
+        other: （帖子被作者删除，如无标记将在 %{count} 小时后自动删除）
+      collapse: "折叠"
       expand_collapse: "展开/折叠"
       gap:
-        other: "查看 {{count}} 个隐藏回复"
+        other: 查看 {{count}} 个隐藏回复
       unread: "未读帖子"
       has_replies:
-        other: "{{count}} 回复"
+        other: '{{count}} 回复'
       has_likes:
-        other: "{{count}} 赞"
+        other: '{{count}} 赞'
       has_likes_title:
-        other: "{{count}} 人赞了该贴"
+        other: '{{count}} 人赞了该贴'
       has_likes_title_only_you: "你赞了该贴"
       has_likes_title_you:
-        other: "你和其他 {{count}} 人赞了该贴"
+        other: 你和其他 {{count}} 人赞了该贴
       errors:
         create: "抱歉，在创建你的帖子时发生了错误。请重试。"
         edit: "抱歉，在编辑你的帖子时发生了错误。请重试。"
@@ -1695,6 +1660,8 @@ zh_CN:
         undelete: "恢复本帖"
         share: "分享指向这个帖子的链接"
         more: "更多"
+        delete_replies:
+          just_the_post: "不，只是这篇帖子"
         admin: "帖子管理"
         wiki: "公共编辑"
         unwiki: "限制公共编辑"
@@ -1703,10 +1670,14 @@ zh_CN:
         rebake: "重建 HTML"
         unhide: "显示"
         change_owner: "更改作者"
+        grant_badge: "授予徽章"
+        lock_post: "锁定帖子"
+        lock_post_description: "禁止发帖者编辑这篇帖子"
+        unlock_post: "解锁帖子"
       actions:
         flag: '标记'
         defer_flags:
-          other: "忽略标记"
+          other: 忽略标记
         undo:
           off_topic: "撤回标记"
           spam: "撤回标记"
@@ -1723,7 +1694,7 @@ zh_CN:
           bookmark: "收藏"
           like: "赞了它"
           like_capped:
-            other: "和其他 {{count}} 人赞了它"
+            other: 和其他 {{count}} 人赞了它
           vote: "已投票"
         by_you:
           off_topic: "你标记其偏离主题"
@@ -1736,41 +1707,41 @@ zh_CN:
           vote: "你已投票"
         by_you_and_others:
           off_topic:
-            other: "你和其他 {{count}} 人标记其偏离主题"
+            other: 你和其他 {{count}} 人标记其偏离主题
           spam:
-            other: "你和其他 {{count}} 人标记其为垃圾信息"
+            other: 你和其他 {{count}} 人标记其为垃圾信息
           inappropriate:
-            other: "你和其他 {{count}} 人标记其为不恰当的言辞"
+            other: 你和其他 {{count}} 人标记其为不恰当的言辞
           notify_moderators:
-            other: "你和其他 {{count}} 人标记了本帖要求管理人员处理"
+            other: 你和其他 {{count}} 人标记了本帖要求管理人员处理
           notify_user:
-            other: "你和其他 {{count}} 人发了私信给该用户"
+            other: 你和其他 {{count}} 人发了私信给该用户
           bookmark:
-            other: "你和其他 {{count}} 人收藏了这个帖子"
+            other: 你和其他 {{count}} 人收藏了这个帖子
           like:
-            other: "你和其他 {{count}} 人赞了它"
+            other: 你和其他 {{count}} 人赞了它
           vote:
-            other: "你和其他 {{count}} 人已投票"
+            other: 你和其他 {{count}} 人已投票
         by_others:
           off_topic:
-            other: "{{count}} 人标记其偏离主题"
+            other: '{{count}} 人标记其偏离主题'
           spam:
-            other: "{{count}} 人标记其为垃圾信息"
+            other: '{{count}} 人标记其为垃圾信息'
           inappropriate:
-            other: "{{count}} 人标记其为不恰当的言辞"
+            other: '{{count}} 人标记其为不恰当的言辞'
           notify_moderators:
-            other: "{{count}} 人标记本帖要求管理人员处理"
+            other: '{{count}} 人标记本帖要求管理人员处理'
           notify_user:
-            other: "{{count}} 人给这个用户发送了私信"
+            other: '{{count}} 人给这个用户发送了私信'
           bookmark:
-            other: "{{count}} 人收藏了这个帖子"
+            other: '{{count}} 人收藏了这个帖子'
           like:
-            other: "{{count}} 人赞了它"
+            other: '{{count}} 人赞了它'
           vote:
-            other: "{{count}} 人已投票"
+            other: '{{count}} 人已投票'
       merge:
         confirm:
-          other: "确定要合并这 {{count}} 个帖子吗？"
+          other: 确定要合并这 {{count}} 个帖子吗？
       revisions:
         controls:
           first: "第一版"
@@ -1853,7 +1824,6 @@ zh_CN:
       email_in_disabled: "站点设置中已经禁用通过邮件发表新主题。欲启用通过邮件发表新主题，"
       email_in_disabled_click: '启用“邮件发表”设置。'
       mailinglist_mirror: "分类镜像了一个邮件列表"
-      suppress_from_homepage: "不在主页中显示这个分类。"
       show_subcategory_list: "在这个分类中把子分类列表显示在主题的上面"
       num_featured_topics: "分类页面上显示的主题数量："
       subcategory_num_featured_topics: "父分类页面上的推荐主题数量："
@@ -1927,11 +1897,11 @@ zh_CN:
       custom_placeholder_notify_moderators: "让我们知道你关心地是什么，并尽可能地提供相关链接和例子。"
       custom_message:
         at_least:
-          other: "输入至少 {{count}} 个字符"
+          other: 输入至少 {{count}} 个字符
         more:
-          other: "还差 {{count}} 个..."
+          other: 还差 {{count}} 个...
         left:
-          other: "剩余 {{count}}"
+          other: 剩余 {{count}}
     flagging_topic:
       title: "感谢你帮助我们建设文明社区！"
       action: "标记帖子"
@@ -1942,11 +1912,11 @@ zh_CN:
       links_title: "热门链接"
       links_shown: "显示更多链接..."
       clicks:
-        other: "%{count} 次点击"
+        other: '%{count} 次点击'
     post_links:
       about: "为本帖展开更多链接"
       title:
-        other: "%{count} 更多"
+        other: '%{count} 更多'
     topic_statuses:
       warning:
         help: "这是一个正式的警告。"
@@ -1980,18 +1950,18 @@ zh_CN:
     original_post: "原始帖"
     views: "浏览"
     views_lowercase:
-      other: "浏览"
+      other: 浏览
     replies: "回复"
     views_long:
-      other: "本主题已经被浏览过 {{number}} 次"
+      other: 本主题已经被浏览过 {{number}} 次
     activity: "活动"
     likes: "赞"
     likes_lowercase:
-      other: "赞"
+      other: 赞
     likes_long: "本主题已有 {{number}} 次赞"
     users: "用户"
     users_lowercase:
-      other: "用户"
+      other: 用户
     category_title: "分类"
     history: "历史"
     changed_by: "由 {{author}}"
@@ -2005,7 +1975,7 @@ zh_CN:
       latest:
         title: "最新"
         title_with_count:
-          other: "最新（{{count}}）"
+          other: 最新（{{count}}）
         help: "有了新帖的活动主题"
       hot:
         title: "热门"
@@ -2023,17 +1993,17 @@ zh_CN:
       unread:
         title: "未读"
         title_with_count:
-          other: "未读（{{count}}）"
+          other: 未读（{{count}}）
         help: "你目前监看或跟踪有了未读帖子的主题"
         lower_title_with_count:
-          other: "{{count}} 未读"
+          other: '{{count}} 未读'
       new:
         lower_title_with_count:
-          other: "{{count}} 近期"
+          other: '{{count}} 近期'
         lower_title: "近期"
         title: "近期"
         title_with_count:
-          other: "近期 ({{count}})"
+          other: 近期 ({{count}})
         help: "最近几天里创建的主题"
       posted:
         title: "我的帖子"
@@ -2044,7 +2014,7 @@ zh_CN:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          other: "{{categoryName}}（{{count}}）"
+          other: '{{categoryName}}（{{count}}）'
         help: "{{categoryName}}分类中热门的主题"
       top:
         title: "热门"
@@ -2129,20 +2099,19 @@ zh_CN:
         print: '<b>ctrl</b>+<b>p</b> 打印主题'
     badges:
       earned_n_times:
-        other: "授予徽章 %{count} 次"
+        other: 授予徽章 %{count} 次
       granted_on: "授予于%{date}"
       others_count: "其他有该徽章的人（%{count}）"
       title: 徽章
       allow_title: "你可以将该徽章设为头衔"
       multiple_grant: "可多次赢得"
       badge_count:
-        other: "%{count} Badges"
+        other: '%{count} Badges'
       more_badges:
-        other: "+%{count} 更多"
+        other: +%{count} 更多
       granted:
-        other: "%{count} 授予"
+        other: '%{count} 授予'
       select_badge_for_title: 选择一个徽章作为你的头衔使用
-      none: "<none>"
       badge_grouping:
         getting_started:
           name: 开始
@@ -2172,7 +2141,7 @@ zh_CN:
       choose_for_topic: "可选标签"
       delete_tag: "删除标签"
       delete_confirm:
-        other: "你确定你想要删除这个标签以及撤销在{{count}}个主题中的关联么？"
+        other: 你确定你想要删除这个标签以及撤销在{{count}}个主题中的关联么？
       delete_confirm_no_topics: "你确定你想要删除这个标签吗？"
       rename_tag: "重命名标签"
       rename_instructions: "标签的新名称："
@@ -2189,19 +2158,15 @@ zh_CN:
       notifications:
         watching:
           title: "监看"
-          description: "你将自动监看该标签中的所有主题。新帖子和新主题会通知你，再者未读和新帖的数量也将显示在主题旁边。"
         watching_first_post:
           title: "监看头一帖"
-          description: "在这个标签中，只是每一个新主题的第一帖，才会通知你。"
         tracking:
           title: "跟踪"
-          description: "你将自动跟踪这个标签里的所有主题。未读和新帖的数量将显示在主题旁边。"
         regular:
           title: "普通"
           description: "如果有人@你或回复你的帖子，将通知你。"
         muted:
           title: "静音"
-          description: "在这个标签中，你将不会收到新主题任何通知，它们也不会出现在你的未读列表上面。"
       groups:
         title: "标签组"
         about: "将标签分组以便管理。"
@@ -2284,8 +2249,6 @@ zh_CN:
         reports:
           today: "今天"
           yesterday: "昨天"
-          last_7_days: "7天以内"
-          last_30_days: "30天以内"
           all_time: "所有时间内"
           7_days_ago: "7天之前"
           30_days_ago: "30天之前"
@@ -2307,14 +2270,14 @@ zh_CN:
         moderation_history: "管理日志"
         agree: "确认标记"
         agree_title: "确认这个标记有效且正确"
-        agree_flag_hide_post: "确认并隐藏帖子"
         agree_flag_hide_post_title: "隐藏帖子并自动发送私信给作者使其修改"
         agree_flag_restore_post: "确认并恢复帖子"
         agree_flag_restore_post_title: "恢复帖子为所有用户可见。"
-        agree_flag: "确认并保持帖子"
+        agree_flag_suspend: "暂停用户"
+        agree_flag_suspend_title: "同意标记并暂停用户。"
+        agree_flag_silence: "禁言用户"
+        agree_flag_silence_title: "同意标记并禁言用户。"
         agree_flag_title: "确认标记并保持帖子不变。"
-        defer_flag: "忽略"
-        defer_flag_title: "移除标记；这次不处理。"
         delete: "删除"
         delete_title: "删除标记指向的帖子。"
         delete_post_defer_flag: "删除帖子并忽略标记"
@@ -2368,8 +2331,6 @@ zh_CN:
         title: "群组"
         edit: "编辑群组"
         refresh: "刷新"
-        new: "新群组"
-        selector_placeholder: "输入用户名"
         about: "在这里编辑群组的名字和成员"
         group_members: "群组成员"
         delete: "删除"
@@ -2377,22 +2338,10 @@ zh_CN:
         delete_failed: "无法删除群组。如果该群组是自动生成的，则不可删除。"
         delete_owner_confirm: "移除“%{username}”的权限？"
         add: "添加"
-        add_members: "添加成员"
         custom: "定制"
-        bulk_complete: "用户已被添加到群组。"
-        bulk_complete_users_not_added: "这些用户还没有被添加（请确保他们已经有账户了）："
-        bulk: "批量添加到群组"
-        bulk_paste: "粘贴用户名邮件列表，一行一个："
-        bulk_select: "( 选择一个群组 )"
         automatic: "自动"
-        automatic_membership_email_domains: "用户注册时邮箱域名若与列表完全匹配则自动添加至这个群组："
-        automatic_membership_retroactive: "应用同样的邮件域名规则添加已经注册的用户"
-        default_title: "群组内所有用户的默认头衔"
-        primary_group: "自动设置为主要群组"
         group_owners: 所有者
         add_owners: 添加所有者
-        incoming_email: "自定义进站电子邮件地址"
-        incoming_email_placeholder: "输入邮箱地址"
         none_selected: "选择一个小组以开始"
         no_custom_groups: "创建一个自定义小组"
       api:
@@ -2449,6 +2398,8 @@ zh_CN:
           details: "当有新回复、编辑、帖子被删除或者恢复时。"
         user_event:
           name: "用户事件"
+        flag_event:
+          name: "标记事件"
         delivery_status:
           title: "分发状态"
           inactive: "不活跃"
@@ -2458,9 +2409,9 @@ zh_CN:
           none: "没有相关事件。"
           redeliver: "重新发送"
           incoming:
-            other: "有 {{count}} 个新事件。"
+            other: 有 {{count}} 个新事件。
           completed_in:
-            other: "在 {{count}} 秒内完成。"
+            other: 在 {{count}} 秒内完成。
           request: "请求"
           response: "回应"
           redeliver_confirm: "你确定要再次发送一样的内容吗？"
@@ -2511,7 +2462,6 @@ zh_CN:
           label: "上传"
           title: "上传备份至实例"
           uploading: "上传中..."
-          success: "“{{filename}}”已成功上传。"
           error: "上传“{{filename}}”时出错：{{message}}"
         operations:
           is_running: "已有操作正在执行"
@@ -2524,7 +2474,6 @@ zh_CN:
             label: "备份"
             title: "建立一个备份"
             confirm: "你确定要开始建立一个备份吗？"
-            without_uploads: "是（不包括文件）"
           download:
             label: "下载"
             title: "发送含下载链接的邮件"
@@ -2593,6 +2542,7 @@ zh_CN:
           common: "通用"
           desktop: "桌面"
           mobile: "移动"
+          settings: "设置"
           preview: "预览"
           is_default: "主题默认启用"
           user_selectable: "用户可选择主题"
@@ -2621,8 +2571,10 @@ zh_CN:
           updating: "更新..."
           up_to_date: "主题已经是最新版本，上次检查："
           add: "添加"
+          theme_settings: "主题设置"
+          no_settings: "这个主题内没有设置"
           commits_behind:
-            other: "主题落后了 {{count}} 个变更！"
+            other: 主题落后了 {{count}} 个变更！
           scss:
             text: "CSS"
             title: "输入自定义 CSS，我们接受所有有效的 CSS 和 SCSS 样式"
@@ -2644,6 +2596,9 @@ zh_CN:
           body_tag:
             text: "</body>"
             title: "将在 </body> 标签前插入的 HTML"
+          yaml:
+            text: "YAML"
+            title: "用 YAML 格式定义主题设置"
         colors:
           select_base:
             title: "选择基础颜色方案"
@@ -2809,6 +2764,7 @@ zh_CN:
             revoke_badge: "撤销徽章"
             check_email: "检查电子邮件"
             delete_topic: "删除主题"
+            recover_topic: "撤销删除帖子"
             delete_post: "删除帖子"
             impersonate: "检视"
             anonymize_user: "匿名用户"
@@ -2835,6 +2791,12 @@ zh_CN:
             backup_destroy: "删除备份"
             reviewed_post: "已审核的帖子"
             custom_staff: "插件自定义操作"
+            post_locked: "帖子锁定"
+            post_edit: "帖子编辑"
+            post_unlocked: "帖子解锁"
+            check_personal_message: "检查个人信息"
+            disabled_second_factor: "停用双重验证"
+            topic_published: "帖子已发布"
         screened_emails:
           title: "被屏蔽的邮件地址"
           description: "当有人试图用以下邮件地址注册时，将受到阻止或其它系统操作。"
@@ -2884,7 +2846,7 @@ zh_CN:
         clear_filter: "清除"
         show_words: "显示敏感词"
         word_count:
-          other: "%{count}个敏感词"
+          other: '%{count}个敏感词'
         actions:
           block: '封禁'
           censor: '审查'
@@ -2926,9 +2888,9 @@ zh_CN:
           suspect: '怀疑'
         approved: "已批准？"
         approved_selected:
-          other: "审核通过用户（{{count）"
+          other: 审核通过用户（{{count）
         reject_selected:
-          other: "审核拒绝用户（{{count}}）"
+          other: 审核拒绝用户（{{count}}）
         titles:
           active: '已激活用户'
           new: '新用户'
@@ -2945,9 +2907,9 @@ zh_CN:
           suspended: '被禁用户'
           suspect: '嫌疑用户'
         reject_successful:
-          other: "成功拒绝 %{count} 个用户。"
+          other: 成功拒绝 %{count} 个用户。
         reject_failures:
-          other: "成功拒绝 %{count} 个用户。"
+          other: 成功拒绝 %{count} 个用户。
         not_verified: "未验证"
         check_email:
           title: "显示用户电子邮件"
@@ -2974,6 +2936,9 @@ zh_CN:
         suspended_until: "（直到%{until}）"
         cant_suspend: "该用户不能被封禁。"
         delete_all_posts: "删除所有帖子"
+        penalty_post_delete: "删除帖子"
+        penalty_post_edit: "编辑帖子"
+        penalty_post_none: "什么都不做"
         delete_all_posts_confirm_MF: "你将要删除 {POSTS, plural, one {1 个帖子} other {# 个帖子}}和 {TOPICS, plural, one {1 个主题} other {# 个主题}}。确定吗？"
         silence: "禁言"
         unsilence: "解除禁言"
@@ -3006,6 +2971,7 @@ zh_CN:
         private_topics_count: 私有主题数量
         posts_read_count: 已阅帖子数量
         post_count: 发表的帖子数量
+        second_factor_enabled: 双重验证已启用
         topics_entered: 已查看的主题数量
         flags_given_count: 提交标记数量
         flags_received_count: 被他人标记数量
@@ -3024,11 +2990,11 @@ zh_CN:
         delete_forbidden_because_staff: "不能删除管理员和版主。"
         delete_posts_forbidden_because_staff: "不能完全删除管理员和版主的帖子。"
         delete_forbidden:
-          other: "用户如果有帖子将不能删除。在试图尝试删除一个用户前删除所有的帖子（%{count} 天前的帖子不能被删除）"
+          other: 用户如果有帖子将不能删除。在试图尝试删除一个用户前删除所有的帖子（%{count} 天前的帖子不能被删除）
         cant_delete_all_posts:
-          other: "不能删除所有帖子。一些帖子发表于 %{count} 天前。（设置项：delete_user_max_post_age）"
+          other: 不能删除所有帖子。一些帖子发表于 %{count} 天前。（设置项：delete_user_max_post_age）
         cant_delete_all_too_many_posts:
-          other: "不能删除所有帖子，因为用户有超过 %{count} 个帖子。（delete_all_posts_max）"
+          other: 不能删除所有帖子，因为用户有超过 %{count} 个帖子。（delete_all_posts_max）
         delete_confirm: "你确定要删除这个用户吗？这个操作是不可逆的！"
         delete_and_block: "删除并<b>封禁</b>该邮件地址和IP地址"
         delete_dont_block: "仅删除"
@@ -3069,7 +3035,7 @@ zh_CN:
         tl3_requirements:
           title: "信任等级3的要求"
           table_title:
-            other: "这最近 %{count} 天："
+            other: 这最近 %{count} 天：
           value_heading: "当前"
           requirement_heading: "要求"
           visits: "访问"
@@ -3143,11 +3109,11 @@ zh_CN:
         go_back: "返回搜索"
         recommended: "我们建议自定义以下文本以符合你的需求："
         show_overriden: '只显示修改过的'
-      site_settings:
-        show_overriden: '只显示修改过的'
-        title: '设置'
-        reset: '重置为默认'
+      settings:
+        reset: '重置'
         none: '无'
+      site_settings:
+        title: '设置'
         no_results: "找不到结果。"
         clear_filter: "清除"
         add_url: "增加链接"
@@ -3215,7 +3181,6 @@ zh_CN:
         enabled: 启用徽章系统
         icon: 图标
         image: 图片
-        icon_help: "使用 Font Awesome class 或者图片的链接"
         query: 徽章查询（SQL）
         target_posts: 查询到的帖子
         auto_revoke: 每天运行撤销查询
@@ -3239,13 +3204,13 @@ zh_CN:
             text: "有授予的样本消失。这在徽章查询返回用户 ID 或者帖子 ID 不存在的时候发生。这可能导致未预期的结果发生——请再次检查你的查询。"
           no_grant_count: "没有徽章可以被授予。"
           grant_count:
-            other: "已授予 <b>%{count}</b> 个徽章。"
+            other: 已授予 <b>%{count}</b> 个徽章。
           sample: "样本："
           grant:
-            with: <span class="username">%{username}</span>
-            with_post: <span class="username">%{username}</span>因 %{link} 帖子
-            with_post_time: <span class="username">%{username}</span>因在<span class="time">%{time}</span>时的 %{link} 帖子
-            with_time: <span class="username">%{username}</span>在<span class="time">%{time}</span>
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span>因 %{link} 帖子"
+            with_post_time: "<span class=\"username\">%{username}</span>因在<span class=\"time\">%{time}</span>时的 %{link} 帖子"
+            with_time: "<span class=\"username\">%{username}</span>在<span class=\"time\">%{time}</span>"
       emoji:
         title: "Emoji"
         help: "增加所有人可用的 emoji。（高端技巧：一次性拖进多个文件）"
@@ -3306,7 +3271,7 @@ zh_CN:
       uploading: "上传中..."
       quit: "以后再说"
       staff_count:
-        other: "你的社区中包括你在内有 %{count} 位工作人员。"
+        other: 你的社区中包括你在内有 %{count} 位工作人员。
       invites:
         add_user: "添加"
         none_added: "你还没有邀请任何工作人员。你确定要继续吗？"
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index 83409b1f3e4..e83362e0daa 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -42,47 +42,52 @@ zh_TW:
       tiny:
         half_a_minute: "< 1 分鐘"
         less_than_x_seconds:
-          other: "< %{count} 秒"
+          other: < %{count} 秒
         x_seconds:
-          other: "%{count} 秒"
+          other: '%{count} 秒'
+        less_than_x_minutes:
+          other: < %{count} 分鐘
         x_minutes:
-          other: "%{count} 分鐘"
+          other: '%{count} 分鐘'
         about_x_hours:
-          other: "%{count} 小時"
+          other: '%{count} 小時'
         x_days:
-          other: "%{count} 天"
+          other: '%{count} 天'
+        x_months:
+          other: '%{count} 月'
         about_x_years:
-          other: "%{count} 年"
+          other: '%{count} 年'
         over_x_years:
-          other: "> %{count} 年"
+          other: '> %{count} 年'
         almost_x_years:
-          other: "%{count} 年"
+          other: '%{count} 年'
         date_month: "MMM D"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          other: "%{count} 分鐘"
+          other: '%{count} 分鐘'
         x_hours:
-          other: "%{count} 小時"
+          other: '%{count} 小時'
         x_days:
-          other: "%{count} 天"
+          other: '%{count} 天'
         date_year: "'YY MMM D"
       medium_with_ago:
         x_minutes:
-          other: "%{count} 分鐘前"
+          other: '%{count} 分鐘前'
         x_hours:
-          other: "%{count} 小時前"
+          other: '%{count} 小時前'
         x_days:
-          other: "%{count} 天前"
+          other: '%{count} 天前'
       later:
         x_days:
-          other: "%{count} 天後"
+          other: '%{count} 天後'
         x_months:
-          other: "%{count} 個月後"
+          other: '%{count} 個月後'
         x_years:
-          other: "%{count} 年後"
+          other: '%{count} 年後'
       previous_month: '上個月'
       next_month: '下個月'
+      placeholder: 日期
     share:
       topic: '在此話題內分享連結'
       post: '文章 #%{postNumber}'
@@ -93,7 +98,6 @@ zh_TW:
       email: '以電子郵件分享此連結'
     action_codes:
       public_topic: "%{when}時讓大家看到這個主題"
-      private_topic: "%{when}時讓其他人看不到這個主題"
       split_topic: "於 %{when} 分割此討論話題"
       invited_user: "邀請 %{who} 於 %{when} "
       invited_group: "邀請 %{who} %{when}"
@@ -119,8 +123,8 @@ zh_TW:
         disabled: '於 %{when} 除名'
     topic_admin_menu: "版區管理員操作"
     emails_are_disabled: "管理員已經停用了所有外寄郵件功能。通知信件都不會寄出。"
-    bootstrap_mode_enabled: "為了讓你的新網站更容易上軌道，現正處於初始化模式中。所有新用戶將被授予信任等級1，並為他們設定接受每日郵件摘要。初始化模式將於用戶數超過 %{min_users} 位後關閉。"
-    bootstrap_mode_disabled: "初始化模式將會在24小時後關閉。"
+    themes:
+      default_description: "預設"
     s3:
       regions:
         ap_northeast_1: "亞太地區 (東京)"
@@ -131,8 +135,10 @@ zh_TW:
         cn_north_1: "中國 (北京)"
         eu_central_1: "歐洲 (法蘭克福)"
         eu_west_1: "歐洲 (愛爾蘭)"
+        eu_west_2: "歐洲 (倫敦)"
         sa_east_1: "南美洲 (聖保羅)"
         us_east_1: "美國東部 (北維珍尼亞州)"
+        us_east_2: "美國東部 (俄亥俄州)"
         us_gov_west_1: "AWS GovCloud (美國)"
         us_west_1: "美國西部 (北加州)"
         us_west_2: "美國西部 (奧勒岡州)"
@@ -140,6 +146,7 @@ zh_TW:
     not_implemented: "抱歉，此功能尚未開放。"
     no_value: "否"
     yes_value: "是"
+    submit: "提交"
     generic_error: "抱歉，發生錯誤。"
     generic_error_with_reason: "發生錯誤: %{error}"
     sign_up: "註冊"
@@ -152,11 +159,11 @@ zh_TW:
     show_help: "選項"
     links: "連結"
     links_lowercase:
-      other: "鏈結"
+      other: 鏈結
     faq: "常見問答集"
     guidelines: "守則"
-    privacy_policy: "隱私政策"
-    privacy: "隱私政策"
+    privacy_policy: "隱私權政策"
+    privacy: "隱私"
     terms_of_service: "服務條款"
     mobile_view: "手機版網站"
     desktop_view: "電腦版網站"
@@ -176,7 +183,7 @@ zh_TW:
     max_of_count: "（最大 {{count}}）"
     alternation: "或者"
     character_count:
-      other: "{{count}} 個字"
+      other: '{{count}} 個字'
     suggested_topics:
       title: "推薦的討論話題"
       pm_title: "推薦訊息"
@@ -210,13 +217,6 @@ zh_TW:
       last_read: "這是你最後閱讀的文章，按此加上書籤"
       remove: "移除書籤"
       confirm_clear: "你確定要刪除該主題的所有書籤嗎？"
-    topic_count_latest:
-      other: "有 {{count}} 個更新過或是新的討論話題。"
-    topic_count_unread:
-      other: "{{count}} 個未讀討論話題"
-    topic_count_new:
-      other: "有 {{count}} 個新討論話題。"
-    click_to_show: "點擊顯示"
     preview: "預覽"
     cancel: "取消"
     save: "儲存變更"
@@ -228,6 +228,7 @@ zh_TW:
     uploaded: "上傳完畢！"
     enable: "啟用"
     disable: "停用"
+    continue: "繼續"
     undo: "復原"
     revert: "回復"
     failed: "失敗"
@@ -252,14 +253,14 @@ zh_TW:
       cancel: "取消"
       view_pending: "觀看等待審核的貼文"
       has_pending_posts:
-        other: "本主題仍有 <b>{{count}}</b>篇貼文等待審核"
+        other: 本主題仍有 <b>{{count}}</b>篇貼文等待審核
       confirm: "儲存變更"
       delete_prompt: "你確定要刪除 <b>%{username}</b> ? 這會移走有關他的文章，並封鎖他的電子郵箱及 IP 位址。"
       approval:
         title: "貼文需等待審核"
         description: "貼文已經送出，但必須等待管理者審核過後才會出現在板上，請耐心等候。"
         pending_posts:
-          other: "你有 <strong>{{count}}</strong> 篇貼文在等待審核中"
+          other: 你有 <strong>{{count}}</strong> 篇貼文在等待審核中
         ok: "確定"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> 建立了 <a href='{{topicUrl}}'>此討論話題</a>"
@@ -293,7 +294,7 @@ zh_TW:
       posts_read: "已讀"
       posts_read_long: "讀過的文章"
       total_rows:
-        other: "%{count} 用戶"
+        other: '%{count} 用戶'
     group_histories:
       actions:
         change_group_setting: "更改群組設定"
@@ -302,22 +303,31 @@ zh_TW:
         make_user_group_owner: "設為所有者"
         remove_user_as_group_owner: "撤銷管理員"
     groups:
-      logs:
-        title: "紀錄"
-        when: "什麼時候"
-        action: "動作"
-        acting_user: "啟用中的用戶"
-        target_user: "目的用戶"
-        subject: "主旨"
-        details: "詳情"
-        from: "從"
-        to: "至"
-      edit:
-        title: '編輯群組'
+      add_members:
+        title: "新增成員"
+        description: "管理這個群組的成員"
+        usernames: "使用者名稱"
+      manage:
+        title: '管理'
+        name: '名稱'
         full_name: '全名'
-        add_members: "增加成員"
-        delete_member_confirm: "從「%{group}」群組移除「%{username}」？"
-      name_placeholder: "群組名，沒有空格，和用戶名一樣的規則"
+        add_members: "新增成員"
+        delete_member_confirm: "從 '\b%{group}‘ 群組移除 '%{username}''？"
+        profile:
+          title: 個人資料
+        interaction:
+          notification: 通知
+        membership:
+          title: 會員資格
+        logs:
+          title: "記錄"
+          when: "時間"
+          action: "動作"
+          target_user: "目標使用者"
+          subject: "主旨"
+          details: "詳情"
+          from: "從"
+          to: "到"
       empty:
         posts: "群組成員沒有發佈帖子。"
         members: "這個團隊裡面沒有成員"
@@ -326,37 +336,63 @@ zh_TW:
         topics: "群組的成員從未發表主題。"
         logs: "這個團隊裡面沒有日誌"
       add: "新增"
-      join: "加入團隊"
-      leave: "離開團隊"
-      request: "請求加入團隊"
+      join: "加入"
+      leave: "離開"
+      request: "請求"
       message: "訊息"
-      automatic_group: 自動群組
-      closed_group: 關閉群組
-      is_group_user: "你是團隊裡面的成員"
+      allow_membership_requests: "允許使用者向群組擁有者傳送加入要求？"
+      membership_request:
+        submit: "提交請求"
+        title: "請求加入 @%{group_name}"
       membership: "會員資格"
       name: "名字"
-      user_count: "成員數量"
+      group_name: "群組名稱"
+      user_count: "使用者"
       bio: "關於群組"
-      selector_placeholder: "新增成員"
+      selector_placeholder: "輸入使用者名稱"
       owner: "擁有者"
       index:
         title: "群組"
+        all: "所有群組"
         empty: "沒有可看見的群組。"
+        owner_groups: "我是擁有者的群組"
+        close_groups: "已關閉的群組"
+        automatic_groups: "自動群組"
+        automatic: "自動"
+        closed: "已關閉"
+        public: "公開"
+        private: "私密"
+        public_groups: "公開群組"
+        automatic_group: 自動群組
+        close_group: 關閉群組
+        my_groups: "我的群組"
+        group_type: "群組類型"
+        is_group_user: "成員"
+        is_group_owner: "擁有者"
+      title:
+        other: 群組
       activity: "活動"
-      members: "成員"
+      members:
+        title: "成員"
+        filter_placeholder_admin: "使用者名稱或電子郵件"
+        filter_placeholder: "使用者名稱"
+        remove_member: "移除成員"
+        remove_member_description: "從這個群組移除 <b>%{username}</b>"
+        make_owner: "設置為擁有者"
+        make_owner_description: "設置 <b>%{username}</b> 為這個群組的擁有者"
+        owner: "擁有者"
       topics: "主題"
       posts: "文章"
       mentions: "提及"
       messages: "訊息"
       alias_levels:
+        mentionable: "誰可以 @標註 此群組?"
+        messageable: "誰可以訊息此群組?"
         nobody: "沒有"
         only_admins: "只有管理員"
         mods_and_admins: "只有板主以及管理員"
         members_mods_and_admins: "只有群組成員、板主以及管理員"
         everyone: "所有人"
-      trust_levels:
-        title: "當這些成員加入時自動提升信任等級:"
-        none: "無"
       notifications:
         watching:
           title: "關注"
@@ -381,23 +417,21 @@ zh_TW:
       flair_color_placeholder: "（可選）十六進制色彩值"
       flair_preview_icon: "預覽圖示"
       flair_preview_image: "預覽圖片"
-      flair_note: "注意：標示將只在用戶的主要群組顯示"
     user_action_groups:
-      '1': "已按讚"
-      '2': "已收到的讚"
-      '3': "書籤"
-      '4': "討論話題"
-      '5': "回覆"
-      '6': "回應"
-      '7': "提到"
-      '9': "引用"
-      '11': "編輯"
-      '12': "送出的項目"
-      '13': "收件匣"
-      '14': "等待中"
+      "1": "已按讚"
+      "2": "已收到的讚"
+      "3": "書籤"
+      "4": "討論話題"
+      "5": "回覆"
+      "6": "回應"
+      "7": "提到"
+      "9": "引用"
+      "11": "編輯"
+      "12": "送出的項目"
+      "13": "收件匣"
+      "14": "等待中"
     categories:
       all: "所有分類"
-      all_subcategories: "所有"
       no_subcategory: "無"
       category: "分類"
       category_list: "顯示分類列表"
@@ -416,9 +450,9 @@ zh_TW:
       toggle_ordering: "顯示/隱藏排序控制"
       subcategories: "次分類"
       topic_sentence:
-        other: "%{count} 話題"
+        other: '%{count} 話題'
       topic_stat_sentence:
-        other: "在過去一%{unit}內有 %{count} 個新討論話題。"
+        other: 在過去一%{unit}內有 %{count} 個新討論話題。
     ip_lookup:
       title: 最近的 IP 位址
       hostname: 伺服器名稱
@@ -442,6 +476,7 @@ zh_TW:
       mute: "靜音"
       edit: "編輯喜好設定"
       download_archive:
+        button_text: "全部下載"
         confirm: "你確定要下載你的文章嗎?"
         success: "開始下載，處理完畢後將以私人訊息通知您。"
         rate_limit_error: "帖子只能每天下載一次，請明天再重試。"
@@ -451,6 +486,7 @@ zh_TW:
       activity_stream: "活動"
       preferences: "偏好設定"
       expand_profile: "展開"
+      collapse_profile: "收合"
       bookmarks: "書籤"
       bio: "關於我"
       invited_by: "邀請人"
@@ -458,7 +494,7 @@ zh_TW:
       notifications: "通知"
       statistics: "統計"
       desktop_notifications:
-        label: "桌面通知"
+        label: "即時通知"
         not_supported: "非常遺憾，你的瀏覽器不支持桌面通知。"
         perm_default: "啟用桌面通知"
         perm_denied_btn: "權限被拒絕"
@@ -466,11 +502,14 @@ zh_TW:
         disable: "停用通知"
         enable: "啟用通知"
         each_browser_note: "注意：你必須在你使用的所用瀏覽器中更改這項設置。"
+        consent_prompt: "當別人回復您的文章時，您想要收到即時的通知嗎?"
       dismiss_notifications: "設定全部為已讀"
       dismiss_notifications_tooltip: "標記所有未讀通知為已讀"
       first_notification: "你的頭一個通知！選中它開始。"
       disable_jump_reply: "不要在回覆之後直接跳到我的文章"
       dynamic_favicon: "在瀏覽器小圖示上顯示新主題/更新的主題數"
+      theme_default_on_all_devices: "在我所有的裝置上將此設為預設佈景"
+      allow_private_messages: "允許其他使用者寄送個人訊息給我"
       external_links_in_new_tab: "以新分頁開啟所有外部連結"
       enable_quoting: "允許引用已標註的文字"
       change: "修改"
@@ -479,6 +518,7 @@ zh_TW:
       moderator_tooltip: "此用戶為板主"
       admin_tooltip: "此用戶為管理員"
       suspended_notice: "此用戶已被停權至 {{date}}。"
+      suspended_permanently: "此用戶已被停權。"
       suspended_reason: "原因: "
       github_profile: "Github"
       email_activity_summary: "活動摘要"
@@ -493,14 +533,14 @@ zh_TW:
         many_per_day: "每當有新文章時，寄給我郵件通知（每天約有  {{dailyEmailEstimate}}  封）。"
         few_per_day: "每當有新文章時，寄給我郵件通知（每天約有 2  封）。"
       tag_settings: "標籤"
-      watched_tags: "已觀看"
-      watched_tags_instructions: "您將會自動監視所有這些添加的主題。您會收到新文章或新主題的通知，新文章數量將出現在每個主題後。"
+      watched_tags: "已關注"
+      watched_tags_instructions: "您將會自動關注該標籤中的所有主題。您會收到新文章或新主題的通知，新文章數量將出現在每個主題後。"
       tracked_tags: "已追蹤"
       tracked_tags_instructions: "您將會自動監視所有這些添加的主題。新文章數量將出現在每個主題後。"
       muted_tags: "靜音"
       muted_tags_instructions: "你將不會收到有這些標籤的新主題任何通知，它們也不會出現在“最新”主題列表。"
-      watched_categories: "關注"
-      watched_categories_instructions: "你將自動監看這些分類中的所有主題。所有新帖子和新主題會通知你，新帖數量也將顯示在主題旁邊。"
+      watched_categories: "已關注"
+      watched_categories_instructions: "你將自動關注這些分類中的所有主題。所有新帖子和新主題會通知你，新帖數量也將顯示在主題旁邊。"
       tracked_categories: "追蹤"
       tracked_categories_instructions: "你將自動跟蹤這些分類中的所有主題。新帖數量將會顯示在主題旁邊。"
       watched_first_post_categories: "關注第一則帖子"
@@ -512,19 +552,20 @@ zh_TW:
       delete_account: "刪除我的帳號"
       delete_account_confirm: "你真的要刪除帳號嗎?此動作不能被還原!"
       deleted_yourself: "你的帳號已成功刪除"
-      delete_yourself_not_allowed: "帳號不能刪除。請聯絡管理人。"
       unread_message_count: "訊息"
       admin_delete: "刪除"
       users: "用戶"
       muted_users: "靜音"
       muted_users_instructions: "禁止來自這些用戶的所有通知。"
       muted_topics_link: "顯示已靜音的主題"
-      watched_topics_link: "顯示已觀看的討論話題"
+      watched_topics_link: "顯示已關注的討論話題"
       automatically_unpin_topics: "當我完整閲讀了主題時自動解除置頂。"
       apps: "應用"
       revoke_access: "撤銷許可"
       undo_revoke_access: "解除撤銷許可"
       api_approved: "已批准："
+      theme: "佈景"
+      home: "預設首頁"
       staff_counters:
         flags_given: "有幫助的投訴"
         flagged_posts: "已投訴的文章"
@@ -542,6 +583,7 @@ zh_TW:
         move_to_archive: "封存"
         failed_to_move: "移動到所選郵件失敗(也許你的網絡沒有開啟)"
         select_all: "選擇全部"
+        tags: "標籤"
       preferences_nav:
         account: "帳號"
         profile: "基本資料"
@@ -559,6 +601,12 @@ zh_TW:
         set_password: "設定密碼"
         choose_new: "選擇一個新密碼"
         choose: "選擇一個密碼"
+      second_factor:
+        title: "兩步驟驗證"
+        disable: "停用兩步驟驗證"
+        enable: "啟用<a href>兩步驟驗證</a>來增加帳號安全性"
+        disable_description: "請從您的應用程式輸入驗證碼"
+        show_key_description: "手動輸入"
       change_about:
         title: "修改關於我"
         error: "修改設定值時發生錯誤"
@@ -598,7 +646,7 @@ zh_TW:
         authenticated: "你的 Email 已由 {{provider}} 驗證完成。"
         frequency_immediately: "如果您沒有閱讀過重要通知，我們會立即發送電子郵件給您。"
         frequency:
-          other: "我們只會在您 {{count}} 分鐘內沒有活動時，才會寄送電郵通知給您。"
+          other: 我們只會在您 {{count}} 分鐘內沒有活動時，才會寄送電郵通知給您。
       name:
         title: "名稱"
         instructions: "您的全名 (選填)"
@@ -629,8 +677,6 @@ zh_TW:
       created: "建立日期"
       log_out: "登出"
       location: "位置"
-      card_badge:
-        title: "用戶卡徽章"
       website: "網站"
       email_settings: "電子郵件"
       like_notification_frequency:
@@ -684,9 +730,8 @@ zh_TW:
         title: "邀請"
         user: "受邀請的用戶"
         sent: "送出"
-        none: "沒有未接受狀態的邀請。"
         truncated:
-          other: "只顯示前 {{count}} 個邀請。"
+          other: 只顯示前 {{count}} 個邀請。
         redeemed: "已接受的邀請"
         redeemed_tab: "接受日期"
         redeemed_tab_with_count: "接受日期 ({{count}})"
@@ -701,6 +746,7 @@ zh_TW:
         rescinded: "邀請已刪除"
         reinvite: "重送邀請"
         reinvite_all: "重送所有邀請"
+        reinvite_all_confirm: "您確定要重新寄出所有邀請嗎?"
         reinvited: "邀請已經重送"
         reinvited_all: "所有邀請已經重送"
         time_read: "閱讀時間"
@@ -727,16 +773,23 @@ zh_TW:
         title: "摘要"
         stats: "統計"
         time_read: "閱讀時間"
+        recent_time_read: "最近的閱讀時間"
         topic_count:
-          other: "討論話題已建立"
+          other: 討論話題已建立
         post_count:
-          other: "帖子已建立"
+          other: 帖子已建立
+        likes_given:
+          other: 已送出
+        likes_received:
+          other: 已接收
         days_visited:
-          other: "到訪天數"
+          other: 到訪天數
+        topics_entered:
+          other: 已讀討論話題
         posts_read:
-          other: "讀過的文章"
+          other: 讀過的文章
         bookmark_count:
-          other: "書籤"
+          other: 書籤
         top_replies: "最佳回覆"
         no_replies: "暫無回覆。"
         more_replies: "更多回覆"
@@ -762,6 +815,7 @@ zh_TW:
         header_title: "個人頁面、消息、書籤和設置"
       title:
         title: "頭銜"
+        none: "(無)"
       filters:
         all: "全部"
       stream:
@@ -804,7 +858,7 @@ zh_TW:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> 達到了站點設置中的 %{siteSettingRate}。"
       exceeded: "<b>[%{relativeAge}]</b> 目前的錯誤率 <a href='%{url}' target='_blank'>%{rate}</a> 已超出了站點設置中的 %{siteSettingRate}。"
       rate:
-        other: "%{count} 錯誤/%{duration}"
+        other: '%{count} 錯誤/%{duration}'
     learn_more: "進一步了解..."
     all_time: '總數'
     all_time_desc: '創建的主題總量'
@@ -818,6 +872,9 @@ zh_TW:
     first_post: 第一篇文章
     mute: 靜音
     unmute: 取消靜音
+    time_read: 已讀
+    time_read_recently: '最近'
+    time_read_recently_tooltip: '%{time_read} 總共閱讀時間 (%{recent_time_read} 在最近 60 天)'
     last_reply_lowercase: 最新回覆
     replies_lowercase:
       other: 回覆
@@ -866,25 +923,34 @@ zh_TW:
       complete_email_found: "我們發現有個帳號跟 <b>%{email}</b> 相符，你應該很快就會收到重設密碼的電子郵件。"
       complete_username_not_found: "沒有帳號使用 <b>%{username}</b> 這個用戶名稱"
       complete_email_not_found: "沒有帳號使用 <b>%{email}</b>"
+      button_ok: "確定"
     login:
       title: "登入"
       username: "用戶"
       password: "密碼"
+      second_factor_title: "兩步驟驗證"
       email_placeholder: "電子郵件地址或用戶名稱"
       caps_lock_warning: "大寫鎖定中"
       error: "未知的錯誤"
       rate_limit: "嘗試重新登入前請先等待"
+      blank_username: "請輸入您的電子郵件或使用者名稱。"
       blank_username_or_password: "請輸入你的電子郵件或者用戶名稱，以及密碼。"
       reset_password: '重設密碼'
       logging_in: "登入中..."
       or: "或"
       authenticating: "正在認證..."
+      awaiting_activation: "你的帳號目前尚未啟用，請點選忘記密碼的連結來重新寄出一封認證信。"
       awaiting_approval: "你的帳號尚未通過工作人員的審核，當審核通過時你會收到電子郵件通知。"
       requires_invite: "抱歉，只有受邀請者才能進入此論壇。"
       not_activated: "你還無法登入，我們之前曾將啟用帳號的電子郵件寄至 <b>{{sentTo}}</b>，請從該電子郵件啟用你的帳號。"
       not_allowed_from_ip_address: "你無法透過此 IP 登入。"
       admin_not_allowed_from_ip_address: "你無法透過此 IP 登入成為管理員。"
       resend_activation_email: "按這裡重新寄出啟用帳號的電子郵件。"
+      omniauth_disallow_totp: "您的帳號已啟用兩步驟驗證。請使用您的密碼登入。"
+      resend_title: "重新寄出認證信"
+      change_email: "更換電子郵件"
+      provide_new_email: "提供新的電子郵件，我們將把認證信重新寄給您。"
+      submit_new_email: "更換電子郵件"
       sent_activation_email_again: "我們已經將啟用帳號的電子郵件寄至 <b>{{currentEmail}}</b>，你可能幾分鐘後才會收到，如果一直沒收到，請檢查垃圾郵件資料夾。"
       to_continue: "請登入"
       preferences: "需要登入後更改設置"
@@ -919,6 +985,9 @@ zh_TW:
       your_email: "您帳號的電郵地址是 <b>%{email}</b>"
       accept_invite: "接受邀請"
       success: "你的帳號已被建立，且您已經登入了。"
+      name_label: "姓名"
+      password_label: "設定密碼"
+      optional_description: "(選擇性)"
     password_reset:
       continue: "繼續連接至 %{site_name}"
     emoji_set:
@@ -927,6 +996,7 @@ zh_TW:
       twitter: "Twitter"
       emoji_one: " Emoji One "
       win10: "Win10"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "僅分類"
       categories_with_featured_topics: "有推薦主題的分類"
@@ -935,6 +1005,12 @@ zh_TW:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    conditional_loading_section:
+      loading: 載入中...
+    select_kit:
+      filter_placeholder: 搜尋...
+    emoji_picker:
+      food: 食物
     composer:
       emoji: "表情符號 :)"
       more_emoji: "更多..."
@@ -951,7 +1027,7 @@ zh_TW:
       similar_topics: "與你的討論話題類似的討論..."
       drafts_offline: "離線草稿"
       group_mentioned:
-        other: "提及 {{group}} 時，你將通知 <a href='{{group_link}}'>{{count}} 人</a> － 確定嗎？"
+        other: 提及 {{group}} 時，你將通知 <a href='{{group_link}}'>{{count}} 人</a> － 確定嗎？
       cannot_see_mention:
         category: "你提到了{{userrname}}，然而他們不能訪問該分類，所以他們不會被通知。你需要把他們加入到能訪問該分類的群組中。"
         private: "你提到了{{userrname}}，然而他們不能訪問該私信，所以他們不會被通知。你需要邀請他們至私信中。"
@@ -1021,28 +1097,13 @@ zh_TW:
       empty: "未找到任何通知。"
       more: "檢視較舊的通知"
       total_flagged: "所有被投訴的文章"
-      alt:
-        mentioned: "被提及"
-        quoted: "引用者"
-        replied: "回覆"
-        posted: "發自"
-        edited: "編輯你的帖子"
-        liked: "讚了你的帖子"
-        private_message: "私信來自"
-        invited_to_private_message: "私信邀請自"
-        invited_to_topic: "主題邀請自"
-        invitee_accepted: "介紹邀請自"
-        moved_post: "你的帖子被移動自"
-        linked: "連結到你的討論"
-        granted_badge: "勛章授予"
-        group_message_summary: "在群組收件箱中的消息"
+      granted_badge: "得到 '{{description}}'"
       popup:
         mentioned: '{{username}}在“{{topic}}”提到了你 - {{site_title}}'
         group_mentioned: '{{username}}在“{{topic}}”提到了你 - {{site_title}}'
         quoted: '{{username}}在“{{topic}}”引用了你的帖子 - {{site_title}}'
         replied: '{{username}}在“{{topic}}”回覆了你 - {{site_title}}'
         posted: '{{username}}在“{{topic}}”中發佈了帖子 - {{site_title}}'
-        private_message: '{{username}}在“{{topic}}”中給你發送了一個私信 - {{site_title}}'
         linked: '{{username}}在“{{topic}}”中連結了你的帖子 - {{site_title}}'
     upload_selector:
       title: "加入一張圖片"
@@ -1088,7 +1149,7 @@ zh_TW:
         filters:
           likes: 我給了讚的
           posted: 我參與發帖
-          watching: 我正在監看
+          watching: 我正在關注
           tracking: 我正在追蹤
           first: 是第一帖
           pinned: 是置頂的
@@ -1133,7 +1194,7 @@ zh_TW:
         archive_topics: "已封存的討論話題"
         choose_new_category: "為主題選擇新類別："
         selected:
-          other: "你已選擇了 <b>{{count}}</b> 個討論話題。"
+          other: 你已選擇了 <b>{{count}}</b> 個討論話題。
         change_tags: "取代標籤"
         append_tags: "添加標籤"
         choose_new_tags: "為主題選擇新標籤"
@@ -1165,11 +1226,8 @@ zh_TW:
         bookmarks: "書籤裡沒有更多的討論話題了。"
         search: "沒有更多搜索結果了。"
     topic:
-      unsubscribe:
-        stop_notifications: "你將收到更少的關於<strong>{{title}}</strong>的通知"
-        change_notification_state: "你現在的通知狀態是"
       filter_to:
-        other: "本主題中的 {{count}} 帖"
+        other: 本主題中的 {{count}} 帖
       create: '新討論話題'
       create_long: '建立新討論話題'
       private_message: '發送訊息'
@@ -1198,13 +1256,13 @@ zh_TW:
         title: "未找到討論話題"
         description: "抱歉，找不到此討論話題，可能已被板主刪除。"
       total_unread_posts:
-        other: "你有 {{count}} 個未讀的文章在這討論話題內"
+        other: 你有 {{count}} 個未讀的文章在這討論話題內
       unread_posts:
-        other: "你有 {{count}} 個未讀的舊文章在討論內"
+        other: 你有 {{count}} 個未讀的舊文章在討論內
       new_posts:
-        other: "自你上次閱讀後，有 {{count}} 篇新文章在此討論話題內"
+        other: 自你上次閱讀後，有 {{count}} 篇新文章在此討論話題內
       likes:
-        other: "此討論話題收到了 {{count}} 個讚"
+        other: 此討論話題收到了 {{count}} 個讚
       back_to_list: "回到討論話題列表"
       options: "討論話題選項"
       show_links: "在討論話題裡顯示連結"
@@ -1220,7 +1278,7 @@ zh_TW:
       deleted: "此討論話題已被刪除"
       auto_close_title: '自動關閉設定'
       auto_close_immediate:
-        other: "主題中的最後一帖是 %{hours} 小時前發出的，所以主題將會立即關閉。"
+        other: 主題中的最後一帖是 %{hours} 小時前發出的，所以主題將會立即關閉。
       timeline:
         back: "返回"
         back_description: "回到最後一個未讀帖子"
@@ -1241,17 +1299,21 @@ zh_TW:
         title: 改變你收到該主題通知的頻率
         reasons:
           mailing_list_mode: "郵件列表模式已啟用，將以郵件通知你關於該主題的回覆。"
-          '3_10': '因為你正監看該主題上的標籤，你將會收到通知。'
-          '3_6': '你將會收到通知，因為你正在關注此分類。'
-          '3_5': '你將會收到通知，因為你在觀看此討論話題。'
-          '3_2': '你將收到關於此討論話題的通知，因為你正在關注此討論話題。'
-          '3_1': '你將收到關於此討論話題的通知，因為你建立了此討論話題。'
-          '3': '你將收到關於此討論話題的通知，因為你正在關注此討論話題。'
-          '1_2': '如果有人@你或回覆你，將通知你。'
-          '1': '如果有人@你或回覆你，將通知你。'
-          '0_7': '你正忽略此分類中的所有通知。'
-          '0_2': '你正忽略此討論話題的所有通知。'
-          '0': '你正忽略此討論話題的所有通知。'
+          "3_10": '因為你正關注該主題上的標籤，你將會收到通知。'
+          "3_6": '你將會收到通知，因為你正在關注此分類。'
+          "3_5": '你將會收到通知，因為你自動關注此討論話題。'
+          "3_2": '你將收到關於此討論話題的通知，因為你正在關注此討論話題。'
+          "3_1": '你將收到關於此討論話題的通知，因為你建立了此討論話題。'
+          "3": '你將收到關於此討論話題的通知，因為你正在關注此討論話題。'
+          "2_8": '您將會看到新回覆的數量，因為你正在追蹤這個分類。'
+          "2_4": '您將會看到新回覆的數量，因為你回覆了此討論話題。'
+          "2_2": '您將會看到新回覆的數量，因為你正在追蹤這個話題。'
+          "2": '您將會看到新回覆的數量，因為你<a href="/u/{{username}}/preferences">看過這個話題</a>。'
+          "1_2": '如果有人@你或回覆你，將通知你。'
+          "1": '如果有人@你或回覆你，將通知你。'
+          "0_7": '你正忽略此分類中的所有通知。'
+          "0_2": '你正忽略此討論話題的所有通知。'
+          "0": '你正忽略此討論話題的所有通知。'
         watching_pm:
           title: "關注中"
           description: "消息有新回覆時提醒我，並顯示新回覆數量。"
@@ -1290,7 +1352,6 @@ zh_TW:
         visible: "出現在列表上"
         reset_read: "重置讀取資料"
         make_public: "設置為公共主題"
-        make_private: "設置為私信"
       feature:
         pin: "置頂主題"
         unpin: "取消置頂主題"
@@ -1323,7 +1384,7 @@ zh_TW:
         pin_validation: "置頂該主題需要一個日期。"
         not_pinned: "沒有主題被釘選在 {{categoryLink}} ."
         already_pinned:
-          other: "{{categoryLink}}分類的置頂主題數：<strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: '{{categoryLink}}分類的置頂主題數：<strong class=''badge badge-notification unread''>{{count}}</strong>'
         pin_globally: "將主題置於所有主題列表最上方至"
         confirm_pin_globally: "已有{{count}}個全局置頂主題。太多的置頂主題可能會困擾新用戶和訪客。確定想再全局置頂一個主題？"
         unpin_globally: "將主題從所有主題列表的最上方移除。"
@@ -1331,7 +1392,7 @@ zh_TW:
         global_pin_note: "允許用戶取消全局置頂。"
         not_pinned_globally: "沒有全局置頂的主題。"
         already_pinned_globally:
-          other: "全局置頂的主題數：<strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: 全局置頂的主題數：<strong class='badge badge-notification unread'>{{count}}</strong>
         make_banner: "將主題設置為出現在所有頁面頂端的橫幅主題。"
         remove_banner: "移除所有頁面頂端的橫幅主題。"
         banner_note: "用戶能點擊關閉隱藏橫幅。且只能設置一個橫幅主題。"
@@ -1367,7 +1428,7 @@ zh_TW:
       login_reply: '登入以發表回應'
       filters:
         n_posts:
-          other: "{{count}} 則文章"
+          other: '{{count}} 則文章'
         cancel: "取消過濾"
       split_topic:
         title: "移至新討論話題"
@@ -1375,13 +1436,13 @@ zh_TW:
         topic_name: "新討論話題的名稱"
         error: "將討論話題移至新討論話題時發生錯誤。"
         instructions:
-          other: "你即將建立一個新討論話題，並填入 <b>{{count}}</b> 篇你已選擇的文章。"
+          other: 你即將建立一個新討論話題，並填入 <b>{{count}}</b> 篇你已選擇的文章。
       merge_topic:
         title: "移至已存在的討論話題"
         action: "移至已存在的討論話題"
         error: "將討論話題移至已存在的討論話題時發生錯誤。"
         instructions:
-          other: "請選擇你想將那 <b>{{count}}</b> 篇文章移至哪一個討論話題。"
+          other: 請選擇你想將那 <b>{{count}}</b> 篇文章移至哪一個討論話題。
       merge_posts:
         title: "合併選擇的帖子"
         action: "合併選擇的帖子"
@@ -1393,8 +1454,7 @@ zh_TW:
         label: "文章的新擁有者"
         placeholder: "新擁有者的用戶名稱"
         instructions:
-          other: "請選擇一位新用戶作為此 {{count}} 篇由 <b>{{old_user}}</b> 撰寫之文章的擁有者。"
-        instructions_warn: "注意，關於此篇文章的舊通知，並不會移轉到新用戶。<br>警告：目前所有與文章相關的資料都不會移轉至新用戶，請謹慎使用。"
+          other: 請選擇一位新用戶作為此 {{count}} 篇由 <b>{{old_user}}</b> 撰寫之文章的擁有者。
       change_timestamp:
         action: "變更時間戳記"
         invalid_timestamp: "時間戳記不能為將來的時刻。"
@@ -1410,8 +1470,6 @@ zh_TW:
         description:
           other: 你已選擇了 <b>{{count}}</b> 篇文章。
     post:
-      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
-      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "引用"
       edit_reason: "原因: "
       post_number: "文章 {{number}}"
@@ -1424,20 +1482,20 @@ zh_TW:
       show_full: "顯示所有文章"
       show_hidden: '觀看隱藏內容'
       deleted_by_author:
-        other: "( 文章已被作者撤回，除非被投訴，否則在 %{count} 小時內將自動刪除。)"
+        other: ( 文章已被作者撤回，除非被投訴，否則在 %{count} 小時內將自動刪除。)
       expand_collapse: "展開/收合"
       gap:
-        other: "檢視 {{count}} 則隱藏回應"
+        other: 檢視 {{count}} 則隱藏回應
       unread: "文章未讀"
       has_replies:
-        other: "{{count}} 個回覆"
+        other: '{{count}} 個回覆'
       has_likes:
-        other: "{{count}} 個讚"
+        other: '{{count}} 個讚'
       has_likes_title:
-        other: "{{count}} 個使用者對此文章讚好"
+        other: '{{count}} 個使用者對此文章讚好'
       has_likes_title_only_you: "你已按讚"
       has_likes_title_you:
-        other: "你和其他 {{count}} 人讚了該貼"
+        other: 你和其他 {{count}} 人讚了該貼
       errors:
         create: "抱歉，建立你的文章時發生錯誤，請再試一次。"
         edit: "抱歉，編輯你的文章時發生錯誤，請再試一次。"
@@ -1510,38 +1568,38 @@ zh_TW:
           vote: "你已在此文章投票支持"
         by_you_and_others:
           off_topic:
-            other: "你與其他 {{count}} 人已投訴此文章為離題內容"
+            other: 你與其他 {{count}} 人已投訴此文章為離題內容
           spam:
-            other: "你與其他 {{count}} 人已投訴此文章為垃圾內容"
+            other: 你與其他 {{count}} 人已投訴此文章為垃圾內容
           inappropriate:
-            other: "你與其他 {{count}} 人已投訴此文章為不當內容"
+            other: 你與其他 {{count}} 人已投訴此文章為不當內容
           notify_moderators:
-            other: "你與其他 {{count}} 人已投訴此文章請板主處理"
+            other: 你與其他 {{count}} 人已投訴此文章請板主處理
           notify_user:
-            other: "您和其他 {{count}} 人已送出訊息給這位用戶"
+            other: 您和其他 {{count}} 人已送出訊息給這位用戶
           bookmark:
-            other: "你與 {{count}} 個人將此文章加上書籤"
+            other: 你與 {{count}} 個人將此文章加上書籤
           like:
-            other: "你與其他 {{count}} 人對此按讚"
+            other: 你與其他 {{count}} 人對此按讚
           vote:
-            other: "你與其他 {{count}} 人已投票給此文章"
+            other: 你與其他 {{count}} 人已投票給此文章
         by_others:
           off_topic:
-            other: "{{count}} 人已投訴此文章為離題內容"
+            other: '{{count}} 人已投訴此文章為離題內容'
           spam:
-            other: "{{count}} 人已投訴此文章為垃圾內容"
+            other: '{{count}} 人已投訴此文章為垃圾內容'
           inappropriate:
-            other: "{{count}} 人已投訴此文章為不當內容"
+            other: '{{count}} 人已投訴此文章為不當內容'
           notify_moderators:
-            other: "{{count}} 人已投訴此文章請板主處理"
+            other: '{{count}} 人已投訴此文章請板主處理'
           notify_user:
-            other: "{{count}} 已送出訊息給這位用戶"
+            other: '{{count}} 已送出訊息給這位用戶'
           bookmark:
-            other: "{{count}} 個人將此文章加上書籤"
+            other: '{{count}} 個人將此文章加上書籤'
           like:
-            other: "{{count}} 人對此按讚"
+            other: '{{count}} 人對此按讚'
           vote:
-            other: "{{count}} 人已投票給此文章"
+            other: '{{count}} 人已投票給此文章'
       revisions:
         controls:
           first: "第一版"
@@ -1610,7 +1668,6 @@ zh_TW:
       email_in_allow_strangers: "接受非用戶的電郵"
       email_in_disabled: "\"用電子郵件張貼新的討論話題\"功能已被關閉。若要使用此功能，"
       email_in_disabled_click: '請啟用"email in"功能'
-      suppress_from_homepage: "不在首頁上顯示此分類。"
       show_subcategory_list: "在此分類中，將子分類顯示在主題上方。"
       all_topics_wiki: "新的主題預設為共筆。"
       allow_badges_label: "允許授予本分類的徽章"
@@ -1625,7 +1682,7 @@ zh_TW:
       notifications:
         watching:
           title: "關注"
-          description: "你將自動監看這些分類中的所有主題。每一個主題的每一個新帖，將通知你，還將顯示新回覆的數量。"
+          description: "你將自動關注這些分類中的所有主題。每一個主題的每一個新帖，將通知你，還將顯示新回覆的數量。"
         watching_first_post:
           title: "關注新的發文"
           description: "在這些分類裡面，只是每一個新主題的第一帖，才會通知你。"
@@ -1673,11 +1730,11 @@ zh_TW:
       custom_placeholder_notify_moderators: "讓我們知道您的意見，並請盡可能地提供相關連結和例子。"
       custom_message:
         at_least:
-          other: "輸入至少 {{count}} 個字元"
+          other: 輸入至少 {{count}} 個字元
         more:
-          other: "還差 {{count}} 個..."
+          other: 還差 {{count}} 個...
         left:
-          other: "剩餘 {{count}}"
+          other: 剩餘 {{count}}
     flagging_topic:
       title: "感謝幫助社群遠離邪惡！"
       action: "投訴討論話題"
@@ -1688,11 +1745,11 @@ zh_TW:
       links_title: "熱門連結"
       links_shown: "顯示更多連結..."
       clicks:
-        other: "%{count} 點擊"
+        other: '%{count} 點擊'
     post_links:
       about: "為本帖展開更多連結"
       title:
-        other: "%{count} 更多"
+        other: '%{count} 更多'
     topic_statuses:
       warning:
         help: "這是正式警告。"
@@ -1726,18 +1783,18 @@ zh_TW:
     original_post: "原始文章"
     views: "觀看"
     views_lowercase:
-      other: "觀看"
+      other: 觀看
     replies: "回覆"
     views_long:
-      other: "這個討論話題已經被檢視過 {{number}} 次"
+      other: 這個討論話題已經被檢視過 {{number}} 次
     activity: "活動"
     likes: "讚"
     likes_lowercase:
-      other: "個讚"
+      other: 個讚
     likes_long: "此討論話題收到了  {{number}}  個讚"
     users: "用戶"
     users_lowercase:
-      other: "用戶"
+      other: 用戶
     category_title: "分類"
     history: "歷史"
     changed_by: "作者 {{author}}"
@@ -1750,7 +1807,7 @@ zh_TW:
       latest:
         title: "最新"
         title_with_count:
-          other: "最新 ({{count}})"
+          other: 最新 ({{count}})
         help: "最近的討論話題"
       hot:
         title: "熱門"
@@ -1768,17 +1825,17 @@ zh_TW:
       unread:
         title: "未讀"
         title_with_count:
-          other: "未讀 ({{count}})"
+          other: 未讀 ({{count}})
         help: "你所關注或追蹤的討論話題有未讀文章"
         lower_title_with_count:
-          other: "{{count}} 個未讀"
+          other: '{{count}} 個未讀'
       new:
         lower_title_with_count:
-          other: "{{count}} 近期"
+          other: '{{count}} 近期'
         lower_title: "新話題"
         title: "新的"
         title_with_count:
-          other: "近期 ({{count}})"
+          other: 近期 ({{count}})
         help: "最近幾天建立的主題"
       posted:
         title: "我的文章"
@@ -1789,7 +1846,7 @@ zh_TW:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          other: "{{categoryName}} ({{count}})"
+          other: '{{categoryName}} ({{count}})'
         help: "{{categoryName}} 分類最近的討論話題"
       top:
         title: "精選"
@@ -1873,18 +1930,18 @@ zh_TW:
         print: '<b>ctrl</b>+<b>p</b> 打印主題'
     badges:
       earned_n_times:
-        other: "授予徽章 %{count} 次"
+        other: 授予徽章 %{count} 次
       granted_on: "授予於%{date}"
       others_count: "其他有該徽章的人（%{count}）"
       title: 徽章
       badge_count:
-        other: "%{count} 徽章"
+        other: '%{count} 徽章'
       more_badges:
-        other: "+%{count} 更多"
+        other: +%{count} 更多
       granted:
-        other: "%{count} 授予"
+        other: '%{count} 授予'
       select_badge_for_title: 選擇一個徽章作為你的頭銜使用
-      none: "<none>"
+      none: "(無)"
       badge_grouping:
         getting_started:
           name: 開始
@@ -1926,20 +1983,17 @@ zh_TW:
         untagged_with_category: "%{category}無標籤的%{filter}主題"
       notifications:
         watching:
-          title: "監看"
+          title: "關注"
           description: "你將自動監看該標籤中的所有主題。新帖子和新主題會通知你，再者未讀和新帖的數量也將顯示在主題旁邊。"
         watching_first_post:
           title: "關注新的發文"
-          description: "在這個標籤中，只是每一個新主題的第一帖，才會通知你。"
         tracking:
           title: "跟蹤"
-          description: "你將自動跟蹤這個標籤裡的所有主題。未讀和新帖的數量將顯示在主題旁邊。"
         regular:
           title: "普通"
           description: "如果有人@你或回覆你的帖子，將通知你。"
         muted:
           title: "靜音"
-          description: "在這個標籤中，你將不會收到新主題任何通知，它們也不會出現在你的未讀列表上面。"
       groups:
         title: "標籤組"
         about: "將標籤分組以便管理。"
@@ -2021,8 +2075,6 @@ zh_TW:
         reports:
           today: "今天"
           yesterday: "昨天"
-          last_7_days: "最近 7 天"
-          last_30_days: "最近 30 天"
           all_time: "所有時間"
           7_days_ago: "7 天前"
           30_days_ago: "30 天前"
@@ -2040,7 +2092,6 @@ zh_TW:
         title: "投訴"
         agree: "同意"
         agree_title: "確認此投訴為有效且正確"
-        defer_flag_title: "移除標記；不需處理。"
         delete: "刪除"
         delete_title: "刪除此標記文章。"
         delete_post_defer_flag_title: "刪除文章，如果刪除的是討論話題的第一則文章，討論話題也將一併刪除"
@@ -2069,13 +2120,14 @@ zh_TW:
         was_edited: "文章已在第一次標記後被編輯"
         previous_flags_count: "這篇文章已經被標記  {{count}} 次。"
       groups:
+        manage:
+          membership:
+            trust_levels_none: "無"
         primary: "主要群組"
         no_primary: "( 沒有主要群組 )"
         title: "群組"
         edit: "編輯群組"
         refresh: "重新整理"
-        new: "建立"
-        selector_placeholder: "輸入用戶名稱"
         about: "請在此編輯你的群組成員與名稱"
         group_members: "群組成員"
         delete: "刪除"
@@ -2083,21 +2135,10 @@ zh_TW:
         delete_failed: "無法刪除群組，自動建立的群組無法刪除。"
         delete_owner_confirm: "移除“%{username}”的權限？"
         add: "加入"
-        add_members: "新增成員"
         custom: "客製"
-        bulk_complete: "用戶已被添加到群組。"
-        bulk: "批量添加到群組"
-        bulk_paste: "粘貼用戶名郵件列表，一行一個："
-        bulk_select: "( 選擇一個群組 )"
         automatic: "自動建立"
-        automatic_membership_email_domains: "註冊的用戶的電子郵件地址網域，完全符合列表裡某項時，會自動加進這個群組裡："
-        automatic_membership_retroactive: "套用相同的電子郵件網域規則到已經註冊的用戶上："
-        default_title: "群組內所有成員的預設頭銜"
-        primary_group: "自動設定為主要群組"
         group_owners: 所有者
         add_owners: 添加所有者
-        incoming_email: "自定義進站電子郵件地址"
-        incoming_email_placeholder: "輸入郵箱地址"
       api:
         generate_master: "產生主 API 金鑰"
         none: "目前沒有啟用中的 API 金鑰。"
@@ -2160,9 +2201,9 @@ zh_TW:
           none: "沒有相關事件。"
           redeliver: "重新發送"
           incoming:
-            other: "有 {{count}} 個新事件。"
+            other: 有 {{count}} 個新事件。
           completed_in:
-            other: "在 {{count}} 秒內完成。"
+            other: 在 {{count}} 秒內完成。
           request: "請求"
           response: "回應"
           redeliver_confirm: "你確定要再次發送一樣的內容嗎？"
@@ -2213,7 +2254,6 @@ zh_TW:
           label: "上傳"
           title: "上傳備份"
           uploading: "上傳中..."
-          success: "'{{filename}}' 已成功被上載"
           error: "上載時發生問題： '{{filename}}': {{message}}"
         operations:
           is_running: "指令執行中..."
@@ -2226,7 +2266,6 @@ zh_TW:
             label: "備份"
             title: "新增備份"
             confirm: "你確定要新增備份嗎?"
-            without_uploads: "是 ( 不包含檔案 )"
           download:
             label: "下載"
           destroy:
@@ -2265,6 +2304,7 @@ zh_TW:
         new_style: "新增樣式"
         import: "匯入"
         delete: "刪除"
+        delete_confirm: "刪除這個佈景？"
         about: "修改網站的 CSS 和 HTML headers。請新增一個自定樣式來開始使用。"
         color: "顏色"
         opacity: "不透明度"
@@ -2277,6 +2317,9 @@ zh_TW:
           none_selected: "選擇一個電子郵件範本開始編輯"
           revert: "恢復變更"
           revert_confirm: "你確定要恢復這個變更?"
+        theme:
+          import_theme: "匯入佈景"
+          title: "佈景"
         colors:
           title: "顏色"
           long_title: "顏色樣式"
@@ -2446,6 +2489,7 @@ zh_TW:
             change_readonly_mode: "變更唯讀模式"
             backup_download: "下載備份"
             backup_destroy: "刪除備份"
+            disabled_second_factor: "停用兩步驟驗證"
         screened_emails:
           title: "過濾的電子郵件地址"
           description: "以下的電子郵件地址將無法用來建立新用戶。"
@@ -2478,6 +2522,8 @@ zh_TW:
             title: "如果有至少 'min_ban_entries_for_roll_up' 個記錄，建立一個子網域封鎖記錄"
         logster:
           title: "錯誤紀錄"
+      watched_words:
+        title: "已關注的文字"
       impersonate:
         title: "檢視角度"
         help: "使用此工具以用戶的檢視角度進行除錯。完成後將需登出。"
@@ -2500,9 +2546,9 @@ zh_TW:
           suspect: '嫌疑'
         approved: "已批准？"
         approved_selected:
-          other: "批准用戶 ({{count}})"
+          other: 批准用戶 ({{count}})
         reject_selected:
-          other: "拒絕用戶 ({{count}})"
+          other: 拒絕用戶 ({{count}})
         titles:
           active: '活躍的用戶'
           new: '新用戶'
@@ -2518,9 +2564,9 @@ zh_TW:
           suspended: '已停權的用戶'
           suspect: '嫌疑使用者'
         reject_successful:
-          other: "成功拒絕 %{count} 個用戶。"
+          other: 成功拒絕 %{count} 個用戶。
         reject_failures:
-          other: "無法拒絕 %{count} 個用戶"
+          other: 無法拒絕 %{count} 個用戶
         not_verified: "未確認"
         check_email:
           title: "顯示使用者 Email"
@@ -2561,6 +2607,7 @@ zh_TW:
         private_topics_count: 私人討論話題
         posts_read_count: 讀過的文章
         post_count: 已發表的文章
+        second_factor_enabled: 兩步驟驗證已啟用
         topics_entered: 讀過的討論話題
         flags_given_count: 投訴
         flags_received_count: 被投訴
@@ -2579,14 +2626,15 @@ zh_TW:
         delete_forbidden_because_staff: "管理員與板主不可刪除。"
         delete_posts_forbidden_because_staff: "無法刪除管理員和版主的所有帖子。"
         delete_forbidden:
-          other: "不能刪除擁有文章的用戶。請先刪除所有文章後才能刪除該用戶。( 發表超過 %{count} 天的文章不能刪除 )"
+          other: 不能刪除擁有文章的用戶。請先刪除所有文章後才能刪除該用戶。( 發表超過 %{count} 天的文章不能刪除 )
         cant_delete_all_posts:
-          other: "無法刪除所有的文章。有些文章時間早於 %{count} 天前。 ( 請見 delete_user_max_post_age 設定 )"
+          other: 無法刪除所有的文章。有些文章時間早於 %{count} 天前。 ( 請見 delete_user_max_post_age 設定 )
         cant_delete_all_too_many_posts:
-          other: "無法刪除所有文章，因為此用戶擁有超過 %{count} 篇文章。( delete_all_posts_max )"
+          other: 無法刪除所有文章，因為此用戶擁有超過 %{count} 篇文章。( delete_all_posts_max )
         delete_confirm: "你確定要刪除此用戶嗎? 此動作將不可復原!"
         delete_and_block: "刪除並且<b>封鎖</b>此電子郵件地址與 IP 位址"
         delete_dont_block: "只刪除"
+        deleting_user: "正在刪除使用者..."
         deleted: "此用戶已刪除。"
         delete_failed: "刪除此用戶時發生錯誤，請先刪除此用戶的所有文章後再試一次。"
         send_activation_email: "送出啟用帳號的電子郵件"
@@ -2618,7 +2666,7 @@ zh_TW:
         tl3_requirements:
           title: "信任等級 3 之條件"
           table_title:
-            other: "這最近 %{count} 天："
+            other: 這最近 %{count} 天：
           value_heading: "價值"
           requirement_heading: "要求"
           visits: "訪問"
@@ -2692,11 +2740,11 @@ zh_TW:
         go_back: "回到搜尋"
         recommended: "我們建議自定義以下文本以符合你的需求："
         show_overriden: '只顯示修改過的項目'
-      site_settings:
-        show_overriden: '只顯示修改過的項目'
-        title: '設定'
-        reset: '重設'
+      settings:
+        reset: '重置'
         none: '無'
+      site_settings:
+        title: '設定'
         no_results: "未找到任何結果。"
         clear_filter: "清除"
         add_url: "加入網址"
@@ -2718,6 +2766,7 @@ zh_TW:
           developer: '開發人員'
           embedding: "嵌入"
           legal: "法律"
+          api: 'API'
           user_api: '用戶 API'
           uncategorized: '其他'
           backups: "備份"
@@ -2745,11 +2794,11 @@ zh_TW:
         reason_help: (連結至文章或主題)
         save: 儲存
         delete: 刪除
-        delete_confirm: 你確定要刪除徽章 ?
+        delete_confirm: "你確定要刪除徽章 ?"
         revoke: 撤回
         reason: 原因
-        expand: '展開 &hellip; '
-        revoke_confirm: 你確定要撤回這個徽章?
+        expand: "展開 &hellip; "
+        revoke_confirm: "你確定要撤回這個徽章?"
         edit_badges: 編輯徽章
         grant_badge: 升級徽章
         granted_badges: 已升級的徽章
@@ -2763,7 +2812,6 @@ zh_TW:
         enabled: 啟用徽章
         icon: 圖示
         image: 圖片
-        icon_help: "使用 Font Awesome class 或者圖片的聯結"
         query: 徽章查詢語法 (SQL)
         target_posts: 查詢文章張貼目標
         auto_revoke: 每日執行撤銷用的 SQL 語法
@@ -2787,13 +2835,13 @@ zh_TW:
             text: "查詢結果沒有授予徽章的樣本；當查詢結果回傳的使用者 ID 或文章 ID 不存在時此問題有可能發生。如此可能會發生未預期的結果 ―― 請再次檢查您的 SQL 語法。"
           no_grant_count: "沒有指定徽章。"
           grant_count:
-            other: "指定了 <b>%{count}</b> 個徽章。"
+            other: 指定了 <b>%{count}</b> 個徽章。
           sample: "樣本："
           grant:
-            with: <span class="username">%{username}</span>
-            with_post: '<span class="username">%{username}</span> 的文章 %{link} '
-            with_post_time: <span class="username">%{username}</span> 的文章 %{link} 在 <span class="time">%{time}</span>
-            with_time: <span class="username">%{username}</span> 在 <span class="time">%{time}</span>
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span> 的文章 %{link} "
+            with_post_time: "<span class=\"username\">%{username}</span> 的文章 %{link} 在 <span class=\"time\">%{time}</span>"
+            with_time: "<span class=\"username\">%{username}</span> 在 <span class=\"time\">%{time}</span>"
       emoji:
         title: "Emoji"
         help: "新增新的emoji供所有人使用。(提示：一次拖放多個檔案)"
diff --git a/config/locales/names.yml b/config/locales/names.yml
index 6f15ab632d6..764cdff0a06 100644
--- a/config/locales/names.yml
+++ b/config/locales/names.yml
@@ -119,9 +119,6 @@ eo:
 es:
   name: Spanish
   nativeName: Español
-es_MX:
-  name: Spanish
-  nativeName: Español (MX)
 et:
   name: Estonian
   nativeName: eesti
@@ -439,7 +436,7 @@ sk:
   nativeName: slovenčina
 sl:
   name: Slovene
-  nativeName: slovenski jezik
+  nativeName: slovenščina
 sm:
   name: Samoan
   nativeName: gagana fa'a Samoa
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index d13bba2c1e3..5e5335b5af5 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -17,12 +17,12 @@ ar:
       date_only: "%-d %B %Y"
       long: "%-d %B %Y، %l:%M%P"
   date:
-    month_names: [null, يناير, فبراير, مارس, أبريل, مايو, يونيو, يوليو, أغسطس, سبتمبر, أكتوبر, نوفمبر, ديسمبر]
+    month_names: [~, يناير, فبراير, مارس, أبريل, مايو, يونيو, يوليو, أغسطس, سبتمبر, أكتوبر, نوفمبر, ديسمبر]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "ص"
     pm: "م"
-    <<: *datetime_formats
   title: "دسكورس"
   topics: "الموضوعات "
   posts: "المنشورات"
@@ -66,18 +66,18 @@ ar:
       present: يجب أن يكون فارغ.
       confirmation: "ليست مطابقة ل %{attribute}."
       empty: لا يمكن جعله فارغا.
-      equal_to: يجب أن تكون مساوي لـ %{count}
+      equal_to: "يجب أن تكون مساوي لـ %{count}"
       even: يجب أن يكون العدد زوجي.
       exclusion: محجوز.
-      greater_than: يجب أن تكون أكبر من %{count}
-      greater_than_or_equal_to: يجب أن تكون أكبر من أو تساوي %{count}
+      greater_than: "يجب أن تكون أكبر من %{count}"
+      greater_than_or_equal_to: "يجب أن تكون أكبر من أو تساوي %{count}"
       has_already_been_used: "مستخدم بالفعل "
       inclusion: غير متضمن في القائمة
       invalid: غير صالح
       is_invalid: "تبدو غير واضحة، هل هذه الجملة كاملة؟"
       contains_censored_words: "تحتوي الكلمات الآتية الخاضعة للرّقابة: %{censored_words}"
-      less_than: يجب أن يكون أقل من %{count}
-      less_than_or_equal_to: يجب أن تكون أقل من أو تساوي %{count}
+      less_than: "يجب أن يكون أقل من %{count}"
+      less_than_or_equal_to: "يجب أن تكون أقل من أو تساوي %{count}"
       not_a_number: ليس عدد
       not_an_integer: يجب أن يكون عدد صحيح
       odd: يجب أن يكون مفرد
@@ -86,36 +86,36 @@ ar:
         one: "لا يمكن حذف السجل لإعتماد سجل آخر عليه %{record} "
         many: "لا يمكن حذف السجل لاعتماده %{record} موجود"
       too_long:
-        zero: طويل جدا (الحد الأقصى بدون الحروف)
-        one: طويل جدا (الحد الأقصى حرف واحد)
-        two: طويل جدا (الحد الأقصى حرفين)
         few: طويل جدا (الحد الأقصى حروف قليلة)
         many: طويل جدا (الحد الأقصى %{count} حرفا)
+        one: طويل جدا (الحد الأقصى حرف واحد)
         other: طويل جدا (الحد الأقصى %{count} حرفا)
+        two: طويل جدا (الحد الأقصى حرفين)
+        zero: طويل جدا (الحد الأقصى بدون الحروف)
       too_short:
-        zero: قصير جدا (الحد الأدنى بدون حروف)
-        one: قصير جدا (الحد الأدنى حرف واحد)
-        two: قصير جدا (الحد الأدنى حرفين)
         few: قصير جدا (الحد الأدنى حروف قليلة)
         many: قصير جدا (الحد الأدنى حروف كثيرة)
+        one: قصير جدا (الحد الأدنى حرف واحد)
         other: قصير جدا (الحد الأدنى %{count} حروف)
+        two: قصير جدا (الحد الأدنى حرفين)
+        zero: قصير جدا (الحد الأدنى بدون حروف)
       wrong_length:
-        zero: طول خاطئ (يجب أن يكون بدون حروف)
-        one: طول خاطئ (يجب أن يكون حرف واحد)
-        two: طول خاطئ (يجب أن يكون حرفين)
         few: طول خاطئ (يجب أن يكون حروف قليلة)
         many: طول خاطئ (يجب أن يكون حروف كثيرة)
+        one: طول خاطئ (يجب أن يكون حرف واحد)
         other: طول خاطئ (يجب أن يكون %{count} حروف)
+        two: طول خاطئ (يجب أن يكون حرفين)
+        zero: طول خاطئ (يجب أن يكون بدون حروف)
       other_than: "يجب أن تكون غير %{count}"
     template:
       body: 'حدثت مشاكل بالحقول الآتية:'
       header:
-        zero: لا أخطاء تمنع هذا %{model} من الحفظ
-        one: خطأ واحد منع هذا %{model} من الحفظ
-        two: خطأن منعا هذا %{model} من الحفظ
         few: أخطاء قليل تمنع هذا %{model} من الحفظ
         many: أخطاء كثيرة تمنع هذا %{model} من الحفظ
+        one: خطأ واحد منع هذا %{model} من الحفظ
         other: '%{count} أخطاء منعت هذا %{model} من الحفظ'
+        two: خطأن منعا هذا %{model} من الحفظ
+        zero: لا أخطاء تمنع هذا %{model} من الحفظ
     embed:
       load_from_remote: "حدث عطل أثناء تحميل هذا المنشور."
     site_settings:
@@ -125,6 +125,9 @@ ar:
       max_username_length_range: "لا يمكن أن تكون القيمة العليا أصغر من الدنيا."
       default_categories_already_selected: "لا يمكنك اختيار قسم يستخدم في قائمة أخرى."
       s3_upload_bucket_is_required: "لا يمكنك تفعيل الرفع إلى S3 حتّى توفّر 's3_upload_bucket'."
+  activemodel:
+    errors:
+      <<: *errors
   invite:
     not_found: "نموذج الدعوة الخاص بك ليس صالحاً. رجاء اتصل بمدير الموقع."
   bulk_invite:
@@ -144,76 +147,75 @@ ar:
   reading_time: "وقت القراءة"
   likes: "الإعجابات"
   too_many_replies:
-    zero: "يمكن للأعضاء الجدد الرد كما يحلو لهم في كل موضوع."
-    one: "آسفون، فلا يمكن للأعضاء الجدد سوى الرد مرة واحدة في نفس الموضوع."
-    two: "آسفون، فلا يمكن للأعضاء الجدد سوى الرد مرتين في نفس الموضوع."
-    few: "آسفون، فلا يمكن للأعضاء الجدد سوى الرد %{count} مرات في نفس الموضوع."
-    many: "آسفون، فلا يمكن للأعضاء الجدد سوى الرد %{count} مرة في نفس الموضوع."
-    other: "آسفون، فلا يمكن للأعضاء الجدد سوى الرد %{count} مرة في نفس الموضوع."
+    few: آسفون، فلا يمكن للأعضاء الجدد سوى الرد %{count} مرات في نفس الموضوع.
+    many: آسفون، فلا يمكن للأعضاء الجدد سوى الرد %{count} مرة في نفس الموضوع.
+    one: آسفون، فلا يمكن للأعضاء الجدد سوى الرد مرة واحدة في نفس الموضوع.
+    other: آسفون، فلا يمكن للأعضاء الجدد سوى الرد %{count} مرة في نفس الموضوع.
+    two: آسفون، فلا يمكن للأعضاء الجدد سوى الرد مرتين في نفس الموضوع.
+    zero: يمكن للأعضاء الجدد الرد كما يحلو لهم في كل موضوع.
   embed:
     start_discussion: "ابدأ النّقاش"
     continue: "تابع النّقاش"
     error: "خطأ في التضمين"
     referer: "المرجع:"
     more_replies:
-      zero: "لا ردود أخرى"
-      one: "رد واحد آخر"
-      two: "ردّان آخران"
-      few: "%{count} ردود أخرى"
-      many: "%{count} ردا آخر"
-      other: "%{count} رد آخر"
+      few: '%{count} ردود أخرى'
+      many: '%{count} ردا آخر'
+      one: رد واحد آخر
+      other: '%{count} رد آخر'
+      two: ردّان آخران
+      zero: لا ردود أخرى
     loading: "يحمّل النّقاش..."
     permalink: "الرابط الثابت"
     imported_from: "هذا موضوع نقاش مصاحب للمدخل الأصلي على %{link}"
     in_reply_to: "◀ %{username}"
     replies:
-      zero: "لا ردود"
-      one: "رد واحد"
-      two: "ردّان"
-      few: "%{count} ردود"
-      many: "%{count} ردا"
-      other: "%{count} رد"
+      few: '%{count} ردود'
+      many: '%{count} ردا'
+      one: رد واحد
+      other: '%{count} رد'
+      two: ردّان
+      zero: لا ردود
   no_mentions_allowed: "نأسف، لا يمكنك الإشارة إلى الغير."
   too_many_mentions:
-    zero: "عذرا، لا يمكنك الإشارة إلى أحد في كلّ مشاركة."
-    one: "عذرا، يمكنك الإشارة إلى عضو واحد فقط في كل منشور."
-    two: "نأسف، يمكنك الإشارة إلى مستخدمين فقط في كلّ مشاركة."
-    few: "نأسف، يمكنك الإشارة إلى %{count} مستخدمين فقط في كلّ مشاركة."
-    many: "نأسف، يمكنك الإشارة إلى %{count} مستخدمًا فقط في كلّ مشاركة."
-    other: "عذرا، يمكنك الإشارة إلى %{count} عضو فقط في كل منشور."
+    few: نأسف، يمكنك الإشارة إلى %{count} مستخدمين فقط في كلّ مشاركة.
+    many: نأسف، يمكنك الإشارة إلى %{count} مستخدمًا فقط في كلّ مشاركة.
+    one: عذرا، يمكنك الإشارة إلى عضو واحد فقط في كل منشور.
+    other: عذرا، يمكنك الإشارة إلى %{count} عضو فقط في كل منشور.
+    two: نأسف، يمكنك الإشارة إلى مستخدمين فقط في كلّ مشاركة.
+    zero: عذرا، لا يمكنك الإشارة إلى أحد في كلّ مشاركة.
   no_mentions_allowed_newuser: "نأسف، لا يمكن للمستخدمين الجدد الإشارة إلى الغير."
   too_many_mentions_newuser:
-    zero: "عذرا ، المستخدمون الجدد بامكانهم فقط تنبيه %{count} عضو في المشاركة ."
-    one: "عذرا ، الاعضاء الجدد بامكانهم فقط الإشارة إلي عضو واحد فقط في المنشور."
-    two: "عذرا ، المستخدمون الجدد بامكانهم فقط تنبيه %{count} عضوين فقط في المشاركة ."
-    few: "عذرا ، المستخدمون الجدد بامكانهم فقط تنبيه %{count} أعضاء في المشاركة ."
-    many: "عذرا ، المستخدمون الجدد بامكانهم فقط تنبيه %{count} عضو في المشاركة ."
-    other: "عذرا ، الاعضاء الجدد بامكانهم فقط الإشارة إلي %{count} عضو في المنشور."
+    few: عذرا ، المستخدمون الجدد بامكانهم فقط تنبيه %{count} أعضاء في المشاركة .
+    many: عذرا ، المستخدمون الجدد بامكانهم فقط تنبيه %{count} عضو في المشاركة .
+    one: عذرا ، الاعضاء الجدد بامكانهم فقط الإشارة إلي عضو واحد فقط في المنشور.
+    other: عذرا ، الاعضاء الجدد بامكانهم فقط الإشارة إلي %{count} عضو في المنشور.
+    two: عذرا ، المستخدمون الجدد بامكانهم فقط تنبيه %{count} عضوين فقط في المشاركة .
+    zero: عذرا ، المستخدمون الجدد بامكانهم فقط تنبيه %{count} عضو في المشاركة .
   no_images_allowed: "عذرا، لا يمكن للأعضاء الجدد وضع صور في المنشور."
   too_many_images:
-    zero: "يمكن للمستخدمين الجدد وضع أيّ عدد من الصور في أي منشور."
-    one: "عذرا، يمكن للأعضاء الجدد وضع صورة واحدة فقط في كل منشور."
-    two: "آسفون، يمكن للمستخدمين الجدد وضع صورتين فقط في كل منشور."
-    few: "آسفون، يمكن للمستخدمين الجدد وضع %{count} صور فقط في كل منشور."
-    many: "آسفون، يمكن للمستخدمين الجدد وضع %{count} صورة فقط في كل منشور."
-    other: "عذرا، يمكن للأعضاء الجدد وضع %{count} صورة فقط في كل منشور."
+    few: آسفون، يمكن للمستخدمين الجدد وضع %{count} صور فقط في كل منشور.
+    many: آسفون، يمكن للمستخدمين الجدد وضع %{count} صورة فقط في كل منشور.
+    one: عذرا، يمكن للأعضاء الجدد وضع صورة واحدة فقط في كل منشور.
+    other: عذرا، يمكن للأعضاء الجدد وضع %{count} صورة فقط في كل منشور.
+    two: آسفون، يمكن للمستخدمين الجدد وضع صورتين فقط في كل منشور.
+    zero: يمكن للمستخدمين الجدد وضع أيّ عدد من الصور في أي منشور.
   no_attachments_allowed: "عذرا، لا يمكن للأعضاء الجدد إرفاق ملفات في المنشورات."
   too_many_attachments:
-    zero: "عذرا، يمكن للأعضاء الجدد إرفاق %{count} ملف فقط إلى كل منشور."
-    one: "عذرا، يمكن للأعضاء الجدد إرفاق ملف واحد فقط في كل منشور."
-    two: "آسفون، يمكن للمستخدمين الجدد إرفاق ملفين فقط إلى كل منشور."
-    few: "آسفون، يمكن للمستخدمين الجدد إرفاق %{count} ملفات فقط إلى كل منشور."
-    many: "آسفون، يمكن للمستخدمين الجدد إرفاق %{count} ملفا فقط إلى كل منشور."
-    other: "عذرا، يمكن للأعضاء الجدد إرفاق %{count} ملف فقط في كل منشور."
+    few: آسفون، يمكن للمستخدمين الجدد إرفاق %{count} ملفات فقط إلى كل منشور.
+    many: آسفون، يمكن للمستخدمين الجدد إرفاق %{count} ملفا فقط إلى كل منشور.
+    one: عذرا، يمكن للأعضاء الجدد إرفاق ملف واحد فقط في كل منشور.
+    other: عذرا، يمكن للأعضاء الجدد إرفاق %{count} ملف فقط في كل منشور.
+    two: آسفون، يمكن للمستخدمين الجدد إرفاق ملفين فقط إلى كل منشور.
+    zero: عذرا، يمكن للأعضاء الجدد إرفاق %{count} ملف فقط إلى كل منشور.
   no_links_allowed: "عذرا، لا يمكن للأعضاء الجدد وضع روابط في المنشورات."
   too_many_links:
-    zero: "يمكن للمستخدمين الجدد وضع أيّ عدد من الروابط في أي منشور."
-    one: "عذرا، يمكن الأعضاء الجدد وضع رابطا واحدا فقط في كل منشور."
-    two: "آسفون، يمكن للمستخدمين الجدد وضع رابطين فقط في كل منشور."
-    few: "آسفون، يمكن للمستخدمين الجدد وضع %{count} روابط فقط في كل منشور."
-    many: "آسفون، يمكن للمستخدمين الجدد وضع %{count} رابطا فقط في كل منشور."
-    other: "عذرا، يمكن للأعضاء الجدد وضع %{count} رابط فقط في كل منشور."
-  contains_blocked_words: "المنشور الخاص بك يحتوي علي كلمات غير مسموح بها."
+    few: آسفون، يمكن للمستخدمين الجدد وضع %{count} روابط فقط في كل منشور.
+    many: آسفون، يمكن للمستخدمين الجدد وضع %{count} رابطا فقط في كل منشور.
+    one: عذرا، يمكن الأعضاء الجدد وضع رابطا واحدا فقط في كل منشور.
+    other: عذرا، يمكن للأعضاء الجدد وضع %{count} رابط فقط في كل منشور.
+    two: آسفون، يمكن للمستخدمين الجدد وضع رابطين فقط في كل منشور.
+    zero: يمكن للمستخدمين الجدد وضع أيّ عدد من الروابط في أي منشور.
   spamming_host: "عذرا، لا يمكنك نشر رابط لهذا العنوان."
   user_is_suspended: "غير مسموح للأعضاء المعلّقة عضويتهم النشر."
   topic_not_found: "حدث خطب ما. قد يكون الموضوع أُغلق أو حُذف وأنت تشاهده؟"
@@ -238,7 +240,6 @@ ar:
     hot: "مواضيع نَشطة"
     top: "مواضيع مميزة"
     posts: "اخر المنشورات"
-    private_posts: "الرسائل الخاصة الآخيرة"
     group_posts: "احدث المنشورات من %{group_name} "
     group_mentions: "احدث التذكيرات من %{group_name} "
     user_posts: "احدث المنشورات من %{username} "
@@ -250,7 +251,6 @@ ar:
   groups:
     errors:
       can_not_modify_automatic: "لا يمكنك تعديل مجموعة تم انشائها تلقائيا"
-      member_already_exist: " '%{username}' هو عضو في هذه المجموعة بالفعل."
       invalid_domain: "'%{domain}' ليس نطاقا صالحا."
       invalid_incoming_email: "'%{email_in}' ليس عنوان بريد الكتروني صالح ."
       email_already_used_in_group: "'%{email}' مستخدم من قبل المجموعه '%{group_name}'. "
@@ -267,13 +267,13 @@ ar:
       trust_level_4: "مستوى_الثقة_4"
   education:
     until_posts:
-      zero: "لا مشاركات"
-      one: "منشور واحد"
-      two: "مشاركتان"
-      few: "%{count} مشاركات"
-      many: "%{count} مشاركة"
-      other: "%{count} منشور"
-    new-topic: |
+      few: '%{count} مشاركات'
+      many: '%{count} مشاركة'
+      one: منشور واحد
+      other: '%{count} منشور'
+      two: مشاركتان
+      zero: لا مشاركات
+    'new-topic': |
       مرحبا بك في %{site_name} &mdash; **شكرا لك لأجل بدء محادثه جديدة!**
 
       هل يبدو عنوان الموضوع مثيرا للإهتمام إذا قراتة بصوت عال؟ العنوان ملخص هام جدا؟
@@ -283,7 +283,7 @@ ar:
       -  استخدم أكثر الكلمات الشائعة في موضوعك بحيث يمكن للآخرين أن * يجدوها*  لاضافة موضوعك مع المواضيع ذات الصلة، حدد قسم الموضوع.
 
       لمعلومات أكثر ، [انظر مبادئ المجتمع](/guidelines). هذا الاعلان سيظهر لك لأول مرة %{education_posts_text}.
-    new-reply: |
+    'new-reply': |
       مرحباً بك في %{site_name} &mdash; **شكراً لمشاركتك**!
 
       -هل يُحسن ردّك المحادثة في جانب معين؟
@@ -333,13 +333,12 @@ ar:
       user_profile:
         bio_raw: "معلومات عنّي"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "يمكنك إرفاق التحذيرات إلى الرسائل الخاصة فقط."
               too_many_users: "يمكنك إرسال التحذيرات إلى مستخدم واحد كل مرة."
-              cant_send_pm: "نأسف، لا يمكنك إرسال رسالة خاصّة إلى هذا المستخدم."
               no_user_selected: "عليك تحديد مستخدم صالح."
             featured_link:
               invalid_category: "لا يمكن التعديل في هذا القسم"
@@ -363,7 +362,6 @@ ar:
           attributes:
             payload_url:
               invalid: "رابط غير صالح. يجب أن يحتوي الرابط على http://  او https://. المساحة الفارغة غير مسموح بها."
-      <<: *errors
   user_profile:
     no_info_other: "<div class='missing-profile'>%{name} لم يدخلوا أي شيء في مجال المعلومات عني لملفهم بعد</div>"
   vip_category_name: "استراحة"
@@ -379,21 +377,21 @@ ar:
     title: "مرحبا بك في الاستراحة"
     body: |2
 
-      تهانينا! :confetti_ball:
+        تهانينا! :confetti_ball:
 
-      إذا تمكنت من رؤية هذا الموضوع, فقد تم ترقيتك مؤخرا  لـمستوي**منتظم** (مستوى الثقة 3).
+        إذا تمكنت من رؤية هذا الموضوع, فقد تم ترقيتك مؤخرا  لـمستوي**منتظم** (مستوى الثقة 3).
 
-      انت الأن تستطيع &hellip
+        انت الأن تستطيع &hellip
 
-      * تعديل العنوان لأي موضوع.
-      * تغيير القسم لأي موضوع.
-      * جميع الروابط التي تضعها تُأرشف من قبل محركات البحث ( خيار [automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) غير مفعل).
-      * الوصول لقسم خاص للأعضاء بمستوى الثقة 3 أو أعلى.
-      * إخفاء رسائل السبام ببلاغ واحد.
+        * تعديل العنوان لأي موضوع.
+        * تغيير القسم لأي موضوع.
+        * جميع الروابط التي تضعها تُأرشف من قبل محركات البحث ( خيار [automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) غير مفعل).
+        * الوصول لقسم خاص للأعضاء بمستوى الثقة 3 أو أعلى.
+        * إخفاء رسائل السبام ببلاغ واحد.
 
-      من هنا [القائمة الحالية للأعضاء بمستوي متابع منتظم](/badges/3/regular).
+        من هنا [القائمة الحالية للأعضاء بمستوي متابع منتظم](/badges/3/regular).
 
-      شكرا لكونك جزءً هاما من هذا المجتمع!
+        شكرا لكونك جزءً هاما من هذا المجتمع!
   category:
     topic_prefix: "عن القسم %{category}."
     replace_paragraph: "(قم بإستبدال هذة الفقرة بوصف مختصر للقسم الجديد. هذا الوصف سوف يظهر في منطقة إختيار القسم, لذا حاول ان يكون اقل من 200 حرف. ** حتي تقوم بتعديل هذا الوصف أو تقوم بإضافة موضوعات, هذا القسم لن يظهر في صفحة الأقسام**)"
@@ -410,12 +408,12 @@ ar:
       uncategorized: "لا يمكن حذف قسم  \"غير مصنف\""
       has_subcategories: "لا يمكن حذف هذا القسم لأن له أقسام فرعيّة."
       topic_exists:
-        zero: "لا يمكنك حذف هذه الفئة ﻷنها لا تملك موضوع.أقدم موضوع هو %{topic_link}."
-        one: "لا يمكنك حذف هذه الفئة ﻷن لها موضوع واحد.أقدم موضوع هو %{topic_link}."
-        two: "لا يمكنك حذف هذه الفئة ﻷن لها موضوعان.أقدم موضوع هو %{topic_link}."
-        few: "لا يمكنك حذف هذه الفئة ﻷن لها مواضيع قليلة.أقدم موضوع هو %{topic_link}."
-        many: "لا يمكنك حذف هذه الفئة ﻷن لها مواضيع كثيرة.أقدم موضوع هو %{topic_link}."
-        other: "لا يمكنك حذف هذا القسم ﻷن به %{count} موضوع. أقدم موضوع هو %{topic_link}."
+        few: لا يمكنك حذف هذه الفئة ﻷن لها مواضيع قليلة.أقدم موضوع هو %{topic_link}.
+        many: لا يمكنك حذف هذه الفئة ﻷن لها مواضيع كثيرة.أقدم موضوع هو %{topic_link}.
+        one: لا يمكنك حذف هذه الفئة ﻷن لها موضوع واحد.أقدم موضوع هو %{topic_link}.
+        other: لا يمكنك حذف هذا القسم ﻷن به %{count} موضوع. أقدم موضوع هو %{topic_link}.
+        two: لا يمكنك حذف هذه الفئة ﻷن لها موضوعان.أقدم موضوع هو %{topic_link}.
+        zero: لا يمكنك حذف هذه الفئة ﻷنها لا تملك موضوع.أقدم موضوع هو %{topic_link}.
       topic_exists_no_oldest: "لا يمكن حذف هذا القسم لأن عدد الموضوعات به هو %{count}."
     uncategorized_description: "الموضوعات التي لا تحتاج الي ان تصنف تحت قسم معين, او لا تندرج تحت الأقسام الأخري."
   trust_levels:
@@ -431,201 +429,186 @@ ar:
       title: "قائد"
     change_failed_explanation: "حاولت تخفيض رتبة %{user_name} إلى '%{new_trust_level}'. أيضا مستوى الثقة لهم حاليا '%{current_trust_level}'. %{user_name} سيبقى في '%{current_trust_level}' - إذا رغبت في تخفيض رتبة عضو أنظر لمستوى الثقة أولاً."
   rate_limiter:
-    slow_down: "لقد قمت بهذا الإجراء عدّة مرات. فحاول مجددا لاحقا."
-    too_many_requests: "لدينا حد يومي لعدد المرات التي يمكن للعمل أن ينجز بها. رجاءا انتظر %{time_left} قبل المحاولة مجدداً."
-    by_type:
-      first_day_replies_per_day: "لقد وصلت للعدد الأقصى للردود التي يمكن  للعضو الجديد إنشائها في يومهم الأول. رجاء انتظر %{time_left} قبل المحاولة مجددا."
-      first_day_topics_per_day: "لقد وصلت للعدد الأقصى للمواضيع التي يمكن  للعضو الجديد إنشائها في يومهم الأول. رجاء انتظر %{time_left} قبل المحاولة مجددا."
-      create_topic: "أنت تنشأ مواضيع بسرعة عالية. رجاء انتظر %{time_left} قبل المحاولة مجددا."
-      create_post: "أنت ترد بسرعة عالية. رجاء انتظر %{time_left} قبل المحاولة مجددا."
-      delete_post: "أنت تقوم بمسح المنشورات بسرعه عاليه . الرجاء الانتظار  %{time_left} قبل المحاوله مجدداً"
-      topics_per_day: "لقد وصلت للعدد الأقصى للمواضيع الجديدة اليوم. رجاء انتظر %{time_left} قبل المحاولة مجددا."
-      pms_per_day: "لقد وصلت للعدد الأقصى للرسائل اليوم. رجاء انتظر %{time_left} قبل المحاولة مجددا."
-      create_like: "لقد وصلت للعدد الأقصى للإعجابات اليوم. رجاء انتظر %{time_left} قبل المحاولة مجددا."
-      create_bookmark: "لقد وصلت للعدد الأقصى للعلامات المرجعية اليوم. رجاء انتظر %{time_left} قبل المحاولة مجددا."
-      live_post_counts: "أنت تطلب تعداد حى للمنشورات بسرعه عاليه . الرجاء الانتظار  %{time_left} قبل المحاوله مجدداً"
-      unsubscribe_via_email: "لقد وصلت للحد الأقصى من الغاء الاشتراكات عبر البريد الالكترونى اليوم. رجاء الانتظار %{time_left} قبل المحاولة مجددا."
-      topic_invitations_per_day: "لقد وصلت للحد الأقصى للدعوة للمواضيع اليوم. رجاء الانتظار %{time_left} قبل المحاولة مجددا."
     hours:
-      zero: "أقلّ من ساعة"
-      one: "ساعة واحدة"
-      two: "ساعتان"
-      few: "%{count} ساعات"
-      many: "%{count} ساعة"
-      other: "%{count} ساعة"
+      few: '%{count} ساعات'
+      many: '%{count} ساعة'
+      one: ساعة واحدة
+      other: '%{count} ساعة'
+      two: ساعتان
+      zero: أقلّ من ساعة
     minutes:
-      zero: "أقلّ من دقيقة"
-      one: "دقيقة واحدة"
-      two: "دقيقتان"
-      few: "%{count} دقائق"
-      many: "%{count} دقيقة"
-      other: "%{count} دقيقة"
+      few: '%{count} دقائق'
+      many: '%{count} دقيقة'
+      one: دقيقة واحدة
+      other: '%{count} دقيقة'
+      two: دقيقتان
+      zero: أقلّ من دقيقة
     seconds:
-      zero: "أقلّ من ثانية"
-      one: "ثانية واحدة"
-      two: "ثانيتان"
-      few: "%{count} ثوان"
-      many: "%{count} ثانية"
-      other: "%{count} ثانية"
+      few: '%{count} ثوان'
+      many: '%{count} ثانية'
+      one: ثانية واحدة
+      other: '%{count} ثانية'
+      two: ثانيتان
+      zero: أقلّ من ثانية
   datetime:
     distance_in_words:
       half_a_minute: "< 1دق"
       less_than_x_seconds:
-        zero: "< %{count}ثا"
-        one: "< %{count}ثا"
-        two: "< %{count}ثا"
-        few: "< %{count}ثا"
-        many: "< %{count}ثا"
-        other: "< %{count}ثا"
+        few: < %{count}ثا
+        many: < %{count}ثا
+        one: < %{count}ثا
+        other: < %{count}ثا
+        two: < %{count}ثا
+        zero: < %{count}ثا
       x_seconds:
-        zero: "%{count}ثا"
-        one: "%{count}ثا"
-        two: "%{count}ثا"
-        few: "%{count}ثا"
-        many: "%{count}ثا"
-        other: "%{count}ثا"
+        few: '%{count}ثا'
+        many: '%{count}ثا'
+        one: '%{count}ثا'
+        other: '%{count}ثا'
+        two: '%{count}ثا'
+        zero: '%{count}ثا'
       less_than_x_minutes:
-        zero: "< %{count}دق"
-        one: "< %{count}دق"
-        two: "< %{count}دق"
-        few: "< %{count}دق"
-        many: "< %{count}دق"
-        other: "< %{count}دق"
+        few: < %{count}دق
+        many: < %{count}دق
+        one: < %{count}دق
+        other: < %{count}دق
+        two: < %{count}دق
+        zero: < %{count}دق
       x_minutes:
-        zero: "%{count}دق"
-        one: "%{count}دق"
-        two: "%{count}دق"
-        few: "%{count}دق"
-        many: "%{count}دق"
-        other: "%{count}دق"
+        few: '%{count}دق'
+        many: '%{count}دق'
+        one: '%{count}دق'
+        other: '%{count}دق'
+        two: '%{count}دق'
+        zero: '%{count}دق'
       about_x_hours:
-        zero: "%{count}سا"
-        one: "%{count}سا"
-        two: "%{count}سا"
-        few: "%{count}سا"
-        many: "%{count}سا"
-        other: "%{count}سا"
+        few: '%{count}سا'
+        many: '%{count}سا'
+        one: '%{count}سا'
+        other: '%{count}سا'
+        two: '%{count}سا'
+        zero: '%{count}سا'
       x_days:
-        zero: "%{count}يوم"
-        one: "%{count}يوم"
-        two: "%{count}يوم"
-        few: "%{count}يوم"
-        many: "%{count}يوم"
-        other: "%{count}يوم"
+        few: '%{count}يوم'
+        many: '%{count}يوم'
+        one: '%{count}يوم'
+        other: '%{count}يوم'
+        two: '%{count}يوم'
+        zero: '%{count}يوم'
       about_x_months:
-        zero: "%{count}شهر"
-        one: "%{count}شهر"
-        two: "%{count}شهر"
-        few: "%{count}شهر"
-        many: "%{count}شهر"
-        other: "%{count}شهر"
+        few: '%{count}شهر'
+        many: '%{count}شهر'
+        one: '%{count}شهر'
+        other: '%{count}شهر'
+        two: '%{count}شهر'
+        zero: '%{count}شهر'
       x_months:
-        zero: "%{count}شهر"
-        one: "%{count}شهر"
-        two: "%{count}شهر"
-        few: "%{count}شهر"
-        many: "%{count}شهر"
-        other: "%{count}شهر"
+        few: '%{count}شهر'
+        many: '%{count}شهر'
+        one: '%{count}شهر'
+        other: '%{count}شهر'
+        two: '%{count}شهر'
+        zero: '%{count}شهر'
       about_x_years:
-        zero: "%{count}عام"
-        one: "%{count}عام"
-        two: "%{count}عام"
-        few: "%{count}عام"
-        many: "%{count}عام"
-        other: "%{count}عام"
+        few: '%{count}عام'
+        many: '%{count}عام'
+        one: '%{count}عام'
+        other: '%{count}عام'
+        two: '%{count}عام'
+        zero: '%{count}عام'
       over_x_years:
-        zero: "> %{count}عام"
-        one: "> %{count}عام"
-        two: "> %{count}عام"
-        few: "> %{count}عام"
-        many: "> %{count}عام"
-        other: "> %{count}عام"
+        few: '> %{count}عام'
+        many: '> %{count}عام'
+        one: '> %{count}عام'
+        other: '> %{count}عام'
+        two: '> %{count}عام'
+        zero: '> %{count}عام'
       almost_x_years:
-        zero: "%{count}عام"
-        one: "%{count}عام"
-        two: "%{count}عام"
-        few: "%{count}عام"
-        many: "%{count}عام"
-        other: "%{count}عام"
+        few: '%{count}عام'
+        many: '%{count}عام'
+        one: '%{count}عام'
+        other: '%{count}عام'
+        two: '%{count}عام'
+        zero: '%{count}عام'
     distance_in_words_verbose:
       half_a_minute: "منذ لحظات"
       less_than_x_seconds:
-        zero: "منذ لحظات"
-        one: "منذ لحظات"
-        two: "منذ لحظات"
-        few: "منذ لحظات"
-        many: "منذ لحظات"
-        other: "منذ لحظات"
+        few: منذ لحظات
+        many: منذ لحظات
+        one: منذ لحظات
+        other: منذ لحظات
+        two: منذ لحظات
+        zero: منذ لحظات
       x_seconds:
-        zero: "قبل لحظات"
-        one: "قبل ثانية واحدة"
-        two: "قبل ثانيتين"
-        few: "قبل %{count} ثوان"
-        many: "قبل %{count} ثانية"
-        other: "قبل %{count} ثانية"
+        few: قبل %{count} ثوان
+        many: قبل %{count} ثانية
+        one: قبل ثانية واحدة
+        other: قبل %{count} ثانية
+        two: قبل ثانيتين
+        zero: قبل لحظات
       less_than_x_minutes:
-        zero: "قبل لحظات"
-        one: "قبل أقل من دقيقة"
-        two: "قبل أقل من دقيقتين"
-        few: "قبل أقل من %{count} دقائق"
-        many: "قبل أقل من %{count} دقيقة"
-        other: "قبل أقل من %{count} دقيقة"
+        few: قبل أقل من %{count} دقائق
+        many: قبل أقل من %{count} دقيقة
+        one: قبل أقل من دقيقة
+        other: قبل أقل من %{count} دقيقة
+        two: قبل أقل من دقيقتين
+        zero: قبل لحظات
       x_minutes:
-        zero: "قبل أقل من دقيقة"
-        one: "قبل دقيقة واحدة"
-        two: "قبل دقيقتين"
-        few: "قبل %{count} دقائق"
-        many: "قبل %{count} دقيقة"
-        other: "قبل %{count} دقيقة"
+        few: قبل %{count} دقائق
+        many: قبل %{count} دقيقة
+        one: قبل دقيقة واحدة
+        other: قبل %{count} دقيقة
+        two: قبل دقيقتين
+        zero: قبل أقل من دقيقة
       about_x_hours:
-        zero: "قبل أقل من ساعة"
-        one: "قبل ساعة واحدة"
-        two: "قبل ساعتين"
-        few: "قبل %{count} ساعات"
-        many: "قبل %{count} ساعة"
-        other: "قبل %{count} ساعة"
+        few: قبل %{count} ساعات
+        many: قبل %{count} ساعة
+        one: قبل ساعة واحدة
+        other: قبل %{count} ساعة
+        two: قبل ساعتين
+        zero: قبل أقل من ساعة
       x_days:
-        zero: "قبل أقل من يوم"
-        one: "قبل يوم واحد"
-        two: "قبل يومين"
-        few: "قبل %{count} أيام"
-        many: "قبل %{count} يوما"
-        other: "قبل %{count} يوم"
+        few: قبل %{count} أيام
+        many: قبل %{count} يوما
+        one: قبل يوم واحد
+        other: قبل %{count} يوم
+        two: قبل يومين
+        zero: قبل أقل من يوم
       about_x_months:
-        zero: "قبل حوالي أقل من شهر"
-        one: "قبل حوالي شهر واحد"
-        two: "قبل حوالي شهرين"
-        few: "قبل حوالي %{count} أشهر"
-        many: "قبل حوالي %{count} شهرا"
-        other: "قبل حوالي %{count} شهر"
+        few: قبل حوالي %{count} أشهر
+        many: قبل حوالي %{count} شهرا
+        one: قبل حوالي شهر واحد
+        other: قبل حوالي %{count} شهر
+        two: قبل حوالي شهرين
+        zero: قبل حوالي أقل من شهر
       x_months:
-        zero: "قبل أقل من شهر"
-        one: "قبل شهر واحد"
-        two: "قبل شهرين"
-        few: "قبل %{count} أشهر"
-        many: "قبل %{count} شهرا"
-        other: "قبل %{count} شهر"
+        few: قبل %{count} أشهر
+        many: قبل %{count} شهرا
+        one: قبل شهر واحد
+        other: قبل %{count} شهر
+        two: قبل شهرين
+        zero: قبل أقل من شهر
       about_x_years:
-        zero: "قبل حوالي أقل من سنة"
-        one: "قبل حوالي سنة واحدة"
-        two: "قبل حوالي سنتين"
-        few: "قبل حوالي %{count} سنوات"
-        many: "قبل حوالي %{count} سنة"
-        other: "قبل حوالي %{count} سنة"
+        few: قبل حوالي %{count} سنوات
+        many: قبل حوالي %{count} سنة
+        one: قبل حوالي سنة واحدة
+        other: قبل حوالي %{count} سنة
+        two: قبل حوالي سنتين
+        zero: قبل حوالي أقل من سنة
       over_x_years:
-        zero: "قبل أكثر من أقل من سنة"
-        one: "قبل أكثر من سنة واحد"
-        two: "قبل أكثر من سنتين"
-        few: "قبل أكثر من %{count} سنوات"
-        many: "قبل أكثر من %{count} سنة"
-        other: "قبل أكثر من %{count} سنة"
+        few: قبل أكثر من %{count} سنوات
+        many: قبل أكثر من %{count} سنة
+        one: قبل أكثر من سنة واحد
+        other: قبل أكثر من %{count} سنة
+        two: قبل أكثر من سنتين
+        zero: قبل أكثر من أقل من سنة
       almost_x_years:
-        zero: "قبل حوالي أقل من سنة"
-        one: "قبل حوالي سنة واحدة"
-        two: "قبل حوالي سنتين"
-        few: "قبل حوالي %{count} سنوات"
-        many: "قبل حوالي %{count} سنة"
-        other: "قبل حوالي %{count} سنة"
+        few: قبل حوالي %{count} سنوات
+        many: قبل حوالي %{count} سنة
+        one: قبل حوالي سنة واحدة
+        other: قبل حوالي %{count} سنة
+        two: قبل حوالي سنتين
+        zero: قبل حوالي أقل من سنة
   password_reset:
     no_token: "نأسف، رابط تغيير كلمة السّرّ قديم جدًّا. انقر زرّ ”لِج“ واختر ”نسيت كلمة السّرّ“ لنرسل لك رابطًا آخر."
     choose_new: "اختر كلمة المرور الجديدة"
@@ -676,8 +659,6 @@ ar:
       long_form: 'ترفع علم هذا عن صورة غير ملائمة'
     notify_user:
       title: 'أرسل رسالة إلى @{{username}}'
-      description: 'أود الحديث مع هذا الشخص مباشرة وعلى انفراد عن هذا المنشور.'
-      short_description: 'أود الحديث مع هذا الشخص مباشرة وعلى انفراد عن هذا المنشور.'
       long_form: 'العضو أرسل'
       email_title: 'منشورك في "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -772,9 +753,7 @@ ar:
       xaxis: "اليوم"
       yaxis: "مرّات الزّيارة"
     signups:
-      title: "المستخدمون الجدد"
       xaxis: "اليوم"
-      yaxis: "عدد المستخدمين الجدد"
     profile_views:
       title: "مشاهدات الحساب الشخصي للعضو"
       xaxis: "اليوم"
@@ -812,7 +791,6 @@ ar:
       xaxis: "يوم"
       yaxis: "عدد رسائل البريد الإلكتروني"
     user_to_user_private_messages:
-      title: "عضو لعضو"
       xaxis: "يوم"
       yaxis: "عدد الرسائل"
     system_private_messages:
@@ -859,7 +837,6 @@ ar:
       xaxis: "يوم"
       yaxis: "عدد قراءات الصفحات لزواحف الانترنت"
     page_view_total_reqs:
-      title: "مجموع"
       xaxis: "يوم"
       yaxis: "عدد قراءات الصفحات الكلى"
     page_view_logged_in_mobile_reqs:
@@ -920,22 +897,17 @@ ar:
     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>.'
     subfolder_ends_in_slash: "إعدادات المجلدات الداخلية خاطئ;ال DISCOURSE_RELATIVE_URL_ROOT يجب ان تنتهي ب سلاش."
-    missing_mailgun_api_key: "ضُبط الموقع ليُرسل الرّسائل الإلكترونيّ عبر mailgun ولكنّك لم توفّر مفتاح API ليُستخدم في تأكيد رسائل webhook."
   site_settings:
     censored_words: "الكلمات التي ستُستبدل آليًّا ب‍ &#9632;&#9632;&#9632;&#9632;"
-    censored_pattern: "نمط التّعبير النّمطيّ الذي سيُستبدل آليًّا ب‍ &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "سيتم حذف المنشورات المخفية تلقائيًا إذا زادت مدة الإخفاء أكثر من 30 يومًا"
-    default_locale: "اللغة الافتراضيّة للموقع طبقا للمعيار (ISO 639-1)"
     allow_user_locale: "اسمح للمستخدمين باختيار لغة الواجهة التي تناسبهم"
     set_locale_from_accept_language_header: "اختيار لغة الواجة للمستخدمين المتخفون طبقا للغة المختارة بمتصفح الشبكة. ( إعداد تجريبى، لا يعمل مع ذاكرة المتصفح )"
     min_post_length: "الحد الأدنى المسموح به لطول المنشور بالأحرف"
     min_first_post_length: "الحد الأدنى المسموح به لطول أول منشور (المنشور الاول بالموضوع) بالأحرف"
-    min_private_message_post_length: "الحد الأدنى المسموح به لطول المنشور بالأحرف في الرسائل"
     max_post_length: "الحد الأقصي المسموح به لطول المنشور بالأحرف"
     topic_featured_link_enabled: "السماح بنشر روابط في الموضوعات"
     min_topic_title_length: "الحد الأدنى المسموح به موضوع طول اللقب في الأحرف"
     max_topic_title_length: "الحد الأعلى المسموح به لطول عنوان موضوع في الأحرف"
-    min_private_message_title_length: "الحد الأدنى المسموح به لطول عنوان لرسالة في الأحرف"
     min_search_term_length: "الحد الأدنى الصالح لطول مصطلح  في الأحرف"
     search_tokenize_chinese_japanese_korean: "ارغام الباحث على تجميع احرف اللغات الصينية واليابانية والكورية حتى على المواقع الغير معدة لتلك اللغات."
     search_prefer_recent_posts: "اذا كان البحث في المنتدي بطئ, هذا الخيار سوف يحاول فهرسة اخر المنشورات اولاً"
@@ -1035,7 +1007,6 @@ ar:
     version_checks: "Ping ديسكورس مركزا لتحديثات الإصدار وإظهار الرسائل النسخة الجديدة على لوحة القيادة / مسؤول"
     new_version_emails: "إرسال بريد إلكتروني إلى عنوان contact_email عندما نسخة جديدة من ديسكورس هو متاح."
     invite_expiry_days: "مدة صلاحية مفاتيح دعوة عضو، بالأيام."
-    invite_passthrough_hours: "كم المدة التي يمكن للعضو أن يستخدم مفتاح دعوة محرر سابقا لتسجيل الدخول، في الساعات"
     invite_only: "غير مسموح للعامة بانشاء حساب, كل الحسابات الجديدة يجب ان تكون دعوات مرسلة من قبل طاقم العمل."
     login_required: "اطلب تسجيل دخول لقرائة محتوي هذا الموقع."
     min_username_length: "أدنى طول لاسم المستخدم (بالمحارف). تحذير: إن كان هناك أيّة مستخدمين أو مجموعات تملك أسماء أقصر من هذه، فسيعطب الموقع!"
@@ -1052,7 +1023,6 @@ ar:
     sso_overrides_name: "يتجاوز الاسم المحلي مع اسم موقع خارجي من حمولة SSO عند كل تسجيل دخول, ويمنع التغيرات المحلية. "
     sso_overrides_avatar: "تجاوز صوره المستخدم الرمزيه بواسطه موقع ور رميه خارجي من SSO المحمول. اذا فعلت, الغي allow_uploaded_avatarsعاليه  مطلوبه "
     sso_not_approved_url: "إعادة التوجيه لم توافق على حسابات SSO لهذا URL"
-    enable_local_logins: "فعل امكانية عمل حسابات محلية باسم المستخدم و كلمة المرور (ملحوظة: يجب ان تفعل لجعل خاصية الدعوات تعمل)"
     allow_new_registrations: "السماح بتسجيل حسابات جديدة. عطل هذه الخاصية إذا كنت تريد منع الكل من عمل حساب جديد علي الموقع."
     enable_signup_cta: "اعرض تنبية للزوار المجهولين المترددين يحثهم علي تسجيل حساب جديد."
     enable_yahoo_logins: "تفعيل تسجيل الدخول بميل YAHOO"
@@ -1060,15 +1030,12 @@ ar:
     google_oauth2_client_id: "رقم التعريف لتطبيق جوجل الخاص بك"
     google_oauth2_client_secret: "الرقم السري لتطبيق جوجل الخاص بك."
     enable_twitter_logins: "تفعيل تسجيل الدخول بحساب تويتر."
-    twitter_consumer_key: "مفتاح المستهلك لنظام تسجيل الدخول بحساب تويتر، يمكن الحصول علي واحد من http://dev.twitter.com"
-    twitter_consumer_secret: "رقم المستهلك السري لنظام تسجيل الدخول بحساب تويتر، يمكن الحصول علي واحد من http://dev.twitter.com"
     enable_instagram_logins: "تفعيل تسجيل الدخول عن طريق حساب انستغرام."
     instagram_consumer_key: "مفتاح المستهلك لنظام تسجيل الدخول بحساب انستجرام."
     instagram_consumer_secret: "رقم المستهلك السري لنظام تسجيل الدخول بحساب انستجرام."
     enable_facebook_logins: "تفعيل تسجيل الدخول عن طريق حساب الفيسبوك."
     facebook_app_id: "رقم تعريف تطبيق الفيسبوك المستخدم لنظام تسجيل الدخول، يمكنك الحصور علية من هنا https://developers.facebook.com/apps"
     facebook_app_secret: "الرقم السري لتطبيق الفيسبوك المستخدم لنظام تسجيل الدخول، يمكنك الحصور علية من هنا https://developers.facebook.com/apps"
-    facebook_request_extra_profile_details: "اطلب من الفيسبوك البيانات \"عني و الموقع الجغرافي و الموقع الالكتروني\". ( يتطلب ان يكون التطبيق المستخدم موافق عليه من قبل الفيسبوك )"
     enable_github_logins: "فعّل استيثاق غِت‌هَب، يتطلّب github_client_id وgithub_client_secret"
     github_client_id: "هوية العميل للمصادقة جيثب، مسجلة في https://github.com/settings/applications"
     github_client_secret: "هوية العميل للمصادقة جيثب، مسجلة في https://github.com/settings/applications"
@@ -1076,7 +1043,6 @@ ar:
     allow_restore: "تسمح استعادة، والتي يمكن أن تحل محل ALL بيانات الموقع! ترك كاذبة إلا إذا كنت تخطط لاستعادة نسخة احتياطية"
     maximum_backups: "أكبر قدر ممكن من النسخ الاحتياطي للحفاظ على القرص. يتم حذف النسخ الاحتياطية القديمة تلقائيا"
     automatic_backups_enabled: "فعل النسخ الإحتياطي التلقائي بشكل متكرر كما هو محدد."
-    backup_frequency: "كمية النسخ الإحتياطية المتكررة التي أنشأناها، في اليوم."
     enable_s3_backups: "تحميل النسخ الاحتياطي لS3 عند اكتماله. هام: يتطلب اعتماد S3 صالحة دخلت في إعدادات الملفات."
     s3_backup_bucket: "الرفع عن بعد لإجراء نسخ إحتياطية. تحذير : تأكد من أنه رفع خاص."
     s3_disable_cleanup: "عطل النسخ الاحتياطيه المحذوفه من S3 عندما يتم حذفها محلياً"
@@ -1094,7 +1060,6 @@ ar:
     max_bookmarks_per_day: "أقصى عدد من العلامات لكلّ مستخدم يوميًّا."
     max_edits_per_day: "أقصى عدد من عمليّات التّحرير لكلّ مستخدم يوميًّا."
     max_topics_per_day: "أقصى عدد للمواضيع التي يمكن للعضو إنشائها باليوم."
-    max_private_messages_per_day: "أقصى عدد لرسائل الأعضاء التي يمكن إنشائها باليوم."
     max_invites_per_day: "أقصى عدد للدعوات التي يمكن للعضو إرسالها باليوم."
     max_topic_invitations_per_day: "أقصى عدد لدعوات الموضوع التي يمكن للعضو إرسالها باليوم."
     alert_admins_if_errors_per_minute: "عدد الأخطاء في الدقيقة الواحدة لكى يرسل تنبيه للمدير. قيمة 0 تعطل هذه الميزة. ملاحظة: تتطلب إعادة تشغيل."
@@ -1106,7 +1071,6 @@ ar:
     clean_orphan_uploads_grace_period_hours: "فترة الراحة (بالساعات) قبل الرفع الوحيد تمت إزالته."
     purge_deleted_uploads_grace_period_days: "يتم مسح فترة سماح (بالأيام) قبل تحميل حذفه."
     enable_s3_uploads: "وضع الإضافات على تخزين الأمازون S3. هام: يتطلب اعتماد S3 صالحة (على حد سواء الوصول معرف مفتاح ومفتاح الوصول السري)."
-    s3_use_iam_profile: 'إستعمل وظيفة AWS EC2 IAM لإسترجاع المفاتيح. ملاحظة : التمكين سوف يتجاوز " مفتاح معرف الوصول ل s3 " و "مفتاح الوصول السري ل s3" الإعدادات.'
     s3_upload_bucket: "اسم حزمة Amazon S3 التي سيتم تحميل الملفات إليها. تحذير : يجب أن تكون أحرف صغيرة، لا تحوي مسافات، ولا _."
     s3_access_key_id: "معرف مفتاح دخول امازون S3 سيستخدم لرفع الصور."
     s3_secret_access_key: "مفتاح دخول أمازون السري S3 سيستخدم لرفع الصور."
@@ -1137,7 +1101,6 @@ ar:
     min_trust_to_edit_wiki_post: "أدنى مستوى ثقة مطلوب لتحرير مشاركة ويكي."
     min_trust_to_edit_post: "أدنى مستوى ثقة مطلوب لتحرير المشاركات."
     min_trust_to_allow_self_wiki: "أدنى مستوى ثقة مطلوب ليستطيع المستخدم جعل مشاركاته ويكي."
-    min_trust_to_send_messages: "أدنى مستوى ثقة مطلوب لإنشاء رسائل خاصّة جديدة."
     newuser_max_links: "عدد الروابط التي يمكن للمستخدم الجديد إضافتها للمشاركة."
     newuser_max_images: "عدد الصّور التي يمكن للمستخدم الجديد إضافتها للمشاركة."
     newuser_max_attachments: "عدد المرفقات التي يمكن للمستخدم الجديد إضافتها للمشاركة."
@@ -1269,7 +1232,6 @@ ar:
     enforce_square_emoji: "أجبِر النّسبة الباعيّة لكلّ الإيموجي لتكون مربّعة."
     approve_post_count: "عدد المنشورات للمستخدم الجديد او الاساسي يجب ان تتم الموافقه عليه "
     approve_unless_trust_level: "مشاركات للأعضاء أدنى من مستوى الثقة هذا يجب أن تتم الموافقة عليها."
-    default_email_private_messages: "أرسل بريد إلكتروني عندما يراسل شخص ما العضو إفتراضيا."
     default_email_direct: "ارسل بريد الكتروني عندما يقوم احدهم بالرد/الاقتباس الي/ذكر او دعوه مستخدم افتراضيا"
     default_email_mailing_list_mode: "ارسل بريد إلكتروني لكل مشاركة جديدة افتراضيا."
     disable_mailing_list_mode: "عدم السماح للمستخدمين بتفعيل خيار  المراسله الجماعيه"
@@ -1330,19 +1292,19 @@ ar:
       different_users: "المشاركات من اعضاء مختلفين لايُمكن دمجهم"
   move_posts:
     new_topic_moderator_post:
-      zero: "المشاركه التي انقسمت الي موضوع جديد: %{topic_link}"
-      one: "المشاركه التي انقسمت الي موضوع جديد : %{topic_link}"
-      two: "%{count} المشاركات التي انقسمت الي موضوع جديد: %{topic_link] "
-      few: "%{count} المشاركات التي انقسمت الي موضوع جديد: %{topic_link] "
-      many: "%{count} المشاركات التي انقسمت الي موضوع جديد: %{topic_link] "
-      other: "%{count} المشاركات التي انقسمت الي موضوع جديد: %{topic_link] "
+      few: '%{count} المشاركات التي انقسمت الي موضوع جديد: %{topic_link] '
+      many: '%{count} المشاركات التي انقسمت الي موضوع جديد: %{topic_link] '
+      one: 'المشاركه التي انقسمت الي موضوع جديد : %{topic_link}'
+      other: '%{count} المشاركات التي انقسمت الي موضوع جديد: %{topic_link] '
+      two: '%{count} المشاركات التي انقسمت الي موضوع جديد: %{topic_link] '
+      zero: 'المشاركه التي انقسمت الي موضوع جديد: %{topic_link}'
     existing_topic_moderator_post:
-      zero: "المشاركه التي اندمجت الي موضوع واحد %{topic_link}"
-      one: "المشاركه التي اندمجت الي موضوع واحد %{topic_link}"
-      two: "%{count} المشاركات التي اندمجت الي مشاركه واحده %{topic_link}"
-      few: "%{count} المشاركات التي اندمجت الي مشاركه واحده %{topic_link}"
-      many: "%{count} المشاركات التي اندمجت الي مشاركه واحده %{topic_link}"
-      other: "%{count} المشاركات التي اندمجت الي مشاركه واحده %{topic_link}"
+      few: '%{count} المشاركات التي اندمجت الي مشاركه واحده %{topic_link}'
+      many: '%{count} المشاركات التي اندمجت الي مشاركه واحده %{topic_link}'
+      one: المشاركه التي اندمجت الي موضوع واحد %{topic_link}
+      other: '%{count} المشاركات التي اندمجت الي مشاركه واحده %{topic_link}'
+      two: '%{count} المشاركات التي اندمجت الي مشاركه واحده %{topic_link}'
+      zero: المشاركه التي اندمجت الي موضوع واحد %{topic_link}
   change_owner:
     post_revision_text: "نقل الملكية من %{old_user} إلى %{new_user}"
     deleted_user: "عضو محذوف"
@@ -1352,47 +1314,47 @@ ar:
     closed_enabled: "تم اغلاق هذا الموضوع لا يسمح باضافة ردود جديدة"
     closed_disabled: "تم فتح هذا الموضوع الان ويسمح باضافة ردود جديدة "
     autoclosed_enabled_days:
-      zero: "هذا الموضوع تم اغلاقه تلقائيا بعد 1 يوم .الردود الجديده غير متوفره بعد الان."
-      one: "هذا الموضوع تم اغلاقه تلقائيا بعد 1 يوم .الردود الجديده غير متوفره بعد الان."
-      two: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ايام . الردود الجديده غير مسموحه بعد الان."
-      few: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ايام . الردود الجديده غير مسموحه بعد الان."
-      many: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ايام . الردود الجديده غير مسموحه بعد الان."
-      other: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ايام . الردود الجديده غير مسموحه بعد الان."
+      few: هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ايام . الردود الجديده غير مسموحه بعد الان.
+      many: هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ايام . الردود الجديده غير مسموحه بعد الان.
+      one: هذا الموضوع تم اغلاقه تلقائيا بعد 1 يوم .الردود الجديده غير متوفره بعد الان.
+      other: هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ايام . الردود الجديده غير مسموحه بعد الان.
+      two: هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ايام . الردود الجديده غير مسموحه بعد الان.
+      zero: هذا الموضوع تم اغلاقه تلقائيا بعد 1 يوم .الردود الجديده غير متوفره بعد الان.
     autoclosed_enabled_hours:
-      zero: "هذا الموضوع تم اغلاقه تلقائيا بعد 1 ساعه. الردود الجديده غير مسموحه بعد الان."
-      one: "هذا الموضوع تم اغلاقه تلقائيا بعد 1 ساعه. الردود الجديده غير مسموحه بعد الان."
-      two: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ساعات. الردود الجديده غير مسموحه"
-      few: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ساعات. الردود الجديده غير مسموحه"
-      many: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ساعات. الردود الجديده غير مسموحه"
-      other: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ساعات. الردود الجديده غير مسموحه"
+      few: هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ساعات. الردود الجديده غير مسموحه
+      many: هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ساعات. الردود الجديده غير مسموحه
+      one: هذا الموضوع تم اغلاقه تلقائيا بعد 1 ساعه. الردود الجديده غير مسموحه بعد الان.
+      other: هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ساعات. الردود الجديده غير مسموحه
+      two: هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ساعات. الردود الجديده غير مسموحه
+      zero: هذا الموضوع تم اغلاقه تلقائيا بعد 1 ساعه. الردود الجديده غير مسموحه بعد الان.
     autoclosed_enabled_minutes:
-      zero: "هذا الموضوع تم غلاقه تلقائيا بعد 1 دقيقه . الردود الجديده غير مسموحه بعد الان."
-      one: "هذا الموضوع تم غلاقه تلقائيا بعد 1 دقيقه . الردود الجديده غير مسموحه بعد الان."
-      two: "هذا الموضوع تم تم اغلاقه تلقائيا بعد %{count} دقائق . الردود الجديده غير مسموحه بعد الان."
-      few: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} دقائق. الردود الجديده غير مسموحه بعد الان."
-      many: "هذا الموضوع  تم اغلاقه تلقائيا بعد %{count} دقائق. الردود الجديده غير مسموحه بعد الان "
-      other: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} دقائق. الردود الجديده غير مسموحه بعد الان"
+      few: هذا الموضوع تم اغلاقه تلقائيا بعد %{count} دقائق. الردود الجديده غير مسموحه بعد الان.
+      many: 'هذا الموضوع  تم اغلاقه تلقائيا بعد %{count} دقائق. الردود الجديده غير مسموحه بعد الان '
+      one: هذا الموضوع تم غلاقه تلقائيا بعد 1 دقيقه . الردود الجديده غير مسموحه بعد الان.
+      other: هذا الموضوع تم اغلاقه تلقائيا بعد %{count} دقائق. الردود الجديده غير مسموحه بعد الان
+      two: هذا الموضوع تم تم اغلاقه تلقائيا بعد %{count} دقائق . الردود الجديده غير مسموحه بعد الان.
+      zero: هذا الموضوع تم غلاقه تلقائيا بعد 1 دقيقه . الردود الجديده غير مسموحه بعد الان.
     autoclosed_enabled_lastpost_days:
-      zero: "هذا الموضوع تم اغلاقه تلقائيا 1 يوم بعد اخر رد . الردود الجديده غير مسموحه بعد الان."
-      one: "هذا الموضوع تم اغلاقه تلقائيا 1 يوم بعد اخر رد . الردود الجديده غير مسموحه بعد الان."
-      two: "هذا الموضوع تم اغلاقه تلقائيا %{count} ايام بعد اخر رد. الردود الجديده غير مسموحه."
-      few: "هذا الموضوع تم اغلاقه تلقائيا %{count} ايام بعد اخر رد. الردود الجديده غير مسموحه."
-      many: "هذا الموضوع تم اغلاقه تلقائيا %{count} ايام بعد اخر رد. الردود الجديده غير مسموحه."
-      other: "هذا الموضوع تم اغلاقه تلقائيا %{count} ايام بعد اخر رد. الردود الجديده غير مسموحه."
+      few: هذا الموضوع تم اغلاقه تلقائيا %{count} ايام بعد اخر رد. الردود الجديده غير مسموحه.
+      many: هذا الموضوع تم اغلاقه تلقائيا %{count} ايام بعد اخر رد. الردود الجديده غير مسموحه.
+      one: هذا الموضوع تم اغلاقه تلقائيا 1 يوم بعد اخر رد . الردود الجديده غير مسموحه بعد الان.
+      other: هذا الموضوع تم اغلاقه تلقائيا %{count} ايام بعد اخر رد. الردود الجديده غير مسموحه.
+      two: هذا الموضوع تم اغلاقه تلقائيا %{count} ايام بعد اخر رد. الردود الجديده غير مسموحه.
+      zero: هذا الموضوع تم اغلاقه تلقائيا 1 يوم بعد اخر رد . الردود الجديده غير مسموحه بعد الان.
     autoclosed_enabled_lastpost_hours:
-      zero: "أُغلق هذا الموضوع آليًّا بعد أقلّ من ساعة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة."
-      one: "أُغلق هذا الموضوع آليًّا بعد ساعة واحدة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة."
-      two: "أُغلق هذا الموضوع آليًّا بعد ساعتين من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة."
-      few: "أُغلق هذا الموضوع آليًّا بعد %{count} ساعات من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة."
-      many: "أُغلق هذا الموضوع آليًّا بعد %{count} ساعة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة."
-      other: "أُغلق هذا الموضوع آليًّا بعد %{count} ساعة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة."
+      few: أُغلق هذا الموضوع آليًّا بعد %{count} ساعات من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة.
+      many: أُغلق هذا الموضوع آليًّا بعد %{count} ساعة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة.
+      one: أُغلق هذا الموضوع آليًّا بعد ساعة واحدة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة.
+      other: أُغلق هذا الموضوع آليًّا بعد %{count} ساعة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة.
+      two: أُغلق هذا الموضوع آليًّا بعد ساعتين من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة.
+      zero: أُغلق هذا الموضوع آليًّا بعد أقلّ من ساعة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة.
     autoclosed_enabled_lastpost_minutes:
-      zero: "أُغلق هذا الموضوع آليًّا بعد أقلّ من دقيقة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة."
-      one: "أُغلق هذا الموضوع آليًّا بعد دقيقة واحدة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة."
-      two: "أُغلق هذا الموضوع آليًّا بعد دقيقتين من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة."
-      few: "أُغلق هذا الموضوع آليًّا بعد %{count} دقائق من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة."
-      many: "أُغلق هذا الموضوع آليًّا بعد %{count} دقيقة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة."
-      other: "أُغلق هذا الموضوع آليًّا بعد %{count} دقيقة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة."
+      few: أُغلق هذا الموضوع آليًّا بعد %{count} دقائق من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة.
+      many: أُغلق هذا الموضوع آليًّا بعد %{count} دقيقة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة.
+      one: أُغلق هذا الموضوع آليًّا بعد دقيقة واحدة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة.
+      other: أُغلق هذا الموضوع آليًّا بعد %{count} دقيقة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة.
+      two: أُغلق هذا الموضوع آليًّا بعد دقيقتين من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة.
+      zero: أُغلق هذا الموضوع آليًّا بعد أقلّ من دقيقة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة.
     autoclosed_disabled: "تم فتح هذا الموضوع الان ويسمح باضافة ردود جديدة "
     autoclosed_disabled_lastpost: "تم فتح هذا الموضوع الان ويسمح باضافة ردود جديدة "
     pinned_enabled: "هذا الموضوع مثبت الأن. سوف يظهر في اعلي القسم الخاص به حتي يتم إزالة التثبيت لكل الاعضاء بواسطة احد افراد طاقم العمل او كل عضو لنفسة ."
@@ -1441,12 +1403,12 @@ ar:
       domain_not_allowed: "موقع الوبّ غير صالح. النّطاقات الممكنة هي: %{domains}"
   flags_reminder:
     subject_template:
-      zero: "لا يوجد تبليغات تنتظر التعامل معها"
-      one: "بلاغ واحد ينتظر التعامل معه"
-      two: "بلاغان ينتظران التعامل معهما"
-      few: "%{count} بلاغات تنتظر التعامل معها"
-      many: "%{count} بلاغات تنتظر التعامل معها"
-      other: "%{count} بلاغات تنتظر التعامل معها"
+      few: '%{count} بلاغات تنتظر التعامل معها'
+      many: '%{count} بلاغات تنتظر التعامل معها'
+      one: بلاغ واحد ينتظر التعامل معه
+      other: '%{count} بلاغات تنتظر التعامل معها'
+      two: بلاغان ينتظران التعامل معهما
+      zero: لا يوجد تبليغات تنتظر التعامل معها
   unsubscribe_mailer:
     subject_template: "أكّد عدم رغبتك بعد الآن باستقبال تحديثات %{site_title} على البريد"
   invite_password_instructions:
@@ -1494,8 +1456,6 @@ ar:
       text_body_template: "ملف دعوة العضو الجماعية الخاص بك تمت معالجته، %{sent} دعوات مرسلة."
     bulk_invite_failed:
       subject_template: "دعوة العضو الجماعية تمت مع وجود أخطاء"
-    csv_export_succeeded:
-      subject_template: "اكتمل تصدير البيانات"
     csv_export_failed:
       subject_template: "فشل تصدير البيانات"
     email_reject_empty:
@@ -1522,12 +1482,12 @@ ar:
         القسم الذي ارسلت له يسمح فقط لعناوين البريد الإلكتروني المعروفة و الاعضاء الحاصلين علي صلاحية مناسبة بعمل رد. إذا كنت تعتقد ان هذا خطا [تواصل مع طاقم العمل](%{base_url}/about).
     pending_users_reminder:
       subject_template:
-        zero: "لا يوجد أعضاء تنتظر الموافقة."
-        one: "عضوا واحد ينتظر الموافقة."
-        two: "عضوان ينتظران الموافقة."
-        few: "%{count} أعضاء تنتظر الموافقة."
-        many: "%{count} أعضاء تنتظر الموافقة."
-        other: "%{count} أعضاء تنتظر الموافقة."
+        few: '%{count} أعضاء تنتظر الموافقة.'
+        many: '%{count} أعضاء تنتظر الموافقة.'
+        one: عضوا واحد ينتظر الموافقة.
+        other: '%{count} أعضاء تنتظر الموافقة.'
+        two: عضوان ينتظران الموافقة.
+        zero: لا يوجد أعضاء تنتظر الموافقة.
       text_body_template: |
         هناك تسجيلات مستخدمين جديده تنظر لكي يتم قبولها (او رفضها) قبل ان يمكنهم الوصول لهذه المدونه.
         [الرجاء مراجعنهم في قسم المدراء](%{base_url}/admin/users/list/pending).
@@ -1574,7 +1534,7 @@ ar:
       text_body_template: |
         أكد عنوان بريدك الإلكتروني لـ %{site_name} بالضغط على الرابط التالي :
 
-        %{email_token}/u/ وثق البريد الإلكتروني  /u/%{base_url}
+        %{email_token}/u/authorize-email/%{base_url}
     confirm_old_email:
       subject_template: "أكّد عنوان بريد الإلكتروني الحالي %{email_prefix}"
       text_body_template: |
@@ -1584,7 +1544,7 @@ ar:
 
         أكّد عنوان بريدك الإلكتروني الحالي لـ %{site_name} بالضغط على الرابط التالي :
 
-        /u/أكّد بريدك الإلكتروني/%{email_token}%{base_url}
+        %{email_token}/u/authorize-email/%{base_url}
     notify_old_email:
       subject_template: "عنوان بريد الإلكتروني تم تغييرة %{email_prefix}"
     signup_after_approval:
@@ -1876,8 +1836,6 @@ ar:
     promoter:
       name: مُروج
       description: لقد دعوت شخص للمجتمع
-      long_description: |
-        تُمنح هذة الشارة عندما تدعوا شخص ما للإنضمام إلي المجتمع عن طريق زر الدعوة في صفحتك الشخصية, او اسفل اي موضوع. إن دعوة الاصدقاء الذين من المحتمل ان يهتموا باحد الموضوعات التي يتم نقاشها بالمجتمع لهو إضافة عظيمة لمجتمعنا, لذا شكرا لك.
     campaigner:
       name: مُبادر
       description: لقد دعوت ثلاث اشخاص للمجتمع
@@ -1973,8 +1931,6 @@ ar:
     first_emoji:
       name: أول رمز تعبيري
       description: استخدمت رمز تعبيري في منشور
-      long_description: |
-        تُمنح هذة الشارة عند اول مره تقوم باستخدام رمز تعبيري في منشوراتك :thumbsup:. الرموز التعبيرية تساعدك علي ملئ منشوراتك بالمشاعر الإنسانية من الفرح :smiley: للحزن :anguished: إلي الغضب :angry: و كل ما هو بينهم :sunglasses:. فقط قم بكتابه نقطتين فوق بعضهم ( : )  او اضغط علي زر الرموز التعبيرية في محرر النصوص لتختار من بين مئات الرموز التعبيرية :ok_hand:
     first_mention:
       name: أول إشارة
       description: اشرت إلي عضو اخر في منشوراتك
@@ -2008,11 +1964,10 @@ ar:
     badge_title_metadata: "%{display_name} شاره على %{site_title}"
   admin_login:
     success: "البريد أُرسل"
-    error: "خطأ!"
     email_input: "مدير البريد الإيكتروني"
     submit_button: "أرسل البريد الإلكتروني"
   performance_report:
-    initial_post_raw: 'هذا الموضوع يحتوي على معلومات الاداء اليومي للموقع '
+    initial_post_raw: "هذا الموضوع يحتوي على معلومات الاداء اليومي للموقع "
     initial_topic_title: التبليغ عن اداء الموقع
   tags:
     title: "الأوسمة"
@@ -2042,6 +1997,3 @@ ar:
         title: "ادعو للانظمام الى الطاقم"
       finished:
         title: "نسخة دسكورس جاهزة!"
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.bg.yml b/config/locales/server.bg.yml
new file mode 100644
index 00000000000..5f42a58a84f
--- /dev/null
+++ b/config/locales/server.bg.yml
@@ -0,0 +1,1341 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+bg:
+  dates:
+    short_date_no_year: "D MMM"
+    short_date: "D MMM, YYYY"
+    long_date: "MMMM D, YYYY h:mma"
+  datetime_formats: &datetime_formats
+    formats:
+      short: "%m-%d-%Y"
+      short_no_year: "%B %-d"
+      date_only: "%B %-d, %Y"
+  date:
+    month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
+    <<: *datetime_formats
+  time:
+    <<: *datetime_formats
+  title: "Discourse"
+  topics: "Теми"
+  posts: "публикации"
+  loading: "Зареждане"
+  log_in: "Вход"
+  submit: "Изпрати"
+  purge_reason: "Автоматично изтрит като изоставен, неактивен акаунт"
+  disable_remote_images_download_reason: "Изтеглянето на отдалечени изображения беше изключено, защото няма достатъчно място на хард диска."
+  anonymous: "Анонимен"
+  remove_posts_deleted_by_author: "Изтрит от автора"
+  themes:
+    other_error: "Нещо се обърка при актуализирането на стила"
+  emails:
+    incoming:
+      default_subject: "Тази тема има нужда от заглавие"
+      show_trimmed_content: "Показване на съкратеното съдържание"
+      errors:
+        empty_email_error: "Се случва, когато raw имейла който получихме беше празен."
+        no_message_id_error: "Се случва, когато имейла няма 'Message-Id' хедър."
+        inactive_user_error: "Се случва, когато изпращача не е активен."
+  errors: &errors
+    format: '%{attribute} %{message}'
+    messages:
+      too_long_validation: "е ограничен на %{max} символа ; вие въведохте %{length}."
+      invalid_boolean: "Невалиден булев."
+      taken: "е вече заето"
+      accepted: трябва да се приеме
+      blank: не може да бъде празно
+      present: трябва да се попълни
+      confirmation: "не съвпада %{attribute}"
+      empty: не може да бъде празно
+      equal_to: "трябва да бъде равно на %{count}"
+      even: трябва да бъде равен
+      exclusion: е запазено
+      greater_than: "трябва да бъде по-голямо от %{count}"
+      greater_than_or_equal_to: "трябва да бъде по-голямо или равно на %{count}"
+      has_already_been_used: "вече е бил използван"
+      inclusion: не е включено в списъка
+      invalid: не невалидно
+      less_than: "трябва да бъде по-малко от %{count}"
+      less_than_or_equal_to: "трябва да бъде по-малко или равно на %{count}"
+      not_a_number: не е число
+      not_an_integer: трябва да бъде число
+      odd: трябва да е нечетно
+      record_invalid: 'Валидирането е неуспешно %{errors}'
+      restrict_dependent_destroy:
+        one: "Записът не може да бъде изтрит, защото е зависим от съществуващите  %{record}"
+        many: "Записът не може да бъде изтрит, защото е зависим от съществуващите %{record}"
+      too_long:
+        one: прекалено дълго (трябва да бъде само 1 символ)
+        other: е прекалено дълго (максималния брой символи е %{count})
+      too_short:
+        one: прекалено кратко (минимума е 1 символ)
+        other: е прекалено кратко (миниума е %{count} символи)
+      wrong_length:
+        one: е с грешна дължина (трябва да бъде поне 1 символ)
+        other: е с грешна дължина (трябва да бъде %{count} символа)
+      other_than: "трябва да бъде различно от %{count}"
+    template:
+      body: 'Имаше проблеми със следните полета:'
+      header:
+        one: 1 грешка възпрепятства запазването на този %{model}
+        other: '%{count} грешки възпрепятстват запазването на този %{model} '
+    embed:
+      load_from_remote: "Получи се грешка при зареждането на тази публикация."
+  activemodel:
+    errors:
+      <<: *errors
+  topic_invite:
+    user_exists: "Съжеляваме, но този потребител е вече поканен. Вие можете да каните потребител за дадена тема само веднъж."
+  backup:
+    operation_already_running: "Операцията се изпълнява в момента. Не можеш да започнеш нова точно сега."
+    backup_file_should_be_tar_gz: "Бекъп файлът трябва да бъде .tar.gz архив."
+    not_enough_space_on_disk: "Няма достатъчно свободно място на диска, за да се качи този бекъп."
+  not_logged_in: "Трябва да сте логнат за да правите това."
+  not_found: "Заявеният адрес или ресурс  не може да бъде намерен."
+  invalid_access: "Вие нямате права да разглеждате този ресурс."
+  read_only_mode_enabled: "Сайтът в режим само за четене. Действията са непозволени."
+  reading_time: "Време за четене"
+  likes: "Харесвания"
+  too_many_replies:
+    one: Съжаляваме, но новите потребители са временно са ограничени до 1 отговор във същата публикация.
+    other: Съжаляваме, но новите потребители са временно са ограничени до %{count}  отговори в същата публикация.
+  embed:
+    start_discussion: "Започване на дискусия "
+    continue: "Продължаване на дискусия"
+    more_replies:
+      one: още един отговор
+      other: '%{count} повече отговори'
+    loading: "Зареждане на дискусия..."
+    permalink: "Постоянен адрес"
+    imported_from: "Това е упътваща дискусионна тема за първоначалното влизане в %{link}"
+    in_reply_to: "▶ %{username}"
+    replies:
+      one: 1 отговор
+      other: '%{count} отговори'
+  no_mentions_allowed: "Съжаляваме, не може да споменавате други потребители."
+  too_many_mentions:
+    one: Съжеляваме, можете да споменавате само един потребител в публикация.
+    other: Съжаляваме, можете да споменете само %{count} потребители в публикацията.
+  no_mentions_allowed_newuser: "Съжаляваме, новите потребите не могат да споменават други потребители."
+  too_many_mentions_newuser:
+    one: Съжаляваме, новите потребители могат да споменават само един друг потребител в публикацията.
+    other: Съжаляваме, новите потребители могат да споменават само %{count} потребители в публикацията.
+  no_images_allowed: "Съжаляваме, новите потребители не могат да поставят изображения в публикациите."
+  too_many_images:
+    one: Съжаляваме, новите потребители могат да поставят само едно изображение в публикацията.
+    other: Съжаляваме, новите потребители могат да поставят само по %{count} изображения в публикацията.
+  no_attachments_allowed: "Съжаляваме, новите потребители не могат да поставят приставки в публикациите."
+  too_many_attachments:
+    one: Съжаляваме, новите потребители могат да поставят само по една приставка в публикацията.
+    other: Съжаляваме, новите потребители могат да поставят %{count} приставки в публикацията.
+  no_links_allowed: "Съжаляваме, новите потребители не могат да поставят линкове в публикациите."
+  links_require_trust: "Съжаляваме, не може да включвате линкове в публикациите си."
+  too_many_links:
+    one: Съжаляваме, новите потребители могат да поставят само по един линк в публикация.
+    other: Съжаляваме, новите потребители могат да поставят само %{count} линкове в публикация.
+  contains_blocked_words: "Публикацията ви съдържа непозволена дума: %{word}"
+  spamming_host: "Съжаляваме, не можете да публикувате линк на този хост."
+  user_is_suspended: "Отстранените потребители нямат право да публикуват."
+  topic_not_found: "Нещо не е наред. Може би тази тема е била затворена или изтрита, докато я гледате."
+  just_posted_that: "твърде подобно е на това което скоро сте публикували"
+  invalid_characters: "съдържа невалидни знаци"
+  next_page: "следваща страница →"
+  prev_page: "← предишна страница"
+  page_num: "Страница %{num}"
+  home_title: "Начало"
+  topics_in_category: "Теми в '%{category}' група"
+  rss_posts_in_topic: "RSS поддържа '%{topic}'"
+  rss_topics_in_category: "RSS поддържа темите в '%{category}' категория"
+  author_wrote: "%{author} написа:"
+  num_posts: "Публикации:"
+  num_participants: "Участници:"
+  read_full_topic: "Прочети цялата тема"
+  private_message_abbrev: "Съобщение"
+  rss_description:
+    latest: "Последни теми"
+    hot: "Горещи теми"
+    top: "Топ теми"
+    top_all: "Топ теми за всички времена"
+    top_yearly: "Годишни топ теми"
+    top_quarterly: "Тримесечни топ теми"
+    top_monthly: "Месечни топ теми"
+    top_weekly: "Седмични топ теми"
+    top_daily: "Дневни топ теми"
+    posts: "Последни публикации"
+    private_posts: "Последни лични съобщения"
+    group_posts: "Последни публикации от @%{group_name}"
+    group_mentions: "Последни споменавания от %{group_name}"
+    user_posts: "Последни публикации от @%{username}"
+    user_topics: "Последни теми от @%{username}"
+  too_late_to_edit: "Това мнение е създадено много отдавна. То вече не може да се променя или  да бъде изтрито."
+  revert_version_same: "Текущата версия е същата като версията, към която се опитвате да се върнете."
+  excerpt_image: "изображение"
+  queue:
+    delete_reason: "Изтрит чрез опашката за медериране на публикации."
+  groups:
+    errors:
+      invalid_domain: "'%{domain}' е невалиден домейн."
+      invalid_incoming_email: "'%{email}' е невалиден имейл адрес."
+      email_already_used_in_group: "'%{email}' е вече използван от групата '%{group_name}'."
+      email_already_used_in_category: "'%{email}' е вече използван за категорията '%{category_name}'."
+    default_names:
+      everyone: "всички"
+      admins: "админи"
+      moderators: "модератори"
+      staff: "персонал"
+      trust_level_0: "trust_level_0 "
+      trust_level_1: "trust_level_1 "
+      trust_level_2: "trust_level_2 "
+      trust_level_3: "trust_level_3 "
+      trust_level_4: "trust_level_4 "
+  education:
+    until_posts:
+      one: 1 публикация
+      other: '%{count} публикации'
+    'new-topic': |
+      Добре дошли в %{site_name} &mdash; **Благодарим ви за създаването на нова тема!**
+
+      - Заглавието и звучи ли ви интересно като го прочетете на глас?Достатъчно описващо ли е?
+
+      - На кого би била интересна тази тема? Защо е важна за обсъждане? Каква реакция от останалите потребители очаквате?
+
+      - Постарайте се да включите в заглавието лесни за намиране думи/фрази. Изберете  подходяща по смисъл категория към която вашата тема да принадлежи.
+
+      За повече информация, вижте нашето [ръководство на потребителя] (/guidelines). Този панел ще изчезне след като създадете първата си публикация %{education_posts_text}.
+    'new-reply': |
+      Добре дошли в %{site_name} &mdash; **Благодарим Ви за съдействието!**
+
+      - Вашият отговор допринася ли за разговора по някакъв начин?
+
+      - Бъдете любезен с вашите колеги от общността.
+
+      - Конструктивната критика е добре дошла, но когато се критикуват *идеи*, не хора.
+
+      За повече информация [виж Правилата на Общността](/guidelines). Този панел ще бъде видим до вашето първо %{education_posts_text}.
+  activerecord:
+    attributes:
+      category:
+        name: "Име на категорията"
+      topic:
+        title: 'Заглавие'
+      post:
+        raw: "Тяло"
+      user_profile:
+        bio_raw: "За мен"
+    errors:
+      <<: *errors
+      models:
+        topic:
+          attributes:
+            base:
+              too_many_users: "Можете да изпращате предупреждения само до един потребител в даден момент."
+              no_user_selected: "Трябва да изберете валиден потребител."
+        user:
+          attributes:
+            password:
+              common: "е една от 10000 най-често използвани пароли. Моля използвайте по-сигурна парола."
+              same_as_username: "е същата като вашето потребителско име. Моля използвайте по-сигурна парола."
+              same_as_email: "е същата като вашия email. Моля използвайте по-сигурна парола."
+            ip_address:
+              signup_not_allowed: "Вписването не е разрешено от този акаунт."
+        color_scheme_color:
+          attributes:
+            hex:
+              invalid: "този цвят не е валиден "
+  user_profile:
+    no_info_other: "<div class='missing-profile'>%{name} в полето За мен на техния профил все още не е въвъдено нищо </div>"
+  vip_category_name: "Салон"
+  vip_category_description: "Категоята е само за членове с ниво на доверие 3 и по-високо."
+  meta_category_name: "Заявка към сайта"
+  meta_category_description: "Дискусия за сайта, неговата организация, как той работи, и как можем да го подобрим."
+  staff_category_name: "Персонал"
+  staff_category_description: "Частна категория за дискусии на персонала. Темите са видими само за админи и модератори."
+  lounge_welcome:
+    title: "Добре дошли в Салона"
+    body: |2
+
+        Честито! :confetti_ball:
+
+        Ако можете да видите тази тема, вие сте повишен в **редовен** (trust level 3)
+
+        Сега Вие можете &hellip;
+
+        * Да променяте заглавието на всяка тема
+        * Да сменяте категорията на всяка тема
+        * Имате си свои последователи  ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) is removed)
+        * Имате достъп до частната Lounge категория, видима само за потребители от trust level 3 и по-високо
+        * Скриване на спама с един сигнал
+
+        Ето и  [current list of fellow regulars](/badges/3/regular). Не забравяйте да кажете здрасти.
+
+        Благодарим Ви за това, че сте важна част от тази общност!
+
+        (За повече информация относно trust levels, [see this topic][trust]. Моля имайте впредвид, че редовни остават само членовете, които с течение на времето продължават да отговарят на изискванията.)
+
+        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+  category:
+    topic_prefix: "За %{category} категория"
+    errors:
+      uncategorized_parent: "Некатегоризиран не може да има основна категория"
+      self_parent: "Една подкатегория не може да бъде родител сама на себе си."
+      depth: "Не можете да създадете една подкатегория под друга такава"
+      invalid_email_in: "'%{email}' е невалиден имейл адрес."
+      email_already_used_in_group: "'%{email}' е вече използван от групата '%{group_name}'."
+      email_already_used_in_category: "'%{email}' е вече използван за категорията '%{category_name}'."
+    cannot_delete:
+      uncategorized: "Не можете да изтриете Некатегоризиран"
+      has_subcategories: "Не можете да изтриете тази категория, защото има подкатегории."
+      topic_exists:
+        one: Не можете да изтриете тази категория, защото има 1 тема. Най-старата тема е %{topic_link}.
+        other: 'Не можете да изтриете тази категория, защото има %{count} теми. Най-старата тема е %{topic_link}. '
+      topic_exists_no_oldest: "Не можете да изтриете тази категория, защото броят на темите е %{count}."
+  trust_levels:
+    newuser:
+      title: "нов потребител"
+    basic:
+      title: "основен потребител"
+    member:
+      title: "потребител"
+    regular:
+      title: "редовен"
+    leader:
+      title: "лидер"
+    change_failed_explanation: "Опитахте се да понижите %{user_name} на '%{new_trust_level}'. Обаче тяхното ниво на доверие е вече '%{current_trust_level}'. %{user_name} ще остане на '%{current_trust_level}' - ако искате да понижите потребителското ниво, ниво на доверие първо"
+  rate_limiter:
+    by_type:
+      create_like: "Достигнахте максималния брой харесвания. Моля, изчакайте %{time_left}, преди да опитате отново."
+      create_bookmark: "Достигнахте максималния брой отметки. Моля, изчакайте %{time_left}, преди да опитате отново."
+      edit_post: "Достигнахте максималния брой редакции. Моля, изчакайте %{time_left}, преди да опитате отново."
+      live_post_counts: "Вие изисквате преброяване на постовете на живо твърде бързо. Моля, изчакайте %{time_left}, преди да опитате отново."
+      unsubscribe_via_email: "Достигнахте максималния брой отписвания по имейл. Моля, изчакайте %{time_left}, преди да опитате отново."
+      topic_invitations_per_day: "Достигнахте максималния брой покани за теми. Моля, изчакайте %{time_left}, преди да опитате отново."
+    hours:
+      one: 1 час
+      other: '%{count} часове '
+    minutes:
+      one: 1 минута
+      other: '%{count} минути '
+    seconds:
+      one: 1 секунда
+      other: '%{count} секунди '
+  datetime:
+    distance_in_words:
+      half_a_minute: "< 1m"
+      less_than_x_seconds:
+        one: < 1с
+        other: < %{count}s
+      x_seconds:
+        one: 1s
+        other: '%{count}s'
+      less_than_x_minutes:
+        one: < 1m
+        other: < %{count}m
+      x_minutes:
+        one: 1m
+        other: '%{count}m'
+      about_x_hours:
+        one: 1h
+        other: '%{count}h'
+      x_days:
+        one: 1d
+        other: '%{count}d'
+      about_x_months:
+        one: '1mon '
+        other: '%{count}mon'
+      x_months:
+        one: '1mon '
+        other: '%{count}mon '
+      about_x_years:
+        one: '1y '
+        other: '%{count}y '
+      over_x_years:
+        one: '> 1y '
+        other: '> %{count}y '
+      almost_x_years:
+        one: 1y
+        other: '%{count}y'
+    distance_in_words_verbose:
+      half_a_minute: "преди малко"
+      less_than_x_seconds:
+        one: преди малко
+        other: преди малко
+      x_seconds:
+        one: преди 1 секунда
+        other: преди %{count} секунди
+      less_than_x_minutes:
+        one: по малко от 1 минута
+        other: преди по-малко от %{count} минути
+      x_minutes:
+        one: преди 1 минута
+        other: преди %{count} минути
+      about_x_hours:
+        one: преди 1 час
+        other: преди %{count} часа
+      x_days:
+        one: преди 1 ден
+        other: преди %{count} дни
+      about_x_months:
+        one: преди около 1 месец
+        other: преди около %{count} месеца
+      x_months:
+        one: преди 1 месец
+        other: преди %{count} месеца
+      about_x_years:
+        one: преди около 1 година
+        other: 'преди около  %{count} години '
+      over_x_years:
+        one: 'преди повече от 1 година '
+        other: 'преди повече от %{count} години '
+      almost_x_years:
+        one: преди почти 1 година
+        other: преди почти %{count} години
+  password_reset:
+    update: 'Обновете паролата'
+    save: 'Задайте парола'
+    title: 'Смяна на паролата'
+    success: "Вие успешно променихте вашата парола и в момента сте логнати."
+    success_unapproved: "Вие успешно променихте вашата парола."
+  change_email:
+    confirmed: "Вашият имейл беше актуализиран."
+    please_continue: "Продължете към %{site_name}"
+    error: "Възникна грешка при промяната на вашия имейл адрес. Може би адресът вече се използва?"
+    authorizing_old:
+      title: "Благодаря че потвърдихте имейл адреса си"
+  activation:
+    action: "Кликнете тук, за да активирате вашия профил"
+    already_done: "Съжаляваме, този линк за потвърждаване на акаунта вече е невалиден. Може би вашият акаунт е вече активен?"
+    please_continue: "Вашият нов акаунт е вече потвърден; ще бъдете пренасочени към началната страница."
+    continue_button: "Продължете към %{site_name}"
+    welcome_to: "Добре дошли в %{site_name}!"
+    approval_required: "Акаунтът Ви трябва да бъде одобрен от модератор преди да получите достъп до този форум. Ще получите имейл когато акаунтът Ви е одобрен!"
+  post_action_types:
+    off_topic:
+      title: 'Оф-топик'
+      description: 'Тази публикация не е уместна за текущата дискусия, нейното заглавие и първа публикация, и трябва да бъде преместена на друго място.'
+      long_form: 'Маркирахте това като оф-топик'
+    spam:
+      title: 'Спам'
+      long_form: 'маркирахте това като спам'
+      email_title: '"%{title}" беше маркиран като спам'
+      email_body: "%{link}\n\n%{message}"
+    inappropriate:
+      title: 'Неприлично'
+      description: 'Този пост има съдържание, което всеки разумен човек би сметнал за обидно и оскърбително  of <a href="/guidelines">Правилата на Общността</a>.'
+      long_form: 'Маркирахте това като неприлично'
+    notify_user:
+      title: 'Изпрати съобщение до @{{username}}'
+      long_form: 'оведомен потребител'
+      email_title: 'Вашата публикация в "%{title}"'
+      email_body: "%{link}\n\n\n%{message}"
+    notify_moderators:
+      title: "Нещо друго"
+      long_form: 'сигнал до шефовете'
+      email_title: 'Постът "%{title}" изисква вниманието на човек от екипа'
+      email_body: "%{link}\n\n%{message}"
+    bookmark:
+      title: 'Отметка'
+      description: 'Добавете тази публикация в Отметки'
+      long_form: 'Добавихте тази публикация в Отметки'
+    like:
+      title: 'Харесвам'
+      description: 'Харесайте тази публикация'
+      long_form: 'харесаха това'
+    vote:
+      title: 'Гласуване'
+      description: 'Гласувайте за тази публикация'
+      long_form: 'Вие гласувахте за тази публикация'
+  topic_flag_types:
+    spam:
+      title: 'Спам'
+      description: 'Този пост е реклама.Той е промоционален, не е полезен или не се отнася към текущата тема.'
+      long_form: 'маркирахте това като спам'
+    inappropriate:
+      title: 'Неприлично'
+      description: 'Този пост има съдържание, което всеки разумен човек би сметнал за обидно и оскърбително , или нарушава of <a href="/guidelines">виж Правилата на Общността</a>.'
+      long_form: 'Маркирано като неприлично'
+    notify_moderators:
+      title: "Нещо друго"
+      long_form: 'сигнал до модератор'
+      email_title: 'Постът "%{title}" изисква вниманието на модератор'
+      email_body: "%{link}\n\n\n%{message}"
+  flagging:
+    user_must_edit: '<p> За тази публикация беше сигнализирано от общността и е временно скрита. .</p>'
+  archetypes:
+    regular:
+      title: "Редовна Тема"
+    banner:
+      title: "Банер тема"
+      message:
+        make: "Тази тема сега е банер. Тя ще се появява най-отгоре на всяка страница докато не бъде премахната от потребителя."
+        remove: "Тази тема вече не е банер. Тя няма да се появява повече най-отгоре на всяка страница."
+  reports:
+    visits:
+      title: "Потребителски посещения "
+      xaxis: "Ден"
+      yaxis: "Брой на посещенията"
+    signups:
+      xaxis: "Ден"
+    profile_views:
+      title: "Гледания на потребителският профил"
+      xaxis: "Ден"
+      yaxis: "Брой на видяни потребителски профили"
+    topics:
+      title: "Теми"
+      xaxis: "Ден"
+      yaxis: "Брой нови теми."
+    posts:
+      title: "Публикации"
+      xaxis: "Ден"
+      yaxis: "Брой нови публикации."
+    likes:
+      title: "Харесвания"
+      xaxis: "Ден"
+      yaxis: "Брой нови харесвания"
+    flags:
+      title: "Сигнали"
+      xaxis: "Ден"
+      yaxis: "Брой сигнали"
+    bookmarks:
+      title: "Отметки"
+      xaxis: "Ден"
+      yaxis: "Брой нови отметки"
+    starred:
+      title: "Любими"
+      xaxis: "Ден"
+      yaxis: "Брой нови любими теми"
+    users_by_trust_level:
+      title: "Потребители с  Ниво на доверие"
+      xaxis: "Ниво на Доверие"
+      yaxis: "Брой потребители"
+    emails:
+      title: "Имейлите са изпратени"
+      xaxis: "Ден"
+      yaxis: "Брой имейли"
+    user_to_user_private_messages:
+      xaxis: "Ден"
+      yaxis: "Брой съобщения"
+    system_private_messages:
+      title: "Система"
+      xaxis: "Ден"
+      yaxis: "Брой съобщения"
+    moderator_warning_private_messages:
+      title: "Предупреждение от Модератор"
+      xaxis: "Ден"
+      yaxis: "Брой съобщения"
+    notify_moderators_private_messages:
+      title: "Уведоми Модераторите"
+      xaxis: "Ден"
+      yaxis: "Брой съобщения"
+    notify_user_private_messages:
+      title: "Уведоми потребител"
+      xaxis: "Ден"
+      yaxis: "Брой съобщения"
+    top_referrers:
+      title: "Топ Референти "
+      xaxis: "Потребител"
+      num_clicks: "Кликвания"
+      num_topics: "Теми"
+    top_traffic_sources:
+      title: "Топ източници на трафик "
+      xaxis: "Домейн"
+      num_clicks: "Кликвания"
+      num_topics: "Теми"
+      num_users: "Потребители"
+    top_referred_topics:
+      title: "Top Посочени Теми "
+      xaxis: "Тема"
+      num_clicks: "Кликвания"
+    page_view_anon_reqs:
+      title: "Анонимен"
+      xaxis: "Ден"
+    page_view_logged_in_reqs:
+      title: "Вписани"
+      xaxis: "Ден"
+    page_view_crawler_reqs:
+      title: "Роботи"
+      xaxis: "Ден"
+    page_view_total_reqs:
+      xaxis: "Ден"
+    page_view_logged_in_mobile_reqs:
+      xaxis: "Ден"
+    page_view_anon_mobile_reqs:
+      xaxis: "Ден"
+    http_background_reqs:
+      title: "Фон"
+      xaxis: "Ден"
+      yaxis: "Заявки използвани за обновяване и проследяване в реално време"
+    http_2xx_reqs:
+      title: "Статус 2xx (OK)"
+      xaxis: "Ден"
+      yaxis: "Успешни заявки (Статус 2xx)"
+    http_3xx_reqs:
+      title: "HTTP 3xx (Redirect)"
+      xaxis: "Ден"
+      yaxis: "Редирект заявки (Status 3xx)"
+    http_4xx_reqs:
+      title: "HTTP 4xx (Client Error)"
+      xaxis: "Ден"
+      yaxis: "Client Errors (Status 4xx)"
+    http_5xx_reqs:
+      title: "HTTP 5xx (Server Error)"
+      xaxis: "Ден"
+      yaxis: "Server Errors (Status 5xx)"
+    http_total_reqs:
+      title: "Общо"
+      xaxis: "Ден"
+      yaxis: "Общо заявки"
+    time_to_first_response:
+      title: "Време до първия отговор"
+      xaxis: "Ден"
+      yaxis: "Средно време (часове)"
+    topics_with_no_response:
+      title: "Теми без отговор"
+      xaxis: "Ден"
+      yaxis: "Общо"
+    mobile_visits:
+      title: "Потребителски посещения "
+      xaxis: "Ден"
+      yaxis: "Брой на посещенията"
+  dashboard:
+    rails_env_warning: "Вашият сървър е в % {env} режим."
+    host_names_warning: "Вашият config/database.yml файл използва по подразбиране localhost за hostname. Обновете, за да използва името на вашия сайт за hostname. "
+    gc_warning: 'Вашият сървър използва default ruby garbage collection parameters, които не Ви гарантират най-добрата производителност. Прочетете тази тема за настройки <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a>.'
+    sidekiq_warning: 'Sidekiq не работи. Много задачи, като изпращане на имейли, се изпълняват несинхронизирано от sidekiq.  Моля убедете се, че поне един процес sidekiq работи.  <a href="https://github.com/mperham/sidekiq" target="_blank">Научете повече за Sidekiq тук</a>.'
+    memory_warning: 'Вашият сървър използва по-малко от 1 ГБ от общата памет. Препоръчва се най-малко 1 ГБ.'
+    google_oauth2_config_warning: 'Сървърът е конфигуриран да позволи регистрация и вписване с Google OAuth2 (enable_google_oauth2_logins), но client id и client secret values не са определени. Отидете на <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: 'Сървърът е конфигуриран да позволи регистрация и вписване с Facebook (enable_facebook_logins), app id и app secret values  не са изпратени. Отидете на  <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: 'Сървърът е конфигуриран да позволи регистрация и вписване със Twitter (enable_twitter_logins),но the key and secret values не са изпратени. Отидете на <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: 'Сървърът е конфигуриран да позволи регистрация и вписване с GitHub (enable_github_logins), но client id и secret values не са изпратени. Отидете на <a href="/admin/site_settings">Настройките на сайта</a> и обновете настройките<a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">За повече информация вижте тук</a>.'
+    image_magick_warning: 'Сървърът е конфигуриран за създаване на умалени изображения на оригиналните, но ImageMagick не е инсталиран. Инсталирайте ImageMagick използвайки вашия системен мениджър или <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">изтеглете най-новата версия</a>.'
+    subfolder_ends_in_slash: "Вашата настройка за подпапка е неправилна; DISCOURSE_RELATIVE_URL_ROOT завършва с наклонена черта."
+  site_settings:
+    censored_words: "Думите които ще бъдат автоматично заменени с &#9632;&#9632;&#9632;&#9632;"
+    delete_old_hidden_posts: "Автоматично изтриване на всички скрити постове, които остават скрити за повече от 30 дни."
+    allow_user_locale: "Позволи на потребителите да избират език на интерфейса"
+    min_post_length: "Минимално допустимо количество символи в едно съобщение"
+    min_first_post_length: "Минимално допустими символи в първата публикация (тялото на темата)."
+    max_post_length: "Максимално допустимо количество символи в едно съобщение"
+    min_topic_title_length: "Минимално допустимо количество символи в името на темата"
+    max_topic_title_length: "Максимално допустимо количество символи в името на темата"
+    min_search_term_length: "Минимално допустимо количество символи в заявката за търсене"
+    allow_uncategorized_topics: "Позволи създаването на теми без категория. ВНИМАНИЕ: Ако има някакви не категоризирани теми, трябва да ги категоризирате, преди да изключите тази опция."
+    allow_duplicate_topic_titles: "Позволи теми с идентични, дублиращи се заглавия."
+    unique_posts_mins: "Колко минути са необходими, за да може потребителя да направи отново публикация със същото съдържание"
+    educate_until_posts: "Когато потребителят започне да пише своите първи (n) публикации, покажи поп-ъп панела за \"обучение на нови потребители\" в \"composer\" панела. "
+    title: "Наименованието на този сайт , както е използвано в заглавния маркер."
+    site_description: "Опишете този сайт с едно изречение като използвате мета описателен таг."
+    contact_url: "Контакт URL за този сайт. Използва се в /about контакт формата при спешни случаи."
+    crawl_images: "Възстановете изображенията от отдалечения URLs,  за да въведете размери с правилната дължина и ширина."
+    download_remote_images_to_local: "Конвертирайте отдалечените изображения в местни изображения като ги свалите; това ще предотврати повредата им."
+    download_remote_images_threshold: "Минимум необходимо дисково пространство за изтеглянето на отдалечените изображения ( в проценти)"
+    disabled_image_download_domains: "Отдалечените изображения никога няма да бъдат изтеглени от тези домейни. Разделен със знака \"|\" списък."
+    post_edit_time_limit: "Авторът може да промени или изтрие своя пост (n) минути след публикацията. Задайте 0 за постоянно."
+    edit_history_visible_to_public: "Позволи на всички потребители да видят предишните версии на публикацията. Ако е деактивитано, историята на публикациите ще бъде видима само за членовете на персонала. "
+    delete_removed_posts_after: "Публикации, които са премахнати от автор ще бъдат автоматично  изтрити след (n) часа. Ако е зададено 0, публикациите ще бъдат изтрити веднага."
+    max_image_width: "Максимална ширина на умалените изображения в публикацията"
+    max_image_height: "Максимална височина на умалените изображения в публикаципта"
+    fixed_category_positions: "Ако е отметнато, ще можете да подредите категориите в определен ред. Ако не е, категориите ще бъдат подредени според нивото им на активност."
+    fixed_category_positions_on_create: "Ако е избрано, подредвата на категориите ще се запази и в диалоговия прозорец за създаване на тема (изисква fixed_category_positions)."
+    add_rel_nofollow_to_user_content: "Добави \"rel nofollow\" към всички връзки с изключение на вътрешните ( включително домейн майките). Промяната на тази настройка изисква актуализация на всички публикации със \"rake posts:rebake\""
+    post_excerpt_maxlength: "Максимална дължина на откъс / резюме от публикацията."
+    post_onebox_maxlength: "Максимална дължина на oneboxed Discourse публикация в писмени знаци."
+    apple_touch_icon_url: "Иконата се използва за Apple сензорни устройства. Препоръчителният размер е  144px по 144px"
+    notification_email: "Подател: имейлът се използва при изпращане на всички системни съобщения. Посоченият тук домейн трябва да се конфигурира правилно със SPF, DKIM и PTR данни за успешна доставка."
+    email_custom_headers: "Разделен със знака \"|\" списък от персонализирани имейл хедъри. "
+    email_subject: "Персонализиран формат на темата за стандартни имейли. Виж https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801"
+    summary_score_threshold: "Минимална оценка необходима за една публикация, за да бъде включена в \"Обобщи тази тема\""
+    summary_posts_required: "Минимум публикации в темата преди \"Обобщи тази тема\" да бъде активирано"
+    summary_likes_required: "Минимум харесвания в темата преди \"Обобщи тази тема\" да бъде активирано"
+    summary_percent_filter: "Когато потребителят кликне върху \"Обобщи тази тема\", се показват % от най-добрите публикации "
+    summary_max_results: "Максимум публикации върнати от \"Обобщи тази тема\""
+    enable_long_polling: "Системата за обработка на известия, да използва long polling - заявки с дълго изчакване / дълъг интервал "
+    long_polling_base_url: "Основен URL използван за long polling - проверка на дълги интервали (когато се използва CDN за динамично съдръжание, уверете се, че тази стойност е настроена към основното съдържание) Например: http://origin.site.com"
+    long_polling_interval: "Времето, през което сървърът трябва да изчака преди да отговори на клиентите, когато няма данни за изпращане (влезли потребители само)"
+    polling_interval: "Когато няма \"long polling\", колко често логнатите потребители трябва да правят заявка към сървъра  в милисекунди"
+    anon_polling_interval: "Колко често трябва анонимни клиенти да правят заявка към сървъра  в милисекунди"
+    background_polling_interval: "Колко често трябва клиентите да правят заявка към сървъра в милисекунди (когато прозорецът е на заден план)"
+    cooldown_minutes_after_hiding_posts: "Брой минути, през които потребителя трябва да чака,  преди да може да редактира скрита заради потребителско сигнализиране публикация "
+    tl2_additional_likes_per_day_multiplier: "Увеличи лимита от харесвания на ден за tl2 (member)  до"
+    tl3_additional_likes_per_day_multiplier: "Увеличи лимита от харесвания на ден за tl3 (regular) до"
+    tl4_additional_likes_per_day_multiplier: "Увеличи лимита от харесвания на ден за tl4 (leader) до"
+    flag_sockpuppets: "Ако нов потребител отговори на тема от същия IP адрес като на новия потребител, който е започнал темата, маркирайте и двете публикации като потенциален спам."
+    traditional_markdown_linebreaks: "Използвайте стандартния метод за пренасяне на нов ред в Markdown, който изисква два интервала за пренасянето на нов ред."
+    post_undo_action_window_mins: "Брой минути, през които потребителите могат да отменят своите действия в публикацията ( харесване, сигнал, и т.н.) "
+    must_approve_users: "Персоналът трябва да одобри всички нови потребителски акаунти, преди да им бъде разрешен достъп до сайта. ВНИМАНИЕ: Включвайки тази функция, достъпът до сайта ще бъде разрешен само за персонала на сайта!"
+    ga_universal_tracking_code: "Google универсален анализ (analytics.js) проследяващ код, напр.: UA-12345678-9; see http://google.com/analytics"
+    ga_universal_domain_name: "Google универсален анализ (analytics.js) име на домейн, напр.: mysite.com; вижте http://google.com/analytics"
+    allow_moderators_to_create_categories: "Позволи на модераторите да създават нови категории"
+    cors_origins: "Позволени източници за cross-origin requests (CORS). Всеки източник трябва да включва http:// или https://. \nПроменливата за DISCOURSE_ENABLE_CORS env трябва да бъде правилно настроена за да позволи CORS."
+    top_menu: "Определете кои елементи да се показват в навигацията на началната страница, и в какъв ред. Например последни|нови|непрочетени|категории|топ|прочетени|публикувани|отметки"
+    post_menu: "Определете кои елементи да се появяват в менюто на публикацията, и в какъв ред. Например like|edit|flag|delete|share|bookmark|reply"
+    post_menu_hidden_items: "Меню елементите над публикацията, които трябва да се скриват и появяват при натискане на бутона с многоточието."
+    share_links: "Определете кои елементи да се появяват в споделен диалог и в какъв ред. "
+    track_external_right_clicks: "Абонирането за външни връзки с кликане на десен бутон (например: отвори в нов прозорец) е изключено по подразбиране, защото пренаписва URL-тата"
+    site_contact_username: "Валидно потребителско име на член от персонала за изпращане на автоматизираните съобщения. Ако оставите празно, ще бъде използвано потребителско име по подразбиране."
+    send_welcome_message: "Изпращай съобщение за добре дошли към всички нови потребители  с инструкции за бързо започване."
+    suppress_reply_directly_below: "Не показвай брояча на отговорите когато има само един отговор точно под тази публикация."
+    suppress_reply_directly_above: "Не показвай разширяемо \"в отговор до\" на публикация когато има само един отговор директно над нея."
+    suppress_reply_when_quoting: "Не показвай в разширен вид отговора на публикацията, когато публикацията е цитирана в отговора."
+    max_reply_history: "Максимален брой отговори за подробно представяне  при подробно представяне в отговора"
+    topics_per_period_in_top_summary: "Брой на най-добрите теми, показвани по подразбиране в резюмето с най-добрите теми."
+    topics_per_period_in_top_page: "Брой на най-добрите видими теми в показваните подробно \"Покажи повече\" топ теми."
+    redirect_users_to_top_page: "Автоматично пренасочване на нови и дълго отсъстващи потребители към началната страница."
+    show_email_on_profile: "Покажи имейлите на потребителите на техните профили (видими само за тях и за персонала) "
+    email_token_valid_hours: "Забравена парола / символите за активиране на акаунта са валидни (n) часа."
+    enable_badges: "Активирай системата за значки"
+    allow_index_in_robots_txt: "Посочете в robots.txt, че е позволено този сайт  да бъде индексиран от търсачките."
+    email_domains_blacklist: "Разделен със знака \"|\" списък на имейл домейните, от които потребителите нямат право да се регистрират. Например: mailinator.com|trashmail.net "
+    email_domains_whitelist: "Разделен със знака \"|\" списък на имейл домейните, от които потребителите трябва да се регистрират. ВНИМАНИЕ: Потребители с имейл домейни, различни от тези в списъка, няма да бъдат допуснати!"
+    log_out_strict: "При изход, да се прекратяват ВСИЧКИ сесии на този потребител на всички устройства "
+    version_checks: "Следи Discourse Hub за актуализации и показвай съобщение за нова версия на /admin таблото."
+    new_version_emails: "Изпратете имейл до contact_email адрес когато има нова версия на Discourse."
+    invite_expiry_days: "Колко дълго са валидни ключовете за покана, в дни"
+    login_required: "Изисква разпознаване за прочит на съдържанието на сайта, не е разрешен анонимен достъп."
+    min_password_length: "Минимална дължина на парола."
+    min_admin_password_length: "Минимална дължина на парола за Админ."
+    block_common_passwords: "Не са разрешени паролите, които са в топ 10,000 от най-често използваните."
+    enable_sso: "Активиране на SSO чрез външен сайт (ВНИМАНИЕ: Имейл адресите на потребителите трябва да бъдат потвърдени от външния сайт!)"
+    verbose_sso_logging: "Запис на дебъг съобщенията свързани със SSO  в папка /logs"
+    enable_sso_provider: "Имплементиране на Discourse SSO протокол в /session/sso_provider крайна точка, изисква sso_secret да бъде настроен"
+    sso_secret: "Таен стринг използван за криптографско удостоверяване на SSO  информацията, уверете се, че е минимум 10 символа"
+    sso_overrides_email: "Заместване на локалния имейл с друг от външен сайт от SSO доставчика при всяко влизане, и предотвратяване на локални промени. (ВНИМАНИЕ: могат да настъпят несъответствия поради нормализирането на локалните имейли)"
+    sso_overrides_username: "Заместване на локалното потребителско име с друго от външен сайт от SSO доставчика при всяко влизане, и предотвратяване на локални промени. (ВНИМАНИЕ: могат да настъпят несъответствия поради нормализирането на потребителското име с дължината/изискванията)"
+    sso_overrides_name: "Сменете потребителското име с това, което е предоставено от SSO доставчика."
+    sso_overrides_avatar: "Заместване на потребителския аватар с друг от външен сайт от SSO payload. Ако е разрешено деактивирането на allow_uploaded_avatars е препоръчително"
+    sso_not_approved_url: "Пренасочване на неодобрените SSO акаунти към този URL"
+    allow_new_registrations: "Позволи регистрация на нови потребители. Махни отметката, за да не може никой да създаде нов акаунт."
+    enable_yahoo_logins: "Активиране на Yahoo удостоверяване"
+    enable_google_oauth2_logins: "Активиране на Google Oauth2 удостоверяване. Това е начина на удостоверяване, който се поддържа от Google в момента. Изисква key и secret."
+    google_oauth2_client_id: "Client ID за Google приложение."
+    google_oauth2_client_secret: "Client secret за Google приложение."
+    enable_twitter_logins: "Активиране на Twitter удостоверяване, изисква  twitter_consumer_key и twitter_consumer_secret"
+    enable_facebook_logins: "Активиране на Facebook удостоверяване изисква facebook_app_id и facebook_app_secret "
+    facebook_app_id: "App id за Facebook удостоверяване, регистрирано на https://developers.facebook.com/apps"
+    facebook_app_secret: "App secret за Facebook удостоверяване, регистрирано на https://developers.facebook.com/apps"
+    enable_github_logins: "Разрешете Github удостоверяване, изисква github_client_id и github_client_secret"
+    github_client_id: "Client id за Github удостоверяване, регистрирано на https://github.com/settings/applications"
+    github_client_secret: "Client secret за Github удостоверяване, регистриран на https://github.com/settings/applications"
+    allow_restore: "Позволи възстановяване, което може да замени ВСИЧКИ данни на сайта! Оставете го погрешно освен ако не планирате да възстановите бекъпа"
+    maximum_backups: "Максимално количество бекъпи, които могат да бъдат съхранени на диска. По-старите бекъпи са автоматично изтрити"
+    enable_s3_backups: "Качи бекъпи на S3 когато е пълен. ВАЖНО: изисква валидни S3 правомощия въведени в настройките на файловете."
+    s3_backup_bucket: "Remote bucket за съхранение на бекъпи. ВНИМАНИЕ: Бъдете сигурни, че това е remote bucket."
+    active_user_rate_limit_secs: "Колко често обновяваме полето the 'last_seen_at', в секунди "
+    verbose_localization: "Покажи разширени локализационни съвети в потребителския интерфейс "
+    previous_visit_timeout_hours: "Колко дълго трябва да продължи посещението на сайта, за да се счита за \"предишно\" посещение, в часове"
+    rate_limit_create_topic: "След създаването на тема, потребителите трябва да изчакат (n) секунди преди да създадат друга тема."
+    rate_limit_create_post: "След публикуване, потребителите трябва да изчакат (n) секунди преди да направят друга публикация."
+    rate_limit_new_user_create_topic: "След създаването на тема, новите потребители трябва да изчакат (n) секунди преди да създадат друга тема."
+    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_invites_per_day: "Максимален брой покани на потребител за ден."
+    max_topic_invitations_per_day: "Максимален брой покани за теми, които потребител може да изпрати за един ден."
+    suggested_topics: "Брой на предложените теми, показани в долната част на една тема."
+    limit_suggested_to_category: " В списъка с предложените теми покажи теми, само от текущата категория."
+    clean_up_uploads: "Прамахни грубите непубликувани качени файлове, за да бъде предотвратен незаконен хостинг. ВАЖНО: може би искате да направите резервно копие на тази директория преди да разрешите тази настройка."
+    clean_orphan_uploads_grace_period_hours: "Гратисен период (в часове) преди непубликуваните прикачени файлове да бъдат премахнати."
+    purge_deleted_uploads_grace_period_days: "Гратисен период (в дни) преди изтритите качвания да бъдат заличени."
+    enable_s3_uploads: "Постави качените файлове на Amazon S3 storage. ВАЖНО: изисква валидни S3 идентификационни данни (both access key id & secret access key)."
+    s3_upload_bucket: "Име на Amazon S3 bucket в което ще се качват файловете. ВНИМАНИЕ: трябва да съдържа само малки букви, без разстояния и долни черти."
+    s3_access_key_id: "Amazon S3 secret access key който ще се използва за качването на изображения."
+    s3_secret_access_key: "Amazon S3 secret access key който ще се използва за качването на изображения."
+    s3_region: "The Amazon S3 region name който ще се използва за качването на изображения."
+    s3_cdn_url: "URL адресът на URL да се използва за всички s3 авоари (например: https://cdn.somewhere.com). ВНИМАНИЕ: след промяната на тази настройка трябва да преработите всичките си публикации."
+    avatar_sizes: "Списък от автоматично генерираните размери на аватари"
+    enable_flash_video_onebox: "Разрешаване на ембедване на swf и flv (Adobe Flash) линкове в oneboxes. ВНИМАНИЕ: това може да създаде проблеми със сигурността."
+    default_invitee_trust_level: "По подразбиране ниво на доверие (0-4) за невалидни потребители."
+    default_trust_level: "Ниво на доверие (0-4) по подразбиране за всички нови потребители. ВНИМАНИЕ! Промяната на това ще ви постави в сериозен риск за спам."
+    tl1_requires_topics_entered: "Колко теми трябва да отвори нов потребител, за да премине към ниво на доверие 1."
+    tl1_requires_read_posts: "Колко публикации трябва да прочете нов потребител, за да премине към ниво на доверие 1."
+    tl1_requires_time_spent_mins: "Колко минути трябва да чете публикации нов потребител, за да премине към ниво на доверие 1."
+    tl2_requires_topics_entered: "Колко теми трябва да отвори нов потребител, за да премине към ниво на доверие 2."
+    tl2_requires_read_posts: "Колко публикации трябва да прочете нов потребител, за да премине към ниво на доверие 2."
+    tl2_requires_time_spent_mins: "Колко минути трябва да чете публикации нов потребител, за да премине към ниво на доверие 2."
+    tl2_requires_days_visited: "Колко дни трябва потребителя да посещава сайта, за да премине към ниво на доверие 2."
+    tl2_requires_likes_received: "Колко харесвания трябва да има потребител, за да премине към ниво на доверие 2."
+    tl2_requires_likes_given: "Колко харесвания трябва да направи потребител, за да премине към ниво на доверие 2."
+    tl2_requires_topic_reply_count: "На колко теми трябва да отговори потребител, за да премине към ниво на доверие 2."
+    tl3_time_period: "Изисквания за Ниво на доверие 3 във времеви период (в дни)"
+    tl3_requires_topics_viewed_all_time: "Общ минимален брой теми, които потребителят трябва да прегледа, за да се класира за ниво на доверие 3."
+    tl3_requires_posts_read_all_time: "Общ минимален брой публикации, които потребителят трябва да прочете, за да се класира за ниво на доверие 3."
+    tl3_promotion_min_duration: "Минимален брой дни, през които трае повишението на ниво на доверие 3 преди потребителят да бъде понижен обратно на ниво на доверие 2."
+    tl3_links_no_follow: "Не премахвайте  rel=nofollow от линковете, публикувани от потребители с ниво на доверие 3."
+    min_trust_to_create_topic: "Минимално ниво на доверие изисквано за създаване на нова тема"
+    min_trust_to_edit_wiki_post: "Минимално ниво на доверие изисквано за редактиране на wiki."
+    newuser_max_links: "Колко линка може да добави в публикация нов потребител."
+    newuser_max_images: "Колко изображения може да добави нов потребител в публикацията си."
+    newuser_max_attachments: "Колко прикачени файла може да добави нов потребител в публикацията си."
+    newuser_max_mentions_per_post: "Максимален брой споменавания на други потребители @name, които нов потребител може да направи."
+    newuser_max_replies_per_topic: "Максимален брой отговори, които нов потребител може да направи докато някой друг не отговори."
+    max_mentions_per_post: "Максимален брой споменавания на @name, които един потребител може да направи."
+    create_thumbnails: "Създадените миниатюри и Lightbox изображения са прекалено големи, за да се поберат в една публикация."
+    email_time_window_mins: "Изчакайте (n) минути преди да изпратите уведомителни имейли, за да дадете шанс на потребителите да редактират и финализират своите публикации."
+    email_posts_context: "Колко предишни отговори да бъдат включени като контекст в уведомителните имейли."
+    flush_timings_secs: "Колко често данните за време се записват на сървъра, в секунди"
+    title_max_word_length: "Малсимално разрешена дължина на думата в символи в заглавието на темата"
+    title_min_entropy: "Минимална ентропия ( уникални символи, тези които не са английски  се броят за повече) изисквана за заглавието на темата."
+    body_min_entropy: "Минимална ентропия ( уникални символи, тези които не са английски  се броят за повече) изисквана за текста на публикацията."
+    title_fancy_entities: "Конвертирайте обикновените ASCII символи в луксозните HTML символи в заглавията на темите, ala SmartyPants http://daringfireball.net/projects/smartypants/"
+    min_title_similar_length: "Минимална дължина на заглавието на темата, като тя ще бъде проверена за наличие на подобна."
+    min_body_similar_length: "Минимална дължина на съдържанието на публикацията, при което то ще бъде проверено за наличие на подобно."
+    category_colors: "Списък от шестнадесетични цветови стойности разрешени за категориите."
+    category_style: "Визуален стил за категорията със значки."
+    max_image_size_kb: "Максимален размер за качване на избражение в kB. Това също трябва да се конфигурира в nginx конфигурацията (client_max_body_size), apache или прокси сървъра."
+    max_attachment_size_kb: "Максимална големина на прикачените файлове в kB. Това също трябва да се конфигурира в nginx (client_max_body_size), apache или прокси сървъра."
+    authorized_extensions: "Списък от разширения на файлове разрешени за качване (използвайте '*' за да разрешите всички)"
+    max_similar_results: "Брой подобни теми показвани на потребителя при създаването на нова тема. Сравнението е базирано на заглавието и текста на темата."
+    title_prettify: "Предотврати разпространението на печатни грешки, грешки включващи главни букви, малки букви, излишни ! и ? в края на изречението и т.н."
+    topic_views_heat_low: "След толкова много прегледи, полето на прегледаните ще бъде леко подчертано."
+    topic_views_heat_medium: "След толкова много прегледи, полето на прегледаните ще бъде умерено подчертано."
+    topic_views_heat_high: "След толкова много прегледи, полето на прегледаните ще бъде силно подчертано."
+    cold_age_days_low: "След толкова много дни на разговори, последната дата с активност ще бъде леко бледа"
+    cold_age_days_medium: "Толкова много дни след последната активност в разговора, последната дата е умерено подчертана."
+    cold_age_days_high: "Толкова много дни след последната активност в разговора, последната дата е силно подчертана."
+    history_hours_low: "Публикация, редактирана в рамките на толкова много часове, ще бъде индикирана като леко подчертана"
+    history_hours_medium: "Публикация, редактирана в рамките на толкова много часове, ще бъде индикирана като умерено подчертана."
+    history_hours_high: "Публикация, редактирана в рамките на толкова много часове, ще бъде индикирана като силно подчертана"
+    topic_post_like_heat_low: "След харесване: ако съотношението на публикации надхвърля това съотношение, полето с броя на публикациите ще е леко подчертано. "
+    topic_post_like_heat_medium: "След харесване: ако съотношението на публикациите надхвърля това съотношение, полето с броя на публикации ще е умерено подчертано."
+    topic_post_like_heat_high: "След харесване:ако съотношението на публикациите надхвърля това съотношение, полето с броя на публикациите ще е силно подчертано."
+    faq_url: "Въведете пълен URL към страницата FAQ, ако искате да използвате собствена версия."
+    tos_url: "Ако имате документ с \"Правила за ползване\" който се хоства някъде другаде и желаете да го използвате, въведете пълния път до URL адреса тук. "
+    privacy_policy_url: "Ако имате документ \"Декларация за поверителност\", който се хоства някъде другаде и желаете да го използвате, въведете пълния път до URL адреса тук. "
+    white_listed_spam_host_domains: "Списък с домейните изключени от спам хост теста. Новите потребители никога няма да бъдат ограничавани в създаването на публикации с линкове към тези домейни."
+    staff_like_weight: "Колко допълнителна тежест да се дава за харесвания от екипа."
+    levenshtein_distance_spammer_emails: "Колко символа разлика в съвпадението може да има, когато се проверява имейла за спам, за да има приблизително съвпадение."
+    max_new_accounts_per_registration_ip: "Ако вече има (n) в ниво на доверие 0 акаунта от това IP (и никой не е от екипа или от по-високо ниво на доверие 2), спри да приемаш нови регистрации от този IP адрес."
+    min_ban_entries_for_roll_up: "Когато щракнете на бутона Сливане, ще създадете нов бан на подмрежа, ако в същата има повече от (N)   записа."
+    max_age_unmatched_emails: "Изтриване на несъвпадащите пресяти имейл записи след (N) дни."
+    max_age_unmatched_ips: "Изтрий  несъчетаните пресяти IP вписвания след (N) дни."
+    num_flaggers_to_close_topic: "Минимален брой уникални сигнализации, които се изискват за спиране на темата"
+    num_flags_to_close_topic: "Минимален брой активни сигнали, които се изискват за спиране на темата"
+    auto_respond_to_flag_actions: "Активиране на автоматичен отговор с помощта на сигналите на сайта."
+    reply_by_email_enabled: "Позволи отговори в темите чрез имейл."
+    reply_by_email_address: "Шаблон за отговор по имейла на входящ имейл адрес, например: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com"
+    disable_emails: "Забрани Discoursе да изпраща каквито и да е имейли "
+    strip_images_from_short_emails: "Премахни от имейлите по-малките от 2800 байта изображения"
+    short_email_length: "Колко байта имейл се счита за кратък"
+    pop3_polling_enabled: "Проверка чрез POP3 за имейл отговорите."
+    pop3_polling_ssl: "Използвай SSL при свързване със сървъра POP3. (Препоръчително)  "
+    pop3_polling_period_mins: "Срок в минути за проверката на POP3 акаунта за имейл. ЗАБЕЛЕЖКА: изисква рестарт."
+    pop3_polling_port: "Порт за проверка на POP3 акаунт."
+    pop3_polling_host: "Хост за проверка на имейла чрез POP3."
+    pop3_polling_username: "Потребителско име за POP3 акаунт за проверка на имейла."
+    pop3_polling_password: "Парола за POP3 акаунт за проверка на имейла. "
+    email_in_min_trust: "Минимално ниво на доверие, което потребителя трябва да притежава, за да публикува нови теми чрез имейл."
+    email_prefix: " [label] се използва като тема на имейлите. Ако не бъде определено, ще бъде използвано \"заглавие\" по подразбиране."
+    email_site_title: "Заглавието на сайта се използва като подател на имейлите от сайта. Ако не бъде определено, ще бъде използвано \"заглавие\" по подразбиране. Ако вашето \"заглавие\" съдържа символи, които не са позволени, използвайте тази настройка."
+    minimum_topics_similar: "Колко теми трябва да съществуват преди да бъдат представени подобни теми при създаването на нови."
+    relative_date_duration: "Брой дни след публикацията, през които датата на публикуването ще бъде показвана като относителна ( 7д) вместо абсолютна ( 20 Фев.)."
+    delete_user_max_post_age: "Забрани изтриване на потребители, чиято първа публикация е по-стара от (x) дни."
+    delete_all_posts_max: "Максимален брой публикации, които могат да бъдат изтрити наведнъж с бутона за изтриване на всички публикации. Ако потребителят има по-голям брой публикации от този, то те не могат да бъдат изтрити наведнъж, следователно и потребителя не може да бъде изтрит."
+    email_editable: "Разреши на потребителите да променят техния имейл адрес след регистрация."
+    allow_uploaded_avatars: "Позволи на потребителите да качват свои снимки на профилите си."
+    allow_animated_thumbnails: "Създай анимирани миниатюри на анимираните GIF изображения."
+    default_avatars: "URL за аватари, които ще бъдат използвани по подразбиране за нови потребители, преди те да ги променят"
+    automatically_download_gravatars: "Свали Gravatar за потребителите преди създаването на профил или промяна на имейла."
+    max_daily_gravatar_crawls: "Максимален брой сваляния на аватари с Gravatar за ден"
+    public_user_custom_fields: "Списък с позволени допълнителни полета за потребителите, които могат да бъдат показани публично."
+    staff_user_custom_fields: "Списък с позволени допълнителни полета за потребителите, които могат да бъдат показани на членове на екипа."
+    enable_user_directory: "Осигури директория за потребителско търсене"
+    allow_anonymous_posting: "Разреши на потребителите да включват анонимен режим"
+    anonymous_posting_min_trust_level: "Минимално ниво на доверие което се изисвка за да се разреши анонимното публикуване."
+    anonymous_account_duration_minutes: "За да се защити анонимността създавай нови анонимни акаунти на всеки N минути за всеки потребител. Например: Ако е настроено на 600, означава, че 600 минути след последния пост на потребителя, след като той излезе, ще бъде създаден анонимен акаунт."
+    allow_profile_backgrounds: "Позволи на потребителите да качват фонове на профилите си."
+    enable_mobile_theme: "Мобилните устройства използват адаптирана тема с възможност за преминаване към нормален изглед. Забранете тази настройка, ако искате да използвате свой собствен стил за мобилните устройства."
+    dominating_topic_minimum_percent: "Какъв процент публикации може да направи един потребител преди да бъде предупреден за доминиране в тема."
+    suppress_uncategorized_badge: "Не показвай значката в списъците с теми за тези, които не  са категоризирани. "
+    global_notice: "Покажи МНОГО ВАЖНО, СПЕШНО съобщение на всички посетители. Премахване на съдържанието, за да бъде скрито ( HTML позволено)."
+    disable_edit_notifications: "Забрани редактирането на уведомления от системните потребители когато 'download_remote_images_to_local'  е активно."
+    full_name_required: "Полето 'Пълно име' е задължително в потребителския профил"
+    enable_names: "Покажи пълното име на потребителите на техните профили, потребителски карти, и имейли. Деактивирай за скриване на пълното име навсякъде."
+    display_name_on_posts: "Покажи пълните имена на потребителите в техните публикации като допълнение към потребителските им имена @username."
+    show_time_gap_days: "Ако двете публикации са направени през такъв дълъг период, покажи разликата във времето в темата."
+    short_progress_text_threshold: "След достигането на определен брой публикации в темата, в лентата за напредъка ще бъде видим само броят на текущите публикации. Ако промените ширината на лентата за напредъка, може да се наложи да промените тази стойност. "
+    default_code_lang: "Подчертаване на  езиковия синтаксис по подразбиране  е приложен за GitHub code blocks (lang-auto, ruby, python etc.) "
+    warn_reviving_old_topic_age: "Когато някой започне да пише в тема, където последният отговор е от преди много време, ще се покаже предупреждение. Изключи с 0. "
+    autohighlight_all_code: "Оцветявай всички предварително форматирани кодови блокове, дори когато няма изрично посочен език."
+    embed_truncate: "Премахване на вградените публикации."
+    embed_post_limit: "Максимален брой публикации за вграждане."
+    show_create_topics_notice: "Ако на сайта има по-малко от 5 теми, покажи на персонала съобщение с молба за създаване на още теми."
+    delete_drafts_older_than_n_days: Изтрий чернови по-стари от (n) дни.
+    prevent_anons_from_downloading_files: "Предотврати свалянето на приложения от анонимни потребители. ВНИМАНИЕ: това ще  попречи на работата на всички авоари ,които са публикувани на сайта като  приложения без изображения. "
+    slug_generation_method: "Изберете метод за генериране на URL. 'кодирано' ще използва букви  URL, кодирани с проценти. 'не' ще откаже генерацията като цяло."
+    enable_emoji: "Разреши емотикони"
+    emoji_set: "Как бихте искали да е вашата емотикона?"
+    enforce_square_emoji: "Направи квадратни всички емотикони."
+    approve_unless_trust_level: "Постовете на потребители с по-ниско от това ниво на доверие трябва да бъдат одобрени"
+    default_email_direct: "Изпращай имейл по подразбиране, когато някой цитира, отговаря на публикацията или споменава името на потребителя."
+    default_email_mailing_list_mode: "Изпращай ми имейл по подразбиране за всяка нова публикация."
+    default_email_always: "Изпращай ми имейл известия по подразбиране, дори когато потребителя е активен на сайта."
+    default_other_new_topic_duration_minutes: "Глобално състояние по подразбиране за всяка тема, която се счита за нова."
+    default_other_auto_track_topics_after_msecs: "Глобално време по подразбиране, преди темата да бъде автоматично следена."
+    default_other_external_links_in_new_tab: "Отваряй външните връзки в нов раздел по подразбиране."
+    default_other_enable_quoting: "Включи отговор с цитат при маркиран текст по подразбиране."
+    default_other_dynamic_favicon: "Покажи броя на новите / обновените теми в иконата на браузъра по подразбиране."
+    default_other_disable_jump_reply: "Не отивай към моята публикация след като отговоря, по подразбиране."
+    default_categories_watching: "Списък с категории, които са прегледани, по подразбиране."
+    default_categories_tracking: "Списък с категории, които са следени, по подразбиране."
+    default_categories_muted: "Списък с категории, които са заглушени, по подразбиране."
+    errors:
+      invalid_email: "Невалиден имейл адрес."
+      invalid_username: "Няма потребител с такова потребителско име."
+      invalid_integer_min_max: "Стойността трябва да мъде между  %{min} и %{max}."
+      invalid_integer_min: "Стойността трябва да бъде %{min} или по-голяма"
+      invalid_integer_max: "Стойността не може да бъде по-голяма от %{max}."
+      invalid_integer: "Стойността трябва да бъде число."
+      regex_mismatch: "Стойноста не съвпада с необходимия формат."
+      must_include_latest: "Заглавното меню трябва да включва таб-а \"последни\"."
+      invalid_string: "Невалидна стойност."
+      invalid_string_min_max: "Трябва да бъде между  %{min} и %{max} символа."
+      invalid_string_min: "Трябва да бъде минимум %{min} символа."
+      invalid_string_max: "Трябва да не бъде с повече от %{max} символа."
+      invalid_reply_by_email_address: "Стойността трябва да съдържа '%{reply_key}' и да бъде различна от известяващия имейл."
+  search:
+    within_post: "#%{post_number} от %{username}"
+    types:
+      category: 'Категории'
+      topic: 'Резултати'
+      user: 'Потребители'
+  original_poster: "Автор"
+  most_posts: "Повечето мнения"
+  most_recent_poster: "Последен Автор"
+  frequent_poster: "Частен Автор"
+  redirected_to_top_reasons:
+    new_user: "Добре дошли в нашата общност! Това са най-популярните последни теми. "
+    not_seen_in_a_month: "Добре дошли отново! Това са най-популярните теми за времето, през което Ви нямаше."
+  change_owner:
+    post_revision_text: "Собствеността е прехвърлена от %{old_user} към %{new_user}"
+    deleted_user: "изтрит потребител"
+  topic_statuses:
+    archived_enabled: "Тази тема в момента е в архив. Тя е замразена и не може да се променя по никакъв начин."
+    archived_disabled: "Тази тема е разархивирана. Вече не е замразена и може да се променя."
+    closed_enabled: "Тази тема е затворена. Вече не е разрешено да се отговаря в нея."
+    closed_disabled: "Тази тема сега е отворена. Новите отговори са разрешени."
+    autoclosed_enabled_days:
+      one: Тази тема ще се затвори автоматично след 1 ден. Нови отговори вече не се допускат.
+      other: Тази тема ще се затвори автоматично след %{count} дни. Нови отговори вече не се допускат.
+    autoclosed_enabled_hours:
+      one: Тази тема ще се затвори автоматично след 1 час. Нови отговори не се допускат.
+      other: Тази тема ще се затвори автоматично след %{count} часа. Нови отговори не се допускат.
+    autoclosed_enabled_minutes:
+      one: Тази тема ще се затвори автоматично след 1 минута. Нови отговори не се допускат.
+      other: Тази тема ще се затвори автоматично след %{count} минути. Нови отговори не се допускат.
+    autoclosed_enabled_lastpost_days:
+      one: Тази тема беше автоматично затворена 1 ден след последния отговор. Нови отговори вече не са разрешени.
+      other: Тази тема беше автоматично затворена след %{count} дни след последния отговор. Нови отговори вече не са разрешени.
+    autoclosed_enabled_lastpost_hours:
+      one: Тази тема беше автоматично затворена 1 час след последния отговор. Отговорите в нея вече са забранени.
+      other: 'Тази тема беше автоматично затворена %{count} часа след последния отговор. Отговорите в нея вече са забранени. '
+    autoclosed_enabled_lastpost_minutes:
+      one: 'Тази тема беше автоматично затворена 1 минута след последния отговор. Отговорите в нея вече са забранени. '
+      other: 'Тази тема беше автоматично затворена %{count} минути след последния отговор. Отговорите в нея вече са забранени. '
+    autoclosed_disabled: "Тази тема сега е отворена. Новите отговори са разрешени."
+    autoclosed_disabled_lastpost: "Тази тема сега е отворена. Новите отговори са разрешени."
+    pinned_enabled: "Тази тема сега е закована. Тя ще се появява най-отгоре на категорията си и на всички списъци с теми, докато не бъде откована от член на персонала или индивидуално от потребителите."
+    pinned_disabled: "Тази тема вече не е закована. Повече няма да се появява най-отгоре на  категорията."
+    pinned_globally_enabled: "Тази тема сега е закована глобално. Тя ще се появява най-отгоре на категорията си и на всички списъци с теми, докато не бъде откована от член на персонала или индивидуално от потребителите."
+    pinned_globally_disabled: "Тази тема вече не е закована. Повече няма да се появява най-отгоре на  категорията."
+    visible_enabled: "Темата е вписана. Тя ще се почви в списъка с темите."
+    visible_disabled: "Тази тема е отписана. Тя вече няма да бъде видима в нито един списък с теми“ Единствения начин за достъп до нея е чрез директен линк."
+  login:
+    not_approved: "Вашият профил все още не е одобрен. Ще бъдете уведомени с имейл когато е възможно влизането Ви. "
+    incorrect_username_email_or_password: "Грешно потребителско име, имейл или парола."
+    wait_approval: "Благодарим Ви за регистрацията. Ще Ви уведомим когато вашият профил е одобрен."
+    active: "Профилът ви е активиран и готов за употреба."
+    not_activated: "Не можете да влезете все още. Ще ви изпратим имейл за активация. Моля следвайте инструкциите, за да активирате вашия профил."
+    not_allowed_from_ip_address: "Вие не може да влезете като %{username} от този IP адрес."
+    admin_not_allowed_from_ip_address: "Вие не може да влезете като админ от този IP адрес."
+    suspended: "Вие не може да влизате до %{date}."
+    suspended_with_reason: "Профилът е отстранен докато %{date}: %{reason}"
+    errors: "%{errors}"
+    not_available: "Не е налично. Опитайте %{suggestion}?"
+    something_already_taken: "Нещо се случи, вероятно потребителското име или имейл адреса са вече регистрирани. Опитайте да използвате връзката за забравена парола."
+    omniauth_error: "Съжаляваме, възникна грешка при потвърждението на вашия профил. Може би не сте приели потвърждението?"
+    omniauth_error_unknown: "Нещо се обърка докато Ви вписваме, моля опитайте отново."
+    new_registrations_disabled: "В момента новите регистации са забранени."
+    password_too_long: "Паролата е ограничена до 200 символа."
+    reserved_username: "Това потребителско име не е разрешено."
+    missing_user_field: "Вие не сте попълнили всички потребителски полета."
+    auth_complete: "Удостоверяването е завършено."
+    click_to_continue: "Кликнете тук, за да продължите."
+    already_logged_in: "Ами сега, изглежда, че се опитвате да приемете покана за друг потребител. Ако не сте  %{current_user}, моля, излезте от профила си и опитайте отново."
+    second_factor_title: "Удостоверяване с два фактора"
+    second_factor_description: "Моля, въведете необходимият код за удостоверяване от приложението си:"
+  user:
+    no_accounts_associated: "Няма свързани профили"
+    username:
+      short: "трябва да бъде минимум %{min} символа."
+      long: "трябва да не е повече от %{max} символа."
+      unique: "Трябва да бъде уникално"
+      blank: "Трябва да присъства"
+    email:
+      not_allowed: "не е разрешено от този имейл доставчик. Моля използвайте друг имейл адрес."
+      blocked: "не е разрешено"
+    ip_address:
+      blocked: "Не са разрешени нови регистрации от вашия IP адрес."
+      max_new_accounts_per_registration_ip: "Не са разрешени нови регистрации от вашия IP адрес (достигнали сте лимита). Свържете се с член на персонала."
+  flags_reminder:
+    subject_template:
+      one: 1 сигнал чакащ за обработка
+      other: '%{count} сигнала налични за обработка '
+  invite_mailer:
+    text_body_template: |
+      %{inviter_name} ви покани да се присъедините към дискусията
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      на
+
+      > %{site_title} -- %{site_description}
+
+      Ако се интересувате, кликнете на линка по-долу:
+
+      %{invite_link}
+  custom_invite_mailer:
+    text_body_template: |
+      %{inviter_name} ви покани да се присъедините към дискусията
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      на
+
+      > %{site_title} -- %{site_description}
+
+      Със тази бележка
+
+      > %{user_custom_message}
+
+      Ако се интересувате, кликнете на линка по-долу:
+
+      %{invite_link}
+  invite_forum_mailer:
+    text_body_template: |
+      %{inviter_name} ви кани да се присъедините към
+
+      > **%{site_title}**
+      >
+      > %{site_description}
+
+      Ако се интересувате, кликнете на линка по-долу:
+
+      %{invite_link}
+  custom_invite_forum_mailer:
+    text_body_template: |
+      %{inviter_name} ви покани да се присъедините към
+
+      > **%{site_title}**
+      >
+      > %{site_description}
+
+      Със тази бележка
+
+      > %{user_custom_message}
+
+      Ако се интересувате, кликнете на линка по-долу:
+
+      %{invite_link}
+  invite_password_instructions:
+    subject_template: "Сложете парола за вашият %{site_name} акаунт"
+  flag_reasons:
+    off_topic: "За вашата публикация беше сигнализирано като **оф-топик**: общността смята, че не се вписва в темата, впредвид заглавието на темата и първата публикация. "
+    inappropriate: "За вашата публикация беше сигнализирано като **неуместна**: общността счита, че е обидна, оскърбителна или нарушение на  [виж Правилата на Общността](/guidelines)."
+    spam: "За вашата публикация беше сигнализирано като **спам**: общността счита, че е реклама,  че е по скоро с  рекламна цел, отколкото полезна и уместна за темата."
+    notify_moderators: "За вашата публикация беше сигнализирано като **сигнал до модератор**: общността счита, че е необходима лична намеса от член на персонала."
+  flags_dispositions:
+    agreed: "Благодарим Ви за информацията. Съгласни сме, че има проблем и вече го разглеждаме."
+    agreed_and_deleted: "Благодарим Ви, за информацията. Съгласни сме, че има проблем и ще премахнем публикацията."
+    disagreed: "Благодарим Ви за информацията. Вече разглеждаме проблема."
+    deferred: "Благодарим Ви за информацията. Вече разглеждаме проблема. "
+    deferred_and_deleted: "Благодарим,Ви за информацията. Вече премахнахме публикацията."
+  system_messages:
+    welcome_user:
+      subject_template: "Добре дошли в %{site_name}!"
+    welcome_invite:
+      subject_template: "Добре дошли в %{site_name}!"
+    backup_succeeded:
+      subject_template: "Бекъпа завърши успещно."
+    backup_failed:
+      subject_template: "Бекъпа се провали"
+    restore_succeeded:
+      subject_template: "Възстановяването завърши успешно."
+    restore_failed:
+      subject_template: "Възстановяването се провали"
+    bulk_invite_succeeded:
+      subject_template: "Груповата потребителска покана e обработена успешно"
+      text_body_template: "Вашата групова потребителска покана от файл е обработена, %{sent} имейл покани бяха изпратени."
+    bulk_invite_failed:
+      subject_template: "Груповата потребителска покана завърши с грешки"
+    csv_export_failed:
+      subject_template: "Изходящите данни се провалиха  "
+    email_reject_parsing:
+      text_body_template: |
+        Съжаляваме, но вашето съобщение до %{destination} (titled %{former_title}) не може да бъде обработено.
+
+        Не намираме вашия отговор в съобщението. **Уверете се, че вашият отговор в горната част на съобщението** -- не можем да обработим инлайн отговори.
+    pending_users_reminder:
+      subject_template:
+        one: 1 потребител чака одобрение
+        other: '%{count} потребители чакат одобрение'
+      text_body_template: |
+        Има нови потребителски регистрации, които чакат да бъдат одобрени (отхвърлени) преди да получат достъп до този форум.
+
+        [Please review them in the admin section](%{base_url}/admin/users/list/pending).
+    download_remote_images_disabled:
+      subject_template: "Изтеглянето на отдалечение изображения е забранено"
+      text_body_template: " `download_remote_images_to_local`  настройка беше спряна защото лимита за дисково пространство в `download_remote_images_threshold` беше достигнат."
+  subject_re: "Ре: "
+  subject_pm: "[ЛС] "
+  user_notifications:
+    previous_discussion: "Предишни Отговори"
+    in_reply_to: "В отговор до"
+    unsubscribe:
+      title: "Отписвам"
+      description: "Не сте заинтересувани от тези имейли? Няма проблем! Кликнете по-долу, за да се отпишете веднага:"
+    posted_by: "Публикувано от  &{username} на %{post_date}"
+    user_replied:
+      title: "Потребителят е отговорил"
+    digest:
+      why: "Кратко резюме на %{site_link} след последното Ви посещение на %{last_seen_at}"
+      click_here: "кликнете тук"
+    signup_after_approval:
+      subject_template: "Вие бяхте одобрени на %{site_name}!"
+  page_not_found:
+    popular_topics: "Популярни"
+    recent_topics: "Скорошни"
+    see_more: "Повече"
+    search_title: "Търси този сайт"
+    search_google: "Google"
+  terms_of_service:
+    title: "Правила за ползване"
+    signup_form_message: 'Аз прочетох и приемам  <a href="/tos" target="_blank">правилата за ползване</a>.'
+  deleted: 'изтрит'
+  upload:
+    edit_reason: "изтеглено локално копие на изображенията"
+    unauthorized: "Съжеляваме, Файлът е забранен за качване (разрешени разширения : %{authorized_extensions})."
+    pasted_image_filename: "Публикувани изображения"
+    store_failure: "Грешка при зареждане на  #%{upload_id} за потребителя  #%{user_id}."
+    attachments:
+      too_large: "Съжaляваме, файлът който се опитвате да качите е много голям (максималния позволен размер е %{max_size_kb}%KB)."
+    images:
+      too_large: "Съжаляваме, изображението, което се опитвате да качите е прекалено голямо (максималният размер е %{max_size_kb}%KB), моля преоразмерете го и опитайте отново. "
+      size_not_found: "Съжаляваме, но не можем да определим размера на изображението. Възможно ли е изображението да е повредено?"
+  email_log:
+    no_user: "Няма потребител с id %{user_id}"
+    anonymous_user: "Потребителя е анонимен"
+    suspended_not_pm: "Бла бля бля\nБла бля бля"
+    seen_recently: "Потребителят скоро е забелязан "
+    post_not_found: "Няма публикация с id %{post_id}"
+    notification_already_read: "Уведомлението, за което е този имейл вече беше прочетено"
+    topic_nil: "post.topic is nil"
+    post_deleted: "публикацията беше изтрита от автора"
+    user_suspended: "потребителят е деактивиран"
+    already_read: "потребителят вече е прочел тази публикация"
+    message_blank: "message е празно"
+    message_to_blank: "message.to е празно"
+    text_part_body_blank: "text_part.body е празно"
+    body_blank: "съдържанието е празно"
+  color_schemes:
+    base_theme_name: "Основа"
+  about: "Относно"
+  guidelines: "Насоки"
+  privacy: "Поверителност"
+  edit_this_page: "Редактирайте тази страница"
+  csv_export:
+    boolean_yes: "Да"
+    boolean_no: "Не"
+  static_topic_first_reply: |
+    Редактирайте първата публикация в тази тема за да промените съдаржанието на страница %{page_name}.
+  guidelines_topic:
+    title: "FAQ/Насоки"
+  tos_topic:
+    title: "Правила за ползване"
+  privacy_topic:
+    title: "Декларация за поверителност"
+  badges:
+    autobiographer:
+      long_description: |
+        Тази значка се предоставя за попълване на <a href="%{base_uri}/my/preferences/profile">потребителския ви профил</a> и за избор на профилна снимка. Дайте възможност на общността да научи малко повече за това кой сте и какво ви интересува, за да допринесете за създаването на една по-добра, по-свързана общност. Присъединете се към нас!
+    great_topic:
+      name: Чудесна тема
+      description: Получени 50 харесвания за една тема
+    nice_share:
+      name: Добро споделяне
+      description: Споделена публикация с 25 уникални посетители
+    good_share:
+      name: Добро споделяне
+      description: Споделена публикация с 300 уникални посетители
+    great_share:
+      name: Велико споделяне
+      description: Споделена публикация с 1000 уникални посещения
+    first_like:
+      name: Първо харесване
+      description: Вие сте харесали тази публикация
+    first_flag:
+      name: Първи сигнал
+      description: Сигнализирал за публикация
+    promoter:
+      name: Промотър
+      description: Покани потребител
+      long_description: |
+        Тази значка се предоставя, когато каните някого да се присъедини към общността чрез бутона за покани на потребителската ви страница или под тема. Поканването на приятели, които биха могли да се интересуват от конкретни дискусии, е чудесен начин да въведете нови хора в нашата общност, така че благодарим!
+    campaigner:
+      name: Участник в кампанията
+    champion:
+      name: Шампион
+      description: Поканени са 5 члена
+    first_share:
+      name: Първо споделяне
+      description: Споделена публикация
+    first_link:
+      name: Първа връзка
+      description: Добавена връзка към друга тема.
+    first_quote:
+      name: Първи цитат
+      description: Цитирана публикация
+    read_guidelines:
+      name: Прочетени напътствия
+    reader:
+      name: Прочел
+    popular_link:
+      name: Популярна връзка
+    hot_link:
+      name: Гореща връзка
+    famous_link:
+      name: Известена връзка
+      long_description: |
+        Тази значка се предоставя, когато споделена от вас връзка получи 1000 кликвания. Еха! Публикувахте връзка, която значително подобри разговора чрез добавяне на основни детайли, контекст и информация. Чудесна работа!
+    appreciated:
+      name: Оценено
+      description: Получено 1 харесване на 20 публикации
+      long_description: |
+        Тази значка се връчва, когато получавате поне едно харесване на 20 различни публикации. Общността се радва на вашия принос към разговорите тук!
+    respected:
+      name: Уважаван
+      description: Получени 2 харесвания на 100 публикации
+    admired:
+      description: Получил 5 харесвания за 300 публикации
+    crazy_in_love:
+      name: Луди от любов
+    thank_you:
+      name: Благодарим ти
+    first_emoji:
+      name: Първа емотикона
+    first_mention:
+      name: Първо споменаване
+    first_reply_by_email:
+      name: Първи отговор по имейл
+      description: Отговорено на публикация по имейл
+    new_user_of_the_month:
+      name: "Нов потребител на месеца"
+    enthusiast:
+      name: Ентусиаст
+      description: Посещавал 10 дни
+      long_description: "Тази значка се дава за посещение в 10 последователни дни. Благодарим Ви, че сте били с нас повече от седмица!"
+    aficionado:
+      name: Любител
+      description: Посещавал 100 дни
+    devotee:
+      name: Отдаден
+      description: Посещавал 365 дни
+      long_description: "Тази значка се дава за посещение в 365 последователни дни. Еха, цяла година!"
+  admin_login:
+    success: "Изпратен имейл"
+    errors:
+      unknown_email_address: "Неизвестен имейл адрес"
+      invalid_token: "Невалиден жетон"
+    email_input: "Админ имейл"
+    submit_button: "Изпрати имейл"
+  performance_report:
+    initial_post_raw: Тази тема съдържа дневните репорти за производителноста на твоя сайт.
+    initial_topic_title: Репорти за производителноста на сайта
+  tags:
+    title: "Тагове"
+    staff_tag_disallowed: "Тагът \"%{tag}\" може да бъде приложен само от персонала."
+    staff_tag_remove_disallowed: "Тагът \"%{tag}\" може да бъде премахнат само от персонала."
+    minimum_required_tags: "Трябва да изберете поне %{count} тагове."
+  finish_installation:
+    register:
+      button: "Регистриране"
+      title: "Регистриране на Админ акаунт"
+      help: "регистрирайте нов профил за да започнете"
+    confirm_email:
+      title: "Потвърдете имейл адреса си"
+    resend_email:
+      title: "Изпрати отново активационен имейл "
+  safe_mode:
+    title: "Влизане в безопасен режим"
+  wizard:
+    step:
+      contact:
+        fields:
+          contact_url:
+            label: "Уеб страница"
+          site_contact:
+            label: "Автоматизирани съобщения"
+      corporate:
+        title: "Организация"
+        fields:
+          company_short_name:
+            label: "Име на компанията"
+      colors:
+        fields:
+          theme_id:
+            description: "Предпочитате ли да започнете с лека или тъмна цветова схема? Можете допълнително да персонализирате външния вид на вашия сайт чрез Админ, Персонализация."
+            choices:
+              default:
+                label: "Опростено светло"
+              dark:
+                label: "Опростено тъмно"
+      logos:
+        title: "Логота"
+        fields:
+          logo_url:
+            label: "Главно лого"
+          logo_small_url:
+            label: "Компактно лого"
+      icons:
+        title: "Икони"
+        fields:
+          favicon_url:
+            label: "Малка икона"
+      homepage:
+        title: "Начална страница"
+        fields:
+          homepage_style:
+            choices:
+              latest:
+                label: "Последни теми"
+              categories:
+                label: "Категории"
+      emoji:
+        title: "Емотикони"
+        description: "Какъв стил Емотикони предпочитате за вашата общност? Можете да добавите още персонализирани Емотикони по-късно чрез Админ, Персонализация, Емотикони."
+      invites:
+        title: "Поканете персонал"
+      finished:
+        title: "Вашият Discourse е готов!"
+  search_logs:
+    graph_title: "Брой търсения"
+  discourse_push_notifications:
+    popup:
+      mentioned: '%{username} ви спомена в "%{topic}" - %{site_title}'
+      group_mentioned: '%{username} ви спомена в "%{topic}" - %{site_title}'
+      quoted: '%{username} ви цитира в "%{topic}" - %{site_title}'
+      replied: '%{username} ви отговори в "%{topic}" - %{site_title}'
+      posted: '%{username} публикува в "%{topic}" - %{site_title}'
+      private_message: '%{username} ви изпрати лично съобщение "%{topic}" - %{site_title}'
+      linked: '%{username} е сложил връзка към вашата публикация в "%{topic}" - %{site_title}'
+      confirm_title: 'Включени известявания - %{site_title}'
+      confirm_body: 'Успех! Известяването е включено.'
diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml
index 398c41d45f6..d69122cb1d0 100644
--- a/config/locales/server.bs_BA.yml
+++ b/config/locales/server.bs_BA.yml
@@ -17,12 +17,12 @@ bs_BA:
       date_only: "%B %-d, %Y"
       long: "%B %-d, %Y, %l:%M%P"
   date:
-    month_names: [null, Januar, Februar, Mart, April, Maj, Juni, Juli, August, Septembar, Oktobar, Novembar, Decembar]
+    month_names: [~, Januar, Februar, Mart, April, Maj, Juni, Juli, August, Septembar, Oktobar, Novembar, Decembar]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "am"
     pm: "pm"
-    <<: *datetime_formats
   title: "Discourse"
   topics: "Topics"
   posts: "posts"
@@ -41,6 +41,9 @@ bs_BA:
       taken: "has already been taken"
     embed:
       load_from_remote: "There was an error loading that post."
+  activemodel:
+    errors:
+      <<: *errors
   backup:
     operation_already_running: "An operation is currently running. Can't start a new job right now."
     backup_file_should_be_tar_gz: "The backup file should be a .tar.gz archive."
@@ -85,7 +88,7 @@ bs_BA:
       trust_level_3: "trust_level_3"
       trust_level_4: "trust_level_4"
   education:
-    new-topic: |
+    'new-topic': |
       Welcome to %{site_name} &mdash; **thanks for starting a new conversation!**
 
       - Does the title accurately describe your topic? Does it sound interesting?
@@ -95,7 +98,7 @@ bs_BA:
       - Include good search words in your topic so others can *find* it. To group your topic with related topics, select a category.
 
       For more, [see our community guidelines](/guidelines). This panel will only appear for your first %{education_posts_text}.
-    new-reply: |
+    'new-reply': |
       Welcome to %{site_name} &mdash; **thanks for contributing!**
 
       - Does your reply improve the conversation in some way?
@@ -112,11 +115,11 @@ bs_BA:
       user_profile:
         bio_raw: "O Meni"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "You can only attach warnings to private messages."
               too_many_users: "You can only send warnings to one user at a time."
         user:
           attributes:
@@ -128,7 +131,6 @@ bs_BA:
           attributes:
             hex:
               invalid: "is not a valid color"
-      <<: *errors
   user_profile:
     no_info_other: "<div class='missing-profile'>%{name} hasn't entered anything in the About Me field of their profile yet</div>"
   vip_category_name: "Lounge"
@@ -140,25 +142,25 @@ bs_BA:
     title: "Welcome to the Lounge"
     body: |2
 
-      Congratulations! :confetti_ball:
+        Congratulations! :confetti_ball:
 
-      If you can see this topic, you were recently promoted to **regular** (trust level 3).
+        If you can see this topic, you were recently promoted to **regular** (trust level 3).
 
-      You can now &hellip;
+        You can now &hellip;
 
-      * Edit the title of any topic
-      * Change the category of any topic
-      * Have all your links followed ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) is removed)
-      * Access a private Lounge category only visible to users at trust level 3 and higher
-      * Hide spam with a single flag
+        * Edit the title of any topic
+        * Change the category of any topic
+        * Have all your links followed ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) is removed)
+        * Access a private Lounge category only visible to users at trust level 3 and higher
+        * Hide spam with a single flag
 
-      Here's the [current list of fellow regulars](/badges/3/regular). Be sure to say hi.
+        Here's the [current list of fellow regulars](/badges/3/regular). Be sure to say hi.
 
-      Thanks for being an important part of this community!
+        Thanks for being an important part of this community!
 
-      (For more information on trust levels, [see this topic][trust]. Please note that only members who continue to meet the requirements over time will remain regulars.)
+        (For more information on trust levels, [see this topic][trust]. Please note that only members who continue to meet the requirements over time will remain regulars.)
 
-      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "About the %{category} category"
     errors:
@@ -176,20 +178,19 @@ bs_BA:
       title: "korisnik"
     change_failed_explanation: "You attempted to demote %{user_name} to '%{new_trust_level}'. However their trust level is already '%{current_trust_level}'. %{user_name} will remain at '%{current_trust_level}' - if you wish to demote user lock trust level first"
   rate_limiter:
-    too_many_requests: "We have a daily limit on how many times that action can be taken. Please wait %{time_left} before trying again."
     hours:
-      one: "1 sat"
-      few: "Par sati"
-      other: "%{count} sati"
+      few: Par sati
+      one: 1 sat
+      other: '%{count} sati'
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
     distance_in_words_verbose:
       half_a_minute: "just now"
       about_x_hours:
-        one: "Pred 1 sat"
-        few: "Pred par sati"
-        other: "Pred %{count} sata"
+        few: Pred par sati
+        one: Pred 1 sat
+        other: Pred %{count} sata
   password_reset:
     update: 'Obnovi Šifru'
     save: 'Namjesti Šifru'
@@ -266,9 +267,7 @@ bs_BA:
       xaxis: "Day"
       yaxis: "Number of visits"
     signups:
-      title: "Users"
       xaxis: "Day"
-      yaxis: "Number of new users"
     profile_views:
       xaxis: "Dan"
     topics:
@@ -304,7 +303,6 @@ bs_BA:
       xaxis: "Day"
       yaxis: "Number of Emails"
     user_to_user_private_messages:
-      title: "User-to-User"
       xaxis: "Day"
       yaxis: "Number of private messages"
     system_private_messages:
@@ -356,14 +354,11 @@ bs_BA:
   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."
-    default_locale: "The default language of this Discourse instance (ISO 639-1 Code)"
     allow_user_locale: "Allow users to choose their own language interface preference"
     min_post_length: "Minimum allowed post length in characters"
-    min_private_message_post_length: "Minimum allowed post length in characters for private messages"
     max_post_length: "Maximum allowed post length in characters"
     min_topic_title_length: "Minimum allowed topic title length in characters"
     max_topic_title_length: "Maximum allowed topic title length in characters"
-    min_private_message_title_length: "Minimum allowed title length for a private message in characters"
     min_search_term_length: "Minimum valid search term length in characters"
     allow_duplicate_topic_titles: "Allow topics with identical, duplicate titles."
     unique_posts_mins: "How many minutes before a user can make a post with the same content again"
@@ -426,21 +421,17 @@ bs_BA:
     version_checks: "Ping the Discourse Hub for version updates and show new version messages on the /admin dashboard"
     new_version_emails: "Send an email to the contact_email address when a new version of Discourse is available."
     invite_expiry_days: "How long user invitation keys are valid, in days"
-    invite_passthrough_hours: "How long a user can use a previously redeemed invitation key to log in, in hours"
     login_required: "Require authentication to read content on this site, disallow anonymous access."
     min_password_length: "Minimum password length."
     block_common_passwords: "Don't allow passwords that are in the 10,000 most common passwords."
     sso_secret: "Secret string used to encrypt/decrypt SSO information, be sure it is 10 chars or longer"
     sso_overrides_avatar: "Overrides user avatar with external site avatar from SSO payload. If enabled, disabling allow_uploaded_avatars is highly recommended"
-    enable_local_logins: "Enable local username and password login based accounts. (Note: this must be enabled for invites to work)"
     allow_new_registrations: "Allow new user registrations. Uncheck this to prevent anyone from creating a new account."
     enable_yahoo_logins: "Enable Yahoo authentication"
     enable_google_oauth2_logins: "Enable Google Oauth2 authentication. This is the method of authentication that Google currently supports. Requires key and secret."
     google_oauth2_client_id: "Client ID of your Google application."
     google_oauth2_client_secret: "Client secret of your Google application."
     enable_twitter_logins: "Enable Twitter authentication, requires twitter_consumer_key and twitter_consumer_secret"
-    twitter_consumer_key: "Consumer key for Twitter authentication, registered at http://dev.twitter.com"
-    twitter_consumer_secret: "Consumer secret for Twitter authentication, registered at http://dev.twitter.com"
     enable_facebook_logins: "Enable Facebook authentication, requires facebook_app_id and facebook_app_secret"
     facebook_app_id: "App id for Facebook authentication, registered at https://developers.facebook.com/apps"
     facebook_app_secret: "App secret for Facebook authentication, registered at https://developers.facebook.com/apps"
@@ -463,14 +454,12 @@ bs_BA:
     max_bookmarks_per_day: "Maximum number of bookmarks per user per day."
     max_edits_per_day: "Maximum number of edits per user per day."
     max_topics_per_day: "Maximum number of topics a user can create per day."
-    max_private_messages_per_day: "Maximum number of private messages users can create per day."
     suggested_topics: "Number of suggested topics shown at the bottom of a topic."
     limit_suggested_to_category: "Only show topics from the current category in suggested topics."
     clean_up_uploads: "Remove orphan unreferenced uploads to prevent illegal hosting. WARNING: you may want to back up of your /uploads directory before enabling this setting."
     clean_orphan_uploads_grace_period_hours: "Grace period (in hours) before an orphan upload is removed."
     purge_deleted_uploads_grace_period_days: "Grace period (in days) before a deleted upload is erased."
     enable_s3_uploads: "Place uploads on Amazon S3 storage. IMPORTANT: requires valid S3 credentials (both access key id & secret access key)."
-    s3_use_iam_profile: 'Use AWS EC2 IAM role to retrieve keys. NOTE: enabling will override "s3 access key id" and "s3 secret access key" settings.'
     s3_upload_bucket: "The Amazon S3 bucket name that files will be uploaded into. WARNING: must be lowercase, no periods."
     s3_access_key_id: "The Amazon S3 access key id that will be used to upload images."
     s3_secret_access_key: "The Amazon S3 secret access key that will be used to upload images."
@@ -666,8 +655,6 @@ bs_BA:
       text_body_template: "Your bulk user invite file was processed, %{sent} invites mailed."
     bulk_invite_failed:
       subject_template: "Bulk user invite processed with errors"
-    csv_export_succeeded:
-      subject_template: "Data Export completed successfully"
     csv_export_failed:
       subject_template: "Export failed"
     pending_users_reminder:
@@ -738,6 +725,3 @@ bs_BA:
     title: "Terms of Service"
   privacy_topic:
     title: "Privacy Policy"
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.ca.yml b/config/locales/server.ca.yml
index 3339523174e..09192ca98a8 100644
--- a/config/locales/server.ca.yml
+++ b/config/locales/server.ca.yml
@@ -17,21 +17,30 @@ ca:
       date_only: "%B %-d, %Y"
       long: "%B %-d, %Y, %l:%M%P"
   date:
-    month_names: [null, gener, febrer, març, abril, maig, juny, juliol, agost, setembre, octubre, novembre, desembre]
+    month_names: [~, gener, febrer, març, abril, maig, juny, juliol, agost, setembre, octubre, novembre, desembre]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "am"
     pm: "pm"
-    <<: *datetime_formats
   title: "Discourse"
   topics: "Temes"
   posts: "escrits"
   loading: "Carregant"
+  powered_by_html: 'Funciona amb <a href="https://www.discourse.org">Discourse</a>, per una millor experiència visita''ns amb JavaScript activat'
   log_in: "Entrar"
+  submit: "Envia"
   purge_reason: "Compte desactivat, esborrat automàticament per abandó."
   disable_remote_images_download_reason: "La descàrrega d'imatges ha estat desactivada perquè no hi havia prou espai d'emmatzematge al disc."
   anonymous: "Anònim"
   remove_posts_deleted_by_author: "Esborrat per la persona autora"
+  redirect_warning: "No hem pogut comprovar que l'enllaç que has seleccionat s'hagi enviat al fòrum. Si tot i així vols continuar, clica l'enllaç de sota."
+  themes:
+    bad_color_scheme: "No es pot actualitzar el tema, esquema de color invàlid"
+    other_error: "S'ha produït un error mentre s'actualitzava el tema"
+    error_importing: "S'ha produït un error clonant el dipòsit git, s'ha denegat l'accés o no s'ha trobat el dipòsit"
+    settings_errors:
+      invalid_yaml: "El YAML proveït és invàlid"
   emails:
     incoming:
       default_subject: "Aquest tema necessita un títol"
@@ -62,21 +71,20 @@ ca:
       present: ha de ser buit
       confirmation: "no coincideix %{attribute}"
       empty: no pot ser buit
-      equal_to: ha de ser igual a %{count}
+      equal_to: "ha de ser igual a %{count}"
       even: ha de ser un nombre parell
       exclusion: està reservat
-      greater_than: ha de ser més gran que %{count}
-      greater_than_or_equal_to: ha de ser més gran o igual a %{count}
+      greater_than: "ha de ser més gran que %{count}"
+      greater_than_or_equal_to: "ha de ser més gran o igual a %{count}"
       has_already_been_used: "ja s'ha fet servir"
       inclusion: no és inclòs a la llista
       invalid: és invàlid
       is_invalid: "no sembla clar, és una frase sencera?"
       contains_censored_words: "hi conté els següents mots censurats: %{censored_words}"
-      matches_censored_pattern: "hi conté els següents mots que coincideixen amb les expressions regulars censurades del lloc: %{censored_words}"
-      less_than: ha de ser menys de %{count}
-      less_than_or_equal_to: ha de ser igual o menor a %{count}
+      less_than: "ha de ser menys de %{count}"
+      less_than_or_equal_to: "ha de ser igual o menor a %{count}"
       not_a_number: no és una xifra
-      not_an_integer: 'ha de ser un nombre enter '
+      not_an_integer: "ha de ser un nombre enter "
       odd: ha de ser un nombre senar
       record_invalid: 'N''ha fallat la validació: %{errors}'
       restrict_dependent_destroy:
@@ -106,6 +114,9 @@ ca:
       max_username_length_range: "No pots establir el màxim per sota del mínim."
       default_categories_already_selected: "No pots triar una categoria emprada a una altra llista."
       s3_upload_bucket_is_required: "No pots activar càrregues a S3 si no has tingut 's3_upload_bucket'."
+  activemodel:
+    errors:
+      <<: *errors
   invite:
     not_found: "La teva invitació no és vàlida. Si us plau, contacta amb l'administració del lloc."
   bulk_invite:
@@ -125,8 +136,8 @@ ca:
   reading_time: "Temps de lectura."
   likes: "M'agrades"
   too_many_replies:
-    one: "Ho lamentem, però les noves persones usuàries ara estan de moment limitades a 1 resposta al mateix tema."
-    other: "Ho lamentem, però les noves persones usuàries ara estan de moment limitades a %{count} respostes al mateix tema."
+    one: Ho lamentem, però les noves persones usuàries ara estan de moment limitades a 1 resposta al mateix tema.
+    other: Ho lamentem, però les noves persones usuàries ara estan de moment limitades a %{count} respostes al mateix tema.
   embed:
     start_discussion: "Comença una discussió"
     continue: "Continua la discussió"
@@ -136,35 +147,35 @@ ca:
     no_hosts: "No s'hi han establert amfitrions per inscrustar."
     configure: "Configurar la incrustació"
     more_replies:
-      one: "1 resposta més"
-      other: "%{count} respostes més "
+      one: 1 resposta més
+      other: '%{count} respostes més '
     loading: "Carregant la discussió..."
     permalink: "Enllaç permanent "
     imported_from: "Aquesta discussió és derivada de l'entrada original de %{link}"
     in_reply_to: "%{username}"
     replies:
-      one: "1 resposta"
-      other: "%{count} respostes"
+      one: 1 resposta
+      other: '%{count} respostes'
   no_mentions_allowed: "Disculpa, no pots mencionar altres persones usuàries"
   too_many_mentions:
-    one: "Disculpa, només pots mencionar una persona usuària a un escrit."
-    other: "Disculpa, només pots mencionar %{count} persones usuàries a un escrit."
+    one: Disculpa, només pots mencionar una persona usuària a un escrit.
+    other: Disculpa, només pots mencionar %{count} persones usuàries a un escrit.
   no_mentions_allowed_newuser: "Disculpa, les noves persones usuàries no poden mencionar-ne d'altres."
   too_many_mentions_newuser:
-    one: "Disculpa, les noves persones usuàries només poden mencionar una persona usuària a un escrit."
-    other: "Disculpa, les noves persones usuàries només poden mencionar %{count} persones usuàries a un escrit."
+    one: Disculpa, les noves persones usuàries només poden mencionar una persona usuària a un escrit.
+    other: Disculpa, les noves persones usuàries només poden mencionar %{count} persones usuàries a un escrit.
   no_images_allowed: "Disculpa, les noves persones usuàries no poden adjuntar imatges a un escrit."
   too_many_images:
-    one: "Disculpa, les noves persones usuàries només poden adjuntar una imatge a un escrit."
-    other: "Disculpa, les noves persones usuàries només poden adjuntar %{count} imatges a un escrit."
+    one: Disculpa, les noves persones usuàries només poden adjuntar una imatge a un escrit.
+    other: Disculpa, les noves persones usuàries només poden adjuntar %{count} imatges a un escrit.
   no_attachments_allowed: "Disculpa, les noves persones usuàries no poden adjuntar arxius a un escrit."
   too_many_attachments:
-    one: "Disculpa, les noves persones usuàries només poden adjuntar un arxiu a un escrit."
-    other: "Disculpa, les noves persones usuàries només poden adjuntar %{count} arxius a un escrit."
+    one: Disculpa, les noves persones usuàries només poden adjuntar un arxiu a un escrit.
+    other: Disculpa, les noves persones usuàries només poden adjuntar %{count} arxius a un escrit.
   no_links_allowed: "Disculpa, les noves persones usuàries no poden incloure enllaços a un escrit."
   too_many_links:
-    one: "Disculpa, les noves persones usuàries només poden incloure un enllaç a un escrit."
-    other: "Disculpa, les noves persones usuàries només poden incloure %{count} enllaços a un escrit."
+    one: Disculpa, les noves persones usuàries només poden incloure un enllaç a un escrit.
+    other: Disculpa, les noves persones usuàries només poden incloure %{count} enllaços a un escrit.
   spamming_host: "Disculpa, no pots enviar un enllaç a aquest amfitrió."
   user_is_suspended: "Les persones usuàries suspeses no tenen permís per publicar."
   topic_not_found: "Alguna cosa ha fallat. Que potser aquest tema ha estat tancat o esborrat mentre el consultaves?"
@@ -188,8 +199,9 @@ ca:
     latest: "Darrers temes"
     hot: "Temes d'interès"
     top: "Principals temes"
+    top_yearly: "Temes més actius anualment"
+    top_monthly: "Temes més actius mensualment"
     posts: "Darreres publicacions"
-    private_posts: "Darrers missatges privats"
     group_posts: "Darreres publicacions de %{group_name}"
     group_mentions: "Darreres mencions de %{group_name}"
     user_posts: "Darreres publicacions segons @%{username}"
@@ -203,7 +215,6 @@ ca:
   groups:
     errors:
       can_not_modify_automatic: "No pots modificar un grup automàtic"
-      member_already_exist: "'%{username}' ja és membre d'aquest grup."
       invalid_domain: "'%{domain}' no és un domini vàlid."
       invalid_incoming_email: "'%{email}' no és una adreça vàlida de correu electrònic."
       email_already_used_in_group: "'%{email}' ja és fa servir pel grup '%{group_name}'."
@@ -220,9 +231,9 @@ ca:
       trust_level_4: "trust_level_4"
   education:
     until_posts:
-      one: "1 publicació"
-      other: "%{count} publicacions"
-    new-topic: |
+      one: 1 publicació
+      other: '%{count} publicacions'
+    'new-topic': |
       Et donem la benvinguda a %{site_name} &mdash; **gràcies per encetar una nova conversa!**
 
       - El títol sona interessant si el llegeixes en veu alta? És un bon resum?
@@ -232,7 +243,7 @@ ca:
       - Inclou mots emprats amb freqüència al teu tema perquè la resta ho puguin *trobar*. Per tal d'agrupar el teu tema amb d'altres relacionats, tria una categoria.
 
       Per saber-ne més, [fes un cop d'ull a la guia de la comunitat](/guidelines). Aquest avís només apareixerà per al teu primer %{education_posts_text}.
-    new-reply: |
+    'new-reply': |
       Et donem la benvinguda a %{site_name} &mdash; **gràcies per contribuir-hi!**
 
       - La teva resposta millora d'alguna manera la conversa?
@@ -270,12 +281,6 @@ ca:
       Disculpa, però les noves persones usuàries estan temporalment limitades a %{newuser_max_replies_per_topic} respostes al mateix tema.
 
       En comptes d'afegir-hi una altra resposta, si us plau, considera l'edició de les teves respostes d'abans o fes una visita a altres temes.
-    reviving_old_topic: |
-      ### Reviu aquest tema?
-
-      Fa **%{days}** de la darrera resposta a aquest tema. La teva resposta llençarà el tema a la part superior de la llista i ho notificarà a tota persona que hi participi.
-
-      Segur que vols continuar amb aquesta conversa antiga?
   activerecord:
     attributes:
       category:
@@ -288,13 +293,12 @@ ca:
       user_profile:
         bio_raw: "Sobre mi"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Només pots adjuntar avisos a missatges privats."
               too_many_users: "Només pots enviar missatges a una persona usuària d'un sol cop."
-              cant_send_pm: "Disculpa, no pots enviar a un missatge privat a aquesta persona usuària."
               no_user_selected: "Has de triar una persona usuària vàlida."
             featured_link:
               invalid: "no és vàlid. La URL hauria d'incloure http:// o https://."
@@ -317,7 +321,6 @@ ca:
           attributes:
             payload_url:
               invalid: "La URL no és vàlida. La URL hauria d'incloure http:// o https://. I no es permeten espais en blanc."
-      <<: *errors
   user_profile:
     no_info_other: "<div class='missing-profile'>%{name} encara no ha introduït res al camp Sobre mi del seu perfil</div>"
   vip_category_name: "Saló"
@@ -331,41 +334,41 @@ ca:
     title: "Benvinguda o benvingut a Discourse"
     body: |2
 
-      El primer paràgraf d'aquest tema fixat será visible com a missatge de benvinguda per a totes les noves visites a la teva pàgina principal. És important!
+        El primer paràgraf d'aquest tema fixat será visible com a missatge de benvinguda per a totes les noves visites a la teva pàgina principal. És important!
 
-      **Edita això** per a una breu descripció de la teva comunitat:
+        **Edita això** per a una breu descripció de la teva comunitat:
 
-      - Per a qui és?
-      - Què hi poden trobar?
-      - Per què haurien de venir aquí?
-      - On poden llegir-ne més (enllaços, recursos, etcètera)?
+        - Per a qui és?
+        - Què hi poden trobar?
+        - Per què haurien de venir aquí?
+        - On poden llegir-ne més (enllaços, recursos, etcètera)?
 
-      <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+        <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
 
-      Potser desitges tancar aquest tema amb l'eina d'adminstració :wrench: (dalt a la dreta i abaix), perquè les respostes no s'amunteguin sobre un anunci.
+        Potser desitges tancar aquest tema amb l'eina d'adminstració :wrench: (dalt a la dreta i abaix), perquè les respostes no s'amunteguin sobre un anunci.
   lounge_welcome:
     title: "Et donem la benvinguda al saló"
     body: |2
 
-      Enhorabona! :confetti_ball:
+        Enhorabona! :confetti_ball:
 
-      Si pots veure aquest tema, se t'ha promogut recentment a **regular** (nivell 3 de confiança).
+        Si pots veure aquest tema, se t'ha promogut recentment a **regular** (nivell 3 de confiança).
 
-      Ara pots &hellip;
+        Ara pots &hellip;
 
-      * Editar el títol de qualsevol tema
-      * Canviar la categoria de qualsevol tema
-      * Tenir tots els teus enllaços seguits ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) és esborrat)
-      * Accedir a la categoria privada de Saló només visible per a persones usuàries a nivell 3 de confiança i superior
-      * Amagar correu brossa amb una única bandera
+        * Editar el títol de qualsevol tema
+        * Canviar la categoria de qualsevol tema
+        * Tenir tots els teus enllaços seguits ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) és esborrat)
+        * Accedir a la categoria privada de Saló només visible per a persones usuàries a nivell 3 de confiança i superior
+        * Amagar correu brossa amb una única bandera
 
-      Vet aquí la llista [current list of fellow regulars](/badges/3/regular). Assegura't d'enviar-hi una salutació.
+        Vet aquí la llista [current list of fellow regulars](/badges/3/regular). Assegura't d'enviar-hi una salutació.
 
-      Gràcies per formar part d'una part important d'aquesta comunitat!
+        Gràcies per formar part d'una part important d'aquesta comunitat!
 
-      (Per a més informació sobre nivell de confiança [see this topic][trust]. Si us plau, fixa't que només membres que continuen reunint els requisits seguiran essent ordinaris).
+        (Per a més informació sobre nivell de confiança [see this topic][trust]. Si us plau, fixa't que només membres que continuen reunint els requisits seguiran essent ordinaris).
 
-      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Sobre la categoria %{category} "
     replace_paragraph: "(Reemplaça aquest primer paràgraf amb una breu descripció de la teva nova categoria. Aquesta guia apareixerà a l'àrea de selecció de categoria, perquè s'hi pugui mantenir per sota de 200 caràcters. **Fins que no editis aquesta descripció o en creïs temes, aquesta categoria no apareixerà a la pàgina de categories.**)"
@@ -381,8 +384,8 @@ ca:
       uncategorized: "No es pot esborrar una descategoritzada"
       has_subcategories: "No es pot esborrar aquesta categoria perquè té subcategories"
       topic_exists:
-        one: "No es pot esborrar aquesta categoria perquè hi conté 1 tema. El tema més antic és %{topic_link}."
-        other: "No es pot esborrar aquesta categoria perquè hi conté %{count} temes. El tema més antic és %{topic_link}."
+        one: No es pot esborrar aquesta categoria perquè hi conté 1 tema. El tema més antic és %{topic_link}.
+        other: No es pot esborrar aquesta categoria perquè hi conté %{count} temes. El tema més antic és %{topic_link}.
       topic_exists_no_oldest: "No es pot esborrar aquesta categoria perquè el recompte de temes és %{count}."
     uncategorized_description: "Temes que no necessiten una categoria o no encaixen a cap altra categoria existent."
   trust_levels:
@@ -398,102 +401,86 @@ ca:
       title: "líder"
     change_failed_explanation: "Has provat de degradar %{user_name} a '%{new_trust_level}'. En qualsevol cas, el seu nivell de confiança ja és '%{current_trust_level}'. %{user_name} restarà a '%{current_trust_level}' - Si vols degradar una persona usuària, bloca-li abans el nivell de confiança"
   rate_limiter:
-    slow_down: "Has provat de fer el mateix moltes vegades, prova-ho més tard."
-    too_many_requests: "Tenim un límit diari sobre quants cops es pot realitzar aquesta acció. Si us plau, espera %{time_left} abans de tornar a provar-ho."
-    by_type:
-      first_day_replies_per_day: "Has arribat a la quantitat màxima de respostes que una nova persona usuària pot crear durant el seu primer dia. Si us plau, espera %{time_left} abans de tornar a provar-ho."
-      first_day_topics_per_day: "Has arribat a la quantitat màxima de temes que una nova persona usuària pot crear durant el seu primer dia. Si us plau, espera %{time_left} abans de tornar a provar-ho."
-      create_topic: "Estàs generant temes massa ràpid. Si us plau, espera %{time_left} abans de tornar a provar-ho."
-      create_post: "Estàs responent massa ràpid. Si us plau, espera %{time_left} abans de tornar a provar-ho."
-      delete_post: "Estàs esborrant publicacions massa ràpid. Si us plau, espera %{time_left} abans de tornar a provar-ho."
-      public_group_membership: "T'estàs unint a grups o abandonant-los massa ràpid. Si us plau, espera %{time_left} abans de tornar a provar-ho."
-      topics_per_day: "Avui has arribat a la quantitat màxima de temes. Si us plau, espera %{time_left} abans de tornar a provar-ho."
-      pms_per_day: "Avui has arribat a la quantitat màxima de missatges. Si us plau, espera %{time_left} abans de tornar a provar-ho."
-      create_like: "Has arribat a la quantitat màxima de m'agrades avui. Si us plau, espera %{time_left} abans de tornar a provar-ho."
-      create_bookmark: "Avui has arribat a la quantitat màxima de preferits. Si us plau, espera %{time_left} abans de tornar a provar-ho."
-      live_post_counts: "Estàs demanant recomptes de publicacions massa ràpid. Si us plau, espera %{time_left} abans de tornar a provar-ho."
-      unsubscribe_via_email: "Avui has arribat a la quantitat màxima de cancel·lacions de subscripcions per correu electrònic. Si us plau, espera %{time_left} abans de tornar a provar-ho."
-      topic_invitations_per_day: "Avui has arribat a la quantitat màxima d'invitacions de temes. Si us plau, espera %{time_left} abans de tornar a provar-ho."
     hours:
-      one: "1 hora"
-      other: "%{count} hores"
+      one: 1 hora
+      other: '%{count} hores'
     minutes:
-      one: "1 minut"
-      other: "%{count} minuts"
+      one: 1 minut
+      other: '%{count} minuts'
     seconds:
-      one: "1 segon"
-      other: "%{count} segons"
+      one: 1 segon
+      other: '%{count} segons'
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: "< 1s"
-        other: "< %{count}s"
+        one: < 1s
+        other: < %{count}s
       x_seconds:
-        one: "1s"
-        other: "%{count}s"
+        one: 1s
+        other: '%{count}s'
       less_than_x_minutes:
-        one: "< 1m"
-        other: "< %{count}m"
+        one: < 1m
+        other: < %{count}m
       x_minutes:
-        one: "1m"
-        other: "%{count}m"
+        one: 1m
+        other: '%{count}m'
       about_x_hours:
-        one: "1h"
-        other: "%{count}h"
+        one: 1h
+        other: '%{count}h'
       x_days:
-        one: "1d"
-        other: "%{count}d"
+        one: 1d
+        other: '%{count}d'
       about_x_months:
-        one: "1mes"
-        other: "%{count}mes"
+        one: 1mes
+        other: '%{count}mes'
       x_months:
-        one: "1mes"
-        other: "%{count}mes"
+        one: 1mes
+        other: '%{count}mes'
       about_x_years:
-        one: "1a"
-        other: "%{count}a"
+        one: 1a
+        other: '%{count}a'
       over_x_years:
-        one: "> 1a"
-        other: "> %{count}a"
+        one: '> 1a'
+        other: '> %{count}a'
       almost_x_years:
-        one: "1a"
-        other: "%{count}a"
+        one: 1a
+        other: '%{count}a'
     distance_in_words_verbose:
       half_a_minute: "ara mateix"
       less_than_x_seconds:
-        one: "ara mateix"
-        other: "ara mateix"
+        one: ara mateix
+        other: ara mateix
       x_seconds:
-        one: "fa 1 segon"
-        other: "fa %{count} segons"
+        one: fa 1 segon
+        other: fa %{count} segons
       less_than_x_minutes:
-        one: "fa menys d'1 minut "
-        other: "fa menys de %{count} minuts "
+        one: 'fa menys d''1 minut '
+        other: 'fa menys de %{count} minuts '
       x_minutes:
-        one: "fa 1 minut"
-        other: "fa %{count} minuts"
+        one: fa 1 minut
+        other: fa %{count} minuts
       about_x_hours:
-        one: "fa 1 hora"
-        other: "fa %{count} houres"
+        one: fa 1 hora
+        other: fa %{count} houres
       x_days:
-        one: "fa 1 dia"
-        other: "fa %{count} dies"
+        one: fa 1 dia
+        other: fa %{count} dies
       about_x_months:
-        one: "fa més o menys 1 mes"
-        other: "fa més o menys %{count} mesos"
+        one: fa més o menys 1 mes
+        other: fa més o menys %{count} mesos
       x_months:
-        one: "fa 1 mes"
-        other: "fa %{count} mesos"
+        one: fa 1 mes
+        other: fa %{count} mesos
       about_x_years:
-        one: "fa més o menys 1 any"
-        other: "fa més o menys %{count} anys"
+        one: fa més o menys 1 any
+        other: fa més o menys %{count} anys
       over_x_years:
-        one: "fa més d'1 any"
-        other: "fa més de %{count} anys"
+        one: fa més d'1 any
+        other: fa més de %{count} anys
       almost_x_years:
-        one: "fa ben bé 1 any"
-        other: "fa ben bé %{count} any"
+        one: fa ben bé 1 any
+        other: fa ben bé %{count} any
   password_reset:
     no_token: "Disculpa, aquest enllaç de canvi de contrasenya és massa antic. Tria el botó de Registre i fes servir 'He oblidat la meva contrasenya' per obtenir-ne un nou enllaç."
     choose_new: "Tria una nova contrasenya"
@@ -536,7 +523,6 @@ ca:
       long_form: 'marcar amb bandera d''inapropiat'
     notify_user:
       title: 'Envia un missatge a @{{username}}'
-      description: 'Vull parlar directament i privadament amb aquesta persona sobre la seva publicació.'
       long_form: 'persona contactada'
       email_title: 'La teva publicació a "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -625,9 +611,7 @@ ca:
       xaxis: "Dia"
       yaxis: "Quantitat de visites"
     signups:
-      title: "Noves persones usuàries"
       xaxis: "Dia"
-      yaxis: "Quantitat de noves persones usuàries"
     profile_views:
       title: "Vistes de perfils de persones usuàries"
       xaxis: "Dia"
@@ -665,7 +649,6 @@ ca:
       xaxis: "Dia"
       yaxis: "Quantitat de correus"
     user_to_user_private_messages:
-      title: "Persona a persona"
       xaxis: "Dia"
       yaxis: "Quantitat de missatges"
     system_private_messages:
@@ -712,7 +695,6 @@ ca:
       xaxis: "Dia"
       yaxis: "Vistes de pàgina de rastrejadors de web"
     page_view_total_reqs:
-      title: "Total"
       xaxis: "Dia"
       yaxis: "Total de vistes de pàgina"
     page_view_logged_in_mobile_reqs:
@@ -776,28 +758,23 @@ ca:
     failing_emails_warning: 'Hi ha %{num_failed_jobs} tasques de correu fallides. Revisa el teu app.yml i assegura''t que la configuració del servidor de correu és correcta. <a href="/sidekiq/retries" target="_blank">Mira les tasques fallides a <i>Sidekiq</i></a>.'
     subfolder_ends_in_slash: "La teva configuració de subcarpeta no és correcta; DISCOURSE_RELATIVE_URL_ROOT acaba amb barra inclinada."
     email_polling_errored_recently:
-      one: "L'enquesta per correu electrònic ha generat un error durant les darreres 24 hores. Fes un cop d'ull als <a href='/logs' target='_blank'>registres</a> per saber-ne més."
-      other: "L'enquesta per correu electrònic ha generat %{count} errors durant les darreres 24 hores. Fes un cop d'ull als <a href='/logs' target='_blank'>registres</a> per saber-ne més."
-    missing_mailgun_api_key: "El servidor està configurat per enviar correus amb <i>mailgun</i> però no has facilitat una clau API emprada per verificar els missatges de ganxo de web."
+      one: L'enquesta per correu electrònic ha generat un error durant les darreres 24 hores. Fes un cop d'ull als <a href='/logs' target='_blank'>registres</a> per saber-ne més.
+      other: L'enquesta per correu electrònic ha generat %{count} errors durant les darreres 24 hores. Fes un cop d'ull als <a href='/logs' target='_blank'>registres</a> per saber-ne més.
     bad_favicon_url: "La càrrega de <i>favicon</i> està fallant. Revisa la configuració de favicon_url a la <a href='/admin/site_settings'>Configuració del lloc</a>."
     poll_pop3_timeout: "S'ha esgotat del temps de connexió al servidor POP3. No s'ha pogut lliurar el correu entrant. Si us plau, revisa la teva <a href='/admin/site_settings/category/email'>configuració de POP3</a> i el proveïdor de serveis."
     poll_pop3_auth_error: "La connexió al servidor POP3 està fallant amb un error d'autenticació. Si us plau, revisa la teva <a href='/admin/site_settings/category/email'>configuració de POP3</a>."
   site_settings:
     censored_words: "Paraules que es reemplaçaran automàticament amb  &#9632;&#9632;&#9632;&#9632;"
-    censored_pattern: "Patró d'expressió regular que serà reemplaçat automàticament amb  &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Esborra automàticament qualsevol publicació que resten oculta durant més de 30 dies."
-    default_locale: "La llengua per defecte d'aquesta instància Discourse (ISO 639-1 Code)"
     allow_user_locale: "Permet que les persones usuàries triïn la seva preferència de llengua d'interfície"
     set_locale_from_accept_language_header: "configura la llengua d'interfície per a persones anònimes des dels encapçalaments dels seus navegadors. (EXPERIMENTAL, no funciona amb memòria cau anònima)"
     min_post_length: "Mínim permès en caràcters per a l'extensió de publicacions "
     min_first_post_length: "Mínim permès en caràcters per a l'extensió de primera publicació (cos del tema)"
-    min_private_message_post_length: "Mínim permès en caràcters per a l'extensió de publicacions a missatges"
     max_post_length: "Màxim permès en caràcters per a l'extensió de publicacions "
     topic_featured_link_enabled: "Activa la publicació d'enllaç amb temes."
     show_topic_featured_link_in_digest: "Mostra el tema de l'enllaç destacat al correu electrònic de resum automàtic."
     min_topic_title_length: "Mida mínima permesa del títol del tema en caràcters  "
     max_topic_title_length: "Mida màxima permesa del títol del tema en caràcters  "
-    min_private_message_title_length: "Mida mínima permesa del títol d'un missatge en caràcters  "
     min_search_term_length: "Mida mínima permesa d'un camp de cerca en caràcters  "
     search_tokenize_chinese_japanese_korean: "Força la cerca per assegurar les dades en Xinès/Japonès/Coreà fins i tot en llocs que no siguin en aquestes llengües"
     search_prefer_recent_posts: "Si la cerca al teu fòrum va lenta, aquesta opció prova primer amb un índex de publicacions recents"
@@ -843,7 +820,6 @@ ca:
     summary_likes_required: "Mínim nombre de m'agrades a un tema abans d'activar 'Resumeix aquest tema'"
     summary_percent_filter: "Quan una persona clica 'Resumeix aquest tema', mostra el '% o' principal de publicacions"
     summary_max_results: "Màxim de publicacions resultat de 'Resumeix aquest tema'"
-    enable_private_messages: "Permet que les persones amb nivell de confiança 1 puguin crear missatges i respondre'ls (configurable amb el mínim de nivell de confiança per enviar missatges). Fixa't que l'equip sempre pot enviar qualsevol mena de missatges."
     enable_long_polling: "El bus de missatges emprat per a la notificació pot fer servir el mostreig llarg"
     long_polling_base_url: "La URL bàsica emprada per a mostreig llarg (quan una xarxa de lliurament de continguts serveix contingut dinàmic, assegura't de configurar-ho per llençar l'origen). Per exemple, http://origin.site.com"
     long_polling_interval: "Quantitat de temps que el servidor hauria d'esperar abans de respondre clients quan no hi ha dades d'enviament (connectat només a persones usuàries)"
@@ -897,7 +873,6 @@ ca:
     version_checks: "Clava l'activitat de Discourse per a actualitzacions de versió i mostra els missatges de la nova versió al tauler /admin"
     new_version_emails: "Envia un correu al contact_email address quan hi hagi una nova versió del Discourse disponible."
     invite_expiry_days: "Quant és vàlida la clau d'invitació a una persona, en dies"
-    invite_passthrough_hours: "Quant pot la persona fer servir una clau d'invitació prèviament recuperada per connectar-s'hi, en hores"
     login_required: "Exigeix l'autenticació per llegir el contingut del lloc, impedeix-ne l'accés anònim."
     min_username_length: "La mida mínima de nom de persona usuària en caràcters. ATENCIÓ: si cap altra persona o grup té noms més breus que aquest, el teu lloc caurà!"
     max_username_length: "Mida màxima de nom de persona usuària en caràcters. ATENCIÓ: si cap altra persona o grup té noms més llargs que aquest, el teu lloc caurà!"
@@ -917,7 +892,6 @@ ca:
     sso_overrides_avatar: "Anul·la l'avatar de la persona amb avatar de lloc extern de la càrrega útil d'autenticació única, es recomana molt la inhabilitació de allow_uploaded_avatars"
     sso_not_approved_url: "Redirecciona els comptes d'autenticació única a aquesta adreça URL"
     sso_allows_all_return_paths: "No restringeixis el domini per a return_paths facilitat per l'autenticació única (per defecte el camí de retorn ha de ser el lloc actual)"
-    enable_local_logins: "Activa la connexió dels comptes basats en noms i contrasenyes locals. (Nota: això ha d'estar activat perquè les invitacions funcionin)"
     allow_new_registrations: "Permet registres de noves persones. Inhabilita-ho per tal d'evitar que qualsevol pugui crear un nou compte."
     enable_signup_cta: "Mostra un avís a les persones anònimes que tornin, convidant-les a registrar-s'hi amb un compte."
     enable_yahoo_logins: "Activa l'autenticació amb Yahoo"
@@ -925,15 +899,12 @@ ca:
     google_oauth2_client_id: "ID de client a la teva aplicació Google."
     google_oauth2_client_secret: "Client secret a la teva aplicació Google."
     enable_twitter_logins: "Activar l'autenticació de Twitter, necessita twitter_consumer_key i twitter_consumer_secret"
-    twitter_consumer_key: "Clau de consum per a l'autenticació amb Twitter, registrada a http://dev.twitter.com"
-    twitter_consumer_secret: "Secret de consum per a l'autenticació amb Twitter, registrat a http://dev.twitter.com"
     enable_instagram_logins: "Activa l'autenticació amb Instagram, necessita instagram_consumer_key i instagram_consumer_secret"
     instagram_consumer_key: "Clau de consum per a l'autenticació amb Instagram"
     instagram_consumer_secret: "Secret de consum per a l'autenticació amb Instagram"
     enable_facebook_logins: "Activa l'autenticació amb Facebook, necessita facebook_app_id i facebook_app_secret"
     facebook_app_id: "Id d'app per a l'autenticació amb Facebook, registrada a https://developers.facebook.com/apps"
     facebook_app_secret: "Secret d'app per a l'autenticació amb Facebook, registrat a https://developers.facebook.com/apps"
-    facebook_request_extra_profile_details: "Demana sobre mi, ubicació i lloc web de Facebook. (necessita que la teva aplicació sigui aprovada per Facebook)"
     enable_github_logins: "Activar l'autenticació de GitHub, necessita  github_client_id i github_client_secret"
     github_client_id: "Id client per a l'autenticació amb Github, registrada a https://github.com/settings/applications"
     github_client_secret: "Secret de client per a l'autenticació amb GitHub, registrat a https://github.com/settings/applications"
@@ -941,7 +912,6 @@ ca:
     allow_restore: "Permet restablir, que pot reemplaçar TOTES les dades del lloc! Deixa-ho com a \"false\" si no pretens restablir una còpia de seguretat"
     maximum_backups: "Quantitat màxima de còpies de seguretat per mantenir al disc. Les còpies més antigues seran esborrades automàticament"
     automatic_backups_enabled: "Executa còpies de seguretat automàtiques tal com estan definides a la freqüències de la còpia de seguretat"
-    backup_frequency: "Amb quina freqüència podem crear una còpia de seguretat del lloc, en dies."
     enable_s3_backups: "Carrega còpies de seguretat a S3 quan es completi. IMPORTANT: necessita credencials vàlides de S3 introduïdes a la configuració de fitxer."
     s3_backup_bucket: "Sistema remot de càrrega de còpies de seguretat. ATENCIÓ: Assegura't que és una càrrega privada."
     s3_disable_cleanup: "Inhabilita l'eliminació de còpies de seguretat de S3 quan s'eliminin localment."
@@ -963,7 +933,6 @@ ca:
     max_bookmarks_per_day: "Quantitat màxima de preferits per persona i dia."
     max_edits_per_day: "Quantitat màxima d'edicions per persona i dia."
     max_topics_per_day: "Quantitat màxima de temes que una persona pot crear cada dia."
-    max_private_messages_per_day: "Quantitat màxima de missatges que una persona pot crear cada dia."
     max_invites_per_day: "Quantitat màxima d'invitacions que una persona pot enviar cada dia."
     max_topic_invitations_per_day: "Quantitat màxima d'invitacions a temes que una persona por enviar cada dia."
     alert_admins_if_errors_per_minute: "Quantitat d'errors per minut per desencadenar una alerta admin. Un valor 0 inhabilita aquesta característica. NOTA: cal reiniciar."
@@ -976,7 +945,6 @@ ca:
     clean_orphan_uploads_grace_period_hours: "Període de gràcia (en hores) abans d'eliminar una càrrega òrfena. "
     purge_deleted_uploads_grace_period_days: "Període de gràcia (en dies) abans d'esborrar una càrrega eliminada."
     enable_s3_uploads: "Emmagatzema les càrregues a un servei Amazon S3. IMPORTANT: calen credencials vàlides S3 (tant l'id de clau d'accés & com la clau secreta d'accés)."
-    s3_use_iam_profile: 'Fes servir el rol AWS EC2 IAM per recuperar claus. NOTA: activar això anul·larà les configuracions "s3 access key id" i "s3 secret access key" settings.'
     s3_upload_bucket: "El nom del dipòsit Amazon S3 on es carregaran els fitxers. ATENCIÓ: ha de ser en minúscula, sense comes, ni guions."
     s3_access_key_id: "La clau d'accés a Amazon S3 que es farà servir per carregar imatges."
     s3_secret_access_key: "La clau secreta d'accés a Amazon S3 que es farà servir per carregar imatges."
@@ -1019,7 +987,6 @@ ca:
     min_trust_to_edit_wiki_post: "Nivell de confiança mínim necessari per editar una publicació marcada com a wiki."
     min_trust_to_edit_post: "Nivell de confiança mínim necessari per editar publicacions."
     min_trust_to_allow_self_wiki: "Nivell de confiança mínim per fer-ne wiki de la pròpia publicació personal."
-    min_trust_to_send_messages: "Nivell de confiança mínim necessari per crear nous missatges privats."
     newuser_max_links: "Quants enllaços pot afegir una persona a una publicació."
     newuser_max_images: "Quantes imatges pot afegir una persona a una publicació."
     newuser_max_attachments: "Quants adjunts pot afegir una persona a una publicació"
@@ -1029,7 +996,6 @@ ca:
     max_users_notified_per_group_mention: "Quantitat màxima de persones que poden rebre alertes si un grup és mencionat (si el valor límit no troba alertes, serà augmentat)"
     create_thumbnails: "Crea miniatures i finestres d'imatge de massa amplada per cabre a una publicació."
     email_time_window_mins: "Espera (n) minuts abans d'enviar qualsevol alerta de correu, per tal de possibilitar l'edició i la finalització de les publicacions."
-    private_email_time_window_seconds: "Espera (n) segons abans d'enviar qualsevol correu privat d'alerta, per tal de possibilitar l'edició i la finalització dels missatges."
     email_posts_context: "Quantes respostes prèvies per incloure com a context a correus d'alerta."
     flush_timings_secs: "Amb quanta freqüència descarreguem al servidor les dades de temporització, en segons."
     title_max_word_length: "La mida màxima permesa de la paraula, en caràcters al títol d'un tema."
@@ -1186,13 +1152,11 @@ ca:
     approve_post_count: "Cal aprovar la quantitat de publicacions d'una persona usuària nova o bàsica"
     approve_unless_trust_level: "Cal aprovar les publicacions per a persones usuàries amb aquest nivell de confiança"
     approve_new_topics_unless_trust_level: "Cal aprovar els nous temes per a persones amb aquest nivell de confiança"
-    notify_about_queued_posts_after: "Si hi ha publicacions que han estat esperant la revisió durant més d'aquesta quantitat d'hores, s'enviarà un correu a contact_email. Deixa-ho a 0 per inhabilitar aquests correus."
     auto_close_messages_post_count: "Quantitat màxima de publicacions permeses a un missatge abans no es tanqui automàticament (a 0 per desactivar)"
     auto_close_topics_post_count: "Quantitat màxima de publicacions permeses a un tema abans no es tanqui automàticament (a 0 per desactivar)"
     code_formatting_style: "El botó de codi al compositor serà per defecte d'aquest estil de format de codi"
     default_email_digest_frequency: "Amb quina freqüència les persones rebran els correus resumits per defecte."
     default_include_tl0_in_digests: "Inclou publicacions de noves persones a correus resumits per defecte. Les persones ho poden canviar a les seves preferències."
-    default_email_private_messages: "Envia un correu s'enviïn missatges a la persona usuària per defecte."
     default_email_direct: "Envia un correu quan se citi/respongui/mencioni la persona usuària o persones convidades per defecte."
     default_email_mailing_list_mode: "Envia un correu per a cada nova publicació per defecte."
     default_email_mailing_list_mode_frequency: "Per defecte, les persones que activen el mode llista de correu rebran correus amb aquesta freqüència."
@@ -1228,7 +1192,6 @@ ca:
     max_tags_in_filter_list: "Quantitat màxima d'etiquetes per mostrar al filtre desplegable. S'hi veuran les etiquetes més emprades."
     tags_sort_alphabetically: "Mostra etiquetes per ordre alfabètic. Per defecte, es mostren ordenades per popularitat."
     tag_style: "Estil visual per a principals distincions."
-    staff_tags: "Un llistat d'etiquetes que només l'equip pot aplicar"
     min_trust_level_to_tag_topics: "Nivell de confiança mínim necessari per etiquetar temes"
     suppress_overlapping_tags_in_list: "Si les etiquetes coincideixen exactament amb paraules als títols dels temes, no mostris l'etiqueta"
     remove_muted_tags_from_latest: "No mostris temes etiquetats amb etiquetes silenciades al darrer llistat de temes."
@@ -1278,18 +1241,18 @@ ca:
     not_seen_in_a_month: "Et tornem a donar la benvinguda! No t'havíem vist durant un temps. Aquests són els temes populars des de la teva marxa."
   merge_posts:
     edit_reason:
-      one: "Una publicació ha estat fusionada per %{username}"
-      other: "%{count} publicacions han estat fusionades per %{username}"
+      one: Una publicació ha estat fusionada per %{username}
+      other: '%{count} publicacions han estat fusionades per %{username}'
     errors:
       different_topics: "Les publicacions que pertanyen a diferents temes no es poden fusionar."
       different_users: "Les publicacions que pertanyen a diferents participants no es poden fusionar."
   move_posts:
     new_topic_moderator_post:
-      one: "Una publicació ha estat dividida a un nou tema: %{topic_link}"
-      other: "%{count} publicacions han estat dividides a un nou tema: %{topic_link}"
+      one: 'Una publicació ha estat dividida a un nou tema: %{topic_link}'
+      other: '%{count} publicacions han estat dividides a un nou tema: %{topic_link}'
     existing_topic_moderator_post:
-      one: "Una publicació ha estat fusionada a un tema existent: %{topic_link}"
-      other: "%{count} publicacions han estat fusionades a un tema existent: %{topic_link}"
+      one: 'Una publicació ha estat fusionada a un tema existent: %{topic_link}'
+      other: '%{count} publicacions han estat fusionades a un tema existent: %{topic_link}'
   change_owner:
     post_revision_text: "Propietat transferida per %{old_user} a %{new_user}"
     deleted_user: "una persona usuària esborrada"
@@ -1299,29 +1262,29 @@ ca:
     closed_enabled: "Aquest tema ara està tancat. Ja no es permeten les noves respostes."
     closed_disabled: "Aquest tema ara està obert. Es permeten les noves respostes."
     autoclosed_message_max_posts:
-      one: "Aquest missatge es va tancar automàticament després d'arribar al límit màxim d'1 resposta."
-      other: "Aquest missatge es va tancar automàticament després d'arribar al límit màxim de %{count} respostes."
+      one: Aquest missatge es va tancar automàticament després d'arribar al límit màxim d'1 resposta.
+      other: Aquest missatge es va tancar automàticament després d'arribar al límit màxim de %{count} respostes.
     autoclosed_topic_max_posts:
-      one: "Aquest missatge es va tancar automàticament després d'arribar al límit màxim d'1 resposta."
-      other: "Aquest tema es va tancar automàticament després d'arribar al límit màxim de %{count} respostes."
+      one: Aquest missatge es va tancar automàticament després d'arribar al límit màxim d'1 resposta.
+      other: Aquest tema es va tancar automàticament després d'arribar al límit màxim de %{count} respostes.
     autoclosed_enabled_days:
-      one: "Aquest missatge es va tancar automàticament després d'1 dia. Ja no es permeten les noves respostes."
-      other: "Aquest missatge es va tancar automàticament després de %{count} dies. Ja no es permeten les noves respostes."
+      one: Aquest missatge es va tancar automàticament després d'1 dia. Ja no es permeten les noves respostes.
+      other: Aquest missatge es va tancar automàticament després de %{count} dies. Ja no es permeten les noves respostes.
     autoclosed_enabled_hours:
-      one: "Aquest missatge es va tancar automàticament després d'1 hora. Ja no es permeten les noves respostes."
-      other: "Aquest missatge es va tancar automàticament després de %{count} hores. Ja no es permeten les noves respostes."
+      one: Aquest missatge es va tancar automàticament després d'1 hora. Ja no es permeten les noves respostes.
+      other: Aquest missatge es va tancar automàticament després de %{count} hores. Ja no es permeten les noves respostes.
     autoclosed_enabled_minutes:
-      one: "Aquest missatge es va tancar automàticament després d'1 minut. Ja no es permeten les noves respostes."
-      other: "Aquest missatge es va tancar automàticament després de %{count} minuts. Ja no es permeten les noves respostes."
+      one: Aquest missatge es va tancar automàticament després d'1 minut. Ja no es permeten les noves respostes.
+      other: Aquest missatge es va tancar automàticament després de %{count} minuts. Ja no es permeten les noves respostes.
     autoclosed_enabled_lastpost_days:
-      one: "Aquest missatge es va tancar automàticament 1 dia després de la darrera resposta. Ja no es permeten les noves respostes."
-      other: "Aquest missatge es va tancar automàticament %{count} dies després de la darrera resposta. Ja no es permeten les noves respostes."
+      one: Aquest missatge es va tancar automàticament 1 dia després de la darrera resposta. Ja no es permeten les noves respostes.
+      other: Aquest missatge es va tancar automàticament %{count} dies després de la darrera resposta. Ja no es permeten les noves respostes.
     autoclosed_enabled_lastpost_hours:
-      one: "Aquest missatge es va tancar automàticament 1 hora després de la darrera resposta. Ja no es permeten les noves respostes."
-      other: "Aquest missatge es va tancar automàticament %{count} hores després de la darrera resposta. Ja no es permeten les noves respostes."
+      one: Aquest missatge es va tancar automàticament 1 hora després de la darrera resposta. Ja no es permeten les noves respostes.
+      other: Aquest missatge es va tancar automàticament %{count} hores després de la darrera resposta. Ja no es permeten les noves respostes.
     autoclosed_enabled_lastpost_minutes:
-      one: "Aquest missatge es va tancar automàticament 1 minut després de la darrera resposta. Ja no es permeten les noves respostes."
-      other: "Aquest missatge es va tancar automàticament %{count} minuts després de la darrera resposta. Ja no es permeten les noves respostes."
+      one: Aquest missatge es va tancar automàticament 1 minut després de la darrera resposta. Ja no es permeten les noves respostes.
+      other: Aquest missatge es va tancar automàticament %{count} minuts després de la darrera resposta. Ja no es permeten les noves respostes.
     autoclosed_disabled: "Aquest tema ara està obert. Es permeten les noves respostes."
     autoclosed_disabled_lastpost: "Aquest tema ara està obert. Es permeten les noves respostes."
     pinned_enabled: "Aquest tema ara està clavat. Apareixerà al començament de la seva categoria fins que l'equip el desclavi per a tothom o ho facin les mateixes persones usuàries."
@@ -1377,8 +1340,8 @@ ca:
       domain_not_allowed: "El lloc web no és vàlid. Els dominis permesos són: %{domains}"
   flags_reminder:
     subject_template:
-      one: "1 bandera esperant ser tractada"
-      other: "%{count} banderes esperant ser tractades"
+      one: 1 bandera esperant ser tractada
+      other: '%{count} banderes esperant ser tractades'
   unsubscribe_mailer:
     title: "Cancel·la la subscripció del remitent"
     subject_template: "Confirma que no vols rebre més actualitzacions per correu des de %{site_title}"
@@ -1393,47 +1356,6 @@ ca:
     subject_template: "Estableix contrasenya per al teu compte de %{site_name}"
   test_mailer:
     title: "Prova remitent"
-    text_body_template: |
-      Aquest és un correu de
-
-      [**%{base_url}**][0]
-
-      La subministrabilitat del correu és complicada. Aquí hi ha algunes coses importants que hauries de revisar primer:
-
-      - "Assegura't" de d'establir correctament el de: de `notification email` a la teva configuració del lloc. **El domini especificat a l'adreça "de" dels correus que enviïs és el domini que tornarà a validar-se**.
-
-      - Sàpigues com veure el codi font dels missatges al teu client de correu, per tal que puguis examinar els encapçalaments per a pistes importants. A Gmail, es mostra a l'opció  "mostra l'original" al menú desplegable de la part superior dreta de cada missatge.
-
-      - **IMPORTANT:** La teva ISP té un registre de DNS inversa per associar els noms de dominis i les adreces IP que envies des del correu? [Prova el teu registre Revers PTR][2] aquí. Si la teva ISP no introdueix el registre adequat de DNS inversa, no és gaire provable que rebis cap correu.
-
-      - És correcte el [registre SPF][8] de domini? [Prova el teu registre SPF][1] aquí. Fixa't que TXT és el registre correcte oficial per a SPF.
-
-      - És correcte el teu domini [DKIM record][3]? Això millorarà força la lliurabilitat del correu. [Test your DKIM record][7] here.
-
-      - Si executes el teu propi servidor de correu, revisa per assegurar-te que les IP del teu servidor de correu no són [a cap de les meves llistes negres][4]. Verifica també que segur que envia un nom d'amfitrió totalment qualifiicat que resol la DNS al seu missatge HELO. En cas contrari, això farà que el teu correu sigui rebutjat per molts serveis de correu.
-
-      - Et recomanem **envia un correu de prova a [mail-tester.com][mt]** per tal de verificar que tot l'esmentat funcioni correctament.
-
-      (La manera "fàcil* és crear un compte lliure a [SendGrid][sg], [SparkPost][sp], [Mailgun][mg] o [Mailjet][mj], que són generosos amb plans de correu gratuïts i funcionarà per a la majoria de comunitats petites. Encara et caldrà configurar els registres SPF i DKIM a la teva DNS!)
-
-      Esperem que hagis rebut correctament aquesta prova de subministrabilitat de correu!
-
-      Bona sort,
-
-      La teva gent a [Discourse](http://www.discourse.org)
-
-      [0]: %{base_url}
-      [1]: http://www.kitterman.com/spf/validate.html
-      [2]: http://mxtoolbox.com/ReverseLookup.aspx
-      [3]: http://www.dkim.org/
-      [4]: http://whatismyipaddress.com/blacklist-check
-      [7]: https://www.mail-tester.com/spf-dkim-check
-      [8]: http://www.openspf.org/SPF_Record_Syntax
-      [sg]: https://goo.gl/r1WMF6
-      [sp]: https://www.sparkpost.com/
-      [mg]: http://www.mailgun.com/
-      [mj]: https://www.mailjet.com/pricing
-      [mt]: http://www.mail-tester.com/
   new_version_mailer:
     title: "Nova versió remitent"
   new_version_mailer_with_notes:
@@ -1514,7 +1436,6 @@ ca:
       subject_template: "Invitació personal massiva amb errors"
     csv_export_succeeded:
       title: "Exportació de CSV reeixida"
-      subject_template: "Exportació de dades completa"
       text_body_template: |
         La teva exportació de dades ha estat reeixida! :dvd:
 
@@ -1609,8 +1530,8 @@ ca:
     pending_users_reminder:
       title: "Recordatori de persones pendents"
       subject_template:
-        one: "1 persona esperant aprovació"
-        other: "%{count} persones esperant aprovació"
+        one: 1 persona esperant aprovació
+        other: '%{count} persones esperant aprovació'
       text_body_template: |
         Hi ha registres de noves persones esperant l'aprovació (o el refús) abans d'accedir a aquest fòrum.
 
@@ -1626,6 +1547,9 @@ ca:
         S'ha informat d'alguns problemes al teu tauler de control d'administració.
 
         [Si us plau, revisa'ls i soluciona'ls](%{base_url}/admin).
+    new_user_of_the_month:
+      title: "Ets la Nova Usuària del Mes!"
+      subject_template: "Ets la Nova Usuària del Mes!"
   unsubscribe_link: |
     Per cancel·lar la subscripció d'aquests correus, [clica aquí](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |
@@ -1767,7 +1691,7 @@ ca:
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
-        %{message}
+          %{message}
     digest:
       why: "Un breu resum de %{site_link} des de la teva darrera visita a %{last_seen_at}"
       since_last_visit: "Des de la teva darrera visita"
@@ -1874,141 +1798,6 @@ ca:
     title: "Guies/Preguntes frqüents"
   tos_topic:
     title: "Condicions del Servei"
-    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: "Política de Privacitat"
   badges:
@@ -2019,22 +1808,22 @@ ca:
         Aquest distintiu es concedeix el primer cop que edites una de les teves publicacions. Com no sempre podràs editar-les, fer-ho ara és una bona idea. Pots millorar-les, corregir petits errors o afegir qualsevol cosa que vas oblidar en publicar originalment. Edita per millorar encara més les teves publicacions!
     basic_user:
       name: Bàsic
-      description: Totes les funcions essencials de la comunitat <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">concedides</a>
+      description: "Totes les funcions essencials de la comunitat <a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">concedides</a>"
       long_description: |
         Aquest distintiu es concedeix quan arribes al nivell 1 de confiança. Gràcies pel teu temps dedicat a llegir un grapat de temes i saber de què va la nostra comunitat. S'han aixecat les teves restriccions de nova persona usuària; t'hem concedit totes les capacitats essencials de la comunitat, com els missatges personals, les banderes, edició de wiki i la possibilitat de publicar múltiples imatges i enllaços.
     member:
       name: Membre
-      description: Invitacions, missatges de grups i més m'agrades <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">concedits</a>
+      description: "Invitacions, missatges de grups i més m'agrades <a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">concedits</a>"
       long_description: |
         Aquest distintiu es concedeix quan arribes al nivell 2 de confiança. Gràcies per participar durant setmanes per afegir-te de debò a la nostra comunitat. Ara pots enviar invitacions des de la teva pàgina personal o temes individuals, crear missatges personals en grup i donar uns pocs més m'agrades cada dia.
     regular:
       name: Ordinari
-      description: Recategoritzar, reanomenar, enllaços seguits, wiki, més m'agrades <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">concedits</a>
+      description: "Recategoritzar, reanomenar, enllaços seguits, wiki, més m'agrades <a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">concedits</a>"
       long_description: |
         Aquest distintiu es concedeix quan arribes al nivell 3 de confiança. Gràcies per formar part de la nostra comunitat durant mesos. Ara ets una de les persones més actives en lectura i contribucions, a més de fer gran la nostra comunitat. Ara pots recategoritzar i reanomenar temes, aprofitar les banderes més potents de brossa, l'accés a l'àrea privada de saló i també rebràs cada dia més m'agrades.
     leader:
       name: Líder
-      description: Edició global, clavar, tancar, arxivar, dividir i fusionar, més m'agrades <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">condedits</a>
+      description: "Edició global, clavar, tancar, arxivar, dividir i fusionar, més m'agrades <a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">condedits</a>"
       long_description: |
         Aquest distintiu es concedeix quan has arribat al nivell de confiança 4. Lideres aquesta comunitat tal i com ha triat l'equip i ets un exemple positiu amb les teves paraules i accions per a la resta de la comunitat. Tens la possibilitat d'editar totes les publicacions, prendre accions moderadores típiques com ara clavar, desllistar, arxivar, dividir i fusionar i cada dia tens muntanyes de m'agrades.
     welcome:
@@ -2046,7 +1835,7 @@ ca:
       name: Autobiògraf
     anniversary:
       name: Aniversary
-      description: Membre amb activitat d'un any, ha publicat almenys un cop
+      description: "Membre amb activitat d'un any, ha publicat almenys un cop"
       long_description: |
         Aquest distintiu es concedeix quan has tingut activitat durant un any amb almenys una publicació. Gràcies per contribuir a la comunitat. Sense tu no ho aconseguiríem.
     nice_post:
@@ -2109,8 +1898,6 @@ ca:
     promoter:
       name: Promoció
       description: Ha convidat una persona
-      long_description: |
-        Aquesta insígnia es concedeix quan invites algú a participar de la comunitat via el botó d'invitar en la teva pàgina d'usuari o al capdavall d'un tema. Invitar amics que puguin estar interessats en la conversa és una gran manera d'introduir nous membres a la comunitat, o sigui que gràcies!
     campaigner:
       name: Activista
       description: Ha convidat 3 persones usuàries bàsiques
@@ -2207,22 +1994,21 @@ ca:
     first_emoji:
       name: Primer emoji
       description: Ha fet servir un emoji a una publicació
-      long_description: |
-        Aquest distintiu es concedeix el primer cop que afegeixes un Emoji a la teva publicació :thumbsup:. L'Emoji et permet donar emoció a les teves publicacions, des de la felicitat :smiley: a la tristor :anguished: o l'empipament :angry: i qualsevol cosa amb :sunglasses: . Senzillament escriu : (dos punts) o clica la barra d'eines d'Emoji a l'editor per triar-ne entre centenars de possibilitats :ok_hand:
     first_mention:
       name: Primera menció
-      long_description: Aquest distintiu es concedeix el primer cop que menciones  @username d'algú a la teva publicació. Cada menció genera una alerta a aquella persona, perquè sàpiga de la teva publicació. Senzillament comença a escriure @ (símbol arrova) per mencionar qualsevol persona o grup, si està permès – és una forma interessant de cridar la seva atenció.
+      long_description: "Aquest distintiu es concedeix el primer cop que menciones  @username d'algú a la teva publicació. Cada menció genera una alerta a aquella persona, perquè sàpiga de la teva publicació. Senzillament comença a escriure @ (símbol arrova) per mencionar qualsevol persona o grup, si està permès – és una forma interessant de cridar la seva atenció."
     first_onebox:
       name: Primera caixa
       description: Enllaç publicat que ha estat encaixat
-      long_description: Aquest distintiu es concedeix el primer cop que publiques un enllaç sobre una línia, que automàticament s'ha estès a una caixa amb un breu resum de l'enllaç, un títol i (si hi és) una imatge.
+      long_description: "Aquest distintiu es concedeix el primer cop que publiques un enllaç sobre una línia, que automàticament s'ha estès a una caixa amb un breu resum de l'enllaç, un títol i (si hi és) una imatge."
     first_reply_by_email:
       name: Primera resposta per correu
       long_description: |
         Aquesta distinció es concedeix el primer cop que respons una publicació per correu :e-mail:.
+    new_user_of_the_month:
+      name: "Nova Usuària del Mes"
   admin_login:
     success: "Correu enviat"
-    error: "Error!"
     email_input: "Administrar correu"
     submit_button: "Enviar correu"
   performance_report:
@@ -2363,6 +2149,3 @@ ca:
         description: |
           <p>Si mai vols canviar aquesta configuració, visita <a href='/admin' target='_blank'>la teva secció d'administració</a>; troba-ho al costat de la icona de clau anglesa al menú del lloc.</p>
           <p>Passa-t'ho bé i molta sort <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>amb la construcció de la teva nova comunitat!</a></p>
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml
index 09ff573a3a8..97356c287c4 100644
--- a/config/locales/server.cs.yml
+++ b/config/locales/server.cs.yml
@@ -17,18 +17,19 @@ cs:
       date_only: "%-d %B %Y"
       long: "%B %-d, %Y, %l:%M%P"
   date:
-    month_names: [null, ledna, února, března, dubna, května, června, července, srpna, září, října, listopadu, prosince]
+    month_names: [~, ledna, února, března, dubna, května, června, července, srpna, září, října, listopadu, prosince]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "am"
     pm: "pm"
-    <<: *datetime_formats
   title: "Discourse"
   topics: "Témata"
   posts: "příspěvky"
   loading: "Nahrávám"
   powered_by_html: 'Systém běží na <a href="https://www.discourse.org">Discourse</a>, nejlépe funguje se zapnutým JavaScriptem'
   log_in: "Přihlásit se"
+  submit: "Odeslat"
   purge_reason: "Tento účet byl automaticky smazán a deaktivován jako opuštěný"
   disable_remote_images_download_reason: "Stahování obrázků z cizích serverů bylo vypnuto protože na disku není dostatek místa."
   anonymous: "Anonymní"
@@ -41,11 +42,19 @@ cs:
       default_subject: "Toto téma potřebuje nadpis"
       show_trimmed_content: "Ukázat upravený obsah"
       maximum_staged_user_per_email_reached: "Dosáhli jste maximálního počtu uživatelů na jeden e-mail."
+      no_subject: "(bez předmětu)"
+      no_body: "(bez textu)"
       errors:
         empty_email_error: "Toto se stává, když e-mail, který obdržíme, je prázdný."
         no_message_id_error: "Toto se stává, když e-mail nemá žádnou hlavičku s \"ID zprávy\"."
+        inactive_user_error: "Toto se stává, když odesílatel není aktivní."
+        silenced_user_error: "Toto se stává, když odesílatel byl umlčen."
+        topic_not_found_error: "Toto se stává, když přijde odpověď k smazanému tématu."
+        topic_closed_error: "Toto se stává, když přijde odpověď k uzavřenému tématu."
+      unrecognized_error: "Neznámá chyba"
   errors: &errors
     format: '%{attribute} %{message}'
+    format_with_full_message: '<b>%{attribute}</b>: %{message}'
     messages:
       too_long_validation: "je limitováno na %{max} znaků; zadali jste %{length}."
       invalid_boolean: "Nevalidní boolean."
@@ -55,90 +64,142 @@ cs:
       present: musí zůstat prázdné
       confirmation: "neodpovídá %{attribute}"
       empty: nemůže být prázdný
-      equal_to: musí být roven %{count}
+      equal_to: "musí být roven %{count}"
       even: musí být sudý
       exclusion: je rezervováno
-      greater_than: musí být větší než %{count}
-      greater_than_or_equal_to: musí být větší nebo rovno %{count}
+      greater_than: "musí být větší než %{count}"
+      greater_than_or_equal_to: "musí být větší nebo rovno %{count}"
       has_already_been_used: "již byl použit"
       inclusion: není zahrnutý v seznamu
       invalid: je neplatný
-      less_than: musí být menší než %{count}
-      less_than_or_equal_to: musí být menší nebo roven %{count}
+      is_invalid: "zdá se to být nejasné, je to kompletní věta?"
+      contains_censored_words: "obsahuje tato cenzurovaná slova: %{censored_words}"
+      less_than: "musí být menší než %{count}"
+      less_than_or_equal_to: "musí být menší nebo roven %{count}"
       not_a_number: není číslo
       not_an_integer: musí být celé číslo
       odd: musí být lichý
       record_invalid: 'Ověření selhalo: %{errors}'
       restrict_dependent_destroy:
         one: "Nelze odstranit záznam, protože závisející %{record} existuje"
-        many: "Nemůžu smazat záznam protože na něm závisí %{record}."
+        many: "Nelze smazat záznam protože na něm závisí %{record}."
       too_long:
-        one: je příliš dlouhý ( maximálně %{count} znak)
         few: je to příliš dlouhé (maximálně %{count} znaků)
+        many: je to příliš dlouhé (maximálně %{count} znaků)
+        one: je příliš dlouhý ( maximálně %{count} znak)
         other: je to příliš dlouhé (maximálně %{count} znaků)
       too_short:
-        one: je to příliš krátké (minimum je %{count} znak)
         few: je to příliš krátké (minimum je %{count} znaků)
+        many: je to příliš krátké (minimum je %{count} znaků)
+        one: je to příliš krátké (minimum je %{count} znak)
         other: je to příliš krátké (minimum je %{count} znaků)
       wrong_length:
-        one: špatná délka (má být %{count} znak)
         few: špatná délka (má být %{count} znaků)
+        many: špatná délka (má být %{count} znaků)
+        one: špatná délka (má být %{count} znak)
         other: špatná délka (má být %{count} znaků)
       other_than: "musí být jiný než %{count}"
     template:
       body: 'Nastaly problémy s následujícími poli: '
       header:
-        one: 1 chyba zamezila uložení modelu %{model}
         few: '%{count} chyb zamezilo uložení modelu %{model}'
+        many: '%{count} chyb zamezilo uložení modelu %{model}'
+        one: 1 chyba zamezila uložení modelu %{model}
         other: '%{count} chyb zamezilo uložení modelu %{model}'
     embed:
       load_from_remote: "Při načítání příspěvku nastala chyba."
     site_settings:
-      min_username_length_exists: "Nemůžeš nastavit minimální délku uživatelského jména delší než je nejkratší uživatelské jméno."
-      min_username_length_range: "Nemůžeš nastavit minimum nad maximum."
-      max_username_length_exists: "Nemůžeš nastavit délku maximální uživatelského jména kratší než je nejdelší uživatelské jméno. "
-      max_username_length_range: "Nemůžeš nastavit maximum pod minimum."
-      default_categories_already_selected: "Nemůžeš vybrat kategorii používanou v jiném seznamu."
+      min_username_length_exists: "Nemůžete nastavit minimální délku uživatelského jména delší než je nejkratší uživatelské jméno."
+      min_username_length_range: "Nemůžete nastavit minimum nad maximum."
+      max_username_length_exists: "Nemůžete nastavit délku maximální uživatelského jména kratší než je nejdelší uživatelské jméno. "
+      max_username_length_range: "Nemůžete nastavit maximum pod minimum."
+      default_categories_already_selected: "Nemůžete vybrat kategorii používanou v jiném seznamu."
+      s3_upload_bucket_is_required: "Nemůžete nahrávat na S3 dokud nezadáte 's3_upload_bucket'."
+  activemodel:
+    errors:
+      <<: *errors
   invite:
+    not_found: "Odkaz pozvánky je neplatný. Kontaktujte prosím administrátora stránky."
     user_exists: "Netřeba posílat pozvánku na <b>%{email}</b>. Tento email <a href='/u/%{username}/summary'>je veden u tohoto účtu!</a>"
+  bulk_invite:
+    file_should_be_csv: "Nahraný soubor by měl být ve formátu csv."
+    error: "Nastala chyba při nahrávání souboru. Prosím opakujte akci později."
+  topic_invite:
+    user_exists: "Omlouváme se, uživatel byl již pozván. K tématu můžete pozvat uživatele jen jednou."
   backup:
     operation_already_running: "Právě probíhá operace %{operation}. V tuto chvíli nelze zahájit novou operaci %{operation}."
     backup_file_should_be_tar_gz: "Záloha by měla být archiv s příponou .tar.gz."
     not_enough_space_on_disk: "Na disku není dostatek místa pro nahrání této zálohy."
+    invalid_filename: "Název zálohy obsahuje neplatné znaky. Platnými znaky jsou a-z 0-9 . - _."
+  invalid_params: "Do požadavku jste zadali neplatné parametry: %{message}"
   not_logged_in: "Na tuto akci musíte být přihlášení."
   not_found: "Žádaná URL adresa nebo zdroj nelze najít."
+  invalid_access: "Nemáte oprávnění na zobrazení požadovaného zdroje."
+  invalid_api_credentials: "Nemáte oprávnění na zobrazení požadovaného zdroje. Uživatelské jméno nebo klíč k API je nevalidní."
   read_only_mode_enabled: "Tato stránka je v režimu jen pro čtení. Interakce jsou zakázány."
   reading_time: "Čas čtení"
   likes: "Líbí se"
   too_many_replies:
-    one: "Je nám líto, ale noví uživatelé jsou dočasně omezeni na 1 odpověď v tématu."
-    few: "Je nám líto, ale noví uživatelé jsou dočasně omezeni na %{count} odpovědi v tématu."
-    other: "Je nám líto, ale noví uživatelé jsou dočasně omezeni na %{count} odpovědí v tématu."
+    few: Je nám líto, ale noví uživatelé jsou dočasně omezeni na %{count} odpovědi v tématu.
+    many: Je nám líto, ale noví uživatelé jsou dočasně omezeni na %{count} odpovědí v tématu.
+    one: Je nám líto, ale noví uživatelé jsou dočasně omezeni na 1 odpověď v tématu.
+    other: Je nám líto, ale noví uživatelé jsou dočasně omezeni na %{count} odpovědí v tématu.
   embed:
     start_discussion: "Začít diskuzi"
     continue: "Pokračovat v diskuzi"
     more_replies:
-      one: "1 další odpověď"
-      few: "%{count} další odpověďi"
-      other: "%{count} dalších odpověďí"
+      few: '%{count} další odpověďi'
+      many: '%{count} dalších odpověďí'
+      one: 1 další odpověď
+      other: '%{count} dalších odpověďí'
     loading: "Načítám diskuzi..."
     permalink: "Permalink"
     imported_from: "Diskuze k původnímu příspěvku na blogu: %{link}"
     in_reply_to: "▶ %{username}"
     replies:
-      one: "1 reakce"
-      few: "%{count} reakce"
-      other: "%{count} reakcí"
+      few: '%{count} reakce'
+      many: '%{count} reakcí'
+      one: 1 reakce
+      other: '%{count} reakcí'
   no_mentions_allowed: "Bohužel, nemůžete zmiňovat ostatní uživatele."
+  too_many_mentions:
+    few: Bohužel, můžete zmínit jen %{count} uživatele v jednom příspěvku.
+    many: Bohužel, můžete zmínit jen %{count} uživatelů v jednom příspěvku.
+    one: Bohužel, můžete zmínit jen jednoho uživatele v jednom příspěvku.
+    other: Bohužel, můžete zmínit jen %{count} uživatelů v jednom příspěvku.
   no_mentions_allowed_newuser: "Bohužel, noví uživatelé nemohou zmiňovat ostatní uživatele."
+  too_many_mentions_newuser:
+    few: Bohužel, noví uživatelé mohou zmínit jen %{count} uživatele v příspěvku.
+    many: Bohužel, noví uživatelé mohou zmínit jen %{count} uživatelů v příspěvku.
+    one: Bohužel, noví uživatelé mohou zmínit jen jednoho uživatele v příspěvku.
+    other: Bohužel, noví uživatelé mohou zmínit jen %{count} uživatelů v příspěvku.
   no_images_allowed: "Bohužel, noví uživatelé nemohou vkládat obrázky do příspěvků."
+  too_many_images:
+    few: Bohužel, noví uživatelé mohou do příspěvku vložit jen %{count} obrázky.
+    many: Bohužel, noví uživatelé mohou do příspěvku vložit jen %{count} obrázků.
+    one: Bohužel, noví uživatelé mohou do příspěvku vložit jen jeden obrázek.
+    other: Bohužel, noví uživatelé mohou do příspěvku vložit jen %{count} obrázků.
   no_attachments_allowed: "Bohužel, noví uživatelé nemohou do příspěvků vkládat přílohy."
+  too_many_attachments:
+    few: Bohužel, noví uživatelé mohou do příspěvku vložit jen %{count} přílohy.
+    many: Bohužel, noví uživatelé mohou do příspěvku vložit jen %{count} příloh.
+    one: Bohužel, noví uživatelé mohou do příspěvku vložit jen jednu přílohu.
+    other: Bohužel, noví uživatelé mohou do příspěvku vložit jen %{count} příloh.
   no_links_allowed: "Bohužel, noví uživatelé nemohou vkládat odkazy do příspěvků."
+  links_require_trust: "Bohužel, nemůžete vkládat odkazy do příspěvků."
+  too_many_links:
+    few: Bohužel, noví uživatelé mohou do příspěvku vložit maximálně %{count} odkazy.
+    many: Bohužel, noví uživatelé mohou do příspěvku vložit maximálně %{count} odkazů.
+    one: Bohužel, noví uživatelé mohou do příspěvku vložit maximálně jeden odkaz.
+    other: Bohužel, noví uživatelé mohou do příspěvku vložit maximálně %{count} odkazů.
   spamming_host: "Bohužel, na tento server nemůžete odkazovat."
   user_is_suspended: "Vyloučení uživatelé nemohou přidávat příspěvky."
+  topic_not_found: "Něco se pokazilo. Téma mohlo být uzavřeno nebo smazáno během vašeho prohlížení."
   not_accepting_pms: "Bohužel, %{username} v současnosti nepřijímá zprávy."
+  max_pm_recepients: "Bohužel, můžete poslat zprávu maximálně %{recipients_limit} příjemcům."
   just_posted_that: "je příliš podobný vašemu příspěvku z poslední doby"
   invalid_characters: "obsahuje neplatné znaky"
+  is_invalid: "zdá se to být nejasné, je to kompletní věta?"
   next_page: "další strana →"
   prev_page: "← předchozí strana"
   page_num: "Strana %{num}"
@@ -154,32 +215,65 @@ cs:
   rss_description:
     latest: "Poslední témata"
     hot: "Populární témata"
-    posts: "Poslední příspěveky"
+    top: "Nejlepší témata"
+    top_all: "Nejlepší témata za celou dobu"
+    top_yearly: "Roční nejlepší témata"
+    top_quarterly: "Nejlepší témata za kvartál"
+    top_monthly: "Měsíční nejlepší témata"
+    top_weekly: "Týdenní nejlepší témata"
+    top_daily: "Denní nejlepší témata"
+    posts: "Poslední příspěvky"
+    private_posts: "Poslední osobní zprávy"
     group_posts: "Poslední příspěvky z @{group_name}"
+    group_mentions: "Poslední zmínky z @{group_name}"
     user_posts: "Poslední příspěvky od @{username}"
+    user_topics: "Poslední témata od @{username}"
+    tag: "Oštítkovaná témata"
+    badge: "%{display_name} odznak na %{site_title}"
   too_late_to_edit: "Tento příspěvek byl vytvořen velmi dávno. Už ho není možné smazat ani upravovat."
+  revert_version_same: "Aktuální verze je stejná jako verze, na kterou se pokoušíte vrátit."
   excerpt_image: "obrázek"
+  queue:
+    delete_reason: "Smazáno moderátorem"
+    not_found: "Příspěvek nebyl nalezen nebo již byl aktualizován."
   groups:
     errors:
       can_not_modify_automatic: "Nelze měnit automatické skupiny"
-      member_already_exist: "'%{username}' je už členem této skupiny."
+      invalid_domain: "'%{domain}' není platná doména."
+      invalid_incoming_email: "'%{email}' není platná emailová adresa."
+      email_already_used_in_group: "'%{email}' už je použit pro skupinu '%{group_name}'."
+      email_already_used_in_category: "'%{email}' už je použit pro kategorii '%{category_name}'."
+      cant_allow_membership_requests: "Nemůžete povolit žádosti o členství pro skupinu bez žádných vlastníků."
     default_names:
       everyone: "kdokoliv"
-      admins: "admins"
-      moderators: "moderators"
-      staff: "staff"
+      admins: "administrátoři"
+      moderators: "moderátoři"
+      staff: "redaktoři"
       trust_level_0: "trust_level_0"
       trust_level_1: "trust_level_1"
       trust_level_2: "trust_level_2"
       trust_level_3: "trust_level_3"
       trust_level_4: "trust_level_4"
+    request_membership_pm:
+      title: "Žádost o členství pro @%{group_name}"
   education:
     until_posts:
-      one: "příspěvek"
-      few: "%{count} příspěvky"
-      other: "%{count} příspěvků"
-    new-reply: |
-      Vítejte na %{site_name} &mdash; **díky za přispívání!**
+      few: '%{count} příspěvky'
+      many: '%{count} příspěvků'
+      one: příspěvek
+      other: '%{count} příspěvků'
+    'new-topic': |
+      Vítejte na %{site_name} &mdash; **díky za nové téma!**
+
+      - Zní název zajímavě, když si jej přečtete nahlas? Je to dobré shrnutí daného tématu?
+
+      - Koho by to mohlo zajímat? Proč na tom záleží? Jaké typy odpovědí očekáváte?
+
+      - Používejte ve svém tématu klíčová slova, aby jej ostatní mohli *najít*. Zařaďte své téma do vhodné kategorie.
+
+      Více se dozvíte v [pravidlech komunity](/guidelines). Tenhle panel se zobrazí pouze pro vaše první %{education_posts_text}.
+    'new-reply': |
+      Vítejte na %{site_name} &mdash; **díky za přispěvek!**
 
       - Přispívá nějak vaše odpověď k diskuzi?
 
@@ -188,6 +282,15 @@ cs:
       - Konstruktivní kritika je vítaná, ale kritizujte *myšlenky*, ne lidi.
 
       Další doporučení máme v [pravidlech komunity](/guidelines). Tenhle panel se zobrazí pouze pro vaše první %{education_posts_text}.
+    avatar: |+
+      ### Nechcete si nastavit svůj profilový obrázek?
+
+      Přidali jste několik témat a příspěvků, ale Váš profilový obrázek není tak jedinečný jako Vy - je to len písmeno.
+
+      Zvažovali jste **[navštívit svůj uživatelský profil]()** a nahrát v něm obrázek, který vás vystihuje?
+
+      Je jednodušší sledovat diskusi a nalézt v konverzaci zajímavé lidi, když má každý jedinečný profilový obrázek!
+
   activerecord:
     attributes:
       category:
@@ -199,14 +302,20 @@ cs:
       user_profile:
         bio_raw: "O mně"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Varování můžete přidat pouze k soukromým zprávám."
+              warning_requires_pm: "Varování můžete přidat pouze k osobním zprávám."
               too_many_users: "Varování můžete najednou poslat pouze jednomu uživateli."
-              cant_send_pm: "Bohužel, tomuto uživateli nemůžete poslat soukromou zprávu."
+              cant_send_pm: "Bohužel, tomuto uživateli nemůžete poslat osobní zprávu."
               no_user_selected: "Musíte vybrat platného uživatele."
+              reply_by_email_disabled: "Odpověď přes email byla vypnuta."
+              target_user_not_found: "Jeden z uživatelů, kterým posíláte tuto zprávu, nebyl nalezen."
+            featured_link:
+              invalid: "je neplatná. URL adresa by měla obsahovat http:// nebo https://."
+              invalid_category: "nelze upravit v této kategorii."
         user:
           attributes:
             password:
@@ -217,6 +326,10 @@ cs:
               unique_characters: "má příliš mnoho opakujících se znaků. Použijte prosím bezpečnější heslo."
             ip_address:
               signup_not_allowed: "Registrace z této adresy není povolena."
+        user_email:
+          attributes:
+            user_id:
+              reassigning_primary_email: "Opětovné přiřazení primárního emailu jinému uživateli není povoleno."
         color_scheme_color:
           attributes:
             hex:
@@ -224,33 +337,92 @@ cs:
         post_reply:
           base:
             different_topic: "Příspěvek a odpověď musí patřit ke stejnému tématu."
-      <<: *errors
+        web_hook:
+          attributes:
+            payload_url:
+              invalid: "URL adresa je neplatná. Měla by obsahovat http:// nebo https:// a nesmí v ní být mezery."
+        custom_emoji:
+          attributes:
+            name:
+              taken: již je použito u jiného emoji
+        topic_timer:
+          attributes:
+            execute_at:
+              in_the_past: "musí být v budoucnosti."
+        watched_word:
+          attributes:
+            word:
+              too_many: "Příliš mnoho slov pro tuto akci"
   user_profile:
-    no_info_other: "<div class='missing-profile'>%{name} o sobě zatím žádné informace nevyplnil</div>"
+    no_info_me: "<div class='missing-profile'>Pole 'o mně' na vašem profilu je v tuto chvíli prázdné, <a href='/u/%{username_lower}/preferences/about-me'>nechcete si ho vyplnit?</a></div>"
+    no_info_other: "<div class='missing-profile'>%{name} o sobě zatím nevyplnil žádné informace</div>"
   vip_category_name: "VIP"
   vip_category_description: "Kategorie je přístupná výhradně členům s důvěryhodností 3 a vyšší."
   meta_category_name: "Poznámky k webu"
   meta_category_description: "Diskutuje tento web, jeho organizaci, jak funguje a jak ho vylepšit."
   staff_category_name: "Redakce"
-  staff_category_description: "Privátní kategorie pro diskuze štábu. Témata jsou viditelná pouze pro moderátory a správce."
+  staff_category_description: "Privátní kategorie pro diskuze redakce. Témata jsou viditelná pouze pro moderátory a správce."
+  assets_topic_title: "Soubory pro vzhled webu"
+  assets_topic_body: "Toto téma je viditelné pouze pro redaktory a slouží pro uchovávání obrázků a souborů použitých v designu tohoto webu. Nemažte ho!\n\n\nJak postupovat:\n\n1. Odpovězte na toto téma.\n2. Nahrajte sem všechny obrázky které chcete používat pro loga, favicony a podobně. (Použijte ikonku „nahrát“ v panelu nad editorem, nebo obrázky rovnou přetáhněte a vložte)\n3. Pošlete tuto odpověď.\n4. Klikněte pravým tlačítkem na obrázky ve vašem novém příspěvku a zkopírujte si adresy, nebo klikněte na úpravu příspěvku a adresy vykopírujte odtud.\n5. Vložte tyto adresy do [základního nastavení](/admin/site_settings/category/required).\n\nPokud potřebujete nahrát jiné soubory, změňte nastavení `authorized_extensions` v [nastavení souborů](/admin/site_settings/category/files)."
   discourse_welcome_topic:
     title: "Vítejte v Discourse"
+    body: |2
+
+        První odstavec tohoto připnutého tématu se zobrazí na domovské stránce jako uvítací zpráva pro všechny nové návštěvníky. Je to důležité!
+
+        **Upravte tento text** do stručného popisu Vaší komunity:
+
+        - Pro koho tu je?
+        - Co zde lze nalézt?
+        - Proč by sem měli lidé chodit?
+        - Kde se lze dozvědět víc (odkazy, zdroje, atd.)?
+
+        <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+
+        Možná budete chtít toto téma v administraci (vpravo nahoře a dole) zavřít, aby se nehromadily odpovědi na oznámeních.
   lounge_welcome:
-    title: "Vítejte v Redakci"
+    title: "Vítejte ve VIP"
+    body: |2
+
+        Gratulujeme! :confetti_ball:
+
+        Pokud vidíte toto téma, byli jste nedávno povýšeni na **pravidelného** uživatele (důvěryhodnost 3).
+
+        Teď můžete &hellip;
+
+        * Upravovat nadpis jakéhokoliv tématu
+        * Měnit kategorii jakéhokoliv tématu
+        * Budou se sledovat všecky Vaše odkazy ([automatické nofollow](http://en.wikipedia.org/wiki/Nofollow) je odstraněno)
+        * Máte přístup do privátní kategorie VIP přístupné jen členům  s důvěryhodností 3 a vyšší
+        * Skrýt spam pomocí vlajky
+
+        Zde je [aktuální seznam pravidelných uživatelů](/badges/3/regular). Určitě je pozdravte.
+
+        Děkujeme, že jste důležitou součástí této komunity!
+
+        (Více informací naleznete na stránce o [důvěryhodnosti][trust]. Prosím nezapomeňte, že jen členové, kteří stále splňují požadavky zůstanou pravidelnými uživateli.)
+
+        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
-    topic_prefix: "Definice kategorie pro %{category}"
-    post_template: "%{replace_paragraph}\n\nPoužijte následující odstavce pro delší popis, nebo pro vytvoření pokynů ke kategorii nebo pravidel:\n\n- Proč by lidé měli používat tuto kategorii? K čemu slouží?\n\nJak přesně je tato kategorie odlišná od ostatních, které již máme?\n\n- Co by měly témata v této kategorii obvykle obsahovat?\n\nPotřebujeme tuto kategorii? Můžeme ji sloučit s jinou kategorií nebo subkategorií?\n"
+    topic_prefix: "O kategorii %{category}"
+    replace_paragraph: "(Nahraďte tento první odstavec stručným popisem nové kategorie. Tento návod se objeví v seznamu kategorií, takže se zkuste vejít do 200 znaků. **Kategorie se neobjeví v seznamu kategorií pokud neupravíte tento popis nebo v ní nevytvoříte témata.**)"
+    post_template: "%{replace_paragraph}\n\nPoužijte následující odstavce pro delší popis, nebo pro vytvoření pokynů ke kategorii nebo pravidel:\n\n- Proč by lidé měli používat tuto kategorii? K čemu slouží?\n\n- Jak přesně je tato kategorie odlišná od ostatních, které již máme?\n\n- Co by měly témata v této kategorii obvykle obsahovat?\n\n- Potřebujeme tuto kategorii? Můžeme ji sloučit s jinou kategorií nebo subkategorií?\n"
     errors:
       uncategorized_parent: "„Bez kategorie“ nemůže mít nadřazenou kategorii"
       self_parent: "Nadřazená kategorie nemůže zároveň být podkategorie"
-      depth: "Pokategorie se nedají vnořovat"
+      depth: "Podkategorie se nedají vnořovat"
+      invalid_email_in: "'%{email}' není platná emailová adresa."
+      email_already_used_in_group: "'%{email}' už je použit pro skupinu '%{group_name}'."
+      email_already_used_in_category: "'%{email}' už je použit pro kategorii '%{category_name}'."
+      description_incomplete: "Příspěvek s popisem kategorie musí obsahovat alespoň jeden odstavec."
     cannot_delete:
       uncategorized: "„Bez kategorie“ nejde smazat"
       has_subcategories: "Tato kategorie nejde smazat protože obsahuje podkategorie."
       topic_exists:
-        one: "Tato kategorie nejde smazat protože obsahuje 1 téma: %{topic_link}."
-        few: "Tato kategorie nejde smazat protože obsahuje %{count} témata. Nejstarší téma je %{topic_link}."
-        other: "Tato kategorie nejde smazat protože obsahuje %{count} témat. Nejstarší téma je %{topic_link}."
+        few: Tato kategorie nejde smazat protože obsahuje %{count} témata. Nejstarší téma je %{topic_link}.
+        many: Tato kategorie nejde smazat protože obsahuje %{count} témat. Nejstarší téma je %{topic_link}.
+        one: 'Tato kategorie nejde smazat protože obsahuje 1 téma: %{topic_link}.'
+        other: Tato kategorie nejde smazat protože obsahuje %{count} témat. Nejstarší téma je %{topic_link}.
       topic_exists_no_oldest: "Kategorii nelze smazat protože počet příspěvků je %{count}."
     uncategorized_description: "Témata bez kategorií, případně která nepasují do stávajících kategorií."
   trust_levels:
@@ -260,116 +432,147 @@ cs:
       title: "základní uživatel"
     member:
       title: "člen"
+    regular:
+      title: "pravidelný uživatel"
+    leader:
+      title: "vůdce"
+    change_failed_explanation: "Pokusili jste se snížit důvěryhodnost uživatele %{user_name} na '%{new_trust_level}'. Nicméně jeho aktuální důvěryhodnost už je '%{current_trust_level}'. Uživatel %{user_name} zůstane na úrovni '%{current_trust_level}'. Pokud chcete snížit důvěryhodnost uživatele, zamkněte nejdříve důvěryhodnost."
+  post:
+    image_placeholder:
+      broken: "Tento obrázek je rozbitý"
   rate_limiter:
-    too_many_requests: "Děláte tuto akci příliš často. Prosím počkejte %{time_left} a zkuste to znovu."
-    by_type:
-      pms_per_day: "Odeslal jsi maximum povolených zpráv za den. Další můžeš odeslat za {time_left}."
     hours:
-      one: "1 hodina"
-      few: "%{count} hodiny"
-      other: "%{count} hodin"
+      few: '%{count} hodiny'
+      many: '%{count} hodin'
+      one: 1 hodina
+      other: '%{count} hodin'
     minutes:
-      one: "1 minuta"
-      few: "%{count} minuty"
-      other: "%{count} minut"
+      few: '%{count} minuty'
+      many: '%{count} minut'
+      one: 1 minuta
+      other: '%{count} minut'
     seconds:
-      one: "1 sekunda"
-      few: "%{count} sekundy"
-      other: "%{count} sekund"
+      few: '%{count} sekundy'
+      many: '%{count} sekund'
+      one: 1 sekunda
+      other: '%{count} sekund'
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: "< 1s"
-        few: "< %{count}s"
-        other: "< %{count}s"
+        few: < %{count}s
+        many: < %{count}s
+        one: < 1s
+        other: < %{count}s
       x_seconds:
-        one: "1s"
-        few: "%{count}s"
-        other: "%{count}s"
+        few: '%{count}s'
+        many: '%{count}s'
+        one: 1s
+        other: '%{count}s'
       less_than_x_minutes:
-        one: "< 1m"
-        few: "< %{count}m"
-        other: "< %{count}m"
+        few: < %{count}m
+        many: < %{count}m
+        one: < 1m
+        other: < %{count}m
       x_minutes:
-        one: "1m"
-        few: "%{count}m"
-        other: "%{count}m"
+        few: '%{count}m'
+        many: '%{count}m'
+        one: 1m
+        other: '%{count}m'
       about_x_hours:
-        one: "1h"
-        few: "%{count}h"
-        other: "%{count}h"
+        few: '%{count}h'
+        many: '%{count}h'
+        one: 1h
+        other: '%{count}h'
       x_days:
-        one: "1d"
-        few: "%{count}d"
-        other: "%{count}d"
+        few: '%{count}d'
+        many: '%{count}d'
+        one: 1d
+        other: '%{count}d'
       about_x_months:
-        one: "1měs"
-        few: "%{count}měs"
-        other: "%{count}měs"
+        few: '%{count}měs'
+        many: '%{count}měs'
+        one: 1měs
+        other: '%{count}měs'
       x_months:
-        one: "1měs"
-        few: "%{count}měs"
-        other: "%{count}měs"
+        few: '%{count}měs'
+        many: '%{count}měs'
+        one: 1měs
+        other: '%{count}měs'
       about_x_years:
-        one: "1r"
-        few: "%{count}r"
-        other: "%{count}let"
+        few: '%{count}r'
+        many: '%{count}let'
+        one: 1r
+        other: '%{count}let'
       over_x_years:
-        one: "> 1r"
-        few: "> %{count}r"
-        other: "> %{count}let"
+        few: '> %{count}r'
+        many: '> %{count}let'
+        one: '> 1r'
+        other: '> %{count}let'
       almost_x_years:
-        one: "1r"
-        few: "%{count}r"
-        other: "%{count}let"
+        few: '%{count}r'
+        many: '%{count}let'
+        one: 1r
+        other: '%{count}let'
     distance_in_words_verbose:
       half_a_minute: "právě teď"
       less_than_x_seconds:
-        one: "právě teď"
-        few: "právě teď"
-        other: "právě teď"
+        few: právě teď
+        many: právě teď
+        one: právě teď
+        other: právě teď
       x_seconds:
-        one: "před 1 sekundou"
-        few: "před %{count} sekundami"
-        other: "před %{count} sekundami"
+        few: před %{count} sekundami
+        many: před %{count} sekundami
+        one: před 1 sekundou
+        other: před %{count} sekundami
       less_than_x_minutes:
-        one: "před méně než 1 minutou"
-        few: "před méně než %{count} minutami"
-        other: "před méně než %{count} minutami"
+        few: před méně než %{count} minutami
+        many: před méně než %{count} minutami
+        one: před méně než 1 minutou
+        other: před méně než %{count} minutami
       x_minutes:
-        one: "před 1 minutou"
-        few: "před %{count} minutami"
-        other: "před %{count} minutami"
+        few: před %{count} minutami
+        many: před %{count} minutami
+        one: před 1 minutou
+        other: před %{count} minutami
       about_x_hours:
-        one: "před 1 hodinou"
-        few: "před %{count} hodinami"
-        other: "před %{count} hodinami"
+        few: před %{count} hodinami
+        many: před %{count} hodinami
+        one: před 1 hodinou
+        other: před %{count} hodinami
       x_days:
-        one: "před 1 dnem"
-        few: "před %{count} dny"
-        other: "před %{count} dny"
+        few: před %{count} dny
+        many: před %{count} dny
+        one: před 1 dnem
+        other: před %{count} dny
       about_x_months:
-        one: "asi před 1 měsícem"
-        few: "asi před %{count} měsíci"
-        other: "asi před %{count} měsíci"
+        few: asi před %{count} měsíci
+        many: asi před %{count} měsíci
+        one: asi před 1 měsícem
+        other: asi před %{count} měsíci
       x_months:
-        one: "před 1 měsícem"
-        few: "před %{count} měsíci"
-        other: "před %{count} měsíci"
+        few: před %{count} měsíci
+        many: před %{count} měsíci
+        one: před 1 měsícem
+        other: před %{count} měsíci
       about_x_years:
-        one: "asi před 1 rokem"
-        few: "asi před %{count} roky"
-        other: "asi před %{count} roky"
+        few: asi před %{count} roky
+        many: asi před %{count} roky
+        one: asi před 1 rokem
+        other: asi před %{count} roky
       over_x_years:
-        one: "před více než 1 rokem"
-        few: "před více než %{count} roky"
-        other: "před více než %{count} roky"
+        few: před více než %{count} roky
+        many: před více než %{count} roky
+        one: před více než 1 rokem
+        other: před více než %{count} roky
       almost_x_years:
-        one: "téměř před 1 rokem"
-        few: "téměř před %{count} roky"
-        other: "téměř před %{count} roky"
+        few: téměř před %{count} roky
+        many: téměř před %{count} roky
+        one: téměř před 1 rokem
+        other: téměř před %{count} roky
   password_reset:
+    choose_new: "Vyberte si nové heslo"
     choose: "Vybrat heslo"
     update: 'změnit heslo'
     save: 'Nastavit heslo'
@@ -381,6 +584,7 @@ cs:
     please_continue: "Pokračovat na %{site_name}"
     error: "Nastala chyba běhěm změny emailové adresy. Není nová adresa již někým používána?"
   activation:
+    action: "Klikni sem pro aktivaci svého účtu"
     already_done: "Bohužel, tento odkaz pro aktivaci účtu již není platný. Není váš účet jíž aktivní?"
     please_continue: "Váš účet je aktivovaný; budete přesměrování na výchozí stránku."
     continue_button: "Pokračovat na %{site_name}"
@@ -390,6 +594,7 @@ cs:
     off_topic:
       title: 'Off-Topic'
       description: 'Tento příspěvek se nevztahuje k diskuzi definované názvem a obsahem prvního příspěvku a měl by asi být přesunut jinam.'
+      short_description: 'Není relevantní k diskuzi'
       long_form: 'označil příspěvek jako off-topic'
     spam:
       title: 'Spam'
@@ -400,6 +605,7 @@ cs:
       title: 'Nevhodné'
       long_form: 'nahlášeno jako nevhodné'
     notify_user:
+      title: 'Poslat @{{username}} zprávu'
       long_form: 'obeslaný uživatel'
       email_title: 'Váš příspěvek v „%{title}“'
       email_body: "%{link}\\\n\\\n%{message}\n"
@@ -409,18 +615,26 @@ cs:
     bookmark:
       title: 'Záložka'
       description: 'Přidat záložku k tomuto příspěvku'
+      short_description: 'Přidat záložku k tomuto příspěvku'
       long_form: 'přidal záložku k tomuto příspěvku'
     like:
       title: 'To se mi líbí'
       description: 'Tento příspěvek se mi líbí'
+      short_description: 'Tento příspěvek se mi líbí'
       long_form: 'se líbí'
     vote:
       title: 'Hlasovat'
       description: 'Hlasujte pro tento příspěvek'
+      short_description: 'Hlasujte pro tento příspěvek'
       long_form: 'hlasoval pro tento příspěvek'
   user_activity:
     no_bookmarks:
+      self: "Nemáte žádné příspěvky v záložkách. Přidání do záložek vám umožní téma v budoucnu snadněji nalézt."
       others: "Žádné záložky."
+    no_likes_given:
+      self: "Zatím se ti nelíbil žádný příspěvek."
+    no_replies:
+      others: "Žádné odpovědi."
   topic_flag_types:
     spam:
       title: 'Spam'
@@ -448,6 +662,7 @@ cs:
     title: "Odhlášení"
     stop_watching_topic: "Přestat sledovat toto téma, %{link}"
     disable_digest_emails: "Zrušit zasílání souhrnných emailů"
+    log_out: "Odhlásit se"
   user_api_key:
     scopes:
       session_info: "Číst user session info"
@@ -459,9 +674,7 @@ cs:
       xaxis: "Den"
       yaxis: "Počet návštěv"
     signups:
-      title: "Noví uživatelé"
       xaxis: "Den"
-      yaxis: "Počet nových uživatelů"
     profile_views:
       title: "Zobrazení uživatelských profilů"
       xaxis: "Den"
@@ -499,7 +712,6 @@ cs:
       xaxis: "Den"
       yaxis: "Počet emailů"
     user_to_user_private_messages:
-      title: "Uživatelské soukromé zprávy"
       xaxis: "Den"
       yaxis: "Počet zpráv"
     system_private_messages:
@@ -542,7 +754,6 @@ cs:
     page_view_crawler_reqs:
       xaxis: "Den"
     page_view_total_reqs:
-      title: "Celkem"
       xaxis: "Den"
       yaxis: "Celkové pageviews"
     page_view_logged_in_mobile_reqs:
@@ -594,7 +805,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>.'
     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>.'
   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"
     min_search_term_length: "Minimální délka hledaného výrazu ve znacích"
     allow_duplicate_topic_titles: "Povolit témata se stejným, duplicitním názvem"
@@ -617,8 +827,6 @@ cs:
     google_oauth2_client_id: "Client ID vaší Google aplikace."
     google_oauth2_client_secret: "Client secret vaší Google aplikace."
     enable_twitter_logins: "Povolit přihlašování přes Twitter, vyžaduje správně nastavené 'twitter_consumer_key' a 'twitter_consumer_secret'"
-    twitter_consumer_key: "'Consumer key' pro přihlašování přes Twitter, registrace na http://dev.twitter.com"
-    twitter_consumer_secret: "'Consumer secret' pro přihlašování přes Twitter, registrace na http://dev.twitter.com"
     enable_facebook_logins: "Povolit přihlašování přes Facebook, vyžaduje správně nastavené 'facebook_app_id' a 'facebook_app_secret'"
     facebook_app_id: "'App id' pro přihlašování přes Facebook, registrace na https://developers.facebook.com/apps"
     facebook_app_secret: "'App secret' pro přihlašování přes Facebook, registrace na https://developers.facebook.com/apps"
@@ -656,13 +864,19 @@ cs:
     types:
       category: 'Kategorie'
       user: 'Uživatelé'
-  original_poster: "Původní zasilatel"
+  original_poster: "Autor tématu"
   most_posts: "Více příspěvků"
-  most_recent_poster: "Poslední zasilatel"
-  frequent_poster: "Častý zasilatel"
+  most_recent_poster: "Poslední přispěvatel"
+  frequent_poster: "Častý přispěvatel"
   redirected_to_top_reasons:
     new_user: "Vítejte v naší komunitě! Tohle jsou poslední populární témata."
     not_seen_in_a_month: "Vítejte zprátky! Chvíli jsme se neviděli. Tohle jsou nejpopulárnější témata od vaší poslední návštěvy."
+  move_posts:
+    new_topic_moderator_post:
+      few: '%{count}příspěvky byly odděleny do nového tématu: %{topic_link}'
+      many: '%{count}příspěvky byly odděleny do nového tématu: %{topic_link}'
+      one: 'Příspěvek byl oddělen do nového tématu: %{topic_link}'
+      other: '%{count}příspěvky byly odděleny do nového tématu: %{topic_link}'
   topic_statuses:
     archived_enabled: "Toto téma je archivováno. Je zmraženo a již nemůže být nijak změněno."
     archived_disabled: "Toto téma je vráceno z archivu. Již není zmraženo a může být měněno."
@@ -702,24 +916,33 @@ cs:
     restore_failed:
       title: "Obnova Neúspěšná"
       subject_template: "Obnova neúspěšná"
-    csv_export_succeeded:
-      subject_template: "Exportování dat dokončeno"
     csv_export_failed:
       subject_template: "Exportování dat selhalo"
     pending_users_reminder:
       subject_template:
-        one: "1 user waiting for approval"
-        few: "%{count} users waiting for approval"
-        other: "%{count} users waiting for approval"
+        few: '%{count} users waiting for approval'
+        many: '%{count} users waiting for approval'
+        one: 1 user waiting for approval
+        other: '%{count} users waiting for approval'
       text_body_template: |
         There are new user signups waiting to be approved (or rejected) before they can access this forum.
 
         [Please review them in the admin section](%{base_url}/admin/users/list/pending).
+  unsubscribe_link: |
+    Pro zrušení zasílání těchto emailů [klikněte zde](%{unsubscribe_url}).
+  unsubscribe_link_and_mail: |
+    Pro zrušení zasílání těchto emailů [klikněte zde](%{unsubscribe_url}).
+  unsubscribe_mailing_list: |
+    Obdrželi jste tento email, protože máte zapnutý režim elektronická pošta.
+
+    Pro zrušení zasílání těchto emailů [klikněte zde](%{unsubscribe_url}).
   user_notifications:
     previous_discussion: "Předchozí diskuze"
     unsubscribe:
       title: "Odhlásit z odběru emailů"
       description: "Nechcete již od nás dostávat emaily? Žádný problém! Klikněte na odkaz níže pro okamžité odhlášení z odběru emailů:"
+    reply_by_email: "K odpovědi [navštivte téma](%{base_url}%{url}) nebo odepište na tento email."
+    visit_link_to_respond: "K odpovědi [navštivte téma](%{base_url}%{url})."
     posted_by: "Zaslal uživatel %{username} dne %{post_date}"
     digest:
       why: "Krátký souhrn z webu %{site_link} od poslední návštěvy v %{last_seen_at}"
@@ -758,7 +981,7 @@ cs:
     post_not_found: "Can't find a post with id %{post_id}"
     notification_already_read: "The notification this email is about has already been read"
     topic_nil: "post.topic is nil"
-    post_deleted: "post was deleted by the author"
+    post_deleted: "příspěvek byl odstraněn autorem"
     user_suspended: "user was suspended"
     already_read: "user has already read this post"
     message_blank: "message is blank"
@@ -793,7 +1016,6 @@ cs:
       name: Obdivovaný
   admin_login:
     success: "E-mail odeslán"
-    error: "Chyba!"
     submit_button: "Odeslat e-mail"
   wizard:
     step:
@@ -840,6 +1062,3 @@ cs:
         title: "Pozvi redakci"
       finished:
         title: "Váš Discourse je připraven!"
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index 0d279ca0e44..9d088049422 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -17,12 +17,12 @@ da:
       date_only: "%-d. %B, %Y"
       long: "%-d. %B %Y, %H:%M"
   date:
-    month_names: [null, Januar, Februar, Marts, April, Maj, Juni, Juli, August, September, Oktober, November, December]
+    month_names: [~, Januar, Februar, Marts, April, Maj, Juni, Juli, August, September, Oktober, November, December]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "am"
     pm: "pm"
-    <<: *datetime_formats
   title: "Discourse"
   topics: "Emner"
   posts: "indlæg"
@@ -66,19 +66,18 @@ da:
       present: skal være tomt
       confirmation: "matcher ikke %{attribute}"
       empty: kan ikke være tom
-      equal_to: skal være %{count}
+      equal_to: "skal være %{count}"
       even: skal være et lige tal
       exclusion: er reserveret
-      greater_than: skal være større end %{count}
-      greater_than_or_equal_to: skal være større eller lig med %{count}
+      greater_than: "skal være større end %{count}"
+      greater_than_or_equal_to: "skal være større eller lig med %{count}"
       has_already_been_used: "er allerede blevet brugt"
       inclusion: er ikke inkluderet i listen
       invalid: er ikke gyldig
       is_invalid: "virker upræcis, er det en hel sætning?"
       contains_censored_words: "indeholder følgende censurerede ord: %{censurerede ord}"
-      matches_censored_pattern: "indeholder følgende ord som matcher sitets censurerede regexp'er: %{censored_words}"
-      less_than: skal være mindre end %{count}
-      less_than_or_equal_to: skal være mindre end eller lig med %{count}
+      less_than: "skal være mindre end %{count}"
+      less_than_or_equal_to: "skal være mindre end eller lig med %{count}"
       not_a_number: er ikke et nummer
       not_an_integer: skal være et heltal
       odd: skal være et ulige tal
@@ -110,6 +109,9 @@ da:
       max_username_length_range: "Du kan ikke sætte maksimum til mindre end minimum."
       default_categories_already_selected: "Du kan ikke vælge en kategori der er brugt i en anden liste."
       s3_upload_bucket_is_required: "Du kan ikke oploade til S3 med mindre du har angivet 's3_upload_bucket'."
+  activemodel:
+    errors:
+      <<: *errors
   invite:
     not_found: "Dit invitation-token er ugyldigt. Kontakt veligst sitets administrator."
     user_exists: "Der er ingen grund til at invitere <b>%{email}</b>, personen <a href='/u/%{username}/summary'>har allerede en profil!</a>"
@@ -130,8 +132,8 @@ da:
   reading_time: "Læsetid"
   likes: "Synes godt om"
   too_many_replies:
-    one: "Beklager, men nye brugere kan kun skrive 1 svar i hvert emne til at starte med."
-    other: "Beklager, men nye brugere kan kun skrive %{count} svar i hvert emne til at starte med."
+    one: Beklager, men nye brugere kan kun skrive 1 svar i hvert emne til at starte med.
+    other: Beklager, men nye brugere kan kun skrive %{count} svar i hvert emne til at starte med.
   embed:
     start_discussion: "Start diskussion"
     continue: "Fortsæt diskussion"
@@ -141,39 +143,40 @@ da:
     no_hosts: "Ingen værter var konfigureret til indlejring."
     configure: "Konfigurér indlejring"
     more_replies:
-      one: "1 svar til"
-      other: "%{count} svar til"
+      one: 1 svar til
+      other: '%{count} svar til'
     loading: "Indlæser diskussion…"
     permalink: "Permalink"
     imported_from: "Importeret fra: %{link}"
     in_reply_to: "▶ %{username}"
     replies:
-      one: "1 svar"
-      other: "%{count} svar"
+      one: 1 svar
+      other: '%{count} svar'
   no_mentions_allowed: "Beklager, du kan ikke nævne andre brugere."
   too_many_mentions:
-    one: "Beklager, men du kan kun nævne %{count} brugere i et indlæg."
-    other: "Beklager, men du kan kun nævne %{count} brugere i et indlæg."
+    one: Beklager, men du kan kun nævne %{count} brugere i et indlæg.
+    other: Beklager, men du kan kun nævne %{count} brugere i et indlæg.
   no_mentions_allowed_newuser: "Beklager, nye brugere kan ikke nævne andre brugere."
   too_many_mentions_newuser:
-    one: "Beklager, nye brugere kan kun nævne en bruger i et indlæg."
-    other: "Beklager, nye brugere kan kun nævne %{count} brugere i et indlæg."
+    one: Beklager, nye brugere kan kun nævne en bruger i et indlæg.
+    other: Beklager, nye brugere kan kun nævne %{count} brugere i et indlæg.
   no_images_allowed: "Beklager, nye brugere kan ikke postere billeder i indlæg."
   too_many_images:
-    one: "Beklager, nye brugere kan kun anvende et billede i et indlæg."
-    other: "Beklager, nye brugere kan kun anvende %{count} billeder i et indlæg."
+    one: Beklager, nye brugere kan kun anvende et billede i et indlæg.
+    other: Beklager, nye brugere kan kun anvende %{count} billeder i et indlæg.
   no_attachments_allowed: "Beklager, nye brugere kan ikke vedhæfte filer i et indlæg."
   too_many_attachments:
-    one: "Beklager, nye brugere kan kun vedhæfte en fil i et indlæg."
-    other: "Beklager, nye brugere kan kun vedhæfte %{count} filer i et indlæg."
+    one: Beklager, nye brugere kan kun vedhæfte en fil i et indlæg.
+    other: Beklager, nye brugere kan kun vedhæfte %{count} filer i et indlæg.
   no_links_allowed: "Beklager, nye brugere kan ikke bruge links i indlæg."
   too_many_links:
-    one: "Beklager, nye brugere kan kun indsætte et link i et indlæg."
-    other: "Beklager, nye brugere kan kun indsætte %{count} links i et indlæg."
+    one: Beklager, nye brugere kan kun indsætte et link i et indlæg.
+    other: Beklager, nye brugere kan kun indsætte %{count} links i et indlæg.
   spamming_host: "Beklager, du kan ikke indsætte et link til det pågældende domæne."
   user_is_suspended: "Suspenderede brugere tilllades ikke at oprette indlæg."
   topic_not_found: "Der er gået noget galt. Måske er emnet blevet lukket eller slettet mens du kiggede på det?"
   not_accepting_pms: "Beklager, %{username} tager ikke imod beskeder i øjeblikket."
+  max_pm_recepients: "Du kan desværre kun sende til %{recipients_limit} modtagere."
   just_posted_that: "ligner et andet indlæg, som du har skrevet for nyligt, for meget"
   invalid_characters: "indeholder ugyldige tegn"
   is_invalid: "lader til at være uklart - er det en komplet sætning?"
@@ -200,7 +203,7 @@ da:
     top_weekly: "Top-emner per uge"
     top_daily: "Top-emner per dag"
     posts: "Seneste indlæg"
-    private_posts: "Seneste private beskeder"
+    private_posts: "Seneste personlige beskeder"
     group_posts: "Seneste indlæg fra %{group_name}"
     group_mentions: "Seneste nævnelser fra %{group_name}"
     user_posts: "Seneste indlæg af @%{username}"
@@ -212,11 +215,8 @@ da:
   queue:
     delete_reason: "Slettet via køen til moderation af indlæg."
   groups:
-    success:
-      bulk_add: "%{users_added} brugere er blevet tilføjet til gruppen."
     errors:
       can_not_modify_automatic: "Du kan ikke modificere en automatisk gruppe"
-      member_already_exist: "'%{username}' er allerede medlem af denne gruppe."
       invalid_domain: "'%{domain}' er ikke et gyldigt domæne."
       invalid_incoming_email: "'%{email}' er ikke en gyldig email adresse."
       email_already_used_in_group: "'%{email}' er allerede brugt af en bruger i gruppen '%{group_name}'."
@@ -233,9 +233,9 @@ da:
       trust_level_4: "tillidsniveau_4"
   education:
     until_posts:
-      one: "indlæg"
-      other: "%{count} indlæg"
-    new-topic: |
+      one: indlæg
+      other: '%{count} indlæg'
+    'new-topic': |
       Velkommen til %{site_name} &mdash; **Tak fordi du starter en ny samtale!**
 
       -  Lyder title interessant hvis du læser den højt? Er det et godt resumé?
@@ -243,7 +243,7 @@ da:
       -  Inkludér relevante ord i dit emne så andre kan *finde* det. For at gruppere dit emne med relaterede emner, så vælg en kategori.
 
       For mere info, [se vores retningslinjer](/guidelines). Dette panel vil kun vises første gang for %{education_posts_text}.
-    new-reply: |
+    'new-reply': |
       Velkommen til %{site_name} &mdash; **tak for at du deltager i samtalen!**
 
       Husk venligst mens du skriver dit svar:
@@ -292,12 +292,6 @@ da:
       Beklager, men nye brugere er begrænset til %{newuser_max_replies_per_topic} svar inden for samme emne.
 
       I stedet for at tilføje endnu et svar, bør du overveje at redigere et af dine eksisterende svar eller at besøge andre emner.
-    reviving_old_topic: |
-      ### Genopliv dette emne?
-
-      Det seneste svar på dette emne er nu over **%{days}** gammelt. Dit svar vil trække dette emne til toppen af listen og vil påminde alle der tidligere have været med i samtalen.
-
-      Er du sikker på du vil vække dette emne til live igen?
   activerecord:
     attributes:
       category:
@@ -310,14 +304,14 @@ da:
       user_profile:
         bio_raw: "Om mig"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Du kan kun vedhæfte advarsler til private beskeder."
               too_many_users: "Du kan kun sende advarsler til en bruger ad gangen."
-              cant_send_pm: "Beklager, du kan ikke sende en privat besked til den bruger."
               no_user_selected: "Du skal vælge en gyldig bruger."
+              reply_by_email_disabled: "Svar via email er slået fra"
             featured_link:
               invalid: "er ugyldig. URL'en skal indeholde http:// eller https://. "
               invalid_category: "kan ikke redigeres i denne kategori."
@@ -346,7 +340,6 @@ da:
           attributes:
             name:
               taken: er allerede i brug af en anden emoji
-      <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>“Om mig”-feltet på din profil er pt. tomt, <a href='/u/%{username_lower}/preferences/about-me'>ønsker du at udfylde det?</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} har ikke skrevet noget i “Om mig”-feltet endnu</div>"
@@ -360,40 +353,40 @@ da:
     title: "Velkommen til Discourse"
     body: |2
 
-      Det første afsnit af dette fastgjorte emne vil kunne ses som en velkomstbesked for alle nye besøgende på din hjemmeside. Dette er vigtigt!
+        Det første afsnit af dette fastgjorte emne vil kunne ses som en velkomstbesked for alle nye besøgende på din hjemmeside. Dette er vigtigt!
 
-      **Redigér dette** til en kortfattet beskrivelse af dit fællesskab:
+        **Redigér dette** til en kortfattet beskrivelse af dit fællesskab:
 
-      - Hvem er det rettet mod?
-      - Hvad kan de finde her?
-      - Hvorfor bør de komme her?
-      - Hvor finde de mere information (links, ressourcer, osv.)?
-      <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+        - Hvem er det rettet mod?
+        - Hvad kan de finde her?
+        - Hvorfor bør de komme her?
+        - Hvor finde de mere information (links, ressourcer, osv.)?
+        <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
 
-      Du bør eventuelt lukke dette emne via administratorfunktionen :wrench: (øverst til højre og i bunden), således at der ikke hober sig svar op til denne meddelelse.
+        Du bør eventuelt lukke dette emne via administratorfunktionen :wrench: (øverst til højre og i bunden), således at der ikke hober sig svar op til denne meddelelse.
   lounge_welcome:
     title: "Velkommen i loungen"
     body: |2
 
-      Tillykke! :confetti_ball:
+        Tillykke! :confetti_ball:
 
-      Hvis du kan se dette er du nu vlevet opgraderet som **regular** (trust level 3) bruger.
+        Hvis du kan se dette er du nu vlevet opgraderet som **regular** (trust level 3) bruger.
 
-      Nu kan du &hellip;
+        Nu kan du &hellip;
 
-      * Rediger enhver emne titel
-      * Ændre alle kategorier og emner
-      * Følge alle links ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) ier fjernet)
-      * Få adgang til en privat lounge kategori kun synlig for brugere med Trust LEvel 3, eller højere
-      * Gemme spam - med et enkelt flag
+        * Rediger enhver emne titel
+        * Ændre alle kategorier og emner
+        * Følge alle links ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) ier fjernet)
+        * Få adgang til en privat lounge kategori kun synlig for brugere med Trust LEvel 3, eller højere
+        * Gemme spam - med et enkelt flag
 
-      Her er  [current list of fellow regulars](/badges/3/regular). Sving forbi og hils på!
+        Her er  [current list of fellow regulars](/badges/3/regular). Sving forbi og hils på!
 
-      Tak fordi du er en vigtig del af dette fællesskab!
+        Tak fordi du er en vigtig del af dette fællesskab!
 
-      (Formere information om Trust Levels [see this topic][trust]. Bemærk venligst at kun brugere der vedbliver at leve op til Trust Level betingelserne, vil have fortsat adgang)
+        (Formere information om Trust Levels [see this topic][trust]. Bemærk venligst at kun brugere der vedbliver at leve op til Trust Level betingelserne, vil have fortsat adgang)
 
-      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Kategoridefinition for %{category}"
     replace_paragraph: "(Beskriv din nye kategori her. Beskriv ramme og formål med kategori således at det er tydeligt for andre. Forsøg at holde beskrivelsen på max 200 tegn. **Kategorien vil ikke fremgå på kategori listen, før du har redigeret beskrivelsen, eller oprettet emner)."
@@ -409,8 +402,8 @@ da:
       uncategorized: "Kan ikke slette Ukategoriseret"
       has_subcategories: "Kan ikke slette denne kategori, fordi den har under kategorier."
       topic_exists:
-        one: "Kan ikke slette denne kategori, da den indeholder et emne. Ældste emne er %{topic_link}"
-        other: "Kan ikke slette denne kategori, da den indeholder %{count} emner. Ældste emne er %{topic_link}"
+        one: Kan ikke slette denne kategori, da den indeholder et emne. Ældste emne er %{topic_link}
+        other: Kan ikke slette denne kategori, da den indeholder %{count} emner. Ældste emne er %{topic_link}
       topic_exists_no_oldest: "Kan ikke slette denne kategori fordi antallet af emner er %{count}"
     uncategorized_description: "Emner der ikke behøver kategori, eller ikke passer i eksisterende kategori."
   trust_levels:
@@ -426,103 +419,86 @@ da:
       title: "Veteran"
     change_failed_explanation: "Du har forsøgt at degradere %{user_name} til '%{new_trust_level}'. Imidlertid er deres niveau af tillid allerede '%{current_trust_level}'. %{user_name} vil forblive'%{current_trust_level}' - hvis du ønsker at degradere brugeren, skal du først låse brugerens tillids niveau / Trust Level"
   rate_limiter:
-    slow_down: "Du har udført denne handling for mange gange, prøv igen senere"
-    too_many_requests: "Vi har en daglig grænse for hvor mange gange den pågældende handling kan udføres. Vent venligst %{time_left} før du prøver igen."
-    by_type:
-      first_day_replies_per_day: "Du har nået det maksimalt antal tilladte svar, en ny bruger kan lave på deres første dag. Vent venligst %{time_left} før du fortsætter med at besvare tanker og indlæg."
-      first_day_topics_per_day: "Du har nået det maksimalt antal af tilladte emner, en ny bruger kan lave på første dag.\nVent venligst %{time_left} før du prøver igen."
-      create_topic: "Du opretter emner for hurtigt. Vent venligst %{time_left} før du prøver igen."
-      create_post: "Du svarer for hurtigt. Vent venligst %{time_left} før du prøver igen."
-      delete_post: "Du sletter emner for hurtigt. Vent venligst %{time_left}før du prøver igen."
-      public_group_membership: "Du tilslutter/forlader grupper for ofte. Vent venligst %{time_left} før du forsøger igen."
-      topics_per_day: "Du har nået det maksimalt antal tilladte nye emner i dag. Venligst vent %{time_left} før du prøver igen."
-      pms_per_day: "Du har nu nået det maksimalt antal tilladte beskeder. Vent venligst %{time_left} før du prøver igen."
-      create_like: "Du har nået grænsen for antal tilladte 'likes' for i dag. Vent venligst %{time_left} før du prøver igen."
-      create_bookmark: "Du har nået det maksimalt antal tilladte bogmærker i dag. Vent venligst %{time_left} før du prøver igen. "
-      edit_post: "Du har nået det maksimale antal redigeringer for i dag. Vent venligst  %{time_left} før du forsøger igen."
-      live_post_counts: "Du efterspørger udgivede emner for hurtigt. Vent venligst %{time_left} før du prøver igen."
-      unsubscribe_via_email: "Du har nået det maksimalt antal tilladte afmeldinger via email i dag.  Vent venligst%{time_left} før du prøver igen."
-      topic_invitations_per_day: "Du har nået det maksimalt antal tilladte emne invitationer i dag. Vent venligst %{time_left} før du prøver igen."
     hours:
-      one: "1 time"
-      other: "%{count} timer"
+      one: 1 time
+      other: '%{count} timer'
     minutes:
-      one: "1 minut"
-      other: "%{count} minutter"
+      one: 1 minut
+      other: '%{count} minutter'
     seconds:
-      one: "1 sekund"
-      other: "%{count} sekunder"
+      one: 1 sekund
+      other: '%{count} sekunder'
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: "< 1s"
-        other: "< %{count}s"
+        one: < 1s
+        other: < %{count}s
       x_seconds:
-        one: "1s"
-        other: "%{count}s"
+        one: 1s
+        other: '%{count}s'
       less_than_x_minutes:
-        one: "< 1m"
-        other: "< %{count}m"
+        one: < 1m
+        other: < %{count}m
       x_minutes:
-        one: "1m"
-        other: "%{count}m"
+        one: 1m
+        other: '%{count}m'
       about_x_hours:
-        one: "1h"
-        other: "%{count}t"
+        one: 1h
+        other: '%{count}t'
       x_days:
-        one: "1d"
-        other: "%{count}d"
+        one: 1d
+        other: '%{count}d'
       about_x_months:
-        one: "1md"
-        other: "%{count}mdr"
+        one: 1md
+        other: '%{count}mdr'
       x_months:
-        one: "1md"
-        other: "%{count}mdr"
+        one: 1md
+        other: '%{count}mdr'
       about_x_years:
-        one: "1 år"
-        other: "%{count} år"
+        one: 1 år
+        other: '%{count} år'
       over_x_years:
-        one: "> 1 år"
-        other: "> %{count} år"
+        one: '> 1 år'
+        other: '> %{count} år'
       almost_x_years:
-        one: "1 år"
-        other: "%{count} år"
+        one: 1 år
+        other: '%{count} år'
     distance_in_words_verbose:
       half_a_minute: "lige nu"
       less_than_x_seconds:
-        one: "lige nu"
-        other: "lige nu"
+        one: lige nu
+        other: lige nu
       x_seconds:
-        one: "1 sekund siden"
-        other: "%{count} sekunder siden"
+        one: 1 sekund siden
+        other: '%{count} sekunder siden'
       less_than_x_minutes:
-        one: "mindre end 1 minut siden"
-        other: "mindre end %{count} minutter siden"
+        one: mindre end 1 minut siden
+        other: mindre end %{count} minutter siden
       x_minutes:
-        one: "1 minut siden"
-        other: "%{count} minutter siden"
+        one: 1 minut siden
+        other: '%{count} minutter siden'
       about_x_hours:
-        one: "1 time siden"
-        other: "%{count} timer siden"
+        one: 1 time siden
+        other: '%{count} timer siden'
       x_days:
-        one: "1 dag siden"
-        other: "%{count} dage siden"
+        one: 1 dag siden
+        other: '%{count} dage siden'
       about_x_months:
-        one: "ca. 1 måned siden"
-        other: "ca. %{count} måneder siden"
+        one: ca. 1 måned siden
+        other: ca. %{count} måneder siden
       x_months:
-        one: "1 måned siden"
-        other: "%{count} måneder siden"
+        one: 1 måned siden
+        other: '%{count} måneder siden'
       about_x_years:
-        one: "ca. 1 år siden"
-        other: "ca. %{count} år siden"
+        one: ca. 1 år siden
+        other: ca. %{count} år siden
       over_x_years:
-        one: "over 1 år siden"
-        other: "over %{count} år siden"
+        one: over 1 år siden
+        other: over %{count} år siden
       almost_x_years:
-        one: "næsten 1 år siden"
-        other: "næsten %{count} år siden"
+        one: næsten 1 år siden
+        other: næsten %{count} år siden
   password_reset:
     no_token: "Beklager, dit kodeords-reset link er udløbet. Vælg 'Log ind' knappen og brug 'Jeg har glemt mit kodeord' for at få et nyt link."
     choose_new: "Vælg en ny adgangskode"
@@ -572,7 +548,6 @@ da:
       long_form: 'markerede dette som stødende'
     notify_user:
       title: 'Send @{{username}} en besked'
-      description: 'Jeg ønsker at tale med denne person direkte om vedkommendes indlæg'
       long_form: 'sendt besked til brugeren'
       email_title: 'Dit indlæg i "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -661,9 +636,7 @@ da:
       xaxis: "Dag"
       yaxis: "Antal besøg"
     signups:
-      title: "Nye brugere"
       xaxis: "Dag"
-      yaxis: "Antal nye brugere"
     profile_views:
       title: "Bruger Profil Visninger"
       xaxis: "Dag"
@@ -701,7 +674,6 @@ da:
       xaxis: "Dag"
       yaxis: "Antal e-mails"
     user_to_user_private_messages:
-      title: "Bruger-til-bruger"
       xaxis: "Dag"
       yaxis: "Antal beskeder"
     system_private_messages:
@@ -748,7 +720,6 @@ da:
       xaxis: "Dag"
       yaxis: "Web Crawler Sidevisninger"
     page_view_total_reqs:
-      title: "Total"
       xaxis: "Dag"
       yaxis: "Totalt antal Sidevisninger"
     page_view_logged_in_mobile_reqs:
@@ -811,28 +782,23 @@ da:
     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>.'
     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."
-      other: "Email afstemning har afstedkommet %{count} fejl i de seneste 24 timer. Se venligst <a href='/logs' target='_blank'>the logs</a> for detaljer."
-    missing_mailgun_api_key: "Serveren er konfigureret til at sende emails via Mailgun, men der er ikke indtastet en API nøgle som bruges til at verificere webhook beskederne."
+      one: Email afstemning har afstedkommet en fejl i de seneste 24 timer. Venligst se <a href='/logs' target='_blank'>the logs</a> for detaljer.
+      other: Email afstemning har afstedkommet %{count} fejl i de seneste 24 timer. Se venligst <a href='/logs' target='_blank'>the logs</a> for detaljer.
     bad_favicon_url: "Favicon kan ikke loades. Tjek dine favicon_url indstilling i  <a href='/admin/site_settings'>Site Settings</a>"
     poll_pop3_timeout: "Forbindelsen til til POP3 serveren er udløbet. Indkomne mail kunne ikke hentes. Venligst tjek  <a href='/admin/site_settings/category/email'>POP3 settings</a> og udbyderen."
     poll_pop3_auth_error: "Forbindelsen til POP3 serveren melder fejl. Venligst tjek <a href='/admin/site_settings/category/email'>POP3 settings</a>."
   site_settings:
     censored_words: "Ord der automatisk vil blive erstattet med &#9632;&#9632;&#9632;&#9632;"
-    censored_pattern: "Regex-mønster som automatisk vil blive erstattet med &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Slet automatisk skjulte indlæg der forbliver skjulte i mere end 30 dage."
-    default_locale: "Standardsproget for denne Discourse-instans (ISO 639-1 kode)."
     allow_user_locale: "Tillad brugere at vælge egne sprog præferencer på site"
     set_locale_from_accept_language_header: "set interface language for anonymous users from their web browser's language headers. (EXPERIMENTAL, does not work with anonymous cache)"
     min_post_length: "Minimumlængde tilladt for indlæg i tegn"
     min_first_post_length: "Minimum tilladte antal tegn (i emne felt) i første indlæg"
-    min_private_message_post_length: "Minimumlængde tilladt for indlæg i tegn"
     max_post_length: "Maksimal længde af indlæg i tegn"
     topic_featured_link_enabled: "Tillad opslag af et link med emner."
     show_topic_featured_link_in_digest: "Vis link med det fremhævede emne i e-mail-sammendraget."
     min_topic_title_length: "Minimumslængde af emnetitel i tegn."
     max_topic_title_length: "Maksimumslængde af emnetitel i tegn."
-    min_private_message_title_length: "Minimumslængde af emnetitel i tegn."
     min_search_term_length: "Antal tegn i søgefeltet skal have et minimum"
     search_tokenize_chinese_japanese_korean: "Tving søg til at \"tokenize\" Chinese/Japanese/Korean selv på sites som ikke er CJK"
     search_prefer_recent_posts: "Såfremt søgning på forum er langsomt, kan denne option indeksere og vise nyeste indlæg først"
@@ -876,7 +842,6 @@ da:
     summary_likes_required: "Minimum antal likes på et emne før 'opsummer dette emne' er aktiveret"
     summary_percent_filter: "Når en bruger kllikker 'Opsummer dette Emne' vises top % af indlæg"
     summary_max_results: "Max antal indlæg indeholdt i 'Opsummer dette Emne'"
-    enable_private_messages: "Tillad Trust Level 1 (kan konfigureres minimum trust level til at sende beskeder), brugere til at sende og svare på beskeder. Bemærk at moderatorer beskeder, uanset hvad."
     enable_long_polling: "Message bus til underretninger kan bruge long polling"
     long_polling_base_url: "URL anvendt for afsteminger (når CDN leverer dynamisk indhold, så sæt dette til oprindelig / orginal) f.eks: http://origin.site.com"
     long_polling_interval: "Mængde tid før serveren bør vente før den svarer klienter når der ikke er ny data at sende (kun for brugere der er logget ind)"
@@ -916,7 +881,6 @@ da:
     log_out_strict: "Når brugeren logger af, log da ud af alle sessioner, på alle enheder"
     new_version_emails: "Send en email til contact_email adressen når der er en ny version af Discourse tilgængelig."
     invite_expiry_days: "Hvor længe brugerinvitationsnøgler er gyldige, i dage."
-    invite_passthrough_hours: "Hvor længe kan en bruger benytte en tidligere benyttet invitation til at logge ind, i timer."
     login_required: "Kræv godkendelse til at læse indhold på dette site, og tillad ikke anonym adgang."
     min_password_length: "Mindste adgangskodelængde."
     min_admin_password_length: "Minimumslængde for Admin adgangskoder."
@@ -925,8 +889,6 @@ da:
     google_oauth2_client_id: "Client ID of your Google application."
     google_oauth2_client_secret: "Client secret of your Google application."
     enable_twitter_logins: "Aktivér Twitter-login, kræver twitter_consumer_key og twitter_consumer_secret"
-    twitter_consumer_key: "Consumer key til Twitter-login, oprettes på http://dev.twitter.com."
-    twitter_consumer_secret: "Consumer secret til Twitter-login, oprettes på http://dev.twitter.com."
     enable_instagram_logins: "Aktivér Instagram-login, kræver instagram_consumer_key og instagram_consumer_secret"
     enable_facebook_logins: "Aktivér Facebook-login, kræver facebook_app_id og facebook_app_secret"
     facebook_app_id: "App id til Facebook-login, oprettes på https://developers.facebook.com/apps"
@@ -998,7 +960,6 @@ da:
     emoji_set: "Hvordan kunne du tænke dig din emoji?"
     default_email_digest_frequency: "Hvor ofte brugere som standard modtager mails med sammendrag."
     default_include_tl0_in_digests: "Inkluder som standard indlæg fra nye brugre i mails med sammendrag. Brugere kan ændre dette i deres indstillinger."
-    default_email_private_messages: "Send som standard en email når nogen sender brugeren en besked."
     default_email_direct: "Send som standard en email når nogen citerer/svarer/nævner/inviterer brugeren."
     default_email_mailing_list_mode: "Send som standard en email for hvert nyt indlæg."
     default_email_always: "Send som standard en email-notifikation selv hvis brugeren er aktiv."
@@ -1044,23 +1005,23 @@ da:
     closed_enabled: "Dette emne er nu lukket. Nye indlæg tillades ikke."
     closed_disabled: "Dette emne er nu åbent. Nye indlæg tillades."
     autoclosed_enabled_days:
-      one: "Dette emne blev automatisk lukket efter 1 dag. Nye svar er ikke længere tilladt."
-      other: "Dette emne blev automatisk lukket efter %{count} dage. Nye svar er ikke længere tilladt."
+      one: Dette emne blev automatisk lukket efter 1 dag. Nye svar er ikke længere tilladt.
+      other: Dette emne blev automatisk lukket efter %{count} dage. Nye svar er ikke længere tilladt.
     autoclosed_enabled_hours:
-      one: "Dette emne blev automatisk lukket efter 1 time. Nye svar er ikke længere tilladt."
-      other: "Dette emne blev automatisk lukket efter %{count} timer. Nye svar er ikke længere tilladt."
+      one: Dette emne blev automatisk lukket efter 1 time. Nye svar er ikke længere tilladt.
+      other: Dette emne blev automatisk lukket efter %{count} timer. Nye svar er ikke længere tilladt.
     autoclosed_enabled_minutes:
-      one: "Dette emne blev automatisk lukket efter 1 minut. Nye svar er ikke længere tilladt."
-      other: "Dette emne blev automatisk lukket efter %{count} minutter. Nye svar er ikke længere tilladt."
+      one: Dette emne blev automatisk lukket efter 1 minut. Nye svar er ikke længere tilladt.
+      other: Dette emne blev automatisk lukket efter %{count} minutter. Nye svar er ikke længere tilladt.
     autoclosed_enabled_lastpost_days:
-      one: "Dette emne blev automatisk lukket 1 dag efter det seneste svar. Nye svar er ikke længere tilladt."
-      other: "Dette emne blev automatisk lukket %{count} dage efter det seneste svar. Nye svar er ikke længere tilladt."
+      one: Dette emne blev automatisk lukket 1 dag efter det seneste svar. Nye svar er ikke længere tilladt.
+      other: Dette emne blev automatisk lukket %{count} dage efter det seneste svar. Nye svar er ikke længere tilladt.
     autoclosed_enabled_lastpost_hours:
-      one: "Dette emne blev automatisk lukket 1 time efter det seneste svar. Nye svar er ikke længere tilladt."
-      other: "Dette emne blev automatisk lukket %{count} timer efter det seneste svar. Nye svar er ikke længere tilladt."
+      one: Dette emne blev automatisk lukket 1 time efter det seneste svar. Nye svar er ikke længere tilladt.
+      other: Dette emne blev automatisk lukket %{count} timer efter det seneste svar. Nye svar er ikke længere tilladt.
     autoclosed_enabled_lastpost_minutes:
-      one: "Dette emne blev automatisk lukket 1 minut efter det seneste svar. Nye svar er ikke længere tilladt."
-      other: "Dette emne blev automatisk lukket %{count} minutter efter det seneste svar. Nye svar er ikke længere tilladt."
+      one: Dette emne blev automatisk lukket 1 minut efter det seneste svar. Nye svar er ikke længere tilladt.
+      other: Dette emne blev automatisk lukket %{count} minutter efter det seneste svar. Nye svar er ikke længere tilladt.
     autoclosed_disabled: "Dette emne er nu åbnet. Nye svar er tilladt."
     autoclosed_disabled_lastpost: "Dette emne er nu åbent. Nye svar er tilladt."
     pinned_enabled: "Dette emne er nu fastgjort. Det vil stå i toppen af dets kategori indtil det bliver frigjort af \"staff\" for alle eller af hver bruger individuelt for dem selv."
@@ -1114,8 +1075,8 @@ da:
       max_new_accounts_per_registration_ip: "Nye kontoer kan ikke oprettes fra din IP-adresse (max antal er nået). Kontakt et medlem af hjælperteamet."
   flags_reminder:
     subject_template:
-      one: "1 flag venter på at blive håndteret"
-      other: "%{count} flag venter på at blive håndteret"
+      one: 1 flag venter på at blive håndteret
+      other: '%{count} flag venter på at blive håndteret'
   unsubscribe_mailer:
     subject_template: "Bekræft at du ikke længere ønsker at modtage email opdateringer fra %{site_title}"
     text_body_template: |+
@@ -1169,8 +1130,8 @@ da:
     deferred: "Tak for din henvendelse. Vi kigger på det."
     deferred_and_deleted: "Tak for din henvendelse. Vi har fjernet indlægget."
   temporarily_closed_due_to_flags:
-    one: "Emnet er lukket i 1 time pga. et stort antal flagmarkeringer."
-    other: "Emnet er lukket i %{count} timer pga. et stort antal flagmarkeringer."
+    one: Emnet er lukket i 1 time pga. et stort antal flagmarkeringer.
+    other: Emnet er lukket i %{count} timer pga. et stort antal flagmarkeringer.
   system_messages:
     private_topic_title: "Emne #%{id}"
     contents_hidden: "Gå venligst til indlægget for at se indholdet."
@@ -1235,8 +1196,8 @@ da:
     pending_users_reminder:
       title: "Påmindelse om afventende brugere"
       subject_template:
-        one: "1 bruger afventer godkendelse"
-        other: "%{count} brugere afventer godkendelse"
+        one: 1 bruger afventer godkendelse
+        other: '%{count} brugere afventer godkendelse'
       text_body_template: |
         Der er nye brugere, som afventer godkendelse (eller afvisning) før de kan tilgå dette forum.
 
@@ -1396,7 +1357,7 @@ da:
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
-        %{message}
+          %{message}
     digest:
       why: "Et kort resumé af %{site_link} siden dit sidste besøg %{last_seen_at}"
       since_last_visit: "Siden dit sidste besøg"
@@ -1516,7 +1477,7 @@ da:
       name: Selvbiograf
     anniversary:
       name: Jubilæum
-      description: Aktivt medlem i et år, som har skrevet mindst et indlæg
+      description: "Aktivt medlem i et år, som har skrevet mindst et indlæg"
     nice_post:
       name: Fint svar
       description: Modtog 10 likes på et svar
@@ -1602,14 +1563,13 @@ da:
       name: Empatisk
       description: Har 500 likede indlæg og givet 1000 likes
     first_onebox:
-      long_description: Dette badge bliver tildelt første gang du poster et link i en linie for sig selv. Det vil automatisk ekspandere til en boks med et kort sammendrag af siden, en titel og (når muligt) et billede.
+      long_description: "Dette badge bliver tildelt første gang du poster et link i en linie for sig selv. Det vil automatisk ekspandere til en boks med et kort sammendrag af siden, en titel og (når muligt) et billede."
     first_reply_by_email:
       name: Første svar via email
       long_description: |
         Dette emblem gives første gang du svarer til et indlæg via email  :e-mail:.
   admin_login:
     success: "Email sendt"
-    error: "Fejl!"
     email_input: "Admin email"
     submit_button: "Send email"
   performance_report:
@@ -1714,6 +1674,3 @@ da:
         title: "Inviter hjælpere"
       finished:
         title: "Discourse er gjort klar til dig!"
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index 5c224a24eef..f248ea16ef6 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -17,36 +17,58 @@ de:
       date_only: "%-d. %B %Y"
       long: "%-d. %B %Y um %H:%M"
   date:
-    month_names: [null, Januar, Februar, März, April, Mai, Juni, Juli, August, September, Oktober, November, Dezember]
+    month_names: [~, Januar, Februar, März, April, Mai, Juni, Juli, August, September, Oktober, November, Dezember]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "vormittags"
     pm: "nachmittags"
-    <<: *datetime_formats
   title: "Discourse"
   topics: "Themen"
   posts: "Beiträge"
   loading: "Wird geladen"
-  powered_by_html: 'Powered by <a href="https://www.discourse.org">Discourse</a>, beste Erfahrung mti aktiviertem JavaScript'
+  powered_by_html: 'Angetrieben von <a href="https://www.discourse.org">Discourse</a>, beste Erfahrung mit aktiviertem JavaScript'
   log_in: "Anmelden"
+  submit: "Absenden"
   purge_reason: "Verlassenes, deaktiviertes Konto automatisch gelöscht"
   disable_remote_images_download_reason: "Der Download von Bildern wurde deaktiviert, weil nicht mehr genug Plattenplatz vorhanden war."
   anonymous: "Anonym"
   remove_posts_deleted_by_author: "Gelöscht vom Verfasser"
+  redirect_warning: "Wir konnten nicht überprüfen, dass der ausgewählte Link tatsächlich im Forum geschrieben wurde. Wenn du trotzdem fortfahren möchtest, wähle den Link unten aus."
   themes:
     bad_color_scheme: "Kann Motiv nicht aktualisieren, ungültiges Farbschema"
     other_error: "Etwas ist schief gelaufen beim Aktualisieren des Theme"
+    error_importing: "Fehler beim Klonen des git-Repository, Zugriff verboten oder Repository nicht gefunden."
+    settings_errors:
+      invalid_yaml: "Der  YAML-Code ist ungültig."
+      data_type_not_a_number: "Der eingestellte Datentyp `%{name}` wird nicht unterstützt. Unterstützte Datentypen sind `integer`, `bool`, `list` und `enum`."
+      name_too_long: "Es gibt eine Einstellung mit einem zu langen Namen. Die maximale Länge beträgt 255 Zeichen."
+      default_value_missing: "Einstellung `%{name}` hat keinen Standardwert."
+      default_not_match_type: "Bei der Einstellung `%{name}` stimmt der Datentyp des Standardwerts nicht mit dem Datentyp der Einstellung überein."
+      default_out_range: "Bei der Einstellung `%{name}` liegt der Standardwert außerhalb des Wertebereichs."
+      enum_value_not_valid: "Der ausgewählte Wert gehört nicht zur Wertemenge des ENUM-Aufzählungstyps."
+      number_value_not_valid: "Der neue Wert liegt außerhalb des erlaubten Wertebereichs."
+      number_value_not_valid_min_max: "Er muss zwischen %{min} und %{max} liegen."
+      number_value_not_valid_min: "Er muss größer oder gleich %{min} sein."
+      number_value_not_valid_max: "Er muss kleiner oder gleich %{max} sein."
+      string_value_not_valid: "Die Länge des neuen Werts liegt außerhalb des erlaubten Bereichs."
+      string_value_not_valid_min_max: "Er muss zwischen %{min} und %{max} Zeichen lang sein."
+      string_value_not_valid_min: "Er muss mindestens %{min} Zeichen lang sein."
+      string_value_not_valid_max: "Er darf maximal %{max} Zeichen lang sein."
   emails:
     incoming:
       default_subject: "Dieses Thema benötigt einen Titel"
       show_trimmed_content: "Zeige gekürzten Inhalt"
       maximum_staged_user_per_email_reached: "Maximale Anzahl vorbereiteter Benutzer erreicht, die automatisch per E-Mail erstellt wurden."
+      no_subject: "(kein Betreff)"
+      no_body: "(kein Inhalt)"
       errors:
         empty_email_error: "Passiert wenn die empfangene E-Mail leer war."
         no_message_id_error: "Passiert wenn in der E-Mail die Kopfzeile 'Message-Id' fehlt."
         auto_generated_email_error: "Passiert wenn die Kopfzeile 'precedence' folgendes enthält: list, junk, bulk oder auto_reply, oder eine der anderen Kopfzeilen enthält: auto-submitted, auto-replied oder auto-generated."
         no_body_detected_error: "Passiert, wenn wir keinen Textkörper extrahieren konnten und keine Anhänge gefunden wurden."
         no_sender_detected_error: "Kommt vor, wenn wir keine gültige E-Mail-Adresse im From-Header finden konnten."
+        from_reply_by_address_error: "Passiert wenn der From-Header mit der Antwort E-Mail-Adresse übereinstimmt."
         inactive_user_error: "Passiert wenn der Sender nicht aktiv ist."
         silenced_user_error: "Kommt vor, wenn der Absender stummgeschaltet wurde."
         bad_destination_address: "Passiert wenn keine der E-Mail Adressen in den Feldern To/Cc/Bcc zu einer konfigurierten Eingangs-E-Mail-Adresse passt."
@@ -72,23 +94,24 @@ de:
       present: muss leer sein
       confirmation: "stimmt nicht mit %{attribute} überein"
       empty: darf nicht leer sein
-      equal_to: muss gleich %{count} sein
+      equal_to: "muss gleich %{count} sein"
       even: muss gerade sein
       exclusion: ist reserviert
-      greater_than: muss größer als %{count} sein
-      greater_than_or_equal_to: muss größer oder gleich %{count} sein
+      greater_than: "muss größer als %{count} sein"
+      greater_than_or_equal_to: "muss größer oder gleich %{count} sein"
       has_already_been_used: "wird bereits verwendet"
       inclusion: ist nicht in der Liste enthalten
       invalid: ist ungültig
       is_invalid: "scheint unklar, ist das ein ganzer Satz?"
       contains_censored_words: "enthält die folgenden nicht erlaubten Wörter: %{censored_words}"
-      matches_censored_pattern: "enthält folgende Wörter, die dem regulären Ausdruck für nicht erlaubte Wörter der Seite entsprechen: %{censored_words}"
-      less_than: muss weniger als %{count} sein
-      less_than_or_equal_to: muss weniger oder gleich %{count} sein
+      less_than: "muss weniger als %{count} sein"
+      less_than_or_equal_to: "muss weniger oder gleich %{count} sein"
       not_a_number: ist keine Zahl
       not_an_integer: muss eine Ganzzahl sein
       odd: muss ungerade sein
       record_invalid: 'Validierung gescheitert: %{errors}'
+      max_emojis: "kann nicht mehr als %{max_emojis_count} Emojis beinhalten"
+      ip_address_already_screened: "wird bereits von einer bestehenden Regel abgedeckt"
       restrict_dependent_destroy:
         one: "Eintrag kann nicht gelöscht werden, da noch ein davon abhängiger %{record} existiert."
         many: "Eintrag kann nicht gelöscht werden, da noch davon abhängige %{record} existieren."
@@ -110,6 +133,9 @@ de:
     embed:
       load_from_remote: "Beim Laden des Beitrags ist ein Fehler aufgetreten."
     site_settings:
+      invalid_choice:
+        one: Du hast die ungültige Auswahl %{name} getroffen
+        other: Du hast die ungültige Auswahl  %{name} getroffen
       min_username_length_exists: "Die minimale Länge für den Benutzernamen kann nicht höher sein als der kürzeste Benutzername."
       min_username_length_range: "Du kannst das Minimum nicht höher setzen als das Maximum."
       max_username_length_exists: "Die maximale Länge für den Benutzernamen kann nicht kürzer sein als der längste Benutzername."
@@ -117,8 +143,17 @@ de:
       default_categories_already_selected: "Du kannst keine Kategorie auswählen, welche bereits in einer anderen Liste benutzt wird. "
       s3_upload_bucket_is_required: "Uploads auf Amazon S3 können nicht aktiviert werden, bevor der 's3_upload_bucket' eingetragen wurde."
     conflicting_google_user_id: 'Die Google-Konto-ID für dieses Konto hat sich geändert; das Einschreiten des Teams ist aus Sicherheitsgründen erforderlich. Bitte kontaktiere das Team und verweise es auf <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
+  activemodel:
+    errors:
+      <<: *errors
   invite:
     not_found: "Dein Einladungsschlüssel ist ungültig. Bitte kontaktiere den Administrator der Seite."
+    not_found_template: |
+      <p>Deine Einladung zu <a href="%{base_url}">%{site_name}</a> wurde bereits zurückgezogen.</p>
+
+      <p>Wenn du dein Passwort noch weißt, kannst du dich <a href="%{base_url}/login">anmelden</a>.</p>
+
+      <p>Ansonsten kannst du <a href="%{base_url}/password-reset">dein Passwort zurücksetzen</a>.</p>
     user_exists: "Es ist nicht nötig, <b>%{email}</b> einzuladen, er/sie <a href='/u/%{username}/summary'>hat schon ein Konto!</a>"
   bulk_invite:
     file_should_be_csv: "Die hochzuladende Datei sollte im CSV-Format vorliegen."
@@ -130,6 +165,7 @@ de:
     backup_file_should_be_tar_gz: "Die Sicherungsdatei sollte ein .tar.gz-Archiv sein."
     not_enough_space_on_disk: "Es gibt nicht genügend freien Festplattenspeicher, um dieses Backup hochzuladen."
     invalid_filename: "Der Dateiname für das Backup enthält ungültige Zeichen. Gültig sind: a-z 0-9 . - _."
+  invalid_params: "Du hast bei der Anfrage ungültige Parameter angegeben: %{message}"
   not_logged_in: "Dazu musst du angemeldet sein."
   not_found: "Die angeforderte URL oder Ressource konnte nicht gefunden werden."
   invalid_access: "Du hast nicht die Erlaubnis, die angeforderte Ressource zu betrachten."
@@ -138,8 +174,8 @@ de:
   reading_time: "Lesezeit"
   likes: "Likes"
   too_many_replies:
-    one: "Entschuldigung, aber neue Benutzer sind vorübergehend auf eine Antwort pro Thema beschränkt."
-    other: "Entschuldigung, aber neue Benutzer sind vorübergehend auf %{count} Antworten pro Thema beschränkt."
+    one: Entschuldigung, aber neue Benutzer sind vorübergehend auf eine Antwort pro Thema beschränkt.
+    other: Entschuldigung, aber neue Benutzer sind vorübergehend auf %{count} Antworten pro Thema beschränkt.
   embed:
     start_discussion: "Diskussion beginnen"
     continue: "Diskussion fortsetzen"
@@ -149,36 +185,38 @@ de:
     no_hosts: "Es wurden keine Hostnamen für die Einbettung konfiguriert."
     configure: "Einbettung konfigurieren"
     more_replies:
-      one: "1 weitere Antwort"
-      other: "%{count} weitere Antworten"
+      one: 1 weitere Antwort
+      other: '%{count} weitere Antworten'
     loading: "Lade Diskussion..."
     permalink: "Permanenter Link"
     imported_from: "Dies ist ein Begleitthema zum ursprünglichen Beitrag unter %{link}"
     in_reply_to: "▶ %{username}"
     replies:
-      one: "1 Antwort"
-      other: "%{count} Antworten"
+      one: 1 Antwort
+      other: '%{count} Antworten'
   no_mentions_allowed: "Entschuldigung, du kannst keine Benutzer erwähnen."
   too_many_mentions:
-    one: "Entschuldigung, du kannst nur einen anderen Benutzer in einem Beitrag erwähnen."
-    other: "Entschuldigung, du kannst nur %{count} Benutzer in einem Beitrag erwähnen."
+    one: Entschuldigung, du kannst nur einen anderen Benutzer in einem Beitrag erwähnen.
+    other: Entschuldigung, du kannst nur %{count} Benutzer in einem Beitrag erwähnen.
   no_mentions_allowed_newuser: "Entschuldigung, neue Benutzer können andere Benutzer nicht erwähnen."
   too_many_mentions_newuser:
-    one: "Entschuldige, neue Benutzer können nur einen anderen Benutzer in einem Beitrag erwähnen."
-    other: "Entschuldige, neue Benutzer können nur %{count} Benutzer in einem Beitrag erwähnen."
+    one: Entschuldige, neue Benutzer können nur einen anderen Benutzer in einem Beitrag erwähnen.
+    other: Entschuldige, neue Benutzer können nur %{count} Benutzer in einem Beitrag erwähnen.
+  no_images_allowed_trust: "Entschuldige, du kannst keine Bilder in einen Beitrag einfügen."
   no_images_allowed: "Entschuldige, neue Benutzer können Beiträgen keine Bilder hinzufügen."
   too_many_images:
-    one: "Entschuldige, neue Benutzer können Beiträgen höchstens ein Bild hinzufügen."
-    other: "Entschuldige, neue Benutzer können Beiträgen höchstens %{count} Bilder hinzufügen."
+    one: Entschuldige, neue Benutzer können Beiträgen höchstens ein Bild hinzufügen.
+    other: Entschuldige, neue Benutzer können Beiträgen höchstens %{count} Bilder hinzufügen.
   no_attachments_allowed: "Entschuldige, neue Benutzer können Beiträgen keine Dateien hinzufügen."
   too_many_attachments:
-    one: "Entschuldige, neue Benutzer können Beiträgen höchstens eine Datei hinzufügen."
-    other: "Entschuldige, neue Benutzer können Beiträgen höchstens %{count} Dateien hinzufügen."
+    one: Entschuldige, neue Benutzer können Beiträgen höchstens eine Datei hinzufügen.
+    other: Entschuldige, neue Benutzer können Beiträgen höchstens %{count} Dateien hinzufügen.
   no_links_allowed: "Entschuldige, neue Benutzer können Beiträgen keine Links hinzufügen."
+  links_require_trust: "Entschuldige, du kannst keine Links in einen Beitrag einfügen."
   too_many_links:
-    one: "Entschuldige, neue Benutzer können Beiträgen höchstens einen Link hinzufügen."
-    other: "Entschuldige, neue Benutzer können Beiträgen höchstens %{count} Links hinzufügen."
-  contains_blocked_words: "Dein Beitrag enthält Wörter, die nicht erlaubt sind."
+    one: Entschuldige, neue Benutzer können Beiträgen höchstens einen Link hinzufügen.
+    other: Entschuldige, neue Benutzer können Beiträgen höchstens %{count} Links hinzufügen.
+  contains_blocked_words: "Dein Beitrag enthält ein nicht erlaubtes Wort: %{word}"
   spamming_host: "Entschuldigung, du kannst keine Links zu diesem Webserver posten."
   user_is_suspended: "Gesperrte Benutzer dürfen keine Beiträge schreiben."
   topic_not_found: "Etwas ist schief gelaufen. Wurde das Thema eventuell geschlossen oder gelöscht, während du es angeschaut hast?"
@@ -210,7 +248,7 @@ de:
     top_weekly: "Top-Themen der letzten Woche"
     top_daily: "Top-Themen der letzten 24 Stunden"
     posts: "Letzte Beiträge"
-    private_posts: "Neueste private Nachricht"
+    private_posts: "Neueste Nachrichten"
     group_posts: "Letzte Beiträge von %(Gruppen_name)"
     group_mentions: "Neueste Nennungen von %{group_name}"
     user_posts: "Neueste Beiträge von @%{username}"
@@ -225,10 +263,15 @@ de:
     not_found: "Seite nicht gefunden oder bereits aktualisiert."
   groups:
     success:
-      bulk_add: "%{users_added} Benutzer wurden der Gruppe hinzugefügt."
+      bulk_add:
+        one: '%{count} Benutzer wurde zu dieser Gruppe hinzugefügt.'
+        other: '%{count} Benutzer wurden zu dieser Gruppe hinzugefügt.'
     errors:
+      grant_trust_level_not_valid: "'%{trust_level}' ist keine gültige Vertrauensstufe"
       can_not_modify_automatic: "Du kannst eine automatische Gruppe nicht bearbeiten"
-      member_already_exist: "'%{username}' ist bereits Mitglied dieser Gruppe."
+      member_already_exist:
+        one: '''%{username}'' ist bereits Mitglied dieser Gruppe.'
+        other: 'Die folgenden Benutzer sind bereits Mitglieder dieser Gruppe: %{username}'
       invalid_domain: "'%{domain}' ist keine gültige Domain."
       invalid_incoming_email: "'%{email}' ist keine gültige E-Mail-Adresse."
       email_already_used_in_group: "'%{email}' wird bereits von der Gruppe '%{group_name}' verwendet."
@@ -248,9 +291,9 @@ de:
       title: "Mitgliedschaftsanfrage für @%{group_name}"
   education:
     until_posts:
-      one: "1 Beitrag"
-      other: "%{count} Beiträge"
-    new-topic: |
+      one: 1 Beitrag
+      other: '%{count} Beiträge'
+    'new-topic': |
       Willkommen bei %{site_name} &mdash; **danke, dass du ein neues Thema erstellst!**
 
       - Klingt der Titel interessant, wenn du ihn laut liest? Ist er eine gute Zusammenfassung?
@@ -260,7 +303,7 @@ de:
       - Verwende gebräuchliche, gut definierte Wörter, damit dein Thema *gefunden* werden kann. Wähle eine Kategorie, um es mit ähnlichen Themen zu gruppieren.
 
       Mehr Tipps findest du in [unseren Community-Richtlinien](/guidelines). Dieses Panel wird nur bei deinen ersten %{education_posts_text} angezeigt.
-    new-reply: |
+    'new-reply': |
       Willkommen bei %{site_name} &mdash; **Danke für deinen Beitrag zum Thema!**
 
       - Fügt dein Beitrag dem Gespräch etwas Neues hinzu, und sei es auch wenig?
@@ -307,9 +350,9 @@ de:
 
       Anstatt eine weitere Antwort hinzuzufügen, denke darüber nach, deine vorherigen Antworten zu bearbeiten oder andere Themen zu besuchen.
     reviving_old_topic: |
-      ### Dieses Thema neu beleben?
+      ### Thema neu beleben?
 
-      Die letzte Antwort auf dieses Thema war vor **%{days}** Tagen. Deine Antwort wird das Thema wieder ans obere Ende der Liste befördern und jeden benachrichtigen, der zuvor in der Unterhaltung beteiligt war.
+      Die letzte Antwort in diesem Thema war **%{time_ago}**. Deine Antwort wird das Thema wieder an den Anfang der Liste schieben und jeden benachrichtigen, der sich zuvor an der Unterhaltung beteiligt hat.
 
       Bist du sicher, dass du diese alte Unterhaltung fortsetzen möchtest?
   activerecord:
@@ -324,15 +367,17 @@ de:
       user_profile:
         bio_raw: "Über mich"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Du kannst eine Warnung nur an eine Nachricht zugleich anhängen."
+              warning_requires_pm: "Du kannst Warnungen nur bei Nachrichten hinzufügen."
               too_many_users: "Du kannst eine Warnung nur an einen Benutzer zugleich anhängen."
-              cant_send_pm: "Entschuldigung, du kannst diesem Benutzer keine Direktnachricht schicken."
+              cant_send_pm: "Entschuldige, du kannst keine Nachricht an diese Person verschicken."
               no_user_selected: "Du musst einen gültigen Benutzer auswählen."
               reply_by_email_disabled: "Antwort per E-Mail ist deaktiviert."
+              target_user_not_found: "Einer der Empfänger dieser Nachricht konnte nicht gefunden werden."
             featured_link:
               invalid: "ist ungültig. URL sollte http:// oder https:// enthalten."
               invalid_category: "kann in dieser Kategorie nicht bearbeitet werden."
@@ -346,6 +391,10 @@ de:
               unique_characters: "hat zu viele sich wiederholende Zeichen. Bitte verwende ein sichereres Passwort."
             ip_address:
               signup_not_allowed: "Eine Registrierung ist von diesem Konto nicht erlaubt."
+        user_email:
+          attributes:
+            user_id:
+              reassigning_primary_email: "Eine primäre E-Mail Adresse einem weiteren Benutzer zuzuordnen ist nicht erlaubt."
         color_scheme_color:
           attributes:
             hex:
@@ -373,7 +422,6 @@ de:
           attributes:
             word:
               too_many: "Zu viele Wörter für diese Aktion"
-      <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>Das „Über mich“-Feld in deinem Profil ist aktuell leer, <a href='/u/%{username_lower}/preferences/about-me'>möchtest du es ausfüllen?</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} hat noch nichts in das 'Über mich'-Feld des Benutzerprofils eingetragen</div>"
@@ -389,46 +437,47 @@ de:
     title: "Willkommen bei Discourse"
     body: |2
 
-      Der erste Absatz dieses angehefteten Themas wird allen neuen Besuchern deiner Webseite als Willkommensnachricht angezeigt. Er ist wichtig!
+        Der erste Absatz dieses angehefteten Themas wird allen neuen Besuchern deiner Webseite als Willkommensnachricht angezeigt. Er ist wichtig!
 
-      **Bearbeite dies** und erstelle eine kurze Beschreibung deiner Community:
+        **Bearbeite dies** und erstelle eine kurze Beschreibung deiner Community:
 
-      - Für wen ist sie?
-      - Was findet man hier?
-      - Warum sollte man hier vorbeischauen?
-      - Wo kann man mehr erfahren (Links, Dokumente, usw.)?
+        - Für wen ist sie?
+        - Was findet man hier?
+        - Warum sollte man hier vorbeischauen?
+        - Wo kann man mehr erfahren (Links, Dokumente, usw.)?
 
-      <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+        <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
 
-      Du solltest dieses Thema eventuell schließen über die Administration :wrench: (oben rechts oder unten), damit sich an einer Ankündigung wie dieser nicht die Antworten aufstapeln.
+        Du solltest dieses Thema eventuell schließen über die Administration :wrench: (oben rechts oder unten), damit sich an einer Ankündigung wie dieser nicht die Antworten aufstapeln.
   lounge_welcome:
     title: "Willkommen in der Lounge"
     body: |2
 
-      Gratuliere! :confetti_ball:
+        Gratuliere! :confetti_ball:
 
-      Wenn du dieses Thema sehen kannst, wurdest du vor Kurzem zum **Stammgast** (Vertrauensstufe 3) befördert.
+        Wenn du dieses Thema sehen kannst, wurdest du vor Kurzem zum **Stammgast** (Vertrauensstufe 3) befördert.
 
-      Du kannst nun &hellip;
+        Du kannst nun &hellip;
 
-      * den Titel eines jeden Themas ändern
-      * Themen in andere Kategorien verschieben
-      * Links veröffentlichen, die von Suchmaschinen weiterverfolgt werden (das automatische [nofollow](http://de.wikipedia.org/wiki/Nofollow) wird entfernt)
-      * auf die private Lounge-Kategorie zugreifen, die für Benutzer mit Vertrauensstufe 3 oder höher sichtbar ist
-      * Spam durch eine einzige Meldung ausblenden
+        * den Titel eines jeden Themas ändern
+        * Themen in andere Kategorien verschieben
+        * Links veröffentlichen, die von Suchmaschinen weiterverfolgt werden (das automatische [nofollow](http://de.wikipedia.org/wiki/Nofollow) wird entfernt)
+        * auf die private Lounge-Kategorie zugreifen, die für Benutzer mit Vertrauensstufe 3 oder höher sichtbar ist
+        * Spam durch eine einzige Meldung ausblenden
 
-      Hier ist die [aktuelle Liste aller Stammgäste](/badges/3/regular). Vergiss nicht, hallo zu sagen!
+        Hier ist die [aktuelle Liste aller Stammgäste](/badges/3/regular). Vergiss nicht, hallo zu sagen!
 
-      Vielen Dank dafür, dass du ein wichtiger Teil dieser Community bist!
+        Vielen Dank dafür, dass du ein wichtiger Teil dieser Community bist!
 
-      (Wenn du mehr über Vertrauensstufen wissen möchtest, kannst du [dieses Thema lesen][trust]. Beachte bitte, dass nur jene Mitglieder Stammgäste bleiben, die auch im Laufe der Zeit die Anforderungen erfüllen.)
+        (Wenn du mehr über Vertrauensstufen wissen möchtest, kannst du [dieses Thema lesen][trust]. Beachte bitte, dass nur jene Mitglieder Stammgäste bleiben, die auch im Laufe der Zeit die Anforderungen erfüllen.)
 
-      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Über die Kategorie %{category}"
     replace_paragraph: "(Ersetze diesen ersten Absatz mit einer kurzen Beschreibung deiner neuen Kategorie. Diese Richtlinie wird in der Kategorienauswahl angezeigt, versuche also weniger als 200 Zeichen zu benutzen. **Bis du diese Beschreibung geändert oder Themen angelegt hast, wird diese Kategorie nicht auf der Kategorie-Seite angezeigt.**)"
     post_template: "%{replace_paragraph}\n\nBenutze die folgenden Abschnitte für eine ausführlichere Beschreibung oder um Richtlinien oder Regeln für diese Kategorie festzulegen:\n\n- Warum sollten Benutzer diese Kategorie nutzen? Wofür ist sie gedacht?\n\n- Wie genau unterscheidet sie sich von den Kategorien, die es bereits gibt?\n\n- Welche Themen sollte diese Kategorie im Allgemeinen beinhalten?\n\n- Brauchen wir diese Kategorie? Können wie sie mit einer anderen Kategorie oder Unter-Kategorie zusammenführen?\n"
     errors:
+      not_found: "Kategorie nicht gefunden!"
       uncategorized_parent: "Die \"unkategorisiert\" Kategorie kann keine Elternkategorie haben."
       self_parent: "Eine Kategorie kann nicht sich selbst untergeordnet werden."
       depth: "Unterkategorien können nicht ineinander verschachtelt werden."
@@ -440,8 +489,8 @@ de:
       uncategorized: "Die \"unkategorisiert\" Kategorie kann nicht gelöscht werden."
       has_subcategories: "Diese Kategorie kann nicht gelöscht werden, weil sie Unterkategorien besitzt."
       topic_exists:
-        one: "Diese Kategorie kann nicht gelöscht werden, weil sie ein Thema enthält. Das Thema ist %{topic_link}."
-        other: "Diese Kategorie kann nicht gelöscht werden, weil sie %{count} Themen enthält. Das älteste Thema ist %{topic_link}."
+        one: Diese Kategorie kann nicht gelöscht werden, weil sie ein Thema enthält. Das Thema ist %{topic_link}.
+        other: Diese Kategorie kann nicht gelöscht werden, weil sie %{count} Themen enthält. Das älteste Thema ist %{topic_link}.
       topic_exists_no_oldest: "Diese Kategorie kann nicht gelöscht werden, weil sie #{category.topic_count} Themen enthält."
     uncategorized_description: "Themen welche keine Kategorie benötigen oder in keine existierende Kategorie passen."
   trust_levels:
@@ -460,8 +509,8 @@ de:
     image_placeholder:
       broken: "Dieses Bild ist beschädigt"
   rate_limiter:
-    slow_down: "Du hast diese Aktion zu oft durchgeführt. Versuche es später wieder."
-    too_many_requests: "Diese Aktion kann nur ein begrenztes Mal pro Tag durchgeführt werden. Bitte warte %{time_left} bis zum nächsten Versuch."
+    slow_down: "Du hast diese Aktion zu oft durchgeführt. Bitte versuche es später noch einmal."
+    too_many_requests: "Du hast diese Aktion zu häufig ausgeführt. Bitte warte %{time_left}, ehe du es erneut versuchst."
     by_type:
       first_day_replies_per_day: "Du hast die maximale Anzahl an Antworten erreicht, die ein neuer Benutzer am ersten Tag erstellen kann. Bitte warte %{time_left}, bis Du es wieder versuchst."
       first_day_topics_per_day: "Du hast die maximale Anzahl an Themen erreicht, die ein neuer Benutzer am ersten Tag erstellen kann. Bitte warte %{time_left}, bis Du es wieder versuchst."
@@ -469,94 +518,94 @@ de:
       create_post: "Du antwortest zu schnell. Bitte warte %{time_left}, bis Du es wieder versuchst."
       delete_post: "Du löschst zu schnell Beiträge. Bitte warte %{time_left}, bis Du es wieder versuchst."
       public_group_membership: "Du wechselst die Gruppenzugehörigkeit zu häufig. Bitte warte %{time_left}, bevor du es erneut versuchst."
-      topics_per_day: "Du hast die maximale Anzahl an neuen Themen für heute erreicht. Bitte warte %{time_left}, bis Du es wieder versuchst."
-      pms_per_day: "Du hast die maximale Anzahl an Nachrichten für heute erreicht. Bitte warte %{time_left}, bis Du es wieder versuchst."
-      create_like: "Du hast die maximale Anzahl an Likes für heute erreicht. Bitte warte %{time_left}, bevor du es wieder versuchst."
-      create_bookmark: "Du hast die maximale Anzahl an Lesezeichen für heute erreicht. Bitte warte %{time_left}, bis Du es wieder versuchst."
-      edit_post: "Du hast für heute die maximale Anzahl an Bearbeitungen erreicht. Bitte warte %{time_left}, bevor du es erneut versuchst."
+      topics_per_day: "Du hast die maximale Anzahl an neuen Themen erreicht. Bitte warte %{time_left}, bis Du es wieder versuchst."
+      pms_per_day: "Du hast die maximale Anzahl an Nachrichten erreicht. Bitte warte %{time_left}, bis Du es wieder versuchst."
+      create_like: "Du hast die maximale Anzahl an Likes erreicht. Bitte warte %{time_left}, bevor du es wieder versuchst."
+      create_bookmark: "Du hast die maximale Anzahl an Lesezeichen erreicht. Bitte warte %{time_left}, bis Du es wieder versuchst."
+      edit_post: "Du hast die maximale Anzahl an Bearbeitungen erreicht. Bitte warte %{time_left}, bevor du es wieder versuchst."
       live_post_counts: "Du forderst die Live-Anzahl der Antworten zu schnell neu an. Bitte warte %{time_left}, bis du es wieder versuchst."
-      unsubscribe_via_email: "Du hast die maximale Anzahl an Abbestell-E-Mails für heute erreicht. Bitte warte %{time_left}, vor einem neuen Versuch."
-      topic_invitations_per_day: "Du hast die maximale Zahl an neuen Thema-Einladungen für heute erreicht. Bitte warte %{time_left}, bis Du es wieder versuchst."
+      unsubscribe_via_email: "Du hast die maximale Anzahl an Abbestellungen per E-Mail erreicht. Bitte warte %{time_left}, vor einem neuen Versuch."
+      topic_invitations_per_day: "Du hast die maximale Zahl an neuen Thema-Einladungen erreicht. Bitte warte %{time_left}, bis Du es wieder versuchst."
     hours:
-      one: "1 Stunde"
-      other: "%{count} Stunden"
+      one: 1 Stunde
+      other: '%{count} Stunden'
     minutes:
-      one: "1 Minute"
-      other: "%{count} Minuten"
+      one: 1 Minute
+      other: '%{count} Minuten'
     seconds:
-      one: "1 Sekunde"
-      other: "%{count} Sekunden"
+      one: 1 Sekunde
+      other: '%{count} Sekunden'
   datetime:
     distance_in_words:
       half_a_minute: "< 1 Min."
       less_than_x_seconds:
-        one: "< 1s"
-        other: "< %{count}s"
+        one: < 1s
+        other: < %{count}s
       x_seconds:
-        one: "1s"
-        other: "%{count}s"
+        one: 1s
+        other: '%{count}s'
       less_than_x_minutes:
-        one: "< 1 Min."
-        other: "< %{count} Min."
+        one: < 1 Min.
+        other: < %{count} Min.
       x_minutes:
-        one: "1 Min."
-        other: "%{count} Min."
+        one: 1 Min.
+        other: '%{count} Min.'
       about_x_hours:
-        one: "1 Std."
-        other: "%{count} Std."
+        one: 1 Std.
+        other: '%{count} Std.'
       x_days:
-        one: "1 Tag"
-        other: "%{count} Tage"
+        one: 1 Tag
+        other: '%{count} Tage'
       about_x_months:
-        one: "1 Monat"
-        other: "%{count} Monate"
+        one: 1 Monat
+        other: '%{count} Monate'
       x_months:
-        one: "1 Monat"
-        other: "%{count} Monate"
+        one: 1 Monat
+        other: '%{count} Monate'
       about_x_years:
-        one: "1 Jahr"
-        other: "%{count} Jahre"
+        one: 1 Jahr
+        other: '%{count} Jahre'
       over_x_years:
-        one: "> 1 Jahr"
-        other: "> %{count} Jahre"
+        one: '> 1 Jahr'
+        other: '> %{count} Jahre'
       almost_x_years:
-        one: "1 Jahr"
-        other: "%{count} Jahre"
+        one: 1 Jahr
+        other: '%{count} Jahre'
     distance_in_words_verbose:
       half_a_minute: "gerade eben"
       less_than_x_seconds:
-        one: "gerade eben"
-        other: "gerade eben"
+        one: gerade eben
+        other: gerade eben
       x_seconds:
-        one: "vor einer Sekunde"
-        other: "vor %{count} Sekunden"
+        one: vor einer Sekunde
+        other: vor %{count} Sekunden
       less_than_x_minutes:
-        one: "vor weniger als einer Minute"
-        other: "vor weniger als %{count} Minuten"
+        one: vor weniger als einer Minute
+        other: vor weniger als %{count} Minuten
       x_minutes:
-        one: "vor einer Minute"
-        other: "vor %{count} Minuten"
+        one: vor einer Minute
+        other: vor %{count} Minuten
       about_x_hours:
-        one: "vor einer Stunde"
-        other: "vor %{count} Stunden"
+        one: vor einer Stunde
+        other: vor %{count} Stunden
       x_days:
-        one: "vor einem Tag"
-        other: "vor %{count} Tagen"
+        one: vor einem Tag
+        other: vor %{count} Tagen
       about_x_months:
-        one: "vor etwa einem Monat"
-        other: "vor etwa %{count} Monaten"
+        one: vor etwa einem Monat
+        other: vor etwa %{count} Monaten
       x_months:
-        one: "vor einem Monat"
-        other: "vor %{count} Monaten"
+        one: vor einem Monat
+        other: vor %{count} Monaten
       about_x_years:
-        one: "vor etwa einem Jahr"
-        other: "vor etwa %{count} Jahren"
+        one: vor etwa einem Jahr
+        other: vor etwa %{count} Jahren
       over_x_years:
-        one: "vor über einem Jahr"
-        other: "vor über %{count} Jahren"
+        one: vor über einem Jahr
+        other: vor über %{count} Jahren
       almost_x_years:
-        one: "vor fast einem Jahr"
-        other: "vor fast %{count} Jahren"
+        one: vor fast einem Jahr
+        other: vor fast %{count} Jahren
   password_reset:
     no_token: "Entschuldige, aber der Link zum Zurücksetzen des Passworts ist zu alt. Wähle 'Ich habe mein Passwort vergessen' um einen neuen Link zu erhalten."
     choose_new: "Wähle ein neues Passwort"
@@ -566,6 +615,9 @@ de:
     title: 'Passwort zurücksetzen'
     success: "Dein Passwort wurde erfolgreich geändert, und du bist nun angemeldet."
     success_unapproved: "Dein Passwort wurde erfolgreich geändert."
+  email_login:
+    invalid_token: "Entschuldige, aber der Link zum Anmelden ist zu alt. Wähle die Anmelden-Schaltfläche und nutze „Ich habe mein Passwort vergessen“, um einen neuen Link zu erhalten."
+    title: "E-Mail-Anmeldung"
   change_email:
     confirmed: "Deine E-Mail-Adresse wurde aktualisiert."
     please_continue: "Weiter zu %{site_name}"
@@ -582,7 +634,7 @@ de:
     continue_button: "Weiter zu %{site_name}"
     welcome_to: "Willkommen bei %{site_name}!"
     approval_required: "Bevor du auf das Forum zugreifen kannst, muss dein neues Konto noch von einem Moderator genehmigt werden. Du erhältst eine E-Mail, sobald dies geschehen ist!"
-    missing_session: "We können nicht feststellen, ob dein Konto erstellt wurde, bitte stelle sichere, dass du Cookies aktiviert hast."
+    missing_session: "Wir können nicht feststellen, ob dein Konto erstellt wurde. Bitte stelle sicher, dass du Cookies aktiviert hast."
     activated: "Bitte entschuldige, dieses Konto wurde bereits aktiviert."
     admin_confirm:
       title: "Admnistrator-Konto bestätigen"
@@ -610,8 +662,8 @@ de:
       long_form: 'dies als unangemessen gemeldet'
     notify_user:
       title: 'Schreibe @{{username}} eine Nachricht'
-      description: 'Ich möchte mit dieser Person direkt und persönlich über ihren Beitrag reden.'
-      short_description: 'Ich möchte mit dieser Person direkt und persönlich über ihren Beitrag reden.'
+      description: 'Ich möchte mit dieser Person direkt und privat über ihren Beitrag reden.'
+      short_description: 'Ich möchte mit dieser Person direkt und privat über ihren Beitrag reden.'
       long_form: 'angeschriebener Benutzer'
       email_title: 'Dein Beitrag in „%{title}“'
       email_body: "%{link}\n\n%{message}"
@@ -680,6 +732,7 @@ de:
     title: "Abbestellt!"
     description: "<b>%{email}</b> wurde abbestellt. Um deine E-Mail-Einstellungen zu ändern, <a href='%{url}'>besuche deine Benutzer-Einstellungen</a>."
     topic_description: "Um %{link} wieder zu abonnieren, verwende die Benachrichtigungseinstellungen, die du am Ende und rechts von jedem Thema findest."
+    private_topic_description: "Um das Thema wieder zu abonnieren, verwende die Benachrichtigungseinstellungen unten oder rechts vom Thema."
   unsubscribe:
     title: "Abbestellen"
     stop_watching_topic: "Thema nicht mehr beobachten, %{link}"
@@ -715,6 +768,22 @@ de:
       title: "Neue Benutzer"
       xaxis: "Tag"
       yaxis: "Anzahl neuer Benutzer"
+      description: "Neue Registrierungen in dieser Zeit"
+    new_contributors:
+      title: "Neue Mitwirkende"
+      xaxis: "Tag"
+      yaxis: "Anzahl neuer Mitwirkender"
+      description: "Anzahl der Benutzer, die ihren ersten Beitrag in dieser Zeit erstellt haben"
+    dau_by_mau:
+      title: "TAB/MAB"
+      xaxis: "Tag"
+      yaxis: "TAB/MAB"
+      description: "Anzahl der Mitglieder, die sich am vergangenen Tag angemeldet haben, geteilt durch die Anzahl der Mitglieder, die sich im letzten Monat angemeldet haben – liefert eine Prozentzahl, die das „Klebeverhalten“ der Community angibt. Erstrebenswert sind 30 % oder mehr."
+    daily_engaged_users:
+      title: "Täglich engagierte Benutzer"
+      xaxis: "Tag"
+      yaxis: "Engagierte Benutzer"
+      description: "Anzahl der Benutzer, die innerhalb des letzten Tages einen Beitrag geschrieben oder mit einem Like markiert haben"
     profile_views:
       title: "Profilaufrufe"
       xaxis: "Tag"
@@ -723,10 +792,12 @@ de:
       title: "Themen"
       xaxis: "Tag"
       yaxis: "Anzahl neuer Themen"
+      description: "Neue Themen, die in dieser Zeit erstellt wurden"
     posts:
       title: "Beiträge"
       xaxis: "Tag"
       yaxis: "Anzahl neuer Beiträge"
+      description: "Neue Beiträge, die in dieser Zeit erstellt wurden"
     likes:
       title: "Likes"
       xaxis: "Tag"
@@ -747,12 +818,31 @@ de:
       title: "Benutzer nach Stufe"
       xaxis: "Stufe"
       yaxis: "Anzahl der Benutzer"
+    users_by_type:
+      title: "Benutzer nach Art"
+      xaxis: "Art"
+      yaxis: "Anzahl der Benutzer"
+      xaxis_labels:
+        admin: Administrator
+        moderator: Moderator
+        suspended: Gesperrt
+        silenced: Stummgeschaltet
+    trending_search:
+      title: Suchtrends
+      labels:
+        term: Begriff
+        searches: Suchen
+        click_through: CTR
     emails:
       title: "Gesendete E-Mails"
       xaxis: "Tag"
       yaxis: "Anzahl der E-Mails"
     user_to_user_private_messages:
-      title: "Benutzer-zu-Benutzer"
+      title: "Benutzer-an-Benutzer (ohne Antworten)"
+      xaxis: "Tag"
+      yaxis: "Anzahl der Nachrichten"
+    user_to_user_private_messages_with_replies:
+      title: "Benutzer-zu-Benutzer (mit Antworten)"
       xaxis: "Tag"
       yaxis: "Anzahl der Nachrichten"
     system_private_messages:
@@ -799,7 +889,7 @@ de:
       xaxis: "Tag"
       yaxis: "Aufrufe durch Suchmaschinen"
     page_view_total_reqs:
-      title: "Gesamt"
+      title: "Seitenaufrufe"
       xaxis: "Tag"
       yaxis: "Seitenaufrufe insgesamt"
     page_view_logged_in_mobile_reqs:
@@ -846,6 +936,10 @@ de:
       title: "Benutzerbesuche"
       xaxis: "Tag"
       yaxis: "Anzahl der Besuche"
+    web_crawlers:
+      title: "Anfragen von Suchmaschinen"
+      xaxis: "Browserkennung"
+      yaxis: "Seitenaufrufe"
   dashboard:
     rails_env_warning: "Dein Server läuft im %{env}-Modus."
     host_names_warning: "Deine config/database.yml-Datei verwendet localhost als Hostname. Trage hier den Hostnamen deiner Website ein."
@@ -863,28 +957,30 @@ de:
     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>"
     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>."
-      other: "Beim Abrufen von E-Mails sind in den letzten 24 Stunden %{count} Fehler aufgetreten. Weitere Informationen findest du <a href='/logs' target='_blank'>im Fehlerprotokoll</a>."
-    missing_mailgun_api_key: "Der Server wurde für den E-Mail-Versand über mailgun konfiguriert, aber du hast keinen API-Schlüssel hinterlegt, um die WebHook-Nachrichten zu überprüfen."
+      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>.
+      other: Beim Abrufen von E-Mails sind in den letzten 24 Stunden %{count} Fehler aufgetreten. Weitere Informationen findest du <a href='/logs' target='_blank'>im Fehlerprotokoll</a>.
+    missing_mailgun_api_key: "Der Server ist so eingestellt, dass E-Mails über Mailgun versendet werden, aber du hast keinen API-Schlüssel angegeben, um Webhook-Nachrichten zu überprüfen."
     bad_favicon_url: "Das Favicon lässt sich nicht laden. Prüfe die favicon_url-Einstellung in den <a href='/admin/site_settings'>Einstellungen</a>."
     poll_pop3_timeout: "Die Verbindung zum POP3-Server schlägt mit einer Zeitüberschreitung fehl. Eingehende E-Mails konnten nicht abgerufen werden. Überprüfe deine <a href='/admin/site_settings/category/email'>POP3-Einstellungen</a>."
     poll_pop3_auth_error: "Die Verbindung zum POP3-Server schlägt mit einem Authentisierungsfehler fehl. Überprüfe deine <a href='/admin/site_settings/category/email'>POP3-Einstellungen</a>."
+    force_https_warning: "Deine Webseite verwendet SSL, aber die `<a href='/admin/site_settings/category/all_results?filter=force_https'>force_https</a>` ist in deinen Website-Einstellungen noch nicht aktiviert."
   site_settings:
     censored_words: "Wörter, die automatisch durch &#9632;&#9632;&#9632;&#9632; ersetzt werden"
-    censored_pattern: "Regex-Muster das automatisch ersetzt wird mit &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Automatisch alle Beiträge löschen, die länger als 30 Tage versteckt bleiben."
-    default_locale: "Die Standardsprache dieser Discourse-Instanz (kodiert in ISO 639-1)."
+    default_locale: "Die Standard-Sprache dieser Discourse-Instanz"
     allow_user_locale: "Erlaube Benutzern, ihre eigene Oberflächensprache zu wählen"
     set_locale_from_accept_language_header: "Sprache der Benutzeroberfläche für anonyme Benutzer an Hand der Spracheinstellung ihres Browsers wählen (EXPERIMENTELL, funktioniert nicht mit Caches für anonyme Benutzer)"
+    support_mixed_text_direction: "Unterstütze die Vermischung von rechtsläufigem und linksläufigem Text"
     min_post_length: "Minimal zulässige Beitragslänge in Zeichen."
     min_first_post_length: "Minimal zulässige Länge des ersten Beitrags (eines Themas) in Zeichen"
-    min_private_message_post_length: "Minimale zulässige Beitragslänge in Zeichen für Nachrichten"
+    min_personal_message_post_length: "Minimale zulässige Zeichenanzahl für Beiträge in Nachrichten."
     max_post_length: "Maximale zulässige Beitragslänge in Zeichen."
     topic_featured_link_enabled: "Beitrag mit Link zu hervorgehobenen Themen erlauben"
     show_topic_featured_link_in_digest: "Zeige den Hervorgehobene Themen Link in der E-Mail-Zusammenfassung."
     min_topic_title_length: "Minimale zulässige Titellänge von Themen in Zeichen."
     max_topic_title_length: "Maximale zulässige Titellänge von Themen in Zeichen."
-    min_private_message_title_length: "Minimale zulässige Titellänge von Nachrichten in Zeichen."
+    min_personal_message_title_length: "Minimale zulässige Zeichenanzahl für den Titel von Nachrichten."
+    max_emojis_in_title: "Maximal erlaubte Emoji-Anzahl in Thementiteln"
     min_search_term_length: "Minimale zulässige Länge der Suche in Zeichen."
     search_tokenize_chinese_japanese_korean: "Zwinge die Suche Chinesisch, Japanisch und Koreanisch zu erkennen, auch wenn die Site keine dieser Sprachen nutzt"
     search_prefer_recent_posts: "Wenn das Durchsuchen deines großen Forums langsam ist, dann versucht diese Option zuerst einen Index der letzten Beiträge."
@@ -905,6 +1001,9 @@ de:
     download_remote_images_max_days_old: "Externe Bilder nicht herunterladen für Beiträge, die älter als (n) Tage alt sind."
     disabled_image_download_domains: "Liste von Domänen, von denen verlinkte Bilder niemals heruntergeladen werden sollen."
     editing_grace_period: "Für (n) Sekunden wird nach dem Bearbeiten keine neue Revision im Beitragsverlauf angelegt."
+    editing_grace_period_max_diff: "Maximale Anzahl von Zeichenänderungen, die während der Bearbeitungsfrist erlaubt sind. Bei größeren Änderungen wird eine neue Beitragsversion gespeichert (Vertrauensstufe 0 und 1)"
+    editing_grace_period_max_diff_high_trust: "Maximale Anzahl von Zeichenänderungen, die während der Bearbeitungsfrist erlaubt sind. Bei größeren Änderungen wird eine neue Beitragsversion gespeichert (Vertrauensstufe 2 und höher)"
+    staff_edit_locks_post: "Beiträge werden für die Bearbeitung gesperrt, wenn sie von Team-Mitgliedern bearbeitet werden"
     post_edit_time_limit: "Der Verfasser eines Beitrags kann diesen nur für (n) Minuten nach Absenden des Beitrags bearbeiten. 0 deaktiviert diese Beschränkung."
     edit_history_visible_to_public: "Erlaube jedem, vorherige Versionen eines bearbeiteten Beitrags zu sehen. Wenn deaktiviert sind diese nur für Team-Mitglieder sichtbar."
     delete_removed_posts_after: "Beiträge, die deren Verfasser selbst entfernt hat, werden nach (n) Stunden automatisch gelöscht. Die Beiträge werden sofort gelöscht, wenn dieser Wert auf 0 gesetzt wird."
@@ -933,14 +1032,15 @@ de:
     email_custom_headers: "Eine durch senkrechte Striche getrennte Liste von eigenen E-Mail Headerzeilen"
     email_subject: "Format der Betreffzeile in Standard-E-Mails. Siehe https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801"
     force_https: "Erzwinge HTTPS für deine Site. ACHTUNG: Aktiviere dies nicht, bevor HTTPS nicht vollständig eingerichtet ist und auf jeden Fall überall funktioniert! Hast du alle CDN-Netzwerke, alle Logins über Soziale Netzwerke, alle externe Logos / Abhängigkeiten geprüft, um sicherzustellen, dass sie auch alle HTTPS-kompatibel sind?"
-    same_site_cookies: "Verwende Same-Site-Cookies, die alle Angriffsszenarien für Cross-Site-Request-Forgery in unterstützten Browsern (lax oder strict). Warnung: Strict wird nur auf Seiten funktionieren, die Login erzwingen und SSO verwenden."
+    same_site_cookies: "Verwende Same-Site-Cookies, die alle Angriffsszenarien für Cross-Site-Request-Forgery in unterstützten Browsern verhindern. Warnung: Strikt wird nur auf Seiten funktionieren, die Login erzwingen und SSO verwenden."
     summary_score_threshold: "Mindestpunktzahl, die ein Beitrag benötigt, um in der \"Thema zusammenfassen\"-Ansicht zu erscheinen."
     summary_posts_required: "Mindestanzahl an Beiträgen in einem Thema, bevor die \"Thema zusammenfassen\"-Funktion aktiviert wird."
     summary_likes_required: "Mindestanzahl an Likes in einem Thema, bevor die \"Thema zusammenfassen\" Funktion aktiviert wird."
     summary_percent_filter: "Zeige die besten (n)% der Beiträge eines Themas in der \"Thema zusammenfassen\"-Ansicht."
     summary_max_results: "Maximale Anzahl der sichtbaren Beiträge beim Zusammenfassen von Themen"
-    enable_private_messages: "Erlaube Benutzer mit der Vertrauensstufe 1 (konfigurierbar über die minimale Vertrauensstufe zum Senden von Nachrichten), Nachrichten zu erstellen und auf Nachrichten zu antworten. Beachte, dass das Team immer Nachrichten und Antworten senden können."
-    enable_private_email_messages: "Erlaube Benutzern mit Vertrauensstufe 4 (konfigurierbar über die Mindestvertrauensstufe, um Nachrichten zu senden), private E-Mail-Nachrichten zu senden. Bitte beachte, dass Team-Mitglieder immer und in jedem Fall Nachrichten senden können."
+    enable_personal_messages: "Erlaube Benutzern mit der Vertrauensstufe 1 (konfigurierbar über die minimale Vertrauensstufe zum Senden von Nachrichten), Nachrichten zu erstellen und auf Nachrichten zu antworten. Beachte, dass das Team immer Nachrichten und Antworten senden kann."
+    enable_system_message_replies: "Erlaube Benutzern, auf Systemnachrichten zu antworten, auch wenn Nachrichten deaktiviert sind"
+    enable_personal_email_messages: "Erlaube Benutzern mit Vertrauensstufe 4 (konfigurierbar über die Mindestvertrauensstufe, um Nachrichten zu senden), private E-Mail-Nachrichten zu senden. Bitte beachte, dass das Team immer Nachrichten senden kann."
     enable_long_polling: "Nachrichtenbus für Benachrichtigungen kann Long-Polling nutzen."
     long_polling_base_url: "Basis-URL für Long Polling (wenn zum Ausliefern von dynamischen Inhalten ein CDN verwendet wird, setze es auf Origin Pull), z. B. http://origin.site.com"
     long_polling_interval: "Wartezeit, bevor der Server auf Clients reagiert, wenn keine Daten gesendet werden müssen (nur für angemeldete Benutzer)"
@@ -961,7 +1061,9 @@ de:
     notify_mods_when_user_silenced: "Wenn ein Benutzer automatisch stummgeschaltet wird, sende eine Nachricht an alle Moderatoren."
     flag_sockpuppets: "Wenn ein neuer Benutzer auf ein Thema antwortet, das von einem anderen neuen Benutzer aber mit der gleichen IP-Adresse begonnen wurde, markiere beide Beiträge als potenziellen Spam."
     traditional_markdown_linebreaks: "Traditionelle Zeilenumbrüche in Markdown, die zwei nachfolgende Leerzeichen für einen Zeilenumbruch benötigen."
-    enable_markdown_typographer: "Verwende grundlegende typografische Regeln, um die Lesbarkeit von Absätzen zu erhöhen, ersetzt (c) (tm) usw. durch Symbole, reduziert die Anzahl von Lesezeichen und so weiter"
+    enable_markdown_typographer: "Verwende typographische Regeln, um die Lesbarkeit von Text zu erhöhen: ersetze einfache Anführungszeichen ' durch geneigte Anführungszeichen ’, (c) (tm) durch Symbole, -- durch Gedankenstriche –, usw."
+    enable_markdown_linkify: "Text, der nach einem Link aussieht, automatisch als Link behandeln: www.site.com und http://site.com werden automatisch verlinkt"
+    markdown_linkify_tlds: "Liste der Top-Level-Domains, die automatisch als Links behandelt werden"
     post_undo_action_window_mins: "Minuten, die ein Benutzer hat, um Aktionen auf einen Beitrag rückgängig zu machen (Gefällt mir, Meldung, usw.)."
     must_approve_users: "Team-Mitglieder müssen alle neuen Benutzerkonten freischalten, bevor diese Zugriff auf die Website erhalten. ACHTUNG: Das Aktivieren dieser Option für eine Live-Site entfernt den Zugriff auch für alle existierenden Benutzer außer für Team-Mitglieder!"
     pending_users_reminder_delay: "Benachrichtige die Moderatoren, falls neue Benutzer mehr als so viele Stunden auf ihre Genehmigung gewartet haben. Stelle -1 ein, um diese Benachrichtigungen zu deaktivieren."
@@ -977,6 +1079,10 @@ de:
     blacklist_ip_blocks: "Eine Liste von privaten IP-Blöcken, die nie von Discourse indiziert werden sollen"
     whitelist_internal_hosts: "Eine Liste interner Hostnamen, die Discourse sicher abrufen kann für Oneboxing und andere Zwecke"
     allowed_iframes: "Eine Liste von iframe-src-Domain-Präfixen, die Discourse in Beiträgen sicher erlauben kann."
+    whitelisted_crawler_user_agents: 'Positivliste mit Browserkennungen von Suchmaschinen, die Zugriff auf die Seite haben sollen.'
+    blacklisted_crawler_user_agents: 'Eindeutiges Wort in der Browserkennung (Groß-/Kleinschreibung wird ignoriert)zur Identifizierung von Suchmaschinen, die keinen Zugriff auf die Seite haben sollen. Wird ignoriert, wenn eine Positivliste definiert wird.'
+    slow_down_crawler_user_agents: 'Browserkennungen von Suchmaschinen, deren Anfragezahl begrenzt werden soll über die Direktive crawl-delay in derDatei „robots.txt“.'
+    slow_down_crawler_rate: 'Wenn slow_down_crawler_user_agents ausgewählt ist, wird diese Anfragenbegrenzung auf alle Suchmaschinen angewendet (Anzahl der Sekunden zwischen zwei Anfragen)'
     top_menu: "Legt fest, welche Elemente in der Navigationsleiste der Startseite auftauchen sollen, und in welcher Reihenfolge. Beispiel: latest|new|unread|categories|top|read|posted|bookmarks"
     post_menu: "Legt fest, welche Funktionen in welcher Reihenfolge im Beitragsmenü auftauchen. Beispiel: like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "Die Einträge im Menü eines Beitrags, die standardmäßig hinter einer erweiterbaren Ellipse versteckt werden sollen."
@@ -1006,7 +1112,6 @@ de:
     version_checks: "Kontaktiere den Discourse Hub zur Überprüfung auf neue Versionen und zeige Benachrichtigungen über neue Versionen auf der Administratorkonsole an."
     new_version_emails: "Sende eine E-Mail an die contact_email Adresse wenn eine neue Version von Discourse verfügbar ist."
     invite_expiry_days: "Tage, die Benutzereinladungen gültig bleiben."
-    invite_passthrough_hours: "Wie viele Stunden ein Benutzer einen bereits eingelösten Einladungsschlüssel zum Anmelden verwenden kann"
     invite_only: "Die öffentliche Registrierungen ist deaktiviert, neue Benutzer müssen explizit vom Team eingeladen werden."
     login_required: "Nur angemeldete Benutzer dürfen Inhalte der Site lesen, anonyme Zugriffe sind verboten."
     min_username_length: "Minimale Zeichenlänge für Benutzernamen. WARNUNG: Wenn bestehende Benutzer oder Gruppen kürzere Namen haben, wird deine Seite nicht mehr funktionieren!"
@@ -1022,29 +1127,34 @@ de:
     sso_url: "URL des Single Sign-On-Endpunkts (muss http:// oder https:// enthalten)"
     sso_secret: "Geheimer Schlüssel für die Authentifizierung von SSO-Informationen. Sollte unbedingt 10 Zeichen oder länger sein."
     sso_overrides_bio: "Überschreibt \"Über mich\" im Benutzerprofil und verhindert Änderungen durch den Benutzer"
+    sso_overrides_groups: "Synchronisiert alle manuellen Gruppenmitgliedschaften mit den Gruppen, die im SSO-Attribut „groups“ angegeben ist (WARNUNG: wenn du keine Gruppen angibst, werden alle Gruppenmitgliedschaften des Benutzers aufgehoben)"
     sso_overrides_email: "Überschreibt lokale E-Mail mit E-Mail der externen Site aus dem SSO-Payload (WARNUNG: Diskrepanzen können aufgrund der Normalisierung lokaler E-Mail-Adressen auftreten.)"
     sso_overrides_username: "Überschreibt lokalen Benutzernamen mit dem Benutzernamen der externen Site aus dem SSO-Payload (WARNUNG: Diskrepanzen können aufgrund von Normalisierung von lokalen Benutzernamen auftreten)"
     sso_overrides_name: "Überschreibt den vollen Namen des Benutzers mit den Daten von der externen Site aus dem SSO-Payload bei jedem Login. Außerdem werden lokale Änderungen verhindert."
     sso_overrides_avatar: "Überschreibt das Profilbild des Benutzers mit dem Profilbild aus dem SSO-Payload. Wenn aktiv, dann sollte allow_uploaded_avatars deaktiviert werden."
+    sso_overrides_profile_background: "Ersetzt das Hintergrundbild des Benutzerprofils mit dem Avatar der externen Seite aus den SSO-Daten"
+    sso_overrides_card_background: "Ersetzt das Hintergrundbild der Benutzerkarte mit dem Avatar der externen Seite aus den SSO-Daten"
     sso_not_approved_url: "Nicht genehmigte SSO-Konten zu dieser URL weiterleiten"
     sso_allows_all_return_paths: "Alle Domain für SSO-Return-Paths zulassen (standardmäßig muss der Return Path auf der aktuellen Seite sein)"
-    enable_local_logins: "Aktiviere Login mit lokal gespeicherten Benutzernamen und Passwörtern. (Anmerkung: muss aktiviert sein, damit Einladungen funktionieren)"
+    enable_local_logins: "Aktiviert lokale Konten mit Anmeldung über Benutzername und Passwort. Dies muss aktiviert sein, damit Einladungen funktionieren. WARNUNG: Wenn deaktiviert, kannst du dich möglicherweise nicht mehr anmelden, wenn du nicht vorher mindestens eine alternative Login-Methode konfiguriert hast."
+    enable_local_logins_via_email: "Erlaube Benutzern, einen einmaligen Anmeldelink anzufordern, der ihnen als E-Mail geschickt wird."
     allow_new_registrations: "Erlaube das Registrieren neuer Benutzerkonten. Wird dies deaktiviert, so kann niemand mehr ein neues Konto erstellen."
     enable_signup_cta: "Zeige wiederkehrenden Gästen einen Hinweis, dass diese sich Anmelden oder Registrieren sollen."
     enable_yahoo_logins: "Aktiviere Yahoo Authentifizierung."
     enable_google_oauth2_logins: "Google OAuth2-Authentifizierung aktivieren. Dies ist der momentan von Google unterstützte Authentifizierungs-Mechanismus. Benötigt Client-ID und Secret."
     google_oauth2_client_id: "Client-ID deiner Google-Anwendung."
     google_oauth2_client_secret: "Client-Secret deiner Google-Anwendung."
+    google_oauth2_prompt: "Eine Leerzeichen-separierte Liste von String-Werten, die angeben, ob der autorisierende Server den Benutzer zur Reauthentifizierung und Zustimmung fragt. Siehe https://developers.google.com/identity/protocols/OpenIDConnect#prompt für die gültigen Werte."
+    google_oauth2_hd: "Domain, die von Google Apps gehostet wird und auf die Anmeldung eingeschränkt wird. Siehe https://developers.google.com/identity/protocols/OpenIDConnect#hd-param für weitere Details."
     enable_twitter_logins: "Aktiviere Twitter-Authentifizierung (benötigt twitter_consumer_key und twitter_consumer_secret)."
-    twitter_consumer_key: "Consumer Key für Twitter-Authentifizierung, registriert auf http://dev.twitter.com"
-    twitter_consumer_secret: "Consumer Secret für Twitter-Authentifizierung, registriert auf http://dev.twitter.com"
+    twitter_consumer_key: "Consumer Key für Twitter-Authentifizierung, registriert auf https://apps.twitter.com/"
+    twitter_consumer_secret: "Consumer Secret für Twitter-Authentifizierung, registriert auf https://apps.twitter.com"
     enable_instagram_logins: "Aktiviere Instagram-Authentifizierung (benötigt instagram_consumer_key und instagram_consumer_secret)."
     instagram_consumer_key: "Consumer Key für Instagram-Authentifizierung"
     instagram_consumer_secret: "Consumer Secret für Instagram-Authentifizierung"
     enable_facebook_logins: "Aktiviere Facebook-Authentifizierung (benötigt facebook_app_id und facebook_app_secret)."
     facebook_app_id: "App-ID für Facebook-Authentifizierung, registriert auf https://developers.facebook.com/apps"
     facebook_app_secret: "App Secret für Facebook-Authentifizierung, registriert auf https://developers.facebook.com/apps"
-    facebook_request_extra_profile_details: "Anfrage zu \"über mich\", Standort und Website von Facebook. (erfordert, dass Deine auth-Anwendung von Facebook genehmigt wurde)"
     enable_github_logins: "Aktiviere GitHub-Authentifizierung (benötigt github_client_id und github_client_secret)."
     github_client_id: "Client-ID für GitHub-uthentifizierung, registriert auf https://github.com/settings/applications"
     github_client_secret: "Client Secret für GitHub-Authentifizierung, registriert auf https://github.com/settings/applications"
@@ -1053,7 +1163,7 @@ de:
     allow_restore: "Wiederherstellung von Sicherungen zulassen, die ALLE vorhandenen Daten überschreiben! Auf 'false' lassen, sofern Sie nicht planen, eine Sicherung wiederherzustellen."
     maximum_backups: "Die maximale Anzahl an Sicherungen, die auf dem Server gespeichert werden. Ältere Sicherungen werden automatisch gelöscht."
     automatic_backups_enabled: "Automatische Backups aktivieren. Die Backups werden im eingestellten Zeitintervall erstellt."
-    backup_frequency: "Wie häufig sollen Backups erstellt werden (Angabe in Tagen)?"
+    backup_frequency: "Die Anzahl von Tagen zwischen Backups."
     enable_s3_backups: "Lade fertige Backups zu S3 hoch. WICHTIG: In den Dateien-Einstellungen müssen gültige S3-Kontodaten eingegeben sein."
     s3_backup_bucket: "Der entfernte Speicherort für Ihre Sicherungen. WARNUNG: Stellen Sie sicher, dass es sich um einen privaten Speicherort handelt."
     s3_disable_cleanup: "Deaktiviere das Löschen von Backups aus S3 wenn sie lokal entfernt werden"
@@ -1066,6 +1176,7 @@ de:
     top_topics_formula_first_post_likes_multiplier: "Wert für den Multiplikator (n) für die ersten „Gefällt mir“-Angaben pro Beitrag in der Formel für die besten Beiträge: `log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
     top_topics_formula_least_likes_per_post_multiplier: "Wert für den Multiplikator (n) für die wenigsten „Gefällt mir“-Angaben pro Beitrag in der Formel für die besten Beiträge: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
     rebake_old_posts_count: "Anzahl alter Beiträge, die im 15 Minuten-Intervall neu generiert werden sollen"
+    enable_safe_mode: "Erlaube Benutzern, den abgesicherten Modus zu betreten, um Plugins zu debuggen."
     rate_limit_create_topic: "Nach Erstellen eines Themas muss ein Benutzer (n) Sekunden warten, bevor ein weiteres Thema erstellt werden kann."
     rate_limit_create_post: "Nach Schreiben eines Beitrags muss ein Benutzer (n) Sekunden warten, bevor ein weiterer Beitrag erstellt werden kann."
     rate_limit_new_user_create_topic: "Nach Erstellen eines Themas muss ein neuer Benutzer (n) Sekunden warten, bevor ein weiteres Thema erstellt werden kann."
@@ -1075,7 +1186,7 @@ de:
     max_bookmarks_per_day: "Maximale Anzahl der Lesezeichen pro Benutzer und Tag."
     max_edits_per_day: "Maximale Anzahl der Bearbeitungen pro Benutzer und Tag."
     max_topics_per_day: "Maximale Anzahl der Themen, die ein Benutzer pro Tag erstellen kann."
-    max_private_messages_per_day: "Maximale Zahl Direktnachrichten, die ein Benutzer pro Tag erstellen kann."
+    max_personal_messages_per_day: "Maximale Anzahl an Nachrichten, die Benutzer pro Tag erstellen können."
     max_invites_per_day: "Maximale Zahl an Einladungen, die ein Benutzer pro Tag verschicken kann."
     max_topic_invitations_per_day: "Maximale Zahl an Thema-Einladungen, die ein Benutzer pro Tag verschicken kann."
     max_logins_per_ip_per_hour: "Maximale Anzahl der erlaubten Anmeldungen pro IP-Adresse und Stunde"
@@ -1091,7 +1202,7 @@ de:
     purge_deleted_uploads_grace_period_days: "Schonfrist (in Tagen), bevor ein entfernter Upload endgültig gelöscht wird."
     purge_unactivated_users_grace_period_days: "Frist (in Tagen), bevor ein Benutzer gelöscht wird, der sein Konto nicht aktiviert hat. Setze sie auf 0, um nicht aktivierte Benutzer nie zu bereinigen."
     enable_s3_uploads: "Speichere hochgeladene Dateien auf Amazon S3. WICHTIG: benötigt gültige S3 Anmeldedaten (sowohl access_key_id als auch secret_access_key)."
-    s3_use_iam_profile: 'Benutze die AWS EC2 IAM Rolle zum Abrufen von Keys. ANMERKUNG: Das Aktivieren überschreibt die Einstellungen „s3 access key id“ und „s3 secret access key“.'
+    s3_use_iam_profile: 'Verwende ein <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html">AWS EC2 Instanz-Profil</a>, um Zugriff auf den S3-Bucket zu gewähren. BEACHTE: Das Aktivieren setzt voraus, dass Discourse in einer entsprechend konfigurierten EC2-Instanz läuft, und überschreibt die Einstellungen „s3 access key id“ und „s3 secret access key”.'
     s3_upload_bucket: "Der Name des Amazon S3 Buckets, in dem hochgeladene Dateien gespeichert werden sollen. ACHTUNG: nur Kleinbuchstaben, keine Punkte, keine Unterstriche."
     s3_access_key_id: "The Amazon S3 access key id that will be used to upload images"
     s3_secret_access_key: "Der geheime Schlüssel von Amazon S3 welcher für das Hochladen verwendet wird"
@@ -1133,12 +1244,17 @@ de:
     tl3_requires_likes_given: "Mindestanzahl an Likes, die ein Benutzer innerhalb der letzten (tl3 time period) gegeben haben muss, um Vertrauensstufe 3 erreichen zu können."
     tl3_requires_likes_received: "Mindestanzahl an Likes die ein Benutzer innerhalb der letzten (tl3 time period) bekommen haben muss, um Vertrauensstufe 3 erreichen zu können."
     tl3_links_no_follow: "rel=nofollow nicht von Links entfernen, die von Benutzern mit Vertrauensstufe 3 erstellt wurden."
+    trusted_users_can_edit_others: "Erlaube Benutzern mit hohen Vertrauensstufen, Inhalte von anderen Benutzern zu bearbeiten."
     min_trust_to_create_topic: "Die minimale Vertrauensstufe wird benötigt um eine neues Thema zu erstellen."
+    allow_flagging_staff: "Wenn aktiviert, können Benutzer auch Beiträge von Team-Konten melden."
     min_trust_to_edit_wiki_post: "Die minimal benötigte Vertrauensstufe, um als Wiki markierte Beiträge bearbeiten zu können."
     min_trust_to_edit_post: "Die minimal benötigte Vertrauensstufe, um Beiträge bearbeiten zu können."
     min_trust_to_allow_self_wiki: "Die minimale Vertrauensstufe, die ein Benutzer haben muss, um einen eigenen Wiki Eintrag zu erstellen."
-    min_trust_to_send_messages: "Benötigte Vertrauensstufe um neue private Nachrichten erstellen zu dürfen."
-    min_trust_to_send_email_messages: "Mindestvertrauensstufe, die nötig ist, um neue private Nachrichten per E-Mail (an vorbereitete Benutzer) zu schicken."
+    min_trust_to_send_messages: "Die minimale Vertrauensstufe zur Erstellung neuer Nachrichten."
+    min_trust_to_send_email_messages: "Die minimale Vertrauensstufe zum Versenden neuer Nachrichten als E-Mail (an vorbereitete Benutzer)."
+    min_trust_to_flag_posts: "Die minimale Vertrauensstufe zur Meldung von Beiträgen."
+    min_trust_to_post_links: "Die minimale Vertrauensstufe zum Einfügen von Links in Beiträgen."
+    min_trust_to_post_images: "Die minimale Vertrauensstufe zum Einfügen von Bildern in Beiträgen."
     newuser_max_links: "Maximale Anzahl der Links, die neue Benutzer Beiträgen hinzufügen dürfen."
     newuser_max_images: "Maximale Anzahl der Bilder, die neue Benutzer Beiträgen hinzufügen dürfen."
     newuser_max_attachments: "Maximale Anzahl der Dateien, die neue Benutzer Beiträgen hinzufügen dürfen."
@@ -1149,7 +1265,7 @@ de:
     enable_mentions: "Erlaube Benutzern, andere Benutzer zu erwähnen."
     create_thumbnails: "Erzeuge ein Vorschaubild und eine Lightbox für Bilder, die zu groß sind, um in einem Beitrag angezeigt zu werden."
     email_time_window_mins: "Warte (n) Minuten bevor eine E-Mail-Benachrichtigung geschickt wird, um Benutzern Gelegenheit zu geben, ihre Beiträge abschließend bearbeiten zu können."
-    private_email_time_window_seconds: "Warte (n) Sekunden bevor eine E-Mail-Benachrichtigung geschickt wird, um Benutzern Gelegenheit zu geben, ihre Beiträge abschließend bearbeiten zu können."
+    personal_email_time_window_seconds: "Warte (n) Sekunden, bevor Benachrichtigungsmails zu Nachrichten verschickt werden, um Benutzern die Gelegenheit zu geben, ihre Nachrichten zu bearbeiten und abzuschließen."
     email_posts_context: "Anzahl der Antworten, welche als Kontext einer Benachrichtigungs-E-Mail hinzugefügt werden."
     flush_timings_secs: "Sekunden, nach denen Zeiteinstellungen auf den Server übertragen werden."
     title_max_word_length: "Maximal erlaubte Wortlänge in Thementiteln, in Zeichen."
@@ -1165,6 +1281,7 @@ de:
     max_image_size_kb: "Maximale Größe eines hochgeladenen Bilds in kB. Dieser Wert muss auch in Nginx (client_max_body_size), Apache oder anderen Proxies entsprechend konfiguriert werden."
     max_attachment_size_kb: "Maximale Größe hochgeladener Dateianhänge in kB. Dieser Wert muss auch in Nginx (client_max_body_size), Apache oder anderen Proxies entsprechend konfiguriert werden."
     authorized_extensions: "Liste von erlaubten Dateiendungen für hochgeladene Dateien ('*' um alle Dateiendungen zu erlauben)"
+    authorized_extensions_for_staff: "Eine Liste von erlaubten Dateiendungen für den Upload von Dateien durch Team-Benutzer, zusätzlich zu der in der Seiteninstellung `authorized_extensions` definierten Liste. (Der Wert „*“ erlaubt alle Dateitypen.)"
     theme_authorized_extensions: "Liste von erlaubten Dateiendungen für hochgeladene Themes (verwende '*', um alle Dateitypen zu erlauben)"
     max_similar_results: "Anzahl ähnlicher Themen, die beim Erstellen eines neuen Themas über dem Editor angezeigt werden. Ähnlichkeit wird an Hand des Titels und Inhalts bestimmt."
     max_image_megapixels: "Maximale erlaubte Auflösung für Bilder (in Megapixeln)."
@@ -1184,6 +1301,7 @@ de:
     faq_url: "Vollständige URL zu einer externen FAQ, welche du gerne verwenden möchtest."
     tos_url: "Die vollständige URL zu deinen extern gehosteten Nutzungsbedingungen, sofern vorhanden."
     privacy_policy_url: "Die vollständige URL zu deinen extern gehosteten Datenschutzrichtlinien, sofern vorhanden."
+    log_anonymizer_details: "Sollen die Details eines Benutzers nach der Anonymisierung im Protokoll aufbewahrt werden. Zur Einhaltung der DSGVO muss dies abgeschaltet werden."
     newuser_spam_host_threshold: "Wie häufig kann ein neuer Benutzer Links der gleichen Domain innerhalb ihrer `newuser_spam_host_threshold` Beiträge schreiben, ohne als Spam eingeordnet zu werden."
     white_listed_spam_host_domains: "Liste von Domänen, die keinem Spam-Host Test unterzogen werden. Neue Benutzer werden niemals daran gehindert, Beiträge mit Links zu diesen Domains zu erstellen."
     staff_like_weight: "Zusätzlicher Gewichtungsfaktor für Likes vom Team."
@@ -1203,10 +1321,11 @@ de:
     auto_silence_fast_typers_max_trust_level: "Maximale Vertrauensstufe, um „Schnelltipper“ stummzuschalten."
     auto_silence_first_post_regex: "Regulärer Ausdruck (ohne Groß- und Kleinschreibung), der dafür sorgt dass entsprechende erste Beiträge von Benutzern stummgeschaltet und in die Genehmigungswarteschlange verschoben werden. Beispiel: raging|a[bc]a sorgt dafür, dass Beiträge, die raging, aba oder aca enthalten, zunächst stummgeschaltet werden. Dies betrifft jedoch nur den ersten Beitrag."
     flags_default_topics: "Zeige gemeldete Themen standardmäßig im Administrationsbereich"
+    min_flags_staff_visibility: "Die minimale Anzahl an Meldungen, die ein Beitrag haben muss, bevor ihn das Team im Administrationsbereich sehen kann."
     reply_by_email_enabled: "Aktviere das Antworten auf Themen via E-Mail."
     reply_by_email_address: "Vorlage für die Antwort einer per E-Mail eingehender E-Mail-Adresse, zum Beispiel: %{reply_key}@reply.example.com oder replies+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "Liste alternativer Vorlagen für eingehende E-Mail-Adressen für das Antworten per E-Mail. Beispiel: %{reply_key}@antwort.example.com|antworten+%{reply_key}@example.com"
-    incoming_email_prefer_html: "Verwende das HTML statt dem Text für eingehende E-Mails."
+    incoming_email_prefer_html: "Verwende HTML statt Text für eingehende E-Mail."
     disable_emails: "Discourse daran hindern jegliche E-Mails zu verschicken"
     strip_images_from_short_emails: "Entferne Bilder aus E-Mails kleiner als 2800 Bytes."
     short_email_length: "Kurze E-Mail-Länge in Bytes"
@@ -1274,12 +1393,14 @@ de:
     staff_user_custom_fields: "Eine Liste von benutzerdefinierten Benutzerfeldern, die vom Team eingesehen werden können."
     enable_user_directory: "Aktiviert ein durchsuchbares Benutzerverzeichnis"
     enable_group_directory: "Aktiviert ein durchsuchbares Gruppenverzeichnis"
+    group_in_subject: "Setze %{optional_pm} im E-Mail-Betreff auf die erste Gruppe in der Nachricht, siehe: https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801"
     allow_anonymous_posting: "Benutzern erlauben, in den anonymen Modus zu wechseln"
     anonymous_posting_min_trust_level: "Vertrauensstufe, ab der das Schreiben anonymer Beiträge erlaubt ist"
     anonymous_account_duration_minutes: "Erzeuge alle (n) Minuten ein neues anonymes Konto je Benutzer, um die Anonymität der virtuellen anonymen Benutzer zu gewährleisten. Beispiel: Ein Wert von 600 sorgt dafür, dass ein neues anonymes Konto erzeugt wird, wenn ein Benutzer in den anonymen Modus wechselt UND mindestens 600 Minuten seit der letzten anonymen Nachricht dieses Benutzers vergangen sind."
     hide_user_profiles_from_public: "Deaktiviert Benutzerkarten, Benutzerprofile und das Benutzerverzeichnis für anonyme Benutzer."
     show_inactive_accounts: "Erlaube angemeldeten Benutzern, die Profile inaktiver Benutzer anzuschauen."
     hide_suspension_reasons: "Zeige Sperrgründe nicht öffentlich auf Benutzerprofilen an."
+    log_personal_messages_views: "Protokolliere Ansichten von Nachrichten anderer Benutzer/Gruppen durch Administratoren"
     user_website_domains_whitelist: "Benutzer-Webseiten werden mit diesen Domains abgeglichen. Mehrere Domains können mit einem Pipe-Symbol „|“ getrennt angegeben werden."
     allow_profile_backgrounds: "Erlaubt es Benutzern, Profilhintergründe hochzuladen."
     sequential_replies_threshold: "Anzahl an Beiträgen die ein Benutzer machen muss, um benachrichtigt zu werden, dass er zu viele aufeinanderfolgende Antworten schreibt."
@@ -1308,22 +1429,25 @@ de:
     autohighlight_all_code: "Erzwinge Syntaxhervorhebung für alle Quellcode-Blöcke, auch dann wenn keine Sprache angeben wurde."
     highlighted_languages: "Aktivierter Regeln für das Syntax-Hervorhebung. (Warnung: Das Aktivieren zu vieler Sprachen kann die Leistung beeinträchtigen) siehe: https://highlightjs.org/static/demo/ für eine Demonstration"
     embed_truncate: "Kürze die eingebetteten Beiträge"
+    embed_support_markdown: "Unterstütze Markdown-Formatierung für eingebettete Beiträge"
     allowed_href_schemes: "URI-Schemas, die in Links zusätzlich zu http und https erlaubt sind."
     embed_post_limit: "Maximale Anzahl der Beiträge die eingebettet werden."
     embed_username_required: "Der Benutzername ist für die Themenerstellung notwendig"
-    notify_about_flags_after: "Wenn es Meldungen gibt, die nicht innerhalb der angegebenen Anzahl von Stunden behandelt wurden, sende eine Nachricht an das Team. Ein Wert von 0 deaktiviert die Funktion."
+    notify_about_flags_after: "Wenn es Meldungen gibt, die nicht innerhalb der angegebenen Anzahl von Stunden behandelt wurden, sende eine Nachricht an die Moderatoren. Ein Wert von 0 deaktiviert die Funktion."
     show_create_topics_notice: "Administratoren eine Warnmeldung anzeigen, wenn im Forum weniger als 5 öffentlich sichtbare Themen existieren."
-    delete_drafts_older_than_n_days: Lösche Entwürfe, die mehr als (n) Tage alt sind.
+    delete_drafts_older_than_n_days: "Lösche Entwürfe, die mehr als (n) Tage alt sind."
     bootstrap_mode_min_users: "Erforderliche Benutzeranzahl, um den Starthilfe-Modus zu deaktivieren (0 = ausgeschaltet)"
     prevent_anons_from_downloading_files: "Nichtangemeldeten Benutzern das Herunterladen von Anhängen verbieten. WARNUNG: dies verhindert auch das Herunterladen jeglicher Ressourcen für Website-Anpassungen, die als Anhänge gespeichert wurden."
     slug_generation_method: "Gib eine Methode an, wie Kürzel in URLs generiert werden sollen. 'encoded' verwendet einen Prozent-Encodierten String, bei 'none' wird kein Kürzel verwendet."
     enable_emoji: "Aktiviere emoji"
+    enable_emoji_shortcuts: "Geläufige Text-Smileys wie :) :p :( werden in Emojis umgewandelt"
     emoji_set: "Welche Emoji sollen es sein?"
     enforce_square_emoji: "Emojis immer mit quadratischem Seitenverhältnis darstellen."
     approve_post_count: "Anzahl der Beiträge eines neuen Benutzer oder Anwärters, die genehmigt werden müssen"
     approve_unless_trust_level: "Beiträge von Benutzer unterhalb dieser Vertrauensstufe müssen genehmigt werden"
     approve_new_topics_unless_trust_level: "Beiträge von Benutzer unterhalb dieser Vertrauensstufe müssen genehmigt werden"
-    notify_about_queued_posts_after: "Wenn es Beiträge gibt, die länger als diese Anzahl von Stunden auf ihre Überprüfung gewartet haben, sende eine E-Mail an contact_email. Setze sie auf 0, um diese E-Mails zu deaktivieren."
+    approve_unless_staged: "Neue Themen und Beiträge für vorbereitete Benutzer müssen genehmigt werden"
+    notify_about_queued_posts_after: "Wenn es Beiträge gibt, die länger als diese Anzahl an Stunden auf ihre Überprüfung warten, sende eine Benachrichtigung an alle Moderatoren. Setze die Einstellung auf 0, um diese Benachrichtigungen zu deaktivieren."
     auto_close_messages_post_count: "Maximale Anzahl von Beiträgen, die in einer Nachricht erlaubt sind, bevor sie automatisch geschlossen wird (0 = ausgeschaltet)"
     auto_close_topics_post_count: "Maximale Anzahl von Beiträgen, die in einem Thema erlaubt sind, bevor es automatisch geschlossen wird (0 = ausgeschaltet)"
     code_formatting_style: "Code-Schaltfläche im Editor wird standardmäßig diesen Formatierungsstil anwenden"
@@ -1331,7 +1455,7 @@ de:
     watched_words_regular_expressions: "Beobachtete Wörter sind reguläre Ausdrücke."
     default_email_digest_frequency: "Wie häufig sollen Benutzer standardmäßig E-Mail-Zusammenfassungen erhalten?"
     default_include_tl0_in_digests: "Beiträge von neuen Benutzern in E-Mail-Zusammenfassungen standardmäßig anzeigen. Benutzer können dies in ihren Einstelllungen ändern."
-    default_email_private_messages: "Sende einem Benutzer standardmäßig eine E-Mail, wenn dieser eine Nachricht von einem anderen Benutzer erhält."
+    default_email_personal_messages: "Sende einem Benutzer standardmäßig eine E-Mail, wenn dieser eine Nachricht von einem anderen Benutzer erhält."
     default_email_direct: "Aktiviere standardmäßig, dass eine E-Mail gesendet wird, sobald ein Benutzer einen anderen Benutzer zitiert / einem anderen Benutzer antwortet / oder einen anderen Benutzer erwähnt bzw. einlädt."
     default_email_mailing_list_mode: "Sende standardmäßig eine E-Mail für jeden neuen Beitrag."
     default_email_mailing_list_mode_frequency: "Benutzer, die den Mailinglisten-Modus einschalten, werden standardmäßig so häufig eine E-Mail erhalten."
@@ -1367,14 +1491,18 @@ de:
     show_filter_by_tag: "Zeige eine Dropdown-Liste, um eine Themenliste nach Schlagwort zu filtern."
     max_tags_in_filter_list: "Maximale Anzahl von Schlagwörtern, die in einer Dropdown-Liste angezeigt werden. Es werden die am häufigsten verwendeten Schlagwörter angezeigt."
     tags_sort_alphabetically: "Zeige Schlagwörter in alphabetischer Reihenfolge. Standardmäßig werden sie nach Beliebtheit sortiert."
+    tags_listed_by_group: "Führe Schlagwörter auf der Schlagwort-Seite (/tags) geordnet nach Schlagwort-Gruppe auf."
     tag_style: "Visueller Stil für Schlagwort-Abzeichen."
-    staff_tags: "Eine Liste von Schlagwörtern, die nur von Team-Mitgliedern angewendet werden können."
+    allow_staff_to_tag_pms: "Erlaube Team-Mitgliedern, jede Nachricht mit einem Schlagwort zu markieren."
     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 neuesten Beiträge keine Themen mit stummgeschalteten Schlagwörtern."
     company_short_name: "Firmenname (kurz)"
     company_full_name: "Firmenname (komplett)"
     company_domain: "Firmendomain"
+    shared_drafts_category: "Aktiviere die Funktion „Gemeinsame Vorlagen“, indem du eine Kategorie für Themen-Vorlagen bestimmst."
+    push_notifications_prompt: "Zeige eine Aufforderung zur Benutzerzustimmung an."
+    push_notifications_icon_url: "Das Abzeichen-Icon, das in der Benachrichtigungsecke erscheint. Empfohlene Größe ist 96px × 96px."
     errors:
       invalid_email: "Ungültige E-Mail-Ad­res­se"
       invalid_username: "Es gibt keinen Benutzer mit diesem Benutzernamen."
@@ -1403,6 +1531,7 @@ de:
       staged_users_disabled: "Du musst erst 'vorbereitete Benutzer' aktivieren, bevor du diese Einstellung aktivierst."
       reply_by_email_disabled: "Du musst erst 'Antwort per E-Mail' aktivieren, bevor du diese Einstellung aktivierst."
       sso_url_is_empty: "Du musst erst eine 'sso url' angeben, bevor du diese Einstellung aktivierst."
+      enable_local_logins_disabled: "Du musst erst die Einstellung „enable local logins“ aktivieren, bevor du diese Einstellung aktivierst."
   search:
     within_post: "#%{post_number} von %{username}"
     types:
@@ -1427,18 +1556,18 @@ de:
     not_seen_in_a_month: "Willkommen zurück! Wir haben dich länger nicht gesehen. Während deiner Abwesenheit waren dies die beliebtesten Themen."
   merge_posts:
     edit_reason:
-      one: "Ein Beitrag von %{username} wurde zusammengeführt"
-      other: "%{count} Beiträge von %{username} wurden zusammengeführt"
+      one: Ein Beitrag von %{username} wurde zusammengeführt
+      other: '%{count} Beiträge von %{username} wurden zusammengeführt'
     errors:
       different_topics: "Beiträge unterschiedlicher Themen können nicht zusammengeführt werden."
       different_users: "Beiträge unterschiedlicher Benutzer können nicht zusammengeführt werden."
   move_posts:
     new_topic_moderator_post:
-      one: "Ein Beitrag wurde in ein neues Thema verschoben: %{topic_link}"
-      other: "%{count} Beiträge wurden in ein neues Thema verschoben: %{topic_link}"
+      one: 'Ein Beitrag wurde in ein neues Thema verschoben: %{topic_link}'
+      other: '%{count} Beiträge wurden in ein neues Thema verschoben: %{topic_link}'
     existing_topic_moderator_post:
-      one: "Ein Beitrag wurde in ein neues Thema verschoben: %{topic_link}"
-      other: "%{count} Beiträge wurden in ein neues Thema verschoben: %{topic_link}"
+      one: 'Ein Beitrag wurde in ein neues Thema verschoben: %{topic_link}'
+      other: '%{count} Beiträge wurden in ein neues Thema verschoben: %{topic_link}'
   change_owner:
     post_revision_text: "Eigentümer geändert von %{old_user} zu %{new_user}"
     deleted_user: "ein gelöschter Benutzer"
@@ -1448,47 +1577,47 @@ de:
     closed_enabled: "Dieses Thema ist nun geschlossen. Es ist nicht länger möglich, auf dieses Thema zu antworten."
     closed_disabled: "Dieses Thema ist nun geöffnet. Es ist wieder möglich, auf dieses Thema zu antworten."
     autoclosed_message_max_posts:
-      one: "Diese Nachricht wurde automatisch geschlossen, nachde mdie maximale Anzahl von einer Antwort erreicht wurde."
-      other: "Diese Nachricht wurde automatisch geschlossen, nachde mdie maximale Anzahl von %{count} Antworten erreicht wurde."
+      one: Diese Nachricht wurde automatisch geschlossen, nachde mdie maximale Anzahl von einer Antwort erreicht wurde.
+      other: Diese Nachricht wurde automatisch geschlossen, nachde mdie maximale Anzahl von %{count} Antworten erreicht wurde.
     autoclosed_topic_max_posts:
-      one: "Dieses Theme wurde automatisch geschlossen, nachdem die maximale Anzahl von einer Antwort erreicht wurde."
-      other: "Dieses Theme wurde automatisch geschlossen, nachdem die maximale Anzahl von %{count} Antworten erreicht wurde."
+      one: Dieses Theme wurde automatisch geschlossen, nachdem die maximale Anzahl von einer Antwort erreicht wurde.
+      other: Dieses Theme wurde automatisch geschlossen, nachdem die maximale Anzahl von %{count} Antworten erreicht wurde.
     autoclosed_enabled_days:
-      one: "Dieses Thema wurde nach einem Tag automatisch geschlossen. Es sind keine neuen Nachrichten mehr erlaubt."
-      other: "Dieses Thema wurde nach %{count} Tagen automatisch geschlossen. Es sind keine neuen Nachrichten mehr erlaubt."
+      one: Dieses Thema wurde nach einem Tag automatisch geschlossen. Es sind keine neuen Nachrichten mehr erlaubt.
+      other: Dieses Thema wurde nach %{count} Tagen automatisch geschlossen. Es sind keine neuen Nachrichten mehr erlaubt.
     autoclosed_enabled_hours:
-      one: "Dieses Thema wurde nach einer Stunde automatisch geschlossen. Es sind keine neuen Nachrichten mehr erlaubt."
-      other: "Dieses Thema wurde nach %{count} Stunden automatisch geschlossen. Es sind keine neuen Nachrichten mehr erlaubt."
+      one: Dieses Thema wurde nach einer Stunde automatisch geschlossen. Es sind keine neuen Nachrichten mehr erlaubt.
+      other: Dieses Thema wurde nach %{count} Stunden automatisch geschlossen. Es sind keine neuen Nachrichten mehr erlaubt.
     autoclosed_enabled_minutes:
-      one: "Dieses Thema wurde nach einer Minute automatisch geschlossen. Es sind keine neuen Nachrichten mehr erlaubt."
-      other: "Dieses Thema wurde nach %{count} Minuten automatisch geschlossen. Es sind keine neuen Nachrichten mehr erlaubt."
+      one: Dieses Thema wurde nach einer Minute automatisch geschlossen. Es sind keine neuen Nachrichten mehr erlaubt.
+      other: Dieses Thema wurde nach %{count} Minuten automatisch geschlossen. Es sind keine neuen Nachrichten mehr erlaubt.
     autoclosed_enabled_lastpost_days:
-      one: "Dieses Thema wurde automatisch einen Tag nach der letzten Antwort geschlossen. Es sind keine neuen Nachrichten mehr erlaubt."
-      other: "Dieses Thema wurde automatisch %{count} Tage nach der letzten Antwort geschlossen. Es sind keine neuen Nachrichten mehr erlaubt."
+      one: Dieses Thema wurde automatisch einen Tag nach der letzten Antwort geschlossen. Es sind keine neuen Nachrichten mehr erlaubt.
+      other: Dieses Thema wurde automatisch %{count} Tage nach der letzten Antwort geschlossen. Es sind keine neuen Nachrichten mehr erlaubt.
     autoclosed_enabled_lastpost_hours:
-      one: "Dieses Thema wurde automatisch eine Stunde nach der letzten Antwort geschlossen. Es sind keine neuen Nachrichten mehr erlaubt."
-      other: "Dieses Thema wurde automatisch %{count} Stunden nach der letzten Antwort geschlossen. Es sind keine neuen Nachrichten mehr erlaubt."
+      one: Dieses Thema wurde automatisch eine Stunde nach der letzten Antwort geschlossen. Es sind keine neuen Nachrichten mehr erlaubt.
+      other: Dieses Thema wurde automatisch %{count} Stunden nach der letzten Antwort geschlossen. Es sind keine neuen Nachrichten mehr erlaubt.
     autoclosed_enabled_lastpost_minutes:
-      one: "Dieses Thema wurde automatisch eine Minute nach der letzten Antwort geschlossen. Es sind keine neuen Nachrichten mehr erlaubt."
-      other: "Dieses Thema wurde automatisch %{count} Minuten nach der letzten Antwort geschlossen. Es sind keine neuen Nachrichten mehr erlaubt."
+      one: Dieses Thema wurde automatisch eine Minute nach der letzten Antwort geschlossen. Es sind keine neuen Nachrichten mehr erlaubt.
+      other: Dieses Thema wurde automatisch %{count} Minuten nach der letzten Antwort geschlossen. Es sind keine neuen Nachrichten mehr erlaubt.
     autoclosed_disabled_days:
-      one: "Das Thema wurde automatisch nach 1 Tag geöffnet."
-      other: "Das Thema wurde automatisch nach %{count} Tagen geöffnet."
+      one: Das Thema wurde automatisch nach 1 Tag geöffnet.
+      other: Das Thema wurde automatisch nach %{count} Tagen geöffnet.
     autoclosed_disabled_hours:
-      one: "Das Thema wurde automatisch nach 1 Stunde geöffnet."
-      other: "Das Thema wurde automatisch nach %{count} Stunden geöffnet."
+      one: Das Thema wurde automatisch nach 1 Stunde geöffnet.
+      other: Das Thema wurde automatisch nach %{count} Stunden geöffnet.
     autoclosed_disabled_minutes:
-      one: "Das Thema wurde automatisch nach 1 Minute geöffnet."
-      other: "Das Thema wurde automatisch nach %{count} Minuten geöffnet."
+      one: Das Thema wurde automatisch nach 1 Minute geöffnet.
+      other: Das Thema wurde automatisch nach %{count} Minuten geöffnet.
     autoclosed_disabled_lastpost_days:
-      one: "Dieses Thema wurde automatisch 1 Tag nach der letzten Antwort geöffnet."
-      other: "Dieses Thema wurde automatisch %{count} Tage nach der letzten Antwort geöffnet."
+      one: Dieses Thema wurde automatisch 1 Tag nach der letzten Antwort geöffnet.
+      other: Dieses Thema wurde automatisch %{count} Tage nach der letzten Antwort geöffnet.
     autoclosed_disabled_lastpost_hours:
-      one: "Dieses Thema wurde automatisch 1 Stunde nach der letzten Antwort geöffnet."
-      other: "Dieses Thema wurde automatisch %{count} Stunden nach der letzten Antwort geöffnet."
+      one: Dieses Thema wurde automatisch 1 Stunde nach der letzten Antwort geöffnet.
+      other: Dieses Thema wurde automatisch %{count} Stunden nach der letzten Antwort geöffnet.
     autoclosed_disabled_lastpost_minutes:
-      one: "Dieses Thema wurde automatisch 1 Minute nach der letzten Antwort geöffnet."
-      other: "Dieses Thema wurde automatisch %{count} Minuten nach der letzten Antwort geöffnet."
+      one: Dieses Thema wurde automatisch 1 Minute nach der letzten Antwort geöffnet.
+      other: Dieses Thema wurde automatisch %{count} Minuten nach der letzten Antwort geöffnet.
     autoclosed_disabled: "Dieses Thema ist nun offen. Neue Beiträge werden angenommen."
     autoclosed_disabled_lastpost: "Dieses Thema ist jetzt geöffnet. Neue Antworten sind erlaubt."
     pinned_enabled: "Dieses Thema ist nun angeheftet. In seiner Kategorie wird es nun oben erscheinen, bis es vom Team oder von einzelnen Benutzer losgelöst wird."
@@ -1501,6 +1630,7 @@ de:
   login:
     not_approved: "Dein Benutzerkonto wurde noch nicht genehmigt. Du wirst per E-Mail benachrichtigt, sobald dies geschehen ist."
     incorrect_username_email_or_password: "Benutzername, E-Mail-Adresse oder Passwort falsch"
+    incorrect_password: "Falsches Passwort"
     wait_approval: "Danke fürs Registrieren. Wir werden dich benachrichtigen, sobald dein Benutzerkonto genehmigt wurde."
     active: "Dein Konto ist nun freigeschaltet und einsatzbereit."
     activate_email: "<p>Du bist fast fertig! Wir haben eine Aktivierungsmail gesendet an <b>%{email}</b>. Bitte folge den Anweisungen in der E-Mail, um dein Konto zu aktivieren.</p><p>Wenn keine E-Mail ankommt, überprüfe bitte deinen Spam-Ordner.</p>"
@@ -1523,6 +1653,9 @@ de:
     auth_complete: "Authentifizierung ist abgeschlossen."
     click_to_continue: "Klicke hier um fortzufahren."
     already_logged_in: "Hoppla, es sieht so aus als ob du versuchst die Einladung für einen anderen Benutzer zu akzeptieren. Wenn du nicht %{current_user} bist, melde dich bitte ab und versuch es erneut."
+    second_factor_title: "Zwei-Faktor Authentifizierung"
+    second_factor_description: "Bitte gib den erforderlichen Authentifizierungscode aus deiner App ein:"
+    invalid_second_factor_code: "Ungültiger Authentifizierungscode"
   user:
     no_accounts_associated: "Es sind keine Konten zugeordnet"
     deactivated: "Deaktiviert wegen zu vielen unzustellbaren E-Mails an '%{email}'."
@@ -1546,7 +1679,7 @@ de:
       revoked: "Sende keine E-Mails an '%{email}' bis %{date}."
     ip_address:
       blocked: "Neue Registrierungen sind von deiner IP-Adresse aus nicht erlaubt."
-      max_new_accounts_per_registration_ip: "Weitere Registrierungen sind von deiner IP-Adresse aus nicht gestattet (limit erreicht). Kontaktiere einen Administrator mit dem Problem damit er dir helfen kann."
+      max_new_accounts_per_registration_ip: "Weitere Registrierungen sind von deiner IP-Adresse aus nicht gestattet (maximale Anzahl erreicht). Kontaktiere einen Administrator mit dem Problem damit er dir helfen kann."
     website:
       domain_not_allowed: "Webseite ist ungültig. Erlaubte Domains sind: %{domains}"
     auto_rejected: "Automatisch abgelehnt aufgrund des Alters. Siehe Seiteneinstellung auto_handle_queued_age."
@@ -1556,11 +1689,11 @@ de:
       same_ip_address: "Gleiche IP-Adresse (%{ip_address}) wie andere Benutzer"
   flags_reminder:
     flags_were_submitted:
-      one: "Meldungen wurden vor über 1 Stunde eingereicht. [Bitte übeprüfe sie](/admin/flags)."
-      other: "Meldungen wurden vor über %{count} Stunden eingereicht. [Bitte übeprüfe sie](/admin/flags)."
+      one: Meldungen wurden vor über 1 Stunde eingereicht. [Bitte übeprüfe sie](/admin/flags).
+      other: Es wurden Meldungen vor über %{count} Stunden eingereicht. [Bitte überprüfe sie](/admin/flags).
     subject_template:
-      one: "Eine Markierung wartet auf Bearbeitung"
-      other: "%{count} Markierungen warten auf Bearbeitung"
+      one: Eine Markierung wartet auf Bearbeitung
+      other: '%{count} Markierungen warten auf Bearbeitung'
   unsubscribe_mailer:
     title: "Abbestellung von E-Mail-Updates"
     subject_template: "Bitte bestätige, dass du keine E-Mail-Updates mehr von %{site_title} erhalten möchtest."
@@ -1756,8 +1889,8 @@ de:
     deferred: "Danke für deine Meldung. Wir sehen uns das an."
     deferred_and_deleted: "Danke für deine Meldung. Wir haben den Beitrag entfernt."
   temporarily_closed_due_to_flags:
-    one: "Dieses Thema ist vorübergehend für 1 Stunde gesperrt aufgrund einer großen Anzahl an Community-Meldungen."
-    other: "Dieses Thema ist vorübergehend für %{count} Stunden gesperrt aufgrund einer großen Anzahl an Community-Meldungen."
+    one: Dieses Thema ist vorübergehend für 1 Stunde gesperrt aufgrund einer großen Anzahl an Community-Meldungen.
+    other: Dieses Thema ist vorübergehend für %{count} Stunden gesperrt aufgrund einer großen Anzahl an Community-Meldungen.
   system_messages:
     private_topic_title: "Thema #%{id}"
     contents_hidden: "Bitte besuche den Beitrag, um die Inhalte zu sehen."
@@ -1777,6 +1910,21 @@ de:
 
         Wird der Beitrag allerdings ein zweites Mal von der Community ausgeblendet, bleibt er dies, bis er vom Team bearbeitet wurde.
 
+        Weitere Hinweise findest du in unseren [Community-Richtlinien](%{base_url}/guidelines).
+    post_hidden_again:
+      title: "Beitrag wieder ausgeblendet"
+      subject_template: "Beitrag ausgeblendet wegen Community-Meldungen, Team wurde informiert"
+      text_body_template: |
+        Hallo,
+
+        dies ist eine automatisch erzeugte Nachricht von %{site_name}, um dich darüber zu informieren, dass dein Beitrag erneut ausgeblendet wurde.
+
+        <%{base_url}%{url}>
+
+        %{flag_reason}
+
+        Mehrere Community-Mitglieder haben diesen Beitrag gemeldet, bevor er ausgeblendet wurde. **Weil der Beitrag mehr als einmal ausgeblendet wurde, wird er nun ausgeblendet bleiben, bis er vom Team behandelt wurde.**
+
         Weitere Hinweise findest du in unseren [Community-Richtlinien](%{base_url}/guidelines).
     usage_tips:
       text_body_template: |
@@ -1874,7 +2022,7 @@ de:
         ```
     csv_export_succeeded:
       title: "CSV-Export erfolgreich"
-      subject_template: "Datenexport abgeschlossen"
+      subject_template: "[%{export_title}] Datenexport abgeschlossen"
       text_body_template: |
         Deine Daten wurden erfolgreich exportiert! :dvd:
 
@@ -2012,6 +2160,13 @@ de:
         Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (mit dem Betreff %{former_title}) hat nicht funktioniert.
 
         Keine der Empfängeradressen wurden erkannt oder der Message-ID-Header in der E-Mail ist verändert worden. Bitte stelle sicher, dass du an die richtige E-Mail-Adresse schickst, die vom Team bekanntgegeben wurde.
+    email_reject_old_destination:
+      title: "E-Mail abgelehnt weil alter Empfänger"
+      subject_template: "[%{email_prefix}] E-Mail-Problem -- Du versuchst, auf eine alte Benachrichtigung zu antworten"
+      text_body_template: |
+        Entschuldige, aber deine E-Mail-Nachricht an %{destination}(mit dem Betreff ) konnte nicht zugestellt werden.
+
+        Aus Sicherheitsgründen akzeptieren wir Antworten auf ursprüngliche Benachrichtigungen nur innerhalb von 90 Tagen. Bitte [besuche das Thema](%{short_url}), um die Unterhaltung fortzusetzen.
     email_reject_topic_not_found:
       title: "E-Mail abgelehnt weil Thema nicht gefunden"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Thema nicht gefunden"
@@ -2116,8 +2271,8 @@ de:
     pending_users_reminder:
       title: "Benachrichtigung: Benutzer warten auf Freigabe"
       subject_template:
-        one: "Es gibt einen nicht freigegebenen Benutzer"
-        other: "Es gibt %{count} nicht freigegebene Benutzer"
+        one: Es gibt einen nicht freigegebenen Benutzer
+        other: Es gibt %{count} nicht freigegebene Benutzer
       text_body_template: |
         Es warten neuen Benutzer auf ihre Freigabe.
 
@@ -2145,8 +2300,8 @@ de:
     queued_posts_reminder:
       title: "Erinnerung für anstehende Beiträge"
       subject_template:
-        one: "1 Beitrag wartet auf Überprüfung"
-        other: "%{count} Beiträge warten auf Überprüfung"
+        one: 1 Beitrag wartet auf Überprüfung
+        other: '%{count} Beiträge warten auf Überprüfung'
       text_body_template: |
         Hallo,
 
@@ -2164,8 +2319,8 @@ de:
   user_notifications:
     previous_discussion: "Vorangehende Antworten"
     reached_limit:
-      one: "Achtung: Wir senden maximal 1 E-Mail pro Tag. Überprüfe die Seite, um möglicherweise zurückgehaltene E-Mails zu sehen."
-      other: "Achtung: Wir senden maximal%{count} E-Mails pro Tag. Überprüfe die Seite, um möglicherweise zurückgehaltene E-Mails zu sehen. P.S.: Danke, dass du so beliebt bist!"
+      one: 'Achtung: Wir senden maximal 1 E-Mail pro Tag. Überprüfe die Seite, um möglicherweise zurückgehaltene E-Mails zu sehen.'
+      other: 'Achtung: Wir senden maximal%{count} E-Mails pro Tag. Überprüfe die Seite, um möglicherweise zurückgehaltene E-Mails zu sehen. P.S.: Danke, dass du so beliebt bist!'
     in_reply_to: "Als Antwort auf"
     unsubscribe:
       title: "Abbestellen"
@@ -2176,6 +2331,7 @@ de:
     visit_link_to_respond: "[Rufe das Thema auf](%{base_url}%{url}), um zu antworten."
     visit_link_to_respond_pm: "[Rufe die Nachricht auf](%{base_url}%{url}), um zu antworten."
     posted_by: "Erstellt von %{username} am %{post_date}"
+    pm_participants: "Teilnehmer:"
     invited_group_to_private_message_body: |
       %{username} hat @%{group_name} eingeladen zu einer Nachricht
 
@@ -2296,6 +2452,17 @@ de:
 
         %{context}
 
+        %{respond_instructions}
+    user_mentioned_pm:
+      title: "Benutzer hat Nachricht erwähnt"
+      subject_template: "[%{email_prefix}] [PN] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
         %{respond_instructions}
     user_group_mentioned:
       title: "Gruppe wurde erwähnt"
@@ -2346,7 +2513,7 @@ de:
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
-        %{message}
+          %{message}
     account_suspended:
       title: "Konto gesperrt"
       subject_template: "[%{email_prefix}] Dein Konto wurde gesperrt"
@@ -2376,6 +2543,15 @@ de:
         Wenn du nicht versucht hast, ein Konto für %{email} zu erstellen oder deine E-Mail-Adresse zu ändern, mach’ dir keine Sorgen – du kannst diese Nachricht getrost ignorieren.
 
         Wenn du Fragen hast, [kontaktiere unser freundliches Team](%{base_url}/about).
+    account_second_factor_disabled:
+      title: "Zwei-Faktor-Authentifizierung deaktiviert"
+      subject_template: "[%{email_prefix}] Zwei-Faktor-Authentifizierung deaktiviert"
+      text_body_template: |
+        Zwei-Faktor-Authentifizierung wurde deaktiviert für dein Benutzerkonto bei %{site_name}. Du kannst dich nun allein mit deinem Passwort anmelden; ein zusätzlicher Authentifizierungscode ist nicht länger erforderlich.
+
+        Wenn du nicht selbst die Zwei-Faktor-Authentifzierung deaktiviert hat, hat jemand dein Benutzerkonto kompromittiert.
+
+        Wenn du Fragen hast, [kontatiere unser freundliches Team](%{base_url}/about).
     digest:
       why: "Eine kurze Zusammenfassung von %{site_link} seit deinem letzten Besuch am %{last_seen_at}"
       since_last_visit: "Seit deinem letzten Besuch"
@@ -2391,7 +2567,7 @@ de:
       popular_posts: "Beliebte Beiträge"
       more_new: "Neu für dich"
       subject_template: "[%{email_prefix}] Zusammenfassung"
-      unsubscribe: "Diese Zusammenfassung wird von %{site_link} versendet, wenn wir dich einige Zeit lang nicht gesehen haben. Ändere %{email_preferences_link} oder %{unsubscribe_link}zum Abbestellen."
+      unsubscribe: "Diese Zusammenfassung wird von %{site_link} versendet, wenn wir dich einige Zeit lang nicht gesehen haben. Ändere %{email_preferences_link} oder %{unsubscribe_link} zum Abbestellen."
       your_email_settings: "deine E-Mail-Einstellungen"
       click_here: "klicke hier"
       from: "Zusammenfassung für %{site_name}"
@@ -2406,6 +2582,16 @@ de:
 
         Folge diesem Link, um ein neues Passwort zu wählen:
         %{base_url}/u/password-reset/%{email_token}
+    email_login:
+      title: "Anmeldung über Link"
+      subject_template: "[%{email_prefix}] Anmeldung über Link"
+      text_body_template: |
+        Hier ist dein Link, um dich anzumelden bei [%{site_name}](%{base_url}).
+
+        Wenn du diesen Link nicht angefordert hast, kannst du diese E-Mail einfach ignorieren.
+
+        Klicke auf den folgenden Link, um dich anzumelden:
+        %{base_url}/session/email-login/%{email_token}
     set_password:
       title: "Passwort setzen"
       subject_template: "[%{email_prefix}] Passwort wählen"
@@ -2467,7 +2653,7 @@ de:
 
         Ein Team-Mitglied hat dein Benutzerkonto auf %{site_name} bestätigt.
 
-        Klicke auf den folgenden Link, um dein neues Konto zu bestätigen und zu aktivieren:
+        Du kannst dein neues Konto nun verwenden, indem du dich hier anmeldest:
         %{base_url}/u/activate-account/%{email_token}
 
         Wenn sich der obenstehende Link nicht anklicken lässt, versuche ihn zu kopieren und in die Adresszeile deines Webbrowsers einzufügen.
@@ -2665,7 +2851,7 @@ de:
   tos_topic:
     title: "Nutzungsbedingungen"
     body: |
-      Die folgenden Geschäftsbedingungen sind maßgebend für die gesamte %{company_domain} Webseite und aller Inhalte, Dienstleistungen und Produkte, die auf oder über die Webseite zur Verfügung gestellt werden, einschließlich, aber nicht beschränkt auf die %{company_domain} Foren-Software, die %{company_domain} Support-Foren und den %{company_domain} Hosting-Dienst ("Hosting"), (zusammengefasst: die „Webseite“). Die Webseite gehört und wird betrieben von %{company_full_name} („%{company_name}“). Die Website wird angeboten vorbehaltlich der uneingeschränkten Zustimmung aller hierin enthaltenen Bedingungen und aller anderen sonstigen betrieblichen Regeln, Richtlinien (einschließlich, ohne Einschränkung, der [Datenschutzrichtlinien](/privacy) and [Community-Richtlinien](/faq)) von %{company_domain} und Verfahren, die von Zeit zu Zeit auf dieser Webseite von %{company_name} veröffentlicht werden können (zusammen die „Vereinbarung“).
+      SiteDie folgenden Geschäftsbedingungen sind maßgebend für die gesamte  Webseite und alle Inhalte, Dienstleistungen und Produkte, die auf oder über die Webseite zur Verfügung gestellt werden, einschließlich, aber nicht beschränkt auf die %{company_domain} Foren-Software, die %{company_domain} Support-Foren und den %{company_domain} Hosting-Dienst („Hosting”), (zusammengefasst: die „Webseite“). Die Webseite gehört und wird betrieben von  („“). Die Website wird angeboten vorbehaltlich der uneingeschränkten Zustimmung aller hierin enthaltenen Bedingungen und aller anderen sonstigen betrieblichen Regeln, Richtlinien (einschließlich, ohne Einschränkung, der [Datenschutzrichtlinien](/privacy) and [Community-Richtlinien](/faq)) von %{company_domain} und Verfahren, die von Zeit zu Zeit auf dieser Webseite von %{company_name} veröffentlicht werden können (zusammen die „Vereinbarung“).
 
       Bitte lies diese Vereinbarung sorgfältig durch, bevor du die Webseite verwendest oder darauf zugreifst. Durch die Benutzung oder den Zugriff auf einen Teil der Webseite stimmst du den Geschäftsbedingungen dieser Vereinbarung zu. Wenn du nicht allen Geschäftsbedingungen in dieser Vereinbarung zustimmst, dann darfst du weder auf die Seite zugreifen noch irgendwelche Dienstleistungen in Anspruch nehmen. Wenn diese Geschäftsbedingungen als Angebot von %{company_name} erachtet werden, beschränkt sich die Zustimmung ausdrücklich auf diese Bedingungen. Die Website wird nur für Benutzer angeboten, die mindestens 13 Jahre alt sind.
 
@@ -2679,7 +2865,7 @@ de:
 
       ## [2. Pflichten der Mitwirkenden](#2)
 
-      Wenn du Material, oder Links auf der Webseite veröffentlichst, anderweitig Material über die Webseite zur Verfügung stellst (oder Dritte dazu berrechtigst) (ajegliches Material als „Inhalt“), bist du für dessen Inhalt und den aus diesem Inhalt resultierenden Schaden in vollem Umfang verantwortlich. Dies gilt unabhängig davon, in welcher Form der Inhalt präsentiert wird, einschließlich, aber nicht beschränkt auf Text, Foto, Video, Audio oder Computer-Software. Indem du Inhalt zur Verfügung stellst, versicherst und garantierst du, dass:
+      Wenn du Material, oder Links auf der Webseite veröffentlichst, anderweitig Material über die Webseite zur Verfügung stellst (oder Dritte dazu berechtigst) (jegliches Material als „Inhalt“), bist du für dessen Inhalt und den aus diesem Inhalt resultierenden Schaden in vollem Umfang verantwortlich. Dies gilt unabhängig davon, in welcher Form der Inhalt präsentiert wird, einschließlich, aber nicht beschränkt auf Text, Foto, Video, Audio oder Computer-Software. Indem du Inhalt zur Verfügung stellst, versicherst und garantierst du, dass:
 
       * das Herunterladen, Kopieren und die Benutzung des Inhalts keine proprietären Rechte verletzt, einschließlich, aber nicht beschränkt auf Urheberrecht, Patente, Schutzmarken oder Betriebsgeheimnissen irgendeines Dritten;
       * sofern dein Arbeitgeber die Rechte an geistigem Eigentum hat, die du erstellst, entweder (i) du die Erlaubnis von deinem Arbeitgeber hast, den Inhalt zu einzustellen bzw. verfügbar zu machen, einschließlich, aber nicht beschränkt auf Software, oder (ii) deinem Arbeitgeber dir einen Verzicht auf alle Rechte an dem Inhalt versichert hat;
@@ -2695,7 +2881,7 @@ de:
 
       ## [3. Lizenz von Benutzerinhalten](#3)
 
-      Benutzerbeiträge werden unter eine [Creative Commons Namensnennung - Nicht-kommerziell - Weitergabe unter gleichen Bedingungen 3.0 Unported - Lizenz](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.de) gestellt. Ohne Einschränkung dieser Darstellungen und Garantien, hat %{company_name} das Recht (jedoch nicht die Pflicht) dazu, nach dem Ermessen von %{company_name} (i) jeglichen Inhalt abzulehnen oder zu entfernen der, refuse or remove any content that, nach eigenem Ermessen von %{company_name}, gegen eine Richtlinie von %{company_name} verstößt oder in einer anderen Weise schädlich oder bedenklich ist, oder (ii) einer Person oder juristischen Person den Zugriff auf und die Benutzung der Seite zu beenden oder zu verweigern, gleich aus welchem Grund, nach eigenem Ermessen von %{company_name}. %{company_name} hat keine Verpflichtigung, Beiträge zu erstatten, die vorher bezahlt wurden.
+      Benutzerbeiträge werden unter eine [Creative Commons Namensnennung – Nicht-kommerziell – Weitergabe unter gleichen Bedingungen 3.0 Unported-Lizenz](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.de) gestellt. Ohne Einschränkung dieser Darstellungen und Garantien, hat %{company_name} das Recht (jedoch nicht die Pflicht) dazu, nach dem Ermessen von %{company_name} (i) jeglichen Inhalt abzulehnen oder zu entfernen der, nach eigenem Ermessen von %{company_name}, gegen eine Richtlinie von %{company_name} verstößt oder in einer anderen Weise schädlich oder bedenklich ist, oder (ii) einer Person oder juristischen Person den Zugriff auf und die Benutzung der Seite zu beenden oder zu verweigern, gleich aus welchem Grund, nach eigenem Ermessen von %{company_name}. %{company_name} hat keine Verpflichtung, Beiträge zu erstatten, die vorher bezahlt wurden.
 
 
       <a name="4"></a>
@@ -2718,6 +2904,14 @@ de:
 
       Optionales Hosting und Support-Dienstleistungen können gemäß den Geschäftsbedingungen von %{company_name} für einen solchen Dienstleistung zur Verfügung gestellt werden. Durch die Registrierung eines Kontos für Hosting oder Support-Dienstleistungen, stimmst du diesen Geschäftsbedingungen zu.
 
+      ### HTTPS
+
+      Wir bieten HTTPS-Verschlüsselung als bezahltes Add-on an. Indem du dich anmeldest und eine benutzerdefinierte Domain auf %{company_domain} verwendest, autorisierst du uns, im Namen des Domaininhabers aufzutreten (zum Beispiel durch Anforderung benötigter Zertifikate) ausschließlich für den Zweck, HTTPS auf deiner Seite anzubieten.
+
+      ### Unternehmen
+
+      Hosting-Dienstleistungen für Unternehmen werden angeboten von%{company_name} nach den maßgeblichen Geschäftsbedingungen für jeden dieser Dienste, die in einem Kunden-spezifischen Vertrag festgelegt sind. Indem du dich für ein Unternehmen-Hosting-Konto registrierst, akzeptierst du, diese Geschäftsbedigungen zu befolgen.
+
       <a name="6"></a>
 
       ## [6. Pflichten der Website-Besucher](#6)
@@ -2798,7 +2992,7 @@ de:
 
       Diese Vereinbarung stellt die gesamte Vereinbarung zwischen %{company_name} und dir bezüglich des Gegenstands dieser Geschäftsbedingungen dar, und sie kann nur durch eine schriftliche, durch einen befugten Vertreter von %{company_name} unterzeichnet oder durch die Veröffentlichung einer überarbeiteten Version durch %{company_name} geändert werden. Vorbehaltlich eventuell anwendbarer anders lautender gesetzlicher Bestimmungen, unterliegt diese Vereinbarung, der Zugang zu und die Benutzung der Website den Gesetzen des Staates Kalifornien, USA unter Ausschluss des Kollisionsrechts. Gerichtsstand für alle Streitigkeiten aus oder im Zusammenhang mit derselben ist der Staat und die Bundesgerichte in San Francisco County, Kalifornien. Mit Ausnahme der Ansprüche auf jede Unterlassung oder jeden Rechtsbehelf oder Ansprüche hinsichtlich der Rechte an geistigem Eigentum (die vor ein ordentliches Gericht ohne die Hinterlegung einer Einlage gebracht werden können) wird jeder Rechtsstreit, der gemäß dieser Vereinbarung entsteht, endgültig durch umfassende Schiedsregelungen des Judicial Arbitration and Mediation Service, Inc. („JAMS“) von drei Schlichtern, die gemäß solcher Regeln ernannt werden, beigelegt werden. Das Schiedsverfahren findet in San Francisco, Kalifornien in englischer Sprache statt, und die Schiedsentscheidung kann vor jedem Gericht durchgesetzt werden. Die obsiegende Partei im Rahmen einer Verhandlung oder eines Verfahrens zur Durchsetzung dieser Vereinbarung ist berechtigt, Unkosten und Anwaltsgebühren in Rechnung zu stellen. Wenn ein Teil dieser Vereinbarung für ungültig oder nicht einklagbar erachtet wird, wird dieser Teil so ausgelegt, dass die ursprüngliche Absicht der Parteien widergespiegelt wird, und die restlichen Abschnitte vollständig gültig bleiben. Eine Verzichtserklärung einer der Parteien hinsichtlich einer Bedingung oder Kondition dieser Vereinbarung oder ein Verstoß gegen eine solche Bedingung in einer anderen Instanz stellt keinen Verzicht auf eine solche Bestimmung oder eine nachfolgende Nichterfüllung einer solchen Bestimmung dar. Du kannst deine Rechte gemäß dieser Vereinbarung auf eine Partei übertragen, die sich mit folgenden Benutzungsbedingungen einverstanden erklärt und bestätigt, dass sie sich an die Geschäftsbedingungen halten wird; %{company_name} kann seine Rechte gemäß dieser Vereinbarung bedingungslos übertragen. Diese Vereinbarung ist bindend und wird zugunsten der Parteien und ihrer entsprechenden Erben und Rechtsnachfolger wirksam.
 
-      Dieses Dokument ist als CC-BY-SA lizensiert. Es wurde zuletzt aktualisiert am am 31. Mai 2013.
+      Dieses Dokument ist als CC-BY-SA lizensiert. Es wurde zuletzt aktualisiert am 1. Januar 2018.
 
       Basiert ursprünglich auf den [WordPress-Geschäftsbedingungen](https://de.wordpress.com/tos/).
   privacy_topic:
@@ -2808,9 +3002,9 @@ de:
 
       ## [Welche Informationen sammeln wir?](#collect)
 
-      Wir sammeln Informationen von dir, wenn du dich auf unserer Seite registrierst, und erfassten Daten, wenn du dich hier am Forum durch Lesen, Schreiben und Bewertung der geteilten Inhalte beteiligst.
+      Wir sammeln Informationen von dir, wenn du dich auf unserer Seite registrierst, und erfassen Daten, wenn du dich hier am Forum durch Lesen, Schreiben und Bewertung der geteilten Inhalte beteiligst.
 
-      Wenn du dich auf unserer Seite registrierst, wirst du möglicherweise gebeten, deinen Namen und deine E-Mail-Adresse einzugeben. Du kannst unsere Seite jedoch möglicherweise auch ohne Registrierung besuchen. Deine E-Mail-Adresse wird durch eine E-Mail verifiziert, die einen eindeutigen Link enthält. Wenn der Link aufgerufen wird, wissen wir, dass du die Kontrolle über die E-Mail-Adresse hast.
+      Wenn du dich auf unserer Seite registrierst, wirst du möglicherweise gebeten, deinen Namen und deine E-Mail-Adresse einzugeben. Du kannst unsere Seite jedoch auch ohne Registrierung besuchen. Deine E-Mail-Adresse wird durch eine E-Mail verifiziert, die einen eindeutigen Link enthält. Wenn der Link aufgerufen wird, wissen wir, dass du die Kontrolle über die E-Mail-Adresse hast.
 
       Wenn du registrierst bist und etwas schreibst, erfassen wir die IP-Adresse, von der der Beitrag stammt. Wir behalten möglicherweise Serverprotokolle, die die IP-Adresse jeder Anfrage an unseren Server enthält.
 
@@ -2820,7 +3014,7 @@ de:
 
       Jede der Informationen, die wir von dir sammeln, kann auf eine der folgenden Arten genutzt werden:
 
-      *   Um deine Erfahrung zu personalisieren &mdash; deine Information hilft uns dabei, besser auf deine individuellen Bedürfnise einzugehen.
+      *   Um deine Erfahrung zu personalisieren &mdash; deine Information hilft uns dabei, besser auf deine individuellen Bedürfnisse einzugehen.
       *   Um unsere Seite zu verbessern &mdash; wir streben kontinuierlich dazu, das Angebot unserer Seite auf Grundlage der Informationen und des Feedbacks zu verbessern, das wir von dir erhalten.
       *   Um unseren Kundendienst zu verbessern &mdash; deine Information hilft uns, effizienter auf deine Anfragen an den Kundendienst und deine Hilfsbedürfnisse einzugehen.
       *   Um wiederkehrende E-Mails zu senden &mdash; Die E-Mail-Adresse, die du angibst, kann genutzt werden, um dir Informationen und Benachrichtigungen zu senden, die du zu Änderungen an Themen oder in Bezug auf deinen Benutzernamen angefordert hast, um dir auf Nachfragen, Anfragen oder Fragen zu antworten.
@@ -2833,18 +3027,18 @@ de:
 
       <a name="data-retention"></a>
 
-      ## [Was sehen eure Bestimmungen zur Datenaufbewahrung aus?](#data-retention)
+      ## [Wie sehen unsere Bestimmungen zur Datenaufbewahrung aus?](#data-retention)
 
       Wir bemühen uns nach bestem Wissen und Gewissen:
 
-      *   Serverprotokolle, die IP-Adressen aller Anfragen an unseren Server erhalten, nicht länger als 90 Tage zu speichern.
+      *   Serverprotokolle, die IP-Adressen aller Anfragen an unseren Server enthalten, nicht länger als 90 Tage zu speichern.
       *   IP-Adressen, die mit registrierten Benutzern und ihren Beiträgen verknüpft sind, nicht länger als 5 Jahre zu speichern.
 
       <a name="cookies"></a>
 
       ## [Verwenden wir Cookies?](#cookies)
 
-      Ja. Cookies sind kleine Dateien, die eine Seite bzw. ihr Dienstleister über einen Browser auf die Festplatte deines Computers überträgst (sofern du zustimmst). Diese Cookies erlauben es der Seite, deinen Browser wiederzuerkennen und, sofern du ein registriertes Konto hast, diesen deinem registrierten Konto zuzuordnen.
+      Ja. Cookies sind kleine Dateien, die eine Seite bzw. ihr Dienstleister über einen Browser auf die Festplatte deines Computers überträgt (sofern du zustimmst). Diese Cookies erlauben es der Seite, deinen Browser wiederzuerkennen und, sofern du ein registriertes Konto hast, diesen deinem registrierten Konto zuzuordnen.
 
       Wir verwenden Cookies, um deine Einstellungen für deine nächsten Besuche zu verstehen und zu speichern und um aggregierte Daten über unseren Internetverkehr und Interaktionen auf der Seite zu berechnen, damit wir in der Zukunft eine bessere Seitenerfahrung und bessere Werkzeuge anbieten können. Wir beauftragen möglicherweise Drittanbieter, die uns dabei unterstützen, unsere Seitenbesucher besser zu verstehen. Diese Dienstleister sind nicht befugt, unsere gesammelten Informationen anders zu verwenden als zur Unterstützung und Verbesserung unseres Geschäfts.
 
@@ -2852,39 +3046,39 @@ de:
 
       ## [Geben wir irgendwelche Informationen an Dritte weiter?](#disclose)
 
-      Weder verkaufen oder handeln wir deine personenbezogenen Daten noch übermitteln wir diese an Dritte. Dies schließt nicht Drittanbieter ein, die uns beim Betrieb unserer Seite, bei der Durchführung unseres Geschäfts oder dir helfen, solange diese Parteien einwilligen, diese Informationen vertraulich zu behandeln. We geben deine Informationen möglicherweise frei, wenn wir glauben, dass die Freigabe zweckmäßig ist, um das Gesetz einzuhalten, unsere Seitenrichtlinien durchzusetzen oder unsere oder fremde Rechte, Werte oder Sicherheit zu schützen. Nicht-personenbezogene Daten werden möglcherweise anderen Parteien für Marketing, Werbung und andere Zwecke zugänglich gemacht.
+      Weder verkaufen oder handeln wir deine personenbezogenen Daten noch übermitteln wir diese an Dritte. Dies schließt nicht Drittanbieter ein, die uns beim Betrieb unserer Seite, bei der Durchführung unseres Geschäfts oder dir helfen, solange diese Parteien einwilligen, diese Informationen vertraulich zu behandeln. Wir geben deine Informationen möglicherweise frei, wenn wir glauben, dass die Freigabe zweckmäßig ist, um das Gesetz einzuhalten, unsere Nutzungsbedingungen durchzusetzen oder unsere oder fremde Rechte, Werte oder Sicherheit zu schützen. Nicht-personenbezogene Daten werden möglicherweise anderen Parteien für Marketing, Werbung und andere Zwecke zugänglich gemacht.
 
       <a name="third-party"></a>
 
-      ## [Linsk auf fremde Webseiten](#third-party)
+      ## [Links auf fremde Webseiten](#third-party)
 
-      Gelegentlich können wir Produkte oder Dienste von Dritten nach unserer Wahl auf unserer Seite einbinden oder darauf bewerben. Diese Drittanbieter haben eigene und unabhängige Datenschutzbestimmungen. Wir übernehmen daher keine Verantwortung oder Haftung für den Inhalt und die Aktivitäten dieser verknüpften Seite. Dennoch sind wir bemüht, die Integrität unserer Seite zu schützen und freuen uns über jedes Feedback zu diesen Seiten.
+      Gelegentlich können wir Produkte oder Dienste von Dritten nach unserer Wahl auf unserer Seite einbinden oder darauf bewerben. Diese Drittanbieter haben eigene und unabhängige Datenschutzrichtlinien. Wir übernehmen daher keine Verantwortung oder Haftung für den Inhalt und die Aktivitäten dieser verknüpften Seite. Dennoch sind wir bemüht, die Integrität unserer Seite zu schützen und freuen uns über jedes Feedback zu diesen Seiten.
 
       <a name="coppa"></a>
 
       ## [Gesetz zum Schutz der Privatsphäre von Kindern im Internet](#coppa)
 
-      Unsere Seite, Produkte und Dienstleistungen richten sich alle an Menschen, die mindestens 13 Jahre oder älter sind. Wenn sich dieser Server in der USA befindet und du unter 13 Jahre alt bist, so benutze diese Seite gemäß der Anforderungen des COPPA-Gesetzes ([Children's Online Privacy Protection Act](https://de.wikipedia.org/wiki/Children%E2%80%99s_Online_Privacy_Protection_Act)) nicht.
+      Unsere Seite, Produkte und Dienstleistungen richten sich alle an Menschen, die mindestens 13 Jahre oder älter sind. Wenn sich dieser Server in der USA befindet und du unter 13 Jahre alt bist, so benutze diese Seite gemäß der Anforderungen des COPPA-Gesetzes ([Children's Online Privacy Protection Act](https://de.wikipedia.org/wiki/Children%27ss_Online_Privacy_Protection_Act)) nicht.
 
       <a name="online"></a>
 
-      ## [Online-Datenschutzbestimmungen](#online)
+      ## [Online-Datenschutzrichtlinie](#online)
 
-      Diese Online-Datenschutzbestimmungen gilt nur für Informationen, die durch unsere Seite gesammelt werden, und nicht für offline erfasste Informationen.
+      Diese Online-Datenschutzrichtlinie gilt nur für Informationen, die durch unsere Seite gesammelt werden, und nicht für offline erfasste Informationen.
 
       <a name="consent"></a>
 
       ## [Deine Zustimmung](#consent)
 
-      Indem du unsere Seite benutzt, stimmst du den Datenschutzschutzbestimmungen unserer Webseite zu.
+      Indem du unsere Seite benutzt, stimmst du der Datenschutzrichtlinie unserer Webseite zu.
 
       <a name="changes"></a>
 
-      ## [Änderungen unserer Datenschutzbestimmungen](#changes)
+      ## [Änderungen unserer Datenschutzrichtlinie](#changes)
 
-      Wenn wir uns dazu entscheiden, unsere Datenschutzbestimmungen zu ändern, werden wir diese Änderungen auf dieser Seite veröffentlichen.
+      Wenn wir uns dazu entscheiden, unsere Datenschutzrichtlinie zu ändern, werden wir diese Änderungen auf dieser Seite veröffentlichen.
 
-      Dieses Dokument ist als CC-BY-SA lizensiert. Es wurde zuletzt aktualisiert am am 31. Mai 2013.
+      Dieses Dokument ist als CC-BY-SA lizenziert. Es wurde zuletzt aktualisiert am 31. Mai 2013.
   badges:
     editor:
       name: Bearbeiter
@@ -2893,22 +3087,22 @@ de:
         Dieses Abzeichen erhältst du, wenn du das erste Mal einen deiner Beiträge bearbeitest. Auch wenn du deine Beiträge nicht unbegrenzt ändern kannst wirst, sind Bearbeitungen immer eine gute Idee – du kannst deine Beiträge verbessern, kleinere Fehler korrigieren oder irgendetwas ergänzen, was du bei deinem ursprünglichen Beitrag vergessen hast. Bearbeite, um deine Beiträge noch besser zu machen!
     basic_user:
       name: Anwärter
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Ermöglicht</a> das Nutzen aller wesentlichen Community-Funktionen
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">Ermöglicht</a> das Nutzen aller wesentlichen Community-Funktionen"
       long_description: |
         Das Abzeichen wird verliehen, wenn du Vertrauensstufe 1 erreichst. Danke, dass du eine Weile dageblieben bist und ein paar Themen gelesen hast um zu lernen, worum es in unserer Community geht. Für dich gelten die Einschränkungen für neue Nutzer nicht mehr und du hast nun Zugriff auf alle wichtigen Funktionen, beispielsweise persönliche Nachrichten, die Melden-Funktion, das Bearbeiten von Wiki-Beiträgen und die Fähigkeit, mehrere Bilder und Links in Beiträgen zu verwenden.
     member:
       name: Mitglied
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Ermöglicht</a> das Versenden von Einladungen, Gruppen-Nachrichten, mehr Likes
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">Ermöglicht</a> das Versenden von Einladungen, Gruppen-Nachrichten, mehr Likes"
       long_description: |
         Das Abzeichen wird verliehen, wenn du Vertrauensstufe 2 erreichst. Danke, dass du einige Wochen mitgemacht hast, um unserer Community richtig beizutreten. Du kannst nun von deiner Benutzerseite und einzelnen Themen-Seiten aus Einladungen versenden, Gruppennachrichten erstellen und ein paar mehr Likes pro Tag vergeben.
     regular:
       name: Stammgast
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Ermöglicht</a> verschieben und umbenennen von Themen, veröffentlichen <a href="http://de.wikipedia.org/wiki/Nofollow">verfolgbarer Links</a>, Aktivierung der Wiki-Funktion, mehr Likes
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">Ermöglicht</a> verschieben und umbenennen von Themen, veröffentlichen <a href=\"http://de.wikipedia.org/wiki/Nofollow\">verfolgbarer Links</a>, Aktivierung der Wiki-Funktion, mehr Likes"
       long_description: |
         Das Abzeichen wird verliehen, wenn du Vertrauensstufe 3 erreichst. Danke, dass du in unserer Community über mehrere Monate ein Stammgast gewesen bist. Du bist nun einer unserer aktivsten Leser und ein zuverlässiges Mitglied, das diese Community großartig macht. Du kannst nun Themen neu kategorisieren und umbenennen, mächtigere Spam-Meldungen nutzen, eine private Lounge nutzen und kannst viel mehr Likes pro Tag erhalten.
     leader:
       name: Anführer
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Ermöglicht</a> bearbeiten aller Beiträge, anheften, schließen, archivieren, aufteilen und zusammenfügen von Themen, mehr Likes
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">Ermöglicht</a> bearbeiten aller Beiträge, anheften, schließen, archivieren, aufteilen und zusammenfügen von Themen, mehr Likes"
       long_description: |
         Das Abzeichen wird verliehen, wenn du Vertrauensstufe 4 erreichst. Du bist ein vom Team ausgezeichneter Anführer und hast durch deine Aktivität und Worte ein positives Beispiel für die übrige Community abgegeben. Du kannst alle Beiträge bearbeiten, Moderator-Aktionen wie das Anheften, Schließen, Unsichtbar machen, Archivieren, Teilen und Zusammenführen von Themen durchführen und viel mehr Likes pro Tag vergeben.
     welcome:
@@ -2918,7 +3112,7 @@ de:
         Das Abzeichen wird verliehen, wenn du den ersten Like auf einen Beitrag erhältst. Glückwunsch, du hast einen Beitrag geschrieben, den deine Mitbenutzer interessant, cool oder nützlich finden!
     autobiographer:
       name: Autobiograf
-      description: Hat <a href="%{base_uri}/my/preferences/profile">Benutzerprofil</a> ausgefüllt
+      description: "Hat <a href=\"%{base_uri}/my/preferences/profile\">Benutzerprofil</a> ausgefüllt"
       long_description: |
         Dieses Abzeichen erhältst du für das Ausfüllen von deinem <a href="%{base_uri}/my/preferences/profile">Benutzerprofil</a> und für das Hochladen eines Profilbildes erhalten. Die Community ein bisschen mehr wissen zu lassen über dich und darüber, was du gerne tust, macht die gesamte Community besser. Mach mit!
     anniversary:
@@ -3013,7 +3207,7 @@ de:
         Das Abzeichen wird verliehen, wenn du das erste Mal einen Beitrag in deiner Antwort zitierst. Das Zitieren relevanter Abschnitte früherer Beiträge in deiner Antwort hilft dabei, Diskussionen verbunden zu halten und beim Thema zu bleiben. Der einfachste Weg zu zitieren besteht darin, den Abschnitt eines Beitrags zu markieren und dann die Antwort-Schaltfläche zu drücken. Zitiere weiter großzügig!
     read_guidelines:
       name: Richtlinien gelesen
-      description: Hat die <a href="%{base_uri}/guidelines">Community-Richtlinien</a> gelesen
+      description: "Hat die <a href=\"%{base_uri}/guidelines\">Community-Richtlinien</a> gelesen"
       long_description: |
         Dieses Abzeichen wird verliehen für das <a href="%{base_uri}/guidelines">Lesen der Communtiy-Richtlinien</a>. Ein Befolgen und Teilen dieser einfachen Richtlinien hilft uns dabei, eine sichere, lustige und nachhaltige Gemeinschaft für alle zu schaffen. Denke immer daran, dass dort ein anderer Mensch, genauso wie du, auf der anderen Seite des Bildschirms ist. Sei nett!
     reader:
@@ -3023,17 +3217,17 @@ de:
         Das Abzeichen wird verliehen, wenn du das erste Mal ein langes Thema mit mehr als 100 Antworten liest. Einen Dialog genau zu lesen, hilft dir dabei, der Diskussion zu folgen, die verschiedenen Standpunkte zu verstehen und führt zu interessanteren Dialogen. Je mehr du liest, desto besser wird der Dialog. Wie wir zu pflegen sagen: Lesen ist grundlegend! :slight_smile:
     popular_link:
       name: Beliebter Link
-      description: Hat einen Link geteilt, welcher mindestens 50 Klicks erhalten hat
+      description: "Hat einen Link geteilt, welcher mindestens 50 Klicks erhalten hat"
       long_description: |
         Das Abzeichen wird verliehen, wenn ein von dir geteilter Link 50 Klicks erhält. Danke, dass du einen nützlichen Link geteilt hast, der dem Dialog einen interessanten Kontext geliefert hat!
     hot_link:
       name: Angesagter Link
-      description: Hat einen Link geteilt, welcher mindestens 300 Klicks erhalten hat
+      description: "Hat einen Link geteilt, welcher mindestens 300 Klicks erhalten hat"
       long_description: |
         Das Abzeichen wird verliehen, wenn ein von dir geteilter Link 300 Klicks erhält. Danke, dass du einen faszinierenden Link geteilt hast, der den Dialog vorwärts gebracht und die Diskussion erleuchtet hat!
     famous_link:
       name: Berühmter Link
-      description: Hat einen Link geteilt, welcher mindestens 1000 Klicks erhalten hat
+      description: "Hat einen Link geteilt, welcher mindestens 1000 Klicks erhalten hat"
       long_description: |
         Das Abzeichen wird verliehen, wenn ein von dir geteilter Link 1000 Klicks erhält. Wow! Du hast einen Link geteilt, der den Dialog signifikant verbessert hat, indem es ein wesentliches Detail, Kontext und Information geliefert hat. Großartige Arbeit!
     appreciated:
@@ -3085,15 +3279,15 @@ de:
       name: Erstes Emoji
       description: Hat ein Emoji in einem Beitrag verwendet
       long_description: |
-        Das Abzeichen wird verliehen, wenn du das erste Mal einen Emoji zu deinem Beitrag hinzufügst. :thumbsup: Emojis lassen dich Emotionen in deinen Beiträgen vermitteln, von Glück :smiley: zu Trauer :anguished: zu Wut :angry: und allem dazwischen :sunglasses:. Gib einfach einen : (Doppelpunkt) ein oder drücke die Emoji-Schaltfläche im Editor, um aus Hunderten Auswahlmöglichkeiten zu wählen :ok_hand:
+        Das Abzeichen wird verliehen, wenn du das erste Mal einen Emoji zu deinem Beitrag hinzufügst. :thumbsup: Emojis lassen dich Emotionen in deinen Beiträgen vermitteln, von Glück :smiley: zu Trauer :anguished: zu Wut :angry: und allem dazwischen :sunglasses: . Gib einfach einen : (Doppelpunkt) ein oder drücke die Emoji-Schaltfläche im Editor, um aus Hunderten Auswahlmöglichkeiten zu wählen :ok_hand:
     first_mention:
       name: Erste Erwähnung
       description: Hat einen Benutzer in einem Beitrag erwähnt
-      long_description: Das Abzeichen wird verliehen, wenn du das erste Mal den @Benutzernamen von jemandem in deinem Beitrag erwähnst. Jede Erwähnung erzeugt eine Benachrichtigung an die Person, sodass sie über deinen Beitrag informiert wird. Gib einfach ein @ (At-Zeichen) ein und erwähne einen beliebigen Benutzer oder, sofern erlaubt, eine Gruppe – es ist ein komfortabler Weg, die Aufmerksamkeit von jemandem auf etwas zu lenken.
+      long_description: "Das Abzeichen wird verliehen, wenn du das erste Mal den @Benutzernamen von jemandem in deinem Beitrag erwähnst. Jede Erwähnung erzeugt eine Benachrichtigung an die Person, sodass sie über deinen Beitrag informiert wird. Gib einfach ein @ (At-Zeichen) ein und erwähne einen beliebigen Benutzer oder, sofern erlaubt, eine Gruppe – es ist ein komfortabler Weg, die Aufmerksamkeit von jemandem auf etwas zu lenken."
     first_onebox:
       name: Erste Onebox
-      description: Hat einen Link geteilt, der in eine Onebox umgewandelt wurde
-      long_description: Das Abzeichen wird verliehen, wenn du das erste Mal einen Link auf einer eigenen Zeile schreibst, der dann automatisch in eine Onebox umgewandelt wurde, mit einer kurzen Zusammenfassung des Links, einem Titel und einem Bild (falls verfügbar).
+      description: "Hat einen Link geteilt, der in eine Onebox umgewandelt wurde"
+      long_description: "Das Abzeichen wird verliehen, wenn du das erste Mal einen Link auf einer eigenen Zeile schreibst, der dann automatisch in eine Onebox umgewandelt wurde, mit einer kurzen Zusammenfassung des Links, einem Titel und einem Bild (falls verfügbar)."
     first_reply_by_email:
       name: Erste Antwort per E-Mail
       description: Hat auf einen Beitrag per E-Mail geantwortet
@@ -3107,7 +3301,7 @@ de:
     enthusiast:
       name: Enthusiast
       description: 10-Tages-Besuch
-      long_description: Dieses Abzeichen wird verliehen für Besuche an zehn aufeinander folgenden Tagen. Danke, dass du über eine Woche bei uns geblieben bist!
+      long_description: "Dieses Abzeichen wird verliehen für Besuche an zehn aufeinander folgenden Tagen. Danke, dass du über eine Woche bei uns geblieben bist!"
     aficionado:
       name: Begeisterter Anhänger
       description: 100-Tages-Besuch
@@ -3115,11 +3309,13 @@ de:
     devotee:
       name: Verehrer
       description: 365-Tages-Besuch
-      long_description: Dieses Abzeichen wird verliehen für Besuche an 365 aufeinander folgenden Tagen. Wow, ein ganzes Jahr!
+      long_description: "Dieses Abzeichen wird verliehen für Besuche an 365 aufeinander folgenden Tagen. Wow, ein ganzes Jahr!"
     badge_title_metadata: "%{display_name} Abzeichen auf %{site_title}"
   admin_login:
     success: "E-Mail gesendet"
-    error: "Fehler!"
+    errors:
+      unknown_email_address: "Unbekannte E-Mail-Adresse."
+      invalid_token: "Ungültiges Token."
     email_input: "Administrator-E-Mail"
     submit_button: "E-Mail senden"
   performance_report:
@@ -3129,6 +3325,7 @@ de:
     title: "Schlagwörter"
     staff_tag_disallowed: "Das Schlagwort \"%{tag}\" darf nur vom Team verwendet werden."
     staff_tag_remove_disallowed: "Das Schlagwort \"%{tag}\" darf nur vom Team entfernt werden."
+    minimum_required_tags: "Du musst mindestens %{count} Schlagwörter auswählen."
   rss_by_tag: "Themen mit dem Schlagwort %{tag}"
   finish_installation:
     congratulations: "Glückwunsch, du hast Discourse installiert!"
@@ -3266,6 +3463,15 @@ de:
           <p>Viel Spaß, und viel Glück <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>beim Aufbauen deiner neuen Community!</a></p>
   search_logs:
     graph_title: "Anzahl Suchen"
-  activemodel:
-    errors:
-      <<: *errors
+  joined: "Beigetreten"
+  discourse_push_notifications:
+    popup:
+      mentioned: '%{username} hat dich erwähnt in "%{topic}" - %{site_title}'
+      group_mentioned: '%{username} hat dich erwähnt in "%{topic}" - %{site_title}'
+      quoted: '%{username} hat dich zitiert in "%{topic}" - %{site_title}'
+      replied: '%{username} hat dir geantwortet in "%{topic}" - %{site_title}'
+      posted: '%{username} hat geschrieben in "%{topic}" - %{site_title}'
+      private_message: '%{username} hat dir eine Nachricht geschickt in "%{topic}" - %{site_title}'
+      linked: '%{username} hat deinen Beitrag verlinkt in "%{topic}" - %{site_title}'
+      confirm_title: 'Benachrichtigungen aktiviert – %{site_title}'
+      confirm_body: 'Erfolgreich! Benachrichtigungen wurden aktiviert.'
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index a21b06301f5..0f5432017ed 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -17,12 +17,12 @@ el:
       date_only: "%B %-d, %Y"
       long: "%B %-d, %Y, %l:%M%P"
   date:
-    month_names: [null, Ιανουάριος, Φεβρουάριος, Μάρτιος, Απρίλιος, Μάϊος, Ιούνιος, Ιούλιος, Αύγουστος, Σεπτέμβριος, Οκτώβριος, Νοέμβριος, Δεκέμβριος]
+    month_names: [~, Ιανουάριος, Φεβρουάριος, Μάρτιος, Απρίλιος, Μάϊος, Ιούνιος, Ιούλιος, Αύγουστος, Σεπτέμβριος, Οκτώβριος, Νοέμβριος, Δεκέμβριος]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "πμ"
     pm: "μμ"
-    <<: *datetime_formats
   title: "Discourse"
   topics: "Νήματα"
   posts: "αναρτήσεις"
@@ -72,19 +72,18 @@ el:
       present: πρέπει να είναι άδειο
       confirmation: "δεν συμφωνεί με το %{attribute}"
       empty: δεν μπορεί να είναι άδειο
-      equal_to: πρέπει να είναι ίσο με το %{count}
+      equal_to: "πρέπει να είναι ίσο με το %{count}"
       even: θα πρέπει να είναι ίσα
       exclusion: είναι δεσμευμένο
-      greater_than: πρέπει να είναι μεγαλύτερο από %{count}
-      greater_than_or_equal_to: πρέπει να είναι μεγαλύτερο ή ίσο με %{count}
+      greater_than: "πρέπει να είναι μεγαλύτερο από %{count}"
+      greater_than_or_equal_to: "πρέπει να είναι μεγαλύτερο ή ίσο με %{count}"
       has_already_been_used: "έχει ήδη χρησιμοποιηθεί"
       inclusion: δεν περιλαμβάνεται στην λίστα
       invalid: δεν είναι έγκυρο
       is_invalid: "φαίνεται ασαφές, είναι μια ολοκληρωμένη πρόταση;"
       contains_censored_words: "περιέχει τις ακόλουθες λογοκριμένες λέξεις: %{censored_words}"
-      matches_censored_pattern: "περιέχει τις ακόλουθες λέξεις που αντιστιχοίζονται με τα λογοκριθέντα regexp: %{censored_words}"
-      less_than: πρέπει να είναι λιγότερο από %{count}
-      less_than_or_equal_to: πρέπει να είναι λιγότερο ή ίσο με %{count}
+      less_than: "πρέπει να είναι λιγότερο από %{count}"
+      less_than_or_equal_to: "πρέπει να είναι λιγότερο ή ίσο με %{count}"
       not_a_number: δεν είναι αριθμός
       not_an_integer: πρέπει να είναι ακέραιος αριθμός
       odd: πρέπει να είναι μονός αριθμός
@@ -116,6 +115,9 @@ el:
       max_username_length_range: "Δεν μπορείς να θέσεις το μέγιστο πιο κάτω από το ελάχιστο."
       default_categories_already_selected: "Δεν μπορείς να επιλέξεις μια κατηγορία που χρησιμοποιείται σε άλλη λίστα."
       s3_upload_bucket_is_required: "Δεν μπορείτε να ενεργοποιήσετε μεταφορτώσεις στο S3 εάν δεν παρέχετε το 's3_upload_bucket'."
+  activemodel:
+    errors:
+      <<: *errors
   invite:
     not_found: "Η πρόσκληση δεν είναι έγκυρη. Παρακαλώ επικοινωνήστε με τον διαχειριστή της ιστοσελίδας."
     user_exists: "Δεν υπάρχει λόγος να προσκαλέσετε τον/την <b>%{email}</b>, έχει ήδη <a href='/u/%{username}/summary'>λογαριασμό χρήστη!</a>"
@@ -137,8 +139,8 @@ el:
   reading_time: "Χρόνος ανάγνωσης"
   likes: "Μου Αρέσει"
   too_many_replies:
-    one: "Λυπούμαστε, αλλά οι νέοι χρήστες έχουν προσωρινό περιορισμό 1 απάντησης ανά νήμα."
-    other: "Λυπούμαστε, αλλά οι νέοι χρήστες έχουν προσωρινό περιορισμό %{count} απαντήσεων ανά νήμα."
+    one: Λυπούμαστε, αλλά οι νέοι χρήστες έχουν προσωρινό περιορισμό 1 απάντησης ανά νήμα.
+    other: Λυπούμαστε, αλλά οι νέοι χρήστες έχουν προσωρινό περιορισμό %{count} απαντήσεων ανά νήμα.
   embed:
     start_discussion: "Έναρξη Συζήτησης"
     continue: "Συνέχεια Συζήτησης"
@@ -148,36 +150,35 @@ el:
     no_hosts: "Δεν υπάρχουν ορισμένοι hosts για ενσωμάτωση."
     configure: "Ρύθμιση Ενσωμάτωσης"
     more_replies:
-      one: "μια ακόμη απάντηση"
-      other: "%{count} ακόμη απαντήσεις"
+      one: μια ακόμη απάντηση
+      other: '%{count} ακόμη απαντήσεις'
     loading: "Φόρτωση Συζήτησης..."
     permalink: "Μόνιμος σύνδεσμος"
     imported_from: "Αυτό είναι ένα συνοδό θέμα συζητησης για την αρχική ανάρτηση στο %{link}"
     in_reply_to: "▶ %{username}"
     replies:
-      one: "1 απάντηση"
-      other: "%{count} απαντήσεις"
+      one: 1 απάντηση
+      other: '%{count} απαντήσεις'
   no_mentions_allowed: "Λυπούμαστε, δεν μπορείς να αναφέρεις άλλους χρήστες."
   too_many_mentions:
-    one: "Λυπούμαστε, μπορείς να αναφέρεις μόνο έναν χρήστη σε κάθε ανάρτηση."
-    other: "Λυπούμαστε, μπορείς να αναφέρεις μόνο %{count} χρήστες σε κάθε ανάρτηση."
+    one: Λυπούμαστε, μπορείς να αναφέρεις μόνο έναν χρήστη σε κάθε ανάρτηση.
+    other: Λυπούμαστε, μπορείς να αναφέρεις μόνο %{count} χρήστες σε κάθε ανάρτηση.
   no_mentions_allowed_newuser: "Λυπούμαστε, οι νέοι χρήστες δεν μπορούν να αναφέρουν άλλους χρήστες."
   too_many_mentions_newuser:
-    one: "Λυπούμαστε, οι νέοι χρήστες μπορούν να αναφέρουν μόνο έναν χρήστη σε κάθε ανάρτηση."
-    other: "Λυπούμαστε, οι νέοι χρήστες μπορούν να αναφέρουν μόνο %{count} χρήστες σε κάθε ανάρτηση."
+    one: Λυπούμαστε, οι νέοι χρήστες μπορούν να αναφέρουν μόνο έναν χρήστη σε κάθε ανάρτηση.
+    other: Λυπούμαστε, οι νέοι χρήστες μπορούν να αναφέρουν μόνο %{count} χρήστες σε κάθε ανάρτηση.
   no_images_allowed: "Λυπούμαστε, οι νέοι χρήστες δεν μπορούν να βάλουν εικόνες στις αναρτήσεις."
   too_many_images:
-    one: "Λυπούμαστε, οι νέοι χρήστες μπορούν να βάλουν μόνο μία εικόνα σε κάθε ανάρτηση."
-    other: "Λυπούμαστε, οι νέοι χρήστες μπορούν να βάλουν μόνο %{count} εικόνες σε κάθε ανάρτηση."
+    one: Λυπούμαστε, οι νέοι χρήστες μπορούν να βάλουν μόνο μία εικόνα σε κάθε ανάρτηση.
+    other: Λυπούμαστε, οι νέοι χρήστες μπορούν να βάλουν μόνο %{count} εικόνες σε κάθε ανάρτηση.
   no_attachments_allowed: "Λυπούμαστε, οι νέοι χρήστες δεν μπορούν να βάλουν συνημμένα αρχεία στις αναρτήσεις."
   too_many_attachments:
-    one: "Λυπούμαστε, οι νέοι χρήστες μπορούν να βάλουν μόνο ένα συνημμένο αρχείο σε κάθε ανάρτηση."
-    other: "Λυπούμαστε, οι νέοι χρήστες μπορούν να βάλουν μόνο %{count} συνημμένα αρχεία σε κάθε ανάρτηση."
+    one: Λυπούμαστε, οι νέοι χρήστες μπορούν να βάλουν μόνο ένα συνημμένο αρχείο σε κάθε ανάρτηση.
+    other: Λυπούμαστε, οι νέοι χρήστες μπορούν να βάλουν μόνο %{count} συνημμένα αρχεία σε κάθε ανάρτηση.
   no_links_allowed: "Λυπούμαστε, οι νεοι χρήστες δεν μπορούν να βάλουν συνδέσμους στις αναρτήσεις."
   too_many_links:
-    one: "Λυπούμαστε, οι νέοι χρήστες μπορούν να βάλουν μόνο έναν σύνδεσμο σε κάθε ανάρτηση."
-    other: "Λυπούμαστε, οι νέοι χρήστες μπορούν να βάλουν μόνο %{count} συνδέσμους σε κάθε ανάρτηση."
-  contains_blocked_words: "Η ανάρτησή σας περιλαμβάνει λέξεις που δεν επιτρέπονται."
+    one: Λυπούμαστε, οι νέοι χρήστες μπορούν να βάλουν μόνο έναν σύνδεσμο σε κάθε ανάρτηση.
+    other: Λυπούμαστε, οι νέοι χρήστες μπορούν να βάλουν μόνο %{count} συνδέσμους σε κάθε ανάρτηση.
   spamming_host: "Συγγνώμη αλλά δεν μπορείτε να αναρτήσετε σύνδεσμο σε αυτόν τον διακομιστή."
   user_is_suspended: "Δεν επιτρέπονται οι αναρτήσεις από αποβλημένους χρήστες."
   topic_not_found: "Κάτι πήγε στραβά. Ίσως το νήμα έκλεισε ή διαγράφηκε ενώ το κοιτούσες;"
@@ -209,7 +210,6 @@ el:
     top_weekly: "Κορυφαία νήματα εβδομαδιαία "
     top_daily: "Κορυφαία νήματα ημερησίως "
     posts: "Τελευταίες αναρτήσεις"
-    private_posts: "Νέα προσωπικά μηνύματα"
     group_posts: "Τελευταίες αναρτήσεις από %{group_name}"
     group_mentions: "Τελευταίες αναφορές από %{group_name}"
     user_posts: "Τελευταίες αναρτήσεις από @%{username}"
@@ -222,11 +222,8 @@ el:
   queue:
     delete_reason: "Διαγράφτηκαν μέσω της ουράς επανελέγχου "
   groups:
-    success:
-      bulk_add: "%{users_added} χρήστες προστέθηκαν στην ομάδα."
     errors:
       can_not_modify_automatic: "Δεν μπορείς να τροποποιήσεις μια αυτόματη ομάδα"
-      member_already_exist: "'%{username}' είναι ήδη μέλος της ομάδας."
       invalid_domain: "'%{domain}' δεν είναι έγκυρο domain."
       invalid_incoming_email: "'%{email}' δεν είναι έγκυρη διεύθυνση email."
       email_already_used_in_group: "'%{email}' χρησιμοποιείται ήδη από την ομάδα '%{group_name}'"
@@ -246,9 +243,9 @@ el:
       title: "Αίτημα Μέλους για @%{group_name}"
   education:
     until_posts:
-      one: "1 ανάρτηση"
-      other: "%{count} αναρτήσεις"
-    new-topic: |
+      one: 1 ανάρτηση
+      other: '%{count} αναρτήσεις'
+    'new-topic': |
       Καλώς ήρθατε στην %{site_name} &mdash. **ευχαριστούμε που αρχίσατε μιά νέα συνομιλία!**
 
       - Είστε σίγουροι οτι ο τίτλος παρουσιάζει ενδιαφέρον; Είναι αντιπροσωπευτικός του περιεχομένου του νήματος;
@@ -258,7 +255,7 @@ el:
       - Συμπεριλάβετε κοινές λέξεις στο νήμα σας έτσι ώστε να μπορούν να το *βρουν* οι άλλοι. Για να κατηγοριοποιήσετε το νήμα σας με άλλα παρόμοια νήματα, επιλέξτε μια κατηγορία.
 
       - Για περισσότερα, [δείτε τον οδηγό χρήσης της κοινότητάς μας](/guidelines). Αυτός ο πίνακας θα παρουσιαστεί μόνο για την πρώτη σας %{education_posts_text}
-    new-reply: |
+    'new-reply': |
       Καλώς ήρθατε στην %{site_name} &mdash; **ευχαριστούμε για την συνεισφορά σας**
 
       - Βελτιώνει/προχωράει η απάντηση σας την συζήτηση με κάποιο τρόπο;
@@ -304,12 +301,6 @@ el:
       Λυπούμαστε, αλλά οι νέοι χρήστες είναι προσωρινά περιορισμένοι σε %{newuser_max_replies_per_topic} απαντήσεις στο ίδιο νήμα.
 
       Αντί να προσθέσετε κι άλλη απάντηση, παρακαλώ επεξεργαστείτε τις προηγούμενες απαντήσεις σας ή επισκεφθείτε άλλα νήματα.
-    reviving_old_topic: |
-      ### Αναβίωση αυτού του νήματος;
-
-      Η τελευταία απάντηση σε αυτό το νήμα ήταν **%{days}** μέρες πριν. Η απάντησή σας θα μεταφέρει το νήμα στην κορυφή της λίστας και θα ειδοποιήσει οποιονδήποτε έχει προηγουμένως συμμετάσχει στη συζήτηση.
-
-      Είστε σίγουροι ότι θέλετε να συνεχίσετε αυτή την παλιά συζήτηση;
   activerecord:
     attributes:
       category:
@@ -322,13 +313,12 @@ el:
       user_profile:
         bio_raw: "Σχετικά με εμένα"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Μπορείτε να καταχωρίσετε προειδοποιήσεις μόνο σε προσωπικά μηνύματα."
               too_many_users: "Μπορείτε να στέλνετε προειδοποιήσεις μόνο σε ένα χρήστη κάθε φορά."
-              cant_send_pm: "Συγγνώμη, δεν μπορείτε να στείλετε προσωπικό μήνυμα σε αυτόν τον χρήστη."
               no_user_selected: "Πρέπει να επιλέξετε έναν έγκυρο χρήστη."
               reply_by_email_disabled: "Η απάντηση μέσω email έχει απενεργοποιηθεί."
             featured_link:
@@ -367,7 +357,6 @@ el:
           attributes:
             word:
               too_many: "Πάρα πολλές λέξεις για την ενέργεια"
-      <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>το πεδίο Σχετικά Με Μένα στο προφίλ σας είναι κενό, <a href='/u/%{username_lower}/preferences/about-me'>θα θέλατε να προσθέσετε κάποιες πληροφορίες;</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} δεν έχει εισάγει τίποτα στο πεδίο Σχετικά με Εμένα στο προφίλ του</div>"
@@ -384,47 +373,47 @@ el:
     body: |2+
 
 
-      Η πρώτη παράγραφος αυτού του καρφιτσωμένου θέματος θα είναι ορατή ως μήνυμα καλωσορίσματος προς τους νέους επισκέπτες της σελίδας. Είναι σημαντικό!
+        Η πρώτη παράγραφος αυτού του καρφιτσωμένου θέματος θα είναι ορατή ως μήνυμα καλωσορίσματος προς τους νέους επισκέπτες της σελίδας. Είναι σημαντικό!
 
-      **Αλλάξτε αυτό** με μία σύντομη περιγραφή της κοινότητάς σας:
+        **Αλλάξτε αυτό** με μία σύντομη περιγραφή της κοινότητάς σας:
 
-      - Σε ποιον απευθύνεται η σελίδα;
-      - Τι θα βρει εδώ πέρα;
-      - Γιατί αξίζει να επισκευθεί τη σελίδα;
-      - Που αλλού θα μπορούσαν να βρουν υλικό σχετικά με το θέμα; (url κτλπ)
+        - Σε ποιον απευθύνεται η σελίδα;
+        - Τι θα βρει εδώ πέρα;
+        - Γιατί αξίζει να επισκευθεί τη σελίδα;
+        - Που αλλού θα μπορούσαν να βρουν υλικό σχετικά με το θέμα; (url κτλπ)
 
 
 
 
-      <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+        <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
 
-      Θα ήταν καλό να κλείσετε αυτό το θέμα μέσω του διαχειριστή :wrench: (στην πάνω δεξιά και κάτω θέση), έτσι ώστε οι απαντήσεις να μην μαζευτούν στην ανακοίνωση.
+        Θα ήταν καλό να κλείσετε αυτό το θέμα μέσω του διαχειριστή :wrench: (στην πάνω δεξιά και κάτω θέση), έτσι ώστε οι απαντήσεις να μην μαζευτούν στην ανακοίνωση.
 
   lounge_welcome:
     title: "Καλώς ήρθατε στο Σαλόνι"
     body: |2+
 
-      Συγχαρητήρια! :confetti_ball:
+        Συγχαρητήρια! :confetti_ball:
 
-      Εάν μπορείς να δεις αυτό το θέμα, έχεις πρόσφατα προαχθεί σε **τακτικό μέλος** (επίπεδο εμπιστοσύνης 3)
+        Εάν μπορείς να δεις αυτό το θέμα, έχεις πρόσφατα προαχθεί σε **τακτικό μέλος** (επίπεδο εμπιστοσύνης 3)
 
-      Τώρα μπορείς να &hellip,
+        Τώρα μπορείς να &hellip,
 
-      * Επεξεργαστείς τον τίτλο οποιουδήποτε θεματος
+        * Επεξεργαστείς τον τίτλο οποιουδήποτε θεματος
 
-      * Αλλάξεις την κατηγορία οποιουδήποτε θέματος
+        * Αλλάξεις την κατηγορία οποιουδήποτε θέματος
 
-      * Ακολουθούνται όλοι σου οι σύνδεσμοι ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) έχει αφαιρεθεί)
+        * Ακολουθούνται όλοι σου οι σύνδεσμοι ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) έχει αφαιρεθεί)
 
-      * Έχεις πρόσβαση στην ιδιωτική κατηγορία, που εμφανίζεται μόνο σε χρήστες του επιπέδου 3 και πάνω.
+        * Έχεις πρόσβαση στην ιδιωτική κατηγορία, που εμφανίζεται μόνο σε χρήστες του επιπέδου 3 και πάνω.
 
-      * Κρύψεις ανεπιθύμητη αλληλογραφία με την σημαία
+        * Κρύψεις ανεπιθύμητη αλληλογραφία με την σημαία
 
-      Εδώ είναι η [λίστα με όλα τα κανονικά μέλη](/badges/3/regular). Μπες να πεις ένα γεια.
+        Εδώ είναι η [λίστα με όλα τα κανονικά μέλη](/badges/3/regular). Μπες να πεις ένα γεια.
 
-      Ευχαριστούμε που συνεχίζεις να είσαι ένα σημαντικό μέρος αυτής της κοινότητας!
+        Ευχαριστούμε που συνεχίζεις να είσαι ένα σημαντικό μέρος αυτής της κοινότητας!
 
-      (Παρακαλώ σημείωσε πως μόνο τα μέλη που συνεχίζουν να τηρούν τις απαραίτητες προϋποθέσεις θα παραμένουν τακτικά μέλη.)
+        (Παρακαλώ σημείωσε πως μόνο τα μέλη που συνεχίζουν να τηρούν τις απαραίτητες προϋποθέσεις θα παραμένουν τακτικά μέλη.)
 
   category:
     topic_prefix: "Σχετικά με την κατηγορία %{category} "
@@ -442,8 +431,8 @@ el:
       uncategorized: "Δεν μπορείτε να διαγράψετε την κατηγορία 'Αταξινόμητα'"
       has_subcategories: "Δεν είναι δυνατή η διαγραφή αυτής της κατηγορίας, επειδή έχει υπο-κατηγορίες."
       topic_exists:
-        one: "Δεν είναι δυνατή η διαγραφή αυτής της κατηγορίας, επειδή έχει 1 θέμα. Το παλαιότερο θέμα είναι %{topic_link}."
-        other: "Δεν είναι δυνατή η διαγραφή αυτής της κατηγορίας, επειδή έχει %{count} θέματα. Το παλαιότερο θέμα είναι %{topic_link}."
+        one: Δεν είναι δυνατή η διαγραφή αυτής της κατηγορίας, επειδή έχει 1 θέμα. Το παλαιότερο θέμα είναι %{topic_link}.
+        other: Δεν είναι δυνατή η διαγραφή αυτής της κατηγορίας, επειδή έχει %{count} θέματα. Το παλαιότερο θέμα είναι %{topic_link}.
       topic_exists_no_oldest: "Δεν είναι δυνατή η διαγραφή αυτής της κατηγορίας, διότι ο αριθμός νημάτων είναι %{count}."
     uncategorized_description: "Νήματα που δεν χρειάζονται κατηγορία ή που δεν ταιριάζουν σε καμία άλλη από τις υπάρχουσες κατηγορίες."
   trust_levels:
@@ -462,103 +451,86 @@ el:
     image_placeholder:
       broken: "Η εικόνα είναι χαλασμένη"
   rate_limiter:
-    slow_down: "Η εντολή αυτή έχει εκτελεστεί πάρα πολλές φορές, δοκιμάστε ξανά αργότερα."
-    too_many_requests: "Υπάρχει περιορισμός στις φορές που μπορεί να επαναληφθεί αυτή η ενέργεια. Παρακαλούμε παριμένετε  %{time_left}  προτού δοκιμάσετε ξανά."
-    by_type:
-      first_day_replies_per_day: "Έχετε φτάσει τον μέγιστο αριθμό απαντήσεων που δικαιούται ένας νέος χρήστης την πρώτη του μέρα. Παρακαλώ περιμένετε %{time_left} πριν προσπαθήσετε ξανά."
-      first_day_topics_per_day: "Έχεται φτάσει τον μέγιστο αριθμό θεμάτων που δικαιούται ένας νέος χρήστης την πρώτη του μέρα. Παρακαλώ περιμένετε %{time_left} πριν προσπαθήσετε ξανά."
-      create_topic: "Δημιουργείτε θέματα πολύ γρήγορα. Παρακαλώ περιμένετε %{time_left} πριν προσπαθήσετε ξανά."
-      create_post: "Η απάντησή σας ήταν πολύ γρήγορη. Παρακαλώ περιμένετε %{time_left} πριν προσπαθήσετε ξανά."
-      delete_post: "Διαγράφετε πολύ γρήγορα τις αναρτήσεις.  Παρακαλώ περιμένετε %{time_left} πριν προσπαθήσετε ξανά."
-      public_group_membership: "Συνδέεστε και αποσυνδέεστε πολύ συχνά. περιμένετε %{time_left} πριν δοκιμάσετε ξανά"
-      topics_per_day: "Έχεις φτάσει το ανώτατο όριο νέων νημάτων για σήμερα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
-      pms_per_day: "Έχεις φτάσει το ανώτατο όριο μηνυμάτων για σήμερα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
-      create_like: "Έχεις φτάσει το ανώτατο όριο των \"μου αρέσει\" για σήμερα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
-      create_bookmark: "Έχεις φτάσει το ανώτατο όριο σελιδοδεικτών για σήμερα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
-      edit_post: "Έχεις φτάσει το ανώτατο όριο επεξεργασιών για σήμερα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
-      live_post_counts: "Ζητάς την ανανέωση του μετρητή αναρτήσεων πολύ γρήγορα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
-      unsubscribe_via_email: "Έχεις φτάσει το ανώτατο όριο απεγγραφών μέσω email για σήμερα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
-      topic_invitations_per_day: "Έχεις φτάσει το ανώτατο όριο προσκλήσεων σε νήματα για σήμερα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
     hours:
-      one: "1 ώρα"
-      other: "%{count} ώρες"
+      one: 1 ώρα
+      other: '%{count} ώρες'
     minutes:
-      one: "1 λεπτό"
-      other: "%{count} λεπτά"
+      one: 1 λεπτό
+      other: '%{count} λεπτά'
     seconds:
-      one: "1 δευτερόλεπτο"
-      other: "%{count} δευτερόλεπτα"
+      one: 1 δευτερόλεπτο
+      other: '%{count} δευτερόλεπτα'
   datetime:
     distance_in_words:
       half_a_minute: "< 1λ"
       less_than_x_seconds:
-        one: "< 1δ"
-        other: "< %{count}δ"
+        one: < 1δ
+        other: < %{count}δ
       x_seconds:
-        one: "1δ"
-        other: "%{count}δ"
+        one: 1δ
+        other: '%{count}δ'
       less_than_x_minutes:
-        one: "1λ"
-        other: "< %{count}λ"
+        one: 1λ
+        other: < %{count}λ
       x_minutes:
-        one: "1λ"
-        other: "%{count}λ"
+        one: 1λ
+        other: '%{count}λ'
       about_x_hours:
-        one: "1ω"
-        other: "%{count}ω"
+        one: 1ω
+        other: '%{count}ω'
       x_days:
-        one: "1η"
-        other: "%{count}η"
+        one: 1η
+        other: '%{count}η'
       about_x_months:
-        one: "1μήνας"
-        other: "%{count}μήνες"
+        one: 1μήνας
+        other: '%{count}μήνες'
       x_months:
-        one: "1μήνας"
-        other: "%{count}μήνες"
+        one: 1μήνας
+        other: '%{count}μήνες'
       about_x_years:
-        one: "1ε"
-        other: "%{count}ε"
+        one: 1ε
+        other: '%{count}ε'
       over_x_years:
-        one: "> 1ε"
-        other: "> %{count}ε"
+        one: '> 1ε'
+        other: '> %{count}ε'
       almost_x_years:
-        one: "1ε"
-        other: "%{count}ε"
+        one: 1ε
+        other: '%{count}ε'
     distance_in_words_verbose:
       half_a_minute: "μόλις τώρα"
       less_than_x_seconds:
-        one: "μόλις τώρα"
-        other: "μόλις τώρα"
+        one: μόλις τώρα
+        other: μόλις τώρα
       x_seconds:
-        one: "πριν 1 δευτερόλεπτο"
-        other: "πριν %{count} δευτερόλεπτα"
+        one: πριν 1 δευτερόλεπτο
+        other: πριν %{count} δευτερόλεπτα
       less_than_x_minutes:
-        one: "λιγότερο από 1 λεπτό πριν"
-        other: "λιγότερο από %{count} λεπτά πριν"
+        one: λιγότερο από 1 λεπτό πριν
+        other: λιγότερο από %{count} λεπτά πριν
       x_minutes:
-        one: "πριν 1 λεπτό"
-        other: "πριν %{count} λεπτά"
+        one: πριν 1 λεπτό
+        other: πριν %{count} λεπτά
       about_x_hours:
-        one: "πριν 1 ώρα"
-        other: "πριν %{count} ώρες"
+        one: πριν 1 ώρα
+        other: πριν %{count} ώρες
       x_days:
-        one: "πριν 1 μέρα"
-        other: "πριν %{count} μέρες"
+        one: πριν 1 μέρα
+        other: πριν %{count} μέρες
       about_x_months:
-        one: "πριν 1 μήνα περίπου"
-        other: "πριν %{count} μήνες περίπου"
+        one: πριν 1 μήνα περίπου
+        other: πριν %{count} μήνες περίπου
       x_months:
-        one: "πριν 1 μήνα"
-        other: "πριν %{count} μήνες"
+        one: πριν 1 μήνα
+        other: πριν %{count} μήνες
       about_x_years:
-        one: "πριν 1 χρόνο περίπου"
-        other: "πριν %{count} χρόνια περίπου"
+        one: πριν 1 χρόνο περίπου
+        other: πριν %{count} χρόνια περίπου
       over_x_years:
-        one: "πάνω από 1 χρόνο"
-        other: "πάνω από %{count} χρόνια"
+        one: πάνω από 1 χρόνο
+        other: πάνω από %{count} χρόνια
       almost_x_years:
-        one: "σχεδόν 1 χρόνο πριν"
-        other: "σχεδόν %{count} χρόνια πριν"
+        one: σχεδόν 1 χρόνο πριν
+        other: σχεδόν %{count} χρόνια πριν
   password_reset:
     no_token: "Συγνώμη, ο σύνδεσμος αλλαγής κωδικού είναι πολύ παλιός. Πατήστε ξανά το κουμπί 'Συνδεθείτε' και επιλέξτε 'Ξέχασα τον κωδικό πρόσβασής μου' για να λάβετε νέο σύνδεσμο. "
     choose_new: "Επιλέξτε νέο κωδικό πρόσβασης"
@@ -612,8 +584,6 @@ el:
       long_form: 'το επισήμαναν ως ανάρμοστο'
     notify_user:
       title: 'Αποστολή μηνύματος στον @{{username}} '
-      description: 'Θέλω να μιλήσω με αυτό το άτομο άμεσα και ιδιωτικά σχετικά με αυτή την ανάρτηση.'
-      short_description: 'Θέλω να μιλήσω με αυτό το άτομο άμεσα και ιδιωτικά σχετικά με αυτή την ανάρτηση.'
       long_form: 'ειδοποίησε το μέλος'
       email_title: 'Η δημοσίευση σας στο "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -714,9 +684,7 @@ el:
       xaxis: "Ημέρα"
       yaxis: "Αριθμός επισκέψεων"
     signups:
-      title: "Νέοι Χρήστες"
       xaxis: "Ημέρα"
-      yaxis: "Αριθμός νέων χρηστών"
     profile_views:
       title: "Προβολές Προφίλ Χρήστη"
       xaxis: "Ημέρα"
@@ -754,7 +722,6 @@ el:
       xaxis: "Ημέρα"
       yaxis: "Αριθμός Emails"
     user_to_user_private_messages:
-      title: "Μέλος-προς-Μέλος"
       xaxis: "Ημέρα"
       yaxis: "Αριθμός μηνυμάτων"
     system_private_messages:
@@ -801,7 +768,6 @@ el:
       xaxis: "Ημέρα"
       yaxis: "Θεάσεις σελίδας από Web Crawlers"
     page_view_total_reqs:
-      title: "Σύνολο"
       xaxis: "Ημέρα"
       yaxis: "Σύνολο προβολών σελίδας"
     page_view_logged_in_mobile_reqs:
@@ -867,28 +833,23 @@ el:
     failing_emails_warning: 'Υπάρχουν %{num_failed_jobs} εργασίες email οι οποίες απέτυχαν. Ελέγξτε το app.yml  και βεβαιωθείτε πως οι ρυθμίσεις του mail server σας είναι σωστές.  <a href="/sidekiq/retries" target="_blank">Δείτε τις αποτυχημένες εργασίες στο Sidekiq</a>.'
     subfolder_ends_in_slash: "Οι ρυθμίσεις του υποφακέλου σας δεν είναι σωστές. Το DISCOURSE_RELATIVE_URL_ROOT τελειώνει με κάθετη.  "
     email_polling_errored_recently:
-      one: "To Email polling έχει παράγει ένα σφάλμα τις τελευταίες 24 ώρες . Δείτε <a href='/logs' target='_blank'>τα αρχεία καταγραφής</a> για περισσότερες λεπτομέρειες.   "
-      other: "To Email polling έχει παράγει %{count} σφάλματα τις τελευταίες 24 ώρες . Δείτε <a href='/logs' target='_blank'>τα αρχεία καταγραφής</a> για περισσότερες λεπτομέρειες.  "
-    missing_mailgun_api_key: "Ο διακομιστής εχεί ρυθμιστεί για να στέλνει email μέσω του mailgun, αλλά δεν εχεις ρυθμίσει το κλειδί API που χρειάζεται για να επαληθευτούν τα webhook μυνήματα. "
+      one: 'To Email polling έχει παράγει ένα σφάλμα τις τελευταίες 24 ώρες . Δείτε <a href=''/logs'' target=''_blank''>τα αρχεία καταγραφής</a> για περισσότερες λεπτομέρειες.   '
+      other: 'To Email polling έχει παράγει %{count} σφάλματα τις τελευταίες 24 ώρες . Δείτε <a href=''/logs'' target=''_blank''>τα αρχεία καταγραφής</a> για περισσότερες λεπτομέρειες.  '
     bad_favicon_url: "Το favicon δεν μπορεί να φορτωθεί 'Ελεγξε το favicon_url στις <a href='/admin/site_settings'>Ρυθμίσεις Iστοσελίδας</a>"
     poll_pop3_timeout: "Το χρονικό όριο σύνδεσης με τον διακομιστή POP3 έληξε. Τα εισερχόμενα email δεν μπορούν να ανακτηθούν. Παρακαλώ ελέγξτε τις <a href='/admin/site_settings/category/email'>POP3 ρυθμίσεις σας</a> και τον πάροχο υπηρεσιών."
     poll_pop3_auth_error: "Υπήρξε σφάλμα ελεχγου ταυτότητας κατά την σύνδεση με τον διακομιστή POP3. Παρακαλώ όπως ελέξετε τις <a href='/admin/site_settings/category/email'> POP3 ρυθμίσεις σας.</a>  "
   site_settings:
     censored_words: "Αυτόματη αντικατάσταση λέξεων θα γίνεται με &#9632;&#9632;&#9632;&#9632;"
-    censored_pattern: "Το Regex πρότυπο που θα αντικατασταθεί αυτόματα με &#9632;&#9632;&#9632;&#;"
     delete_old_hidden_posts: "Διάγραψε αυτόματα όποιες κρυμμένες αναρτήσεις μένουν κρυφές για πάνω από 30 ημέρες. "
-    default_locale: "Η προεπιλεγμένη γλώσσα του Discourse (ISO 639-1 Code)"
     allow_user_locale: "Επίτρεψε στους χρήστες να επιλέγουν την γλώσσα που επιθυμούν. "
     set_locale_from_accept_language_header: "θέστε την γλώσσα του interface για ανώνυμους χρήστες από τη γλώσσα που χρησιμοποιεί το πρόγραμμα περιήγησης τους. (ΠΕΙΡΑΜΑΤΙΚΟ ΧΑΡΑΚΤΗΡΙΣΤΙΚΟ, δεν λειτουργεί με ανώνυμη cache)"
     min_post_length: "Ελάχιστο επιτρεπτό μήκος ανάρτησης σε χαρακτήρες"
     min_first_post_length: "Ελάχιστο επιτρεπτό μήκος πρώτης ανάρτησης (σώμα νήματος) σε χαρακτήρες"
-    min_private_message_post_length: "Ελάχιστο επιτρεπτό μήκος ανάρτησης σε χαρακτήρες για μηνύματα"
     max_post_length: "Μέγιστο επιτρεπτό μήκος ανάρτησης σε χαρακτήρες"
     topic_featured_link_enabled: "Ενεργοποίηση ανάρτησης ενός συνδέσμου με νήματα."
     show_topic_featured_link_in_digest: "Δείξε το σύνδεσμο προτεινόμενου νήματος στο συνοπτικό email."
     min_topic_title_length: "Ελάχιστο επιτρεπτό μήκος τίτλου νήματος σε χαρακτήρες"
     max_topic_title_length: "Μέγιστο επιτρεπτό μήκος τίτλου νήματος σε χαρακτήρες"
-    min_private_message_title_length: "Ελάχιστο επιτρεπτό μήκος τίτλου για ένα μήνυμα σε χαρακτήρες"
     min_search_term_length: "Ελάχιστο έγκυρο μήκος όρου αναζήτησης σε χαρακτήρες"
     search_tokenize_chinese_japanese_korean: "Ανάγκασε την αναζήτηση να κάνει tokenize Κινέζικα / Ιαπωνικά / κορεατικά, ακόμη και σε μη CJK ιστότοπους"
     search_prefer_recent_posts: "Εάν η αναζήτηση στην ιστοσελίδα σας είναι αργή, αυτή η επιλογή δημιουργεί κατάλογο των πιο πρόσφατων αναρτήσεων πρώτα"
@@ -943,8 +904,6 @@ el:
     summary_likes_required: "Ελάχιστος αριθμός ''Μου αρέσει'' σε ένα θέμα πριν ενεργοποιηθεί το «Συνοψίστε αυτό το θέμα» "
     summary_percent_filter: "Όταν ο χρήστης επιλέξει «Συνοψίστε αυτό το θέμα», δείξε το κορυφαίο % των αναρτήσεων"
     summary_max_results: "Μέγιστος αριθμός αναρτήσεων στο «Συνοψίστε αυτό το θέμα»"
-    enable_private_messages: "Επίτρεψε στους χρήστες επιπέδου εμπιστοσύνης 1 (ρυθμιζόμενο μέσω min trust level to send messages)  να δημιουργήσουν μηνύματα και να απαντήσουν σε μηνύματα. Σημειώστε ότι οι συνεργάτες μπορούν πάντα να στέλνουν μηνύματα."
-    enable_private_email_messages: "Επίτρεψε στους χρήστες επιπέδου εμπιστοσύνης 4 (ρυθμιζόμενο μέσω min trust level to send messages) να στέλνουν προσωπικά μηνύματα email. Σημειώστε ότι οι συνεργάτες μπορούν πάντα να στέλνουν μηνύματα."
     enable_long_polling: "Η αρτηρία μηνυμάτων που χρησιμοποιείτε για ειδοποιήσεις μπορεί να χρησιμοποιήσει μακρυά μέθοδο εξέτασης."
     long_polling_base_url: "Base URL που χρησιμοποιείτε για μακρύ ψήφισμα (όταν ένα CDN εξυπηρετεί δυναμικό περιεχόμενο, βεβαιωθείτε ότι το ορίσατε σε έλξη προέλευσης ) π.χ.: http://origin.site.com"
     long_polling_interval: "Χρονικό διάστημα που ο διακομιστής θα πρέπει να περιμένει πριν απαντήσει στους πελάτες όταν δεν υπάρχουν δεδομένα για την αποστολή (μόνο συνδεδεμένοι χρήστες )"
@@ -965,7 +924,6 @@ el:
     notify_mods_when_user_silenced: "Αν ένας χρήστης σιγηθεί αυτόματα, στείλε ένα μήνυμα σε όλους τους συντονιστές."
     flag_sockpuppets: "Εάν ένας νέος χρήστης απαντήσει σε ένα νήμα από την ίδια διεύθυνση ΙP όπως ο νέος χρήστης, ο οποίος ξεκίνησε το νήμα, και οι δυο δημοσιεύσεις τους θα επισημανθούν ως δυνητικά ανεπιθύμητες."
     traditional_markdown_linebreaks: "Χρήση παραδοσιακών αλλαγών γραμμών στη Markdown, η οποία απαιτεί δύο κενά διαστήματα για μια αλλαγή γραμμής."
-    enable_markdown_typographer: "Χρησιμοποίησε βασικούς τυπογραφικούς κανόνες για να βελτιώσεις την αναγνωσιμότητα του κειμένου στις παραγράφους, αντικαθιστά (c) (tm) κλπ με σύμβολα, μειώνει τον αριθμό των ερωτηματικών και άλλα"
     post_undo_action_window_mins: "Αριθμός των λεπτών όπου οι χρήστες δικαιούνται να αναιρέσουν πρόσφατες ενέργειες πάνω σε ένα θέμα (μου αρέσει, επισήμανση, κτλ) "
     must_approve_users: "Το προσωπικό πρέπει να εγκρίνει όλους τους λογαριασμούς των νέων χρηστών προτού τους επιτραπεί να έχουν πρόσβαση στην ιστοσελίδα. Προειδοποίηση: ενεργοποιώντας το για μια ζωντανή ιστοσελίδα θα έχει ως αποτέλεσμα την ανάκληση για τους υπάρχοντες χρήστες που δεν ανήκουν στο προσωπικό!"
     pending_users_reminder_delay: "Ειδοποίηση των συντονιστών αν υπάρχουν νέοι χρήστες που περιμένουν για αποδοχή του λογαριασμού τους για μεγαλύτερο απο αυτό το χρονικό διάστημα. Όρισέ το στο -1 για να απενεργοποιηθούν οι ειδοποιήσεις."
@@ -1009,7 +967,6 @@ el:
     version_checks: "Έλεγξε το Hub του Discourse για αναβαθμίσεις και δείξε μηνύματα για νέες ενημερώσεις στην σελίδα διαχείρισης.  "
     new_version_emails: "Αποστολή email στην contact_email διεύθυνση όταν μια νέα έκδοση του Discourse είναι διαθέσιμη."
     invite_expiry_days: "Για πόσο καιρό οι κύριες προσκλήσεις ισχύουν, σε μέρες "
-    invite_passthrough_hours: "Για πόσο καιρό ο χρήστης μπορεί να χρησιμοποιήσει ένα ήδη εξαργυρωμένο κλειδί πρόσκλησης για να συνδεθεί, σε ώρες"
     invite_only: "Οι ανοιχτές εγγραφές είναι απενεργοποιημένες, όλα τα νέα μέλη θα πρέπει να προσκληθούν από το προσωπικό."
     login_required: "Απαιτήστε την επικύρωση για να διαβάσετε το περιεχόμενο σε αυτήν την ιστοσελίδα,  απαγορεύσετε την ανώνυμη πρόσβαση."
     min_username_length: "Ελάχιστο μέγεθος ονόματος χρήστη σε χαρακτήρες. ΠΡΟΣΟΧΗ: εάν υπάρχουν χρήστες ή ομάδες που έχουν ονόματα πιο μικρά από την ρύθμιση αυτή, θα δημιουργηθεί πρόβλημα στην λειτουργία της ιστοσελίδας!"
@@ -1031,7 +988,6 @@ el:
     sso_overrides_avatar: "Παράκαμψη τοπικού άβαταρ χρήστη με το άβαταρ από τον εξωτερικό ιστότοπο SSO Εάν ενεργοποιημένο, η αποσύνδεση του allow_uploaded_avatars συνιστάται."
     sso_not_approved_url: "Ανακατευθύνετε μη εγκεκριμένους λογαριασμούς SSO σε αυτό το URL"
     sso_allows_all_return_paths: "Do not restrict the domain for return_paths provided by SSO (by default return path must be on current site)"
-    enable_local_logins: "Ενεργοποίηση τοπικών λογαριασμών χρήστη με βάση το όνομα χρήστη και τον κωδικό πρόσβασης. (Σημείωση: αυτό πρέπει να είναι ενεργοποιημένο για να λειτουργούν οι προσκλήσεις)"
     allow_new_registrations: "Επιτρέψτε τις νέες εγγραφές χρηστών. Απενεργοποιήστε την επιλογή αυτή για να αποτρέψετε σε οποιονδήποτε  να δημιουργήσει ένα νέο λογαριασμό"
     enable_signup_cta: "Δείξε μια ανακοίνωση στους ανώνυμους χρήστες που επιστρέφουν, η οποία να τους παροτρύνει να δημιουργήσουν λογαριασμό."
     enable_yahoo_logins: "Ενεργοποιήστε την επαλήθευση μέσω Yahoo"
@@ -1039,15 +995,12 @@ el:
     google_oauth2_client_id: "Client ID της Google εφαρμογής σας."
     google_oauth2_client_secret: "Μυστικό πελάτη της Google εφαρμογής σας. "
     enable_twitter_logins: "Ενεργοποίησε την επαλήθευση μέσω Twitter. Απαιτεί twitter_consumer_key και twitter_consumer_secret"
-    twitter_consumer_key: "Consumer key για επαλήθευση μέσω Twitter, εγγεγραμμένο στο http://dev.twitter.com"
-    twitter_consumer_secret: "Consumer secret για επαλήθευση μέσω Twitter, εγγεγραμμένο στο http://dev.twitter.com"
     enable_instagram_logins: "Ενεργοποίησε την επαλήθευση μέσω Instagram, απαιτεί instagram_consumer_key και instagram_consumer_secret"
     instagram_consumer_key: "Consumer key για επαλήθευση μέσω Instagram"
     instagram_consumer_secret: "Consumer secret για επαλήθευση μέσω Instagram"
     enable_facebook_logins: "Ενεργοποίησε την επαλήθευση μέσω Facebook, απαιτεί facebook_app_id και facebook_app_secret"
     facebook_app_id: "App id για επαλήθευση μέσω Facebook, εγγεγραμμένο στο https://developers.facebook.com/apps"
     facebook_app_secret: "App secret για επαλήθευση μέσω Facebook, εγγεγραμμένο στο https://developers.facebook.com/apps"
-    facebook_request_extra_profile_details: "Ζήτησε σχετικά με μένα, τοποθεσία και ιστοσελίδα από το facebook. (απαιτείται έγκριση της εφαρμογής σου από το facebook)"
     enable_github_logins: "Ενεργοποίησε την επαλήθευση μέσω Github, απαιτεί github_client_id και github_client_secret"
     github_client_id: "Client id για επαλήθευση μέσω Github, εγγεγραμμένο στο https://github.com/settings/applications"
     github_client_secret: "Client secret για επαλήθευση μέσω Github, εγγεγραμμένο στο https://github.com/settings/applications"
@@ -1055,7 +1008,6 @@ el:
     allow_restore: "Επίτρεψε επαναφορά, η οποία μπορεί να αντικαταστήσει ΟΛΑ τα δεδομένα του ιστότοπου! Αφήστε απενεργοποιημένο, εκτός αν σχεδιάζετε να επαναφέρετε αντίγραφο ασφαλείας"
     maximum_backups: "Το μέγιστο ποσό αντιγράφων ασφαλείας το οποία θα διατηρηθούν στο δίσκο. Παλαιότερα αντίγραφα ασφαλείας διαγράφονται αυτόματα"
     automatic_backups_enabled: "Πάρε αυτόματα αντίγραφα ασφαλείας όπως ορίζεται στη συχνότητα αντιγράφων ασφαλείας"
-    backup_frequency: "Πόσο συχνά δημιουργούμε αντίγραφο ασφαλείας ιστοτόπου, σε ημέρες."
     enable_s3_backups: "Ανέβασε τα αντίγραφα αφαλείας στο S3 όταν ολοκληρωθούν. ΣΗΜΑΝΤΙΚΟ: απαιτεί έγκυρα διαπιστευτήρια S3 καταχωρημένα στις ρυθμίσεις αρχείων."
     s3_backup_bucket: "Απομακρυσμένος αποθηκευτικός χώρος για τα αντίγραφα ασφαλείας. ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Βεβαιωθείτε οτι ο χώρος είναι προσωπικός."
     s3_disable_cleanup: "Απενεργοποιήστε την αφαίρεση των αντιγράφων ασφαλείας από το S3 όταν αφαιρεθούν τοπικά"
@@ -1077,7 +1029,6 @@ el:
     max_bookmarks_per_day: "Μέγιστος αριθμός σελιδοδεικτών ανά χρήστη ανά ημέρα."
     max_edits_per_day: "Μέγιστος αριθμός επεξεργασιών ανά χρήστη ανά ημέρα."
     max_topics_per_day: "Μέγιστος αριθμός νημάτων που μπορεί να δημιουργήσει ο χρήστης σε μια ημέρα."
-    max_private_messages_per_day: "Μέγιστος αριθμός μηνυμάτων που μπορεί να δημιουργήσει ο χρήστης σε μια ημέρα."
     max_invites_per_day: "Μέγιστος αριθμός προσκλήσεων που μπορεί να στείλει ο χρήστης σε μια ημέρα."
     max_topic_invitations_per_day: "Μέγιστος αριθμός προσκλήσεων νημάτων που μπορεί να στείλει ο χρήστης σε μια ημέρα."
     max_logins_per_ip_per_hour: "Μέγιστος αριθμός επιτρεπόμενων συνδέσεων ανα διεύθυνση IP την ώρα"
@@ -1093,7 +1044,6 @@ el:
     purge_deleted_uploads_grace_period_days: "Η περίοδος χάριτος (σε μέρες) πριν μία διεγραμένη μεταφόρτωση αφαιρεθεί μόνιμα."
     purge_unactivated_users_grace_period_days: "Περίοδος χάριτος (σε ημέρες) πριν διαγραφεί ο λογαριασμός ενός χρήστη ο οποίος δεν ενεργοποιήθηκε. Ρυθμίστε στο 0 για να μην διαγράφονται ποτέ οι μη ενεργοποιημένοι χρήστες."
     enable_s3_uploads: "Τοποθέτηση μεταφορτώσεων σε αποθηκευτικό χώρο Amazon S3. ΣΗΜΑΝΤΙΚΟ: Απαιτούνται έγκυρα διαπιστευτήρια S3 (access key id και secret access key)."
-    s3_use_iam_profile: 'Χρησιμοποιήστε AWS EC2 ΙΑΜ ρόλο για να ανακτήσετε τα κλειδιά. ΣΗΜΕΙΩΣΗ: η ενεργοποίηση θα αναιρέσει τις ρυθμίσεις "s3 access key id" και "s3 secret access key".'
     s3_upload_bucket: "Το όνομα κουβά Amazon S3 οπου θα μεταφορτωθούν τα αρχεία . ΠΡΟΣΟΧΗ: πρέπει να είναι πεζά, χωρίς τελείες και χωρίς κάτω παύλες."
     s3_access_key_id: "Η ταυτότητα του κλειδιού πρόσβασης του Amazon S3 η οποία θα χρεισημοποιηθεί για το ανέβασμα φωτογραφιών."
     s3_secret_access_key: "Το μυστικό κλειδί πρόσβασης στο Amazon S3 που θα χρησιμοποιηθεί για να ανεβάσετε εικόνες."
@@ -1139,8 +1089,6 @@ el:
     min_trust_to_edit_wiki_post: "Το ελάχιστο επίπεδο εμπιστοσύνης που απαιτείται για να επεξεργαστείς μία ανάρτηση που έχει σημειωθεί ως wiki."
     min_trust_to_edit_post: "Το ελάχιστο επίπεδο εμπιστοσύνης που απαιτείται για να επεξεργαστείς αναρτήσεις."
     min_trust_to_allow_self_wiki: "Το ελάχιστο επίπεδο εμπιστοσύνης που απαιτείται για να μετατραπεί μία ανάρτηση του ίδιου του χρήστη σε wiki."
-    min_trust_to_send_messages: "Το ελάχιστο επίπεδο εμπιστοσύνης που απαιτείται για να δημιουργήσεις νέα προσωπικά μηνύματα."
-    min_trust_to_send_email_messages: "Το ελάχιστο επίπεδο εμπιστοσύνης που απαιτείται για την αποστολή νέου προσωπικού μηνύματος μέσω email (σε σταδιακούς χρήστες)."
     newuser_max_links: "Πόσους συνδέσμους μπορεί να προσθέσει ένας χρήστης σε μια ανάρτηση."
     newuser_max_images: "Πόσες εικόνες μπορεί να προσθέσει ένας χρήστης σε μια ανάρτηση."
     newuser_max_attachments: "Πόσα συνημμένα μπορεί να προσθέσει ένας χρήστης σε μια ανάρτηση."
@@ -1150,7 +1098,6 @@ el:
     max_users_notified_per_group_mention: "Μέγιστος αριθμός χρηστών που ίσως λάβουν μια ειδοποίηση εάν μια ομάδα αναφέρεται (εάν φτάσουν το κατώφλι, δεν θα σταλούν ειδοποιήσεις)"
     create_thumbnails: "Δημιούργησε μικρογραφίες και lightbox για εικόνες που είναι πολύ μεγάλες για να χωρέσουν σε μια ανάρτηση."
     email_time_window_mins: "Αναμονή (χ) λεπτών πριν την αποστολή οποιουδήποτε ειδοποιητικού email, έτσι ώστε να δωθεί στους χρήστες η ευκαιρία να επεξεργασθούν και να οριστικοποιήσουν τις αναρτήσεις τους. "
-    private_email_time_window_seconds: "Αναμονή (χ) δευτερολέπτων πριν την αποστολή οποιουδήποτε προσωπικού ειδοποιητικού email, έτσι ώστε να δωθεί στους χρήστες η ευκαιρία να επεξεργασθούν και να οριστικοποιήσουν τα μηνύματα τους. "
     email_posts_context: "Πόσες προηγούμενες απαντήσεις να συμπεριλαμβάνονται ως περιεχόμενο στα ειδοποιητικά μηνύματα. "
     flush_timings_secs: "Πόσο συχνά θα καθαρίσουμε τα δεδομένα χρονισμού στο σέρβερ, σε δευτερόλεπτα."
     title_max_word_length: "Το μέγιστο επιτρεπόμενο όριο λέξεων, σε χαρακτήρες, σε ένα τίτλο νήματος."
@@ -1207,7 +1154,6 @@ el:
     reply_by_email_enabled: "Ενεργοποίηση απάντησης στα νήματα μέσω email."
     reply_by_email_address: "Πρότυπο για την απάντηση μέσω email της διεύθυνσης email εισερχομένων μηνυμάτων, για παράδειγμα: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "Λίστα εναλλακτικών προτύπων για την απάντηση μέσω email της διεύθυνσης email εισερχομένων μηνυμάτων, πχ: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
-    incoming_email_prefer_html: "Χρησιμοποίησε HTML αντί για κείμενο στα εισερχόμενα email."
     disable_emails: "Απαγόρευσε στο Discourse να στέλνει email οποιοασδήποτε μορφής"
     strip_images_from_short_emails: "Αφαίρεσε εικόνες από email που έχουν μέγεθος λιγότερο από 2800 Bytes. "
     short_email_length: "Μέγεθος μικρού email σε Bytes"
@@ -1310,9 +1256,8 @@ el:
     allowed_href_schemes: "Τα σχεδιαγράμματα επιτρέπονται σε συνδέσμους επιπλέον απο το http και το https."
     embed_post_limit: "Μέγιστος αριθμός αναρτήσεων για ενσωμάτωση."
     embed_username_required: "Απαιτείται το όνομα χρήστη για τη δημιουργία νήματος."
-    notify_about_flags_after: "Αν υπάρχουν σημάνσεις που δεν έχουν διαχειριστεί μετά από αυτόν τον αριθμό ωρών, στείλε ένα μήνυμα στο προσωπικό. Θέσε 0 για απενεργοποίηση."
     show_create_topics_notice: "Εάν η ιστοσελίδα έχει λιγότερα από 5 δημόσια νήματα, κάνε μια παρατήρηση ζητώντας από τον διαχειριστή να δημιουργήσει μερικά νήματα."
-    delete_drafts_older_than_n_days: 'Διαγραφή προχείρων παλαιότερα απο (ν) ημερων '
+    delete_drafts_older_than_n_days: "Διαγραφή προχείρων παλαιότερα απο (ν) ημερων "
     bootstrap_mode_min_users: "Μέγιστος αριθμός χρηστών που απαιτούνται για την απενεργοποίηση της κατάστασης bootstrap (0 για απενεργοποίηση)"
     prevent_anons_from_downloading_files: "Αποτρέψτε ανώνυμους χρήστες από το να κατεβάζουν συνημμένα. ΠΡΟΣΟΧΗ: αυτό θα αποτρέψει οποιαδήποτε στοιχεία του ιστοτόπου που δεν είναι εικόνες και δημοσιεύονται ως συνημμένα από το να λειτουργούν."
     slug_generation_method: "Επιλέξτε μια μέθοδο παραγωγής slug. «Κωδικοποιημένη» θα δημιουργήσει μια συμβολοσειρά για ποσοστιαία κωδικοποίηση. «Κανένα» θα απενεργοποιήσει τα slug."
@@ -1322,7 +1267,6 @@ el:
     approve_post_count: "Ο όγκος των αναρτήσεων ενός καινούριου ή βασικού χρήστη που θα πρέπει να εγκριθεί."
     approve_unless_trust_level: "Οι αναρτήσεις για χρήστες κάτω από αυτό το επίπεδο εμπιστοσύνης πρέπει να εγκριθούν"
     approve_new_topics_unless_trust_level: "Τα καινούρια νήματα για χρήστες κάτω από αυτό το επίπεδο εμπιστοσύνης πρέπει να εγκριθούν."
-    notify_about_queued_posts_after: "Εάν υπάρχουν αναρτήσεις που περιμέναν να αναθεωρηθούν για περισσότερο από τόσες ώρες, θα σταλεί ένα email στο contact_email. Όρισε το στο 0 για να απενεργοποιήσεις αυτά τα emails."
     auto_close_messages_post_count: "Ανώταρο όριο αναρτήσεων που επιτρέπονται σε ένα μήνυμα πριν αυτό κλείσει αυτομάτως (0 για απενεργοποιήση)"
     auto_close_topics_post_count: "Ανώτατο όριο αναρτήσεων που επιτρέπονται σε ένα νήμα πριν αυτό κλείσει αυτομάτως (0 για απενεργοποίηση)"
     code_formatting_style: "Το κουμπί κώδικα στον συνθέτη θα έχει ως αποτέλεσμα αυτό το στυλ μορφοποίησης κώδικα "
@@ -1330,7 +1274,6 @@ el:
     watched_words_regular_expressions: "Οι λέξεις που επιτηρούνται είναι regular expressions."
     default_email_digest_frequency: "Πόσο συχνά οι χρήστες λαμβάνουν συνοπτικά email από προεπιλογή."
     default_include_tl0_in_digests: "Συμπεριέλαβε αναρτήσεις από νέους χρήστες στα συνοπτικά email από προεπιλογή. Οι χρήστες μπορούν να το αλλάξουν αυτό στις προτιμήσεις τους. "
-    default_email_private_messages: "Στείλε email όταν κάποιος στέλνει μήνυμα στο χρήστη από προεπιλογή."
     default_email_direct: "Στείλε email όταν κάποιος παραθέτει/απαντάει σε/αναφέρει ή προσκαλεί το χρήστη από προεπιλογή."
     default_email_mailing_list_mode: "Στείλε email για κάθε νέα ανάρτηση από προεπιλογή."
     default_email_mailing_list_mode_frequency: "Οι χρήστες, οι οποίοι έχουν ενεργοποιήσει την λειτουργία ταχυδρομικής λίστας θα λαμβάνουν emails τόσο συχνά από προεπιλογή."
@@ -1367,7 +1310,6 @@ el:
     max_tags_in_filter_list: "Μέγιστος αριθμός ετικετών που εμφανίζονται στο αναπτυσσόμενο μενού φίλτρων. Θα εμφανίζονται οι πιο συχνά χρησιμοποιημένες ετικέτες. "
     tags_sort_alphabetically: "Εμφάνιζε τις ετικέτες με αλφαβητική σειρά. Η προεπιλογή είναι να εμφανίζονται με σειρά δημοτικότητας. "
     tag_style: "Οπτικό στυλ για εμβλήματα ετικετών. "
-    staff_tags: "Μια λίστα ετικετών που μπορούν να εφαρμοστούν μόνο από μέλη του προσωπικού"
     min_trust_level_to_tag_topics: "Ελάχιστο επίπεδο εμπιστοσύνης που απαιτείται για προσθήκη ετικετών στα νήματα"
     suppress_overlapping_tags_in_list: "Αν μία ετικέτα ταιριάζει ακριβώς με μία λέξη στον τίτλο ενός θέματος, τότε μην εμφανίσεις την ετικέτα. "
     remove_muted_tags_from_latest: "Μην εμφανίζεις θέματα που έχουν επισημανθεί με ετικέτες σε σίγαση στην λίστα με τα νεώτερα θέματα. "
@@ -1425,18 +1367,18 @@ el:
     not_seen_in_a_month: "Καλώς ήλθες και πάλι! Δε σε έχουμε δει για αρκετό καιρό. Αυτά είναι τα πιο δημοφιλή νήματα συζητήσεων από την τελευταία σου επίσκεψη."
   merge_posts:
     edit_reason:
-      one: "Μία δημοσίευση συγχωνεύθηκε από %{username}"
-      other: "%{count} δημοσιεύσεις συγχωνεύθηκαν από %{username}"
+      one: Μία δημοσίευση συγχωνεύθηκε από %{username}
+      other: '%{count} δημοσιεύσεις συγχωνεύθηκαν από %{username}'
     errors:
       different_topics: "Δημοσιεύσεις που ανήκουν σε διαφορετικά νήματα δεν μπορούν να συγχωνευθούν."
       different_users: "Δημοσιεύσεις που ανήκουν σε διαφορετικούς χρήστες δεν μπορούν να συγχωνευθούν."
   move_posts:
     new_topic_moderator_post:
-      one: "Μια ανάρτηση διαχωρίστηκε σε ένα νέο νήμα: %{topic_link}"
-      other: "%{count} αναρτήσεις διαχωρίσθηκαν σε ένα νέο νήμα: %{topic_link}"
+      one: 'Μια ανάρτηση διαχωρίστηκε σε ένα νέο νήμα: %{topic_link}'
+      other: '%{count} αναρτήσεις διαχωρίσθηκαν σε ένα νέο νήμα: %{topic_link}'
     existing_topic_moderator_post:
-      one: "Μία ανάρτηση συγχωνεύθηκε σε ένα υπάρχον νήμα: %{topic_link}"
-      other: "%{count} αναρτήσεις συγχωνεύθηκαν σε ένα υπάρχον νήμα: %{topic_link}"
+      one: 'Μία ανάρτηση συγχωνεύθηκε σε ένα υπάρχον νήμα: %{topic_link}'
+      other: '%{count} αναρτήσεις συγχωνεύθηκαν σε ένα υπάρχον νήμα: %{topic_link}'
   change_owner:
     post_revision_text: "Η κυριότητα μεταφέρεται από %{old_user} σε %{new_user}."
     deleted_user: "έναν διεγραμμένο χρήστη"
@@ -1446,47 +1388,47 @@ el:
     closed_enabled: "Αυτό το νήμα είναι πια κλειστό. Οι απαντήσεις δεν είναι πλέον δυνατές"
     closed_disabled: "Αυτό το θέμα είναι τώρα ανοικτό. Επιτρέπονται νεές απαντήσεις."
     autoclosed_message_max_posts:
-      one: "Αυτό το μήνυμα έκλεισε αυτόματα αφού έφτασε το μέγιστο όριο της 1 απάντησης."
-      other: "Αυτό το μήνυμα έκλεισε αυτόματα αφού έφτασε το μέγιστο όριο των %{count} απαντήσεων."
+      one: Αυτό το μήνυμα έκλεισε αυτόματα αφού έφτασε το μέγιστο όριο της 1 απάντησης.
+      other: Αυτό το μήνυμα έκλεισε αυτόματα αφού έφτασε το μέγιστο όριο των %{count} απαντήσεων.
     autoclosed_topic_max_posts:
-      one: "Αυτό το νήμα έκλεισε αυτόματα αφού έφτασε το μέγιστο όριο της 1 απάντησης."
-      other: "Αυτό το νήμα έκλεισε αυτόματα αφού έφτασε το μέγιστο όριο των %{count} απαντήσεων."
+      one: Αυτό το νήμα έκλεισε αυτόματα αφού έφτασε το μέγιστο όριο της 1 απάντησης.
+      other: Αυτό το νήμα έκλεισε αυτόματα αφού έφτασε το μέγιστο όριο των %{count} απαντήσεων.
     autoclosed_enabled_days:
-      one: "Αυτό το νήμα έκλεισε αυτόματα μετά από 1 ημέρα. Δεν επιτρέπονται πια καινούριες απαντήσεις."
-      other: "Αυτό το νήμα έκλεισε αυτόματα μετά από %{count} ημέρες. Δεν επιτρέπονται πια καινούριες απαντήσεις."
+      one: Αυτό το νήμα έκλεισε αυτόματα μετά από 1 ημέρα. Δεν επιτρέπονται πια καινούριες απαντήσεις.
+      other: Αυτό το νήμα έκλεισε αυτόματα μετά από %{count} ημέρες. Δεν επιτρέπονται πια καινούριες απαντήσεις.
     autoclosed_enabled_hours:
-      one: "Αυτό το νήμα έκλεισε αυτόματα μετά από 1 ώρα. Δεν επιτρέπονται πια καινούριες απαντήσεις."
-      other: "Αυτό το νήμα έκλεισε αυτόματα μετά από %{count} ώρες. Δεν επιτρέπονται πια καινούριες απαντήσεις."
+      one: Αυτό το νήμα έκλεισε αυτόματα μετά από 1 ώρα. Δεν επιτρέπονται πια καινούριες απαντήσεις.
+      other: Αυτό το νήμα έκλεισε αυτόματα μετά από %{count} ώρες. Δεν επιτρέπονται πια καινούριες απαντήσεις.
     autoclosed_enabled_minutes:
-      one: "Αυτό το νήμα έκλεισε αυτόματα μετά από 1 λεπτό. Δεν επιτρέπονται πια καινούριες απαντήσεις."
-      other: "Αυτό το νήμα έκλεισε αυτόματα μετά από %{count} λεπτά. Δεν επιτρέπονται πια καινούριες απαντήσεις."
+      one: Αυτό το νήμα έκλεισε αυτόματα μετά από 1 λεπτό. Δεν επιτρέπονται πια καινούριες απαντήσεις.
+      other: Αυτό το νήμα έκλεισε αυτόματα μετά από %{count} λεπτά. Δεν επιτρέπονται πια καινούριες απαντήσεις.
     autoclosed_enabled_lastpost_days:
-      one: "Αυτό το νήμα έκλεισε αυτόματα 1 ημέρα μετά την τελευταία απάντηση. Δεν επιτρέπονται πλέον νέες απαντήσεις."
-      other: "Αυτό το νήμα έκλεισε αυτόματα %{count} ημέρες μετά την τελευταία απάντηση. Δεν επιτρέπονται πλέον νέες απαντήσεις."
+      one: Αυτό το νήμα έκλεισε αυτόματα 1 ημέρα μετά την τελευταία απάντηση. Δεν επιτρέπονται πλέον νέες απαντήσεις.
+      other: Αυτό το νήμα έκλεισε αυτόματα %{count} ημέρες μετά την τελευταία απάντηση. Δεν επιτρέπονται πλέον νέες απαντήσεις.
     autoclosed_enabled_lastpost_hours:
-      one: "Αυτό το νήμα έκλεισε αυτόματα 1 ώρα μετά την τελευταία απάντηση. Δεν επιτρέπονται πλέον νέες απαντήσεις."
-      other: "Αυτό το νήμα έκλεισε αυτόματα %{count} ώρες μετά την τελευταία απάντηση. Δεν επιτρέπονται πλέον νέες απαντήσεις."
+      one: Αυτό το νήμα έκλεισε αυτόματα 1 ώρα μετά την τελευταία απάντηση. Δεν επιτρέπονται πλέον νέες απαντήσεις.
+      other: Αυτό το νήμα έκλεισε αυτόματα %{count} ώρες μετά την τελευταία απάντηση. Δεν επιτρέπονται πλέον νέες απαντήσεις.
     autoclosed_enabled_lastpost_minutes:
-      one: "Αυτό το νήμα έκλεισε αυτόματα 1 λεπτό μετά την τελευταία απάντηση. Δεν επιτρέπονται πια καινούριες απαντήσεις."
-      other: "Αυτό το νήμα έκλεισε αυτόματα %{count} λεπτά μετά την τελευταία απάντηση. Δεν επιτρέπονται πια νέες απαντήσεις."
+      one: Αυτό το νήμα έκλεισε αυτόματα 1 λεπτό μετά την τελευταία απάντηση. Δεν επιτρέπονται πια καινούριες απαντήσεις.
+      other: Αυτό το νήμα έκλεισε αυτόματα %{count} λεπτά μετά την τελευταία απάντηση. Δεν επιτρέπονται πια νέες απαντήσεις.
     autoclosed_disabled_days:
-      one: "Το νήμα αυτό ανοίχτηκε αυτόματα μετά από 1 ημέρα."
-      other: "Το νήμα αυτό ανοίχτηκε αυτόματα μετά από %{count} ημέρες."
+      one: Το νήμα αυτό ανοίχτηκε αυτόματα μετά από 1 ημέρα.
+      other: Το νήμα αυτό ανοίχτηκε αυτόματα μετά από %{count} ημέρες.
     autoclosed_disabled_hours:
-      one: "Το νήμα αυτό ανοίχτηκε αυτόματα μετά από 1 ώρα."
-      other: "Το νήμα αυτό ανοίχτηκε αυτόματα μετά από %{count} ώρες."
+      one: Το νήμα αυτό ανοίχτηκε αυτόματα μετά από 1 ώρα.
+      other: Το νήμα αυτό ανοίχτηκε αυτόματα μετά από %{count} ώρες.
     autoclosed_disabled_minutes:
-      one: "Το νήμα αυτό ανοίχτηκε αυτόματα μετά από 1 λεπτό."
-      other: "Το νήμα αυτό ανοίχτηκε αυτόματα μετά από %{count} λεπτά."
+      one: Το νήμα αυτό ανοίχτηκε αυτόματα μετά από 1 λεπτό.
+      other: Το νήμα αυτό ανοίχτηκε αυτόματα μετά από %{count} λεπτά.
     autoclosed_disabled_lastpost_days:
-      one: "Το νήμα αυτό ανοίχτηκε αυτόματα 1 ημέρα μετά την τελευταία απάντηση."
-      other: "Το νήμα αυτό ανοίχτηκε αυτόματα %{count} ημέρες μετά την τελευταία απάντηση."
+      one: Το νήμα αυτό ανοίχτηκε αυτόματα 1 ημέρα μετά την τελευταία απάντηση.
+      other: Το νήμα αυτό ανοίχτηκε αυτόματα %{count} ημέρες μετά την τελευταία απάντηση.
     autoclosed_disabled_lastpost_hours:
-      one: "Το νήμα αυτό ανοίχτηκε αυτόματα 1 ώρα μετά την τελευταία απάντηση."
-      other: "Το νήμα αυτό ανοίχτηκε αυτόματα %{count} ώρες μετά την τελευταία απάντηση."
+      one: Το νήμα αυτό ανοίχτηκε αυτόματα 1 ώρα μετά την τελευταία απάντηση.
+      other: Το νήμα αυτό ανοίχτηκε αυτόματα %{count} ώρες μετά την τελευταία απάντηση.
     autoclosed_disabled_lastpost_minutes:
-      one: "Το νήμα αυτό ανοίχτηκε αυτόματα 1 λεπτό μετά την τελευταία απάντηση."
-      other: "Το νήμα αυτό ανοίχτηκε αυτόματα %{count} λεπτά μετά την τελευταία απάντηση."
+      one: Το νήμα αυτό ανοίχτηκε αυτόματα 1 λεπτό μετά την τελευταία απάντηση.
+      other: Το νήμα αυτό ανοίχτηκε αυτόματα %{count} λεπτά μετά την τελευταία απάντηση.
     autoclosed_disabled: "Αυτό το νήμα είναι τώρα ανοικτό. Επιτρέπονται νέες απαντήσεις."
     autoclosed_disabled_lastpost: "Αυτό το νήμα είναι τώρα ανοικτό. Επιτρέπονται νέες απαντήσεις."
     pinned_enabled: "Αυτό το νήμα είναι τώρα καρφιτσωμένο. Θα εμφανίζεται στην κορυφή της κατηγορίας του έως ότου ξεκαρφιτσωθεί από τους συνεργάτες για όλους ή από τους χρήστες για τον εαυτό τους."
@@ -1550,11 +1492,11 @@ el:
     auto_rejected: "Απορρίφθηκε αυτόματα λόγω παλαιότητας. Δες την ρύθμιση auto_handle_queued_age της ιστοσελίδας."
   flags_reminder:
     flags_were_submitted:
-      one: "Οι σημάνσεις έχουν καταχωρηθεί πάνω από 1 ώρα πριν. [Παρακαλούμε ελέγξτε τις](/admin/flags)."
-      other: "Οι σημάνσεις έχουν καταχωρηθεί πάνω από %{count} ώρες πριν. [Παρακαλούμε ελέγξτε τις](/admin/flags)."
+      one: Οι σημάνσεις έχουν καταχωρηθεί πάνω από 1 ώρα πριν. [Παρακαλούμε ελέγξτε τις](/admin/flags).
+      other: Οι σημάνσεις έχουν καταχωρηθεί πάνω από %{count} ώρες πριν. [Παρακαλούμε ελέγξτε τις](/admin/flags).
     subject_template:
-      one: "1 επισήμανση περιμένει να διαχειριστεί"
-      other: "%{count} επισημάνσεις περιμένουν να διαχειριστούν"
+      one: 1 επισήμανση περιμένει να διαχειριστεί
+      other: '%{count} επισημάνσεις περιμένουν να διαχειριστούν'
   unsubscribe_mailer:
     title: "Απεγγραφή"
     subject_template: "Επιβεβαιώστε ότι δε θέλετε να λαμβάνετε πλέον ενημερώσεις μέσω email από %{site_title}"
@@ -1605,47 +1547,6 @@ el:
   test_mailer:
     title: "Δοκιμαστική Αποστολή"
     subject_template: "[%{email_prefix}] Email Deliverability Test"
-    text_body_template: |
-      Αυτό είναι το πρώτο δοκιμαστικό μήνυμα ηλεκτρονικού ταχυδρομείου από
-
-      [**%{base_url}**][0]
-
-      Η δοκιμή ικανότητας παράδοσης με μήνυμα ηλεκτρονικού ταχυδρομείου είναι περίπλοκη. Εδώ θα βρεις μερικά σημαντικά πράγματα που πρέπει πρώτα να ελέγξεις:
-
-      -*Σιγουρέψου* ότι έθεσες τις `ειδοποιήσεις ηλεκτρονικού ταχυδρομείου ` από: διεύθυνση σωστά στις ρυθμίσεις ιστοτόπου σου. **Ο τομέας που περιγράφεται στην "από" διεύθυνση ηλεκτρονικού ταχυδρομείου από την οποία στέλνεις είναι ο τομέας απέναντι στον οποίο θα εξακριβωθεί η διεύθυνση ηλεκτρονικού ταχυδρομείου σου **.
-
-      - Μάθε πως μπορείς να δεις την αρχική πηγή των μηνυμάτων ηλεκτρονικού ταχυδρομείου στην αλληλογραφία του πελάτη σου, ώστε να μπορείς να εξετάζεις τίτλους μηνυμάτων ηλεκτρονικού ταχυδρομείου για σημαντικά στοιχεία. Στο Gmail, είναι η "δείξε το αρχικό" επιλογή στο ανοιγμένο μενού στην πάνω δεξιά μεριά κάθε μηνύματος ηλεκτρονικού ταχυδρομείου.
-
-      - **ΣΗΜΑΝΤΙΚΟ:** Έχει ο ISP σου αντίστροφο αρχείο DNS που έχει εισαχθεί για να συσχετίζει τα ονόματα τομέων και τις διευθύνσεις IP από τις οποίες στέλνεις αλληλογραφία; [Έλεγξε το αντίστροφο αρχείο PTR ][2] εδώ. Αν ο ISP σου δεν εισάγει το σωστό κέρσορα του αντίστροφου αρχείου DNS, είναι απίθανο οποιοδήποτε μήνυμα ηλεκτρονικού ταχυδρομείου σου να παραδοθεί.
-
-      - Είναι το [SPF record][8] του τομέα σου σωστό; [Έλεγξε το αρχείο SPF][1] εδώ. Σημείωσε ότι TXT είναι ο σωστός επίσημος τύπος αρχείου SPF.
-
-      - Είναι το [DKIM record][3] του τομέα σου σωστό? Αυτό θα βελτιώσει την ικανότητα παράδοσης με μήνυμα ηλεκτρονικού ταχυδρομείου σημαντικά. [Έλεγξε το αρχείο DKIM σου][7] εδώ.
-
-      - Αν τρέχεις το δικό σου διακομιστή αλληλογραφίας, έλεγξε και επιβεβαίωσε ότι τα IPs του διακομιστή αλληλογραφίας σου [δεν είναι σε μαύρη λίστα μηνυμάτων ηλεκτρονικής αλληλογραφίας][4]. Επίσης, επιβεβαίωσε ότι σίγουρα στέλνει ένα εξειδικευμένο όνομα δέκτη που παίρνει τη μορφή DNS στο HELO μήνυμα. Αν όχι, αυτό θα προκαλέσει απόρριψη του ηλεκτρονικού ταχυδρομείου σου από πολλές υπηρεσίες αλληλογραφίας.
-
-      - Σου προτείνουμε να **στείλεις ένα δοκιμαστικό μήνυμα ηλεκτρονικού ταχυδρομείου [mail-tester.com][mt]** για να εξακριβώσεις αν όλα τα παραπάνω λειτουργούν κανονικά.
-
-      (Ο *εύκολος* τρόπος είναι να δημιουργήσεις ένα δωρεάν λογαριασμό στο [SendGrid][sg], [SparkPost][sp], [Mailgun][mg] ή [Mailjet][mj], τα οποία έχουν γεναιόδωρα ελεύθερα πλάνα αλληλογραφίας και θα είναι εντάξει για μικρές κοινότητες. Ακόμη χρειάζεται να ενεργοποιήσεις τα αρχεία SPF και DKIM στο DNS σου, όμως!)
-
-      Ελπίζουμε να έλαβες αυτή τη δοκιμή ικανότητας παράδοσης με μήνυμα ηλεκτρονικού ταχυδρομείου ΕΝΤΑΞΕΙ!
-
-      Καλή επιτυχία,
-
-      Οι φίλοι σου στο [Discourse](http://www.discourse.org)
-
-      [0]: %{base_url}
-      [1]: http://www.kitterman.com/spf/validate.html
-      [2]: http://mxtoolbox.com/ReverseLookup.aspx
-      [3]: http://www.dkim.org/
-      [4]: http://whatismyipaddress.com/blacklist-check
-      [7]: https://www.mail-tester.com/spf-dkim-check
-      [8]: http://www.openspf.org/SPF_Record_Syntax
-      [sg]: https://goo.gl/r1WMF6
-      [sp]: https://www.sparkpost.com/
-      [mg]: http://www.mailgun.com/
-      [mj]: https://www.mailjet.com/pricing
-      [mt]: http://www.mail-tester.com/
   new_version_mailer:
     title: "Αποστολή Καινούργιας Έκδοσης"
     subject_template: "[%{email_prefix}] Νέα έκδοση Discourse, διαθέσιμη ενημέρωση"
@@ -1664,8 +1565,8 @@ el:
     deferred: "Ευχαριστούμε που μας ειδοποιήσατε. Το εξετάζουμε."
     deferred_and_deleted: "Ευχαριστούμε που μας ειδοποιήσατε. Έχουμε αφαιρέσει τη δημοσίευση."
   temporarily_closed_due_to_flags:
-    one: "Αυτό το νήμα έχει κλείσει προσωρινά για 1 ώρα λόγω μεγάλου αριθμού σημάνσεων από την κοινότητα."
-    other: "Αυτό το νήμα έχει κλείσει προσωρινά για %{count} ώρες λόγω μεγάλου αριθμού σημάνσεων από την κοινότητα."
+    one: Αυτό το νήμα έχει κλείσει προσωρινά για 1 ώρα λόγω μεγάλου αριθμού σημάνσεων από την κοινότητα.
+    other: Αυτό το νήμα έχει κλείσει προσωρινά για %{count} ώρες λόγω μεγάλου αριθμού σημάνσεων από την κοινότητα.
   system_messages:
     private_topic_title: "Νήμα #%{id}"
     contents_hidden: "Παρακαλώ επισκεφθείτε αυτή την ανάρτηση για να δείτε τα περιεχόμενά της."
@@ -1766,7 +1667,6 @@ el:
         ```
     csv_export_succeeded:
       title: "Η CSV Εξαγωγή Πέτυχε"
-      subject_template: "Εξαγωγή δεδομένων ολοκληρώθηκε"
       text_body_template: |
         Η εξαγωγή αρχείων σου ήταν επιτυχής! :dvd:
 
@@ -1997,8 +1897,8 @@ el:
     pending_users_reminder:
       title: "Υπενθύμηση για χρήστες που εκκρεμούν"
       subject_template:
-        one: "1 χρήστης περιμένει για έγκριση"
-        other: "%{count} χρήστες περιμένουν για έγκριση"
+        one: 1 χρήστης περιμένει για έγκριση
+        other: '%{count} χρήστες περιμένουν για έγκριση'
       text_body_template: |
         Υπάρχουν εγγραφές νέων χρηστών σε αναμονή έγκρισης (΄ή απόρριψης) πριν μπορέσουν να έχουν πρόσβαση σε αυτό το φόρουμ.
 
@@ -2026,8 +1926,8 @@ el:
     queued_posts_reminder:
       title: "Υπενθύμιση Ουράς Αναρτήσεων"
       subject_template:
-        one: "1 ανάρτηση σε αναμονή για έλεγχο"
-        other: "%{count} αναρτήσεις σε αναμονή για έλεγχο"
+        one: 1 ανάρτηση σε αναμονή για έλεγχο
+        other: '%{count} αναρτήσεις σε αναμονή για έλεγχο'
       text_body_template: |
         Γεια σου,
 
@@ -2047,8 +1947,8 @@ el:
   user_notifications:
     previous_discussion: "Προηγούμενες Απαντήσεις"
     reached_limit:
-      one: "Ενημέρωση: Στέλνουμε το μέγιστο 1 email καθημερινά. Ελέγξτε την ιστοσελίδα για να δείτε αυτά που πιθανώς έχουν κρατηθεί. "
-      other: "Ενημέρωση: Στέλνουμε το μέγιστο %{count} emails καθημερινά. Ελέγξτε την ιστοσελίδα για να δείτε αυτά που πιθανώς έχουν κρατηθεί. ΥΓ ευχαριστούμε που είστε τόσο δημοφιλής!"
+      one: 'Ενημέρωση: Στέλνουμε το μέγιστο 1 email καθημερινά. Ελέγξτε την ιστοσελίδα για να δείτε αυτά που πιθανώς έχουν κρατηθεί. '
+      other: 'Ενημέρωση: Στέλνουμε το μέγιστο %{count} emails καθημερινά. Ελέγξτε την ιστοσελίδα για να δείτε αυτά που πιθανώς έχουν κρατηθεί. ΥΓ ευχαριστούμε που είστε τόσο δημοφιλής!'
     in_reply_to: "Απάντηση Σε"
     unsubscribe:
       title: "Απεγγραφή"
@@ -2229,7 +2129,7 @@ el:
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
-        %{message}
+          %{message}
     account_suspended:
       title: "Χρήστης σε Αποβολη"
       subject_template: "[%{email_prefix}] Ο λογαριασμός σου είναι σε κατάσταση αποβολής"
@@ -2349,21 +2249,6 @@ el:
     signup_after_approval:
       title: "Εγγραφή μετά από έγκριση "
       subject_template: "Έχετε εγκριθεί στην %{site_name}!"
-      text_body_template: |
-        Καλώς ήρθατε στην %{site_name}!
-
-        Ένα μέλος του προσωπικού ενέκρινε τον λογαριασμό σας στην %{site_name}.
-
-        Κάντε κλικ στον παρακάτω σύνδεσμο για να επικυρώσετε και να ενεργοποιήσετε τον νέο λογαριασμό σας:
-        %{base_url}/u/activate-account/%{email_token}
-
-        Αν για κάποιο λόγο δεν μπορείτε να κάνετε κλικ στον παραπάνω σύνδεσμο, παρακαλούμε αντιγράψτε ολόκληρη την διεύθυνση και επικολλήστε την στην γραμμή διευθύνσεων του περιηγητή σας.
-
-        %{new_user_tips}
-
-        Επικροτούμε πάντα την [πολιτισμένη κοινωνική συμπεριφορά](%{base_url}/guidelines).
-
-        Καλά να περάσετε!
     signup:
       title: "Εγγραφή"
       subject_template: "[%{email_prefix}] Επικυρώστε τον νέο σας λογαριασμό"
@@ -2553,162 +2438,6 @@ el:
       Yes, legalese is boring, but we must protect ourselves &ndash; and by extension, you and your data &ndash; against unfriendly folks. We have a [Terms of Service](/tos) describing your (and our) behavior and rights related to content, privacy, and laws. To use this service, you must agree to abide by our [TOS](/tos).
   tos_topic:
     title: "Όροι Χρήσης"
-    body: |+
-      Οι ακόλουθοι όροι και προϋποθέσεις διέπουν την χρήση του %{company_domain} ιστότοπου και όλου του περιεχομένου, υπηρεσιών και προϊόντων που διατίθενται στον ή από τον ιστότοπο, συμπεριλαμβανομένων αλλά μη περιοριζομένων, και των %{company_domain} Λογισμικό Φόρουμ, %{company_domain} Φόρουμ Υποστήριξης και %{company_domain} Υπηρεσία Φιλοξενίας (‘’Φιλοξενια’’), (λαμβανόμενα μαζί, ο ιστότοπος). Ο ιστότοπος ανήκει και λειτουργεί από την %{company_full_name} ("%{company_name}"). Ο ιστότοπος προσφέρεται υπό την προυπόθεση της εκ μέρους σας αποδοχής, χωρίς τροποποίηση όλων των όρων και συνθηκών που περιλαμβάνονται στο παρόν κείμενο και όλους τους άλλους κανόνες λειτουργείας, πολιτικές (περιλαμβανομένων, χωρίς περιορισμό, %{company_domain}’s [Πολιτική προστασίας προσωπικών δεδομένων](/προστασία προσωπικών δεδομένων) και [Κατευθυντήριες Οδηγίες Κοινότητας](Συχνές Ερωτήσεις)) και διαδικασίες που μπορεί να δημοσιευθούν από καιρού εις καιρών σε αυτό τον ιστότοπο από την %{company_name} (Συνοπτικά, το ‘’Συμφωνητικό’’).
-
-      Παρακαλώ διαβάστε αυτό το Συμφωνητικό προσεκτικά πριν την πρόσβαση ή την χρήση του ιστότοπου. Με την πρόσβαση ή την χρήση οποιουδήποτε μέρους του ιστότοπου, συφωνείτε να δεσμευτείτε από τους όρους και τις προϋποθέσεις αυτού του Συμφωνητικού. Αν δεν συμφωνείτε με όλους τους όρους και τις προϋποθέσεις του Συμφωνητικού, τότε δεν μπορείτε να έχετε πρόσβαση στον ιστότοπο ή να χρησιμοποιήσετε οποιαδήποτε από τις υπηρεσίες. Εαν αυτοί οι όροι και οι προϋποθέσεις θεωρούνται ως προσφορά από την %{company_name}, η αποδοχή περιορίζεται ρητά σε αυτούς τους όρους. Ο ιστότοπος είναι διαθέσιμος μόνο σε άτομα που είναι τουλάχιστον 13 ετών.
-
-      <a name="1"></a>
-
-      ## [1. Ο %{company_domain} Λογαριασμός σας](#1)
-
-
-      Αν δημιουργήσετε λογαριασμό στον ιστότοπο, είστε υπεύθυνοι για την τήρηση της ασφάλειας του λογαριασμού σας και έχετε πλήρη ευθύνη για όλες τις ενέργειες που θα πραγματοποιηθούν μέσω του λογαριασμού. Πρέπει να ειδοποιήσετε αμέσως την %{company_name} για την οποιαδήποτε μη εξουσιοδοτημένη χρήση του λογαριασμού σας ή οποιαδήποτε άλλη παραβίαση της ασφάλειας του. Η %{company_name} δεν φέρει ευθύνη για οποιεσδήποτε πράξεις ή παραλείψεις από εσάς, συμπεριλαμβανομένων των οποιουδήποτε είδους ζημιών που προκλήθηκαν ως αποτέλεσμα αυτών των πράξεων ή παραλείψεων.
-
-      <a name="2"></a>
-
-      ## [2. Ευθύνη των Συνεισφερόντων](#2)
-
-
-      Αν αναρτήσετε υλικό στον ιστότοπο, αναρτήσετε συνδέσμους στον ιστότοπο, ή με άλλον τρόπο καταστήσετε (ή επιτρέψετε σε κάποιον τρίτον να καταστήσει) υλικό διαθέσιμο μέσω του ιστότοπου (οποιοδήποτε τέτοιο υλικό, ‘Περιεχόμενο’), είστε αποκλειστικά υπεύθυνοι για το περιεχόμενο και οποιαδήποτε βλάβη προκληθεί από το περιεχόμενο αυτό. Αυτό ισχύει ανεξάρτητα από το αν το εν λόγω περιεχόμενο αποτελείται απο κείμενο, γραφικά, αρχείο ήχου, ή λογισμικό για ηλεκτρονικούς υπολογιστές. Καθιστόντας περιεχόμενο διαθέσιμο, εκπροσωπείτε και εγγυάστε οτι:
-
-      * η λήψη, αντιγραφή και χρήση του Περιεχομένου δεν παραβιάζει τα δικαιώματα ιδιοκτησίας, περιλαμβανομένων αλλά μη περιοριζομένων στα πνευματικά δικαιώματα, ευρεσιτεχνίες, σήματα κατατεθέντα ή δικαιώματα εμπορικών μυστικών, κανενός τρίτου·
-
-      * αν ο εργοδότης έχει δικαιώματα στην πνευματική ιδιοκτησία που παράγετε, τότε είτε (1) έχετε λάβει άδεια από τον εργοδότη σας να αναρτάτε ή να διαθέτετε το Περιεχόμενο, περιλαμβανομένου αλλά μη περιοριζομένου οποιουδήποτε λογισμικού, ή (2) έχετε εξασφαλίσει από τον εργοδότη σας μια παραίτηση όσον αφορά τα πνευματικά δικαιώματα σχετικά με το Περιεχόμενο·
-
-      * έχετε πλήρως συμμορφωθεί με τις άδειες τρίτων σχετικά με το Περιεχόμενο, και έχετε όλες τις αναγκαίες ενέργειες για να ενημερώσετε τους τελικούς χρήστες για οποιουσδήποτε απαιτούμενους όρους·
-
-      * το Περιεχόμενο δεν περιέχει ή εγκαθιστά ιούς, και πάσης φύσεως κακόβουλο λογισμικό ή άλλο επιβλαβές ή καταστροφικό περιεχόμενο·
-
-      * το Περιεχόμενο δεν είναι ανεπιθύμητη αλληλογραφία, δεν παράγεται από μηχανή ή τυχαία διαδικασία, και δεν περιλαμβάνει ανήθικο ή ανεπιθύμητο εμπορικό περιεχόμενο σχεδιασμένο να καθοδηγεί κίνηση προς ιστότοπους τρίτων ή να βελτιώνει τις κατατάξεις ιστότοπων τρίτων σε μηχανές αναζήτησης ή σε περαιτέρω παράνομες πράξεις (όπως η κακόβουλη εκμαίευση μυστικών πληροφοριών (‘ψάρεμα’)) ή να παραπλανήσει αποδέκτες σχετικά με την πηγή του υλικού (όπως η παράνομη παραποίηση της ηλεκτρονικής διεύθυνσης προέλευσης)·
-
-      * το Περιεχόμενο δεν είναι πορνογραφικό, δεν περιέχει απειλές ή προκαλεί βία και δεν παραβιάζει τα προσωπικά δεδομένα ή δικαιώματα δημοσιότητας τρίτων·
-
-      * το Περιεχόμενο δεν διαφημίζεται μέσω ανεπιθύμητων ηλεκτρονικών μηνυμάτων, όπως σύνδεσμοι σε ανεπιθύμητη αλληλογραφία ευρισκόμενους σε ομάδες συζήτησης, καταλόγους διευθύνσεων ηλεκτρονικού ταχυδρομείου, ιστολόγια και ιστότοπους, καθώς και παρεμφερείς απρόσκλητες προωθητικές μεθόδους·
-
-      * το περιεχόμενο σας δεν έχει όνομα που να παραπλανεί τους αναγνώστες στο να πιστεύουν οτι είστε ένα άλλο πρόσωπο ή εταιρεία· και
-
-      * έχετε, στην περίπτωση περιεχομένου που περιλαμβάνει κώδικα προγραμματισμού ηλεκτρονικών υπολογιστών, επακριβώς κατηγοριοποιήσει ή/και περιγράψει τον τύπο, την φύση, τις χρήσεις και τα αποτελέσματα των υλικών, είτε αυτό απαιτείται να γίνει από την %{company_name} ή από κάποιον άλλον.
-
-      <a name="3"></a>
-
-      ## [3. Άδεια Περιεχομένου του Χρήστη](#3)
-
-      Οι συνεισφορές των χρηστών αδειοδοτούνται υπό το καθεστώς του [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Χωρίς να περιορίζονται καμία από αυτές τις αντιπροσωπεύσεις ή εγγυήσεις, η %{company_name} έχει το δικαίωμα (αλλά όχι την υποχρέωση), κατά την αποκλειστική διακριτική ευχέρεια της %{company_name} να (i) αρνηθεί ή αφαιρέσει οποιοδήποτε περιεχόμενο που, κατά την λογική άποψη της %{company_name}, παραβιάζει οποιαδήποτε πολιτική της %{company_name} ή είναι κατά οιονδήποτε τρόπο επιβλαβές ή ανάρμοστο, ή (ii) να τερματίσει ή να αρνηθεί την πρόσβαση και τη χρήση του Ιστότοπου σε οποιοδήποτε άτομο ή οντότητα για οποιονδήποτε λόγο, κατά την απόλυτη διακριτική ευχέρεια της %{company_name}. Η %{company_name} δεν θα έχει υποχρέωση να επιστρέψει οποιαδήποτε χρηματικά ποσά έχουν ήδη πληρωθεί.
-
-      <a name="4"></a>
-
-      ## [4. Πληρωμή και Ανανέωση](#4)
-
-      ### Γενικοί Όροι
-
-      Προαιρετικές υπηρεσίες ή αναβαθμίσεις επί πληρωμής μπορεί να είναι διαθέσιμες στον ιστότοπο. Όταν χρησιμοποιείται μία υπηρεσία ή αναβάθμιση επί πληρωμής, συμφωνείτε να πληρώσετε την %{company_name} τα μηνιαία ή ετήσια συνδρομητικά τέλη που  υποδεικνύονται. Οι πληρωμές θα πραγματοποιούνται την ημέρα που θα αρχίσετε να χρησιμοποιείτε την υπηρεσία ή την αναβάθμιση και θα καλύπτουν την χρήση αυτής της υπηρεσίας ή της αναβάθμισης για την μηνιαία ή την ετήσια συνδρομητική περίοδο όπως υποδεικνύεται. Αυτές οι χρεώσεις είναι μη επιστρεφόμενες.
-
-      ### Αυτόματη Ανανέωση
-
-      Εκτώς και αν ειδοποιήσετε την %{company_name} πριν το τέλος της ισχύουσας συνδρομητικής περιόδου οτι θέλετε να ακυρώσετε μία υπηρεσία ή μία αναβάθμιση, η συνδρομή σας θα ανανεωθεί αυτόματα και μας εξουσιοδοτείτε να εισπράξουμε τα τότε ισχύοντα ετήσια ή μηνιαία συνδρομητικά τέλη (καθώς και οποιουσδήποτε φόρους) χρησιμοποιόντας οποιαδήποτε πιστωτική κάρτα ή άλλο τρόπο πληρωμής που έχουμε καταγεγραμμένη από εσάς. Οι συνδρομές μπορούν να ακυρωθούν οποιαδήποτε στιγμή.
-
-      <a name="5"></a>
-
-      ## [5. Υπηρεσίες](#5)
-
-      ### Φιλοξενία, Υπηρεσίες Υποστήριξης
-
-      Προαιρετική φιλοξενία και υπηρεσίες Υποστήριξης μπορεί να προμηθευτούν από την %{company_name} υπό τους όρους και τις προϋποθέσεις της κάθε τέτοιας υπηρεσίας. Με την εγγραφή σας για έναν λογαριασμό Φιλοξενίας/Υποστήριξης ή λογαριασμό υπηρεσιών Υποστήριξης, συμφωνείτε να συμμορφωθείτε με τέτοιους όρους και προϋποθέσεις.
-
-      <a name="6"></a>
-
-      ## [6. Ευθήνη των Επισκεπτών του Ιστότοπου](#6)
-
-
-      Η %{company_name} δεν έχει ελέγξει, και δεν μπορεί να ελέγξει, όλο το υλικό, περιλαμβανομένων των λογισμικών υπολογιστών, που αναρτώνται στον Ιστότοπο, και επομένως δεν μπορεί να είναι υπεύθυνη για τα περιεχόμενα, την χρήση και τις επιδράσεις αυτού του υλικού. Η λειτουργεία του Ιστότοπου από την %{company_name}, δεν αντιπροσωπεύει ή συνεπάγεται οτι εγκρίνει το υλικό που έχει αναρτηθεί στον Ιστότοπο, ή οτι πιστεύει πως το υλικό είναι σωστό, χρήσιμο ή μη επιβλαβές. Είστε υπεύθυνος να λάβετε τις απαραίτητες προφυλάξεις για να προστατεύσετε τον εαυτό σας και τον υπολογιστή σας από ιούς, κακόβουλα λογισμικά και άλλα επιβλαβή ή καταστροφικά περιεχόμενα. Ο Ιστότοπος μπορεί να περιέχει περιεχόμενα που να είναι προσβλητικά, απρεπή ή αλλιώς μη αποδεκτά, καθώς και περιεχόμενο που εμπεριέχει θεωρητικές ανακρίβειες, τυπογραφικά λάθη και άλλα σφάλματα. Ο Ιστότοπος μπορεί επίσης να περιέχει υλικό που παραβιάζει τα δικαιώματα προστασίας προσωπικών δεδομένων ή τα δικαιώματα δημοσιότητας, ή καταπατά την πνευματική ιδιοκτησία και άλλα δικαιώματα ιδιοκτησίας τρίτων, ή των οποίων η λήψη, η αντιγραφή ή η χρήση υπόκειται σε επιπλέον όρους και προϋποθέσεις, καθορισμένους ή μη καθορισμένους. Η %{company_name} αποποιείται οποιαδήποτε ευθύνη για όποια τυχόν βλάβη προκληθεί από την χρήση του Ιστότοπου από τους επισκέπτες του, ή από την όποιαδήποτε λήψη περιεχομένου από τους επισκέπτες του Ιστότοπου που  αναρτήθηκε σε αυτο.
-
-      <a name="7"></a>
-
-      ## [7. Περιεχόμενο που Άναρτήθηκε σε Άλλους Ιστότοπους](#7)
-
-      Δεν έχουμε ελέγξει, και δεν μπορούμε να ελέγξουμε, όλο το υλικό, περιλαμβανομένων των λογισμικών υπολογιστών, διαθέσιμο μέσα από τους ιστότοπους και τις ιστοσελίδες που συνδέονται με την %{company_domain}. Η %{company_name} δεν ελέγχει τους ιστότοπους και τις ιστοσελίδες που δεν ανήκουν στην %{company_name} και δεν είναι υπεύθυνη για τα περιεχόμενα τους ή την χρήση τους. Η ύπαρξη συνδέσμων μεταξύ της %{company_name} και των ιστότοπων ή των ιστοσελίδων που δεν ανήκουν στην %{company_name}, δεν αντιπροσωπεύει ή συνεπάγεται οτι η  %{company_name} εγκρίνει αυτούς τους ιστότοπους ή ιστοσελίδες. Είστε υπεύθυνοι να λάβετε τις απαραίτητες προφυλάξεις για να προστατεύσετε τον εαυτό σας και τον υπολογιστή σας από ιούς, κακόβουλα λογισμικά και άλλα επιβλαβή ή καταστροφικά περιεχόμενα. Η %{company_name} αποποιείται οποιαδήποτε ευθύνη για όποια ζημιά προκληθεί από την χρήση ιστότοπων και ιστοσελίδων που δεν ανήκουν στην %{company_name}.
-
-
-      <a name="8"></a>
-
-      ## [8. Καταπάτηση Πνευματικής Ιδιοκτησίας και η Πολιτική DMCA](#8)
-
-
-      Όπως η %{company_name} ζητά από τους άλλους να σεβαστούν τα δικαιώματα πνευματικής ιδιοκτησίας της, έτσι και η %{company_name} σέβεται τα δικαιώματα πνευματικής ιδιοκτησίας των άλλων. Αν πιστεύετε οτι υλικό που βρίσκεται στην %{company_domain} ή συνδέεται με την %{company_domain} παραβιάζει τα δικαιώματα πνευματικής ιδιοκτησίας σας, και αν αυτός ο ιστότοπος βρίσκεται στις ΗΠΑ, σας ενθαρρύνουμε να ειδοποιήσετε την %{company_name} σύμφωνα με την Πολιτική [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") της %{company_name}. Η %{company_name} θα ανταποκριθεί με τον τρόπο που ζητείται ή είναι κατάλληλος, σε όλες τις σχετικές ειδοποιήσεις και θα αφαιρέσει το υλικό που καταπατά τα δικαιώματα πνευματικής ιδιοκτησίας σας ή θα απενεργοποιήσει όλους τους συνδέσμους που συνδέονται με αυτό το υλικό. Η %{company_name} θα τερματίσει την πρόσβαση του επισκέπτη στον Ιστότοπο, καθώς και τη χρήση του Ιστότοπου από τον επισκέπτη, αν, υπό τις κατάλληλες συνθήκες, ο επισκέπτης θεωρηθεί πως έχει επανειλημμένα καταπατήσει τα πνευματικά δικαιώματα ή άλλα πνευματικά δικαιώματα ιδιοκτησίας της %{company_name} ή άλλων. Σε περίπτωση τέτοιου τερματισμού, η %{company_name} δεν έχει καμία υποχρέωση να προβεί σε επιστροφή όποιων ποσών έχουν προηγουμένως πληρωθεί στην %{company_name}.
-
-      <a name="9"></a>
-
-      ## [9. Πνευματική Ιδιοκτησία](#9)
-
-
-      Το παρόν Συμφωνητικό δεν μεταφέρει από την %{company_name} προς εσάς καμία πνευματική ιδιοκτησία της %{company_name} ή τρίτου και κάθε δικαίωμα, τίτλος και συμφέρον σε τέτοιου είδους ιδιοκτησία θα παραμείνει (όπως μεταξύ των μερών) αποκλειστικά στην %{company_name}. %{company_name}, %{company_domain}, το %{company_domain} λογότυπο, και όλα τα άλλα σήματα κατατεθέντα, σήματα υπηρεσιών, γραφικά και λογότυπα που χρησιμοποιούνται σε σχέση με την %{company_domain}, ή τον Ιστότοπο αποτελούν σήματα κατατεθέντα ή καταχωρημένα σήματα κατατεθέντα της %{company_name} ή των αδειοδοτών της %{company_name}. Άλλα σήματα κατατεθέντα, σήματα υπηρεσιών, γραφικά και λογότυπα που χρησιμοποιούνται σε σχέση με τον Ιστότοπο μπορεί να είναι σήματα κατατεθέντα τρίτων. Η χρήση του Ιστότοπου δεν σας δίνει το δικαίωμα ή την άδεια να αναπαράγετε ή κατά οιοδήποτε τρόπο να χρησιμοποιείτε τα σήματα κατατεθέντα της %{company_name} ή τρίτων.
-
-
-      <a name="10"></a>
-
-      ## [10. Διαφημίσεις](#10)
-
-      Η %{company_name} διατηρεί το δικαίωμα να προβάλει διαφημίσεις πάνω στο περιεχόμενο σας εκτός εάν έχετε αγοράσει μία Αναβάθμιση ή λογαριασμό Υπηρεσιών δίχως διαφημίσεις.
-
-      <a name="11"></a>
-
-      ## [11. Αναγνώριση](#11)
-
-
-      Η %{company_name} διατηρεί το δικαίωμα να προβάλει συνδέσμους αναγνώρισης όπως ‘Powered by %{company_domain},’ συγγραφέα θεματικής εμφάνισης, και γραμματοσειράς αναγνώρισης στο υποσέλιδο του περιεχομένου σας ή στην εργαλειοσειρά σας. Οι αναφορές αναγνώρισης στο υποσέλιδο και η εργαλειοσειρά της %{company_domain} δεν μπορούν να αφαιρεθούν ανεξαρτήτως από το αν έχουν αγοραστεί αναβαθμίσεις.
-
-
-      <a name="12"></a>
-
-      ## [12. Αλλαγές](#12)
-
-      Η %{company_name} διατηρεί το δικαίωμα, κατά την αποκλειστική διακριτική της ευχέρεια, να τροποποιεί ή να αντικαθιστά οποιοδήποτε μέρος του παρόντος Συμφωνητικού. Είναι δική σας ευθύνη να ελέγχετε περιοδικά το παρόν Συμφωνητικό για αλλαγές. Η συνεχιζόμενη χρήση ή πρόσβαση στον Ιστότοπο μετά την ανάρτηση οιονδήποτε αλλαγών στο παρόν Συμφωνητικό, συνιστά αποδοχή αυτών των αλλαγών. Η %{company_name} μπορεί επίσης, στο μέλλον, να προσφέρει νέες υπηρεσίες ή/και χαρακτηριστικά δια του Ιστότοπου (περιλαμβανομένης της κυκλοφορίας νέων εργαλείων και πόρων). Αυτά τα νέα χαρακτηριστικά ή/και οι υπηρεσίες θα υπόκεινται στους όρους και τις προϋποθέσεις του παρόντος Συμφωνητικού.
-
-
-      <a name="13"></a>
-
-      ## [13. Τερματισμός](#13)
-
-      Η %{company_name} μπορεί να τερματίσει την πρόσβαση σας στο σύνολο ή σε οποιοδήποτε μέρος του Ιστότοπου οιαδήποτε στιγμή, με ή χωρίς αιτία, με ή χωρίς ειδοποίηση, με άμεση ισχύ. Αν επιθυμείτε να τερματίσετε το παρόν Συμφωνητικό ή τον λογαριασμό σας στο %{company_domain} (εάν έχετε), μπορείτε απλώς να σταματήσετε να χρησιμοποιείτε τον Ιστότοπο. Όλες οι προβλέψεις του παρόντος συμφωνητικού, οι οποίες εκ της φύσεως τους πρέπει να ισχύουν και μετά των τερματισμό, θα ισχύουν και μετά τον τερματισμό, περιλαμβανομένων, χωρίς περιορισμό, προβλέψεων ιδιοκτησίας, αποποιήσεων ευθυνών εγγυήσεων, αποζημιώσεων και περιορισμών ευθύνης.
-
-      <a name="14"></a>
-
-      ## [14. Αποποίηση Ευθυνών Εγγυήσεων ](#14)
-
-
-      Ο Ιστότοπος παρέχεται ‘ως έχει’. Η %{company_name} και οι προμηθευτές και αδειοδότες της αποποιούνται όλες τις εγγυήσεις παντώς είδους, ρητά διατυπομένες ή εννοούμενες, περιλαμβανομένων, χωρίς περιορισμό, των εγγυήσεων εμπορευσιμότητας, καταλληλότητας για συγκεκριμένο σκοπό και μη παραβίασης. Ούτε η %{company_name} ούτε οι προμηθευτές και οι αδειοδότες της, εγγυώνται οτι ο Ιστότοπος δεν θα περιέχει λάθη ή οτι η πρόσβαση σε αυτόν θα είναι συνεχής και χωρίς διακοπή. Αν το διαβάζει αυτό: (http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). Κατανοείτε οτι η λήψη ή με άλλο τρόπο η παροχή υπηρεσιών ή περιεχομένου από τον Ιστότοπο υπόκειται στην δική σας διακριτική ευχέρεια και ανάληψη κινδύνου.
-
-      <a name="15"></a>
-
-      ## [15. Περιορισμός Ευθύνης ](#15)
-
-
-      Σε καμία περίπτωση η %{company_name} ή οι προμηθευτές ή αδειοδότες της, θα είναι υπεύθυνοι σχετικά με οποιοδήποτε θέμα του παρόντος Συμφωνητικού εξ αιτίας οποιουδήποτε συμβολαίου, αμέλειας, αυστηρής ευθύνης ή άλλης νομικής ή άλλης θεωρίας δικαίου για: (i) όποιες ειδικές, συμπτωματικές ή επακόλουθες βλάβες· (ii) το κόστος της προμήθειας για προϊόντα ή υπηρεσίες υποκατάστασης· (iii) την διακοπή της χρήσης ή απώλεια ή φθορά δεδομένων· ή (iv) οιαδήποτε ποσά που υπερβαίνουν τις αμοιβές που εσείς πληρώσατε στην %{company_name} στο πλαίσιο του παρόντος Συμφωνητικού κατά την περίοδο των 12 μηνών που προηγήθηκαν της αιτίας της ενέργειας. Η %{company_name} δεν θα έχει ευθύνη για οιαδήποτε αστοχία ή καθυστέρηση οφειλόμενη σε λόγους πέραν εύλογου εκ μέρους της ελέγχου. Τα ανωτέρω δεν ισχύουν πέραν των προβλεπομένων από τους εφαρμόσιμους νόμους.
-
-      <a name="16"></a>
-
-      ## [16. Γενική Εκπροσώπηση και Εγγύηση](#16)
-
-      Εκπροσωπείτε και εγγυάστε οτι (i) η χρήση σας του Ιστότοπου θα βρίσκεται σε αυστήρη συμμόρφωση με τις Πολιτικές Προστασίας Προσωπικών Δεδομένων της %{company_name},  [CommunityGuidelines] (/γενικές οδηγίες), με το παρόν Συμφωνητικό και με όλους τους εφαρμόσιμους νόμους και κανονισμούς (περιλαμβανομένων, χωρίς περιορισμό οιονδήποτε τοπικών νόμων ή κανονισμών της χώρας, πολιτείας, πόλης, ή άλλης περιοχής διακυβέρνησης, σε σχέση με την διαδικτυακή συμπεριφορά και αποδεκτό περιεχόμενο, και περιλαμβανομένων όλων των εφαρμόσιμων νόμων σχετικά με την μετάδοση τεχνικών δεδομένων εξαγομένων από την χώρα όπου αυτός ο Ιστότοπος ευρίσκεται ή εσείς ευρίσκεστε) και (ii) η εκ μέρους σας χρήση του Ιστότοπου δεν θα παραβίασει ή υπεξαιρέσει τα δικαιώματα πνευματικής ιδιοκτησίας τρίτων.
-
-
-
-      <a name="17"></a>
-
-      ## [17. Αποζημίωση](#17)
-
-      Συμφωνείτε να αποζημιώσετε και να φροντίσετε να μην βλαφθούν η %{company_name}, οι εργολάβοι της, και οι αδειοδότες της, καθώς και οι αντίστοιχοι διευθυντές, αξιωματούχοι, υπάλληλοι και παράγοντες τους από κάθε διεκδίκηση και έξοδα, περιλαμβανομένων αμοιβών δικηγόρων, που προκύπτουν από τη χρήση σας του Ιστότοπου, περιλαμβανομένης αλλά μη περιοριζόμενης στην εκ μέρους σας παραβίαση αυτού του Συμφωνητικού.
-
-      <a name="18"></a>
-
-      ## [18. Διάφορα](#18)
-
-      Το παρόν Συμφωνητικό αποτελεί το σύνολο της συμφωνίας μεταξύ της %{company_name} και εσάς σχετικά με το περιεχόμενο θέμα, και μπορεί να τροποποιηθεί μόνον με γραπτή τροπολογία υπογεγραμμένη από εξουσιοδοτημένο στέλεχος της %{company_name}, ή από την ανάρτηση αναθεωρημένης εκδόσεως από την %{company_name}. Εκτός αν ο εφαρμόσιμος νόμος, εφόσον υπάρχει, προβλέπει διαφορετικά, το παρόν Συμφωνητικό, οιαδήποτε πρόσβαση ή χρήση του Ιστότοπου ρυθμίζεται από τους νόμους της πολιτείας της Καλιφόρνια, Η.Π.Α., εξαιρουμένων των προβλέψεων για σύγκρουση νόμων, και ο κατάλληλος τόπος για διαφωνίες που προέρχονται από ή σχετίζονται με τα προαναφερθόντα, θα είναι τα πολιτειακά και ομοσπονδιακά δικαστήρια που βρίσκονται στην κομητεία του Σαν Φρανσίσκο, Καλιφόρνια. Εκτώς από αξιώσεις ασφαλιστικών μέτρων ή δίκαιης ανακούφισης ή αξιώσεων που αφορούν δικαιώματα πνευματικής ιδιοκτησίας (οι οποίες μπορεί να παρουσιαστούν σε κάθε αρμόδιο δικαστήριο χωρίς την πληρωμή εγγυήσεως), κάθε διαφωνία που εγείρεται στο πλαίσιο του παρόντος Συμψωνητικού θα ρυθμίζεται οριστικά σύμφωνα με τις προβλέψεις των Κανόνων Συνολικής Διαιτησίας της Υπηρεσίας Μεσολάβησης και Δικαστικής Διαιτησίας ΑΕ (‘’ΥΜΔΔ’’) από τρεις διαιτητές διορισμένους σύμφωνα με τις προβλέψεις αυτών των Κανόνων. Η διαιτησία θα λάβει χώρα στο Σαν Φρανσίσκο, Καλιφόρνια, στην Αγγλική γλώσσα και η διαιτητική απόφαση μπορεί να εφαρμοστεί σε οποιοδήποτε δικαστήριο. Η επικρατούσα πλευρά σε κάθε δράση ή διαδικασία εφαρμογής αυτής της Συμφωνίας δικαιούται έξοδα και αμοιβές δικηγόρων. Εάν κάποιο τμήμα του παρόντος Συμφωνητικού κριθεί άκυρο ή ανεφάρμοστο, αυτό το τμήμα θα ερμηνευθεί οτι αντανακλά τις αρχικές προθέσεις των μερών, και τα εναπομένοντα μέρη θα παραμείνουν σε πλήρη ισχύ και αποτέλεσμα. Η αποποίηση από οποιαδήποτε πλευρά, οιουδήποτε όρου ή προϋπόθεσης του παρόντος Συμφωνητικού ή παραβίασης τους, σε κάθε μία περίσταση δεν θα αποποιείται τον όρο ή την προϋπόθεση ή όποια επακόλουθη παραβίαση τους. Μπορείτε να αναθέσετε τα δικαιώματα σας στο πλαίσιο του παρόντος Συμφωνητικού σε οποιονδήποτε συναινεί και συμφωνεί να δεσμεύεται από τους όρους και τις προϋποθέσεις του· η %{company_name} μπορεί να αναθέσει τα δικαιώματα που έχει στο πλαίσιο του παρόντος Συμφωνητικού χωρίς περιορισμό. Το παρόν Συμφωνητικό είναι δεσμευτικό και θα ισχύει προς ώφελος των μερών, των διαδόχων και των επιτετραμένων τους.
-      Το παρόν κείμενο είναι CC-BY-SA. Η τελευταία ενημέρωση έγινε στις 31 Μαίου, 2013.
-      Η αρχική προσαρμογή έγινε από το [WordPress Terms of Service](http://en.wordpress.com/tos/).
-
-
   privacy_topic:
     title: "Πολιτική Ιδιωτικότητας"
     body: |
@@ -2804,17 +2533,17 @@ el:
         Αυτό το παράσημο δίνεται όταν φτάσεις το 1ο επίπεδο εμπιστοσύνης. Ευχαριστούμε που μένεις μαζί μας για λίγο και διαβάζεις νήματα για να μάθεις σχετικά με την κοινότητά μας. Οι περιορισμοί νέου χρήστη έχουν αφαιρεθεί. Όλες οι βασικές δυνατότητες της κοινότητας σου έχουν δοθεί, όπως προσωπικά μηνύματα, επισημάνσεις, επεξεργασία του wiki και δυνατότητα ανάρτησης πολλαπλών εικόνων και συνδέσμων.
     member:
       name: Μέλος
-      description: Παραχωρήθηκε δυνατότητα για αποστολή προσκλήσεων, μηνύματα ομάδας, περισσότερα μου αρέσει
+      description: "Παραχωρήθηκε δυνατότητα για αποστολή προσκλήσεων, μηνύματα ομάδας, περισσότερα μου αρέσει"
       long_description: |
         Αυτό το παράσημο δίνεται όταν φτάσεις το 2ο επίπεδο εμπιστοσύνης. Ευχαριστούμε που συμμετέχεις και είσαι μέλος της κοινότητας μας εδώ και κάποιες εβδομάδες. Μπορείς πλέον να στέλνεις προσκλήσεις από την σελίδα χρήστη σου ή από ατομικά νήματα, να δημιουργείς ομαδικά προσωπικά μηνύματα και να έχεις λίγα περισσότερα "μου αρέσει" ημερησίως.
     regular:
       name: Τακτικός
-      description: Παραχωρήθηκε δυνατότητα για επανακατηγοριοποίηση, μετονομασία, ακολούθηση συνδέσμων, wiki, περισσότερα "μου αρέσει"
+      description: "Παραχωρήθηκε δυνατότητα για επανακατηγοριοποίηση, μετονομασία, ακολούθηση συνδέσμων, wiki, περισσότερα \"μου αρέσει\""
       long_description: |
         Αυτό το παράσημο δίνεται όταν φτάσεις το 3ο επίπεδο εμπιστοσύνης. Ευχαριστούμε που είσαι τακτικό μέλος της κοινότητάς μας εδώ και μήνες. Είσαι πλέον ένας από τους πιο ενεργούς αναγνώστες και έμπιστα συμβάλλεις να γίνει η κοινότητά μας υπέροχη. Μπορείς πλέον να ανακατηγοριοποιήσεις και να μετονομάσεις νήματα, να εκμεταλλευτείς πιο ισχυρές επισημάνσεις, να έχεις πρόσβαση σε ιδιωτική περιοχή χαλάρωσης και επιπλέον θα παίρνεις πολύ περισσότερα "μου αρέσει" ημερησίως.
     leader:
       name: Αρχηγός
-      description: Παραχωρήθηκε δυνατότητα για καθολική επεξεργασία, καρφίτσωμα, κλείσιμο, αρχειοθέτηση, διαχωρισμό και συγχώνευση, περισσότερα μου αρέσει
+      description: "Παραχωρήθηκε δυνατότητα για καθολική επεξεργασία, καρφίτσωμα, κλείσιμο, αρχειοθέτηση, διαχωρισμό και συγχώνευση, περισσότερα μου αρέσει"
       long_description: |
         Αυτό το παράσημο δίνεται όταν φτάσεις το 4ο επίπεδο εμπιστοσύνης. Οι συνεργάτες έχουν επιλέξει να είσαι αρχηγός αυτής της κοινότητας και δίνεις το καλό παράδειγμα για την υπόλοιπη κοινότητα με τις πράξεις και τα λεγόμενά σου. Έχεις τη δυνατότητα να επεξεργαστείς όλες τις αναρτήσεις, να συντονίσεις νήματα μέσω καρφιτσώματος, κλεισίματος, αρχειοθέτησης, αφαίρεσης κατηγοριοποίησης, διαίρεσης και συγχώνευση καθώς επίσης και τόνους "μου αρέσει" κάθε μέρα.
     welcome:
@@ -2825,7 +2554,7 @@ el:
 
     autobiographer:
       name: Αυτοβιογράφος
-      description: Συμπλήρωσε τις πληροφορίες του <a href="%{base_uri}/my/preferences/profile">προφίλ</a>
+      description: "Συμπλήρωσε τις πληροφορίες του <a href=\"%{base_uri}/my/preferences/profile\">προφίλ</a>"
       long_description: |
         Αυτό το παράσημο χορηγείται όταν συμπληρώσεις <a href="%{base_uri}/my/preferences/profile">το προφίλ σου</a> και επιλέξεις μια φωτογραφία προφίλ. Επιτρέποντας στην κοινότητα να μάθει λίγα περισσότερα για σένα και τα ενδιαφέροντά σου, βοηθάει στην δημιουργία μιας καλύτερης, πιο διασυνδεμένης κοινότητας.
     anniversary:
@@ -2842,7 +2571,7 @@ el:
 
     good_post:
       name: Πολύ Καλή Απάντηση
-      description: 'Έλαβε 25 "Μου αρέσει" σε μια απάντηση '
+      description: "Έλαβε 25 \"Μου αρέσει\" σε μια απάντηση "
       long_description: |
         Το παράσημο χορηγείται όταν η απάντησή σου παίρνει 25 ¨Μου αρέσει". Η απάντησή σου ήταν εξαιρετική και έκανε τη συζήτηση πολύ καλύτερη για όλους!
     great_post:
@@ -2898,9 +2627,6 @@ el:
     promoter:
       name: Προωθητής
       description: Προσκάλεσε ένα χρήστη
-      long_description: |+
-        Το παράσημο χορηγείται όταν προσκαλείς κάποιον να συμμετάσχει μέσω του κουμπιού "Πρόσκληση" στη σελίδα χρήστη, ή στο κάτω μέρος του νήματος. Με το να προσκαλείς φίλους, οι οποίοι πιθανόν να ενδιαφέρονται για συγκεκριμένες συζητήσεις είναι ένας υπέροχος τρόπος να γνωρίσεις καινούριους ανθρώπους στην κοινότητά μας, ευχαριστούμε λοιπόν!
-
     campaigner:
       name: Εκστρατεύων
       description: Προσκάλεσε 3 βασικούς χρήστες
@@ -2908,7 +2634,7 @@ el:
         Το παράσημο χορηγείται όταν έχεις προσκαλέσει 3 άτομα,  τα οποία στην συνέχεια πέρασαν αρκετό χρόνο στην ιστοσελίδα και έγιναν βασικοί χρήστες. Μια ζωηρή κοινότητα χρειάζεται την τακτική εισροή νεων χρηστών σε αυτήν και με την συμμετοχή τους να προσθέτουν καινούριες φωνές στη συζήτηση.
 
     champion:
-      name: 'Πρωταθλητής '
+      name: "Πρωταθλητής "
       description: Προσκάλεσε 5 μέλη
       long_description: |+
         Το παράσημο χορηγείται όταν έχεις προσκαλέσει 5 άτομα, τα οποία στην συνέχεια πέρασαν αρκετό χρόνο στην ιστοσελίδα και έγιναν κανονικοί χρήστες. Ουάου! Ευχαριστούμε που επέκτεινες την ποικιλία της κοινότητάς μας με καινούρια μέλη!
@@ -2932,7 +2658,7 @@ el:
         Αυτό το παράσημο δίνεται την πρώτη φορά που παραθέτεις μια ανάρτηση σε μια απάντησή σου. Παραθέτοντας σχετικά τμήματα από προηγούμενες αναρτήσεις στην απάντησή σου, βοηθάει να παραμένουν οι συζητήσεις συνδεδεμένες και εντός θέματος. Ο πιο εύκολος τρόπος να παραθέσεις, είναι να μαρκάρεις ένα τμήμα από μια ανάρτηση και έπειτα να πατήσεις κάποιο πλήκτρο απάντησης. Παραθέστε ελεύθερα!
     read_guidelines:
       name: Διάβασε τις Οδηγίες
-      description: Διάβασε τις <a href="%{base_uri}/guidelines">οδηγίες χρήσης της κοινότητας</a>
+      description: "Διάβασε τις <a href=\"%{base_uri}/guidelines\">οδηγίες χρήσης της κοινότητας</a>"
       long_description: |+
         Το παράσημο χορηγείται για την <a href="%{base_uri}/guidelines">ανάγνωση των οδηγιών χρήσης της κοινότητας</a>. Ακολουθώντας και κοινοποιώντας αυτές τις απλές οδηγίες σε βοηθά να χτίσεις μια ασφαλή, διασκεδαστική και βιώσιμη κοινότητα για όλους. Να θυμάσαι πάντα ότι υπάρχει κάποιος άλλος άνθρωπος, πολύ όμοιος με εσένα, στην άλλη πλευρά της οθόνης. Να είσαι καλός!
 
@@ -2975,7 +2701,7 @@ el:
       long_description: |
         Αυτό το παράσημο χορηγείται όταν λαμβάνεις τουλάχιστον 5 "Μου αρέσει" σε 300 διαφορετικές δημοσιεύσεις. Ουάου! Η κοινότητα θαυμάζει την συχνή και υψηλής ποιότητας συνεισφορά σου στις συζητήσεις εδώ.
     out_of_love:
-      name: 'Αγάπη '
+      name: "Αγάπη "
       description: Χρησιμοποίησε 50 "Μου αρέσει" σε μια ημέρα
       long_description: |+
         Το παράσημο χορηγείται όταν χρησιμοποιείς όλα τα 50 "Μου αρέσει" που έχεις ημερησίως. Να θυμάσαι ότι το να έχεις το χρόνο να πατάς "Μου αρέσει" στις αναρτήσεις που απολαμβάνεις και εκτιμάς, ενθαρρύνει τα μέλη της κοινότητας σου να δημιουργούν ακόμα καλύτερες συζητήσεις στο μέλλον.
@@ -3002,22 +2728,20 @@ el:
         Το παράσημο χορηγείται όταν έχεις 20 "Μου αρέσει" σε δημοσιεύσεις και ταυτόχρονα έχεις κι εσύ πατήσει "μου αρέσει" σε 100 ή περισσότερες αναρτήσεις. Ευχαριστούμε που το συνεχίζεις!
     empathetic:
       name: Λατρεία
-      description: 'Έχει σε 500 δημοσιεύσεις "Μου αρέσει" και πάτησε 1000 "Μου αρέσει" '
+      description: "Έχει σε 500 δημοσιεύσεις \"Μου αρέσει\" και πάτησε 1000 \"Μου αρέσει\" "
       long_description: |
         Το παράσημο χορηγείται όταν έχεις 500 "Μου αρέσει" σε δημοσιεύσεις και δίνεις 1000 ή περισσότερα "Μου αρέσει" σε αντάλλαγμα. Ουάου! Είσαι υπόδειγμα γενναιοδωρίας και αμοιβαίας εκτίμησης :two_hearts:.
     first_emoji:
       name: Πρώτο Emoji
       description: Χρησιμοποίησε ένα Emoji σε μια ανάρτηση
-      long_description: |
-        Αυτό το παράσημο δίνεται την πρώτη φορά που προσθέτεις κάποιο Emoji σε ανάρτησή σου :thumbsup:. Τα Emoji σου επιτρέπουν να προσθέσεις συναίσθημα στις αναρτήσεις σου, από χαρά :smiley: έως λύπη :anguished: έως θυμό :angry: και όλα τα ενδιάμεσα :sunglasses: . Απλώς πληκτρολόγησε ένα : (άνω κάτω τελεία) ή πίεσε το πλήκτρο εργαλειοθήκης Emoji στο συνθέτη για να διαλέξεις  από εκατοντάδες επιλογές  :ok_hand:
     first_mention:
       name: Πρώτη Αναφορά
       description: Ανέφερε έναν χρήστη σε μία ανάρτηση
-      long_description: 'Αυτό το παράσημο δίνεται την πρώτη φορά που αναφέρεις το @όνομα κάποιου στην ανάρτησή σου. Κάθε αναφορά δημιουργεί μια ειδοποίηση σε αυτό το άτομο, ώστε να μάθουν για την ανάρτησή σου. Απλώς ξεκίνα να πληκτρολογείς το @ (at σύμβολο) για να αναφέρεις οποιοδήποτε χρήστη ή εάν επιτρέπεται, μια ομάδα. Είναι ένας βολικός τρόπος να τραβήξεις την προσοχή τους σε κάτι. '
+      long_description: "Αυτό το παράσημο δίνεται την πρώτη φορά που αναφέρεις το @όνομα κάποιου στην ανάρτησή σου. Κάθε αναφορά δημιουργεί μια ειδοποίηση σε αυτό το άτομο, ώστε να μάθουν για την ανάρτησή σου. Απλώς ξεκίνα να πληκτρολογείς το @ (at σύμβολο) για να αναφέρεις οποιοδήποτε χρήστη ή εάν επιτρέπεται, μια ομάδα. Είναι ένας βολικός τρόπος να τραβήξεις την προσοχή τους σε κάτι. "
     first_onebox:
       name: Πρώτο Onebox
       description: Αναρτήθηκε σύνδεσμος ο οποίος είναι oneboxed
-      long_description: 'Αυτό το παράσημο δίνεται την πρώτη φορά που αναρτείς ένα σύνδεσμο μόνο του σε μια γραμμή, το οποίο αυτόματα αναπτύσσεται σε onebox με μια σύντονη περίληψη του συνδέσμου, ένα τίτλο και (όπου αυτό είναι διαθέσιμο) μια εικόνα. '
+      long_description: "Αυτό το παράσημο δίνεται την πρώτη φορά που αναρτείς ένα σύνδεσμο μόνο του σε μια γραμμή, το οποίο αυτόματα αναπτύσσεται σε onebox με μια σύντονη περίληψη του συνδέσμου, ένα τίτλο και (όπου αυτό είναι διαθέσιμο) μια εικόνα. "
     first_reply_by_email:
       name: Πρώτη Απάντηση μέσω Email
       description: Απάντησε σε μία ανάρτηση μέσω email
@@ -3039,11 +2763,10 @@ el:
     devotee:
       name: Λάτρης
       description: 365 ημέρες επισκέψεων
-      long_description: Αυτό το παράσημο σας απονέμεται για 365  ημέρες επισκέψεων. Γουάου, ένας ολόκληρος χρόνος!
+      long_description: "Αυτό το παράσημο σας απονέμεται για 365  ημέρες επισκέψεων. Γουάου, ένας ολόκληρος χρόνος!"
     badge_title_metadata: "%{display_name} παράσημο στην %{site_title}"
   admin_login:
     success: "Το Email Στάλθηκε"
-    error: "Σφάλμα!"
     email_input: "Email Διαχειριστή"
     submit_button: "Αποστολή Email"
   performance_report:
@@ -3188,6 +2911,3 @@ el:
         description: |
           <p>Αν ποτέ θελήσεις να αλλάξεις αυτές τις ρυθμίσεις, επισκέψου την <a href='/admin' target='_blank'>σελίδα διαχείρισης</a>; θα τη βρεις δίπλα στο εικονίδιο του εργαλείου στο μενού ιστοτόπου.</p>
           <p>Καλή διασκέδαση και καλή επιτυχία στην κατασκευή της νέας σου κοινότητας!</a></p>
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 4974f1062e9..0e472182dc2 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -49,26 +49,47 @@ en:
   loading: "Loading"
   powered_by_html: 'Powered by <a href="https://www.discourse.org">Discourse</a>, best viewed with JavaScript enabled'
   log_in: "Log In"
-
+  submit: "Submit"
   purge_reason: "Automatically deleted as abandoned, deactivated account"
   disable_remote_images_download_reason: "Remote images download was disabled because there wasn't enough disk space available."
   anonymous: "Anonymous"
   remove_posts_deleted_by_author: "Deleted by author"
+  redirect_warning: "We were unable to verify that the link you selected was actually posted to the forum. If you wish to proceed anyway, select the link below."
 
   themes:
     bad_color_scheme: "Can not update theme, invalid color scheme"
     other_error: "Something went wrong updating theme"
+    error_importing: "Error cloning git repository, access is denied or repository is not found"
+    settings_errors:
+      invalid_yaml: "Provided YAML is invalid."
+      data_type_not_a_number: "Setting `%{name}` type is unsupported. Supported types are `integer`, `bool`, `list` and `enum`"
+      name_too_long: "There is a setting with a too long name. Maximum length is 255"
+      default_value_missing: "Setting `%{name}` has no default value"
+      default_not_match_type: "Setting `%{name}` default value's type doesn't match with the setting type."
+      default_out_range: "Setting `%{name}` default value isn't in the specified range."
+      enum_value_not_valid: "Selected value isn't one of the enum choices."
+      number_value_not_valid: "New value isn't within the allowed range."
+      number_value_not_valid_min_max: "It must be between %{min} and %{max}."
+      number_value_not_valid_min: "It must be larger than or equal to %{min}."
+      number_value_not_valid_max: "It must be smaller than or equal to %{max}."
+      string_value_not_valid: "New value length isn't within the allowed range."
+      string_value_not_valid_min_max: "It must be between %{min} and %{max} character long."
+      string_value_not_valid_min: "It must be at least %{min} characters long."
+      string_value_not_valid_max: "It must be at most %{max} characters long."
   emails:
     incoming:
       default_subject: "This topic needs a title"
       show_trimmed_content: "Show trimmed content"
       maximum_staged_user_per_email_reached: "Reached maximum number of staged users created per email."
+      no_subject: "(no subject)"
+      no_body: "(no body)"
       errors:
         empty_email_error: "Happens when the raw mail we received was blank."
         no_message_id_error: "Happens when the mail has no 'Message-Id' header."
         auto_generated_email_error: "Happens when the 'precedence' header is set to: list, junk, bulk or auto_reply, or when any other header contains: auto-submitted, auto-replied or auto-generated."
         no_body_detected_error: "Happens when we couldn't extract a body and there were no attachments."
         no_sender_detected_error: "Happens when we couldn't find a valid email address in the From header."
+        from_reply_by_address_error: "Happens when the From header matches the reply by email address."
         inactive_user_error: "Happens when the sender is not active."
         silenced_user_error: "Happens when the sender has been silenced."
         bad_destination_address: "Happens when none of the email addresses in To/Cc/Bcc fields matched a configured incoming email address."
@@ -105,13 +126,14 @@ en:
       invalid: is invalid
       is_invalid: "seems unclear, is it a complete sentence?"
       contains_censored_words: "contains the following censored words: %{censored_words}"
-      matches_censored_pattern: "contains the following words that matches the site's censored regexp: %{censored_words}"
       less_than: must be less than %{count}
       less_than_or_equal_to: must be less than or equal to %{count}
       not_a_number: is not a number
       not_an_integer: must be an integer
       odd: must be odd
       record_invalid: ! 'Validation failed: %{errors}'
+      max_emojis: "can't have more than %{max_emojis_count} emoji"
+      ip_address_already_screened: "is already included in an existing rule"
       restrict_dependent_destroy:
         one: "Cannot delete record because a dependent %{record} exists"
         many: "Cannot delete record because dependent %{record} exist"
@@ -133,6 +155,9 @@ en:
     embed:
       load_from_remote: "There was an error loading that post."
     site_settings:
+      invalid_choice:
+        one: 'You specified the invalid choice %{name}'
+        other: 'You specified the invalid choices %{name}'
       min_username_length_exists: "You cannot set the minimum username length above the shortest username."
       min_username_length_range: "You cannot set the minimum above the maximum."
       max_username_length_exists: "You cannot set the maximum username length below the longest username."
@@ -147,6 +172,12 @@ en:
 
   invite:
     not_found: "Your invite token is invalid. Please contact the site's administrator."
+    not_found_template: |
+      <p>Your invite to <a href="%{base_url}">%{site_name}</a> has already been redeemed.</p>
+
+      <p>If you remember your password you can <a href="%{base_url}/login">Login</a>.</p>
+
+      <p>Otherwise please <a href="%{base_url}/password-reset">Reset Password</a>.</p>
     user_exists: "There's no need to invite <b>%{email}</b>, they <a href='/u/%{username}/summary'>already have an account!</a>"
 
   bulk_invite:
@@ -162,6 +193,7 @@ en:
     not_enough_space_on_disk: "There is not enough space on disk to upload this backup."
     invalid_filename: "The backup filename contains invalid characters. Valid characters are a-z 0-9 . - _."
 
+  invalid_params: "You supplied invalid parameters to the request: %{message}"
   not_logged_in: "You need to be logged in to do that."
   not_found: "The requested URL or resource could not be found."
   invalid_access: "You are not permitted to view the requested resource."
@@ -203,6 +235,7 @@ en:
   too_many_mentions_newuser:
     one: "Sorry, new users can only mention one other user in a post."
     other: "Sorry, new users can only mention %{count} users in a post."
+  no_images_allowed_trust: "Sorry, you can't put images in a post"
   no_images_allowed: "Sorry, new users can't put images in posts."
   too_many_images:
     one: "Sorry, new users can only put one image in a post."
@@ -212,10 +245,11 @@ en:
     one: "Sorry, new users can only put one attachment in a post."
     other: "Sorry, new users can only put %{count} attachments in a post."
   no_links_allowed: "Sorry, new users can't put links in posts."
+  links_require_trust: "Sorry, you can't include links in your posts."
   too_many_links:
     one: "Sorry, new users can only put one link in a post."
     other: "Sorry, new users can only put %{count} links in a post."
-  contains_blocked_words: "Your post contains words that aren't allowed."
+  contains_blocked_words: "Your post contains a word that's not allowed: %{word}"
 
   spamming_host: "Sorry you cannot post a link to that host."
   user_is_suspended: "Suspended users are not allowed to post."
@@ -250,7 +284,7 @@ en:
     top_weekly: "Weekly top topics"
     top_daily: "Daily top topics"
     posts: "Latest posts"
-    private_posts: "Latest private messages"
+    private_posts: "Latest personal messages"
     group_posts: "Latest posts from %{group_name}"
     group_mentions: "Latest mentions from %{group_name}"
     user_posts: "Latest posts by @%{username}"
@@ -269,10 +303,15 @@ en:
 
   groups:
     success:
-      bulk_add: "%{users_added} users have been added to the group."
+      bulk_add:
+        one: "%{count} user have been added to the group."
+        other: "%{count} users have been added to the group."
     errors:
+      grant_trust_level_not_valid: "'%{trust_level}' is not a valid trust level."
       can_not_modify_automatic: "You cannot modify an automatic group"
-      member_already_exist: "'%{username}' is already a member of this group."
+      member_already_exist:
+        one: "'%{username}' is already a member of this group."
+        other: "The following users are already members of this group: %{username}"
       invalid_domain: "'%{domain}' is not a valid domain."
       invalid_incoming_email: "'%{email}' is not a valid email address."
       email_already_used_in_group: "'%{email}' is already used by the group '%{group_name}'."
@@ -362,7 +401,7 @@ en:
     reviving_old_topic: |
       ### Revive this topic?
 
-      The last reply to this topic was **%{days}** days ago. Your reply will bump the topic to the top of its list and notify anyone previously involved in the conversation.
+      The last reply to this topic was **%{time_ago}**. Your reply will bump the topic to the top of its list and notify anyone previously involved in the conversation.
 
       Are you sure you want to continue this old conversation?
 
@@ -385,11 +424,12 @@ en:
         topic:
           attributes:
             base:
-              warning_requires_pm: "You can only attach warnings to private messages."
+              warning_requires_pm: "You can only attach warnings to personal messages."
               too_many_users: "You can only send warnings to one user at a time."
-              cant_send_pm: "Sorry, you cannot send a private message to that user."
+              cant_send_pm: "Sorry, you cannot send a personal message to that user."
               no_user_selected: "You must select a valid user."
               reply_by_email_disabled: "Reply by email has been disabled."
+              target_user_not_found: "One of the users you are sending this message to could not be found."
             featured_link:
               invalid: "is invalid. URL should include http:// or https://."
               invalid_category: "can't be edited in this category."
@@ -403,6 +443,10 @@ en:
               unique_characters: "has too many repeated characters. Please use a more secure password."
             ip_address:
               signup_not_allowed: "Signup is not allowed from this account."
+        user_email:
+          attributes:
+            user_id:
+              reassigning_primary_email: "Reassigning a primary email to another user is not allowed."
         color_scheme_color:
           attributes:
             hex:
@@ -529,23 +573,23 @@ en:
       broken: "This image is broken"
 
   rate_limiter:
-    slow_down: "You have performed this action too many times, try again later."
-    too_many_requests: "We have a daily limit on how many times that action can be taken. Please wait %{time_left} before trying again."
+    slow_down: "You’ve performed this action too many times, please try again later."
+    too_many_requests: "You’ve performed this action too many times. Please wait %{time_left} before trying again."
     by_type:
-      first_day_replies_per_day: "You've reached the maximum number of replies a new user can create on their first day. Please wait %{time_left} before trying again."
-      first_day_topics_per_day: "You've reached the maximum number of topics a new user can create on their first day. Please wait %{time_left} before trying again."
-      create_topic: "You're creating topics too quickly. Please wait %{time_left} before trying again."
-      create_post: "You're replying too quickly. Please wait %{time_left} before trying again."
-      delete_post: "You're deleting posts too quickly. Please wait %{time_left} before trying again."
-      public_group_membership: "You're joining/leaving groups too frequently. Please wait %{time_left} before trying again."
-      topics_per_day: "You've reached the maximum number of new topics today. Please wait %{time_left} before trying again."
-      pms_per_day: "You've reached the maximum number of messages today. Please wait %{time_left} before trying again."
-      create_like: "You've reached the maximum number of likes today. Please wait %{time_left} before trying again."
-      create_bookmark: "You've reached the maximum number of bookmarks today. Please wait %{time_left} before trying again."
-      edit_post: "You've reached the maximum number of edits today. Please wait %{time_left} before trying again."
-      live_post_counts: "You're asking for live post counts too quickly. Please wait %{time_left} before trying again."
-      unsubscribe_via_email: "You've reached the maximum number of unsubscribe via email today. Please wait %{time_left} before trying again."
-      topic_invitations_per_day: "You've reached the maximum number of topic invitations today. Please wait %{time_left} before trying again."
+      first_day_replies_per_day: "You’ve reached the maximum number of replies a new user can create on their first day. Please wait %{time_left} before trying again."
+      first_day_topics_per_day: "You’ve reached the maximum number of topics a new user can create on their first day. Please wait %{time_left} before trying again."
+      create_topic: "You’re creating topics too quickly. Please wait %{time_left} before trying again."
+      create_post: "You’re replying too quickly. Please wait %{time_left} before trying again."
+      delete_post: "You’re deleting posts too quickly. Please wait %{time_left} before trying again."
+      public_group_membership: "You’re joining/leaving groups too frequently. Please wait %{time_left} before trying again."
+      topics_per_day: "You’ve reached the maximum number of new topics. Please wait %{time_left} before trying again."
+      pms_per_day: "You’ve reached the maximum number of messages. Please wait %{time_left} before trying again."
+      create_like: "You’ve reached the maximum number of likes. Please wait %{time_left} before trying again."
+      create_bookmark: "You’ve reached the maximum number of bookmarks. Please wait %{time_left} before trying again."
+      edit_post: "You’ve reached the maximum number of edits. Please wait %{time_left} before trying again."
+      live_post_counts: "You’re asking for live post counts too quickly. Please wait %{time_left} before trying again."
+      unsubscribe_via_email: "You’ve reached the maximum number of unsubscribes via email. Please wait %{time_left} before trying again."
+      topic_invitations_per_day: "You’ve reached the maximum number of topic invitations. Please wait %{time_left} before trying again."
 
     hours:
       one: "1 hour"
@@ -640,6 +684,10 @@ en:
     success: "You successfully changed your password and are now logged in."
     success_unapproved: "You successfully changed your password."
 
+  email_login:
+    invalid_token: "Sorry, that email login link is too old. Select the Log In button and use 'I forgot my password' to get a new link."
+    title: "Email login"
+
   change_email:
     confirmed: "Your email has been updated."
     please_continue: "Continue to %{site_name}"
@@ -685,8 +733,8 @@ en:
       long_form: 'flagged this as inappropriate'
     notify_user:
       title: 'Send @{{username}} a message'
-      description: 'I want to talk to this person directly and privately about their post.'
-      short_description: 'I want to talk to this person directly and privately about their post.'
+      description: 'I want to talk to this person directly and personally about their post.'
+      short_description: 'I want to talk to this person directly and personally about their post.'
       long_form: 'messaged user'
       email_title: 'Your post in "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -796,9 +844,25 @@ en:
       xaxis: "Day"
       yaxis: "Number of visits"
     signups:
-      title: "New Users"
+      title: "Signups"
       xaxis: "Day"
-      yaxis: "Number of new users"
+      yaxis: "Number of signups"
+      description: "New account registrations for this period"
+    new_contributors:
+      title: "New Contributors"
+      xaxis: "Day"
+      yaxis: "Number of new contributors"
+      description: "Number of users who made their first post during this period"
+    dau_by_mau:
+      title: "DAU/MAU"
+      xaxis: "Day"
+      yaxis: "DAU/MAU"
+      description: "No. of members that logged in in the last day divided by no of members that logged in in the last month – returns a % which indicates community 'stickiness'. Aim for >30%."
+    daily_engaged_users:
+      title: "Daily Engaged Users"
+      xaxis: "Day"
+      yaxis: "Engaged Users"
+      description: "Number of users that have liked or posted in the last day"
     profile_views:
       title: "User Profile Views"
       xaxis: "Day"
@@ -807,10 +871,12 @@ en:
       title: "Topics"
       xaxis: "Day"
       yaxis: "Number of new topics"
+      description: "New topics created during this period"
     posts:
       title: "Posts"
       xaxis: "Day"
       yaxis: "Number of new posts"
+      description: "New posts created during this period"
     likes:
       title: "Likes"
       xaxis: "Day"
@@ -831,12 +897,31 @@ en:
       title: "Users per Trust Level"
       xaxis: "Trust Level"
       yaxis: "Number of Users"
+    users_by_type:
+      title: "Users per Type"
+      xaxis: "Type"
+      yaxis: "Number of Users"
+      xaxis_labels:
+        admin: Admin
+        moderator: Moderator
+        suspended: Suspended
+        silenced: Silenced
+    trending_search:
+      title: Trending search
+      labels:
+        term: Term
+        searches: Searches
+        click_through: CTR
     emails:
       title: "Emails Sent"
       xaxis: "Day"
       yaxis: "Number of Emails"
     user_to_user_private_messages:
-      title: "User-to-User"
+      title: "User-to-User (excluding replies)"
+      xaxis: "Day"
+      yaxis: "Number of messages"
+    user_to_user_private_messages_with_replies:
+      title: "User-to-User (with replies)"
       xaxis: "Day"
       yaxis: "Number of messages"
     system_private_messages:
@@ -883,7 +968,7 @@ en:
       xaxis: "Day"
       yaxis: "Web Crawler Pageviews"
     page_view_total_reqs:
-      title: "Total"
+      title: "Pageviews"
       xaxis: "Day"
       yaxis: "Total Pageviews"
     page_view_logged_in_mobile_reqs:
@@ -930,6 +1015,10 @@ en:
       title: "User Visits"
       xaxis: "Day"
       yaxis: "Number of visits"
+    web_crawlers:
+      title: "Web Crawler Requests"
+      xaxis: "User Agent"
+      yaxis: "Pageviews"
 
   dashboard:
     rails_env_warning: "Your server is running in %{env} mode."
@@ -950,27 +1039,29 @@ en:
     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."
       other: "Email polling has generated %{count} errors in the past 24 hours. Look at <a href='/logs' target='_blank'>the logs</a> for more details."
-    missing_mailgun_api_key: "The server is configured to send emails via mailgun but you haven't provided an API key used the verify the webhook messages."
+    missing_mailgun_api_key: "The server is configured to send emails via Mailgun but you haven't provided an API key used to verify the webhook messages."
     bad_favicon_url: "The favicon is failing to load. Check your favicon_url setting in <a href='/admin/site_settings'>Site Settings</a>."
     poll_pop3_timeout: "Connection to the POP3 server is timing out. Incoming email could not be retrieved. Please check your <a href='/admin/site_settings/category/email'>POP3 settings</a> and service provider."
     poll_pop3_auth_error: "Connection to the POP3 server is failing with an authentication error. Please check your <a href='/admin/site_settings/category/email'>POP3 settings</a>."
+    force_https_warning: "Your website is using SSL. But `<a href='/admin/site_settings/category/all_results?filter=force_https'>force_https</a>` is not yet enabled in your site settings."
 
   site_settings:
     censored_words: "Words that will be automatically replaced with &#9632;&#9632;&#9632;&#9632;"
-    censored_pattern: "Regex pattern 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."
-    default_locale: "The default language of this Discourse instance (ISO 639-1 Code)"
+    default_locale: "The default language of this Discourse instance"
     allow_user_locale: "Allow users to choose their own language interface preference"
     set_locale_from_accept_language_header: "set interface language for anonymous users from their web browser's language headers. (EXPERIMENTAL, does not work with anonymous cache)"
+    support_mixed_text_direction: "Support mixed left-to-right and right-to-left text directions."
     min_post_length: "Minimum allowed post length in characters"
     min_first_post_length: "Minimum allowed first post (topic body) length in characters"
-    min_private_message_post_length: "Minimum allowed post length in characters for messages"
+    min_personal_message_post_length: "Minimum allowed post length in characters for messages"
     max_post_length: "Maximum allowed post length in characters"
     topic_featured_link_enabled: "Enable posting a link with topics."
     show_topic_featured_link_in_digest: "Show the topic featured link in the digest email."
     min_topic_title_length: "Minimum allowed topic title length in characters"
     max_topic_title_length: "Maximum allowed topic title length in characters"
-    min_private_message_title_length: "Minimum allowed title length for a message in characters"
+    min_personal_message_title_length: "Minimum allowed title length for a message in characters"
+    max_emojis_in_title: "Maximum allowed emojis in topic title"
     min_search_term_length: "Minimum valid search term length in characters"
     search_tokenize_chinese_japanese_korean: "Force search to tokenize Chinese/Japanese/Korean even on non CJK sites"
     search_prefer_recent_posts: "If searching your large forum is slow, this option tries an index of more recent posts first"
@@ -991,6 +1082,9 @@ en:
     download_remote_images_max_days_old: "Don't download remote images for posts that are more than n days old."
     disabled_image_download_domains: "Remote images will never be downloaded from these domains. Pipe-delimited list."
     editing_grace_period: "For (n) seconds after posting, editing will not create a new version in the post history."
+    editing_grace_period_max_diff: "Maximum number of character changes allowed in editing grace period, if more changed store another post revision (trust level 0 and 1)"
+    editing_grace_period_max_diff_high_trust: "Maximum number of character changes allowed in editing grace period, if more changed store another post revision (trust level 2 and up)"
+    staff_edit_locks_post: "Posts will be locked from editing if they are edited by staff members"
     post_edit_time_limit: "The author can edit or delete their post for (n) minutes after posting. Set to 0 for forever."
     edit_history_visible_to_public: "Allow everyone to see previous versions of an edited post. When disabled, only staff members can view."
     delete_removed_posts_after: "Posts removed by the author will be automatically deleted after (n) hours. If set to 0, posts will be deleted immediately."
@@ -1029,8 +1123,9 @@ en:
     summary_percent_filter: "When a user clicks 'Summarize This Topic', show the top % of posts"
     summary_max_results: "Maximum posts returned by 'Summary This Topic'"
 
-    enable_private_messages: "Allow trust level 1 (configurable via min trust level to send messages) users to create messages and reply to messages. Note that staff can always send messages no matter what."
-    enable_private_email_messages: "Allow trust level 4 (configurable via min trust level to send messages) users to send private email messages. Note that staff can always send messages no matter what."
+    enable_personal_messages: "Allow trust level 1 (configurable via min trust level to send messages) users to create messages and reply to messages. Note that staff can always send messages no matter what."
+    enable_system_message_replies: "Allows users to reply to system messages, even if personal messages are disabled"
+    enable_personal_email_messages: "Allow trust level 4 (configurable via min trust level to send messages) users to send personal email messages. Note that staff can always send messages no matter what."
 
     enable_long_polling: "Message bus used for notification can use long polling"
     long_polling_base_url: "Base URL used for long polling (when a CDN is serving dynamic content, be sure to set this to origin pull) eg: http://origin.site.com"
@@ -1057,7 +1152,9 @@ en:
     flag_sockpuppets: "If a new user replies to a topic from the same IP address as the new user who started the topic, flag both of their posts as potential spam."
 
     traditional_markdown_linebreaks: "Use traditional linebreaks in Markdown, which require two trailing spaces for a linebreak."
-    enable_markdown_typographer: "Use basic typography rules to improve text readability of paragraphs of text, replaces (c) (tm) etc, with symbols, reduces number of question marks and so on"
+    enable_markdown_typographer: "Use typography rules to improve readability of text: replace straight quotes ' with curly quotes ’, (c) (tm) with symbols, -- with emdash –, etc"
+    enable_markdown_linkify: "Automatically treat text that looks like a link as a link: www.site.com and http://site.com will be automatically linked"
+    markdown_linkify_tlds: "List of top level domains that get automatically treated as links"
     post_undo_action_window_mins: "Number of minutes users are allowed to undo recent actions on a post (like, flag, etc)."
     must_approve_users: "Staff must approve all new user accounts before they are allowed to access the site. WARNING: enabling this for a live site will revoke access for existing non-staff users!"
     pending_users_reminder_delay: "Notify moderators if new users have been waiting for approval for longer than this many hours. Set to -1 to disable notifications."
@@ -1073,6 +1170,10 @@ en:
     blacklist_ip_blocks: "A list of private IP blocks that should never be crawled by Discourse"
     whitelist_internal_hosts: "A list of internal hosts that discourse can safely crawl for oneboxing and other purposes"
     allowed_iframes: "A list of iframe src domain prefixes that discourse can safely allow in posts"
+    whitelisted_crawler_user_agents: 'User agents of web crawlers that should be allowed to access the site.'
+    blacklisted_crawler_user_agents: 'Unique case insensitive word in the user agent string identifying web crawlers that should not be allowed to access the site. Does not apply if whitelist is defined.'
+    slow_down_crawler_user_agents: 'User agents of web crawlers that should be rate limited in robots.txt using the Crawl-delay directive'
+    slow_down_crawler_rate: 'If slow_down_crawler_user_agents is specified this rate will apply to all the crawlers (number of seconds delay between requests)'
     top_menu: "Determine which items appear in the homepage navigation, and in what order. Example latest|new|unread|categories|top|read|posted|bookmarks"
     post_menu: "Determine which items appear on the post menu, and in what order. Example like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "The menu items to hide by default in the post menu unless an expansion ellipsis is clicked on."
@@ -1106,7 +1207,6 @@ en:
     new_version_emails: "Send an email to the contact_email address when a new version of Discourse is available."
 
     invite_expiry_days: "How long user invitation keys are valid, in days"
-    invite_passthrough_hours: "How long a user can use a previously redeemed invitation key to log in, in hours"
 
     invite_only: "Public registration is disabled, all new users must be explicitly invited by staff."
 
@@ -1128,14 +1228,18 @@ en:
     sso_url: "URL of single sign on endpoint (must include http:// or https://)"
     sso_secret: "Secret string used to cryptographically authenticate SSO information, be sure it is 10 characters or longer"
     sso_overrides_bio: "Overrides user bio in user profile and prevents user from changing it"
+    sso_overrides_groups: "Synchronize all manual group membership with groups specified in the groups sso attribute (WARNING: if you do not specify groups all manual group membership will be cleared for user)"
     sso_overrides_email: "Overrides local email with external site email from SSO payload on every login, and prevent local changes. (WARNING: discrepancies can occur due to normalization of local emails)"
     sso_overrides_username: "Overrides local username with external site username from SSO payload on every login, and prevent local changes. (WARNING: discrepancies can occur due to differences in username length/requirements)"
     sso_overrides_name: "Overrides local full name with external site full name from SSO payload on every login, and prevent local changes."
     sso_overrides_avatar: "Overrides user avatar with external site avatar from SSO payload. If enabled, disabling allow_uploaded_avatars is highly recommended"
+    sso_overrides_profile_background: "Overrides user profile background with external site avatar from SSO payload."
+    sso_overrides_card_background: "Overrides user card background with external site avatar from SSO payload."
     sso_not_approved_url: "Redirect unapproved SSO accounts to this URL"
     sso_allows_all_return_paths: "Do not restrict the domain for return_paths provided by SSO (by default return path must be on current site)"
 
-    enable_local_logins: "Enable local username and password login based accounts. (Note: this must be enabled for invites to work)"
+    enable_local_logins: "Enable local username and password login based accounts. This must be enabled for invites to work. WARNING: if disabled, you may be unable to log in if you have not previously configured at least one alternate login method."
+    enable_local_logins_via_email: "Allow users to request a one-click login link to be sent to them via email."
     allow_new_registrations: "Allow new user registrations. Uncheck this to prevent anyone from creating a new account."
     enable_signup_cta: "Show a notice to returning anonymous users prompting them to sign up for an account."
     enable_yahoo_logins: "Enable Yahoo authentication"
@@ -1143,10 +1247,12 @@ en:
     enable_google_oauth2_logins: "Enable Google Oauth2 authentication. This is the method of authentication that Google currently supports. Requires key and secret."
     google_oauth2_client_id: "Client ID of your Google application."
     google_oauth2_client_secret: "Client secret of your Google application."
+    google_oauth2_prompt: "A space-delimited list of string values that specifies whether the authorization server prompts the user for reauthentication and consent. See https://developers.google.com/identity/protocols/OpenIDConnect#prompt for the possible values."
+    google_oauth2_hd: "Google Apps Hosted domain that the sign-in will be limited to. See https://developers.google.com/identity/protocols/OpenIDConnect#hd-param for more details."
 
     enable_twitter_logins: "Enable Twitter authentication, requires twitter_consumer_key and twitter_consumer_secret"
-    twitter_consumer_key: "Consumer key for Twitter authentication, registered at http://dev.twitter.com"
-    twitter_consumer_secret: "Consumer secret for Twitter authentication, registered at http://dev.twitter.com"
+    twitter_consumer_key: "Consumer key for Twitter authentication, registered at https://apps.twitter.com/"
+    twitter_consumer_secret: "Consumer secret for Twitter authentication, registered at https://apps.twitter.com/"
 
     enable_instagram_logins: "Enable Instagram authentication, requires instagram_consumer_key and instagram_consumer_secret"
     instagram_consumer_key: "Consumer key for Instagram authentication"
@@ -1155,7 +1261,6 @@ en:
     enable_facebook_logins: "Enable Facebook authentication, requires facebook_app_id and facebook_app_secret"
     facebook_app_id: "App id for Facebook authentication, registered at https://developers.facebook.com/apps"
     facebook_app_secret: "App secret for Facebook authentication, registered at https://developers.facebook.com/apps"
-    facebook_request_extra_profile_details: "Request about me, location and website from facebook. (requires that your auth application be approved by facebook)"
 
     enable_github_logins: "Enable Github authentication, requires github_client_id and github_client_secret"
     github_client_id: "Client id for Github authentication, registered at https://github.com/settings/applications"
@@ -1166,7 +1271,7 @@ en:
     allow_restore: "Allow restore, which can replace ALL site data! Leave false unless you plan to restore a backup"
     maximum_backups: "The maximum amount of backups to keep on disk. Older backups are automatically deleted"
     automatic_backups_enabled: "Run automatic backups as defined in backup frequency"
-    backup_frequency: "How frequently we create a site backup, in days."
+    backup_frequency: "The number of days between backups."
     enable_s3_backups: "Upload backups to S3 when complete. IMPORTANT: requires valid S3 credentials entered in Files settings."
     s3_backup_bucket: "The remote bucket to hold backups. WARNING: Make sure it is a private bucket."
     s3_disable_cleanup: "Disable the removal of backups from S3 when removed locally."
@@ -1182,6 +1287,7 @@ en:
     top_topics_formula_least_likes_per_post_multiplier: "value of least likes per post multiplier (n) in top topics formula: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
 
     rebake_old_posts_count: "Number of old posts to be rebaked every 15 minutes."
+    enable_safe_mode: "Allow users to enter safe mode to debug plugins."
 
     rate_limit_create_topic: "After creating a topic, users must wait (n) seconds before creating another topic."
     rate_limit_create_post: "After posting, users must wait (n) seconds before creating another post."
@@ -1193,7 +1299,7 @@ en:
     max_bookmarks_per_day: "Maximum number of bookmarks per user per day."
     max_edits_per_day: "Maximum number of edits per user per day."
     max_topics_per_day: "Maximum number of topics a user can create per day."
-    max_private_messages_per_day: "Maximum number of messages users can create per day."
+    max_personal_messages_per_day: "Maximum number of messages users can create per day."
     max_invites_per_day: "Maximum number of invites a user can send per day."
     max_topic_invitations_per_day: "Maximum number of topic invitations a user can send per day."
 
@@ -1213,7 +1319,7 @@ en:
     purge_deleted_uploads_grace_period_days: "Grace period (in days) before a deleted upload is erased."
     purge_unactivated_users_grace_period_days: "Grace period (in days) before a user who has not activated their account is deleted. Set to 0 to never purge unactivated users."
     enable_s3_uploads: "Place uploads on Amazon S3 storage. IMPORTANT: requires valid S3 credentials (both access key id & secret access key)."
-    s3_use_iam_profile: 'Use AWS EC2 IAM role to retrieve keys. NOTE: enabling will override "s3 access key id" and "s3 secret access key" settings.'
+    s3_use_iam_profile: 'Use an <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html">AWS EC2 instance profile</a> to grant access to the S3 bucket. NOTE: enabling this requires Discourse to be running in an appropriately-configured EC2 instance, and overrides the "s3 access key id" and "s3 secret access key" settings.'
     s3_upload_bucket: "The Amazon S3 bucket name that files will be uploaded into. WARNING: must be lowercase, no periods, no underscores."
     s3_access_key_id: "The Amazon S3 access key id that will be used to upload images."
     s3_secret_access_key: "The Amazon S3 secret access key that will be used to upload images."
@@ -1267,8 +1373,10 @@ en:
     tl3_requires_likes_given: "The minimum number of likes that must be given in the last (tl3 time period) days to qualify for promotion to trust level 3."
     tl3_requires_likes_received: "The minimum number of likes that must be received in the last (tl3 time period) days to qualify for promotion to trust level 3."
     tl3_links_no_follow: "Do not remove rel=nofollow from links posted by trust level 3 users."
+    trusted_users_can_edit_others: "Allow users with high trust levels to edit content from other users"
 
     min_trust_to_create_topic: "The minimum trust level required to create a new topic."
+    allow_flagging_staff: "If enabled, users can flag posts from staff accounts."
 
     min_trust_to_edit_wiki_post: "The minimum trust level required to edit post marked as wiki."
 
@@ -1276,9 +1384,13 @@ en:
 
     min_trust_to_allow_self_wiki: "The minimum trust level required to make user's own post wiki."
 
-    min_trust_to_send_messages: "The minimum trust level required to create new private messages."
+    min_trust_to_send_messages: "The minimum trust level required to create new personal messages."
 
-    min_trust_to_send_email_messages: "The minimum trust level required to send new private messages via email (to staged users)."
+    min_trust_to_send_email_messages: "The minimum trust level required to send new personal messages via email (to staged users)."
+
+    min_trust_to_flag_posts: "The minimum trust level required to flag posts"
+    min_trust_to_post_links: "The minimum trust level required to include links in posts"
+    min_trust_to_post_images: "The minimum trust level required to include images in a post"
 
     newuser_max_links: "How many links a new user can add to a post."
     newuser_max_images: "How many images a new user can add to a post."
@@ -1292,7 +1404,7 @@ en:
     create_thumbnails: "Create thumbnails and lightbox images that are too large to fit in a post."
 
     email_time_window_mins: "Wait (n) minutes before sending any notification emails, to give users a chance to edit and finalize their posts."
-    private_email_time_window_seconds: "Wait (n) seconds before sending any private notification emails, to give users a chance to edit and finalize their messages."
+    personal_email_time_window_seconds: "Wait (n) seconds before sending any personal message notification emails, to give users a chance to edit and finalize their messages."
     email_posts_context: "How many prior replies to include as context in notification emails."
     flush_timings_secs: "How frequently we flush timing data to the server, in seconds."
     title_max_word_length: "The maximum allowed word length, in characters, in a topic title."
@@ -1312,6 +1424,7 @@ en:
     max_image_size_kb: "The maximum image upload size in kB. This must be configured in nginx (client_max_body_size) / apache or proxy as well."
     max_attachment_size_kb: "The maximum attachment files upload size in kB. This must be configured in nginx (client_max_body_size) / apache or proxy as well."
     authorized_extensions: "A list of file extensions allowed for upload (use '*' to enable all file types)"
+    authorized_extensions_for_staff: "A list of file extensions allowed for upload for staff users in addition to the list defined in the `authorized_extensions` site setting. (use '*' to enable all file types)"
     theme_authorized_extensions: "A list of file extensions allowed for theme uploads (use '*' to enable all file types)"
     max_similar_results: "How many similar topics to show above the editor when composing a new topic. Comparison is based on title and body."
 
@@ -1338,6 +1451,7 @@ en:
     faq_url: "If you have a FAQ hosted elsewhere that you want to use, provide the full URL here."
     tos_url: "If you have a Terms of Service document hosted elsewhere that you want to use, provide the full URL here."
     privacy_policy_url: "If you have a Privacy Policy document hosted elsewhere that you want to use, provide the full URL here."
+    log_anonymizer_details: "Whether to keep a user's details in the log after being anonymized. When complying to GDPR you'll need to turn this off."
 
     newuser_spam_host_threshold: "How many times a new user can post a link to the same host within their `newuser_spam_host_threshold` posts before being considered spam."
 
@@ -1364,11 +1478,12 @@ en:
     auto_silence_fast_typers_max_trust_level: "Maximum trust level to auto silence fast typers"
     auto_silence_first_post_regex: "Case insensitive regex that if passed will cause first post by user to be silenced and sent to approval queue. Example: raging|a[bc]a , will cause all posts containing raging or aba or aca to be silenced on first. Only applies to first post."
     flags_default_topics: "Show flagged topics by default in the admin section"
+    min_flags_staff_visibility: "The minimum amount of flags on a post must have before staff can see it in the admin section"
 
     reply_by_email_enabled: "Enable replying to topics via email."
     reply_by_email_address: "Template for reply by email incoming email address, for example: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "List of alternative templates for reply by email incoming email addresses. Example: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
-    incoming_email_prefer_html: "Use the HTML instead of the text for incoming email."
+    incoming_email_prefer_html: "Use HTML instead of text for incoming email."
 
     disable_emails: "Prevent Discourse from sending any kind of emails"
 
@@ -1449,6 +1564,7 @@ en:
     staff_user_custom_fields: "A whitelist of custom fields for a user that can be shown to staff."
     enable_user_directory: "Provide a directory of users for browsing"
     enable_group_directory: "Provide a directory of groups for browsing"
+    group_in_subject: "Set %{optional_pm} in email subject to name of first group in PM, see: https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801"
     allow_anonymous_posting: "Allow users to switch to anonymous mode"
     anonymous_posting_min_trust_level: "Minimum trust level required to enable anonymous posting"
     anonymous_account_duration_minutes: "To protect anonymity create a new anonymous account every N minutes for each user. Example: if set to 600, as soon as 600 minutes elapse from last post AND user switches to anon, a new anonymous account is created."
@@ -1458,6 +1574,9 @@ en:
     show_inactive_accounts: "Allow logged in users to browse profiles of inactive accounts."
 
     hide_suspension_reasons: "Don't display suspension reasons publically on user profiles."
+
+    log_personal_messages_views: "Log personal message views by Admin for other users/groups."
+
     user_website_domains_whitelist: "User website will be verified against these domains. Pipe-delimited list."
 
     allow_profile_backgrounds: "Allow users to upload profile backgrounds."
@@ -1505,10 +1624,11 @@ en:
     highlighted_languages: "Included syntax highlighting rules. (Warning: including too many languages may impact performance) see: https://highlightjs.org/static/demo/ for a demo"
 
     embed_truncate: "Truncate the embedded posts."
+    embed_support_markdown: "Support Markdown formatting for 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."
-    notify_about_flags_after: "If there are flags that haven't been handled after this many hours, send a private message to staff. Set to 0 to disable."
+    notify_about_flags_after: "If there are flags that haven't been handled after this many hours, send a personal message to moderators. Set to 0 to disable."
     show_create_topics_notice: "If the site has fewer than 5 public topics, show a notice asking admins to create some topics."
 
     delete_drafts_older_than_n_days: Delete drafts older than (n) days.
@@ -1520,13 +1640,15 @@ en:
     slug_generation_method: "Choose a slug generation method. 'encoded' will generate percent encoding string. 'none' will disable slug at all."
 
     enable_emoji: "Enable emoji"
+    enable_emoji_shortcuts: "Common smiley text such as :) :p :( will be converted to emojis"
     emoji_set: "How would you like your emoji?"
     enforce_square_emoji: "Force a square aspect ratio to all emojis."
 
     approve_post_count: "The amount of posts from a new or basic user that must be approved"
     approve_unless_trust_level: "Posts for users below this trust level must be approved"
     approve_new_topics_unless_trust_level: "New topics for users below this trust level must be approved"
-    notify_about_queued_posts_after: "If there are posts that have been waiting to be reviewed for more than this many hours, an email will be sent to the contact_email. Set to 0 to disable these emails."
+    approve_unless_staged: "New topics and posts for staged users must be approved"
+    notify_about_queued_posts_after: "If there are posts that have been waiting to be reviewed for more than this many hours, send a notification to all moderators. Set to 0 to disable these notifications."
     auto_close_messages_post_count: "Maximum number of posts allowed in a message before it is automatically closed (0 to disable)"
     auto_close_topics_post_count: "Maximum number of posts allowed in a topic before it is automatically closed (0 to disable)"
 
@@ -1537,7 +1659,7 @@ en:
 
     default_email_digest_frequency: "How often users receive summary emails by default."
     default_include_tl0_in_digests: "Include posts from new users in summary emails by default. Users can change this in their preferences."
-    default_email_private_messages: "Send an email when someone messages the user by default."
+    default_email_personal_messages: "Send an email when someone messages the user by default."
     default_email_direct: "Send an email when someone quotes/replies to/mentions or invites the user by default."
     default_email_mailing_list_mode: "Send an email for every new post by default."
     default_email_mailing_list_mode_frequency: "Users who enable mailing list mode will receive emails this often by default."
@@ -1581,8 +1703,9 @@ en:
     show_filter_by_tag: "Show a dropdown to filter a topic list by tag."
     max_tags_in_filter_list: "Maximum number of tags to show in the filter dropdown. The most used tags will be shown."
     tags_sort_alphabetically: "Show tags in alphabetical order. Default is to show in order of popularity."
+    tags_listed_by_group: "List tags by tag group on the Tags page (/tags)."
     tag_style: "Visual style for tag badges."
-    staff_tags: "A list of tags that can only be applied by staff members"
+    allow_staff_to_tag_pms: "Allow staff members to tag any personal message"
     min_trust_level_to_tag_topics: "Minimum trust level required to tag topics"
     suppress_overlapping_tags_in_list: "If tags match exact words in topic titles, don't show the tag"
     remove_muted_tags_from_latest: "Don't show topics tagged with muted tags in the latest topic list."
@@ -1591,6 +1714,11 @@ en:
     company_full_name: "Company Name (full)"
     company_domain: "Company Domain"
 
+    shared_drafts_category: "Enable the Shared Drafts feature by designating a category for topic drafts."
+
+    push_notifications_prompt: "Display user consent prompt."
+    push_notifications_icon_url: "The badge icon that appears in the notification corner. Recommended size is 96px by 96px."
+
     errors:
       invalid_email: "Invalid email address."
       invalid_username: "There's no user with that username."
@@ -1619,6 +1747,7 @@ en:
       staged_users_disabled: "You must first enable 'staged users' before enabling this setting."
       reply_by_email_disabled: "You must first enable 'reply by email' before enabling this setting."
       sso_url_is_empty: "You must set a 'sso url' before enabling this setting."
+      enable_local_logins_disabled: "You must first enable 'enable local logins' before enabling this setting."
 
   search:
     within_post: "#%{post_number} by %{username}"
@@ -1728,6 +1857,7 @@ en:
   login:
     not_approved: "Your account hasn't been approved yet. You will be notified by email when you are ready to log in."
     incorrect_username_email_or_password: "Incorrect username, email or password"
+    incorrect_password: "Incorrect password"
     wait_approval: "Thanks for signing up. We will notify you when your account has been approved."
     active: "Your account is activated and ready to use."
     activate_email: "<p>You’re almost done! We sent an activation mail to <b>%{email}</b>. Please follow the instructions in the mail to activate your account.</p><p>If it doesn’t arrive, check your spam folder.</p>"
@@ -1750,6 +1880,9 @@ en:
     auth_complete: "Authentication is complete."
     click_to_continue: "Click here to continue."
     already_logged_in: "Oops, looks like you are attempting to accept an invitation for another user. If you are not %{current_user}, please log out and try again."
+    second_factor_title: "Two Factor Authentication"
+    second_factor_description: "Please enter the required authentication code from your app:"
+    invalid_second_factor_code: "Invalid authentication code"
 
   user:
     no_accounts_associated: "No accounts associated"
@@ -1918,7 +2051,7 @@ en:
 
       - Be *sure* to set the `notification email` from: address correctly in your site settings. **The domain specified in the "from" address of the emails you send is the domain your email will be validated against**.
 
-      - Know how to view the raw source of the email in your mail client, so you can examine email headers for important clues. in Gmail, it is the "show original" option in the drop-down menu at the top right of each mail.
+      - Know how to view the raw source of the email in your mail client, so you can examine email headers for important clues. In Gmail, it is the "show original" option in the drop-down menu at the top right of each mail.
 
       - **IMPORTANT:** Does your ISP have a reverse DNS record entered to associate the domain names and IP addresses you send mail from? [Test your Reverse PTR record][2] here. If your ISP does not enter the proper reverse DNS pointer record, it's very unlikely any of your email will be delivered.
 
@@ -2024,6 +2157,22 @@ en:
 
         For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines).
 
+    post_hidden_again:
+      title: "Post Hidden again"
+      subject_template: "Post hidden by community flags, staff notified"
+      text_body_template: |
+        Hello,
+
+        This is an automated message from %{site_name} to let you know that your post was hidden again.
+
+        <%{base_url}%{url}>
+
+        %{flag_reason}
+
+        Multiple community members flagged this post before it was hidden. **Because this post has been hidden more than once, your post will now remain hidden until it is handled by a staff member.**
+
+        For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines).
+
     usage_tips:
       text_body_template: |
         For a few quick tips on getting started as a new user, [check out this blog post](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
@@ -2129,7 +2278,7 @@ en:
 
     csv_export_succeeded:
       title: "CSV Export Succeeded"
-      subject_template: "Data export complete"
+      subject_template: "[%{export_title}] Data export complete"
       text_body_template: |
         Your data export was successful! :dvd:
 
@@ -2287,6 +2436,14 @@ en:
 
         None of the destination email addresses are recognized, or the Message-ID header in the email has been modified. Please make sure that you are sending to the correct email address provided by staff.
 
+    email_reject_old_destination:
+      title: "Email Reject Old Destination"
+      subject_template: "[%{email_prefix}] Email issue -- You are trying to reply to an old notification"
+      text_body_template: |
+        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
+
+        For security reasons we only accept replies to original notifications for 90 days. Please [visit the topic](%{short_url}) to continue the conversation.
+
     email_reject_topic_not_found:
       title: "Email Reject Topic Not Found"
       subject_template: "[%{email_prefix}] Email issue -- Topic Not Found"
@@ -2474,6 +2631,8 @@ en:
 
     posted_by: "Posted by %{username} on %{post_date}"
 
+    pm_participants: "Participants:"
+
     invited_group_to_private_message_body: |
       %{username} invited @%{group_name} to a message
 
@@ -2607,6 +2766,18 @@ en:
 
         %{respond_instructions}
 
+    user_mentioned_pm:
+      title: "User Mentioned PM"
+      subject_template: "[%{email_prefix}] [PM] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+
     user_group_mentioned:
       title: "User Group Mentioned"
       subject_template: "[%{email_prefix}] %{topic_title}"
@@ -2697,6 +2868,17 @@ en:
 
 
 
+    account_second_factor_disabled:
+      title: "Two Factor Authentication disabled"
+      subject_template: "[%{email_prefix}] Two Factor Authentication disabled"
+      text_body_template: |
+        Two factor authentication has been disabled on your account at %{site_name}. You can now log in with only your password; an additional authentication code is no longer required.
+
+        If you did not choose to disable two factor authentication, someone may have compromised your account.
+
+        If you have any questions, [contact our friendly staff](%{base_url}/about).
+
+
     digest:
       why: "A brief summary of %{site_link} since your last visit on %{last_seen_at}"
       since_last_visit: "Since your last visit"
@@ -2751,6 +2933,17 @@ en:
         Click the following link to choose a new password:
         %{base_url}/u/password-reset/%{email_token}
 
+    email_login:
+      title: "Log in via link"
+      subject_template: "[%{email_prefix}] Log in via link"
+      text_body_template: |
+        Here's your link to log in at [%{site_name}](%{base_url}).
+
+        If you did not request this link, you can safely ignore this email.
+
+        Click the following link to log in:
+        %{base_url}/session/email-login/%{email_token}
+
     set_password:
       title: "Set Password"
       subject_template: "[%{email_prefix}] Set Password"
@@ -2822,8 +3015,8 @@ en:
 
         A staff member approved your account on %{site_name}.
 
-        Click the following link to confirm and activate your new account:
-        %{base_url}/u/activate-account/%{email_token}
+        You can now access your new account by logging in at:
+        %{base_url}
 
         If the above link is not clickable, try copying and pasting it into the address bar of your web browser.
 
@@ -3172,7 +3365,7 @@ en:
 
       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 January 1, 2017.
+      This document is CC-BY-SA. It was last updated January 1, 2018.
 
       Originally adapted from the [WordPress Terms of Service](http://en.wordpress.com/tos/).
 
@@ -3361,7 +3554,7 @@ en:
       name: Promoter
       description: Invited a user
       long_description: |
-        This badge is granted when you invite someone to join the community via the invite button on your user page, or at the bottom of a topic. Inviting friends who might be interested in specific discussions is an great way to introduce new people to our community, so thanks!
+        This badge is granted when you invite someone to join the community via the invite button on your user page, or at the bottom of a topic. Inviting friends who might be interested in specific discussions is a great way to introduce new people to our community, so thanks!
     campaigner:
       name: Campaigner
       description: Invited 3 basic users
@@ -3461,7 +3654,7 @@ en:
       name: First Emoji
       description: Used an Emoji in a Post
       long_description: |
-        This badge is granted the first time you add an Emoji to your post :thumbsup:. Emoji let you convey emotion in your posts, from happiness :smiley: to sadness :anguished: to anger :angry: and everything in between :sunglasses: . Just type a : (colon) or press the Emoji toolbar button in the editor to select from hundreds of choices :ok_hand:
+        This badge is granted the first time you add an Emoji to your post :thumbsup:. Emoji let you convey emotion in your posts, from happiness :smiley: to sadness :anguished: to anger :angry: and everything in between :sunglasses:. Just type a : (colon) or press the Emoji toolbar button in the editor to select from hundreds of choices :ok_hand:
     first_mention:
       name: First Mention
       description: Mentioned a user in a post
@@ -3496,7 +3689,9 @@ en:
 
   admin_login:
     success: "Email Sent"
-    error: "Error!"
+    errors:
+      unknown_email_address: "Unknown email address."
+      invalid_token: "Invalid token."
     email_input: "Admin Email"
     submit_button: "Send Email"
 
@@ -3508,6 +3703,7 @@ en:
     title: "Tags"
     staff_tag_disallowed: "The tag \"%{tag}\" may only be applied by staff."
     staff_tag_remove_disallowed: "The tag \"%{tag}\" may only be removed by staff."
+    minimum_required_tags: "You must select at least %{count} tags."
   rss_by_tag: "Topics tagged %{tag}"
 
   finish_installation:
@@ -3672,3 +3868,17 @@ en:
 
   search_logs:
     graph_title: "Search Count"
+
+  joined: "Joined"
+
+  discourse_push_notifications:
+    popup:
+      mentioned: '%{username} mentioned you in "%{topic}" - %{site_title}'
+      group_mentioned: '%{username} mentioned you in "%{topic}" - %{site_title}'
+      quoted: '%{username} quoted you in "%{topic}" - %{site_title}'
+      replied: '%{username} replied to you in "%{topic}" - %{site_title}'
+      posted: '%{username} posted in "%{topic}" - %{site_title}'
+      private_message: '%{username} sent you a private message in "%{topic}" - %{site_title}'
+      linked: '%{username} linked to your post from "%{topic}" - %{site_title}'
+      confirm_title: 'Notifications enabled - %{site_title}'
+      confirm_body: 'Success! Notifications have been enabled.'
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index 7befac1f30e..ec146fd0a31 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -17,36 +17,58 @@ es:
       date_only: "%-d %B, %Y"
       long: "%-d %B, %Y, %l:%M%P"
   date:
-    month_names: [null, Enero, Febrero, Marzo, Abril, Mayo, Junio, Julio, Agosto, Septiembre, Octubre, Noviembre, Diciembre]
+    month_names: [~, Enero, Febrero, Marzo, Abril, Mayo, Junio, Julio, Agosto, Septiembre, Octubre, Noviembre, Diciembre]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "am"
     pm: "pm"
-    <<: *datetime_formats
   title: "Discourse"
   topics: "Temas"
   posts: "posts"
   loading: "Cargando"
   powered_by_html: 'Funciona gracias a <a href="https://www.discourse.org">Discourse</a>, se ve mejor con JavaScript activado'
   log_in: "Iniciar sesión"
+  submit: "Enviar"
   purge_reason: "Cuenta eliminada automáticamente al detectarse como abandonada, desactivada"
   disable_remote_images_download_reason: "La descarga de imágenes remotas se desactivó porque no había suficiente espacio disponible en disco."
   anonymous: "Anónimos"
   remove_posts_deleted_by_author: "Eliminado por su autor"
+  redirect_warning: "No pudimos verificar que el enlace que seleccionó se haya publicado en el foro. Si desea continuar de todos modos, seleccione el enlace a continuación."
   themes:
     bad_color_scheme: "No puedes actualizar theme, esquema de color inválido"
     other_error: "Algo salió mal actualizando el theme"
+    error_importing: "Error al clonar el repositorio de git, acceso denegado o no se encuentra el repositorio"
+    settings_errors:
+      invalid_yaml: "YAML provisto es inválido."
+      data_type_not_a_number: "Tipo de ajuste `%{name}` no está soportado. Tipos soportados: `integer`, `bool`, `list` and `enum`"
+      name_too_long: "Hay un ajuste con un nombre muy largo. Cantidad máxima de caracteres es 255"
+      default_value_missing: "Ajuste `%{name}`` no tiene valor por defecto"
+      default_not_match_type: "Tipo de valor por defecto para el ajuste `%{name}` no coincide con el tipo de ajuste."
+      default_out_range: "Valor por defecto del ajuste `%{name}` no está en el rango específico."
+      enum_value_not_valid: "El valor seleccionado no es una de las opciones enumeradas."
+      number_value_not_valid: "El nuevo valor no está dentro del rango permitido."
+      number_value_not_valid_min_max: "Debe ser entre %{min} y %{max}."
+      number_value_not_valid_min: "Debe ser mayor o igual que %{min}."
+      number_value_not_valid_max: "Debe ser menor o igual que %{max}."
+      string_value_not_valid: "La nueva longitud del valor no está dentro del rango permitido."
+      string_value_not_valid_min_max: "Debe ser entre %{min} y %{max} de longitud de caracteres."
+      string_value_not_valid_min: "Debe ser al menos de %{min} caracteres de longitud."
+      string_value_not_valid_max: "Debe ser como máximo de %{max} caracteres de longitud."
   emails:
     incoming:
       default_subject: "Este tema necesita un título"
       show_trimmed_content: "Mostrar contenido recortado"
       maximum_staged_user_per_email_reached: "Alcanzado el número máximo de usuarios provisionales creados por email."
+      no_subject: "(sin título)"
+      no_body: "(sin mensaje)"
       errors:
         empty_email_error: "Sucede cuando el texto en bruto del email que recibimos está en blanco."
         no_message_id_error: "Sucede cuando el email no tiene Id del mensaje en el encabezado."
         auto_generated_email_error: "Sucede cuando la 'prioridad' en el encabezado está establecida en: lista, basura, en masa o auto_respuesta, o cuando algún otro encabezado contiene: auto-enviado, auto-respondido o auto-generado."
         no_body_detected_error: "Sucede cuando no podemos extraer el cuerpo del mensaje y no hay archivos adjuntos."
         no_sender_detected_error: "Sucede cuando no podemos encontrar una dirección de email válida desde el encabezado From."
+        from_reply_by_address_error: "Ocurre cuando el encabezado From coincide con la respuesta por dirección de correo electrónico."
         inactive_user_error: "Sucede cuando el emisor no está activo."
         silenced_user_error: "Ocurre cuando el remitente ha sido silenciado."
         bad_destination_address: "Sucede cuando ninguna de las direcciones de email en los campos Para/Cc/Bcc coincide con un email configurado como dirección de correo entrante."
@@ -72,23 +94,24 @@ es:
       present: debe dejarse en blanco
       confirmation: "no coincide %{attribute}"
       empty: no puede estar vacío
-      equal_to: debe ser igual a %{count}
+      equal_to: "debe ser igual a %{count}"
       even: debe ser además
       exclusion: está reservado
-      greater_than: debe ser más grande que %{count}
-      greater_than_or_equal_to: debe ser igual o más grande que %{count}
+      greater_than: "debe ser más grande que %{count}"
+      greater_than_or_equal_to: "debe ser igual o más grande que %{count}"
       has_already_been_used: "ya se está utilizando"
       inclusion: no está incluido en la lista
       invalid: no es válido
       is_invalid: "parece poco claro, es una oración completa?"
       contains_censored_words: "contiene las siguientes palabras censuradas: %{censored_words}"
-      matches_censored_pattern: "contiene las siguientes palabras que coinciden con el regexp de censuras: %{censored_words}"
-      less_than: debe ser menor que %{count}
-      less_than_or_equal_to: debe ser menor o igual que %{count}
+      less_than: "debe ser menor que %{count}"
+      less_than_or_equal_to: "debe ser menor o igual que %{count}"
       not_a_number: no es un número
       not_an_integer: debe ser un valor entero
       odd: debe ser impar
       record_invalid: 'Error en la validación: %{errors}'
+      max_emojis: "no puede tener más de %{max_emojis_count} emoji"
+      ip_address_already_screened: "ya se está incluido en una regla existente"
       restrict_dependent_destroy:
         one: "No se pudo eliminar el registro porque existe otro %{record} dependiente"
         many: "No se puede eliminar el registro porque existen otros %{record} dependientes"
@@ -110,15 +133,27 @@ es:
     embed:
       load_from_remote: "Hubo un error al cargar ese post."
     site_settings:
+      invalid_choice:
+        one: Has especificado la opción inválida %{name}
+        other: Has especificado las opciones inválidas %{name}
       min_username_length_exists: "No se puede establecer una longitud mínima para nombre de usuario mayor que el nombre de usuario más corto ya existente."
       min_username_length_range: "No se puede establecer el mínimo por encima del máximo."
       max_username_length_exists: "No se puede establecer una longitud máxima de nombre de usuario menor que el nombre de usuario más largo ya existente."
       max_username_length_range: "No puedes poner el máximo por debajo del mínimo."
       default_categories_already_selected: "No se puede seleccionar una categoría ya utilizada en otra lista."
       s3_upload_bucket_is_required: "No se pueden activar las subidas a S3 a menos que se haya proporcionado un valor a 's3_upload_bucket'."
-    conflicting_google_user_id: 'La ID de la cuenta de Google para esta cuenta ha cambiado; por motivos de seguridad, hace falta que un miembro del staff intervenga. Por favor, ponte en contacto con el staff y mándales a <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
+    conflicting_google_user_id: 'El ID de la cuenta Google para esta cuenta ha cambiado; el staff debe intervenir por razones de seguridad. Por favor, póngase en contacto con miembros del staff y envíe esta referencia <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
+  activemodel:
+    errors:
+      <<: *errors
   invite:
     not_found: "El código de la invitación es inválido. Por favor, ponte en contacto con un administrador."
+    not_found_template: |
+      <p>Tu invitación a <a href="%{base_url}">%{site_name}</a> ya ha sido redimida.</p>
+
+      <p>Si recuerdas tu contraseña puedes <a href="%{base_url}/login">Ingresar</a>.</p>
+
+      <p>O bien, por favor <a href="%{base_url}/password-reset">Resetear Contraseña</a>.</p>
     user_exists: "No hay necesidad de invitar a <b>%{email}</b>, ya <a href='/u/%{username}/summary'>tiene una cuenta!</a>"
   bulk_invite:
     file_should_be_csv: "El archivo subido debería ser de formato csv."
@@ -130,6 +165,7 @@ es:
     backup_file_should_be_tar_gz: "El archivo de la copia de seguridad debería ser del tipo .tar.gz"
     not_enough_space_on_disk: "No hay espacio suficiente en el disco para subir esta copia de seguridad."
     invalid_filename: "El nombre de archivo del backup contiene caracteres no válidos. Los válidos son a-z 0-9 . - _."
+  invalid_params: "Proporcionó parámetros no válidos para la solicitud: %{message}"
   not_logged_in: "Tienes que iniciar sesión para hacer eso."
   not_found: "No se ha podido encontrar la URL o recurso solicitado."
   invalid_access: "No tienes permiso para ver el recurso solicitado."
@@ -138,8 +174,8 @@ es:
   reading_time: "Tiempo de lectura"
   likes: "Me gusta"
   too_many_replies:
-    one: "Lo sentimos, pero los usuarios nuevos están limitados a 1 respuesta en el mismo tema."
-    other: "Lo sentimos, pero los usuarios nuevos están limitados a %{count} respuestas en el mismo tema."
+    one: Lo sentimos, pero los usuarios nuevos están limitados a 1 respuesta en el mismo tema.
+    other: Lo sentimos, pero los usuarios nuevos están limitados a %{count} respuestas en el mismo tema.
   embed:
     start_discussion: "Empezar discusión"
     continue: "Continuar discusión"
@@ -149,36 +185,38 @@ es:
     no_hosts: "No se han definido hosts para el insertado"
     configure: "Configurar insertado"
     more_replies:
-      one: "otra respuesta"
-      other: "otras %{count}  respuestas"
+      one: otra respuesta
+      other: otras %{count}  respuestas
     loading: "Cargando discusión"
     permalink: "Enlace permanente"
     imported_from: "Este es un tema de discusión derivado de la entrada %{link}"
     in_reply_to: "▶ %{username}"
     replies:
-      one: "1 respuesta"
-      other: "%{count} respuestas"
+      one: 1 respuesta
+      other: '%{count} respuestas'
   no_mentions_allowed: "Lo sentimos, pero no puedes mencionar a otros usuarios."
   too_many_mentions:
-    one: "Lo sentimos, solo puedes mencionar a un usuario en un post."
-    other: "Lo sentimos, pero solo puedes mencionar a %{count} usuarios en un post."
+    one: Lo sentimos, solo puedes mencionar a un usuario en un post.
+    other: Lo sentimos, pero solo puedes mencionar a %{count} usuarios en un post.
   no_mentions_allowed_newuser: "Lo sentimos, pero los usuarios nuevos no pueden mencionar a otros usuarios."
   too_many_mentions_newuser:
-    one: "Lo sentimos, pero los usuarios nuevos solo pueden mencionar a un usuario en un post."
-    other: "Lo sentimos, pero los usuarios nuevos solo pueden mencionar a %{count} usuarios en un post."
+    one: Lo sentimos, pero los usuarios nuevos solo pueden mencionar a un usuario en un post.
+    other: Lo sentimos, pero los usuarios nuevos solo pueden mencionar a %{count} usuarios en un post.
+  no_images_allowed_trust: "Lo sentimos, no puedes poner imágenes en una publicación"
   no_images_allowed: "Lo sentimos, pero los usuarios nuevos no pueden poner imágenes en los mensajes."
   too_many_images:
-    one: "Lo sentimos, pero los usuarios nuevos solo pueden poner una imagen por post."
-    other: "Lo sentimos, los nuevos usuarios solo pueden poner %{count} imágenes en un post."
+    one: Lo sentimos, pero los usuarios nuevos solo pueden poner una imagen por post.
+    other: Lo sentimos, los nuevos usuarios solo pueden poner %{count} imágenes en un post.
   no_attachments_allowed: "Lo sentimos, los usuarios nuevos no pueden adjuntar archivos en posts."
   too_many_attachments:
-    one: "Lo sentimos, los usuarios nuevos solo pueden adjuntar un archivo por post"
-    other: "Lo sentimos, los usuarios nuevos solo pueden adjuntar %{count} archivos por post."
+    one: Lo sentimos, los usuarios nuevos solo pueden adjuntar un archivo por post
+    other: Lo sentimos, los usuarios nuevos solo pueden adjuntar %{count} archivos por post.
   no_links_allowed: "Lo sentimos, los nuevos usuarios no pueden poner enlaces en los posts."
+  links_require_trust: "Lo sentimos, no puedes incluir enlaces en tus posts."
   too_many_links:
-    one: "Lo sentimos, los nuevos usuarios solo pueden poner un link en un post."
-    other: "Lo sentimos, los nuevos usuarios solo pueden poner %{count} enlaces en un post."
-  contains_blocked_words: "Tu post contiene palabras que no son permitidas."
+    one: Lo sentimos, los nuevos usuarios solo pueden poner un link en un post.
+    other: Lo sentimos, los nuevos usuarios solo pueden poner %{count} enlaces en un post.
+  contains_blocked_words: "Tu post contiene una palabra que no está permitida: %{word}"
   spamming_host: "Lo sentimos, no puedes publicar un enlace a esa web."
   user_is_suspended: "A los usuarios suspendidos no se les permite publicar."
   topic_not_found: "Algo ha salido mal. ¿Tal vez este tema ha sido cerrado o eliminado mientras estabas lo estabas mirando?"
@@ -225,10 +263,15 @@ es:
     not_found: "Post no encontrado o ya se actualizó."
   groups:
     success:
-      bulk_add: "usuarios %{users_added} han sido agregado al grupo."
+      bulk_add:
+        one: '%{count} usuario ha sido agregado al grupo.'
+        other: '%{count} usuarios han sido agregados al grupo.'
     errors:
+      grant_trust_level_not_valid: "'%{trust_level}' no es un nivel de confianza válido."
       can_not_modify_automatic: "No se puede modificar un grupo automático"
-      member_already_exist: "'%{username}' ya es miembro de este grupo."
+      member_already_exist:
+        one: '''%{username}'' ya es miembro de este grupo.'
+        other: 'Los siguientes usuarios ya son miembros de éste grupo: %{username}'
       invalid_domain: "'%{domain}' no es un dominio válido."
       invalid_incoming_email: "'%{email}' no es una dirección de email válida."
       email_already_used_in_group: "'%{email}' ya está siendo utilizado por el grupo '%{group_name}'."
@@ -248,9 +291,9 @@ es:
       title: "Solicitud de membresía para @%{group_name}"
   education:
     until_posts:
-      one: "1 post"
-      other: "%{count} posts"
-    new-topic: |
+      one: 1 post
+      other: '%{count} posts'
+    'new-topic': |
       Bienvenido a %{site_name} &mdash; **¡gracias por comenzar una nueva conversación!**
 
       - ¿El título describe de forma precisa tu tema? ¿Suena interesante?
@@ -260,7 +303,7 @@ es:
       - Incluye buenos términos de búsqueda en tu tema para que otros puedan *encontrarlo*. Para agrupar tu tema con otros relacionados, selecciona una categoría.
 
       Para más consejos, [visita nuestras directrices de uso en comunidad](/guidelines). Este panel solo aparecerá para tus primeros %{education_posts_text}.
-    new-reply: |
+    'new-reply': |
       Bienvenido a %{site_name} &mdash; **¡gracias por contribuir a la conversación!**
 
       - ¿Tu respuesta mejora la conversación de alguna forma, aunque sea un poco?
@@ -309,7 +352,7 @@ es:
     reviving_old_topic: |
       ### ¿Revivir este tema?
 
-      La última respuesta a este tema fue hace %{days} días. Tu post reactivará el tema subiéndolo a las primeras posiciones de la lista y notificará a aquellos involucrados en la conversación previa.
+      La última respuesta a este tema fue hace **%{time_ago}**. Tu post reactivará el tema subiéndolo a las primeras posiciones de la lista y notificará a aquellos involucrados previamente en la conversación.
 
       ¿Estás seguro de que quieres continuar esta conversación antigua?
   activerecord:
@@ -324,15 +367,17 @@ es:
       user_profile:
         bio_raw: "Sobre mí"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
               warning_requires_pm: "Solamente puedes enviar advertencias por mensajes privado."
               too_many_users: "Solamente puedes enviar advertencias a un usuario a la vez."
-              cant_send_pm: "Lo sentimos, no puedes enviar un mensaje privado a este usuario."
+              cant_send_pm: "Lo sentimos, no puedes enviar un mensaje personal a este usuario."
               no_user_selected: "Debes seleccionar un usuario válido."
               reply_by_email_disabled: "Respuestas por email han sido desactivadas."
+              target_user_not_found: "No se pudo encontrar uno de los usuarios a los que envía este mensaje."
             featured_link:
               invalid: "es inválido. La dirección debería incluir http:// o https://."
               invalid_category: "no puede ser editado en esta categoría."
@@ -346,6 +391,10 @@ es:
               unique_characters: "tiene demasiados caracteres repetidos. Por favor usa una contraseña más segura."
             ip_address:
               signup_not_allowed: "El registro no está permitido para esta cuenta."
+        user_email:
+          attributes:
+            user_id:
+              reassigning_primary_email: "Reasignar un email primario a otro usuario no está permitido."
         color_scheme_color:
           attributes:
             hex:
@@ -373,7 +422,6 @@ es:
           attributes:
             word:
               too_many: "Demasiadas palabras para esa acción"
-      <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>El campo 'Sobre mí' de tu perfil está vacío, <a href='/u/%{username_lower}/preferences/about-me'>¿Te gustaría completarlo?</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} no has completado aún el campo 'Sobre mí' de tu perfil</div>"
@@ -389,46 +437,47 @@ es:
     title: "Bienvenido a Discourse"
     body: |2
 
-      El primer párrafo de este tema destacado (tema fijo) será visible para todos los usuarios como mensaje de bienvenida en tu página principal. Es importante!
+        El primer párrafo de este tema destacado (tema fijo) será visible para todos los usuarios como mensaje de bienvenida en tu página principal. Es importante!
 
-      **Estia esto** con un resumen de lo que es tu comunidad:
+        **Estia esto** con un resumen de lo que es tu comunidad:
 
-      - ¿Para quiénes es?
-      - ¿Qué pueden encontrar aquí?
-      - ¿Por qué deben venir aquí?
-      - ¿Dónde pueden leer más sobre la comunidad (enlaces, recursos, etc)?
+        - ¿Para quiénes es?
+        - ¿Qué pueden encontrar aquí?
+        - ¿Por qué deben venir aquí?
+        - ¿Dónde pueden leer más sobre la comunidad (enlaces, recursos, etc)?
 
-      <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+        <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
 
-      Quizás quieras "cerrar" este tema :wrench: (en la parte superior derecha o en la parte de abajo), para que las nuevas respuestas no se sumen en el anuncio.
+        Quizás quieras "cerrar" este tema :wrench: (en la parte superior derecha o en la parte de abajo), para que las nuevas respuestas no se sumen en el anuncio.
   lounge_welcome:
     title: "Bienvenido a la Sala VIP"
     body: |2
 
-      ¡Enhorabuena! :confetti_ball:
+        ¡Enhorabuena! :confetti_ball:
 
-      Si puedes ver este tema, es que has sido promocionado a usuario **habitual** (nivel de confianza 3).
+        Si puedes ver este tema, es que has sido promocionado a usuario **habitual** (nivel de confianza 3).
 
-      Ahora puedes &hellip;
+        Ahora puedes &hellip;
 
-      * Editar el título de cualquier tema
-      * Cambiar la categoría de cualquier tema
-      * Tus enlaces no llevarán automáticamente la etiqueta [nofollow](http://es.wikipedia.org/wiki/Nofollow)
-      * Acceder a la categoría privada Sala VIP, solo visible para usuarios de nivel 3 o más
-      * Ocultar spam con una sola vez que reportes
+        * Editar el título de cualquier tema
+        * Cambiar la categoría de cualquier tema
+        * Tus enlaces no llevarán automáticamente la etiqueta [nofollow](http://es.wikipedia.org/wiki/Nofollow)
+        * Acceder a la categoría privada Sala VIP, solo visible para usuarios de nivel 3 o más
+        * Ocultar spam con una sola vez que reportes
 
-      Consulta aquí [la lista actualizada de usuarios habituales](/badges/3/regular). ¡Manda un saludo!
+        Consulta aquí [la lista actualizada de usuarios habituales](/badges/3/regular). ¡Manda un saludo!
 
-      ¡Gracias por formar la parte más importante de esta comunidad!
+        ¡Gracias por formar la parte más importante de esta comunidad!
 
-      (Para saber más sobre niveles de confianza, [mira este tema][trust]. Por favor, ten en cuenta que solo los usuarios que continúen cumpliendo los requisitos a lo largo del tiempo seguirán en el nivel de usuarios habituales.)
+        (Para saber más sobre niveles de confianza, [mira este tema][trust]. Por favor, ten en cuenta que solo los usuarios que continúen cumpliendo los requisitos a lo largo del tiempo seguirán en el nivel de usuarios habituales.)
 
-      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Definición de la categoría %{category}"
     replace_paragraph: "(Sustituye este primer párrafo con una descripción breve de tu nueva categoría. Esta descripción aparecerá en el área de selección de categoría, por ello, intenta que sea inferior a 200 caracteres. **Hasta que edites esta descripción o se creen temas, esta categoría no aparecerá en la página de categorías.**)"
     post_template: "%{replace_paragraph}\n\nUtiliza los siguientes párrafos para una descripción más detallada, o establece las directrices o reglas de la categoría::\n\n- ¿Para qué podrían usar los usuarios esta categoría? ¿De qué trata?\n\n- ¿Cómo se distingue de otras categorías existentes?\n\n- ¿Qué temas debería contener esta categoría normalmente?\n\n- ¿Necesitamos esta categoría? ¿Podría agruparse o converger con otra categoría o subcategoría?\n"
     errors:
+      not_found: "¡Categoría no encontrada!"
       uncategorized_parent: "Sin categoría no puede tener categoría primaria"
       self_parent: "La categoría primaria de una subcategoría no puede ser ella misma."
       depth: "No se puede anidar una subcategoría debajo de otra"
@@ -440,8 +489,8 @@ es:
       uncategorized: "Sin categoría no se puede eliminar"
       has_subcategories: "No se puede eliminar esta categoría porque tiene sub-categorías."
       topic_exists:
-        one: "No se puede eliminar esta categoría porque tiene 1 tema. El más antiguo es %{topic_link}."
-        other: "No se puede eliminar esta categoría porque tiene %{count} temas. El tema más antiguo es %{topic_link}."
+        one: No se puede eliminar esta categoría porque tiene 1 tema. El más antiguo es %{topic_link}.
+        other: No se puede eliminar esta categoría porque tiene %{count} temas. El tema más antiguo es %{topic_link}.
       topic_exists_no_oldest: "No se puede eliminar esta categoría porque el contador de temas está en %{count}."
     uncategorized_description: "Debates que no necesitan una categoría, o bien no encajan en alguna de las categorías existentes."
   trust_levels:
@@ -460,103 +509,103 @@ es:
     image_placeholder:
       broken: "Esta imagen está rota"
   rate_limiter:
-    slow_down: "Has realizado esta acción muchas veces, inténtalo de nuevo más tarde."
-    too_many_requests: "Estas haciendo eso demasiado a menudo. Por favor espera %{time_left} antes de intentarlo de nuevo."
+    slow_down: "Has realizado esta acción muchas veces, por favor inténtalo de nuevo más tarde."
+    too_many_requests: "Has realizado esta acción muchas veces. Por favor espera %{time_left} antes de intentar nuevamente."
     by_type:
-      first_day_replies_per_day: "Has llegado al límite de respuestas que un nuevo usuario puede crear en su primer día. Por favor, espera %{time_left} antes de intentarlo de nuevo."
-      first_day_topics_per_day: "Has llegado al límite de temas que un nuevo usuario puede crear en su primer día. Por favor, espera %{time_left} antes de intentarlo de nuevo."
-      create_topic: "Estás creando temas demasiado rápido. Por favor, espera %{time_left} antes de intentarlo de nuevo."
-      create_post: "Estás respondiendo demasiado rápido. Por favor, espera %{time_left} antes de intentarlo de nuevo."
-      delete_post: "Estás eliminando posts demasiado rápido. Por favor espera %{time_left} antes de intentarlo de nuevo."
-      public_group_membership: "Estás uniéndote o saliendo de grupos con mucha frecuencia. Por favor, espera %{time_left} antes de volver a intentarlo."
-      topics_per_day: "Has llegado al límite de nuevos temas de hoy. Por favor, espera %{time_left} antes de intentarlo de nuevo."
-      pms_per_day: "Has llegado al límite de mensajes de hoy. Por favor, espera %{time_left} antes de intentarlo de nuevo."
-      create_like: "Has llegado al límite de Me gusta de hoy. Por favor, espera %{time_left} antes de intentarlo de nuevo."
-      create_bookmark: "Has llegado al límite de marcadores de hoy. Por favor, espera %{time_left} antes de intentarlo de nuevo."
-      edit_post: "Has llegado al límite de ediciones de hoy. Por favor, espera %{time_left} antes de intentarlo de nuevo."
-      live_post_counts: "Estás solicitando actualizaciones de posts demasiado rápido. Por favor, espera %{time_left} antes de intentarlo de nuevo."
-      unsubscribe_via_email: "Has alcanzado el máximo de bajas de suscripción vía email por hoy. Por favor espera %{time_left} antes de intentarlo de nuevo."
-      topic_invitations_per_day: "Has alcanzado el máximo de invitaciones a temas por hoy. Por favor, espera %{time_left} antes de intentarlo de nuevo."
+      first_day_replies_per_day: "Has alcanzado el número máximo de respuestas que un nuevo usuario puede publicar en su primer día. Por favor espera %{time_left} antes de intentar de nuevo."
+      first_day_topics_per_day: "Has alcanzado el número máximo de temas que un nuevo usuario puede publicar en su primer día. Por favor espera %{time_left} antes de intentar de nuevo."
+      create_topic: "Has creado temas muy rápido. Por favor espera %{time_left} antes de intentar de nuevo."
+      create_post: "Has respondido muy rápido. Por favor espera %{time_left} antes de intentar de nuevo."
+      delete_post: "Estás borrando posts muy rápido. Por favor espera %{time_left} antes de intentar de nuevo."
+      public_group_membership: "Estás ingresando/saliendo de grupos muy frecuentemente. Por favor espera %{time_left} antes de intentar de nuevo."
+      topics_per_day: "Has alcanzado el número máximo de nuevos temas. Por favor espera %{time_left} antes de intentar de nuevo."
+      pms_per_day: "Has alcanzado el número máximo de mensajes. Por favor espera %{time_left} antes de intentar de nuevo."
+      create_like: "Has alcanzado el número máximo de likes. Por favor espera %{time_left} antes de intentar de nuevo."
+      create_bookmark: "Has alcanzado el número máximo de favoritos. Por favor espera %{time_left} antes de intentar de nuevo."
+      edit_post: "Has alcanzado el número máximo de ediciones. Por favor espera %{time_left} antes de intentar de nuevo."
+      live_post_counts: "Estás pidiendo recuentos de posts en vivo muy rápido. Por favor espera %{time_left} antes de intentar de nuevo."
+      unsubscribe_via_email: "Has alcanzado el número máximo de desuscripciones por email. Por favor espera %{time_left} antes de intentar de nuevo."
+      topic_invitations_per_day: "Has alcanzado el número máximo de invitaciones al tema. Por favor espera %{time_left} antes de intentar de nuevo."
     hours:
-      one: "1 hora"
-      other: "%{count} horas"
+      one: 1 hora
+      other: '%{count} horas'
     minutes:
-      one: "1 minuto"
-      other: "%{count} minutos"
+      one: 1 minuto
+      other: '%{count} minutos'
     seconds:
-      one: "1 segundo"
-      other: "%{count} segundos"
+      one: 1 segundo
+      other: '%{count} segundos'
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: "< 1s"
-        other: "< %{count}s"
+        one: < 1s
+        other: < %{count}s
       x_seconds:
-        one: "1s"
-        other: "%{count}s"
+        one: 1s
+        other: '%{count}s'
       less_than_x_minutes:
-        one: "< 1m"
-        other: "< %{count}m"
+        one: < 1m
+        other: < %{count}m
       x_minutes:
-        one: "1m"
-        other: "%{count}m"
+        one: 1m
+        other: '%{count}m'
       about_x_hours:
-        one: "1h"
-        other: "%{count}h"
+        one: 1h
+        other: '%{count}h'
       x_days:
-        one: "1d"
-        other: "%{count}d"
+        one: 1d
+        other: '%{count}d'
       about_x_months:
-        one: "1mon"
-        other: "%{count}mon"
+        one: 1mon
+        other: '%{count}mon'
       x_months:
-        one: "1mon"
-        other: "%{count}mon"
+        one: 1mon
+        other: '%{count}mon'
       about_x_years:
-        one: "1y"
-        other: "%{count}y"
+        one: 1y
+        other: '%{count}y'
       over_x_years:
-        one: "> 1y"
-        other: "> %{count}y"
+        one: '> 1y'
+        other: '> %{count}y'
       almost_x_years:
-        one: "1y"
-        other: "%{count}y"
+        one: 1y
+        other: '%{count}y'
     distance_in_words_verbose:
       half_a_minute: "ahora mismo"
       less_than_x_seconds:
-        one: "ahora mismo"
-        other: "ahora mismo"
+        one: ahora mismo
+        other: ahora mismo
       x_seconds:
-        one: "hace 1 segundo"
-        other: "hace %{count} segundos"
+        one: hace 1 segundo
+        other: hace %{count} segundos
       less_than_x_minutes:
-        one: "hace menos de 1 minuto"
-        other: "hace menos de %{count} minutos"
+        one: hace menos de 1 minuto
+        other: hace menos de %{count} minutos
       x_minutes:
-        one: "hace 1 minuto"
-        other: "hace %{count} minutos"
+        one: hace 1 minuto
+        other: hace %{count} minutos
       about_x_hours:
-        one: "hace 1 hora"
-        other: "hace %{count} horas"
+        one: hace 1 hora
+        other: hace %{count} horas
       x_days:
-        one: "hace 1 día"
-        other: "hace %{count} días"
+        one: hace 1 día
+        other: hace %{count} días
       about_x_months:
-        one: "hace como 1 mes"
-        other: "hace como %{count} meses"
+        one: hace como 1 mes
+        other: hace como %{count} meses
       x_months:
-        one: "hace 1 mes"
-        other: "hace %{count} meses"
+        one: hace 1 mes
+        other: hace %{count} meses
       about_x_years:
-        one: "hace sobre 1 año"
-        other: "hace sobre %{count} años"
+        one: hace sobre 1 año
+        other: hace sobre %{count} años
       over_x_years:
-        one: "hace más de 1 año"
-        other: "hace más de %{count} años"
+        one: hace más de 1 año
+        other: hace más de %{count} años
       almost_x_years:
-        one: "hace casi 1 año"
-        other: "hace casi %{count} años"
+        one: hace casi 1 año
+        other: hace casi %{count} años
   password_reset:
     no_token: "Lo sentimos, ese enlace para cambiar la contraseña es demasiado antiguo. Haz clic en el botón Iniciar sesión y utiliza el 'olvidé mi contraseña' para obtener un nuevo enlace. "
     choose_new: "Escoge una nueva contraseña"
@@ -566,6 +615,9 @@ es:
     title: 'Restablecer contraseña'
     success: "Has cambiado tu contraseña correctamente y ahora has iniciado sesión."
     success_unapproved: "Has cambiado tu password correctamente."
+  email_login:
+    invalid_token: "Lo sentimos, ese enlace de inicio de sesión de correo electrónico es demasiado viejo. Seleccione el botón Iniciar sesión y use 'Olvidé mi contraseña' para obtener un nuevo enlace."
+    title: "Email login"
   change_email:
     confirmed: "Tu email ha sido actualizado."
     please_continue: "Continuar a %{site_name}"
@@ -610,8 +662,8 @@ es:
       long_form: 'reportado como inapropiado'
     notify_user:
       title: 'Enviar un mensaje a @{{username}}'
-      description: 'Quiero hablar con esta persona de forma directa y privada sobre su mensaje.'
-      short_description: 'Quiero hablar con esta persona de forma directa y privada sobre su mensaje.'
+      description: 'Quiero hablar con esta persona directa y personalmente sobre su post.'
+      short_description: 'Quiero hablar con esta persona directa y personalmente sobre su post.'
       long_form: 'usuario notificado vía mensaje'
       email_title: 'Tu publicación en "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -680,6 +732,7 @@ es:
     title: "¡Suscripción cancelada!"
     description: "<b>%{email}</b> ha sido desuscrito. Para cambiar la configuración del email <a href='%{url}'>visita las preferencias del usuario</a>."
     topic_description: "Para volver a suscribirte a %{link}, utiliza el desplegable de notificación al pie o en la parte derecha del tema."
+    private_topic_description: "Para volver a suscribirte, use el control de notificación al pie o en la parte derecha del tema."
   unsubscribe:
     title: "Cancelar suscripción"
     stop_watching_topic: "Dejar de vigilar este tema, %{link}"
@@ -712,9 +765,25 @@ es:
       xaxis: "Día"
       yaxis: "Número de visitas"
     signups:
-      title: "Nuevos usuarios"
+      title: "Registros"
       xaxis: "Día"
-      yaxis: "Número de usuarios nuevos"
+      yaxis: "Número de Registros"
+      description: "Nuevos registros de cuentas para este periodo"
+    new_contributors:
+      title: "Nuevos Colaboradores"
+      xaxis: "Día"
+      yaxis: "Número de nuevos colaboradores"
+      description: "Número de usuarios quienes hicieron su primer post en este periodo"
+    dau_by_mau:
+      title: "UAD/UAM"
+      xaxis: "Día"
+      yaxis: "UAD/UAM"
+      description: "Nro. de miembros que se loguearon en el último día dividido el núm. de miembros que se loguearon en el último mes – devuelve un % que indica la 'adhesión' de la comunidad. Apunta al >30%."
+    daily_engaged_users:
+      title: "Usuarios comprometidos a diario"
+      xaxis: "Día"
+      yaxis: "Usuarios Comprometidos"
+      description: "Número de usuarios que le han gustado o publicado en el último día"
     profile_views:
       title: "Visitas a perfil de usuario"
       xaxis: "Día"
@@ -723,10 +792,12 @@ es:
       title: "Temas nuevos"
       xaxis: "Día"
       yaxis: "Número de topics nuevos"
+      description: "Nuevos temas creados durante este período"
     posts:
       title: "Nuevos posts"
       xaxis: "día"
       yaxis: "Número de posts nuevos"
+      description: "Nuevos posts creados durante este periodo"
     likes:
       title: "Me gusta"
       xaxis: "Día"
@@ -747,12 +818,31 @@ es:
       title: "Usuarios por nivel de confianza"
       xaxis: "Día"
       yaxis: "Número de usuarios"
+    users_by_type:
+      title: "Usuarios por Tipos"
+      xaxis: "Tipo"
+      yaxis: "Número de Usuarios"
+      xaxis_labels:
+        admin: Admin
+        moderator: Moderador
+        suspended: Suspendidos
+        silenced: Silenciados
+    trending_search:
+      title: Trending search
+      labels:
+        term: Término
+        searches: Búsquedas
+        click_through: CTR
     emails:
       title: "Correos enviados"
       xaxis: "Día"
       yaxis: "Número de correos"
     user_to_user_private_messages:
-      title: "Usuario a usuario"
+      title: "Usuario a usuario (respuestas excluidas)"
+      xaxis: "Día"
+      yaxis: "Número de mensajes"
+    user_to_user_private_messages_with_replies:
+      title: "Usuario a usuario (con respuestas)"
       xaxis: "Día"
       yaxis: "Número de mensajes"
     system_private_messages:
@@ -799,7 +889,7 @@ es:
       xaxis: "Día"
       yaxis: "Páginas vistas de rastreadores web"
     page_view_total_reqs:
-      title: "Total"
+      title: "Páginas vistas"
       xaxis: "Día"
       yaxis: "Total páginas vistas"
     page_view_logged_in_mobile_reqs:
@@ -846,6 +936,10 @@ es:
       title: "Visitas de Usuarios"
       xaxis: "Día"
       yaxis: "Número de visita"
+    web_crawlers:
+      title: "Solicitudes de Rastreadores Web"
+      xaxis: "User Agent"
+      yaxis: "Páginas vistas"
   dashboard:
     rails_env_warning: "Tu servidor está funcionando en modo de %{env}."
     host_names_warning: "Tu archivo 'config/database.yml' está utilizando un hostname predeterminado de 'localhost'. Actualízalo para usar el hostname de tu sitio."
@@ -863,28 +957,30 @@ es:
     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>.'
     subfolder_ends_in_slash: "La configuación del subdirectorio no es correcta; el campo DISCOURSE_RELATIVE_URL_ROOT termina con una barra."
     email_polling_errored_recently:
-      one: "El email polling ha generado un error en las pasadas 24 horas. Mira en <a href='/logs' target='_blank'>los logs</a> para más detalles."
-      other: "El email polling ha generado %{count} errores en las pasadas 24 horas. Mira en <a href='/logs' target='_blank'>los logs</a> para más detalles."
-    missing_mailgun_api_key: "El servidor está configurado para enviar emails vía mailgun pero no se ha proporcionado una API key para verificar los mensajes webhook."
+      one: El email polling ha generado un error en las pasadas 24 horas. Mira en <a href='/logs' target='_blank'>los logs</a> para más detalles.
+      other: El email polling ha generado %{count} errores en las pasadas 24 horas. Mira en <a href='/logs' target='_blank'>los logs</a> para más detalles.
+    missing_mailgun_api_key: "El servidor está configurado para enviar correos electrónicos a través de Mailgun pero no ha proporcionado una clave API utilizada para verificar los mensajes de webhook."
     bad_favicon_url: "El favicon está dando fallos en su carga. Revisa la opción favicon_url en <a href='/admin/site_settings'>Ajustes del sitio</a>."
     poll_pop3_timeout: "La conexión al servidor POP3 está rebasando el tiempo de espera. Los emails entrantes no han podido ser recogidos. Por favor revisa los <a href='/admin/site_settings/category/email'>ajustes de POP3</a> y tu proveedor de servicio."
     poll_pop3_auth_error: "La conexión al servidor POP3 está fallando debido a un error de autenticación. Por favor revisa los <a href='/admin/site_settings/category/email'>ajustes POP3</a>."
+    force_https_warning: "Tu sitio web está usando SSL. Pero  `<a href='/admin/site_settings/category/all_results?filter=force_https'>force_https</a>` no está aún habilitado en la configuración de tu sitio."
   site_settings:
     censored_words: "Las palabras serán reemplazadas con &#9632;&#9632;&#9632;&#9632;"
-    censored_pattern: "Patrones de Regex serán automáticamente reemplazados con &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Auto-borrar cualquier post que se quede oculto por mas de 30 días."
-    default_locale: "El idioma por defecto de Discourse (ISO 639-1 Code)"
+    default_locale: "El idioma por defecto para esta instancia de Discourse "
     allow_user_locale: "Permitir que los usuarios escojan su propio idioma para la interfaz"
     set_locale_from_accept_language_header: "Establece el lenguaje de la interfaz para usuarios anónimos desde el lenguaje declarado por su navegador web. (EXPERIMENTAL, no funciona con caché anónimo)"
+    support_mixed_text_direction: "Admite direcciones mixtas de texto de izquierda a derecha y de derecha a izquierda."
     min_post_length: "Extensión mínima de los posts, en número de caracteres"
     min_first_post_length: "Extensión mínima permitida en el primer mensaje (cuerpo del tema) en caracteres"
-    min_private_message_post_length: "Extensión mínima de los posts en los mensajes, en número de caracteres"
+    min_personal_message_post_length: "Longitud mínima permitida de publicación en caracteres para mensajes"
     max_post_length: "Extensión máxima de los posts, en número de caracteres"
     topic_featured_link_enabled: "Activar publicar temas a partir de un enlace."
     show_topic_featured_link_in_digest: "Mostrar el enlace destacado por el tema en el email de resumen."
     min_topic_title_length: "Extensión mínima del título de los temas, en número de caracteres"
     max_topic_title_length: "Extensión máxima del título de los temas, en número de caracteres"
-    min_private_message_title_length: "Extensión mínima del título de los temas en mensajes, en número de caracteres"
+    min_personal_message_title_length: "Longitud mínima permitida del título para un mensaje en caracteres"
+    max_emojis_in_title: "Emojis máximos permitidos en el título del tema"
     min_search_term_length: "Extensión mínima de una búsqueda válida, en número de caracteres"
     search_tokenize_chinese_japanese_korean: "Forzar la búsqueda a tokenizar Chino/Japonés/Coreano incluso en sitios que no basados en esos idiomas"
     search_prefer_recent_posts: "Si la búsqueda en tu foro gigante es lenta, esta opción prueba primero un índice de posts más recientes"
@@ -905,6 +1001,9 @@ es:
     download_remote_images_max_days_old: "No descargar imágenes remotas de posts que sean más antiguos de n días."
     disabled_image_download_domains: "Las imágenes remotas que provengan de estos dominios no serán descargadas. Lista delimitada por barras."
     editing_grace_period: "Durante (n) segundos después de publicar un post, se puede editar ese post sin crear una nueva versión en el historial."
+    editing_grace_period_max_diff: "Número máximo de cambios de caracteres permitidos en el período de gracia de edición, si hay más cambios, almacene otra revisión de publicación (nivel de confianza 0 y 1)"
+    editing_grace_period_max_diff_high_trust: "Número máximo de cambios de caracteres permitidos en el período de gracia de edición, si hay más cambios, almacene otra revisión de publicación (nivel de confianza 2 y superior)"
+    staff_edit_locks_post: "Se bloqueará la publicación de las publicaciones si son editadas por miembros del staff."
     post_edit_time_limit: "El autor puede editar o eliminar su post durante (n) minutos después de publicarlo. Pon un 0 para que pueda hacerlo siempre."
     edit_history_visible_to_public: "Permitir a todos ver las versiones previas de un post editado. Si se deshabilita, solo los miembros del staff podrán verlas."
     delete_removed_posts_after: "Los posts borrados por su autor serán automáticamente eliminados después de (n) horas. Si se establece este valor a 0, los posts serán eliminados automáticamente."
@@ -939,8 +1038,9 @@ es:
     summary_likes_required: "Mínimo de \"me gusta\" en un tema para habilitar 'Resumen de este tema'"
     summary_percent_filter: "Cuando un usuario hace clic en 'Resumen de este tema', se muestra el n % mejores posts"
     summary_max_results: "Máximo de posts devueltos en \"Resumen de este  tema\""
-    enable_private_messages: "Permitir a los usuarios con nivel 1 de confianza (configurable vía mínimo nivel para enviar mensajes) crear y responder a mensajes directos. Ten en cuenta que el staff siempre puede enviar mensajes directos."
-    enable_private_email_messages: "Permita que el nivel de confianza 4 (configurable a través del nivel mínimo de confianza para enviar mensajes) envíe mensajes de correo electrónico privados. Tenga en cuenta que el personal siempre puede enviar mensajes, pase lo que pase."
+    enable_personal_messages: "Permitir que los usuarios con nivel de confianza 1 (configurable a través del mínimo nivel de confianza para enviar mensajes) crear mensajes y responder a ellos. Tenga en cuenta que el staff  siempre puede enviar mensajes pase lo que pase."
+    enable_system_message_replies: "Permite a los usuarios responder a los mensajes del sistema, incluso si los mensajes privados están inhabilitados."
+    enable_personal_email_messages: "Permita que el nivel de confianza 4 (configurable a través del nivel mínimo de confianza para enviar mensajes) envíe mensajes de correo electrónico privados. Tenga en cuenta que el personal siempre puede enviar mensajes, pase lo que pase."
     enable_long_polling: "Los mensajes usados para notificaciones pueden usar el long polling"
     long_polling_base_url: "URL base usada para el 'long polling' (cuando un CDN esta sirviendo contenido dinámico, asegúrate de ajustar esto al 'pull' de origen) ejemplo: http://origin.site.com"
     long_polling_interval: "Cantidad de tiempo que el servidor debe de esperar antes de responder a los clientes que no hay datos enviados (solamente usuarios con sesión iniciada)."
@@ -961,7 +1061,9 @@ es:
     notify_mods_when_user_silenced: "Si un usuario es silenciado automáticamente, enviar un mensaje a todos los moderadores."
     flag_sockpuppets: "Si un nuevo usuario responde a un tema desde la misma dirección de IP que el nuevo usuario que inició el tema, reportar los posts de los dos como spam en potencia."
     traditional_markdown_linebreaks: "Utiliza saltos de línea tradicionales en Markdown, que requieren dos espacios al final para un salto de línea."
-    enable_markdown_typographer: "Utilice reglas básicas de tipografía para mejorar la legibilidad de texto de los párrafos de texto, reemplaza (c) (tm) etc, con símbolos, reduce el número de signos de interrogación y así sucesivamente"
+    enable_markdown_typographer: "Utilice reglas de tipografía para mejorar la legibilidad de texto: remplace citas rectas 'con comillas', (c) (tm) con símbolos, - con emdash -, etc."
+    enable_markdown_linkify: "Trate automáticamente el texto que se ve como un enlace como un enlace: www.site.com y http://site.com se vincularán automáticamente"
+    markdown_linkify_tlds: "Lista de dominios de nivel superior que se tratan automáticamente como enlaces"
     post_undo_action_window_mins: "Número de minutos durante los cuales los usuarios pueden deshacer sus acciones recientes en un post (me gusta, reportes, etc)."
     must_approve_users: "Los miembros administración deben aprobar todas las nuevas cuentas antes de que se les permita el acceso al sitio. AVISO: ¡habilitar esta opción en un sitio activo revocará el acceso a los usuarios que no sean moderadores o admin!"
     pending_users_reminder_delay: "Notificar a los moderadores si hay nuevos usuarios que hayan estado esperando aprbación durante más estas horas. Usa -1 para desactivar estas notificaciones."
@@ -977,6 +1079,10 @@ es:
     blacklist_ip_blocks: "Una lista de IPs bloqueadas privadas que nunca deberían ser rastreadas por Discourse"
     whitelist_internal_hosts: "Una lista con hosts internos que discourse puede rastrear de forma segura para oneboxing y otros propósitos"
     allowed_iframes: "Una lista de dominios para iframe src donde discourse pueda permitir de forma segura en mensajes"
+    whitelisted_crawler_user_agents: 'User agents de rastreadores web a los que se debe permitir el acceso al sitio.'
+    blacklisted_crawler_user_agents: 'Palabra única insensible a mayúsculas y minúsculas en la cadena del user agent que identifica rastreadores web a los que no se debe permitir el acceso al sitio. No se aplica si se define una lista blanca.'
+    slow_down_crawler_user_agents: 'User agents de rastreadores web a los que se debe aplicar una tarifa limitada en robots.txt utilizando la directiva de retardo de rastreo'
+    slow_down_crawler_rate: 'Si slow_down_crawler_user_agents es especificado, este ratio aplicará para todos los crawlers (la solicitud demora número de segundos)'
     top_menu: "Determinar que items aparecen en la navegación de la home y en qué orden. Ejemplo latest|new|unread|categories|top|read|posted|bookmarks"
     post_menu: "Determina qué elementos aparecen en el menú de un post y en qué orden. Ejemplo: like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "Los elementos del menú a ocultar por defecto en el menú de cada post a menos que se haga clic en el botón para expandir las opciones."
@@ -994,7 +1100,7 @@ es:
     top_page_default_timeframe: "Período de tiempo por defecto para la página de temas top"
     show_email_on_profile: "Mostrar el e-mail los usuarios en su perfil (solamente visibles para ellos mismos y el staff)"
     prioritize_username_in_ux: "Mostrar username primero en la página de usuario, tarjeta de usuario y mensajes (cuando el nombre ha sido desactivado se muestra primero)"
-    enable_rich_text_paste: "Activar la conversión automática de HTML a Markdown al pegar texto en el editor. (Experimental)"
+    enable_rich_text_paste: "Habilitar conversión automática de HTML a Markdown cuando pegues texto en el compositor. (Experimental)"
     email_token_valid_hours: "Los tokens para restablecer contraseña olvidada / activar cuenta son válidos durante (n) horas."
     enable_badges: "Activar el sistema de distintivos"
     enable_whispers: "Permitir a los miembros del staff comunicarse privadamente entre ellos en temas públicos."
@@ -1006,7 +1112,6 @@ es:
     version_checks: "Ping el 'Discourse Hub' para actualizaciones de versión y mostrar mensajes del número de versión en el dashboard /admin"
     new_version_emails: "Enviar un email a la dirección contact_email cuando esté disponible una nueva versión de Discourse."
     invite_expiry_days: "Durante cuánto tiempo son válidas las claves de invitación de usuarios, en días"
-    invite_passthrough_hours: "Durante cuánto tiempo, en horas, un usuario puede utilizar una clave de invitación redimida para iniciar sesión iniciar sesión"
     invite_only: "El registro público está deshabilitado, todos los nuevos usuarios deberán ser invitados explícitamente por el staff."
     login_required: "Se requiere haber iniciado sesión para leer el contenido de este sitio, deshabilita el acceso anónimo."
     min_username_length: "Longitud mínima del nombre de usuario en caracteres. ADVERTENCIA: si existen usuarios o grupos con nombres de menor longitud que ésta, tu sitio se romperá."
@@ -1022,38 +1127,43 @@ es:
     sso_url: "URL del endpoint para el single sign on (debe incluir http:// o https://)"
     sso_secret: "Cadena secreta utilizada para autenticar criptográficamente la información del SSO, asegúrate de que es de 10 caracteres o más"
     sso_overrides_bio: "Sobreescribe la bio del usuario en su perfil y deshabilita que pueda cambiarla"
+    sso_overrides_groups: "Sincronice toda la membresía del grupo manual con los grupos especificados en el atributo sso de grupos (ADVERTENCIA: si no especifica grupos, todos los miembros del grupo manual serán borrados para el usuario)"
     sso_overrides_email: "Sobreescribe el email local con el email que provea sitio externo desde el payload del SSO en cada registro, y previene cambios locales. (AVISO: pueden ocasionarse discrepancias debido a la normalización de los emails locales)"
     sso_overrides_username: "Sobreescribe el usuario local con el usuario que provea el payload del SSO en cada registro, y previene cambios locales. (AVISO: pueden ocasionarse discrepancias debido a las diferencias en los requirimientos/longitud del usuario)"
     sso_overrides_name: "Sobreescribe el nombre completo con el que provee el payload del SSO en cada registro, y previene cambios locales."
     sso_overrides_avatar: "Sustituye el avatar de usuario con el avatar proveniente del sitio externo configurado para el SSO. Si se activa esta opción, se recomienda encarecidamente deshabilitar allow_uploaded_avatars"
+    sso_overrides_profile_background: "Sobrescribe el fondo del perfil del usuario con el avatar del sitio externo desde SSO payload."
+    sso_overrides_card_background: "Sobrescribe el fondo de la tarjeta de usuario con el avatar de sitio externo desde SSO payload."
     sso_not_approved_url: "Redireccionar cuentas SSO sin aprobar a esta URL"
     sso_allows_all_return_paths: "No restringe el dominio para return_paths provisto por SSO (por defecto, el return_paths debe ser sobre el sitio actual)."
-    enable_local_logins: "Habilitar las cuentas con nombre de usuario y contraseña de forma local. (Nota: esto debe estar habilitado para que funcionen las invitaciones)"
+    enable_local_logins: "Habilite las cuentas locales de inicio de sesión con nombre de usuario y contraseña. Esto debe estar habilitado para que las invitaciones funcionen. ADVERTENCIA: si está deshabilitado, es posible que no pueda iniciar sesión si no ha configurado previamente al menos un método de inicio de sesión alternativo."
+    enable_local_logins_via_email: "Permitir a los usuarios que soliciten un enlace de inicio de sesión con un solo clic que se les enviará por correo electrónico."
     allow_new_registrations: "Permitir el registro de nuevos usuarios. Desactiva esta opción para prevenir que nadie pueda crear una nueva cuenta."
     enable_signup_cta: "Mostrar un aviso a los usuarios anónimos que vuelvan a visitar el sitio animándoles a registrarse."
     enable_yahoo_logins: "Activar autenticación por Yahoo"
     enable_google_oauth2_logins: "Habilita la autenticación con Google Oauth2. Este es el método de autenticación a la que Google da soporte actualmente. Requiere de una clave de cliente y una clave secreta."
     google_oauth2_client_id: "Client ID de tu aplicación Google."
     google_oauth2_client_secret: "Client secret de tu aplicación Google."
+    google_oauth2_prompt: "Una lista delimitada por espacios de valores de cadena que especifica si el servidor de autorizaciones solicita al usuario la reautenticación y el consentimiento. Consulte https://developers.google.com/identity/protocols/OpenIDConnect#prompt para conocer los valores posibles."
+    google_oauth2_hd: "Dominio hospedado de Google Apps al que se limitará el inicio de sesión. Consulte https://developers.google.com/identity/protocols/OpenIDConnect#hd-param para obtener más detalles."
     enable_twitter_logins: "Activar autenticación por Twitter, requiere una twitter_consumer_key y un twitter_consumer_secret"
-    twitter_consumer_key: "Comsumer key para autenticación por Twitter, registrado en http://dev.twitter.com"
-    twitter_consumer_secret: "Comsumer secret para autenticación por Twitter, registrado en http://dev.twitter.com"
+    twitter_consumer_key: "Clave del consumidor para la autenticación de Twitter, registrado en  https://apps.twitter.com/"
+    twitter_consumer_secret: "Secreto del consumidor para la autenticación de Twitter, registrado en https://apps.twitter.com/"
     enable_instagram_logins: "Activar la autenticación por Instagram, requiere instagram_consumer_key y instagram_consumer_secret"
     instagram_consumer_key: "Consumer key para autenticación por Instagram"
     instagram_consumer_secret: "Consumer secret para autenticación por Instagram"
     enable_facebook_logins: "Activar autenticación por Facebook, requiere una facebook_app_id y un facebook_app_secret"
     facebook_app_id: "App id para la autenticación por Facebook, registrado en https://developers.facebook.com/apps"
     facebook_app_secret: "App secret para autenticación por Facebook, registrado en https://developers.facebook.com/apps"
-    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"
     readonly_mode_during_backup: "Habilitar el modo de 'solo-lectura' mientras se hace el backup"
-    enable_backups: "Permitir a los administradores crear copias de seguridad del foro"
+    enable_backups: "Permitir a los administradores crear backups del foro"
     allow_restore: "Permitir restauración, la cual puede sobreescribir TODOS los datos del sitio! Dejela en falso a menos que tenga planeado recuperar sus datos desde una copia de respaldo. "
     maximum_backups: "La cantidad máxima de copias de seguridad a tener en el disco. Las copias de seguridad más antiguas se eliminan automáticamente"
     automatic_backups_enabled: "Ejecutar backups automáticos definidos por la opción de frecuencia de backups"
-    backup_frequency: "Con qué frecuencia, en días, crearemos un backup del sitio."
+    backup_frequency: "El número de días entre backups."
     enable_s3_backups: "Sube copias de seguridad a S3 cuando complete. IMPORTANTE: requiere credenciales validas de S3 puestas Archivos configuración."
     s3_backup_bucket: "El bucket remoto para mantener copias de seguridad. AVISO: Asegúrate de que es un bucket privado."
     s3_disable_cleanup: "Desactivar el eliminado de backups de S3 cuando se eliminen de forma local."
@@ -1066,6 +1176,7 @@ es:
     top_topics_formula_first_post_likes_multiplier: "valor del multiplicador de me gusta en el primer post (n) en la fórmula de temas top:: `log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
     top_topics_formula_least_likes_per_post_multiplier: "valor del multiplicador de me gusta por post (n) en la fórmula de temas top: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
     rebake_old_posts_count: "Número de publicaciones antiguas objeto de rebake cada 15 minutos."
+    enable_safe_mode: "Permitir a los usuarios ingresar al modo seguro para depurar plugins."
     rate_limit_create_topic: "Después de crear un tema, los usuarios deben esperar (n) segundos antes de crear otro tema."
     rate_limit_create_post: "Después de publicar un post, los usuarios deben esperar (n) segundos antes de crear otro post."
     rate_limit_new_user_create_topic: "Después de crear un tema, los nuevos usuarios deben esperar (n) segundos antes de crear otro tema."
@@ -1075,7 +1186,7 @@ es:
     max_bookmarks_per_day: "Máximo número de marcadores por usuario y día."
     max_edits_per_day: "Máximo número de ediciones por usuario y día."
     max_topics_per_day: "Máximo número de temas que un usuario puede crear al día."
-    max_private_messages_per_day: "Máximo número de mensajes por usuario y día."
+    max_personal_messages_per_day: "Número máximo de mensajes que los usuarios pueden crear por día."
     max_invites_per_day: "Máximo número de invitaciones que un usuario puede enviar al día."
     max_topic_invitations_per_day: "Máximo número de invitaciones a un tema que un usuario puede enviar por día."
     max_logins_per_ip_per_hour: "Máximo número de inicios de sesión permitidos por direcciones IP por hora."
@@ -1091,7 +1202,7 @@ es:
     purge_deleted_uploads_grace_period_days: "Período de gracia (en días) antes de que una subida eliminada sea borrada totalmente."
     purge_unactivated_users_grace_period_days: "Periodo de gracia (en días) antes de que un usuario que no ha activado su cuenta sea borrado. Configurar a 0 para que nunca se purgue a usuarios no activados."
     enable_s3_uploads: "Coloca los archivos subidos en el almacén Amazon S3. IMPORTANTE: requiere de credenciales de S3 validas. (ambas clave de acceso y clave de acceso secreta)."
-    s3_use_iam_profile: 'Usar el rol de AWS EC2 IAM para descargar las llaves. NOTA: habilitando esta opción ignorará la "llave de acceso s3" y "la llave de acceso secreta s3".'
+    s3_use_iam_profile: 'Utilice un <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html">perfil de instancia de AWS EC2</a> para otorgar acceso al S3 bucket. NOTA: habilitar esto requiere que Discourse se ejecute en una instancia EC2 configurada apropiadamente, y anula las configuraciones de "clave de acceso s3" y "clave secreta s3".'
     s3_upload_bucket: "El nombre del bucket Amazon S3 donde se subirán los archivos. AVISO: debe ser en minúsculas, sin puntos ni guiones bajos."
     s3_access_key_id: "La clave id de acceso de Amazon S3 que se utilizará para subir imágenes."
     s3_secret_access_key: "La clave secreta de acceso de Amazon S3 que se utilizará para subir imágenes."
@@ -1133,12 +1244,17 @@ es:
     tl3_requires_likes_given: "El mínimo número de me gusta que un usuario debe dar en los últimos (tl3 time period) días para promocionar a nivel de confianza 3."
     tl3_requires_likes_received: "El mínimo número de me gusta que un usuario debe recibir en los últimos (tl3 time period) días para promocionar a nivel de confianza 3."
     tl3_links_no_follow: "No remover rel=nofollow de los enlaces publicados por usuarios con nivel de confianza 3."
+    trusted_users_can_edit_others: "Permitir usuarios con alto nivel de confianza editar contenido de otros usuarios"
     min_trust_to_create_topic: "El mínimo nivel de confianza requerido para crear un nuevo tema."
+    allow_flagging_staff: "Si está habilitado, los usuarios pueden reportar las publicaciones de las cuentas del staff."
     min_trust_to_edit_wiki_post: "El mínimo nivel de confianza requerido para editar un post marcado como wiki."
     min_trust_to_edit_post: "El mínimo nivel de confianza requerido para editar posts."
     min_trust_to_allow_self_wiki: "El mínimo nivel de confianza requerido para que un usuario convierta sus propios posts a wiki."
-    min_trust_to_send_messages: "Mínimo nivel de confianza requerido para crear nuevos mensajes directos."
-    min_trust_to_send_email_messages: "El nivel de confianza mínimo necesario para enviar nuevos mensajes privados por correo electrónico (a los usuarios en escena)."
+    min_trust_to_send_messages: "El mínimo nivel de confianza requerido para crear nuevos mensajes personales."
+    min_trust_to_send_email_messages: "El nivel de confianza mínimo necesario para enviar nuevos mensajes privados por correo electrónico (a los usuarios staged)."
+    min_trust_to_flag_posts: "El mínimo nivel de confianza requerido para reportar posts"
+    min_trust_to_post_links: "El mínimo nivel de confianza requerido para incluir enlaces en posts"
+    min_trust_to_post_images: "El nivel mínimo de confianza requerido para incluir imágenes en una publicación"
     newuser_max_links: "Cuántos enlaces puede un nuevo usuario añadir a un post."
     newuser_max_images: "Cuántas imágenes puede un nuevo usuario añadir a un post."
     newuser_max_attachments: "Cuántos adjuntos puede un nuevo usuario añadir a un post."
@@ -1146,10 +1262,10 @@ es:
     newuser_max_replies_per_topic: "Máximo número de respuestas que un nuevo usuario puede realizar en el mismo tema antes de que alguien responda a su vez a alguna de ellas."
     max_mentions_per_post: "Máximo número de menciones a @usuarios que alguien puede usar en un post."
     max_users_notified_per_group_mention: "Número de usuarios máximos que serán notificados si un grupo es mencionado (si se llega al límite no se mandarán las notificaciones)"
-    enable_mentions: "Permitir a los usuarios mencionar a otros usuarios."
+    enable_mentions: "Permitir a usuarios mencionar a otros usuarios."
     create_thumbnails: "Crear miniaturas de imágenes y lightbox cuando estas son demasiado grandes para encajar en un post."
     email_time_window_mins: "Esperar (n) minutos antes de enviar cualquier email de notificación, para dar a los usuarios margen con el que editar y finalizar sus posts."
-    private_email_time_window_seconds: "Espera (n) segundos antes de enviar cualquier email de notificación, para dar a los usuarios margen con el que editar y finalizar sus mensajes."
+    personal_email_time_window_seconds: "Espera (n) segundos antes de enviar cualquier mensaje email personal de notificación, para dar a los usuarios margen con el que editar y finalizar sus mensajes."
     email_posts_context: "Cuántas respuestas previas se incluirán como contexto en los emails de notificación."
     flush_timings_secs: "Cuán frecuente, en segundos, se alinean los datos de sincronización con el servidor."
     title_max_word_length: "La longitud máxima permitida de una palabra, en caracteres, en el título del tema."
@@ -1165,6 +1281,7 @@ es:
     max_image_size_kb: "El tamaño máximo, en kB, para subir imágenes. Debe ser configurado también en nginx (client_max_body_size) / apache o proxy."
     max_attachment_size_kb: "El tamaño máximo, en kB, para adjuntar archivos. Debe ser configurado también en nginx (client_max_body_size) / apache o proxy."
     authorized_extensions: "Una lista de las extensiones de archivo permitidas para subir (usa \"*\" para habilitar todos los tipos de archivo)"
+    authorized_extensions_for_staff: "Una lista de las extensiones de archivo permitidas para subir por miembros del staff en adición a la lista definida en la configuración `authorized_extensions`. (Usa '*' para habilitar todos los tipos)"
     theme_authorized_extensions: "Una lista de las extensiones de archivo permitidas para subir (usa \"*\" para habilitar todos los tipos)"
     max_similar_results: "Cuántos temas similares se mostrarán encima del editor cuando estés creando un nuevo tema. La comparación se basa en el título y el cuerpo del tema."
     max_image_megapixels: "Máximo de megapíxeles permitidos por una imagen."
@@ -1184,6 +1301,7 @@ es:
     faq_url: "Si tienes un documento de Preguntas Frecuentes alojado que quieras utilizar, introduce la URL completa aquí."
     tos_url: "Si tienes un documento de Condiciones de Servicio alojado en algún sitio quieras utilizar, facilita la URL aquí."
     privacy_policy_url: "Si tienes un documento de Preguntas Frecuentes alojado en algún sitio quieras utilizar, facilita la URL aquí."
+    log_anonymizer_details: "Si mantienes los detalles de un usuario en el log después de ser anonimizados. Al cumplir con GDPR, deberá apagarlo."
     newuser_spam_host_threshold: "¿Cuántas veces un nuevo usuario puede publicar un enlace al mismo host en `newuser_spam_host_threshold` posts antes de ser considerado spam."
     white_listed_spam_host_domains: "Una lista de dominios a excluir de las pruebas de spam. A los nuevos usuarios no se les restringirá la posibilidad de crear posts con enlaces a estos dominios."
     staff_like_weight: "Qué ponderación extra otorgan los me gusta provenientes de los miembros del Staff."
@@ -1203,10 +1321,11 @@ es:
     auto_silence_fast_typers_max_trust_level: "Máximo nivel de confianza por debajo del cual se podrán silenciar usuarios que escriban demasiado rápido en su primer post"
     auto_silence_first_post_regex: "Expresión regular que no distingue mayúsculas y minúsculas que si es detectada hará que el primer post de un usuario sea silenciado y enviado a la cola de aprobación. Ejemplo: raging|a[bc]a hará que todos los posts que contengan gaging, aba o aca sean silenciados. Sólo tiene efecto en el primer mensaje de un usuario."
     flags_default_topics: "Mostrar temas reportados por defecto en la sección de administración"
+    min_flags_staff_visibility: "La cantidad mínima de reportes que una publicación debe tener antes de que el staff pueda verla en la sección de administración"
     reply_by_email_enabled: "Habilitar la respuesta a temas por email."
     reply_by_email_address: "Plantilla para la dirección de email que aparecerá al recibir correos con la función de respuesta por email: %{reply_key}@respuesta.ejemplo.com o respuestas+%{reply_key}@ejemplo.com"
     alternative_reply_by_email_addresses: "Lista de plantillas alternativa para las direcciones de respuesta por email. Ejemplo: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
-    incoming_email_prefer_html: "Usar el HTML en vez del texto del email entrante."
+    incoming_email_prefer_html: "Usar el HTML en vez del texto para email entrante."
     disable_emails: "Impedir que Discourse envié cualquier tipo de e-mail."
     strip_images_from_short_emails: "Remover imágenes de e-mails que tengan un tamaño menor a 2800 Bytes"
     short_email_length: "e-mail corto longitud en Bytes"
@@ -1250,7 +1369,7 @@ es:
     relative_date_duration: "Número de días desde el último post antes de los cuales las fechas se mostrarán en formato relativo (7d) en vez de absoluto (20 Feb)."
     delete_user_max_post_age: "No permitir eliminar usuarios cuyo primer post tenga una antigüedad de (x) días."
     delete_all_posts_max: "El máximo número de posts que pueden ser eliminados a la vez con el botón \"Eliminar todos los posts\". Si un usuario tiene un mayor número de posts que este valor, éstos no podrán ser eliminados de una vez y el usuario no podrá ser eliminado."
-    username_change_period: "Número máximo de días después del registro en los que las cuentas pueden cambiar su nombre de usuario (0 para desactivar los cambios de usuario)."
+    username_change_period: "El número máximo de días después de registrarse entre los cuales una cuenta puede cambiar su nombre de usuario (0 para deshabilitar el cambio de nombre)"
     email_editable: "Permitir a los usuarios cambiar su dirección de email después de registrarse."
     logout_redirect: "Destino hacia donde redirigir el navegador después de cerrar sesión (ej: http://sitio.com/salida)"
     allow_uploaded_avatars: "Permitir a los usuarios subir imágenes de perfil personalizadas."
@@ -1274,12 +1393,14 @@ es:
     staff_user_custom_fields: "Una lista con campos personalizados para el usuario que pueden ser mostrados a los moderadores o admin."
     enable_user_directory: "Proporcionar un directorio de usuarios"
     enable_group_directory: "Activa un directorio de grupos para explorar"
+    group_in_subject: "Configura %{optional_pm} en el título del email para nombrar el primer grupo en MP, ver: https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801"
     allow_anonymous_posting: "Permitir a los usuarios cambiar a modo anónimo"
     anonymous_posting_min_trust_level: "Nivel de confianza mínimo requerido para activar el modo anónimo"
     anonymous_account_duration_minutes: "Para proteger el anonimato, crear una nueva cuenta anónima cada N minutos para cada usuario. Ejemplo: si se establece en 600, tan pronto como pasen 600 minutos desde el último post Y el usuario cambie a anónimo, se creará una nueva cuenta anónima."
     hide_user_profiles_from_public: "Desactiva las tarjetas de usuario, los perfiles y el directorio de usuarios para usuarios anónimos."
-    show_inactive_accounts: "Permitir a los usuarios con sesión iniciada ver perfiles de cuentas inactivas."
+    show_inactive_accounts: "Permitir a usuarios logueados visualizar perfiles de cuentas inactivas."
     hide_suspension_reasons: "No mostrar la razón de suspensión públicamente en el perfil de usuario."
+    log_personal_messages_views: "Log de mensajes personales vistos por Admin para otros usuarios/grupos."
     user_website_domains_whitelist: "El sitio web del usuario será automáticamente verificado con estos dominios. Lista delimitada por barras |"
     allow_profile_backgrounds: "Permitir a los usuarios subir sus propios fondos de perfil personalizados."
     sequential_replies_threshold: "Número de mensajes que un usuario tiene que publicar seguidos antes de que se le recuerde sobre demasiadas respuestas consecutivas."
@@ -1308,22 +1429,25 @@ es:
     autohighlight_all_code: "Forzar el resaltado de código a los bloques de código preformateado cuando no se especifique el lenguaje del código."
     highlighted_languages: "Reglas de resaltado de sintaxis incluidas. (Aviso: incluir demasiados lenguajes puede afectar al rendimiento) mira: https://highlightjs.org/static/demo/ para ver una demo"
     embed_truncate: "Truncar los posts embebidos."
+    embed_support_markdown: "Soporte de formato Markdown para publicaciones incrustadas."
     allowed_href_schemes: "Esquemas permitidos en enlaces además de http y https."
     embed_post_limit: "Número máximo de posts a embeber."
     embed_username_required: "Se requiere el nombre de usuario para la creación de temas."
-    notify_about_flags_after: "Si hay reportes que no han sido revisados después de este número de horas, enviar un correo electrónico al staff. Deshabilita esta opción introduciendo el valor 0."
+    notify_about_flags_after: "Si hay reportes que no han sido revisados después de este número de horas, enviar un mensaje personal a los moderadores. Poner 0 para inhabilitar."
     show_create_topics_notice: "Si el sitio tiene menos de 5 temas abiertos al público, mostrar un aviso pidiendo a los administradores crear más temas."
     delete_drafts_older_than_n_days: Eliminar borradores de más de (n) días de antigüedad.
     bootstrap_mode_min_users: "Mínimo número de usuarios requerido para desactivar el modo bootstrap (pon 0 para desactivar esta opción)"
     prevent_anons_from_downloading_files: "Impedir que los usuarios anónimos descarguen archivos. ADVERTENCIA: Esto impedirá que funcione cualquier recurso del sitio publicado como adjunto."
     slug_generation_method: "Elegir un método de generación de slug. 'encoded' generará cadenas con código porciento. 'none' hara que no se genere slug."
     enable_emoji: "Habilitar emoji"
+    enable_emoji_shortcuts: "Texto común de emoticones como :) :p :( serán convertidos a emojis"
     emoji_set: "¿De qué tipo os gustan los emoji?"
     enforce_square_emoji: "Forzar una relación de aspecto cuadrada para todos los emojis."
     approve_post_count: "La cantidad de posts que deben ser aprobados de usuarios nuevos o de nivel básico"
     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."
+    approve_unless_staged: "Nuevos temas y mensajes de usuarios temporales deben ser aprovados"
+    notify_about_queued_posts_after: "Si hay publicaciones que han estado esperando para ser revisadas por más de este número de horas, enviar una notificación a todos los moderadores. Pon 0 para desactivar estas notificaciones."
     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)"
     code_formatting_style: "El botón de código en el editor se establecerá por defecto a este estilo de formato de código"
@@ -1331,7 +1455,7 @@ es:
     watched_words_regular_expressions: "Palabras observadas son expresiones regulares."
     default_email_digest_frequency: "Cuán a menudo recibirán los usuarios emails de resumen por defecto."
     default_include_tl0_in_digests: "Incluir temas de usuarios nuevos en los emails de resumen por defecto. Los usuarios pueden cambiar esto en sus preferencias."
-    default_email_private_messages: "Enviar un email cuando alguien envíe un mensaje al usuario por defecto."
+    default_email_personal_messages: "Enviar un correo electrónico cuando alguien envíe un mensaje al usuario de manera predeterminada."
     default_email_direct: "Enviar un email cuando alguien cite/responda/mencione o invite al usuario por defecto."
     default_email_mailing_list_mode: "Enviar un email por cada nuevo post por defecto."
     default_email_mailing_list_mode_frequency: "Los usuarios que activen el modo lista de correo recibirán correos con esta frecuencia por defecto."
@@ -1367,14 +1491,18 @@ es:
     show_filter_by_tag: "Mostrar un desplegable para filtrar una lista de temas por etiqueta."
     max_tags_in_filter_list: "Máximo número de etiquetas en el desplegable. Se mostrarán primero aquellas más utilizadas."
     tags_sort_alphabetically: "Mostrar etiquetas en orden alfabético. Por defecto se mostrarán por popularidad."
+    tags_listed_by_group: "Listar etiquetas por grupo de etiquetas en la página Etiquetas (/tags)."
     tag_style: "Estilo visual de las etiquetas."
-    staff_tags: "Una lista de etiquetas que sólo pueden ser aplicadas por administradores o moderadores"
+    allow_staff_to_tag_pms: "Permitir a los miembros del staff etiquetar cualquier mensaje personal"
     min_trust_level_to_tag_topics: "Nivel mínimo requerido para etiquetar temas"
     suppress_overlapping_tags_in_list: "Si alguna etiqueta coinciden con palabras en el título de los temas, ocultarla."
     remove_muted_tags_from_latest: "No mostrar temas con etiquetas silenciadas en la lista de temas recientes."
     company_short_name: "Nombre de la empresa (corto)"
     company_full_name: "Nombre de la empresa (largo)"
     company_domain: "Dominio de la empresa"
+    shared_drafts_category: "Habilite la característica de Borradores Compartidos designando una categoría para borradores de temas."
+    push_notifications_prompt: "Mostrar aviso del consentimiento del usuario."
+    push_notifications_icon_url: "El icono del distintivo que aparece en la esquina de notificaciones. El tamaño recomendado es 96px por 96px."
     errors:
       invalid_email: "Dirección de correo electrónico inválida. "
       invalid_username: "No existe ningún usuario con ese nombre de usuario. "
@@ -1402,7 +1530,8 @@ es:
       enable_sso_disabled: "Debes activar primero 'enable sso' antes de activar esta opción."
       staged_users_disabled: "Primero debes habilitar 'staged users' antes, para habilitar esta configuración."
       reply_by_email_disabled: "Primero debes habilitar 'reply by email' antes de habilitar esta configuración."
-      sso_url_is_empty: "Debes establecer un valor en 'sso url' antes de activar este ajuste."
+      sso_url_is_empty: "Debe establecer una 'sso url' antes de habilitar esta configuración."
+      enable_local_logins_disabled: "Primero debes habilitar 'enable local logins'  antes de habilitar esta configuración."
   search:
     within_post: "#%{post_number} por %{username}"
     types:
@@ -1427,18 +1556,18 @@ es:
     not_seen_in_a_month: "¡Bienvenido de vuelta! No te habíamos visto en un tiempo. Estos son los temas mas populares desde que no has estado."
   merge_posts:
     edit_reason:
-      one: "Un tema fue juntado por %{username}"
-      other: "%{count}  mensaje fueron juntados por %{username}"
+      one: Un tema fue juntado por %{username}
+      other: '%{count}  mensaje fueron juntados por %{username}'
     errors:
       different_topics: "Mensajes que pertenecen a temas diferentes no pueden ser juntados."
       different_users: "Mensajes que pertenecen a diferentes usuarios no pueden ser juntados."
   move_posts:
     new_topic_moderator_post:
-      one: "un post fue trasladado a un nuevo tema: %{topic_link}"
-      other: "%{count} posts fueron trasladados a un nuevo tema: %{topic_link}"
+      one: 'un post fue trasladado a un nuevo tema: %{topic_link}'
+      other: '%{count} posts fueron trasladados a un nuevo tema: %{topic_link}'
     existing_topic_moderator_post:
-      one: "Un post fue trasladado al siguiente tema: %{topic_link}"
-      other: "%{count} posts fueron trasladados al siguiente tema: %{topic_link}"
+      one: 'Un post fue trasladado al siguiente tema: %{topic_link}'
+      other: '%{count} posts fueron trasladados al siguiente tema: %{topic_link}'
   change_owner:
     post_revision_text: "Se ha transferido la propiedad de %{old_user} a %{new_user}"
     deleted_user: "un usuario eliminado"
@@ -1448,47 +1577,47 @@ es:
     closed_enabled: "Este tema está ahora cerrado. No se admiten nuevas respuestas."
     closed_disabled: "Este tema ahora está abierto. Se admiten nuevas respuestas."
     autoclosed_message_max_posts:
-      one: "Este mensaje fue cerrado automáticamente al alcanzar el límite máximo de 1 respuesta."
-      other: "Este mensaje fue cerrado automáticamente al alcanzar el límite máximo de %{count} respuestas."
+      one: Este mensaje fue cerrado automáticamente al alcanzar el límite máximo de 1 respuesta.
+      other: Este mensaje fue cerrado automáticamente al alcanzar el límite máximo de %{count} respuestas.
     autoclosed_topic_max_posts:
-      one: "Este tema fue cerrado automáticamente al alcanzar el límite máximo de 1 respuesta."
-      other: "Este tema fue cerrado automáticamente al alcanzar el límite máximo de %{count} respuestas."
+      one: Este tema fue cerrado automáticamente al alcanzar el límite máximo de 1 respuesta.
+      other: Este tema fue cerrado automáticamente al alcanzar el límite máximo de %{count} respuestas.
     autoclosed_enabled_days:
-      one: "Este tema se cerró automáticamente después de 1 día. No se permiten nuevas respuestas."
-      other: "Este tema se cerró automáticamente después de %{count} días. No se permiten nuevas respuestas."
+      one: Este tema se cerró automáticamente después de 1 día. No se permiten nuevas respuestas.
+      other: Este tema se cerró automáticamente después de %{count} días. No se permiten nuevas respuestas.
     autoclosed_enabled_hours:
-      one: "Este tema se cerró automáticamente después de 1 hora. No se permiten nuevas respuestas."
-      other: "Este tema se cerró automáticamente después de %{count} horas. No se permiten nuevas respuestas."
+      one: Este tema se cerró automáticamente después de 1 hora. No se permiten nuevas respuestas.
+      other: Este tema se cerró automáticamente después de %{count} horas. No se permiten nuevas respuestas.
     autoclosed_enabled_minutes:
-      one: "Este tema se cerró automáticamente después de 1 minuto. No se permiten nuevas respuestas."
-      other: "Este tema se cerró automáticamente después de %{count} minutos. No se permiten nuevas respuestas."
+      one: Este tema se cerró automáticamente después de 1 minuto. No se permiten nuevas respuestas.
+      other: Este tema se cerró automáticamente después de %{count} minutos. No se permiten nuevas respuestas.
     autoclosed_enabled_lastpost_days:
-      one: "Este tema se cerró automáticamente 1 día después del último post. No se permiten nuevas respuestas."
-      other: "Este tema se cerró automáticamente %{count} días después del último post. No se permiten nuevas respuestas."
+      one: Este tema se cerró automáticamente 1 día después del último post. No se permiten nuevas respuestas.
+      other: Este tema se cerró automáticamente %{count} días después del último post. No se permiten nuevas respuestas.
     autoclosed_enabled_lastpost_hours:
-      one: "Este tema se cerró automáticamente 1 hora después del último post. No se permiten nuevas respuestas."
-      other: "Este tema se cerró automáticamente %{count} horas después del último post. No se permiten nuevas respuestas."
+      one: Este tema se cerró automáticamente 1 hora después del último post. No se permiten nuevas respuestas.
+      other: Este tema se cerró automáticamente %{count} horas después del último post. No se permiten nuevas respuestas.
     autoclosed_enabled_lastpost_minutes:
-      one: "Este tema se cerró automáticamente 1 minuto después del último post. No se permiten nuevas respuestas."
-      other: "Este tema se cerró automáticamente %{count} minutos después del último post. No se permiten nuevas respuestas."
+      one: Este tema se cerró automáticamente 1 minuto después del último post. No se permiten nuevas respuestas.
+      other: Este tema se cerró automáticamente %{count} minutos después del último post. No se permiten nuevas respuestas.
     autoclosed_disabled_days:
-      one: "Este tema se abrió automáticamente después de 1 día."
-      other: "Este tema se abrió automáticamente después de %{count} días."
+      one: Este tema se abrió automáticamente después de 1 día.
+      other: Este tema se abrió automáticamente después de %{count} días.
     autoclosed_disabled_hours:
-      one: "Este tema se abrió automáticamente después de 1 hora."
-      other: "Este tema se abrió automáticamente después de %{count} horas."
+      one: Este tema se abrió automáticamente después de 1 hora.
+      other: Este tema se abrió automáticamente después de %{count} horas.
     autoclosed_disabled_minutes:
-      one: "Este tema se abrió automáticamente después de 1 minuto."
-      other: "Este tema se abrió automáticamente después de %{count} minutos."
+      one: Este tema se abrió automáticamente después de 1 minuto.
+      other: Este tema se abrió automáticamente después de %{count} minutos.
     autoclosed_disabled_lastpost_days:
-      one: "Este tema se abrió automáticamente 1 día después de la última respuesta."
-      other: "Este tema se abrió automáticamente %{count} días después de la última respuesta."
+      one: Este tema se abrió automáticamente 1 día después de la última respuesta.
+      other: Este tema se abrió automáticamente %{count} días después de la última respuesta.
     autoclosed_disabled_lastpost_hours:
-      one: "Este tema se abrió automáticamente 1 hora después de la última respuesta."
-      other: "Este tema se abrió automáticamente %{count} horas después de la última respuesta."
+      one: Este tema se abrió automáticamente 1 hora después de la última respuesta.
+      other: Este tema se abrió automáticamente %{count} horas después de la última respuesta.
     autoclosed_disabled_lastpost_minutes:
-      one: "Este tema se abrió automáticamente 1 minuto después de la última respuesta."
-      other: "Este tema se abrió automáticamente %{count} minutos después de la última respuesta."
+      one: Este tema se abrió automáticamente 1 minuto después de la última respuesta.
+      other: Este tema se abrió automáticamente %{count} minutos después de la última respuesta.
     autoclosed_disabled: "El tema ahora está en abierto, se permiten respuestas."
     autoclosed_disabled_lastpost: "Este tema está ahora abierto. Se permiten nuevas respuestas."
     pinned_enabled: "Este tema ahora está destacado. Aparecerá en primer lugar en la lista de su categoría hasta que se deshaga el destacado de forma general por los moderadores o de forma particular por cada usuario para sí."
@@ -1501,6 +1630,7 @@ es:
   login:
     not_approved: "Tu cuenta aún no ha sido aprobada. Se te notificará por email cuando todo esté listo para iniciar sesión."
     incorrect_username_email_or_password: "Nombre de usuario, dirección de correo o contraseña incorrectos"
+    incorrect_password: "Password incorrecto"
     wait_approval: "Gracias por registrarte. Te notificaremos cuando tu cuenta haya sido aprobada."
     active: "Tu cuenta está activa y lista para usar."
     activate_email: "<p>¡Ya casi has terminado! Te enviamos un correo de activación a <b>%{email}</b>. Por favor sigue las instrucciones de ese correo para activar tu cuenta.</p><p>Si no llega, mira en la carpeta de spam.</p>"
@@ -1523,6 +1653,9 @@ es:
     auth_complete: "Autenticación completa."
     click_to_continue: "Clic aquí para continuar."
     already_logged_in: "Ups, parece que estás intentando aceptar una invitación dirigida a otro usuariol. Si no eres %{current_user}, por favor cierra sesión e inténtalo de nuevo."
+    second_factor_title: "Autenticación Dos Factores"
+    second_factor_description: "Por favor ingrese el código de autenticación desde tu aplicación:"
+    invalid_second_factor_code: "Código de Autenticación inválido"
   user:
     no_accounts_associated: "No hay cuentas relacionadas."
     deactivated: "Ha sido desactivado a causa de muchos rebotes al email '%{email}'."
@@ -1556,11 +1689,11 @@ es:
       same_ip_address: "Misma dirección de IP (%{ip_address}) como otros usuarios"
   flags_reminder:
     flags_were_submitted:
-      one: "Hay un reporte enviados hace 1 hora. [Por favor, revísalo](/admin/flags)."
-      other: "Hay reportes enviados hace %{count} horas. [Por favor, revísalos](/admin/flags)."
+      one: Hay un reporte enviados hace 1 hora. [Por favor, revísalo](/admin/flags).
+      other: Hay reportes enviados hace %{count} horas. [Por favor, revísalos](/admin/flags).
     subject_template:
-      one: "1 reporte esperando ser atendidos."
-      other: "%{count} reportes esperando ser atendidos."
+      one: 1 reporte esperando ser atendidos.
+      other: '%{count} reportes esperando ser atendidos.'
   unsubscribe_mailer:
     title: "Darse de baja"
     subject_template: "Confirma que no quieres recibir más emails de %{site_title}"
@@ -1678,7 +1811,7 @@ es:
 
       La entrega de correo electrónico es complicada. Aquí hay unas cuantas cosas importantes que deberías comprobar primero:
 
-      - *Asegúrate* de ajustar la dirección `notification email` desde: correctamente en los ajustes de tu sitio. **El dominio especificado en la dirección "from" de los emails que envíes es el dominio contra el que se validará tu email**.
+      - *Asegúrate* de configurar la dirección correctamente en los ajustes de tu sitio de `notification email`. **El dominio especificado en la dirección "from" de los emails que envíes es el dominio contra el que se validará tu email**.
 
       - Entérate de como ver el código fuente del email desde tu cliente de correo, para que así puedas examinar las cabeceras para ver pistas importantes. En Gmail está la opción "mostrar original" en el menú de lista desplegable en la parte superior derecha de cada email.
 
@@ -1690,7 +1823,7 @@ es:
 
       - Si estás corriendo tu propio servidor de correo, asegúrate de que las IPs de tu servidor de correo [no están en ninguna lista negra de correos][4]. También verifica que definitivamente se está enviando un nombre de huésped "hostname" completamente cualificado que resuelva en DNS en su mensaje HELO. Si no es así, esto causará que tu correo sea denegado por muchos servicios de correo.
 
-      -Recomendamos **enviar un email de prueba a [mail-tester.com][mt]** para verificar que todo está funcionando correctamente.
+      - Recomendamos **enviar un email de prueba a [mail-tester.com][mt]** para verificar que todo está funcionando correctamente.
 
       (La forma *fácil* es crear una cuenta gratuita en [Sendgrip][sg], [SparkPost][sp], [Mailgun][mg] o [Mailjet][mj], que proveen generosamente planes de mailing gratuitos y serán adecuados para pequeñas comunidades. ¡De todas formas todavía tendrás que configurar los registros SPF y DKIM en tus DNS!)
 
@@ -1757,8 +1890,8 @@ es:
     deferred: "Gracias por hacérnoslo saber. Estamos revisándolo."
     deferred_and_deleted: "Gracias por hacérnoslo saber. Hemos eliminado el post."
   temporarily_closed_due_to_flags:
-    one: "Este tema está temporalmente cerrado por 1 hora debido a un gran número de reportes de la comunidad."
-    other: "Este tema está temporalmente cerrado por %{count} horas debido a un gran número de reportes de la comunidad."
+    one: Este tema está temporalmente cerrado por 1 hora debido a un gran número de reportes de la comunidad.
+    other: Este tema está temporalmente cerrado por %{count} horas debido a un gran número de reportes de la comunidad.
   system_messages:
     private_topic_title: "Tema #%{id}"
     contents_hidden: "Por favor, visita el post para ver su contenido."
@@ -1768,17 +1901,32 @@ es:
       text_body_template: |
         Hola,
 
-        Esto es un mensaje automático de %{site_name} para hacerte saber que tu mensaje ha sido ocultado.
+        Este es un mensaje automático desde %{site_name} para notificarte que tu mensaje ha sido ocultado.
 
         <%{base_url}%{url}>
 
         %{flag_reason}
 
-        Varios miembros de la comunidad han reportado este mensaje antes de que fuera ocultado, por lo que por favor considera cómo podrías editar tu mensaje para reflejar sus comentarios. **Podrás editar tu mensaje en %{edit_delay} minutos, y será automáticamente desocultado**.
+        Varios miembros de la comunidad han reportado tu mensaje antes de que éste se haya ocultado, así que por favor considera cómo vas a editar tu mensaje. **Puedes editar tu mensaje después de  %{edit_delay} minutos, y será automáticamente mostrado de nuevo.**
 
-        Sin embargo, si el mensaje es ocultado por la comunidad una segunda vez, se mantendrá oculto hasta que sea revisado por un miembro del staff.
+        Sin embargo, si el mensaje es ocultado por la comunidad por segunda vez, permanecerá en ese estado hasta que sea revisado por alguien del staff.
 
-        Para obtener más información sobre el comportamiento esperado, revisa por favor las [directrices de la comunidad](%{base_url}/guidelines).
+        Para aprender más, por favor leer nuestra [guía de la comunidad](%{base_url}/guidelines).
+    post_hidden_again:
+      title: "Mensaje ocultado de nuevo"
+      subject_template: "Mensaje ocultado debido a reportes de la comunidad, staff notificado"
+      text_body_template: |
+        Hola,
+
+        Este es un mensaje automático desde %{site_name} para notificarte que tu mensaje ha sido ocultado nuevamente.
+
+        <%{base_url}%{url}>
+
+        %{flag_reason}
+
+        Varios miembros de la comunidad han reportado tu mensaje antes de que éste se haya ocultado.  **Porque este post ha sido ocultado más de una vez, permanecerá oculto hasta que personal del staff lo revise.**
+
+        Para aprender más, por favor leer nuestra [guía de la comunidad](%{base_url}/guidelines).
     usage_tips:
       text_body_template: |
         Si quieres unos consejos para empezar, [echa un vistazo a esta entrada de blog](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
@@ -1878,7 +2026,7 @@ es:
         ```
     csv_export_succeeded:
       title: "Exportación de datos en CSV completada con éxito"
-      subject_template: "Exportación de datos completada"
+      subject_template: "[%{export_title}] exportación de datos completa"
       text_body_template: |
         ¡Se han exportado tus datos correctamente! :dvd:
 
@@ -2016,6 +2164,13 @@ es:
         Lo sentimos, pero tu email para %{destination} (titulado %{former_title}) no funcionó.
 
         Ninguna de las direcciones de emails ha sido reconocida, o el Message-ID de la cabecera en el email ha sido modificado. Por favor asegúrate de que estás enviando los correos a las direcciones correctas provistas por el staff.
+    email_reject_old_destination:
+      title: "Correo electrónico rechazo antiguo destino"
+      subject_template: "[%{email_prefix}] Problema con el correo -- Estás intentando responder a una notificación antigua"
+      text_body_template: |
+        Lo sentimos, pero tu mensaje de correo a %{destination} (titulado %{former_title}) no ha funcionado.
+
+        Por razones de seguridad nosotros solo aceptamos respuestas a notificaciones originales para 90 días. Por favor [visita el tema](%{short_url}) para continuar esta conversación.
     email_reject_topic_not_found:
       title: "Email rechazado, tema no encontrado"
       subject_template: "[%{email_prefix}] Problema con el correo -- Tema no encontrado"
@@ -2099,16 +2254,16 @@ es:
 
         Esto puede ser cambiado con el ajuste `silence_new_user` en configuración del sitio.
     spam_post_blocked:
-      title: "Post spam bloqueado"
-      subject_template: "Bloqueado nuevo usuario %{username} debido a enlaces repetidos"
+      title: "Post con Spam Bloqueado"
+      subject_template: "Nuevo usuario %{username} posts bloqueados debido a repetición de enlaces."
       text_body_template: |
         Este es un mensaje automático.
 
-        El nuevo usuario [%{username}](%{user_url}) ha intentado crear múltiples posts con enlaces a %{domains}, pero han sido bloqueados para evitar spam. El usuario podrá seguir creando nuevos posts si no enlazan a %{domains}.
+        El usuario nuevo [%{username}](%{user_url}) ha intentado crear múltiples temas con enlaces a %{domains}, pero han sido bloqueados para evitar spam. El usuario todavía puede crear temas, siempre y cuando no contengan enlaces a %{domains}.
 
-        Por favor, [revisa el usuario](%{user_url}).
+        Por favor, [echa un vistazo al usuario](%{user_url}).
 
-        Esto puede ser modificado a través de los ajustes `newuser_spam_host_threshold` y `newuser_spam_host_threshold`.
+        Esto puede ser modificado con los ajustes `newuser_spam_host_threshold` y `white_listed_spam_host_domains`.
     unsilenced:
       title: "Dejar de silenciar"
       subject_template: "Cuenta no retenida"
@@ -2121,8 +2276,8 @@ es:
     pending_users_reminder:
       title: "Recordatorio de usuarios pendientes de revisión"
       subject_template:
-        one: "1 usuario esperando aprobación"
-        other: "%{count} usuarios esperando aprobación"
+        one: 1 usuario esperando aprobación
+        other: '%{count} usuarios esperando aprobación'
       text_body_template: |
         Hay nuevos registros de usuario esperando ser aprobados (o no) antes de poder acceder al foro.
 
@@ -2150,8 +2305,8 @@ es:
     queued_posts_reminder:
       title: "Recordatorio de post en revisión"
       subject_template:
-        one: "1 post esperando a ser revisado"
-        other: "%{count} posts esperando a ser revisados"
+        one: 1 post esperando a ser revisado
+        other: '%{count} posts esperando a ser revisados'
       text_body_template: |
         Hola,
 
@@ -2169,8 +2324,8 @@ es:
   user_notifications:
     previous_discussion: "Respuestas anteriores"
     reached_limit:
-      one: "ADVERTENCIA: has superado el límite de 1 email diario. Revisa el sitio para ver las otras notificaciones que no te han llegado."
-      other: "ADVERTENCIA: has superado el límite de %{count} emails diarios. Las próximas notificaciones de emails serán suprimidas. PD: gracias por ser tan popular!"
+      one: 'ADVERTENCIA: has superado el límite de 1 email diario. Revisa el sitio para ver las otras notificaciones que no te han llegado.'
+      other: 'ADVERTENCIA: has superado el límite de %{count} emails diarios. Las próximas notificaciones de emails serán suprimidas. PD: gracias por ser tan popular!'
     in_reply_to: "En respuesta a"
     unsubscribe:
       title: "Darse de baja"
@@ -2181,6 +2336,7 @@ es:
     visit_link_to_respond: "[Visita el tema](%{base_url}%{url}) para responder."
     visit_link_to_respond_pm: "[Visita el mensaje](%{base_url}%{url}) para responder."
     posted_by: "Publicado por %{username} el %{post_date}"
+    pm_participants: "Participantes:"
     invited_group_to_private_message_body: |
       %{username} te invitó en @%{group_name} al mensaje
 
@@ -2301,6 +2457,17 @@ es:
 
         %{context}
 
+        %{respond_instructions}
+    user_mentioned_pm:
+      title: "Usuario Mencionado MP"
+      subject_template: "[%{email_prefix}] [MP] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
         %{respond_instructions}
     user_group_mentioned:
       title: "Grupo del usuario mencionado"
@@ -2351,7 +2518,7 @@ es:
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
-        %{message}
+          %{message}
     account_suspended:
       title: "Cuenta Suspendida"
       subject_template: "[%{email_prefix}] Tu cuenta ha sido suspendida"
@@ -2381,6 +2548,15 @@ es:
         Si no quisiste crear una cuenta para  %{email} o cambiar la dirección de correo electrónico, no te preocupes – puedes ignorar este mensaje.
 
         Si tienes alguna pregunta, [contactar a nuestro amigable staff](%{base_url}/about).
+    account_second_factor_disabled:
+      title: "Autenticación de dos factores inhabilitada"
+      subject_template: "[%{email_prefix}] Autenticación de dos factores inhabilitada"
+      text_body_template: |
+        La autenticación de dos factores de tu cuenta en %{site_name} ha sido inhabilitada. Puedes ingresar únicamente con tu contraseña; no será necesario que ingreses con el código de autenticación adicional.
+
+        Si no seleccionaste inhabilitar la autenticación de dos factores, alguien puede haber comprometido tu cuenta.
+
+        Si tienes alguna pregunta.  [contacta nuestro amigable staff](%{base_url}/about).
     digest:
       why: "Un breve resumen de %{site_link} desde tu última visita el %{last_seen_at}"
       since_last_visit: "Desde tu última visita"
@@ -2411,6 +2587,16 @@ es:
 
         Haz clic en el siguiente enlace para cambiar tu contraseña:
         %{base_url}/u/password-reset/%{email_token}
+    email_login:
+      title: "Ingreso vía enlace"
+      subject_template: "[%{email_prefix}] Ingreso vía enlace"
+      text_body_template: |
+        Aquí tienes tu enlace para ingresar a [%{site_name}](%{base_url}).
+
+        Si no has solicitado este enlace, puedes simplemente ignorar este correo electrónico.
+
+        Clic en el siguiente enlace para ingresar:
+        %{base_url}/session/email-login/%{email_token}
     set_password:
       title: "Pon una contraseña"
       subject_template: "[%{email_prefix}] Establecer Contraseña"
@@ -2468,12 +2654,12 @@ es:
       title: "Entra después de ser aprobado"
       subject_template: "¡Tu solicitud ha sido aprobada en %{site_name}!"
       text_body_template: |
-        ¡Te damos la bienvenida a %{site_name}!
+        ¡Bienvenido a %{site_name}!
 
         Un miembro del staff aprobó tu cuenta en %{site_name}.
 
-        Haz clic en el siguiente enlace para confirmar y activar tu nueva cuenta:
-        %{base_url}/u/activate-account/%{email_token}
+        Puedes ahora acceder a tu nueva cuenta ingresando en:
+        %{base_url}
 
         Si no puedes hacer clic en el enlace, intenta copiándolo y pegándolo en la barra de direcciones de tu navegador.
 
@@ -2481,7 +2667,7 @@ es:
 
         Creemos en una comunidad con un [comportamiento civilizado](%{base_url}/guidelines).
 
-        ¡Disfruta de tu estancia!
+        ¡Disfruta tu estadía!
     signup:
       title: "Registrate"
       subject_template: "[%{email_prefix}] Confirma tu nueva cuenta"
@@ -2518,7 +2704,7 @@ es:
     store_failure: "Falló el almacenamiento de la subida #%{upload_id} para el usuario #%{user_id}."
     file_missing: "Lo sentimos, debes incluir un archivo a subir."
     empty: "Disculpa, pero el archivo que proporcionaste está vacío."
-    png_to_jpg_conversion_failure_message: "Ha ocurrido un error al convertir de PNG a JPG."
+    png_to_jpg_conversion_failure_message: "Ha ocurrido un error cuando se convertía desde PNG a JPG."
     attachments:
       too_large: "Lo sentimos, el archivo que estás intentando subir es demasiado grande (el tamaño máximo es %{max_size_kb}%KB)."
     images:
@@ -2671,140 +2857,140 @@ es:
   tos_topic:
     title: "Términos de Servicio"
     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").
+      Los siguientes términos y condiciones rigen el uso del sitio web %{company_domain} y todo el contenido, servicios y productos disponibles a través del sitio web, incluidos, entre otros, el software del foro %{company_domain}, el foro de soporte de %{company_domain} y el servicio de alojamiento de alojamiento ("Hosting") si existiese, (en conjunto, el sitio web). El sitio web pertenece y es operado por %{company_full_name} ("%{company_name}"). El sitio web se ofrece sujeto a su aceptación sin modificación de todos los términos y condiciones aquí contenidos y todas las demás reglas operativas y políticas (incluyendo, sin limitación, las [Política de privacidad](/privacy) y las [Guías de la Comunidad](/faq) de %{company_domain}) y los procedimientos que pueden publicarse de vez en cuando en este Sitio por %{company_name} (colectivamente, el "Acuerdo").
 
-      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.
+      Lea este Acuerdo detenidamente antes de acceder o utilizar el sitio web. Al acceder o usar cualquier parte del sitio web, usted acepta quedar sujeto a los términos y condiciones de este acuerdo. Si no acepta todos los términos y condiciones de este acuerdo, entonces no podrá acceder al sitio web ni utilizar ningún servicio. Si estos términos y condiciones se consideran una oferta de %{company_name}, la aceptación está expresamente limitada a estos términos. El sitio web está disponible solo para personas que tienen al menos 13 años de edad.
 
       <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.
+      ## [1. Tu cuenta en %{company_domain}](#1)
 
+      Si crea una cuenta en el sitio web, usted es responsable de mantener la seguridad de su cuenta y usted es totalmente responsable de todas las actividades que ocurran en la cuenta. Debe notificar de inmediato a %{company_name} cualquier uso no autorizado de su cuenta o cualquier otra violación de seguridad. %{company_name} no será responsable de ningún acto u omisión por su parte, incluidos los daños y perjuicios de cualquier tipo incurridos como resultado de dichos actos u omisiones.
       <a name="2"></a>
 
-      ## [2. Responsibility of Contributors](#2)
+      ## [2. Responsabilidad de los Colaboradores](#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:
+      Si publica material en el sitio web, ya sea publica enlaces en el sitio web o crea (o permite que un tercero lo haga) material disponible por medio del sitio web (cualquier material se considera "Contenido"), usted es completamente responsable del contenido y cualquier daño resultante de ese contenido. Este caso independientemente de si el Contenido en cuestión constituye texto, gráficos, un archivo de audio o software de computadora. Al hacer que el Contenido esté disponible, usted declara y garantiza que:
 
-      *   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.
+      * la descarga, copia y uso del Contenido no infringirá los derechos de propiedad, incluidos, entre otros, los derechos de autor, patente, marca comercial o secreto comercial de terceros;
+      * si su empleador tiene derechos de propiedad intelectual que usted crea, usted (i) ha recibido permiso de su empleador para publicar o poner a disposición el Contenido, incluido, entre otros, cualquier software, o (ii) ha obtenido una exención de su empleador como a todos los derechos en o al Contenido;
+      * usted ha cumplido completamente con las licencias de terceros relacionadas con el Contenido, y ha hecho todo lo necesario para transmitir con éxito a los usuarios finales los términos requeridos;
+      * el contenido no contiene ni instala virus, gusanos, malware, caballos de Troya u otro contenido dañino o destructivo;
+      * el contenido no es correo no deseado, no se genera de forma automática o aleatoria, y no contiene contenido comercial no ético o no deseado diseñado para dirigir el tráfico a sitios de terceros o aumentar la clasificación de motores de búsqueda de sitios de terceros o actos ilegales (como phishing) o engañar a los destinatarios sobre el origen del material (como spoofing);
+      * el Contenido no es pornográfico, no contiene amenazas ni incita a la violencia, y no viola los derechos de privacidad o publicidad de ningún tercero;
+      * su contenido no se anuncia a través de mensajes electrónicos no deseados, como enlaces de spam en grupos de noticias, listas de correo electrónico, blogs y sitios web, y métodos de promoción no solicitados similares;
+      * su contenido no se nombra de una manera que induzca a error a sus lectores a pensar que usted es otra persona o empresa; y
+      * usted tiene, en el caso de Contenido que incluye código de computadora, categorizado y/o descrito con precisión el tipo, naturaleza, usos y efectos de los materiales, ya sea que lo solicite %{company_name} o de otra manera.
 
       <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.
+      ## [3. Licencia de Contenido de Usuario](#3)
 
+      Las contribuciones de los usuarios están autorizadas bajo una [Reconocimiento-NoComercial-CompartirIgual 3.0 Unported (CC BY-NC-SA 3.0)](https://creativecommons.org/licenses/by-nc-sa/3.0/deed.es_ES). Sin limitar ninguna de esas representaciones o garantías, %{company_name} tiene el derecho (aunque no la obligación) de, en el exclusivo criterio de %{company_name} (i) rechazar o eliminar cualquier contenido que en opinión razonable de %{company_name}, viola cualquier política de %{company_name} o es de alguna manera dañina u objetable, o (ii) cancela o niega el acceso y uso del sitio web a cualquier individuo o entidad por cualquier motivo, en la única propiedad de %{company_name} discreción. %{company_name} no tendrá obligación de proporcionar un reembolso de los montos pagados previamente.
 
       <a name="4"></a>
 
-      ## [4. Payment and Renewal](#4)
+      ## [4. Pago y Renovación](#4)
 
-      ### General Terms
+      ### Términos Generales
 
-      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.
+      Servicios pagos opcionales o actualizaciones pueden estar disponibles en el sitio web. Al utilizar un servicio o actualización pagada opcional, usted acepta pagar a %{company_name} las tarifas de suscripción mensuales o anuales indicadas. Los pagos se cobrarán de forma prepaga el día que comience a utilizar el servicio o la actualización, y cubrirá el uso de ese servicio o la actualización por un período de suscripción mensual o anual según lo indicado. Estas tarifas no son reembolsables.
 
-      ### Automatic Renewal
+      ### Renovación Automática
 
-      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 menos que notifique a %{company_name} antes del final del período de suscripción correspondiente que desea cancelar un servicio o una actualización, su suscripción se renovará automáticamente y usted nos autorizará a cobrar la tarifa de suscripción anual o mensual aplicable en ese momento (así como cualquier impuestos) utilizando cualquier tarjeta de crédito u otro mecanismo de pago que tengamos registrado para usted. Las suscripciones pueden cancelarse en cualquier momento.
 
       <a name="5"></a>
 
-      ## [5. Services](#5)
+      ## [5. Servicios](#5)
 
-      ### Hosting, Support Services
+      ### Hosting, Servicios de Soporte
 
-      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.
+      Servicios opcionales de Hosting y Soporte pueden ser provistos por %{company_name} bajo los términos y condiciones para cada servicio. Al suscribirse a una cuenta de servicios de Hosting/Soporte o Soporte, acepta cumplir con dichos términos y condiciones.
+
+      ### HTTPS
+
+      Ofrecemos HTTPS como un complemento pago. Al registrarse y utilizar un dominio personalizado en %{company_domain}, nos autoriza a actuar en nombre del registrante del nombre de dominio (al solicitar los certificados necesarios, por ejemplo) con el único propósito de proporcionar HTTPS en su sitio.
+
+      ### Enterprise
+
+      Los servicios de Enterprise Hosting son provistos por %{company_name} bajo los términos y condiciones para cada servicio, que están determinados por un contrato específico del cliente. Al registrarse en una cuenta de Enterprise Hosting, acepta cumplir con dichos términos y condiciones.
 
       <a name="6"></a>
 
-      ## [6. Responsibility of Website Visitors](#6)
+      ## [6. Responsabilidad de los visitantes del sitio web](#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.
+      %{company_name} no ha revisado, y no puede revisar, todo el material, incluido el software informático, publicado en el sitio web, y no puede ser responsable del contenido, uso o efectos de ese material. Al operar el sitio web, %{company_name} no representa ni implica que respalda el material allí publicado, o que considera que dicho material es preciso, útil o no dañino. Usted es responsable de tomar las precauciones necesarias para protegerse a usted mismo y a sus sistemas informáticos contra virus, gusanos, caballos de Troya y otros contenidos dañinos o destructivos. El sitio web puede contener contenido ofensivo, indecente u objetable, así como contenido que contenga inexactitudes técnicas, errores tipográficos y otros errores. El sitio web también puede contener material que viole los derechos de privacidad o publicidad, o que infrinja la propiedad intelectual y otros derechos de propiedad de terceros, o cuya descarga, copia o uso esté sujeto a términos y condiciones adicionales, establecidos o no. %{company_name} se exime de cualquier responsabilidad por cualquier daño que resulte del uso por parte de los visitantes del sitio web, o de cualquier descarga por parte de los visitantes del contenido allí publicado.
 
       <a name="7"></a>
 
-      ## [7. Content Posted on Other Websites](#7)
+      ## [7. Contenido publicado en otros sitios web](#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.
+      No hemos revisado, y no podemos revisar, todo el material, incluido el software de computadora, disponible a través de los sitios web y páginas web a los cuales %{company_domain} vincula, y ese enlace a %{company_domain}. %{company_name} no tiene ningún control sobre los sitios web y páginas web que no sean del %{company_domain}, y no es responsable de sus contenidos o su uso. Al vincular a un sitio web o página web que no sea de %{company_domain}, %{company_name} no representa ni implica que respalde dicho sitio web o página web. Usted es responsable de tomar las precauciones necesarias para protegerse a usted mismo y a sus sistemas informáticos contra virus, gusanos, caballos de Troya y otros contenidos dañinos o destructivos. %{company_name} no se responsabiliza por ningún daño derivado de su uso de sitios web y páginas web que no sean del %{company_domain}.
 
       <a name="8"></a>
 
-      ## [8. Copyright Infringement and DMCA Policy](#8)
+      ## [8. Infracción de derechos de autor y política de DMCA](#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}.
+      Como %{company_name} pide a los demás que respeten sus derechos de propiedad intelectual, respeta los derechos de propiedad intelectual de los demás. Si cree que el material ubicado en o vinculado a %{company_domain} infringe sus derechos de autor, y si este sitio web reside en los EE. UU., Le recomendamos que notifique a %{company_name} de acuerdo con %{company_name} [Digital Millennium Copyright Ley](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") Política. %{company_name} responderá a todos los avisos, incluidos los necesarios o apropiados, eliminando el material infractor o deshabilitando todos los enlaces al material infractor. %{company_name} dará por terminado el acceso y uso del visitante del sitio web si, bajo circunstancias apropiadas, se determina que el visitante es un infractor recurrente de los derechos de autor u otros derechos de propiedad intelectual de %{company_name} u otros. En el caso de dicha finalización, %{company_name} no tendrá obligación de proporcionar un reembolso de los montos pagados previamente a %{company_name}.
 
       <a name="9"></a>
 
-      ## [9. Intellectual Property](#9)
+      ## [9. Propiedad Intelectual](#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.
+      Este Acuerdo no transfiere de %{company_name} ninguna propiedad intelectual de %{company_name} o de terceros, y todos los derechos, títulos e intereses en y para dicha propiedad se mantendrán (entre las partes) únicamente con %{company_name}. %{company_name}, %{company_domain}, el logotipo de %{company_domain} y todas las demás marcas comerciales, marcas de servicio, gráficos y logotipos utilizados en relación con %{company_domain}, o el sitio web son marcas comerciales o marcas comerciales registradas de %{company_name} o los licenciantes de %{company_name}. Otras marcas comerciales, marcas de servicio, gráficos y logotipos utilizados en relación con el sitio web pueden ser marcas comerciales de otros terceros. Su uso del sitio web no le concede ningún derecho o licencia para reproducir o usar cualquier %{company_name} o marcas comerciales de terceros.
 
       <a name="10"></a>
 
-      ## [10. Advertisements](#10)
+      ## [10. Atribución](#10)
 
-      %{company_name} reserves the right to display advertisements on your content unless you have purchased an Ad-free Upgrade or a Services account.
+      %{company_name} se reserva el derecho de mostrar vínculos de atribución como 'Desarrollado por %{company_domain},' autor del tema y atribución de fuentes en su pie de página de contenido.
 
       <a name="11"></a>
 
-      ## [11. Attribution](#11)
+      ## [11. Cambios](#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.
+      %{company_name} se reserva el derecho, a su entera discreción, de modificar o reemplazar cualquier parte de este Acuerdo. Es su responsabilidad verificar este Acuerdo periódicamente para ver los cambios. Su uso continuo o acceso al sitio web después de la publicación de cualquier cambio en este Acuerdo constituye la aceptación de dichos cambios. %{company_name} también puede, en el futuro, ofrecer nuevos servicios y/o características a través del sitio web (incluido el lanzamiento de nuevas herramientas y recursos). Tales nuevas características y/o servicios estarán sujetos a los términos y condiciones de este Acuerdo.
 
       <a name="12"></a>
 
-      ## [12. Changes](#12)
+      ## [12. Terminación](#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.
+      %{company_name} puede finalizar su acceso a todo o a cualquier parte del sitio web en cualquier momento, con o sin causa, con o sin aviso, y con efecto inmediato. Si desea rescindir este Acuerdo o su cuenta de %{company_domain} (si tiene una), simplemente puede dejar de usar el sitio web. Todas las disposiciones de este Acuerdo que por su naturaleza deben seguir vigentes después de la terminación seguirán vigentes después de la terminación, incluidas, entre otras, las disposiciones de propiedad, los descargos de garantía, la indemnización y las limitaciones de responsabilidad.
 
       <a name="13"></a>
 
-      ## [13. Termination](#13)
+      ## [13. Descargo de garantías](#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.
+      El sitio web se proporciona "tal cual". %{company_name} y sus proveedores y licenciantes renuncian a todas las garantías de cualquier tipo, expresas o implícitas, incluidas, entre otras, las garantías de comerciabilidad, adecuación para un propósito particular y no infracción. Ni %{company_name} ni sus proveedores y licenciantes hacen ninguna garantía de que el sitio web esté libre de errores o que el acceso al mismo sea continuo o ininterrumpido. Usted entiende que la descarga u obtención de contenido o servicios a través del sitio web, a su propia discreción y riesgo.
 
       <a name="14"></a>
 
-      ## [14. Disclaimer of Warranties](#14)
+      ## [14. Limitación de Responsabilidad](#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.
+      En ningún caso %{company_name}, ni sus proveedores o licenciantes, serán responsables con respecto a cualquier tema de este acuerdo bajo ningún contrato, negligencia, responsabilidad estricta u otra teoría legal o equitativa para: (i) cualquier especial, incidental o daños generados; (ii) el costo de adquisición de productos o servicios sustitutos; (iii) por interrupción de uso o pérdida o corrupción de datos; o (iv) para cualquier cantidad que exceda las tarifas pagadas por usted a %{company_name} en virtud de este acuerdo durante el período de doce (12) meses anterior a la causa de la acción. %{company_name} no tendrá ninguna responsabilidad por cualquier falla o retraso debido a asuntos fuera de su control razonable. Lo anterior no se aplicará en la medida en que lo prohíba la ley aplicable.
 
       <a name="15"></a>
 
-      ## [15. Limitation of Liability](#15)
+      ## [15. Representación general y garantía](#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.
+      Usted declara y garantiza que (i) su uso del sitio web será estrictamente de acuerdo con %{company_name} [Política de privacidad](/privacy), [Pautas de la comunidad](/guidelines), con este Acuerdo y con todas las leyes aplicables y normativas (incluidas, entre otras, leyes o normativas locales de su país, estado, ciudad u otra área gubernamental, relacionadas con la conducta en línea y el contenido aceptable, e incluidas todas las leyes aplicables relativas a la transmisión de datos técnicos exportados del país en el que se encuentra este sitio web reside o el país en el que usted reside) y (ii) su uso del sitio web no infringirá o mal apropiará los derechos de propiedad intelectual de ningún tercero.
 
       <a name="16"></a>
 
-      ## [16. General Representation and Warranty](#16)
+      ## [16. Indemnización](#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.
+      Usted acepta indemnizar y mantener indemne a %{company_name}, sus contratistas y sus licenciantes, y sus respectivos directores, funcionarios, empleados y agentes de y contra todos los reclamos y gastos, incluidos los honorarios de abogados, que surjan de su uso de el sitio web, incluyendo pero no limitado a su violación de este Acuerdo.
 
       <a name="17"></a>
 
-      ## [17. Indemnification](#17)
+      ## [17. Diversos](#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.
+      Este acuerdo constituye el acuerdo completo entre %{company_name} y usted con respecto al tema del presente documento, y solo se puede modificar mediante una enmienda escrita firmada por un ejecutivo autorizado de %{company_name}, o mediante la publicación por parte de %{company_name} de una versión revisada. Excepto en la medida en que la ley aplicable, de existir alguna, establezca lo contrario, este Acuerdo, cualquier acceso o uso del Sitio web se regirá por las leyes del estado de California, EE. UU., excluyendo las disposiciones sobre conflicto de leyes y el lugar adecuado para cualquier disputa que surja de o esté relacionada con cualquiera de los mismos será a los tribunales estatales y federales ubicados en el condado de San Francisco, California. A excepción de las reclamaciones por orden judicial o equitativo o reclamaciones relativas a los derechos de propiedad intelectual (que pueden ser llevados ante los tribunales competentes sin la fijación de un enlace), cualquier disputa que surja de este Acuerdo será resuelta de acuerdo con las Reglas completas de Arbitraje de la Judicial Arbitration and Mediation Service, Inc. ("JAMS") por tres árbitros designados de acuerdo con dichas Reglas. El arbitraje se llevará a cabo en San Francisco, California, en idioma inglés y la decisión de arbitraje se puede hacer cumplir en cualquier tribunal. La parte que prevalezca en cualquier acción o procedimiento para hacer cumplir este Acuerdo tendrá derecho a los costos y honorarios de abogados. Si alguna parte de este Acuerdo se considera inválida o no exigible, se interpretará que esa parte refleja la intención original de las partes, y las partes restantes permanecerán en pleno vigor y efecto. Una renuncia por cualquiera de las partes de cualquier término o condición de este Acuerdo o cualquier incumplimiento del mismo, en cualquier instancia, no renunciará a dicho término o condición o cualquier incumplimiento posterior de los mismos. Puede ceder sus derechos bajo este Acuerdo a cualquier parte que consienta y acuerde estar sujeto a sus términos y condiciones; %{company_name} puede asignar sus derechos bajo este Acuerdo sin condición. Este Acuerdo será vinculante y redundará en beneficio de las partes, sus sucesores y cesionarios permitidos.
 
-      <a name="18"></a>
+      Este documento es CC-BY-SA. Se actualizó por última vez el 1 de enero de 2017.
 
-      ## [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/).
+      Originalmente adaptado de los [Términos del servicio de WordPress](http://en.wordpress.com/tos/) en inglés.
   privacy_topic:
     title: "Políticas de Privacidad"
     body: |
@@ -2900,22 +3086,22 @@ es:
         Este distintivo se concede la primera vez que editas uno de tus posts. Aunque no siempre podrás editar tus posts, editar es una buena idea — te permite mejorar tus posts, corregir pequeños errores o añadir algo que se te había pasado. ¡Editar hace mejores tus publicaciones!
     basic_user:
       name: Básico
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Dispone</a> de todas las funciones esenciales de la comunidad
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">Dispone</a> de todas las funciones esenciales de la comunidad"
       long_description: |
         Este distintivo se concede cuando alcanzas el nivel de confianza 1. Gracias por pasar por aquí un momento y leer unos cuantos temas para ver de qué va esta comunidad. Las restricciones de nuevo usuario se eliminan y podrás usar las funcionalidades esenciales del sitio como enviar mensajes a otras personas, reportar posts, editar posts wiki y publicar imágenes o varios enlaces.
     member:
       name: Miembro
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Disponen</a> de invitaciones, mensaje a grupos y más "me gusta"
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">Disponen</a> de invitaciones, mensaje a grupos y más \"me gusta\""
       long_description: |
         Este distintivo se concede cuando alcanzas el nivel de confianza 2. Gracias por tu constante participación en la comunidad. Ahora puedes enviar invitaciones a otras personas desde tu perfil o temas individuales, enviar mensajes a grupos y dar más Me gusta por día.
     regular:
       name: Habitual
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Disponen</a> del poder recategorizar, renombrar, publicar enlacer sin el tag no-follow y más me gusta
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">Disponen</a> del poder recategorizar, renombrar, publicar enlacer sin el tag no-follow y más me gusta"
       long_description: |
         Este distintivo se concede cuando alcanzas el nivel de confianza 3. Gracias por tomar parte activa de nuestra comunidad por tanto tiempo, ser uno de los más ávidos lectores y contribuir tanto a su crecimiento y calidad. Ahora puedes recategorizar o renombrar temas, acceder al área vip, reportar spam de forma más contundente y dar muchos más Me gusta por día.
     leader:
       name: Líder
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Dispone</a> de poder editar, destacar, cerrar, archivar, dividir y combinar temas globalmente
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">Dispone</a> de poder editar, destacar, cerrar, archivar, dividir y combinar temas globalmente"
       long_description: |
         Este distintivo se concede cuando alcanzas el nivel de confianza 4. Eres un líder de la comunidad elegido por los administradores, constituyes un ejemplo positivo para los demás mediante tus hechos y palabras. Ahora puedes editar todos los posts, dar muchísimos Me gusta por día y realizar acciones de moderador como destacar temas, cerrarlos, archivarlos, hacerlos invisibles, dividirlos o integrarlos.
     welcome:
@@ -2925,7 +3111,7 @@ es:
         Este distintivo se concede cuando recibes tu primer Me gusta en un post. ¡Enhorabuena, has publicado algo que la comunidad considera guay, útil o interesante!
     autobiographer:
       name: Autobiógrafo
-      description: Detalló información en su <a href="%{base_uri}/my/preferences/profile">perfil</a> de usuario
+      description: "Detalló información en su <a href=\"%{base_uri}/my/preferences/profile\">perfil</a> de usuario"
       long_description: |
         Este distintivo se otorga por completar <a href="%{base_uri}/my/preferences/profile">tu perfil de usuario</a> y seleccionando una foto de perfil. Permitiendo a la comunidad saber más sobre ti y tus intereses hace que la comunidad sea mejor y esté más conectada. ¡Anímate!
     anniversary:
@@ -2992,7 +3178,7 @@ es:
       name: Promotor
       description: Invitó a un usuario
       long_description: |
-        Este distintivo se concede cuando invitas a alguien a unirse a la comunidad a través del botón de invitación en tu perfil o al final de un tema. Invitar a amigos que puedan estar interesados en debates específicos es la manera perfecta para introducirles a la comunidad, ¡gracias!
+        Este distintivo se concede cuando invitas a alguien a unirse a la comunidad a través del botón de invitación en tu página del perfil o al final de un tema. Invitar a amigos que puedan estar interesados en debates específicos es la manera perfecta para introducirles a la comunidad, ¡así que gracias!
     campaigner:
       name: Paladín
       description: Invitó a 3 usuarios
@@ -3020,7 +3206,7 @@ es:
         Este distintivo se otorga la primera vez que citas un post en tu respuesta. Citar secciones relevantes de posts anteriores ayuda a mantener los debates conectados y centrados en el tema. La forma más fácil de citar es seleccionando un trozo de cualquier post y utilizando el botón Citar que aparece al lado. ¡Cita generosamente!
     read_guidelines:
       name: Directrices leídas
-      description: Leyó las <a href="%{base_uri}/guidelines">directrices de la comunidad</a>
+      description: "Leyó las <a href=\"%{base_uri}/guidelines\">directrices de la comunidad</a>"
       long_description: |
         Este distintivo se otorga por <a href="%{base_uri}/guidelines">leer las directrices de la comunidad</a>. Siguiendo y compartiendo estas simples directrices ayudas a construir una comunidad segura, divertida y sostenible para todos. Recuerda siempre que hay otra persona como tú al otro lado de la pantalla, ¡sé agradable!
     reader:
@@ -3075,7 +3261,7 @@ es:
         Este distintivo se concede cuando das 20 veces todos los 50 me gusta que puedes utilizar al día. ¡Bravo! Eres un ejemplo de cómo incentivar a tus colegas miembros de la comunidad!
     thank_you:
       name: Agradecido/a
-      description: 'Ha recibido me gusta en 20 posts y dado a 10 '
+      description: "Ha recibido me gusta en 20 posts y dado a 10 "
       long_description: |
         Este distintivo se concede cuando has recibido 20 Me gusta en tus posts y has dado 10 o más de vuelta. Cuando a alguien le gustan tus posts, encuentras el tiempo para agradecer los posts de otras personas.
     gives_back:
@@ -3096,11 +3282,11 @@ es:
     first_mention:
       name: Primera mención
       description: Mencionó a un usuario en un post
-      long_description: Este distintivo se concede la primera vez que mencionas a un @usuario en tu post. Las menciones generan una notificación a la persona, así saben de tu publicación. Comienza escribiendo una @ para mencionar a cualquier usuario o, si está permitido, a un grupo – es una forma útil de llamar su atención.
+      long_description: "Este distintivo se concede la primera vez que mencionas a un @usuario en tu post. Las menciones generan una notificación a la persona, así saben de tu publicación. Comienza escribiendo una @ para mencionar a cualquier usuario o, si está permitido, a un grupo – es una forma útil de llamar su atención."
     first_onebox:
       name: Primer Onebox
       description: Publicó un enlace expandido vía Onebox
-      long_description: Este distintivo se concede la primera vez que publicas un enlace en una línea aparte, que fue automáticamente expandido vía Onebox con un resumen del enlace, un título y (si estuvo disponible) una imagen.
+      long_description: "Este distintivo se concede la primera vez que publicas un enlace en una línea aparte, que fue automáticamente expandido vía Onebox con un resumen del enlace, un título y (si estuvo disponible) una imagen."
     first_reply_by_email:
       name: Primera respuesta por email
       description: Respondió a un post vía email
@@ -3122,11 +3308,13 @@ es:
     devotee:
       name: Devoto
       description: 365 días de visitas
-      long_description: Este distintivo se gana por visitas durante 365 días consecutivos. ¡Wow, un año entero!
+      long_description: "Este distintivo se gana por visitas durante 365 días consecutivos. ¡Wow, un año entero!"
     badge_title_metadata: "%{display_name} distintivo en %{site_title}"
   admin_login:
     success: "Email enviado"
-    error: "¡Error!"
+    errors:
+      unknown_email_address: "Dirección de email desconocida."
+      invalid_token: "Token inválido."
     email_input: "Email de admin"
     submit_button: "Enviar email"
   performance_report:
@@ -3136,6 +3324,7 @@ es:
     title: "Etiquetas"
     staff_tag_disallowed: "La etiqueta \"%{tag}\" solo puede ser insertada por moderadores."
     staff_tag_remove_disallowed: "La etiqueta \"%{tag}\" solo puede ser eliminada por moderadores."
+    minimum_required_tags: "Debes seleccionar al menos %{count} etiquetas,"
   rss_by_tag: "Temas con la etiqueta %{tag}"
   finish_installation:
     congratulations: "Enhorabuena, ¡has instalado Discourse!"
@@ -3272,7 +3461,16 @@ es:
           <p>Si alguna vez quieres cambiar alguno de estos ajustes, visita <a href='/admin' target='_blank'>tu sección de administrador</a>; la puedes encontrar el lado del icono de una llave inglesa en el menú de la página..</p>
           <p>Diviértete, y ¡buena suerte <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>construyendo tu nueva comunidad!</a></p>
   search_logs:
-    graph_title: "Número de búsquedas"
-  activemodel:
-    errors:
-      <<: *errors
+    graph_title: "Cuenta de Búsquedas"
+  joined: "Registrado"
+  discourse_push_notifications:
+    popup:
+      mentioned: '%{username} te mencionó en "%{topic}" - %{site_title}'
+      group_mentioned: '%{username} te mencionó en "%{topic}" - %{site_title}'
+      quoted: '%{username} te cito en "%{topic}" - %{site_title}'
+      replied: '%{username} te respondió en "%{topic}" - %{site_title}'
+      posted: '%{username} publicó en "%{topic}" - %{site_title}'
+      private_message: '%{username} te envió un mensaje privado en "%{topic}" - %{site_title}'
+      linked: '%{username} enlazó tu publicación desde "%{topic}" - %{site_title}'
+      confirm_title: 'Notificaciones habilitadas - %{site_title}'
+      confirm_body: '¡Éxito! Las notificaciones han sido habilitadas.'
diff --git a/config/locales/server.et.yml b/config/locales/server.et.yml
index a7fa24e09c9..988ae433cdb 100644
--- a/config/locales/server.et.yml
+++ b/config/locales/server.et.yml
@@ -17,17 +17,18 @@ et:
       date_only: "%-d. %B %Y"
       long: "%B %-d, %Y, %l:%M%P"
   date:
-    month_names: [null, jaanuar, veebruar, märts, aprill, mai, juuni, juuli, august, september, oktoober, november, detsember]
+    month_names: [~, jaanuar, veebruar, märts, aprill, mai, juuni, juuli, august, september, oktoober, november, detsember]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "am"
     pm: "pm"
-    <<: *datetime_formats
   title: "Discourse"
   topics: "Teemad"
   posts: "postitused"
   loading: "Laetakse"
   log_in: "Logi sisse"
+  submit: "Saada"
   purge_reason: "Kustutatud automaatselt kui mahajäetud, deaktiveeritud konto"
   disable_remote_images_download_reason: "Väliste piltide allalaadimine keelati, kuna polnud polnud piisavalt vaba ruumi."
   anonymous: "Anonüümne"
@@ -62,18 +63,18 @@ et:
       present: peab olema tühi
       confirmation: "%{attribute} ei ühti"
       empty: ei tohi olla tühi
-      equal_to: peab olema %{count}
+      equal_to: "peab olema %{count}"
       even: peab olema paaris
       exclusion: on reserveeritud
-      greater_than: peab olema suurem kui %{count}
-      greater_than_or_equal_to: peab olema suurem või võrdne kui %{count}
+      greater_than: "peab olema suurem kui %{count}"
+      greater_than_or_equal_to: "peab olema suurem või võrdne kui %{count}"
       has_already_been_used: "on juba kasutusel"
       inclusion: puudub nimekirjas
       invalid: pole korrektne
       is_invalid: "tundub segane. kas see on terve lause?"
       contains_censored_words: "sisaldab järgmisi tsenseeritud sõnu: %{censored_words}"
-      less_than: peab olema väiksem kui %{count}
-      less_than_or_equal_to: peab olema väiksem või võrdne kui %{count}
+      less_than: "peab olema väiksem kui %{count}"
+      less_than_or_equal_to: "peab olema väiksem või võrdne kui %{count}"
       not_a_number: ei ole number
       not_an_integer: peab olema täisarv
       odd: peab olema paaritu
@@ -105,6 +106,9 @@ et:
       max_username_length_range: "Sa ei tohi maksimaalset seada minimaalsest väiksemaks."
       default_categories_already_selected: "Sa ei saa valida teises nimekirjas valitud liiki."
       s3_upload_bucket_is_required: "Ei saa aktiveerida S3 üleslaadimist, kui 's3_upload_bucket' ei ole määratud."
+  activemodel:
+    errors:
+      <<: *errors
   bulk_invite:
     file_should_be_csv: "Üles laetav fail peab olema CSV vormingus."
     error: "Selle faili üleslaadimisel tekkis viga. Palun proovi hiljem uuesti."
@@ -120,8 +124,8 @@ et:
   reading_time: "Lugemise aeg"
   likes: "Meeldimisi"
   too_many_replies:
-    one: "Vabandame, kuid ajutiselt on uutel kasutajatel lubatud 1 vastus teema kohta."
-    other: "Vabandame, kuid ajutiselt on uutel kasutajatel lubatud %{count} vastust teema kohta."
+    one: Vabandame, kuid ajutiselt on uutel kasutajatel lubatud 1 vastus teema kohta.
+    other: Vabandame, kuid ajutiselt on uutel kasutajatel lubatud %{count} vastust teema kohta.
   embed:
     start_discussion: "Alusta vestlust"
     continue: "Jätka arutelu"
@@ -131,35 +135,35 @@ et:
     no_hosts: "Sängitamiseks pole ühtegi hosti seadistatud."
     configure: "Sängitamise seadistamine"
     more_replies:
-      one: "veel 1 vastus"
-      other: "veel %{count} vastust"
+      one: veel 1 vastus
+      other: veel %{count} vastust
     loading: "Laen arutelu..."
     permalink: "Püsilink"
     imported_from: "See on kaasnev vestlusteema originaalsisestusele %{link}"
     in_reply_to: "▶ %{username}"
     replies:
-      one: "1 vastus"
-      other: "%{count} vastust"
+      one: 1 vastus
+      other: '%{count} vastust'
   no_mentions_allowed: "Vabandust, sa ei saa teisi kasutajaid mainida."
   too_many_mentions:
-    one: "Vabandust, sa tohid postituses vaid üht kasutajat mainida."
-    other: "Vabandust, Sa tohid postituses vaid %{count} kasutajat mainida."
+    one: Vabandust, sa tohid postituses vaid üht kasutajat mainida.
+    other: Vabandust, Sa tohid postituses vaid %{count} kasutajat mainida.
   no_mentions_allowed_newuser: "Vabanda, uued kasutajad ei tohi teisi kasutajaid mainida."
   too_many_mentions_newuser:
-    one: "Vabandust, uued kasutajad tohivad postituses vaid ühte kasutajat mainida."
-    other: "Vabanda, uued kasutajad tohivad postituses vaid %{count} kasutajat mainida."
+    one: Vabandust, uued kasutajad tohivad postituses vaid ühte kasutajat mainida.
+    other: Vabanda, uued kasutajad tohivad postituses vaid %{count} kasutajat mainida.
   no_images_allowed: "Vabanda, uued kasutajad ei saa postitustesse pilte panna."
   too_many_images:
-    one: "Vabandust, uued kasutajad tohivad postitusse panna vaid ühe pildi."
-    other: "Vabandust, uued kasutajad tohivad postitusse panna vaid %{count} pilti."
+    one: Vabandust, uued kasutajad tohivad postitusse panna vaid ühe pildi.
+    other: Vabandust, uued kasutajad tohivad postitusse panna vaid %{count} pilti.
   no_attachments_allowed: "Vabanda, uued kasutajad ei tohi postitusse manuseid lisada."
   too_many_attachments:
-    one: "Vabandust, uued kasutajad tohivad postitusele ainult ühe manuse lisada."
-    other: "Vabandust, uued kasutajad tohivad postitusele ainult %{count} manust lisada."
+    one: Vabandust, uued kasutajad tohivad postitusele ainult ühe manuse lisada.
+    other: Vabandust, uued kasutajad tohivad postitusele ainult %{count} manust lisada.
   no_links_allowed: "Vabandust, uued kasutajad ei tohi postituses viiteid kasutada."
   too_many_links:
-    one: "Vabandust, uued kasutajad tohivad postituses vaid ühte viidet kasutada."
-    other: "Vabandust, uued kasutajad tohivad postituses vaid %{count} viidet kasutada."
+    one: Vabandust, uued kasutajad tohivad postituses vaid ühte viidet kasutada.
+    other: Vabandust, uued kasutajad tohivad postituses vaid %{count} viidet kasutada.
   spamming_host: "Vabandust, sa ei tohi sellele domeenile viidata."
   user_is_suspended: "Peatatud kasutajatel pole lubatud postitada."
   topic_not_found: "Midagi on valesti. Kas on võimalik, et antud teema suleti või kustutati samal ajal, kui te seda vaatasite?"
@@ -184,7 +188,6 @@ et:
     hot: "Populaarsed teemad"
     top: "Parimad teemad"
     posts: "Viimased postitused"
-    private_posts: "Viimased privaatsõnumid"
     group_posts: "Viimased postitused grupilt %{group_name}"
     group_mentions: "Viimati mainitud grupis %{group_name}"
     user_posts: "Viimased postitused kasutajalt @%{username}"
@@ -198,7 +201,6 @@ et:
   groups:
     errors:
       can_not_modify_automatic: "Autommatset gruppi ei saa muuta"
-      member_already_exist: "'%{username}' on juba selle grupi liige."
       invalid_domain: "'%{domain}' ei ole nõuetele vastav domeen."
       invalid_incoming_email: "'%{email}' ei ole korrektne meiliaadress."
       email_already_used_in_group: "Grupp '%{group_name}' juba kasutab meiliaadressi '%{email}'."
@@ -215,9 +217,9 @@ et:
       trust_level_4: "usaldustase_4"
   education:
     until_posts:
-      one: "1 postitus"
-      other: "%{count} postitust"
-    new-topic: |
+      one: 1 postitus
+      other: '%{count} postitust'
+    'new-topic': |
       Teretulemast saidile %{site_name} &mdash; **tänud uue vestluse alustamise eest!**
 
       - Kas pealkiri kõlab kuvitavalt kui sa seda kõvasti loed? Kas see on hea kokkuvõte?
@@ -227,7 +229,7 @@ et:
       - Lisa enim kasutatud sõnad oma teemasse et teised *leiaksid* selle üles. Et grupeerida oma teema teiste sarnaste teemadega vali liik.
 
       Rohkema info saamiseks [vaata meie kommuuni juhiseid](/guidelines). See paneel ilmub ainult esimesel %{education_posts_text}.
-    new-reply: |
+    'new-reply': |
       Teretulemast saidile %{site_name} &mdash; **täname osalemast!**
 
       - Kas sinu vastus parandab vestlust mingil moel?
@@ -249,13 +251,12 @@ et:
       user_profile:
         bio_raw: "Minust"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Saad hoiatusi lisada vaid privaatsõnumitele."
               too_many_users: "Saad hoiatusi saata vaid ühele kasutajale korraga."
-              cant_send_pm: "Vabanda, sa ei saa sellele kasutajale privaatsõnumit saata."
               no_user_selected: "Pead valima sobiva kasutaja."
             featured_link:
               invalid: "on vigane. URL peab sisaldama http:// või https://."
@@ -278,7 +279,6 @@ et:
           attributes:
             payload_url:
               invalid: "URL on vigane. URL peab sisaldama http:// või https://. Ning tühikud ei ole lubatud."
-      <<: *errors
   user_profile:
     no_info_other: "<div class='missing-profile'>%{name} profiilis on väli 'Minust' veel täitmata</div>"
   vip_category_name: "Lounge"
@@ -292,41 +292,41 @@ et:
     title: "Teretulemast Discourse'i"
     body: |2
 
-      Selle märgistatud teema esimene lõik saab olema kõikidele uutele külastajatele nähtav kui tervitustekst sinu avalehel. See on oluline!
+        Selle märgistatud teema esimene lõik saab olema kõikidele uutele külastajatele nähtav kui tervitustekst sinu avalehel. See on oluline!
 
-      **Muuda see** enda kommuuni lühitutvustuseks:
+        **Muuda see** enda kommuuni lühitutvustuseks:
 
-      - Kellele see on?
-      - Mida siit leiab?
-      - Miks peaks keegi siia tulema?
-      - Kust saab rohkem infot (lingid, ressursid jne)?
+        - Kellele see on?
+        - Mida siit leiab?
+        - Miks peaks keegi siia tulema?
+        - Kust saab rohkem infot (lingid, ressursid jne)?
 
-      <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+        <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
 
-      Ilmselt peaksid sa selle teema administreerimise alt sulgema :wrench: (üleval paremal ja allääres), et teadandele vastuseid ei kuhjuks.
+        Ilmselt peaksid sa selle teema administreerimise alt sulgema :wrench: (üleval paremal ja allääres), et teadandele vastuseid ei kuhjuks.
   lounge_welcome:
     title: "Teretulemast Lounge'i"
     body: |2
 
-      Õnnitlused! :confetti_ball:
+        Õnnitlused! :confetti_ball:
 
-      Kui Sa seda teemat näed, oled hiljuti edutatud **püsiliikmeks** (usaldustase 3).
+        Kui Sa seda teemat näed, oled hiljuti edutatud **püsiliikmeks** (usaldustase 3).
 
-      Nüüd võid &hellip;
+        Nüüd võid &hellip;
 
-      * Muuta suvalise teema pealkirja
-      * Muuta suvalise teema foorumit
-      * Lasta kõiki oma viiteid järgida ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) on eemaldatud)
-      * Siseneda vaid usaldustasemel 3 ja kõrgemal olevatele kasutajatele mõeldud privaatse Salongi foorumisse
-      * Peita spämmi vaid ühe tähisega
+        * Muuta suvalise teema pealkirja
+        * Muuta suvalise teema foorumit
+        * Lasta kõiki oma viiteid järgida ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) on eemaldatud)
+        * Siseneda vaid usaldustasemel 3 ja kõrgemal olevatele kasutajatele mõeldud privaatse Salongi foorumisse
+        * Peita spämmi vaid ühe tähisega
 
-      Siin on [hetke püsiliikmete nimekiri](/badges/3/regular). Tervita neid kindlasti.
+        Siin on [hetke püsiliikmete nimekiri](/badges/3/regular). Tervita neid kindlasti.
 
-      Täname, et oled meie kogukonna tähtis liige!
+        Täname, et oled meie kogukonna tähtis liige!
 
-      (Täiendava info saamiseks usaldustasemete kohta [vaata teemat][trust]. Pea meeles, et vaid need liikmed kes jätkuvalt seatud nõudmisi täidavad püsivad püsiliikmetena.)
+        (Täiendava info saamiseks usaldustasemete kohta [vaata teemat][trust]. Pea meeles, et vaid need liikmed kes jätkuvalt seatud nõudmisi täidavad püsivad püsiliikmetena.)
 
-      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Liigist %{category}"
     replace_paragraph: "(Asenda see paragrahv oma uues kategoorias kategooria lühitutvustusega. See juhis ilmub siis kategooriate vaates. Seega, katsu hoida kirjeldus alla 200 tähemärgi. **Kuniks sa pole muutnud seda kirjeldust või kuni sa pole loonud teemasid, ei ole seda kategooriat kategooriate lehel näha.**)"
@@ -342,8 +342,8 @@ et:
       uncategorized: "Ei saa kustutada Liigitamata liiki"
       has_subcategories: "Seda foorumit ei saa kustutada, kuna tal on alamfoorumid."
       topic_exists:
-        one: "Seda foorumit ei saa kustutada, kuna tal on 1 teema. Vanim teema on %{topic_link}."
-        other: "Seda foorumit ei saa kustutada, kuna tal on %{count} teemat. Vanim teema on %{topic_link}."
+        one: Seda foorumit ei saa kustutada, kuna tal on 1 teema. Vanim teema on %{topic_link}.
+        other: Seda foorumit ei saa kustutada, kuna tal on %{count} teemat. Vanim teema on %{topic_link}.
       topic_exists_no_oldest: "Seda foorumit ei saa kustutada, kuna teemade arv on %{count}."
     uncategorized_description: "Teemad, mis ei vaja või mida ei saa liigitada ühegi olemasoleva foorumi alla."
   trust_levels:
@@ -359,102 +359,86 @@ et:
       title: "juht"
     change_failed_explanation: "Üritasid alandada %{user_name} tasemele '%{new_trust_level}'. Samas on tal juba tase'%{current_trust_level}'. %{user_name} jääb tasemele '%{current_trust_level}' - kui soovid alandada kasutaja taset, siis lukusta kõigepealt usaldustase."
   rate_limiter:
-    slow_down: "Oled antud seda toimingut liiga palju proovinud. Proovi hiljem uuesti."
-    too_many_requests: "Antud tegevuse jaoks on meil päevane kordade limiit. Palun oota %{time_left} enne kui uuesti proovid."
-    by_type:
-      first_day_replies_per_day: "Oled ületanud uuele kasutajale esimesel päeval lubatud vastuste limiidi. Palun oota %{time_left} enne kui uuesti proovid."
-      first_day_topics_per_day: "Oled ületanud uuele kasutajale esimesel päeval lubatud teemade lisamise limiidi. Palun oota %{time_left} enne kui uuesti proovid."
-      create_topic: "Lisad teemasid liiga kiiresti. Palun oota %{time_left} enne kui uuesti proovid."
-      create_post: "Vastad liiga kiiresti. Palun oota %{time_left} enne kui uuesti proovid."
-      delete_post: "Kustutad postitusi liiga kiiresti. Palun oota %{time_left} enne kui uuesti proovid."
-      public_group_membership: "Liitud gruppidega/lahkud neist liiga sageli. Palun oota %{time_left} enne kui uuesti proovid."
-      topics_per_day: "Oled ületanud tänaseks lubatud uute teemade lisamise limiidi. Palun oota %{time_left} enne kui uuesti proovid."
-      pms_per_day: "Oled ületanud tänaseks lubatud sõnumite limiidi. Palun oota %{time_left} enne kui uuesti proovid."
-      create_like: "Oled ületanud tänaseks lubatud meeldimiste lisamise limiidi. Palun oota %{time_left} enne kui uuesti proovid."
-      create_bookmark: "Oled ületanud tänaseks lubatud järjehoidjate lisamise limiidi. Palun oota %{time_left} enne kui uuesti proovid."
-      live_post_counts: "Küsid postituste reaalajas loendit liiga kiiresti. Palun oota %{time_left} enne kui uuesti proovid."
-      unsubscribe_via_email: "Oled ületanud tänaseks lubatud meilitsi tellimuste tühistamise limiidi. Palun oota %{time_left} enne kui uuesti proovid."
-      topic_invitations_per_day: "Oled ületanud tänaseks lubatud teemadesse kutsumise limiidi. Palun oota %{time_left} enne kui uuesti proovid."
     hours:
-      one: "1 tund"
-      other: "%{count} tundi"
+      one: 1 tund
+      other: '%{count} tundi'
     minutes:
-      one: "1 minut"
-      other: "%{count} minutit"
+      one: 1 minut
+      other: '%{count} minutit'
     seconds:
-      one: "1 sekund"
-      other: "%{count} sekundit"
+      one: 1 sekund
+      other: '%{count} sekundit'
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: "< 1s"
-        other: "< %{count}s"
+        one: < 1s
+        other: < %{count}s
       x_seconds:
-        one: "1s"
-        other: "%{count}s"
+        one: 1s
+        other: '%{count}s'
       less_than_x_minutes:
-        one: "< 1m"
-        other: "< %{count}m"
+        one: < 1m
+        other: < %{count}m
       x_minutes:
-        one: "1m"
-        other: "%{count}m"
+        one: 1m
+        other: '%{count}m'
       about_x_hours:
-        one: "1h"
-        other: "%{count}h"
+        one: 1h
+        other: '%{count}h'
       x_days:
-        one: "1p"
-        other: "%{count}p"
+        one: 1p
+        other: '%{count}p'
       about_x_months:
-        one: "1kuu"
-        other: "%{count}kuud"
+        one: 1kuu
+        other: '%{count}kuud'
       x_months:
-        one: "1kuu"
-        other: "%{count}kuud"
+        one: 1kuu
+        other: '%{count}kuud'
       about_x_years:
-        one: "1a"
-        other: "%{count}a"
+        one: 1a
+        other: '%{count}a'
       over_x_years:
-        one: "> 1a"
-        other: "> %{count}a"
+        one: '> 1a'
+        other: '> %{count}a'
       almost_x_years:
-        one: "1a"
-        other: "%{count}a"
+        one: 1a
+        other: '%{count}a'
     distance_in_words_verbose:
       half_a_minute: "just praegu"
       less_than_x_seconds:
-        one: "hetk tagasi"
-        other: "hetk tagasi"
+        one: hetk tagasi
+        other: hetk tagasi
       x_seconds:
-        one: "1 sekund tagasi"
-        other: "%{count} sekundit tagasi"
+        one: 1 sekund tagasi
+        other: '%{count} sekundit tagasi'
       less_than_x_minutes:
-        one: "vähem kui 1 minut tagasi"
-        other: "vähem kui %{count} minutit tagasi"
+        one: vähem kui 1 minut tagasi
+        other: vähem kui %{count} minutit tagasi
       x_minutes:
-        one: "1 minut tagasi"
-        other: "%{count} minutit tagasi"
+        one: 1 minut tagasi
+        other: '%{count} minutit tagasi'
       about_x_hours:
-        one: "1 tund tagasi"
-        other: "%{count} tundi tagasi"
+        one: 1 tund tagasi
+        other: '%{count} tundi tagasi'
       x_days:
-        one: "1 päev tagasi"
-        other: "%{count} päeva tagasi"
+        one: 1 päev tagasi
+        other: '%{count} päeva tagasi'
       about_x_months:
-        one: "umbes 1 kuu tagasi"
-        other: "umbes%{count} kuud tagasi"
+        one: umbes 1 kuu tagasi
+        other: umbes%{count} kuud tagasi
       x_months:
-        one: "1 kuu tagasi"
-        other: "%{count} kuud tagasi"
+        one: 1 kuu tagasi
+        other: '%{count} kuud tagasi'
       about_x_years:
-        one: "umbes 1 aasta tagasi"
-        other: "umbes %{count} aastat tagasi"
+        one: umbes 1 aasta tagasi
+        other: umbes %{count} aastat tagasi
       over_x_years:
-        one: "üle 1 aasta tagasi"
-        other: "üle %{count} aasta tagasi"
+        one: üle 1 aasta tagasi
+        other: üle %{count} aasta tagasi
       almost_x_years:
-        one: "peaaegu 1 aasta tagasi"
-        other: "peaaegu %{count} aastat tagasi"
+        one: peaaegu 1 aasta tagasi
+        other: peaaegu %{count} aastat tagasi
   password_reset:
     no_token: "Vabandust, see parooli uuendamise link on liiga vana. Vajuta sisselogimise nuppu ja kasuta värske lingi saamiseks 'Unustasin parooli'."
     choose_new: "Vali uus parool"
@@ -497,7 +481,6 @@ et:
       long_form: 'tähistasin selle kui sobimatu'
     notify_user:
       title: 'Saada kasutajale @{{username}} sõnum'
-      description: 'Soovin selle isikuga tema postituse osas otse ja privaatselt suhelda.'
       long_form: 'saatsin kasutajale sõnumi'
       email_title: 'Sinu postitus teemas "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -563,9 +546,7 @@ et:
       xaxis: "Päev"
       yaxis: "Külastajate arv"
     signups:
-      title: "Uued kasutajad"
       xaxis: "Päev"
-      yaxis: "Uute kasutajate arv"
     profile_views:
       title: "Kasutaja profiili vaatamisi"
       xaxis: "Päev"
@@ -600,7 +581,6 @@ et:
       xaxis: "Päev"
       yaxis: "Kirjade hulk"
     user_to_user_private_messages:
-      title: "Kasutajalt kasutajale"
       xaxis: "Päev"
       yaxis: "Sõnumite arv"
     system_private_messages:
@@ -644,7 +624,6 @@ et:
     page_view_crawler_reqs:
       xaxis: "Päev"
     page_view_total_reqs:
-      title: "Kokku"
       xaxis: "Päev"
     page_view_logged_in_mobile_reqs:
       xaxis: "Päev"
@@ -682,7 +661,6 @@ et:
     max_post_length: "Maksimaalne lubatud postituse pikkus tähemärkides"
     min_topic_title_length: "Lühim lubatud teema pealkirja pikkus tähemärkides"
     max_topic_title_length: "Maksimaalne lubatud teema pealkirja pikkus tähemärkides"
-    min_private_message_title_length: "Minimaalne lubatud teema pealkirja pikkus tähemärkides"
     enable_instagram_logins: "Luba autentimine Instagrami abil, nõuab instagram_consumer_key ja instagram_consumer_secret"
     instagram_consumer_key: "Teenusekasutaja avalik võti Instagrami abil autentimiseks"
     instagram_consumer_secret: "Teenusekasutaja salajane võti Instagrami abil autentimiseks"
@@ -700,7 +678,6 @@ et:
     max_tags_in_filter_list: "Filtri rippmenüüs kuvatavate siltide maksimaalne arv. Kuvatakse enimkasutatud sildid."
     tags_sort_alphabetically: "Kuva sildid tähestikulises järjekorras. Vaikimisi kuvatakse need populaarsuse järjekorras."
     tag_style: "Siltide vimplite visuaalne stiil."
-    staff_tags: "Siltide loetelu, mida võib lisada ainult meeskonna liige"
     min_trust_level_to_tag_topics: "Teemade sildistamiseks on nõutav minimaalne usaldustase"
     suppress_overlapping_tags_in_list: "Ära näita silti, kui see ühtib täpselt sõnaga teema päses"
     remove_muted_tags_from_latest: "Ära näita värskete teemade nimistus teemasid, millel on vaigistatud silt."
@@ -737,7 +714,25 @@ et:
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
-        %{message}
+          %{message}
+    digest:
+      new_topics: "Uued teemad"
+      unread_messages: "Lugemata sõnumid"
+      unread_notifications: "Lugemata teavitused"
+      new_posts: "Uued postitused"
+      new_users: "Uued kasutajad"
+      popular_topics: "Populaarsed teemad"
+      follow_topic: "Jälgi seda teemat"
+      join_the_discussion: "Loe lisa"
+      popular_posts: "Populaarsed postitused"
+      more_new: "Uus sinu jaoks"
+      subject_template: "[%{email_prefix}] Kokkuvõte"
+      your_email_settings: "sinu e-posti seaded"
+      click_here: "kliki siia"
+      from: "%{site_name} kokkuvõte"
+    forgot_password:
+      title: "Unustasin parooli"
+      subject_template: "[%{email_prefix}] Parooli taastamine"
     signup_after_approval:
       subject_template: "Oled saidil %{site_name} heaks kiidetud!"
   page_not_found:
@@ -750,6 +745,9 @@ et:
   terms_of_service:
     title: "Teenuse tingimused"
   deleted: 'kustutatud'
+  image: "pilt"
+  upload:
+    pasted_image_filename: "Asetatud pilt"
   email_log:
     anonymous_user: "Kasutaja on anonüümne"
     seen_recently: "Kasutajat nähti hiljuti"
@@ -758,6 +756,12 @@ et:
     message_to_blank: "message.to on tühi"
     text_part_body_blank: "text_part.body on tühi"
     body_blank: "sisu on tühi"
+  color_schemes:
+    default: "Hele skeem"
+    dark: "Tume skeem"
+    default_theme_name: "Vaikimisi"
+    dark_theme_name: "Tume"
+    light_theme_name: "Hele"
   about: "Teave"
   guidelines: "Juhendid"
   privacy: "Privaatsus"
@@ -787,7 +791,7 @@ et:
       name: Autobiograaf
     anniversary:
       name: Tähtpäev
-      description: Olnud aktiivne kasutaja vähemalt aasta, postitanud vähemalt ühe korra
+      description: "Olnud aktiivne kasutaja vähemalt aasta, postitanud vähemalt ühe korra"
     nice_post:
       name: Mõnus vastus
     good_post:
@@ -843,13 +847,13 @@ et:
       name: Lugeja
     popular_link:
       name: Populaarne viide
-      description: Postitas välise lingi, millel 50 klikki
+      description: "Postitas välise lingi, millel 50 klikki"
     hot_link:
       name: Kuum viide
-      description: Postitas välise lingi, millel 300 klikki
+      description: "Postitas välise lingi, millel 300 klikki"
     famous_link:
       name: Kuulus viide
-      description: Postitas välise lingi, millel 1000 klikki
+      description: "Postitas välise lingi, millel 1000 klikki"
     appreciated:
       name: Hinnatud
     respected:
@@ -882,7 +886,6 @@ et:
       name: Esimene vastamine meiliga
   admin_login:
     success: "Kiri saadetud"
-    error: "Viga!"
     email_input: "Admini kiri"
     submit_button: "Saada kiri"
   tags:
@@ -1001,6 +1004,3 @@ et:
         title: "Kutsu meeskonda"
       finished:
         title: "Sinu Discourse on valmis!"
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index 2635f3c4039..58f7cbb79bc 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -17,12 +17,12 @@ fa_IR:
       date_only: "%B %-d, %Y"
       long: "%B %-d, %Y, %l:%M%P"
   date:
-    month_names: [null, ژانویه, فوریه, مارچ, آپریل, می, جون, جولای, آگوست, سپتامبر, اکتبر, نوامبر, دسامبر]
+    month_names: [~, ژانویه, فوریه, مارچ, آپریل, می, جون, جولای, آگوست, سپتامبر, اکتبر, نوامبر, دسامبر]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "ق.ظ"
     pm: "ب.ظ"
-    <<: *datetime_formats
   title: "Discourse"
   topics: "موضوعات"
   posts: "نوشته‌ها"
@@ -67,19 +67,18 @@ fa_IR:
       present: باید خالی باشد
       confirmation: "با %{attribute} مطابق نیست"
       empty: نمی‌تواند خالی باشد
-      equal_to: باید برابر %{count} باشد
+      equal_to: "باید برابر %{count} باشد"
       even: باید زوج باشد
       exclusion: رزرو شده است
-      greater_than: باید بزرگ‌تر از %{count} باشد
-      greater_than_or_equal_to: باید بزرگتر یا مساوی %{count} باشد
+      greater_than: "باید بزرگ‌تر از %{count} باشد"
+      greater_than_or_equal_to: "باید بزرگتر یا مساوی %{count} باشد"
       has_already_been_used: "قبلا استفاده شده"
       inclusion: در فهرست وجود ندارد
       invalid: نامعتبر است
       is_invalid: "به نظر واضح نیست، آیا این جمله کامل است؟"
       contains_censored_words: "شامل کلمات سانسور شده زیر است: %{censored_words}"
-      matches_censored_pattern: "شامل کلمات سانسور شده‌ی زیر است که با الگوی کلمات سانسور شده سایت هماهنگ است: %{censored_words}"
-      less_than: باید کمتر از %{count} باشد
-      less_than_or_equal_to: باید کمتر و یا مساوی %{count} باشد
+      less_than: "باید کمتر از %{count} باشد"
+      less_than_or_equal_to: "باید کمتر و یا مساوی %{count} باشد"
       not_a_number: عدد نیست
       not_an_integer: باید یک عدد صحیح باشد
       odd: باید یک عدد فرد باشد
@@ -88,15 +87,19 @@ fa_IR:
         one: "نمی توان رکورد را پاک کرد زیرا یک %{record} وابسته وجود دارد."
         many: "نمی توان رکورد را پاک کرد زیرا یک %{record} وابسته وجود دارد."
       too_long:
+        one: خیلی طولانی است ( حداکثر مقدار قابل قبول %{count} نویسه است)
         other: خیلی طولانی است ( حداکثر مقدار قابل قبول %{count} نویسه است)
       too_short:
+        one: خیلی کوتاه است (حداقل مقدار قابل قبول %{count} نویسه است)
         other: خیلی کوتاه است (حداقل مقدار قابل قبول %{count} نویسه است)
       wrong_length:
+        one: مقدار طول اشتباه است (باید %{count} نویسه باشد)
         other: مقدار طول اشتباه است (باید %{count} نویسه باشد)
       other_than: "باید غیر از {count}% باشد"
     template:
       body: 'مشکلاتی با زمینه‌های دنبال شده وجود دارد:'
       header:
+        one: '%{count} خطا از ذخیره شدن %{model} جلوگیری می‌کنند.'
         other: '%{count} خطا از ذخیره شدن %{model} جلوگیری می‌کنند.'
     embed:
       load_from_remote: "خطایی در بارگذاری آن نوشته رخ داده است."
@@ -107,6 +110,9 @@ fa_IR:
       max_username_length_range: "شما نمی‌توانید حداکثر را کمتر از حداقل قرار دهید."
       default_categories_already_selected: "شما نمیتوانید دسته‌بندی‌ای را که در یک فهرست دیگر استفاده شده را انتخاب کنید."
       s3_upload_bucket_is_required: "شما نمیتوانید بارگذاری به S3 را فعال کنید مگر اینکه 's3_upload_bucket' را ارائه دهید."
+  activemodel:
+    errors:
+      <<: *errors
   invite:
     not_found: "رمز دعوت شما نامعتبر است. لطفا با مدیریت سایت تماس بگیرید."
     user_exists: "نیازی به دعوت <b>%{email}</b> نیست، در حال حاضر <a href='/u/%{username}/summary'>حساب کاربری دارند!</a> "
@@ -127,7 +133,8 @@ fa_IR:
   reading_time: "زمان مطالعه"
   likes: "پسند‌ها"
   too_many_replies:
-    other: "متأسفیم، ولی کاربران جدید موقتا محدود به {count}% پاسخ در یک موضوع هستند."
+    one: متأسفیم، ولی کاربران جدید موقتا محدود به {count}% پاسخ در یک موضوع هستند.
+    other: متأسفیم، ولی کاربران جدید موقتا محدود به {count}% پاسخ در یک موضوع هستند.
   embed:
     start_discussion: "شروع بحث"
     continue: "ادامه‌ی بحث"
@@ -137,29 +144,35 @@ fa_IR:
     no_hosts: "میزبانی برای قرارگیری فایل‌ها تعبیه نشده."
     configure: "پیکربندی کد‌های جاسازی شده"
     more_replies:
-      other: "%{count} پاسخ دیگر"
+      one: '%{count} پاسخ دیگر'
+      other: '%{count} پاسخ دیگر'
     loading: "بارگزاری بحث..."
     permalink: " پیوند یکتا"
     imported_from: "این بحث‌وگفتگوی همراه برای ورود اصلی در %{link} است"
     in_reply_to: "◀ %{username}"
     replies:
-      other: "%{count} پاسخ"
+      one: '%{count} پاسخ'
+      other: '%{count} پاسخ'
   no_mentions_allowed: "متأسفیم، شما نمی‌توانید به کاربران دیگر اشاره کنید."
   too_many_mentions:
-    other: "متأسفیم، شما در هر نوشته تنها می‌توانید به %{count} کاربر اشاره کنید."
+    one: متأسفیم، شما در هر نوشته تنها می‌توانید به %{count} کاربر اشاره کنید.
+    other: متأسفیم، شما در هر نوشته تنها می‌توانید به %{count} کاربر اشاره کنید.
   no_mentions_allowed_newuser: "متأسفیم، کاربران تازه نمی‌توانند به کاربران دیگر اشاره کنند."
   too_many_mentions_newuser:
-    other: "متأسفیم، کاربران تازه در هر نوشته تنها می‌توانند به %{count} کاربر دیگر اشاره کنند."
+    one: متأسفیم، کاربران تازه در هر نوشته تنها می‌توانند به %{count} کاربر دیگر اشاره کنند.
+    other: متأسفیم، کاربران تازه در هر نوشته تنها می‌توانند به %{count} کاربر دیگر اشاره کنند.
   no_images_allowed: "متأسفیم، کاربران تازه نمی‌توانند در نوشته‌ها تصویر بگذارند."
   too_many_images:
-    other: "متأسفیم، کاربران تازه تنها می‌توانند %{count} تصویر در هر نوشته بگذارند."
+    one: متأسفیم، کاربران تازه تنها می‌توانند %{count} تصویر در هر نوشته بگذارند.
+    other: متأسفیم، کاربران تازه تنها می‌توانند %{count} تصویر در هر نوشته بگذارند.
   no_attachments_allowed: "متأسفیم، کاربران تازه امکان قرار دادن پیوست را در نوشته هایشان ندارند."
   too_many_attachments:
-    other: "متأسفیم ، کاربران تازه تنها میتوانند %{count} پیوست در هر نوشته قرار بدهند."
+    one: متأسفیم ، کاربران تازه تنها میتوانند %{count} پیوست در هر نوشته قرار بدهند.
+    other: متأسفیم ، کاربران تازه تنها میتوانند %{count} پیوست در هر نوشته قرار بدهند.
   no_links_allowed: "متأسفیم، کاربران تازه نمی‌توانند در نوشته‌ها پیوند بگذارند."
   too_many_links:
-    other: "متأسفیم، کاربران تازه تنها می‌توانند در هر نوشته %{count} پیوند بگذارند."
-  contains_blocked_words: "نوشته‌ی شما حاوی الفاظی است که ممنوع هستند."
+    one: متأسفیم، کاربران تازه تنها می‌توانند در هر نوشته %{count} پیوند بگذارند.
+    other: متأسفیم، کاربران تازه تنها می‌توانند در هر نوشته %{count} پیوند بگذارند.
   spamming_host: "متأسفانه شما نمی‌توانید پیوندی با آن میزبان را بفرستید."
   user_is_suspended: "کاربر تعلیق شده نمی‌تواند نوشته‌ای ارسال کند."
   topic_not_found: "یک مشکلی وجود دارد.  شاید این موضوع همزمان که شما در حال خواندن آن بودید بسته شده یا پاک شده."
@@ -191,7 +204,6 @@ fa_IR:
     top_weekly: "برترین موضوعات هفتگی"
     top_daily: "برتین موضوعات روزانه"
     posts: "آخرین نوشته‌ها"
-    private_posts: "آخرین پیام‌های خصوصی"
     group_posts: "آخرین نوشته‌ها در گروه %{group_name}"
     group_mentions: "آخرین اشاره‌ها از %{group_name}"
     user_posts: "آخرین نوشته ها توسط @%{username}"
@@ -204,11 +216,8 @@ fa_IR:
   queue:
     delete_reason: "پاک شد از مدیر زمانبندی نوشته"
   groups:
-    success:
-      bulk_add: "%{users_added} کاربر به گروه اضافه شدند."
     errors:
       can_not_modify_automatic: "نمی‌توانید گروه‌های خودکار را تغییر دهید."
-      member_already_exist: "%{username}' در حال حاضر عضو این گروه است."
       invalid_domain: "'%{domain}' دامنه معتبری نیست."
       invalid_incoming_email: "'%{email}' نامعتبر است."
       email_already_used_in_group: "'%{email}' در حال حاضر در گروه '%{group_name}' استفاده شده است."
@@ -227,8 +236,9 @@ fa_IR:
       title: "درخواست عضویت در @%{group_name}"
   education:
     until_posts:
-      other: "%{count} نوشته"
-    new-topic: |
+      one: '%{count} نوشته'
+      other: '%{count} نوشته'
+    'new-topic': |
       به  %{site_name} &mdash خوش آمدید؛ **با تشکر از شما برای شروع گفتگو!**
 
       - آیا عنوان برای خواندن با صدای بلند، جالب است؟‌ خلاصه‌ی خوبیست؟
@@ -238,7 +248,7 @@ fa_IR:
       - به همراه کلمه‌هایی که عموما در موضوع شما برای *پیدا* کردن استفاده می‌شود. برای گروه کردن موضوعاتتان با موضوعات مرتبط، یک دسته‌بندی انتخاب کنید.
 
       برای اطلاعات بیشتر [دستورالعمل های انجمن را ببینید](/guidelines). این پنل اول فقط به شما نشان داد می‌شود %{education_posts_text}.
-    new-reply: |
+    'new-reply': |
       به %{site_name} &mdash; خوش آمدید **با تشکر از شما برای همکارییتان!**
 
       - آیا پاسخ شما سطح گفتگو رو بالا می‌برد؟
@@ -284,12 +294,6 @@ fa_IR:
       با عرض پوزش، محدودیت %{newuser_max_replies_per_topic} پاسخ در هر موضوع برای کاربران جدید وجود دارد.
 
       به جای افزودن پاسخ‌های دیگر پاسخ‌های قبلی را ویرایش کنید یا موضوعات دیگر را ببینید
-    reviving_old_topic: |
-      ### می‌خواهید موضوع را احیا کنید؟
-
-      آخرین پاسخ **%{days}** روز قبل بوده. نوشته‌ی شما موضوع را به بالای لیست خواهد آورد و تمام افرادی که در این بحث شرکت کردند متوجه خواهند شد.
-
-      آیا ادامه می‌دهید؟
   activerecord:
     attributes:
       category:
@@ -302,13 +306,12 @@ fa_IR:
       user_profile:
         bio_raw: "درباره من"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "شما فقط قادر به ضمیمه کردن اخطار در پیام‌های خصوصی هستید."
               too_many_users: "شما در هر بار می توانید به یک کاربر اخطار ارسال نمایید."
-              cant_send_pm: "متأسفانه ، شما نمی‌توانید به این کاربر پیام‌خصوصی بفرستید."
               no_user_selected: "باید یک کاربر معتبر انتخاب کنید"
               reply_by_email_disabled: "پاسخ با ایمیل از کار انداخته شده است."
             featured_link:
@@ -347,7 +350,6 @@ fa_IR:
           attributes:
             word:
               too_many: "برای چنین کاری کلمات زیادی است"
-      <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>فیلد درباره من نمایه شما خالی است, <a href='/u/%{username_lower}/preferences/about-me'>قصد نوشتن دارید؟</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} هنوز در نمایه‌اش چیزی در فیلد 'درباره من' وارد نکرده است."
@@ -362,41 +364,41 @@ fa_IR:
     title: "به دیسکورس خوش آمدید"
     body: |2
 
-      اولین پاراگراف این موضوع سنجاق شده و به عنوان پیام خوش‌آمد گویی به تمام بازدید‌کنندگان نمایش داده می‌شود. که مهم است!
+        اولین پاراگراف این موضوع سنجاق شده و به عنوان پیام خوش‌آمد گویی به تمام بازدید‌کنندگان نمایش داده می‌شود. که مهم است!
 
-      این متن را به یک توضیح مختصر درباره انجمن خود **تغییر دهید**:
+        این متن را به یک توضیح مختصر درباره انجمن خود **تغییر دهید**:
 
-      - برای چه افرادی است؟
-      - چه چیزی را در اینجا پیدا می‌کنند؟
-      - چرا باید به اینجا بیایند؟
-      - چه زمانی می‌توانند بیشتر بخوانند (پیوند‌ها، منابع و...)؟
-      <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+        - برای چه افرادی است؟
+        - چه چیزی را در اینجا پیدا می‌کنند؟
+        - چرا باید به اینجا بیایند؟
+        - چه زمانی می‌توانند بیشتر بخوانند (پیوند‌ها، منابع و...)؟
+        <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
 
-      شاید بخواهید این موضوع را از طریق مدیریت ببندید :wrench: (در قسمت بالا سمت راست و پایین)، بنابراین پاسخ‌ها در اعلان ها انباشته نمی‌شوند.
+        شاید بخواهید این موضوع را از طریق مدیریت ببندید :wrench: (در قسمت بالا سمت راست و پایین)، بنابراین پاسخ‌ها در اعلان ها انباشته نمی‌شوند.
   lounge_welcome:
     title: "به سالن خوش آمدید"
     body: |2
 
-      تبریک! :confetti_ball:
+        تبریک! :confetti_ball:
 
-      اگر می‌توانید این موضوع را ببینید، یعنی به **ناظم** (سطح اعتماد 3) ارتقا پیدا کردید.
+        اگر می‌توانید این موضوع را ببینید، یعنی به **ناظم** (سطح اعتماد 3) ارتقا پیدا کردید.
 
-      حالا می‌توانید  &hellip;
+        حالا می‌توانید  &hellip;
 
-      * عنواهر موضوعی را ویرایش کنید
-      * دسته‌بندی هر موضوعی را تغییر دهید
-      * تمام پیوند‌های خود را به صورت follow قرار دهید. ([nofollow خودکار](http://en.wikipedia.org/wiki/Nofollow) حذف می‌شود)
-      * دسترسی به تالار  های خصوصی دسته‌بندی‌هایی که فقط به کاربران سطح 3 و بالاتر به آن دسترسی دارند
-      * مخفی سازی هرزنامه‌ با یک پرچم
+        * عنواهر موضوعی را ویرایش کنید
+        * دسته‌بندی هر موضوعی را تغییر دهید
+        * تمام پیوند‌های خود را به صورت follow قرار دهید. ([nofollow خودکار](http://en.wikipedia.org/wiki/Nofollow) حذف می‌شود)
+        * دسترسی به تالار  های خصوصی دسته‌بندی‌هایی که فقط به کاربران سطح 3 و بالاتر به آن دسترسی دارند
+        * مخفی سازی هرزنامه‌ با یک پرچم
 
-      در اینجا [لیست فعلی کاربران ناظم](/badges/3/regular) را می‌تواند ببینید. مطمئن شوید که سلام می‌کنید!
+        در اینجا [لیست فعلی کاربران ناظم](/badges/3/regular) را می‌تواند ببینید. مطمئن شوید که سلام می‌کنید!
 
-      با تشکر از شما که بخش مهمی از این انجمن هستید!
+        با تشکر از شما که بخش مهمی از این انجمن هستید!
 
 
-      (برای اطلاعات بیشتر درباره سطوح اعتماد  [این موضوع را ببینید][trust]. توجه داشته باشید که اعضا فقط در صورتی که شرایط را رعایت کنند در سطح اعتماد 3 باقی می‌مانند.)
+        (برای اطلاعات بیشتر درباره سطوح اعتماد  [این موضوع را ببینید][trust]. توجه داشته باشید که اعضا فقط در صورتی که شرایط را رعایت کنند در سطح اعتماد 3 باقی می‌مانند.)
 
-      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "در رابطه با دسته‌بندی %{category}"
     replace_paragraph: "(به جای پاراگراف اول توضیحات کوتاهی درباره دسته جدیدتان قرار بدهید. این راهنما در قسمت دسته ها نمایش داده می شود٬ پس سعی کنید آن را زیر  200 کلمه نگاه دارید. **قبل از اینکه این متن را ویرایش کنید یا موضوع جدیدی بوجود بیاورید٬ این دسته در صفحه دسته ها نمایش داده نمی شود.**)"
@@ -412,7 +414,8 @@ fa_IR:
       uncategorized: "بدون دسته‌بندی را نمی توان حذف کرد"
       has_subcategories: "این دسته‌بندی به دلیل داشتن زیردسته قابل پاک شدن نیست."
       topic_exists:
-        other: "این دسته‌بندی باید پاک شود زیرا این موضوع دارای %{count} است. قدیمی ترین موضوع  %{topic_link}."
+        one: این دسته‌بندی باید پاک شود زیرا این موضوع دارای %{count} است. قدیمی ترین موضوع  %{topic_link}.
+        other: این دسته‌بندی باید پاک شود زیرا این موضوع دارای %{count} است. قدیمی ترین موضوع  %{topic_link}.
       topic_exists_no_oldest: "این دسته را نمی توان پاک کرد زیرا تعداد موضوع %{count} است "
     uncategorized_description: "موضوعاتی که نیاز به دسته‌بندی ندارند، یا قابل دسته‌بندی نیستند."
   trust_levels:
@@ -431,78 +434,86 @@ fa_IR:
     image_placeholder:
       broken: "عکس خراب شده است."
   rate_limiter:
-    slow_down: "شما این عمل را بیش از حد انجام داده اید, بعدا دوباره امتحان کنید."
-    too_many_requests: "ما روزانه  محدودیت زمانی داریم برای اینکه این اقدام چند بار انجام شود. لطفا %{time_left} قبل از اینکه دوباره تلاش کنید صبر کنید . "
-    by_type:
-      first_day_replies_per_day: "شما به حداکثر تعداد پاسخ هایی که یک کاربر تازه میتواند در روز اولش ایجاد کند رسیده اید. لطفا به مدت %{time_left} صبر کنید قبل از اینکه دوباره امتحان کنید."
-      first_day_topics_per_day: "شما به حداکثر تعداد موضوعاتی که یک کاربر تازه میتواند در روز اولش ایجاد کند رسیده‌اید. لطفا به مدت %{time_left} صبر کنید قبل از اینکه دوباره امتحان کنید."
-      create_topic: "شما  موضوعات را خیلی سریع ایجاد میکنید. لطفا به مدت %{time_left} صبر کنید قبل از اینکه دوباره امتحان کنید."
-      create_post: "شما خیلی سریع پاسخ می‌دهید. لطفا به مدت %{time_left} صبر کنید قبل از اینکه دوباره امتحان کنید."
-      delete_post: "شما نوشته‌ها را بسیار سریع حذف می‌کنید. لطفا %{time_left}  صبر کنید و سبپس دوباره امتحان کنید."
-      public_group_membership: "میزان ورود/ترک شما در گروه‌ها زیاد است. لطفا %{time_left}  صبر کنید و سپس دوباره امتحان کنید."
-      topics_per_day: "شما به حداکثر تعداد مباحث جدیدی که امروز میتوانید ایجاد کنید رسیده اید. لطفا به مدت %{time_left} صبر کنید قبل از اینکه دوباره امتحان کنید."
-      pms_per_day: "شما به حداکثر تعداد پیام‌هایی که امروز میتوانید بفرستید رسیده‌اید. لطفا به مدت %{time_left} صبر کنید قبل از اینکه دوباره امتحان کنید."
-      create_like: "شما به حداکثر تعداد پسند هایی که امروز میتوانید بکنید رسیده اید. لطفا به مدت %{time_left} صبر کنید قبل از اینکه دوباره امتحان کنید."
-      create_bookmark: "شما به حداکثر تعداد نشانک‌هایی که امروز میتوانید ایجاد کنید، رسیده‌اید. لطفا به مدت %{time_left} صبر کنید قبل از اینکه دوباره امتحان کنید."
-      edit_post: "به حداکثر تعداد ویرایش روزانه رسیدید. بعد از %{time_left} می‌توانید دوباره تلاش کنید."
-      live_post_counts: "درخواست نمایش زنده پست‌های شما بسیار سریع است. لطفا %{time_left} صبر کنید سپس دوباره تلاش کنید."
-      unsubscribe_via_email: "به حداکثر تعداد لغو اشتراک با ایمیل رسیده‌اید. لطفا %{time_left} صبر کنید سپس مجددا تلاش کنید."
-      topic_invitations_per_day: "به حداکثر تعداد دعوت به موضوع رسیده‌اید. لطفا %{time_left} صبر کنید سپس مجددا تلاش کنید."
     hours:
-      other: "%{count} ساعت"
+      one: '%{count} ساعت'
+      other: '%{count} ساعت'
     minutes:
-      other: "%{count} دقیقه"
+      one: '%{count} دقیقه'
+      other: '%{count} دقیقه'
     seconds:
-      other: "%{count} ثانیه"
+      one: '%{count} ثانیه'
+      other: '%{count} ثانیه'
   datetime:
     distance_in_words:
       half_a_minute: "<  1 دقیقه"
       less_than_x_seconds:
-        other: "< %{count} ثانیه"
+        one: < %{count} ثانیه
+        other: < %{count} ثانیه
       x_seconds:
-        other: "%{count} ثانیه"
+        one: '%{count} ثانیه'
+        other: '%{count} ثانیه'
       less_than_x_minutes:
-        other: "< %{count} دقیقه"
+        one: < %{count} دقیقه
+        other: < %{count} دقیقه
       x_minutes:
-        other: "%{count} دقیقه"
+        one: '%{count} دقیقه'
+        other: '%{count} دقیقه'
       about_x_hours:
-        other: "%{count} ساعت"
+        one: '%{count} ساعت'
+        other: '%{count} ساعت'
       x_days:
-        other: "%{count} روز"
+        one: '%{count} روز'
+        other: '%{count} روز'
       about_x_months:
-        other: "%{count} ماه"
+        one: '%{count} ماه'
+        other: '%{count} ماه'
       x_months:
-        other: "%{count} ماه"
+        one: '%{count} ماه'
+        other: '%{count} ماه'
       about_x_years:
-        other: "%{count} سال"
+        one: '%{count} سال'
+        other: '%{count} سال'
       over_x_years:
-        other: "> %{count} سال"
+        one: '> %{count} سال'
+        other: '> %{count} سال'
       almost_x_years:
-        other: "%{count} سال"
+        one: '%{count} سال'
+        other: '%{count} سال'
     distance_in_words_verbose:
       half_a_minute: "هم اکنون"
       less_than_x_seconds:
-        other: "هم اکنون"
+        one: هم اکنون
+        other: هم اکنون
       x_seconds:
-        other: "%{count} ثانیه قبل"
+        one: '%{count} ثانیه قبل'
+        other: '%{count} ثانیه قبل'
       less_than_x_minutes:
-        other: "کمتر از %{count} دقیقه قبل"
+        one: کمتر از %{count} دقیقه قبل
+        other: کمتر از %{count} دقیقه قبل
       x_minutes:
-        other: "%{count} دقیقه قبل"
+        one: '%{count} دقیقه قبل'
+        other: '%{count} دقیقه قبل'
       about_x_hours:
-        other: "%{count} ساعت قبل"
+        one: '%{count} ساعت قبل'
+        other: '%{count} ساعت قبل'
       x_days:
-        other: "%{count} روز قبل"
+        one: '%{count} روز قبل'
+        other: '%{count} روز قبل'
       about_x_months:
-        other: "حدود %{count} ماه قبل"
+        one: حدود %{count} ماه قبل
+        other: حدود %{count} ماه قبل
       x_months:
-        other: "%{count} ماه قبل"
+        one: '%{count} ماه قبل'
+        other: '%{count} ماه قبل'
       about_x_years:
-        other: "حدود %{count} سال قبل"
+        one: حدود %{count} سال قبل
+        other: حدود %{count} سال قبل
       over_x_years:
-        other: "بیش از %{count} سال قبل"
+        one: بیش از %{count} سال قبل
+        other: بیش از %{count} سال قبل
       almost_x_years:
-        other: "تقریبا %{count} سال قبل"
+        one: تقریبا %{count} سال قبل
+        other: تقریبا %{count} سال قبل
   password_reset:
     no_token: "متآسفیم, پیوند تغییر رمز عبور بسیار قدیمی است. دکمه ورود را انتخاب کنید و از 'من رمز عبور خود را فراموش کرده ام' برای دریافت یک پیوند جدید استفاده کنید."
     choose_new: "رمز‌عبور جدید را وارد کنید"
@@ -556,8 +567,6 @@ fa_IR:
       long_form: 'به عنوان نامناسب علامت گذاری شده'
     notify_user:
       title: 'فرستادن پیام به @{{username}}'
-      description: 'من می‌خواهم با این شخص به صورت مستقیم و محرمانه درباره نوشته‌اش صحبت کنم.'
-      short_description: 'می‌خواهم با این شخص به صورت خصوصی درباره‌ی نوشته‌اش صحبت کنم.'
       long_form: 'به کاربر پیام داده شد'
       email_title: 'نوشته ی شما در " %{title} "'
       email_body: "%{link}\n\n%{message}"
@@ -654,9 +663,7 @@ fa_IR:
       xaxis: "روز"
       yaxis: "تعداد بازدید ها"
     signups:
-      title: "کاربران جدید"
       xaxis: "روز"
-      yaxis: "تعداد کاربران جدید"
     profile_views:
       title: "بازدید‌های نمایه کاربر"
       xaxis: "روز"
@@ -694,7 +701,6 @@ fa_IR:
       xaxis: "روز"
       yaxis: "تعداد ایمیل‌ها"
     user_to_user_private_messages:
-      title: "کاربر به کاربر"
       xaxis: "روز"
       yaxis: "تعداد پیام‌ها"
     system_private_messages:
@@ -741,7 +747,6 @@ fa_IR:
       xaxis: "روز"
       yaxis: "نمایش صفحات به خزندگان وب"
     page_view_total_reqs:
-      title: "مجموع"
       xaxis: "روز"
       yaxis: "مجموع بازدید صفحات"
     page_view_logged_in_mobile_reqs:
@@ -805,27 +810,23 @@ fa_IR:
     failing_emails_warning: '%{num_failed_jobs} ایمیل زمانبندی شده نا‌موفق وجود دارد. فایل app.yml  را بررسی کنید و مطمئن شوید که تنظیمات سرور ایمیل درست است.  <a href="/sidekiq/retries" target="_blank"> نمایش زمابندی‌های ناموفق Sidekiq </a>.'
     subfolder_ends_in_slash: "تنظیمات زیرپوشه نادرست است، مقدار DISCOURSE_RELATIVE_URL_ROOT با نویسه‌ی slash تمام می‌شود."
     email_polling_errored_recently:
-      other: "رای‌گیری ایمیلی %{count} خطا در 24 ساعت گذشته ایجاد کرده. <a href='/logs' target='_blank'>گزارشات</a> را ببینید."
-    missing_mailgun_api_key: "سرور تنظیم شده که با mailgun ایمیل ارسال کند ولی شما کلید API را برای تایید پیام وب‌هوک تنظیم نکردید."
+      one: رای‌گیری ایمیلی %{count} خطا در 24 ساعت گذشته ایجاد کرده. <a href='/logs' target='_blank'>گزارشات</a> را ببینید.
+      other: رای‌گیری ایمیلی %{count} خطا در 24 ساعت گذشته ایجاد کرده. <a href='/logs' target='_blank'>گزارشات</a> را ببینید.
     bad_favicon_url: "favicon نمی‌تواند بارگذاری شود. مقدار favicon_url را در <a href='/admin/site_settings'>تنظیمات سایت</a> بررسی کنید."
     poll_pop3_timeout: "اتصال به سرور POP3 انجام نشد. ایمیل‌های ورودی ممکن است دریافت نشوند. لطفا  <a href='/admin/site_settings/category/email'>تنظیمات POP3 </a>و فراهم کننده خدمات را بررسی کنید."
     poll_pop3_auth_error: "اتصال به سرور POP3 ناموفق بود، خطای اعتبار سنجی. لطفا <a href='/admin/site_settings/category/email'>تنظیمات POP3</a> را بررسی کنید."
   site_settings:
     censored_words: "کلماتی که به صورت خودکار جایگزین می شوند با  &#9632;&#9632;&#9632;&#9632;"
-    censored_pattern: "الگوی Regex به صورت خودکار با &#9632;&#9632;&#9632;&#9632; جا به جا می‌شود."
     delete_old_hidden_posts: "پاک کردن خودکار تمام نوشته‌هایی که بیش از 30 روز بصورت پنهان باقی می‌مانند. "
-    default_locale: "زبان پیشفرض برای دیسکورس  (ISO 639-1 کد)"
     allow_user_locale: "اجازه انتخاب زبان به کاربران داده شود."
     set_locale_from_accept_language_header: "تنظیم زبان برای رابط کاربری کاربران ناشناس که از هدر مرورگر دریافت می‌شود. (تجربی، با کش ناشناس کار نمی‌کند)"
     min_post_length: "حداقل طول مجاز نوشته به نویسه"
     min_first_post_length: "حداقل طول نوشته به نویسه (topic body)"
-    min_private_message_post_length: "حداقل طول نوشته به نویسه در پیام‌ها "
     max_post_length: "حداکثر طول نوشته به نویسه"
     topic_featured_link_enabled: "فعال بودن ارسال لینک در موضوعات"
     show_topic_featured_link_in_digest: "نمایش پیوند‌های برجسته موضوع در ایمیل خلاصه"
     min_topic_title_length: "حداقل طول عنوان نوشته به نویسه"
     max_topic_title_length: "حداکثر طول مجاز عنوان موضوع به نویسه"
-    min_private_message_title_length: "حداقل طول مجاز عنوان برای پیام به نویسه"
     min_search_term_length: "حداقل طول واژه جستجوی معتبر به نویسه"
     search_tokenize_chinese_japanese_korean: "اجبار جستجو برای tokenize کردن چینی/ژاپنی/کره‌ای حتی در سایت هایی که از این زبان‌ها استفاده نمی‌کنند"
     search_prefer_recent_posts: "اگر سرعت جستجوی انجمن پایین است، این گزینه آخرین نوشته‌ها را در ابتدا ایندکس گذاری می‌کند."
@@ -874,7 +875,6 @@ fa_IR:
     summary_likes_required: "حداقل پسندها در این جستار قبل از اینکه \" خلاصه این موضوع\" فعال شود"
     summary_percent_filter: "وقتی کاربر بر روی ' خلاصه این موضوع' کلیک کرد٬‌ % بهترین نوشته‌ها را نشان بده"
     summary_max_results: "حداکثر نوشته‌های برگردانده شد با \" خلاصه این موضوع\""
-    enable_private_messages: "اجازه ارسال پیام به کاربران سطح اعتماد 1 (قابل تنظیم با حداقل سطح اعتماد برای ارسال پیام). توجه کنید که همکاران در هر شرایطی می‌توانند پیام ارسال کنند."
     enable_long_polling: "message bus استفاده شده برای آگاه سازی می تواند برای رای گیری طولانی استفاده شود. "
     long_polling_base_url: " URL پایه استفاده شده برای رای گیری طولانی (وقتی CDN خدمت محتوای پویا می دهد٬ از تنظیم بودن منشا این کشش مطمئن شوید) برای نمونه : http://origin.site.com"
     long_polling_interval: "مدت زمانی که سرور قبل پاسخ دادن  به مشتری‌ها  باید صبر کند، وقتی در آن‌جا داده ای برای ارسال نیست (فقط کاربران وارد شده)"
@@ -928,7 +928,6 @@ fa_IR:
     version_checks: "Discourse Hub را پینگ کن برای  نسخه بروزرسانی و پیام نسخه جدید را صفحه آمار ادمین نشان بده."
     new_version_emails: "ارسال ایمیل به contact_email address وقتی نسخه جدید  Discourse موجود است. "
     invite_expiry_days: "کلید دعوتنامه فراخوان برای چه مدت اعتبار دارد، واحد روز"
-    invite_passthrough_hours: "کاربر برای چه مدت می تواند از کلید فراخوان استفاده شده برای ورود به سیستم استفاده کند، واحد ساعت"
     invite_only: "ثبت‌نام عمومی غیر‌فعال است، تمام کاربران جدید باید توسط کارمندان دعوت شوند."
     login_required: "برای خواندن محتوا در سایت نیاز به تصدیق است، دسترسی  ناشناس رد شود."
     min_username_length: "حداقل طول نام کاربری به نویسه. توجه: اگر کاربری در حال حاضر نام کاربری کوتاه تر از این مقدار داشته باشد سایت به مشکل برمی‌خورد."
@@ -950,7 +949,6 @@ fa_IR:
     sso_overrides_avatar: "لغو آواتار کاربر با آواتار سایت خارجی از محموله SSO. اگر فعال باشد، غیر فعال کردن allow_uploaded_avatars به شدت توصیه می شود"
     sso_not_approved_url: "حساب‌های تأیید نشده SSO را به این URL بفرست"
     sso_allows_all_return_paths: "از دامنه برای return_paths که توسط SSO فراهم شده جلوگیری نکن (به صورت پیشفرض مسیر برگشتی باید در همین سایت باشد)"
-    enable_local_logins: "نام‌کاربری و رمز ورود را بر اسای حساب‌های کاربری فعال کن. (نکته: این باید برای کارکرد دعوتنامه‌ها فعال باشد)"
     allow_new_registrations: "به کاربر جدید اجازه ثبت‌نام بده. لغو این انتخاب برای جلوگیری از ساخت حساب‌کاربری جدید. "
     enable_signup_cta: "نمایش اطلاعیه برای کاربران ناشناسی که سعی در ایجاد حساب کاربری دارند."
     enable_yahoo_logins: "احراز هویت یاهو را فعال کن "
@@ -958,15 +956,12 @@ fa_IR:
     google_oauth2_client_id: "Client ID  برای نرم افزار گوگل شما. "
     google_oauth2_client_secret: "Client secret برای بر نرم افزار گوگل شما. "
     enable_twitter_logins: "احراز هویت تیوتر را فعال کن، به twitter_consumer_key و  twitter_consumer_secret‌ نیاز است "
-    twitter_consumer_key: "Consumer key برای احراز هویت در توییتر، که در http://dev.twitter.com ایجاد شده"
-    twitter_consumer_secret: "Consumer secret کننده برای احراز هویت توییتر،‌ که در http://dev.twitter.com ایجاد شده"
     enable_instagram_logins: "فعالسازی ورود با اینستاگرام، نیازمند \ninstagram_consumer_key and instagram_consumer_secret"
     instagram_consumer_key: "Consumer key اینستاگرام"
     instagram_consumer_secret: "Consumer secret اینستاگرام"
     enable_facebook_logins: "فعال کردن احراز هویت فیس‌بوک به facebook_app_id و facebook_app_secret  نیار دارد"
     facebook_app_id: "App ID برای احراز هویت فیس بوک٬ که در  https://developers.facebook.com/apps ایجاد شده"
     facebook_app_secret: "App secret برای احراز هویت فیس بوک، که در https://developers.facebook.com/apps ثبت شده"
-    facebook_request_extra_profile_details: "درخواست دربارهمن، موقعیت من و سایت من از فیسبوک‌ (نیازمند تایید برنامه شما توسط فیسبوک است)"
     enable_github_logins: "احراز هویت در Github را فعال کن، نیاز به github_client_id  و github_client_secret"
     github_client_id: "Client ID برای احراز هویت در Github ٬ که در https://github.com/settings/applications ایجاد شده"
     github_client_secret: "Client secret را برای احراز هویت Github@که در https://github.com/settings/applications ایجاد شده"
@@ -974,7 +969,6 @@ fa_IR:
     allow_restore: "اجازه بازیابی بده، که می‌تواند تمام اطلاعات سایت را جایگزین کند! نادرست را رها کن مگر اینکه قصد بازیابی نسخه پشتیبان را داری "
     maximum_backups: "حداکثر تعداد پشتیبان برای نگه داری بر روی دیسک. نسخه های پشتیبان قدیمی بطور خودکار پاک شده است"
     automatic_backups_enabled: "فعالسازی پشتیبان‌گیری خودکار در بازه زمانی مشخص"
-    backup_frequency: "هر چند وقت یک بار نسخه پشتیبان میگیریم، به روز."
     enable_s3_backups: "نسخه پشتیبان را وقتی کامل شد به S3 بارگزاری کن. مهم: نیازمند اطلاعات ورود صحیح به S3 در تنظیمات فایل می‌باشد."
     s3_backup_bucket: "میزبان راه‌دور برای نگهداری از نسخه‌های پشتیبان. اخطار: مطمئن شوید که میزبان خصوصی است.  "
     s3_disable_cleanup: "غیر‌فعال‌سازی حذف نسخه پشتیبان از S3 وقتی در هاست حذف می‌شود."
@@ -996,7 +990,6 @@ fa_IR:
     max_bookmarks_per_day: "حداکثر تعداد نشانک هر کاربر در روز"
     max_edits_per_day: "حداکثر تعداد ویرایش هر کاربر در روز"
     max_topics_per_day: "حداکثر تعداد موضوعاتی که هر کاربر در روز می توانند ایجاد کند"
-    max_private_messages_per_day: "حداکثر تعداد پیام هایی که هر کاربر در روز می توانند ایجاد کند"
     max_invites_per_day: "حداکثر تعداد دعوت‌نامه‌هایی که هر کاربر در روز می توانند ارسال کند"
     max_topic_invitations_per_day: "حداکثر تعداد دعوت‌‌نامه‌هایی که یک کاربر می‌تواند برای عناوین در یک روز ارسال کند."
     max_logins_per_ip_per_hour: "حداکثر تعداد ورود به ازای هر آیپی در ساعت"
@@ -1011,7 +1004,6 @@ fa_IR:
     clean_orphan_uploads_grace_period_hours: "دوره معافیت (واحد ساعت) قبل از اینکه بارگذاری‌های بدون ریشه پاک شوند. "
     purge_deleted_uploads_grace_period_days: "دوره معافیت (واحد روز) قبل از اینکه بارگذاری‌های پاک شده حذف شوند. "
     enable_s3_uploads: "مکان بارگزاری ها در فضای Amazon S3. مهم: به اطلاعات ورود S3 صحیح معتبر نیاز است (a3 access key id و s3 secret key)"
-    s3_use_iam_profile: 'از نقش AWS EC2 IAM  برای بازیابی کلید‌ها استفاده کن. نکته: بکارگیری این مورد موجب باطل کردن  تنظیمات "s3 access key id"  و "s3 secret access key" می شود. '
     s3_upload_bucket: "نام میزبان Amazon S3 که فایل‌ها در آنجا بارگذاری می شود. اخطار: باید حروف کوچک باشد٬ بدون دوره٬‌ بدون زیرخط"
     s3_access_key_id: "ID کلید درسترسی Amazon S3 که برای بارگذاری عکس‌ها استفاده می‌شود."
     s3_secret_access_key: "کلید درسترسی مخفی Amazon S3 که برای بارگذاری عکس‌ها استفاده می‌شود."
@@ -1057,7 +1049,6 @@ fa_IR:
     min_trust_to_edit_wiki_post: "حداقل سطح اعتماد برای ویرایش نوشته ای که به‌عنوان دانشنامه نشانه‌گزاری شده است. "
     min_trust_to_edit_post: "حداقل سطح اعتماد برای ویرایش نوشته مورد نیاز است."
     min_trust_to_allow_self_wiki: "حداقل سطح اعتماد برای تبدیل نوشته‌ی خود به دانش‌نامه نیاز است."
-    min_trust_to_send_messages: "حداقل سطح اعتماد برای ایجاد پیام خصوصی جدید نیاز است."
     newuser_max_links: "کاربر جدید می تواند چند پیوند به نوشته اضافه کند. "
     newuser_max_images: "کاربر جدید می تواند چند عکس به نوشته اضافه کند."
     newuser_max_attachments: "کاربر جدید می تواند چند پیوست اضافه کند به پست. "
@@ -1067,7 +1058,6 @@ fa_IR:
     max_users_notified_per_group_mention: "حداکثر تعداد کاربرانی که اگر به گروه اشاره شود، اعلان دریافت می‌کنند (اگر آستانه براورده شود هیچ اعلانی ارسال نخواهد شد)"
     create_thumbnails: "ایجاد تصویر بند‌انگشتی و کادر تصاویر کوچک عکس‌ها را درست که برای جا شدن در نوشته بسیار بزگ هستند"
     email_time_window_mins: "قبل از ارسال هرگونه آگاهی‌سازی از طریق ایمیل (n) دقیقه صبر کن، برای اینکه به کاربران فرصت بدهید تا بتوانند نوشته‌های خود را ویرایش و نهایی کنند. "
-    private_email_time_window_seconds: "قبل از ارسال ایمیل آگاه‌سازی خصوصی، (n) ثانیه صبر کنید تا به کاربر اجازه ویرایش پیام نهایی خود را بدهید."
     email_posts_context: "چند پاسخ قبلی تا شامل متن خلاصه در ایمیل های آگاهی سازی شود. "
     flush_timings_secs: "هر چند وقت یک بار  اطلاعات زمان‌بندی سرور را خالی کنیم، واحد ثانیه"
     title_max_word_length: "حداکثر طول مجاز کلمه٬ در نویسه، در عنوان موضوع."
@@ -1120,7 +1110,6 @@ fa_IR:
     reply_by_email_enabled: "Enable replying to topics via email."
     reply_by_email_address: "نمونه برای پاسخ به ایمیل، آدرس‌های ایمیل آمده برای مثال: %{reply_key}@reply.example.com یا replies+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "لیست قالب‌های مشابه برای پاسخ به ایمیل‌های دریافتی. مثال:\n%{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
-    incoming_email_prefer_html: "استفاده از HTML به جای متن در ایمیل‌های ورودی."
     disable_emails: "به discourse اجازه ارسال هیچ گونه ایمیلی را نده"
     strip_images_from_short_emails: "محروم کردن تصاویر از ایمیل‌هایی با حجم کمتر از 2800 بایت"
     short_email_length: "طول ایمیل کوتاه به بایت"
@@ -1218,7 +1207,6 @@ fa_IR:
     allowed_href_schemes: "طرح‌ها در لینک‌های http و https مجازند"
     embed_post_limit: "حداکثر تعداد نوشته‌هایی که می‌توانید جا‌سازی کنید. "
     embed_username_required: "نام‌کاربری برای ایجاد تاپیک مورد نیاز است."
-    notify_about_flags_after: "اگر پرچم‌ها بعد از چند ساعت حل نشدند، یک پیام خصوصی به کارمندان ارسال کن. 0 برای غیرفعال"
     show_create_topics_notice: "اگر سایت کمتر از 5 موضوع عمومی دارد٬ مدیران اطلاع بده تا موضوعات بیشتری بسازند."
     delete_drafts_older_than_n_days: پیش‌نویس‌های قدیمی‌تر از (n) روز را حذف کن
     bootstrap_mode_min_users: "حداقل تعداد کاربرانی که نیاز است تا حالت خود‌راه‌انداز غیر‌فعال شود (0 برای غیر‌فعال)"
@@ -1230,13 +1218,11 @@ fa_IR:
     approve_post_count: "تعداد نوشته‌های کاربر جدید که باید تایید شود."
     approve_unless_trust_level: "نوشته‌ها برای کاربران پایین تر از این سطح اعتماد نیاز به تایید دارد. "
     approve_new_topics_unless_trust_level: "موضوعات جدید برای کاربرانی با کمتر از این سطح اعتماد باید تایید شود"
-    notify_about_queued_posts_after: "در صورتی که نوشته‌هایی بیش از این مقدار ساعت منتظر تایید باشند یک ایمیل به contact_email ارسال می‌شود. تنظیم به 0 برای غیرفعال‌سازی ایمیل ها."
     auto_close_messages_post_count: "حداکثر تعداد نوشته‌های مجاز برای پیام‌خصوصی قبل از اینکه به صورت خودکار بسته شود (0 برای غیر فعال)"
     auto_close_topics_post_count: "حداکثر تعداد نوشته‌های مجاز برای موضوع قبل از اینکه به صورت خودکار بسته شود (0 برای غیر فعال)"
     code_formatting_style: "کد دکمه در composer به صورت پیشفرض این حالت خواهد بود"
     default_email_digest_frequency: "به صورت پیشفرض هر چند وقت یک بار ایمیل خلاصه دریافت شود."
     default_include_tl0_in_digests: "قرار دادن نوشته‌های کاربران جدید در خلاصه ایمیل به صورت پیشفرض. کاربران می‌توانند این تنظیمات را از طریق تنظیمات شخصیشان ویرایش کنند."
-    default_email_private_messages: "به صورت پیشفرض وقتی پیامی ارسال می‌شود به او ایمیل بفرست."
     default_email_direct: "ارسال ایمیل وقتی نقل‌قول، پاسخ، اشاره یا دعوت دریافت می‌کند"
     default_email_mailing_list_mode: "ارسال ایمیل برای نوشته‌های جدید"
     default_email_mailing_list_mode_frequency: "کاربرانی که ارسال ایمیل را  فعال کنند، در این بازه زمانی ایمیل دریافت می‌کنند."
@@ -1272,7 +1258,6 @@ fa_IR:
     max_tags_in_filter_list: "حداکثر تعداد برچسب‌ها برای نمایش در منو کشویی. بیشترین استفاده شده ها نمایش داده می‌شوند."
     tags_sort_alphabetically: "نمایش برچسب‌ها به ترتیب الفبا. پیشفرض نمایش به ترتیب محبوبیت است."
     tag_style: "سبک بصری نشان برچسب‌ها."
-    staff_tags: "لیست برچسب‌هایی که فقط توسط کارمندان قابل استفاده هستند."
     min_trust_level_to_tag_topics: "حداقل سطح اعتماد مورد نیاز برای برچسب زدن به موضوع"
     suppress_overlapping_tags_in_list: "اگر برچسب با عنوان موضوع دقیقا یکی بودند، برچسب را نشان نده."
     remove_muted_tags_from_latest: "موضوعاتی که برچسب غیر‌فعال دارند در قسمت آخرین موضوعات نمایش نده"
@@ -1325,15 +1310,18 @@ fa_IR:
     not_seen_in_a_month: "خوش آمدید دوباره!‌ شما را برای مدت طولانی ندیده‌ایم. اینها بهترین موضعات از وقتی که شما نبودید، هستند."
   merge_posts:
     edit_reason:
-      other: "%{count} نوشته ترکیب شده توسط %{username}"
+      one: '%{count} نوشته ترکیب شده توسط %{username}'
+      other: '%{count} نوشته ترکیب شده توسط %{username}'
     errors:
       different_topics: "نوشته‌ها به موضوعات مختلفی تعلق دارند و امکان ترکیب آن‌ها وجود ندارد."
       different_users: "نوشته‌ها به کاربران مختلفی تعلق دارند و امکان ترکیب آن‌ها وجود ندارد."
   move_posts:
     new_topic_moderator_post:
-      other: "%{count} نوشته تبدیل به یک موضوع جدید شدند: %{topic_link}"
+      one: '%{count} نوشته تبدیل به یک موضوع جدید شدند: %{topic_link}'
+      other: '%{count} نوشته تبدیل به یک موضوع جدید شدند: %{topic_link}'
     existing_topic_moderator_post:
-      other: "%{count} نوشته با یک موضوع موجود ترکیب شدند: %{topic_link}"
+      one: '%{count} نوشته با یک موضوع موجود ترکیب شدند: %{topic_link}'
+      other: '%{count} نوشته با یک موضوع موجود ترکیب شدند: %{topic_link}'
   change_owner:
     post_revision_text: "حق مالکیت از کاربر {old_user}% به کاربر {new_user}% منتقل شد"
     deleted_user: "یک کاربر حذف شده"
@@ -1343,33 +1331,47 @@ fa_IR:
     closed_enabled: "این موضوع در حال حاضر بسته شده است. پاسخ جدید دیگر مجاز نیست."
     closed_disabled: "موضوع در حال حاضر باز است. پاسخ‌های جدید اجازه‌ی ثبت دارند."
     autoclosed_message_max_posts:
-      other: "این پیام بعد از رسیدن به حداکثر تعداد پاسخ‌ها %{count} بسته شد."
+      one: این پیام بعد از رسیدن به حداکثر تعداد پاسخ‌ها %{count} بسته شد.
+      other: این پیام بعد از رسیدن به حداکثر تعداد پاسخ‌ها %{count} بسته شد.
     autoclosed_topic_max_posts:
-      other: "این موضوع بعد از رسیدن به حداکثر تعداد پاسخ‌ها %{count} بسته شد."
+      one: این موضوع بعد از رسیدن به حداکثر تعداد پاسخ‌ها %{count} بسته شد.
+      other: این موضوع بعد از رسیدن به حداکثر تعداد پاسخ‌ها %{count} بسته شد.
     autoclosed_enabled_days:
-      other: "این موضوع به صورت خود کار بعد از %{count} روز بسته شد. پاسخ جدید دیگر مجاز نیست."
+      one: این موضوع به صورت خود کار بعد از %{count} روز بسته شد. پاسخ جدید دیگر مجاز نیست.
+      other: این موضوع به صورت خود کار بعد از %{count} روز بسته شد. پاسخ جدید دیگر مجاز نیست.
     autoclosed_enabled_hours:
-      other: "این موضوع به صورت خود کار بعد از %{count} ساعت بسته شد. پاسخ جدید دیگر مجاز نیست."
+      one: این موضوع به صورت خود کار بعد از %{count} ساعت بسته شد. پاسخ جدید دیگر مجاز نیست.
+      other: این موضوع به صورت خود کار بعد از %{count} ساعت بسته شد. پاسخ جدید دیگر مجاز نیست.
     autoclosed_enabled_minutes:
-      other: "این موضوع به صورت خود کار بعد از %{count} دقیقه بسته شد. پاسخ جدید دیگر مجاز نیست."
+      one: این موضوع به صورت خود کار بعد از %{count} دقیقه بسته شد. پاسخ جدید دیگر مجاز نیست.
+      other: این موضوع به صورت خود کار بعد از %{count} دقیقه بسته شد. پاسخ جدید دیگر مجاز نیست.
     autoclosed_enabled_lastpost_days:
-      other: "این موضوع به صورت خود کار بعد از %{count} روز بعد از آخرین پاسخ بسته شد. پاسخ جدید دیگر مجاز نیست."
+      one: این موضوع به صورت خود کار بعد از %{count} روز بعد از آخرین پاسخ بسته شد. پاسخ جدید دیگر مجاز نیست.
+      other: این موضوع به صورت خود کار بعد از %{count} روز بعد از آخرین پاسخ بسته شد. پاسخ جدید دیگر مجاز نیست.
     autoclosed_enabled_lastpost_hours:
-      other: "این موضوع به صورت خود کار بعد از %{count} ساعت بعد از آخرین پاسخ بسته شد. پاسخ جدید دیگر مجاز نیست."
+      one: این موضوع به صورت خود کار بعد از %{count} ساعت بعد از آخرین پاسخ بسته شد. پاسخ جدید دیگر مجاز نیست.
+      other: این موضوع به صورت خود کار بعد از %{count} ساعت بعد از آخرین پاسخ بسته شد. پاسخ جدید دیگر مجاز نیست.
     autoclosed_enabled_lastpost_minutes:
-      other: "این موضوع به صورت خود کار بعد از %{count} دقیقه بعد از آخرین پاسخ بسته شد. پاسخ جدید دیگر مجاز نیست."
+      one: این موضوع به صورت خود کار بعد از %{count} دقیقه بعد از آخرین پاسخ بسته شد. پاسخ جدید دیگر مجاز نیست.
+      other: این موضوع به صورت خود کار بعد از %{count} دقیقه بعد از آخرین پاسخ بسته شد. پاسخ جدید دیگر مجاز نیست.
     autoclosed_disabled_days:
-      other: "این موضوع بعد از %{count} روز به صورت خودکار باز شد."
+      one: این موضوع بعد از %{count} روز به صورت خودکار باز شد.
+      other: این موضوع بعد از %{count} روز به صورت خودکار باز شد.
     autoclosed_disabled_hours:
-      other: "این موضوع بعد از %{count} ساعت به صورت خودکار باز شد."
+      one: این موضوع بعد از %{count} ساعت به صورت خودکار باز شد.
+      other: این موضوع بعد از %{count} ساعت به صورت خودکار باز شد.
     autoclosed_disabled_minutes:
-      other: "این موضوع بعد از %{count} دقیقه به صورت خودکار باز شد."
+      one: این موضوع بعد از %{count} دقیقه به صورت خودکار باز شد.
+      other: این موضوع بعد از %{count} دقیقه به صورت خودکار باز شد.
     autoclosed_disabled_lastpost_days:
-      other: "این موضوع %{count} روز بعد از آخرین پاسخ به صورت خودکار باز شد."
+      one: این موضوع %{count} روز بعد از آخرین پاسخ به صورت خودکار باز شد.
+      other: این موضوع %{count} روز بعد از آخرین پاسخ به صورت خودکار باز شد.
     autoclosed_disabled_lastpost_hours:
-      other: "این موضوع %{count} ساعت بعد از آخرین پاسخ به صورت خودکار باز شد."
+      one: این موضوع %{count} ساعت بعد از آخرین پاسخ به صورت خودکار باز شد.
+      other: این موضوع %{count} ساعت بعد از آخرین پاسخ به صورت خودکار باز شد.
     autoclosed_disabled_lastpost_minutes:
-      other: "این موضوع %{count} دقیقه بعد از آخرین پاسخ به صورت خودکار باز شد."
+      one: این موضوع %{count} دقیقه بعد از آخرین پاسخ به صورت خودکار باز شد.
+      other: این موضوع %{count} دقیقه بعد از آخرین پاسخ به صورت خودکار باز شد.
     autoclosed_disabled: "این موضوع در حال حاضر باز است. پاسخ‌های جدید اجازه‌ی ثبت دارند."
     autoclosed_disabled_lastpost: "این موضوع در حال حاضر باز است. پاسخ‌های جدید اجازه‌ی ثبت دارند."
     pinned_enabled: "این موضوع الان سنجاق شد. این در بالای تمام دسته‌بندی‌ها نمایش داده خواهد شد تا زمانی که توسط مدیران از سنجاق خارج شود و یا کاربران برای خودشان از سنجاق خارج کنند. "
@@ -1429,9 +1431,11 @@ fa_IR:
       domain_not_allowed: "سایت نامعتبر است. دامنه‌های مجاز: %{domains}"
   flags_reminder:
     flags_were_submitted:
-      other: "پرچم‌ها %{count} ساعت پیش ثبت شدند. [لطفا بررسی کنید](/admin/flags)."
+      one: پرچم‌ها %{count} ساعت پیش ثبت شدند. [لطفا بررسی کنید](/admin/flags).
+      other: پرچم‌ها %{count} ساعت پیش ثبت شدند. [لطفا بررسی کنید](/admin/flags).
     subject_template:
-      other: "%{count} نشانه ها منتظر استفاده"
+      one: '%{count} نشانه ها منتظر استفاده'
+      other: '%{count} نشانه ها منتظر استفاده'
   unsubscribe_mailer:
     title: "لغو اشتراک نامه‌رسان"
     subject_template: "تایید کنید که دیگر نمی‌خواهید از %{site_title} ایمیل بروز‌رسانی دریافت کنید"
@@ -1483,7 +1487,6 @@ fa_IR:
   test_mailer:
     title: "تست نامه‌رسان"
     subject_template: "[%{email_prefix}] تست تحویل ایمیل"
-    text_body_template: "این یک فرم ایمیل تست است\n\n[**%{base_url}**][0]\n\n-\t-مطمئن- شوید که مقدار `notification email` از: را به درستی در تنظیمات سایت وارد کنید. **دامنه مشخص شده در “فرم” با ایمیل استفاده شده برای ارسال معتبر‌سازی می‌شود.**\n-\tاز نحوه نمایش سورس ایمیل در کلاینت ایمیل خود مطلع شوید، بنابراین می‌توانید سربرگ‌های  ایمیل را برای کار‌های مهم بررسی کنید. در جیمیل این گزینه “show original” در منو کشویی بالا سمت راست هر ایمیل است.\n-\t**مهم:** آیا ISP  شما از Reverse DNS وارد شده در ارتباط با دامنه و آیپی شما که با ایمیل ارسال می‌شود پشتیبانی می‌کند؟ بررسی رکورد [Reverse PTD][2] اگر ISP شما مقدار reverse DNS pointer را به درستی وارد نکند، ایمیل‌های شما به احتمال زیاد ارسال نمی‌شوند.\n-\tآیا [SPF record][8]  دامنه شما صحیح است؟ [بررسی SPF record][1]. توجه داشته باشید که TXT مقدار رسمی record type  برای SPF  است.\n-\t آیا [DKIM record][3] دامنه شما صحیح است؟ این گزینه ارسال شدن ایمیل را به شدت بهبود می‌بخشد. . [بررسی DKIM record][7]\n-\tاگر سرور ایمیل خود شخصی دارید، مطمئن شوید که آیپی سرور ایمیل شما [در هیچ لیست سیاهی نیستند][4]. همچنین تایید کنید که ارسال ایمیل با نام کامل میزبان در ارسال پیام HELO انجام می‌شود. اگر نشود، توسط سرور‌های ایمیل بسیاری رد می‌شود.\n-\tتوصیه می‌کنیم  **یک ایمیل تست به  [mail-tester.com][mt] بفرستید ** تا کارکرد تنظیمات بالا را تایید کنید.\n\n(راه *ساده* این است که یک حساب‌کاربری رایگان در  [SendGrid][sg], [SparkPost][sp], [Mailgun][mg] یا [Mailjet][mj] بسازید، که امکان ارسال ایمیل برای انجمن‌های کوچک را دارند. همچنان نیاز است که مقدار SPF و DKIM را در تنظیمات DNS خود وارد کنید!)\nامیدواریم تست ایمیل بدون مشکل باشد\n\nدوستان شما در [Discourse](http://www.discourse.org)\n[0]: %{base_url}\n[1]: http://www.kitterman.com/spf/validate.html\n[2]: http://mxtoolbox.com/ReverseLookup.aspx\n[3]: http://www.dkim.org/\n[4]: http://whatismyipaddress.com/blacklist-check\n[7]: https://www.mail-tester.com/spf-dkim-check\n[8]: http://www.openspf.org/SPF_Record_Syntax\n[sg]: https://goo.gl/r1WMF6\n[sp]: https://www.sparkpost.com/\n[mg]: http://www.mailgun.com/\n[mj]: https://www.mailjet.com/pricing\n[mt]: http://www.mail-tester.com/\n"
   new_version_mailer:
     title: "نسخه جدید نامه‌رسان"
     subject_template: "[%{email_prefix}] نسخه جدید Discourse موجود است"
@@ -1502,7 +1505,8 @@ fa_IR:
     deferred: "ممنون از اینکه به ما اطلاع دادید. ما بررسی می کنیم"
     deferred_and_deleted: "ممنون از اینکه به ما اطلاع دادید. ما نوشته را حذف کردیم."
   temporarily_closed_due_to_flags:
-    other: "این موضوع موقتا به دلیل دریافت تعداد زیادی پرچم به مدت %{count}  ساعت بسته می‌شود."
+    one: این موضوع موقتا به دلیل دریافت تعداد زیادی پرچم به مدت %{count}  ساعت بسته می‌شود.
+    other: این موضوع موقتا به دلیل دریافت تعداد زیادی پرچم به مدت %{count}  ساعت بسته می‌شود.
   system_messages:
     private_topic_title: "موضوع #%{id}"
     contents_hidden: "لطفا نوشته را برای نمایش محتویات ببینید"
@@ -1605,7 +1609,6 @@ fa_IR:
         ```
     csv_export_succeeded:
       title: "خروجی CSV موفق"
-      subject_template: "خارج کردن اطلاعات کامل شد"
       text_body_template: |
         خروجی اطلاعات موفقیت آمیز بود! :dvd:
 
@@ -1722,7 +1725,8 @@ fa_IR:
     pending_users_reminder:
       title: "یاداور کاربران در انتظار"
       subject_template:
-        other: "%{count} کاربران منتظر تایید"
+        one: '%{count} کاربران منتظر تایید'
+        other: '%{count} کاربران منتظر تایید'
       text_body_template: |
         تعدادی درخواست کاربران جدید عضو شده برای تایید (یا رد شدن) منتظر هستند. قبل از اینکه به انجمن دسترسی داشته باشند.
 
@@ -1745,7 +1749,8 @@ fa_IR:
     queued_posts_reminder:
       title: "یادآور نوشته‌های زمانبندی شده"
       subject_template:
-        other: "%{count} نوشته منتظر بررسی است"
+        one: '%{count} نوشته منتظر بررسی است'
+        other: '%{count} نوشته منتظر بررسی است'
   unsubscribe_link: |
     برای لغو اشتراک از این ایمیل‌ها،  [کلیک کنید](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |
@@ -1759,7 +1764,8 @@ fa_IR:
   user_notifications:
     previous_discussion: "پاسخ‌های قبلی"
     reached_limit:
-      other: "توجه کنید: ما حداکثر %{count} ایمیل در روز ارسال می‌کنیم. برای دیدن موارد ارسال نشده سایت را بررسی کنید. پ.ن: از شما برای محبوب بودنتان تشکر می‌کنیم!"
+      one: 'توجه کنید: ما حداکثر %{count} ایمیل در روز ارسال می‌کنیم. برای دیدن موارد ارسال نشده سایت را بررسی کنید. پ.ن: از شما برای محبوب بودنتان تشکر می‌کنیم!'
+      other: 'توجه کنید: ما حداکثر %{count} ایمیل در روز ارسال می‌کنیم. برای دیدن موارد ارسال نشده سایت را بررسی کنید. پ.ن: از شما برای محبوب بودنتان تشکر می‌کنیم!'
     in_reply_to: "در پاسخ به"
     unsubscribe:
       title: "لغو اشتراک"
@@ -1903,7 +1909,7 @@ fa_IR:
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
-        %{message}
+          %{message}
     account_suspended:
       title: "حساب کاربری معلق شد"
       subject_template: "[%{email_prefix}] حساب کاربری شما معلق شده است"
@@ -2005,21 +2011,6 @@ fa_IR:
     signup_after_approval:
       title: "ثبت نام بعد از تایید"
       subject_template: "شما در %{site_name} تایید شدید!"
-      text_body_template: |
-        به  %{site_name} خوش آمدید!
-
-        حساب کاربری شما در %{site_name} توسط همکاران تایید شده تسن.
-
-        برای فعالسازی حساب‌کاربری خود روی لینک زیر کلیک کنید:
-        %{base_url}/u/activate-account/%{email_token}
-
-        اگر لینک بالا قابل کلیک نیست، آن را در نوار‌ آدرس مرورگر اینترنتی خود کپی کنید.
-
-        %{new_user_tips}
-
-        ما  همیشه به  [رفتار اجتماعی متمدنانه](%{base_url}/guidelines) اعتقاد داریم.
-
-        از بودن در انجمن لذت ببرید!
     signup:
       title: "ثبت‌نام"
       subject_template: "[%{email_prefix}] حساب کاربری خود را تایید کنید."
@@ -2114,22 +2105,22 @@ fa_IR:
         این نشان را وقتی دریافت می‌کنید که برای بار اول یکی از نوشته‌هایتان را ویرایش کنید. در حالی که همیشه قادر به ویرایش خود نخواهید بود، ویرایش همیشه ایده خوبی است -- می‌توانید سطح نوشته‌های خود را ارتقا دهید، اشتباهات را رفع کنید، یا هرچیزی که در زمان ارسال نوشته فراموش کردید به آن اضافه کنید. ویرایش کنید تا نوشته‌هایتان بهتر شوند!
     basic_user:
       name: پایه‌ای
-      description: تمام عملکرد‌های ضرورع <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">اعطا شدند</a>
+      description: "تمام عملکرد‌های ضرورع <a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">اعطا شدند</a>"
       long_description: |
         این نشان را زمانی که به سطح اعتماد 1 برسید دریافت می‌کنید. از شما برای برای حضور و خواندن موضوعات برای یادگیری موضوعات مربوط به انجمن تشکر می‌کنیم. محدودیت‌های حساب کاربری شما برداشته شد; حالا به تمام توانایی‌های ضروری انجمن دسترسی دارید، مواردی مثل ارسال پیام شخصی، پرچم گذاری، ویرایش دانشنامه، و امکان ارسال چند تصویر و پیوند در نوشته.
     member:
       name: عضو
-      description: دعوت، پیام گروهی، پسند بیشتر <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">اعطا شد</a>
+      description: "دعوت، پیام گروهی، پسند بیشتر <a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">اعطا شد</a>"
       long_description: |
         این نشان را وقتی به سطح اعتماد 2 برسید، دریافت می‌کنید. با تشکر از شما برای شرکت در دوره‌های هفتگی برای پیوستن واقعی به انجمن ما. حالا می‌توانید از صفحه کاربری یا موضوعات جداگانه خود دعوتنامه بفرستید. گروه و پیام خصوصی ایجاد کنید، و پسند‌های روزانه بیشتری داشته باشید.
     regular:
       name: معمولی
-      description: 'تغییر دسته‌بندی، تغییر نام، پیوند‌های follow ، دانشنامه و پسند‌های بیشتر <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">اعطا شد</a> '
+      description: "تغییر دسته‌بندی، تغییر نام، پیوند‌های follow ، دانشنامه و پسند‌های بیشتر <a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">اعطا شد</a> "
       long_description: |
         این نشان را در زمان رسیدن به سطح اعتماد 3 دریافت می‌کنید. با تشکر از شما برای نظم شما و بودن در انجمن برای چند ماه. حالا یکی از بهترین خوانندگان، و یکی از عواملی هستید که باعث می‌شوید انجمن ما عالی باشد. حالا می‌توانید دسته‌بندی و نام موضوعات را تغییر دهید، از مزایای پرچم‌های قدرتمند هرزنامه استفاده کنید، به تالار خصوصی دسترسی پیدا کنید، و می‌توانید پسند‌های بیشتری در روز داشته باشید.
     leader:
       name: رهبر
-      description: ویرایش سراسری، سنجاق، بستن، آرشیو کردن، جدا سازی و داغام و پسند‌های بیشتر <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">اعطا شد</a>
+      description: "ویرایش سراسری، سنجاق، بستن، آرشیو کردن، جدا سازی و داغام و پسند‌های بیشتر <a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">اعطا شد</a>"
       long_description: |
         این نشان را زمانی دریافت می‌کنید که به سطح اعتماد 4 برسید، حالا شما یک راهبر برای این انجمن هستید که توسط همکاران انتخاب شده، و می‌توانید یک نمونه مثبت در حرف و عمل برای سایر اعضای انجمن باشید. شما می‌توانید تمام نوشته‌ها را ویرایش کنید،‌ موارد مدیریتی متداول موضوعات را بر عهده بگیرید، مواردی مثل سنجاق کردن، بستن، خروج از فهرست، آرشیو، جداسازی، ادغام، و می‌توانید هزاران پسند در روز داشته باشید.
     welcome:
@@ -2139,6 +2130,7 @@ fa_IR:
         این نشان را وقتی که اولین پسند را دریافت کنید به شما اعطا می‌شود. تبریک، نوشته‌ای ارسال کردید که اعضای انجمن به آن علاقه نشان دادند، باحال، یا مفید بود!
     autobiographer:
       name: نویسنده شرح‌حال
+      description: اطلاعات <a href="/my/preferences">صفحه شخصی</a>  خود را تکمیل کرده
     anniversary:
       name: سالگرد
       description: برای یک سال کاربر فعال بوده، حداقل یک نوشته دارد.
@@ -2190,20 +2182,18 @@ fa_IR:
       long_description: |
         این نشان زمانی اعطا می‌شود که یک لینک را به اشتراک بگذارید و 1000 کلیک دریافت کند. وای!‌ شما یک بحث جالب را به حضار زیادی ترویج کردید، شما کمک بزرگ  به رشد انجمن کردید!
     first_like:
-      name: اولین پسندیدن
+      name: اولین پسند
       description: یک پست را پسندیده است
       long_description: |
         این نشان زمانی اعطا می‌شود که برای بار اول یک نوشته را با گزینه :heart: بپسندید. پسندیدن نوشته‌ها یک راه عالی برای ابراز علاقه شما به نوشته‌های اعضاست که بدانند نوشته‌هایشان جالب، مفید، باحال، یا خنده دار است. علاقه‌تان را به اشتراک بگذارید!
     first_flag:
-      name: اولین نشان
-      description: اولین نوشته را نشانه‌گذاری کرد
+      name: اولین پرچم
+      description: یک نوشته را پرچم گذاری کرده
       long_description: |
         این نشان زمانی اعطا می‌شود که برای بار اول یک نوشته را پرچم گذاری کنید. پرچم گذاری راهی است برای تمیز نگه داشتن انجمن، جای روشنی برای همه. اگر فکر می‌کنید نوشته‌ای به هر دلیلی نیاز به توجه مدیریت دارد لطفا از پرچم گذاری دریغ نکنید. می‌توانید برای ارسال <b>پیام خصوصی</b> هم پرچم بزنید تا اعضا متوجه ایراد در نوشته‌هایشان شوند. اگر مشکلی میبینید، :flag_black: پرچم‌گذاری کنید!
     promoter:
       name: ترویج کننده
       description: 1 کاربر دعوت کرده
-      long_description: |
-        این نشان زمانی اعطا می‌شود که فردی را با دکمه دعوت در صفحه کاربری خود، به انجمن دعوت کنید، یا از گزینه دعوت پایین هر موضوع استفاده کنید تا دوستانتان را به موضوع خاصیکه ممکن است به آن علاقه‌مند باشند دعوت کنید، این راه عالی‌ای برای معرفی انجمن ما به افراد جدید است، بسیار ممنونیم!
     campaigner:
       name: سرباز کهنه‌کار
       description: 3 کاربر معمولی دعوت کرده
@@ -2220,7 +2210,7 @@ fa_IR:
       long_description: |
         این نشان زمانی اعطا می‌شود که یک پیوند پاسخ یا موضوع را با دکمه اشتراک گذاری، به اشتراک بگذارید. به اشتراک گذاشتن پیوند‌ها یک راه علی برای نمایش دادن موضوعات جالب با سایر مردم جهان و رشد انجمتان است!
     first_link:
-      name: اولین پیوند
+      name: اولین لینک
       description: لینکی به موضوع دیگر قرار داده
       long_description: |
         این نشان زمانی اعطا می‌شود که برای بار اول پیوندی به موضوع دیگر اضافه کنید. پیوند به موضوعات به خوانندگان موضوع شما کمک می‌کند گفتگو‌های جالب مرتبط را با نمایش اتصال بین موضوعات، پیدا کنند. با آزادی پیوند بگذارید!
@@ -2231,6 +2221,7 @@ fa_IR:
         این نشان زمانی اعطا می‌شود که برای بار اول یک نوشته را  در پاسخ خود نقل‌قول کنید. نقل‌قول بخش‌های مربوطه کمک می‌کند که بحث‌های موضوع به هم متصل شوند. بهترین راه برای نقل قول انتخاب متن در نوشته و کلیک روی دکمه پاسخ است. سخاوتمندانه نقل‌قول کنید!
     read_guidelines:
       name: خواندن دستورالعمل‌ها
+      description: " <a href=\"/guidelines\">دستورالعمل های انجمن</a> را خوانده"
     reader:
       name: اهل مطالعه
       description: همه‌ی پاسخ‌های یک موضوع با ۱۰۰ پاسخ را مطالعه کرده.
@@ -2247,18 +2238,18 @@ fa_IR:
       long_description: |
         این نشان زمانی اعطا می‌شود که یک پیوند با 300 کلیک به اشتراک بگذارید. با تشکر از شما بابت لینک شگفت‌انگیزی که قرار دادید که باعث جلو رفتن بحث و روشن شدن گفتگو شد!
     famous_link:
-      name: پیوند معروف
+      name: پیوند برجسته
       description: یک پیوند خروجی با 1000 کلیک ارسال کرده
       long_description: |
         این نشان زمانی اعطا می‌شود که یک پیوند با 1000 کلیک به اشتراک بگذارید. وای! شما یک لینک قرار دادید که به طور قابل ملاحظه‌ای سطح گفتگو را با اضافه کردن  جزئیات ضروری، زمینه و اطلاعات بالا برد. عالی بود!
     appreciated:
-      name: استقبال می‌نماید
-      description: 20 پست 1 بار پسندیده شده دارد.
+      name: تقدیر شده
+      description: ۱ پسند در ۲۰ پست دریافت کرده
       long_description: |
         این نشان زمانی اعطا می‌شود که حداقل یک پسند در 20 نوشته مختلف خود دریافت کنید. این انجمن از کمک‌های شما به گفتگو ها لذت می‌برد!
     respected:
       name: محترم
-      description: 100 پست 2 بار پسندیده شده دارد.
+      description: ۲ پسند در ۱۰۰ پست دریافت کرده
       long_description: |
         این نشان زمانی اعطا می‌شود که حداقل 2 پسند در 100 نوشته مختلف داشته باشید. انجمن در حال بزرگ شدن و احترام به تمام کمک‌های شما به گفتگو‌ها است.
     admired:
@@ -2267,17 +2258,17 @@ fa_IR:
       long_description: |
         این نشان را در زمانی که حداقل 5 پسند در 300 نوشته مختلف داشته باشید، دریافت می‌کنید. انجمن همکاری مکرر و کمک‌های باکیفیت شما در گفتگو‌ها را تحسین می‌کند.
     out_of_love:
-      name: نبض احساس
+      name: مهربان
       description: در یک روز 50 نوشته را پسندیده است.
       long_description: |
         این نشان را در زمانی دریافت می‌کنید که تمام 50 پسند روزانه خود را استفاده کنید. به خاطر داشته باشید که  برای پسندیدن نوشته‌هایی که از آن لذت بردید و تشویق و قدردانی از اعضای جامعه همکار برای ایجاد بحث‌های بهتر در‌آینده،‌ زمانی را اختصاص دهید.
     higher_love:
-      name: یکی هست
+      name: مهرورز
       description: در 5 روز، روزانه 50 نوشته را پسندیده است.
       long_description: |
         این مدال وقتی به شما تعلق می‌گیرد که برای 5 روز متوالی روزانه 50 بار نوشته دیگران را بپسندید. با تشکر از شما برای تشویق بهترین گفتگو‌ها!
     crazy_in_love:
-      name: نگران منی
+      name: الهه‌ی مهر
       description: در 20 روز، روزانه 50 نوشته را پسندیده است.
       long_description: |
         این مدال وقتی به شما تعلق می‌گیرد که برای 20 روز متوالی روزانه 50 بار نوشته دیگران را بپسندید. شما نمونه فردی هستید که افراد انجمن را به طور منظم تشویق می‌کنید!
@@ -2287,7 +2278,7 @@ fa_IR:
       long_description: |
         این مدال زمانی به شما تعلق می‌گیرد که نوشته‌هایتان 20 بار پسندیده شده باشد و شما هم 10 نوشته را بپسندید. وقتی شما نوشته‌های دیگری را می‌پسندید زمان پسندیدن نوشته‌های سایرین را نیز پیدای می‌کنید.
     gives_back:
-      name: برگشت می‌دهد
+      name: قدر شناس
       description: 100 نوشته پسندیده شده دارد و 100 نوشته را پسندیده است.
       long_description: |
         این نشان را بعد از دریافت 100 پسند در نوشته‌هایتان و پسندیدن 100 نوشته دریافت می‌کنید. با تشکر از شما!
@@ -2298,31 +2289,40 @@ fa_IR:
         این مدال زمانی به شما تعلق می‌گیرد که نوشته‌هایتان 1000 بار پسندیده شده باشد و شما هم 500 نوشته را بپسندید. شما نمونه بخشندگی و قدردانی متقابل هستید :two_hearts:.
     first_emoji:
       name: اولین شکلک
-      description: از یک شکلک در پست استفاده کرد
-      long_description: |
-        این نشان در زمانی که برای بار اول یک شکلک به نوشته اضافه کنید به شما تعلق می‌گیرد :thumbsup:. شکلک‌ها اجازه می‌دهند که احساسات خود را در نوشته انتقال دهید، از خوشحالی :smiley: تا ناراحتی :anguished: تا عصبانیت :angry: و هرچیزی که در بین آن‌هاست :sunglasses:. فقط یک : (دو نقطه) تایپ کنید یا از نوار ابزار شکلک در ویرایشگر استفاده کنید تا بتوانید از صد‌ها شکلک انتخاب کنید :ok_hand:
+      description: در یک نوشته از شکلک استفاده کرده.
     first_mention:
       name: اولین اشاره
-      description: اشاره به یک کاربر در یک نوشته
+      description: کاربری را در یک نوشته مخاطب قرار داده.
       long_description: این نشان را در زمانی که برای بار اول به یک کاربر به صورت @نام‌کاربری اشاره کنید، دریافت می‌کنید. هر اشاره به نام کاربری یه اعلان برای آن شخص ارسال می‌کند، بنابراین آن‌ها از نوشته‌ی شما مطلع خواهند شد. فقط علامت @ (علامت at) را تایپ کنید تا بتوانید به هر کاربری اشاره کنید یا، اگر اجازه وجود دارد، در گروه. -- این یک راه ساده برای جلب توجه آن‌ها است.
     first_onebox:
-      name: اولین جعبه
-      description: لینک باز شده ارسال کرده
+      name: اولین لینک قاب‌شده
+      description: یک لینک قاب شده پست کرده
       long_description: این مدال زمانی به شما تعلق می‌گیرد که برای بار اول یک پیوند قرار می‌دهید، که به صورت خودکار در جعبه باز شده و عنوان و خلاصه و عکس آن (در صورت وجود) نمایش داده می‌شود.
     first_reply_by_email:
       name: اولین پاسخ با ایمیل
-      description: پاسخ داده شده با ایمیل
+      description: به یک نوشته از طریق ایمیل پاسخ داده
       long_description: |
         این مدال وقتی دریافت می‌کنید که اولین پاسخ خود با ایمیل را ثبت کنید :e-mail:.
     new_user_of_the_month:
-      name: "کاربران جدید این ماه"
+      name: "تازه‌وارد منتخب ماه"
       description: مشارکت‌های برجسته در ماه اول
       long_description: |
         این مدال را وقتی دریافت می‌کنید که به دو کاربر در هر ماه به خاطر همکاری هایشان تبریک بگویید، به عنوان اندازه گیری که چقدر نوشته‌هایشان پسندیده شده و توسط چه کسی.
+    enthusiast:
+      name: علاقه‌مند
+      description: ۱۰ روز به اینجا سر زده
+      long_description: "به به! این مدال رو به شما دادیم چون ده روزه پشت سر هم به اینجا سر زدی. از اینکه بیش از یک هفته با ما هستی ازت متشکریم. "
+    aficionado:
+      name: طرفدار
+      description: ۱۰۰ روز به اینجا سر زده.
+      long_description: این نشان برای بازدید ۱۰۰ روز متوالی به شما اهدا شده. یعنی بیشتر از سه ماه! از همراهی‌تون ممنونیم.
+    devotee:
+      name: هواخواه
+      description: ۳۶۵ روز به اینجا سر زده
+      long_description: این نشان برای ۳۶۵ روز بازدید متوالی به شما اهدا شده. دمت گرم! یک سال تمام! چه زود گذشت. نه؟
     badge_title_metadata: "نشان %{display_name} در %{site_title}"
   admin_login:
     success: "ایمیل ارسال شد "
-    error: "خطا!"
     email_input: "ایمیل مدیر ارشد"
     submit_button: "ارسال ایمیل "
   performance_report:
@@ -2464,6 +2464,3 @@ fa_IR:
         description: |
           <p>برای تغییر تنظیمات وارد <a href='/admin' target='_blank'>بخش مدیریت</a>; کنار آیکن آچار شوید.</p>
           <p> <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>برای ساخت انجمن خود!</a> موفق باشید!</p>
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index 07f351faeab..de3a89ded35 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -17,12 +17,12 @@ fi:
       date_only: "%d. %B[ta] %Y"
       long: "%d. %B[ta] %Y, [klo] %H.%M"
   date:
-    month_names: [null, Tammikuu, Helmikuu, Maaliskuu, Huhtikuu, Toukokuu, Kesäkuu, Heinäkuu, Elokuu, Syyskuu, Lokakuu, Marraskuu, Joulukuu]
+    month_names: [~, Tammikuu, Helmikuu, Maaliskuu, Huhtikuu, Toukokuu, Kesäkuu, Heinäkuu, Elokuu, Syyskuu, Lokakuu, Marraskuu, Joulukuu]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "am"
     pm: "pm"
-    <<: *datetime_formats
   title: "Discourse"
   topics: "Ketjut"
   posts: "viestit"
@@ -72,19 +72,18 @@ fi:
       present: täytyy olla tyhjä
       confirmation: "ei vastaa %{attribute}"
       empty: ei voi olla tyhjä
-      equal_to: täytyy olla sama kuin %{count}
+      equal_to: "täytyy olla sama kuin %{count}"
       even: täytyy olla parillinen
       exclusion: on varattu
-      greater_than: täytyy olla suurempi kuin %{count}
-      greater_than_or_equal_to: täytyy olla yhtä suuri tai suurempi kuin %{count}
+      greater_than: "täytyy olla suurempi kuin %{count}"
+      greater_than_or_equal_to: "täytyy olla yhtä suuri tai suurempi kuin %{count}"
       has_already_been_used: "on jo käytetty"
       inclusion: ei ole listalla
       invalid: ei kelpaa
       is_invalid: "vaikuttaa epäselvältä, olihan se kokonainen virke?"
       contains_censored_words: "sisältää nämä sensuroidut sanat: %{censored_words}"
-      matches_censored_pattern: "sisältää nämä sivustolla sensuroidun säännöllisen lausekkeen täyttävät sanat: %{censored_words}"
-      less_than: täytyy olla vähemmän kuin %{count}
-      less_than_or_equal_to: täytyy olla yhtä suuri tai pienempi kuin %{count}
+      less_than: "täytyy olla vähemmän kuin %{count}"
+      less_than_or_equal_to: "täytyy olla yhtä suuri tai pienempi kuin %{count}"
       not_a_number: ei ole numero
       not_an_integer: täytyy olla kokonaisluku
       odd: täytyy olla pariton
@@ -116,6 +115,9 @@ fi:
       max_username_length_range: "Et voi asettaa maksimia minimin alle."
       default_categories_already_selected: "Et voi valita aluetta, joka on käytössä toisella listalla"
       s3_upload_bucket_is_required: "Et voi ottaa s3 latausta käyttöön, jos et ole määrittänyt 's3_upload_bucket'."
+  activemodel:
+    errors:
+      <<: *errors
   invite:
     not_found: "Kutsusi tunnistusväline ei kelpaa. Ota yhteyttä sivuston ylläpitäjään."
     user_exists: "Ei ole tarpeen lähettää kutsua osoitteeseen <b>%{email}</b>, sillä kutsuttavalla <a href='/u/%{username}/summary'>on jo tunnus!</a>"
@@ -137,8 +139,8 @@ fi:
   reading_time: "Lukuaika"
   likes: "Tykkäykset"
   too_many_replies:
-    one: "Pahoittelut, uudet käyttäjät voivat kirjoittaa yhden vastauksen samaan ketjuun."
-    other: "Pahoittelut, uudet käyttäjät voivat kirjoittaa %{count} vastausta samaan ketjuun."
+    one: Pahoittelut, uudet käyttäjät voivat kirjoittaa yhden vastauksen samaan ketjuun.
+    other: Pahoittelut, uudet käyttäjät voivat kirjoittaa %{count} vastausta samaan ketjuun.
   embed:
     start_discussion: "Lisää kommentti"
     continue: "Siirry keskusteluun"
@@ -148,36 +150,35 @@ fi:
     no_hosts: "Isäntiä ei ole määritetty upotusta varten."
     configure: "Määritä upottaminen"
     more_replies:
-      one: "1 muu kommentti"
-      other: "%{count} muuta kommenttia"
+      one: 1 muu kommentti
+      other: '%{count} muuta kommenttia'
     loading: "Haetaan kommentteja..."
     permalink: "Ikilinkki"
     imported_from: "Tämä on kommenttiketju artikkelille %{link}"
     in_reply_to: "▶ %{username}"
     replies:
-      one: "1 kommentti"
-      other: "%{count} kommenttia"
+      one: 1 kommentti
+      other: '%{count} kommenttia'
   no_mentions_allowed: "Pahoittelut, et voi mainita muita käyttäjiä."
   too_many_mentions:
-    one: "Pahoittelut, voit mainita viestissä vain yhden käyttäjän."
-    other: "Pahoittelut, voit mainita viestissä vain %{count} käyttäjää."
+    one: Pahoittelut, voit mainita viestissä vain yhden käyttäjän.
+    other: Pahoittelut, voit mainita viestissä vain %{count} käyttäjää.
   no_mentions_allowed_newuser: "Pahoittelut, uusi käyttäjä ei voi mainita muita käyttäjiä."
   too_many_mentions_newuser:
-    one: "Pahoittelut, uusi käyttäjä voi mainita viestissä vain yhden käyttäjän."
-    other: "Pahoittelut, uusi käyttäjä voi mainita viestissä vain %{count} käyttäjää."
+    one: Pahoittelut, uusi käyttäjä voi mainita viestissä vain yhden käyttäjän.
+    other: Pahoittelut, uusi käyttäjä voi mainita viestissä vain %{count} käyttäjää.
   no_images_allowed: "Pahoittelut, uusi käyttäjä ei voi liittää kuvia viestiin."
   too_many_images:
-    one: "Pahoittelut, uusi käyttäjä voi liittää vain yhden kuvan viestiin."
-    other: "Pahoittelut, uusi käyttäjä voi liittää vain %{count} kuvaa viestiin."
+    one: Pahoittelut, uusi käyttäjä voi liittää vain yhden kuvan viestiin.
+    other: Pahoittelut, uusi käyttäjä voi liittää vain %{count} kuvaa viestiin.
   no_attachments_allowed: "Pahoittelut, uusi käyttäjä ei voi liittää liitteitä viesteihin."
   too_many_attachments:
-    one: "Pahoittelut, uusi käyttäjä voi liittää vain yhden liitteen viestiin."
-    other: "Pahoittelut, uusi käyttäjä voi liittää vain %{count} liittettä viestiin."
+    one: Pahoittelut, uusi käyttäjä voi liittää vain yhden liitteen viestiin.
+    other: Pahoittelut, uusi käyttäjä voi liittää vain %{count} liittettä viestiin.
   no_links_allowed: "Pahoittelut, uusi käyttäjä ei voi laittaa linkkiä viestiin."
   too_many_links:
-    one: "Pahoittelut, uudet käyttäjät voivat laittaa vain yhden linkin viestiin."
-    other: "Pahoittelut, uusi käyttäjä voi laittaa vain %{count} linkkiä viestiin."
-  contains_blocked_words: "Viestissäsi on kielletty sanoja."
+    one: Pahoittelut, uudet käyttäjät voivat laittaa vain yhden linkin viestiin.
+    other: Pahoittelut, uusi käyttäjä voi laittaa vain %{count} linkkiä viestiin.
   spamming_host: "Pahoittelut, linkit tuolle sivulle eivät ole sallittuja."
   user_is_suspended: "Hyllytetyt käyttäjät eivät saa luoda viestejä."
   topic_not_found: "Jotain on mennyt pieleen. Ehkä tämä ketju on suljettu tai poistettu sillä välin, kun katselit sitä?"
@@ -209,7 +210,6 @@ fi:
     top_weekly: "Viikon parhaat ketjut"
     top_daily: "Päivän parhaat ketjut"
     posts: "Uusimmat viestit"
-    private_posts: "Uusimmat yksityisviestit"
     group_posts: "Uusimmat viestit ryhmässä %{group_name}"
     group_mentions: "Uusimmat maininnat ryhmässä %{group_name}"
     user_posts: "Viimeisimmät viestit käyttäjältä @%{username}"
@@ -223,11 +223,8 @@ fi:
     delete_reason: "Poistettu moderointijonon kautta"
     not_found: "Viestiä ei löytynyt tai se päivittyi jo."
   groups:
-    success:
-      bulk_add: "%{users_added} käyttäjää lisättiin ryhmään."
     errors:
       can_not_modify_automatic: "Et voi muokata automaattista ryhmää"
-      member_already_exist: "'%{username}' on jo ryhmän jäsen."
       invalid_domain: "'%{domain}' ei ole käypä verkkotunnus."
       invalid_incoming_email: "'%{email}' ei ole käypä sähköpostiosoite."
       email_already_used_in_group: "'%{email}' on jo käytössä ryhmällä '%{group_name}'."
@@ -247,9 +244,9 @@ fi:
       title: "Jäsenhakemus ryhmään @%{group_name}"
   education:
     until_posts:
-      one: "ensimmäisen viestisi"
-      other: "%{count} ensimmäistä viestiäsi"
-    new-topic: |
+      one: ensimmäisen viestisi
+      other: '%{count} ensimmäistä viestiäsi'
+    'new-topic': |
       Tervetuloa, tämä on %{site_name} &mdash; **kiitos uuden viestiketjun aloittamisesta!**
 
       - Kuulostaako otsikko mielenkiintoiselta, jos luet sen ääneen? Onko se hyvä kiteytys?
@@ -259,7 +256,7 @@ fi:
       - Sisällytä tekstiin usein käytettyjä sanoja, jotta muut voivat *löytää* sen. Yhdistääksesi ketjun muihin siihen liittyviin ketjuihin, valitse sille sopiva alue.
 
       Saadaksesi lisätietoa, [käy tutkimassa ohjeet](/guidelines). Tämä ohje näytetään vain kirjoittaessasi %{education_posts_text}.
-    new-reply: |
+    'new-reply': |
       Tervetuloa, tämä on %{site_name} &mdash; **kiitos keskusteluun osallistumisesta!**
 
       - Parantaako vastauksesi keskustelua jollain tapaa?
@@ -306,12 +303,6 @@ fi:
       Olemme pahoillamme, mutta uusien käyttäjien viestien määrä on rajoitettu %{newuser_max_replies_per_topic} vastaukseen samassa ketjussa.
 
       Harkitse edellisten viestiesi muokkaamista uuden viestin kirjoittamisen sijaan tai vieraile muissa ketjuissa.
-    reviving_old_topic: |
-      ### Elvytä tämä ketju?
-
-      Viimeisin vastaus tähän ketjuun on %{days} päivän takaa. Vastauksesi nostaa ketjun listauksen kärkeen ja lähettää ilmoituksen kaikille, jotka ovat aiemmin olleet osallistuneet keskusteluun
-
-      Oletko varma, että haluat jatkaa tätä vanhaa keskustelua?
   activerecord:
     attributes:
       category:
@@ -324,13 +315,12 @@ fi:
       user_profile:
         bio_raw: "Minusta"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Voit liittää varoituksia vain yksityisviesteihin."
               too_many_users: "Voit lähettää varoituksia vain yhdelle käyttäjälle kerrallaan."
-              cant_send_pm: "Pahoittelut, et voi lähettää tälle käyttäjälle yksityisviestiä."
               no_user_selected: "Sinun täytyy valita kelpaava käyttäjä."
               reply_by_email_disabled: "Sähköpostilla vastaaminen ei ole käytössä."
             featured_link:
@@ -373,7 +363,6 @@ fi:
           attributes:
             word:
               too_many: "Toiminnolle on määritelty liian monta sanaa"
-      <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>Tietoa minusta -kenttä käyttäjätiedoissasi on täyttämättä. <a href='/u/%{username_lower}/preferences/about-me'>Haluaisitko täyttää sen nyt?</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} ei ole täyttänyt vielä mitään Minusta -kohtaan profiilissaan</div>"
@@ -389,41 +378,41 @@ fi:
     title: "Tervetuloa käyttämään Discoursea"
     body: |2
 
-      Tämän kiinnitetyn ketjun ensimmäinen kappale on sivustolla vierailevalle näkyvä tervetulotoivotus. Se on tärkeä!
+        Tämän kiinnitetyn ketjun ensimmäinen kappale on sivustolla vierailevalle näkyvä tervetulotoivotus. Se on tärkeä!
 
-      **Muokkaa tästä** tiivis kuvaus yhteisöstäsi:
+        **Muokkaa tästä** tiivis kuvaus yhteisöstäsi:
 
-      - Kenelle se on suunnattu?
-      - Mistä täällä keskustellaan?
-      - Miksi heidän kannattaa käydä täällä?
-      - Mistä he löytävät lisätietoa (linkkejä, ohjeita jne.)?
+        - Kenelle se on suunnattu?
+        - Mistä täällä keskustellaan?
+        - Miksi heidän kannattaa käydä täällä?
+        - Mistä he löytävät lisätietoa (linkkejä, ohjeita jne.)?
 
-      <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+        <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
 
-      Saattaa olla hyvä sulkea tämä ketju ylläpitäjän :wrench: -valikon kautta (oikealla ylhäällä sekä sivun pohjalla), jottei vastauksia kasaannu ilmoituksen alle.
+        Saattaa olla hyvä sulkea tämä ketju ylläpitäjän :wrench: -valikon kautta (oikealla ylhäällä sekä sivun pohjalla), jottei vastauksia kasaannu ilmoituksen alle.
   lounge_welcome:
     title: "Tervetuloa Loungeen"
     body: |2
 
-      Onnittelut! :confetti_ball:
+        Onnittelut! :confetti_ball:
 
-      Jos näet tämän ketjun, sinut on juuri ylennetty **Mestariksi** (luottamustaso 3).
+        Jos näet tämän ketjun, sinut on juuri ylennetty **Mestariksi** (luottamustaso 3).
 
-      Voit nyt&hellip;
+        Voit nyt&hellip;
 
-      * Muokata minkä hyvänsä ketjun otsikkoa
-      * Siirtää minkä tahansa ketjun toiselle alueelle
-      * Lisätä linkkejä, joita hakukoneet seuraavat ([nofollow](http://en.wikipedia.org/wiki/Nofollow) on poistettu)
-      * Päästä suljetulle Lounge-alueelle, joka näkyy vain luottamustason 3 ja korkeammille käyttäjille
-      * Piilottaa roskapostiviestin yhdellä liputuksella
+        * Muokata minkä hyvänsä ketjun otsikkoa
+        * Siirtää minkä tahansa ketjun toiselle alueelle
+        * Lisätä linkkejä, joita hakukoneet seuraavat ([nofollow](http://en.wikipedia.org/wiki/Nofollow) on poistettu)
+        * Päästä suljetulle Lounge-alueelle, joka näkyy vain luottamustason 3 ja korkeammille käyttäjille
+        * Piilottaa roskapostiviestin yhdellä liputuksella
 
-      Tässä on nykyinen [lista mestareista](/badges/3/leader). Muista käydä moikkaamassa.
+        Tässä on nykyinen [lista mestareista](/badges/3/leader). Muista käydä moikkaamassa.
 
-      Kiitos, että olet tämän yhteisön arvokas jäsen!
+        Kiitos, että olet tämän yhteisön arvokas jäsen!
 
-      (Lisää tietoa luottamustasoista saat [tästä englanninkielisestä ketjusta][trust]. Huomaa, että pysyäksesi mestarina sinun pitää täyttää vaatimukset jatkossakin.)
+        (Lisää tietoa luottamustasoista saat [tästä englanninkielisestä ketjusta][trust]. Huomaa, että pysyäksesi mestarina sinun pitää täyttää vaatimukset jatkossakin.)
 
-      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Alueesta %{category}"
     replace_paragraph: "(Korvaa tämä kappale lyhyellä kuvauksella uudesta alueesta. Tämä kuvaus näytetään alueen valinnan yhteydessä, joten yritä pitää se alle 200 merkin pituisena. **Aluetta ei näytetä Keskustelualueet-sivulla ennen kuin olet muokannut tätä tekstiä tai aloittanut viestiketjuja.**)"
@@ -440,8 +429,8 @@ fi:
       uncategorized: "Alueettomat-aluetta ei voi poistaa"
       has_subcategories: "Aluetta ei voi poistaa, koska sillä on tytäralueita."
       topic_exists:
-        one: "Aluetta ei voi poistaa, koska siellä on 1 ketju. Linkki ketjuun %{topic_link}."
-        other: "Aluetta ei voi poistaa, koska siellä on %{count} ketjua. Vanhin ketju on %{topic_link}."
+        one: Aluetta ei voi poistaa, koska siellä on 1 ketju. Linkki ketjuun %{topic_link}.
+        other: Aluetta ei voi poistaa, koska siellä on %{count} ketjua. Vanhin ketju on %{topic_link}.
       topic_exists_no_oldest: "Aluetta ei voi poistaa, koska ketjujen lukumäärä on #{count}."
     uncategorized_description: "Ketjut, jotka eivät tarvitse aluetta tai eivät sovi muihin alueisiin."
   trust_levels:
@@ -460,103 +449,86 @@ fi:
     image_placeholder:
       broken: "Tämä kuva ei toimi"
   rate_limiter:
-    slow_down: "Olet tehnyt tämän toiminnon liian monta kertaa, yritä uudelleen myöhemmin."
-    too_many_requests: "Tämä toiminto voidaan suorittaa vain määrätyn monta kertaa päivässä. Odota %{time_left} ja yritä sitten uudelleen."
-    by_type:
-      first_day_replies_per_day: "Uusi käyttäjä ei voi ensimmäisenä päivänään kirjoittaa enempää viestejä. Odota %{time_left} ja yritä sitten uudelleen."
-      first_day_topics_per_day: "Uusi käyttäjä ei voi ensimmäisenä päivänään aloittaa enempää ketjuja. Odota %{time_left} ja yritä sitten uudelleen."
-      create_topic: "Yrität aloittaa ketjuja liian nopeasti. Odota %{time_left} ja yritä sitten uudelleen."
-      create_post: "Yrität vastata liian nopeasti. Odota %{time_left} ja yritä sitten uudelleen."
-      delete_post: "Poistat viestejä liian nopeasti. Odota %{time_left} ja yritä sitten uudelleen."
-      public_group_membership: "Liityt/eroat ryhmistä liian nopeasti. Odota %{time_left} ja yritä sitten uudelleen."
-      topics_per_day: "Olet aloittanut enimmäismäärän uusia ketjuja tälle päivälle. Odota %{time_left} ja yritä sitten uudelleen."
-      pms_per_day: "Olet lähettänyt enimmäismäärän viestejä tälle päivälle. Odota %{time_left} ja yritä sitten uudelleen."
-      create_like: "Olet tykännyt enimmäismäärän tälle päivälle. Odota %{time_left} ja yritä sitten uudelleen."
-      create_bookmark: "Olet lisännyt enimmäismäärän kirjanmerkkejä tälle päivälle. Odota %{time_left} ja yritä sitten uudelleen."
-      edit_post: "Olet saavuttanut muokkausten enimmäismäärän tälle päivälle. Odota %{time_left} ja yritä sitten uudelleen."
-      live_post_counts: "Kysyt viestimääriä liian nopealla tahdilla. Odota %{time_left} ja yritä sitten uudelleen."
-      unsubscribe_via_email: "Olet perunut enimmäismäärän sähköpostitse tänään. Odota %{time_left} ja yritä sitten uudelleen."
-      topic_invitations_per_day: "Olet kutsunut enimmäismäärän tälle päivälle. Odota %{time_left} ja yritä sitten uudelleen."
     hours:
-      one: "1 tunti"
-      other: "%{count} tuntia"
+      one: 1 tunti
+      other: '%{count} tuntia'
     minutes:
-      one: "1 minuutti"
-      other: "%{count} minuuttia"
+      one: 1 minuutti
+      other: '%{count} minuuttia'
     seconds:
-      one: "1 sekunti"
-      other: "%{count} sekuntia"
+      one: 1 sekunti
+      other: '%{count} sekuntia'
   datetime:
     distance_in_words:
       half_a_minute: "< 1 min"
       less_than_x_seconds:
-        one: "< 1 s"
-        other: "< %{count} s"
+        one: < 1 s
+        other: < %{count} s
       x_seconds:
-        one: "1 s"
-        other: "%{count} s"
+        one: 1 s
+        other: '%{count} s'
       less_than_x_minutes:
-        one: "< 1 min"
-        other: "< %{count} min"
+        one: < 1 min
+        other: < %{count} min
       x_minutes:
-        one: "1 min"
-        other: "%{count} min"
+        one: 1 min
+        other: '%{count} min'
       about_x_hours:
-        one: "1 t"
-        other: "%{count} t"
+        one: 1 t
+        other: '%{count} t'
       x_days:
-        one: "1 pv"
-        other: "%{count} pv"
+        one: 1 pv
+        other: '%{count} pv'
       about_x_months:
-        one: "1 kk"
-        other: "%{count} kk"
+        one: 1 kk
+        other: '%{count} kk'
       x_months:
-        one: "1 kk"
-        other: "%{count} kk"
+        one: 1 kk
+        other: '%{count} kk'
       about_x_years:
-        one: "1 v"
-        other: "%{count} v"
+        one: 1 v
+        other: '%{count} v'
       over_x_years:
-        one: "> 1 v"
-        other: "> %{count} v"
+        one: '> 1 v'
+        other: '> %{count} v'
       almost_x_years:
-        one: "1 v"
-        other: "%{count} v"
+        one: 1 v
+        other: '%{count} v'
     distance_in_words_verbose:
       half_a_minute: "hetki sitten"
       less_than_x_seconds:
-        one: "hetki sitten"
-        other: "hetki sitten"
+        one: hetki sitten
+        other: hetki sitten
       x_seconds:
-        one: "1 sekunti sitten"
-        other: "%{count} sekuntia sitten"
+        one: 1 sekunti sitten
+        other: '%{count} sekuntia sitten'
       less_than_x_minutes:
-        one: "alle minuutti sitten"
-        other: "alle %{count} minuuttia sitten"
+        one: alle minuutti sitten
+        other: alle %{count} minuuttia sitten
       x_minutes:
-        one: "minuutti sitten"
-        other: "%{count} minuuttia sitten"
+        one: minuutti sitten
+        other: '%{count} minuuttia sitten'
       about_x_hours:
-        one: "tunti sitten"
-        other: "%{count} tuntia sitten"
+        one: tunti sitten
+        other: '%{count} tuntia sitten'
       x_days:
-        one: "1 päivä sitten"
-        other: "%{count} päivää sitten"
+        one: 1 päivä sitten
+        other: '%{count} päivää sitten'
       about_x_months:
-        one: "noin kuukausi sitten"
-        other: "noin %{count} kuukautta sitten"
+        one: noin kuukausi sitten
+        other: noin %{count} kuukautta sitten
       x_months:
-        one: "kuukausi sitten"
-        other: "%{count} kuukautta sitten"
+        one: kuukausi sitten
+        other: '%{count} kuukautta sitten'
       about_x_years:
-        one: "noin vuosi sitten"
-        other: "noin %{count} vuotta sitten"
+        one: noin vuosi sitten
+        other: noin %{count} vuotta sitten
       over_x_years:
-        one: "yli vuosi sitten"
-        other: "yli %{count} vuotta sitten"
+        one: yli vuosi sitten
+        other: yli %{count} vuotta sitten
       almost_x_years:
-        one: "lähes vuosi sitten"
-        other: "lähes %{count} vuotta sitten"
+        one: lähes vuosi sitten
+        other: lähes %{count} vuotta sitten
   password_reset:
     no_token: "Pahoittelut, tämä salasanan uusimisen linkki on liian vanha. Paina 'Kirjaudu sisään' nappia ja valitse 'Unohdin salasanani' saadaksesi uuden linkin."
     choose_new: "Valitse uusi salasana"
@@ -610,8 +582,6 @@ fi:
       long_form: 'liputti tämän sopimattomaksi'
     notify_user:
       title: 'Lähetä käyttäjälle @{{username}} viesti.'
-      description: 'Haluan keskustella viestistä kirjoittajan kanssa kahden kesken.'
-      short_description: 'Haluan keskustella viestistä kirjoittajan kanssa suoraan kahden kesken.'
       long_form: 'lähetä käyttäjälle viesti'
       email_title: 'Viestisi ketjussa "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -712,9 +682,7 @@ fi:
       xaxis: "Päivä"
       yaxis: "Vierailujen määrä"
     signups:
-      title: "Uudet käyttäjät"
       xaxis: "Päivä"
-      yaxis: "Uusien käyttäjien määrä"
     profile_views:
       title: "Käyttäjäprofiilin katselut"
       xaxis: "Päivä"
@@ -752,7 +720,6 @@ fi:
       xaxis: "Päivä"
       yaxis: "Sähköpostien lukumäärä"
     user_to_user_private_messages:
-      title: "Käyttäjältä käyttäjälle"
       xaxis: "Päivä"
       yaxis: "Viestien lukumäärä"
     system_private_messages:
@@ -799,7 +766,6 @@ fi:
       xaxis: "Päivä"
       yaxis: "Hakurobottien sivunlataukset"
     page_view_total_reqs:
-      title: "Yhteensä"
       xaxis: "Päivä"
       yaxis: "Sivunlatauksia yhteensä"
     page_view_logged_in_mobile_reqs:
@@ -863,28 +829,23 @@ fi:
     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>.'
     subfolder_ends_in_slash: "Alihakemiston asetuksesi ei kelpaa; DISCOURSE_RELATIVE_URL_ROOT päättyy vinoviivaan."
     email_polling_errored_recently:
-      one: "Sähköpostin pollaus on aiheuttanut virheen edellisen 24 tunnin aikana. Tarkastele <a href='/logs' target='_blank'>lokeja</a> saadaksesi lisätietoja."
-      other: "Sähköpostin pollaus aiheutti %{count} virhettä edellisen 24 tunnin aikana. Tarkastele <a href='/logs' target='_blank'>lokeja</a> saadaksesi lisätietoja."
-    missing_mailgun_api_key: "Palvelin on asetettu lähettämään sähköposti mailgunin kautta, mutta et ole syöttänyt API tunnusta, jolla verifioidaan webhook-viestit."
+      one: Sähköpostin pollaus on aiheuttanut virheen edellisen 24 tunnin aikana. Tarkastele <a href='/logs' target='_blank'>lokeja</a> saadaksesi lisätietoja.
+      other: Sähköpostin pollaus aiheutti %{count} virhettä edellisen 24 tunnin aikana. Tarkastele <a href='/logs' target='_blank'>lokeja</a> saadaksesi lisätietoja.
     bad_favicon_url: "Faviconin asettaminen epäonnistui. Tarkista favicon_url -asetus <a href='/admin/site_settings'>sivuston asetuksissa</a>."
     poll_pop3_timeout: "Yhteyttä POP3-palvelimelle aikakatkaistaan ja saapuvaa sähköpostia ei voitu hakea. Tarkista <a href='/admin/site_settings/category/email'>POP3-asetukset</a> ja palveluntarjoaja."
     poll_pop3_auth_error: "Yhteys POP3-palvelimelle epäonnistuu autentikaatiovirheen vuoksi. Tarkista <a href='/admin/site_settings/category/email'>POP3-asetukset</a>."
   site_settings:
     censored_words: "Sanat, jotka korvataan automaattisesti merkeillä &#9632;&#9632;&#9632;&#9632;"
-    censored_pattern: "Säännöllinen lauseke, joka korvataan automaattisesti &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Poista automaattisesti kaikki yli 30 päivää piilotettuna olleet viestit."
-    default_locale: "Sivuston oletuskieli (ISO 639-1 koodi)"
     allow_user_locale: "Salli käyttäjien vaihtaa käyttöliittymän kieli omista asetuksista"
     set_locale_from_accept_language_header: "Aseta sivuston kieli kirjautumattomille käyttäjille selaimen kielivalinnan perusteella. (KOKEELLINEN, ei toimi anonyymin välimuistin kanssa)"
     min_post_length: "Viestin merkkien minimimäärä"
     min_first_post_length: "Ketjun aloitusviestin (leipätekstin) merkkien minimimäärä"
-    min_private_message_post_length: "Viestin merkkien minimimäärä viesteille"
     max_post_length: "Viestin merkkien minimimäärä"
     topic_featured_link_enabled: "Ota käyttöön ketjulinkit."
     show_topic_featured_link_in_digest: "Näytä ketjulinkki tiivistelmäsähköpostissa."
     min_topic_title_length: "Viestin otsikon merkkien minimimäärä"
     max_topic_title_length: "Viestin otsikon merkkien maksimimäärä"
-    min_private_message_title_length: "Viestin otsikon merkkien minimimäärä viestille"
     min_search_term_length: "Haun merkkien minimimäärä"
     search_tokenize_chinese_japanese_korean: "Pakota haku käsittelemään kiinaa/japania/koreaa myös muunkielisillä sivustoilla"
     search_prefer_recent_posts: "Jos hakeminen suurelta palstaltasi on hidasta, tämä asetus kokeilee hakemistorakennetta, jossa tuoreimmat viestit ovat ensin"
@@ -938,8 +899,6 @@ fi:
     summary_likes_required: "Montako tykkäystä ketjussa pitää olla, jotta ketjun tiivistelmä otetaan käyttöön"
     summary_percent_filter: "Kun käyttäjä klikkaa 'Näytä ketjun tiivistelmä', näytä paras % viesteistä"
     summary_max_results: "Maksimimäärä viestejä, jotka näytetään ketjun tiivistelmässä"
-    enable_private_messages: "Salli luottamustason 1 (muokattavissa asetuksista) käyttäjien lähettää yksityisviestejä ja vastata viesteihin. Huomaa, että henkilökunta voi aina lähettää viestejä."
-    enable_private_email_messages: "Salli luottamustason 4 (säädettävissä toisella asetuksella) käyttäjien lähettää yksityisviestitoiminnolla sähköpostia. Huomioi, että henkilökunta voi lähettää riippumatta asetuksista."
     enable_long_polling: "Ilmoitusten käyttämä viestiväylä voi käyttää long pollingia"
     long_polling_base_url: "Base URL, jota käytetään long pollingissa (kun CDN on käytössä, varmista että tähän on asetettu origin pull) esim: http://origin.site.com"
     long_polling_interval: "Kuinka kauan palvelimen pitäisi odottaa ennen vastaamista asiakkaalle, kun ei ole mitään dataa jota lähettää (vain kirjautuneille käyttäjille)"
@@ -960,7 +919,6 @@ fi:
     notify_mods_when_user_silenced: "Jos käyttäjä hiljennetään automaattisesti, lähetä viesti kaikile valvojille."
     flag_sockpuppets: "Jos uuden käyttäjän aloittamaan ketjuun vastaa toinen uusi käyttäjä samasta IP-osoitteesta, liputa molemmat viestit mahdolliseksi roskapostiksi."
     traditional_markdown_linebreaks: "Käytä perinteisiä rivinvaihtoja Markdownissa, joka vaatii kaksi perättäistä välilyöntiä rivin vaihtoon."
-    enable_markdown_typographer: "Käytetään tavanomaisia typografisia sääntöjä parantamaan tekstikappaleiden luettavuutta, (c), (tm) ym. korvataan symboleilla, kysymysmerkkien määrää vähennetään jne."
     post_undo_action_window_mins: "Kuinka monta minuuttia käyttäjällä on aikaa perua viestiin kohdistuva toimi (tykkäys, liputus, etc)."
     must_approve_users: "Henkilökunnan täytyy hyväksyä kaikki uudet tilit, ennen uusien käyttäjien päästämistä sivustolle. VAROITUS: tämän asetuksen valitseminen poistaa pääsyn kaikilta jo olemassa olevilta henkilökuntaan kuulumattomilta käyttäjiltä."
     pending_users_reminder_delay: "Ilmoita valvojille, jos uusi käyttäjä on odottanut hyväksyntää kauemmin kuin näin monta tuntia. Aseta -1, jos haluat kytkeä ilmoitukset pois päältä."
@@ -1003,7 +961,6 @@ fi:
     version_checks: "Pingaa Discourse Hubia päivityksistä ja näytä viesti /admin hallintapaneelissa kun uusi versio on saatavilla"
     new_version_emails: "Lähetä sähköposti contact_email osoitteeseen kun uusi versio Discoursesta on saatavilla."
     invite_expiry_days: "Kuinka monta päivää käyttäjäkutsujen avaimet ovat voimassa"
-    invite_passthrough_hours: "Kuinka pitkään käyttäjä voi käyttää vastatun kutsun avainta kirjautuakseen sisään, tunneissa"
     invite_only: "Julkinen rekisteröityminen ei ole käytössä, uuden tilin luominen vaatii kutsun henkilökunnalta."
     login_required: "Vaadi kirjautumista sivuston lukemiseen, epää anonyymi pääsy."
     min_username_length: "Käyttäjänimen vähimmäispituus merkeissä. VAROITUS: Jos olemassa olevalla käyttäjällä tai ryhmällä on tätä lyhyempi nimi, sivustosi hajoaa!"
@@ -1024,7 +981,7 @@ fi:
     sso_overrides_name: "Ohittaa paikallisen koko nimen SSO:n kautta saatavalla ulkopuolisella nimellä jokaisella kirjautumiskerralla ja estää paikalliset muutokset"
     sso_overrides_avatar: "Syrjäyttää käyttäjän avatarin ulkopuolisella kertakirjautumisen kautta haetulla avatarilla. Jos tämä otetaan käyttöön, suositellaan samalla allow_uploaded_avatars -asetuksen poistamista käytöstä."
     sso_not_approved_url: "Uudelleenohjaa hyväksymättömät SSO-tilit tähän osoitteeseen"
-    enable_local_logins: "Ota käyttöön käyttäjätunnus/salasana -perusteinen kirjautuminen. (Huom: tämän täytyy olla käytössä kutsujen toimimiseksi)"
+    sso_allows_all_return_paths: "Älä rajoita SSO:n antamien palautuspolkujen verkkotunnusta (oletuksena palautuspolun on oltava nykyisellä sivustolla)"
     allow_new_registrations: "Salli uusien käyttäjien rekisteröityminen. Ota tämä asetus pois käytöstä estääksesi uusien käyttäjätilien luomisen."
     enable_signup_cta: "Näytä palaaville anonyymeille käyttäjille ilmoitus, jossa kehoitetaan heitä luomaan tili."
     enable_yahoo_logins: "Ota käyttöön Yahoo kirjautuminen"
@@ -1032,15 +989,12 @@ fi:
     google_oauth2_client_id: "Google-applikaatiosi Client ID."
     google_oauth2_client_secret: "Google-applikaatiosi Client secret."
     enable_twitter_logins: "Ota käyttöön Twitter kirjautuminen, vaatimuksena twitter_consumer_key ja twitter_consumer_secret"
-    twitter_consumer_key: "Consumer key Twitter autentikaatioon, rekisteröinti osoitteessa http://dev.twitter.com"
-    twitter_consumer_secret: "Consumer secret key Twitter autentikaatioon, rekisteröinti osoitteessa http://dev.twitter.com"
     enable_instagram_logins: "Ota Instagram-autentikaatio käyttöön, vaatimuksena instagram_consumer_key ja instagram_consumer_secret"
     instagram_consumer_key: "Consumer key Instagram-autentikaatioon"
     instagram_consumer_secret: "Consumer secret Instagram-autentikaatioon"
     enable_facebook_logins: "Ota käyttöön Facebook autentikaatio, vaatimuksena facebook_app_id ja facebook_app_secret"
     facebook_app_id: "App id Facebook autentikaatioon, rekisteröinti osoitteessa https://developers.facebook.com/apps"
     facebook_app_secret: "App secret Facebook autentikaatioon, rekisteröinti osoitteessa https://developers.facebook.com/apps"
-    facebook_request_extra_profile_details: "Pyydä tietoa käyttäjästä, sijaintitieto ja internetsivu Facebookilta (vaatii Facebookin hyväksynnän)"
     enable_github_logins: "Ota käyttöön Gtihub autentikaatio, vaatimuksena github_client_id ja github_client_secret"
     github_client_id: "Client id Github autentikaatioon, rekisteröinti osoitteessa https://github.com/settings/applications"
     github_client_secret: "Client secret Github autentikaatioon, rekisteröinti osoitteessa https://github.com/settings/applications"
@@ -1049,7 +1003,6 @@ fi:
     allow_restore: "Salli palautus, joka korvaa KAIKEN sivuston datan! Jätä valitsematta, jos et aio palauttaa sivuston varmuuskopiota"
     maximum_backups: "Tallennettuna pidettävien varmuuskopioiden maksimimäärä. Vanhemmat varmuuskopiot poistetaan automaattisesti"
     automatic_backups_enabled: "Tee automaattinen varmuuskopiointi, kuten tiheysasetus on määritelty"
-    backup_frequency: "Kuinka usein luodaan sivuston varmuuskopio, päivissä."
     enable_s3_backups: "Lataa varmuuskopiot S3:een niiden valmistuttua. TÄRKEÄÄ: edellyttää, että toimivat S3 kirjautumistiedot on syötetty asetuksiin."
     s3_backup_bucket: "Amazon S3 bucket johon varmuuskopiot ladataan. VAROITUS: Varmista, että se on yksityinen."
     s3_disable_cleanup: "Älä poista varmuuskopiota S3:sta, kun se poistetaan paikallisesti."
@@ -1071,7 +1024,6 @@ fi:
     max_bookmarks_per_day: "Kirjanmerkkien päivittäinen maksimimäärä per käyttäjä."
     max_edits_per_day: "Muokkausten päivittäinen maksimimäärä per käyttäjä."
     max_topics_per_day: "Kuinka monta ketjua käyttäjä voi aloittaa päivässä."
-    max_private_messages_per_day: "Viestien päivittäinen maksimimäärä per käyttäjä."
     max_invites_per_day: "Maksimimäärä kutsuja, jonka käyttäjä voi lähettää päivässä."
     max_topic_invitations_per_day: "Maksimimäärä ketjukutsuja, jonka yksittäinen käyttäjä voi lähettää päivässä"
     max_logins_per_ip_per_hour: "Enimmäismäärä kirjautumisia IP-osoitetta kohden tunnissa"
@@ -1087,7 +1039,6 @@ fi:
     purge_deleted_uploads_grace_period_days: "Varoaika (päivinä) kunnes poistettu liitetiedosto tuhotaan."
     purge_unactivated_users_grace_period_days: "Varoaika (päivissä) ennen kuin aktivoimaton käyttäjätili poistetaan.  Aseta 0 niin aktivoimattomia käyttäjiä ei poisteta ollenkaan."
     enable_s3_uploads: "Lataa liitetiedostot Amazon S3:een. Tärkeää: edellyttää toimivat S3 kirjautumistiedot (access key id ja secret access key)."
-    s3_use_iam_profile: 'Käytä AWS EC2 IAM roolia avainten hakuun. HUOM: käyttöönotto korvaa "s3 access key id" ja "s3 secret access key" asetukset.'
     s3_upload_bucket: "Amazon S3 bucket, jonne lataukset sijoitetaan. VAROITUS: täytyy olla pienillä kirjaimilla, ei pisteitä, ei alaviivoja."
     s3_access_key_id: "Amazon S3 access key id, jota käytetään kuvien sijoittamisessa."
     s3_secret_access_key: "Amazon S3 secret access key, jota käytetään kuvien sijoittamisessa."
@@ -1133,8 +1084,6 @@ fi:
     min_trust_to_edit_wiki_post: "Wikiviestin muokkaamiseen vaadittava luottamustaso."
     min_trust_to_edit_post: "Viestin muokkaamiseen vaadittava luottamustaso."
     min_trust_to_allow_self_wiki: "Minimiluottamustaso, jolla käyttäjä voi tehdä omasta viestistään wiki-viestin."
-    min_trust_to_send_messages: "Yksityisviestien luomiseen vaadittava luottamustaso"
-    min_trust_to_send_email_messages: "Vähimmäisluottamustaso, jotta voi lähettää uusia yksityisviestejä sähköpostilla (esikäyttäjille)"
     newuser_max_links: "Kuinka monta linkkiä uusi käyttäjä voi lisätä viestiin."
     newuser_max_images: "Kuinka monta kuvaa uusi käyttäjä voi lisätä viestiin."
     newuser_max_attachments: "Kuinka monta liitettä uusi käyttäjä voi lisätä viestiin."
@@ -1145,7 +1094,6 @@ fi:
     enable_mentions: "Salli käyttäjän mainita toinen käyttäjä."
     create_thumbnails: "Luo esikatselu- ja lightbox-kuvia, jotka ovat liian suuria mahtuakseen viestiin."
     email_time_window_mins: "Odota (n) minuuttia ennen ilmoitussähköpostien lähettämistä, jotta käyttäjällä on aikaa muokata ja viimeistellä viestinsä."
-    private_email_time_window_seconds: "Odota (n) sekuntia ennen sähköposti-ilmoitusten lähettämistä käyttäjille, jotta kirjoittajalla on mahdollisuus tehdä muokkaukset ja viimeistellä viestinsä."
     email_posts_context: "Kuinka monta edellistä vastausta liitetään kontekstiksi sähköposti-ilmoituksessa."
     flush_timings_secs: "Kuinka usein timing data päivitetään palvelimelle, sekunneissa."
     title_max_word_length: "Sanan enimmäispituus merkkeinä ketjun otsikossa"
@@ -1179,7 +1127,7 @@ fi:
     topic_post_like_heat_high: "Kun tykkäysten suhde viestien määrään ylittää tämän, viestien lukumäärän saraketta korostetaan voimakkaasti."
     faq_url: "Jos haluat käyttää sivuston ulkopuolella ylläpidettyä UKK-listaa, syötä URL tähän."
     tos_url: "Jos haluat ylläpitää käyttöehtoja sivuston ulkopuolella, syötä URL tähän."
-    privacy_policy_url: "Jos haluat ylläpitää rekisteriselostetta sivuston ulkopuolella, syötä URL tähän."
+    privacy_policy_url: "Jos haluat ylläpitää tietosuojaselostetta sivuston ulkopuolella, syötä URL tähän."
     newuser_spam_host_threshold: "Kuinka monta kertaa uusi käyttäjä voi linkittää samalle sivustolle `newuser_spam_host_posts` viesteissään, ennen kuin se tulkitaan roskapostin lähettämiseksi."
     white_listed_spam_host_domains: "Lista verkkotunnuksista, joita ei oteta huomioon roskapostin tunnistamisessa. Uusilla käyttäjillä ei ole rajoituksia linkkaamisessa näihin tunnuksiin."
     staff_like_weight: "Kuinka suuri ylimääräinen arvo on henkilökunnan tykkäyksillä."
@@ -1202,7 +1150,6 @@ fi:
     reply_by_email_enabled: "Ota käyttöön vastaukset sähköpostin avulla."
     reply_by_email_address: "Saapuvien sähköpostivastausten sähköpostiosoitekaava, esimerkiksi: %{reply_key}@reply.example.com tai replies+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "Lista vaihtoehtoisista saapuvien sähköpostivastausten sähköpostiosoitekaavoista, esimerkiksi: %{reply_key}@reply.example.com tai replies+%{reply_key}@example.com"
-    incoming_email_prefer_html: "Käytä HTMLää tekstin sijaan saapuville sähköposteille."
     disable_emails: "Estä Discoursea lähettämästä mitään sähköpostia"
     strip_images_from_short_emails: "Poista kuvat sähköposteista, joiden koko on alle 2800 tavua"
     short_email_length: "Lyhyen sähköpostin pituus tavuissa"
@@ -1307,7 +1254,6 @@ fi:
     allowed_href_schemes: "Linkeissä sallitut skeemat http:n ja https:n lisäksi."
     embed_post_limit: "Upotettavien viestien maksimimäärä."
     embed_username_required: "Käyttäjänimi vaaditaan ketjun luomiseksi."
-    notify_about_flags_after: "Jos liputusta ei ole käsitelty näin monessa tunnissa, lähetä yksityisviesti henkilökunnalle. Aseta 0 ottaaksesi pois käytöstä."
     show_create_topics_notice: "Jos palstalla on vähemmän kuin 5 julkista ketjua, kehota ylläpitäjiä aloittamaan ketjuja."
     delete_drafts_older_than_n_days: Poista yli (n) päivää vanhat luonnokset.
     bootstrap_mode_min_users: "Vähimmäismäärä käyttäjiä, joka vaaditaan aloitustilan poistamiseen (aseta 0 poistaaksesi käytöstä)"
@@ -1319,7 +1265,6 @@ fi:
     approve_post_count: "Viestien lukumäärä, joka tarkastetaan uusilta käyttäjiltä ja haastajilta."
     approve_unless_trust_level: "Tätä luottamustasoa alhaisempien käyttäjien viestit tarkastetaan"
     approve_new_topics_unless_trust_level: "Tätä luottamustasoa alhaisempien käyttäjien aloittamat ketjut tarkastetaan"
-    notify_about_queued_posts_after: "Jos viesti on odottanut hyväksyntää kauemmin kuin näin monta tuntia, sähköpostiviesti lähetetään contact_email osoitteeseen. Aseta 0 ottaaksesi pois käytöstä."
     auto_close_messages_post_count: "Maksimimäärä viestejä yksityisketjussa, kunnes se suljetaan automaattisesti (0 poistaaksesi käytöstä)"
     auto_close_topics_post_count: "Maksimimäärä viestejä ketjussa, kunnes se suljetaan automaattisesti (0 poistaaksesi käytöstä)"
     code_formatting_style: "Viestikentän koodipainike käyttää oletuksena tätä koodimuotoilutyyliä"
@@ -1327,7 +1272,6 @@ fi:
     watched_words_regular_expressions: "Tarkkaillut sanat ovat säännöllisiä lausekkeita."
     default_email_digest_frequency: "Kuinka usein käyttäjille lähetetään sähköpostikooste oletuksena."
     default_include_tl0_in_digests: "Sisällytä uusien käyttäjien viestit sähköpostikoosteisiin oletuksena. Tätä voi muuttaa käyttäjäasetuksissa."
-    default_email_private_messages: "Lähetä oletuksena sähköposti, kun joku lähettää käyttäjälle viestin."
     default_email_direct: "Lähetä oletuksena sähköposti, kun joku lainaa/vastaa/mainitsee tai kutsuu käyttäjän."
     default_email_mailing_list_mode: "Lähetä oletuksena sähköposti jokaisesta uudesta viestistä."
     default_email_mailing_list_mode_frequency: "Postituslistatilassa käyttäjä saa sähköpostia oletuksena näin usein."
@@ -1353,6 +1297,7 @@ fi:
     allow_user_api_key_scopes: "Lista rajapinnan käyttäjäavaimiin liittyvistä oikeuksista"
     max_api_keys_per_user: "Enimmäismäärä rajapinnan käyttäjäavaimia käyttäjää kohden"
     min_trust_level_for_user_api_key: "Vähimmäisluottamustaso, joka vaaditaan rajapinnan käyttäjäavainten muodostamiseen"
+    allowed_user_api_push_urls: "Sallitut URL-osoitteet "
     tagging_enabled: "Ota käyttöön ketjujen tunnisteet?"
     min_trust_to_create_tag: "Vähimmäisluottamustaso, jolla voi luoda tunnisteita."
     max_tags_per_topic: "Suurin tunnisteiden määrä, joka voi liittyä ketjuun."
@@ -1362,7 +1307,6 @@ fi:
     max_tags_in_filter_list: "Enimmäismäärä tunnisteita, joka näytetään suodatuspudotusvalikossa. Käytetyimmät tunnisteet näytetään."
     tags_sort_alphabetically: "Näytä tunnisteet aakkosjärjestyksessä. Oletusasetus on näyttäminen suosion mukaan."
     tag_style: "Tunnisteiden visuaalinen tyyli."
-    staff_tags: "Lista tunnisteista, joita vain henkilökunta voi lisätä"
     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."
@@ -1420,18 +1364,18 @@ fi:
     not_seen_in_a_month: "Tervetuloa takaisin! Emme ole nähneet sinua vähään aikaan. Tässä ovat suosituimmat viestiketjut sitten viime näkemän."
   merge_posts:
     edit_reason:
-      one: "%{username} yhdisti viestin"
-      other: "%{username} yhdisti %{count} viestiä"
+      one: '%{username} yhdisti viestin'
+      other: '%{username} yhdisti %{count} viestiä'
     errors:
       different_topics: "Eri ketjuissa olevia viestejä ei voi yhdistää."
       different_users: "Eri käyttäjien viestejä ei voi yhdistää."
   move_posts:
     new_topic_moderator_post:
-      one: "Yksi viesti siirrettiin uuteen ketjuun: %{topic_link}"
-      other: "%{count} viestiä siirrettiin uuteen ketjuun: %{topic_link}"
+      one: 'Yksi viesti siirrettiin uuteen ketjuun: %{topic_link}'
+      other: '%{count} viestiä siirrettiin uuteen ketjuun: %{topic_link}'
     existing_topic_moderator_post:
-      one: "Yksi viesti siirrettiin toiseen ketjuun: %{topic_link}"
-      other: "%{count} viestiä siirrettiin toiseen ketjuun: %{topic_link}"
+      one: 'Yksi viesti siirrettiin toiseen ketjuun: %{topic_link}'
+      other: '%{count} viestiä siirrettiin toiseen ketjuun: %{topic_link}'
   change_owner:
     post_revision_text: "Omistus siirrettiin käyttäjältä %{old_user} käyttäjälle %{new_user}"
     deleted_user: "poistettu käyttäjä"
@@ -1441,47 +1385,47 @@ fi:
     closed_enabled: "Tämä ketju on suljettu. Uusia vastauksia ei voi enää kirjoittaa."
     closed_disabled: "Tämä ketju on nyt avattu. Uusia vastauksia voi taas kirjoittaa."
     autoclosed_message_max_posts:
-      one: "Tämä yksityisketju suljettiin automaattisesti sen saavutettua vastausten maksimimäärän 1."
-      other: "Tämä yksityisketju suljettiin automaattisesti sen saavutettua vastausten maksimimäärän %{count}."
+      one: Tämä yksityisketju suljettiin automaattisesti sen saavutettua vastausten maksimimäärän 1.
+      other: Tämä yksityisketju suljettiin automaattisesti sen saavutettua vastausten maksimimäärän %{count}.
     autoclosed_topic_max_posts:
-      one: "Tämä viestiketju suljettiin automaattisesti sen saavutettua vastausten maksimimäärän 1."
-      other: "Tämä viestiketju suljettiin automaattisesti sen saavutettua vastausten maksimimäärän %{count}."
+      one: Tämä viestiketju suljettiin automaattisesti sen saavutettua vastausten maksimimäärän 1.
+      other: Tämä viestiketju suljettiin automaattisesti sen saavutettua vastausten maksimimäärän %{count}.
     autoclosed_enabled_days:
-      one: "Tämä ketju suljettiin automaattisesti 1 päivän kuluttua. Uusia vastauksia ei voi enää kirjoittaa."
-      other: "Ketju suljettiin ajastetusti %{count} päivän kuluttua. Uusia vastauksia ei voi enää kirjoittaa."
+      one: Tämä ketju suljettiin automaattisesti 1 päivän kuluttua. Uusia vastauksia ei voi enää kirjoittaa.
+      other: Ketju suljettiin ajastetusti %{count} päivän kuluttua. Uusia vastauksia ei voi enää kirjoittaa.
     autoclosed_enabled_hours:
-      one: "Tämä ketju suljettiin automaattisesti 1 tunnin kuluttua. Uusia vastauksia ei voi enää kirjoittaa."
-      other: "Ketju suljettiin ajastetusti %{count} tunnin kuluttua. Uusia vastauksia ei voi enää kirjoittaa."
+      one: Tämä ketju suljettiin automaattisesti 1 tunnin kuluttua. Uusia vastauksia ei voi enää kirjoittaa.
+      other: Ketju suljettiin ajastetusti %{count} tunnin kuluttua. Uusia vastauksia ei voi enää kirjoittaa.
     autoclosed_enabled_minutes:
-      one: "Tämä ketju suljettiin automaattisesti 1 minuutin kuluttua. Uusia vastauksia ei voi enää kirjoittaa."
-      other: "Ketju suljettiin ajastetusti %{count} minuutin kuluttua. Uusia vastauksia ei voi enää kirjoittaa."
+      one: Tämä ketju suljettiin automaattisesti 1 minuutin kuluttua. Uusia vastauksia ei voi enää kirjoittaa.
+      other: Ketju suljettiin ajastetusti %{count} minuutin kuluttua. Uusia vastauksia ei voi enää kirjoittaa.
     autoclosed_enabled_lastpost_days:
-      one: "Tämä ketju suljettiin automaattisesti 1 päivän kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa."
-      other: "Ketju suljettiin automaattisesti %{count} päivän kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa."
+      one: Tämä ketju suljettiin automaattisesti 1 päivän kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa.
+      other: Ketju suljettiin automaattisesti %{count} päivän kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa.
     autoclosed_enabled_lastpost_hours:
-      one: "Tämä ketju suljettiin automaattisesti 1 tunnin kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa."
-      other: "Ketju suljettiin automaattisesti %{count} tunnin kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa."
+      one: Tämä ketju suljettiin automaattisesti 1 tunnin kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa.
+      other: Ketju suljettiin automaattisesti %{count} tunnin kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa.
     autoclosed_enabled_lastpost_minutes:
-      one: "Tämä ketju suljettiin automaattisesti 1 minuutin kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa."
-      other: "Ketju suljettiin automaattisesti %{count} minuutin kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa."
+      one: Tämä ketju suljettiin automaattisesti 1 minuutin kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa.
+      other: Ketju suljettiin automaattisesti %{count} minuutin kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa.
     autoclosed_disabled_days:
-      one: "Ketju avattiin ajastetusti 1 päivän kuluttua."
-      other: "Ketju avattiin ajastetusti %{count} päivän kuluttua."
+      one: Ketju avattiin ajastetusti 1 päivän kuluttua.
+      other: Ketju avattiin ajastetusti %{count} päivän kuluttua.
     autoclosed_disabled_hours:
-      one: "Ketju avattiin ajastetusti 1 tunnin kuluttua."
-      other: "Ketju avattiin ajastetusti %{count} tunnin kuluttua."
+      one: Ketju avattiin ajastetusti 1 tunnin kuluttua.
+      other: Ketju avattiin ajastetusti %{count} tunnin kuluttua.
     autoclosed_disabled_minutes:
-      one: "Ketju avattiin ajastetusti 1 minuutin kuluttua."
-      other: "Ketju avattiin ajastetusti %{count} minuutin kuluttua."
+      one: Ketju avattiin ajastetusti 1 minuutin kuluttua.
+      other: Ketju avattiin ajastetusti %{count} minuutin kuluttua.
     autoclosed_disabled_lastpost_days:
-      one: "Ketju avattiin automaattisesti 1 päivän kuluttua viimeisimmästä viestistä."
-      other: "Ketju avattiin automaattisesti %{count} päivän kuluttua viimeisimmästä viestistä."
+      one: Ketju avattiin automaattisesti 1 päivän kuluttua viimeisimmästä viestistä.
+      other: Ketju avattiin automaattisesti %{count} päivän kuluttua viimeisimmästä viestistä.
     autoclosed_disabled_lastpost_hours:
-      one: "Ketju avattiin automaattisesti 1 tunnin kuluttua viimeisimmästä viestistä."
-      other: "Ketju avattiin automaattisesti %{count} tunnin kuluttua viimeisimmästä viestistä."
+      one: Ketju avattiin automaattisesti 1 tunnin kuluttua viimeisimmästä viestistä.
+      other: Ketju avattiin automaattisesti %{count} tunnin kuluttua viimeisimmästä viestistä.
     autoclosed_disabled_lastpost_minutes:
-      one: "Ketju avattiin automaattisesti 1 minuutin kuluttua viimeisimmästä viestistä."
-      other: "Ketju avattiin automaattisesti %{count} minuutin kuluttua viimeisimmästä viestistä."
+      one: Ketju avattiin automaattisesti 1 minuutin kuluttua viimeisimmästä viestistä.
+      other: Ketju avattiin automaattisesti %{count} minuutin kuluttua viimeisimmästä viestistä.
     autoclosed_disabled: "Tämä ketju on nyt avattu. Uusia vastauksia voi taas kirjoittaa."
     autoclosed_disabled_lastpost: "Tämä ketju on nyt avattu. Uusia vastauksia voi taas kirjoittaa."
     pinned_enabled: "Tämä ketju on nyt kiinnitetty. Se näytetään alueensa ylimmäisenä. Kiinnityksen voi poistaa joko henkilökunnan jäsen kaikilta yhteisesti tai yksittäiset käyttäjät itseltään."
@@ -1548,11 +1492,11 @@ fi:
       same_ip_address: "Sama IP-osoite (%{ip_address}) kuin muilla käyttäjillä"
   flags_reminder:
     flags_were_submitted:
-      one: "Viestejä liputettiin yli tunti sitten. [Tarkastele niitä](/admin/flags)."
-      other: "Viestejä liputettiin yli %{count} tuntia sitten. [Tarkastele niitä](/admin/flags)."
+      one: Viestejä liputettiin yli tunti sitten. [Tarkastele niitä](/admin/flags).
+      other: Viestejä liputettiin yli %{count} tuntia sitten. [Tarkastele niitä](/admin/flags).
     subject_template:
-      one: "Yksi liputus odottaa käsittelyä"
-      other: "%{count} liputusta odottaa käsittelyä"
+      one: Yksi liputus odottaa käsittelyä
+      other: '%{count} liputusta odottaa käsittelyä'
   unsubscribe_mailer:
     title: "Peru sähköpostimuistukset"
     subject_template: "Vahvista, ettet enää halua, että %{site_title} lähettää sinulle sähköpostimuistutuksia."
@@ -1662,47 +1606,6 @@ fi:
   test_mailer:
     title: "Sähköpostipalvelun testaus"
     subject_template: "[%{email_prefix}] Sähköpostin toimitettavuustesti"
-    text_body_template: |
-      Tämä on testisähköposti osoitteesta
-
-      [**%{base_url}**][0]
-
-      Sähköpostien toimittaminen on monimutkaista. Tässä joitakin tärkeitä seikkoja, jotka sinun tulisi tarkistaa ensimmäisenä:
-
-      - *Varmista*, että `ilmoitusten sähköpostiosoitteen` from: kenttä on asetettu oikein sivuston asetuksissa. **Sähköpostin validointi tapahtuu "from"-kentän sähköpostiosoitteen verkkotunnusta vastaan**.
-
-      - Selvitä, miten sähköpostiohjelmassasi saa näkyville sähköpostin raakadatan, jotta voit tutkia viestin tunnistetiedot. Gmailissa tämä tapahtuu "näytä kokonaan" valinnalla viestin oikeassa yläkulmassa olevasta valikosta.
-
-      - **TÄRKEÄÄ:** Onko palveluntarjoajallasi syötettynä reverse DNS -kenttä verkkotunnuksille ja IP-osoitteille, joista lähetät sähköpostia? [Kokeile Reverse PTR -tietuetta][2] täällä. Jos palveluntarjoajasi ei tarjoa kunnollista reverse DNS pointer -tietuetta, on hyvin epätodennäköistä, että mikään sähköpostisi menee perille.
-
-      - Onko verkkotunnuksesi [SPF-tietue][8] oikein? [Kokeile SPF-tietuetta][1] täällä. Huomaa, että TXT on oikea tietuetyyppi SPF-tietueelle.
-
-      - Onko verkkotunnuksesi [DKIM-tietue][3] oikein? Tämä parantaa merkittävästi sähköpostin toimitettavuutta. [Kokeile DKIM-tietuetta][7] täällä.
-
-      - Jos käytät omaa sähköpostipalvelinta, tarkista että palvelimen IP-osoite [ei ole millään sähköpostin mustalla listalla][4]. Tarkista myös, että se varmasti lähettää oikean muotoisen isäntänimen HELO-viestissään, joka palauttaa oikean DNS-tietueen. Jos näin ei ole, monet sähköpostipalvelut hylkäävät viestin.
-
-      - Suosittelemme vahvasti, että **lähetät testisähköpostin osoitteeseen [mail-tester.com][mt]** varmistaaksesi, että kaikki yllä mainittu toimii kunnolla.
-
-      (*Helpoin* tapa on luoda ilmainen tili [Sendgridiin][md], [SparkPostiin][sp][Mailguniin][mg] tai [Mailjetiin][mj], joiden ilmaiset palvelut riittävät hyvin pienen yhteisön käyttöön. Muista silti asettaa SPF- ja DKIM-tietueet DNS:ään!)
-
-      Toivottavasti tämä testisähköposti saapui perille OK!
-
-      Onnea matkaan,
-
-      Ystäväsi [Discourselta](http://www.discourse.org)
-
-      [0]: %{base_url}
-      [1]: http://www.kitterman.com/spf/validate.html
-      [2]: http://mxtoolbox.com/ReverseLookup.aspx
-      [3]: http://www.dkim.org/
-      [4]: http://whatismyipaddress.com/blacklist-check
-      [7]: https://www.mail-tester.com/spf-dkim-check
-      [8]: http://www.openspf.org/SPF_Record_Syntax
-      [sg]: https://goo.gl/r1WMF6
-      [sp]: https://www.sparkpost.com/
-      [mg]: http://www.mailgun.com/
-      [mj]: https://www.mailjet.com/pricing
-      [mt]: http://www.mail-tester.com/
   new_version_mailer:
     title: "Uusi versio"
     subject_template: "[%{email_prefix}] Uusi Discourse-versio, päivitys saatavilla"
@@ -1747,14 +1650,28 @@ fi:
     deferred: "Kiitos kun toit asian tietoomme. Selvitämme asiaa."
     deferred_and_deleted: "Kiitos kun toit asian tietoomme. Poistimme kyseisen viestin."
   temporarily_closed_due_to_flags:
-    one: "Ketju on suljettu väliaikaisesti 1 tunnin ajan suuren lippumäärän vuoksi."
-    other: "Ketju on suljettu väliaikaisesti %{count} tunnin ajan suuren lippumäärän vuoksi."
+    one: Ketju on suljettu väliaikaisesti 1 tunnin ajan suuren lippumäärän vuoksi.
+    other: Ketju on suljettu väliaikaisesti %{count} tunnin ajan suuren lippumäärän vuoksi.
   system_messages:
     private_topic_title: "Ketju #%{id}"
     contents_hidden: "Käy lukemassa viesti, jotta näet sen sisällön."
     post_hidden:
       title: "Viesti piilotettu"
       subject_template: "Yhteisön piiloon liputtama viesti"
+      text_body_template: |
+        Hei,
+
+        Tämä automaattinen viesti lähetettiin sivustolta %{site_name} kertoaksemme sinulle, että viestisi piilotettiin.
+
+        <%{base_url}%{url}>
+
+        %{flag_reason}
+
+        Usea sivuston käyttäjä liputti viestin ennen sen piilottamista, joten mieti miten voisit muokata sitä heidän antamansa palautteen pohjalta. **Kun %{edit_delay} minuuttia on kulunut, voit muokata viestiä, mikä palauttaa sen näkyville.**
+
+        Jos viesti kuitenkin piilotetaan toisen kerran, se pysyy piilotettuna, kunnes henkilökunta selvittää tilanteen.
+
+        Saadaksesi lisätietoja, lue [yhteisön säännöt](%{base_url}/guidelines).
     usage_tips:
       text_body_template: |
         [Tässä blogikirjoituksessa](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/) on joitakin käteviä vinkkejä uudelle käyttäjälle.
@@ -1851,7 +1768,6 @@ fi:
         ```
     csv_export_succeeded:
       title: "CSV:n vienti onnistui"
-      subject_template: "Datan vieminen on tehty"
       text_body_template: |
         Tietojen vienti onnistui! :dvd:
 
@@ -2094,8 +2010,8 @@ fi:
     pending_users_reminder:
       title: "Käyttäjiä jonossa"
       subject_template:
-        one: "1 käyttäjä odottaa hyväksymistä"
-        other: "%{count} käyttäjää odottaa hyväksymistä"
+        one: 1 käyttäjä odottaa hyväksymistä
+        other: '%{count} käyttäjää odottaa hyväksymistä'
       text_body_template: |
         Uusia käyttäjiä odottaa hyväksymistä (tai hylkäämistä) ja pääsyä palstalle.
 
@@ -2123,8 +2039,8 @@ fi:
     queued_posts_reminder:
       title: "Muistutukset jonossa olevista viesteistä"
       subject_template:
-        one: "Yksi viesti odottaa tarkastusta"
-        other: "%{count} viestiä odottaa tarkastusta"
+        one: Yksi viesti odottaa tarkastusta
+        other: '%{count} viestiä odottaa tarkastusta'
       text_body_template: |
         Hei
 
@@ -2142,8 +2058,8 @@ fi:
   user_notifications:
     previous_discussion: "Edelliset vastaukset"
     reached_limit:
-      one: "Huom. Olemme lähettäneet jo yhden sähköpostin tänään, mikä on enimmäismäärä. Käy sivustolla, jottet jää mistään paitsi. PS. Kiitos kun olet niin suosittu!"
-      other: "Huom. Olemme lähettäneet jo %{count} sähköpostia tänään, mikä on enimmäismäärä. Käy sivustolla, jottet jää mistään paitsi. PS. Kiitos kun olet niin suosittu!"
+      one: Huom. Olemme lähettäneet jo yhden sähköpostin tänään, mikä on enimmäismäärä. Käy sivustolla, jottet jää mistään paitsi. PS. Kiitos kun olet niin suosittu!
+      other: Huom. Olemme lähettäneet jo %{count} sähköpostia tänään, mikä on enimmäismäärä. Käy sivustolla, jottet jää mistään paitsi. PS. Kiitos kun olet niin suosittu!
     in_reply_to: "Vastauksena"
     unsubscribe:
       title: "Peru tilaus"
@@ -2324,7 +2240,7 @@ fi:
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
-        %{message}
+          %{message}
     account_suspended:
       title: "Tili hyllytetty"
       subject_template: "[%{email_prefix}] Tilisi on hyllytetty"
@@ -2441,19 +2357,6 @@ fi:
     signup_after_approval:
       title: "Liity hyväksynnän jälkeen"
       subject_template: "Sinut on hyväksytty sivustolle %{site_name}!"
-      text_body_template: |
-        Kiitos kun liityit %{site_name} ja tervetuloa!
-
-        Henkilökunnan jäsen hyväksyi tunnuksesi sivustolla %{site_name}.
-
-        Vahvista ja aktivoi uusi tunnuksesi klikkaamalla linkkiä:
-        %{base_url}/u/activate-account/%{email_token}
-
-        %{new_user_tips}
-
-        Vaalimme [sivistynyttä yhteisökäyttäytymistä](%{base_url}/guidelines) tilanteessa kuin tilanteessa.
-
-        Toivottavasti viihdyt!
     signup:
       title: "Liity"
       subject_template: "[%{email_prefix}] Vahvista uusi käyttäjätilisi"
@@ -2490,6 +2393,7 @@ fi:
     store_failure: "Latauksen #%{upload_id} käyttäjälle #%{user_id} tallentaminen epäonnistui."
     file_missing: "Pahoittelut, sinun täytyy valita tiedosto joka ladataan."
     empty: "Pahoittelut, mutta tiedostosi on tyhjä."
+    png_to_jpg_conversion_failure_message: "PNG:n muuttamisessa JPG:ksi tapahtui virhe."
     attachments:
       too_large: "Pahoittelut, tiedosto jonka latausta yritit on liian suuri ( suurin tiedostokoko on %{max_size_kb}KB)."
     images:
@@ -2531,7 +2435,7 @@ fi:
     light_theme_name: "Vaalea"
   about: "Tietoja"
   guidelines: "Ohjeet"
-  privacy: "Yksityisyys"
+  privacy: "Tietosuoja"
   edit_this_page: "Muokkaa tätä sivua"
   csv_export:
     boolean_yes: "Kyllä"
@@ -2637,11 +2541,11 @@ fi:
 
       ## [Käyttöehdot](#tos)
 
-      Kyllä, lakikieli on tylsää, mutta meidän on suojeltava itseämme &ndash; ja siinä sivussa sinua ja sinun tietojasi &ndash; epäsuotuisia tahoja vastaan. Palstalla on [käyttöehdot](/tos), jotka säätelevät sinun (ja meidän) toimintaa ja oikeuksia sisältöön, yksityisyyteen ja lakeihin liittyen. Jotta voit käyttää palvelua, sinun on hyväksyttävä [käyttöehdot](/tos).
+      Kyllä, lakikieli on tylsää, mutta meidän on suojeltava itseämme &ndash; ja siinä sivussa sinua ja sinun tietojasi &ndash; epäsuotuisia tahoja vastaan. Palstalla on [käyttöehdot](/tos), jotka säätelevät sinun (ja meidän) toimintaa ja oikeuksia sisältöön, tietosuojaan ja lakeihin liittyen. Jotta voit käyttää palvelua, sinun on hyväksyttävä [käyttöehdot](/tos).
   tos_topic:
     title: "Käyttöehdot"
   privacy_topic:
-    title: "Rekisteriseloste"
+    title: "Tietosuojaseloste"
     body: |
       <a name="collect"></a>
 
@@ -2709,7 +2613,7 @@ fi:
 
       ## [Tietosuojaseloste koskee vain internetiä](#online)
 
-      Tämä tietosuojakäytäntö koskee vain sivustomme kautta kerättyä tietoa eikä siten koske verkon ulkopuolelta kerättyä tietoa.
+      Tämä tietosuojaseloste koskee vain sivustomme kautta kerättyä tietoa eikä siten koske verkon ulkopuolelta kerättyä tietoa.
 
       <a name="consent"></a>
 
@@ -2732,22 +2636,22 @@ fi:
         Tämä ansiomerkki myönnetään, kun ensimmäistä kertaa muokkaat viestiäsi. Viestiä ei voi muokata kuin määrätyn ajan viestin lähettämisen jälkeen, mutta sinä aikana muokkaaminen on aina hyvä ajatus. Voit parannella viestiä, korjata pieniä virheitä tai lisätä jotakin, mikä pääsi unohtumaan viestin kirjoittamisen hetkellä. Muokkaa viesteistäsi entistäkin parempia!
     basic_user:
       name: Haastaja
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Myönnetty</a> kaikki palstan välttämättömimmät toiminnot
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">Myönnetty</a> kaikki palstan välttämättömimmät toiminnot"
       long_description: |
         Tämä ansiomerkki myönnetään, kun nouset luottamustasolle 1. Kiitos siitä, että olet päättänyt antaa palstalle mahdollisuuden ja lukenut muutamaa ketjua ottaaksesi selvää, mistä yhteisössä on kyse. Uuden käyttäjän rajoituksia on nyt poistettu; sait käyttöösi välttämättömimmät palstan toiminnot kuten yksityisviestit, liputtamisen, wiki-viestien muokkaamisen ja oikeuden laittaa viestiin useampia kuvia ja linkkejä.
     member:
       name: Konkari
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Myönnetty</a> kutsut, ryhmäviestit ja lisää tykkäyksiä
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">Myönnetty</a> kutsut, ryhmäviestit ja lisää tykkäyksiä"
       long_description: |
         Tämä ansiomerkki myönnetään, kun nouset luottamustasolle 2. Kiitos siitä, että olet ollut keskuudessamme viikkojen ajan ja tullut osaksi yhteisöä. Voit nyt lähettää kutsuja käyttäjäsivultasi ja ketjuista, aloittaa ryhmäviestejä ja käytössäsi on muutama tykkäys enemmän päivää kohden.
     regular:
       name: Mestari
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Myönnetty</a> ketjujen siirto toiselle alueelle ja uudelleen nimeäminen, hakukoneiden seuraamat linkit, wiki-viestit ja lisää tykkäyksiä
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">Myönnetty</a> ketjujen siirto toiselle alueelle ja uudelleen nimeäminen, hakukoneiden seuraamat linkit, wiki-viestit ja lisää tykkäyksiä"
       long_description: |
         Tämä ansiomerkki myönnetään, kun nouset luottamustasolle 3. Kiitos kun olet ollut tärkeä osa yhteisöä kuukausien ajan. Olet yksi innokkaimmista lukijoista ja luotettava sisällön tuottaja, ja olet tekemässä yhteisöstä niin hienoa kuin se on. Voit nyt siirtää alueelta toiselle ja uudelleennimetä ketjuja, roskapostiliputuksesi ovat tehokkaampia, pääset lounge-alueelle ja käytössäsi on selvästi enemmän tykkäyksiä päivää kohden.
     leader:
       name: Johtaja
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Myönnetty</a> minkä tahansa viestin muokkaaminen, kiinnittäminen, sulkeminen, arkistoiminen, pilkkominen ja yhdistäminen ja lisää tykkäyksiä
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">Myönnetty</a> minkä tahansa viestin muokkaaminen, kiinnittäminen, sulkeminen, arkistoiminen, pilkkominen ja yhdistäminen ja lisää tykkäyksiä"
       long_description: |
         Tämä ansiomerkki myönnetään, kun nouset luottamustasolle 4. Palstan henkilökunta on valinnut sinut johtajaksi. Näytät muille positiivista esimerkkiä sanoin ja teoin. Voit nyt muokata mitä tahansa viestiä ja käytössäsi on yleiset valvojatyökalut, joilla voit hallita ketjuja kuten kiinnittäminen, sulkeminen, listauksista poistaminen, arkistoiminen, pilkkominen ja yhdistäminen, ja käytössäsi on paljon enemmän tykkäyksiä päivää kohden.
     welcome:
@@ -2757,12 +2661,12 @@ fi:
         Tämä ansiomerkki myönnetään, kun viestistäsi tykätään ensi kertaa. Onnittelut, olet tuottanut jotakin, mitä toinen käyttäjä on pitänyt mielenkiintoisena, hauskana tai hyödyllisenä!
     autobiographer:
       name: Omaelämäkerta
-      description: Täytti <a href="%{base_uri}/my/preferences/profile">käyttäjätiedot</a>
+      description: "Täytti <a href=\"%{base_uri}/my/preferences/profile\">käyttäjätiedot</a>"
       long_description: |
         Tämä ansiomerkki myönnetään, kun täytät <a href="%{base_uri}/my/preferences/profile">käyttäjätiedot</a> ja valitset profiilikuvan. Kertomalla hieman itsestäsi ja kiinnostuksen kohteistasi edistät yhteisöllisyyttä. Liity meihin!
     anniversary:
       name: Vuosipäivä
-      description: Aktiivinen jäsen vuoden ajan, kirjoittanut ainakin yhden viestin
+      description: "Aktiivinen jäsen vuoden ajan, kirjoittanut ainakin yhden viestin"
       long_description: |
         Tämä ansiomerkki myönnetään aina, kun olet jäsenenä vuoden ajan ja kirjoitat sinä aikana ainakin yhden viestin. Kiitos, kun olet yhä keskuudessamme ja antanut panoksesi yhteisön hyväksi. Emme pärjäisi ilman sinua.
     nice_post:
@@ -2798,18 +2702,18 @@ fi:
 
     nice_share:
       name: Hyvä jako
-      description: Jakoi viestin, ja linkin kautta saapui 25 vierailijaa
+      description: "Jakoi viestin, ja linkin kautta saapui 25 vierailijaa"
       long_description: |+
         Tämä ansiomerkki myönnetään, kun jaat linkin, jota klikkaa 25 ulkopuolista vierailijaa. Kiitos kun levität sanaa palstan keskusteluista ja yhteisöstä.
 
     good_share:
       name: Erinomainen jako
-      description: Jakoi viestin, ja linkin kautta saapui 300 vierailijaa
+      description: "Jakoi viestin, ja linkin kautta saapui 300 vierailijaa"
       long_description: |
         Tämä ansiomerkki myönnetään, kun jaat linkin, jota klikkaa 300 ulkopuolista vierailijaa. Hyvää työtä! Olet esitellyt upean keskustelun joukolle uusia ihmisiä ja siten auttanut yhteisöä kasvamaan.
     great_share:
       name: Loistava jako
-      description: Jakoi viestin, ja linkin kautta saapui 1000 vierailijaa
+      description: "Jakoi viestin, ja linkin kautta saapui 1000 vierailijaa"
       long_description: |
         Tämä ansiomerkki myönnetään, kun jaat linkin, jota klikkaa 1000 ulkopuolista vierailijaa. Vau! Olet mainostanut kiinnostavaa keskustelua valtavalle joukolle uusia ihmisiä ja siten auttanut yhteisöä kasvamaan merkittävästi.
     first_like:
@@ -2825,8 +2729,6 @@ fi:
     promoter:
       name: Markkinoija
       description: Kutsui käyttäjän
-      long_description: |
-        Tämä ansiomerkki myönnetään, kun kutsut jonkun yhteisöön käyttäjäsivusi kutsutoiminnolla tai ketjun alla sijaitsevan painikkeen avulla. Keskustelusta mahdollisesti kiinnostuneen ystävän kutsuminen on hyvä tapa esitellä yhteisöä uusille ihmisille, joten kiitos!
     campaigner:
       name: Kampanjoija
       description: Kutsui kolme haastajaa (luottamustaso 1)
@@ -2854,27 +2756,27 @@ fi:
         Tämä ansiomerkki myönnetään, kun ensi kerran lainaat viestiä vastauksessasi. Edellisten viestien olennaisten osien lainaaminen auttaa pitämään keskustelun yhtenäisenä ja aiheen mukaisena. Helpoin tapa on maalata viestin osa ja sitten painaa vastaa-painiketta. Lainaa runsaasti!
     read_guidelines:
       name: Luki ohjeet
-      description: Luki <a href="%{base_uri}/guidelines">yhteisön säännöt</a>
+      description: "Luki <a href=\"%{base_uri}/guidelines\">yhteisön säännöt</a>"
       long_description: |
         Tämä ansiomerkki myönnetään, kun <a href="%{base_uri}/guidelines">luet yhteisön säännöt</a>. Noudattamalla ja jakamalla näitä yksinkertaisia ohjeita edistät yhteisön turvallisuutta, viihtyisyyttä ja jatkuvuutta. Muista aina, että toisessa päässä on toinen ihminen, hyvin itsesi kaltainen. Ole kohtelias!
     reader:
       name: Lukutoukka
-      description: Luki jokaisen viestin ketjusta, jossa on enemmän kuin 100 vastausta
+      description: "Luki jokaisen viestin ketjusta, jossa on enemmän kuin 100 vastausta"
       long_description: |
         Tämä ansiomerkki myönnetään, kun ensi kerran luet pitkän, vähintään 100 vastauksen ketjun. Keskustelua huolellisesti lukemalla tiedät missä mennään ja ymmärrät eri näkökulmia, mikä johtaa mielenkiintoisempiin keskusteluihin. Mitä enemmän luet, sitä parempaa on vuoropuhelu. Kuten tapaamme sanoa, lukeminen on kaiken A ja O! :slight_smile:
     popular_link:
       name: Suosittu linkki
-      description: Linkitti ulkoiselle sivustolle, ja linkkiä klikattiin 50 kertaa
+      description: "Linkitti ulkoiselle sivustolle, ja linkkiä klikattiin 50 kertaa"
       long_description: |
         Tämä ansiomerkki myönnetään, kun linkkiäsi klikataan 50 kertaa. Kiitos kun laitoit hyödyllisen linkin, joka toi mielenkiintoista sisältöä kekusteluun!
     hot_link:
       name: Kuuma linkki
-      description: Linkitti ulkoiselle sivustolle, ja linkkiä klikattiin 300 kertaa
+      description: "Linkitti ulkoiselle sivustolle, ja linkkiä klikattiin 300 kertaa"
       long_description: |
         Tämä ansiomerkki myönnetään, kun linkkiäsi klikataan 300 kertaa. Kiitos kun laitoit kiehtovan linkin, joka vei keskustelua eteenpäin ja todella edisti keskustelua!
     famous_link:
       name: Kuuluisa linkki
-      description: Linkitti ulkoiselle sivustolle, ja linkkiä klikattiin 1000 kertaa
+      description: "Linkitti ulkoiselle sivustolle, ja linkkiä klikattiin 1000 kertaa"
       long_description: |
         Tämä ansiomerkki myönnetään, kun linkkisi saa 1000 klikkausta. Vau! Sen sisältö paransi keskustelua merkittävästi. Hyvin tehty!
     appreciated:
@@ -2925,16 +2827,14 @@ fi:
     first_emoji:
       name: Ensimmäinen Emoji
       description: Käytti Emojia viestissä
-      long_description: |
-        Tämä ansiomerkki myönnetään, kun ensimmäisen kerran lisäät emojin viestiisi :thumbsup:. Emojin avulla voit viestiä tunteita, ilosta :smiley: suruun :anguished: ja vihaan :angry: ja kaikkea siltä väliltä :sunglasses: . Kirjoita vain : (kaksoispiste) tai paina Emoji painiketta tekstieditorin valikossa valitaksesi sadoista vaihtoehdoista :ok_hand:
     first_mention:
       name: Ensimmäinen maininta
       description: Mainitsi käyttäjän viestissä
-      long_description: Tämä ansiomerkki myönnetään, kun ensimmäistä kertaa mainitset jonkun @käyttäjänimen viestissäsi. Tämä käyttäjä saa ilmoituksen viestistäsi. Aloita vain kirjoittamaan @ (at-merkki) mainitaksesi käyttäjän tai, jos sallittua, ryhmän – se on helppo tapa tuoda jotain toisten huomioon.
+      long_description: "Tämä ansiomerkki myönnetään, kun ensimmäistä kertaa mainitset jonkun @käyttäjänimen viestissäsi. Tämä käyttäjä saa ilmoituksen viestistäsi. Aloita vain kirjoittamaan @ (at-merkki) mainitaksesi käyttäjän tai, jos sallittua, ryhmän – se on helppo tapa tuoda jotain toisten huomioon."
     first_onebox:
       name: Ensimmäinen Onebox
-      description: Lähetti linkin, josta tehtiin onebox
-      long_description: Tämä ansiomerkki myönnetään, kun ensimmäistä kertaa lisäät linkin omalle rivilleen, josta sitten automaattisesti tehdään onebox esikatselu otsikolla, lyhyellä kuvauksella ja (jos saatavilla) kuvalla.
+      description: "Lähetti linkin, josta tehtiin onebox"
+      long_description: "Tämä ansiomerkki myönnetään, kun ensimmäistä kertaa lisäät linkin omalle rivilleen, josta sitten automaattisesti tehdään onebox esikatselu otsikolla, lyhyellä kuvauksella ja (jos saatavilla) kuvalla."
     first_reply_by_email:
       name: Ensimmäinen vastaus sähköpostilla
       description: Vastasi sähköpostilla
@@ -2948,19 +2848,18 @@ fi:
     enthusiast:
       name: Intoilija
       description: Vieraili 10 päivänä
-      long_description: Tämä ansiomerkki myönnetään, kun olet vieraillut 10 peräkkäisenä päivänä. Kiitos kun olet ollut kanssamme yli viikon ajan!
+      long_description: "Tämä ansiomerkki myönnetään, kun olet vieraillut 10 peräkkäisenä päivänä. Kiitos kun olet ollut kanssamme yli viikon ajan!"
     aficionado:
       name: Hullaantunut
       description: Vieraili 100 päivänä
-      long_description: Tämä ansiomerkki myönnetään, kun olet vieraillut 100 peräkkäisenä päivänä. Sehän on yli kolme kuukautta!
+      long_description: "Tämä ansiomerkki myönnetään, kun olet vieraillut 100 peräkkäisenä päivänä. Sehän on yli kolme kuukautta!"
     devotee:
       name: Omistautunut
       description: Vieraili 365 päivänä
-      long_description: Tämä ansiomerkki myönnetään, kun olet vieraillut 365 peräkkäisenä päivänä. Vau, kokonainen vuosi!
+      long_description: "Tämä ansiomerkki myönnetään, kun olet vieraillut 365 peräkkäisenä päivänä. Vau, kokonainen vuosi!"
     badge_title_metadata: "%{display_name} -ansiomerkki sivustolla %{site_title}"
   admin_login:
     success: "Sähköposti lähetetty"
-    error: "Virhe!"
     email_input: "Ylläpitäjän sähköpostiosoite"
     submit_button: "Lähetä sähköposti"
   performance_report:
@@ -3045,7 +2944,7 @@ fi:
             description: "Tämän käyttäjän nimissä Discourse lähettää käyttäjille kaikki automaattiset yksityisviestit, kuten liputusvaroitukset ja ilmoitukset valmistuneista varmuuskopioista."
       corporate:
         title: "Organisaatio"
-        description: "Nämä nimet näkyvät <a href='/privacy' target='blank'>rekisteriselosteen</a> ja <a href='/tos' target='blank'>käyttöehtojen</a> yhteydessä, joita voit milloin vain muokata henkilökunta-alueella. Jos taustalla ei ole yritystä, voit hypätä tämän vaiheen yli toistaiseksi."
+        description: "Nämä nimet näkyvät <a href='/privacy' target='blank'>tietosuojaselosteen</a> ja <a href='/tos' target='blank'>käyttöehtojen</a> yhteydessä, joita voit milloin vain muokata henkilökunta-alueella. Jos taustalla ei ole yritystä, voit hypätä tämän vaiheen yli toistaiseksi."
         fields:
           company_short_name:
             label: "Yrityksen nimi (lyhyesti)"
@@ -3105,6 +3004,5 @@ fi:
         description: |
           <p>Jos milloin tahansa haluat muuttaa asetuksia, käy <a href='/admin' target='_blank'>ylläpito-osiossa</a>; löydät sen jakoavainkuvakkeen vierestä sivuston valikosta.</p>
           <p>Onnea ja menestystä <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>uuden yhteisön rakentamiseen!</a></p>
-  activemodel:
-    errors:
-      <<: *errors
+  search_logs:
+    graph_title: "Hakujen määrä"
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index d98e8f0f079..eaac77ae3e0 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -17,30 +17,51 @@ fr:
       date_only: "%B %-d, %Y"
       long: "%B %-d, %Y, %l:%M%P"
   date:
-    month_names: [null, janvier, février, mars, avril, mai, juin, juillet, août, septembre, octobre, novembre, décembre]
+    month_names: [~, janvier, février, mars, avril, mai, juin, juillet, août, septembre, octobre, novembre, décembre]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "am"
     pm: "pm"
-    <<: *datetime_formats
   title: "Discourse"
   topics: "Sujets"
   posts: "messages"
   loading: "Chargement"
-  powered_by_html: 'Propulsé par <a href="https://www.discourse.org">Discourse</a>, nécessite l''activation de JavaScript '
+  powered_by_html: 'Powered by <a href="https://www.discourse.org">Discourse</a>,  le rendu est meilleur avec le JavaScript activé '
   log_in: "Se connecter"
+  submit: "Envoyer"
   purge_reason: "Supprimé automatiquement comme compte abandonné et non activé"
   disable_remote_images_download_reason: "Le téléchargement des images externes a été désactivé faute de place suffisante sur le disque."
   anonymous: "Anonyme"
   remove_posts_deleted_by_author: "Supprimé par l'auteur"
+  redirect_warning: "Nous n'avons pas été en mesure de vérifier que le lien que vous avez sélectionné a bien été posté sur le forum. Si vous souhaitez quand même continuer, sélectionnez le lien ci-dessous."
   themes:
     bad_color_scheme: "Impossible de mettre à jour le thème, la palette de couleur est invalide"
     other_error: "Il y a eu un problème pendant la mise à jour du thème"
+    error_importing: "Erreur de clonage du dépôt git, l'accès est refusé ou le dépôt n'est pas trouvé."
+    settings_errors:
+      invalid_yaml: "Le YAML est invalide"
+      data_type_not_a_number: "Le type du paramètre `%{name}` n'est pas supporté. Les types supportés sont `integer`, `bool`, `list` et `enum`"
+      name_too_long: "Il y a un paramètre avec un nom trop long. Longueur maximum 255"
+      default_value_missing: "Le paramètre `%{name}` n'a pas de valeur par défaut"
+      default_not_match_type: "Le type de la valeur par défaut de paramètre `%{name}` ne correspond pas au type du paramètre."
+      default_out_range: "La valeur par défaut de paramètre `%{name}` n'est pas dans la plage spécifiée."
+      enum_value_not_valid: "La valeur séléctionnée ne fait pas partie des choix enum."
+      number_value_not_valid: "La nouvelle valeur n'est pas dans la plage autorisée."
+      number_value_not_valid_min_max: "Doit être comprise entre %{min} et %{max}."
+      number_value_not_valid_min: "Doit être supérieure ou égale à %{min}."
+      number_value_not_valid_max: "Doit être inférieur ou égal à %{max}."
+      string_value_not_valid: "La longueur de la nouvelle valeur n'est pas dans la plage autorisée."
+      string_value_not_valid_min_max: "Doit être compris(e) entre %{min} et %{max} caractères."
+      string_value_not_valid_min: "Doit être d'au moins %{count} caractères."
+      string_value_not_valid_max: "Doit être de %{max} caractères au plus."
   emails:
     incoming:
       default_subject: "Ce sujet a besoin d'un titre"
       show_trimmed_content: "Montrer le contenu raccourci"
-      maximum_staged_user_per_email_reached: "Vous avez atteint le nombre maximal d'utilisateurs qui peuvent être créés par courriel."
+      maximum_staged_user_per_email_reached: "Vous avez atteint le nombre maximal d'utilisateurs distants qui peuvent être créés par courriel."
+      no_subject: "(aucun objet)"
+      no_body: "(aucun texte)"
       errors:
         empty_email_error: "Se produit quand le courriel reçu était vide."
         no_message_id_error: "Se produit quand le courriel n'a pas d'entête \"Message-Id\"."
@@ -72,23 +93,24 @@ fr:
       present: doit être vide
       confirmation: "ne correspond pas à %{attribute}"
       empty: ne peut être vide
-      equal_to: doit être égal à %{count}
+      equal_to: "doit être égal à %{count}"
       even: doit être paire
       exclusion: est réservé
-      greater_than: doit être supérieure à %{count}
-      greater_than_or_equal_to: doit être supérieur ou égal à %{count}
+      greater_than: "doit être supérieure à %{count}"
+      greater_than_or_equal_to: "doit être supérieur ou égal à %{count}"
       has_already_been_used: "a déjà été utilisée"
       inclusion: n'est pas inclus dans la liste
       invalid: est invalide
       is_invalid: "ne semble pas clair, est-ce une phrase complète ?"
       contains_censored_words: "contient les mots censurés suivants : %{censored_words}"
-      matches_censored_pattern: "contient les mots censurés suivants qui correspondent à l'expression régulière : %{censored_words}"
-      less_than: doit être inférieure à %{count}
-      less_than_or_equal_to: doit être inférieur ou égal à %{count}
+      less_than: "doit être inférieure à %{count}"
+      less_than_or_equal_to: "doit être inférieur ou égal à %{count}"
       not_a_number: n'est pas un nombre
       not_an_integer: doit être un entier
       odd: doit être impair
       record_invalid: 'Validation échouée : %{errors}'
+      max_emojis: "limité à %{max_emojis_count}emoji"
+      ip_address_already_screened: "est déjà inclus dans une règle existante"
       restrict_dependent_destroy:
         one: "Impossible de supprimer l'enregistrement car certains %{record} existent et en dépendent"
         many: "Impossible de supprimer l'enregistrement car un %{record} existe et en dépend"
@@ -110,14 +132,27 @@ fr:
     embed:
       load_from_remote: "Il y a eu une erreur lors du chargement de ce message."
     site_settings:
+      invalid_choice:
+        one: Vous avez spécifié le choix invalide %{name}
+        other: Vous avez spécifié les choix invalides %{name}
       min_username_length_exists: "Il n'est pas possible de définir une longeur minimale de pseudo qui soit plus court qu'un pseudo qui existe déjà."
       min_username_length_range: "Il n'est pas possible de définir un minimum plus grand qu'un maximum."
       max_username_length_exists: "Il n'est pas possible de définir une longeur maximale de pseudo qui soit plus court qu'un pseudo qui existe déjà."
       max_username_length_range: "Il n'est pas possible de définir un maximum plus petit que le minimum."
       default_categories_already_selected: "Vous ne pouvez pas séléctionner une catégorie qui est utilisée dans une autre liste."
       s3_upload_bucket_is_required: "Vous ne pouvez pas activer l'upload sur S3 avant d'avoir renseigné le 's3_upload_bucket'."
+    conflicting_google_user_id: 'Le Google Account ID a changé pour ce compte ; un responsable doit intervenir pour des raisons de sécurité. Merci de contacter les responsables et les renvoyer vers <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
+  activemodel:
+    errors:
+      <<: *errors
   invite:
     not_found: "Votre jeton d'invitation est invalide. Veuillez contacter l'administrateur du site."
+    not_found_template: |
+      <p>Votre invitation à <a href="%{base_url}">%{site_name}</a> a déjà été utilisée.</p>
+
+      <p>Si vous vous rappelez de votre mot de passe vous pouvez vous <a href="%{base_url}/login">Connecter</a>.</p>
+
+      <p>Sinon, veuillez <a href="%{base_url}/password-reset">Réinitialiser mot de passe</a>.</p>
     user_exists: "Il n'y a pas besoin d'inviter <b>%{email}</b> qui <a href='/u/%{username}/summary'>a déjà un compte</a> !"
   bulk_invite:
     file_should_be_csv: "Le fichier envoyé doit être au format CSV."
@@ -129,6 +164,7 @@ fr:
     backup_file_should_be_tar_gz: "Le fichier de sauvegarde doit être une archive .tar.gz."
     not_enough_space_on_disk: "Il n'y a pas assez d'espace sur le disque pour charger cette sauvegarde."
     invalid_filename: "Le nom du fichier de sauvegarde contient des caractères invalides. Sont autorisés : a-z 0-9 . - _."
+  invalid_params: "Vous avez fourni des paramètres invalides pour la requête: %{message}"
   not_logged_in: "Vous devez être connecté pour faire cela."
   not_found: "L'URL ou ressource demandée n'a pas été retrouvé."
   invalid_access: "Vous n'avez pas la permission de voir cette ressource."
@@ -137,8 +173,8 @@ fr:
   reading_time: "Temps de lecture"
   likes: "J'aime"
   too_many_replies:
-    one: "Nous sommes désolés, mais les nouveaux utilisateurs sont temporairement limités à 1 réponse par sujet."
-    other: "Nous sommes désolés, mais les nouveaux utilisateurs sont temporairement limités à %{count} réponses par sujet."
+    one: Nous sommes désolés, mais les nouveaux utilisateurs sont temporairement limités à 1 réponse par sujet.
+    other: Nous sommes désolés, mais les nouveaux utilisateurs sont temporairement limités à %{count} réponses par sujet.
   embed:
     start_discussion: "Démarrer la discussion"
     continue: "Continuer la discussion"
@@ -148,36 +184,38 @@ fr:
     no_hosts: "Aucun hôte n'a été configuré pour l'intégration."
     configure: "Configurer l'intégration"
     more_replies:
-      one: "1 réponse supplémentaire"
-      other: "%{count} réponses supplémentaires"
+      one: 1 réponse supplémentaire
+      other: '%{count} réponses supplémentaires'
     loading: "Chargement de la discussion…"
     permalink: "Lien permanent"
     imported_from: "Il s'agit d'un sujet en provenance de l'article %{link}"
     in_reply_to: "▶ %{username}"
     replies:
-      one: "1 réponse"
-      other: "%{count} réponses"
+      one: 1 réponse
+      other: '%{count} réponses'
   no_mentions_allowed: "Désolé, vous ne pouvez pas mentionner d'autres utilisateurs."
   too_many_mentions:
-    one: "Désolé, vous ne pouvez mentionner qu'un utilisateur dans un message."
-    other: "Désolé, vous ne pouvez mentionner que %{count} utilisateurs dans un message."
+    one: Désolé, vous ne pouvez mentionner qu'un utilisateur dans un message.
+    other: Désolé, vous ne pouvez mentionner que %{count} utilisateurs dans un message.
   no_mentions_allowed_newuser: "Désolé, les nouveaux utilisateurs ne peuvent pas mentionner d'autres utilisateurs."
   too_many_mentions_newuser:
-    one: "Désolé, les nouveaux utilisateurs ne peuvent mentionner qu'un utilisateur dans un message."
-    other: "Désolé, les nouveaux utilisateurs ne peuvent mentionner que %{count} utilisateurs dans un message."
+    one: Désolé, les nouveaux utilisateurs ne peuvent mentionner qu'un utilisateur dans un message.
+    other: Désolé, les nouveaux utilisateurs ne peuvent mentionner que %{count} utilisateurs dans un message.
+  no_images_allowed_trust: "Désolé, il ne vous est pas possible d'inclure des images dans un message"
   no_images_allowed: "Désolé, les nouveaux utilisateurs ne peuvent pas ajouter d'image dans les messages."
   too_many_images:
-    one: "Désolé, les nouveaux utilisateurs ne peuvent ajouter qu'une image dans un message."
-    other: "Désolé, les nouveaux utilisateurs ne peuvent ajouter que %{count} images dans un message."
+    one: Désolé, les nouveaux utilisateurs ne peuvent ajouter qu'une image dans un message.
+    other: Désolé, les nouveaux utilisateurs ne peuvent ajouter que %{count} images dans un message.
   no_attachments_allowed: "Désolé, les nouveaux utilisateurs ne peuvent pas ajouter de fichiers dans leurs messages."
   too_many_attachments:
-    one: "Désolé, les nouveaux utilisateurs ne peuvent ajouter qu'un fichier dans leurs messages."
-    other: "Désolé, les nouveaux utilisateurs ne peuvent ajouter que %{count} fichiers dans leurs messages."
+    one: Désolé, les nouveaux utilisateurs ne peuvent ajouter qu'un fichier dans leurs messages.
+    other: Désolé, les nouveaux utilisateurs ne peuvent ajouter que %{count} fichiers dans leurs messages.
   no_links_allowed: "Désolé, les nouveaux utilisateurs ne peuvent pas insérer de liens dans leurs messages."
+  links_require_trust: "Désolé, il ne vous est pas possible d'inclure des liens dans vos messages."
   too_many_links:
-    one: "Désolé, les nouveaux utilisateurs ne peuvent insérer qu'un seul lien par message."
-    other: "Désolé, les nouveaux utilisateurs ne peuvent insérer que %{count} liens par message."
-  contains_blocked_words: "Votre message contient des mots non autorisés."
+    one: Désolé, les nouveaux utilisateurs ne peuvent insérer qu'un seul lien par message.
+    other: Désolé, les nouveaux utilisateurs ne peuvent insérer que %{count} liens par message.
+  contains_blocked_words: "Votre message contient un mot qui n'est pas permis : %{word}"
   spamming_host: "Désolé, vous ne pouvez pas insérer de lien vers ce domaine."
   user_is_suspended: "Les utilisateurs suspendus ne sont pas autorisés à poster de messages."
   topic_not_found: "Une erreur est survenue. Peut-être que ce sujet a été fermé ou supprimé pendant que vous le regardiez ?"
@@ -209,7 +247,7 @@ fr:
     top_weekly: "Meilleurs sujets de la semaine"
     top_daily: "Meilleurs sujets du jour"
     posts: "Messages récents"
-    private_posts: "Derniers messages privés"
+    private_posts: "Derniers messages directs"
     group_posts: "Derniers messages de %{group_name}"
     group_mentions: "Dernières mentions de %{group_name}"
     user_posts: "Derniers messages par @%{username}"
@@ -224,10 +262,15 @@ fr:
     not_found: "Message non trouvé ou déjà mis à jour."
   groups:
     success:
-      bulk_add: "%{users_added} utilisateurs ont bien été ajoutés au groupe."
+      bulk_add:
+        one: '%{count}utilisateur a été ajouté au groupe.'
+        other: '%{count}utilisateurs ont été ajoutés au groupe.'
     errors:
+      grant_trust_level_not_valid: "'%{trust_level}' n'est pas un niveau de confiance valide."
       can_not_modify_automatic: "Vous ne pouvez pas modifier un groupe automatique"
-      member_already_exist: "« %{username} » est déjà membre de ce groupe."
+      member_already_exist:
+        one: '''%{username}'' est déjà membre de ce groupe.'
+        other: 'Les utilisateurs suivants sont déjà membres de ce groupe: %{username}'
       invalid_domain: "'%{domain}' n'est pas un domaine valide."
       invalid_incoming_email: "« %{email} » n'est pas une adresse de courriel valide."
       email_already_used_in_group: "« %{email} » est déjà utilisé par le groupe « %{group_name} »."
@@ -247,9 +290,9 @@ fr:
       title: "Demande d'adhésion pour @%{group_name}"
   education:
     until_posts:
-      one: "1 message"
-      other: "%{count} messages"
-    new-topic: |
+      one: 1 message
+      other: '%{count} messages'
+    'new-topic': |
       Bienvenue sur %{site_name} &mdash; **merci de débuter une nouvelle conversation !**
 
       - Le titre vous semble-t-il intéressant lorsque vous le lisez à haute voix ? Est-ce une bonne synthèse de votre message ?
@@ -259,7 +302,7 @@ fr:
       - Incluez des mots fréquents dans votre sujet pour que les utilisateurs puissent le *retrouver*. Pour le regrouper avec des sujets liés, sélectionnez une catégorie.
 
       Pour plus d'info, [jettez un œil sur la charte de la communauté](/guidelines). Ce message apparaîtra uniquement pour vos premiers %{education_posts_text}.
-    new-reply: |
+    'new-reply': |
       Bienvenue sur %{site_name} &mdash; **Merci de contribuer !**
 
       - Votre réponse améliore-t-elle la discussion ?
@@ -294,44 +337,46 @@ fr:
     get_a_room: |
       ### Répondre à d'autres personnes
 
-      Vous avez déjà répondu %{count} à @%{reply_username} dans ce sujet.
+      Vous avez déjà répondu %{count} fois à @%{reply_username} dans ce sujet.
 
-      Avez-vous aussi pensé répondre à d'autres personnes dans cette discussion ? Une grande discussion implique plusieurs avis, perspectives.
+      Avez-vous aussi pensé répondre à d'autres personnes dans cette discussion ? Une grande discussion implique plusieurs avis et points de vue.
 
-      Si vous aimeriez continuer la discussion avec ce membre en particulier, [send them a personal message](/u/%{reply_username}).
+      Si vous aimeriez prolonger la discussion avec cet utilisateur en particulier, [envoyez-leur un message direct](/u/%{reply_username}).
     too_many_replies: |
-      ### Vous avez atteint le nombre de réponses maximum dans ce topic
+      ### Vous avez atteint le nombre de réponses maximum dans ce sujet
 
-      Nous sommes désolés, les nouveaux membres sont limités temporairement à %{newuser_max_replies_per_topic} réponses dans un même topic.
+      Nous sommes désolés, les nouveaux membres sont limités temporairement à %{newuser_max_replies_per_topic} réponses dans un même sujet.
 
-      Plutôt que d'ajouter une nouvelle réponse, vous pouvez éditer vos messages précédents ou visiter d'autres topics.
+      Plutôt que d'ajouter une nouvelle réponse, vous pouvez éditer vos messages précédents ou visiter d'autres sujets.
     reviving_old_topic: |
-      ### Déterrer ce sujet ?
+      ### Relancer ce sujet ?
 
-      La dernière réponse à ce sujet date d'il y a plus de %{days} jours. Votre réponse va faire remonter ce sujet en haut de la liste et notifier chaque personne qui suit cette conversation.
+      La dernière réponse à ce sujet était **%{time_ago}**. Votre réponse remettra ce sujet en tête de liste et provoquera une notification à tous les intervenants qui y ont pris part auparavant.
 
-      Êtes-vous sûr de vouloir continuer cette conversation ?
+      Etes vous sûr de vouloir continuer cette vieille conversation ?
   activerecord:
     attributes:
       category:
         name: "Nom de la catégorie"
       topic:
         title: 'Titre'
-        featured_link: 'Lien associé'
+        featured_link: 'Lien à la une'
       post:
         raw: "Corps"
       user_profile:
         bio_raw: "À propos de moi"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Vous ne pouvez joindre des avertissements qu'aux messages privés."
+              warning_requires_pm: "Vous ne pouvez associer des avertissements qu'à des messages directs."
               too_many_users: "Vous ne pouvez envoyer des avertissements qu'à un utilisateur à la fois."
-              cant_send_pm: "Désolé, vous ne pouvez pas envoyer de message privé à cet utilisateur."
+              cant_send_pm: "Désolé, vous ne pouvez pas envoyer un message direct à cet utilisateur."
               no_user_selected: "Vous devez choisir un utilisateur valide."
               reply_by_email_disabled: "Réponse par courriel désactivée."
+              target_user_not_found: "Un des utilisateurs à qui vous envoyez ce message n'a pas été retrouvé."
             featured_link:
               invalid: "est invalide. L'URL doit inclure http:// ou https://."
               invalid_category: "ne peut pas être modifié dans cette catégorie."
@@ -345,6 +390,10 @@ fr:
               unique_characters: "a trop de caractères répétés. Veuillez utiliser un mot de passe plus sécurisé."
             ip_address:
               signup_not_allowed: "L'inscription n'est pas autorisée à partir de ce compte."
+        user_email:
+          attributes:
+            user_id:
+              reassigning_primary_email: "Il n'est pas permis de réassigner une adresse courriel à un autre utilisateur."
         color_scheme_color:
           attributes:
             hex:
@@ -359,11 +408,11 @@ fr:
         custom_emoji:
           attributes:
             name:
-              taken: est déjà utilisé pas un autre emoji
+              taken: est déjà utilisé par un autre emoji
         topic_timer:
           attributes:
             execute_at:
-              in_the_past: "Doit être dans le futur"
+              in_the_past: "doit être dans le futur"
         translation_overrides:
           attributes:
             value:
@@ -372,7 +421,6 @@ fr:
           attributes:
             word:
               too_many: "Trop de mots pour cette action"
-      <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>Le champs À propos de moi de votre profil est vide,  <a href='/u/%{username_lower}/preferences/about-me'>voulez vous le remplir ?</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} n'a pas encore renseigné le champ À propos de moi de son profil</div>"
@@ -388,46 +436,47 @@ fr:
     title: "Bienvenue sur Discourse"
     body: |2
 
-      Le premier paragraphe de ce sujet épinglé sera visible comme message de bienvenue à tous les nouveaux visiteurs de votre page d'accueil. Il est important !
+        Le premier paragraphe de ce sujet épinglé sera visible comme message de bienvenue à tous les nouveaux visiteurs de votre page d'accueil. Il est important !
 
-      **Modifier le** en une brève description de votre communauté :
+        **Modifier le** en une brève description de votre communauté :
 
-      - Pour qui est-elle destinée ?
-      - Que peuvent-ils y trouver ?
-      - Pourquoi doivent-ils venir ici ?
-      - Où peuvent-ils en lire plus (liens, ressources, etc.) ?
+        - A qui est-elle destinée ?
+        - Que peuvent-ils y trouver ?
+        - Pourquoi devraient-ils venir ici ?
+        - Où peuvent-ils en savoir plus (liens, ressources, etc.) ?
 
-      <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+        <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
 
-      Vous voulez peut-être fermer ce sujet via l'administration :wrench: (dans le coin supérieur droit et le bas) afin que des réponses ne s'accumulent pas après une annonce.
+        Vous voulez peut-être fermer ce sujet via l'administration :wrench: (dans le coin supérieur droit et le bas) afin que des réponses ne s'accumulent pas après une annonce.
   lounge_welcome:
     title: "Bienvenue dans le salon"
     body: |2
 
-      Félicitation ! :confetti_ball:
+        Félicitation ! :confetti_ball:
 
-      Si vous voyez ce sujet, c'est que vous avez récemment été promu au niveau de confiance **habitué** (niveau de confiance 3).
+        Si vous voyez ce sujet, c'est que vous avez récemment été promu au niveau de confiance **habitué** (niveau de confiance 3).
 
-      Vous pouvez désormais &hellip;
+        Vous pouvez désormais &hellip;
 
-      * Modifier le titre de tous les sujets
-      * Modifier la catégorie de tous les sujets
-      * Avoir vos liens suivis ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) est retiré)
-      * Accès à un salon privé visible uniquement pour les membres de niveau de confiance 3 ou plus.
-      * Masquer un message indésirable avec seulement un drapeau.
+        * Modifier le titre de tous les sujets
+        * Modifier la catégorie de tous les sujets
+        * Avoir vos liens suivis ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) est retiré)
+        * Accès à un salon privé visible uniquement pour les membres de niveau de confiance 3 ou plus.
+        * Masquer un message indésirable avec seulement un drapeau.
 
-      Voici la [liste courante des membres habitués](/badges/3/regular). N'hésitez pas à venir dire bonjour !
+        Voici la [liste courante des membres habitués](/badges/3/regular). N'hésitez pas à venir dire bonjour !
 
-      Merci d'être une part importante de cette communauté !
+        Merci d'être une part importante de cette communauté !
 
-      (Pour plus d'information sur les niveaux de confiance [voir ce sujet][trust]. Veuillez noter que seuls les membres qui continuerons de respecter les critères garderons ce niveau de confiance.)
+        (Pour plus d'information sur les niveaux de confiance [voir ce sujet][trust]. Veuillez noter que seuls les membres qui continuerons de respecter les critères garderons ce niveau de confiance.)
 
-      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "À propos de la catégorie %{category}"
     replace_paragraph: "(Remplacez ce premier paragraphe par une brève description de votre nouvelle catégorie. Ce guide apparaîtra dans la zone de sélection de la catégorie, alors essayez de rester en dessous de 200 caractères. **Cette catégorie n'apparaîtra pas sur la page des catégories jusqu'à ce que vous ayez modifié cette description ou créé des sujets.**"
     post_template: "%{replace_paragraph}\n\nUtilisez les paragraphes suivants pour une plus longue description ou pour établir des règles :\n\n- À quoi sert cette catégorie ? Pourquoi les utilisateurs choisiraient-ils cette catégorie pour leur discussion ?\n\n- En quoi est-elle différente des autres catégories existantes ?\n\n- Quels sujets devraient figurer dans cette catégorie ?\n\n- Avons-nous besoin de cette catégorie ? Devrions-nous fusionner celle-ci avec une autre catégorie ?\n"
     errors:
+      not_found: "Catégorie introuvée !"
       uncategorized_parent: "Sans catégorie ne peut pas avoir de parent"
       self_parent: "Le parent d'une sous-catégorie ne peut pas être elle-même"
       depth: "Vous ne pouvez pas imbriquer une sous-catégorie sous une autre"
@@ -439,8 +488,8 @@ fr:
       uncategorized: "Vous ne pouvez pas supprimer Sans Catégorie"
       has_subcategories: "Vous ne pouvez pas supprimer cette catégorie car elle a des sous-catégories."
       topic_exists:
-        one: "Vous ne pouvez pas supprimer cette catégorie car elle contient 1 sujet. Le plus vieux sujet est %{topic_link}."
-        other: "Vous ne pouvez pas supprimer cette catégorie car elle contient %{count} sujets. Le plus vieux sujet est %{topic_link}."
+        one: Vous ne pouvez pas supprimer cette catégorie car elle contient 1 sujet. Le plus vieux sujet est %{topic_link}.
+        other: Vous ne pouvez pas supprimer cette catégorie car elle contient %{count} sujets. Le plus vieux sujet est %{topic_link}.
       topic_exists_no_oldest: "Vous ne pouvez pas supprimer cette catégorie car le nombre de sujet est de %{count}."
     uncategorized_description: "Sujets qui n'ont pas besoin d'une catégorie ou qui ne correspondent à aucune catégorie existante."
   trust_levels:
@@ -459,103 +508,103 @@ fr:
     image_placeholder:
       broken: "Cette image ne fonctionne pas"
   rate_limiter:
-    slow_down: "Vous avez réalisé cette action un trop grand nombre de fois, essayez à nouveau plus tard."
-    too_many_requests: "Nous avons une limite journalière du nombre d'actions qui peuvent être effectuées. Veuillez patienter %{time_left} avant de recommencer."
+    slow_down: "Vous avez réalisé cette action un trop grand nombre de fois, merci d'essayer à nouveau plus tard."
+    too_many_requests: "Vous avez effectué cette action trop de fois. Merci d'attendre %{time_left}avant de ressayer."
     by_type:
-      first_day_replies_per_day: "Vous avez atteint le nombre maximum de réponses qu'un nouvel utilisateur peut créer pour son premier jour. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau."
-      first_day_topics_per_day: "Vous avez atteint le nombre maximum de sujets qu'un nouvel utilisateur peut créer pour son premier jour. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau."
-      create_topic: "Vous créez des sujets trop rapidement. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau."
-      create_post: "Vous répondez trop rapidement. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau."
-      delete_post: "Vous effacez des messages trop rapidement. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau."
+      first_day_replies_per_day: "Vous avez atteint le nombre maximum de réponses qu'un nouvel utilisateur peut créer pour son premier jour. Merci de patienter %{time_left} avant d'essayer à nouveau."
+      first_day_topics_per_day: "Vous avez atteint le nombre maximum de sujets qu'un nouvel utilisateur peut créer pour son premier jour. Merci de patienter %{time_left} avant d'essayer à nouveau."
+      create_topic: "Vous créez des sujets trop rapidement. Merci de patienter %{time_left} avant d'essayer à nouveau."
+      create_post: "Vous répondez trop rapidement. Merci de patienter %{time_left} avant d'essayer à nouveau."
+      delete_post: "Vous effacez des messages trop rapidement. Merci de patienter %{time_left} avant d'essayer à nouveau."
       public_group_membership: "Vous rejoignez et/ou quittez des groupes trop souvent. Veuillez attendre %{time_left} avant d'essayer à nouveau."
       topics_per_day: "Vous avez atteint le nombre maximum de nouveaux sujets pour aujourd'hui. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau."
-      pms_per_day: "Vous avez atteint le nombre maximum de nouveaux messages pour aujourd'hui. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau."
-      create_like: "Vous avez atteint le nombre maximum de J'aime pour aujourd'hui. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau."
-      create_bookmark: "Vous avez atteint le nombre maximum de favoris pour aujourd'hui. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau."
-      edit_post: "Vous avez atteint le nombre maximum de modifications pour aujourd'hui. Veuillez patienter %{time_left} avant d'essayer à nouveau."
-      live_post_counts: "Vous demandez le nombre de posts en activité trop rapidement. Veuillez respecter le temps d'attente %{time_left} avant de réessayer."
-      unsubscribe_via_email: "Vous avez atteint le nombre maximum de désinscriptions par email pour aujourd'hui. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau."
-      topic_invitations_per_day: "Vous avez atteint le nombre maximum d'invitations dans un sujet pour aujourd'hui. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau."
+      pms_per_day: "Vous avez atteint le nombre maximum de nouveaux messages. Merci de patienter %{time_left} avant d'essayer à nouveau."
+      create_like: "Vous avez atteint le nombre maximum de J'aime. Merci de patienter %{time_left} avant d'essayer à nouveau."
+      create_bookmark: "Vous avez atteint le nombre maximum de signets. Merci de patienter %{time_left} avant d'essayer à nouveau."
+      edit_post: "Vous avez atteint le nombre maximum de modifications. Merci de patienter %{time_left} avant d'essayer à nouveau."
+      live_post_counts: "Vous demandez le nombre de messages en activité trop rapidement. Veuillez respecter le temps d'attente %{time_left} avant de réessayer."
+      unsubscribe_via_email: "Vous avez atteint le nombre maximum de désinscriptions par courriel. Merci de patienter %{time_left} avant d'essayer à nouveau."
+      topic_invitations_per_day: "Vous avez atteint le nombre maximum d'invitations dans un sujet. Merci de patienter %{time_left} avant d'essayer à nouveau."
     hours:
-      one: "1 heure"
-      other: "%{count} heures"
+      one: 1 heure
+      other: '%{count} heures'
     minutes:
-      one: "1 minute"
-      other: "%{count} minutes"
+      one: 1 minute
+      other: '%{count} minutes'
     seconds:
-      one: "1 seconde"
-      other: "%{count} secondes"
+      one: 1 seconde
+      other: '%{count} secondes'
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: "< 1s"
-        other: "< %{count}s"
+        one: < 1s
+        other: < %{count}s
       x_seconds:
-        one: "1s"
-        other: "%{count}s"
+        one: 1s
+        other: '%{count}s'
       less_than_x_minutes:
-        one: "1m"
-        other: "%{count}m"
+        one: 1m
+        other: '%{count}m'
       x_minutes:
-        one: "1h"
-        other: "%{count}h"
+        one: 1h
+        other: '%{count}h'
       about_x_hours:
-        one: "1h"
-        other: "%{count}h"
+        one: 1h
+        other: '%{count}h'
       x_days:
-        one: "1j"
-        other: "%{count}j"
+        one: 1j
+        other: '%{count}j'
       about_x_months:
-        one: "1 mois "
-        other: "%{count} mois"
+        one: '1 mois '
+        other: '%{count} mois'
       x_months:
-        one: "1 mois"
-        other: "%{count} mois"
+        one: 1 mois
+        other: '%{count} mois'
       about_x_years:
-        one: "1 an"
-        other: "%{count} ans"
+        one: 1 an
+        other: '%{count} ans'
       over_x_years:
-        one: "> 1 an"
-        other: "> %{count} ans"
+        one: '> 1 an'
+        other: '> %{count} ans'
       almost_x_years:
-        one: "1 an"
-        other: "%{count} ans"
+        one: 1 an
+        other: '%{count} ans'
     distance_in_words_verbose:
       half_a_minute: "à l'instant"
       less_than_x_seconds:
-        one: "à l'instant"
-        other: "à l'instant"
+        one: à l'instant
+        other: à l'instant
       x_seconds:
-        one: "il y a une seconde"
-        other: "il y a %{count} secondes"
+        one: il y a une seconde
+        other: il y a %{count} secondes
       less_than_x_minutes:
-        one: "il y a moins d'une minute"
-        other: "il y a moins de %{count} minutes"
+        one: il y a moins d'une minute
+        other: il y a moins de %{count} minutes
       x_minutes:
-        one: "il y a 1 minute"
-        other: "il y a %{count} minutes"
+        one: il y a 1 minute
+        other: il y a %{count} minutes
       about_x_hours:
-        one: "il y a 1 heure"
-        other: "il y a %{count} heures"
+        one: il y a 1 heure
+        other: il y a %{count} heures
       x_days:
-        one: "il y a un jour"
-        other: "il y a %{count} jours"
+        one: il y a un jour
+        other: il y a %{count} jours
       about_x_months:
-        one: "il y a environ un mois"
-        other: "il y a environ %{count} mois"
+        one: il y a environ un mois
+        other: il y a environ %{count} mois
       x_months:
-        one: "il y a un mois"
-        other: "il y a %{count} mois"
+        one: il y a un mois
+        other: il y a %{count} mois
       about_x_years:
-        one: "il y a environ un an"
-        other: "il y a environ %{count} ans"
+        one: il y a environ un an
+        other: il y a environ %{count} ans
       over_x_years:
-        one: "il y a plus d'un an"
-        other: "il y a plus de %{count} ans"
+        one: il y a plus d'un an
+        other: il y a plus de %{count} ans
       almost_x_years:
-        one: "il y a presque un an"
-        other: "il y a presque %{count} ans"
+        one: il y a presque un an
+        other: il y a presque %{count} ans
   password_reset:
     no_token: "Désolé, le lien pour le changement de mot de passe est trop ancien. Cliquez sur Connexion puis redemandez un mot de passe afin d'obtenir un nouveau lien. "
     choose_new: "Choisir un nouveau mot de passe"
@@ -565,11 +614,14 @@ fr:
     title: 'Réinitialiser le mot de passe'
     success: "Vous avez modifié votre mot de passe avec succès et vous êtes maintenant connecté."
     success_unapproved: "Vous avez modifié votre mot de passe avec succès."
+  email_login:
+    invalid_token: "Désolé, ce lien de connexion courriel est trop vieux. Séléctionner le bouton 'Se connecter' et utiliser 'Mot de passe oublié' pour obtenir un nouveau lien."
+    title: "Connexion courriel"
   change_email:
     confirmed: "Votre adresse de courriel a été mise à jour."
     please_continue: "Continuer vers %{site_name}"
     error: "Il y a eu une erreur lors de la modification de votre adresse de courriel. Elle est peut-être déjà utilisée ?"
-    error_staged: "Une erreur est survenue lors de la modification de votre adresse courriel. Cette adresse est déjà utilisée par un utilisateur en attente."
+    error_staged: "Une erreur est survenue lors de la modification de votre adresse courriel. Cette adresse est déjà utilisée par un utilisateur distant."
     already_done: "Désolé, ce lien de confirmation n'est plus valide. Votre adresse de courriel a peut-être déjà été changée ?"
     authorizing_old:
       title: "Merci d'avoir confirmé votre adresse de courriel"
@@ -593,7 +645,7 @@ fr:
     off_topic:
       title: 'Hors-sujet'
       description: 'Étant donné le titre et le premier message de cette discussion, ce message n''est pas pertinent dans ce contexte et devrait probablement être déplacé ailleurs.'
-      short_description: 'Non pertinent pour la discussio'
+      short_description: 'N''est pas pertinent à la discussion'
       long_form: 'signalé comme hors-sujet'
     spam:
       title: 'Spam'
@@ -609,8 +661,8 @@ fr:
       long_form: 'signalé comme inapproprié'
     notify_user:
       title: 'Envoyer un message à @{{username}} '
-      description: 'Je veux parler à cette personne directement et de manière privée à propos de son message.'
-      short_description: 'Je veux parler à cette personne directement et de manière privée au sujet de son message'
+      description: 'J''aimerais parler à cette personne directement et personnellement au sujet de leur message.'
+      short_description: 'J''aimerais parler à cette personne directement et personnellement au sujet de leur message.'
       long_form: 'utilisateur contacté'
       email_title: 'Votre message sur « %{title} »'
       email_body: "%{link}\n\n%{message}"
@@ -679,6 +731,7 @@ fr:
     title: "Désabonné !"
     description: "<b>%{email}</b> a été désabonné. Pour modifier vos paramètres de courriel, <a href='%{url}'>visitez vos préférences utilisateurs</a>."
     topic_description: "Pour vous ré-abonner à %{link}, utilisez le contrôle des notifications en bas ou à droite du sujet."
+    private_topic_description: "Pour vous ré-abonner, utilisez le contrôle des notifications en bas ou à droite du sujet."
   unsubscribe:
     title: "Se désabonner"
     stop_watching_topic: "Arrêter de surveiller ce sujet, %{link}"
@@ -697,7 +750,7 @@ fr:
     read_write: "lecture/écriture"
     description: "« %{application_name} » demande l'accès suivant à votre compte :"
     no_trust_level: "Désolé, vous n'avez pas le niveau de confiance requis pour accéder à l'API utilisateur"
-    generic_error: "Désolé, nous n'avons pu générer de clés pour l'API utilisateur, cette fonctionnalité peut être désactivée par l'administrateur"
+    generic_error: "Désolé, nous n'avons pu générer de clés pour l'API utilisateur, cette fonctionnalité a peut-être été désactivée par l'administrateur"
     scopes:
       message_bus: "Mises à jour en temps réel"
       notifications: "Lire et supprimer les notifications"
@@ -711,9 +764,20 @@ fr:
       xaxis: "Jour"
       yaxis: "Nombre de visites"
     signups:
-      title: "Nouveaux utilisateurs"
       xaxis: "Jour"
-      yaxis: "Nombre de nouveaux utilisateurs"
+    new_contributors:
+      title: "Nouveaux contributeurs"
+      xaxis: "Jour"
+      yaxis: "Nombre de nouveaux contributeurs"
+      description: "Nombre d'utilisateurs qui ont fait leur première contribution durant cette période"
+    dau_by_mau:
+      title: "DAU/MAU"
+      xaxis: "Jour"
+    daily_engaged_users:
+      title: "Utilisateurs impliqués au quotidien"
+      xaxis: "Jour"
+      yaxis: "Utilisateurs impliqués"
+      description: "Nombre d'utilisateurs ayant aimé ou publié un message dans les derniers 24h"
     profile_views:
       title: "Vues des profils d'utilisateurs"
       xaxis: "Jour"
@@ -722,10 +786,12 @@ fr:
       title: "Sujets"
       xaxis: "Jour"
       yaxis: "Nombre de nouveaux sujets"
+      description: "Nouveaux sujets crées pour cette période"
     posts:
       title: "Messages"
       xaxis: "Jour"
       yaxis: "Nombre de nouveaux messages"
+      description: "Nouveaux messages crées pour cette période"
     likes:
       title: "J'aime"
       xaxis: "Jour"
@@ -746,12 +812,29 @@ fr:
       title: "Utilisateurs par niveau de confiance"
       xaxis: "Niveau de confiance"
       yaxis: "Nombre d'utilisateurs"
+    users_by_type:
+      title: "Utilisateurs par type"
+      xaxis: "Type"
+      yaxis: "Nombre d'utilisateurs"
+      xaxis_labels:
+        admin: Administrateur
+        moderator: Modérateur
+        suspended: Suspendu
+        silenced: Sous silence
+    trending_search:
+      title: Recherche tendance
+      labels:
+        term: Terme
+        searches: Recherches
     emails:
       title: "Courriels envoyés"
       xaxis: "Jour"
       yaxis: "Nombre de courriels"
     user_to_user_private_messages:
-      title: "Utilisateur à utilisateur"
+      title: "Utilisateur à utilisateur (sans réponses)"
+      xaxis: "Jour"
+      yaxis: "Nombre de messages"
+    user_to_user_private_messages_with_replies:
       xaxis: "Jour"
       yaxis: "Nombre de messages"
     system_private_messages:
@@ -798,7 +881,7 @@ fr:
       xaxis: "Jour"
       yaxis: "Nombre de vues par les robots d'indexation"
     page_view_total_reqs:
-      title: "Total"
+      title: "Pages vues"
       xaxis: "Jour"
       yaxis: "Total de pages vues"
     page_view_logged_in_mobile_reqs:
@@ -845,6 +928,10 @@ fr:
       title: "Visites d'utilisateurs"
       xaxis: "Jour"
       yaxis: "Nombre de visites"
+    web_crawlers:
+      title: "Requêtes de crawler web"
+      xaxis: "User Agent"
+      yaxis: "Pages vues"
   dashboard:
     rails_env_warning: "Votre serveur fonctionne dans l'environnement de %{env}."
     host_names_warning: "Votre fichier config/database.yml utilise le nom d'hôte par défaut. Veuillez renseigner votre nom d'hôte."
@@ -862,28 +949,30 @@ fr:
     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>.'
     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."
-      other: "La vérification des courriels a généré %{count} erreurs au cours des 24 dernières heures. Vérifiez <a href='/logs' target='_blank'>le journal</a> pour plus de détails."
-    missing_mailgun_api_key: "Le serveur est configuré pour envoyer des courriels via Mailgun mais vous n'avez pas spécifié une clé API utilisée pour vérifier les messages du webhook."
+      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.
+      other: La vérification des courriels a généré %{count} erreurs au cours des 24 dernières heures. Vérifiez <a href='/logs' target='_blank'>le journal</a> pour plus de détails.
+    missing_mailgun_api_key: "Le serveur est configuré pour envoyer des courriels via Mailgun mais vous n'avez pas fourni la clef API nécessaire pour vérifier les messages webhook."
     bad_favicon_url: "Impossible de charger la favicon. Vérifiez le paramètre favicon_url dans les <a href='/admin/site_settings'>paramètres du site</a>"
     poll_pop3_timeout: "La connexion vers le serveur POP3 a expiré. Les courriels entrants n'ont pas pu être téléchargés. Veuillez vérifier <a href='/admin/site_settings/category/email'>les paramètres POP3</a> et votre fournisseur de service courriel."
     poll_pop3_auth_error: "La connexion vers le serveur POP3 échoue avec une erreur d'authentification. Veuillez vérifier <a href='/admin/site_settings/category/email'>les paramètres POP3</a>."
+    force_https_warning: "Votre site web utiliser le SSL. Mais  `<a href='/admin/site_settings/category/all_results?filter=force_https'>force_https</a>` n'est pas encore activé dans les paramètres du site."
   site_settings:
     censored_words: "Mots qui seront automatiquement remplacés par &#9632;&#9632;&#9632;&#9632;"
-    censored_pattern: "Expressions régulières qui seront automatiquement remplacées par &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Supprimer automatiquement les messages cachés plus de 30 jours."
-    default_locale: "La langue par défaut de cette instance de Discourse (code ISO 639-1)"
+    default_locale: "La langue par défaut de cette instance de Discourse"
     allow_user_locale: "Autoriser les utilisateurs à choisir la langue de l'interface dans leurs préférences"
     set_locale_from_accept_language_header: "configurer la langue de l'interface pour les visiteurs à partir des entêtes de langue de leur navigateur. (EXPÉRIMENTAL, ne fonctionne pas avec le cache anonyme)"
+    support_mixed_text_direction: "Permettre le mélange de textes gauche-droite et droite-gauche."
     min_post_length: "Longueur minimale autorisée des messages en nombre de caractères"
     min_first_post_length: "Longueur minimale d'un premier message (corps de sujet) en nombre de caractères"
-    min_private_message_post_length: "Longueur minimale des messages en nombre de caractères"
+    min_personal_message_post_length: "Longueur minimale des messages en nombre de caractères"
     max_post_length: "Longueur maximale autorisée des messages en nombres de caractères"
     topic_featured_link_enabled: "Activer la création de sujets avec lien"
-    show_topic_featured_link_in_digest: "Afficher les sujets avec lien dans le résumé par courriel."
+    show_topic_featured_link_in_digest: "Afficher le lien du sujet à la une dans le résumé par courriel."
     min_topic_title_length: "Longueur minimale autorisée des titres de sujet en nombre de caractères"
     max_topic_title_length: "Longueur maximale autorisée des titres de sujet en nombre de caractères"
-    min_private_message_title_length: "Longueur minimale pour un titre de message en nombre de caractères"
+    min_personal_message_title_length: "Longueur minimale pour un titre de message en nombre de caractères"
+    max_emojis_in_title: "Nombre maximum d'emojis permis dans le titre d'un sujet"
     min_search_term_length: "Longueur minimale autorisée du texte saisie avant de lancer une recherche en nombre de caractères"
     search_tokenize_chinese_japanese_korean: "Forcer la tokenisation dans la recherche chinois/japonais/koréen, même sur des sites non-CJK."
     search_prefer_recent_posts: "Si la recherche dans votre forum est lente, cette option tente l'indéxation des messages les plus récents en premier"
@@ -904,6 +993,9 @@ fr:
     download_remote_images_max_days_old: "Ne pas télécharger les images distantes pour les messages plus anciens que n jours."
     disabled_image_download_domains: "Les images distantes de ces domaines ne seront jamais téléchargées. Liste délimitée par des pipes (|)."
     editing_grace_period: "Pendant (n) secondes après la publication d'un message, la modification de ce dernier ne provoquera pas d'historisation."
+    editing_grace_period_max_diff: "Nombre maximum de changements de caractères autorisés dans le délai de grâce d'édition, si plus de changements, enregistrez une autre révision de poste (niveaux de confiance 0 et 1)."
+    editing_grace_period_max_diff_high_trust: "Nombre maximum de changements de caractères autorisés dans le délai de grâce d'édition, si plus de changements, enregistrez une autre révision de poste (niveaux de confiance 2 et plus)."
+    staff_edit_locks_post: "Les messages seront vérouillés à la modification si modifiés par des responsables"
     post_edit_time_limit: "L'auteur peut modifier ou supprimer ses messages pendant (n) minutes après leur publication. Mettre à 0 pour l'autoriser sans limite de temps."
     edit_history_visible_to_public: "Autoriser tout le monde à voir les versions précédentes d'un message modifié. Quand désactivé, seuls les responsables peuvent voir l'historique."
     delete_removed_posts_after: "Les messages retirés par leur auteur seront automatiquement supprimés après (n) heures. Pour une valeur renseignée à 0, les messages seront supprimés immédiatement."
@@ -919,23 +1011,28 @@ fr:
     post_onebox_maxlength: "Longueur maximale d'un message emboîté en nombre de caractères."
     onebox_domains_blacklist: "Une liste de domaines que ne seront jamais transformés en Onebox."
     inline_onebox_domains_whitelist: "Une liste de domaines qui seront transformé en Onebox s'ils ont été liés sans titre"
+    enable_inline_onebox_on_all_domains: "Ignorer le paramètre inline_onebox_domain_whitelist et permettre des onebox 'inline' pour tous les domaines."
     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."
     favicon_url: "Un favicon pour votre site, voir http://fr.wikipedia.org/wiki/Favicon, pour fonctionner correctement à travers un CDN il doit être PNG."
+    mobile_logo_url: "Logo personnalisé utilisé sur la version mobile de votre site. Si non renseigné, `logo_url` sera utilisé, par exemple : http://example.com/uploads/default/logo.png"
     large_icon_url: "Image utilisée comme logo sur Android. Taille recommandée : 512 px par 512 px."
     apple_touch_icon_url: "Icône utilisée pour les appareils d'Apple. Taille recommandée 144 px par 144 px."
     notification_email: "L'adresse de courriel dans le champs De qui sera utilisée pour envoyer les courriels systèmes essentiels. Le nom de domaine spécifié  doit avoir les informations SPF, DKIM et PTR inversé renseignés correctement pour que le courriel arrive à destination."
     email_custom_headers: "Une liste délimité par des (|) pipes d'entêtes de courriel"
     email_subject: "Format du sujet personnalisable pour les courriels standards. Voir https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801"
     force_https: "Forcer votre site en HTTPS uniquement. MISE EN GARDE : n'activez PAS cette fonction tant que vous n'avez pas vérifié que le HTTPS est complètement configuré et fonctionne absolument partout ! Avez-vous vérifié que vos CDN, vos connexions via réseaux sociaux ainsi que tous les logos / dépendances tiers sont tous compatibles HTTPS eux aussi ?"
+    same_site_cookies: "Utiliser des cookies de même site, qui éliminent tous les vecteurs de Cross Site Request Forgery sur les navigateurs supportés (Lax ou Strict). Avertissement: Strict ne fonctionnera que sur des sites qui imposent la connexion et utilisent le SSO."
     summary_score_threshold: "Le score minimum requis pour qu'un message soit inclus dans le 'Résumé de ce sujet'"
     summary_posts_required: "Nombre minimum de messages dans un sujet avant que le 'Résumé du sujet' soit activé"
     summary_likes_required: "Nombre de J'aime minimum dans un sujet avant que le 'Résumé du sujet' soit activé"
     summary_percent_filter: "Quand un utilisateur clique sur « Résumer ce sujet », montrer le top % des messages"
     summary_max_results: "Nombre maximum de messages retournés par « Résumer ce sujet »"
-    enable_private_messages: "Autoriser les utilisateurs de niveau de confiance 1 à créer des messages et à répondre (configurable via le niveau de confiance minimum pour envoyer des messages). Notez que les responsables peuvent toujours envoyer des messages."
+    enable_personal_messages: "Autoriser les utilisateurs de niveau de confiance 1 à créer des messages et à répondre (configurable via le niveau de confiance minimum pour envoyer des messages). Notez que les responsables peuvent toujours envoyer des messages."
+    enable_system_message_replies: "Permettre aux utilisateurs de répondre aux messages système, même si les messages directs sont désactivés."
+    enable_personal_email_messages: "Autoriser les utilisateurs de niveau de confiance 1 à envoyer des messages courriel personnels (configurable via le niveau de confiance minimum pour envoyer des messages). Notez que les responsables peuvent toujours envoyer des messages."
     enable_long_polling: "Utiliser les requêtes longues pour le flux de notifications."
     long_polling_base_url: "Racine de l'URL utilisée pour les requêtes longues (dans le cas de l'utilisation d'un CDN pour fournir du contenu dynamique, pensez à le configurer en mode \"origin pull\") par exemple : http://origin.site.com"
     long_polling_interval: "Délai d'attente du serveur avant de répondre aux clients lorsqu'il n'y a pas de données à envoyer\n(réservé aux utilisateurs connectés)"
@@ -949,15 +1046,23 @@ fr:
     tl2_additional_likes_per_day_multiplier: "Augmenter la limite de J'aime par jour pour les utilisateurs de niveau 2 (membres) en la multipliant par ce nombre"
     tl3_additional_likes_per_day_multiplier: "Augmenter la limite de J'aime par jour pour les utilisateurs de niveau 3 (réguliers) en la multipliant par ce nombre"
     tl4_additional_likes_per_day_multiplier: "Augmenter la limite de J'aime par jour pour les utilisateurs de niveau 4 (meneurs) en la multipliant par ce nombre"
+    num_spam_flags_to_silence_new_user: "Si le message d'un nouvel utilisateur obtient plusieurs signalements pour spam de la part de num_users_to_silence_new_user différents utilisateurs, masquer tous ses messages et l'empêcher de poster à l'avenir. 0 désactive cette fonctionnalité."
+    num_users_to_silence_new_user: "Si les messages d'un nouvel utilisateur obtiennent num_spam_flags_to_silence_new_user signalements d'autant d'utilisateurs différents, masquer tous ses messages et l'empêcher de poster à l'avenir. 0 désactive cette fonctionnalité."
+    num_tl3_flags_to_silence_new_user: "Si les messages d'un nouvel utilisateur obtiennent ce nombre de signalements de la part de num_tl3_users_to_silence_new_user utilisateurs de niveau de confiance 3 différents, masquer tous ses messages et l'empêcher de poster à l'avenir. 0 désactive cette fonctionnalité."
+    num_tl3_users_to_silence_new_user: "Si les messages d'un nouvel utilisateur num_tl3_flags_to_silence_new_user signalements de la part de plusieurs utilisateurs de niveau de confiance 3 différents, masquer tous ses messages et l'empêcher de poster à l'avenir. 0 désactive cette fonctionnalité."
     notify_mods_when_user_silenced: "Si un utilisateur est automatiquement mis sous silence, envoyer un message à tous les modérateurs."
     flag_sockpuppets: "Si un nouvel utilisateur répond à un sujet avec la même adresse IP que le nouvel utilisateur qui a commencé le sujet, alors leurs messages seront automatiquement marqués comme spam."
     traditional_markdown_linebreaks: "Utiliser le retour à la ligne traditionnel dans Markdown, qui nécessite deux espaces pour un saut de ligne."
+    enable_markdown_typographer: "Utiliser des règles typographiques pour améliorer la lisibilité du texte: remplacer les guillemets simples ' avec les guillemets bouclés ’, (c) (tm) avec les symbôles, -- avec emdash –, etc."
+    enable_markdown_linkify: "Traiter automatiquement le texte qui ressemble à un lien comme un lien : www.site.com et http://site.com seront automatiquement liés."
+    markdown_linkify_tlds: "Liste des domaines de premier niveau qui sont automatiquement traités comme des liens."
     post_undo_action_window_mins: "Nombre de minutes pendant lesquelles un utilisateur peut annuler une action sur un message (J'aime, signaler, etc.)"
     must_approve_users: "Les responsables doivent approuver les nouveaux utilisateurs afin qu'ils puissent accéder au site. ATTENTION : activer cette option sur un site en production suspendra l'accès des utilisateurs existants qui ne sont pas des responsables !"
     pending_users_reminder_delay: "Avertir les modérateurs si des nouveaux utilisateurs sont en attente d'approbation depuis x heures. Mettre -1 pour désactiver les notifications."
     maximum_session_age: "L'utilisateur restera connecté pour n heures après la dernière visite"
     ga_universal_tracking_code: "Code de suivi Google Universal Analytics (analytics.js), par exemple : UA-12345678-9 ; voir http://google.com/analytics"
     ga_universal_domain_name: "Nom de domaine Google Universal Analytics (analytics.js), par exemple : monsite.com ; voir http://google.com/analytics"
+    ga_universal_auto_link_domains: "Activer Google Universal Analytics (analytics.js) pour le suivi interdomaine. Les liens sortants vers ces domaines auront l'identifiant client ajouté. Voir le guide Cross-Domain Tracking  de Google."
     gtm_container_id: "ID du conteneur Google Tag Manager, par exemple : GTM-ABCDEF"
     enable_escaped_fragments: "Utiliser l'API Ajax-Crawling de Google si aucun robot n'est détecté. Voir https://developers.google.com/webmasters/ajax-crawling/docs/learn-more"
     allow_moderators_to_create_categories: "Autoriser les modérateurs à créer de nouvelles catégories"
@@ -965,6 +1070,11 @@ fr:
     use_admin_ip_whitelist: "Les administrateurs ne peuvent se connecter que s'ils sont à une adresse IP définie dans la liste des IP surveillées (Admin > Journaux > IP surveillés)."
     blacklist_ip_blocks: "Une liste de blocs IP privés qui ne doivent jamais être crawlés par Discourse"
     whitelist_internal_hosts: "Une liste de domaines internes que Discourse peut crawler en sécurité pour les Onebox et autres"
+    allowed_iframes: "Une liste des préfixes du domaine src iframe que Discourse peut autoriser en toute sécurité dans les messages"
+    whitelisted_crawler_user_agents: 'Les agents utilisateurs des robots d''exploration du Web qui devraient être autorisés à accéder au site.'
+    blacklisted_crawler_user_agents: 'Mot unique insensible à la casse dans la chaîne de caractères de l''agent utilisateur identifiant les robots d''exploration Web qui ne devraient pas être autorisés à accéder au site. Ne s''applique pas si une whitelist est définie.'
+    slow_down_crawler_user_agents: 'Agents de crawlers web qui devrait être limité dans robots.txt avec la commande Crawl-delay.'
+    slow_down_crawler_rate: 'Si slow_down_crawler_user_agents est spécifié ce taux s''appliquera aux crawlers web (secondes d''attente entre requêtes)'
     top_menu: "Déterminer les éléments qui apparaissent dans la navigation de la page d'accueil, et dans quel ordre. Exemple latest|new|unread|categories|top|read|posted|bookmarks"
     post_menu: "L'ordre des éléments dans le menu de rédaction. Exemple like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "Les éléments du menu qui seront cachés par défaut jusqu’à extension du menu."
@@ -982,19 +1092,22 @@ fr:
     top_page_default_timeframe: "Période par défaut pour la page la plus vue."
     show_email_on_profile: "Afficher l'adresse du courriel de l'utilisateur sur leur page utilisateur (seulement visible pour l'utilisateur et les équipes techniques)"
     prioritize_username_in_ux: "Afficher le pseudonyme en premier sur la page d'un utilisateur, sa carte et ses messages (si désactivé, le nom est affiché en premier)"
+    enable_rich_text_paste: "Permettre la conversion automatique de HTML en Markdown lors que du texte est collé dans l'éditeur. (Expérimental)"
     email_token_valid_hours: "Les jetons (tokens) de Mot de passe oublié / Activation de comptes sont valides (n) jours."
     enable_badges: "Activer le système de badges"
     enable_whispers: "Autoriser les communications privées entre responsables au sein d'un sujet."
     allow_index_in_robots_txt: "Préciser dans robots.txt que le site est autorisé à être indexé par les robots des moteurs de recherche."
     email_domains_blacklist: "Liste des domaines de courriel qui ne sont pas autorisés lors de la création de compte, délimitée par des pipes. Exemple : mailinator.com|trashmail.net"
     email_domains_whitelist: "Liste des domaines de courriel avec lesquelles les utilisateurs DOIVENT s'enregistrer, délimités par un pipe. ATTENTION : les utilisateurs ayant une adresse de courriel sur un autre domaine ne pourront pas s'enregistrer."
+    hide_email_address_taken: "Ne pas informer les utilisateurs qu'un compte existe avec un courriel donné lors de l'inscription ou à partir du formulaire d'oubli du mot de passe."
     log_out_strict: "Lors de la déconnexion, déconnecter TOUTES les sessions pour l'utilisateur sur tous les appareils"
     version_checks: "Ping les serveurs de Discourse afin d'obtenir les mises à jours et affiche les nouveaux messages d'information dans le tableau de bord /admin"
     new_version_emails: "Envoyer un courriel à contact_email quand une nouvelle version de Discourse est disponible."
     invite_expiry_days: "Combien de temps (en jours) les clés d'invitation sont-elles valides"
-    invite_passthrough_hours: "Combien de temps un utilisateur peut encore utilisé une clé d'invitation après son expiration, en heure"
-    invite_only: "Les inscriptions sont désactivées, elles ne peuvent se faire uniquement sur invitation par le staff."
+    invite_only: "Les inscriptions publiques sont désactivées, elles ne peuvent se faire uniquement sur invitation par les responsables."
     login_required: "Authentification requise pour lire le contenu du site, interdit l'accès anonyme."
+    min_username_length: "Longueur minimale du nom d'utilisateur en caractères. ATTENTION : si des utilisateurs ou groupes existants ont des noms plus courts que celui-ci, votre site se cassera !"
+    max_username_length: "Longueur maximale du nom d'utilisateur en caractères. ATTENTION : si des utilisateurs ou groupes existants ont des noms plus longs que celui-ci, votre site se cassera !"
     reserved_usernames: "Pseudos pour lesquels l'inscription n'est pas autorisée. Le symbole « * » peut être utilisé pour représenter n'importe quel caractère 0 ou plusieurs fois."
     min_password_length: "Longueur minimale du mot de passe."
     min_admin_password_length: "Longueur minimale du mot de passe pour l'administrateur."
@@ -1005,38 +1118,44 @@ fr:
     enable_sso_provider: "Implémenter le procotole Discourse de provider SSO à /session/sso_provider, requiert sso_secret"
     sso_url: "URL de l'authentification unique SSO (doit inclure http:// ou http://)"
     sso_secret: "Chaîne de caractères secrète utilisée pour authentifier les informations SSO par cryptographie, assurez-vous qu'elle est de 10 caractères ou plus"
-    sso_overrides_bio: "Écrase la biographie du profil utilisateur et empêche son changement"
+    sso_overrides_bio: "Écrase la biographie du profil utilisateur et empêche l'utilisateur de le modifier"
+    sso_overrides_groups: "Synchroniser l'ensemble de adhésions de groupe manuelles avec les groupes spécifiés dans l'attibut sso (ATTENTION : si vous ne spécifiez pas de groupe toutes les adhésions de groupe manuelles seront résiliées pour l'utilisateur)"
     sso_overrides_email: "Surcharger les emails locaux avec les emails externes d'un SSO à chaque connexion, et prévenir les modifications locales. (ATTENTION : Des écarts peuvent se produire dus aux règles locales sur les emails)"
     sso_overrides_username: "Surcharger les pseudos locaux avec les pseudos externes d'un SSO à chaque connexion, et prévenir les modifications locales. (ATTENTION : des écarts peuvent se produire dûes aux différences de longueur et d'exigences sur les pseudos)"
     sso_overrides_name: "Surcharger les noms complets locaux avec les noms complets externes d'un SSO à chaque connexion, et prévenir les modifications locales."
     sso_overrides_avatar: "Surcharge les avatars des utilisateurs avec les avatars d'un SSO. Si activé, il est fortement recommandé de désactiver allow_uploaded_avatars."
+    sso_overrides_profile_background: "Remplacer arrière-plan du profil utilisateur avec un avatar d'un site externe à travers SSO payload."
+    sso_overrides_card_background: "Remplacer arrière-plan de la carte de l'utilisateur avec un avatar d'un site externe à travers SSO payload."
     sso_not_approved_url: "Rediriger les comptes SSO non validés vers cette URL"
     sso_allows_all_return_paths: "Ne pas restreindre le domaine pour les return_paths fournis par le SSO (par défaut, le chemin de retour doit être sur le site actuel)"
-    enable_local_logins: "Activer les comptes locaux avec pseudo et mot de passe. (Note : ceci doit être activé pour que les invitations fonctionnent)"
+    enable_local_logins: "Activer les comptes locaux avec pseudo et mot de passe. Ceci doit être activé pour que les invitations fonctionnent. ATTENTION : si désactivé, vous ne pourrez peut-être plus vous connecter si vous n'avez pas configuré au préalable au moins une autre méthode de connection."
+    enable_local_logins_via_email: "Permettre aux utilisateurs de demander qu'un lien de connexion en un clic leur soit envoyé par courriel."
     allow_new_registrations: "Autorise l'inscription des nouveaux utilisateurs. Décocher pour prévenir la création de nouveau compte."
     enable_signup_cta: "Afficher un rappel aux visiteurs pour les encourager à créer un compte."
     enable_yahoo_logins: "Activer l'authentification Yahoo"
     enable_google_oauth2_logins: "Activer l'authentification Google Oauth2. C'est la méthode d'authentification que Google supporte désormais. Nécessite une clé et une phrase secrète."
     google_oauth2_client_id: "Identifiante du client de votre application Google."
     google_oauth2_client_secret: "Clé secrète du client de votre application Google."
+    google_oauth2_prompt: "Une liste de valeurs de chaînes de caractères délimitées par des espaces qui spécifie si le serveur d'autorisation demande à l'utilisateur de se réauthentifier et de donner son consentement. Voir https://developers.google.com/identity/protocols/OpenIDConnect#prompt pour les valeurs possibles."
+    google_oauth2_hd: "Google Apps Hosted domain auquel la connexion sera limitée. Voir https://developers.google.com/identity/protocols/OpenIDConnect#hd-param pour plus de détails."
     enable_twitter_logins: "Activer l'authentification Twitter, nécessite twitter_consumer_key et  twitter_consumer_secret"
-    twitter_consumer_key: "Clé utilisateur pour l'authentification Twitter, enregistrée sur http://dev.twitter.com"
-    twitter_consumer_secret: "Secret utilisateur pour l'authentification Twitter, enregistré sur http://dev.twitter.com"
+    twitter_consumer_key: "Clé consommateur pour l'authentification Twitter, enregistrée sur https://apps.twitter.com/"
+    twitter_consumer_secret: "Secret consommateur pour l'authentification Twitter, enregistré sur http://dev.twitter.com"
     enable_instagram_logins: "Activer l'authentification Instagram, nécessite instagram_consumer_key et  instagram_consumer_secret"
     instagram_consumer_key: "« Consumer key » pour l'identification Instagram"
     instagram_consumer_secret: "« Consumer secret » pour l'identification Instagram"
     enable_facebook_logins: "Activer l'authentification Facebook, nécessite facebook_app_id et  facebook_app_secret"
     facebook_app_id: "App id pour l'authentification Facebook, enregistré sur https://developers.facebook.com/apps"
     facebook_app_secret: "App secret pour l'authentification Facebook, enregistré sur https://developers.facebook.com/apps"
-    facebook_request_extra_profile_details: "Remplir les champs À propos de moi, Localisation et Site internet depuis Facebook (nécessite que votre application soit autorisée par Facebook)."
     enable_github_logins: "Activer l'authentification GitHub, nécessite github_client_id et github_client_secret"
     github_client_id: "Id client pour l'authentification Github, enregistré sur https://github.com/settings/applications"
     github_client_secret: "Secret client  pour l'authentification Github, enregistré sur https://github.com/settings/applications"
     readonly_mode_during_backup: "Activer le mode lecture seule pendant une sauvegarde"
+    enable_backups: "Autoriser les administrateurs à créer de nouveaux sauvegardes du forum"
     allow_restore: "Autoriser la restauration, qui peut remplacer TOUTES les données du site ! Laissez à faux, sauf si vous envisagez de faire restaurer une sauvegarde"
     maximum_backups: "Nombre maximum de sauvegardes à conserver sur le disque. Les anciennes sauvegardes seront automatiquement supprimées"
     automatic_backups_enabled: "Activer les sauvegardes automatiques tels que définis dans les fréquences de sauvegarde"
-    backup_frequency: "Fréquence de création des sauvegardes du site, en jours."
+    backup_frequency: "Nombre de jours entre sauvegardes"
     enable_s3_backups: "Envoyer vos sauvegardes à S3 lorsqu'elles sont terminées. IMPORTANT : Vous devez avoir renseigné vos identifiants S3 dans les paramètres de fichiers."
     s3_backup_bucket: "Bucket distant qui contiendra les sauvegardes. ATTENTION: Vérifiez que c'est un bucket privé"
     s3_disable_cleanup: "Désactiver la suppression des sauvegardes de S3 lors de leur suppression locale."
@@ -1049,6 +1168,7 @@ fr:
     top_topics_formula_first_post_likes_multiplier: "formule pour la valeur de multiplicateur de premiers J'aime (n) dans les sujets tendance: `log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
     top_topics_formula_least_likes_per_post_multiplier: "formule pour la valeur de multiplicateur de moins de J'aime par message (n) dans les sujets tendance: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
     rebake_old_posts_count: "Nombre d'anciens messages à être régénéré toutes les 15 minutes."
+    enable_safe_mode: "Permettre aux utilisateurs d'utiliser le mode sans échec pour déboguer les plugins."
     rate_limit_create_topic: "Après la création d'un sujet, les utilisateurs doivent attendre (n) secondes avant de pouvoir en créer un nouveau."
     rate_limit_create_post: "Après avoir posté un message, les utilisateurs doivent attendre (n) secondes avant de pouvoir en poster un nouveau."
     rate_limit_new_user_create_topic: "Après la création d'un sujet, les nouveaux utilisateurs doivent attendre (n) secondes avant de pouvoir en créer un nouveau."
@@ -1058,7 +1178,7 @@ fr:
     max_bookmarks_per_day: "Nombre maximum de signets par utilisateur et par jour."
     max_edits_per_day: "Nombre maximum de modifications par utilisateur chaque jour."
     max_topics_per_day: "Nombre maximum de sujet qu'utilisateur peut créer par jour."
-    max_private_messages_per_day: "Nombre maximum de messages que les utilisateurs peuvent créer chaque jour."
+    max_personal_messages_per_day: "Nombre maximum de messages que les utilisateurs peuvent créer chaque jour."
     max_invites_per_day: "Nombre maximum d'invitations qu'un utilisateur peut envoyer par jour."
     max_topic_invitations_per_day: "Nombre maximum d'invitations à un sujet qu'un utilisateur peut envoyer par jour."
     max_logins_per_ip_per_hour: "Nombre maximum de connexions autorisées par adresse IP et par heure"
@@ -1072,8 +1192,9 @@ fr:
     clean_up_uploads: "Retirer les fichiers téléchargés orphelins pour prévenir les hébergements illégaux. ATTENTION: vous devriez faire une sauvegarde de votre répertoire /uploads avant d'activer ce paramètre."
     clean_orphan_uploads_grace_period_hours: "La période de grâce (en heures) avant qu'un fichier envoyé orphelin soit retiré."
     purge_deleted_uploads_grace_period_days: "La période de grâce (en jours) avant qu'un fichier envoyé et supprimé soit effacé."
+    purge_unactivated_users_grace_period_days: "Période de grâce (en jours) avant qu'un utilisateur qui n'a pas activé son compte soit supprimé. Régler à 0 pour ne jamais purger les utilisateurs non activés."
     enable_s3_uploads: "Placez les fichiers envoyés sur un stockage Amazon S3. IMPORTANT: nécessite un accès valide à S3  (l'identifiant et la clé secrète)."
-    s3_use_iam_profile: 'Utiliser un role AWS EC2 IAM pour la récupération des clés. NOTE: si activé, surcharge les paramètres "s3 access key id" et "s3 secret access key".'
+    s3_use_iam_profile: 'Utiliser un <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html">profile d''instance AWS EC2 </a> pour accorder l''accès au S3 bucket. NOTE: pour cela, Discourse doit être exécuté dans une instance EC2 correctement configurée, et remplace les paramètres "s3 access key id" et "s3 secret access key".'
     s3_upload_bucket: "Le nom du bucket Amazon S3 qui contiendra les fichiers téléchargés. ATTENTION : doit être en minuscule, sans points et sans caractères de soulignement."
     s3_access_key_id: "L' access key Amazon S3 qui sera utilisée pour uploader les images."
     s3_secret_access_key: "La clé secrète Amazon S3 qui va être utilisée pour uploader des images."
@@ -1086,7 +1207,7 @@ fr:
     twitter_summary_large_image_url: "URL de l'image par défaut de la carte de résumé Twitter (devrait au moins mesurer 280px en largeur et 150px en hauteur). "
     allow_all_attachments_for_group_messages: "Autorise toutes les pièces-jointes pour les messages de groupes."
     png_to_jpg_quality: "Qualité du fichier JPEG converti (1 est la plus faible, 99 est la meilleure, 100 pour désactiver)."
-    allow_staff_to_upload_any_file_in_pm: "Autoriser les responsables à envoyer n'importe quel fichier dans les messages privés."
+    allow_staff_to_upload_any_file_in_pm: "Autoriser les responsables à envoyer n'importe quel fichier dans les messages directs."
     strip_image_metadata: "Enlever les métadonnées de l'image."
     enable_flash_video_onebox: "Activer l'utilisation de swf et flv (Adobe Flash) dans les boites imbriquées. ATTENTION : cela pourrait introduire un risque de sécurité."
     default_invitee_trust_level: "Niveau de confiance par défaut (0-4) pour les invités."
@@ -1115,12 +1236,17 @@ fr:
     tl3_requires_likes_given: "Le nombre minimum de J'aime à donner dans les (tl3 time period) derniers jours pour être éligible au niveau de confiance 3."
     tl3_requires_likes_received: "Le nombre minimum de J'aime à recevoir dans les (tl3 time period) derniers jours pour être éligible au niveau de confiance 3."
     tl3_links_no_follow: "Ne pas retirer rel=nofollow sur les liens des messages par les utilisateurs de niveau de confiance 3."
+    trusted_users_can_edit_others: "Permettre aux utilisateurs ayant un niveau de confiance élevé d'éditer le contenu d'autres utilisateurs"
     min_trust_to_create_topic: "Le niveau de confiance minimum pour créer un nouveau sujet."
+    allow_flagging_staff: "Si cette option est activée, les utilisateurs peuvent signaler les messages des responsables."
     min_trust_to_edit_wiki_post: "Le niveau de confiance minimum requis pour modifier les messages de type wiki."
     min_trust_to_edit_post: "Le niveau de confiance minimum requis pour modifier des messages."
     min_trust_to_allow_self_wiki: "Le niveau de confiance minimum requis pour transformer ses propres messages en type wiki."
-    min_trust_to_send_messages: "Le niveau de confiance minimum pour être autorisé à créer des nouveaux messages privés."
-    min_trust_to_send_email_messages: "Le niveau de confiance minimum requis pour envoyer de nouveaux messages privés par courriel (aux utilisateurs générés)."
+    min_trust_to_send_messages: "Le niveau de confiance minimum pour être autorisé à créer des nouveaux messages directs."
+    min_trust_to_send_email_messages: "Le niveau de confiance minimum requis pour envoyer de nouveaux messages directs par courriel (aux utilisateurs distants)."
+    min_trust_to_flag_posts: "Le niveau de confiance minimum requis pour signaler des messages"
+    min_trust_to_post_links: "Le niveau de confiance minimum requis pour inclure des liens dans les messages"
+    min_trust_to_post_images: "Le niveau de confiance minimum requis pour inclure des images dans les messages"
     newuser_max_links: "Combien de liens un nouvel utilisateur peut-il ajouter à un message."
     newuser_max_images: "Combien d'images un nouvel utilisateur peut-il ajouter à un message."
     newuser_max_attachments: "Combien de fichiers un nouvel utilisateur peut-il ajouter à un message."
@@ -1128,9 +1254,10 @@ fr:
     newuser_max_replies_per_topic: "Nombre maximum de réponses qu'un nouvel utilisateur peut faire dans une même discussion avant que quelqu'un lui réponde."
     max_mentions_per_post: "Nombre maximal de @pseudo que tout le monde peut mentionner dans un message."
     max_users_notified_per_group_mention: "Nombre maximum d'utilisateurs qui peuvent recevoir une notification si un groupe est mentionné (si le seuil est atteint, aucune notification ne sera envoyée)"
+    enable_mentions: "Permettre aux utilisateurs de mentionner d'autres utilisateurs."
     create_thumbnails: "Créer un aperçu pour les images imbriquées qui sont trop large pour le message."
     email_time_window_mins: "Attendre (n) minutes avant l'envoi des courriels de notification, afin de laisser une chance aux utilisateurs de modifier ou finaliser leurs messages."
-    private_email_time_window_seconds: "Attendre (n) secondes avant d'envoyer des courriels de notification privés, afin de donner aux utilisateurs la chance d'éditer et de finaliser leurs messages."
+    personal_email_time_window_seconds: "Attendre (n) secondes avant d'envoyer des courriels de notification directs, afin de donner aux utilisateurs la possibilité d'éditer et de finaliser leurs messages."
     email_posts_context: "Combien de réponses précédentes doit-on inclure dans les courriels de notifications pour situer le contexte."
     flush_timings_secs: "À quelle fréquence les données de timing doivent être vider, en secondes."
     title_max_word_length: "Le nombre maximum de caractères dans le titre d'un sujet."
@@ -1146,6 +1273,7 @@ fr:
     max_image_size_kb: "La taille maximale des images en Ko. Doit être configuré dans nginx (client_max_body_size) / apache ou proxy aussi."
     max_attachment_size_kb: "La taille maximale des fichiers envoyés en Ko. Doit être configurer dans nginx (client_max_body_size) / apache ou proxy aussi."
     authorized_extensions: "Une liste d'extensions de fichier autorisées pour les envois sur le serveur (mettre '*' pour autoriser tous les types)"
+    authorized_extensions_for_staff: "Une liste des extensions de fichiers autorisées pour le téléchargement pour les responsables en plus de la liste définie dans le paramètre `authorized_extensions'. (utilisez '*' pour activer tous les types de fichiers)"
     theme_authorized_extensions: "Une liste d'extensions de fichier autorisées pour les envois de thème (mettre « * » pour autoriser tous les types de fichier)"
     max_similar_results: "Combien de sujets similaires sont afficher lorsqu'un utilisateur est en train de créer un nouveau sujet. La comparaison se base sur le titre et le contenu."
     max_image_megapixels: "Nombre maximum autorisé de mégapixels pour une image."
@@ -1165,6 +1293,7 @@ fr:
     faq_url: "Si vous disposez déjà d'une FAQ/Règles de la communauté, hébergée ailleurs, que vous souhaitez utiliser, vous pouvez renseigner l'URL complète ici."
     tos_url: "Si vous disposez déjà de conditions générales d'utilisation hébergées ailleurs que vous souhaitez utiliser, vous pouvez renseigner leur URL complète ici."
     privacy_policy_url: "Si vous disposez déjà d'une politique de confidentialité hébergée ailleurs que vous voulez utiliser, vous pouvez renseigner son URL complète ici."
+    log_anonymizer_details: "S'il y a lieu de conserver les détails d'un utilisateur dans le journal après avoir été rendu anonyme. Lorsque vous vous conformerez au GDPR, vous devrez l'éteindre."
     newuser_spam_host_threshold: "Combien de fois un nouvel utilisateur peut publier un lien vers le même hôte dans la limite de leur `newuser_spam_host_threshold` messages avant d'être considérés comme du spam."
     white_listed_spam_host_domains: "Une liste des domaines exclus des hôtes testés comme spam. Les nouveaux utilisateurs ne seront jamais empêchés de créer des messages contenant des liens vers ces domaines. "
     staff_like_weight: "Quel poids supplémentaire donner aux J'aime de l'équipe."
@@ -1180,12 +1309,15 @@ fr:
     num_hours_to_close_topic: "Nombre d'heures de fermeture d'un sujet pour intervention."
     auto_respond_to_flag_actions: "Activer la réponse automatique lors du traitement d'un signalement."
     min_first_post_typing_time: "Minimum de temps en millisecondes qu'un utilisateur doit passer à la saisie de son premier commentaire, si le seuil n'est pas atteint, il rejoindra automatiquement la file des commentaires en cours d'approbation. Mettre à 0 pour désactiver (non recommandé)"
+    auto_silence_fast_typers_on_first_post: "Mettre sous silence automatiquement les utilisateurs qui n'ont pas respecté min_first_post_typing_time"
     auto_silence_fast_typers_max_trust_level: "Niveau de confiance maximum pour automatiquement mettre sous silence les utilisateurs rédigeant des messages trop rapidement."
+    auto_silence_first_post_regex: "Regex non sensible à la casse qui, si elle est déclenchée, mettre sous silence le premier message de l'utilisateur et l'enverra dans la file d'attente d'approbation.\nExemple: rageux|a[bc]a mettre sous slience les premiers messages contenant rageux ou aba ou aca."
     flags_default_topics: "Afficher les sujets signalés par défaut dans la section administrateur"
+    min_flags_staff_visibility: "Le nombre minimum de signalements sur un message avant qu'un responsable puisse le voir sous admin."
     reply_by_email_enabled: "Activer les réponses aux sujets via courriel."
     reply_by_email_address: "Modèle pour la réponse par courriel entrant; exemple : %{reply_key}@reply.example.com ou replies+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "Liste des templates alternatifs pour les adresses des courriels entrants de la réponse par courriel. Exemple : %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
-    incoming_email_prefer_html: "Utilisez le HTML plutôt que le texte pour les emails entrants."
+    incoming_email_prefer_html: "Utilisez HTML plutôt que du texte pour les courriels entrants."
     disable_emails: "Désactiver l'envoi de les courriels depuis Discourse."
     strip_images_from_short_emails: "Retirer les images des courriels dont la taille est inférieur à 2800 Octets"
     short_email_length: "Taille des courriels courts en Octets"
@@ -1194,15 +1326,15 @@ fr:
     unsubscribe_via_email_footer: "Inclure un lien dans le pied des courriels envoyés pour se désabonner"
     delete_email_logs_after_days: "Efface les journaux de messagerie après (N) jours. 0 pour conserver indéfiniment."
     max_emails_per_day_per_user: "Nombre maximum de courriels à envoyer aux utilisateurs par jour. 0 pour désactiver la limite"
-    enable_staged_users: "Créer automatiquement les utilisateurs en attente lors du traitement des courriels entrants."
-    maximum_staged_users_per_email: "Nombre maximum d'utilisateurs créés lors du traitement d'un courriel entrant."
+    enable_staged_users: "Créer automatiquement les utilisateurs distants lors du traitement des courriels entrants."
+    maximum_staged_users_per_email: "Nombre maximum d'utilisateurs distants créés lors du traitement d'un courriel entrant."
     auto_generated_whitelist: "Liste des adresses courriel qui ne seront pas vérifiées pour du contenu généré automatiquement. Exemple : foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "Bloquer les courriels entrants identifiés comme générés automatiquement."
     ignore_by_title: "Ignorer les courriels entrants selon leur titre."
     mailgun_api_key: "Clé API secrète de Mailgun utilisée pour vérifier les messages du webhook."
     soft_bounce_score: "Score de rejet ajouté à l'utilisateur lorsqu'un rejet temporaire se produit."
     hard_bounce_score: "Score de rejet ajouté à l'utilisateur lorsqu'un rejet permanent se produit."
-    bounce_score_threshold: "Score de rejet maximum à partir duquel nous allons arrêter d'envoyer des courriels à un utilisateur."
+    bounce_score_threshold: "Score de rejet maximum à partir duquel nous arrêterons d'envoyer des courriels à un utilisateur."
     bounce_score_threshold_deactivate: "Score de rejet maximum à partir duquel nous allons désactiver un utilisateur."
     reset_bounce_score_after_days: "Rétablir automatiquement le score de rejet après X jours."
     attachment_content_type_blacklist: "Liste des mots-clés utilisés pour filtrer les pièces jointes en fonction du type de contenu."
@@ -1212,7 +1344,7 @@ fr:
     private_email: "Ne pas inclure du contenu des messages ou des sujets dans les courriels pour plus de confidentialité."
     manual_polling_enabled: "Envoyer les courriels en utilisant l'API des réponses par courriel."
     pop3_polling_enabled: "Utiliser POP3 pour les réponses via courriel."
-    pop3_polling_ssl: "Utiliser SSL pour les connections au serveur POP3. (Recommandé)"
+    pop3_polling_ssl: "Utiliser SSL pour les connexions au serveur POP3. (Recommandé)"
     pop3_polling_openssl_verify: "Vérifier le certificat TLS du serveur (activé par défaut)"
     pop3_polling_period_mins: "La période en minute entre chaque vérification du compte POP3 des courriels.\nNote: nécessite un redémarrage de la machine."
     pop3_polling_port: "Le port pour le pooling des courriels via POP3."
@@ -1220,13 +1352,16 @@ fr:
     pop3_polling_username: "Le nom d'utilisateur du compte POP3 pour le pooling des courriels."
     pop3_polling_password: "Le mot de passe du compte POP3 pour le pooling des courriels."
     log_mail_processing_failures: "Enregistrer tous les problèmes de mails sur\nhttp://yoursitename.com/logs"
+    email_in: "Autoriser les utilisateurs à poster de nouveaux sujets par courriel (requêtes manuelles ou via pop3 requises). Configurer les adresses dans l'onglet \"Paramètres\" de chaque catégorie."
     email_in_min_trust: "Le niveau de confiance minimum qu'un utilisateur doit avoir pour être autorisé à poster de nouveaux sujets par courriel."
     email_prefix: "Le [label] qui sera utilisé dans le sujet des courriels. Par défaut il prend la valeur de 'title'."
     email_site_title: "Le titre du site utilisé comme expéditeur pour les courriels du site. Par défaut il prend la valeur de 'title'. Si votre 'title\" utilise des caractères interdits dans les courriels, utiliser ce paramètre."
+    find_related_post_with_key: "N'utilisez que le 'reply key' pour trouver le message auquel on a répondu. ATTENTION : la désactivation de cette option permet l'usurpation d'identité de l'utilisateur sur la base de l'adresse e-mail."
     minimum_topics_similar: "Combien de sujets ont besoin d'exister dans la base de données avant que des sujets similaires soit présentés lors de la rédaction de nouveaux sujets."
     relative_date_duration: "Nombre de jours après la création d'un message à partir desquels les dates seront affichées en absolu (20 Fév) plutôt qu'en relatif (7j)"
     delete_user_max_post_age: "Interdire la suppression des utilisateurs dont le premier message est date de plus de (n) jours."
     delete_all_posts_max: "Le nombre maximum de messages qui peuvent être supprimés en une seule fois avec le bouton Supprimer tous les messages. Si un utilisateur a plus que ce nombre de messages, ses messages ne pourront pas être supprimés en une seule fois et l'utilisateur ne pourra pas être supprimé."
+    username_change_period: "Le nombre de jours maximum après l'enregistrement que l'utilisateur peut encore modifier son pseudo (0 pour empêcher la modification de pseudo)."
     email_editable: "Autoriser les utilisateurs à modifier leur adresse de courriel après l'inscription."
     logout_redirect: "URL vers laquelle rediriger le navigateur après déconnexion (par exemple : http://unsite.com/deconnexion)"
     allow_uploaded_avatars: "Autoriser les utilisateurs à télécharger une photo de profil personnalisé."
@@ -1241,6 +1376,7 @@ fr:
     suppress_digest_email_after_days: "Ne pas envoyer de résumés par courriel aux utilisateurs qui n'ont pas visité le site depuis plus de (n) jours."
     digest_suppress_categories: "Ne pas inclure ces catégories dans les résumés par courriel."
     disable_digest_emails: "Désactiver les résumés par courriel pour tous les utilisateurs."
+    email_accent_bg_color: "La couleur d'accentuation utilisée comme arrière-plan de certains éléments des courriels HTML. Entrez un nom de couleur (« red ») ou une valeur hexadécimale (« #FF0000 »)."
     email_accent_fg_color: "La couleur des textes rendus sur la couleur d'arrière-plan des courriels HTML. Entrez un nom de couleur (« white ») ou une valeur hexadécimale (« #FFFFFF »)."
     email_link_color: "La couleur des liens dans les courriels HTML. Entrez un nom de couleur (« blue ») ou une valeur hexadécimale (« #0000FF »)."
     detect_custom_avatars: "Vérifier ou non si les utilisateurs ont envoyé une photo de profil personnalisée."
@@ -1249,11 +1385,14 @@ fr:
     staff_user_custom_fields: "Une liste blanche des champs personnalisés pour un utilisateur qui peuvent être vus par l'équipe."
     enable_user_directory: "Fournir un répertoire des utilisateurs"
     enable_group_directory: "Proposer un répertoire pour parcourir les groupes"
+    group_in_subject: "Mettre %{optional_pm} dans le sujet du courriel au nom du premier groupe dans le MD. Voir : https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801"
     allow_anonymous_posting: "Permettre aux utilisateurs de passer en mode anonyme"
     anonymous_posting_min_trust_level: "Le niveau de confiance minimum pour passer en mode anonyme."
     anonymous_account_duration_minutes: "Pour protéger l'anonymat, créer un nouveau compte anonyme tous les N minutes pour chaque utilisateur. Exemple: si 600 est choisi, dès 600 minutes après le dernier message ET que l'utilisateur passe en mode anonyme, un nouveau compte anonyme lui sera crée."
     hide_user_profiles_from_public: "Cacher les cartes, les profils et le répertoire d'utilisateurs aux visiteurs."
+    show_inactive_accounts: "Autoriser les utilisateurs connectés à parcourir les profils de comptes inactifs."
     hide_suspension_reasons: "Ne pas afficher les raisons d'une suspension sur les profils utilisateurs."
+    log_personal_messages_views: "Logguer les vues de messages directs par Admin pour d'autres utilisateurs/groupes."
     user_website_domains_whitelist: "Les sites Web des utilisateurs vont être vérifiés contre ces domaines. Liste délimitée par des pipes (|)."
     allow_profile_backgrounds: "Autoriser les utilisateurs à envoyer des arrières-plans de profil."
     sequential_replies_threshold: "Nombre de messages successifs qu'un utilisateur peut poster dans un sujet avant d'être averti d'avoir posté un nombre excessif de réponses qui se suivent."
@@ -1270,6 +1409,7 @@ fr:
     topic_page_title_includes_category: "Le titre de la page du sujet inclut le nom de la catégorie."
     native_app_install_banner: "Propose aux visiteurs réguliers d'installer l'application Discourse native."
     share_anonymized_statistics: "Partager les statistiques d'utilisation anonymes."
+    auto_handle_queued_age: "Gérer automatiquement les documents qui attendent d'être examinés après ce nombre de jours. Les signalements seront ignorés. Les messages et les utilisateurs en file d'attente  seront rejetés. Réglez à 0 pour désactiver cette fonction."
     max_prints_per_hour_per_user: "Nombre maximum d'accès à la page /print (mettre à 0 pour désactiver)"
     full_name_required: "Le nom complet est requis dans le profil utilisateur."
     enable_names: "Autoriser l'affichage des noms complets des utilisateurs dans leur profil, sur leur carte d'utilisateur et dans les courriels. Décocher pour cacher les noms complets partout."
@@ -1281,22 +1421,25 @@ fr:
     autohighlight_all_code: "Forcer la mise en évidence de tout les textes dans les balises code, même si ils ne correspondent à aucun langage de programmation."
     highlighted_languages: "Règles de coloration syntaxique supportées. (Attention : supporter trop de langages peut impacter les performances) voir : https://highlightjs.org/static/demo/ pour une démo"
     embed_truncate: "Tronquer les messages embarqués."
+    embed_support_markdown: "Prise en charge du formatage Markdown pour les messages intégrés."
     allowed_href_schemes: "Préfixes autorisés dans les liens en plus de http et https."
     embed_post_limit: "Nombre maximum de messages à embarquer."
     embed_username_required: "Un pseudo d'utilisateur pour la création du sujet est nécessaire."
-    notify_about_flags_after: "S'il y a des signalements qui n'ont pas été traités après ce nombre d'heures, envoyer un message privé aux responsables. Mettre 0 pour désactiver."
+    notify_about_flags_after: "S'il y a des signalements qui n'ont pas été gérés après ce nombre d'heures, envoyer un message direct aux modérateurs. 0 pour désactiver."
     show_create_topics_notice: "Si le site contient moins de 5 sujets publics, afficher un message pour demander aux administrateurs de créer d'autres sujets."
     delete_drafts_older_than_n_days: Supprimer les brouillons plus vieux que (n) jours.
     bootstrap_mode_min_users: "Nombre minimum d'utilisateurs nécessaire pour désactiver le mode de démarrage (mettre à 0 pour désactiver)"
     prevent_anons_from_downloading_files: "Refuser le téléchargement de pièces jointes aux visiteurs. ATTENTION : cela empêchera de fonctionner les ressources envoyées en pièce jointe qui ne sont pas des images."
     slug_generation_method: "Choisissez une méthode de génération d'identifiant. \"encodé\" générera des chaines de caractères encodées avec des pourcentages. \"aucune\" désactivera complètement les identifiants."
     enable_emoji: "Activer les emojis"
+    enable_emoji_shortcuts: "Les textes de smiley courants :) :p :( seront convertis en emojis"
     emoji_set: "Comment aimeriez-vous vos emoji ?"
     enforce_square_emoji: "Forcer tous les Emojis à être carrés."
     approve_post_count: "Le nombre de messages d'un utilisateur nouveau ou basique devant être approuvés"
     approve_unless_trust_level: "Les messages des utilisateurs qui n'ont pas atteint ce niveau de confiance doivent être approuvés"
     approve_new_topics_unless_trust_level: "Les nouveaux sujets des utilisateurs en dessous de ce niveau de confiance doivent être approuvés"
-    notify_about_queued_posts_after: "Si des messages sont en attente de modération depuis ce nombre d'heures, un courriel sera envoyé à l'email de contact. Mettre 0 pour désactiver ces courriels."
+    approve_unless_staged: "Les nouveaux sujets et messages des utilisateurs distants doivent être approuvés"
+    notify_about_queued_posts_after: "Si des messages sont en attente de modération depuis ce nombre d'heures, envoyer un courriel à tous les modérateurs. Désactiver ces courriels en indiquant 0."
     auto_close_messages_post_count: "Nombre maximum de messages dans un message privé avant qu'il ne soit automatiquement fermé (0 pour désactiver)"
     auto_close_topics_post_count: "Nombre maximum de messages dans un sujet avant qu'il ne soit automatiquement fermé (0 pour désactiver)"
     code_formatting_style: "Le bouton Code dans l'éditeur utilisera ce style de formatage par défaut"
@@ -1304,7 +1447,7 @@ fr:
     watched_words_regular_expressions: "Les mots surveillés sont des expressions régulières."
     default_email_digest_frequency: "Par défaut, à quelle fréquence les utilisateurs reçoivent les résumés par courriel."
     default_include_tl0_in_digests: "Par défaut, inclure les messages des nouveaux utilisateurs dans les résumés par courriel. Les utilisateurs peuvent changer cela dans leurs préférences."
-    default_email_private_messages: "Envoyer un courriel quand quelqu'un envoie un message à un utilisateur."
+    default_email_personal_messages: "Envoyer un courriel quand quelqu'un envoie un message à l'utilisateur par défaut."
     default_email_direct: "Envoyer un courriel quand quelqu'un cite/répond à/mentionne ou invite un utilisateur."
     default_email_mailing_list_mode: "Envoyer un courriel pour chaque nouveau message."
     default_email_mailing_list_mode_frequency: "Par défaut, les utilisateurs ayant activé la liste de diffusion recevront des courriels à cette fréquence."
@@ -1340,14 +1483,18 @@ fr:
     show_filter_by_tag: "Afficher une liste déroulante pour filtrer une liste de sujet par tag."
     max_tags_in_filter_list: "Nombre maximum de tags à afficher dans la liste déroulante de filtres. Les tags les plus utilisés seront affichés."
     tags_sort_alphabetically: "Afficher les tags par ordre alphabétique. Par défaut, ils sont affichés par ordre de popularité."
+    tags_listed_by_group: "Lister les tags par groupe de tag sur la page Tags (/tags)."
     tag_style: "Style visuel pour tag badges."
-    staff_tags: "Une liste de tags qui ne peuvent être appliqués que par des responsables."
+    allow_staff_to_tag_pms: "Autoriser les responsables à signaler n'importe quel message direct"
     min_trust_level_to_tag_topics: "Niveau de confiance minimum requis pour taguer des sujets"
     suppress_overlapping_tags_in_list: "Si des tags correspondent exactement à des mots du titre d'un sujet, ne pas afficher ces tags"
     remove_muted_tags_from_latest: "Ne pas afficher les sujets avec des tags silencieux dans la liste des sujets récents."
     company_short_name: "Nom de société (court)"
     company_full_name: "Nom de société (complet)"
     company_domain: "Domaine de la société"
+    shared_drafts_category: "Activez la fonction Ébauches partagées en désignant une catégorie pour les ébauches de sujet."
+    push_notifications_prompt: "Afficher la demande de consentement de l'utilisateur"
+    push_notifications_icon_url: "L'icône de badge qui apparait dans le coin notifications. Taille recommandée: 96px x 96px."
     errors:
       invalid_email: "Adresse de courriel invalide."
       invalid_username: "Il n'y a pas d'utilisateur ayant ce pseudo."
@@ -1371,6 +1518,12 @@ fr:
       email_polling_disabled: "Vous devez activer le relevé manuel ou via POP3 avant d'activer les réponses par courriel."
       user_locale_not_enabled: "Vous devez d'abord activer 'allow user locale' avant d'activer ce paramètre."
       invalid_regex: "L'expression régulière est invalide ou non autorisée."
+      email_editable_enabled: "Vous devez désactiver 'email editable' avant d'activer ce paramètre."
+      enable_sso_disabled: "Vous devez d'abord activer 'enable sso' avant d'activer ce paramètre."
+      staged_users_disabled: "Vous devez d'abord activer 'utilisateurs distants' avant d'activer ce paramètre."
+      reply_by_email_disabled: "Vous devez d'abord activer 'reply by email' avant d'activer ce paramètre."
+      sso_url_is_empty: "Vous devez d'abord configurer un 'sso url' avant d'activer ce paramètre."
+      enable_local_logins_disabled: "Vous devez d'abord activer 'enable local logins' avant d'activer ce paramètre."
   search:
     within_post: "#%{post_number} par %{username}"
     types:
@@ -1395,18 +1548,18 @@ fr:
     not_seen_in_a_month: "Heureux de vous revoir parmi nous ! Nous ne vous avons pas vu depuis un moment. Voici les sujets les plus populaires depuis votre absence."
   merge_posts:
     edit_reason:
-      one: "Un message a été fusionné par %{username}"
-      other: "%{count} messages ont été fusionnés par %{username}"
+      one: Un message a été fusionné par %{username}
+      other: '%{count} messages ont été fusionnés par %{username}'
     errors:
       different_topics: "Des messages appartenant à différents sujets ne peuvent pas être fusionnés."
       different_users: "Des messages appartenant à différents utilisateurs ne peuvent pas être fusionnés."
   move_posts:
     new_topic_moderator_post:
-      one: "Un message a été déplacé vers un nouveau sujet : %{topic_link}"
-      other: "%{count} messages ont été déplacés vers un nouveau sujet : %{topic_link}"
+      one: 'Un message a été déplacé vers un nouveau sujet : %{topic_link}'
+      other: '%{count} messages ont été déplacés vers un nouveau sujet : %{topic_link}'
     existing_topic_moderator_post:
-      one: "Un message a été intégré dans un sujet existant : %{topic_link}"
-      other: "%{count} messages ont été intégrés dans un sujet existant : %{topic_link}"
+      one: 'Un message a été intégré dans un sujet existant : %{topic_link}'
+      other: '%{count} messages ont été intégrés dans un sujet existant : %{topic_link}'
   change_owner:
     post_revision_text: "Auteur du message changé de %{old_user} vers %{new_user}"
     deleted_user: "un utilisateur supprimé"
@@ -1416,47 +1569,47 @@ fr:
     closed_enabled: "Ce sujet est maintenant fermé. Les nouvelles réponses ne sont plus autorisées."
     closed_disabled: "Ce sujet est maintenant ouvert. Les nouvelles réponses sont autorisées."
     autoclosed_message_max_posts:
-      one: "Ce message a été automatiquement fermé après avoir atteint la limite maximum de 1 réponse."
-      other: "Ce message a été automatiquement fermé après avoir atteint la limite maximum de %{count} réponses."
+      one: Ce message a été automatiquement fermé après avoir atteint la limite maximum de 1 réponse.
+      other: Ce message a été automatiquement fermé après avoir atteint la limite maximum de %{count} réponses.
     autoclosed_topic_max_posts:
-      one: "Ce sujet a été automatiquement fermé après avoir atteint la limite maximum de 1 réponse."
-      other: "Ce sujet a été automatiquement fermé après avoir atteint la limite maximum de %{count} réponses."
+      one: Ce sujet a été automatiquement fermé après avoir atteint la limite maximum de 1 réponse.
+      other: Ce sujet a été automatiquement fermé après avoir atteint la limite maximum de %{count} réponses.
     autoclosed_enabled_days:
-      one: "Cette discussion a été automatiquement fermée après un jour. Aucune réponse n'est permise dorénavant."
-      other: "Ce sujet a été automatiquement fermé après %{count} jours. Aucune réponse n'est permise dorénavant."
+      one: Cette discussion a été automatiquement fermée après un jour. Aucune réponse n'est permise dorénavant.
+      other: Ce sujet a été automatiquement fermé après %{count} jours. Aucune réponse n'est permise dorénavant.
     autoclosed_enabled_hours:
-      one: "Cette discussion a été automatiquement fermée après une heure. Aucune réponse n'est permise dorénavant."
-      other: "Ce sujet a été automatiquement fermé après %{count} heures. Aucune réponse n'est permise dorénavant."
+      one: Cette discussion a été automatiquement fermée après une heure. Aucune réponse n'est permise dorénavant.
+      other: Ce sujet a été automatiquement fermé après %{count} heures. Aucune réponse n'est permise dorénavant.
     autoclosed_enabled_minutes:
-      one: "Cette discussion a été automatiquement fermée après une minute. Aucune réponse n'est permise dorénavant."
-      other: "Ce sujet a été automatiquement fermé après %{count} minutes. Aucune réponse n'est permise dorénavant."
+      one: Cette discussion a été automatiquement fermée après une minute. Aucune réponse n'est permise dorénavant.
+      other: Ce sujet a été automatiquement fermé après %{count} minutes. Aucune réponse n'est permise dorénavant.
     autoclosed_enabled_lastpost_days:
-      one: "Cette discussion a été automatiquement fermée après un jour. Aucune réponse n'est permise dorénavant."
-      other: "Ce sujet a été automatiquement fermé après %{count} jours. Aucune réponse n'est permise dorénavant."
+      one: Cette discussion a été automatiquement fermée après un jour. Aucune réponse n'est permise dorénavant.
+      other: Ce sujet a été automatiquement fermé après %{count} jours. Aucune réponse n'est permise dorénavant.
     autoclosed_enabled_lastpost_hours:
-      one: "Cette discussion a été automatiquement fermée après 1 heure suivant le dernier commentaire. Aucune réponse n'est permise dorénavant."
-      other: "Ce sujet a été automatiquement fermé après %{count} heures suivant le dernier commentaire. Aucune réponse n'est permise dorénavant."
+      one: Cette discussion a été automatiquement fermée après 1 heure suivant le dernier commentaire. Aucune réponse n'est permise dorénavant.
+      other: Ce sujet a été automatiquement fermé après %{count} heures suivant le dernier commentaire. Aucune réponse n'est permise dorénavant.
     autoclosed_enabled_lastpost_minutes:
-      one: "Cette discussion a été automatiquement fermée une minute après le dernier message. Aucune réponse n'est permise dorénavant."
-      other: "Ce sujet a été automatiquement fermé %{count} minutes après le dernier message. Aucune réponse n'est permise dorénavant."
+      one: Cette discussion a été automatiquement fermée une minute après le dernier message. Aucune réponse n'est permise dorénavant.
+      other: Ce sujet a été automatiquement fermé %{count} minutes après le dernier message. Aucune réponse n'est permise dorénavant.
     autoclosed_disabled_days:
-      one: "Ce sujet a été automatiquement ouvert après 1 jour."
-      other: "Ce sujet a été automatiquement ouvert après %{count} jours."
+      one: Ce sujet a été automatiquement ouvert après 1 jour.
+      other: Ce sujet a été automatiquement ouvert après %{count} jours.
     autoclosed_disabled_hours:
-      one: "Ce sujet a été automatiquement ouvert après 1 heure."
-      other: "Ce sujet a été automatiquement ouvert après %{count} heures."
+      one: Ce sujet a été automatiquement ouvert après 1 heure.
+      other: Ce sujet a été automatiquement ouvert après %{count} heures.
     autoclosed_disabled_minutes:
-      one: "Ce sujet a été automatiquement ouvert après 1 minute."
-      other: "Ce sujet a été automatiquement ouvert après %{count} minutes."
+      one: Ce sujet a été automatiquement ouvert après 1 minute.
+      other: Ce sujet a été automatiquement ouvert après %{count} minutes.
     autoclosed_disabled_lastpost_days:
-      one: "Ce sujet a été automatiquement ouvert 1 jour après la dernière réponse."
-      other: "Ce sujet a été automatiquement ouvert %{count} jours après la dernière réponse."
+      one: Ce sujet a été automatiquement ouvert 1 jour après la dernière réponse.
+      other: Ce sujet a été automatiquement ouvert %{count} jours après la dernière réponse.
     autoclosed_disabled_lastpost_hours:
-      one: "Ce sujet a été automatiquement ouvert 1 heure après la dernière réponse."
-      other: "Ce sujet a été automatiquement ouvert %{count} heures après la dernière réponse."
+      one: Ce sujet a été automatiquement ouvert 1 heure après la dernière réponse.
+      other: Ce sujet a été automatiquement ouvert %{count} heures après la dernière réponse.
     autoclosed_disabled_lastpost_minutes:
-      one: "Ce sujet a été automatiquement ouvert 1 minute après la dernière réponse."
-      other: "Ce sujet a été automatiquement ouvert %{count} minutes après la dernière réponse."
+      one: Ce sujet a été automatiquement ouvert 1 minute après la dernière réponse.
+      other: Ce sujet a été automatiquement ouvert %{count} minutes après la dernière réponse.
     autoclosed_disabled: "Ce sujet est maintenant ouvert. Les nouvelles réponses sont autorisées."
     autoclosed_disabled_lastpost: "Ce sujet est maintenant ouvert. Vous pouvez y participer."
     pinned_enabled: "Ce sujet est maintenant épinglé. Il apparaîtra en haut de sa catégorie jusqu'à ce qu'il soit désépinglé par un modérateur, ou individuellement par les utilisateurs eux-mêmes."
@@ -1465,13 +1618,14 @@ fr:
     pinned_globally_disabled: "Ce sujet est maintenant désépinglé. Il n'apparaîtra plus en haut de sa catégorie."
     visible_enabled: "Ce sujet est maintenant visible. Il sera affiché dans la liste des sujets."
     visible_disabled: "Ce sujet est maintenant invisible. Il ne sera plus affiché dans la liste des sujets. Le seul moyen d'y accéder est par lien direct."
-    auto_deleted_by_timer: "Automatiquement supprimé par planification"
+    auto_deleted_by_timer: "Supprimé automatiquement par planification"
   login:
     not_approved: "Votre compte n'a pas encore été approuvé. Vous serez notifié par courriel quand cela sera fait."
     incorrect_username_email_or_password: "pseudo, adresse de courriel ou mot de passe incorrect"
+    incorrect_password: "Mot de passe incorrect"
     wait_approval: "Merci de vous être inscrit. Nous vous informerons lorsque votre compte aura été approuvé."
     active: "Votre compte est activé et prêt à l'emploi."
-    activate_email: "<p>C'est presque terminé ! Nous avons envoyé un email d'activation à <b>%{email}</b>.  Merci de suivre les instructions pour activer votre compte.</p><p>Si vous ne le recevez pas, vérifiez le dossier Spam dans votre messagerie."
+    activate_email: "<p>C'est presque terminé ! Nous avons envoyé un email d'activation à <b>%{email}</b>.  Merci de suivre les instructions pour activer votre compte.</p><p>Si vous ne le recevez pas, vérifiez le dossier Spam dans votre messagerie.</p>"
     not_activated: "Vous ne pouvez pas vous connecter pour le moment. Nous vous avons envoyé un courriel d'activation. Merci de suivre les instructions qui s'y trouve pour activer votre compte."
     not_allowed_from_ip_address: "Vous ne pouvez pas vous connecter en tant que %{username} depuis cette adresse IP."
     admin_not_allowed_from_ip_address: "Vous ne pouvez pas vous connecter depuis cette adresse IP."
@@ -1482,7 +1636,7 @@ fr:
     something_already_taken: "Quelque chose c'est mal passé. Peut-être que votre pseudo ou votre adresse de courriel est déjà enregistré ? Essayez le lien : j'ai oublié mon mot de passe."
     omniauth_error: "Désolé, une erreur est survenue lors de l'autorisation de votre compte. Vous n'avez peut-être pas approuvé l'autorisation ?"
     omniauth_error_unknown: "Quelque chose s'est mal passé lors de votre connexion, merci de réessayer."
-    authenticator_error_no_valid_email: "Aucune adresse courriel associée à %{account] n'est autorisée. Vous devriez configurer votre compte avec une autre adresse."
+    authenticator_error_no_valid_email: "Aucune adresse courriel associée à %{account}n'est autorisée. Vous devriez configurer votre compte avec une autre adresse."
     new_registrations_disabled: "La création de nouveau compte n'est pas autorisé pour le moment."
     password_too_long: "Les mots de passe sont limités à 200 caractères."
     email_too_long: "L'email renseigné est trop long. Les noms de boîte ne doivent pas dépasser 254 caractères, et les noms de domaines ne doivent pas dépasser 253 caractères."
@@ -1491,6 +1645,9 @@ fr:
     auth_complete: "Authentification terminée."
     click_to_continue: "Cliquer ici pour continuer."
     already_logged_in: "Oups, on dirait que vous essayez d'accepter une invitation d'un autre utilisateur. Si vous n'êtes pas %{current_user}, veuillez vous déconnecter et réessayer."
+    second_factor_title: "Authentification à deux facteurs"
+    second_factor_description: "Veuillez saisir le code d'authentification requise de votre app :"
+    invalid_second_factor_code: "Code d'authentification invalide"
   user:
     no_accounts_associated: "Aucun compte associé"
     deactivated: "A été désactivé à cause de trop de courriels rejetés vers '%{email}'."
@@ -1517,13 +1674,18 @@ fr:
       max_new_accounts_per_registration_ip: "Les nouvelles inscriptions ne sont pas autorisées depuis votre adresse IP (limite atteinte). Contactez un responsable."
     website:
       domain_not_allowed: "Site Web invalide. Les domaines autorisés sont : %{domains}"
+    auto_rejected: "Rejeté automatiquement à cause de l'âge. Voir paramètre auto_handle_queued_age site."
+    destroy_reasons:
+      unused_staged_user: "Utilisateur distant inutilisé"
+      fixed_primary_email: "Correction de l'email primaire pour utilisateur distant"
+      same_ip_address: "Même adresse IP (%{ip_address}) que d'autres utilisateurs"
   flags_reminder:
     flags_were_submitted:
-      one: "Des signalements ont été soumis il y a plus de 1 heure. [Veuillez les passer en revue](/admin/flags)."
-      other: "Des signalements ont été soumis il y a plus de %{count} heures. [Veuillez les passer en revue](/admin/flags)."
+      one: Des signalements ont été soumis il y a plus de 1 heure. [Veuillez les passer en revue](/admin/flags).
+      other: Des signalements ont été soumis il y a plus de %{count} heures. [Veuillez les passer en revue](/admin/flags).
     subject_template:
-      one: "un signalement en attente de traitement"
-      other: "%{count} signalements en attente de traitement."
+      one: un signalement en attente de traitement
+      other: '%{count} signalements en attente de traitement.'
   unsubscribe_mailer:
     title: "Désinscription"
     subject_template: "Confirmez que vous ne souhaitez plus recevoir de courriels de mises à jour de %{site_title}"
@@ -1537,12 +1699,72 @@ fr:
       Si vous souhaitez continuer à recevoir ces emails, vous pouvez ignorer ce message.
   invite_mailer:
     title: "Invitiation"
+    subject_template: "%{inviter_name} vous a invité(e) à participer à « %{topic_title} » sur %{site_domain_name}"
+    text_body_template: |
+      %{inviter_name} vous a invité(e) à une discussion
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      à
+
+      > %{site_title} -- %{site_description}
+
+      Si cela vous intéresse, cliquez sur le lien ci-dessous :
+
+      %{invite_link}
   custom_invite_mailer:
     title: "Invitation personnalisée"
+    subject_template: "%{inviter_name} vous a invité(e) à participer à « %{topic_title} » sur %{site_domain_name}"
+    text_body_template: |
+      %{inviter_name} vous a invité(e) à une discussion
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      à
+
+      > %{site_title} -- %{site_description}
+
+      Avec ce message :
+
+      > %{user_custom_message}
+
+      Si cela vous intéresse, cliquez sur le lien ci-dessous :
+
+      %{invite_link}
   invite_forum_mailer:
     title: "Invitation sur le forum"
+    subject_template: "%{inviter_name} vous a invité(e) à rejoindre %{site_domain_name}"
+    text_body_template: |
+      %{inviter_name} vous invite à rejoindre :
+
+      > **%{site_title}**
+      >
+      > %{site_description}
+
+      Si cela vous intéresse, cliquez sur le lien ci-dessous :
+
+      %{invite_link}
   custom_invite_forum_mailer:
     title: "Invitation personnalisée sur le forum"
+    subject_template: "%{inviter_name} vous a invité(e) à rejoindre %{site_domain_name}"
+    text_body_template: |
+      %{inviter_name} vous a invité(e) à rejoindre :
+
+      > **%{site_title}**
+      >
+      > %{site_description}
+
+      Avec ce message :
+
+      > %{user_custom_message}
+
+      Si cela vous intéresse, cliquez sur le lien ci-dessous :
+
+      %{invite_link}
   invite_password_instructions:
     title: "Instructions du mot de passe d'invité"
     subject_template: "Renseignez le mot de passe pour votre compte utilisateur %{site_name} "
@@ -1566,7 +1788,7 @@ fr:
       Désolé, ce lien de téléchargement a déjà été utilisé ou a expiré.
   admin_confirmation_mailer:
     title: "Confirmation de l'Administrateur"
-    subject_template: "[%{site_name}] Confirmer votre nouveau compte"
+    subject_template: "[%{email_prefix}] Confirmer votre nouveau compte"
     text_body_template: |+
       Merci de confirmer que vous aimeriez ajouter **%{target_username}** comme administrateur de votre forum.
 
@@ -1574,7 +1796,7 @@ fr:
 
   test_mailer:
     title: "Envoyer un courriel de test"
-    subject_template: "[%{email_prefix}] Test de délivrance d'email"
+    subject_template: "[%{email_prefix}] Test de délivrabilité courriel"
     text_body_template: |
       Ceci est un courriel de test de
 
@@ -1617,7 +1839,7 @@ fr:
       [mj]: https://www.mailjet.com/pricing
       [mt]: http://www.mail-tester.com/
   new_version_mailer:
-    title: "Nouvelle version"
+    title: "Avertissement de nouvelle version"
     subject_template: "[%{email_prefix}] Nouvelle version de Discourse, mise à jour disponible"
     text_body_template: |+
       Hourra, une nouvelle version de [Discourse](http://www.discourse.org) est disponible !
@@ -1632,7 +1854,7 @@ fr:
       - Visitez [meta.discourse.org](https://meta.discourse.org) pour des nouvelles, des discussions et de l'aide concernant Discourse
 
   new_version_mailer_with_notes:
-    title: "Nouvelle version avec notes"
+    title: "Avertissement de nouvelle version avec notes"
     subject_template: "[%{email_prefix}] mise à jour disponible"
     text_body_template: |
       Hourra, une nouvelle version de [Discourse](http://www.discourse.org) est disponible !
@@ -1661,20 +1883,50 @@ fr:
     deferred: "Merci de nous en informer. Nous travaillons à sa résolution."
     deferred_and_deleted: "Merci de nous en informer. Nous avons supprimé le message."
   temporarily_closed_due_to_flags:
-    one: "Ce sujet est fermé 1 heure suite à plusieurs signalements de la communauté."
-    other: "Ce sujet est fermé %{count} heures suite à plusieurs signalements de la communauté."
+    one: Ce sujet est fermé 1 heure suite à plusieurs signalements de la communauté.
+    other: Ce sujet est fermé %{count} heures suite à plusieurs signalements de la communauté.
   system_messages:
     private_topic_title: "Topic #%{id}"
-    contents_hidden: "Veuillez visiter le post pour voir son contenu."
+    contents_hidden: "Veuillez visiter le message pour voir son contenu."
     post_hidden:
       title: "Message caché"
       subject_template: "Message caché suite à des signalements de la communauté"
-    usage_tips:
       text_body_template: |+
-        Pour connaître quelques astuces pour vous aider à démarrer en tant que nouveau membre, [check out this blog post](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
+        Bonjour,
 
-        Comme vous êtes nouveau ici, nous aimerions vous connaître un peu plus, aussi quelques limitations seront appliquées temporairement. Avec le temps, vous gagnerez  [trust levels](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924)  qui inclus des fonctionnalités spéciales pour nous aider à gérer notre communauté, ensemble.
+        Ceci est un message automatique de %{site_name} pour vous informer que votre message a été caché.
 
+        <%{base_url}%{url} >
+
+        %{flag_reason}
+
+        Plusieurs membres de la communauté ont signalé ce message avant qu'il ne soit masqué donc nous vous invitons à le revoir en fonction de ces retours. **Vous pouvez modifier votre message après %{edit_delay} minutes et il sera alors automatiquement démasqué.**
+
+        Cependant, si votre message est masqué par la communauté une seconde fois, il le restera jusqu'à ce qu'un responsable s'en occupe.
+
+        Pour plus d'informations, merci de vous référer à notre [charte](%{base_url}/guidelines).
+
+    post_hidden_again:
+      title: "Message caché à nouveau"
+      subject_template: "Message caché suite à des signalements de la communauté, responsables avertis"
+      text_body_template: |+
+        Bonjour,
+
+        Ceci est un message automatique de %{site_name} pour vous informer que votre message a été caché.
+
+        <%{base_url}%{url} >
+
+        %{flag_reason}
+
+        Plusieurs membres de la communauté ont signalé ce message avant qu'il ne soit masqué. **Puisque ce message a été caché plusieurs fois, il restera caché jusqu'à ce qu'un responsable puisse s'en occuper.**
+
+        Pour plus d'informations, merci de vous référer à notre [charte communautaire](%{base_url}/guidelines).
+
+    usage_tips:
+      text_body_template: |
+        Pour connaître quelques astuces pour vous aider à démarrer en tant que nouveau membre, [rendez-vous sur cette page](https://meta.discourse.org/t/fr-trucs-et-astuces-pour-nouveaux-utilisateurs/84100/).
+
+        Au fur et à mesure que vous participerez ici, nous apprendrons à vous connaître et les limitations temporaires des nouveaux utilisateurs seront levées. Avec le temps, vous gagnerez [des niveaux de confiance](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) (en anglais) qui incluent des fonctionnalités spéciales pour nous aider à gérer notre communauté ensemble.
     welcome_user:
       title: "Bienvenue Utilisateur"
       subject_template: "Bienvenue sur %{site_name} !"
@@ -1683,7 +1935,7 @@ fr:
 
         %{new_user_tips}
 
-        Nous croyons constamment au [comportement communautaire civilisé](%{base_url}/guidelines).
+        Nous croyons au [comportement civilisé de la communauté](%{base_url}/guidelines) en tout temps.
 
         Amusez-vous bien !
     welcome_invite:
@@ -1698,7 +1950,7 @@ fr:
 
         %{new_user_tips}
 
-        Nous croyons  constamment au [comportement communautaire civilisé](%{base_url}/guidelines).
+        Nous croyons  au [comportement civilisé de la communauté](%{base_url}/guidelines) en tout temps.
 
         Amusez-vous bien !
 
@@ -1765,8 +2017,8 @@ fr:
         %{logs}
         ```
     csv_export_succeeded:
-      title: "Export CVS réussi"
-      subject_template: "Exportation des données terminée"
+      title: "Export CSV réussi"
+      subject_template: "[%{export_title}] Exportation des données terminée"
       text_body_template: |
         L'exportation de vos données a réussi !  :dvd:
 
@@ -1780,24 +2032,63 @@ fr:
       subject_template: "Échec de l'exportation des données "
       text_body_template: "Nous sommes désolés, votre export de données a échoué. Veuillez consulter les journaux ou [contacter un responsable](%{base_url}/about)."
     email_reject_insufficient_trust_level:
+      title: "Courriel rejeté - Niveau de confiance insuffisant "
       subject_template: "[%{email_prefix}] Problème de courriel -- Niveau de confiance insuffisant "
+      text_body_template: |
+        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        Votre compte n'a pas le niveau de confiance requis pour créer un nouveau sujet via cette adresse de courriel. Si vous pensez qu'il s'agit d'une erreur, [contacter un responsable](%{base_url}/about).
     email_reject_user_not_found:
+      title: "Courriel rejeté - Utilisateur introuvable"
       subject_template: "[%{site_name}] Problème de courriel -- L'utilisateur est introuvable"
+      text_body_template: |
+        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        Votre réponse a été envoyée depuis une adresse inconnue. Essayez de l'envoyer depuis une autre adresse, ou [contactez un responsable](%{base_url}/about).
     email_reject_screened_email:
+      title: "Courriel rejeté - Courriel sous surveillance"
       subject_template: "[%{email_prefix}] Problème de courriel -- Courriel bloqué"
+      text_body_template: |
+        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        Votre réponse a été envoyée depuis une adresse qui est sous surveillance. Essayez de l'envoyer depuis une autre adresse, ou [contactez un responsable](%{base_url}/about).
     email_reject_not_allowed_email:
+      title: "Courriel rejeté - Courriel bloqué"
       subject_template: "[%{email_prefix}] Problème de courriel -- Courriel bloqué"
+      text_body_template: |
+        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        Votre réponse a été envoyée depuis une adresse bloquée. Essayez de l'envoyer depuis une autre adresse, ou [contactez un responsable](%{base_url}/about).
     email_reject_inactive_user:
+      title: "Courriel rejeté -  Utilisateur inactif"
       subject_template: "[%{email_prefix}] Problème de courriel -- Utilisateur inactif"
       text_body_template: |
         Malheureusement votre courriel à %{destination} (titled %{former_title}) a échoué.
 
         Le compte associé avec cette adresse existe n'est pas activé. Veuillez activer votre compte avant d'envoyer des courriels.
+    email_reject_silenced_user:
+      title: "Courriel rejeté - Utilisateur sous silence"
+      subject_template: "[%{email_prefix}] Problème de courriel -- Utilisateur sous silence"
+      text_body_template: |
+        Malheureusement votre courriel à %{destination} (titled %{former_title}) a échoué.
+
+        Le compte associé avec cette adresse a été mis sous silence.
     email_reject_reply_user_not_matching:
+      title: "Courriel rejeté - Utilisateur ne correspond pas"
       subject_template: "[%{email_prefix}] Problème de courriel -- Adresse de réponse inattendue"
+      text_body_template: |
+        Malheureusement votre courriel à %{destination} (titled %{former_title}) a échoué.
+
+        Votre réponses nous est parvenue d'une autre adresse courriel que celle attendue, nous ne savons donc pas s'il s'agit de la même personne. Essayez de l'envoyer depuis une autre adresse, ou [contactez un responsable](%{base_url}/about).
     email_reject_no_account:
+      title: "Courriel rejeté - Aucun compte"
       subject_template: "[%{email_prefix}] Problème de courriel - Compte inconnu"
+      text_body_template: |
+        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        Aucun compte utilisateur avec cette adresse n'a été trouvé. Essayez de l'envoyer depuis une autre adresse ou [contactez un responsable](%{base_url}/about).
     email_reject_empty:
+      title: "Courriel rejeté - Vide"
       subject_template: "[%{email_prefix}] Problème de courriel - Aucun contenu"
       text_body_template: |
         Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
@@ -1806,22 +2097,35 @@ fr:
 
         Si vous obtenez ce message alors que vous _aviez_ inclus une réponse, réessayez avec un formatage plus simple.
     email_reject_parsing:
+      title: "Courriel rejeté - Parsing"
       subject_template: "[%{email_prefix}] Problème de courriel -- Contenu non reconnu"
       text_body_template: |
         Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
 
         Nous n'avons pas pu trouver votre réponse dans le courriel. **Assurez-vous que votre réponse se trouve au début du courriel** -- nous ne pouvons pas traiter les réponses en ligne.
     email_reject_invalid_access:
+      title: "Courriel rejeté -  Accès invalide"
       subject_template: "[%{email_prefix}] Problème de courriel -- Accès invalide"
+      text_body_template: |
+        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        Votre compte n'a pas le niveau de confiance requis pour créer un nouveau sujet dans cette catégorie. Si vous pensez qu'il s'agit d'une erreur, contactez un responsable](%{base_url}/about).
     email_reject_strangers_not_allowed:
+      title: "Courriel rejeté - Inconnus interdits"
       subject_template: "[%{email_prefix}] Problème de courriel -- Accès invalide"
+      text_body_template: |
+        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        La catégorie vers laquelle vous avez envoyé ce courriel autorise uniquement les réponses d'utilisateurs avec un compte valide et une adresse de courriel connue. Si vous pensez qu'il s'agit d'une erreur, [contactez un responsable](%{base_url}/about).
     email_reject_invalid_post:
+      title: "Courriel rejeté -  Message invalide"
       subject_template: "[%{email_prefix}] Problème de courriel -- Erreur d'envoi d'un message"
       text_body_template: |
         Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
 
         Cela peut-être à cause d'un format trop complexe, d'un message trop long ou trop court. Veuillez réessayer ou rédigez votre message directement sur le site si le problème persiste.
     email_reject_invalid_post_specified:
+      title: "Courriel rejeté -  Message invalide spécifié"
       subject_template: "[%{email_prefix}] Problème de courriel -- Erreur d'envoi d'un message"
       text_body_template: |
         Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
@@ -1832,22 +2136,63 @@ fr:
 
         Si vous pouvez corriger les erreurs, veuillez réessayer.
     email_reject_invalid_post_action:
+      title: "Courriel rejeté -  Message action invalide"
       subject_template: "[%{email_prefix}] Problème de courriel -- Action de message invalide"
       text_body_template: |
         Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
 
         Le Post Action n'était pas reconnu. Veuillez réessayer ou rédigez votre message directement sur le site si le problème persiste.
     email_reject_reply_key:
+      title: "Courriel rejeté - Clé de réponse"
       subject_template: "[%{email_prefix}] Problème de courriel -- Clé de réponse inconnue"
+      text_body_template: |
+        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        La clé de réponse est invalide ou inconnue et nous ne pouvons pas savoir à quel message s’adresse cette réponse.  [Contactez un responsable](%{base_url}/about).
     email_reject_bad_destination_address:
+      title: "Courriel rejeté - Mauvaise adresse de destination"
       subject_template: "[%{email_prefix}] Problème de courriel - Adresse de destinataire inconnue"
+      text_body_template: |
+        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        Aucune des adresses de destination n'est reconnue, ou l'entête Message-ID dans le courriel a été modifié. Veuillez vérifier que vous envoyez bien à l'adresse de courriel fournie par les responsables.
+    email_reject_old_destination:
+      title: "Courriel rejeté - Mauvaise ancienne destination"
+      subject_template: "[%{email_prefix}] Problème de courriel -- Vous essayez de répondre à une ancienne notification"
+      text_body_template: |
+        Nous sommes désolé, mais l'envoi de votre courriel à destination de %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        Pour des raisons de sécurité, nous n'acceptons des réponses aux notifications que pendant 90 jours. Veuillez vous rendre sur [le sujet](%{short_url}) pour continuer la conversation.
     email_reject_topic_not_found:
+      title: "Courriel rejeté - Sujet introuvable"
       subject_template: "[%{email_prefix}] Problème de courriel -- Sujet introuvable"
+      text_body_template: |
+        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        Le sujet à lequel vous répondez n'existe plus. Si vous pensez qu'il s'agit d'une erreur, ](/about)contactez un responsable](%{base_url}/about).
     email_reject_topic_closed:
+      title: "Courriel rejeté - Sujet fermé"
       subject_template: "[%{email_prefix}] Problème de courriel -- Sujet fermé"
+      text_body_template: |
+        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        Le sujet à lequel vous répondez est actuellement fermé et n'accepte plus de réponses. Si vous pensez qu'il s'agit d'une erreur, [contactez un responsable](%{base_url}/about).
     email_reject_auto_generated:
+      title: "Courriel rejeté - Réponse automatique"
       subject_template: "[%{email_prefix}] Problème de courriel - Réponse automatique"
+      text_body_template: |
+        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        Votre courriel a été marqué comme "automatiquement généré", ce qui signifie qu'il a été créé par un ordinateur au lieu d'être rédigé par un humain ; nous ne pouvons pas accepter ces types de courriel. Si vous pensez qu'il s'agit d'une erreur, [contacter un responsable](%{base_url}/about).
+    email_reject_unrecognized_error:
+      title: "Courriel rejeté -  Erreur inconnue"
+      subject_template: "[%{email_prefix}] Problème de courriel - Erreur inconnue"
+      text_body_template: |
+        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        Une erreur inconnue est survenue lors du traitement de votre courriel. Essayez de l'envoyer depuis une autre adresse, ou [contactez un responsable](%{base_url}/about).
     email_error_notification:
+      title: "Notification d'erreur courriel"
       subject_template: "[%{email_prefix}] Problème de courriel -- Erreur d'authentification POP3"
       text_body_template: |
         Malheureusement il y a eu un erreur d'authentification lors de la récupération des courriels depuis le serveur POP.
@@ -1867,13 +2212,14 @@ fr:
 
         Pour plus d'informations, merci de vous référer à la [charte de la communauté](%{base_url}/guidelines).
     too_many_tl3_flags:
+      title: "Trop de flags TL3"
       subject_template: "Nouveau compte bloqué"
       text_body_template: |
         Bonjour,
 
         Ceci est un message automatique de %{site_name} pour vous informer que votre compte a été bloqué suite à un grand nombre de signalements de la communauté.
 
-        Par mesure de précaution, votre nouveau compte a été mis sous silence et vous ne pourrez par créer de nouvelles réponses ou sujets tant qu'un responsable n'a pas vérifié votre compte.
+        Par mesure de précaution, votre nouveau compte a été mis sous silence et vous ne pourrez par créer de nouvelles réponses ou sujets tant qu'un responsable n'a pas vérifié votre compte. Veuillez nous excuser pour la gêne occasionnée.
 
         Pour plus d'informations, merci de vous en référer à la [charte de la communauté](%{base_url}/guidelines).
     silenced_by_staff:
@@ -1898,6 +2244,17 @@ fr:
         Merci de [vérifier les signalements](%{base_url}/admin/flags). Si %{username} a été injustement mis sous silence, cliquez sur le bouton d'annulation de la mise sous silence sur la [page d'administration de cet utilisateur](%{user_url}).
 
         Ce seuil peut être changé par le paramètre `silence_new_user`.
+    spam_post_blocked:
+      title: "Message spam bloqué"
+      subject_template: "Les messages du nouvel utilisateur %{username} sont bloqués pour des liens répétés"
+      text_body_template: |
+        Ceci est un message automatique.
+
+        Le nouvel utilisateur [%{username}](%{user_url}) tente de créer de multiples messages avec des liens vers %{domains}, mais que ces messages ont été bloqués pour éviter le spam. Cet utilisateur est toujours capable de créer des messages qui ne contiennent pas de liens vers %{domains}.
+
+        Merci de [review the user](%{user_url}).
+
+        Ceci peut être modifier via les options `newuser_spam_host_threshold` et white_listed_spam_host_domains`.
     unsilenced:
       title: "Mise sous silence annulée"
       subject_template: "Compte débloqué"
@@ -1910,8 +2267,8 @@ fr:
     pending_users_reminder:
       title: "Rappel d'utilisateurs en attente"
       subject_template:
-        one: "1 utilisateur en attente d'approbation"
-        other: "%{count} utilisateurs en attente d'approbation"
+        one: 1 utilisateur en attente d'approbation
+        other: '%{count} utilisateurs en attente d''approbation'
       text_body_template: |
         Il y a de nouvelles inscriptions utilisateurs en attente d'approbation (ou rejet).
 
@@ -1933,13 +2290,14 @@ fr:
       text_body_template: |
         Félicitations, vous avez reçu le prix du **nouveau membre du mois de %{month_year}**. :trophy:
 
-        Ce prix est seulement décerné à deux nouveaux membres par mois et sera listé [dans vos badges](/my/badges).
+        Ce prix est seulement décerné à deux nouveaux membres par mois et sera listé [dans vos badges](%{url}).
 
         Vous êtes rapidement devenu un membre précieux de notre communauté. Merci de nous avoir rejoint et continuez à participer ainsi !
     queued_posts_reminder:
+      title: "Messages dans la file d'attente"
       subject_template:
-        one: "1 message en attente de modération"
-        other: "%{count} messages en attention de modération"
+        one: 1 message en attente de modération
+        other: '%{count} messages en attention de modération'
       text_body_template: |
         Bonjour,
 
@@ -1957,8 +2315,8 @@ fr:
   user_notifications:
     previous_discussion: "Réponses précédentes"
     reached_limit:
-      one: "Rappel : nous envoyons un maximum de 1 courriel quotidien. Vérifiez le site pour voir lesquels pourraient être retenus. P.S. : merci d'être populaire !"
-      other: "Rappel : nous envoyons un maximum de %{count} courriels quotidiens. Vérifiez le site pour voir lesquels pourraient être retenus. P.S. : merci d'être populaire !"
+      one: 'Rappel : nous envoyons un maximum de 1 courriel quotidien. Vérifiez le site pour voir lesquels pourraient être retenus. P.S. : merci d''être populaire !'
+      other: 'Rappel : nous envoyons un maximum de %{count} courriels quotidiens. Vérifiez le site pour voir lesquels pourraient être retenus. P.S. : merci d''être populaire !'
     in_reply_to: "En réponse à"
     unsubscribe:
       title: "Se désabonner"
@@ -1969,6 +2327,7 @@ fr:
     visit_link_to_respond: "[Voir le sujet](%{base_url}%{url}) pour répondre."
     visit_link_to_respond_pm: "[Voir le message](%{base_url}%{url}) pour répondre."
     posted_by: "Redigé par %{username} le %{post_date}"
+    pm_participants: "Participants :"
     invited_group_to_private_message_body: |
       %{username} a invité @%{group_name} à un message
 
@@ -2000,6 +2359,7 @@ fr:
 
       > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm_group:
+      title: "Utilisateur a invité groupe au MD"
       subject_template: "[%{email_prefix}] %{username} a invité @%{group_name} dans la conversation « %{topic_title} »"
       text_body_template: |
         %{header_instructions}
@@ -2008,7 +2368,7 @@ fr:
 
         %{respond_instructions}
     user_invited_to_private_message_pm:
-      title: "Utilisateur invité au MP"
+      title: "Utilisateur invité au MD"
       subject_template: "[%{email_prefix}] %{username} vous a invité dans la conversation « %{topic_title} »"
       text_body_template: |
         %{header_instructions}
@@ -2017,6 +2377,7 @@ fr:
 
         %{respond_instructions}
     user_invited_to_private_message_pm_staged:
+      title: "Utilisateur distant invité au MD"
       subject_template: "[%{email_prefix}] %{username} vous a invité dans la conversation « %{topic_title} »"
       text_body_template: |
         %{header_instructions}
@@ -2045,8 +2406,8 @@ fr:
 
         %{respond_instructions}
     user_replied_pm:
-      title: "Utilisateur a répondu au MP"
-      subject_template: "[%{email_prefix}] [MP] %{topic_title}"
+      title: "Utilisateur a répondu au MD"
+      subject_template: "[%{email_prefix}] [MD] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -2087,8 +2448,20 @@ fr:
 
         %{context}
 
+        %{respond_instructions}
+    user_mentioned_pm:
+      title: "Utilisateur a mentionné un MD"
+      subject_template: "[%{email_prefix}] [MD] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
         %{respond_instructions}
     user_group_mentioned:
+      title: "Mention de groupe utilisateur"
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -2110,6 +2483,7 @@ fr:
 
         %{respond_instructions}
     user_watching_first_post:
+      title: "Utilisateur surveille premier message"
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -2120,8 +2494,8 @@ fr:
 
         %{respond_instructions}
     user_posted_pm:
-      title: "Utilisateur a posté un PM"
-      subject_template: "[%{email_prefix}] [MP] %{topic_title}"
+      title: "Utilisateur a posté un MD"
+      subject_template: "[%{email_prefix}] [MD] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -2131,10 +2505,11 @@ fr:
 
         %{respond_instructions}
     user_posted_pm_staged:
+      title: "Utilisateur distant a posté un MD"
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
-        %{message}
+          %{message}
     account_suspended:
       title: "Compte suspendu"
       subject_template: "[%{email_prefix}] Votre compte a été suspendu"
@@ -2157,13 +2532,22 @@ fr:
       title: "Le compte existe déjà"
       subject_template: "[%{email_prefix}] Le compte existe déjà"
       text_body_template: |
-        Vous venez d'essayer de créer un compte sur %{site_name}, ou essayer de changer l'adresse courriel d'un compte vers %{email}. Cependant, un compte existe déjà pour %{email}.
+        Vous venez d'essayer de créer un compte sur %{site_name}, ou d'essayer de changer l'adresse courriel d'un compte vers %{email}. Cependant, un compte existe déjà pour %{email}.
 
         Si vous avez oublié votre mot de passe,  [réinitialisez le maintenant](%{base_url}/password-reset).
 
-        Si vous n'avez pas essayé de créer un compte pour %{email} ou changer votre adresse courriel, ne vous inquiétez pas – vous pouvez ignorer ce message.
+        Si vous n'avez pas essayé de créer un compte pour %{email} ou de changer votre adresse courriel, ne vous inquiétez pas – vous pouvez ignorer ce message.
 
         Si vous avez des questions, [contactez notre équipe](%{base_url}/about).
+    account_second_factor_disabled:
+      title: "Authentification à deux facteurs desactivée"
+      subject_template: "[%{email_prefix}] Authentification à deux facteurs desactivée"
+      text_body_template: |
+        L'authentification à deux facteurs a été désactivée sur votre compte à %{site_name}. Vous pouvez maintenant vous connecter uniquement avec votre mot de passe ; un code d'authentification supplémentaire n'est plus nécessaire.
+
+        Si vous n'avez pas choisi de désactiver l'authentification à deux facteurs, il se peut que quelqu'un ait compromis votre compte.
+
+        Si vous avez des questions,[contactez notre personnel amical](%{base_url}/about).
     digest:
       why: "Voici un bref résumé de ce qu'il s'est passé sur %{site_link} depuis votre dernière visite le %{last_seen_at}"
       since_last_visit: "Depuis votre dernière visite"
@@ -2194,6 +2578,16 @@ fr:
 
         Cliquez sur le lien suivant pour définir un nouveau mot de passe :
         %{base_url}/u/password-reset/%{email_token}
+    email_login:
+      title: "Se connecter avec un lien"
+      subject_template: "[%{email_prefix}] Se connecter avec un lien"
+      text_body_template: |
+        Voilà votre lien pour vous connecter à [%{site_name}](%{base_url}).
+
+        Si vous n'en avez pas fait la demande, vous pouvez ignorer sans crainte ce courriel.
+
+        Sinon, cliquer sur le lien suivant pour vous connecter:
+        %{base_url}/session/email-login/%{email_token}
     set_password:
       title: "Définir le mot de passe"
       subject_template: "[%{email_prefix}] Définir le mot de passe"
@@ -2208,7 +2602,7 @@ fr:
       title: "Identifiant Administrateur"
       subject_template: "[%{email_prefix}] Identification"
       text_body_template: |
-        Vous avez demandé à recevoir un lien pour vous identifier sur [%{site_name}](%{base_url}).
+        Quelqu'un a demandé à se connecter sur votre compte sur [%{site_name}](%{base_url}).
 
         Si vous n'avez pas fait cette demande, vous pouvez ignorer cet email.
 
@@ -2252,13 +2646,13 @@ fr:
     signup_after_approval:
       title: "Inscription après approbation"
       subject_template: "Votre compte a été approuvé sur %{site_name} !"
-      text_body_template: |+
-        Bienvenue sur %{site_name} !
+      text_body_template: |
+        Bienvenue sur %{site_name}!
 
         Un responsable a approuvé votre compte sur %{site_name}.
 
-        Cliquez sur le lien suivant pour confirmer et activer votre nouveau compte :
-        %{base_url}/u/activate-account/%{email_token}
+        Cliquez sur le lien suivant pour accèder à votre nouveau compte:
+        %{base_url}
 
         Si le lien ci-dessus n'est pas cliquable, essayez de le copier/coller dans la barre d'adresse de votre navigateur internet.
 
@@ -2266,8 +2660,7 @@ fr:
 
         Nous croyons constamment au [comportement communautaire civilisé](%{base_url}/guidelines).
 
-        Amusez-vous bien !
-
+        musez-vous bien !
     signup:
       title: "Inscription"
       subject_template: "[%{email_prefix}] Activez votre nouveau compte"
@@ -2304,6 +2697,7 @@ fr:
     store_failure: "Erreur lors du stockage de #%{upload_id} pour l'utilisateur #%{user_id}."
     file_missing: "Désolé, il faut fournir un fichier à envoyer."
     empty: "Désolé, mais le fichier que vous avez fourni est vide."
+    png_to_jpg_conversion_failure_message: "Une erreur est survenue lors de la conversion de PNG en JPG."
     attachments:
       too_large: "Désolé, le fichier que vous essayez d'envoyer est trop gros (taille maximale de %{max_size_kb} Ko)."
     images:
@@ -2354,6 +2748,104 @@ fr:
     Modifier le premier message de ce sujet pour changer le contenu de la page  %{page_name}.
   guidelines_topic:
     title: "FAQ/Charte"
+    body: |
+      <a name="civilized"></a>
+
+      ## [Ceci est un endroit civilisé, merci de le respecter](#civilized)
+
+      Merci de traiter ce forum de discussion avec le même respect que vous pourriez avoir dans un parc public. Nous, aussi, sommes une ressource partagée par la communauté &mdash; un endroit pour partager des compétences, savoirs et intérêts au travers de conversations.
+
+      Il ne s'agit pas de règles absolues, mais de conseils pour le bon fonctionnement de notre communauté. Suivez ces conseils pour garder cet endroit propre et bien éclairé pour un débat public civilisé.
+
+      <a name="improve"></a>
+
+      ## [Améliorez la discussion](#improve)
+
+      Aidez nous à faire de cet endroit un lieu idéal pour la discussion en améliorant constamment le débat d'une certaine façon, même minime. Si vous n'êtes pas sûr que votre message soit utile à la discussion ou pourrait nuire à son utilité, pensez à ce que vous voulez dire et essayer de nouveau plus tard.
+
+      Les sujets abordés ici sont importants pour nous et nous voulons que vous agissiez comme s'ils comptaient également pour vous. Soyez respectueux des sujets et des autres utilisateurs, même si vous êtes en désaccord avec une partie de ce qui est dit.
+
+      Une façon d'améliorer la discussion est de découvrir celles qui sont déjà en cours. Passez un peu de temps à parcourir les sujets avant de répondre ou démarrer votre propre discussion. De fait, vous aurez de plus grandes chances de rencontrer d'autres personnes qui partagent vos intérêts.
+
+      <a name="agreeable"></a>
+
+      ## [Soyez agréable, même si vous n'êtes pas d'accord](#agreeable)
+
+      La critique peut être constructive. Vous pouvez répondre à une personne en étant en désaccord avec elle. C'est très bien. Mais n'oubliez pas de *critiquer les idées, pas les gens*. Merci d'éviter :
+
+      * les injures,
+      * les attaques ad hominem,
+      * de répondre à la tonalité d'un sujet plutôt qu'à son contenu réel,
+      * les contradictions primaires.
+
+      Au lieu de cela, fournissez des contre-arguments motivés qui améliorent la conversation.
+
+      <a name="participate"></a>
+
+      ## [Votre participation compte](#participate)
+
+      Les conversations que nous avons ici donnent le ton pour chaque nouveau venu. Aidez-nous à influencer l'avenir de cette communauté en choisissant de vous engager dans des discussions qui font de ce forum un lieu intéressant &mdash; et en évitant celles qui n'y participent pas.
+
+      Discourse fournit des outils qui permettent à la communauté d'identifier collectivement le meilleur (et le pire) des contributions : signets, des *J'aime*, des signalements, des réponses, des vérifications et ainsi de suite. Utilisez ces outils pour améliorer votre propre expérience et celle de tous les autres aussi.
+
+      Liassons notre communauté en meilleur état que nous l'avons trouvé.
+
+      <a name="flag-problems"></a>
+
+      ## [Si vous voyez un problème, signaler le](#flag-problems)
+
+      Les modérateurs ont un rôle spécial ; ils sont responsables de ce forum. Mais vous aussi. Avec votre aide, les modérateurs peuvent être des facilitateurs de la vie de la communauté et pas seulement des concierges ou des policiers.
+
+      Quand vous voyez un mauvais comportement, ne répondez pas. Votre reconnaissance encourage le mauvais comportement, il consomme votre énergie et fait perdre du temps à chacun. *Signalez-le*. Si suffisamment de signalements s'accumulent, des mesures seront prises, automatiquement ou par l'intervention d'un modérateur.
+
+      Afin de maintenir notre communauté, les modérateurs se réservent le droit de supprimer tout contenu et n'importe quel compte utilisateur pour une raison quelconque, et ce à n'importe quel moment. Les modérateurs ne revoient pas les nouveaux messages avant leur publication, les modérateurs et opérateurs du site n'assument aucune responsabilité pour tout contenu affiché par la communauté.
+
+      <a name="be-civil"></a>
+
+      ## [Soyez toujours civilisé](#be-civil)
+
+      Rien ne sabote une conversation saine mieux que la grossièreté :
+
+      * Soyez civilisé. Ne postez pas ce qu'une personne raisonnable jugerait offensif, ni de discours violent ou haineux.
+      * Gardez-le forum propre. Ne publiez rien d'obscène ou sexuellement explicite.
+      * Se respecter mutuellement est primordial. Ne pas harceler ou chagriner quelqu'un, ni usurper l'identité de quelqu'un ou exposer des informations privées le concernant.
+      * Respecter notre forum. Ne postez pas de spam ou tout autre forme de vandalisme.
+
+      Il ne s'agit pas ici de choses concrètes avec des définitions précises - évitez *même d'avoir l'air* d'agir de la sorte. Si vous avez un doute, demandez-vous comment vous vous sentiriez si votre sujet était publié sur la première page du Monde.
+
+      Il s'agit d'un forum public et les moteurs de recherche indexent ces discussions. Utilisez un langage, des liens et des images sans danger pour votre famille et vos amis.
+
+      <a name="keep-tidy"></a>
+
+      ## [Gardez cet endroit propre](#keep-tidy)
+
+      Faites l'effort de mettre les choses au bon endroit, afin que nous puissions passer plus de temps à discuter et moins à ranger. Ainsi :
+
+      * Ne commencez pas un sujet dans la mauvaise catégorie.
+      * Ne postez pas le même contenu dans plusieurs discussions.
+      * Ne postez pas de message sans contenu.
+      * Ne pas détourner un sujet en le changeant en cours de route.
+      * Ne signez pas vos messages &mdash; chaque message dispose d'informations sur le profil qui s'y rattache.
+
+      Plutôt que de poster "+1", "lol", "mdr" ou "d'accord", utilisez le bouton 'J'aime'. Plutôt que de faire prendre à une discussion existante une direction radicalement différente, utilisez "Répondre en créant un sujet lié".
+
+      <a name="stealing"></a>
+
+      ## [Postez seulement vos propres trucs](#stealing)
+
+      Vous ne pouvez pas poster n'importe quel contenu numérique s'il appartient à quelqu'un d'autre sans son autorisation. Vous ne pouvez pas poster des descriptions, des liens ou des méthodes pour voler la propriété intellectuelle de quelqu'un (logiciels, vidéo, audio, images), ou pour transgresser toute autre loi.
+
+      <a name="power"></a>
+
+      ## [Powered by You](#power)
+
+      Ce site est géré par votre [équipe de responsables](/about) ainsi que *vous*, la communauté. Si vous avez d'autres questions sur comment les choses devraient fonctionner ici, créez un nouveau sujet dans [la catégorie meta](/c/meta) et discutons-en ! S'il y un problème critique ou urgent qui ne peut pas être résolu par un sujet meta ou un signalement, contactez nous [ici](/about).
+
+      <a name="tos"></a>
+
+      ## [Lisez les conditions générales d'utilisation](#tos)
+
+      Oui, le jargon juridique est ennuyeux, mais nous devons nous protéger &ndash; et par extension, vous et vos données &ndash; contre des gens hostiles. Nous avons des [Conditions générales d'utilisation](/tos) décrivant votre (et notre) comportement et les droits liés au contenu, la confidentialité et les lois. Pour utiliser ce service, vous devez accepter de respecter nos [CGU](/tos).
   tos_topic:
     title: "Conditions générales d'utilisation"
   privacy_topic:
@@ -2474,22 +2966,22 @@ fr:
         Ce badge est accordé après la première modification d'un de vos messages. Bien que la possibilité d'éditer un message soit limitée dans le temps, l'édition est toujours une bonne idée — vous pouvez améliorer vos messages, réparer des petites erreurs, ou ajouter des éléments que vous avez oubliés lors de la rédaction. Éditer vos messages pour les rendre encore meilleurs !
     basic_user:
       name: Actif
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Accès accordé</a> à toutes les fonctions communautaires essentielles
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">Accès accordé</a> à toutes les fonctions communautaires essentielles"
       long_description: |
         Ce badge est accordé lorsque vous atteignez le niveau de confiance 1. Merci d'être resté dans le coin un petit moment et d'avoir lu quelques sujets pour en apprendre plus sur notre communauté. Vos restrictions "nouvel utilisateur" ont été levées, et vous avez accès aux fonctionnalités essentielles telles que la messagerie personnelle, le signalement, l'édition des wikis, et la possibilité de poster des images et de multiples liens.
     member:
       name: Membre
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Accès accordé</a> aux invitations, aux messages de groupe et à plus de J'aime
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">Accès accordé</a> aux invitations, aux messages de groupe et à plus de J'aime"
       long_description: |
         Ce badge est accordé lorsque vous atteignez le niveau de confiance 2. Merci d'avoir participé durant plusieurs semaines à notre communauté. Vous pouvez désormais envoyer des invitations personnelles depuis votre page utilisateur ou un sujet, envoyer des messages groupés, et avez quelques J'aime supplémentaires chaque jour.
     regular:
       name: Habitué
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Accès accordé</a> à la re-catégorisation, au renommage, au suivi de liens, au Wiki et à plus de J'aime
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">Accès accordé</a> à la re-catégorisation, au renommage, au suivi de liens, au Wiki et à plus de J'aime"
       long_description: |
         Ce badge est accordé lorsque vous atteignez le niveau de confiance 3. Merci d'avoir été un participant régulier à notre communauté pendant ces quelques mois, l'un de nos lecteurs les plus actifs et un contributeur sérieux à ce qui rend notre communauté si belle. Vous pouvez désormais re-catégoriser et renommer des sujets, accéder à la section privée, signaler des spams, et vous avez plein de J'aime en plus chaque jour.
     leader:
       name: Meneur
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Accès accordé</a> à l'édition globale, l'épinglage, la fermeture, l'archivage, la séparation et la fusion de sujets, et toujours plus de J'aime
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">Accès accordé</a> à l'édition globale, l'épinglage, la fermeture, l'archivage, la séparation et la fusion de sujets, et toujours plus de J'aime"
       long_description: |
         Ce badge est accordé lorsque vous atteignez le niveau de confiance 4. Vous êtes un meneur choisi par l'équipe dans cette communauté, et vous montrez l'exemple dans vos actions et vos mots. Vous avez la capacité de modifier tous les messages, utiliser les actions de modérations telles qu'épingler, fermer, cacher, archiver, scinder et fusionner, ainsi que des tonnes de J'aime par jour.
     welcome:
@@ -2499,12 +2991,12 @@ fr:
         Ce badge est accordé lorsque vous recevez votre premier J'aime sur un de vos messages. Félicitations, vous avez écrit quelque chose que les membres de votre communauté ont trouvé intéressant, cool, ou utile !
     autobiographer:
       name: Autobiographe
-      description: A complété les informations de son <a href="%{base_uri}/my/preferences/profile">profile</a>
+      description: "A complété les informations de son <a href=\"%{base_uri}/my/preferences/profile\">profile</a>"
       long_description: |
         Ce badge est accordé pour avoir complété <a href="%{base_uri}/my/preferences/profile">votre profil utilisateur</a> et au choix d'une photo de profil. En dire plus à la communauté sur vous et vos intérêts permet de la rendre plus agréable et plus connectée. Rejoignez-nous !
     anniversary:
       name: Jubilaire
-      description: Membre actif depuis un an, avec au moins un message
+      description: "Membre actif depuis un an, avec au moins un message"
       long_description: |
         Ce badge est accordé après avoir été membre du site pendant une année, avec au moins un message crée dans cette année. Merci d'être resté avec nous et de contribuer ainsi à notre communauté ! Nous n'aurions pas pu le faire sans vous.
     nice_post:
@@ -2561,7 +3053,7 @@ fr:
       name: Premier signalement
       description: A signalé un message
       long_description: |
-        Ce badge est accordé la première fois que vous signalez un message. Les signalements sont essentiels à la santé de votre communauté. Si vous remarquez des messages nécessitant l'intervention d'un modérateur n'hésitez pas à les signaler. Vous pouvez aussi utiliser les boîtes de dialogue de signalement pour envoyer des <b>messages</b> à d'autres utilisateurs. Si vous voyez un problème, :flag_black: signalez-le !
+        Ce badge est accordé la première fois que vous signalez un message. Les signalements sont essentiels à la santé de votre communauté. Si vous remarquez des messages nécessitant l'intervention d'un modérateur n'hésitez pas à les signaler. Vous pouvez aussi utiliser les boîtes de dialogue de signalement pour envoyer des <b>messages directs</b> à d'autres utilisateurs. Si vous voyez un problème, :flag_black: signalez-le !
     promoter:
       name: Ambassadeur
       description: A invité un utilisateur
@@ -2594,7 +3086,7 @@ fr:
         Ce badge est accordé la première fois que vous citez un message dans votre réponse. Citer les sections pertinentes des messages précédents dans votre réponse permet de garder les discussions reliées entre elles et sur le sujet. La meilleure façon de citer est de mettre en évidence une section d'un message, puis appuyer sur un bouton de réponse. Citer généreusement !
     read_guidelines:
       name: Règlement lu
-      description: A lu le <a href="%{base_uri}/guidelines">règlement de la communauté</a>
+      description: "A lu le <a href=\"%{base_uri}/guidelines\">règlement de la communauté</a>"
       long_description: |
         Ce badge est accordé après <a href="%{base_uri}/guidelines">lecture de la charte de la communauté</a>. Respecter et partager ces règles simples permet de construire une communauté sûre, agréable et durable. Souvenez-vous toujours qu'il y a un autre être humain, tout comme vous, de l'autre côté de cet écran. Soyez courtois !
     reader:
@@ -2648,7 +3140,7 @@ fr:
       long_description: |
         Ce badge est accordé lorsque vous utilisez la totalité vos 50 J'aime par jour pendant 20 jours. Whaou ! Vous êtes un modèle d'encouragement régulier des membres de la communauté !
     thank_you:
-      name: 'Merci '
+      name: "Merci "
       description: A 20 messages ayant reçu un J'aime et a donné 10 j'aime
       long_description: |
         Ce badge est accordé quand vous avez reçu 20 J'aime sur vos messages et en avez donné 10 ou plus en retour. Quand quelqu'un aime vos messages, vous trouvez le temps d'aimer ce que les autres postent à leur tour.
@@ -2670,11 +3162,11 @@ fr:
     first_mention:
       name: Première mention
       description: A mentionné un utilisateur dans un message
-      long_description: Ce badge est accordé la première fois que vous mentionnez le @pseudo de quelqu'un dans votre message. Chaque mention génère une notification à cette personne pour qu'elle soit informée de votre message. Il suffit de commencer à taper @ (arobase) pour mentionner un utilisateur ou, si autorisé, un groupe – c'est un moyen pratique de porter quelque chose à leur attention.
+      long_description: "Ce badge est accordé la première fois que vous mentionnez le @pseudo de quelqu'un dans votre message. Chaque mention génère une notification à cette personne pour qu'elle soit informée de votre message. Il suffit de commencer à taper @ (arobase) pour mentionner un utilisateur ou, si autorisé, un groupe – c'est un moyen pratique de porter quelque chose à leur attention."
     first_onebox:
       name: Premier onebox
       description: A inséré un lien qui a été transformé en onebox
-      long_description: Ce badge est accordé la première fois que vous publiez un lien seul sur une ligne, qui a ensuite été développé automatiquement dans un onebox avec un bref résumé du lien, un titre, et (le cas échéant) une image.
+      long_description: "Ce badge est accordé la première fois que vous publiez un lien seul sur une ligne, qui a ensuite été développé automatiquement dans un onebox avec un bref résumé du lien, un titre, et (le cas échéant) une image."
     first_reply_by_email:
       name: Première réponse par courriel
       description: A répondu à un message par courriel
@@ -2688,19 +3180,21 @@ fr:
     enthusiast:
       name: Passionné
       description: A visité 10 jours
-      long_description: Ce badge est décerné pour avoir visiter 10 jours consécutifs. Merci d'être resté avec nous pendant plus d'une semaine !
+      long_description: Ce badge est décerné pour avoir visité 10 jours consécutifs. Merci d'être resté avec nous pendant plus d'une semaine !
     aficionado:
       name: Aficionado
       description: A visité 100 jours
-      long_description: Ce badge est décerné pour avoir visiter 100 jours consécutifs. C'est plus de trois mois !
+      long_description: Ce badge est décerné pour avoir visité 100 jours consécutifs. C'est plus de trois mois !
     devotee:
       name: Adepte
       description: A visité 365 jours
-      long_description: Ce badge est décerné pour avoir visiter 365 jours consécutifs. Waouh, une année entière !
+      long_description: "Ce badge est décerné pour avoir visité 365 jours consécutifs. Waouh, une année entière !"
     badge_title_metadata: "%{display_name} badge sur %{site_title}"
   admin_login:
     success: "Courriel envoyé"
-    error: "Erreur !"
+    errors:
+      unknown_email_address: "Adresse courriel inconnue."
+      invalid_token: "Jeton invalide."
     email_input: "Courriel de l'administrateur"
     submit_button: "Envoyer un courriel"
   performance_report:
@@ -2710,6 +3204,7 @@ fr:
     title: "Tags"
     staff_tag_disallowed: "Le tag \"%{tag}\" ne peut être mis que par un responsable."
     staff_tag_remove_disallowed: "Le tag \"%{tag}\" ne peut être retiré que par un responsable."
+    minimum_required_tags: "Vous devez choisir au moins %{count} tags."
   rss_by_tag: "Sujets avec le tag %{tag}"
   finish_installation:
     congratulations: "Félicitations, vous avez installé Discourse !"
@@ -2731,6 +3226,7 @@ fr:
     only_official: "Désactiver les extensions non officielles"
     no_plugins: "Désactiver toutes les extensions"
     enter: "Activer le mode sans échec"
+    must_select: "Vous devez sélectionner au moins 1 option pour entre en mode sans échec."
   wizard:
     title: "Configuration de Discourse"
     step:
@@ -2781,7 +3277,7 @@ fr:
             description: "Page web pour vous contacter ou votre organisation. Sera affichée dans la page <a href='/about' target='_blank'>À propos</a>."
           site_contact:
             label: "Messages automatiques"
-            description: "Tous les messages privés de Discourse seront envoyés de cet utilisateur, tels que les signalements et les notifications de sauvegarde."
+            description: "Tous les messages directs de Discourse seront envoyés de cet utilisateur, tels que les signalements et les notifications de sauvegarde."
       corporate:
         title: "Organisation"
         description: "Ces noms seront renseignés dans les pages <a href='/privacy' target='blank'>Politique de confidentialité</a> et <a href='/tos' target='blank'>Conditions générales d'utilisation</a> que vous pouvez modifier à tout moment depuis la catégorie Staff. Si vous n'avez pas de société, vous pouvez ignorer cette étape pour le moment."
@@ -2844,6 +3340,17 @@ fr:
         description: |
           <p>Si vous souhaitez modifier ces paramètres, rendez-vous dans la section <a href='/admin' target='_blank'>Administration</a> ; trouvez la dans le menu du site.</p>
           <p>Amusez-vous et bonne chance pour <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>construire votre nouvelle communauté</a> !</p>
-  activemodel:
-    errors:
-      <<: *errors
+  search_logs:
+    graph_title: "Nombre de recherches"
+  joined: "Inscrit"
+  discourse_push_notifications:
+    popup:
+      mentioned: '%{username} vous a mentionné dans « %{topic} » - %{site_title}'
+      group_mentioned: '%{username} vous a mentionné dans « %{topic} » - %{site_title}'
+      quoted: '%{username} vous a cité dans « %{topic} » - %{site_title}'
+      replied: '%{username} vous a répondu dans « %{topic} » - %{site_title}'
+      posted: '%{username} a posté dans « %{topic} » - %{site_title}'
+      private_message: '%{username} vous a envoyé un message direct dans « %{topic} » - %{site_title}'
+      linked: '%{username} a créé un lien vers votre message posté dans « %{topic} » - %{site_title}'
+      confirm_title: 'Notifications activées - %{site_title}'
+      confirm_body: 'Les notifications ont été activées.'
diff --git a/config/locales/server.gl.yml b/config/locales/server.gl.yml
index 6a2712fe3c4..2b9231fbf12 100644
--- a/config/locales/server.gl.yml
+++ b/config/locales/server.gl.yml
@@ -16,7 +16,9 @@ gl:
       short_no_year: "%-d de %B"
       date_only: "%-d de %B, %Y"
   date:
-    month_names: [null, Xaneiro, Febreiro, Marzo, Abril, Maio, Xuño, Xullo, Agosto, Setembro, Outubro, Novembro, Decembro]
+    month_names: [~, Xaneiro, Febreiro, Marzo, Abril, Maio, Xuño, Xullo, Agosto, Setembro, Outubro, Novembro, Decembro]
+    <<: *datetime_formats
+  time:
     <<: *datetime_formats
   title: "Discourse"
   topics: "Temas"
@@ -33,15 +35,15 @@ gl:
       present: debe quedar baleiro
       confirmation: "%{attribute} non coincide"
       empty: non pode quedar baleiro
-      equal_to: debe ser igual a %{count}
+      equal_to: "debe ser igual a %{count}"
       exclusion: está reservado
-      greater_than: debe ser maior de %{count}
-      greater_than_or_equal_to: debe ser igual ou maior de %{count}
+      greater_than: "debe ser maior de %{count}"
+      greater_than_or_equal_to: "debe ser igual ou maior de %{count}"
       has_already_been_used: "xa está en uso"
       inclusion: no está incluído na lista
       invalid: é incorrecto
-      less_than: debe ser menor de %{count}
-      less_than_or_equal_to: debe ser igual ou menor de %{count}
+      less_than: "debe ser menor de %{count}"
+      less_than_or_equal_to: "debe ser igual ou menor de %{count}"
       not_a_number: non é un número
       not_an_integer: debe ser un enteiro
       odd: debe ser impar
@@ -62,6 +64,9 @@ gl:
       load_from_remote: "Produciuse un erro cargando esta publicación."
     site_settings:
       min_username_length_range: "O mínimo non pode ser maior que o máximo."
+  activemodel:
+    errors:
+      <<: *errors
   not_logged_in: "Debes iniciar sesión para facer iso."
   not_found: "Non foi posíbel atopar o recurso ou URL solicitado."
   invalid_access: "Non se che permite ver o recurso solicitado."
@@ -72,14 +77,14 @@ gl:
     start_discussion: "Comezar a discusión"
     continue: "Continuar a discusión"
     more_replies:
-      one: "Unha resposta máis"
-      other: "%{count} respostas máis"
+      one: Unha resposta máis
+      other: '%{count} respostas máis'
     loading: "Cargando a discusión..."
     permalink: "Ligazón permanente"
     in_reply_to: "▶ %{username}"
     replies:
-      one: "Unha resposta"
-      other: "%{count} respostas"
+      one: Unha resposta
+      other: '%{count} respostas'
   no_mentions_allowed: "Sentímolo pero non podes mencionar outros usuarios"
   invalid_characters: "contén caracteres incorrectos"
   next_page: "páxina seguinte →"
@@ -113,8 +118,8 @@ gl:
       trust_level_4: "nivel_de_confianza_4"
   education:
     until_posts:
-      one: "Unha publicación"
-      other: "%{count} publicacións"
+      one: Unha publicación
+      other: '%{count} publicacións'
   activerecord:
     attributes:
       category:
@@ -124,11 +129,11 @@ gl:
       user_profile:
         bio_raw: "Verbo de min"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Só podes anexar avisos a mensaxes privadas."
               no_user_selected: "Debes seleccionar un usuario correcto."
         user:
           attributes:
@@ -142,7 +147,6 @@ gl:
           attributes:
             hex:
               invalid: "non é unha cor válida"
-      <<: *errors
   vip_category_name: "Taberna"
   vip_category_description: "Unha categoría exclusiva para membros cun nivel de confianza igual ou maior a 3."
   meta_category_name: "Opinións sobre o sitio"
@@ -168,41 +172,41 @@ gl:
       title: "líder"
   rate_limiter:
     hours:
-      one: "Unha hora"
-      other: "%{count} horas"
+      one: Unha hora
+      other: '%{count} horas'
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: "< 1s"
-        other: "< %{count}s"
+        one: < 1s
+        other: < %{count}s
       x_seconds:
-        one: "1s"
-        other: "%{count}s"
+        one: 1s
+        other: '%{count}s'
       less_than_x_minutes:
-        one: "< 1m"
-        other: "< %{count}m"
+        one: < 1m
+        other: < %{count}m
       about_x_hours:
-        one: "1h"
-        other: "%{count}h"
+        one: 1h
+        other: '%{count}h'
       x_days:
-        one: "1d"
-        other: "%{count}d"
+        one: 1d
+        other: '%{count}d'
       about_x_months:
-        one: "1mes"
-        other: "%{count}mes"
+        one: 1mes
+        other: '%{count}mes'
       x_months:
-        one: "1mes"
-        other: "%{count}mes"
+        one: 1mes
+        other: '%{count}mes'
       about_x_years:
-        one: "1ano"
-        other: "%{count}ano"
+        one: 1ano
+        other: '%{count}ano'
       over_x_years:
-        one: "> 1ano"
-        other: "> %{count}ano"
+        one: '> 1ano'
+        other: '> %{count}ano'
       almost_x_years:
-        one: "1ano"
-        other: "%{count}ano"
+        one: 1ano
+        other: '%{count}ano'
     distance_in_words_verbose:
       half_a_minute: "agora mesmiño"
   password_reset:
@@ -265,9 +269,7 @@ gl:
       xaxis: "Día"
       yaxis: "Número de visitas"
     signups:
-      title: "Novos usuarios"
       xaxis: "Día"
-      yaxis: "Número de novos usuarios"
     profile_views:
       title: "Vistas dos perfís de usuario"
       xaxis: "Día"
@@ -305,7 +307,6 @@ gl:
       xaxis: "Día"
       yaxis: "Número de correos-e enviados"
     user_to_user_private_messages:
-      title: "Entre usuarios"
       xaxis: "Día"
       yaxis: "Número de mensaxes"
     system_private_messages:
@@ -347,7 +348,6 @@ gl:
       title: "Extractores web"
       xaxis: "Día"
     page_view_total_reqs:
-      title: "Total"
       xaxis: "Día"
     page_view_logged_in_mobile_reqs:
       xaxis: "Día"
@@ -386,11 +386,9 @@ gl:
       yaxis: "Número de visitas"
   site_settings:
     delete_old_hidden_posts: "Eliminar automaticamente as publicacións ocultas durante máis de 30 días."
-    default_locale: "Idioma predeterminado desta instancia (código ISO 639-1)"
     allow_user_locale: "Permitir os usuarios escoller o idioma da interface"
     min_post_length: "Número mínimo de caracteres permitido para unha publicación"
     min_first_post_length: "Número mínimo de caracteres (corpo do tema) permitido para unha primeira publicación"
-    min_private_message_post_length: "Número mínimo de caracteres permitido para unha mensaxe"
     max_post_length: "Número máximo de caracteres permitido para unha publicación"
     post_undo_action_window_mins: "Número de minutos que os usuarios teñen para desfacer accións recentes nunha publicación (gústames, denuncias, etc)."
     enable_badges: "Activar o sistema de insignias"
@@ -429,8 +427,6 @@ gl:
       subject_template: "A copia de seguranza completouse correctamente"
     bulk_invite_succeeded:
       subject_template: "O convite en bloque procesouse correctamente"
-    csv_export_succeeded:
-      subject_template: "Completouse a exportación dos datos"
   page_not_found:
     see_more: "Máis"
     search_google: "Google"
@@ -447,10 +443,4 @@ gl:
   privacy_topic:
     title: "Política de intimidade"
   admin_login:
-    error: "Erro!"
     submit_button: "Enviar correo-e"
-  time:
-    <<: *datetime_formats
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 655be9279eb..a4f9cec2055 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -17,18 +17,19 @@ he:
       date_only: "%B %-d, %Y"
       long: "%B %-d, %Y, %l:%M%P"
   date:
-    month_names: [null, ינואר, פברואר, מרץ, אפריל, מאי, יוני, יולי, אוגוסט, ספטמבר, אוקטובר, נובמבר, דצמבר]
+    month_names: [~, ינואר, פברואר, מרץ, אפריל, מאי, יוני, יולי, אוגוסט, ספטמבר, אוקטובר, נובמבר, דצמבר]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "am"
     pm: "pm"
-    <<: *datetime_formats
   title: "Discourse"
   topics: "נושאים"
   posts: "פוסטים"
   loading: "טוען"
   powered_by_html: 'מופעל על ידי <a href="https://www.discourse.org">דיסקורס</a>, לצפיה מיטבית יש להפעיל JavaScript'
   log_in: "כניסה"
+  submit: "הגשה"
   purge_reason: "נמחק אוטומטית כחשבון נטוש ולא פעיל"
   disable_remote_images_download_reason: "הורדת תמונות מרחוק נחסמה בשל היעדר מספיק שטח אחסון פנוי."
   anonymous: "אלמוני"
@@ -36,6 +37,8 @@ he:
   themes:
     bad_color_scheme: "לא ניתן לעדכן את התמה, סכמת צבעים שגויה"
     other_error: "ארעה שגיאה בזמן עדכון התמה"
+    settings_errors:
+      invalid_yaml: "ה־YAML שסופק שגוי."
   emails:
     incoming:
       default_subject: "נושא זה צריך כותרת"
@@ -68,19 +71,18 @@ he:
       present: חייב להיות ריק
       confirmation: "לא תואם ל-%{attribute}"
       empty: לא יכול להיות ריק
-      equal_to: חייב להיות שווה ל-%{count}
+      equal_to: "חייב להיות שווה ל-%{count}"
       even: חייב להיות זוגי
       exclusion: שמור
-      greater_than: ' חייב להיות יותר מ-%{count}'
-      greater_than_or_equal_to: חייב להיות גדול יותר או שווה ל-%{count}
+      greater_than: " חייב להיות יותר מ-%{count}"
+      greater_than_or_equal_to: "חייב להיות גדול יותר או שווה ל-%{count}"
       has_already_been_used: "כבר בשימוש"
       inclusion: לא נכלל ברשימה
       invalid: לא תקין
       is_invalid: "נראה לא ברור, האם זה משפט שלם?"
       contains_censored_words: "מכיל את המילים המצונזרות הבאות: %{censored_words}"
-      matches_censored_pattern: "מכיל את המילים הבאות שמתאימות לביטוי הרגולרי המצונזר הבא: %{censored_words}"
-      less_than: חייב להיות פחות מ-%{count}
-      less_than_or_equal_to: חייב להיות פחות או שווה ל-%{count}
+      less_than: "חייב להיות פחות מ-%{count}"
+      less_than_or_equal_to: "חייב להיות פחות או שווה ל-%{count}"
       not_a_number: אינו מספר
       not_an_integer: חייב להיות מספר שלם
       odd: חייב להיות אי-זוגי
@@ -89,20 +91,28 @@ he:
         one: "לא ניתן למחוק בגלל קיומה של רשומה תלויה %{record}"
         many: "לא ניתן למחוק רשומה בגלל קיומה של רשומה תלויה %{record}"
       too_long:
+        many: ארוך מידי (המקסימום האפשרי הוא %{count} תוים)
         one: ארוך מידי (המקסימום האפשרי הוא תו אחד)
         other: ארוך מידי (המקסימום האפשרי הוא %{count} תוים)
+        two: ארוך מידי (המקסימום האפשרי הוא %{count} תוים)
       too_short:
+        many: קצר מידי (המינימום הנדרש הוא %{count} תוים)
         one: קצר מידי (המינימום הנדרש הוא תו אחד)
         other: קצר מידי (המינימום הנדרש הוא %{count} תוים)
+        two: קצר מידי (המינימום הנדרש הוא %{count} תוים)
       wrong_length:
+        many: באורך שגוי (צריך להיות %{count} תוים)
         one: באורך שגוי (צריך להיות באורך תו אחד)
         other: באורך שגוי (צריך להיות %{count} תוים)
+        two: באורך שגוי (צריך להיות %{count} תוים)
       other_than: "צריך להיות שונה מ-%{count}"
     template:
       body: 'היו בעיות עם השדות הבאים:'
       header:
+        many: '%{count} שגיאות מנעו מ-%{model} להישמר.'
         one: שגיאה מנעה מ-%{model} להישמר.
         other: '%{count} שגיאות מנעו מ-%{model} להישמר.'
+        two: '%{count} שגיאות מנעו מ-%{model} להישמר.'
     embed:
       load_from_remote: "ארעה שגיאה בטעינת הפוסט הזה."
     site_settings:
@@ -112,6 +122,9 @@ he:
       max_username_length_range: "לא ניתן לקבוע את המקסימום מתחת למינימום."
       default_categories_already_selected: "לא ניתן לבחור קטגוריה שהשתמשו בה ברשימה אחרת."
       s3_upload_bucket_is_required: "אינכם יכולים להעלות ל-S3 ללא 's3_upload_bucket'."
+  activemodel:
+    errors:
+      <<: *errors
   invite:
     not_found: "אסימון ההזמנה שלכם אינו תקין. אנא צרו קשר עם האדמיניסטרטור של האתר."
     user_exists: "אין צורך להזמין את <b>%{email}</b>, הוא/היא <a href='/u/%{username}/summary'>כבר בעלים של חשבון!</a>"
@@ -132,8 +145,10 @@ he:
   reading_time: "זמן קריאה"
   likes: "לייקים"
   too_many_replies:
-    one: "אנחנו מצטערים, אבל משתמשים חדשים מוגבלים זמנית לתגובה אחת לאותו הנושא."
-    other: "אנחנו מצטערים, אבל משתמשים חדשים מוגבלים זמנית ל-%{count} תגובות לאותו הנושא."
+    many: אנחנו מצטערים, אבל משתמשים חדשים מוגבלים זמנית ל-%{count} תגובות לאותו הנושא.
+    one: אנחנו מצטערים, אבל משתמשים חדשים מוגבלים זמנית לתגובה אחת לאותו הנושא.
+    other: אנחנו מצטערים, אבל משתמשים חדשים מוגבלים זמנית ל-%{count} תגובות לאותו הנושא.
+    two: אנחנו מצטערים, אבל משתמשים חדשים מוגבלים זמנית ל-%{count} תגובות לאותו הנושא.
   embed:
     start_discussion: "התחלת דיון"
     continue: "המשך דיון"
@@ -143,36 +158,49 @@ he:
     no_hosts: "אף שרת לא הוגדר לשילוב."
     configure: "הגדרת שילוב (Embedding)"
     more_replies:
-      one: "עוד תגובה אחת"
-      other: "עוד %{count} תגובות"
+      many: עוד %{count} תגובות
+      one: עוד תגובה אחת
+      other: עוד %{count} תגובות
+      two: עוד %{count} תגובות
     loading: "טוען דיון..."
     permalink: "קישור"
     imported_from: "זה נושא דיון מלווה לערך המקורי ב- %{link}"
     in_reply_to: "◄ %{username}"
     replies:
-      one: "תגובה אחת"
-      other: "%{count} תגובות"
+      many: '%{count} תגובות'
+      one: תגובה אחת
+      other: '%{count} תגובות'
+      two: '%{count} תגובות'
   no_mentions_allowed: "מצטערים, אך אינכם יכולים לאזכר משתמשים אחרים."
   too_many_mentions:
-    one: "מצטערים, אתם יכולים לאזכר רק משתמש אחד בפוסט"
-    other: "מצטערים, אתם יכולים לאזכר רק %{count} משתמשים בפוסט"
+    many: מצטערים, אתם יכולים לאזכר רק %{count} משתמשים בפוסט
+    one: מצטערים, אתם יכולים לאזכר רק משתמש אחד בפוסט
+    other: מצטערים, אתם יכולים לאזכר רק %{count} משתמשים בפוסט
+    two: מצטערים, אתם יכולים לאזכר רק %{count} משתמשים בפוסט
   no_mentions_allowed_newuser: "מצטערים, משתמשים חדשים לא יכולים להזכיר משתמשים אחרים."
   too_many_mentions_newuser:
-    one: "מצטערים, משתמשים חדשים יכולים לאזכר רק משתמש אחד בפוסט."
-    other: "מצטערים, משתמשים חדשים יכולים להזכיר רק %{count} משתמשים אחרים בפוסט. "
+    many: 'מצטערים, משתמשים חדשים יכולים להזכיר רק %{count} משתמשים אחרים בפוסט. '
+    one: מצטערים, משתמשים חדשים יכולים לאזכר רק משתמש אחד בפוסט.
+    other: 'מצטערים, משתמשים חדשים יכולים להזכיר רק %{count} משתמשים אחרים בפוסט. '
+    two: 'מצטערים, משתמשים חדשים יכולים להזכיר רק %{count} משתמשים אחרים בפוסט. '
   no_images_allowed: "מצטערים, משתמשים חדשים לא יכולים להוסיף תמונות לפוסטים."
   too_many_images:
-    one: "מצטערים, משתמשים חדשים יכולים להוסיף רק תמונה אחת לפוסט."
-    other: "מצטערים, משתמשים חדשים יכולים להוסיף רק %{count} תמונות לפוסט."
+    many: מצטערים, משתמשים חדשים יכולים להוסיף רק %{count} תמונות לפוסט.
+    one: מצטערים, משתמשים חדשים יכולים להוסיף רק תמונה אחת לפוסט.
+    other: מצטערים, משתמשים חדשים יכולים להוסיף רק %{count} תמונות לפוסט.
+    two: מצטערים, משתמשים חדשים יכולים להוסיף רק %{count} תמונות לפוסט.
   no_attachments_allowed: "מצטערים, משתמשים חדשים לא יכולים להוסיף קבצים לפוסטים."
   too_many_attachments:
-    one: "מצטערים, משתמשים חדשים יכולים להוסיף רק צירוף אחד לפוסט."
-    other: "מצטערים, משתמשים חדשים יכולים להוסיף רק %{count} צירופים לפוסט."
+    many: מצטערים, משתמשים חדשים יכולים להוסיף רק %{count} צירופים לפוסט.
+    one: מצטערים, משתמשים חדשים יכולים להוסיף רק צירוף אחד לפוסט.
+    other: מצטערים, משתמשים חדשים יכולים להוסיף רק %{count} צירופים לפוסט.
+    two: מצטערים, משתמשים חדשים יכולים להוסיף רק %{count} צירופים לפוסט.
   no_links_allowed: "מצטערים, משתמשים חדשים לא יכולים להוסיף קישורים לפוסטים."
   too_many_links:
-    one: "מצטערים, משתמשים חדשים יכולים להוסיף רק קישור אחד בפוסט."
-    other: "מצטערים, משתמשים חדשים יכולים להוסיף רק %{count} קישורים בפוסט."
-  contains_blocked_words: "הפוסט שלך מכיל מילים אסורות."
+    many: מצטערים, משתמשים חדשים יכולים להוסיף רק %{count} קישורים בפוסט.
+    one: מצטערים, משתמשים חדשים יכולים להוסיף רק קישור אחד בפוסט.
+    other: מצטערים, משתמשים חדשים יכולים להוסיף רק %{count} קישורים בפוסט.
+    two: מצטערים, משתמשים חדשים יכולים להוסיף רק %{count} קישורים בפוסט.
   spamming_host: "סליחה אך אינכם יכולים להוסיף קישור לאתר זה."
   user_is_suspended: "משתמשים מושעים אינם מורשים לפרסם."
   topic_not_found: "משהו השתבש אולי נושא זה נסגר או נמחק בזמן שקראתם אותו?"
@@ -204,7 +232,6 @@ he:
     top_weekly: "הנושאים המובילים השבועיים"
     top_daily: "הנושאים המובילים היומיים"
     posts: "פוסטים אחרונים"
-    private_posts: "הודעות פרטיות אחרונות"
     group_posts: "פוסטים אחרונים מ %{group_name}"
     group_mentions: "איזכורים אחרונים מ %{group_name}"
     user_posts: "פוסטים אחרונים של @%{username}"
@@ -217,11 +244,8 @@ he:
   queue:
     delete_reason: "נמחק באמצעות בקרה על תור הפוסטים"
   groups:
-    success:
-      bulk_add: "%{users_added} משתמשים נוספו לקבוצה."
     errors:
       can_not_modify_automatic: "אינכם יכולים לערוך קבוצה אוטומטית"
-      member_already_exist: "'%{username}' כבר חבר/ה בקבוצה זו."
       invalid_domain: "'%{domain}' אינו שם מתחם תקף."
       invalid_incoming_email: "'%{email}' אינה כתובת מייל תקפה."
       email_already_used_in_group: "'%{email}' כבר בשימוש על ידי הקבוצה '%{group_name}'."
@@ -241,16 +265,18 @@ he:
       title: "בקשת חברות עבור @%{group_name}"
   education:
     until_posts:
-      one: "פוסט אחד"
-      other: "%{count} פוסטים"
-    new-topic: |
+      many: '%{count} פוסטים'
+      one: פוסט אחד
+      other: '%{count} פוסטים'
+      two: '%{count} פוסטים'
+    'new-topic': |
       ברוכים באים ל%{site_name} &mdash; **תודה שהתחלתם שיחה חדשה! **
       -הכותרת נשמעת מעניינת כשאתם קוראים אותה בקול רם? האם היא תקציר טוב?
       -מי יתעניין בזה? איזה סוג של תגובות אתם רוצים?
       -השתמשו במילים נפוצות בכותרת שלכם כך שאחרים יוכלו למצוא אותה. כדי לשייך את הנושאים שלכם עם נושאים קשורים בחרו קטגוריה.
       -לעוד טיפים, [ראו את כללי התנהלות בקהילה] (/guidelines).
       הפנל הזה יופיע רק עבור %{education_posts_text} הפוסטים הראשונים.
-    new-reply: |
+    'new-reply': |
       ברוכים הבאים ל %{site_name} &mdash; ** תודה על תרומתך! **
 
       - האם התגובה שלך משפרת את השיחה בדרך כלשהיא?
@@ -296,12 +322,6 @@ he:
       אנחנו מצטערים, אבל משתמשים חדשים מוגבלים זמנית ל-%{newuser_max_replies_per_topic} תגובות באותו הנושא.
 
       במקום להוסיף תגובה נוספת, בבקשה שיקלו לערוך תגובות קודמות שלכם, או לבקר נושאים אחרים.
-    reviving_old_topic: |
-      ### לחיות נושא זה?
-
-      התגובה האחרונה לנושא זה ארעה לפני **%{days}** ימים. התגובה שלכם תקפיץ את הנושא לראש הרשימה ותודיע לכל המעורבים בשיחה.
-
-      האם אתם בטוחים שאתם מעוניינים להמשיך עם שיחה ישנה זו?
   activerecord:
     attributes:
       category:
@@ -314,13 +334,12 @@ he:
       user_profile:
         bio_raw: "אודותיי"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "אתם יכולים להוסיף אזהרות רק למסרים פרטיים."
               too_many_users: "אתם יכולים לשלוח אזהרות רק למשתמש/ת אחד בכל פעם."
-              cant_send_pm: "מצטערים, אינכם יכולים לשלוח הודעה פרטית למשתמש זה."
               no_user_selected: "עליכם לבחור משתמש/ת תקניים."
               reply_by_email_disabled: "תגובה באמצעות מייל נוטרלה"
             featured_link:
@@ -359,7 +378,6 @@ he:
           attributes:
             word:
               too_many: "יש יותר מדי מילים בפעולה הזו"
-      <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>השדה ״אודותי״ בפרופיל שלכם הוא ריק כרגע, <a href='/u/%{username_lower}/preferences/about-me'>תרצו למלא אותו?</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} עדיין לא הזין/ה דבר בשדה אודות של הפרופיל שלו/ה</div>"
@@ -374,40 +392,40 @@ he:
     title: "ברוכים הבאים לדיסקורס"
     body: |2
 
-      הפסקה הראשונה של נושא נעוץ זה תראה כהודעת ״ברוכים הבאים״ לכל המבקרים החדשים באתר הבית שלכם. היא חשובה!
+        הפסקה הראשונה של נושא נעוץ זה תראה כהודעת ״ברוכים הבאים״ לכל המבקרים החדשים באתר הבית שלכם. היא חשובה!
 
-      **עירכו זאת** לתיאור קצר של הקהילה שלכם:
+        **עירכו זאת** לתיאור קצר של הקהילה שלכם:
 
-      - למי היא נועדה?
-      - מה הם יכולים למצוא כאן?
-      - למה כדאי להם לבוא לפה?
-      - איפה אפשר לקרוא עוד (קישורים, מקורות, וכד׳)?
+        - למי היא נועדה?
+        - מה הם יכולים למצוא כאן?
+        - למה כדאי להם לבוא לפה?
+        - איפה אפשר לקרוא עוד (קישורים, מקורות, וכד׳)?
 
-      <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+        <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
 
-      ייתכן ותרצו לסגור נושא זה באמצעות :wrench: הניהול (בפינות משמאל למעלה ולמטה), כדי שתגובות לא ייערמו על גבי כרזה.
+        ייתכן ותרצו לסגור נושא זה באמצעות :wrench: הניהול (בפינות משמאל למעלה ולמטה), כדי שתגובות לא ייערמו על גבי כרזה.
   lounge_welcome:
     title: "ברוכים הבאים ללאונג'"
     body: |2
 
-      ברכות!: confetti_ball
+        ברכות!: confetti_ball
 
-      אם אתם רואים נושא זה, קודמתם לאחרונה ל**משתמשים** (trust level 3).
+        אם אתם רואים נושא זה, קודמתם לאחרונה ל**משתמשים** (trust level 3).
 
-      אתם יכולים עכשיו &hellip;
-      * לערוך כותרות של כל נושא
-      * לשנות את הקטגוריה של כל נושא
-      * לאפשר מעקב אחר כל הקישורים שלכם (([automatic nofollow]) (http://en.wikipedia.org/wiki/Nofollow) ) יוסר.
-      * לגשת לקטגוריית הלאונג' הפרטי הזמינה רק למשתמשים ברמת אמון 3 ומעלה
-      * להסתיר ספאם בעזרת דגל אחד
+        אתם יכולים עכשיו &hellip;
+        * לערוך כותרות של כל נושא
+        * לשנות את הקטגוריה של כל נושא
+        * לאפשר מעקב אחר כל הקישורים שלכם (([automatic nofollow]) (http://en.wikipedia.org/wiki/Nofollow) ) יוסר.
+        * לגשת לקטגוריית הלאונג' הפרטי הזמינה רק למשתמשים ברמת אמון 3 ומעלה
+        * להסתיר ספאם בעזרת דגל אחד
 
-      הנה [רשימת החברים שלכם למעמד זה(/badges/3/regular). אתם מוזמנים להגיד שלום.
+        הנה [רשימת החברים שלכם למעמד זה(/badges/3/regular). אתם מוזמנים להגיד שלום.
 
-      תודה על החלק החשוב שאתם נוטלים בקהילה שלנו!
+        תודה על החלק החשוב שאתם נוטלים בקהילה שלנו!
 
-      למידע נוסף על רמות האמון, [ראו נושא זה][trust]. שימו לב בבקשה שרק חברים שממשיכים לעמוד בדירשות לאורך זמן נשארים ברמת אמון זו).
+        למידע נוסף על רמות האמון, [ראו נושא זה][trust]. שימו לב בבקשה שרק חברים שממשיכים לעמוד בדירשות לאורך זמן נשארים ברמת אמון זו).
 
-      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "אודות הקטגוריה %{category}"
     replace_paragraph: "(החליפו פסקה ראשונה זו עם תיאור קצר של הקטגוריה החדשה שלכם. הנחיה זו תופיעה באזור בחירת הקטגוריה, אז נסו לשמור על פחות מ 200 אותיות. **עד שתערכו תיאור זה או תיצרו נושאים, קטגוריה זו לא תופיע בדף הקטגוריות.**)"
@@ -424,8 +442,10 @@ he:
       uncategorized: "לא ניתן למחוק תוכן ללא קטגוריה"
       has_subcategories: "לא ניתן למחוק קטגוריה זו משום שיש בה תת-קטגוריות."
       topic_exists:
-        one: "לא ניתן למחוק את הקטגוריה הזו משום שיש בה נושא אחד. הנושא הותיק ביותר הוא %{topic_link}."
-        other: "לא ניתן למחוק את הקטגוריה הזו משום שיש בה %{count} נושאים. הנושא הותיק ביותר הוא %{topic_link}."
+        many: לא ניתן למחוק את הקטגוריה הזו משום שיש בה %{count} נושאים. הנושא הותיק ביותר הוא %{topic_link}.
+        one: לא ניתן למחוק את הקטגוריה הזו משום שיש בה נושא אחד. הנושא הותיק ביותר הוא %{topic_link}.
+        other: לא ניתן למחוק את הקטגוריה הזו משום שיש בה %{count} נושאים. הנושא הותיק ביותר הוא %{topic_link}.
+        two: לא ניתן למחוק את הקטגוריה הזו משום שיש בה %{count} נושאים. הנושא הותיק ביותר הוא %{topic_link}.
       topic_exists_no_oldest: "לא ניתן למחוק קטגוריה זו משום שסך הנושאים הוא %{count}."
     uncategorized_description: "נושאים שלא דורשים קטגוריה מסויימת, או שאינם מתאימים לאף קטגוריה קיימת."
   trust_levels:
@@ -444,103 +464,136 @@ he:
     image_placeholder:
       broken: "תמונה זו שבורה"
   rate_limiter:
-    slow_down: "ביצעתם פעולה זו מספר רב מדי של פעמים. נסו שוב מאוחר יותר."
-    too_many_requests: "יש לנו מגבלה יומית על מספר הפעמים שניתן לבצע פעולה זו. אנא המתינו %{time_left} לפני ניסיון חוזר."
-    by_type:
-      first_day_replies_per_day: "הגעתם למספר המירבי של תגובות שמתמשים חדשים יכולים ליצור ביומם הראשון. אנא המתינו %{time_left} לפני ניסיון חוזר לבצע פעולה זו."
-      first_day_topics_per_day: "הגעתם למספר המירבי של נושאים שמשתמשים חדשים יכולים ליצור ביומם הראשון. אנא המתינו %{time_left} לפני ניסיון חוזר לבצע פעולה זו."
-      create_topic: "אתם יוצרים נושא חדש מהר מדי. אנא המתנו %{time_left} לפני ניסיון חוזר לבצע פעולה זו."
-      create_post: "אתם מגיבים מהר מדי. אנא המתינו %{time_left} לפני ניסיון חוזר לבצע פעולה זו."
-      delete_post: "אתם מוחקים פוסטים מהר מידי. אנא המתינו %{time_left} לפני שאתם מנסים שוב."
-      public_group_membership: "אתם מצטרפים/עוזבים קבוצות בתדירות גבוהה מידי. אנא המתינו %{time_left} לפני שתנסו שוב."
-      topics_per_day: "הגעתם למספר המירבי של נושאים חדשים היום. אנא המתינו %{time_left} לפני ניסיון חוזר לבצע פעולה זו."
-      pms_per_day: "הגעתם למספר המירבי של הודעות היום. אנא המתינו %{time_left} לפני ניסיון חוזר לבצע פעולה זו."
-      create_like: "הגעתם למספר המירבי של לייקים היום. אנא המתינו %{time_left} לפני ניסיון חוזר לבצע פעולה זו."
-      create_bookmark: "הגעתם למספר המירבי של סימניות להיום. אנא המתינו %{time_left} לפני ניסיון חוזר לבצע פעולה זו."
-      edit_post: "הגעתם למספר המרבי של עריכות היום. אנא המתינו %{time_left} לפני שתנסו שוב."
-      live_post_counts: "אתם מבקשים ספירה של פוסטים חיים מהר מידי. אנא המתינו %{time_left} לפני שאתם מנסים שוב."
-      unsubscribe_via_email: "הגעתם למספר המקסימלי של בטולי מנוי באמצעות מייל להיום. אנא המתינו %{time_left} לפני שאתם מנסים שוב."
-      topic_invitations_per_day: "הגעתם למספר המקסימלי של הזמנות לנושאים להיום. אנא המתינו %{time_left} לפני שאתם מנסים שוב."
     hours:
-      one: "שעה אחת"
-      other: "%{count} שעות"
+      many: '%{count} שעות'
+      one: שעה אחת
+      other: '%{count} שעות'
+      two: '%{count} שעות'
     minutes:
-      one: "דקה אחת"
-      other: "%{count} דקות"
+      many: '%{count} דקות'
+      one: דקה אחת
+      other: '%{count} דקות'
+      two: '%{count} דקות'
     seconds:
-      one: "שניה אחת"
-      other: "%{count} שניות"
+      many: '%{count} שניות'
+      one: שניה אחת
+      other: '%{count} שניות'
+      two: '%{count} שניות'
   datetime:
     distance_in_words:
       half_a_minute: "פחות מדקה"
       less_than_x_seconds:
-        one: "פחות משנייה"
-        other: "פחות מ-%{count} שניות"
+        many: פחות מ-%{count} שניות
+        one: פחות משנייה
+        other: פחות מ-%{count} שניות
+        two: פחות מ-%{count} שניות
       x_seconds:
-        one: "שנייה"
-        other: "%{count} שניות"
+        many: '%{count} שניות'
+        one: שנייה
+        other: '%{count} שניות'
+        two: '%{count} שניות'
       less_than_x_minutes:
-        one: "פחות מדקה"
-        other: "פחות מ-%{count} דקות"
+        many: פחות מ-%{count} דקות
+        one: פחות מדקה
+        other: פחות מ-%{count} דקות
+        two: פחות מ-%{count} דקות
       x_minutes:
-        one: "דקה"
-        other: "%{count} דקות"
+        many: '%{count} דקות'
+        one: דקה
+        other: '%{count} דקות'
+        two: '%{count} דקות'
       about_x_hours:
-        one: "שעה"
-        other: "%{count} שעות"
+        many: '%{count} שעות'
+        one: שעה
+        other: '%{count} שעות'
+        two: '%{count} שעות'
       x_days:
-        one: "יום"
-        other: "%{count} ימים"
+        many: '%{count} ימים'
+        one: יום
+        other: '%{count} ימים'
+        two: '%{count} ימים'
       about_x_months:
-        one: "חודש"
-        other: "%{count} חודשים"
+        many: '%{count} חודשים'
+        one: חודש
+        other: '%{count} חודשים'
+        two: '%{count} חודשים'
       x_months:
-        one: "חודש"
-        other: "%{count} חודשים"
+        many: '%{count} חודשים'
+        one: חודש
+        other: '%{count} חודשים'
+        two: '%{count} חודשים'
       about_x_years:
-        one: "שנה"
-        other: "%{count} שנים"
+        many: '%{count} שנים'
+        one: שנה
+        other: '%{count} שנים'
+        two: '%{count} שנים'
       over_x_years:
-        one: "יותר משנה"
-        other: "יותר מ-%{count} שנים"
+        many: יותר מ-%{count} שנים
+        one: יותר משנה
+        other: יותר מ-%{count} שנים
+        two: יותר מ-%{count} שנים
       almost_x_years:
-        one: "שנה"
-        other: "%{count} שנים"
+        many: '%{count} שנים'
+        one: שנה
+        other: '%{count} שנים'
+        two: '%{count} שנים'
     distance_in_words_verbose:
       half_a_minute: "ממש עכשיו"
       less_than_x_seconds:
-        one: "ממש עכשיו"
-        other: "ממש עכשיו"
+        many: ממש עכשיו
+        one: ממש עכשיו
+        other: ממש עכשיו
+        two: ממש עכשיו
       x_seconds:
-        one: "לפני שנייה"
-        other: "לפני %{count} שניות"
+        many: לפני %{count} שניות
+        one: לפני שנייה
+        other: לפני %{count} שניות
+        two: לפני %{count} שניות
       less_than_x_minutes:
-        one: "לפני פחות מדקה"
-        other: "לפני פחות מ-%{count} דקות"
+        many: לפני פחות מ-%{count} דקות
+        one: לפני פחות מדקה
+        other: לפני פחות מ-%{count} דקות
+        two: לפני פחות מ-%{count} דקות
       x_minutes:
-        one: "לפני דקה"
-        other: "לפני %{count} דקות"
+        many: לפני %{count} דקות
+        one: לפני דקה
+        other: לפני %{count} דקות
+        two: לפני %{count} דקות
       about_x_hours:
-        one: "לפני שעה"
-        other: "לפני %{count} שעות"
+        many: לפני %{count} שעות
+        one: לפני שעה
+        other: לפני %{count} שעות
+        two: לפני %{count} שעות
       x_days:
-        one: "אתמול"
-        other: "לפני %{count} ימים"
+        many: לפני %{count} ימים
+        one: אתמול
+        other: לפני %{count} ימים
+        two: לפני %{count} ימים
       about_x_months:
-        one: "לפני בערך חודש"
-        other: "לפני בערך %{count} חודשים"
+        many: לפני בערך %{count} חודשים
+        one: לפני בערך חודש
+        other: לפני בערך %{count} חודשים
+        two: לפני בערך %{count} חודשים
       x_months:
-        one: "לפני חודש"
-        other: "לפני %{count} חודשים"
+        many: לפני %{count} חודשים
+        one: לפני חודש
+        other: לפני %{count} חודשים
+        two: לפני %{count} חודשים
       about_x_years:
-        one: "לפני בערך שנה"
-        other: "לפני בערך %{count} שנים"
+        many: לפני בערך %{count} שנים
+        one: לפני בערך שנה
+        other: לפני בערך %{count} שנים
+        two: לפני בערך %{count} שנים
       over_x_years:
-        one: "לפני יותר משנה"
-        other: "לפני יותר מ %{count} שנים"
+        many: לפני יותר מ %{count} שנים
+        one: לפני יותר משנה
+        other: לפני יותר מ %{count} שנים
+        two: לפני יותר מ %{count} שנים
       almost_x_years:
-        one: "לפני כמעט שנה"
-        other: "לפני כמעט %{count} שנים"
+        many: לפני כמעט %{count} שנים
+        one: לפני כמעט שנה
+        other: לפני כמעט %{count} שנים
+        two: לפני כמעט %{count} שנים
   password_reset:
     no_token: "מצטערים, הקישור לשינוי הסיסמה ישן מדי. לחצו על כפתור הכניסה ובחרו ב\"שכחתי את הסיסמה שלי\" כדי לקבל קישור חדש."
     choose_new: "בחרו סיסמה חדשה"
@@ -594,8 +647,6 @@ he:
       long_form: 'דוגלל כלא ראוי'
     notify_user:
       title: 'שלחו הודעה ל @{{username}}'
-      description: 'אנו מעוניינים לדבר עם אדם זה ישירות ובפרטיות בנוגע לפוסט שלו.'
-      short_description: 'אני רוצה לדבר עם אדם זה ישירות ובאופן פרטי בנוגע לפוסט שלהם.'
       long_form: 'הודעה נשלחה למשתמש/ת'
       email_title: 'הפוסט שלכם ב"%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -693,9 +744,7 @@ he:
       xaxis: "יום"
       yaxis: "מספר ביקורים"
     signups:
-      title: "משתמשים חדשים"
       xaxis: "יום"
-      yaxis: "מספר משתמשים חדשים"
     profile_views:
       title: "צפיות בפרופילי משתמשים"
       xaxis: "יום"
@@ -733,7 +782,6 @@ he:
       xaxis: "יום"
       yaxis: "מספר הודעות דואר"
     user_to_user_private_messages:
-      title: "משתמש למשתמש"
       xaxis: "יום"
       yaxis: "מספר ההודעות"
     system_private_messages:
@@ -780,7 +828,6 @@ he:
       xaxis: "יום"
       yaxis: "צפיות בדפים של זחלני רשת"
     page_view_total_reqs:
-      title: "סה\"כ"
       xaxis: "יום"
       yaxis: "צפיות כוללות"
     page_view_logged_in_mobile_reqs:
@@ -844,28 +891,25 @@ he:
     failing_emails_warning: 'יש %{num_failed_jobs} עבודות מייל שנכשלו. בידקו את app.yml שלכם כדי לוודא ששרת המייל מוגדר כיאות. <a href="/sidekiq/retries" target="_blank">ראו את העבודות שנכשלו ב Sidekiq</a>.'
     subfolder_ends_in_slash: "הגדרות תיקיית המשנה שלכם לא נכונות, הנתיב DISCOURSE_RELATIVE_URL_ROOT צריך להסתיים בלוכסן."
     email_polling_errored_recently:
-      one: "ניסיונות שליחת מיילים יצרו תקלה ב 24 השעות האחרונות. צפו ב<a href='/logs' target='_blank'>יומנים</a> לפרטים נוספים."
-      other: "ניסיונות שליחת מיילים יצרו %{count} תקלות ב 24 השעות האחרונות. צפו ב<a href='/logs' target='_blank'>יומנים</a> לפרטים נוספים."
-    missing_mailgun_api_key: "השרת מכוון לשלוח מיילים באמצעות mailgun אבל לא סיפקתם מפתח API שמוודא את הודעות ה webhook."
+      many: ניסיונות שליחת מיילים יצרו %{count} תקלות ב 24 השעות האחרונות. צפו ב<a href='/logs' target='_blank'>יומנים</a> לפרטים נוספים.
+      one: ניסיונות שליחת מיילים יצרו תקלה ב 24 השעות האחרונות. צפו ב<a href='/logs' target='_blank'>יומנים</a> לפרטים נוספים.
+      other: ניסיונות שליחת מיילים יצרו %{count} תקלות ב 24 השעות האחרונות. צפו ב<a href='/logs' target='_blank'>יומנים</a> לפרטים נוספים.
+      two: ניסיונות שליחת מיילים יצרו %{count} תקלות ב 24 השעות האחרונות. צפו ב<a href='/logs' target='_blank'>יומנים</a> לפרטים נוספים.
     bad_favicon_url: "ה favicon לא עולה. אנא בדקו את הגדרת ה favicon_url ב <a href='/admin/site_settings'>הגדרות האתר</a>."
     poll_pop3_timeout: "החיבור לשרת POP3 התנתק. דוא\"ל נכנס לא יכול להשלף ואינו  מאוחזר. אנא בדקו את <a href='/admin/site_settings/category/email'> הגדרות ה-POP3 </a> שלכם ואת ספק השירות."
     poll_pop3_auth_error: "החיבור לשרת POP3 נכשל בשל שגיאת הזדהות. אנא בדקו את <a href='/admin/site_settings/category/email'> הגדרות ה-POP3 </a> שלכם."
   site_settings:
     censored_words: "מלים שיוחלפו באופן אוטומטי ב- &#9632;&#9632;&#9632;&#9632;"
-    censored_pattern: "ביטוי רגולרי שיוחלף אוטומטית עם &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "מחיקת אוטומטית של פרסומים מוסתרים שנותרים מוסתרים במשך יותר מ-30 יום."
-    default_locale: "שפת ברירת המחדל עבור אתר Discourse זה (קוד ISO 639-1)"
     allow_user_locale: "אפשרו למשתמשים לבחור את הגדרות השפה שלהם בממשק המשתמש/ת"
     set_locale_from_accept_language_header: "קבעו את שפת הממשק עבור משתמשים אנונימיים לפי השפה בדפדפן. (נ-י-ס-י-ו-נ-י, לא עובד עם cache אנונימי)"
     min_post_length: "מספר התווים המותר כאורך מינימלי לפוסט"
     min_first_post_length: "אורך מינימלי מותר לפוסט ראשון (בגוף הנושא) בתווים "
-    min_private_message_post_length: "אורך הפוסט המינימלי המותר בתווים להודעות"
     max_post_length: "מספר התווים המקסימלי כאורך פוסט"
     topic_featured_link_enabled: "איפשור של פרסום קישור עם נושאים."
     show_topic_featured_link_in_digest: "הצגת קישור מומלץ של הנושא במייל התמצות."
     min_topic_title_length: "מספר התווים המינימלי הנדרש לכותרת נושא"
     max_topic_title_length: "מספר התווים המקסימלי המותר לכותרת נושא"
-    min_private_message_title_length: "אורך הכותרת המנימילי המותר להודעה בתווים"
     min_search_term_length: "מספר התווים המינמלי התקין כאורך מונח לחיפוש"
     search_tokenize_chinese_japanese_korean: "אלצו את החיפוש לנתח סינית/יפנית/קוריאנית גם באתרים שאינם בשפות אלו"
     search_prefer_recent_posts: "אם חיפוש בפורום הגדול שלכם איטי, אופציה זו מנסה לאנדקס קודם כל את הפוסטים החדשים יותר"
@@ -914,7 +958,6 @@ he:
     summary_likes_required: "מינימום הלייקים לנושא לפני שהאפשרות \"סיכום נושא זה\" תתאפשר"
     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)"
     long_polling_interval: "כמות הזמן שהשרת צריך לחכות לפני שעונה ללקוחות, כאשר אין מידע לשליחה (משתמשים רשומים מחוברים למערכת בלבד)"
@@ -969,7 +1012,6 @@ he:
     version_checks: "שלחו פינג להאב של Discourse לעדכוני גרסה וכדי להציג מסרים אודות גרסאות בלוח התצוגה ב /admin"
     new_version_emails: "שלחו דוא\"ל לכתובת של contact_email כשגרסה חדשה של Discourse זמינה."
     invite_expiry_days: "מה התוקף מפתחות הזמנת משתמשים, בימים"
-    invite_passthrough_hours: "כמה זמן, בשעות, יכולים משתמשים לעשות שימוש בהזמנה שנשלחה כדי להתחבר "
     invite_only: "הרשמה פומבית מנוטרלת, כל המשתמשים החדשים חייבים להיות מוזמנים על ידי הצוות."
     login_required: "דרשו הזדהות לקריאת תוכן באתר זה, אל תאפשרו גישה אנונימית."
     min_username_length: "אורך שמות משתמשים מינימלי בתווים. אזהרה: אם למשתמשים קיימים או קבוצות כבר יש שם קצר יותר, האתר שלכם ישבר!"
@@ -991,7 +1033,6 @@ he:
     sso_overrides_avatar: "מעקף אווטאר של משתמש בעזרת אווטר אתר חיצוני מ-SSO Payload. אם אפשרות זו מופעלת, מומלץ מאוד לבטל את האפשרות להעלאת אווטר."
     sso_not_approved_url: "SSO של חשבונות שלא אושרו יופנו ל URL זה"
     sso_allows_all_return_paths: "אל תגבילו את שמות המתחם של נתיבי החזרה (return_paths) שניתנים על ידי ה-SSO (כברירת מחדל, נתיבי החזרה חייבים להיות באתר הנוכחי)"
-    enable_local_logins: "אפשרו התחברות שמבוססת על שמות משתמשים וסיסמאות מקומיים. (שימו לב: אפשרות זו חייבת להיות מותרת כדי שהזמנות להצטרפות יפעלו)"
     allow_new_registrations: "אפשרו הרשמות משתמשים חדשים. בטלו סימון זה כדי למנוע יצירת חשבונות חדשים."
     enable_signup_cta: "הציגו מודעה למשתמשים אנונימיים חוזרים שמציעה להם להרשם כדי לקבל חשבון."
     enable_yahoo_logins: "איפשור אימות של Yahoo"
@@ -999,15 +1040,12 @@ he:
     google_oauth2_client_id: "זהות לקוח (Client ID) של אפליקציית ה-Google שלך."
     google_oauth2_client_secret: "קוד סודי של לקוח (client secret) של אפליקציית Google."
     enable_twitter_logins: "אפשרו אימות Twitter, מצריך twitter_consumer_key ו twitter_consumer_secret"
-    twitter_consumer_key: "מפתח לשימוש באימות Twitter, רשום ב http://dev.twitter.com"
-    twitter_consumer_secret: "סוד לשימוש באימות Twitter, רשום ב http://dev.twitter.com"
     enable_instagram_logins: "אפשרו אימות אינסטגרם, מצריך instagram_consumer_key ו instagram_consumer_secret"
     instagram_consumer_key: "מפתח לאימות אינסטגרם"
     instagram_consumer_secret: "סוד לאימות אינסטגרם"
     enable_facebook_logins: "איפשור אימות פייסבוק, מצריך facebook_app_id ו facebook_app_secret"
     facebook_app_id: "מזהה אפליקציה לאימות פייסבוק, רשום ב https://developers.facebook.com/apps"
     facebook_app_secret: "סוד אפליקציה לאימות פייסבוק, רשום ב https://developers.facebook.com/apps"
-    facebook_request_extra_profile_details: "בקשת מידע לגבי \"אודות\", מיקום, ואתר אינטרנט מפייסבוק. (מצריך שאפליקציית האימות שלכם תאושר על ידי פייסבוק)"
     enable_github_logins: "אפשור אימות Github, מצריך github_client_id ו github_client_secret"
     github_client_id: "מזהה לקוח לאימות Github, רשום ב https://github.com/settings/applications"
     github_client_secret: "סוד לקוח לאימות Github, רשום ב https://github.com/settings/applications"
@@ -1015,7 +1053,6 @@ he:
     allow_restore: "אפשר שחזור, אשר יכול להחליף את כל(!) המידע באתר! הותירו על \"שלילי\" (false) אלא אם כן אתם מתכננים לשחזר גיבוי."
     maximum_backups: "המספר המקסימלי של גיבויים לשמירה על הכונן. גיבויים ישנים יותר ימחקו אוטומטית"
     automatic_backups_enabled: "הרץ גיבויים אוטומטים כמו שמוגדר בתדירות הגיבויים"
-    backup_frequency: "באיזו תכיפות אנחנו מגבים את האתר, בימים."
     enable_s3_backups: "העלאת גיבויים ל-S3 לאחר השלמתם. חשוב: דורש הזנת הרשאות S3 תקפות להגדרות הקבצים."
     s3_backup_bucket: "הדלי המרוחק שבו לשמור גיבויים. אזהרה: שימו לב שהוא דלי פרטי."
     s3_disable_cleanup: "בטלו את ההסרה של גיבויים מ S3 כאשר הם מוסרים מקומית."
@@ -1037,7 +1074,6 @@ he:
     max_bookmarks_per_day: "מספר מקסימלי של סימניות למשתמשים ביום."
     max_edits_per_day: "מספר עריכות מקסימלי מותר למשתמשים ליום."
     max_topics_per_day: "מספר מקסימלי של נושאים שמשתמשים יכולים ליצור ביום."
-    max_private_messages_per_day: "מספר מקסימלי של הודעות שמשתמשים יכולים ליצור ביום."
     max_invites_per_day: "מספר מקסימלי של הזמנות שיכולים משתמשים לשלוח ביום."
     max_topic_invitations_per_day: "מספר מירבי של הזמנות לנושא שמשתמשים יכולים לשלוח ביום. "
     max_logins_per_ip_per_hour: "מספר מקסימלי של התחברויות מורשות לכל כתובת IP בשעה"
@@ -1052,7 +1088,6 @@ he:
     clean_orphan_uploads_grace_period_hours: "תקופת חסד (בשעות) לפני שהעלאות יתומות מוסרות."
     purge_deleted_uploads_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_access_key_id: "מפתח הגישה (access key id) של Amazon S3 שישמש להעלאת התמונות."
     s3_secret_access_key: "מפתח הגישה הסודי (secret access key) של Amazon S3 שישמש להעלאת תמונות."
@@ -1098,7 +1133,6 @@ he:
     min_trust_to_edit_wiki_post: "רמת האמון המינימלי הנדרשת כדי לערוך פוסט שמסומן כ-wiki."
     min_trust_to_edit_post: "רמת האמון המינימלית הנדרשת כדי לערוך פוסטים."
     min_trust_to_allow_self_wiki: "רמת האמון המינימלית הנדרשת כדי שמשתמש יוכל להפוך פוסט של עצמו לויקי."
-    min_trust_to_send_messages: "רמת האמון המינימלית המדרשת כדי ליצור הודעות פרטיות חדשות."
     newuser_max_links: "כמה קישורים יכולים משתמשים חדשים להוסיף לפוסט."
     newuser_max_images: "כמה תמונות יכולים משתמשים להוסיף לפוסט."
     newuser_max_attachments: "כמה קבצים מצורפים יכולים משתמשים חדשים להוסיף לפוסט."
@@ -1108,7 +1142,6 @@ he:
     max_users_notified_per_group_mention: "מספר מקסימלי של משתמשים שיכולים לקבל התראה אם מוזכרת קבוצה (אם מגיעים לסף זה לא תועלה התראה)"
     create_thumbnails: "יצירת תמונות מוקטנות והארת תמונות גדולות מידי מלהיכלל בפוסט."
     email_time_window_mins: "המתינו (n) דקות לפני משלוח כל התראת מייל, כדי לאפשר למשתמשים הזדמנות לערוך ולוודא באופן סופי את הפוסטים שלהם."
-    private_email_time_window_seconds: "המתינו (n) שניות לפני משלוח מיילים אישיים להתראה, על מנת לאפשר למשתמשים לערוך או לתקן את ההודעה."
     email_posts_context: "כמה תגובות קודמות יש לכלול כהקשר במיילים עם התראות."
     flush_timings_secs: "באיזו תדירות אנחנו מזרימים מידע לשרת, בשניות."
     title_max_word_length: "האורך המקסימלי המותר למילה בכותרת נושא, בתווים. "
@@ -1161,7 +1194,6 @@ he:
     reply_by_email_enabled: "אפשרו  תגובה לנושאים באמצעות הדוא\"ל."
     reply_by_email_address: "תבנית עבור כתובות מייל של מענה באמצעות אימייל, למשל: {reply_key}@reply.example.com או  replies+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "רשימה של כמה תבניות לתגובות במייל באמצעות כתובות מייל נכנסות. למשל: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
-    incoming_email_prefer_html: "השתמשו ב HTML במקום טקסט למייל נכנס."
     disable_emails: "מנעו מ-Discourse ממשלוח דוא\"ל כלשהו"
     strip_images_from_short_emails: "הסרת תמונות מדוא\"ל בגודל של פחות מ-2800 בתים"
     short_email_length: "אורכו של דוא\"ל קצר בבתים (Bytes)"
@@ -1259,7 +1291,6 @@ he:
     allowed_href_schemes: "פרוטוקולים מותרים בלינקים בנוסף ל http ו https."
     embed_post_limit: "מספר מקסימלי של פוסטים להטמעה."
     embed_username_required: "נדרש שם משתמש ליצירת הנושא."
-    notify_about_flags_after: "אם יש דגלים שלא טופלו לאחר מספר זה של שעות, שילחו הודעה פרטית לצוות. קיבעו ל 0 כדי לנטרל."
     show_create_topics_notice: "אם לאתר פחות מ-5 נושאים פומביים, הציגו מודעה המבקשת מן המנהלים ליצור עוד נושאים."
     delete_drafts_older_than_n_days: מחקו טיוטות בנות יותר מ (n) ימים.
     bootstrap_mode_min_users: "מספר משתמשים מינימלי שנדרש כדי לנטרל מצב איתחול (קבעו ל 0 כדי לנטרל)"
@@ -1271,14 +1302,12 @@ he:
     approve_post_count: "מספר הפוסטים ממשתמשים חדשים או בסיסיים שחייבים לאשר אותם"
     approve_unless_trust_level: "פוסטים של משתמשים מתחת לרמת אמון זו חייבים לעבור אישור"
     approve_new_topics_unless_trust_level: "נושאים חדשים עבור משתמשים מתחת לרמת אמון זו חייבים להיות מאושרים"
-    notify_about_queued_posts_after: "אם יש פוסטים שהמתינו לסקירה ליותר מכמות השעות הזו, יישלח מייל ל contact_email. קבעו 0 כדי לנטרל את המיילים האלו."
     auto_close_messages_post_count: "מספר פוסטים מקסימלי בהודעה לפני שהיא נסגרת אוטומטית (0 לניטרול)"
     auto_close_topics_post_count: "מספר מקסימלי של פוסטים בנושא לפני שהוא נסגר אוטומטית (0 לניטרול)"
     code_formatting_style: "כפתור קוד בדפדפן יציע אוטומטית סגנון קידוד זה"
     max_allowed_message_recipients: "מספר מקסימלי של נמענים מותר בהודעה."
     default_email_digest_frequency: "באיזו תדירות משתמשים יקבלו סיכומי מיילים כברירת מחדל."
     default_include_tl0_in_digests: "כללו פוסטים ממשתמשים חדשים בדוא\"ל מסכם כברירת מחדל. משתמשים יוכלו לשנות זאת בהעדפות האישיות."
-    default_email_private_messages: "שלח מייל כשמישהו שולח הודעה למשתמש, בתור ברירת מחדל."
     default_email_direct: "שלח מייל כשמישהו מצטט/מגיב-ל/מזכיר או מזמין משתמש, בתור ברירת מחדל."
     default_email_mailing_list_mode: "שלח מייל עבור כל פוסט חדש בתור ברירת מחדל. "
     default_email_mailing_list_mode_frequency: "משתמשים שאיפשרו את מצב רשימת התפוצה יקבלו מיילים בתדירות זו כברירת מחדל."
@@ -1314,7 +1343,6 @@ he:
     max_tags_in_filter_list: "מספר מירבי של תגיות להצגה בתפריט הסינון הנפתח. יוצגו התגים שבשימוש הרב ביותר."
     tags_sort_alphabetically: "הצגת תגים בסדר אלפביתי. ברירת המחדל היא להציג אותם על פי פופולאריות."
     tag_style: "סגנון ויזואלי לתג עיטורים."
-    staff_tags: "רשימת תגים שניתנים להחלה רק על ידי אנשי צוות"
     min_trust_level_to_tag_topics: "רמת אמון מינימלית שדרושה כדי לתייג נושאים"
     suppress_overlapping_tags_in_list: "אם תגים תואמים בדיוק מילים בכותרות נושאים, אל תציגו את התגים"
     remove_muted_tags_from_latest: "אל תציגו נושאים מתוייגים עם תגים מושתקים ברשימת הנושאים האחרונים."
@@ -1368,18 +1396,24 @@ he:
     not_seen_in_a_month: "ברוך שובכם! לא ראינו אתכם כבר כמה זמן, אה? הנה כמה נושאים פופולאריים שהתווספו מאז שהייתם כאן."
   merge_posts:
     edit_reason:
-      one: "פוסט מוזג על ידי %{username}"
-      other: "%{count} פוסטים מוזגו על ידי %{username}"
+      many: '%{count} פוסטים מוזגו על ידי %{username}'
+      one: פוסט מוזג על ידי %{username}
+      other: '%{count} פוסטים מוזגו על ידי %{username}'
+      two: '%{count} פוסטים מוזגו על ידי %{username}'
     errors:
       different_topics: "לא ניתן למזג פוסטים ששייכים לנושאים שונים."
       different_users: "לא ניתן למזג פוסטים ששייכים למשתמשים שונים."
   move_posts:
     new_topic_moderator_post:
-      one: "תגובה פוצלה לנושא חדש: %{topic_link}"
-      other: "%{count} תגובות פוצלו לנושא חדש: %{topic_link}"
+      many: '%{count} תגובות פוצלו לנושא חדש: %{topic_link}'
+      one: 'תגובה פוצלה לנושא חדש: %{topic_link}'
+      other: '%{count} תגובות פוצלו לנושא חדש: %{topic_link}'
+      two: '%{count} תגובות פוצלו לנושא חדש: %{topic_link}'
     existing_topic_moderator_post:
-      one: "תגובה אוחדה לנושא קיים:  %{topic_link}"
-      other: "%{count} תגובות אוחדו לנושא קיים: %{topic_link}"
+      many: '%{count} תגובות אוחדו לנושא קיים: %{topic_link}'
+      one: 'תגובה אוחדה לנושא קיים:  %{topic_link}'
+      other: '%{count} תגובות אוחדו לנושא קיים: %{topic_link}'
+      two: '%{count} תגובות אוחדו לנושא קיים: %{topic_link}'
   change_owner:
     post_revision_text: "בעלות הועברה מהמשתמש %{old_user} אל %{new_user}"
     deleted_user: "משתמש שנמחק"
@@ -1389,47 +1423,75 @@ he:
     closed_enabled: "הנושא הזה סגור. לא ניתן להגיב תגובות חדשות."
     closed_disabled: "הנושא הזה פתוח. ניתן להגיב תגובות חדשות."
     autoclosed_message_max_posts:
-      one: "הודעה זו נסגרה אוטומטית אחרי שהגיעה למספר המקסימלי  של תגובות: 1 ."
-      other: "הודעה זו נסגרה אוטומטית אחרי שהגיעה למספר המקסימלי  של תגובות: %{count} ."
+      many: 'הודעה זו נסגרה אוטומטית אחרי שהגיעה למספר המקסימלי  של תגובות: %{count} .'
+      one: 'הודעה זו נסגרה אוטומטית אחרי שהגיעה למספר המקסימלי  של תגובות: 1 .'
+      other: 'הודעה זו נסגרה אוטומטית אחרי שהגיעה למספר המקסימלי  של תגובות: %{count} .'
+      two: 'הודעה זו נסגרה אוטומטית אחרי שהגיעה למספר המקסימלי  של תגובות: %{count} .'
     autoclosed_topic_max_posts:
-      one: "נושא זה נסגר אוטומטית לאחר שהגיע למספר המקסימלי של תגובות: 1."
-      other: "נושא זה נסגר אוטומטית אחרי שהגיע למספר המקסימלי  של תגובות: %{count} ."
+      many: 'נושא זה נסגר אוטומטית אחרי שהגיע למספר המקסימלי  של תגובות: %{count} .'
+      one: 'נושא זה נסגר אוטומטית לאחר שהגיע למספר המקסימלי של תגובות: 1.'
+      other: 'נושא זה נסגר אוטומטית אחרי שהגיע למספר המקסימלי  של תגובות: %{count} .'
+      two: 'נושא זה נסגר אוטומטית אחרי שהגיע למספר המקסימלי  של תגובות: %{count} .'
     autoclosed_enabled_days:
-      one: "הנושא הזה ננעל אוטומטית לאחר יום אחד. תגובות חדשות לא מתקבלות."
-      other: "נושא זה נסגר באופן אוטומטי לאחר %{count} ימים. לא ניתן להוסיף תגובות חדשות."
+      many: נושא זה נסגר באופן אוטומטי לאחר %{count} ימים. לא ניתן להוסיף תגובות חדשות.
+      one: הנושא הזה ננעל אוטומטית לאחר יום אחד. תגובות חדשות לא מתקבלות.
+      other: נושא זה נסגר באופן אוטומטי לאחר %{count} ימים. לא ניתן להוסיף תגובות חדשות.
+      two: נושא זה נסגר באופן אוטומטי לאחר %{count} ימים. לא ניתן להוסיף תגובות חדשות.
     autoclosed_enabled_hours:
-      one: "נושא זה ננעל לאחר שעה אחת. לא ניתן להוסיף תגובות חדשות."
-      other: "נושא זה נסגר אוטומטית לאחר %{count} שעות. לא ניתן להוסיף תגובות חדשות."
+      many: נושא זה נסגר אוטומטית לאחר %{count} שעות. לא ניתן להוסיף תגובות חדשות.
+      one: נושא זה ננעל לאחר שעה אחת. לא ניתן להוסיף תגובות חדשות.
+      other: נושא זה נסגר אוטומטית לאחר %{count} שעות. לא ניתן להוסיף תגובות חדשות.
+      two: נושא זה נסגר אוטומטית לאחר %{count} שעות. לא ניתן להוסיף תגובות חדשות.
     autoclosed_enabled_minutes:
-      one: "הנושא הזה ננעל אוטומטית לאחר דקה. תגובות חדשות לא מתקבלות."
-      other: "הנושא הזה נסגר אוטומטית לאחר %{count} דקות. תגובות חדשות לא מתקבלות."
+      many: הנושא הזה נסגר אוטומטית לאחר %{count} דקות. תגובות חדשות לא מתקבלות.
+      one: הנושא הזה ננעל אוטומטית לאחר דקה. תגובות חדשות לא מתקבלות.
+      other: הנושא הזה נסגר אוטומטית לאחר %{count} דקות. תגובות חדשות לא מתקבלות.
+      two: הנושא הזה נסגר אוטומטית לאחר %{count} דקות. תגובות חדשות לא מתקבלות.
     autoclosed_enabled_lastpost_days:
-      one: "נושא זה ננעל אוטומטית לאחר יום אחד מהתגובה האחרונה. תגובות חדשות לא מתקבלות."
-      other: "נושא זה נסגר אוטומטית לאחר %{count} ימים מהתגובה האחרונה. תגובות חדשות לא מתקבלות."
+      many: נושא זה נסגר אוטומטית לאחר %{count} ימים מהתגובה האחרונה. תגובות חדשות לא מתקבלות.
+      one: נושא זה ננעל אוטומטית לאחר יום אחד מהתגובה האחרונה. תגובות חדשות לא מתקבלות.
+      other: נושא זה נסגר אוטומטית לאחר %{count} ימים מהתגובה האחרונה. תגובות חדשות לא מתקבלות.
+      two: נושא זה נסגר אוטומטית לאחר %{count} ימים מהתגובה האחרונה. תגובות חדשות לא מתקבלות.
     autoclosed_enabled_lastpost_hours:
-      one: "נושא זה נסגר שעה לאחר התגובה האחרונה. תגובות נוספות אינן מותרות יותר."
-      other: "נושא זה נסגר אוטומטית  %{count} שעות לאחר התגובה האחרונה. תגובות נוספות אינן מותרות יותר."
+      many: נושא זה נסגר אוטומטית  %{count} שעות לאחר התגובה האחרונה. תגובות נוספות אינן מותרות יותר.
+      one: נושא זה נסגר שעה לאחר התגובה האחרונה. תגובות נוספות אינן מותרות יותר.
+      other: נושא זה נסגר אוטומטית  %{count} שעות לאחר התגובה האחרונה. תגובות נוספות אינן מותרות יותר.
+      two: נושא זה נסגר אוטומטית  %{count} שעות לאחר התגובה האחרונה. תגובות נוספות אינן מותרות יותר.
     autoclosed_enabled_lastpost_minutes:
-      one: "נושא זה ננעל אוטומטית לאחר דקה מהתגובה האחרונה. תגובות חדשות לא מתקבלות."
-      other: "נושא זה נסגר אוטומטית לאחר %{count} דקות מהתגובה האחרונה. תגובות חדשות לא מתקבלות."
+      many: נושא זה נסגר אוטומטית לאחר %{count} דקות מהתגובה האחרונה. תגובות חדשות לא מתקבלות.
+      one: נושא זה ננעל אוטומטית לאחר דקה מהתגובה האחרונה. תגובות חדשות לא מתקבלות.
+      other: נושא זה נסגר אוטומטית לאחר %{count} דקות מהתגובה האחרונה. תגובות חדשות לא מתקבלות.
+      two: נושא זה נסגר אוטומטית לאחר %{count} דקות מהתגובה האחרונה. תגובות חדשות לא מתקבלות.
     autoclosed_disabled_days:
-      one: "נושא זה נפתח אוטומטית לאחר יום 1."
-      other: "נושא זה נפתח אוטומטית לאחר %{count} ימים."
+      many: נושא זה נפתח אוטומטית לאחר %{count} ימים.
+      one: נושא זה נפתח אוטומטית לאחר יום 1.
+      other: נושא זה נפתח אוטומטית לאחר %{count} ימים.
+      two: נושא זה נפתח אוטומטית לאחר %{count} ימים.
     autoclosed_disabled_hours:
-      one: "נושא זה נפתח אוטומטית לאחר שעה 1."
-      other: "נושא זה נפתח אוטומטית לאחר %{count} שעות."
+      many: נושא זה נפתח אוטומטית לאחר %{count} שעות.
+      one: נושא זה נפתח אוטומטית לאחר שעה 1.
+      other: נושא זה נפתח אוטומטית לאחר %{count} שעות.
+      two: נושא זה נפתח אוטומטית לאחר %{count} שעות.
     autoclosed_disabled_minutes:
-      one: "נושא זה נפתח אוטומטית לאחר דקה 1."
-      other: "נושא זה נפתוח אוטומטית לאחר %{count} דקות."
+      many: נושא זה נפתוח אוטומטית לאחר %{count} דקות.
+      one: נושא זה נפתח אוטומטית לאחר דקה 1.
+      other: נושא זה נפתוח אוטומטית לאחר %{count} דקות.
+      two: נושא זה נפתוח אוטומטית לאחר %{count} דקות.
     autoclosed_disabled_lastpost_days:
-      one: "הנושא נפתח אוטומטית יום 1 אחרי התגובה האחרונה."
-      other: "הנושא נפתח אוטומטית %{count} ימים אחרי התגובה האחרונה."
+      many: הנושא נפתח אוטומטית %{count} ימים אחרי התגובה האחרונה.
+      one: הנושא נפתח אוטומטית יום 1 אחרי התגובה האחרונה.
+      other: הנושא נפתח אוטומטית %{count} ימים אחרי התגובה האחרונה.
+      two: הנושא נפתח אוטומטית %{count} ימים אחרי התגובה האחרונה.
     autoclosed_disabled_lastpost_hours:
-      one: "נושא זה נפתח אוטומטית שעה 1 אחרי התגובה האחרונה."
-      other: "נושא זה נפתח אוטומטית %{count} שעות אחרי התגובה האחרונה."
+      many: נושא זה נפתח אוטומטית %{count} שעות אחרי התגובה האחרונה.
+      one: נושא זה נפתח אוטומטית שעה 1 אחרי התגובה האחרונה.
+      other: נושא זה נפתח אוטומטית %{count} שעות אחרי התגובה האחרונה.
+      two: נושא זה נפתח אוטומטית %{count} שעות אחרי התגובה האחרונה.
     autoclosed_disabled_lastpost_minutes:
-      one: "נושא זה נפתח אוטומטית דקה 1 אחרי התגובה האחרונה."
-      other: "נושא זה נפתח אוטומטית %{count} דקות אחרי התגובה האחרונה."
+      many: נושא זה נפתח אוטומטית %{count} דקות אחרי התגובה האחרונה.
+      one: נושא זה נפתח אוטומטית דקה 1 אחרי התגובה האחרונה.
+      other: נושא זה נפתח אוטומטית %{count} דקות אחרי התגובה האחרונה.
+      two: נושא זה נפתח אוטומטית %{count} דקות אחרי התגובה האחרונה.
     autoclosed_disabled: "הנושא הזה נפתח. ניתן להגיב תגובות חדשות."
     autoclosed_disabled_lastpost: "הנושא הזה נפתח. ניתן להגיב תגובות חדשות."
     pinned_enabled: "הנושא הזה ננעץ. הוא יופיע בראש הקטגוריה שלו עד שיוסר מנעיצה על ידי מנהל או שכפתור נקה נעיצות נלחץ."
@@ -1489,11 +1551,15 @@ he:
       domain_not_allowed: "אתר לא תקין. מתחמים מותרים: %{domains}"
   flags_reminder:
     flags_were_submitted:
-      one: "דגלים נרשמו לפני יותר משעה. [אנא סיקרו אותם](/admin/flags)."
-      other: "דגלים נרשמו לפני יותר מ %{count} שעות. [אנא סיקרו אותם](/admin/flags)."
+      many: דגלים נרשמו לפני יותר מ %{count} שעות. [אנא סיקרו אותם](/admin/flags).
+      one: דגלים נרשמו לפני יותר משעה. [אנא סיקרו אותם](/admin/flags).
+      other: דגלים נרשמו לפני יותר מ %{count} שעות. [אנא סיקרו אותם](/admin/flags).
+      two: דגלים נרשמו לפני יותר מ %{count} שעות. [אנא סיקרו אותם](/admin/flags).
     subject_template:
-      one: "דגל אחד ממתין לטיפול"
-      other: "%{count} דגלים ממתינים לטיפול"
+      many: '%{count} דגלים ממתינים לטיפול'
+      one: דגל אחד ממתין לטיפול
+      other: '%{count} דגלים ממתינים לטיפול'
+      two: '%{count} דגלים ממתינים לטיפול'
   unsubscribe_mailer:
     title: "שולח-מיילים לביטול מנוי"
     subject_template: "אשרו שאינכם מעוניינים יותר לקבל עדכוני דוא\"ל מ%{site_title}"
@@ -1544,47 +1610,6 @@ he:
   test_mailer:
     title: "שולח-מיילים לבדיקה"
     subject_template: "[%{email_prefix}] מייל בדיקת שליחתיות"
-    text_body_template: |
-      זהו מייל בדיקה מ
-
-      [**%{base_url}**][0]
-
-      הגעה של מיילים ליעד היא עיניין מסובך. הנה כמה דברים חשובים שאתם צריכים לבדוק קודם כל:
-
-      - היו *בטוחים* שקבעתם כמו שצריך את כתובת ה from: של `מייל ההתראה` בהגדרות האתר. **הדומיין שקבוע בכתובת ה "from" של המיילים שאתם שולחים הוא הדומיין שמיילים יאומתו מולו**.
-
-      - דעו איך להסתכל על המקור הגולמי של המיילים בתוכנת המיילים שלכם, כדי שתוכלו לבחון את כותרות המיילים לרמזים חשובים. בג׳ימייל, זו אופציית ״הצג מקור״ בתפריט הנפתח בכותרת של כל מייל.
-
-      - חשוב: **האם אצל ספק האינטרנט שלכם רשומה רשומת DNS הפוכה כדי לקשר את שמות הדומיין וכתובות ה IP שאתם שולחים מהן מיילים? [בידקו את רשומת ה Reverse PTR שלכם] [2] כאן. אם ספק האינטרנט שלכם לא מכניס את המצביע לרשומת ה DNS ההפוכה הנכון, זה מאוד לא סביר שמיילים שלכם יגיעו ליעד.
-
-      - האם [רשומת ה SPF][8] שלכם נכונה? [בידקו את רשומת ה SPF שלכם][1] כאן. שימו לב ש TXT זה סוג הרשומה הרשמי והנכון ל SPF.
-
-      - האם [רשומת ה DKIM][3] שלכם נכונה? זה ישפר משמעותית את שליחת המיילים שלכם. [בידקו את רשומת ה DKIM שלכם][7] כאן.
-
-      - אם אתם מריצים את שרת המייל של עצמכם, וודאו שכתובות ה IP של שרת המייל שלכם [לא נמצאות באף רשימה שחורה][4]. וודאו גם שהשרת בטוח שולח שם שרת מלא (fully-qualified hostname) שעושה resolve ל DNS בהודעת ה HELO שלו. אם לא, זה יגרום למיילים שלכם להדחות על ידי שירותי מייל רבים.
-
-      - אנחנו ממליצים בחום ש**תשלחו מייל בדיקה ל[mail-tester.com][mt]** כדי לוודא שכל מה שמוזכר למעלה עובד כיאות.
-
-      (הדרך *הקלה* היא ליצור חשבון חינמי ב [SendGrid][sg], [SparkPost][sp], [Mailgun][mg] או [Mailjet][mj], שיש להם תוכניות מיילים חינמיות נדיבות ויהיו בסדר לקהילות קטנות. עדיין תצטרכו להקים רשומות SPF ו DKIM בשירות ה DNS שלכם!)
-
-      אנחנו מקווים שקיבלתם את מייל הבדיקה הזה בסדר!
-
-      בהצלחה,
-
-      חבריכם ב[Discourse](http://www.discourse.org)
-
-      [0]: %{base_url}
-      [1]: http://www.kitterman.com/spf/validate.html
-      [2]: http://mxtoolbox.com/ReverseLookup.aspx
-      [3]: http://www.dkim.org/
-      [4]: http://whatismyipaddress.com/blacklist-check
-      [7]: https://www.mail-tester.com/spf-dkim-check
-      [8]: http://www.openspf.org/SPF_Record_Syntax
-      [sg]: https://goo.gl/r1WMF6
-      [sp]: https://www.sparkpost.com/
-      [mg]: http://www.mailgun.com/
-      [mj]: https://www.mailjet.com/pricing
-      [mt]: http://www.mail-tester.com/
   new_version_mailer:
     title: "שולח-מיילים של גרסה חדשה"
     subject_template: "[%{email_prefix}] גרסת Discourse חדשה, עדכון זמין."
@@ -1603,8 +1628,10 @@ he:
     deferred: "תודה שעדכנתם אותנו. אנחנו בודקים את העניין."
     deferred_and_deleted: "תודה שעדכנתם אותנו. הסרנו את הפוסט."
   temporarily_closed_due_to_flags:
-    one: "נושא זה סגור זמנית לשעה 1 עקב מספר רב של דגלי קהילה."
-    other: "נושא זה סגור זמנית ל-%{count} שעות עקב מספר רב של דגלי קהילה."
+    many: נושא זה סגור זמנית ל-%{count} שעות עקב מספר רב של דגלי קהילה.
+    one: נושא זה סגור זמנית לשעה 1 עקב מספר רב של דגלי קהילה.
+    other: נושא זה סגור זמנית ל-%{count} שעות עקב מספר רב של דגלי קהילה.
+    two: נושא זה סגור זמנית ל-%{count} שעות עקב מספר רב של דגלי קהילה.
   system_messages:
     private_topic_title: "נושא #%{id}"
     contents_hidden: "אנא בקרו בפוסט כדי לצפות בתוכן שלו."
@@ -1693,7 +1720,6 @@ he:
         ```
     csv_export_succeeded:
       title: "יצוא CSV הצליח"
-      subject_template: "יצוא הנתונים הושלם"
       text_body_template: |
         ייצוא המידע שלכם הצליח! :dvd:
 
@@ -1809,8 +1835,10 @@ he:
     pending_users_reminder:
       title: "תזכורת משתמשים ממתינים"
       subject_template:
-        one: "משתמש 1 ממתין לאישורכם"
-        other: "%{count} משתמשים ממתינים לאישורכם"
+        many: '%{count} משתמשים ממתינים לאישורכם'
+        one: משתמש 1 ממתין לאישורכם
+        other: '%{count} משתמשים ממתינים לאישורכם'
+        two: '%{count} משתמשים ממתינים לאישורכם'
       text_body_template: |
         ישנן הרשמות של משתמשים חדשים שממתינות לאישור (או דחייה) לפני שהם יוכלו לגשת לפורום זה.
 
@@ -1844,8 +1872,10 @@ he:
   user_notifications:
     previous_discussion: "תגובות קודמות"
     reached_limit:
-      one: "שימו לב: אנחנו שולחים לכל היותר מייל 1 יומי. בידקו באתר כדי לראות את אלו שעלולים להשאר מאחור."
-      other: "שימו לב: אנחנו שולחים לכל היותר %{count} מיילים יומיים. בידקו באתר כדי לראות את אלו שעלולים להשאר מאחור. נ.ב: תודה שאתם פופולאריים!"
+      many: 'שימו לב: אנחנו שולחים לכל היותר %{count} מיילים יומיים. בידקו באתר כדי לראות את אלו שעלולים להשאר מאחור. נ.ב: תודה שאתם פופולאריים!'
+      one: 'שימו לב: אנחנו שולחים לכל היותר מייל 1 יומי. בידקו באתר כדי לראות את אלו שעלולים להשאר מאחור.'
+      other: 'שימו לב: אנחנו שולחים לכל היותר %{count} מיילים יומיים. בידקו באתר כדי לראות את אלו שעלולים להשאר מאחור. נ.ב: תודה שאתם פופולאריים!'
+      two: 'שימו לב: אנחנו שולחים לכל היותר %{count} מיילים יומיים. בידקו באתר כדי לראות את אלו שעלולים להשאר מאחור. נ.ב: תודה שאתם פופולאריים!'
     in_reply_to: "בתגובה ל"
     unsubscribe:
       title: "ביטול מנוי"
@@ -1987,7 +2017,7 @@ he:
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
-        %{message}
+          %{message}
     digest:
       why: "סיכום קצר של %{site_link} מאז ביקורך האחרון ב-%{last_seen_at}"
       since_last_visit: "מאז ביקורכם האחרון"
@@ -2156,147 +2186,6 @@ he:
     title: "שאלות נפוצות / הנחיות"
   tos_topic:
     title: "תנאי השימוש"
-    body: |
-      התנאים והתניות שלהלן מסדירים את כל פרטי השימוש באתר %{company_domain} ובכל פריטי התוכן, השירותים והמוצרים הזמינים באתר או דרכו, כולל, בין השאר, את תוכנת הפורום של %{company_domain} (שיקראו ביחד ״האתר״ או ״אתר האינטרנט״). האתר שייך ומתופעל על-ידי %{company_full_name} (להלן ״%{company_name}״). אנו מציעים לכם את אתר האינטרנט, אך מתנים זאת בקבלת כל התנאים והתניות הכלולים כאן, ללא שינוי, וכל יתר כללי ההפעלה, העקרונות (כולל, ללא הגבלה,  [מדיניות הפרטיות](/privacy) של %{company_name}, [הנחיות הקהילה](/faq) של %{company_name}) והנהלים ש%{company_name} עשויה לפרסם מעת לעת באתר האינטרנט (במקובץ, 'ההסכם').
-
-      יש לקרוא את ההסכם בעיון לפני הגישה לאתר או השימוש בו. הגישה לאתר או לחלק ממנו והשימוש בהם פירושם הסכמה מצדכם כי יחולו עליכם התנאים והתניות הכלולים בהסכם זה. הרשות לגשת אל אתר האינטרנט ולהשתמש בשירותים מותנית בהסכמתכם לכל התנאים והתניות שבהסכם. אם תנאים ותניות אלה נחשבים להצעה מטעם %{company_name}, קבלת התנאים מצדכם מוגבלת במפורש לתנאים אלה.
-
-      האתר אינו מיועד למי שלא מלאו לו 13 שנים והשירות באתר מוצע אך ורק למשתמשים בני 13 ומעלה. משתמשים בני 13 ומטה מתבקשים לא להירשם לשימוש באתר. כל אדם שנרשם כמשתמש או מספק את פרטיו האישיים לאתר מצהיר בזאת כי הוא בן 13 ומעלה.
-
-      <a name="1"></a>
-
-      ## [1. חשבונכם ב %{company_domain}](#1)
-
-      אם אתם יוצרים חשבון באתר, אתם אחראים על שמירת האבטחה של חשבונכם ואתם אחראים לחלוטין על כל הפעילויות שמתרחשות בשמכם בחשבון. באחריותכם ליידע את %{company_name} מיידית על כל שימוש לא מורשה בחשבונכם ועל כל הפרה אחרת של האבטחה. לא תחול על %{company_name} חבות בגין מעשים או מחדלים מצידכם, לרבות נזק מכל סוג ומין שייגרם כתוצאה מאותם מעשים או מחדלים.
-
-      <a name="2"></a>
-
-      ## [2. אחריות התורמים](#2)
-
-      אם אתם מפרסמים חומרים באתר, קישורים באתר, או יוצרים (או מאפשרים לצד שלישי ליצור) חומרים שנעשים זמינים באמצעות האתר (כל חומר שהוא, להלן ״תוכן״), האחריות המלאה על התוכן הזה, כמו גם על כל נזק הנובע ממנו, תחול עליכם. האחריות חלה ללא תלות בסוג התוכן, לרבות, אך ללא הגבלה, טקסט, תמונה, סרטון וידאו, אודיו או קוד. כאשר אתם מנגישים תוכן, אתם מאשרים ש:
-
-      *   הורדה, העתקה ושימוש בתוכן לא יפרו זכויות קיניין, לרבות זכויות יוצרים, פטנטים, סימני מסחר או זכויות סודות מסחריים, של שום צד שלישי;
-      *   אם למעסיק שלכם יש זכויות על קיניין רוחני שאתם יוצרים, או (i) שקיבלתם רשות מהמעסיק לפרסם או להפוך תוכן לנגיש, לרבות תוכנה, או (ii) שקיבלתם ויתור מהמעסיק לכל הזכויות על התוכן;
-      *   אתם מתואמים לחלוטין עם כל רשיון צד שלישי שקשור לתוכן, ועשיתם את כל שנדרש כדי להעביר בהצלחה למשתמשי הקצה כל תנאי נדרש;
-      *   התוכן אינו מכיל או מתקין שום וירוס, תולעת, רוגלה, סוס טרויאני או כל תוכן הרסני אחר;
-      *   התוכן אינו ספאם, אינו מיוצר באקראי או על ידי מכונה, ואינו מכיל תוכן מסחרי שאינו אתי או בלתי רצוי שתוכנן כדי להזרים תנועה לאתרי צד שלישי או לשפר דירוגים של מנועי חיפוש של צדדים שלישיים, או כדי לקדם מעשים לא חוקיים (כגון פישינג) או להטעות נמענים בנוגע למקור של התוכן (כמו ספופינג);
-      *   התוכן אינו פורנוגרפי, לא מכיל איומים או מסית לאלימות, ולא מפר את הפרטיות או זכויות הפרסום של שום צד שלישי;
-      *   התוכן שלכם אינו מפורסם באמצעות הודעות אלקטרוניות בלתי רצויות כמו קישורי ספאם בקבוצות דיון, רשימות מיילים, בלוגים ואתרים, ודרכי קידום בלתי רצויות אחרות;
-      *   לתוכן לא ניתן שם בצורה שמטעה את הקוראים שלכם וגורמת להם לחשוב שאתם אדם אחר או חברה אחרת; ו
-      *   במקרה שהתוכן מכיל קוד מחשב, קיטלגתם במדוייק ו/או תיארתם את הסוג, אופי, שימושים והשפעות של החומרים שפרסמתם, בין שנתבקשתם לעשות זאת על ידי %{company_name} או שלא.
-
-      <a name="3"></a>
-
-      ## [3. רשיון תוכן משתמשים](#3)
-
-      תרומות תוכן של משתמשים הן תחת [רשיון קריאייטיב קומונס ייחוס-שימוש_לא_מסחרי-שיתוף_זהה 3.0 לא-מותאם](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.he). מבלי להגביל אף אחת מהמצגים והערובות, ל%{company_name} יש את הזכות (אך לא את החובה), לפי שיקול דעתה הבלעדי (i) לסרב לקבל או להסיר כל תוכן שלפי דעתה הסבירה של %{company_name}, מפר איזשהי מהמדיניויות של %{company_name} או שהוא פוגעני או שהוא מעורר התנגדות, או (ii) לסגור או למנוע כניסה ו/או שימוש באתר לכל אדם או יישות מכל סיבה שהיא, לפי שיקול דעתה הבלעדי של %{company_name}. על %{company_name} לא תחול שום חובה להחזיר איזה מהסכומים ששולמו בעבר.
-
-      <a name="4"></a>
-
-      ## [4. תשלומים וחידוש](#4)
-
-      ### תנאים כלליים
-
-      שירותים אופציונליים ושידרוגים יכולים להיות זמינים באתר. כאשר אתם משתמשים בשירות או שדרוג אופציונליים, אתם מסכימים לשלם ל%{company_name} את דמי המנוי החודשיים או שנתיים. תשלומים יגבו מראש ביום שתתחילו להשתמש בשירות או בשדרוג ויכסו את השימוש בשירות או בשדרוג למנוי תקופתי חודשי או שנתי כפי שמצויין. תשלומים אלו לא ניתנים להחזרה.
-
-      ### חידוש אוטומטי
-
-      אלא אם תודיעו ל%{company_name} לפני סיום תקופת המנוי הרלוונטית שאתם מעוניינים לבטל את השירות או השדרוג, המנוי שלכם יתחדש אוטומטית ואתם מאשרים לנו לגבות את דמי המנוי החודשיים השנתיים (וכן מיסים) באמצעות כרטיס אשראי או אמצעי תשלום אחר שברשותנו. ניתן לבטל מנויים בכל עת.
-
-      <a name="5"></a>
-
-      ## [5. שירותים](#5)
-
-      ### אירוח, שרותי תמיכה
-
-      שירותי אירוח ותמיכה אופציונליים עלולים להיות מסופקים על ידי %{company_name} תחת התנאים וההתניות לכל אחד מהשירותים הללו. על ידי הרשמה לאירוח/תמיכה או חשבון שירותי תמיכה, אתם מסכימים לציית לכל התנאים וההתניות.
-
-      <a name="6"></a>
-
-      ## [6. אחריות מבקרים](#6)
-
-      %{company_name} לא סקרה, ולא יכולה לסקור, את כל החומר, כולל תוכנות מחשב, שפורסמו באתר, ולכן לא יכולה להיות אחראית לתכנים, שימושם או השפעתם. על ידי הפעלת האתר, %{company_name} לא מייצגת או רומזת שהיא תומכת בחומר שפורסם בו, או שהיא מאמינה שהחומר מדוייק, שימושי או לא-מזיק. אתם האחראים על נקיטת אמצעים לפי הצורך כדי להגן על עצמכם ועל מערכות המחשב שלכם בפני וירוסים, תולעים, סוסים טרויאנים, ותכנים מזיקים או הרסניים אחרים. האתר עלוללהכיל תכנים פוגעניים, לא-ראויים, או נתונים לביקורת בצורה אחרת, כמו גם מכילים אי-דיוקים טכניים, טעויות טיפוגרפיות, ואחרות. האתר עלול להכיל גם תכנים שמפרים את הפרטיות או זכויות הפרסום, או מפרים את זכויות הקניין וזכויות רכוש אחרות, של צדדים שלישיים, או הורדות, העתקות או שימוש שעליו חלים תנאים והתניות, מצויינים או שאינם מצויינים. %{company_name} לא לוקחת כל אחריות לכל נזק שייגרם מהשימוש על ידי מבקרים באתר, או מכל הורדה על ידי מבקרים שתכניהם מפורסמים.
-
-      <a name="7"></a>
-
-      ## [7. תכנים שמפורסמים באתרים אחרים](#7)
-
-      לא סקרנו, ואנחנו לא יכולים לסקור, את כל החומר, כולל תוכנות מחשב, שמוצעים דרך האתרים ודפי האינטרנט אליהם %{company_domain} מקשר, ואשר מקשרים אל %{company_domain}. ל%{company_name} אין שליטה על אתרים ודפים אלו שאינם %{company_domain} והיא אינה אחראית על התוכן והשימוש שלהם. על ידי קישור לאתר או דף שאינו חלק מ %{company_domain}, %{company_name} לא מייצגת או רומזת שהיא תומכת באתרים ודפים כאלו. אתם אחראים לנקוט באמצעי זהירות לפי הצורך כדי להגן על עצמכם ועל מערכות המחשוב שלכם מוירוסים, תולעים, סוסים טרוינים, ותכנים פוגעניים או הרסניים אחרים. %{company_name} פוטרת עצמה מכל אחריות לכל נזק שנגרם כתוצאה משימוש באתרים ודפים שאינם %{company_domain}.
-
-      <a name="8"></a>
-
-      ## [8. הפרת זכויות יוצרים ומדיניות DMCA](#8)
-
-      כשם ש%{company_name} מבקשת מאחרים לכבד את זכויות הקניין הרוחני שלה, היא מכבדת את זכויות הקניין הרוחני של אחרים. אם אתם מאמינים שחומר שנמצא ב או מקושר מ %{company_domain} מפר את זכויות היוצרים שלכם, ואם אתר זה שוכן בארה״ב, %{company_name} מעודדת אתכם להודיע לה בהתאם למדיניות [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") של %{company_name}. %{company_name} תגיב להודעות כאלו, כפי שנדרש או ראוי על ידי הסרה של תכנים מפרים או ביטול כל הקישורים לחומרים המפרים. %{company_name} תבטל גישה ותחסום שימוש באתר אם, תחת נסיבות מתאימות, המבקר נחוש להיות מפר סדרתי של זכויות יוצרים או זכויות קניין רוחני אחרות של %{company_name} או אחרים. במקרה של סיום התקשרות שכזה, ל%{company_name} לא תהיה שום מחוייבות לספק החזר של שום סכום ששולם לפני כן ל%{company_name}.
-
-      <a name="9"></a>
-
-      ## [9. קיניין רוחני](#9)
-
-      הסכם זה לא מעביר אליכם מ%{company_name} או מצד שלישי שום קניין רוחני, וכל זכות, קניין ועיניין בקניין זה יישאר (כפי שבין הצדדים) ב%{company_name} בלבד. %{company_name}, %{company_domain}, הלוגו של %{company_domain}, וכל שאר סימני המסחר, סימני השירות, גרפיקות ולוגואים שנעשה בהם שימוש בקשר ל %{company_domain}, או האתר הם סימני מסחר או סימנים רשומים של %{company_name} או זכייניה. סימני מסחר אחרים, סימני שירות, גרפיקות ולוגואים שנעשה בהם שימוש בהקשר של האתר יכולים להיות סימני מסחר של צדדים שלישיים אחרים. השימוש שלכם באתר לא מקנה לכם זכות או רישיון לייצר או להשתמש בשום סימני מסחר של %{company_name} או צד שלישי.
-
-      <a name="10"></a>
-
-      ## [10. פרסום](#10)
-
-      %{company_name} שומרת על זכותה להציג פרסומות על גבי התכנים שלך, אלא אם רכשת שדרוג 'ללא פרסומות' או שברשותך חשבון מיוחד.
-
-      <a name="11"></a>
-
-      ## [11. ייחוס](#11)
-
-      %{company_name} שומרת לעצמה את הזכות להציג קישורי ייחוס כמו ״מופעל על ידי %{company_domain}״, ייחוס לתמה, כותב וייחוס פונט בתחתית או בבאר הכלים של התכנים שלכם. קרדיטים בתחתית ובבאר הכלים של %{company_domain} לא מותרים להסרה בלי קשר לשדרוגים שנרכשו.
-
-      <a name="12"></a>
-
-      ## [12. שינויים](#12)
-
-      אנו מעדכנים את השירותים שלנו ללא הרף ופירוש הדבר, שלעתים אנו נדרשים לשנות את התנאים המשפטיים שבכפוף להם אנו מציעים את שירותינו. באחריותך לבדוק מפעם לפעם הסכם זה בנוגע לשינויים בו. המשך השימוש שלך ב-%{company_domain} יהיה בכפוף לתנאים החדשים ומשקף הסכמה אליהם. עם זאת, %{company_name} יכולה בהמשך להציע שירותים נוספים, עליהם יחול הסכם זה.
-
-      <a name="13"></a>
-
-      ## [13. סיום](#13)
-
-      %{company_name} רשאית להפסיק את הגישה שלך לאתר האינטרנט בכל עת, באופן מלא או חלקי, עם או בלי סיבה, עם או בלי התראה, ובתוקף מיידי. אם ברצונך לסיים את ההסכם או לסגור את חשבונך ב-%{company_domain} (אם קיים), עליך פשוט להפסיק את השימוש באתר האינטרנט. כל הוראות הסכם זה אשר מעצם טבען אמורות לשרוד סיום כאמור ישרדו אותו, כולל, ללא הגבלה, הוראות בדבר בעלות, תניות פטור וסעיפי הסתייגות מאחריות, סעיפי שיפוי וסעיפי הגבלת חבות.
-
-      <a name="14"></a>
-
-      ## [14. הגבלת אחריות](#14)
-
-      האתר מוגש ״כמו שהוא״. %{company_name} והספקים שלה והגורמים המעניקים לה רשיונות מתנערים מכל אחריות מכל סוג שהוא, מוצהרת או מרומזת, ובכללה, מבלי להגביל, אחריות מסחרית, התאמה למטרה כלשהי ואחריות לאי-הפרה. לא %{company_name} ולא הספקים או הגורמים המעניקים לה רשיונות, מתחייבים שבאתר לא יהיו שגיאות או שהגישה אליו תהיה רציפה וללא שיבושים. אם אתם באמת קוראים זאת, הנה [הפתעה](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). אתם מבינים שאתם מורידים, או מקבלים תכנים או שירותים מהאתר על אחריותכם וסיכונכם בלבד.
-
-
-      <a name="15"></a>
-
-      ## [15. הגבלת חבות](#15)
-
-      בשום מקרה %{company_name}, או הספקים שלה או בעלי הרשיון שלה, יהיו אחראים לכל דבר ועיניין שקשורים להסכם זה תחת כל חוזה, התרשלות, אחריות קפידה או דין אחר או תיאוריית יושר בעבור: (i) נזקים מיוחדים, מקריים או תוצאתיים; (ii) מחיר רכש של מוצרים תחליפיים או שירותים; (iii) בעבור הפרעה בשימוש או אבדן או השחתה של מידע; או (iv) כל סכום שעולה על המחיר ששילמתם ל%{company_name} תחת הסכם זה במהלך שנים עשר (12) החודשים שלפני סיבת הפעולה. ל%{company_name} לא תהיה אחריות לכל תקלה או איחור בעקבות עיניינים שמחוץ לשליטתה הסבירה. האמור לעיל לא תקף מעבר למה שנאסר בחוק.
-
-      <a name="16"></a>
-
-      ## [16. ייצוג כללי ואחריות](#16)
-
-      אתם מייצגים ומאשרים ש (i) שימושכם באתר יתאם בקפידה עם [מדיניות הפרטיות](/privacy) של %{company_name}, [הנחיות הקהילה](/guidelines), עם הסכם זה ועם כל החוקים והתקנות הרלוונטיים (כולל, מבלי להגביל, כל החוקים המקומיים או התקנות בארצכם, מדינתכם, עירכם, או אזור ממשלתי אחר, בנוגע להתנהלות מקוונת ותכנים קבילים, וכולל כל החוקים הרלוונטיים בנוגע למשלוח מידע טכני מהמדינה בה אתר זה נמצא או המדינה בה אתם נמצאים) ו (ii) שימושכם באתר לא מפר או מועל בזכויות קניין רוחני של כל צד שלישי.
-
-      <a name="17"></a>
-
-      ## [17. שיפוי](#17)
-
-      הסכמתכם נתונה לכך שתחול עליכם החובה לפצות ולשפות את %{company_name}, קבלניה והגורמים המעניקים לה רישיונות, ואת המנהלים, בעלי התפקידים, העובדים והסוכנים של כל אלה, מפני וכנגד כל תביעה והוצאה, כולל הוצאות הגנה משפטית כתוצאה מהשימוש שלכם באתר האינטרנט, כולל אך לא רק, הפרה מצדכם של האמור בהסכם זה.
-
-      <a name="18"></a>
-
-      ## [18. שונות](#18)
-
-      הסכם זה מהווה את כלל ההסכם בין %{company_name} לבינכם בנוגע לעיניין הנדון, והוא יכול להשתנות על ידי תיקון כתוב חתום על ידי מנהל מורשה של %{company_name}, או על ידי פרסום מטעם %{company_name} של גרסה מתוקנת. למעט במידה המותרת בחוק הרלוונטי, אם יש, הסכם זה, הגישה לאתר האינטרנט והשימוש בו יוסדרו על פי חוקי מדינת ישראל, והמקום לבירור מחלוקות שיתעוררו מתוך או בנוגע לכל אלה יהיה בתי המשפט המדינתיים שבתל אביב, ישראל. למעט תביעות לסעד באמצעות צו מניעה או מן הדין, או תביעות בנוגע לזכויות קניין רוחני (אשר מותר להגישן בכל בית משפט מוסמך ללא תשלום ערבות), כל מחלוקת שתיווצר כתוצאה מהסכם זה תיושב באופן סופי בהתאם לכללי הבוררות הנהוגים בישראל, באמצעות שלושה בוררים שימונו בהתאם לאותם כללים. הבוררות תתקיים בתל אביב, ישראל, בשפה העברית, ויהיה אפשר לאכוף את פסיקת הבוררות בכל בית משפט. הצד שייצא וידו על העליונה בכל תביעה או הליך לאכיפת הסכם זה יהא זכאי להחזר בגין עלויות ודמי הגנה משפטית. היה וייקבע כי חלק כלשהו בהסכם זה אינו תקף או בלתי אכיף, אותו חלק יפורש כך שישקף את הכוונה המקורית של הצדדים ויתר חלקי ההסכם ישמרו על מלוא תוקפם וחלותם. ויתור של צד מן הצדדים על תנאי או תניה הכלולים בהסכם זה או על הפרה של תנאי/תניה כאמור בהזדמנות נתונה, ייחשב לוויתור באותה הזדמנות בלבד ולא יחול על אף הפרה נוספת/עתידית. מותר לכם להסב את זכויותיכם במסגרת הסכם זה לזכות כל גורם שיסכים כי האמור בתנאים ובתניות שהוא כולל יחולו עליו. %{company_name} רשאית להסב את זכויותיה במסגרת הסכם ללא שום תנאי. הסכם זה יחייב את הצדדים וייזקף לזכות הצדדים, יורשיהם ונמחיהם המורשים.
-
-      ## [19. תרגום](#19)
-
-      תנאי שירות אלה נוסחו במקור בשפה האנגלית (ארה"ב). אפשר שנתרגם את התנאים לשפות אחרות. במקרה של סתירה בין גרסה מתורגמת של תנאי השירות לבין הגרסה באנגלית, תינתן עדיפות לגרסה בשפה האנגלית.
-
-      מסמך זה הוא CC-BY-SA. הוא עודכן ב 2 באוקטובר, 2016.
-
-      הותאם במקור מ[תנאי השירות של Wordpress](http://en.wordpress.com/tos/).
   privacy_topic:
     title: "מדיניות פרטיות"
     body: |
@@ -2389,22 +2278,22 @@ he:
         עיטור זה מוענק בפעם הראשונה שאתם עורכים את אחד הפוסטים שלכם. אמנם לא תוכלו לערוך את הפוסטים שלכם לעד, אבל עריכות זה רעיון טוב - אתם יכולים לשפר את הפוסטים שלכם, לתקן טעויות קטנות, או להוסיף כל דבר שפספסתם במקור. עירכו כדי להפוך את הפוסטים שלכם לטובים אפילו יותר!
     basic_user:
       name: בסיסיים
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">הוענקו להם</a> כל אפשרויות הקהילה הבסיסיות
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">הוענקו להם</a> כל אפשרויות הקהילה הבסיסיות"
       long_description: |
         עיטור זה מוענק כשאתם מגיעים לרמת אמון 1. תודה שנשארתם וקראתם כמה נושאים כדי להבין במה הקהילה הזו עוסקת. הסרנו כמה מגבלות של משתמשים חדשים; הוענקו לכם כמה יכולות נחוצות לקהילה, כמו הודעות פרטיות, דגלים, עריכת ויקי, והיכולת להוסיף תמונות וקישורים מרובים.
     member:
       name: חברים
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">הוענקו לכם</a> הזמנות, הודעות קבוצתיות, יותר לייקים
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">הוענקו לכם</a> הזמנות, הודעות קבוצתיות, יותר לייקים"
       long_description: |
         עיטור זה מוענק כאשר אתם מגיעים לרמת אמון 2. תודה על השתתפות במשך תקופה של שבועות כדי באמת להצטרף לקהילה שלנו. אתם יכולים כעת לשלוח הזמנות מחשבון המשתמש שלכם או מנושאים, ליצור הודעות אישיות לקבוצות, ולחלק קצת יותר לייקים בכל יום.
     regular:
       name: רגילים
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">הוענקו לכם</a> הוקרה, שינוי שם, מעקב אחר לינקים, וויקי, ולייקים נוספים
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">הוענקו לכם</a> הוקרה, שינוי שם, מעקב אחר לינקים, וויקי, ולייקים נוספים"
       long_description: |
         עיטור זה מוענק כאשר אתם מגיעים לרמת אמון 3. תודה על נטילת חלק באופן קבוע בקהילה לאורך תקופה של חודשים. אתם כעת חלק מקבוצת הקוראים הפעילה ביותר, ומקור אמין שהופך את הקהילה שלנו למעולה. אתם כעת יכולים לקטלג ולשנות שמות לנושאים, להשתמש בדגלים חזקים יותר, לגשת לאזור הלאונג׳ הפרטי, ותקבלו גם הרבה יותר לייקים ליום.
     leader:
       name: מובילים
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">הוענקו לכם</a> יכולות עריכה גלובאליות, נעיצה, סגירה, אירכוב, פיצול ומיזוג, לייקים נוספים
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">הוענקו לכם</a> יכולות עריכה גלובאליות, נעיצה, סגירה, אירכוב, פיצול ומיזוג, לייקים נוספים"
       long_description: |
         עיטור זה מוענק כאשר אתם מגיעים לרמת אמון 4. אתם מובילים בקהילה הזו כחברי צוות נבחרים, ואתם משמשים דוגמה חיובית לשאר הקהילה בפעולות ובמילים שלכם פה. יש לכם את היכולת לערוך את כל הפוסטים, ולהשתמש ביכולות ההנחייה הנפוצות כמו נעיצה, סגירה, הסרה מהרשימות, ארכוב, פיצול, ומיזוג, ויש לכם טונות של לייקים ביום.
     welcome:
@@ -2416,7 +2305,7 @@ he:
       name: אוטוביוגרפים
     anniversary:
       name: יום השנה
-      description: חברים פעילים למשך שנה, פרסמו לפחות פעם אחת
+      description: "חברים פעילים למשך שנה, פרסמו לפחות פעם אחת"
       long_description: |
         עיטור זה מוענק אם הייתם חברים למשך שנה עם לפחות פוסט אחד בשנה זו. תודה על שנשארתם איתנו ועל תרומתכם לקהילה שלנו. לא יכולנו לעשות זאת בלעדיכם.
     nice_post:
@@ -2478,8 +2367,6 @@ he:
     promoter:
       name: מקדמים
       description: הזמינו משתמש
-      long_description: |
-        עיטור זה ניתן כאשר אתם מזמינים מישהו להצטרף לקהילה באמצעות כפתור ההזמנה בדף המשתמש שלכם, או בתחתיתו של נושא. הזמנת חברים שעלולים להתעניין בדיונים ספציפיים היא דרך מצויינת להכיר אנשים חדשים לקהילה שלנו, אז תודה!
     campaigner:
       name: קמפיינרים
       description: הזמינו 3 משתמשים בסיסיים
@@ -2575,16 +2462,14 @@ he:
     first_emoji:
       name: אמוג׳י ראשון
       description: השתמשו באמוג׳י בפוסט
-      long_description: |
-        עיטור זה מוענק בפעם הראשונה שאתם מוסיפים אימוג׳י לפוסט שלכם :thumbsup:. אמוג׳יז מאפשרים לכם להעביר רגשות בפוסטים שלכם, משמחה :smiley: לעצב :anguished: לכעס :angry:  וכל דבר שבינהם :sunglasses: . פשוט הקישו : (נקודותיים) או לחצו על כפתור האימוג׳י בארגז הכלים בעורך כדי לבחור מבין מאות אפשרויות :ok_hand:
     first_mention:
       name: אזכור ראשון
       description: הזכירו משתמש בפוסט
-      long_description: עיטור זה מוענק בפעם הראשונה שאתם מזכירים את שם @המשתמש של מישהו בפוסט שלכם. כל איזכור מייצר התראה לאדם זה, כדי שידעו על הפוסט שלכם. פשוט התחילו בהקלדת @ (כרוכית) כדי לאזכר כל משתמש או, אם ניתן, קבוצה - זו דרך נוחה להביא דברים לתשומת ליבם.
+      long_description: "עיטור זה מוענק בפעם הראשונה שאתם מזכירים את שם @המשתמש של מישהו בפוסט שלכם. כל איזכור מייצר התראה לאדם זה, כדי שידעו על הפוסט שלכם. פשוט התחילו בהקלדת @ (כרוכית) כדי לאזכר כל משתמש או, אם ניתן, קבוצה - זו דרך נוחה להביא דברים לתשומת ליבם."
     first_onebox:
       name: Onebox ראשון
       description: פרסמו קישור שנעשה לו onebox
-      long_description: עיטור זה מוענק בפעם הראשונה שמפרסמים קישור בשורה נפרדת, מה שיגרום לו להתרחב לתיבת onebox עם תקציר של העמוד המקושר, כותרת ותמונה (כאשר ישנה תמונה בעמוד המקושר).
+      long_description: "עיטור זה מוענק בפעם הראשונה שמפרסמים קישור בשורה נפרדת, מה שיגרום לו להתרחב לתיבת onebox עם תקציר של העמוד המקושר, כותרת ותמונה (כאשר ישנה תמונה בעמוד המקושר)."
     first_reply_by_email:
       name: תגובה ראשונה במייל
       description: הגיבו לפוסט באמצעות מייל
@@ -2605,11 +2490,10 @@ he:
     badge_title_metadata: "עיטור ב-%{site_title} של %{display_name}"
   admin_login:
     success: "דוא\"ל נשלח"
-    error: "שגיאה!"
     email_input: "מייל של המנהל"
     submit_button: "שלח מייל"
   performance_report:
-    initial_post_raw: 'נושא זה כולל דוחות פעילות יומיים עבור האתר שלך. '
+    initial_post_raw: "נושא זה כולל דוחות פעילות יומיים עבור האתר שלך. "
     initial_topic_title: דוחות פעילות לאתר
   tags:
     title: "תגיות"
@@ -2747,6 +2631,3 @@ he:
         description: |
           <p>אם אתם אי פעם מרגישים שאתם צריכים לשנות הגדרות אלו, בקרו ב<a href='/admin' target='_blank'>אזור הניהול שלכם</a>; מיצאו אותו ליד האייקון של מפתח הברגים בתפריט האתר.</p>
           <p>תהנו, ובהצלחה <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>בבניית הקהילה החדשה שלכם!</a></p>
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.id.yml b/config/locales/server.id.yml
index 040029a5060..72259317ab8 100644
--- a/config/locales/server.id.yml
+++ b/config/locales/server.id.yml
@@ -17,7 +17,9 @@ id:
       date_only: "%B %-d, %Y"
       long: "%B %-d, %Y, %l:%M%P"
   date:
-    month_names: [null, Januari, Februari, Maret, April, Mei, Juni, Juli, Agustus, September, Oktober, November, Desember]
+    month_names: [~, Januari, Februari, Maret, April, Mei, Juni, Juli, Agustus, September, Oktober, November, Desember]
+    <<: *datetime_formats
+  time:
     <<: *datetime_formats
   title: "Discourse"
   topics: "Topik"
@@ -43,16 +45,16 @@ id:
       present: harus kosong
       confirmation: "tidak cocok dengan %{attribute}"
       empty: tidak boleh kosong
-      equal_to: harus sebanyak %{count}
+      equal_to: "harus sebanyak %{count}"
       even: harus genap
       exclusion: telah dipratentukan oleh sistem
-      greater_than: harus lebih besar dari %{count}
-      greater_than_or_equal_to: harus sama dengan atau lebih besar dari %{count}
+      greater_than: "harus lebih besar dari %{count}"
+      greater_than_or_equal_to: "harus sama dengan atau lebih besar dari %{count}"
       has_already_been_used: "telah digunakan"
       inclusion: tidak dimasukkan kedalam daftar
       invalid: tidak benar
-      less_than: harus kurang dari %{count}
-      less_than_or_equal_to: harus sama dengan atau kurang dari %{count}
+      less_than: "harus kurang dari %{count}"
+      less_than_or_equal_to: "harus sama dengan atau kurang dari %{count}"
       not_a_number: bukan numerik
       not_an_integer: harus integer
       odd: harus ganjil
@@ -79,6 +81,9 @@ id:
       max_username_length_exists: "Anda tidak boleh menentukan jumlah karakter maksimum username dibawah username terpendek. "
       max_username_length_range: "Anda tidak bisa menentukan jumlah maksimum dibawah jumlah minimum."
       default_categories_already_selected: "Anda tidak boleh memilih kategori yang digunakan di daftar lainnya."
+  activemodel:
+    errors:
+      <<: *errors
   backup:
     operation_already_running: "Proses lain sedang berjalan. Tidak dapat menjalankan proses baru saat ini."
     backup_file_should_be_tar_gz: "File backup harus berupa arsip .tar.gz."
@@ -90,32 +95,32 @@ id:
   reading_time: "Waktu bacaan"
   likes: "Suka"
   too_many_replies:
-    other: "Maaft, bagi pengguna baru sementara ini hanya dibatasi hingga %{count} jawaban dalam topik yang sama."
+    other: Maaft, bagi pengguna baru sementara ini hanya dibatasi hingga %{count} jawaban dalam topik yang sama.
   embed:
     start_discussion: "Mulai Diskusi"
     continue: "Lanjutkan Diskusi"
     more_replies:
-      other: "%{count} jawaban lainnya"
+      other: '%{count} jawaban lainnya'
     loading: "Sedang memuat diskusi..."
     imported_from: "Ini adalah topik diskusi tambahan untuk topik utama di %{link}"
     in_reply_to: "▶ %{username}"
     replies:
-      other: "%{count} balasan"
+      other: '%{count} balasan'
   no_mentions_allowed: "Maaf, Anda tidak dapat menyebut pengguna lain."
   too_many_mentions:
-    other: "Maaf, Anda hanya diperbolehkan untuk menyebut %{count} pengguna dalam satu posting."
+    other: Maaf, Anda hanya diperbolehkan untuk menyebut %{count} pengguna dalam satu posting.
   no_mentions_allowed_newuser: "Maaf, pengguna baru tidak diijinkan untuk menyebut pengguna lain."
   too_many_mentions_newuser:
-    other: "Maaf, pengguna baru hanya diperbolehkan untuk menyebut %{count} pengguna dalam satu posting."
+    other: Maaf, pengguna baru hanya diperbolehkan untuk menyebut %{count} pengguna dalam satu posting.
   no_images_allowed: "Maaf, pengguna baru tidak diperbolehkan untuk memasang gambar/foto dalam posting."
   too_many_images:
-    other: "Maaf, pengguna baru hanya diperbolehkan untuk memasang %{count} gambar/foto dalam satu posting."
+    other: Maaf, pengguna baru hanya diperbolehkan untuk memasang %{count} gambar/foto dalam satu posting.
   no_attachments_allowed: "Maaf, pengguna baru tidak diijinkan untuk mengunggah file/attachment dalam posting."
   too_many_attachments:
-    other: "Maaf, pengguna baru hanya diijinkan untuk mengunggah %{count} file/attachment dalam satu posting."
+    other: Maaf, pengguna baru hanya diijinkan untuk mengunggah %{count} file/attachment dalam satu posting.
   no_links_allowed: "Maaf, pengguna baru tidak diijinkan untuk menulis tautan dalam posting."
   too_many_links:
-    other: "Maaf, pengguna baru hanya diijinkan untuk menulis %{count} tautan dalam satu posting."
+    other: Maaf, pengguna baru hanya diijinkan untuk menulis %{count} tautan dalam satu posting.
   spamming_host: "Maaf, Anda tidak dapat mencantumkan tautan ke host tersebut."
   user_is_suspended: "Pengguna yang dalam masa suspensi tidak diperbolehkan untuk membuat posting."
   topic_not_found: "Ada yang salah. Mungkin topik ini ditutup atau dihapus ketika Anda sedang menjelajahinya?"
@@ -138,7 +143,6 @@ id:
     hot: "Topik Terpanas"
     top: "Topik unggulan"
     posts: "Pos terbaru"
-    private_posts: "pesan pribadi terkini"
     group_posts: "Posting terkini dari %{group_name}"
     group_mentions: "Mention terkini dari %{group_name}"
     user_topics: "Topik terakhir oleh @%{username}"
@@ -146,7 +150,6 @@ id:
   groups:
     errors:
       can_not_modify_automatic: "Anda tidak bisa mengubah grup otomatis."
-      member_already_exist: "'%{username}' telah menjadi anggota grup ini."
       invalid_domain: "'%{domain}' bukan domain yang valid."
       invalid_incoming_email: "'%{email}' bukanlah alamat email yang valid."
       email_already_used_in_group: "'%{email}' telah digunakan oleh grup '%{group_name}'."
@@ -163,7 +166,7 @@ id:
       trust_level_4: "trust_level_4"
   education:
     until_posts:
-      other: "%{count} post"
+      other: '%{count} post'
   activerecord:
     attributes:
       category:
@@ -175,12 +178,11 @@ id:
       user_profile:
         bio_raw: "Tentang Saya"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Anda hanya dapat melampirkan peringatan pada pesan pribadi."
-              cant_send_pm: "Mohon maaf, Anda tidak dapat mengirimkan pesan pribadi pada pengguna tersebut."
               no_user_selected: "Anda harus memilih pengguna yang valid."
         user:
           attributes:
@@ -195,7 +197,6 @@ id:
           attributes:
             hex:
               invalid: "bukan warna yang valid."
-      <<: *errors
   user_profile:
     no_info_other: "<div class='missing-profile'>%{name} belum mengisi kolom Tentang Saya untuk profilnya</div>"
   vip_category_name: "Lounge / Santai"
@@ -222,38 +223,37 @@ id:
     leader:
       title: "pemimpin"
   rate_limiter:
-    too_many_requests: "Kami membatasi jumlah tindakan itu dapat dilakukan dalam satu hari. Mohon tunggu %{time_left} sebelum mencoba lagi."
     hours:
-      other: "%{count} jam"
+      other: '%{count} jam'
     minutes:
-      other: "%{count} menit"
+      other: '%{count} menit'
     seconds:
-      other: "%{count} detik"
+      other: '%{count} detik'
   datetime:
     distance_in_words_verbose:
       half_a_minute: "baru saja"
       less_than_x_seconds:
-        other: "baru saja"
+        other: baru saja
       x_seconds:
-        other: "%{count} detik yang lalu"
+        other: '%{count} detik yang lalu'
       less_than_x_minutes:
-        other: "kurang dari %{count} menit yang lalu"
+        other: kurang dari %{count} menit yang lalu
       x_minutes:
-        other: "%{count} menit yang lalu"
+        other: '%{count} menit yang lalu'
       about_x_hours:
-        other: "%{count} jam yang lalu"
+        other: '%{count} jam yang lalu'
       x_days:
-        other: "%{count} hari yang lalu"
+        other: '%{count} hari yang lalu'
       about_x_months:
-        other: "sekitar %{count} bulan yang lalu"
+        other: sekitar %{count} bulan yang lalu
       x_months:
-        other: "%{count} bulan yang lalu"
+        other: '%{count} bulan yang lalu'
       about_x_years:
-        other: "sekitar %{count} tahun yang lalu"
+        other: sekitar %{count} tahun yang lalu
       over_x_years:
-        other: "lebih dari %{count} tahun yang lalu"
+        other: lebih dari %{count} tahun yang lalu
       almost_x_years:
-        other: "hampir %{count} tahun yang lalu"
+        other: hampir %{count} tahun yang lalu
   password_reset:
     update: 'Perbaharui Kata Sandi'
     success: "Anda telah mengubah kata sandi dengan sukses dan sekarang telah login."
@@ -310,9 +310,7 @@ id:
       xaxis: "Haru"
       yaxis: "Jumlah kunjungan"
     signups:
-      title: "Pengguna Baru"
       xaxis: "Hari"
-      yaxis: "Jumlah pengguna baru"
     profile_views:
       xaxis: "Hari"
     topics:
@@ -347,7 +345,6 @@ id:
       xaxis: "Hari"
       yaxis: "Jumlah Surel"
     user_to_user_private_messages:
-      title: "Pengguna-ke-Pengguna"
       xaxis: "Hari"
       yaxis: "Jumlah Pesan"
     system_private_messages:
@@ -387,7 +384,6 @@ id:
       title: "Penjelajah Web"
       xaxis: "Hari"
     page_view_total_reqs:
-      title: "Total"
       xaxis: "Hari"
     page_view_logged_in_mobile_reqs:
       xaxis: "Hari"
@@ -447,7 +443,7 @@ id:
   system_messages:
     pending_users_reminder:
       subject_template:
-        other: "%{count} pengguna sedang menunggu persetujuan"
+        other: '%{count} pengguna sedang menunggu persetujuan'
   user_notifications:
     previous_discussion: "Balasan Sebelumnya"
     posted_by: "Dipost oleh %{username} pada %{post_date}"
@@ -467,8 +463,3 @@ id:
     title: "Ketentuan Layanan"
   privacy_topic:
     title: "Kebijakan Privasi"
-  time:
-    <<: *datetime_formats
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index 84fd7684b66..4836c61dad5 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -17,12 +17,12 @@ it:
       date_only: "%B %-d, %Y"
       long: "%-d %B %Y, %l:%M%P"
   date:
-    month_names: [null, Gennaio, Febbraio, Marzo, Aprile, Maggio, Giugno, Luglio, Agosto, Settembre, Ottobre, Novembre, Dicembre]
+    month_names: [~, Gennaio, Febbraio, Marzo, Aprile, Maggio, Giugno, Luglio, Agosto, Settembre, Ottobre, Novembre, Dicembre]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "am"
     pm: "pm"
-    <<: *datetime_formats
   title: "Discourse"
   topics: "Argomenti"
   posts: "messaggi"
@@ -72,19 +72,18 @@ it:
       present: deve essere vuoto
       confirmation: "non corrisponde a %{attribute}"
       empty: non può essere vuoto
-      equal_to: deve essere uguale a %{count}
+      equal_to: "deve essere uguale a %{count}"
       even: deve essere pari
       exclusion: è riservato
-      greater_than: deve essere maggiore di %{count}
-      greater_than_or_equal_to: deve essere maggiore o uguale a %{count}
+      greater_than: "deve essere maggiore di %{count}"
+      greater_than_or_equal_to: "deve essere maggiore o uguale a %{count}"
       has_already_been_used: "è già stato usato"
       inclusion: non è incluso nella lista
       invalid: non è valido
       is_invalid: "sembra poco chiaro, è una frase completa?"
       contains_censored_words: "contiene le seguenti parole censurate: %{censored_words}"
-      matches_censored_pattern: "contiene le seguenti parole che coincidono con la regexp di censura del sito: %{censored_words}"
-      less_than: deve essere minore di %{count}
-      less_than_or_equal_to: deve essere minore o uguale a %{count}
+      less_than: "deve essere minore di %{count}"
+      less_than_or_equal_to: "deve essere minore o uguale a %{count}"
       not_a_number: non è un numero
       not_an_integer: deve essere un intero
       odd: deve essere dispari
@@ -116,6 +115,9 @@ it:
       max_username_length_range: "Non puoi impostare il massimo inferiore al minimo."
       default_categories_already_selected: "Non puoi selezionare una categoria usata in un'altra lista."
       s3_upload_bucket_is_required: "Non è possibile attivare i caricamenti da S3 a meno che non imposti l'opzione 's3_upload_bucket'."
+  activemodel:
+    errors:
+      <<: *errors
   invite:
     not_found: "Il tuo token di invito non è valido. Per favore contatta l'amministratore del sito."
     user_exists: "Non c'è bisogno di invitare <b>%{email}</b>, perché <a href='/u/%{username}/summary'>ha già un account!</a>"
@@ -137,8 +139,8 @@ it:
   reading_time: "Tempo di lettura"
   likes: "Mi piace"
   too_many_replies:
-    one: "Spiacenti, ma i nuovi utenti possono inserire solo 1 risposta nello stesso argomento."
-    other: "Spiacenti, ma i nuovi utenti possono inserire solo %{count} risposte nello stesso argomento."
+    one: Spiacenti, ma i nuovi utenti possono inserire solo 1 risposta nello stesso argomento.
+    other: Spiacenti, ma i nuovi utenti possono inserire solo %{count} risposte nello stesso argomento.
   embed:
     start_discussion: "Inizia Discussione"
     continue: "Continua Discussione"
@@ -148,36 +150,35 @@ it:
     no_hosts: "Non sono stati configurati host per l'inclusione."
     configure: "Configura Inclusione"
     more_replies:
-      one: "1 ulteriore risposta"
-      other: "%{count} ulteriori risposte"
+      one: 1 ulteriore risposta
+      other: '%{count} ulteriori risposte'
     loading: "Caricamento Discussione..."
     permalink: "Permalink"
     imported_from: "Questo è un argomento collegato all'originale su: %{link}"
     in_reply_to: "▶ %{username}"
     replies:
-      one: "1 risposta"
-      other: "%{count} risposte"
+      one: 1 risposta
+      other: '%{count} risposte'
   no_mentions_allowed: "Spiacenti, non puoi menzionare altri utenti."
   too_many_mentions:
-    one: "Spiacenti, puoi menzionare al massimo un utente in un messaggio."
-    other: "Spiacenti, puoi menzionare al massimo %{count} utenti in un messaggio."
+    one: Spiacenti, puoi menzionare al massimo un utente in un messaggio.
+    other: Spiacenti, puoi menzionare al massimo %{count} utenti in un messaggio.
   no_mentions_allowed_newuser: "Spiacenti, i nuovi utenti non possono menzionare altri utenti."
   too_many_mentions_newuser:
-    one: "Spiacenti, i nuovi utenti possono menzionare al massimo un utente in un messaggio."
-    other: "Spiacenti, i nuovi utenti possono menzionare al massimo %{count} utenti in un messaggio."
+    one: Spiacenti, i nuovi utenti possono menzionare al massimo un utente in un messaggio.
+    other: Spiacenti, i nuovi utenti possono menzionare al massimo %{count} utenti in un messaggio.
   no_images_allowed: "Spiacenti, i nuovi utenti non possono inserire immagini nei messaggi."
   too_many_images:
-    one: "Spiacenti, i nuovi utenti possono inserire al massimo un'immagine in un messaggio."
-    other: "Spiacenti, i nuovi utenti possono inserire al massimo %{count} immagini in un messaggio."
+    one: Spiacenti, i nuovi utenti possono inserire al massimo un'immagine in un messaggio.
+    other: Spiacenti, i nuovi utenti possono inserire al massimo %{count} immagini in un messaggio.
   no_attachments_allowed: "Spiacenti, i nuovi utenti non possono inserire allegati nei messaggi."
   too_many_attachments:
-    one: "Spiacenti, i nuovi utenti possono inserire al massimo un allegato in un messaggio."
-    other: "Spiacenti, i nuovi utenti possono inserire al massimo %{count} allegati in un messaggio."
+    one: Spiacenti, i nuovi utenti possono inserire al massimo un allegato in un messaggio.
+    other: Spiacenti, i nuovi utenti possono inserire al massimo %{count} allegati in un messaggio.
   no_links_allowed: "Spiacenti, i nuovi utenti non possono inserire collegamenti nei messaggi."
   too_many_links:
-    one: "Spiacenti, i nuovi utenti possono inserire al massimo un collegamento in un messaggio."
-    other: "Spiacenti, i nuovi utenti possono inserire al massimo %{count} collegamenti in un messaggio."
-  contains_blocked_words: "Il tuo messaggio contiene parole che non sono consentite."
+    one: Spiacenti, i nuovi utenti possono inserire al massimo un collegamento in un messaggio.
+    other: Spiacenti, i nuovi utenti possono inserire al massimo %{count} collegamenti in un messaggio.
   spamming_host: "Spiacenti, non puoi inserire un collegamento verso quel dominio."
   user_is_suspended: "Agli utenti sospesi non è permesso creare messaggi."
   topic_not_found: "Quancosa non ha funzionato. Forse questo argomento è stato chiuso o cancellato mentre lo leggevi."
@@ -209,7 +210,6 @@ it:
     top_weekly: "Argomenti di punta settimanali"
     top_daily: "Argomenti di punta giornalieri"
     posts: "Ultimi messaggi"
-    private_posts: "Ultimi messaggi privati"
     group_posts: "Ultimi messaggi da %{group_name}"
     group_mentions: "Ultime menzioni da %{group_name}"
     user_posts: "Ultimi messaggi di @%{username}"
@@ -222,11 +222,8 @@ it:
   queue:
     delete_reason: "Cancellato attraverso la coda di moderazione"
   groups:
-    success:
-      bulk_add: "%{users_added}utentu sono stati aggiunti al gruppo. "
     errors:
       can_not_modify_automatic: "Non puoi modificare un gruppo automatico"
-      member_already_exist: "'%{username}' è già membro di questo gruppo."
       invalid_domain: "'%{domain}' non è un dominio valido."
       invalid_incoming_email: "'%{email}' non è un indirizzo email valido."
       email_already_used_in_group: "L'indirizzo '%{email}' è stato già usato dal gruppo '%{group_name}'."
@@ -246,9 +243,9 @@ it:
       title: "Richesta di Adesione per @%{group_name}"
   education:
     until_posts:
-      one: "1 messaggio"
-      other: "%{count} messaggi"
-    new-topic: |
+      one: 1 messaggio
+      other: '%{count} messaggi'
+    'new-topic': |
       Benvenuto in %{site_name} &mdash; **grazie per iniziare una nuova conversazione!**
 
       - Il titolo sembra interessante? E' un buon riassunto?
@@ -258,7 +255,7 @@ it:
       - Includi delle buone parole di ricerca nell'argomento così gli altri lo potranno *trovare*. Per raggruppare questo argomento con altri argomenti correlati, seleziona una categoria.
 
       Per maggiori informazioni, [leggi le linee guida della comunità](/guidelines). Questo pannello sarà visualizzato solo per i primi %{education_posts_text}.
-    new-reply: |
+    'new-reply': |
       Benvenuto in %{site_name} &mdash; **grazie per il tuo contributo !**
 
       - La tua risposta migliora in qualche modo la conversazione?
@@ -306,13 +303,6 @@ it:
 
       Invece di aggiungere un'altra risposta, per favore considera di modificare le tue precedenti risposte o di visitare altri argomenti.
 
-    reviving_old_topic: |+
-      ### Resuscitare questo argomento?
-
-      L'ultima risposta a questo argomento è vecchia di %{days} giorni. La tua risposta farà tornare l'argomento in cima alla lista e tutti gli utenti coinvolti verranno notificati.
-
-      Sei davvero sicuro di voler continuare questa vecchia conversazione?
-
   activerecord:
     attributes:
       category:
@@ -325,13 +315,12 @@ it:
       user_profile:
         bio_raw: "Su di me"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Puoi allegare solo avvertimenti ai messaggi privati."
               too_many_users: "Puoi inviare avvertimenti ad un solo utente per volta."
-              cant_send_pm: "Spiacenti, non puoi inviare un messaggio privato a quell'utente."
               no_user_selected: "Seleziona un utente valido."
               reply_by_email_disabled: "La risposta via email è stata disabilitata."
             featured_link:
@@ -370,7 +359,6 @@ it:
           attributes:
             word:
               too_many: "Troppe parole per quest'azione"
-      <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>il campo \"Su di me\" del tuo profilo è vuoto, <a href='/u/%{username_lower}/preferences/about-me'>vuoi compilarlo? </a></div>"
     no_info_other: "<div class='missing-profile'>%{name} non ha ancora compilato il campo \"Su di me\" del suo profilo</div>"
@@ -386,41 +374,41 @@ it:
     title: "Benvenuto in Discourse"
     body: |2
 
-      Il primo paragrafo di questo argomento puntato sarà visibile come messaggio di benvenuto a tutti i nuovi visitatori sulla tua homepage. È importante!
+        Il primo paragrafo di questo argomento puntato sarà visibile come messaggio di benvenuto a tutti i nuovi visitatori sulla tua homepage. È importante!
 
-      **Modificalo** con una breve descrizione della tua comunità:
+        **Modificalo** con una breve descrizione della tua comunità:
 
-      - A chi è rivolto?
-      - Cosa possono trovare qui?
-      - Perchè dovrebbero venire qui?
-      - Dove possono leggere di più (collegamenti, risorse, ecc)?
+        - A chi è rivolto?
+        - Cosa possono trovare qui?
+        - Perchè dovrebbero venire qui?
+        - Dove possono leggere di più (collegamenti, risorse, ecc)?
 
-      <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+        <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
 
-      Puoi chiudere questo argomento tramite la :wrench: per amministratori (in alto a destra e in basso), in modo che le risposte non si accumulino all'annuncio.
+        Puoi chiudere questo argomento tramite la :wrench: per amministratori (in alto a destra e in basso), in modo che le risposte non si accumulino all'annuncio.
   lounge_welcome:
     title: "Benvenuto nel Lounge"
     body: |2
 
-      Congratulazioni! :confetti_ball:
+        Congratulazioni! :confetti_ball:
 
-      Se vedi questo argomento, sei stato recentemente promosso a **esperto** (livello di esperienza 3).
+        Se vedi questo argomento, sei stato recentemente promosso a **esperto** (livello di esperienza 3).
 
-      Adesso puoi &hellip;
+        Adesso puoi &hellip;
 
-      * Modificare il titolo di qualunque argomento
-      * Cambiare la categoria di qualunque argomento
-      * Seguire tutti i tuoi collegamenti (è rimosso il [nofollow automatico](http://it.wikipedia.org/wiki/Nofollow) )
-      * Accedere alla categoria privata Lounge visibile solo agli utenti con livello di esperienza 3 o superiore
-      * Cancellare i messaggi spam con un singolo clic
+        * Modificare il titolo di qualunque argomento
+        * Cambiare la categoria di qualunque argomento
+        * Seguire tutti i tuoi collegamenti (è rimosso il [nofollow automatico](http://it.wikipedia.org/wiki/Nofollow) )
+        * Accedere alla categoria privata Lounge visibile solo agli utenti con livello di esperienza 3 o superiore
+        * Cancellare i messaggi spam con un singolo clic
 
-      Ecco l'elenco degli altri [utenti esperti](/badges/3/regular). Vai a salutarli.
+        Ecco l'elenco degli altri [utenti esperti](/badges/3/regular). Vai a salutarli.
 
-      Grazie per essere una parte importante di questa comunità!
+        Grazie per essere una parte importante di questa comunità!
 
-      (Per maggiori informazioni sui livelli di esperienza, [leggi questa discussione][trust]. Nota che possono rimanere utenti esperti solo quegli utenti che continuano a soddisfare i criteri di selezione)
+        (Per maggiori informazioni sui livelli di esperienza, [leggi questa discussione][trust]. Nota che possono rimanere utenti esperti solo quegli utenti che continuano a soddisfare i criteri di selezione)
 
-      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Definizione della categoria %{category}"
     replace_paragraph: "(Sostituisci questo primo paragrafo con una breve descrizione della nuova categoria. Questa guida apparirà nell'area di selezione della categoria, perciò cerca di stare sotto i 200 caratteri. **Finché non modifichi questo testo o non crei argomenti, questa categoria non apparirà sulla pagina delle categorie.**)"
@@ -437,8 +425,8 @@ it:
       uncategorized: "Non puoi eliminare la categoria \"Non classificato\""
       has_subcategories: "Non puoi cancellare questa categoria perché ha sotto-categorie."
       topic_exists:
-        one: "Non puoi eliminare questa categoria perché ha 1 argomento. L'argomento più vecchio è %{topic_link}."
-        other: "Non puoi cancellare questa categoria perché ha %{count} argomenti. L'argomento più vecchio è %{topic_link}."
+        one: Non puoi eliminare questa categoria perché ha 1 argomento. L'argomento più vecchio è %{topic_link}.
+        other: Non puoi cancellare questa categoria perché ha %{count} argomenti. L'argomento più vecchio è %{topic_link}.
       topic_exists_no_oldest: "Non puoi cancellare questa categoria perché il numero di argomenti è di %{count}."
     uncategorized_description: "Argomenti che non necessitano di una categoria, o che non ricadono in nessuna categoria esistente."
   trust_levels:
@@ -457,103 +445,86 @@ it:
     image_placeholder:
       broken: "Questa immagine è assente"
   rate_limiter:
-    slow_down: "Hai eseguito questa operazione troppe volte, riprova più tardi."
-    too_many_requests: "C'è un limite giornaliero su quante volte si può fare questa azione. Per favore attendi %{time_left} prima di riprovare."
-    by_type:
-      first_day_replies_per_day: "Hai raggiunto il massimo numero di risposte che può creare un nuovo utente il suo primo giorno. Per favore attendi %{time_left} prima di riprovare."
-      first_day_topics_per_day: "Hai raggiunto il massimo numero di argomenti che può creare un nuovo utente il suo primo giorno. Per favore attendi %{time_left} prima di riprovare."
-      create_topic: "Stai creando argomenti troppo rapidamente. Attendi %{time_left} prima di riprovare."
-      create_post: "Stai rispondendo troppo rapidamente. Attendi %{time_left} prima di riprovare."
-      delete_post: "Stai cancellando i messaggi troppo velocemente. Per favore attendi %{time_left} prima di riprovare."
-      public_group_membership: "Stai entrando/uscendo dai gruppi troppo di frequente. Per favore aspetta %{time_left} prima di riprovare."
-      topics_per_day: "Hai raggiunto il massimo numero di nuovi argomenti per oggi. Per favore attendi %{time_left} prima di riprovare."
-      pms_per_day: "Hai raggiunto il massimo numero di messaggi per oggi. Per favore attendi %{time_left} prima di riprovare."
-      create_like: "Hai raggiunto il massimo numero di \"Mi piace\" per oggi. Per favore attendi %{time_left} prima di riprovare."
-      create_bookmark: "Hai raggiunto il massimo numero di segnalibri per oggi. Per favore attendi %{time_left} prima di riprovare."
-      edit_post: "Hai raggiunto il massimo numero di modifiche per oggi. Per favore attendi %{time_left} prima di riprovare."
-      live_post_counts: "Stai richiedendo troppo velocemente il conteggio dei messaggi attivi. Attendi %{time_left} prima di riprovare."
-      unsubscribe_via_email: "Hai raggiunto il massimo numero di cancellazioni via email per oggi. Per favore aspetta %{time_left}  prima di riprovare ancora."
-      topic_invitations_per_day: "Hai raggiunto il numero massimo di inviti ad argomenti per oggi. Per favore aspetta %{time_left} prima di riprovare."
     hours:
-      one: "1 ora"
-      other: "%{count} ore"
+      one: 1 ora
+      other: '%{count} ore'
     minutes:
-      one: "1 minuto"
-      other: "%{count} minuti"
+      one: 1 minuto
+      other: '%{count} minuti'
     seconds:
-      one: "1 secondo"
-      other: "%{count} secondi"
+      one: 1 secondo
+      other: '%{count} secondi'
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: "< 1s"
-        other: "< %{count}s"
+        one: < 1s
+        other: < %{count}s
       x_seconds:
-        one: "1s"
-        other: "%{count}s"
+        one: 1s
+        other: '%{count}s'
       less_than_x_minutes:
-        one: "< 1m"
-        other: "< %{count}m"
+        one: < 1m
+        other: < %{count}m
       x_minutes:
-        one: "1m"
-        other: "%{count}m"
+        one: 1m
+        other: '%{count}m'
       about_x_hours:
-        one: "1o"
-        other: "%{count}o"
+        one: 1o
+        other: '%{count}o'
       x_days:
-        one: "1g"
-        other: "%{count}gg"
+        one: 1g
+        other: '%{count}gg'
       about_x_months:
-        one: "1mese"
-        other: "%{count}mesi"
+        one: 1mese
+        other: '%{count}mesi'
       x_months:
-        one: "1mese"
-        other: "%{count}mesi"
+        one: 1mese
+        other: '%{count}mesi'
       about_x_years:
-        one: "1a"
-        other: "%{count}a"
+        one: 1a
+        other: '%{count}a'
       over_x_years:
-        one: "> 1a"
-        other: "> %{count}a"
+        one: '> 1a'
+        other: '> %{count}a'
       almost_x_years:
-        one: "1a"
-        other: "%{count}a"
+        one: 1a
+        other: '%{count}a'
     distance_in_words_verbose:
       half_a_minute: "adesso"
       less_than_x_seconds:
-        one: "adesso"
-        other: "adesso"
+        one: adesso
+        other: adesso
       x_seconds:
-        one: "1 secondo fa"
-        other: "%{count} secondi fa"
+        one: 1 secondo fa
+        other: '%{count} secondi fa'
       less_than_x_minutes:
-        one: "meno di 1 minuto fa"
-        other: "meno di %{count} minuti fa"
+        one: meno di 1 minuto fa
+        other: meno di %{count} minuti fa
       x_minutes:
-        one: "1 minuto fa"
-        other: "%{count} minuti fa"
+        one: 1 minuto fa
+        other: '%{count} minuti fa'
       about_x_hours:
-        one: "1 ora fa"
-        other: "%{count} ore fa"
+        one: 1 ora fa
+        other: '%{count} ore fa'
       x_days:
-        one: "1 giorno fa"
-        other: "%{count} giorni fa"
+        one: 1 giorno fa
+        other: '%{count} giorni fa'
       about_x_months:
-        one: "circa 1 mese fa"
-        other: "circa %{count} mesi fa"
+        one: circa 1 mese fa
+        other: circa %{count} mesi fa
       x_months:
-        one: "1 mese fa"
-        other: "%{count} mesi fa"
+        one: 1 mese fa
+        other: '%{count} mesi fa'
       about_x_years:
-        one: "circa 1 anno fa"
-        other: "circa %{count} anni fa"
+        one: circa 1 anno fa
+        other: circa %{count} anni fa
       over_x_years:
-        one: "più di 1 anno fa"
-        other: "più di %{count} anni fa"
+        one: più di 1 anno fa
+        other: più di %{count} anni fa
       almost_x_years:
-        one: "quasi 1 anno fa"
-        other: "quasi %{count} anni fa"
+        one: quasi 1 anno fa
+        other: quasi %{count} anni fa
   password_reset:
     no_token: "Spiacenti, il collegamento per il cambio password è scaduto. Clicca su Connetti e poi su 'Ho dimenticato la password' per ricevere un nuovo collegamento."
     choose_new: "Scegli una nuova password"
@@ -607,8 +578,6 @@ it:
       long_form: 'segnalato come inappropriato'
     notify_user:
       title: 'Invia un messaggio a @{{username}}'
-      description: 'Vorrei discutere direttamente e privatamente con l''autore di questo messaggio.'
-      short_description: 'Voglio parlare con questa persona direttamente e privatamente a proposito del suo messaggio.'
       long_form: 'messaggio inviato'
       email_title: 'Il tuo messaggio su "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -709,9 +678,7 @@ it:
       xaxis: "Giorno"
       yaxis: "Numero visite"
     signups:
-      title: "Nuovi Utenti"
       xaxis: "Giorno"
-      yaxis: "Numero di nuovi utenti"
     profile_views:
       title: "Visite Profilo Utente"
       xaxis: "Giorno"
@@ -749,7 +716,6 @@ it:
       xaxis: "Giorno"
       yaxis: "Numero di Email"
     user_to_user_private_messages:
-      title: "Utente-a-Utente"
       xaxis: "Giorno"
       yaxis: "Numero di messaggi"
     system_private_messages:
@@ -796,7 +762,6 @@ it:
       xaxis: "Giorno"
       yaxis: "Visualizzazioni pagina da Spider web"
     page_view_total_reqs:
-      title: "Totali"
       xaxis: "Giorno"
       yaxis: "Visualizzazioni pagina totali"
     page_view_logged_in_mobile_reqs:
@@ -860,28 +825,23 @@ it:
     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>.'
     subfolder_ends_in_slash: "L'impostazione della sottocartella è errata; DISCOURSE_RELATIVE_URL_ROOT finisce con uno slash."
     email_polling_errored_recently:
-      one: "Il polling delle email ha generato un errore nelle ultime 24 ore. Controlla <a href='/logs' target='_blank'>i log</a> per maggiori dettagli."
-      other: "Il polling delle email ha generato %{count}errori nelle ultime 24 ore. Controlla <a href='/logs' target='_blank'>i log</a> per maggiori dettagli. "
-    missing_mailgun_api_key: "Il server è configurato per inviare email via mailgun ma non sono state fornite le API key necessarie per verificare i messaggi webhook."
+      one: Il polling delle email ha generato un errore nelle ultime 24 ore. Controlla <a href='/logs' target='_blank'>i log</a> per maggiori dettagli.
+      other: 'Il polling delle email ha generato %{count}errori nelle ultime 24 ore. Controlla <a href=''/logs'' target=''_blank''>i log</a> per maggiori dettagli. '
     bad_favicon_url: "La favicon non si carica. Verifica la configurazione della tua favicon_url in <a href='/admin/site_settings'>Impostazioni del sito</a>."
     poll_pop3_timeout: "La connessione al server POP3 sta scadendo. Le email in entrata non sono state scaricate. Per favore verifica il la tua  <a href='/admin/site_settings/category/email'>configurazione POP3</a> e il fornitore di servizi."
     poll_pop3_auth_error: "La connessione al server POP3 è fallita per un errore di autenticazione. Per favore verifica la tua <a href='/admin/site_settings/category/email'>configurazione POP3</a>."
   site_settings:
     censored_words: "Parole che saranno automaticamente sostituite con &#9632;&#9632;&#9632;&#9632;"
-    censored_pattern: "Pattern regex che sarà automaticamente sostituito con &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Cancella automaticamente tutti i messaggi nascosti che restano nascosti per più di 30 giorni."
-    default_locale: "Il linguaggio di default di questa istanza Discourse (ISO 639-1 Code)"
     allow_user_locale: "Permetti agli utenti di personalizzare la lingua dell'interfaccia"
     set_locale_from_accept_language_header: "imposta la lingua di interfaccia per gli utenti anonimi in base ai language header del loro browser.\n(SPERIMENTALE, non funziona con cache anonima)"
     min_post_length: "Lunghezza minima dei messaggi in caratteri"
     min_first_post_length: "Lunghezza minima del primo messaggio (corpo del testo), in caratteri"
-    min_private_message_post_length: "Lunghezza minima in caratteri per i messaggi"
     max_post_length: "Lunghezza massima dei messaggi in caratteri"
     topic_featured_link_enabled: "Abilita la pubblicazione di collegamenti con gli argomenti."
     show_topic_featured_link_in_digest: "Mostra i collegamenti in primo piano dell'argomento nella email riepilogativa."
     min_topic_title_length: "Numero minimo di caratteri per i titoli degli argomenti"
     max_topic_title_length: "Numero massimo di caratteri per i titoli degli argomenti"
-    min_private_message_title_length: "Numero minimo di caratteri per un messaggio"
     min_search_term_length: "Numero minimo di caratteri per le parole cercate"
     search_tokenize_chinese_japanese_korean: "Attiva la tokenizzazione dei caratteri Cinesi/Giapponesi/Coreani nella ricerca anche sui siti non CJK"
     search_prefer_recent_posts: "Se il tuo forum è corposo e la ricerca è lenta, questa opzione tenta di indicizzare prima i messaggi più recenti"
@@ -936,8 +896,6 @@ it:
     summary_likes_required: "Minimo numero di \"Mi piace\" in un argomento affinché venga abilitato 'Riassumi Questo Argomento'"
     summary_percent_filter: "Quando un utente clicca su 'Riassumi Questo Argomento', mostra i primi % messaggi"
     summary_max_results: "Massimo numero di messaggi mostrati in 'Riassumi Argomento'"
-    enable_private_messages: "Autorizza gli utenti con livello di esperienza 1  (configurabile attraverso \"min livello di esperienza per l'invio di messaggi\") a creare e rispondere ai messaggi. Nota che lo staff può inviare messaggi in ogni caso."
-    enable_private_email_messages: "Consenti agli utenti a livello di esperienza 4 (configurabile attraverso \"min trust level to send messages\") di inviare messaggi privati via email . Nota che lo staff può inviare messaggi in ogni caso."
     enable_long_polling: "Il message bus per le notifiche può usare il long polling"
     long_polling_base_url: "URL di base usato per il long polling (quando una CDN serve contenuto dinamico, bisogna impostarlo come origin pull) es. http://origin.site.com"
     long_polling_interval: "Tempo di attesa prima che il server risponda ai client che non ci sono dati da trasmettere (solo per utenti autenticati)"
@@ -958,7 +916,6 @@ it:
     notify_mods_when_user_silenced: "Se un utente è silenziato automaticamente, manda un messaggio ai moderatori."
     flag_sockpuppets: "Se un nuovo utente risponde ad un argomento dallo stesso indirizzo IP dell'utente che ha aperto l'argomento stesso, segnala entrambi i messaggi come potenziale spam."
     traditional_markdown_linebreaks: "Usa l'accapo tradizionale in Markdown, cioè due spazi a fine riga per andare a capo."
-    enable_markdown_typographer: "Utilizza regole tipografiche di base per migliorare la leggibilità dei paragrafi di testo, sostituire (c) (tm) ecc, con simboli, ridurre il numero di punti interrogativi e così via"
     post_undo_action_window_mins: "Numero di minuti durante i quali gli utenti possono annullare le loro azioni recenti su un messaggio (segnalazioni, Mi piace, ecc.)."
     must_approve_users: "Lo staff deve approvare tutti i nuovi account utente prima che essi possano accedere al sito. ATTENZIONE: abilitare l'opzione per un sito live revocherà l'accesso per tutti gli utenti non-staff esistenti!"
     pending_users_reminder_delay: "Notifica i moderatori se nuovi utenti sono in attesa di approvazione per più di queste ore. Imposta a -1 per disabilitare le notifiche."
@@ -1002,7 +959,6 @@ it:
     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."
     invite_expiry_days: "Per quanti giorni le chiavi per inviti utente sono valide"
-    invite_passthrough_hours: "Per quanto tempo un utente può usare una chiave d'invito per connettersi, espresso in ore"
     invite_only: "La registrazione pubblica è disabilitata, tutti i nuovi utenti devono essere esplicitamente invitati dallo staff."
     login_required: "E' richiesta l'autenticazione per leggere contenuti su questo sito, disabilita l'accesso anonimo."
     min_username_length: "Lunghezza minima di un nome utente in caratteri. ATTENZIONE: se utenti o gruppi già esistenti hanno nomi più brevi di questo, il tuo sito si romperà!"
@@ -1024,7 +980,6 @@ it:
     sso_overrides_avatar: "Sostituisce l'avatar dell'utente con un avatar su un sito esterno usando SSO. Se abilitato, si raccomanda di disabilitare allow_uploaded_avatars"
     sso_not_approved_url: "Ridirigi a questa URL gli account SSO non approvati"
     sso_allows_all_return_paths: "Non restringere il dominio per i return_paths forniti da SSO (per default il return path deve essere sul sito corrente)"
-    enable_local_logins: "Abilita la connessione degli account con nome utente e password locali. (Nota: deve essere abilitato affinché funzionino gli inviti)"
     allow_new_registrations: "Abilita la registrazione di nuovi utenti. Se deselezionato, non sarà possibile creare nuovi account."
     enable_signup_cta: "Mostra una notifica agli utenti anonimi che ritornano chiedendo loro di registrare un account."
     enable_yahoo_logins: "Abilita l'autenticazione con Yahoo"
@@ -1032,15 +987,12 @@ it:
     google_oauth2_client_id: "Client ID della tua applicazione Google."
     google_oauth2_client_secret: "Client secret della tua applicazione Google."
     enable_twitter_logins: "Abilita l'autenticazione con Twitter, richiede twitter_consumer_key e twitter_consumer_secret"
-    twitter_consumer_key: "Consumer key per autenticazione via Twitter, come registrata su http://dev.twitter.com"
-    twitter_consumer_secret: "Consumer secret per autenticazione via Twitter, come registrata su  http://dev.twitter.com"
     enable_instagram_logins: "Abilita l'autenticazione con Instagram, richiede la instagram_consumer_key e la instagram_consumer_secret"
     instagram_consumer_key: "La consumer key per autenticazione Instagram"
     instagram_consumer_secret: "La consumer secret per l'autenticazione Instagram"
     enable_facebook_logins: "Abilita l'autenticazione via Facebook, richiede facebook_app_id e facebook_app_secret"
     facebook_app_id: "App id per autenticazione Facebook, come registrata su  https://developers.facebook.com/apps"
     facebook_app_secret: "App secret per autenticazione Facebook, come registrata su https://developers.facebook.com/apps"
-    facebook_request_extra_profile_details: "Richiedi i miei dati, posizione e sito web da facebook (richiede che la tua applicazione auth sia approvata da facebook)."
     enable_github_logins: "Abilita l'autenticazione via Github, richiede github_client_id e github_client_secret"
     github_client_id: "Client id per autenticazione Github, come registrata su https://github.com/settings/applications"
     github_client_secret: "Client secret per autenticazione Github, come registrata su  https://github.com/settings/applications"
@@ -1048,7 +1000,6 @@ it:
     allow_restore: "Abilita il ripristino, che sostituisce TUTTI i dati del sito! Lascia a falso a meno che non hai intenzione di ripristinare un backup."
     maximum_backups: "Il numero massimo di backup da mantenere sul disco. I backup più vecchi vengono automaticamente cancellati."
     automatic_backups_enabled: "Esegui backup automatici come definito nella frequenza di backup"
-    backup_frequency: "Con che frequenza, in giorni, effettuiamo il backup del sito."
     enable_s3_backups: "Carica i backup su S3 quando completati. IMPORTANTE: richiede che siano inserite valide credenziali S3 nelle impostazioni File."
     s3_backup_bucket: "Il bucket remoto che contiene i backup. ATTENZIONE: assicurati che sia un bucket privato."
     s3_disable_cleanup: "Disabilita la rimozione dei backup da S3 quando rimossi localmente."
@@ -1070,7 +1021,6 @@ it:
     max_bookmarks_per_day: "Massimo numero di segnalibri per utente al giorno."
     max_edits_per_day: "Massimo numero di modifiche per utente al giorno."
     max_topics_per_day: "Massimo numero di argomenti che un utente può creare al giorno."
-    max_private_messages_per_day: "Numero massimo di messaggi che gli utenti possono creare al giorno."
     max_invites_per_day: "Numero massimo di inviti che un utente può inviare in un giorno."
     max_topic_invitations_per_day: "Numero massimo di inviti ad argomenti che un utente può inviare al giorno."
     max_logins_per_ip_per_hour: "Numero massimo di accessi consentiti per indirizzo Ip per ora"
@@ -1086,7 +1036,6 @@ it:
     purge_deleted_uploads_grace_period_days: "Dopo quanti giorni un caricamento cancellato viene rimosso."
     purge_unactivated_users_grace_period_days: "Il periodo di grazia (in giorni) prima che un utente che non ha attivato il suo account venga eliminato. Impostare su 0 per non eliminare mai gli utenti non attivati."
     enable_s3_uploads: "Mette i caricamenti sullo spazio disco Amazon S3. IMPORTANTE: richiede che siano inserite valide credenziali S3 (sia l'access key id sia l'access key secret)."
-    s3_use_iam_profile: 'Usa il ruolo AWS EC2 IAM per recuperare le chiavi. NOTA: abilitarla sovrascriverà le impostazioni "s3 access key id" e "s3 secret access key". '
     s3_upload_bucket: "Il nome del bucket Amazon S3 sul quale verranno caricati i file. ATTENZIONE: deve essere tutto minuscolo, senza punti, senza trattini bassi."
     s3_access_key_id: "La access key id Amazon S3 che verrà usata per caricare le immagini."
     s3_secret_access_key: "La access key secret Amazon S3 che verrà usata per caricare le immagini."
@@ -1132,8 +1081,6 @@ it:
     min_trust_to_edit_wiki_post: "Livello minimo richiesto per modificare un argomento segnato come wiki."
     min_trust_to_edit_post: "Il livello di esperienza minimo richiesto per modificare i messaggi."
     min_trust_to_allow_self_wiki: "Il livello di esperienza minimo richiesto per consentire agli utenti di pubblicare una propria wiki."
-    min_trust_to_send_messages: "Il livello di esperienza minimo richiesto per creare nuovi messaggi privati."
-    min_trust_to_send_email_messages: " Il livello di esperienza minimo richiesto per inviare nuovi messaggi privati via email (a utenti temporanei)."
     newuser_max_links: "Quanti collegamenti può aggiungere a un messaggio un nuovo utente ."
     newuser_max_images: "Quante immagini può aggiungere ad un messaggio un nuovo utente."
     newuser_max_attachments: "Quanti allegati può aggiungere ad un messaggio un nuovo utente."
@@ -1143,7 +1090,6 @@ it:
     max_users_notified_per_group_mention: "Massimo numero di utenti che possono ricevere una notifica se un gruppo è menzionato (se la soglia è raggiunta, nessuna notifica verrà inviata)"
     create_thumbnails: "Crea anteprime e lightbox delle immagini che sono troppo grandi per essere contenute in un messaggio."
     email_time_window_mins: "Aspetta (n) minuti prima di inviare email di notifica, per dare agli utenti la possibilità di modificare e completare i loro messaggi."
-    private_email_time_window_seconds: "Attendi (n) secondi prima di inviare una notifica privata per email, per dare agli utenti la possibilità di modificare e finalizzare i loro messaggi."
     email_posts_context: "Quante risposte precedenti inserire come contesto nelle email di notifica."
     flush_timings_secs: "Frequenza di svuotamento dei dati temporali verso il server, in secondi."
     title_max_word_length: "La lunghezza massima di una parola, in caratteri, nel titolo di un argomento."
@@ -1200,7 +1146,6 @@ it:
     reply_by_email_enabled: "Abilita la possibilità di rispondere ai messaggi tramite email."
     reply_by_email_address: "Modello per rispondere via email, per esempio: %{reply_key}@risposta.esempio.com o risposte+%{reply_key}@esempio.com"
     alternative_reply_by_email_addresses: "Elenco dei template alternativi per la risposta via email in arrivo da indirizzi email. Esempio: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
-    incoming_email_prefer_html: "Usa l'HTML invece del testo per le email in arrivo."
     disable_emails: "Evita che Discourse invii qualunque tipo di email"
     strip_images_from_short_emails: "Elimina le immagini dalle email aventi dimensione inferiore a 2800 Byte."
     short_email_length: "Lunghezza delle email brevi in Byte"
@@ -1303,7 +1248,6 @@ it:
     allowed_href_schemes: "Schemi consentiti nei collegamenti in aggiunta a http e https."
     embed_post_limit: "Numero massimo di messaggi da incorporare."
     embed_username_required: "E' richiesto il nome utente per la creazione di argomenti."
-    notify_about_flags_after: "Se ci sono segnalazioni che non sono state revisionate dopo un tale numero di ore, invia un messaggio privato allo staff. Imposta a 0 per disattivare. "
     show_create_topics_notice: "Se il sito ha meno di 5 argomenti pubblici, mostra un avviso chiedendo agli amministratori di creare qualche argomento."
     delete_drafts_older_than_n_days: Elimina bozze più vecchie di (n) giorni.
     bootstrap_mode_min_users: "Numero minimo di utenti richiesto per disabilitare la modalità bootstrap (imposta a 0 per disattivare)"
@@ -1315,7 +1259,6 @@ it:
     approve_post_count: "La quantità di messaggi di un utente nuovo o di base che deve essere approvata"
     approve_unless_trust_level: "I messaggi degli utenti al di sotto di questo livello di esperienza devono essere approvati"
     approve_new_topics_unless_trust_level: "I nuovi argomenti degli utenti al di sotto di questo livello di esperienza devono essere approvati"
-    notify_about_queued_posts_after: "Se ci sono messaggi che devono essere revisionati dopo un tale numero di ore, una email verrà inviata a contact_email. Imposta a 0 per disattivare queste email."
     auto_close_messages_post_count: "Numero massimo di messaggi consentiti in un messaggio privato prima di essere automaticamente chiuso (0 per disabilitare)"
     auto_close_topics_post_count: "Numero massimo di messaggi consentiti in un argomento prima di essere automaticamente chiuso (0 per disabilitare)"
     code_formatting_style: "Il pulsante del testo preformattato nel composer verrà predefinito a questo stile di formattazione del codice"
@@ -1323,7 +1266,6 @@ it:
     watched_words_regular_expressions: "Le parole osservate sono espressioni regolari."
     default_email_digest_frequency: "Con quale frequenza gli utenti ricevono email riepilogative di default."
     default_include_tl0_in_digests: "Per impostazione predefinita, includi i messaggi dei nuovi utenti nelle email riepilogative. Gli utenti possono modificare questa impostazione nelle loro preferenze"
-    default_email_private_messages: " Invia una email quando qualcuno scrive un messaggio ad un utente di default."
     default_email_direct: "Invia una email quando qualcuno cita/risponde/menziona un utente di default."
     default_email_mailing_list_mode: "Invia una email per ogni nuovo messaggio di default."
     default_email_mailing_list_mode_frequency: "Con quale frequenza gli utenti che hanno attivato la modalità mailing list riceveranno email di default."
@@ -1360,7 +1302,6 @@ it:
     max_tags_in_filter_list: "Numero massimo di etichette da mostrare nell'elenco a discesa del filtro. Saranno mostrate le etichette più usate."
     tags_sort_alphabetically: "Mostra le etichette in ordine alfabetico. Per default vengono mostrate in ordine di popolarità."
     tag_style: "Stile grafico dei distintivi relativi alle etichette."
-    staff_tags: "Un elenco di etichette che possono essere usate soltanto dai membri dello staff"
     min_trust_level_to_tag_topics: "Livello di esperienza minimo richiesto per etichettare argomenti"
     suppress_overlapping_tags_in_list: "Se le etichette corrispondono alle esatte parole nei titoli degli argomenti, non mostrare l'etichetta"
     remove_muted_tags_from_latest: "Non mostrare argomenti contrassegnati con etichette silenziate nella lista degli argomenti recenti."
@@ -1418,18 +1359,18 @@ it:
     not_seen_in_a_month: "Bentornato! Non ti si vede da un po'. Questi sono gli argomenti più popolari da quando sei stato via."
   merge_posts:
     edit_reason:
-      one: "A post was merged in by %{username}"
-      other: "%{count} messaggi sono stati fusi da %{username}"
+      one: A post was merged in by %{username}
+      other: '%{count} messaggi sono stati fusi da %{username}'
     errors:
       different_topics: "I messaggi appartenenti a diversi argomenti non possono essere fusi."
       different_users: "I messaggi appartenenti a diversi utenti non possono essere fusi."
   move_posts:
     new_topic_moderator_post:
-      one: "Un messaggio è stato spostato in un nuovo argomento: %{topic_link}"
-      other: "%{count} messaggi sono stati spostati in un nuovo argomento: %{topic_link}"
+      one: 'Un messaggio è stato spostato in un nuovo argomento: %{topic_link}'
+      other: '%{count} messaggi sono stati spostati in un nuovo argomento: %{topic_link}'
     existing_topic_moderator_post:
-      one: "Un messaggio è stato fuso in un argomento esistente: %{topic_link}"
-      other: "%{count} messaggi sono stati fusi in un argomento esistente: %{topic_link}"
+      one: 'Un messaggio è stato fuso in un argomento esistente: %{topic_link}'
+      other: '%{count} messaggi sono stati fusi in un argomento esistente: %{topic_link}'
   change_owner:
     post_revision_text: "Proprietà trasferita da %{old_user} a %{new_user}"
     deleted_user: "un utente eliminato"
@@ -1439,47 +1380,47 @@ it:
     closed_enabled: "Questo argomento è stato chiuso. Non è più possibile inviare risposte."
     closed_disabled: "Questo argomento è stato aperto. È di nuovo possibile rispondere."
     autoclosed_message_max_posts:
-      one: "Questo messaggio è stato chiuso automaticamente per aver raggiunto il limite massimo di 1 risposta."
-      other: "Questo messaggio è stato chiuso automaticamente per aver raggiunto il limite massimo di %{count} risposte."
+      one: Questo messaggio è stato chiuso automaticamente per aver raggiunto il limite massimo di 1 risposta.
+      other: Questo messaggio è stato chiuso automaticamente per aver raggiunto il limite massimo di %{count} risposte.
     autoclosed_topic_max_posts:
-      one: "Questo argomento è stato chiuso automaticamente per aver raggiunto il limite massimo di 1 risposta."
-      other: "Questo argomento è stato chiuso automaticamente per aver raggiunto il limite massimo di %{count} risposte."
+      one: Questo argomento è stato chiuso automaticamente per aver raggiunto il limite massimo di 1 risposta.
+      other: Questo argomento è stato chiuso automaticamente per aver raggiunto il limite massimo di %{count} risposte.
     autoclosed_enabled_days:
-      one: "Questo argomento è stato automaticamente chiuso dopo un giorno. Non sono permesse altre risposte."
-      other: "Questo argomento è stato automaticamente chiuso dopo %{count} giorni. Non sono permesse altre risposte."
+      one: Questo argomento è stato automaticamente chiuso dopo un giorno. Non sono permesse altre risposte.
+      other: Questo argomento è stato automaticamente chiuso dopo %{count} giorni. Non sono permesse altre risposte.
     autoclosed_enabled_hours:
-      one: "Questo argomento è stato automaticamente chiuso dopo un'ora. Non sono permesse altre risposte."
-      other: "Questo argomento è stato automaticamente chiuso dopo %{count} ore. Non sono permesse altre risposte."
+      one: Questo argomento è stato automaticamente chiuso dopo un'ora. Non sono permesse altre risposte.
+      other: Questo argomento è stato automaticamente chiuso dopo %{count} ore. Non sono permesse altre risposte.
     autoclosed_enabled_minutes:
-      one: "Questo argomento è stato automaticamente chiuso dopo un minuto. Non sono permesse altre risposte."
-      other: "Questo argomento è stato automaticamente chiuso dopo %{count} minuti. Non sono permesse altre risposte."
+      one: Questo argomento è stato automaticamente chiuso dopo un minuto. Non sono permesse altre risposte.
+      other: Questo argomento è stato automaticamente chiuso dopo %{count} minuti. Non sono permesse altre risposte.
     autoclosed_enabled_lastpost_days:
-      one: "Questo argomento è stato automaticamente chiuso un giorno dopo l'ultima risposta. Non sono permesse altre risposte."
-      other: "Questo argomento è stato automaticamente chiuso %{count} giorni dopo l'ultima risposta. Non sono permesse altre risposte."
+      one: Questo argomento è stato automaticamente chiuso un giorno dopo l'ultima risposta. Non sono permesse altre risposte.
+      other: Questo argomento è stato automaticamente chiuso %{count} giorni dopo l'ultima risposta. Non sono permesse altre risposte.
     autoclosed_enabled_lastpost_hours:
-      one: "Questo argomento è stato automaticamente chiuso un'ora dopo l'ultima risposta. Non sono permesse altre risposte."
-      other: "Questo argomento è stato automaticamente chiuso %{count} ore dopo l'ultima risposta. Non sono permesse altre risposte."
+      one: Questo argomento è stato automaticamente chiuso un'ora dopo l'ultima risposta. Non sono permesse altre risposte.
+      other: Questo argomento è stato automaticamente chiuso %{count} ore dopo l'ultima risposta. Non sono permesse altre risposte.
     autoclosed_enabled_lastpost_minutes:
-      one: "Questo argomento è stato automaticamente chiuso un minuto dopo l'ultima risposta. Non sono permesse altre risposte."
-      other: "Questo argomento è stato automaticamente chiuso %{count} minuti dopo l'ultima risposta. Non sono permesse altre risposte."
+      one: Questo argomento è stato automaticamente chiuso un minuto dopo l'ultima risposta. Non sono permesse altre risposte.
+      other: Questo argomento è stato automaticamente chiuso %{count} minuti dopo l'ultima risposta. Non sono permesse altre risposte.
     autoclosed_disabled_days:
-      one: "This topic was automatically opened after 1 day."
-      other: "Questo argomento è stato aperto automaticamente dopo %{count} giorni."
+      one: This topic was automatically opened after 1 day.
+      other: Questo argomento è stato aperto automaticamente dopo %{count} giorni.
     autoclosed_disabled_hours:
-      one: "This topic was automatically opened after 1 hour."
-      other: "Questo argomento è stato aperto automaticamente dopo %{count} ore."
+      one: This topic was automatically opened after 1 hour.
+      other: Questo argomento è stato aperto automaticamente dopo %{count} ore.
     autoclosed_disabled_minutes:
-      one: "This topic was automatically opened after 1 minute."
-      other: "Questo argomento è stato aperto automaticamente dopo %{count} minuti."
+      one: This topic was automatically opened after 1 minute.
+      other: Questo argomento è stato aperto automaticamente dopo %{count} minuti.
     autoclosed_disabled_lastpost_days:
-      one: "This topic was automatically opened 1 day after the last reply."
-      other: "Questo argomento è stato aperto automaticamente %{count} giorni dopo l'ultima risposta."
+      one: This topic was automatically opened 1 day after the last reply.
+      other: Questo argomento è stato aperto automaticamente %{count} giorni dopo l'ultima risposta.
     autoclosed_disabled_lastpost_hours:
-      one: "This topic was automatically opened 1 hour after the last reply."
-      other: "Questo argomento è stato aperto automaticamente %{count} ore dopo l'ultima risposta."
+      one: This topic was automatically opened 1 hour after the last reply.
+      other: Questo argomento è stato aperto automaticamente %{count} ore dopo l'ultima risposta.
     autoclosed_disabled_lastpost_minutes:
-      one: "Questo argomento è stato aperto automaticamente 1 minuto dopo l'ultima risposta."
-      other: "This topic was automatically opened %{count} minutes after the last reply."
+      one: Questo argomento è stato aperto automaticamente 1 minuto dopo l'ultima risposta.
+      other: This topic was automatically opened %{count} minutes after the last reply.
     autoclosed_disabled: "Questo argomento è ora aperto. Sono permesse altre risposte."
     autoclosed_disabled_lastpost: "Questo argomento è ora aperto. Sono permesse altre risposte."
     pinned_enabled: "Questo argomento è stato puntato. Sarà mostrato in cima alla sua categoria finché non sarà spuntato da un membro dello staff - e allora varrà per tutti - oppure dai singoli utenti - e varrà solo per loro stessi."
@@ -1546,11 +1487,11 @@ it:
       fixed_primary_email: "Risolto il problema dell'email principale per l'utente temporaneo"
   flags_reminder:
     flags_were_submitted:
-      one: "Flags were submitted over 1 hour ago. [Please review them](/admin/flags)."
-      other: "Delle segnalazioni sono state inviate oltre %{count} ore fa. [Per favore, revisionale](/admin/flags)."
+      one: Flags were submitted over 1 hour ago. [Please review them](/admin/flags).
+      other: Delle segnalazioni sono state inviate oltre %{count} ore fa. [Per favore, revisionale](/admin/flags).
     subject_template:
-      one: "1 segnalazione in attesa di essere revisionata"
-      other: "%{count} segnalazioni in attesa di essere revisionate"
+      one: 1 segnalazione in attesa di essere revisionata
+      other: '%{count} segnalazioni in attesa di essere revisionate'
   unsubscribe_mailer:
     title: "Annullare Iscrizione Mailer"
     subject_template: "Conferma che non desideri più ricevere aggiornamenti via email da %{site_title}"
@@ -1601,47 +1542,6 @@ it:
   test_mailer:
     title: "Test Mailer"
     subject_template: "[%{email_prefix}] Test di Consegna Email"
-    text_body_template: |
-      Questa è una email di prova inviata da
-
-      [**%{base_url}**][0]
-
-      Il recapito di email è complesso. Ecco alcune cose importanti che dovresti controllare prima::
-
-      - Sii *certo* di aver impostato `notification email`  from: indirizzo correttamente nelle impostazioni del tuo sito. **Il dominio specificato nell'indirizzo "from" delle email inviate è il dominio in cui verranno convalidate le tue email**.
-
-      - Impara a visualizzare il contenuto originale delle email nel tuo client email, in questo modo potrai controllare la presenza di eventuali errori. In Gmail puoi usare il tasto "Mostra Originale" presente nel menù a tendina di ogni email.
-
-      - **IMPORTANTE:** Il tuo ISP ha un record DNS inverso per associare il nome del dominio e l'indirizzo ip dal quale invii le email? [Controlla il tuo record inverso PTR][2] qui. Se il tuo ISP non inserisce il record DNS inverso appropriato è molto improbabile che le tue email verranno recapitate.
-
-      - Il [record SPF][8] del tuo dominio è corretto? [Controlla il tuo record SPF][1] qui. Tieni presente che TXT è il tipo di record ufficiale corretto per SPF.
-
-      - Il [record DKIM][3] del tuo dominio è corretto? Questo migliorerà significativamente il recapito delle email. [Controlla il tuo record DKIM][7] qui.
-
-      - Se usi un tuo mail server, verifica che gli IP del tuo mail server [non siano in nessuna blacklist][4]. Verifica inoltre che il tuo mail server stia inviando un hostname pienamente qualificato che abbia una risoluzione nel DNS nel suo messaggio HELO. Se questo non avviene, è molto provabile che le tue email verranno scartate da molte caselle email.
-
-      - Ti raccomandiamo di **inviare una email di prova a [mail-tester.com][mt]** per verificare che tutte le operazioni sopra indicate funzionino correttamente.
-
-      (Il modo più *semplice* è quello di creare un account free su [SendGrid][sg], [SparkPost][sp], [Mailgun][mg] o [Mailjet][mj], che hanno un generoso piano gratuito che andrà bene per i forum più piccoli. Attenzione che dovrai comunque impostare i tuoi record SPF e DKIM nel DNS!)
-
-      Speriamo tu abbia ricevuto questo test di recapito email!
-
-      Buona fortuna,
-
-      I tuoi amici di [Discourse](http://www.discourse.org)
-
-      [0]: %{base_url}
-      [1]: http://www.kitterman.com/spf/validate.html
-      [2]: http://mxtoolbox.com/ReverseLookup.aspx
-      [3]: http://www.dkim.org/
-      [4]: http://whatismyipaddress.com/blacklist-check
-      [7]: https://www.mail-tester.com/spf-dkim-check
-      [8]: http://www.openspf.org/SPF_Record_Syntax
-      [sg]: https://goo.gl/r1WMF6
-      [sp]: https://www.sparkpost.com/
-      [mg]: http://www.mailgun.com/
-      [mj]: https://www.mailjet.com/pricing
-      [mt]: http://www.mail-tester.com/
   new_version_mailer:
     title: "Mailer Nuova Versione"
     subject_template: "[%{email_prefix}] Nuova versione di Discourse, aggiornamento disponibile"
@@ -1660,8 +1560,8 @@ it:
     deferred: "Grazie per averci informato. Stiamo provvedendo."
     deferred_and_deleted: "Grazie per averci informato. Abbiamo rimosso il messaggio."
   temporarily_closed_due_to_flags:
-    one: "Questo argomento resterà temporaneamente chiuso per 1 ora per via di un elevato numero di segnalazioni da parte della comunità. "
-    other: "Questo argomento resterà temporaneamente chiuso per %{count}ore per via di un elevato numero di segnalazioni da parte della comunità. "
+    one: 'Questo argomento resterà temporaneamente chiuso per 1 ora per via di un elevato numero di segnalazioni da parte della comunità. '
+    other: 'Questo argomento resterà temporaneamente chiuso per %{count}ore per via di un elevato numero di segnalazioni da parte della comunità. '
   system_messages:
     private_topic_title: "Argomento #%{id}"
     contents_hidden: "Visita il messaggio per vederne i contenuti."
@@ -1764,7 +1664,6 @@ it:
         ```
     csv_export_succeeded:
       title: "Esportazione CSV Riuscita"
-      subject_template: "Esportazione dati completa"
       text_body_template: |
         L'esportazione dei tuoi dati è avvenuta con successo! :dvd:
 
@@ -1995,8 +1894,8 @@ it:
     pending_users_reminder:
       title: "Promemoria Utenti in Sospeso"
       subject_template:
-        one: "1 utente in attesa di approvazione"
-        other: "%{count} utenti in attesa di approvazione"
+        one: 1 utente in attesa di approvazione
+        other: '%{count} utenti in attesa di approvazione'
       text_body_template: |
         Ci sono nuove iscrizioni in attesa di essere approvate (o rifiutate) prima che possano accedere a questo forum.
 
@@ -2024,8 +1923,8 @@ it:
     queued_posts_reminder:
       title: "Promemoria Messaggi in Coda"
       subject_template:
-        one: "messaggi in attesa di essere revisionati "
-        other: "%{count} messaggi in attesa di essere revisionati"
+        one: 'messaggi in attesa di essere revisionati '
+        other: '%{count} messaggi in attesa di essere revisionati'
       text_body_template: |
         Ciao,
 
@@ -2043,8 +1942,8 @@ it:
   user_notifications:
     previous_discussion: "Risposte Precedenti"
     reached_limit:
-      one: "Heads up: We send a maximum of 1 daily email. Check the site to see the ones that might be held back."
-      other: "Avvertimento: Inviamo un massimo di  %{count} email giornaliere. Controlla il sito per vedere quelle che potrebbero essere state trattenute. PS grazie per essere popolare!"
+      one: 'Heads up: We send a maximum of 1 daily email. Check the site to see the ones that might be held back.'
+      other: 'Avvertimento: Inviamo un massimo di  %{count} email giornaliere. Controlla il sito per vedere quelle che potrebbero essere state trattenute. PS grazie per essere popolare!'
     in_reply_to: "In Risposta A"
     unsubscribe:
       title: "Annulla iscrizione"
@@ -2225,7 +2124,7 @@ it:
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
-        %{message}
+          %{message}
     account_suspended:
       title: "Account Sospeso"
       subject_template: "[%{email_prefix}] Il tuo account è stato sospeso"
@@ -2344,21 +2243,6 @@ it:
     signup_after_approval:
       title: "Iscrizione Dopo Approvazione"
       subject_template: "Sei stato ammesso su %{site_name}!"
-      text_body_template: |
-        Benvenuto su %{site_name}!
-
-        Un membro dello staff ha approvato il tuo account su  %{site_name}.
-
-        Clicca sul seguente collegamento per confermare e attivare il tuo nuovo account:
-        %{base_url}/u/activate-account/%{email_token}
-
-        Se il collegamento qui sopra non è cliccabile, prova a copiarlo e incollarlo nella barra degli indirizzi del tuo browser.
-
-        %{new_user_tips}
-
-        Noi crediamo da sempre in un [comportamento comunitario civile](%{base_url}/guidelines).
-
-        Buona permanenza!
     signup:
       title: "Iscrizione"
       subject_template: "[%{email_prefix}] Conferma il tuo nuovo account"
@@ -2545,141 +2429,6 @@ it:
       Sì, l'avvocatese è noioso, ma ci dobbiamo proteggere &ndash; e, per estensione, proteggere anche te ed i tuoi dati &ndash; contro persone non amichevoli. Abbiamo dei [Termini di Servizio](/tos) che descrivono il tuo (e il nostro) comportamento ed i diritti che riguardano i contenuti, la privacy e le leggi. Per poter usare questo servizio, devi accettare i nostri [TDS](/tos)
   tos_topic:
     title: "Termini del Servizio"
-    body: |
-      I seguenti termini e condizioni regolano l’uso del sito web %{company_domain} e di tutti i contenuti, i servizi e i prodotti disponibili direttamente sul sito web e mediante di esso, compresi, ma non limitatamente a, il Software Forum di %{company_domain}, il Forum di Supporto di %{company_domain} e il Servizio Hosting ("Hosting") di %{company_domain} (collettivamente chiamati nel seguito il Sito). Il Sito è di proprietà ed è gestito da %{company_full_name} ("%{company_name}"). L’uso del Sito è soggetto all’accettazione incondizionata di tutti i termini e le condizioni previsti nel presente documento e di tutte le altre regole operative, le politiche (incluse, senza limitazione, la [Politica sulla Privacy](/privacy) di %{company_domain}e le [Linee guida della comunità](/faq)) e le procedure che possono essere pubblicate di volta in volta su questo Sito da %{company_name} (nel seguito, il “Contratto”).
-
-      Leggi il presente Contratto prima di accedere o utilizzare il Sito. L’accesso o l’utilizzo di qualsiasi parte del Sito implica l’accettazione dei termini e delle condizioni del presente contratto. In caso di mancata accettazione di tutti i termini e le condizioni del presente contratto, l’accesso al Sito o l’uso di qualsiasi servizio potrebbe non essere consentito. Se questi termini e condizioni sono considerati un’offerta di %{company_name}, l’accettazione è espressamente limitata ai presenti termini. Il Sito è disponibile solo per gli utenti con almeno 13 anni di età.
-
-      <a name="1"></a>
-
-      ## [1. Il tuo Account su %{company_domain}](#1)
-
-      Se crei un account sul Sito, è tua responsabilità mantenere la sicurezza dell’account e sei interamente responsabile di tutte le attività eseguite con l’account. L’utente è tenuto a notificare immediatamente a %{company_name} usi non autorizzati dell’account o altre violazioni della sicurezza. %{company_name} non sarà responsabile per qualsiasi atto od omissione da parte tua, inclusi eventuali danni di qualsiasi tipo derivanti da tali atti o omissioni.
-
-      <a name="2"></a>
-
-      ## [2. Responsabilità dei Collaboratori](#2)
-
-      Se pubblichi materiale o inserisci collegamenti sul Sito o rendi disponibile in altro modo (o consenti a terzi di rendere disponibile) materiale mediante il Sito (qualsiasi materiale di questo tipo, nel seguito chiamato il “Contenuto”), sei interamente responsabile del Contenuto e di qualsiasi danno risultante da tale Contenuto. Ciò è valido indipendentemente dalla circostanza in cui il Contenuto in questione sia costituito da testo, grafica, file audio o software informatico. Rendendo disponibile il Contenuto, l’utente dichiara e garantisce che:
-
-      *   il download, la copia e l’uso del Contenuto non viola i diritti di proprietà, inclusi ma non limitatamente a, il copyright, i brevetti, i diritti di marchi di fabbrica o di segreti commerciali di terze parti;
-      *   se il tuo datore di lavoro è titolare dei diritti sulla proprietà intellettuale creata da te, allora delle due l’una, o (i) hai ottenuto il permesso dal datore di lavoro di pubblicare o rendere disponibile il Contenuto, incluso ma non limitatamente a, qualsiasi software oppure (ii) che hai ottenuto dal datore di lavoro una rinuncia relativamente a tutti i diritti sul Contenuto o in riferimento ad esso;
-      *   sei pienamente in regola con le licenze di terze parti in relazione al Contenuto e che sono state adottate tutte le azioni necessarie per trasferire con esito positivo qualsiasi condizione richiesta agli utenti finali;
-      *   il Contenuto non contiene né installa alcun virus, worm, malware, cavalli di Troia o altri contenuti dannosi o distruttivi;
-      *   il Contenuto non costituisce spam, non è generato da macchina o in modo casuale e non contiene contenuto commerciale indesiderato o immorale finalizzato a indirizzare il traffico verso siti di terze parti o a migliorare il posizionamento nei motori di ricerca di siti di terze parti o per altri atti illeciti (ad esempio, il phishing) o per indurre in errore i destinatari in relazione all’origine del materiale (ad esempio, lo spoofing);
-      *   il Contenuto non ha carattere pornografico, non contiene minacce e non incita alla violenza e non viola i diritti di privacy o pubblicitari di terze parti;
-      *   il Contenuto non viene pubblicizzato tramite messaggi elettronici indesiderati, come collegamenti spam verso a newsgroup, elenchi email, altri blog e siti web e analoghi metodi promozionali non richiesti;
-      *   il Contenuto non è presentato in modo da indurre gli utenti a errori di identità con altri utenti o aziende; e
-      *   nel caso di Contenuto contenente codice informatico, hai classificato e/o descritto in modo accurato il tipo, la natura, gli usi e gli effetti dei materiali, se richiesto da %{company_name} o in altro modo.
-
-      <a name="3"></a>
-
-      ## [3. Licenza sui contenuti utente](#3)
-
-      I contributi degli utenti sono resi disponibili ai sensi di una [Licenza Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Senza alcuna limitazione di tali dichiarazioni o garanzie, %{company_name} ha il diritto (sebbene non l’obbligo), a discrezione di %{company_name} (i), di rifiutare o rimuovere qualsiasi contenuto che, nella ragionevole opinione di %{company_name}, viola qualsiasi politica di %{company_name} o è in altro modo dannoso o sgradevole, o (ii) di cessare o negare l’accesso e l’utilizzo del Sito a qualsiasi singolo utente o entità per qualsiasi motivo, a sola discrezione di %{company_name}. %{company_name} non ha alcun obbligo di rimborsare eventuali somme pagate in precedenza.
-
-
-      <a name="4"></a>
-
-      ## [4. Pagamento e rinnovo](#4)
-
-      ### Termini Generali
-
-      Potrebbero essere disponibili sul Sito servizi opzionali o aggiornamenti a pagamento. Quando si utilizza un servizio opzionale o aggiornamento a pagamento, acconsenti a pagare a %{company_name} le commissioni per l’abbonamento mensile o annuale indicate per tale servizio. Le somme verranno addebitate con pagamento anticipato il giorno dell’abbonamento al servizio o aggiornamento e riguarderanno l’uso di tale servizio o aggiornamento per un periodo di abbonamento mensile o annuale, come indicato. Le commissioni non sono rimborsabili.
-
-      ### Rinnovo Automatico
-
-      A meno che non invii una notifica a %{company_name} prima della scadenza del periodo di abbonamento applicabile da annullare, l’abbonamento si rinnoverà automaticamente e tu ci autorizzi a riscuotere le commissioni dell’abbonamento annuale o mensile applicabili in quel momento per tale abbonamento (così come eventuali tasse) utilizzando qualsiasi carta di credito o altro meccanismo di pagamento registrato. Gli abbonamenti possono essere annullati in qualsiasi momento.
-
-      <a name="5"></a>
-
-      ## [5. Servizi](#5)
-
-      ### Servizi di Hosting e di supporto
-
-      Possono essere forniti da %{company_name} servizi opzionali di Hosting e di supporto, ai sensi dei termini e delle condizioni specifici per ogni servizio. Con la sottoscrizione a un account di servizi di hosting o supporto, accetti di rispettare i termini e le condizioni previsti.
-
-      <a name="6"></a>
-
-      ## [6. Responsabilità dei visitatori del Sito](#6)
-
-      %{company_name} non ha rivisto e non può rivedere tutto il materiale, compreso il software informatico, pubblicato sul Sito e pertanto non può essere considerata responsabile per il contenuto, l’uso o gli effetti di tale materiale. Gestendo il Sito, %{company_name} non dichiara né implica che approva il materiale pubblicato o che ritiene che tale materiale sia accurato, utile o non nocivo. L’utente deve adottare le precauzioni necessarie per proteggere se stesso e i sistemi informatici da virus, worm, cavalli di Troia e altri contenuti dannosi o distruttivi. Il Sito potrebbe includere contenuto offensivo, indecente, o altrimenti discutibile, così come contenuto contenente imprecisioni tecniche, errori tipografici e altri errori. Il Sito potrebbe inoltre contenere materiale che viola i diritti pubblicitari o di privacy, o violare la proprietà intellettuale e altri diritti proprietari di terzi, o il cui download, la copia o l’utilizzo siano soggetti a ulteriori termini e condizioni, dichiarati o non dichiarati. %{company_name} declina ogni responsabilità per qualsiasi danno derivante dall’uso da parte di visitatori del Sito, o da qualsiasi download eseguito da tali visitatori del contenuto pubblicato.
-
-      <a name="7"></a>
-
-      ## [7. Contenuto pubblicato su altri siti Web](#7)
-
-      Non abbiamo rivisto e non possiamo rivedere tutto il materiale, compreso il software informatico, reso disponibile mediante i siti e le pagine Web che contengono link a %{company_domain} e dal sito %{company_domain}. %{company_name} non esercita alcun controllo su tali siti e pagine Web non %{company_domain} e non è responsabile del loro contenuto o utilizzo. Con il collegamento a un sito o a una pagina Web non %{company_domain}, %{company_name} non dichiara né ammette implicitamente che approva tale sito o pagina Web. L’utente deve adottare le precauzioni necessarie per proteggere se stesso e i sistemi informatici da virus, worm, cavalli di Troia e altri contenuti dannosi o distruttivi. %{company_name} declina ogni responsabilità per eventuali danni risultanti dall’uso di siti e pagine Web non %{company_domain}.
-
-      <a name="8"></a>
-
-      ## [8. Violazione del copyright e della politica DMCA](#8)
-
-      %{company_name} chiede agli altri di rispettare i propri diritti di proprietà intellettuale e a sua volta rispetta i diritti di proprietà intellettuale di terzi. Se l’utente ritiene che il materiale presente o a cui accede mediante link dal sito %{company_domain} violi il proprio copyright, è invitato a inviare una notifica a %{company_name} in conformità alla politica [Digital Millennium Copyright Act] (http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) (“DMCA”) di %{company_name}. %{company_name} risponderà a tutte le notifiche includendo, in base alle misure necessarie o appropriate, la rimozione del materiale che genera la violazione o la disabilitazione di tutti i link al materiale in presunta violazione. %{company_name} non consentirà più l’accesso e l’utilizzo del Sito al visitatore se, in circostanze appropriate, il visitatore si comporta come trasgressore recidivo del copyright o di altri diritti di proprietà intellettuale di %{company_name} o di terzi. In caso di rescissione, %{company_name} non avrà alcun obbligo di rimborsare eventuali somme pagate in precedenza a  %{company_name}.
-
-      <a name="9"></a>
-
-      ## [9. Proprietà intellettuale](#9)
-
-      Il presente Contratto non trasferisce da %{company_name} all’utente qualsiasi proprietà intellettuale di %{company_name} o di terzi e tutti i diritti, la titolarità e l’interesse nel e su tale proprietà rimarranno (fra le parti) esclusivamente di %{company_name}. %{company_name}, %{company_domain}, il logo %{company_domain} e tutti gli altri marchi commerciali, marchi di servizio, grafica e logo utilizzati in connessione a %{company_domain} o il Sito sono marchi commerciali o marchi commerciali registrati di %{company_name} o dei licenziatari di %{company_name}. Altri marchi, marchi di servizio, grafica e logo utilizzati in connessione con il Sito possono essere marchi di terzi. L’utilizzo del Sito non implica per l’utente alcun diritto o licenza di riprodurre o utilizzare in altro modo qualsiasi marchio commerciale di %{company_name} o di terzi.
-
-      <a name="10"></a>
-
-      ## [10. Annunci pubblicitari](#10)
-
-      %{company_name} si riserva il diritto di visualizzare annunci pubblicitari sul tuo contenuto, a meno che tu non abbia acquistato un Upgrade o un account di servizi senza pubblicità.
-
-      <a name="11"></a>
-
-      ## [11. Attribuzione](#11)
-
-      %{company_name} si riserva il diritto di visualizzare link di attribuzione come “Powered by %{company_domain}”, autore del tema e attribuzione dei caratteri nel piè di pagina o la barra degli strumenti del tuo contenuto. I crediti a piè di pagina e la barra degli strumenti %{company_domain} non possono essere alterati o rimossi indipendentemente dagli upgrade acquistati.
-
-      <a name="12"></a>
-
-      ## [12. Modifiche](#12)
-
-      %{company_name} si riserva il diritto, a sua unica discrezione, di modificare o rimpiazzare qualunque parte di questo Contratto. E’ tua responsabilità controllare questo Contratto periodicamente per prendere atto dei cambiamenti. L’uso continuato e l'accesso al sito web implica l’accettazione di tali cambiamenti. %{company_name} può, in futuro, offrire nuovi servizi e/o funzionalità attraverso il Sito (incluso il rilascio di nuovi strumenti e risorse). Tali nuovi servizi e/o funzionalità saranno soggetti ai termini e condizioni di questo Contratto.
-
-      <a name="13"></a>
-
-      ## [13. Rescissione del contratto](#13)
-
-      %{company_name} può interrompere l’accesso a tutto o a parte del Sito in qualsiasi momento, con o senza causa, con o senza preavviso, con efficacia immediata. Se desideri rescindere dal presente Contratto o dall’account %{company_domain} (se disponibile), puoi semplicemente interrompere l’utilizzo del Sito. Tutte le disposizioni del presente Contratto che, per loro natura, devono permanere dopo la rescissione permarranno, incluse, senza limitazione, le disposizioni di proprietà, le esclusioni di garanzia, le indennità e le limitazioni di responsabilità.
-
-      <a name="14"></a>
-
-      ## [14. Esclusione di garanzie](#14)
-
-      Il Sito è fornito “così com’è”. Con la presente, %{company_name}, i suoi fornitori e licenziatari declinano tutte le garanzie di qualsiasi tipo, espresse o implicite, incluse, senza limitazione, le garanzie di commerciabilità, idoneità per un particolare scopo e non violazione. Né %{company_name} né i suoi fornitori e licenziatari concedono alcuna garanzia che il Sito sia privo di errori o che l’accesso ad essi sarà continuo o ininterrotto. Se stai leggendo queste informazioni, ecco un [chiarimento] (http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). Tu comprendi che scaricare o ottenere in altro modo i contenuti o i servizi mediante il Sito, a tua discrezione e a tuo rischio.
-
-      <a name="15"></a>
-
-      ## [15. Limitazione di responsabilità](#15)
-
-      In nessun caso %{company_name}, o suoi fornitori o licenziatari, saranno responsabili per qualsiasi aspetto oggetto del presente contratto ai sensi di qualsiasi accordo, negligenza, responsabilità oggettiva o altra dottrina legale o equitativa: (i) per qualsiasi danno speciale, incidentale o consequenziale; (ii) per il costo di approvvigionamento dei prodotti o dei servizi sostitutivi; (iii) per l’interruzione dell’utilizzo oppure la perdita o il danneggiamento di dati; o (iv) per gli importi che superano le commissioni versate a %{company_name} ai sensi del presente contratto nel corso del periodo di dodici (12) mesi precedenti alla causa dell’azione. %{company_name} non sarà responsabile per qualsiasi errore o ritardo dovuto a cause al di fuori del proprio ragionevole controllo. Quanto precede non si applica nella misura vietata dalla legge applicabile.
-
-      <a name="16"></a>
-
-      ## [16. Garanzia e dichiarazione generale](#16)
-
-      Tu dichiari e garantisci che (i) l’utilizzo del Sito avverrà in stretta conformità alla [Politica sulla Privacy] (/privacy) di %{company_name}, alle [Linee Guida](/guidelines), al presente Contratto e a tutti i regolamenti e le leggi (inclusi senza limitazioni le leggi o i regolamenti locali in vigore nel paese, nello stato, nella città o in altra area governativa di appartenenza, per quanto riguarda la condotta online e il contenuto accettabile, e comprese tutte le leggi applicabili in materia di trasmissione di dati tecnici esportati dal paese di residenza del Sito o del tuo) e (ii) l’uso del Sito non viola o non si appropria indebitamente dei diritti di proprietà intellettuale di terze parti.
-
-      <a name="17"></a>
-
-      ## [17. Indennizzo](#17)
-
-      Tu accetti di indennizzare e manlevare %{company_name}, i suoi contraenti e i suoi licenziatari, e i rispettivi direttori, funzionari, dipendenti e agenti da e contro tutte le richieste di risarcimento e le spese, inclusi gli onorari, derivanti dall’uso del Sito, inclusa ma non limitatamente alla violazione dell’utente del presente Contratto.
-
-      <a name="18"></a>
-
-      ## [18. Varie](#18)
-
-      Il presente Contratto costituisce l’intero contratto tra te e %{company_name} riguardo l’argomento oggetto del contratto, e può essere modificato solo da un emendamento scritto e firmato da un dirigente autorizzato di %{company_name}, o mediante l’invio da parte di %{company_name} di una versione riveduta. Salvo diversa disposizione nel presente Contratto nei limiti consentiti dalla legge applicabile, se disponibile, qualsiasi accesso a o utilizzo del sito sarà disciplinato dalle leggi dello stato italiano, con esclusione delle disposizioni in materia di conflitto di leggi, il foro competente per qualsiasi controversia derivante dal presente contratto o collegata allo stesso è il tribunale di Roma. Fatta eccezione per le richieste di risarcimento ingiuntivo o per via equitativa o richieste di risarcimento relative ai diritti di proprietà intellettuale (che possono essere avanzate in qualsiasi tribunale competente senza prestare garanzie), qualsiasi controversia derivante dal presente contratto sarà risolta in conformità alle leggi italiane (Italia). La parte vincente in qualsiasi azione o procedimento per l’applicazione del presente Contratto avrà diritto di ottenere il rimborso delle spese e degli onorari legali. Nel caso in cui una parte del presente Contratto venga ritenuta non valida o non applicabile, tale parte verrà interpretata in modo da riflettere le intenzioni originali delle parti e le altre disposizioni rimarranno attive ed efficaci. Il mancato esercizio da parte di qualsiasi parte di qualsiasi termine o condizione del presente Contratto o qualsiasi violazione dello stesso, in qualsiasi unica istanza, non implicherà la rinuncia a tale termine o condizione oppure a successive violazioni. Tu puoi assegnare diritti ai sensi del presente Contratto a qualsiasi parte che acconsenta e accetti di essere vincolata dai suoi termini e condizioni; %{company_name} può assegnare i suoi diritti ai sensi del presente Contratto senza condizioni. Il presente Contratto sarà vincolante e avrà effetto a beneficio delle parti, dei subentranti e degli assegnatari autorizzati.
-
-      Questo documento è CC-BY-SA. Ultimo aggiornamento 31 maggio 2013.
-
-      Adattamento dal contratto originale [Termini di Servizio WordPress](http://en.wordpress.com/tos/).
   privacy_topic:
     title: "Politica della Privacy"
     body: |
@@ -2772,22 +2521,22 @@ it:
         Questo distintivo viene assegnato la prima volta che modifichi uno dei tuoi messaggi. Anche se non potrai modificare i tuoi messaggi indefinitamente, la modifica è sempre una buona idea — puoi migliorare i tuoi messaggi, correggere piccoli errori o aggiungere qualcosa che avevi tralasciato nel momento della prima stesura. Effettua modifiche per migliorare i tuoi messaggi!
     basic_user:
       name: Base
-      description: '<a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Assegnate</a> tutte le funzionalità essenziali della comunità '
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">Assegnate</a> tutte le funzionalità essenziali della comunità "
       long_description: |
         Questo distintivo viene assegnato quando raggiungi il livello di esperienza 1. Grazie per essere stato nei paraggi per un po' a leggere qualche argomento e a imparare di cosa tratta la nostra comunità. Le restrizioni iniziali che avevi come nuovo utente sono state allentate; ti sono ora state assegnate tutte le capacità essenziali, come ad esempio i messaggi personali, le segnalazioni, la modifica delle wiki e la possibilità di inviare più immagini e collegamenti.
     member:
       name: Membro
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Assegnati</a> inviti, messaggi multipli, maggiori "Mi piace"
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">Assegnati</a> inviti, messaggi multipli, maggiori \"Mi piace\""
       long_description: |
         Questo distintivo viene assegnato quando raggiungi il livello di esperienza 2. Grazie per esserti unito e per aver partecipato per qualche settimana alla nostra comunità. Puoi inviare inviti dalla tua pagina utente o dai singoli argomenti, creare messaggi personali di gruppo, a mettere un numero maggiore di "Mi piace" al giorno.
     regular:
       name: Assiduo
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Assegnato</a> ricategorizza, rinomina, collegamenti seguiti, wiki, maggiori "Mi piace"
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">Assegnato</a> ricategorizza, rinomina, collegamenti seguiti, wiki, maggiori \"Mi piace\""
       long_description: |
         Questo distintivo viene assegnato quando raggiungi il livello di esperienza 3. Grazie per essere stato parte attiva della nostra comunità per qualche mese. Ora sei uno dei lettori più attivi e un collaboratore affidabile che rende grande la nostra comunità. Ora puoi ricategorizzare e rinominare gli argomenti, usare le segnalazioni spam più potenti, accedere a un'area Lounge privata, e puoi mettere un numero ancora maggiore di "Mi piace" al giorno.
     leader:
       name: Veterano
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Assegnato</a> modifica globale, puntare, chiudere, archiviare, suddividere e riunire, maggiori "Mi piace"
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">Assegnato</a> modifica globale, puntare, chiudere, archiviare, suddividere e riunire, maggiori \"Mi piace\""
       long_description: |
         Questo distintivo è assegnato quando si raggiunge il livello di esperienza 4. Sei un veterano in questa comunità selezionato dallo staff, e qui sei un esempio positivo per il resto della comunità con le tue azioni e parole. Hai la possibilità di modificare tutti i messaggi, agire come un moderatore con azioni comuni quali puntare, chiudere, rendere invisibile, archiviare, dividere e unire, e hai tonnellate di mi piace al giorno.
     welcome:
@@ -2797,12 +2546,12 @@ it:
         Questo distintivo è assegnato quando ricevi il tuo primo mi piace su un messaggio. Congratulazioni, hai pubblicato qualcosa che i membri della tua comunità hanno trovato interessante, eccezionale o utile!
     autobiographer:
       name: Autobiografo
-      description: Ha compilato le informazioni del <a href="%{base_uri}/my/preferences/profile">profilo</a>
+      description: "Ha compilato le informazioni del <a href=\"%{base_uri}/my/preferences/profile\">profilo</a>"
       long_description: |
         Questo distintivo è assegnato per aver compilato <a href="%{base_uri}/my/preferences/profile">il tuo profilo utente</a> e selezionato un'immagine per il profilo. Lasciare che gli altri sappiano di più su chi sei e a cosa sei interessato rende la comunità migliore e più connessa. Unisciti a noi!
     anniversary:
       name: Compleanno
-      description: Membro attivo per un anno, ha scritto almeno una volta
+      description: "Membro attivo per un anno, ha scritto almeno una volta"
       long_description: |
         Questo distintivo è assegnato a chi è membro da un anno con almeno un messaggio scritto durante quell'anno. Grazie per esserci e contribuire alla nostra comunità. Non potremmo farcela senza di te.
     nice_post:
@@ -2863,8 +2612,6 @@ it:
     promoter:
       name: Promotore
       description: Ha invitato un utente
-      long_description: |
-        Questo distintivo è assegnato quando si invita qualcuno ad unirsi alla comunità tramite il pulsante invita sulla tua pagina utente, o in fondo ad un argomento. Invitare amici che potrebbero essere interessati a discussioni specifiche è un ottimo modo per introdurre nuove persone alla nostra comunità, quindi grazie!
     campaigner:
       name: Attivista
       description: Ha invitato 3 utenti
@@ -2892,7 +2639,7 @@ it:
         Questo distintivo è assegnato la prima volta che citi un messaggio nella tua risposta. Citare le sezioni rilevanti di messaggi precedenti nella tua risposta aiuta a mantenere le discussioni connesse insieme e in argomento. Il modo più semplice per citare è evidenziare una sezione di un messaggio e quindi premere il pulsante rispondi. Cita generosamente!
     read_guidelines:
       name: Linee Guida
-      description: Ha letto le <a href="%{base_uri}/guidelines">linee guida della comunità</a>
+      description: "Ha letto le <a href=\"%{base_uri}/guidelines\">linee guida della comunità</a>"
       long_description: |
         Questo distintivo è assegnato per <a href="%{base_uri}/guidelines">aver letto le linee guida della comunità</a>. Seguendo e condividendo queste semplici linee guida aiuti a costruire una comunità sicura, divertente e sostenibile per tutti. Ricorda sempre che c'è un altro essere umano, molto simile a te, dall'altro lato dello schermo. Sii carino!
     reader:
@@ -2963,16 +2710,14 @@ it:
     first_emoji:
       name: Prima Emoji
       description: Ha usato una Emoji in un messaggio
-      long_description: |
-        Questo distintivo viene assegnato la prima volta che inserisci un Emoji in un messaggio :thumbsup:. Gli Emoji ti permettono di trasmettere emozioni nei messaggi, dalla felicità :smiley: alla tristezza :anguished: alla rabbia :angry: e tutto ciò che sta nel mezzo :sunglasses:. Digita semplicemente : (carattere due punti) oppure premi il bottone Emoji nella barra degli strumenti dell'editor, per selezionare tra centinaia di possibilità :ok_hand:
     first_mention:
       name: Prima Menzione
       description: Ha menzionato un utente in un messaggio
-      long_description: Questo distintivo è assegnato la prima volta che menzioni lo @username di qualcuno nel tuo messaggio. Ogni menzione genera una notifica a quella persona, così verrà a conoscenza del tuo messaggio. Inizia a digitare @ (il simbolo) per menzionare qualsiasi utente o, se è consentito, un gruppo - è un modo conveniente per portare qualcosa alla loro attenzione.
+      long_description: "Questo distintivo è assegnato la prima volta che menzioni lo @username di qualcuno nel tuo messaggio. Ogni menzione genera una notifica a quella persona, così verrà a conoscenza del tuo messaggio. Inizia a digitare @ (il simbolo) per menzionare qualsiasi utente o, se è consentito, un gruppo - è un modo conveniente per portare qualcosa alla loro attenzione."
     first_onebox:
       name: Prima Onebox
       description: ha inserito un collegamento che ha generato una onebox
-      long_description: Questo distintivo è assegnato la prima volta che inserisci un collegamento su una riga da solo, il quale viene automaticamente espanso in un'anteprima con un breve riassunto del collegamento, un titolo e (quando disponibile) un'immagine.
+      long_description: "Questo distintivo è assegnato la prima volta che inserisci un collegamento su una riga da solo, il quale viene automaticamente espanso in un'anteprima con un breve riassunto del collegamento, un titolo e (quando disponibile) un'immagine."
     first_reply_by_email:
       name: Prima Risposta Da Email
       description: Ha risposto ad un messaggio tramite email
@@ -2994,11 +2739,10 @@ it:
     devotee:
       name: Devoto
       description: 365 giorni di frequenza
-      long_description: Questo distintivo è assegnato per aver frequentato il sito per 365 giorni consecutivi. Wow, un anno intero!
+      long_description: "Questo distintivo è assegnato per aver frequentato il sito per 365 giorni consecutivi. Wow, un anno intero!"
     badge_title_metadata: "%{display_name}distintivo su %{site_title}"
   admin_login:
     success: "email Inviata"
-    error: "Errore!"
     email_input: "Email Amministratore"
     submit_button: "Invia Email"
   performance_report:
@@ -3143,6 +2887,3 @@ it:
         description: |
           <p>Se te la senti di cambiare queste impostazioni, visita <a href='/admin' target='_blank'>la tua sezione amministrazione</a>; la trovi accanto all'icona della chiave inglese nel menu hamburger del sito.</p>
           <p>Divertiti e buona fortuna <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>nel costruire la tua nuova comunità!</a></p>
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index 3df482f16d9..e18b205fcdf 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -17,12 +17,12 @@ ja:
       date_only: "%B%-d、%Y"
       long: "%B%-d、%Y、%I:%M%P"
   date:
-    month_names: [null, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月]
+    month_names: [~, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "午前"
     pm: "午後"
-    <<: *datetime_formats
   title: "Discourse"
   topics: "トピック"
   posts: "投稿"
@@ -50,16 +50,17 @@ ja:
       present: は入力しないでください
       confirmation: "と%{attribute}の入力が一致しません"
       empty: 本文が入力されていません
-      equal_to: は%{count}にしてください
+      equal_to: "は%{count}にしてください"
       even: は偶数にしてください
       exclusion: はすでに使われています
-      greater_than: は%{count}より大きい値にしてください
-      greater_than_or_equal_to: は%{count}以上の値にしてください
+      greater_than: "は%{count}より大きい値にしてください"
+      greater_than_or_equal_to: "は%{count}以上の値にしてください"
       has_already_been_used: "は既に使用されています"
       inclusion: は一覧にありません
       invalid: は正しくありません
-      less_than: は%{count}より小さい値にしてください
-      less_than_or_equal_to: は%{count}以下の値にしてください
+      is_invalid: "文章に不適切な文字、または文字列があるようです。\n文章をもう一度確認してやり直してください。"
+      less_than: "は%{count}より小さい値にしてください"
+      less_than_or_equal_to: "は%{count}以下の値にしてください"
       not_a_number: は数値で入力してください
       not_an_integer: は整数で入力してください
       odd: は奇数にしてください
@@ -82,6 +83,9 @@ ja:
       load_from_remote: "投稿の読み込みに失敗しました。"
     site_settings:
       min_username_length_range: "最小値を最大値より上にすることはできません。"
+  activemodel:
+    errors:
+      <<: *errors
   bulk_invite:
     file_should_be_csv: "アップロードファイルはcsv形式である必要があります。"
     error: "アップロードファイルにエラーが発生しました。時間が経ってから再度お試しください。"
@@ -96,18 +100,18 @@ ja:
   reading_time: "閲覧時間"
   likes: "いいね！"
   too_many_replies:
-    other: "申し訳ありません、新しいユーザーの同じトピックへの返信は、一時的に %{count} 回に制限されています。"
+    other: 申し訳ありません、新しいユーザーの同じトピックへの返信は、一時的に %{count} 回に制限されています。
   embed:
     start_discussion: "会話をする"
     continue: "会話を続ける"
     more_replies:
-      other: "%{count} 以上の返信"
+      other: '%{count} 以上の返信'
     loading: "会話を読み込んでいます…"
     permalink: "パーマリンク"
     imported_from: "これは、オリジナルエントリ%{link}に対するディスカッショントピックです"
     in_reply_to: "▶ %{username}"
     replies:
-      other: "%{count} 通の返信"
+      other: '%{count} 通の返信'
   no_mentions_allowed: "あなたは他のユーザーへメンションを送ることができません。"
   no_images_allowed: "新規ユーザーは投稿に画像を付ける事はできません。"
   spamming_host: "申し訳ありませんが、このホストへのリンクを貼ることはできません。"
@@ -115,6 +119,7 @@ ja:
   topic_not_found: "問題が発生しました。トピックがクローズしたか、閲覧中に削除された可能性があります。"
   just_posted_that: "は最近の投稿と内容がほぼ一緒です"
   invalid_characters: "は不正な文字を含んでいます"
+  is_invalid: "文章に不適切な文字、または文字列があるようです。\n文章をもう一度確認してやり直してください。"
   next_page: "次のページ →"
   prev_page: "← 前のページ"
   page_num: "%{num} ページ"
@@ -131,7 +136,6 @@ ja:
     latest: "最新のトピック"
     hot: "ホットトピック"
     posts: "最近の投稿"
-    private_posts: "最新のプライベートメッセージ"
     group_posts: "%{group_name}からの最新投稿"
     group_mentions: "%{group_name}からの最新メンション"
     user_posts: "@%{username}からの最新投稿"
@@ -141,8 +145,6 @@ ja:
   queue:
     delete_reason: "投稿の承認機能を用いて削除されました"
   groups:
-    errors:
-      member_already_exist: "'%{username}'はすでにこのグループのメンバーです。"
     default_names:
       everyone: "みなさん"
       admins: "管理者"
@@ -155,8 +157,8 @@ ja:
       trust_level_4: "トラストレベル4"
   education:
     until_posts:
-      other: "%{count} 投稿"
-    new-topic: |
+      other: '%{count} 投稿'
+    'new-topic': |
       %{site_name} へようこそ！&mdash; **新たなトピックの作成ありがとうございます!**
 
       - タイトルはトピックの内容を正しく説明していますか？他の人にとって興味深いタイトルになっていますか？
@@ -164,7 +166,7 @@ ja:
       - このトピックは何をカバーするものですか？このトピックに興味を示しそうなのは誰でしょう？なぜこのトピックは重要なのでしょうか？コミュニティよりどのような回答を期待していますか？
 
       - トピックに適切な検索用ワードを含めると、他の人がトピックを *発見* しやすくなります。詳細は [コミュニティガイドライン](/guidelines) を参照してください。このメッセージは最初の %{education_posts_text} まで表示されます。
-    new-reply: |
+    'new-reply': |
       %{site_name} へようこそ &mdash; **コミュニティへの貢献ありがとうございます!**
       - あなたの回答は議論に何らかの形で貢献していますか?
       - 会話は礼儀正しく、マナーを守りましょう。
@@ -179,13 +181,12 @@ ja:
       user_profile:
         bio_raw: "自己紹介"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "プライベートメッセージでのみ警告を送ることができます"
               too_many_users: "一度に1ユーザーにしか警告を送る事はできません"
-              cant_send_pm: "申し訳ありません。このユーザーにはプライベートメッセージを送る事ができません"
               no_user_selected: "有効なユーザーを選択してください"
         user:
           attributes:
@@ -200,7 +201,6 @@ ja:
           attributes:
             hex:
               invalid: "は有効なカラーではありません"
-      <<: *errors
   user_profile:
     no_info_other: "<div class='missing-profile'>%{name} は、まだプロフィールの自己紹介フィールドに何も書いていません</div>"
   vip_category_name: "ラウンジ"
@@ -215,24 +215,24 @@ ja:
     title: "ラウンジへようこそ"
     body: |2
 
-      素晴らしい! :confetti_ball:
+        素晴らしい! :confetti_ball:
 
-      このトピックが見えるという事は、**レギュラー**へ昇格したようですね！(トラストレベル3)。
+        このトピックが見えるという事は、**レギュラー**へ昇格したようですね！(トラストレベル3)。
 
-      これであなたは.... &hellip;
+        これであなたは.... &hellip;
 
-      * トピックのタイトルを好きに編集する事ができます。
-      * トピックのカテゴリを好きに変更する事ができます。
-      * Have all your links followed ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) is removed)
-      * トラストレベルが3以上が利用出来るプライベートラウンジへのアクセス
-      * 一度の報告でスパムを非表示にできます
+        * トピックのタイトルを好きに編集する事ができます。
+        * トピックのカテゴリを好きに変更する事ができます。
+        * Have all your links followed ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) is removed)
+        * トラストレベルが3以上が利用出来るプライベートラウンジへのアクセス
+        * 一度の報告でスパムを非表示にできます
 
-      [現在レギュラーに所属している人の一覧](/badges/3/regular)からリストを確認する事ができます。
+        [現在レギュラーに所属している人の一覧](/badges/3/regular)からリストを確認する事ができます。
 
-      コミュニティを支えていただき、ありがとうございます！
-      (トラストレベルに関する詳しい説明は [こちら][trust]をご覧ください。 レギュラーの条件を満たし続けることで維持する事ができます。)
+        コミュニティを支えていただき、ありがとうございます！
+        (トラストレベルに関する詳しい説明は [こちら][trust]をご覧ください。 レギュラーの条件を満たし続けることで維持する事ができます。)
 
-      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "%{category}カテゴリについて"
     errors:
@@ -243,7 +243,7 @@ ja:
       uncategorized: "未分類カテゴリは削除出来ません"
       has_subcategories: "サブカテゴリを持っているため、このカテゴリを削除できません。"
       topic_exists:
-        other: "%{count}個のトピックを持っているため、このカテゴリを削除できません。一番古いトピックは%{topic_link}です。"
+        other: '%{count}個のトピックを持っているため、このカテゴリを削除できません。一番古いトピックは%{topic_link}です。'
       topic_exists_no_oldest: "%{count}個のトピックを持っているため、このカテゴリを削除できません。"
   trust_levels:
     newuser:
@@ -252,64 +252,61 @@ ja:
       title: "ベーシックユーザー"
     change_failed_explanation: "%{user_name} を '%{new_trust_level}' に下げようとしましたが、既にトラストレベルが '%{current_trust_level}' です。%{user_name} は '%{current_trust_level}' のままになります - もしユーザーを降格させたい場合は、トラストレベルをロックしてください"
   rate_limiter:
-    too_many_requests: "このアクションを一日の間に実施可能な回数が決まっています。%{time_left}待ってから再度試してください。"
-    by_type:
-      public_group_membership: "グループへの参加/離脱が多すぎます。%{time_left}お待ち下さい。"
     hours:
-      other: "%{count} 時間"
+      other: '%{count} 時間'
     minutes:
-      other: "%{count} 分"
+      other: '%{count} 分'
     seconds:
-      other: "%{count} 秒"
+      other: '%{count} 秒'
   datetime:
     distance_in_words:
       half_a_minute: "1分前"
       less_than_x_seconds:
-        other: "< %{count} 秒"
+        other: < %{count} 秒
       x_seconds:
-        other: "%{count} 秒"
+        other: '%{count} 秒'
       less_than_x_minutes:
-        other: "%{count}分前"
+        other: '%{count}分前'
       x_minutes:
-        other: "%{count}分"
+        other: '%{count}分'
       about_x_hours:
-        other: "%{count} 時間"
+        other: '%{count} 時間'
       x_days:
-        other: "%{count} 日"
+        other: '%{count} 日'
       about_x_months:
-        other: "%{count}ヶ月"
+        other: '%{count}ヶ月'
       x_months:
-        other: "%{count}ヶ月"
+        other: '%{count}ヶ月'
       about_x_years:
-        other: "%{count} 年"
+        other: '%{count} 年'
       over_x_years:
-        other: "> %{count} 年"
+        other: '> %{count} 年'
       almost_x_years:
-        other: "%{count} 年"
+        other: '%{count} 年'
     distance_in_words_verbose:
       half_a_minute: "たった今"
       less_than_x_seconds:
-        other: "現在"
+        other: 現在
       x_seconds:
-        other: "%{count} 秒前"
+        other: '%{count} 秒前'
       less_than_x_minutes:
-        other: "%{count}分未満"
+        other: '%{count}分未満'
       x_minutes:
-        other: "%{count}分前"
+        other: '%{count}分前'
       about_x_hours:
-        other: "%{count} 時間前"
+        other: '%{count} 時間前'
       x_days:
-        other: "%{count} 日前"
+        other: '%{count} 日前'
       about_x_months:
-        other: "約 %{count}ヶ月前"
+        other: 約 %{count}ヶ月前
       x_months:
-        other: "%{count}ヶ月前"
+        other: '%{count}ヶ月前'
       about_x_years:
-        other: "約 %{count} 年前"
+        other: 約 %{count} 年前
       over_x_years:
-        other: "%{count} 年以上前"
+        other: '%{count} 年以上前'
       almost_x_years:
-        other: "だいたい %{count} 年前"
+        other: だいたい %{count} 年前
   password_reset:
     no_token: "申し訳ありません。パスワード変更のためのリンクは古いようです。ログインボタンを選択し、再度パスワード変更を行ってください"
     update: 'パスワード更新'
@@ -395,6 +392,7 @@ ja:
   unsubscribe:
     title: "配信停止"
     unwatch_category: "%{category}内の全トピックのウォッチを解除"
+    all: "%{sitename}からのメールを私に送信しないでください。"
   user_api_key:
     title: "アプリケーションアクセスの認証"
     description: "\"%{application_name}\" があなたのアカウントへのアクセスを要求しています: "
@@ -404,9 +402,7 @@ ja:
       xaxis: "日"
       yaxis: "アクセス数"
     signups:
-      title: "新規ユーザー"
       xaxis: "日"
-      yaxis: "新規ユーザー数"
     profile_views:
       xaxis: "日"
       yaxis: "ユーザープロフィールの閲覧数"
@@ -443,7 +439,6 @@ ja:
       xaxis: "日"
       yaxis: "メールの数"
     user_to_user_private_messages:
-      title: "ユーザーからユーザーへ"
       xaxis: "日"
       yaxis: "メッセージ数"
     system_private_messages:
@@ -490,7 +485,6 @@ ja:
       xaxis: "日"
       yaxis: "ウェブクローラからの閲覧数"
     page_view_total_reqs:
-      title: "全体"
       xaxis: "日"
       yaxis: "合計閲覧数"
     page_view_logged_in_mobile_reqs:
@@ -552,15 +546,12 @@ ja:
   site_settings:
     censored_words: "自動的に &#9632;&#9632;&#9632;&#9632; で置換されます"
     delete_old_hidden_posts: "30日以上非表示になっている投稿を自動で削除します"
-    default_locale: "この Discourse インスタンスのデフォルト言語 (ISO 639-1 Code)"
     allow_user_locale: "ユーザーが言語を選択できるようにする"
     min_post_length: "投稿を許可する最少の文字数"
     min_first_post_length: "最初の投稿(投稿本文)を許可する最少の文字数"
-    min_private_message_post_length: "メッセージに投稿可能な最少の文字数"
     max_post_length: "投稿を許可する最大の文字数"
     min_topic_title_length: "トピックタイトルとして許可する最小の文字数"
     max_topic_title_length: "トピックタイトルとして許可する最大の文字数"
-    min_private_message_title_length: "プライベートメッセージのタイトルとして許容する最小の文字数"
     min_search_term_length: "検索ワードとして有効にする最小の文字数"
     allow_uncategorized_topics: "カテゴリなしのトピック作成を許可するか。警告：未分類のトピックがある場合は、これをオフにする前に、再分類する必要があります。"
     allow_duplicate_topic_titles: "トピックタイトルの重複を許可"
@@ -636,7 +627,6 @@ ja:
     version_checks: "Discourse Hubからのアップデートを確認し、管理ページにバージョンやアップデートメッセージを表示する"
     new_version_emails: "Discourseの新しいバージョンが利用可能になった際に contact_email アドレスにメールで通知する"
     invite_expiry_days: "招待キーの有効期間 (日)"
-    invite_passthrough_hours: "ユーザーが、以前の招待キーを使う事ができる時間"
     login_required: "サイトのコンテンツを閲覧するには認証を必須にして、匿名アクセスを拒否する"
     min_password_length: "パスワードの最小の長さ"
     block_common_passwords: "最もよく使われている10,000個のパスワードを許可しない"
@@ -648,15 +638,12 @@ ja:
     sso_overrides_name: "ログインする度に、SSOペイロードから取得した外部サイトの名前でローカルの名前を上書きし、ローカルでの変更を防ぐ"
     sso_overrides_avatar: "SSOペイロードから取得した外部サイトのプロフィール画像でローカルのプロフィール画像を上書きする。有効にする場合、プロフィール画像のアップデートを無効にする事を強く薦めます"
     sso_not_approved_url: "このURLに承認されていないSSOアカウントをリダイレクト"
-    enable_local_logins: "ローカルのユーザ名、パスワードでのログインを有効にする (注意: 招待を使用するには有効にする必要があります)"
     allow_new_registrations: "新しいユーザの登録を許可。ユーザを誰でも作れないようにするためには、チェックを外してください。"
     enable_yahoo_logins: "Yahoo 認証を有効にする"
     enable_google_oauth2_logins: "グーグル Oauth2 認証を有効にします。これはグーグルが現在サポートしている認証方式です。key と secret が必要です。"
     google_oauth2_client_id: "あなたのGoogleアプリケーションのクライアントID"
     google_oauth2_client_secret: "あなたの Google アプリケーションのクライアント Secret。"
     enable_twitter_logins: "Twitter 認証を有効にする (twitter_consumer_key と twitter_consumer_secret の設定が必要)"
-    twitter_consumer_key: "Twitter 認証用の consumer key。http://dev.twitter.com で入手可能"
-    twitter_consumer_secret: "Twitter 認証用の consumer secret。http://dev.twitter.com で入手可能"
     enable_facebook_logins: "Facebook 認証を有効にする (facebook_app_id と facebook_app_secret の設定が必要)"
     facebook_app_id: "Facebook 認証用の app id。https://developers.facebook.com/apps で入手可能"
     facebook_app_secret: "Facebook 認証用の app secret。https://developers.facebook.com/apps で入手可能"
@@ -665,7 +652,6 @@ ja:
     github_client_secret: "Github 認証用の client secret。https://github.com/settings/applications で入手可能"
     allow_restore: "すべてのサイトデータを置き換える復元を許可します\n。バックアップからの復元を行うとき以外はfalseのままにしてください。"
     maximum_backups: "ディスクに保存するバックアップの最大数。古いバックアップは自動的に削除されます"
-    backup_frequency: "サイトのバックアップを作成する頻度（日）"
     enable_s3_backups: "完了時にS3にバックアップをアップロードします。重要: 有効なS3 credentialsがファイル設定に必要です"
     s3_backup_bucket: "バックアップを保持するバケット。　警告: 必ずプライベートバケットになっていることを確認してください"
     active_user_rate_limit_secs: "'last_seen_at' フィールドを更新する頻度 (秒)"
@@ -680,7 +666,6 @@ ja:
     max_bookmarks_per_day: "ユーザが一日にブックマークできる最大数"
     max_edits_per_day: "ユーザが一日に編集できる最大数"
     max_topics_per_day: "ユーザが一日に作成できるトピックの最大数"
-    max_private_messages_per_day: "ユーザが一日に作成できるメッセージの最大数"
     max_invites_per_day: "ユーザが一日に招待できる最大数"
     max_topic_invitations_per_day: "ユーザが一日にトピックに招待できる最大数"
     suggested_topics: "トピック下部に表示されるおすすめトピックの数"
@@ -689,7 +674,6 @@ ja:
     clean_orphan_uploads_grace_period_hours: "どこからもリンクされていないアップロードファイルを削除するまでの猶予期間 (単位：時間)。"
     purge_deleted_uploads_grace_period_days: "削除されたアップロードファイルが完全削除されるまでの猶予期間 (単位：日)。"
     enable_s3_uploads: "Amazon S3にアップロードします。重要: 有効なS3 credentials(access key id & secret access key)が必要です"
-    s3_use_iam_profile: 'キーの取得にAWS EC2 IAM roleを使用する 注意: 有効にすると、s3 access key id" と "s3 secret access key"の設定を上書きします'
     s3_upload_bucket: "ファイルをアップロードする Amazon S3のバケット名。　警告: 小文字である必要があり、ピリオドとアンダースコアを含むことはできません"
     s3_access_key_id: "画像をアップロードするAmazonS3のaccess key id"
     s3_secret_access_key: "画像をアップロードする Amazon S3 の secret access key"
@@ -847,6 +831,8 @@ ja:
       category: 'カテゴリ'
       topic: '結果'
       user: 'ユーザ'
+  sso:
+    timeout_expired: "アカウントへのログインがタイムアウトになりました。もう一度トップページからログインしてください。"
   original_poster: "Original Poster"
   most_posts: "Most Posts"
   most_recent_poster: "Most Recent Poster"
@@ -856,9 +842,9 @@ ja:
     not_seen_in_a_month: "お帰りなさい！　最近見かけませんでしたね。　これらがあなたが離れてから最も人気のトピックです"
   move_posts:
     new_topic_moderator_post:
-      other: "%{count}件の投稿を新しいトピックに分割しました: %{topic_link}"
+      other: '%{count}件の投稿を新しいトピックに分割しました: %{topic_link}'
     existing_topic_moderator_post:
-      other: "%{count} 件のポストを既存のトピックにマージしました: %{topic_link}"
+      other: '%{count} 件のポストを既存のトピックにマージしました: %{topic_link}'
   change_owner:
     post_revision_text: "%{old_user} から %{new_user}にownershipを移動させました"
     deleted_user: "削除されたユーザ"
@@ -868,17 +854,17 @@ ja:
     closed_enabled: "このトピックはクローズされました。返信することはできません。"
     closed_disabled: "このトピックはオープンされました。新たに回答を投稿することができます。"
     autoclosed_enabled_days:
-      other: "このトピックは%{count}日が経過したので自動的にクローズされました。新たに返信することはできません。"
+      other: このトピックは%{count}日が経過したので自動的にクローズされました。新たに返信することはできません。
     autoclosed_enabled_hours:
-      other: "このトピックは%{count}時間が経過したので自動的にクローズされました。新たに返信することはできません。"
+      other: このトピックは%{count}時間が経過したので自動的にクローズされました。新たに返信することはできません。
     autoclosed_enabled_minutes:
-      other: "このトピックは%{count}分が経過したので自動的にクローズされました。新たに返信することはできません。"
+      other: このトピックは%{count}分が経過したので自動的にクローズされました。新たに返信することはできません。
     autoclosed_enabled_lastpost_days:
-      other: "このトピックは最後の返信から%{count}日が経過したので自動的にクローズされました。新たに返信することはできません。"
+      other: このトピックは最後の返信から%{count}日が経過したので自動的にクローズされました。新たに返信することはできません。
     autoclosed_enabled_lastpost_hours:
-      other: "このトピックは最後の返信から%{count}時間が経過したので自動的にクローズされました。新たに返信することはできません。"
+      other: このトピックは最後の返信から%{count}時間が経過したので自動的にクローズされました。新たに返信することはできません。
     autoclosed_enabled_lastpost_minutes:
-      other: "このトピックは最後の返信から%{count}分が経過したので自動的にクローズされました。新たに返信することはできません。"
+      other: このトピックは最後の返信から%{count}分が経過したので自動的にクローズされました。新たに返信することはできません。
     autoclosed_disabled: "このトピックは再オープンされました。新しい回答が投稿できるようになりました。。"
     autoclosed_disabled_lastpost: "このトピックは再オープンされました。新しい回答が投稿できます"
     pinned_enabled: "このトピックはピン留めされました。スタッフによって全てのユーザのピン留めが解除されるか、ユーザ自身がピン留め解除するまで、カテゴリのトップに表示されます"
@@ -922,7 +908,7 @@ ja:
       max_new_accounts_per_registration_ip: "あなたのIPアドレスからの新規登録は行えません(登録可能な数を超えています)。スタッフへお問い合わせください。"
   flags_reminder:
     subject_template:
-      other: "%{count}件の通報が対応待ちです"
+      other: '%{count}件の通報が対応待ちです'
   invite_password_instructions:
     subject_template: "%{site_name} アカウントのパスワードを設定"
   flag_reasons:
@@ -955,8 +941,6 @@ ja:
       text_body_template: "ユーザの一括招待が処理され、%{sent}通の招待メールを送信しました"
     bulk_invite_failed:
       subject_template: "ユーザの一括招待中にエラーが発生しました"
-    csv_export_succeeded:
-      subject_template: "データのダウンロード準備が完了しました"
     csv_export_failed:
       subject_template: "データのエクスポートに失敗しました"
     email_reject_parsing:
@@ -965,7 +949,7 @@ ja:
         メールから回答を見つける事ができませんでした。返信はメールのトップにあることを確認してください。インライン回答を見つける事はできません。
     pending_users_reminder:
       subject_template:
-        other: "%{count} 人のユーザか承認を待っています。"
+        other: '%{count} 人のユーザか承認を待っています。'
       text_body_template: |
         新たなユーザが、フォーラム参加のための承認（もしくは拒否）待ち状態になっています。
 
@@ -1191,12 +1175,8 @@ ja:
       name: はじめての絵文字
   admin_login:
     success: "メールを送信しました"
-    error: "エラー！"
     email_input: "アドミンメール"
     submit_button: "メールを送信する"
   performance_report:
     initial_post_raw: このトピックでは、あなたのサイトの毎日のパフォーマンスレポートが含まれています。
     initial_topic_title: ウェブサイトパフォーマンスレポート
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index 6220d2e962a..a0c99eb58ee 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -17,12 +17,12 @@ ko:
       date_only: "%B %-d, %Y"
       long: "%B %-d, %Y, %l:%M%P"
   date:
-    month_names: [null, 1월, 2월, 3월, 4월, 5월, 6월, 7월, 8월, 9월, 10월, 11월, 12월]
+    month_names: [~, 1월, 2월, 3월, 4월, 5월, 6월, 7월, 8월, 9월, 10월, 11월, 12월]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "오전"
     pm: "오후"
-    <<: *datetime_formats
   title: "Discourse"
   topics: "토픽"
   posts: "포스트"
@@ -67,19 +67,18 @@ ko:
       present: 공백이어야 합니다.
       confirmation: " %{attribute} 속성과 맞지 않음"
       empty: 필수 작성
-      equal_to: '다음 숫자와 같아야 함: %{count}'
+      equal_to: "다음 숫자와 같아야 함: %{count}"
       even: 짝수여야 함
       exclusion: 예약됨
-      greater_than: '%{count}보다 커야 함'
-      greater_than_or_equal_to: '%{count}보다 크거나 같아야 함'
+      greater_than: "%{count}보다 커야 함"
+      greater_than_or_equal_to: "%{count}보다 크거나 같아야 함"
       has_already_been_used: "이미 사용되었음"
       inclusion: 리스트에 없음
       invalid: 올바르지 않음
       is_invalid: "문장이 불분명합니다."
       contains_censored_words: "검열된 단어가 있습니다: %{censored_words}"
-      matches_censored_pattern: "해당 단어는 사이트에서 검열하는 정규식을 포함하고 있습니다: %{censored_words}"
-      less_than: '%{count}보다 작아야 함'
-      less_than_or_equal_to: '%{count}보다 작거나 같아야 함'
+      less_than: "%{count}보다 작아야 함"
+      less_than_or_equal_to: "%{count}보다 작거나 같아야 함"
       not_a_number: 숫자가 아님
       not_an_integer: 정수여야 함
       odd: 홀수여야 함
@@ -107,6 +106,9 @@ ko:
       max_username_length_range: "최대값은 최소값보다 작게 설정할 수 없습니다."
       default_categories_already_selected: "다른 목록에서 사용중인 카테고리는 선택할 수 없습니다."
       s3_upload_bucket_is_required: "'s3_upload_bucket'이 설정되지 않으면 S3로 업로드하기를 활성화할 수 없습니다."
+  activemodel:
+    errors:
+      <<: *errors
   invite:
     not_found: "초대 토큰이 유효하지 않습니다. 사이트 관리자에게 문의하세요."
     user_exists: "<b>%{email}</b>님은 초대하지 않아도 됩니다. <a href='/u/%{username}/summary'>이미 회원이거든요!</a>"
@@ -127,7 +129,7 @@ ko:
   reading_time: "읽은 시간"
   likes: "좋아요"
   too_many_replies:
-    other: "죄송합니다. 신규 가입자는 글 하나에 %{count}개까지만 댓글을 달 수 있습니다."
+    other: 죄송합니다. 신규 가입자는 글 하나에 %{count}개까지만 댓글을 달 수 있습니다.
   embed:
     start_discussion: "토론 시작"
     continue: "토론 계속하기"
@@ -137,29 +139,28 @@ ko:
     no_hosts: "임베딩을 위한 호스트가 설정되지 않았습니다."
     configure: "삽입 설정"
     more_replies:
-      other: "추가 %{count} 개 댓글"
+      other: 추가 %{count} 개 댓글
     loading: "토론 불러오는 중..."
     permalink: "Permalink"
     imported_from: "%{link}에 있는 원글과 유사한 토론 글입니다."
     in_reply_to: "▶ %{username}"
     replies:
-      other: "답글 %{count}개"
+      other: 답글 %{count}개
   no_mentions_allowed: "죄송합니다, 다른 사용자를 언급할 수 없습니다."
   too_many_mentions:
-    other: "죄송합니다, 이 포스트에서 %{count}명의 사용자만 언급할 수 있습니다."
+    other: 죄송합니다, 이 포스트에서 %{count}명의 사용자만 언급할 수 있습니다.
   no_mentions_allowed_newuser: "죄송합니다. 새로운 사용자는 다른 사용자를 언급할 수 없습니다."
   too_many_mentions_newuser:
-    other: "죄송합니다. 신규 회원은 %{count}명의 사용자만 언급할 수 있습니다."
+    other: 죄송합니다. 신규 회원은 %{count}명의 사용자만 언급할 수 있습니다.
   no_images_allowed: "죄송합니다. 신규 회원은 글에 이미지를 넣을 수 없습니다."
   too_many_images:
-    other: "죄송합니다. 신규회원은 글 하나에 %{count}개의 이미지만 넣을 수 있습니다."
+    other: 죄송합니다. 신규회원은 글 하나에 %{count}개의 이미지만 넣을 수 있습니다.
   no_attachments_allowed: "죄송합니다. 신규회원은 글에 파일을 첨부할 수 없습니다."
   too_many_attachments:
-    other: "죄송합니다. 신규회원은 글 하나에 %{count}개의 파일만 첨부할 수 있습니다."
+    other: 죄송합니다. 신규회원은 글 하나에 %{count}개의 파일만 첨부할 수 있습니다.
   no_links_allowed: "죄송합니다. 신규회원은 글에 링크를 넣을 수 없습니다."
   too_many_links:
-    other: "죄송합니다. 신규회원은 글 하나에 링크를 %{count}개까지 넣을 수 있습니다."
-  contains_blocked_words: "포스트에 금지 단어가 포함되어 있습니다."
+    other: 죄송합니다. 신규회원은 글 하나에 링크를 %{count}개까지 넣을 수 있습니다.
   spamming_host: "죄송합니다. 회원님은 링크를 첨부할 수 없습니다."
   user_is_suspended: "가입이 보류된 회원은 글을 쓸 수 없습니다."
   topic_not_found: "뭔가 잘못됐네요. 아마 읽려는 도중에  토픽이 닫혔거나 지워진 건 아닐까요?"
@@ -191,7 +192,6 @@ ko:
     top_weekly: "주간 인기 토픽"
     top_daily: "일간 인기 토픽"
     posts: "최근 글"
-    private_posts: "최신 개인 메시지"
     group_posts: "%{group_name}의 최신 게시글"
     group_mentions: "%{group_name}의 최신 멘션"
     user_posts: "@%{username}님의 최신 포스트"
@@ -204,11 +204,8 @@ ko:
   queue:
     delete_reason: "운영팀이 글을 지웠습니다."
   groups:
-    success:
-      bulk_add: "%{users_added}명의 사용자가 그룹에 추가되었습니다."
     errors:
       can_not_modify_automatic: "자동 설정 그룹은 수정할 수 없습니다."
-      member_already_exist: "'%{username}'은 이미 이 그룹의 멤버입니다."
       invalid_domain: "'%{domain}'은 유효한 도메인이 아닙니다."
       invalid_incoming_email: "'%{email}' 는 올바른 이메일 주소가 아닙니다."
       email_already_used_in_group: "'%{email}'는 '%{group_name}' 그룹에서 이미 사용중입니다."
@@ -228,8 +225,8 @@ ko:
       title: "@%{group_name}그룹에 가입 신청"
   education:
     until_posts:
-      other: "글 %{count}개"
-    new-topic: |
+      other: 글 %{count}개
+    'new-topic': |
       %{site_name}에 오신 것을 환영합니다 &mdash; **새로운 대화를 시작해서 감사합니다.**
 
       - 제목을 큰소리로 읽어봤을 때 흥미롭게 들리던가요? 좋은 요약문인가요?
@@ -239,7 +236,7 @@ ko:
       - 사람들이 *검색*할 수 있도록 토픽에 흔히 사용하는 단어를 집어넣으세요. 관련 토픽과 같이 엮으려면 해당 카테고리를 선택하시고요.
 
       이 글은 당신의 첫 %{education_posts_text} 에서만 나옵니다. 자세한 내용은 [커뮤니티 가이드라인](/guidelines)을 참조하세요.
-    new-reply: |
+    'new-reply': |
       %{site_name}에 오신것을 환영합니다! &mdash; **참여해주셔서 감사합니다!**
 
       - 당신의 댓글이 어떤 식으로든 토론을 발전시키나요?
@@ -285,12 +282,6 @@ ko:
       죄송하지만, 새로운 사용자는 한 토픽 당%{newuser_max_replies_per_topic}개의 답글만 쓸 수 있습니다.
 
       새 답글을 다는 대신에, 전에 쓴 답글을 수정하거나 다른 토픽을 구경해보세요.
-    reviving_old_topic: |
-      ### 이 토픽을 다시 살려보고 싶으세요?
-
-      마지막으로 답글이 달린 지 **%{days}** 일이 지났습니다. 여기에 답글을 쓰시면 토픽이 리스트의 상단으로 껑충 뛰어오르고, 이 토픽과 관련된 사람들에게 알림이 가게 됩니다.
-
-      이 오래된 대화를 이어가고 싶은 것이 확실하신가요?
   activerecord:
     attributes:
       category:
@@ -303,13 +294,12 @@ ko:
       user_profile:
         bio_raw: "내 소개"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "개인 메시지를 통해 경고를 보낼 수 있습니다."
               too_many_users: "한 번에 한 명의 사용자에게 경고를 보낼 수 있습니다."
-              cant_send_pm: "죄송합니다. 그 사용자에게 개인 메세지를 보낼 수 없습니다."
               no_user_selected: "유효한 사용자를 선택해주십시오"
               reply_by_email_disabled: "이메일로 답글쓰기가 비활성화되었습니다."
             featured_link:
@@ -348,7 +338,6 @@ ko:
           attributes:
             word:
               too_many: "해당 행동을 위한 단어가 너무 많습니다."
-      <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>프로필의 자기소개란이 비어있습니다. <a href='/u/%{username_lower}/preferences/about-me'>뭔가 써보지 않으실래요?</a></div>"
     no_info_other: "<div class='missing-profile'>%{name}님께서는 아직 프로필을 작성하지 않으셨습니다</div>"
@@ -364,23 +353,23 @@ ko:
     title: "Discourse에 오신 것을 환영합니다"
     body: |2
 
-      고정된 토픽의 첫 문단은 홈페이지에 들어오는 사람들에게 환영 메시지로 보이게 됩니다. 그래서 매우 중요해요!
+        고정된 토픽의 첫 문단은 홈페이지에 들어오는 사람들에게 환영 메시지로 보이게 됩니다. 그래서 매우 중요해요!
 
-      커뮤니티를 알릴 수 있도록 **이 글을 편집하세요**
+        커뮤니티를 알릴 수 있도록 **이 글을 편집하세요**
 
-      - 누구를 위한 커뮤니티인가요?
-      - 여기에서 무엇을 얻을 수 있나요?
-      - 여기에 왜 와야하나요?
-      - 더 알고싶으면 뭘 봐야 하나요 (링크, 자료, 기타 등등)?
+        - 누구를 위한 커뮤니티인가요?
+        - 여기에서 무엇을 얻을 수 있나요?
+        - 여기에 왜 와야하나요?
+        - 더 알고싶으면 뭘 봐야 하나요 (링크, 자료, 기타 등등)?
 
-      <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+        <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
 
-      이 토픽에 답글이 쌓이는 게 싫다면, 관리기능 :wrench:(우측 상단에 있어요)을 통해 이 토픽을 닫을 수 있습니다.
+        이 토픽에 답글이 쌓이는 게 싫다면, 관리기능 :wrench:(우측 상단에 있어요)을 통해 이 토픽을 닫을 수 있습니다.
   lounge_welcome:
     title: "라운지에 오신 것을 환영합니다."
     body: |2
 
-      축하합니다! :confetti_ball: 당신의 회원등급이 **지도자** (회원등급 3등급)로 올라갔기 때문에 이 토픽을 볼 수 있게 되었습니다. 이제부터 아래의 행동들을 할 수 있습니다 &hellip; * 토픽 제목을 수정할 수 있습니다 * 토픽의 카테고리를 수정할 수 있습니다 * 링크가 follow로 처리됩니다 ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) 가 제거됩니다) * 회원등급 3 이상인 사용자가 접근할 수 있는 비공개 카테고리인 라운지에 접근할 수 있습니다 * 좋아요와 신고의 가중치가 높아집니다 [정규 멤버 목록](&#x2F;badges/3/regular)을 확인할 수 있습니다. 인사하는 것을 잊지마세요. 이 커뮤니티의 중요한 역할을 해주신 것에 감사드립니다! (회원등급에 관한 더 자세한 정보를 보시려면, [이 토픽 확인하세요][trust]. 기준에 맞는 사람만 정규 회원으로 자격이 유지됩니다.) [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+        축하합니다! :confetti_ball: 당신의 회원등급이 **지도자** (회원등급 3등급)로 올라갔기 때문에 이 토픽을 볼 수 있게 되었습니다. 이제부터 아래의 행동들을 할 수 있습니다 &hellip; * 토픽 제목을 수정할 수 있습니다 * 토픽의 카테고리를 수정할 수 있습니다 * 링크가 follow로 처리됩니다 ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) 가 제거됩니다) * 회원등급 3 이상인 사용자가 접근할 수 있는 비공개 카테고리인 라운지에 접근할 수 있습니다 * 좋아요와 신고의 가중치가 높아집니다 [정규 멤버 목록](&#x2F;badges/3/regular)을 확인할 수 있습니다. 인사하는 것을 잊지마세요. 이 커뮤니티의 중요한 역할을 해주신 것에 감사드립니다! (회원등급에 관한 더 자세한 정보를 보시려면, [이 토픽 확인하세요][trust]. 기준에 맞는 사람만 정규 회원으로 자격이 유지됩니다.) [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "'%{category}' 카테고리의 설명"
     replace_paragraph: "(이 문단을 새로운 카테고리를 간단히 설명하는 내용으로 대체하세요. 이 가이드는 카테고리 섹션 영역에 표시되므로, 200자 이하로 유지하는 게 좋습니다. **이 설명을 편집하거나 토픽을 생성하기 전까지는, 이 카테고리는 카테고리 페이지에 표시되지 않습니다.**)"
@@ -397,7 +386,7 @@ ko:
       uncategorized: "Uncategorized는 삭제할 수 없습니다."
       has_subcategories: "하위 카테고리가 있어, 삭제할 수 없습니다."
       topic_exists:
-        other: "%{count}개의 글타래가 이 카테고리 내에 있어 삭제할 수 없습니다. 가장 오래된 글타래는 %{topic_link}입니다."
+        other: '%{count}개의 글타래가 이 카테고리 내에 있어 삭제할 수 없습니다. 가장 오래된 글타래는 %{topic_link}입니다.'
       topic_exists_no_oldest: "%{count}개의 글타래가 이 카테고리 내에 있어 삭제할 수 없습니다."
     uncategorized_description: "카테고리가 필요없는 토픽이거나, 토픽에 부합하는 카테고리가 없습니다."
   trust_levels:
@@ -413,78 +402,61 @@ ko:
       title: "리더"
     change_failed_explanation: "당신은 %{user_name} 사용자를 '%{new_trust_level}'으로 강등시키려 하였습니다. 하지만 해당 사용자의 회원등급는 이미 '%{current_trust_level}'입니다. %{user_name} 사용자의 회원등급는 '%{current_trust_level}'으로 유지됩니다.  - if you wish to demote user lock trust level first"
   rate_limiter:
-    slow_down: "해당 작업을 너무 많이 수행했습니다. 잠시후 다시 시도해보세요. "
-    too_many_requests: "지금 하시려는 행동에는 하루 제한이 있습니다. %{time_left} 동안 기다리시고 다시 시도해 주세요."
-    by_type:
-      first_day_replies_per_day: "새 유저가 가입한 첫 날에 작성할 수 있는 댓글의 최대 갯수에 도달했습니다. %{time_left}동안 기다리셨다가 다시 시도해보세요."
-      first_day_topics_per_day: "새 유저가 가입한 첫 날에 작성할 수 있는 토픽의 최대 갯수에 도달했습니다. %{time_left}동안 기다리셨다가 다시 시도해보세요."
-      create_topic: "너무 빨리 토픽을 작성했습니다. %{time_left}동안 기다리셨다가 다시 시도해보세요."
-      create_post: "너무 빨리 댓글을 작성했습니다. %{time_left}동안 기다리셨다가 다시 시도해보세요."
-      delete_post: "포스트 삭제속도가 너무 빠릅니다. %{time_left}후에 다시 시도해주세요."
-      public_group_membership: "그룹 가입/탈퇴가 너무 잦습니다. %{time_left} 후에 다시 시도해주세요."
-      topics_per_day: "생성할 수 있는 토픽의 일일최대값에 도달했습니다. %{time_left} 후에 다시 시도하세요."
-      pms_per_day: "보낼 수 있는 메시지의 일일최대값에 도달했습니다. %{time_left} 후에 다시 시도하세요."
-      create_like: "쓸 수 있는 좋아요의 일일최대값에 도달했습니다. %{time_left} 후에 다시 시도하세요."
-      create_bookmark: "북마크할 수 있는 일일최대값에 도달했습니다. %{time_left} 후에 다시 시도하세요."
-      edit_post: "일일 최대 편집 횟수에 도달했습니다. %{time_left} 후에 다시 시도하세요."
-      live_post_counts: "실시간 포스트 카운트를 너무 빨리 요청하셨습니다. %{time_left} 후에 다시 시도하세요."
-      unsubscribe_via_email: "이메일을 통한 구독취소 일일 최대값에 도달했습니다. %{time_left} 후에 다시 시도하세요."
-      topic_invitations_per_day: "토픽으로 초청하기의 일일최대값에 도달했습니다. %{time_left} 후에 다시 시도하세요."
     hours:
-      other: "%{count}시간"
+      other: '%{count}시간'
     minutes:
-      other: "%{count}분"
+      other: '%{count}분'
     seconds:
-      other: "%{count}초"
+      other: '%{count}초'
   datetime:
     distance_in_words:
       half_a_minute: "<1분"
       less_than_x_seconds:
-        other: "< %{count}초"
+        other: < %{count}초
       x_seconds:
-        other: "%{count}초"
+        other: '%{count}초'
       less_than_x_minutes:
-        other: "< %{count}분"
+        other: < %{count}분
       x_minutes:
-        other: "%{count}분"
+        other: '%{count}분'
       about_x_hours:
-        other: "%{count}시간"
+        other: '%{count}시간'
       x_days:
-        other: "%{count}일"
+        other: '%{count}일'
       about_x_months:
-        other: "%{count}달"
+        other: '%{count}달'
       x_months:
-        other: "%{count}달"
+        other: '%{count}달'
       about_x_years:
-        other: "%{count}년"
+        other: '%{count}년'
       over_x_years:
-        other: "%{count}년 보다 전"
+        other: '%{count}년 보다 전'
       almost_x_years:
-        other: "약 %{count}년"
+        other: 약 %{count}년
     distance_in_words_verbose:
       half_a_minute: "방금 전"
       less_than_x_seconds:
-        other: "방금 전"
+        other: 방금 전
       x_seconds:
-        other: "%{count}초 전"
+        other: '%{count}초 전'
       less_than_x_minutes:
-        other: "%{count}분 보다 이전"
+        other: '%{count}분 보다 이전'
       x_minutes:
-        other: "%{count}분 전"
+        other: '%{count}분 전'
       about_x_hours:
-        other: "%{count}시간 전"
+        other: '%{count}시간 전'
       x_days:
-        other: "%{count}일 전"
+        other: '%{count}일 전'
       about_x_months:
-        other: "약 %{count}달 전"
+        other: 약 %{count}달 전
       x_months:
-        other: "${count}달 전"
+        other: ${count}달 전
       about_x_years:
-        other: "약 %{count}년 전"
+        other: 약 %{count}년 전
       over_x_years:
-        other: "%{count}년 보다 이전"
+        other: '%{count}년 보다 이전'
       almost_x_years:
-        other: "약 %{count}년 전"
+        other: 약 %{count}년 전
   password_reset:
     no_token: "죄송하지만, 해당 비밀번호 변경 링크는 너무 오래됐습니다. 로그인 버튼을 눌러서 '비밀번호를 잊어버렸어요'를 사용하여 새로운 링크를 받으세요."
     choose_new: "새로운 비밀번호를 입력하세요"
@@ -538,8 +510,6 @@ ko:
       long_form: '부적절함으로 신고하기'
     notify_user:
       title: '@{{username}} 님에게 메시지를 보냅니다'
-      description: '포스트에 대하여 작성자와 직접 개인적으로 이야기하고 싶습니다.'
-      short_description: '포스트에 대하여 작성자와 직접 개인적으로 이야기하고 싶습니다.'
       long_form: '메세지한 유저'
       email_title: '"%{title}" 내의 당신의 글'
       email_body: "%{link}\n\n%{message}"
@@ -638,9 +608,7 @@ ko:
       xaxis: "일"
       yaxis: "방문자 수"
     signups:
-      title: "새 사용자"
       xaxis: "일"
-      yaxis: "새로운 사용자 수"
     profile_views:
       title: "회원 프로필 조회수"
       xaxis: "일"
@@ -678,7 +646,6 @@ ko:
       xaxis: "일"
       yaxis: "이메일 수"
     user_to_user_private_messages:
-      title: "사용자대 사용자"
       xaxis: "일"
       yaxis: "메세지 수"
     system_private_messages:
@@ -725,7 +692,6 @@ ko:
       xaxis: "일"
       yaxis: "로봇 페이지뷰"
     page_view_total_reqs:
-      title: "총"
       xaxis: "일"
       yaxis: "총 페이지뷰"
     page_view_logged_in_mobile_reqs:
@@ -789,27 +755,22 @@ ko:
     failing_emails_warning: '실패한 이메일 작업이 %{num_failed_jobs} 개 있습니다. app.yml 을 열어서 메일 서버 설정이 정확한지 확인해보세요. <a href="/sidekiq/retries" target="_blank">Sidekiq에서 실패한 작업 보기</a>.'
     subfolder_ends_in_slash: "서브폴더 설정이 정확하지 않습니다. DISCOURSE_RELATIVE_URL_ROOT 다음에 슬래시가 있습니다."
     email_polling_errored_recently:
-      other: "이메일 폴링에서 지난 24시간 동안%{count}개의 에러가 발생하였습니다. 세부 정보는 <a href='/logs' target='_blank'>로그</a>에서 확인하세요."
-    missing_mailgun_api_key: "서버가 mailgun으로 이메일을 보내도록 설정되어 있지만, webhook 메시지를 인증한 API키를 입력하지 않으셨습니다."
+      other: 이메일 폴링에서 지난 24시간 동안%{count}개의 에러가 발생하였습니다. 세부 정보는 <a href='/logs' target='_blank'>로그</a>에서 확인하세요.
     bad_favicon_url: "파비콘 불러오기가 실패했습니다. <a href='/admin/site_settings'>사이트 설정</a>에서 favicon_url 설정을 확인해보세요."
     poll_pop3_timeout: "타임아웃으로 POP3 연결이 실패했습니다. 수신 이메일을 가져올 수 없습니다. <a href='/admin/site_settings/category/email'>POP3 설정</a> 과 서비스 제공자를 확인하세요."
     poll_pop3_auth_error: "인증 실패로 POP3 연결이 실패했습니다. <a href='/admin/site_settings/category/email'>POP3 설정</a>을 확인하세요."
   site_settings:
     censored_words: "단어는 자동적으로 `&#9632;&#9632;&#9632;&#9632;` 로 대체 됩니다."
-    censored_pattern: "자동으로 `&#9632;&#9632;&#9632;&#9632;` 로 대체되는 정규표현식"
     delete_old_hidden_posts: "30일이 지난 숨겨진 글은 자동으로 삭제됩니다."
-    default_locale: "Discourse 인스턴스가 사용하는 기본 언어 (ISO 639-1 Code)"
     allow_user_locale: "사용자에게 자신이 원하는 언어를 선택 허용"
     set_locale_from_accept_language_header: "익명 사용자의 인터페이스 언어를 웹브라우저 언어 헤더를 기준으로 변경하기(실험적인 기능입니다. 익명 cache와 동작하지 않습니다.)"
     min_post_length: "글의 최소 글자 수"
     min_first_post_length: "첫 글 (내용)의 최소 길이"
-    min_private_message_post_length: "메세지 내용의 최소 길이"
     max_post_length: "글의 최대 글자 수"
     topic_featured_link_enabled: "토픽에 링크 게시글 달기 활성화"
     show_topic_featured_link_in_digest: "요약 메일에 토픽 주요 링크 보이게 하기."
     min_topic_title_length: "글타래 제목의 최소 글자 수"
     max_topic_title_length: "글타래 제목의 최대 글자 수"
-    min_private_message_title_length: "메세지 제목의 최소 길이"
     min_search_term_length: "검색을 하기 위한 최소 글자 수"
     search_tokenize_chinese_japanese_korean: "CJK(한중일) 설정이 되어 있지 않은 사이트라도, 검색시 한중일 언어를 토크나이징하도록 강제합니다."
     search_prefer_recent_posts: "이 옵션을 켜면, 포럼이 너무 커서 검색이 느리게 작동할 때 최근의 포스트부터 먼저 검색합니다."
@@ -858,7 +819,6 @@ ko:
     summary_likes_required: "하나의 글타래에 대하여 요약본 보기 모드가 활성화되기 전까지 요구되는 최소 좋아요 수"
     summary_percent_filter: "요약본 보기를 클릭시, 글 중에 몇 %의 상위 글을 보여줄 것인가?"
     summary_max_results: "이 주제에 대한 요약 글 최대 갯수"
-    enable_private_messages: "신뢰도 1 사용자(메시지 전송을 위한 최소 신뢰도로 설정가능)가 메시지를 작성하고 답장을 쓸 수 있도록 허용합니다. 운영진은 언제나 메시지를 보낼 수 있음을 참고하세요."
     enable_long_polling: "Message bus used for notification can use long polling"
     long_polling_base_url: "long polling에 사용 될 Base URL (CDN이 동적 콘텐트를 제공할 시에는 origin pull로 설정) eg: http://origin.site.com"
     long_polling_interval: "보낼 데이터가 없을 때 응답 전에 서버가 기다려야하는 시간 (로그인된 유저 전용)"
@@ -874,7 +834,6 @@ ko:
     tl4_additional_likes_per_day_multiplier: "tl4 (리더)의 일별 좋아요 제한을 올릴 배수"
     flag_sockpuppets: "어떤 신규 사용자(예:24이내 가입자)가 글타래를 생성하고 같은 IP주소의 또 다른 신규 사용자가 댓글을 쓰면 자동 스팸 신고"
     traditional_markdown_linebreaks: "Markdown에서 전통적인 linebreak를 사용, linebreak시 두개의 trailing space를 사용하는 것."
-    enable_markdown_typographer: "문단의 가독성을 높이기 위해서 기본 타이포그라피 룰을 사용합니다. (c) (tm), 기타 기호를 교체하고 연달아 나오는 물음표의 갯수를 줄입니다."
     post_undo_action_window_mins: "사용자가 어떤 글에 대해서 수행한 작업(신고 등)을 취소하는 것이 허용되는 시간(초)"
     must_approve_users: "스태프는 반드시 사이트 엑세스권한을 허용하기 전에 모든 신규가입계정을 승인해야 합니다. 경고: 이것을 활성화하면 기존 스태프 아닌 회원들의 엑세스권한이 회수됩니다."
     pending_users_reminder_delay: "새로운 사용자가 승인을 기다리는 시간이 여기에 지정된 시간횟수보다 더 길어길경우 운영자에게 알려줍니다. 알림을 해제하려면 -1로 설정하세요."
@@ -915,7 +874,6 @@ ko:
     version_checks: "Dicousre Hub에 ping을 날려 버전 업데이트와 새 버전 알림을 /admin 대시보드에 보이게 합니다."
     new_version_emails: "사용가능한 새로운 업데이트가 있으면 등록된 contact_email 주소로 메일을 발송하여 알려줍니다."
     invite_expiry_days: "사용자 초대키 유효 기간, 일"
-    invite_passthrough_hours: "사용되어진 방문키를 로그인하는데 재사용할 수 있는 기간, 시간"
     invite_only: "가입 비공개화, 운영진에 의한 초대로만 신규 사용자 가입."
     login_required: "글을 읽으려면 인증(로그인)이 필요함"
     min_username_length: "최소 아이디 글자수. 경고: 이미 가입한 사용자나 그룹의 아이디 길이가 이 값보다 작으면 사이트가 깨집니다!"
@@ -937,7 +895,6 @@ ko:
     sso_overrides_avatar: "SSO로 접속 시 사용자 아바타 이미지 갱신. 활성화하고 allow_uploaded_avatars를 비활성화를 매우 권장합니다."
     sso_not_approved_url: "승인안된 SSO 계정은 이 URL로 이동"
     sso_allows_all_return_paths: "SSO로 제공된 return_paths를 위한 도메인 제한 해제 (기본 return path는 현재 사이트로 설정)"
-    enable_local_logins: "기존의 로컬 username, password에 의한 인증을 허용. (초대 기능이 필요하다면 이 기능을 허용해야 함)"
     allow_new_registrations: "새로운 사용자 가입을 허락함. 새로운 계정 생성을 막으려면 체크하지 않음."
     enable_signup_cta: "재방문한 익명 사용자에게 가입 권유 공지 표시"
     enable_yahoo_logins: "야후 인증 활성화"
@@ -945,15 +902,12 @@ ko:
     google_oauth2_client_id: "Google Application의 Client ID"
     google_oauth2_client_secret: "Google Application의 Client Secret"
     enable_twitter_logins: "Twitter 인증을 활성화합니다. twitter_consumer_key와 twitter_consumer_secret 필요."
-    twitter_consumer_key: "http://dev.twitter.com에 등록된 Twitter 인증을 위한 Consumer key"
-    twitter_consumer_secret: "http://dev.twitter.com에 등록된 Twitter 인증을 위한 Consumer secret"
     enable_instagram_logins: "인스타그램 인증 켜기, instagram_consumer_key 와 instagram_consumer_secret 필요"
     instagram_consumer_key: "인스타그램 인증을 위한 Consumer key "
     instagram_consumer_secret: "인스타그램 인증을 위한 Consumer secret"
     enable_facebook_logins: "Facebook 인증을 활성화합니다. facebook_app_id와 facebook_app_secret 필요."
     facebook_app_id: "https://developers.facebook.com/apps에 등록된 Facebook 인증을 위한 App id"
     facebook_app_secret: "https://developers.facebook.com/apps에 등록된 Facebook 인증을 위한 App secret"
-    facebook_request_extra_profile_details: "Facebook에서 자기소개, 위치, 웹사이트를 요청(인증 어플리케이션이 Facebook으로부터 허가 받아야 함)"
     enable_github_logins: "Github 인증을 활성화한다. github_client_id와 github_client_secret 필요."
     github_client_id: "https://github.com/settings/applications에 등록된 Github 인증을 위한 Client id"
     github_client_secret: "https://github.com/settings/applications에 등록된 Github 인증을 위한 Client secret"
@@ -961,7 +915,6 @@ ko:
     allow_restore: "데이터 복원을 허용합니다. 이 사이트의 모든 데이터가 변경될 수 있다. 백업이나 복원 계획이 없다면 비활성화로 놔둡니다."
     maximum_backups: "디스크에 유지할 최대 백업 개수. 오래된 백업순으로 자동으로 삭제된다."
     automatic_backups_enabled: "설정된 백업 주기로 자동 백업 실행"
-    backup_frequency: "하루에 몇 번 백업을 받을까요?"
     enable_s3_backups: "백업이 완료되면 Amazon S3로 업로드합니다. 중요: s3 credentials을 기입되어있는지 확인 필요"
     s3_backup_bucket: "백업본을 유지할 s3 버켓 이름. 주의 : 프라이빗 버켓인지 반드시 확인해야하세요."
     s3_disable_cleanup: "로컬에서 백업 삭제 시 S3에서 백업 제거하는 기능 해제"
@@ -983,7 +936,6 @@ ko:
     max_bookmarks_per_day: "사용자가 하루동안 할 수 있는 최대 북마크 개수"
     max_edits_per_day: "사용자가 하루동안 할 수 있는 최대 편집 수"
     max_topics_per_day: "사용자가 하루동안 생성할 수 있는 최대 글타래 개수"
-    max_private_messages_per_day: "하루에 유저가 쓸 수 있는 최대 메세지 갯수"
     max_invites_per_day: "하루에 보낼 수 있는 초대장의 최대치입니다."
     max_topic_invitations_per_day: "하루에 유저가 최대로 보낼 수 있는 글타래 초대장 수"
     max_logins_per_ip_per_hour: "시간 당 동일 IP에서 로그인할 수 있는 최대 사용자 수"
@@ -998,7 +950,6 @@ ko:
     clean_orphan_uploads_grace_period_hours: "참조되지 않은 업로드 파일을 제거하기 전 기간(시간)"
     purge_deleted_uploads_grace_period_days: "참조되지 않은 업로드 파일을 완전 삭제하지 전 기간(일)"
     enable_s3_uploads: "Amazon S3 storage에 업로드해주세요. 중요: 올바른 S3 계정이 필요합니다.(access key id와 secret access key 둘다)"
-    s3_use_iam_profile: 'AWS EC2 IAM role로 key를 받음. 정보: 활성화하면 "s3 access key id"와 "s3 secret access key" 설정도 같이 변경됩니다.'
     s3_upload_bucket: "파일이 업로드 될 위치의 Amazon S3 bucket name.  경고: 소문자 알파벳만 허용되며 점 . 이나 밑줄문자 _ 가 없어야 함."
     s3_access_key_id: "이미지를 업로드 할 때 사용할 Amazon S3의 access key id"
     s3_secret_access_key: "이미지를 업로드 할 때 사용할 Amazon S3의 secret access key"
@@ -1043,7 +994,6 @@ ko:
     min_trust_to_edit_wiki_post: "위키로 설정된 글 수정할 수 있는 최소 회원등급"
     min_trust_to_edit_post: "포스트를 편집하기 위한 최소 신뢰도"
     min_trust_to_allow_self_wiki: "사용자의 포스트 위키를 만들기 위한 최소 신뢰도"
-    min_trust_to_send_messages: "새로운 개인 메시지를 보내기 위한 최소 신뢰도"
     newuser_max_links: "새로운 사용자가 글에 붙일 수 있는 최대 링크 개수"
     newuser_max_images: "새로운 사용자가 글에 붙일 수 있는 최대 이미지 개수"
     newuser_max_attachments: "새로운 사용자가 포스트에 첨부할 수 있는 최대 파일 개수"
@@ -1053,7 +1003,6 @@ ko:
     max_users_notified_per_group_mention: "그룹이 멘션을 받으면 알림을 받는 최대사용자의 수(최대치에 도달하면 알림이 전송되지 않음)"
     create_thumbnails: "글의 너무 큰 크기의 이미지는 thumnails와 lightbox를 만든다."
     email_time_window_mins: "알림 메일을 보내기 전 대기 기간(분), 사용자에게 글의 변경하고 완료할 수 있는 기회를 준다."
-    private_email_time_window_seconds: "사용자가 메시지를 재편집할 기회를 주기 위하여 개인 알림 메일을 보내기 이전에 설정한 시간만큼 대기합니다."
     email_posts_context: "알림메일의 내용에 추가할 기존 답글 수"
     flush_timings_secs: "사용자의 이용 시간 데이터를 서버로 보내는 기간(초)"
     title_max_word_length: "글타래 제목안에 단어들의 최대 길이"
@@ -1106,7 +1055,6 @@ ko:
     reply_by_email_enabled: "이메일을 통해 주제에 답글을 달 수 있음."
     reply_by_email_address: "이메일 주소로 답글을 다는 템플릿. 예: %{reply_key}@reply.myforum.com"
     alternative_reply_by_email_addresses: "수신된 이메일에 대한 답장메일의 대체 템플릿 목록. 예: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
-    incoming_email_prefer_html: "수신 이메일에 text 대신 HTML을 사용"
     disable_emails: "Discourse가 어떤 메일로 보내지 못하도록 합니다."
     strip_images_from_short_emails: "2800바이트, 즉 2.73 KB 이내 사이즈를 가지도록 이미지를 빼주세요."
     short_email_length: "짦은 이메일 바이트 길이"
@@ -1255,17 +1203,17 @@ ko:
     closed_enabled: "이 글타래는 이제 닫혔습니다. 새로운 답글을 다실 수 없습니다."
     closed_disabled: "이 글타래는 이제 열렸습니다. 새로운 답글을 다실 수 있습니다."
     autoclosed_enabled_days:
-      other: "이 글타래는 %{count}일 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다."
+      other: 이 글타래는 %{count}일 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다.
     autoclosed_enabled_hours:
-      other: "이 글타래는 %{count}시간 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다."
+      other: 이 글타래는 %{count}시간 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다.
     autoclosed_enabled_minutes:
-      other: "이 글타래는 %{count}분 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다."
+      other: 이 글타래는 %{count}분 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다.
     autoclosed_enabled_lastpost_days:
-      other: "이 글타래는 마지막 답글이 달리고 %{count}일 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다."
+      other: 이 글타래는 마지막 답글이 달리고 %{count}일 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다.
     autoclosed_enabled_lastpost_hours:
-      other: "마지막 댓글로부터 %{count} 시간이 지나 글타래가 자동으로 닫혔습니다. 새로운 댓글을 다실 수 없습니다."
+      other: 마지막 댓글로부터 %{count} 시간이 지나 글타래가 자동으로 닫혔습니다. 새로운 댓글을 다실 수 없습니다.
     autoclosed_enabled_lastpost_minutes:
-      other: "이 글타래는 마지막 답글이 달리고 %{count}분 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다."
+      other: 이 글타래는 마지막 답글이 달리고 %{count}분 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다.
     autoclosed_disabled: "이 글타래는 이제 열렸습니다. 새로운 답글을 허용합니다."
     autoclosed_disabled_lastpost: "이 글타래는 이제 열렸습니다. 새로운 답글을 허용합니다."
     pinned_enabled: "이 글타래는 고정되었습니다. 고정이 해제되기 전까지 카테고리의 상단에 나타납니다."
@@ -1319,7 +1267,7 @@ ko:
       domain_not_allowed: "유효하지 않은 웹사이트입니다. 허용되는 도메인 목록: %{domains}"
   flags_reminder:
     subject_template:
-      other: "%{count}개의 신고가 접수 대기 중"
+      other: '%{count}개의 신고가 접수 대기 중'
   unsubscribe_mailer:
     title: "메일링 구독해지"
   invite_password_instructions:
@@ -1353,8 +1301,6 @@ ko:
       text_body_template: "대량 사용자 초대가 진행되어 %{sent}개의 초대장을 보냈습니다."
     bulk_invite_failed:
       subject_template: "대량 사용자 초대 중 오류가 났습니다."
-    csv_export_succeeded:
-      subject_template: "데이터 추출이 완료되었습니다."
     csv_export_failed:
       subject_template: "데이터 추출 실패"
     email_reject_parsing:
@@ -1369,7 +1315,7 @@ ko:
       subject_template: "대기중인 신규 계정"
     pending_users_reminder:
       subject_template:
-        other: "%{count}명의 새로운 사용자가 가입 승인 대기중 입니다."
+        other: '%{count}명의 새로운 사용자가 가입 승인 대기중 입니다.'
       text_body_template: |
         가입 승인 대기중(또는 거절된)인 새로운 사용자가 있습니다.
 
@@ -1418,7 +1364,7 @@ ko:
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
-        %{message}
+          %{message}
     digest:
       why: "%{last_seen_at}부터 지금까지 %{site_link} 사이트 근황"
       since_last_visit: "마지막 방문 후 경과시간"
@@ -1520,22 +1466,22 @@ ko:
         이 배지는 처음으로 포스트를 편집했을 때 수여됩니다. 글을 고치는 것은 언제나 좋은 일이죠. 포스트를 더 낫게 만들 수도 있고, 작은 실수를 고칠 수도 있고, 처음 포스트를 올렸을 때 깜빡하고 못올렸던 걸 추가할 수도 있으니까요. 편집으로 당신의 포스트를 더 좋게 만들어보세요!
     basic_user:
       name: 초보회원
-      description: 모든 기본적인 커뮤니티 기능이 <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">수여되었습니다</a>
+      description: "모든 기본적인 커뮤니티 기능이 <a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">수여되었습니다</a>"
       long_description: |
         이 배지는 신뢰도 1에 도달했을 때 수여됩니다. 잠시 동안 머물러서 몇 가지 토픽을 읽고 이 커뮤니티가 어떤 곳인지 탐구해주셔서 감사합니다. 당신의 신규 사용자 제한은 사라졌습니다. 이제 개인 메시지 보내기, 신고하기, 위키 편집하기, 이미지나 링크를 여러 개 올리기와 같은 기본적인 커뮤니티 기능을 사용하실 수 있습니다.
     member:
       name: 준회원
-      description: 초대장 보내기, 그룹 메시징, 더 많은 좋아요 보내기가<a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">가능합니다</a>
+      description: "초대장 보내기, 그룹 메시징, 더 많은 좋아요 보내기가<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">가능합니다</a>"
       long_description: |
         이 배지는 신뢰도 2에 도달했을 때 수여됩니다. 몇 주가 넘도록 참여하시면서 우리 커뮤니티와 함께해주셔서 감사합니다. 이제 개인 토픽이나 사용자 페이지에서 초대장을 보낼 수 있고, 그룹 개인 메시지를 보내고 하루에 더 많은 좋아요를 보낼 수 있습니다.
     regular:
       name: 정회원
-      description: 카테고리 재조정, 이름바꾸기, 링크 팔로우, 위키, 더 많은 좋아요<a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">가 가능합니다.</a>
+      description: "카테고리 재조정, 이름바꾸기, 링크 팔로우, 위키, 더 많은 좋아요<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">가 가능합니다.</a>"
       long_description: |
         이 배지는 신뢰도 4에 도달했을 때 수여됩니다. 여러 달이 넘도록 우리 커뮤니티의 중요멤버가 되어주셔서 감사합니다. 당신은 가장 활동적인 구독자이고 우리 커뮤니티를 훌륭하게 만드는 믿을만한 기여자이기도 합니다. 이제 당신은 토픽의 이름을 바꾸거나 카테고리 재조정을 할 수 있고, 더 강력한 신고 기능과 개인 라운지의 사용이 가능합니다. 그리고 하루에 더 많은 좋아요를 보낼 수 있습니다.
     leader:
       name: 지도자
-      description: 전역 편집, 핀 고정, 닫기, 아카이브, 자르고 붙이기, 더 많은 좋아요가<a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">가능합니다</a>
+      description: "전역 편집, 핀 고정, 닫기, 아카이브, 자르고 붙이기, 더 많은 좋아요가<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">가능합니다</a>"
       long_description: |
         이 배지는 신뢰도 4에 도달했을 때 수여됩니다. 당신은 운영진에게 선택받은 이 커뮤니티의 리더입니다. 당신의 말과 행동은 이 커뮤니티의 다른 사용자에게 좋은 모범이 되고 있습니다. 이제 당신은 모든 포스트를 편집할 수 있는 권한과 핀 고정, 닫기, 목록해제, 아카이브, 자르기, 붙이기 같은 공통 토픽 운영권한을 가지게 됩니다. 그리고 하루에 엄청나게 많은 좋아요를 보낼 수 있습니다.
     welcome:
@@ -1608,8 +1554,6 @@ ko:
     promoter:
       name: 후원자
       description: 사용자를 초청했습니다
-      long_description: |
-        이 배지는 사용자 페이지나 토픽의 하단에서 초대 버튼을 눌러 다른 사람을 우리 커뮤니티에 초대했을 때 수여됩니다. 특정 주제에 대해 흥미를 느낄 것 같은 친구를 초대하는 것은 우리 커뮤니티를 새로운 사람에게 알리는 훌륭한 방법입니다. 고마워요!
     campaigner:
       name: 사회운동가
       description: 기본 사용자 3명을 초청했습니다
@@ -1705,16 +1649,14 @@ ko:
     first_emoji:
       name: 첫 Emoji
       description: 게시글에 Emoji를 사용했습니다
-      long_description: |
-        이 배지는 포스트에 Emoji를 처음으로 추가했을 때 수여됩니다:thumbsup:. Emoji는 행복함부터 :smiley: 슬픔 :anguished:  그리고 분노 :angry: 에 이르기 까지 많은 감정을 포스트에 싣게 해줍니다:sunglasses: . 그냥 : (콜론) 을 입력하거나 툴바에서 Emoji버튼을 누르면 수많은 Emoji를 선택할 수 있어요 :ok_hand:
     first_mention:
       name: 첫 멘션
       description: 처음으로 포스트에서 다른 사용자를 멘션했습니다
-      long_description: 이 배지는 포스트에서 다른 사람의 @아이디 를 처음으로 멘션했을 때 수여됩니다. 각각의 멘션들은 해당 사용자에게 알림을 생성해서 당신이 쓴 포스트에 대해 알게 해줍니다. 그냥 @ 를 친 후 사용자 아이디를 입력하거나, 허용이 되어있다면 그룹을 입력할 수 있습니다. 관심을 끌 수 있는 아주 간편한 방법이죠.
+      long_description: "이 배지는 포스트에서 다른 사람의 @아이디 를 처음으로 멘션했을 때 수여됩니다. 각각의 멘션들은 해당 사용자에게 알림을 생성해서 당신이 쓴 포스트에 대해 알게 해줍니다. 그냥 @ 를 친 후 사용자 아이디를 입력하거나, 허용이 되어있다면 그룹을 입력할 수 있습니다. 관심을 끌 수 있는 아주 간편한 방법이죠."
     first_onebox:
       name: 첫 박스 링크
       description: 박스 링크를 처음으로 포스팅했습니다
-      long_description: 이 배지는 포스트의 링크만으로 이루어진 글 한줄을 남겨서 박스링크를 만들 때 수여됩니다.  박스링크에는 링크의 간략한 요약과 타이틀, (만약에 있다면) 그림이 실리게 됩니다.
+      long_description: "이 배지는 포스트의 링크만으로 이루어진 글 한줄을 남겨서 박스링크를 만들 때 수여됩니다.  박스링크에는 링크의 간략한 요약과 타이틀, (만약에 있다면) 그림이 실리게 됩니다."
     first_reply_by_email:
       name: 첫 이메일 답글
       description: 포스트에 이메일로 답글을 달았습니다
@@ -1728,7 +1670,6 @@ ko:
     badge_title_metadata: "%{site_title}의 %{display_name} 배지"
   admin_login:
     success: "이메일 보냄"
-    error: "에러!"
     email_input: "관리자 이메일"
     submit_button: "이메일 보내기"
   performance_report:
@@ -1870,6 +1811,3 @@ ko:
         description: |
           <p>이 설정을 바꾸고 싶어지면, <a href='/admin' target='_blank'>관리자 섹션</a>으로 들어가세요. 사이트 메뉴에 공구처럼 생긴 아이콘을 누르면 됩니다.</p>
           <p>당신의 <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>새로운 커뮤니티 만들기</a>를 응원합니다!</p>
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.lv.yml b/config/locales/server.lv.yml
index 88fa154c744..bf0dd8bf8d6 100644
--- a/config/locales/server.lv.yml
+++ b/config/locales/server.lv.yml
@@ -10,6 +10,8 @@ lv:
     short_date_no_year: "D MMM"
     short_date: "D MMM, YYYY"
     long_date: "MMMM D, YYYY hh:mm"
+  date:
+    month_names: [~, "", "", "", "", "", "", "", "", "", "", "", ""]
   title: "Discourse"
   topics: "Tēmas"
   posts: "raksti"
@@ -23,15 +25,15 @@ lv:
     start_discussion: "Sākt Diskusiju"
     continue: "Turpināt Diskusiju"
     more_replies:
-      zero: "vel %{count} atbildes"
-      one: "vel 1 atbilde"
-      other: "vel %{count} atbildes"
+      one: vel 1 atbilde
+      other: vel %{count} atbildes
+      zero: vel %{count} atbildes
     loading: "Diskusijas Ielādēšana..."
     in_reply_to: "▶ %{username}"
     replies:
-      zero: "%{count} atbildes"
-      one: "1 atbilde"
-      other: "%{count} atbildes"
+      one: 1 atbilde
+      other: '%{count} atbildes'
+      zero: '%{count} atbildes'
   next_page: "nākošo lapu →"
   prev_page: "← iepriekšējo lapu"
   page_num: "Lapa %{num}"
@@ -54,9 +56,9 @@ lv:
       trust_level_4: "trust_level_4"
   education:
     until_posts:
-      zero: "%{count} raksti"
-      one: "1 raksts"
-      other: "%{count} raksti"
+      one: 1 raksts
+      other: '%{count} raksti'
+      zero: '%{count} raksti'
   activerecord:
     attributes:
       user_profile:
diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml
index 20c1bd5d7dc..d574ab21600 100644
--- a/config/locales/server.nb_NO.yml
+++ b/config/locales/server.nb_NO.yml
@@ -17,28 +17,51 @@ nb_NO:
       date_only: "%B %-d, %Y"
       long: "%B %-d, %Y, %l:%M%P"
   date:
-    month_names: [null, januar, februar, mars, april, mai, juni, juli, august, september, oktober, november, desember]
+    month_names: [~, januar, februar, mars, april, mai, juni, juli, august, september, oktober, november, desember]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "am"
     pm: "pm"
-    <<: *datetime_formats
   title: "Discourse"
-  topics: "Emner"
+  topics: "Tråder"
   posts: "innlegg"
   loading: "Laster"
   powered_by_html: 'Drives av <a href="https://www.discourse.org">Discourse</a>, og ser best ut med JavaScript aktivert'
   log_in: "Logg inn"
+  submit: "Send"
   purge_reason: "Automatisk slettet som som forlatt, uaktivert konto"
   disable_remote_images_download_reason: "Nedlasting av bilder ble deaktivert grunnet mangel på tilgjengelig diskplass."
   anonymous: "Anonym"
   remove_posts_deleted_by_author: "Slettet av forfatter"
+  redirect_warning: "Vi kunne ikke verifisere at lenken du valgte faktisk var publisert på forumet. Hvis du likevel ønsker å fortsette, velg lenken under."
   themes:
     bad_color_scheme: "Kan ikke oppdatere drakt, ugyldig fargepalett"
+    other_error: "Noe gikk galt under oppdateringen av drakten"
+    error_importing: "En feil oppstod under kloning av git repository, tilgang ble nektet eller repository ikke funnet."
+    settings_errors:
+      invalid_yaml: "YAML koden er ikke gyldig."
+      data_type_not_a_number: "Innstilling `%{name}` typen er ikke støttet. Støttede typer er `integer`, `bool`, `list` og `enum`"
+      name_too_long: "En eller flere innstillinger har for langt navn. Maksimal lengde er 255 tegn"
+      default_value_missing: "Innstilling `%{name}` har ingen standardverdi"
+      default_not_match_type: "Innstilling `%{name}` har en type standardverdi som ikke stemmer med den definerte typen for innstillingen."
+      default_out_range: "Innstilling `%{name}` sin standardverdi er utenfor de tillatte grenseverdiene."
+      enum_value_not_valid: "Den valgte verdien er ikke en av de oppførte valgmulighetene."
+      number_value_not_valid: "Ny verdi er utenfor de tillatte grenseverdiene."
+      number_value_not_valid_min_max: "Den må være mellom %{min} og %{max}."
+      number_value_not_valid_min: "Den må være større enn eller lik %{min}."
+      number_value_not_valid_max: "Den må være mindre enn eller lik %{max}."
+      string_value_not_valid: "Lengden på ny verdi er ikke innenfor grensen."
+      string_value_not_valid_min_max: "Den må være mellom %{min} og %{max} tegn lang."
+      string_value_not_valid_min: "Den må være minst %{min} tegn lang."
+      string_value_not_valid_max: "Den må være maksimalt %{max} tegn lang."
   emails:
     incoming:
-      default_subject: "Emnet trenger en tittel"
+      default_subject: "Tråden trenger en tittel"
       show_trimmed_content: "Vis beskåret innhold"
+      maximum_staged_user_per_email_reached: "Grensen er nådd for antall arrangerte brukere per e-post."
+      no_subject: "(mangler emne)"
+      no_body: "(mangler tekst)"
       errors:
         empty_email_error: "Skjer når den rå e-posten vi mottok var blank."
         no_message_id_error: "Skjer når en e-post ikke har noen «Message-ID»-hode."
@@ -46,15 +69,21 @@ nb_NO:
         no_body_detected_error: "Skjer når vi ikke kunne trekke ut meldingskroppen eller det ikke var noen vedlegg."
         no_sender_detected_error: "Skjer når vi ikke kunne finne en gyldig adresse i Fra-hodet."
         inactive_user_error: "Skjer når senderen ikke er aktiv."
+        silenced_user_error: "Skjer når senderen er dempet."
         bad_destination_address: "Skjer når ingen av adressene i To-, Cc- eller Bcc-feltene passer med en konfigurert innkommende e-postadresse."
-        strangers_not_allowed_error: "Skjer når en bruker forsøket å opprette et nytt emne i en kategori som han eller hun ikke er medlem av."
-        insufficient_trust_level_error: "Skjer når en bruker forsøket å opprette et nytt emne i en kategori som han eller hun ikke har tillitsnivå for."
+        strangers_not_allowed_error: "Skjer når en bruker har forsøkt å opprette en ny tråd i en kategori som vedkommende ikke er medlem av."
+        insufficient_trust_level_error: "Skjer når en bruker har forsøkt å opprette en ny tråd i en kategori som vedkommende ikke har påkrevet tillitsnivå for."
         reply_user_not_matching_error: "Skjer når et innkommende svar kommer fra en annen e-postadresse enn varselet var sendt til."
-        topic_not_found_error: "Skjer når et svar blir mottatt, men det tilhørene emnet er slettet."
-        topic_closed_error: "Skjer når et svar blir mottatt, men det tilhørene emnet er stengt."
+        topic_not_found_error: "Skjer når et svar blir mottatt, men den tilhørende tråden er slettet."
+        topic_closed_error: "Skjer når et svar blir mottatt, men den tilhørende tråden er stengt."
+        bounced_email_error: "E-posten er en returnert e-postrapport."
+        screened_email_error: "Skjer når avsenderens e-postadresse allerede var filtrert."
+        unsubscribe_not_allowed: "Skjer når avmelding via e-post ikke er tillatt for denne brukeren."
+        email_not_allowed: "Skjer når e-postadressen ikke er på hvitlisten eller er svartelistet."
       unrecognized_error: "Ukjent feil"
   errors: &errors
     format: '%{attribute} %{message}'
+    format_with_full_message: '<b>%{attribute}</b>: %{message}'
     messages:
       too_long_validation: "er begrenset til %{max} tegn; du brukte %{length}."
       invalid_boolean: "Ugyldig boolsk verdi."
@@ -64,22 +93,24 @@ nb_NO:
       present: må være tom
       confirmation: "er ikke like %{attribute}"
       empty: kan ikke være tom
-      equal_to: må være lik %{count}
+      equal_to: "må være lik %{count}"
       even: må være jevnt antall
       exclusion: er reservert
-      greater_than: må være større enn %{count}
-      greater_than_or_equal_to: må være lik eller større enn %{count}
+      greater_than: "må være større enn %{count}"
+      greater_than_or_equal_to: "må være lik eller større enn %{count}"
       has_already_been_used: "har allerede blitt brukt"
       inclusion: er ikke inkludert i listen
       invalid: er ugyldig
       is_invalid: "virker uklart, er det en komplett setning?"
       contains_censored_words: "inneholder følgende sensurerte ord: %{censored_words}"
-      less_than: må være mindre enn %{count}
-      less_than_or_equal_to: må være lik eller mindre enn %{count}
+      less_than: "må være mindre enn %{count}"
+      less_than_or_equal_to: "må være lik eller mindre enn %{count}"
       not_a_number: er ikke et nummer
       not_an_integer: må være ett heltall
       odd: må være oddetall
       record_invalid: 'Validering feilet: %{errors}'
+      max_emojis: "kan ikke ha over %{max_emojis_count} emoji"
+      ip_address_already_screened: "er allerede inkludert i en eksisterende regel"
       restrict_dependent_destroy:
         one: "Kunne ikke slette oppføringen, oppføringen %{record} er avhengig av denne"
         many: "Kunne ikke slette oppføringen, oppføringen %{record} er avhengig av denne"
@@ -101,22 +132,40 @@ nb_NO:
     embed:
       load_from_remote: "Det oppstod et problem med innlastingen av innlegget."
     site_settings:
+      invalid_choice:
+        one: Du spesifiserte det ugyldige valget %{name}
+        other: Du spesifiserte de ugyldige valgene %{name}
       min_username_length_exists: "Du kan ikke sette minimumslengden på brukernavn over det korteste brukernavnet."
       min_username_length_range: "Du kan ikke sette minimum høyere enn maksimum."
       max_username_length_exists: "Du kan ikke sette maksimallengden for brukernavn under det lengste brukernavnet."
       max_username_length_range: "Du kan ikke sette maksimum under minimum."
       default_categories_already_selected: "Du kan ikke velge en annen kategori brukt i en annen liste."
+      s3_upload_bucket_is_required: "Du kan ikke aktivere opplasting til S3 hvis ikke du har satt innstillingen 's3_upload_bucket'."
+    conflicting_google_user_id: 'Google Account ID for denne kontoen har endret seg; staben må manuelt godkjenne endringen av sikkerhetshensyn. Vennligst kontakt staben og pek dem til <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
+  activemodel:
+    errors:
+      <<: *errors
   invite:
     not_found: "Ditt invitasjonssymbol er ugyldig. Kontakt sidens administrator."
+    not_found_template: |
+      <p>Invitasjonen din til <a href="%{base_url}">%{site_name}</a> er allerede brukt.</p>
+
+      <p>Hvis du husker passordet ditt kan du <a href="%{base_url}/login">Logge Inn</a>.</p>
+
+      <p>Hvis ikke kan du <a href="%{base_url}/password-reset">Nullstille Passordet</a>.</p>
+    user_exists: "Det er ikke nødvendig å invitere <b>%{email}</b>, de <a href='/u/%{username}/summary'>har allerede en konto!</a>"
   bulk_invite:
     file_should_be_csv: "Filen som lastes opp burde være i csv format."
     error: "Det skjedde en feil når filen ble lastet opp. Prøv igjen senere. "
+  topic_invite:
+    user_exists: "Beklager, den brukeren er allerede invitert. Du kan ikke invitere samme bruker til et emne flere ganger."
   backup:
     operation_already_running: "En prosess kjører allerede. Kan ikke starte en ny jobb akkurat nå."
     backup_file_should_be_tar_gz: "Backup-filen må være en .tar.gz -arkiveringsfil."
     not_enough_space_on_disk: "Det er ikke nok diskplass til å laste opp denne backupen."
     invalid_filename: "Det sikkerhetskopierte filnavnet inneholder ugyldige tegn. Gyldige tegn er a-z 0-9 . - _."
-  not_logged_in: "Du må være logget inn for å gjøre dette."
+  invalid_params: "Du brukte feil parametre i forespørselen: %{message}"
+  not_logged_in: "Du må være innlogget for å gjøre det."
   not_found: "Den etterspurte URL eller ressurs ble ikke funnet"
   invalid_access: "Du har ingen tilgang til denne resurssen."
   invalid_api_credentials: "Du har ikke tillatelse til å se denne forespurte ressuresen. API-brukernavnet eller -nøkkelen er ikke gyldig."
@@ -124,8 +173,8 @@ nb_NO:
   reading_time: "Lesetid"
   likes: "Likes"
   too_many_replies:
-    one: "Vi beklager, men nye brukere er midlertidig begrenset til 1 svar i det samme emnet."
-    other: "Vi beklager, men nye brukere er midlertidig begrenset til %{count} svar i det samme emnet."
+    one: Vi beklager, men nye brukere er midlertidig begrenset til 1 svar i det samme tråden.
+    other: Vi beklager, men nye brukere er midlertidig begrenset til %{count} svar i samme tråd.
   embed:
     start_discussion: "Start diskusjon"
     continue: "Fortsett diskusjon"
@@ -135,74 +184,98 @@ nb_NO:
     no_hosts: "Vertsnavn for innbygging."
     configure: "Sett opp innbygging"
     more_replies:
-      one: "1 svar til"
-      other: "%{count} svar til"
+      one: 1 svar til
+      other: '%{count} svar til'
     loading: "Laster inn diskusjon…"
     permalink: "Permalink"
     imported_from: "Dette er en relatert diskusjon ved siden av det originale innlegget ved %{link}"
     in_reply_to: "▶ %{username}"
     replies:
-      one: "1 svar"
-      other: "%{count} svar"
+      one: 1 svar
+      other: '%{count} svar'
   no_mentions_allowed: "Beklager, du kan ikke nevne andre brukere."
   too_many_mentions:
-    one: "Beklager, du kan bare nevne en bruker i et innlegg. "
-    other: "Beklager, du kan bare nevne %{count} brukere i et innlegg. "
+    one: 'Beklager, du kan bare nevne en bruker i et innlegg. '
+    other: 'Beklager, du kan bare nevne %{count} brukere i et innlegg. '
   no_mentions_allowed_newuser: "Beklager, nye brukere kan ikke nevne andre brukere."
+  too_many_mentions_newuser:
+    one: Beklager, nye brukere kan bare nevne én annen bruker i et innlegg.
+    other: Beklager, nye brukere kan bare nevne %{count} brukere i et innlegg.
+  no_images_allowed_trust: "Beklager, du kan ikke legge til bilder i et innlegg."
   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."
+    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."
+    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.
   no_links_allowed: "Beklager, nye brukere kan ikke publisere innlegg med lenker."
+  links_require_trust: "Beklager, du kan ikke legge til lenker i et innlegg."
+  too_many_links:
+    one: Beklager, nye brukere kan bare legge til én lenke i et innlegg.
+    other: Beklager, nye brukere kan bare legge til %{count} lenker i et innlegg.
+  contains_blocked_words: "Innlegget ditt inneholder et ord som ikke er tillatt: %{word}"
   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?"
+  user_is_suspended: "Utestengte brukere kan ikke skrive innlegg."
+  topic_not_found: "Noe gikk galt. Kanskje tråden ble lukket eller slettet mens du leste den?"
+  not_accepting_pms: "Beklager, %{username} ønsker ikke å motta personlige meldinger."
+  max_pm_recepients: "Beklager, du kan bare sende en melding til maksimalt %{recipients_limit} mottakere."
   just_posted_that: "er for likt det du nylig publiserte."
   invalid_characters: "inneholder ugyldige tegn"
+  is_invalid: "virker uklart, er det en komplett setning?"
   next_page: "neste side →"
   prev_page: "← forrige side"
   page_num: "Side %{num}"
   home_title: "Hjem"
-  topics_in_category: "Emner i '%{category}' kategorien"
+  topics_in_category: "Tråder i '%{category}'-kategorien"
   rss_posts_in_topic: "RSS-strøm av '%{topic}'"
-  rss_topics_in_category: "RSS-strøm av emner i '%{category}' kategorien"
+  rss_topics_in_category: "RSS-strøm av tråder i '%{category}'-kategorien"
   author_wrote: "%{author} skrev:"
   num_posts: "Innlegg:"
   num_participants: "Deltakere:"
-  read_full_topic: "Les hele emnet"
+  read_full_topic: "Les hele tråden"
   private_message_abbrev: "Mld"
   rss_description:
-    latest: "Siste emner"
-    hot: "Populære emner"
-    top: "Mest Populære Emner"
-    top_all: "Tidenes mest populære emner"
-    top_yearly: "Årets mest populære emner"
-    top_quarterly: "Kvartalets mest populære emner"
-    top_monthly: "Månedens mest populære emner"
-    top_weekly: "Ukas mest populære emner"
-    top_daily: "Dagens mest populære emner"
+    latest: "Siste tråder"
+    hot: "Populære tråder"
+    top: "Mest populære tråder"
+    top_all: "Tidenes mest populære tråder"
+    top_yearly: "Årets mest populære tråder"
+    top_quarterly: "Kvartalets mest populære tråder"
+    top_monthly: "Månedens mest populære tråder"
+    top_weekly: "Ukens mest populære tråder"
+    top_daily: "Dagens mest populære tråder"
     posts: "Siste innlegg"
-    private_posts: "Siste private meldinger"
+    private_posts: "Siste personlige beskjeder"
     group_posts: "Siste innlegg fra %{group_name}"
+    group_mentions: "Siste omtalelser %{group_name}"
     user_posts: "Siste innlegg av @%{username}"
-    user_topics: "Siste emner av @%{username}"
-    tag: "Emner merket med stikkord"
-  too_late_to_edit: "Det innlegget ble laget for lenge siden. Det kan ikke lenger redigeres eller slettes."
+    user_topics: "Siste tråder av @%{username}"
+    tag: "Tråder med stikkord"
+    badge: "%{display_name} merke på %{site_title}"
+  too_late_to_edit: "Det er for lenge siden det innlegget ble skrevet. Det kan ikke lenger redigeres eller slettes."
+  revert_version_same: "Den gjeldende versjonen er den samme som den du prøver å rulle tilbake til."
   excerpt_image: "bilde"
   queue:
     delete_reason: "Slettet via køen for innleggmoderering"
+    not_found: "Innlegget ble ikke funnet eller er allerede oppdatert."
   groups:
+    success:
+      bulk_add:
+        one: '%{count} bruker ble lagt til i gruppen.'
+        other: '%{count} brukere ble lagt til i gruppen.'
     errors:
+      grant_trust_level_not_valid: "'%{trust_level}' er ikke et gyldig tillitsnivå."
       can_not_modify_automatic: "Du kan ikke modifisere en automatisk gruppe"
-      member_already_exist: "'%{username}' er allerede medlem av denne gruppen."
+      member_already_exist:
+        one: '''%{username}'' er allerede medlem av denne gruppen.'
+        other: 'Følgende brukere er allerede medlemmer av denne gruppen: %{username}'
       invalid_domain: "'%{domain}' er ikke et gyldig domene."
       invalid_incoming_email: "'%{email}' er ikke en gyldig e-postadresse."
       email_already_used_in_group: "'%{email}' er allerede i bruk av gruppa '%{group_name}'."
       email_already_used_in_category: "'%{email}' er allerede i bruk av kategorien '%{category_name}'."
+      cant_allow_membership_requests: "Du kan ikke tillate forespørsler om medlemskap for en gruppe som ikke har noen eiere."
     default_names:
       everyone: "alle"
       admins: "administratorer"
@@ -213,30 +286,74 @@ nb_NO:
       trust_level_2: "tillitsnivå_2"
       trust_level_3: "tillitsnivå_3"
       trust_level_4: "tillitsnivå_4"
+    request_membership_pm:
+      title: "Ønske om medlemskap i gruppen @%{group_name}"
   education:
     until_posts:
-      one: "1 innlegg"
-      other: "%{count} innlegg"
-    new-topic: |
-      Velkommen til %{site_name}. **Takk for at du starter et nytt innlegg!**
+      one: 1 innlegg
+      other: '%{count} innlegg'
+    'new-topic': |
+      Velkommen til %{site_name}. **Takk for at du starter en ny samtale!**
 
-      - Høres tittelen på innlegget interessant ut hvis du leser den høyt? Er den en god oppsummering?
+      - Høres tittelen interessant ut hvis du leser den høyt? Er den en god oppsummering?
 
       - Hvem vil være interessert i dette? Hvorfor har det noe å si? Hva slags respons er du ute etter?
 
-      - Bruk relevante begrep i emnet så andre kan *finne* det. Velg en kategori for å gruppere emnet ditt med andre lignende emner.
+      - Bruk relevante begrep i tråden slik at andre kan *finne* det. Velg en kategori for å gruppere tråden ditt med andre lignende tråder.
 
       [Se retningslinjene for dette nettstedet](/guidelines) for mer informasjon. Denne meldingen vises kun for ditt/dine første %{education_posts_text}.
-    new-reply: |
+    'new-reply': |
       Velkommen til %{site_name} &mdash; **takk for at du bidrar!**
 
       - Forbedrer innlegget ditt samtalen på noen måte?
 
-      - Vær snill mot andre medlemmer.
+      - Vær snill mot andre brukere.
 
       - Konstruktiv kritikk er velkommen, men husk å kritisere *idéer,* ikke mennesker.
 
       For mer informasjon [se retningslinjene våre](/guidelines). Dette panelet vil kun vises for ditt/dine første %{education_posts_text}.
+    avatar: |
+      ### Hva med et bilde på kontoen din?
+
+      Du har skrevet et par emner og svar, men profilbildet ditt er ikke like unikt som du er - akkurat nå er det bare en bokstav.
+
+      Har du vurdert å **[besøke brukerprofilen din](%{profile_path})** for å laste opp et bilde som kan representere deg?
+
+      Det er lettere å følge diskusjoner og å finne interessante personer i en samtale om alle har et unikt profilbilde!
+    sequential_replies: |
+      ### Vurder å svare på flere innlegg samtidig
+
+      I stedet for å legge inn flere svar på rad i et emne, anbefaler vi at du skriver et innlegg som kombinerer flere sitater fra tidligere innlegg eller @navn referanser.
+
+      Du kan redigere det forrige svaret ditt om du ønsker å legge til et sitat ved å merke teksten som skal siteres og velge <b>Sitat</b> knappen som spretter opp.
+
+      Det er lettere for alle å lese emner som har færre og mer dyptgående innlegg enn et stort antall små, individuelle svar.
+    dominating_topic: |
+      ### La andre delta i diskusjonen
+
+      Dette emnet er helt klart viktig for deg &ndash; du har skrevet mer enn %{percent}% av svarene her.
+
+      Er du sikker på at du gir andre folk nok tid til å dele sine synspunkter også?
+    get_a_room: |
+      ### Vurder å svare flere personer
+
+      Du har allerede svart %{count}ganger til @%{reply_username} i dette ene emnet.
+
+      Har du vurdert å skrive svar til *andre* folk i diskusjonen også? En bra diskusjon involverer mange stemmer og perspektiv.
+
+      Hvis du vil fortsette en lang samtale med denne ene personen kan det være bedre å [sende dem en personlig melding](/u/%{reply_username}).
+    too_many_replies: |
+      ### Du har nådd grensen for svar i dette emnet
+
+      Vi beklager, men nye brukere er midlertidig begrenset til å skrive %{newuser_max_replies_per_topic} svar per emne.
+
+      I stedet for å legge til et nytt svar, vurder om du kan redigere et tidligere svar, eller besøk et annet emne i mellomtiden.
+    reviving_old_topic: |
+      ### Gjennopplive dette emnet?
+
+      Det siste svaret i dette emnet ble skrevet **%{time_ago}**. Svaret ditt vil flytte emnet tilbake på toppen av listene og varsle alle tidligere deltagere av samtalen.
+
+      Er du sikker på at du ønsker å fortsette denne gamle samtalen?
   activerecord:
     attributes:
       category:
@@ -249,14 +366,17 @@ nb_NO:
       user_profile:
         bio_raw: "Om meg"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Du kan bare legge ved advarsel til private meldinger."
+              warning_requires_pm: "Du kan bare legge ved advarsel til personlige meldinger."
               too_many_users: "Du kan bare sende advarsel til en bruker om gangen."
-              cant_send_pm: "Beklager, du kan ikke sende en privat melding til den brukeren."
+              cant_send_pm: "Beklager, du kan ikke sende en personlig melding til den brukeren."
               no_user_selected: "Du må velge en gyldig bruker. "
+              reply_by_email_disabled: "Svar via e-post er nå deaktivert."
+              target_user_not_found: "En av brukerne du prøver å sende denne meldingen til ble ikke funnet."
             featured_link:
               invalid: "er ugyldig. Nettadressen bør inneholde http:// eller https://"
               invalid_category: "kan ikke redigeres i denne kategorien."
@@ -270,13 +390,17 @@ nb_NO:
               unique_characters: "har for mange gjentatte tegn. Benytt et sikrere passord."
             ip_address:
               signup_not_allowed: "Registrering er ikke tillatt fra denne kontoen."
+        user_email:
+          attributes:
+            user_id:
+              reassigning_primary_email: "Å flytte en primær e-postadresse over til en annen bruker er ikke tillatt."
         color_scheme_color:
           attributes:
             hex:
               invalid: "er ikke en gyldig farge"
         post_reply:
           base:
-            different_topic: "Innlegg ogg svar må tilhøre samme emne."
+            different_topic: "Innlegg og svar må tilhøre samme tråd."
         web_hook:
           attributes:
             payload_url:
@@ -289,56 +413,85 @@ nb_NO:
           attributes:
             execute_at:
               in_the_past: "må være i fremtiden."
-      <<: *errors
+        translation_overrides:
+          attributes:
+            value:
+              invalid_interpolation_keys: 'De følgende interpolasjonsnøklene er ugyldige: "%{keys}"'
+        watched_word:
+          attributes:
+            word:
+              too_many: "For mange ord for den handlingen"
   user_profile:
-    no_info_other: "<div class='missing-profile'>%{name} har ikke skrevet noe i Om meg-feltet på sin profil ennå</div>"
+    no_info_me: "<div class='missing-profile'>feltet \"Om Meg\" i profilen din er foreløpig blankt, <a href='/u/%{username_lower}/preferences/about-me'>ønsker du å fylle det ut?</a></div>"
+    no_info_other: "<div class='missing-profile'>%{name} har ikke skrevet noe i Om meg-feltet i profilen sin ennå</div>"
   vip_category_name: "Salong"
   vip_category_description: "En kategori tilgjengelig for brukere på tillitsnivå 3 og høyere."
   meta_category_name: "Tilbakemeldinger"
   meta_category_description: "Diskusjon om dette nettstedet, hvordan det er organisert, hvordan det fungerer og hvordan vi kan forbedre det."
   staff_category_name: "Stab"
-  staff_category_description: "Privat kategori for diskusjoner blant staben. Emner er kun synlige for administratorer og moderatorer."
+  staff_category_description: "Privat kategori for diskusjoner blant staben. Tråder er kun synlige for administratorer og moderatorer."
+  assets_topic_title: "Ressurser til nettstedets design"
+  assets_topic_body: "Dette emnet, kun synlig for staben, brukes for å lagre bilder og filer som benyttes av nettstedets design. Ikke slett emnet!\n\n\nHer er hvordan du bruker det:\n\n\n1. Svar på dette emnet.\n2. Last opp alle bilder du ønsker å bruke som logoer, ikoner og så videre her. (Bruk knappen merket \"last opp\" i redigeringsverktøyet eller trekk og slipp bilder.)\n3. Publiser svaret ditt.\n4. Høyreklikk på bildene for å kopiere stien til bildet, eller klikk på redigeringsknappen for å vise stien der. Kopier lenken til utklippstavlen.\n5. Lim lenkene til bildene inn der du ønsker å bruke dem i [grunnleggende oppsett](admin/site_settings/category/required).\n\n\nHvis du trenger å laste opp en annen type fil, kan du legge den til i listen `godkjente_filendelser` i instillingene for [Filer](/admin/site_settings/category/files)."
   discourse_welcome_topic:
     title: "Velkommen til Discourse"
+    body: |2
+
+      Det første avsnittet av dette festede emnet vil være synlig som en velkomstmelding til alle nye besøkende på hjemmesiden. Det er viktig!
+
+      **Rediger dette** til en kort beskrivelse av samfunnet ditt:
+
+      - Hvem er det ment for?
+      - Hva kan de finner her?
+      - Hvorfor skal de besøke stedet?
+      - Hvor kan de lese mer (lenker, ressurser, etc)?
+
+      <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+
+      Vi anbefaler at du stenger dette emnet ved hjelp av Admin :wrench: knappen (oppe til høyre og i bunnen), slik at svar ikke hoper seg opp på en kunngjøring som denne.
   lounge_welcome:
     title: "Velkommen til salongen"
     body: |2
 
-      Gratulerer! :confetti_ball:
+        Gratulerer! :confetti_ball:
 
-      Hvis du kan se dette emnet har du nylig blitt promotert til **trofast** (tillitsnivå 3).
+        Hvis du kan se denne tråden, er du nylig blitt forfremmet til **aktivt medlem** (tillitsnivå 3).
 
-      Du kan nå &hellip;
+        Du kan nå &hellip;
 
-      * Redigere tittelen på alle emner
-      * Endre kategorien på alle emner
-      * Få lenkene dine fulgt opp ([automatisk nofollow](http://en.wikipedia.org/wiki/Nofollow) er fjernet)
-      * Tilgang til en privat salong-kategori som bare er synlig for brukere på tillitsnivå 3 eller høyere.
-      * All søppelpost du flagger vil bli gjemt umiddelbart.
+        * Endre tittelen til hvilken som helst tråd
+        * Endre kategorien til hvilken som helst tråd
+        * Få lenkene dine fulgt opp ([automatisk nofollow](http://en.wikipedia.org/wiki/Nofollow) er fjernet)
+        * Se og delta i diskusjonene i en privat salong-kategori som bare er synlig for brukere med tillitsnivå 3 eller høyere.
+        * Skjule søppelpost med ett flagg.
 
-      Her er den [oppdaterte listen over andre "trofaste"](/badges/3/regular). Si gjerne hei!
+        Her er den [oppdaterte listen over andre trofaste](/badges/3/regular). Si gjerne hei!
 
-      Takk for at du er en aktiv del av fellesskapet vårt.
+        Takk for at du er en viktig del av fellesskapet vårt.
 
-      (For mer informasjon om tillitsnivå, [see dette emnet][trust]. Merk deg at bare medlemmer som fortsetter å oppfylle kravene over tid vil forbli *trofaste*.)
+        (For mer informasjon om tillitsnivå [se denne tråden][tillit]. Merk deg at bare medlemmer som fortsetter å oppfylle kravene over tid, vil forbli *trofaste*.)
 
-      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+        [tillit]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Om kategorien %{category} "
-    replace_paragraph: "(Erstatt dette første avsnittet med en kort beskrivelse av den nye kategorien din. Denne teksten vil vises i oversikten over kategorier, så prøv å holde den under 200 ord. **Inntil du endrer denne beskrivelsen eller oppretter emner, vil denne kategorien ikke vises på kategorier-siden.**)"
-    post_template: "%{replace_paragraph}\n\nBruk de følgende avsnittene for en lengre beskrivelse, eller for å beskrive retningslinjer eller regler for kategorien:\n\n- Hvorfor skal folk bruke denne kategorien? Hva er den ment for?\n\n- På hvilken måte skiller den seg fra de andre kategoriene vi allerede har?\n\n- Hva skal emner i denne kategorien generelt sett inneholde?\n\n- Trenger vi denne kategorien? Kan vi slå den sammen med en annen kategori eller underkategori?\n"
+    replace_paragraph: "(Erstatt dette første avsnittet med en kort beskrivelse av den nye kategorien din. Denne teksten vil vises i oversikten over kategorier, så prøv å holde lengden under 200 bokstaver. **Inntil du endrer denne beskrivelsen eller oppretter tråder, vil denne kategorien ikke vises på kategorier-siden.**)"
+    post_template: "%{replace_paragraph}\n\nBruk de følgende avsnittene for en lengre beskrivelse, eller for å formulere retningslinjer eller regler for kategorien:\n\n- Hvorfor skal folk bruke denne kategorien? Hva er den ment for?\n\n- Hvordan skiller den seg fra de andre kategoriene vi allerede har?\n\n- Hva skal tråder i denne kategorien generelt sett inneholde?\n\n- Trenger vi denne kategorien? Kan vi slå den sammen med en annen kategori eller underkategori?\n"
     errors:
+      not_found: "Kategorien finnes ikke!"
       uncategorized_parent: "Ukategorisert kan ikke ha en foreldrekategori"
       self_parent: "En underkategori kan ikke være underlagt seg selv"
       depth: "En underkategori kan ikke underlegges en annen underkategori"
+      invalid_email_in: "'%{email}' er ikke en gyldig e-postadresse."
+      email_already_used_in_group: "'%{email}' er allerede i bruk av gruppen '%{group_name}'."
+      email_already_used_in_category: "'%{email}' er allerede i bruk av kategorien '%{category_name}'."
+      description_incomplete: "Innlegget som beskriver en kategori må ha minst ett avsnitt."
     cannot_delete:
       uncategorized: "Kan ikke slette Ukategorisert"
       has_subcategories: "Kan ikke slette denne kategorien fordi den har underkategorier."
       topic_exists:
-        one: "Kan ikke slette denne kategorien fordi den har 1 emne. Eldste emne er %{topic_link}."
-        other: "Kan ikke slette denne kategorien fordi den har %{count} emner. Eldste emne er %{topic_link}."
-      topic_exists_no_oldest: "Kan ikke slette denne kategorien fordi emneantallet er %{count}."
-    uncategorized_description: "Emner som ikke trenger en kategori eller som ikke passer i noen av de eksisterende."
+        one: Kan ikke slette denne kategorien fordi den har 1 tråd. Eldste tråd er %{topic_link}.
+        other: Kan ikke slette denne kategorien fordi den har %{count} tråder. Eldste tråd er %{topic_link}.
+      topic_exists_no_oldest: "Kan ikke slette denne kategorien fordi antall tråder er %{count}."
+    uncategorized_description: "Tråder som ikke trenger en kategori eller som ikke passer i noen av de eksisterende kategoriene."
   trust_levels:
     newuser:
       title: "ny bruker"
@@ -347,97 +500,111 @@ nb_NO:
     member:
       title: "medlem"
     regular:
-      title: "trofast"
+      title: "aktivt medlem"
     leader:
       title: "leder"
+    change_failed_explanation: "Du forsøkte å nedgradere %{user_name} til '%{new_trust_level}'. Men tillitsnivået til brukeren er allerede '%{current_trust_level}'. %{user_name} vil bli værende ved '%{current_trust_level}' - hvis du ønsker å nedgradere brukeren må du låse fast tillitsnivået først"
+  post:
+    image_placeholder:
+      broken: "Dette bildet fungerer ikke"
   rate_limiter:
-    too_many_requests: "Vi har en daglig begrensning for hvor mange ganger den handlingen kan utføres. Vent %{time_left} før du prøver igjen."
+    slow_down: "Du har utført denne handlingen for mange ganger, vennligst prøv igjen senere."
+    too_many_requests: "Du har utført denne handlingen for mange ganger. Vennligst vent %{time_left} før du prøver igjen."
     by_type:
-      first_day_replies_per_day: "Du har nådd det maksimale antall svar en ny bruker kan publisere på sin første dag. Vær så snill og vent %{time_left} før du prøver igjen."
-      first_day_topics_per_day: "Du har nådd det maksimale antall emner en ny bruker kan publisere på sin første dag. Vær så snill og vent %{time_left} før du prøver igjen."
-      create_post: "Du svarer for raskt. Vent %{time_left} før du prøver igjen."
-      delete_post: "Du sletter innlegg for raskt. Vent %{time_left} før du prøver igjen."
-      topics_per_day: "Du har oppnådd høyest antall innlegg for i dag. Vær så snill og vent %{time_left} før du prøver igjen."
+      first_day_replies_per_day: "Du har nådd grensen for hvor mange innlegg en ny bruker kan skrive den første dagen. Vennligst vent %{time_left} før du prøver igjen."
+      first_day_topics_per_day: "Du har nådd grensen for hvor mange emner en ny bruker kan lage den første dagen. Vennligst vent %{time_left} før du prøver igjen."
+      create_topic: "Du lager emner i for høyt tempo! Vennligst vent %{time_left} før du prøver igjen."
+      create_post: "Du svarer for raskt. Vennligst vent %{time_left} før du prøver igjen."
+      delete_post: "Du sletter innlegg for fort. Vennligst vent %{time_left} før du prøver på nytt."
+      public_group_membership: "Du melder deg inn/ut av grupper for ofte. Vennligst vent %{time_left} før du prøver igjen."
+      topics_per_day: "Du har nådd grensen for publisering av nye emner. Vennligst vent %{time_left} før du prøver igjen."
+      pms_per_day: "Du har nådd grensen for antall meldinger. Vennligst vent %{time_left} før du prøver igjen."
+      create_like: "Du har nådd grensen for antall likte innlegg. Vennligst vent %{time_left} før du prøver igjen."
+      create_bookmark: "Du har nådd grensen for antall bokmerker. Vennligst vent %{time_left} før du prøver igjen."
+      edit_post: "Du har nådd grensen for antall redigeringer. Vennligst vent %{time_left} før du prøver igjen."
+      live_post_counts: "Du ber om oppdateringer av antall innlegg for ofte. Vennligst vent %{time_left} før du prøver igjen."
+      unsubscribe_via_email: "Du har nådd grensen for antall avmeldinger via e-post. Vennligst vent %{time_left} før du prøver igjen."
+      topic_invitations_per_day: "Du har nådd grensen for invitasjoner til emner. Vennligst vent %{time_left} før du prøver igjen."
     hours:
-      one: "1 time"
-      other: "%{count} timer"
+      one: 1 time
+      other: '%{count} timer'
     minutes:
-      one: "1 minutt"
-      other: "%{count} minutter"
+      one: 1 minutt
+      other: '%{count} minutter'
     seconds:
-      one: "1 sekund"
-      other: "%{count} sekunder"
+      one: 1 sekund
+      other: '%{count} sekunder'
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: "< 1s"
-        other: "< %{count}s"
+        one: < 1s
+        other: < %{count}s
       x_seconds:
-        one: "1s"
-        other: "%{count}s"
+        one: 1s
+        other: '%{count}s'
       less_than_x_minutes:
-        one: "< 1m"
-        other: "< %{count}m"
+        one: < 1m
+        other: < %{count}m
       x_minutes:
-        one: "1m"
-        other: "%{count}m"
+        one: 1m
+        other: '%{count}m'
       about_x_hours:
-        one: "1h"
-        other: "%{count}h"
+        one: 1h
+        other: '%{count}h'
       x_days:
-        one: "1d"
-        other: "%{count}d"
+        one: 1d
+        other: '%{count}d'
       about_x_months:
-        one: "1mnd"
-        other: "%{count}mnd"
+        one: 1mnd
+        other: '%{count}mnd'
       x_months:
-        one: "1mnd"
-        other: "%{count}mnd"
+        one: 1mnd
+        other: '%{count}mnd'
       about_x_years:
-        one: "1å"
-        other: "%{count}å"
+        one: 1å
+        other: '%{count}å'
       over_x_years:
-        one: "> 1år"
-        other: "> %{count}y"
+        one: '> 1år'
+        other: '> %{count}y'
       almost_x_years:
-        one: "1år"
-        other: "%{count}år"
+        one: 1år
+        other: '%{count}år'
     distance_in_words_verbose:
       half_a_minute: "Nå nettopp"
       less_than_x_seconds:
-        one: "nå nettopp"
-        other: "nå nettopp"
+        one: nå nettopp
+        other: nå nettopp
       x_seconds:
-        one: "1 sekund siden"
-        other: "%{count} sekunder siden"
+        one: 1 sekund siden
+        other: '%{count} sekunder siden'
       less_than_x_minutes:
-        one: "mindre enn 1 minutt siden"
-        other: "mindre enn %{count} minutter siden"
+        one: mindre enn 1 minutt siden
+        other: mindre enn %{count} minutter siden
       x_minutes:
-        one: "1 minutt siden"
-        other: "%{count} minutter siden"
+        one: 1 minutt siden
+        other: '%{count} minutter siden'
       about_x_hours:
-        one: "1 time siden"
-        other: "%{count} timer siden"
+        one: 1 time siden
+        other: '%{count} timer siden'
       x_days:
-        one: "1 dag siden"
-        other: "%{count} dager siden"
+        one: 1 dag siden
+        other: '%{count} dager siden'
       about_x_months:
-        one: "ca 1 måned siden"
-        other: "ca %{count} måneder siden"
+        one: ca 1 måned siden
+        other: ca %{count} måneder siden
       x_months:
-        one: "1 måned siden"
-        other: "%{count} måneder siden"
+        one: 1 måned siden
+        other: '%{count} måneder siden'
       about_x_years:
-        one: "omtrent 1 år siden"
-        other: "omtrent %{count} år siden"
+        one: omtrent 1 år siden
+        other: omtrent %{count} år siden
       over_x_years:
-        one: "over et år siden"
-        other: "over  %{count} år siden"
+        one: over et år siden
+        other: over  %{count} år siden
       almost_x_years:
-        one: "nesten 1 år siden"
-        other: "nesten %{count} år siden"
+        one: nesten 1 år siden
+        other: nesten %{count} år siden
   password_reset:
     no_token: "Beklager, den lenken for å endre passord er for gammel. Velg logg inn-knappen bruk 'Jeg glemte passordet mitt' for å motta en ny lenke."
     choose_new: "Velg et nytt passord"
@@ -447,10 +614,15 @@ nb_NO:
     title: 'Tilbakestill passord'
     success: "Du har endret passordet og er nå logget inn."
     success_unapproved: "Du har endret ditt passord."
+  email_login:
+    invalid_token: "Beklager, denne lenken for innlogging via e-post er for gammel. Bruk 'Logg Inn' knappen og deretter 'Jeg har glemt passordet' for å motta en oppdatert lenke."
+    title: "E-post innlogging"
   change_email:
     confirmed: "E-postaddressen din er blitt oppdatert."
     please_continue: "Fortsett til %{site_name}"
     error: "Det oppsto en feil ved endring av din e-postadresse. Kanskje addressen allerede er i bruk?"
+    error_staged: "En feil oppstod ved endring av e-postadressen din. Den nye adressen er allerede i bruk av en arrangert bruker."
+    already_done: "Beklager, denne godkjenningslenken er ikke lenger gyldig. Kanskje e-postadressen din allerede er byttet?"
     authorizing_old:
       title: "Takk for at du bekreftet din nåværende e-postadresse"
       description: "Vi sender deg en e-post til din nye adresse for bekreftelse."
@@ -461,54 +633,78 @@ nb_NO:
     continue_button: "Fortsett til %{site_name}"
     welcome_to: "Velkommen til %{site_name}!"
     approval_required: "En moderator må manuelt godkjenne kontoen din før du får tilgang til forumet. Du vil motta en e-post når kontoen din er godkjent!"
+    missing_session: "Vi klarer ikke å se om kontoen din ble laget, vennligst sjekk om cookies/kapsler er aktivert i nettleseren."
+    activated: "Beklager, denne kontoen er allerede aktivert."
     admin_confirm:
       title: "Bekreft admin-konto"
+      description: "Er du sikker på at du ønsker at <b>%{target_username}</b> skal være en administrator?"
       grant: "Tildel admin-tilgang"
+      complete: "<b>%{target_username}</b> er nå en administrator."
       back_to: "Gå tilbake til %{title}"
   post_action_types:
     off_topic:
       title: 'Urelatert'
-      description: 'Dette innlegget er ikke relevant til den aktuelle emne som definert av tittelen og første innlegget, og burde sannsynligvis flyttes et annet sted. '
+      description: 'Dette innlegget er ikke relevant for den aktuelle diskusjonen som fastsatt av tittelen og det første innlegget og burde sannsynligvis flyttes til et annet sted. '
+      short_description: 'Ikke relevant til diskusjonen'
       long_form: 'markerte dette som urelevant'
     spam:
       title: 'Spam'
+      description: 'Dette innlegget er reklame, eller vandalisme. Det er ikke nyttig eller relevant for dette emnet.'
+      short_description: 'Dette er reklame eller vandalisme'
       long_form: 'markerte dette som spam'
       email_title: '"%{title}" ble rapportert som spam'
       email_body: "%{link}\n\n%{message}"
     inappropriate:
       title: 'Upassende'
       description: 'Dette innlegget har innhold som for en fornuftig person vil kunne være fornærmende, nedverdigende eller brudd på <a href="/guidelines">retningslinjene til denne gemenskapen</a>.'
+      short_description: 'Et brudd på <a href="/guidelines">retningslinjene for samfunnet</a>'
       long_form: 'markerte dette som upassende'
     notify_user:
       title: 'Send en melding til @{{username}}'
+      description: 'Jeg ønsker å snakke med denne personen direkte og personlig om innlegget.'
+      short_description: 'Jeg ønsker å snakke med denne personen direkte og personlig om innlegget.'
       long_form: 'sendt melding til bruker'
       email_title: 'Ditt innlegg i "%{title}"'
       email_body: "%{link}\n\n%{message}"
     notify_moderators:
       title: "Noe annet"
+      description: 'Dette innlegget krever oppmerksomhet fra staben av en annen grunn enn listen over.'
+      short_description: 'Krever oppmerksomhet fra staben av en annen grunn'
+      long_form: 'flagget dette for oppfølging av staben'
+      email_title: 'Et innlegg i "%{title}" krever oppfølging av staben'
       email_body: "%{link}\n\n%{message}"
     bookmark:
       title: 'Bokmerke'
       description: 'Bokmerk dette innlegget'
+      short_description: 'Lag bokmerke for dette innlegget'
       long_form: 'bokmerket dette innlegget'
     like:
       title: 'Lik'
       description: 'Liker dette innlegget'
+      short_description: 'Lik dette innlegget'
       long_form: 'likte dette'
     vote:
       title: 'Stem'
       description: 'Stem på dette innlegget'
+      short_description: 'Stem på dette innlegget'
       long_form: 'stemte for dette innlegget'
   user_activity:
+    no_default:
+      self: "Du har ingen aktivitet enda."
+      others: "Ingen aktivitet."
     no_bookmarks:
+      self: "Du har ingen bokmerker, hvis du lager bokmerker for innlegg er det lettere å finne dem igjen senere."
       others: "Ingen bokmerker."
     no_likes_given:
       self: "Du har ikke likt noen innlegg."
       others: "Ingen likte innlegg. "
+    no_replies:
+      self: "Du har ikke svart på noen innlegg."
+      others: "Ingen svar."
   topic_flag_types:
     spam:
       title: 'Spam'
-      description: 'Dette innlegget er reklame. Det er ikke nyttig eller relevant til emnet, men av promoterende karakter.'
+      description: 'Dette innlegget er reklame. Det er ikke nyttig eller relevant for dette nettstedet, men av promoterende karakter.'
       long_form: 'rapporterte dette som spam'
     inappropriate:
       title: 'Upassende'
@@ -516,33 +712,50 @@ nb_NO:
       long_form: 'markerte dette som upassende'
     notify_moderators:
       title: "Noe annet"
+      description: 'Emnet krever oppfølging av staben basert på <a href="/guidelines">retningslinjene</a>, <a href="%{tos_url}">brukeravtale</a>, eller en annen grunn ikke i listen over.'
       long_form: 'Markert for mederering'
-      email_title: 'Emne "%{title}" krever moderator oppmerksomhet'
+      email_title: 'Tråden "%{title}" krever oppmerksomhet fra en moderator'
       email_body: "%{link}\n\n%{message}"
   flagging:
+    you_must_edit: '<p>Innlegget ditt ble flagget av samfunnet. Vennligst <a href="%{path}">sjekk meldingene dine</a>.</p>'
     user_must_edit: '<p>Dette innlegget ble rapportert av gemenskapen og er midlertidig skjult.</p>'
   archetypes:
     regular:
-      title: "Vanlig emne"
+      title: "Vanlig tråd"
     banner:
-      title: "Banneremne"
+      title: "Bannertråd"
       message:
-        make: "Dette emnet er nå en banner. Det vil vises på toppen av hver side til brukeren lukker det."
-        remove: "Dette emnet er ikke lenger en banner. Det vil ikke lenger vises på toppen av hver side."
+        make: "Denne tråden er nå et banner. Det vil vises øverst på hver side til brukeren lukker det."
+        remove: "Denne tråden er ikke lenger et banner. Det vil ikke lenger vises øverst på hver side."
+  unsubscribed:
+    title: "Avmeldt!"
+    description: "<b>%{email}</b> er avmeldt. For å endre på oppsettet for e-post kan du <a href='%{url}'>besøke brukerinnstilingene</a>."
+    topic_description: "For å melde deg på %{link} igjen, bruk varslingskontrollene til høyre for eller i bunnen av emnet."
+    private_topic_description: "For å melde deg på igjen, bruk varslingskontrollene til høyre for eller i bunnen av emnet."
   unsubscribe:
     title: "Avmeld"
-    stop_watching_topic: "Slutt å følge dette emnet, %{link}"
-    mute_topic: "Demp alle varslene for dette emnet, %{link}"
-    unwatch_category: "Slutt å følge alle emner i %{category}"
+    stop_watching_topic: "Slutt å følge denne tråden, %{link}"
+    mute_topic: "Ignorer alle varslene for denne tråden, %{link}"
+    unwatch_category: "Slutt å følge alle tråder i %{category}"
     mailing_list_mode: "Slå av e-postlistemodus"
     disable_digest_emails: "Slutt å sende meg oppsummerings-eposter"
     all: "Ikke send meg noen e-poster fra %{sitename}"
+    different_user_description: "Du er allerede logget inn som en annen bruker enn den vi sendte e-posten til. Vennligst logg ut eller bytt til anonym modus før du prøver igjen."
+    not_found_description: "Beklager, vi klarte ikke finne denne avmeldingen. Det kan tenkes lenken i e-posten har gått ut på dato?"
     log_out: "Logg ut"
   user_api_key:
+    title: "Autoriser tilgang fra applikasjon"
+    authorize: "Autoriser"
     read: "les"
     read_write: "les/skriv"
+    description: "\"%{application_name}\" ber om følgende tilgang til kontoen din:"
+    no_trust_level: "Beklager, du har ikke det nødvendige tillitsnivået for tilgang til API for brukere"
+    generic_error: "Beklager, vi kan ikke utstede API nøkler for brukere, denne funksjonen kan være deaktivert av administratoren"
     scopes:
       message_bus: "Sanntidsoppdateringer"
+      notifications: "Les og rydd varsler"
+      push: "Push varslinger til eksterne tjenester "
+      session_info: "Les informasjon om brukersesjon"
       read: "Les alt"
       write: "Skriv alt"
   reports:
@@ -551,21 +764,36 @@ nb_NO:
       xaxis: "Dag"
       yaxis: "Antall besøk"
     signups:
-      title: "nye brukere"
       xaxis: "Dag"
-      yaxis: "Antall nye brukere"
+    new_contributors:
+      title: "Nye Bidragsytere"
+      xaxis: "Dag"
+      yaxis: "Antall nye bidragsytere"
+      description: "Antall brukere som skrev sitt første innlegg i denne perioden"
+    dau_by_mau:
+      title: "DAB/MAB"
+      xaxis: "Dag"
+      yaxis: "DAB/MAB"
+      description: "Antall medlemmer som logget inn siste døgn delt på antall brukere som logget inn siste måned – returnerer en % som indikerer samfunnets evne til å engasjere brukere. Sikt mot >30%."
+    daily_engaged_users:
+      title: "Daglige Engasjerte Brukere"
+      xaxis: "Dag"
+      yaxis: "Engasjerte Brukere"
+      description: "Antall brukere som har likt eller skrevet innlegg siste døgn"
     profile_views:
       title: "Visninger av brukerprofil"
       xaxis: "Dag"
       yaxis: "Antallet brukerprofiler vist"
     topics:
-      title: "Emner"
+      title: "Tråder"
       xaxis: "Dag"
-      yaxis: "Antall nye emner"
+      yaxis: "Antall nye tråder"
+      description: "Nye emner opprettet i denne perioden"
     posts:
       title: "Innlegg"
       xaxis: "Dag"
       yaxis: "Antall nye innlegg"
+      description: "Nye innlegg opprettet i denne perioden"
     likes:
       title: "Likes"
       xaxis: "Dag"
@@ -579,19 +807,38 @@ nb_NO:
       xaxis: "Dag"
       yaxis: "Antall nye bokmerker"
     starred:
-      title: "Favorisert"
+      title: "Favoritt"
       xaxis: "Dag"
-      yaxis: "Antall nye favoriserte emner"
+      yaxis: "Antall nye favoritt-tråder"
     users_by_trust_level:
       title: "Brukere per tillitsnivå"
       xaxis: "Tillitsnivå"
       yaxis: "Antall brukere"
+    users_by_type:
+      title: "Brukere per Type"
+      xaxis: "Type"
+      yaxis: "Antall Brukere"
+      xaxis_labels:
+        admin: Admin
+        moderator: Moderator
+        suspended: Utestengt
+        silenced: Dempet
+    trending_search:
+      title: Søketrender
+      labels:
+        term: Uttrykk
+        searches: Søk
+        click_through: Klikkrate
     emails:
       title: "Emailer sendt"
       xaxis: "Dag"
       yaxis: "Antall emailer"
     user_to_user_private_messages:
-      title: "Bruker-til-Bruker"
+      title: "Bruker-til-Bruker (ekskludert svar)"
+      xaxis: "Dag"
+      yaxis: "Antall meldinger"
+    user_to_user_private_messages_with_replies:
+      title: "Bruker-til-Bruker (med svar)"
       xaxis: "Dag"
       yaxis: "Antall meldinger"
     system_private_messages:
@@ -614,16 +861,16 @@ nb_NO:
       title: "Topp-henvisere"
       xaxis: "Bruker"
       num_clicks: "Klikk"
-      num_topics: "Emner"
+      num_topics: "Tråder"
     top_traffic_sources:
       title: "Topp trafikk-kilder"
       xaxis: "Domene"
       num_clicks: "Klikk"
-      num_topics: "Emner"
+      num_topics: "Tråder"
       num_users: "Brukere"
     top_referred_topics:
-      title: "Topp henviste emner"
-      xaxis: "Emne"
+      title: "Topp henviste tråder"
+      xaxis: "Tråd"
       num_clicks: "Klikk"
     page_view_anon_reqs:
       title: "Anonym"
@@ -632,20 +879,23 @@ nb_NO:
     page_view_logged_in_reqs:
       title: "Innlogget"
       xaxis: "Dag"
-      yaxis: "Innloggede sidevisninger"
+      yaxis: "Sidevisninger av innloggede"
     page_view_crawler_reqs:
       title: "Web crawlere"
       xaxis: "Dag"
+      yaxis: "Sidevisninger fra Søkeroboter"
     page_view_total_reqs:
-      title: "Totalt"
+      title: "Sidevisninger"
       xaxis: "Dag"
       yaxis: "Totalt antall sidevisninger"
     page_view_logged_in_mobile_reqs:
-      title: "Innloggede sidevisninger"
+      title: "Sidevisninger av innloggede"
       xaxis: "Dag"
-      yaxis: "Innloggede sidevisninger fra mobil"
+      yaxis: "Sidevisninger på mobil av innloggede"
     page_view_anon_mobile_reqs:
+      title: "Anonyme Sidevisninger"
       xaxis: "Dag"
+      yaxis: "Mobile Anonyme Sidevisninger"
     http_background_reqs:
       title: "Bakgrunn"
       xaxis: "Dag"
@@ -675,53 +925,123 @@ nb_NO:
       xaxis: "Dag"
       yaxis: "Gjennomsnittlig tid (timer)"
     topics_with_no_response:
-      title: "Emner uten svar"
+      title: "Tråder uten svar"
       xaxis: "Dag"
       yaxis: "Totalt"
     mobile_visits:
       title: "Brukerbesøk"
       xaxis: "Dag"
       yaxis: "Antall besøk"
+    web_crawlers:
+      title: "Forespørsler fra Søkeroboter"
+      xaxis: "Brukeragent"
+      yaxis: "Sidevisninger"
   dashboard:
     rails_env_warning: "Serveren din kjører i %{env] modus."
     host_names_warning: "Din config/database.yml-fil bruker forvalgt lokalvert-vertsnavn. Oppdater det til å bruke din sides vertsnavn."
+    gc_warning: 'Serveren din bruker standardinstillingene for garbage collection i Ruby, dette gir ikke den beste ytelsen. Les dette emnet om hvordan man optimaliserer ytelse: <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a>.'
+    sidekiq_warning: 'Sidekiq kjører ikke. Mange oppgaver, som å sende e-post, kjøres i bakgrunnen av sidekiq. Vennligst verifiser at minst én sidekiq-prosess kjører. <a href="https://github.com/mperham/sidekiq" target="_blank">Lær mer om Sidekiq her</a>.'
+    queue_size_warning: 'Antallet jobber som står i kø er %{queue_size}, som er høyt. Dette kan være en indikasjon på at Sidekiq-prosessen(e) har et problem, eller det kan tenkes du bare trenger flere samtidige Sidekiq-arbeidere.'
     memory_warning: 'Serveren din kjører med mindre enn 1 GB med minne. Minst 1 GB RAM er anbefalt.'
+    google_oauth2_config_warning: 'Denne serveren er konfigurert for å tillate innmelding og innlogging med Google OAuth2 (enable_google_oauth2_logins), men verdiene for klientid og klienthemmelighet er ikke satt. Gå til <a href="/admin/site_settings">Instillingene for nettstedet</a> og oppdater dem. <a href="https://meta.discourse.org/t/configuring-google-login-for-discourse/15858" target="_blank">Les denne guiden for å lære mer</a>.'
+    facebook_config_warning: 'Denne serveren er konfigurert for å tillate innmelding og innlogging med Facebook (enable_facebook_logins), men verdiene for app-id og app-hemmelighet er ikke satt. Gå til <a href="/admin/site_settings">Instillingene for nettstedet</a> og oppdater dem. <a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">Les denne guiden for å lære mer</a>.'
+    twitter_config_warning: 'Denne serveren er konfigurert for å tillate innmelding og innlogging med Twitter (enable_twitter_logins), men verdiene for nøkkel og hemmelighet er ikke satt. Gå til <a href="/admin/site_settings">Instillingene for nettstedet</a> og oppdater dem. <a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">Les denne guiden for å lære mer</a>.'
+    github_config_warning: 'Denne serveren er konfigurert for å tillate innmelding og innlogging med GitHub (enable_github_logins), men verdiene for klientid og hemmelighet er ikke satt. Gå til <a href="/admin/site_settings">Instillingene for nettstedet</a> og oppdater dem. <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">Les denne guiden for å lære mer</a>.'
+    s3_config_warning: 'Denne serveren er konfigurert for å tillate opplasting av filer til s3, men minst en av de følgende verdiene er ikke satt: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, eller s3_upload_bucket. Gå til <a href="/admin/site_settings">Instillingene for nettstedet</a> og oppdater dem. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Les "How to set up image uploads to S3?" for å lære mer</a>.'
+    s3_backup_config_warning: 'Denne serveren er konfigurert for å sende backup til s3, men minst en av de følgende verdiene er ikke satt: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, eller s3_backup_bucket. Gå til <a href="/admin/site_settings">Instillingene for nettstedet</a> og oppdater dem. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Les "How to set up image uploads to S3?" for å lære mer</a>.'
+    image_magick_warning: 'Denne serveren er konfigurert for å lage miniatyrer for store bilder, men ImageMagick er ikke installert. Installer ImageMagick via operativsystemets pakkehåndtering eller <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">last ned den siste versjonen</a>.'
+    failing_emails_warning: 'Det er %{num_failed_jobs} e-postjobber som har feilet. Sjekk instillingene i app.yml og verifiser at serverinstillingene for e-post er riktige. <a href="/sidekiq/retries" target="_blank">Se de feilede jobbene i Sidekiq</a>.'
+    subfolder_ends_in_slash: "Oppsettet av undermappe er feil; variablen DISCOURSE_RELATIVE_URL_ROOT slutter med en skråstrek."
+    email_polling_errored_recently:
+      one: Henting av e-post har generert en feil de siste 24 timene. Se i <a href='/logs' target='_blank'>loggene</a> for mer detaljer.
+      other: Henting av e-post har generert %{count} feil de siste 24 timene. Se i <a href='/logs' target='_blank'>loggene</a> for mer detaljer.
+    missing_mailgun_api_key: "Serveren er konfigurert til å sende e-post via Mailgun men du har ikke satt API-nøkkelen som brukes til å verifisere webhook meldinger."
+    bad_favicon_url: "Favicon filen blir ikke lastet inn. Sjekk instillingen for favicon_url i <a href='/admin/site_settings'>Instillingene for nettstedet</a>."
+    poll_pop3_timeout: "Tilkoblingen til POP3 serveren får timeout. Vi får ikke hentet innkommende e-post. Vennligst sjekk <a href='/admin/site_settings/category/email'>instillingene for POP3</a> eller leverandøren av posttjenesten."
+    poll_pop3_auth_error: "Tilkoblingen til POP3 serveren feiler på grunn av problemer med autentisering. Vennligst sjekk <a href='/admin/site_settings/category/email'>POP3 instillingene</a>. "
+    force_https_warning: "Nettstedet ditt bruker SSL. Men `<a href='/admin/site_settings/category/all_results?filter=force_https'>force_https</a>` er ikke aktivert enda i instillingene."
   site_settings:
     censored_words: "Ord som automatisk vil bli erstattet med &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Slett automatisk skjulte innlegg som har vært skjult i mer enn 30 dager."
-    default_locale: "Forvalgt språk for denne instansen av Discourse (ISO 639-1 Kode)"
+    default_locale: "Standardspråket for denne instansen av Discourse"
     allow_user_locale: "Tillat brukere å velge eget språk"
+    set_locale_from_accept_language_header: "sett språket i grensesnittet for anonyme brukere basert på hva nettleseren deres rapporterer. (EKSPERIMENTELL, fungerer ikke med anonym cache) "
+    support_mixed_text_direction: "Tillat blanding av skriftspråk som bruker venstre-til-høyre og høyre-til-venstre."
     min_post_length: "Minimum tillatt lengde for innlegg i tegn"
     min_first_post_length: "Minimum tillatt lengde på for teksten i første innlegg"
-    min_private_message_post_length: "Minste tillatte innleggslengde for meldinger i antall tegn"
+    min_personal_message_post_length: "Minste lengde i antall tegn for en melding"
     max_post_length: "Maksimum tillatt lengde for innlegg i tegn"
+    topic_featured_link_enabled: "Tillat publisering av lenker som emner."
+    show_topic_featured_link_in_digest: "Vis den fremhevede lenken fra et emne i e-postsammendrag."
     min_topic_title_length: "Minimum tillatt lengde for tittel i tegn"
     max_topic_title_length: "Maksimum tillatt lengde for innlegg i tegn"
-    min_private_message_title_length: "Minste antall tegn tillatt til bruk for tittellengde i meldinger"
+    min_personal_message_title_length: "Minste lengde i antall tegn for en meldingstittel"
+    max_emojis_in_title: "Maksimalt antall emojier i en emnetittel"
     min_search_term_length: "Minimum lengde på søkeord i tegn"
-    allow_duplicate_topic_titles: "Tillat flere emner med identisk tittel."
+    search_tokenize_chinese_japanese_korean: "Tving søk til å tokenisere Kinesisk/Japansk/Koreansk selv på nettsteder uten KJK"
+    search_prefer_recent_posts: "Hvis søking er tregt på et stort forum, vil dette valget forsøke å søke i en index av de nyeste innleggene først"
+    search_recent_posts_size: "Hvor mange innlegg som beholdes i indeksen"
+    log_search_queries: "Logg søkeord som benyttes av brukerne"
+    search_query_log_max_size: "Maksimalt antall søkeord som beholdes"
+    allow_uncategorized_topics: "Tillat opprettelse av ukategoriserte emner. ADVARSEL: Hvis det finnes ukategoriserte emner, må du sette en kategori på dem før du skrur denne instillingen av."
+    allow_duplicate_topic_titles: "Tillat flere tråder med identisk tittel."
     unique_posts_mins: "Hvor mange minutter før en bruker kan lage et innlegg med det samme innholdet igjen"
-    educate_until_posts: "Når bruker begynner å skrive på de første (n) innleggene, vis pop-up med opplæringspanelet for nye brukere i editoren."
+    educate_until_posts: "Når brukeren begynner å skrive sine første (n) innlegg, vis pop-up med opplæringspanelet for nye brukere i redigeringspanelet."
     title: "Navnet på denne siden, slik du vil ha det i title-taggen."
     site_description: "Beskriv siden med en setning, vil brukes i beskrivelses-merkelappen."
+    contact_email: "E-postadresser for nøkkelpersonen ansvarlig for dette nettstedet. Brukes for kritiske varsler, i tillegg til på /about kontaktskjema for saker som haster."
     contact_url: "Kontakt-URL for siden. Brukes på /om siden."
     crawl_images: "Hent bilder fra ekstern URL for å sette inn korrekt høyde og bredde."
     download_remote_images_to_local: "Konverter eksterne bilder ved å laste de ned lokalt, dette forhindrer ødelagte bilder."
     download_remote_images_threshold: "Minimum ledig diskplass for å kunne laste ned eksterne bilder (i prosent)"
+    download_remote_images_max_days_old: "Ikke last ned eksterne bilder for innlegg som er eldre enn dette antall dager."
     disabled_image_download_domains: "Eksterne bilder vil aldri bli lastet ned fra disse domenene (pipe-separert liste)."
     editing_grace_period: "(n) sekunder etter publisering vil redigering ikke opprette en ny versjon i redigeringsloggen."
-    post_edit_time_limit: "Forfattere kan redigere eller slette innleggene sine (n) minutter etter opprettelse. Sett 0 for uendelig."
-    edit_history_visible_to_public: "Alle kan se tidligere versjoner av et redigert innlegg. Hvis det er slått av kan kun staben se det."
+    editing_grace_period_max_diff: "Maksimalt antall tegn for en endring utført i nådeperioden, hvis antallet overskrides lagres en ny revisjon av innlegget (tillitsnivå 0 og 1)"
+    editing_grace_period_max_diff_high_trust: "Maksimalt antall tegn for en endring utført i nådeperioden, hvis antallet overskrides lagres en ny revisjon av innlegget (tillitsnivå 2 og opp)"
+    staff_edit_locks_post: "Innlegg vil bli sperret for redigering av brukere hvis de har vært redigert av staben "
+    post_edit_time_limit: "Forfatteren kan redigere eller slette innleggene sine (n) minutter etter opprettelse. Sett til 0 for uendelig."
+    edit_history_visible_to_public: "La alle se tidligere versjoner av et redigert innlegg. Hvis det er slått av, kan kun staben se det."
     delete_removed_posts_after: "Innlegg som blir fjernet av forfatter blir automatisk slettet etter (n) timer. Sett til 0 og innleggene blir slettet øyeblikkelig."
     max_image_width: "Maksimal thumbnail bredde for bilder i et innlegg"
     max_image_height: "Maksimal thumbnail høyde for bilder i et innlegg"
+    fixed_category_positions: "Hvis denne er valgt kan du manuelt bestemme rekkefølgen i listen over kategorier. Ellers vil kategoriene sorteres automatisk basert på aktivitet."
+    fixed_category_positions_on_create: "Hvis denne er valgt vil den fastsatte rekkefølgen på kategorier også gjelde for dialogboksen når man lager nye emner (krever fixed_category_positions)."
+    add_rel_nofollow_to_user_content: "Legg til rel nofollow på alle lenker som publiseres av brukere, bortsett fra interne lenker (inkludert foreldredomener). Hvis du endrer denne, må du rebake alle innlegg med: \"rake posts:rebake\""
+    exclude_rel_nofollow_domains: "En liste over domener hvor nofollow ikke skal legges til i lenker. example.com vil automatisk også tillate sub.example.com. Som et minimum bør du legge til dette nettstedets domene slik at søkeroboter klarer å finne alt innholdet. Hvis andre deler av nettstedet ditt ligger under forskjellige domener bør de også legges til."
     post_excerpt_maxlength: "Maksimal lengde på utdrag eller oppsummering av innlegg."
+    show_pinned_excerpt_mobile: "Vis utdrag fra festede emner i mobil visning."
+    show_pinned_excerpt_desktop: "Vis utdrag fra festede emner i desktop visning."
+    post_onebox_maxlength: "Maksimal lengde på et onebox Discourse innlegg i antall tegn."
+    onebox_domains_blacklist: "En liste over domener som aldri vil bli forsøkt oneboxet."
+    inline_onebox_domains_whitelist: "En liste over domener hvor onebox brukes i miniatyrstørrelse hvis lenken ikke har en tittel"
+    enable_inline_onebox_on_all_domains: "Ignorer inline_onebox_domain_whitelist innstillingen og tillat inline onebox på alle domener."
+    max_oneboxes_per_post: "Maksimalt antall oneboxer i hvert innlegg."
+    logo_url: "Bildet som skal brukes som logo øverst til venstre på nettstedet, må være en bred rektangel. Hvis instillingen er blank brukes kun tittelteksten."
+    digest_logo_url: "Alternativt bilde for logoen som brukes i toppen av nettstedets oppsummeringer på e-post. Må være et bredt rektangulært bilde. Bør ikke være i SVG format. Hvis instillingen er blank, brukes `logo_url` i stedet."
+    logo_small_url: "Den lille logoen øverst til venstre på nettstedet, bør være et kvadratisk bilde. Dette bildet brukes når man blar nedover på sidene. Hvis den er blank brukes et symbol for 'Hjem' i stedet."
+    favicon_url: "Bildet som skal være favicon for nettstedet, se http://en.wikipedia.org/wiki/Favicon, for å fungere via et CDN må filen være i png-format"
+    mobile_logo_url: "URL for tilpasset logo som skal brukes på den mobile versjonen av nettstedet. Hvis blank, brukes `logo_url` i stedet, for eksempel: http://example.com/uploads/default/logo.png "
+    large_icon_url: "Bildet som skal brukes som logo/splash på Android. Anbefalt størrelse er 512x512 piksler."
     apple_touch_icon_url: "Ikon brukt på Apple touch enheter. Anbefalt størrelse er 144px x 144px."
-    summary_max_results: "Maksimalt antall innlegg som returneres av 'Oppsummer dette emnet'"
+    notification_email: "Adressen som skal brukes som avsender: på alle viktige system e-poster. Domenet som spesifiseres her må ha SPF, DKIM og reverse PTR record satt korrekt for at e-post skal nå frem."
+    email_custom_headers: "En liste over tilpassede e-posthoder med pipe-tegn mellom hvert element"
+    email_subject: "Tilpasset formatering av emnefeltet i standard e-poster. Se også https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801 "
+    force_https: "Tving dette nettstedet til å bare tillate HTTPS. ADVARSEL: Du må IKKE aktivere dette valget før du har verifisert at HTTPS er riktig satt opp og fungerer absolutt alle steder! Har du sjekket CDN, alle sosiale loginmetoder og eventuelle eksterne ressurser for å sikre at de også er kompatible med HTTPS?"
+    same_site_cookies: "Bruk Same-Site cookies/kapsler, de eliminerer alle former for Cross Site Request Forgery på nettlesere som støtter dem (Lax eller Strict). Avarsel: Strict vil kun fungere på nettsteder som tvinger innlogging og bruker SSO."
+    summary_score_threshold: "Minste score for at et innlegg skal inkluderes i 'Sammendrag for Emnet'"
+    summary_posts_required: "Minste antall innlegg før 'Sammendrag for Emnet' aktiveres"
+    summary_likes_required: "Minste antall 'likes' i et emne før 'Sammendrag for Emnet' aktiveres"
+    summary_max_results: "Maksimalt antall innlegg som returneres av 'Oppsummer denne tråden'"
+    num_spam_flags_to_silence_new_user: "Hvis en ny brukers innlegg flagges som spam av minst num_users_to_silence_new_user forskjellige brukere, skjul den nye brukerens innlegg og stans fremtidige innlegg. 0 for å deaktivere."
+    num_users_to_silence_new_user: "Hvis en ny brukers innlegg flagges som spam num_spam_flags_to_silence_new_user ganger av dette antallet brukere, skjul den nye brukerens innlegg og stans fremtidige innlegg. 0 for å deaktivere."
+    num_tl3_flags_to_silence_new_user: "Hvis en ny brukers innlegg flagges av num_tl3_users_to_silence_new_user forskjellige brukere med tillitsnivå 3, skjul alle den nye brukerens innlegg og stans fremtidige innlegg. 0 for å deaktivere."
+    num_tl3_users_to_silence_new_user: "Hvis en ny brukers innlegg flagges num_tl3_flags_to_silence_new_user ganger fra dette antallet brukere med tillitsnivå 3, skjul alle den nye brukerens innlegg og stans fremtidige innlegg. 0 for å deaktivere."
+    notify_mods_when_user_silenced: "Hvis en bruker har blitt automatisk dempet, send en melding til alle moderatorene."
     allow_moderators_to_create_categories: "Tillat moderatorer å opprette nye kategorier"
     send_welcome_message: "Send alle nye brukere en velkomstmelding med en rask startveileder."
-    topics_per_period_in_top_summary: "Antall topp-emner vises som forvalg i oppsummeringen av topp-emner."
-    show_email_on_profile: "Vis brukerens e-postadresse i profilen (kun synlig for brukeren selv og forumstaben)"
+    topics_per_period_in_top_summary: "Antall tråder som vises i standard oppsummering av mest populære tråder."
+    show_email_on_profile: "Vis en brukers e-postadresse vedkommendes profil (kun synlig for brukeren selv og forumstaben)"
     email_token_valid_hours: "Glemt passord / aktiver konto tokens er gyldig for (n) timer."
     enable_badges: "Aktiver badge system"
     log_out_strict: "Ved utlogging, logg ut av ALLE enheter som er pålogget"
@@ -734,39 +1054,42 @@ nb_NO:
     max_likes_per_day: "Maximum antall likes per bruker per dag"
     max_invites_per_day: "Maksimalt antall invitasjoner en bruker kan sende hver dag."
     max_logins_per_ip_per_hour: "Maksimalt antall innlogginger som tillates for hver IP-adresse per time."
+    allow_staff_to_upload_any_file_in_pm: "Tillat medlemmer av staben å laste opp hvilken som helst fil i private samtaler"
     newuser_max_links: "Hvor mange linker en ny bruker kan legge til i et innlegg."
     newuser_max_images: "Hvor mange bilder en ny bruker kan legge til i et innlegg."
     title_prettify: "Unngå vanlige skrivefeil i titler, sånn som store bokstaver, liten bokstav først, mange !, ? og punktum på slutten, osv."
     faq_url: "Hvis du har O-S-S på et annet nettsted du gjerne vil bruke, skriv inn nettadressen her."
     tos_url: "Dersom du har et bruksvilkår-dokument et annet sted som du vil bruke, skriv inn den fullstendige URL-en her."
     privacy_policy_url: "Dersom du har en personvernerklæring et annet sted som du vil bruke, skriv inn den fullstendige URL-en her."
+    auto_silence_fast_typers_on_first_post: "Demp brukere automatisk hvis de skriver innlegg raskere enn min_first_post_typing_time"
+    auto_silence_fast_typers_max_trust_level: "Maksimalt tillitsnivå for automatisk demping av raske innlegg"
     delete_user_max_post_age: "Ikke tillatt å slette brukere hvor deres første innlegg er mer enn (x) dager gamle."
-    email_editable: "Tillat brukere å endre deres email etter at de har registrert seg."
-    digest_topics: "Maksimalt antall populære emner å vise i oppsummerings-e-posten."
+    email_editable: "Tillat brukere å endre e-postadressen sin etter registrering."
+    digest_topics: "Maksimalt antall populære tråder som skal vises i oppsummerings-e-posten."
     digest_posts: "Maksimalt antall populære innlegg å vise i oppsummerings-e-posten."
-    digest_other_topics: "Maksimalt antall emner å vise i delen 'Nytt i emner og kategorier du følger' i oppsummerings-e-posten."
+    digest_other_topics: "Maksimalt antall tråder som skal vises i delen 'Nytt i tråder og kategorier du følger' i oppsummerings-e-posten."
     digest_min_excerpt_length: "Minimal lengde på utdrag av innlegg i e-post-oppsummeringen, i antall tegn."
     digest_suppress_categories: "Utelat disse kategoriene i oppsummerings-eposter"
     disable_digest_emails: "Deaktiver oppsummerings-eposter for alle brukere."
     allow_profile_backgrounds: "Gi brukere mulighet til å laste opp profilbakgrunner."
     enable_mobile_theme: "Mobilenheter bruker et mobilvennlig drakt, med muligheten til å gå til den fulle siden. Deaktiver dette hvis du ønsker å bruke et tilpasset stilark."
     dominating_topic_minimum_percent: "Hvor mange innlegg en bruker kan lage innenfor en topic før de blir påminnet om dominering av en topic."
-    automatically_unpin_topics: "Automatisk fjern feste for emner når brukeren når bunnen."
+    automatically_unpin_topics: "Automatisk fjern feste for tråder når brukeren når bunnen."
     embed_post_limit: "Maksimalt antall innlegg som skal bygges inn."
-    embed_username_required: "Brukernavn kreves for opprettelse av emne."
+    embed_username_required: "Brukernavn kreves for opprettelse av tråd."
     enable_emoji: "Aktiver emoji."
     emoji_set: "Hvordan vil du ha din emoji?"
     default_email_digest_frequency: "Forvalgt innstilling for hvor ofte brukere mottar oppsummerings-e-poster"
-    default_include_tl0_in_digests: "La det være forvalgt innstilling å inkludere innlegg fra nye brukere i oppsummerings-e-poster. Brukere kan endre dette i innstillingene sine."
+    default_include_tl0_in_digests: "Inkluder innlegg fra nye brukere i oppsummerings-e-poster som forvalg. Brukere kan endre dette i innstillingene sine."
     default_email_mailing_list_mode_frequency: "Brukere som slår på e-postlistemodus, vil motta e-poster så ofte som forvalg"
     disable_mailing_list_mode: "Forby brukere å slå på e-postlistemodus"
     default_email_previous_replies: "Inkluder tidligere svar i e-poster som forvalg."
-    default_topics_automatic_unpin: "Automatisk fjern feste for emner når brukeren når bunnen som forvalg."
+    default_topics_automatic_unpin: "La det være forvalgt innstilling å fjerne feste for tråder automatisk når brukeren når bunnen."
     default_categories_watching: "Liste med kategorier som følges som forvalg"
     default_categories_tracking: "Liste med kategorier som overvåkes som forvalg"
-    default_categories_muted: "Liste med kategorier som blir dempet som forvalg"
-    default_categories_watching_first_post: "Liste med kategorier hvor det første innlegget i hvert nye emne følges som forvalg."
-    remove_muted_tags_from_latest: "Ikke vis emner med dempede stikkord i listen med siste emner."
+    default_categories_muted: "Liste med kategorier som er dempet som forvalg"
+    default_categories_watching_first_post: "Liste over kategorier hvor det er forvalgt innstilling at det første innlegget i hver nye tråd følges."
+    remove_muted_tags_from_latest: "Ikke vis tråder med dempede stikkord i listen over siste tråder."
     company_short_name: "Firmanavn (kort)"
     company_full_name: "Firmanavn (hele)"
     company_domain: "Firmadomene"
@@ -786,45 +1109,46 @@ nb_NO:
   most_posts: "Flest innlegg"
   most_recent_poster: "Ferskeste innlegg av"
   redirected_to_top_reasons:
-    new_user: "Velkommen til forumet vårt! Dette er de mest populære emnene for tiden. "
-    not_seen_in_a_month: "Velkommen tilbake! Nå har ikke vi sett deg på en stund. Dette er de mest populære emnene for tiden."
+    new_user: "Velkommen til forumet vårt! Dette er de mest populære trådene for tiden. "
+    not_seen_in_a_month: "Velkommen tilbake! Vi har ikke sett deg på en stund. Dette er de mest populære trådene siden du var her sist."
   change_owner:
     deleted_user: "en slettet bruker"
   topic_statuses:
-    archived_enabled: "Dette emnet er nå arkivert. Det er fryst og kan ikke bli endret på noen måte. "
-    archived_disabled: "Dette emnet er ikke lenger arkivert. Det er ikke lenger fryst, og kan endres."
-    closed_enabled: "Dette emnet er nå lukket. Emnet kan ikke lenger svares på. "
-    closed_disabled: "Dette emnet er nå åpent. Emnet kan svares på. "
+    archived_enabled: "Denne tråden er nå arkivert. Den er fryst og kan ikke endres på noen måte. "
+    archived_disabled: "Denne tråden er ikke lenger arkivert. Den er ikke lenger fryst, og kan endres."
+    closed_enabled: "Denne tråden er nå lukket. Nye svar er ikke lenger tillatt."
+    closed_disabled: "Denne tråden er nå åpen. Nye svar er tillatt."
     autoclosed_enabled_days:
-      one: "Dette emnet ble automatisk lukket etter 1 dag. Emnet kan ikke lenger svares på. "
-      other: "Dette emnet ble automatisk lukket etter %{count} dager. Emnet kan ikke lenger svares på. "
+      one: 'Denne tråden ble automatisk lukket etter 1 dag. Nye svar er ikke lenger tillatt. '
+      other: 'Denne tråden ble automatisk lukket etter %{count} dager. Nye svar er ikke lenger tillatt. '
     autoclosed_enabled_hours:
-      one: "Dette emnet ble automatisk lukket etter 1 time. Emnet kan ikke lenger svares på. "
-      other: "Dette emnet ble automatisk lukket etter %{count} timer. Emnet kan ikke lenger svares på. "
+      one: 'Denne tråden ble automatisk lukket etter 1 time. Nye svar er ikke lenger tillatt. '
+      other: 'Denne tråden ble automatisk lukket etter %{count} timer. Nye svar er ikke lenger tillatt. '
     autoclosed_enabled_minutes:
-      one: "Dette emnet ble automatisk lukket etter 1 minutt. Emnet kan ikke lenger svares på. "
-      other: "Dette emnet ble automatisk lukket etter %{count} minutter. Emnet kan ikke lenger svares på. "
+      one: 'Denne tråden ble automatisk lukket etter 1 minutt. Nye svar er ikke lenger tillatt. '
+      other: 'Denne tråden ble automatisk lukket etter %{count} minutter. Nye svar er ikke lenger tillatt. '
     autoclosed_enabled_lastpost_days:
-      one: "Dette emnet ble automatisk lukket 1 dag etter siste innlegg. Emnet kan ikke lenger svares på. "
-      other: "Dette emnet ble automatisk lukket %{count} dager etter siste innlegg. Emnet kan ikke lenger svares på. "
+      one: 'Denne tråden ble automatisk lukket 1 dag etter siste innlegg. Nye svar er ikke lenger tillatt. '
+      other: 'Denne tråden ble automatisk lukket %{count} dager etter siste svar. Nye svar er ikke lenger tillatt. '
     autoclosed_enabled_lastpost_hours:
-      one: "Dette emnet ble automatisk lukket 1 time etter siste innlegg. Emnet kan ikke lenger svares på. "
-      other: "Dette emnet ble automatisk lukket %{count} timer etter siste innlegg. Emnet kan ikke lenger svares på. "
+      one: 'Denne tråden ble automatisk lukket 1 time etter siste innlegg. Nye svar er ikke lenger tillatt. '
+      other: 'Denne tråden ble automatisk lukket %{count} timer etter siste svar. Nye svar er ikke lenger tillatt. '
     autoclosed_enabled_lastpost_minutes:
-      one: "Dette emnet ble automatisk lukket 1 minutt etter siste innlegg. Emnet kan ikke lenger svares på. "
-      other: "Dette emnet ble automatisk lukket %{count} minutter etter siste innlegg. Emnet kan ikke lenger svares på. "
-    autoclosed_disabled: "Dette emnet er nå åpent. Emnet kan svares på. "
-    autoclosed_disabled_lastpost: "Dette emnet er åpnet. Nye svar er tillatt."
-    pinned_enabled: "Dette emnet er nå festet. Det vil vises i toppen av sin kategori inntil festet fjernes av en administrator eller av enkeltbrukere for seg selv."
-    pinned_disabled: "Dette emnet er ikke lenger festet. Det vil ikke lenger vises i toppen av sin kategori."
-    pinned_globally_enabled: "Dette emnet er nå festet globalt. Det vil vises i toppen av sin kategori og alle emne lister inntil festet fjernes for alle av staben, eller for enkelte brukere av dem selv."
-    pinned_globally_disabled: "Dette emnet er ikke lenger festet. Det vil ikke lenger vises i toppen av sin kategori."
-    visible_enabled: "Dette emnet er nå listet. Det vil vises i emne listene. "
-    visible_disabled: "Dette ement er ikke lenger listet. Det vil ikke lenger bli vist i noen av emnelistene. Den eneste måten å få tilgang til dette emnet er via en direkte link. "
+      one: 'Denne tråden ble automatisk lukket 1 minutt etter siste innlegg. Nye svar er ikke lenger tillatt. '
+      other: 'Denne tråden ble automatisk lukket %{count} minutter etter siste svar. Nye svar er ikke lenger tillatt. '
+    autoclosed_disabled: "Denne tråden er nå åpen. Tråden kan svares på. "
+    autoclosed_disabled_lastpost: "Denne tråden er åpne. Nye svar er tillatt."
+    pinned_enabled: "Denne tråden er nå festet. Den vil vises øverst i kategorien sin inntil festet fjernes for alle av en administrator eller for individuelle brukere av dem selv."
+    pinned_disabled: "Denne tråden er ikke lenger festet. Den vil ikke lenger vises øverst i kategorien sin."
+    pinned_globally_enabled: "Denne tråden er nå festet globalt. Den vil vises øverst i kategorien sin og alle lister over tråder inntil festet fjernes for alle av staben eller for individuelle brukere av dem selv."
+    pinned_globally_disabled: "Denne tråden er ikke lenger festet. Den vil ikke lenger vises øverst i kategorien sin."
+    visible_enabled: "Denne tråden er nå synlig. Den vil vises i listene over tråder."
+    visible_disabled: "Denne tråden er nå usynlig. Den vil ikke lenger vises i noen liste over tråder. Den eneste måten å se denne tråden er med en direkte lenke. "
   login:
     incorrect_username_email_or_password: "Feil brukernavn, email eller passord"
     wait_approval: "Takk for at du registrerte deg. Vi vil varsle deg når din konto er blitt godkjent."
     active: "Kontoen din har blitt godkjent og er klar for bruk."
+    suspended_with_reason: "Konto sperret til %{date}: %{reason}"
     not_available: "Ikke mulig. Prøv %{suggestion}?"
     something_already_taken: "Noe gikk galt, kanskje brukernavn eller email er allerede i bruk? Prøv 'glemt passord' linken."
     omniauth_error_unknown: "Noe gikk galt under innloggingsprosessen, prøv igjen."
@@ -867,19 +1191,43 @@ nb_NO:
     Du mottar dette fordi du har slått på e-postlistemodus.
 
     For å melde deg av disse e-postene [klikk her](%{unsubscribe_url}).
+  subject_pm: "[privat samtale]"
   user_notifications:
     previous_discussion: "Tidligere svar"
+    user_invited_to_private_message_pm_group:
+      title: "Bruker inviterte gruppe til privat samtale"
+    user_invited_to_private_message_pm:
+      title: "Bruker invitert til privat samtale"
+    user_invited_to_private_message_pm_staged:
+      title: "Bruker invitert til privat samtale arrangert"
+    user_replied_pm:
+      title: "Bruker svarte i privat samtale"
+      subject_template: "[%{email_prefix}] [privat samtale] %{topic_title}"
+    user_posted_pm:
+      title: "Bruker opprettet privat samtale"
+      subject_template: "[%{email_prefix}] [privat samtale] %{topic_title}"
+    user_posted_pm_staged:
+      title: "Bruker opprettet arrangert privat samtale"
+    account_suspended:
+      title: "Konto sperret"
+      subject_template: "[%{email_prefix}] Kontoen din er blitt sperret"
+      text_body_template: |
+        Du er blitt utestengt fra forumet til %{suspended_till}.
+
+        %{reason}
+
+        %{message}
     digest:
       why: "Dette har skjedd på %{site_link} siden ditt forrige besøk %{last_seen_at}"
       since_last_visit: "Siden siste besøk"
-      new_topics: "Nye emner"
+      new_topics: "Nye tråder"
       unread_messages: "Uleste meldinger"
       unread_notifications: "Uleste varslinger."
       liked_received: "Likes mottatt"
       new_posts: "Nye innlegg"
       new_users: "Nye brukere"
-      popular_topics: "Populære emner"
-      follow_topic: "Følg dette emnet"
+      popular_topics: "Populære tråder"
+      follow_topic: "Følg denne tråden"
       join_the_discussion: "Les mer"
       popular_posts: "Populære innlegg"
       more_new: "Nytt for deg"
@@ -906,9 +1254,10 @@ nb_NO:
   email_log:
     no_user: "Finner ikke brukeren med id %{user_id}"
     anonymous_user: "Brukeren er anonym"
+    suspended_not_pm: "Bruker er utestengt, ikke en beskjed"
     seen_recently: "Brukeren ble sett nylig"
     post_deleted: "innlegget var "
-    user_suspended: "Brukeren var suspendert"
+    user_suspended: "Brukeren var utestengt"
     already_read: "bruker har allerede lest dette innlegget"
     message_blank: "meldingen er tom"
   color_schemes:
@@ -950,7 +1299,7 @@ nb_NO:
       *   For å gjøre opplevelsen din mer personlig. Opplysningene dine hjelper oss å svare bedre på dine individuelle behov.
       *   For å forbedre nettstedet vårt. Vi jobber konstant for å forbedre nettstedets tilbud basert på opplysningene og tilbakemeldingene vi mottar fra deg.
       *   For å forbedre vår kundeservice. Dine opplysninger hjelper oss å svare mer effektivt på dine forespørsler sendt til kundeservice eller behov om støtte.
-      *   For å sende periodiske e-poster. E-postadressen du oppgir, kan bli brukt til å sende deg informasjon, påminnelser som du ber om ved endringer av emner eller ved svar til brukernavnet ditt, til henvendelser, og/eller andre forspørsler eller andre spørsmål.
+      *   For å sende periodiske e-poster. E-postadressen du oppgir, kan bli brukt til å sende deg informasjon, påminnelser som du ber om ved endringer av tråder eller ved svar til brukernavnet ditt, til henvendelser, og/eller andre forspørsler eller andre spørsmål.
 
       <a name="sikre"></a>
 
@@ -1017,12 +1366,16 @@ nb_NO:
       name: Tekstbehandler
     member:
       name: Medlem
+    regular:
+      name: Aktivt medlem
+      long_description: |
+        Dette merket tildeles når du når tillitsnivå 3. Takk for at du har vært en aktivt medlem av fellesskapet vårt gjennom flere måneder. Du er nå en av de mest aktive leserne og en pålitelig bidragsyter som gjør fellesskapet vårt storartet. Du kan nå endre kategori og navn på tråder, fjerne søppelpost med ett flagg, delta i diskusjoner i en privat kategori bare for medlemmer med tillitsnivå 3 eller høyere , og du vil også få mange flere likes per dag.
     welcome:
       name: Velkommen
     anniversary:
       name: Jubileum
     good_topic:
-      name: Bra emne
+      name: Bra tråd
     champion:
       description: Inviterte fem medlemmer
     first_quote:
@@ -1030,6 +1383,8 @@ nb_NO:
       description: Siterte et innlegg
     read_guidelines:
       name: Les retningslinjene
+    hot_link:
+      name: Populær lenke
     famous_link:
       name: Berømt lenke
     appreciated:
@@ -1041,14 +1396,17 @@ nb_NO:
     gives_back:
       name: Gir tilbake
     first_onebox:
-      long_description: Dette merket tildeles den første gangen du publiserer et innlegg med en lenke på en egen linje, som deretter automatisk blir utvidet til en miniboks med en kort oppsummering av lenken, en tittel og (dersom tilgjengelig) et bilde.
+      long_description: "Dette merket tildeles den første gangen du publiserer et innlegg med en lenke på en egen linje, som deretter automatisk blir utvidet til en miniboks med en kort oppsummering av lenken, en tittel og (dersom tilgjengelig) et bilde."
   admin_login:
     success: "E-post sendt"
-    error: "Feil!"
     submit_button: "Send e-post"
   tags:
     title: "Stikkord"
   finish_installation:
+    register:
+      button: "Registrer"
+      title: "Registrer administratorkonto"
+      help: "registrer en ny konto for å komme igang"
     confirm_email:
       title: "Bekreft din e-postadresse"
     resend_email:
@@ -1058,9 +1416,19 @@ nb_NO:
     title: "Start sikkerhetsmodus"
     description: "Sikkerhetsmodus lar deg teste nettstedet ditt uten at tillegg eller tilpasninger lastes."
   wizard:
+    title: "Discourse-oppsett"
     step:
       forum_title:
         title: "Navn"
+      introduction:
+        title: "Introduksjon"
+      privacy:
+        title: "Tilgang"
+        fields:
+          privacy:
+            choices:
+              restricted:
+                label: "Privat"
       contact:
         fields:
           contact_email:
@@ -1078,6 +1446,13 @@ nb_NO:
             label: "Bedriftsnavn (kort)"
       colors:
         title: "Drakt"
+        fields:
+          theme_id:
+            choices:
+              default:
+                label: "Enkel lys"
+              dark:
+                label: "Enkel mørk"
       logos:
         title: "Logoer"
         fields:
@@ -1102,11 +1477,8 @@ nb_NO:
           homepage_style:
             choices:
               latest:
-                label: "Siste emner"
+                label: "Siste tråder"
               categories:
                 label: "Kategorier"
       emoji:
         title: "Emoji"
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index 1ccee3384b6..3f10fed8e2a 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -17,12 +17,12 @@ nl:
       date_only: "%-d %B %Y"
       long: "%-d %B %Y om %H:%M"
   date:
-    month_names: [null, januari, februari, maart, april, mei, juni, juli, augustus, september, oktober, november, december]
+    month_names: [~, januari, februari, maart, april, mei, juni, juli, augustus, september, oktober, november, december]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "am"
     pm: "pm"
-    <<: *datetime_formats
   title: "Discourse"
   topics: "Topics"
   posts: "berichten"
@@ -67,19 +67,18 @@ nl:
       present: moet leeg zijn
       confirmation: "komt niet overeen met %{attribute}"
       empty: mag niet leeg zijn
-      equal_to: moet gelijk zijn aan %{count}
+      equal_to: "moet gelijk zijn aan %{count}"
       even: moet even zijn
       exclusion: is gereserveerd
-      greater_than: moet groter zijn dan %{count}
-      greater_than_or_equal_to: moet groter zijn dan of gelijk zijn aan %{count}
+      greater_than: "moet groter zijn dan %{count}"
+      greater_than_or_equal_to: "moet groter zijn dan of gelijk zijn aan %{count}"
       has_already_been_used: "is al gebruikt"
       inclusion: komt niet voor in de lijst
       invalid: is ongeldig
       is_invalid: "lijkt onduidelijk, is het een volledige zin?"
       contains_censored_words: "bevat de volgende gecensureerde woorden: %{censored_words}"
-      matches_censored_pattern: "bevat de volgende woorden die met de gecensureerde regexp van de website overeenkomen: %{censored_words}"
-      less_than: moet minder zijn dan %{count}
-      less_than_or_equal_to: moet minder zijn dan of gelijk zijn aan %{count}
+      less_than: "moet minder zijn dan %{count}"
+      less_than_or_equal_to: "moet minder zijn dan of gelijk zijn aan %{count}"
       not_a_number: is niet een getal
       not_an_integer: moet een integer zijn
       odd: moet oneven zijn
@@ -111,6 +110,9 @@ nl:
       max_username_length_range: "U kunt het maximum niet lager instellen dan het minimum."
       default_categories_already_selected: "U kunt geen categorie selecteren die in een andere lijst wordt gebruikt."
       s3_upload_bucket_is_required: "U kunt geen uploads naar S3 toestaan voordat u de 's3_upload_bucket' hebt opgegeven."
+  activemodel:
+    errors:
+      <<: *errors
   invite:
     not_found: "Uw uitnodigingstoken is ongeldig. Neem contact op met de beheerder van de website."
     user_exists: "<b>%{email}</b> hoeft niet te worden uitgenodigd; hij of zij <a href='/u/%{username}/summary'>heeft al een account!</a>"
@@ -131,8 +133,8 @@ nl:
   reading_time: "Leestijd"
   likes: "Likes"
   too_many_replies:
-    one: "Sorry, maar nieuwe gebruikers mogen tijdelijk maar 1 antwoord in hetzelfde topic plaatsen."
-    other: "Sorry, maar nieuwe gebruikers mogen tijdelijk maar %{count} antwoorden in hetzelfde topic plaatsen."
+    one: Sorry, maar nieuwe gebruikers mogen tijdelijk maar 1 antwoord in hetzelfde topic plaatsen.
+    other: Sorry, maar nieuwe gebruikers mogen tijdelijk maar %{count} antwoorden in hetzelfde topic plaatsen.
   embed:
     start_discussion: "Discussie starten"
     continue: "Discussie voortzetten"
@@ -142,36 +144,35 @@ nl:
     no_hosts: "Er zijn geen hosts ingesteld voor embedding."
     configure: "Embedden configureren"
     more_replies:
-      one: "Nog 1 antwoord"
-      other: "Nog %{count} antwoorden"
+      one: Nog 1 antwoord
+      other: Nog %{count} antwoorden
     loading: "Discussie laden..."
     permalink: "Permalink"
     imported_from: "Dit discussietopic is een voortzetting van het oorspronkelijke topic op %{link}"
     in_reply_to: "▶ %{username}"
     replies:
-      one: "1 antwoord"
-      other: "%{count} antwoorden"
+      one: 1 antwoord
+      other: '%{count} antwoorden'
   no_mentions_allowed: "Sorry, u kunt geen andere gebruikers noemen."
   too_many_mentions:
-    one: "Sorry, u kunt maar één andere gebruiker in een bericht noemen."
-    other: "Sorry, u kunt maar %{count} gebruikers in een bericht noemen."
+    one: Sorry, u kunt maar één andere gebruiker in een bericht noemen.
+    other: Sorry, u kunt maar %{count} gebruikers in een bericht noemen.
   no_mentions_allowed_newuser: "Sorry, nieuwe gebruikers kunnen geen andere gebruikers noemen."
   too_many_mentions_newuser:
-    one: "Sorry, nieuwe gebruikers kunnen maar één andere gebruiker in een bericht noemen."
-    other: "Sorry, nieuwe gebruikers kunnen maar %{count} gebruikers in een bericht noemen."
+    one: Sorry, nieuwe gebruikers kunnen maar één andere gebruiker in een bericht noemen.
+    other: Sorry, nieuwe gebruikers kunnen maar %{count} gebruikers in een bericht noemen.
   no_images_allowed: "Sorry, nieuwe gebruikers kunnen geen afbeeldingen in berichten plaatsen."
   too_many_images:
-    one: "Sorry, nieuwe gebruikers kunnen maar één afbeelding in een bericht plaatsen."
-    other: "Sorry, nieuwe gebruikers kunnen maar %{count} afbeeldingen in een bericht plaatsen."
+    one: Sorry, nieuwe gebruikers kunnen maar één afbeelding in een bericht plaatsen.
+    other: Sorry, nieuwe gebruikers kunnen maar %{count} afbeeldingen in een bericht plaatsen.
   no_attachments_allowed: "Sorry, nieuwe gebruikers kunnen geen bijlagen in berichten plaatsen."
   too_many_attachments:
-    one: "Sorry, nieuwe gebruikers kunnen maar één bijlage in een bericht plaatsen."
-    other: "Sorry, nieuwe gebruikers kunnen maar %{count} bijlagen in een bericht plaatsen."
+    one: Sorry, nieuwe gebruikers kunnen maar één bijlage in een bericht plaatsen.
+    other: Sorry, nieuwe gebruikers kunnen maar %{count} bijlagen in een bericht plaatsen.
   no_links_allowed: "Sorry, nieuwe gebruikers kunnen geen koppelingen in berichten plaatsen."
   too_many_links:
-    one: "Sorry, nieuwe gebruikers kunnen maar één koppeling in een bericht plaatsen."
-    other: "Sorry, nieuwe gebruikers kunnen maar %{count} koppelingen in een bericht plaatsen."
-  contains_blocked_words: "Je bericht bevat woorden die niet zijn toegestaan."
+    one: Sorry, nieuwe gebruikers kunnen maar één koppeling in een bericht plaatsen.
+    other: Sorry, nieuwe gebruikers kunnen maar %{count} koppelingen in een bericht plaatsen.
   spamming_host: "Sorry, u kunt geen koppeling naar die host plaatsen."
   user_is_suspended: "Geschorste gebruikers mogen geen berichten plaatsen."
   topic_not_found: "Er is iets fout gegaan. Misschien is het topic gesloten of verwijderd terwijl u het bekeek?"
@@ -202,7 +203,6 @@ nl:
     top_weekly: "Wekelijkse toptopics"
     top_daily: "Dagelijkse toptopics"
     posts: "Nieuwste berichten"
-    private_posts: "Nieuwste privéberichten"
     group_posts: "Nieuwste berichten van %{group_name}"
     group_mentions: "Nieuwste vermeldingen van %{group_name}"
     user_posts: "Nieuwste berichten van @%{username}"
@@ -215,11 +215,8 @@ nl:
   queue:
     delete_reason: "Verwijderd via wachtrij voor berichtmoderatie"
   groups:
-    success:
-      bulk_add: "Er zijn %{users_added} gebruikers aan de groep toegevoegd."
     errors:
       can_not_modify_automatic: "U kunt een automatische groep niet wijzigen"
-      member_already_exist: "'%{username}' is al lid van deze groep."
       invalid_domain: "%{domain}' is geen geldig domein."
       invalid_incoming_email: "%{email}' is geen geldig e-mailadres."
       email_already_used_in_group: "'%{email}' wordt al gebruikt door de groep '%{group_name}'."
@@ -238,9 +235,9 @@ nl:
       title: "Lidmaatschapsverzoek voor @%{group_name}"
   education:
     until_posts:
-      one: "1 bericht"
-      other: "%{count} berichten"
-    new-topic: |
+      one: 1 bericht
+      other: '%{count} berichten'
+    'new-topic': |
       Welkom op %{site_name} &ndash; **bedankt voor het starten van een nieuwe conversatie!**
 
       - Klinkt de titel interessant als u deze hardop leest? Is het een goede samenvatting?
@@ -250,7 +247,7 @@ nl:
       - Gebruik algemeen gebruikte woorden, zodat anderen uw topic kunnen *vinden*. Selecteer een categorie om uw topic met verwante topics te groeperen.
 
       [Bekijk onze gemeenschapsrichtlijnen](/guidelines) voor meer informatie. Dit paneel verschijnt alleen bij uw eerste %{education_posts_text}.
-    new-reply: |
+    'new-reply': |
       Welkom op %{site_name} &ndash; **bedankt voor uw bijdrage!**
 
       - Levert uw antwoord een nuttige bijdrage aan de conversatie, hoe klein dan ook?
@@ -296,12 +293,6 @@ nl:
       Het spijt ons, maar nieuwe gebruikers hebben een tijdelijke beperking van %{newuser_max_replies_per_topic} antwoorden in hetzelfde topic.
 
       Overweeg uw eerdere antwoorden te bewerken of andere topics te bezoeken in plaats van nog een antwoord toe te voegen.
-    reviving_old_topic: |
-      ### Dit topic nieuw leven inblazen?
-
-      Het laatste antwoord op dit topic was **%{days}** dagen geleden. Uw antwoord zal het topic naar de bovenkant van de bijbehorende lijst verplaatsen en iedereen die eerder bij de conversatie was betrokken op de hoogte brengen.
-
-      Weet u zeker dat u deze oude conversatie wilt voortzetten?
   activerecord:
     attributes:
       category:
@@ -314,13 +305,12 @@ nl:
       user_profile:
         bio_raw: "Over mij"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "U kunt alleen waarschuwingen aan privéberichten toevoegen."
               too_many_users: "U kunt alleen waarschuwingen naar één gebruiker tegelijk sturen."
-              cant_send_pm: "Sorry, u kunt geen privébericht naar die gebruiker sturen."
               no_user_selected: "U moet een geldige gebruiker selecteren."
               reply_by_email_disabled: "Antwoorden met een email is uitgeschakeld."
             featured_link:
@@ -359,7 +349,6 @@ nl:
           attributes:
             word:
               too_many: "Te veel woorden voor die aktie"
-      <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>het veld Over mij van uw profiel is momenteel leeg; <a href='/u/%{username_lower}/preferences/about-me'>zou u dit willen invullen?</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} heeft nog niets in het veld Over mij van zijn of haar profiel ingevoerd</div>"
@@ -375,41 +364,41 @@ nl:
     title: "Welkom bij Discourse"
     body: |2
 
-      De eerste alinea van dit vastgemaakte topic is op uw startpagina zichtbaar als een welkomstbericht voor alle nieuwe bezoekers. Dit is belangrijk!
+        De eerste alinea van dit vastgemaakte topic is op uw startpagina zichtbaar als een welkomstbericht voor alle nieuwe bezoekers. Dit is belangrijk!
 
-      **Bewerk dit** naar een korte beschrijving van uw gemeenschap:
+        **Bewerk dit** naar een korte beschrijving van uw gemeenschap:
 
-      - Voor wie is deze bestemd?
-      - Wat kunnen ze hier vinden?
-      - Waarom zouden ze hier moeten komen?
-      - Waar kunnen ze meer lezen (koppelingen, bronnen, etc.)?
+        - Voor wie is deze bestemd?
+        - Wat kunnen ze hier vinden?
+        - Waarom zouden ze hier moeten komen?
+        - Waar kunnen ze meer lezen (koppelingen, bronnen, etc.)?
 
-      <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+        <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
 
-      Mogelijk wilt u dit topic sluiten via de :wrench: voor beheer (rechtsboven en -beneden), zodat er bij een aankondiging geen antwoorden opstapelen.
+        Mogelijk wilt u dit topic sluiten via de :wrench: voor beheer (rechtsboven en -beneden), zodat er bij een aankondiging geen antwoorden opstapelen.
   lounge_welcome:
     title: "Welkom in de Lounge"
     body: |2
 
-      Gefeliciteerd! :confetti_ball:
+        Gefeliciteerd! :confetti_ball:
 
-      Als u dit bericht kunt zien, bent u onlangs gepromoveerd naar **vaste gebruiker** (vertrouwensniveau 3).
+        Als u dit bericht kunt zien, bent u onlangs gepromoveerd naar **vaste gebruiker** (vertrouwensniveau 3).
 
-      U kunt nu &hellip;
+        U kunt nu &hellip;
 
-      * De titel van elk topic bewerken
-      * De categorie van elk topic wijzigen
-      * Al uw koppelingen laten volgen ([automatische nofollow](http://nl.wikipedia.org/wiki/Nofollow) is verwijderd)
-      * Een privécategorie Lounge benaderen, die alleen zichtbaar is voor gebruikers met vertrouwensniveau 3 en hoger
-      * Spam verbergen met één markering
+        * De titel van elk topic bewerken
+        * De categorie van elk topic wijzigen
+        * Al uw koppelingen laten volgen ([automatische nofollow](http://nl.wikipedia.org/wiki/Nofollow) is verwijderd)
+        * Een privécategorie Lounge benaderen, die alleen zichtbaar is voor gebruikers met vertrouwensniveau 3 en hoger
+        * Spam verbergen met één markering
 
-      Hier is de [huidige lijst van vaste gebruikers](/badges/3/regular). Zeg zeker even hallo.
+        Hier is de [huidige lijst van vaste gebruikers](/badges/3/regular). Zeg zeker even hallo.
 
-      Bedankt dat u een belangrijk onderdeel bent van deze gemeenschap!
+        Bedankt dat u een belangrijk onderdeel bent van deze gemeenschap!
 
-      ([Bekijk dit topic][trust] voor meer informatie over vertrouwensniveaus. Let erop dat alleen leden die na verloop van tijd aan de voorwaarden blijven voldoen vaste gebruikers blijven.)
+        ([Bekijk dit topic][trust] voor meer informatie over vertrouwensniveaus. Let erop dat alleen leden die na verloop van tijd aan de voorwaarden blijven voldoen vaste gebruikers blijven.)
 
-      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Over de categorie %{category}"
     replace_paragraph: "(Vervang deze eerste alinea door een korte beschrijving van uw nieuwe categorie. Deze leidraad verschijnt in het categorieselectiegebied, dus probeer deze onder de 200 tekens te houden. **Voordat u deze beschrijving bewerkt of topics aanmaakt, verschijnt deze categorie niet op de categoriepagina.**)"
@@ -426,8 +415,8 @@ nl:
       uncategorized: "Ongecategoriseerd kan niet worden verwijderd"
       has_subcategories: "Deze categorie kan niet worden verwijderd, omdat deze subcategorieën bevat"
       topic_exists:
-        one: "Deze categorie kan niet worden verwijderd, omdat deze 1 topic bevat. Het oudste topic is %{topic_link}."
-        other: "Deze categorie kan niet worden verwijderd, omdat deze %{count} topics bevat. Het oudste topic is %{topic_link}."
+        one: Deze categorie kan niet worden verwijderd, omdat deze 1 topic bevat. Het oudste topic is %{topic_link}.
+        other: Deze categorie kan niet worden verwijderd, omdat deze %{count} topics bevat. Het oudste topic is %{topic_link}.
       topic_exists_no_oldest: "Deze categorie kan niet worden verwijderd, omdat het aantal topics %{count} is."
     uncategorized_description: "Topics die geen categorie nodig hebben of niet in een andere bestaande categorie passen."
   trust_levels:
@@ -443,103 +432,86 @@ nl:
       title: "leider"
     change_failed_explanation: "U probeerde %{user_name} naar '%{new_trust_level}' te degraderen. Zijn of haar vertrouwensniveau is echter al '%{current_trust_level}'. %{user_name} blijft op vertrouwensniveau '%{current_trust_level}'. Als u de gebruiker wil degraderen, vergrendel dan eerst het vertrouwensniveau."
   rate_limiter:
-    slow_down: "U hebt deze actie te vaak uitgevoerd; probeer het later opnieuw."
-    too_many_requests: "Er is een dagelijks limiet voor hoe vaak die actie kan worden uitgevoerd. Wacht %{time_left} voordat u het opnieuw probeert."
-    by_type:
-      first_day_replies_per_day: "U hebt het maximale aantal antwoorden dat een nieuwe gebruiker op de eerste dag kan plaatsen bereikt. Wacht %{time_left} voordat u het opnieuw probeert."
-      first_day_topics_per_day: "U hebt het maximale aantal topics dat een nieuwe gebruiker op de eerste dag kan plaatsen bereikt. Wacht %{time_left} voordat u het opnieuw probeert."
-      create_topic: "U maakt te snel topics aan. Wacht %{time_left} voordat u het opnieuw probeert."
-      create_post: "U antwoordt te snel. Wacht %{time_left} voordat u het opnieuw probeert."
-      delete_post: "U verwijdert berichten te snel. Wacht %{time_left} voor u het opnieuw probeert."
-      public_group_membership: "U neemt deel aan of verlaat groepen te regelmatig. Wacht %{time_left} voordat u het opnieuw probeert."
-      topics_per_day: "U hebt het maximale aantal nieuwe topics voor vandaag bereikt. Wacht %{time_left} voordat u het opnieuw probeert."
-      pms_per_day: "U hebt het maximale aantal berichten voor vandaag bereikt. Wacht %{time_left} voordat u het opnieuw probeert."
-      create_like: "U hebt het maximale aantal likes voor vandaag bereikt. Wacht %{time_left} voordat u het opnieuw probeert."
-      create_bookmark: "U hebt het maximale aantal bladwijzers voor vandaag bereikt. Wacht %{time_left} voordat u het opnieuw probeert."
-      edit_post: "U hebt het maximale aantal bewerkingen voor vandaag bereikt. Wacht %{time_left} voordat u het opnieuw probeert."
-      live_post_counts: "U vraagt te snel om live berichtaantallen. Wacht %{time_left} voordat u het opnieuw probeert."
-      unsubscribe_via_email: "U hebt het maximale aantal uitschrijvingen via e-mail voor vandaag bereikt. Wacht %{time_left} voordat u het opnieuw probeert."
-      topic_invitations_per_day: "U hebt het maximale aantal topicuitnodigingen voor vandaag bereikt. Wacht %{time_left} voordat u het opnieuw probeert."
     hours:
-      one: "1 uur"
-      other: "%{count} uur"
+      one: 1 uur
+      other: '%{count} uur'
     minutes:
-      one: "1 minuut"
-      other: "%{count} minuten"
+      one: 1 minuut
+      other: '%{count} minuten'
     seconds:
-      one: "1 seconde"
-      other: "%{count} seconden"
+      one: 1 seconde
+      other: '%{count} seconden'
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: "< 1s"
-        other: "< %{count}s"
+        one: < 1s
+        other: < %{count}s
       x_seconds:
-        one: "1s"
-        other: "%{count}s"
+        one: 1s
+        other: '%{count}s'
       less_than_x_minutes:
-        one: "< 1m"
-        other: "< %{count}m"
+        one: < 1m
+        other: < %{count}m
       x_minutes:
-        one: "1m"
-        other: "%{count}m"
+        one: 1m
+        other: '%{count}m'
       about_x_hours:
-        one: "1u"
-        other: "%{count}u"
+        one: 1u
+        other: '%{count}u'
       x_days:
-        one: "1d"
-        other: "%{count}d"
+        one: 1d
+        other: '%{count}d'
       about_x_months:
-        one: "1mnd"
-        other: "%{count}mnd"
+        one: 1mnd
+        other: '%{count}mnd'
       x_months:
-        one: "1mnd"
-        other: "%{count}mnd"
+        one: 1mnd
+        other: '%{count}mnd'
       about_x_years:
-        one: "1j"
-        other: "%{count}j"
+        one: 1j
+        other: '%{count}j'
       over_x_years:
-        one: "> 1j"
-        other: "> %{count}j"
+        one: '> 1j'
+        other: '> %{count}j'
       almost_x_years:
-        one: "1j"
-        other: "%{count}j"
+        one: 1j
+        other: '%{count}j'
     distance_in_words_verbose:
       half_a_minute: "zojuist"
       less_than_x_seconds:
-        one: "zojuist"
-        other: "zojuist"
+        one: zojuist
+        other: zojuist
       x_seconds:
-        one: "1 seconde geleden"
-        other: "%{count} seconden geleden"
+        one: 1 seconde geleden
+        other: '%{count} seconden geleden'
       less_than_x_minutes:
-        one: "minder dan 1 minuut geleden"
-        other: "minder dan %{count} minuten geleden"
+        one: minder dan 1 minuut geleden
+        other: minder dan %{count} minuten geleden
       x_minutes:
-        one: "1 minuut geleden"
-        other: "%{count} minuten geleden"
+        one: 1 minuut geleden
+        other: '%{count} minuten geleden'
       about_x_hours:
-        one: "1 uur geleden"
-        other: "%{count} uur geleden"
+        one: 1 uur geleden
+        other: '%{count} uur geleden'
       x_days:
-        one: "1 dag geleden"
-        other: "%{count} dagen geleden"
+        one: 1 dag geleden
+        other: '%{count} dagen geleden'
       about_x_months:
-        one: "ongeveer 1 maand geleden"
-        other: "ongeveer %{count} maanden geleden"
+        one: ongeveer 1 maand geleden
+        other: ongeveer %{count} maanden geleden
       x_months:
-        one: "1 maand geleden"
-        other: "%{count} maanden geleden"
+        one: 1 maand geleden
+        other: '%{count} maanden geleden'
       about_x_years:
-        one: "ongeveer 1 jaar geleden"
-        other: "ongeveer %{count} jaar geleden"
+        one: ongeveer 1 jaar geleden
+        other: ongeveer %{count} jaar geleden
       over_x_years:
-        one: "meer dan 1 jaar geleden"
-        other: "meer dan %{count} jaar geleden"
+        one: meer dan 1 jaar geleden
+        other: meer dan %{count} jaar geleden
       almost_x_years:
-        one: "bijna 1 jaar geleden"
-        other: "bijna %{count} jaar geleden"
+        one: bijna 1 jaar geleden
+        other: bijna %{count} jaar geleden
   password_reset:
     no_token: "Sorry, die koppeling voor het wijzigen van uw wachtwoord is te oud. Selecteer de knop Aanmelden en gebruik 'Ik ben mijn wachtwoord vergeten' om een nieuwe koppeling te ontvangen."
     choose_new: "Een nieuw wachtwoord kiezen"
@@ -593,8 +565,6 @@ nl:
       long_form: 'heeft dit als ongepast gemarkeerd'
     notify_user:
       title: '@{{username}} een bericht sturen'
-      description: 'I wil rechtstreeks en privé met deze persoon over zijn of haar bericht praten.'
-      short_description: 'I wil rechtstreeks en privé met deze persoon over zijn of haar bericht praten.'
       long_form: 'bericht verstuurd naar gebruiker'
       email_title: 'Uw bericht in ''%{title}'''
       email_body: "%{link}\n\n%{message}"
@@ -690,9 +660,7 @@ nl:
       xaxis: "Dag"
       yaxis: "Aantal bezoeken"
     signups:
-      title: "Nieuwe gebruikers"
       xaxis: "Dag"
-      yaxis: "Aantal nieuwe gebruikers"
     profile_views:
       title: "Gebruikersprofielweergaven"
       xaxis: "Dag"
@@ -730,7 +698,6 @@ nl:
       xaxis: "Dag"
       yaxis: "Aantal e-mails"
     user_to_user_private_messages:
-      title: "Gebruiker-naar-gebruiker"
       xaxis: "Dag"
       yaxis: "Aantal berichten"
     system_private_messages:
@@ -777,7 +744,6 @@ nl:
       xaxis: "Dag"
       yaxis: "Webcrawler-paginaweergaven"
     page_view_total_reqs:
-      title: "Totaal"
       xaxis: "Dag"
       yaxis: "Totale paginaweergaven"
     page_view_logged_in_mobile_reqs:
@@ -841,28 +807,23 @@ nl:
     failing_emails_warning: 'Er zijn %{num_failed_jobs} mislukte e-mailtaken. Controleer uw bestand app.yml en zorg ervoor dat de mailserverinstellingen juist zijn. <a href="/sidekiq/retries" target="_blank">Bekijk de mislukte taken in Sidekiq</a>.'
     subfolder_ends_in_slash: "Uw submapconfiguratie is onjuist; de DISCOURSE_RELATIVE_URL_ROOT eindigt met een schuine streep."
     email_polling_errored_recently:
-      one: "E-mailpolling heeft de afgelopen 24 uur een fout gegenereerd. Bekijk <a href='/logs' target='_blank'>de logboeken</a> voor meer details."
-      other: "E-mailpolling heeft de afgelopen 24 uur %{count} fouten gegenereerd. Bekijk <a href='/logs' target='_blank'>de logboeken</a> voor meer details."
-    missing_mailgun_api_key: "De server is geconfigureerd om e-mails via Mailgun te verzenden, maar u hebt geen API-sleutel opgegeven voor verificatie van de webhookberichten."
+      one: E-mailpolling heeft de afgelopen 24 uur een fout gegenereerd. Bekijk <a href='/logs' target='_blank'>de logboeken</a> voor meer details.
+      other: E-mailpolling heeft de afgelopen 24 uur %{count} fouten gegenereerd. Bekijk <a href='/logs' target='_blank'>de logboeken</a> voor meer details.
     bad_favicon_url: "De favicon wordt niet geladen. Controleer uw favicon_url-instelling in de <a href='/admin/site_settings'>Website-instellingen</a>."
     poll_pop3_timeout: "Time-out voor verbinding met de POP3-server. Binnenkomende e-mail kon niet worden opgehaald. Controleer uw <a href='/admin/site_settings/category/email'>POP3-instellingen</a> en serviceprovider."
     poll_pop3_auth_error: "Verbinding met de POP3-server is mislukt met een authenticatiefout. Controleer uw <a href='/admin/site_settings/category/email'>POP3-instellingen</a>."
   site_settings:
     censored_words: "Woorden die automatisch door &#9632;&#9632;&#9632;&#9632; zullen worden vervangen"
-    censored_pattern: "Regex-patroon dat automatisch door &#9632;&#9632;&#9632;&#9632; zal worden vervangen"
     delete_old_hidden_posts: "Verborgen berichten die meer dan 30 dagen verborgen blijven automatisch verwijderen"
-    default_locale: "De standaardtaal van dit Discourse-forum (ISO 639-1-code)"
     allow_user_locale: "Gebruikers toestaan om een eigen voorkeur voor de interfacetaal te kiezen"
     set_locale_from_accept_language_header: "Taal van interface voor anonieme gebruikers instellen op basis van de taalheaders van hun webbrowser. (EXPERIMENTEEL, werkt niet met anonieme cache)"
     min_post_length: "Minimaal toegestane lengte van een bericht in tekens"
     min_first_post_length: "Minimaal toegestane lengte van eerste bericht (topictekst) in tekens"
-    min_private_message_post_length: "Minimaal toegestane berichtlengte in tekens voor privéberichten"
     max_post_length: "Maximaal toegestane lengte van een bericht in tekens"
     topic_featured_link_enabled: "Plaatsing van een koppeling met topics toestaan"
     show_topic_featured_link_in_digest: "Koppeling naar aanbevolen topics in de samenvattingsmail tonen"
     min_topic_title_length: "Minimaal toegestane lengte van een topictitel in tekens"
     max_topic_title_length: "Maximaal toegestane lengte van een topictitel in tekens"
-    min_private_message_title_length: "Minimaal toegestane titellengte voor een bericht in tekens"
     min_search_term_length: "Minimumlengte van een zoekterm in tekens"
     search_prefer_recent_posts: "Als doorzoeken van uw grote forum traag werkt, probeert deze optie eerst een index van recentere berichten"
     search_recent_posts_size: "Het aantal in de index te behouden recente berichten "
@@ -907,7 +868,6 @@ nl:
     summary_likes_required: "Minimale aantal likes in een topic voordat 'Dit topic samenvatten' wordt ingeschakeld"
     summary_percent_filter: "Wanneer een gebruiker op 'Dit topic samenvatten' klikt, de top % van berichten tonen"
     summary_max_results: "Maximale aantal getoonde berichten in 'Dit topic samenvatten'"
-    enable_private_messages: "Gebruikers met vertrouwensniveau 1 (instelbaar via het minimale niveau om berichten te verzenden) toestaan om berichten aan te maken en op berichten te antwoorden. Houd er rekening mee dat stafleden altijd berichten kunnen verzenden."
     enable_long_polling: "Gebruikte 'message bus' voor melding kan 'long polling' gebruiken"
     long_polling_base_url: "Basis-URL voor 'long polling' (als een CDN dynamische inhoud aanbiedt, zorg er dan voor dat dit op 'origin pull' is ingesteld), zoals http://origin.site.com"
     long_polling_interval: "De hoeveelheid tijd die de server zou moeten wachten voordat het clients beantwoord als er geen data te verzenden is (alleen voor ingelogde gebruikers)"
@@ -954,7 +914,6 @@ nl:
     version_checks: "Ping de Discourse-Hub voor updates en laat meldingen van nieuwe versies zien op het dashboard van de beheerder."
     new_version_emails: "Stuur een email naar het contact_email adres wanneer een nieuwe versie van Discourse beschikbaar is."
     invite_expiry_days: "Hoe lang uitnodigingscodes geldig blijven (in dagen)."
-    invite_passthrough_hours: "Hoe lang een gebruiker een eerder verkregen uitnodigingssleutel kan gebruiken om in te loggen, in uren gespecificeerd"
     invite_only: "Openbare registratie is uitgeschakeld; alle nieuwe gebruikers moeten expliciet worden uitgenodigd door stafleden."
     login_required: "Authenticatie vereist om inhoud te lezen op deze site, verbied anonieme toegang."
     min_password_length: "Minimum lengte wachtwoord."
@@ -971,7 +930,6 @@ nl:
     sso_overrides_name: "Overschrijft bij elke aanmelding lokaal opgegeven volledige naam door volledige naam uit SSO payload van externe site, en voorkomt lokaal wijzigen"
     sso_overrides_avatar: "Overschrijft gebruikers avatar door avatar uit SSO payload van externe site, uitschakelen van allow_uploaded_avatars is sterk aanbevolen."
     sso_not_approved_url: "Stuur niet geaccepteerde SSO accounts door naar deze URL"
-    enable_local_logins: "Accounts op basis van een lokale gebruikersnaam en wachtwoord toestaan. (Let op: dit moet aan staan voor toegang op basis van een uitnodiging.)"
     allow_new_registrations: "Nieuwe gebruikers registreren toestaan. Uitschakelen om te voorkomen dat iedereen een nieuw account kan maken."
     enable_signup_cta: "Een melding tonen voor terugkerende anonieme gebruikers waarin wordt gevraagd zich voor een account te registreren"
     enable_yahoo_logins: "Yahoo-authenticatie inschakelen"
@@ -979,8 +937,6 @@ nl:
     google_oauth2_client_id: "Client-ID van uw Google-toepassing."
     google_oauth2_client_secret: "Client-geheim van uw Google-toepassing."
     enable_twitter_logins: "Twitter-authenticatie inschakelen; vereist twitter_consumer_key en twitter_consumer_secret."
-    twitter_consumer_key: "consumer_key (registreer op dev.twitter.com)"
-    twitter_consumer_secret: "consumer secret (registreer op dev.twitter.com)"
     enable_instagram_logins: "Instagram-authenticatie inschakelen; vereist instagram_consumer_key en instagram_consumer_secret."
     enable_facebook_logins: "Facebook-authenticatie inschakelen; vereist facebook_app_id en facebook_app_secret."
     facebook_app_id: "app_id (registreer op https://developers.facebook.com/apps)"
@@ -992,7 +948,6 @@ nl:
     allow_restore: "Herstellen van data toestaan, waarbij ALLE site-data wordt overschreven! Laat op 'false' staan, tenzij je een back-up terug wil zetten."
     maximum_backups: "Het maximale aantal back-ups om op schijf te bewaren. Oudere back-ups worden automatisch verwijderd."
     automatic_backups_enabled: "Automatische back-ups uitvoeren volgens de opgegeven back-up frequentie."
-    backup_frequency: "Hoe vaak we een back-up van de site maken, in dagen."
     enable_s3_backups: "Upload voltooide back-ups naar S3. LET OP: Zorg ervoor dat je je S3 inloggegevens hebt ingevuld in de Bestanden instellingen."
     s3_backup_bucket: "De S3 bucket voor de backups. WAARSCHUWING: zorg er voor dat dit een privébucket is."
     s3_disable_cleanup: "Backups van S3 niet verwijderen als het lokaal wordt verwijdert."
@@ -1010,7 +965,6 @@ nl:
     max_bookmarks_per_day: "Maximale aantal bladwijzers per gebruiker per dag."
     max_edits_per_day: "Maximale aantal bewerkingen per gebruiker per dag."
     max_topics_per_day: "Maximale aantal topics dat een gebruiker per dag kan plaatsen."
-    max_private_messages_per_day: "Maximale aantal berichten dat een gebruiker per dag kan plaatsen."
     max_invites_per_day: "Maximale aantal uitnodigingen dat een gebruiker per dag kan versturen."
     max_topic_invitations_per_day: "Maximale aantal uitnodigingen voor een topic dat een gebruiker per dag kan versturen."
     max_logins_per_ip_per_hour: "Maximale aantal toegestane aanmeldingen per IP-adres per uur"
@@ -1026,7 +980,6 @@ nl:
     purge_deleted_uploads_grace_period_days: "Na hoeveel uur een weesbestand definitief verwijderd wordt."
     purge_unactivated_users_grace_period_days: "Periode (in dagen) voordat een gebruiker die zijn account niet heeft geactiveerd wordt verwijderd. Zet op 0 om gebruikers nooit te verwijderen."
     enable_s3_uploads: "Uploads plaatsen op Amazon S3 storage. LET OP: vereist geldige S3 inloggegevens (zowel acces key id als secret access key)"
-    s3_use_iam_profile: 'Gebruik AWS EC2 IAM rol om keys binnen te halen. LET OP: na inschakelen dit gebruikt i.p.v. de instellingen voor "s3 access key id" en "s3 secret access key".'
     s3_upload_bucket: "De naam van de Amazon S3 bucket waar bestanden naar worden geüpload. LET OP: moet bestaan uit kleine letters, zonder puntjes en geen underscores."
     s3_access_key_id: "Het Amazon S3 access key id dat wordt gebruikt voor het uploaden van afbeeldingen."
     s3_secret_access_key: "De Amazon S3 secret access key die wordt gebruikt voor het uploaden van afbeeldingen."
@@ -1059,7 +1012,6 @@ nl:
     min_trust_to_create_topic: "Het minimale trust level dat nodig is om een topic te mogen maken."
     min_trust_to_edit_wiki_post: "Het minimale trust level dat nodig is om een bericht te wijzigen dat als wiki gemarkeerd is."
     min_trust_to_edit_post: "Het minimale vertrouwensniveau dat nodig is om het bericht te bewerken."
-    min_trust_to_send_messages: "Het minimum vertrouwensniveau dat nodig is om nieuwe private berichten aan te maken."
     newuser_max_links: "Hoeveel links een nieuw lid in een bericht kan plaatsen."
     newuser_max_images: "Hoeveel afbeeldingen een nieuw lid in een bericht kan plaatsen."
     newuser_max_attachments: "Hoeveel bestanden een nieuw lid in een bericht kan plaatsen."
@@ -1116,7 +1068,6 @@ nl:
     min_first_post_typing_time: "Minimum tijd in milliseconden dat een gebruiker moet typen tijdens een eerste post, als de drempelwaarde niet wordt bereikt zal de post automatisch in de wachtrij voor goedkeuring gezet worden. Zet op 0 om uit te schakelen (niet aanbevolen)"
     reply_by_email_enabled: "Mogelijk inschakelen om te antwoorden per e-mail."
     reply_by_email_address: "Template voor antwoorden per e-mail, bijvoorbeeld: %{reply_key}@reageer.mijnforum.nl"
-    incoming_email_prefer_html: "De HTML gebruiken in plaats van de tekst voor inkomende e-mail"
     disable_emails: "Voorkomt dat Discourse e-mails van welke soort dan ook verstuurd."
     strip_images_from_short_emails: "Verwijder afbeeldingen met grootte van minder dan 2800 Bytes uit e-mails."
     short_email_length: "Korte e-mail lengte in Bytes"
@@ -1183,7 +1134,6 @@ nl:
     embed_truncate: "Kort de geembedde berichten in"
     embed_post_limit: "Maximale aantal te embedden berichten."
     embed_username_required: "De gebruikersnaam om topics aan te maken is vereist."
-    notify_about_flags_after: "Als er na dit aantal uren markeringen zijn die nog niet zijn afgehandeld, een privébericht naar stafleden sturen. Gebruik 0 om dit uit te schakelen."
     show_create_topics_notice: "Als de site minder dan 5 publieke topics heeft, toon dan een melding waarin admins gevraagd wordt om een aantal topics te creëren."
     delete_drafts_older_than_n_days: Verwijder concepten ouder dan (n) dagen.
     prevent_anons_from_downloading_files: "Voorkom dat anonieme gebruikers bijlagen mogen downloaden. WAARSCHUWING: hierdoor zullen website onderdelen, anders dan afbeeldingen, die zijn gepost als bijlage niet langer werken."
@@ -1194,7 +1144,6 @@ nl:
     approve_post_count: "Het aantal berichten van een nieuwe of normale gebruiker dat moet worden goedgekeurd"
     approve_unless_trust_level: "Posts voor gebruikers onder dit vertrouwensniveau moeten worden goedgekeurd"
     approve_new_topics_unless_trust_level: "Nieuwe topics voor gebruikers onder dit vertrouwensniveau moeten worden goedgekeurd"
-    default_email_private_messages: "Stuur standaard een e-mail als iemand de gebruiker bericht."
     default_email_direct: "Stuur standaard een e-mail wanneer iemand de gebruiker citeert/beantwoordt/vermeldt of uitnodigt."
     default_email_mailing_list_mode: "Stuur standaard een email voor elk nieuw bericht."
     default_email_always: "Standaard een e-mailmelding verzenden, zelfs wanneer de gebruiker actief is"
@@ -1253,11 +1202,11 @@ nl:
     not_seen_in_a_month: "Welkom terug! We hebben u een tijdje niet gezien. Dit zijn de meest populaire topics sinds uw afwezigheid."
   move_posts:
     new_topic_moderator_post:
-      one: "Een bericht is gesplitst naar een nieuw topic: %{topic_link}"
-      other: "%{count} berichten zijn gesplitst naar een nieuw topic: %{topic_link}"
+      one: 'Een bericht is gesplitst naar een nieuw topic: %{topic_link}'
+      other: '%{count} berichten zijn gesplitst naar een nieuw topic: %{topic_link}'
     existing_topic_moderator_post:
-      one: "Een bericht is samengevoegd in een bestaand topic: %{topic_link}"
-      other: "%{count} berichten zijn samengevoegd in een bestaand topic: %{topic_link}"
+      one: 'Een bericht is samengevoegd in een bestaand topic: %{topic_link}'
+      other: '%{count} berichten zijn samengevoegd in een bestaand topic: %{topic_link}'
   change_owner:
     post_revision_text: "Eigendom overgezet van %{old_user} naar %{new_user}"
     deleted_user: "een verwijderde gebruiker"
@@ -1267,47 +1216,47 @@ nl:
     closed_enabled: "Dit topic is nu gesloten. Nieuwe antwoorden zijn niet meer toegestaan."
     closed_disabled: "Dit topic is nu geopend. Nieuwe antwoorden zijn toegestaan."
     autoclosed_message_max_posts:
-      one: "Dit bericht is na het bereiken van de maximumlimiet van 1 antwoord automatisch gesloten."
-      other: "Dit bericht is na het bereiken van de maximumlimiet van %{count} antwoorden automatisch gesloten."
+      one: Dit bericht is na het bereiken van de maximumlimiet van 1 antwoord automatisch gesloten.
+      other: Dit bericht is na het bereiken van de maximumlimiet van %{count} antwoorden automatisch gesloten.
     autoclosed_topic_max_posts:
-      one: "Dit topic is na het bereiken van de maximumlimiet van 1 antwoord automatisch gesloten."
-      other: "Dit topic is na het bereiken van de maximumlimiet van %{count} antwoorden automatisch gesloten."
+      one: Dit topic is na het bereiken van de maximumlimiet van 1 antwoord automatisch gesloten.
+      other: Dit topic is na het bereiken van de maximumlimiet van %{count} antwoorden automatisch gesloten.
     autoclosed_enabled_days:
-      one: "Dit topic is na 1 dag automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan."
-      other: "Dit topic is na %{count} dagen automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan."
+      one: Dit topic is na 1 dag automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan.
+      other: Dit topic is na %{count} dagen automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan.
     autoclosed_enabled_hours:
-      one: "Dit topic is na 1 uur automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan."
-      other: "Dit topic is na %{count} uur automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan."
+      one: Dit topic is na 1 uur automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan.
+      other: Dit topic is na %{count} uur automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan.
     autoclosed_enabled_minutes:
-      one: "Dit topic is na 1 minuut automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan."
-      other: "Dit topic is na %{count} minuten automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan."
+      one: Dit topic is na 1 minuut automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan.
+      other: Dit topic is na %{count} minuten automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan.
     autoclosed_enabled_lastpost_days:
-      one: "Dit topic is 1 dag na het laatste antwoord automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan."
-      other: "Dit topic is %{count} dagen na het laatste antwoord automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan."
+      one: Dit topic is 1 dag na het laatste antwoord automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan.
+      other: Dit topic is %{count} dagen na het laatste antwoord automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan.
     autoclosed_enabled_lastpost_hours:
-      one: "Dit topic is 1 uur na het laatste antwoord automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan."
-      other: "Dit topic is %{count} uur na het laatste antwoord automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan."
+      one: Dit topic is 1 uur na het laatste antwoord automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan.
+      other: Dit topic is %{count} uur na het laatste antwoord automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan.
     autoclosed_enabled_lastpost_minutes:
-      one: "Dit topic is 1 minuut na het laatste antwoord automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan."
-      other: "Dit topic is %{count} minuten na het laatste antwoord automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan."
+      one: Dit topic is 1 minuut na het laatste antwoord automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan.
+      other: Dit topic is %{count} minuten na het laatste antwoord automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan.
     autoclosed_disabled_days:
-      one: "Dit topic is na 1 dag automatisch geopend."
-      other: "Dit topic is na %{count} dagen automatisch geopend."
+      one: Dit topic is na 1 dag automatisch geopend.
+      other: Dit topic is na %{count} dagen automatisch geopend.
     autoclosed_disabled_hours:
-      one: "Dit topic is na 1 uur automatisch geopend."
-      other: "Dit topic is na %{count} uur automatisch geopend."
+      one: Dit topic is na 1 uur automatisch geopend.
+      other: Dit topic is na %{count} uur automatisch geopend.
     autoclosed_disabled_minutes:
-      one: "Dit topic is na 1 minuut automatisch geopend."
-      other: "Dit topic is na %{count} minuten automatisch geopend."
+      one: Dit topic is na 1 minuut automatisch geopend.
+      other: Dit topic is na %{count} minuten automatisch geopend.
     autoclosed_disabled_lastpost_days:
-      one: "Dit topic is 1 dag na het laatste antwoord automatisch geopend."
-      other: "Dit topic is %{count} dagen na het laatste antwoord automatisch geopend."
+      one: Dit topic is 1 dag na het laatste antwoord automatisch geopend.
+      other: Dit topic is %{count} dagen na het laatste antwoord automatisch geopend.
     autoclosed_disabled_lastpost_hours:
-      one: "Dit topic is 1 uur na het laatste antwoord automatisch geopend."
-      other: "Dit topic is %{count} uur na het laatste antwoord automatisch geopend."
+      one: Dit topic is 1 uur na het laatste antwoord automatisch geopend.
+      other: Dit topic is %{count} uur na het laatste antwoord automatisch geopend.
     autoclosed_disabled_lastpost_minutes:
-      one: "Dit topic is 1 minuut na het laatste antwoord automatisch geopend."
-      other: "Dit topic is %{count} minuten na het laatste antwoord automatisch geopend."
+      one: Dit topic is 1 minuut na het laatste antwoord automatisch geopend.
+      other: Dit topic is %{count} minuten na het laatste antwoord automatisch geopend.
     autoclosed_disabled: "Dit topic is nu geopend. Nieuwe antwoorden zijn toegestaan."
     autoclosed_disabled_lastpost: "Dit topic is nu geopend. Nieuwe reacties worden weer geaccepteerd."
     pinned_enabled: "Dit topic is nu vastgemaakt. Het verschijnt bovenaan de categorie ervan totdat het door een staflid wordt losgemaakt voor iedereen, of door individuele gebruikers voor henzelf."
@@ -1356,8 +1305,8 @@ nl:
       max_new_accounts_per_registration_ip: "Nieuwe registraties vanaf uw IP-adres zijn niet toegestaan (maximumlimiet bereikt). Neem contact op met een staflid."
   flags_reminder:
     subject_template:
-      one: "Eén vlag af te handelen"
-      other: "%{count} vlaggen af te handelen"
+      one: Eén vlag af te handelen
+      other: '%{count} vlaggen af te handelen'
   invite_password_instructions:
     subject_template: "Geeft wachtwoord voor je %{site_name} account"
   flag_reasons:
@@ -1397,7 +1346,6 @@ nl:
       subject_template: "Massale uitnodiging aan gebruikers verwerkt, met fouten"
     csv_export_succeeded:
       title: "CSV Export Geslaagd"
-      subject_template: "Export succesvol afgerond."
     csv_export_failed:
       title: "CSV Export Mislukt"
       subject_template: "Export mislukt"
@@ -1441,8 +1389,8 @@ nl:
         De plaatsingsactie werd niet herkend. Probeer het opnieuw of plaats je bericht via de website als het nog steeds niet lukt.
     pending_users_reminder:
       subject_template:
-        one: "1 gebruiker wacht op goedkeuring"
-        other: "%{count} gebruikers wachten op goedkeuring"
+        one: 1 gebruiker wacht op goedkeuring
+        other: '%{count} gebruikers wachten op goedkeuring'
       text_body_template: |
         Er zijn nieuwe gebruikers die zich hebben ingeschreven en wachten op goedkeuring (of afwijzing) voor zij het forum op kunnen.
 
@@ -1459,6 +1407,8 @@ nl:
     unsubscribe:
       title: "Uitschrijven"
       description: "Niet geïnteresseerd in deze e-mails? Geen probleem! Klik hieronder om direct uitgeschreven te worden:"
+    reply_by_email: "[Bezoek topic (het)](%{base_url}%{url}) of beantwoord deze e-mail om te reageren."
+    visit_link_to_respond: "[Bezoek topic (het)](%{base_url}%{url}) om te reageren."
     posted_by: "Geplaatst door %{username} op %{post_date}"
     digest:
       why: "Een korte samenvatting van %{site_link} sinds we je voor het laatst zagen op %{last_seen_at}."
@@ -1556,7 +1506,6 @@ nl:
       name: Richtlijnen gelezen
   admin_login:
     success: "E-mail verstuurd"
-    error: "Fout!"
     email_input: "E-mailadres van beheerder"
     submit_button: "E-mail versturen"
   performance_report:
@@ -1614,6 +1563,3 @@ nl:
         description: |
           <p>Als u deze instellingen ooit wilt wijzigen, bezoek dan <a href='/admin' target='_blank'>uw beheersectie</a>; deze vindt u naast het moersleutelpictogram in het websitemenu.</p>
           <p>Veel plezier, en succes met <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>het opbouwen van uw nieuwe gemeenschap!</a></p>
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index 97bebf4ebdf..280b002edcb 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -17,12 +17,12 @@ pl_PL:
       date_only: "%-d %b %Y"
       long: "%B %-d, %Y, %l:%M%P"
   date:
-    month_names: [null, Styczeń, Luty, Marzec, Kwiecień, Maj, Czerwiec, Lipiec, Sierpień, Wrzesień, Październik, Listopad, Grudzień]
+    month_names: [~, Styczeń, Luty, Marzec, Kwiecień, Maj, Czerwiec, Lipiec, Sierpień, Wrzesień, Październik, Listopad, Grudzień]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "rano"
     pm: "po południu"
-    <<: *datetime_formats
   title: "Discourse"
   topics: "Tematy"
   posts: "posty"
@@ -67,19 +67,18 @@ pl_PL:
       present: musi być puste
       confirmation: "nie zgadza się z %{attribute}"
       empty: nie może być puste
-      equal_to: musi być równe do %{count}
+      equal_to: "musi być równe do %{count}"
       even: musi być parzyste
       exclusion: jest zarezerwowane
-      greater_than: musi być większe niż %{count}
-      greater_than_or_equal_to: musi być większe lub równe %{count}
+      greater_than: "musi być większe niż %{count}"
+      greater_than_or_equal_to: "musi być większe lub równe %{count}"
       has_already_been_used: "został już użyty"
       inclusion: nie jest zawarty w liście
       invalid: jest nieprawidłowy
       is_invalid: "wygląda niejasno, czy to cała wypowiedz ?"
       contains_censored_words: "zawiera następujące niedozwolone słowa: %{censored_words}"
-      matches_censored_pattern: "zawiera następujące niedozwolone słowa: %{censored_words}"
-      less_than: musi być mniejszy niż %{count}
-      less_than_or_equal_to: musi być mniejszy lub równy %{count}
+      less_than: "musi być mniejszy niż %{count}"
+      less_than_or_equal_to: "musi być mniejszy lub równy %{count}"
       not_a_number: nie jest liczbą
       not_an_integer: musi być liczbą całkowitą
       odd: musi być nieparzysty
@@ -88,27 +87,27 @@ pl_PL:
         one: "Nie można usunąć wpisu, ponieważ zależny %{record} istnieje"
         many: "Nie można usunąć wpisu, ponieważ zależny %{record} istnieje"
       too_long:
-        one: jest za długa (maksymalnie 1 znak)
         few: jest za długa (maksymalnie %{count} znaków)
         many: jest za długa (maksymalnie %{count} znaków)
+        one: jest za długa (maksymalnie 1 znak)
         other: jest za długa (maksymalnie %{count} znaków)
       too_short:
-        one: jest za krótka (minimalnie 1 znak)
         few: jest za krótka (minimalnie %{count} znaków)
         many: jest za długa (minimum to %{count} znaków)
+        one: jest za krótka (minimalnie 1 znak)
         other: jest za długa (minimum to %{count} znaków)
       wrong_length:
-        one: ma nieprawidłową długość (powinna być 1 znakiem)
         few: jest nieprawidłowej długości (powinna mieć %{count} znaków)
         many: jest nieprawidłowej długości (powinna mieć %{count} znaków)
+        one: ma nieprawidłową długość (powinna być 1 znakiem)
         other: jest nieprawidłowej długości (powinna mieć %{count} znaków)
       other_than: "musi być różna od %{count}"
     template:
       body: 'Wystąpiły problemy z następującymi polami:'
       header:
-        one: 1 błąd uniemożliwił zapisanie %{model}
         few: '%{count} błędy uniemożliwiły zapisanie %{model}'
         many: '%{count} błędów uniemożliwiło zapisanie %{model}'
+        one: 1 błąd uniemożliwił zapisanie %{model}
         other: '%{count} błędów uniemożliwiło zapisanie %{model}'
     embed:
       load_from_remote: "Wystąpił błąd podczas wczytywania tego wpisu."
@@ -119,6 +118,9 @@ pl_PL:
       max_username_length_range: "Nie możesz ustawić maksimum poniżej minimum."
       default_categories_already_selected: "Nie możesz wybrać kategorii użytej w innej liście."
       s3_upload_bucket_is_required: "Nie możesz wysyłać na S3 jeżeli nie podasz 's3_upload_bucket'."
+  activemodel:
+    errors:
+      <<: *errors
   invite:
     not_found: "Link do zaproszenia nie istnieje. Skontaktuj się z administratorem strony"
     user_exists: "Nie ma potrzeby zapraszania <b>%{email}</b>, <a href='/u/%{username}/summary'>obecnie posiada konto!"
@@ -140,10 +142,10 @@ pl_PL:
   reading_time: "Czas odczytu"
   likes: "Lajki"
   too_many_replies:
-    one: "Przepraszamy, ale nowi użytkownicy są tymczasowo ograniczeni do 1 odpowiedzi w ramach  jednego tematu."
-    few: "Przepraszamy, ale nowi użytkownicy są tymczasowo ograniczeni do %{count} odpowiedzi w ramach  jednego tematu."
-    many: "Przepraszamy, ale nowi użytkownicy są tymczasowo ograniczeni do %{count} odpowiedzi w ramach  jednego tematu."
-    other: "Przepraszamy, ale nowi użytkownicy są tymczasowo ograniczeni do %{count} odpowiedzi w ramach  jednego tematu."
+    few: Przepraszamy, ale nowi użytkownicy są tymczasowo ograniczeni do %{count} odpowiedzi w ramach  jednego tematu.
+    many: Przepraszamy, ale nowi użytkownicy są tymczasowo ograniczeni do %{count} odpowiedzi w ramach  jednego tematu.
+    one: Przepraszamy, ale nowi użytkownicy są tymczasowo ograniczeni do 1 odpowiedzi w ramach  jednego tematu.
+    other: Przepraszamy, ale nowi użytkownicy są tymczasowo ograniczeni do %{count} odpowiedzi w ramach  jednego tematu.
   embed:
     start_discussion: "Rozpocznij dyskusję"
     continue: "Kontynuuj dyskusję"
@@ -153,45 +155,24 @@ pl_PL:
     no_hosts: "Brak ustawionych hostów do osadzenia."
     configure: "Konfiguracja osadzenia"
     more_replies:
-      one: "1 odpowiedź więcej"
-      few: "%{count} odpowiedzi więcej"
-      many: "%{count} odpowiedzi więcej"
-      other: "%{count} odpowiedzi więcej"
+      few: '%{count} odpowiedzi więcej'
+      many: '%{count} odpowiedzi więcej'
+      one: 1 odpowiedź więcej
+      other: '%{count} odpowiedzi więcej'
     loading: "Wczytuję dyskusję…"
     permalink: "Link bezpośredni"
     imported_from: "Ten temat jest powiązany ze źródłową dyskusją: %{link}"
     in_reply_to: "▶ %{username}"
     replies:
-      one: "1 odpowiedź"
-      few: "%{count} odpowiedzi"
-      many: "%{count} odpowiedzi"
-      other: "%{count} odpowiedzi"
+      few: '%{count} odpowiedzi'
+      many: '%{count} odpowiedzi'
+      one: 1 odpowiedź
+      other: '%{count} odpowiedzi'
   no_mentions_allowed: "Przepraszamy, nie możesz odwoływać się do innych użytkowników."
-  too_many_mentions:
-    one: "Przepraszamy, możesz wspomnieć tylko o jednym użytkowniku w poście."
-    few: "Przepraszamy, możesz wspomnieć tylko o %{count} osobach w poście."
-    other: "Przepraszamy, możesz wspomnieć tylko o %{count} osobach w poście."
   no_mentions_allowed_newuser: "Przepraszamy, nowi użytkownicy nie mogą odwoływać się do innych użytkowników."
-  too_many_mentions_newuser:
-    one: "Przepraszamy, nowi użytkownicy mogą wspomnieć tylko o jednym użytkowniku w poście."
-    few: "Przepraszamy, nowi użytkownicy mogą wspomnieć tylko o %{count} użytkownikach w poście."
-    other: "Przepraszamy, nowi użytkownicy mogą wspomnieć tylko o %{count} użytkownikach w poście."
   no_images_allowed: "Przepraszamy, nowi użytkownicy nie mogą dodawać zdjęć do postów."
-  too_many_images:
-    one: "Przepraszamy, nowi użytkownicy mogą dodać tylko 1 zdjęcie we wpisie. "
-    few: "Przepraszamy, nowi użytkownicy mogą umieścić tylko %{count} zdjęcia we wpisie."
-    other: "Przepraszamy, nowi użytkownicy mogą umieścić tylko %{count} zdjęć we wpisie."
   no_attachments_allowed: "Przepraszamy, nowi użytkownicy nie mogą dodawać załączników do postów."
-  too_many_attachments:
-    one: "Przepraszamy, nowi użytkownicy mogą dodać tylko jeden załącznik do wpisu."
-    few: "Przepraszamy, nowi użytkownicy mogą dodać %{count} załączniki do wpisu."
-    other: "Przepraszamy, nowi użytkownicy mogą dodać %{count} załączników do wpisu."
   no_links_allowed: "Przepraszamy, nowi użytkownicy nie mogą umieszczać linków w wiadomościach."
-  too_many_links:
-    one: "Przepraszamy, nowi użytkownicy mogą dodać tylko jeden link we wpisie."
-    few: "Przepraszamy, nowi użytkownicy mogą dodać tylko %{count} linki we wpisie."
-    other: "Przepraszamy, nowi użytkownicy mogą dodać tylko %{count} linków we wpisie."
-  contains_blocked_words: "Twój wpis zawiera niedozwolone słowa"
   spamming_host: "Przepraszamy, nie możesz umieścić linka do tej strony."
   user_is_suspended: "Zawieszeni użytkownicy nie mogą wysyłać wiadomości."
   topic_not_found: "Coś poszło nie tak. Być może temat został zamknięty lub usunięty w międzyczasie?"
@@ -223,7 +204,6 @@ pl_PL:
     top_weekly: "Najpopularniejsze tematy w tym tygodniu"
     top_daily: "Najpopularniejsze tematy dzisiaj"
     posts: "Aktualne wpisy"
-    private_posts: "Najnowsze prywatne wiadomości"
     group_posts: "Ostatni post z %{group_name}"
     group_mentions: "Ostatnie wspomnienie z %{group_name}"
     user_posts: "Ostatnie posty @%{username}"
@@ -237,11 +217,8 @@ pl_PL:
     delete_reason: "Skasowany z poziomu kolejki moderacji."
     not_found: "Post nie został znaleziony lub jest już zaktualizowany."
   groups:
-    success:
-      bulk_add: "%{users_added} użytkowników zostało dodanych do grupy"
     errors:
       can_not_modify_automatic: "Nie można modyfikować automatyczną grupę"
-      member_already_exist: "'%{username}' należy już do tej grupy."
       invalid_domain: "'%{domain}' nie jest poprawną domeną."
       invalid_incoming_email: "'%{domain}' nie jest poprawną domeną."
       email_already_used_in_group: "'%{email}' jest już używany przez grupę '%{group_name}'."
@@ -261,11 +238,11 @@ pl_PL:
       title: "Prośba o członkostwo w grupie @%{group_name}"
   education:
     until_posts:
-      one: "1 wpis"
-      few: "%{count} wpisy"
-      many: "%{count} wpisów"
-      other: "%{count} wpisów"
-    new-topic: |+
+      few: '%{count} wpisy'
+      many: '%{count} wpisów'
+      one: 1 wpis
+      other: '%{count} wpisów'
+    'new-topic': |+
       Witaj na %{site_name} &mdash; **dziękujemy za rozpoczęcie nowej dyskusji!**
 
       - Czy tytuł brzmi interesująco, gdy przeczytasz go na głos? Czy jest dobrym podsumowaniem treści?
@@ -275,7 +252,9 @@ pl_PL:
       - Postaraj się umieścić słowa kluczowe w tytule, dzięki czemu inni będą mogli łatwo *wyszukać* temat. Przypisz go do kategorii o pokrewnej tematyce.
 
       Aby dowiedzieć się więcej, [zobacz przewodnik społeczności](/guidelines). Ten panel pojawi się tylko przy pierwszym %{education_posts_text}.
-    new-reply: |
+
+
+    'new-reply': |
       Witaj na %{site_name} &mdash; **dziękujemy za zaangażowanie!**
 
       - Czy twoja odpowiedź wnosi coś pozytywnego do dyskusji?
@@ -322,12 +301,6 @@ pl_PL:
       Przepraszamy, ale nowi użytkownicy są obecnie ograniczeni do %{newuser_max_replies_per_topic} odpowiedzi w tym samym temacie.
 
       Zamiast dodawać kolejną odpowiedź, rozważ edycję swoich poprzednich odpowiedzi lub odwiedzenie innych tematów.
-    reviving_old_topic: |
-      ### Ożywić ten temat?
-
-      Ostatnia odpowiedź w tym temacie ma ponad %{days} dni. Twoja odpowiedź przesunie temat na górę listy i spowoduje powiadomienie wszystkich wcześniej uczestniczących w rozmowie.
-
-      Czy na pewno chcesz kontynuować tę starą rozmowę?
   activerecord:
     attributes:
       category:
@@ -340,13 +313,12 @@ pl_PL:
       user_profile:
         bio_raw: "O mnie"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Ostrzeżenie można dołączać jedynie do prywatnych wiadomości."
               too_many_users: "Jedno ostrzeżenie możesz wysłać tylko do pojedynczego użytkownika."
-              cant_send_pm: "Przepraszamy, niestety nie możesz wysłać prywatnej wiadomości temu użytkownikowi."
               no_user_selected: "Musisz wybrać poprawnego użytkownika,"
               reply_by_email_disabled: "Odpowiedź przez e-mail została wyłączona."
             featured_link:
@@ -385,7 +357,6 @@ pl_PL:
           attributes:
             word:
               too_many: "Za długi opis akcji"
-      <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>pole \"O mnie\" w profilu jest obecnie puste, <a href='/u/%{username_lower}/preferences/about-me'>Czy chcesz je wypełnić?</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} jeszcze nie podał swojego opisu w profilu</div>"
@@ -401,41 +372,41 @@ pl_PL:
     title: "Witaj w Discourse"
     body: |2
 
-      Pierwszy paragraf tego przypiętego tematu będzie widoczny jako wiadomość powitalna dla wszystkich odwiedzających stronę główną. Jest bardzo ważny!
+        Pierwszy paragraf tego przypiętego tematu będzie widoczny jako wiadomość powitalna dla wszystkich odwiedzających stronę główną. Jest bardzo ważny!
 
-      **Edytuj go** żeby zwięźle opisać swoje społeczeństwo.
+        **Edytuj go** żeby zwięźle opisać swoje społeczeństwo.
 
-      - Dla kogo jest?
-      - Co mogą tutaj znaleźć?
-      - Dlaczego powinni tutaj przychodzić?
-      - Gdzie mogą przeczytać więcej (link, zasoby, itp.)?
+        - Dla kogo jest?
+        - Co mogą tutaj znaleźć?
+        - Dlaczego powinni tutaj przychodzić?
+        - Gdzie mogą przeczytać więcej (link, zasoby, itp.)?
 
-      <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+        <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
 
-      Rozważ zamknięcie tego tematu poprzez administracyjny :wrench: (w prawym górnym i dolnym rogu), aby zapobiec niepotrzebnym odpowiedziom do ogłoszenia.
+        Rozważ zamknięcie tego tematu poprzez administracyjny :wrench: (w prawym górnym i dolnym rogu), aby zapobiec niepotrzebnym odpowiedziom do ogłoszenia.
   lounge_welcome:
     title: "Witaj w Salonie"
     body: |2
 
-      Gratulacje! :confetti_ball:
+        Gratulacje! :confetti_ball:
 
-      Jeśli widzisz ten temat, twoje konto osiągnęło trzeci poziom zaufania.
+        Jeśli widzisz ten temat, twoje konto osiągnęło trzeci poziom zaufania.
 
-      Od teraz możesz &hellip;
+        Od teraz możesz &hellip;
 
-      * Edytować tytuł każdego tematu
-      * Przenieść temat do innej kategorii
-      * Twoje linki nie będą posiadać już atrybutu [nofollow](http://en.wikipedia.org/wiki/Nofollow)
-      * Korzystać z prywatnego Salonu, kategorii która jest widoczna jedynie dla użytkowników na 3 poziomie zaufania lub wyższym
-      * Przyznawać polubienia i flagi o większej wadze
+        * Edytować tytuł każdego tematu
+        * Przenieść temat do innej kategorii
+        * Twoje linki nie będą posiadać już atrybutu [nofollow](http://en.wikipedia.org/wiki/Nofollow)
+        * Korzystać z prywatnego Salonu, kategorii która jest widoczna jedynie dla użytkowników na 3 poziomie zaufania lub wyższym
+        * Przyznawać polubienia i flagi o większej wadze
 
-      Możesz zobaczyć [wszystkie osoby z tym poziomem zaufania](/badges/3/regular). Nie zapomnij się przywitać.
+        Możesz zobaczyć [wszystkie osoby z tym poziomem zaufania](/badges/3/regular). Nie zapomnij się przywitać.
 
-      Dziękujemy, że jesteś tak aktywną częścią naszej społeczności!
+        Dziękujemy, że jesteś tak aktywną częścią naszej społeczności!
 
-      (Więcej informacji o poziomach zaufania znajduje się [pod tym adresem][trust]. Pamiętaj, że trzeci poziom zaufania zależy od utrzymywania aktywności danego konta na określonym poziomie.)
+        (Więcej informacji o poziomach zaufania znajduje się [pod tym adresem][trust]. Pamiętaj, że trzeci poziom zaufania zależy od utrzymywania aktywności danego konta na określonym poziomie.)
 
-      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "O kategorii %{category}"
     replace_paragraph: "(Zamień ten pierwszy paragraf na krótki opis nowej kategorii. Opis ten będzie wyświetlany na karcie wyboru kategorii, więc postaraj się utrzymać go krótszego niż 200 znaków. **Dopóki nie zmienisz tego opisu, ani nie utworzysz tematu, kategoria nie będzie wyświetlana na liście kategorii.**)"
@@ -452,10 +423,10 @@ pl_PL:
       uncategorized: "Nie można usunąć kategorii Inne"
       has_subcategories: "Nie można usunąć tej kategorii ponieważ posiada podkategorie. "
       topic_exists:
-        one: "Nie można usunąć tej kategorii ponieważ zawiera temat: %{topic_link}."
-        few: "Nie można usunąć tej kategorii ponieważ zawiera %{count} tematy. Najstarszy z nich: %{topic_link}."
-        many: "Nie można usunąć tej kategorii ponieważ zawiera %{count} tematów. Najstarszy z nich: %{topic_link}."
-        other: "Nie można usunąć tej kategorii ponieważ zawiera %{count} tematów. Najstarszy z nich: %{topic_link}."
+        few: 'Nie można usunąć tej kategorii ponieważ zawiera %{count} tematy. Najstarszy z nich: %{topic_link}.'
+        many: 'Nie można usunąć tej kategorii ponieważ zawiera %{count} tematów. Najstarszy z nich: %{topic_link}.'
+        one: 'Nie można usunąć tej kategorii ponieważ zawiera temat: %{topic_link}.'
+        other: 'Nie można usunąć tej kategorii ponieważ zawiera %{count} tematów. Najstarszy z nich: %{topic_link}.'
       topic_exists_no_oldest: "Nie można usunąć tej kategorii z uwagi na liczbę tematów: %{count}."
     uncategorized_description: "Tematy które nie potrzebują kategorii, albo nie nadają się do żadnej innej."
   trust_levels:
@@ -474,153 +445,136 @@ pl_PL:
     image_placeholder:
       broken: "Ten obraz jest uszkodzony"
   rate_limiter:
-    slow_down: "Powtórzyłeś to działanie zbyt wiele razy, spróbuj ponownie później."
-    too_many_requests: "Liczba wykonań tej czynności w ciągu dnia jest ograniczona. Odczekaj %{time_left} przed ponowną próbą."
-    by_type:
-      first_day_replies_per_day: "Osiągnąłeś maksymalną liczbę odpowiedzi, jakie może napisać nowy użytkownik pierwszego dnia. Musisz odczekać %{time_left} zanim znów spróbujesz."
-      first_day_topics_per_day: "Osiągnąłeś maksymalną liczbę tematów, jakie może napisać nowy użytkownik pierwszego dnia. Musisz odczekać %{time_left}, zanim znów spróbujesz."
-      create_topic: "Zbyt szybko tworzysz tematy. Musisz poczekać %{time_left}, zanim znów spróbujesz."
-      create_post: "Odpowiadasz zbyt szybko. Musisz poczekać %{time_left}, zanim znów spróbujesz."
-      delete_post: "Zbyt szybko usuwasz posty. Musisz poczekać %{time_left}, zanim znów spróbujesz."
-      public_group_membership: "Dołączasz/opuszczasz grupy zbyt często. Odczekaj %{time_left} przed kolejną próbą."
-      topics_per_day: "Osiągnąłeś maksymalną liczbę nowych tematów na dziś. Musisz poczekać %{time_left}, zanim znów spróbujesz."
-      pms_per_day: "Osiągnąłeś maksymalną liczbę wiadomości na dziś. Musisz poczekać %{time_left}, zanim znów spróbujesz."
-      create_like: "Osiągnąłeś maksymalną liczbę lajków na dziś. Musisz poczekać %{time_left}, zanim znów spróbujesz."
-      create_bookmark: "Wyczerpałeś na dziś możliwość dodawania zakładek. Musisz poczekać %{time_left}, zanim znów spróbujesz."
-      edit_post: "Wyczerpałeś na dziś możliwość edytowania. Musisz poczekać %{time_left}, zanim znów spróbujesz."
-      live_post_counts: "Zbyt szybko prosisz o bieżące zliczanie postów . Musisz poczekać %{time_left}, zanim znów spróbujesz."
-      unsubscribe_via_email: "Osiągnąłeś maksymalną liczbę wypisań przez maila na dziś. Musisz poczekać %{time_left}, zanim znów spróbujesz."
-      topic_invitations_per_day: "Osiągnąłeś maksymalną liczbę zaproszeń do tematów na dziś. Odczekaj %{time_left} przed kolejną próbą."
     hours:
-      one: "1 godzina"
-      few: "%{count} godziny"
-      many: "%{count} godzin"
-      other: "%{count} godzin"
+      few: '%{count} godziny'
+      many: '%{count} godzin'
+      one: 1 godzina
+      other: '%{count} godzin'
     minutes:
-      one: "1 minuta"
-      few: "%{count} minuty"
-      many: "%{count} minut"
-      other: "%{count} minut"
+      few: '%{count} minuty'
+      many: '%{count} minut'
+      one: 1 minuta
+      other: '%{count} minut'
     seconds:
-      one: "1 sekunda"
-      few: "%{count} sekundy"
-      many: "%{count} sekund"
-      other: "%{count} sekund"
+      few: '%{count} sekundy'
+      many: '%{count} sekund'
+      one: 1 sekunda
+      other: '%{count} sekund'
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: "< %{count}s"
-        few: "< %{count}s"
-        many: "< %{count}s"
-        other: "< %{count}s"
+        few: < %{count}s
+        many: < %{count}s
+        one: < %{count}s
+        other: < %{count}s
       x_seconds:
-        one: "1s"
-        few: "%{count}s"
-        many: "%{count}s"
-        other: "%{count}s"
+        few: '%{count}s'
+        many: '%{count}s'
+        one: 1s
+        other: '%{count}s'
       less_than_x_minutes:
-        one: "< 1m"
-        few: "< %{count}m"
-        many: "< %{count}m"
-        other: "< %{count}m"
+        few: < %{count}m
+        many: < %{count}m
+        one: < 1m
+        other: < %{count}m
       x_minutes:
-        one: "1m"
-        few: "%{count}m"
-        many: "%{count}m"
-        other: "%{count}m"
+        few: '%{count}m'
+        many: '%{count}m'
+        one: 1m
+        other: '%{count}m'
       about_x_hours:
-        one: "1h"
-        few: "%{count}h"
-        many: "%{count}h"
-        other: "%{count}h"
+        few: '%{count}h'
+        many: '%{count}h'
+        one: 1h
+        other: '%{count}h'
       x_days:
-        one: "1d"
-        few: "%{count}d"
-        many: "%{count}d"
-        other: "%{count}d"
+        few: '%{count}d'
+        many: '%{count}d'
+        one: 1d
+        other: '%{count}d'
       about_x_months:
-        one: "1mie"
-        few: "%{count}mie"
-        many: "%{count}mie"
-        other: "%{count}mie"
+        few: '%{count}mie'
+        many: '%{count}mie'
+        one: 1mie
+        other: '%{count}mie'
       x_months:
-        one: "1mie"
-        few: "%{count}mie"
-        many: "%{count}mie"
-        other: "%{count}mie"
+        few: '%{count}mie'
+        many: '%{count}mie'
+        one: 1mie
+        other: '%{count}mie'
       about_x_years:
-        one: "1r"
-        few: "%{count}l"
-        many: "%{count}l"
-        other: "%{count}l"
+        few: '%{count}l'
+        many: '%{count}l'
+        one: 1r
+        other: '%{count}l'
       over_x_years:
-        one: "> 1r"
-        few: "> %{count}l"
-        many: "> %{count}l"
-        other: "> %{count}l"
+        few: '> %{count}l'
+        many: '> %{count}l'
+        one: '> 1r'
+        other: '> %{count}l'
       almost_x_years:
-        one: "1r"
-        few: "%{count}l"
-        many: "%{count}l"
-        other: "%{count}l"
+        few: '%{count}l'
+        many: '%{count}l'
+        one: 1r
+        other: '%{count}l'
     distance_in_words_verbose:
       half_a_minute: "przed chwilą"
       less_than_x_seconds:
-        one: "przed chwilą"
-        few: "przed chwilą"
-        many: "przed chwilą"
-        other: "przed chwilą"
+        few: przed chwilą
+        many: przed chwilą
+        one: przed chwilą
+        other: przed chwilą
       x_seconds:
-        one: "1 sekundę temu"
-        few: "%{count} sekundy temu"
-        many: "%{count} sekund temu"
-        other: "%{count} sekund temu"
+        few: '%{count} sekundy temu'
+        many: '%{count} sekund temu'
+        one: 1 sekundę temu
+        other: '%{count} sekund temu'
       less_than_x_minutes:
-        one: "mniej niż 1 minutę temu"
-        few: "mniej niż %{count} minuty temu"
-        many: "mniej niż %{count} minut temu"
-        other: "mniej niż %{count} minut temu"
+        few: mniej niż %{count} minuty temu
+        many: mniej niż %{count} minut temu
+        one: mniej niż 1 minutę temu
+        other: mniej niż %{count} minut temu
       x_minutes:
-        one: "1 minutę temu"
-        few: "%{count} minuty temu"
-        many: "%{count} minut temu"
-        other: "%{count} minut temu"
+        few: '%{count} minuty temu'
+        many: '%{count} minut temu'
+        one: 1 minutę temu
+        other: '%{count} minut temu'
       about_x_hours:
-        one: "godzinę temu"
-        few: "%{count} godziny temu"
-        many: "%{count} godzin temu"
-        other: "%{count} godzin temu"
+        few: '%{count} godziny temu'
+        many: '%{count} godzin temu'
+        one: godzinę temu
+        other: '%{count} godzin temu'
       x_days:
-        one: "1 dzień temu"
-        few: "%{count} dni temu"
-        many: "%{count} dni temu"
-        other: "%{count} dni temu"
+        few: '%{count} dni temu'
+        many: '%{count} dni temu'
+        one: 1 dzień temu
+        other: '%{count} dni temu'
       about_x_months:
-        one: "około 1 miesiąca temu"
-        few: "około %{count} miesiące temu"
-        many: "około %{count} miesięcy temu"
-        other: "około %{count} miesięcy temu"
+        few: około %{count} miesiące temu
+        many: około %{count} miesięcy temu
+        one: około 1 miesiąca temu
+        other: około %{count} miesięcy temu
       x_months:
-        one: "1 miesiąc temu"
-        few: "%{count} miesiące temu"
-        many: "%{count} miesięcy temu"
-        other: "%{count} miesięcy temu"
+        few: '%{count} miesiące temu'
+        many: '%{count} miesięcy temu'
+        one: 1 miesiąc temu
+        other: '%{count} miesięcy temu'
       about_x_years:
-        one: "około 1 rok temu"
-        few: "około %{count} lata temu"
-        many: "około %{count} lat temu"
-        other: "około %{count} lat temu"
+        few: około %{count} lata temu
+        many: około %{count} lat temu
+        one: około 1 rok temu
+        other: około %{count} lat temu
       over_x_years:
-        one: "ponad 1 rok temu"
-        few: "ponad %{count} lata temu"
-        many: "ponad %{count} lat temu"
-        other: "ponad %{count} lat temu"
+        few: ponad %{count} lata temu
+        many: ponad %{count} lat temu
+        one: ponad 1 rok temu
+        other: ponad %{count} lat temu
       almost_x_years:
-        one: "prawie 1 rok temu"
-        few: "prawie %{count} lata temu"
-        many: "prawie %{count} lat temu"
-        other: "prawie %{count} lat temu"
+        few: prawie %{count} lata temu
+        many: prawie %{count} lat temu
+        one: prawie 1 rok temu
+        other: prawie %{count} lat temu
   password_reset:
     no_token: "Przepraszamy, ten link do zmiany hasła jest zbyt stary. Wybierz przycisk \"Zaloguj\", a następnie \"Zapomniałem hasła\", by uzyskać nowy link."
     choose_new: "Wprowadź nowe hasło"
@@ -674,8 +628,6 @@ pl_PL:
       long_form: 'oflagowano jako niewłaściwe'
     notify_user:
       title: 'Wyślij @{{username}} wiadomość'
-      description: 'Chciałbym porozmawiać o tym poście z tą osobą prywatnie'
-      short_description: 'Chciałbym porozmawiać o tym poście bezpośrednio z tą osobą.'
       long_form: 'użytkownik został powiadomiony'
       email_title: 'Twój wpis w "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -775,9 +727,7 @@ pl_PL:
       xaxis: "Dzień"
       yaxis: "Liczba wizyt"
     signups:
-      title: "Nowi Użytkownicy"
       xaxis: "Dzień"
-      yaxis: "Liczba nowych użytkowników"
     profile_views:
       title: "Wyświetlenia profilu użytkownika"
       xaxis: "Dzień"
@@ -815,7 +765,6 @@ pl_PL:
       xaxis: "Dzień"
       yaxis: "Liczba emaili"
     user_to_user_private_messages:
-      title: "Użytkownik-do-użytkownika"
       xaxis: "Dzień"
       yaxis: "Liczba wiadomości"
     system_private_messages:
@@ -862,7 +811,6 @@ pl_PL:
       xaxis: "Dzień"
       yaxis: "Odsłony botów indeksujących"
     page_view_total_reqs:
-      title: "Łącznie"
       xaxis: "Dzień"
       yaxis: "Wszystkie odsłony"
     page_view_logged_in_mobile_reqs:
@@ -926,30 +874,25 @@ pl_PL:
     failing_emails_warning: '%{num_failed_jobs} prac emailowych nie powiodło się. Sprawdź plik app.yml i upewnij się, że ustawienia serwera poczty są poprawne. <a href="/sidekiq/retries" target="_blank">Zobacz nieudane prace w Sidekiqu</a>.'
     subfolder_ends_in_slash: "Twoje ustawienie podfolderu jest niepoprawne; DISCOURSE_RELATIVE_URL_ROOT kończy się slashem."
     email_polling_errored_recently:
-      one: "Email polling wygenerował 1 błąd w przeciągu ostatniej doby. Więcej szczegółów w <a href='/logs' target='_blank'>logach</a>."
-      few: "Email polling wygenerował %{count} błędy w przeciągu ostatniej doby. Więcej szczegółów w <a href='/logs' target='_blank'>logach</a>."
-      many: "Email polling wygenerował %{count} błędów w przeciągu ostatniej doby. Więcej szczegółów w <a href='/logs' target='_blank'>logach</a>."
-      other: "Email polling wygenerował %{count} błędów w przeciągu ostatniej doby. Więcej szczegółów w <a href='/logs' target='_blank'>logach</a>."
-    missing_mailgun_api_key: "Serwer jest skonfigurowany by wysyłać maile przez mailguna, ale nie ustawiłeś klucza API niezbędnego do zweryfikowania wiadomości webhook."
+      few: Email polling wygenerował %{count} błędy w przeciągu ostatniej doby. Więcej szczegółów w <a href='/logs' target='_blank'>logach</a>.
+      many: Email polling wygenerował %{count} błędów w przeciągu ostatniej doby. Więcej szczegółów w <a href='/logs' target='_blank'>logach</a>.
+      one: Email polling wygenerował 1 błąd w przeciągu ostatniej doby. Więcej szczegółów w <a href='/logs' target='_blank'>logach</a>.
+      other: Email polling wygenerował %{count} błędów w przeciągu ostatniej doby. Więcej szczegółów w <a href='/logs' target='_blank'>logach</a>.
     bad_favicon_url: "Nie można załadować favikony. Sprawdź ustawiony favicon_url w <a href='/admin/site_settings'>Ustawieniach Strony</a>."
     poll_pop3_timeout: "Połączenie z serwerem POP3 zostało zerwane. Przychodząca wiadomość mogła nie zostać odebrany. Proszę sprawdź swoje <a href='/admin/site_settings/category/email'ustawienia POP3</a> i dostawcę usług."
     poll_pop3_auth_error: "Połączenie z serwerem POP3 nie powiodło się przez błąd uwierzytelnienia. Proszę sprawdź swoje <a href='/admin/site_settings/category/email'>ustawienia POP3</a>."
   site_settings:
     censored_words: "Wskazane słowa będą automatycznie zamieniane na  &#9632;&#9632;&#9632;&#9632;"
-    censored_pattern: "Wzorzec Regex który będzie automatycznie zamieniany na  &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Automatycznie kasuj wpisy ukryte dłużej niż 30 dni."
-    default_locale: "Domyślny język tej instancji Discourse (kod ISO 639-1)"
     allow_user_locale: "Zezwól użytkownikom na zmianę języka interfejsu we własnych  ustawieniach"
     set_locale_from_accept_language_header: "ustaw język interfejsu dla niezalogowanych użytkowników na podstawie języka w nagłówku ich przeglądarki. (EKSPERYMENTALNE, nie działa z anonimowym cache)"
     min_post_length: "Minimalna długość wpisu w znakach"
     min_first_post_length: "Minimalna długość treści (liczba znaków) pierwszego wpisu w temacie "
-    min_private_message_post_length: "Minimalna długość treści wiadomości "
     max_post_length: "Maksymalna długość wpisu, w znakach"
     topic_featured_link_enabled: "Włącz dodawanie linków w tematach."
     show_topic_featured_link_in_digest: "Pokazuj polecany link tematu w podsumowaniu mailowym."
     min_topic_title_length: "Minimalna długość tytułu tematu, w znakach"
     max_topic_title_length: "Maksymalna długość tytułu tematu, w znakach"
-    min_private_message_title_length: "Minimalna liczba znaków w temacie wiadomości "
     min_search_term_length: "Minimalna długość wyszukiwanego tekstu, w znakach"
     search_tokenize_chinese_japanese_korean: "Wymuś wyszukiwanie żeby tokenizowało Chiński/Japoński/Koreański nawet na stronach nie-CJK"
     search_prefer_recent_posts: "Jeśli wyszukiwanie na twoim duży forum jest wolne, ta opcja pozwala zaindeskować ostanie posty wpierw."
@@ -1001,7 +944,6 @@ pl_PL:
     summary_likes_required: "Minimalna liczba polubień w temacie zanim 'Podsumowanie tematu' jest dostępne"
     summary_percent_filter: "Gdy użytkownik kliknie na 'Podsumowaniu tematu', pokaż % najlepszych wpisów"
     summary_max_results: "Maksymalna liczba wpisów w 'Podsumowaniu tematu'"
-    enable_private_messages: "Zezwalaj użytkownikom o poziomie zaufania 1 (możliwe do zmiany przez min trust level to send messages) na tworzenie wiadomości i odpowiadanie na nie. Zwróć uwagę, że administracja zawsze może wysyłać wiadomości bez względu na wszystko."
     enable_long_polling: "Message bus used for notification can use long polling"
     long_polling_base_url: "Podstawowy URL używany dla long polling (kiedy CDN dostarcza dynamicznych treści, upewnij się że ustawiłeś to w origin pull) np.: http://origin.site.com"
     long_polling_interval: "Okres czasu jaki serwer powinien odczekać przed odpowiedzią klientowi kiedy nie ma danych do przesłania (tylko do zalogowanych użytkowników)"
@@ -1017,7 +959,6 @@ pl_PL:
     tl4_additional_likes_per_day_multiplier: "Zwiększ limit lajków na dzień dla tl4 (lider), mnożąc przez tę liczbę"
     flag_sockpuppets: "Jeśli nowy użytkownik odpowiada na dany temat z tego samego adresu IP co nowy użytkownik, który założył temat, oznacz ich posty jako potencjalny spam."
     traditional_markdown_linebreaks: "Używaj tradycyjnych znaków końca linii w Markdown, to znaczy dwóch spacji na końcu linii."
-    enable_markdown_typographer: "Używaj podstawowych zasad typografii, aby poprawić czytelność poszczególnych paragrafów tekstu, zastąpienie (c)(tm) itd, z symbolami, zmniejsza liczbę znaków zapytania itd"
     post_undo_action_window_mins: "Przez tyle minut użytkownicy mogą cofnąć swoje ostatnie działania przy danym poście (lajki, flagowanie, itd.)."
     must_approve_users: "Zespół musi zaakceptować wszystkie nowe konta zanim uzyskają dostęp do serwisu. UWAGA: włączenie tego dla już udostępnionej strony sprawi, że zostanie odebrany dostęp wszystkim istniejącym użytkownikom spoza zespołu."
     pending_users_reminder_delay: "Powiadomić moderatorów jeżeli nowi użytkownicy czekali na zatwierdzenie dłużej niż his mamy godzin. Ustaw -1 aby wyłączyć powiadomienia. "
@@ -1059,7 +1000,6 @@ pl_PL:
     version_checks: "Odpytuj Discourse Hub o aktualizacje i wyświetlaj wiadomości o nowej wersji w panelu /admin"
     new_version_emails: "Wyślij email na adres contact_email, kiedy nowa wersja Discourse będzie dostępna."
     invite_expiry_days: "Jak długo klucz zaproszenie użytkownika jest ważny, w dniach."
-    invite_passthrough_hours: "Jak długo użytkownik może użyć poprzednio wykorzystanego klucza zaproszenia by się zalogować, w godzinach"
     invite_only: "Rejestracja jest wyłączona. Nowi użytkownicy muszą zostać zaproszeni przez administrację."
     login_required: "Wymagaj autoryzacji do wyświetlenia zawartości strony, zablokuj możliwość anonimowego dostępu."
     min_username_length: "Minimalna długość nazwy użytkownika w znakach. OSTRZEŻENIE: jeśli jacykolwiek istniejący użytkownicy lub grupy mają nazwy krótsze niż ta, twój serwis się uszkodzi!"
@@ -1081,7 +1021,6 @@ pl_PL:
     sso_overrides_avatar: "Nadpisuje avatar użytkownika z pomocą avatarów z zewnętrznych stron poprzez SSO. Jeśli włączone, wyłączanie allow_uploaded_avatars wysoce polecane"
     sso_not_approved_url: "Przekieruj niezatwierdzone konta SSO na ten URL"
     sso_allows_all_return_paths: "Nie ograniczaj domen dla return_paths dostarczanych przez SSO (domyślnie zwracana ścieżka musi być na aktualnej stronie)"
-    enable_local_logins: "Włącz konta oparte o lokalne nazwy użytkownika i hasła logowania. (Pamiętaj: to musi być włączone dla zaproszeń, aby działało)"
     allow_new_registrations: "Zezwól na rejestrację nowych użytkowników. Odznacz opcję żeby uniemożliwić rejestrację nowych kont."
     enable_signup_cta: "Pokazuj wiadomość dla powracających użytkowników anonimowych, zachęcającą ich do założenia konta."
     enable_yahoo_logins: "Włącz autoryzację Yahoo"
@@ -1089,15 +1028,12 @@ pl_PL:
     google_oauth2_client_id: "Client ID twojej aplikacji w Google"
     google_oauth2_client_secret: "Client Secret twojej aplikacji w Google"
     enable_twitter_logins: "Włącz autoryzację Twitter, wymagane twitter_consumer_key oraz twitter_consumer_secret"
-    twitter_consumer_key: "Consumer key for Twitter authentication, registered at http://dev.twitter.com"
-    twitter_consumer_secret: "Consumer secret for Twitter authentication, registered at http://dev.twitter.com"
     enable_instagram_logins: "Włącz uwierzytelnienie za pomocą Instagramu, wymaga instagram_consumer_key i instagram_consumer_secret."
     instagram_consumer_key: "Klucz konsumenta dla uwierzytelnienia Instragram"
     instagram_consumer_secret: "Sekret konsumenta dla uwierzytelnienia Instragram"
     enable_facebook_logins: "Enable Facebook authentication, requires facebook_app_id and facebook_app_secret"
     facebook_app_id: "App id for Facebook authentication, registered at https://developers.facebook.com/apps"
     facebook_app_secret: "App secret for Facebook authentication, registered at https://developers.facebook.com/apps"
-    facebook_request_extra_profile_details: "Poproś o mnie, lokalizację i stronę z facebooka. (wymaga, aby twoja aplikacja autoryzacyjna była zaakceptowana przez Facebooka)"
     enable_github_logins: "Włacz autoryzację Github, wymagane github_client_id oraz github_client_secret"
     github_client_id: "Client id dla autoryzacji Github, zarejestrowany w https://github.com/settings/applications"
     github_client_secret: "Client secret dla autoryzacji Github, zarejestrowany w https://github.com/settings/applications"
@@ -1105,7 +1041,6 @@ pl_PL:
     allow_restore: "Dopuść przywracanie, które może zamienić WSZYSTKIE dane strony! Zostaw fałsz, chyba że planujesz przywrócić kopię zapasową"
     maximum_backups: "Maksymalna liczba kopii zapasowych do przechowywania na dysku. Starsze kopie zapasowe zostaną automatycznie usunięte."
     automatic_backups_enabled: "Uruchom automatyczne kopie zapasowe zgodnie z ustawioną częstotliwością kopii"
-    backup_frequency: "Jak często możemy utworzyć kopię zapasową strony, w dniach."
     enable_s3_backups: "Wysyłaj kopie zapasowe do S3 kiedy gotowe. WAŻNE: wymaga poprawnych poświadczeń S3 wprowadzonych w ustawieniach Plików."
     s3_backup_bucket: "Zdalne wiadro do przechowywania kopii zapasowych. UWAGA: Upewnij się, że jest to wiadro prywatne."
     s3_disable_cleanup: "Dezaktywuj usuwanie kopii zapasowych z S3 kiedy usunięte lokalnie."
@@ -1127,7 +1062,6 @@ pl_PL:
     max_bookmarks_per_day: "Maksymalna liczba zakładek per użytkownik per dzień."
     max_edits_per_day: "Maksymalna liczba edycji per użytkownik per dzień."
     max_topics_per_day: "Maksymalna liczba tematów jakie użytkownik może stworzyć jednego dnia."
-    max_private_messages_per_day: "Maksymalna liczba wiadomości jakie użytkownik może wysłać jednego dnia."
     max_invites_per_day: "Maksymalna liczba zaproszeń jakie użytkownik może wysłać jednego dnia."
     max_topic_invitations_per_day: "Maksymalna dzienna liczba zaproszeń do tematu, jakie może wysłać użytkownik."
     max_logins_per_ip_per_hour: "Maksymalna liczba logowań dozwolona per adres IP na godzinę"
@@ -1142,7 +1076,6 @@ pl_PL:
     clean_orphan_uploads_grace_period_hours: "Okres karencji (w dniach) przed wysłaniem sierot zostanie skasowany."
     purge_deleted_uploads_grace_period_days: "Okres karencji (w dniach) przed usunięciem upload zostanie skasowany."
     enable_s3_uploads: "Umieść przesyły w pamięci Amazon S3. Ważne: wymaga ważnych danych uwierzytelniających (zarówno klucza id i tajnego klucza dostępu)"
-    s3_use_iam_profile: 'Użyj AWS EC2 IAM aby odzyskać klucze. Pamiętaj: włączenie spowoduje nadpisanie ustawień "id klucza dostępu s3" i "tajnego klucza dostępu s3" '
     s3_upload_bucket: "Nazwa koszyka Amazon S3, do którego zostaną przesłane pliki. Ostrzeżenie: bez wielkich liter, kropek czy podkreślenia."
     s3_access_key_id: "Klucz dostępu Amazon S3, który zostanie użyty do przesyłania zdjęć."
     s3_secret_access_key: "Tajny klucz dostępu Amazon S3, który zostanie użyty do przesyłania zdjęć."
@@ -1188,7 +1121,6 @@ pl_PL:
     min_trust_to_edit_wiki_post: "Minimalny poziom zaufania wymagany do edycji posta oznaczonego jako wiki."
     min_trust_to_edit_post: "Minimalny poziom zaufania potrzebny do edytowania postów."
     min_trust_to_allow_self_wiki: "Wymagany poziom zaufania, by post użytkownika uczynić wiki."
-    min_trust_to_send_messages: "Minimalny poziom zaufania wymagany do tworzenia nowych prywatnych wiadomości."
     newuser_max_links: "Ile linków może dodać nowy użytkownik do posta."
     newuser_max_images: "Ile obrazów może dodać nowy użytkownik do posta."
     newuser_max_attachments: "Ile załączników może dodać nowy użytkownik do posta."
@@ -1198,7 +1130,6 @@ pl_PL:
     max_users_notified_per_group_mention: "Maksymalna liczba użytkowników, którzy mogą otrzymać powiadomienie jeśli ktoś wspomniał o grupie (jeśli próg został osiągnięty, nie będzie żadnych powiadomień)"
     create_thumbnails: "Stwórz miniatury i obrazy lightbox, które są za duże, aby pasować do postu."
     email_time_window_mins: "Odczekaj (n) minut przed wysłaniem maila z powiadomieniem, aby dać użytkownikom szansę na edytowanie i ukończenie postów."
-    private_email_time_window_seconds: "Poczekaj (n) sekund przed wysłaniem jakichkolwiek prywatnych powiadomień emailem, by dać szansę użytkownikom na edycję i sfinalizowanie ich wiadomości."
     email_posts_context: "Jak wiele poprzednich wiadomości zawrzeć jako kontekst i emailu powiadamiającym."
     flush_timings_secs: "W sekundach, jak często wysyłamy dane czasowe na serwer."
     title_max_word_length: "Maksymalna dozwolona długość słowa, w znakach, jako tytuł tematu."
@@ -1251,7 +1182,6 @@ pl_PL:
     reply_by_email_enabled: "Włącz możliwość odpowiadania na wpisy poprzez email."
     reply_by_email_address: "Template for reply by email incoming email address, for example: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "Lista alternatywnych szablonów do odpowiedzi przez adres email. Przykład: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
-    incoming_email_prefer_html: "Używaj HTML zamiast tekstu dla emaili przychodzących."
     disable_emails: "Powstrzymaj Discourse przed wysyłaniem jakichkolwiek emaili."
     strip_images_from_short_emails: "Pasek zdjęć z emaila o rozmiarze mniejszym niż 2800 bajtów"
     short_email_length: "Długość krótkiego emaila w bajtach"
@@ -1350,7 +1280,6 @@ pl_PL:
     allowed_href_schemes: "Projekty dozwolone w linkach jako dodatek do http i https."
     embed_post_limit: "Maksymalna liczba postów do osadzenia."
     embed_username_required: "W celu stworzenia tematu potrzebna jest nazwa użytkownika."
-    notify_about_flags_after: "Jeśli istnieją oflagowania, które nie zostały przejrzane po tylu godzinach, wyślij wiadomość prywatną do obsługi. Ustaw 0, aby wyłączyć."
     show_create_topics_notice: "Jeśli na stronie jest mniej niż 5 publicznych tematów, pokaż powiadomienie proszące adminów, aby stworzyli nowe wątki."
     delete_drafts_older_than_n_days: Usuń projekty starsze niż (n) dni.
     bootstrap_mode_min_users: "Minimalna liczba użytkowników potrzebnych do wyłączenia trybu rozruchowego (ustaw 0, aby wyłączyć)"
@@ -1362,14 +1291,12 @@ pl_PL:
     approve_post_count: "Liczba postów od nowego lub podstawowego użytkownika, które muszą zostać zatwierdzone"
     approve_unless_trust_level: "Posty użytkowników poniżej tego poziomu zaufania muszą być zatwierdzane"
     approve_new_topics_unless_trust_level: "Nowe wątki dodawane przez użytkowników z poziomem zaufania poniżej muszą zostać zaakceptowane"
-    notify_about_queued_posts_after: "Jeśli są posty, które czekają na przejrzenie przez więcej niż tak wiele godzin, zostanie wysłany email do contact_email. Ustaw 0, aby wyłączyć te emaile."
     auto_close_messages_post_count: "Maksymalna liczba postów dozwolonych w wiadomości przed automatycznym zamknięciem (0 aby wyłączyć)"
     auto_close_topics_post_count: "Maksymalna liczba postów dozwolona w temacie przed automatycznym zamknięciem (0 aby wyłączyć)"
     code_formatting_style: "Przycisk kodu w kompozytorze narzuci domyśl styl formatowania dla tego kodu"
     max_allowed_message_recipients: "Maksymalna dozwolona liczba odbiorców dla wiadomości."
     default_email_digest_frequency: "Domyślnie, jak często użytkownicy otrzymują emaile podsumowujące."
     default_include_tl0_in_digests: "Domyślnie uwzględniaj posty od nowych użytkowników w podsumowaniach mailowych. Użytkownicy mogą dokonywać zmian w swoich ustawieniach."
-    default_email_private_messages: "Domyślnie wysyłaj email, gdy użytkownik otrzyma wiadomość."
     default_email_direct: "Domyślnie wysyłaj email, gdy ktoś zacytuje/odpowie/wspomni lub zaprosi użytkownika."
     default_email_mailing_list_mode: "Domyślnie wyślij email dla każdego nowego posta."
     default_email_mailing_list_mode_frequency: "Domyślnie użytkownicy, którzy włączą tryb listy mailingowej będą otrzymywać emaile tak często."
@@ -1405,7 +1332,6 @@ pl_PL:
     max_tags_in_filter_list: "Maksymalna liczba tagów do pokazania w rozwijanym filtrze. Pokazane będą najczęściej używane tagi."
     tags_sort_alphabetically: "Pokaż tagi w alfabetycznym porządku. Domyślne pokazywane są według popularności."
     tag_style: "Styl etykiet tagów"
-    staff_tags: "Lista tagów może być zaakceptowana tylko przez moderatorów."
     min_trust_level_to_tag_topics: "Minimalny poziom zaufania wymagany do tagowania tematów"
     suppress_overlapping_tags_in_list: "Jeśli tagi dopasowane są dokładnie do słów w tytule tematu, nie pokazuj tagu"
     remove_muted_tags_from_latest: "Nie pokazuj tematów z tagiem z wyciszonymi tagami w ostatniej liście tematów."
@@ -1460,24 +1386,24 @@ pl_PL:
     not_seen_in_a_month: "Witamy ponownie! Długo tu nie zaglądałeś. Oto najpopularniejsze tematy z czasów, kiedy cię tu nie było."
   merge_posts:
     edit_reason:
-      one: "%{username} dołączył 1 post"
-      few: "%{username} dołączył %{count} posty"
-      many: "%{username} dołączył %{count} postów"
-      other: "%{username} dołączył %{count} postów"
+      few: '%{username} dołączył %{count} posty'
+      many: '%{username} dołączył %{count} postów'
+      one: '%{username} dołączył 1 post'
+      other: '%{username} dołączył %{count} postów'
     errors:
       different_topics: "Nie można połączyć postów z różnych wątków."
       different_users: "Nie można połączyć postów różnych użytkowników."
   move_posts:
     new_topic_moderator_post:
-      one: "Wydzielono 1 post tworząc nowy wątek: %{topic_link}"
-      few: "Wydzielono %{count} posty tworząc nowy wątek: %{topic_link}"
-      many: "Wydzielono %{count} postów tworząc nowy wątek: %{topic_link}"
-      other: "Wydzielono %{count} postów tworząc nowy wątek: %{topic_link}"
+      few: 'Wydzielono %{count} posty tworząc nowy wątek: %{topic_link}'
+      many: 'Wydzielono %{count} postów tworząc nowy wątek: %{topic_link}'
+      one: 'Wydzielono 1 post tworząc nowy wątek: %{topic_link}'
+      other: 'Wydzielono %{count} postów tworząc nowy wątek: %{topic_link}'
     existing_topic_moderator_post:
-      one: "1 post przeniesiono do wątku: %{topic_link}"
-      few: "%{count} posty przeniesiono do wątku: %{topic_link}"
-      many: "%{count} postów przeniesiono do wątku: %{topic_link}"
-      other: "%{count} postów przeniesiono do wątku: %{topic_link}"
+      few: '%{count} posty przeniesiono do wątku: %{topic_link}'
+      many: '%{count} postów przeniesiono do wątku: %{topic_link}'
+      one: '1 post przeniesiono do wątku: %{topic_link}'
+      other: '%{count} postów przeniesiono do wątku: %{topic_link}'
   change_owner:
     post_revision_text: "Zmieniono właściciela z %{old_user} na %{new_user}"
     deleted_user: "usunięty użytkownik"
@@ -1487,45 +1413,45 @@ pl_PL:
     closed_enabled: "Temat został zamknięty. Dodawanie nowych odpowiedzi nie jest możliwe."
     closed_disabled: "Temat został otwarty. Dodawanie odpowiedzi jest ponownie możliwe."
     autoclosed_message_max_posts:
-      one: "Wiadomość została automatycznie zamknięta po osiągnięciu maksymalnej liczby 1 odpowiedzi."
-      few: "Wiadomość została automatycznie zamknięta po osiągnięciu maksymalnej liczby %{count} odpowiedzi."
-      many: "Wiadomość została automatycznie zamknięta po osiągnięciu maksymalnej liczby %{count} odpowiedzi."
-      other: "Wiadomość została automatycznie zamknięta po osiągnięciu maksymalnej liczby %{count} odpowiedzi."
+      few: Wiadomość została automatycznie zamknięta po osiągnięciu maksymalnej liczby %{count} odpowiedzi.
+      many: Wiadomość została automatycznie zamknięta po osiągnięciu maksymalnej liczby %{count} odpowiedzi.
+      one: Wiadomość została automatycznie zamknięta po osiągnięciu maksymalnej liczby 1 odpowiedzi.
+      other: Wiadomość została automatycznie zamknięta po osiągnięciu maksymalnej liczby %{count} odpowiedzi.
     autoclosed_topic_max_posts:
-      one: "Wątek został automatycznie zamknięty po osiągnięciu maksymalnej liczby 1 odpowiedzi."
-      few: "Wątek został automatycznie zamknięty po osiągnięciu maksymalnej liczby %{count} odpowiedzi."
-      many: "Wątek został automatycznie zamknięty po osiągnięciu maksymalnej liczby %{count} odpowiedzi."
-      other: "Wątek został automatycznie zamknięty po osiągnięciu maksymalnej liczby %{count} odpowiedzi."
+      few: Wątek został automatycznie zamknięty po osiągnięciu maksymalnej liczby %{count} odpowiedzi.
+      many: Wątek został automatycznie zamknięty po osiągnięciu maksymalnej liczby %{count} odpowiedzi.
+      one: Wątek został automatycznie zamknięty po osiągnięciu maksymalnej liczby 1 odpowiedzi.
+      other: Wątek został automatycznie zamknięty po osiągnięciu maksymalnej liczby %{count} odpowiedzi.
     autoclosed_enabled_days:
-      one: "Ten temat został automatycznie zamknięty po 1 dniu. Tworzenie nowych odpowiedzi nie jest możliwe."
-      few: "Ten temat został automatycznie zamknięty po %{count} dniach. Tworzenie nowych odpowiedzi nie jest możliwe."
-      many: "Ten temat został automatycznie zamknięty po %{count} dniach. Tworzenie nowych odpowiedzi nie jest już możliwe."
-      other: "Ten temat został automatycznie zamknięty po %{count} dniach. Tworzenie nowych odpowiedzi nie jest już możliwe."
+      few: Ten temat został automatycznie zamknięty po %{count} dniach. Tworzenie nowych odpowiedzi nie jest możliwe.
+      many: Ten temat został automatycznie zamknięty po %{count} dniach. Tworzenie nowych odpowiedzi nie jest już możliwe.
+      one: Ten temat został automatycznie zamknięty po 1 dniu. Tworzenie nowych odpowiedzi nie jest możliwe.
+      other: Ten temat został automatycznie zamknięty po %{count} dniach. Tworzenie nowych odpowiedzi nie jest już możliwe.
     autoclosed_enabled_hours:
-      one: "Ten temat został automatycznie zamknięty po 1 godzinie. Tworzenie nowych odpowiedzi nie jest już możliwe."
-      few: "Ten temat został automatycznie zamknięty po %{count} godzinach. Tworzenie nowych odpowiedzi nie jest już możliwe."
-      many: "Ten temat został automatycznie zamknięty po %{count} godzinach. Tworzenie nowych odpowiedzi nie jest już możliwe."
-      other: "Ten temat został automatycznie zamknięty po %{count} godzinach. Tworzenie nowych odpowiedzi nie jest już możliwe."
+      few: Ten temat został automatycznie zamknięty po %{count} godzinach. Tworzenie nowych odpowiedzi nie jest już możliwe.
+      many: Ten temat został automatycznie zamknięty po %{count} godzinach. Tworzenie nowych odpowiedzi nie jest już możliwe.
+      one: Ten temat został automatycznie zamknięty po 1 godzinie. Tworzenie nowych odpowiedzi nie jest już możliwe.
+      other: Ten temat został automatycznie zamknięty po %{count} godzinach. Tworzenie nowych odpowiedzi nie jest już możliwe.
     autoclosed_enabled_minutes:
-      one: "Ten temat został automatycznie zamknięty po 1 minucie. Tworzenie nowych odpowiedzi nie jest już możliwe."
-      few: "Ten temat został automatycznie zamknięty po %{count} minutach. Tworzenie nowych odpowiedzi nie jest już możliwe."
-      many: "Ten temat został automatycznie zamknięty po %{count} minutach. Tworzenie nowych odpowiedzi nie jest już możliwe."
-      other: "Ten temat został automatycznie zamknięty po %{count} minutach. Tworzenie nowych odpowiedzi nie jest już możliwe."
+      few: Ten temat został automatycznie zamknięty po %{count} minutach. Tworzenie nowych odpowiedzi nie jest już możliwe.
+      many: Ten temat został automatycznie zamknięty po %{count} minutach. Tworzenie nowych odpowiedzi nie jest już możliwe.
+      one: Ten temat został automatycznie zamknięty po 1 minucie. Tworzenie nowych odpowiedzi nie jest już możliwe.
+      other: Ten temat został automatycznie zamknięty po %{count} minutach. Tworzenie nowych odpowiedzi nie jest już możliwe.
     autoclosed_enabled_lastpost_days:
-      one: "Ten temat został automatycznie zamknięty 1 dzień po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe."
-      few: "Ten temat został automatycznie zamknięty %{count} dni po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe."
-      many: "Ten temat został automatycznie zamknięty %{count} dni po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe."
-      other: "Ten temat został automatycznie zamknięty %{count} dni po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe."
+      few: Ten temat został automatycznie zamknięty %{count} dni po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe.
+      many: Ten temat został automatycznie zamknięty %{count} dni po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe.
+      one: Ten temat został automatycznie zamknięty 1 dzień po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe.
+      other: Ten temat został automatycznie zamknięty %{count} dni po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe.
     autoclosed_enabled_lastpost_hours:
-      one: "Ten temat został automatycznie zamknięty 1 godzinę po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe."
-      few: "Ten temat został automatycznie zamknięty %{count} godziny po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe."
-      many: "Ten temat został automatycznie zamknięty %{count} godzin po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe."
-      other: "Ten temat został automatycznie zamknięty %{count} godzin po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe."
+      few: Ten temat został automatycznie zamknięty %{count} godziny po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe.
+      many: Ten temat został automatycznie zamknięty %{count} godzin po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe.
+      one: Ten temat został automatycznie zamknięty 1 godzinę po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe.
+      other: Ten temat został automatycznie zamknięty %{count} godzin po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe.
     autoclosed_enabled_lastpost_minutes:
-      one: "Ten temat został automatycznie zamknięty 1 minutę po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe."
-      few: "Ten temat został automatycznie zamknięty %{count} minuty po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe."
-      many: "Ten temat został automatycznie zamknięty %{count} minut po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe."
-      other: "Ten temat został automatycznie zamknięty %{count} minut po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe."
+      few: Ten temat został automatycznie zamknięty %{count} minuty po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe.
+      many: Ten temat został automatycznie zamknięty %{count} minut po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe.
+      one: Ten temat został automatycznie zamknięty 1 minutę po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe.
+      other: Ten temat został automatycznie zamknięty %{count} minut po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe.
     autoclosed_disabled: "Temat został otwarty. Dodawanie odpowiedzi jest ponownie możliwe."
     autoclosed_disabled_lastpost: "Temat został otwarty. Pisanie odpowiedzi jest możliwe."
     pinned_enabled: "Temat został przypięty. Będzie pojawiać się na początku swojej kategorii dopóki nie zostanie odpięty przez obsługę lub prywatnie przez użytkownika."
@@ -1586,10 +1512,10 @@ pl_PL:
       domain_not_allowed: "Błędny adres strony internetowej. Dozwolone domeny: %{domains}"
   flags_reminder:
     subject_template:
-      one: "1 flaga oczekuje na reakcję"
-      few: "%{count} flagi oczekują na reakcję"
-      many: "%{count} flagi oczekują na reakcję"
-      other: "%{count} flagi oczekują na reakcję"
+      few: '%{count} flagi oczekują na reakcję'
+      many: '%{count} flagi oczekują na reakcję'
+      one: 1 flaga oczekuje na reakcję
+      other: '%{count} flagi oczekują na reakcję'
   unsubscribe_mailer:
     title: "Unsubscribe Mailer"
     subject_template: "Potwierdź, że nie chcesz już otrzymywać powiadomień mailowych ze strony %{site_title}"
@@ -1646,47 +1572,6 @@ pl_PL:
   test_mailer:
     title: "Test Powiadomień"
     subject_template: "[%{site_name}] Test dostarczania poczty"
-    text_body_template: |
-      To testowy mail z serwisu:
-
-      [**%{base_url}**][0]
-
-      Mail nie bez powodu jest tak długi! Powinieneś jeszcze sprawdzić kilka rzeczy:
-
-      - **Upewnij się**, że prawidłowo ustawiłeś pole "od" dla powiadomień mailowych w ustawieniach serwisu. **Względem tej domeny twoje maile będą weryfikowane!**
-
-      - Dowiedz się, jak wyświetlić surowy kod źródłowy wiadomości mailowej w twoim programie pocztowym, tak abyś mógł przeglądać nagłówki maili szukając istotnych wskazówek. W przypadku GMaila nad każdym mailem, po rozwinięciu menu, dostępna jest opcja "Pokaż oryginał".
-
-      - **WAŻNE:** Czy twój ISP skonfigurował odwrotny rekord DNS (reverse DNS record), by powiązać nazwy domenowe z adresami IP, spod których wysyłasz maile? [Sprawdź swój odwrotny rekord PTR][2] tutaj. Jeśli ISP nie skonfigurował tego prawidłowo, twoje maile mogą nie docierać do adresatów.
-
-      - Czy [rekord SPF][8] twojej domeny jest prawidłowy? [Sprawdź swój rekord SPF][1] tutaj. Pamiętaj, że oficjalnym prawidłowym typem rekordu SPF jest TXT.
-
-      - Czy [rekord DKIM][3] twojej domeny jest prawidłowy? To znacznie zwiększy prawdopodobieństwo docierania twoich maili do adresatów. [Sprawdź swój rekord DKIM][7] tutaj.
-
-      - Jeśli korzystasz z własnego serwera poczty, upewnij się, że adresy IP twojego serwera [nie znajdują się na czarnych listach][4]. Ponadto upewnij się, że serwer wysyła w pełni kwalifikowaną nazwę hosta, rozwiązywaną przez serwery DNS w wiadomościach HELO. W przeciwnym wypadku wielu usługodawców mailowych będzie odrzucać twoje maile.
-
-      - Mocno zalecamy, byś **wysłał testowego maila do [mail-tester.com][mt]**, aby potwierdzić, że wszystko o czym wspomnieliśmy działa prawidłowo.
-
-      (*Najłatwiej* założyć darmowe konto w jednym z serwisów: [SendGrid][sg], [SparkPost][sp], [Mailgun][mg] lub [Mailjet][mj]. Mają one wiele bezpłatnych ofert mailingowych, w sam raz dla małej społeczności. Pamiętaj, że i tak musisz skonfigurować rekordy SPF i DKIM w twoim serwerze DNS!)
-
-      Mamy nadzieję, że bez problemu otrzymałeś tego maila potwierdzającego docieranie maili wysyłanych przez forum.
-
-      Powodzenia,
-
-      Koledzy z [Discourse](http://www.discourse.org)
-
-      [0]: %{base_url}
-      [1]: http://www.kitterman.com/spf/validate.html
-      [2]: http://mxtoolbox.com/ReverseLookup.aspx
-      [3]: http://www.dkim.org/
-      [4]: http://whatismyipaddress.com/blacklist-check
-      [7]: https://www.mail-tester.com/spf-dkim-check
-      [8]: http://www.openspf.org/SPF_Record_Syntax
-      [sg]: https://goo.gl/r1WMF6
-      [sp]: https://www.sparkpost.com/
-      [mg]: http://www.mailgun.com/
-      [mj]: https://www.mailjet.com/pricing
-      [mt]: http://www.mail-tester.com/
   new_version_mailer:
     title: "Nowa wersja powiadomień"
     subject_template: "[%{site_name}] Aktualizacja do nowej wersji Discourse jest dostępna."
@@ -1812,7 +1697,6 @@ pl_PL:
 
     csv_export_succeeded:
       title: "Eksport CSV udany "
-      subject_template: "Zakończono eksport danych"
       text_body_template: |
         Eksport danych zakończył się sukcesem! :dvd:
 
@@ -1978,10 +1862,10 @@ pl_PL:
     pending_users_reminder:
       title: "Oczekujący użytkownicy przypomnienie"
       subject_template:
-        one: "1 użytkownik czeka na zatwierdzenie"
-        few: "%{count} użytkowników czeka na zatwierdzenie"
-        many: "%{count} użytkowników czeka na zatwierdzenie"
-        other: "%{count} użytkowników czeka na zatwierdzenie"
+        few: '%{count} użytkowników czeka na zatwierdzenie'
+        many: '%{count} użytkowników czeka na zatwierdzenie'
+        one: 1 użytkownik czeka na zatwierdzenie
+        other: '%{count} użytkowników czeka na zatwierdzenie'
       text_body_template: |+
         Są nowi zarejestrowani użytkownicy, oczekujący na zaakceptowanie (lub odrzucenie) przed rozpoczęciem użytkowania forum.
 
@@ -2183,7 +2067,7 @@ pl_PL:
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
-        %{message}
+          %{message}
     digest:
       why: "Krótkie podsumowanie aktywności na %{site_link} od twojej ostatniej wizyty w dniu %{last_seen_at}."
       since_last_visit: "Od twojej ostatniej wizyty"
@@ -2268,21 +2152,6 @@ pl_PL:
     signup_after_approval:
       title: "Zarejestruj się po zatwierdzeniu"
       subject_template: "Zostałeś zaakceptowany na forum %{site_name}!"
-      text_body_template: |
-        Witamy na %{site_name}!
-
-        Nasz personel zatwierdził twoje konto na %{site_name}.
-
-        Kliknij na podany link, aby potwierdzić i aktywować swoje nowe konto:
-        %{base_url}/u/activate-account/%{email_token}
-
-        Jeśli podany link nie działa, spróbuj skopiować go i przykleić w pasku adresów swojej wyszukiwarki.
-
-        %{new_user_tips}
-
-        Wierzymy, że [cywilizowana dyskusja](%{base_url}/guidelines) jest zawsze możliwa.
-
-        Baw się dobrze!
     signup:
       title: "Podpis"
       subject_template: "[%{site_name}] Potwierdź swoje nowe konto"
@@ -2560,22 +2429,22 @@ pl_PL:
         Ta odznaka jest przyznawana, gdy po raz pierwszy dokonasz edycji jednego z twoich postów. Nie będziesz miał możliwości dokonywania zmian w postach na zawsze, edytowanie to jest zawsze dobry pomysł - możesz dokonać ulepszenia swoich postów, naprawić małe błędy, lub dodać tekst, który przez przypadek pominąłeś w oryginalnym poście. Edytuj by twoje posty stawały się coraz lepsze!
     basic_user:
       name: Podstawowy
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Przyznano</a> wszystkie podstawowe funkcje
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">Przyznano</a> wszystkie podstawowe funkcje"
       long_description: |
         To odznaka jest przyznawana, gdy osiągniesz poziom zaufania 1. Dziękujemy, że z nami jesteś i czytasz różne wątki, aby dowiedzieć się jak działa  nasza społeczność. Ograniczenia dla nowego użytkownika zostały usunięte; przyznano ci wszystkie niezbędne funkcję społecznościowe, jak na przykład wysyłanie wiadomości prywatnych, edytowanie wiki, flagowanie i możliwość dodawania wielu obrazków i linków w postach.
     member:
       name: Zwykły
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Przyznano</a> zaproszenia, wysyłanie wiadomości do grup, więcej lajków
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">Przyznano</a> zaproszenia, wysyłanie wiadomości do grup, więcej lajków"
       long_description: |
         Ta odznaka jest przyznawana, gdy osiągniesz poziom zaufania 2. Dziękujemy za to, że udzielasz się przez czas kilku tygodni, aby w pełni dołączyć do społeczności. Możesz teraz wysyłać zaproszenia ze strony użytkownika lub z wątków, tworzyć konwersacje grupowe i mieć kilka polubień więcej na dzień.
     regular:
       name: Regularny
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Przyznano</a> możliwość zmiany kategorii, nazwy, linków oraz salon, więcej lajków
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">Przyznano</a> możliwość zmiany kategorii, nazwy, linków oraz salon, więcej lajków"
       long_description: |
         Ta odznaka jest przyznawana, gdy osiągniesz poziom zaufania 3. Dziękujemy, że regularnie udzielasz się w naszej społeczności od miesięcy. Jesteś teraz jednym z najbardziej aktywnych czytelników i masz realny wkład w tworzenie tej społeczności. Możesz teraz dokonywać zmian kategorii i zmieniać nazwy tematów, wykorzystaj bardziej skuteczne oflagowania, dostęp do obszaru prywatnego pokoju i możliwość dawania dużo większej liczby polubień na dzień.
     leader:
       name: Weteran
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Przyznano</a> możliwość globalnej edycji, przypinania, zamykania, archiwizacji, podziału i scalania, więcej lajków
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">Przyznano</a> możliwość globalnej edycji, przypinania, zamykania, archiwizacji, podziału i scalania, więcej lajków"
       long_description: |
         Ta odznaka jest przyznawana, gdy osiągniesz poziom zaufania 4. Obsługa ocenia, że jesteś liderem w tej społeczności i dajesz dobry przykład reszcie społeczności poprzez swoje akcje i wypowiedzi. Masz możliwość edycji wszystkich postów, dokonywania akcji zarezerwowanych dla moderatorów takich jak przypinanie, zamykanie, usuwanie z katalogu, archiwizowanie, rozdzielanie i łącznie, jak również otrzymujesz całe tony polubień do rozdania dziennie.
     welcome:
@@ -2587,7 +2456,7 @@ pl_PL:
       name: Autobiograf
     anniversary:
       name: Rocznica
-      description: Aktywność przez rok, co najmniej jeden wpis
+      description: "Aktywność przez rok, co najmniej jeden wpis"
       long_description: |
         Ta odznaka jest przyznawana w momencie, gdy jesteś członkiem przynajmniej rok i napisałeś przynajmniej jeden post przez rok. Dziękujemy, że z nami jesteś i udzielasz się w naszej społeczności. Nie moglibyśmy funkcjonować bez ciebie.
     nice_post:
@@ -2622,17 +2491,17 @@ pl_PL:
         Ta odznaka jest przyznawana, gdy twój wątek otrzymał 50 polubień. Rozpocząłeś fascynującą konwersację, a społeczeństwu spodobała się dynamiczna dyskusja, która z tego wynikła.
     nice_share:
       name: Miłe udostępnienie
-      description: 'Udostępniono post z 25 unikalnymi odwiedzającymi. '
+      description: "Udostępniono post z 25 unikalnymi odwiedzającymi. "
       long_description: |
         Ta odznaka przyznawana jest za udostępnienie linku, który został naciśnięty przez co najmniej 25 osób. Dziękujemy za rozpowszechnianie naszych konwersacji i tej społeczności.
     good_share:
       name: Dobre udostępnienie
-      description: 'Udostępniono post z 300 unikalnymi odwiedzającymi. '
+      description: "Udostępniono post z 300 unikalnymi odwiedzającymi. "
       long_description: |
         Ta odznaka jest przyznawana za udostępnienie linku, który został naciśnięty przez co najmniej 300 osób. Dobra robota! Pokazałeś jak wygląda prawdziwa dyskusja grupie nowych osób i wspomogłeś rozrost tej społeczności.
     great_share:
       name: Świetne udostępnienie
-      description: 'Udostępniono post z 1000 unikalnych odwiedzających. '
+      description: "Udostępniono post z 1000 unikalnych odwiedzających. "
       long_description: |
         Ta odznaka jest przyznawana za udostępnienie linku, który został naciśnięty przez co najmniej 1000 osób. Wow! Dokonałeś promocji naprawdę interesującej dyskusji w dużym gronie odbiorców i wspomogłeś w istotny sposób rozrost naszej społeczności!
     first_like:
@@ -2648,11 +2517,9 @@ pl_PL:
     promoter:
       name: Promotor
       description: Zaproszenie użytkownika
-      long_description: |
-        Ta odznaka jest przyznawana, gdy zaprosisz kogoś do społeczności poprzez przycisk zaproś na stronie użytkownika, lub na dole wątku. Zapraszanie przyjaciół, którzy mogą być zainteresowani dyskusjami to świetny sposób aby wprowadzić nowe osoby do naszej społeczności, dzięki!
     campaigner:
       name: Działacz
-      description: 'Zaproszenie 3 użytkowników '
+      description: "Zaproszenie 3 użytkowników "
       long_description: |
         Ta odznaka jest przyznawana, gdy zaprosisz przynajmniej 3 osoby, które później spędzą wystarczająco dużo czasu na stronie, aby zostać regularnymi użytkownikami. Żyjąca społeczność potrzebuje regularnego wpływu nowych użytkowników, którzy regularnie udzielają się na forum i przedstawiają swój nowy punkt widzenia w konwersacjach.
     champion:
@@ -2685,17 +2552,17 @@ pl_PL:
         Ta odznaka jest przyznawana, gdy po raz pierwszy przeczytasz dłuższy wątek z więcej niż 100 odpowiedziami. Dokładne czytanie konwersacji pozwala na śledzenie dyskusji, zrozumienie różnych punktów widzenia i prowadzi do bardziej interesującej konwersacji. Im więcej czytasz, tym lepsza staję się konwersacja. Lubimy powtarzać, że czytanie to właśnie fundament! :slight_smile:
     popular_link:
       name: Popularny link
-      description: Opublikowanie zewnętrznego linku, który otrzymał co najmniej 50 kliknięć
+      description: "Opublikowanie zewnętrznego linku, który otrzymał co najmniej 50 kliknięć"
       long_description: |
         Ta odznaka jest przyznawana, gdy link, który udostępniłeś zostanie otwarty przynajmniej 50 razy. Dziękujemy za dodawanie przydatnych linków, które mają wyraźny wkład w zawartość konwersacji!
     hot_link:
       name: Gorący link
-      description: Opublikowanie zewnętrznego linku, który otrzymał co najmniej 300 kliknięć
+      description: "Opublikowanie zewnętrznego linku, który otrzymał co najmniej 300 kliknięć"
       long_description: |
         Ta odznaka jest przyznawana, gdy link, który udostępniłeś zostanie otwarty przynajmniej 300 razy. Dziękujemy za udostępnienie ciekawe linku, który pozwolił rozwinąć konwersację i dodać nowy punkt widzenia dyskusji!
     famous_link:
       name: Popularny link
-      description: Opublikowanie zewnętrznego linku, który otrzymał co najmniej 1000 kliknięć
+      description: "Opublikowanie zewnętrznego linku, który otrzymał co najmniej 1000 kliknięć"
       long_description: |
         Ta odznaka jest przyznawana, gdy link, który udostępniłeś zostanie otwarty przynajmniej 1000 razy. Wow! Udostępniłeś link, który wyraźnie przyczynił się do ulepszenia konwersacji poprzez dodanie niezbędnych szczegółów, zawartości i informacji. Dobra robota!
     appreciated:
@@ -2746,16 +2613,14 @@ pl_PL:
     first_emoji:
       name: Pierwszy Emoji
       description: Użyto Emoji w Poście
-      long_description: |
-        Ta odznaka jest przyznawana, gdy po raz pierwszy dodasz emoji do twojego posta  :thumbsup:. Emoji pozwala ci przenosić emocje do twojego posta, od szczęścia  :smiley: do smutku  :anguished:, gniewu :angry: i wszystkie pomiędzy  :sunglasses:. Po prostu rozpocznij od: (dwukropka) lub naciśnij na przycisk paska Emoji w edytorze, aby wybrać z spośród setek emoji :ok_hand:.
     first_mention:
       name: Pierwsze Wspomnienie
       description: Wspomniano o użytkowniku w poście
-      long_description: Ta odznaka jest przyznawana, gdy po raz pierwszy wspomnisz o którymś użytkowniku *nazwa użytkownika w swoim poście. Każde wspomnienie powoduje wysłanie powiadomienia do tej osoby, tak aby wiedział o twoim poście. Po prostu rozpocznij pisanie od @(symbolu) aby wspomnieć o użytkowniku lub jeśli można o grupie - jest to wygodny sposób, aby zwrócić czyjąś uwagę.
+      long_description: "Ta odznaka jest przyznawana, gdy po raz pierwszy wspomnisz o którymś użytkowniku *nazwa użytkownika w swoim poście. Każde wspomnienie powoduje wysłanie powiadomienia do tej osoby, tak aby wiedział o twoim poście. Po prostu rozpocznij pisanie od @(symbolu) aby wspomnieć o użytkowniku lub jeśli można o grupie - jest to wygodny sposób, aby zwrócić czyjąś uwagę."
     first_onebox:
       name: Pierwszy Onebox
       description: Dodany link został poddany funkcji oneboxe
-      long_description: Ta odznaka jest przyznawana, gdy po raz pierwszy umieścisz link w swoim poście, który został automatycznie rozszerzony przez funkcję onebox z krótkim podsumowaniem linku; tytuł i (jeśli dozwolone) zdjęcie.
+      long_description: "Ta odznaka jest przyznawana, gdy po raz pierwszy umieścisz link w swoim poście, który został automatycznie rozszerzony przez funkcję onebox z krótkim podsumowaniem linku; tytuł i (jeśli dozwolone) zdjęcie."
     first_reply_by_email:
       name: Pierwsza Odpowiedz przez Email
       description: Odpowiedział na post poprzez email
@@ -2769,12 +2634,11 @@ pl_PL:
     badge_title_metadata: "%{display_name} odznaka na %{site_title}"
   admin_login:
     success: "Email wysłany"
-    error: "Błąd!"
     email_input: "Email administratora. "
     submit_button: "Wyślij Email. "
   performance_report:
-    initial_post_raw: 'Ten temat zawiera codzienne raporty wydajności dla twojej witryny. '
-    initial_topic_title: 'Testy wydajności witryny. '
+    initial_post_raw: "Ten temat zawiera codzienne raporty wydajności dla twojej witryny. "
+    initial_topic_title: "Testy wydajności witryny. "
   tags:
     title: "Etykiety"
     staff_tag_disallowed: "Etykieta \"%{tag}\" może być zatwierdzona przez personel."
@@ -2913,6 +2777,3 @@ pl_PL:
         description: |
           <p>Jeśli kiedykolwiek będziesz chciał dokonać zmian w tych ustawieniach, przejdź <a href='/admin' target='_blank'>do sekcji admina</a>; znajdziesz ją obok ikony klucza w menu witryny.</p>
           <p>Baw się dobrze i powodzenia <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>w budowaniu nowej społeczności!</a></p>
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index f8d3d28d888..30a3b9f9c2a 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -17,18 +17,19 @@ pt:
       date_only: "%B %-d, %Y"
       long: "%B %-d, %Y, %l:%M%P"
   date:
-    month_names: [null, Janeiro, Fevereiro, Março, Abril, Maio, Junho, Julho, Agosto, Setembro, Outubro, Novembro, Dezembro]
+    month_names: [~, Janeiro, Fevereiro, Março, Abril, Maio, Junho, Julho, Agosto, Setembro, Outubro, Novembro, Dezembro]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "am"
     pm: "pm"
-    <<: *datetime_formats
   title: "Discourse"
   topics: "Tópicos"
   posts: "mensagens"
   loading: "A carregar"
   powered_by_html: 'Desenvolvido por <a href="https://www.discourse.org">Discourse</a>, e melhor visualização com o JavaScript ativado'
   log_in: "Iniciar Sessão"
+  submit: "Submeter"
   purge_reason: "Eliminada automaticamente como abandonada, conta desativada"
   disable_remote_images_download_reason: "A transferência remota de imagens foi desativada porque não existe espaço disponível no disco."
   anonymous: "Anónimo"
@@ -36,6 +37,11 @@ pt:
   themes:
     bad_color_scheme: "Não é possível atualizar o tema, esquema de cor inválido"
     other_error: "Ocorreu algo de errado ao atualizar o tema"
+    error_importing: "Erro ao clonar o repositório de GIT, acesso foi negado ou o repositório não foi encontrado"
+    settings_errors:
+      invalid_yaml: "O YAML fornecido é inválido"
+      data_type_not_a_number: "Tipo de configuração `%{name}` não é suportado. Tipos suportados são `integer`, `bool`, `lista` e `enum`."
+      name_too_long: "Existe uma configuração com um nome demasiado longo. O tamanho máximo é 255"
   emails:
     incoming:
       default_subject: "Este tópico precisa de um título"
@@ -67,17 +73,17 @@ pt:
       present: tem que estar em branco
       confirmation: "não corresponde %{attribute}"
       empty: não pode estar vazio
-      equal_to: tem que ser igual a %{count}
+      equal_to: "tem que ser igual a %{count}"
       even: tem que ser par
       exclusion: está reservado
-      greater_than: tem que ser maior que %{count}
-      greater_than_or_equal_to: tem que ser maior ou igual a %{count}
+      greater_than: "tem que ser maior que %{count}"
+      greater_than_or_equal_to: "tem que ser maior ou igual a %{count}"
       has_already_been_used: "já foi usado"
       inclusion: não está incluído na lista
       invalid: é inválido
       is_invalid: "parece pouco claro, é uma frase completa?"
-      less_than: tem que ser menos que %{count}
-      less_than_or_equal_to: tem que ser menos ou igual a %{count}
+      less_than: "tem que ser menos que %{count}"
+      less_than_or_equal_to: "tem que ser menos ou igual a %{count}"
       not_a_number: não é um número
       not_an_integer: tem que ser um inteiro
       odd: tem que ser ímpar
@@ -109,6 +115,9 @@ pt:
       max_username_length_range: "Não pode definir o máximo abaixo do mínimo."
       default_categories_already_selected: "Não pode selecionar uma categoria usada noutra lista."
       s3_upload_bucket_is_required: "Não pode ativar carregamentos para o S3 excepto se tiver fornecido o 's3_upload_bucket'."
+  activemodel:
+    errors:
+      <<: *errors
   invite:
     not_found: "O seu código de convite é inválido. Por favor, contacte o administrador do site."
   bulk_invite:
@@ -128,8 +137,8 @@ pt:
   reading_time: "Tempo de leitura"
   likes: "Gostos"
   too_many_replies:
-    one: "Pedimos desculpa mas novos utilizadores estão temporariamente limitados a 1 resposta no mesmo tópico."
-    other: "Pedimos desculpa mas novos utilizadores estão temporariamente limitados a %{count} respostas no mesmo tópico."
+    one: Pedimos desculpa mas novos utilizadores estão temporariamente limitados a 1 resposta no mesmo tópico.
+    other: Pedimos desculpa mas novos utilizadores estão temporariamente limitados a %{count} respostas no mesmo tópico.
   embed:
     start_discussion: "Iniciar Discussão"
     continue: "Continuar Discussão"
@@ -137,36 +146,35 @@ pt:
     no_hosts: "Não foram configurados anfitriões para incorporar."
     configure: "Configurar Integração"
     more_replies:
-      one: "mais 1 resposta"
-      other: "mais %{count} respostas"
+      one: mais 1 resposta
+      other: mais %{count} respostas
     loading: "A carregar Discussão..."
     permalink: "Hiperligação Permanente"
     imported_from: "Este é um tópico de discussão de acompanhamento para a entrada original em %{link}"
     in_reply_to: "▶ %{username}"
     replies:
-      one: "1 resposta"
-      other: "%{count} respostas"
+      one: 1 resposta
+      other: '%{count} respostas'
   no_mentions_allowed: "Pedimos desculpa, não pode mencionar outros utilizadores."
   too_many_mentions:
-    one: "Pedimos desculpa, pode mencionar apenas 1 outro utilizador numa mensagem."
-    other: "Pedimos desculpa, pode mencionar apenas %{count} outros utilizadores numa mensagem."
+    one: Pedimos desculpa, pode mencionar apenas 1 outro utilizador numa mensagem.
+    other: Pedimos desculpa, pode mencionar apenas %{count} outros utilizadores numa mensagem.
   no_mentions_allowed_newuser: "Pedimos desculpa, novos utilizadores não podem mencionar outros utilizadores."
   too_many_mentions_newuser:
-    one: "Pedimos desculpa, novos utilizadores podem mencionar apenas 1 outro utilizador numa mensagem."
-    other: "Pedimos desculpa, novos utilizadores podem mencionar apenas %{count} utilizadores numa mensagem."
+    one: Pedimos desculpa, novos utilizadores podem mencionar apenas 1 outro utilizador numa mensagem.
+    other: Pedimos desculpa, novos utilizadores podem mencionar apenas %{count} utilizadores numa mensagem.
   no_images_allowed: "Pedimos desculpa, novos utilizadores não podem colocar imagens nas mensagens."
   too_many_images:
-    one: "Pedimos desculpa, novos utilizadores podem colocar apenas 1 imagem numa mensagem."
-    other: "Pedimos desculpa, novos utilizadores podem colocar apenas %{count} imagens numa mensagem."
+    one: Pedimos desculpa, novos utilizadores podem colocar apenas 1 imagem numa mensagem.
+    other: Pedimos desculpa, novos utilizadores podem colocar apenas %{count} imagens numa mensagem.
   no_attachments_allowed: "Pedimos desculpa, novos utilizadores não podem colocar anexos nas mensagens."
   too_many_attachments:
-    one: "Pedimos desculpa, novos utilizadores podem colocar apenas 1 anexo numa mensagem."
-    other: "Pedimos desculpa, novos utilizadores podem colocar apenas %{count} anexos numa mensagem."
+    one: Pedimos desculpa, novos utilizadores podem colocar apenas 1 anexo numa mensagem.
+    other: Pedimos desculpa, novos utilizadores podem colocar apenas %{count} anexos numa mensagem.
   no_links_allowed: "Pedimos desculpa, novos utilizadores não podem colocar hiperligações nas mensagens."
   too_many_links:
-    one: "Pedimos desculpa, novos utilizadores podem colocar apenas 1 hiperligação numa mensagem."
-    other: "Pedimos desculpa, novos utilizadores podem colocar apenas %{count} hiperligações numa mensagem."
-  contains_blocked_words: "A sua publicação contém palavras que não são permitidas."
+    one: Pedimos desculpa, novos utilizadores podem colocar apenas 1 hiperligação numa mensagem.
+    other: Pedimos desculpa, novos utilizadores podem colocar apenas %{count} hiperligações numa mensagem.
   spamming_host: "Pedimos desculpa, não pode colocar uma hiperligação para esse servidor."
   user_is_suspended: "Utilizadores suspensos não têm permissão para publicar."
   topic_not_found: "Algo de errado ocorreu. Talvez este tópico tenha sido fechado ou eliminado enquanto olhava para ele?"
@@ -198,7 +206,6 @@ pt:
     top_weekly: "Melhores tópicos da semana"
     top_daily: "Melhores tópicos do dia"
     posts: "Últimas mensagens"
-    private_posts: "Mensagens privadas recentes"
     group_posts: "Mensagens recentes em %{group_name}"
     group_mentions: "Menções recentes em %{group_name}"
     user_posts: "Mensagens recentes criadas por @%{username}"
@@ -210,11 +217,8 @@ pt:
   queue:
     delete_reason: "Eliminado através da fila de moderação de mensagens"
   groups:
-    success:
-      bulk_add: "Foram adicionados %{users_added} utilizadores ao grupo."
     errors:
       can_not_modify_automatic: "Não pode modificar um grupo automático"
-      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."
       email_already_used_in_group: "'%{email}' já é utilizado pelo grupo '%{group_name}'."
@@ -234,9 +238,9 @@ pt:
       title: "Pedido de Adesão para @%{group_name}"
   education:
     until_posts:
-      one: "1 mensagem"
-      other: "%{count} mensagens"
-    new-topic: |
+      one: 1 mensagem
+      other: '%{count} mensagens'
+    'new-topic': |
       Bem-vindo a %{site_name} &mdash; **obrigado por começar uma nova conversação!**
 
       - O título parece-lhe interessante se o ler em voz alto? É um bom resumo?
@@ -246,7 +250,7 @@ pt:
       - Inclua palavras usadas com frequência no seu tópico para que outros possam *encontrá-lo*. Para agrupar o seu tópico com tópicos relacionados, selecione a categoria.
 
       Para mais, [verifique as orientações da comunidade](/guidelines). Este painel irá aparecer apenas para o seu primeiro %{education_posts_text}.
-    new-reply: |
+    'new-reply': |
       Bem-vindo a %{site_name} &mdash; **obrigado por contribuir!**
 
       - A sua resposta melhora de alguma maneira esta conversação?
@@ -268,13 +272,12 @@ pt:
       user_profile:
         bio_raw: "Sobre Mim"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Apenas pode anexar avisos a mensagens privadas."
               too_many_users: "Apenas pode enviar avisos a um utilizador de cada vez."
-              cant_send_pm: "Pedimos desculpa, não pode enviar uma mensagem privada a esse utilizador."
               no_user_selected: "Tem que selecionar um utilizador válido."
             featured_link:
               invalid: "é inválida. URL deve incluir http:// ou https://."
@@ -312,7 +315,6 @@ pt:
           attributes:
             word:
               too_many: "Demasiadas palavras para essa ação"
-      <<: *errors
   user_profile:
     no_info_other: "<div class='missing-profile'>%{name} ainda não colocou nada no campo Sobre Mim</div>"
   vip_category_name: "Salão"
@@ -328,25 +330,26 @@ pt:
     title: "Bem-vindo ao Salão"
     body: |2+
 
-      Parabéns! :confetti_ball:
+        Parabéns! :confetti_ball:
 
-      Se consegue ver este tópico, então é porque foi recentemente promovido a **habitual** (Nível de Confiança 3).
+        Se consegue ver este tópico, então é porque foi recentemente promovido a **habitual** (Nível de Confiança 3).
 
-      Pode agora &hellip;
+        Pode agora &hellip;
 
-      * Editar o título de qualquer tópico
-      * Modificar a categoria de qualquer tópico
-      * Ter todas as suas hiperligações a serem seguidas ([nãoseguimento automático](http://en.wikipedia.org/wiki/Nofollow) é removido)
-      * Aceder a um salão privado de categorias, apenas visível a utilizadores com Nível de Confiança 3 ou superior
-      * Esconder spam com uma única sinalização
+        * Editar o título de qualquer tópico
+        * Modificar a categoria de qualquer tópico
+        * Ter todas as suas hiperligações a serem seguidas ([nãoseguimento automático](http://en.wikipedia.org/wiki/Nofollow) é removido)
+        * Aceder a um salão privado de categorias, apenas visível a utilizadores com Nível de Confiança 3 ou superior
+        * Esconder spam com uma única sinalização
 
-      Aqui está a [lista actual de membros habituais](/badges/3/regular). Certifique-se que diz olá.
+        Aqui está a [lista actual de membros habituais](/badges/3/regular). Certifique-se que diz olá.
 
-      Obrigado por ser uma parte importante na nossa comunidade!
+        Obrigado por ser uma parte importante na nossa comunidade!
 
-      (Para mais informação acerca dos Níveis de Confiança, [veja este tópico][confiança]. Por favor tenha conhecimento que apenas membros que continuam a corresponder aos requisitos ao longo do tempo, irão manter-se habituais.)
+        (Para mais informação acerca dos Níveis de Confiança, [veja este tópico][confiança]. Por favor tenha conhecimento que apenas membros que continuam a corresponder aos requisitos ao longo do tempo, irão manter-se habituais.)
+
+        [confiança]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
 
-      [confiança]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Acerca da categoria %{category}"
     replace_paragraph: "(Substitua este primeiro parágrafo com uma breve descrição da sua nova categoria. Este guia irá aparecer na área de seleção da categoria, por isso tente mantê-lo abaixo dos 200 caracteres. **Até editar esta descrição ou criar tópicos, esta categoria não irá aparecer na página das categorias.**)"
@@ -362,8 +365,8 @@ pt:
       uncategorized: "Não é possível eliminar Sem Categoria"
       has_subcategories: "Não é possível eliminar esta categoria porque contém sub-categorias."
       topic_exists:
-        one: "Não é possível eliminar esta categoria porque contém 1 tópico. O tópico mais antigo é  %{topic_link}."
-        other: "Não é possível eliminar esta categoria porque contém %{count} tópicos. O tópico mais antigo é  %{topic_link}."
+        one: Não é possível eliminar esta categoria porque contém 1 tópico. O tópico mais antigo é  %{topic_link}.
+        other: Não é possível eliminar esta categoria porque contém %{count} tópicos. O tópico mais antigo é  %{topic_link}.
       topic_exists_no_oldest: "Não é possível eliminar esta categoria porque a contagem de tópicos é de %{count}."
     uncategorized_description: "Tópicos que não precisam de uma categoria ou que não se encaixam em nenhuma outra categoria existente."
   trust_levels:
@@ -379,101 +382,86 @@ pt:
       title: "líder"
     change_failed_explanation: "Tentou despromover %{user_name} para '%{new_trust_level}'. Contudo o Nível de Confiança é atualmente '%{current_trust_level}'. %{user_name} irá permanecer em '%{current_trust_level}' - se deseja despromover o utilizador, bloqueie o Nível de Confiança primeiro"
   rate_limiter:
-    slow_down: "Realizou esta ação demasiadas vezes, tente novamente mais tarde."
-    too_many_requests: "Possuímos um limite diário de número de vezes que uma ação pode ser tomada. Por favor aguarde %{time_left} antes de tentar novamente."
-    by_type:
-      first_day_replies_per_day: "Atingiu o número máximo de respostas que um novo utilizador pode criar no seu primeiro dia. Por favor espere %{time_left} antes de tentar novamente."
-      first_day_topics_per_day: "Atingiu o número máximo de tópicos que um novo utilizador pode criar no seu primeiro dia. Por favor espere %{time_left} antes de tentar novamente."
-      create_topic: "Está a criar tópicos demasiado rápido. Por favor espere %{time_left} antes de tentar novamente."
-      create_post: "Está a responder demasiado rápido. Por favor espere %{time_left} antes de tentar novamente."
-      delete_post: "Está a apagar publicações a um ritmo demasiado rápido. Por favor espere %{time_left} antes de tentar novamente."
-      topics_per_day: "Atingiu o número máximo de novos tópicos de hoje. Por favor espere %{time_left} antes de tentar novamente."
-      pms_per_day: "Atingiu o número máximo de mensagens de hoje. Por favor espere %{time_left} antes de tentar novamente."
-      create_like: "Atingiu o número máximo de gostos de hoje. Por favor espere %{time_left} antes de tentar novamente."
-      create_bookmark: "Atingiu o número máximo de marcações de hoje. Por favor espere %{time_left} antes de tentar novamente."
-      live_post_counts: "Está a pedir por contagens de publicações em tempo real a um ritmo demasiado rápido. Por favor espere %{time_left} antes de tentar outra vez."
-      unsubscribe_via_email: "Atingiu o número máximo de cancelamentos de subscrições por email de hoje. Por favor espere %{time_left} antes de tentar novamente."
-      topic_invitations_per_day: "Atingiu o número máximo de convites para tópicos de hoje. Por favor espere %{time_left} antes de tentar novamente."
     hours:
-      one: "1 hora"
-      other: "%{count} horas"
+      one: 1 hora
+      other: '%{count} horas'
     minutes:
-      one: "1 minuto"
-      other: "%{count} minutos"
+      one: 1 minuto
+      other: '%{count} minutos'
     seconds:
-      one: "1 segundo"
-      other: "%{count} segundos"
+      one: 1 segundo
+      other: '%{count} segundos'
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: "< 1s"
-        other: "< %{count}s"
+        one: < 1s
+        other: < %{count}s
       x_seconds:
-        one: "1s"
-        other: "%{count}s"
+        one: 1s
+        other: '%{count}s'
       less_than_x_minutes:
-        one: "< 1m"
-        other: "< %{count}m"
+        one: < 1m
+        other: < %{count}m
       x_minutes:
-        one: "1m"
-        other: "%{count}m"
+        one: 1m
+        other: '%{count}m'
       about_x_hours:
-        one: "1h"
-        other: "%{count}h"
+        one: 1h
+        other: '%{count}h'
       x_days:
-        one: "1d"
-        other: "%{count}d"
+        one: 1d
+        other: '%{count}d'
       about_x_months:
-        one: "1mês"
-        other: "%{count}mês"
+        one: 1mês
+        other: '%{count}mês'
       x_months:
-        one: "1mês"
-        other: "%{count}mês"
+        one: 1mês
+        other: '%{count}mês'
       about_x_years:
-        one: "1ano"
-        other: "%{count}anos"
+        one: 1ano
+        other: '%{count}anos'
       over_x_years:
-        one: "> 1ano"
-        other: "> %{count}anos"
+        one: '> 1ano'
+        other: '> %{count}anos'
       almost_x_years:
-        one: "1ano"
-        other: "%{count}anos"
+        one: 1ano
+        other: '%{count}anos'
     distance_in_words_verbose:
       half_a_minute: "mesmo agora"
       less_than_x_seconds:
-        one: "mesmo agora"
-        other: "mesmo agora"
+        one: mesmo agora
+        other: mesmo agora
       x_seconds:
-        one: "1 segundo atrás"
-        other: "%{count} segundos atrás"
+        one: 1 segundo atrás
+        other: '%{count} segundos atrás'
       less_than_x_minutes:
-        one: "menos de 1 minuto atrás"
-        other: "menos de %{count} minutos atrás"
+        one: menos de 1 minuto atrás
+        other: menos de %{count} minutos atrás
       x_minutes:
-        one: "1 minuto atrás"
-        other: "%{count} minutos atrás"
+        one: 1 minuto atrás
+        other: '%{count} minutos atrás'
       about_x_hours:
-        one: "1 hora atrás"
-        other: "%{count} horas atrás"
+        one: 1 hora atrás
+        other: '%{count} horas atrás'
       x_days:
-        one: "1 dia atrás"
-        other: "%{count} dias atrás"
+        one: 1 dia atrás
+        other: '%{count} dias atrás'
       about_x_months:
-        one: "há cerca de 1 mês atrás"
-        other: "há cerca de %{count} meses atrás"
+        one: há cerca de 1 mês atrás
+        other: há cerca de %{count} meses atrás
       x_months:
-        one: "1 mês atrás"
-        other: "%{count} meses atrás"
+        one: 1 mês atrás
+        other: '%{count} meses atrás'
       about_x_years:
-        one: "há cerca de 1 ano atrás"
-        other: "há cerca %{count} anos atrás"
+        one: há cerca de 1 ano atrás
+        other: há cerca %{count} anos atrás
       over_x_years:
-        one: "há mais de 1 ano atrás"
-        other: "há mais de %{count} anos atrás"
+        one: há mais de 1 ano atrás
+        other: há mais de %{count} anos atrás
       almost_x_years:
-        one: "há quase 1 ano atrás"
-        other: "há quase %{count} anos atrás"
+        one: há quase 1 ano atrás
+        other: há quase %{count} anos atrás
   password_reset:
     no_token: "Desculpe, essa hiperligação para alterar a palavra-passe é muito antiga. Selecione o botão Iniciar Sessão e utilize 'Esqueci a minha palavra-passe' para obter uma nova hiperligação."
     choose_new: "Escolha uma nova palavra-passe"
@@ -526,8 +514,6 @@ pt:
       long_form: 'sinalizou isto como inapropriado'
     notify_user:
       title: 'Enviar uma mensagem a @{{username}}'
-      description: 'Quero falar com esta pessoa diretamente e em privado acerca da sua mensagem.'
-      short_description: 'Eu quero falar com esta pessoa diretamente e em privado sobre a sua publicação.'
       long_form: 'utilizador com mensagens'
       email_title: 'A sua mensagem em "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -620,9 +606,7 @@ pt:
       xaxis: "Dia"
       yaxis: "Número de visitas"
     signups:
-      title: "Novos Utilizadores"
       xaxis: "Dia"
-      yaxis: "Número de novos utilizadores"
     profile_views:
       title: "Vistas do Perfil de Utilizador"
       xaxis: "Dia"
@@ -660,7 +644,6 @@ pt:
       xaxis: "Dia"
       yaxis: "Número de Emails"
     user_to_user_private_messages:
-      title: "Utilizador-a-Utilizador"
       xaxis: "Dia"
       yaxis: "Número de mensagens"
     system_private_messages:
@@ -707,7 +690,6 @@ pt:
       xaxis: "Dia"
       yaxis: "Vistas de Página de Web Crawler"
     page_view_total_reqs:
-      title: "Total"
       xaxis: "Dia"
       yaxis: "Total de Vistas de Página"
     page_view_logged_in_mobile_reqs:
@@ -769,28 +751,23 @@ pt:
     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>.'
     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."
-    missing_mailgun_api_key: "O servidor está configurado para enviar email via mailgun mas você não forneceu uma chave de API para verificar as mensagens de webhook."
+      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. 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;"
-    censored_pattern: "Expressão regular que será automaticamente substituída por &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Eliminar automaticamente quaisquer mensagens ocultas que permaneçam escondidas por mais de 30 dias."
-    default_locale: "Idioma padrão para esta instância do Discourse (ISO 639-1 Code)"
     allow_user_locale: "Permitir aos utilizadores escolherem a sua própria língua preferencial para a interface."
     set_locale_from_accept_language_header: "defina a língua de interface para utilizadores anónimos com base nos cabeçalhos de língua dos seus navegadores. (EXPERIMENTAL, não funciona com cache anónima)"
     min_post_length: "Tamanho mínimo permitido por mensagem, em caracteres"
     min_first_post_length: "Tamanho mínimo permitido para a primeira mensagem (corpo do tópico), em caracteres"
-    min_private_message_post_length: "Tamanho mínimo permitido para mensagens, em caracteres"
     max_post_length: "Tamanho máximo permitido por mensagem, em caracteres"
     topic_featured_link_enabled: "Permitir publicar uma ligação com tópicos."
     show_topic_featured_link_in_digest: "Mostrar a ligação destacada do tópico no email de resumo."
     min_topic_title_length: "Tamanho mínimo permitido por título de cada tópico, em caracteres"
     max_topic_title_length: "Tamanho máximo permitido por título de cada tópico, em caracteres"
-    min_private_message_title_length: "Tamanho mínimo permitido por título nas mensagens, em caracteres"
     min_search_term_length: "Tamanho mínimo válido para termos de pesquisa, em caracteres"
     search_tokenize_chinese_japanese_korean: "Forçar pesquisa para atomizar Chinês/Japonês/Coreano mesmo em sites que não sejam CJC"
     search_prefer_recent_posts: "Se pesquisar no seu fórum vasto é lento, esta opção tenta usar um índex de publicações recentes primeiro"
@@ -836,7 +813,6 @@ pt:
     summary_likes_required: "Número mínimo de gostos num tópico antes que 'Resumir Este Tópico' seja ativo."
     summary_percent_filter: "Quando um utilizador clica em 'Resumir Este Tópico', mostrar as melhores %  de mensagens"
     summary_max_results: "Número máximo de mensagens devolvidas por 'Resumo deste Tópico'"
-    enable_private_messages: "Permitir que utilizadores de nível de confiança 1 (configurável através do nível de confiança mínimo para enviar mensagens) criem mensagens e respostas a mensagens. Note que a equipa de apoio pode mandar mensagens de qualquer maneira."
     enable_long_polling: "O sistema de mensagens usado para notificações pode fazer solicitações longas"
     long_polling_base_url: "URL base usada para solicitação ao servidor (quando um CDN serve conteúdo dinâmico, certifique-se de configurá-lo para a 'pull' original) ex: http://origem.sítio.com"
     long_polling_interval: "Quantidade de tempo que um servidor deve esperar antes de notificar os clientes quando não há dados para serem enviados (apenas utilizadores ligados)"
@@ -890,7 +866,6 @@ pt:
     version_checks: "Fazer o ping do Discourse Hub para atualização de versões e mostrar mensagens sobre novas versões no painel de administração"
     new_version_emails: "Enviar um email para o endereço 'contact_email' quando uma nova versão do Discourse estiver disponível."
     invite_expiry_days: "Durante quantos dias as chaves de convite são válidas."
-    invite_passthrough_hours: "Quanto tempo pode um utilizador utilizar uma chave de convite previamente recuperada, em horas"
     login_required: "Requerer autenticação para ler conteúdo neste sítio, não permitir acesso anónimo."
     min_password_length: "Tamanho mínimo da palavra-passe."
     min_admin_password_length: "Tamanho mínimo da palavra-passe para Administração."
@@ -906,7 +881,6 @@ pt:
     sso_overrides_name: "Substitui o nome completo local por um nome completo de um sítio externo a partir de um SSO em cada início de sessão, e previne mudanças locais."
     sso_overrides_avatar: "Substitui o avatar do utilizador com avatares externos a partir de um SSO. Se ativo, é altamente recomendada a desativação de allow_uploaded_avatars"
     sso_not_approved_url: "Redirecionar contas SSO não aprovadas para este URL"
-    enable_local_logins: "Ativar contas com nome de utilizador e senha de forma local (Nota: isto tem que estar ativo para que os convites funcionem)"
     allow_new_registrations: "Permitir registo de novos utilizadores. Desmarcar isto para prevenir que alguém crie uma nova conta."
     enable_signup_cta: "Mostrar um aviso a utilizadores anónimos que retornem levando-os a inscreverem-se para uma conta."
     enable_yahoo_logins: "Ativar autenticação pelo Yahoo"
@@ -914,15 +888,12 @@ pt:
     google_oauth2_client_id: "ID do cliente da sua aplicação Google."
     google_oauth2_client_secret: "Chave do cliente da sua aplicação Google."
     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: "Activar autenticação pelo Instagram, requer instagram_consumer_key e instagram_consumer_secret"
     instagram_consumer_key: "Chave de consumidor para a autenticação via Instagram"
     instagram_consumer_secret: "Segredo de consumidor para a autenticação via Instagram"
     enable_facebook_logins: "Ativar autenticação pelo Facebook, requer facebook_app_id e facebook_app_secret"
     facebook_app_id: "Id App usado para autenticação pelo Facebook, registado em https://developers.facebook.com/apps"
     facebook_app_secret: "Chave da App para autenticação com o Facebook, registado em https://developers.facebook.com/apps"
-    facebook_request_extra_profile_details: "Requerer informação sobre mim, localização e website do facebook. (requer que sua aplicação de autenticação esteja autorizada pelo facebook)"
     enable_github_logins: "Ativar autenticação via Github, requer github_client_id e github_client_secret"
     github_client_id: "Id do cliente para autenticação pelo Github, registado em https://github.com/settings/applications"
     github_client_secret: "Chave do Cliente para autenticação pelo Github, registado em https://github.com/settings/applications"
@@ -930,7 +901,6 @@ pt:
     allow_restore: "Permitir o restauro, que pode substituir TODOS os dados do sítio. Deixar a falso a menos que planeie restaurar uma cópia de segurança"
     maximum_backups: "Valor máximo de cópias de segurança a serem guardadas em disco. Cópias de Segurança antigas são automaticamente eliminadas."
     automatic_backups_enabled: "Executar cópias de segurança automáticas de acordo com as definições de frequência de cópia de segurança"
-    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: "Desactive a remoção das cópias de segurança do S3 quando removidas localmente."
@@ -952,7 +922,6 @@ pt:
     max_bookmarks_per_day: "Número máximo de marcadores por utilizador por dia."
     max_edits_per_day: "Número máximo de edições por utilizador por dia."
     max_topics_per_day: "Número máximo de tópicos que um utilizador pode criar por dia."
-    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: "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."
@@ -965,7 +934,6 @@ pt:
     clean_orphan_uploads_grace_period_hours: "Período de carência (em horas) antes de um carregamento orfão ser removido."
     purge_deleted_uploads_grace_period_days: "Período de carência (em dias) antes de um carregamento eliminado ser apagado."
     enable_s3_uploads: "Coloca os carregamentos no armazenamento Amazon S3. IMPORTANTE: requer credenciais S3 válidas (tanto id de chave de acesso como a chave de acesso secreta)."
-    s3_use_iam_profile: 'Utiliza AWS EC2 IAM para recuperar chaves. NOTA: a ativação irá substituir as configurações de "id da chave de acesso s3" e a "chave de acesso secreta s3".'
     s3_upload_bucket: "Nome do balde da Amazon S3 que contém os ficheiros carregados. AVISO: tem que ser minúsculo, sem pontos e sem sublinhados."
     s3_access_key_id: "Id da chave de acesso Amazon S3 que será usada para carregar imagens."
     s3_secret_access_key: "Chave de acesso secreta Amazon S3 que será usada para carregar imagens."
@@ -1008,7 +976,6 @@ pt:
     min_trust_to_edit_wiki_post: "O nível mínimo de confiança necessário para editar mensagens marcadas como wiki."
     min_trust_to_edit_post: "O nível mínimo de confiança necessário para editar publicações."
     min_trust_to_allow_self_wiki: "O nível mínimo de confiança necessário para o utilizador criar as suas publicações wiki."
-    min_trust_to_send_messages: "O nível de confiança mínimo necessário para criar mensagens privadas."
     newuser_max_links: "Quantas hiperligações um novo utilizador pode adicionar a uma mensagem."
     newuser_max_images: "Quantas imagens um novo utilizador pode adicionar a uma mensagem."
     newuser_max_attachments: "Quantos anexos um novo utilizador pode adicionar a uma mensagem."
@@ -1018,7 +985,6 @@ pt:
     max_users_notified_per_group_mention: "Número máximo de utilizadores que podem receber uma notificação se um grupo é mencionado (se o limite é atingido nenhuma notificação será levantada)"
     create_thumbnails: "Criar imagens miniatura e lightbox que são demasiado largas para caber numa mensagem."
     email_time_window_mins: "Esperar (n) minutos antes de enviar quaisquer emails de notificação, para dar aos utilizadores a hipótese de editarem e finalizarem as suas mensagens."
-    private_email_time_window_seconds: "Espere (n) segundos antes de enviar emails de notificação privados, para dar aos utilizadores a oportunidade de editar e finalizar as suas mensagens."
     email_posts_context: "Quantas respostas prévias a serem incluídas como contexto em emails de notificação."
     flush_timings_secs: "Com que frequência o servidor é alimentado com dados de sincronização, em segundos."
     title_max_word_length: "Tamanho máximo permitido de comprimento de palavras, em caracteres, no título de um tópico."
@@ -1069,7 +1035,6 @@ pt:
     reply_by_email_enabled: "Ativar respostas aos tópicos por email."
     reply_by_email_address: "Modelo para endereços emails recebidos com função resposta por email, por exemplo: %{reply_key}@resposta.exemplo.com ou resposta+%{reply_key}@exemplo.com"
     alternative_reply_by_email_addresses: "Lista de modelos alternativos para respostas via email. Exemplo: %{reply_key}@resposta.exemplo.com ou resposta+%{reply_key}@exemplo.com"
-    incoming_email_prefer_html: "Utilize HTML em vez de texto para o correio a receber."
     disable_emails: "Impedir que Discourse envie qualquer tipo de emails"
     strip_images_from_short_emails: "Remover imagens de emails cujo tamanho seja inferior a 2800 Bytes"
     short_email_length: "Comprimento de email curto, em Bytes"
@@ -1081,7 +1046,7 @@ pt:
     enable_staged_users: "Automaticamente criar utilizadores temporários ao processar emails recebidos."
     maximum_staged_users_per_email: "Número máximo de utilizadores temporários criados ao processar um email recebido."
     auto_generated_whitelist: "Lista de endereços de email que não serão verificados para conteúdo gerado automaticamente. Exemplo: foo@bar.com|discourse@bar.com"
-    block_auto_generated_emails: "Bloquear emails recebidos que sejam identificados como tendo sido gerados automaticamente."
+    block_auto_generated_emails: "Bloquear as mensagens a receber que sejam identificadas como tendo sido geradas automaticamente."
     ignore_by_title: "Ignorar emails recebidos com base no seu título."
     mailgun_api_key: "Chave de API secreta de Mailgun usada para verificar mensagens."
     soft_bounce_score: "Pontuação de redirecionamento adicionada ao utilizador quando um redirecionamento temporário acontece."
@@ -1152,9 +1117,9 @@ pt:
     display_name_on_posts: "Mostrar o nome completo de um utilizador nas suas mensagens em adição ao seu @nome-de-utilizador."
     show_time_gap_days: "Se duas mensagens são feitas com todos estes dias de diferença, exibir a diferença de tempo no tópico."
     short_progress_text_threshold: "Após o número de mensagens num tópico passar acima deste número, a barra de progresso irá apenas mostrar o número da mensagem atual. Se alterar a largura da barra de progresso, poderá ter que mudar este valor."
-    default_code_lang: "Linguagem de programação por defeito a aplicar no destaque da sintaxe em blocos de código GitHub (lang-auto, ruby, python, etc.)"
+    default_code_lang: "O destaque de sintaxe da linguagem de programação predefinida aplicada aos blocos de código do GitHub (lang-auto, ruby, python, etc.)"
     warn_reviving_old_topic_age: "Quando alguém começa a responder a um tópico em que a última resposta é mais antiga que estes dias, um aviso será exibido. Desativar ao configurar para 0."
-    autohighlight_all_code: "Forçar o destaque do código a todos os blocos de código pré-formatados mesmo quando não se especifica a linguagem."
+    autohighlight_all_code: "Forçar a aplicação do destaque de código para todos os blocos de código pré-formatados mesmo quando estes não especificam explicitamente a linguagem."
     highlighted_languages: "Incluídas regras de destaque da sintaxe (Aviso: incluir demasiadas linguagens pode impactar o desempenho) ver: https://highlightjs.org/static/demo/ para uma demonstração"
     embed_truncate: "Truncar mensagens incorporadas."
     allowed_href_schemes: "Esquemas permitidos nos links além de http e https."
@@ -1171,13 +1136,11 @@ pt:
     approve_post_count: "A quantidade de publicações de um novo utilizador ou utilizador básico que devem ser aprovadas"
     approve_unless_trust_level: "Mensagens para utilizadores abaixo deste nível de confiança devem ser aprovados"
     approve_new_topics_unless_trust_level: "Novos tópicos para utilizadores abaixo deste nível de confiança devem ser aprovados"
-    notify_about_queued_posts_after: "Se houver publicações a aguardar revisão após tantas horas, enviar email para `contact_email`. Configurar a 0 para desactivar."
     auto_close_messages_post_count: "Número máximo de publicações numa mensagem  antes de a fechar automáticamente (configurar a 0 para desactivar)"
     auto_close_topics_post_count: "Número máximo de publicações num tópico antes de o fechar automáticamente (configurar a 0 para desactivar)"
     code_formatting_style: "Botão de código no compositor por defeito usa este estilo de formatação"
     default_email_digest_frequency: "Por defeito, quantas frequentemente os utilizadores recebem emails de resumo."
     default_include_tl0_in_digests: "Incluir publicações de novos utilizadores nos emails de resumo por defeito. Utilizadores podem alterar isto nas suas preferências."
-    default_email_private_messages: "Por defeito, enviar um email quando alguém envia mensagens ao utilizador."
     default_email_direct: "Por defeito, enviar um email quando alguém cita/responde a/menciona ou convida o utilizador."
     default_email_mailing_list_mode: "Por defeito, enviar um email por cada nova mensagem."
     default_email_mailing_list_mode_frequency: "Utilizadores que activem o modo de lista de distribuição receberão, por omissão, emails com esta frequência."
@@ -1213,7 +1176,6 @@ pt:
     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."
     suppress_overlapping_tags_in_list: "Se as etiquetas coincidirem exactamente com palavras nos títulos dos tópicos, não mostrar as etiquetas"
     remove_muted_tags_from_latest: "Não mostrar tópicos etiquetados com etiquetas silenciadas na lista de tópicos recentes."
@@ -1264,18 +1226,18 @@ pt:
     not_seen_in_a_month: "Bem-vindo novamente! Não o vemos há algum tempo. Estes são os tópicos mais populares desde que esteve ausente."
   merge_posts:
     edit_reason:
-      one: "Uma publicação foi unida por  %{username}"
-      other: "%{count} publicações foram unidas por  %{username}"
+      one: Uma publicação foi unida por  %{username}
+      other: '%{count} publicações foram unidas por  %{username}'
     errors:
       different_topics: "Publicações pertencentes a tópicos diferentes não podem ser unidas."
       different_users: "Publicações pertencentes a utilizadores diferentes não podem ser unidas."
   move_posts:
     new_topic_moderator_post:
-      one: "Uma mensagem foi dividida em um novo tópico: %{topic_link}"
-      other: "%{count} mensagens foram divididas em um novo tópico: %{topic_link}"
+      one: 'Uma mensagem foi dividida em um novo tópico: %{topic_link}'
+      other: '%{count} mensagens foram divididas em um novo tópico: %{topic_link}'
     existing_topic_moderator_post:
-      one: "Uma mensagem foi unida em um tópico existente: %{topic_link}"
-      other: "%{count} mensagens foram unidas em um tópico existente: %{topic_link}"
+      one: 'Uma mensagem foi unida em um tópico existente: %{topic_link}'
+      other: '%{count} mensagens foram unidas em um tópico existente: %{topic_link}'
   change_owner:
     post_revision_text: "Direito de posse transferido de %{old_user} para %{new_user}"
     deleted_user: "um utilizador eliminado"
@@ -1285,29 +1247,29 @@ pt:
     closed_enabled: "Este tópico está agora fechado. Novas respostas não são aceites."
     closed_disabled: "Este tópico está agora aberto. Novas respostas serão aceites."
     autoclosed_message_max_posts:
-      one: "Esta mensagem foi automaticamente fechada após atingir o limite máximo de 1 resposta."
-      other: "Esta mensagem foi automaticamente fechada após atingir o limite máximo de %{count} respostas."
+      one: Esta mensagem foi automaticamente fechada após atingir o limite máximo de 1 resposta.
+      other: Esta mensagem foi automaticamente fechada após atingir o limite máximo de %{count} respostas.
     autoclosed_topic_max_posts:
-      one: "Este tópico foi automaticamente fechado após atingir o limite máximo de 1 resposta."
-      other: "Este tópico foi automaticamente fechado após atingir o limite máximo de %{count} respostas."
+      one: Este tópico foi automaticamente fechado após atingir o limite máximo de 1 resposta.
+      other: Este tópico foi automaticamente fechado após atingir o limite máximo de %{count} respostas.
     autoclosed_enabled_days:
-      one: "Este tópico foi automaticamente encerrado após 1 dia. Novas respostas não são permitidas."
-      other: "Este tópico foi automaticamente encerrado após %{count} dias. Novas respostas não são permitidas."
+      one: Este tópico foi automaticamente encerrado após 1 dia. Novas respostas não são permitidas.
+      other: Este tópico foi automaticamente encerrado após %{count} dias. Novas respostas não são permitidas.
     autoclosed_enabled_hours:
-      one: "Este tópico foi automaticamente encerrado após 1 hora. Novas respostas não são permitidas."
-      other: "Este tópico foi automaticamente encerrado após %{count} horas. Novas respostas não são permitidas."
+      one: Este tópico foi automaticamente encerrado após 1 hora. Novas respostas não são permitidas.
+      other: Este tópico foi automaticamente encerrado após %{count} horas. Novas respostas não são permitidas.
     autoclosed_enabled_minutes:
-      one: "Este tópico foi automaticamente fechado após 1 minuto. Novas respostas não são permitidas."
-      other: "Este tópico foi automaticamente fechado após %{count} minutos. Novas respostas não são permitidas."
+      one: Este tópico foi automaticamente fechado após 1 minuto. Novas respostas não são permitidas.
+      other: Este tópico foi automaticamente fechado após %{count} minutos. Novas respostas não são permitidas.
     autoclosed_enabled_lastpost_days:
-      one: "Este tópico foi automaticamente fechado 1 dia após a última resposta. Novas respostas não são permitidas."
-      other: "Este tópico foi automaticamente fechado %{count} dias após a última resposta. Novas respostas não são permitidas."
+      one: Este tópico foi automaticamente fechado 1 dia após a última resposta. Novas respostas não são permitidas.
+      other: Este tópico foi automaticamente fechado %{count} dias após a última resposta. Novas respostas não são permitidas.
     autoclosed_enabled_lastpost_hours:
-      one: "Este tópico foi automaticamente fechado 1 hora após a última resposta. Novas respostas não são permitidas."
-      other: "Este tópico foi automaticamente fechado %{count} horas após a última resposta. Novas respostas não são permitidas."
+      one: Este tópico foi automaticamente fechado 1 hora após a última resposta. Novas respostas não são permitidas.
+      other: Este tópico foi automaticamente fechado %{count} horas após a última resposta. Novas respostas não são permitidas.
     autoclosed_enabled_lastpost_minutes:
-      one: "Este tópico foi automaticamente fechado 1 minuto após a última resposta. Novas respostas não são permitidas."
-      other: "Este tópico foi automaticamente fechado %{count} minutos após a última resposta. Novas respostas não são permitidas."
+      one: Este tópico foi automaticamente fechado 1 minuto após a última resposta. Novas respostas não são permitidas.
+      other: Este tópico foi automaticamente fechado %{count} minutos após a última resposta. Novas respostas não são permitidas.
     autoclosed_disabled: "Este tópico está aberto agora. Novas respostas são permitidas."
     autoclosed_disabled_lastpost: "Este tópico está agora aberto. Novas respostas são permitidas."
     pinned_enabled: "Este tópico está agora fixado. Irá aparecer no topo da sua categoria até ser desafixado pelo pessoal para todas as pessoas, ou por utilizadores individuais para si próprios."
@@ -1359,8 +1321,8 @@ pt:
       max_new_accounts_per_registration_ip: "Novos registos não são permitidos a partir do seu endereço IP (limite máximo atingido).Contacte um membro do pessoal."
   flags_reminder:
     subject_template:
-      one: "1 sinalização à espera de ser tratada"
-      other: "%{count} sinalizações à espera de serem tratadas"
+      one: 1 sinalização à espera de ser tratada
+      other: '%{count} sinalizações à espera de serem tratadas'
   unsubscribe_mailer:
     subject_template: "Confirme que não quer receber emails com actualizações de %{site_title}"
   invite_password_instructions:
@@ -1371,48 +1333,6 @@ pt:
       Desculpe, esta hiperligação de transferência da cópia de segurança já foi utilizada ou expirou.
   admin_confirmation_mailer:
     subject_template: "[%{email_prefix}] Confirmar nova Conta de Administrador"
-  test_mailer:
-    text_body_template: |
-      Este é um email de teste de
-
-      [**%{base_url}**][0]
-
-      A entregabilidade de email é complicada. Aqui estão alguns pontos importantes a verificar primeiro:
-
-      - *Certifique-se* que configurou o endereço de: do `email de notificação` corretamente nas configurações do seu sítio. **O domínio especificado no endereço “de” nos emails que envia é o domínio que será validado**.
-
-      - Conhecer como observar o código fonte dos emails no seu email cliente, de modo a que possa examinar cabeçalhos de email à procura de pistas importantes. No Gmail, é a opção “mostrar original” no menu pendente no canto superior direito de cada email.
-
-      - **IMPORTANTE:** O seu ISP tem um registo de DNS inverso inserido para associar os nomes de domínio aos endereços IP de onde envia o seu email? [Teste o seu registo de PTR Inverso][2] aqui. Se o seu ISP não inserir o registo de DNS inverso apropriado, é muito improvável que qualquer um dos seus emails seja entregue.
-
-      - Estará o [registo SPF][8] do seu domínio correto? [Teste o seu registo SPF][1] aqui. Note que TXT é o tipo correcto de registo oficial para SPF.
-
-      - Estará o [registo DKIM][3] do seu domínio correto? Isto irá melhorar significativamente a entregabilidade de emails. [Teste o seu registo DKIM][7] aqui.
-
-      - Se correr o seu próprio servidor de email, certifique-se que os IPs do seu servidor de email não [estão em nenhuma lista negra de email] [4]. Verifique também que é enviado um nome de servidor qualificado que resolve o DNS na sua mensagem HELO. Se não for, isto irá fazer com que o seu email seja rejeitado por muitos serviços de email.
-
-      - Recomendamos vivamente que **envie um email de teste para [mail-tester.com][mt]** para verificar que tudo mencionado em cima está a funcionar correctamente.
-
-      (A maneira *fácil* é criar uma conta grátis em [SendGrid][sg], [SparkPost][sp], [Mailgun][mg] ou [Mailjet][mj], que têm pacotes grátis generosos de envio de emails e serão suficientes para pequenas comunidades. Mesmo assim irá precisar de configurar os registos SPF e DKIM no seu DNS!)
-
-      Esperamos que tenha recebido este teste de entregabilidade de email sem problemas!
-
-      Boa sorte,
-
-      Dos seus amigos em [Discourse](http://www.discourse.org)
-
-      [0]: %{base_url}
-      [1]: http://www.kitterman.com/spf/validate.html
-      [2]: http://mxtoolbox.com/ReverseLookup.aspx
-      [3]: http://www.dkim.org/
-      [4]: http://whatismyipaddress.com/blacklist-check
-      [7]: http://dkimcore.org/tools/dkimrecordcheck.html
-      [8]: http://www.openspf.org/SPF_Record_Syntax
-      [sg]: https://sendgrid.com/
-      [sp]: https://www.sparkpost.com/
-      [mg]: http://www.mailgun.com/
-      [mj]: https://www.mailjet.com/pricing
-      [mt]: http://www.mail-tester.com/
   new_version_mailer:
     subject_template: "[%{email_prefix}] Nova versão do Discourse, disponível atualização"
   new_version_mailer_with_notes:
@@ -1507,7 +1427,6 @@ pt:
       subject_template: "Convite de utilizadores em massa processado com erros"
     csv_export_succeeded:
       title: "Exportação de CSV bem-sucedida"
-      subject_template: "Exportação de dados completa"
     csv_export_failed:
       title: "Exportação de CSV falhou"
       subject_template: "A exportação dos dados falhou"
@@ -1561,8 +1480,8 @@ pt:
       subject_template: "Nova conta suspensa"
     pending_users_reminder:
       subject_template:
-        one: "1 utilizador espera a aprovação"
-        other: "%{count} utilizadores esperam a aprovação"
+        one: 1 utilizador espera a aprovação
+        other: '%{count} utilizadores esperam a aprovação'
       text_body_template: |
         Há registos de novos utilizadores à espera de serem aprovados (ou rejeitados) antes de poderem aceder a este fórum.
 
@@ -1705,7 +1624,7 @@ pt:
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
-        %{message}
+          %{message}
     digest:
       why: "Um breve sumário de %{site_link} desde a sua última visita em %{last_seen_at}"
       since_last_visit: "Desde a sua última visita"
@@ -1793,140 +1712,6 @@ pt:
     title: "FAQ/Orientações"
   tos_topic:
     title: "Termos de Serviço"
-    body: |
-      Os seguintes termos e condições governam todo o uso do sítio %{company_domain} e todo o conteúdo, serviços e produtos disponíveis no ou através do sítio, incluindo mas não limitado a, Software do Fórum de %{company_domain}, Fóruns de Suporte de %{company_domain} e serviço de alojamento de %{company_domain} ("Alojamento"), (em conjunto, o Sítio). O Sítio é propriedade e operado por %{company_full_name} ("%{company_name}"). O Sítio oferecido está sujeito à sua aprovação sem nenhuma modificação de todos os termos e condições contidos aqui e todas as outras regras de operação políticas (incluindo, sem limitação, a [Política de Privacidade](/privacy) e [Orientações da Comunidade](/faq) de %{company_domain}) e procedimentos que possam ser publicados esporadicamente neste Sítio por %{company_name} (coletivamente, o "Acordo").
-
-      Por favor leia este Acordo com cuidado antes de aceder ou usar o Sítio. Ao aceder ou usar qualquer parte do Sítio, concorda em estar limitado pelos termos e condições deste acordo. Se não concorda com todos os termos e condições deste acordo, então não deve aceder ao Sítio ou usar qualquer um dos serviços. Se estes termos e condições são considerados uma oferta de %{company_name}, a sua aceitação é expressamente limitada a estes termos. O Sítio está disponível apenas a indíviduos que têm pelo menos 13 anos de idade.
-
-      <a name="1"></a>
-
-      ## [1. A Sua Conta em %{company_domain}](#1)
-
-      Se criar uma conta no Sítio, será responsável por manter a segurança da sua conta e será totalmente responsável por todas as atividades que ocorrerem sob a sua conta. Deve notificar imediatamente %{company_name} de qualquer uso não autorizado da sua conta ou qualquer outra falha de segurança. %{company_name} não será passível de quaisquer atos ou omissões da sua parte, incluindo danos de qualquer tipo que incorram como resultado de tais atos ou omissões.
-
-      <a name="2"></a>
-
-      ## [2.Responsabilidade dos Participantes](#2)
-
-      Se publicar material no Sítio, publicar ligações no Sítio, ou de outra maneira disponibilizar (ou permitir que qualquer terceiro o faça) material disponível por meios do Sítio (qualquer material, “Conteúdo”), será inteiramente responsável pelo conteúdo de, e qualquer dano resultante de, tal Conteúdo. Esse é o caso independentemente de o Conteúdo em questão constituir texto, gráficos, ficheiros áudio, ou programas de computador. Ao tornar o Conteúdo disponível, está a representar e garantir que:
-
-      *   o descarregamento, cópia e uso do Conteúdo não irá infringir os direitos do proprietário, incluindo mas não limitado aos direitos de autor, patentes, marcas registadas ou direitos de segredos de troca, de qualquer terceiro;
-      *   se o seu empregado tem direitos sob a propriedade intelectual que criou, terá que (i) ou ter recebido permissões do seu empregado para publicar ou tornar o Conteúdo disponível, incluindo mas não limitado a qualquer software, ou (ii) ter garantido uma renúncia do seu empregador a todos os direitos no e ao Conteúdo;
-      *   está de acordo com licenças de qualquer terceiro relacionado com o Conteúdo, e fez tudo o necessário para passar corretamente quaisquer termos requeridos aos utilizadores finais;
-      *   o Conteúdo não contém ou instala quaisquer vírus, minhocas ou malware, cavalos de Tróia ou outro conteúdo nocivo ou destrutivo;
-      *   o Conteúdo não é spam, não é gerado por máquinas ou aleatóriamente gerado, e não contém conteúdo indesejado sem ética ou comercial com intuito de conduzir o tráfico de sítios terceiros ou aumentar a posição de sítios terceiros em motores de pesquisa, ou ainda outros atos ilegais (tais como phishing) ou destinatários enganadores relativamente à origem do material (tais como spoofing);
-      *   o Conteúdo não é pornográfico, nem contém ameaças ou incita à violência, e não viola os direitos de privacidade ou publicidade de qualquer terceiro;
-      *   o conteúdo não está a ser anunciado através de quaisquer mensagens eletrónicas indesejadas tais como ligações de spam em grupos de notícias, listas de email, blogs e sítios, e similares métodos promocionais não solicitados;
-      *   o seu conteúdo não está nomeado de nenhuma maneira que leve os seus leitores a pensarem que é outra pessoa ou empresa; e
-      *   terá, no caso do Conteúdo incluir código de computador, categorizado e/ou descrito o tipo, natureza, uso e efeito dos materiais, quer tenha sido pedido para fazê-lo por %{company_name} ou não.
-
-      <a name="3"></a>
-
-      ## [3. Licença do Conteúdo do Utilizador](#3)
-
-      As contribuições dos utilizadores estão licenciadas sob a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Sem qualquer limitação de qualquer dessas representações ou garantias, %{company_name} tem o direito (embora não tenha a obrigação) de, em critério exclusivo de %{company_name} (i) recusar ou remover qualquer conteúdo que, na sensata opinião de %{company_name} viola qualquer política de %{company_name} ou é de alguma maneira prejudicial ou questionável, ou (ii) terminar ou negar acesso ao Sítio e ao uso do mesmo a qualquer indivíduo ou entidade por qualquer razão, em critério exclusivo de %{company_name}. %{company_name} não terá obrigação de fornecer reembolsos de quaisquer montantes previamente pagos.
-
-      <a name="4"></a>
-
-      ## [4. Pagamento e Renovação](#4)
-
-      ### Termos Gerais
-
-      Atualizações ou serviços opcionais pagos poderão estar disponíveis no Sítio. Ao utilizar uma atualização ou serviço opcional pago, está a concordar em pagar a %{company_name} as taxas de subscrição mensais ou anuais indicadas. Os pagamentos serão cobrados numa base pré-paga no dia em que começa a utilizar o serviço ou a atualização e irá cobrir o uso desse serviço ou atualização por um período de subscrição mensal ou anual tal como indicado. Estas taxas não são reembolsáveis.
-
-      ### Renovação Automática
-
-      A não ser que notifique %{company_name} antes do final do período da subscrição que quer cancelar, a sua subscrição será automaticamente renovada e você autoriza-nos a colecionar as taxas anuais ou mensais (assim como outras taxas) usando qualquer cartão de crédito ou outro mecanismo de pagamento que tivermos no seu registo. As subscrições podem ser canceladas em qualquer altura.
-
-      <a name="5"></a>
-
-      ## [5. Serviços](#5)
-
-      ### Serviços de Alojamento, Suporte
-
-      Serviços opcionais de Alojamento e Suporte podem ser fornecidos por %{company_name} sob os termos e condições para cada serviço. Ao inscrever-se numa conta com serviços de Alojamento ou Suporte, irá concordar e agir sob tais termos e condições.
-
-      <a name="6"></a>
-
-      ## [6. Responsabilidade dos Visitantes do Sítio](#6)
-
-      %{company_name} não reviu, nem pode rever, todo o material, incluindo programas de computador, publicado no Sítio, e não pode portanto ser responsável pelo conteúdo do mesmo, pelo seu uso ou efeitos. Ao operar o Sítio, %{company_name} não representa ou implica que corrobora com o material publicado, ou que acredita que o material seja preciso, útil e não prejudicial. Será responsável por tomar as precauções necessárias para proteger-se a si próprio e o seu sistema computacional de vírus, minhocas, cavalos de Tróia e outros conteúdos nocivos ou destrutivos. O Sítio pode ter conteúdo ofensivo, indecente, ou questionável de outra maneira, assim como também imprecisões técnicas, erros tipográficos, e outros erros. O Sítio pode também ter material que viola os direitos de privacidade e publicidade, ou que infringe a propriedade intelectual e outros direitos do proprietário, de terceiros, ou o descarregamento, cópia ou uso que é sujeito a termos e condições adicionais, estabelecidos ou não. %{company_name} está isenta de qualquer responsabilidade de qualquer dano resultante do uso por parte dos visitantes do Sítio, ou de qualquer descarregamento feito por esses visitantes do conteúdo lá publicado.
-
-      <a name="7"></a>
-
-      ## [7. Conteúdo Publicado Noutros Sítios](#7)
-
-      Não revimos nem podemos rever todo o material, incluindo programas de computador, disponibilizado através de sítios e páginas em %{company_domain} no qual existem ligações e que se ligam a %{company_domain}. %{company_name} não tem qualquer controlo dos sítios e páginas não-%{company_domain}, e não é responsável pelo seu conteúdo ou o seu uso. Ao clicar num sítio ou página não-%{company_domain}, %{company_name} não representa ou implica que corrobora com tais sítios ou páginas. Você é responsável por tomar ações necessárias para proteger-se a si próprio ou o seu sistema computacional de vírus, minhocas, cavalos de Tróia e outros conteúdos nocivos ou destrutivos. %{company_name} renuncia qualquer responsabilidade por qualquer dano resultante do uso de sítios e páginas não-%{company_domain}.
-
-      <a name="8"></a>
-
-      ## [8. Violação de Direitos de Autor e Política DCMA](#8)
-
-      Assim como %{company_name} pede aos outros para respeitarem os direitos de propriedade intelectual, a mesma respeita os direitos de propriedade intelectual dos outros. Se acredita que material localizado em ou com ligação por %{company_domain} viola os seus direitos de autor, e se este sítio reside nos EUA, encorajamo-lo a notificar a %{company_name} em concordância com a Política (“DMCA”) [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) da %{company_name}. %{company_name} irá responder a todos tais avisos, incluindo, tal como requerido ou apropriado, por remover o material ilícito ou desativando as ligações para o material ilícito. %{company_name} irá terminar o acesso a e o uso do Sítio por um visitante se, sob circunstâncias apropriadas, o visitante é determinado como sendo um infrator reincidente dos direitos de autor e de outros direitos de propriedade intelectual de %{company_name} ou outros. No caso de tal terminação, %{company_name} não terá qualquer obrigação de fornecer um reembolso de quaisquer valores previamente pagos a %{company_name}.
-
-      <a name="9"></a>
-
-      ## [9. Propriedade Intelectual](#9)
-
-      Este Acordo não transfere de %{company_name} para si qualquer propriedade intelectual de %{company_name} ou de terceiros, e todos os direitos, títulos e interesse na e à propriedade irão permanecer (como entre as partes) apenas com %{company_name}. %{company_name}, %{company_domain}, o logótipo %{company_domain} e todos as outras marcas, marcas de serviço, gráficos, logótipos usados na ligação com %{company_domain}, ou o Sítio é marca registada de %{company_name} ou licenciadores de %{company_name}. Outras marcas, marcas de serviço, gráficos e logótipos usados em conexão com o Sítio podem ser marcas de terceiros. O seu uso do Sítio não lhe concede direitos ou licença para reproduzir ou de outra forma usar quaisquer marcas de %{company_name} ou de terceiros.
-
-      <a name="10"></a>
-
-      ## [10. Anúncios](#10)
-
-      %{company_name} reserva-se ao direito de mostrar anúncios no seu conteúdo a não ser que tenha comprado a Atualização Ad-free ou uma conta de Serviços.
-
-      <a name="11"></a>
-
-      ## [11. Atribuição](#11)
-
-      %{company_name} reserva-se ao direito de mostrar ligações de atribuição tais como ‘Suportado por %{company_domain},’ autor do tema, e atribuição das fontes tipográficas ao conteúdo do rodapé ou da sua ferramenta. Os créditos do rodapé e a ferramenta de %{company_domain} não poderão ser removidas independentemente das atualizações compradas.
-
-      <a name="12"></a>
-
-      ## [12. Alterações](#12)
-
-      %{company_name} reserva-se ao direito, por critério exclusivo, de modificar ou substituir qualquer parte deste Acordo. É sua responsabilidade verificar periodicamente o Acordo e verificar as suas alterações. O seu uso ou acesso contínuo ao Sítio seguido da publicação de qualquer alteração a este Acordo constitui aceitação a essas mudanças. %{company_name} pode também, no futuro, oferecer novos serviços e/ou funcionalidades através do Sítio (incluindo, o lançamento de novas ferramentas e recursos). Estas novas funcionalidades e/ou serviços serão sujeitos aos termos e condições deste Acordo.
-
-      <a name="13"></a>
-
-      ## [13. Terminação](#13)
-
-      %{company_name} pode terminar o seu acesso a todas ou alguma parte do Sítio em qualquer altura, com ou sem motivo, com ou sem aviso, com efeitos imediatos. Se desejar terminar este Acordo ou a sua conta %{company_domain} (se tiver uma), pode simplesmente deixar de usar o Sítio. Todas as provisões para este Acordo que pela sua natureza deverão sobreviver à terminação sobreviverão à sua terminação, incluindo, sem limitações, provisões de propriedade, isenções de garantia, indemnizações e limitações de responsabilidade.
-
-      <a name="14"></a>
-
-      ## [14. Isenção de Garantias](#14)
-
-      O Sítio é fornecido “tal como está”. %{company_name} e os seus fornecedores e licenciadores ficam aqui isentos de garantias de qualquer tipo, expressas ou implícitas, sem limitação, as garantias de comerciabilidade, adequabilidade a uma finalidade específica e não-infrigimento. Nem %{company_name} nem os seus fornecedores e licenciadores, garantem que o Sítio está livre de erros ou que o acesso seja contínuo e ininterrupto. Se está realmente a ler isto, aqui está [um presente] (http://www.newyorker.com/humor/daily-shouts/the-hundred-best-lists-of-all-time). Compreende que descarregou de, ou de outra maneira obteve conteúdo ou serviços através do Sítio a seu próprio risco e descrição.
-
-      <a name="15"></a>
-
-      ## [15. Limitação da Responsabilidade](#15)
-
-      Em nenhum evento %{company_name} ou os seus fornecedores ou licenciadores, serão responsáveis em respeito a qualquer assunto deste acordo sob qualquer contrato, negligência, estrita responsabilidade ou outras teorias legais para: (i) quaisquer danos especiais, incidentes ou consequenciais; (ii) o custo de procura de produtos ou serviços substitutos; (iii) por interrupção do uso, perda ou corrupção dos dados; ou (iv) por quaisquer valores que excedem as taxas pagas por si a %{company_name} sob este acordo durante um período de doze (12) meses anterior à causa da ação. %{company_name} não deverá ter qualquer responsabilidade por qualquer falha ou atraso devido a assuntos para além do seu controlo razoável. O disposto neste artigo não se aplica nas medidas proibidas pela lei aplicável.
-
-      <a name="16"></a>
-
-      ## [16. Representações Gerais e Garantia](#16)
-
-      Representa e garante que (i) o seu uso do Sítio irá estar em estrita concordância com a [Política de Privacidade](/privacy) e das [Orientações da Comunidade](/guidelines) da %{company_name}, com este Acordo e com as leis e regulações aplicáveis (incluindo sem limitação de quaisquer leis ou regulações locais no seu país, estado, cidade ou outras áreas governamentais, relativamente à conduta online e ao conteúdo aceitável, e incluindo quaisquer leis aplicáveis relativamente à transmissão de dados técnicos exportados do país em que o sítio reside ou do país em que você reside) e (ii) o seu uso do Sítio não irá infringir os direitos de propriedade intelectual de qualquer terceiro.
-
-      <a name="17"></a>
-
-      ## [17. Indemnização](#17)
-
-      Concorda em indemnizar e não prejudicar %{company_name}, os seus contratados, e os seus licenciadores, os seus respetivos diretores, empregados e agentes de e contra quaisquer reivindicações e despesas, incluindo taxas de advogados, decorrentes do seu uso do Sítio, incluindo mas não limitado à sua violação deste Acordo.
-
-      <a name="18"></a>
-
-      ## [18. Diversos](#18)
-
-      Este Acordo constitui o acordo integral entre si e %{company_name} em relação ao assunto em questão, e poderá ser modificado apenas por uma emenda escrita assinada por um executivo autorizado da %{company_name}, ou pela publicação por parte da %{company_name} de uma versão revista. Excepto se existirem disposições opostas na leis aplicáveis, o presente Acordo, qualquer acesso ou uso do sítio será governado pelas leis do estado da Califórnia, E.U.A, excluindo os conflitos das disposições da lei, e a local próprio para qualquer disputa emergente de ou relativa a qualquer do mesmo será o tribunal federal e estatal localizado em São Francisco, Califórnia. Exceto para os pedidos de medida cautelar ou equitativa ou reclamações relativas aos direitos de propriedade intelectual (que podem ser introduzidos em qualquer tribunal competente, sem a prestação de uma caução), qualquer litígio decorrente do presente acordo será resolvido de acordo com as Regras de Arbitragem de "Judicial Arbitration and Mediation Service, Inc.” (“JAMS”) por três árbitros apontados em concordância com tais Regras. A arbitragem deverá ter lugar em São Francisco, Califórnia, em língua Inglesa e a decisão arbitral pode ser feita em qualquer tribunal. A parte prevalecente em qualquer ação ou processo para executar este Acordo terá direito a custos e honorários dos advogados. Se qualquer parte deste Acordo for considerada inválida ou inexequível, essa parte será interpretada de forma a refletir a intenção original das partes e as porções restantes permanecerão em pleno vigor e efeito. A renúncia por qualquer das partes de qualquer termo ou condição deste Acordo ou qualquer violação dos mesmos, em qualquer instância, não renuncia tal termo ou condição ou qualquer violação subsequente. Pode atribuir os seus direitos sob este acordo a qualquer parte que consente a, e concorda em ficar vinculado por, os seus termos e condições; %{company_name} pode atribuir os seus direitos sob este Acordo sem condição. O presente Acordo será vinculativo e reverterá em benefício das partes, dos seus sucessores e signatários autorizados.
-
-      Este documento é CC-BY-SA. Foi atualizado pela última vez em 31 de Maio de 2013.
-
-      Originalmente adaptado de [Termos de Serviço WordPress](http://en.wordpress.com/tos/).
   privacy_topic:
     title: "Política de Privacidade"
     body: |
@@ -2019,22 +1804,22 @@ pt:
         Este distintivo é concedido pela primeira vez que edita uma das suas publicações. Apesar de não ser possível editar as suas publicações após um tempo limite, editar é sempre uma boa ideia - pode melhorar as suas publicações, corrigir pequenos erros, ou acrescentar algo que tenha esquecido quando criou a sua publicação. Edite para tornar as suas publicações ainda melhores!
     basic_user:
       name: Básico
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Atribuídas</a> todas as funções comunitárias essenciais
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">Atribuídas</a> todas as funções comunitárias essenciais"
       long_description: |
         Este distintivo é concedido quando atinge o nível de confiança 1. Obrigado por ficar por cá durante algum tempo e por ler alguns tópicos para aprender do que trata a nossa comunidade. As suas restrições de novo utilizador foram removidas, e foram-lhe atribuídas habilidades essenciais da comunidade, tais como mensagens pessoais, denúncias, edição de wikis, e a habilidade de publicar múltiplas imagens e ligações.
     member:
       name: Membro
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Concedido</a> convites, mensagens de grupo, mais gostos
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">Concedido</a> convites, mensagens de grupo, mais gostos"
       long_description: |
         Este distintivo é concedido quando atinge o nível de confiança 2. Obrigado por participar durante um período de semanas para se juntar à nossa comunidade. Agora pode enviar convites pessoais da sua página de utilizador ou tópicos individuais, criar mensagens de grupo, e mais alguns gostos por dia!
     regular:
       name: Regular
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Concedido</a> re-categorização, renomeação, wiki, ligações seguidas, mais gostos
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">Concedido</a> re-categorização, renomeação, wiki, ligações seguidas, mais gostos"
       long_description: |
         Este distintivo é concedido quando atingir o nível de confiança 3. Obrigado por ser uma parte regular da nossa comunidade por um período de meses. É de momento um dos leitores mais activos, que contribui regularmente para tornar esta comunidade excelente. Agora pode re-categorizar e renomear tópicos, aceder à área privada do salão, tomar partido de denúncias de spam mais poderosas, e muitos mais gostos por dia.
     leader:
       name: Líder
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Concedido</a> edição global, afixar, fechar, arquivar, separar e unir, mais gostos
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">Concedido</a> edição global, afixar, fechar, arquivar, separar e unir, mais gostos"
       long_description: |
         Este distintivo é concedido quando atinge o nível de confiança 4. É um líder nesta comunidade, como tal seleccionado pela equipa de apoio, e define um exemplo positivo para a comunidade nos seus actos e palavras. Tem a habilidade de editar todas as publicações, realizar acções de moderador de tópicos comuns tais como afixar, fechar, arquivar, separar e unir, e toneladas de gostos por dia.
     welcome:
@@ -2046,7 +1831,7 @@ pt:
       name: Autobiógrafo
     anniversary:
       name: Aniversário
-      description: Membro ativo há um ano, publicou pelo menos uma vez
+      description: "Membro ativo há um ano, publicou pelo menos uma vez"
       long_description: |
         Este distintivo é concedido quando tiver sido membro por um ano com pelo menos uma mensagem nesse ano. Obrigado por ficar por cá e por contribuir para a nossa comunidade. Não o podíamos fazer sem você.
     nice_post:
@@ -2108,8 +1893,6 @@ pt:
     promoter:
       name: Promotor
       description: Convidou um utilizador
-      long_description: |
-        Este distintivo é concedido quando convida alguém para se juntar à comunidade através do botão de convidar na sua página de utilizador, ou no fim de um tópico. Convidar amigos que possam estar interessados em discussões específicas é uma boa maneira de apresentar a comunidade a novas pessoas, por isso, obrigado!
     campaigner:
       name: Ativista
       description: Convidou 3 utilizadores básicos
@@ -2205,22 +1988,19 @@ pt:
     first_emoji:
       name: Primeiro Emoji
       description: Usou um Emoji numa Publicação
-      long_description: |
-        Este distintivo é concedido quando pela primeira vez adiciona um Emoji à sua publicação :thumbsup:. Emoji deixam-no exprimir emoção  nas suas publicações, de felicidade :smiley: a tristeza :anguished: a raiva :angry: e tudo entre estes :sunglasses: . Escreva simplesmente : (dois pontos) ou prima o botão de Emoji na barra de ferramentas no editor para escolher um de entre centenas de escolhas :ok_hand:
     first_mention:
       name: Primeira Menção
-      long_description: Este distintivo é concedido pela primeira vez que menciona o @nome-de-utilizador de alguém numa publicação sua. Cada menção gera uma notificação para o mencionado, de maneira a que saibam da sua publicação. Simplesmente comece por escrever @ (símbolo arroba) para mencionar qualquer utilizador, ou, se permitido, um grupo – é uma maneira conveniente de chamar a atenção de alguém.
+      long_description: "Este distintivo é concedido pela primeira vez que menciona o @nome-de-utilizador de alguém numa publicação sua. Cada menção gera uma notificação para o mencionado, de maneira a que saibam da sua publicação. Simplesmente comece por escrever @ (símbolo arroba) para mencionar qualquer utilizador, ou, se permitido, um grupo – é uma maneira conveniente de chamar a atenção de alguém."
     first_onebox:
       name: Primeira Pré-visualização
       description: Publicou uma ligação que foi pré-visualizada
-      long_description: Este distintivo é concedido pela primeira vez que publica uma ligação numa linha por si próprio, que foi então automaticamente expandido numa pré-visualização com um breve sumário da ligação, um titulo, e (quando disponível) uma imagem.
+      long_description: "Este distintivo é concedido pela primeira vez que publica uma ligação numa linha por si próprio, que foi então automaticamente expandido numa pré-visualização com um breve sumário da ligação, um titulo, e (quando disponível) uma imagem."
     first_reply_by_email:
       name: Primeira Resposta por Email
       long_description: |
         Este distintivo é concedido pela primeira vez que responde a uma publicação por email :e-mail:.
   admin_login:
     success: "Email Enviado"
-    error: "Erro!"
     email_input: "Email Administração"
     submit_button: "Enviar Email"
   performance_report:
@@ -2355,6 +2135,3 @@ pt:
         description: |
           <p>Se alguma vez quiser mudar estas configurações, visite <a href='/admin' target='_blank'>a sua secção de administração</a>; encontre-a junto ao ícone de chave inglesa no menu do sítio.</p>
           <p>Divirta-se, e boa sorte <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>para a construção da sua comunidade!</a></p>
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index f855ee931f2..b8b7b423a65 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -8,7 +8,7 @@
 pt_BR:
   dates:
     short_date_no_year: "D MMM"
-    short_date: "D MMM, AAAA"
+    short_date: "D MMM, YYYY"
     long_date: "D de MMMM de YYYY h:mma"
   datetime_formats: &datetime_formats
     formats:
@@ -17,12 +17,12 @@ pt_BR:
       date_only: "%b %-d, %Y"
       long: "%B %-d, %Y, %l:%M%P"
   date:
-    month_names: [null, Janeiro, Fevereiro, Março, Abril, Maio, Junho, Julho, Agosto, Setembro, Outubro, Novembro, Dezembro]
+    month_names: [~, Janeiro, Fevereiro, Março, Abril, Maio, Junho, Julho, Agosto, Setembro, Outubro, Novembro, Dezembro]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "am"
     pm: "pm"
-    <<: *datetime_formats
   title: "Discourse"
   topics: "Tópicos"
   posts: "mensagens"
@@ -65,19 +65,18 @@ pt_BR:
       present: deve estar em branco
       confirmation: "não combina com %{attribute}"
       empty: não pode estar vazio
-      equal_to: deve ser igual a %{count}
+      equal_to: "deve ser igual a %{count}"
       even: precisa ser par
       exclusion: está reservado
-      greater_than: precisar ser maior que %{count}
-      greater_than_or_equal_to: precisa ser maior ou igual à %{count}
+      greater_than: "precisar ser maior que %{count}"
+      greater_than_or_equal_to: "precisa ser maior ou igual à %{count}"
       has_already_been_used: "já está sendo usado"
       inclusion: não está incluído na lista
       invalid: é inválido
       is_invalid: "parece pouco claro; é uma frase completa?"
       contains_censored_words: "contém as seguintes palavras censuradas: %{censored_words}"
-      matches_censored_pattern: "contém as seguintes palavras que se encaixam nos padrões de expressões regulares censuradas do site: %{censored_words}"
-      less_than: precisa ser menor que %{count}
-      less_than_or_equal_to: deve ser menor ou igual à %{count}
+      less_than: "precisa ser menor que %{count}"
+      less_than_or_equal_to: "deve ser menor ou igual à %{count}"
       not_a_number: não é um número
       not_an_integer: deve ser um inteiro
       odd: deve ser ímpar
@@ -109,6 +108,9 @@ pt_BR:
       max_username_length_range: "Você não pode definir o máximo abaixo no mínimo."
       default_categories_already_selected: "Você não pode selecionar uma categoria usada noutra lista."
       s3_upload_bucket_is_required: "Você não pode habilitar uploads para o S3 a não ser que tenha provido o 's3_upload_bucket'."
+  activemodel:
+    errors:
+      <<: *errors
   invite:
     not_found: "O token do seu convite é inválido. Por favor entre em contato com o administrador do site."
   bulk_invite:
@@ -128,42 +130,42 @@ pt_BR:
   reading_time: "Tempo de leitura"
   likes: "Curtidas"
   too_many_replies:
-    one: "Lamentamos, mas usuários novos estão temporariamente limitados a 1 resposta no mesmo tópico."
-    other: "Lamentamos, mas usuários novos estão temporariamente limitados a %{count} respostas no mesmo tópico."
+    one: Lamentamos, mas usuários novos estão temporariamente limitados a 1 resposta no mesmo tópico.
+    other: Lamentamos, mas usuários novos estão temporariamente limitados a %{count} respostas no mesmo tópico.
   embed:
     start_discussion: "Começar Discussão"
     continue: "Continuar Discussão"
     error: "Erro na Incorporação"
     more_replies:
-      one: "1 resposta a mais"
-      other: "%{count} respostas a mais"
+      one: 1 resposta a mais
+      other: '%{count} respostas a mais'
     loading: "Carregando Discussão..."
     permalink: "Permalink"
     imported_from: "Este é um tópico de discussão companheiro para a mensagem original em %{link}"
     in_reply_to: "▶ %{username}"
     replies:
-      one: "1 resposta"
-      other: "%{count} respostas"
+      one: 1 resposta
+      other: '%{count} respostas'
   no_mentions_allowed: "Desculpe, você não pode mencionar outros usuários."
   too_many_mentions:
-    one: "Desculpe, você pode mencionar apenas %{count} usuário em um post."
-    other: "Desculpe, você pode mencionar apenas %{count} usuários em uma mensagem."
+    one: Desculpe, você pode mencionar apenas %{count} usuário em um post.
+    other: Desculpe, você pode mencionar apenas %{count} usuários em uma mensagem.
   no_mentions_allowed_newuser: "Desculpe, usuários novos não podem mencionar outros usuários."
   too_many_mentions_newuser:
-    one: "Desculpe, usuários novos podem mencionar apenas um usuário em uma mensagem."
-    other: "Desculpe, usuários novos podem mencionar apenas %{count} usuários em uma mensagem."
+    one: Desculpe, usuários novos podem mencionar apenas um usuário em uma mensagem.
+    other: Desculpe, usuários novos podem mencionar apenas %{count} usuários em uma mensagem.
   no_images_allowed: "Desculpe, usuários novos não podem colocar imagens nas mensagens."
   too_many_images:
-    one: "Desculpe, usuários novos podem colocar apenas %{count} imagem nas postagens."
-    other: "Desculpe, usuários novos podem colocar apenas %{count} imagens nas mensagens."
+    one: Desculpe, usuários novos podem colocar apenas %{count} imagem nas postagens.
+    other: Desculpe, usuários novos podem colocar apenas %{count} imagens nas mensagens.
   no_attachments_allowed: "Desculpe, novos usuários não podem colocar anexos nas mensagens."
   too_many_attachments:
-    one: "Desculpe, novos usuários podem colocar apenas %{count} anexo nas suas postagens."
-    other: "Desculpe, novos usuários podem colocar apenas %{count} anexos nas suas mensagens."
+    one: Desculpe, novos usuários podem colocar apenas %{count} anexo nas suas postagens.
+    other: Desculpe, novos usuários podem colocar apenas %{count} anexos nas suas mensagens.
   no_links_allowed: "Desculpe, usuários novos não podem colocar links nas postagens."
   too_many_links:
-    one: "Desculpe, usuários novos podem colocar apenas %{count} link nas postagens."
-    other: "Desculpe, usuários novos podem colocar apenas %{count} links nas postagens."
+    one: Desculpe, usuários novos podem colocar apenas %{count} link nas postagens.
+    other: Desculpe, usuários novos podem colocar apenas %{count} links nas postagens.
   spamming_host: "Desculpe, você não pode colocar um link para este site."
   user_is_suspended: "Usuários suspensos não tem permissão para postar."
   topic_not_found: "Ocorreu um erro. Talvez este tópico foi fechado ou removido enquanto você estava visualizando?"
@@ -188,7 +190,6 @@ pt_BR:
     hot: "Tópicos quentes"
     top: "Principais tópicos"
     posts: "Últimos tópicos"
-    private_posts: "Últimas mensagens privadas"
     group_posts: "Últimos posts de %{group_name}"
     group_mentions: "Últimas citações de %{group_name}"
     user_posts: "Últimos posts por @%{username}"
@@ -202,7 +203,6 @@ pt_BR:
   groups:
     errors:
       can_not_modify_automatic: "Você não pode modificar um grupo automático"
-      member_already_exist: "'%{username}' já é um membro deste grupo."
       invalid_domain: "'%{domain}' não é um domínio válido."
       invalid_incoming_email: "'%{email}' não é um endereço de e-mail válido."
       email_already_used_in_group: "'%{email}' já é utilizado pelo grupo '%{group_name}'."
@@ -219,9 +219,9 @@ pt_BR:
       trust_level_4: "nivel_de_confianca_4"
   education:
     until_posts:
-      one: "1 mensagem"
-      other: "%{count} mensagens"
-    new-topic: |
+      one: 1 mensagem
+      other: '%{count} mensagens'
+    'new-topic': |
       Bem vindo ao %{site_name} &mdash; **obrigado por iniciar uma nova conversa!**
 
       - O título parece interessante se você ler em voz alta? É um bom resumo?
@@ -231,7 +231,7 @@ pt_BR:
       - Incluir palavras geralmente usadas no seu tópico para que outros possam *encontrar*. Para agrupar seu tópico com outros relacionados, selecione uma categoria.
 
       Para mais, [veja os guias da comunidade](/guidelines). Este painel só irá aparecer para seu primeiro %{education_posts_text}.
-    new-reply: |
+    'new-reply': |
       Bem-vindo ao %{site_name} &mdash; **obrigado por contribuir!**
 
       - Sua resposta melhora a conversa de alguma forma?
@@ -269,12 +269,6 @@ pt_BR:
       Sentimos muito, mas novos usuários são temporariamente limitados a %{newuser_max_replies_per_topic} respostas no mesmo tópico.
 
       Em vez de adicionar outra resposta, por favor considere editar suas respostas anteriores, ou visite outros tópicos.
-    reviving_old_topic: |
-      ### Reviver este tópico?
-
-      A última resposta deste tópico foi feita há **%{days}** dias atrás. Sua resposta jogará o tópico para o topo da sua lista e notificará as pessoas que foram envolvidas na conversa.
-
-      Tem certeza que deseja continuar essa velha conversa?
   activerecord:
     attributes:
       category:
@@ -287,13 +281,12 @@ pt_BR:
       user_profile:
         bio_raw: "Sobre Mim"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Você só pode anexar avisos em mensagens privadas."
               too_many_users: "Você só pode enviar avisos para um usuário de cada vez."
-              cant_send_pm: "Desculpe, você não pode enviar uma mensagem privada para este usuário."
               no_user_selected: "Você deve escolher um usuário válido."
             featured_link:
               invalid: "é inválida. A URL deve conter http:// ou https://."
@@ -323,7 +316,6 @@ pt_BR:
           attributes:
             word:
               too_many: "Muitas palavras para esta ação"
-      <<: *errors
   user_profile:
     no_info_other: "<div class='missing-profile'>%{name} ainda não colocou nada no campo Sobre Mim</div>"
   vip_category_name: "Salão"
@@ -336,41 +328,41 @@ pt_BR:
     title: "Bem vindo ao Discourse"
     body: |2
 
-      O primeiro parágrafo deste tópico fixo será visto como uma mensagem de boas vindas a todos os novos visitantes em sua página inicial. É muito importante!
+        O primeiro parágrafo deste tópico fixo será visto como uma mensagem de boas vindas a todos os novos visitantes em sua página inicial. É muito importante!
 
-      **Edite isso** em uma breve descrição da sua comunidade:
+        **Edite isso** em uma breve descrição da sua comunidade:
 
-      - Para quem ela é?
-      - O que será encontrado aqui?
-      - Porque as pessoas deveria vir aqui?
-      - Onde é possível saber mais a respeito (links, fontes, etc)?
+        - Para quem ela é?
+        - O que será encontrado aqui?
+        - Porque as pessoas deveria vir aqui?
+        - Onde é possível saber mais a respeito (links, fontes, etc)?
 
-      <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+        <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
 
-      Você pode querer fechar este tópico através do Administrador :wrench: (na parte superior direita e inferior), para que não se acumulem respostas num tópico de boas vindas.
+        Você pode querer fechar este tópico através do Administrador :wrench: (na parte superior direita e inferior), para que não se acumulem respostas num tópico de boas vindas.
   lounge_welcome:
     title: "Bem-vindo ao Salão"
     body: |2
 
-      Parabéns! :confetti_ball:
+        Parabéns! :confetti_ball:
 
-      Se você pode ver neste tópico, você foi recentemente promovido a  **regular** (nível de confiança 3).
+        Se você pode ver neste tópico, você foi recentemente promovido a  **regular** (nível de confiança 3).
 
-      Agora você pode &hellip;
+        Agora você pode &hellip;
 
-      * Editar o título de qualquer tópico
-      * Alterar a categoria de qualquer assunto
-      * Ter todos os seus links seguidos ([nofollow automática] (http://en.wikipedia.org/wiki/Nofollow) é removido)
-      * Acesso a categoria privada Sala visíveis apenas para os utilizadores a nível de confiança 3 e superior
-      * Esconder o spam com uma única sinalização
+        * Editar o título de qualquer tópico
+        * Alterar a categoria de qualquer assunto
+        * Ter todos os seus links seguidos ([nofollow automática] (http://en.wikipedia.org/wiki/Nofollow) é removido)
+        * Acesso a categoria privada Sala visíveis apenas para os utilizadores a nível de confiança 3 e superior
+        * Esconder o spam com uma única sinalização
 
-      Aqui está o [lista atual de companheiros regulares] (/badges/3/regular). Não se esqueça de dizer oi.
+        Aqui está o [lista atual de companheiros regulares] (/badges/3/regular). Não se esqueça de dizer oi.
 
-      Obrigado por ser uma parte importante dessa comunidade!
+        Obrigado por ser uma parte importante dessa comunidade!
 
-      (Para obter mais informações sobre os níveis de confiança, [veja este tópico][trust]. Por favor note que somente os membros que continuam a atender aos requisitos ao longo do tempo permanecerá regulares.)
+        (Para obter mais informações sobre os níveis de confiança, [veja este tópico][trust]. Por favor note que somente os membros que continuam a atender aos requisitos ao longo do tempo permanecerá regulares.)
 
-      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Sobre a categoria %{category} "
     replace_paragraph: "(Substitua este primeiro parágrafo por uma curta descrição da sua nova categoria. Este guia vai aparecer na área de seleção de categoria, então tente usar menos que 200 caracteres. **Até você editar essa descrição ou criar tópicos, esta categoria não aparece na página de categorias.**)"
@@ -386,8 +378,8 @@ pt_BR:
       uncategorized: "Não é possível excluir Sem categoria"
       has_subcategories: "Não é possível excluir essa categoria porque tem subcategorias."
       topic_exists:
-        one: "Não é possível excluir esta categoria porque ela tem um tópico. O tópico mais velho é %{topic_link}."
-        other: "Não é possível excluir essa categoria porque ela tem %{count} tópicos. O tópico mais velho é %{topic_link}."
+        one: Não é possível excluir esta categoria porque ela tem um tópico. O tópico mais velho é %{topic_link}.
+        other: Não é possível excluir essa categoria porque ela tem %{count} tópicos. O tópico mais velho é %{topic_link}.
       topic_exists_no_oldest: "Não é possível excluir esta categoria porque contagem tópico é %{count}."
     uncategorized_description: "Tópicos que não precisam de uma categoria, ou que não se encaixam em nenhuma outra categoria existente."
   trust_levels:
@@ -406,101 +398,86 @@ pt_BR:
     image_placeholder:
       broken: "Esta imagem está danificada"
   rate_limiter:
-    slow_down: "Você fez essa ação demais, tente novamente mais tarde."
-    too_many_requests: "Nós possuímos um limite diário do número de vezes que uma ação pode ser tomada. Por favor aguarde %{time_left} antes de tentar novamente."
-    by_type:
-      first_day_replies_per_day: "Você atingiu o número máximo de respostas que um novo usuário pode criar em seu primeiro dia. Por favor aguarde %{time_left} antes de tentar novamente."
-      first_day_topics_per_day: "Você atingiu o número máximo de tópicos que um novo usuário pode criar em seu primeiro dia. Por favor aguarde %{time_left} antes de tentar novamente."
-      create_topic: "Você está criando tópicos muito rápido. Por favor aguarde %{time_left} antes de tentar novamente."
-      create_post: "Você está respondendo muito rápido. Por favor aguarde %{time_left} antes de tentar novamente."
-      delete_post: "Você está removendo posts muito rapidamente. Por favor, aguarde %{time_left} antes de tentar novamente."
-      topics_per_day: "Você atingiu o número máximo de novos tópicos hoje. Por favor aguarde %{time_left} antes de tentar novamente."
-      pms_per_day: "Você alcançou o número máximo de mensagens por hoje. Por favor aguarde %{time_left} antes de tentar de novo."
-      create_like: "Você atingiu o número máximo de curtidas hoje. Por favor aguarde% {time_left} antes de tentar novamente."
-      create_bookmark: "Você atingiu o número máximo de marcadores hoje. Por favor aguarde% {time_left} antes de tentar novamente."
-      live_post_counts: "Você está pedindo contagens de publicações ao vivo rápido demais. Por favor, espere %{time_left} antes de tentar novamente."
-      unsubscribe_via_email: "Você atingiu o número máximo de cancelamentos de inscrição via email por hoje. Por favor, espere %{time_left} antes de tentar novamente."
-      topic_invitations_per_day: "Você atingiu o número máximo de convites para tópicos hoje. Por favor aguarde %{time_left} antes de tentar novamente."
     hours:
-      one: "1 hora"
-      other: "%{count} horas"
+      one: 1 hora
+      other: '%{count} horas'
     minutes:
-      one: "1 minuto"
-      other: "%{count} minutos"
+      one: 1 minuto
+      other: '%{count} minutos'
     seconds:
-      one: "1 segundo"
-      other: "%{count} segundos"
+      one: 1 segundo
+      other: '%{count} segundos'
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: "< 1s"
-        other: "< %{count}s"
+        one: < 1s
+        other: < %{count}s
       x_seconds:
-        one: "1s"
-        other: "%{count}s"
+        one: 1s
+        other: '%{count}s'
       less_than_x_minutes:
-        one: "< 1m"
-        other: "< %{count}m"
+        one: < 1m
+        other: < %{count}m
       x_minutes:
-        one: "1m"
-        other: "%{count}m"
+        one: 1m
+        other: '%{count}m'
       about_x_hours:
-        one: "1h"
-        other: "%{count}h"
+        one: 1h
+        other: '%{count}h'
       x_days:
-        one: "1d"
-        other: "%{count}d"
+        one: 1d
+        other: '%{count}d'
       about_x_months:
-        one: "1mês"
-        other: "%{count}mon"
+        one: 1mês
+        other: '%{count}mon'
       x_months:
-        one: "1mês"
-        other: "%{count}mon"
+        one: 1mês
+        other: '%{count}mon'
       about_x_years:
-        one: "1ano"
-        other: "%{count}anos"
+        one: 1ano
+        other: '%{count}anos'
       over_x_years:
-        one: "> 1ano"
-        other: "> %{count}anos"
+        one: '> 1ano'
+        other: '> %{count}anos'
       almost_x_years:
-        one: "1ano"
-        other: "%{count}anos"
+        one: 1ano
+        other: '%{count}anos'
     distance_in_words_verbose:
       half_a_minute: "mesmo agora"
       less_than_x_seconds:
-        one: "mesmo agora"
-        other: "mesmo agora"
+        one: mesmo agora
+        other: mesmo agora
       x_seconds:
-        one: "1 segundo atrás"
-        other: "%{count} segundos atrás"
+        one: 1 segundo atrás
+        other: '%{count} segundos atrás'
       less_than_x_minutes:
-        one: "menos de 1 minuto atrás"
-        other: "menos de %{count} minutos atrás"
+        one: menos de 1 minuto atrás
+        other: menos de %{count} minutos atrás
       x_minutes:
-        one: "1 minuto atrás"
-        other: "%{count} minutos atrás"
+        one: 1 minuto atrás
+        other: '%{count} minutos atrás'
       about_x_hours:
-        one: "1 hora atrás"
-        other: "%{count} horas atrás"
+        one: 1 hora atrás
+        other: '%{count} horas atrás'
       x_days:
-        one: "1 dia atrás"
-        other: "%{count} dias atrás"
+        one: 1 dia atrás
+        other: '%{count} dias atrás'
       about_x_months:
-        one: "há cerca de 1 mês atrás"
-        other: "há cerca de %{count} meses atrás"
+        one: há cerca de 1 mês atrás
+        other: há cerca de %{count} meses atrás
       x_months:
-        one: "1 mês atrás"
-        other: "%{count} meses atrás"
+        one: 1 mês atrás
+        other: '%{count} meses atrás'
       about_x_years:
-        one: "há cerca de 1 ano atrás"
-        other: "há cerca %{count} anos atrás"
+        one: há cerca de 1 ano atrás
+        other: há cerca %{count} anos atrás
       over_x_years:
-        one: "há mais de 1 ano atrás"
-        other: "há mais de %{count} anos atrás"
+        one: há mais de 1 ano atrás
+        other: há mais de %{count} anos atrás
       almost_x_years:
-        one: "há quase 1 ano atrás"
-        other: "há quase %{count} anos atrás"
+        one: há quase 1 ano atrás
+        other: há quase %{count} anos atrás
   password_reset:
     no_token: "Desculpe, essa alteração de senha é muito antiga. Selecione o botão Login e use 'Esqueci minha senha' para obter um novo link."
     choose_new: "Escolha uma nova senha"
@@ -547,7 +524,6 @@ pt_BR:
       long_form: 'sinalizado como inapropriado'
     notify_user:
       title: 'Envie ao(à) @ {{nome de usuário}} uma mensagem'
-      description: 'Eu quero falar com essa pessoa diretamente e em particular sobre o seu post.'
       long_form: 'mensagem privada'
       email_title: 'Sobre a sua postagem "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -639,9 +615,7 @@ pt_BR:
       xaxis: "Dia"
       yaxis: "Número de visitas"
     signups:
-      title: "Novos Usuários"
       xaxis: "Dia"
-      yaxis: "Número de usuários novos"
     profile_views:
       title: "Visualizações de Perfil de Usuário"
       xaxis: "Dia"
@@ -679,7 +653,6 @@ pt_BR:
       xaxis: "Dia"
       yaxis: "Número de Emails"
     user_to_user_private_messages:
-      title: "Usuário-a-Usuário"
       xaxis: "Dia"
       yaxis: "Número de mensagens particulares"
     system_private_messages:
@@ -726,7 +699,6 @@ pt_BR:
       xaxis: "Dia"
       yaxis: "Visualizações por indexadores web"
     page_view_total_reqs:
-      title: "Total"
       xaxis: "Dia"
       yaxis: "Visualizações totais"
     page_view_logged_in_mobile_reqs:
@@ -788,26 +760,21 @@ pt_BR:
     failing_emails_warning: 'Existem %{num_failed_jobs} tarefas de email que falharam. Verifique seu app.yml e se assegure 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>.'
     subfolder_ends_in_slash: "Sua configuração de subdiretórios está incorreta; DISCOURSE_RELATIVE_URL_ROOT termina com uma barra."
     email_polling_errored_recently:
-      one: "A apuração de email gerou um erro nas últimas 24 horas. Veja <a href='/logs' target='_blank'>os logs</a> para mais detalhes."
-      other: "A apuração de email gerou %{count} erros nas últimas 24 horas. Veja <a href='/logs' target='_blank'>os logs</a> para mais detalhes."
-    missing_mailgun_api_key: "O servidor está configurado para enviar email pelo mailgun, mas você não forneceu uma chave de API usada para verificar as mensagens de webhook."
+      one: A apuração de email gerou um erro nas últimas 24 horas. Veja <a href='/logs' target='_blank'>os logs</a> para mais detalhes.
+      other: A apuração de email gerou %{count} erros nas últimas 24 horas. Veja <a href='/logs' target='_blank'>os logs</a> para mais detalhes.
     bad_favicon_url: "O carregamento do favicon está falhando. Verifique a sua configuração de favicon_url nas <a href='/admin/site_settings'>Configurações do Site</a>."
     poll_pop3_timeout: "A conexão com o servidor POP3 está atingindo o tempo limite. Por favor, verifique suas <a href='/admin/site_settings/category/email'>configurações de POP3</a> e selecione um servidor de serviço."
     poll_pop3_auth_error: "A conexão com o servidor POP3 está falhando com um erro de autenticação. Por favor, verifique suas <a href='/admin/site_settings/category/email'>configurações de POP3</a>."
   site_settings:
     censored_words: "Palavras que serão substituídos automaticamente por &#9632;&#9632;&#9632;&#9632;"
-    censored_pattern: "Padrão de expressão regular que será automaticamente substituído por &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Auto-apagar todas as mensagens ocultas que ficar oculta por mais de 30 dias."
-    default_locale: "Idioma padrão para esta instância do Discourse (ISO 639-1 Code)"
     allow_user_locale: "Permitir que os usuários escolham suas próprias preferências de idioma de interface"
     set_locale_from_accept_language_header: "define a língua da interface para os usuários anônimos de acordo com os cabeçalhos de língua de seus navegadores. (EXPERIMENTAL, não funciona com cache anônimo)"
     min_post_length: "Comprimento mínimo permitido do post em caracteres"
     min_first_post_length: "Comprimento mínimo de caracteres permitido para primeira mensagem (corpo do tópico)"
-    min_private_message_post_length: "Comprimento mínimo de caracteres permitido para mensagens"
     max_post_length: "Comprimento máximo permitido para o post em caracteres"
     min_topic_title_length: "Comprimento mínimo permitido para o título do post em caracteres"
     max_topic_title_length: "Comprimento máximo permitido para o título do post em caracteres"
-    min_private_message_title_length: "Comprimento mínimo de caracteres permitido para o título de uma mensagem"
     min_search_term_length: "Comprimento mínimo válido para o termo de pesquisa em caracteres"
     search_tokenize_chinese_japanese_korean: "Força a busca a tokenizar Mandarim/Japonês/Coreano até para sites que não são nesses idiomas"
     search_prefer_recent_posts: "Se buscar o seu fórum está lento, essa opção tenta indexar as publicações mais recentes primeiro"
@@ -853,7 +820,6 @@ pt_BR:
     summary_likes_required: "Curtidas mínimas em um tópico antes de 'Resumir este tópico, ficar habilitado"
     summary_percent_filter: "Quando um usuário clicar em 'Resumor este tópico', mostrar os melhores % mensagens"
     summary_max_results: "Máximo número de posts quando resumidos por Categoria "
-    enable_private_messages: "Permitir que usuários de nível de confiança 1 (configurável via o nível mínimo de confiança para enviar mensagens) criem e respondam a mensagens. Note que a equipe sempre pode enviar mensagens, independente do caso."
     enable_long_polling: "O sistema de mensagens das notificações pode fazer solicitações longas."
     long_polling_base_url: "URL Utilizada para \"long polling\" ( Quando um CDN for configurado, tenha certeza que essa configuração seja a padrão) ex: http://origin.site.com"
     long_polling_interval: "Tempo que o servidor deve aguardar antes de responder quando não existe nenhum dado para ser enviado. (apenas usuários logados)"
@@ -905,7 +871,6 @@ pt_BR:
     version_checks: "Pingar Discourse Hub para atualizações de versão e exibir mensagens de versão no Painel em /admin"
     new_version_emails: "Enviar um email para o endereço contact_email quando uma nova versão do Discourse estiver disponível."
     invite_expiry_days: "Quantos dias as chaves de convite são válidas."
-    invite_passthrough_hours: "Quando tempo um usuário pode usar uma chave de convite previamente usada para logar, em horas"
     login_required: "Exigir autenticação para ler conteúdo neste site, desabilitar acesso anônimo."
     min_password_length: "Comprimento mínimo da senha."
     min_admin_password_length: "Tamanho de senha mínima para Administradores."
@@ -921,7 +886,6 @@ pt_BR:
     sso_overrides_name: "Substitui nome completo local com nome completo do site externo através da informação de login, e previne mudanças locais."
     sso_overrides_avatar: "Substitui o avatar do usuário pelo avatar do site externo de SSO. Se habilitado, desabilitar allow_uploaded_avatars é altamente recomendado"
     sso_not_approved_url: "Redireciona contas não aprovadas no login externo para este endereço"
-    enable_local_logins: "Habilitar nome de usuário e senha local para autenticação nas contas. (Observação: deve ser habilitado para funcionamento dos convites)"
     allow_new_registrations: "Permitir registro de novos usuários. Desmarque isso para prevenir quem quer que seja de criar uma nova conta."
     enable_signup_cta: "Mostra um aviso aos usuários anônimos que retornem, solicitando que criem uma conta."
     enable_yahoo_logins: "Ativar autenticação pelo Yahoo"
@@ -929,15 +893,12 @@ pt_BR:
     google_oauth2_client_id: "Client ID da sua aplicação Google."
     google_oauth2_client_secret: "Client secret da sua aplicação Google."
     enable_twitter_logins: "Ativar autenticação pelo Twitter, requer twitter_consumer_key e twitter_consumer_secret"
-    twitter_consumer_key: "consumer key registrada em dev.twitter.com (usada para fazer autenticação via twitter)"
-    twitter_consumer_secret: "consumer secret registrada em dev.twitter.com (usada para fazer autenticação via twitter)"
     enable_instagram_logins: "Habilitar autenticação via Instagram. Requer instagram_consumer_key e instagram_consumer_secret"
     instagram_consumer_key: "Chave de consumidor para autenticação via Instagram"
     instagram_consumer_secret: "Segredo de consumidor para autenticação via Instagram"
     enable_facebook_logins: "Ativar autenticação pelo Facebook, requer facebook_app_id e facebook_app_secret"
     facebook_app_id: "app id, registrado em https://developers.facebook.com/apps (used for facebook auth)"
     facebook_app_secret: "app secret, registrado em https://developers.facebook.com/apps (used for facebook auth)"
-    facebook_request_extra_profile_details: "Solicitar sobre mim, localização e site do facebook. (requer que sua aplicação de autenticação seja aprovada pelo facebook)"
     enable_github_logins: "Ativar autenticação via Github, requer github_client_id e github_client_secret"
     github_client_id: "Client id para autenticação via Github, registrado em https://github.com/settings/applications"
     github_client_secret: "Client secret para autenticação via Github, registrado em https://github.com/settings/applications"
@@ -945,7 +906,6 @@ pt_BR:
     allow_restore: "Permitir restauração, que pode substituir todos os dados do site! Deixe falsa, a menos que você pretenda restaurar um backup"
     maximum_backups: "A quantidade máxima de backups para manter no disco. Backups mais antigos são excluídos automaticamente"
     automatic_backups_enabled: "Realizar backups automáticos, como definido na frequência de backup"
-    backup_frequency: "A frequência com a qual criamos backups, em dias."
     enable_s3_backups: "Fazer upload dos backups para o S3 quando completado. IMPORTANTE: exige credenciais válidas do S3 configuradas nas Configurações de Arquivos."
     s3_backup_bucket: "O repositório remoto para realizar backups. AVISO: Certifique-se de que é um repositório privado."
     s3_disable_cleanup: "Desabilitar a remoção de backups na S3 quando removidos localmente."
@@ -967,7 +927,6 @@ pt_BR:
     max_bookmarks_per_day: "Número máximo de novos favoritos por usuário por dia."
     max_edits_per_day: "Número máximo de edições que um usuário pode fazer por dia."
     max_topics_per_day: "Número máximo de postagens que um usuário pode criar por dia."
-    max_private_messages_per_day: "Máximo número de mensagens que usuários podem criar por dia."
     max_invites_per_day: "Número máximo de convites que um usuário pode enviar por dia."
     max_topic_invitations_per_day: "Número máximo de convites para tópicos que um usuário pode enviar por dia."
     alert_admins_if_errors_per_minute: "Número de erros por minutos para desencadear um alerta aos administradores. Um valor igual a 0 desabilita esse recurso. NOTA: requer reinicialização."
@@ -980,7 +939,6 @@ pt_BR:
     clean_orphan_uploads_grace_period_hours: "Carência (em horas) antes de um upload órfão ser removido."
     purge_deleted_uploads_grace_period_days: "Carência (em dias) antes que um upload excluído seja apagado."
     enable_s3_uploads: "Colocar uploads no armazenamento da Amazon S3. IMPORTANTE: exige credenciais válidas da S3 (ambos id da chave de acesso & segredo da chave de acesso)."
-    s3_use_iam_profile: 'Usar papel AWS EC2 IAM para recuperar chaves. OBS: habilitar irá substituir configurações "s3 access key id" e "s3 secret access key".'
     s3_upload_bucket: "Nome do bucket da Amazon S3 no qual os arquivos serão enviados. AVISO: precisa ser em minúsculas, sem pontos, sem underscores."
     s3_access_key_id: "A id da chave de acesso da Amazon S3 que será usada para fazer upload de imagens."
     s3_secret_access_key: "O segredo da chave de acesso da Amazon S3 que será usada para fazer upload de imagens."
@@ -1165,18 +1123,18 @@ pt_BR:
     not_seen_in_a_month: "Bem-vindo de volta! Nós não o vemos a um tempo. Estes são os principais tópicos de discussão desde que você foi embora."
   merge_posts:
     edit_reason:
-      one: "Uma publicação foi combinada por %{username}"
-      other: "%{count} publicações foram combinadas por %{username}"
+      one: Uma publicação foi combinada por %{username}
+      other: '%{count} publicações foram combinadas por %{username}'
     errors:
       different_topics: "Publicações que pertencem a tópicos diferentes não podem ser combinadas."
       different_users: "Publicações que pertencem a usuários diferentes não podem ser combinadas."
   move_posts:
     new_topic_moderator_post:
-      one: "Uma publicação foi dividida em um novo tópico : %{topic_link}"
-      other: "%{count} publicações foram divididas em um novo tópico: %{topic_link}"
+      one: 'Uma publicação foi dividida em um novo tópico : %{topic_link}'
+      other: '%{count} publicações foram divididas em um novo tópico: %{topic_link}'
     existing_topic_moderator_post:
-      one: "Uma publicação foi combinada em um tópico existente: %{topic_link}"
-      other: "%{count} publicações foram combinadas em um tópico existente: %{topic_link}"
+      one: 'Uma publicação foi combinada em um tópico existente: %{topic_link}'
+      other: '%{count} publicações foram combinadas em um tópico existente: %{topic_link}'
   change_owner:
     post_revision_text: "Autoria transferida de %{old_user} para %{new_user}"
     deleted_user: "um usuário deletado"
@@ -1186,23 +1144,23 @@ pt_BR:
     closed_enabled: "Este tópico está agora fechado. Novas respostas não são aceitas."
     closed_disabled: "Este tópico está agora aberto. Novas respostas serão aceitas."
     autoclosed_enabled_days:
-      one: "Este tópico foi automaticamente fechado após 1 dia. Novas respostas não são mais permitidas."
-      other: "Este tópico foi automaticamente fechado após %{count} dias. Novas respostas não são mais permitidas."
+      one: Este tópico foi automaticamente fechado após 1 dia. Novas respostas não são mais permitidas.
+      other: Este tópico foi automaticamente fechado após %{count} dias. Novas respostas não são mais permitidas.
     autoclosed_enabled_hours:
-      one: "Este tópico foi fechado automaticamente após 1 hora. Novas respostas não são mais permitidas."
-      other: "Este tópico foi fechado automaticamente após %{count} horas. Novas respostas não são mais permitidas."
+      one: Este tópico foi fechado automaticamente após 1 hora. Novas respostas não são mais permitidas.
+      other: Este tópico foi fechado automaticamente após %{count} horas. Novas respostas não são mais permitidas.
     autoclosed_enabled_minutes:
-      one: "Este tópico foi fechado automaticamente após 1 minuto. Novas respostas não são mais permitidas."
-      other: "Este tópico foi fechado automaticamente após %{count} minutos. Novas respostas não são mais permitidas."
+      one: Este tópico foi fechado automaticamente após 1 minuto. Novas respostas não são mais permitidas.
+      other: Este tópico foi fechado automaticamente após %{count} minutos. Novas respostas não são mais permitidas.
     autoclosed_enabled_lastpost_days:
-      one: "Este tópico foi fechado automaticamente 1 dia depois da úlima resposta. Novas respostas não são mais permitidas."
-      other: "Este tópico foi fechado automaticamente %{count} dias depois da úlima resposta. Novas respostas não são mais permitidas."
+      one: Este tópico foi fechado automaticamente 1 dia depois da úlima resposta. Novas respostas não são mais permitidas.
+      other: Este tópico foi fechado automaticamente %{count} dias depois da úlima resposta. Novas respostas não são mais permitidas.
     autoclosed_enabled_lastpost_hours:
-      one: "Este tópico foi fechado automaticamente 1 hora depois da úlima resposta. Novas respostas não são mais permitidas."
-      other: "Este tópico foi fechado automaticamente %{count} horas depois da úlima resposta. Novas respostas não são mais permitidas."
+      one: Este tópico foi fechado automaticamente 1 hora depois da úlima resposta. Novas respostas não são mais permitidas.
+      other: Este tópico foi fechado automaticamente %{count} horas depois da úlima resposta. Novas respostas não são mais permitidas.
     autoclosed_enabled_lastpost_minutes:
-      one: "Este tópico foi fechado automaticamente após 1 minuto após a última resposta. Novas respostas não são mais permitidas."
-      other: "Este tópico foi fechado automaticamente após %{count} minutos depois da última resposta. Novas respostas não são mais permitidas."
+      one: Este tópico foi fechado automaticamente após 1 minuto após a última resposta. Novas respostas não são mais permitidas.
+      other: Este tópico foi fechado automaticamente após %{count} minutos depois da última resposta. Novas respostas não são mais permitidas.
     autoclosed_disabled: "Este tópico está aberto agora. Novas respostas estão permitidas."
     autoclosed_disabled_lastpost: "Este tópico está aberto agora. Novas respostas estão permitidas."
     pinned_enabled: "Este tópico está agora afixado. Irá aparecer no topo das suas categorias"
@@ -1250,8 +1208,8 @@ pt_BR:
       max_new_accounts_per_registration_ip: "Novos registros não são permitidos a partir do seu endereço de IP (quantidade máxima alcançada). Contate um membro da equipe."
   flags_reminder:
     subject_template:
-      one: "1 sinalização aguardando a ser controlada"
-      other: "%{count} sinalizações aguardando a ser controladas"
+      one: 1 sinalização aguardando a ser controlada
+      other: '%{count} sinalizações aguardando a ser controladas'
   invite_password_instructions:
     subject_template: "Defina uma senha para a sua %{site_name}  conta"
   flag_reasons:
@@ -1283,8 +1241,6 @@ pt_BR:
       text_body_template: "Seus convites foram enviados com sucesso: %{sent}."
     bulk_invite_failed:
       subject_template: "Seus convites não forma enviados, contate os moderadores."
-    csv_export_succeeded:
-      subject_template: "Exportação de dados completada"
     csv_export_failed:
       subject_template: "A exportação de dados falhou"
     email_reject_parsing:
@@ -1298,8 +1254,8 @@ pt_BR:
       subject_template: "Nova conta suspensa"
     pending_users_reminder:
       subject_template:
-        one: "1 usuário aguardando aprovação"
-        other: "%{count} usuários aguardando aprovação"
+        one: 1 usuário aguardando aprovação
+        other: '%{count} usuários aguardando aprovação'
       text_body_template: |
         Há novos cadastros de usuários à espera de serem aprovados (ou rejeitados), antes de poderem acessar este fórum.
 
@@ -1433,7 +1389,7 @@ pt_BR:
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
-        %{message}
+          %{message}
     digest:
       why: "Um breve resumo de %{site_link} desde que viu pela última vez em %{last_seen_at}."
       since_last_visit: "Desde a sua última visita"
@@ -1531,16 +1487,16 @@ pt_BR:
       description: Primeira edição de mensagem
     basic_user:
       name: Básico
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Concedido</a> o acesso a todas as funções essenciais da comunidade
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">Concedido</a> o acesso a todas as funções essenciais da comunidade"
     member:
       name: Membro
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Concedido</a> o acesso a enviar convites, mensagens em grupo e mais curtidas
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">Concedido</a> o acesso a enviar convites, mensagens em grupo e mais curtidas"
     regular:
       name: Habitual
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Concedido</a> o acesso a recategorizar, renomear, seguir links, wiki e mais curtidas
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">Concedido</a> o acesso a recategorizar, renomear, seguir links, wiki e mais curtidas"
     leader:
       name: Líder
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Concedido</a> o acesso para editar globalmente, fixar, fechar, arquivar, desmembrar e unificar tópicos, além de mais curtidas
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">Concedido</a> o acesso para editar globalmente, fixar, fechar, arquivar, desmembrar e unificar tópicos, além de mais curtidas"
       long_description: |
         Este emblema é concedido quando você alcança o nível de confiança 4. Você é um líder desta comunidade selecionado pela equipe, e define um exemplo positivo em suas ações e palavras. Você tem habilidade de editar todos tópicos, agir como moderador nas ações como fixar, fechar, delistar, arquivar, separar, agrupar e vários curtidas a mais por dia.
     welcome:
@@ -1552,7 +1508,7 @@ pt_BR:
       name: Autobiógrafo
     anniversary:
       name: Aniversário
-      description: Membro ativo por um ano, postou ao menos uma vez
+      description: "Membro ativo por um ano, postou ao menos uma vez"
     nice_post:
       name: Resposta Interessante
       description: Recebeu 10 curtidas em uma resposta
@@ -1654,16 +1610,15 @@ pt_BR:
       description: Utilizou um emoji em uma publicação
     first_mention:
       name: Primeira menção
-      long_description: Este emblema é concedido na primeira vez em que você menciona o @nomedeusuaio de alguém em uma publicação. Cada menção gera uma notificação para a pessoa de forma que ela saiba o que você publicou. Simplesmente comece a digitar "@" (arroba) para mencionar qualquer usuário ou, caso permitido, um grupo -- é uma maneira conveniente de chamar a atenção de alguém.
+      long_description: "Este emblema é concedido na primeira vez em que você menciona o @nomedeusuaio de alguém em uma publicação. Cada menção gera uma notificação para a pessoa de forma que ela saiba o que você publicou. Simplesmente comece a digitar \"@\" (arroba) para mencionar qualquer usuário ou, caso permitido, um grupo -- é uma maneira conveniente de chamar a atenção de alguém."
     first_onebox:
       name: Primeiro Onebox
       description: Postou um link que foi embutido na mensagem
-      long_description: 'Esse emblema é concedido na primeira vez em que você posta um link que é convertido automaticamente em uma caixa com um título, sumário e uma imagem (se disponível) sumarizando o link. '
+      long_description: "Esse emblema é concedido na primeira vez em que você posta um link que é convertido automaticamente em uma caixa com um título, sumário e uma imagem (se disponível) sumarizando o link. "
     first_reply_by_email:
       name: Primeira Resposta por email
   admin_login:
     success: "Email Enviado"
-    error: "Erro!"
     email_input: "Email do Administrador"
     submit_button: "Enviar Email"
   performance_report:
@@ -1784,6 +1739,3 @@ pt_BR:
         title: "Convidar um grupo"
       finished:
         title: "Seu Discourse está pronto!"
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index 95f2e9f36c3..4470c411aad 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -17,12 +17,12 @@ ro:
       date_only: "%B %-d, %Y"
       long: "%B %-d, %Y, %l:%M%P"
   date:
-    month_names: [null, ianuarie, februarie, martie, aprilie, mai, iunie, iulie, august, septembrie, octombrie, noiembrie, decembrie]
+    month_names: [~, ianuarie, februarie, martie, aprilie, mai, iunie, iulie, august, septembrie, octombrie, noiembrie, decembrie]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "AM"
     pm: "PM"
-    <<: *datetime_formats
   title: "Discourse"
   topics: "Subiecte"
   posts: "Postări"
@@ -62,17 +62,17 @@ ro:
       present: trebuie să fie gol
       confirmation: "nu se potrivește cu %{attribute}"
       empty: nu poate fi gol
-      equal_to: trebuie sa fie egal cu %{count}
+      equal_to: "trebuie sa fie egal cu %{count}"
       even: trebuie să fie par
       exclusion: este rezervat
-      greater_than: trebuie să fie mai mare decât %{count}
-      greater_than_or_equal_to: trebuie să fie mai mare sau egal cu %{count}
+      greater_than: "trebuie să fie mai mare decât %{count}"
+      greater_than_or_equal_to: "trebuie să fie mai mare sau egal cu %{count}"
       has_already_been_used: "a fost deja folosit"
       inclusion: nu este inclus in listă
       invalid: nu este valid
       is_invalid: "pare neclar, e completă propoziția?"
-      less_than: trebuie să fie mai mic decât %{count}
-      less_than_or_equal_to: trebuie să fie mai mic sau egal cu %{count}
+      less_than: "trebuie să fie mai mic decât %{count}"
+      less_than_or_equal_to: "trebuie să fie mai mic sau egal cu %{count}"
       not_a_number: nu este un număr
       not_an_integer: trebuie sa fie un număr întreg
       odd: trebuie sa fie impar
@@ -81,23 +81,23 @@ ro:
         one: "Înregistrarea nu poate fi ştearsă pentru că există %{record} (de) înregistrări dependente"
         many: "Înregistrarea nu poate fi ştearsă pentru că există %{record} (de) înregistrări dependente"
       too_long:
-        one: este prea lung (maximum un caracter)
         few: este prea lung (maximum %{count} caractere)
+        one: este prea lung (maximum un caracter)
         other: este prea lung (maximum %{count} de caractere)
       too_short:
-        one: este prea scurt (minimum un caracter)
         few: este prea scurt (minimum %{count} caractere)
+        one: este prea scurt (minimum un caracter)
         other: este prea scurt (minimum %{count} de caractere)
       wrong_length:
-        one: are lungimea greşită (trebuie sa fie un caracter)
         few: are lungimea greşită (trebuie sa fie %{count} caractere)
+        one: are lungimea greşită (trebuie sa fie un caracter)
         other: are lungimea greşită (trebuie sa fie %{count} de caractere)
       other_than: "trebuie sa fie diferit de %{count}"
     template:
       body: 'Au apărut probleme cu următoarele câmpuri:'
       header:
-        one: O eroare a împiedicat acest %{model} să fie salvat
         few: '%{count} erori au împiedicat acest %{model} să fie salvat'
+        one: O eroare a împiedicat acest %{model} să fie salvat
         other: '%{count} de erori au împiedicat acest %{model} să fie salvat'
     embed:
       load_from_remote: "A apărut o eroare la încărcarea postării."
@@ -108,6 +108,9 @@ ro:
       max_username_length_range: "Nu poți seta maximum cu o valoare mai mică decât a minimului."
       default_categories_already_selected: "Nu poți selecta o categorie folosită într-o altă listă."
       s3_upload_bucket_is_required: "Nu poți activa încărcările pe S3 dacă nu ai introdus 's3_upload_bucket'."
+  activemodel:
+    errors:
+      <<: *errors
   bulk_invite:
     file_should_be_csv: "Fișierul de încărcat trebuie să fie în format csv."
     error: "A apărut o eroare la încărcarea acestui fișier. Te rugăm să încerci din nou, mai târziu."
@@ -125,9 +128,9 @@ ro:
   reading_time: "Durata citirii"
   likes: "Aprecieri"
   too_many_replies:
-    one: "Ne pare rău, dar utilizatorii noi sunt limitați la 1 răspuns pe discuție."
-    few: "Ne pare rău, dar utilizatorii noi sunt limitați la %{count} răspunsuri pe discuție."
-    other: "Ne pare rău, dar utilizatori noi sunt limitați la %{count} de răspunsuri pe discuție."
+    few: Ne pare rău, dar utilizatorii noi sunt limitați la %{count} răspunsuri pe discuție.
+    one: Ne pare rău, dar utilizatorii noi sunt limitați la 1 răspuns pe discuție.
+    other: Ne pare rău, dar utilizatori noi sunt limitați la %{count} de răspunsuri pe discuție.
   embed:
     start_discussion: "Pornește discuție"
     continue: "Continuă discuție"
@@ -137,42 +140,42 @@ ro:
     no_hosts: "Nu s-a setat nicio gazdă pentru încorporare."
     configure: "Configurează încorporarea"
     more_replies:
-      one: "Încă un răspuns"
-      few: "Încă %{count} răspunsuri"
-      other: "Încă %{count} de răspunsuri"
+      few: Încă %{count} răspunsuri
+      one: Încă un răspuns
+      other: Încă %{count} de răspunsuri
     loading: "Încarcă discuția..."
     permalink: "Link permanent"
     imported_from: "Acesta este un subiect de discuție adăugat la discuția originală de la %{link}"
     in_reply_to: "▶ %{username}"
     replies:
-      one: "Un răspuns"
-      few: "%{count} răspunsuri"
-      other: "%{count} de răspunsuri"
+      few: '%{count} răspunsuri'
+      one: Un răspuns
+      other: '%{count} de răspunsuri'
   no_mentions_allowed: "Ne pare rău, nu poți menționa alți utilizatori."
   too_many_mentions:
-    one: "Ne pare rău, poți menționa doar un utilizator într-o postare."
-    few: "Ne pare rău, poți menționa doar %{count} utilizatori într-o postare."
-    other: "Ne pare rău, poți menționa doar %{count} de utilizatori într-o postare."
+    few: Ne pare rău, poți menționa doar %{count} utilizatori într-o postare.
+    one: Ne pare rău, poți menționa doar un utilizator într-o postare.
+    other: Ne pare rău, poți menționa doar %{count} de utilizatori într-o postare.
   no_mentions_allowed_newuser: "Ne pare rău, noii utilizatori nu pot menționa alți utilizatori."
   too_many_mentions_newuser:
-    one: "Ne pare rău, noii utilizatori pot menționa doar un utilizator într-o postare."
-    few: "Ne pare rău, noii utilizatori pot menționa doar %{count} utilizatori într-o postare."
-    other: "Ne pare rău, noii utilizatori pot menționa doar %{count} de utilizatori într-o postare."
+    few: Ne pare rău, noii utilizatori pot menționa doar %{count} utilizatori într-o postare.
+    one: Ne pare rău, noii utilizatori pot menționa doar un utilizator într-o postare.
+    other: Ne pare rău, noii utilizatori pot menționa doar %{count} de utilizatori într-o postare.
   no_images_allowed: "Ne pare rău, nu poți pune imagini în postări."
   too_many_images:
-    one: "Ne pare rău, noii utilizatori pot pune numai o imagine într-o postare."
-    few: "Ne pare rău, noii utilizatori pot pune numai %{count} imagini într-o postare."
-    other: "Ne pare rău, noii utilizatori pot pune numai %{count} de imagini într-o postare."
+    few: Ne pare rău, noii utilizatori pot pune numai %{count} imagini într-o postare.
+    one: Ne pare rău, noii utilizatori pot pune numai o imagine într-o postare.
+    other: Ne pare rău, noii utilizatori pot pune numai %{count} de imagini într-o postare.
   no_attachments_allowed: "Ne pare rău, noii utilizatori nu pot pune atașamente la postări."
   too_many_attachments:
-    one: "Ne pare rău, noii utilizatori pot pune doar un atașament la o postare."
-    few: "Ne pare rău, noii utilizatori pot pune doar %{count} atașamente la o postare."
-    other: "Ne pare rău, noii utilizatori pot pune doar %{count} de atașamente la o postare."
+    few: Ne pare rău, noii utilizatori pot pune doar %{count} atașamente la o postare.
+    one: Ne pare rău, noii utilizatori pot pune doar un atașament la o postare.
+    other: Ne pare rău, noii utilizatori pot pune doar %{count} de atașamente la o postare.
   no_links_allowed: "Ne pare rău, noii utilizatori nu pot pune link-uri în postări."
   too_many_links:
-    one: "Ne pare rău, noii utilizatori pot pune doar un link într-o postare."
-    few: "Ne pare rău, noii utilizatori pot pune doar %{count} link-uri într-o postare."
-    other: "Ne pare rău, noii utilizatori pot pune doar %{count} de link-uri într-o postare."
+    few: Ne pare rău, noii utilizatori pot pune doar %{count} link-uri într-o postare.
+    one: Ne pare rău, noii utilizatori pot pune doar un link într-o postare.
+    other: Ne pare rău, noii utilizatori pot pune doar %{count} de link-uri într-o postare.
   spamming_host: "Nu poți adăuga un link pentru acest domeniu."
   user_is_suspended: "Utilizatorii suspendați nu au dreptul de a posta."
   topic_not_found: "Ceva n-a mers bine. Poate că acest subiect a fost închis sau șters în timp ce te uitai la el?"
@@ -197,7 +200,6 @@ ro:
     hot: "Subiecte fierbinți"
     top: "Subiecte fierbinți"
     posts: "Ultimele postări"
-    private_posts: "Ultimele mesaje private"
     group_posts: "Ultimele postări de la %{group_name}"
     group_mentions: "Ultimele menționări de la %{group_name}"
     user_posts: "Ultimele postări ale lui @%{username}"
@@ -211,7 +213,6 @@ ro:
   groups:
     errors:
       can_not_modify_automatic: "Nu poți modifica un grup automat"
-      member_already_exist: "'%{username}' este deja membru al acestui grup"
       invalid_domain: "'%{domain}' nu este un domeniu valid."
       invalid_incoming_email: "'%{email}' nu este o adresa validă de email."
       email_already_used_in_group: "'%{email}' este deja folosit de grupul '%{group_name}'."
@@ -228,10 +229,10 @@ ro:
       trust_level_4: "nivel_de_încredere_4"
   education:
     until_posts:
-      one: "o postare"
-      few: "%{count} postări"
-      other: "%{count} de postări"
-    new-topic: |
+      few: '%{count} postări'
+      one: o postare
+      other: '%{count} de postări'
+    'new-topic': |
       Bun venit pe %{site_name} &mdash; **îți mulțumim că ai început o nouă conversație!**
 
       - Atunci când îl citești cu voce tare, titlul sună interesant ? Rezumă bine conținutul?
@@ -241,7 +242,7 @@ ro:
       - Include în subiect cuvinte folosite în mod obișnuit pentru a le da altora posibilitatea să îl *găsească*. Pentru a grupa subiectul tău laolaltă cu alte subiecte asemănătoare, alege o anumită categorie.
 
       Pentru mai multe îndrumări, [citește ghidul comunității](/guidelines). Această secțiune de pagină va apărea doar pentru prima/primele %{education_posts_text}.
-    new-reply: |
+    'new-reply': |
       Bine ai venit la %{site_name} &mdash; **Îți mulțumim pentru contribuție!**
 
       - Răspunsul tău îmbunătațește discuția în vreun fel?
@@ -259,12 +260,6 @@ ro:
       Ai luat în considerare să **[îți actualizezi profilul](%{profile_path})** cu o imagine care te reprezintă?
 
       Este mai ușor să urmărești o discuție și să găsești oameni interesanți într-o conversație atunci când fiecare are o imagine unică!
-    reviving_old_topic: |
-      ### Reînvii această discuție?
-
-      Ultimul răspuns în această discuție a fost în urmă cu **%{days}** zile. Răspunsul tău va pune discuția pe prima pagină și îi va notifica pe toți cei ce au fost implicați în discuție.
-
-      Ești sigur că vrei să continui această discuție veche?
   activerecord:
     attributes:
       category:
@@ -277,13 +272,12 @@ ro:
       user_profile:
         bio_raw: "Despre mine"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Poți ataşa avertizări doar la mesajele private."
               too_many_users: "Poți trimite avertizări la un singur utilizator odată."
-              cant_send_pm: "Ne pare rău, nu poți trimite un mesaj privat acestui utilizator."
               no_user_selected: "Trebuie selectat un nume de utilizator valid."
             featured_link:
               invalid: "e invalid. URL-ul trebuie să includă http:// sau https://."
@@ -310,7 +304,6 @@ ro:
           attributes:
             name:
               taken: este deja folosit de un alt emoji
-      <<: *errors
   user_profile:
     no_info_other: "<div class='missing-profile'>%{name} încă nu a introdus nimic în câmpul Despre mine din profilul său</div>"
   vip_category_name: "Sufragerie"
@@ -323,25 +316,25 @@ ro:
     title: "Bine ai venit în sufragerie"
     body: |2
 
-      Felicitări! :confetti_ball:
+        Felicitări! :confetti_ball:
 
-      Dacă poți vedea acest subiect, ai fost promovat recent la **utilizator frecvent** (nivel de încredere 3).
+        Dacă poți vedea acest subiect, ai fost promovat recent la **utilizator frecvent** (nivel de încredere 3).
 
-      Acum poți să &hellip;
+        Acum poți să &hellip;
 
-      * Editezi titlul oricărui subiect
-      * Schimbi categoria oricărui subiect
-      * Setezi ca toate link-urile tale să fie urmărite ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) este dezactivat)
-      * Accesezi secțiunea privată din categoria Sufragerie unde au acces numai utilizatorii de nivel 3 sau mai mare
-      * Ascunzi spam-ul folosind un singur marcaj de avertizare
+        * Editezi titlul oricărui subiect
+        * Schimbi categoria oricărui subiect
+        * Setezi ca toate link-urile tale să fie urmărite ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) este dezactivat)
+        * Accesezi secțiunea privată din categoria Sufragerie unde au acces numai utilizatorii de nivel 3 sau mai mare
+        * Ascunzi spam-ul folosind un singur marcaj de avertizare
 
-      Aici este [lista colegilor utilizatori ce au ajuns la nivelul de încredere 3](/badges/3/regular). Salută-i!
+        Aici este [lista colegilor utilizatori ce au ajuns la nivelul de încredere 3](/badges/3/regular). Salută-i!
 
-      Îți mulțumim că ești o parte importantă a acestei comunități!
+        Îți mulțumim că ești o parte importantă a acestei comunități!
 
-      (Pentru mai multe informații cu privire la nivelurile de încredere, [vezi subiectul ăsta][încredere]. Ține aminte că doar membrii ce vor îndeplini constant criteriile cerute vor rămâne la nivelul de încredere 3.)
+        (Pentru mai multe informații cu privire la nivelurile de încredere, [vezi subiectul ăsta][încredere]. Ține aminte că doar membrii ce vor îndeplini constant criteriile cerute vor rămâne la nivelul de încredere 3.)
 
-      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Despre categoria %{category}"
     replace_paragraph: "(Înlocuiește acest prim paragraf cu o scurtă descriere a noii tale categorii. Acest îndreptar va apărea în zona de selecție a categoriei, așa că încearcă să îl limitezi la maxim 200 de caractere. **Această categorie nu va apărea în pagina categoriilor până ce nu editezi această descriere sau până ce nu creezi subiecte**)"
@@ -357,9 +350,9 @@ ro:
       uncategorized: "Nu se poate șterge Necategorizat"
       has_subcategories: "Nu putem șterge categoria aceasta pentru că are sub-categorii."
       topic_exists:
-        one: "Nu poți șterge categoria aceasta pentru că are un subiect. Cel mai vechi subiect este %{topic_link}."
-        few: "Nu poți șterge categoria aceasta pentru că are %{count} subiecte. Cel mai vechi subiect este %{topic_link}."
-        other: "Nu poți șterge categoria aceasta pentru că are %{count} de subiecte. Cel mai vechi subiect este %{topic_link}."
+        few: Nu poți șterge categoria aceasta pentru că are %{count} subiecte. Cel mai vechi subiect este %{topic_link}.
+        one: Nu poți șterge categoria aceasta pentru că are un subiect. Cel mai vechi subiect este %{topic_link}.
+        other: Nu poți șterge categoria aceasta pentru că are %{count} de subiecte. Cel mai vechi subiect este %{topic_link}.
       topic_exists_no_oldest: "Nu poți șterge categoria fiindcă numărul subiectelor este de %{count}."
     uncategorized_description: "Subiecte care nu au nevoie de o categorie, sau care nu se potrivesc în nicio categorie deja existentă."
   trust_levels:
@@ -375,127 +368,111 @@ ro:
       title: "lider"
     change_failed_explanation: "Ai încercat să retrogradezi utilizatorul %{user_name} la nivelul '%{new_trust_level}'. Însă nivelul este deja '%{current_trust_level}'. %{user_name} va rămâne la '%{current_trust_level}' - dacă dorești să retrogradezi utilizatorul, trebuie să îi blochezi întâi nivelul de încredere."
   rate_limiter:
-    slow_down: "Ai executat această acțiune de prea multe ori. Încearcă mai târziu."
-    too_many_requests: "Există o limită zilnică de executare a acestei acțiuni. Te rugăm așteaptă %{time_left} până să încerci iar."
-    by_type:
-      first_day_replies_per_day: "Ai atins numărul maxim de răspunsuri pe care un nou utilizator le poate crea în prima sa zi. Te rugăm să aștepți %{time_left} înainte să încerci din nou."
-      first_day_topics_per_day: "Ai atins numărul maxim de subiecte pe care un nou utilizator poate să le creeze în prima sa zi. Te rugăm să aștepți %{time_left} înainte să încerci din nou."
-      create_topic: "Ai atins numărul maxim de subiecte. Te rugăm să aștepți %{time_left} înainte să încerci din nou."
-      create_post: "Răspunzi prea rapid. Te rugăm să aștepți %{time_left} înainte să încerci din nou."
-      delete_post: "ștergi postările prea rapid. Te rugăm să aștepți %{time_left} înainte să încerci din nou."
-      public_group_membership: "Ieși/intri din/în grupuri prea frecvent. Te rugăm așteaptă %{time_left} până să încerci din nou."
-      topics_per_day: "Ai atins numărul maxim de subiecte noi pe ziua de azi. Te rugăm să aștepți %{time_left} înainte să încerci din nou."
-      pms_per_day: "Ai atins numărul maxim de mesaje pe ziua de azi. Te rugăm să aștepți %{time_left} înainte să încerci din nou."
-      create_like: "Ai atins numărul maxim de aprecieri pe ziua de azi. Te rugăm să aștepți %{time_left} înainte să încerci din nou."
-      create_bookmark: "Ai atins numărul maxim de semne de carte pe ziua de azi. Te rugăm să aștepți %{time_left} înainte să încerci din nou."
-      live_post_counts: "Ceri prea rapid contorizarea live a numărului de postări. Te rugăm să aștepți %{time_left} înainte să încerci din nou."
-      unsubscribe_via_email: "Ai atins numărul maxim de dezabonări prin email pe ziua de azi. Te rugăm să aștepți %{time_left} înainte să încerci din nou."
-      topic_invitations_per_day: "Ai atins numărul maxim de invitații la subiecte pe ziua de azi. Te rugăm să aștepți %{time_left} înainte să încerci din nou."
     hours:
-      one: "o oră"
-      few: "%{count} ore"
-      other: "%{count} de ore"
+      few: '%{count} ore'
+      one: o oră
+      other: '%{count} de ore'
     minutes:
-      one: "un minut"
-      few: "%{count} minute"
-      other: "%{count} de minute"
+      few: '%{count} minute'
+      one: un minut
+      other: '%{count} de minute'
     seconds:
-      one: "o secundă"
-      few: "%{count} secunde"
-      other: "%{count} de secunde"
+      few: '%{count} secunde'
+      one: o secundă
+      other: '%{count} de secunde'
   datetime:
     distance_in_words:
       half_a_minute: "de < 1m"
       less_than_x_seconds:
-        one: "de < 1s"
-        few: "de < %{count}s"
-        other: "de < %{count}s"
+        few: de < %{count}s
+        one: de < 1s
+        other: de < %{count}s
       x_seconds:
-        one: "de 1s"
-        few: "de %{count}s"
-        other: "de %{count}s"
+        few: de %{count}s
+        one: de 1s
+        other: de %{count}s
       less_than_x_minutes:
-        one: "de < 1m"
-        few: " < %{count}m"
-        other: "de < %{count}m"
+        few: ' < %{count}m'
+        one: de < 1m
+        other: de < %{count}m
       x_minutes:
-        one: "de 1m"
-        few: " de %{count}m"
-        other: "de %{count}m"
+        few: ' de %{count}m'
+        one: de 1m
+        other: de %{count}m
       about_x_hours:
-        one: "de 1h"
-        few: " %{count}h"
-        other: "de %{count}h"
+        few: ' %{count}h'
+        one: de 1h
+        other: de %{count}h
       x_days:
-        one: "de 1z"
-        few: " %{count}z"
-        other: "de %{count}z"
+        few: ' %{count}z'
+        one: de 1z
+        other: de %{count}z
       about_x_months:
-        one: "de o lună"
-        few: " de %{count} luni"
-        other: "de %{count} de luni"
+        few: ' de %{count} luni'
+        one: de o lună
+        other: de %{count} de luni
       x_months:
-        one: "de o lună"
-        few: "de %{count} luni"
-        other: "de %{count} de luni"
+        few: de %{count} luni
+        one: de o lună
+        other: de %{count} de luni
       about_x_years:
-        one: "de %{count}an"
-        few: "de %{count} ani"
-        other: "de %{count} de ani"
+        few: de %{count} ani
+        one: de %{count}an
+        other: de %{count} de ani
       over_x_years:
-        one: "de > 1an"
-        few: "de > %{count}ani"
-        other: "de > %{count} de ani"
+        few: de > %{count}ani
+        one: de > 1an
+        other: de > %{count} de ani
       almost_x_years:
-        one: "de un an"
-        few: "de %{count} ani"
-        other: "de %{count} de ani"
+        few: de %{count} ani
+        one: de un an
+        other: de %{count} de ani
     distance_in_words_verbose:
       half_a_minute: "chiar acum"
       less_than_x_seconds:
-        one: "chiar acum"
-        few: "chiar acum"
-        other: "chiar acum"
+        few: chiar acum
+        one: chiar acum
+        other: chiar acum
       x_seconds:
-        one: "cu o secundă în urmă"
-        few: "cu %{count} secunde în urmă"
-        other: "cu %{count} de secunde în urmă"
+        few: cu %{count} secunde în urmă
+        one: cu o secundă în urmă
+        other: cu %{count} de secunde în urmă
       less_than_x_minutes:
-        one: "cu mai puțin de 1 minut în urmă"
-        few: "cu mai puțin de %{count} minute în urmă"
-        other: "mai puțin de %{count} de minute în urmă"
+        few: cu mai puțin de %{count} minute în urmă
+        one: cu mai puțin de 1 minut în urmă
+        other: mai puțin de %{count} de minute în urmă
       x_minutes:
-        one: "acum un minut"
-        few: "acum %{count} minute"
-        other: "acum %{count} de minute"
+        few: acum %{count} minute
+        one: acum un minut
+        other: acum %{count} de minute
       about_x_hours:
-        one: "acum o ora"
-        few: "acum %{count} ore"
-        other: "acum %{count} de ore"
+        few: acum %{count} ore
+        one: acum o ora
+        other: acum %{count} de ore
       x_days:
-        one: "acum o zi"
-        few: "acum %{count} zile"
-        other: "acum %{count} de zile"
+        few: acum %{count} zile
+        one: acum o zi
+        other: acum %{count} de zile
       about_x_months:
-        one: "cu aproape o lună în urmă"
-        few: "cu aproape %{count} luni în urmă"
-        other: "cu aproape %{count} de luni în urmă"
+        few: cu aproape %{count} luni în urmă
+        one: cu aproape o lună în urmă
+        other: cu aproape %{count} de luni în urmă
       x_months:
-        one: "acum o lună"
-        few: "acum %{count} luni"
-        other: "acum %{count} de luni"
+        few: acum %{count} luni
+        one: acum o lună
+        other: acum %{count} de luni
       about_x_years:
-        one: "cu aproape un an în urmă"
-        few: "cu aproape %{count} ani în urmă"
-        other: "cu aproape %{count} de ani în urmă"
+        few: cu aproape %{count} ani în urmă
+        one: cu aproape un an în urmă
+        other: cu aproape %{count} de ani în urmă
       over_x_years:
-        one: "cu peste un an în urmă"
-        few: "cu peste %{count} ani în urmă"
-        other: "cu peste %{count} de ani în urmă"
+        few: cu peste %{count} ani în urmă
+        one: cu peste un an în urmă
+        other: cu peste %{count} de ani în urmă
       almost_x_years:
-        one: "cu aproape un an în urmă"
-        few: "cu aproape %{count} ani în urmă"
-        other: "cu aproape %{count} de ani în urmă"
+        few: cu aproape %{count} ani în urmă
+        one: cu aproape un an în urmă
+        other: cu aproape %{count} de ani în urmă
   password_reset:
     no_token: "Ne pare rău, dar link-ul de schimbare a parolei este prea vechi. Selectează butonul Înregistrare și folosește 'Mi-am uitat parola' pentru a obține un nou link."
     choose_new: "Alege o parolă nouă"
@@ -545,7 +522,6 @@ ro:
       long_form: 'marcat ca necorespunzător'
     notify_user:
       title: 'Trimite-i un mesaj lui @{{username}}'
-      description: 'Vreau să îi vorbesc direct și în mod privat acestei persoane cu privire la postarea sa.'
       long_form: 'utilizator căruia i-a fost trimis mesaj'
       email_title: 'Postarea ta din "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -634,9 +610,7 @@ ro:
       xaxis: "Zi"
       yaxis: "Număr de vizite"
     signups:
-      title: "Utilizatori noi"
       xaxis: "Zi"
-      yaxis: "Număr de noi utilizatori"
     profile_views:
       title: "Vizualizări profil utilizator"
       xaxis: "Zi"
@@ -674,7 +648,6 @@ ro:
       xaxis: "Zi"
       yaxis: "Numărul de emailuri"
     user_to_user_private_messages:
-      title: "De la utilizator la utilizator"
       xaxis: "Zi"
       yaxis: "Număr de mesaje"
     system_private_messages:
@@ -721,7 +694,6 @@ ro:
       xaxis: "Zi"
       yaxis: "Vizualizări de pagină făcute de roboți web"
     page_view_total_reqs:
-      title: "Total"
       xaxis: "Zi"
       yaxis: "Total vizualizări de pagină"
     page_view_logged_in_mobile_reqs:
@@ -783,29 +755,24 @@ ro:
     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>.'
     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."
-      few: "Email polling a generat %{count} erori în ultimele 24 de ore. Vizualizează <a href='/logs' target='_blank'>rapoartele</a> pentru mai multe detalii."
-      other: "Retragerea de emailuri generat %{count} de erori în ultimele 24 de ore. Vizualizează <a href='/logs' target='_blank'>rapoartele</a> pentru mai multe detalii."
-    missing_mailgun_api_key: "Serverul este configurat să trimită emailuri printr-un mailgun dar nu ai furnizat nici o cheie API folosită pentru a verifica mesajele webhook."
+      few: Email polling a generat %{count} erori în ultimele 24 de ore. Vizualizează <a href='/logs' target='_blank'>rapoartele</a> pentru mai multe detalii.
+      one: Email polling a generat o eroare în ultimele 24 de ore. Vizualizează <a href='/logs' target='_blank'>rapoartele</a> pentru mai multe detalii.
+      other: Retragerea de emailuri generat %{count} de erori în ultimele 24 de ore. Vizualizează <a href='/logs' target='_blank'>rapoartele</a> pentru mai multe detalii.
     bad_favicon_url: "Eroare la încărcarea Favicon. Verifică setarea favicon_url în <a href='/admin/site_settings'>Setările site-ului</a>."
     poll_pop3_timeout: "Conexiunea la serverul POP3 a dat time-out. Mailurile primite nu au putut fi accesate. Te rugăm să verifici <a href='/admin/site_settings/category/email'>setările POP3</a> și furnizorul de servicii."
     poll_pop3_auth_error: "Conexiunea la serverul POP3 a eșuat cu o eroare de autentificare. Te rugăm să verifici <a href='/admin/site_settings/category/email'>setările POP3</a>."
   site_settings:
     censored_words: "Cuvintele vor fi înlocuite automat cu &#9632;&#9632;&#9632;&#9632;"
-    censored_pattern: "Modelul Regex va fi înlocuit automat cu  &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "șterge automat toate postările ascunse care stau ascunse mai mult de 30 de zile."
-    default_locale: "Limba implicită a acestei instanțe de Discourse (ISO 639-1 Code)"
     allow_user_locale: "Permite utilizatorilor să-și aleagă singuri limba pentru interfață"
     set_locale_from_accept_language_header: "setează limba interfeței pentru utilizatorii anonimi pe baza header-elor de limbă ale web browser-elor lor. (EXPERIMENTAL, nu funcționează cu cache anonim)"
     min_post_length: "Lungimea minimă a postării, în caractere"
     min_first_post_length: "Numărul minim de caractere permis pentru prima postare (în corpul mesajului)"
-    min_private_message_post_length: "Numărul minim de caractere permis pentru mesaje, per postare"
     max_post_length: "Lungimea maximă permisă a postării, în caractere"
     topic_featured_link_enabled: "Activează postarea unui link cu subiecte."
     show_topic_featured_link_in_digest: "Arată link-ul promovat al subiectului în rezumatul pe email."
     min_topic_title_length: "Minimul de caractere permis în titlul unui subiect"
     max_topic_title_length: "Maximul de caractere permis în titlul unui subiect"
-    min_private_message_title_length: "Numărul minim de caractere permis în titlul unui mesaj"
     min_search_term_length: "Lungimea minimă a unui termen de căutare valid, în caractere."
     search_tokenize_chinese_japanese_korean: "Forțează căutarea să utilizeze tokens chineză/japoneză/coreană chiar și pe site-uri care nu sunt CJK."
     search_prefer_recent_posts: "Dacă ai un forum mare și căutarea este prea lentă, această opțiune încearcă să indexeze mai multe postări recente întâi."
@@ -851,7 +818,6 @@ ro:
     summary_likes_required: "Minimul de aprecieri într-un subiect înainte de a se activa 'Rezumă acest subiect'."
     summary_percent_filter: "Când un utilizator face click pe 'Rezumatul acestui subiect', arată primele % de postări"
     summary_max_results: "Numărul maxim de postări returnate de \"Rezumatul acestui subiect\""
-    enable_private_messages: "Acordă nivelul de încredere 1 (configurabil via nivel minim de încredere pentru trimiterea de mesaje) utilizatorilor, pentru a le permite să creeze și să răspundă la mesaje. Atenție: echipa poate oricând să trimită mesaje, indiferent de setări."
     enable_long_polling: "Bus-ul de mesaje folosit pentru notificări poate utiliza long polling."
     long_polling_base_url: "URL de bază folosit pentru long polling (atunci când un CDN servește conținut dinamic, asigură-te că setezi asta pe origin pull) ex: http://origin.site.com"
     long_polling_interval: "Durata cât serverul va trebui să aștepte înainte de a răspunde clienților atunci când nu există date de trimis (exclusiv utilizatori autentificați)"
@@ -905,7 +871,6 @@ ro:
     version_checks: "Verifică Hub-ul Discourse pentru actualizări și arată notificările de versiuni noi pe spațiul de lucru /admin ."
     new_version_emails: "Trimite un email la adresa contact_email când o nouă versiune de Discourse este disponibilă."
     invite_expiry_days: "Cât timp sunt valabile cheile de invitație ale utilizatorilor, în zile"
-    invite_passthrough_hours: "Cât timp un utilizator poate folosi o cheie de invitație acceptată anterior pentru autentificare, în ore"
     login_required: "Cere autentificare pentru a citi conținutul acestui site, blochează accesul anonim."
     min_password_length: "Lungimea minimă a parolei."
     min_admin_password_length: "Lungimea maximă a parolei pentru Admin."
@@ -922,7 +887,6 @@ ro:
     sso_overrides_avatar: "Suprascrie avatarul utilizatorului cu avatarul din datele SSO. Dacă este activat, se recomandă călduros dezactivarea allow_uploaded_avatars"
     sso_not_approved_url: "Redirecționează conturile neaprobate SSO către acest URL"
     sso_allows_all_return_paths: "Nu restricționa domeniul pentru return_paths furnizate de SSO (implicit, calea de întoarcere trebuie să fie pe site-ul curent)"
-    enable_local_logins: "Activează numele de utilizator local și conturile bazate pe autentificare cu parolă. (Notă: Pentru ca invitațiile să funcționeze, această opțiune trebuie să fie activată)"
     allow_new_registrations: "Permite înregistrarea noilor utilizatori. Debifați pentru a restricționa pe oricine să creeze un cont nou."
     enable_signup_cta: "Arată o notificare către utilizatorii anonimi care revin prin care să le ceri să se înscrie pentru a avea un cont pe site."
     enable_yahoo_logins: "Activează autentificarea cu Yahoo"
@@ -930,15 +894,12 @@ ro:
     google_oauth2_client_id: "ID client al aplicației tale Google."
     google_oauth2_client_secret: "Secret client al aplicației tale Google."
     enable_twitter_logins: "Activează autentificarea cu Twitter, necesită twitter_consumer_key and twitter_consumer_secret"
-    twitter_consumer_key: "Cheie consumator pentru autentificarea cu Twitter, înregistrată la http://dev.twitter.com"
-    twitter_consumer_secret: "Secret consumator pentru autentificarea cu Twitter, înregistrat la http://dev.twitter.com"
     enable_instagram_logins: "Activează autentificarea prin Instagram, necesită instagram_consumer_key și instagram_consumer_secret"
     instagram_consumer_key: "Cheie consumator pentru autentificarea Instagram"
     instagram_consumer_secret: "Autentificare Instagram pe bază de secret consumator"
     enable_facebook_logins: "Activează autentificarea cu Facebook, necesită facebook_app_id și facebook_app_secret"
     facebook_app_id: "ID-ul aplicației pentru autentificarea cu Facebook, înregistrată la https://developers.facebook.com/apps"
     facebook_app_secret: "App secret pentru autentificarea cu Facebook, înregistrat la https://developers.facebook.com/apps"
-    facebook_request_extra_profile_details: "Solicită informațiile despre mine, locație și website de la Facebook. (necesită ca aplicația ta de autentificare să fie aprobată de Facebook)"
     enable_github_logins: "Activează autentificarea cu Github, requires github_client_id and github_client_secret"
     github_client_id: "ID client pentru autentificarea cu Github, înregistrat la https://github.com/settings/applications"
     github_client_secret: "Secretul clientului pentru autentificarea cu Github, înregistrat la https://github.com/settings/applications"
@@ -946,7 +907,6 @@ ro:
     allow_restore: "Bifează-l doar dacă dorești să restaurezi un fișier de backup. Atenție, restaurarea poate șterge/înlocui TOATE datele din site!"
     maximum_backups: "Maximul de fișiere backup păstrate. Fișierele backup vechi sunt șterse automat"
     automatic_backups_enabled: "Rulează automat operațiuni de backup după cum este definit la frecvența de backup"
-    backup_frequency: "Cât de frecvent facem backup la site, în zile."
     enable_s3_backups: "Încarcă fișierele backup pe s3 când sunt complete. IMPORTANT: sunt necesare date de autentificare valide pentru S3 în secțiunea FIșIERE."
     s3_backup_bucket: "Containerul (bucket) de la distanță care ține backupurile. ATENȚIE: Asgură-te că e un container privat."
     s3_disable_cleanup: "Dezactivează eliminarea backup-urilor de pe S3 când sunt șterse local."
@@ -968,7 +928,6 @@ ro:
     max_bookmarks_per_day: "Numărul maxim zilnic de semne de carte per utilizator."
     max_edits_per_day: "Numărul maxim zilnic de editări per utilizator."
     max_topics_per_day: "Numărul maxim de subiecte pe care un utilizator le poare crea zilnic."
-    max_private_messages_per_day: "Număr maxim de mesaje pe care utilizatorii le pot crea pe zi."
     max_invites_per_day: "Număr maxim de invitații pe care un utilizator le poate trimite pe zi."
     max_topic_invitations_per_day: "Numărul maxim de invitații la subiect pe care un utilizator le poate trimite pe zi."
     alert_admins_if_errors_per_minute: "Numărul de erori pe minut la care să se declanșeze o alerta admin. Valoarea 0 dezactivează această funcționalitate. NOTĂ: necesită restart."
@@ -981,7 +940,6 @@ ro:
     clean_orphan_uploads_grace_period_hours: "Perioada de grație (în ore) înainte ca o reîncărcare orfană să fie ștearsă."
     purge_deleted_uploads_grace_period_days: "Perioada de grație (în zile) înainte ca o încărcare ștearsă să fie eliminată."
     enable_s3_uploads: "Pune încărcările pe spațiul Amazon S3. IMPORTANT: necesită un acces valid (atât identificatorul cheii de acces cât și cheia secretă)."
-    s3_use_iam_profile: 'Folosește rolul AWS EC2 IAM pentru retragerea cheilor. NOTĂ: activarea va suprascrie setările pentru "s3 access key id" și "s3 secret access key".'
     s3_upload_bucket: "Numele containerului Amazon S3 unde vor fi încărcate fișierele. ATENȚIE: trebuie să fie scris cu litere mici, fără puncte și fără underscore."
     s3_access_key_id: "Id cheie de acces Amazon S3 ce va fi folosit la încărcarea imaginilor."
     s3_secret_access_key: "Cheie secretă de acces Amazon S3 ce va fi folosită la încărcarea imaginilor."
@@ -1024,7 +982,6 @@ ro:
     min_trust_to_edit_wiki_post: "Nivelul de încredere minim necesar pentru a edita o postare marcată ca wiki."
     min_trust_to_edit_post: "Nivelul de încredere minim necesar pentru a edita postări."
     min_trust_to_allow_self_wiki: "Nivelul de încredere minim necesar pentru transformarea propriilor mesaje în wiki."
-    min_trust_to_send_messages: "Nivelul minim de încredere necesar pentru a crea noi mesaje private."
     newuser_max_links: "Câte linkuri poate adăuga un nou utilizator într-o postare."
     newuser_max_images: "Câte imagini poate adăuga un nou utilizator într-o postare."
     newuser_max_attachments: "Câte atașamente poate adăuga un nou utilizator într-o postare."
@@ -1034,7 +991,6 @@ ro:
     max_users_notified_per_group_mention: "Numărul maxim de utilizatori care pot primi o notificare dacă un grup este menționat (dacă pragul este atins, nici o notificare nu va fi trimisă)"
     create_thumbnails: "Creează previzualizări de tipul thumbnail și lightbox ale imaginilor ce sunt prea mari să încapă într-o postare."
     email_time_window_mins: "Așteaptă (n) minute până să trimiți un email de notificare, pentru a da utilizatorilor șansa să-și editeze și să-și finalizeze postările."
-    private_email_time_window_seconds: "Așteaptă (n) secunde înainte de a trimite emailuri de notificare privată, pentru a-i da utilizatorului șansa să își editeze sau finalizeze mesajele."
     email_posts_context: "Câte răspunsuri precedente să fie incluse drept context în email-urile de notificare."
     flush_timings_secs: "Cât de frecvent se resetează datele legate de timp de pe server, în secunde."
     title_max_word_length: "Numărul maxim de caractere din titlul unui subiect."
@@ -1185,13 +1141,11 @@ ro:
     approve_post_count: "Numărul de postări de la un utilizator simplu trebuie să fie aprobat"
     approve_unless_trust_level: "Postările utilizatorilor care au un nivel de încredere mai mic decât acesta trebuie să fie aprobate."
     approve_new_topics_unless_trust_level: "Crearea de subiecte noi pentru utilizatorii care se află sub acest nivel de încredere, trebuie aprobată"
-    notify_about_queued_posts_after: "Dacă există postări care au așteptat să fie verificate mai mult de atâtea ore, un email va fi trimis către contact_email. Setează la 0 pentru a dezactiva aceste emailuri."
     auto_close_messages_post_count: "Numărul maxim de postări permise într-un mesaj privat înainte să fie închis automat (0 pentru dezactivare) "
     auto_close_topics_post_count: "Numărul maxim de postări permise într-un subiect înainte ca acesta să fie închis automat (0 pentru dezactivare)"
     code_formatting_style: "Butonul Cod din cadrul editorului va fi setat cu opțiunea implicită pe acest stil de formatare cod "
     default_email_digest_frequency: "Frecvența implicită cu care utilizatorii primesc emailuri-rezumat."
     default_include_tl0_in_digests: "Implicit, include postări de la utilizatori noi în emailurile-rezumat. Utilizatorii pot schimba această opțiune din preferințele lor."
-    default_email_private_messages: "Implicit, trimite un email atunci când cineva trimite un mesaj unui utilizator."
     default_email_direct: "Implicit, trimite un mesaj când cineva citează/răspunde/menționează sau invită un utilizator."
     default_email_mailing_list_mode: "Implicit, trimite un email pentru fiecare nou mesaj."
     default_email_mailing_list_mode_frequency: "Implicit, utilizatorii care activează modul mailing list vor primi emailuri cu această frecvență."
@@ -1227,7 +1181,6 @@ ro:
     max_tags_in_filter_list: "Numărul maxim de etichete care să se afișeze într-un drop-down filtru. Vor fi afișate etichetele cele mai folosite."
     tags_sort_alphabetically: "Afișează etichetele în ordine alfabetică. Implicit, etichetele sunt afișate în ordinea popularității."
     tag_style: "Stil vizual pentru ecusoanele etichetă."
-    staff_tags: "O listă de etichete care nu poate fi aplicată decât de către membrii echipei."
     min_trust_level_to_tag_topics: "Nivelul minim de încredere necesar pentru a pune etichete pe subiecte."
     suppress_overlapping_tags_in_list: "Dacă etichetele corespund exact cu cuvintele din titlul subiectelor, nu mai afișa aceste etichete."
     remove_muted_tags_from_latest: "Nu afișa în lista subiectelor recente, subiectele ce au fost etichetate cu etichete setate pe silențios"
@@ -1277,21 +1230,21 @@ ro:
     not_seen_in_a_month: "Bun venit! Nu te-am mai văzut de ceva vreme. Aici sunt cele mai populare subiecte ce au apărut în timpul absenței tale."
   merge_posts:
     edit_reason:
-      one: "o postare a fost comasată de către %{username}"
-      few: "%{count} postări au fost comasate de către  %{username}"
-      other: "%{count} de postări au fost comasate de către  %{username}"
+      few: '%{count} postări au fost comasate de către  %{username}'
+      one: o postare a fost comasată de către %{username}
+      other: '%{count} de postări au fost comasate de către  %{username}'
     errors:
       different_topics: "Postările care aparțin unor subiecte diferite nu pot fi comasate."
       different_users: "Postările care aparțin unor utilizatori diferiți nu pot fi comasate."
   move_posts:
     new_topic_moderator_post:
-      one: "o postare a fost mutată într-un nou subiect: %{topic_link}"
-      few: "%{count}  postări au fost mutate într-un nou subiect: %{topic_link}"
-      other: "%{count} de postări au fost mutate într-un nou subiect: %{topic_link}"
+      few: '%{count}  postări au fost mutate într-un nou subiect: %{topic_link}'
+      one: 'o postare a fost mutată într-un nou subiect: %{topic_link}'
+      other: '%{count} de postări au fost mutate într-un nou subiect: %{topic_link}'
     existing_topic_moderator_post:
-      one: "o postare a fost comasată într-un subiect existent: %{topic_link}"
-      few: "%{count} postări au fost comasate într-un subiect existent: %{topic_link}"
-      other: "%{count} de postări au fost comasate într-un subiect existent: %{topic_link}"
+      few: '%{count} postări au fost comasate într-un subiect existent: %{topic_link}'
+      one: 'o postare a fost comasată într-un subiect existent: %{topic_link}'
+      other: '%{count} de postări au fost comasate într-un subiect existent: %{topic_link}'
   change_owner:
     post_revision_text: "Autor schimbat din %{old_user} în %{new_user}"
     deleted_user: "un utilizator șters"
@@ -1301,37 +1254,37 @@ ro:
     closed_enabled: "Acest subiect este acum închis. Nu mai sunt permise răspunsuri noi."
     closed_disabled: "Acest subiect este acum deschis. Sunt permise răspunsuri noi."
     autoclosed_message_max_posts:
-      one: "Acest mesaj va fi închis automat după ce atinge limita de maximă de un răspuns."
-      few: "Acest mesaj va fi închis automat după ce atinge limita de maximă de %{count}  răspunsuri."
-      other: "Acest mesaj va fi închis automat după ce atinge limita de maximă de %{count} de răspunsuri."
+      few: Acest mesaj va fi închis automat după ce atinge limita de maximă de %{count}  răspunsuri.
+      one: Acest mesaj va fi închis automat după ce atinge limita de maximă de un răspuns.
+      other: Acest mesaj va fi închis automat după ce atinge limita de maximă de %{count} de răspunsuri.
     autoclosed_topic_max_posts:
-      one: "Acest subiect a fost închis automat după ce a atins limita maximă de un răspuns."
-      few: "Acest subiect a fost închis automat după ce a atins limita maximă de %{count}  răspunsuri."
-      other: "Acest subiect a fost închis automat după ce a atins limita maximă de %{count} de răspunsuri."
+      few: Acest subiect a fost închis automat după ce a atins limita maximă de %{count}  răspunsuri.
+      one: Acest subiect a fost închis automat după ce a atins limita maximă de un răspuns.
+      other: Acest subiect a fost închis automat după ce a atins limita maximă de %{count} de răspunsuri.
     autoclosed_enabled_days:
-      one: "Acest subiect a fost închis automat după o zi. Nu mai sunt permise răspunsuri noi."
-      few: "Acest subiect a fost închis automat după %{count}  zile. Nu mai sunt permise răspunsuri noi."
-      other: "Acest subiect a fost închis automat după %{count} de zile. Nu mai sunt permise răspunsuri noi."
+      few: Acest subiect a fost închis automat după %{count}  zile. Nu mai sunt permise răspunsuri noi.
+      one: Acest subiect a fost închis automat după o zi. Nu mai sunt permise răspunsuri noi.
+      other: Acest subiect a fost închis automat după %{count} de zile. Nu mai sunt permise răspunsuri noi.
     autoclosed_enabled_hours:
-      one: "Acest subiect a fost închis automat după o oră. Nu mai sunt permise răspunsuri noi."
-      few: "Acest subiect a fost închis automat după %{count}  ore. Nu mai sunt permise răspunsuri noi."
-      other: "Acest subiect a fost închis automat după %{count} de ore. Nu mai sunt permise răspunsuri noi."
+      few: Acest subiect a fost închis automat după %{count}  ore. Nu mai sunt permise răspunsuri noi.
+      one: Acest subiect a fost închis automat după o oră. Nu mai sunt permise răspunsuri noi.
+      other: Acest subiect a fost închis automat după %{count} de ore. Nu mai sunt permise răspunsuri noi.
     autoclosed_enabled_minutes:
-      one: "Acest subiect a fost închis automat după un minut. Nu mai sunt permise răspunsuri noi."
-      few: "Acest subiect a fost închis automat după %{count}  minute. Nu mai sunt permise răspunsuri noi."
-      other: "Acest subiect a fost închis automat după %{count} de minute. Nu mai sunt permise răspunsuri noi."
+      few: Acest subiect a fost închis automat după %{count}  minute. Nu mai sunt permise răspunsuri noi.
+      one: Acest subiect a fost închis automat după un minut. Nu mai sunt permise răspunsuri noi.
+      other: Acest subiect a fost închis automat după %{count} de minute. Nu mai sunt permise răspunsuri noi.
     autoclosed_enabled_lastpost_days:
-      one: "Acest subiect a fost închis automat după o zi de la primul răspuns. Nu mai sunt permise răspunsuri noi."
-      few: "Acest subiect a fost închis automat după %{count}  zile de la primul răspuns. Nu mai sunt permise răspunsuri noi."
-      other: "Acest subiect a fost închis automat după %{count} de zile de la primul răspuns. Nu mai sunt permise răspunsuri noi."
+      few: Acest subiect a fost închis automat după %{count}  zile de la primul răspuns. Nu mai sunt permise răspunsuri noi.
+      one: Acest subiect a fost închis automat după o zi de la primul răspuns. Nu mai sunt permise răspunsuri noi.
+      other: Acest subiect a fost închis automat după %{count} de zile de la primul răspuns. Nu mai sunt permise răspunsuri noi.
     autoclosed_enabled_lastpost_hours:
-      one: "Acest subiect a fost închis automat după o oră de la primul răspuns. Nu mai sunt permise răspunsuri noi."
-      few: "Acest subiect a fost închis automat după %{count}  ore de la primul răspuns. Nu mai sunt permise răspunsuri noi."
-      other: "Acest subiect a fost închis automat după %{count} de ore de la primul răspuns. Nu mai sunt permise răspunsuri noi."
+      few: Acest subiect a fost închis automat după %{count}  ore de la primul răspuns. Nu mai sunt permise răspunsuri noi.
+      one: Acest subiect a fost închis automat după o oră de la primul răspuns. Nu mai sunt permise răspunsuri noi.
+      other: Acest subiect a fost închis automat după %{count} de ore de la primul răspuns. Nu mai sunt permise răspunsuri noi.
     autoclosed_enabled_lastpost_minutes:
-      one: "Acest subiect a fost închis automat după un minut de la primul răspuns. Nu mai sunt permise răspunsuri noi."
-      few: "Acest subiect a fost închis automat după %{count}  minute de la primul răspuns. Nu mai sunt permise răspunsuri noi."
-      other: "Acest subiect a fost închis automat după %{count} de minute de la primul răspuns. Nu mai sunt permise răspunsuri noi."
+      few: Acest subiect a fost închis automat după %{count}  minute de la primul răspuns. Nu mai sunt permise răspunsuri noi.
+      one: Acest subiect a fost închis automat după un minut de la primul răspuns. Nu mai sunt permise răspunsuri noi.
+      other: Acest subiect a fost închis automat după %{count} de minute de la primul răspuns. Nu mai sunt permise răspunsuri noi.
     autoclosed_disabled: "Acest subiect este acum deschis. Sunt permise răspunsuri noi."
     autoclosed_disabled_lastpost: "Acest subiect este acum deschis. Sunt permise răspunsuri noi."
     pinned_enabled: "Acest subiect este fixat. Va apărea în vârful listei de categorii până când echipa îl va dezactiva opțiunea de fixare pentru toată lumea odată,  sau până când utilizatorii vor dezactiva opțiunea, individual, pentru ei înșiși."
@@ -1383,55 +1336,13 @@ ro:
       max_new_accounts_per_registration_ip: "Nu sunt permise noi înregistrări de la adresa ta de IP (limita maximă a fost atinsă). Contactează un membru al echipei."
   flags_reminder:
     subject_template:
-      one: "un marcaj de avertizare așteptând să fie gestionat"
-      few: "%{count}  marcaje de avertizare așteptând să fie gestionate"
-      other: "%{count} de marcaje de avertizare așteptând să fie gestionate"
+      few: '%{count}  marcaje de avertizare așteptând să fie gestionate'
+      one: un marcaj de avertizare așteptând să fie gestionat
+      other: '%{count} de marcaje de avertizare așteptând să fie gestionate'
   unsubscribe_mailer:
     subject_template: "Confirmă că nu mai vrei să primești actualizări pe email de la %{site_title}"
   invite_password_instructions:
     subject_template: "Setează parolă pentru contul tău %{site_name}"
-  test_mailer:
-    text_body_template: |
-      Acesta este un email de test de la
-
-      [**%{base_url}**][0]
-
-      A te asigura că emailul se poate livra este o chestiune complicată. Aici sunt câteva lucruri pe care ar trebui să le verifici înainte de toate:
-
-      - Asigură-te *cu rigurozitate* că la setările site-ului, câmpul from: din `emailul de notificare` are adresa corectă. **Domeniul menționat în adresa din câmpul "from" al emailurilor pe care le trimiți este domeniul în raport cu care se va face validarea emailului tău**.
-
-      - ști cum să vizualizezi sursa brută a emailului în clientul tău de mail, astfel încât să poți extrage indicii prețioase din header. În Gmail, acest lucru se face cu opțiunea "arată originalul" din meniu drop-down aflat în partea din dreapta-sus a fiecărui mail.
-
-      - **IMPORTANT:** ISP-ul tău are introdusă înregistrarea pentru reverse DNS astfel încât sa asocieze numele domeniilor cu adresele IP de pe care trimiți mailuri? [Verifică-ți înregistrarea Reverse PTR][2] aici. Dacă ISP-ul tău nu a introdus corect înregistrarea reverse DNS, este foarte puțin probabil că emailul ți se va livra corect.
-
-      -  [Înregistrarea SPF][8] a domeniului tău este corectă? [Verifică-ți înregistrarea SPF][1] aici. Observă că TXT reprezintă tipul de înregistrare corect pentru SPF.
-
-      - [Înregistrarea DKIM][3] a domeniului tău este corectă? Aceasta îți poate crește semnificativ capacitatea emailului de a fi livrat. [Verifică-ți înregistrarea DKIM][7] aici.
-
-      - Dacă operezi propriul tău server de mail, asigură-te că IP-urile sale nu sunt listate pe [nicio listă neagră de emailuri][4]. Verifică, de asemenea, că trimite un hostname calificat în întregime, care se rezolvă în DNS prin mesajul său HELO. În caz contrar, multe servicii de mail îți vor respinge emailul.
-
-      - Îți recomandăm călduros să **trimiți un mail de probă [mail-tester.com][mt]** pentru a verifica dacă toate cele de mai sus funcționează corect.
-
-      (Modalitatea *ușoară* de a face asta este să îți faci un cont gratuit pe [SendGrid][sg], [SparkPost][sp], [Mailgun][mg] sau pe [Mailjet][mj], care au planuri generoase de email gratuit și suficiente pentru comunități mici. Însă tot va trebui să îți setezi înregistrările SPF și DKIM în DNS!)
-
-      Sperăm că vei primi acest test de livrare a emailurilor cu calificativul OK!
-
-      Mult noroc,
-
-      Prietenii tăi de la [Discourse](http://www.discourse.org)
-
-      [0]: %{base_url}
-      [1]: http://www.kitterman.com/spf/validate.html
-      [2]: http://mxtoolbox.com/ReverseLookup.aspx
-      [3]: http://www.dkim.org/
-      [4]: http://whatismyipaddress.com/blacklist-check
-      [7]: https://www.mail-tester.com/spf-dkim-check
-      [8]: http://www.openspf.org/SPF_Record_Syntax
-      [sg]: https://goo.gl/r1WMF6
-      [sp]: https://www.sparkpost.com/
-      [mg]: http://www.mailgun.com/
-      [mj]: https://www.mailjet.com/pricing
-      [mt]: http://www.mail-tester.com/
   flag_reasons:
     off_topic: "Postarea ta a fost marcată cu marcaj de avertizare **în afara subiectului**: comunitatea simte că nu se potrivește subiectului, așa cum e el momentan definit de titlu și de prima postare."
     inappropriate: "Postarea ta a fost marcată cu marcaj de avertizare **inadecvat**: comunitatea simte că este ofensatoare, abuzivă sau în contradicție cu [ghidul comunității noastre](/guidelines)."
@@ -1446,6 +1357,20 @@ ro:
   system_messages:
     post_hidden:
       subject_template: "Postare ascunsă din cauza marcajelor de avertizare ale comunității"
+      text_body_template: |
+        Salut,
+
+        Acesta este un mesaj automat de pe %{site_name} pentru a te informa că mesajul tău a fost ascuns.
+
+        %{base_url}%{url}
+
+        %{flag_reason}
+
+        Mai mulți membri ai comunității au marcat acestă postare cu marcaje de avertizare înainte ca ea să fie ascunsă, așa că te rugăm să îți revizuiești postarea pentru a ține cont de feedback-ul primit. **Îți poți edita postarea după %{edit_delay} minute, și ea va fi automat re-afișată**
+
+        Totuși, dacă postarea este ascunsă de comunitate pentru a doua oară, va rămâne așa până ce va fi gestionată de un membru al echipei -- și asta ar putea atrage și alte consecințe, inclusiv posibilitatea suspendării contului tău.
+
+        Pentru informații suplimentare, te rugăm să citești [ghidul comunității](%{base_url}/guidelines).
     welcome_user:
       subject_template: "Bine ai venit pe %{site_name}!"
     welcome_invite:
@@ -1497,8 +1422,6 @@ ro:
       text_body_template: "Fișierul tău de invitații multiple a fost procesat, %{sent} (de) invitații trimise."
     bulk_invite_failed:
       subject_template: "Invitația multiplă a fost procesată cu erori"
-    csv_export_succeeded:
-      subject_template: "Exportul datelor s-a terminat"
     csv_export_failed:
       subject_template: "Exportul datelor a eșuat"
     email_reject_inactive_user:
@@ -1546,13 +1469,46 @@ ro:
         Dacă există interfață utilizator web pentru contul tău POP, ar trebui să te autentifici pe ea și să îți verifici acolo setările.
     too_many_spam_flags:
       subject_template: "Cont nou suspendat"
+      text_body_template: |
+        Salut,
+
+        Acesta este un mesaj automat de pe %{site_name} pentru a te informa că postările tale au fost temporar ascunse pentru că au fost marcate cu marcaje de avertizare de către comunitate..
+
+        Ca măsura de precauție, noului tău cont i s-a blocat posibilitatea de a crea noi răspunsuri sau subiecte până ce un un membru al echipei nu îl va verifica. Ne cerem scuze pentru inconveniență.
+
+        Pentru informații suplimentare, te rugăm să citești [ghidul comunității](%{base_url}/guidelines).
     too_many_tl3_flags:
       subject_template: "Cont nou suspendat"
+      text_body_template: |
+        Salut,
+
+        Acesta este un mesaj automat de pe %{site_name} pentru a te informa că ți-a fost suspendat contul din cauza unui număr mare de marcaje de avertizare primite de la comunitate.
+
+        Ca măsura de precauție, noului tău cont i s-a blocat posibilitatea de a crea noi răspunsuri sau subiecte până ce un un membru al echipei nu îl va verifica. Ne cerem scuze pentru inconveniență.
+
+        Pentru informații suplimentare, te rugăm să citești [ghidul comunității](%{base_url}/guidelines).
+    silenced_by_staff:
+      text_body_template: |+
+        Salut,
+
+        Acesta este un mesaj automat de pe %{site_name} pentru a te informa că ți-a fost suspendat temporar contul, ca măsură de precauție.
+
+        Poți să continui să răsfoiești, dar nu vei mai putea să răspunzi sau să creezi subiecte până când un [membru al echipei](%{base_url}/about) nu îți verifică postările recente. Ne cerem scuze pentru inconveniență.
+
+        Pentru informații suplimentare, te rugăm să citești [ghidul comunității](%{base_url}/guidelines).
+
+    unsilenced:
+      text_body_template: |
+        Salut,
+
+        Acesta este un mesaj automat din partea %{site_name} pentru a vă informa cu privire la deblocarea contului dumneavoastră după o revizie a personalului.
+
+        Acum puteți crea discuții și răspunsuri noi.
     pending_users_reminder:
       subject_template:
-        one: "un utilizator în așteptarea aprobării"
-        few: "%{count}  utilizatori în așteptarea aprobării"
-        other: "%{count} de utilizatori în așteptarea aprobării"
+        few: '%{count}  utilizatori în așteptarea aprobării'
+        one: un utilizator în așteptarea aprobării
+        other: '%{count} de utilizatori în așteptarea aprobării'
       text_body_template: |
         Exista înscrieri de noi utilizatori ce așteaptă să fie aprobate (sau respinse) înainte de a putea accesa forumul.
 
@@ -1694,7 +1650,7 @@ ro:
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
-        %{message}
+          %{message}
     digest:
       why: "Un rezumat scurt al %{site_link} de la ultima ta vizită din %{last_seen_at}."
       since_last_visit: "De la ultima ta vizită"
@@ -1781,141 +1737,6 @@ ro:
     title: "FAQ/Ghid"
   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: |
@@ -2007,22 +1828,22 @@ ro:
         Acest ecuson se acordă când, pentru prima dată, îți editezi una din postări. Deși nu poți să îți editezi postările la infinit, editarea este întotdeauna o idee buna: poți să îți îmbunătățești postările, să corectezi micile greșeli sau să adaugi chestii pe care le-ai uitat când ai postat prima dată. Editează ca să îți faci postările să strălucească.
     basic_user:
       name: Simplu utilizator
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Ți-au fost acordate</a> toate funcțiile esențiale ale comunității
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">Ți-au fost acordate</a> toate funcțiile esențiale ale comunității"
       long_description: |
         Acest ecuson se acordă când ai ajuns la nivelul de încredere 1. Îți mulțumim că stai nițel pe aici ca să citești câteva subiecte și să înveți despre ce anume e comunitatea noastră. Restricțiile de utilizator nou ți-au fost ridicate; ți-au fost acordate toate capacitățile esențiale, precum trimiterea de mesaje personale, marcarea cu marcaje de avertizare, editare wiki, și capacitatea de a posta imagini și link-uri multiple.
     member:
       name: Membru
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Ți s-au acordat</a> invitații, mesaje în grup, mai multe aprecieri
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">Ți s-au acordat</a> invitații, mesaje în grup, mai multe aprecieri"
       long_description: |
         Acest ecuson se acordă când ajungi la nivelul de încredere 2. Îți mulțumim că încerci de câteva săptămâni să te alături cu adevărat comunității noastre.
     regular:
       name: Utilizator frecvent
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Ți s-au acordat</a> recategorizare, redenumire, link-uri urmărite, wiki, mai multe aprecieri
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">Ți s-au acordat</a> recategorizare, redenumire, link-uri urmărite, wiki, mai multe aprecieri"
       long_description: |
         Acest ecuson se acordă atunci când ai atins nivelul de încredere 3. Îți mulțumim că ești un utilizator frecvent, „adevărat client al casei” în comunitatea noastră, deja de câteva luni de zile. Acum ești unul dintre cei mai activi cititori și un contributor de încredere care ne ridică întreaga comunitate. Acum vei avea posibilitatea să recategorisești și redenumești subiecte, să utilizezi marcaje de avertizare spam mai puternice, să ai acces la zona privată de sufragerie, și o să primești mult mai multe aprecieri în fiecare zi.
     leader:
       name: Lider
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Ți s-au acordat</a> editare globală, fixare, închidere, arhivare, divizare și comasare, mai multe aprecieri
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">Ți s-au acordat</a> editare globală, fixare, închidere, arhivare, divizare și comasare, mai multe aprecieri"
       long_description: |
         Acest ecuson se acordă când ajungi la nivelul de încredere 4. Ești un lider al acestei comunități, după cum te-a selectat echipa și, reprezinți un exemplu pozitiv prin acțiunile și cuvintele tale. Ai capacitatea să editezi toate postările, să aplici acțiuni de moderare obișnuite precum fixare, închidere, delistare, arhivare, divizare și comasare, și ai tone de aprecieri pe zi.
     welcome:
@@ -2034,7 +1855,7 @@ ro:
       name: Autobiograf
     anniversary:
       name: Aniversare
-      description: Ești membru activ de un an, ai postat cel puțin odată
+      description: "Ești membru activ de un an, ai postat cel puțin odată"
       long_description: |
         Acest ecuson se acordă când ai împlinit un an de când ești membru și ai avut cel puțin o postare în acest timp. Îți mulțumim că stai prin zonă și contribui la comunitatea noastră. Nu ne-am putea descurca fără tine.
     nice_post:
@@ -2095,8 +1916,6 @@ ro:
     promoter:
       name: Promotor
       description: Ai invitat un utilizator
-      long_description: |
-        Acest ecuson se acordă când ai invitat pe cineva să se alăture comunității noastre prin intermediul butonului Invită din pagina ta de utilizator, sau de la sfârșitul unui subiect. Invitarea prietenilor care pot fi interesați în discuții specifice reprezintă o metodă minunată de a introduce oameni noi în comunitatea noastră, asa că mulțumim!
     campaigner:
       name: șef de campanie
       description: Ai invitat 3 utilizatori simpli
@@ -2192,22 +2011,19 @@ ro:
     first_emoji:
       name: Primul emoji
       description: Ai folosit un emoji într-o postare.
-      long_description: |
-        Acest ecuson se acordă prima data când adaugi un emoji la postarea ta :thumbsup:. Emoji permit transmiterea de emoții prin postări, de la fericire :smiley: la tristețe :anguished: la furie :angry: și întreaga planetă :sunglasses: . Apasă un : (două puncte) sau apasă pe butonul Emoji toolbar din editor pentru a alege dintre sute de opțiuni :ok_hand:
     first_mention:
       name: Prima mențiune
-      long_description: Acest ecuson se acordă când, pentru prima oară, ai menționat @numele de utilizator al cuiva într-o postare de-a ta. Fiecare menționare generează o notificare către acea persoană, astfel încât ea să știe despre postarea ta. Începi prin a apăsa tasta @ (simbolul at) ca să menționezi orice utilizator sau, dacă îți este permis, grup. E o metodă convenabilă să atragi atenția cuiva.
+      long_description: "Acest ecuson se acordă când, pentru prima oară, ai menționat @numele de utilizator al cuiva într-o postare de-a ta. Fiecare menționare generează o notificare către acea persoană, astfel încât ea să știe despre postarea ta. Începi prin a apăsa tasta @ (simbolul at) ca să menționezi orice utilizator sau, dacă îți este permis, grup. E o metodă convenabilă să atragi atenția cuiva."
     first_onebox:
       name: Primul onebox
       description: Ai postat un link care a devenit onebox
-      long_description: Acest ecuson se acordă când, pentru prima data, ai postat un link singur pe line, ceea ce a făcut ca automat să fie expandat într-un onebox cu un scurt rezumat al link-ului, un titlu și (dacă e disponibilă) cu o poză.
+      long_description: "Acest ecuson se acordă când, pentru prima data, ai postat un link singur pe line, ceea ce a făcut ca automat să fie expandat într-un onebox cu un scurt rezumat al link-ului, un titlu și (dacă e disponibilă) cu o poză."
     first_reply_by_email:
       name: Forum prin email
       long_description: |
         Acest ecuosn se acordă când ai răspuns pentru prima dată la o postare prin email :e-mail:.
   admin_login:
     success: "Emailul a fost trimis"
-    error: "Eroare!"
     email_input: "Email Admin"
     submit_button: "Trimite email"
   performance_report:
@@ -2342,6 +2158,3 @@ ro:
         description: |
           <p>Dacă vei dori vreodată să schimbi aceste setări, vizitează <a href='/admin' target='_blank'>secțiunea admin</a>; care se găsește lângă iconița cu cheia franceză din meniul site-ului.</p>
           <p>Distracție plăcută și mult succes<a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>la construcția noii comunități!</a></p>
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index 4f956b82127..c03072a3b25 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -17,12 +17,12 @@ ru:
       date_only: "%d.%m.%Y"
       long: "%d.%m.%Y %H:%M:%S"
   date:
-    month_names: [null, Январь, Февраль, Март, Апрель, Май, Июнь, Июль, Август, Сентябрь, Октябрь, Ноябрь, Декабрь]
+    month_names: [~, Январь, Февраль, Март, Апрель, Май, Июнь, Июль, Август, Сентябрь, Октябрь, Ноябрь, Декабрь]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "до полудня"
     pm: "после полудня"
-    <<: *datetime_formats
   title: "Discourse"
   topics: "Темы"
   posts: "сообщения"
@@ -65,19 +65,18 @@ ru:
       present: должно быть пустым
       confirmation: "не совпадает с %{attribute}"
       empty: не может быть пустым
-      equal_to: должно быть равно %{count}
+      equal_to: "должно быть равно %{count}"
       even: должно быть четным
       exclusion: зарезервировано
-      greater_than: должно быть больше чем %{count}
-      greater_than_or_equal_to: должно быть больше или равно %{count}
+      greater_than: "должно быть больше чем %{count}"
+      greater_than_or_equal_to: "должно быть больше или равно %{count}"
       has_already_been_used: "уже было использовано"
       inclusion: не включен в список
       invalid: неверный
       is_invalid: "Не совсем ясно, это предложение закончено?"
       contains_censored_words: "содержит следующие запрещенные слова  %{censored_words}"
-      matches_censored_pattern: "содержит запрещенные на сайте выражения, которые соответствуют шаблону  %{censored_words}"
-      less_than: должен быть меньше %{count}
-      less_than_or_equal_to: должен быть меньше или равен %{count}
+      less_than: "должен быть меньше %{count}"
+      less_than_or_equal_to: "должен быть меньше или равен %{count}"
       not_a_number: не число
       not_an_integer: должно быть целым
       odd: должно быть нечетным
@@ -85,25 +84,9 @@ ru:
       restrict_dependent_destroy:
         one: "Невозможно удалить запись, т.к. существует зависимая запись: %{record}"
         many: "Невозможно удалить запись, т.к. существует зависимая запись: %{record}"
-      too_long:
-        one: слишком длинное (максимум 1 символ)
-        few: слишком длинное (максимум %{count} символов)
-        other: слишком длинное (максимум %{count} символов)
-      too_short:
-        one: слишком короткое (минимум 1 символ)
-        few: слишком короткое (минимум %{count} символов)
-        other: слишком короткое (минимум %{count} символов)
-      wrong_length:
-        one: недопустимой длины (должен быть 1 символ)
-        few: недопустимой длины (должно быть %{count} символов)
-        other: недопустимой длины (должно быть %{count} символов)
       other_than: "не должно быть равно %{count}"
     template:
       body: 'Обнаружены ошибки в следующих полях:'
-      header:
-        one: 1 ошибка препятствует сохранению %{model}
-        few: '%{count} ошибки препятствует сохранению %{model}'
-        other: '%{count} ошибок препятствуют сохранению %{model}'
     embed:
       load_from_remote: "Произошла ошибка при загрузке сообщения."
     site_settings:
@@ -113,6 +96,9 @@ ru:
       max_username_length_range: "Нельзя установить максимум ниже минимума."
       default_categories_already_selected: "Нельзя выбрать раздел, используемый в другом списке."
       s3_upload_bucket_is_required: "Нельзя включить загрузки на S3, пока не задана настройка 's3_upload_bucket'."
+  activemodel:
+    errors:
+      <<: *errors
   invite:
     not_found: "Неверный код приглашения. Пожалуйста, свяжитесь с администратором сайта."
     user_exists: "Нет необходимости приглашать <b>%{email}</b>, у него уже есть <a href='/u/%{username}/summary'>аккаунт</a>!"
@@ -133,10 +119,10 @@ ru:
   reading_time: "Время на прочтение"
   likes: "Лайков"
   too_many_replies:
-    one: "Извините, новые пользователи могут оставлять только один ответ к теме."
-    few: "Извините, новые пользователи могут оставлять только %{count} ответов к одной теме."
-    many: "Извините, новые пользователи могут оставлять только %{count} ответов к одной теме."
-    other: "Извините, новые пользователи могут оставлять только %{count} ответ(ов) к одной теме."
+    few: Извините, новые пользователи могут оставлять только %{count} ответов к одной теме.
+    many: Извините, новые пользователи могут оставлять только %{count} ответов к одной теме.
+    one: Извините, новые пользователи могут оставлять только один ответ к теме.
+    other: Извините, новые пользователи могут оставлять только %{count} ответ(ов) к одной теме.
   embed:
     start_discussion: "Начать обсуждение"
     continue: "Продолжить обсуждение"
@@ -146,49 +132,50 @@ ru:
     no_hosts: "Никаких хостов не настроено для встраивания."
     configure: "Настроить Встраивание"
     more_replies:
-      one: "Еще 1 ответ"
-      few: "Еще %{count} ответа"
-      many: "Еще %{count} ответов"
-      other: "Еще %{count} ответов"
+      few: Еще %{count} ответа
+      many: Еще %{count} ответов
+      one: Еще 1 ответ
+      other: Еще %{count} ответов
     loading: "Загрузка обсуждения..."
     permalink: "Постоянная ссылка"
     imported_from: "Это обсуждение публикации %{link}"
     in_reply_to: "▶ %{username}"
     replies:
-      one: "1 ответ"
-      few: "%{count} ответа"
-      many: "%{count} ответов"
-      other: "%{count} ответов"
+      few: '%{count} ответа'
+      many: '%{count} ответов'
+      one: 1 ответ
+      other: '%{count} ответов'
   no_mentions_allowed: "Извините, но вы не можете упоминать других пользователей."
   too_many_mentions:
-    one: "Извините, но вы можете упоминать только одного пользователя в сообщении."
-    few: "Извините, но вы можете упоминать только %{count} пользователей в сообщении."
-    many: "Извините, но вы можете упоминать только %{count} пользователей в сообщении."
-    other: "Извините, но вы можете упоминать только %{count} пользователей в сообщении."
+    few: Извините, но вы можете упоминать только %{count} пользователей в сообщении.
+    many: Извините, но вы можете упоминать только %{count} пользователей в сообщении.
+    one: Извините, но вы можете упоминать только одного пользователя в сообщении.
+    other: Извините, но вы можете упоминать только %{count} пользователей в сообщении.
   no_mentions_allowed_newuser: "Извините, новые пользователи не могут упоминать других пользователей."
   too_many_mentions_newuser:
-    one: "Извините, новые пользователи могут упоминать только одного пользователя в каждом сообщении."
-    few: "Извините, новые пользователи могут упоминать только %{count} пользователей в сообщении."
-    many: "Извините, новые пользователи могут упоминать только %{count} пользователей в сообщении."
-    other: "Извините, новые пользователи могут упоминать только %{count} пользователей в сообщении."
+    few: Извините, новые пользователи могут упоминать только %{count} пользователей в сообщении.
+    many: Извините, новые пользователи могут упоминать только %{count} пользователей в сообщении.
+    one: Извините, новые пользователи могут упоминать только одного пользователя в каждом сообщении.
+    other: Извините, новые пользователи могут упоминать только %{count} пользователей в сообщении.
   no_images_allowed: "Извините, новые пользователи не могут прикреплять изображения."
   too_many_images:
-    one: "Извините, новые пользователи могут прикреплять только одно изображение к сообщению."
-    few: "Извините, новые пользователи могут прикреплять только %{count} изображений к сообщению."
-    many: "Извините, новые пользователи могут прикреплять только %{count} изображений к сообщению."
-    other: "Извините, новые пользователи могут прикреплять только %{count} изображений к сообщению."
+    few: Извините, новые пользователи могут прикреплять только %{count} изображений к сообщению.
+    many: Извините, новые пользователи могут прикреплять только %{count} изображений к сообщению.
+    one: Извините, новые пользователи могут прикреплять только одно изображение к сообщению.
+    other: Извините, новые пользователи могут прикреплять только %{count} изображений к сообщению.
   no_attachments_allowed: "К сожалению, загрузка файлов недоступна новым пользователям."
   too_many_attachments:
-    one: "К сожалению, новые пользователи могут добавить только одно вложение в сообщение."
-    few: "К сожалению, новые пользователи могут добавить только %{count} вложений в сообщение."
-    many: "К сожалению, новые пользователи могут добавить только %{count} вложений в сообщение."
-    other: "К сожалению, новые пользователи могут добавить только %{count} вложений в сообщение."
+    few: К сожалению, новые пользователи могут добавить только %{count} вложений в сообщение.
+    many: К сожалению, новые пользователи могут добавить только %{count} вложений в сообщение.
+    one: К сожалению, новые пользователи могут добавить только одно вложение в сообщение.
+    other: К сожалению, новые пользователи могут добавить только %{count} вложений в сообщение.
   no_links_allowed: "Извините, новые пользователи не могут размещать ссылки."
+  links_require_trust: "Извините, Вы не можете включать ссылки в Ваши сообщения."
   too_many_links:
-    one: "Извините, новые пользователи могут размещать только одну ссылку в сообщении."
-    few: "Извините, новые пользователи могут размещать только %{count} ссылок в сообщении."
-    many: "Извините, новые пользователи могут размещать только %{count} ссылок в сообщении."
-    other: "Извините, новые пользователи могут размещать только %{count} ссылок в сообщении."
+    few: Извините, новые пользователи могут размещать только %{count} ссылок в сообщении.
+    many: Извините, новые пользователи могут размещать только %{count} ссылок в сообщении.
+    one: Извините, новые пользователи могут размещать только одну ссылку в сообщении.
+    other: Извините, новые пользователи могут размещать только %{count} ссылок в сообщении.
   spamming_host: "Извините, вы не можете разместить ссылку в этом сообщении."
   user_is_suspended: "Заблокированным пользователям запрещено писать."
   topic_not_found: "Что-то пошло не так. Возможно, эта тема была закрыта или заархивирована, пока вы ее читали?"
@@ -231,12 +218,10 @@ ru:
   excerpt_image: "изображение"
   queue:
     delete_reason: "Удалено по запросу модератора."
+    not_found: "Сообщение не найдено или уже обновлено."
   groups:
-    success:
-      bulk_add: "%{users_added}пользователей было добавлено в группу."
     errors:
       can_not_modify_automatic: "Вы не можете изменить автоматическую группу."
-      member_already_exist: "'%{username}' уже является членом этой группы."
       invalid_domain: "'%{domain}' является некорректным доменом."
       invalid_incoming_email: "'%{email}' не является корректным адресом электронной почты"
       email_already_used_in_group: "'%{email}' уже используется группой '%{group_name}'."
@@ -256,11 +241,11 @@ ru:
       title: "Запрос на участие в группе %{group_name}"
   education:
     until_posts:
-      one: "1 сообщение"
-      few: "%{count} сообщения"
-      many: "%{count} сообщений"
-      other: "%{count} сообщений"
-    new-topic: |
+      few: '%{count} сообщения'
+      many: '%{count} сообщений'
+      one: 1 сообщение
+      other: '%{count} сообщений'
+    'new-topic': |
       Добро пожаловать на сайт %{site_name} &mdash; **Спасибо за открытие новой темы!**
 
       Когда вы создаете новую тему, подумайте:
@@ -272,7 +257,7 @@ ru:
       - Постарайтесь включить в текст сообщения подходящие теги, по которым другие смогут *найти* тему. Выберите раздел, к которому ваша тема подходит по смыслу.
 
       Больше информации вы найдете в нашем [руководстве пользователя](/guidelines). Данное окно будет показываться, пока вы создаете свои первые %{education_posts_text}.
-    new-reply: |
+    'new-reply': |
       Добро пожаловать на сайт %{site_name} &mdash; **Спасибо за участие в обсуждении!**
 
       - Как вы думаете, улучшит ли ваш ответ обсуждение в целом, хотя бы немного?
@@ -308,13 +293,12 @@ ru:
       user_profile:
         bio_raw: "Обо мне"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Прикреплять предупреждения можно только к приватным сообщениям."
               too_many_users: "Можно отправлять предупреждения только одному пользователю за раз."
-              cant_send_pm: "Извините, вы не можете посылать личные сообщения данному пользователю."
               no_user_selected: "Вы должны выбрать корректного пользователя."
             featured_link:
               invalid: "недействителен. URL должен включать http:// или https://."
@@ -340,7 +324,10 @@ ru:
           attributes:
             payload_url:
               invalid: "URL недействителен. URL должен включает в себя HTTP: // или https: //. И ни один пустой не допускается."
-      <<: *errors
+        watched_word:
+          attributes:
+            word:
+              too_many: "Слишком много слов для этого действия"
   user_profile:
     no_info_other: "<div class='missing-profile'>%{name} еще не заполнил поле «Обо мне» в своём профайле. </div>"
   vip_category_name: "Фойе"
@@ -355,25 +342,25 @@ ru:
     title: "Добро пожаловать в Фойе"
     body: |2
 
-      Поздравляем! :confetti_ball:
+        Поздравляем! :confetti_ball:
 
-      Если вы видите данное сообщение, вы достигли уровня **regular** (уровень доверия 3).
+        Если вы видите данное сообщение, вы достигли уровня **regular** (уровень доверия 3).
 
-      Увас появились новые возможности &hellip;
+        Увас появились новые возможности &hellip;
 
-      * Вы можете редактировать заголовок любого обсуждения
-      * Вы можете менять категорию обсуждения
-      * С ваших ссылок снимается ограничения nofollow ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) is removed)
-      * Вы получили доступ к закрытым категориям, которые доступны только для уровня доверия 3 и выше
-      * Вы можете скрывать нежелательные сообщения в один клик
+        * Вы можете редактировать заголовок любого обсуждения
+        * Вы можете менять категорию обсуждения
+        * С ваших ссылок снимается ограничения nofollow ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) is removed)
+        * Вы получили доступ к закрытым категориям, которые доступны только для уровня доверия 3 и выше
+        * Вы можете скрывать нежелательные сообщения в один клик
 
-      С полным списком привелегий вы можете ознакомиться тут [current list of fellow regulars](/badges/3/regular). Пожалуйста прочитайте это.
+        С полным списком привелегий вы можете ознакомиться тут [current list of fellow regulars](/badges/3/regular). Пожалуйста прочитайте это.
 
-      Спасибо Вам за то что являетесь важным членом нашего сообщества!
+        Спасибо Вам за то что являетесь важным членом нашего сообщества!
 
-      (Для получения более детальной информации об уронях доверия посмотрите тут [see this topic][trust]. Напоминаем что данный уровень доверия сохраняется до тех пор пока вы придерживаетесь этих правил.)
+        (Для получения более детальной информации об уронях доверия посмотрите тут [see this topic][trust]. Напоминаем что данный уровень доверия сохраняется до тех пор пока вы придерживаетесь этих правил.)
 
-      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Описание раздела %{category}"
     replace_paragraph: "(Замените первый параграф лаконичным описанием новой категории. Данное описание будет отражено в области выбора категории, поэтому желательно ограничиться 200 символами. ** Пока вы не измените данное описание или создадите темы, данная категория не появится на странице категорий.**)"
@@ -385,14 +372,15 @@ ru:
       invalid_email_in: "'%{email}' не является корректным адресом электронной почты"
       email_already_used_in_group: "'%{email}' уже используется группой '%{group_name}'."
       email_already_used_in_category: "'%{email}' уже используется категорией '%{category_name}'."
+      description_incomplete: "Описание категории должна иметь по крайней мере один абзац."
     cannot_delete:
       uncategorized: "Нельзя удалить раздел, предназначенный для тем вне разделов"
       has_subcategories: "Невозможно удалить этот раздел, т.к. в нем есть подразделы."
       topic_exists:
-        one: "Невозможно удалить этот раздел, т.к. в нем содержится тема - %{topic_link}."
-        few: "Невозможно удалить этот раздел, т.к. в нем содержатся %{count} тем(ы). Самая старая - %{topic_link}."
-        many: "Невозможно удалить этот раздел, т.к. в нем содержатся %{count} тем(ы). Самая старая - %{topic_link}."
-        other: "Невозможно удалить этот раздел, т.к. в нем содержатся %{count} тем(ы). Самая старая - %{topic_link}."
+        few: Невозможно удалить этот раздел, т.к. в нем содержатся %{count} тем(ы). Самая старая - %{topic_link}.
+        many: Невозможно удалить этот раздел, т.к. в нем содержатся %{count} тем(ы). Самая старая - %{topic_link}.
+        one: Невозможно удалить этот раздел, т.к. в нем содержится тема - %{topic_link}.
+        other: Невозможно удалить этот раздел, т.к. в нем содержатся %{count} тем(ы). Самая старая - %{topic_link}.
       topic_exists_no_oldest: "Невозможно удалить этот раздел, т.к. количество тем в нем равно %{count}."
     uncategorized_description: "Темы, которым не нужен раздел, или которые не попадают ни в один из существующих разделов."
   trust_levels:
@@ -408,151 +396,136 @@ ru:
       title: "лидер"
     change_failed_explanation: "Вы пытаетесь понизить пользователя %{user_name} до уровня доверия '%{new_trust_level}'. Однако, его уровень доверия уже '%{current_trust_level}'. %{user_name} останется с уровнем доверия '%{current_trust_level}'. Если вы все же хотите понизить пользователя, заблокируйте вначале уровень доверия."
   rate_limiter:
-    slow_down: "Вы выполняли это действие слишком часто, попробуйте еще раз позже."
-    too_many_requests: "Вы повторяете действие слишком часто. Пожалуйста, подождите %{time_left} до следующей попытки."
-    by_type:
-      first_day_replies_per_day: "Вы достигли лимита на создание ответов для нового пользователя в первый день на сайте. Пожалуйста, попробуйте через %{time_left}."
-      first_day_topics_per_day: "Вы достигли лимита на создание тем для нового пользователя в первый день на сайте. Пожалуйста, попробуйте через %{time_left}."
-      create_topic: "Вы создаете темы слишком быстро. Пожалуйста, подождите %{time_left}, затем повторите попытку"
-      create_post: "Вы отвечаете слишком быстро. Пожалуйста, подождите %{time_left} слева, затем повторите попытку."
-      delete_post: "Вы удаляете сообщения слишком быстро. Пожалуйста, подождите %{time_left} перед следующей попыткой."
-      public_group_membership: "Вы присоединяетесь/покидаете группы слишком часто. Пожалуйста, подождите %{time_left} перед следующей попыткой."
-      topics_per_day: "Вы достигли лимита новых тем на сегодня. Пожалуйста, подождите %{time_left} перед следующей попыткой."
-      pms_per_day: "Вы достигли лимита сообщений на сегодня. Пожалуйста, подождите %{time_left} перед следующей попыткой."
-      create_like: "Вы достигли лимита симпатий на сегодня. Пожалуйста, подождите %{time_left} перед следующей попыткой."
-      create_bookmark: "Вы достигли лимита закладок на сегодня. Пожалуйста, подождите %{time_left} перед следующей попыткой."
-      unsubscribe_via_email: "Вы достигли лимита отказа от подписок через email на сегодня. Пожалуйста, подождите %{time_left} перед следующей попыткой."
-      topic_invitations_per_day: "На сегодня вы достигли лимита приглашений в темы. Пожалуйста, подождите %{time_left} перед следующей попыткой."
     hours:
-      one: "1 час"
-      few: "1 часа"
-      many: "%{count} часов"
-      other: "%{count} часов"
+      few: 1 часа
+      many: '%{count} часов'
+      one: 1 час
+      other: '%{count} часов'
     minutes:
-      one: "1 минута"
-      few: "1 минуты"
-      many: "%{count} минут"
-      other: "%{count} минут"
+      few: 1 минуты
+      many: '%{count} минут'
+      one: 1 минута
+      other: '%{count} минут'
     seconds:
-      one: "1 секунда"
-      few: "1 секунды"
-      many: "%{count} секунд"
-      other: "%{count} секунд"
+      few: 1 секунды
+      many: '%{count} секунд'
+      one: 1 секунда
+      other: '%{count} секунд'
   datetime:
     distance_in_words:
       half_a_minute: "< 1 мин"
       less_than_x_seconds:
-        one: "< 1 сек"
-        few: "< %{count} сек"
-        many: "< %{count} сек"
-        other: "< %{count} сек"
+        few: < %{count} сек
+        many: < %{count} сек
+        one: < 1 сек
+        other: < %{count} сек
       x_seconds:
-        one: "1 сек"
-        few: "%{count} сек"
-        many: "%{count} сек"
-        other: "%{count} сек"
+        few: '%{count} сек'
+        many: '%{count} сек'
+        one: 1 сек
+        other: '%{count} сек'
       less_than_x_minutes:
-        one: "< 1 мин"
-        few: "< %{count} мин"
-        many: "< %{count} мин"
-        other: "< %{count} мин"
+        few: < %{count} мин
+        many: < %{count} мин
+        one: < 1 мин
+        other: < %{count} мин
       x_minutes:
-        one: "1 мин"
-        few: "%{count} мин"
-        many: "%{count} мин"
-        other: "%{count} мин"
+        few: '%{count} мин'
+        many: '%{count} мин'
+        one: 1 мин
+        other: '%{count} мин'
       about_x_hours:
-        one: "1 ч"
-        few: "%{count} ч"
-        many: "%{count} ч"
-        other: "%{count} ч"
+        few: '%{count} ч'
+        many: '%{count} ч'
+        one: 1 ч
+        other: '%{count} ч'
       x_days:
-        one: "1 дн"
-        few: "%{count} дн"
-        many: "%{count} дн"
-        other: "%{count} дн"
+        few: '%{count} дн'
+        many: '%{count} дн'
+        one: 1 дн
+        other: '%{count} дн'
       about_x_months:
-        one: "1 мес"
-        few: "%{count} мес"
-        many: "%{count} мес"
-        other: "%{count} мес"
+        few: '%{count} мес'
+        many: '%{count} мес'
+        one: 1 мес
+        other: '%{count} мес'
       x_months:
-        one: "1 мес"
-        few: "%{count} мес"
-        many: "%{count} мес"
-        other: "%{count} мес"
+        few: '%{count} мес'
+        many: '%{count} мес'
+        one: 1 мес
+        other: '%{count} мес'
       about_x_years:
-        one: "1 год"
-        few: "%{count} года"
-        many: "%{count} лет"
-        other: "%{count} лет"
+        few: '%{count} года'
+        many: '%{count} лет'
+        one: 1 год
+        other: '%{count} лет'
       over_x_years:
-        one: "> 1 года"
-        few: "> %{count} года"
-        many: "> %{count} лет"
-        other: "> %{count} лет"
+        few: '> %{count} года'
+        many: '> %{count} лет'
+        one: '> 1 года'
+        other: '> %{count} лет'
       almost_x_years:
-        one: "1 год"
-        few: "%{count} года"
-        many: "%{count} лет"
-        other: "%{count} лет"
+        few: '%{count} года'
+        many: '%{count} лет'
+        one: 1 год
+        other: '%{count} лет'
     distance_in_words_verbose:
       half_a_minute: "только что"
       less_than_x_seconds:
-        one: "только что"
-        few: "только что"
-        many: "только что"
-        other: "только что"
+        few: только что
+        many: только что
+        one: только что
+        other: только что
       x_seconds:
-        one: "1 секунду назад"
-        few: "%{count} секунды назад"
-        many: "%{count} секунд назад"
-        other: "%{count} секунд назад"
+        few: '%{count} секунды назад'
+        many: '%{count} секунд назад'
+        one: 1 секунду назад
+        other: '%{count} секунд назад'
       less_than_x_minutes:
-        one: "менее 1 минуты назад"
-        few: "менее %{count} минут назад"
-        many: "менее %{count} минут назад"
-        other: "менее %{count} минут назад"
+        few: менее %{count} минут назад
+        many: менее %{count} минут назад
+        one: менее 1 минуты назад
+        other: менее %{count} минут назад
       x_minutes:
-        one: "1 минуту назад"
-        few: "%{count} минуты назад"
-        many: "%{count} минут назад"
-        other: "%{count} минут назад"
+        few: '%{count} минуты назад'
+        many: '%{count} минут назад'
+        one: 1 минуту назад
+        other: '%{count} минут назад'
       about_x_hours:
-        one: "1 час назад"
-        few: "%{count} часа назад"
-        many: "%{count} часов назад"
-        other: "%{count} часов назад"
+        few: '%{count} часа назад'
+        many: '%{count} часов назад'
+        one: 1 час назад
+        other: '%{count} часов назад'
       x_days:
-        one: "1 день назад"
-        few: "%{count} дня назад"
-        many: "%{count} дней назад"
-        other: "%{count} дней назад"
+        few: '%{count} дня назад'
+        many: '%{count} дней назад'
+        one: 1 день назад
+        other: '%{count} дней назад'
       about_x_months:
-        one: "около 1 месяца назад"
-        few: "около %{count} месяцев назад"
-        many: "около %{count} месяцев назад"
-        other: "около %{count} месяцев назад"
+        few: около %{count} месяцев назад
+        many: около %{count} месяцев назад
+        one: около 1 месяца назад
+        other: около %{count} месяцев назад
       x_months:
-        one: "1 месяц назад"
-        few: "%{count} месяца назад"
-        many: "%{count} месяцев назад"
-        other: "%{count} месяцев назад"
+        few: '%{count} месяца назад'
+        many: '%{count} месяцев назад'
+        one: 1 месяц назад
+        other: '%{count} месяцев назад'
       about_x_years:
-        one: "около 1 года назад"
-        few: "около %{count} лет назад"
-        many: "около %{count} лет назад"
-        other: "около %{count} лет назад"
+        few: около %{count} лет назад
+        many: около %{count} лет назад
+        one: около 1 года назад
+        other: около %{count} лет назад
       over_x_years:
-        one: "более 1 года назад"
-        few: "более %{count} лет назад"
-        many: "более %{count} лет назад"
-        other: "более %{count} лет назад"
+        few: более %{count} лет назад
+        many: более %{count} лет назад
+        one: более 1 года назад
+        other: более %{count} лет назад
       almost_x_years:
-        one: "почти 1 год назад"
-        few: "почти %{count} года назад"
-        many: "почти %{count} лет назад"
-        other: "почти %{count} лет назад"
+        few: почти %{count} года назад
+        many: почти %{count} лет назад
+        one: почти 1 год назад
+        other: почти %{count} лет назад
   password_reset:
     no_token: "К сожалению, данная ссылка на изменение пароля устарела.  Нажмите на кнопку \"Войти\", а затем на \"Я забыл свой пароль\", чтобы сгенерировать новую ссылку для изменения пароля."
     choose_new: "Введите новый пароль"
@@ -596,7 +569,6 @@ ru:
       long_form: 'отметить как неуместное'
     notify_user:
       title: 'Отправить @{{username}} личное сообщение'
-      description: 'Я хочу обсудить это сообщение с автором приватно и не привлекая внимания модераторов.'
       long_form: 'оповещаемый пользователь'
       email_title: 'Ваше сообщение в теме "%{title}"'
       email_body: "%{link}\n\n%{message}\n"
@@ -682,9 +654,7 @@ ru:
       xaxis: "Дата"
       yaxis: "Количество визитов"
     signups:
-      title: "Регистрации"
       xaxis: "Дата"
-      yaxis: "Количество регистраций"
     profile_views:
       title: "Просмотры профилей"
       xaxis: "Дата"
@@ -722,7 +692,6 @@ ru:
       xaxis: "Дата"
       yaxis: "Количество электронных писем"
     user_to_user_private_messages:
-      title: "Личные сообщения"
       xaxis: "Дата"
       yaxis: "Количество сообщений"
     system_private_messages:
@@ -769,7 +738,6 @@ ru:
       xaxis: "Дата"
       yaxis: "Просмотров страниц поисковыми системами"
     page_view_total_reqs:
-      title: "Всего"
       xaxis: "Дата"
       yaxis: "Всего Просмотров Страниц"
     page_view_logged_in_mobile_reqs:
@@ -830,16 +798,13 @@ ru:
   site_settings:
     censored_words: "Слова, которые будут автоматически заменены на &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Автоматически удалять сообщения, скрытые дольше чем 30 дней."
-    default_locale: "Язык по умолчанию для данного экземпляра Discourse (ISO 639-1 Code)"
     allow_user_locale: "Позволять пользователям выбирать язык интерфейса"
     min_post_length: "Минимально допустимое количество символов в одном сообщении."
     min_first_post_length: "Минимально допустимое количество символов в первом сообщении (или теле темы)"
-    min_private_message_post_length: "Минимально допустимое количество символов в сообщении в беседе."
     max_post_length: "Максимально допустимое количество символов в одном сообщении."
     topic_featured_link_enabled: "Разрешить публиковать ссылку с темами."
     min_topic_title_length: "Минимально допустимое количество символов в названии темы."
     max_topic_title_length: "Максимально допустимое количество символов в названии темы."
-    min_private_message_title_length: "Минимально допустимое количество символов в заголовке сообщения в беседе."
     min_search_term_length: "Минимальное количество символов в поисковом запросе."
     allow_duplicate_topic_titles: "Разрешить создание тем с одинаковыми названиями."
     unique_posts_mins: "Количество минут до того, как пользователь сможет разместить сообщение с тем же содержанием."
@@ -914,7 +879,6 @@ ru:
     version_checks: "Проверять обновления и показывать сообщения о новых версиях на панели администратора"
     new_version_emails: "Отправлять сообщение на адрес contact_email когда будут доступны новые версии."
     invite_expiry_days: "Срок валидности ключей, высланных приглашенному пользователю, в днях"
-    invite_passthrough_hours: "Как долго пользователь может воспользоваться ключем приглашения для входа на сайт, указывается в часах"
     login_required: "Требовать авторизации для доступа к сайту, анонимный доступ запретить."
     min_password_length: "Минимальная длина пароля"
     min_admin_password_length: "Минимальная длина пароля для Администратора."
@@ -923,15 +887,12 @@ ru:
     sso_secret: "Секретный набор символов, используемый для проверки подлинности  зашиврованного входа с помощью SSO, убедитесь, что это 10 или более символов"
     sso_overrides_avatar: "Использовать аватары предоставляемые внешним SSO провайдером. При этом настоятельно рекомендуется отключить функцию: разрешить закгрузку аватаров."
     sso_not_approved_url: "Перенаправлять неподтвержденные SSO-аккаунты на этот URL"
-    enable_local_logins: "Включить внутреннюю систему учетных записей пользователей по логину и паролю. (Требуется для работы системы приглашений.)"
     allow_new_registrations: "Разрешить регистрацию новых пользователей. Выключите, чтобы запретить посетителям создавать новые учетные записи."
     enable_yahoo_logins: "Разрешить идентификацию с Yahoo"
     enable_google_oauth2_logins: "Включить Google Oauth2 аутентификацию. Этот метод аутентификации корректно поддерживается Google. Требуется настройки key и secret."
     google_oauth2_client_id: "Client ID для вашего Google приложения."
     google_oauth2_client_secret: "Client secret для Google приложения"
     enable_twitter_logins: "Разрешить идентификацию с Twitter, требует twitter_consumer_key и twitter_consumer_secret"
-    twitter_consumer_key: "Потребительский ключ для идентификации с Twitter, зарегистрированный на http://dev.twitter.com"
-    twitter_consumer_secret: "Потребительский секрет для идентификации с Twitter, зарегистрированный на http://dev.twitter.com"
     enable_facebook_logins: "Разрешить идентификацию с Facebook, требует facebook_app_id и facebook_app_secret"
     facebook_app_id: "id приложения для идентификации с Facebook, зарегистрированный на https://developers.facebook.com/apps"
     facebook_app_secret: "секрет приложения для идентификации с Facebook, зарегистрированный на https://developers.facebook.com/apps"
@@ -941,7 +902,6 @@ ru:
     readonly_mode_during_backup: "Включить режим \"только для чтения\" во время выполнения резервного копирования"
     allow_restore: "Позволить импорт, который может заменить ВСЕ данные сайта. Оставьте выключенным, если не планируете восстанавливать резервную копию"
     maximum_backups: "Максимальное количество резервных копий к сохранению. Более старые резервные копии будут автоматически удалены."
-    backup_frequency: "Как часто создавать резервные копии форума, в днях"
     enable_s3_backups: "Загружать резервные копии на S3 по завершению. Убедитесь, что настройки S3 заполнены."
     s3_backup_bucket: "Адрес папки удаленного сервера для резервных копий. ВНИМАНИЕ: Убедитесь, что место назначения защищено от посторонних."
     active_user_rate_limit_secs: "Как часто мы обновляем поле 'last_seen_at', в секундах"
@@ -956,7 +916,6 @@ ru:
     max_bookmarks_per_day: "Максимальное количество созданных закладок пользователем в день."
     max_edits_per_day: "Максимальное количество редактирований пользователем в день."
     max_topics_per_day: "Максимальное количество тем, которые пользователь может создать за один день."
-    max_private_messages_per_day: "Максимальное количество тем, которые пользователь может создать за один день."
     max_invites_per_day: "Максимальное количество приглашений, которое может отправить пользователь за один день."
     max_topic_invitations_per_day: "Максимальное количество приглашений в тему, которое может отправить пользователь в течении дня."
     alert_admins_if_errors_per_minute: "Количество ошибок в минуту для предупреждения администратора. Значение 0 отключает эту опцию. ВНИМАНИЕ: требуется перезагрузка."
@@ -969,7 +928,6 @@ ru:
     clean_orphan_uploads_grace_period_hours: "Период (в часах) после которого неопубликованные вложения удаляются."
     purge_deleted_uploads_grace_period_days: "Период (в днях) после которого удаленные вложения очищаются."
     enable_s3_uploads: "размещать загружаемые файлы на Amazon S3. ВАЖНО: требуется правильные настройки S3 (access key id и secret access key)."
-    s3_use_iam_profile: 'Использовать AWS EC2 IAM роль для ключей. ПРИМЕЧАНИЕ: включение данной функции перезапишет настройки "s3 access key id" и "s3 secret access key".'
     s3_upload_bucket: "Имя Amazon S3 bucket куда будут загружаться файлы. ВНИМАНИЕ: должно быть в нижнем регистре, без пробелов, без подчеркиваний.\nhttp://docs.aws.amazon.com/AmazonS3/latest/dev/BucketRestrictions.html"
     s3_access_key_id: "Amazon S3 access key для загрузки и хранения изображений"
     s3_secret_access_key: "Amazon S3 secret key для загрузки и хранения изображений"
@@ -1000,7 +958,6 @@ ru:
     min_trust_to_edit_wiki_post: "Минимальный уровень доверия, требуемый для редактирования вики-сообщения."
     min_trust_to_edit_post: "Минимальный уровень доверия, требуемый для редактирования сообщений."
     min_trust_to_allow_self_wiki: "Минимальный уровень доверия, требуемый для создания своего вики-сообщений."
-    min_trust_to_send_messages: "Минимальный уровень доверия, требуемый для создания личных сообщений."
     newuser_max_links: "Сколько ссылок новый пользователь может вставлять в сообщение."
     newuser_max_images: "Сколько изображений новый пользователь может вставлять в одно сообщение."
     newuser_max_attachments: "Максимальное количество вложений, которое новый пользователь может прикрепить к одному сообщению."
@@ -1104,14 +1061,13 @@ ru:
     embed_truncate: "Обрезать встроенные сообщения."
     embed_post_limit: "Максимальное количество вложенных сообщений."
     show_create_topics_notice: "Если общее количество тем меньше 5, показывать персоналу соощбение с просьбой создать новые темы."
-    delete_drafts_older_than_n_days: Удалять черновики, которые старше (n) дней.
+    delete_drafts_older_than_n_days: "Удалять черновики, которые старше (n) дней."
     prevent_anons_from_downloading_files: "Запретить анонимным пользователям скачивать вложенные файлы. ВНИМАНИЕ: при этом будут недоступны любые вложения кроме картинок."
     slug_generation_method: "Выберите метод генерации URL. 'encoded' будет изпользовать русские буквы в URL закодированные через проценты. 'none' не будет использовать перегенирацию."
     enable_emoji: "Активировать смайлы Emoji"
     emoji_set: "Какую коллекцию Emoji использовать?"
     enforce_square_emoji: "Принудительно использовать квадратный формат для всех смайлов."
     approve_unless_trust_level: "Сообщения для пользователей ниже этого уровня доверия подлежат проверки"
-    default_email_private_messages: "По умолчанию присылать почтовое уведомление, когда кто-то оставляет пользователю личное сообщение."
     default_email_mailing_list_mode: "По умолчанию присылать почтовое уведомление, когда появляется новое сообщение."
     default_other_external_links_in_new_tab: "По умолчанию открывать внешние ссылки в новой вкладке."
     default_other_dynamic_favicon: "Показывать количество новых/обновлённых тем на иконке веб-браузера по умолчанию."
@@ -1127,7 +1083,6 @@ ru:
     max_tags_in_filter_list: "Максимальное количество тегов для отображения в выпадающем списке фильтрации. Будут показаны самые часто используемые теги."
     tags_sort_alphabetically: "Отображать теги в алфавитном порядке. По умолчанию теги отображаются в порядке популярности."
     tag_style: "Стиль отображения для значков тегов."
-    staff_tags: "Список тегов, который может применяться только к персоналу."
     min_trust_level_to_tag_topics: "Минимальный уровень доверия для отметки тем тегами."
     suppress_overlapping_tags_in_list: "Не отображать тег, если он полностью совпадают с заголовком темы"
     company_short_name: "Наименование Компании (кратко)"
@@ -1174,24 +1129,24 @@ ru:
     not_seen_in_a_month: "С возвращением!  Т.к. вас не было какое-то время, мы собрали список популярных тем за время вашего отсутсвия. Вот они."
   merge_posts:
     edit_reason:
-      one: "Сообщение было объединено пользователем %{username}"
-      few: "%{count} сообщений было объединено пользователем %{username}"
-      many: "%{count} сообщений было объединено пользователем %{username}"
-      other: "%{count} сообщений было объединено пользователем %{username}"
+      few: '%{count} сообщений было объединено пользователем %{username}'
+      many: '%{count} сообщений было объединено пользователем %{username}'
+      one: Сообщение было объединено пользователем %{username}
+      other: '%{count} сообщений было объединено пользователем %{username}'
     errors:
       different_topics: "Сообщения, принадлежащие другой теме, не могут быть объединены."
       different_users: "Сообщения, принадлежащие разным пользователям, не могут быть объединены."
   move_posts:
     new_topic_moderator_post:
-      one: "Сообщение перенесено в новую тему: %{topic_link}"
-      few: "%{count} сообщения перенесены в новую тему: %{topic_link}"
-      many: "%{count} сообщений перенесены в новую тему: %{topic_link}"
-      other: "%{count} сообщений перенесены в новую тему: %{topic_link}"
+      few: '%{count} сообщения перенесены в новую тему: %{topic_link}'
+      many: '%{count} сообщений перенесены в новую тему: %{topic_link}'
+      one: 'Сообщение перенесено в новую тему: %{topic_link}'
+      other: '%{count} сообщений перенесены в новую тему: %{topic_link}'
     existing_topic_moderator_post:
-      one: "Сообщение перенесено в тему %{topic_link}"
-      few: "%{count} сообщения перенесены в тему %{topic_link}"
-      many: "%{count} сообщений перенесены в тему %{topic_link}"
-      other: "%{count} сообщений перенесены в тему %{topic_link}"
+      few: '%{count} сообщения перенесены в тему %{topic_link}'
+      many: '%{count} сообщений перенесены в тему %{topic_link}'
+      one: Сообщение перенесено в тему %{topic_link}
+      other: '%{count} сообщений перенесены в тему %{topic_link}'
   change_owner:
     post_revision_text: "Владелец сменен с %{old_user} на %{new_user}"
     deleted_user: "Удаленный пользователь"
@@ -1201,45 +1156,45 @@ ru:
     closed_enabled: "Эта тема закрыта. В ней больше нельзя отвечать."
     closed_disabled: "Эта тема открыта. В ней можно отвечать."
     autoclosed_message_max_posts:
-      one: "Это сообщение было автоматически закрыто, когда количество ответов достигло максимума: 1."
-      few: "Это сообщение было автоматически закрыто, когда количество ответов достигло максимума: %{count}."
-      many: "Это сообщение было автоматически закрыто, когда количество ответов достигло максимума: %{count}."
-      other: "Это сообщение было автоматически закрыто, когда количество ответов достигло максимума: %{count}."
+      few: 'Это сообщение было автоматически закрыто, когда количество ответов достигло максимума: %{count}.'
+      many: 'Это сообщение было автоматически закрыто, когда количество ответов достигло максимума: %{count}.'
+      one: 'Это сообщение было автоматически закрыто, когда количество ответов достигло максимума: 1.'
+      other: 'Это сообщение было автоматически закрыто, когда количество ответов достигло максимума: %{count}.'
     autoclosed_topic_max_posts:
-      one: "Эта тема была автоматически закрыта, когда количество ответов достигло максимума: 1."
-      few: "Эта тема была автоматически закрыта, когда количество ответов достигло максимума: %{count}."
-      many: "Эта тема была автоматически закрыта, когда количество ответов достигло максимума: %{count}."
-      other: "Эта тема была автоматически закрыта, когда количество ответов достигло максимума: %{count}."
+      few: 'Эта тема была автоматически закрыта, когда количество ответов достигло максимума: %{count}.'
+      many: 'Эта тема была автоматически закрыта, когда количество ответов достигло максимума: %{count}.'
+      one: 'Эта тема была автоматически закрыта, когда количество ответов достигло максимума: 1.'
+      other: 'Эта тема была автоматически закрыта, когда количество ответов достигло максимума: %{count}.'
     autoclosed_enabled_days:
-      one: "Эта тема была автоматически закрыта спустя 1 день. В ней больше нельзя отвечать."
-      few: "Эта тема была автоматически закрыта спустя %{count} дня. В ней больше нельзя отвечать."
-      many: "Эта тема была автоматически закрыта спустя %{count} дней. В ней больше нельзя отвечать."
-      other: "Эта тема была автоматически закрыта спустя %{count} дней. В ней больше нельзя отвечать."
+      few: Эта тема была автоматически закрыта спустя %{count} дня. В ней больше нельзя отвечать.
+      many: Эта тема была автоматически закрыта спустя %{count} дней. В ней больше нельзя отвечать.
+      one: Эта тема была автоматически закрыта спустя 1 день. В ней больше нельзя отвечать.
+      other: Эта тема была автоматически закрыта спустя %{count} дней. В ней больше нельзя отвечать.
     autoclosed_enabled_hours:
-      one: "Эта тема была автоматически закрыта спустя 1 час. В ней больше нельзя отвечать."
-      few: "Эта тема была автоматически закрыта спустя %{count} часа. В ней больше нельзя отвечать."
-      many: "Эта тема была автоматически закрыта спустя %{count} часов. В ней больше нельзя отвечать."
-      other: "Эта тема была автоматически закрыта спустя %{count} часов. В ней больше нельзя отвечать."
+      few: Эта тема была автоматически закрыта спустя %{count} часа. В ней больше нельзя отвечать.
+      many: Эта тема была автоматически закрыта спустя %{count} часов. В ней больше нельзя отвечать.
+      one: Эта тема была автоматически закрыта спустя 1 час. В ней больше нельзя отвечать.
+      other: Эта тема была автоматически закрыта спустя %{count} часов. В ней больше нельзя отвечать.
     autoclosed_enabled_minutes:
-      one: "Эта тема была автоматически закрыта спустя 1 минуту. В ней больше нельзя отвечать."
-      few: "Эта тема была автоматически закрыта спустя %{count} минуты. В ней больше нельзя отвечать."
-      many: "Эта тема была автоматически закрыта спустя %{count} минут. В ней больше нельзя отвечать."
-      other: "Эта тема была автоматически закрыта спустя %{count} минут. В ней больше нельзя отвечать."
+      few: Эта тема была автоматически закрыта спустя %{count} минуты. В ней больше нельзя отвечать.
+      many: Эта тема была автоматически закрыта спустя %{count} минут. В ней больше нельзя отвечать.
+      one: Эта тема была автоматически закрыта спустя 1 минуту. В ней больше нельзя отвечать.
+      other: Эта тема была автоматически закрыта спустя %{count} минут. В ней больше нельзя отвечать.
     autoclosed_enabled_lastpost_days:
-      one: "Эта тема была автоматически закрыта через 1 день после последнего ответа. В ней больше нельзя отвечать."
-      few: "Эта тема была автоматически закрыта через %{count} дня после последнего ответа. В ней больше нельзя отвечать."
-      many: "Эта тема была автоматически закрыта через %{count} дней после последнего ответа. В ней больше нельзя отвечать."
-      other: "Эта тема была автоматически закрыта через %{count} дней после последнего ответа. В ней больше нельзя отвечать."
+      few: Эта тема была автоматически закрыта через %{count} дня после последнего ответа. В ней больше нельзя отвечать.
+      many: Эта тема была автоматически закрыта через %{count} дней после последнего ответа. В ней больше нельзя отвечать.
+      one: Эта тема была автоматически закрыта через 1 день после последнего ответа. В ней больше нельзя отвечать.
+      other: Эта тема была автоматически закрыта через %{count} дней после последнего ответа. В ней больше нельзя отвечать.
     autoclosed_enabled_lastpost_hours:
-      one: "Эта тема была автоматически закрыта через 1 час после последнего ответа. В ней больше нельзя отвечать."
-      few: "Эта тема была автоматически закрыта через %{count} часа после последнего ответа. В ней больше нельзя отвечать."
-      many: "Эта тема была автоматически закрыта через %{count} часов после последнего ответа. В ней больше нельзя отвечать."
-      other: "Эта тема была автоматически закрыта через %{count} часов после последнего ответа. В ней больше нельзя отвечать."
+      few: Эта тема была автоматически закрыта через %{count} часа после последнего ответа. В ней больше нельзя отвечать.
+      many: Эта тема была автоматически закрыта через %{count} часов после последнего ответа. В ней больше нельзя отвечать.
+      one: Эта тема была автоматически закрыта через 1 час после последнего ответа. В ней больше нельзя отвечать.
+      other: Эта тема была автоматически закрыта через %{count} часов после последнего ответа. В ней больше нельзя отвечать.
     autoclosed_enabled_lastpost_minutes:
-      one: "Эта тема была автоматически закрыта через 1 минуту после последнего ответа. В ней больше нельзя отвечать."
-      few: "Эта тема была автоматически закрыта через %{count} минуты после последнего ответа. В ней больше нельзя отвечать."
-      many: "Эта тема была автоматически закрыта через %{count} минут после последнего ответа. В ней больше нельзя отвечать."
-      other: "Эта тема была автоматически закрыта через %{count} минут после последнего ответа. В ней больше нельзя отвечать."
+      few: Эта тема была автоматически закрыта через %{count} минуты после последнего ответа. В ней больше нельзя отвечать.
+      many: Эта тема была автоматически закрыта через %{count} минут после последнего ответа. В ней больше нельзя отвечать.
+      one: Эта тема была автоматически закрыта через 1 минуту после последнего ответа. В ней больше нельзя отвечать.
+      other: Эта тема была автоматически закрыта через %{count} минут после последнего ответа. В ней больше нельзя отвечать.
     autoclosed_disabled: "Эта тема открыта. В ней можно отвечать."
     autoclosed_disabled_lastpost: "Эта тема теперь открыта, и в ней можно отвечать."
     pinned_enabled: "Данная тема закреплена. Тема будет находиться наверху списка тем раздела, пока кто нибудь из администраторов не открепит ее."
@@ -1295,10 +1250,10 @@ ru:
       domain_not_allowed: "Сайт недействителен. Допустимые домены: %{domains}"
   flags_reminder:
     subject_template:
-      one: "1 жалоба ожидает рассмотрения"
-      few: "%{count} жалобы ожидают рассмотрения"
-      many: "%{count} жалоб ожидают рассмотрения"
-      other: "%{count} жалоб ожидают рассмотрения"
+      few: '%{count} жалобы ожидают рассмотрения'
+      many: '%{count} жалоб ожидают рассмотрения'
+      one: 1 жалоба ожидает рассмотрения
+      other: '%{count} жалоб ожидают рассмотрения'
   unsubscribe_mailer:
     subject_template: "Подтвердите, что вы больше не желаете получать обновления по электронной почте от %{site_title}"
   invite_password_instructions:
@@ -1341,7 +1296,6 @@ ru:
       subject_template: "Массовое приглашение пользователей выполнено с ошибками"
     csv_export_succeeded:
       title: "Успешный Экспорт CSV"
-      subject_template: "Экспорт завершен"
     csv_export_failed:
       title: "Неудачный Экспорт CSV"
       subject_template: "Экспорт не удался"
@@ -1352,10 +1306,10 @@ ru:
         Система не смогла обнаружить тект сообщения в теле письма. Советуем убедится в том, что вы написали желаемый текст **в самом верху письма**.
     pending_users_reminder:
       subject_template:
-        one: "1 пользователь ожидает рассмотрение"
-        few: "%{count} пользователя ожидают рассмотрения"
-        many: "%{count} пользователей ожидают рассмотрения"
-        other: "%{count} пользователей ожидают рассмотрения"
+        few: '%{count} пользователя ожидают рассмотрения'
+        many: '%{count} пользователей ожидают рассмотрения'
+        one: 1 пользователь ожидает рассмотрение
+        other: '%{count} пользователей ожидают рассмотрения'
       text_body_template: |
         Новые пользователи ожидают подтверждения (или отказа) перед тем, как они получат доступ до форума.
 
@@ -1550,22 +1504,22 @@ ru:
       description: Прочитал каждый ответ в теме с более чем 100 ответами
     popular_link:
       name: Популярная Ссылка
-      description: Оставил внешнюю ссылку, которую открыли более 50 раз
+      description: "Оставил внешнюю ссылку, которую открыли более 50 раз"
     hot_link:
       name: Горячая Ссылка
-      description: Оставил внешнюю ссылку, которую открыли более 300 раз
+      description: "Оставил внешнюю ссылку, которую открыли более 300 раз"
     famous_link:
       name: Легендарная Ссылка
-      description: Оставил внешнюю ссылку, которую открыли более 1000 раз
+      description: "Оставил внешнюю ссылку, которую открыли более 1000 раз"
     appreciated:
       name: Оценённый
-      description: Получил 1 симпатию, отправив 20 сообщений
+      description: "Получил 1 симпатию, отправив 20 сообщений"
     respected:
       name: Уважаемый
-      description: Получил 2 симпатии, отправив 100 сообщений
+      description: "Получил 2 симпатии, отправив 100 сообщений"
     admired:
       name: Почитаемый
-      description: Получил 5 симпатий, отправив 300 сообщений
+      description: "Получил 5 симпатий, отправив 300 сообщений"
     out_of_love:
       name: За Любовь
       description: Использовал 50 симпатий за день
@@ -1584,14 +1538,13 @@ ru:
       description: Использовал смайлик в сообщении
     first_mention:
       name: Первое обращение
-      long_description: Эта награда выдается, когда вы впервые вставляете чей-то @псевдоним в свое сообщение. Каждое такое обращение отправит уведомление этому человеку, чтобы они были в курсе вашего сообщения. Чтобы вставить обращение к человеку по его псевдониму, или к целой группе по ее названию (если это разрешено), начните с символа @ - это удобный способ привлечь их внимание.
+      long_description: "Эта награда выдается, когда вы впервые вставляете чей-то @псевдоним в свое сообщение. Каждое такое обращение отправит уведомление этому человеку, чтобы они были в курсе вашего сообщения. Чтобы вставить обращение к человеку по его псевдониму, или к целой группе по ее названию (если это разрешено), начните с символа @ - это удобный способ привлечь их внимание."
     first_onebox:
       name: Первая Умная Вставка
     first_reply_by_email:
       name: Первый Ответ По Почте
   admin_login:
     success: "письмо отправлено"
-    error: "Ошибка!"
     email_input: "Email Администратора"
     submit_button: "отправить письмо"
   performance_report:
@@ -1729,6 +1682,3 @@ ru:
         description: |
           <p>Если вы когда-либо захотите изменить эти настройки, зайдите в <a href='/admin' target='_blank'>Вашу админку</a>; ссылка находится напротив иконки гаечного ключа в меню сайта.</p>
           <p>Удачи в <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>создании Вашего нового сообщества!</a></p>
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml
index 086694727dc..e0881ec5ac0 100644
--- a/config/locales/server.sk.yml
+++ b/config/locales/server.sk.yml
@@ -16,32 +16,41 @@ sk:
       short_no_year: "%B %-d"
       date_only: "%Y,  %B %-d"
   date:
-    month_names: [null, Január, Február, Marec, Apríl, Máj, Jún, Júl, August, September, Október, November, December]
+    month_names: [~, Január, Február, Marec, Apríl, Máj, Jún, Júl, August, September, Október, November, December]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "am"
     pm: "pm"
-    <<: *datetime_formats
   title: "DIscourse"
   topics: "Témy"
   posts: "príspevky"
   loading: "Načítava sa"
   log_in: "Prihlásenie"
+  submit: "odošli"
   purge_reason: "Automaticky zmazaný ako opustený, dezaktivovaný účet"
   disable_remote_images_download_reason: "Sťahovanie vzdialených obrázkov je vypnuté kvôli nedostatku diskového priestoru."
   anonymous: "Anonymný"
   remove_posts_deleted_by_author: "Zmazané autorom"
+  themes:
+    bad_color_scheme: "Nepodarilo sa aktualizovať tému, neplatná farebná schéma"
+    other_error: "počas aktualizácie tému sa niečo nepodarilo"
   emails:
     incoming:
       default_subject: "Táto téma musí mať názov"
       show_trimmed_content: "Ukázať orezaný obsah"
       maximum_staged_user_per_email_reached: "Dosiahnutý maximálny počet dočasných používateľov vytvorených emailom."
+      no_subject: "(bez predmetu)"
+      no_body: "(bez tela)"
       errors:
         empty_email_error: "Nastane, keď prijmeme úplne prázdny mail."
         no_message_id_error: "Nastane, keď v maili chýba hlavička 'Message-Id'."
         inactive_user_error: "Nastane, keď odosielateľ nie je aktívny."
+        silenced_user_error: "Nastane, keď odosielateľ bol stíšený."
         insufficient_trust_level_error: "Nastane, keď sa používateľ pokúsi vytvoriť novú tému v kategórii, na ktorú nemajú dostatočný stupeň dôvery."
         topic_closed_error: "Nastane, keď príde odpoveď na uzavretú tému."
+        bounced_email_error: "Email report bol odoslaný emailom"
+      unrecognized_error: "Chyba nebola rozpoznaná."
   errors: &errors
     format: '%{attribute} %{message}'
     messages:
@@ -53,16 +62,18 @@ sk:
       present: musí byť prázdne
       confirmation: "sa nerovná %{attribute}"
       empty: nesmie byť prázdne
-      equal_to: sa musí rovnať %{count}
+      equal_to: "sa musí rovnať %{count}"
       even: musí byť párne
       exclusion: je rezervované
-      greater_than: musí byť viac ako %{count}
-      greater_than_or_equal_to: musí byť väčšie alebo rovné %{count}
+      greater_than: "musí byť viac ako %{count}"
+      greater_than_or_equal_to: "musí byť väčšie alebo rovné %{count}"
       has_already_been_used: "je už použité"
       inclusion: nie je v zozname
       invalid: je nesprávne
-      less_than: musí byť menej ako %{count}
-      less_than_or_equal_to: musí byť menej alebo rovné %{count}
+      is_invalid: "je to nejasné, je to kompletná veta?"
+      contains_censored_words: "obsahuje nasledujúce cenzúrované slová %{censored_words}"
+      less_than: "musí byť menej ako %{count}"
+      less_than_or_equal_to: "musí byť menej alebo rovné %{count}"
       not_a_number: nie je číslo
       not_an_integer: musí byť číslo
       odd: musí byť nepárne
@@ -71,23 +82,27 @@ sk:
         one: "Nedá sa zmazať záznam pretože existuje %{record} závislých záznamov"
         many: "Záznam nemôže byť zmazaný z dôvodu zavislosti na zázname: %{record} "
       too_long:
-        one: príliš dlhé (maximálne 1 znak)
         few: príliiš dlhé (maximum je %{count} znaky)
+        many: príliiš dlhé (maximum je %{count} znakov)
+        one: príliš dlhé (maximálne 1 znak)
         other: príliiš dlhé (maximum je %{count} znakov)
       too_short:
-        one: príliiš krátke (minimum je 1 znak)
         few: príliiš krátke (minimum je %{count} znaky)
+        many: príliiš krátke (minimum je %{count} znakov)
+        one: príliiš krátke (minimum je 1 znak)
         other: príliiš krátke (minimum je %{count} znakov)
       wrong_length:
-        one: nesprávna dĺžka (musí byť 1 znak)
         few: nesprávna dĺžka (musí byť %{count} znaky)
+        many: nesprávna dĺžka (musí byť %{count} znakov)
+        one: nesprávna dĺžka (musí byť 1 znak)
         other: nesprávna dĺžka (musí byť %{count} znakov)
       other_than: "musí byť iný než %{count}"
     template:
       body: 'Nastal problém s nasledujúcimi položkami:'
       header:
-        one: Uloženie  %{model} zlyhalo kôli chybe
         few: Uloženie  %{model} zlyhalo kôli %{count} chybám
+        many: 'Uloženie  %{model} zlyhalo kôli %{count} chybám '
+        one: Uloženie  %{model} zlyhalo kôli chybe
         other: 'Uloženie  %{model} zlyhalo kôli %{count} chybám '
     embed:
       load_from_remote: "Nastala chyba pri načítaní príspevku"
@@ -98,6 +113,14 @@ sk:
       max_username_length_range: "Nemôžete nastaviť maximum menšie ako minimum."
       default_categories_already_selected: "Nemôžete vybrať kategóriu použitú v inom zozname."
       s3_upload_bucket_is_required: "Nemôžete nahrávať na S3 pokiaľ ste nezadali 's3_upload_bucket'."
+  activemodel:
+    errors:
+      <<: *errors
+  invite:
+    not_found: "Tvoj pozívací token je nesprávny. Prosím, kontaktujte administrátora stránky."
+  bulk_invite:
+    file_should_be_csv: "Nahrávaný súbor by mal byť typu CSV."
+    error: "Počas nahrávanie súboru sa vyskytla chyba. Prosím, vyskúšajte ho nahraď znovu neskôr."
   backup:
     operation_already_running: "Prebieha spracovanie inej operácie. Momentálne sa nová úloha nedá spustiť. "
     backup_file_should_be_tar_gz: "Záložný súbor musí byť archív .tar.gz"
@@ -109,49 +132,58 @@ sk:
   reading_time: "Doba čítania"
   likes: "Páči sa mi"
   too_many_replies:
-    one: "Ľutujeme, noví používatelia majú dočasne obmedzený počet príspevkov na jeden v rámci jednej témy."
-    few: "Ľutujeme, noví používatelia majú dočasne obmedzený počet príspevkov na %{count} v rámci jednej témy."
-    other: "Ľutujeme, noví používatelia majú dočasne obmedzený počet príspevkov na %{count} v rámci jednej témy."
+    few: Ľutujeme, noví používatelia majú dočasne obmedzený počet príspevkov na %{count} v rámci jednej témy.
+    many: Ľutujeme, noví používatelia majú dočasne obmedzený počet príspevkov na %{count} v rámci jednej témy.
+    one: Ľutujeme, noví používatelia majú dočasne obmedzený počet príspevkov na jeden v rámci jednej témy.
+    other: Ľutujeme, noví používatelia majú dočasne obmedzený počet príspevkov na %{count} v rámci jednej témy.
   embed:
     start_discussion: "Začať diskusiu"
     continue: "Pokračovať v diskusii"
     more_replies:
-      one: "1 ďalšia odpoveď"
-      few: "%{count} ďalšie odpovede"
-      other: "%{count} ďalších odpovedí"
+      few: '%{count} ďalšie odpovede'
+      many: '%{count} ďalších odpovedí'
+      one: 1 ďalšia odpoveď
+      other: '%{count} ďalších odpovedí'
     loading: "Nahrávanie Diskusie ..."
     permalink: "Trvalý odkaz"
     imported_from: "Toto je sprievodná diskusia k pôvodnej téme na %{link}"
     in_reply_to: "▶ %{username}"
     replies:
-      one: "1 odpoveď"
-      few: "%{count} odpovede"
-      other: "%{count} odpovedí"
+      few: '%{count} odpovede'
+      many: '%{count} odpovedí'
+      one: 1 odpoveď
+      other: '%{count} odpovedí'
   no_mentions_allowed: "Ľutujeme, nesmiete zmieňovať iných používateľov"
   too_many_mentions:
-    one: "Ľutujeme, v príspevku môžete zmieniť maximálne jedného používateľa."
-    few: "Ľutujeme, v príspevku môžete zmieniť maximálne %{count} používatelov."
-    other: "Ľutujeme, v príspevku môžete zmieniť maximálne %{count} používatelov."
+    few: Ľutujeme, v príspevku môžete zmieniť maximálne %{count} používatelov.
+    many: Ľutujeme, v príspevku môžete zmieniť maximálne %{count} používatelov.
+    one: Ľutujeme, v príspevku môžete zmieniť maximálne jedného používateľa.
+    other: Ľutujeme, v príspevku môžete zmieniť maximálne %{count} používatelov.
   no_mentions_allowed_newuser: "Ľutujeme, noví používatelia nesmú zmieňovať iných použivateľov"
   too_many_mentions_newuser:
-    one: "Ľutujeme, noví používatelia môžu zmieniť v príspevku maximálne jedného používateľa."
-    few: "Ľutujeme, noví používatelia môžu zmieniť v príspevku maximálne %{count} používatelov."
-    other: "Ľutujeme, noví používatelia môžu zmieniť v príspevku maximálne %{count} používatelov."
+    few: Ľutujeme, noví používatelia môžu zmieniť v príspevku maximálne %{count} používatelov.
+    many: Ľutujeme, noví používatelia môžu zmieniť v príspevku maximálne %{count} používatelov.
+    one: Ľutujeme, noví používatelia môžu zmieniť v príspevku maximálne jedného používateľa.
+    other: Ľutujeme, noví používatelia môžu zmieniť v príspevku maximálne %{count} používatelov.
+  no_images_allowed_trust: "Ľutujeme, do príspevku nemôžete vložiť obrázok"
   no_images_allowed: "Ľutujeme, noví používatelia nemôžu vkladať obrázky do príspevkov."
   too_many_images:
-    one: "Ľutujeme, noví používatelia môžu vložiť maximálne jeden obrázok do príspevku."
-    few: "Ľutujeme, noví používatelia môžu vložiť maximálne %{count}  obrázky do príspevku."
-    other: "Ľutujeme, noví používatelia môžu vložiť maximálne %{count}  obrázkov do príspevku."
+    few: Ľutujeme, noví používatelia môžu vložiť maximálne %{count}  obrázky do príspevku.
+    many: Ľutujeme, noví používatelia môžu vložiť maximálne %{count}  obrázkov do príspevku.
+    one: Ľutujeme, noví používatelia môžu vložiť maximálne jeden obrázok do príspevku.
+    other: Ľutujeme, noví používatelia môžu vložiť maximálne %{count}  obrázkov do príspevku.
   no_attachments_allowed: "Ľutujeme, noví používatelia nemôžu vkladať prílohy do príspevkov."
   too_many_attachments:
-    one: "Ľutujeme, noví používatelia môžu vložiť maximálne jednu prílohu do príspevku."
-    few: "Ľutujeme, noví používatelia môžu vložiť maximálne %{count}  prílohy do príspevku."
-    other: "Ľutujeme, noví používatelia môžu vložiť maximálne %{count}  príloh do príspevku."
+    few: Ľutujeme, noví používatelia môžu vložiť maximálne %{count}  prílohy do príspevku.
+    many: Ľutujeme, noví používatelia môžu vložiť maximálne %{count}  príloh do príspevku.
+    one: Ľutujeme, noví používatelia môžu vložiť maximálne jednu prílohu do príspevku.
+    other: Ľutujeme, noví používatelia môžu vložiť maximálne %{count}  príloh do príspevku.
   no_links_allowed: "Ľutujeme, noví používatelia nemôžu vkladať odkazy do príspevkov."
   too_many_links:
-    one: "Ľutujeme, noví používatelia môžu vložiť maximálne jeden odkaz do príspevku."
-    few: "Ľutujeme, noví používatelia môžu vložiť maximálne %{count} odkazy do príspevku."
-    other: "Ľutujeme, noví používatelia môžu vložiť maximálne %{count} odkazov do príspevku."
+    few: Ľutujeme, noví používatelia môžu vložiť maximálne %{count} odkazy do príspevku.
+    many: Ľutujeme, noví používatelia môžu vložiť maximálne %{count} odkazov do príspevku.
+    one: Ľutujeme, noví používatelia môžu vložiť maximálne jeden odkaz do príspevku.
+    other: Ľutujeme, noví používatelia môžu vložiť maximálne %{count} odkazov do príspevku.
   spamming_host: "Ľutujeme, nemôžete publikovať odkaz na tento zdroj"
   user_is_suspended: "Suspendovaní používatelia nemôžu vkladať príspevky"
   topic_not_found: "Niečo sa pokazilo. Téma mohla byť napríklad uzavretá, alebo zmazaná kým ste ju prezerali."
@@ -173,8 +205,11 @@ sk:
     latest: "Najnovšie témy"
     hot: "Horúce témy"
     top: "Top témy"
+    top_monthly: "Mesačné najčastejšie témy"
+    top_weekly: "Týždenné najčastejšie témy"
+    top_daily: "Denné najčastejšie témy"
     posts: "Najnovšie príspevky"
-    private_posts: "Najnovšie súkromné správy"
+    private_posts: "Posledné osobné správy"
     group_posts: "Najnovšie príspevky od %{group_name}"
     group_mentions: "Najnovšie zmienky od %{group_name}"
     user_posts: "Najnovšie príspevky od @%{username}"
@@ -187,7 +222,6 @@ sk:
   groups:
     errors:
       can_not_modify_automatic: "Nemôžete upraviť automatickú skupinu"
-      member_already_exist: "'%{username}' už je členom tejto skupiny."
       invalid_domain: "'%{domain}' nie je platnou doménou."
       invalid_incoming_email: "'%{email}' nie je platná emailová adresa."
       email_already_used_in_group: "'%{email}' už je použité skupinou '%{group_name}'."
@@ -203,10 +237,11 @@ sk:
       trust_level_4: "stupen_dovery_4"
   education:
     until_posts:
-      one: "jeden príspevok"
-      few: "%{count} príspevky"
-      other: "%{count} príspevkov"
-    new-topic: |
+      few: '%{count} príspevky'
+      many: '%{count} príspevkov'
+      one: jeden príspevok
+      other: '%{count} príspevkov'
+    'new-topic': |
       Víitajte na %{site_name} &mdash; **Ďakujeme za založenie novej konverzácie!**
 
       - Znie titulok zaujímavo ak ho čítate nahlas ? Zodpovedá obsahu ?
@@ -216,7 +251,7 @@ sk:
       - Vložte často používane slová vo vašej téme aby ju ostatní vedeli "nájsť". Pre zlúčenie vašej témy so súvisiacimi témami vyberte kategóriu .
 
       Pre viac informácií, [pozri návody](/guidelines). Tento panel sa zobrazí iba raz %{education_posts_text}.
-    new-reply: |
+    'new-reply': |
       Vitajte na %{site_name} &mdash; **Ďakujeme za príspevok!**
 
       - Vylepší vaša odpoveď nejakým spôsobom diskusiu ?
@@ -245,13 +280,12 @@ sk:
       user_profile:
         bio_raw: "O mne"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Výstraha môže byť pripojená len k súkromným spravam"
               too_many_users: "Výstraha môže byť zaslaná len jednej osobe"
-              cant_send_pm: "Ľutujeme, nemôžete zaslať súkromnú správu tomuto používateľovi"
               no_user_selected: "Musíte zadať existujúceho používateľa"
         user:
           attributes:
@@ -266,7 +300,10 @@ sk:
           attributes:
             hex:
               invalid: "nesprávna farba"
-      <<: *errors
+        watched_word:
+          attributes:
+            word:
+              too_many: "Príliš veľa slov k tej akcii"
   user_profile:
     no_info_other: "<div class='missing-profile'>%{name} nevložil zatiaľ nič do profilu \"O mne\"</div>"
   vip_category_name: "Salón"
@@ -275,29 +312,31 @@ sk:
   meta_category_description: "Diskusia o stránke, organizácii, ako funguje a ako ju môžme vylepšit"
   staff_category_name: "Zamestnanci"
   staff_category_description: "Súkromna kategória pre zamestnaneckú diskusiu. Témy su viditeľné len pre správcov a moderátorov diskusie"
+  discourse_welcome_topic:
+    title: "Vitajte v Discourse"
   lounge_welcome:
     title: "Vítajte v Salóne"
     body: |2
 
-      Gratulácia! :confetti_ball:
+        Gratulácia! :confetti_ball:
 
-      Ak vidíte túto tému, boli ste nedávno povýšený na **pravidelný** (úroveň dôvery 3).
+        Ak vidíte túto tému, boli ste nedávno povýšený na **pravidelný** (úroveň dôvery 3).
 
-      Teraz môžete &hellip;
+        Teraz môžete &hellip;
 
-      * Upravovať nadpis akejkoľvek témy
-      * Meniť kategóriu akejkoľvek témy
-      * Mať sledované všetky Vaše odkazy ([automatické nofollow](http://en.wikipedia.org/wiki/Nofollow) je odstránené)
-      * Prístup do privátnej katogógie Lounge prístupnej iba členom s úrovňou dôvery 3 a vyššou
-      * Skryť spam pomocou vlajky
+        * Upravovať nadpis akejkoľvek témy
+        * Meniť kategóriu akejkoľvek témy
+        * Mať sledované všetky Vaše odkazy ([automatické nofollow](http://en.wikipedia.org/wiki/Nofollow) je odstránené)
+        * Prístup do privátnej katogógie Lounge prístupnej iba členom s úrovňou dôvery 3 a vyššou
+        * Skryť spam pomocou vlajky
 
-      Tu je [aktuálny zoznam pravidelných členov](/badges/3/regular). Určite ich pozdravte.
+        Tu je [aktuálny zoznam pravidelných členov](/badges/3/regular). Určite ich pozdravte.
 
-      Ďakujeme, že ste dôležitou súčasťou našej komunity!
+        Ďakujeme, že ste dôležitou súčasťou našej komunity!
 
-      (Pre viac informácií o úrovniach dôvery, [pozrite túto tému][trust]. Prosím nezabudnite, že iba členovia, ktorý neustále spĺňajú požiadavky zostanú platnými členmy.)
+        (Pre viac informácií o úrovniach dôvery, [pozrite túto tému][trust]. Prosím nezabudnite, že iba členovia, ktorý neustále spĺňajú požiadavky zostanú platnými členmy.)
 
-      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "O kategórii: %{category} "
     replace_paragraph: "(Nahraďte tento prvý odstavec stručným popisom Vašej novej kategórie. Tento návod sa objaví v zozname kategórií, tak sa snažte ho udržať pod 200 znakov. **Kategória sa neobjaví v zozname kategórií pokým neupravíte tento popis alebo v nej nevytvoríte témy.**)"
@@ -313,9 +352,10 @@ sk:
       uncategorized: "Nemôžete vymazať kategóriu nezaradených"
       has_subcategories: "Nemôžete vymazať kategóriu pretože obsahuje podkategórie."
       topic_exists:
-        one: "Nemôžete vymazať kategóriu pretože obsahuje tému %{topic_link}."
-        few: "Nemôžete vymazať kategóriu pretože obsahuje %{count} témy. Najstaršia téma je %{topic_link}."
-        other: "Nemôžete vymazať kategóriu pretože obsahuje %{count} tém. Najstaršia téma je %{topic_link}."
+        few: Nemôžete vymazať kategóriu pretože obsahuje %{count} témy. Najstaršia téma je %{topic_link}.
+        many: Nemôžete vymazať kategóriu pretože obsahuje %{count} tém. Najstaršia téma je %{topic_link}.
+        one: Nemôžete vymazať kategóriu pretože obsahuje tému %{topic_link}.
+        other: Nemôžete vymazať kategóriu pretože obsahuje %{count} tém. Najstaršia téma je %{topic_link}.
       topic_exists_no_oldest: "Nemôžete vymazať túto kategóriu pretože obsahuje %{count} tém."
     uncategorized_description: "Témy, ktoré nepotrebujú kategóriu, alebo sa do žiadnej existujúcej nehodia."
   trust_levels:
@@ -330,125 +370,144 @@ sk:
     leader:
       title: "vodca"
     change_failed_explanation: "Pokúsili  ste sa znížiť úroveň %{user_name} na '%{new_trust_level}'. Ale jeho/jej aktuálna úroveň už je '%{current_trust_level}'. %{user_name} zostane na úrovni '%{current_trust_level}' - Ak chcete znížiť úroveň používateľa, najskôr uzamknite úroveň"
+  post:
+    image_placeholder:
+      broken: "Tento obrázok je poškodený"
   rate_limiter:
-    slow_down: "Vykonali ste túto akciu príliš veľa krát, skúste neskôr"
-    too_many_requests: "Na vykonávanie tejto akcie máme nastavený denný limit. Prosím počkajte %{time_left} než skúsite znovu."
-    by_type:
-      first_day_replies_per_day: "Dosiahli ste maximálny počet odpovedí stanovený pre nového používateľa v jeho prvý deň. Prosím čakajte %{time_left} , než skúsite znova"
-      first_day_topics_per_day: "Dosiahli ste maximálny počet tém stanovený pre nového používateľa v jeho prvý deň. Prosím čakajte %{time_left} , než skúsite znova"
-      create_topic: "Výtvárate témy príliš rýchlo. Prosím čakajte %{time_left} , než skúsite znova"
-      create_post: "Odpovedáte príliš rýchlo. Prosím čakajte %{time_left} , než skúsite znova"
-      topics_per_day: "Dosiahli ste maximálny počet nových tém na tento deň. Prosím čakajte %{time_left} , než skúsite znova"
-      pms_per_day: "Dosiahli ste maximálny počet správ na tento deň. Prosím čakajte %{time_left} , než skúsite znova"
-      create_like: "Dosiahli ste maximálny počet  \"Páči sa\" na tento deň. Prosím čakajte %{time_left} , než skúsite znova"
-      create_bookmark: "Dosiahli ste maximálny počet záložiek na tento deň. Prosím čakajte %{time_left} , než skúsite znova"
     hours:
-      one: "1 hodina"
-      few: "%{count} hodiny"
-      other: "%{count} hodín"
+      few: '%{count} hodiny'
+      many: '%{count} hodín'
+      one: 1 hodina
+      other: '%{count} hodín'
     minutes:
-      one: "1 minútu"
-      few: "%{count} minúty"
-      other: "%{count} minút"
+      few: '%{count} minúty'
+      many: '%{count} minút'
+      one: 1 minútu
+      other: '%{count} minút'
     seconds:
-      one: " 1 sekundu"
-      few: "%{count} sekundy"
-      other: "%{count} sekúnd"
+      few: '%{count} sekundy'
+      many: '%{count} sekúnd'
+      one: ' 1 sekundu'
+      other: '%{count} sekúnd'
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: "< 1s"
-        few: "< %{count}s"
-        other: "< %{count}s"
+        few: < %{count}s
+        many: < %{count}s
+        one: < 1s
+        other: < %{count}s
       x_seconds:
-        one: "1s"
-        few: "%{count}s"
-        other: "%{count}s"
+        few: '%{count}s'
+        many: '%{count}s'
+        one: 1s
+        other: '%{count}s'
       less_than_x_minutes:
-        one: "< 1m"
-        few: "< %{count}m"
-        other: "< %{count}m"
+        few: < %{count}m
+        many: < %{count}m
+        one: < 1m
+        other: < %{count}m
       x_minutes:
-        one: "1m"
-        few: "%{count}m"
-        other: "%{count}m"
+        few: '%{count}m'
+        many: '%{count}m'
+        one: 1m
+        other: '%{count}m'
       about_x_hours:
-        one: "1h"
-        few: "%{count}h"
-        other: "%{count}h"
+        few: '%{count}h'
+        many: '%{count}h'
+        one: 1h
+        other: '%{count}h'
       x_days:
-        one: "1d"
-        few: "%{count}d"
-        other: "%{count}d"
+        few: '%{count}d'
+        many: '%{count}d'
+        one: 1d
+        other: '%{count}d'
       about_x_months:
-        one: " 1mes"
-        few: "%{count}mes"
-        other: "%{count}mes"
+        few: '%{count}mes'
+        many: '%{count}mes'
+        one: ' 1mes'
+        other: '%{count}mes'
       x_months:
-        one: "1mes"
-        few: "%{count}mes"
-        other: "%{count}mes"
+        few: '%{count}mes'
+        many: '%{count}mes'
+        one: 1mes
+        other: '%{count}mes'
       about_x_years:
-        one: "1r"
-        few: "%{count}r"
-        other: "%{count}r"
+        few: '%{count}r'
+        many: '%{count}r'
+        one: 1r
+        other: '%{count}r'
       over_x_years:
-        one: "> 1r"
-        few: "> %{count}r"
-        other: "> %{count}r"
+        few: '> %{count}r'
+        many: '> %{count}r'
+        one: '> 1r'
+        other: '> %{count}r'
       almost_x_years:
-        one: "1r"
-        few: "%{count}r"
-        other: "%{count}r"
+        few: '%{count}r'
+        many: '%{count}r'
+        one: 1r
+        other: '%{count}r'
     distance_in_words_verbose:
       half_a_minute: "práve teraz"
       less_than_x_seconds:
-        one: "práve teraz"
-        few: "práve teraz"
-        other: "práve teraz"
+        few: práve teraz
+        many: práve teraz
+        one: práve teraz
+        other: práve teraz
       x_seconds:
-        one: "pred sekundou"
-        few: "pred %{count} sekundami"
-        other: "pred %{count} sekundami"
+        few: pred %{count} sekundami
+        many: pred %{count} sekundami
+        one: pred sekundou
+        other: pred %{count} sekundami
       less_than_x_minutes:
-        one: "menej ako pred minútou"
-        few: "menej ako pred %{count} minútami"
-        other: "menej ako pred %{count} minútami"
+        few: menej ako pred %{count} minútami
+        many: menej ako pred %{count} minútami
+        one: menej ako pred minútou
+        other: menej ako pred %{count} minútami
       x_minutes:
-        one: "pred minútou"
-        few: "pred %{count} minútami"
-        other: "pred %{count} minútami"
+        few: pred %{count} minútami
+        many: pred %{count} minútami
+        one: pred minútou
+        other: pred %{count} minútami
       about_x_hours:
-        one: "pred hodinou"
-        few: "pred %{count} hodinami"
-        other: "pred %{count} hodinami"
+        few: pred %{count} hodinami
+        many: pred %{count} hodinami
+        one: pred hodinou
+        other: pred %{count} hodinami
       x_days:
-        one: "včera"
-        few: "pred %{count} dňami"
-        other: "pred %{count} dňami"
+        few: pred %{count} dňami
+        many: pred %{count} dňami
+        one: včera
+        other: pred %{count} dňami
       about_x_months:
-        one: "približne pred mesiacom"
-        few: "približne pred %{count} mesiacmi"
-        other: "približne pred %{count} mesiacmi"
+        few: približne pred %{count} mesiacmi
+        many: približne pred %{count} mesiacmi
+        one: približne pred mesiacom
+        other: približne pred %{count} mesiacmi
       x_months:
-        one: "pred mesiacom"
-        few: "pred %{count} mesiacmi"
-        other: "pred %{count} mesiacmi"
+        few: pred %{count} mesiacmi
+        many: pred %{count} mesiacmi
+        one: pred mesiacom
+        other: pred %{count} mesiacmi
       about_x_years:
-        one: "približne pred rokom"
-        few: "približne pred %{count} rokmi"
-        other: "približne pred %{count} rokmi"
+        few: približne pred %{count} rokmi
+        many: približne pred %{count} rokmi
+        one: približne pred rokom
+        other: približne pred %{count} rokmi
       over_x_years:
-        one: "pred vyše rokom"
-        few: "pred vyše %{count} rokmi"
-        other: "pred vyše %{count} rokmi"
+        few: pred vyše %{count} rokmi
+        many: pred vyše %{count} rokmi
+        one: pred vyše rokom
+        other: pred vyše %{count} rokmi
       almost_x_years:
-        one: "pred takmer rokom"
-        few: "pred takmer %{count} rokmi"
-        other: "pred takmer %{count} rokmi"
+        few: pred takmer %{count} rokmi
+        many: pred takmer %{count} rokmi
+        one: pred takmer rokom
+        other: pred takmer %{count} rokmi
   password_reset:
     no_token: "Ľutujeme, tento odkaz na zmenu hesla je už príliš starý. Stlačte tlačidlo Prihlásiť a použite \"Zabudol som heslo\" pre vytvorenie nového odkazu."
+    choose_new: "Napíš nové heslo"
+    choose: "Napíš heslo"
     update: 'Aktualizujte heslo'
     save: 'Nastavte heslo'
     title: 'Obnoviť heslo'
@@ -466,6 +525,9 @@ sk:
     continue_button: "Pokračujte na %{site_name}"
     welcome_to: "Vitajte na %{site_name}!"
     approval_required: "Moderátor musí manuálne povoliť Váš prístup na toto fórum.  O schválení prístupu budete upovedomení emailom."
+    admin_confirm:
+      title: "Potvrď admin účet"
+      back_to: "Vráť sa na %{title}"
   post_action_types:
     off_topic:
       title: 'Mimo témy'
@@ -482,7 +544,6 @@ sk:
       long_form: 'toto označ ako nevhodné'
     notify_user:
       title: 'Poslať @{{username}} správu'
-      description: 'Chcem sa s touto osobou rozprávať o jeho príspevku priamo a súkromne.'
       long_form: 'úživateľovi bola zaslaná správa'
       email_title: 'Váš príspevok v "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -504,6 +565,9 @@ sk:
       title: 'Hlasovať'
       description: 'Hlasovať pre tento príspevok'
       long_form: 'hlasoval pre tento príspevok'
+  user_activity:
+    no_default:
+      others: "Žiadna aktivita"
   topic_flag_types:
     spam:
       title: 'Spam'
@@ -554,9 +618,7 @@ sk:
       xaxis: "Deň"
       yaxis: "Počet návštev"
     signups:
-      title: "Noví používatelia"
       xaxis: "Deň"
-      yaxis: "Počet nových používateľov"
     profile_views:
       title: "Prezreté používateľské profily"
       xaxis: "Deň"
@@ -594,7 +656,6 @@ sk:
       xaxis: "Deň"
       yaxis: "Počet emailov"
     user_to_user_private_messages:
-      title: "Používateľ používateľovi"
       xaxis: "Deň"
       yaxis: "Počet správ"
     system_private_messages:
@@ -638,7 +699,6 @@ sk:
       title: "Webové prehľadávače"
       xaxis: "Deň"
     page_view_total_reqs:
-      title: "Celkovo"
       xaxis: "Deň"
     page_view_logged_in_mobile_reqs:
       xaxis: "Deň"
@@ -697,15 +757,12 @@ sk:
   site_settings:
     censored_words: "Slová, ktoré budu automatický nahradené znakmi &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Automatické zmazanie príspevkov, ktoré ostali skryté viac ako 30 dní"
-    default_locale: "Predvolený jazyk tejto inštancie Discourse je (ISO 639-1 Code)"
     allow_user_locale: "Povoliť používateľom zvoliť si vlastný jazyk"
     min_post_length: "Minimálny povolený počet znakov v príspevkoch"
     min_first_post_length: "Minimálny povolený počet znakov pre prvý príspevok (obsah témy)"
-    min_private_message_post_length: "Minimálny povolený počet znakov v správe"
     max_post_length: "Maximálny povolený počet znakov v príspevkoch"
     min_topic_title_length: "Minimálny povolený počet znakov v názve témy"
     max_topic_title_length: "Maximálny povolený počet znakov v názve témy"
-    min_private_message_title_length: "Minimálny povolený počet znakov v správe"
     min_search_term_length: "Minimálny povolený počet znakov vo vyhľadávaní"
     search_tokenize_chinese_japanese_korean: "Prinúť vyhľádávanie rozložiť Čínštinu/Japončinu/Kórejčinu dokonca i pre nie CJK stránky"
     allow_uncategorized_topics: "Pvoliť vytváranie tém bez kategórií. UPOZORNENIE: Pokiaľ existujú nekategorizované témy, musíte ich zaradiť do kategórii skôr než túto možnosť vypnete."
@@ -787,7 +844,6 @@ sk:
     version_checks: "Zisťovať aktualizácie na Discourse Hub a zobrazovať správy o novej verzii na stránke admina"
     new_version_emails: "Poslať email na kontaktnú emailovú adresu ak je zistená nová verzia Discourse."
     invite_expiry_days: "Ako dlho je platná pozvánka pre používateľa, v dňoch"
-    invite_passthrough_hours: "Ako dlho môže používateľ používať získaný pozývací kľúč na prihlasovanie, v hodinách"
     login_required: "Požadovať prihlásenie pre čítanie obshau tejto stránky, zakáž anonymný prístup. "
     min_password_length: "Minimálna dĺžka hesla."
     min_admin_password_length: "Minimálna dĺžka hesla pre Administrátora."
@@ -800,7 +856,6 @@ sk:
     sso_overrides_name: "Nahrádzať lokálne plné mená pomocou plných mien z externej stránky pomocou dát z SSO dotazu pri každom logine a zamedziť lokálnym zmenám."
     sso_overrides_avatar: "Nahrádzať používateľský avatar pomocou avatara z externej stránky pomocou dát z SSO dotazu. V prípade zapnutia veľmi doporučujeme vypnúť allow_uploaded_avatars"
     sso_not_approved_url: "Presmeruj nepovolené SSO účty na URL"
-    enable_local_logins: "Povoliť používanie lokálnych účtov a hesiel. (Poznámka: musí to byť zapnuté pre fungovanie pozvánok)"
     allow_new_registrations: "Povoliť registráciu nových používateľov. Odznačte to ak chcete zabrániť vytváraniu nových účtov. "
     enable_signup_cta: "Zobraz oznámenie pre navrátilých anonymných používateľov s výzvou na registráciu účtu. "
     enable_yahoo_logins: "Povoliť autentifikáciu pomocou Yahoo."
@@ -808,8 +863,6 @@ sk:
     google_oauth2_client_id: "Client ID Vašej Google aplikácie."
     google_oauth2_client_secret: "Client secret Vašej Google aplikácie."
     enable_twitter_logins: "Povoliť autentifikáciu cez Twitter, vyžaduje twitter_consmer_key a twiiter_consumer_secret"
-    twitter_consumer_key: "Consumer key pre Twitter autentifikáciu, registrovaný na http://dev.twitter.com"
-    twitter_consumer_secret: "Consumer secret pre Twitter autentifikáciu, registrované na http://dev.twitter.com"
     enable_facebook_logins: "Povoliť autentifikáciu pomocou Facebook, vyžaduje facebook_app_id a facebook_app_secret."
     facebook_app_id: "App id pre Facebook autentifikáciu, registrované na https://developers.facebook.com/apps"
     facebook_app_secret: "App secret pre Facebook autentifikáciu, registrované na https://developers.facebook.com/apps"
@@ -820,7 +873,6 @@ sk:
     allow_restore: "Umožniť obnovu, ktorá nahradí VŠETKY data na stránkach! Ponechajte prázdne okrem prípadu ak chcete obnoviť zo zálohy."
     maximum_backups: "Maximálny počet záloh udržiavaných na disku. Staršie zálohy budu automaticky vymazané"
     automatic_backups_enabled: "Spustiť automatické zálohy podľa nastavenia intervalu záloh"
-    backup_frequency: "Ako často máme vytvárať zálohu stránok, v dňoch."
     enable_s3_backups: "Po dokončení nahrať zálohy na S3. DÔLEŽITÉ: požaduje správne nastavenie prístupových údajov na S3 v menu Súbory."
     s3_backup_bucket: "Vzdialený S3 bucket na uloženie záloh. VAROVANIE: Uistite sa, že ide o súkromný S3 bucket."
     backup_time_of_day: "Čas v UTC, kedy sa má spustiť záloha."
@@ -840,7 +892,6 @@ sk:
     max_bookmarks_per_day: "Maximálny počet záložiek na jedného používateľa denne."
     max_edits_per_day: "Maximálny počet úprav používateľa denne."
     max_topics_per_day: "Maximálny počet tém používateľa denne."
-    max_private_messages_per_day: "Maximálny počet správ ktoré môže používateľ denne vytvoriť."
     max_invites_per_day: "Maximálny počet pozvánok ktoré môže používateľ denne zaslať."
     max_topic_invitations_per_day: "Maximálny počet pozvánok do tém ktoré môže používateľ denne zaslať."
     suggested_topics: "Zobrazovaný počet navrhovaných tém na konci témy."
@@ -849,7 +900,6 @@ sk:
     clean_orphan_uploads_grace_period_hours: "Doba (v hodinách) pred odstránením opustených nahraných súborov."
     purge_deleted_uploads_grace_period_days: "Doba (v dňoch) pred úplným vymazaním odstráneného nahraného súboru."
     enable_s3_uploads: "Ukladať nahrávané súbory na úložište S3. DÔLEŽITÉ: vyžaduje platné prístupové údaje S3 (id prístupového kľúča (access key id) a tajný prístupový kľúč (secret access key))."
-    s3_use_iam_profile: 'Použiť rolu AWS EC2 IAM na načítanie kľúčov. POZNÁMKA: zapnutie prepíše nastavený "s3 prístupový kľúč id (s3 access key id)" a "s3 tajný prístupový kľúč (s3 secret access key)".'
     s3_upload_bucket: "Amazon S3 bucket name, do ktorého budú nahraté súbory. POZOR: musí byť malými písmenami, žiadne bodky a žiadne podtržítka."
     s3_access_key_id: "Amazon S3 access key id, ktoré bude použité pre nahrávanie obrázkov."
     s3_secret_access_key: "Amazon S3 secret access key, ktorý bude použitý pre nahrávanie obrázkov."
@@ -878,7 +928,6 @@ sk:
     min_trust_to_create_topic: "MInimálna úroveň dôvery na vytvorenie novej témy."
     min_trust_to_edit_wiki_post: "MInimálna úroveň dôvery na úpravu wiki príspevku."
     min_trust_to_allow_self_wiki: "MInimálna úroveň dôvery k tomu aby mohol používateľ svoje témy meniť na wiki."
-    min_trust_to_send_messages: "MInimálna úroveň dôvery na vytvorenie novej osobnej správy."
     newuser_max_links: "Koľko odkazov môže nový používateľ pridať do príspevku."
     newuser_max_images: "Koľko obrázkov môže nový používateľ pridať do príspevku."
     newuser_max_attachments: "Koľko príloh môže nový používateľ pridať do príspevku."
@@ -1001,7 +1050,6 @@ sk:
     approve_unless_trust_level: "Príspevky používateľov pod touto úrovňou důvery musia byť schválené"
     auto_close_messages_post_count: "Maximálny počet povolených príspevkov v správe kým je automaticky uzavretá (0 znamená vypnuté)"
     auto_close_topics_post_count: "Maximálny počet povolených príspevkov v téme kým je automaticky uzavretá (0 znamená vypnuté)"
-    default_email_private_messages: "Štandardne poslať email použivateľovi, ktorému niekto poslal správu."
     default_email_direct: "Štandardne poslať email ak niekto cituje/odpovedá na/zmieni alebo pozve používateľa."
     default_email_mailing_list_mode: "Štandardne poslať email pre každý nový príspevok."
     default_email_always: "Štandardne poslať emailovú správu dokonca i vtedy, ak je používateľ aktívny."
@@ -1051,13 +1099,15 @@ sk:
     not_seen_in_a_month: "Vitajte späť! Nevideli sme Vás už nejaký čas. Toto sú najpopulárnejšie témy odkedy ste boli preč."
   move_posts:
     new_topic_moderator_post:
-      one: "Príspevok bol oddelený do novej témy: %{topic_link}"
-      few: "%{count} príspevky boli oddelené do novej témy: %{topic_link}"
-      other: "%{count} príspevkov bolo oddelených do novej témy: %{topic_link}"
+      few: '%{count} príspevky boli oddelené do novej témy: %{topic_link}'
+      many: '%{count} príspevkov bolo oddelených do novej témy: %{topic_link}'
+      one: 'Príspevok bol oddelený do novej témy: %{topic_link}'
+      other: '%{count} príspevkov bolo oddelených do novej témy: %{topic_link}'
     existing_topic_moderator_post:
-      one: "Príspevok bol pripojený k existujúcej téme: %{topic_link}"
-      few: "%{count} príspevky boli pripojené k existujúcej téme: %{topic_link}"
-      other: "%{count} príspevkov bolo pripojených k existujúcej téme: %{topic_link}"
+      few: '%{count} príspevky boli pripojené k existujúcej téme: %{topic_link}'
+      many: '%{count} príspevkov bolo pripojených k existujúcej téme: %{topic_link}'
+      one: 'Príspevok bol pripojený k existujúcej téme: %{topic_link}'
+      other: '%{count} príspevkov bolo pripojených k existujúcej téme: %{topic_link}'
   change_owner:
     post_revision_text: "Vlástníctvo bolo prenesené z  %{old_user} na %{new_user}"
     deleted_user: "vymazaný užívateľ"
@@ -1067,37 +1117,45 @@ sk:
     closed_enabled: "Táto téma je už uzavretá. Nové odpovede už nie sú povolené."
     closed_disabled: "Táto téma je teraz otvorená. Nové odpovede sú povolené."
     autoclosed_message_max_posts:
-      one: "Táto správa bola automaticky uzavretá po dosiahnutí maximálneho limitu 1 odpovede."
-      few: "Táto správa bola automaticky uzavretá po dosiahnutí maximálneho limitu %{count} odpovedí."
-      other: "Táto správa bola automaticky uzavretá po dosiahnutí maximálneho limitu %{count} odpovedí."
+      few: Táto správa bola automaticky uzavretá po dosiahnutí maximálneho limitu %{count} odpovedí.
+      many: Táto správa bola automaticky uzavretá po dosiahnutí maximálneho limitu %{count} odpovedí.
+      one: Táto správa bola automaticky uzavretá po dosiahnutí maximálneho limitu 1 odpovede.
+      other: Táto správa bola automaticky uzavretá po dosiahnutí maximálneho limitu %{count} odpovedí.
     autoclosed_topic_max_posts:
-      one: "Táto téma bola automaticky uzavretá po dosiahnutí maximálneho limitu 1 odpovede."
-      few: "Táto téma bola automaticky uzavretá po dosiahnutí maximálneho limitu %{count} odpovedí."
-      other: "Táto téma bola automaticky uzavretá po dosiahnutí maximálneho limitu %{count} odpovedí."
+      few: Táto téma bola automaticky uzavretá po dosiahnutí maximálneho limitu %{count} odpovedí.
+      many: Táto téma bola automaticky uzavretá po dosiahnutí maximálneho limitu %{count} odpovedí.
+      one: Táto téma bola automaticky uzavretá po dosiahnutí maximálneho limitu 1 odpovede.
+      other: Táto téma bola automaticky uzavretá po dosiahnutí maximálneho limitu %{count} odpovedí.
     autoclosed_enabled_days:
-      one: "Táto téma bola automaticky uzavretá po 1 dni . Nové odpovede už nie sú povolené."
-      few: "Táto téma bola automaticky uzavretá po %{count} dňoch . Nové odpovede už nie sú povolené."
-      other: "Táto téma bola automaticky uzavretá po %{count} dňoch . Nové odpovede už nie sú povolené."
+      few: Táto téma bola automaticky uzavretá po %{count} dňoch . Nové odpovede už nie sú povolené.
+      many: Táto téma bola automaticky uzavretá po %{count} dňoch . Nové odpovede už nie sú povolené.
+      one: Táto téma bola automaticky uzavretá po 1 dni . Nové odpovede už nie sú povolené.
+      other: Táto téma bola automaticky uzavretá po %{count} dňoch . Nové odpovede už nie sú povolené.
     autoclosed_enabled_hours:
-      one: "Táto téma bola automaticky uzavretá po hodine. Nové odpovede už nie sú povolené."
-      few: "Táto téma bola automaticky uzavretá po %{count} hodinách. Nové odpovede už nie sú povolené."
-      other: "Táto téma bola automaticky uzavretá po %{count} hodinách. Nové odpovede už nie sú povolené."
+      few: Táto téma bola automaticky uzavretá po %{count} hodinách. Nové odpovede už nie sú povolené.
+      many: Táto téma bola automaticky uzavretá po %{count} hodinách. Nové odpovede už nie sú povolené.
+      one: Táto téma bola automaticky uzavretá po hodine. Nové odpovede už nie sú povolené.
+      other: Táto téma bola automaticky uzavretá po %{count} hodinách. Nové odpovede už nie sú povolené.
     autoclosed_enabled_minutes:
-      one: "Táto téma bola automaticky uzavretá po minúte. Nové odpovede už nie sú povolené."
-      few: "Táto téma bola automaticky uzavretá po %{count} minútach. Nové odpovede už nie sú povolené."
-      other: "Táto téma bola automaticky uzavretá po %{count} minútach. Nové odpovede už nie sú povolené."
+      few: Táto téma bola automaticky uzavretá po %{count} minútach. Nové odpovede už nie sú povolené.
+      many: Táto téma bola automaticky uzavretá po %{count} minútach. Nové odpovede už nie sú povolené.
+      one: Táto téma bola automaticky uzavretá po minúte. Nové odpovede už nie sú povolené.
+      other: Táto téma bola automaticky uzavretá po %{count} minútach. Nové odpovede už nie sú povolené.
     autoclosed_enabled_lastpost_days:
-      one: "Táto téma bola automaticky uzavretá po 1 dni od poslednej odpovede. Nové odpovede už nie sú povolené."
-      few: "Táto téma bola automaticky uzavretá po %{count} dňoch od poslednej odpovede. Nové odpovede už nie sú povolené."
-      other: "Táto téma bola automaticky uzavretá po %{count} dňoch od poslednej odpovede. Nové odpovede už nie sú povolené."
+      few: Táto téma bola automaticky uzavretá po %{count} dňoch od poslednej odpovede. Nové odpovede už nie sú povolené.
+      many: Táto téma bola automaticky uzavretá po %{count} dňoch od poslednej odpovede. Nové odpovede už nie sú povolené.
+      one: Táto téma bola automaticky uzavretá po 1 dni od poslednej odpovede. Nové odpovede už nie sú povolené.
+      other: Táto téma bola automaticky uzavretá po %{count} dňoch od poslednej odpovede. Nové odpovede už nie sú povolené.
     autoclosed_enabled_lastpost_hours:
-      one: "Táto téma bola automaticky uzavretá po1 hodine od poslednej odpovede. Nové odpovede už nie sú povolené."
-      few: "Táto téma bola automaticky uzavretá po %{count} hodinách od poslednej odpovede. Nové odpovede už nie sú povolené."
-      other: "Táto téma bola automaticky uzavretá po %{count} hodinách od poslednej odpovede. Nové odpovede už nie sú povolené."
+      few: Táto téma bola automaticky uzavretá po %{count} hodinách od poslednej odpovede. Nové odpovede už nie sú povolené.
+      many: Táto téma bola automaticky uzavretá po %{count} hodinách od poslednej odpovede. Nové odpovede už nie sú povolené.
+      one: Táto téma bola automaticky uzavretá po1 hodine od poslednej odpovede. Nové odpovede už nie sú povolené.
+      other: Táto téma bola automaticky uzavretá po %{count} hodinách od poslednej odpovede. Nové odpovede už nie sú povolené.
     autoclosed_enabled_lastpost_minutes:
-      one: "Táto téma bola automaticky uzavretá po 1 minúte od poslednej odpovede. Nové odpovede už nie sú povolené."
-      few: "Táto téma bola automaticky uzavretá po %{count} minútach od poslednej odpovede. Nové odpovede už nie sú povolené."
-      other: "Táto téma bola automaticky uzavretá po %{count} minútach od poslednej odpovede. Nové odpovede už nie sú povolené."
+      few: Táto téma bola automaticky uzavretá po %{count} minútach od poslednej odpovede. Nové odpovede už nie sú povolené.
+      many: Táto téma bola automaticky uzavretá po %{count} minútach od poslednej odpovede. Nové odpovede už nie sú povolené.
+      one: Táto téma bola automaticky uzavretá po 1 minúte od poslednej odpovede. Nové odpovede už nie sú povolené.
+      other: Táto téma bola automaticky uzavretá po %{count} minútach od poslednej odpovede. Nové odpovede už nie sú povolené.
     autoclosed_disabled: "Táto téma je teraz otvorená. Nové odpovede sú povolené."
     autoclosed_disabled_lastpost: "Táto téma je teraz otvorená. Nové odpovede sú povolené."
     pinned_enabled: "Táto téma je teraz pripnutá. Bude zobrazená na vrchu danej kategórie pokiaľ ju neodopnú zamestnanci pre všetkých alebo samostatne každý používateľ."
@@ -1143,9 +1201,10 @@ sk:
       max_new_accounts_per_registration_ip: "Nové registrácie nie sú povolené z Vašej IP adresy (dosiahnutý limit). Kontaktujte člena obsluhy. "
   flags_reminder:
     subject_template:
-      one: "1 značká čaká na zpracovanie"
-      few: "%{count} značky čakajú na zpracovanie"
-      other: "%{count} značiek čaká na zpracovanie"
+      few: '%{count} značky čakajú na zpracovanie'
+      many: '%{count} značiek čaká na zpracovanie'
+      one: 1 značká čaká na zpracovanie
+      other: '%{count} značiek čaká na zpracovanie'
   unsubscribe_mailer:
     subject_template: "Potvrďte, že už ďalej nechcete dostávať aktualizácie z  %{site_title}"
   invite_password_instructions:
@@ -1179,8 +1238,6 @@ sk:
       text_body_template: "Váš súbor na hromadné pozvanie používateľov bol zpracovaný, emailom bolo poslaných %{sent} prihlášok."
     bulk_invite_failed:
       subject_template: "Zpracovanie pozvania viacerých používateľov dopadlo s chybami"
-    csv_export_succeeded:
-      subject_template: "Export dát kompletný"
     csv_export_failed:
       subject_template: "Export dát zlyhal"
     email_reject_inactive_user:
@@ -1221,9 +1278,10 @@ sk:
         Akcia uverejnenia nebola rozpoznaná. Prosíme skúste znovu alebo, ak sa chovanie opakuje, uverejnite pomocou webstránky.
     pending_users_reminder:
       subject_template:
-        one: "1 užívateľ čaká na schválenie"
-        few: "%{count} užívateľia čakajú na schválenie"
-        other: "%{count} užívateľov čaká na schválenie"
+        few: '%{count} užívateľia čakajú na schválenie'
+        many: '%{count} užívateľov čaká na schválenie'
+        one: 1 užívateľ čaká na schválenie
+        other: '%{count} užívateľov čaká na schválenie'
     download_remote_images_disabled:
       subject_template: "Sťahovanie vzdialených obrázkov je zablokované."
   subject_re: "Re:"
@@ -1301,10 +1359,9 @@ sk:
   badges:
     first_mention:
       name: Prvá zmienka
-      long_description: Tento odznak je udelený, keď prvýkrát zmienite niekoho @meno vo Vašom príspevku. Každá zmienka generuje upozornenie danej osobe, takže bude vedieť o Vašom príspevku. Jednoducho začnite písať @ (zavináč) aby ste zmienili používateľa alebo, ak je to povolené, skupinu - Je to pohodlný spôsob ako upútať ich pozornosť.
+      long_description: "Tento odznak je udelený, keď prvýkrát zmienite niekoho @meno vo Vašom príspevku. Každá zmienka generuje upozornenie danej osobe, takže bude vedieť o Vašom príspevku. Jednoducho začnite písať @ (zavináč) aby ste zmienili používateľa alebo, ak je to povolené, skupinu - Je to pohodlný spôsob ako upútať ich pozornosť."
   admin_login:
     success: "Email odoslaný"
-    error: "Chyba !"
     email_input: "Email administrátora"
     submit_button: "Poslať email"
   performance_report:
@@ -1314,6 +1371,3 @@ sk:
     step:
       invites:
         title: "Pozvite členov"
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.sl.yml b/config/locales/server.sl.yml
new file mode 100644
index 00000000000..fc9c6dc901d
--- /dev/null
+++ b/config/locales/server.sl.yml
@@ -0,0 +1,80 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sl:
+  dates:
+    short_date_no_year: "D MMM"
+    short_date: "D MMM, YYYY"
+    long_date: "D MMMM, YYYY h:mma"
+  datetime_formats: &datetime_formats
+    formats:
+      short: "%d-%m-%Y"
+      short_no_year: "%B %-d"
+      date_only: "%B %-d, %Y"
+      long: "%B %-d, %Y, %l:%M%P"
+  date:
+    month_names: [~, Januar, Februar, Marec, April, Maj, Junij, Julij, Avgust, September, Oktober, November, December]
+    <<: *datetime_formats
+  time:
+    <<: *datetime_formats
+    am: "am"
+    pm: "pm"
+  title: "Discourse"
+  topics: "Teme"
+  loading: "Nalagam"
+  log_in: "Vpis"
+  errors: &errors
+    messages:
+      taken: "je že uporabljeno"
+      exclusion: je rezervirano
+      has_already_been_used: "je že v uporabi"
+      inclusion: ni vključeno na seznam
+      invalid: je neveljavno
+      less_than: "mora biti manj kot %{count}"
+      less_than_or_equal_to: "mora biti manj ali enako kot %{count}"
+      not_a_number: ni številka
+      not_an_integer: mora biti celo število
+      odd: mora biti liho število
+      too_long:
+        few: je predolgo (največ %{count} znakov)
+        one: je predolgo (največ 1 znak)
+        other: je predolgo (največ %{count} znakov)
+        two: je predolgo (največ 2 znaka)
+      too_short:
+        few: je prekratko (minimum je %{count} znakov)
+        one: je prekratko (minimum je 1 znak)
+        other: je prekratko (minimum je %{count} znakov)
+        two: je prekratko (minimum sta 2 znaka)
+  activemodel:
+    errors:
+      <<: *errors
+  reading_time: "Čas branja"
+  likes: "Všečki"
+  embed:
+    start_discussion: "Začni razpravo"
+    continue: "Nadaljuj razpravo"
+  next_page: "naslednja stran →"
+  prev_page: "← prejšnja stran"
+  page_num: "Stran %{num}"
+  home_title: "Domov"
+  author_wrote: "%{author} je napisal/a:"
+  num_participants: "Udeleženci:"
+  read_full_topic: "Preberi celo temo"
+  private_message_abbrev: "Msg"
+  rss_description:
+    latest: "Zadnje teme"
+  excerpt_image: "slika"
+  groups:
+    default_names:
+      everyone: "vsi"
+      admins: "administratorji"
+      moderators: "moderatorji"
+  activerecord:
+    errors:
+      <<: *errors
+  site_settings:
+    avatar_sizes: "Seznam avtomatsko generiranih velikosti avatarjev."
diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml
index 2a51d683aca..71baba1a3d1 100644
--- a/config/locales/server.sq.yml
+++ b/config/locales/server.sq.yml
@@ -17,12 +17,12 @@ sq:
       date_only: "%B %-d, %Y"
       long: "%B %-d, %Y, %l:%M%P"
   date:
-    month_names: [null, Janar, Shkurt, Mars, Prill, Maj, Qershor, Korrik, Gusht, Shtator, Tetor, Nëntor, Dhjetor]
+    month_names: [~, Janar, Shkurt, Mars, Prill, Maj, Qershor, Korrik, Gusht, Shtator, Tetor, Nëntor, Dhjetor]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "pd"
     pm: "md"
-    <<: *datetime_formats
   title: "Discourse"
   topics: "Tema"
   posts: "postime"
@@ -54,7 +54,7 @@ sq:
       present: mund të lihet bosh
       confirmation: "nuk përputhet %{attribute}"
       empty: nuk mund të lihet bosh
-      equal_to: duhet të jetë baraz me %{count}
+      equal_to: "duhet të jetë baraz me %{count}"
       exclusion: është i rezervuar
       invalid: është i pavlefshëm
       not_a_number: nuk është një numër
@@ -63,6 +63,9 @@ sq:
       load_from_remote: "Postimi nuk mundi të ngarkohet. Riprovoheni!"
     site_settings:
       default_categories_already_selected: "Nuk mund të zgjidhni një kategori të përdorur në një tjetër listë."
+  activemodel:
+    errors:
+      <<: *errors
   invite:
     user_exists: "Nuk keni nevojë të ftoni <b>%{email}</b>, ata <a href='/u/%{username}/summary'>kanë krijuar një llogari në faqe!</a>"
   not_logged_in: "Ju duhet të identifikoheni për këtë veprim."
@@ -73,18 +76,18 @@ sq:
     start_discussion: "Fillo Diskutim"
     continue: "Vazhdo Diskutimin"
     more_replies:
-      one: "edhe 1 përgjigje "
-      other: "janë %{count} përgjigje"
+      one: 'edhe 1 përgjigje '
+      other: janë %{count} përgjigje
     loading: "Duke Ngarkuar Diskutimin..."
     permalink: "Permalink"
     in_reply_to: "▶ %{username}"
     replies:
-      one: "1 përgjigje"
-      other: "%{count} përgjigje"
+      one: 1 përgjigje
+      other: '%{count} përgjigje'
   no_mentions_allowed_newuser: "Na vjen keq, anëtarët e rinj nuk mund të citojnë anëtarë të tjerë."
   too_many_mentions_newuser:
-    one: "Na vjen keq, anëtarët e rinj mund të citojnë vetëm 1 anëtar në një postim."
-    other: "Na vjen keq, anëtarët e rinj mund të citojnë vetëm %{count} anëtarë në një postim."
+    one: Na vjen keq, anëtarët e rinj mund të citojnë vetëm 1 anëtar në një postim.
+    other: Na vjen keq, anëtarët e rinj mund të citojnë vetëm %{count} anëtarë në një postim.
   no_images_allowed: "Na vjen keq, anëtarët e rinj nuk kanë të drejtë të vendosin imazhe në një postim."
   spamming_host: "Na vjen keq, you cannot post a link to that host."
   invalid_characters: "përmban karaktere  jo të vlefshëm"
@@ -117,9 +120,9 @@ sq:
       trust_level_4: "trust_level_4"
   education:
     until_posts:
-      one: "1 postim"
-      other: "%{count} postime"
-    new-topic: |
+      one: 1 postim
+      other: '%{count} postime'
+    'new-topic': |
       Mirë se vini te %{site_name} &mdash; **faleminderit që nisët një bisedë të re!**
 
       - A ju duket tërheqës titulli nëse e lexoni me zë të lartë? A është e mirë përmbledhja?
@@ -129,7 +132,7 @@ sq:
       - Përfshini fjalë të përdorura zakonisht në temën tuaj kështu që të tjerët mund **ta gjejnë** atë. Për të grupuar temën tuaj me të ngjashmet, zgjidhni një kategori.
 
       Për më tepër, [lexoni porositë e bashkësisë](/guidelines). Ky panel do t'ju shfaqet vetëm gjatë %{education_posts_text} tuaj të parë.
-    new-reply: |
+    'new-reply': |
       Mirë se vini tek %{site_name} &mdash; **faleminderit për pjesëmarrjen!**
 
       - Jini të sjellshëm me anëtarët e tjerë të faqes.
@@ -148,11 +151,11 @@ sq:
       user_profile:
         bio_raw: "Rreth Meje"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              cant_send_pm: "Ndjesë, nuk mund t'i dërgoni këtij përdoruesi një mesazh privat."
               no_user_selected: "Ju duhet të zgjidhni një përdorues të vlefshëm."
         user:
           attributes:
@@ -162,32 +165,31 @@ sq:
           attributes:
             hex:
               invalid: "nuk është një ngjyrë e vlefshme"
-      <<: *errors
   meta_category_name: "Reagimet e Faqes"
   staff_category_name: "Stafi"
   lounge_welcome:
     title: "Mirë se vini në Lounge"
     body: |2
 
-      Congratulations! :confetti_ball:
+        Congratulations! :confetti_ball:
 
-      If you can see this topic, you were recently promoted to **regular** (trust level 3).
+        If you can see this topic, you were recently promoted to **regular** (trust level 3).
 
-      You can now &hellip;
+        You can now &hellip;
 
-      * Edit the title of any topic
-      * Change the category of any topic
-      * Have all your links followed ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) is removed)
-      * Access a private Lounge category only visible to users at trust level 3 and higher
-      * Hide spam with a single flag
+        * Edit the title of any topic
+        * Change the category of any topic
+        * Have all your links followed ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) is removed)
+        * Access a private Lounge category only visible to users at trust level 3 and higher
+        * Hide spam with a single flag
 
-      Here's the [current list of fellow regulars](/badges/3/regular). Be sure to say hi.
+        Here's the [current list of fellow regulars](/badges/3/regular). Be sure to say hi.
 
-      Thanks for being an important part of this community!
+        Thanks for being an important part of this community!
 
-      (For more information on trust levels, [see this topic][trust]. Please note that only members who continue to meet the requirements over time will remain regulars.)
+        (For more information on trust levels, [see this topic][trust]. Please note that only members who continue to meet the requirements over time will remain regulars.)
 
-      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Rreth kategorisë %{category}"
     errors:
@@ -199,8 +201,8 @@ sq:
       uncategorized: "Nuk fshij dot kategorinë \"Uncategorized\""
       has_subcategories: "Nuk e fshini dot këtë kategori sepse ajo ka nënkategori. "
       topic_exists:
-        one: "Nuk e fshini dot këtë kategori sepse këtu ka 1 temë. Tema më e vjetër është %{topic_link}."
-        other: "Nuk e fshini dot këtë kategori sepse këtu ka %{count} tema. Tema më e vjetër është %{topic_link}."
+        one: Nuk e fshini dot këtë kategori sepse këtu ka 1 temë. Tema më e vjetër është %{topic_link}.
+        other: Nuk e fshini dot këtë kategori sepse këtu ka %{count} tema. Tema më e vjetër është %{topic_link}.
       topic_exists_no_oldest: "Nuk e fshini dot këtë kategori sepse numri i temave është %{count}."
   trust_levels:
     newuser:
@@ -214,95 +216,86 @@ sq:
     leader:
       title: "udhëheqës"
   rate_limiter:
-    slow_down: "E keni bërë këtë veprim shumë shpesh, prisni pak e provoni më vonë. "
-    too_many_requests: "Sistemi ka një limit për sa herë ai veprim mund të kryhet në një ditë. Prisni %{time_left} para se të provoni përsëri. "
-    by_type:
-      first_day_replies_per_day: "Keni arritur maksimumin e përgjigjeve që një përdorues i ri mund të postojë në ditën e parë. Prisni %{time_left} dhe provoni përsëri."
-      first_day_topics_per_day: "Keni postuar maksimumin e temave që një anëtar i ri mund të krijojë në ditën e parë. Prisni %{time_left} para se të provoni përsëri. "
-      create_topic: "Po nxitoheni shumë për të krijuar tema të reja. Prisni %{time_left} dhe provoni përsëri."
-      create_post: "Po përgjigjeni shumë shpejt. Prisni %{time_left} dhe provoni përsëri."
-      delete_post: "Po fshini postimet shumë shpejt. Prisni %{time_left} dhe provoni përsëri."
-      topics_per_day: "Keni arritur maksimumin e temave të reja për sot. Prisni %{time_left} dhe provoni përsëri."
     hours:
-      one: "1 orë"
-      other: "%{count} orë"
+      one: 1 orë
+      other: '%{count} orë'
     minutes:
-      one: "1 minutë"
-      other: "%{count} minuta"
+      one: 1 minutë
+      other: '%{count} minuta'
     seconds:
-      one: "1 sekondë"
-      other: "%{count} sekonda"
+      one: 1 sekondë
+      other: '%{count} sekonda'
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: "< 1s"
-        other: "< %{count}s"
+        one: < 1s
+        other: < %{count}s
       x_seconds:
-        one: "1s"
-        other: "%{count}s"
+        one: 1s
+        other: '%{count}s'
       less_than_x_minutes:
-        one: "< 1m"
-        other: "< %{count}m"
+        one: < 1m
+        other: < %{count}m
       x_minutes:
-        one: "1m"
-        other: "%{count}m"
+        one: 1m
+        other: '%{count}m'
       about_x_hours:
-        one: "1h"
-        other: "%{count}h"
+        one: 1h
+        other: '%{count}h'
       x_days:
-        one: "1d"
-        other: "%{count}d"
+        one: 1d
+        other: '%{count}d'
       about_x_months:
-        one: "1muaj"
-        other: "%{count}muaj"
+        one: 1muaj
+        other: '%{count}muaj'
       x_months:
-        one: "1muaj"
-        other: "%{count}muaj"
+        one: 1muaj
+        other: '%{count}muaj'
       about_x_years:
-        one: "1y"
-        other: "%{count}y"
+        one: 1y
+        other: '%{count}y'
       over_x_years:
-        one: "> 1v"
-        other: "> %{count}v"
+        one: '> 1v'
+        other: '> %{count}v'
       almost_x_years:
-        one: "1v"
-        other: "%{count}v"
+        one: 1v
+        other: '%{count}v'
     distance_in_words_verbose:
       half_a_minute: "tani"
       less_than_x_seconds:
-        one: "tani"
-        other: "tani"
+        one: tani
+        other: tani
       x_seconds:
-        one: "1 sekondë më parë"
-        other: "%{count} sekonda më parë"
+        one: 1 sekondë më parë
+        other: '%{count} sekonda më parë'
       less_than_x_minutes:
-        one: "më pak se 1 minutë më parë"
-        other: "më pak se %{count} minuta më parë"
+        one: më pak se 1 minutë më parë
+        other: më pak se %{count} minuta më parë
       x_minutes:
-        one: "1 minutë më parë"
-        other: "%{count} minuta më parë"
+        one: 1 minutë më parë
+        other: '%{count} minuta më parë'
       about_x_hours:
-        one: "para 1 ore"
-        other: "para %{count} orësh"
+        one: para 1 ore
+        other: para %{count} orësh
       x_days:
-        one: "para 1 dite"
-        other: "para %{count} ditësh"
+        one: para 1 dite
+        other: para %{count} ditësh
       about_x_months:
-        one: "rreth 1 muaj më parë"
-        other: "rreth %{count} muaj më parë"
+        one: rreth 1 muaj më parë
+        other: rreth %{count} muaj më parë
       x_months:
-        one: "1 muaj më parë"
-        other: "%{count} muaj më parë"
+        one: 1 muaj më parë
+        other: '%{count} muaj më parë'
       about_x_years:
-        one: "rreth 1 vit më parë"
-        other: "rreth %{count} vjet më parë"
+        one: rreth 1 vit më parë
+        other: rreth %{count} vjet më parë
       over_x_years:
-        one: "mbi 1 vit më parë"
-        other: "mbi %{count} vite më parë"
+        one: mbi 1 vit më parë
+        other: mbi %{count} vite më parë
       almost_x_years:
-        one: "pothuajse 1 vit më parë"
-        other: "pothuajse %{count} vite më parë"
+        one: pothuajse 1 vit më parë
+        other: pothuajse %{count} vite më parë
   password_reset:
     no_token: "Ndjesë, kjo lidhje për ndryshimin e fjalëkalimit është shumë e vjetër. Kliko butonin 'Identifikohu' dhe përdorni 'Kam harruar fjalëkalimin' për të marrë një lidhje të re."
     update: 'Rifresko Fjalëkalimin'
@@ -340,7 +333,6 @@ sq:
       long_form: 'sinjalizoi këtë postim si të papërshtatshëm'
     notify_user:
       title: 'Dërgoji @{{username}} një mesazh'
-      description: 'Dëshiroj të flas me këtë person drejtpërdrejt dhe privatish rreth këtij postimi.'
       long_form: 'messaged user'
       email_title: 'Postimi juaj në "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -407,9 +399,7 @@ sq:
       xaxis: "Ditë"
       yaxis: "Numri i vizitave"
     signups:
-      title: "Përdorues të rinj"
       xaxis: "Ditë"
-      yaxis: "Numri i përdoruesve të rinj"
     profile_views:
       xaxis: "Ditë"
     topics:
@@ -443,7 +433,6 @@ sq:
       xaxis: "Ditë"
       yaxis: "Number of Emails"
     user_to_user_private_messages:
-      title: "User-to-User"
       xaxis: "Ditë"
       yaxis: "Numri i mesazheve"
     system_private_messages:
@@ -487,7 +476,6 @@ sq:
       title: "Web Crawlers"
       xaxis: "Day"
     page_view_total_reqs:
-      title: "Total"
       xaxis: "Day"
     page_view_logged_in_mobile_reqs:
       xaxis: "Ditë"
@@ -544,15 +532,12 @@ sq:
   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."
-    default_locale: "The default language of this Discourse instance (ISO 639-1 Code)"
     allow_user_locale: "Allow users to choose their own language interface preference"
     min_post_length: "Minimum allowed post length in characters"
     min_first_post_length: "Minimum allowed first post (topic body) length in characters"
-    min_private_message_post_length: "Minimum allowed post length in characters for messages"
     max_post_length: "Maximum allowed post length in characters"
     min_topic_title_length: "Minimum allowed topic title length in characters"
     max_topic_title_length: "Maximum allowed topic title length in characters"
-    min_private_message_title_length: "Minimum allowed title length for a message in characters"
     min_search_term_length: "Minimum valid search term length in characters"
     allow_uncategorized_topics: "Allow topics to be created without a category. WARNING: If there are any uncategorized topics, you must recategorize them before turning this off."
     allow_duplicate_topic_titles: "Allow topics with identical, duplicate titles."
@@ -629,7 +614,6 @@ sq:
     version_checks: "Ping the Discourse Hub for version updates and show new version messages on the /admin dashboard"
     new_version_emails: "Send an email to the contact_email address when a new version of Discourse is available."
     invite_expiry_days: "How long user invitation keys are valid, in days"
-    invite_passthrough_hours: "How long a user can use a previously redeemed invitation key to log in, in hours"
     login_required: "Require authentication to read content on this site, disallow anonymous access."
     min_password_length: "Minimum password length."
     block_common_passwords: "Mos lejo fjalëkalimet që gjenden në 10,000 fjalëkalimet më të përdorshme."
@@ -641,15 +625,12 @@ sq:
     sso_overrides_name: "Overrides local full name with external site full name from SSO payload on every login, and prevent local changes."
     sso_overrides_avatar: "Overrides user avatar with external site avatar from SSO payload. If enabled, disabling allow_uploaded_avatars is highly recommended"
     sso_not_approved_url: "Redirect unapproved SSO accounts to this URL"
-    enable_local_logins: "Enable local username and password login based accounts. (Note: this must be enabled for invites to work)"
     allow_new_registrations: "Allow new user registrations. Uncheck this to prevent anyone from creating a new account."
     enable_yahoo_logins: "Enable Yahoo authentication"
     enable_google_oauth2_logins: "Enable Google Oauth2 authentication. This is the method of authentication that Google currently supports. Requires key and secret."
     google_oauth2_client_id: "Client ID of your Google application."
     google_oauth2_client_secret: "Client secret of your Google application."
     enable_twitter_logins: "Enable Twitter authentication, requires twitter_consumer_key and twitter_consumer_secret"
-    twitter_consumer_key: "Consumer key for Twitter authentication, registered at http://dev.twitter.com"
-    twitter_consumer_secret: "Consumer secret for Twitter authentication, registered at http://dev.twitter.com"
     enable_facebook_logins: "Enable Facebook authentication, requires facebook_app_id and facebook_app_secret"
     facebook_app_id: "App id for Facebook authentication, registered at https://developers.facebook.com/apps"
     facebook_app_secret: "App secret for Facebook authentication, registered at https://developers.facebook.com/apps"
@@ -658,7 +639,6 @@ sq:
     github_client_secret: "Client secret for Github authentication, registered at https://github.com/settings/applications"
     allow_restore: "Allow restore, which can replace ALL site data! Leave false unless you plan to restore a backup"
     maximum_backups: "The maximum amount of backups to keep on disk. Older backups are automatically deleted"
-    backup_frequency: "How frequently we create a site backup, in days."
     enable_s3_backups: "Upload backups to S3 when complete. IMPORTANT: requires valid S3 credentials entered in Files settings."
     s3_backup_bucket: "The remote bucket to hold backups. WARNING: Make sure it is a private bucket."
     active_user_rate_limit_secs: "How frequently we update the 'last_seen_at' field, in seconds"
@@ -673,7 +653,6 @@ sq:
     max_bookmarks_per_day: "Maximum number of bookmarks per user per day."
     max_edits_per_day: "Maximum number of edits per user per day."
     max_topics_per_day: "Maximum number of topics a user can create per day."
-    max_private_messages_per_day: "Maximum number of messages users can create per day."
     max_invites_per_day: "Maximum number of invites a user can send per day."
     max_topic_invitations_per_day: "Maximum number of topic invitations a user can send per day."
     suggested_topics: "Number of suggested topics shown at the bottom of a topic."
@@ -682,7 +661,6 @@ sq:
     clean_orphan_uploads_grace_period_hours: "Grace period (in hours) before an orphan upload is removed."
     purge_deleted_uploads_grace_period_days: "Grace period (in days) before a deleted upload is erased."
     enable_s3_uploads: "Place uploads on Amazon S3 storage. IMPORTANT: requires valid S3 credentials (both access key id & secret access key)."
-    s3_use_iam_profile: 'Use AWS EC2 IAM role to retrieve keys. NOTE: enabling will override "s3 access key id" and "s3 secret access key" settings.'
     s3_upload_bucket: "The Amazon S3 bucket name that files will be uploaded into. WARNING: must be lowercase, no periods, no underscores."
     s3_access_key_id: "The Amazon S3 access key id that will be used to upload images."
     s3_secret_access_key: "The Amazon S3 secret access key that will be used to upload images."
@@ -848,11 +826,11 @@ sq:
     not_seen_in_a_month: "Welcome back! We haven't seen you in a while. These are the most popular topics since you've been away."
   move_posts:
     new_topic_moderator_post:
-      one: "A post was split to a new topic: %{topic_link}"
-      other: "%{count} posts were split to a new topic: %{topic_link}"
+      one: 'A post was split to a new topic: %{topic_link}'
+      other: '%{count} posts were split to a new topic: %{topic_link}'
     existing_topic_moderator_post:
-      one: "A post was merged into an existing topic: %{topic_link}"
-      other: "%{count} posts were merged into an existing topic: %{topic_link}"
+      one: 'A post was merged into an existing topic: %{topic_link}'
+      other: '%{count} posts were merged into an existing topic: %{topic_link}'
   change_owner:
     post_revision_text: "Ownership transferred from %{old_user} to %{new_user}"
     deleted_user: "a deleted user"
@@ -862,29 +840,29 @@ sq:
     closed_enabled: "This topic is now closed. New replies are no longer allowed."
     closed_disabled: "This topic is now opened. New replies are allowed."
     autoclosed_message_max_posts:
-      one: "Ky mesazh u mbyll automatikisht pasi arriti kufirin e lejueshëm të 1 përgjigjeje."
-      other: "Ky mesazh u mbyll automatikisht pasi arriti kufirin e lejueshëm të %{count} përgjigjeve."
+      one: Ky mesazh u mbyll automatikisht pasi arriti kufirin e lejueshëm të 1 përgjigjeje.
+      other: Ky mesazh u mbyll automatikisht pasi arriti kufirin e lejueshëm të %{count} përgjigjeve.
     autoclosed_topic_max_posts:
-      one: "Kjo temë është mbyllur automatikisht pasi arriti kufirin e lejueshëm të 1 përgjigjeje."
-      other: "Kjo temë është mbyllur automatikisht pasi arriti kufirin e lejueshëm të %{count} përgjigjeve."
+      one: Kjo temë është mbyllur automatikisht pasi arriti kufirin e lejueshëm të 1 përgjigjeje.
+      other: Kjo temë është mbyllur automatikisht pasi arriti kufirin e lejueshëm të %{count} përgjigjeve.
     autoclosed_enabled_days:
-      one: "This topic was automatically closed after 1 day. New replies are no longer allowed."
-      other: "This topic was automatically closed after %{count} days. New replies are no longer allowed."
+      one: This topic was automatically closed after 1 day. New replies are no longer allowed.
+      other: This topic was automatically closed after %{count} days. New replies are no longer allowed.
     autoclosed_enabled_hours:
-      one: "This topic was automatically closed after 1 hour. New replies are no longer allowed."
-      other: "This topic was automatically closed after %{count} hours. New replies are no longer allowed."
+      one: This topic was automatically closed after 1 hour. New replies are no longer allowed.
+      other: This topic was automatically closed after %{count} hours. New replies are no longer allowed.
     autoclosed_enabled_minutes:
-      one: "This topic was automatically closed after 1 minute. New replies are no longer allowed."
-      other: "This topic was automatically closed after %{count} minutes. New replies are no longer allowed."
+      one: This topic was automatically closed after 1 minute. New replies are no longer allowed.
+      other: This topic was automatically closed after %{count} minutes. New replies are no longer allowed.
     autoclosed_enabled_lastpost_days:
-      one: "This topic was automatically closed 1 day after the last reply. New replies are no longer allowed."
-      other: "This topic was automatically closed %{count} days after the last reply. New replies are no longer allowed."
+      one: This topic was automatically closed 1 day after the last reply. New replies are no longer allowed.
+      other: This topic was automatically closed %{count} days after the last reply. New replies are no longer allowed.
     autoclosed_enabled_lastpost_hours:
-      one: "This topic was automatically closed 1 hour after the last reply. New replies are no longer allowed."
-      other: "This topic was automatically closed %{count} hours after the last reply. New replies are no longer allowed."
+      one: This topic was automatically closed 1 hour after the last reply. New replies are no longer allowed.
+      other: This topic was automatically closed %{count} hours after the last reply. New replies are no longer allowed.
     autoclosed_enabled_lastpost_minutes:
-      one: "This topic was automatically closed 1 minute after the last reply. New replies are no longer allowed."
-      other: "This topic was automatically closed %{count} minutes after the last reply. New replies are no longer allowed."
+      one: This topic was automatically closed 1 minute after the last reply. New replies are no longer allowed.
+      other: This topic was automatically closed %{count} minutes after the last reply. New replies are no longer allowed.
     autoclosed_disabled: "This topic is now opened. New replies are allowed."
     autoclosed_disabled_lastpost: "This topic is now opened. New replies are allowed."
     pinned_enabled: "This topic is now pinned. It will appear at the top of its category until it is unpinned by staff for everyone, or by individual users for themselves."
@@ -919,8 +897,8 @@ sq:
       max_new_accounts_per_registration_ip: "New registrations are not allowed from your IP address (maximum limit reached). Contact a staff member."
   flags_reminder:
     subject_template:
-      one: "1 sinjalizim në pritje për t'u trajtuar"
-      other: "%{count} sinjalizime në pritje për t'u trajtuar"
+      one: 1 sinjalizim në pritje për t'u trajtuar
+      other: '%{count} sinjalizime në pritje për t''u trajtuar'
   invite_password_instructions:
     subject_template: "Vendos fjalëkalimin për llogarinë tek %{site_name}"
   admin_confirmation_mailer:
@@ -959,8 +937,6 @@ sq:
       text_body_template: "Your bulk user invite file was processed, %{sent} invites mailed."
     bulk_invite_failed:
       subject_template: "Bulk user invite processed with errors"
-    csv_export_succeeded:
-      subject_template: "Data export complete"
     csv_export_failed:
       subject_template: "Data export failed"
     email_reject_parsing:
@@ -970,8 +946,8 @@ sq:
         We couldn't find your reply in the email. **Make sure your reply is at the top of the email** -- we can't process inline replies.
     pending_users_reminder:
       subject_template:
-        one: "1 user waiting for approval"
-        other: "%{count} users waiting for approval"
+        one: 1 user waiting for approval
+        other: '%{count} users waiting for approval'
       text_body_template: |
         There are new user signups waiting to be approved (or rejected) before they can access this forum.
 
@@ -1112,7 +1088,7 @@ sq:
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
-        %{message}
+          %{message}
     digest:
       why: "Një përmbledhje e shkurtër e temave tek %{site_link} që prej vizitës tuaj të fundit më %{last_seen_at}"
       subject_template: "[%{email_prefix}] Përmbledhja"
@@ -1197,141 +1173,6 @@ sq:
     title: "Pyetje dhe Përgjigje/Udhëzime"
   tos_topic:
     title: "Termat e Shërbimit "
-    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: "Politika e Privatësisë"
   badges:
@@ -1342,22 +1183,22 @@ sq:
         Kjo stemë jepet kur ndryshoni një nga postimet tuaja për herë të parë. Ndërkohë që nuk do jetë e mundur të ndryshoni postimet tuaja përgjithmonë, ndryshimi është gjithmonë një ide e mirë - ju mund të përmirësoni postimet tuaja, të korigjoni gabime të vogla, apo të shtoni çdo gjë që mungonte nga postimi i parë. Ndryshojini postimet që t'i bëni akoma më të mira!
     basic_user:
       name: Anëtar i Thjeshtë
-      description: Ka të drejtat bazë të një anëtari në këtë komunitet <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Informacion shtesë në anglisht</a>
+      description: "Ka të drejtat bazë të një anëtari në këtë komunitet <a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">Informacion shtesë në anglisht</a>"
       long_description: |
         Kjo stemë jepet kur ju arrini nivelin e bisedës 1. Falemindeit që jeni përreth prej ca kohësh dhe që lexoni disa tema për të mësuar më tepër rreth komunitetit tonë. Limitet e përdoruesit të ri janë hequr, keni mundësi të përdorni të gjitha aftësitë kryesore të komunitetit, si mesazhet private, sinjalizimet, ndryshim për wiki, dhe aftësinë për të postuar disa imazhe njëherazi dhe lidhje.
     member:
       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
+      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 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
+      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"
       long_description: |
         Kjo stemë jepet kur ju arrini nivelin e besimit 3. Faleminderit që jeni pjesë e komutetit tonë prej disa muajsh. Ju jeni tashmë një prej lexuesve më aktivë, dhe një bashkëpunëtor i besueshëm që përmirëson komunitetin tonë. Ju mundet tashmë të ri-kategorizoni dhe ri-emëroni temat, të keni cilësime të mëtejshme për sinjalizime spam-esh, të keni hyrje në zona private të faqes, gjithashtu dhe më tepër pëlqime ditore.
     leader:
       name: Udhëheqës
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Dhënë</a> mundësia për ndryshim të gjithanshëm, ngjitje në krye, mbyllje, arkivim, ndarje dhe ngjitje, më tepër pëlqime
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">Dhënë</a> mundësia për ndryshim të gjithanshëm, ngjitje në krye, mbyllje, arkivim, ndarje dhe ngjitje, më tepër pëlqime"
       long_description: |
         Kjo stemë jepet kur ju arrini nivelin e besimit 4. Jeni një udhëheqës në këtë komunitet si i përzgjedhur nga stafi, dhe ju jeni një shembull për pjesën tjetër të anëtarëve me veprimet dhe fjalët tuaja këtu. Ju keni mundësinë të ndryshoni të gjitha postimet, të aftë për moderime të tjera siç janë ngjitja në krye, mbyllja, çlistimi, arkivimi, ndarja dhe ngjitja, dhe ju keni tonelata pëlqimesh ditore.
     welcome:
@@ -1369,7 +1210,7 @@ sq:
       name: Autobiograf
     anniversary:
       name: Përvjetor
-      description: Anëtar aktiv për një vit, postoi të paktën një herë
+      description: "Anëtar aktiv për një vit, postoi të paktën një herë"
       long_description: |
         Kjo stemë jepet kur keni qenë një anëtar për një vit me të paktën një postim për atë vit. Faleminderit që jeni përreth dhe jepni ndihmën tuaj për komunitetin tonë. Ne nuk mund t'ia dilnim pa ju.
     nice_post:
@@ -1430,8 +1271,6 @@ sq:
     promoter:
       name: Promotor
       description: Ftoi një anëtar të ri në faqe
-      long_description: |
-        Kjo stemë jepet kur ftoni dikë për t'u bërë pjesë e komunitetit nëpërmjet butonit të ftesave në faqen e përdoruesit, ose në fund të faqes. Duke ftuar miq që mund të jenë të interesuar në biseda të veçanta është një mënyrë shumë e mirë të paraqesësh njerëz të rinj në komunitet, kështu që faleminderit!
     campaigner:
       name: Ambasador
       description: Ftoi 3 anëtarë të thjeshtë
@@ -1528,22 +1367,19 @@ sq:
     first_emoji:
       name: Emoji i parë
       description: Përdori Emoji në një postim
-      long_description: |
-        Kjo stemë jepet kur ju shtoni një Emoji në postimin tuaj për herë të parë :thumbsup:. Emoji ju lejon të përçoni emocionet në postimet tuaja, prej kënaqësisë :smiley: tek mërzitja :anguished: e deri tek inati :angry: dhe çdo gjë midis :sunglasses:. Thjesht filloni të shkruani : (dy pika) ose shtypni butonin Emoji në shiritin e veglave të fushës së shkrimit për të zgjedhur mes qindra llojesh :ok_hand:
     first_mention:
       name: Përmendja e parë
-      long_description: Kjo stemë jepet herën e parë kur ju përmendni @username e dikujt në një postim. Secila përmendje krijon një njoftim për atë person, që të vihen në dijeni për postimin tuaj. Thjesht filloni të shtypni @ (simbolin te) për të përmendur çdo përdorues ose, nëse e mundur, çdo grup - është një mënyrë e volitshme për të patur vëmendjen e dikujt.
+      long_description: "Kjo stemë jepet herën e parë kur ju përmendni @username e dikujt në një postim. Secila përmendje krijon një njoftim për atë person, që të vihen në dijeni për postimin tuaj. Thjesht filloni të shtypni @ (simbolin te) për të përmendur çdo përdorues ose, nëse e mundur, çdo grup - është një mënyrë e volitshme për të patur vëmendjen e dikujt."
     first_onebox:
       name: Onebox i Parë
       description: Postoi një lidhje në onebox
-      long_description: Kjo stemë jepet herën e parë kur postoni një lidhje në një rresht të vetëm, i cili shpaloset automatikisht në një onebox me një përmbledhje të shkurtër të lidhjes, një titull, dhe (kur është e mundur) një imazh.
+      long_description: "Kjo stemë jepet herën e parë kur postoni një lidhje në një rresht të vetëm, i cili shpaloset automatikisht në një onebox me një përmbledhje të shkurtër të lidhjes, një titull, dhe (kur është e mundur) një imazh."
     first_reply_by_email:
       name: Përgjigja e parë me email
       long_description: |
         Kjo stemë jepet herën e parë kur i përgjigjeni një postimi nëpërmjet email-it :e-mail:
   admin_login:
     success: "Emaili u dërgua"
-    error: "Error!"
     email_input: "Admin Email"
     submit_button: "Dërgo Email"
   performance_report:
@@ -1556,6 +1392,3 @@ sq:
     step:
       emoji:
         title: "Emoji"
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.sr.yml b/config/locales/server.sr.yml
index 57e7f7a111e..8811398ce76 100644
--- a/config/locales/server.sr.yml
+++ b/config/locales/server.sr.yml
@@ -16,7 +16,9 @@ sr:
       short_no_year: "%B %-d"
       date_only: "%B %-d, %Y"
   date:
-    month_names: [null, januar, februar, mart, april, maj, jun, jul, avgust, septembar, oktobar, novembar, decembar]
+    month_names: [~, januar, februar, mart, april, maj, jun, jul, avgust, septembar, oktobar, novembar, decembar]
+    <<: *datetime_formats
+  time:
     <<: *datetime_formats
   title: "Discourse"
   topics: "Teme"
@@ -35,10 +37,9 @@ sr:
       invalid_boolean: "Nepravilan boolean."
       even: mora biti parno
       exclusion: je rezervisano
-      greater_than: mora biti veće od %{count}
+      greater_than: "mora biti veće od %{count}"
       contains_censored_words: "sadrži sledeće cenzurisane reči: 1%{censored_words}"
-      matches_censored_pattern: "sadrži sledeće reči koje se poklapaju sa registrom cenzurisanih reči: 1%{censored_wrods}"
-      less_than: mora biti manje od 1%{count}
+      less_than: "mora biti manje od 1%{count}"
       not_a_number: nije broj
       not_an_integer: mora biti ceo broj
       record_invalid: 'Verifikacija neuspešna: 1%{errors}'
@@ -46,6 +47,9 @@ sr:
       load_from_remote: "Došlo je do greške prilikom učitavanja poruke."
     site_settings:
       default_categories_already_selected: "Ne možete izabrati kategoriju koja se koristi u drugoj listi."
+  activemodel:
+    errors:
+      <<: *errors
   bulk_invite:
     file_should_be_csv: "Izabrani fajl bi trebalo biti u csv formatu."
   topic_invite:
@@ -63,7 +67,6 @@ sr:
     start_discussion: "Započnite diskusiju"
     continue: "Nastavite diskusiju"
   no_links_allowed: "Žao nam je, novi korisnici ne mogu postavljati linkove u svoje postove."
-  contains_blocked_words: "Vaš post, sadrži reči koje nisu dozvoljene."
   user_is_suspended: "Suspendovanim korisnicima nije dozvoljeno da objavljuju postove."
   topic_not_found: "Nešto se dogodilo. Možda je tema zatvorena ili izbrisana dok ste je gledali?"
   not_accepting_pms: "Žao nam je, %{username} trenutno ne prihvata privatne poruke."
@@ -87,10 +90,6 @@ sr:
   revert_version_same: "Trenutna verzija je ista onoj na koju pokušavate da se vratite."
   excerpt_image: "slika"
   groups:
-    success:
-      bulk_add: "%{users_added} korisnika je dodato grupi."
-    errors:
-      member_already_exist: "'%{username}' je postojeći član grupe."
     default_names:
       everyone: "svi"
       admins: "admini"
@@ -105,24 +104,19 @@ sr:
       user_profile:
         bio_raw: "O meni"
     errors:
+      <<: *errors
       models:
-        topic:
-          attributes:
-            base:
-              cant_send_pm: "Žao nam je, ne možete slati privatne poruke tom korisniku."
         user:
           attributes:
             password:
               common: "je jedna od 10000 najčešće korišćenih lozinki. Molimo Vas izaberite sigurniju lozinku."
               same_as_username: "je ista kao vaše korisničko ime. Molimo Vas izaberite sigurniju šifru."
-      <<: *errors
   change_email:
     authorizing_old:
       title: "Hvala što ste potvrdili svoju važeću email adresu"
   site_settings:
     min_topic_title_length: "Minimalna dozvoljena dužina naslova teme u znakovima"
     max_topic_title_length: "Maksimalna dozvoljena dužina naslova teme u znakovima"
-    min_private_message_title_length: "Minimalna dozvoljena dužina naslova poruke u znakovima"
     min_search_term_length: "Minimalna dozvoljena dužina termina za pretragu u znakovima"
     apple_touch_icon_url: "Ikonica koja se koristi za Apple touch uređaje. Preporučena veličina 144px sa 144px."
     max_replies_in_first_day: "Maksimalan broj odgovora koje korisnik može da kreira u prvih 24 sata nakon kreiranja svoje prve poruke."
@@ -135,7 +129,6 @@ sr:
     topic_views_heat_high: "Nakon ovoliko pregleda, polje pregleda je jako označeno."
     num_hours_to_close_topic: "Broj sati za pauziranje teme radi intervencije."
     reply_by_email_enabled: "Omogući odgovore na teme putem email poruka."
-    incoming_email_prefer_html: "Koristi HTML umesto tekstualnog formata za dolazne email poruke."
     disable_emails: "Spreči Discourse da šalje bilo kakve email poruke"
     delete_email_logs_after_days: "Obriši email logove posle (N) dana. Uneti 0 za neograničeno čuvanje."
     block_auto_generated_emails: "Blokiraj dolazne email poruke prepoznate kao automatski generisane."
@@ -205,8 +198,3 @@ sr:
             one_paragraph: "Molimo da vaša poruka dobrodošlice ne bude duža od jednog paragrafa."
       finished:
         title: "Vaš Discource je spreman!"
-  time:
-    <<: *datetime_formats
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index e2f12b7b6c1..54ba030b125 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -17,12 +17,12 @@ sv:
       date_only: "%B %-d, %Y"
       long: "%B %-d, %Y, %l:%M%P"
   date:
-    month_names: [null, Januari, Februari, Mars, April, Maj, Juni, Juli, Augusti, September, Oktober, November, December]
+    month_names: [~, Januari, Februari, Mars, April, Maj, Juni, Juli, Augusti, September, Oktober, November, December]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "am"
     pm: "pm"
-    <<: *datetime_formats
   title: "Discourse"
   topics: "Ämnen"
   posts: "inlägg"
@@ -62,18 +62,18 @@ sv:
       present: måste vara tomt
       confirmation: "matchar inte %{attribute}"
       empty: kan inte vara tomt
-      equal_to: måste vara lika med %{count}
+      equal_to: "måste vara lika med %{count}"
       even: måste vara jämnt
       exclusion: är reserverad
-      greater_than: måste vara större än %{count}
-      greater_than_or_equal_to: måste vara större eller lika med %{count}
+      greater_than: "måste vara större än %{count}"
+      greater_than_or_equal_to: "måste vara större eller lika med %{count}"
       has_already_been_used: "har redan använts"
       inclusion: är inte inkluderad i listan
       invalid: är ogiltig
-      is_invalid: "Verkar oklart, det ären komplett mening"
+      is_invalid: "Verkar oklart, är det en komplett mening?"
       contains_censored_words: "innehåller följande censurerade ord:%(censurerade_ord)"
-      less_than: måste vara mindre än %{count}
-      less_than_or_equal_to: måste vara mindre eller lika med %{count}
+      less_than: "måste vara mindre än %{count}"
+      less_than_or_equal_to: "måste vara mindre eller lika med %{count}"
       not_a_number: är inte ett nummer
       not_an_integer: måste vara ett tal
       odd: måste vara udda
@@ -105,6 +105,9 @@ sv:
       max_username_length_range: "Du kan inte sätta maximum högre än minimum."
       default_categories_already_selected: "Du kan inte välja en kategori som används i en annan lista. "
       s3_upload_bucket_is_required: "Du kan inte aktivera uppladdning till S3 innan du har angivit 's3_upload_bucket'."
+  activemodel:
+    errors:
+      <<: *errors
   invite:
     not_found: "Ert invitations lösenord är ogiltigt. Vänlig kontakta webbplatsens administratör."
   bulk_invite:
@@ -113,7 +116,7 @@ sv:
   topic_invite:
     user_exists: "Tyvärr, den användaren har redan bjudits in. Du kan endast bjuda in en användare till ett ämne en gång."
   backup:
-    operation_already_running: "En operation är redan igång. Kan inte starta ett nytt jobb just nu."
+    operation_already_running: "En operation är redan igång och därför kan inte ett nytt jobb snartas just nu."
     backup_file_should_be_tar_gz: "Backup-filen ska vara ett .tar.gz arkiv."
     not_enough_space_on_disk: "Det finns inte tillräckligt mycket utrymme på disken för att ladda upp denna backup."
     invalid_filename: "Backupfilnamnet innehåller ogiltiga tecken. Giltiga tecken är a-z 0-9 . - _."
@@ -124,8 +127,8 @@ sv:
   reading_time: "Lästid"
   likes: "Gillningar"
   too_many_replies:
-    one: "Vi är ledsna men nya användare är tillfälligt begränsade till 1 svar i samma ämne."
-    other: "Vi är ledsna men nya användare är tillfälligt begränsade till &{count} svar i samma ämne."
+    one: Vi är ledsna men nya användare är tillfälligt begränsade till 1 svar i samma ämne.
+    other: Vi är ledsna men nya användare är tillfälligt begränsade till &{count} svar i samma ämne.
   embed:
     start_discussion: "Starta diskussion"
     continue: "Fortsätt diskussion"
@@ -135,35 +138,35 @@ sv:
     no_hosts: "Inga värdar var uppsatta för textinbäddningen"
     configure: "konfigurera inbäddningen"
     more_replies:
-      one: "1 till svar"
-      other: "%{count} till svar"
+      one: 1 till svar
+      other: '%{count} till svar'
     loading: "Laddar diskussion..."
     permalink: "Permalänk"
     imported_from: "Detta är ett kopplat diskussionsämne till det ursprungliga inlägget på %{link}"
     in_reply_to: "▶ %{username}"
     replies:
-      one: "1 svar"
-      other: "%{count} svar"
+      one: 1 svar
+      other: '%{count} svar'
   no_mentions_allowed: "Tyvärr, du kan inte omnämna andra användare."
   too_many_mentions:
-    one: "Tyvärr, du kan bara omnämna en annan användare i ett inlägg."
-    other: "Tyvärr, du kan bara omnämna %{count} användare i ett inlägg."
+    one: Tyvärr, du kan bara omnämna en annan användare i ett inlägg.
+    other: Tyvärr, du kan bara omnämna %{count} användare i ett inlägg.
   no_mentions_allowed_newuser: "Tyvärr, nya användare kan inte omnämna andra användare."
   too_many_mentions_newuser:
-    one: "Tyvärr, besökare kan bara omnämna en annan användare i ett inlägg."
-    other: "Tyvärr, besökare kan bara omnämna %{count} användare i ett inlägg."
+    one: Tyvärr, besökare kan bara omnämna en annan användare i ett inlägg.
+    other: Tyvärr, besökare kan bara omnämna %{count} användare i ett inlägg.
   no_images_allowed: "Tyvärr, nya användare kan inte infoga bilder i inlägg."
   too_many_images:
-    one: "Tyvärr, nya användare kan bara infoga en bild i ett inlägg."
-    other: "Tyvärr, nya användare kan bara infoga %{count} bilder i ett inlägg."
+    one: Tyvärr, nya användare kan bara infoga en bild i ett inlägg.
+    other: Tyvärr, nya användare kan bara infoga %{count} bilder i ett inlägg.
   no_attachments_allowed: "Tyvärr, nya användare kan inte bifoga filer i inlägg."
   too_many_attachments:
-    one: "Tyvärr, nya användare kan bara bifoga en filer i ett inlägg."
-    other: "Tyvärr, nya användare kan bara bifoga %{count} filer i ett inlägg."
+    one: Tyvärr, nya användare kan bara bifoga en filer i ett inlägg.
+    other: Tyvärr, nya användare kan bara bifoga %{count} filer i ett inlägg.
   no_links_allowed: "Tyvärr, nya användare kan inte ha länkar i inlägg."
   too_many_links:
-    one: "Tyvärr, besökare kan bara ha en länk i ett inlägg."
-    other: "Tyvärr, nya användare kan bara ha %{count} länkar i ett inlägg."
+    one: Tyvärr, besökare kan bara ha en länk i ett inlägg.
+    other: Tyvärr, nya användare kan bara ha %{count} länkar i ett inlägg.
   spamming_host: "Tyvärr, du kan inte posta en länk till det värdnamnet."
   user_is_suspended: "Avstängda användare är inte tillåtna att göra inlägg"
   topic_not_found: "Något har gått fel. Kanske har ämnet stängts eller raderats medan du tittade på det?"
@@ -188,7 +191,6 @@ sv:
     hot: "Heta ämnen"
     top: "Toppämnen"
     posts: "Senaste inläggen"
-    private_posts: "Senaste privata meddelanden"
     group_posts: "Senaste inläggen från %{group_name}"
     group_mentions: "Senaste omnämningarna från %{group_name}"
     user_posts: "Senaste inlägggen av @%{username}"
@@ -202,7 +204,6 @@ sv:
   groups:
     errors:
       can_not_modify_automatic: "Du kan inte modifiera en automatisk grupp"
-      member_already_exist: "'%{username}' är redan medlem i denna grupp."
       invalid_domain: "'%{domain}' är inte ett giltigt domän."
       invalid_incoming_email: "'%{email}' är inte en giltig e-postadress."
       email_already_used_in_group: "'%{email}' är redan använd av gruppen '%{group_name}'."
@@ -219,9 +220,9 @@ sv:
       trust_level_4: "trust_level_4"
   education:
     until_posts:
-      one: "1 inlägg"
-      other: "%{count} inlägg"
-    new-topic: |
+      one: 1 inlägg
+      other: '%{count} inlägg'
+    'new-topic': |
       Välkommen till %{site_name} &mdash; **tack för att du startade en ny konversation!**
 
       - Låter rubriken intressant om du läser det högt? Är det en bra sammanfattning?
@@ -231,7 +232,7 @@ sv:
       - Inkludera vanligt förekommande ord i ditt ämne så att andra kan *hitta* det. För att gruppera ditt ämne med relaterade ämnen, välj en kategori.
 
       För mer information kan du läsa [riktlinjerna](/guidelines). Detta meddelande visas enbart vid ditt första %{education_posts_text}.
-    new-reply: |
+    'new-reply': |
       Välkommen till %{site_name} &mdash; **tack för att du bidrar!**
 
       - Bidrar ditt svar något till konversationen på något sätt?
@@ -253,13 +254,12 @@ sv:
       user_profile:
         bio_raw: "Om mig"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Du kan endast bifoga varningar till privata meddelanden."
               too_many_users: "Du kan endast skicka varningar till en användare åt gången."
-              cant_send_pm: "Tyvärr, du kan inte skicka ett privat medelande till den användaren. "
               no_user_selected: "Du måste välja en giltig användare."
             featured_link:
               invalid: "är ogiltig. URL måste innehålla http:// eller http://."
@@ -284,7 +284,6 @@ sv:
           attributes:
             payload_url:
               invalid: "Webbadressen är ogiltig. Webbadressen skall inkludera :// eller https://. Inga blanktecken är tillåtna"
-      <<: *errors
   user_profile:
     no_info_other: "<div class='missing-profile'>%{name} har inte skrivit någonting i dess profils Om Mig-fält ännu</div>"
   vip_category_name: "Lounge"
@@ -300,25 +299,25 @@ sv:
     title: "Välkommen till loungen"
     body: |2
 
-      Grattis! :confetti_ball:
+        Grattis! :confetti_ball:
 
-      Om du kan se det här ämnet så har du nyligen blivit upphöjd till **regelbunden** användare (förtroendenivå 3).
+        Om du kan se det här ämnet så har du nyligen blivit upphöjd till **regelbunden** användare (förtroendenivå 3).
 
-      Du kan nu &hellip;
+        Du kan nu &hellip;
 
-      * Redigera rubriken för alla ämnen
-      * Ändra kategorin för alla ämnen
-      * Få alla dina länkar följda ([automatiskt nofollow](http://en.wikipedia.org/wiki/Nofollow) är borttagna)
-      * Få åtkomst till en privat Lounge-kategori som endast är synlig för användare som har förtroendenivå 3 eller högre
-      * Gömma spam med en enda flagga
+        * Redigera rubriken för alla ämnen
+        * Ändra kategorin för alla ämnen
+        * Få alla dina länkar följda ([automatiskt nofollow](http://en.wikipedia.org/wiki/Nofollow) är borttagna)
+        * Få åtkomst till en privat Lounge-kategori som endast är synlig för användare som har förtroendenivå 3 eller högre
+        * Gömma spam med en enda flagga
 
-      Här är den [aktuella listan över regelbundna användare](/badges/3/regular). Glöm inte att hälsa.
+        Här är den [aktuella listan över regelbundna användare](/badges/3/regular). Glöm inte att hälsa.
 
-      Tack för att du är en viktig del av det här forumet!
+        Tack för att du är en viktig del av det här forumet!
 
-      (För mer information om förtroendenivåer, [se det här ämnet][trust]. Notera att endast medlemmar som fortsätter att tillfredställa kraven över tid kommer att fortsätta vara regelbundna medlemmar.)
+        (För mer information om förtroendenivåer, [se det här ämnet][trust]. Notera att endast medlemmar som fortsätter att tillfredställa kraven över tid kommer att fortsätta vara regelbundna medlemmar.)
 
-      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Om kategorin %{category}"
     replace_paragraph: "(Byt ut den här första paragrafen med en sammanfattad beskrivning av din nya kategori. Den här vägledningen kommer att dyka upp i kategorins urvalsområde, så försök att hålla det kortare än 200 tecken. **Tills du har redigerat den här beskrivningen eller skapat nya ämnen så kommer den här kategorin inte att synas på kategorisidan.**)"
@@ -334,8 +333,8 @@ sv:
       uncategorized: "Du kan inte ta bort kategorin \"Okategoriserat\""
       has_subcategories: "Du kan inte ta bort den här kategorin för att den har underkategorier."
       topic_exists:
-        one: "Kan inte ta bort den här kategorien eftersom den innehåller ett ämne. Ämnet är %{topic_link}."
-        other: "Kan inte ta bort den här kategorien eftersom den innehåller %{count} ämnen. Äldsta ämnet är %{topic_link}."
+        one: Kan inte ta bort den här kategorien eftersom den innehåller ett ämne. Ämnet är %{topic_link}.
+        other: Kan inte ta bort den här kategorien eftersom den innehåller %{count} ämnen. Äldsta ämnet är %{topic_link}.
       topic_exists_no_oldest: "Kan inte ta bort den här kategorin eftersom antalet ämnen är %{count}."
     uncategorized_description: "Ämnen som inte behöver en kategori, eller som inte passar in i någon annan befintlig kategori."
   trust_levels:
@@ -351,102 +350,86 @@ sv:
       title: "ledare"
     change_failed_explanation: "Du försökte degradera %{user_name} till '%{new_trust_level}'. Användarens förtroendenivå är redan '%{current_trust_level}'. %{user_name} kommer behålla '%{current_trust_level}'. Om du vill degradera användaren, lås förtroendenivån först"
   rate_limiter:
-    slow_down: "Du har utfört den här handlingen för många gånger, försök igen senare."
-    too_many_requests: "Du gör det där för ofta. Var god vänta %{time_left} innan du försöker igen."
-    by_type:
-      first_day_replies_per_day: "Du har uppnått maximalt antal inlägg en ny användare kan göra under första dagen. Var god vänta %{time_left} innan du försöker igen."
-      first_day_topics_per_day: "Du har uppnått maximalt antal nya ämnen som nya användare kan skapa under första dagen. Var god vänta %{time_left} innan du försöker igen."
-      create_topic: "Du skapar nya ämnen för snabbt. Var god vänta %{time_left} innan du försöker igen."
-      create_post: "Du svarar för snabbt. Var god vänta %{time_left} innan du försöker igen."
-      delete_post: "Du raderar inlägg för snabbt. Var god vänta %{time_left} innan du försöker igen."
-      public_group_membership: "Du deltar/lämnar grupper för frekvent. Vad god och vänta %[tid_kvar] innan du försöker igen."
-      topics_per_day: "Du har uppnått maximalt antal nya ämnen idag. Var god vänta %{time_left} innan du försöker igen."
-      pms_per_day: "Du har uppnått maximalt antal inlägg idag. Var god vänta %{time_left} innan du försöker igen."
-      create_like: "Du har uppnått maximalt antal gillningar idag. Var god vänta %{time_left} innan du försöker igen."
-      create_bookmark: "Du har uppnått maximalt antal bokmärken idag. Var god vänta %{time_left} innan du försöker igen."
-      live_post_counts: "Du ber om uppdateringar för ofta. Var god vänta %{time_left} innan du försöker igen."
-      unsubscribe_via_email: "Du har uppnått maximalt antal avregistreringar via e-post idag. Var god vänta %{time_left} innan du försöker igen."
-      topic_invitations_per_day: "Du har uppnått maximalt antal inbjudningar till ämnen idag. Var god vänta %{time_left} innan du försöker igen."
     hours:
-      one: "1 timme"
-      other: "%{count} timmar"
+      one: 1 timme
+      other: '%{count} timmar'
     minutes:
-      one: "1 minut"
-      other: "%{count} minuter"
+      one: 1 minut
+      other: '%{count} minuter'
     seconds:
-      one: "1 sekund"
-      other: "%{count} sekunder"
+      one: 1 sekund
+      other: '%{count} sekunder'
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: "< 1s"
-        other: "< %{count}s"
+        one: < 1s
+        other: < %{count}s
       x_seconds:
-        one: "1s"
-        other: "%{count}s"
+        one: 1s
+        other: '%{count}s'
       less_than_x_minutes:
-        one: "< 1m"
-        other: "< %{count}m"
+        one: < 1m
+        other: < %{count}m
       x_minutes:
-        one: "1m"
-        other: "%{count}m"
+        one: 1m
+        other: '%{count}m'
       about_x_hours:
-        one: "1h"
-        other: "%{count}h"
+        one: 1h
+        other: '%{count}h'
       x_days:
-        one: "1d"
-        other: "%{count}d"
+        one: 1d
+        other: '%{count}d'
       about_x_months:
-        one: "1mån"
-        other: "%{count}mån"
+        one: 1mån
+        other: '%{count}mån'
       x_months:
-        one: "1mån"
-        other: "%{count}mån"
+        one: 1mån
+        other: '%{count}mån'
       about_x_years:
-        one: "1år"
-        other: "%{count}år"
+        one: 1år
+        other: '%{count}år'
       over_x_years:
-        one: "> 1år"
-        other: "> %{count}år"
+        one: '> 1år'
+        other: '> %{count}år'
       almost_x_years:
-        one: "1år"
-        other: "%{count}år"
+        one: 1år
+        other: '%{count}år'
     distance_in_words_verbose:
       half_a_minute: "nyss"
       less_than_x_seconds:
-        one: "nyss"
-        other: "nyss"
+        one: nyss
+        other: nyss
       x_seconds:
-        one: "1 sekund sedan"
-        other: "%{count} sekunder sedan"
+        one: 1 sekund sedan
+        other: '%{count} sekunder sedan'
       less_than_x_minutes:
-        one: "mindre än 1 minut sedan"
-        other: "mindre än %{count} minuter sedan"
+        one: mindre än 1 minut sedan
+        other: mindre än %{count} minuter sedan
       x_minutes:
-        one: "1 minut sedan"
-        other: "%{count} minuter sedan"
+        one: 1 minut sedan
+        other: '%{count} minuter sedan'
       about_x_hours:
-        one: "1 timme sedan"
-        other: "%{count} timmar sedan"
+        one: 1 timme sedan
+        other: '%{count} timmar sedan'
       x_days:
-        one: "1 dag sedan"
-        other: "%{count} dagar sedan"
+        one: 1 dag sedan
+        other: '%{count} dagar sedan'
       about_x_months:
-        one: "ungefär 1 månad sedan"
-        other: "ungefär %{count} månader sedan"
+        one: ungefär 1 månad sedan
+        other: ungefär %{count} månader sedan
       x_months:
-        one: "1 månad sedan"
-        other: "%{count} månader sedan"
+        one: 1 månad sedan
+        other: '%{count} månader sedan'
       about_x_years:
-        one: "ungefär 1 år sedan"
-        other: "ungefär %{count} år sedan"
+        one: ungefär 1 år sedan
+        other: ungefär %{count} år sedan
       over_x_years:
-        one: "över 1 år sedan"
-        other: "över %{count} år sedan"
+        one: över 1 år sedan
+        other: över %{count} år sedan
       almost_x_years:
-        one: "nästan 1 år sedan"
-        other: "nästan %{count} år sedan"
+        one: nästan 1 år sedan
+        other: nästan %{count} år sedan
   password_reset:
     no_token: "Tyvärr, din lösenordslänk har löpt ut. Klicka på inloggningsknappen och välj \"jag har glömt mitt lösenord\" för att få en ny länk."
     choose_new: "Välj ett nytt lösenord"
@@ -480,16 +463,17 @@ sv:
       long_form: 'flagga detta som orelevant'
     spam:
       title: 'Spam'
+      description: 'Det här inlägget är en annons eller vandalism. Det är inte lämpligt eller relevant med avseende på det aktuella ämnet.'
+      short_description: 'Detta är reklam eller vandalism'
       long_form: 'flagga detta som spam'
       email_title: '"%{title}" flaggades som spam'
       email_body: "%{link}\n\n%{message}"
     inappropriate:
       title: 'Olämpligt'
-      description: 'Detta inläggs innehåll inkluderar saker som en förnuftig person skulle anse vara stötande, kränkande eller en överträdelse av <a href="/guidelines">våra riktlinjer</a>r.'
+      description: 'Detta inläggs innehåll inkluderar saker som en förnuftig person skulle anse vara stötande, kränkande eller en överträdelse av <a href="/guidelines">våra riktlinjer</a>.'
       long_form: 'flagga detta som olämpligt'
     notify_user:
       title: 'Skicka ett meddelande till @{{username}} '
-      description: 'Jag vill prata med den här personen direkt och privat om inlägget. '
       long_form: 'notifierad användare'
       email_title: 'Du skrev i "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -577,9 +561,7 @@ sv:
       xaxis: "Dag"
       yaxis: "Antal besök"
     signups:
-      title: "Nya användare"
       xaxis: "Dag"
-      yaxis: "Antalet nya användare"
     profile_views:
       title: "Användarprofilvisningar"
       xaxis: "Dag"
@@ -617,7 +599,6 @@ sv:
       xaxis: "Dag"
       yaxis: "Antal e-post"
     user_to_user_private_messages:
-      title: "Användare-till-användare"
       xaxis: "Dag"
       yaxis: "Antal meddelanden"
     system_private_messages:
@@ -664,7 +645,6 @@ sv:
       xaxis: "Dag"
       yaxis: "Sökrobotars sidvisningar"
     page_view_total_reqs:
-      title: "Total"
       xaxis: "Dag"
       yaxis: "Totalt antal sidvisningar"
     page_view_logged_in_mobile_reqs:
@@ -726,27 +706,23 @@ sv:
     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>.'
     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."
-      other: "E-postpolling har genererat %{count} fel de senaste 24 timmarna. Se <a href='/logs' target='_blank'>loggarna</a> för mer detaljer."
-    missing_mailgun_api_key: "Servern är konfigurerad att skicka e-post via mailgun men du har inte tillhandahållit en API-nyckel att använda för verifiera webhook-meddelanden. "
+      one: E-postpolling har genererat ett fel de senaste 24 timmarna. Se <a href='/logs' target='_blank'>loggarna</a> för mer detaljer.
+      other: E-postpolling har genererat %{count} fel de senaste 24 timmarna. Se <a href='/logs' target='_blank'>loggarna</a> för mer detaljer.
     bad_favicon_url: "Uppladdningen av favoritikonen misslyckas. Kontrollera inställningen favicon_url i <a href='/admin/site_settings'>webbplatsinställningarna</a>."
     poll_pop3_timeout: "Anslutningen till POP3-servern har nått tidsgränsen. Inkommande e-postmeddelanden kunde inte mottas. Var vänlig kontrollera dina <a href='/admin/site_settings/category/email'>POP3-inställningar</a> och tjänsteleverantör."
     poll_pop3_auth_error: "Anslutning till POP3-servern misslyckas med ett autentiseringsfel. Var vänlig kontrollera dina <a href='/admin/site_settings/category/email'>POP3-inställningar</a>."
   site_settings:
     censored_words: "Ord som automatiskt ersätts med &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Auto-radera alla dolda inlägg som varit dolda i mer än 30 dagar."
-    default_locale: "Standardspråk för den här instansen av Discourse (ISO 639-1-kod)"
     allow_user_locale: "Tillåt användare att själva välja språk"
     set_locale_from_accept_language_header: "sätt gränssnittets språk för anonyma användare från deras webbläsares rubriks språk. (EXPERIMENTELLT, det fungerar inte med anonym cache)"
     min_post_length: "Minsta tillåtna inläggslängd i antal tecken"
     min_first_post_length: "Lägsta antal tillåtna tecken i första inlägget (ämnestext)"
-    min_private_message_post_length: "Lägst antal tillåtna tecken i inlägg för meddelanden"
     max_post_length: "Högsta tillåtna längd på inlägg i antal tecken"
     topic_featured_link_enabled: "Möjliggör att lägga upp en länk med ämnen."
     show_topic_featured_link_in_digest: "Visa ämnet i skiss länken som fanns i det nerkortade emailet."
     min_topic_title_length: "Lägsta tillåtna längd på ämnesrubrik i antal tecken"
     max_topic_title_length: "Högsta tillåtna längd på ämnesrubrik i antal tecken"
-    min_private_message_title_length: "Lägst tillåtna längd på rubrik för ett meddelande i antal tecken"
     min_search_term_length: "Lägsta giltiga teckenlängd på sökterm"
     search_tokenize_chinese_japanese_korean: "Framtvinga sökning för att tokenisera kinesiska/japanska/koreanska även på webbplatser som inte är på dessa språk"
     search_prefer_recent_posts: "Om sökningar på ditt stora forum går långsamt, försök detta alternativ som är ett index av de senaste inläggen först."
@@ -791,7 +767,6 @@ sv:
     summary_likes_required: "Minsta antal gillningar i ett ämne innan 'Sammanfatta det här ämnet' möjliggörs"
     summary_percent_filter: "Visa högsta % av inläggen när en användare bockar i 'Sammanfatta det här ämnet'"
     summary_max_results: "Maximalt antal inlägg som returneras av 'Sammanfatta det här ämnet'"
-    enable_private_messages: "Tillåt användare med förtroendenivå 1 (konfigurera via minsta förtroendenivå för att skicka meddelanden) att skapa meddelanden och svara på meddelanden. Notera att personalen oavsett  alltid kan skicka meddelanden. "
     enable_long_polling: "Meddelande-buss som används för notifiering kan använda long polling"
     long_polling_base_url: "URL som används för long polling (när en CDN levererar dynamiskt innehåll, kontrollera att det här är inställt till origin pull) se: http://origin.site.com"
     long_polling_interval: "Tid som servern bör vänta innan den svarar på klienter när det inte finns någon data att skicka (endast loggad på användare)"
@@ -844,7 +819,6 @@ sv:
     version_checks: "Pinga Discourse Hubben för versionsuppdatering och visa nya versionsmeddelanden på /admin översiktspanelen"
     new_version_emails: "Skicka ett mejl till contact_email när en ny version av Discourse finns tillgängligt."
     invite_expiry_days: "Hur länge användarinbjudningsnycklar är giltiga, i dagar"
-    invite_passthrough_hours: "Hur länge en användare kan använda en tidigare utlöst inbjudningsnyckel för att logga in, i timmar"
     login_required: "Kräv autentisering för att läsa innehåll på den här webbplatsen, avvisa anonym tillgång."
     min_username_length: "Minsta längd på användarnamnet. Varning: om någon existerande användare eller grupp har namn kortare än detta, er sida kommer att gå sönder!"
     max_username_length: "Längsta användarnamn. Varning: om någon existerande användare eller grupp har ett namn längre än detta, er sida kommer att gå sönder."
@@ -863,7 +837,6 @@ sv:
     sso_overrides_name: "Åsidosätter lokala fullständiga namn med externa webbplatsers fullständiga namn från SSO-nyttolast vid varje inloggning, och förhindrar lokala ändringar."
     sso_overrides_avatar: "Åsidosätter användares avatarer med externa webbplatsers avatarer från SSO-nyttolast. Om aktiverad är inaktivering av allow_uploaded_avatars högt rekommenderat"
     sso_not_approved_url: "Omdirigera icke godkända SSO-konton till den här URL:en"
-    enable_local_logins: "Aktivera traditionell autentisering med lokala användarnamn och lösenord. (Obs: det här måste vara aktiverat för att inbjudningar ska fungera)"
     allow_new_registrations: "Tillåt nya användarregistreringar. Avbocka det här för att förhindra vem som helst från att skapa ett nytt konto."
     enable_signup_cta: "Visa en notis för återvändande anonyma användare för att förmå dem att registrera ett nytt konto."
     enable_yahoo_logins: "Aktivera Yahoo autentisering"
@@ -871,8 +844,6 @@ sv:
     google_oauth2_client_id: "Klient-ID för din Google-applikation."
     google_oauth2_client_secret: "Klienthemlighet för din Google-applikation."
     enable_twitter_logins: "Aktivera Twitter autentisering, kräver twitter_consumer_key och twitter_consumer_secret"
-    twitter_consumer_key: "Konsumentnyckel för Twitter autentisering, registrerad på http://dev.twitter.com"
-    twitter_consumer_secret: "Konsumenthemlighet för Twitter autentisering, registrerad på http://dev.twitter.com"
     enable_instagram_logins: "Tillåt Instagramautentisering, kräver instagram_consumer_key och instagram_consumer_secret"
     instagram_consumer_key: "Konsumentnyckel för Instagram-autentisering"
     instagram_consumer_secret: "Konsumenthemlighet för Instagram-autentisering"
@@ -886,7 +857,6 @@ sv:
     allow_restore: "Tillåt återställning, vilket kan ersätta ALL data på webbplatsen! Lämna avbockad om du inte planerar att återställa en säkerhetskopia"
     maximum_backups: "Högsta antal säkerhetskopior att spara på disken. Äldre säkerhetskopior raderas automatiskt"
     automatic_backups_enabled: "Kör automatiska säkerhetskopior som definierats i säkerhetskopieringsfrekvens"
-    backup_frequency: "Hur frekvent vi skapar en säkerhetskopia, i dagar."
     enable_s3_backups: "Ladda upp säkerhetskopior till S3 vid färdigställning. VIKTIGT: kräver giltiga S3-kreditiv inlagda i Webbplatsinställningar > Filer."
     s3_backup_bucket: "Den externa behållaren för säkerhetskopieringar. VARNING: Se till att det här en privat behållare."
     s3_disable_cleanup: "Inaktivera borttagande av säkerhetskopior från S3 när de tagits bort lokalt."
@@ -905,7 +875,6 @@ sv:
     max_bookmarks_per_day: "Max antal bokmärken per användare och dag."
     max_edits_per_day: "Max antal redigeringar per användare och dag."
     max_topics_per_day: "Max antal ämnen en användare kan skapa per dag."
-    max_private_messages_per_day: "Max antal meddelanden användare kan skapa per dag."
     max_invites_per_day: "Max antal inbjudningar en användare kan skicka per dag."
     max_topic_invitations_per_day: "Max antal ämnesinbjudningar en användare kan skicka per dag."
     alert_admins_if_errors_per_minute: "Antal felindikeringar per minut för att utlösa ett administratörslarm. Ange 0 för att inaktivera den här funktionen. OBS: kräver omstart."
@@ -918,7 +887,6 @@ sv:
     clean_orphan_uploads_grace_period_hours: "Nådefrist (i timmar) innan en föräldralös uppladdning raderas."
     purge_deleted_uploads_grace_period_days: "Nådefrist (i dagar) innan en borttagen uppladdning raderas."
     enable_s3_uploads: "Lägg uppladdningar i Amazon S3 lagring. VIKTIGT: kräver giltiga S3-kreditiv (både åtkomstnyckelns ID och den hemliga åtkomstnyckeln)."
-    s3_use_iam_profile: 'Använd AWS EC2 IAM roll för att återfå nycklar. OBS: aktivering kommer att åsidosätta inställningarna "s3 access key id" och "s3 secret access key". '
     s3_upload_bucket: "Namnet på Amazon S3 behållaren som filerna kommer att laddas upp i. VARNING: måste vara gemener, inga punkter och inga understreck."
     s3_access_key_id: "ID för åtkomstnyckeln till Amazon S3 som kommer att användas för att ladda upp bilder."
     s3_secret_access_key: "Den hemliga åtkomstnyckeln till Amazon S3 som kommer att användas för att ladda upp bilder."
@@ -959,7 +927,6 @@ sv:
     min_trust_to_edit_wiki_post: "Lägsta förtroendenivå som krävs för att redigera inlägg markerade som wiki. "
     min_trust_to_edit_post: "Lägsta förtroende nivån som krävs för att skapa ett inlägg."
     min_trust_to_allow_self_wiki: "Lägsta förtroendenivå som krävs för att göra användares egna inlägg wiki."
-    min_trust_to_send_messages: "Lägsta förtroendenivå som krävs för att skapa nya privata meddelanden."
     newuser_max_links: "Antalet länkar en ny användare kan lägga till i ett inlägg."
     newuser_max_images: "Antalet bilder en ny användare kan lägga till i ett inlägg."
     newuser_max_attachments: "Antalet bilagor en ny användare kan lägga till i ett inlägg."
@@ -969,7 +936,6 @@ sv:
     max_users_notified_per_group_mention: "Maximalt antal användare som kan få ett meddelande om en grupp anges (om tröskeln är uppfyllt kommer inga meddelande att skickas)"
     create_thumbnails: "Skapa miniatyrer och \"lightboxa\" bilder som är för stora för att passa in i ett inlägg."
     email_time_window_mins: "Vänta (n) minuter innan något notifikationsmejl skickas ut, för att ge användare chansen att redigera och slutföra deras inlägg."
-    private_email_time_window_seconds: "Vänta (n) sekunder innan någon privat e-postnotifikation skickas ut för att ge användare chansen att redigera och slutföra deras meddelande."
     email_posts_context: "Hur många tidigare svar som ska inkluderas som kontext i e-postnotifikationer."
     flush_timings_secs: "Hur frekvent vi spolar tidsdata till servern, i sekunder."
     title_max_word_length: "Den maximala tillåtna ordlängden, i tecken, i ett ämnes rubrik."
@@ -1120,13 +1086,11 @@ sv:
     approve_post_count: "Antalet inlägg från en ny användare eller basanvändare som måste godkännas"
     approve_unless_trust_level: "Inlägg för användare under den här förtroendenivån måste godkännas"
     approve_new_topics_unless_trust_level: "Nya ämnen för användare under denna förtroendenivå måste bli godkända"
-    notify_about_queued_posts_after: "Om det finns inlägg som väntat på att granskas i fler än så här många timmar så skickas ett e-postmeddelande till contact_email. Ange 0 för att inaktivera de här e-postmeddelandena."
     auto_close_messages_post_count: "Högsta antal inlägg som tillåts i ett meddelande innan det automatiskt stängs (ange 0 för att inaktivera)"
     auto_close_topics_post_count: "Högsta antal inlägg som tillåts i ett ämne innan det automatiskt stängs (ange 0 för att inaktivera)"
     code_formatting_style: "Kodknappen i redigeraren kommer att använda den här kodformatteringsstilen som standard"
     default_email_digest_frequency: "Standardinställning för hur ofta användare mottar e-postsammanfattningar."
     default_include_tl0_in_digests: "Standardinställning för hur ofta nya användare får e-postsammanfattningar. Användare kan ändra det i sina inställningar."
-    default_email_private_messages: "Ange standardinställningen till att skicka ett e-post när någon skickar användaren ett meddelande."
     default_email_direct: "Ange standardinställningen till att skicka ett e-post när någon citerar/svarar/nämner eller bjuder in användaren."
     default_email_mailing_list_mode: "Ange standardinställningen till att skicka ett e-post för varje nytt inlägg."
     default_email_mailing_list_mode_frequency: "Standardinställning för hur ofta användare som aktiverar utskicksläge kommer att motta e-post."
@@ -1159,7 +1123,6 @@ sv:
     max_tags_in_filter_list: "Högsta antal taggar att visa i filtreringsrullgardinen. De taggar som är mest använda kommer att visas."
     tags_sort_alphabetically: "Visa taggar i alfabetisk ordning. Standard är att visa i popularitetsordning."
     tag_style: "Visuell stil för tagg-utmärkelser."
-    staff_tags: "En lista av taggar som endast kan användas av personalen"
     min_trust_level_to_tag_topics: "Lägsta förtroendenivå som krävs för att tagga ämnen"
     suppress_overlapping_tags_in_list: "Om taggen exakt matchar orden i ämnets titel, visa inte taggen"
     remove_muted_tags_from_latest: "Visa inte ämnen som taggats med dolda taggar i listan med senaste ämnen."
@@ -1212,11 +1175,11 @@ sv:
       different_users: "Inlägg som hör till olika användare kan inte lägga ihop."
   move_posts:
     new_topic_moderator_post:
-      one: "Ett inlägg har delats in i ett nytt ämne: %{topic_link}"
-      other: "%{count} inlägg delades in i ett nytt ämne: %{topic_link}"
+      one: 'Ett inlägg har delats in i ett nytt ämne: %{topic_link}'
+      other: '%{count} inlägg delades in i ett nytt ämne: %{topic_link}'
     existing_topic_moderator_post:
-      one: "Ett inlägg har sammanfogats med ett existerande ämne: %{topic_link}"
-      other: "%{count} inlägg har sammanfogats med ett existerande ämne: %{topic_link}"
+      one: 'Ett inlägg har sammanfogats med ett existerande ämne: %{topic_link}'
+      other: '%{count} inlägg har sammanfogats med ett existerande ämne: %{topic_link}'
   change_owner:
     post_revision_text: "Ägarbyte från %{old_user} till %{new_user}"
     deleted_user: "en raderad användare"
@@ -1226,29 +1189,29 @@ sv:
     closed_enabled: "Detta ämne är nu stängt. Nya svar tillåts inte längre."
     closed_disabled: "Detta ämne är nu öppnat. Nya svar är tillåtna."
     autoclosed_message_max_posts:
-      one: "Det här ämnet stängdes automatiskt efter att ha nått den övre gränsen av 1 inlägg."
-      other: "Det här ämnet stängdes automatiskt efter att ha uppnått den övre gränsen av %{count} inlägg. "
+      one: Det här ämnet stängdes automatiskt efter att ha nått den övre gränsen av 1 inlägg.
+      other: 'Det här ämnet stängdes automatiskt efter att ha uppnått den övre gränsen av %{count} inlägg. '
     autoclosed_topic_max_posts:
-      one: "Det här ämnet stängdes automatiskt efter att ha uppnått den övre gränsen av 1 inlägg."
-      other: "Det här ämnet stängdes automatiskt efter att ha uppnått den övre gränsen av %{count} inlägg. "
+      one: Det här ämnet stängdes automatiskt efter att ha uppnått den övre gränsen av 1 inlägg.
+      other: 'Det här ämnet stängdes automatiskt efter att ha uppnått den övre gränsen av %{count} inlägg. '
     autoclosed_enabled_days:
-      one: "Detta ämne stängdes automatiskt efter 1 dag. Nya svar är ej längre tillåtet."
-      other: "Detta ämne stängdes automatiskt efter %{count} dagar. Nya svar är ej längre tillåtna."
+      one: Detta ämne stängdes automatiskt efter 1 dag. Nya svar är ej längre tillåtet.
+      other: Detta ämne stängdes automatiskt efter %{count} dagar. Nya svar är ej längre tillåtna.
     autoclosed_enabled_hours:
-      one: "Detta ämne stängdes automatiskt efter 1 timme. Nya svar är ej längre tillåtna."
-      other: "Detta ämne stängdes automatiskt efter %{count} timmar. Nya svar är ej längre tillåtna."
+      one: Detta ämne stängdes automatiskt efter 1 timme. Nya svar är ej längre tillåtna.
+      other: Detta ämne stängdes automatiskt efter %{count} timmar. Nya svar är ej längre tillåtna.
     autoclosed_enabled_minutes:
-      one: "Detta ämne stängdes automatiskt efter 1 minut. Nya svar är ej längre tillåtna."
-      other: "Detta ämne stängdes automatiskt efter %{count} minuter. Nya svar är ej längre tillåtna."
+      one: Detta ämne stängdes automatiskt efter 1 minut. Nya svar är ej längre tillåtna.
+      other: Detta ämne stängdes automatiskt efter %{count} minuter. Nya svar är ej längre tillåtna.
     autoclosed_enabled_lastpost_days:
-      one: "Detta ämne stängdes automatiskt 1 dag efter det senaste svaret. Nya svar är ej längre tillåtna."
-      other: "Detta ämne stängdes automatiskt %{count} dagar efter det senaste svaret. Nya svar är ej längre tillåtna."
+      one: Detta ämne stängdes automatiskt 1 dag efter det senaste svaret. Nya svar är ej längre tillåtna.
+      other: Detta ämne stängdes automatiskt %{count} dagar efter det senaste svaret. Nya svar är ej längre tillåtna.
     autoclosed_enabled_lastpost_hours:
-      one: "Detta ämne stängdes automatiskt 1 timme efter det senaste svaret. Nya svar är ej längre tillåtna."
-      other: "Detta ämne stängdes automatiskt %{count} timmar efter det senaste svaret. Nya svar är ej längre tillåtna."
+      one: Detta ämne stängdes automatiskt 1 timme efter det senaste svaret. Nya svar är ej längre tillåtna.
+      other: Detta ämne stängdes automatiskt %{count} timmar efter det senaste svaret. Nya svar är ej längre tillåtna.
     autoclosed_enabled_lastpost_minutes:
-      one: "Detta ämne stängdes automatiskt 1 minut efter det senaste svaret. Nya svar är ej längre tillåtna."
-      other: "Detta ämne stängdes automatiskt %{count} minuter efter det senaste svaret. Nya svar är ej längre tillåtna."
+      one: Detta ämne stängdes automatiskt 1 minut efter det senaste svaret. Nya svar är ej längre tillåtna.
+      other: Detta ämne stängdes automatiskt %{count} minuter efter det senaste svaret. Nya svar är ej längre tillåtna.
     autoclosed_disabled: "Detta ämne är nu öppet. Nya svar är tillåtna."
     autoclosed_disabled_lastpost: "Detta ämne är nu öppnat. Nya svar är tillåtna."
     pinned_enabled: "Detta ämne är nu klistrat. Det dyker upp i toppen av dess kategori tills den blir avklistrad av personal för alla, eller av enskilda användare för de själva."
@@ -1262,6 +1225,7 @@ sv:
     incorrect_username_email_or_password: "Felaktigt användarnamn, e-post eller lösenord"
     wait_approval: "Tack för din registrering. Vi meddelar dig när ditt konto blivit godkänt."
     active: "Ditt konto är aktiverat och redo att användas."
+    activate_email: "Du är nästan där! Vi har skickat ett aktiveringsmejl till %{email}. Vänligen följ instruktionerna i mejlet och aktivera ditt konto. Får du inget mejl, kolla skräpposten. "
     not_activated: "Du kan inte logga in ännu. Vi har skickat ett aktiveringsmejl till dig. Vänligen följ instruktionerna i mejlet för att aktivera ditt konto."
     not_allowed_from_ip_address: "Du kan inte logga in som %{username} från den IP-adressen."
     admin_not_allowed_from_ip_address: "Du kan inte logga in som admin från den IP-adressen."
@@ -1299,8 +1263,8 @@ sv:
       max_new_accounts_per_registration_ip: "Nya registreringar är inte tillåtna från din IP-adress (maxgräns uppnådd). Kontakta personal."
   flags_reminder:
     subject_template:
-      one: "1 flagga väntar på att bli hanterad"
-      other: "%{count} flaggor väntar på att bli hanterade"
+      one: 1 flagga väntar på att bli hanterad
+      other: '%{count} flaggor väntar på att bli hanterade'
   unsubscribe_mailer:
     title: "stäng av mail skrivaren"
     subject_template: "Bekräfta att du inte längre vill motta e-postuppdateringar från %{site_title}"
@@ -1361,7 +1325,6 @@ sv:
       subject_template: "Massrekrytering av användare genererade fel"
     csv_export_succeeded:
       title: "CSV exporten lyckades"
-      subject_template: "Dataexport lyckades"
     csv_export_failed:
       title: "CSV exporten misslyckades"
       subject_template: "Dataexport misslyckades"
@@ -1446,8 +1409,8 @@ sv:
     pending_users_reminder:
       title: "Påminnelse om väntande användare"
       subject_template:
-        one: "1 användare väntar på godkännande"
-        other: "%{count} användare väntar på godkännande"
+        one: 1 användare väntar på godkännande
+        other: '%{count} användare väntar på godkännande'
       text_body_template: |
         Det finns nya användarregistreringar att godkänna (eller avvisa) innan de kan få tillträde till forumet.
 
@@ -1597,7 +1560,7 @@ sv:
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
-        %{message}
+          %{message}
     digest:
       why: "En kortfattad sammanfattning av %{site_link} sedan ditt senaste besök den %{last_seen_at}"
       since_last_visit: "Sedan ditt senaste besök"
@@ -1639,6 +1602,14 @@ sv:
       subject_template: "Du har blivit godkänd på %{site_name}!"
     signup:
       title: "Bli medlem"
+      subject_template: "%{email_prefix}Bekräfta ditt nya konto"
+      text_body_template: |
+        Välkommen till %{site_name}!
+
+        Klicka på följande länk för att bekräfta och aktivera ditt nya konto:
+        %{base_url}/u/activate-account/%{email_token}
+
+        Om ovan länk inte är klickbar, försök kopiera och klistra in den i adressfältet i din webbläsare.
   page_not_found:
     title: "Hoppsan! Den sidan finns inte eller så är den privat."
     popular_topics: "Populära"
@@ -1710,22 +1681,22 @@ sv:
         Den här utmärkelsen beviljas första gången som du redigerar något av dina inlägg. Även om du inte kan redigera dina inlägg förevigt så är redigering alltid en god idé — du kan förbättra dina inlägg, fixa små misstag eller lägga till något som du missade när du först skrev inlägget. Redigera dina inlägg för att göra dem ännu bättre!
     basic_user:
       name: Grundläggande
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Beviljad</a> alla väsentliga forumfunktioner
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">Beviljad</a> alla väsentliga forumfunktioner"
       long_description: |
         Den här utmärkelsen beviljas när du uppnår förtroendenivå 1. Tack för att du har följt med en stund och läst några ämnen för att lära dig vad vårt forum handlar om. Dina användarrestriktioner som ny användare har lyfts och du har nu tillgång till alla väsentliga forumfunktioner, bland annat personliga meddelanden, flaggningar, redigering av wikin och möjligheten att posta flertalet bilder och länkar
     member:
       name: Medlem
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Beviljad</a> inbjudningar, gruppmeddelanden, fler gillningar
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">Beviljad</a> inbjudningar, gruppmeddelanden, fler gillningar"
       long_description: |
         Den här utmärkelsen beviljas när du når förtroendenivå 2. Tack för att har varit en del av forumet de senaste veckorna. Du kan nu skicka inbjudningar från din användarsida eller från individuella ämnen, skicka gruppmeddelanden och ha några fler gillningar varje dag.
     regular:
       name: Regelbunden
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Beviljad</a> omkategorisera, döpa om, följa länkar, wiki, fler gillningar
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">Beviljad</a> omkategorisera, döpa om, följa länkar, wiki, fler gillningar"
       long_description: |
         Den här utmärkelsen beviljas när du når förtroendenivå 3. Tack för att du regelbundet har varit en del av forumet de senaste månaderna. Du är nu en av våra mest aktiva läsare och en tillförlitlig bidragsgivare som gör forumet fantastiskt. Du kan nu omkategorisera och döpa om ämnen, använda mer kraftfulla verktyg som skräppost-flaggor, få tillgång till ett privat delforum och du får också massor av fler gillningar varje dag.
     leader:
       name: Ledare
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Beviljad</a> globala redigeringar, klistra, stänga, arkivera, splitta och sammanfoga, fler gillningar
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">Beviljad</a> globala redigeringar, klistra, stänga, arkivera, splitta och sammanfoga, fler gillningar"
       long_description: |
         Den här utmärkelsen beviljas när du når förtroendenivå 4. Du är en ledare för det här forumet speciellt utvald av personalen och du är en fin förebild genom dina handlingar och ord här. Du har möjlighet att ändra alla inlägg, använda vanliga moderingsverktyg för ämnen såsom att klistra, stänga, olista, arkivera, splitta och sammanfoga, och du har massor av fler gillningar varje dag.
     welcome:
@@ -1737,7 +1708,7 @@ sv:
       name: Självbiograf
     anniversary:
       name: Årsdag
-      description: Aktiv medlem ett år, har skrivit minst en gång
+      description: "Aktiv medlem ett år, har skrivit minst en gång"
       long_description: |
         Den här utmärkelsen beviljas när du har varit en medlem i ett år med minst ett inlägg under det året. Tack för att du har varit en del av och bidragit till forumet. Vi kunde inte ha gjort det utan dig.
     nice_post:
@@ -1798,8 +1769,6 @@ sv:
     promoter:
       name: Främjare
       description: Bjöd in en användare
-      long_description: |
-        Den här utmärkelsen beviljas när du bjuder in någon att delta i forumet med hjälp av inbjudningsknappen på användarsidan eller i slutet av ett ämne. Att bjuda in vänner som kan vara intresserade av specifika diskussioner är ett bra sätt att introducera nya personer till vårt forum, tack!
     campaigner:
       name: Förespråkare
       description: Bjöd in 3 grundläggande användare
@@ -1895,22 +1864,19 @@ sv:
     first_emoji:
       name: Första emoji
       description: Använde en emoji i ett inlägg
-      long_description: |
-        Den här utmärkelsen beviljas när du för första gången använder en emoji i ditt inlägg :thumbsup:. Emojis låter dig förmedla dina känslor i dina inlägg, från glädje :smiley: till sorgsenhet :anguished: till ilska :angry: och allt däremellan :sunglasses:. Skriv bara ett : (kolon) eller klicka på emoji-knappen i redigeraren för att välja mellan hundratals emojis :ok_hand:
     first_mention:
       name: Första omnämningen
-      long_description: 'Den här utmärkelsen beviljas när du nämner någons @användarnamn i ett inlägg. Varje omnämnande genererar en notifiering till den personen, så att det känner till ditt inlägg. Börja skriva @ (snabel-a) för att nämna en användare, eller, om det tillåts, en grupp - det är ett bekvämt sätt att uppmärksamma dem på något. '
+      long_description: "Den här utmärkelsen beviljas när du nämner någons @användarnamn i ett inlägg. Varje omnämnande genererar en notifiering till den personen, så att det känner till ditt inlägg. Börja skriva @ (snabel-a) för att nämna en användare, eller, om det tillåts, en grupp - det är ett bekvämt sätt att uppmärksamma dem på något. "
     first_onebox:
-      name: Första onebox:en
-      description: Lade upp en länk som var onebox:ad
-      long_description: 'Den här utmärkelsen beviljas när du för första gången lägger upp en länk på en rad för sig själv, vilken sedan automatiskt utvidgas och blir en onebox med en kort sammanfattning av länken, en rubrik och (när det finns tillgängligt) även en bild. '
+      name: "Första onebox:en"
+      description: "Lade upp en länk som var onebox:ad"
+      long_description: "Den här utmärkelsen beviljas när du för första gången lägger upp en länk på en rad för sig själv, vilken sedan automatiskt utvidgas och blir en onebox med en kort sammanfattning av länken, en rubrik och (när det finns tillgängligt) även en bild. "
     first_reply_by_email:
       name: Första svaret via e-post
       long_description: |
         Den här utmärkelsen beviljas när du för första gången svarar på ett inlägg via e-post :e-mail:.
   admin_login:
     success: "E-post skickat"
-    error: "Fel!"
     email_input: "E-post till administratör"
     submit_button: "Skicka e-post"
   performance_report:
@@ -2031,6 +1997,3 @@ sv:
         title: "Invitera personal"
       finished:
         title: "Er diskussionsgrupp är klar!"
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.te.yml b/config/locales/server.te.yml
index d6f0962ec6a..4b8dde93314 100644
--- a/config/locales/server.te.yml
+++ b/config/locales/server.te.yml
@@ -10,6 +10,8 @@ te:
     short_date_no_year: "D MMM"
     short_date: "D MMM, YYYY"
     long_date: "MMMM D, YYYY h:mma"
+  date:
+    month_names: [~, "", "", "", "", "", "", "", "", "", "", "", ""]
   title: "డిస్కోర్స్"
   topics: "విషయాలు"
   posts: "టపాలు"
@@ -27,15 +29,15 @@ te:
       present: తప్పనిసరిగా ఖాళీగా ఉండాలి
       confirmation: "%{attribute} కు జత అవ్వలేదు "
       empty: ఖాళీ ఉండకూడదు
-      equal_to: తప్పనిసరిగా %{count} కు సమానంగా ఉండాలి
+      equal_to: "తప్పనిసరిగా %{count} కు సమానంగా ఉండాలి"
       even: జతగా ఉండాలి
       exclusion: రక్షితము
-      greater_than: ' %{count} కన్నా ఎక్కువ ఉండాలి'
-      greater_than_or_equal_to: '%{count} కన్నా సమానం లేదా ఎక్కువ ఉండాలి'
+      greater_than: " %{count} కన్నా ఎక్కువ ఉండాలి"
+      greater_than_or_equal_to: "%{count} కన్నా సమానం లేదా ఎక్కువ ఉండాలి"
       inclusion: జాబితాలో జతపర్చబడలేదు
       invalid: చెల్లనిది
-      less_than: '%{count} కన్నా తక్కువ ఉండాలి'
-      less_than_or_equal_to: '%{count} కన్నా సమానం లేదా తక్కువగా ఉండాలి'
+      less_than: "%{count} కన్నా తక్కువ ఉండాలి"
+      less_than_or_equal_to: "%{count} కన్నా సమానం లేదా తక్కువగా ఉండాలి"
       not_a_number: సంఖ్య కాదు
       not_an_integer: తప్పనిసరిగా పూర్ణ సంఖ్య అయి ఉండాలి
       odd: తప్పనిసరి బేసి సంఖ్య కావాలి
@@ -60,6 +62,9 @@ te:
         other: '%{count} దోషాల వల్ల  %{model} భద్రపరుచుట వీలవలేదు'
     embed:
       load_from_remote: "ఈ టపా లోడింగులో దోషం"
+  activemodel:
+    errors:
+      <<: *errors
   backup:
     operation_already_running: "ఒక పరిక్రియ ప్రస్తుతం జరుగుతోంది. కొత్త పని ఇప్పుడు మొదలుపెట్టవీలవదు."
     backup_file_should_be_tar_gz: "బ్యాకప్ దస్త్రం తప్పనిసరి .tar.gz కట్ట అయి ఉండాలి."
@@ -69,21 +74,21 @@ te:
   invalid_access: "అభ్యర్థించిన వనరు వీక్షించడానికి మీకు అనుమతి లేదు."
   read_only_mode_enabled: "సైటు కేవలం చదివే రీతిలో ఉంది. చర్చలు ఇప్పుడు అచేతనం."
   too_many_replies:
-    one: "క్షమించాలి. కొత్త సభ్యులు తాత్కాలికంగా ఒక విషయానికి  ఒక జవాబుకు మాత్రమే పరిమితం చేయబడ్డారు"
-    other: "క్షమించాలి. కొత్త సభ్యులు, తాత్కాలికంగా ఒక విషయానికి %{count} జవాబులకు మాత్రమే పరిమితం చెయ్యబడ్డారు."
+    one: క్షమించాలి. కొత్త సభ్యులు తాత్కాలికంగా ఒక విషయానికి  ఒక జవాబుకు మాత్రమే పరిమితం చేయబడ్డారు
+    other: క్షమించాలి. కొత్త సభ్యులు, తాత్కాలికంగా ఒక విషయానికి %{count} జవాబులకు మాత్రమే పరిమితం చెయ్యబడ్డారు.
   embed:
     start_discussion: "చర్చ మొదలుపెట్టు"
     continue: "చర్చ కొనసాగించు"
     more_replies:
-      one: "మరో జవాబు ఉంది"
-      other: "ఇంకా %{count} జవాబులు ఉన్నాయి"
+      one: మరో జవాబు ఉంది
+      other: ఇంకా %{count} జవాబులు ఉన్నాయి
     loading: "చర్చ లోడవుతోంది"
     permalink: "శాస్వత లంకె"
     imported_from: "%{link} వద్ద మూల పద్దుకు జోడు చర్చా విషయం ఉంది."
     in_reply_to: "▶ %{username}"
     replies:
-      one: "ఒక జవాబు"
-      other: "%{count} జవాబులు"
+      one: ఒక జవాబు
+      other: '%{count} జవాబులు'
   spamming_host: "క్షమించాలి. ఆ అతిధికి మీరు లంకె టపా చెయ్యలేరు."
   user_is_suspended: "సస్పెండైన సభ్యులు టపా రాయుట వీలవదు"
   topic_not_found: "ఏదో తప్పు జరిగింది. బహుశా ఈ అంశం ముగిసింది లేదా మీరు చూస్తూ ఉండగా తొలగించబడింది?"
@@ -116,9 +121,9 @@ te:
       trust_level_4: "నమ్మకం_స్థాయి_4"
   education:
     until_posts:
-      one: "ఒక టపా"
-      other: "%{count} టపాలు"
-    new-reply: |
+      one: ఒక టపా
+      other: '%{count} టపాలు'
+    'new-reply': |
       స్వాగతం %{site_name} &mdash; **పాల్గొన్నందుకు ధన్యవాదాలు!**
 
       - మీ సమాధానం సంభాషణను కొంత మెరుగు పరిచిందా ?
@@ -138,13 +143,12 @@ te:
       user_profile:
         bio_raw: "నా గురించి"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "ప్రైవేటు సందేశాలకు మీరు కేవలం హెచ్చరికలు మాత్రమే జోడించగలరు"
               too_many_users: "మీరు హెచ్చరికలు ఒక పర్యాయం కేవలం ఒక సభ్యునికి మాత్రమే పంపగలరు."
-              cant_send_pm: "క్షమించాలి. ఆ సభ్యునికి మీరు ప్రైవేటు సందేశం పంపలేరు."
               no_user_selected: "మీరు ఒక సభ్యుడిని ఎంచుకోవాలి."
         user:
           attributes:
@@ -158,7 +162,6 @@ te:
           attributes:
             hex:
               invalid: "ఇది చెల్లని రంగు"
-      <<: *errors
   user_profile:
     no_info_other: "<div class='missing-profile'>%{name} ఇంకా వారి ప్రొఫైల్ లో ఎబౌట్ మీ స్థానంలో ఏమీ చేర్చలేదు</div>"
   vip_category_name: "అడ్డా"
@@ -178,8 +181,8 @@ te:
       uncategorized: "అవర్గీకృతాన్ని తొలగించలేరు"
       has_subcategories: "ఈ వర్గాన్ని తొలగించలేరు. ఎందుకంటే దీనికి ఉప వర్గాలు ఉన్నాయి."
       topic_exists:
-        one: "ఈ వర్గాన్ని తొలగించలేరు. ఎందుకంటే దీనిలో ఒక విషయం ఉంది. పురాతన విషయం %{topic_link}."
-        other: "ఈ వర్గాన్ని తొలగించలేరు. ఎందుకంటే దీనిలో %[count] విషయాలు ఉన్నాయి. పురాతన విషయం %{topic_link}."
+        one: ఈ వర్గాన్ని తొలగించలేరు. ఎందుకంటే దీనిలో ఒక విషయం ఉంది. పురాతన విషయం %{topic_link}.
+        other: ఈ వర్గాన్ని తొలగించలేరు. ఎందుకంటే దీనిలో %[count] విషయాలు ఉన్నాయి. పురాతన విషయం %{topic_link}.
       topic_exists_no_oldest: "ఈ వర్గాన్ని తొలగించలేరు. ఎందుకంటే దీనిలో %{count} విషయాలు ఉన్నాయి."
   trust_levels:
     newuser:
@@ -187,87 +190,86 @@ te:
     basic:
       title: "ప్రాథమిక సభ్యుడు"
   rate_limiter:
-    too_many_requests: "ఈ చర్యకు రోజువారీపరిమితి ఉంది. దయచేసి %{time_left} సమయం తర్వాత ప్రయత్నించండి"
     hours:
-      one: "ఒక గంట"
-      other: "%{count} గంటలు"
+      one: ఒక గంట
+      other: '%{count} గంటలు'
     minutes:
-      one: "ఒక నిమిషం"
-      other: "%{count} నిమిషాలు"
+      one: ఒక నిమిషం
+      other: '%{count} నిమిషాలు'
     seconds:
-      one: "ఒక సెకను"
-      other: "%{count} సెకన్లు"
+      one: ఒక సెకను
+      other: '%{count} సెకన్లు'
   datetime:
     distance_in_words:
       half_a_minute: "< 1ని"
       less_than_x_seconds:
-        one: "< 1సె"
-        other: "<%{count}సె"
+        one: < 1సె
+        other: <%{count}సె
       x_seconds:
-        one: "1సె"
-        other: "%{count}సె"
+        one: 1సె
+        other: '%{count}సె'
       less_than_x_minutes:
-        one: "< 1ని"
-        other: "< %{count}ని"
+        one: < 1ని
+        other: < %{count}ని
       x_minutes:
-        one: "1ని"
-        other: "%{count}ని"
+        one: 1ని
+        other: '%{count}ని'
       about_x_hours:
-        one: "1గం"
-        other: "%{count}గం"
+        one: 1గం
+        other: '%{count}గం'
       x_days:
-        one: "1రో"
-        other: "%{count}రో"
+        one: 1రో
+        other: '%{count}రో'
       about_x_months:
-        one: "1నెల"
-        other: "%{count}నెల"
+        one: 1నెల
+        other: '%{count}నెల'
       x_months:
-        one: "1నెల"
-        other: "%{count}నెల"
+        one: 1నెల
+        other: '%{count}నెల'
       about_x_years:
-        one: "1సం"
-        other: "%{count}సం"
+        one: 1సం
+        other: '%{count}సం'
       over_x_years:
-        one: "> 1సం"
-        other: "> %{count}సం"
+        one: '> 1సం'
+        other: '> %{count}సం'
       almost_x_years:
-        one: "1సం"
-        other: "%{count}సం"
+        one: 1సం
+        other: '%{count}సం'
     distance_in_words_verbose:
       half_a_minute: "ఇప్పుడే"
       less_than_x_seconds:
-        one: "ఇప్పుడే"
-        other: "ఇప్పుడే"
+        one: ఇప్పుడే
+        other: ఇప్పుడే
       x_seconds:
-        one: "1 సెకన్ వెనుక"
-        other: "%{count} సెకన్ల వెనుక"
+        one: 1 సెకన్ వెనుక
+        other: '%{count} సెకన్ల వెనుక'
       less_than_x_minutes:
-        one: "ఒక్క నిమిషం ముందు"
-        other: "%{count} నిమిషాల ముందు"
+        one: ఒక్క నిమిషం ముందు
+        other: '%{count} నిమిషాల ముందు'
       x_minutes:
-        one: "ఒక్క నిమిషం ముందు"
-        other: "%{count} నిమిషాలు ముందు"
+        one: ఒక్క నిమిషం ముందు
+        other: '%{count} నిమిషాలు ముందు'
       about_x_hours:
-        one: "1 గంట ముందు"
-        other: "%{count} గంటల ముందు"
+        one: 1 గంట ముందు
+        other: '%{count} గంటల ముందు'
       x_days:
-        one: "1 రోజు ముందు"
-        other: "%{count} రోజుల ముందు"
+        one: 1 రోజు ముందు
+        other: '%{count} రోజుల ముందు'
       about_x_months:
-        one: "రమారమీ ఒక మాసం ముందు"
-        other: "రమారమీ %{count} నెలల ముందు"
+        one: రమారమీ ఒక మాసం ముందు
+        other: రమారమీ %{count} నెలల ముందు
       x_months:
-        one: "ఒక మాసం ముందు"
-        other: "%{count} నెలల వెనుక"
+        one: ఒక మాసం ముందు
+        other: '%{count} నెలల వెనుక'
       about_x_years:
-        one: "రమారమీ ఒక సంవత్సరం ముందు"
-        other: "రమారమీ %{count} సంవత్సరాల క్రితం"
+        one: రమారమీ ఒక సంవత్సరం ముందు
+        other: రమారమీ %{count} సంవత్సరాల క్రితం
       over_x_years:
-        one: "ఒక సంవత్సరం పైబడి"
-        other: "%{count} సవంత్సరాలకు పైబడి"
+        one: ఒక సంవత్సరం పైబడి
+        other: '%{count} సవంత్సరాలకు పైబడి'
       almost_x_years:
-        one: "అటో ఇటో ఒక సంవత్సరం వెనుక"
-        other: "అటోఇటో %{count} సంవత్సరాల ముందు"
+        one: అటో ఇటో ఒక సంవత్సరం వెనుక
+        other: అటోఇటో %{count} సంవత్సరాల ముందు
   password_reset:
     update: 'సంకేతపదం ఉన్నతీకరించండి'
     save: 'సంకేతపదం అమర్చండి'
@@ -345,9 +347,7 @@ te:
       xaxis: "రోజు"
       yaxis: "దర్శనాల సంఖ్య"
     signups:
-      title: "కొత్త వినియోగదారులు"
       xaxis: "రోజు"
-      yaxis: "కొత్త సభ్యుల సంఖ్య"
     topics:
       title: "విషయాలు"
       xaxis: "రోజు"
@@ -381,7 +381,6 @@ te:
       xaxis: "రోజు"
       yaxis: "ఈమెయిల్ల సంఖ్య"
     user_to_user_private_messages:
-      title: "సభ్యుని నుండి సభ్యునికి"
       xaxis: "రోజు"
     system_private_messages:
       title: "వ్వవస్థ"
@@ -420,7 +419,6 @@ te:
       title: "జాల క్రాలర్లు"
       xaxis: "రోజు"
     page_view_total_reqs:
-      title: "మొత్తం"
       xaxis: "రోజు"
     http_background_reqs:
       title: "వెనుతలం"
@@ -453,7 +451,6 @@ te:
   site_settings:
     censored_words: "వీటితో పదాలు స్వయంచాలకంగా భర్తీ చేయబడతాయి &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "30 రోజుల కంటే ఎక్కువ దాగివున్న టపాలు స్వయంసిధ్ధంగా తొలగింపబడతాయి."
-    default_locale: "ఈ సంభాషణ సమయంలో అప్రమేయ భాష (ISO 639-1 Code)"
     allow_user_locale: "వినియోగదారులు వారి సొంత భాష ఇంటర్ఫేస్ ప్రాధాన్యతను ఎంచుకోవడానికి అనుమతించు"
     min_post_length: "టపా అనుమతించే అక్షరాల కనిష్ఠ పొడవు"
     max_post_length: "టపా అనుమతించే అక్షరాల గరిష్ఠ పొడవు"
@@ -575,6 +572,3 @@ te:
     title: "సేవా నిబంధనలు"
   privacy_topic:
     title: "ప్రైవసీ పోలసీ"
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.th.yml b/config/locales/server.th.yml
index dd3fd19d261..1eaf3d4bc4f 100644
--- a/config/locales/server.th.yml
+++ b/config/locales/server.th.yml
@@ -17,12 +17,12 @@ th:
       date_only: "%B %-d, %Y"
       long: "%B %-d, %Y, %l:%M%P"
   date:
-    month_names: [null, มกราคม, กุมภาพันธ์, มีนาคม, เมษายน, พฤษภาคม, มิถุนายน, กรกฎาคม, สิงหาคม, กันยายน, ตุลาคม, พฤศจิกายน, ธันวาคม]
+    month_names: [~, มกราคม, กุมภาพันธ์, มีนาคม, เมษายน, พฤษภาคม, มิถุนายน, กรกฎาคม, สิงหาคม, กันยายน, ตุลาคม, พฤศจิกายน, ธันวาคม]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "am"
     pm: "pm"
-    <<: *datetime_formats
   title: "ดิสคอส"
   topics: "หัวข้อ"
   posts: "โพสต์"
@@ -39,6 +39,9 @@ th:
   errors: &errors
     messages:
       invalid: ไม่ถูกต้อง
+  activemodel:
+    errors:
+      <<: *errors
   embed:
     start_discussion: "เริ่มการสนทนา"
     continue: "ดำเนินการสนทนาต่อ"
@@ -58,7 +61,10 @@ th:
       staff: "ทีมงาน"
   education:
     until_posts:
-      other: "%{count} โพส"
+      other: '%{count} โพส'
+  activerecord:
+    errors:
+      <<: *errors
   category:
     topic_prefix: "เกี่ยวกับหมวด %{category}"
   archetypes:
@@ -98,13 +104,7 @@ th:
     user_posted_pm_staged:
       text_body_template: |2
 
-        %{message}
+          %{message}
   page_not_found:
     see_more: "อื่น"
     search_google: "กูเกิ้ล"
-  activemodel:
-    errors:
-      <<: *errors
-  activerecord:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index 5a70c661561..5c970ce2340 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -17,12 +17,12 @@ tr_TR:
       date_only: "%B %-d, %Y"
       long: "%B %-d, %Y, %l:%M%P"
   date:
-    month_names: [null, Ocak, Şubat, Mart, Nisan, Mayıs, Haziran, Temmuz, Ağustos, Eylül, Ekim, Kasım, Aralık]
+    month_names: [~, Ocak, Şubat, Mart, Nisan, Mayıs, Haziran, Temmuz, Ağustos, Eylül, Ekim, Kasım, Aralık]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "öö"
     pm: "ös"
-    <<: *datetime_formats
   title: "Discourse"
   topics: "Konular"
   posts: "gönderiler"
@@ -54,16 +54,16 @@ tr_TR:
       present: boş bırakılmalı
       confirmation: "%{attribute} ile eşleşmiyor"
       empty: boş olamaz
-      equal_to: '%{count} rakamına eşit olmalı'
+      equal_to: "%{count} rakamına eşit olmalı"
       even: çift sayı olmalı
       exclusion: ayrıldı
-      greater_than: '%{count} rakamından fazla olmalı'
-      greater_than_or_equal_to: '%{count} rakamına eşit veya daha fazla olmalı'
+      greater_than: "%{count} rakamından fazla olmalı"
+      greater_than_or_equal_to: "%{count} rakamına eşit veya daha fazla olmalı"
       has_already_been_used: "önceden kullanıldı"
       inclusion: listeye dahil edilmemiş
       invalid: geçersiz
-      less_than: '%{count} rakamından az olmalı'
-      less_than_or_equal_to: '%{count} rakamına eşit veya daha az olmalı'
+      less_than: "%{count} rakamından az olmalı"
+      less_than_or_equal_to: "%{count} rakamına eşit veya daha az olmalı"
       not_a_number: sayı değil
       not_an_integer: tam sayı değil
       odd: tek sayı olmalı
@@ -72,15 +72,19 @@ tr_TR:
         one: "Kayıt silinemiyor çünkü bir bağımlı %{record} var"
         many: "Kayıt silinemiyor çünkü bir bağımlı %{record} var"
       too_long:
+        one: çok uzun (en fazla %{count} karakter)
         other: çok uzun (en fazla %{count} karakter)
       too_short:
+        one: çok kısa (en az %{count} karakter olabilir)
         other: çok kısa (en az %{count} karakter olabilir)
       wrong_length:
+        one: yanlış uzunlukta (%{count} karakter olmalı)
         other: yanlış uzunlukta (%{count} karakter olmalı)
       other_than: "%{count} dışında bir rakam olmalı"
     template:
       body: 'Şu alanlarla ilgili problem yaşandı:'
       header:
+        one: '%{count} hata bu %{model} kaydının alınmasını engelledi'
         other: '%{count} hata bu %{model} kaydının alınmasını engelledi'
     embed:
       load_from_remote: "Gönderi yüklenirken bir hata oluştu."
@@ -91,6 +95,9 @@ tr_TR:
       max_username_length_range: "En küçük değer altında en büyük değer ayarlayamazsınız."
       default_categories_already_selected: "Bir başka listede kullanılan bir kategoriyi seçemezsiniz."
       s3_upload_bucket_is_required: "Bir 's3_upload_bucket' tanımlamadıysanız, S3 yüklemelerini etkinleştiremezsiniz."
+  activemodel:
+    errors:
+      <<: *errors
   topic_invite:
     user_exists: "Üzgünüz, bu kullanıcı zaten davet edildi. Konuya yalnızca bir kullanıcı davet edebilirsiniz."
   backup:
@@ -105,34 +112,42 @@ tr_TR:
   reading_time: "Okuma Zamanı"
   likes: "Beğeniler"
   too_many_replies:
-    other: "Üzgünüz, yeni kullanıcılar geçici olarak aynı konu içinde sadece %{count} cevap ile sınırlılar. "
+    one: 'Üzgünüz, yeni kullanıcılar geçici olarak aynı konu içinde sadece %{count} cevap ile sınırlılar. '
+    other: 'Üzgünüz, yeni kullanıcılar geçici olarak aynı konu içinde sadece %{count} cevap ile sınırlılar. '
   embed:
     start_discussion: "Tartışma Başlat"
     continue: "Tartışmaya Devam Et"
     referer: "Yönlendiren:"
     more_replies:
-      other: "%{count} cevap daha"
+      one: '%{count} cevap daha'
+      other: '%{count} cevap daha'
     loading: "Tartışma Yükleniyor..."
     permalink: "Kalıcı Bağlantı"
     imported_from: "Bu ilave bir tartışmadır, asıl konu adresi %{link}"
     in_reply_to: "▶ %{username}"
     replies:
-      other: "%{count} cevap"
+      one: '%{count} cevap'
+      other: '%{count} cevap'
   no_mentions_allowed: "Üzgünüz, diğer kullanıcılardan bahsedemezsiniz."
   too_many_mentions:
-    other: "Üzgünüz, bir gönderide sadece %{count} kullanıcıdan bahsedebilirsiniz."
+    one: Üzgünüz, bir gönderide sadece %{count} kullanıcıdan bahsedebilirsiniz.
+    other: Üzgünüz, bir gönderide sadece %{count} kullanıcıdan bahsedebilirsiniz.
   no_mentions_allowed_newuser: "Üzgünüz, yeni kullanıcılar diğer kullanıcılardan bahsedemezler."
   too_many_mentions_newuser:
-    other: "Üzgünüz, yeni kullanıcılar bir gönderide sadece %{count} kullanıcıdan bahsedebilirler."
+    one: Üzgünüz, yeni kullanıcılar bir gönderide sadece %{count} kullanıcıdan bahsedebilirler.
+    other: Üzgünüz, yeni kullanıcılar bir gönderide sadece %{count} kullanıcıdan bahsedebilirler.
   no_images_allowed: "Üzgünüz, yeni kullanıcılar gönderilere resim koyamazlar."
   too_many_images:
-    other: "Üzgünüz, yeni kullanıcılar bir gönderiye sadece %{count} resim koyabilirler. "
+    one: 'Üzgünüz, yeni kullanıcılar bir gönderiye sadece %{count} resim koyabilirler. '
+    other: 'Üzgünüz, yeni kullanıcılar bir gönderiye sadece %{count} resim koyabilirler. '
   no_attachments_allowed: "Üzgünüz, yeni kullanıcılar gönderilere bir şey ekleyemezler."
   too_many_attachments:
-    other: "Üzgünüz, yeni kullanıcılar bir gönderiye sadece %{count} eklenti koyabilirler."
+    one: Üzgünüz, yeni kullanıcılar bir gönderiye sadece %{count} eklenti koyabilirler.
+    other: Üzgünüz, yeni kullanıcılar bir gönderiye sadece %{count} eklenti koyabilirler.
   no_links_allowed: "Üzgünüz, yeni kullanıcılar gönderilere bağlantı ekleyemezler."
   too_many_links:
-    other: "Üzgünüz, yeni kullanıcılar bir gönderiye sadece %{count} bağlantı ekleyebilirler."
+    one: Üzgünüz, yeni kullanıcılar bir gönderiye sadece %{count} bağlantı ekleyebilirler.
+    other: Üzgünüz, yeni kullanıcılar bir gönderiye sadece %{count} bağlantı ekleyebilirler.
   spamming_host: "Üzgünüz bu sunucuya bağlantı veremezsiniz."
   user_is_suspended: "Uzaklaştırılmış kullanıcılar gönderi yapamazlar."
   topic_not_found: "Bir şeyler ters gitti. Muhtemelen siz konuya bakarken bu konu kapatıldı ya da silindi."
@@ -161,7 +176,6 @@ tr_TR:
     top_weekly: "Haftalık en iyi konular"
     top_daily: "Günlük en iyi konular"
     posts: "Son gönderiler"
-    private_posts: "Son özel iletiler"
     group_posts: "%{group_name} tarafından son gönderiler"
     group_mentions: "%{group_name} tarafından son bahsetmeler"
     user_posts: "@%{username} tarafından son gönderiler"
@@ -175,7 +189,6 @@ tr_TR:
   groups:
     errors:
       can_not_modify_automatic: "Otomatik bir grupta değişiklik yapamazsınız"
-      member_already_exist: "'%{username}' zaten grubun bir üyesi."
       invalid_domain: "'%{domain}' geçerli bir alan adı değil."
       invalid_incoming_email: "'%{email}' geçerli bir e-posta adresi değil."
       email_already_used_in_group: "'%{email}' zaten '%{group_name}' grubu tarafından kullanılıyor."
@@ -192,8 +205,9 @@ tr_TR:
       trust_level_4: "güven_seviyesi_4"
   education:
     until_posts:
-      other: "%{count} gönderi"
-    new-topic: |
+      one: '%{count} gönderi'
+      other: '%{count} gönderi'
+    'new-topic': |
       %{site_name} topluluğuna hoş geldiniz &mdash; **yeni bir sohbet başlattığınız için teşekkür ederiz! **
 
       - Yüksek sesle okuduğunuzda başlık ilgi çekici geliyor mu? İyi bir özet mi?
@@ -203,7 +217,7 @@ tr_TR:
       - Diğerlerinin de kolayca *bulabilmesi * için konunuzun içerisine sıkça kullanılan kelimeler dahil edin. Konunuzun benzer konularla gruplanması için bir kategori seçin.
 
       Daha fazlası için, [topluluk yönergelerimize bakın](/guidelines). Bu panel sadece ilk %{education_posts_text} için görünür.
-    new-reply: |
+    'new-reply': |
       %{site_name} topluluğuna hoş geldiniz &mdash; **katılımınız için teşekkür ederiz!**
 
       - Cevabınız sohbeti bir şekilde geliştiriyor mu?
@@ -224,13 +238,12 @@ tr_TR:
       user_profile:
         bio_raw: "Hakkımda"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Özel iletilere sadece uyarı ekleyebilirsiniz. "
               too_many_users: "Uyarıları aynı anda sadece bir kişiye gönderebilirsiniz."
-              cant_send_pm: "Üzgünüz, seçtiğiniz kullanıcıya özel ileti gönderemezsiniz."
               no_user_selected: "Geçerli bir kullanıcı seçmelisiniz."
         user:
           attributes:
@@ -245,7 +258,6 @@ tr_TR:
           attributes:
             hex:
               invalid: "geçerli bir renk değil"
-      <<: *errors
   user_profile:
     no_info_other: "<div class='missing-profile'>%{name} profilinde Hakkımda kısmına henüz bir şey girmedi</div>"
   vip_category_name: "Lobi"
@@ -258,25 +270,25 @@ tr_TR:
     title: "Lobiye hoş geldiniz"
     body: |2
 
-      Tebrikler! :confetti_ball:
+        Tebrikler! :confetti_ball:
 
-      Bu konuyu görebiliyorsanız, yakın süre önce **müdavim** (güven seviyesi 3) seviyesine terfi etmişsiniz demektir.
+        Bu konuyu görebiliyorsanız, yakın süre önce **müdavim** (güven seviyesi 3) seviyesine terfi etmişsiniz demektir.
 
-      Artık &hellip;
+        Artık &hellip;
 
-      * Herhangi bir konunun başlık bilgisini düzenleyebilirsiniz
-      * Herhangi bir konunun kategorisini değiştirebilirsiniz
-      * Eklediğiniz linkler takip edilebilir durumunda olacaktır ([otomatik nofollow] (http://en.wikipedia.org/wiki/Nofollow) kaldırıldı)
-      * Sadece 3. güven seviyesi ve üzerindekilere gözüken özel lobi kategorisine erişebilirsiniz
-      * Tek bildirmeyle istenmeyen içerikli iletileri gizleyebilirsiniz
+        * Herhangi bir konunun başlık bilgisini düzenleyebilirsiniz
+        * Herhangi bir konunun kategorisini değiştirebilirsiniz
+        * Eklediğiniz linkler takip edilebilir durumunda olacaktır ([otomatik nofollow] (http://en.wikipedia.org/wiki/Nofollow) kaldırıldı)
+        * Sadece 3. güven seviyesi ve üzerindekilere gözüken özel lobi kategorisine erişebilirsiniz
+        * Tek bildirmeyle istenmeyen içerikli iletileri gizleyebilirsiniz
 
-      [Şu anki müdavim seviyedeki kişilerin listesi](/badges/3/regular). Merhaba demeyi unutmayın.
+        [Şu anki müdavim seviyedeki kişilerin listesi](/badges/3/regular). Merhaba demeyi unutmayın.
 
-      Bu topluluğun önemli bir parçası olduğunuz için teşekkür ederiz!
+        Bu topluluğun önemli bir parçası olduğunuz için teşekkür ederiz!
 
-      (Güven seviyeleriyle ilgili daha fazla bilgi için, [bu konuya bakın][trust]. Lütfen, sadece sürekli olarak kriterlere uyan üyelerin standart seviyede kalacağını unutmayın.)
+        (Güven seviyeleriyle ilgili daha fazla bilgi için, [bu konuya bakın][trust]. Lütfen, sadece sürekli olarak kriterlere uyan üyelerin standart seviyede kalacağını unutmayın.)
 
-      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "%{category} kategorisi hakkında "
     replace_paragraph: "(Bu paragrafın yerine yeni kategorinizin kısa bir açıklamasını girin. Buraya yazılanlar kategori seçim alanında görüneceği için, açıklamanızı 200 karakterin altında tutmaya çalışın.**Siz bu metni düzenleyene veya herhangi bir konu oluşturana kadar bu kategori, kategori sayfasında gözükmeyecek.**)"
@@ -292,7 +304,8 @@ tr_TR:
       uncategorized: "Kategorisiz silinemez"
       has_subcategories: "Alt kategorileri bulunduğu için bu kategori silinemez."
       topic_exists:
-        other: "Bu kategoriyi silemezsiniz çünkü %{count} konusu bulunuyor. En eski konu: %{topic_link}."
+        one: 'Bu kategoriyi silemezsiniz çünkü %{count} konusu bulunuyor. En eski konu: %{topic_link}.'
+        other: 'Bu kategoriyi silemezsiniz çünkü %{count} konusu bulunuyor. En eski konu: %{topic_link}.'
       topic_exists_no_oldest: "Bu kategoriyi silemezsiniz çünkü %{count} konusu bulunuyor."
     uncategorized_description: "Kategoriye ihtiyacı olmayan, ya da diğer kategorilere uymayan konular."
   trust_levels:
@@ -308,75 +321,86 @@ tr_TR:
       title: "lider"
     change_failed_explanation: " %{user_name} adlı kullanıcıyı '%{new_trust_level}' seviyesine düşürmeye çalıştınız. Ancak, halihazırda kullanıcının güven seviyesi zaten '%{current_trust_level}'. %{user_name} '%{current_trust_level}' seviyesinde kalacak - eğer seviyesini düşürmek istiyorsanız öncelikle güven seviyesini kilitlemelisiniz"
   rate_limiter:
-    slow_down: "Bu eylemi birçok sefer gerçekleştirdiniz, daha sonra tekrar deneyin."
-    too_many_requests: "Bu eylem için günlük limitinizi aştınız. Lütfen tekrar denemek için %{time_left} bekleyin. "
-    by_type:
-      first_day_replies_per_day: "Yeni bir kullanıcının ilk gününde verebileceği en fazla cevap sayısına ulaştınız. Lütfen tekrar denemek için %{time_left} bekleyin."
-      first_day_topics_per_day: "Yeni bir kullanıcının ilk gününde oluşturabileceği en fazla konu sayısına ulaştınız. Lütfen tekrar denemek için %{time_left} bekleyin."
-      create_topic: "Kısa sürede çok sayıda konu oluşturmaya çalıştınız. Lütfen tekrar denemeden önce %{time_left} bekleyin."
-      create_post: "Kısa sürede çok sayıda cevap yazmaya çalıştınız. Lütfen tekrar denemeden önce %{time_left} bekleyin."
-      delete_post: "Kısa sürede çok sayıda gönderi silmeye çalıştınız. Lütfen tekrar denemek için %{time_left} bekleyin."
-      topics_per_day: "Bugün oluşturabileceğiniz en fazla konu sayısına ulaştınız. Lütfen tekrar denemek için %{time_left} bekleyin."
-      pms_per_day: "Bugün oluşturabileceğiniz en fazla ileti sayısına ulaştınız. Lütfen tekrar denemek için %{time_left} bekleyin."
-      create_like: "Bugün yapabileceğiniz en fazla beğeni sayısına ulaştınız. Lütfen tekrar denemek için %{time_left} bekleyin."
-      create_bookmark: "Bugün yapabileceğiniz en fazla imleme sayısına ulaştınız. Lütfen tekrar denemek için %{time_left} bekleyin."
-      live_post_counts: "Canlı gönderi sayımları için çok hızlı istek yapıyorsunuz. Lütfen tekrar denemeden önce %{time_left} bekleyin."
-      unsubscribe_via_email: "Günlük e-posta ile abonelikten çıkma limitinizi aştınız. Lütfen tekrar denemeden önce %{time_left} bekleyin."
     hours:
-      other: "%{count} saat"
+      one: '%{count} saat'
+      other: '%{count} saat'
     minutes:
-      other: "%{count} dakika"
+      one: '%{count} dakika'
+      other: '%{count} dakika'
     seconds:
-      other: "%{count} saniye"
+      one: '%{count} saniye'
+      other: '%{count} saniye'
   datetime:
     distance_in_words:
       half_a_minute: "< 1dk"
       less_than_x_seconds:
-        other: "< %{count}sn"
+        one: < %{count}sn
+        other: < %{count}sn
       x_seconds:
-        other: "%{count}sn"
+        one: '%{count}sn'
+        other: '%{count}sn'
       less_than_x_minutes:
-        other: "< %{count}dk"
+        one: < %{count}dk
+        other: < %{count}dk
       x_minutes:
-        other: "%{count}dk"
+        one: '%{count}dk'
+        other: '%{count}dk'
       about_x_hours:
-        other: "%{count}sa"
+        one: '%{count}sa'
+        other: '%{count}sa'
       x_days:
-        other: "%{count}gün"
+        one: '%{count}gün'
+        other: '%{count}gün'
       about_x_months:
-        other: "%{count}ay"
+        one: '%{count}ay'
+        other: '%{count}ay'
       x_months:
-        other: "%{count}ay"
+        one: '%{count}ay'
+        other: '%{count}ay'
       about_x_years:
-        other: "%{count}yıl"
+        one: '%{count}yıl'
+        other: '%{count}yıl'
       over_x_years:
-        other: "> %{count}yıl"
+        one: '> %{count}yıl'
+        other: '> %{count}yıl'
       almost_x_years:
-        other: "%{count}yıl"
+        one: '%{count}yıl'
+        other: '%{count}yıl'
     distance_in_words_verbose:
-      half_a_minute: "şu anda"
+      half_a_minute: "hemen şimdi"
       less_than_x_seconds:
-        other: "hemen şimdi"
+        one: hemen şimdi
+        other: hemen şimdi
       x_seconds:
-        other: "%{count} saniye önce"
+        one: '%{count} saniye önce'
+        other: '%{count} saniye önce'
       less_than_x_minutes:
-        other: "son %{count} dakika içerisinde"
+        one: son %{count} dakika içerisinde
+        other: son %{count} dakika içerisinde
       x_minutes:
-        other: "%{count} dakika önce"
+        one: '%{count} dakika önce'
+        other: '%{count} dakika önce'
       about_x_hours:
-        other: "%{count} saat önce"
+        one: '%{count} saat önce'
+        other: '%{count} saat önce'
       x_days:
-        other: "%{count} gün önce"
+        one: '%{count} gün önce'
+        other: '%{count} gün önce'
       about_x_months:
-        other: "yaklaşık %{count} ay önce"
+        one: yaklaşık %{count} ay önce
+        other: yaklaşık %{count} ay önce
       x_months:
-        other: "%{count} ay önce"
+        one: '%{count} ay önce'
+        other: '%{count} ay önce'
       about_x_years:
-        other: "yaklaşık %{count} yıl önce"
+        one: yaklaşık %{count} yıl önce
+        other: yaklaşık %{count} yıl önce
       over_x_years:
-        other: "%{count} yıldan daha fazla önce"
+        one: '%{count} yıldan daha fazla önce'
+        other: '%{count} yıldan daha fazla önce'
       almost_x_years:
-        other: "neredeyse %{count} yıl önce"
+        one: neredeyse %{count} yıl önce
+        other: neredeyse %{count} yıl önce
   password_reset:
     no_token: "Üzgünüz, bu parola değiştirme bağlantısı çok eski. Yeni bir bağlantı almak için lütfen 'Giriş Yap' tuşuna basın ve 'Parolamı unuttum'u seçin."
     update: 'Parolayı Güncelle'
@@ -395,7 +419,7 @@ tr_TR:
       description: "Doğrulama için yeni adresine şimdi e-posta gönderiyoruz."
   activation:
     action: "Hesabınızı etkinleştirmek için buraya tıklayın"
-    already_done: "Üzgünüz, hesap doğrulama linki artık geçerli değil. Hesabınız zaten etkin olabilir mi?"
+    already_done: "Üzgünüz, hesap doğrulama bağlantısı artık geçerli değil. Hesabınız zaten etkin olabilir mi?"
     please_continue: "Hesabınız doğrulandı; şimdi ana sayfaya yönlendirileceksiniz."
     continue_button: "%{site_name} adresine devam edin"
     welcome_to: "%{site_name} topluluğuna hoş geldiniz!"
@@ -417,7 +441,6 @@ tr_TR:
       long_form: 'bunu uygunsuz olarak bildirdi'
     notify_user:
       title: '@{{username}} adlı kullanıcıya ileti gönder'
-      description: 'Bu kişiyle gönderisi hakkında doğrudan ve gizli olarak konuşmak istiyorum.'
       long_form: 'ileti gönderilen kullanıcı'
       email_title: '"%{title}" başlıklı gönderiniz'
       email_body: "%{link}\n\n%{message}"
@@ -489,9 +512,7 @@ tr_TR:
       xaxis: "Gün"
       yaxis: "Ziyaret sayısı"
     signups:
-      title: "Yeni Kullanıcılar"
       xaxis: "Gün"
-      yaxis: "Yeni kullanıcı sayısı"
     profile_views:
       title: "Kullanıcı Profil Görüntülemeleri"
       xaxis: "Gün"
@@ -529,7 +550,6 @@ tr_TR:
       xaxis: "Gün"
       yaxis: "E-posta Sayısı"
     user_to_user_private_messages:
-      title: "Kullanıcıdan kullanıcıya"
       xaxis: "Gün"
       yaxis: "İleti sayısı"
     system_private_messages:
@@ -575,7 +595,6 @@ tr_TR:
       title: "Arama botları"
       xaxis: "Gün"
     page_view_total_reqs:
-      title: "Toplam"
       xaxis: "Gün"
       yaxis: "Toplam Sayfa Görüntülemeleri"
     page_view_logged_in_mobile_reqs:
@@ -640,16 +659,13 @@ tr_TR:
   site_settings:
     censored_words: "kelime yerine otomatik olarak &#9632;&#9632;&#9632;&#9632; kullanılacak kelimeler"
     delete_old_hidden_posts: "30 günden fazla süreyle gizli kalan gizlenmiş gönderileri otomatik olarak sil."
-    default_locale: "Bu Discourse yüklemesinin  (ISO 639-1 Code) öntanımlı dili"
     allow_user_locale: "Kullanıcıların arayüz için kendi istedikleri dili seçmesine izin ver"
     set_locale_from_accept_language_header: "anonim kullanıcıların arayüz dilini tarayıcılarının dil başlığından al. (DENEYSELDİR, anonim önbellek ile çalışmaz)"
     min_post_length: "Gönderide olması gereken en az karakter sayısı"
     min_first_post_length: "İlk gönderi için (konu içi) izin verilen en az karakter sayısı"
-    min_private_message_post_length: "İleti gönderileri için izin verilen en az karakter sayısı"
     max_post_length: "Gönderide izin verilen en fazla karakter sayısı"
     min_topic_title_length: "Konuda olması gereken en az karakter sayısı"
     max_topic_title_length: "Konu başlığında izin verilen en fazla karakter sayısı"
-    min_private_message_title_length: "İleti başlıkları için izin verilen en az karakter sayısı"
     min_search_term_length: "Arama için girilecek kelimede olması gereken en az karakter sayısı"
     search_tokenize_chinese_japanese_korean: " CJK olmayan siteler dahil, -Çince/Japonca/Korece için aramayı bilgileri sıfırlamaya zorla"
     search_prefer_recent_posts: "Eğer büyük forumunuzda arama yavaş ise, bu seçenek daha yeni gönderilerin dizine eklenmesini deneyecek"
@@ -693,7 +709,6 @@ tr_TR:
     summary_likes_required: "'Bu Konuyu Özetle'nin etkinleştirilmesi için konuda olması gereken en az beğeni sayısı"
     summary_percent_filter: "Kullanıcı 'Bu Konuyu Özetle'ye tıkladığında, gönderinin ilk % kısmını göster"
     summary_max_results: "'Bu Konuyu Özetle'den dönen en fazla gönderi sayısı"
-    enable_private_messages: "Güven seviyesi 1'e(özel ileti göndermek için en az seviye ayarıyla belirlenebilir) sahip kullanıcıların ileti oluşturup cevaplamasına izin ver. Görevliler her durumda ileti gönderebilir."
     enable_long_polling: "Bildiri için kullanılan ileti yolu uzun sorgular yapabilir"
     long_polling_base_url: "Uzun sorgular için kullanılan baz URL (CDN dinamik içerik sunuyorsa, bunu origin olarak ayarladığına emin ol) ör: http://origin.site.com"
     long_polling_interval: "Gönderilecek bilgi olmadığı zaman sunucunun kullanıcılara geri dönmeden önce beklemesi gereken zaman (sadece giriş yapmış kullanıcın için)"
@@ -745,7 +760,6 @@ tr_TR:
     version_checks: "Discourse Hub'a sürüm güncellemeleri için haber yolla ve yeni versiyon iletilerine /admin gösterge panelinde yer ver"
     new_version_emails: "Discourse'un yeni sürümü çıktığında contact_email adresine e-posta gönder."
     invite_expiry_days: "Kullanıcı davet anahtarlarının geçerlilik süresi, gün olarak"
-    invite_passthrough_hours: "Daha önce kabul edilmiş davetiye anahtarının kullanım süresi, saat olarak"
     login_required: "Bu sitede içerik görüntülenebilmesi için kimlik doğrulamayı zorunlu kıl, isimsiz girişe izin verme."
     min_password_length: "Parolanın en az uzunluğu."
     min_admin_password_length: "Yönetici için parolanın en az uzunluğu."
@@ -758,7 +772,6 @@ tr_TR:
     sso_overrides_name: "SSO yararlı yükündeki dış sitedeki tam adı, her giriş yapıldığında, yerel değişiklikleri engellemek için yerel tam adın üzerine yazar."
     sso_overrides_avatar: "SSO yararlı yükündeki dış site avatarını kullanıcı avatarının üzerine yazar Eğer etkinleştirildiyse, allow_uploaded_avatars ayarının devre dışı bırakılması şiddetle önerilir"
     sso_not_approved_url: "Bu bağlantıya onaylanmamış SSO hesaplarını yönlendir."
-    enable_local_logins: "Yerel kullanıcı adı ve parola bazlı hesap girişlerini etkinleştir. (Not: davetiyelerin çalışabilmesi için bu ayarın etkinleştirilmesi gerekli)"
     allow_new_registrations: "Yeni kayıtlara izin ver. Yeni hesap oluşturulmasını engellemek için burayı işaretlemeyin."
     enable_signup_cta: "Geri dönen anonim kullanıcılara hesap oluşturmaları için bir uyarı göster."
     enable_yahoo_logins: "Yahoo doğrulamasını etkinleştir"
@@ -766,8 +779,6 @@ tr_TR:
     google_oauth2_client_id: "Google uygulamanıza ait Müşteri ID'si."
     google_oauth2_client_secret: "Google uygulamanıza ait client secret değeri."
     enable_twitter_logins: "Twitter doğrulamasını etkinleştir. twitter_consumer_key ve twitter_consumer_secret gereklidir"
-    twitter_consumer_key: "Twitter doğrulaması için gereken, http://dev.twitter.com adresinde kayıtlı consumer key"
-    twitter_consumer_secret: "Twitter doğrulaması için gereken, http://dev.twitter.com adresinde kayıtlı consumer secret"
     enable_instagram_logins: "Instagram doğrulamasını etkinleştir, instagram_consumer_key ve instagram_consumer_secret gereklidir"
     enable_facebook_logins: "Facebook doğrulamasını etkinleştir. facebook_app_id ve facebook_app_secret gerekir"
     facebook_app_id: "Facebook kimlik doğrulama için gerekli, https://developers.facebook.com/apps sayfasında bulunan app id"
@@ -779,7 +790,6 @@ tr_TR:
     allow_restore: "Geri almaya izin ver. Sitedeki TÜM verileri değiştirebilir! Bir yedeklemeyi geri yüklemeyi planlamıyorsanız devre dışı bırakın."
     maximum_backups: "Diskte tutulacak en fazla yedek sayısı. Eski yedekler otomatik olarak silinir."
     automatic_backups_enabled: "Yedek sıklığında tanımlandığı gibi otomatik yedek almayı çalıştır"
-    backup_frequency: "Hangi sıklıkta bir site yedeği oluştururuz, gün olarak."
     enable_s3_backups: "Tamamlanınca yedeklemeleri S3'e yükle. ÖNEMLİ: Dosyalar ayarında doğru S3 girilmesini gerektirir"
     s3_backup_bucket: "Yedeklemelerin yüklenmesi için uzak biriktirme yeri. UYARI: Özel bir biriktirme yeri olduğundan emin olun"
     s3_disable_cleanup: "Yerel olarak silinen yedeklerin S3 sunucularından silinmesini kapat"
@@ -798,7 +808,6 @@ tr_TR:
     max_bookmarks_per_day: "Kullanıcı başına düşen günlük en fazla imleme sayısı."
     max_edits_per_day: "Bir günde, bir kullanıcının yapabileceği en fazla düzenleme sayısı."
     max_topics_per_day: "Bir günde, bir kullanıcının oluşturabileceği en fazla konu sayısı."
-    max_private_messages_per_day: "Bir günde kullanıcıların oluşturabileceği en fazla ileti sayısı"
     max_invites_per_day: "Bir günde, bir kullanıcının yollayabileceği en fazla davet sayısı."
     max_topic_invitations_per_day: "Bir günde, bir kullanıcının yollayabileceği en fazla başlık daveti sayısı."
     categories_topics: "/categories sayfasında gösterilecek olan konu sayısı."
@@ -809,7 +818,6 @@ tr_TR:
     clean_orphan_uploads_grace_period_hours: "Artık yüklemeler kaldırılmadan önce tanınan süre (saat olarak)."
     purge_deleted_uploads_grace_period_days: "Silinen yüklemelerin kaldırılması için tanınan süre (gün olarak)."
     enable_s3_uploads: "Yüklemeleri Amazon S3 belleklerinde sakla. ÖNEMLİ: Doğru S3 bilgileri (erişim anahtarı id & gizli erişim anahtarı) gerektirir"
-    s3_use_iam_profile: 'Anahtarları almak için AWS EC2 IAM rolünü kullan. NOT: Etkinleştirilmesi "s3 access key id" and "s3 secret access key" ayarlarının üzerine yazacaktır.'
     s3_upload_bucket: "Dosyaların yükleneceği Amazon S3 biriktirme yeri adı. DİKKAT: büyük harfler, nokta ve altçizgi karakterleri kullanılmamalı."
     s3_access_key_id: "Resimleri yüklemek için kullanılacak olan Amazon S3 access key id."
     s3_secret_access_key: "Resimleri yüklemek için kullanılacak olan Amazon S3 secret access key."
@@ -848,7 +856,6 @@ tr_TR:
     min_trust_to_edit_wiki_post: "Wiki olarak işaretlenmiş bir gönderiyi düzenleyebilmek için gereken en az güven seviyesi."
     min_trust_to_edit_post: "Gönderilerin düzenlenebilmesi için gereken en düşük güven seviyesi."
     min_trust_to_allow_self_wiki: "Kullanıcının kendi wiki gönderisini oluşturabilmesi için gereken güven seviyesi."
-    min_trust_to_send_messages: "Özel bir ileti oluşturabilmek için gerekli olan güven seviyesi."
     newuser_max_links: "Yeni bir kullanıcının bir gönderiye ekleyebileceği bağlantı sayısı."
     newuser_max_images: "Yeni bir kullanıcının bir gönderiye ekleyebileceği resim sayısı."
     newuser_max_attachments: "Yeni bir kullanıcının bir gönderiye ekleyebileceği dosya sayısı."
@@ -976,7 +983,6 @@ tr_TR:
     enforce_square_emoji: "Tüm emojileri kare en-boy oranına zorla"
     approve_unless_trust_level: "Bu güven seviyesi altındaki kullanıcılardan gelen gönderilerin onaylanması gerekir"
     default_email_digest_frequency: "Öntanımlı olarak kullanıcılar ne sıklıkla e-posta özeti alacak."
-    default_email_private_messages: "Öntanımlı olarak birisi bir kullanıcıya ileti attığında e-posta gönder."
     default_email_direct: "Öntanımlı olarak birisi bir kullanıcı hakkında alıntı yapma, cevaplama, bahsetme ya da davet etme eylemlerini gerçekleştirdiğinde e-posta gönder."
     default_email_mailing_list_mode: "Öntanımlı olarak her yeni gönderi için bir e-posta gönder."
     disable_mailing_list_mode: "Kullanıcıların duyuru listesi modunu etkinleştirmesini engelle."
@@ -1001,7 +1007,6 @@ tr_TR:
     max_tag_search_results: "Etiketler için arama yapılırken gösterilecek en fazla sonuç."
     tags_sort_alphabetically: "Etiketleri harf sırasına göre sırala. Öntanımlı olarak gözdelik seviyesine göre gösterilir."
     tag_style: "Etiket rozetleri için görsel biçim."
-    staff_tags: "Yalnızca görevli kişiler tarafından kullanılabilecek etiket listesi"
     min_trust_level_to_tag_topics: "Konulara etiket eklemek için gereken en az güven seviyesi."
     suppress_overlapping_tags_in_list: "Eğer etiketler konu ismi içerisinde tam kelime olarak bulunuyorsa, etiketi gösterme"
     company_short_name: "Firma İsmi (kısa)"
@@ -1042,15 +1047,18 @@ tr_TR:
     not_seen_in_a_month: "Hoş geldiniz! Bir süredir yoktunuz. Bunlar sizin yokluğunuzda en gözde olan konular."
   merge_posts:
     edit_reason:
-      other: "%{count} gönderi %{username} tarafından birleştirildi"
+      one: '%{count} gönderi %{username} tarafından birleştirildi'
+      other: '%{count} gönderi %{username} tarafından birleştirildi'
     errors:
       different_topics: "Farklı konulara ait gönderiler birleştirilemez."
       different_users: "Farklı kullanıcılara ait gönderiler birleştirilemez."
   move_posts:
     new_topic_moderator_post:
-      other: "%{count} gönderi yeni bir konu için ayıklandı: %{topic_link}"
+      one: '%{count} gönderi yeni bir konu için ayıklandı: %{topic_link}'
+      other: '%{count} gönderi yeni bir konu için ayıklandı: %{topic_link}'
     existing_topic_moderator_post:
-      other: "%{count} gönderi var olan bir konu içinde birleştirildi: %{topic_link}"
+      one: '%{count} gönderi var olan bir konu içinde birleştirildi: %{topic_link}'
+      other: '%{count} gönderi var olan bir konu içinde birleştirildi: %{topic_link}'
   change_owner:
     post_revision_text: "Sahiplik %{old_user} hesabından %{new_user} hesabına aktarıldı"
     deleted_user: "silinmiş kullanıcı"
@@ -1060,21 +1068,29 @@ tr_TR:
     closed_enabled: "Konu şimdi kapatıldı. Artık yeni cevap yazılmasına izin yok. "
     closed_disabled: "Konu şimdi açıldı. Yeni cevaplara izin var."
     autoclosed_message_max_posts:
-      other: "Bu ileti %{count} olan en fazla cevap limitini aştığı için otomatik olarak kapatıldı."
+      one: Bu ileti %{count} olan en fazla cevap limitini aştığı için otomatik olarak kapatıldı.
+      other: Bu ileti %{count} olan en fazla cevap limitini aştığı için otomatik olarak kapatıldı.
     autoclosed_topic_max_posts:
-      other: "Bu konu %{count} olan en fazla cevap limitini aştığı için otomatik olarak kapatıldı."
+      one: Bu konu %{count} olan en fazla cevap limitini aştığı için otomatik olarak kapatıldı.
+      other: Bu konu %{count} olan en fazla cevap limitini aştığı için otomatik olarak kapatıldı.
     autoclosed_enabled_days:
-      other: "Bu konu %{count} gün sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor."
+      one: Bu konu %{count} gün sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor.
+      other: Bu konu %{count} gün sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor.
     autoclosed_enabled_hours:
-      other: "%{count} saat sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor."
+      one: '%{count} saat sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor.'
+      other: '%{count} saat sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor.'
     autoclosed_enabled_minutes:
-      other: "%{count} dakika sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor."
+      one: '%{count} dakika sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor.'
+      other: '%{count} dakika sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor.'
     autoclosed_enabled_lastpost_days:
-      other: "Bu konu son cevaptan %{count} gün sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor."
+      one: Bu konu son cevaptan %{count} gün sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor.
+      other: Bu konu son cevaptan %{count} gün sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor.
     autoclosed_enabled_lastpost_hours:
-      other: "Bu konu son cevaptan %{count} saat sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor."
+      one: Bu konu son cevaptan %{count} saat sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor.
+      other: Bu konu son cevaptan %{count} saat sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor.
     autoclosed_enabled_lastpost_minutes:
-      other: "Bu konu son cevaptan %{count} dakika sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor."
+      one: Bu konu son cevaptan %{count} dakika sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor.
+      other: Bu konu son cevaptan %{count} dakika sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor.
     autoclosed_disabled: "Konu şimdi açıldı. Yeni cevaplara izin var."
     autoclosed_disabled_lastpost: "Konu şimdi açıldı. Yeni cevaplara izin var."
     pinned_enabled: "Bu konu başa tutturuldu. Görevli tarafından herkes için ya da kullanıcı tarafından kendisi için baştan kaldırılmadığı sürede bulunduğu kategorinin en üstünde yer alacak."
@@ -1122,7 +1138,8 @@ tr_TR:
       max_new_accounts_per_registration_ip: "Mevcut IP adresiniz üzerinden yeni kayıt işlemine izin verilmiyor. (Belirlenen sınır aşıldı.) Bir görevli ile iletişime geçin."
   flags_reminder:
     subject_template:
-      other: "İlgilenilmesi gereken %{count} bildirim var"
+      one: İlgilenilmesi gereken %{count} bildirim var
+      other: İlgilenilmesi gereken %{count} bildirim var
   unsubscribe_mailer:
     subject_template: "%{site_title} üzerinden daha fazla e-posta güncellemesi almak istemediğinizi onaylayın"
   invite_password_instructions:
@@ -1192,8 +1209,6 @@ tr_TR:
       text_body_template: "Toplu davet dosyanız işlendi, %{sent} davetiye gönderildi. "
     bulk_invite_failed:
       subject_template: "Toplu davet gönderiminde hata oluştu"
-    csv_export_succeeded:
-      subject_template: "Dışarı veri aktarımı tamamlandı"
     csv_export_failed:
       subject_template: "Dışarı veri aktarımı başarısız oldu"
     email_reject_empty:
@@ -1212,7 +1227,8 @@ tr_TR:
       subject_template: "Yeni hesap askıda"
     pending_users_reminder:
       subject_template:
-        other: "%{count} kullanıcı onay bekliyor"
+        one: '%{count} kullanıcı onay bekliyor'
+        other: '%{count} kullanıcı onay bekliyor'
       text_body_template: |
         Bu foruma giriş yapabilmek için onayınızı (ya da reddinizi) bekleyen yeni kullanıcı kayıtları var.
 
@@ -1354,7 +1370,7 @@ tr_TR:
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
-        %{message}
+          %{message}
     digest:
       why: "%{last_seen_at} tarihindeki son girişinizden beri %{site_link} sitesine olanların kısa bir özeti"
       since_last_visit: "Son ziyaretinizden bu yana"
@@ -1446,22 +1462,22 @@ tr_TR:
         Bu rozet gönderilerinizden birini düzenlediğinizde verilecektir. Gönderilerinizi düzenlemek her zaman için iyidir — gönderilerinizi geliştirebilir, küçük hataları düzeltebilir, ya da unuttuğunuz ayrıntıları ekleyebilirsiniz. Daha iyi gönderi oluşturabilmek için düzenleyin.
     basic_user:
       name: Acemi
-      description: Bütün esas forum uygulamalarını kullanabilmeye <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">hak kazanılmıştır</a>
+      description: "Bütün esas forum uygulamalarını kullanabilmeye <a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">hak kazanılmıştır</a>"
       long_description: |
         Bu rozet 1. güven seviyesine ulaştığın için verildi. Forumda neler olduğunu takip ettiğin için ve konuları okuduğun için teşekkürler. Artık yeni özelliklere sahipsin; özel iletiler, bildirme, düzenleme, ve çoklu resim ve bağlantı paylaşabilme gibi.
     member:
       name: Üye
-      description: Davetler, grup iletileri, ve daha fazla beğeni <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">hakkı kazanılmıştır</a>
+      description: "Davetler, grup iletileri, ve daha fazla beğeni <a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">hakkı kazanılmıştır</a>"
       long_description: |
         Bu rozet 2. güven seviyesine ulaştığın için verildi. Birkaç haftadır aramızda zaman geçirdiğin için teşekkürler. Artık kullanıcı sayfandan ya da konu sayfandan davetler gönderebilirsin, kişisel grup iletileri oluşturabilirsin ve günlük daha fazla beğeni yapabilirsin.
     regular:
       name: Müdavim
-      description: Yeniden kategorize etme, yeniden isimlendirme, takip edilen bağlantılar, ve daha fazla beğeni <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">hakkı kazanılmıştır</a>
+      description: "Yeniden kategorize etme, yeniden isimlendirme, takip edilen bağlantılar, ve daha fazla beğeni <a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">hakkı kazanılmıştır</a>"
       long_description: |
         Bu rozet 3. güven seviyesine ulaştığın için verildi. Bir kaç aydır düzenli katılımcımız olduğun için teşekkür ederiz. Forumumuzun en etkin okuyucularından ve güvenilir katılımcılarından birisisin. Artık konuları tekrar kategorize edip, isimlendirebilirsin, bazı özel alanlara da girebilirsiniz ve günlük daha fazla beğeni yapabilirsin.
     leader:
       name: Lider
-      description: Genel düzenleme, başa tutturma, kapama, arşivleme, ayırma ve birleştirme, daha fazla beğeni <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">hakkı kazanılmıştır</a>
+      description: "Genel düzenleme, başa tutturma, kapama, arşivleme, ayırma ve birleştirme, daha fazla beğeni <a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">hakkı kazanılmıştır</a>"
       long_description: |
         Bu rozet 4. güven seviyesine ulaştığın için verildi. Forumda yönetim tarafından seçilmiş bir lidersiniz ve yaptığınız paylaşımlarla diğer üyelere örnek oluyorsunuz. Bütün gönderileri düzenleme hakkına sahipsiniz. Moderatörlerin yapabileceği, başa tutturma, kapama, arşivleme, ayırma ve birleştirme gibi işlemleri yapabilirsiniz. Artık günlük çok daha fazla beğeni yapabilirsiniz.
     welcome:
@@ -1473,7 +1489,7 @@ tr_TR:
       name: Güncel Profil
     anniversary:
       name: Yıldönümü
-      description: Bir sene içerisinde, en az bir kere gönderi yazmış etkin üye
+      description: "Bir sene içerisinde, en az bir kere gönderi yazmış etkin üye"
       long_description: |
         Bu rozet en az bir gönderi yazarak bir yıllık üyeliğinizi tamamladığınız için size verilmiştir. Forumda zaman geçirdiğiniz ve bizlere katkıda bulunduğunuz için teşekkür ederiz. Sizler olmasanız yapamazdık.
     nice_post:
@@ -1517,7 +1533,7 @@ tr_TR:
       long_description: |
         Bu rozeti paylaştığınız bağlantı forum dışından 300 kişi tarafından tıklandığı için kazandınız. Çok iyi iş başardın! Paylaşımların daha fazla kişiye ulaşmasını ve forumun gelişmesini sağladın.
     great_share:
-      name: 'Muhteşem Paylaşım '
+      name: "Muhteşem Paylaşım "
       description: Bir gönderiniz 1000 tekil ziyaretci tarafından paylaşıldı
       long_description: |
         Bu rozeti paylaştığınız bağlantı forum dışından 1000 kişi tarafından tıklandığı için kazandınız.Süper! Tartışmayı çok büyük kitlelere ulaştırdın ve forumun büyümesine muhteşem bir katkı yaptın.
@@ -1534,8 +1550,6 @@ tr_TR:
     promoter:
       name: Destekçi
       description: Kullanıcı davet etme
-      long_description: |
-        Bu rozet kullanıcı sayfanızdan ya da konularının altındaki düğmeden başka birini forumu kullanmaya davet ettiğiniz için verilmiştir. Arkadaşlarınızı ilgilerini çekebilecek konulara davet etmek forumun büyümesi için mükemmel bir yoldur. Teşekkürler!
     campaigner:
       name: Mücadeleci
       description: 3 Acemi kullanıcı davet edildi
@@ -1603,22 +1617,22 @@ tr_TR:
         Bu rozet günlük 50 beğeni hakkınızı kullandığınız için verilmiştir.
     higher_love:
       name: Yüksek Beğeni
-      description: '5 gün boyunca, günde 50 beğeni hakkını kullanma '
+      description: "5 gün boyunca, günde 50 beğeni hakkını kullanma "
       long_description: |
         Bu rozet 5 gün boyunca 50 beğeni hakkınızı kullandığınız için verilmiştir. Diğer kullanıcıların paylaşımlarını beğenerek onları cesaretlendirdiğiniz için teşekkür ederiz.
     crazy_in_love:
       name: Beğeni Delisi
-      description: '20 gün boyunca, günde 50 beğeni hakkını kullanma '
+      description: "20 gün boyunca, günde 50 beğeni hakkını kullanma "
       long_description: |
         Bu rozet 20 gün boyunca 50 beğeni hakkınızı kullandığınız için verilmiştir. Süper! Diğer üyelere tam bir örneksin. Tebrik ederiz!
     thank_you:
       name: Teşekkürler
-      description: '20 beğeni sahibi olma ve 10 beğenme '
+      description: "20 beğeni sahibi olma ve 10 beğenme "
       long_description: |
         Bu rozet 20 beğenilmiş gönderi sahibi olduğunuz ve bunun karşılığında 10 ya da daha fazla beğeni yaptığınızdan dolayı size verilmiştir.
     gives_back:
       name: Beğenilip Beğenme
-      description: '100 beğeni sahibi olma ve 100 beğenme '
+      description: "100 beğeni sahibi olma ve 100 beğenme "
       long_description: |
         Bu rozet 100 beğenilmiş gönderi sahibi olduğunuz ve bunun karşılığında 100 ya da daha fazla beğeni yaptığınızdan dolayı size verilmiştir. Teşekkür ederiz!
     empathetic:
@@ -1628,12 +1642,10 @@ tr_TR:
         Bu rozet 500 beğenilmiş gönderisahibi olduğunuz ve bunun karşılığında 1000 ya da daha fazla beğeni yaptığınızdan dolayı size verilmiştir. Süper! Cömetliğin ve takdirin örneğisin :two_hearts:.
     first_emoji:
       name: İlk Emoji
-      description: 'Bir gönderide emoji kullanma '
-      long_description: |
-        Bu rozet gönderinize ilk defa bir emoji eklediğiniz için verilmiştir :thumbsup:.
+      description: "Bir gönderide emoji kullanma "
     first_mention:
       name: İlk Bahsetme
-      long_description: Bu rozet ilk defa gönderinizde başka bir kullanıcıdan bahsettiğiniz için verilmiştir. Her bahsetme bahsi geçen kullanıcıya bildirim gitmesini sağlar, böylece bu kullanıcı sizin gönderinizden haberdar olur. Sadece bahsi geçen kullanıcı adına @ gerekir.
+      long_description: "Bu rozet ilk defa gönderinizde başka bir kullanıcıdan bahsettiğiniz için verilmiştir. Her bahsetme bahsi geçen kullanıcıya bildirim gitmesini sağlar, böylece bu kullanıcı sizin gönderinizden haberdar olur. Sadece bahsi geçen kullanıcı adına @ gerekir."
     first_onebox:
       name: İlk Kutulama
       description: Kutulanmış bir bağlantı gönderdi
@@ -1643,7 +1655,6 @@ tr_TR:
         Bu rozet ilk defa bir gönderiye mail yoluyla cevap verdiğiniz için verilmiştir :e-mail:.
   admin_login:
     success: "E-posta Gönderildi"
-    error: "Hata!"
     email_input: "Yönetici e-postası"
     submit_button: "E-posta Gönder"
   performance_report:
@@ -1682,10 +1693,10 @@ tr_TR:
         fields:
           title:
             label: "Topluluğunuzun ismi"
-            placeholder: "Oktay'ın Yeri"
+            placeholder: "Ali'nin Yeri"
           site_description:
             label: "Topluluğunuzu kısa bir cümle ile tanımlayın"
-            placeholder: "Oktay ve arkadaşlarının ilginç şeyleri tartışabilecekleri bir yer"
+            placeholder: "Ali ve arkadaşlarının ilginç şeyleri tartışabilecekleri bir yer"
       introduction:
         title: "Tanıtım"
         fields:
@@ -1765,6 +1776,3 @@ tr_TR:
         title: "Görevli Davet Et"
       finished:
         title: "Discourse'unuz hazır! "
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml
index 29794e94403..daacd8082f1 100644
--- a/config/locales/server.uk.yml
+++ b/config/locales/server.uk.yml
@@ -10,6 +10,8 @@ uk:
     short_date_no_year: "D MMM"
     short_date: "D MMM, YYYY"
     long_date: "MMMM D, YYYY h:mma"
+  date:
+    month_names: [~, "", "", "", "", "", "", "", "", "", "", "", ""]
   title: "Discourse"
   topics: "Теми"
   posts: "дописи"
@@ -27,14 +29,18 @@ uk:
       not_a_number: це не цифра
       not_an_integer: має бути цілим числом
       too_long:
-        one: надто довге (максимум 1 символ)
         few: надто довге (максимум %{count} символів)
+        many: надто довге (максимум %{count} символів)
+        one: надто довге (максимум 1 символ)
         other: надто довге (максимум %{count} символів)
       other_than: "має бути іншим ніж %{count}"
     template:
       body: 'Проблеми на цих полях:'
     embed:
       load_from_remote: "Під час завантаження допису виникла проблема."
+  activemodel:
+    errors:
+      <<: *errors
   backup:
     operation_already_running: "An operation is currently running. Can't start a new job right now."
     backup_file_should_be_tar_gz: "The backup file should be a .tar.gz archive."
@@ -47,31 +53,36 @@ uk:
     start_discussion: "Розпочати Дискусію"
     continue: "Продовжити Дискусію"
     more_replies:
-      one: "1 більше відповідей"
-      few: "%{count} більше відповідей"
-      other: "%{count} більше відповідей"
+      few: '%{count} більше відповідей'
+      many: '%{count} більше відповідей'
+      one: 1 більше відповідей
+      other: '%{count} більше відповідей'
     loading: "Завантаження обговорення..."
     permalink: "Постійне посилання"
     imported_from: "Discussion topic for the original blog entry at: %{link}"
     replies:
-      one: "1 відповідь"
-      few: "%{count} відповідей"
-      other: "%{count} відповідей"
+      few: '%{count} відповідей'
+      many: '%{count} відповідей'
+      one: 1 відповідь
+      other: '%{count} відповідей'
   no_images_allowed: "Даруйте, нові користувачі не можуть вставляти зображення в дописи."
   too_many_images:
-    one: "Даруйте, нові користувачі можуть вставляти тільки одне зображення в допис."
-    few: "Даруйте, нові користувачі можуть вставляти тільки %{count} зображень в допис."
-    other: "Даруйте, нові користувачі можуть вставляти тільки %{count} зображень в допис."
+    few: Даруйте, нові користувачі можуть вставляти тільки %{count} зображень в допис.
+    many: Даруйте, нові користувачі можуть вставляти тільки %{count} зображень в допис.
+    one: Даруйте, нові користувачі можуть вставляти тільки одне зображення в допис.
+    other: Даруйте, нові користувачі можуть вставляти тільки %{count} зображень в допис.
   no_attachments_allowed: "Даруйте, нові користувачі не можуть вставляти прикріплення в дописи."
   too_many_attachments:
-    one: "Даруйте, нові користувачі можуть вставляти тільки одне прикріплення в допис."
-    few: "Даруйте, нові користувачі можуть вставляти тільки %{count} прикріплень в допис."
-    other: "Даруйте, нові користувачі можуть вставляти тільки %{count} прикріплень в допис."
+    few: Даруйте, нові користувачі можуть вставляти тільки %{count} прикріплень в допис.
+    many: Даруйте, нові користувачі можуть вставляти тільки %{count} прикріплень в допис.
+    one: Даруйте, нові користувачі можуть вставляти тільки одне прикріплення в допис.
+    other: Даруйте, нові користувачі можуть вставляти тільки %{count} прикріплень в допис.
   no_links_allowed: "Даруйте, нові користувачі не можуть вставляти посилання в дописи."
   too_many_links:
-    one: "Даруйте, нові користувачі можуть вставляти тільки одне посилання в допис."
-    few: "Даруйте, нові користувачі можуть вставляти тільки %{count} посилань в допис."
-    other: "Даруйте, нові користувачі можуть вставляти тільки %{count} посилань в допис."
+    few: Даруйте, нові користувачі можуть вставляти тільки %{count} посилань в допис.
+    many: Даруйте, нові користувачі можуть вставляти тільки %{count} посилань в допис.
+    one: Даруйте, нові користувачі можуть вставляти тільки одне посилання в допис.
+    other: Даруйте, нові користувачі можуть вставляти тільки %{count} посилань в допис.
   spamming_host: "Даруйте, Ви не можете вставити посилання на цей хост."
   topic_not_found: "Щось пішло не так. Можливо цей допис було закрито або видалено, під час того як ви його переглядали?"
   just_posted_that: "це дуже схоже на те, що ви нещодавно дописували"
@@ -90,7 +101,6 @@ uk:
     latest: "Останні теми"
     hot: "Гарячі теми"
     posts: "Останні дописи"
-    private_posts: "Останні приватні повідомлення"
     group_posts: "Останні дописи від %{group_name}"
     user_posts: "Останні дописи @%{username}"
     user_topics: "Останні теми @%{username}"
@@ -117,6 +127,7 @@ uk:
       user_profile:
         bio_raw: "Про мене"
     errors:
+      <<: *errors
       models:
         user:
           attributes:
@@ -126,7 +137,6 @@ uk:
           attributes:
             payload_url:
               invalid: "Хибний URL. URL має містити http:// або https://. І пробіли не дозволяються."
-      <<: *errors
   user_profile:
     no_info_other: "<div class='missing-profile'>%{name} hasn't entered anything in the About Me field of their profile yet</div>"
   vip_category_description: "A category exclusive to members with trust level 3 and higher."
@@ -144,28 +154,31 @@ uk:
     member:
       title: "учасник"
   rate_limiter:
-    too_many_requests: "У нас є обмеження щодо того, скільки разів за добу можна виконати цю дію. Будь ласка, зачекайте %{time_left} перед тим, як спробувати ще раз."
     hours:
-      one: "1 година"
-      few: "%{count} години"
-      other: "%{count} годин"
+      few: '%{count} години'
+      many: '%{count} годин'
+      one: 1 година
+      other: '%{count} годин'
     minutes:
-      one: "1 хвилина"
-      few: "%{count} хвилини"
-      other: "%{count} хвилин"
+      few: '%{count} хвилини'
+      many: '%{count} хвилин'
+      one: 1 хвилина
+      other: '%{count} хвилин'
     seconds:
-      one: "1 секунда"
-      few: "%{count} секунди"
-      other: "%{count} секунд"
+      few: '%{count} секунди'
+      many: '%{count} секунд'
+      one: 1 секунда
+      other: '%{count} секунд'
   datetime:
     distance_in_words:
       half_a_minute: "< 1 хв"
     distance_in_words_verbose:
       half_a_minute: "щойно"
       x_seconds:
-        one: "1 секунда тому"
-        few: "%{count} секунд тому"
-        other: "%{count} секунд тому"
+        few: '%{count} секунд тому'
+        many: '%{count} секунд тому'
+        one: 1 секунда тому
+        other: '%{count} секунд тому'
   password_reset:
     update: 'Оновити пароль'
     save: 'Встановити пароль'
@@ -226,7 +239,6 @@ uk:
       yaxis: "Кількість відвідин"
     signups:
       xaxis: "День"
-      yaxis: "Кількість нових користувачів"
     topics:
       title: "Теми"
       xaxis: "День"
@@ -260,7 +272,6 @@ uk:
       xaxis: "День"
       yaxis: "Кількість листів"
     user_to_user_private_messages:
-      title: "Користувач користувачу"
       xaxis: "День"
     system_private_messages:
       title: "Системні"
@@ -300,7 +311,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>.'
     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>.'
   site_settings:
-    default_locale: "Мова за замовчуванням для цього екземпляра Discourse (Код ISO 639-1)"
     allow_user_locale: "Allow users to choose their own language interface preference"
     min_search_term_length: "Мінімальна дозволена довжина пошукової фрази у символах"
     allow_duplicate_topic_titles: "Дозволити теми з однаковими, дублюючими назвами."
@@ -318,8 +328,6 @@ uk:
     min_password_length: "Мінімальна довжина пароля."
     enable_yahoo_logins: "Увімкнути вхід через Yahoo"
     enable_twitter_logins: "Увімкнути вхід через Twitter; потребує twitter_consumer_key та twitter_consumer_secret"
-    twitter_consumer_key: "Consumer key для входу через Twitter, зареєстрований на http://dev.twitter.com"
-    twitter_consumer_secret: "Consumer secret для входу через Twitter, зареєстрований на http://dev.twitter.com"
     enable_facebook_logins: "Увімкнути вхід через Facebook; потребує facebook_app_id та facebook_app_secret"
     facebook_app_id: "App id для входу через Facebook, зареєстрований на https://developers.facebook.com/apps"
     facebook_app_secret: "App secret для входу через Facebook, зареєстрований на https://developers.facebook.com/apps"
@@ -454,6 +462,3 @@ uk:
   edit_this_page: "Редагувати цю сторінку"
   guidelines_topic:
     title: "ЧаПи/Інструкції"
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.ur.yml b/config/locales/server.ur.yml
index ffdc57e4272..c68947603c9 100644
--- a/config/locales/server.ur.yml
+++ b/config/locales/server.ur.yml
@@ -6,13 +6,3352 @@
 # https://www.transifex.com/projects/p/discourse-org/
 
 ur:
+  dates:
+    short_date_no_year: "D MMM"
+    short_date: "D MMM, YYYY"
+    long_date: "MMMM D, YYYY h:mma"
+  datetime_formats: &datetime_formats
+    formats:
+      short: "%m-%d-%Y"
+      short_no_year: "%B %-d"
+      date_only: "%B %-d, %Y"
+      long: "%B %-d, %Y, %l:%M%P"
+  date:
+    month_names: [~, "", "", "", "", "", "", "", "", "", "", "", ""]
+    <<: *datetime_formats
+  time:
+    <<: *datetime_formats
+    am: "am"
+    pm: "pm"
   title: "ڈسکورس"
+  topics: "ٹاپک"
+  posts: "پوسٹ`"
+  loading: "لوڈ ہو رہا ہے"
+  powered_by_html: '<a href="https://www.discourse.org">ڈِسکورس</a>کے مرہونِ مِنَّت، جاوااسکرپٹ کے ساتھ بہترین نظر آئے گا'
+  log_in: "لاگ اِن"
+  submit: "شائع"
+  purge_reason: "ترک کردہ، غیر فعال اکاؤنٹ کے طور پر خود کار طریقے سے حذف کر دیا گیا"
+  disable_remote_images_download_reason: "ریمَوٹ تصاویر کا ڈاؤن لوڈ غیر فعال کردیا گیا تھا کیونکہ ڈِسک میں کافی جگہ دستیاب نہیں تھی۔"
+  anonymous: "گمنام"
+  remove_posts_deleted_by_author: "مصنف کی طرف سے حذف کر دیا گیا"
+  redirect_warning: "ہم تصدیق نہ کر سکے کہ آپ کا منتخب کردہ لِنک اصل میں فورم پر شائع کیا گیا تھا کہ نہیں۔ اگر آپ پھر بھی آگے بڑھنا چاہتے ہیں، تو نیچے دیئے گئے لِنک کو منتخب کریں۔"
+  themes:
+    bad_color_scheme: "تِھیم اَپ ڈَیٹ نہیں ہو سکی، غلط رنگ سکیم"
+    other_error: "تِھیم اَپ ڈَیٹ کرتے ہوے کچھ غلط ہو گیا"
+    error_importing: "گِٹ رِیپَوزِٹَری کلَون کرنے میں خرابی، رسائی کی اجازت نہیں یا رِیپَوزِٹَری موجود نہیں ہے"
+    settings_errors:
+      invalid_yaml: "فراہم کردہ YAML غلط ہے۔"
+      data_type_not_a_number: "ترتیب `%{name}` کی قسم کی اجازت نہیں ہے۔ اجازت یافتہ اقسام `integer'،` bool`، `list` اور `enum` ہیں"
+      name_too_long: "بہت طویل نام کے ساتھ ایک ترتیب موجود ہے۔ زیادہ سے زیادہ لمبائی 255 ہے"
+      default_value_missing: "ترتیب `%{name}` کی کوئی ڈِیفالٹ قدر نہیں ہے"
+      default_not_match_type: "ترتیب `%{name}` کی ڈِیفالٹ قدر کی قِسم، ترتیب قِسم سے مَیچ نہیں کرتی۔"
+      default_out_range: "ترتیب `%{name}` کی ڈِیفالٹ قدر مخصوص رَینج میں نہیں ہے۔"
+      enum_value_not_valid: "منتخب کردہ قدر enum انتخاب میں سے ایک نہیں ہے۔"
+      number_value_not_valid: "نئی قدر اجازت یافتہ رَینج کے اندر نہیں ہے۔"
+      number_value_not_valid_min_max: "یہ %{min} اور %{max} کے درمیان ہونی ضروری ہے۔"
+      number_value_not_valid_min: "اِس کا %{min} سے زیادہ یا اِس کے برابر ہونا لازمی ہے۔"
+      number_value_not_valid_max: "اِس کا %{max} سے کم یا اِس کے برابر ہونا لازمی ہے۔"
+      string_value_not_valid: "نئی قدر کی لمبائی اجازت یافتہ رَینج کے اندر نہیں ہے۔"
+      string_value_not_valid_min_max: "اِس کا %{min} اور %{max} حروف لمبائی کے درمیان ہونا لازمی ہے۔"
+      string_value_not_valid_min: "کم از کم %{min} حروف لمبا ہونا لازمی ہے۔"
+      string_value_not_valid_max: "زیادہ سے زیادہ %{min} حروف لمبا ہونا لازمی ہے۔"
+  emails:
+    incoming:
+      default_subject: "یہ ٹاپک کو ایک عنوان کی ضرورت ہے"
+      show_trimmed_content: "کٹا ہوا مواد دکھائیں"
+      maximum_staged_user_per_email_reached: "فی اِی میل بنائے گئے سٹَیجڈ صارفین کی زیادہ سے زیادہ تعداد تک پہنچ گئے ہیں۔"
+      no_subject: "(کوئی موضوع نہیں)"
+      no_body: "(کوئی مواد نہیں)"
+      errors:
+        empty_email_error: "ہو جاتا ہے جب موصول ہونے والی راء میل خالی ہوتی ہے۔"
+        no_message_id_error: "ہو جاتا ہے جب میل کا 'Message-Id' ہیڈر نہ ہو۔"
+        auto_generated_email_error: "جب 'precedence' ہیڈر سَیٹ کیا جائے: list ،junk ،bulk یا auto_reply، پر یا جب کسی اور ہیڈر میں شامل ہو: auto-submitted ،auto-replied یا auto-generated۔"
+        no_body_detected_error: "ہو جاتا ہے جب ہم متن کو نکال نہ سکیں اور کوئی اٹَیچمنٹس نہ ہوں۔"
+        no_sender_detected_error: "ہو جاتا ہے جب ہم فرام ہیڈر میں ایک درست ای میل ایڈریس نہ تلاش کر سکیں۔"
+        inactive_user_error: "ہو جاتا ہے جب بھیجنے والا سرگرم نہ ہو۔"
+        silenced_user_error: "ہو جاتا ہے جب بھیجنے والا خاموش کیا گیا ہو۔"
+        bad_destination_address: "ہو جاتا ہے جب To/Cc/Bcc فیلڈز میں کوئی بھی ای میل ایڈریس ترتیب کردہ آنے والے ای میل ایڈریسوں سے مَیچ نہ کرے۔"
+        strangers_not_allowed_error: "ہو جاتا ہے جب کسی صارف نے ایک ایسے زُمرہ میں نیا ٹاپک بنانے کی کوشش کی ہو جس کا وہ رکن نہ ہوں۔"
+        insufficient_trust_level_error: "ہو جاتا ہے جب کسی صارف نے ایک ایسے زُمرہ میں نیا ٹاپک بنانے کی کوشش کی ہو جس پر اُن کے پاس مطلوبہ ٹرسٹ لَیول نہ ہو۔"
+        reply_user_not_matching_error: "ہو جاتا ہے جب جواب ایک ایسے ای میل ایڈریس سے آیا ہو جو اطلاع بھیجے جانے والے ایڈریس سے مختلف ہو۔"
+        topic_not_found_error: "ہو جاتا ہے جب جواب آجائے لیکن متعلقہ ٹاپک حذف کر دیا گیا ہو۔"
+        topic_closed_error: "ہو جاتا ہے جب جواب آجائے لیکن متعلقہ ٹاپک بند کر دیا گیا ہو۔"
+        bounced_email_error: "یہ ای میل ایک لوٹا دیئے جانے والی ای میل کی رپورٹ ہے۔"
+        screened_email_error: "ہو جاتا ہے جب بھیجنے والے کا ای میل ایڈریس پہلے سے ہی سکرین ہوا ہو۔"
+        unsubscribe_not_allowed: "ہو جاتا ہے جب اِس صارف کیلئے ای میل کے ذریعے سبسکرِپشن ختم کرنے کی اجازت نہ ہو۔"
+        email_not_allowed: "جب ای میل ایڈریس وائٹ لِسٹ میں نہ ہو یا بلیک لِسٹ پر ہو۔"
+      unrecognized_error: "نامعلوم خرابی"
   errors: &errors
+    format: '%{attribute} %{message}'
+    format_with_full_message: '<b>%{attribute}</b>: %{message}'
     messages:
-      empty: ھالی نہیں ھو سکتا
+      too_long_validation: "%{max} حروف تک محدود ہے؛ آپ نے %{length} درج کیے۔"
+      invalid_boolean: "غلط بُولِیَّن۔"
+      taken: "پہلے سے ہی لیا جا چکا ہے"
+      accepted: منظور کرنا لازمی ہے
+      blank: خالی نہیں ہو سکتا
+      present: خالی ہونا لازمی ہے
+      confirmation: "%{attribute}کے ساتھ مماثلت نہیں رکھتا "
+      empty: خالی نہیں ہو سکتا
+      equal_to: "%{count} کے برابر ہونا لازمی ہے"
+      even: غیر طاق ہونا لازمی ہے
+      exclusion: مخصوص ہے
+      greater_than: "%{count}سے زیادہ ہونا لازمی ہے "
+      greater_than_or_equal_to: "%{count}سے زیادہ یا اُس کے برابر ہونا لازمی ہے "
+      has_already_been_used: "پہلے سے ہی استعمال کیا جا چکا ہے"
+      inclusion: فہرست میں شامل نہیں ہے
+      invalid: غلط ہے
+      is_invalid: "واضح نہیں لگتا، کیا یہ ایک مکمل جملہ ہے؟"
+      contains_censored_words: "درج ذیل سَینسَر کیے گئے الفاظ پر مشتمل ہے: %{censored_words}"
+      less_than: "%{count}سے کم ہونا لازمی ہے "
+      less_than_or_equal_to: "%{count}سے کم یا اُس کے برابر ہونا لازمی ہے "
+      not_a_number: نمبر نہیں ہے
+      not_an_integer: اِنٹیجَر ہونا لازمی ہے
+      odd: طاق ہونا لازمی ہے
+      record_invalid: 'توثیق ناکام ہو گئی: %{errors}'
+      max_emojis: "%{max_emojis_count} سے زیادہ اِیمَوجی نہیں ہو سکتیں"
+      ip_address_already_screened: "پہلے سے موجودہ ایک اصول میں شامل ہے"
+      restrict_dependent_destroy:
+        one: "ریکارڈ حذف نہیں کیا جا سکتا کیونکہ ایک انحصار %{record} موجود ہے"
+        many: "ریکارڈ حذف نہیں کیا جا سکتا کیونکہ ایک انحصار %{record} موجود ہے"
+      too_long:
+        one: بہت لمبا ہے (زیادہ سے زیادہ 1 حرف ہو سکتا ہے)
+        other: بہت لمبا ہے (زیادہ سے زیادہ %{count} حروف ہو سکتے ہیں)
+      too_short:
+        one: بہت مختصر ہے (کم از کم 1 حرف ہو سکتا ہے)
+        other: بہت مختصر ہے (کم از کم %{count} حروف ہو سکتے ہیں)
+      wrong_length:
+        one: غلط لمبائی ہے (1 حرف لمبا ہونا چاہئے)
+        other: غلط لمبائی ہے (%{count} حروف لمبا ہونا چاہئے)
+      other_than: "%{count}کے علاوہ ہونا لازمی ہے "
+    template:
+      body: 'درج ذیل خانوں کے ساتھ مسائل تھے:'
+      header:
+        one: 1 خرابی نے اِس %{model} کو محفوظ ہونے سے روک دیا
+        other: '%{count}خرابیوں نے اِس %{model} کو محفوظ ہونے سے روک دیا'
+    embed:
+      load_from_remote: "اُس پوسٹ کو لوڈ کرنے میں ایک خرابی کا سامنا کرنا پڑا۔"
+    site_settings:
+      min_username_length_exists: "آپ صارف نام کی کم از کم لمبائی، سب سے مختصر صارف نام کی لمبائی سے کم مقرر نہیں کرسکتے۔"
+      min_username_length_range: "آپ کم از کم، زیادہ سے زیادہ سے اوپر مقرر نہیں کرسکتے۔"
+      max_username_length_exists: "آپ صارف نام کی زیادہ سے زیادہ لمبائی، سب سے طویل صارف نام کی لمبائی سے کم مقرر نہیں کرسکتے۔"
+      max_username_length_range: "آپ زیادہ سے زیادہ، کم از کم سے نیچے مقرر نہیں کرسکتے۔"
+      default_categories_already_selected: "آپ کسی دوسری فہرست میں استعمال کردہ زُمرَہ کا انتخاب نہیں کرسکتے۔"
+      s3_upload_bucket_is_required: "آپ S3 پر اَپ لوڈز فعال نہیں کرسکتے جب تک کہ آپ نے 's3_upload_bucket' فراہم نہیں کیا۔"
+    conflicting_google_user_id: 'اِس اکاؤنٹ کے لئے گُوگَل اکاؤنٹ ID تبدیل ہوگئی ہے؛ سیکیورٹی وجوہات کی بناہ پر اسٹاف کی مداخلت کی ضرورت ہے۔ براہ مہربانی اسٹاف سے رابطہ کریں اور اُنہیں اشارہ کریں <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
   activemodel:
     errors:
       <<: *errors
+  invite:
+    not_found: "آپ کا دعوتی ٹوکن غلط ہے۔ براہ کرم سائٹ کے ایڈمِنِسٹریٹر سے رابطہ کریں۔"
+    user_exists: "<b>%{email}</b>کو مدعو کرنے کی کوئی ضرورت نہیں ہے، اُن کا <a href='/u/%{username}/summary'>پہلے سے ہی ایک اکاؤنٹ ہے!</a>"
+  bulk_invite:
+    file_should_be_csv: "اَپ لوڈ شدہ فائل CSV فارمیٹ میں ہونی چاہئے۔"
+    error: "یہ فائل اَپ لوڈ کرنے میں ایک خرابی کا سامنا کرنا پڑا۔  براہ مہربانی کچھ دیر بعد دوبارہ کوشش کریں۔"
+  topic_invite:
+    user_exists: "معذرت، وہ صارف پہلے ہی مدعو کیا جا چکا ہے۔ آپ صارف کو ایک ٹاپک پر صرف ایک ہی دفعہ مدعو کرسکتے ہیں۔"
+  backup:
+    operation_already_running: "ایک کارروائی اِس وقت چل رہی ہے۔ ابھی ایک نیا کام شروع نہیں کیا جا سکتا۔"
+    backup_file_should_be_tar_gz: "بیک اَپ فائل کو .tar.gz آرکائیو ہونا چاہئے۔"
+    not_enough_space_on_disk: "اس بیک اَپ کو اَپ لوڈ کرنے کیلئے ڈِسک میں کافی جگہ نہیں ہے۔"
+    invalid_filename: " بیک اَپ فائل کے نام میں غلط حروف شامل ہیں۔ درست حروف a-z 0-9 . - _ ہیں۔"
+  invalid_params: "آپ نے درخواست پر غلط پیرامیٹرز فراہم کیے ہیں: %{message}"
+  not_logged_in: "آپ کو یہ کرنے کیلئے لاگ اِن ہونا ضروری ہے۔"
+  not_found: "مطلوبہ URL یا ریسورس نہیں مل سکی۔"
+  invalid_access: "آپ کو درخواست کردہ ریسورس کو دیکھنے کی اجازت نہیں ہے۔"
+  invalid_api_credentials: "آپ کو درخواست کردہ ریسورس کو دیکھنے کی اجازت نہیں ہے۔ API کا صارف نام یا کِی غلط ہے۔"
+  read_only_mode_enabled: "یہ سائٹ صرف پڑھنے کے مَوڈ میں ہے۔ اِنٹرَیکشنز غیر فعال ہیں۔"
+  reading_time: "پڑھنے کیلئے وقت"
+  likes: "لائیکس"
+  too_many_replies:
+    one: ہم معذرت خواہ ہیں، لیکن نئے صارفین کو عارضی طور پر ایک ٹاپک میں 1 جواب تک محدود کیا گیا ہے۔
+    other: ہم معذرت خواہ ہیں، لیکن نئے صارفین کو عارضی طور پر ایک ٹاپک میں %{count} جوابات تک محدود کیا گیا ہے۔
+  embed:
+    start_discussion: "بحث شروع کریں"
+    continue: "بحث جاری رکھیں"
+    error: "اَیمبَیڈ کرنے میں خرابی"
+    referer: "حوالہ دہندہ:"
+    mismatch: "حوالہ دہندہ مندرجہ ذیل ہوسٹس میں سے کسی کے ساتھ بھی مَیچ نہیں کیا:"
+    no_hosts: "اَیمبَیڈ کرنے کیلئے کوئی ہوسٹس سَیٹ نہیں کیے گئے۔"
+    configure: "اَیمبَیڈ کرنا ترتیب دیں"
+    more_replies:
+      one: 1 مزید جواب
+      other: '%{count}مزید جوابات '
+    loading: "بحث لَوڈ ہو رہی ہے..."
+    permalink: "دائمی لِنک"
+    imported_from: "%{link}پر اصل اندراج کیلئے یہ ایک ساتھی بحث ٹاپک ہے "
+    in_reply_to: "◀ %{username}"
+    replies:
+      one: 1 جواب
+      other: '%{count}جوابات '
+  no_mentions_allowed: "معذرت، آپ دوسرے صارفین کا ذکر نہیں کر سکتے۔"
+  too_many_mentions:
+    one: معذرت، آپ ایک پوسٹ میں صرف ایک صارف کا ذکر کر سکتے ہیں۔
+    other: معذرت، آپ ایک پوسٹ میں صرف %{count} صارفین کا ذکر کر سکتے ہیں۔
+  no_mentions_allowed_newuser: "معذرت، نئے صارفین دوسرے صارفین کا ذکر نہیں کر سکتے۔"
+  too_many_mentions_newuser:
+    one: معذرت، نئے صارفین ایک پوسٹ میں صرف ایک دوسرے صارف کا ذکر کر سکتے ہیں۔
+    other: معذرت، نئے صارفین ایک پوسٹ میں صرف %{count} صارفین کا ذکر کر سکتے ہیں۔
+  no_images_allowed_trust: "معذرت، آپ پوسٹ میں تصاویر نہیں ڈال سکتے"
+  no_images_allowed: "معذرت، نئے صارفین پوسٹس میں تصاویر نہیں ڈال سکتے۔"
+  too_many_images:
+    one: معذرت، نئے صارفین ایک پوسٹ میں صرف ایک تصویر ڈال سکتے ہیں۔
+    other: معذرت، نئے صارفین ایک پوسٹ میں صرف %{count} تصاویر ڈال سکتے ہیں۔
+  no_attachments_allowed: "معذرت، نئے صارفین پوسٹس میں اَٹَیچمنٹس نہیں ڈال سکتے۔"
+  too_many_attachments:
+    one: معذرت، نئے صارفین ایک پوسٹ میں صرف ایک اَٹَیچمنٹ ڈال سکتے ہیں۔
+    other: معذرت، نئے صارفین ایک پوسٹ میں صرف %{count} اَٹَیچمنٹس ڈال سکتے ہیں۔
+  no_links_allowed: "معذرت، نئے صارفین پوسٹس میں لِنکس نہیں ڈال سکتے۔"
+  links_require_trust: "معذرت، آپ اپنی پوسٹس میں لِنکس شامل نہیں کر سکتے۔"
+  too_many_links:
+    one: معذرت، نئے صارفین ایک پوسٹ میں صرف ایک لِنک ڈال سکتے ہیں۔
+    other: معذرت، نئے صارفین ایک پوسٹ میں صرف %{count} لِنکس ڈال سکتے ہیں۔
+  contains_blocked_words: "آپ کی پوسٹ میں ایک ایسا لفظ شامل ہے جس کی اجازت نہیں ہے: %{word}"
+  spamming_host: "معذرت، آپ اس ہَوسٹ کیلئے لِنک پوسٹ نہیں کر سکتے۔"
+  user_is_suspended: "معطل صارفین کو پوسٹ کرنے کی اجازت نہیں ہے۔"
+  topic_not_found: "کچھ غلط ہو گیا ہے۔ شاید جس دوران آپ اِسے دیکھ رہے تھے، یہ ٹاپک بند یا حذف کر دیا گیا؟"
+  not_accepting_pms: "معذرت، %{username} اِس وقت پیغامات قبول نہیں کر رہا ہے۔"
+  max_pm_recepients: "معذرت، آپ زیادہ سے زیادہ %{recipients_limit} وصول کنندگان کو ایک پیغام بھیج سکتے ہیں۔"
+  just_posted_that: "آپ نے جو حال ہی میں پوسٹ کیا ہے، یہ اُسی کی طرح کا بہت زیادہ ہے"
+  invalid_characters: "غلط حروف شامل ہیں"
+  is_invalid: "واضح نہیں لگتا، کیا یہ ایک مکمل جملہ ہے؟"
+  next_page: "اگلا صفحہ ←"
+  prev_page: "→ پچھلا صفح"
+  page_num: "صفحہ نمبر %{num}"
+  home_title: "ہَوم"
+  topics_in_category: "'%{category}' زُمرہ میں ٹاپک"
+  rss_posts_in_topic: "'%{topic}' کی RSS فِیڈ"
+  rss_topics_in_category: "'%{category}' زُمرہ میں ٹاپکس کی RSS فِیڈ"
+  author_wrote: "%{author} نے لکھا: "
+  num_posts: "پوسٹس:"
+  num_participants: "شرکاء:"
+  read_full_topic: "مکمل ٹاپک پڑھیں"
+  private_message_abbrev: "پغم"
+  rss_description:
+    latest: "تازہ ترین ٹاپک"
+    hot: "گرم ٹاپک"
+    top: "ٹاپ ٹاپک"
+    top_all: "تمام وقت کے ٹاپ ٹاپک"
+    top_yearly: "سالانہ ٹاپ ٹاپک"
+    top_quarterly: "سہ ماہی ٹاپ ٹاپک"
+    top_monthly: "ماہانہ ٹاپ ٹاپک"
+    top_weekly: "ہفتہ وار ٹاپ ٹاپک"
+    top_daily: "روزانہ کے ٹاپ ٹاپک"
+    posts: "تازہ ترین پوسٹس"
+    private_posts: "تازہ ترین ذاتی پیغامات"
+    group_posts: "%{group_name} کی طرف سے تازہ ترین پوسٹس "
+    group_mentions: "%{group_name} کی طرف سے تازہ ترین ذکر"
+    user_posts: "@%{username} کی طرف سے تازہ ترین پوسٹس"
+    user_topics: "@%{username} کی طرف سے تازہ ترین ٹاپک"
+    tag: "ٹیگ ہوے ٹاپک"
+    badge: "%{display_name} پر %{site_title} بَیج"
+  too_late_to_edit: "یہ پوسٹ بہت دیر پہلے بنائی گئی تھی۔ یہ مزید ترمیم یا حذف نہیں کی جا سکتی۔"
+  revert_version_same: "موجودہ وَرژن وہی وَرژن ہے جسے آپ واپس لوٹانے کی کوشش کررہے ہیں۔"
+  excerpt_image: "تصویر"
+  queue:
+    delete_reason: "پوسٹ ماڈرَیشَن قطار کے ذریعے حذف کر دیا گیا"
+    not_found: "پوسٹ نہیں مل سکی یا پہلے سے ہی اَپ ڈیٹ ہو چکی ہے۔"
+  groups:
+    errors:
+      can_not_modify_automatic: "آپ ایک خودکار گروپ کو ترمیم نہیں کر سکتے ہیں"
+      invalid_domain: "'%{domain}' ایک درست ڈَومَین نہیں ہے۔"
+      invalid_incoming_email: "'%{domain}' ایک درست ایِ میل ایڈریس نہیں ہے۔"
+      email_already_used_in_group: "'%{email}' پہلے ہی گروپ '%{group_name}' کے ذیرِاستعمال ہے۔"
+      email_already_used_in_category: "'%{email}' پہلے ہی زُمرہ '%{category_name}' کے ذیرِاستعمال ہے۔"
+      cant_allow_membership_requests: "آپ ایک ایسا گروپ جس کا کوئی مالک نہ ہو، اُس کیلئے رکنیت کی درخواستوں کی اجازت نہیں دے سکتے۔"
+    default_names:
+      everyone: "ہر کوئی"
+      admins: "ایڈمن"
+      moderators: "ماڈریٹرز"
+      staff: "اسٹاف"
+      trust_level_0: "ٹرسٹ_لَیول_0"
+      trust_level_1: "ٹرسٹ_لَیول_1"
+      trust_level_2: "ٹرسٹ_لَیول_2"
+      trust_level_3: "ٹرسٹ_لَیول_3"
+      trust_level_4: "ٹرسٹ_لَیول_4"
+    request_membership_pm:
+      title: "@%{group_name} کیلئے رکنیت کی درخواست"
+  education:
+    until_posts:
+      one: 1 پوسٹ
+      other: '%{count} پوسٹس'
+    'new-topic': |
+      %{site_name}پر خوش آمدید &mdash؛ **نئی بات چیت شروع کرنے کیلئے شکریہ!**
+
+      - اگر آپ عنوان کو زبان سے پڑھیں تو کیا یہ دِلچسپ سنائی دیتا ہے؟ کیا یہ ایک اچھا خلاصہ ہے؟
+
+      - کون اِس میں دلچسپی رکھے گا؟ یہ کیوں ضروری ہے؟ آپ کو کس قِسم کے جوابات چاہیئیں؟
+
+      - امنے ٹاپک میں عام طور پر استعمال کردہ الفاظ شامل کریں تاکہ دوسرے اِسے *تلاش* کرسکیں۔ اپنے ٹاپک کو متعلقہ ٹاپکس کے ساتھ گروہ کرنے کیلئے، ایک زُمرہ منتخب کریں۔
+
+      مزید کے لئے، [ہماری کمیونٹی کی رہنما ہدایات دیکھیے](/guidelines)۔ یہ پَینل صرف آپ کے پہلے %{education_posts_text} کیلئے ظاہر ہوگا۔
+    'new-reply': |
+      %{site_name}پر خوش آمدید &mdash؛ **شراکت کیلئے شکریہ!**
+
+      - کیا آپ کا جواب کسی طرح سے اِس بات چیت کو بہتر بناتا ہے؟
+
+      - اپنے کمیونٹی کے ارکان کے ساتھ مہربان ہوں۔
+
+      - تعمیراتی تنقید قابل قبول ہے، لیکن تنقید *خیالات* پر کریں، نہ کہ لوگوں پر۔
+
+      مزید کے لئے، [ہماری کمیونٹی کی رہنما ہدایات دیکھیے](/guidelines)۔ یہ پَینل صرف آپ کے پہلے %{education_posts_text} کیلئے ظاہر ہوگا۔
+    avatar: |
+      ### آپ کے اکاؤنٹ کیلئے ایک تصویر کیسی لگے گی؟
+
+      آپ نے چند ٹاپک اور جوابات پوسٹ کیے ہیں، لیکن آپ کی پروفائل تصویر آپ کی طرح منفرد نہیں ہے – یہ صرف ایک حرف ہے۔
+
+      کیا آپ نے اِس بات پر غور کیا ہے کہ آپ **[اپنے صارف پروفائل پر جا کر](%{profile_path})** اور ایسی تصویر اَپ لَوڈ کریں جو آپ کی نمائندگی کرتی ہو؟
+
+      بات چیت کی پیروی کرنا اور دلچسپ لوگوں کو بات چیت میں تلاش کرنا آسان ہو جاتا ہے جب سب کی ایک منفرد پروفائل تصویر ہے!
+    sequential_replies: |
+      ### ایک ساتھ کئی پوسٹس کا جواب دینے پر غور کریں
+
+      ٹاپک پر ایک سلسلہ میں کئی جوابوں کے بجائے، براہ کرم ایک ہی جواب، جس میں پچھلی پوسٹس کے اقتباس یا @نام کے حوالے شامل ہوں، پر غور کریں۔
+
+      متن کو اُجاگر کر کہ ظاہر ہونے والے <b>جواب اقتباس کریں</b> بٹن منتخب کرنے سے ایک اقتباس شامل کرنے کیلئے آپ اپنے پچھلے جواب میں ترمیم کرسکتے ہیں۔
+
+      ہر ایک کیلئے اُن ٹاپکس کو پڑھ نا زیادہ آسان ہے جس میں بہت سے چھوٹے، انفرادی جوابات کے مقابلے میں تفصیلی لیکن کم جوابات ہوں۔
+    dominating_topic: |
+      ### دوسروں کو گفتگو میں شامل ہونے کی اجازت دیں
+
+      یہ ٹاپک آپ کے لئے واضح طور پر اہم ہے&ndash; آپ نے یہاں %{percent}% سے زیادہ جوابات پوسٹ کیے ہیں۔
+
+      کیا آپ کو یقین ہے کہ آپ دوسروں کو اپنے نقطہ نظر کا اشتراک کرنے کیلئے کافی وقت فراہم کررہے ہیں؟
+    get_a_room: |
+      ### مزید لوگوں کو جواب دینے پر غور کریں
+
+      آپ نے اِس مخصوص ٹاپک میں پہلے ہی @%{reply_username} کو %{count} مرتبہ جواب دیا ہے۔
+
+      کیا آپ نے بحث میں *دیگر* لوگوں کو بھی جواب دیبے کا سوچا ہے؟ ایک عظیم بحث میں مختلف آرا اور نقطہ نظر شامل ہوتے ہیں۔
+
+      اگر آپ اِس مخصوص صارف کے ساتھ اپنی گفتگو لمبائی میں جاری رکھنا چاہتے ہیں، تو [اِنہیں ایک ذاتی پیغام بھیجیں](/u/%{reply_username})۔
+    too_many_replies: |
+      ### آپ اس ٹاپک پر جوابات کے نمبر کی حد تک پہنچ گئے ہیں
+
+      ہم معذرت خواہ ہیں، لیکن نئے صارفین کو عارضی طور پر ایک ٹاپک میں %{newuser_max_replies_per_topic} جوابات تک محدود کیا گیا ہے۔
+
+      ایک اور جواب کو شامل کرنے کے بجائے، براہ کرم اپنے پچھلے جوابوں میں ترمیم، یا دیگر ٹاپکس ملاحظہ کرنے کے بارے میں سوچیں۔
+    reviving_old_topic: |
+      ### اِس ٹاپک کو بحال کریں؟
+
+      اِس ٹاپک پر آخری جواب **** تھا۔ آپ کا جواب ٹاپک کو اپنی فہرست کے سب سے اوپر پہنچا دے گا اور گفتگو میں پہلے ملوث تمام افراد کو مطلع کردے گا۔
+
+      کیا آپ واقعی یہ پرانی گفتگو جاری رکھنا چاہتے ہیں؟
   activerecord:
+    attributes:
+      category:
+        name: "زُمرہ کا نام"
+      topic:
+        title: 'عنوان'
+        featured_link: 'نمایاں لنک'
+      post:
+        raw: "متن"
+      user_profile:
+        bio_raw: "میرے بارے میں"
     errors:
       <<: *errors
+      models:
+        topic:
+          attributes:
+            base:
+              warning_requires_pm: "آپ ذاتی پیغامات کے ساتھ صرف انتباہات منسلک کرسکتے ہیں۔"
+              too_many_users: "آپ انتباہات ایک وقت میں صرف ایک صارف کو بھیج سکتے ہیں۔"
+              cant_send_pm: "معذرت، آپ اُس صارف کو ذاتی پیغام نہیں بھیج سکتے۔"
+              no_user_selected: "آپ کا ایک درست صارف منتخب کرنا ضروری ہے۔"
+              reply_by_email_disabled: "ای میل کے ذریعے جواب دینا غیر فعال کردیا گیا ہے۔"
+              target_user_not_found: "جن صارفین کو آپ یہ پیغام بھیج رہے ہیں اُن میں سے ایک نہ مل سکا۔"
+            featured_link:
+              invalid: "غلط ہے۔ URL میں http:// یا https:// شامل ہونا چاہئے۔"
+              invalid_category: "اِس زُمرہ میں ترمیم نہیں کیا جا سکتا۔"
+        user:
+          attributes:
+            password:
+              common: "سب سے زیادہ عام 10000 پاسورڈز میں سے ایک ہے۔ براہ مہربانی مزید محفوظ پاسورڈ کا استعمال کریں۔"
+              same_as_username: "آپ کے صارف نام جیسا ہی ہے۔ براہ مہربانی مزید محفوظ پاسورڈ کا استعمال کریں۔"
+              same_as_email: "آپ کے ای میل جیسا ہی ہے۔ براہ مہربانی مزید محفوظ پاسورڈ کا استعمال کریں۔"
+              same_as_current: "آپ کے موجودہ پاسورڈ جیسا ہی ہے۔"
+              unique_characters: "بار بار اِستعمال ہونے والے بہت زیادہ حروف شامل ہیں۔ براہ مہربانی مزید محفوظ پاسورڈ کا استعمال کریں۔"
+            ip_address:
+              signup_not_allowed: "اِس اکاؤنٹ سے سائن اَپ کی اجازت نہیں ہے۔"
+        user_email:
+          attributes:
+            user_id:
+              reassigning_primary_email: "کسی دوسرے صارف کو ایک بنیادی ای میل دوبارہ تفویض کرنے کی اجازت نہیں ہے۔"
+        color_scheme_color:
+          attributes:
+            hex:
+              invalid: "درست رنگ نہیں ہے"
+        post_reply:
+          base:
+            different_topic: "پوسٹ اور جواب ایک ہی ٹاپک سے منسلک ہونے چاہئیں۔"
+        web_hook:
+          attributes:
+            payload_url:
+              invalid: "URL غلط ہے۔ URL میں http:// یا https:// شامل ہونا چاہئے۔ اور کوئی خالی جگہ کی اجازت نہیں ہے۔"
+        custom_emoji:
+          attributes:
+            name:
+              taken: پہلے سے ہی ایک دوسرے اِیمَوجی کے ذیرِ استعمال ہے
+        topic_timer:
+          attributes:
+            execute_at:
+              in_the_past: "مستقبل میں ہونا ضروری ہے۔"
+        translation_overrides:
+          attributes:
+            value:
+              invalid_interpolation_keys: 'مندرجہ ذیل اِنٹَرپَولَیشَن کیز غلط ہیں: "%{keys}"'
+        watched_word:
+          attributes:
+            word:
+              too_many: "اس کارروائی کیلئے بہت زیادہ الفاظ"
+  user_profile:
+    no_info_me: "<div class='missing-profile'>آپ کی پروفائل کا \"میرے بارے میں\" والی فیلڈ فی الحال خالی ہے، <a href='/u/%{username_lower}/preferences/about-me'>کیا آپ اسے بھرنا پسند کریں گے؟</a></div>"
+    no_info_other: "<div class='missing-profile'>%{name}نے اپنی پروفائل کے \"میرے بارے میں\" والی فیلڈ میں ابھی تک کچھ نہیں درج کیا</div>"
+  vip_category_name: "لاؤنج"
+  vip_category_description: "ٹرسٹ لَیول 3 یا اُس سے زیادہ والے ارکان کیلئے خاص زُمرہ۔"
+  meta_category_name: "سائٹ کیلئے رائے"
+  meta_category_description: "اِس سائٹ کے بارے میں بحث، اِس کی تنظیم، یہ کیسے کام کرتی ہے، اور ہم کس طرح اِسے بہتر بنا سکتے ہیں۔"
+  staff_category_name: "سٹاف"
+  staff_category_description: "اسٹاف کی گفتگو کیلئے ذاتی زُمرہ۔ ٹاپک صرف ایڈمن اور ماڈریٹرز کو نظر آتے ہیں۔"
+  assets_topic_title: "سائٹ کے ڈیزائن کیلئے اثاثہ جات"
+  assets_topic_body: "یہ ٹاپک، جو صرف اسٹاف کو نظر آتا ہے، سائٹ کے ڈیزائن میں استعمال ہونے والی تصاویر اور فائلوں کو رکھنے کیلئے ہے۔ اسے حذف نہ کیجیے!\n\n\nیہ اِس طرح سے ہے:\n\n\n1. اس ٹاپک پر جواب دیں۔\n2. تمام تصاویر جنہیں آپ لوگو، فیوکان یا دوسری چیزوں کیلئے استعمال کرنا چاہتے ہیں یہاں اَپ لوڈ کریں۔ (پوسٹ ایڈیٹر میں اپلوڈ ٹول بار آئیکن کا استعمال کریں، یا ڈریگ اور ڈراپ یا تصاویر پیسٹ کریں۔)\n3. پوسٹ کرنے کیلئے اپنا جواب شائع کریں۔\n4. اپ لوڈ کردہ تصاویر کے پاتھ حاصل کرنے کیلئے اپنی نئی پوسٹ میں تصاویر پر دائیں کلِک کریں، یا اپنی پوسٹ میں ترمیم کرنے کیلئے ترمیم آئیکن پر کلِک کریں اور تصاویر کے پاتھ حاصل کریں۔ تصویر کا پاتھ کاپی کریں۔\n5. اِن تصاویر کے پاتھ کو [بنیادی ترتیبات](/admin/site_settings/category/required) میں پَیسٹ کریں۔\n\n\nاگر آپ کو مختلف فائل اِقسام کے اَپ لوڈ کو فعال کرنے کی ضرورت ہے تو، [فائل ترتیبات]() کت اندر `authorized_extensions` میں ترمیم کریں۔"
+  discourse_welcome_topic:
+    title: "ڈسکورس میں خوش آمدید"
+    body: |2
+
+        اس پِن کیے گئے ٹاپک کا پہلا پیراگراف آپ کے ہَوم پیج پر تمام نئے زائرین کو ایک خوش آمدید پیغام کے طور پر نظر آئے گا۔ یہ اہم ہے!
+
+        **اس میں ترمیم کریں** آپنی کمیونٹی کی ایک مختصر وضاحت میں:
+
+        یہ کس کیلئے ہے؟
+        وہ یہاں کیا تلاش کرسکتے ہیں؟
+        وہ یہاں کیوں آئیں؟
+        - وہ مزید کہاں پڑھ سکتے ہیں (لنکس، وسائل، وغیرہ)؟
+
+        <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+
+        آپ اَیڈمن :wrench: (اوپری دائیں اور سب سے نیچے) کے ذریعہ اِس ٹاپک کو بند کرنا چاہیں گے، تاکہ ایک اعلان پر جوابات کا ڈھیر نہ لگ جائے۔
+  lounge_welcome:
+    title: "لاؤنج میں خوش آمدید"
+    body: |2
+
+        مبارک باد! :confetti_ball:
+
+        اگر آپ اِس ٹاپک کو دیکھ سکتے ہیں، تو آپ کو حال ہی میں **رَیگولر** (ٹرسٹ لَیول 3) پر ترقی دے دی گئی ہے۔
+
+        اب آپ &hellip;
+
+        * کسی بھی ٹاپک کے عنوان میں ترمیم کر سکتے ہیں
+        * کسی بھی ٹاپک کا زُمرہ تبدیل کر سکتے ہیں
+        * اپنے تمام لِنکس فَولَو کروا سکتے ہیں ([خود کار طریقے سےغیر فَولَو](http://en.wikipedia.org/wiki/Nofollow) is removed) ہٹا دیا جاتا ہے)
+        * ایک ذاتی لاؤنج زُمرہ جو صرف ٹرسٹ لَیول 3 یا اُس سے زیادہ والے صارفین کو نظر آتا ہے تک رسائی کر سکتے ہیں
+        * ایک ہی فلَیگ سے سپَیم چھپا سکتے ہیں
+
+        یہاں [ساتھی رَیگولرز کی موجودہ فہرست](/badges/3/regular) ہے۔ ہیلو کہنا نہ بھولیے گا۔
+
+        اِس کمیونٹی کا ایک اہم حصہ ہونے کا شکریہ!
+
+        (ٹرسٹ لَیول پر مزید معلومات کیلئے، [یہ ٹاپک دیکھیے][اعتماد]۔ براہ کرم نوٹ کریں کہ صرف ایسے ممبران جو وقت کے ساتھ شرائط کو پورا کرتے رہیں گے صرف وہی رَیگولرز میں شامل رہیں گے۔)
+
+        [اعتماد]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+  category:
+    topic_prefix: "%{category} زُمرہ کے بارے میں"
+    replace_paragraph: "(اس پہلے پیراگراف کو اپنے نئے زُمرہ کے بارے میں ایک مختصر وضاحت کے ساتھ تبدیل کریں۔ یہ ہدایات زُمرہ کے انتخاب کے والی جگہ پر نظر آئے گا، لہٰذا اِسے 200 حروف سے نیچے رکھنے کی کوشش کریں۔ **جب تک آپ اِس وضاحت میں ترمیم یا ٹاپک نہیں بنائیں گے، یہ زُمرہ زُمرہ جات کے صفحہ پر نہیں دکھایا جائے گا۔**)"
+    post_template: "%{replace_paragraph}\n\nطویل تر وضاحت، یا زُمرہ کے قواعد و ضوابط قائم کرنے کیلئے مندرجہ ذیل پیراگراف کا استعمال کریں:\n\n- لوگوں کو اِس زُمرہ کو کیوں استعمال کرنا چاہئے؟ یہ کس لیے ہے؟ \n\n- ہمارے پاس پہلے ہی سے موجود دیگر زُمرہ جات کے مقابلے میں یہ کس طرح مختلف ہے؟\n\n- اس زُمرہ کے ٹاپکس میں عام طور پر کیا ہونا چاہئے؟\n\nکیا ہمیں اِس زُمرہ کی ضرورت ہے؟ کیا ہم کسی اور زُمرہ، یا ذیلی زمرہ کے ساتھ ضم کر سکتے ہیں؟\n"
+    errors:
+      not_found: "زُمرہ نہیں ملا!"
+      uncategorized_parent: "بِلا زُمرہ والوں کا بالائی زُمرہ نہیں ہو سکتا"
+      self_parent: "ایک ذیلی زُمرہ کا بالائی وہ خود ہی نہیں ہوسکتا"
+      depth: "آپ ایک ذیلی زُمرہ کو کسی دوسرے کے تحت نہیں کر سکتے"
+      invalid_email_in: "'%{email}' ایک درست ای میل اَیڈرَیس نہیں ہے۔"
+      email_already_used_in_group: "'%{email}' پہلے ہی گروپ '%{group_name}' کے ذیرِاستعمال ہے۔"
+      email_already_used_in_category: "'%{email}' پہلے ہی زُمرہ '%{category_name}' کے ذیرِاستعمال ہے۔"
+      description_incomplete: "زُمرہ کی وضاحت والی پوسٹ کا کم ازکم ایک پیراگراف ہونا ضروری ہے۔"
+    cannot_delete:
+      uncategorized: "بِلا زُمرہ والوں کو حذف نہیں کیا جا سکتا"
+      has_subcategories: "اِس زُمرہ کو حذف نہیں کیا جا سکتا کیونکہ اِس کے ذیلی زُمرہ ہیں۔"
+      topic_exists:
+        one: اِس زُمرہ کو حذف نہیں کیا جا سکتا کیونکہ اِس میں 1 ٹاپک ہے۔ سب سے پرانا ٹاپک %{topic_link} ہے۔
+        other: اِس زُمرہ کو حذف نہیں کیا جا سکتا کیونکہ اِس میں %{count} ٹاپک ہیں۔ سب سے پرانا ٹاپک %{topic_link} ہے۔
+      topic_exists_no_oldest: "اِس زُمرہ کو حذف نہیں کیا جا سکتا کیونکہ ٹاپک تعداد %{count} ہے۔"
+    uncategorized_description: "وہ ٹاپک جنہیں کسی زُمرہ کی ضرورت نہیں، یا جو کسی اور موجودہ زُمرہ میں فِٹ نہیں ہوتے۔"
+  trust_levels:
+    newuser:
+      title: "نیا صارف"
+    basic:
+      title: "بَیسِک صارف"
+    member:
+      title: "ممبر"
+    regular:
+      title: "رَیگولر"
+    leader:
+      title: "لِیڈر"
+    change_failed_explanation: "آپ نے %{user_name} کو '%{new_trust_level}' تک درجہ کم کرنے کی کوشش کی۔ تاہم اُن کا ٹرسٹ لَیول پہلے سے ہی '%{current_trust_level}' ہے۔ %{user_name} '%{current_trust_level}' پر رہیں گے - اگر آپ صارف کا درجہ کم کرنا چاہتے ہیں تو پہلے ٹرسٹ لَیول لاک کیجیے"
+  post:
+    image_placeholder:
+      broken: "یہ تصویر ٹوٹی ہوئی ہے"
+  rate_limiter:
+    slow_down: "آپ یہ کارروائی بہت بار کر چکے ہیں، براہ کرم بعد میں دوبارہ کوشش کیجیے۔"
+    too_many_requests: "آپ نے یہ کارروائی بہت زیادہ دفعہ کی ہے۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+    by_type:
+      first_day_replies_per_day: "آپ نئے صارف کیلئے پہلے دن کے زیادہ سے زیادہ جوابات کی حد تک پہنچ گئے ہیں۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+      first_day_topics_per_day: "آپ نئے صارف کیلئے پہلے دن کے زیادہ سے زیادہ بنائے جانے والے ٹاپکس کی حد تک پہنچ گئے ہیں۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+      create_topic: "آپ بہت جلدی سے ٹاپکس بنائے جا رہے ہیں۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+      create_post: "آپ بہت جلدی سے جواب دیے جا رہے ہیں۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+      delete_post: "آپ بہت جلدی سے پوسٹس حذف کرتے جا رہے ہیں۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+      public_group_membership: "آپ بہت کثرت سے گروپوں میں شامل اور اُنہیں چھوڑ رہے ہیں۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+      topics_per_day: "آپ نئے ٹاپکس کی زیادہ سے زیادہ تعداد تک پہنچ گئے ہیں۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+      pms_per_day: "آپ نئے پیغامات کی زیادہ سے زیادہ تعداد تک پہنچ گئے ہیں۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+      create_like: "آپ لائیکس کی زیادہ سے زیادہ تعداد تک پہنچ گئے ہیں۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+      create_bookmark: "آپ بُکمارکس کی زیادہ سے زیادہ تعداد تک پہنچ گئے ہیں۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+      edit_post: "آپ ترامیم کی زیادہ سے زیادہ تعداد تک پہنچ گئے ہیں۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+      live_post_counts: "آپ بہت جلدی سے لائیو پوسٹ شمار کیلئے درخواست کر رہے ہیں۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+      unsubscribe_via_email: "آپ ای میل کے ذریعہ رکنیت ختم کرنے کی زیادہ سے زیادہ تعداد تک پہنچ گئے ہیں۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+      topic_invitations_per_day: "آپ ٹاپک کیلئے دعوت ناموں کی زیادہ سے زیادہ تعداد تک پہنچ گئے ہیں۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+    hours:
+      one: 1 گھنٹا
+      other: '%{count} گھنٹے'
+    minutes:
+      one: 1 منٹ
+      other: '%{count} منٹس'
+    seconds:
+      one: 1 سیکنڈ
+      other: '%{count} سیکنڈ'
+  datetime:
+    distance_in_words:
+      half_a_minute: "< 1منٹ"
+      less_than_x_seconds:
+        one: < 1سیکنڈ
+        other: < %{count}سیکنڈ
+      x_seconds:
+        one: 1سیکنڈ
+        other: '%{count}سیکنڈ'
+      less_than_x_minutes:
+        one: '< 1منٹ '
+        other: '< %{count}منٹ '
+      x_minutes:
+        one: 1منٹ
+        other: '%{count}منٹ '
+      about_x_hours:
+        one: 1گھنٹا
+        other: '%{count}گھنٹے'
+      x_days:
+        one: 1دن
+        other: '%{count}دن'
+      about_x_months:
+        one: 1ماہ
+        other: '%{count}مہینے'
+      x_months:
+        one: 1ماہ
+        other: '%{count}مہینے'
+      about_x_years:
+        one: 1سال
+        other: '%{count}سال'
+      over_x_years:
+        one: '> 1سال'
+        other: '> %{count}سال'
+      almost_x_years:
+        one: 1سال
+        other: '%{count}سال'
+    distance_in_words_verbose:
+      half_a_minute: "ابھی"
+      less_than_x_seconds:
+        one: ابھی
+        other: ابھی
+      x_seconds:
+        one: 1 سیکنڈ قبل
+        other: '%{count} سیکنڈ قبل'
+      less_than_x_minutes:
+        one: قبل از 1 منٹ سے بھی کم
+        other: قبل از %{count} منٹ
+      x_minutes:
+        one: 1 منٹ قبل
+        other: '%{count} منٹ قبل'
+      about_x_hours:
+        one: قبل از 1 گھنٹہ
+        other: ' %{count} گھنٹے قبل'
+      x_days:
+        one: قبل از 1 دن
+        other: '%{count} دن قبل'
+      about_x_months:
+        one: تقریباً 1 ماہ قبل
+        other: تقریباً %{count} مہینے قبل
+      x_months:
+        one: 1 ماہ قبل
+        other: ' %{count} مہینے قبل '
+      about_x_years:
+        one: تقریباً 1 سال قبل
+        other: تقریباً %{count} سال قبل
+      over_x_years:
+        one: 1 سال سے زیادہ پہلے
+        other: '%{count} سال سے زیادہ پہلے'
+      almost_x_years:
+        one: تقریباً 1 سال قبل
+        other: تقریباً %{count} سال قبل
+  password_reset:
+    no_token: "معذرت، وہ پاسورڈ تبدیل کرنے کا لِنک بہت پرانا ہے۔ لاگ ان کے بٹن کو منتخب کریں اور ایک نیا لِنک حاصل کرنے کیلئے 'میں اپنا پاسورڈ بھول گیا' کا استعمال کریں۔"
+    choose_new: "نیا پاسورڈ منتخب کریں"
+    choose: "پاسورڈ منتخب کریں"
+    update: 'پاسورڈ اَپ ڈیٹ کریں'
+    save: 'پاسورڈ رکھیں'
+    title: 'پاسورڈ رِی سَیٹ کریں'
+    success: "آپ نے کامیابی سے اپنا پاسورڈ تبدیل کر لیا اور اب آپ لاگ ان ہوے وے ہیں۔"
+    success_unapproved: "آپ نے کامیابی سے اپنا پاسورڈ تبدیل کر لیا۔"
+  email_login:
+    invalid_token: "معذرت، وہ بذریعہ ای میل لاگ اِن لِنک بہت پرانا ہے۔ لاگ ان کے بٹن کو منتخب کریں اور ایک نیا لِنک حاصل کرنے کیلئے 'میں اپنا پاسورڈ بھول گیا' کا استعمال کریں۔"
+    title: "بذریعہ ای میل لاگ اِن"
+  change_email:
+    confirmed: "آپ کا اِی میل اپڈیٹ کر دیا کیا ہے۔"
+    please_continue: "%{site_name} پر جاری رکھیں"
+    error: "آپ کا اِی میل ایڈریس تبدیل کرنے میں ایک خرابی کا سامنا کرنا پڑا۔ شاید یہ ایڈریس پہلے سے استعمال میں ہے؟"
+    error_staged: "آپ کا اِی میل تبدیل کرنے میں ایک خرابی کا سامنا کرنا پڑا۔ یہ ایڈریس پہلے سے ہی ایک سٹَیجڈ صارف کے استعمال میں ہے۔"
+    already_done: "معذرت، یہ تصدیقی لِنک اب درست نہیں ہے۔ شاید آپ کا اِی میل پہلے ہی بدل چکا تھا؟"
+    authorizing_old:
+      title: "اپنے موجودہ اِی میل ایڈریس کی تصدیق کرنے کیلئے شکریہ"
+      description: "اب ہم تصدیق کیلئے آپ کے نئے ایڈریس پر اِی میل کر رہے ہیں۔"
+  activation:
+    action: "اپنا اکاؤنٹ فعال کرنے کیلئے یہاں کلک کریں"
+    already_done: "معذرت، یہ اکاؤنٹ تصدیق لنک اب درست نہیں ہے۔ شاید آپ کا اکاؤنٹ پہلے ہی سے فعال ہے؟"
+    please_continue: "آپ کا نیا اکاؤنٹ تصدیق کر لیا گیا ہے؛ آپ کو ہَوم پیج پر ری ڈائرَیکٹ کیا جائے گا۔"
+    continue_button: "%{site_name} پر جاری رکھیں"
+    welcome_to: "%{site_name} پر خوش آمدید!"
+    approval_required: "اِس فورم تک رسائی حاصل کرنے سے پہلے ایک ماڈریٹر کو آپ کا نیا اکاؤنٹ دستی طور پر منظور کرنا ضروری ہے۔ جب آپ کا اکاؤنٹ منظور ہوجائے گا تو آپ کو ایک اِی میل مل جائے گی!"
+    missing_session: "ہم یہ پتہ نہیں لگا سکتے کہ آپ کا اکاؤنٹ بن چکا تھا کہ نہیں، براہ مہربانی یقینی بنائیں کہ کُوکِیز فعال ہوں۔"
+    activated: "معذرت، یہ اکاؤنٹ پہلے ہی سے چالو کر دیا گیا ہے۔"
+    admin_confirm:
+      title: "توثیق ایڈمن اکاؤنٹ"
+      description: "کیا آپ واقعی <b>%{target_username}</b> کو ایک ایڈمِنِسٹریٹر بننا چاہتے ہیں؟"
+      grant: "عطا ایڈمن رسائی"
+      complete: "<b>%{target_username}</b> اب ایک ایڈمِنِسٹریٹر ہے۔"
+      back_to: "%{title} پر واپس جائیں"
+  post_action_types:
+    off_topic:
+      title: 'موضوع سے ہٹ کر'
+      description: 'موجودہ بحث جو کہ عنوان اور پہلی پوسٹ سے واضح ہوتی ہے، یہ پوسٹ اُس سے متعلق نہیں ہے، اور غالباً کہیں اور منتقل ہوجانی چاہئیے۔'
+      short_description: 'بحث سے متعلق نہیں'
+      long_form: 'اِس کو موضوع سے ہٹ کر ہونے کے طور پر فلَیگ کیا گیا'
+    spam:
+      title: 'سپَیم'
+      description: 'یہ پوسٹ ایک اشتہار، یا وَینڈَلِزم ہے۔ یہ مفید یا موجودہ موضوع کے متعلقہ نہیں ہے۔'
+      short_description: 'یہ ایک اشتہار، یا وَینڈَلِزم ہے'
+      long_form: 'اِس کو سپَیم ہونے کے طور پر فلَیگ کیا گیا'
+      email_title: '"%{title}" کو سپَیم کے طور پر فلَیگ کیا گیا'
+      email_body: "%{link}\n\n%{message}"
+    inappropriate:
+      title: 'نامناسب'
+      description: 'اِس پوسٹ میں ایسا مواد شامل ہے جو ایک مناسب شخص جارحانہ، غیر مہذب، یا <a href="/guidelines">ہماری کمیونٹی کے قواعد و ضوابط</a> کے خلاف سمجھے گا۔'
+      short_description: '<a href="/guidelines">ہماری کمیونٹی کے قواعد و ضوابط</a> کی خلاف ورزی'
+      long_form: 'اِس کو نامناسب ہونے کے طور پر فلَیگ کیا گیا'
+    notify_user:
+      title: '@{{username}} کو ایک پیغام بھیجیں'
+      description: 'میں اِس شخص سے اُس کی پوسٹ کے بارے میں براہ راست اور ذاتی طور پر بات کرنا چاہتا ہوں۔'
+      short_description: 'میں اِس شخص سے اُس کی پوسٹ کے بارے میں براہ راست اور ذاتی طور پر بات کرنا چاہتا ہوں۔'
+      long_form: 'پیغام دیا گیا صارف'
+      email_title: 'آپ کی "%{title}" میں پوسٹ'
+      email_body: "%{link}\n\n%{message}"
+    notify_moderators:
+      title: " کچھ اور"
+      description: 'اِس پوسٹ پر اسٹاف کی توجہ درکار ہے جس کی وجہ مندرجہ بالا درج وجوہات میں شامل نہیں ہے۔'
+      short_description: 'اسٹاف کی توجہ کسی اور وجہ کی بناہ پر درکار ہے'
+      long_form: 'اِس کو اسٹاف کی توجہ کیلئے فلَیگ کیا گیا'
+      email_title: '"%{title}" میں ایک پوسٹ پر اسٹاف کی توجہ درکار ہے'
+      email_body: "%{link}\n\n%{message}"
+    bookmark:
+      title: 'بُک مارک'
+      description: 'اِس پوسٹ کو بُک مارک کریں'
+      short_description: 'اِس پوسٹ کو بُک مارک کریں'
+      long_form: 'اِس پوسٹ کو بُک مارک کیا'
+    like:
+      title: 'لائیک'
+      description: ' اِس پوسٹ کو لائیک کریں'
+      short_description: ' اِس پوسٹ کو لائیک کریں'
+      long_form: 'اِس کو لائیک کیا'
+    vote:
+      title: 'ووٹ'
+      description: 'اِس پوسٹ کیلیے ووٹ کریں'
+      short_description: 'اِس پوسٹ کیلیے ووٹ کریں'
+      long_form: 'اِس پوسٹ کے لیے ووٹ کیا'
+  user_activity:
+    no_default:
+      self: "ابھی تک آپ کی کوئی سرگرمی نہیں ہے."
+      others: "کوئی سرگرمی نہیں۔"
+    no_bookmarks:
+      self: "آپ کے پاس کوئی بُک مارک کی ہوئی پوسٹس نہیں ہیں، پوسٹس بُک مارک کرنے سے آپ بعد میں اُن تک آسانی سے رسائی حاصل کرپاتے ہیں۔"
+      others: "کوئی بُک مارکس نہیں"
+    no_likes_given:
+      self: "آپ نے کوئی پوسٹس لائیک نہیں کیں۔"
+      others: "کوئی لائیک کردہ پوسٹس نہیں۔"
+    no_replies:
+      self: "آپ نے کسی بھی پوسٹ پر جواب نہیں دیا ہے۔"
+      others: "کوئی جوابات نہیں۔"
+  topic_flag_types:
+    spam:
+      title: 'سپَیم'
+      description: 'یہ ٹاپک ایک اشتہار ہے۔ یہ اِس سائٹ کیلئے مفید یا اِس کے متعلقہ نہیں ہے، لیکن نوعیت میں پروموشنل ہے۔'
+      long_form: 'اِس کو سپَیم کے طور پر فلَیگ کیا گیا'
+    inappropriate:
+      title: 'نامناسب'
+      description: 'اِس ٹاپک میں ایسا مواد شامل ہے جو ایک مناسب شخص جارحانہ، غیر مہذب، یا <a href="/guidelines">ہماری کمیونٹی کے قواعد و ضوابط</a> کے خلاف سمجھے گا۔'
+      long_form: 'اِس کو نامناسب ہونے کے طور پر فلَیگ کیا گیا'
+    notify_moderators:
+      title: "کچھ اور"
+      description: 'اِس ٹاپک کو، <a href="/guidelines">قواعد و ضوابط</a>، <a href="%{tos_url}">سروس کی شرائط</a>، یا مندرجہ بالا درج وجوہات کے علاوہ، کے مطابق اسٹاف کی عام توجہ کی ضرورت ہے۔'
+      long_form: 'اِس کو ماڈریٹر کی توجہ کیلئے فلَیگ کیا گیا'
+      email_title: 'ٹاپک "%{title}" پر اسٹاف کی توجہ درکار ہے'
+      email_body: "%{link}\n\n%{message}"
+  flagging:
+    you_must_edit: '<p>آپ کی پوسٹ کمیونٹی کی طرف سے فلَیگ کی گئی تھی۔ براہ مہربانی <a href="%{path}">اپنے پیغامات دیکھیے</a>۔</p>'
+    user_must_edit: '<p>یہ پوسٹ کمیونٹی کی طرف سے فلَیگ کی گئی تھی اور عارضی طور پر چھپا دی گئی ہے۔</p>'
+  archetypes:
+    regular:
+      title: "عام ٹاپک"
+    banner:
+      title: "بینر ٹاپک"
+      message:
+        make: "یہ ٹاپک اب ایک بَینر ہے۔ یہ ہر صفحے کے سب سے اوپر دکھایا جائے گا جب تک صارف اِسے برخاست نہیں کر دیتا۔"
+        remove: "یہ ٹاپک اب بینر نہیں ہے۔ یہ اب ہر صفحے کے سب سے اوپر دکھایا نہیں جائے گا۔"
+  unsubscribed:
+    title: "غیر سَبسکرائب شدہ!"
+    description: "<b>%{email}</b> کو غیر سَبسکرائب کر دیا گیا ہے۔ اپنی ای میل کی ترتیبات کو تبدیل کرنے کیلئے <a href='%{url}'>اپنی صارفی ترجیحات پر جائیں</a>۔"
+    topic_description: "%{link} پر دوبارہ سَبسکرائب کرنے کیلئے، ٹاپک کے نچلے حصے یا دائیں جانب اطلاعات کنٹرول کا استعمال کریں۔"
+  unsubscribe:
+    title: "غیر سَبسکرائب"
+    stop_watching_topic: "اس ٹاپک کو دیکھنا چھوڑ دیں، %{link}"
+    mute_topic: "اِس ٹاپک کیلئے تمام اطلاعات کو خاموش کر دیں، %{link}"
+    unwatch_category: "%{category} میں تمام ٹاپکس کو دیکھنا چھوڑ دیں"
+    mailing_list_mode: "مَیلِنگ لِسٹ مَوڈ بند کریں"
+    disable_digest_emails: "مجھے خلاصہ ای میلزبھیجنا روک دیں"
+    all: "مجھے %{sitename} سے کوئی میل نہ بھیجیں"
+    different_user_description: "جس صارف کو ہم نے اِی میل کی، آپ اُس سے مختلف صارف کے طور پر لاگ اِن ہیں۔ براہ مہربانی لاگ آوٹ کریں، یا گمنام مَوڈ میں داخل ہوں، اور دوبارہ کوشش کریں۔"
+    not_found_description: "معذرت، ہم اِس غیر سَبسکرائب کو تلاش نہ کرسکے۔ ممکن ہے کہ آپ کے ای میل میں لِنک کی میعاد ختم ہوگئی ہے؟"
+    log_out: "لاگ آُوٹ"
+  user_api_key:
+    title: "ایپلیکیشن ایکسَیس کی اجازت دیں"
+    authorize: "اجازت دیں"
+    read: "رِیڈ"
+    read_write: "رِیڈ/رائیٹ"
+    description: "\"%{application_name}\" آپ کے اکاؤنٹ سے مندرجہ ذیل رسائی کی درخواست کر رہا ہے:"
+    no_trust_level: "معذرت، صارف API تک رسائی حاصل کرنے کیلئے آپ کے پاس ضروری ٹرسٹ لَیول نہیں ہے"
+    generic_error: "معذرت، ہم صارف API کیز جاری کرنے سے قاصر ہیں، یہ خصوصیت سائٹ کے ایڈمن کی طرف سے غیر فعال کی گئی ہوسکتی ہے"
+    scopes:
+      message_bus: "لائیو اپ ڈیٹس"
+      notifications: "اطلاعات پڑھیں اور ہٹائیں"
+      push: "بیرونی سروِسوں پر اطلاعات بھیجیں"
+      session_info: "صارف سیشن کی معلومات پڑھیں"
+      read: "تمام رِیڈ"
+      write: " تمام رائیٹ"
+  reports:
+    visits:
+      title: "صارف وِزِٹس"
+      xaxis: "دن"
+      yaxis: "وِزِٹس کی تعداد"
+    signups:
+      xaxis: "دن"
+    profile_views:
+      title: "صارف پروفائل وِیوز"
+      xaxis: "دن"
+      yaxis: "دیکھے گئے صارفین پروفائلز کی تعداد"
+    topics:
+      title: "ٹاپک"
+      xaxis: "دن"
+      yaxis: "نئے ٹاپکس کی تعداد"
+    posts:
+      title: "پوسٹس"
+      xaxis: "دن"
+      yaxis: "نئی پوسٹس کی تعداد"
+    likes:
+      title: "لائیکس"
+      xaxis: "دن"
+      yaxis: "نئے لائیکس کی تعداد"
+    flags:
+      title: "فلَیگز"
+      xaxis: "دن"
+      yaxis: "فلَیگز کی تعداد"
+    bookmarks:
+      title: "بُک مارکس"
+      xaxis: "دن"
+      yaxis: "نئے بُک مارکس کی تعداد"
+    starred:
+      title: "ستارہ شُدہ"
+      xaxis: "دن"
+      yaxis: "نئے ستارہ شُدہ ٹاپکس کی تعداد"
+    users_by_trust_level:
+      title: "صارفین فی ٹرسٹ لَیول"
+      xaxis: "ٹرسٹ لَیول"
+      yaxis: "صارفین کی تعداد"
+    emails:
+      title: "بھیجی گئیں اِی میل"
+      xaxis: "دن"
+      yaxis: "اِی میل کی تعداد"
+    user_to_user_private_messages:
+      xaxis: "دن"
+      yaxis: "پیغامات کی تعداد"
+    user_to_user_private_messages_with_replies:
+      xaxis: "دن"
+      yaxis: "پیغامات کی تعداد"
+    system_private_messages:
+      title: "سِسٹَم"
+      xaxis: "دن"
+      yaxis: "پیغامات کی تعداد"
+    moderator_warning_private_messages:
+      title: "ماڈریٹر انتباہ"
+      xaxis: "دن"
+      yaxis: "پیغامات کی تعداد"
+    notify_moderators_private_messages:
+      title: "ماڈریٹرز کو مطلع کریں"
+      xaxis: "دن"
+      yaxis: "پیغامات کی تعداد"
+    notify_user_private_messages:
+      title: "صارف کو مطلع کریں"
+      xaxis: "دن"
+      yaxis: "پیغامات کی تعداد"
+    top_referrers:
+      title: "ٹاپ تجویز کنندگان"
+      xaxis: "صارف"
+      num_clicks: "کلِکس"
+      num_topics: "ٹاپک"
+    top_traffic_sources:
+      title: "ٹریفک کے ٹاپ ذرائع"
+      xaxis: "ڈَومَین"
+      num_clicks: "کلِکس"
+      num_topics: "ٹاپک"
+      num_users: "صارفین"
+    top_referred_topics:
+      title: "ٹاپ تجویز کردہ ٹاپک"
+      xaxis: "ٹاپک"
+      num_clicks: "کلِکس"
+    page_view_anon_reqs:
+      title: "گمنام"
+      xaxis: "دن"
+      yaxis: "صفحہ کے گمنام ملاحظات"
+    page_view_logged_in_reqs:
+      title: "لاگڈ اِن"
+      xaxis: "دن"
+      yaxis: "صفحہ کے لاگڈ اِن ملاحظات"
+    page_view_crawler_reqs:
+      title: "وَیب کرالرز"
+      xaxis: "دن"
+      yaxis: "صفحہ کے وَیب کرالر ملاحظات"
+    page_view_total_reqs:
+      xaxis: "دن"
+      yaxis: "صفحہ کے کُل ملاحظات"
+    page_view_logged_in_mobile_reqs:
+      title: "صفحہ کے لاگڈ اِن ملاحظات"
+      xaxis: "دن"
+      yaxis: "صفحہ کے موبائل لاگڈ اِن ملاحظات"
+    page_view_anon_mobile_reqs:
+      title: "صفحہ گمنام ملاحظات"
+      xaxis: "دن"
+      yaxis: "صفحہ موبائل گمنام ملاحظات"
+    http_background_reqs:
+      title: "پس منظر"
+      xaxis: "دن"
+      yaxis: "لائیو اَپ ڈیٹ اور ٹریکنگ کیلئے استعمال ہونے والی درخواستیں"
+    http_2xx_reqs:
+      title: "سٹَیٹَس 2xx (OK)"
+      xaxis: "دن"
+      yaxis: "کامیاب درخواستیں (سٹَیٹَس 2xx)"
+    http_3xx_reqs:
+      title: "HTTP 3xx (ریڈائرَیکٹ)"
+      xaxis: "دن"
+      yaxis: "ریڈائرَیکٹ کردہ درخواستیں (سٹَیٹَس 3xx)"
+    http_4xx_reqs:
+      title: "HTTP 4xx (کلائنٹ کی خرابی)"
+      xaxis: "دن"
+      yaxis: "کلائنٹ خرابیاں (سٹَیٹَس 4xx)"
+    http_5xx_reqs:
+      title: "HTTP 5xx (سرور کی خرابی)"
+      xaxis: "دن"
+      yaxis: "سرور خرابیاں (سٹَیٹَس 5xx)"
+    http_total_reqs:
+      title: "کُل"
+      xaxis: "دن"
+      yaxis: "کُل درخواستیں"
+    time_to_first_response:
+      title: "پہلے جواب تک کا وقت"
+      xaxis: "دن"
+      yaxis: "اوسطً وقت (گھنٹے)"
+    topics_with_no_response:
+      title: "بۃلا جواب والے ٹاپک"
+      xaxis: "دن"
+      yaxis: "کُل"
+    mobile_visits:
+      title: "صارف وِزِٹس"
+      xaxis: "دن"
+      yaxis: "وِزِٹس کی تعداد"
+    web_crawlers:
+      title: "وَیب کرالر درخواستیں"
+      xaxis: "صارف ایجنٹ"
+      yaxis: "صفحہ ملاحظات"
+  dashboard:
+    rails_env_warning: "آپ کا سرور %{env} مَوڈ میں چل رہا ہے۔"
+    host_names_warning: "آپ کی config/database.yml فائل ڈیفالٹ localhost نام استعمال کر رہا ہے۔ اِسے اپنے سائیٹ ہوسٹ کے نام پر اپ ڈیٹ کریں۔"
+    gc_warning: 'آپ کا سرور ڈیفالٹ روبی گاربَیج کولیکشن پیرامیٹرز کا استعمال کر رہا ہے، جو آپ کو بہترین کارکردگی نہیں دے گا۔ کارکردگی کی ٹیوننگ پر اس ٹاپک کو پڑھیں: <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">ڈِسکورس کیلئے روبی اور ریلز کی ٹیوننگ</a>۔'
+    sidekiq_warning: 'Sidekiq نہیں چل رہا۔ بہت سے کام، جیسا کہ ای میل بھیجنا، sidekq کی طرف سے اےسِنکرونسلی مکمل کیے جاتے ہیں۔ براہ کرم یقینی بنائیں کہ کم ازکم ایک sidekq پراسیس چل رہا ہے۔ <a href="https://github.com/mperham/sidekiq" target="_blank">Sidekiq کے بارے میں یہاں سے جانیے</a>۔'
+    queue_size_warning: 'قطار میں موجود جابز کی تعداد %{queue_size} ہے، جو کہ زیادہ ہے۔ یہ Sidekiq پراسیس کے ساتھ ایک مسئلہ کی نشاندہی کر سکتا ہے، یا آپ کو مزید Sidekiq کارکنوں کو شامل کرنے کی ضرورت ہوسکتی ہے۔'
+    memory_warning: 'آپ کا سرور مجموعی طور پر 1 GB سے کم میموری کے ساتھ چل رہا ہے۔ کم ازکم 1 GB میموری تجویز کی گئی ہے۔'
+    google_oauth2_config_warning: 'سرور کو ترتیب دیا گیا ہے کہ گُوگل (OAuth2 (enable_google_oauth2_logins کے ساتھ سائن اپ اور لاگ اِن کی اجازت ہو، لیکن کلائنٹ آئی ڈی اور کلائنٹ سیکرٹ وَیلِیوز مقرر نہیں کیے گئے ہیں۔ <a href="/admin/site_settings">سائٹ ترتیبات</a> پر جائیں اور ترتیبات کو اَپ ڈیٹ کریں۔ <a href="https://meta.discourse.org/t/configuring-google-login-for-discourse/15858" target="_blank">مزید جاننے کے لئے یہ گائیڈ ملاحظہ کریں</a>۔'
+    facebook_config_warning: 'سرور کو ترتیب دیا گیا ہے کہ فیس بُک (OAuth2 (enable_facebook_logins کے ساتھ سائن اپ اور لاگ اِن کی اجازت ہو، لیکن اَیپ آئی ڈی اور اَیپ سیکرٹ وَیلِیوز مقرر نہیں کیے گئے ہیں۔ <a href="/admin/site_settings">سائٹ ترتیبات</a> پر جائیں اور ترتیبات کو اَپ ڈیٹ کریں۔ <a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">مزید جاننے کے لئے یہ گائیڈ ملاحظہ کریں</a>۔'
+    twitter_config_warning: 'سرور کو ترتیب دیا گیا ہے کہ ٹَوِیٹر (enable_twitter_logins) کے ساتھ سائن اپ اور لاگ اِن کی اجازت ہو، لیکن قیی اور سیکرٹ وَیلِیوز مقرر نہیں کیے گئے ہیں۔ <a href="/admin/site_settings">سائٹ ترتیبات</a> پر جائیں اور ترتیبات کو اَپ ڈیٹ کریں۔ <a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">مزید جاننے کے لئے یہ گائیڈ ملاحظہ کریں</a>۔'
+    github_config_warning: 'سرور کو ترتیب دیا گیا ہے کہ گِٹ ہَب (enable_github_logins) کے ساتھ سائن اپ اور لاگ اِن کی اجازت ہو، لیکن کلائنٹ آئی ڈی اور سیکرٹ وَیلِیوز مقرر نہیں کیے گئے ہیں۔ <a href="/admin/site_settings">سائٹ ترتیبات</a> پر جائیں اور ترتیبات کو اَپ ڈیٹ کریں۔ <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">مزید جاننے کے لئے یہ گائیڈ ملاحظہ کریں</a>۔'
+    s3_config_warning: 'سرور کو s3 پر فائلوں کو اَپ لوڈ کرنے کیلئے ترتیب دیا گیا ہے، لیکن کم از کم ایک درج ذیل ترتیب سَیٹ نہیں کی گئی ہے: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, or s3_upload_bucket۔ <a href="/admin/site_settings">سائٹ ترتیبات</a> پر جائیں اور ترتیبات کو اَپ ڈیٹ کریں۔ <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">مزید جاننے کے لئے "S3 پر تصویر اپ لوڈز کیسے سَیٹ کریں؟" ملاحظہ کریں</a>۔'
+    s3_backup_config_warning: 'سرور کو s3 پر بیک اَپس اَپ لوڈ کرنے کیلئے ترتیب دیا گیا ہے، لیکن کم از کم ایک درج ذیل ترتیب سَیٹ نہیں کی گئی ہے: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, or s3_backup_bucket۔ <a href="/admin/site_settings">سائٹ ترتیبات</a> پر جائیں اور ترتیبات کو اَپ ڈیٹ کریں۔ <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">مزید جاننے کے لئے "S3 پر تصویر اپ لوڈز کیسے سَیٹ کریں؟" ملاحظہ کریں</a>۔'
+    image_magick_warning: 'سرور کو بڑی تصاویر کے تھَمب نَیل تخلیق کرنے کیلئے ترتیب دیا گیا ہے، لیکن ImageMagick اِنسٹال نہیں ہے۔ اپنے پسندیدہ پیکیج مینیجر کا استعمال کرکے ImageMagick اِنسٹال کریں یا <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">تازہ ترین ورژن ڈاؤن لوڈ کریں</a>۔'
+    failing_emails_warning: 'ناکام ہونے والی %{num_failed_jobs} اِی مَیل جابز موجود ہیں۔ اپنا app.yml چیک کریں اور یہ یقینی بنائیں کہ میل سرور کی ترتیبات درست ہیں۔ Sidekiq میں ناکام جابز ملاحظہ کریں۔'
+    subfolder_ends_in_slash: "آپ کا سب-فولڈر سیٹ اپ غلط ہے؛ DISCOURSE_RELATIVE_URL_ROOT ایک سلَیش میں ختم ہوتا ہے۔"
+    email_polling_errored_recently:
+      one: گزشتہ 24 گھنٹوں میں ای میل پولِنگ نے ایک خرابی دکھائی ہے۔ مزید تفصیلات کیلئے <a href='/logs' target='_blank'>لاگز</a> کا ملاحضہ کریں۔
+      other: گزشتہ 24 گھنٹوں میں ای میل پولِنگ نے %{count} خرابیاں دکھائی ہیں۔ مزید تفصیلات کیلئے <a href='/logs' target='_blank'>لاگز</a> کا ملاحضہ کریں۔
+    missing_mailgun_api_key: "سرور کو بذریعہ مَیلگَن ای میل بھیجنے کیلئے ترتیب دیا گیا ہے، لیکن آپ نے وَیب ھُوک٘ پیغامات کی توثیق کرنے کیلئے API کلید فراہم نہیں کی ہے۔"
+    bad_favicon_url: "فَیوِکان لوڈ نہیں ہو رہا ہے۔ <a href='/admin/site_settings'>سائٹ ترتیبات</a> میں اپنی favicon_url کی ترتیبات چیک کریں۔"
+    poll_pop3_timeout: "POP3 سرور کے ساتھ کنِکشن کا وقت ختم ہوا جا رہا ہے۔ آنے والی ای میل حاصل نہیں کی جاسکی۔ براہ مہربانی اپنی <a href='/admin/site_settings/category/email'>POP3 ترتیبات</a> اور سروس فراہم کرنے والے کو چیک کریں۔"
+    poll_pop3_auth_error: "POP3 سرور کے ساتھ کنِکشن ایک اوَتھَینٹیکیشن خرابی سے ناکام ہو رہا ہے۔ آنے والی ای میل حاصل نہیں کی جاسکی۔ براہ مہربانی اپنی <a href='/admin/site_settings/category/email'>POP3 ترتیبات</a> کو چیک کریں۔"
+    force_https_warning: "آپ کی ویب سائٹ SSL استعمال کر رہی ہے۔ لیکن `<a href='/admin/site_settings/category/all_results?filter=force_https'>force_https</a>` ابھی تک آپ کی سائٹ ترتیبات میں فعال نہیں ہے۔"
+  site_settings:
+    censored_words: "الفاظ جو خود بخود &#9632;&#9632;&#9632;&#9632; سے تبدیل ہوجائیں گے"
+    delete_old_hidden_posts: "کوئی چھپی ہوئی پوسٹ جو 30 دن سے زائد عرصہ سے چھپا رکھی ہو اُس کو خود کار طریقے سے حذف کر دیں۔"
+    default_locale: "اِس ڈِسکورس سَیٹ اپ کی پہلے سے طہ شدہ زبان"
+    allow_user_locale: "صارفین کو اپنی زبان انٹرفیس ترجیح کو منتخب کرنے کی اجازت دیں"
+    set_locale_from_accept_language_header: "گمنام صارفین کیلئے اِنٹرفیس زبان اُن کے وَیب براؤزر کے لَینگوَیج ہیڈرز سے سَیٹ کریں۔ (تجرباتی، گمنام کَیشے کے ساتھ کام نہیں کرتا)"
+    support_mixed_text_direction: "مخلوط بائیں-سے-دائیں اور دائیں-سے-بائیں ٹیکسٹ سمتوں کی اجازت دیں۔"
+    min_post_length: "حروف میں پوسٹ کی کم از کم لمبائی"
+    min_first_post_length: "حروف میں پہلی پوسٹ (ٹاپک متن) کی کم از کم لمبائی"
+    min_personal_message_post_length: "حروف میں پیغامات کیلئے پوسٹ کی کم از کم لمبائی"
+    max_post_length: "حروف میں پوسٹ کی زیادہ سے زیادہ لمبائی"
+    topic_featured_link_enabled: "ٹاپکس کے ساتھ لِنک پوسٹ کرنا فعال کریں۔"
+    show_topic_featured_link_in_digest: "ڈائجسٹ ای میل میں نمایاں ٹاپک کا لِنک دکھائیں۔"
+    min_topic_title_length: "حروف میں ٹاپک کے عنوان کی کم از کم لمبائی"
+    max_topic_title_length: "حروف میں ٹاپک کے عنوان کی زیادہ سے زیادہ لمبائی"
+    min_personal_message_title_length: "حروف میں ایک پیغام کیلئے عنوان کی کم از کم لمبائی"
+    max_emojis_in_title: "ٹاپک عنوان میں اِیمَوجیوں کی زیادہ سے زیادہ تعداد"
+    min_search_term_length: "حروف میں درست سرچ ٹَرم کی کم از کم لمبائی"
+    search_prefer_recent_posts: "اگر آپ کے بڑے فورم پر سرچ سست ہے، تو یہ آپشن پہلے حالیہ پوسٹس کے ایک اِنڈَیکس پر کوشش کرتا ہے"
+    search_recent_posts_size: "اِنڈَیکس میں کتنی حالیہ پوسٹس رکھی جائیں"
+    log_search_queries: "صارفین کی طرف سے سرچ قُوَیریز کو لاگ کریں"
+    search_query_log_max_size: "رکھی جانے والی سرچ قُوَیریز کی زیادہ سے زیادہ تعداد"
+    allow_uncategorized_topics: "ٹاپکس کو بغیر کسی زُمرہ کے تخلیق ہونے کی اجازت دیں۔ انتباہ: اگر کوئی بِلا زُمرہ ٹاپکس موجود ہوں، تو اِس کو بند کرنے سے پہلے آپ کو اُنہیں دوبارہ کسی زُمرہ میں ڈالنا ہوگا۔"
+    allow_duplicate_topic_titles: "ایک جیسے، نقل عنوانات کے ساتھ ٹاپکس کی اجازت دیں۔"
+    unique_posts_mins: "ایک ہی مواد والی دوبارہ پوسٹ صارف کتنے منٹ بعد بنا سکتا ہے"
+    educate_until_posts: "جب صارف اپنی پہلی (ن) نئی پوسٹس کو ٹائپ کرنا شروع کرے، تو کمپوزر میں نیا صارف تعلیمی پینل کا پاپ-اپ دکھائیں۔"
+    title: "اس سائٹ کا نام، جیسا کہ عنوان ٹَیگ میں استعمال ہوتا ہے۔"
+    site_description: "اِس سائٹ کو ایک جملہ میں بیان کریں، جیسا کہ مَیٹا وضاحتی ٹَیگ میں استعمال کیا جاتا ہے۔"
+    contact_email: "اِس سائٹ کیلئے ذمہ دار اہم کانٹیکٹ کا ای میل ایڈریس۔ اہم اطلاعات کے لئے استعمال کیا جاتا ہے، اور اُس کے ساتھ ساتھ فوری طور کے معاملات کیلئے /about رابطہ فارم پر۔"
+    contact_url: "اِس سائٹ کے لئے رابطہ URL۔ فوری طور کے معاملات کیلئے /about رابطہ فارم پر استعمال کیا جاتا ہے۔"
+    crawl_images: "صحیح چوڑائی اور اونچائی والے طول و عرض داخل کرنے کیلئے ریمَوٹ URL سے تصاویر حاصل کریں۔"
+    download_remote_images_to_local: "ڈاؤن لوڈ کرکے ریمَوٹ تصاویر کو مقامی تصاویر میں تبدیل کریں؛ اِس طرح سے ٹوٹی ہوئی تصاویر کو روکا جا سکتا ہے۔"
+    download_remote_images_threshold: "مقامی طور پر ریمَوٹ تصاویر کو ڈاؤن لَوڈ کرنے کیلئے ڈِسک میں کم از کم جگہ (فیصد میں)"
+    download_remote_images_max_days_old: "اُن پوسٹس کیلئے ریمَوٹ تصاویر ڈاؤن لوڈ نہ کریں جو ن دنوں سے زیادہ پرانی ہوں۔"
+    disabled_image_download_domains: "ریمَوٹ تصاویر اِن ڈومینز سے کبھی ڈاؤن لوڈ نہیں ہوں گی۔ پائپ کے ساتھ الگ کی گئی فہرست۔"
+    editing_grace_period: "پوسٹنگ کے بعد (ن) سیکنڈ تک، نئی ترمیم پوسٹ کی ہسٹری میں ایک نیا ورژن نہیں بنائے گا۔"
+    editing_grace_period_max_diff: "ترمیم کی رعایتی مدت کے دوران حروف تبدیلیوں کی زیادہ سے زیادہ تعداد، اگر اِس سے زیادہ تبدیل کیے جائیں تو ایک اور پوسٹ رَوِیژن سٹور کریں (ٹرسٹ لَیول 0 اور 1)"
+    editing_grace_period_max_diff_high_trust: "ترمیم کی رعایتی مدت کے دوران حروف تبدیلیوں کی زیادہ سے زیادہ تعداد، اگر اِس سے زیادہ تبدیل کیے جائیں تو ایک اور پوسٹ رَوِیژن سٹور کریں (ٹرسٹ لَیول 2 اور اوپر)"
+    staff_edit_locks_post: "پوسٹس کو ترمیم کرنے سے روک دیا جائے گا اگر وہ اسٹاف کے اراکین کی طرف سے ترمیم کی گئی ہوں"
+    post_edit_time_limit: "مصنف اشاعت کے بعد (ن) منٹ تک اپنی پوسٹ میں ترمیم یا اسے خارج کرسکتے ہیں۔ ہمیشہ کیلئے 0 پر سیٹ کریں۔"
+    edit_history_visible_to_public: "سب کو ایک ترمیم شدہ پوسٹ کے پچھلے ورژن دیکھنے کی اجازت دیں۔ غیر فعال ہونے پر، صرف اسٹاف ممبران دیکھ سکتے ہیں۔"
+    delete_removed_posts_after: "مصنف کی طرف سے ہٹائی گئی پوسٹس خود کار طریقے سے (ن) گھنٹوں کے بعد حذف کردی جائیں گی۔ اگر 0 پر سیٹ ہو، تو پوسٹس کو فوری طور پر حذف کردیا جائے گا۔"
+    max_image_width: "پوسٹ میں تصاویر کی زیادہ سے زیادہ تھَمب نَیل چوڑائی"
+    max_image_height: "پوسٹ میں تصاویر کی زیادہ سے زیادہ تھَمب نَیل اونچائی"
+    fixed_category_positions: "اگر باکس چیک شدہ ہو تو، آپ زُمرہ جات کو ایک مقررہ سلسلہ کے حساب سے اُن کی درجہ بندی کرسکیں گے۔ اگر چیک شدہ نہ ہو تو، سرگرمیوں کی تعداد کے مطابق زُمرہ جات درج کیے جاتے ہیں۔"
+    fixed_category_positions_on_create: "اگر باکس چیک شدہ ہو تو، ٹاپک تخلیق ڈائیلاگ پر زُمرہ جات کی درجہ بندی کی ترتیب برقرار رکھی جائے گی (fixed_category_positions ضروری ہے)۔"
+    add_rel_nofollow_to_user_content: "اندرونی لِنکس (بالائی ڈومینز سمیت) کے علاوہ، تمام شائع کردہ صارف کے مواد پر رَیل nofollow شامل کریں۔ اگر آپ اس کو تبدیل کرتے ہیں تو، آپ کو تمام پوسٹس کو دوبارہ رِیبَیک کرنا ہوگا: \"rake posts:rebake\""
+    exclude_rel_nofollow_domains: "اُن ڈومینز کی فہرست جن کے لنکس پر nofollow کو شامل نہیں کیا جانا چاہئے۔ example.com خود بخود sub.example.com کو بھی اجازت دیدے گا۔ وَیب کرالرز کو تمام مواد تلاش کرنے میں مدد دینے کیلئے آپ کو کم از کم، اِس سائٹ کا ڈومَین شامل کرلینا چاہئے۔ اگر آپ کی ویب سائٹ کے دوسرے حصے دوسرے ڈومینز پر ہیں، تو اُنہیں بھی شامل کر لیں۔"
+    post_excerpt_maxlength: "پوسٹ اقتباس / خلاصہ کی زیادہ سے زیادہ لمبائی۔"
+    show_pinned_excerpt_mobile: "موبائل وِیو میں پِن ہوے ٹاپکس پر اقتباس دکھائیں۔"
+    show_pinned_excerpt_desktop: "ڈیسک ٹاپ وِیو میں پِن ہوے ٹاپکس پر اقتباس دکھائیں۔"
+    post_onebox_maxlength: "ایک وَن باکسڈ ڈِسکورس پوسٹ کے حروف کی زیادہ سے زیادہ لمبائی۔"
+    onebox_domains_blacklist: "ڈومینز کی ایک فہرست جو کبھی بھی وَن باکسڈ نہیں کیے جائیں گے۔"
+    inline_onebox_domains_whitelist: "ڈومینز کی ایک فہرست جو چھوٹے فارم میں وَن باکسڈ کیے جائیں گے اگر وہ عنوان کے بغیر لنک کیے جائیں"
+    enable_inline_onebox_on_all_domains: "inline_onebox_domain_whitelist سائٹ ترتیب کو نظر انداز کریں اور تمام ڈَومینز پر وَن باکس کی اجازت دیں۔"
+    max_oneboxes_per_post: "ایک پوسٹ میں وَن باکس کی زیادہ سے زیادہ تعداد۔"
+    logo_url: "آپ کی سائٹ کے سب سے اوپر بائیں پر لوگو کی تصویر وسیع مستطیل شکل ہونی چاہئے۔ اگر خالی چھوڑ دیا گیا ہو تو سائٹ کا عنوان دکھایا جائے گا۔"
+    digest_logo_url: "آپ کی سائٹ کے ای میل خلاصہ کے اوپر استعبال ہونے والا متبادل کوگو۔ ایک وسیع مستطیل شکل ہونی چاہئے۔ ایک SVG تصویر نہیں ہونی چاہئے۔ اگر خالی چھوڑ دیا گیا ہو تو `logo_url` استعمال کیا جائے گا۔"
+    logo_small_url: "آپ کی سائٹ کے سب سے اوپر بائیں پر چھوٹا سی لوگو کی تصویر، ایک چکور شکل ہونی چاہئے، جب نیچے سکرول کیا جائے تو دکھائی دیتا ہے۔ اگر خالی چھوڑ دیا گیا ہو تو ایک ہَوم گلِف دکھایا جائے گا۔"
+    favicon_url: "آپ کی ویب سائٹ کیلئے ایک فَیوِکان، http://en.wikipedia.org/wiki/Favicon دیکھیے، ایک CDN پر صحیح کام کرنے کیلئے اِس کا png ہونا ضروری ہے"
+    mobile_logo_url: "آپکی سائٹ کے موبائل ورژن پر استعمال ہونے والا اپنی مرضی کا لوگو url۔ اگر خالی چھوڑ دیا گیا ہو تو `logo_url` استعمال کیا جائے گا۔ مثال: http://example.com/uploads/default/logo.png"
+    large_icon_url: "تصویر جو اینڈرائڈ پر لوگو/سپلیش تصویر کے طور پر استعمال ہو۔ تجویز شدہ سائز 512px/512px ہے۔"
+    apple_touch_icon_url: "اَیپل ٹَچ ڈِیوائیسِز پر استعمال ہونے والا آئکن۔ تجویز شدہ سائز 144px/144px ہے۔"
+    notification_email: "تمام ضروری سِسٹم ای میلز بھیجنے کیلئے استعمال ہونے والا from: ای میل ایڈریس۔ یہاں درج کردہ ڈومین کا SPF ،DKIM اور ریورس PTR ریکارڈ، ای میل کے پہنچنے کیلئے، صحیح طریقے سے مقرر ہونا لازمی ہے۔"
+    email_custom_headers: "اپنی مرضی کے ای میل ہیڈرز کی پائپ سے علیحدہ کردہ فہرست"
+    email_subject: "سٹینڈرڈ ای میلز کیلئے اپنی مرضی کا موضوع فارمَیٹ۔ دیکھیے https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801"
+    force_https: "صرف HTTPS استعمال کرنے کیلئے اپنی سائٹ کو مجبورکریں۔ انتباہ: جب تک آپ تصدیق نہ کر لیں کہ HTTPS مکمل طور پر سیٹ ہے اور ہر جگہ کام کر رہا ہے، اِس کو فعال نہ کریں! کیا آپ نے اپنا CDN، تمام سماجی لاگ ان، اور بیرونی لوگو / انحصارات کو چیک کر کے یہ یقینی بنا لیا ہے کہ وہ تمام HTTPS سے مطابقت رکھتے ہیں؟"
+    same_site_cookies: "سَیم سائٹ کے کُوکِیز کا استعمال کریں، وہ قابل براؤزرز (Lax یا Strict) پر تمام ویکٹر Cross Site Request Forgery کو ختم کر دیتے ہیں۔ انتباہ: Strict صرف اُن سائٹس پر کام کرے گا جو لاگ اِن پر مجبور کرتے ہیں اور SSO کا استعمال کرتے ہیں۔"
+    summary_score_threshold: "'اِس ٹاپک کا خلاصہ کریں' میں شامل ہونے کیلئے ایک پوسٹ کا کم از کم سکور"
+    summary_posts_required: "'اِس ٹاپک کا خلاصہ کریں' فعال ہونے سے پہلے ٹاپک میں پوسٹس کی کم از کم تعداد"
+    summary_likes_required: "'اِس ٹاپک کا خلاصہ کریں' فعال ہونے سے پہلے ٹاپک میں لائیکس کی کم از کم تعداد"
+    summary_percent_filter: "جب صارف 'اِس ٹاپک کا خلاصہ کریں' پر کلک کرتا ہے، تو سب سے اوپر % پوسٹس دکھائیں"
+    summary_max_results: "'اِس ٹاپک کا خلاصہ کریں' کی طرف سے لوٹائی جانے والی زیادہ سے زیادہ پوسٹس"
+    enable_personal_messages: "ٹرسٹ لَیول 1 (پیغامات بھیجنے کیلئے کم از کم ٹرسٹ لَیول کے ذریعہ ترتیب دے سکتے ہیں) والے صارفین کو پیغامات بنانے اور پیغامات کا جواب دینے کی اجازت دیں۔ نوٹ کریں کہ جوبھی ہو، اسٹاف ہمیشہ پیغامات بھیج سکتا ہے۔"
+    enable_system_message_replies: "صارفین کو سِسٹم پیغامات کا جواب دینے کی اجازت دیں، یہاں تک کہ اگر ذاتی پیغامات بھی غیر فعال ہوں"
+    enable_personal_email_messages: "ٹرسٹ لَیول 4 (پیغامات بھیجنے کیلئے کم از کم ٹرسٹ لَیول کے ذریعہ ترتیب دے سکتے ہیں) والے صارفین کو ذاتی ای میل پیغامات کی اجازت دیں۔ نوٹ کریں کہ جوبھی ہو، اسٹاف ہمیشہ پیغامات بھیج سکتا ہے۔"
+    enable_long_polling: "نوٹیفکیشن کیلئے مَیسج بس استعمال ہو رہا ہے، لانگ پولِنگ کا استعمال کیا جا سکتا ہے"
+    long_polling_base_url: "لانگ پولِنگ کیلئے استعمال ہونے والا بَیس URL (جب ایک CDN متحرک مواد فراہم کر رہا ہو، تو اِس کو اوریِجِن پُل پر سَیٹ کرنا یقینی بنائیں) مثال: http://origin.site.com"
+    long_polling_interval: "جب بھیجنے کیلئے کوئی ڈیٹا نہ ہو تو کلائینٹس کوجواب دینے سے پہلے سرور کو کتنا وقت انتظار کرنا چاہئے (صرف لاگ ہوئے صارفین)"
+    polling_interval: "جب لانگ پولِنگ نہ ہو، تو لاگ ہوئے کلائنٹس کو مِلی سیکنڈوں میں کتنی دفعہ پَول کرنا چاہئے"
+    anon_polling_interval: "گمنام کلائنٹس کو مِلی سیکنڈوں میں کتنی دفعہ پَول کرنا چاہئے"
+    background_polling_interval: "کلائنٹس کو مِلی سیکنڈوں میں کتنی دفعہ پَول کرنا چاہئے (جب وِنڈو پسِ منظر میں ہو)"
+    flags_required_to_hide_post: "فلَیگز کی تعداد جس کے بعد کسی پوسٹ کو خود کار طریقہ سے چھپا دیا اور صارف کو پیغام بھیج دیا جاتا ہے (کبھی نہیں کیلئے 0)"
+    cooldown_minutes_after_hiding_posts: "منٹوں کی تعداد جن کیلئے ایک صارف کو کمیونٹی فلَیگ بندی کے ذریعہ چھپائی گئی پوسٹ میں ترمیم کرنے سے پہلے انتظار کرنا لازمی ہے"
+    max_topics_in_first_day: "اُن کی پہلی پوسٹ بنانے کے بعد 24 گھنٹوں کی مدت میں ایک صارف کی طرف سے تخلیق کردہ ٹاپکس کی زیادہ سے زیادہ تعداد"
+    max_replies_in_first_day: "اُن کی پہلی پوسٹ بنانے کے بعد 24 گھنٹوں کی مدت میں ایک صارف کی طرف سے تخلیق کردہ جوابات کی زیادہ سے زیادہ تعداد"
+    tl2_additional_likes_per_day_multiplier: "اِس نمبر کے ساتھ ضرب کر کے ٹ.ل.2 (ممبر) کیلئے فی دن لائیکس کی حد میں اضافہ کریں"
+    tl3_additional_likes_per_day_multiplier: "اِس نمبر کے ساتھ ضرب کر کے ٹ.ل.3 (رَیگولر) کیلئے فی دن لائیکس کی حد میں اضافہ کریں"
+    tl4_additional_likes_per_day_multiplier: "اِس نمبر کے ساتھ ضرب کر کے ٹ.ل.4 (لِیڈر) کیلئے فی دن لائیکس کی حد میں اضافہ کریں"
+    num_spam_flags_to_silence_new_user: "اگر کسی نئے صارف کی پوسٹس کو num_users_to_silence_new_user مختلف صارفین سے اتنے سپَیم فلَیگز ملیں، تو اُن کی تمام پوسٹس کو چھپا اور مستقبل کی اشاعت کو روک دیں۔ غیر فعال کرنے کیلئے 0۔"
+    num_users_to_silence_new_user: "اگر کسی نئے صارف کی پوسٹس کو اتنے مختلف صارفین سے num_spam_flags_to_silence_new_user سپَیم فلَیگز ملیں، تو اُن کی تمام پوسٹس کو چھپا اور مستقبل کی اشاعت کو روک دیں۔ غیر فعال کرنے کیلئے 0۔"
+    num_tl3_flags_to_silence_new_user: "اگر کسی نئے صارف کی پوسٹس کو num_tl3_users_to_silence_new_user مختلف ٹرسٹ لَیول 3 والے صارفین سے اتنے فلَیگز ملیں، تو اُن کی تمام پوسٹس کو چھپا اور مستقبل کی اشاعت کو روک دیں۔ غیر فعال کرنے کیلئے 0۔"
+    num_tl3_users_to_silence_new_user: "اگر کسی نئے صارف کی پوسٹس کو اتنے مختلف ٹرسٹ لَیول 3 والے صارفین سے num_tl3_flags_to_silence_new_user فلَیگز ملیں، تو اُن کی تمام پوسٹس کو چھپا اور مستقبل کی اشاعت کو روک دیں۔ غیر فعال کرنے کیلئے 0۔"
+    notify_mods_when_user_silenced: "اگر صارف خود کار طریقے سے خاموش کر دیا جائے، تو تمام ماڈریٹرزکو ایک پیغام بھیجیں۔"
+    flag_sockpuppets: "اگر ایک نیا صارف اُسی IP ایڈریس سے کسی ٹاپک پر جواب دیتا ہے جس IP ایڈریس سے ایک دوسرے نئے صارف نے وہی ٹاپک شروع کیا تھا، تو اُن دونوں کی پوسٹس کو ممکنہ سپَیم کے طور پر فلَیگ کریں۔"
+    traditional_markdown_linebreaks: "مارکڈائون میں روایتی لائن وقفے کا استعمال کریں، جس میں ایک لائن وقفے کیلئے دو ٹریلنگ خالی جگہوں کی ضرورت ہوتی ہے۔"
+    enable_markdown_linkify: "ٹیکسٹ جو ایک لنک کی طرح لگے اُسے خود کار طریقے سے ایک لنک کے طور پر دکھائیں: www.site.com اور http://site.com خود کار طریقے سے لِنک کر دیے جائیں گے"
+    markdown_linkify_tlds: "سب سے اوپر کی سطح کے ڈَومینز کی فہرست جو خود بخود لِنکس کے طور پر دکھائے جاتے ہیں"
+    post_undo_action_window_mins: "منٹوں کی تعداد جب تک صارفین کو ایک پوسٹ پر حالیہ کارروائیوں (لائیک، فلَیگ، وغیرہ) کو واپس کرلینے کی اجازت ہے۔"
+    must_approve_users: "سائٹ تک رسائی حاصل کرنے سے پہلے اسٹاف کو تمام نئے صارف اکاؤنٹس کو منظور کرنا ضروری ہے۔ انتباہ: کسی لائیو سائٹ کیلئے اِس کو فعال کرنے سے غیر اسٹاف صارفین کیلئے رسائی منسوخ ہو جائے گی!"
+    pending_users_reminder_delay: "ماڈریٹرز کو مطلع کریں اگر نئے صارفین اِس سے زیادہ گھنٹوں سے منظوری کے منتظر ہوں۔ اطلاعات کو غیر فعال کرنے کیلئے -1 سَیٹ کریں۔"
+    maximum_session_age: "آخری وزٹ سے ن گھنٹوں بعد تک صارف کو لاگڈ اِن رکھا جائے گا"
+    ga_universal_tracking_code: "گُوگل یونیوَرسل اَینَیلَیٹِکس (analytics.js) ٹرَیکِنگ کَوڈ کَوڈ، مثال: UA-12345678-9؛ دیکھیے http://google.com/analytics"
+    ga_universal_domain_name: "گُوگل یونیوَرسل اَینَیلَیٹِکس (analytics.js) ڈَومَین نام، مثال: mysite.com؛ دیکھیے http://google.com/analytics"
+    ga_universal_auto_link_domains: "گُوگل یونیوَرسل اَینَیلَیٹِکس (analytics.js) کراس ڈَومَین ٹرَیکِنگ فعال کریں۔ اِن ڈومینز کے باہر جانے والے لِنکس کے ساتھ کلائینٹ id شامل کر دی جائے گی۔ گُوگل کی کراس ڈَومَین ٹریکنگ گائیڈ ملاحظہ کریں۔"
+    gtm_container_id: "گُوگل ٹیگ مینیجر کی کنٹینر آئی ڈی. مثال: GTM-ABCDEF"
+    enable_escaped_fragments: "اگر کسی وَیب کرالر کا پتہ نہ لگے تو گُوگل اَیجَیکس-کرالِنگ API کا استعمال کریں۔ دیکھیے https://developers.google.com/webmasters/ajax-crawling/docs/learn-more"
+    allow_moderators_to_create_categories: "منتظمین کو نئے زُمرہ جات بنانے کی اجازت دیں"
+    cors_origins: "وہ اَوریجِن جن کیلئے کراس-اَوریجِن درخواستوں (CORS) کی اجازت ہے۔ ہراَوریجِن میں http:// یا https:// شامل ہونا ضروری ہے۔ CORS کو فعال کرنے کیلئے DISCOURSE_ENABLE_CORS کی وَیلِیو ٹرُو پر مقرر ہونا لاذمی ہے۔"
+    use_admin_ip_whitelist: "ایڈمن صرف اُس صورت میں لاگ ان کرسکتے ہیں اگر وہ ایسے IP ایڈریس میں ہیں جو اسکرین کردہ آئی پیز کی فہرست (ایڈمن > لاگز > اسکرین کردہ آئی پیز) میں بیان کیا گیا ہو۔"
+    blacklist_ip_blocks: "نجی IP بلاکس کی فہرست جو ڈِسکَورس کی طرف سے کبھی کرال نہیں ہونی چاہئیں"
+    whitelist_internal_hosts: "اندرونی ہَوسٹس کی فہرست جو ڈِسکَورس محفوظ طریقے سے وَن باکس اور دیگر مقاصد کیلئے کرال کر سکتا ہے"
+    allowed_iframes: "iframe src ڈَومَین کے سابقوں کی ایک فہرست جو ڈِسکَورس محفوظ طریقے سے پوسٹس میں شامل ہونے کی اجازت دے سکتا ہے"
+    whitelisted_crawler_user_agents: 'وَیب کرالرز کے صارف ایجنٹوں جن کو اِس سائٹ تک رسائی کی اجازت دی جانی چاہیئے۔'
+    slow_down_crawler_rate: 'اگر slow_down_crawler_user_agents کی وضاحت کی گئی ہے تو یہ شرح تمام کرالرز پر لاگو ہوگی (درخواستوں کے درمیان سیکنڈوں کی تاخیر)'
+    top_menu: "اِس بات کا تعین کریں کہ ہَوم پیج نیویگیشن پر کونسی، اور کس ترتیب کے ساتھ اشیاء ظاہر ہوں۔ مثال کے طور پر تازہ ترین|نئی|بغیر پڑھی|زُمرہ جات|ٹاپ|پڑھ لیے گئے|شائع کیے|بُکمارکس"
+    post_menu: "اِس بات کا تعین کریں کہ پوسٹ مَینِیو پر کونسی، اور کس ترتیب کے ساتھ اشیاء ظاہر ہوں۔ مثال کے طور پر لائیک|ترمیم| فلَیگ|حذف|شئیر|بُکمارک|جواب"
+    post_menu_hidden_items: "پوسٹ مینیو میں ڈیفالٹ کے طور پرچھپائی جانے والی اشیاء جب تک کسی توسیعی ellipsis پر کلِک نہ کیا جائے۔"
+    share_links: "اِس بات کا تعین کریں کہ شیئر ڈائیلاگ پر کونسی، اور کس ترتیب کے ساتھ اشیاء ظاہر ہوں۔"
+    track_external_right_clicks: "بیرونی لِنکس جن پر دائیاں کلک کیا جائے اُن کو ٹریک کریں (مثال: نئے ٹیب میں کھولیں) ڈیفالٹ کے طور پر غیر فعال، کیونکہ یہ URLs کو رِیرائیٹ کر دیتا ہے"
+    site_contact_username: "ایک درست سٹاف صارف نام جس کی طرف سے تمام خود کار طریقے سے پیغامات بھیجے جائیں۔ اگر خالی چھوڑ دیا گیا ہو تو ڈیفالٹ سِسٹم اکاؤنٹ استعمال کیا جائے گا۔"
+    send_welcome_message: "تمام نئے صارفین کو فوری شروعات کے گائیڈ کے ساتھ خوش آمدید کا پیغام بھیجیں۔"
+    suppress_reply_directly_below: "پوسٹ پر وسیع ہو سکنے والا جوابات کی تعداد مت دکھائیں جب اِس پوسٹ کے براہ راست نیچے ایک ہی واحد جواب موجود ہو۔"
+    suppress_reply_directly_above: "پوسٹ پر وسیع ہو سکنے والا جس-کے-جواب-میں مت دکھائیں جب اِس پوسٹ کے براہ راست اوپر ایک ہی واحد جواب موجود ہو۔"
+    suppress_reply_when_quoting: "پوسٹ پر وسیع ہو سکنے والا جس-کے-جواب-میں مت دکھائیں جب پوسٹ میں جواب کا اقتباس شامل ہو۔"
+    max_reply_history: "جس-کے-جواب-میں توسیع کرتے وقت، توسیع کیے گئے جوابات کی زیادہ سے زیادہ تعداد"
+    topics_per_period_in_top_summary: "ڈیفالٹ کے طور پر ٹاپ ٹاپکس خلاصہ میں دکھائے گئے ٹاپ ٹاپکس کی تعداد۔"
+    topics_per_period_in_top_page: "توسیع کردہ ٹاپ ٹاپکس 'مزید دکھائیں' میں دکھائے گئے ٹاپ ٹاپکس کی تعداد۔"
+    redirect_users_to_top_page: "نئے اور طویل غیر حاضر صارفین کو خود کار طریقے سے ٹاپ صفحے پر ریڈائرَیکٹ کریں۔"
+    top_page_default_timeframe: "ٹاپ وِیُو صفحے کیلئے ڈِیفالٹ ٹائم فریم۔"
+    show_email_on_profile: "صارف کا ای میل اُن کی پروفائل پر دکھائیں (صرف خود اُنہیں اور سٹاف کو نظر آتا ہے)"
+    prioritize_username_in_ux: "صارف صفحے، صارف کارڈ اور پوسٹس پر پہلے صارف نام دکھائیں (جب غیر فعال ہو تو نام پہلے دکھایا جاتا ہے)"
+    enable_rich_text_paste: "کمپَوزر میں ٹیکسٹ پَیسٹ کرتے وقت خود کار طریقہ سے HTML سے مارکڈائون میں تبادلہ فعال کریں۔ (تجرباتی)"
+    email_token_valid_hours: "پاسورڈ بھولنے / اکاؤنٹ چالو کرنے کے ٹوکن (ن) گھنٹوں کیلئے درست ہیں۔"
+    enable_badges: "بَیج سِسٹم فعال کریں"
+    enable_whispers: "ٹاپک کے اندر سٹاف کے درمیان ذاتی مواصلات کی اجازت دیں۔"
+    allow_index_in_robots_txt: "robots.txt فائل میں وضاحت کریں کہ یہ سائٹ وَیب سرچ اِنجنوں کی طرف سے انڈیکس کی جاسکتی ہے۔"
+    email_domains_blacklist: "ای میل ڈومینز کی پائپ سے علیحدہ کردہ فہرست جن کے ساتھ صارفین کو اکاؤنٹس رجسٹر کرنے کی اجازت نہیں ہے۔ مثال: mailinator.com|trashmail.net"
+    email_domains_whitelist: "ای میل ڈومینز کی پائپ سے علیحدہ کردہ فہرست جن کے ساتھ صارفین کو اکاؤنٹس رجسٹر کرنا لاذمی ہے۔ انتباہ: اِس فہرست کے علاوہ ای میل ڈومینز والے صارفین کو روک دیا جائے گی!"
+    hide_email_address_taken: "سائن اَپ کے دوران اور بھولا پاسورڈ فارم سے صارفین کو مطلع نہ کریں کہ فراہم کیے گئے ای میل ایڈریس کے ساتھ ایک اکاؤنٹ موجود ہے۔"
+    log_out_strict: "لاگ آؤٹ ہونے پر، صارف کیلئے تمام ڈِیوائیسِز پر تمام سیشنوں کو لاگ آؤٹ کریں"
+    version_checks: "ورژن اپ ڈیٹ کیلئے ڈِسکورس ہَب کو پِنگ کریں اور /admin ڈیش بورڈ پر نئے ورژن کا پیغام دکھائیں"
+    new_version_emails: "جب ڈِسکورس کا نیا ورژن دستیاب ہو تو contact_email ایڈریس پر ایک ای میل بھیجیں۔"
+    invite_expiry_days: "دنوں میں، کتنے عرصے تک صارف دعوت نامہ کلیدیں درست رہیں"
+    invite_only: "عوامی رجسٹریشن غیر فعال ہے، تمام نئے صارفین کو واضح طور پر سٹاف کی طرف سے مدعو کیا جانا لاذمی ہے۔"
+    login_required: "اِس سائٹ پر مواد پڑھنے کیلئے اکاؤنٹ کی توثیق ہونا ضروری بنائیں، گمنام صارفین تک رسائی کو مسترد کریں۔"
+    min_username_length: "حروف میں صارف نام کی کم از کم لمبائی۔ انتباہ: اگر کوئی موجودہ صارفین یا گروپوں کے نام اِس سے چھوٹے ہیں، تو آپ کی سائٹ ٹوٹ جائے گی!"
+    max_username_length: "حروف میں صارف نام کی زیادہ سے زیادہ لمبائی۔ انتباہ: اگر کوئی موجودہ صارفین یا گروپوں کے نام اِس سے زیادہ لمبے ہیں، تو آپ کی سائٹ ٹوٹ جائے گی!"
+    reserved_usernames: "صارف نام جن کیلئے سائن اَپ کی اجازت نہیں ہے۔ وائلڈ کارڈ علامت * کسی بھی حرف کو صفر یا اِس سے زیادہ بار میچ کرنے کیلئے استعمال کیا جا سکتا ہے۔"
+    min_password_length: "پاسورڈ کی کم از کم لمبائی۔"
+    min_admin_password_length: "اَیڈمن کیلئے پاسورڈ کی کم از کم لمبائی۔"
+    password_unique_characters: "منفرد حروف کی کم از کم تعداد جو پاسورڈ میں ہونا لاذمی ہے۔"
+    block_common_passwords: "ایسا پاسورڈ جو 10،000 سب سے زیادہ عام پاسورڈز میںشامل ہو، اۃسے رکھنے کی اجازت نہ دیں۔"
+    enable_sso: "بیرونی سائٹ کے ذریعہ واحد سائن اَن کو فعال کریں (انتباہ: صارفین کے ای میل ایڈریس بیرونی سائٹ کی طرف سے توثیق کیے جانا *لازمی* ہے!)"
+    verbose_sso_logging: "بہت زیادہ تفصیلی SSO سے متعلقہ تشخیص /logs میں ریکارڈ کریں"
+    enable_sso_provider: "/session/sso_provider کے اینڈپوائنٹ پر ڈِسکورس SSO پرووَائیڈر پروٹوکول کو نافذ کریں، sso_secret کو مقرر کیا جانا ضروری ہے"
+    sso_url: "URL واحد سائن اَن اینڈپوائنٹ کا (اhttp:// یا https:// کا شامل ہونا لاذمی ہے)"
+    sso_secret: "خفیہ سٹرنگ جو کرِیپٹَوگرافی کے زریعہ SSO معلومات کی توثیق کرنے کیلئے استعمال کیا جاتا ہے، یقینی بنائیں کہ یہ 10 یا اُس سے زیادہ حروف لمبا ہے"
+    sso_overrides_bio: "صارف پروفائل میں صارف کی بائیو کی جگہ لے لیتا ہے اور اِس کو تبدیل کرنے سے صارف کو روک دیتا ہے"
+    sso_overrides_email: "ہر لاگ اِن پر SSO پے لوڈ سے بیرونی ویب سائٹ ای میل مقامی ای میل کی جگہ لے لیتا ہے، اور مقامی تبدیلیوں کو روک دیتا ہے۔ (انتباہ: مقامی ای میلز کو معمول پر لانے کی وجہ سے اختلافات ہوسکتے ہیں)"
+    sso_overrides_username: "ہر لاگ اِن پر SSO پے لوڈ سے بیرونی ویب سائٹ صارف نام مقامی صارف نام کی جگہ لے لیتا ہے، اور مقامی تبدیلیوں کو روک دیتا ہے۔ (انتباہ: صارف نام کی لمبائی/ضروریات کے فرق کی وجہ سے اختلافات ہوسکتے ہیں)"
+    sso_overrides_name: "ہر لاگ اِن پر SSO پے لوڈ سے بیرونی ویب سائٹ پورا نام مقامی پورا نام کی جگہ لے لیتا ہے، اور مقامی تبدیلیوں کو روک دیتا ہے۔"
+    sso_overrides_avatar: "SSO پے لوڈ سے بیرونی ویب سائٹ اوتار صارف اوتار کی جگہ لے لیتا ہے۔ اگر فعال ہو تو، allow_uploaded_avatars کو غیر فعال کر دینا تجویز کیا جاتا ہے"
+    sso_not_approved_url: "غیر منظور شدہ SSO اکاؤنٹس کو اِس URL پر ریڈائرَیکٹ کریں"
+    sso_allows_all_return_paths: "SSO کے ذریعہ فراہم کردہ return_paths کیلئے ڈَومین کو محدود نہ کریں (ڈِیفالٹ کے طور پر ریٹرن پاتھ کا موجودہ سائٹ پر ہونا لاذمی ہے)"
+    enable_local_logins_via_email: "صارفین کو بذریعہ ای میل بھیجے جانے والے ایک کلِک لاگ اِن لِنک کی درخواست کرنے کی اجازت دیں۔"
+    allow_new_registrations: "نئے صارف رجسٹریشنوں کی اجازت دیں۔ کسی کو نیا اکاؤنٹ بنانے سے روکنے کیلئے اس کو غیر چیک شدہ کریں۔"
+    enable_signup_cta: "واپس آنے والے گمنام صارفین کو ایک نوٹس دکھائیں جو اُنہیں اکاؤنٹ بنانے کیلۓ قائل کرے۔"
+    enable_yahoo_logins: "یاہُو توثیق کو فعال کریں"
+    enable_google_oauth2_logins: "گُوگل Oauth2 توثیق کو فعال کریں۔ گُوگل فی الحال اِس توثیق کے طریقہ کی اجازت دیتا ہے۔ کلید اور سیکرٹ کی ضرورت ہے۔"
+    google_oauth2_client_id: "آپ کی گُوگل ایپلی کیشن کی کلائنٹ آئی ڈی."
+    google_oauth2_client_secret: "آپ کی گُوگل ایپلی کیشن کا کلائنٹ سیکرٹ."
+    google_oauth2_prompt: "خالی جگہ سے علیحدہ کردہ سٹرنگ وَیلِیوز کی فہرست جو اِس بات کی وضاحت کرتی ہے کہ اَوتھرائزیشن سرور صارف کو دوبارہ تصدیق اور رضامندی کیلئے پوچھتا ہے کہ نہیں۔ ممکنہ اقدار کیلئے https://developers.google.com/identity/protocols/OpenIDConnect#prompt دیکھیں۔"
+    google_oauth2_hd: "گُوگل اَیپس ہوسٹِڈ ڈومَین جس تک کہ سائن اِن محدود ہو گا۔ مزید تفصیلات کیلئے https://developers.google.com/identity/protocols/OpenIDConnect#hd-param ملاحظہ کریں۔"
+    enable_twitter_logins: "ٹویٹر توثیق کو فعال کریں، twitter_consumer_key اور twitter_consumer_secret کی ضرورت ہے"
+    twitter_consumer_key: "ٹویٹر توثیق کیلئے کنزِیُومر کلید، https://apps.twitter.com/ پر رجسٹر کردہ"
+    twitter_consumer_secret: "ٹویٹر توثیق کیلئے کنزِیُومر سیکرٹ، https://apps.twitter.com/ پر رجسٹر کردہ"
+    enable_instagram_logins: "اِنسٹاگرام توثیق کو فعال کریں، instagram_consumer_key اور instagram_consumer_secret کی ضرورت ہے"
+    instagram_consumer_key: "اِنسٹاگرام توثیق کیلئے کنزِیُومر کلید"
+    instagram_consumer_secret: "اِنسٹاگرام توثیق کیلئے کنزِیُومر سیکرٹ"
+    enable_facebook_logins: "فَیس بُک توثیق کو فعال کریں، facebook_app_id اور facebook_app_secret کی ضرورت ہے"
+    facebook_app_id: "فَیس بُک توثیق کیلئے اَیپ آئی ڈی، https://developers.facebook.com/apps پر رجسٹر کردہ"
+    facebook_app_secret: "فَیس بُک توثیق کیلئے اَیپ سیکرٹ، https://developers.facebook.com/apps پر رجسٹر کردہ"
+    enable_github_logins: "گِٹ ہَب توثیق کو فعال کریں، github_client_id اور github_client_secret کی ضرورت ہے"
+    github_client_id: "گِٹ ہَب توثیق کیلئے کلائنٹ آئی ڈی، https://github.com/settings/applications پر رجسٹر کردہ"
+    github_client_secret: "گِٹ ہَب توثیق کیلئے کلائنٹ سیکرٹ، https://github.com/settings/applications پر رجسٹر کردہ"
+    readonly_mode_during_backup: "بیک اَپ کرتے وقت صرف پڑھنے کا مَوڈ فعال کریں"
+    enable_backups: "ایڈمِنِسٹریٹروں کو فورم کے بیک اَپ بنانے کی اجازت دیں"
+    allow_restore: "رِیسٹور کی اجازت دیں، جو سائٹ کا تمام ڈیٹا تبدیل کر سکتا ہے! فالس چھوڑ دیں جب تک کہ آپ بیک اَپ بحال نہ کرنے لگیں"
+    maximum_backups: "ڈِسک پر رکھے جانے بیک اَپس کی زیادہ سے زیادہ تعداد۔ پرانے بیک اَپس خود کار طریقے سے حذف کر دیے جاتے ہیں"
+    automatic_backups_enabled: "خودکار بیک اَپس چلائیں جیسا کہ بیک اَپ فریکوئنسی میں بیان کیا گیا ہے"
+    backup_frequency: "بَیک اَپس کے درمیان دنوں کی تعداد۔"
+    enable_s3_backups: "مکمل ہونے پر S3 پر بیک اَپس اَپلوڈ کریں۔ اہم: فائل ترتیبات میں درست S3 اسناد کا درج ہونا ضروری ہے۔"
+    s3_backup_bucket: "بیک اَپس رکھنے کیلئے ریمَوٹ بَکِّٹ۔ انتباہ: یقینی بنائیں کہ یہ ایک زاتی بَکِّٹ ہے۔"
+    s3_disable_cleanup: "جب مقامی طور پر بیک اَپ ہٹا دیا جائے اُس کے ساتھ S3 پر سے بھی ہٹا دینا غیر فعال کریں۔"
+    backup_time_of_day: "دن کا وقت UTC جب بیک اَپ ہونا چاہئے۔"
+    backup_with_uploads: "شیڈول کردہ بیک اَپس میں اپلوڈز شامل کریں۔ اِس کو غیر فعال کرنے پر صرف ڈَیٹا بَیس بیک اَپ کیا جائے گا۔"
+    active_user_rate_limit_secs: "سیکنڈوں میں، 'last_seen_at' فیلڈ کو ہم کتنی بار اَپ ڈیٹ کریں"
+    verbose_localization: "UI میں توسیعی لَوکلائزَیشن کی تجاویز دکھائیں"
+    previous_visit_timeout_hours: "ایک وِزٹ کتنا لمبا ہونا چاہئے جس کے بعد ہم اُسے 'پچھلا' وِزٹ سمجھنا شروع کر دیں، گھنٹوں میں"
+    top_topics_formula_log_views_multiplier: "ٹاپ ٹاپکس کے فارمولے میں لاگ وِیوز کے مَلٹیپلائر (ن) کی عدد: `log(views_count) * (n) + op_likes_count * 0.5 + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
+    top_topics_formula_first_post_likes_multiplier: "ٹاپ ٹاپکس کے فارمولے میں پہلی پوسٹ لائیکس کے مَلٹیپلائر (ن) کی عدد: `log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
+    top_topics_formula_least_likes_per_post_multiplier: "ٹاپ ٹاپکس کے فارمولے میں فی پوسٹ کم از کم لائیکس کے مَلٹیپلائر (ن) کی عدد: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
+    rebake_old_posts_count: "ہر 15 منٹ پر رِیبَیک کرنے والی پرانی پوسٹس کی تعداد۔"
+    rate_limit_create_topic: "ایک ٹاپک بنانے کے بعد، کوئی دوسرا ٹاپک بنانے سے پہلے صارفین کو (ن) سیکنڈوں کیلئے انتظار کرنا ہوگا۔"
+    rate_limit_create_post: "ایک پوسٹ شائع کرنے کے بعد، دوسری پوسٹ بنانے سے پہلے صارفین کو (ن) سیکنڈوں کیلئے انتظار کرنا ہوگا۔"
+    rate_limit_new_user_create_topic: "ایک ٹاپک بنانے کے بعد، کوئی دوسرا ٹاپک بنانے سے پہلے نئے صارفین کو (ن) سیکنڈوں کیلئے انتظار کرنا ہوگا۔"
+    rate_limit_new_user_create_post: "ایک پوسٹ شائع کرنے کے بعد، دوسری پوسٹ بنانے سے پہلے نئے صارفین کو (ن) سیکنڈوں کیلئے انتظار کرنا ہوگا۔"
+    max_likes_per_day: "فی صارف ایک دن کے لائیکس کی زیادہ سے زیادہ تعداد۔"
+    max_flags_per_day: "فی صارف ایک دن کے فلَیگز کی زیادہ سے زیادہ تعداد۔"
+    max_bookmarks_per_day: "فی صارف ایک دن کے بُکمارکس کی زیادہ سے زیادہ تعداد۔"
+    max_edits_per_day: "فی صارف ایک دن کے ترامیم کی زیادہ سے زیادہ تعداد۔"
+    max_topics_per_day: "ایک صارف کے فی دن بنائے گئے ٹاپکس کی زیادہ سے زیادہ تعداد۔"
+    max_personal_messages_per_day: "صارفین کے فی دن بنائے گئے پیغامات کی زیادہ سے زیادہ تعداد۔"
+    max_invites_per_day: "ایک صارف کے فی دن بھیجی گئی دعوتوں کی زیادہ سے زیادہ تعداد۔"
+    max_topic_invitations_per_day: "ایک صارف کے فی دن بھیجی گئی ٹاپک دعوتوں کی زیادہ سے زیادہ تعداد۔"
+    max_logins_per_ip_per_hour: "ایک IP ایڈریس سے فی گھنٹہ لاگ اِنوں کی زیادہ سے زیادہ تعداد"
+    max_logins_per_ip_per_minute: "ایک IP ایڈریس سے فی منٹ لاگ اِنوں کی زیادہ سے زیادہ تعداد"
+    alert_admins_if_errors_per_minute: "اِیڈمن الرٹ کو متحرک کرنے کیلئے فی منٹ خرابیوں کی تعداد۔ 0 کی وَیلِیو اِس خصوصیت کو غیر فعال کردیتی ہے۔ نوٹ: رِیسٹارٹ ضروری ہے۔"
+    alert_admins_if_errors_per_hour: "اِیڈمن الرٹ کو متحرک کرنے کیلئے فی گھنٹہ خرابیوں کی تعداد۔ 0 کی وَیلِیو اِس خصوصیت کو غیر فعال کردیتی ہے۔ نوٹ: رِیسٹارٹ ضروری ہے۔"
+    categories_topics: "/categories صفحے پر دکھائے جانے والے ٹاپکس کی تعداد۔"
+    suggested_topics: "ٹاپک کے نچلے حصے پر دکھائے گئے تجویز کردہ ٹاپکس کی تعداد۔"
+    limit_suggested_to_category: "تجویز کردہ ٹاپکس میں صرف موجودہ زُمرہ سے ٹاپکس دکھائیں۔"
+    suggested_topics_max_days_old: "تجویز کردہ ٹاپکس ن دنوں سے زیادہ پرانے نہیں ہونے چاہئیں۔"
+    clean_up_uploads: "غیر قانونی ہوسٹنگ کو روکنے کیلئے یتیم غیر حوالہ دیے گئے اَپ لوڈ ہٹائیں۔ انتباہ: آپ اِس ترتیب کو فعال کرنے سے پہلے آپ شاید /uploads ڈائریکٹری کو بیک اَپ کرنا چاہیں گے۔"
+    clean_orphan_uploads_grace_period_hours: "یتیم اَپ لوڈ ہٹانے سے پہلے رعایتی مدت (گھنٹوں میں)۔"
+    purge_deleted_uploads_grace_period_days: "حذف کردہ اَپ لوڈ مٹا دینے سے پہلے رعایتی مدت (دنوں میں)۔"
+    purge_unactivated_users_grace_period_days: "صارف کی طرف سے اکاؤنٹ اَیکٹیوَیٹ نہ کرنے کی رعایتی مدت (دنوں میں)، جس کے بعد اکاؤنٹ حذف کر دیا جائے گا۔ غیر اَیکٹیوَیٹ کردہ صارفین کو کبھی نہ ہٹانے کیلئے 0 مقرر کریں۔"
+    enable_s3_uploads: "اَیمَیزَون S3 سٹوریج پر اَپ لوڈز رکھیں۔ اہم: درست S3 اسناد ضروری ہیں (دونوں ایکسَیس قی آئی ڈی اور سیکرٹ ایکسَیس قی دونوں کا ہونا ضروری ہو)۔"
+    s3_use_iam_profile: 'S3 بَکِّٹ تک رسائی فراہم کرنے کیلئے <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html">AWS EC2 اِنسٹَنس پرَوفائل</a> کا استعمال کریں۔ نوٹ: اِس کو فعال کرنے کیلئے ڈِسکورس کو مناسب طریقے سے ترتیب کردہ ایک EC2 اِنسٹَنس کے اندر چلانے کی ضرورت ہوتی ہے، اور "s3 ایکسَیس کلید آئی ڈی" اور "s3 سیکرٹ ایکسَیس کلید" کی ترتیبات کی جگہ لے لیتا ہے۔'
+    s3_upload_bucket: "اَیمَیزَون S3 بَکِّٹ کا نام جس میں فائلیں اَپ لوڈ کی جائیں گی۔ انتباہ: لوئر کَیس، کسی قسم کے پیریڈ، یا انڈر سکور لازمی طور پر نہیں ہونے چاہئیں۔"
+    s3_access_key_id: "اَیمَیزَون S3 ایکسَیس کلید آئی ڈی جو تصاویر کو اَپ لوڈ کرنے کیلئے استعمال کیا جائے گی۔"
+    s3_secret_access_key: "اَیمَیزَون S3 سیکرٹ ایکسَیس کلید جو تصاویر کو اَپ لوڈ کرنے کیلئے استعمال کیا جائے گی۔"
+    s3_region: "اَیمَیزَون S3 خطے کا نام جو تصاویر کو اَپ لوڈ کرنے کیلئے استعمال کیا جائے گی۔"
+    s3_cdn_url: "تمام s3 اثاثوں کیلئے استعمال ہونے والا CDN URL (مثال: https://cdn.somewhere.com)۔ انتباہ: اِس ترتیب کو تبدیل کرنے کے بعد آپ کو تمام پرانی پوسٹس کو رِیبَیک کرنا ہوگا۔"
+    avatar_sizes: "خود کار طریقے سے تیار کردہ اوتار کے سائزوں کی فہرست۔"
+    external_system_avatars_enabled: "بیرونی سسٹم کی اوتار سروس کا استعمال کریں۔"
+    external_system_avatars_url: "بیرونی سسٹم کی اوتار سروس کا URL۔ اجازت شدہ متبادلات {username} {first_letter} {color} {size} ہیں"
+    default_opengraph_image_url: "ڈِیفالٹ اَوپَن٘گراف تصویر کا URL۔"
+    twitter_summary_large_image_url: "ٹویٹر خلاصہ کارڈ کی ڈِیفالٹ تصویر کا URL (کم از کم 280px چوڑائی، اور کم از کم 150px اونچائی کے سائز میں ہونا چاہئے)۔"
+    allow_all_attachments_for_group_messages: "گروپ کے پیغامات کیلئے تمام ای میل منسلکات کی اجازت دیں۔"
+    png_to_jpg_quality: "تبدیل شدہ JPG فائل کا معیار (1 سب سے کم معیار ہے، 99 بہترین معیار ہے، 100 غیر فعال)۔"
+    allow_staff_to_upload_any_file_in_pm: "سٹاف ارکان کو PM میں کوئی بھی فائل اَپ لوڈ کرنے کی اجازت دیں۔"
+    strip_image_metadata: "تصویر مَیٹا ڈَیٹا کو ہٹائیں۔"
+    enable_flash_video_onebox: "وَن باکس میں swf اور flv (اَیڈَوبِ فلَیش) لِنکس کو اَیمبَیڈ کرنے کی اجازت دیں۔ انتباہ: یہ سیکورٹی خطروں کو متعارف کرا سکتا ہے۔"
+    default_invitee_trust_level: "مدعو صارفین کیلئے ڈِیفالٹ ٹرسٹ لَیول (0-4)۔"
+    default_trust_level: "تمام نئے صارفین کیلئے ڈِیفالٹ ٹرسٹ لَیول (0-4)۔ انتباہ! اِسے تبدیل کرنے سے آپ کو سپَیم کیلئے سنگین خطرہ لاہک ہو جائے گا۔"
+    tl1_requires_topics_entered: "ٹرسٹ لَیول 1 پر ترقی ملنے سے قبل کتنے ٹاپکس میں ایک نئے صارف کا داخل ہونا ضروری ہے۔"
+    tl1_requires_read_posts: "ٹرسٹ لَیول 1 پر ترقی ملنے سے قبل کتنی پوسٹس کو ایک نئے صارف کا پڑھنا ضروری ہے۔"
+    tl1_requires_time_spent_mins: "ٹرسٹ لَیول 1 پر ترقی ملنے سے قبل کتنے منٹوں تک پوسٹس کا پڑھنا ایک نئے صارف کیلئے ضروری ہے۔"
+    tl2_requires_topics_entered: "ٹرسٹ لَیول 2 پر ترقی ملنے سے قبل کتنے ٹاپکس میں ایک صارف کا داخل ہونا ضروری ہے۔"
+    tl2_requires_read_posts: "ٹرسٹ لَیول 2 پر ترقی ملنے سے قبل کتنی پوسٹس کو ایک صارف کا پڑھنا ضروری ہے۔"
+    tl2_requires_time_spent_mins: "ٹرسٹ لَیول 2 پر ترقی ملنے سے قبل کتنے منٹوں تک پوسٹس کا پڑھنا ایک صارف کیلئے ضروری ہے۔"
+    tl2_requires_days_visited: "ٹرسٹ لَیول 2 پر ترقی ملنے سے قبل کتنے دنوں تک ایک صارف کا سائٹ وزٹ کرنا ضروری ہے۔"
+    tl2_requires_likes_received: "ٹرسٹ لَیول 2 پر ترقی ملنے سے قبل کتنے لائیکس ایک صارف کو موصول ہونا ضروری ہے۔"
+    tl2_requires_likes_given: "ٹرسٹ لَیول 2 پر ترقی ملنے سے قبل کتنے لائیکس ایک صارف کو کاسٹ کرنا ضروری ہے۔"
+    tl2_requires_topic_reply_count: "ٹرسٹ لَیول 2 پر ترقی ملنے سے قبل کتنے ٹاپکس کا ایک صارف کو جواب دینا ضروری ہے۔"
+    tl3_time_period: "ٹرسٹ لَیول 3 کے تقاضات کیلئے وقت کی مدت (دنوں میں)"
+    tl3_requires_days_visited: "ٹرسٹ لَیول 3 پر ترقی کیلئے کوالیفائی کرنے کیلئے کسی صارف کی طرف سے آخری (ٹ.ل.3 وقت کی مدت) دنوں میں سائٹ کے دوروں کی کم از کم تعداد۔ ٹ.ل.3 پر ترقی غیر فعال کرنے کیلئے ٹ.ل.3 وقت کی مدت سے زیادہ سَیٹ کریں۔ (0 یا اُس سے زیادہ)"
+    tl3_requires_topics_replied_to: "ٹرسٹ لَیول 3 پر ترقی کیلئے کوالیفائی کرنے کیلئے کسی صارف کی طرف سے آخری (ٹ.ل.3 وقت کی مدت) دنوں میں جواب دیے گئے ٹاپکس کی کم از کم تعداد۔ (0 یا اُس سے زیادہ)"
+    tl3_requires_topics_viewed: "ٹرسٹ لَیول 3 پر ترقی کیلئے کوالیفائی کرنے کیلئے آخری (ٹ.ل.3 وقت کی مدت) دنوں میں تخلیق کردہ نئے ٹاپکس میں سے کتنے فیصد ایک صارف کی طرف سے دیکھے گئے ہونے چاہئیں۔ (0 سے 100)"
+    tl3_requires_topics_viewed_cap: "گزشتہ (ٹ.ل.3 وقت کی مدت) دنوں میں دیکھے گئے ٹاپکس کی زیادہ سے زیادہ مطلوبہ تعداد۔"
+    tl3_requires_posts_read: "ٹرسٹ لَیول 3 پر ترقی کیلئے کوالیفائی کرنے کیلئے آخری (ٹ.ل.3 وقت کی مدت) دنوں میں تخلیق کردہ نئی پوسٹس میں سے کتنے فیصد ایک صارف کی طرف سے دیکھی گئی ہونی چاہئیں۔ (0 سے 100)"
+    tl3_requires_posts_read_cap: "گزشتہ (ٹ.ل.3 وقت کی مدت) دنوں میں دیکھے گئی پوسٹس کی زیادہ سے زیادہ مطلوبہ تعداد۔"
+    tl3_requires_topics_viewed_all_time: "ٹرسٹ لَیول 3 کیلئے کوالیفائی کرنے کیلئے صارف کی طرف سے کُل دیکھے گئے ٹاپکس کی کم از کم تعداد۔"
+    tl3_requires_posts_read_all_time: "ٹرسٹ لَیول 3 کیلئے کوالیفائی کرنے کیلئے صارف کی طرف سے کُل پڑھی گئی پوسٹس کی کم از کم تعداد۔"
+    tl3_requires_max_flagged: "ٹرسٹ لَیول 3 پر ترقی کیلئے کوالیفائی کرنے کیلئے آخری (ٹ.ل.3 وقت کی مدت) دنوں میں صارف کی x سے زیادہ پوسٹس x مختلف صارفین کی طرف سے فلَیگ نہیں کی گئی ہونی چاہئیں، جہاں x اِس ترتیب کی قدر ہے۔ (0 یا اُس سے زیادہ)"
+    tl3_promotion_min_duration: "دنوں کی کم از کم تعداد جب تک ٹرسٹ لَیول 3 پر ترقی قائم رہتی ہے اِس سے پہلے کہ ایک صارف کو ٹرسٹ لَیول 2 پر واپس تنزلی کی جا سکے۔"
+    tl3_requires_likes_given: "ٹرسٹ لَیول 3 پر ترقی کیلئے کوالیفائی کرنے کیلئے آخری (ٹ.ل.3 وقت کی مدت) دنوں میں دیے گئے لائیکس کی کم از کم تعداد۔"
+    tl3_requires_likes_received: "ٹرسٹ لَیول 3 پر ترقی کیلئے کوالیفائی کرنے کیلئے آخری (ٹ.ل.3 وقت کی مدت) دنوں میں موصول ہوئے لائیکس کی کم از کم تعداد۔"
+    tl3_links_no_follow: "ٹرسٹ سطح 3 صارفین کی طرف سے پوسٹ کردہ لنکس سے rel=nofollow نہ ہٹائیں۔"
+    trusted_users_can_edit_others: "اعلیٰ ٹرسٹ لَیول والے صارفین کو دیگر صارفین کے مواد میں ترمیم کرنے کی اجازت دیں"
+    min_trust_to_create_topic: "نئے ٹاپک بنانے کیلئے کم از کم مطلوبہ ٹرسٹ لَیول۔"
+    allow_flagging_staff: "اگر فعال ہو، تو صارف سٹاف اکاؤنٹس کی طرف سے پوسٹس کو فلَیگ کرسکتے ہیں۔"
+    min_trust_to_edit_wiki_post: "وِیکی کے طور پر نشان زدہ پوسٹ میں ترمیم کرنے کیلئے کم از کم مطلوبہ ٹرسٹ لَیول۔"
+    min_trust_to_edit_post: "پوسٹس میں ترمیم کرنے کیلئے کم از کم مطلوبہ ٹرسٹ لَیول۔"
+    min_trust_to_allow_self_wiki: "صارف کی طرف سے اپنی پوسٹ وِیکی بنانے کیلئے کم از کم مطلوبہ ٹرسٹ لَیول۔"
+    min_trust_to_send_messages: "نئے ذاتی پیغامات بنانے کیلئے کم از کم مطلوبہ ٹرسٹ لَیول۔"
+    min_trust_to_send_email_messages: "ای میل کے ذریعہ نئے ذاتی پیغامات (سٹَیجڈ صارفین کو) بھیجنے کیلئے کم از کم مطلوبہ ٹرسٹ لَیول۔"
+    min_trust_to_flag_posts: "پوسٹس فلَیگ کرنے کیلئے کم از کم مطلوبہ ٹرسٹ لَیول"
+    min_trust_to_post_links: "پوسٹس میں لِنکس شامل کرنے کیلئے کم از کم مطلوبہ ٹرسٹ لَیول۔"
+    min_trust_to_post_images: "ایک پوسٹ میں تصاویر شامل کرنے کیلئے کم از کم مطلوبہ ٹرسٹ لَیول۔"
+    newuser_max_links: "ایک نیا صارف ایک پوسٹ میں کتنے لِنکس شامل کر سکتا ہے۔"
+    newuser_max_images: "ایک نیا صارف ایک پوسٹ میں کتنے کتنی تصاویر شامل کر سکتا ہے۔"
+    newuser_max_attachments: "ایک نیا صارف ایک پوسٹ میں کتنی اٹیچمنٹس شامل کر سکتا ہے۔"
+    newuser_max_mentions_per_post: "@نام اطلاعات کی زیادہ سے زیادہ تعداد جو ایک نیا صارف ایک پوسٹ میں استعمال کر سکتا ہے۔"
+    newuser_max_replies_per_topic: "ایک ٹاپک میں ایک نئے صارف کی طرف سے دیے جانے والے جوابات کی زیادہ سے زیادہ تعداد جب تک کہ کوئی اُن کو جواب نہ دے۔"
+    max_mentions_per_post: "@نام اطلاعات کی زیادہ سے زیادہ تعداد جو کوئی ایک پوسٹ میں استعمال کر سکتا ہے۔"
+    max_users_notified_per_group_mention: "ایک گروپ کے ذکر پر نوٹیفکیشن موصول ہونے والے صارفین کی زیادہ سے زیادہ تعداد (اگر حد کراس ہو جائے تو کوئی اطلاع نہیں بھیجی جائے گی)"
+    enable_mentions: "صارفین کو دوسرے صارفین کا ذکر کرنے کی اجازت دیں۔"
+    create_thumbnails: "تصاویر جو پوسٹ میں فِٹ ہونے کیلئے بہت بڑی ہوں، اُن کے تھَمب نَیل اور لائیٹ باکس تصاویر تخلیق کریں۔"
+    email_time_window_mins: "صارفین کو اپنی پوسٹس میں ترمیم اور اُن کو حتمی شکل دینے کا موقع دینے کیلئے، کوئی بھی نوٹیفکیشن ای میل بھیجنے سے قبل (ن) منٹوں تک انتظار کریں۔"
+    personal_email_time_window_seconds: "صارفین کو اپنے پیغامات میں ترمیم اور اُن کو حتمی شکل دینے کا موقع دینے کیلئے، کوئی بھی ذاتی پیغام نوٹیفکیشن ای میل بھیجنے سے قبل (ن) منٹوں تک انتظار کریں۔"
+    email_posts_context: "نوٹیفکیشن ای میل میں سیاق و سباق کے طور پر کتنے پچھلے جوابات شامل کیے جائیں۔"
+    flush_timings_secs: "ہم سرور پر ٹائمنگ ڈَیٹا کتنی دفعہ فَلَش کرتے ہیں، سَیکنڈوں میں۔"
+    title_max_word_length: "ایک ٹاپک کے عنوان میں الفاظ کی زیادہ سے زیادہ لمبائی، حروف میں۔"
+    title_min_entropy: "ایک ٹاپک کے عنوان میں کم از کم مطلوبہ اَینٹراپی (منفرد حروف، مزید کیلئے غیر انگریزی حروف)۔"
+    body_min_entropy: "ایک پوسٹ کے متن میں کم از کم مطلوبہ اَینٹراپی (منفرد حروف، مزید کیلئے غیر انگریزی حروف)۔"
+    allow_uppercase_posts: "ایک ٹاپک عنوان یا پوسٹ متن میں تمام کَیپس کی اجازت دیں۔"
+    title_fancy_entities: "ٹاپک عنوانات میں عام ASCII حروف کو شوخ HTML اشیاء میں تبدیل کریں، بذریعہ SmartyPants http://daringfireball.net/projects/smartypants/"
+    min_title_similar_length: "عنوان کی کم از کم لمبائی، اِس سے پہلے کہاُس کو اُسی طرح کے دوسرے ٹاپکس کیلئے چیک کیا جائے گا۔"
+    min_body_similar_length: "پوسٹ متن کی کم از کم لمبائی، اِس سے پہلے کہاُس کو اُسی طرح کے دوسرے ٹاپکس کیلئے چیک کیا جائے گا۔"
+    desktop_category_page_style: " /categories صفحے کیلئے بصری سٹائل۔"
+    category_colors: "زُمرہ جات کیلئے ہیکسا ڈَیسیمل رنگوں کے اقدار کی ایک فہرست۔"
+    category_style: "زُمرہ بیَجوں کیلئے بصری سٹائل۔"
+    max_image_size_kb: "kB میں تصویر اَپ لوڈ کا زیادہ سے زیادہ سائز۔ یہ اِنجَن٘ اَیکس (client_max_body_size) / اَپَیچی یا پراکسی میں بھی ترتیب دیا جانا لازمی ہے۔"
+    max_attachment_size_kb: "kB میں اٹیچمنٹ فائل اَپ لوڈ کا زیادہ سے زیادہ سائز۔ یہ اِنجَن٘ اَیکس (client_max_body_size) / اَپَیچی یا پراکسی میں بھی ترتیب دیا جانا لازمی ہے۔"
+    authorized_extensions: "اپ لوڈ کیلئے اجازت یافتہ فائل اَیکسٹَینشَنز کی فہرست (تمام فائل اقسام کی اجازت دینے کیلئے '*' کا استعمال کریں)"
+    authorized_extensions_for_staff: "سٹاف صارفین کیلئے `authorized_extensions` سائٹ ترتیب میں بیان کردہ فہرست کے علاوہ اَپ لوڈ کیلئے اجازت یافتہ فائل اَیکسٹَینشَنز کی فہرست۔ (تمام فائل اقسام کی اجازت دینے کیلئے '*' کا استعمال کریں)"
+    theme_authorized_extensions: "تھِیم اپ لوڈز کیلئے اجازت یافتہ فائل اَیکسٹَینشَنز کی فہرست (تمام فائل اقسام کی اجازت دینے کیلئے '*' کا استعمال کریں)"
+    max_similar_results: "ایک نیا ٹاپک کمپوز کرتے وقت کتنے اُسی جیسے دوسرے ٹاپک اَیڈیٹر کے اوپر دکھائے جائیں۔ موازنہ عنوان اور متن پر مبنی ہے۔"
+    max_image_megapixels: "ایک تصویر کیلئے مَیگا پِکسل کی زیادہ سے زیادہ عدد۔"
+    title_prettify: "عام عنوان ٹائپینگ کی غلطیوں کو روکیں، بشمول تمام کَیپس، سب سے پہلے حرف کا لوئر کََیس ہونا، کئی! اور؟، آخر میں اضافی ۔، وغیرہ"
+    topic_views_heat_low: "اتنے وِیوز کے بعد، وِیوز فیلڈ ذرا سی اُجاگر کر دی جاتی ہے۔"
+    topic_views_heat_medium: "اتنے وِیوز کے بعد، وِیوز فیلڈ درمیانی سی اُجاگر کر دی جاتی ہے۔"
+    topic_views_heat_high: "اتنے وِیوز کے بعد، وِیوز فیلڈ زور کے ساتھ اُجاگر کر دی جاتی ہے۔"
+    cold_age_days_low: "گفتگو کے اتنے دنوں کے بعد، آخری سرگرمی کی تاریخ ذرا سی مدھم کر دی جاتی ہے۔"
+    cold_age_days_medium: "گفتگو کے اتنے دنوں کے بعد، آخری سرگرمی کی تاریخ درمیانی سی مدھم کر دی جاتی ہے۔"
+    cold_age_days_high: "گفتگو کے اتنے دنوں کے بعد، آخری سرگرمی کی تاریخ زور سے مدھم کر دی جاتی ہے۔"
+    history_hours_low: "اتنے گھنٹوں میں ترمیم کردہ ایک پوسٹ کا ترمیم اشارہ ذرا سا اُجاگر کر دیا جاتا ہے۔"
+    history_hours_medium: "اتنے گھنٹوں میں ترمیم کردہ ایک پوسٹ کا ترمیم اشارہ درمیانا سا اُجاگر کر دیا جاتا ہے۔"
+    history_hours_high: "اتنے گھنٹوں میں ترمیم کردہ ایک پوسٹ کا ترمیم اشارہ زور کے ساتھ اُجاگر کر دیا جاتا ہے۔"
+    topic_post_like_heat_low: "جب لائیکس:پوسٹ تناسب اِس تناسب سے زیادہ ہو جاتا ہے، تو پوسٹ شمار فیلڈ ذرا سی اُجاگر کر دی جاتی ہے۔"
+    topic_post_like_heat_medium: "جب لائیکس:پوسٹ تناسب اِس تناسب سے زیادہ ہو جاتا ہے، تو پوسٹ شمار فیلڈ درمیانی سی اُجاگر کر دی جاتی ہے۔"
+    topic_post_like_heat_high: "جب لائیکس:پوسٹ تناسب اِس تناسب سے زیادہ ہو جاتا ہے، تو پوسٹ شمار فیلڈ زور کے ساتھ اُجاگر کر دی جاتی ہے۔"
+    faq_url: "اگر آپ کے پاس ایک FAQ کسی اور جگہ پر ہَوسٹ کیا ہوا ہے جو آپ استعمال کرنا چاہتے ہیں، تو یہاں مکمل URL فراہم کریں۔"
+    tos_url: "اگر آپ کے پاس ایک سروس کی شرائط کی دستاویز کسی اور جگہ پر ہَوسٹ کی ہوئی ہے جو آپ استعمال کرنا چاہتے ہیں، تو یہاں مکمل URL فراہم کریں۔"
+    privacy_policy_url: "اگر آپ کے پاس ایک نجی معلومات کی حفاظتی پالیسی کی دستاویز کسی اور جگہ پر ہَوسٹ کی ہوئی ہے جو آپ استعمال کرنا چاہتے ہیں، تو یہاں مکمل URL فراہم کریں۔"
+    log_anonymizer_details: "کیا آیک صارف کو گمنام بنانے کے بعد اُس کی تفصیلات رکھی جائیں کہ نہیں۔ GDPR کے ساتھ تعمیل کرتے وقت آپ کو اِسے بند کر دینے کی ضرورت ہوگی۔"
+    newuser_spam_host_threshold: "ایک نیا صارف کتنی دفعہ ایک ہی ہَوسٹ کا لِنک اپنی `newuser_spam_host_threshold` پوسٹس کے اندر شائع کر سکتا ہے، اِس سے پہلے کہ وہ سپَیم سمجھا جائے۔"
+    white_listed_spam_host_domains: "ڈومَینز کی فہرست جو سپیم ہَوسٹ کی جانچ پڑتال سے خارج ہے۔ نئے صارفین کو اِن ڈومینز کے لِنکس کے ساتھ پوسٹ بنانے سے کبھی روکا نہیں جائے گا۔"
+    staff_like_weight: "سٹاف کے لائیکس کو کتنا اضافی وزن کا عنصر دیں۔"
+    topic_view_duration_hours: "ہر ن گھنٹوں پر فی IP/صارف ایک نیا ٹاپک وِیو شمار کریں"
+    user_profile_view_duration_hours: "ہر ن گھنٹوں پر فی IP/صارف ایک نیا صارف پروفائل وِیو شمار کریں"
+    levenshtein_distance_spammer_emails: "سپَیمر ای میل کو مَیچ کرتے وقت، فرق حروف کی تعداد جس پر بھی ایک فزِّی میچ ہو سکے گا۔"
+    max_new_accounts_per_registration_ip: "اگر اِس IP کی طرف سے پہلے سے ہی (ن) ٹرسٹ لَیول 0 اکاؤنٹس موجود ہیں (اور کوئی بھی سٹاف کا رکن یا ٹ.ل.2 یا اُس سے زیادہ نہیں ہے)، اُس IP سے نئے سائن اَپ کو قبول کرنا روک دیں۔"
+    min_ban_entries_for_roll_up: "رول اَپ بٹن پر کلک کرتے وقت اگر کم از کم (ن) اندراج موجود ہوں، تو ایک نیا ذیلی نیٹ بَین اندراج تخلیق ہو جائے گا۔"
+    max_age_unmatched_emails: "غیر مَیچ شدہ سکرین کردہ ای میل اندراجات (ن) دنوں کے بعد حذف کر دیں۔"
+    max_age_unmatched_ips: "غیر مَیچ شدہ سکرین کردہ IP اندراجات (ن) دنوں کے بعد حذف کر دیں۔"
+    num_flaggers_to_close_topic: "ٹاپک کو مداخلت کیلئے خود کار طریقے سے روک دینے کیلئے فلَیگ کرنے والوں کی کم از کم تعداد"
+    num_flags_to_close_topic: "ٹاپک کو مداخلت کیلئے خود کار طریقے سے روک دینے کیلئے فعال فلَیگز کی کم از کم تعداد"
+    num_hours_to_close_topic: "مداخلت کیلئے ٹاپک کو روک دینے کیلئے گھنٹوں کی تعداد۔"
+    auto_respond_to_flag_actions: "ایک فلَیگ کو ڈراپ کرتے وقت خودکار جوابات فعال کریں۔"
+    min_first_post_typing_time: "ایک صارف پہلی پوسٹ کے دوران ملی سیکنڈوں میں کم از کم کتنا وقت ٹائپ کرے، اگر حد پوری نہ ہو تو پوسٹ خود بخود منظوری کی ضرورت کی قطار میں داخل کر دی جائے گی۔ غیر فعال کرنے کیلئے 0 سَیٹ کریں (غیر تجویز کردہ)"
+    auto_silence_fast_typers_on_first_post: "صارفین کو خود بخود خاموش کر دیں جو min_first_post_typing_time کو پورا نہیں کرتے"
+    auto_silence_fast_typers_max_trust_level: "تیز رفتار ٹائپرز کو خود بخود خاموش کرنے کیلئے زیادہ سے زیادہ ٹرسٹ لَیول"
+    auto_silence_first_post_regex: "کَیس کے حساب سے غیر حساس رَیج اَیکس جو اگر مَیچ کر جائے تو صارف کی طرف سے پہلی پوسٹ خاموش کر دی جائے گی اور منظوری کی قطار میں بھیج دی جائے گی۔ مثال: raging|a[bc]a تمام raging یا aba یا aca پر مشتمل پوسٹس کو پہلے پر خاموش کر دیے جانے کا سبب بن جائے گا۔ صرف پہلی پوسٹ پر لاگو ہوتا ہے۔"
+    flags_default_topics: "فلَیگ کردہ ٹاپکس ڈیفالٹ کے طور پر اَیڈمن سیکشن میں دکھائیں"
+    reply_by_email_enabled: "بذریعہ ای میل، ٹاپکس کا جواب دینا فعال کریں۔"
+    reply_by_email_address: "جواب بذریعہ ای میل کا آنے والا ای میل ایڈریس کیلئے ٹَیمپلیٹ، مثال کے طور پر: %{reply_key}@reply.example.com یا replies+%{reply_key}@example.com"
+    alternative_reply_by_email_addresses: "جواب بذریعہ ای میل کے آنے والا ای میل ایڈریس کیلئے متبادل ٹیمپلیٹس، مثال: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
+    incoming_email_prefer_html: "آنے والے ای میل کیلئے ٹیکسٹ کے بجائے HTML کا استعمال کریں۔"
+    disable_emails: "ڈِسکورس کو کسی بھی قسم کے ای میل بھیجنے سے روکیں"
+    strip_images_from_short_emails: "2800 بائٹس سے کم سائز والے ای میلز سے تصاویر ہٹا دیں"
+    short_email_length: "بائٹس میں مختصر ای میل کی لمبائی"
+    display_name_on_email_from: "ای میل کی \"سے\" فیلڈ پر مکمل نام دکھائیں"
+    unsubscribe_via_email: "صارفین کو ای میل کے موضوع یا متن میں 'غیر سَبسکرائب' کا لِنک بھیج کر ای میلز سے غیر سَبسکرائب ہو جانے کی اجازت دیں"
+    unsubscribe_via_email_footer: "بھیجی گئی ای میلز کے فُوٹر میں غیر سَبسکرائب بذریعہ ای میل mailto: کا لِنک منسلک کریں"
+    delete_email_logs_after_days: "(ن) دنوں کے بعد ای میل لاگز حذف کریں۔ غیر متعینہ مدت تک رکھنے کیلئے 0"
+    max_emails_per_day_per_user: "صارفین کو فی دن بھیجی گئی ای میلز کی زیادہ سے زیادہ تعداد۔ حد کو غیر فعال کرنے کیلئے 0"
+    enable_staged_users: "آنے والی ای میلز سے نمٹتے وقت خود کار طریقے سے سٹَیجڈ صارفین بنائیں۔"
+    maximum_staged_users_per_email: "آنے والی ایک ای میل سے نمٹتے وقت تشکیل کردہ سٹَیجڈ صارفین کی زیادہ سے زیادہ تعداد۔"
+    auto_generated_whitelist: "ای میل پتوں کی فہرست جو خود کار طریقہ سے تخلیق شدہ مواد کیلئے چیک نہیں کیے جائیں گے۔ مثال: foo@bar.com|discourse@bar.com"
+    block_auto_generated_emails: "آنے والی ای میلز جو خود کار طریقہ سے تخلیق شدہ کے طور پر شناخت کی گئی ہوں، اُن کو خود بخود بلاک کریں۔"
+    ignore_by_title: "اُن کے عنوان کی بَیس پر آنے والی ای میلز کو نظر انداز کریں۔"
+    mailgun_api_key: "وَیب ھُوک٘ پیغامات کی توثیق کیلئے استعمال ہونے والی مَیلگَن سیکرٹ API کلید۔"
+    soft_bounce_score: "عارضی بائونس ہونے پر صارف کے ساتھ بائونس سکور شامل کر دیا جائے۔"
+    hard_bounce_score: "مستقل بائونس ہونے پر صارف کے ساتھ بائونس سکور شامل کر دیا جائے۔"
+    bounce_score_threshold: "زیادہ سے زیادہ بائونس سکور اِس سے پہلے کہ ہم صارف کو ای میل کرنا روک دیں۔"
+    bounce_score_threshold_deactivate: "زیادہ سے زیادہ بائونس سکور اِس سے پہلے کہ ہم صارف کو غیر فعال کر دیں۔"
+    reset_bounce_score_after_days: "X دنوں بعد بائونس سکور خود بخود رِی سَیٹ کریں۔"
+    attachment_content_type_blacklist: "مطلوبہ الفاظ کی فہرست جو مواد قِسم کی بنیاد پر منسلک اٹیچمنٹس کو بلَیک لِسٹ کرنے کیلئے استعمال ہوتی ہے۔"
+    attachment_filename_blacklist: "مطلوبہ الفاظ کی فہرست جو فائل نام کی بنیاد پر منسلک اٹیچمنٹس کو بلَیک لِسٹ کرنے کیلئے استعمال ہوتی ہے۔"
+    enable_forwarded_emails: "[BETA] صارفین کو ایک ای میل فارورڈ کر کہ ٹاپک بنائے کی اجازت دیں۔"
+    always_show_trimmed_content: "ہمیشہ آنے والی ای میلز کا حصے دکھائیں۔ انتباہ: ای میل پتوں کو افشاں کر سکتا ہے۔"
+    private_email: "مزید رازداری کیلئے ای میلز میں پوسٹس یا ٹاپکس سے مواد شامل نہ کریں۔"
+    manual_polling_enabled: "ای میل جوابات کیلئے API کا استعمال کرتے ہوئے ای میلز پُش کریں۔"
+    pop3_polling_enabled: "ای میل جوابات کیلئے پَول بذریعہ POP3 کریں۔"
+    pop3_polling_ssl: "POP3 سرور سے کنیکٹ کرتے وقت SSL کا استعمال کریں۔ (تجویز کردہ)"
+    pop3_polling_openssl_verify: "TLS سرور سرٹیفکیٹ کی تصدیق کریں (ڈِیفالٹ: فعال کردہ)"
+    pop3_polling_period_mins: "ای میل کیلئے POP3 اکاؤنٹ چیک کرنے کے درمیان منٹوں میں مدت۔ نوٹ: رِیسٹارٹ ضروری ہے۔"
+    pop3_polling_port: "پَورٹ جس پر POP3 اکاؤنٹ پَول کیا جائے۔"
+    pop3_polling_host: "جس ہَوسٹ کیلئے پَول کیا جائے بذریعہ POP3۔"
+    pop3_polling_username: "ای میل کیلئے پَول کرنے کیلئے POP3 اکاؤنٹ کا صارف نام۔"
+    pop3_polling_password: "ای میل کیلئے پَول کرنے کیلئے POP3 اکاؤنٹ کا پاسورڈ۔"
+    log_mail_processing_failures: "تمام ای میل سے نمٹتے پر پیش آنء والی خرابیوں کو http://yoursitename.com/logs پر لاگ کریں"
+    email_in: "صارفین کو بذریعہ ای میل نئے ٹاپکس شائع کرنے کی اجازت دیں (دستی یا pop3 پَولنگ کی ضرورت ہے)۔ ہر قِسم کیلئے \"ترتیبات\" ٹَیب میں پتوں کو ترتیب دیں۔"
+    email_in_min_trust: "نئے ٹاپک بذریعہ ای میل شائع کرنے کیلئے کم از کم ٹرسٹ لَیول جس کی صارف کو ضرورت ہے۔"
+    email_prefix: "ای میلز کے موضوع میں استعمال کیا جانے والا [لیبل]۔ یہ سَیٹ کردہ نہ ہو تو 'عنوان' پر ڈِیفالٹ ہو جائے گا۔"
+    email_site_title: "سائٹ سے ای میلز کے \"بھیجنے والا\" کے طور پر استعمال ہونے والا سائٹ کا عنوان۔ یہ سَیٹ نہ ہو تو 'عنوان' پر ڈِیفالٹ ہو جائے گا۔ اگر آپ کے 'عنوان' میں ایسے حروف شامل ہیں جن کی ای میل \"بھیجنے والا\" سٹرِنگ میں اجازت نہیں ہے، تو اِس ترتیب کو استعمال کریں۔"
+    find_related_post_with_key: "جواب دی گئی پوسٹ کو تلاش کرنے کیلئے صرف 'جواب کلید' استعمال کریں۔ انتباہ: اِس کو غیر فعال کرنے سے ای میل ایڈریس پر مبنی صارف نقالی ممکن ہو جاتی ہے۔"
+    minimum_topics_similar: "نئے ٹاپک تشکیل کرتے وقت اُسی طرح کے دوسرے ٹاپکس پیش کیے جانے سے پہلے کتنے ٹاپکس کے موجود ہونے کی ضرورت ہے۔"
+    relative_date_duration: "اشاعت کے بعد دنوں کی تعداد جب پوسٹ تاریخیں مطلق (20 فروری) کی بجائے رَیلَیٹِو (7 دن) کے طور پر دکھائی جائیں گی۔"
+    delete_user_max_post_age: "اُن صارفین کو حذف کرنے کی اجازت نہ دیں جن کی پہلی اشاعت (x) دنوں سے زیادہ پرانی ہو۔"
+    delete_all_posts_max: "تمام پوسٹس حذف کریں والے بٹن سے ایک وقت میں حذف کیے جانے والی پوسٹس کی زیادہ سے زیادہ تعداد۔ اگر ایک صارف کی اِس سے زیادہ پوسٹس ہیں ، تو سبھی پوسٹس ایک ہی وقت میں حذف نہیں ہوسکتیں اور صارف کو حذف نہیں کیا جا سکتا۔"
+    username_change_period: "رجسٹریشن کے بعد دنوں کی زیادہ سے زیادہ تعداد جب تک کہ اکاؤنٹس اپنا صارف نام تبدیل کرسکتے ہیں (صارف نام کی تبدیلی کو غیر فعال کرنے کیلئے 0)۔"
+    email_editable: "رجسٹریشن کے بعد صارفین کو اپنا ای میل ایڈریس تبدیل کرنے کی اجازت دیں۔"
+    logout_redirect: "لاگ آؤٹ کے بعد براؤزر کو ریڈائرَیکٹ کرنے کا مقام (مثال: http://somesite.com/logout)"
+    allow_uploaded_avatars: "صارفین کو اپنی مرضی کی پروفائل تصاویر اَپ لوڈ کرنے کی اجازت دیں۔"
+    allow_animated_avatars: "صارفین کو اَینیمَیٹِڈ GIF پروفائل تصاویر استعمال کرنے کی اجازت دیں۔ انتباہ: اِس ترتیب کو تبدیل کرنے کے بعد avatars:refresh رَیک ٹاسک چلائیں۔"
+    allow_animated_thumbnails: "اَینیمَیٹِڈ GIFs کے اَینیمَیٹِڈ تھَمب نَیل پیدا کریں۔"
+    default_avatars: "URL اوتار کے، جو نئے صارفین کے لئے ڈِیفالٹ کی طور پر استعمال کیے جائیں گے جب تک کہ وہ اُن کو تبدیل نہ کر لیں۔"
+    automatically_download_gravatars: "اکاؤنٹ تخلیق یا ای میل کی تبدیلی پر صارفین کے لئے گَرِیوَّٹار ڈاؤن لوڈ کریں۔"
+    digest_topics: "ای میل خلاصہ میں شامل کرنے کیلئے مقبول ترین ٹاپکس کی زیادہ سے زیادہ تعداد۔"
+    digest_posts: "ای میل خلاصہ میں شامل کرنے کیلئے مقبول ترین پوسٹس کی زیادہ سے زیادہ تعداد۔"
+    digest_other_topics: "ای میل خلاصہ کے \"آپ کو پیروی کردہ ٹاپکس اور زُمرہ جات\" سیکشن میں دکھائے گئے ٹاپکس کی زیادہ سے زیادہ تعداد۔"
+    digest_min_excerpt_length: "ای میل خلاصہ میں پوسٹ اقتباس کی کم از کم لمبائی، حروف میں۔"
+    suppress_digest_email_after_days: "صارفین کیلئے خلاصہ ای میلز کو روک دیں جو (ن) دنوں سے زیادہ کیلئے سائٹ پر نہیں دیکھے گئے۔"
+    digest_suppress_categories: "خلاصہ ای میلز سے یہ زُمرہ جات دبائیں۔"
+    disable_digest_emails: "تمام صارفین کیلئے خلاصہ ای میلز غیر فعال کریں۔"
+    email_accent_bg_color: "اَیکسنٹ رنگ جو HTML ای میلز میں کچھ عناصر کے پسِ منظر کے طور پر استعمال کیا جائے گا۔ رنگ کا نام درج کریں ('red') یا ہَیکس قدر ('#FF0000')۔"
+    email_accent_fg_color: "رنگ ٹَیکسٹ کا جو HTML ای میلز میں ای میل کے پسِ منظر رنگ کے اوپر ظاہر ہوتا ہے۔ رنگ کا نام درج کریں ('white') یا ہَیکس قدر ('#FFFFFF')۔"
+    email_link_color: "HTML ای میلز میں لِنکس کا رنگ۔ رنگ کا نام درج کریں ('blue') یا ہَیکس قدر ('#0000FF')۔"
+    detect_custom_avatars: "چیک کیا جائے یا نہ کیا جائے کہ صارفین نے اپنی مرضی کی پروفائل تصاویر اَپ لوڈ کی ہیں کہ نہیں۔"
+    max_daily_gravatar_crawls: "ایک دن میں زیادہ سے زیادہ کتنی دفعہ ڈِسکورس گَرِیوَّٹار کو اپنی مرضی کے اوتار کیلئے چیک کرے گا"
+    public_user_custom_fields: "ایک صارف کیلئے اپنی مرضی کے فیلڈز کی وائٹ لِسٹ جو عوامی سطح پر دکھائی جا سکتی ہے۔"
+    staff_user_custom_fields: "ایک صارف کیلئے اپنی مرضی کے فیلڈز کی وائٹ لِسٹ جو سٹاف کو دکھائی جا سکتی ہے۔"
+    enable_user_directory: "براؤزِنگ کیلئے صارفین کی ایک ڈائرِکٹری فراہم کریں"
+    enable_group_directory: "براؤزِنگ کیلئے گروپوں کی ایک ڈائرِکٹری فراہم کریں"
+    group_in_subject: "ای میل کے موضوع میں %{optional_pm} کو ذاتی پیغام میں پہلے گروپ کے نام پر سَیٹ کریں، ملاحظہ کریں: https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801"
+    allow_anonymous_posting: "صارفین کو گمنام مَوڈ میں تبدیل ہونے کی اجازت دیں"
+    anonymous_posting_min_trust_level: "گمنام پوسٹنگ کو فعال کرنے کیلئے کم از کم مطلوبہ ٹرسٹ لَیول"
+    anonymous_account_duration_minutes: "صارف کی گمنامی کی حفاظت کیلئے ہر صارف کیلئے ہر ن منٹ بعد ایک نیا گمنام اکاؤنٹ بنائیں۔ مثال: اگر 600 پر سَیٹ کیا جائے، تو جیسے ہی آخری پوسٹ سے 600 منٹ گزر چکے ہوں گے اور صارف گمنام مَوڈ پر تبدیل ہو گا، تو ایک نیا گمنام اکاؤنٹ پیدا کر دیا جائے گا۔"
+    hide_user_profiles_from_public: "گمنام صارفین کیلئے صارف کارڈ، صارف پروفائلز اور صارف ڈائرِکٹری غیر فعال کریں۔"
+    show_inactive_accounts: "لاگ اِن ہوے صارفین کو غیر فعال اکاؤنٹس کی پروفائلز کو براؤز کرنے کی اجازت دیں۔"
+    hide_suspension_reasons: "صارف پروفائلز پر عوامی طور پر معطلی کی وجوہات ظاہر نہ کریں۔"
+    log_personal_messages_views: "دیگر صارفین/گروپوں کیلئے ایڈمن کی طرف سے ذاتی پیغام وِیوز کو لاگ کریں۔"
+    user_website_domains_whitelist: "اِن ڈومینز کے ساتھ صارف ویب سائٹ کی تصدیق کی جائے گی۔ پائپ کے ساتھ الگ کی گئی فہرست۔"
+    allow_profile_backgrounds: "صارفین کو پروفائل پسِ منظر اَپ لوڈ کرنے کی اجازت دیں۔"
+    sequential_replies_threshold: "ایک ہی ٹاپک میں لگاتار کتنی پوسٹس ایک صارف شائع کرے اِس سے پہلے کہ اُسے بہت زیادہ لگاتار جوابات ہونے کی یاد دہانی کرائی جائے۔"
+    get_a_room_threshold: "انتباہ کرا دینے سے پہلے صارف ایک ہی ٹاپک میں ایک ہی شخص کیلئے کتنی پوسٹس شائع کرے۔"
+    enable_mobile_theme: "موبائل ڈِیوائیسِز ایک موبائل دوستانہ تھِیم کا استعمال کرتی ہیں، مکمل سائٹ پر تبدیل ہو جانے کی صلاحیت کے ساتھ۔ اگر آپ اپنی مرضی کی سٹائل شیٹ، جو کہ مکمل طور پر رِسپَونسِو ہو، استعمال کرنا چاہتے ہیں تو اِس کو غیر فعال کریں۔"
+    dominating_topic_minimum_percent: "ایک ٹاپک میں ایک ہی صارف کی طرف سے کتنے فیصد پوسٹس ہونی چاہئیں، اِس سے پہلے کہ اُسے ٹاپک پر حد سے زیادہ غالب ہو جانے کی یاد دہانی کرائی جائے۔"
+    disable_avatar_education_message: "اوتار تبدیل کرنے کیلئے تعلیمی پیغام کو غیر فعال کریں۔"
+    suppress_uncategorized_badge: "ٹاپک فہرستوں میں غیر زُمرہ جات والے ٹاپکس کیلئے بَیج نہ دکھائیں۔"
+    permalink_normalizations: "دائمی لِنکس میچ کرنے سے پہلے درج ذیل رَیج اَیکس کا اطلاق کریں، مثال کے طور پر: /(topic.*)\\?.*/\\1 ٹاپک روٹس میں سے قُوَیری سٹرِنگ کو نکال دے گا۔ فارمیٹ regex+string ہے، میچ کردہ کو ایکسَیس کرنے کیلئے \\1 وغیرہ کا استعمال کریں"
+    global_notice: "تمام زائرین کو فوری،اَیمرجنسی گلوبل بَینر نوٹس دکھائیں، اِسے چھپانے کیلئے خالی جگہ میں تبدیل کریں (HTML کی اجازت ہے)۔"
+    disable_edit_notifications: "سِسٹم صارف کی طرف سے ترمیم اطلاعات کو غیر فعال کریں جب 'download_remote_images_to_local' فعال ہو۔"
+    automatically_unpin_topics: "صارفین جب ٹاپک کے آخر تک پہنچ جائیں تو خود بخود ٹاپکس پر سے پِن ہٹا دیں۔"
+    read_time_word_count: "متوقع پڑھنے کے وقت کا حساب لگانے کیلئے فی منٹ الفاظ کی تعداد۔"
+    topic_page_title_includes_category: "ٹاپک صفحہ کے عنوان میں زُمرہ کا نام شامل ہے۔"
+    native_app_install_banner: "بار بار آنے والوں کو ڈِسکورس مقامی ایَپ اِنسٹال کرنے کیلئے پوچھا جائے۔"
+    share_anonymized_statistics: "گمنام استعمال کے اعداد و شمار کا اشتراک کریں۔"
+    auto_handle_queued_age: "اُن ریکارڈز کو خود کار طریقہ سے ہَینڈل کریں جو اتنے دنوں کے بعد نظر ثانی کے منتظر ہیں۔ فلَیگز کو نظر انداز کیا جائے گا۔ قطار شدہ پوسٹس اور صارفین کو مسترد کردیا جائے گا۔ اِس خصوصیت کو غیر فعال کرنے کیلئے 0 پر سَیٹ کریں۔"
+    max_prints_per_hour_per_user: "/print صفحہ نقوش کی زیادہ سے زیادہ تعداد (غیر فعال کرنے کیلئے 0 پر سَیٹ کریں)"
+    full_name_required: "مکمل نام ایک صارف کے پروفائل کا لازمی فیلڈ ہے۔"
+    enable_names: "صارف کا مکمل نام اُن کے پروفائل، صارف کارڈ، اور ای میل پر دکھائیں۔ ہر جگہ مکمل نام چھپانے کیلئے غیر فعال کریں۔"
+    display_name_on_posts: "اپنے @username کے علاوہ صارف کی پوسٹس پر اُن کا مکمل نام بھی دکھائیں۔"
+    show_time_gap_days: "اگر دو پوسٹس اتنے دنوں بعد شائع کی گئے ہوں، تو ٹاپک میں وقت کا فرق دکھائیں۔"
+    short_progress_text_threshold: "اگر ٹاپک میں پوسٹس کی تعداد اِس نمبر سے اوپر چلے جاتی ہے، تو پراگرَیس بار صرف موجودہ پوسٹ نمبر دکھائے گا۔ اگر آپ پراگرَیس بار کی چوڑائی کو تبدیل کریں گے، تو آپ کو اِس قدر کو تبدیل کرنے کی ضرورت پر سکتی ہے۔"
+    default_code_lang: "گِٹ ہَب کَوڈ بلاکس پر لاگو ڈِیفالٹ پروگرامِنگ زبان سِنٹیکس ہائلائیٹِنگ (lang-auto، ruby، python وغیرہ)"
+    warn_reviving_old_topic_age: "جب کوئی ایسے ٹاپک پر جواب دینا شروع کرے جہاں پچھلا آخری جواب اتنے دنوں سے زیادہ پرانا ہو، تو ایک انتباہ ظاہر کی جائے گی۔ 0 پر سَیٹ کر کہ غیر فعال کریں۔"
+    autohighlight_all_code: "تمام پہلے سے فارمَیٹ کردہ کَوڈ بلاکس پر ذبردستی کَوڈ ہائلائیٹِنگ لاگو کریں، یہاں تک کہ جب زبان بھی خاص طور پر واضح نہ کی گئی ہو۔"
+    highlighted_languages: "سِنٹیکس ہائلائیٹِنگ کے قوانین شامل کریں۔ (انتباہ: بہت زیادہ زبانوں کو شامل کرنے سے کارکردگی پر اثر ہو سکتا ہے) ڈَیمو کیلئے ملاحظہ کریں: https://highlightjs.org/static/demo/"
+    embed_truncate: "اَیمبَیڈ کی گئی پوسٹس کو تراشیں۔"
+    embed_support_markdown: "اَیمبَیڈ کردہ پوسٹس کیلئے مارکڈائون کی اجازت دیں۔"
+    allowed_href_schemes: "http اور https کے علاوہ لِنکس میں اجازت دی گئی اسکیمز۔"
+    embed_post_limit: "اَیمبَیڈ کیے جانے والی پوسٹس کی زیادہ سے زیادہ تعداد۔"
+    embed_username_required: "ٹاپک کی تخلیق کیلئے صارف نام ضروری ہے۔"
+    show_create_topics_notice: "اگر سائٹ میں 5 سے کم عوامی ٹاپک موجود ہیں، تو کچھ ٹاپک تخلیق کرنے کیلئے منتظمین کو ایک نوٹس دکھائیں۔"
+    delete_drafts_older_than_n_days: (ن) دنوں سے پرانے ڈرافٹ حذف کریں۔
+    bootstrap_mode_min_users: "بُوٹسٹرَیپ مَوڈ غیر فعال کرنے کیلئے درکار صارفین کی کم از کم تعداد (غیر فعال کرنے کیلئے 0 پر سَیٹ کریں)"
+    prevent_anons_from_downloading_files: "گمنام صارفین کو اٹَیچمنٹس ڈاؤن لوڈ کرنے سے روکیں۔ انتباہ: ایسا کرنے سے کوئی بھی غیر تصویر سائٹ کے اثاثہ جات، جو اٹَیچمنٹ کے طور پرشائع کیے گئے ہوں، بھی کام کرنا چھوڑ دیں گے۔"
+    slug_generation_method: "سلَگ تخلیق کا طریقہ منتخب کریں۔ 'انکوڈ کردہ' فیصد انکوڈِنگ سٹرِنگ تخلیق کرے گ۔. 'کوئی بھی نہیں' سلَگ کو غیر فعال کر دے گا۔"
+    enable_emoji: "اِیمَوجی فعال کریں"
+    enable_emoji_shortcuts: "عام سمائلی ٹیکسٹ جیسا کہ :) :p :(  اِیمَوجیوں میں تبدیل کر دیا جائے گا"
+    emoji_set: "آپ اپنا اِیمَوجی کیسا پسند کریں گے؟"
+    enforce_square_emoji: "تمام اِیمَوجیوں کو ایک مربع اَیسپَیکٹ رَیشو پر مجبور کریں۔"
+    approve_post_count: "ایک نئے یا بَیسِک صارف کی طرف سے پوسٹس کی تعداد جن کا منظور کیے جانا لاذمی ہے "
+    approve_unless_trust_level: "اِس ٹرسٹ لَیول سے نیچے کے صارفین کیلئے پوسٹس کا منظور شدہ ہونا لازمی ہے"
+    approve_new_topics_unless_trust_level: "اِس ٹرسٹ لَیول سے نیچے کے صارفین کیلئے نئے ٹاپکس کا منظور شدہ ہونا لازمی ہے"
+    approve_unless_staged: "سٹَیجڈ صارفین کیلئے نئے ٹاپکس اور پوسٹس کا منظور شدہ ہونا لازمی ہے"
+    notify_about_queued_posts_after: "اگر ایسی پوسٹس موجود ہیں جو اتنے گھنٹوں کے بعد بھی جائزہ لیے جانے کی منتظر ہیں، تو تمام ماڈریٹرز کو اطلاع بھیجیں۔ اِن اطلاعات کو غیر فعال کرنے کیلئے 0 پر سَیٹ کریں۔"
+    auto_close_messages_post_count: "خود کار طریقہ سے بند کیے جانے سے پہلے ایک پیغام میں پوسٹس کی زیادہ سے زیادہ تعداد (غیر فعال کرنے کیلئے 0)"
+    auto_close_topics_post_count: "خود کار طریقہ سے بند کیے جانے سے پہلے ایک ٹاپک میں پوسٹس کی زیادہ سے زیادہ تعداد (غیر فعال کرنے کیلئے 0)"
+    code_formatting_style: "کمپَوزر میں کَوڈ بٹن اِس کوڈ فارمَیٹِنگ سٹائل پر ڈِیفالٹ کرے گا"
+    max_allowed_message_recipients: "ایک پیغام میں وصول کنندگان کی زیادہ سے زیادہ تعداد۔"
+    watched_words_regular_expressions: "دیکھے گئے الفاظ رَیگولر اَیکسپرَیشَن ہیں۔"
+    default_email_digest_frequency: "صارفین کو ڈِیفالٹ کے طور پر خلاصہ ای میل کتنی بار ملتی ہیں۔"
+    default_include_tl0_in_digests: "ڈِیفالٹ کے طور پر خلاصہ ای میلز میں نئے صارفین کی طرف سے پوسٹس شامل کریں۔ صارفین اسے اپنی ترجیحات میں تبدیل کرسکتے ہیں۔"
+    default_email_personal_messages: "ڈِیفالٹ کے طور پر ایک ای میل بھیجیں جب کوئی صارف کو پیغام بھیجتا ہے۔"
+    default_email_direct: "ڈِیفالٹ کے طور پر ایک ای میل بھیجیں جب کوئی صارف، کا اقتباس/ کو جواب/ ذکر یا کو مدعو کرتا ہے۔"
+    default_email_mailing_list_mode: "ڈِیفالٹ کے طور ہر نئی پوسٹ پر ایک ای میل بھیجیں"
+    default_email_mailing_list_mode_frequency: "صارفین جو مَیلنگ لِسٹ مَوڈ فعال کرتے ہیں اُن کو ڈِیفالٹ کے طور پر اِس کثرت سے ای میلز ملیں گی۔"
+    disable_mailing_list_mode: "صارفین کو مَیلنگ لِسٹ مَوڈ فعال کرنے سے روکیں۔"
+    default_email_always: "ڈِیفالٹ کے طور پر صارف کو فعال ہونے پر بھی ای میل اطلاع بھیجیں۔"
+    default_email_previous_replies: "ڈِیفالٹ کے طور پر ای میلز میں پچھلے جواب شامل کریں۔"
+    default_email_in_reply_to: "ڈِیفالٹ کے طور پر ای میلز میں جس پوسٹ کا جواب دیا گیا ہو، اُس کا اقتباس شامل کریں۔"
+    default_other_new_topic_duration_minutes: "عالمی ڈِیفالٹ شرط جس کیلئے کوئی ٹاپک نیا سمجھا جاتا ہے۔"
+    default_other_auto_track_topics_after_msecs: "عالمی ڈِیفالٹ وقت جس کے بعد ٹاپک خود کار طریقہ سے ٹرَیک کر دیا جائے گا۔"
+    default_other_notification_level_when_replying: " گلوبل ڈیفالٹ اطلاعات کا لَیول جب صارف کسی ٹاپک پر جواب دے۔"
+    default_other_external_links_in_new_tab: "ڈِیفالٹ کے طور پر تمام بیرونی ویب سائٹ کے لنکس ایک نئے ٹیب میں کھولیں۔"
+    default_other_enable_quoting: "ڈِیفالٹ کے طور پر روشنی ڈالے گئے ٹَیکسٹ کے لئے اقتباسی جواب فعال کریں۔"
+    default_other_dynamic_favicon: "ڈِیفالٹ کے طور پر براؤزر آئکن پر نئے / اَپ ڈیٹ کردہ ٹاپکس کی گنتی دکھائیں۔"
+    default_other_disable_jump_reply: "ڈِیفالٹ کے طور پر صارف کے جواب دینے کے بعد اُن کی پوسٹ پر نہ جائیں۔"
+    default_other_like_notification_frequency: "ڈِیفالٹ کے طور پر صارفین کو لائیکس پر اطلاع دیں"
+    default_topics_automatic_unpin: "ڈِیفالٹ کے طور پر صارفین جب ٹاپک کے آخر تک پہنچ جائیں تو خود بخود ٹاپکس پر سے پِن ہٹا دیں۔"
+    default_categories_watching: "زُمرہ جات کی فہرست جو ڈِیفالٹ کے طور پر دیکھے گئے ہوں۔"
+    default_categories_tracking: "زُمرہ جات کی فہرست جو ڈِیفالٹ کے طور پر ٹرَیک کردہ ہوں۔"
+    default_categories_muted: "زُمرہ جات کی فہرست جو ڈِیفالٹ کے طور پر خاموش کردہ ہوں۔"
+    default_categories_watching_first_post: "زُمرہ جات کی فہرست جس میں ڈِیفالٹ کے طور پر ہر نئے ٹاپک میں پہلی پوسٹ دیکھی جائے گی۔"
+    retain_web_hook_events_period_days: "ویب ہک اِیونٹ ریکارڈ برقرار رکھنے کیلئے دنوں کی تعداد۔"
+    allow_user_api_keys: "صارف API کلیدیں تخلیق کرنے کی اجازت دیں"
+    allow_user_api_key_scopes: "صارف API کلیدوں کیلئے اجازت دی جانے والی سکَوپس کی فہرست"
+    max_api_keys_per_user: "فی صارف، صارف API کلیدوں کی زیادہ سے زیادہ تعداد"
+    min_trust_level_for_user_api_key: "API کلیدوں کی تخلیق کیلئے مطلوبہ ٹرسٹ لَیول"
+    allowed_user_api_auth_redirects: "صارف API کلیدوں کیلئے توثیقی ریڈائرَیکٹ کیلئے اجازت یافتہ URL"
+    allowed_user_api_push_urls: "صارف API پر سرور پُش کیلئے اجازت یافتہ URL"
+    tagging_enabled: "ٹاپکس پر ٹیگز فعال کریں؟"
+    min_trust_to_create_tag: "ٹَیگ بنانے کیلئے کم از کم مطلوبہ ٹرسٹ لَیول۔"
+    max_tags_per_topic: "ایک ٹاپک پر لگائے جانے والے ٹَیگز کی زیادہ سے زیادہ تعداد۔"
+    max_tag_length: "ایک ٹَیگ میں استعمال ہونے والے حروف کی زیادہ سے زیادہ تعداد۔"
+    max_tag_search_results: "ٹَیگز سرچ کرتے وقت، ظاہر کردہ نتائج کی زیادہ سے زیادہ تعداد۔"
+    show_filter_by_tag: "ٹیگ کی بنیاد پر ایک ٹاپک فہرست کو فلٹر کرنے کیلئے ڈراپ ڈاؤن دکھائیں۔"
+    max_tags_in_filter_list: "فلٹر ڈراپ ڈاؤن میں دکھانے گئے ٹَیگز کی زیادہ سے زیادہ تعداد۔ سب سے زیادہ استعمال شدہ ٹَیگز دکھائے جائیں گے۔"
+    tags_sort_alphabetically: "ٹَیگز کو حروف تہجی کی ترتیب میں دکھائیں۔ ڈِیفالٹ کے طور پر مقبولیت کے مطابق دکھائے جائیں گے۔"
+    tags_listed_by_group: "ٹَیگز صفحے پر ٹَیگ گروپ کی بنیاد پر ٹَیگز کی فہرست بنائیں (/tags)۔"
+    tag_style: "ٹَیگ بیَجوں کیلئے بصری سٹائل۔"
+    allow_staff_to_tag_pms: "سٹاف ممبران کو کسی بھی ذاتی پیغام پر ٹَیگ لگانے کی اجازت دیں"
+    min_trust_level_to_tag_topics: "ٹاپکس پر ٹَیگ لگانے کیلئے کم از کم مطلوبہ ٹرسٹ لَیول"
+    suppress_overlapping_tags_in_list: "اگر ٹَیگز ٹاپک عنوانات میں موجود مکمل الفاظ سے مَیچ کرتے ہوں، تو ٹَیگ مت دکھائیں"
+    remove_muted_tags_from_latest: "تازہ ترین ٹاپک فہرست میں خاموش شدہ ٹَیگز کے ساتھ ٹَیگ کردہ ٹاپکس مت دکھائیں۔"
+    company_short_name: "کمپنی نام (مختصر)"
+    company_full_name: "کمپنی نام (مکمل)"
+    company_domain: "کمپنی ڈَومَین"
+    shared_drafts_category: "ٹاپک ڈرافٹس کیلئے ایک زُمرَہ کو مقرر کر کہ مشترکہ ڈرافٹس کی صلاحیت کو فعال کریں۔"
+    errors:
+      invalid_email: "غلط ای میل ایڈریس۔"
+      invalid_username: "اِس صارف نام والا کوئی صارف نہیں ہے۔"
+      invalid_integer_min_max: "قدر کا %{min} اور %{max} کے درمیان ہونا ضروری ہے۔"
+      invalid_integer_min: "قدر کا %{min} یا زیادہ ہونا ضروری ہے۔"
+      invalid_integer_max: "قدر %{max} سے زیادہ نہیں ہوسکتی۔"
+      invalid_integer: "وَیلِیو کا اِنٹیجَر ہونا لازمی ہے۔"
+      regex_mismatch: "وَیلِیو مطلوبہ فارمَیٹ سے مَیچ نہیں کرتی۔"
+      must_include_latest: "سب سے اوپر والے مَینِیو میں 'تازہ ترین' ٹَیب کا شامل ہونا لازمی ہے۔"
+      invalid_string: "غلط وَیلِیو۔"
+      invalid_string_min_max: "%{min} اور %{max} حروف کے درمیان ہونا ضروری ہے۔"
+      invalid_string_min: "کم از کم %{min} حروف کا ہونا ضروری ہے۔"
+      invalid_string_max: "%{max} حروف سے زیادہ نہ ہونا ضروری ہے۔"
+      invalid_reply_by_email_address: "وَیلِیو میں '%{reply_key}' موجود ہونا اور اُس کا نوٹیفکیشن ای میل سے مختلف ہونا ضروری ہے۔"
+      invalid_alternative_reply_by_email_addresses: "تمام وَیلِیوز میں '%{reply_key}' موجود ہونا اور اُس کا نوٹیفکیشن ای میل سے مختلف ہونا ضروری ہے۔"
+      pop3_polling_host_is_empty: "POP3 پولِنگ فعال کرنے سے پہلے آپ کو 'pop3 پولِنگ ہوَسٹ' سَیٹ کرنا ہوگا۔"
+      pop3_polling_username_is_empty: "POP3 پولِنگ فعال کرنے سے پہلے آپ کو 'pop3 پولِنگ صارف نام' سَیٹ کرنا ہوگا۔"
+      pop3_polling_password_is_empty: "POP3 پولِنگ فعال کرنے سے پہلے آپ کو 'pop3 پولِنگ پاسورڈ' سَیٹ کرنا ہوگا۔"
+      pop3_polling_authentication_failed: "POP3 کی توثیق ناکام ہوگئی۔ براہ مہربانی اپنے pop3 اسناد کی تصدیق کریں۔"
+      reply_by_email_address_is_empty: "بذریعہ ای میل جواب فعال کرنے سے پہلے آپ کی طرف سے ایک 'جواب بذریعہ ای میل ایڈریس' سَیٹ کرنا ضروری ہے۔"
+      email_polling_disabled: "بذریعہ ای میل جواب فعال کرنے سے پہلے آپ کا دستی یا POP3 پولِنگ فعال کرنا ضروری ہے۔"
+      user_locale_not_enabled: "اِس ترتیب کو فعال کرنے سے پہلے آپ کا 'صارف مقامیت کی اجازت' فعال کرنا ضروری ہے۔"
+      invalid_regex: "رَیج اَیکس غلط یا اجازت یافتہ نہیں ہے۔"
+      email_editable_enabled: "اِس ترتیب کو فعال کرنے سے پہلے آپ کا 'قابل ترمیم بذریعہ ای میل' غیر فعال کرنا ضروری ہے۔"
+      enable_sso_disabled: "اِس ترتیب کو فعال کرنے سے پہلے آپ کا 'sso فعال کریں' فعال کرنا ضروری ہے۔"
+      staged_users_disabled: "اِس ترتیب کو فعال کرنے سے پہلے آپ کا 'سٹَیجڈ صارفین' فعال کرنا ضروری ہے۔"
+      reply_by_email_disabled: "اِس ترتیب کو فعال کرنے سے پہلے آپ کا 'جواب بذریعہ ای میل' فعال کرنا ضروری ہے۔"
+      sso_url_is_empty: "اِس ترتیب کو فعال کرنے سے پہلے آپ کا 'sso url' مقرر کرنا ضروری ہے۔"
+      enable_local_logins_disabled: "اِس ترتیب کو فعال کرنے سے پہلے آپ کا 'مقامی لاگ اِن' فعال کرنا ضروری ہے۔"
+  search:
+    within_post: "%{username} کی طرف سے #%{post_number}"
+    types:
+      category: 'زُمرَہ جات'
+      topic: 'نتائج'
+      user: 'صارفین'
+    results_page: "'%{term}' کیلئے سرچ کے نتائج"
+  sso:
+    login_error: "لاگ اِن خرابی"
+    not_found: "آپ کا اکاؤنٹ نہیں مل سکا۔ براہ مہربانی سائٹ کے ایڈمِنِسٹریٹر سے رابطہ کریں۔"
+    account_not_approved: "آپ کے اکاؤنٹ کی منظوری زیر التواء ہے۔ منظوری ملنے پر آپ کو ایک ای میل اطلاع موصول ہو گی۔"
+    unknown_error: "آپ کے اکاؤنٹ کے ساتھ ایک مسئلہ درپیش ہے۔ براہ مہربانی سائٹ کے ایڈمِنِسٹریٹر سے رابطہ کریں۔"
+    timeout_expired: "اکاؤنٹ لاگ اِن کا وقت ختم ہوگیا، براہ مہربانی دوبارہ لاگ اِن کرنے کی کوشش کریں۔"
+    no_email: "کوئی ای میل پتہ فراہم نہیں گیا تھا۔ براہ مہربانی سائٹ کے ایڈمِنِسٹریٹر سے رابطہ کریں۔"
+    email_error: "%{email} ای میل ایڈریس کے ساتھ اکاؤنٹ رجسٹر نہیں کیا جا سکا ۔ براہ مہربانی سائٹ کے ایڈمِنِسٹریٹر سے رابطہ کریں۔"
+  original_poster: "اصل پوسٹ کرنے والا"
+  most_posts: "سب سے زیادہ پوسٹس"
+  most_recent_poster: "سب سے حالیہ پوسٹ کرنے والا"
+  frequent_poster: "اکثر پوسٹ کرنے والا"
+  redirected_to_top_reasons:
+    new_user: "ہماری کمیونٹی میں خوش آمدید! یہ سب سے زیادہ مقبول ترین حالیہ ٹاپک ہیں۔"
+    not_seen_in_a_month: "واپسی کی خوش آمدید! ہم نے کچھ دیر سے آپ کو یہاں نہیں دیکھا۔ جب سے آپ دور رہے ہیں، یہ اُس دورانیہ کے سب سے زیادہ مقبول ترین ٹاپک ہیں۔"
+  merge_posts:
+    edit_reason:
+      one: ایک پوسٹ کو %{username} کی طرف سے ضم کیا گیا تھا
+      other: '%{count} پوسٹس کو %{username} کی طرف سے ضم کیا گیا تھا'
+    errors:
+      different_topics: "مختلف ٹاپکس کی پوسٹس کو ضم نہیں کیا جا سکتا۔"
+      different_users: "مختلف صارفین کی پوسٹس کو ضم نہیں کیا جا سکتا۔"
+  move_posts:
+    new_topic_moderator_post:
+      one: 'پوسٹ کو ایک نئے ٹاپک پر تقسیم کر دیا گیا تھا: %{topic_link}'
+      other: '%{count} پوسٹس کو ایک نئے ٹاپک پر تقسیم کر دیا گیا تھا: %{topic_link}'
+    existing_topic_moderator_post:
+      one: 'پوسٹ کو ایک موجودہ ٹاپک میں ضم کر دیا گیا تھا: %{topic_link}'
+      other: '%{count} پوسٹس کو ایک موجودہ ٹاپک میں ضم کر دیا گیا تھا: %{topic_link}'
+  change_owner:
+    post_revision_text: "%{old_user} سے %{new_user} کو مالکیت منتقل کر دی گئی"
+    deleted_user: "ایک حذف شدہ صارف"
+  topic_statuses:
+    archived_enabled: "یہ ٹاپک اب آرکائیو کیا ہوا ہے۔ یہ منجمد ہے اور کسی طرح سے بھی تبدیل نہیں کیا جاسکتا۔"
+    archived_disabled: "یہ ٹاپک اب غیر آرکائیو شدہ ہے۔ یہ اب منجمد نہیں اور تبدیل کیا جاسکتا ہے۔"
+    closed_enabled: "یہ ٹاپک اب بند کر دیا گیا ہے۔ نئے جوابات کی اب اجازت نہیں ہے۔"
+    closed_disabled: "یہ ٹاپک اب کھول دیا گیا ہے. نئے جوابات کی اجازت ہے۔"
+    autoclosed_message_max_posts:
+      one: 1 جواب کی زیادہ سے زیادہ حد تک پہنچنے کے بعد یہ پیغام خود کار طریقہ سے بند کر دیا گیا تھا۔
+      other: '%{count} جوابات کی زیادہ سے زیادہ حد تک پہنچنے کے بعد یہ پیغام خود کار طریقہ سے بند کر دیا گیا تھا۔'
+    autoclosed_topic_max_posts:
+      one: 1 جواب کی زیادہ سے زیادہ حد تک پہنچنے کے بعد یہ ٹاپک خود کار طریقہ سے بند کر دیا گیا تھا۔
+      other: '%{count} جوابات کی زیادہ سے زیادہ حد تک پہنچنے کے بعد یہ ٹاپک خود کار طریقہ سے بند کر دیا گیا تھا۔'
+    autoclosed_enabled_days:
+      one: یہ ٹاپک خود کار طریقہ سے 1 دن کے بعد بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت نہیں ہے۔
+      other: یہ ٹاپک خود کار طریقہ سے %{count} دنوں کے بعد بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت نہیں ہے۔
+    autoclosed_enabled_hours:
+      one: یہ ٹاپک خود کار طریقہ سے 1 گھنٹے کے بعد بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت نہیں ہے۔
+      other: یہ ٹاپک خود کار طریقہ سے %{count} گھنٹوں کے بعد بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت نہیں ہے۔
+    autoclosed_enabled_minutes:
+      one: یہ ٹاپک خود کار طریقہ سے 1 منٹ کے بعد بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت نہیں ہے۔
+      other: یہ ٹاپک خود کار طریقہ سے %{count} منٹوں کے بعد بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت نہیں ہے۔
+    autoclosed_enabled_lastpost_days:
+      one: یہ ٹاپک آخری جواب کے 1 دن بعد خود کار طریقہ سے بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت نہیں ہے۔
+      other: یہ ٹاپک آخری جواب کے %{count} دنوں بعد خود کار طریقہ سے بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت نہیں ہے۔
+    autoclosed_enabled_lastpost_hours:
+      one: یہ ٹاپک آخری جواب کے 1 گھنٹے بعد خود کار طریقہ سے بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت نہیں ہے۔
+      other: یہ ٹاپک آخری جواب کے %{count} گھنٹوں بعد خود کار طریقہ سے بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت نہیں ہے۔
+    autoclosed_enabled_lastpost_minutes:
+      one: یہ ٹاپک آخری جواب کے 1 منٹ بعد خود کار طریقہ سے بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت نہیں ہے۔
+      other: یہ ٹاپک آخری جواب کے %{count} منٹوں بعد خود کار طریقہ سے بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت نہیں ہے۔
+    autoclosed_disabled_days:
+      one: یہ ٹاپک خود کار طریقہ سے 1 دن کے بعد کھول دیا گیا تھا۔
+      other: یہ ٹاپک خود کار طریقہ سے %{count} دنوں کے بعد کھول دیا گیا تھا۔
+    autoclosed_disabled_hours:
+      one: یہ ٹاپک خود کار طریقہ سے 1 گھنٹے کے بعد کھول دیا گیا تھا۔
+      other: یہ ٹاپک خود کار طریقہ سے %{count} گھنٹوں کے بعد کھول دیا گیا تھا۔
+    autoclosed_disabled_minutes:
+      one: یہ ٹاپک خود کار طریقہ سے 1 منٹ کے بعد کھول دیا گیا تھا۔
+      other: یہ ٹاپک خود کار طریقہ سے %{count} منٹوں کے بعد کھول دیا گیا تھا۔
+    autoclosed_disabled_lastpost_days:
+      one: یہ ٹاپک آخری جواب کے 1 دن بعد خود کار طریقہ سے کھول دیا گیا تھا۔
+      other: یہ ٹاپک آخری جواب کے %{count} دنوں بعد خود کار طریقہ سے کھول دیا گیا تھا۔
+    autoclosed_disabled_lastpost_hours:
+      one: یہ ٹاپک آخری جواب کے 1 گھنٹے بعد خود کار طریقہ سے کھول دیا گیا تھا۔
+      other: یہ ٹاپک آخری جواب کے %{count} گھنٹوں بعد خود کار طریقہ سے کھول دیا گیا تھا۔
+    autoclosed_disabled_lastpost_minutes:
+      one: یہ ٹاپک آخری جواب کے 1 منٹ بعد خود کار طریقہ سے کھول دیا گیا تھا۔
+      other: یہ ٹاپک آخری جواب کے %{count} منٹوں بعد خود کار طریقہ سے کھول دیا گیا تھا۔
+    autoclosed_disabled: "یہ ٹاپک اب کھول دیا گیا ہے. نئے جوابات کی اجازت ہے۔"
+    autoclosed_disabled_lastpost: "یہ ٹاپک اب کھول دیا گیا ہے. نئے جوابات کی اجازت ہے۔"
+    pinned_enabled: "یہ ٹاپک اب پِن کیا یوا ہے۔ یہ اپنے زُمرہ میں سب سے اوپر ظاہر ہو گا جب تک کہ سٹاف کی طرف سے سب کیلئے یہ پِن ہٹا دی نہ جائے یا صارفین کی طرف سے انفرادی طور پر صرف اپنے آپ کیلئے۔"
+    pinned_disabled: "اِس ٹاپک پر سے اب پِن ہٹا دی گئی ہے۔ یہ اب اپنے زُمرہ کے سب سے اوپر ظاہر نہیں ہو گا۔"
+    pinned_globally_enabled: "یہ ٹاپک اب عالمی سطح پر پِن کیا یوا ہے۔ یہ اپنے زُمرہ میں اور سبھی ٹاپک فہرستوں پر سب سے اوپر ظاہر ہو گا جب تک کہ سٹاف کی طرف سے سب کیلئے یہ پِن ہٹا دی نہ جائے یا صارفین کی طرف سے انفرادی طور پر صرف اپنے آپ کیلئے۔"
+    pinned_globally_disabled: "اِس ٹاپک پر سے اب پِن ہٹا دی گئی ہے۔ یہ اب اپنے زُمرہ کے سب سے اوپر ظاہر نہیں ہو گا۔"
+    visible_enabled: "یہ ٹاپک اب فہرست شدہ ہے۔ یہ ٹاپک فہرستوں میں ظاہر ہو گا۔"
+    visible_disabled: "یہ ٹاپک اب غیر فہرست شد ہے۔ یہ اب کسی ٹاپک فہرستوں میں ظاہر نہیں ہو گا۔ اِس ٹاپک تک رسائی کا واحد طریقہ براہ راست لِنک کے ذریعہ ہے۔"
+    auto_deleted_by_timer: "ٹائمر کی طرف سے خود بخود حذف کر دیا گیا۔"
+  login:
+    not_approved: "آپ کا اکاؤنٹ ابھی تک منظور نہیں کیا گیا ہے۔ جب آپ لاگ اِن کر سکیں گے تو آپ کو بذریعہ اِی میل مطلع کر دیا جائے گا۔"
+    incorrect_username_email_or_password: "غلط صارف نام، ای میل یا پاسوَرڈ"
+    incorrect_password: "غلط پاسوَرڈ"
+    wait_approval: "سائن اَپ ہونے کیلئے شکریہ۔ جب آپ کا اکاؤنٹ منظور ہو جائے گا تو ہم آپ کو مطلع کر دیں گے۔"
+    active: "آپ کا اکاؤنٹ چالو کر دیا گیا ہے اور استعمال کیلئے تیار ہے۔"
+    activate_email: "<p>آپ تقریباً کام مکمل کر چکے ہیں! ہم نے <b>%{email}</b> پر ایک ایکٹیویشن میل بھیج دی ہے۔ براہ مہربانی اپنے اکاؤنٹ کو چالو کرنے کیلئے میل میں دی گئی ہدایات پر عمل کریں۔</p> <p>اگر یہ آپ کو موصول نہ ہو، تو اپنا سپَیم فولڈر چیک کریں۔</p>"
+    not_activated: "ابھی آپ لاگ اِن نہیں کر سکتے۔ ہم نے آپ کو ایک ایکٹیویشن اِی میل بھیجی ہے۔ براہ مہربانی، اپنے اکاؤنٹ کو چالو کرنے کیلئے ای میل میں دی گئی ہدایات پر عمل کریں۔"
+    not_allowed_from_ip_address: "آپ %{username} کے طور پر اِس IP ایڈریس سے لاگ اِن نہیں ہو سکتے۔"
+    admin_not_allowed_from_ip_address: "آپ ایڈمن کے طور پر اِس IP ایڈریس سے لاگ اِن نہیں ہو سکتے۔"
+    suspended: "آپ %{date} تک لاگ اِن نہیں کر سکتے ہیں۔"
+    suspended_with_reason: "اکاؤنٹ %{date} تک معطل کر دیا گیا: %{reason}"
+    errors: "%{errors}"
+    not_available: "دستیاب نہیں۔ اِستعمال کریں %{suggestion}؟"
+    something_already_taken: "کچھ غلط ہو گیا، شاید صارف نام یا ای میل پہلے یہ سے رجسٹرڈ ہے۔ پاسورڈ بھول گیا والا لنک اِستعمال کر کے دیکھیں۔"
+    omniauth_error: "معذرت، آپ کا اکاؤنٹ اَوتھرائز کرنے میں ایک خرابی کا سامنا کرنا پڑا۔ شاید آپ نے اَوتھرائز کرنے کی اجازت نہیں دی؟"
+    omniauth_error_unknown: "آپ کے لاگ اِن سے نمٹنے میں کچھ خراب ہو گیا، براہ مہربانی دوبارہ کوشش کریں۔"
+    authenticator_error_no_valid_email: "%{account} سے وابستہ کسی ای میل پتہ کی اجازت نہیں ہے۔ آپ کو اپنے اکاؤنٹ کو کسی مختلف ای میل ایڈریس کے ساتھ ترتیب دینے کی ضرورت ہوسکتی ہے۔"
+    new_registrations_disabled: "اِس وقت کسی بھی نئے اکاؤنٹ کی رجسٹریشن کی اجازت نہیں ہے۔"
+    password_too_long: "پاسورڈ 200 حروف تک محدود ہیں۔"
+    email_too_long: "آپ کا فراہم کردہ ای میل بہت طویل ہے۔ میل باکس نام 254 حروف سے زیادہ نہیں ہونے چاہئیں، اور ڈَومین نام 253 حروف سے زیادہ نہیں ہونے چاہئیں۔"
+    reserved_username: "اُس صارف نام کی اجازت نہیں ہے۔"
+    missing_user_field: "آپ نے تمام صارف فیلڈز مکمل نہیں کی ہیں"
+    auth_complete: "تصدیق مکمل ہوگئی ہے۔"
+    click_to_continue: "جاری رکھنے کیلئے یہاں کلِک کریں۔"
+    already_logged_in: "افوہ، لگتا ہے کہ آپ کسی اور صارف کیلئے دعوت نامے کو قبول کرنے کی کوشش کر رہے ہیں۔ اگر آپ %{current_user} نہیں ہیں تو، براہ مہربانی لاگ آُوٹ کریں اور دوبارہ کوشش کریں۔"
+    second_factor_title: "دو فیکٹر توثیق"
+    second_factor_description: "براہ مہربانی اپنی اَیپ میں سے مطلوبہ توثیقی کَوڈ درج کریں:"
+    invalid_second_factor_code: "غلط توثیقی کَوڈ"
+  user:
+    no_accounts_associated: "کوئی اکاؤنٹس وابستہ نہیں"
+    deactivated: "بہت سے '%{email}' پر باؤنسِ ہوئے ای میل کی وجہ سے غیر فعال کر دیا گیا تھا۔"
+    deactivated_by_staff: "سٹاف نے غیر فعال کیا"
+    activated_by_staff: "سٹاف نے فعال کیا"
+    new_user_typed_too_fast: "نئے صارف نے بہت تیزی سے ٹائپ کیا"
+    content_matches_auto_block_regex: "مواد خود کار طریقہ سے بلاک کردہ رَیج اَیکس سے مَیچ کرتا ہے"
+    username:
+      short: "کم از کم %{min} حروف کا ہونا لازمی ہے"
+      long: "%{max} حروف سے زیادہ نہ ہونا لازمی ہے"
+      characters: "صرف نمبر، حروف، ڈَیشِز، اور انڈر سکَور کا شامل ہونا لازمی ہے"
+      unique: "منفرد ہونا لازمی ہے"
+      blank: "موجود ہونا لازمی ہے"
+      must_begin_with_alphanumeric_or_underscore: "ایک حرف، ایک نمبر یا ایک انڈر سکَور کے ساتھ شروع ہونا لازمی ہے"
+      must_end_with_alphanumeric: "ایک حرف یا ایک نمبر کے ساتھ ختم ہونا لازمی ہے"
+      must_not_contain_two_special_chars_in_seq: "2 یا اُس سے زیادہ خاص حروف (.-_) ایک سلسلہ میں شامل نہ ہونا لازمی ہے"
+      must_not_end_with_confusing_suffix: "عجیب لاحقہ جیسا کہ .json یا .png وغیرہ کے ساتھ ختم نہ ہونا لازمی ہے"
+    email:
+      not_allowed: "اِس ای میل پرووَائیڈر سے اجازت نہیں ہے۔ براہ مہربانی ایک اور ای میل پتہ استعمال کریں۔"
+      blocked: "کی اجازت نہیں ہے۔"
+      revoked: "%{date} تک '%{email}' کو ای میل نہیں بھیجیں گے۔"
+    ip_address:
+      blocked: "آپ کے آئی پی ایڈریس سے نئی رجسٹریشنوں کی اجازت نہیں ہے۔"
+      max_new_accounts_per_registration_ip: "آپ کے آئی پی ایڈریس سے نئی رجسٹریشنوں کی اجازت نہیں ہے (زیادہ سے زیادہ حد تک پہنچ گئے)۔ ایک سٹاف ممبر سے رابطہ کریں۔"
+    website:
+      domain_not_allowed: "ویب سائٹ غلط ہے۔ اجازت یافتہ ڈومَینز ہیں: %{domains}"
+    auto_rejected: "عمر کی وجہ سے خود کار طریقہ سے رد کر دیا گیا۔ دیکھیے auto_handle_queued_age سائٹ ترتیب۔"
+    destroy_reasons:
+      unused_staged_user: "غیر استعمال شدہ سٹَیجڈ صارف"
+      fixed_primary_email: "سٹَیجڈ صارف کیلئے بنیادی ای میل مقرر کر دیا گیا"
+      same_ip_address: "دوسرے صارفین کی طرح ایک ہی IP ایڈریس (%{ip_address})"
+  flags_reminder:
+    flags_were_submitted:
+      one: فلَیگز 1 گھنٹے سے پہلے جمع کیے گئے تھے۔ [براہ مہربانی ان کا جائزہ لیں](/admin/flags)۔
+      other: فلَیگز %{count} گھنٹوں سے پہلے جمع کیے گئے تھے۔ [براہ مہربانی ان کا جائزہ لیں](/admin/flags)۔
+    subject_template:
+      one: نمٹائے جانے کا منتظر 1 فلَیگ
+      other: نمٹائے جانے کے منتظر %{count} فلَیگز
+  unsubscribe_mailer:
+    title: "مَیلر غیر سَبسکرائب کریں"
+    subject_template: "تصدیق کریں کہ اب آپ %{site_title} سے ای میل اَپ ڈیٹس حاصل نہیں کرنا چاہتے ہیں"
+    text_body_template: |
+      کسی (ممکنہ طور پر آپ؟) نے %{site_domain_name} سے اِس ایڈریس پر ای میل اَپ ڈیٹس کو مزید نہ بھیجنے کا مطالبہ کیا۔
+      اگر آپ اس کی تصدیق کرنا چاہتے ہیں، تو براہ مہربانی اِس لنک پر کلِک کریں:
+
+      %{confirm_unsubscribe_link}
+
+
+      اگر آپ ای میل اَپ ڈیٹس موصول ہونا جاری رکھنا چاہتے ہیں، تو آپ اِس ای میل کو نظر انداز کر سکتے ہیں۔
+  invite_mailer:
+    title: "دعوتی مَیلر"
+    subject_template: "%{inviter_name} نے آپ کو %{site_domain_name} پر '%{topic_title}' پر دعوت دی"
+    text_body_template: |
+      %{inviter_name}  نے آپ کو ایک بحث پر مدعو کیا
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      پر
+
+      > %{site_title}-- %{site_description}
+      اگر آپ دلچسپی رکھتے ہیں، تو نیچے دیے گئے لِنک پر کلِک کریں:
+
+      %{invite_link}
+  custom_invite_mailer:
+    title: "اپنی مرضی کا دعوتی مَیلر"
+    subject_template: "%{inviter_name} نے آپ کو %{site_domain_name} پر '%{topic_title}' پر دعوت دی"
+    text_body_template: |
+      %{inviter_name}  نے آپ کو ایک بحث پر مدعو کیا
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      پر
+
+      > %{site_title}-- %{site_description}
+
+      اِس نوٹ کے ساتھ
+
+      > %{user_custom_message}
+
+      اگر آپ دلچسپی رکھتے ہیں، تو نیچے دیے گئے لِنک پر کلِک کریں:
+
+      %{invite_link}
+  invite_forum_mailer:
+    title: "دعوتی فورَم مَیلر"
+    subject_template: "%{inviter_name} نے آپ کو %{site_domain_name} میں شمولیت کیلئے دعوت دی"
+    text_body_template: |
+      %{inviter_name}  نے آپ کو شمولیت کیلئے دعوت دی
+
+      > **%{site_title}**
+      >
+      > %{site_description}
+
+      اگر آپ دلچسپی رکھتے ہیں، تو نیچے دیے گئے لِنک پر کلِک کریں:
+
+      %{invite_link}
+  custom_invite_forum_mailer:
+    title: "اپنی مرضی کا دعوتی فورَم مَیلر"
+    subject_template: "%{inviter_name} نے آپ کو %{site_domain_name} میں شمولیت کیلئے دعوت دی"
+    text_body_template: |
+      %{inviter_name} نے آپ کو شمولیت کیلئے دعوت دی
+
+      > **%{site_title}**
+      >
+      > %{site_description}
+
+      اِس نوٹ کے ساتھ
+
+      > %{user_custom_message}
+
+      اگر آپ دلچسپی رکھتے ہیں، تو نیچے دیے گئے لِنک پر کلِک کریں:
+
+      %{invite_link}
+  invite_password_instructions:
+    title: "دعوت پاسوَرڈ ہدایات"
+    subject_template: "اپنے %{site_name} اکاؤنٹ کیلئے پاسوَرڈ مقرر کریں"
+    text_body_template: |
+      %{site_name} کیلئے اپنا دعوت نامہ قبول کرنے کا شکریہ -- خوش آمدید!
+
+      ابھی پاسوَرڈ مقرر کرنے کیلئے اِس لِنک پر کلِک کریں:
+      %{base_url}/u/password-reset/%{email_token}
+
+      (اگر اوپر والے لِنک کی میعاد ختم ہو چکی ہو، تو اپنے ای میل پتہ سے لاگ اِن کرتے وقت "میں اپنا پاسوَرڈ بھول گیا" منتخب کریں۔)
+  download_backup_mailer:
+    title: "بَیک اَپ مَیلر ڈاؤن لوڈ کریں"
+    subject_template: "[%{email_prefix}] سائٹ بَیک اَپ ڈاؤن لوڈ"
+    text_body_template: |
+      یہ آپ کی طرف سے درخواست کردہ [سائٹ بَیک اَپ ڈاؤن لوڈ](%{backup_file_path}) ہے۔
+
+      ہم نے یہ ڈاؤن لوڈ لِنک سیکیورٹی وجوہات کی بناہ پر آپ کے تصدیق کردہ ای میل ایڈریس پر بھیجا ہے۔
+      مصدقہ
+      (اگر آپ نے اِس ڈاؤن لوڈ کی درخواست *نہیں* کی، تو آپ کو سنجیدگی سے فکرمند ہونا چاہئے -- کسی کے پاس آپ کی سائٹ تک اَیڈمِن رسائی حاصل ہے۔)
+    no_token: |
+      معذرت، یہ بَیک اَپ ڈاؤن لوڈ لِنک پہلے سے ہی استعمال کیا جا چکا یا اِس کی میعاد ختم ہو چکی ہے۔
+  admin_confirmation_mailer:
+    title: "ایڈمن کی توثیق"
+    subject_template: "[%{email_prefix}] نئے ایڈمن اکاؤنٹ کی توثیق کریں"
+    text_body_template: |
+      براہ مہربانی تصدیق کریں کہ آپ **%{target_username}** کو اپنے فورَم کے ایڈمِنِسٹریٹر کے طور پر شامل کرنا چاہتے ہیں۔
+
+      [ایڈمِنِسٹریٹر اکاؤنٹ کی تصدیق کریں](%{admin_confirm_url})
+  test_mailer:
+    title: "مَیلر ٹیسٹ کریں"
+    subject_template: "[%{email_prefix}] ای میل قابل ترسیل ہونے کا ٹیسٹ"
+    text_body_template: |
+      یہ اِس سے ایک ٹیسٹ ای میل ہے
+
+      [**%{base_url}**][0]
+
+      ای میل کا قابل ترسیل ہونا ترسیل پیچیدہ ہے۔ یہ چند اہم چیزیں ہیں جنہیں آپ کو پہلے چیک کرنا چاہیئے:
+
+      - اپنی سائٹ ترتیبات میں درست طریقے سے `نوٹیفکیشن ای میل` کیلئے from: ایڈریس مقرر کرنے کا *یقین* کر لیں۔ ** آپ کے بھیجے جانے والے ای میلز کے "from" ایڈریس میں درج کردہ ڈَومین وہ ڈَومین ہے جس کی بنیاد پر آپ کی ای میل کی تصدیق کی جائے گی**۔
+
+      - اپنے میل کلائنٹ میں ای میل کی رَا سورس دیکھنے کا طریقہ معلوم کر لیں، تاکہ آپ اہم سراگوں کیلئے ای میل ہیڈرز کی جانچ پڑتال کر سکیں۔ Gmail میں، ہر میل کے سب سے اوپر دائیں جانب ڈراپ-ڈاؤن مَینِیو میں یہ "show original" کی آپشن ہے۔
+
+      - **اہم:** کیا آپ کے ISP کے پاس، جن ڈومین ناموں اور IP ایڈریسوں سے آپ ای میل بھیجتے ہیں، اُن کے ساتھ منسلک کرنے کیلئے ریوَرس DNS ریکارڈ درج ہے؟ یہاں [اپنا ریوَرس PTR ریکارڈ ٹیسٹ کریں][2]۔ اگر آپ کا ISP مناسب ریورس DNS پوائنٹر ریکارڈ درج نہیں کرتا، تو اِس کا بہت کم امکان ہے کہ آپ کا کوئی بھی ای میل ارسال کیا جا سکے گا۔
+
+      - کیا آپ کے ڈومَین کا [SPF ریکارڈ][8] درست ہے؟ یہاں [اپنا SPF ریکارڈ چیک کریں][1]۔ نوٹ کریں کہ SPF ریکارڈ کی درست آفیشل ریکارڈ ٹائپ TXT ہے۔
+
+      - کیا آپ کے ڈومَین کا [DKIM ریکارڈ][3] درست ہے؟ یہ ای میل کے قابلِ ترسیل ہونے کو نمایاں طور پر بہتر بنائے گا۔ یہاں [اپنا DKIM ریکارڈ چیک کریں][7]۔
+
+      اگر آپ اپنا میل سرور چلاتے ہیں، تو اِس بات کا یقین کرنے کیلئے چیک کریں کہ آپ کے میل سرور کے IP [کسی بھی ای میل بلَیک لِسٹ پر موکود نہیں ہیں][4]۔ اِس بات کی بھی تصدیق کر لیں کہ یہ یقینی طور پر پوری طرح سے قوالیفائڈ ہَوسٹ نام بھیج رہا ہے جو اپنے HELO پیغام میں DNS پر ریزَولو ہوتا ہے۔ اگر ایسا نہ ہو، تو یہ آپ کا ای میل بہت سی میل سروِسوں کی طرف سے رد کیے جانے کا بائث بنے گا۔
+
+      - ہم آپ کو ذور کے ساتھ تجویز دیتے ہیں کہ آپ **[mail-tester.com][mt] پر ایک میل بھیجیں** اِس بات کا یقین کرنے کیلئے کہ اوپر سب صحیح طریقے سے کام کر رہا ہے۔
+
+      (*آسان* راستہ ہے کہ [SendGrid][sg]، [SparkPost][sp]، [Mailgun][mg] یا [Mailjet][mj]، پر ایک مفت اکاؤنٹ بنائیں جن پر سخی مفت میلنگ پلَین ہوتے ہیں اور چھوٹی کمیونٹیوں کیلئے ٹھیک ہیں۔ اگرچہ! آپ کو ابھی بھی اپنے DNS میں SPF اور DKIM ریکارڈ مقرر کرنے کی ضرورت ہوگی)
+
+      ہمیں امید ہے کہ آپ کو ای میل کے قابلِ ترسیل ہونے کا ٹیسٹ ٹھیک سے موصول ہو گیا ہو گا!
+
+      قسمت کامیاب کرے،
+
+      آپ کے [ڈِسکورس](http://www.discourse.org) پر دوست
+
+      [0]: %{base_url}
+      [1]: http://www.kitterman.com/spf/validate.html
+      [2]: http://mxtoolbox.com/ReverseLookup.aspx
+      [3]: http://www.dkim.org/
+      [4]: http://whatismyipaddress.com/blacklist-check
+      [7]: https://www.mail-tester.com/spf-dkim-check
+      [8]: http://www.openspf.org/SPF_Record_Syntax
+      [sg]: https://goo.gl/r1WMF6
+      [sp]: https://www.sparkpost.com/
+      [mg]: http://www.mailgun.com/
+      [mj]: https://www.mailjet.com/pricing
+      [mt]: http://www.mail-tester.com/
+  new_version_mailer:
+    title: "نیا ورژن مَیلر"
+    subject_template: "[%{email_prefix}] نیا ڈِسکورس ورژن، اَپ ڈیٹ دستیاب ہے"
+    text_body_template: |
+      ہُرے، [ڈِسکورس](http://www.discourse.org) کا ایک نیا ورژن دستیاب ہے!
+
+      آپ کا ورژن: %{installed_version}
+      نیا ورژن: **%{new_version}**
+
+      - ہمارے آسان ** [ایک-کلِک براؤزر اَپ گریڈ](%{base_url}/admin/upgrade)** کا استعمال کرتے ہوئے اَپ گریڈ کریں
+
+      - [ریلیز نوٹس](https://meta.discourse.org/tags/release-notes) میں ملاحظہ کریں کہ نیا کیا ہے یا [رَا گِٹ ہَب تبدیلیوں کا لاگ](https://github.com/discourse/discourse/commits/master) دیکھیں
+
+      ڈِسکورس کی خبر، بحث، اور مدد کیلئے [meta.discourse.org](https://meta.discourse.org) وِزِٹ کریں
+  new_version_mailer_with_notes:
+    title: "نوٹس کے ساتھ نیا ورژن مَیلر"
+    subject_template: "[%{email_prefix}] اَپ ڈیٹ دستیاب ہے"
+    text_body_template: |
+      ہُرے، [ڈِسکورس](http://www.discourse.org) کا ایک نیا ورژن دستیاب ہے!
+
+      آپ کا ورژن: %{installed_version}
+      نیا ورژن: **%{new_version}**
+
+      - ہمارے آسان ** [ایک-کلِک براؤزر اَپ گریڈ](%{base_url}/admin/upgrade)** کا استعمال کرتے ہوئے اَپ گریڈ کریں
+
+      - [ریلیز نوٹس](https://meta.discourse.org/tags/release-notes) میں ملاحظہ کریں کہ نیا کیا ہے یا [رَا گِٹ ہَب تبدیلیوں کا لاگ](https://github.com/discourse/discourse/commits/master) دیکھیں
+
+      ڈِسکورس کی خبر، بحث، اور مدد کیلئے [meta.discourse.org](https://meta.discourse.org) وِزِٹ کریں
+
+      ### ریلیز نوٹس
+
+      %{notes}
+  flag_reasons:
+    off_topic: "آپ کی پوسٹ کو **موضوع سے ہٹ کر** کے طور پر فلَیگ کیا گیا تھا: کمیونٹی سمجھتی ہے کہ یہ ٹاپک کیلئے اچھی فِٹ نہیں ہے، جیسا کہ عنوان اور پہلی پوسٹ کی طرف سے فی الحال بیان کیا گیا ہے۔"
+    inappropriate: "آپ کی پوسٹ کو **نامناسب** کے طور پر فلَیگ کیا گیا تھا: کمیونٹی سمجھتی ہے کہ یہ توہین آمیز، بدسلوکی، یا [ہماری کمیونٹی کے قواعد و ضوابط]() کی خلاف ورزی ہے۔"
+    spam: "آپ کی پوسٹ کو **سپَیم** کے طور پر فلَیگ کیا گیا تھا: کمیونٹی سمجھتی ہے کہ یہ ایک اشتہار ہے، ایسی چیز جو کہ بجائے توقع کے مطابق مفید یا موضوع سے متعلقہ ہونے، کے فطرت میں زیادہ تر پرَومَوشنل ہے۔"
+    notify_moderators: "آپ کی پوسٹ کو **ماڈریٹر کی توجہ کیلئے** فلَیگ کیا گیا تھا: کمیونٹی سمجھتی ہے کہ اِس پوسٹ میں کچھ ایسا ہے جس کیلئے سٹاف ممبر کی طرد سے دستی مداخلت کی ضرورت ہے۔"
+  flags_dispositions:
+    agreed: "ہمیں بتانے کیلئے شکریہ۔ ہم اتفاق کرتے ہیں کہ ایک مسئلہ موجود ہے اور ہم اِس سے نمٹ رہے ہیں۔"
+    agreed_and_deleted: "ہمیں بتانے کیلئے شکریہ۔ ہم اتفاق کرتے ہیں کہ ایک مسئلہ موجود ہے اور ہم نے پوسٹ ہٹا دی ہے۔"
+    disagreed: "ہمیں بتانے کیلئے شکریہ۔ ہم اِس سے نمٹ رہے ہیں۔"
+    deferred: "ہمیں بتانے کیلئے شکریہ۔ ہم اِس سے نمٹ رہے ہیں۔"
+    deferred_and_deleted: "ہمیں بتانے کیلئے شکریہ۔ ہم نے پوسٹ ہٹا دی ہے۔"
+  temporarily_closed_due_to_flags:
+    one: یہ ٹاپک کمیونٹی فلَیگز کی بڑی تعداد کی وجہ سے 1 گھنٹے کیلئے عارضی طور پر بند کردیا گیا ہے۔
+    other: یہ ٹاپک کمیونٹی فلَیگز کی بڑی تعداد کی وجہ سے %{count} گھنٹوں کیلئے عارضی طور پر بند کردیا گیا ہے۔
+  system_messages:
+    private_topic_title: "ٹاپک #%{id}"
+    contents_hidden: "اِس کے مواد کو دیکھنے کیلئے براہ کرم پوسٹ پر جائیں۔"
+    post_hidden:
+      title: "پوسٹ چھاپی دی گئی"
+      subject_template: "کمیونٹی فلَیگز کی وجہ سے پوسٹ چھاپی دی گئی"
+      text_body_template: |
+        ہیلو،
+
+        یہ %{site_name} کی طرف سے ایک خود کار پیغام ہے تاکہ آپ کو بتایا جاسکے کہ آپ کی پوسٹ چھپا دی گئی تھی۔
+
+        <%{base_url}%{url}>
+
+        %{flag_reason}
+
+        اِس پوسٹ کو چھپانے سے پہلے ایک سے زیادہ کمیونٹی ممبران نے اِسے فلَیگ کیا تھا، لہٰذا غور کریں کہ آپ اپنی پوسٹ میں کس طرح سے ترمیم کر سکتے ہیں کہ اُن کی رائے کی عکاسی ہو سکے۔ **آپ %{edit_delay} منٹ کے بعد اپنی پوسٹ میں ترمیم کرسکتے ہیں، اور یہ خود بخود غیر چھپی ہوئی ہو جائے گی۔**
+
+        تاہم، اگر پوسٹ ایک دوسری دفعہ کمیونٹی کی طرف سے چھپا دی جائے، تو سٹاف کی طرف سے اِس سے نمٹنے تک اِس کی پوشیدگی برقرار رہے گی۔
+
+        اضافی رہنمائی کیلئے، براہ کرم ہماری [کمیونٹی کی رہنما ہدایات](%{base_url}/guidelines) دیکھیے۔
+    post_hidden_again:
+      title: "پوسٹ دوبارہ چھاپی دی گئی"
+    usage_tips:
+      text_body_template: |
+        نئے صارف کے طور پر شروعات کرنے پر چند فوری تجاویز کیلئے، [اِس بلاگ پوسٹ کو دیکھیں](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/)۔
+
+        جیسے جیسے کہ آپ یہاں شرکت کریں گے، ہم آپ کو جان پائیں گے، اور نئے صارف پر عارضی پابندیاں اٹھا دی جائیں گی۔ وقت کے ساتھ ساتھ آپ [ٹرسٹ لَیول](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) حاصل کر سکیں گے، جن میں اِس کمیونٹی کو مل کر مینیج کرنے کیلئے خصوصی صلاحیتیں شامل ہوں گی۔
+    welcome_user:
+      title: "خوش آمدید صارف"
+      subject_template: "%{site_name} پر خوش آمدید!"
+      text_body_template: |
+        %{site_name} میں شمولیت اختیار کرنے کیلئے شکریہ، اور خوش آمدید!
+
+        %{new_user_tips}
+
+        ہم ہر وقت [مہذب کمیونٹی رویہ](%{base_url}/guidelines) پر یقین رکھتے ہیں۔
+
+        اپنے قیام کا لطف اٹھائیں!
+    welcome_invite:
+      title: "خوش آمدید دعوت"
+      subject_template: "%{site_name} پر خوش آمدید!"
+      text_body_template: |
+        %{site_name} پر اپنے دعوت نامہ کو قبول کرنے کا شکریہ -- خوش آمدید!
+
+        - ہم نے آپ کیلئے یہ نیا اکاؤنٹ **%{username}** بنایا ہے۔ [اپنی صارف پروفائل][prefs] پر جا کر اپنا نام یا پاسوَرڈ تبدیل کریں۔
+
+        جب آپ لاگ اِن کریں، تو براہ کرم **اپنے اصل دعوت نامے والے ای میل ایڈریس کو استعمال کریں** — ورنہ ہم بتانے کے قابل نہیں ہوں گے کہ یہ آپ ہی ہیں!
+
+        %{new_user_tips}
+
+        ہم ہر وقت [مہذب کمیونٹی رویہ](%{base_url}/guidelines) پر یقین رکھتے ہیں۔
+
+        اپنے قیام کا لطف اٹھائیں!
+
+        [prefs]: %{user_preferences_url}
+    backup_succeeded:
+      title: "بیک اَپ کامیاب"
+      subject_template: "بیک اَپ کامیابی سے مکمل کر لیا گیا"
+      text_body_template: |
+        بیک اَپ کامیاب ہو گیا تھا۔
+
+        اپنا نیا بیک اَپ ڈاؤن لوڈ کرنے کیلئے [ایڈمن > بیک اَپ سیکشن](%{base_url}/admin/backups) ملاحظہ کریں۔
+
+        یہ لاگ ہے:
+
+        ```text
+        %{logs}
+        ```
+    backup_failed:
+      title: "بیک اَپ ناکام"
+      subject_template: "بیک اَپ ناکام ہو گیا"
+      text_body_template: |
+        بیک اَپ ناکام ہو گیا ہے۔
+
+        یہ لاگ ہے:
+
+        ```text
+        %{logs}
+        ```
+    restore_succeeded:
+      title: "رِیسٹور کامیاب"
+      subject_template: "رِیسٹور کامیابی سے مکمل ہو گیا"
+      text_body_template: |
+        رِیسٹور کامیاب ہو گیا تھا۔
+
+        یہ لاگ ہے:
+
+        ```text
+        %{logs}
+        ```
+    restore_failed:
+      title: "رِیسٹور ناکام"
+      subject_template: "رِیسٹور ناکام ہو گیا"
+      text_body_template: |
+        رِیسٹور ناکام ہو گیا ہے۔
+
+        یہ لاگ ہے:
+
+        ```text
+        %{logs}
+        ```
+    bulk_invite_succeeded:
+      title: "بَلک مدعو کامیاب"
+      subject_template: "بَلک صارف دعوت ناموں پر کامیابی سے عملدرآمد ہو گیا"
+      text_body_template: "آپ کے بَلک صارف دعوت نامے فائل پر عملدرآمد کر دیا گیا، %{sent} دعوتیں میل کر دی گئیں۔"
+    bulk_invite_failed:
+      title: "بَلک مدعو ناکام"
+      subject_template: "بَلک صارف دعوت ناموں پر خرابں کے ساتھ عملدرآمد ہو گیا"
+      text_body_template: |
+        آپ کے بَلک صارف دعوت نامے فائل پر عملدرآمد کر دیا گیا، %{sent} دعوتیں میل کر دی گئیں اور %{failed} خرابی(وں) کا سامنا کرنا پڑا۔
+
+        یہ لاگ ہے:
+
+        ```text
+        %{logs}
+        ```
+    csv_export_succeeded:
+      title: "CSV ایکسپورٹ کامیاب"
+      text_body_template: |
+        آپ کا ڈَیٹا ایکسپورٹ کامیاب ہو گیا! :dvd:
+
+        <a class="attachment" href="%{download_link}">%{file_name}</a> (%{file_size})
+
+        درجہ بالا ڈاؤن لوڈ لِنک 48 گھنٹے تک درست رہے گا۔
+
+        ڈَیٹا gzip آرکائیو کے طور پر کمپرَیسڈ کیا گیا ہے۔ اگر آپ کے کھولنے پر آرکائیو خود کو ایکسٹریکٹ نہیں کی لیتی، تو یہاں تجویز کردہ ٹولز استعمال کریں: http://www.gzip.org/#faq4
+    csv_export_failed:
+      title: "CSV ایکسپورٹ ناکام"
+      subject_template: "ڈَیٹا ایکسپورٹ ناکام ہو گئی"
+      text_body_template: "ہمیں افسوس ہے، لیکن آپ کا ڈَیٹا ایکسپورٹ ناکام ہوگیا ہے۔ برائے مہربانی لاگز چیک کریں یا [ایک سٹاف ممبر سے رابطہ کریں](%{base_url}/about)۔"
+    email_reject_insufficient_trust_level:
+      title: "ای میل مسترد ناکافی ٹرسٹ لَیول"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- ناکافی ٹرسٹ لَیول"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        اِس ای میل ایڈریس پر نئے ٹاپک شائع کرنے کیلئے آپ کے اکاؤنٹ کے پاس مطلوبہ ٹرسٹ لَیول نہیں ہے۔ اگر آپ سمجھتے ہیں کہ یہ ایک غلطی ہے، تو [ایک سٹاف ممبر سے رابطہ کریں](%{base_url}/about)۔
+    email_reject_user_not_found:
+      title: "ای میل مسترد صارف نہیں ملا"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- صارف نہیں ملا"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        آپ کا جواب ایک نامعلوم ای میل ایڈریس سے بھیجا گیا تھا۔ کسی دوسرے ای میل ایڈریس سے بھیجنے کی کوشش کریں، یا [ایک سٹاف ممبر سے رابطہ کریں](%{base_url}/about)۔
+    email_reject_screened_email:
+      title: "ای میل مسترد سکرین کردہ ای میل"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- بلاک کردہ ای میل"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        آپ کا جواب ایک بلاک شدہ ای میل ایڈریس سے بھیجا گیا تھا۔ کسی دوسرے ای میل ایڈریس سے بھیجنے کی کوشش کریں، یا [ایک سٹاف ممبر سے رابطہ کریں](%{base_url}/about)۔
+    email_reject_not_allowed_email:
+      title: "ای میل مسترد غیر اجازت یافتہ ای میل"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- بلاک کردہ ای میل"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        آپ کا جواب ایک بلاک شدہ ای میل ایڈریس سے بھیجا گیا تھا۔ کسی دوسرے ای میل ایڈریس سے بھیجنے کی کوشش کریں، یا [ایک سٹاف ممبر سے رابطہ کریں](%{base_url}/about)۔
+    email_reject_inactive_user:
+      title: "ای میل مسترد غیر فعال صارف"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- غیر فعال صارف"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        اِس ای میل ایڈریس سے منسلک آپ کا اکاؤنٹ چالو نہیں ہے۔ ای میل بھیجنے سے پہلے اپنے اکاؤنٹ کو فعال کریں۔
+    email_reject_silenced_user:
+      title: "ای میل مسترد خاموش کردہ صارف"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- خاموش کردہ صارف"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        اِس ای میل ایڈریس سے منسلک آپ کا اکاؤنٹ خاموش کر دیا گیا ہے۔
+    email_reject_reply_user_not_matching:
+      title: "ای میل مسترد صارف مَیچ نہیں کرتا"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- غیر متوقع ایڈریس سے جواب"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        آپ کا جواب ہماری طرف سے متوقع ای میل ایڈریس کے علاوہ سے بھیجا گیا تھا، لہٰذا ہمیں یقین نہیں ہے کہ یہ وہی شخص ہے۔ کسی دوسرے ای میل ایڈریس سے بھیجنے کی کوشش کریں، یا [ایک سٹاف ممبر سے رابطہ کریں](%{base_url}/about)۔
+    email_reject_no_account:
+      title: "ای میل مسترد اکاؤنٹ نہیں"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- نامعلوم اکاؤنٹ"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        ہم آپ کے ای میل ایڈریس سے مَیچ کردہ کسی بھی اکاؤنٹ کو تلاش نہ کر سکے۔ کسی دوسرے ای میل ایڈریس سے بھیجنے کی کوشش کریں، یا [ایک سٹاف ممبر سے رابطہ کریں](%{base_url}/about)۔
+    email_reject_empty:
+      title: "ای میل مسترد خالی"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- مواد نہیں"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        ہم آپ کے ای میل میں جواب کا کوئی بھی مواد تلاش نہ کر سکے۔
+
+        اگر آپ کو یہ موصول ہو رہا ہے اور آپ _نے_ جواب شامل کیا تھا، تو مزید سادہ فارمَیٹِنگ کے ساتھ دوبارہ کوشش کریں۔
+    email_reject_parsing:
+      title: "ای میل مسترد پارسِنگ"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- مواد نہیں سمجھا"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        ای میل میں ہم آپ کا جواب تلاش نہ کر سکے۔ **یقینی بنائیں کہ آپ کا جواب ای میل کے سب سے اوپر ہے** -- ہم اِن لائن جوابات پر عمل درامد نہیں کرسکتے ہیں۔
+    email_reject_invalid_access:
+      title: "ای میل مسترد غلط رسائی"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- غلط رسائی"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        آپ کے اکاؤنٹ کے پاس اس زُمرہ پر نئے ٹاپک شائع کرنے کی اجازت نہیں ہے۔ اگر آپ سمجھتے ہیں کہ یہ ایک غلطی ہے، تو [ایک سٹاف ممبر سے رابطہ کریں](%{base_url}/about)۔
+    email_reject_strangers_not_allowed:
+      title: "ای میل مسترد اجنبیوں کو اجازت نہیں"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- غلط رسائی"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        جس زُمرہ پر آپ نے یہ ای میل بھیجا ہے، وہ صرف درست اکاؤنٹ اور معلوم ای میل ایڈریس والے صارفین کے جوابات کی اجازت دیتا ہے۔ اگر آپ سمجھتے ہیں کہ یہ ایک غلطی ہے، تو [ایک سٹاف ممبر سے رابطہ کریں](%{base_url}/about)۔
+    email_reject_invalid_post:
+      title: "ای میل مسترد غلط پوسٹ"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- پوسٹ اشاعت میں خرابی"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        چند ممکنہ وجوہات ہیں: پیچیدہ فارمَیٹِنگ، پیغام بہت بڑا، پیغام بہت چھوٹا۔ براہ کرم دوبارہ کوشش کریں، یا اگر یہ جاری رہے تو ویب سائٹ کے ذریعہ شائع کریں۔
+    email_reject_invalid_post_specified:
+      title: "ای میل مسترد غلط پوسٹ متعین کردہ"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- پوسٹ اشاعت میں خرابی"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        وجہ:
+
+        %{post_error}
+
+        اگر آپ مسئلہ کو درست کر سکتے ہیں، تو براہ کرم دوبارہ کوشش کریں۔
+    email_reject_invalid_post_action:
+      title: "ای میل مسترد غلط پوسٹ اَیکشن"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- غلط پوسٹ اَیکشن"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        پوسٹ اَیکشن نامعلوم ہے۔ براہ کرم دوبارہ کوشش کریں، یا اگر یہ جاری رہے تو ویب سائٹ کے ذریعہ شائع کریں۔
+    email_reject_reply_key:
+      title: "ای میل مسترد جواب کلید"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- نامعلوم جواب کلید"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        ای میل میں جواب کی کلید غلط یا نامعلوم ہے، لہٰذا ہم اِس بات کا تعین نہیں کر سکتے کہ یہ ای میل کس کے جواب میں ہے۔ [ایک سٹاف ممبر سے رابطہ کریں](%{base_url}/about)۔
+    email_reject_bad_destination_address:
+      title: "ای میل مسترد غلط منزل ایڈریس"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- نامعلوم کیلئے ایڈریس"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        کوئی بھی منزل ای میل ایڈریس معلوم نہیں، یا ای میل میں Message-ID کے ہیڈر میں ترمیم کی گئی ہے۔ براہ کرم یقینی بنائیں کہ سٹاف کی طرف سے فراہم کردہ صحیح ای میل ایڈریس پر آپ بھیج رہے ہیں۔
+    email_reject_topic_not_found:
+      title: "ای میل مسترد ٹاپک نہیں ملا"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- ٹاپک نہیں ملا"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        جس ٹاپک پر آپ جواب دے رہے ہیں وہ اب موجود نہیں ہیں -- شاید یہ حذف کر دیا گیا تھا؟ اگر آپ سمجھتے ہیں کہ یہ ایک غلطی ہے، تو [ایک سٹاف ممبر سے رابطہ کریں](%{base_url}/about)۔
+    email_reject_topic_closed:
+      title: "ای میل مسترد ٹاپک بند"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- ٹاپک بند"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        جس ٹاپک پر آپ جواب دے رہے ہیں وہ فی الحال بند ہے اور اَب جوابات قبول نہیں کر رہا۔ اگر آپ سمجھتے ہیں کہ یہ ایک غلطی ہے، تو [ایک سٹاف ممبر سے رابطہ کریں](%{base_url}/about)۔
+    email_reject_auto_generated:
+      title: "ای میل مسترد خود بخود تخلیق کردہ"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- خود بخود تخلیق کردہ جواب"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        آپ کی ای میل "خود بخود تخلیق کردہ" کے طور پر نشان زد کی گئی تھی، جس کا مطلب یہ ہے کہ کسی انسان کی طرف سے ٹائپ ہونے کی بجائے اِسے کمپیوٹر کے ذریعہ خود کار طریقہ سے بنایا گیا ہے؛ ہم ایسی قِسم کی ای میلز کو قبول نہیں کرسکتے ہیں۔ اگر آپ سمجھتے ہیں کہ یہ ایک غلطی ہے، تو [ایک سٹاف ممبر سے رابطہ کریں](%{base_url}/about)۔
+    email_reject_unrecognized_error:
+      title: "ای میل مسترد نامعلوم خرابی"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- نامعلوم خرابی"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        آپ کی ای میل پر عمل درامد کے دوران ایک نامعلوم خرابی کا سامنا کرنا پڑا اور وہ شائع نہیں ہوئی۔ آپ کو دوبارہ کوشش کرنی چاہئے، یا [ایک سٹاف ممبر سے رابطہ کریں](%{base_url}/about)۔
+    email_error_notification:
+      title: "ای میل مسترد اطلاع"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- POP توثیق خرابی"
+      text_body_template: |
+        بدقسمتی سے، POP سرور سے میلز پولِنگ کرنے کے دوران ایک توثیقی خرابی کا سامنا کرنا پڑا۔
+
+        براہ مہربانی یقینی بنائیں کہ آپ نے [سائٹ ترتیبات](%{base_url}/admin/site_settings/category/email) میں POP اسناد کو ٹھیک طریقے سے ترتیب دیا ہے۔
+
+        اگر POP ای میل اکاؤنٹ کیلئے ویب UI موجود ہے، تو آپ کو ویب پر لاگ اِن کرنے اور اپنی ترتیبات کو وہاں چیک کرنے کی ضرورت پڑ سکتی ہے۔
+    too_many_spam_flags:
+      title: "بہت زیادہ سپَیم فلَیگز"
+      subject_template: "نیا اکاؤنٹ ہَولڈ پر"
+      text_body_template: |
+        ہیلو،
+
+        یہ %{site_name} کی طرف سے ایک خود کار پیغام ہے تاکہ آپ کو بتایا جاسکے کہ آپ کی پوسٹس عارضی طور پر چھپا دیا گیا ہے کیونکہ وہ کمیونٹی کی طرف سے فلَیگ کی گئی تھیں۔
+
+        احتیاطی تدابیر کے طور پر، آپ کا نیا اکاؤنٹ نئے جوابات یا ٹاپک تخلیق کرنے سے خاموش کر دیا گیا ہے جب تک کہ ایک سٹاف ممبر آپ کے اکاؤنٹ کا جائزہ لے سکے۔ ہم تکلیف کے لیے معذرت خواہ ہیں۔
+
+        اضافی رہنمائی کیلئے، براہ کرم ہماری [کمیونٹی کی رہنما ہدایات](%{base_url}/guidelines) دیکھیے۔
+    too_many_tl3_flags:
+      title: "بہت زیادہ ٹ.ل.3 فلَیگز"
+      subject_template: "نیا اکاؤنٹ ہَولڈ پر"
+      text_body_template: |
+        ہیلو،
+
+        یہ %{site_name} کی طرف سے ایک خود کار پیغام ہے تاکہ آپ کو بتایا جاسکے کہ بڑی تعداد میں کمیونٹی فلَیگز کی وجہ سے آپ کا اکاؤنٹ ہَولڈ پر رکھ دیا گیا ہے۔
+
+        احتیاطی تدابیر کے طور پر، آپ کا نیا اکاؤنٹ نئے جوابات یا ٹاپک تخلیق کرنے سے خاموش کر دیا گیا ہے جب تک کہ ایک سٹاف ممبر آپ کے اکاؤنٹ کا جائزہ لے سکے۔ ہم تکلیف کے لیے معذرت خواہ ہیں۔
+
+        اضافی رہنمائی کیلئے، براہ کرم ہماری [کمیونٹی کی رہنما ہدایات](%{base_url}/guidelines) دیکھیے۔
+    silenced_by_staff:
+      title: "سٹاف نے خاموش کیا"
+      subject_template: "اکاؤنٹ عارضی طور پر ہَولڈ پر"
+      text_body_template: |
+        ہیلو،
+
+        یہ %{site_name} کی طرف سے ایک خود کار پیغام ہے تاکہ آپ کو بتایا جاسکے کہ احتیاطی تدابیر کے طور پر آپ کا اکاؤنٹ عارضی طور پر ہَولڈ پر رکھ دیا گیا ہے۔
+
+        براہ مہربانی براؤز کرنا جاری رکھیں، لیکن آپ جواب یا ٹاپک تخلیق نہیں کر سکیں گے جب تک کوئی [سٹاف ممبر](%{base_url}/about) آپ کی سب سے حالیہ اشاعتوں کا جائزہ نہ لیلے۔ ہم تکلیف کے لیے معذرت خواہ ہیں۔
+
+        اضافی رہنمائی کیلئے، ہماری [کمیونٹی کی رہنما ہدایات](%{base_url}/guidelines) دیکھیے۔
+    user_automatically_silenced:
+      title: "صارف خود بخود خاموش کردہ"
+      subject_template: "نیا صارف %{username} کمیونٹی فلَیگز کے ذریعہ خاموش کر دیا گیا"
+      text_body_template: |
+        یہ ایک خودکار پیغام ہے۔
+
+        نیا صارف [%{username}](%{user_url}) خود کار طریقہ سے خاموش کر دیا گیا تھا کیونکہ کئی صارفین نے %{username} کی پوسٹ(س) کو فلَیگ کیا تھا۔
+
+        براہ مہربانی [فلَیگز کا جائزہ لیں](%{base_url}/admin/flags)۔ اگر %{username} کو اشاعت سے غلط خاموش کیا گیا تھا، تو اِس صارف کیلئے [ایڈمن صفحہ](%{user_url}) پر خاموشی ختم کر دینے والے بٹن پر کلِک کریں۔
+
+        اس حد کو بذریعہ `silence_new_user` سائٹ ترتیب کے تبدیل کیا جاسکتا ہے۔
+    spam_post_blocked:
+      title: "سپَیم پوسٹ بلاک کر دی گئی"
+      subject_template: "بار بار لِنکس کی وجہ سے نئے صارف %{username} کی پوسٹس کو بلاک کردیا گیا"
+      text_body_template: |
+        یہ ایک خودکار پیغام ہے۔
+
+        نئے صارف [%{username}](%{user_url}) نے %{domains} کے ساتھ لِنکس والی کئی پوسٹس بنانے کی کوشش کی، لیکن سپَیم سے بچنے کے لئے اُن پوسٹس کو بلاک کر دیا گیا تھا۔ صارف اب بھی نئی پوسٹس بنا سکتا ہے جو %{domains} پر لِنک نہ کریں۔
+
+        براہ مہربانی [صارف کا جائزہ لیں](%{user_url})۔
+
+        یہ `newuser_spam_host_threshold` اور `white_listed_spam_host_domains` سائٹ ترتیب کے ذریعے تبدیل کیا جا سکتا ہے۔
+    unsilenced:
+      title: "خاموشی ختم"
+      subject_template: "اکاؤنٹ اَب ہولڈ پر نہیں ہے"
+      text_body_template: |
+        ہیلو،
+
+        یہ %{site_name} کی طرف سے ایک خود کار پیغام ہے آپ کو مطلع کرنے کیلئے کہ سٹاف کے جائزہ لینے کے بعد آپ کا اکاؤنٹ مزید ہَولڈ پر نہیں ہے۔
+
+        اَب آپ دوبارہ نئے جوابات اور ٹاپک بنا سکتے ہیں۔ آپ کے صبر کا شکریہ۔
+    pending_users_reminder:
+      title: "زیرِ اِلتواء صارفین کیلئے یاد دہانی"
+      subject_template:
+        one: 1 صارف منظوری کا منتظر ہے
+        other: '%{count} صارفین منظوری کے منتظر ہیں'
+      text_body_template: |
+        اِس فورم تک رسائی حاصل کرنے سے پہلے نئے صارف سائن اَپ منظور (یا مسترد) ہونے کے منتظر ہیں۔
+        [براہ مہربانی اَیڈمن سیکشن میں اُن کا جائزہ لیں](%{base_url}/admin/users/list/pending)۔
+    download_remote_images_disabled:
+      title: "ریمَوٹ تصاویر کے ڈاؤن لوڈ غیر فعال"
+      subject_template: "ریمَوٹ تصاویر کے ڈاؤن لوڈ کو غیر فعال کر دیا گیا ہے"
+      text_body_template: "`download_remote_images_to_local` ترتیب غیر فعال کر دی گئی تھی کیونکہ` download_remote_images_threshold` پر ڈِسک میں جگہ کی حد تک پہنچ گئے تھے۔"
+    dashboard_problems:
+      title: "ڈَیش بورڈ مسائل"
+      subject_template: "مسائل پائے گئے ہیں"
+      text_body_template: |
+        آپ کے اَیڈمن ڈَیش بورڈ پر کچھ مسائل کی اطلاع دی جا رہی ہے۔
+
+        [براہ مہربانی اُن کا جائزہ لیں اور اُنہیں حل کریں](%{base_url}/admin)۔
+    new_user_of_the_month:
+      title: "مہینہ کے سب سے زیادہ قابل قدر نئے صارف!"
+      subject_template: "آپ مہینہ کے سب سے زیادہ قابل قدر نئے صارف ہیں!"
+      text_body_template: |
+        مبارک ہو، آپ نے **%{month_year} کیلئے مہینہ کے سب سے زیادہ قابل قدر نئے صارف ایوارڈ** حاصل کر لیا ہے۔ :trophy:
+
+        یہ اعزاز صرف ایک ماہ میں دو نئے صارفین کو دیا جاتا ہے، اور یہ [بَیجز صفحہ](%{url}) پر مستقل طور پر نظر آئے گا۔
+
+        آپ تیزی سے ہماری کمیونٹی کے قابل قدر رکن بن گئے ہیں۔ شامل ہونے کیلئے شکریہ، اور اپنا اچھا کام جاری رکھیں!
+    queued_posts_reminder:
+      title: "قطار شدہ پوسٹس یاد دہانی"
+      subject_template:
+        one: جائزہ لیے جانے کی منتظر 1 پوسٹ
+        other: جائزہ لیے جانے کی منتظر %{count} پوسٹس
+      text_body_template: |
+        ہیلو،
+
+        نئے صارفین کی پوسٹس کو ماڈرَیشَن کیلئے ہَولڈ پر رکھا گیا اور فی الحال جائزہ لیے جانے کے انتظار میں ہیں۔ [اُن کو منظور یا مسترد یہاں کریں](%{base_url}/queued-posts)۔
+  unsubscribe_link: |
+    اِن ای میلز سے غیر سَبسکرائب کرنے کیلئے، [یہاں کلِک کریں](%{unsubscribe_url})۔
+  unsubscribe_link_and_mail: |
+    اِن ای میلز سے غیر سَبسکرائب کرنے کیلئے، [یہاں کلِک کریں](%{unsubscribe_url})۔
+  unsubscribe_mailing_list: |
+    آپ کو یہ موصول ہو رہا ہے کیونکہ آپ نے مَیلنگ لِسٹ مَوڈ فعال کیا ہوا ہے۔
+
+    اِن ای میلز سے غیر سَبسکرائب کرنے کیلئے، [یہاں کلِک کریں](%{unsubscribe_url})۔
+  subject_re: "جواب:"
+  subject_pm: "[PM]"
+  user_notifications:
+    previous_discussion: "پچھلے جوابات"
+    reached_limit:
+      one: 'جان لیں کہ: ہم روزانہ کی 1 ای میل بھیجتے ہیں۔ جو ممکنی روک دی گئی ہوں، اُن کو دیکھنے کیلئے سائٹ کو چیک کریں۔ اور ہاں، مقبول ہونے کیلئے شکریہ!'
+      other: 'جان لیں کہ: ہم روزانہ کی %{count} ای میل بھیجتے ہیں۔ جو ممکنی روک دی گئی ہوں، اُن کو دیکھنے کیلئے سائٹ کو چیک کریں۔ اور ہاں، مقبول ہونے کیلئے شکریہ!'
+    in_reply_to: "کے جواب میں"
+    unsubscribe:
+      title: "غیر سَبسکرائب"
+      description: "اِن ای میلز کو موصول کرنے میں دلچسپی نہیں ہے؟ کوئی مسئلہ نہیں! فوری طور پر غیر سَبسکرائب کرنے کیلئے ذیل میں کلِک کریں:"
+    reply_by_email: "[ٹاپک وِزِٹ کریں](%{base_url}%{url}) یا جواب دینے کیلئے اس ای میل کا جواب دیں۔"
+    reply_by_email_pm: "[پیغام وِزِٹ کریں](%{base_url}%{url}) یا جواب دینے کیلئے اس ای میل کا جواب دیں۔"
+    only_reply_by_email: "جواب دینے کیلئے اس ای میل کا جواب دیں۔"
+    visit_link_to_respond: "جواب دینے کیلئے [ٹاپک وِزِٹ کریں](%{base_url}%{url})۔"
+    visit_link_to_respond_pm: "جواب دینے کیلئے [پیغام وِزِٹ کریں](%{base_url}%{url})۔"
+    posted_by: "%{post_date} کو %{username} نے پوسٹ کیا"
+    invited_group_to_private_message_body: |
+      %{inviter_name}  نے %{group_name} کو ایک پیغام پر مدعو کیا
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      پر
+
+      > %{site_title}-- %{site_description}
+    invited_to_private_message_body: |
+      %{inviter_name}  نے آپ کو ایک پیغام پر مدعو کیا
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      پر
+
+      > %{site_title}-- %{site_description}
+    invited_to_topic_body: |
+      %{inviter_name}  نے آپ کو ایک بحث پر مدعو کیا
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      پر
+
+      > %{site_title}-- %{site_description}
+    user_invited_to_private_message_pm_group:
+      title: "صارف نے گروپ ذاتی پیغام میں مدعو کیا"
+      subject_template: "[%{email_prefix}]%{username} نے @%{group_name} کو پیغام '%{topic_title}' میں مدعو کیا"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_invited_to_private_message_pm:
+      title: "صارف ذاتی پیغام میں مدعو"
+      subject_template: "[%{email_prefix}]%{username} نے آپ کو پیغام '%{topic_title}' میں مدعو کیا"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_invited_to_private_message_pm_staged:
+      title: "صارف ذاتی پیغام سٹَیجڈ میں مدعو"
+      subject_template: "[%{email_prefix}]%{username} نے آپ کو پیغام '%{topic_title}' میں مدعو کیا"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_invited_to_topic:
+      title: "صارف ٹاپک میں مدعو"
+      subject_template: "[%{email_prefix}]%{username} نے آپ کو '%{topic_title}' میں مدعو کیا"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_replied:
+      title: "صارف کی طرف سے جواب دیا گیا"
+      subject_template: "[%{email_prefix}]%{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_replied_pm:
+      title: "صارف کی طرف سے جواب دیا گیا ذاتی پیغام"
+      subject_template: "[%{email_prefix}] [ذاتی پیغام] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_quoted:
+      title: "صارف کی طرف سے اقتباس کردہ"
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_linked:
+      title: "صارف کی طرف سے لِنک کردہ"
+      subject_template: "[%{email_prefix}]%{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_mentioned:
+      title: "صارف ذکر کیا گیا"
+      subject_template: "[%{email_prefix}]%{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_group_mentioned:
+      title: "صارف گروپ ذکر کیا گیا"
+      subject_template: "[%{email_prefix}]%{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_posted:
+      title: "صارف نے شائع کیا"
+      subject_template: "[%{email_prefix}]%{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_watching_first_post:
+      title: "صارف نے پہلی پوسٹ پر نظر رکھی ہوئی ہے"
+      subject_template: "[%{email_prefix}]%{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_posted_pm:
+      title: "صارف نے ذاتی پیغام شائع کیا"
+      subject_template: "[%{email_prefix}] [ذاتی پیغام] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_posted_pm_staged:
+      title: "صارف نے ذاتی پیغام سٹَیجڈ شائع کیا"
+      subject_template: "%{optional_re}%{topic_title}"
+      text_body_template: |2
+
+          %{message}
+    account_suspended:
+      title: "اکاؤنٹ معطل"
+      subject_template: "[%{email_prefix}] آپ کا اکاؤنٹ معطل کر دیا گیا ہے"
+      text_body_template: |
+        آپ کو %{suspended_till} تک فورَم سے معطل کر دیا گیا ہے۔
+
+        %{reason}
+
+        %{message}
+    account_silenced:
+      title: "اکاؤنٹ خاموش"
+      subject_template: "[%{email_prefix}] آپ کا اکاؤنٹ خاموش کر دیا گیا ہے"
+      text_body_template: |
+        آپ کو %{silenced_till} تک فورَم سے خاموش کر دیا گیا ہے۔
+
+        %{reason}
+
+        %{message}
+    account_exists:
+      title: "اکاؤنٹ پہلے سے موجود"
+      subject_template: "[%{email_prefix}] اکاؤنٹ پہلے سے ہی موجود ہے"
+      text_body_template: |
+        آپ نے ابھی %{site_name} پر ایک اکاؤنٹ بنانے کی کوشش کی، یا ایک اکاؤنٹ کی ای میل کو %{email} پر تبدیل کرنے کی کوشش کی۔ تاہم، %{email} کیلئے ایک اکاؤنٹ پہلے سے ہی موجود ہے۔
+
+        اگر آپ کو اپنا پاسوَرڈ بھول گیا، تو [ابھی دوبارہ رِی سَیٹ کریں](%{base_url}/password-reset)۔
+
+        اگر آپ نے %{email} کیلئے اکاؤنٹ بنانے کی کوشش نہیں کی یا اپنا ای میل ایڈریس تبدیل کرنے کی، تو فکر مت کریں - آپ اِس پیغام کو آرام سے نظر انداز کر سکتے ہیں۔
+
+        اگر آپ کے پاس کوئی سوال ہیں، تو [ہمارے دوستانہ سٹاف سے رابطہ کریں](%{base_url}/about)۔
+    account_second_factor_disabled:
+      title: "دو فیکٹر توثیق غیر فعال"
+      subject_template: "[%{email_prefix}] دو فیکٹر توثیق غیر فعال کردی گئی"
+      text_body_template: |
+        %{site_name} پر آپ کے اکاؤنٹ کیلئے دو فیکٹر توثیق غیر فعال کردی گئی ہے۔ اب آپ صرف اپنے پاسوَرڈ کے ساتھ لاگ اِن کرسکتے ہیں۔ ایک اضافی توثیقی کوڈ کی مزید ضرورت نہیں ہے۔
+
+        اگر آپ نے دو فیکٹر توثیق کو غیر فعال کرنے کا انتخاب نہیں کیا، تو کسی نے آپ کے اکاؤنٹ تک غیر مجاز رسائی حاصل کر لی ہے۔
+
+        اگر آپ کے پاس کوئی سوال ہیں، تو [ہمارے دوستانہ سٹاف سے رابطہ کریں](%{base_url}/about)۔
+    digest:
+      why: "آپ کے %{last_seen_at} کو آخری وِزِٹ کے بعد سے %{site_link} کا ایک مختصر خلاصہ"
+      since_last_visit: "آپ کے کو آخری وِزِٹ کے بعد سے"
+      new_topics: "نئے ٹاپک"
+      unread_messages: "غیر پڑھے پیغامات"
+      unread_notifications: "غیر پڑھی اطلاعات"
+      liked_received: "لائیکس موصول ہوے"
+      new_posts: "نئی پوسٹس"
+      new_users: "نئے صارفین"
+      popular_topics: "مقبول ٹاپک"
+      follow_topic: "اِس ٹاپک کی پیروی کریں"
+      join_the_discussion: "مزید پڑھیں "
+      popular_posts: "مقبول پوسٹس"
+      more_new: "آپ کیلئے نیا"
+      subject_template: "[%{email_prefix}] خلاصہ"
+      unsubscribe: "یہ خلاصہ %{site_link} کی طرف سے بھیجا جاتا ہے جب ہم نے کچھ دیر سے آپ کو نہیں دیکھا ہو۔ %{email_preferences_link} کو تبدیل کریں، یا غیر سَبسکرائب کرنے کیلئے %{unsubscribe_link}۔"
+      your_email_settings: "آپ کی ای میل ترتیبات"
+      click_here: "یہاں کلِک کریں"
+      from: "%{site_name} خلاصہ"
+      preheader: "آپ کے %{last_seen_at} کو آخری وِزِٹ کے بعد سے ایک مختصر خلاصہ"
+    forgot_password:
+      title: "پاسوَرڈ بھول گیا"
+      subject_template: "[%{email_prefix}] پاسوَرڈ ری سَیٹ"
+      text_body_template: |
+        کسی نے پر آپ کا پاسوَرڈ [%{site_name}](%{base_url}) رِی سَیٹ کرنے کیلئے کہا۔
+
+        اگر یہ آپ نہیں تھے، تو آپ اِس ای میل کو آرام سے نظر انداز کر سکتے ہیں۔
+
+        نیا پاسوَرڈ منتخب کرنے کیلئے مندرجہ ذیل لِنک پر کلِک کریں:
+        %{base_url}/u/password-reset/%{email_token}
+    email_login:
+      title: "بذریعہ لِنک لاگ اِن کریں"
+      subject_template: "[%{email_prefix}] بذریعہ لِنک لاگ اِن کریں"
+      text_body_template: |
+        [%{site_name}](%{base_url}) پر لاگ اِن کرنے کیلئے آپ کا لِنک یہ ہے۔
+
+        اگر آپ نے اِس لِنک کی درخواست نہیں کی، تو آپ اِس ای میل کو آرام سے نظر انداز کر سکتے ہیں۔
+
+        لاگ اِن کرنے کیلئے مندرجہ ذیل لِنک پر کلِک کریں:
+        %{base_url}/session/email-login/%{email_token}
+    set_password:
+      title: "پاسوَرڈ مقرر"
+      subject_template: "[%{email_prefix}] پاسوَرڈ مقرر کریں"
+      text_body_template: |
+        کسی نے [%{site_name}](%{base_url}) پر آپ کے اکاؤنٹ پر پاسوَرڈ مقرر کرنے کیلئے کہا۔ متبادل طور پر، آپ اِس تصدیق کردہ ای میل ایڈریس سے منسلک کسی بھی قابل آن لائن سروس (گُوگل، فَیس بُک، وغیرہ) کا استعمال کرتے ہوئے لاگ اِن کرسکتے ہیں۔
+
+        اگر آپ نے یہ درخواست نہیں کی، تو آپ اِس ای میل کو آرام سے نظر انداز کر سکتے ہیں۔
+
+        پاسوَرڈ منتخب کرنے کیلئے مندرجہ ذیل لِنک پر کلِک کریں:
+        %{base_url}/u/password-reset/%{email_token}
+    admin_login:
+      title: "ایڈمن لاگ اِن"
+      subject_template: "[%{email_prefix}] لاگ اِن"
+      text_body_template: |
+        کسی نے [%{site_name}](%{base_url}) پر آپ کے اکاؤنٹ میں لاگ اِن کرنے کیلئے کہا۔
+
+        اگر آپ نے یہ درخواست نہیں کی، تو آپ اِس ای میل کو آرام سے نظر انداز کر سکتے ہیں۔
+
+        لاگ اِن کرنے کیلئے مندرجہ ذیل لِنک پر کلِک کریں:
+        %{base_url}/u/admin-login/%{email_token}
+    account_created:
+      title: "اکاؤنٹ تشکیل"
+      subject_template: "[%{email_prefix}] آپ کا نیا اکاؤنٹ"
+      text_body_template: |
+        %{site_name} پر آپ کیلئے ایک نیا اکاؤنٹ بنایا گیا تھا
+
+        نیا پاسوَرڈ منتخب کرنے کیلئے مندرجہ ذیل لِنک پر کلِک کریں:
+        %{base_url}/u/password-reset/%{email_token}
+    confirm_new_email:
+      title: "نئے ای میل کی تصدیق کریں"
+      subject_template: "[%{email_prefix}] اپنے نئے ای میل ایڈریس کی تصدیق کریں"
+      text_body_template: |
+        %{site_name} پر اپنے نئے ای میل ایڈریس کی تصدیق کرنے کیلئے مندرجہ ذیل لِنک پر کلِک کریں:
+
+        %{base_url}/u/authorize-email/%{email_token}
+    confirm_old_email:
+      title: "پرانی ای میل تصدیق"
+      subject_template: "[%{email_prefix}] اپنا موجودہ ای میل ایڈریس تصدیق کریں"
+      text_body_template: |
+        اِس سے پہلے کہ ہم آپ کا ای میل ایڈریس تبدیل کر سکیں، ہمیں آپ کے اِس بات کی تصدیق کرنے کی ضرورت ہے کہ آپ کنٹرول کرتے ہیں
+        موجودہ ای میل اکاؤنٹ۔ آپ کا یہ قدم مکمل کرنے کے بعد، ہم آپ کی طرف سے تصدیق کروائئں گے
+        نئے ای میل ایڈریس کی۔
+
+        %{site_name} پر اپنے موجودہ ای میل ایڈریس کی تصدیق کرنے کیلئے مندرجہ ذیل لِنک پر کلک کریں:
+
+        %{base_url}/u/authorize-email/%{email_token}
+    notify_old_email:
+      title: "پرانا ای میل مطلع"
+      subject_template: "[%{email_prefix}] آپ کا ای میل ایڈریس تبدیل ہوگیا ہے"
+      text_body_template: |
+        یہ خود کار پیغام ہے کہ آپ کا ای میل ایڈریس
+        %{site_name} کیلئے تبدیل کر دیا گیا ہے۔ اگر یہ غلطی سے کیا گیا، تو براہ مہربانی رابطہ کریں
+        ایک سائٹ ایڈمِنِسٹریٹر سے۔
+
+        آپ کا ای میل ایڈریس جس پر تبدیل کردیا گیا ہے:
+
+        %{new_email}
+    signup_after_approval:
+      title: "سائن اَپ بعد از منظوری "
+      subject_template: "آپ کو %{site_name} پر منظور کر دیا گیا ہے!"
+      text_body_template: |
+        %{site_name} میں خوش آمدید!
+
+        ایک سٹاف ممبر نے %{site_name} پر آپ کے اکاؤنٹ کو منظور کیا۔
+
+        اَب آپ لاگ اِن کرکے اپنے نئے اکاؤنٹ تک رسائی حاصل کرسکتے ہیں:
+        %{base_url}
+
+        اگر اوپر والا لِنک کلک نہیں ہوتا ہو، تو اپنے ویب براؤزر کے ایڈریس بار میں کاپی اور پَیسٹ کرنے کی کوشش کریں۔
+
+        %{new_user_tips}
+
+        ہم ہر وقت [مہذب کمیونٹی رویہ](%{base_url}/guidelines) پر یقین رکھتے ہیں۔
+
+        اپنے قیام کا لطف اٹھائیں!
+    signup:
+      title: "سائن اَپ"
+      subject_template: "[%{email_prefix}] اپنے نئے اکاؤنٹ کی تصدیق کریں"
+      text_body_template: |
+        %{site_name} میں خوش آمدید!
+
+        اپنے نئے اکاؤنٹ کی تصدیق اور اُسے چالو کرنے کیلئے مندرجہ ذیل لِنک پر کلِک کریں:
+        %{base_url}/u/activate-account/%{email_token}
+
+        اگر اوپر والا لِنک کلک نہیں ہوتا ہو، تو اپنے ویب براؤزر کے ایڈریس بار میں کاپی اور پَیسٹ کرنے کی کوشش کریں۔
+  page_not_found:
+    title: "افوہ! وہ صفحہ موجود نہیں یا ذاتی ہے۔"
+    popular_topics: "مقبول"
+    recent_topics: "حالیہ"
+    see_more: "مذید"
+    search_title: "اِس سائٹ میں تلاش کریں"
+    search_google: "گُوگَل"
+  offline:
+    title: "اَیپ کو لوڈ نہیں کیا جا سکا"
+    offline_page_message: "لگتا ہے کہ آپ آف لائن ہیں! براہ مہربانی اپنا نیٹ وَرک کنکشن چیک کریں اور دوبارہ کوشش کیجیے۔"
+  login_required:
+    welcome_message: |
+      ## [%{title} پر خوش آمدید](#welcome)
+      ایک اکاؤنٹ کی ضرورت ہے۔ برائے مہربانی جاری رکھنے کیلئے ایک اکاؤنٹ بنائیں یا لاگ اِن کریں۔
+  terms_of_service:
+    title: "سروس کی شرائط"
+    signup_form_message: 'میں نے <a href="/tos" target="_blank">سروس کی شرائط</a> کو پڑھا اور قبول کر لیا ہے۔'
+  deleted: 'حذف کردہ'
+  image: "تصویر"
+  upload:
+    edit_reason: "تصاویر کی مقامی کاپیاں ڈاؤن لوڈ کریں"
+    unauthorized: "معذرت، جو فائل آپ اَپ لوڈ کرنے کے کوشش کر رہے ہیں اُس کی اجازت نہیں ہے (اجازت یافتہ ایکسٹینشنز: %{authorized_extensions})۔"
+    pasted_image_filename: "پَیسٹ کردہ تصویر"
+    store_failure: "صارف #%{user_id} کیلئے اَپ لوڈ #%{upload_id} سٹور کرنے میں ناکامی"
+    file_missing: "معذرت، اَپ لوڈ کرنے کیلئے آپ کو ایک فائل فراہم کرنا ضروری ہے۔"
+    empty: "معذرت، لیکن آپ کی فراہم کردہ فائل خالی ہے۔"
+    png_to_jpg_conversion_failure_message: "PNG سے JPG پر تبدیل کرتے وقت ایک خرابی کا سامنا کرنا پڑا۔"
+    attachments:
+      too_large: "معذرت، جو فائل آپ اَپ لوڈ کرنے کے کوشش کر رہے ہیں وہ بہت بڑی ہے (زیادہ سے زیادہ سائز %{max_size_kb} KB ہے)۔"
+    images:
+      too_large: "معذرت، جو فائل آپ اَپ لوڈ کرنے کے کوشش کر رہے ہیں وہ بہت بڑی ہے (زیادہ سے زیادہ سائز %{max_size_kb} KB ہے)، براہ کرم اِس کا سائز تبدیل کریں اور دوبارہ کوشش کریں۔"
+      larger_than_x_megapixels: "معذرت، جو فائل آپ اَپ لوڈ کرنے کے کوشش کر رہے ہیں وہ بہت بڑی ہے (زیادہ سے زیادہ طول و عرض %{max_image_megapixels}-مَیگا پِکسل ہے)، براہ کرم اِس کا سائز تبدیل کریں اور دوبارہ کوشش کریں۔"
+      size_not_found: "معذرت، لیکن ہم تصویر کا سائز جان نہیں سکے۔ شاید آپ کی تصویر خراب ہے؟"
+    placeholders:
+      too_large: "(%{max_size_kb}KB سے بڑی تصویر)"
+  avatar:
+    missing: "معذرت، ہم اس ای میل ایڈریس سے منسلک کوئی اوتار تلاش نہیں کر سکے۔ کیا آپ اُسے دوبارہ اَپ لوڈ کرنے کی کوشش کر سکتے ہیں؟"
+  flag_reason:
+    sockpuppet: "ایک نئے صارف نے ایک ٹاپک بنایا، اور اُسی IP ایڈریس (%{ip_address}) پر ایک نئے صارف نے جواب دیا۔ `flag_sockpuppets` سائٹ ترتیب دیکھیے۔"
+    spam_hosts: "اِس نئے صارف ایک ہی ڈومَین (%{domain}) کے لِنکس کے ساتھ کئی پوسٹس تخلیق کرنے کی کوشش کی۔ <a href='/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> سائٹ کی ترتیب دیکھیے۔"
+  email_log:
+    post_user_deleted: "پوسٹ کا صارف حذف کردیا گیا ہے۔"
+    no_user: "آئی ڈی %{user_id} کے ساتھ صارف کو تلاش نہیں کیا جا سکا"
+    anonymous_user: "صارف گمنام ہے"
+    suspended_not_pm: "صارف معطل ہے، پیغام نہیں ہے"
+    seen_recently: "صارف کو حال ہی میں دیکھا گیا تھا"
+    post_not_found: "آئی ڈی %{post_id} کے ساتھ پوسٹ کو تلاش نہیں کیا جا سکا"
+    notification_already_read: "یہ ای میل جس اطلاع کے بارے میں ہے، وہ پہلے ہی پڑھ لی گئی ہے"
+    topic_nil: "پوسٹ.ٹاپک نِل ہے"
+    post_deleted: "پوسٹ مصنف کی طرف سے حذف کر دی گئی"
+    user_suspended: "صارف معطل کردیا گیا تھا"
+    already_read: "صارف نے اِس پوسٹ کو پہلے ہی پڑھ لیا ہے"
+    exceeded_emails_limit: "max_emails_per_day_per_user سے تجاوز کر گیا"
+    exceeded_bounces_limit: "bounce_score_threshold سے تجاوز کر گیا"
+    message_blank: "پیغام خالی ہے"
+    message_to_blank: "پیغام.کیلئے خالی ہے"
+    text_part_body_blank: "text_part.body خالی ہے"
+    body_blank: "متن خالی ہے"
+    no_echo_mailing_list_mode: "صارف کی اپنے پوسٹس کیلئے مَیلنگ لِسٹ اطلاعات غیر فعال ہیں"
+  color_schemes:
+    base_theme_name: "بَیس"
+    default: "لائٹ سکیم"
+    dark: "ڈارک سکیم"
+    default_theme_name: "ڈِیفالٹ"
+    dark_theme_name: "ڈارک"
+    light_theme_name: "لائٹ"
+  about: "بارے میں"
+  guidelines: "ہدایات"
+  privacy: "پرائیوِیسی"
+  edit_this_page: " اِس صفحہ میں ترمیم کریں"
+  csv_export:
+    boolean_yes: "جی ہاں"
+    boolean_no: "نہیں "
+  static_topic_first_reply: |
+    %{page_name} صفحے کے مواد کو تبدیل کرنے کیلئے اس ٹاپک میں پہلی پوسٹ میں ترمیم کریں۔
+  guidelines_topic:
+    title: "عمومی سوالات کے جوابات / ہدایات"
+    body: |
+      <a name="civilized"></a>
+
+      ## [یہ عوامی بحث مباحثے کیلئے ایک مہذب جگہ ہے](#civilized)
+
+      براہ مہربانی اِس مبابحثے کے فورم پر اُسی احترام سے پیش آئیں جس سے آپ ایک پبلک پارک میں پیش آتے ہیں۔ ہم، بھی، ایک مشترکہ کمیونٹی وسائل ہیں &mdash; اور جاری گفتگو کے ذریعہ مہارتیں، علم اور دلچسپیوں کے اشتراک کی ایک جگہ۔
+
+      یہ پتھر میں لکھے گئے قواعد نہیں ہیں، صرف ہماری کمیونٹی میں کیے جانے والے انسانی فیصلوں کو مدد دینے کیلئے ہدایات اور یہاں مہذب عوامی گفتگو کیلئے ایک صاف اور اچھی طرح سے روشن جگہ محفوض رکھنے کیلئے۔
+
+      <a name="improve"></a>
+
+      ## [بحث کو بہتر بنایے](#improve)
+
+      بحثوں میں بہتری لانے کیلئے ہمیشہ کام، چاہے وہ کتنا ہی چھوٹا کیوں نہ ہو، کر کے ہمیں اِسے مباحثوں کیلئے ایک عظیم جگہ بنانے میں مدد دیں۔ اگر آپ کو یقین نہیں ہے کہ آپ کای اشاعت گفتگو میں کچھ اضافہ کرتی ہے، تو اِس پر غور کریں کہ آپ کیا کہنا چاہتے ہیں اور بعد میں دوبارہ کوشش کیجیے۔
+
+      یہاں پر بحث کیے گئے موضوعات ہمارے لیے اہم ہیں، اور ہم چاہتے ہیں کہ وہ آپ کیلئے بھی اہم ہوں۔ اِن موضوعات اور ان پر بحث کرنے والوں کا احترام کیجیے، یہاں تک کہ اگر جو کچھ کہا جا رہا ہے آپ اُس سے اتفاق نہ بھی کرتے ہوں، تب بھی۔
+
+      بحث کو بہتر بنانے کا ایک طریقہ یہ ہے کہ پہلے سے ہوئے جانے والے مباحثوں کو دریافت کریں۔ اپنا جواب دینے یا نیا ٹاپک شروع کرنے سے پہلے یہاں کے ٹاپکس کا ایک جائیزہ لیں، اور پھر آپ کو اپنے آپ سے ملتی جلتی دلچسپی والوں سے ملنے کا بہتر موقع ملے گا۔
+
+      <a name="agreeable"></a>
+
+      ## [خوشگواررہیں، جب آپ متفق نہ بھی ہوں، تب بھی](#agreeable)
+
+      آپ کسی چیز کا جواب اپنے غیر متفق ہونے کا اظہار کر کے دینا چاہ سکتے ہیں۔ یہ ٹھیک ہے۔ لیکن _خیالات پر تنقید، نہ کہ لوگوں پر_ کرنا یاد رکھیے گا۔ براہ مہربانی بچیں:
+
+      * نام پکارنا
+      * ذات پر حملے
+      * کسی اشاعت کے اصلی مواد کے بجائے اُس کے لب و لہجه کا جواب دینا
+      * جَلد جذباتی تضاد
+
+      اس کے بجائے، معقول جوابی دلائل فراہم کریں جو گفتگو کو بہتر بنائے۔
+
+      <a name="participate"></a>
+
+      ## [آپ کی شرکت سے فرق پڑتا ہے](#participate)
+
+      ہمارے ہیاں مکالمات ہر نئے آنے والے کیلئے لب و لہجه مقرر کرتے ہیں۔ ہمیں اِس کمیونٹی کے مستقبل پر اثر انداز ہونے میں مدد کرنے کیلئے اُن مباحثوں میں مشغول ہونے کا انتخاب کریں جو اِس فورم کو ایک دلچسپ جگہ بناتے ہیں &mdash; اور اُن سے دور رہیے جو ایسا نہیں کرتے۔
+
+      ڈِسکورس ایسے ٹولز فراہم کرتا ہے جو کمیونٹی کو مجموعی طور پر بہترین (اور بدترین) شراکت داروں کی نشاندہی کرنے دیتی ہیں: بُک مارکس، لائیکس، فلَیگز، جوابات، ترامیم، اور اِس طرح دیگر۔ اپنے، اور سبھی دوسروں کے بھی، تجربے کو بہتر بنانے کیلئے اِن ٹولز کا استعمال کریں۔
+
+      چلیے ہم اپنی کمیونٹی کو بہتر بنا کر چھوڑیں۔
+
+      <a name="flag-problems"></a>
+
+      ## [اگر آپ کوئی مسئلہ دیکھیں، تو اُسے فلَیگ کریں](#flag-problems)
+
+      ماڈریٹرز کو خصوصی اختیار حاصل ہیں؛ وہ اِس فورم کیلئے ذمہ دار ہیں۔ لیکن پھر آپ بھی ہیں۔ آپ کی مدد سے، ماڈریٹرز نہ کہ صرف صفائی کرنے والے یا پولیس بلکہ کمیونٹی سہولت کار بھی بن سکتے ہیں۔
+
+      جب آپ بد سلوکی دیکھیں تو جواب مت دیں۔ اِس کو تسلیم کرنے سے برے سلوک کی حوصلہ افزائی ہوتی ہے، اپنی توانائی استعمال ہوتی ہے، اور ہر کسی کا وقت ضائع ہوتا ہے۔ _ بس فلَیگ کریں_۔ اگر کافی فلَیگز جمع ہو جائیں، تو خود بخود یا بذریعہ ماڈریٹر مداخلت، کارروائی کر دی جائے گی۔
+
+      ہماری کمیونٹی کو برقرار رکھنے کیلئے، ماڈریٹرز کسی بھی وقت کسی بھی وجہ سے کسی بھی مواد اور کسی بھی صارف کے اکاؤنٹ کو ہٹانے کا حق محفوظ رکھتے ہیں۔ ماڈریٹرز نئی اشاعتوں کو پیشگی نہیں دیکھتے؛ ماڈریٹرز اور سائٹ کے آپرَیٹرز کمیونٹی کی طرف سے شائع کردہ مواد کیلئے کوئی ذمہ داری نہیں رکھتے۔
+
+      <a name="be-civil"></a>
+
+      ## [ہمیشہ مہذب رہیے](#be-civil)
+
+      کچھ بھی ایک صحت مند بحث کو ایسے نقصان نہیں پہنچاتا جیسے بد سلوکی پہنچاتی ہے:
+
+      * مہذب رہیے۔ کبھی ایسا کچھ نہ شائع کریں جو ایک مناسب شخص جارحانہ، غیر مہذب، یا نفرت بھری تقریر سمجھے۔
+      * اِسے صاف رکھیے۔ کسی بھی فحش یا جنسی طور پر واضح چیز شائع نہ کریں۔
+      * ایک دوسرے کی عزت کریں۔ کسی کو ہراساں یا غمگین، لوگوں کی نقالی، یا اُن کی ذاتی معلومات افشاں نہ کریں۔
+      * ہمارے فَورم کا احترام کریں۔ سپَیم شائع نہ کریں یا دوسری صورت میں فورم کو وَینڈَلِائز نہ کریں۔
+
+      یہ عین مطابق تعریفوں کے ساتھ ٹھوس الفاظ نہیں ہیں &mdash; اِن چیزوں میں سے کسی ایک کے جیسا _دِکھنے_ سے بھی بچیں۔ اگر آپ کو یقین نہیں ہے، تو اپنے آپ سے پوچھیں کہ آپ کیسا محسوس کریں گے اگر آپ کی پوسٹ نیویارک ٹائمز کے پہلے صفحہ پر نمایاں کی جائے۔
+
+      یہ ایک پبلک فورَم ہے، اور سرچ انجن اِن مباحثوں کو اِنڈَیکس کرتے ہیں۔ خاندان اور دوستوں کیلئے زبان، لِنکس، اور تصاویر صاف رکھیں۔
+
+      <a name="keep-tidy"></a>
+
+      ## [اِسے صاف رکھیے](#keep-tidy)
+
+      چیزوں کو صحیح جگہ پر رکھنے کی کوشش کیا کریں، تاکہ ہم زیادہ وقت بحث مباحثے کرنے میں اور کم وقت صفائی کرنے میں صرف کر سکیں۔ اِس لیے:
+
+      * غلط زُمرہ میں ٹاپک شروع نہ کریں۔
+      * ایک ہی چیز کو متعدد ٹاپکس میں کراس-شائع نہ کریں۔
+      * بغیر مواد کے جوابات شائع نہ کریں،
+      * ٹاپک کو درمیان میں بدل کر اُس کا رُخ تبدیلیل نہ کریں۔
+      * اپنی اشاعتوں پر دستخط نہ کریں &mdash; ہر اشاعت پر آپ کی پروفائل معلومات منسلک ہوتی ہیں۔
+
+      "+1" یا "متفق" شائع کرنے کے بجائے، لائیک بٹن کا استعمال کریں۔ ایک موجودہ موضوع کو بنیادی طور پر مختلف سمت میں لے جانے کے بجائے، "منسلک ٹاپک کے طور پر جواب دیں" کا استعمال کریں۔
+
+      <a name="stealing"></a>
+
+      ## [صرف اپنے خود کی چیزیں شائع کریں](#stealing)
+
+      آپ اجازت کے بغیر ڈیجیٹل کچھ بھی شائع نہیں کرسکتے۔ آپ کسی کی بھی دانشورانہ ملکیت (سافٹ ویئر، ویڈیو، آڈیو، تصاویر)، کو چوری کرنے کے متعلقہ بیانات، لِنکس یا طریقوں کو شائع نہیں کر سکتے ہیں، اور نہ کسی دوسرے قانون کو توڑنے کے متعلقہ۔
+
+      <a name="power"></a>
+
+      ## [آپ کے مرہونِ مِنَّت](#power)
+
+      یہ سائٹ آپ کے [دوستانہ مقامی سٹاف](/about) اور *آپ*، یہاں کی کمیونٹی، کے ذریعہ چلائی جا رہی ہے۔ چیزوں کو یہاں کس طرح کام کرنا چاہئے کے بارے میں اگر آپ کے پاس مزید سوالات ہیں، تو [سائٹ آراء زُمرہ](/c/site-feedback) میں ایک نیا ٹاپک کھولیں اور چلیے گفتگو کریں! اگر کوئی اہم یا فوری مسئلہ درپیش ہے جو بذریعہ مَیٹا ٹاپک یا فلَیگ کے سنبھالا نہیں جاسکتا، تو [سٹاف صفحہ](/about) کے ذریعہ ہم سے رابطہ کریں۔
+
+      <a name="tos"></a>
+
+      ## [سروس کی شرائط](#tos)
+
+      جی ہاں، قانونی ابہام بَورِنگ ہوتے ہیں، لیکن ہمیں خود کی &ndash; اور توسیع کے طور پر، آپ اور آپ کے ڈیٹا &ndash; کی غیر دوستانہ افراد سے حفاظت کرنا لاذمی ہے۔ ہمارے پاس [سروس کی شرائط](/tos) ہے جو آپ کے (اور ہمارے) رویے اور مواد، پرائیوِیسی اور قوانین سے متعلقہ حقوق کی تفصیل بیان کرتا ہے۔ اِس سروس کو استعمال کرنے کیلئے، آپ کو ہماری [سروس شرائط](/tos) کی پابندی کرنا ہوگی۔
+  tos_topic:
+    title: "سروس کی شرائط"
+    body: |
+      مندرجہ ذیل شرائط و ضوابط  ویب سائٹ کے تمام استعمال، اور تمام متن، خدمات اور مصنوعات جو ویب سائٹ پر یا اِس کے ذریعہ دستیاب ہیں، بشمول، لیکن اِن تک محدود نہیں، %{company_domain} فورَم سافٹ ویئر، %{company_domain} سپورٹ فورَم اور %{company_domain} ہوسٹنگ سروس ("ہوسٹنگ")، (ملا کر لیا جائے، تو ویب سائٹ)۔ ویب سائٹ %{company_full_name} ("%{company_name}") کی ملکیت اور اس کی طرف سے چلائی جاتی ہے۔ ویب سائٹ آپ کی منظوری سے مشروط پیش کی جاتی ہے: بغیر کسی ترمیم کے یہاں پر موجود تمام شرائط و ضوابط اور تمام دیگر آپریٹنگ قوانین، پالیسیوں (بشمول، بغیر کسی حد کے، %{company_domain} کی [پرائیوِیسی پالیسی](/privacy) اور [کمیونٹی کے قواعد و ضوابط](/faq)) اور طریقہ کار جو اِس سائٹ پر %{company_name} کی طرف سے وقت بوقت شائع کیے جا سکتے ہیں (مجموعی طور پر، "معاہدہ")۔
+
+      ویب سائٹ تک رسائی یا اِس کا استعمال کرنے سے پہلے اِس معاہدہ کو احتیاط سے پڑھیں۔ ویب سائٹ کے کسی بھی حصے تک رسائی یا اِس کا استعمال کرنے سے، آپ اِس معاہدے کے شرائط و ضوابط کے پابند ہو جانے پر اتفاق کرتے ہیں۔ اگر آپ اس معاہدے کے تمام شرائط و ضوابط سے متفق نہیں ہیں، تو آپ ویب سائٹ تک رسائی حاصل یا کسی بھی خدمات کا استعمال نہیں کرسکتے ہیں۔ اگر یہ شرائط و ضوابط %{company_name} کی طرف سے ایک پیشکش سمجھی جاتی ہیں، تو قبولیت واضح طور پر اِن شرائط تک محدود ہے۔ ویب سائٹ صرف اُن افراد کیلئے دستیاب ہے جو کم از کم 13 سال کی عمر کے ہیں۔
+
+      <a name="1"></a>
+
+      ## [1۔ آپ کا %{company_domain} اکاؤنٹ](#1)
+
+      اگر آپ ویب سائٹ پر ایک اکاؤنٹ بناتے ہیں، تو آپ اپنے اکاؤنٹ کو محفوظ رکھنے کے ذمہ دار ہیں اور اِس اکاؤنٹ کے تحت ہونے والی تمام سرگرمیوں کیلئے آپ مکمل طور پر ذمہ دار ہیں۔ آپ کو اپنے اکاؤنٹ کے کسی غیر اجازت استعمال یا سیکورٹی کی کسی دوسری خلاف ورزیاں ہونے پر %{company_name} کو فوری طور پر مطلع کرنا ضروری ہے۔ آپ کی طرف سے کسی بھی کارروائی یا بھول چوک کا ذمہ دار %{company_name} نہیں ہو گا، بشمول اِس طرح کے اعمال یا بھول چوک کے نتیجے میں ہونے والے کسی بھی قسم کے نقصانات۔
+
+      <a name="2"></a>
+
+      ## [2۔ شراکت داروں کی ذمہ داری](#2)
+
+      اگر آپ ویب سائٹ پر مواد شائع کرتے ہیں، ویب سائٹ پر لِنکس شائع کرتے ہیں، یا دوسری صورت میں خود (یا کسی تیسرے فریق کو) ویب سائٹ کے ذریعہ مواد دستیاب کرتے ہیں (ایسا کوئی بھی مواد، "متن")، آپ مکمل طور پر ذمہ دار ہیں، اُس متن، کے مواد کیلئے اور اُس کے نتیجے میں کسی بھی نقصان کےکیلئے۔ معاملہ ایسا ہی ہے خواہ مواد ٹَیکسٹ، گرافکس، ایک آڈیو فائل، یا کمپیوٹر سافٹ ویئر کا حامل ہو۔ مواد دستیاب کرنے سے، آپ نمائندگی کرتے ہیں اور اِس کی ضمانت دیتے ہیں:
+
+      * مواد کا ڈاؤن لوڈ، کاپی اور استعمال کرنا ملکیت کے حقوق کی خلاف ورزی نہیں کرے گا، بشمول، لیکن اِن تک محدود نہیں، کسی بھی تیسری پارٹی کے، کاپی رائٹ، پَیٹنٹ، ٹریڈ مارک یا تجارتی رازوں کے حقوق؛
+      * اگر آپ کے آجر کے پاس آپ کی دانشورانہ ملکیت پر حق حاصل ہے، تو آپ نے یا تو (i) متن کو شائع کرنے یا اُسے دستیاب کرنے کیلئے اپنے آجر سے اجازت موصول کی ہوئی ہے، بشمول کسی بھی سافٹ ویئر لیکن اِس تک محدود نہیں، یا (ii) اپنے آجر سے متن میں یا اُس پر سے تمام حقوق کیلئے چھوٹ حاصل کر لی ہے؛
+      * آپ نے متن سے متعلق کسی بھی تیسرے فریق لائسنسوں کے ساتھ مکمل طور پر عمل کیا ہے، اور ضروری شرائط کو صارفین تک کامیابی سے منتقل کرنے کیلئے تمام ضروری چیزوں کو پورا کر لیا ہے؛
+      * کوئی بھی وائرس، وَورمز، میل ویئر، ٹروجن گھوڑے یا دیگر نقصان دہ یا تباہ کن مواد، متن میں شامل نہیں یا اِنہیں انسٹال نہیں کرتا؛
+      * متن سپَیم نہیں ہے، مشین یا رَینڈم طور پر پیدا نہیں کیا گیا ہے، اور اِس میں غیر اخلاقی یا ناپسندیدہ تجارتی مواد شامل نہیں ہے جن سے ٹریفک تیسری فریقین کی سائٹس پر بھیجی جائے یا تیسری فریقین سائٹس کی سرچ انجنوں پر درجہ بندی بہتر کی جائے، یا مزید غیر قانونی کارروائیوں کو بڑھانے کیلئے تیار کیا گیا ہے (جیسے کہ فیشِنگ) یا وصول کنندگان کو مواد کے ذریعہ کے بارے میں گمراہ کرتا ہے (جیسے کہ سپُوفِنگ)؛
+      * متن فحش نہیں ہے، دھمکیوں پر مشتمل نہیں ہے یا تشدد پر مشتعل نہیں کرتا، اور کسی بھی تیسری فریق کی پرائیوِیسی یا اشاعت کے حقوق کی خلاف ورزی نہیں کرتا؛
+      * آپ کا متن ناپسندیدہ الیکٹرانک پیغامات کے ذریعہ مشتہر نہیں کیا جا رہا جیسے کہ نیوز گروپوں، ای میل فہرستوں، بلاگز اور ویب سائٹس پر سپَیم لنکس، اور اِنہی طرح کے دوسرے بِن مانگے پروموشنل طریقوں کے ذریعہ؛
+      * آپ کے متن کو اِس طرح سے نام نہیں دیا گیا جس سے پڑھنے والے گمراہ ہو جائیں اور سمجھیں کہ آپ کوئی دوسرے شخص یا کمپنی ہیں؛ اور
+      * آپ نے، ایسے متن کے معاملے میں جس میں کمپیوٹر کَوڈ شامل ہو، درست طریقے سے درجہ بندی کیی گئی ہے اور/یا مواد کی قِسم، نوعیت، استعمالات اور اثرات بیان کیے ہیں، چاہے %{company_name} کی طرف سے ایسا کرنے کی درخواست کی گئی یا نہ کی گئی ہو۔
+
+      <a name="3"></a>
+
+      ## [3۔ صارف مواد لائسنس](#3)
+
+      صارف کی شراکتیں [کَرِی اَیٹِو کامنز اَیٹریبیوشن-غیر تجارتی-شئیر الائیک 3.0 اَن پورٹِڈ لائسنس](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US) کے طرز پر لائسنس شدہ ہیں۔ اِن نمائندوں یا وارنٹیوں میں سے کسی کو بھی محدود کیے بغیر، %{company_name} کے پاس حق (اگرچہ ذمہ داری نہیں) ہے کہ، %{company_name} کی واحد صوابدید پر (i) کسی بھی متن سے انکار یا اُس کو ہٹا دیا جائے کہ، %{company_name} کی مناسب رائے میں، %{company_name} کی کسی بھی پالیسی کی خلاف ورزی ہو رہی ہے یا کسی بھی طرح سے نقصان دہ یا قابل اعتراض ہے، یا (ii) کسی بھی فرد یا ادارے کیلئے کسی بھی وجوہات کی بنا پر ویب سائٹ تک رسائی یا اُس کے استعمال کو ختم یا اُس کا انکار کیا جا سکتا ہے، %{company_name} کی واحد صوابدید پر۔ کسی بھی پہلے سے ادا کی گئی رقم کی واپسی کی ذمہ داری %{company_name} پر نہیں ہوگی۔
+
+
+      <a name="4"></a>
+
+      ## [4۔ ادائیگی اور تجدید](#4)
+
+      ### جنرل شرائط
+
+      ویب سائٹ پر قیمت والی اختیاری خدمات یا اَپ گریڈ دستیاب ہوسکتے ہیں۔ ایک اختیاری قیمت والی خدمت یا اَپ گریڈ کا استعمال کرتے ہوئے، آپ ظاہر کی گئی ماہانہ یا سالانہ سبسکرِپشن فیس %{company_name} کو ادا کرنے کیلئے ااتفاق کرتے ہیں۔ ادائیگیاں پری-پَیڈ بنیاد پر وصول کی جائیں گی، جس دن آپ سروس یا اَپ گریڈ کا استعمال کرنا شروع کرتے ہیں اور ماہانہ یا سالانہ سبسکرِپشن مدت کے حساب سے جیسا کہ مطلع کیا گیا ہو۔ یہ فیسیں قابلِ واپسی نہیں ہیں۔
+
+      ### خود بخود تجدید
+
+      جب تک آپ قابل اطلاق سبسکرِپشن مدت کے اختتام سے پہلے %{company_name}کو مطلع نہیں کرتے کہ آپ کسی سروس یا اَپ گریڈ کو منسوخ کرنا چاہتے ہیں، آپ کی سبسکرپشن خود بخود تجدید کر دی جائے گی اور آپ ہمیں پھر قابل اطلاق سالانہ یا ماہانہ سبسکرپشن فیس (اس کے ساتھ ساتھ کسی بھی ٹیکس) کو، بذریعہ کریڈٹ کارڈ یا کسی اور ادائیگی کے طریقہ کے جو ہمارے پاس ریکارڈ پر موجود ہو، وصول کرنے کی اجازت دیتے ہیں۔ کسی بھی وقت سبسکرِپشنیں منسوخ کر دی جا سکتی ہیں۔
+
+      <a name="5"></a>
+
+      ## [5۔ خدمات](#5)
+
+      ### ہَوسٹِنگ، سپورٹ خدمات
+
+      %{company_name} کی طرف سے اختیاری ہَوسٹِنگ اور سپورٹ خدمات ہر ایسی ایک سروس کی الگ شرائط و ضوابط کے تحت فراہم کی جاسکتی ہیں۔ ہَوسٹِنگ/سپورٹ یا سپورٹ خدمات کے اکاؤنٹ کیلئے سائن اَپ کر کہ، آپ ایسی شرائط و ضوابط کی پابندی کرنے کیلئے اتفاق کرتے ہیں۔
+
+      ### HTTPS
+
+      ہم HTTPS ایک ادائیگی والے ایَڈ آن کے طور پر پیش کرتے ہیں۔ سائن اَپ کرنے اور %{company_domain} پر اپنی مرضی کا ڈَومَین استعمال کر کہ، آپ ہمیں آپ کی سائٹ پر HTTPS فراہم کرنے کے واحد مقصد کیلئے ڈَومَین نام رجسٹر کرنے والے کی جانب سے (مثال کے طور پر ضروری سرٹیفکیٹ کی درخواست کرنے کیلئے) عمل کرنے کی اجازت دیتے ہیں۔
+
+      ### اِنٹرپرائز
+
+      %{company_name} کی طرف سے انٹرپرائز ہَوسٹِنگ خدمات ہر ایسی ایک سروس کی الگ شرائط و ضوابط، جو کسٹمر مخصوص معاہدے سے متعین کی جاتی ہیں، کے تحت فراہم کی جاتی ہیں۔ ایک انٹرپرائز ہَوسٹِنگ اکاؤنٹ کیلئے سائن اَپ کر کہ، آپ ایسی شرائط و ضوابط کی پابندی کرنے کیلئے اتفاق کرتے ہیں۔
+
+      <a name="6"></a>
+
+      ## [6۔ ویب سائٹ کے زائرین کی ذمہ داری](#6)
+
+      %{company_name} نے جائزہ نہیں لیا ہے، اور نہ ہی لے سکتا ہے، ویب سائٹ پر شائع کیے جانے والے تمام مواد، سمیت کمپیوٹر سافٹ ویئر، اور لہٰذا اس مواد کے متن، استعمال یا اثرات کیلئے ذمہ دار نہیں ہوسکتا ہے۔ اِس ویب سائٹ کو چلانے سے، %{company_name} یہاں پر موجود مواد کی توثیق کرنے کی نمائندگی یا اشارہ نہیں کرتا، یا نہ اِس کا یقین ہے کہ یہ مواد درست، مفید یا غیر نقصان دہ ہے۔ اپنے آپ اور اپنے کمپیوٹر سسٹموں کو وائرس، وَورمز، ٹروجن گھوڑے یا دیگر نقصان دہ یا تباہ کن مواد سے بچانے کیلئے، احتیاطی تدابیر اختیار کرنے کے آپ خود ذمہ دار ہیں۔ ویب سائٹ میں ایسا مواد جو جارحانہ، نامناسب، یا دوسری صورت میں قابل اعتراض ہو، شامل ہوسکتا ہے، اور اِس کے ساتھ ساتھ مواد میں تکنیکی غلطیاں، ٹائپینگ کی غلطیاں، اور دیگر غلطیاں بھی شامل ہو سکتی ہیں۔ ویب سائٹ میں ایسا مواد بھی شامل ہو سکتا ہے جو پرائیوِیسی یا اشاعت کے حقوق کی خلاف ورزی کرتا ہو، یا دانشورانہ ملکیت اور دیگر ملکیت کے حقوق کی خلاف ورزی کرتا ہو، تیسرے فریقوں کے، یا جن کا ڈاؤن لوڈ، کاپی یا استعمال کرنا، بیان کردہ یا غیر بیان شدہ، اضافی شرائط و ضوابط کے تابع ہے۔ زائرین کی طرف سے ویب سائٹ کے استعمال، یا یہاں شائع کردہ مواد کے اِن افراد کی طرف سے کسی بھی ڈاؤن لوڈ کرنے سے ہونے والے کسی بھی نقصان سے %{company_name} ہر قِسم کی ذمہ داری سے دستبردار ہے۔
+
+      <a name="7"></a>
+
+      ## [7۔ دوسری ویب سائٹ پر شائع کردہ مواد](#7)
+
+      ہم نے جائزہ نہیں لیا ہے، اور نہ ہی لے سکتے ہیں، بذریعہ ویب سائٹس اور ویب صفحات کے دستیاب کردہ، سمیت کمپیوٹر سافٹ ویئر تمام مواد کا، جن کو %{company_domain} لِنک کرتا ہے اور جو %{company_domain} کو لِنک کرتے ہیں۔ اِن غیر-%{company_domain} ویب سائٹس اور ویب صفحات پر %{company_name} کا کوئی کنٹرول نہیں ہے، اور ان کے مواد یا ان کے استعمال کا ذمہ دار نہیں ہے۔ کسی غیر-%{company_domain} ویب سائٹ یا ویب پیج پر لِنک کر کے، %{company_name} ایسی ویب سائٹ یا ایسے ویب صفحہ کی نمائندگی یا توثیق کرنے کا اشارہ نہیں کرتا۔ اپنے آپ اور اپنے کمپیوٹر سسٹموں کو وائرس، وَورمز، ٹروجن گھوڑے یا دیگر نقصان دہ یا تباہ کن مواد سے بچانے کیلئے، احتیاطی تدابیر اختیار کرنے کے آپ خود ذمہ دار ہیں۔ غیر-%{company_domain} ویب سائٹس اور ویب صفحات کے استعمال کے نتیجے میں ہونے والے کسی بھی نقصان سے %{company_name} ہر قِسم کی ذمہ داری سے دستبردار ہے۔
+
+      <a name="8"></a>
+
+      ## [8۔ کاپی رائٹ خلاف ورزی اور DMCA پالیسی](#8)
+
+      جیسا کہ %{company_name} دوسروں کو اپنے دانشورانہ ملکیت کے حقوق کا احترام کرنے کیلئے کہتا ہے، اُسے طرح یہ دوسروں کے دانشورانہ ملکیت کے حقوق کا بھی احترام کرتا ہے۔ اگر آپ سمجھتے ہیں کہ %{company_domain} پر موجود یا لِنک کیے جانے والا مواد آپ کے کاپی رائٹ کی خلاف ورزی کرتا ہے، اور اگر یہ ویب سائٹ امریکہ میں رہتی ہے، تو آپ کو %{company_name} کی [ڈیجیٹل ملینیم کاپی رائٹ ایکٹ](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") پالیسی کے مطابق %{company_name} کو مطلع کرنا چاہئے۔ %{company_name} اِس طرح کے تمام نوٹسوں پر کارروائی کرے گا، بشمول جیسا کہ مطلوب یا مناسب ہو خلاف ورزی کرنے والے مواد کو ہٹانے یا اُس کے تمام لِنکس کو غیر فعال کر کہ۔ اگر، مناسب حالات میں، ایک وِزِیٹر کی طرف سے %{company_name} کے یا دوسروں کے کاپی رائٹ یا دیگر دانشورانہ ملکیت کے حقوق کی بار بار خلاف ورزی کرنے کا تعین کیا جاتا ہے تو %{company_name} اُس شخص کی ویب سائٹ تک رسائی اور اِس کا استعمال برطرف کر دے گا۔ ایسی برطرفی کی صورت میں، %{company_name} کو کسی بھی پہلے سے ادا کی گئی رقم کی واپسی کی ذمہ داری %{company_name} پر نہیں ہوگی۔
+
+      <a name="9"></a>
+
+      ## [9۔ دانشورانہ پراپرٹی](#9)
+
+      یہ معاہدہ آپ کو %{company_name} سے %{company_name} کی یا کسی تیسرے فریق کی دانشورانہ ملکیت منتقل نہیں کرتا ہے، اور اِس پراپرٹی میں اور پر تمام حق، ٹائیٹل اور انٹرسٹ (فریقین کے درمیان) صرف %{company_name} کا پاس ہی رہیں گے۔ %{company_name}، %{company_domain}، %{company_domain} کا لَوگَو، اور %{company_domain} یا ویب سائٹ کے ساتھ استعمال ہونے والے دیگر تمام ٹریڈ مارک، سروس کے نشان، گرافکس اور لَوگَو، %{company_name} یا %{company_name} کے لائسنس دینے والوں کے ٹریڈ مارک یا رجسٹرڈ ٹریڈ مارکس ہیں۔ ویب سائٹ کے ساتھ استعمال ہونے والے دیگر ٹریڈ مارک، سروس کے نشان، گرافکس اور لَوگَو دوسری تیسرے فریق کے ٹریڈ مارک ہو سکتے ہیں۔ آپ کا ویب سائٹ کا استعمال آپ کو کسی بھی %{company_name} یا تیسرے فریق کے ٹریڈ مارک کو دوبارہ بنانے یا استعمال کرنے کیلئے حق یا لائسنس فراہم نہیں کرتا ہے۔
+
+      <a name="10"></a>
+
+      ## [10۔ انتساب](#10)
+
+      %{company_name} آپ کے صفحے کے فوٹر میں '%{company_domain} کے مرہونِ مِنَّت'، تھِیم مصنف، اور فونٹ انتساب جیسے انتساب کے لِنکس کو ظاہر کرنے کا حق محفوظ رکھتا ہے۔
+
+      <a name="11"></a>
+
+      ## [11۔ تبدیلیاں](#11)
+
+      %{company_name} اِس معاہدے کے کسی بھی حصے میں ترمیم یا تبدیل کرنے کے، اپنی واحد صوابدید پر، حق محفوظ رکھتا ہے۔ یہ آپ کی ذمہ داری ہے کہ اس معاہدے کو باقاعدگی سے تبدیلیوں کیلئے چیک کرتے رہیں۔ اِس معاہدے میں کسی بھی تبدیلی کی اشاعت کے بعد، آپ کی طرف سے ویب سائٹ کا استعمال جاری رکھنا یا اُس تک رسائی حاصل کرنا، اِن تبدیلیوں کو قبول کرنے کے برابر ہے۔ %{company_name}، مستقبل میں، ویب سائٹ کے ذریعہ نئی خدمات اور/یا خصوصیات (بشمول، نئے ٹُولز اور وسائل کے تعارف کے) بھی پیش کر سکتا ہے۔ ایسی نئی خصوصیات اور/یا خدمات اس معاہدے کی شرائط و ضوابط کے تابع ہوں گی۔
+
+      <a name="12"></a>
+
+      ## [12۔ برطرفی](#12)
+
+      %{company_name}، کسی وجہ کے ساتھ یا اُس کے بغیر، کسی نوٹس کے ساتھ یا اُس کے بغیر، کسی بھی وقت پوری ویب سائٹ یا اُس کے کسی بھی خاص حصے تک آپ کی رسائی فوری طور پر موثر طریقے سے برطرف کر سکتا ہے۔ اگر آپ اِس معاہدے یا اپنے %{company_domain} اکاؤنٹ (اگر آپ کے پاس ہے تو) کو ختم کرنا چاہتے ہیں، آپ کو صرف ویب سائٹ کا استعمال کرنا بند کرنا ہو گا۔ اس معاہدے کی تمام شرائط جو اپنی فطرت میں برطرفی کے باوجود ختم نہیں ہونی چاہئیں، وہ بچ جائیں گی، بشمول بغیر کسی حد کے، ملکیت کی شرائط، وارنٹی کے ڈِسکلَیمر، ہرجانہ اور ذمہ داریوں کی حدیں۔
+
+      <a name="13"></a>
+
+      ## [13۔ وارنٹیوں کے ڈِسکلَیمر](#13)
+
+      ویب سائٹ "جیسے ہے ویسے ہی" کے طور پر فراہم کی جاتی ہے۔ %{company_name} اور اِس کے سپلائرز اور لائسنس دینے والے کسی بھی قِسم، اظہار یا اشارہ کی گئیں، بشمول، بغیر کسی حد کے، فروختگی کی ضمانتیں، کسی خاص مقصد کیلئے صحیح اور غیر خلاف ورزی کی تمام وارنٹیوں کا انکار کرتے ہیں۔ نہ %{company_name} اور نہ ہی اِس کے سپلائرز اور لائسنس دینے والے، اِس بات کی ضمانت دیتے ہیں کہ ویب سائٹ غلطی سے پاک ہو گی یا اِس تک رسائی مسلسل یا بلاتعطل رہے گی۔ اگر آپ واقعی یہ پڑھ رہے ہیں، تو یہ [ایک تحفہ] (http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html) ہے۔ آپ کو سمجھ ہے کہ آپ ویب سائٹ کے ذریعہ ڈاؤن لوڈ کرتے ہیں، یا مواد یا خدمات حاصل کرتے ہیں، اپنی صوابدید اور خطرے کے پر۔
+
+      <a name="14"></a>
+
+      ## [14۔ ذمہ داری کی حد](#14)
+
+      کسی بھی واقعہ پر %{company_name}، یا اِس کے سپلائرز اور لائسنس دینے والے، اِس معاہدے کے کسی بھی موضوع کے بارے میں کسی بھی معاہدے کے اندر، غفلت، سخت ذمہ داری یا دوسرے قانونی یا متوازن نظریہ کے تحت ذمہ دار نہیں ہوں گے: (i) کسی خاص، حادثاتی یا نتیجتاً نقصانات؛ (ii) متبادل مصنوعات یا خدمات کی خریداری کی قیمت؛ (iii) استعمال میں تعطلی یا ڈیٹا میں نقصان یا خرابی؛ یا (iv) کارروائی کے سبب سے پہلے بارہ (12) مہینے کے عرصے کے دوران اِس معاہدے کے تحت آپ کی طرف سے %{company_name} کو ادا کی گئیں فیسوں سے زیادہ کسی بھی رقم کیلئے۔ اُن کے مناسب کنٹرول سے باہر معاملات کی وجہ سے کسی بھی ناکامی یا تاخیر کیلئے %{company_domain} پر کوئی ذمہ داری نہیں ہوگی۔ پہلے آنے والا قابل اطلاق قانون کی طرف سے منع کیے جانے کی حد تک لاگو نہیں ہو گا۔
+
+      <a name="15"></a>
+
+      ## [15۔ جنرل نمائندگی اور وارنٹی](#15)
+
+      آپ نمائندگی کرتے ہیں اور اس بات کی ضمانت دیتے ہیں کہ (i) آپ کا ویب سائٹ کا استعمال %{company_name} کی [پرائیویسی پالیسی](/privacy)، [کمیونٹی کے قواعد و ضوابط](/guidelines)، اِس معاہدے کے ساتھ اور تمام قابل اطلاق قوانین اور قواعد و ضوابط (بشمول بغیر کسی حد کے آپ کے ملک، ریاست، شہر، یا دیگر سرکاری علاقے میں کسی بھی مقامی قوانین یا قواعد و ضوابط، آن لائن رویہ اور قابل قبول مواد کے بارے میں، اور ملک، جس میں یہ ویب سائٹ رہتی ہے یا جس میں آپ رہتے ہیں، سے برآمد کردہ تکنیکی ڈَیٹا کی منتقلی سے متعلقہ تمام قابل اطلاق قوانین سمیت) کے ساتھ سخت مطابقت رکھے گا اور (ii) آپ کی ویب سائٹ کا استعمال کسی بھی تیسرے فریق کی دانشورانہ ملکیت کے حقوق کی خلاف ورزی یا اُنہیں خورد برد نہیں کرے گا۔
+
+      <a name="16"></a>
+
+      ## [16۔ تلافی](#16)
+
+      تلافی کرنے اور %{company_name}، اِس کے ٹھیکیداروں، لائسنس دینے والوں کو، اور اِن کے متعلقہ ڈائریکٹرز، افسران، ملازمین اور ایجنٹوں کو تمام دعووں اور اخراجات، بشمول اٹارنیوں کی فیسیں، آپ کی ویب سائٹ کے استعمال سے پیدا ہونے والے، بشمول، لیکن اِس تک محدود نہیں، اِس معاہدے کی خلاف ورزی پر ہونے والے نقصانات کی ذمہ داری سے برطرف کرنے کیلئے آپ اتفاق کرتے ہیں۔
+
+      <a name="17"></a>
+
+      ## [17۔ متفرقہ](#17)
+
+      یہاں کے موضوع کے معاملہ میں یہ معاہدے %{company_name} اور آپ کے درمیان مکمل معاہدہ کو تشکیل دیتا ہے، اور وہ صرف %{company_name} کے ایک بااختیار اَیگزَیکِٹِو کی جانب سے دستخط کردہ ایک تحریری ترمیم، یا %{company_name} کی طرف سے شائع کیے جانے والے ایک رِیوائز کردہ ورژن کی طرف سے ترمیم کیا جا سکتا ہے۔ قابل اطلاق قانون کی حد کے علاوہ، اگر کوئی ہو، دوسری صورت میں فراہم کرتا ہے، یہ معاہدے، ویب سائٹ تک رسائی یا استعمال ریاستِ کَیلِیفَورنیا، یو ایس اے، کے قوانین کی مطابق ہو گا، قانون کے کانفلِکٹ دفعات کو چھوڑ کر، اور کسی بھی تنازعہ کیلئے مناسب مقام سان فرانسِسکَو کاؤنٹی، کَیلِیفَورنیا میں واقع ریاست اور وفاقی عدالتیں ہوں گی۔ امتناعی یا منصفانہ رَیلیف کے دعووں یا دانشورانہ ملکیت کے حقوق کے دعووں (جو کسی بھی قابل عدالت میں کسی بانڈ کی فراہمی کے بغیر لائے جا سکتے ہیں) کے علاوہ، اِس معاہدے کے تحت ہونے والے کسی بھی تنازعہ کو آخر میں جیوڈیشیل آربریٹَیشن اور مَیڈیشن سروس، انکارپوریٹڈ ("JAMS") کے جامع ثالثی قواعد کے مطابق، ایسے قواعد کے مطابق مقرر کردہ تین ثالثین کی طرف سے حل کیا جائے گا۔ ثالثی انگریزی زبان میں سان فرانسِسکَو، کَیلِیفَورنیا میں ہوگی اور کسی بھی عدالت میں فیصلہ نافذ کیا جاسکتا ہے۔ اس معاہدے کو نافذ کرنے کیلئے کسی بھی عمل یا کارروائی میں موجودہ فریق کو اخراجات اور وکلاء کی فیسوں کا حق حاصل ہوگا۔ اگر اس معاہدے کے کسی بھی حصہ کو غلط یا غیر قابلِ عمل متعین کیا جاتا ہے، تو یہ حصہ فریقین کے اصل ارادے کی عکاسی کرتے ہوئے کے طور پر سمجھا جائے گا، اور باقی حصے مکمل ذور اور اثر کے ساتھ رہیں گے۔ اِس معاہدے کی کسی بھی اصطلاح یا شرط کے کسی بھی فریق کی طرف سے، کسی ایک دفعہ کی چھوٹ، اِس طرح کی اصطلاح یا شرط کی اِس کے بعد اگلی خلاف ورزی کیلئے چھوٹ نہیں فراہم کرے گی۔ آپ اس معاہدے کے تحت اپنے حقوق کو کسی بھی فریق کو تفویض کرسکتے ہیں جو اِس کی شرائط و ضوابط کے ساتھ رضامندی، اور اُن پر پابند رہنے کیلئے اتفاق کریں؛ اِس معاہدے میں %{company_name} بغیر کسی شرط کے تحت اپنے حقوق کو تفویض کرسکتا ہے۔ یہ معاہدے فریقین، اُن کے جانشینوں اور اجازت یافتہ تفویض کنندہ پر پابندی اور اُن کے فائدہ کیلئے ہو گا۔
+
+      یہ دستاویز CC-BY-SA ہے۔ یہ آخری دفعہ جنوری 1، 2018 کو اَپ ڈیٹ کی گئی تھی۔
+
+      اصل میں [وَرڈپرَیس کی سروس کی شرائط](http://en.wordpress.com/tos/) سے اخذ کردہ۔
+  privacy_topic:
+    title: "پرائیوِیسی پالیسی"
+    body: |
+      <a name="collect"></a>
+
+      ## [ہم کیا معلومات جمع کرتے ہیں؟](#collect)
+
+      ہم آپ سے معلومات اکھٹی کرتے ہیں جب آپ ہماری ویب سائٹ پر رجسٹر کرتے ہیں اور ڈیٹا جمع کرتے ہیں جب آپ یہاں پر شئیر کردہ مواد کو پڑھ، لکھ، اور اس کا جائزہ لے کر اِس فورَم میں حصہ لیتے ہیں۔
+
+      ہماری سائٹ پر رجسٹر کرتے وقت، آپ سے اپنا نام اور ای میل پتہ درج کرنے کیلئے کہا جا سکتا ہے۔ تاہم، آپ رجسٹریشن کے بغیر ہماری سائٹ وِزِٹ کر سکتے ہیں۔ آپ کا ای میل ایڈریس کی تصدیق بذریعہ ایک منفرد لنک پر مشتمل ای میل سے ہوگی۔ اگر وہ لنک وِزِٹ کیا جاتا ہے، تو ہم جان جائیں گے کہ آپ اس ای میل ایڈریس کو کنٹرول کرتے ہیں۔
+
+      رجسٹر کرنے کے بعد کچھ شائع کرنے پر، ہم اشاعت کا تخلیق کنندہ IP ایڈریس ریکارڈ کر لیتے ہیں۔ ہم سرور لاگز کو بھی برقرار رکھ سکتے ہیں جس میں ہمارے سرور پر کیے جانے والی ہر درخواست کا IP ایڈریس شامل ہوتا ہے۔
+
+      <a name="use"></a>
+
+      ## [ہم آپ کی معلومات کس لیے استعمال کرتے ہیں؟](#use)
+
+      ہم آپ سے جمع کردہ کوئی بھی معلومات مندرجہ ذیل طریقوں میں سے ایک میں استعمال کر سکتے ہیں:
+
+      * آپ کے اِس سائٹ پر تجربے کو ذاتی بنانے کیلئے &mdash; آپ کی معلومات ہمیں آپ کی ذاتی ضروریات کو بہتر سمجھنے میں مدد دیتی ہے۔
+      * اِس سائٹ کو بہتر بنانے کیلئے &mdash; ہم مسلسل آپ کی طرف سے موصول ہونے والی معلومات اور آراء کی بنیاد پر سائٹ خصوصیات کو بہتر بنانے کی کوشش کرتے رہتے ہیں۔
+      * کسٹمر سروس کو بہتر بنانے کیلئے &mdash; آپ کی معلومات ہمیں کسٹمر سروس کی درخواستوں اور معاونت کی ضروریات کا زیادہ موثر طریقے سے جواب دینے میں ہماری مدد کرتی ہے۔
+      * ہر مخصوص مدت کے بعد ای میلز بھیجنے کیلئے &mdash; آپ کی طرف سے فراہم کردہ ای میل ایڈریس استعمال کیا جا سکتا ہے، آپ کو بھیجنے کیلئے: معلومات، اطلاعات جن کی آپ ٹاپکس میں تبدیلیاں ہونے پر، یا اپنے صارف نام کے جواب میں درخواست کرتے ہیں، انکوائریوں کے جواب کیلئے، اور/یا دیگر درخواستوں یا سوالات کا جواب دینے کیلئے۔
+
+      <a name="protect"></a>
+
+      ## [ہم آپ کی معلومات کی حفاظت کیسے کرتے ہیں؟](#protect)
+
+      جب آپ اپنی ذاتی معلومات درج، جمع، یا ایکسَیس کرتے ہیں تو ہم آپ کی ذاتی معلومات کو محفوظ رکھنے کیلئے مختلف قِسم کے سیکورٹی اقدامات کو لاگو کرتے ہیں۔
+
+      <a name="data-retention"></a>
+
+      ## [آپ کی ڈَیٹا برقرار رکھنے کی پالیسی کیا ہے؟](#data-retention)
+
+      ہم نیک نیتی کے ساتھ ممکنہ کوشش کریں گے کہ:
+
+      * اِس سرور پر کیے جانے والی تمام درخواستوں کے IP ایڈریسوں پر مشتمل سرور لاگز کو 90 دنوں سے زائد برقرار نہیں رکھیں گے۔
+      * رجسٹر جردہ صارفین اور اُن کی اشاعتوں کے ساتھ منسلک IP ایڈریسوں کو 5 سال سے زائد برقرار نہیں رکھیں گے۔
+
+      <a name="cookies"></a>
+
+      ## [کیا ہم کوکیز کا استعمال کرتے ہیں؟](#cookies)
+
+      جی ہاں۔ کُوکِیز ایسی چھوٹی فائلیں ہوتی ہیں جو ایک سائٹ یا اُس کی سروس فراہم کرنے والے، بذریعہ ویب براؤزر آپ کے کمپیوٹر کی ہارڈ ڈرائیو میں منتقل کر دیتے ہیں (اگر آپ کی اجازت ہو)۔ یہ کُوکِیز سائٹ کو آپ کے براؤزر کو پہچاننے کے قابل بناتے ہیں اور، اگر آپ کے پاس ایک رجسٹر کردہ اکاؤنٹ ہو، تو براؤزر کو آپ کے رجسٹرڈ اکاؤنٹ سے منسلک کر دیتے ہیں۔
+
+      ہم مستقبل کے وِزِٹس کیلئے آپ کی ترجیحات کو سمجھنے اور محفوظ کرنے کیلئے کُوکِیز کا استعمال کرتے ہیں اور سائٹ پر ٹریفک اور سائٹ اِنٹرَیکشن کے بارے میں مجموعی ڈَیٹا مرتب کرتے ہیں تاکہ ہم مستقبل میں بہتر سائٹ پر تجربات اور ٹولز پیش کرسکیں۔ ہم تیسرے فریق سروس فراہم کرنے والوں کے ساتھ معاہدے کرسکتے ہیں تاکہ ہماری ویب سائٹس پر آنے والوں کو بہتر سمجھا جا سکے۔ یہ سروس فراہم کرنے والوں کو اجازت نہیں ہے کہ ہماری جانب سے جمع کردہ معلومات کو ہمارے کام کو چلنے اور بہتر بنانے میں ہماری مدد کرنے کے علاوہ کسی اور مقصد کیلئے استعمال کریں۔
+
+      <a name="disclose"></a>
+
+      ## [کیا ہم بیرونی تنظیموں کو کوئی بھی معلومات ظاہر کرتے ہیں؟](#disclose)
+
+      ہم آپ کی ذاتی طور پر قابلِ شناخت معلومات کی فروخت، تجارت یا بیرونی تنظیموں کو منتقل نہیں کرتے ہیں۔ ِاس میں بھروسہ والی تیسری پارٹیاں شامل نہیں ہیں جو ہماری سائٹ کو چلانے میں مدد کرتی ہیں، ہمارے کام کو چلانے یا آپ کی خدمت کرنے میں مدد کرتی ہیں، جب تک کہ یہ تنظیمیں آپ کی معلومات کو رازداری سے رکھنے پر متفق رہیں۔ ہم آپ کی معلومات اِس صورت میں بھی جاری کرسکتے ہیں جب ہم یقین رکھتے ہوں کہ ایسا کرنا قانون پر عمل کرنے کیلئے مناسب ہے، ہماری ویب سائٹ کی پالیسیوں کو نافذ کرنے کیلئے، یا ہمارے یا دوسروں کے حقوق، ملکیت، یا حفاظت کو محفوظ رکھنے کیلئے بھی۔ تاہم، مارکیٹنگ، اشتہارات، یا دیگر استعمال کیلئے غیر ذاتی طور پر قابلِ شناخت وِزِیٹر معلومات دیگر تنظیموں کو فراہم کی جا سکتی ہے۔
+
+      <a name="third-party"></a>
+
+      ## [تیسری پارٹی والے لِنکس](#third-party)
+
+      کبھی کبھار، ہماری صوابدید پر، ہم اپنی ویب سائٹ پر تیسری پارٹی کی مصنوعات یا خدمات شامل یا پیش کرسکتے ہیں۔ اِن تیسری پارٹی سائٹس کی الگ اور آزادانہ پرائیوِیسی پالیسیاں ہیں۔ لہٰذا ہم اِن منسلک سائٹس کے مواد اور سرگرمیوں کیلئے کسی قِسم کی بھی کوئی ذمہ داری نہیں رکھتے۔ اس کے باوجود، ہم اپنی سائٹ کی سالمیت کی حفاظت کرنے کی کوشش کرتے ہیں اور اِن سائٹس کے بارے میں کسی بھی رائے کا خیر مقدم کرتے ہیں۔
+
+      <a name="coppa"></a>
+
+      ## [بچوں کی آن لائن پرائیوِیسی کے تحفظ کے ایکٹ کے تعمیل](#coppa)
+
+      ہماری سائٹ، مصنوعات اور خدمات سبھی اُن لوگوں کیلئے پیش کی جاتی ہیں جو کم از کم 13 سال یا اُس سے زائد عمر کے ہیں۔ اگر یہ سرور امریکہ میں ہے، اور آپ 13 سال سے کم عمر ہیں، تو COPPA ([بچوں کی آن لائن پرائیوِیسی کے تحفظ کا ایکٹ](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)) کی ضروریات کے مطابق، آپ یہ سائٹ استعمال نہ کیجیے۔
+
+      <a name="online"></a>
+
+      ## [آن لائن پرائیویسی پالیسی صرف](#online)
+
+      یہ آن لائن پرائیویسی پالیسی صرف ہماری ویب سائٹ کے ذریعہ جمع کردہ معلومات پر لاگو ہوتی ہے اور اُس معلومات پر نہیں جو آف لائن جمع کی جائے۔
+
+      <a name="consent"></a>
+
+      ## [آپ کی رضامندی](#consent)
+
+      ہماری ویب سائٹ کا استعمال کرتے ہوئے، آپ ہماری سائٹ کی پرائیویسی پالیسی پر رضامندی کا اظہار کرتے ہیں۔
+
+      <a name="changes"></a>
+
+      ## [ہماری پرائیویسی پالیسی میں تبدیلیاں](#changes)
+
+      اگر ہم اپنی پرائیویسی پالیسی کو تبدیل کرنے کا فیصلہ کریں، تو ہم اِس صفحہ پر اُن تبدیلیوں کو شائع کریں گے۔
+
+      یہ دستاویز CC-BY-SA ہے۔ یہ آخری دفعہ مئی 31، 2013 کو اَپ ڈیٹ کی گئی تھی۔
+  badges:
+    editor:
+      name: ترمیم کنندہ
+      description: پہلی پوسٹ ترمیم
+      long_description: |
+        یہ بَیج پہلی دفعہ اپنی اشاعتوں میں سے ایک میں ترمیم کرنے پر دیا جاتا ہے۔ تاہم آپ ہمیشہ کیلئے اپنی اشاعتوں میں ترمیم نہیں کر سکیں گے، ترامیم کرنا ہمیشہ ایک اچھا خیال ہوتا ہے — آپ اپنے پیغامات کو بہتر بنا سکتے ہیں، چھوٹی غلطیوں کو درست کر سکتے ہیں، یا ایسا کچھ بھی شامل کریں جو آپ پہلی دفعہ میں شامل کرنا بھول گئے تھے۔ اپنی اشاعتیں کو مذید بہتر بنانے کیلئے اُن کو ترمیم کیجیے!
+    basic_user:
+      name: بَیسِک
+      description: "تمام لازمی کمیونٹی کے افعال <a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">عطا</a> کر دیے گئے"
+      long_description: |
+        یہ بَیج آپ کے ٹرسٹ لَیول 1 تک پہنچنے پر دیا جاتا ہے۔ تھوڑی دیر کیلئے یہاں رکنے اور ہماری کمیونٹی کے بارے میں جاننے کیلئے چند ٹاپک پڑھنے کیلئے شکریہ۔ آپ پر نئے صارف کی پابندیاں ہٹا دی گئیں ہیں؛ آپ کو تمام لازمی کمیونٹی صلاحیات، جیسے کہ ذاتی پیغام رسانی، فلَیگ سازی، وِیکی ترمیم، اور ایک سے زیادہ تصاویر اور لِنکس شائع کرنا، عطا کر دی گئیں ہیں۔
+    member:
+      name: ممبر
+      description: "دعوت نامے، گروپ پیغام رسانی، مزید لائیکس <a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">عطا</a> کر دیے گئے"
+      long_description: |
+        یہ بَیج کے آپ ٹرسٹ لَیول 2 تک پہنچنے پر دیا جاتا ہے۔ ہماری کمیونٹی میں واقعی شامل ہونے کیلئے چند ہفتوں کیلئے حصہ لینے کیلئے شکریہ۔ اَب آپ اپنے صارف صفحے یا انفرادی ٹاپکس سے دعوت نامہ بھیج سکتے ہیں، گروپ ذاتی پیغامات تشکیل دے سکتے ہیں، اور آپ کو فی دن کچھ مذید لائیکس حاصل ہو گئے ہیں۔
+    regular:
+      name: رَیگولر
+      description: "زُمرہ دوبارہ درج کرنا، نام تبدیل کرنا، فَولَو کردہ لِنکس، وِیکی، مذید لائیکس <a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">عطا</a> کر دیے گئے"
+      long_description: |
+        یہ بَیج آپ کے ٹرسٹ لَیول 3 تک پہنچنے پر دیا جاتا ہے۔ مہینوں کی مدت کیلئے ہماری کمیونٹی باقاعدگی سے حصہ بننے کیلئے شکریہ۔ اَب آپ سب سے زیادہ سرگرم پڑھنے والوں میں سے ایک ہیں، اور ایک قابل اعتماد شراکت دار ہیں جو ہماری کمیونٹی کو زبردست بنا دیتے ہیں۔ اَب آپ ٹاپکس کے زُمرہ جات اور نام تبدیل کر سکتے ہیں، مزید طاقتور سپَیم فلَیگز کا فائدہ اٹھا سکتے ہیں، ایک ذاتی لاؤنج تک رسائی حاصل کرسکتے ہیں اور آپ کو فی دن کئی زیادہ لائیکس بھی حاصل ہو گئے ہیں۔
+    leader:
+      name: لِیڈر
+      description: "گلَوبل ترمیم، پِن، بند، آرکائیو، تقسیم اور ضم کرنا، مزید لائیکس <a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">عطا</a> کر دیے گئے"
+      long_description: |
+        یہ بَیج آپ کے ٹرسٹ لَیول 4 تک پہنچنے پر دیا جاتا ہے۔ آپ اِس کمیونٹی میں سٹاف کی طرف سے منتخب کردہ ایک رہنما کی حیثیت رکھتے ہیں، اور آپ نے اپنے اعمال اور الفاظ سے باقی کمیونٹی کیلئے ایک مثبت مثال قائم کی ہے۔ آپ کے پاس تمام پوسٹس میں ترمیم کرنے کی صلاحیت ہے، ٹاپک پر ماڈریٹر کے عام افعال جیسے کہ پِن، بند، غیر فہرست شدہ، آرکائیو، تقسیم، اور ضم کرنا، اور آپ کے پاس فی دن ٹنَوں لائیکس ہیں۔
+    welcome:
+      name: خوش آمدید
+      description: لائیک موصول ہوا
+      long_description: |
+        یہ بَیج آپ کے اپنی پوسٹ پر پہلا لائیک موصول ہونے پر دیا جاتا ہے۔ مبارک ہو، آپ نے کچھ شائع کیا ہے جو آپ کے ساتھی کمیونٹی ممبران کو دلچسپ، زبردست، یا مفید معلوم ہوا ہے!
+    autobiographer:
+      name: آپ بيتی نويس
+      description: "<a href=\"%{base_uri}/my/preferences/profile\">پروفائل</a> معلومات کو پُر کر دیا"
+      long_description: |
+        یہ بَیج <a href="%{base_uri}/my/preferences/profile">اپنی صارف پروفائل</a> بھرنے اور پروفائل تصویر منتخب کرنے پر عطا کیا جاتا ہے۔ کمیونٹی کو بتانے سے کہ آپ کون ہیں اور کن چیزوں میں دلچسپی رکھتے ہیں، ایک بہتر، مذید مشترکہ کمیونٹی بنانے میں مدد دیتا ہے۔ ہمارے ساتھ شامل ہوں!
+    anniversary:
+      name: سالگرٰہ
+      description: ایک سال کیلئے سرگرم رکن، کم از کم ایک دفعہ پوسٹ کیا
+      long_description: |
+        یہ بَیج آپ کے ایک سال کیلئے رکن ہونے کے ساتھ ساتھ اُسی سال کم از کم ایک پوسٹ شائع کرنے پر عطا کیا جاتا ہے۔ یہاں رکنے اور ہماری کمیونٹی میں حصہ لینے کیلئے آپ کا شکریہ۔ ہم آپ کے بغیر یہ نہیں کر سکتے تھے۔
+    nice_post:
+      name: اچھا جواب
+      description: ایک جواب پر 10 لائیکس موصول ہوئے
+      long_description: |+
+        یہ بَیج آپ کے جواب پر 10 لائیکس موصول ہونے پر عطا کیا جاتا ہے۔ آپ کا جواب کمیونٹی پر واقعی اثر انداز ہوا اور گفتگو کو آگے بڑھانے میں مدد کا بائث بنا!
+
+    good_post:
+      name: عمدہ جواب
+      description: ایک جواب پر 25 لائیکس موصول ہوئے
+      long_description: |
+        یہ بَیج آپ کے جواب پر 25 لائیکس موصول ہونے پر عطا کیا جاتا ہے۔ آپ کا جواب غیر معمولی تھا اور گفتگو کو سب کیلئے بہتر بنانے کا بائث بنا!
+    great_post:
+      name: زبردست جواب
+      description: ایک جواب پر 50 لائیکس موصول ہوئے
+      long_description: |
+        یہ بَیج آپ کے جواب پر 50 لائیکس موصول ہونے پر عطا کیا جاتا ہے۔ زبردست! آپ کا جواب حوصلہ افزانے والا، انتہائی دلچسپ، مزاحیہ یا بصیرت شعار تھا اور کمیونٹی نے اُسے بہت پسند کیا۔
+    nice_topic:
+      name: اچھا ٹاپک
+      description: ایک ٹاپک پر 10 لائیکس موصول ہوئے
+      long_description: |
+        یہ بَیج آپ کے ٹاپک پر 10 لائیکس موصول ہونے پر عطا کیا جاتا ہے۔ ارے، آپ نے ایک دلچسپ گفتگو شروع کی جس سے کمیونٹی لطف اندوز ہوئی!
+    good_topic:
+      name: عمدہ ٹاپک
+      description: ایک ٹاپک پر 25 لائیکس موصول ہوئے
+      long_description: |
+        یہ بَیج آپ کے ٹاپک پر 25 لائیکس موصول ہونے پر عطا کیا جاتا ہے۔ آپ نے ایک متحرک گفتگو شروع کی جس میں کمیونٹی نے بھرپور حصہ لیا اور جس سے بہت پسند کیا گیا!
+    great_topic:
+      name: زبردست ٹاپک
+      description: ایک ٹاپک پر 50 لائیکس موصول ہوئے
+      long_description: |
+        یہ بَیج آپ کے ٹاپک پر 50 لائیکس موصول ہونے پر عطا کیا جاتا ہے۔ آپ نے ایک انتہائی دلچسپ گفتگو کا آغاز کیا اور کمیونٹی نے اُس کے نتیجے میں چلنے والی متحرک بحث کا لطف اٹھایا!
+    nice_share:
+      name: اچھا شیئر
+      description: 25 منفرد زائرین کے ساتھ ایک اشاعت شیئر کی
+      long_description: |
+        یہ بَیج ایک ایسا لِنک جس پر 25 بیرونی زائرین نے کلِک کیا ہو شیئر کرنے پر عطا کیا جاتا ہے۔ ہماری گفتگوئوں، اور اِس کمیونٹی کے بارے میں بات پھیلانے کیلئے شکریہ۔
+    good_share:
+      name: عمدہ شیئر
+      description: 300 منفرد زائرین کے ساتھ ایک اشاعت شیئر کی
+      long_description: |
+        یہ بَیج ایک ایسا لِنک جس پر 300 بیرونی زائرین نے کلِک کیا ہو شیئر کرنے پر عطا کیا جاتا ہے۔ عمدہ کام! آپ نے نئے لوگوں کے ایک گروپ کو ایک شاندار بحث دکھائی اور اِس کمیونٹی کو بڑھنے میں مدد دی ہے۔
+    great_share:
+      name: زبردست شیئر
+      description: 1000 منفرد زائرین کے ساتھ ایک اشاعت شیئر کی
+      long_description: |
+        یہ بَیج ایک ایسا لِنک جس پر 1000 بیرونی زائرین نے کلِک کیا ہو شیئر کرنے پر عطا کیا جاتا ہے۔ زبردست! آپ نے نیا ناظرین کی ایک بہت بڑی تعداد میں ایک دلچسپ بحث کو فروغ دیا ہے، اور ہماری کمیونٹی کو بڑے پیمانے پر بڑھانے میں مدد دی ہے!
+    first_like:
+      name: پہلا لائیک
+      description: ایک پوسٹ کو لائیک کیا
+      long_description: |
+        یہ بَیج آپ کو :heart: کا بٹن استعمال کرتے ہوئے پہلی مرتبہ پوسٹ لائیک کرنے پر عطا کیا جاتا ہے۔ پوسٹس لائیک کرنا ایک عمدہ طریقہ ہے تاکہ آپ کے ساتھی کمیونٹی ممبران کو پتہ چل سکے کہ اُن کا شائع کیا ہوا دلچسپ، مفید، زبردست، یا پُر لطف تھا۔ محبت بانٹیے!
+    first_flag:
+      name: پہلا فلَیگ
+      description: ایک پوسٹ کو فلَیگ کیا
+      long_description: |
+        یہ بَیج آپ کو پہلی مرتبہ پوسٹ فلَیگ کرنے پر عطا کیا جاتا ہے۔ فلَیگز کے ذریعہ ہم مل کر ہر ایک کیلئے اِس جگہ کو صاف، اور اچھی طرح سے روشن جگہ رکھنے میں مدد دیتے ہیں۔ اگر آپ کسی بھی ایسی پوسٹ کو نوٹس کرتے ہیں جس پر کسی بھی وجہ سے ماڈریٹر کی توجہ کی ضرورت ہوتی ہے تو براہ کرم فلَیگ کرنے سے نہ ہچکچائیں۔ اگر آپ ساتھی صارفین کی پوسٹس کے ساتھ کوئی مسئلہ دیکھتے ہیں تو آپ اُنہیں ایک <b>ذاتی پیغام</b> بھیجنے کیلئے بھی فلَیگ کرسکتے ہیں۔ اگر آپ کو کوئی مسئلہ نظر آتا ہے، تو اُسے :flag_black: فلَیگ کریں!
+    promoter:
+      name: پروموٹر
+      description: ایک صارف  کو دعوت دی
+      long_description: |
+        آپ کو اپنے صارف صفحے یا کسی ٹاپک کے نچلے حصے پر بذریعہ مدعو کے بٹن کسی کو کمیونٹی میں شامل ہونے کیلئے دعوت دینے پر یہ بَیج عطا کیا جاتا ہے۔ دوست جو مخصوص بحثوں میں دلچسپی رکھتے ہوں، اُن کو دعوت دینا ہماری کمیونٹی کے ساتھ نئے لوگوں کو متعارف کرانے کا ایک عمدہ طریقہ ہے، تو شکریہ!
+    campaigner:
+      name: مہم چلانے والا
+      description: 3 بَیسِک صارفین کو مدعو کیا
+      long_description: |
+        جب آپ نے 3 ایسے لوگوں کو مدعہ کیا ہو جنہوں نے بعد میں بَیسِک صارفین بننے کیلئے سائٹ پر کافی وقت گزارا ہو، تو یہ بَیج عطا کیا جاتا ہے۔ ایک متحرک کمیونٹی کو باقاعدگی سے نئے آنے والوں کی، جو باقاعدگی سے شرکت اور گفتگو میں نئی آوازیں شامل کرتے ہیں، کی ضرورت ہوتی ہے۔
+    champion:
+      name: چَیمپیئن
+      description: 5 ممبران کو دعوت دی
+      long_description: |
+        جب آپ نے 5 ایسے لوگوں کو مدعہ کیا ہو جنہوں نے بعد میں مکمل ممبر بننے کیلئے سائٹ پر کافی وقت گزارا ہو، تو یہ بَیج عطا کیا جاتا ہے۔ زبردست! نئے اراکین کے ساتھ ہماری کمیونٹی کی جداگانیت کو بڑھانے کیلئے شکریہ!
+    first_share:
+      name: پہلا شیئر
+      description: ایک پوسٹ شیئر کی
+      long_description: |
+        جب آپ پہلی دفعہ شیئر بٹن کا استعمال کرتے ہوئے کسی جواب یا ٹاپک کا لِنک شیئر کرتے ہیں، تو یہ بَیج عطا کیا جاتا ہے۔ لِنکس شیئر کرنا باقی دنیا کے ساتھ دلچسپ مباحثوں کو ظاہر کرنے اور اپنی کمیونٹی کو بڑھانے کا ایک عمدہ طریقہ ہے۔
+    first_link:
+      name: پہلا لِنک
+      description: دوسرے ٹاپک کا لِنک شامل کیا
+      long_description: |
+        یہ بَیج آپ کے پہلی دفعہ کسی دوسرے ٹاپک کا لِنک شامل کرنے پر عطا کیا جاتا ہے۔ ٹاپکس کو لِنک کرنے سے ٹاپکس کے درمیان دونوں طرف کے کنکشن ظاہر ہوتے ہیں، جس سے ساتھی پڑھنے والوں کو متعلقہ دلچسپ مباحثے ڈھونڈنے میں مدد ملتی ہے۔ آزادانہ طور پر لِنک کیا کریں!
+    first_quote:
+      name: پہلا اقتباس
+      description: ایک پوسٹ کا اقتباس کیا
+      long_description: |
+        یہ بَیج آپ کو اپنے جواب میں پہلی دفعہ کسی پوسٹ کا اقتباس کرنے پر عطا کیا جاتا ہے۔ اپنے جواب میں پچھلی پوسٹس کے متعلقہ حصوں کا حوالہ دینے سے مباحثوں کو ایک دوسرے سے منسلک اور موضوع پر رہنے میں مدد ملتی ہے۔ اقتباس کرنے کا سب سے آسان طریقہ ایک پوسٹ کے سیکشن کو اجاگر کرنا، اور پھر کسی بھی جواب کے بٹن کو دبانا ہے۔ ل کھول کر اقتباس کریں!
+    read_guidelines:
+      name: ہدایات پڑھِیں
+      description: "کمیونٹی کے <a href=\"%{base_uri}/guidelines\">قواعد و ضوابط</a> پڑھیں"
+      long_description: |
+        یہ بَیج <a href="%{base_uri}/guidelines">کمیونٹی کے قواعد و ضوابط پڑھنے</a> پر عطا کیا جاتا ہے۔ اِن سادہ ہدایات پر عمل اور اُنہیں شیئر کرنے سے ہر ایک کیلئے ایک محفوظ، پُر لطف اور پائیدار کمیونٹی بنانے میں مدد ملتی ہے۔ ہمیشہ یاد رکھیے کہ اِس سکرین کی دوسری طرف بھی ایک، آپ سے کافی ملتا جلتا، انسان ہے۔ لہاز رکھیے!
+    reader:
+      name: پڑهنے والا
+      description: 100 سے زائد جوابات کے ساتھ ٹاپک میں ہر جواب پڑھا
+      long_description: |
+        یہ بَیج آپ کو پہلی مرتبہ 100 سے زائد جوابات والے ایک طویل ٹاپک کو پڑھنے پر عطا کیا جاتا ہے۔ گفتگو کو قریب سے پڑھنے پر آپ کو مدد ملتی ہے بحث کی پیروی کرنے اور مختلف نقطہ نظر کو سمجھنے میں، اور مذید دلچسپ مباحث کی طرف پہنچ جاتے ہیں۔ آپ جتنا زیادہ پڑھتے ہیں، گفتگو اتنی زیادہ بہتر ہو جاتی ہے۔ جیسا کہ ہم کہنا پسند کرتے ہیں، پڑھنا بنیادی ہے! :slight_smile:
+    popular_link:
+      name: مقبول لنک
+      description: 50 کلکس کے ساتھ ایک بیرونی لِنک پوسٹ کیا
+      long_description: |
+        یہ بَیج آپ کی طرف سے ایک شیئر کردہ لِنک پر 50 کلکس ہونے پر عطا کیا جاتا ہے۔ ایک مفید لِنک جس نے گفتگو میں دلچسپ سیاق و سباق شامل کیا، شائع کرنے کیلئے شکریہ!
+    hot_link:
+      name: ہاٹ لِنک
+      description: 300 کلکس کے ساتھ ایک بیرونی لِنک پوسٹ کیا
+      long_description: |
+        یہ بَیج آپ کی طرف سے ایک شیئر کردہ لِنک پر 300 کلکس ہونے پر عطا کیا جاتا ہے۔ ایک انتہائی دلچسپ لِنک شائع کرنے کیلئے شکریہ جس نے گفتگو کو آگے بڑھایا اور بحث پر روشنی ڈالی!
+    famous_link:
+      name: مشہور لِنک
+      description: 1000 کلکس کے ساتھ ایک بیرونی لِنک پوسٹ کیا
+      long_description: |
+        یہ بَیج آپ کی طرف سے ایک شیئر کردہ لِنک پر 1000 کلکس ہونے پر عطا کیا جاتا ہے۔ زبردست! آپ نے ایک ایسا لِنک شائع کیا جس نے ضروری تفصیل، سیاق و سباق، اور معلومات شامل کرکے گفتگو کو نمایاں طور پر بہتر بنایا۔ شاندار کام!
+    appreciated:
+      name: قدر کی گئی
+      description: 20 پوسٹس پر 1 لائیک موصول ہوا
+      long_description: |
+        یہ بَیج آپ کو 20 مختلف پوسٹس پر کم از کم ایک لائیک موصول ہونے پر عطا کیا جاتا ہے۔ کمیونٹی یہاں کی مباحثوں میں آپ کی شرکت سے لطف اندوز ہو رہی ہے!
+    respected:
+      name: محترم
+      description: 100 پوسٹس پر 2 لائیکس موصول ہوئے
+      long_description: |
+        یہ بَیج آپ کو 100 مختلف پوسٹس پر کم از کم 2 لائیکس موصول ہونے پر عطا کیا جاتا ہے۔ کمیونٹی یہاں کے مباحثوں میں آپ کی کئی شراکتوں کی وجہ سے آپ کا احترام کرنے لگی ہے۔
+    admired:
+      name: تعریف کردہ
+      description: 300 پوسٹس پر 5 لائیکس موصول ہوئے
+      long_description: |
+        یہ بَیج آپ کو 300 مختلف پوسٹس پر کم از کم 5 لائیکس موصول ہونے پر عطا کیا جاتا ہے۔ زبردست! کمیونٹی آپ کی یہاں کے مباحثوں میں مسلسل، اعلیٰ معیار کی شراکتوں کی تعریف کرتی ہے۔
+    out_of_love:
+      name: محبت کی لِمٹ سے باہر
+      description: ایک دن میں 50 لائیکس استعمال کر لیے
+      long_description: |
+        یہ بَیج آپ کے اپنے فی دن کے تمام 50 لائیکس استعمال کرلینے پر عطا کیا جاتا ہے۔ ایک لمحہ کیلئے رُک کر جن اشاعتوں سے آپ لطف اندوز اور جن کی آپ تعریف کرتے ہیں، اُنہیں لائیک کرنا یاد رکھنے سے آپ کے ساتھی کمیونٹی ممبران کی حوصلہ افزائی ہوتی ہے کہ وہ مستقبل میں مذید عمدہ مباحث تخلیق کریں۔
+    higher_love:
+      name: عظیم تر محبت
+      description: ایک دن میں 50 لائیکس 5 مرتبہ استعمال کر لیے
+      long_description: |
+        یہ بَیج آپ کے اپنے فی دن کے تمام 50 لائیکس 5 دنوں کیلئے استعمال کرلینے پر عطا کیا جاتا ہے۔ بہترین مباحثوں کی ہر دن مسلسل حوصلہ افزائی کرنے کیلئے وقت نکالنے کا شکریہ!
+    crazy_in_love:
+      name: محبت میں دیوانہ
+      description: ایک دن میں 50 لائیکس 20 مرتبہ استعمال کر لیے
+      long_description: |
+        یہ بَیج آپ کے اپنے فی دن کے تمام 50 لائیکس 20 دنوں کیلئے استعمال کرلینے پر عطا کیا جاتا ہے۔ زبردست! آپ باقاعدگی سے آپنے ساتھی کمیونٹی ممبران کی حوصلہ افزائی کرنے کی ایک مثال ہیں!
+    thank_you:
+      name: آپ کا شکریہ
+      description: 20 لائیک کردہ پوسٹس ہیں اور 10 لائیکس دیے
+      long_description: |
+        یہ بَیج آپ کے پاس 20 لائیک کردہ پوسٹس ہونے اور جواب میں 10 یا اُس سے زائد لائیکس دینے پر عطا کیا جاتا ہے۔ جب کوئی آپ کی پوسٹس کو لائیک کرتا ہے، تو آپ بھی دوسروں کی اشاعتوں کو لائیک کرنے کیلئے وقت نکال لیتے ہیں۔
+    gives_back:
+      name: واپس دیتا ہے
+      description: 100 لائیک کردہ پوسٹس ہیں اور 100 لائیکس دیے
+      long_description: |
+        یہ بَیج آپ کے پاس 100 لائیک کردہ پوسٹس ہونے اور جواب میں 100 یا اُس سے زائد لائیکس دینے پر عطا کیا جاتا ہے۔ اِن کو آگے بڑھانے کیلئے شکریہ!
+    empathetic:
+      name: خیال رکھنے والا
+      description: 500 لائیک کردہ پوسٹس ہیں اور 1000 لائیکس دیے
+      long_description: |
+        یہ بَیج آپ کے پاس 500 لائیک کردہ پوسٹس ہونے اور جواب میں 1000 یا اُس سے زائد لائیکس دینے پر عطا کیا جاتا ہے۔ زبردست! آپ سخاوت اور باہمی تعریف کی ایک مثال ہیں :two_hearts:۔
+    first_emoji:
+      name: پہلی اِیمَوجی
+      description: ایک پوسٹ میں اِیمَوجی کا استعمال کیا
+      long_description: |
+        یہ بَیج آپ کے اپنی پوسٹ پر پہلی مرتبہ اِیمَوجی شامل کرنے پر عطا کیا جاتا ہے :thumbsup:۔ اِیمَوجی آپ کو اپنی پوسٹس میں جذبات کا اظہار کرنے دیتی ہیں، خوشی :smiley: سے اداسی :anguished: تک، اداسی سے غصہ :angry: تک اور سب کچھ درمیان میں :sunglasses:۔ سینکڑوں انتخابات :ok_hand: میں سے منتخب کرنے کیلئے صرف : (کالن) ٹائپ کیجیے یا اَیڈیٹر میں اِیمَوجی ٹُول بار کے بٹن کو دبائیے۔
+    first_mention:
+      name: پہلا ذکر
+      description: پوسٹ میں ایک صارف کا ذکر کیا
+      long_description: اس بَیج آپ کے اپنی پوسٹ میں پہلی مرتبہ کسی کا @صارفنام ذکر کرنے پر عطا کیا جاتا ہے۔ ہر ذکر اُس شخص کیلئے ایک اطلاع پیدا کرتا ہے، تاکہ اُنہیں آپ کی پوسٹ کے بارے میں پتہ چل سکے۔ کسی بھی صارف، یا اگر اجازت ہو تو، گروپ کا ذکر کرنے کیلئے صرف @ (at کا نشان) ٹائپ کرنا شروع کریں – یہ اُن کی توجہ میں کچھ لانے کا آسان طریقہ ہے۔
+    first_onebox:
+      name: پہلا وَن باکس
+      description: ایک وَن باکس کردہ لِنک شائع کیا
+      long_description: یہ بَیج عطا کیا جاتا ہے جب آپ پہلی مرتبہ ایک لِنک کو لائین میں اکیلا شائع کرتے ہیں، جس کے بعد وہ خود بخود ایک مختصر خلاصہ، ایک عنوان، اور (جب دستیاب ہو) ایک تصویر کے ساتھ ایک وَن باکس میں کھل جاتا ہے۔
+    first_reply_by_email:
+      name: بذریعہ ای میل پہلا جواب
+      description: ایک پوسٹ پر بذریعہ ای میل جواب دیا
+      long_description: |
+        یہ بَیج آپ کے پہلی مرتبہ ایک پوسٹ پر بذریعہ ای میل جواب دینے پر عطا کیا جاتا ہے :e-mail:۔
+    new_user_of_the_month:
+      name: "مہینہ کے سب سے زیادہ قابل قدر نئے صارف"
+      description: اِن کے پہلے مہینے میں شاندار شراکتَیں
+      long_description: |
+        یہ بَیج ہر ماہ دو نئے صارفین کو اپنی شاندار مجموعی شراکتوں کیلئے مبارکباد دینے کیلئے عطا کیا جاتا ہے، جیسا کہ اُن کی پوسٹس کو کتنی کثرت سے اور کن کی طرف سے لائیک کیا گیا تھا، سے ناپا جاتا ہے۔
+    enthusiast:
+      name: پرجوش
+      description: 10 دن وِزِٹ کیا
+      long_description: یہ بَیج مسلسل 10 دنوں تک وِزِٹ کرنے پر عطا کیا جاتا ہے۔ ہمارے ساتھ ایک ہفتے سے زائد رکنے کیلئے شکریہ!
+    aficionado:
+      name: اَفیشیاناڈو
+      description: 100 دن وِزِٹ کیا
+      long_description: یہ بَیج مسلسل 100 دنوں تک وِزِٹ کرنے پر عطا کیا جاتا ہے۔ یہ تین ماہ سے زائد ہے!
+    devotee:
+      name: جاں نثار
+      description: 365 دن وِزِٹ کیا
+      long_description: یہ بَیج مسلسل 365 دنوں تک وِزِٹ کرنے پر عطا کیا جاتا ہے۔ واہ، ایک پورا سال!
+    badge_title_metadata: "%{site_title}پر %{display_name} بَیج "
+  admin_login:
+    success: "ای میل بھیج دی گئ"
+    errors:
+      unknown_email_address: "نامعلوم ای میل ایڈریس۔"
+      invalid_token: "غلط ٹوکن۔"
+    email_input: "ایڈمن اِی میل"
+    submit_button: "اِیمیل بھیجیں"
+  performance_report:
+    initial_post_raw: اِس ٹاپک میں آپ کی سائٹ کیلئے روزانہ کی کارکردگی کی رپورٹیں شامل ہیں۔
+    initial_topic_title: ویب سائٹ کارکردگی کی رپورٹیں
+  tags:
+    title: "ٹیگز"
+    staff_tag_disallowed: "\"%{tag}\" ٹَیگ صرف سٹاف کی طرف سے لاگو کیا جا سکتا ہے۔"
+    staff_tag_remove_disallowed: "\"%{tag}\" ٹَیگ صرف سٹاف کی طرف سے ہٹایا جا سکتا ہے۔"
+  rss_by_tag: "ٹاپکس %{tag} کے ساتھ ٹَیگ کردہ"
+  finish_installation:
+    congratulations: "مبارک باد، آپ نے ڈِسکورس اِنسٹال کر لیا!"
+    register:
+      button: "رجسٹر"
+      title: "رجسٹر ایڈمن اکاؤنٹ"
+      help: "شروع کرنے کے لئے ایک نیا اکاؤنٹ رجسٹر کریں"
+      no_emails: "بدقسمتی سے، سَیٹ اَپ کے دوران کوئی ایڈمِنِسٹریٹر ای میل واضح نہیں کی گئیں، لہٰذا ترتیب کو حتمی شکل دینا <a href='https://meta.discourse.org/t/how-to-create-an-administrator-account-after-install/14046'>مشکل ہوسکتا ہے</a>۔"
+    confirm_email:
+      title: "اپنے ای میل کی تصدیق کریں"
+      message: "</p>ہم نے </b>%{email}</b> پر ایک ایکٹیویشن میل بھیج دی ہے۔ براہ مہربانی اپنے اکاؤنٹ کو چالو کرنے کیلئے میل میں دی گئی ہدایات پر عمل کریں۔</p> </p>اگر یہ آپ کو موصول نہ ہو، تو یقینی بنائیں کہ آپ نے ڈِسکورس کیلئے صحیح طریقہ سے ای میل سَیٹ کر لی ہے اور اپنا سپَیم فولڈر چیک کریں۔</p>"
+    resend_email:
+      title: "ایکٹیویشن اِیمیل دوبارہ بھیجییں"
+      message: "<p>ہم نے <b>%{email}</b> پر ایکٹیویشن اِیمیل دوبارہ بھیج دی ہے"
+  safe_mode:
+    title: "سَیف مَوڈ میں داخل ہوں"
+    description: "پلگ اِن یا سائٹ کو اپنی مرضی کے حساب سے بنانے کیلئے کیے جانے والی تبدیلیوں کو لَوڈ کیے بغیر، سَیف مَوڈ آپ کو اپنی سائٹ کی جانچ پڑتال کرنے دیتا ہے۔"
+    no_customizations: "موجودہ تھِیم کو غیر فعال کریں"
+    only_official: "غیر آفیشل پلگ اِن غیر فعال کریں"
+    no_plugins: "تمام پلگ اِن غیر فعال کریں"
+    enter: "سَیف مَوڈ میں داخل ہوں"
+    must_select: "سَیف مَوڈ میں داخل ہونے کیلئے آپ کا کم از کم ایک آپشن منتخب کرنا ضروری ہے۔"
+  wizard:
+    title: "ڈِسکورس سَیٹ اَپ"
+    step:
+      locale:
+        title: "اپنے ڈِسکورس میں خوش آمدید!"
+        fields:
+          default_locale:
+            description: "آپ کی کمیونٹی کیلئے ڈِیفالٹ زبان کونسی ہے؟"
+      forum_title:
+        title: "نام"
+        description: "آپ کا نام ایک فاصلے سے نظر آجانے والی چیز ہے، ممکنہ زائرین کی طرف سے آپ کی کمیونٹی کے بارے میں نوٹ کیے جانے والی <i>پہلی</i> چیز۔ آپ کا نام اور عنوان آپ کی کمیونٹی کے بارے میں کیا کہتا ہے؟"
+        fields:
+          title:
+            label: "آپ کی کمیونٹی کا نام"
+            placeholder: "جمیلہ کے ٹھہرنے کی جگہ"
+          site_description:
+            label: "اپنی کمیونٹی کو ایک مختصر جملہ میں بیان کریں"
+            placeholder: "جمیلہ اور اس کی دوستوں کیلئے دلچسپ چیزوں پر بحث کرنے کی ایک جگہ"
+      introduction:
+        title: "تعارف"
+        fields:
+          welcome:
+            label: "خیرمقدم ٹاپک"
+            description: "<p>آپ ایک لفٹ میں ہوتے ہوئے 1 منٹ کے اندر اندر کسی اجنبی کو اپنی کمیونٹی کس طرح سے بیان کریں گے؟</p> <ul> <li>یہ مباحثے کن لوگوں کیلئے ہیں؟</li> <li>مجھے یہاں پر کیا مل سکتا ہے؟</li> <li>مجھے یہاں کیوں آنا چاہئے؟</li> </ul> <p>آپ کا خیرمقدم ٹاپک وہ پہلی چیز ہے جسے نئے آنے والے پڑھیں گے۔ اِسے اپنی <b>ایک پیراگراف</b> پر مشتمل 'لفٹ میں اِلتجاء' یا 'مِشَن کے بیان' کے طور پر تصور کیجیے۔ </p>"
+            one_paragraph: "براہ مہربانی اپنے خیر مقدم پیغام کو ایک پیراگراف تک محدود رکھیں۔"
+      privacy:
+        title: "رسائی"
+        description: "<p>کیا آپ کا کمیونٹی سب کے لئے کھلی ہے، یا یہ رکنیت، دعوت ناموں، یا منظوری کے ذریعہ محدود ہے؟ اگر آپ پسند کریں تو، آپ ذاتی طور پر چیزوں کو مقرر کر سکتے ہیں، اور پھر بعد میں کمیونٹی کو عوامی طور پر کھول سکتے ہیں۔</p> <p>آپ ہمیشہ ٹاپکس، یا اپنے صارف پروفائل صفحے سے بھی دعوت نامے بھیج سکتے ہیں۔</p>"
+        fields:
+          privacy:
+            choices:
+              open:
+                label: "عوامی"
+                description: "کوئی بھی اِس کمیونٹی تک رسائی حاصل کر سکتا ہے اور ایک اکاؤنٹ کیلئے سائن اَپ کرسکتا ہے"
+              restricted:
+                label: "ذاتی"
+                description: "جنہیں میں نے مدعو کیا یا منظوری دی ہے صرف وہ لوگ اِس کمیونٹی تک رسائی حاصل کر سکتے ہیں"
+      contact:
+        title: "رابطہ"
+        fields:
+          contact_email:
+            label: "میل"
+            placeholder: "name@example.com"
+            description: "اِس کمیونٹی کیلئے ذمہ دار شخص یا گروپ کا ای میل ایڈریس۔ اہم اطلاعات جیسے کہ غیر نمٹائے گئے فلَیگز، سیکورٹی اپ ڈیٹس، اور فوری کمیونٹی رابطے کیلئے <a href='/about' target='_blank'>آپ کے \"بارے میں\" والے صفحے</a> پر اہم اطلاعات کیلئے استعمال کیا جاتا ہے۔"
+          contact_url:
+            label: "وِیب صفحہ"
+            placeholder: "http://www.example.com/contact-us"
+            description: "آپ یا آپ کے ادارہ کیلئے عام رابطہ کیلئے وَیب صفحہ۔ <a href='/about' target='_blank'>آپ کے \"بارے میں\" والے صفحے</a> پر دکھایا جائے گا۔"
+          site_contact:
+            label: "خودکار پیغامات"
+            description: "تمام خودکار ڈِسکورس ذاتی پیغامات اِس صارف کی طرف سے بھیجے جائیں گے جیسے کہ فلَیگ انتباہات اور بیک اَپ تکمیل نوٹس۔"
+      corporate:
+        title: "ادارہ"
+        description: "یہ نام آپ کی <a href='/privacy' target='blank'>پرائیوَیسی پالیسی</a> اور <a href='/tos' target='blank'>سروس کی شرائط</a> میں درج کیے جائیں گے، جو ٹاپک ہیں جو کہ آپ سٹاف زُمرہ میں ترمیم کرسکتے ہیں۔ اگر آپ کی کمپنی نہیں ہے، تو ابھی کیلئے آپ آسانی سے اِس مرحلے کو چھوڑ سکتے ہیں۔"
+        fields:
+          company_short_name:
+            label: "کمپنی نام (مختصر)"
+            placeholder: "اِینیٹَیک"
+          company_full_name:
+            label: "کمپنی نام (مکمل)"
+            placeholder: "اِینیٹَیک، انکارپورَیٹِڈ"
+          company_domain:
+            label: "کمپنی ڈَومَین نام"
+            placeholder: "initech.com"
+      colors:
+        title: "تھیم"
+        fields:
+          theme_id:
+            description: "شروعات کیلئے کیا آپ لائیٹ یا ڈارک رنگ سکیم پسند کریں گے؟ آپ اپنی سائٹ کی جمالیات کو مذید اپنی مرضی کے مطابق ڈھال سکتے ہیں بذریعہ ایڈمن، \"مرضی کے مطابق بنائیں\"۔"
+            choices:
+              default:
+                label: "سادہ لائیٹ"
+              dark:
+                label: "سادہ ڈارک"
+      logos:
+        title: "لَوگَو"
+        fields:
+          logo_url:
+            label: "بنیادی لَوگَو"
+            description: "آپ کی سائٹ کے سب سے اوپر بائیں پر لَوگَو کی تصویر۔ وسیع مستطیل شکل کا استعمال کریں۔"
+          logo_small_url:
+            label: "کومپیکٹ لَوگَو"
+            description: "آپ کے لَوگَو کا ایک کومپیکٹ ورژن، جو نیچے سکرول کرنے پر آپ کی سائٹ کے سب سے اوپر بائیں جانب دکھایا جائے گا۔ ایک مربع شکل کا استعمال کریں۔"
+      icons:
+        title: "آئیکن"
+        fields:
+          favicon_url:
+            label: "چھوٹا آئیکن"
+            description: "آئیکن کی تصویر جو وَیب براؤزروں میں آپ کی ویب سائٹ کی نمائندگی کرنے کیلئے استعمال کی جاتی ہے اور جو چھوٹے سائزوں جیسے کہ 32px by 32px پر اچھی لگتی ہے۔"
+          apple_touch_icon_url:
+            label: "بڑا آئیکن"
+            description: "آئیکن کی تصویر جو جدید ڈِیوائیسِز پر آپ کی سائٹ کی نمائندگی کرنے کیلئے استعمال کی جاتی ہے اور جو بڑے سائزوں پر اچھی لگتی ہے۔ تجویز کردہ سائز کم از کم 144px by 144px ہے۔"
+      homepage:
+        description: "ہم آپ کے ہَوم پَیج پر تازہ ترین ٹاپک پیش کرنے کو تجویز کرتے ہیں، لیکن اگر آپ چاہیں تو ہَوم پَیج پر زُمرہ جات (ٹاپکس کے گروپوں) کو بھی دکھا سکتے ہیں۔"
+        title: "ہَوم پَیج"
+        fields:
+          homepage_style:
+            choices:
+              latest:
+                label: "تازہ ترین ٹاپک"
+              categories:
+                label: "زُمرَہ جات"
+      emoji:
+        title: "اِیمَوجی"
+        description: "آپ اپنی کمیونٹی کیلئے کونسا اِیمَوجی سڑائل پسند کریں گے؟ آپ ایڈمن، مرضی کے مطابق بنائیں، اِیمَوجی کے ذریعہ بعد میں مزید اپنی مرضی کے اِیمَوجی شامل کرسکتے ہیں۔"
+      invites:
+        title: "سٹاف مدعو کریں"
+        description: "آپ تقریباً کام مکمل کر چکے ہیں! چلیے لوگوں کو دعوت دیتے ہیں کہ <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>آپ کے مباحثوں میں</a> دلچسپ ٹاپک اور جوابات شامل کرنے میں آپ کی مدد کریں تاکہ آپ کی کمیونٹی کا آغاز ہو سکے۔"
+      finished:
+        title: "آپ کا ڈِسکورس تیار ہے!"
+        description: |
+          <p>اگر آپ کبھی بھی اِن ترتیبات کو تبدیل کرنا پسند کریں، تو <a href='/admin' target='_blank'>اپنے ایڈمن سیکشن</a> پر جائیں؛ اِسے سائٹ مینیو میں رِنچ آئیکن کے ساتھ تلاش کریں۔</p>
+          <p>لطف اندوز ہوئے اور <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>اپنی نئی کمیونٹی بنانے میں اللہ آپ کو کامیاب کرے!</a></p>
+  search_logs:
+    graph_title: "سرچ شمار"
+  joined: "شمولیت اختیار کی"
diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml
index 7320fbe29bb..12bb1ad3867 100644
--- a/config/locales/server.vi.yml
+++ b/config/locales/server.vi.yml
@@ -16,25 +16,25 @@ vi:
       short_no_year: "%B %-d"
       date_only: "%b %-d, %Y"
   date:
-    month_names: [null, Tháng Một, Tháng Hai, Tháng Ba, Tháng Tư, Tháng Năm, Tháng Sáu, Tháng Bảy, Tháng Tám, Tháng Chín, Tháng Mười, Tháng Mười Một, Tháng Mười Hai]
+    month_names: [~, Tháng Một, Tháng Hai, Tháng Ba, Tháng Tư, Tháng Năm, Tháng Sáu, Tháng Bảy, Tháng Tám, Tháng Chín, Tháng Mười, Tháng Mười Một, Tháng Mười Hai]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "sa"
     pm: "ch"
-    <<: *datetime_formats
   title: "Discourse"
   topics: "Chủ đề"
   posts: "bài viết"
   loading: "Đang tải"
   log_in: "Đăng nhập"
-  disable_remote_images_download_reason: "Không thể tải ảnh về máy chủ vì thiếu dung lượng."
+  disable_remote_images_download_reason: "Không thể tải ảnh về máy chủ vì không dung lượng lưu trữ."
   anonymous: "Ẩn danh"
   emails:
     incoming:
-      show_trimmed_content: "Hiện nội dung đã cắt"
+      show_trimmed_content: "Hiện nội dung đã ẩn"
       errors:
-        empty_email_error: "Xảy ra khi thư nguồn hệ thống nhận được trống."
-        no_message_id_error: "Xảy ra khi thư không có tiêu đề."
+        empty_email_error: "Xảy ra khi hệ thống nhận được một thư rỗng."
+        no_message_id_error: "Xảy ra khi thư không có phần 'Message-Id'."
         auto_generated_email_error: "Xảy ra khi tiêu đề 'ưu tiên' được đặt là: danh sách, rác, theo lô hoặc tự động trả lời, hoặc khi có tiêu đề khác bao gồm: tự động gửi, tự động trả lời hoặc tự động tạo."
         inactive_user_error: "Xảy ra khi người gửi không hoạt động."
         bad_destination_address: "Xảy ra khi không có địa chỉ email trong các trường Tới/Cc/Bcc khớp với địa chỉ email đến đã được cấu hình."
@@ -54,16 +54,16 @@ vi:
       present: phải để trống
       confirmation: "%{attribute} không khớp"
       empty: không thể để trống
-      equal_to: phải bằng %{count}
-      even: phải là chắn
+      equal_to: "phải bằng %{count}"
+      even: phải là số chẵn
       exclusion: được dành riêng
-      greater_than: phải lớn hơn %{count}
-      greater_than_or_equal_to: phải lớn hơn hoặc bằng %{count}
+      greater_than: "phải lớn hơn %{count}"
+      greater_than_or_equal_to: "phải lớn hơn hoặc bằng %{count}"
       has_already_been_used: "đã được sử dụng"
       inclusion: không được bao gồm trong danh sách
       invalid: là không hợp lệ
-      less_than: phải nhỏ hơn %{count}
-      less_than_or_equal_to: phải nhỏ hơn hoặc bằng %{count}
+      less_than: "phải nhỏ hơn %{count}"
+      less_than_or_equal_to: "phải nhỏ hơn hoặc bằng %{count}"
       not_a_number: không phải là số
       not_an_integer: phải là một số nguyên
       odd: phải là số lẻ
@@ -91,6 +91,9 @@ vi:
       max_username_length_range: "Bạn không thể thiết lập số tối đa nhỏ hơn số tối thiểu"
       default_categories_already_selected: "Bạn không thể chọn một danh mục được sử dụng trong danh sách khác."
       s3_upload_bucket_is_required: "Bạn không thể tải lên S3 mà chưa thiết lập 's3_upload_bucket'."
+  activemodel:
+    errors:
+      <<: *errors
   topic_invite:
     user_exists: "Xin lỗi, thành viên này đã được mời. Bạn chỉ có thể mời một người dùng đến một chủ đề một lần."
   backup:
@@ -104,33 +107,33 @@ vi:
   reading_time: "Thời gian đọc"
   likes: "Lượt Thích"
   too_many_replies:
-    other: "Xin lỗi bạn, người dùng mới tạm thời bị giới hạn với %{count} câu trả lời trong một chủ đề."
+    other: Xin lỗi bạn, người dùng mới tạm thời bị giới hạn với %{count} câu trả lời trong một chủ đề.
   embed:
     start_discussion: "Bắt đầu cuộc thảo luận"
     continue: "Tiếp tục cuộc thảo luận"
     more_replies:
-      other: "còn %{count} câu trả lời"
+      other: còn %{count} câu trả lời
     loading: "Đang tải cuộc thảo luận"
     permalink: "Liên kết cố định"
     imported_from: "Đây là cuộc thảo luận đi kèm chủ đề gốc tại %{link}"
     in_reply_to: "▶ %{username}"
     replies:
-      other: "%{count} câu trả lời"
+      other: '%{count} câu trả lời'
   no_mentions_allowed: "Xin lỗi, bạn không thể nhắc tới thành viên khác."
   too_many_mentions:
-    other: "Xin lỗi, bạn chỉ có thể nhắc tới %{count} thành viên trong một bài viết."
+    other: Xin lỗi, bạn chỉ có thể nhắc tới %{count} thành viên trong một bài viết.
   no_mentions_allowed_newuser: "Xin lỗi, thành viên mới không thể nhắc tới thành viên khác."
   too_many_mentions_newuser:
-    other: "Xin lỗi, thành viên mới chỉ có thể nhắc tới %{count} thành viên khác trong một bài viết."
+    other: Xin lỗi, thành viên mới chỉ có thể nhắc tới %{count} thành viên khác trong một bài viết.
   no_images_allowed: "Xin lỗi, thành viên mới chưa được chèn hình ảnh vào bài viết."
   too_many_images:
-    other: "Xin lỗi, thành viên mới chỉ có thể chèn %{count} hình ảnh trong một bài viết."
+    other: Xin lỗi, thành viên mới chỉ có thể chèn %{count} hình ảnh trong một bài viết.
   no_attachments_allowed: "Xin lỗi, thành viên mới chưa được chèn tập tin trong bài viết."
   too_many_attachments:
-    other: "Xin lỗi, thành viên mới chỉ được chèn %{count} file đính kèm trong một bài viết."
+    other: Xin lỗi, thành viên mới chỉ được chèn %{count} file đính kèm trong một bài viết.
   no_links_allowed: "Xin lỗi, thành viên mới chưa được chèn liên kết trong bài viết."
   too_many_links:
-    other: "Xin lỗi, thành viên mới chỉ được chèn %{count} liên kết trong một bài viết."
+    other: Xin lỗi, thành viên mới chỉ được chèn %{count} liên kết trong một bài viết.
   spamming_host: "Xin lỗi bạn không thể chèn liên kết tới trang đó."
   user_is_suspended: "Người dùng đang bị treo không được phép đăng bài."
   topic_not_found: "Có gì đó đã sai. Có lẽ chủ đề này đã bị đóng hoặc bị xóa trong khi bạn đang xem?"
@@ -153,7 +156,6 @@ vi:
     hot: "Chủ đề nóng nhất"
     top: "Top chủ đề"
     posts: "Bài viết mới nhất"
-    private_posts: "Tin nhắn mới nhất"
     group_posts: "Bài viết mới từ %{group_name}"
     group_mentions: "Đề cập mới từ %{group_name}"
     user_posts: "Bài viết mới của @%{username}"
@@ -167,7 +169,6 @@ vi:
   groups:
     errors:
       can_not_modify_automatic: "Bạn không thể sửa một nhóm tự động"
-      member_already_exist: "'%{username}' đã là thành viên của nhóm"
       invalid_domain: "'%{domain}' không phải là tên miền hợp lệ."
       invalid_incoming_email: "'%{email}' không phải là email hợp lệ."
       email_already_used_in_group: "'%{email}' đã được sử dụng trong nhóm '%{group_name}'."
@@ -184,8 +185,8 @@ vi:
       trust_level_4: "trust_level_4"
   education:
     until_posts:
-      other: "%{count} bài đăng"
-    new-topic: |
+      other: '%{count} bài đăng'
+    'new-topic': |
       Chào mừng bạn đến với %{site_name} &mdash; **cảm ơn vì đã đăng cuộc thảo luận mới!**
 
       - Bạn có cảm thấy tiêu đề có thú vị không khi bạn đọc to nó? Đó có phải là một đoạn tóm tắt tốt không?
@@ -195,7 +196,7 @@ vi:
       - Sử dụng những từ khóa phổ biến để người khác có thể tìm thấy chủ đề của bạn dễ hơn. Để nhóm chủ đề của bạn với các chủ đề liên quan khác, hãy chọn chuyên mục cho chủ đề của mình.
 
       Xem thêm, [hướng dẫn cộng đồng của chúng tôi](/guidelines). Bảng điều khiển này sẽ chỉ xuất hiện vào lần đầu %{education_posts_text}.
-    new-reply: |
+    'new-reply': |
       Chào mừng bạn đến với %{site_name} &mdash; **cám ơn vì đã đóng góp!**
 
       - Câu trả lời của bạn có làm cuộc thảo luận tốt hơn về mặt nào đó?
@@ -216,13 +217,12 @@ vi:
       user_profile:
         bio_raw: "GIới thiệu bản thân"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Bạn chỉ có thể đính kèm cảnh báo qua tin nhắn cá nhân"
               too_many_users: "Bạn chỉ có thể gửi một cảnh báo tới một người dùng mỗi lần."
-              cant_send_pm: "Xin lỗi, bạn không thể gửi tin nhắn tới thành viên này"
               no_user_selected: "Bạn phải chọn một thành viên phù hợp."
         user:
           attributes:
@@ -236,7 +236,6 @@ vi:
           attributes:
             hex:
               invalid: "không phải là một màu không hợp lệ"
-      <<: *errors
   user_profile:
     no_info_other: "<div class = 'missing-profile'>%{name} đã không nhập bất cứ điều gì nói về bản thân của họ </ div>"
   vip_category_name: "Phòng khách"
@@ -249,25 +248,25 @@ vi:
     title: "Chào mừng bạn đến với Phòng khách"
     body: |2
 
-      Chúc mừng! :confetti_ball:
+        Chúc mừng! :confetti_ball:
 
-      Nếu bạn có thể xem chủ đề này, bạn đã được thăng lên bậc **thường xuyên** (bậc tin tưởng 3).
+        Nếu bạn có thể xem chủ đề này, bạn đã được thăng lên bậc **thường xuyên** (bậc tin tưởng 3).
 
-      Bạn có thể &hellip;
+        Bạn có thể &hellip;
 
-      * Sửa tiêu đề của bất kì chủ đề nào
-      * Sửa chuyên mục của bất kì chủ đề nào
-      * Tất cả liên kết ở trạng thái follow ([những liên kết nofollow](http://en.wikipedia.org/wiki/Nofollow) sẽ được loại bỏ)
-      * Truy cập vào phòng khách dành riêng cho thành viên với bậc tin tưởng 3 hoặc cao hơn
-      * Ẩn bài viết spam với 1 lần đánh dấu.
+        * Sửa tiêu đề của bất kì chủ đề nào
+        * Sửa chuyên mục của bất kì chủ đề nào
+        * Tất cả liên kết ở trạng thái follow ([những liên kết nofollow](http://en.wikipedia.org/wiki/Nofollow) sẽ được loại bỏ)
+        * Truy cập vào phòng khách dành riêng cho thành viên với bậc tin tưởng 3 hoặc cao hơn
+        * Ẩn bài viết spam với 1 lần đánh dấu.
 
-      Đây là danh sách [của các thành viên thường xuyên](/badges/3/regular). Hãy chào họ đi nào.
+        Đây là danh sách [của các thành viên thường xuyên](/badges/3/regular). Hãy chào họ đi nào.
 
-      Cảm ơn vì đã trở thành một phần không thể thiếu đối với cộng đồng.
+        Cảm ơn vì đã trở thành một phần không thể thiếu đối với cộng đồng.
 
-      (Để biết thêm chi tiết về bậc tin tưởng, [xem chủ đề này][trust]. Hãy nhớ rằng bạn phải tiếp tục đạt được các yêu cầu để duy trì bậc tin tưởng của mình.)
+        (Để biết thêm chi tiết về bậc tin tưởng, [xem chủ đề này][trust]. Hãy nhớ rằng bạn phải tiếp tục đạt được các yêu cầu để duy trì bậc tin tưởng của mình.)
 
-      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Giới thiệu chuyên mục %{category}"
     replace_paragraph: "(Thay thế đoạn này với miêu tả về category mới. Bản hướng dẫn này sẽ được xuất hiện trong vùng chọn của category, vì thế nó chỉ giới hạn trong 200 kí tự. **Cho đến khi bạn chỉnh sửa phần miêu tả này hoặc tạo topic cho nó, category này sẽ không xuất hiện trên trang web.**)"
@@ -283,7 +282,7 @@ vi:
       uncategorized: "Không thể xoá mục Chưa phân loại"
       has_subcategories: "Không thể xoá chuyên mục này được vì nó có chuyên mục con."
       topic_exists:
-        other: "Không thể xoá phân loại này được bởi vì nó có %{count} chủ đề. Các chủ đề cũ là  %{topic_link}."
+        other: Không thể xoá phân loại này được bởi vì nó có %{count} chủ đề. Các chủ đề cũ là  %{topic_link}.
       topic_exists_no_oldest: "Không thể xoá chuyên mục này vì nó có %{count}  chủ để."
     uncategorized_description: "Chủ đề không cần chuyên mục, hoặc không phù hợp với bất kỳ chuyên mục nào hiện có."
   trust_levels:
@@ -299,76 +298,61 @@ vi:
       title: "người khởi xướng"
     change_failed_explanation: "Bạn đã cố gắng để giảm hạng %{user_name}  xuống '%{new_trust_level}'. Tuy nhiên cấp độ  tin cậy hiện tại của họ đã là '%{current_trust_level}'. %{user_name} sẽ được giữ lại ở cấp độ '%{current_trust_level}' - nếu bạn muốn giảm hạng thành viên, trước tiên hãy khóa cấp độ tin cậy"
   rate_limiter:
-    slow_down: "Hành động này đã được thực hiện quá nhiều lần. Bạn vui lòng thử lại sau."
-    too_many_requests: "Hành động bạn vừa thực hiện bị giới hạn theo ngày. Hãy chờ %{time_left} và thử lại."
-    by_type:
-      first_day_replies_per_day: "Bạn vừa vượt quá số lần trả lời tối đa trong ngày đầu của thành viên mới. Xin hãy chờ %{time_left} và thử lại sau."
-      first_day_topics_per_day: "Bạn vừa đạt tới số lần mở topic tối đa cho thành viên mới. Xin vui lòng chờ %{time_left} trước khi thử lại."
-      create_topic: "Bạn đang tạo topic quá nhanh. Vui lòng chờ %{time_left} trước khi thử lại."
-      create_post: "Bạn đang trả lời quá nhanh. Xin vui lòng chờ %{time_left} trước khi thử lại."
-      delete_post: "Bạn đang xóa bài viết quá nhanh, hãy đợi %{time_left} trước khi thử lại."
-      topics_per_day: "Bạn vừa đạt tới số lần mở topic mới tối đa trong ngày hôm nay. Vui lòng chờ %{time_left} trước khi thử lại."
-      pms_per_day: "Bạn vừa đạt tới số lần gửi tin nhắn tối đa trong ngày. Xin vui lòng chờ %{time_left} trước khi thử lại."
-      create_like: "Bạn vừa đạt tới số lần tối đa được Like trong ngày. Xin vui lòng chờ %{time_left} trước khi thử lại."
-      create_bookmark: "Bạn vừa đạt tới số lần đánh dấu tối đa trong ngày. Xin vui lòng chờ %{time_left} trước khi thử lại."
-      live_post_counts: "Bạn đang yêu cầu bộ đếm bài viết quá nhanh, hãy đợi %{time_left} trước khi thử lại."
-      unsubscribe_via_email: "Bạn đã vượt quá số lần hủy nhận tin qua email của ngày hôm nay, hãy đợi %{time_left} trước khi thử lại."
-      topic_invitations_per_day: "Bạn đã vượt quá số lần mời chủ đề của ngày hôm nay, hãy đợi %{time_left} trước khi thử lại."
     hours:
-      other: "%{count} giờ"
+      other: '%{count} giờ'
     minutes:
-      other: "%{count} phút"
+      other: '%{count} phút'
     seconds:
-      other: "%{count} giây"
+      other: '%{count} giây'
   datetime:
     distance_in_words:
       half_a_minute: "< 1 phút"
       less_than_x_seconds:
-        other: "< %{count} giây"
+        other: < %{count} giây
       x_seconds:
-        other: "%{count} giây"
+        other: '%{count} giây'
       less_than_x_minutes:
-        other: "< %{count} phút"
+        other: < %{count} phút
       x_minutes:
-        other: "%{count} phút"
+        other: '%{count} phút'
       about_x_hours:
-        other: "%{count} giờ"
+        other: '%{count} giờ'
       x_days:
-        other: "%{count} ngày"
+        other: '%{count} ngày'
       about_x_months:
-        other: "%{count} tháng"
+        other: '%{count} tháng'
       x_months:
-        other: "%{count} tháng"
+        other: '%{count} tháng'
       about_x_years:
-        other: "%{count} năm"
+        other: '%{count} năm'
       over_x_years:
-        other: "> %{count} năm"
+        other: '> %{count} năm'
       almost_x_years:
-        other: "%{count} năm"
+        other: '%{count} năm'
     distance_in_words_verbose:
       half_a_minute: "ngay bây giờ"
       less_than_x_seconds:
-        other: "ngay bây giờ"
+        other: ngay bây giờ
       x_seconds:
-        other: "%{count} giây trước"
+        other: '%{count} giây trước'
       less_than_x_minutes:
-        other: "ít hơn %{count} phút trước"
+        other: ít hơn %{count} phút trước
       x_minutes:
-        other: "%{count} phút trước"
+        other: '%{count} phút trước'
       about_x_hours:
-        other: "%{count} giờ trước"
+        other: '%{count} giờ trước'
       x_days:
-        other: "%{count} ngày trước"
+        other: '%{count} ngày trước'
       about_x_months:
-        other: "khoảng %{count} tháng trước"
+        other: khoảng %{count} tháng trước
       x_months:
-        other: " %{count} tháng trước"
+        other: ' %{count} tháng trước'
       about_x_years:
-        other: "khoảng %{count} năm trước"
+        other: khoảng %{count} năm trước
       over_x_years:
-        other: "hơn %{count} năm trước"
+        other: hơn %{count} năm trước
       almost_x_years:
-        other: "gần %{count} năm trước"
+        other: gần %{count} năm trước
   password_reset:
     no_token: "Xin lỗi, liên kết đổi mật khẩu đã cũ. Chọn \"Đăng nhập\" và sử dụng chức năng \"Quên mật khẩu\" để lấy liên kết mới."
     update: 'Cập nhật mật khẩu'
@@ -408,7 +392,6 @@ vi:
       long_form: 'đánh dấu cái này không thích hợp'
     notify_user:
       title: 'Gửi tin nhắn cho @{{username}}.'
-      description: 'Tôi muốn trao đổi riêng, trực tiếp với người này về bài viết của họ.'
       long_form: 'đã nhắn tin cho thành viên'
       email_title: 'Bài đăng của bạn trong "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -466,9 +449,7 @@ vi:
       xaxis: "Ngày"
       yaxis: "Số lần truy cập"
     signups:
-      title: "Thành viên mới"
       xaxis: "Ngày"
-      yaxis: "Số lượng thành viên mới"
     profile_views:
       title: "Xem hồ sơ người dùng"
       xaxis: "Ngày"
@@ -506,7 +487,6 @@ vi:
       xaxis: "Ngày"
       yaxis: "Số lượng emails"
     user_to_user_private_messages:
-      title: "Người dùng tới người dùng"
       xaxis: "Ngày"
       yaxis: "Số lượng tin nhắn"
     system_private_messages:
@@ -550,7 +530,6 @@ vi:
       title: "Thu thập thông tin web"
       xaxis: "Ngày"
     page_view_total_reqs:
-      title: "Tổng số"
       xaxis: "Ngày"
       yaxis: "Tổng lượt xem trang"
     page_view_logged_in_mobile_reqs:
@@ -608,23 +587,20 @@ vi:
     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>.'
     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."
+      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.
     bad_favicon_url: "Favicon không tải được, bạn hãy kiểm tra lại favicon_url trong <a href='/admin/site_settings'>Thiết Lập Website</a>."
     poll_pop3_timeout: "Không thể kết nối với POP3 server, sẽ không nhận được email gửi đến. Bạn hãy kiểm tra <a href='/admin/site_settings/category/email'>thiết lập POP3</a> và nhà cung cấp dịch vụ."
     poll_pop3_auth_error: "Không thể kết nối với POP3 server do lỗi chứng thực. Bạn hãy kiểm tra <a href='/admin/site_settings/category/email'>thiết lập POP3</a>."
   site_settings:
     censored_words: "Từ sẽ tự động thay thế bằng &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Tự động ẩn bất kỳ bài viết ở ẩn hơn 30 ngày."
-    default_locale: "Ngôn ngữ mặc định của Discourse (Mã ISO 639-1)"
     allow_user_locale: "Cho phép thành viên chọn ngôn ngữ của riêng trong thiết lập giao diện."
     set_locale_from_accept_language_header: "đặt ngôn ngữ giao diện cho người dùng ẩn danh từ tiêu đề ngôn ngữ trình duyệt web của họ. (KINH NGHIỆM, không hoạt động với bộ nhớ cache ẩn danh)"
     min_post_length: "Số kí tự tối thiểu trong bài đăng."
     min_first_post_length: "Chiều dài tối thiểu cho bài viết đầu tiên (nội dung chủ đề) tính theo ký tự."
-    min_private_message_post_length: "Số kí tự tối thiểu trong tin nhắn."
     max_post_length: "Số kí tự tối đa trong bài đăng."
     min_topic_title_length: "Số kí tự tối thiểu trong tiêu đề chủ đề."
     max_topic_title_length: "Số kí tự tối đa trong tiêu đề chủ đề."
-    min_private_message_title_length: "Chiều dài tối thiểu cho phép theo số kí tự của một thông điệp"
     min_search_term_length: "Số kí tự tối thiểu trong từ khóa tìm kiếm."
     search_tokenize_chinese_japanese_korean: "Bắt buộc tìm kiếm tách từ Chinese/Japanese/Korean ngay cả trên các site không phải là CJK"
     allow_uncategorized_topics: "Cho phép các chủ đề được tạo ra mà không gán chuyên mục. LƯU Ý: Nếu có bất kỳ chủ đề nào chưa gán chuyên mục, bạn phải phân loại chúng trước khi thay đổi."
@@ -707,7 +683,6 @@ vi:
     version_checks: "Ping Discourse Hub để cập nhật phiên bản và hiện thông báo phiên bản mới trong bảng điều khiển quản trị"
     new_version_emails: "Gửi email đến địa chỉ contact_email khi có phiên bản Discourse mới."
     invite_expiry_days: "Key mời người dùng có giới hạn bao lâu? tính theo ngày"
-    invite_passthrough_hours: "Bao lâu người dùng có thể sử dụng mã lời mời trước đó để đăng nhập, theo giờ"
     login_required: "Yêu cầu chứng thực để đọc nội dung trên trang web, không cho phép người dùng nặc danh truy cập."
     min_password_length: "Chiều dài mật khẩu tối thiểu."
     min_admin_password_length: "Chiều dài mật khẩu tối thiểu đối với Admin."
@@ -722,7 +697,6 @@ vi:
     sso_overrides_name: "Ghi đè tên thành viên cục bộ với tên thành viên trang ngoài từ SSO cho tất cả các lần đăng nhập, và ngăn chặn những thay đổi cục bộ."
     sso_overrides_avatar: "Ghi đè avatar thành viên cục bộ với avatar thành viên trang ngoài từ SSO. Nếu bật, bạn nên vô hiệu hóa allow_uploaded_avatars"
     sso_not_approved_url: "Chuyển những tài khoản SSO chưa duyệt tới URL này"
-    enable_local_logins: "Bật tên tài khoản và mật khẩu đăng nhập cục bộ dựa trên tài khoản. (Chú ý: bật thiết lập này để kích hoạt chức năng gửi lời mời)"
     allow_new_registrations: "Cho phép đăng ký người dùng mới. Bỏ chọn để bất cứ ai cũng có thể tạo tài khoản mới."
     enable_signup_cta: "Hiện thông báo với thành viên ẩn danh khi họ quay lại để yêu cầu họ đăng ký tài khoản."
     enable_yahoo_logins: "Cho phé chứng thực qua Yahoo"
@@ -730,8 +704,6 @@ vi:
     google_oauth2_client_id: "Client ID ứng dụng Google của bạn."
     google_oauth2_client_secret: "Client secret ứng dụng Google của bạn."
     enable_twitter_logins: "Cho phép chứng thực qua Twitter, yêu cầu twitter_consumer_key và twitter_consumser_secret"
-    twitter_consumer_key: "Consumer key cho chứng thực Twitter, đăng ký tại http://dev.twitter.com"
-    twitter_consumer_secret: "Consumer secret cho chứng thực Twitter, đăng ký tại http://dev.twitter.com"
     enable_instagram_logins: "Bật chứng thực Instagram, yêu cầu instagram_consumer_key và instagram_consumer_secret"
     instagram_consumer_key: "Khóa người dùng để chứng thực Instagram"
     instagram_consumer_secret: "Khóa bảo mật để chứng thực Instagram"
@@ -744,7 +716,6 @@ vi:
     allow_restore: "Cho phép phục hồi, nó có thể thay thế TẤT CẢ dữ liệu trang web! Bỏ chọn, trừ khi bạn có kế hoạch phục hồi một bản sao lưu"
     maximum_backups: "Số bản sao lưu tối đa lưu trong đĩa cứng. Những bản sao lưu cũ sẽ được xóa tự động"
     automatic_backups_enabled: "Chạy sao lưu tự động như cấu hình trong tần số sao lưu"
-    backup_frequency: "Tần số sao lưu trang web, trong ngày."
     enable_s3_backups: "Tải bản sao lưu lên S3 khi hoàn tất. QUAN TRỌNG: yêu cầu chứng thực S3 đã được nhập trong cấu hình File."
     s3_backup_bucket: "Địa chỉ tách biệt lưu trữ backup. LƯU Ý: đây phải là địa chỉ được giành riêng."
     s3_disable_cleanup: "Vô hiệu hóa việc loại bỏ các bản sao lưu từ S3 khi lấy ra tại địa phương."
@@ -765,7 +736,6 @@ vi:
     max_bookmarks_per_day: "Số tối đa người dùng có thể đánh dấu mỗi ngày."
     max_edits_per_day: "Số tối đa người dùng có thể chỉnh sửa mỗi ngày."
     max_topics_per_day: "Số chủ đề tối đa người dùng có thể tạo mỗi ngày."
-    max_private_messages_per_day: "Số tin nhắn tối đa người dùng có thể tạo mỗi ngày."
     max_invites_per_day: "Số tối đa người dùng có thể gửi lời mời mỗi ngày."
     max_topic_invitations_per_day: "Số tối đa lời mời chủ đề thành viên có thể gửi mỗi ngày."
     alert_admins_if_errors_per_minute: "Số lỗi trong một phút để kích hoạt cảnh báo admin, điền 0 để tắt tính năng này. LƯU Ý: yêu cầu khởi động lại."
@@ -776,7 +746,6 @@ vi:
     clean_orphan_uploads_grace_period_hours: "Thời gian gia hạn (theo giờ) trước khi dòng mồ côi upload được loại bỏ."
     purge_deleted_uploads_grace_period_days: "Thời gian gia hạn (theo ngày) trước khi upload cần xóa được xóa."
     enable_s3_uploads: "Đặt thư mục upload trên Amazon S3. QUAN TRỌNG: yêu cầu chứng thực S3 (cả ID khóa truy cập & khóa bảo mật)."
-    s3_use_iam_profile: 'Sử dụng AWS EC2 IAM để lấy khóa. LƯU Ý: bật thiết lập này sẽ ghi đè thiết lập "s3 access key id" và "s3 secret access key".'
     s3_upload_bucket: "Tên Amazon S3 để lưu trữ các file sẽ được upload. CHÚ Ý: phải là chữ thường, không cách và không gạch dưới."
     s3_access_key_id: "Amazon S3 access key id này sẽ được sử dụng để tải lên ảnh."
     s3_secret_access_key: "Amazon S3 secret access key này sẽ được sử dụng để tải lên ảnh."
@@ -814,7 +783,6 @@ vi:
     min_trust_to_create_topic: "Bậc tin tưởng tối thiểu để tạo một chủ đề mới."
     min_trust_to_edit_wiki_post: "Bậc tin cậy tối thiểu cần thiết để có thể sửa bài viết được đánh dấu là wiki."
     min_trust_to_allow_self_wiki: "Bậc tin cậy tối thiểu cần thiết để người dùng có thể đánh dấu bài viết của họ là wiki."
-    min_trust_to_send_messages: "Bậc tin cậy tối thiểu cần thiết để có thể tạo hội thoại riêng."
     newuser_max_links: "Bao nhiêu liên kết tài khoản mới có thể thêm vào bài viết."
     newuser_max_images: "Bao nhiêu hình tài khoản mới có thể thêm vào bài viết."
     newuser_max_attachments: "Bao nhiêu đính kèm tài khoản mới có thể thêm vào bài viết"
@@ -823,7 +791,6 @@ vi:
     max_mentions_per_post: "Số tối đa thông báo @name mà tất cả mọi người có thể sử dụng trong bài viết."
     create_thumbnails: "Tạo ảnh nhỏ và ảnh lightbox nếu quá lớn để vừa trong một bài đăng."
     email_time_window_mins: "Chờ (n) phút trước khi gửi bất kỳ một email thông báo nào, để cung cấp cho người dùng cơ hội để chỉnh sửa và hoàn tất bài viết của họ."
-    private_email_time_window_seconds: "Đợi (n) giây trước khi gửi bất kỳ thông báo email nào, để cho thành viên cơ hội để chỉnh sửa và hoàn thiện các thông điệp của họ."
     email_posts_context: "Có bao nhiêu trả lời trước được kèm theo như là bối cảnh trong email thông báo."
     flush_timings_secs: "Tần suất tuôn dữ liệu thời gian tới server, theo giây."
     title_max_word_length: "Chiều dài tối đa chữ cho phép, tính theo ký tự, trong một tiêu đề chủ đề."
@@ -940,8 +907,6 @@ vi:
     enforce_square_emoji: "Sử dụng kích thước vuông cho tất cả các emoji."
     approve_post_count: "Số lượng bài viết từ một thành viên mới hoặc thành viên cũ phải được duyệt"
     approve_unless_trust_level: "Bài viết của thành viên dưới cấp độ tin cậy này phải được duyệt"
-    notify_about_queued_posts_after: "Nếu những bài viết đang chờ duyệt có thời gian cũ hơn số giờ thiết lập ở đây, một email sẽ được gửi đến contact_email. Đặt là 0 để vô hiệu hóa email này."
-    default_email_private_messages: "Gửi email khi ai đó nhắn tin cho thành viên theo mặc định."
     default_email_direct: "Gửi email khi ai đó trích dẫn/trả lời/đề cập hoặc mời thành viên theo mặc định."
     default_email_mailing_list_mode: "Mặc định gửi email cho mỗi bài viết mới."
     disable_mailing_list_mode: "Không cho phép thành viên bật chế độ danh sách thư."
@@ -1000,9 +965,9 @@ vi:
     not_seen_in_a_month: "Chào mừng quay trở lại! Chúng tôi thấy bạn truy cập một khoảng thời gian. Ở đây có những bài viết phổ biến từ lúc bạn đ."
   move_posts:
     new_topic_moderator_post:
-      other: "%{count} bài viết đã được chia thành chủ đề mới: %{topic_link}"
+      other: '%{count} bài viết đã được chia thành chủ đề mới: %{topic_link}'
     existing_topic_moderator_post:
-      other: "%{count} bài viết đã được hợp nhất vào chủ đề: %{topic_link}"
+      other: '%{count} bài viết đã được hợp nhất vào chủ đề: %{topic_link}'
   change_owner:
     post_revision_text: "Chuyển quyền sở hữu từ %{old_user} sang %{new_user}"
     deleted_user: "xóa người dùng"
@@ -1012,17 +977,17 @@ vi:
     closed_enabled: "Chủ đề này được đóng lại. Các trả lời mới sẽ không được chấp nhận."
     closed_disabled: "Chủ đề này được mở ra. Các trả lời mới sẽ được chấp nhận."
     autoclosed_enabled_days:
-      other: "Chủ đề này sẽ được tự động đóng sau %{count} ngày, sẽ không được gửi trả lời."
+      other: Chủ đề này sẽ được tự động đóng sau %{count} ngày, sẽ không được gửi trả lời.
     autoclosed_enabled_hours:
-      other: "Chủ đề này sẽ được tự động đóng sau %{count} giờ, sẽ không được gửi trả lời."
+      other: Chủ đề này sẽ được tự động đóng sau %{count} giờ, sẽ không được gửi trả lời.
     autoclosed_enabled_minutes:
-      other: "Chủ đề này sẽ được tự động đóng sau %{count} phút, sẽ không được gửi trả lời."
+      other: Chủ đề này sẽ được tự động đóng sau %{count} phút, sẽ không được gửi trả lời.
     autoclosed_enabled_lastpost_days:
-      other: "Chủ đề này sẽ được tự động đóng sau %{count} ngày sau lần trả lời cuối, sẽ không được gửi trả lời."
+      other: Chủ đề này sẽ được tự động đóng sau %{count} ngày sau lần trả lời cuối, sẽ không được gửi trả lời.
     autoclosed_enabled_lastpost_hours:
-      other: "Chủ đề này đã được đóng tự động %{count} giờ sau phản hồi cuối cùng. Không còn cho phép phản hồi mới."
+      other: Chủ đề này đã được đóng tự động %{count} giờ sau phản hồi cuối cùng. Không còn cho phép phản hồi mới.
     autoclosed_enabled_lastpost_minutes:
-      other: "Chủ đề này sẽ được tự động đóng sau %{count} phút sau lần trả lời cuối, sẽ không được gửi trả lời."
+      other: Chủ đề này sẽ được tự động đóng sau %{count} phút sau lần trả lời cuối, sẽ không được gửi trả lời.
     autoclosed_disabled: "Chủ đề này đã được mở. Bạn có thể bình luận"
     autoclosed_disabled_lastpost: "Chủ đề này đã được mở. Bạn có thể bình luận"
     pinned_enabled: "Chủ đề này đang được ghim, nó sẽ hiển thị ở trên cùng chuyên mục cho đến khi được BQT bỏ ghim, hoặc bởi chính thành viên cá nhân."
@@ -1071,7 +1036,7 @@ vi:
       max_new_accounts_per_registration_ip: "Đăng ký tài khoản mới không được chấp nhận từ địa chỉ IP của bạn (đã đạt giới hạn tối), xin hãy liên hệ với BQT."
   flags_reminder:
     subject_template:
-      other: "%{count} đánh dấu đang đợi xử lý"
+      other: '%{count} đánh dấu đang đợi xử lý'
   unsubscribe_mailer:
     subject_template: "Xác nhận bạn không còn muốn nhận email cập nhật từ %{site_title}"
   invite_password_instructions:
@@ -1105,8 +1070,6 @@ vi:
       text_body_template: "File mời thành viên hàng loạt của bạn đã được thực hiện, %{sent} lời mời đã được gửi."
     bulk_invite_failed:
       subject_template: "Có lỗi khi thực hiện mời thành viên hàng loạt"
-    csv_export_succeeded:
-      subject_template: "Xuất dữ liệu hoàn tất"
     csv_export_failed:
       subject_template: "Xuất dữ liệu thất bại"
     email_reject_inactive_user:
@@ -1154,7 +1117,7 @@ vi:
         Nếu có một giao diện web cho các tài khoản email POP, bạn có thể cần phải đăng nhập vào website và kiểm tra các thiết lập này.
     pending_users_reminder:
       subject_template:
-        other: "%{count} thành viên đang chờ duyệt"
+        other: '%{count} thành viên đang chờ duyệt'
       text_body_template: |
         Có tài khoản mới đăng ký đang chờ duyệt (hoặc từ chối) trước khi họ có thể truy cập diễn đàn.
 
@@ -1256,22 +1219,22 @@ vi:
         Huy hiệu này được trao lần đầu tiên khi bạn chỉnh sửa một trong những bài viết của mình. Chỉnh sửa luôn luôn là một ý tưởng tốt — bạn có thể cải thiện bài viết của mình, sửa chữa những lỗi nhỏ, hoặc thêm bất cứ điều gì còn thiếu. Chỉnh sửa có thể làm cho bài viết của bạn thậm chí còn tốt hơn!
     basic_user:
       name: Cơ bản
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Các cấp</a> chức năng cần thiết của cộng đồng
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">Các cấp</a> chức năng cần thiết của cộng đồng"
       long_description: |
         Huy hiệu này được cấp khi bạn đạt cấp độ tin cậy 1. Cám ơn bạn đã nán lại một chút đọc một vài chủ đề để tìm hiểu về cộng đồng của chúng tôi. Hạn chế đối với thành viên mới của bạn đã được dỡ bỏ; bạn đã được cấp tất cả các khả năng cần thiết của cộng đồng, chẳng hạn như tin nhắn cá nhân, gắn cờ, chỉnh sửa wiki, và khả năng gửi nhiều ảnh và liên kết.
     member:
       name: Thành viên
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Các cấp</a> lời mời, nhắn tin nhóm, và thêm lượt like
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">Các cấp</a> lời mời, nhắn tin nhóm, và thêm lượt like"
       long_description: |
         Huy hiệu này được cấp khi bạn đạt cấp độ tin cậy 2. Cám ơn bạn đã tham gia trong một thời gian vài tuần để thực sự gia nhập cộng đồng của chúng tôi. Bây giờ bạn có thể gửi lời mời từ trang tài khoản hay tạo chủ đề cá nhân, tạo nhóm tin nhắn cá nhân, và có thể thêm một vài lượt like mỗi ngày.
     regular:
       name: Thường xuyên
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Cấp độ</a> phân hạng, đổi tên, theo đuôi liên kết, wiki, và thêm lượt like
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">Cấp độ</a> phân hạng, đổi tên, theo đuôi liên kết, wiki, và thêm lượt like"
       long_description: |
         Huy hiệu này được cấp khi bạn đạt cấp độ tin cậy 3. Cám ơn bạn đã tham gia cộng đồng của chúng tôi trong thời gian vài tháng. Bây giờ bạn đã là một trong những độc giả tích cực nhất, và là một đóng góp tin cậy giúp cho cộng đồng của chúng tôi tuyệt vời hơn. Bây giờ bạn có thể phân loại và đổi tên chủ đề, tận dụng lợi thế để gắn cờ spam mạnh mẽ hơn, truy cập vào một khu vực phòng riêng, và bạn cũng có thể nhận được nhiều lượt like hơn mỗi ngày.
     leader:
       name: Lãnh đạo
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Cấp độ</a> sửa toàn trang, ghim, đóng, lưu trữ, tách và hợp nhất, và thêm lượt like
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">Cấp độ</a> sửa toàn trang, ghim, đóng, lưu trữ, tách và hợp nhất, và thêm lượt like"
       long_description: |
         Huy hiệu này được cấp khi bạn đạt cấp độ tin cậy 4. Bạn là một nhà lãnh đạo trong cộng đồng theo sự lựa chọn của BQT, bạn là một ví dụ về sự tích cực cho phần còn lại của cộng đồng trong hành động và lời nói. Bạn có khả năng chỉnh sửa tất cả các bài viết, thực hiện hành động quản trị như ghim, đóng, lưu trữ, tách và hợp nhất, và bạn có thể có hàng ngàn lượt like mỗi ngày.
     welcome:
@@ -1283,7 +1246,7 @@ vi:
       name: Tự truyện
     anniversary:
       name: Ngày kỷ niệm
-      description: Thành viên hoạt động trong một năm, gửi bài ít nhất một lần
+      description: "Thành viên hoạt động trong một năm, gửi bài ít nhất một lần"
       long_description: |
         Huy hiệu này được cấp khi bạn đã là thành viên của cộng đồng trong một năm và gửi ít nhất một bài trong năm đó. Cám ơn bạn đã nán lại và đóng góp cho cộng đồng của chúng tôi. Chúng tôi không thể làm điều đó mà không có bạn.
     nice_post:
@@ -1344,8 +1307,6 @@ vi:
     promoter:
       name: Người Khởi Xướng
       description: Đã mời 1 người dùng
-      long_description: |
-        Huy hiệu này được cấp khi bạn đã mời 1 người tham gia cộng đồng thông qua nút mời trên trang tài khoản của bạn, hoặc nút mời ở dưới cùng của chủ đề. Mời bạn bè tham gia thảo luận là một cách tuyệt vời để giới thiệu những người mới đến với cộng đồng, cám ơn bạn!
     campaigner:
       name: Người Vận Động
       description: Đã mời 3 người dùng
@@ -1433,7 +1394,6 @@ vi:
       name: Đề cập đầu tiên
   admin_login:
     success: "Gửi mail lỗi"
-    error: "Lỗi!"
     email_input: "Email quản trị"
     submit_button: "Gửi email"
   performance_report:
@@ -1441,6 +1401,3 @@ vi:
     initial_topic_title: Báo cáo hiệu suất website
   tags:
     title: "Thẻ"
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index aaf5ae63d16..ddd63933e7b 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -17,18 +17,19 @@ zh_CN:
       date_only: "%Y年%m月%d日"
       long: "%Y年%m月%d日%H:%M"
   date:
-    month_names: [null, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月]
+    month_names: [~, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "上午"
     pm: "下午"
-    <<: *datetime_formats
   title: "Discourse"
   topics: "主题列表"
   posts: "帖子"
   loading: "载入中"
   powered_by_html: '采用 <a href="http://www.discourse.org">Discourse</a>，启用 JavaScript 以获得最佳体验'
   log_in: "登录"
+  submit: "提交"
   purge_reason: "自动删除废弃，停用账户"
   disable_remote_images_download_reason: "磁盘空间不足，远程图像下载已经被停用。"
   anonymous: "匿名"
@@ -36,6 +37,8 @@ zh_CN:
   themes:
     bad_color_scheme: "色彩空间无效，无法更新主题"
     other_error: "更新主题时出错"
+    settings_errors:
+      invalid_yaml: "填写的 YAML 无效"
   emails:
     incoming:
       default_subject: "这个主题需要个标题"
@@ -72,19 +75,18 @@ zh_CN:
       present: 必须为空
       confirmation: "不匹配%{attribute}"
       empty: 不能为空
-      equal_to: 必须等于 %{count}
+      equal_to: "必须等于 %{count}"
       even: 必须为奇数
       exclusion: 被保留
-      greater_than: 必须大于 %{count}
-      greater_than_or_equal_to: 必须大于或等于 %{count}
+      greater_than: "必须大于 %{count}"
+      greater_than_or_equal_to: "必须大于或等于 %{count}"
       has_already_been_used: "不能和其他%{attribute}重复"
       inclusion: 不包括在列表中
       invalid: 无效
       is_invalid: "似乎不清楚，这是一个完整的句子？"
       contains_censored_words: "包含了以下敏感词:%{censored_words}"
-      matches_censored_pattern: "包含了以下网站过滤系统中的敏感词%{censored_words}"
-      less_than: 必须小于 %{count}
-      less_than_or_equal_to: 必须小于等于 %{count}
+      less_than: "必须小于 %{count}"
+      less_than_or_equal_to: "必须小于等于 %{count}"
       not_a_number: 不是数字
       not_an_integer: 必须是数字
       odd: 必须是偶数
@@ -112,6 +114,9 @@ zh_CN:
       max_username_length_range: "不能将最大值设置为一个小于最小值的值。"
       default_categories_already_selected: "不能选择一个已经用于另一个列表的分类。"
       s3_upload_bucket_is_required: "你没有填写“s3_upload_bucket”，不能开启上传至 S3。"
+  activemodel:
+    errors:
+      <<: *errors
   invite:
     not_found: "你的邀请码不正确。请联系网站管理员。"
     user_exists: "不需要邀请<b>%{email}</b>，他们<a href='/u/%{username}/summary'>已经有帐号了！</a>"
@@ -133,7 +138,7 @@ zh_CN:
   reading_time: "阅读时间"
   likes: "赞"
   too_many_replies:
-    other: "我们非常抱歉，但是新用户有发帖限制。在同一主题只能回复 %{count} 次。"
+    other: 我们非常抱歉，但是新用户有发帖限制。在同一主题只能回复 %{count} 次。
   embed:
     start_discussion: "开始讨论"
     continue: "继续讨论"
@@ -143,29 +148,29 @@ zh_CN:
     no_hosts: "嵌入没有设置任何主机地址。"
     configure: "配置嵌入"
     more_replies:
-      other: "%{count} 个更多回复"
+      other: '%{count} 个更多回复'
     loading: "正在载入讨论中..."
     permalink: "永久链接"
     imported_from: "这是一个已从原 %{link} 中分离的主题"
     in_reply_to: "▶ %{username}"
     replies:
-      other: "%{count} 个回复"
+      other: '%{count} 个回复'
   no_mentions_allowed: "抱歉，你无法提到其他用户。"
   too_many_mentions:
-    other: "抱歉，你一次仅能提到 %{count} 个用户。"
+    other: 抱歉，你一次仅能提到 %{count} 个用户。
   no_mentions_allowed_newuser: "抱歉，访客无法@用户。"
   too_many_mentions_newuser:
-    other: "抱歉，访客一次仅能@ %{count} 个用户。"
+    other: 抱歉，访客一次仅能@ %{count} 个用户。
+  no_images_allowed_trust: "抱歉，你无法在这个帖子里贴图"
   no_images_allowed: "抱歉，访客无法贴图。"
   too_many_images:
-    other: "抱歉，访客一次仅能贴 %{count} 张图。"
+    other: 抱歉，访客一次仅能贴 %{count} 张图。
   no_attachments_allowed: "抱歉，新用户无法上传附件。"
   too_many_attachments:
-    other: "抱歉，新用户一次仅能上传 %{count} 个附件。"
+    other: 抱歉，新用户一次仅能上传 %{count} 个附件。
   no_links_allowed: "抱歉，访客无法贴链接。"
   too_many_links:
-    other: "抱歉，访客一次仅能贴 %{count} 条链接。"
-  contains_blocked_words: "你的帖子包含违禁词。"
+    other: 抱歉，访客一次仅能贴 %{count} 条链接。
   spamming_host: "抱歉，你不能添加一个链接到那个地址的链接。"
   user_is_suspended: "被封禁的用户不允许发贴。"
   topic_not_found: "出现问题。或许这个主题在你看的时候已经被关闭或删除了。"
@@ -197,7 +202,6 @@ zh_CN:
     top_weekly: "每周热门主题"
     top_daily: "每日热门主题"
     posts: "最新帖子"
-    private_posts: "最近的私信"
     group_posts: "%{group_name}组最近的帖子"
     group_mentions: "%{group_name}组最近的提及"
     user_posts: "最新贴子由@%{username}发表"
@@ -211,11 +215,8 @@ zh_CN:
     delete_reason: "通过帖子审核队列删除"
     not_found: "未找到帖子或已经更新。"
   groups:
-    success:
-      bulk_add: "%{users_added}用户已经被添加至小组。"
     errors:
       can_not_modify_automatic: "你不能修改自动组"
-      member_already_exist: "“%{username}”已经是群组成员了。"
       invalid_domain: "“%{domain}”不是有效域名。"
       invalid_incoming_email: "“%{email}”不是有效邮箱地址。"
       email_already_used_in_group: "“%{email}”已经被群组“%{group_name}”使用了。"
@@ -235,8 +236,8 @@ zh_CN:
       title: "%{group_name}的成员请求"
   education:
     until_posts:
-      other: "%{count} 个帖子"
-    new-topic: |
+      other: '%{count} 个帖子'
+    'new-topic': |
       欢迎来到%{site_name} &mdash; **衷心感谢你参与讨论！**
 
       - 标题念出来后听着有趣么？是否清晰明了？
@@ -246,7 +247,7 @@ zh_CN:
       - 选择常用的词句以便别人能找到你的主题。如果想要把主题和类似主题放在一起，选择一个分类。
 
       更多的帮助信息，[请查看我们的社区准则](/guidelines)。此信息面板只在你发布前 %{education_posts_text}时显示。
-    new-reply: |
+    'new-reply': |
       欢迎来到%{site_name} &mdash; **感谢你的贡献！**
 
       - 你的回复是否以某种方式改善了讨论？
@@ -292,12 +293,6 @@ zh_CN:
       非常抱歉，但新用户被限制只能在同一主题中回复 %{newuser_max_replies_per_topic} 次。
 
       与其添加另一个回复不如考虑编辑你以前的回复，或访问其他主题。
-    reviving_old_topic: |
-      ### 重新激活这个主题？
-
-      这个主题的最后一个回复距今已有 %{days} 天了。你的回复将让主题重新出现在列表的顶端并通知原先参与讨论的人。
-
-      你确定要继续这个老的话题吗？
   activerecord:
     attributes:
       category:
@@ -310,13 +305,12 @@ zh_CN:
       user_profile:
         bio_raw: "关于我"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "只能使用私信警告。"
               too_many_users: "一次只能发送警告给一个用户。"
-              cant_send_pm: "抱歉，不能向该用户发送私信。"
               no_user_selected: "必须选择一个有效的用户。"
               reply_by_email_disabled: "用邮件回复已被禁止"
             featured_link:
@@ -359,7 +353,6 @@ zh_CN:
           attributes:
             word:
               too_many: "对该操作敏感词过多"
-      <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>你的个人主页中的关于我部分目前还是空白，<a href='/u/%{username_lower}/preferences/about-me'>你想要补些什么吗？</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} 尚未在他们的资料中的关于我部分填写任何信息</div>"
@@ -375,41 +368,41 @@ zh_CN:
     title: "欢迎来到 Discourse"
     body: |2
 
-      置顶主题的第一段是访客在主页看到的欢迎私信。这很重要！
+        置顶主题的第一段是访客在主页看到的欢迎私信。这很重要！
 
-      **编辑**它作为社区的简要介绍：
+        **编辑**它作为社区的简要介绍：
 
-      - 什么人想参与？
-      - 他们能在这找到什么？
-      - 为什么他们要来这？
-      - 他们能在哪里阅读更多的内容（链接、资源等）？
+        - 什么人想参与？
+        - 他们能在这找到什么？
+        - 为什么他们要来这？
+        - 他们能在哪里阅读更多的内容（链接、资源等）？
 
-      <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+        <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
 
-      你可能想要在管理 :wrench: （右上角）中关闭这个主题，这样回复就不会积压在这个通告下。
+        你可能想要在管理 :wrench: （右上角）中关闭这个主题，这样回复就不会积压在这个通告下。
   lounge_welcome:
     title: "欢迎来到贵宾室"
     body: |2
 
-      恭喜！ :confetti_ball:
+        恭喜！ :confetti_ball:
 
-      如果你看到了这个主题，说明你已经被提升至**常规**（信任等级3）了。
+        如果你看到了这个主题，说明你已经被提升至**常规**（信任等级3）了。
 
-      你现在可以&hellip;
+        你现在可以&hellip;
 
-      * 编辑任何主题的标题
-      * 改变任何主题的分类
-      * 让你的链接设置为 follow 属性（[自动 nofollow](http://en.wikipedia.org/wiki/Nofollow)限制已经移除）
-      * 访问一个只有信任等级3及更高才能见到的贵宾室分类
-      * 一次标记即可隐藏垃圾信息
+        * 编辑任何主题的标题
+        * 改变任何主题的分类
+        * 让你的链接设置为 follow 属性（[自动 nofollow](http://en.wikipedia.org/wiki/Nofollow)限制已经移除）
+        * 访问一个只有信任等级3及更高才能见到的贵宾室分类
+        * 一次标记即可隐藏垃圾信息
 
-      这里是[目前达到常规的用户列表](/badges/3/regular)。一定要来问个好！
+        这里是[目前达到常规的用户列表](/badges/3/regular)。一定要来问个好！
 
-      感谢成为社区的重要一员！
+        感谢成为社区的重要一员！
 
-      （想了解关于信任等级的更多信息，[参见这个主题][trust]。请注意成员需要在将来也维持一定的选择条件的成员才能保持在常规。）
+        （想了解关于信任等级的更多信息，[参见这个主题][trust]。请注意成员需要在将来也维持一定的选择条件的成员才能保持在常规。）
 
-      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "关于“%{category}”分类"
     replace_paragraph: "（将第一段话修改成你的新分类的简述。这段文字将出现在用户选择分类的地方，所以尝试保持在 200 个字符内。 **除非你编辑了这段文字或者在这分类中创建了主题，这个分类不会出现在分类页面中。**）"
@@ -426,7 +419,7 @@ zh_CN:
       uncategorized: "不能删除未分类。"
       has_subcategories: "不能删除该分类，因为它有子分类"
       topic_exists:
-        other: "不能删除该分类，因为它有 %{count} 个主题。最老的主题是 %{topic_link}。"
+        other: 不能删除该分类，因为它有 %{count} 个主题。最老的主题是 %{topic_link}。
       topic_exists_no_oldest: "不能删除该分类，因为主题数量为 %{count}。"
     uncategorized_description: "不需要分类或者不适合放在现在的任何分类中的主题。"
   trust_levels:
@@ -445,78 +438,61 @@ zh_CN:
     image_placeholder:
       broken: "此图片已损坏"
   rate_limiter:
-    slow_down: "你执行这个操作太多次了，请稍后再试。"
-    too_many_requests: "你的请求过于频繁，请等待%{time_left}之后再试。"
-    by_type:
-      first_day_replies_per_day: "你回帖的数量已经超出身为新用户当天允许的上限，请等待%{time_left}之后再试。"
-      first_day_topics_per_day: "你创建新主题的数量已经超出身为新用户当天允许的上限，请等待%{time_left}之后再试。"
-      create_topic: "你创建新主题的速度太快了，请等待%{time_left}之后再试。"
-      create_post: "你回帖太快了，请等待%{time_left}之后再试。"
-      delete_post: "你正在快速地删除帖子。请等 %{time_left}之后再试。"
-      public_group_membership: "你加入/离开群组的速度太快了，请等待%{time_left}之后再试。"
-      topics_per_day: "你今天新主题的数量已经到达上限，请等待%{time_left}之后再试。"
-      pms_per_day: "你今天的私信数量已经到达上限，请等待%{time_left}之后再试。"
-      create_like: "你今天的“赞”数量已经到达上限，请等待%{time_left}之后再试。"
-      create_bookmark: "你今天的收藏已经到达上限，请等待%{time_left}之后再试。"
-      edit_post: "你今天编辑帖子的数量已经到达上限。请等待%{time_left}之后再试。"
-      live_post_counts: "你请求帖子数量的速度太快了，请等待%{time_left}之后再试。"
-      unsubscribe_via_email: "你已经达到了今日用邮件解除订阅的最大数量限制。请等待%{time_left}之后再试。"
-      topic_invitations_per_day: "你已经达到了今日主题邀请的最大数量限制。请等待%{time_left}之后再试。"
     hours:
-      other: "%{count}小时"
+      other: '%{count}小时'
     minutes:
-      other: "%{count}分"
+      other: '%{count}分'
     seconds:
-      other: "%{count}秒"
+      other: '%{count}秒'
   datetime:
     distance_in_words:
       half_a_minute: "< 1分"
       less_than_x_seconds:
-        other: "< %{count}秒"
+        other: < %{count}秒
       x_seconds:
-        other: "%{count}秒"
+        other: '%{count}秒'
       less_than_x_minutes:
-        other: "< %{count}分"
+        other: < %{count}分
       x_minutes:
-        other: "%{count}分"
+        other: '%{count}分'
       about_x_hours:
-        other: "%{count}小时"
+        other: '%{count}小时'
       x_days:
-        other: "%{count}天"
+        other: '%{count}天'
       about_x_months:
-        other: "%{count}分钟"
+        other: '%{count}分钟'
       x_months:
-        other: "%{count}分钟"
+        other: '%{count}分钟'
       about_x_years:
-        other: "%{count}年"
+        other: '%{count}年'
       over_x_years:
-        other: "> %{count}年"
+        other: '> %{count}年'
       almost_x_years:
-        other: "%{count}年"
+        other: '%{count}年'
     distance_in_words_verbose:
       half_a_minute: "刚刚"
       less_than_x_seconds:
-        other: "刚刚"
+        other: 刚刚
       x_seconds:
-        other: "%{count}秒之前"
+        other: '%{count}秒之前'
       less_than_x_minutes:
-        other: "少于%{count}分钟前"
+        other: 少于%{count}分钟前
       x_minutes:
-        other: "%{count}分钟前"
+        other: '%{count}分钟前'
       about_x_hours:
-        other: "%{count}小时前"
+        other: '%{count}小时前'
       x_days:
-        other: "%{count}天前"
+        other: '%{count}天前'
       about_x_months:
-        other: "大约%{count}分钟前"
+        other: 大约%{count}分钟前
       x_months:
-        other: "%{count}分钟前"
+        other: '%{count}分钟前'
       about_x_years:
-        other: "大约%{count}年前"
+        other: 大约%{count}年前
       over_x_years:
-        other: "超过%{count}年前"
+        other: 超过%{count}年前
       almost_x_years:
-        other: "将近%{count}年前"
+        other: 将近%{count}年前
   password_reset:
     no_token: "抱歉，密码修改链接已过期。选择登录按钮再使用“我忘记了密码”获得一个新链接。"
     choose_new: "选择一个新密码"
@@ -570,8 +546,6 @@ zh_CN:
       long_form: '标记为不当内容'
     notify_user:
       title: '给@{{username}}发送一条私信'
-      description: '我想与此人私下交流他们的帖子。'
-      short_description: '我想要直接地私下里和作者沟通他们的帖子。'
       long_form: '以发送私信给用户'
       email_title: '你在“%{title}”中的帖子'
       email_body: "%{link}\n\n%{message}"
@@ -672,9 +646,7 @@ zh_CN:
       xaxis: "天"
       yaxis: "访问量"
     signups:
-      title: "新用户"
       xaxis: "天"
-      yaxis: "新用户数"
     profile_views:
       title: "查看用户资料"
       xaxis: "天"
@@ -707,14 +679,23 @@ zh_CN:
       title: "各信任等级的用户数"
       xaxis: "用户等级"
       yaxis: "用户数"
+    users_by_type:
+      xaxis: "类型"
+      xaxis_labels:
+        admin: 管理员
+        moderator: 版主
+        suspended: 禁止
+        silenced: 禁言
     emails:
       title: "已发送邮件"
       xaxis: "天"
       yaxis: "邮件数"
     user_to_user_private_messages:
-      title: "用户至用户"
       xaxis: "天"
       yaxis: "私信数"
+    user_to_user_private_messages_with_replies:
+      xaxis: "天"
+      yaxis: "消息数量"
     system_private_messages:
       title: "系统"
       xaxis: "天"
@@ -759,7 +740,6 @@ zh_CN:
       xaxis: "天"
       yaxis: "Web 爬虫页面访问"
     page_view_total_reqs:
-      title: "总量"
       xaxis: "天"
       yaxis: "总浏览量"
     page_view_logged_in_mobile_reqs:
@@ -806,6 +786,8 @@ zh_CN:
       title: "用户访问"
       xaxis: "天"
       yaxis: "访问次数"
+    web_crawlers:
+      title: "Web 爬虫请求"
   dashboard:
     rails_env_warning: "你的服务器运行在 %{env} 模式。"
     host_names_warning: "你的 config/database.yml 文件使用的是缺省的 localhost 主机名。请更改成你的站点主机名。"
@@ -823,27 +805,22 @@ zh_CN:
     failing_emails_warning: '有 %{num_failed_jobs} 个邮件任务失败。请检查 app.yml 文件是否正确配置了邮件服务器。<a href="/sidekiq/retries" target="_blank">查看 Sidekiq 中失败的任务</a>。'
     subfolder_ends_in_slash: "你的子目录设置不正确；DISCOURSE_RELATIVE_URL_ROOT以斜杠结尾。"
     email_polling_errored_recently:
-      other: "邮件轮询在过去的 24 小时内出现了 %{count} 个错误。看一看<a href='/logs' target='_blank'>日志</a>寻找详情。"
-    missing_mailgun_api_key: "服务器设置使用 Mailgun 发送邮件，但并未设置验证 webhook 私信的 API 密钥。"
+      other: 邮件轮询在过去的 24 小时内出现了 %{count} 个错误。看一看<a href='/logs' target='_blank'>日志</a>寻找详情。
     bad_favicon_url: "网站图标无法载入。检查<a href='/admin/site_settings'>站点设置</a>中的 favicon_url。"
     poll_pop3_timeout: "至 POP3 服务器的连接超时。无法获取进站邮件。请检查<a href='/admin/site_settings/category/email'>POP3 设置</a>和服务商。"
     poll_pop3_auth_error: "至 POP3 服务器的连接验证失败。请检查<a href='/admin/site_settings/category/email'>POP3 设置</a>。"
   site_settings:
     censored_words: "将被自动替换为 &#9632;&#9632;&#9632;&#9632;"
-    censored_pattern: "正则表达式将自动被替换为&#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "自动删除被隐藏超过 30 天的帖子。"
-    default_locale: "此论坛的缺省语言（ISO 639-1 代码）"
     allow_user_locale: "允许用户选择他们自己的语言界面"
     set_locale_from_accept_language_header: "为未登录用户按照他们的浏览器发送的请求头部设置界面语言。（实验性，无法和匿名缓存共同使用）"
     min_post_length: "帖子允许的最少字符数"
     min_first_post_length: "第一帖（主题内容）允许的最少字符数"
-    min_private_message_post_length: "私信允许的最小字符数"
     max_post_length: "帖子允许的最大字符数"
     topic_featured_link_enabled: "允许发链接帖。"
     show_topic_featured_link_in_digest: "在摘要邮件中显示主题特色链接。"
     min_topic_title_length: "标题允许的最少字符数"
     max_topic_title_length: "标题允许的最大字符数"
-    min_private_message_title_length: "私信标题允许的最小字符数"
     min_search_term_length: "搜索条件允许的最少字符数"
     search_tokenize_chinese_japanese_korean: "在非中/日/韩语站点强制切割中/日/韩语搜索分词"
     search_prefer_recent_posts: "如果搜索大型论坛较慢，这个选项将优先尝试最新的帖子"
@@ -898,8 +875,6 @@ zh_CN:
     summary_likes_required: "在一个主题启用'摘要模式'的最小赞的数量"
     summary_percent_filter: "当用户点击摘要，显示前 % 几的帖子"
     summary_max_results: "“概括主题”返回的最大帖子数量"
-    enable_private_messages: "允许信任等级1（可以另外选择发送私信的信任等级）的用户创建私信和回复私信。注意：管理人员不受限制。"
-    enable_private_email_messages: "允许信任等级 4 (可通过发送私信的最低信任等级进行设置) 的用户创建私信和回复私信。注意：管理人员不受限制。"
     enable_long_polling: "启用 Message bus 使通知功能可以使用长轮询（long polling）"
     long_polling_base_url: "长轮询的基本 URL（当用 CDN 分发动态能让时，请设置此至原始拉取地址）例如：http://origin.site.com"
     long_polling_interval: "当没有数据向客户端发送时服务器端应等待的时间（仅对已登录用户有效）"
@@ -920,7 +895,6 @@ zh_CN:
     notify_mods_when_user_silenced: "如果用户被自动禁言了，发私信给所有版主。"
     flag_sockpuppets: "如果一个新用户开始了一个主题，并且同时另一个新用户以同一个 IP 在该主题回复，他们所有的帖子都将被自动标记为垃圾。"
     traditional_markdown_linebreaks: "在 Markdown 中使用传统换行符，即用两个尾随空格来换行"
-    enable_markdown_typographer: "使用基本的排版规则来提高文本段落的可读性，用符号替换 (c) (tm) 等，减少问号等等"
     post_undo_action_window_mins: "允许用户在帖子上进行撤销操作（赞、标记等）所需等待的间隔分钟数"
     must_approve_users: "新用户在被允许访问站点前需要由管理人员批准。警告：在运行的站点中启用将解除所有非管理人员用户的访问权限！"
     pending_users_reminder_delay: "如果新用户等待批准时间超过此小时设置则通知版主。设置 -1 关闭通知。"
@@ -964,7 +938,6 @@ zh_CN:
     version_checks: "访问 Discourse Hub 来检查版本更新，并在管理面板 /admin 显示新版本信息"
     new_version_emails: "当新版本发布时，发送一封邮件至 contact_email 设置的地址。"
     invite_expiry_days: "多少天以内用户的邀请码是有效的"
-    invite_passthrough_hours: "用户多久才能使用一个已经使用过的邀请代码，以小时计"
     invite_only: "公开注册已被禁用，所有新用户必须由管理人员邀请进来。"
     login_required: "需要验证才能继续在该站阅读，不允许匿名访问。"
     min_username_length: "最小用户名长度。警告：如果任何现存的用户或小组名字长度比这短，站点将无法正常工作！"
@@ -986,7 +959,6 @@ zh_CN:
     sso_overrides_avatar: "用单点登录信息中的外部站点头像覆盖用户头像。如果启用，强烈建议禁用 allow_uploaded_avatars"
     sso_not_approved_url: "重定向未受许可的单点登录账号至这个 URL"
     sso_allows_all_return_paths: "不限制 SSO 提供的 return_paths 中的域名（默认情况下返回地址必须位于当前站点）"
-    enable_local_logins: "启用本地用户名和密码验证。（注意：邀请特性需要该选项）"
     allow_new_registrations: "允许新用户注册。取消选择将阻止任何人创建一个新账户。"
     enable_signup_cta: "显示推荐创建账户的提示给那些回访的未注册用户。"
     enable_yahoo_logins: "启用 Yahoo 帐号验证登录"
@@ -994,15 +966,12 @@ zh_CN:
     google_oauth2_client_id: "Google 应用的 Client ID"
     google_oauth2_client_secret: "Google 应用的 Client secret"
     enable_twitter_logins: "启用 Twitter 帐号验证登录，需要 twitter_consumer_key 和 twitter_consumer_secret"
-    twitter_consumer_key: "Twitter 帐号验证的客户密匙（Consumer key），到 http://dev.twitter.com 来注册获取"
-    twitter_consumer_secret: "Twitter 帐号验证的客户密码（Consumer secret），到 http://dev.twitter.com 来注册获取"
     enable_instagram_logins: "启用 Instagram 验证，需要 instagram_consumer_key 和 instagram_consumer_secret"
     instagram_consumer_key: "Instagram 验证的 Consumer key"
     instagram_consumer_secret: "Instagram 验证的 Consumer secret"
     enable_facebook_logins: "启用 Facebook 帐号验证登录，需要 facebook_app_id 和 facebook_app_secret"
     facebook_app_id: "Facebook 帐号验证的应用帐号（App id），到 https://developers.facebook.com/apps 来注册获取"
     facebook_app_secret: "Facebook 帐号验证的应用密码（App secret），到 https://developers.facebook.com/apps 来注册获取"
-    facebook_request_extra_profile_details: "从 Facebook 中请求关于我、地点和网站。（需要 Facebook 许可你的登录应用）"
     enable_github_logins: "启用 Github 帐号验证登录，需要 github_client_id 和 github_client_secret"
     github_client_id: "Github 帐号验证的客户端帐号（Client id），到 https://github.com/settings/applications 来注册获取"
     github_client_secret: "Github 帐号验证的客户端密码（Client secret），到 https://github.com/settings/applications 来注册获取"
@@ -1010,7 +979,6 @@ zh_CN:
     allow_restore: "允许导入数据，这将能替换所有全站数据！除非你计划导入数据，否则请保持设置为 false"
     maximum_backups: "磁盘保存的最大备份数量。老的备份将自动删除"
     automatic_backups_enabled: "按照定义的备份频率运行自动备份计划"
-    backup_frequency: "自动创建站点备份的频率，以天为单位。"
     enable_s3_backups: "当完成备份后上传备份到 S3。重要：需要在文件设置中填写有效的 S3 验证资料。"
     s3_backup_bucket: "远端备份 bucket。警告：确认它使私有的 bucket。"
     s3_disable_cleanup: "当在本地删除备份时不删除 S3 上的备份。"
@@ -1032,7 +1000,6 @@ zh_CN:
     max_bookmarks_per_day: "每个用户每天能做书签数量的最大值。"
     max_edits_per_day: "每个用户每天能编辑的次数的最大值。"
     max_topics_per_day: "每个用户每天能创建的主题数量的最大值。"
-    max_private_messages_per_day: "每个用户每天能发私信数量的最大值。"
     max_invites_per_day: "每个用户每天能创建的邀请数量的最大值。"
     max_topic_invitations_per_day: "每个用户每天能创建的邀请至主题数量的最大值。"
     max_logins_per_ip_per_hour: "一小时内同一个IP（网络）地址能允许最大的登陆次数。"
@@ -1048,7 +1015,6 @@ zh_CN:
     purge_deleted_uploads_grace_period_days: "彻底删除孤立上传资料的宽限期（单位：天）"
     purge_unactivated_users_grace_period_days: "删除未激活用户账户的宽限期（单位：天）。设置为 0 将永不清除未激活用户。"
     enable_s3_uploads: "上传至 Amazon S3 存储的地址。重要：需要有效的 S3 验证资料（包括 access key id & secret access key）。"
-    s3_use_iam_profile: '使用 AWS EC2 IAM 角色来获得 key。注意：启用这个会覆盖“S3 access key id”和“S3 secret access key” 设置。'
     s3_upload_bucket: "上传文件保存于 Amazon S3 的 bucket 名字。警告：必须为小写，无句点，无下划线。"
     s3_access_key_id: "将用于上传图片的 Amazon S3 access key。"
     s3_secret_access_key: "将用于上传图片的 Amazon S3 secret key。"
@@ -1094,8 +1060,6 @@ zh_CN:
     min_trust_to_edit_wiki_post: "能编辑维基模式帖子的最小信任等级"
     min_trust_to_edit_post: "能编辑帖子的最小信任等级。"
     min_trust_to_allow_self_wiki: "用户将自己的帖子设置为维基模式的最低信任等级。"
-    min_trust_to_send_messages: "发送私信所需的最低信任等级。"
-    min_trust_to_send_email_messages: "通过 email 发送新私信（给暂存用户）所需的最低信任等级。"
     newuser_max_links: "一个访问者可以添加到一个帖子里的链接数量。"
     newuser_max_images: "一个访问者可以加入到一个帖子里的图片数量。"
     newuser_max_attachments: "一个新用户可以添加到一个帖子里的附件数量。"
@@ -1106,7 +1070,6 @@ zh_CN:
     enable_mentions: "允许用户提及其他用户。"
     create_thumbnails: "为太大而无法恰当地显示在帖子里的图片创建 lightbox 缩略图。"
     email_time_window_mins: "等待多少（n）分钟才给用户发送通知电子邮件，好让他们有机会自己来编辑和完善他们的帖子。"
-    private_email_time_window_seconds: "等待多少（n）秒再给用户发送通知电子邮件，这可以让用户有时间来编辑和完善他们的私信。"
     email_posts_context: "在通知邮件中包含的作为上下文的回复数量。"
     flush_timings_secs: "向服务器刷新时间数据的频率，以秒为单位。"
     title_max_word_length: "在主题的标题中，允许的词语长度的最大字符数。"
@@ -1163,7 +1126,6 @@ zh_CN:
     reply_by_email_enabled: "启用通过邮件回复。"
     reply_by_email_address: "通过邮件回复的回复地址模板，例如：%{reply_key}@reply.example.com 或 replies+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "通过邮件回复的回复地址模板，例如：%{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
-    incoming_email_prefer_html: "处理进站邮件时优先使用 HTML 而不是文本。"
     disable_emails: "禁止 Discourse 发送任何邮件"
     strip_images_from_short_emails: "忽略邮件中小于 2800 字节的图片"
     short_email_length: "短邮件地址长度（以比特作为单位）"
@@ -1267,7 +1229,6 @@ zh_CN:
     allowed_href_schemes: "除了 http 和 https 外允许的链接协议。"
     embed_post_limit: "嵌入帖子的最大数量。"
     embed_username_required: "创建主题需要用户名。"
-    notify_about_flags_after: "如果有标记在设定的小时数后仍未被处理，那么发送邮件给管理人员。设为 0 禁用。"
     show_create_topics_notice: "如果站点只有少于 5 篇的公开帖子时，显示一条请管理员创建帖子的提示。"
     delete_drafts_older_than_n_days: 删除超过 n 天得草稿。
     bootstrap_mode_min_users: "禁用摘要模式的用户数下限（0 为禁用）。"
@@ -1279,7 +1240,6 @@ zh_CN:
     approve_post_count: "新用户或基础用户需要被审核的帖子数量"
     approve_unless_trust_level: "该信任等级之下的用户的帖子必须被审核"
     approve_new_topics_unless_trust_level: "低于该信任等级的用户的新帖子需要被审核"
-    notify_about_queued_posts_after: "如果帖子在设定的小时数后仍在等候处理，发送一封邮件至 contact_email。设为 0 将禁用这些邮件。"
     auto_close_messages_post_count: "私信中贴子数上限，达到后自动关闭私信（0 为禁用）"
     auto_close_topics_post_count: "主题中贴子数上限，达到后自动关闭主题 ( 0 为禁用 )"
     code_formatting_style: "编辑器中的代码格式化按钮设置的默认格式"
@@ -1287,7 +1247,6 @@ zh_CN:
     watched_words_regular_expressions: "监视词是正则表达式。"
     default_email_digest_frequency: "用户收到摘要邮件的默认频率。"
     default_include_tl0_in_digests: "在摘要邮件中默认包含新用户帖子。用户可以自行在参数设置中更改这个设置。"
-    default_email_private_messages: "默认在有人发私信给用户时发送一封邮件通知。"
     default_email_direct: "默认在有人引用、回复、提及或者邀请用户时发送一封邮件通知。"
     default_email_mailing_list_mode: "默认为每一个新帖子发送一封邮件通知。"
     default_email_mailing_list_mode_frequency: "邮件列表模式下，用户收到邮件的默认频率。"
@@ -1324,7 +1283,6 @@ zh_CN:
     max_tags_in_filter_list: "过滤菜单中显示的标签数上限。优先显示最常用的标签。"
     tags_sort_alphabetically: "按照字母顺序显示标签。默认按流行度显示。"
     tag_style: "标签的视觉样式。"
-    staff_tags: "只可由管理人员使用的标签列表"
     min_trust_level_to_tag_topics: "给主题加标签的最小信任等级"
     suppress_overlapping_tags_in_list: "如果标签匹配了主题标题中的词，不显示该标签"
     remove_muted_tags_from_latest: "在最新主题列表中，不显示有静音标签的主题。"
@@ -1382,15 +1340,15 @@ zh_CN:
     not_seen_in_a_month: "欢迎回来！我们已经好久没见到你了。这些是你不在时的最热门主题。"
   merge_posts:
     edit_reason:
-      other: "%{username}合并了 %{count} 个帖子"
+      other: '%{username}合并了 %{count} 个帖子'
     errors:
       different_topics: "无法合并不同主题的帖子。"
       different_users: "无法合并不同用户的帖子。"
   move_posts:
     new_topic_moderator_post:
-      other: "%{count} 个帖子被分离到了新主题：%{topic_link}"
+      other: '%{count} 个帖子被分离到了新主题：%{topic_link}'
     existing_topic_moderator_post:
-      other: "%{count} 个帖子被合并到现存主题：%{topic_link}"
+      other: '%{count} 个帖子被合并到现存主题：%{topic_link}'
   change_owner:
     post_revision_text: "所有权从 %{old_user} 转移至 %{new_user}"
     deleted_user: "已经删除的用户"
@@ -1400,33 +1358,33 @@ zh_CN:
     closed_enabled: "该主题现已关闭，不再允许新的回复。"
     closed_disabled: "本主题已开放，可以发表新的回复。"
     autoclosed_message_max_posts:
-      other: "私信中回复已经达到上限 %{count}，自动锁定。"
+      other: 私信中回复已经达到上限 %{count}，自动锁定。
     autoclosed_topic_max_posts:
-      other: "主题中回复已经达到上限 %{count}，自动关闭。"
+      other: 主题中回复已经达到上限 %{count}，自动关闭。
     autoclosed_enabled_days:
-      other: "该主题在创建%{count}天后自动关闭。不再允许添加新回复。"
+      other: 该主题在创建%{count}天后自动关闭。不再允许添加新回复。
     autoclosed_enabled_hours:
-      other: "该主题在创建%{count}小时后自动关闭。不再允许新的回复。"
+      other: 该主题在创建%{count}小时后自动关闭。不再允许新的回复。
     autoclosed_enabled_minutes:
-      other: "该主题在创建%{count}分钟后自动关闭。不再允许新的回复。"
+      other: 该主题在创建%{count}分钟后自动关闭。不再允许新的回复。
     autoclosed_enabled_lastpost_days:
-      other: "该主题在最后一个回复创建后%{count}天后自动关闭。不再允许新的回复。"
+      other: 该主题在最后一个回复创建后%{count}天后自动关闭。不再允许新的回复。
     autoclosed_enabled_lastpost_hours:
-      other: "该主题在最后一个回复创建后%{count}小时后自动关闭。不再允许添加新回复。"
+      other: 该主题在最后一个回复创建后%{count}小时后自动关闭。不再允许添加新回复。
     autoclosed_enabled_lastpost_minutes:
-      other: "本主题在最后一个回复创建后%{count}分钟后自动锁定。不再允许添加新回复。"
+      other: 本主题在最后一个回复创建后%{count}分钟后自动锁定。不再允许添加新回复。
     autoclosed_disabled_days:
-      other: "该主题开启 %{count} 天后将自动关闭。"
+      other: 该主题开启 %{count} 天后将自动关闭。
     autoclosed_disabled_hours:
-      other: "该主题开启 %{count} 小时后将自动关闭。"
+      other: 该主题开启 %{count} 小时后将自动关闭。
     autoclosed_disabled_minutes:
-      other: "该主题开启 %{count} 分钟后将自动关闭。"
+      other: 该主题开启 %{count} 分钟后将自动关闭。
     autoclosed_disabled_lastpost_days:
-      other: "该主题将在最后一个回复 %{count} 天后自动关闭。"
+      other: 该主题将在最后一个回复 %{count} 天后自动关闭。
     autoclosed_disabled_lastpost_hours:
-      other: "该主题将在最后一个回复 %{count} 小时后自动关闭。"
+      other: 该主题将在最后一个回复 %{count} 小时后自动关闭。
     autoclosed_disabled_lastpost_minutes:
-      other: "该主题将在最后一个回复 %{count} 分钟后自动关闭。"
+      other: 该主题将在最后一个回复 %{count} 分钟后自动关闭。
     autoclosed_disabled: "本主题是开放的，可以添加新的回复。"
     autoclosed_disabled_lastpost: "本主题现在开放了。可以添加新的回复。"
     pinned_enabled: "本主题已置顶，它将始终显示在它所属分类的顶部。可由管理人员对所有人解除置顶，或者由用户自己取消置顶。"
@@ -1494,9 +1452,9 @@ zh_CN:
       same_ip_address: "同一IP地址(%{ip_address})如其他用户"
   flags_reminder:
     flags_were_submitted:
-      other: "标志已经提交%{count}小时前。[请审核他们](/admin/flags)。"
+      other: 标志已经提交%{count}小时前。[请审核他们](/admin/flags)。
     subject_template:
-      other: "%{count} 个标记需要被处理"
+      other: '%{count} 个标记需要被处理'
   unsubscribe_mailer:
     title: "取消订阅发件人"
     subject_template: "确认你不想要收到%{site_title}的电子邮件更新"
@@ -1608,47 +1566,6 @@ zh_CN:
   test_mailer:
     title: "测试发件人"
     subject_template: "[%{email_prefix}] 邮件可达性测试"
-    text_body_template: |
-      这是一封测试电子邮件，发自：
-
-      [**%{base_url}**][0]
-
-      电子邮件分发很复杂。以下是一些你应该检查的重点：
-
-      - 确定你在站点设置中为 `notification email` 设置了正确的地址。**这是系统发送邮件里的“发自”地址，并需要你的域名配置正确以供相关验证。**。
-
-      - 学习使用邮件客户端查看电子邮件源代码，这样你可以通过查看邮件头部来排查重要线索。在 Gmail 中，可以通过每一封邮件下拉菜单中的“显示原始私信”来查看。
-
-      - **重要：** 你的 ISP 是否对你发送邮件的域名和 IP 作了反向 DNS 解析？你可以在此[测试你的反向枚举指针（PTR）记录][2]。如果你的 ISP 没有设置正确的反向 DNS 记录，那么很可能你的任何电子邮件都不会被成功发送。
-
-      - 你的域名的[发件人策略框架（SPF）记录][8]是否正确？你可以在此[测试你的SPF记录][1]。注意 TXT 是一种正确的官方 SPF 记录。
-
-      - 你域名的[域名密钥身份识别邮件（DKIM）记录][3]设置是否正确？这将显著提高邮件分发的成功率。在此[测试你的 DKIM 记录][7]。
-
-      - 如果你自己运行邮件服务器，检查确认你发送电子邮件的服务器 IP [不在任何邮件黑名单中][4]。验证你的 DNS 记录的 HELO 私信中设置了符合要求的主机名。如果没有，那么会导致很多邮件服务商拒收你的邮件。
-
-      - 我们强烈建议你**发送测试邮件至 [mail-tester.com][mt]**，这样可以检查上述设置是否正确。
-
-      （最简单的方法是在 [SendGrid][sg]、[SparkPost][sp]、[Mailgun][mg] 和 [Mailjet][mj]注册免费账户，他们的免费账户对一个小社区是足够的。不过你仍然需要在 DNS 设置中设定 SPF 和 DKIM 记录！）
-
-      我们衷心希望你成功完成邮件发送测试！
-
-      祝好运！
-
-      你的朋友，[Discourse](http://www.discourse.org)
-
-      [0]: %{base_url}
-      [1]: http://www.kitterman.com/spf/validate.html
-      [2]: http://mxtoolbox.com/ReverseLookup.aspx
-      [3]: http://www.dkim.org/
-      [4]: http://whatismyipaddress.com/blacklist-check
-      [7]: https://www.mail-tester.com/spf-dkim-check
-      [8]: http://www.openspf.org/SPF_Record_Syntax
-      [sg]: https://sendgrid.com/
-      [sp]: https://www.sparkpost.com/
-      [mg]: http://www.mailgun.com/
-      [mj]: https://www.mailjet.com/pricing
-      [mt]: http://www.mail-tester.com/
   new_version_mailer:
     title: "新版本发件人"
     subject_template: "[%{email_prefix}] 新 Discourse 版本可供升级"
@@ -1693,7 +1610,7 @@ zh_CN:
     deferred: "感谢通知我们。我们正在调查情况。"
     deferred_and_deleted: "感谢通知我们。我们已经删除了帖子。"
   temporarily_closed_due_to_flags:
-    other: "因为大量社区成员的标记，这个主题被临时关闭 %{count} 小时。"
+    other: 因为大量社区成员的标记，这个主题被临时关闭 %{count} 小时。
   system_messages:
     private_topic_title: "主题 #%{id}"
     contents_hidden: "请访问帖子以查看内容。"
@@ -1796,7 +1713,6 @@ zh_CN:
         ```
     csv_export_succeeded:
       title: "成功导致CSV格式"
-      subject_template: "数据导出完成"
       text_body_template: |
         数据成功出成功！:dvd:
 
@@ -2041,7 +1957,7 @@ zh_CN:
     pending_users_reminder:
       title: "待审核用户提醒"
       subject_template:
-        other: "%{count} 个用户等待批准"
+        other: '%{count} 个用户等待批准'
       text_body_template: |
         有新注册的用户在访问论坛前需要被确认（或者拒绝）。
 
@@ -2069,7 +1985,7 @@ zh_CN:
     queued_posts_reminder:
       title: "待处理帖子提醒"
       subject_template:
-        other: "%{count} 个帖子等待审核"
+        other: '%{count} 个帖子等待审核'
       text_body_template: |
         你好，
 
@@ -2087,7 +2003,7 @@ zh_CN:
   user_notifications:
     previous_discussion: "之前的回复"
     reached_limit:
-      other: "注意：我们每天最多发送 %{count} 邮件。访问站点看看没被发送的消息。还有你很火！"
+      other: 注意：我们每天最多发送 %{count} 邮件。访问站点看看没被发送的消息。还有你很火！
     in_reply_to: "回复给"
     unsubscribe:
       title: "取消订阅"
@@ -2268,7 +2184,7 @@ zh_CN:
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
-        %{message}
+          %{message}
     account_suspended:
       title: "账户被禁用"
       subject_template: "[%{email_prefix}] 你的账户已经被禁用"
@@ -2298,6 +2214,8 @@ zh_CN:
         如果你没有试着用%{email}创建账户或者更改邮件，不要担心——你可以安全地忽略这封邮件。
 
         如果你有任何问题，[联系我们友善的工作人员](%{base_url}/about)。
+    account_second_factor_disabled:
+      title: "双重验证已停用"
     digest:
       why: "在你上次于%{last_seen_at}访问后，%{site_link}的新内容摘要。"
       since_last_visit: "自从你上次访问"
@@ -2328,6 +2246,8 @@ zh_CN:
 
         点击以下链接设置新密码：
         %{base_url}/u/password-reset/%{email_token}
+    email_login:
+      title: "用链接登录"
     set_password:
       title: "设置密码"
       subject_template: "[%{email_prefix}] 设置密码"
@@ -2384,21 +2304,6 @@ zh_CN:
     signup_after_approval:
       title: "在审批之后注册"
       subject_template: "你已经被 %{site_name} 论坛批准加入了！"
-      text_body_template: |
-        欢迎来到%{site_name}！
-
-        管理人员批准了你在%{site_name}的帐号。
-
-        点击下面的链接确认并激活你的新帐号：
-        %{base_url}/u/activate-account/%{email_token}
-
-        如果以上链接无法点击，请将它复制并粘贴到浏览器的地址栏。
-
-        %{new_user_tips}
-
-        我们相信任何时候[讨论应该文明](%{base_url}/guidelines)。
-
-        享受你的时光！
     signup:
       title: "注册"
       subject_template: "[%{email_prefix}] 确认你的新账户"
@@ -2584,141 +2489,6 @@ zh_CN:
       是的，法律很无聊，但是我们必须保护我们自己 &ndash; 引申开来，你和你的数据 &ndash; 用于针对不友好的家伙们。我们有一个[使用条款](/tos)描述你的（以及我们）关于内容、隐私和法律的行为和权力。要使用我们的服务，你必须同意遵守[使用条款](/tos)。
   tos_topic:
     title: "服务条款"
-    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: "隐私政策"
     body: |
@@ -2811,22 +2581,22 @@ zh_CN:
         该徽章授予给第一次编辑自己帖子的你。虽然你不能永远在编辑自己的帖子，但是编辑他们总是一个好办法——你可以改进你的帖子、修正小错误，或者是增补你原来没有写的内容。编辑能让你的帖子质量变得更好！
     basic_user:
       name: 初级用户
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">授予</a>所有常用社区功能
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">授予</a>所有常用社区功能"
       long_description: |
         该徽章授予给用户等级达到 1 的成员。感谢你在社区里花了一些时间并且阅读了一些帖子，了解了我们的社区。你的新用户限制已经被取消；并且你已经被授予了所有基本的社区权限，必须个人私信、标记、维基编辑和发布多张图片和多个链接的能力。
     member:
       name: 成员
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">授予</a>邀请、群组私信和更多的赞
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">授予</a>邀请、群组私信和更多的赞"
       long_description: |
         该徽章授予给达到用户等级 2 的你。感谢你在社区待了几周，真正融入到了社区中。你现在可以在你的用户页或者主题中邀请他人或者创建群组私信了。每天你也可以点更多次赞了。
     regular:
       name: 活跃用户
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">授予</a>重分类、重命名、跟踪链接、维基功能和更多的赞
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">授予</a>重分类、重命名、跟踪链接、维基功能和更多的赞"
       long_description: |
         该徽章授予给达到用户等级 3 的你。感谢你在这几个月持续地参与社区。你现在是我们之中最活跃的读者之一了，你持续的贡献极大地帮助了我们的社区。你现在可以社区待了几周，真正融入到了社区中。你现在可以重新分类或者重命名主题、使用能力强大的垃圾标记功能以及访问隐藏的贵宾分类了。而且每天你可以点更多次赞了。
     leader:
       name: 资深
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">授予</a>全局编辑、固定、锁定、存档、分割、合并和更多的赞
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">授予</a>全局编辑、固定、锁定、存档、分割、合并和更多的赞"
       long_description: |
         该徽章授予给达到用户等级 4 的你。你被管理人员选作了社区的领导力量，你用你的行动和言辞为社区树立了正面的形象。你现在可以修改所有帖子，使用常见的版主的主题管理功能，比如置顶、锁定、隐藏、存档、分割和合并功能。你每天可以点更多的赞了。
     welcome:
@@ -2836,7 +2606,7 @@ zh_CN:
         该徽章授予给帖子收到了第一个赞的成员。恭喜，有社区成员发现你发表的内容有意思、酷炫或者有用！
     autobiographer:
       name: 自传作者
-      description: 填写<a href="%{base_uri}/my/preferences/profile">用户资料</a>信息
+      description: "填写<a href=\"%{base_uri}/my/preferences/profile\">用户资料</a>信息"
       long_description: |
         该徽章授予给填写了<a href="%{base_uri}/my/preferences/profile">用户资料页</a>并设置了用户头像的你。让社群成员们多了解你一点以及你感兴趣的内容，能帮助我们打造一个更好、更团结的社群。让我们一起努力！
     anniversary:
@@ -2903,8 +2673,6 @@ zh_CN:
     promoter:
       name: 推广者
       description: 已邀请了 1 个用户
-      long_description: |
-        该徽章授予给邀请他人加入社区的你。你曾使用了用户页面的邀请按钮或主题底部的邀请按钮。邀请对某个讨论感兴趣的朋友是引介新人的好办法，非常感谢！
     campaigner:
       name: 活动家
       description: 已邀请了 3 个初级用户
@@ -2933,7 +2701,7 @@ zh_CN:
         该徽章授予给第一次在回复中引用帖子的你。在你的回复中引用之前帖子中的相关的段落将把主题关联在一起并切题。只要选中别的帖子中的任何文字，然后点击回复按钮将可以引用啦。多引用一些吧！
     read_guidelines:
       name: 阅读指引
-      description: 阅读<a href="%{base_uri}/guidelines">社群指引</a>
+      description: "阅读<a href=\"%{base_uri}/guidelines\">社群指引</a>"
       long_description: |
         该徽章授予给<a href="%{base_uri}/guidelines">阅读了社群指引</a>的你。遵守和分享简单的指引能让我们打造一个稳定、有趣和可持续的社群。永远记住别人，一个和你有很多共同点的人，就在屏幕的那一侧。友好一些！
     reader:
@@ -3004,8 +2772,6 @@ zh_CN:
     first_emoji:
       name: 首个表情
       description: 在帖子中使用表情符号
-      long_description: |
-        该徽章授予给第一次在帖子中使用 Emoji 的你 :thumbsup:。Emoji 让你在帖子中表达快乐 :smiley:、悲伤 :anguished:、愤怒 :angry: 以及任何东西 :sunglasses:。输入 :（冒号）或在编辑器中的 Emoji 工具栏中选择吧 :ok_hand:
     first_mention:
       name: 首次提及
       description: 帖子中提及用户
@@ -3039,7 +2805,6 @@ zh_CN:
     badge_title_metadata: "%{site_title}的%{display_name}徽章"
   admin_login:
     success: "邮件已发送"
-    error: "错误！"
     email_input: "管理员邮件"
     submit_button: "发送邮件"
   performance_report:
@@ -3184,6 +2949,3 @@ zh_CN:
         description: |
           <p>如果你觉得需要修改这些设置，访问<a href='/admin' target='_blank'>管理员分块</a>；你可以在站点菜单找到扳手图标旁找到。</p>
           <p>祝你玩得开心，还有祝你<a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>建设新社区好运！</a></p>
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index 1f838e50f3c..f2ac0db6937 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -17,12 +17,12 @@ zh_TW:
       date_only: "%Y年%m月%d日"
       long: "%Y年%m月%d日%H:%M"
   date:
-    month_names: [null, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月]
+    month_names: [~, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "上午"
     pm: "下午"
-    <<: *datetime_formats
   title: "論壇"
   topics: "討論話題"
   posts: "文章"
@@ -63,19 +63,18 @@ zh_TW:
       present: 必須空白
       confirmation: "不匹配 %{attribute}"
       empty: 不能空白
-      equal_to: 必須等於 %{count}
+      equal_to: "必須等於 %{count}"
       even: 必須是雙數
       exclusion: 被保留
-      greater_than: 必須大於 %{count}
-      greater_than_or_equal_to: 必須大於或等於 %{count}
+      greater_than: "必須大於 %{count}"
+      greater_than_or_equal_to: "必須大於或等於 %{count}"
       has_already_been_used: "已經被使用"
       inclusion: 不包括在這列表中
       invalid: 無效的
       is_invalid: "似乎不清楚，這是完整的句子嗎？"
       contains_censored_words: "包含下列過濾詞彙: %{censored_words}"
-      matches_censored_pattern: "包含下列過濾詞彙（依照站方設定的正規表達式 %{censored_words}）"
-      less_than: 必須少於 %{count}
-      less_than_or_equal_to: 必須少於或等於 %{count}
+      less_than: "必須少於 %{count}"
+      less_than_or_equal_to: "必須少於或等於 %{count}"
       not_a_number: 不是數字
       not_an_integer: 必須是整數
       odd: 必須是單數
@@ -103,6 +102,9 @@ zh_TW:
       max_username_length_range: "你不能設定「最大」小於「最小」。"
       default_categories_already_selected: "不能選擇一個已經用於另一個列表的分類。"
       s3_upload_bucket_is_required: "你沒有填寫“s3_upload_bucket”，不能開啟上傳至 S3。"
+  activemodel:
+    errors:
+      <<: *errors
   invite:
     not_found: "您的邀請碼無效。請聯絡管理人員。"
     user_exists: "無需邀請 <b>%{email}</b>，他 <a href='/u/%{username}/summary'>已經有帳號了</a>！"
@@ -123,7 +125,7 @@ zh_TW:
   reading_time: "閱讀時間"
   likes: "個讚"
   too_many_replies:
-    other: "我們非常抱歉，新用戶被臨時限制在同一個主題上，只能回覆 %{count} 次"
+    other: 我們非常抱歉，新用戶被臨時限制在同一個主題上，只能回覆 %{count} 次
   embed:
     start_discussion: "開始討論"
     continue: "繼續討論"
@@ -133,29 +135,28 @@ zh_TW:
     no_hosts: "未設置內嵌用的主機。"
     configure: "配置嵌入"
     more_replies:
-      other: "%{count} 個更多回覆"
+      other: '%{count} 個更多回覆'
     loading: "討論串載入中⋯"
     permalink: "永久連結"
     imported_from: "這是一個已從原 %{link} 中分離的主題"
     in_reply_to: "▶ %{username}"
     replies:
-      other: "%{count} 個回覆"
+      other: '%{count} 個回覆'
   no_mentions_allowed: "抱歉，您無法提及其他用戶。"
   too_many_mentions:
-    other: "抱歉，您的文章中只能提及 %{count} 位用戶。"
+    other: 抱歉，您的文章中只能提及 %{count} 位用戶。
   no_mentions_allowed_newuser: "抱歉，新用戶不能提及其他用戶。"
   too_many_mentions_newuser:
-    other: "抱歉，新使用者在文章中只能提及 %{count} 位用戶。"
+    other: 抱歉，新使用者在文章中只能提及 %{count} 位用戶。
   no_images_allowed: "抱歉，新用戶不能在貼文中放置圖片。"
   too_many_images:
-    other: "抱歉，新使用者只能在文章中放置 %{count} 張圖片。"
+    other: 抱歉，新使用者只能在文章中放置 %{count} 張圖片。
   no_attachments_allowed: "抱歉，新用戶不能在貼文中放置附件。"
   too_many_attachments:
-    other: "抱歉，新使用者只能在文章中放置 %{count} 個附件。"
+    other: 抱歉，新使用者只能在文章中放置 %{count} 個附件。
   no_links_allowed: "抱歉，新用戶不能在貼文中放置連結。"
   too_many_links:
-    other: "抱歉，新使用者只能在文章中放置 %{count} 個連結。"
-  contains_blocked_words: "你的文章包含禁用的字詞"
+    other: 抱歉，新使用者只能在文章中放置 %{count} 個連結。
   spamming_host: "抱歉，你不能張貼該網站之連結。"
   user_is_suspended: "被停權的用戶無法張貼文章。"
   topic_not_found: "出現問題。也許這個話題被關閉或刪除。"
@@ -181,7 +182,6 @@ zh_TW:
     top: "熱門討論話題"
     top_weekly: "每週最佳話題"
     posts: " 最近文章"
-    private_posts: "最新的私人訊息"
     group_posts: "%{group_name} 的最新貼文"
     group_mentions: "%{group_name} 的最近提及"
     user_posts: "@%{username} 的最新貼文"
@@ -195,7 +195,6 @@ zh_TW:
   groups:
     errors:
       can_not_modify_automatic: "你不能修改自動組"
-      member_already_exist: "'%{username}' 已經是群組成員了。"
       invalid_domain: "'%{domain}' 不是有效的域名."
       invalid_incoming_email: "「%{email}」不是有效的電子郵件位址。"
       email_already_used_in_group: "「%{email}」已經被「%{group_name}」群組使用。"
@@ -212,8 +211,8 @@ zh_TW:
       trust_level_4: "信任等級 4"
   education:
     until_posts:
-      other: "%{count} 篇文章"
-    new-topic: |
+      other: '%{count} 篇文章'
+    'new-topic': |
       歡迎來到%{site_name} &mdash; **衷心感謝你參與討論！**
 
       - 標題是否清晰明了地描述了主題？看起來有意思麼？
@@ -223,7 +222,7 @@ zh_TW:
       - 選擇恰當的詞句以便別人能找到你的主題。若想要給主題分組，選擇一個分類。
 
       更多的幫助信息，[請查看我們的社群準則](/guidelines)。此信息面板只在你發佈前 %{education_posts_text}時顯示。
-    new-reply: |
+    'new-reply': |
       歡迎來到 %{site_name} — **感謝你的參與！**
 
       - 你的回應是否以某些方式改善了討論？
@@ -270,12 +269,6 @@ zh_TW:
       非常抱歉，新使用者有只能回覆同一話題 %{newuser_max_replies_per_topic} 次的臨時限制。
 
       除了繼續回覆外，請考慮修改你先前的回應，或參與其他話題。
-    reviving_old_topic: |
-      ### 討論串考古？
-
-      這個主題中最新的回應已經是 **%{days} 天** 前的事情了。你的回應會讓主題跳到最上方，並且通知所有曾參與過討論的人。
-
-      你確定你想要喚醒這個舊主題嗎？
   activerecord:
     attributes:
       category:
@@ -288,13 +281,12 @@ zh_TW:
       user_profile:
         bio_raw: "關於我"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
             base:
-              warning_requires_pm: "你只能附加警告於私人訊息。"
               too_many_users: "你只能同時傳送警告給一位使用者。"
-              cant_send_pm: "抱歉，你不能向該用戶發送私人訊息。"
               no_user_selected: "你必須選擇有效用戶。"
             featured_link:
               invalid: "不合法。URL 應包括 http:// 或 https://。"
@@ -321,7 +313,6 @@ zh_TW:
           attributes:
             name:
               taken: 已被其他表情符號使用
-      <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>你的個人檔案中，「關於我」的部分目前還沒有內容，<a href='/u/%{username_lower}/preferences/about-me'>不如來自我介紹一下吧？</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} 尚未在他/她自我簡介中的“關於我”部分填寫任何資訊</div>"
@@ -337,41 +328,41 @@ zh_TW:
     title: "歡迎來到 Discourse"
     body: |2
 
-      置頂主題的第一段是訪客在主頁看到的歡迎消息。這很重要！
+        置頂主題的第一段是訪客在主頁看到的歡迎消息。這很重要！
 
-      **編輯**它作為社群的簡要介紹：
+        **編輯**它作為社群的簡要介紹：
 
-      - 什麼人想參與？
-      - 他們能在這找到什麼？
-      - 為什麼他們要來這？
-      - 他們能在哪裡閲讀更多的內容（連結、資源等）？
+        - 什麼人想參與？
+        - 他們能在這找到什麼？
+        - 為什麼他們要來這？
+        - 他們能在哪裡閲讀更多的內容（連結、資源等）？
 
-      <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+        <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
 
-      你可能想要在管理 :wrench: （右上角）中關閉這個主題，這樣回覆就不會積壓在這個通告下。
+        你可能想要在管理 :wrench: （右上角）中關閉這個主題，這樣回覆就不會積壓在這個通告下。
   lounge_welcome:
     title: "歡迎來到貴賓室"
     body: |2
 
-      恭喜！ :confetti_ball:
+        恭喜！ :confetti_ball:
 
-      如果你看到了這個主題，說明你已經被提升至**常規**（信任等級3）了。
+        如果你看到了這個主題，說明你已經被提升至**常規**（信任等級3）了。
 
-      你現在可以&hellip;
+        你現在可以&hellip;
 
-      * 編輯任何主題的標題
-      * 改變任何主題的分類
-      * 讓你的連結設置為 follow 屬性（[自動 nofollow](http://en.wikipedia.org/wiki/Nofollow)限制已經移除）
-      * 訪問一個只有信任等級3及更高才能見到的貴賓室分類
-      * 一次標記即可隱藏垃圾信息
+        * 編輯任何主題的標題
+        * 改變任何主題的分類
+        * 讓你的連結設置為 follow 屬性（[自動 nofollow](http://en.wikipedia.org/wiki/Nofollow)限制已經移除）
+        * 訪問一個只有信任等級3及更高才能見到的貴賓室分類
+        * 一次標記即可隱藏垃圾信息
 
-      這裡是[目前達到常規的用戶列表](/badges/3/regular)。一定要來問個好！
+        這裡是[目前達到常規的用戶列表](/badges/3/regular)。一定要來問個好！
 
-      感謝成為社群的重要一員！
+        感謝成為社群的重要一員！
 
-      （想瞭解關於信任等級的更多信息，[參見這個主題][trust]。請注意成員需要在將來也維持一定的選擇條件的成員才能保持在常規。）
+        （想瞭解關於信任等級的更多信息，[參見這個主題][trust]。請注意成員需要在將來也維持一定的選擇條件的成員才能保持在常規。）
 
-      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "對於分類：%{category} 的定義"
     replace_paragraph: "（將第一段話修改成你的新分類的簡述。這段文字將出現在用戶選擇分類的地方，所以嘗試保持在 200 個字元內。 **除非你編輯了這段文字或者在這分類中創建了主題，這個分類不會出現在分類頁面中。**）"
@@ -387,7 +378,7 @@ zh_TW:
       uncategorized: "不能刪除該分類"
       has_subcategories: "不能刪除該分類，因為它有子分類"
       topic_exists:
-        other: "不能刪除該分類，因為它有 %{count} 個話題，最老的話題是 %{topic_link}"
+        other: 不能刪除該分類，因為它有 %{count} 個話題，最老的話題是 %{topic_link}
       topic_exists_no_oldest: "不能刪除該分類，因為有 %{count} 個話題"
     uncategorized_description: "不需要分類或者不適合放在現在的任何分類中的主題。"
   trust_levels:
@@ -403,78 +394,61 @@ zh_TW:
       title: "資深"
     change_failed_explanation: "你嘗試將%{user_name}降至%{new_trust_level}。然而他們的信任等級已經是%{current_trust_level}。%{user_name}將仍處于%{current_trust_level}——如果你想要降級用戶，先鎖定信任等級。"
   rate_limiter:
-    slow_down: "您這個動作重複太多次，請稍後再試。"
-    too_many_requests: "你的瀏覽速度過於頻繁，請等待 %{time_left} 後再試。"
-    by_type:
-      first_day_replies_per_day: "你回帖的數量已經超出身為新用戶當天允許的上限，請等待%{time_left}之後再試。"
-      first_day_topics_per_day: "你創建新主題的數量已經超出身為新用戶當天允許的上限，請等待%{time_left}之後再試。"
-      create_topic: "您創建討論話題過於倉猝。請稍等 %{time_left} 再試一次。"
-      create_post: "你的回覆過快。請等待%{time_left}再重試。"
-      delete_post: "您刪除討論話題過於倉猝。請稍待 %{time_left} 後再試一次。"
-      public_group_membership: "您加入/離開群組過於頻繁。請稍等 %{time_left} 後再試一次。"
-      topics_per_day: "您今天新發佈的討論話題已經達到上限。請稍待 %{time_left} 後再試一次。"
-      pms_per_day: "您今天發表的訊息數已經達到上限。請等待 %{time_left} 後再行嘗試。"
-      create_like: "您今天給予讚的次數已經達到上限。請等待 %{time_left} 再行嘗試。"
-      create_bookmark: "您今天加入書籤的數目已經達到上限。請等待 %{time_left} 再行嘗試。"
-      edit_post: "您已達到單日編輯次數上限。請等待 %{time_left} 後再行嘗試。"
-      live_post_counts: "您要求的即時文章計數過於快速。請等待 %{time_left} 再行嘗試。"
-      unsubscribe_via_email: "你已經達到了今日用郵件解除訂閲的最大數量限制。請等待%{time_left}之後再試。"
-      topic_invitations_per_day: "你已經達到了今日主題邀請的最大數量限制。請等待%{time_left}之後再試。"
     hours:
-      other: "%{count} 小時"
+      other: '%{count} 小時'
     minutes:
-      other: "%{count} 分"
+      other: '%{count} 分'
     seconds:
-      other: "%{count} 秒"
+      other: '%{count} 秒'
   datetime:
     distance_in_words:
       half_a_minute: "< 1分"
       less_than_x_seconds:
-        other: "< %{count} 秒鐘"
+        other: < %{count} 秒鐘
       x_seconds:
-        other: "%{count} 秒"
+        other: '%{count} 秒'
       less_than_x_minutes:
-        other: "< %{count} 分鐘"
+        other: < %{count} 分鐘
       x_minutes:
-        other: "%{count} 分鐘"
+        other: '%{count} 分鐘'
       about_x_hours:
-        other: "%{count} 小時"
+        other: '%{count} 小時'
       x_days:
-        other: "%{count} 天"
+        other: '%{count} 天'
       about_x_months:
-        other: "%{count} 月"
+        other: '%{count} 月'
       x_months:
-        other: "%{count} 月"
+        other: '%{count} 月'
       about_x_years:
-        other: "%{count} 年"
+        other: '%{count} 年'
       over_x_years:
-        other: "> %{count} 年"
+        other: '> %{count} 年'
       almost_x_years:
-        other: "%{count} 年"
+        other: '%{count} 年'
     distance_in_words_verbose:
       half_a_minute: "剛剛"
       less_than_x_seconds:
-        other: "剛才"
+        other: 剛才
       x_seconds:
-        other: "%{count} 秒前"
+        other: '%{count} 秒前'
       less_than_x_minutes:
-        other: "不到 %{count} 分鐘前"
+        other: 不到 %{count} 分鐘前
       x_minutes:
-        other: "%{count} 分鐘前"
+        other: '%{count} 分鐘前'
       about_x_hours:
-        other: "%{count} 小時前"
+        other: '%{count} 小時前'
       x_days:
-        other: "%{count} 天前"
+        other: '%{count} 天前'
       about_x_months:
-        other: "約 %{count} 個月前"
+        other: 約 %{count} 個月前
       x_months:
-        other: "%{count} 個月前"
+        other: '%{count} 個月前'
       about_x_years:
-        other: "約 %{count} 年前"
+        other: 約 %{count} 年前
       over_x_years:
-        other: "超過 %{count} 年前"
+        other: 超過 %{count} 年前
       almost_x_years:
-        other: "約 %{count} 年前"
+        other: 約 %{count} 年前
   password_reset:
     no_token: "抱歉，密碼修改連結已過期。選擇登錄按鈕再使用“我忘記了密碼”獲得一個新連結。"
     choose_new: "選擇一個新密碼"
@@ -521,7 +495,6 @@ zh_TW:
       long_form: '投訴為不當內容'
     notify_user:
       title: '給 @{{username}} 送出一則訊息'
-      description: '我想要直接且私下地和這位朋友討論其文章。'
       long_form: '傳訊給用戶'
       email_title: '你的文章在"%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -611,9 +584,7 @@ zh_TW:
       xaxis: "天"
       yaxis: "瀏覽量"
     signups:
-      title: "新用戶"
       xaxis: "天"
-      yaxis: "新用戶數量"
     profile_views:
       title: "查看用戶資料"
       xaxis: "天"
@@ -651,7 +622,6 @@ zh_TW:
       xaxis: "天"
       yaxis: "郵件數量"
     user_to_user_private_messages:
-      title: "用戶對用戶"
       xaxis: "天"
       yaxis: "訊息數量"
     system_private_messages:
@@ -698,7 +668,6 @@ zh_TW:
       xaxis: "天"
       yaxis: "Web 爬蟲頁面訪問"
     page_view_total_reqs:
-      title: "總數"
       xaxis: "天"
       yaxis: "總瀏覽量"
     page_view_logged_in_mobile_reqs:
@@ -762,27 +731,22 @@ zh_TW:
     failing_emails_warning: '有 %{num_failed_jobs} 個郵件任務失敗。請檢查 app.yml 檔案是否正確配置了郵件伺服器。<a href="/sidekiq/retries" target="_blank">查看 Sidekiq 中失敗的任務</a>。'
     subfolder_ends_in_slash: "你的子目錄設置不正確；DISCOURSE_RELATIVE_URL_ROOT以斜杠結尾。"
     email_polling_errored_recently:
-      other: "郵件輪詢在過去的 24 小時內出現了 %{count} 個錯誤。看一看<a href='/logs' target='_blank'>日誌</a>尋找詳情。"
-    missing_mailgun_api_key: "伺服器設置使用 Mailgun 寄送電子郵件，但你尚未設置用來驗證 webhook 訊息的 API 密鑰。"
+      other: 郵件輪詢在過去的 24 小時內出現了 %{count} 個錯誤。看一看<a href='/logs' target='_blank'>日誌</a>尋找詳情。
     bad_favicon_url: "網站表徵圖無法載入。檢查<a href='/admin/site_settings'>站點設置</a>中的 favicon_url。"
     poll_pop3_timeout: "至 POP3 伺服器的連接超時。無法獲取進站郵件。請檢查<a href='/admin/site_settings/category/email'>POP3 設置</a>和服務商。"
     poll_pop3_auth_error: "至 POP3 伺服器的連接驗證失敗。請檢查<a href='/admin/site_settings/category/email'>POP3 設置</a>。"
   site_settings:
     censored_words: "將被自動替換為 &#9632;&#9632;&#9632;&#9632;"
-    censored_pattern: "正則表達式將自動被替換為&#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "自動刪除被隱藏超過 30 天的帖子。"
-    default_locale: "Discourse 執行個體 (instance) 的預設語言編碼 (ISO 639-1)"
     allow_user_locale: "允許用戶選擇自己的語言介面"
     set_locale_from_accept_language_header: "為未登錄用戶按照他們的瀏覽器發送的請求頭部設置界面語言。（實驗性，無法和匿名緩存共同使用）"
     min_post_length: "文章允許的最小文字數"
     min_first_post_length: "第一篇文章允許的最少文字數"
-    min_private_message_post_length: "私訊允許的最小文字數"
     max_post_length: "文章允許的最大文字數"
     topic_featured_link_enabled: "允許發連結帖。"
     show_topic_featured_link_in_digest: "在摘要郵件中顯示主題特色連結。"
     min_topic_title_length: "標題允許的最小文字數"
     max_topic_title_length: "標題允許的最大文字數"
-    min_private_message_title_length: "標題允許的最小文字數"
     min_search_term_length: "搜尋條件允許的最小文字數"
     search_tokenize_chinese_japanese_korean: "在非中/日/韓語站點強制切割中/日/韓語搜索分詞"
     search_prefer_recent_posts: "如果搜索大型論壇較慢，這個選項將優先嘗試最新的帖子"
@@ -830,7 +794,6 @@ zh_TW:
     summary_likes_required: "如果使用了\"此話題的摘用\"，話題顯示時需滿足最小得到\"讚\"的數量"
     summary_percent_filter: "當用戶點擊 \"此話題的摘要\"，顯示前面多少 % 的文章"
     summary_max_results: "“概括主題”返回的最大帖子數量"
-    enable_private_messages: "允許信任等級1（可以另外選擇發送消息的信任等級）的用戶創建消息和回覆消息。注意：管理人員不受限制。"
     enable_long_polling: "啟用消息匯流排使通知功能可以使用長輪詢（long polling）"
     long_polling_base_url: "長輪詢的基本 URL（當用 CDN 分發動態內容，請設置此至原始拉取地址）例如：http://origin.site.com"
     long_polling_interval: "當沒有數據向客戶端發送時伺服器端應等待的時間（僅對已登錄用戶有效）"
@@ -884,7 +847,6 @@ zh_TW:
     version_checks: "訪問 Discourse Hub 來檢查版本更新，並在管理面板 /admin 顯示新版本訊息"
     new_version_emails: "當新版本發佈時，將會發送一封新的 EMail 至 contact_email 設定的位址"
     invite_expiry_days: "多少天以內用戶的邀請碼是有效的"
-    invite_passthrough_hours: "邀請號碼如已被使用，用戶仍可使用多少小時"
     login_required: "需要登入才能進入網站，不允許匿名操作"
     min_username_length: "最短用戶名長度。警告：如果任何現有帳號或群組名稱短於此，你的網站會炸掉。"
     max_username_length: "最長用戶名長度。警告：如果任何現有帳號或群組名稱長於此，你的網站會炸掉。"
@@ -903,7 +865,6 @@ zh_TW:
     sso_overrides_avatar: "用 SSO 訊息中的外部網站頭像覆蓋用戶頭像。如果啟用，建議禁用 allow_uploaded_avatars"
     sso_not_approved_url: "重定向未受許可的單點登錄賬號至這個 URL"
     sso_allows_all_return_paths: "不限制 SSO 提供的 return_paths 中的域名（預設情況下返回地址必須位於當前站點）"
-    enable_local_logins: "啟用網站用戶名稱和密碼驗證 ( 注意：這必須啟用邀請才能有動作 )"
     allow_new_registrations: "允許新用戶註冊，如果取消選取，則沒有人能夠註冊"
     enable_signup_cta: "顯示推薦創建賬戶的提示給那些回訪的未註冊用戶。"
     enable_yahoo_logins: "啟用雅虎（Yahoo）帳號驗證登入"
@@ -911,15 +872,12 @@ zh_TW:
     google_oauth2_client_id: "你的 Google 應用程式的客戶端 ID"
     google_oauth2_client_secret: "你的 Google 應用程式的客戶端 secret"
     enable_twitter_logins: "啟用推特（Twitter）帳號驗證登入，需要 twitter_consumer_key 和 twitter_consumer_secret"
-    twitter_consumer_key: "推特帳號驗證的客戶密匙（Consumer key），到 http://dev.twitter.com 來註冊獲取"
-    twitter_consumer_secret: "推特帳號驗證的客戶密碼（Consumer secret），到 http://dev.twitter.com 來註冊獲取"
     enable_instagram_logins: "啟用 Instagram 驗證，需要 instagram_consumer_key 和 instagram_consumer_secret"
     instagram_consumer_key: "Instagram 驗證的 Consumer key"
     instagram_consumer_secret: "Instagram 驗證的 Consumer secret"
     enable_facebook_logins: "啟用臉書（Facebook）帳號驗證登入，需要 facebook_app_id 和 facebook_app_secret"
     facebook_app_id: "臉書帳號驗證的應用帳號（App id），到 https://developers.facebook.com/apps 來註冊獲取"
     facebook_app_secret: "臉書帳號驗證的應用密碼（App secret），到 https://developers.facebook.com/apps 來註冊獲取"
-    facebook_request_extra_profile_details: "從 Facebook 中請求關於我、地點和網站。（需要 Facebook 許可你的登錄應用）"
     enable_github_logins: "啟用 Github 帳號驗證登入，需要 github_client_id 和 github_client_secret"
     github_client_id: "Github 帳號驗證的用戶端帳號（Client id），到 https://github.com/settings/applications 來註冊獲取"
     github_client_secret: "Github 帳號驗證的用戶端密碼（Client secret），到 https://github.com/settings/applications 來註冊獲取"
@@ -927,7 +885,6 @@ zh_TW:
     allow_restore: "允許還原資料，注意此動作可能覆蓋「所有」網站資料！除非你計畫還原備份檔，否則請保持此設定為 false"
     maximum_backups: "磁碟備份的最大數量，舊的將會自動刪除"
     automatic_backups_enabled: "按照定義的備份頻率運行自動備份計劃"
-    backup_frequency: "自動創建站點備份的頻率，以天為單位。"
     enable_s3_backups: "當完成備份後上傳備份到 S3。重要：需要在文件設定中填寫有效的 S3 驗證資料。"
     s3_backup_bucket: "遠端備份 bucket ，注意：請確定是私有的 bucket"
     s3_disable_cleanup: "當在本地刪除備份時不刪除 S3 上的備份。"
@@ -949,7 +906,6 @@ zh_TW:
     max_bookmarks_per_day: "每個用戶每天最多能建立\"書籤\"的數量"
     max_edits_per_day: "每個用戶每天最大的\"編輯次數\"的數量"
     max_topics_per_day: "每個用戶每天最多建立\"討論話題\"的數量"
-    max_private_messages_per_day: "用戶每天能建立訊息的數量上限"
     max_invites_per_day: "每個用戶每天最多能邀請用戶的數量。"
     max_topic_invitations_per_day: "每個用戶每天能創建的邀請至主題數量的最大值。"
     alert_admins_if_errors_per_minute: "觸發管理員警示的每分鐘錯誤數量。設為 0 會停用這個功能。注意：需要重啟。"
@@ -962,7 +918,6 @@ zh_TW:
     clean_orphan_uploads_grace_period_hours: "刪除孤立的上傳檔案的寬限期（單位：小時）"
     purge_deleted_uploads_grace_period_days: "徹底刪除孤立的上傳檔案的寬限期（單位：天）"
     enable_s3_uploads: "上傳至 Amazon S3 存儲的地址。重要：需要有效的 S3 驗證資料（包括 access key id & secret access key）。"
-    s3_use_iam_profile: '使用 AWS EC2 IAM 角色來獲得鑰匙。注意：啟用這個會覆蓋“S3 access key id”和“S3 secret access key” 設定。'
     s3_upload_bucket: "Amazon S3 保存上傳檔案的 bucket 名稱。警告：必須為小寫，不包含句點 (.) 與底線 (_)。"
     s3_access_key_id: "上傳至 Amazon S3 的 access key id，將用於上傳圖片"
     s3_secret_access_key: "上傳至 Amazon S3 的 secret access key，將用於上傳圖片"
@@ -1005,8 +960,6 @@ zh_TW:
     min_trust_to_edit_wiki_post: "編輯被標示為維基的文章所需之最低信任等級。"
     min_trust_to_edit_post: "能編輯帖子的最小信任等級。"
     min_trust_to_allow_self_wiki: "用戶將自己的帖子設置為維基模式的最低信任等級。"
-    min_trust_to_send_messages: "發送消息所需的最低信任等級。"
-    min_trust_to_send_email_messages: "透過郵件發送私訊給暫存使用者所需的最低信任等級"
     newuser_max_links: "新用戶可添加多少連結於一篇文章中"
     newuser_max_images: "新用戶可添加多少張圖片於一篇文章中"
     newuser_max_attachments: "新用戶可添加多少附件於一篇文章中"
@@ -1016,7 +969,6 @@ zh_TW:
     max_users_notified_per_group_mention: "當群組被提及時，接受提醒的最大用戶數 ( 超過閾值後將不發送提醒 )"
     create_thumbnails: "為太大而無法在帖子裡正常顯示的圖片創造縮略圖及 lightbox 圖片。"
     email_time_window_mins: "等待多少 (n) 分鐘才給用戶發送通知電子郵件，好讓他們有機會自己來編輯和完善他們的帖子。"
-    private_email_time_window_seconds: "等待多少（n）秒再給用戶發送通知電子郵件，這可以讓用戶有時間來編輯和完善他們的消息。"
     email_posts_context: "在通知電郵中包含的作為上下文的回覆數量。"
     flush_timings_secs: "刷新時間資料的頻率，以秒為單位"
     title_max_word_length: "在主題的標題中，允許的詞語長度的最大字元數。"
@@ -1172,13 +1124,11 @@ zh_TW:
     approve_post_count: "新用戶或基礎用戶需要被審核的帖子數量"
     approve_unless_trust_level: "該信任等級之下的用戶的帖子必須被審核"
     approve_new_topics_unless_trust_level: "低於該信任等級的用戶的新帖子需要被審核"
-    notify_about_queued_posts_after: "如果帖子在設定的小時數後仍在等候處理，發送一封郵件至 contact_email。設為 0 將禁用這些郵件。"
     auto_close_messages_post_count: "消息中貼子數上限，達到後自動關閉消息（0 為禁用）"
     auto_close_topics_post_count: "主題中貼子數上限，達到後自動關閉主題 ( 0 為禁用 )"
     code_formatting_style: "編輯器中的代碼格式化按鈕設置的預設格式"
     default_email_digest_frequency: "用戶收到摘要郵件的預設頻率。"
     default_include_tl0_in_digests: "在摘要郵件中預設包含新用戶的貼文。用戶可以自行在參數設置中更改這個設定。"
-    default_email_private_messages: "預設在有人發消息給用戶時發送一封郵件通知。"
     default_email_direct: "預設在有人引用、回覆、提及或者邀請用戶時發送一封郵件通知。"
     default_email_mailing_list_mode: "預設為每一個新帖子發送一封郵件通知。"
     default_email_mailing_list_mode_frequency: "郵件列表模式下，用戶收到郵件的預設頻率。"
@@ -1214,7 +1164,6 @@ zh_TW:
     max_tags_in_filter_list: "過濾下拉選單中顯示的標籤數上限。優先顯示最常用的標籤。"
     tags_sort_alphabetically: "按照字母順序顯示標籤。預設按流行度顯示。"
     tag_style: "標籤的視覺樣式。"
-    staff_tags: "只可由管理人員使用的標籤列表"
     min_trust_level_to_tag_topics: "給主題加標籤的最小信任等級"
     suppress_overlapping_tags_in_list: "如果標籤匹配了主題標題中的詞，不顯示該標籤"
     remove_muted_tags_from_latest: "在最新主題列表中，不顯示有靜音標籤的主題。"
@@ -1264,15 +1213,15 @@ zh_TW:
     not_seen_in_a_month: "歡迎回來！我們已經好久沒見到你了。這些是你不在時的最熱門主題。"
   merge_posts:
     edit_reason:
-      other: "%{username}合併了 %{count} 個帖子"
+      other: '%{username}合併了 %{count} 個帖子'
     errors:
       different_topics: "無法合並不同主題的帖子。"
       different_users: "無法合並不同用戶的帖子。"
   move_posts:
     new_topic_moderator_post:
-      other: "%{count} 個帖子被分離到了新主題：%{topic_link}"
+      other: '%{count} 個帖子被分離到了新主題：%{topic_link}'
     existing_topic_moderator_post:
-      other: "%{count} 個帖子被合併到現存主題：%{topic_link}"
+      other: '%{count} 個帖子被合併到現存主題：%{topic_link}'
   change_owner:
     post_revision_text: "所有權從 %{old_user} 轉移至 %{new_user}"
     deleted_user: "已經刪除的用戶"
@@ -1282,21 +1231,21 @@ zh_TW:
     closed_enabled: "此討論話題已關閉，不再接受新的回覆。"
     closed_disabled: "此討論話題已開放，可以發表新的回覆。"
     autoclosed_message_max_posts:
-      other: "消息中回覆已經達到上限 %{count}，自動鎖定。"
+      other: 消息中回覆已經達到上限 %{count}，自動鎖定。
     autoclosed_topic_max_posts:
-      other: "主題中回覆已經達到上限 %{count}，自動關閉。"
+      other: 主題中回覆已經達到上限 %{count}，自動關閉。
     autoclosed_enabled_days:
-      other: "該主題在創建%{count}天后自動關閉。不再允許添加新回覆。"
+      other: 該主題在創建%{count}天后自動關閉。不再允許添加新回覆。
     autoclosed_enabled_hours:
-      other: "該主題在創建%{count}小時後自動關閉。不再允許新的回覆。"
+      other: 該主題在創建%{count}小時後自動關閉。不再允許新的回覆。
     autoclosed_enabled_minutes:
-      other: "該主題在創建%{count}分鐘後自動關閉。不再允許新的回覆。"
+      other: 該主題在創建%{count}分鐘後自動關閉。不再允許新的回覆。
     autoclosed_enabled_lastpost_days:
-      other: "該主題在最後一個回覆創建後%{count}天后自動關閉。不再允許新的回覆。"
+      other: 該主題在最後一個回覆創建後%{count}天后自動關閉。不再允許新的回覆。
     autoclosed_enabled_lastpost_hours:
-      other: "該主題在最後一個回覆創建後%{count}小時後自動關閉。不再允許添加新回覆。"
+      other: 該主題在最後一個回覆創建後%{count}小時後自動關閉。不再允許添加新回覆。
     autoclosed_enabled_lastpost_minutes:
-      other: "本主題在最後一個回覆創建後%{count}分鐘後自動鎖定。不再允許添加新回覆。"
+      other: 本主題在最後一個回覆創建後%{count}分鐘後自動鎖定。不再允許添加新回覆。
     autoclosed_disabled: "此討論話題已開放，可以發表新的回覆。"
     autoclosed_disabled_lastpost: "本主題現在開放了。可以添加新的回覆。"
     pinned_enabled: "本主題已置頂，它將始終顯示在它所屬分類的頂部。可由管理人員對所有人解除置頂，或者由用戶自己取消置頂。"
@@ -1353,7 +1302,7 @@ zh_TW:
       domain_not_allowed: "網站無效。允許的域名有：%{domains}"
   flags_reminder:
     subject_template:
-      other: "%{count} 個標記需要被處理"
+      other: '%{count} 個標記需要被處理'
   unsubscribe_mailer:
     title: "取消訂閱 Mailer"
     subject_template: "確認你不想要收到%{site_title}的電子郵件更新"
@@ -1389,47 +1338,6 @@ zh_TW:
   test_mailer:
     title: "測試 Mailer"
     subject_template: "[%{email_prefix}] 電子郵件發送測試"
-    text_body_template: |
-      這是一封測試電子郵件，發自：
-
-      [**%{base_url}**][0]
-
-      電子郵件分發很複雜。以下是一些你應該檢查的重點：
-
-      - 確定你在站點設置中為 `notification email` 設置了正確的地址。**這是系統發送郵件裡的“發自”地址，並需要你的域名配置正確以供相關驗證。**。
-
-      - 學習使用郵件客戶端查看電子郵件原始碼，這樣你可以通過查看郵件頭部來排查重要線索。在 Gmail 中，可以通過每一封郵件下拉菜單中的“顯示原始消息”來查看。
-
-      - **重要：** 你的 ISP 是否對你發送郵件的域名和 IP 作了反向 DNS 解析？你可以在此[測試你的反向枚舉指針（PTR）記錄][2]。如果你的 ISP 沒有設置正確的反向 DNS 記錄，那麼很可能你的任何電子郵件都不會被成功發送。
-
-      - 你的域名的[發件人策略框架（SPF）記錄][8]是否正確？你可以在此[測試你的SPF記錄][1]。注意 TXT 是一種正確的官方 SPF 記錄。
-
-      - 你域名的[域名密鑰身份識別郵件（DKIM）記錄][3]設置是否正確？這將顯著提高郵件分發的成功率。在此[測試你的 DKIM 記錄][7]。
-
-      - 如果你自己運行郵件伺服器，檢查確認你發送電子郵件的伺服器 IP [不在任何郵件黑名單中][4]。驗證你的 DNS 記錄的 HELO 消息中設置了符合要求的主機名。如果沒有，那麼會導致很多郵件服務商拒收你的郵件。
-
-      - 我們強烈建議你**發送測試郵件至 [mail-tester.com][mt]**，這樣可以檢查上述設置是否正確。
-
-      （最簡單的方法是在 [SendGrid][sg]、[SparkPost][sp]、[Mailgun][mg] 和 [Mailjet][mj]註冊免費賬戶，他們的免費賬戶對一個小社群是足夠的。不過你仍然需要在 DNS 設置中設定 SPF 和 DKIM 記錄！）
-
-      我們衷心希望你成功完成郵件發送測試！
-
-      祝好運！
-
-      你的朋友，[Discourse](http://www.discourse.org)
-
-      [0]: %{base_url}
-      [1]: http://www.kitterman.com/spf/validate.html
-      [2]: http://mxtoolbox.com/ReverseLookup.aspx
-      [3]: http://www.dkim.org/
-      [4]: http://whatismyipaddress.com/blacklist-check
-      [7]: https://www.mail-tester.com/spf-dkim-check
-      [8]: http://www.openspf.org/SPF_Record_Syntax
-      [sg]: https://sendgrid.com/
-      [sp]: https://www.sparkpost.com/
-      [mg]: http://www.mailgun.com/
-      [mj]: https://www.mailjet.com/pricing
-      [mt]: http://www.mail-tester.com/
   new_version_mailer:
     title: "新版本 Mailer"
     subject_template: "[%{email_prefix}] 有可用的 Discourse 更新"
@@ -1448,7 +1356,7 @@ zh_TW:
     deferred: "感謝你讓我們知道。我們正在調查。"
     deferred_and_deleted: "感謝通知我們。我們已經刪除了帖子。"
   temporarily_closed_due_to_flags:
-    other: "這個話題因為大量的社群投訴暫時關閉 %{count} 小時。"
+    other: 這個話題因為大量的社群投訴暫時關閉 %{count} 小時。
   system_messages:
     post_hidden:
       title: "文章已隱藏"
@@ -1542,7 +1450,6 @@ zh_TW:
         ```
     csv_export_succeeded:
       title: "CSV 檔匯出成功"
-      subject_template: "資料匯出完成"
       text_body_template: |
         資料成功匯出了！:dvd:
 
@@ -1639,7 +1546,7 @@ zh_TW:
     pending_users_reminder:
       title: "待審用戶提醒"
       subject_template:
-        other: "%{count} 個用戶等待審核"
+        other: '%{count} 個用戶等待審核'
       text_body_template: |
         有新註冊的用戶在訪問論壇前需要被確認（或者拒絶）。
 
@@ -1671,7 +1578,7 @@ zh_TW:
   user_notifications:
     previous_discussion: "之前的回覆"
     reached_limit:
-      other: "注意：你達到了每日郵件限額（%{count}），到網站看看哪些訊息可能被延遲了。BTW，感謝你經營的這麼熱絡！"
+      other: 注意：你達到了每日郵件限額（%{count}），到網站看看哪些訊息可能被延遲了。BTW，感謝你經營的這麼熱絡！
     in_reply_to: "回覆給"
     unsubscribe:
       title: "取消訂閱"
@@ -1826,7 +1733,7 @@ zh_TW:
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
-        %{message}
+          %{message}
     digest:
       why: "在你上一次於 %{last_seen_at} 訪問後，在 %{site_link} 上的摘要。"
       since_last_visit: "自你上次訪問至今"
@@ -1913,21 +1820,6 @@ zh_TW:
     signup_after_approval:
       title: "在同意之後註冊"
       subject_template: "你已受到 %{site_name} 的認可！"
-      text_body_template: |
-        歡迎加入 %{site_name}！
-
-        管理員已通過你的帳號申請。
-
-        請點擊以下連結，以確認啟用你的新帳號：
-        %{base_url}/u/activate-account/%{email_token}
-
-        如果上面的連結無法點擊，請複製該連結，並貼到瀏覽器中開啟。
-
-        %{new_user_tips}
-
-        我們永遠相信[文明的社群行為](%{base_url}/guidelines)。
-
-        好好享受您在此的時光吧！
     signup:
       title: "註冊"
       subject_template: "[%{email_prefix}] 確認你的新帳號"
@@ -2102,141 +1994,6 @@ zh_TW:
       是的，法律條文很無聊，但是我們必須保護自己 &ndash; 以及你與你的資料 &ndash; 面對那些不友善的傢伙。我們的[服務條款](/tos)描述你（以及我們）在內容、隱私和法律上的行為和權利。想要使用我們的服務，你必須同意並遵守[服務條款](/tos)。
   tos_topic:
     title: "服務條款"
-    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: "隱私政策"
     body: |
@@ -2329,22 +2086,22 @@ zh_TW:
         該徽章授予給第一次編輯自己帖子的你。雖然你不能永遠在編輯自己的帖子，但是編輯他們總是一個好辦法——你可以改進你的帖子、修正小錯誤，或者是增補你原來沒有寫的內容。編輯能讓你的帖子質量變得更好！
     basic_user:
       name: 初級用戶
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">授予</a>所有常用社群功能
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">授予</a>所有常用社群功能"
       long_description: |
         該徽章授予給用戶等級達到 1 的成員。感謝你在社群裡花了一些時間並且閲讀了一些帖子，瞭解了我們的社群。你的新用戶限制已經被取消；並且你已經被授予了所有基本的社群權限，必須個人消息、標記、維基編輯和發佈多張圖片和多個連結的能力。
     member:
       name: 成員
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">授予</a>邀請、群組消息和更多的贊
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">授予</a>邀請、群組消息和更多的贊"
       long_description: |
         該徽章授予給達到用戶等級 2 的你。感謝你在社群待了幾周，真正融入到了社群中。你現在可以在你的用戶頁或者主題中邀請他人或者創建群組消息了。每天你也可以點更多次讚了。
     regular:
       name: 活躍用戶
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">授予</a>重分類、重命名、跟蹤連結、維基功能和更多的贊
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">授予</a>重分類、重命名、跟蹤連結、維基功能和更多的贊"
       long_description: |
         該徽章授予給達到用戶等級 3 的你。感謝你在這幾個月持續地參與社群。你現在是我們之中最活躍的讀者之一了，你持續的貢獻極大地幫助了我們的社群。你現在可以社群待了幾周，真正融入到了社群中。你現在可以重新分類或者重命名主題、使用能力強大的垃圾標記功能以及訪問隱藏的貴賓分類了。而且每天你可以點更多次讚了。
     leader:
       name: 資深
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">授予</a>全局編輯、固定、鎖定、存檔、分割、合併和更多的贊
+      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">授予</a>全局編輯、固定、鎖定、存檔、分割、合併和更多的贊"
       long_description: |
         該徽章授予給達到用戶等級 4 的你。你被管理人員選作了社群的領導力量，你用你的行動和言辭為社群樹立了正面的形象。你現在可以修改所有帖子，使用常見的版主的主題管理功能，比如置頂、鎖定、隱藏、存檔、分割和合併功能。你每天可以點更多的讚了。
     welcome:
@@ -2418,8 +2175,6 @@ zh_TW:
     promoter:
       name: 推廣者
       description: 已邀請了 1 個用戶
-      long_description: |
-        該徽章授予給邀請他人加入社群的你。你曾使用了用戶頁面的邀請按鈕或主題底部的邀請按鈕。邀請對某個討論感興趣的朋友是引介新人的好辦法，非常感謝！
     campaigner:
       name: 活動家
       description: 已邀請了 3 個初級用戶
@@ -2516,8 +2271,6 @@ zh_TW:
     first_emoji:
       name: 首個表情
       description: 在文章中使用表情符號
-      long_description: |
-        該徽章授予給第一次在文章中使用表情符號的你 :thumbsup:。表情符號讓你在文章中表達快樂 :smiley:、悲傷 :anguished:、憤怒 :angry: 以及任何東西 :sunglasses:。輸入 : (冒號) 或在編輯器中的表情符號工具列中按鈕選擇吧 :ok_hand:
     first_mention:
       name: 首次提及
       long_description: 該徽章授予給第一次在帖子中@別人的你。每個提及都將通知對方，讓他們知道你發了貼。輸入 @ 提及任何用戶，如果可以的話，也可以提及群組——這是個獲得他們注意的好辦法。
@@ -2536,7 +2289,6 @@ zh_TW:
         這個徽章每個月授與兩位新使用者，以表揚他們的傑出貢獻。衡量的標準在發表的文章獲得喜歡的頻率、與喜愛者的身份。
   admin_login:
     success: "已發送郵件"
-    error: "錯誤"
     email_input: "管理者郵件"
     submit_button: "送出電子郵件"
   performance_report:
@@ -2677,6 +2429,3 @@ zh_TW:
         description: |
           <p>如果你覺得需要修改這些設置，訪問<a href='/admin' target='_blank'>管理員分塊</a>；你可以在站點菜單找到扳手表徵圖旁找到。</p>
           <p>祝你玩得開心，還有祝你<a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>建設新社區好運！</a></p>
-  activemodel:
-    errors:
-      <<: *errors
diff --git a/config/locales/transliterate.bg.yml b/config/locales/transliterate.bg.yml
new file mode 100644
index 00000000000..4c8c61c289e
--- /dev/null
+++ b/config/locales/transliterate.bg.yml
@@ -0,0 +1,71 @@
+# encoding: utf-8
+# This file contains content for the i18n transliteration map from
+# Russian Cyrillic to ASCII (ISO-9:1995 / GOST 7.79-2000, table B)
+#
+# To validate this YAML file after you change it, please paste it into
+# http://yamllint.com/
+
+bg:
+  i18n:
+    transliterate:
+      rule:
+        А: A
+        а: a
+        Б: B
+        б: b
+        В: V
+        в: v
+        Г: G
+        г: g
+        Д: D
+        д: d
+        Е: E
+        е: e
+        Ж: Zh
+        ж: zh
+        З: Z
+        з: z
+        И: I
+        и: i
+        Й: J
+        й: j
+        К: K
+        к: k
+        Л: L
+        л: l
+        М: M
+        м: m
+        Н: N
+        н: n
+        О: O
+        о: o
+        П: P
+        п: p
+        Р: R
+        р: r
+        С: S
+        с: s
+        Т: T
+        т: t
+        У: U
+        у: u
+        Ф: F
+        ф: f
+        Х: H
+        х: h
+        Ц: C
+        ц: c
+        Ч: Ch
+        ч: ch
+        Ш: Sh
+        ш: sh
+        Щ: Sht
+        щ: sht
+        Ъ: y
+        ъ: y
+        Ь: y
+        ь: y
+        Ю: Yu
+        ю: yu
+        Я: Ya
+        я: ya
diff --git a/config/nginx.sample.conf b/config/nginx.sample.conf
index c4f0c79ddf9..0162ff5db61 100644
--- a/config/nginx.sample.conf
+++ b/config/nginx.sample.conf
@@ -40,6 +40,7 @@ server {
   gzip_min_length 1000;
   gzip_comp_level 5;
   gzip_types application/json text/css application/x-javascript application/javascript image/svg+xml;
+  gzip_proxied any;
 
   # Uncomment and configure this section for HTTPS support
   # NOTE: Put your ssl cert in your main nginx config directory (/etc/nginx)
@@ -90,7 +91,7 @@ server {
     # auth_basic on;
     # auth_basic_user_file /etc/nginx/htpasswd;
 
-    location ~* assets/.*\.(eot|ttf|woff|woff2|ico)$ {
+    location ~* (assets|plugins|uploads)/.*\.(eot|ttf|woff|woff2|ico)$ {
       expires 1y;
       add_header Cache-Control public,immutable;
       add_header Access-Control-Allow-Origin *;
@@ -101,12 +102,20 @@ server {
       log_not_found off;
       proxy_set_header Host $http_host;
       proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Request-Start "t=${msec}";
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header X-Forwarded-Proto $thescheme;
       proxy_pass http://discourse;
       break;
     }
 
+    # some minimal caching here so we don't keep asking
+    # longer term we should increas probably to 1y
+    location ~ ^/javascripts/ {
+      expires 1d;
+      add_header Cache-Control public,immutable;
+    }
+
     location ~ ^/assets/(?<asset_path>.+)$ {
       expires 1y;
       # asset pipeline enables this
@@ -138,6 +147,7 @@ server {
       # otherwise headers are not set correctly
       proxy_set_header Host $http_host;
       proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Request-Start "t=${msec}";
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header X-Forwarded-Proto $thescheme;
       proxy_set_header X-Sendfile-Type X-Accel-Redirect;
@@ -169,6 +179,7 @@ server {
     location ~ ^/admin/backups/ {
       proxy_set_header Host $http_host;
       proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Request-Start "t=${msec}";
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header X-Forwarded-Proto $thescheme;
       proxy_set_header X-Sendfile-Type X-Accel-Redirect;
@@ -180,9 +191,10 @@ server {
     # This big block is needed so we can selectively enable
     # acceleration for backups and avatars
     # see note about repetition above
-    location ~ ^/(letter_avatar/|user_avatar|highlight-js|stylesheets|favicon/proxied) {
+    location ~ ^/(letter_avatar/|user_avatar|highlight-js|stylesheets|favicon/proxied|service-worker) {
       proxy_set_header Host $http_host;
       proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Request-Start "t=${msec}";
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header X-Forwarded-Proto $thescheme;
 
@@ -190,9 +202,12 @@ server {
       # this is double bad cause we are not passing last modified in
       proxy_ignore_headers "Set-Cookie";
       proxy_hide_header "Set-Cookie";
+      proxy_hide_header "X-Discourse-Username";
+      proxy_hide_header "X-Runtime";
 
       # note x-accel-redirect can not be used with proxy_cache
       proxy_cache one;
+      proxy_cache_key "$scheme,$host,$request_uri";
       proxy_cache_valid 200 301 302 7d;
       proxy_cache_valid any 1m;
       proxy_pass http://discourse;
@@ -209,9 +224,12 @@ server {
       # client
       proxy_ignore_headers "Set-Cookie";
       proxy_hide_header "Set-Cookie";
+      proxy_hide_header "X-Discourse-Username";
+      proxy_hide_header "X-Runtime";
 
       proxy_cache one;
-      proxy_cache_key $uri;
+      # shared in multisite
+      proxy_cache_key $request_uri;
       proxy_cache_valid 200 7d;
       proxy_cache_valid 404 1m;
       proxy_set_header Connection "";
@@ -222,6 +240,7 @@ server {
 
     # we need buffering off for message bus
     location /message-bus/ {
+      proxy_set_header X-Request-Start "t=${msec}";
       proxy_set_header Host $http_host;
       proxy_set_header X-Real-IP $remote_addr;
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -244,6 +263,7 @@ server {
   location @discourse {
     add_header Referrer-Policy 'no-referrer-when-downgrade';
     proxy_set_header Host $http_host;
+    proxy_set_header X-Request-Start "t=${msec}";
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header X-Forwarded-Proto $thescheme;
diff --git a/config/routes.rb b/config/routes.rb
index f3cb50b6fbf..8765881d63d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -10,6 +10,7 @@ USERNAME_ROUTE_FORMAT = /[\w.\-]+?/ unless defined? USERNAME_ROUTE_FORMAT
 BACKUP_ROUTE_FORMAT = /.+\.(sql\.gz|tar\.gz|tgz)/i unless defined? BACKUP_ROUTE_FORMAT
 
 Discourse::Application.routes.draw do
+  relative_url_root = (defined?(Rails.configuration.relative_url_root) && Rails.configuration.relative_url_root) ? Rails.configuration.relative_url_root + '/' : '/'
 
   match "/404", to: "exceptions#not_found", via: [:get, :post]
   get "/404-body" => "exceptions#not_found_body"
@@ -77,7 +78,6 @@ Discourse::Application.routes.draw do
 
     resources :groups, constraints: AdminConstraint.new do
       collection do
-        post "refresh_automatic_groups" => "groups#refresh_automatic_groups"
         get 'bulk'
         get 'bulk-complete' => 'groups#bulk'
         put 'bulk' => 'groups#bulk_perform'
@@ -103,6 +103,7 @@ Discourse::Application.routes.draw do
         put "approve-bulk" => "users#approve_bulk"
         delete "reject-bulk" => "users#reject_bulk"
       end
+      delete "penalty_history", constraints: AdminConstraint.new
       put "suspend"
       put "delete_all_posts"
       put "unsuspend"
@@ -129,6 +130,7 @@ Discourse::Application.routes.draw do
       get "tl3_requirements"
       put "anonymize"
       post "reset_bounce_score"
+      put "disable_second_factor"
     end
     get "users/:id.json" => 'users#show', defaults: { format: 'json' }
     get 'users/:id/:username' => 'users#show', constraints: { username: RouteFormat.username }
@@ -200,6 +202,7 @@ Discourse::Application.routes.draw do
 
     post "themes/import" => "themes#import"
     post "themes/upload_asset" => "themes#upload_asset"
+    post "themes/generate_key_pair" => "themes#generate_key_pair"
     get "themes/:id/preview" => "themes#preview"
 
     scope "/customize", constraints: AdminConstraint.new do
@@ -211,9 +214,10 @@ Discourse::Application.routes.draw do
 
       # They have periods in their URLs often:
       get 'site_texts'          => 'site_texts#index'
-      get 'site_texts/(:id)'    => 'site_texts#show',   constraints: { id: /[\w.\-\+]+/i }
-      put 'site_texts/(:id)'    => 'site_texts#update', constraints: { id: /[\w.\-\+]+/i }
-      delete 'site_texts/(:id)' => 'site_texts#revert', constraints: { id: /[\w.\-\+]+/i }
+      get 'site_texts/:id'      => 'site_texts#show',   constraints: { id: /[\w.\-\+]+/i }
+      put 'site_texts/:id.json' => 'site_texts#update', constraints: { id: /[\w.\-\+]+/i }
+      put 'site_texts/:id'      => 'site_texts#update', constraints: { id: /[\w.\-\+]+/i }
+      delete 'site_texts/:id'   => 'site_texts#revert', constraints: { id: /[\w.\-\+]+/i }
 
       get 'email_templates'          => 'email_templates#index'
       get 'email_templates/(:id)'    => 'email_templates#show',   constraints: { id: /[0-9a-z_.]+/ }
@@ -228,6 +232,9 @@ Discourse::Application.routes.draw do
 
     get "version_check" => "versions#show"
 
+    get "dashboard-next" => "dashboard_next#index"
+    get "dashboard-old" => "dashboard#index"
+
     resources :dashboard, only: [:index] do
       collection do
         get "problems"
@@ -290,7 +297,10 @@ Discourse::Application.routes.draw do
   get "extra-locales/:bundle" => "extra_locales#show"
 
   resources :session, id: RouteFormat.username, only: [:create, :destroy, :become] do
-    get 'become'
+    if !Rails.env.production?
+      get 'become'
+    end
+
     collection do
       post "forgot_password"
     end
@@ -301,6 +311,8 @@ Discourse::Application.routes.draw do
   get "session/sso_provider" => "session#sso_provider"
   get "session/current" => "session#current"
   get "session/csrf" => "session#csrf"
+  get "session/email-login/:token" => "session#email_login"
+  post "session/email-login/:token" => "session#email_login"
   get "composer_messages" => "composer_messages#index"
   post "composer/parse_html" => "composer#parse_html"
 
@@ -328,11 +340,16 @@ Discourse::Application.routes.draw do
       end
     end
 
+    post "#{root_path}/second_factors" => "users#create_second_factor"
+    put "#{root_path}/second_factor" => "users#update_second_factor"
+
     put "#{root_path}/update-activation-email" => "users#update_activation_email"
     get "#{root_path}/hp" => "users#get_honeypot_value"
+    post "#{root_path}/email-login" => "users#email_login"
     get "#{root_path}/admin-login" => "users#admin_login"
     put "#{root_path}/admin-login" => "users#admin_login"
     get "#{root_path}/admin-login/:token" => "users#admin_login"
+    put "#{root_path}/admin-login/:token" => "users#admin_login"
     post "#{root_path}/toggle-anon" => "users#toggle_anon"
     post "#{root_path}/read-faq" => "users#read_faq"
     get "#{root_path}/search/users" => "users#search_users"
@@ -347,6 +364,7 @@ Discourse::Application.routes.draw do
     get "#{root_path}/activate-account/:token" => "users#activate_account"
     put({ "#{root_path}/activate-account/:token" => "users#perform_account_activation" }.merge(index == 1 ? { as: 'perform_activate_account' } : {}))
     get "#{root_path}/authorize-email/:token" => "users_email#confirm"
+    put "#{root_path}/authorize-email/:token" => "users_email#confirm"
     get({
       "#{root_path}/confirm-admin/:token" => "users#confirm_admin",
       constraints: { token: /[0-9a-f]+/ }
@@ -358,6 +376,7 @@ Discourse::Application.routes.draw do
     get "#{root_path}/:username/messages/:filter" => "user_actions#private_messages", constraints: { username: RouteFormat.username }
     get "#{root_path}/:username/messages/group/:group_name" => "user_actions#private_messages", constraints: { username: RouteFormat.username, group_name: RouteFormat.username }
     get "#{root_path}/:username/messages/group/:group_name/archive" => "user_actions#private_messages", constraints: { username: RouteFormat.username, group_name: RouteFormat.username }
+    get "#{root_path}/:username/messages/tags/:tag_id" => "user_actions#private_messages", constraints: StaffConstraint.new
     get "#{root_path}/:username.json" => "users#show", constraints: { username: RouteFormat.username }, defaults: { format: :json }
     get({ "#{root_path}/:username" => "users#show", constraints: { username: RouteFormat.username, format: /(json|html)/ } }.merge(index == 1 ? { as: 'user' } : {}))
     put "#{root_path}/:username" => "users#update", constraints: { username: RouteFormat.username }, defaults: { format: :json }
@@ -378,10 +397,9 @@ Discourse::Application.routes.draw do
     put "#{root_path}/:username/preferences/badge_title" => "users#badge_title", constraints: { username: RouteFormat.username }
     get "#{root_path}/:username/preferences/username" => "users#preferences", constraints: { username: RouteFormat.username }
     put "#{root_path}/:username/preferences/username" => "users#username", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/preferences/second-factor" => "users#preferences", constraints: { username: RouteFormat.username }
     delete "#{root_path}/:username/preferences/user_image" => "users#destroy_user_image", constraints: { username: RouteFormat.username }
     put "#{root_path}/:username/preferences/avatar/pick" => "users#pick_avatar", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/preferences/card-badge" => "users#card_badge", constraints: { username: RouteFormat.username }
-    put "#{root_path}/:username/preferences/card-badge" => "users#update_card_badge", constraints: { username: RouteFormat.username }
     get "#{root_path}/:username/staff-info" => "users#staff_info", constraints: { username: RouteFormat.username }
     get "#{root_path}/:username/summary" => "users#summary", constraints: { username: RouteFormat.username }
     get "#{root_path}/:username/invited" => "users#invited", constraints: { username: RouteFormat.username }
@@ -434,6 +452,7 @@ Discourse::Application.routes.draw do
   get "posts/by_number/:topic_id/:post_number" => "posts#by_number"
   get "posts/:id/reply-history" => "posts#reply_history"
   get "posts/:id/reply-ids"     => "posts#reply_ids"
+  get "posts/:id/reply-ids/all" => "posts#all_reply_ids"
   get "posts/:username/deleted" => "posts#deleted_posts", constraints: { username: RouteFormat.username }
   get "posts/:username/flagged" => "posts#flagged_posts", constraints: { username: RouteFormat.username }
 
@@ -441,23 +460,36 @@ Discourse::Application.routes.draw do
     get "posts.rss" => "groups#posts_feed", format: :rss
     get "mentions.rss" => "groups#mentions_feed", format: :rss
 
-    get 'activity' => "groups#show"
-    get 'activity/:filter' => "groups#show"
     get 'members'
     get 'posts'
-    get 'topics'
     get 'mentions'
-    get 'messages'
     get 'counts'
     get 'mentionable'
     get 'messageable'
     get 'logs' => 'groups#histories'
 
     collection do
+      get 'custom/new' => 'groups#new', constraints: AdminConstraint.new
       get "search" => "groups#search"
     end
 
     member do
+      %w{
+        activity
+        activity/:filter
+        messages
+        messages/inbox
+        messages/archive
+        manage
+        manage/profile
+        manage/members
+        manage/membership
+        manage/interaction
+        manage/logs
+      }.each do |path|
+        get path => 'groups#show'
+      end
+
       put "members" => "groups#add_members"
       delete "members" => "groups#remove_member"
       post "request_membership" => "groups#request_membership"
@@ -475,6 +507,7 @@ Discourse::Application.routes.draw do
     put "post_type"
     put "rebake"
     put "unhide"
+    put "locked"
     get "replies"
     get "revisions/latest" => "posts#latest_revision"
     get "revisions/:revision" => "posts#revisions", constraints: { revision: /\d+/ }
@@ -488,11 +521,14 @@ Discourse::Application.routes.draw do
     end
   end
 
-  get 'notifications' => 'notifications#index'
-  put 'notifications/mark-read' => 'notifications#mark_read'
-  # creating an alias cause the api was extended to mark a single notification
-  # this allows us to cleanly target it
-  put 'notifications/read' => 'notifications#mark_read'
+  resources :notifications, except: :show do
+    collection do
+      put 'mark-read' => 'notifications#mark_read'
+      # creating an alias cause the api was extended to mark a single notification
+      # this allows us to cleanly target it
+      put 'read' => 'notifications#mark_read'
+    end
+  end
 
   match "/auth/:provider/callback", to: "users/omniauth_callbacks#complete", via: [:get, :post]
   match "/auth/failure", to: "users/omniauth_callbacks#failure", via: [:get, :post]
@@ -518,7 +554,7 @@ Discourse::Application.routes.draw do
   get "/badges/:id(/:slug)" => "badges#show"
   resources :user_badges, only: [:index, :create, :destroy]
 
-  get '/c', to: redirect('/categories')
+  get '/c', to: redirect(relative_url_root + 'categories')
 
   resources :categories, except: :show
   post "category/:category_id/move" => "categories#move"
@@ -527,6 +563,7 @@ Discourse::Application.routes.draw do
   put "category/:category_id/slug" => "categories#update_slug"
 
   get "categories_and_latest" => "categories#categories_and_latest"
+  get "categories_and_top" => "categories#categories_and_top"
 
   get "c/:id/show" => "categories#show"
   get "c/:category_slug/find_by_slug" => "categories#find_by_slug"
@@ -575,6 +612,8 @@ Discourse::Application.routes.draw do
   put "t/:id/archive-message" => "topics#archive_message"
   put "t/:id/move-to-inbox" => "topics#move_to_inbox"
   put "t/:id/convert-topic/:type" => "topics#convert_topic"
+  put "t/:id/publish" => "topics#publish"
+  put "t/:id/shared-draft" => "topics#update_shared_draft"
   put "topics/bulk"
   put "topics/reset-new" => 'topics#reset_new'
   post "topics/timings"
@@ -583,20 +622,21 @@ Discourse::Application.routes.draw do
   resources :similar_topics
 
   get "topics/feature_stats"
-  get "topics/created-by/:username" => "list#topics_by", as: "topics_by", constraints: { username: RouteFormat.username }
-  get "topics/private-messages/:username" => "list#private_messages", as: "topics_private_messages", constraints: { username: RouteFormat.username }
-  get "topics/private-messages-sent/:username" => "list#private_messages_sent", as: "topics_private_messages_sent", constraints: { username: RouteFormat.username }
-  get "topics/private-messages-archive/:username" => "list#private_messages_archive", as: "topics_private_messages_archive", constraints: { username: RouteFormat.username }
-  get "topics/private-messages-unread/:username" => "list#private_messages_unread", as: "topics_private_messages_unread", constraints: { username: RouteFormat.username }
-  get "topics/private-messages-group/:username/:group_name.json" => "list#private_messages_group", as: "topics_private_messages_group", constraints: {
-    username: RouteFormat.username,
-    group_name: RouteFormat.username
-  }
 
-  get "topics/private-messages-group/:username/:group_name/archive.json" => "list#private_messages_group_archive", as: "topics_private_messages_group_archive", constraints: {
-    username: RouteFormat.username,
-    group_name: RouteFormat.username
-  }
+  scope "/topics", username: RouteFormat.username do
+    get "created-by/:username" => "list#topics_by", as: "topics_by"
+    get "private-messages/:username" => "list#private_messages", as: "topics_private_messages"
+    get "private-messages-sent/:username" => "list#private_messages_sent", as: "topics_private_messages_sent"
+    get "private-messages-archive/:username" => "list#private_messages_archive", as: "topics_private_messages_archive"
+    get "private-messages-unread/:username" => "list#private_messages_unread", as: "topics_private_messages_unread"
+    get "private-messages-tags/:username/:tag_id.json" => "list#private_messages_tag", as: "topics_private_messages_tag", constraints: StaffConstraint.new
+    get "groups/:group_name" => "list#group_topics", as: "group_topics", group_name: RouteFormat.username
+
+    scope "/private-messages-group/:username", group_name: RouteFormat.username do
+      get ":group_name.json" => "list#private_messages_group", as: "topics_private_messages_group"
+      get ":group_name/archive.json" => "list#private_messages_group_archive", as: "topics_private_messages_group_archive"
+    end
+  end
 
   get 'embed/comments' => 'embed#comments'
   get 'embed/count' => 'embed#count'
@@ -612,8 +652,6 @@ Discourse::Application.routes.draw do
   get "t/:topic_id/wordpress" => "topics#wordpress", constraints: { topic_id: /\d+/ }
   get "t/:slug/:topic_id/moderator-liked" => "topics#moderator_liked", constraints: { topic_id: /\d+/ }
   get "t/:slug/:topic_id/summary" => "topics#show", defaults: { summary: true }, constraints: { topic_id: /\d+/ }
-  get "t/:slug/:topic_id/unsubscribe" => "topics#unsubscribe", constraints: { topic_id: /\d+/ }
-  get "t/:topic_id/unsubscribe" => "topics#unsubscribe", constraints: { topic_id: /\d+/ }
   get "t/:topic_id/summary" => "topics#show", constraints: { topic_id: /\d+/ }
   put "t/:slug/:topic_id" => "topics#update", constraints: { topic_id: /\d+/ }
   put "t/:slug/:topic_id/star" => "topics#star", constraints: { topic_id: /\d+/ }
@@ -674,9 +712,6 @@ Discourse::Application.routes.draw do
     collection do
       post "export_entity" => "export_csv#export_entity"
     end
-    member do
-      get "" => "export_csv#show", constraints: { id: /[^\/]+/ }
-    end
   end
 
   get "onebox" => "onebox#show"
@@ -690,7 +725,17 @@ Discourse::Application.routes.draw do
   post "draft" => "draft#update"
   delete "draft" => "draft#destroy"
 
-  get "service-worker" => "static#service_worker_asset", format: :js
+  if service_worker_asset = Rails.application.assets_manifest.assets['service-worker.js']
+    # https://developers.google.com/web/fundamentals/codelabs/debugging-service-workers/
+    # Normally the browser will wait until a user closes all tabs that contain the
+    # current site before updating to a new Service Worker.
+    # Support the old Service Worker path to avoid routing error filling up the
+    # logs.
+    get "/service-worker.js" => redirect(relative_url_root + service_worker_asset, status: 302), format: :js
+    get service_worker_asset => "static#service_worker_asset", format: :js
+  elsif Rails.env.development?
+    get "/service-worker.js" => "static#service_worker_asset", format: :js
+  end
 
   get "cdn_asset/:site/*path" => "static#cdn_asset", format: false
   get "brotli_asset/*path" => "static#brotli_asset", format: false
@@ -698,6 +743,7 @@ Discourse::Application.routes.draw do
   get "favicon/proxied" => "static#favicon", format: false
 
   get "robots.txt" => "robots_txt#index"
+  get "robots-builder.json" => "robots_txt#builder"
   get "offline.html" => "offline#index"
   get "manifest.json" => "metadata#manifest", as: :manifest
   get "opensearch" => "metadata#opensearch", format: :xml
@@ -707,6 +753,7 @@ Discourse::Application.routes.draw do
     get '/filter/list' => 'tags#index'
     get '/filter/search' => 'tags#search'
     get '/check' => 'tags#check_hashtag'
+    get '/personal_messages/:username' => 'tags#personal_messages'
     constraints(tag_id: /[^\/]+?/, format: /json|rss/) do
       get '/:tag_id.rss' => 'tags#tag_feed'
       get '/:tag_id' => 'tags#show', as: 'tag_show'
@@ -752,6 +799,13 @@ Discourse::Application.routes.draw do
 
   get "/themes/assets/:key" => "themes#assets"
 
+  if Rails.env == "test" || Rails.env == "development"
+    get "/qunit" => "qunit#index"
+  end
+
   get "*url", to: 'permalinks#show', constraints: PermalinkConstraint.new
 
+  post "/push_notifications/subscribe" => "push_notification#subscribe"
+  post "/push_notifications/unsubscribe" => "push_notification#unsubscribe"
+
 end
diff --git a/config/site_settings.yml b/config/site_settings.yml
index c94fff84893..6686036b76e 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -7,6 +7,7 @@
 # max                - For a string setting, the maximum length. For an integer setting, the maximum value.
 # regex              - A regex that the value must match.
 # validator          - The name of the class that will be use to validate the value of the setting.
+# allow_any          - For choice settings allow items not specified in the choice list (default true)
 # enum               - The setting has a fixed set of allowed values, and only one can be chosen.
 #                      Set to the class name that defines the set.
 # shadowed_by_global - "Shadow" a site setting with a GlobalSetting. If the GlobalSetting
@@ -79,6 +80,9 @@ basic:
   set_locale_from_accept_language_header:
     default: false
     validator: "AllowUserLocaleEnabledValidator"
+  support_mixed_text_direction:
+    client: true
+    default: false
   categories_topics:
     default: 20
     min: 5
@@ -117,6 +121,8 @@ basic:
     default: "latest|new|unread|top|categories"
     regex: "latest"
     regex_error: "site_settings.errors.must_include_latest"
+    validator: RegexPresenceValidator
+    allow_any: false
     choices:
      - latest
      - new
@@ -130,6 +136,7 @@ basic:
     client: true
     type: list
     default: 'like-count|like|share|flag|edit|bookmark|delete|admin|reply'
+    allow_any: false
     choices:
      - like-count
      - like
@@ -144,6 +151,7 @@ basic:
     client: true
     type: list
     default: 'flag|bookmark|edit|delete|admin'
+    allow_any: false
     choices:
      - like
      - edit
@@ -157,6 +165,7 @@ basic:
     client: true
     type: list
     default: 'twitter|facebook|email'
+    allow_any: false
     choices:
      - twitter
      - facebook
@@ -220,6 +229,21 @@ basic:
   enable_whispers:
     client: true
     default: false
+  push_notifications_prompt:
+    default: false
+    client: true
+  push_notifications_icon_url:
+    default: ''
+  vapid_public_key_bytes:
+    default: ''
+    client: true
+    hidden: true
+  vapid_public_key:
+    default: ''
+    hidden: true
+  vapid_private_key:
+    default: ''
+    hidden: true
 
 login:
   invite_only:
@@ -236,6 +260,10 @@ login:
   enable_local_logins:
     client: true
     default: true
+  enable_local_logins_via_email:
+    client: true
+    default: false
+    validator: "EnableLocalLoginsViaEmailValidator"
   allow_new_registrations:
     client: true
     default: true
@@ -247,6 +275,16 @@ login:
     default: false
   google_oauth2_client_id: ''
   google_oauth2_client_secret: ''
+  google_oauth2_prompt:
+    default: ''
+    type: list
+    choices:
+      - ''
+      - 'none'
+      - 'consent'
+      - 'select_account'
+  google_oauth2_hd:
+    default: ''
   enable_yahoo_logins:
     client: true
     default: false
@@ -277,8 +315,6 @@ login:
   facebook_app_secret:
     default: ''
     regex: "^[a-f0-9]+$"
-  facebook_request_extra_profile_details:
-    default: false
   enable_github_logins:
     client: true
     default: false
@@ -302,6 +338,7 @@ login:
     default: ''
     regex: '^https?:\/\/.+[^\/]$'
   sso_secret: ''
+  sso_overrides_groups: false
   sso_overrides_bio: false
   sso_overrides_email:
     default: false
@@ -311,6 +348,8 @@ login:
   sso_overrides_avatar:
     default: false
     client: true
+  sso_overrides_profile_background: false
+  sso_overrides_card_background: false
   sso_not_approved_url: ''
   email_domains_blacklist:
     default: 'mailinator.com'
@@ -327,7 +366,6 @@ login:
     default: 1440
     min: 1
     max: 175200
-
 users:
   min_username_length:
     client: true
@@ -341,7 +379,7 @@ users:
     max: 60
   reserved_usernames:
     type: list
-    default: "admin|moderator|administrator|mod|sys|system|community|info|you|name|username|user|nickname|discourse|discourseorg|discourseforum|support|account-created"
+    default: "admin|moderator|administrator|mod|sys|system|community|info|you|name|username|user|nickname|discourse|discourseorg|discourseforum|support|hp|account-created|password-reset|admin-login|confirm-admin|account-created|activate-account|confirm-email-token|authorize-email"
   min_password_length:
     client: true
     default: 10
@@ -370,7 +408,6 @@ users:
     default: true
   invite_expiry_days:
     default: 30
-  invite_passthrough_hours: 0
   invites_per_page:
     client: true
     default: 40
@@ -424,11 +461,14 @@ users:
   hide_suspension_reasons:
     default: false
     client: true
+  log_personal_messages_views: false
 
 groups:
   enable_group_directory:
     client: true
     default: true
+  group_in_subject:
+    default: false
 
 posting:
   min_post_length:
@@ -445,7 +485,7 @@ posting:
     locale_default:
       zh_CN: 8
       zh_TW: 8
-  min_private_message_post_length:
+  min_personal_message_post_length:
     client: true
     min: 1
     default: 10
@@ -488,10 +528,11 @@ posting:
       zh_CN: false
       zh_TW: false
   title_fancy_entities: true
-  min_private_message_title_length:
+  min_personal_message_title_length:
     client: true
     default: 2
     min: 1
+  max_emojis_in_title: 1
   allow_uncategorized_topics:
     client: true
     default: true
@@ -503,14 +544,22 @@ posting:
     locale_default:
       zh_CN: 4
       zh_TW: 4
-  enable_private_messages:
+  enable_personal_messages:
     default: true
     client: true
-  enable_private_email_messages:
+  enable_system_message_replies:
+    default: true
+  enable_personal_email_messages:
     default: false
     client: true
     validator: "EnablePrivateEmailMessagesValidator"
   editing_grace_period: 300
+  editing_grace_period_max_diff: 100
+  editing_grace_period_max_diff_high_trust: 400
+  staff_edit_locks_post: false
+  shared_drafts_category:
+    type: category
+    default: ''
   post_edit_time_limit:
     default: 86400
     max: 525600
@@ -526,6 +575,13 @@ posting:
   enable_markdown_typographer:
     client: true
     default: true
+  enable_markdown_linkify:
+    client: true
+    default: true
+  markdown_linkify_tlds:
+    client: true
+    type: list
+    default: 'com|net|org|io|co|tv|ru|cn|us|uk|me|de|fr|fi|gov'
   enable_rich_text_paste:
     client: true
     default: false
@@ -590,14 +646,12 @@ posting:
     type: list
     client: true
   delete_old_hidden_posts: true
-  censored_pattern:
-    client: true
-    default: ''
-    refresh: true
-    type: regex
   enable_emoji:
     default: true
     client: true
+  enable_emoji_shortcuts:
+    default: true
+    client: true
   emoji_set:
     default: 'twitter'
     client: true
@@ -612,10 +666,16 @@ posting:
   approve_new_topics_unless_trust_level:
     default: 0
     enum: 'TrustLevelSetting'
+  approve_unless_staged:
+    default: false
   notify_about_queued_posts_after:
     default: 24
-  auto_close_messages_post_count: 500
-  auto_close_topics_post_count: 10000
+  auto_close_messages_post_count:
+    default: 500
+    shadowed_by_global: true
+  auto_close_topics_post_count:
+    default: 10000
+    shadowed_by_global: true
   code_formatting_style:
     client: true
     type: enum
@@ -625,6 +685,8 @@ posting:
      - code-fences
   embed_truncate:
     default: true
+  embed_support_markdown:
+    default: false
   allowed_href_schemes:
     client: true
     default: ''
@@ -633,6 +695,7 @@ posting:
     default: 30
     min: 1
   watched_words_regular_expressions:
+    client: true
     default: false
   enable_advanced_editor_preview_sync:
     hidden: true
@@ -644,7 +707,7 @@ email:
   email_time_window_mins:
     default: 10
     client: true
-  private_email_time_window_seconds: 20
+  personal_email_time_window_seconds: 20
   email_posts_context: 5
   digest_min_excerpt_length:
     default: 100
@@ -654,8 +717,15 @@ email:
   digest_topics:
     default: 5
     min: 1
-  digest_posts: 3
-  digest_other_topics: 5
+    max: 20
+  digest_posts:
+    default: 5
+    min: 0
+    max: 20
+  digest_other_topics:
+    default: 5
+    min: 0
+    max: 20
   suppress_digest_email_after_days:
     default: 365
   digest_suppress_categories:
@@ -675,6 +745,7 @@ email:
     validator: "ReplyByEmailEnabledValidator"
   reply_by_email_address:
     default: ''
+    validator: "ReplyByEmailAddressValidator"
   alternative_reply_by_email_addresses:
     default: ''
     validator: "AlternativeReplyByEmailAddressesValidator"
@@ -693,7 +764,7 @@ email:
   pop3_polling_username: ''
   pop3_polling_password: ''
   log_mail_processing_failures: false
-  incoming_email_prefer_html: false
+  incoming_email_prefer_html: true
   email_in:
     default: false
     client: true
@@ -714,7 +785,8 @@ email:
   unsubscribe_via_email_footer:
     default: false
   delete_email_logs_after_days:
-    default: 365
+    default: 90
+    shadowed_by_global: true
   max_emails_per_day_per_user: 100
   enable_staged_users: true
   maximum_staged_users_per_email: 10
@@ -772,6 +844,15 @@ files:
     default: 'jpg|jpeg|png|gif'
     refresh: true
     type: list
+  authorized_extensions_for_staff:
+    client: true
+    default: ''
+    refresh: true
+    type: list
+  export_authorized_extensions:
+    hidden: true
+    default: 'gz'
+    type: list
   crawl_images:
     default: true
   max_image_width:
@@ -875,6 +956,16 @@ trust:
   min_trust_to_send_email_messages:
     default: 4
     enum: 'TrustLevelSetting'
+  min_trust_to_flag_posts:
+    default: 1
+    enum: 'TrustLevelSetting'
+  min_trust_to_post_links:
+    default: 0
+    enum: 'TrustLevelSetting'
+  min_trust_to_post_images:
+    default: 0
+    enum: 'TrustLevelSetting'
+  allow_flagging_staff: true
   tl1_requires_topics_entered: 5
   tl1_requires_read_posts:
     default: 30
@@ -922,6 +1013,8 @@ trust:
   tl3_links_no_follow:
     default: false
     client: true
+  trusted_users_can_edit_others:
+    default: true
 
 security:
   force_https:
@@ -938,9 +1031,13 @@ security:
   enable_escaped_fragments: true
   allow_index_in_robots_txt: true
   allow_moderators_to_create_categories: false
+  non_crawler_user_agents:
+    hidden: true
+    default: 'trident|webkit|gecko|chrome|safari|msie|opera|goanna'
+    type: list
   crawler_user_agents:
     hidden: true
-    default: 'Googlebot|Mediapartners|AdsBot|curl|HTTrack|Twitterbot|facebookexternalhit|bingbot|Baiduspider|ia_archiver|archive.org_bot|Wayback Save Page|360Spider|Swiftbot|YandexBot'
+    default: 'rss|bot|spider|crawler|facebook|archive|wayback|ping|monitor'
     type: list
   cors_origins:
     default: ''
@@ -956,9 +1053,19 @@ security:
     default: ''
     type: list
   allowed_iframes:
-    default: 'https://www.google.com/maps/embed?|https://www.openstreetmap.org/export/embed.html?'
+    default: 'https://www.google.com/maps/embed?|https://www.openstreetmap.org/export/embed.html?|https://calendar.google.com/calendar/embed?'
     type: list
     client: true
+  whitelisted_crawler_user_agents:
+    type: list
+    default: ''
+  blacklisted_crawler_user_agents:
+    type: list
+    default: ''
+  slow_down_crawler_user_agents:
+    type: list
+    default: 'bingbot'
+  slow_down_crawler_rate: 60
 
 onebox:
   enable_flash_video_onebox: false
@@ -1013,6 +1120,7 @@ spam:
   flags_default_topics:
     default: false
     client: true
+  min_flags_staff_visibility: 1
 
 rate_limits:
   unique_posts_mins: 5
@@ -1021,7 +1129,7 @@ rate_limits:
   rate_limit_new_user_create_topic: 120
   rate_limit_new_user_create_post: 30
   max_topics_per_day: 20
-  max_private_messages_per_day: 20
+  max_personal_messages_per_day: 20
   max_likes_per_day: 50
   max_bookmarks_per_day: 20
   max_flags_per_day: 20
@@ -1121,6 +1229,9 @@ developer:
   bootstrap_error_pages:
     hidden: true
     default: false
+  enable_safe_mode:
+    default: true
+    client: true
 
 embedding:
   feed_polling_enabled:
@@ -1167,6 +1278,8 @@ legal:
   faq_url:
     client: true
     default: ''
+  log_anonymizer_details:
+    default: true
 
 backups:
   enable_backups:
@@ -1211,13 +1324,17 @@ search:
     locale_default:
       zh_CN: 2
       zh_TW: 2
+      ko: 2
+      ja: 2
 
   search_tokenize_chinese_japanese_korean: false
   search_prefer_recent_posts: false
   search_recent_posts_size:
     default: 100000
     max: 100000
-  log_search_queries: true
+  log_search_queries:
+    client: true
+    default: true
   search_query_log_max_size:
     default: 1000000
     max: 1000000
@@ -1401,7 +1518,7 @@ user_preferences:
     enum: 'DigestEmailSiteSetting'
     default: 10080
   default_include_tl0_in_digests: false
-  default_email_private_messages: true
+  default_email_personal_messages: true
   default_email_direct: true
   default_email_mailing_list_mode: false
   default_email_mailing_list_mode_frequency:
@@ -1520,10 +1637,11 @@ tags:
     client: true
     default: false
     refresh: true
-  staff_tags:
-    type: list
+  tags_listed_by_group:
     client: true
-    default: ''
+    default: false
+  allow_staff_to_tag_pms:
+    default: false
   suppress_overlapping_tags_in_list:
     default: false
     client: true
diff --git a/config/unicorn.conf.rb b/config/unicorn.conf.rb
index e5f5c4d112a..01c800b1986 100644
--- a/config/unicorn.conf.rb
+++ b/config/unicorn.conf.rb
@@ -195,7 +195,7 @@ before_fork do |server, worker|
               sleep 10
               force_kill_rogue_sidekiq
             end
-            $redis.client.disconnect
+            $redis._client.disconnect
           end
         end
 
@@ -211,7 +211,7 @@ before_fork do |server, worker|
   end
 
   ActiveRecord::Base.connection.disconnect!
-  $redis.client.disconnect
+  $redis._client.disconnect
 
   # Throttle the master from forking too quickly by sleeping.  Due
   # to the implementation of standard Unix signal handlers, this
diff --git a/db/fixtures/001_categories.rb b/db/fixtures/001_categories.rb
index 4dc13268ac5..f21181180e7 100644
--- a/db/fixtures/001_categories.rb
+++ b/db/fixtures/001_categories.rb
@@ -1,4 +1,4 @@
-require 'column_dropper'
+require 'migration/column_dropper'
 
 # fix any bust caches post initial migration
 ActiveRecord::Base.send(:subclasses).each { |m| m.reset_column_information }
@@ -26,10 +26,10 @@ if uncat_id == -1 || !Category.exists?(uncat_id)
            VALUES ('uncategorized_category_id', 3, #{category_id}, now(), now())"
 end
 
-ColumnDropper.drop(
+Migration::ColumnDropper.drop(
   table: 'categories',
-  after_migration: 'AddUploadsToCategories',
-  columns: ['logo_url', 'background_url'],
+  after_migration: 'AddSuppressFromLatestToCategories',
+  columns: ['logo_url', 'background_url', 'suppress_from_homepage'],
   on_drop: ->() {
     STDERR.puts 'Removing superflous categories columns!'
   }
diff --git a/db/fixtures/002_groups.rb b/db/fixtures/002_groups.rb
index 900f4b3ca80..cbf32466c3d 100644
--- a/db/fixtures/002_groups.rb
+++ b/db/fixtures/002_groups.rb
@@ -5,7 +5,7 @@ end
 
 Group.where(name: 'everyone').update_all(visibility_level: Group.visibility_levels[:owners])
 
-ColumnDropper.drop(
+Migration::ColumnDropper.drop(
   table: 'groups',
   after_migration: 'SplitAliasLevels',
   columns:  %w[visible public alias_level],
diff --git a/db/fixtures/007_web_hook_event_types.rb b/db/fixtures/007_web_hook_event_types.rb
index d91b5f09a1a..8aa08591607 100644
--- a/db/fixtures/007_web_hook_event_types.rb
+++ b/db/fixtures/007_web_hook_event_types.rb
@@ -12,3 +12,23 @@ WebHookEventType.seed do |b|
   b.id = WebHookEventType::USER
   b.name = "user"
 end
+
+WebHookEventType.seed do |b|
+  b.id = WebHookEventType::GROUP
+  b.name = "group"
+end
+
+WebHookEventType.seed do |b|
+  b.id = WebHookEventType::CATEGORY
+  b.name = "category"
+end
+
+WebHookEventType.seed do |b|
+  b.id = WebHookEventType::TAG
+  b.name = "tag"
+end
+
+WebHookEventType.seed do |b|
+  b.id = WebHookEventType::FLAG
+  b.name = "flag"
+end
diff --git a/db/fixtures/009_users.rb b/db/fixtures/009_users.rb
index 6a97df4bb20..fb6f6ee5bab 100644
--- a/db/fixtures/009_users.rb
+++ b/db/fixtures/009_users.rb
@@ -33,7 +33,7 @@ UserOption.where(user_id: -1).update_all(
 
 Group.user_trust_level_change!(-1, TrustLevel[4])
 
-ColumnDropper.drop(
+Migration::ColumnDropper.drop(
   table: 'users',
   after_migration: 'DropEmailFromUsers',
   columns: %w[
@@ -61,7 +61,7 @@ ColumnDropper.drop(
   }
 )
 
-ColumnDropper.drop(
+Migration::ColumnDropper.drop(
   table: 'users',
   after_migration: 'RenameBlockedSilence',
   columns: %w[
@@ -72,7 +72,7 @@ ColumnDropper.drop(
   }
 )
 
-ColumnDropper.drop(
+Migration::ColumnDropper.drop(
   table: 'users',
   after_migration: 'AddSilencedTillToUsers',
   columns: %w[
@@ -83,7 +83,7 @@ ColumnDropper.drop(
   }
 )
 
-ColumnDropper.drop(
+Migration::ColumnDropper.drop(
   table: 'users',
   after_migration: 'AddTrustLevelLocksToUsers',
   columns: %w[
@@ -94,6 +94,17 @@ ColumnDropper.drop(
   }
 )
 
+Migration::ColumnDropper.drop(
+  table: 'user_auth_tokens',
+  after_migration: 'RemoveLegacyAuthToken',
+  columns: %w[
+    legacy
+  ],
+  on_drop: ->() {
+    STDERR.puts 'Removing user_auth_token legacy column!'
+  }
+)
+
 # User for the smoke tests
 if ENV["SMOKE"] == "1"
   UserEmail.seed do |ue|
diff --git a/db/fixtures/600_themes.rb b/db/fixtures/600_themes.rb
index 5b141c57ad7..84694a5ec0c 100644
--- a/db/fixtures/600_themes.rb
+++ b/db/fixtures/600_themes.rb
@@ -18,7 +18,7 @@ if !Theme.exists?
   default_theme.set_default!
 end
 
-ColumnDropper.drop(
+Migration::ColumnDropper.drop(
   table: 'theme_fields',
   after_migration: 'AddUploadIdToThemeFields',
   columns: ['target'],
diff --git a/db/fixtures/999_delayed.rb b/db/fixtures/999_delayed.rb
index 4d69a58267d..00f440f3798 100644
--- a/db/fixtures/999_delayed.rb
+++ b/db/fixtures/999_delayed.rb
@@ -1,8 +1,8 @@
 # Delayed migration steps
 
-require 'table_migration_helper'
+require 'migration/table_dropper'
 
-TableMigrationHelper.delayed_drop(
+Migration::TableDropper.delayed_rename(
   old_name: 'topic_status_updates',
   new_name: 'topic_timers',
   after_migration: 'RenameTopicStatusUpdatesToTopicTimers',
@@ -10,3 +10,29 @@ TableMigrationHelper.delayed_drop(
     STDERR.puts "Dropping topic_status_updates. It was moved to topic_timers."
   }
 )
+
+Migration::TableDropper.delayed_drop(
+  table_name: 'category_featured_users',
+  after_migration: 'DropUnusedTables',
+  on_drop: ->() {
+    STDERR.puts "Dropping category_featured_users. It isn't used anymore."
+  }
+)
+
+Migration::TableDropper.delayed_drop(
+  table_name: 'versions',
+  after_migration: 'DropUnusedTables',
+  on_drop: ->() {
+    STDERR.puts "Dropping versions. It isn't used anymore."
+  }
+)
+
+Migration::ColumnDropper.drop(
+  table: 'user_profiles',
+  after_migration: 'DropUserCardBadgeColumns',
+  columns: ['card_image_badge_id'],
+  on_drop: ->() {
+    STDERR.puts "Removing user_profiles column card_image_badge_id"
+  },
+  delay: 3600
+)
diff --git a/db/fixtures/999_topics.rb b/db/fixtures/999_topics.rb
index 25958a8c694..78ee61a92d3 100644
--- a/db/fixtures/999_topics.rb
+++ b/db/fixtures/999_topics.rb
@@ -64,7 +64,7 @@ end
 
 # run this later, cause we need to make sure new application controller resilience is in place first
 
-ColumnDropper.drop(
+Migration::ColumnDropper.drop(
   table: 'user_stats',
   after_migration: 'DropUnreadTrackingColumns',
   columns: %w{
@@ -76,7 +76,7 @@ ColumnDropper.drop(
   }
 )
 
-ColumnDropper.drop(
+Migration::ColumnDropper.drop(
   table: 'topics',
   after_migration: 'DropUnreadTrackingColumns',
   columns: %w{
@@ -92,7 +92,7 @@ ColumnDropper.drop(
   }
 )
 
-ColumnDropper.drop(
+Migration::ColumnDropper.drop(
   table: 'topics',
   after_migration: 'RemoveAutoCloseColumnsFromTopics',
   columns: %w{
diff --git a/db/migrate/20170512185227_create_topic_status_updates_again.rb b/db/migrate/20170512185227_create_topic_status_updates_again.rb
index 9883594e90c..785939f2b3a 100644
--- a/db/migrate/20170512185227_create_topic_status_updates_again.rb
+++ b/db/migrate/20170512185227_create_topic_status_updates_again.rb
@@ -1,4 +1,4 @@
-require 'table_migration_helper'
+require 'migration/table_dropper'
 
 class CreateTopicStatusUpdatesAgain < ActiveRecord::Migration[4.2]
   def up
@@ -14,7 +14,7 @@ class CreateTopicStatusUpdatesAgain < ActiveRecord::Migration[4.2]
       t.integer :category_id
     end
 
-    TableMigrationHelper.read_only_table('topic_status_updates')
+    Migration::TableDropper.read_only_table('topic_status_updates')
   end
 
   def down
diff --git a/db/migrate/20170717084947_create_user_emails.rb b/db/migrate/20170717084947_create_user_emails.rb
index 978c75bfdf8..449bf1a1777 100644
--- a/db/migrate/20170717084947_create_user_emails.rb
+++ b/db/migrate/20170717084947_create_user_emails.rb
@@ -1,4 +1,4 @@
-require_dependency 'column_dropper'
+require 'migration/column_dropper'
 
 class CreateUserEmails < ActiveRecord::Migration[4.2]
   def up
@@ -33,7 +33,7 @@ class CreateUserEmails < ActiveRecord::Migration[4.2]
     SQL
 
     change_column_null :users, :email, true
-    ColumnDropper.mark_readonly(:users, :email)
+    Migration::ColumnDropper.mark_readonly(:users, :email)
   end
 
   def down
diff --git a/db/migrate/20180109222722_create_user_second_factors.rb b/db/migrate/20180109222722_create_user_second_factors.rb
new file mode 100644
index 00000000000..ff038c17762
--- /dev/null
+++ b/db/migrate/20180109222722_create_user_second_factors.rb
@@ -0,0 +1,12 @@
+class CreateUserSecondFactors < ActiveRecord::Migration[5.1]
+  def change
+    create_table :user_second_factors do |t|
+      t.integer :user_id, null: false
+      t.integer :method, null: false
+      t.string :data, null: false
+      t.boolean :enabled, null: false, default: false
+      t.timestamp :last_used
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20180111092141_add_indexes_to_email_logs.rb b/db/migrate/20180111092141_add_indexes_to_email_logs.rb
new file mode 100644
index 00000000000..692c6dcb609
--- /dev/null
+++ b/db/migrate/20180111092141_add_indexes_to_email_logs.rb
@@ -0,0 +1,6 @@
+class AddIndexesToEmailLogs < ActiveRecord::Migration[5.1]
+  def change
+    add_index :email_logs, :post_id
+    add_index :email_logs, :topic_id
+  end
+end
diff --git a/db/migrate/20180118215249_create_theme_settings.rb b/db/migrate/20180118215249_create_theme_settings.rb
new file mode 100644
index 00000000000..4803641ec28
--- /dev/null
+++ b/db/migrate/20180118215249_create_theme_settings.rb
@@ -0,0 +1,12 @@
+class CreateThemeSettings < ActiveRecord::Migration[5.1]
+  def change
+    create_table :theme_settings do |t|
+      t.string :name, limit: 255, null: false
+      t.integer :data_type, null: false
+      t.text :value
+      t.integer :theme_id, null: false
+
+      t.timestamps null: false
+    end
+  end
+end
diff --git a/db/migrate/20180125185717_add_locked_by_to_posts.rb b/db/migrate/20180125185717_add_locked_by_to_posts.rb
new file mode 100644
index 00000000000..ec832cdd94c
--- /dev/null
+++ b/db/migrate/20180125185717_add_locked_by_to_posts.rb
@@ -0,0 +1,5 @@
+class AddLockedByToPosts < ActiveRecord::Migration[5.1]
+  def change
+    add_column :posts, :locked_by_id, :integer
+  end
+end
diff --git a/db/migrate/20180127005644_remove_old_ga_site_settings.rb b/db/migrate/20180127005644_remove_old_ga_site_settings.rb
new file mode 100644
index 00000000000..6c3f29df20f
--- /dev/null
+++ b/db/migrate/20180127005644_remove_old_ga_site_settings.rb
@@ -0,0 +1,10 @@
+class RemoveOldGaSiteSettings < ActiveRecord::Migration[5.1]
+  def up
+    execute "DELETE FROM site_settings WHERE name = 'ga_tracking_code'"
+    execute "DELETE FROM site_settings WHERE name = 'ga_domain_name'"
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20180131052859_rename_private_personal.rb b/db/migrate/20180131052859_rename_private_personal.rb
new file mode 100644
index 00000000000..8a4edead629
--- /dev/null
+++ b/db/migrate/20180131052859_rename_private_personal.rb
@@ -0,0 +1,26 @@
+class RenamePrivatePersonal < ActiveRecord::Migration[5.1]
+
+  def setting(old, new)
+    execute "UPDATE site_settings SET name='#{new}' where name='#{old}'"
+  end
+
+  def up
+    setting :min_private_message_post_length, :min_personal_message_post_length
+    setting :min_private_message_title_length, :min_personal_message_title_length
+    setting :enable_private_messages, :enable_personal_messages
+    setting :enable_private_email_messages, :enable_personal_email_messages
+    setting :private_email_time_window_seconds, :personal_email_time_window_seconds
+    setting :max_private_messages_per_day, :max_personal_messages_per_day
+    setting :default_email_private_messages, :default_email_personal_messages
+  end
+
+  def down
+    setting :min_personal_message_post_length, :min_private_message_post_length
+    setting :min_personal_message_title_length, :min_private_message_title_length
+    setting :enable_personal_messages, :enable_private_messages
+    setting :enable_personal_email_messages, :enable_private_email_messages
+    setting :personal_email_time_window_seconds, :private_email_time_window_seconds
+    setting :max_personal_messages_per_day, :max_private_messages_per_day
+    setting :default_email_personal_messages, :default_email_private_messages
+  end
+end
diff --git a/db/migrate/20180207161422_add_skipped_created_at_user_id_index_on_email_logs.rb b/db/migrate/20180207161422_add_skipped_created_at_user_id_index_on_email_logs.rb
new file mode 100644
index 00000000000..d8d13ff0ed8
--- /dev/null
+++ b/db/migrate/20180207161422_add_skipped_created_at_user_id_index_on_email_logs.rb
@@ -0,0 +1,8 @@
+class AddSkippedCreatedAtUserIdIndexOnEmailLogs < ActiveRecord::Migration[5.1]
+  def up
+    execute "CREATE INDEX idx_email_logs_user_created_filtered ON email_logs(user_id, created_at) WHERE skipped = 'f'"
+  end
+  def down
+    execute "DROP INDEX idx_email_logs_user_created_filtered"
+  end
+end
diff --git a/db/migrate/20180207163946_create_category_tag_stats.rb b/db/migrate/20180207163946_create_category_tag_stats.rb
new file mode 100644
index 00000000000..6ee70da8e75
--- /dev/null
+++ b/db/migrate/20180207163946_create_category_tag_stats.rb
@@ -0,0 +1,12 @@
+class CreateCategoryTagStats < ActiveRecord::Migration[5.1]
+  def change
+    create_table :category_tag_stats do |t|
+      t.references :category, null: false
+      t.references :tag, null: false
+      t.integer :topic_count, default: 0, null: false
+    end
+
+    add_index :category_tag_stats, [:category_id, :topic_count]
+    add_index :category_tag_stats, [:category_id, :tag_id], unique: true
+  end
+end
diff --git a/db/migrate/20180221215641_add_suppress_from_latest_to_categories.rb b/db/migrate/20180221215641_add_suppress_from_latest_to_categories.rb
new file mode 100644
index 00000000000..3a812a3c115
--- /dev/null
+++ b/db/migrate/20180221215641_add_suppress_from_latest_to_categories.rb
@@ -0,0 +1,11 @@
+class AddSuppressFromLatestToCategories < ActiveRecord::Migration[5.1]
+  def up
+    add_column :categories, :suppress_from_latest, :boolean, default: false
+    execute <<~SQL
+      UPDATE categories SET suppress_from_latest = suppress_from_homepage
+    SQL
+  end
+  def down
+    raise "can not be removed"
+  end
+end
diff --git a/db/migrate/20180223041147_fix_google_oauth2_prompt_data_type.rb b/db/migrate/20180223041147_fix_google_oauth2_prompt_data_type.rb
new file mode 100644
index 00000000000..1317ec46c4c
--- /dev/null
+++ b/db/migrate/20180223041147_fix_google_oauth2_prompt_data_type.rb
@@ -0,0 +1,16 @@
+class FixGoogleOauth2PromptDataType < ActiveRecord::Migration[5.1]
+  def up
+    sql = <<~SQL
+    UPDATE site_settings
+    SET data_type=#{SiteSettings::TypeSupervisor.types[:list]}
+    WHERE data_type=#{SiteSettings::TypeSupervisor.types[:enum]}
+    AND name='google_oauth2_prompt'
+    SQL
+
+    execute sql
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20180223222415_remove_censored_pattern_site_setting.rb b/db/migrate/20180223222415_remove_censored_pattern_site_setting.rb
new file mode 100644
index 00000000000..b82a300b9be
--- /dev/null
+++ b/db/migrate/20180223222415_remove_censored_pattern_site_setting.rb
@@ -0,0 +1,19 @@
+class RemoveCensoredPatternSiteSetting < ActiveRecord::Migration[5.1]
+  def up
+    execute <<~SQL
+      INSERT INTO user_histories
+        (action, acting_user_id, subject, previous_value,
+         new_value, admin_only, created_at, updated_at)
+      SELECT 3, -1, 'censored_pattern', value, '', true, now(), now()
+        FROM site_settings
+       WHERE name = 'censored_pattern'
+         AND value != ''
+    SQL
+
+    execute "DELETE FROM site_settings WHERE name = 'censored_pattern'"
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20180227161818_drop_unused_tables.rb b/db/migrate/20180227161818_drop_unused_tables.rb
new file mode 100644
index 00000000000..f0c735f0218
--- /dev/null
+++ b/db/migrate/20180227161818_drop_unused_tables.rb
@@ -0,0 +1,9 @@
+class DropUnusedTables < ActiveRecord::Migration[5.1]
+  def up
+    # Delayed drop of tables "category_featured_users" and "versions"
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20180309014014_add_private_key_to_remote_theme.rb b/db/migrate/20180309014014_add_private_key_to_remote_theme.rb
new file mode 100644
index 00000000000..81dc798a09b
--- /dev/null
+++ b/db/migrate/20180309014014_add_private_key_to_remote_theme.rb
@@ -0,0 +1,5 @@
+class AddPrivateKeyToRemoteTheme < ActiveRecord::Migration[5.1]
+  def change
+    add_column :remote_themes, :private_key, :text
+  end
+end
diff --git a/db/migrate/20180316092939_add_external_profile_and_card_background_url_to_single_sign_on_record.rb b/db/migrate/20180316092939_add_external_profile_and_card_background_url_to_single_sign_on_record.rb
new file mode 100644
index 00000000000..62a9393dad0
--- /dev/null
+++ b/db/migrate/20180316092939_add_external_profile_and_card_background_url_to_single_sign_on_record.rb
@@ -0,0 +1,6 @@
+class AddExternalProfileAndCardBackgroundUrlToSingleSignOnRecord < ActiveRecord::Migration[5.1]
+  def change
+    add_column :single_sign_on_records, :external_profile_background_url, :string
+    add_column :single_sign_on_records, :external_card_background_url, :string
+  end
+end
diff --git a/db/migrate/20180316165104_create_shared_drafts.rb b/db/migrate/20180316165104_create_shared_drafts.rb
new file mode 100644
index 00000000000..0371e695f9a
--- /dev/null
+++ b/db/migrate/20180316165104_create_shared_drafts.rb
@@ -0,0 +1,10 @@
+class CreateSharedDrafts < ActiveRecord::Migration[5.1]
+  def change
+    create_table :shared_drafts, id: false do |t|
+      t.integer :topic_id, null: false
+      t.integer :category_id, null: false
+      t.timestamps
+    end
+    add_index :shared_drafts, :topic_id, unique: true
+  end
+end
diff --git a/db/migrate/20180320190339_create_web_crawler_requests.rb b/db/migrate/20180320190339_create_web_crawler_requests.rb
new file mode 100644
index 00000000000..f02fd776344
--- /dev/null
+++ b/db/migrate/20180320190339_create_web_crawler_requests.rb
@@ -0,0 +1,11 @@
+class CreateWebCrawlerRequests < ActiveRecord::Migration[5.1]
+  def change
+    create_table :web_crawler_requests do |t|
+      t.date :date, null: false
+      t.string :user_agent, null: false
+      t.integer :count, null: false, default: 0
+    end
+
+    add_index :web_crawler_requests, [:date, :user_agent], unique: true
+  end
+end
diff --git a/db/migrate/20180323154826_create_tag_group_permissions.rb b/db/migrate/20180323154826_create_tag_group_permissions.rb
new file mode 100644
index 00000000000..74abffefc85
--- /dev/null
+++ b/db/migrate/20180323154826_create_tag_group_permissions.rb
@@ -0,0 +1,10 @@
+class CreateTagGroupPermissions < ActiveRecord::Migration[5.1]
+  def change
+    create_table :tag_group_permissions do |t|
+      t.references :tag_group,  null: false
+      t.references :group, null: false
+      t.integer :permission_type, default: 1, null: false
+      t.timestamps null: false
+    end
+  end
+end
diff --git a/db/migrate/20180323161659_add_id_to_shared_drafts.rb b/db/migrate/20180323161659_add_id_to_shared_drafts.rb
new file mode 100644
index 00000000000..33fd2b99bc9
--- /dev/null
+++ b/db/migrate/20180323161659_add_id_to_shared_drafts.rb
@@ -0,0 +1,5 @@
+class AddIdToSharedDrafts < ActiveRecord::Migration[5.1]
+  def change
+    add_column :shared_drafts, :id, :primary_key
+  end
+end
diff --git a/db/migrate/20180327062911_add_post_custom_fields_akismet_index.rb b/db/migrate/20180327062911_add_post_custom_fields_akismet_index.rb
new file mode 100644
index 00000000000..66fb4a227c6
--- /dev/null
+++ b/db/migrate/20180327062911_add_post_custom_fields_akismet_index.rb
@@ -0,0 +1,12 @@
+# This is our current pattern for data migrations needed by plugins, we prefer to keep them in core
+# so schema is tightly controlled, especially if we are amending tables owned by core
+#
+# this index makes looking up posts requiring review much faster (20ms on meta)
+
+class AddPostCustomFieldsAkismetIndex < ActiveRecord::Migration[5.1]
+  def change
+    add_index :post_custom_fields, [:post_id],
+      name: 'idx_post_custom_fields_akismet',
+      where: "name = 'AKISMET_STATE' AND value = 'needs_review'"
+  end
+end
diff --git a/db/migrate/20180328180317_add_category_index_to_shared_drafts.rb b/db/migrate/20180328180317_add_category_index_to_shared_drafts.rb
new file mode 100644
index 00000000000..cd1be7b23d4
--- /dev/null
+++ b/db/migrate/20180328180317_add_category_index_to_shared_drafts.rb
@@ -0,0 +1,5 @@
+class AddCategoryIndexToSharedDrafts < ActiveRecord::Migration[5.1]
+  def change
+    add_index :shared_drafts, :category_id
+  end
+end
diff --git a/db/migrate/20180331125522_add_minimum_required_tags_to_categories.rb b/db/migrate/20180331125522_add_minimum_required_tags_to_categories.rb
new file mode 100644
index 00000000000..646e370d012
--- /dev/null
+++ b/db/migrate/20180331125522_add_minimum_required_tags_to_categories.rb
@@ -0,0 +1,5 @@
+class AddMinimumRequiredTagsToCategories < ActiveRecord::Migration[5.1]
+  def change
+    add_column :categories, :minimum_required_tags, :integer, default: 0
+  end
+end
diff --git a/db/migrate/20180419095326_add_upload_id_to_user_exports.rb b/db/migrate/20180419095326_add_upload_id_to_user_exports.rb
new file mode 100644
index 00000000000..d29887e51ed
--- /dev/null
+++ b/db/migrate/20180419095326_add_upload_id_to_user_exports.rb
@@ -0,0 +1,5 @@
+class AddUploadIdToUserExports < ActiveRecord::Migration[5.1]
+  def change
+    add_column :user_exports, :upload_id, :integer
+  end
+end
diff --git a/db/migrate/20180420141134_remove_staff_tags_setting.rb b/db/migrate/20180420141134_remove_staff_tags_setting.rb
new file mode 100644
index 00000000000..4b473cb7adb
--- /dev/null
+++ b/db/migrate/20180420141134_remove_staff_tags_setting.rb
@@ -0,0 +1,52 @@
+class RemoveStaffTagsSetting < ActiveRecord::Migration[5.1]
+  def up
+    execute "INSERT INTO tag_group_permissions
+      (tag_group_id, group_id, permission_type, created_at, updated_at)
+      SELECT id, #{Group::AUTO_GROUPS[:everyone]},
+             #{TagGroupPermission.permission_types[:full]},
+             now(), now()
+        FROM tag_groups
+       WHERE id NOT IN (SELECT tag_group_id FROM tag_group_permissions)"
+
+    result = execute("SELECT value FROM site_settings WHERE name = 'staff_tags'").to_a
+    if result.length > 0
+      if tags = result[0]['value']&.split('|')
+        tag_group = execute(
+          "INSERT INTO tag_groups (name, created_at, updated_at)
+           VALUES ('staff tags', now(), now())
+           RETURNING id"
+        )
+
+        tag_group_id = tag_group[0]['id']
+
+        execute(
+          "INSERT INTO tag_group_permissions
+          (tag_group_id, group_id, permission_type, created_at, updated_at)
+          VALUES
+          (#{tag_group_id}, #{Group::AUTO_GROUPS[:everyone]},
+           #{TagGroupPermission.permission_types[:readonly]}, now(), now()),
+          (#{tag_group_id}, #{Group::AUTO_GROUPS[:staff]},
+           #{TagGroupPermission.permission_types[:full]}, now(), now())"
+        )
+
+        tags.each do |tag_name|
+          tag = execute("SELECT id FROM tags WHERE name = '#{tag_name}'").to_a
+          if tag[0] && tag[0]['id']
+            execute(
+              "INSERT INTO tag_group_memberships
+              (tag_id, tag_group_id, created_at, updated_at)
+              VALUES
+              (#{tag[0]['id']}, #{tag_group_id}, now(), now())"
+            )
+          end
+        end
+      end
+    end
+
+    execute "DELETE FROM site_settings WHERE name = 'staff_tags'"
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20180425152503_drop_user_card_badge_columns.rb b/db/migrate/20180425152503_drop_user_card_badge_columns.rb
new file mode 100644
index 00000000000..753aaaf7a1c
--- /dev/null
+++ b/db/migrate/20180425152503_drop_user_card_badge_columns.rb
@@ -0,0 +1,21 @@
+class DropUserCardBadgeColumns < ActiveRecord::Migration[5.1]
+  def up
+    # User card images have been moved to a plugin which uses the
+    # user's custom fields instead of the card_image_badge_id column.
+    execute "INSERT INTO user_custom_fields (user_id, name, value, created_at, updated_at)
+      SELECT user_id, 'card_image_badge_id', card_image_badge_id, now(), now()
+        FROM user_profiles
+       WHERE card_image_badge_id IS NOT NULL
+         AND user_id NOT IN (
+            SELECT user_id
+              FROM user_custom_fields
+             WHERE name = 'card_image_badge_id'
+         )"
+
+    # delayed drop of the user_profiles.card_image_badge_id column
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20180425185749_create_push_subscription.rb b/db/migrate/20180425185749_create_push_subscription.rb
new file mode 100644
index 00000000000..67936fcec05
--- /dev/null
+++ b/db/migrate/20180425185749_create_push_subscription.rb
@@ -0,0 +1,9 @@
+class CreatePushSubscription < ActiveRecord::Migration[5.1]
+  def change
+    create_table :push_subscriptions do |t|
+      t.integer :user_id, null: false
+      t.string :data, null: false
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20180504000531_remove_legacy_auth_token.rb b/db/migrate/20180504000531_remove_legacy_auth_token.rb
new file mode 100644
index 00000000000..19c785fb437
--- /dev/null
+++ b/db/migrate/20180504000531_remove_legacy_auth_token.rb
@@ -0,0 +1,5 @@
+class RemoveLegacyAuthToken < ActiveRecord::Migration[5.1]
+  def change
+    # placeholder so we can drop column in 009_users.rb
+  end
+end
diff --git a/db/migrate/20180508142711_remove_invite_passthrough_hours.rb b/db/migrate/20180508142711_remove_invite_passthrough_hours.rb
new file mode 100644
index 00000000000..5fbe7083cb0
--- /dev/null
+++ b/db/migrate/20180508142711_remove_invite_passthrough_hours.rb
@@ -0,0 +1,9 @@
+class RemoveInvitePassthroughHours < ActiveRecord::Migration[5.1]
+  def up
+    execute "DELETE FROM site_settings WHERE name = 'invite_passthrough_hours'"
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20180514133440_add_pm_topic_count_to_tags.rb b/db/migrate/20180514133440_add_pm_topic_count_to_tags.rb
new file mode 100644
index 00000000000..9bcf5724eb4
--- /dev/null
+++ b/db/migrate/20180514133440_add_pm_topic_count_to_tags.rb
@@ -0,0 +1,5 @@
+class AddPmTopicCountToTags < ActiveRecord::Migration[5.1]
+  def change
+    add_column :tags, :pm_topic_count, :integer, null: false, default: 0
+  end
+end
diff --git a/db/migrate/20180519053933_delete_confirm_old_email_template_overrides.rb b/db/migrate/20180519053933_delete_confirm_old_email_template_overrides.rb
new file mode 100644
index 00000000000..f1383030db2
--- /dev/null
+++ b/db/migrate/20180519053933_delete_confirm_old_email_template_overrides.rb
@@ -0,0 +1,11 @@
+class DeleteConfirmOldEmailTemplateOverrides < ActiveRecord::Migration[5.1]
+  def up
+    execute "DELETE FROM translation_overrides WHERE translation_key = 'user_notifications.confirm_old_email.title'"
+    execute "DELETE FROM translation_overrides WHERE translation_key = 'user_notifications.confirm_old_email.subject_template'"
+    execute "DELETE FROM translation_overrides WHERE translation_key = 'user_notifications.confirm_old_email.text_body_template'"
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20180521190040_allow_null_ip_topic_link_click.rb b/db/migrate/20180521190040_allow_null_ip_topic_link_click.rb
new file mode 100644
index 00000000000..b9f29e1aa84
--- /dev/null
+++ b/db/migrate/20180521190040_allow_null_ip_topic_link_click.rb
@@ -0,0 +1,10 @@
+class AllowNullIpTopicLinkClick < ActiveRecord::Migration[5.1]
+  def up
+    begin
+      Migration::SafeMigrate.disable!
+      change_column :topic_link_clicks, :ip_address, :inet, null: true
+    ensure
+      Migration::SafeMigrate.enable!
+    end
+  end
+end
diff --git a/db/migrate/20180521191418_allow_null_ip_user_profile_view.rb b/db/migrate/20180521191418_allow_null_ip_user_profile_view.rb
new file mode 100644
index 00000000000..0f5b3795c17
--- /dev/null
+++ b/db/migrate/20180521191418_allow_null_ip_user_profile_view.rb
@@ -0,0 +1,25 @@
+class AllowNullIpUserProfileView < ActiveRecord::Migration[5.1]
+  def up
+    begin
+      Migration::SafeMigrate.disable!
+      change_column :user_profile_views, :ip_address, :inet, null: true
+    ensure
+      Migration::SafeMigrate.enable!
+    end
+
+    remove_index :user_profile_views,
+      column: [:viewed_at, :ip_address, :user_profile_id],
+      name: :unique_profile_view_ip,
+      unique: true
+    remove_index :user_profile_views,
+      column: [:viewed_at, :user_id, :user_profile_id],
+      name: :unique_profile_view_user,
+      unique: true
+    add_index :user_profile_views, [:viewed_at, :user_id, :ip_address, :user_profile_id],
+      name: :unique_profile_view_user_or_ip,
+      unique: true
+  end
+
+  def down
+  end
+end
diff --git a/docs/ADMIN-QUICK-START-GUIDE.md b/docs/ADMIN-QUICK-START-GUIDE.md
index f02868df86e..045b964c3ab 100644
--- a/docs/ADMIN-QUICK-START-GUIDE.md
+++ b/docs/ADMIN-QUICK-START-GUIDE.md
@@ -83,7 +83,7 @@ All new users start out in a sandbox with restrictions for everyone's safety. **
 
 - post more than 2 hyperlinks
 - post any images or file attachments
-- send private messages
+- send personal messages
 - flag posts or topics
 - have actual links in the "about me" field of their profile
 - @name mention more than 2 users in a post
diff --git a/docs/AUTHORS.md b/docs/AUTHORS.md
index 6bb7ccdad55..7f3196ff1e7 100644
--- a/docs/AUTHORS.md
+++ b/docs/AUTHORS.md
@@ -1,16 +1,14 @@
+> ⚠ This document _only_ reflects the team at the time of the original release in February 2013. For a more detailed and up to date list of the many individuals that contributed to the design and development of Discourse since then, please refer to [the official Discourse website](http://www.discourse.org). For a list of people who have contributed to the codebase, see [GitHub's list of contributors](https://github.com/discourse/discourse/contributors).
+
 # The Core Discourse Team
 
 * [Jeff Atwood](//github.com/coding-horror) - Co-Founder, PM
 * [Robin Ward](//github.com/eviltrout) - Co-Founder, Developer
 * [Sam Saffron](//github.com/samsaffron) - Co-Founder, Developer
 * [Neil Lalonde](//github.com/nlalonde) - Developer
-* [Régis Hanol](//github.com/zogstrip) - Développeur
 
 ### Special Thanks To
 
 * Nick Sahler - Intern
 * Ryan Mudryk - CSS and HTML design implementation
 * Don Petersen - Developer, installation scripts
-
-*For a more detailed list of the many individuals that contributed to the design and development of Discourse outside of GitHub, please refer to [the official Discourse website](http://www.discourse.org).*
-*For a list of people who have contributed to the codebase, see [GitHub's list of contributors](https://github.com/discourse/discourse/contributors).*
diff --git a/docs/DEVELOPER-ADVANCED.md b/docs/DEVELOPER-ADVANCED.md
index 5bd9792d06c..7a99b643953 100644
--- a/docs/DEVELOPER-ADVANCED.md
+++ b/docs/DEVELOPER-ADVANCED.md
@@ -1,6 +1,6 @@
 # Discourse Advanced Developer Install Guide
 
-This guide is aimed at advanced Rails developers who have installed their own Rails apps before. If you are new to Rails, you are likely much better off with our **[Discourse Vagrant Developer Guide](VAGRANT.md)**.
+This guide is aimed at advanced Rails developers who have installed their own Rails apps before.
 
 Note: If you are developing on a Mac, you will probably want to look at [these instructions](DEVELOPMENT-OSX-NATIVE.md) as well.
 
diff --git a/docs/DEVELOPMENT-OSX-NATIVE.md b/docs/DEVELOPMENT-OSX-NATIVE.md
index 470930a7e41..ec4ae1ecefe 100644
--- a/docs/DEVELOPMENT-OSX-NATIVE.md
+++ b/docs/DEVELOPMENT-OSX-NATIVE.md
@@ -1,10 +1,10 @@
-# Developing under OS X Without Vagrant
+# Developing under OS X
 
 These instructions assume you have read and understood the **[Discourse Advanced Developer Install Guide](DEVELOPER-ADVANCED.md)**.
 
 OS X has become a popular platform for developing Ruby on Rails applications; as such, if you run OS X, you might find it more congenial to work on **[Discourse](http://discourse.org)** in your native environment. These instructions should get you there.
 
-Obviously, if you **already** develop Ruby on OS X, a lot of this will be redundant, because you'll have already done it, or something like it. If that's the case, you may well be able to just install Ruby 2.0 using RVM and get started! Discourse has enough dependencies, however (note: not a criticism!) that there's a good chance you'll find **something** else in this document that's useful for getting your Discourse development started!
+Obviously, if you **already** develop Ruby on OS X, a lot of this will be redundant, because you'll have already done it, or something like it. If that's the case, you may well be able to just install Ruby 2.3 using RVM and get started! Discourse has enough dependencies, however (note: not a criticism!) that there's a good chance you'll find **something** else in this document that's useful for getting your Discourse development started!
 
 ## Quick Setup
 
@@ -79,8 +79,8 @@ If you do already have RVM installed, this should make sure everything is up to
 Either way, you'll now want to install the 'turbo' version of Ruby 2.0.
 
     # Now, install Ruby
-    rvm install 2.0.0-turbo
-    rvm use 2.0.0-turbo --default # Careful with this if you're already developing Ruby
+    rvm install 2.3.4-turbo
+    rvm use 2.3.4 --default # Careful with this if you're already developing Ruby
 
 ## Git
 
diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md
index aaca49a3ad7..89a9a20e219 100644
--- a/docs/INSTALL-cloud.md
+++ b/docs/INSTALL-cloud.md
@@ -53,6 +53,16 @@ You will need to be root through the rest of the setup and bootstrap process.
 
 - To ensure mail deliverability, you must add valid [SPF and DKIM records](https://www.google.com/search?q=spf+dkim) in your DNS. See your mail provider instructions for specifics.
 
+### Domain Name
+
+> 🔔 Discourse will not work from an IP address, you must own a domain name such as `example.com` to proceed.
+
+- Already own a domain name? Great. Select a subdomain such as `discourse.example.com` or `talk.example.com` or `forum.example.com` for your Discourse instance.
+
+- No domain name? We can [recommend NameCheap](https://www.namecheap.com/domains/domain-name-search.aspx?utm_source=SAS&utm_medium=Affiliate&utm_campaign=1632369&affnetwork=sas), or there are many other [great domain name registrars](https://www.google.com/search?q=best+domain+name+registrars) to choose from.
+
+- Your DNS controls should be accessible from the place where you purchased your domain name. Create a DNS A record for the `discourse.example.com` subdomain in your DNS control panel, pointing to the IP address of your cloud instance where you are installing Discourse.
+
 ### Edit Discourse Configuration
 
 Launch the setup tool at
@@ -62,14 +72,17 @@ Launch the setup tool at
 Answer the following questions when prompted:
 
     Hostname for your Discourse? [discourse.example.com]: 
-    Email address for admin account? [me@example.com]: 
+    Email address for admin account(s)? [me@example.com,you@example.com]: 
     SMTP server address? [smtp.example.com]: 
-    SMTP user name? [postmaster@discourse.example.com]: 
-    SMTP port [587]:
-    SMTP password? []: 
+    SMTP port? [587]: 
+    SMTP user name? [user@example.com]: 
+    SMTP password? [pa$$word]: 
+    Let's Encrypt account email? (ENTER to skip) [me@example.com]: 
 
 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 these settings after bootstrapping, you can run `./discourse-setup` again (it will read your old values from the file) or edit `/containers/app.yml` with `nano` and then `./launcher rebuild app`, otherwise your changes will not take effect.
 
+**NOTE:** You should not attempt to enable Let's Encrypt unless the DNS record for hostname resolves to your server. You can run `./discourse-setup` again later to make any changes.
+
 ### 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`.
diff --git a/docs/INSTALL-digital-ocean.md b/docs/INSTALL-digital-ocean.md
deleted file mode 100644
index 8c46e0cdf1d..00000000000
--- a/docs/INSTALL-digital-ocean.md
+++ /dev/null
@@ -1 +0,0 @@
-This file has moved; please navigate to https://github.com/discourse/discourse/blob/master/docs/INSTALL-cloud.md
diff --git a/docs/VAGRANT.md b/docs/VAGRANT.md
deleted file mode 100644
index 32a8fa7ac70..00000000000
--- a/docs/VAGRANT.md
+++ /dev/null
@@ -1,164 +0,0 @@
-# Discourse Developer Install Guide (Vagrant)
-
-### If you are on a Mac or PC, please try our [Discourse as Your First Rails App](http://blog.discourse.org/2013/04/discourse-as-your-first-rails-app/) blog post first!
-
-(If you have experience setting up Rails projects, you might want to take a look at our **[Discourse Advanced Developer Guide](DEVELOPER-ADVANCED.md)**. It also contains instructions on building your own Vagrant VM.)
-
-The following instructions will automatically download and provision a virtual machine for you to begin hacking
-on Discourse with:
-
-### Getting Started
-
-1. Install Git: http://git-scm.com/downloads (or [GitHub for Windows](http://windows.github.com/) if you want a GUI)
-2. Install VirtualBox: https://www.virtualbox.org/wiki/Downloads
-3. Install Vagrant: http://www.vagrantup.com/ (We require Vagrant 1.7.2 or later)
-4. Open a terminal
-5. Clone the project: `git clone https://github.com/discourse/discourse.git`
-6. Enter the project directory: `cd discourse`
-
-### Using Vagrant
-
-When you're ready to start working, boot the VM:
-```
-vagrant up
-```
-
-Vagrant will prompt you for your admin password. This is so it can mount your local files inside the VM for an easy workflow.
-
-(The first time you do this, it will take a while as it downloads the VM image and installs it. Go grab a coffee.)
-
-**Note to Linux users**: Your Discourse directory cannot be on an ecryptfs mount or you will receive an error: `exportfs: /home/your/path/to/discourse does not support NFS export`
-
-**Note to OSX/Linux users**: Vagrant will mount your local files via an NFS share. Therefore, make sure that NFS is installed or else you'll receive the error message:
-
-```
-Mounting NFS shared folders failed. This is most often caused by the NFS
-client software not being installed on the guest machine. Please verify
-that the NFS client software is properly installed, and consult any resources
-specific to the linux distro you're using for more information on how to
-do this.
-```
-
-For example, on Ubuntu, you can install NFS support by installing nfs-kernel-server with `apt-get install`.
-
-Once the machine has booted up, you can shell into it by typing:
-
-```
-vagrant ssh
-```
-
-The discourse code is found in the /vagrant directory in the image.
-
-**Note to Windows users**: You cannot run ```vagrant ssh``` from a cmd prompt; you'll receive the error message:
-
-```
-`vagrant ssh` isn't available on the Windows platform. You are still able
-to SSH into the virtual machine if you get a Windows SSH client (such as
-PuTTY). The authentication information is shown below:
-
-Host: 127.0.0.1
-Port: 2222
-Username: vagrant
-Private key: C:/Users/Your Name/.vagrant.d/insecure_private_key
-```
-
-At this point, you will want to get an SSH client, and use it to connect to your Vagrant VM instead. We recommend
-PuTTY:
-
-**[PuTTY Download Link](http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html)**
-
-You may use this client to connect to the VM by using ```vagrant/vagrant``` as your username/password, or by [using
-PuTTYGen to import the insecure_private_key file](http://jason.sharonandjason.com/key_based_putty_logins_mini_how_to.htm)
-(mentioned above) into a PuTTY profile to quickly access your VM.
-
-### Keeping your VM up to date (and first install)
-
-Now you're in a virtual machine is almost ready to start developing. It's a good idea to perform the following instructions
-*every time* you pull from master to ensure your environment is still up to date.
-
-```
-cd /vagrant
-bundle install
-bundle exec rake db:migrate
-```
-
-### Starting Rails
-
-Once your VM is up to date, you can start a rails instance using the following command from the /vagrant directory:
-
-```
-bundle exec rails s -b 0.0.0.0
-```
-
-In a few seconds, rails will start serving pages. To access them, open a web browser to [http://localhost:4000](http://localhost:4000) - if it all worked you should see discourse! Congratulations, you are ready to start working!
-
-You can now edit files on your local file system, using your favorite text editor or IDE. When you reload your web browser, it should have the latest changes.
-
-### Creating an Admin User
-
-You'll want an admin account to be able to do anything fun on your new Discourse environment. Enter your vagrant image by using `vagrant ssh` then
-run the following command and follow the instructions:
-
-```bash
-bundle exec rake admin:create
-```
-
-Your admin account should be approved. Log in in your browser and you're good to go!
-
-### Tests
-
-If you're actively working on Discourse, we recommend that you run rake autospec, which will run the specs.  It’s very, very smart. It’ll abort very long test runs. So if it starts running all of the specs and then you just start editing a spec file and save it, it knows that it’s time to interrupt the spec suite, run this one spec for you, then it’ll keep running these specs until they pass as well. If you fail a spec by saving it and then go and start editing around the project to try and fix that spec, it’ll detect that and run that one failing spec, not a hundred of them.
-
-To use it, follow all the above steps. Once rails is running, open a new terminal window or tab, and then do this:
-
-```
-vagrant ssh
-cd /vagrant
-RAILS_ENV=test bundle exec rake db:migrate
-bundle exec rake autospec p l=5
-```
-
-When developing a plugin (the *poll* plugin for instance), the following can be used to only run all tests from the *spec* directory:
-
-```
-bundle exec rake plugin:spec poll
-```
-
-or just a single file with:
-
-```
-LOAD_PLUGINS=1 bundle exec rspec plugins/poll/spec/controllers/posts_controller_spec.rb
-```
-
-For more insight into testing Discourse, see [this discussion](http://rubyrogues.com/117-rr-discourse-part-2-with-sam-saffron-and-robin-ward/) with the Ruby Rogues.
-
-### Sending Email
-
-Mail is sent asynchronously by Sidekiq, so you'll need to have sidekiq running to process jobs. Run it with this command in the /vagrant directory:
-
-```
-bundle exec sidekiq
-```
-
-Mailcatcher is used to avoid the whole issue of actually sending emails: https://github.com/sj26/mailcatcher
-
-Mailcatcher is already installed in the vm, and there's an alias to launch it:
-
-```
-mailcatcher --http-ip=0.0.0.0
-```
-Running the above command might throw out the `'method_missing'` error in the terminal. This can be fixed by upgrading rubygems to the latest version which can be done by running the following in the /vagrant directory:
-
-```
-gem update --system
-```
-
-Then in a browser, go to [http://localhost:4080](http://localhost:4080). Sent emails will be received by mailcatcher and shown in its web ui.
-
-### Shutting down the VM
-
-When you're done working on Discourse, you can shut down Vagrant with:
-
-```
-vagrant halt
-```
diff --git a/docs/vagrant.screen b/docs/vagrant.screen
deleted file mode 100644
index e6c33482785..00000000000
--- a/docs/vagrant.screen
+++ /dev/null
@@ -1,18 +0,0 @@
-# GNU screen configuration file for Discourse vagrant image
-
-# Start up development support commands in detached mode:
-#   screen -d -m -c docs/vagrant.screen
-
-# Start in attached mode:
-# screen -m -c docs/vagrant.screen
-
-# commands that exit hang around until you hit 'k' to kill or 'r' to restart
-zombie kr
-
-screen -t rails_s 0 bash -c 'echo Starting rails server...;  cd /vagrant; bundle exec rails s -b 0.0.0.0'
-screen -t rails_c 1 bash -c 'echo Starting rails console...; cd /vagrant; bundle exec rails c'
-screen -t sidekiq 2 bash -c 'echo Starting sidekiq...;       cd /vagrant; bundle exec sidekiq -l log/sidekiq.log'
-screen -t mail    3 bash -c 'echo Starting mailcatcher...;   cd /; mailcatcher --ip 0.0.0.0'
-screen -t bash    4 bash
-
-scrollback 50000
diff --git a/lib/admin_constraint.rb b/lib/admin_constraint.rb
index db5c0e73b64..1d0291cd7f1 100644
--- a/lib/admin_constraint.rb
+++ b/lib/admin_constraint.rb
@@ -9,9 +9,17 @@ class AdminConstraint
   def matches?(request)
     return false if @require_master && RailsMultisite::ConnectionManagement.current_db != "default"
     provider = Discourse.current_user_provider.new(request.env)
-    provider.current_user && provider.current_user.admin?
+    provider.current_user &&
+      provider.current_user.admin? &&
+      custom_admin_check(request)
   rescue Discourse::InvalidAccess
     false
   end
 
+  # Extensibility point: plugins can overwrite this to add additional checks
+  # if they require.
+  def custom_admin_check(request)
+    true
+  end
+
 end
diff --git a/lib/admin_user_index_query.rb b/lib/admin_user_index_query.rb
index b9d74e8a52d..baf20275da7 100644
--- a/lib/admin_user_index_query.rb
+++ b/lib/admin_user_index_query.rb
@@ -63,7 +63,7 @@ class AdminUserIndexQuery
     if params[:stats].present? && params[:stats] == false
       klass.order(order.reject(&:blank?).join(","))
     else
-      klass.includes(:user_stat).order(order.reject(&:blank?).join(","))
+      klass.includes(:user_stat, :user_second_factor).order(order.reject(&:blank?).join(","))
     end
   end
 
@@ -98,21 +98,10 @@ class AdminUserIndexQuery
     when 'suspended'  then @query.suspended
     when 'pending'    then @query.not_suspended.where(approved: false, active: true)
     when 'suspect'    then suspect_users
+    when 'staged'     then @query.where(staged: true)
     end
   end
 
-  def filter_by_user_with_bypass(filter)
-    if filter =~ /.+@.+/
-      # probably an email so try the bypass
-      user_id = UserEmail.where(email: filter.downcase).pluck(:user_id).first
-      if user_id
-        return @query.where('users.id = ?', user_id)
-      end
-    end
-
-    @query.where('username_lower ILIKE :filter OR user_emails.email ILIKE :filter', filter: "%#{params[:filter]}%")
-  end
-
   def filter_by_search
     if params[:email].present?
       return @query.where('user_emails.email = ?', params[:email].downcase)
@@ -124,7 +113,7 @@ class AdminUserIndexQuery
       if ip = IPAddr.new(filter) rescue nil
         @query.where('ip_address <<= :ip OR registration_ip_address <<= :ip', ip: ip.to_cidr_s)
       else
-        filter_by_user_with_bypass(filter)
+        @query.filter_by_username_or_email(filter)
       end
     end
   end
diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index 105ae538390..4d7521046c8 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -5,15 +5,16 @@ require_dependency "rate_limiter"
 
 class Auth::DefaultCurrentUserProvider
 
-  CURRENT_USER_KEY ||= "_DISCOURSE_CURRENT_USER".freeze
-  API_KEY ||= "api_key".freeze
-  USER_API_KEY ||= "HTTP_USER_API_KEY".freeze
-  USER_API_CLIENT_ID ||= "HTTP_USER_API_CLIENT_ID".freeze
-  API_KEY_ENV ||= "_DISCOURSE_API".freeze
-  USER_API_KEY_ENV ||= "_DISCOURSE_USER_API".freeze
-  TOKEN_COOKIE ||= "_t".freeze
-  PATH_INFO ||= "PATH_INFO".freeze
+  CURRENT_USER_KEY ||= "_DISCOURSE_CURRENT_USER"
+  API_KEY ||= "api_key"
+  USER_API_KEY ||= "HTTP_USER_API_KEY"
+  USER_API_CLIENT_ID ||= "HTTP_USER_API_CLIENT_ID"
+  API_KEY_ENV ||= "_DISCOURSE_API"
+  USER_API_KEY_ENV ||= "_DISCOURSE_USER_API"
+  TOKEN_COOKIE ||= ENV['DISCOURSE_TOKEN_COOKIE'] || "_t"
+  PATH_INFO ||= "PATH_INFO"
   COOKIE_ATTEMPTS_PER_MIN ||= 10
+  BAD_TOKEN ||= "_DISCOURSE_BAD_TOKEN"
 
   # do all current user initialization here
   def initialize(env)
@@ -58,13 +59,20 @@ class Auth::DefaultCurrentUserProvider
         current_user = @user_token.try(:user)
       end
 
-      unless current_user
+      if !current_user
+        @env[BAD_TOKEN] = true
         begin
           limiter.performed!
         rescue RateLimiter::LimitExceeded
-          raise Discourse::InvalidAccess
+          raise Discourse::InvalidAccess.new(
+            'Invalid Access',
+            nil,
+            delete_cookie: TOKEN_COOKIE
+          )
         end
       end
+    elsif @env['HTTP_DISCOURSE_LOGGED_IN']
+      @env[BAD_TOKEN] = true
     end
 
     if current_user && should_update_last_seen?
@@ -82,8 +90,11 @@ class Auth::DefaultCurrentUserProvider
       raise Discourse::InvalidAccess if current_user.suspended? || !current_user.active
       @env[API_KEY_ENV] = true
 
-      limiter_min = RateLimiter.new(nil, "admin_api_min_#{api_key}", GlobalSetting.max_admin_api_reqs_per_key_per_minute, 60)
-      limiter_min.performed!
+      # we do not run this rate limiter while profiling
+      if Rails.env != "profile"
+        limiter_min = RateLimiter.new(nil, "admin_api_min_#{api_key}", GlobalSetting.max_admin_api_reqs_per_key_per_minute, 60)
+        limiter_min.performed!
+      end
     end
 
     # user api key handling
@@ -120,7 +131,6 @@ class Auth::DefaultCurrentUserProvider
   end
 
   def refresh_session(user, session, cookies)
-
     # if user was not loaded, no point refreshing session
     # it could be an anonymous path, this would add cost
     return if is_api? || !@env.key?(CURRENT_USER_KEY)
@@ -130,15 +140,12 @@ class Auth::DefaultCurrentUserProvider
 
       needs_rotation = @user_token.auth_token_seen ? rotated_at < UserAuthToken::ROTATE_TIME.ago : rotated_at < UserAuthToken::URGENT_ROTATE_TIME.ago
 
-      if !@user_token.legacy && needs_rotation
+      if needs_rotation
         if @user_token.rotate!(user_agent: @env['HTTP_USER_AGENT'],
                                client_ip: @request.ip,
                                path: @env['REQUEST_PATH'])
           cookies[TOKEN_COOKIE] = cookie_hash(@user_token.unhashed_auth_token)
         end
-      elsif @user_token.legacy
-        # make a new token
-        log_on_user(user, session, cookies)
       end
     end
 
@@ -154,6 +161,7 @@ class Auth::DefaultCurrentUserProvider
                                           client_ip: @request.ip)
 
     cookies[TOKEN_COOKIE] = cookie_hash(@user_token.unhashed_auth_token)
+    unstage_user(user)
     make_developer_admin(user)
     enable_bootstrap_mode(user)
     @env[CURRENT_USER_KEY] = user
@@ -174,6 +182,13 @@ class Auth::DefaultCurrentUserProvider
     hash
   end
 
+  def unstage_user(user)
+    if user.staged
+      user.unstage
+      user.save
+    end
+  end
+
   def make_developer_admin(user)
     if  user.active? &&
         !user.admin &&
@@ -185,11 +200,16 @@ class Auth::DefaultCurrentUserProvider
   end
 
   def enable_bootstrap_mode(user)
-    Jobs.enqueue(:enable_bootstrap_mode, user_id: user.id) if user.admin && user.last_seen_at.nil? && !SiteSetting.bootstrap_mode_enabled && user.is_singular_admin?
+    return if SiteSetting.bootstrap_mode_enabled
+
+    if user.admin && user.last_seen_at.nil? && user.is_singular_admin?
+      Jobs.enqueue(:enable_bootstrap_mode, user_id: user.id)
+    end
   end
 
   def log_off_user(session, cookies)
     user = current_user
+
     if SiteSetting.log_out_strict && user
       user.user_auth_tokens.destroy_all
 
@@ -259,6 +279,10 @@ class Auth::DefaultCurrentUserProvider
         api_key.user if !api_username || (api_key.user.username_lower == api_username.downcase)
       elsif api_username
         User.find_by(username_lower: api_username.downcase)
+      elsif user_id = request["api_user_id"]
+        User.find_by(id: user_id.to_i)
+      elsif external_id = request["api_user_external_id"]
+        SingleSignOnRecord.find_by(external_id: external_id.to_s).try(:user)
       end
     end
   end
diff --git a/lib/auth/facebook_authenticator.rb b/lib/auth/facebook_authenticator.rb
index f969c8dabf0..50e717d7395 100644
--- a/lib/auth/facebook_authenticator.rb
+++ b/lib/auth/facebook_authenticator.rb
@@ -57,9 +57,6 @@ class Auth::FacebookAuthenticator < Auth::Authenticator
               strategy.options[:client_id] = SiteSetting.facebook_app_id
               strategy.options[:client_secret] = SiteSetting.facebook_app_secret
               strategy.options[:info_fields] = 'gender,email,name,about,first_name,link,last_name,website,location'
-              if SiteSetting.facebook_request_extra_profile_details
-                strategy.options[:scope] = 'email,user_about_me,user_location,user_website'
-              end
            },
            scope: "email"
   end
diff --git a/lib/auth/github_authenticator.rb b/lib/auth/github_authenticator.rb
index bde25ed5d16..2d3f705cf30 100644
--- a/lib/auth/github_authenticator.rb
+++ b/lib/auth/github_authenticator.rb
@@ -41,14 +41,14 @@ class Auth::GithubAuthenticator < Auth::Authenticator
       # If there's existing user info with the given GitHub ID, that's all we
       # need to know.
       user = user_info.user
-      result.email = data[:email],
-      result.email_valid = !!data[:email_verified]
+      result.email = data[:email]
+      result.email_valid = data[:email].present?
     else
       # Potentially use *any* of the emails from GitHub to find a match or
       # register a new user, with preference given to the primary email.
       all_emails = Array.new(auth_token[:extra][:all_emails])
-      all_emails.unshift(email: data[:email],
-                         verified: !!data[:email_verified])
+      primary = all_emails.detect { |email| email[:primary] && email[:verified] }
+      all_emails.unshift(primary) if primary.present?
 
       # Only consider verified emails to match an existing user.  We don't want
       # someone to be able to create a GitHub account with an unverified email
diff --git a/lib/auth/google_oauth2_authenticator.rb b/lib/auth/google_oauth2_authenticator.rb
index dcee38d217f..e477c55edc0 100644
--- a/lib/auth/google_oauth2_authenticator.rb
+++ b/lib/auth/google_oauth2_authenticator.rb
@@ -44,22 +44,28 @@ class Auth::GoogleOAuth2Authenticator < Auth::Authenticator
   def after_create_account(user, auth)
     data = auth[:extra_data]
     GoogleUserInfo.create({ user_id: user.id }.merge(data))
-    if auth[:email_valid].to_s == 'true' && data[:email]&.downcase == user.email
-      EmailToken.confirm(user.email_tokens.first.token)
-      user.set_automatic_groups
-    end
   end
 
   def register_middleware(omniauth)
+    options = {
+      setup: lambda { |env|
+        strategy = env["omniauth.strategy"]
+         strategy.options[:client_id] = SiteSetting.google_oauth2_client_id
+         strategy.options[:client_secret] = SiteSetting.google_oauth2_client_secret
+      },
+      skip_jwt: true
+    }
+
+    if (google_oauth2_prompt = SiteSetting.google_oauth2_prompt).present?
+      options[:prompt] = google_oauth2_prompt.gsub("|", " ")
+    end
+
+    google_oauth2_hd = SiteSetting.google_oauth2_hd
+    options[:hd] = google_oauth2_hd if google_oauth2_hd.present?
+
     # jwt encoding is causing auth to fail in quite a few conditions
     # skipping
-    omniauth.provider :google_oauth2,
-           setup: lambda { |env|
-             strategy = env["omniauth.strategy"]
-              strategy.options[:client_id] = SiteSetting.google_oauth2_client_id
-              strategy.options[:client_secret] = SiteSetting.google_oauth2_client_secret
-           },
-           skip_jwt: true
+    omniauth.provider :google_oauth2, options
   end
 
   protected
diff --git a/lib/auth/result.rb b/lib/auth/result.rb
index 35204bb7e35..9f34d2c62e2 100644
--- a/lib/auth/result.rb
+++ b/lib/auth/result.rb
@@ -4,7 +4,7 @@ class Auth::Result
                 :awaiting_approval, :authenticated, :authenticator_name,
                 :requires_invite, :not_allowed_from_ip_address,
                 :admin_not_allowed_from_ip_address, :omit_username,
-                :skip_email_validation
+                :skip_email_validation, :destination_url, :omniauth_disallow_totp
 
   attr_accessor(
     :failed,
@@ -42,13 +42,24 @@ class Auth::Result
                                      date: I18n.l(user.suspended_till, format: :date_only), reason: user.suspend_reason)
         }
       else
-        {
-          authenticated: !!authenticated,
-          awaiting_activation: !!awaiting_activation,
-          awaiting_approval: !!awaiting_approval,
-          not_allowed_from_ip_address: !!not_allowed_from_ip_address,
-          admin_not_allowed_from_ip_address: !!admin_not_allowed_from_ip_address
-        }
+        result =
+          if omniauth_disallow_totp
+            {
+              omniauth_disallow_totp: !!omniauth_disallow_totp,
+              email: email
+            }
+          else
+            {
+              authenticated: !!authenticated,
+              awaiting_activation: !!awaiting_activation,
+              awaiting_approval: !!awaiting_approval,
+              not_allowed_from_ip_address: !!not_allowed_from_ip_address,
+              admin_not_allowed_from_ip_address: !!admin_not_allowed_from_ip_address
+            }
+          end
+
+        result[:destination_url] = destination_url if authenticated && destination_url.present?
+        result
       end
     else
       result = { email: email,
diff --git a/lib/autospec/qunit_runner.rb b/lib/autospec/qunit_runner.rb
index 051fcb0409c..4adafeba373 100644
--- a/lib/autospec/qunit_runner.rb
+++ b/lib/autospec/qunit_runner.rb
@@ -66,7 +66,7 @@ module Autospec
         end
       end
 
-      cmd = "node #{Rails.root}/lib/autospec/run-qunit.js \"#{qunit_url}\""
+      cmd = "node #{Rails.root}/vendor/assets/javascripts/run-qunit.js \"#{qunit_url}\" 3000000 ./tmp/qunit_result"
 
       @pid = Process.spawn(cmd)
       _, status = Process.wait2(@pid)
diff --git a/lib/autospec/rspec_runner.rb b/lib/autospec/rspec_runner.rb
index 03b49f63d84..34e4043df30 100644
--- a/lib/autospec/rspec_runner.rb
+++ b/lib/autospec/rspec_runner.rb
@@ -23,6 +23,8 @@ module Autospec
     watch(%r{^plugins/.*/discourse-markdown/.*\.js\.es6$}) { "spec/components/pretty_text_spec.rb" }
 
     watch(%r{^plugins/.*/spec/.*\.rb})
+    watch(%r{^(plugins/.*/)plugin\.rb})     { |m| "#{m[1]}spec" }
+    watch(%r{^(plugins/.*)/(lib|app)})    { |m| "#{m[1]}/spec/integration" }
     watch(%r{^(plugins/.*)/lib/(.*)\.rb}) { |m| "#{m[1]}/spec/lib/#{m[2]}_spec.rb" }
 
     RELOADERS = Set.new
diff --git a/lib/autospec/run-qunit.js b/lib/autospec/run-qunit.js
deleted file mode 100644
index 2c2bd860734..00000000000
--- a/lib/autospec/run-qunit.js
+++ /dev/null
@@ -1,182 +0,0 @@
-// Chrome QUnit Test Runner
-// Author: David Taylor
-// Requires chrome-launcher and chrome-remote-interface from npm
-// An up-to-date version of chrome is also required
-
-/* globals Promise */
-
-var args = process.argv.slice(2);
-
-if (args.length < 1 || args.length > 2) {
-  console.log("Usage: node run-qunit.js <URL> <timeout>");
-  process.exit(1);
-}
-
-const chromeLauncher = require('chrome-launcher');
-const CDP = require('chrome-remote-interface');
-const fs = require('fs');
-const QUNIT_RESULT = "./tmp/qunit_result";
-
-(async () => {
-  await fs.stat(QUNIT_RESULT, (err, stats) => {
-    if (stats && stats.isFile()) fs.unlink(QUNIT_RESULT);
-  });
-})();
-
-(function() {
-
-  function launchChrome() {
-    return chromeLauncher.launch({
-      chromeFlags: [
-        '--disable-gpu',
-       '--headless',
-       '--no-sandbox'
-      ]
-    });
-  }
-
-  launchChrome().then(chrome => {
-    CDP({
-      port: chrome.port
-    }).then(protocol => {
-      const {Page, Runtime} = protocol;
-      Promise.all([Page.enable(), Runtime.enable()]).then(()=>{
-
-        Runtime.consoleAPICalled((response) => {
-          const message = response['args'][0].value;
-
-          // If it's a simple test result, write without newline
-          if (message === "." || message === "F") {
-            process.stdout.write(message);
-          } else if (message.startsWith("AUTOSPEC:")) {
-            fs.appendFileSync(QUNIT_RESULT, `${message.slice(10)}\n`);
-          } else {
-            console.log(message);
-          }
-        });
-
-        Page.navigate({
-          url: args[0]
-        });
-
-        Page.loadEventFired(() => {
-
-          Runtime.evaluate({
-            expression: `(${qunit_script})()`
-          }).then(() => {
-            const timeout = parseInt(args[1] || 300000, 10);
-            var start = Date.now();
-
-            var interval = setInterval(() => {
-              if (Date.now() > start + timeout) {
-                console.error("Tests timed out");
-
-                protocol.close();
-                chrome.kill();
-                process.exit(124);
-              } else {
-
-                Runtime.evaluate({
-                  expression: `(${check_script})()`
-                }).then(numFails => {
-                  if (numFails.result.type !== 'undefined') {
-                    clearInterval(interval);
-                    protocol.close();
-                    chrome.kill();
-
-                    if (numFails.result.value > 0) {
-                      process.exit(1);
-                    } else {
-                      process.exit();
-                    }
-                  }
-                }).catch(error);
-              }
-            }, 250);
-          }).catch(error(1));
-        });
-      }).catch(error(3));
-    }).catch(error(4));
-  }).catch(error(5));
-})();
-
-function error(code){
-  return function(){
-    console.log("A promise failed to resolve code:"+code);
-    process.exit(1);
-  };
-}
-
-// The following functions are converted to strings
-// And then sent to chrome to be evalaluated
-function logQUnit() {
-  var moduleErrors = [];
-  var testErrors = [];
-  var assertionErrors = [];
-
-  console.log("\nRunning: " + JSON.stringify(QUnit.urlParams) + "\n");
-
-  QUnit.config.testTimeout = 10000;
-
-  QUnit.moduleDone(function(context) {
-    if (context.failed) {
-      var msg = "Module Failed: " + context.name + "\n" + testErrors.join("\n");
-      moduleErrors.push(msg);
-      testErrors = [];
-    }
-  });
-
-  QUnit.testDone(function(context) {
-    if (context.failed) {
-      var msg = "  Test Failed: " + context.name + assertionErrors.join("    ");
-      console.log(`AUTOSPEC: ${context.module}:::${context.testId}:::${context.name}`);
-      testErrors.push(msg);
-      assertionErrors = [];
-      console.log("F");
-    } else {
-      console.log(".");
-    }
-  });
-
-  QUnit.log(function(context) {
-    if (context.result) { return; }
-
-    var msg = "\n    Assertion Failed:";
-    if (context.message) {
-      msg += " " + context.message;
-    }
-
-    if (context.expected) {
-      msg += "\n      Expected: " + context.expected + ", Actual: " + context.actual;
-    }
-
-    assertionErrors.push(msg);
-  });
-
-  QUnit.done(function(context) {
-    console.log("\n");
-
-    if (moduleErrors.length > 0) {
-      for (var idx=0; idx<moduleErrors.length; idx++) {
-        console.error(moduleErrors[idx]+"\n");
-      }
-    }
-
-    var stats = [
-      "Time: " + context.runtime + "ms",
-      "Total: " + context.total,
-      "Passed: " + context.passed,
-      "Failed: " + context.failed
-    ];
-    console.log(stats.join(", "));
-    window.qunitDone = context;
-  });
-}
-const qunit_script = logQUnit.toString();
-
-function check() {
-  if(window.qunitDone){
-    return window.qunitDone.failed;
-  }
-}
-const check_script = check.toString();
diff --git a/lib/backup_restore/backup_restore.rb b/lib/backup_restore/backup_restore.rb
index 99789e139ca..a0a217556e3 100644
--- a/lib/backup_restore/backup_restore.rb
+++ b/lib/backup_restore/backup_restore.rb
@@ -110,8 +110,8 @@ module BackupRestore
     config = config.with_indifferent_access
 
     DatabaseConfiguration.new(
-      config["host"],
-      config["port"],
+      config["backup_host"] || config["host"],
+      config["backup_port"] || config["port"],
       config["username"] || ENV["USER"] || "postgres",
       config["password"],
       config["database"]
diff --git a/lib/backup_restore/backuper.rb b/lib/backup_restore/backuper.rb
index 9465457092d..491d2cf5c3b 100644
--- a/lib/backup_restore/backuper.rb
+++ b/lib/backup_restore/backuper.rb
@@ -316,8 +316,8 @@ module BackupRestore
 
     def log(message)
       timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-      puts(message) rescue nil
-      publish_log(message, timestamp) rescue nil
+      puts(message)
+      publish_log(message, timestamp)
       save_log(message, timestamp)
     end
 
diff --git a/lib/backup_restore/restorer.rb b/lib/backup_restore/restorer.rb
index 29980edd94a..d2d46239be4 100644
--- a/lib/backup_restore/restorer.rb
+++ b/lib/backup_restore/restorer.rb
@@ -501,8 +501,8 @@ module BackupRestore
 
     def log(message)
       timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-      puts(message) rescue nil
-      publish_log(message, timestamp) rescue nil
+      puts(message)
+      publish_log(message, timestamp)
       save_log(message, timestamp)
     end
 
diff --git a/lib/base62.rb b/lib/base62.rb
index 84f9fbf23c8..bec48359aa9 100644
--- a/lib/base62.rb
+++ b/lib/base62.rb
@@ -1,9 +1,9 @@
 # Modified version of: https://github.com/steventen/base62-rb
 
 module Base62
-  KEYS = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ".freeze
-  KEYS_HASH = KEYS.each_char.with_index.inject({}) { |h, (k, v)| h[k] = v; h }
-  BASE = KEYS.length
+  KEYS ||= "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ".freeze
+  KEYS_HASH ||= KEYS.each_char.with_index.to_h
+  BASE ||= KEYS.length
 
   # Encodes base10 (decimal) number to base62 string.
   def self.encode(num)
diff --git a/lib/cache.rb b/lib/cache.rb
index e04129b877f..597ae2ce1dd 100644
--- a/lib/cache.rb
+++ b/lib/cache.rb
@@ -21,8 +21,12 @@ class Cache < ActiveSupport::Cache::Store
     redis.reconnect
   end
 
+  def keys(pattern = "*")
+    redis.keys("#{@namespace}:#{pattern}")
+  end
+
   def clear
-    redis.keys("#{@namespace}:*").each do |k|
+    keys.each do |k|
       redis.del(k)
     end
   end
diff --git a/lib/category_badge.rb b/lib/category_badge.rb
index 900f2938492..1b9398a46e3 100644
--- a/lib/category_badge.rb
+++ b/lib/category_badge.rb
@@ -88,12 +88,14 @@ module CategoryBadge
         when :bar
           'color: #222222; padding: 3px; vertical-align: text-top; margin-top: -3px; display: inline-block;'
         when :box
-          "color: #{category.text_color}; #{show_parent ? 'margin-left: 5px; ' : ''} position: relative; padding: 0 5px; margin-top: 2px;"
+          "color: ##{category.text_color}; #{show_parent ? 'margin-left: 5px; ' : ''} position: relative; padding: 0 5px; margin-top: 2px;"
         when :bullet
           'color: #222222; vertical-align: text-top; line-height: 1; margin-left: 4px; padding-left: 2px; display: inline;'
         when :none
           ''
         end + 'max-width: 150px; overflow: hidden; text-overflow: ellipsis;'
+      elsif (SiteSetting.category_style).to_sym == :box
+        "color: ##{category.text_color}"
       else
         ''
       end
diff --git a/lib/column_dropper.rb b/lib/column_dropper.rb
deleted file mode 100644
index a291d212bc2..00000000000
--- a/lib/column_dropper.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-class ColumnDropper
-  def self.drop(table:, after_migration:, columns:, delay: nil, on_drop: nil)
-    raise ArgumentError.new("Invalid table name passed to drop #{table}") if table =~ /[^a-z0-9_]/i
-
-    columns.each do |column|
-      raise ArgumentError.new("Invalid column name passed to drop #{column}") if column =~ /[^a-z0-9_]/i
-    end
-
-    delay ||= Rails.env.production? ? 60 : 0
-
-    sql = <<~SQL
-    SELECT 1
-    FROM INFORMATION_SCHEMA.COLUMNS
-    WHERE table_schema = 'public' AND
-      table_name = :table AND
-      column_name IN (:columns) AND
-      EXISTS (
-        SELECT 1
-        FROM schema_migration_details
-        WHERE name = :after_migration AND
-              created_at <= (current_timestamp at time zone 'UTC' - interval :delay)
-      )
-    LIMIT 1
-    SQL
-
-    if ActiveRecord::Base.exec_sql(sql, table: table,
-                                        columns: columns,
-                                        delay: "#{delay.to_i || 0} seconds",
-                                        after_migration: after_migration).to_a.length > 0
-      on_drop&.call
-
-      columns.each do |column|
-        ActiveRecord::Base.exec_sql <<~SQL
-        DROP TRIGGER IF EXISTS #{readonly_trigger_name(table, column)} ON #{table};
-        DROP FUNCTION IF EXISTS #{readonly_function_name(table, column)} CASCADE;
-        SQL
-
-        # safe cause it is protected on method entry, can not be passed in params
-        ActiveRecord::Base.exec_sql("ALTER TABLE #{table} DROP COLUMN IF EXISTS #{column}")
-      end
-
-      Discourse.reset_active_record_cache
-    end
-  end
-
-  def self.mark_readonly(table_name, column_name)
-    ActiveRecord::Base.exec_sql <<-SQL
-    CREATE OR REPLACE FUNCTION #{readonly_function_name(table_name, column_name)} RETURNS trigger AS $rcr$
-      BEGIN
-        RAISE EXCEPTION 'Discourse: #{column_name} in #{table_name} is readonly';
-      END
-    $rcr$ LANGUAGE plpgsql;
-    SQL
-
-    ActiveRecord::Base.exec_sql <<-SQL
-    CREATE TRIGGER #{readonly_trigger_name(table_name, column_name)}
-    BEFORE INSERT OR UPDATE OF #{column_name}
-    ON #{table_name}
-    FOR EACH ROW
-    WHEN (NEW.#{column_name} IS NOT NULL)
-    EXECUTE PROCEDURE #{readonly_function_name(table_name, column_name)};
-    SQL
-  end
-
-  private
-
-  def self.readonly_function_name(table_name, column_name)
-    "raise_#{table_name}_#{column_name}_readonly()"
-  end
-
-  def self.readonly_trigger_name(table_name, column_name)
-    "#{table_name}_#{column_name}_readonly"
-  end
-end
diff --git a/lib/composer_messages_finder.rb b/lib/composer_messages_finder.rb
index 94d5a23efa7..76c582dd572 100644
--- a/lib/composer_messages_finder.rb
+++ b/lib/composer_messages_finder.rb
@@ -20,7 +20,7 @@ class ComposerMessagesFinder
 
   # Determines whether to show the user education text
   def check_education_message
-    return if @topic && @topic.archetype == Archetype.private_message
+    return if @topic&.private_message?
 
     if creating_topic?
       count = @user.created_topic_count
@@ -187,7 +187,7 @@ class ComposerMessagesFinder
       templateName: 'education',
       wait_for_typing: false,
       extraClass: 'education-message',
-      body: PrettyText.cook(I18n.t('education.reviving_old_topic', days: (Time.zone.now - @topic.last_posted_at).round / 1.day))
+      body: PrettyText.cook(I18n.t('education.reviving_old_topic', time_ago: FreedomPatches::Rails4.time_ago_in_words(@topic.last_posted_at, false, scope: :'datetime.distance_in_words_verbose')))
     }
   end
 
diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index 3582a42e464..1dc0306dfb6 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -3,6 +3,7 @@
 
 require_dependency 'url_helper'
 require_dependency 'pretty_text'
+require_dependency 'quote_comparer'
 
 class CookedPostProcessor
   include ActionView::Helpers::NumberHelper
@@ -33,6 +34,7 @@ class CookedPostProcessor
       DiscourseEvent.trigger(:before_post_process_cooked, @doc, @post)
       post_process_oneboxes
       post_process_images
+      post_process_quotes
       keep_reverse_index_up_to_date
       optimize_urls
       update_post_image
@@ -90,6 +92,24 @@ class CookedPostProcessor
     end
   end
 
+  def post_process_quotes
+    @doc.css("aside.quote").each do |q|
+      post_number = q['data-post']
+      topic_id = q['data-topic']
+      if topic_id && post_number
+        comparer = QuoteComparer.new(
+          topic_id.to_i,
+          post_number.to_i,
+          q.css('blockquote').text
+        )
+
+        if comparer.modified?
+          q['class'] = ((q['class'] || '') + " quote-modified").strip
+        end
+      end
+    end
+  end
+
   def add_large_image_placeholder!(img)
     url = img["src"]
 
@@ -237,7 +257,7 @@ class CookedPostProcessor
     return unless SiteSetting.crawl_images? || Discourse.store.has_been_uploaded?(url)
 
     @size_cache[url] = FastImage.size(absolute_url)
-  rescue Zlib::BufError, URI::InvalidURIError, URI::InvalidComponentError
+  rescue Zlib::BufError, URI::InvalidURIError, URI::InvalidComponentError, OpenSSL::SSL::SSLError
     # FastImage.size raises BufError for some gifs, leave it.
   end
 
@@ -247,9 +267,9 @@ class CookedPostProcessor
   rescue URI::InvalidURIError
   end
 
-  # only crop when the image is taller than 16:9
-  # we only use 95% of that to allow for a small margin
-  MIN_RATIO_TO_CROP ||= (9.0 / 16.0) * 0.95
+  # only crop when the image is taller than 18:9
+  # we only use 90% of that to allow for a small margin
+  MIN_RATIO_TO_CROP ||= (9.0 / 18.0) * 0.9
 
   def convert_to_link!(img)
     src = img["src"]
@@ -268,11 +288,7 @@ class CookedPostProcessor
     return if original_width <= width && original_height <= height
     return if original_width <= SiteSetting.max_image_width && original_height <= SiteSetting.max_image_height
 
-    crop = original_width.to_f / original_height.to_f < MIN_RATIO_TO_CROP
-    # prevent iPhone X screenshots from being cropped
-    crop &= original_width != 1125 && original_height != 2436
-
-    if crop
+    if crop = (original_width.to_f / original_height.to_f < MIN_RATIO_TO_CROP)
       width, height = ImageSizer.crop(original_width, original_height)
       img["width"] = width
       img["height"] = height
@@ -372,15 +388,13 @@ class CookedPostProcessor
   end
 
   def post_process_oneboxes
-    args = {
-      post_id: @post.id,
-      invalidate_oneboxes: !!@opts[:invalidate_oneboxes],
-    }
-
-    # apply oneboxes
-    Oneboxer.apply(@doc, topic_id: @post.topic_id) do |url|
+    Oneboxer.apply(@doc) do |url|
       @has_oneboxes = true
-      Oneboxer.onebox(url, args)
+      Oneboxer.onebox(url,
+        invalidate_oneboxes: !!@opts[:invalidate_oneboxes],
+        user_id: @post&.user_id,
+        category_id: @post&.topic&.category_id
+      )
     end
 
     oneboxed_images.each do |img|
@@ -404,8 +418,10 @@ class CookedPostProcessor
       next if img["class"]&.include?('onebox-avatar')
 
       parent_class = img.parent && img.parent["class"]
-      if parent_class&.include?("onebox-body") && (width = img["width"].to_i) > 0 && (height = img["height"].to_i) > 0
+      width = img["width"].to_i
+      height = img["height"].to_i
 
+      if parent_class&.include?("onebox-body") && width > 0 && height > 0
         # special instruction for width == height, assume we are dealing with an avatar
         if (img["width"].to_i == img["height"].to_i)
           found = false
@@ -431,9 +447,17 @@ class CookedPostProcessor
           new_parent = img.add_next_sibling("<div class='aspect-image' style='--aspect-ratio:#{width}/#{height};'/>")
           new_parent.first.add_child(img)
         end
-
+      elsif (parent_class&.include?("instagram-images") || parent_class&.include?("tweet-images")) && width > 0 && height > 0
+        img.remove_attribute("width")
+        img.remove_attribute("height")
+        img.parent["class"] = "aspect-image-full-size"
+        img.parent["style"] = "--aspect-ratio:#{width}/#{height};"
       end
     end
+
+    if @cooking_options[:omit_nofollow] || !SiteSetting.add_rel_nofollow_to_user_content
+      @doc.css(".onebox-body a, .onebox a").each { |a| a.remove_attribute("rel") }
+    end
   end
 
   def optimize_urls
diff --git a/lib/crawler_detection.rb b/lib/crawler_detection.rb
index 5d222ecf7bb..bf28c6c1aa8 100644
--- a/lib/crawler_detection.rb
+++ b/lib/crawler_detection.rb
@@ -1,17 +1,52 @@
 module CrawlerDetection
 
-  # added 'ia_archiver' based on https://meta.discourse.org/t/unable-to-archive-discourse-pages-with-the-internet-archive/21232
-  # added 'Wayback Save Page' based on https://meta.discourse.org/t/unable-to-archive-discourse-with-the-internet-archive-save-page-now-button/22875
-  # added 'Swiftbot' based on https://meta.discourse.org/t/how-to-add-html-markup-or-meta-tags-for-external-search-engine/28220
-  def self.to_matcher(string)
+  def self.to_matcher(string, type: nil)
     escaped = string.split('|').map { |agent| Regexp.escape(agent) }.join('|')
-    Regexp.new(escaped)
+
+    if type == :real && Rails.env == "test"
+      # we need this bypass so we properly render views
+      escaped << "|Rails Testing"
+    end
+
+    Regexp.new(escaped, Regexp::IGNORECASE)
   end
 
   def self.crawler?(user_agent)
+    return true if user_agent.nil?
+
     # this is done to avoid regenerating regexes
+    @non_crawler_matchers ||= {}
     @matchers ||= {}
-    matcher = (@matchers[SiteSetting.crawler_user_agents] ||= to_matcher(SiteSetting.crawler_user_agents))
-    matcher.match?(user_agent)
+
+    possibly_real = (@non_crawler_matchers[SiteSetting.non_crawler_user_agents] ||= to_matcher(SiteSetting.non_crawler_user_agents, type: :real))
+
+    if user_agent.match?(possibly_real)
+      known_bots = (@matchers[SiteSetting.crawler_user_agents] ||= to_matcher(SiteSetting.crawler_user_agents))
+      user_agent.match?(known_bots)
+    else
+      true
+    end
+
+  end
+
+  # Given a user_agent that returns true from crawler?, should its request be allowed?
+  def self.allow_crawler?(user_agent)
+    return true if SiteSetting.whitelisted_crawler_user_agents.blank? &&
+      SiteSetting.blacklisted_crawler_user_agents.blank?
+
+    @whitelisted_matchers ||= {}
+    @blacklisted_matchers ||= {}
+
+    if SiteSetting.whitelisted_crawler_user_agents.present?
+      whitelisted = @whitelisted_matchers[SiteSetting.whitelisted_crawler_user_agents] ||= to_matcher(SiteSetting.whitelisted_crawler_user_agents)
+      !user_agent.nil? && user_agent.match?(whitelisted)
+    else
+      blacklisted = @blacklisted_matchers[SiteSetting.blacklisted_crawler_user_agents] ||= to_matcher(SiteSetting.blacklisted_crawler_user_agents)
+      user_agent.nil? || !user_agent.match?(blacklisted)
+    end
+  end
+
+  def self.is_blocked_crawler?(user_agent)
+    crawler?(user_agent) && !allow_crawler?(user_agent)
   end
 end
diff --git a/lib/db_helper.rb b/lib/db_helper.rb
index 7059c592bb9..9d5e1176962 100644
--- a/lib/db_helper.rb
+++ b/lib/db_helper.rb
@@ -18,6 +18,8 @@ class DbHelper
       column_name = rc["column_name"]
       connection.async_exec("UPDATE #{table_name} SET #{column_name} = REPLACE(#{column_name}, $1, $2) WHERE #{column_name} LIKE $3", args) rescue nil
     end
+
+    SiteSetting.refresh!
   end
 
 end
diff --git a/lib/demon/base.rb b/lib/demon/base.rb
index 188a27e9fe6..af4a73bb3cd 100644
--- a/lib/demon/base.rb
+++ b/lib/demon/base.rb
@@ -7,10 +7,10 @@ class Demon::Base
     @demons
   end
 
-  def self.start(count = 1)
+  def self.start(count = 1, verbose: false)
     @demons ||= {}
     count.times do |i|
-      (@demons["#{prefix}_#{i}"] ||= new(i)).start
+      (@demons["#{prefix}_#{i}"] ||= new(i, verbose: verbose)).start
     end
   end
 
@@ -38,16 +38,18 @@ class Demon::Base
   attr_reader :pid, :parent_pid, :started, :index
   attr_accessor :stop_timeout
 
-  def initialize(index)
+  def initialize(index, rails_root: nil, parent_pid: nil, verbose: false)
     @index = index
     @pid = nil
-    @parent_pid = Process.pid
+    @parent_pid = parent_pid || Process.pid
     @started = false
     @stop_timeout = 10
+    @rails_root = rails_root || Rails.root
+    @verbose = verbose
   end
 
   def pid_file
-    "#{Rails.root}/tmp/pids/#{self.class.prefix}_#{@index}.pid"
+    "#{@rails_root}/tmp/pids/#{self.class.prefix}_#{@index}.pid"
   end
 
   def alive?(pid = nil)
@@ -153,8 +155,15 @@ class Demon::Base
 
   private
 
+  def verbose(msg)
+    if @verbose
+      puts msg
+    end
+  end
+
   def write_pid_file
-    FileUtils.mkdir_p(Rails.root + "tmp/pids")
+    verbose("writing pid file #{pid_file} for #{@pid}")
+    FileUtils.mkdir_p(@rails_root + "tmp/pids")
     File.open(pid_file, 'w') do |f|
       f.write(@pid)
     end
@@ -190,7 +199,7 @@ class Demon::Base
   end
 
   def establish_app
-    Discourse.after_fork
+    Discourse.after_fork if defined?(Discourse)
 
     Signal.trap("HUP") do
       begin
diff --git a/lib/discourse.rb b/lib/discourse.rb
index 66ce5c3d76b..79e59845982 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -64,12 +64,12 @@ module Discourse
 
   # When they don't have permission to do something
   class InvalidAccess < StandardError
-    attr_reader :obj, :custom_message
+    attr_reader :obj, :custom_message, :opts
     def initialize(msg = nil, obj = nil, opts = nil)
       super(msg)
 
-      opts ||= {}
-      @custom_message = opts[:custom_message] if opts[:custom_message]
+      @opts = opts || {}
+      @custom_message = opts[:custom_message] if @opts[:custom_message]
       @obj = obj
     end
   end
@@ -128,7 +128,11 @@ module Discourse
     if Rails.env.development?
       plugin_hash = Digest::SHA1.hexdigest(all_plugins.map { |p| p.path }.sort.join('|'))
       hash_file = "#{Rails.root}/tmp/plugin-hash"
-      old_hash = File.read(hash_file) rescue nil
+
+      old_hash = begin
+        File.read(hash_file)
+      rescue Errno::ENOENT
+      end
 
       if old_hash && old_hash != plugin_hash
         puts "WARNING: It looks like your discourse plugins have recently changed."
@@ -160,6 +164,14 @@ module Discourse
     @plugins ||= []
   end
 
+  def self.hidden_plugins
+    @hidden_plugins ||= []
+  end
+
+  def self.visible_plugins
+    self.plugins - self.hidden_plugins
+  end
+
   def self.plugin_themes
     @plugin_themes ||= plugins.map(&:themes).flatten
   end
@@ -236,15 +248,17 @@ module Discourse
   end
 
   def self.route_for(uri)
+    unless uri.is_a?(URI)
+      uri = begin
+        URI(uri)
+      rescue URI::InvalidURIError
+      end
+    end
 
-    uri = URI(uri) rescue nil unless (uri.is_a?(URI))
     return unless uri
 
     path = uri.path || ""
-    if (uri.host == Discourse.current_hostname &&
-      path.start_with?(Discourse.base_uri)) ||
-      !uri.host
-
+    if !uri.host || (uri.host == Discourse.current_hostname && path.start_with?(Discourse.base_uri))
       path.slice!(Discourse.base_uri)
       return Rails.application.routes.recognize_path(path)
     end
@@ -426,7 +440,7 @@ module Discourse
     RailsMultisite::ConnectionManagement.establish_connection(db: current_db)
     MessageBus.after_fork
     SiteSetting.after_fork
-    $redis.client.reconnect
+    $redis._client.reconnect
     Rails.cache.reconnect
     Logster.store.redis.reconnect
     # shuts down all connections in the pool
@@ -446,6 +460,10 @@ module Discourse
   # report a warning maintaining backtrack for logster
   def self.warn_exception(e, message: "", env: nil)
     if Rails.logger.respond_to? :add_with_opts
+
+      env ||= {}
+      env[:current_db] ||= RailsMultisite::ConnectionManagement.current_db
+
       # logster
       Rails.logger.add_with_opts(
         ::Logger::Severity::WARN,
@@ -505,7 +523,7 @@ module Discourse
   def self.reset_active_record_cache_if_needed(e)
     last_cache_reset = Discourse.last_ar_cache_reset
     if e && e.message =~ /UndefinedColumn/ && (last_cache_reset.nil? || last_cache_reset < 30.seconds.ago)
-      Rails.logger.warn "Clear Active Record cache cause schema appears to have changed!"
+      Rails.logger.warn "Clearing Active Record cache, this can happen if schema changed while site is running or in a multisite various databases are running different schemas. Consider running rake multisite:migrate."
       Discourse.last_ar_cache_reset = Time.zone.now
       Discourse.reset_active_record_cache
     end
diff --git a/lib/discourse_diff.rb b/lib/discourse_diff.rb
index 91e4115fedd..89d293e4319 100644
--- a/lib/discourse_diff.rb
+++ b/lib/discourse_diff.rb
@@ -85,7 +85,7 @@ class DiscourseDiff
       i += 1
     end
 
-    "<div class=\"span8\">#{left.join}</div><div class=\"span8 offset1\">#{right.join}</div>"
+    "<div class=\"revision-content\">#{left.join}</div><div class=\"revision-content\">#{right.join}</div>"
   end
 
   def side_by_side_markdown
@@ -184,8 +184,13 @@ class DiscourseDiff
         # add it right before the ">"
         html_or_text.insert(index_of_next_chevron, " class=\"diff-#{klass}\"")
       else
-        # we have a class, insert it at the beginning
-        html_or_text.insert(index_of_class + "class=".length + 1, "diff-#{klass} ")
+        # we have a class, insert it at the beginning if not already present
+        classes = html_or_text[/class=(["'])([^\1]*)\1/, 2]
+        if classes.include?("diff-#{klass}")
+          html_or_text
+        else
+          html_or_text.insert(index_of_class + "class=".length + 1, "diff-#{klass} ")
+        end
       end
     else
       "<#{klass}>#{html_or_text}</#{klass}>"
diff --git a/lib/discourse_logstash_logger.rb b/lib/discourse_logstash_logger.rb
index 369e7e3c052..32376b49600 100644
--- a/lib/discourse_logstash_logger.rb
+++ b/lib/discourse_logstash_logger.rb
@@ -10,6 +10,7 @@ class DiscourseLogstashLogger
         event['severity_name'] = event['severity']
         event['severity'] = Object.const_get("Logger::Severity::#{event['severity']}")
         event['type'] = type
+        event['pid'] = Process.pid
       },
     )
   end
diff --git a/lib/discourse_plugin_registry.rb b/lib/discourse_plugin_registry.rb
index afe8009f8c5..547857838f8 100644
--- a/lib/discourse_plugin_registry.rb
+++ b/lib/discourse_plugin_registry.rb
@@ -14,6 +14,7 @@ class DiscoursePluginRegistry
     attr_writer :handlebars
     attr_writer :serialized_current_user_fields
     attr_writer :seed_data
+    attr_writer :locales
     attr_accessor :custom_html
 
     def plugins
@@ -65,6 +66,10 @@ class DiscoursePluginRegistry
       @seed_data ||= HashWithIndifferentAccess.new({})
     end
 
+    def locales
+      @locales ||= HashWithIndifferentAccess.new({})
+    end
+
     def html_builders
       @html_builders ||= {}
     end
@@ -77,6 +82,9 @@ class DiscoursePluginRegistry
       @vendored_pretty_text ||= Set.new
     end
 
+    def vendored_core_pretty_text
+      @vendored_core_pretty_text ||= Set.new
+    end
   end
 
   def register_js(filename, options = {})
@@ -92,6 +100,10 @@ class DiscoursePluginRegistry
     self.class.stylesheets << filename
   end
 
+  def self.register_locale(locale, options = {})
+    self.locales[locale] = options
+  end
+
   def register_archetype(name, options = {})
     Archetype.register(name, options)
   end
@@ -127,6 +139,8 @@ class DiscoursePluginRegistry
         self.admin_javascripts << asset
       elsif opts == :vendored_pretty_text
         self.vendored_pretty_text << asset
+      elsif opts == :vendored_core_pretty_text
+        self.vendored_core_pretty_text << asset
       else
         self.javascripts << asset
       end
@@ -171,6 +185,20 @@ class DiscoursePluginRegistry
     result.uniq
   end
 
+  VENDORED_CORE_PRETTY_TEXT_MAP = {
+    "moment.js" => "lib/javascripts/moment.js",
+    "moment-timezone.js" => "lib/javascripts/moment-timezone-with-data.js"
+  }
+  def self.core_asset_for_name(name)
+    asset = VENDORED_CORE_PRETTY_TEXT_MAP[name]
+    raise KeyError, "Asset #{name} not found in #{VENDORED_CORE_PRETTY_TEXT_MAP}" unless asset
+    asset
+  end
+
+  def locales
+    self.class.locales
+  end
+
   def javascripts
     self.class.javascripts
   end
@@ -207,6 +235,7 @@ class DiscoursePluginRegistry
     self.desktop_stylesheets = nil
     self.sass_variables = nil
     self.handlebars = nil
+    self.locales = nil
   end
 
   def self.reset!
@@ -221,7 +250,9 @@ class DiscoursePluginRegistry
     asset_globs.clear
     html_builders.clear
     vendored_pretty_text.clear
+    vendored_core_pretty_text.clear
     seed_path_builders.clear
+    locales.clear
   end
 
   def self.setup(plugin_class)
diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb
index 49f0a3ec1d4..800acd4980d 100644
--- a/lib/discourse_redis.rb
+++ b/lib/discourse_redis.rb
@@ -229,7 +229,7 @@ class DiscourseRedis
   end
 
   def reconnect
-    @redis.client.reconnect
+    @redis._client.reconnect
   end
 
   def namespace_key(key)
diff --git a/lib/discourse_tagging.rb b/lib/discourse_tagging.rb
index 0fcf8bda9b7..030927df29e 100644
--- a/lib/discourse_tagging.rb
+++ b/lib/discourse_tagging.rb
@@ -4,39 +4,49 @@ module DiscourseTagging
   TAGS_FILTER_REGEXP = /[\/\?#\[\]@!\$&'\(\)\*\+,;=\.%\\`^\s|\{\}"<>]+/ # /?#[]@!$&'()*+,;=.%\`^|{}"<>
 
   def self.tag_topic_by_names(topic, guardian, tag_names_arg, append: false)
-    if SiteSetting.tagging_enabled
+    if guardian.can_tag?(topic)
       tag_names = DiscourseTagging.tags_for_saving(tag_names_arg, guardian) || []
 
-      old_tag_names = topic.tags.map(&:name) || []
+      old_tag_names = topic.tags.pluck(:name) || []
       new_tag_names = tag_names - old_tag_names
       removed_tag_names = old_tag_names - tag_names
 
       # Protect staff-only tags
       unless guardian.is_staff?
-        staff_tags = DiscourseTagging.staff_only_tags(new_tag_names)
+        all_staff_tags = DiscourseTagging.staff_tag_names
+        hidden_tags = DiscourseTagging.hidden_tag_names
+
+        staff_tags = new_tag_names & all_staff_tags
+        staff_tags += new_tag_names & hidden_tags
         if staff_tags.present?
           topic.errors[:base] << I18n.t("tags.staff_tag_disallowed", tag: staff_tags.join(" "))
           return false
         end
 
-        staff_tags = DiscourseTagging.staff_only_tags(removed_tag_names)
+        staff_tags = removed_tag_names & all_staff_tags
         if staff_tags.present?
           topic.errors[:base] << I18n.t("tags.staff_tag_remove_disallowed", tag: staff_tags.join(" "))
           return false
         end
+
+        tag_names += removed_tag_names & hidden_tags
       end
 
-      if tag_names.present?
-        category = topic.category
-        tag_names = tag_names + old_tag_names if append
+      category = topic.category
+      tag_names = tag_names + old_tag_names if append
 
+      if tag_names.present?
         # guardian is explicitly nil cause we don't want to strip all
         # staff tags that already passed validation
-        tags = filter_allowed_tags(Tag.where(name: tag_names), nil,           for_input: true,
-                                                                              category: category,
-                                                                              selected_tags: tag_names).to_a
+        tags = filter_allowed_tags(
+          Tag.where(name: tag_names),
+          nil, # guardian
+          for_topic: true,
+          category: category,
+          selected_tags: tag_names
+        ).to_a
 
-        if tags.size < tag_names.size && (category.nil? || category.tags.count == 0)
+        if tags.size < tag_names.size && (category.nil? || (category.tags.count == 0 && category.tag_groups.count == 0))
           tag_names.each do |name|
             unless Tag.where(name: name).exists?
               tags << Tag.create(name: name)
@@ -44,8 +54,20 @@ module DiscourseTagging
           end
         end
 
+        # validate minimum required tags for a category
+        if !guardian.is_staff? && category && category.minimum_required_tags > 0 && tags.length < category.minimum_required_tags
+          topic.errors[:base] << I18n.t("tags.minimum_required_tags", count: category.minimum_required_tags)
+          return false
+        end
+
         topic.tags = tags
       else
+        # validate minimum required tags for a category
+        if !guardian.is_staff? && category && category.minimum_required_tags > 0
+          topic.errors[:base] << I18n.t("tags.minimum_required_tags", count: category.minimum_required_tags)
+          return false
+        end
+
         topic.tags = []
       end
       topic.tags_changed = true
@@ -57,8 +79,16 @@ module DiscourseTagging
   #   term: a search term to filter tags by name
   #   category: a Category to which the object being tagged belongs
   #   for_input: result is for an input field, so only show permitted tags
+  #   for_topic: results are for tagging a topic
   #   selected_tags: an array of tag names that are in the current selection
   def self.filter_allowed_tags(query, guardian, opts = {})
+
+    selected_tag_ids = opts[:selected_tags] ? Tag.where(name: opts[:selected_tags]).pluck(:id) : []
+
+    if !opts[:for_topic] && !selected_tag_ids.empty?
+      query = query.where('tags.id NOT IN (?)', selected_tag_ids)
+    end
+
     term = opts[:term]
     if term.present?
       term.gsub!("_", "\\_")
@@ -86,7 +116,7 @@ module DiscourseTagging
 
         query = query.where("tags.id IN (SELECT tag_id FROM tag_group_memberships WHERE tag_group_id IN (?))", tag_group_ids)
       end
-    elsif opts[:for_input] || category
+    elsif opts[:for_input] || opts[:for_topic] || category
       # exclude tags that are restricted to other categories
       if CategoryTag.exists?
         query = query.where("tags.id NOT IN (SELECT tag_id FROM category_tags)")
@@ -98,12 +128,10 @@ module DiscourseTagging
       end
     end
 
-    if opts[:for_input]
-      selected_tag_ids = opts[:selected_tags] ? Tag.where(name: opts[:selected_tags]).pluck(:id) : []
-
+    if opts[:for_input] || opts[:for_topic]
       unless guardian.nil? || guardian.is_staff?
-        staff_tag_names = SiteSetting.staff_tags.split("|")
-        query = query.where('tags.name NOT IN (?)', staff_tag_names) if staff_tag_names.present?
+        all_staff_tags = DiscourseTagging.staff_tag_names
+        query = query.where('tags.name NOT IN (?)', all_staff_tags) if all_staff_tags.present?
       end
 
       # exclude tag groups that have a parent tag which is missing from selected_tags
@@ -141,7 +169,37 @@ module DiscourseTagging
       end
     end
 
-    query
+    if guardian.nil? || guardian.is_staff?
+      query
+    else
+      filter_visible(query, guardian)
+    end
+  end
+
+  def self.filter_visible(query, guardian = nil)
+    guardian&.is_staff? ? query : query.where("tags.id NOT IN (#{hidden_tags_query.select(:id).to_sql})")
+  end
+
+  def self.hidden_tag_names(guardian = nil)
+    guardian&.is_staff? ? [] : hidden_tags_query.pluck(:name)
+  end
+
+  def self.hidden_tags_query
+    Tag.joins(:tag_groups)
+      .where('tag_groups.id NOT IN (
+        SELECT tag_group_id
+        FROM tag_group_permissions
+        WHERE group_id = ?)',
+        Group::AUTO_GROUPS[:everyone]
+      )
+  end
+
+  def self.staff_tag_names
+    Tag.joins(tag_groups: :tag_group_permissions)
+      .where('tag_group_permissions.group_id = ? AND tag_group_permissions.permission_type = ?',
+        Group::AUTO_GROUPS[:everyone],
+        TagGroupPermission.permission_types[:readonly]
+      ).pluck(:name)
   end
 
   def self.clean_tag(tag)
@@ -150,17 +208,6 @@ module DiscourseTagging
       .gsub(TAGS_FILTER_REGEXP, '')[0...SiteSetting.max_tag_length]
   end
 
-  def self.staff_only_tags(tags)
-    return nil if tags.nil?
-
-    staff_tags = SiteSetting.staff_tags.split("|")
-
-    tag_diff = tags - staff_tags
-    tag_diff = tags - tag_diff
-
-    tag_diff.present? ? tag_diff : nil
-  end
-
   def self.tags_for_saving(tags_arg, guardian, opts = {})
 
     return [] unless guardian.can_tag_topics? && tags_arg.present?
diff --git a/lib/email.rb b/lib/email.rb
index 0bae995d178..ed9182980db 100644
--- a/lib/email.rb
+++ b/lib/email.rb
@@ -8,16 +8,7 @@ module Email
 
   def self.is_valid?(email)
     return false unless String === email
-
-    parsed = Mail::Address.new(email)
-
-    # Don't allow for a TLD by itself list (sam@localhost)
-    # The Grammar is: (local_part "@" domain) / local_part ... need to discard latter
-    parsed.address == email &&
-    parsed.local != parsed.address &&
-    parsed&.domain.split(".").size > 1
-  rescue Mail::Field::ParseError
-    false
+    !!(EmailValidator.email_regex =~ email)
   end
 
   def self.downcase(email)
diff --git a/lib/email/message_builder.rb b/lib/email/message_builder.rb
index 9bc9cfd5dd5..e5007cae690 100644
--- a/lib/email/message_builder.rb
+++ b/lib/email/message_builder.rb
@@ -62,7 +62,7 @@ module Email
         subject = String.new(SiteSetting.email_subject)
         subject.gsub!("%{site_name}", @template_args[:email_prefix])
         subject.gsub!("%{optional_re}", @opts[:add_re_to_subject] ? I18n.t('subject_re', @template_args) : '')
-        subject.gsub!("%{optional_pm}", @opts[:private_reply] ? I18n.t('subject_pm', @template_args) : '')
+        subject.gsub!("%{optional_pm}", @opts[:private_reply] ? @template_args[:subject_pm] : '')
         subject.gsub!("%{optional_cat}", @template_args[:show_category_in_subject] ? "[#{@template_args[:show_category_in_subject]}] " : '')
         subject.gsub!("%{topic_title}", @template_args[:topic_title]) if @template_args[:topic_title] # must be last for safety
       else
@@ -96,6 +96,13 @@ module Email
         html_override.gsub!("%{respond_instructions}", "")
       end
 
+      if @template_args[:participants].present?
+        participants = PrettyText.cook(@template_args[:participants], sanitize: false).html_safe
+        html_override.gsub!("%{participants}", participants)
+      else
+        html_override.gsub!("%{participants}", "")
+      end
+
       styled = Email::Styles.new(html_override, @opts)
       styled.format_basic
       if style = @opts[:style]
@@ -112,6 +119,12 @@ module Email
       body = @opts[:body]
       body = I18n.t("#{@opts[:template]}.text_body_template", template_args).dup if @opts[:template]
 
+      if @template_args[:participants].present?
+        body << "\n"
+        body << @template_args[:participants]
+        body << "\n"
+      end
+
       if @template_args[:unsubscribe_instructions].present?
         body << "\n"
         body << @template_args[:unsubscribe_instructions]
diff --git a/lib/email/processor.rb b/lib/email/processor.rb
index f212fef6678..6bac32fe3a9 100644
--- a/lib/email/processor.rb
+++ b/lib/email/processor.rb
@@ -36,6 +36,7 @@ module Email
     def handle_failure(mail_string, e)
       message_template = case e
                          when Email::Receiver::NoSenderDetectedError       then return nil
+                         when Email::Receiver::FromReplyByAddressError     then return nil
                          when Email::Receiver::EmptyEmailError             then :email_reject_empty
                          when Email::Receiver::NoBodyDetectedError         then :email_reject_empty
                          when Email::Receiver::UserNotFoundError           then :email_reject_user_not_found
@@ -55,6 +56,7 @@ module Email
                          when ActiveRecord::Rollback                       then :email_reject_invalid_post
                          when Email::Receiver::InvalidPostAction           then :email_reject_invalid_post_action
                          when Discourse::InvalidAccess                     then :email_reject_invalid_access
+                         when Email::Receiver::OldDestinationError         then :email_reject_old_destination
                          else                                                   :email_reject_unrecognized_error
       end
 
@@ -75,6 +77,10 @@ module Email
         Rails.logger.error(msg)
       end
 
+      if message_template == :email_reject_old_destination
+        template_args[:short_url] = e.message
+      end
+
       if message_template
         # inform the user about the rejection
         message = Mail::Message.new(mail_string)
diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb
index 1cf9754b259..09d6ca52fbe 100644
--- a/lib/email/receiver.rb
+++ b/lib/email/receiver.rb
@@ -21,6 +21,7 @@ module Email
     class BouncedEmailError            < ProcessingError; end
     class NoBodyDetectedError          < ProcessingError; end
     class NoSenderDetectedError        < ProcessingError; end
+    class FromReplyByAddressError      < ProcessingError; end
     class InactiveUserError            < ProcessingError; end
     class SilencedUserError            < ProcessingError; end
     class BadDestinationAddress        < ProcessingError; end
@@ -33,21 +34,27 @@ module Email
     class InvalidPostAction            < ProcessingError; end
     class UnsubscribeNotAllowed        < ProcessingError; end
     class EmailNotAllowed              < ProcessingError; end
+    class OldDestinationError          < ProcessingError; end
 
     attr_reader :incoming_email
     attr_reader :raw_email
     attr_reader :mail
     attr_reader :message_id
 
+    COMMON_ENCODINGS ||= [-"utf-8", -"windows-1252", -"iso-8859-1"]
+
     def self.formats
-      @formats ||= Enum.new(plaintext: 1,
-                            markdown: 2)
+      @formats ||= Enum.new(plaintext: 1, markdown: 2)
     end
 
     def initialize(mail_string, opts = {})
       raise EmptyEmailError if mail_string.blank?
       @staged_users = []
-      @raw_email = try_to_encode(mail_string, "UTF-8") || try_to_encode(mail_string, "ISO-8859-1") || mail_string
+      @raw_email = mail_string
+      COMMON_ENCODINGS.each do |encoding|
+        fixed = try_to_encode(mail_string, encoding)
+        break @raw_email = fixed if fixed.present?
+      end
       @mail = Mail.new(@raw_email)
       @message_id = @mail.message_id.presence || Digest::MD5.hexdigest(mail_string)
       @opts = opts
@@ -58,6 +65,7 @@ module Email
       DistributedMutex.synchronize(@message_id) do
         begin
           return if IncomingEmail.exists?(message_id: @message_id)
+          ensure_valid_address_lists
           @from_email, @from_display_name = parse_from_field(@mail)
           @incoming_email = create_incoming_email
           process_internal
@@ -71,6 +79,16 @@ module Email
       end
     end
 
+    def ensure_valid_address_lists
+      [:to, :cc, :bcc].each do |field|
+        addresses = @mail[field]
+
+        if addresses&.errors.present?
+          @mail[field] = addresses.to_s.scan(/\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}\b/i)
+        end
+      end
+    end
+
     def is_blacklisted?
       return false if SiteSetting.ignore_by_title.blank?
       Regexp.new(SiteSetting.ignore_by_title, Regexp::IGNORECASE) =~ @mail.subject
@@ -90,6 +108,7 @@ module Email
     def process_internal
       raise BouncedEmailError  if is_bounce?
       raise NoSenderDetectedError if @from_email.blank?
+      raise FromReplyByAddressError if is_from_reply_by_email_address?
       raise ScreenedEmailError if ScreenedEmail.should_block?(@from_email)
 
       user = find_user(@from_email)
@@ -105,10 +124,10 @@ module Email
 
       raise NoBodyDetectedError if body.blank? && attachments.empty?
 
-      if is_auto_generated?
+      if is_auto_generated? && !sent_to_mailinglist_mirror?
         @incoming_email.update_columns(is_auto_generated: true)
 
-        if SiteSetting.block_auto_generated_emails? && !sent_to_mailinglist_mirror?
+        if SiteSetting.block_auto_generated_emails?
           raise AutoGeneratedEmailError
         end
       end
@@ -146,7 +165,15 @@ module Email
           end
         end
 
-        raise first_exception || BadDestinationAddress
+        raise first_exception if first_exception
+
+        if post = find_related_post(force: true)
+          if Guardian.new(user).can_see_post?(post) && post.created_at < 90.days.ago
+            raise OldDestinationError.new("#{Discourse.base_url}/p/#{post.id}")
+          end
+        end
+
+        raise BadDestinationAddress
       end
     end
 
@@ -178,38 +205,33 @@ module Email
       true
     end
 
+    def is_from_reply_by_email_address?
+      Email::Receiver.reply_by_email_address_regex.match(@from_email)
+    end
+
     def verp
       @verp ||= all_destinations.select { |to| to[/\+verp-\h{32}@/] }.first
     end
 
     def self.update_bounce_score(email, score)
-      # only update bounce score once per day
-      key = "bounce_score:#{email}:#{Date.today}"
+      if user = User.find_by_email(email)
+        old_bounce_score = user.user_stat.bounce_score
+        new_bounce_score = old_bounce_score + score
+        range = (old_bounce_score + 1..new_bounce_score)
 
-      if $redis.setnx(key, "1")
-        $redis.expire(key, 25.hours)
+        user.user_stat.bounce_score = new_bounce_score
+        user.user_stat.reset_bounce_score_after = SiteSetting.reset_bounce_score_after_days.days.from_now
+        user.user_stat.save!
 
-        if user = User.find_by_email(email)
-          user.user_stat.bounce_score += score
-          user.user_stat.reset_bounce_score_after = SiteSetting.reset_bounce_score_after_days.days.from_now
-          user.user_stat.save
-
-          bounce_score = user.user_stat.bounce_score
-          if user.active && bounce_score >= SiteSetting.bounce_score_threshold_deactivate
-            user.update_columns(active: false)
-            reason = I18n.t("user.deactivated", email: user.email)
-            StaffActionLogger.new(Discourse.system_user).log_user_deactivate(user, reason)
-          elsif bounce_score >= SiteSetting.bounce_score_threshold
-            # NOTE: we check bounce_score before sending emails, nothing to do
-            # here other than log it happened.
-            reason = I18n.t("user.email.revoked", email: user.email, date: user.user_stat.reset_bounce_score_after)
-            StaffActionLogger.new(Discourse.system_user).log_revoke_email(user, reason)
-          end
+        if user.active && range === SiteSetting.bounce_score_threshold_deactivate
+          user.update!(active: false)
+          reason = I18n.t("user.deactivated", email: user.email)
+          StaffActionLogger.new(Discourse.system_user).log_user_deactivate(user, reason)
+        elsif range === SiteSetting.bounce_score_threshold
+          # NOTE: we check bounce_score before sending emails, nothing to do here other than log it happened.
+          reason = I18n.t("user.email.revoked", email: user.email, date: user.user_stat.reset_bounce_score_after)
+          StaffActionLogger.new(Discourse.system_user).log_revoke_email(user, reason)
         end
-
-        true
-      else
-        false
       end
     end
 
@@ -232,14 +254,16 @@ module Email
         text_content_type = @mail.text_part&.content_type
       elsif @mail.content_type.to_s["text/html"]
         html = fix_charset(@mail)
-      else
+      elsif @mail.content_type.blank? || @mail.content_type["text/plain"]
         text = fix_charset(@mail)
         text_content_type = @mail.content_type
       end
 
+      return unless text.present? || html.present?
+
       if text.present?
         text = trim_discourse_markers(text)
-        text, elided_text = EmailReplyTrimmer.trim(text, true)
+        text, elided_text = trim_reply_and_extract_elided(text)
 
         if @opts[:convert_plaintext] || sent_to_mailinglist_mirror?
           text_content_type ||= ""
@@ -253,9 +277,15 @@ module Email
       end
 
       markdown, elided_markdown = if html.present?
-        markdown = HtmlToMarkdown.new(html, keep_img_tags: true, keep_cid_imgs: true).to_markdown
-        markdown = trim_discourse_markers(markdown)
-        EmailReplyTrimmer.trim(markdown, true)
+        # use the first html extracter that matches
+        if html_extracter = HTML_EXTRACTERS.select { |_, r| html[r] }.min_by { |_, r| html =~ r }
+          doc = Nokogiri::HTML.fragment(html)
+          self.send(:"extract_from_#{html_extracter[0]}", doc)
+        else
+          markdown = HtmlToMarkdown.new(html, keep_img_tags: true, keep_cid_imgs: true).to_markdown
+          markdown = trim_discourse_markers(markdown)
+          trim_reply_and_extract_elided(markdown)
+        end
       end
 
       if text.blank? || (SiteSetting.incoming_email_prefer_html && markdown.present?)
@@ -265,6 +295,88 @@ module Email
       end
     end
 
+    def to_markdown(html, elided_html)
+      markdown = HtmlToMarkdown.new(html, keep_img_tags: true, keep_cid_imgs: true).to_markdown
+      [EmailReplyTrimmer.trim(markdown), HtmlToMarkdown.new(elided_html).to_markdown]
+    end
+
+    HTML_EXTRACTERS ||= [
+      [:gmail, /class="gmail_(?!default)/],
+      [:outlook, /id="(divRplyFwdMsg|Signature)"/],
+      [:word, /class="WordSection1"/],
+      [:exchange, /name="message(Body|Reply)Section"/],
+      [:apple_mail, /id="AppleMailSignature"/],
+      [:mozilla, /class="moz-/],
+      [:protonmail, /class="protonmail_/],
+      [:zimbra, /data-marker="__/],
+      [:newton, /(id|class)="cm_/],
+    ]
+
+    def extract_from_gmail(doc)
+      # GMail adds a bunch of 'gmail_' prefixed classes like: gmail_signature, gmail_extra, gmail_quote
+      # Just elide them all except for 'gmail_default'
+      elided = doc.css("*[class^='gmail_']:not([class*='gmail_default'])").remove
+      to_markdown(doc.to_html, elided.to_html)
+    end
+
+    def extract_from_outlook(doc)
+      # Outlook properly identifies the signature and any replied/forwarded email
+      # Use their id to remove them and anything that comes after
+      elided = doc.css("#Signature, #Signature ~ *, hr, #divRplyFwdMsg, #divRplyFwdMsg ~ *").remove
+      to_markdown(doc.to_html, elided.to_html)
+    end
+
+    def extract_from_word(doc)
+      # Word (?) keeps the content in the 'WordSection1' class and uses <p> tags
+      # When there's something else (<table>, <div>, etc..) there's high chance it's a signature or forwarded email
+      elided = doc.css(".WordSection1 > :not(p):not(ul):first-of-type, .WordSection1 > :not(p):not(ul):first-of-type ~ *").remove
+      to_markdown(doc.at(".WordSection1").to_html, elided.to_html)
+    end
+
+    def extract_from_exchange(doc)
+      # Exchange is using the 'messageReplySection' class for forwarded emails
+      # And 'messageBodySection' for the actual email
+      elided = doc.css("div[name='messageReplySection']").remove
+      to_markdown(doc.css("div[name='messageReplySection']").to_html, elided.to_html)
+    end
+
+    def extract_from_apple_mail(doc)
+      # AppleMail is the worst. It adds 'AppleMailSignature' ids (!) to several div/p with no deterministic rules
+      # Our best guess is to elide whatever comes after that.
+      elided = doc.css("#AppleMailSignature:last-of-type ~ *").remove
+      to_markdown(doc.to_html, elided.to_html)
+    end
+
+    def extract_from_mozilla(doc)
+      # Mozilla (Thunderbird ?) properly identifies signature and forwarded emails
+      # Remove them and anything that comes after
+      elided = doc.css("*[class^='moz-'], *[class^='moz-'] ~ *").remove
+      to_markdown(doc.to_html, elided.to_html)
+    end
+
+    def extract_from_protonmail(doc)
+      # Removes anything that has a class starting with "protonmail_" and everything after that
+      elided = doc.css("*[class^='protonmail_'], *[class^='protonmail_'] ~ *").remove
+      to_markdown(doc.to_html, elided.to_html)
+    end
+
+    def extract_from_zimbra(doc)
+      # Removes anything that has a 'data-marker' attribute
+      elided = doc.css("*[data-marker]").remove
+      to_markdown(doc.to_html, elided.to_html)
+    end
+
+    def extract_from_newton(doc)
+      # Removes anything that has an id or a class starting with 'cm_'
+      elided = doc.css("*[id^='cm_'], *[class^='cm_']").remove
+      to_markdown(doc.to_html, elided.to_html)
+    end
+
+    def trim_reply_and_extract_elided(text)
+      return [text, ""] if @opts[:skip_trimming]
+      EmailReplyTrimmer.trim(text, true)
+    end
+
     def fix_charset(mail_part)
       return nil if mail_part.blank? || mail_part.body.blank?
 
@@ -273,7 +385,7 @@ module Email
       return nil if string.blank?
 
       # common encodings
-      encodings = ["UTF-8", "ISO-8859-1"]
+      encodings = COMMON_ENCODINGS.dup
       encodings.unshift(mail_part.charset) if mail_part.charset.present?
 
       # mail (>=2.5) decodes mails with 8bit transfer encoding to utf-8, so
@@ -438,20 +550,13 @@ module Email
       case destination[:type]
       when :group
         group = destination[:obj]
-        create_topic(user: user,
-                     raw: body,
-                     elided: elided,
-                     title: subject,
-                     archetype: Archetype.private_message,
-                     target_group_names: [group.name],
-                     is_group_message: true,
-                     skip_validations: true)
+        create_group_post(group, user, body, elided)
 
       when :category
         category = destination[:obj]
 
         raise StrangersNotAllowedError    if user.staged? && !category.email_in_allow_strangers
-        raise InsufficientTrustLevelError if !user.has_trust_level?(SiteSetting.email_in_min_trust)
+        raise InsufficientTrustLevelError if !user.has_trust_level?(SiteSetting.email_in_min_trust) && !sent_to_mailinglist_mirror?
 
         create_topic(user: user,
                      raw: body,
@@ -463,7 +568,7 @@ module Email
       when :reply
         email_log = destination[:obj]
 
-        if email_log.user_id != user.id && !forwareded_reply_key?(email_log, user)
+        if email_log.user_id != user.id && !forwarded_reply_key?(email_log, user)
           raise ReplyUserNotMatchingError, "email_log.user_id => #{email_log.user_id.inspect}, user.id => #{user.id.inspect}"
         end
 
@@ -476,27 +581,63 @@ module Email
       end
     end
 
-    def forwareded_reply_key?(email_log, user)
+    def create_group_post(group, user, body, elided)
+      message_ids = Email::Receiver.extract_reply_message_ids(@mail, max_message_id_count: 5)
+      post_ids = []
+
+      incoming_emails = IncomingEmail
+        .where(message_id: message_ids)
+        .addressed_to_user(user)
+        .pluck(:post_id, :to_addresses, :cc_addresses)
+
+      incoming_emails.each do |post_id, to_addresses, cc_addresses|
+        post_ids << post_id if contains_email_address_of_user?(to_addresses, user) ||
+          contains_email_address_of_user?(cc_addresses, user)
+      end
+
+      if post_ids.any? && post = Post.where(id: post_ids).order(:created_at).last
+        create_reply(user: user,
+                     raw: body,
+                     elided: elided,
+                     post: post,
+                     topic: post.topic,
+                     skip_validations: true)
+      else
+        create_topic(user: user,
+                     raw: body,
+                     elided: elided,
+                     title: subject,
+                     archetype: Archetype.private_message,
+                     target_group_names: [group.name],
+                     is_group_message: true,
+                     skip_validations: true)
+      end
+    end
+
+    def forwarded_reply_key?(email_log, user)
       incoming_emails = IncomingEmail
         .joins(:post)
         .where('posts.topic_id = ?', email_log.topic_id)
         .addressed_to(email_log.reply_key)
-        .addressed_to(user.email)
+        .addressed_to_user(user)
+        .pluck(:to_addresses, :cc_addresses)
 
-      incoming_emails.each do |email|
-        next unless contains_email_address?(email.to_addresses, user.email) ||
-          contains_email_address?(email.cc_addresses, user.email)
+      incoming_emails.each do |to_addresses, cc_addresses|
+        next unless contains_email_address_of_user?(to_addresses, user) ||
+          contains_email_address_of_user?(cc_addresses, user)
 
-        return true if contains_reply_by_email_address(email.to_addresses, email_log.reply_key) ||
-          contains_reply_by_email_address(email.cc_addresses, email_log.reply_key)
+        return true if contains_reply_by_email_address(to_addresses, email_log.reply_key) ||
+          contains_reply_by_email_address(cc_addresses, email_log.reply_key)
       end
 
       false
     end
 
-    def contains_email_address?(addresses, email)
+    def contains_email_address_of_user?(addresses, user)
       return false if addresses.blank?
-      addresses.split(";").include?(email)
+
+      addresses = addresses.split(";")
+      user.user_emails.any? { |user_email| addresses.include?(user_email.email) }
     end
 
     def contains_reply_by_email_address(addresses, reply_key)
@@ -588,9 +729,13 @@ module Email
       reply_addresses.flatten!
       reply_addresses.select!(&:present?)
       reply_addresses.map! { |a| Regexp.escape(a) }
-      reply_addresses.map! { |a| a.gsub(Regexp.escape("%{reply_key}"), "(\\h{32})") }
-
-      /#{reply_addresses.join("|")}/
+      reply_addresses.map! { |a| a.gsub("\+", "\+?") }
+      reply_addresses.map! { |a| a.gsub(Regexp.escape("%{reply_key}"), "(\\h{32})?") }
+      if reply_addresses.empty?
+        /$a/ # a regex that can never match
+      else
+        /#{reply_addresses.join("|")}/
+      end
     end
 
     def group_incoming_emails_regex
@@ -601,17 +746,12 @@ module Email
       @category_email_in_regex ||= Regexp.union Category.pluck(:email_in).select(&:present?).map { |e| e.split("|") }.flatten.uniq
     end
 
-    def find_related_post
-      return if SiteSetting.find_related_post_with_key && !sent_to_mailinglist_mirror?
+    def find_related_post(force: false)
+      return if !force && SiteSetting.find_related_post_with_key && !sent_to_mailinglist_mirror?
 
-      message_ids = [@mail.in_reply_to, Email::Receiver.extract_references(@mail.references)]
-      message_ids.flatten!
-      message_ids.select!(&:present?)
-      message_ids.uniq!
+      message_ids = Email::Receiver.extract_reply_message_ids(@mail, max_message_id_count: 5)
       return if message_ids.empty?
 
-      message_ids = message_ids.first(5)
-
       host = Email::Sender.host_for(Discourse.base_url)
       post_id_regexp  = Regexp.new "topic/\\d+/(\\d+)@#{Regexp.escape(host)}"
       topic_id_regexp = Regexp.new "topic/(\\d+)@#{Regexp.escape(host)}"
@@ -630,6 +770,14 @@ module Email
       Post.where(id: post_ids).order(:created_at).last
     end
 
+    def self.extract_reply_message_ids(mail, max_message_id_count:)
+      message_ids = [mail.in_reply_to, Email::Receiver.extract_references(mail.references)]
+      message_ids.flatten!
+      message_ids.select!(&:present?)
+      message_ids.uniq!
+      message_ids.first(max_message_id_count)
+    end
+
     def self.extract_references(references)
       if Array === references
         references
@@ -679,11 +827,17 @@ module Email
       raise InvalidPostAction.new(e)
     end
 
+    def is_whitelisted_attachment?(attachment)
+      attachment.content_type !~ SiteSetting.attachment_content_type_blacklist_regex &&
+      attachment.filename !~ SiteSetting.attachment_filename_blacklist_regex
+    end
+
     def attachments
       # strip blacklisted attachments (mostly signatures)
-      @attachments ||= @mail.attachments.select do |attachment|
-        attachment.content_type !~ SiteSetting.attachment_content_type_blacklist_regex &&
-        attachment.filename !~ SiteSetting.attachment_filename_blacklist_regex
+      @attachments ||= begin
+        attachments =  @mail.attachments.select { |attachment| is_whitelisted_attachment?(attachment) }
+        attachments << @mail if @mail.attachment? && is_whitelisted_attachment?(@mail)
+        attachments
       end
     end
 
@@ -718,7 +872,7 @@ module Email
             end
           end
         ensure
-          tmp.try(:close!) rescue nil
+          tmp&.close!
         end
       end
 
@@ -753,6 +907,11 @@ module Email
         options[:raw] << Email::Receiver.elided_html(options[:elided])
       end
 
+      if sent_to_mailinglist_mirror?
+        options[:skip_validations] = true
+        options[:skip_guardian] = true
+      end
+
       user = options.delete(:user)
       result = NewPostManager.new(user, options).perform
 
diff --git a/lib/email/sender.rb b/lib/email/sender.rb
index 08e141a923e..6ded4b88e9c 100644
--- a/lib/email/sender.rb
+++ b/lib/email/sender.rb
@@ -109,25 +109,25 @@ module Email
         else
           @message.header['Message-ID']  = post_message_id
           @message.header['In-Reply-To'] = referenced_post_message_ids[0] || topic_message_id
-          @message.header['References']  = [referenced_post_message_ids, topic_message_id].flatten.compact.uniq
+          @message.header['References']  = [topic_message_id, referenced_post_message_ids].flatten.compact.uniq
         end
 
         # https://www.ietf.org/rfc/rfc2919.txt
         if topic && topic.category && !topic.category.uncategorized?
-          list_id = "<#{topic.category.name.downcase.tr(' ', '-')}.#{host}>"
+          list_id = "#{SiteSetting.title} | #{topic.category.name} <#{topic.category.name.downcase.tr(' ', '-')}.#{host}>"
 
           # subcategory case
           if !topic.category.parent_category_id.nil?
             parent_category_name = Category.find_by(id: topic.category.parent_category_id).name
-            list_id = "<#{topic.category.name.downcase.tr(' ', '-')}.#{parent_category_name.downcase.tr(' ', '-')}.#{host}>"
+            list_id = "#{SiteSetting.title} | #{parent_category_name} #{topic.category.name} <#{topic.category.name.downcase.tr(' ', '-')}.#{parent_category_name.downcase.tr(' ', '-')}.#{host}>"
           end
         else
-          list_id = "<#{host}>"
+          list_id = "#{SiteSetting.title} <#{host}>"
         end
 
         # https://www.ietf.org/rfc/rfc3834.txt
-        @message.header['Precedence']   = 'list'
-        @message.header['List-ID']      = list_id
+        @message.header['Precedence'] = 'list'
+        @message.header['List-ID']    = list_id
 
         if topic
           if SiteSetting.private_email?
diff --git a/lib/email/styles.rb b/lib/email/styles.rb
index 8fc9677b7ae..7a34bc679ef 100644
--- a/lib/email/styles.rb
+++ b/lib/email/styles.rb
@@ -97,6 +97,7 @@ module Email
       style('.lightbox-wrapper .meta', 'display: none')
       correct_first_body_margin
       correct_footer_style
+      style('div.undecorated-link-footer a', "font-weight: normal;")
       reset_tables
       onebox_styles
       plugin_styles
diff --git a/lib/email_updater.rb b/lib/email_updater.rb
index e8515b8645f..d3d8eaf339b 100644
--- a/lib/email_updater.rb
+++ b/lib/email_updater.rb
@@ -86,6 +86,7 @@ class EmailUpdater
         when EmailChangeRequest.states[:authorizing_new]
           change_req.update_column(:change_state, EmailChangeRequest.states[:complete])
           user.primary_email.update!(email: token.email)
+          user.set_automatic_groups
           confirm_result = :complete
         end
       else
diff --git a/lib/emoji/db.json b/lib/emoji/db.json
index 1f021752e4f..f23998d8f48 100644
--- a/lib/emoji/db.json
+++ b/lib/emoji/db.json
@@ -5792,6 +5792,10 @@
       "code": "1f9d9",
       "name": "mage"
     },
+    {
+      "code": "1f9d9-200d-2640-fe0f",
+      "name": "woman_mage"
+    },
     {
       "code": "1f9da",
       "name": "fairy"
@@ -5802,7 +5806,11 @@
     },
     {
       "code": "1f9dc",
-      "name": "merperson"
+      "name": "mermaid"
+    },
+    {
+      "code": "1f9dc-200d-2642-fe0f",
+      "name": "merman"
     },
     {
       "code": "1f9dd",
@@ -5812,22 +5820,42 @@
       "code": "1f9de",
       "name": "genie"
     },
+    {
+      "code": "1f9de-200d-2640",
+      "name": "woman_genie"
+    },
     {
       "code": "1f9df",
       "name": "zombie"
     },
+    {
+      "code": "1f9df-200d-2640",
+      "name": "woman_zombie"
+    },
     {
       "code": "1f9d6",
       "name": "person_in_steamy_room"
     },
+    {
+      "code": "1f9d6-200d-2640-fe0f",
+      "name": "woman_in_steamy_room"
+    },
     {
       "code": "1f9d7",
       "name": "person_climbing"
     },
+    {
+      "code": "1f9d7-200d-2640-fe0f",
+      "name": "woman_climbing"
+    },
     {
       "code": "1f9d8",
       "name": "person_in_lotus_position"
     },
+    {
+      "code": "1f9d8-200d-2640-fe0f",
+      "name": "woman_in_lotus_position"
+    },
     {
       "code": "1f91f",
       "name": "love_you_gesture"
@@ -6150,13 +6178,18 @@
     "bearded_person",
     "breast_feeding",
     "mage",
+    "woman_mage",
     "fairy",
     "vampire",
-    "merperson",
+    "mermaid",
+    "merman",
     "elf",
     "person_in_steamy_room",
+    "woman_in_steamy_room",
     "person_climbing",
+    "woman_climbing",
     "person_in_lotus_position",
+    "woman_in_lotus_position",
     "love_you_gesture",
     "palms_up_together"
   ],
@@ -6758,6 +6791,21 @@
     ],
     "fleur_de_lis": [
       "fleur-de-lis"
+    ],
+    "face_vomiting": [
+      "puke"
+    ]
+  },
+  "searchAliases": {
+    "sad": [
+      "frowning_face",
+      "slightly_frowning_face",
+      "sob",
+      "crying_cat_face",
+      "cry"
+    ],
+    "cry": [
+      "sob"
     ]
   }
 }
\ No newline at end of file
diff --git a/lib/emoji/groups.json b/lib/emoji/groups.json
index 82766edadb2..50d78901d60 100644
--- a/lib/emoji/groups.json
+++ b/lib/emoji/groups.json
@@ -316,10 +316,6 @@
         "name": "cowboy_hat_face",
         "diversity": false
       },
-      {
-        "name": "clown_face",
-        "diversity": false
-      },
       {
         "name": "lying_face",
         "diversity": false
@@ -348,6 +344,10 @@
         "name": "imp",
         "diversity": false
       },
+      {
+        "name": "clown_face",
+        "diversity": false
+      },
       {
         "name": "japanese_ogre",
         "diversity": false
@@ -700,6 +700,10 @@
         "name": "mage",
         "diversity": true
       },
+      {
+        "name": "woman_mage",
+        "diversity": true
+      },
       {
         "name": "fairy",
         "diversity": true
@@ -709,7 +713,11 @@
         "diversity": true
       },
       {
-        "name": "merperson",
+        "name": "mermaid",
+        "diversity": true
+      },
+      {
+        "name": "merman",
         "diversity": true
       },
       {
@@ -720,10 +728,18 @@
         "name": "genie",
         "diversity": false
       },
+      {
+        "name": "woman_genie",
+        "diversity": false
+      },
       {
         "name": "zombie",
         "diversity": false
       },
+      {
+        "name": "woman_zombie",
+        "diversity": false
+      },
       {
         "name": "frowning_woman",
         "diversity": true
@@ -2416,14 +2432,26 @@
         "name": "person_in_steamy_room",
         "diversity": true
       },
+      {
+        "name": "woman_in_steamy_room",
+        "diversity": true
+      },
       {
         "name": "person_climbing",
         "diversity": true
       },
+      {
+        "name": "woman_climbing",
+        "diversity": true
+      },
       {
         "name": "person_in_lotus_position",
         "diversity": true
       },
+      {
+        "name": "woman_in_lotus_position",
+        "diversity": true
+      },
       {
         "name": "bath",
         "diversity": true
@@ -2604,10 +2632,6 @@
         "name": "tennis",
         "diversity": false
       },
-      {
-        "name": "8ball",
-        "diversity": false
-      },
       {
         "name": "bowling",
         "diversity": false
@@ -2644,10 +2668,6 @@
         "name": "goal_net",
         "diversity": false
       },
-      {
-        "name": "dart",
-        "diversity": false
-      },
       {
         "name": "golf",
         "diversity": false
@@ -2676,6 +2696,18 @@
         "name": "curling_stone",
         "diversity": false
       },
+      {
+        "name": "dart",
+        "diversity": false
+      },
+      {
+        "name": "8ball",
+        "diversity": false
+      },
+      {
+        "name": "crystal_ball",
+        "diversity": false
+      },
       {
         "name": "video_game",
         "diversity": false
@@ -2684,6 +2716,10 @@
         "name": "joystick",
         "diversity": false
       },
+      {
+        "name": "slot_machine",
+        "diversity": false
+      },
       {
         "name": "game_die",
         "diversity": false
@@ -2859,10 +2895,6 @@
         "name": "houses",
         "diversity": false
       },
-      {
-        "name": "cityscape",
-        "diversity": false
-      },
       {
         "name": "derelict_house",
         "diversity": false
@@ -2975,6 +3007,10 @@
         "name": "night_with_stars",
         "diversity": false
       },
+      {
+        "name": "cityscape",
+        "diversity": false
+      },
       {
         "name": "sunrise_over_mountains",
         "diversity": false
@@ -3023,22 +3059,6 @@
         "name": "circus_tent",
         "diversity": false
       },
-      {
-        "name": "performing_arts",
-        "diversity": false
-      },
-      {
-        "name": "framed_picture",
-        "diversity": false
-      },
-      {
-        "name": "art",
-        "diversity": false
-      },
-      {
-        "name": "slot_machine",
-        "diversity": false
-      },
       {
         "name": "steam_locomotive",
         "diversity": false
@@ -3175,6 +3195,10 @@
         "name": "railway_track",
         "diversity": false
       },
+      {
+        "name": "oil_drum",
+        "diversity": false
+      },
       {
         "name": "fuelpump",
         "diversity": false
@@ -3192,11 +3216,11 @@
         "diversity": false
       },
       {
-        "name": "construction",
+        "name": "stop_sign",
         "diversity": false
       },
       {
-        "name": "stop_sign",
+        "name": "construction",
         "diversity": false
       },
       {
@@ -3283,30 +3307,6 @@
         "name": "bellhop_bell",
         "diversity": false
       },
-      {
-        "name": "door",
-        "diversity": false
-      },
-      {
-        "name": "bed",
-        "diversity": false
-      },
-      {
-        "name": "couch_and_lamp",
-        "diversity": false
-      },
-      {
-        "name": "toilet",
-        "diversity": false
-      },
-      {
-        "name": "shower",
-        "diversity": false
-      },
-      {
-        "name": "bathtub",
-        "diversity": false
-      },
       {
         "name": "checkered_flag",
         "diversity": false
@@ -4678,18 +4678,6 @@
         "name": "mag_right",
         "diversity": false
       },
-      {
-        "name": "microscope",
-        "diversity": false
-      },
-      {
-        "name": "telescope",
-        "diversity": false
-      },
-      {
-        "name": "satellite",
-        "diversity": false
-      },
       {
         "name": "candle",
         "diversity": false
@@ -5062,10 +5050,6 @@
         "name": "clamp",
         "diversity": false
       },
-      {
-        "name": "alembic",
-        "diversity": false
-      },
       {
         "name": "balance_scale",
         "diversity": false
@@ -5102,18 +5086,6 @@
         "name": "moyai",
         "diversity": false
       },
-      {
-        "name": "oil_drum",
-        "diversity": false
-      },
-      {
-        "name": "crystal_ball",
-        "diversity": false
-      },
-      {
-        "name": "shopping_cart",
-        "diversity": false
-      },
       {
         "name": "atm",
         "diversity": false
diff --git a/lib/excerpt_parser.rb b/lib/excerpt_parser.rb
index 0e3f824679b..96400ade31c 100644
--- a/lib/excerpt_parser.rb
+++ b/lib/excerpt_parser.rb
@@ -18,6 +18,7 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
     @keep_onebox_source = options[:keep_onebox_source] == true
     @remap_emoji = options[:remap_emoji] == true
     @start_excerpt = false
+    @in_details_depth = 0
     @summary_contents = ""
     @detail_contents = ""
   end
@@ -48,7 +49,8 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
   end
 
   def include_tag(name, attributes)
-    characters("<#{name} #{attributes.map { |k, v| "#{k}=\"#{escape_attribute(v)}\"" }.join(' ')}>", false, false, false)
+    characters("<#{name} #{attributes.map { |k, v| "#{k}=\"#{escape_attribute(v)}\"" }.join(' ')}>",
+               truncate: false, count_it: false, encode: false)
   end
 
   def start_element(name, attributes = [])
@@ -91,31 +93,37 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
 
     when "aside"
       attributes = Hash[*attributes.flatten]
+      unless @keep_onebox_source && attributes['class'].include?('onebox')
+        @in_quote = true
+      end
 
-        unless @keep_onebox_source && attributes['class'].include?('onebox')
-          @in_quote = true
-        end
     when 'article'
       if @keep_onebox_source && attributes.include?(['class', 'onebox-body'])
         @in_quote = true
       end
+
     when "div", "span"
       if attributes.include?(["class", "excerpt"])
         @excerpt = ""
         @current_length = 0
         @start_excerpt = true
       end
-        # Preserve spoilers
-        if attributes.include?(["class", "spoiler"])
-          include_tag("span", attributes)
-          @in_spoiler = true
-        end
+      # Preserve spoilers
+      if attributes.include?(["class", "spoiler"])
+        include_tag("span", attributes)
+        @in_spoiler = true
+      end
+
     when "details"
-      @detail_contents = ""
-      @in_details = true
+      @detail_contents = "" if @in_details_depth == 0
+      @in_details_depth += 1
+
     when "summary"
-      @summary_contents = ""
-      @in_summary = true
+      if @in_details_depth == 1 && !@in_summary
+        @summary_contents = ""
+        @in_summary = true
+      end
+
     end
   end
 
@@ -123,31 +131,45 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
     case name
     when "a"
       unless @strip_links
-        characters("</a>", false, false, false)
+        characters("</a>", truncate: false, count_it: false, encode: false)
         @in_a = false
       end
     when "p", "br"
       if @keep_newlines
-        characters("<br>", false, false, false)
+        characters("<br>", truncate: false, count_it: false, encode: false)
       else
         characters(" ")
       end
     when "aside"
       @in_quote = false
     when "details"
-      @in_details = false
-      full = "<details><summary>#{clean(@summary_contents)}</summary>#{clean(@detail_contents)}</details>"
-      if @current_length + full.length > @length
-        @excerpt << "<details class='disabled'><summary>#{@summary_contents[0..@length]}</summary></details>"
-      else
-        @excerpt << full
-      end
+      @in_details_depth -= 1
+      if @in_details_depth == 0
+        @summary_contents = clean(@summary_contents)
+        @detail_contents = clean(@detail_contents)
 
+        if @current_length + @summary_contents.length >= @length
+          characters(@summary_contents,
+                     encode: false,
+                     before_string: "<details class='disabled'><summary>",
+                     after_string: "</summary></details>")
+        else
+          characters(@summary_contents,
+                     truncate: false,
+                     encode: false,
+                     before_string: "<details><summary>",
+                     after_string: "</summary>")
+
+          characters(@detail_contents,
+                     encode: false,
+                     after_string: "</details>")
+        end
+      end
     when "summary"
-      @in_summary = false
+      @in_summary = false if @in_details_depth == 1
     when "div", "span"
       throw :done if @start_excerpt
-      characters("</span>", false, false, false) if @in_spoiler
+      characters("</span>", truncate: false, count_it: false, encode: false) if @in_spoiler
       @in_spoiler = false
     end
   end
@@ -156,12 +178,12 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
     ERB::Util.html_escape(str.strip)
   end
 
-  def characters(string, truncate = true, count_it = true, encode = true)
+  def characters(string, truncate: true, count_it: true, encode: true, before_string: nil, after_string: nil)
     return if @in_quote
 
     # we call length on this so might as well ensure we have a string
     string = string.to_s
-    if @in_details
+    if @in_details_depth > 0
       if @in_summary
         @summary_contents << string
       else
@@ -170,15 +192,20 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
       return
     end
 
+    @excerpt << before_string if before_string
+
     encode = encode ? lambda { |s| ERB::Util.html_escape(s) } : lambda { |s| s }
     if count_it && @current_length + string.length > @length
       length = [0, @length - @current_length - 1].max
       @excerpt << encode.call(string[0..length]) if truncate
       @excerpt << (@text_entities ? "..." : "&hellip;")
       @excerpt << "</a>" if @in_a
+      @excerpt << after_string if after_string
       throw :done
     end
+
     @excerpt << encode.call(string)
+    @excerpt << after_string if after_string
     @current_length += string.length if count_it
   end
 end
diff --git a/lib/file_helper.rb b/lib/file_helper.rb
index c8039bb9c55..7ef59523907 100644
--- a/lib/file_helper.rb
+++ b/lib/file_helper.rb
@@ -25,57 +25,55 @@ class FileHelper
                     follow_redirect: false,
                     read_timeout: 5,
                     skip_rate_limit: false,
-                    verbose: nil)
-
-    # verbose logging is default while debugging onebox
-    verbose = verbose.nil? ? true : verbose
+                    verbose: false)
 
     url = "https:" + url if url.start_with?("//")
     raise Discourse::InvalidParameters.new(:url) unless url =~ /^https?:\/\//
 
-    dest = FinalDestination.new(
+    tmp = nil
+
+    fd = FinalDestination.new(
       url,
       max_redirects: follow_redirect ? 5 : 1,
       skip_rate_limit: skip_rate_limit,
       verbose: verbose
     )
-    uri = dest.resolve
 
-    if !uri && dest.status_code.to_i >= 400
-      # attempt error API compatability
-      io = FakeIO.new
-      io.status = [dest.status_code.to_s, ""]
+    fd.get do |response, chunk, uri|
+      if tmp.nil?
+        # error handling
+        if uri.blank?
+          if response.code.to_i >= 400
+            # attempt error API compatibility
+            io = FakeIO.new
+            io.status = [response.code, ""]
+            raise OpenURI::HTTPError.new("#{response.code} Error", io)
+          else
+            log(:error, "FinalDestination did not work for: #{url}") if verbose
+            throw :done
+          end
+        end
 
-      # TODO perhaps translate and add Discourse::DownloadError
-      raise OpenURI::HTTPError.new("#{dest.status_code} Error", io)
-    end
+        # first run
+        tmp_file_ext = File.extname(uri.path)
 
-    unless uri
-      log(:error, "FinalDestination did not work for: #{url}") if verbose
-      return
-    end
+        if tmp_file_ext.blank? && response.content_type.present?
+          ext = MiniMime.lookup_by_content_type(response.content_type)&.extension
+          ext = "jpg" if ext == "jpe"
+          tmp_file_ext = "." + ext if ext.present?
+        end
 
-    downloaded = uri.open("rb", read_timeout: read_timeout)
-
-    extension = File.extname(uri.path)
-
-    if extension.blank? && downloaded.content_type.present?
-      ext = MiniMime.lookup_by_content_type(downloaded.content_type)&.extension
-      ext = "jpg" if ext == "jpe"
-      extension = "." + ext if ext.present?
-    end
-
-    tmp = Tempfile.new([tmp_file_name, extension])
-
-    File.open(tmp.path, "wb") do |f|
-      while f.size <= max_file_size && data = downloaded.read(512.kilobytes)
-        f.write(data)
+        tmp = Tempfile.new([tmp_file_name, tmp_file_ext])
+        tmp.binmode
       end
+
+      tmp.write(chunk)
+
+      throw :done if tmp.size > max_file_size
     end
 
+    tmp&.rewind
     tmp
-  ensure
-    downloaded&.close
   end
 
   def self.optimize_image!(filename)
diff --git a/lib/file_store/base_store.rb b/lib/file_store/base_store.rb
index f30882d4d6e..aa602c2c79b 100644
--- a/lib/file_store/base_store.rb
+++ b/lib/file_store/base_store.rb
@@ -131,7 +131,7 @@ module FileStore
       FileUtils.mkdir_p(dir) unless Dir[dir].present?
       FileUtils.cp(file.path, path)
       # keep latest 500 files
-      `ls -tr #{CACHE_DIR} | head -n +#{CACHE_MAXIMUM_SIZE} | xargs rm -f`
+      `ls -tr #{CACHE_DIR} | head -n -#{CACHE_MAXIMUM_SIZE} | xargs rm -f`
     end
 
     private
diff --git a/lib/file_store/s3_store.rb b/lib/file_store/s3_store.rb
index 838e8ffbc6d..483b41e02f0 100644
--- a/lib/file_store/s3_store.rb
+++ b/lib/file_store/s3_store.rb
@@ -85,7 +85,8 @@ module FileStore
     def cdn_url(url)
       return url if SiteSetting.Upload.s3_cdn_url.blank?
       schema = url[/^(https?:)?\/\//, 1]
-      url.sub("#{schema}#{absolute_base_url}", SiteSetting.Upload.s3_cdn_url)
+      folder = @s3_helper.s3_bucket_folder_path.nil? ? "" : "#{@s3_helper.s3_bucket_folder_path}/"
+      url.sub("#{schema}#{absolute_base_url}/#{folder}", "#{SiteSetting.Upload.s3_cdn_url}/")
     end
 
     def cache_avatar(avatar, user_id)
diff --git a/lib/final_destination.rb b/lib/final_destination.rb
index d28fc0d3c7e..c551715e6f4 100644
--- a/lib/final_destination.rb
+++ b/lib/final_destination.rb
@@ -30,20 +30,12 @@ class FinalDestination
 
   def initialize(url, opts = nil)
     @url = url
-    @uri =
-      begin
-        URI(escape_url) if @url
-      rescue URI::InvalidURIError
-      end
+    @uri = uri(escape_url) if @url
 
     @opts = opts || {}
     @force_get_hosts = @opts[:force_get_hosts] || []
     @opts[:max_redirects] ||= 5
-    @opts[:lookup_ip] ||= lambda do |host|
-      begin
-        FinalDestination.lookup_ip(host)
-      end
-    end
+    @opts[:lookup_ip] ||= lambda { |host| FinalDestination.lookup_ip(host) }
     @ignored = [Discourse.base_url_no_prefix] + (@opts[:ignore_redirects] || [])
     @limit = @opts[:max_redirects]
     @status = :ready
@@ -51,12 +43,17 @@ class FinalDestination
     @cookie = nil
     @limited_ips = []
     @verbose = @opts[:verbose] || false
+    @timeout = @opts[:timeout] || nil
   end
 
   def self.connection_timeout
     20
   end
 
+  def timeout
+    @timeout || FinalDestination.connection_timeout
+  end
+
   def redirected?
     @limit < @opts[:max_redirects]
   end
@@ -68,19 +65,60 @@ class FinalDestination
       "Host" => @uri.hostname
     }
 
-    result['cookie'] = @cookie if @cookie
+    result['Cookie'] = @cookie if @cookie
 
     result
   end
 
   def small_get(headers)
     Net::HTTP.start(@uri.host, @uri.port, use_ssl: @uri.is_a?(URI::HTTPS)) do |http|
-      http.open_timeout = FinalDestination.connection_timeout
-      http.read_timeout = FinalDestination.connection_timeout
+      http.open_timeout = timeout
+      http.read_timeout = timeout
       http.request_get(@uri.request_uri, headers)
     end
   end
 
+  # this is a new interface for simply getting
+  # N bytes accounting for all internal logic
+  def get(uri = @uri, redirects = @limit, extra_headers: {}, &blk)
+    raise "Must specify block" unless block_given?
+
+    if uri && uri.port == 80 && FinalDestination.is_https_domain?(uri.hostname)
+      uri.scheme = "https"
+      uri = URI(uri.to_s)
+    end
+
+    return nil unless validate_uri
+
+    result, (location, cookie) = safe_get(uri, &blk)
+
+    if result == :redirect && (redirects == 0 || !location)
+      return nil
+    end
+
+    if result == :redirect
+      old_port = uri.port
+      location = "#{uri.scheme}://#{uri.host}#{location}" if location[0] == "/"
+      uri = uri(location)
+
+      # https redirect, so just cache that whole new domain is https
+      if old_port == 80 && uri&.port == 443 && (URI::HTTPS === uri)
+        FinalDestination.cache_https_domain(uri.hostname)
+      end
+
+      return nil if !uri
+
+      extra = nil
+      extra = { 'Cookie' => cookie } if cookie
+
+      get(uri, redirects - 1, extra_headers: extra, &blk)
+    elsif result == :ok
+      uri.to_s
+    else
+      nil
+    end
+  end
+
   def resolve
     if @uri && @uri.port == 80 && FinalDestination.is_https_domain?(@uri.hostname)
       @uri.scheme = "https"
@@ -108,12 +146,12 @@ class FinalDestination
     headers = request_headers
     response = Excon.public_send(@http_verb,
       @uri.to_s,
-      read_timeout: FinalDestination.connection_timeout,
+      read_timeout: timeout,
       headers: headers
     )
 
     location = nil
-    headers = nil
+    response_headers = nil
 
     response_status = response.status.to_i
 
@@ -121,7 +159,7 @@ class FinalDestination
     when 200
       @status = :resolved
       return @uri
-    when 405, 406, 409, 501
+    when 400, 405, 406, 409, 501
       get_response = small_get(request_headers)
 
       response_status = get_response.code.to_i
@@ -130,38 +168,35 @@ class FinalDestination
         return @uri
       end
 
-      headers = {}
+      response_headers = {}
       if cookie_val = get_response.get_fields('set-cookie')
-        headers['set-cookie'] = cookie_val.join
+        response_headers[:cookies] = cookie_val
       end
 
-      # TODO this is confusing why grap location for anything not
-      # between 300-400 ?
       if location_val = get_response.get_fields('location')
-        headers['location'] = location_val.join
+        response_headers[:location] = location_val.join
       end
     end
 
-    unless headers
-      headers = {}
-      response.headers.each do |k, v|
-        headers[k.to_s.downcase] = v
-      end
+    unless response_headers
+      response_headers = {
+        cookies: response.data[:cookies] || response.headers[:"set-cookie"],
+        location: response.headers[:location]
+      }
     end
 
     if (300..399).include?(response_status)
-      location = headers["location"]
+      location = response_headers[:location]
     end
 
-    if set_cookie = headers["set-cookie"]
-      @cookie = set_cookie
+    if cookies = response_headers[:cookies]
+      @cookie = Array.wrap(cookies).map { |c| c.split(';').first.strip }.join('; ')
     end
 
     if location
       old_port = @uri.port
-
       location = "#{@uri.scheme}://#{@uri.host}#{location}" if location[0] == "/"
-      @uri = URI(location) rescue nil
+      @uri = uri(location)
       @limit -= 1
 
       # https redirect, so just cache that whole new domain is https
@@ -198,11 +233,11 @@ class FinalDestination
   end
 
   def hostname_matches?(url)
-    @uri && url.present? && @uri.hostname == (URI(url) rescue nil)&.hostname
+    url = uri(url)
+    @uri && url.present? && @uri.hostname == url&.hostname
   end
 
   def is_dest_valid?
-
     return false unless @uri && @uri.host
 
     # Whitelisted hosts
@@ -211,9 +246,7 @@ class FinalDestination
       hostname_matches?(Discourse.base_url_no_prefix)
 
     if SiteSetting.whitelist_internal_hosts.present?
-      SiteSetting.whitelist_internal_hosts.split('|').each do |h|
-        return true if @uri.hostname.downcase == h.downcase
-      end
+      return true if SiteSetting.whitelist_internal_hosts.split("|").any? { |h| h.downcase == @uri.hostname.downcase }
     end
 
     # Whitelisted hosts
@@ -255,8 +288,7 @@ class FinalDestination
   end
 
   def log(log_level, message)
-    # blacklist 404 on gravatar.com
-    return if @status_code == 404 && @uri.hostname["gravatar.com"]
+    return if @status_code == 404
 
     Rails.logger.public_send(
       log_level,
@@ -275,13 +307,84 @@ class FinalDestination
   end
 
   def self.lookup_ip(host)
-    # TODO clean this up in the test suite, cause it is a mess
-    # if Rails.env == "test"
-    #   STDERR.puts "WARNING FinalDestination.lookup_ip was called with host: #{host}, this is network call that should be mocked"
-    # end
-    IPSocket::getaddress(host)
+    if Rails.env.test?
+      "0.0.0.0"
+    else
+      IPSocket::getaddress(host)
+    end
   rescue SocketError
     nil
   end
 
+  protected
+
+  def safe_get(uri)
+    result = nil
+    unsafe_close = false
+
+    safe_session(uri) do |http|
+      headers = request_headers.merge(
+        'Accept-Encoding' => 'gzip',
+        'Host' => uri.host
+      )
+
+      req = Net::HTTP::Get.new(uri.request_uri, headers)
+
+      http.request(req) do |resp|
+        if Net::HTTPRedirection === resp
+          result = :redirect, [resp['location'], resp['Set-Cookie']]
+        end
+
+        if Net::HTTPSuccess === resp
+          resp.decode_content = true
+          resp.read_body do |chunk|
+            read_next = true
+
+            catch(:done) do
+              if read_next
+                read_next = false
+                yield resp, chunk, uri
+                read_next = true
+              end
+            end
+
+            # no clean way of finishing abruptly cause
+            # response likes reading till the end
+            if !read_next
+              unsafe_close = true
+              http.finish
+              raise StandardError
+            end
+          end
+          result = :ok
+        else
+          catch(:done) do
+            yield resp, nil, nil
+          end
+        end
+      end
+    end
+
+    result
+  rescue StandardError
+    unsafe_close ? :ok : raise
+  end
+
+  def safe_session(uri)
+    Net::HTTP.start(uri.host, uri.port, use_ssl: (uri.scheme == "https")) do |http|
+      http.read_timeout = timeout
+      http.open_timeout = timeout
+      yield http
+    end
+  end
+
+  private
+
+  def uri(location)
+    begin
+      URI(location)
+    rescue URI::InvalidURIError, ArgumentError
+    end
+  end
+
 end
diff --git a/lib/flag_query.rb b/lib/flag_query.rb
index f8051853c60..11db2aa887d 100644
--- a/lib/flag_query.rb
+++ b/lib/flag_query.rb
@@ -21,19 +21,25 @@ module FlagQuery
 
     total_rows = actions.count
 
-    post_ids = actions.limit(per_page)
+    post_ids_relation = actions.limit(per_page)
       .offset(offset)
       .group(:post_id)
       .order('MIN(post_actions.created_at) DESC')
-      .pluck(:post_id)
-      .uniq
+
+    if opts[:filter] != "old" && SiteSetting.min_flags_staff_visibility > 1
+      post_ids_relation = post_ids_relation.having("count(*) >= ?", SiteSetting.min_flags_staff_visibility)
+    end
+
+    post_ids = post_ids_relation.pluck(:post_id).uniq
 
     posts = SqlBuilder.new("
       SELECT p.id,
              p.cooked,
+             p.raw,
              p.user_id,
              p.topic_id,
              p.post_number,
+             p.reply_count,
              p.hidden,
              p.deleted_at,
              p.user_deleted,
@@ -145,6 +151,16 @@ module FlagQuery
       post_actions = post_actions.where("topics.id = ?", opts[:topic_id])
     end
 
+    if opts[:user_id]
+      post_actions = post_actions.where("posts.user_id = ?", opts[:user_id])
+    end
+
+    if opts[:filter] == 'without_custom'
+      return post_actions.where(
+        'post_action_type_id' => PostActionType.flag_types_without_custom.values
+      )
+    end
+
     if opts[:filter] == "old"
       post_actions.where("post_actions.disagreed_at IS NOT NULL OR
                           post_actions.deferred_at IS NOT NULL OR
@@ -170,18 +186,25 @@ module FlagQuery
     ft_by_id = {}
     users_by_id = {}
     topics_by_id = {}
+    counts_by_post = {}
 
     results.each do |pa|
       if pa.post.present? && pa.post.topic.present?
-        ft = ft_by_id[pa.post.topic.id] ||= OpenStruct.new(
+        topic_id = pa.post.topic.id
+
+        ft = ft_by_id[topic_id] ||= OpenStruct.new(
           topic: pa.post.topic,
           flag_counts: {},
           user_ids: [],
-          last_flag_at: pa.created_at
+          last_flag_at: pa.created_at,
+          meets_minimum: false
         )
 
-        topics_by_id[pa.post.topic.id] = pa.post.topic
+        counts_by_post[pa.post.id] ||= 0
+        sum = counts_by_post[pa.post.id] += 1
+        ft.meets_minimum = true if sum >= SiteSetting.min_flags_staff_visibility
 
+        topics_by_id[topic_id] = pa.post.topic
         ft.flag_counts[pa.post_action_type_id] ||= 0
         ft.flag_counts[pa.post_action_type_id] += 1
 
@@ -192,9 +215,11 @@ module FlagQuery
       end
     end
 
+    flagged_topics = ft_by_id.values.select { |ft| ft.meets_minimum }
+
     Topic.preload_custom_fields(topics_by_id.values, TopicList.preloaded_custom_fields)
 
-    { flagged_topics: ft_by_id.values, users: users_by_id.values }
+    { flagged_topics: flagged_topics, users: users_by_id.values }
   end
 
   private
diff --git a/lib/freedom_patches/active_record_base.rb b/lib/freedom_patches/active_record_base.rb
index bd4eb2c1e82..b65ebc0616b 100644
--- a/lib/freedom_patches/active_record_base.rb
+++ b/lib/freedom_patches/active_record_base.rb
@@ -4,7 +4,7 @@ class ActiveRecord::Base
   def self.exec_sql(*args)
     conn = ActiveRecord::Base.connection
     sql = ActiveRecord::Base.send(:sanitize_sql_array, args)
-    conn.raw_connection.exec(sql)
+    conn.raw_connection.async_exec(sql)
   end
 
   def self.exec_sql_row_count(*args)
diff --git a/lib/freedom_patches/safe_migrations.rb b/lib/freedom_patches/safe_migrations.rb
new file mode 100644
index 00000000000..59eb1f7ce42
--- /dev/null
+++ b/lib/freedom_patches/safe_migrations.rb
@@ -0,0 +1,3 @@
+require_dependency 'migration/safe_migrate'
+
+Migration::SafeMigrate.patch_active_record!
diff --git a/lib/freedom_patches/translate_accelerator.rb b/lib/freedom_patches/translate_accelerator.rb
index 92f0b80b311..fe737f52578 100644
--- a/lib/freedom_patches/translate_accelerator.rb
+++ b/lib/freedom_patches/translate_accelerator.rb
@@ -39,6 +39,13 @@ module I18n
         if @loaded_locales.empty?
           # load all rb files
           I18n.backend.load_translations(I18n.load_path.grep(/\.rb$/))
+
+          # load plural rules from plugins
+          DiscoursePluginRegistry.locales.each do |locale, options|
+            if options[:plural]
+              I18n.backend.store_translations(locale, i18n: { plural: options[:plural] })
+            end
+          end
         end
 
         # load it
diff --git a/lib/guardian.rb b/lib/guardian.rb
index 9792f468f3c..baa26363aa3 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -70,12 +70,13 @@ class Guardian
   def is_developer?
     @user &&
     is_admin? &&
-    (Rails.env.development? ||
+    (
+      Rails.env.development? ||
+      Developer.user_ids.include?(@user.id) ||
       (
         Rails.configuration.respond_to?(:developer_emails) &&
         Rails.configuration.developer_emails.include?(@user.email)
-      ) ||
-      Developer.user_ids.include?(@user.id)
+      )
     )
   end
 
@@ -111,6 +112,10 @@ class Guardian
     true
   end
 
+  def can_enable_safe_mode?
+    SiteSetting.enable_safe_mode? || is_staff?
+  end
+
   # Can the user edit the obj
   def can_edit?(obj)
     can_do?(:edit, obj)
@@ -128,6 +133,16 @@ class Guardian
   alias :can_see_flags? :can_moderate?
   alias :can_close? :can_moderate?
 
+  def can_tag?(topic)
+    return false if topic.blank?
+
+    topic.private_message? ? can_tag_pms? : can_tag_topics?
+  end
+
+  def can_see_tags?(topic)
+    SiteSetting.tagging_enabled && topic.present? && (!topic.private_message? || can_tag_pms?)
+  end
+
   def can_send_activation_email?(user)
     user && is_staff? && !SiteSetting.must_approve_users?
   end
@@ -204,8 +219,12 @@ class Guardian
     can_administer?(user) && !user.moderator?
   end
 
-  def can_grant_title?(user)
-    user && is_staff?
+  def can_grant_title?(user, title = nil)
+    return true if user && is_staff?
+    return false if title.nil?
+    return false if user != @user
+    return true if user.badges.where(name: title, allow_title: true).exists?
+    user.groups.where(title: title).exists?
   end
 
   def can_change_primary_group?(user)
@@ -246,11 +265,14 @@ class Guardian
   def can_invite_to?(object, groups = nil)
     return false unless authenticated?
     return true if is_admin?
-    return false unless SiteSetting.enable_private_messages?
     return false if (SiteSetting.max_invites_per_day.to_i == 0 && !is_staff?)
     return false unless can_see?(object)
     return false if groups.present?
 
+    if object.is_a?(Topic) && object.private_message?
+      return false unless SiteSetting.enable_personal_messages?
+    end
+
     if object.is_a?(Topic) && object.category
       if object.category.groups.any?
         return true if object.category.groups.all? { |g| can_edit_group?(g) }
@@ -302,7 +324,7 @@ class Guardian
     # User disabled private message
     (is_staff? || is_group || target.user_option.allow_private_messages) &&
     # PMs are enabled
-    (is_staff? || SiteSetting.enable_private_messages) &&
+    (is_staff? || SiteSetting.enable_personal_messages) &&
     # Can't send PMs to suspended users
     (is_staff? || is_group || !target.suspended?) &&
     # Check group messageable level
@@ -319,7 +341,7 @@ class Guardian
     # User is trusted enough
     @user.has_trust_level?(SiteSetting.min_trust_to_send_email_messages) &&
     # PMs to email addresses are enabled
-    (is_staff? || SiteSetting.enable_private_email_messages)
+    (is_staff? || SiteSetting.enable_personal_email_messages)
   end
 
   def can_see_emails?
diff --git a/lib/guardian/group_guardian.rb b/lib/guardian/group_guardian.rb
index 95ec4f2fdef..492924c92e5 100644
--- a/lib/guardian/group_guardian.rb
+++ b/lib/guardian/group_guardian.rb
@@ -13,6 +13,8 @@ module GroupGuardian
   end
 
   def can_see_group_messages?(group)
-    is_admin? || group.users.include?(user)
+    SiteSetting.enable_personal_messages? && (
+      is_admin? || group.users.include?(user)
+    )
   end
 end
diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb
index d4ce94fdffe..81eb95f9f0e 100644
--- a/lib/guardian/post_guardian.rb
+++ b/lib/guardian/post_guardian.rb
@@ -1,6 +1,11 @@
 #mixin for all guardian methods dealing with post permissions
 module PostGuardian
 
+  def can_post_link?
+    authenticated? &&
+      @user.has_trust_level?(TrustLevel[SiteSetting.min_trust_to_post_links])
+  end
+
   # Can the user act on the post in a particular way.
   #  taken_actions = the list of actions the user has already taken
   def post_can_act?(post, action_key, opts: {}, can_see_post: nil)
@@ -10,42 +15,47 @@ module PostGuardian
     return false if (action_key == :notify_user && !is_staff? && opts[:is_warning].present? && opts[:is_warning] == 'true')
 
     taken = opts[:taken_actions].try(:keys).to_a
-    is_flag = PostActionType.flag_types_without_custom[action_key]
+    is_flag = PostActionType.notify_flag_types[action_key]
     already_taken_this_action = taken.any? && taken.include?(PostActionType.types[action_key])
-    already_did_flagging      = taken.any? && (taken & PostActionType.flag_types_without_custom.values).any?
+    already_did_flagging      = taken.any? && (taken & PostActionType.notify_flag_types.values).any?
 
     result = if authenticated? && post && !@user.anonymous?
+      # post made by staff, but we don't allow staff flags
+      return false if is_flag &&
+        (!SiteSetting.allow_flagging_staff?) &&
+        post.user.staff?
 
-      return false if [:notify_user, :notify_moderators].include?(action_key) &&
-        !SiteSetting.enable_private_messages?
+      if [:notify_user, :notify_moderators].include?(action_key) &&
+         (!SiteSetting.enable_personal_messages? ||
+         !@user.has_trust_level?(SiteSetting.min_trust_to_send_messages))
+
+        return false
+      end
 
       # we allow flagging for trust level 1 and higher
       # always allowed for private messages
-      (is_flag && not(already_did_flagging) && (@user.has_trust_level?(TrustLevel[1]) || post.topic.private_message?)) ||
+      (is_flag && not(already_did_flagging) && (@user.has_trust_level?(TrustLevel[SiteSetting.min_trust_to_flag_posts]) || post.topic.private_message?)) ||
 
       # not a flagging action, and haven't done it already
       not(is_flag || already_taken_this_action) &&
 
       # nothing except flagging on archived topics
-      not(post.topic.try(:archived?)) &&
+      not(post.topic&.archived?) &&
 
       # nothing except flagging on deleted posts
       not(post.trashed?) &&
 
       # don't like your own stuff
-      not(action_key == :like && is_my_own?(post)) &&
-
-      # new users can't notify_user or notify_moderators because they are not allowed to send private messages
-      not((action_key == :notify_user || action_key == :notify_moderators) &&
-        !@user.has_trust_level?(SiteSetting.min_trust_to_send_messages)) &&
-
-      # no voting more than once on single vote topics
-      not(action_key == :vote && opts[:voted_in_topic] && post.topic.has_meta_data_boolean?(:single_vote))
+      not(action_key == :like && is_my_own?(post))
     end
 
     !!result
   end
 
+  def can_lock_post?(post)
+    can_see_post?(post) && is_staff?
+  end
+
   def can_defer_flags?(post)
     can_see_post?(post) && is_staff? && post
   end
@@ -62,11 +72,6 @@ module PostGuardian
 
     return can_see_flags?(topic) if PostActionType.is_flag?(type_symbol)
 
-    if type_symbol == :vote
-      # We can see votes if the topic allows for public voting
-      return false if topic.has_meta_data_boolean?(:private_poll)
-    end
-
     true
   end
 
@@ -80,6 +85,9 @@ module PostGuardian
 
   # Creating Method
   def can_create_post?(parent)
+
+    return false if !SiteSetting.enable_system_message_replies? && parent.try(:subtype) == "system_message"
+
     (!SpamRule::AutoSilence.silence?(@user) || (!!parent.try(:private_message?) && parent.allowed_users.include?(@user))) && (
       !parent ||
       !parent.category ||
@@ -95,9 +103,16 @@ module PostGuardian
 
     return true if is_admin?
 
-    if is_staff? || @user.has_trust_level?(TrustLevel[4])
-      return can_create_post?(post.topic)
-    end
+    # Must be staff to edit a locked post
+    return false if post.locked? && !is_staff?
+
+    return can_create_post?(post.topic) if (
+      is_staff? ||
+      (
+        SiteSetting.trusted_users_can_edit_others? &&
+        @user.has_trust_level?(TrustLevel[4])
+      )
+    )
 
     if post.topic.archived? || post.user_deleted || post.deleted_at
       return false
@@ -184,10 +199,6 @@ module PostGuardian
     can_see_post?(post)
   end
 
-  def can_vote?(post, opts = {})
-    post_can_act?(post, :vote, opts: opts)
-  end
-
   def can_change_post_owner?
     is_admin?
   end
diff --git a/lib/guardian/tag_guardian.rb b/lib/guardian/tag_guardian.rb
index b9315078df3..84856d4d152 100644
--- a/lib/guardian/tag_guardian.rb
+++ b/lib/guardian/tag_guardian.rb
@@ -5,7 +5,11 @@ module TagGuardian
   end
 
   def can_tag_topics?
-    user && user.has_trust_level?(SiteSetting.min_trust_level_to_tag_topics.to_i)
+    user && SiteSetting.tagging_enabled && user.has_trust_level?(SiteSetting.min_trust_level_to_tag_topics.to_i)
+  end
+
+  def can_tag_pms?
+    is_staff? && SiteSetting.tagging_enabled && SiteSetting.allow_staff_to_tag_pms
   end
 
   def can_admin_tags?
diff --git a/lib/guardian/topic_guardian.rb b/lib/guardian/topic_guardian.rb
index bf451ec2baf..d3b60521806 100644
--- a/lib/guardian/topic_guardian.rb
+++ b/lib/guardian/topic_guardian.rb
@@ -10,6 +10,14 @@ module TopicGuardian
     )
   end
 
+  def can_create_shared_draft?
+    is_staff? && SiteSetting.shared_drafts_enabled?
+  end
+
+  def can_publish_topic?(topic, category)
+    is_staff? && can_see?(topic) && can_create_topic?(category)
+  end
+
   # Creating Methods
   def can_create_topic?(parent)
     is_staff? ||
@@ -20,8 +28,7 @@ module TopicGuardian
 
   def can_create_topic_on_category?(category)
     # allow for category to be a number as well
-    category_id = category
-    category_id = category.id if Category === category
+    category_id = Category === category ? category.id : category
 
     can_create_topic?(nil) &&
     (!category || Category.topic_create_allowed(self).where(id: category_id).count == 1)
@@ -50,10 +57,22 @@ module TopicGuardian
     return false if !can_create_topic_on_category?(topic.category)
 
     # TL4 users can edit archived topics, but can not edit private messages
-    return true if (topic.archived && !topic.private_message? && user.has_trust_level?(TrustLevel[4]) && can_create_post?(topic))
+    return true if (
+      SiteSetting.trusted_users_can_edit_others? &&
+      topic.archived &&
+      !topic.private_message? &&
+      user.has_trust_level?(TrustLevel[4]) &&
+      can_create_post?(topic)
+    )
 
     # TL3 users can not edit archived topics and private messages
-    return true if (!topic.archived && !topic.private_message? && user.has_trust_level?(TrustLevel[3]) && can_create_post?(topic))
+    return true if (
+      SiteSetting.trusted_users_can_edit_others? &&
+      !topic.archived &&
+      !topic.private_message? &&
+      user.has_trust_level?(TrustLevel[3]) &&
+      can_create_post?(topic)
+    )
 
     return false if topic.archived
     is_my_own?(topic) && !topic.edit_time_limit_expired?
@@ -67,14 +86,15 @@ module TopicGuardian
   def can_delete_topic?(topic)
     !topic.trashed? &&
     is_staff? &&
-    !(Category.exists?(topic_id: topic.id)) &&
+    !(topic.is_category_topic?) &&
     !Discourse.static_doc_topic_ids.include?(topic.id)
   end
 
   def can_convert_topic?(topic)
+    return false unless SiteSetting.enable_personal_messages?
     return false if topic.blank?
-    return false if topic && topic.trashed?
-    return false if Category.where("topic_id = ?", topic.id).exists?
+    return false if topic.trashed?
+    return false if topic.is_category_topic?
     return true if is_admin?
     is_moderator? && can_create_post?(topic)
   end
diff --git a/lib/guardian/user_guardian.rb b/lib/guardian/user_guardian.rb
index 26a1056262f..0aef85c9914 100644
--- a/lib/guardian/user_guardian.rb
+++ b/lib/guardian/user_guardian.rb
@@ -43,7 +43,7 @@ module UserGuardian
     if is_me?(user)
       user.post_count <= 1
     else
-      is_staff? && (user.first_post_created_at.nil? || user.first_post_created_at > SiteSetting.delete_user_max_post_age.to_i.days.ago)
+      is_staff? && (user.first_post_created_at.nil? || user.post_count <= 5 || user.first_post_created_at > SiteSetting.delete_user_max_post_age.to_i.days.ago)
     end
   end
 
@@ -72,4 +72,8 @@ module UserGuardian
     user == @user || is_staff?
   end
 
+  def can_disable_second_factor?(user)
+    user && can_administer_user?(user)
+  end
+
 end
diff --git a/lib/hijack.rb b/lib/hijack.rb
index 026077dbb61..e0641182d11 100644
--- a/lib/hijack.rb
+++ b/lib/hijack.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_dependency 'method_profiler'
+
 # This module allows us to hijack a request and send it to the client in the deferred job queue
 # For cases where we are making remote calls like onebox or proxying files and so on this helps
 # free up a unicorn worker while the remote IO is happening
@@ -13,20 +15,27 @@ module Hijack
       request.env['discourse.request_tracker.skip'] = true
       request_tracker = request.env['discourse.request_tracker']
 
-      # unicorn will re-cycle env, this ensures we keep the original copy
-      env_copy = request.env.dup
-      request_copy = ActionDispatch::Request.new(env_copy)
+      # in the past unicorn would recycle env, this is not longer the case
+      env = request.env
 
-      transfer_timings = MethodProfiler.transfer if defined? MethodProfiler
+      # rack may clean up tempfiles unless we trick it and take control
+      tempfiles = env[Rack::RACK_TEMPFILES]
+      env[Rack::RACK_TEMPFILES] = nil
+      request_copy = ActionDispatch::Request.new(env)
+
+      transfer_timings = MethodProfiler.transfer
 
       io = hijack.call
 
+      # duplicate headers so other middleware does not mess with it
+      # on the way down the stack
+      original_headers = response.headers.dup
+
       Scheduler::Defer.later("hijack #{params["controller"]} #{params["action"]}") do
 
-        MethodProfiler.start(transfer_timings) if defined? MethodProfiler
-
+        MethodProfiler.start(transfer_timings)
         begin
-          Thread.current[Logster::Logger::LOGSTER_ENV] = env_copy
+          Thread.current[Logster::Logger::LOGSTER_ENV] = env
           # do this first to confirm we have a working connection
           # before doing any work
           io.write "HTTP/1.1 "
@@ -38,13 +47,18 @@ module Hijack
           instance.response = response
 
           instance.request = request_copy
+          original_headers&.each do |k, v|
+            instance.response.headers[k] = v
+          end
 
+          view_start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
           begin
             instance.instance_eval(&blk)
           rescue => e
             # TODO we need to reuse our exception handling in ApplicationController
-            Discourse.warn_exception(e, message: "Failed to process hijacked response correctly", env: env_copy)
+            Discourse.warn_exception(e, message: "Failed to process hijacked response correctly", env: env)
           end
+          view_runtime = Process.clock_gettime(Process::CLOCK_MONOTONIC) - view_start
 
           unless instance.response_body || response.committed?
             instance.status = 500
@@ -56,16 +70,25 @@ module Hijack
 
           headers = response.headers
           # add cors if needed
-          if cors_origins = env_copy[Discourse::Cors::ORIGINS_ENV]
-            Discourse::Cors.apply_headers(cors_origins, env_copy, headers)
+          if cors_origins = env[Discourse::Cors::ORIGINS_ENV]
+            Discourse::Cors.apply_headers(cors_origins, env, headers)
           end
 
+          headers['Content-Type'] ||= response.content_type || "text/plain"
           headers['Content-Length'] = body.bytesize
-          headers['Content-Type'] = response.content_type || "text/plain"
           headers['Connection'] = "close"
 
-          status_string = Rack::Utils::HTTP_STATUS_CODES[instance.status.to_i] || "Unknown"
-          io.write "#{instance.status} #{status_string}\r\n"
+          if env[Auth::DefaultCurrentUserProvider::BAD_TOKEN]
+            headers['Discourse-Logged-Out'] = '1'
+          end
+
+          status_string = Rack::Utils::HTTP_STATUS_CODES[response.status.to_i] || "Unknown"
+          io.write "#{response.status} #{status_string}\r\n"
+
+          timings = MethodProfiler.stop
+          if timings && duration = timings[:total_duration]
+            headers["X-Runtime"] = "#{"%0.6f" % duration}"
+          end
 
           headers.each do |name, val|
             io.write "#{name}: #{val}\r\n"
@@ -78,15 +101,44 @@ module Hijack
           io = nil
         ensure
 
+          if Rails.configuration.try(:lograge).try(:enabled)
+            if timings
+              db_runtime = 0
+              if timings[:sql]
+                db_runtime = timings[:sql][:duration]
+              end
+
+              subscriber = Lograge::RequestLogSubscriber.new
+              payload = ActiveSupport::HashWithIndifferentAccess.new(
+                controller: self.class.name,
+                action: action_name,
+                params: request.filtered_parameters,
+                headers: request.headers,
+                format: request.format.ref,
+                method: request.request_method,
+                path: request.fullpath,
+                view_runtime: view_runtime * 1000.0,
+                db_runtime: db_runtime * 1000.0,
+                timings: timings,
+                status: response.status
+              )
+
+              event = ActiveSupport::Notifications::Event.new("hijack", Time.now, Time.now + timings[:total_duration], "", payload)
+              subscriber.process_action(event)
+            end
+          end
+
+          MethodProfiler.clear
           Thread.current[Logster::Logger::LOGSTER_ENV] = nil
 
           io.close if io rescue nil
 
           if request_tracker
-            status = instance.status rescue 500
-            timings = MethodProfiler.stop if defined? MethodProfiler
-            request_tracker.log_request_info(env_copy, [status, headers || {}, []], timings)
+            status = response.status rescue 500
+            request_tracker.log_request_info(env, [status, headers || {}, []], timings)
           end
+
+          tempfiles&.each(&:close!)
         end
       end
       # not leaked out, we use 418 ... I am a teapot to denote that we are hijacked
diff --git a/lib/html_normalize.rb b/lib/html_normalize.rb
deleted file mode 100644
index 1243a4426a6..00000000000
--- a/lib/html_normalize.rb
+++ /dev/null
@@ -1,151 +0,0 @@
-# frozen_string_literal: true
-#
-# this class is used to normalize html output for internal comparisons in specs
-#
-require 'oga'
-
-class HtmlNormalize
-
-  def self.normalize(html)
-    parsed = Oga.parse_html(html.strip, strict: true)
-    if parsed.children.length != 1
-      puts parsed.children.count
-      raise "expecting a single child"
-    end
-    new(parsed.children.first).format
-  end
-
-  SELF_CLOSE = Set.new(%w{area base br col command embed hr img input keygen line meta param source track wbr})
-
-  BLOCK = Set.new(%w{
-    html
-    body
-    aside
-    p
-    h1 h2 h3 h4 h5 h6
-    ol ul
-    address
-    blockquote
-    dl
-    div
-    fieldset
-    form
-    hr
-    noscript
-    table
-    pre
-  })
-
-  def initialize(doc)
-    @doc = doc
-  end
-
-  def format
-    buffer = String.new
-    dump_node(@doc, 0, buffer)
-    buffer.strip!
-    buffer
-  end
-
-  def inline?(node)
-    Oga::XML::Text === node || !BLOCK.include?(node.name.downcase)
-  end
-
-  def dump_node(node, indent = 0, buffer)
-
-    if Oga::XML::Text === node
-      if node.parent&.name
-        buffer << node.text
-      end
-      return
-    end
-
-    name = node.name.downcase
-
-    block = BLOCK.include?(name)
-
-    buffer << " " * indent * 2 if block
-
-    buffer << "<" << name
-
-    attrs = node&.attributes
-    if (attrs && attrs.length > 0)
-      attrs.sort! { |x, y| x.name <=> y.name }
-      attrs.each do |a|
-        buffer << " "
-        buffer << a.name
-        if a.value
-          buffer << "='"
-          buffer << a.value
-          buffer << "'"
-        end
-      end
-    end
-
-    buffer << ">"
-
-    if block
-      buffer << "\n"
-    end
-
-    children = node.children
-    children = trim(children) if block
-
-    inline_buffer = nil
-
-    children&.each do |child|
-      if block && inline?(child)
-        inline_buffer ||= String.new
-        dump_node(child, indent + 1, inline_buffer)
-      else
-        if inline_buffer
-          buffer << " " * (indent + 1) * 2
-          buffer << inline_buffer.strip
-          inline_buffer = nil
-        else
-          dump_node(child, indent + 1, buffer)
-        end
-      end
-    end
-
-    if inline_buffer
-      buffer << " " * (indent + 1) * 2
-      buffer << inline_buffer.strip
-      inline_buffer = nil
-    end
-
-    if block
-      buffer << "\n" unless buffer[-1] == "\n"
-      buffer << " " * indent * 2
-    end
-
-    unless SELF_CLOSE.include?(name)
-      buffer << "</" << name
-      buffer << ">\n"
-    end
-  end
-
-  def trim(nodes)
-    start = 0
-    finish = nodes.length
-
-    nodes.each do |n|
-      if Oga::XML::Text === n && n.text.blank?
-        start += 1
-      else
-        break
-      end
-    end
-
-    nodes.reverse_each do |n|
-      if Oga::XML::Text === n && n.text.blank?
-        finish -= 1
-      else
-        break
-      end
-    end
-
-    nodes[start...finish]
-  end
-
-end
diff --git a/lib/html_to_markdown.rb b/lib/html_to_markdown.rb
index 99563379aea..3f362e6f945 100644
--- a/lib/html_to_markdown.rb
+++ b/lib/html_to_markdown.rb
@@ -75,11 +75,12 @@ class HtmlToMarkdown
     code = node.children.find { |c| c.name == "code" }
     code_class = code ? code["class"] : ""
     lang = code_class ? code_class[/lang-(\w+)/, 1] : ""
-    @stack << Block.new("pre")
-    @markdown << "```#{lang}\n"
+    pre = Block.new("pre")
+    pre.markdown = "```#{lang}\n"
+    @stack << pre
     traverse(node)
+    pre.markdown << "\n```\n"
     @markdown << format_block
-    @markdown << "```\n"
   end
 
   def visit_blockquote(node)
diff --git a/lib/i18n/backend/discourse_i18n.rb b/lib/i18n/backend/discourse_i18n.rb
index 375b72b8cc2..1f33dd60e0d 100644
--- a/lib/i18n/backend/discourse_i18n.rb
+++ b/lib/i18n/backend/discourse_i18n.rb
@@ -25,7 +25,7 @@ module I18n
       end
 
       def fallbacks(locale)
-        [locale, SiteSetting.default_locale.to_sym, :en].uniq.compact
+        I18n.fallbacks[locale]
       end
 
       def exists?(locale, key)
diff --git a/lib/i18n/backend/fallback_locale_list.rb b/lib/i18n/backend/fallback_locale_list.rb
new file mode 100644
index 00000000000..6b4faf1bf1b
--- /dev/null
+++ b/lib/i18n/backend/fallback_locale_list.rb
@@ -0,0 +1,11 @@
+module I18n
+  module Backend
+    # Configure custom fallback order
+    class FallbackLocaleList < Hash
+      def [](locale)
+        fallback_locale = LocaleSiteSetting.fallback_locale(locale)
+        [locale, fallback_locale, SiteSetting.default_locale.to_sym, :en].uniq.compact
+      end
+    end
+  end
+end
diff --git a/lib/import_export/base_exporter.rb b/lib/import_export/base_exporter.rb
index ff6cd2ed076..58d3b77e4e8 100644
--- a/lib/import_export/base_exporter.rb
+++ b/lib/import_export/base_exporter.rb
@@ -5,7 +5,7 @@ module ImportExport
 
     CATEGORY_ATTRS = [:id, :name, :color, :created_at, :user_id, :slug, :description, :text_color,
                       :auto_close_hours, :parent_category_id, :auto_close_based_on_last_post,
-                      :topic_template, :suppress_from_homepage, :all_topics_wiki, :permissions_params]
+                      :topic_template, :suppress_from_latest, :all_topics_wiki, :permissions_params]
 
     GROUP_ATTRS = [ :id, :name, :created_at, :mentionable_level, :messageable_level, :visibility_level,
                     :automatic_membership_email_domains, :automatic_membership_retroactive,
@@ -75,10 +75,10 @@ module ImportExport
       end
 
       user_ids.uniq!
-      return [] if user_ids.empty?
+      return User.none if user_ids.empty?
 
       users = User.where(id: user_ids)
-      export_users(users.to_a)
+      export_users(users)
     end
 
     def export_group_users!
@@ -118,10 +118,9 @@ module ImportExport
       return if @export_data[:topics].blank?
       topic_ids = @export_data[:topics].pluck(:id)
 
-      users = User.joins(:topics).where('topics.id IN (?)', topic_ids).to_a
-      users.uniq!
+      users = User.joins(:posts).where('posts.topic_id IN (?)', topic_ids).distinct
 
-      export_users(users.to_a)
+      export_users(users)
     end
 
     def export_topic_users!
@@ -132,9 +131,9 @@ module ImportExport
 
     def export_users(users)
       data = []
-      users.reject! { |u| u.id == Discourse::SYSTEM_USER_ID }
 
-      users.each do |u|
+      users.find_each do |u|
+        next if u.id == Discourse::SYSTEM_USER_ID
         x = USER_ATTRS.inject({}) { |h, a| h[a] = u.send(a); h; }
         x.merge(bio_raw: u.user_profile.bio_raw,
                 website: u.user_profile.website,
diff --git a/lib/import_export/importer.rb b/lib/import_export/importer.rb
index 2e982a089ef..90d787a5294 100644
--- a/lib/import_export/importer.rb
+++ b/lib/import_export/importer.rb
@@ -32,6 +32,8 @@ module ImportExport
     def import_users
       return if @users.blank?
 
+      puts "Importing users..."
+
       @users.each do |u|
         import_id = "#{u[:id]}#{import_source}"
         existing = User.with_email(u[:email]).first
@@ -52,6 +54,8 @@ module ImportExport
     def import_groups
       return if @groups.blank?
 
+      puts "Importing groups..."
+
       @groups.each do |group_data|
         g = group_data.dup
         user_ids = g.delete(:user_ids)
@@ -68,6 +72,8 @@ module ImportExport
     def import_categories
       return if @categories.blank?
 
+      puts "Importing categories..."
+
       import_ids = @categories.collect { |c| "#{c[:id]}#{import_source}" }
       existing_categories = CategoryCustomField.where("name = 'import_id' AND value IN (?)", import_ids).select(:category_id, :value).to_a
       existing_category_ids = existing_categories.pluck(:value)
@@ -106,6 +112,8 @@ module ImportExport
     def import_topics
       return if @topics.blank?
 
+      puts "Importing topics...", ''
+
       @topics.each do |t|
         puts ""
         print t[:title]
@@ -153,7 +161,10 @@ module ImportExport
     end
 
     def new_category_id(external_category_id)
-      CategoryCustomField.where(name: "import_id", value: "#{external_category_id}#{import_source}").first.category_id rescue nil
+      CategoryCustomField.where(
+        name: "import_id",
+        value: "#{external_category_id}#{import_source}"
+      ).first&.category_id
     end
 
     def import_source
diff --git a/lib/inline_oneboxer.rb b/lib/inline_oneboxer.rb
index 4c71cba888d..aafe3b338cb 100644
--- a/lib/inline_oneboxer.rb
+++ b/lib/inline_oneboxer.rb
@@ -2,6 +2,8 @@ require_dependency 'retrieve_title'
 
 class InlineOneboxer
 
+  MIN_TITLE_LENGTH = 2
+
   def initialize(urls, opts = nil)
     @urls = urls
     @opts = opts || {}
@@ -27,10 +29,12 @@ class InlineOneboxer
       return cached if cached.present?
     end
 
+    return unless url
+
     if route = Discourse.route_for(url)
       if route[:controller] == "topics" &&
         route[:action] == "show" &&
-        topic = (Topic.where(id: route[:topic_id].to_i).first rescue nil)
+        topic = Topic.where(id: route[:topic_id].to_i).first
 
         return onebox_for(url, topic.title, opts) if Guardian.new.can_see?(topic)
       end
@@ -40,12 +44,16 @@ class InlineOneboxer
     domains = SiteSetting.inline_onebox_domains_whitelist&.split('|') unless always_allow
 
     if always_allow || domains
-      uri = URI(url) rescue nil
+      uri = begin
+        URI(url)
+      rescue URI::InvalidURIError
+      end
 
       if uri.present? &&
         uri.hostname.present? &&
         (always_allow || domains.include?(uri.hostname)) &&
         title = RetrieveTitle.crawl(url)
+        title = nil if title && title.length < MIN_TITLE_LENGTH
         return onebox_for(url, title, opts)
       end
     end
@@ -58,7 +66,7 @@ class InlineOneboxer
     def self.onebox_for(url, title, opts)
       onebox = {
         url: url,
-        title: Emoji.gsub_emoji_to_unicode(title)
+        title: title && Emoji.gsub_emoji_to_unicode(title)
       }
       unless opts[:skip_cache]
         Rails.cache.write(cache_key(url), onebox, expires_in: 1.day)
diff --git a/lib/javascripts/moment-timezone-with-data.js b/lib/javascripts/moment-timezone-with-data.js
new file mode 100644
index 00000000000..f0c870d8712
--- /dev/null
+++ b/lib/javascripts/moment-timezone-with-data.js
@@ -0,0 +1,1204 @@
+//! moment-timezone.js
+//! version : 0.5.14
+//! Copyright (c) JS Foundation and other contributors
+//! license : MIT
+//! github.com/moment/moment-timezone
+
+(function (root, factory) {
+	"use strict";
+
+	/*global define*/
+	if (typeof define === 'function' && define.amd) {
+		define(['moment'], factory);                 // AMD
+	} else if (typeof module === 'object' && module.exports) {
+		module.exports = factory(require('moment')); // Node
+	} else {
+		factory(root.moment);                        // Browser
+	}
+}(this, function (moment) {
+	"use strict";
+
+	// Do not load moment-timezone a second time.
+	// if (moment.tz !== undefined) {
+	// 	logError('Moment Timezone ' + moment.tz.version + ' was already loaded ' + (moment.tz.dataVersion ? 'with data from ' : 'without any data') + moment.tz.dataVersion);
+	// 	return moment;
+	// }
+
+	var VERSION = "0.5.14",
+		zones = {},
+		links = {},
+		names = {},
+		guesses = {},
+		cachedGuess,
+
+		momentVersion = moment.version.split('.'),
+		major = +momentVersion[0],
+		minor = +momentVersion[1];
+
+	// Moment.js version check
+	if (major < 2 || (major === 2 && minor < 6)) {
+		logError('Moment Timezone requires Moment.js >= 2.6.0. You are using Moment.js ' + moment.version + '. See momentjs.com');
+	}
+
+	/************************************
+		Unpacking
+	************************************/
+
+	function charCodeToInt(charCode) {
+		if (charCode > 96) {
+			return charCode - 87;
+		} else if (charCode > 64) {
+			return charCode - 29;
+		}
+		return charCode - 48;
+	}
+
+	function unpackBase60(string) {
+		var i = 0,
+			parts = string.split('.'),
+			whole = parts[0],
+			fractional = parts[1] || '',
+			multiplier = 1,
+			num,
+			out = 0,
+			sign = 1;
+
+		// handle negative numbers
+		if (string.charCodeAt(0) === 45) {
+			i = 1;
+			sign = -1;
+		}
+
+		// handle digits before the decimal
+		for (i; i < whole.length; i++) {
+			num = charCodeToInt(whole.charCodeAt(i));
+			out = 60 * out + num;
+		}
+
+		// handle digits after the decimal
+		for (i = 0; i < fractional.length; i++) {
+			multiplier = multiplier / 60;
+			num = charCodeToInt(fractional.charCodeAt(i));
+			out += num * multiplier;
+		}
+
+		return out * sign;
+	}
+
+	function arrayToInt (array) {
+		for (var i = 0; i < array.length; i++) {
+			array[i] = unpackBase60(array[i]);
+		}
+	}
+
+	function intToUntil (array, length) {
+		for (var i = 0; i < length; i++) {
+			array[i] = Math.round((array[i - 1] || 0) + (array[i] * 60000)); // minutes to milliseconds
+		}
+
+		array[length - 1] = Infinity;
+	}
+
+	function mapIndices (source, indices) {
+		var out = [], i;
+
+		for (i = 0; i < indices.length; i++) {
+			out[i] = source[indices[i]];
+		}
+
+		return out;
+	}
+
+	function unpack (string) {
+		var data = string.split('|'),
+			offsets = data[2].split(' '),
+			indices = data[3].split(''),
+			untils  = data[4].split(' ');
+
+		arrayToInt(offsets);
+		arrayToInt(indices);
+		arrayToInt(untils);
+
+		intToUntil(untils, indices.length);
+
+		return {
+			name       : data[0],
+			abbrs      : mapIndices(data[1].split(' '), indices),
+			offsets    : mapIndices(offsets, indices),
+			untils     : untils,
+			population : data[5] | 0
+		};
+	}
+
+	/************************************
+		Zone object
+	************************************/
+
+	function Zone (packedString) {
+		if (packedString) {
+			this._set(unpack(packedString));
+		}
+	}
+
+	Zone.prototype = {
+		_set : function (unpacked) {
+			this.name       = unpacked.name;
+			this.abbrs      = unpacked.abbrs;
+			this.untils     = unpacked.untils;
+			this.offsets    = unpacked.offsets;
+			this.population = unpacked.population;
+		},
+
+		_index : function (timestamp) {
+			var target = +timestamp,
+				untils = this.untils,
+				i;
+
+			for (i = 0; i < untils.length; i++) {
+				if (target < untils[i]) {
+					return i;
+				}
+			}
+		},
+
+		parse : function (timestamp) {
+			var target  = +timestamp,
+				offsets = this.offsets,
+				untils  = this.untils,
+				max     = untils.length - 1,
+				offset, offsetNext, offsetPrev, i;
+
+			for (i = 0; i < max; i++) {
+				offset     = offsets[i];
+				offsetNext = offsets[i + 1];
+				offsetPrev = offsets[i ? i - 1 : i];
+
+				if (offset < offsetNext && tz.moveAmbiguousForward) {
+					offset = offsetNext;
+				} else if (offset > offsetPrev && tz.moveInvalidForward) {
+					offset = offsetPrev;
+				}
+
+				if (target < untils[i] - (offset * 60000)) {
+					return offsets[i];
+				}
+			}
+
+			return offsets[max];
+		},
+
+		abbr : function (mom) {
+			return this.abbrs[this._index(mom)];
+		},
+
+		offset : function (mom) {
+			logError("zone.offset has been deprecated in favor of zone.utcOffset");
+			return this.offsets[this._index(mom)];
+		},
+
+		utcOffset : function (mom) {
+			return this.offsets[this._index(mom)];
+		}
+	};
+
+	/************************************
+		Current Timezone
+	************************************/
+
+	function OffsetAt(at) {
+		var timeString = at.toTimeString();
+		var abbr = timeString.match(/\([a-z ]+\)/i);
+		if (abbr && abbr[0]) {
+			// 17:56:31 GMT-0600 (CST)
+			// 17:56:31 GMT-0600 (Central Standard Time)
+			abbr = abbr[0].match(/[A-Z]/g);
+			abbr = abbr ? abbr.join('') : undefined;
+		} else {
+			// 17:56:31 CST
+			// 17:56:31 GMT+0800 (台北標準時間)
+			abbr = timeString.match(/[A-Z]{3,5}/g);
+			abbr = abbr ? abbr[0] : undefined;
+		}
+
+		if (abbr === 'GMT') {
+			abbr = undefined;
+		}
+
+		this.at = +at;
+		this.abbr = abbr;
+		this.offset = at.getTimezoneOffset();
+	}
+
+	function ZoneScore(zone) {
+		this.zone = zone;
+		this.offsetScore = 0;
+		this.abbrScore = 0;
+	}
+
+	ZoneScore.prototype.scoreOffsetAt = function (offsetAt) {
+		this.offsetScore += Math.abs(this.zone.utcOffset(offsetAt.at) - offsetAt.offset);
+		if (this.zone.abbr(offsetAt.at).replace(/[^A-Z]/g, '') !== offsetAt.abbr) {
+			this.abbrScore++;
+		}
+	};
+
+	function findChange(low, high) {
+		var mid, diff;
+
+		while ((diff = ((high.at - low.at) / 12e4 | 0) * 6e4)) {
+			mid = new OffsetAt(new Date(low.at + diff));
+			if (mid.offset === low.offset) {
+				low = mid;
+			} else {
+				high = mid;
+			}
+		}
+
+		return low;
+	}
+
+	function userOffsets() {
+		var startYear = new Date().getFullYear() - 2,
+			last = new OffsetAt(new Date(startYear, 0, 1)),
+			offsets = [last],
+			change, next, i;
+
+		for (i = 1; i < 48; i++) {
+			next = new OffsetAt(new Date(startYear, i, 1));
+			if (next.offset !== last.offset) {
+				change = findChange(last, next);
+				offsets.push(change);
+				offsets.push(new OffsetAt(new Date(change.at + 6e4)));
+			}
+			last = next;
+		}
+
+		for (i = 0; i < 4; i++) {
+			offsets.push(new OffsetAt(new Date(startYear + i, 0, 1)));
+			offsets.push(new OffsetAt(new Date(startYear + i, 6, 1)));
+		}
+
+		return offsets;
+	}
+
+	function sortZoneScores (a, b) {
+		if (a.offsetScore !== b.offsetScore) {
+			return a.offsetScore - b.offsetScore;
+		}
+		if (a.abbrScore !== b.abbrScore) {
+			return a.abbrScore - b.abbrScore;
+		}
+		return b.zone.population - a.zone.population;
+	}
+
+	function addToGuesses (name, offsets) {
+		var i, offset;
+		arrayToInt(offsets);
+		for (i = 0; i < offsets.length; i++) {
+			offset = offsets[i];
+			guesses[offset] = guesses[offset] || {};
+			guesses[offset][name] = true;
+		}
+	}
+
+	function guessesForUserOffsets (offsets) {
+		var offsetsLength = offsets.length,
+			filteredGuesses = {},
+			out = [],
+			i, j, guessesOffset;
+
+		for (i = 0; i < offsetsLength; i++) {
+			guessesOffset = guesses[offsets[i].offset] || {};
+			for (j in guessesOffset) {
+				if (guessesOffset.hasOwnProperty(j)) {
+					filteredGuesses[j] = true;
+				}
+			}
+		}
+
+		for (i in filteredGuesses) {
+			if (filteredGuesses.hasOwnProperty(i)) {
+				out.push(names[i]);
+			}
+		}
+
+		return out;
+	}
+
+	function rebuildGuess () {
+
+		// use Intl API when available and returning valid time zone
+		try {
+			var intlName = Intl.DateTimeFormat().resolvedOptions().timeZone;
+			if (intlName && intlName.length > 3) {
+				var name = names[normalizeName(intlName)];
+				if (name) {
+					return name;
+				}
+				logError("Moment Timezone found " + intlName + " from the Intl api, but did not have that data loaded.");
+			}
+		} catch (e) {
+			// Intl unavailable, fall back to manual guessing.
+		}
+
+		var offsets = userOffsets(),
+			offsetsLength = offsets.length,
+			guesses = guessesForUserOffsets(offsets),
+			zoneScores = [],
+			zoneScore, i, j;
+
+		for (i = 0; i < guesses.length; i++) {
+			zoneScore = new ZoneScore(getZone(guesses[i]), offsetsLength);
+			for (j = 0; j < offsetsLength; j++) {
+				zoneScore.scoreOffsetAt(offsets[j]);
+			}
+			zoneScores.push(zoneScore);
+		}
+
+		zoneScores.sort(sortZoneScores);
+
+		return zoneScores.length > 0 ? zoneScores[0].zone.name : undefined;
+	}
+
+	function guess (ignoreCache) {
+		if (!cachedGuess || ignoreCache) {
+			cachedGuess = rebuildGuess();
+		}
+		return cachedGuess;
+	}
+
+	/************************************
+		Global Methods
+	************************************/
+
+	function normalizeName (name) {
+		return (name || '').toLowerCase().replace(/\//g, '_');
+	}
+
+	function addZone (packed) {
+		var i, name, split, normalized;
+
+		if (typeof packed === "string") {
+			packed = [packed];
+		}
+
+		for (i = 0; i < packed.length; i++) {
+			split = packed[i].split('|');
+			name = split[0];
+			normalized = normalizeName(name);
+			zones[normalized] = packed[i];
+			names[normalized] = name;
+			addToGuesses(normalized, split[2].split(' '));
+		}
+	}
+
+	function getZone (name, caller) {
+		name = normalizeName(name);
+
+		var zone = zones[name];
+		var link;
+
+		if (zone instanceof Zone) {
+			return zone;
+		}
+
+		if (typeof zone === 'string') {
+			zone = new Zone(zone);
+			zones[name] = zone;
+			return zone;
+		}
+
+		// Pass getZone to prevent recursion more than 1 level deep
+		if (links[name] && caller !== getZone && (link = getZone(links[name], getZone))) {
+			zone = zones[name] = new Zone();
+			zone._set(link);
+			zone.name = names[name];
+			return zone;
+		}
+
+		return null;
+	}
+
+	function getNames () {
+		var i, out = [];
+
+		for (i in names) {
+			if (names.hasOwnProperty(i) && (zones[i] || zones[links[i]]) && names[i]) {
+				out.push(names[i]);
+			}
+		}
+
+		return out.sort();
+	}
+
+	function addLink (aliases) {
+		var i, alias, normal0, normal1;
+
+		if (typeof aliases === "string") {
+			aliases = [aliases];
+		}
+
+		for (i = 0; i < aliases.length; i++) {
+			alias = aliases[i].split('|');
+
+			normal0 = normalizeName(alias[0]);
+			normal1 = normalizeName(alias[1]);
+
+			links[normal0] = normal1;
+			names[normal0] = alias[0];
+
+			links[normal1] = normal0;
+			names[normal1] = alias[1];
+		}
+	}
+
+	function loadData (data) {
+		addZone(data.zones);
+		addLink(data.links);
+		tz.dataVersion = data.version;
+	}
+
+	function zoneExists (name) {
+		if (!zoneExists.didShowError) {
+			zoneExists.didShowError = true;
+				logError("moment.tz.zoneExists('" + name + "') has been deprecated in favor of !moment.tz.zone('" + name + "')");
+		}
+		return !!getZone(name);
+	}
+
+	function needsOffset (m) {
+		var isUnixTimestamp = (m._f === 'X' || m._f === 'x');
+		return !!(m._a && (m._tzm === undefined) && !isUnixTimestamp);
+	}
+
+	function logError (message) {
+		if (typeof console !== 'undefined' && typeof console.error === 'function') {
+			console.error(message);
+		}
+	}
+
+	/************************************
+		moment.tz namespace
+	************************************/
+
+	function tz (input) {
+		var args = Array.prototype.slice.call(arguments, 0, -1),
+			name = arguments[arguments.length - 1],
+			zone = getZone(name),
+			out  = moment.utc.apply(null, args);
+
+		if (zone && !moment.isMoment(input) && needsOffset(out)) {
+			out.add(zone.parse(out), 'minutes');
+		}
+
+		out.tz(name);
+
+		return out;
+	}
+
+	tz.version      = VERSION;
+	tz.dataVersion  = '';
+	tz._zones       = zones;
+	tz._links       = links;
+	tz._names       = names;
+	tz.add          = addZone;
+	tz.link         = addLink;
+	tz.load         = loadData;
+	tz.zone         = getZone;
+	tz.zoneExists   = zoneExists; // deprecated in 0.1.0
+	tz.guess        = guess;
+	tz.names        = getNames;
+	tz.Zone         = Zone;
+	tz.unpack       = unpack;
+	tz.unpackBase60 = unpackBase60;
+	tz.needsOffset  = needsOffset;
+	tz.moveInvalidForward   = true;
+	tz.moveAmbiguousForward = false;
+
+	/************************************
+		Interface with Moment.js
+	************************************/
+
+	var fn = moment.fn;
+
+	moment.tz = tz;
+
+	moment.defaultZone = null;
+
+	moment.updateOffset = function (mom, keepTime) {
+		var zone = moment.defaultZone,
+			offset;
+
+		if (mom._z === undefined) {
+			if (zone && needsOffset(mom) && !mom._isUTC) {
+				mom._d = moment.utc(mom._a)._d;
+				mom.utc().add(zone.parse(mom), 'minutes');
+			}
+			mom._z = zone;
+		}
+		if (mom._z) {
+			offset = mom._z.utcOffset(mom);
+			if (Math.abs(offset) < 16) {
+				offset = offset / 60;
+			}
+			if (mom.utcOffset !== undefined) {
+				mom.utcOffset(-offset, keepTime);
+			} else {
+				mom.zone(offset, keepTime);
+			}
+		}
+	};
+
+	fn.tz = function (name, keepTime) {
+		if (name) {
+			this._z = getZone(name);
+			if (this._z) {
+				moment.updateOffset(this, keepTime);
+			} else {
+				logError("Moment Timezone has no data for " + name + ". See http://momentjs.com/timezone/docs/#/data-loading/.");
+			}
+			return this;
+		}
+		if (this._z) { return this._z.name; }
+	};
+
+	function abbrWrap (old) {
+		return function () {
+			if (this._z) { return this._z.abbr(this); }
+			return old.call(this);
+		};
+	}
+
+	function resetZoneWrap (old) {
+		return function () {
+			this._z = null;
+			return old.apply(this, arguments);
+		};
+	}
+
+	fn.zoneName = abbrWrap(fn.zoneName);
+	fn.zoneAbbr = abbrWrap(fn.zoneAbbr);
+	fn.utc      = resetZoneWrap(fn.utc);
+
+	moment.tz.setDefault = function(name) {
+		if (major < 2 || (major === 2 && minor < 9)) {
+			logError('Moment Timezone setDefault() requires Moment.js >= 2.9.0. You are using Moment.js ' + moment.version + '.');
+		}
+		moment.defaultZone = name ? getZone(name) : null;
+		return moment;
+	};
+
+	// Cloning a moment should include the _z property.
+	var momentProperties = moment.momentProperties;
+	if (Object.prototype.toString.call(momentProperties) === '[object Array]') {
+		// moment 2.8.1+
+		momentProperties.push('_z');
+		momentProperties.push('_a');
+	} else if (momentProperties) {
+		// moment 2.7.0
+		momentProperties._z = null;
+	}
+
+	loadData({
+		"version": "2017c",
+		"zones": [
+			"Africa/Abidjan|LMT GMT|g.8 0|01|-2ldXH.Q|48e5",
+			"Africa/Accra|LMT GMT +0020|.Q 0 -k|012121212121212121212121212121212121212121212121|-26BbX.8 6tzX.8 MnE 1BAk MnE 1BAk MnE 1BAk MnE 1C0k MnE 1BAk MnE 1BAk MnE 1BAk MnE 1C0k MnE 1BAk MnE 1BAk MnE 1BAk MnE 1C0k MnE 1BAk MnE 1BAk MnE 1BAk MnE 1C0k MnE 1BAk MnE 1BAk MnE 1BAk MnE 1C0k MnE 1BAk MnE 1BAk MnE|41e5",
+			"Africa/Nairobi|LMT EAT +0230 +0245|-2r.g -30 -2u -2J|01231|-1F3Cr.g 3Dzr.g okMu MFXJ|47e5",
+			"Africa/Algiers|PMT WET WEST CET CEST|-9.l 0 -10 -10 -20|0121212121212121343431312123431213|-2nco9.l cNb9.l HA0 19A0 1iM0 11c0 1oo0 Wo0 1rc0 QM0 1EM0 UM0 DA0 Imo0 rd0 De0 9Xz0 1fb0 1ap0 16K0 2yo0 mEp0 hwL0 jxA0 11A0 dDd0 17b0 11B0 1cN0 2Dy0 1cN0 1fB0 1cL0|26e5",
+			"Africa/Lagos|LMT WAT|-d.A -10|01|-22y0d.A|17e6",
+			"Africa/Bissau|LMT -01 GMT|12.k 10 0|012|-2ldWV.E 2xonV.E|39e4",
+			"Africa/Maputo|LMT CAT|-2a.k -20|01|-2GJea.k|26e5",
+			"Africa/Cairo|EET EEST|-20 -30|0101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-1bIO0 vb0 1ip0 11z0 1iN0 1nz0 12p0 1pz0 10N0 1pz0 16p0 1jz0 s3d0 Vz0 1oN0 11b0 1oO0 10N0 1pz0 10N0 1pb0 10N0 1pb0 10N0 1pb0 10N0 1pz0 10N0 1pb0 10N0 1pb0 11d0 1oL0 11d0 1pb0 11d0 1oL0 11d0 1oL0 11d0 1oL0 11d0 1pb0 11d0 1oL0 11d0 1oL0 11d0 1oL0 11d0 1pb0 11d0 1oL0 11d0 1oL0 11d0 1oL0 11d0 1pb0 11d0 1oL0 11d0 1WL0 rd0 1Rz0 wp0 1pb0 11d0 1oL0 11d0 1oL0 11d0 1oL0 11d0 1pb0 11d0 1qL0 Xd0 1oL0 11d0 1oL0 11d0 1pb0 11d0 1oL0 11d0 1oL0 11d0 1ny0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 WL0 1qN0 Rb0 1wp0 On0 1zd0 Lz0 1EN0 Fb0 c10 8n0 8Nd0 gL0 e10 mn0|15e6",
+			"Africa/Casablanca|LMT WET WEST CET|u.k 0 -10 -10|0121212121212121213121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2gMnt.E 130Lt.E rb0 Dd0 dVb0 b6p0 TX0 EoB0 LL0 gnd0 rz0 43d0 AL0 1Nd0 XX0 1Cp0 pz0 dEp0 4mn0 SyN0 AL0 1Nd0 wn0 1FB0 Db0 1zd0 Lz0 1Nf0 wM0 co0 go0 1o00 s00 dA0 vc0 11A0 A00 e00 y00 11A0 uM0 e00 Dc0 11A0 s00 e00 IM0 WM0 mo0 gM0 LA0 WM0 jA0 e00 Rc0 11A0 e00 e00 U00 11A0 8o0 e00 11A0 11A0 5A0 e00 17c0 1fA0 1a00 1a00 1fA0 17c0 1io0 14o0 1lc0 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1lc0 14o0 1fA0|32e5",
+			"Africa/Ceuta|WET WEST CET CEST|0 -10 -10 -20|010101010101010101010232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232|-25KN0 11z0 drd0 18p0 3HX0 17d0 1fz0 1a10 1io0 1a00 1y7o0 LL0 gnd0 rz0 43d0 AL0 1Nd0 XX0 1Cp0 pz0 dEp0 4VB0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|85e3",
+			"Africa/El_Aaiun|LMT -01 WET WEST|Q.M 10 0 -10|01232323232323232323232323232323232323232323232323232323232323232323232323232323232323232|-1rDz7.c 1GVA7.c 6L0 AL0 1Nd0 XX0 1Cp0 pz0 1cBB0 AL0 1Nd0 wn0 1FB0 Db0 1zd0 Lz0 1Nf0 wM0 co0 go0 1o00 s00 dA0 vc0 11A0 A00 e00 y00 11A0 uM0 e00 Dc0 11A0 s00 e00 IM0 WM0 mo0 gM0 LA0 WM0 jA0 e00 Rc0 11A0 e00 e00 U00 11A0 8o0 e00 11A0 11A0 5A0 e00 17c0 1fA0 1a00 1a00 1fA0 17c0 1io0 14o0 1lc0 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1lc0 14o0 1fA0|20e4",
+			"Africa/Johannesburg|SAST SAST SAST|-1u -20 -30|012121|-2GJdu 1Ajdu 1cL0 1cN0 1cL0|84e5",
+			"Africa/Juba|LMT CAT CAST EAT|-26.s -20 -30 -30|01212121212121212121212121212121213|-1yW26.s 1zK06.s 16L0 1iN0 17b0 1jd0 17b0 1ip0 17z0 1i10 17X0 1hB0 18n0 1hd0 19b0 1gp0 19z0 1iN0 17b0 1ip0 17z0 1i10 18n0 1hd0 18L0 1gN0 19b0 1gp0 19z0 1iN0 17z0 1i10 17X0 yGd0",
+			"Africa/Khartoum|LMT CAT CAST EAT|-2a.8 -20 -30 -30|012121212121212121212121212121212131|-1yW2a.8 1zK0a.8 16L0 1iN0 17b0 1jd0 17b0 1ip0 17z0 1i10 17X0 1hB0 18n0 1hd0 19b0 1gp0 19z0 1iN0 17b0 1ip0 17z0 1i10 18n0 1hd0 18L0 1gN0 19b0 1gp0 19z0 1iN0 17z0 1i10 17X0 yGd0 HjL0|51e5",
+			"Africa/Monrovia|MMT MMT GMT|H.8 I.u 0|012|-23Lzg.Q 28G01.m|11e5",
+			"Africa/Ndjamena|LMT WAT WAST|-10.c -10 -20|0121|-2le10.c 2J3c0.c Wn0|13e5",
+			"Africa/Tripoli|LMT CET CEST EET|-Q.I -10 -20 -20|012121213121212121212121213123123|-21JcQ.I 1hnBQ.I vx0 4iP0 xx0 4eN0 Bb0 7ip0 U0n0 A10 1db0 1cN0 1db0 1dd0 1db0 1eN0 1bb0 1e10 1cL0 1c10 1db0 1dd0 1db0 1cN0 1db0 1q10 fAn0 1ep0 1db0 AKq0 TA0 1o00|11e5",
+			"Africa/Tunis|PMT CET CEST|-9.l -10 -20|0121212121212121212121212121212121|-2nco9.l 18pa9.l 1qM0 DA0 3Tc0 11B0 1ze0 WM0 7z0 3d0 14L0 1cN0 1f90 1ar0 16J0 1gXB0 WM0 1rA0 11c0 nwo0 Ko0 1cM0 1cM0 1rA0 10M0 zuM0 10N0 1aN0 1qM0 WM0 1qM0 11A0 1o00|20e5",
+			"Africa/Windhoek|+0130 SAST SAST CAT WAT WAST|-1u -20 -30 -20 -10 -20|01213454545454545454545454545454545454545454545454543|-2GJdu 1Ajdu 1cL0 1SqL0 9Io0 16P0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0|32e4",
+			"America/Adak|NST NWT NPT BST BDT AHST HST HDT|b0 a0 a0 b0 a0 a0 a0 90|012034343434343434343434343434343456767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676|-17SX0 8wW0 iB0 Qlb0 52O0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 cm0 10q0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|326",
+			"America/Anchorage|AST AWT APT AHST AHDT YST AKST AKDT|a0 90 90 a0 90 90 90 80|012034343434343434343434343434343456767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676|-17T00 8wX0 iA0 Qlb0 52O0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 cm0 10q0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|30e4",
+			"America/Port_of_Spain|LMT AST|46.4 40|01|-2kNvR.U|43e3",
+			"America/Araguaina|LMT -03 -02|3c.M 30 20|0121212121212121212121212121212121212121212121212121|-2glwL.c HdKL.c 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 1EN0 FX0 1HB0 Lz0 dMN0 Lz0 1zd0 Rb0 1wN0 Wn0 1tB0 Rb0 1tB0 WL0 1tB0 Rb0 1zd0 On0 1HB0 FX0 ny10 Lz0|14e4",
+			"America/Argentina/Buenos_Aires|CMT -04 -03 -02|4g.M 40 30 20|01212121212121212121212121212121212121212123232323232323232|-20UHH.c pKnH.c Mn0 1iN0 Tb0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 MN0 2jz0 MN0 4lX0 u10 5Lb0 1pB0 Fnz0 u10 uL0 1vd0 SL0 1vd0 SL0 1vd0 17z0 1cN0 1fz0 1cN0 1cL0 1cN0 asn0 Db0 zvd0 Bz0 1tB0 TX0 1wp0 Rb0 1wp0 Rb0 1wp0 TX0 A4p0 uL0 1qN0 WL0",
+			"America/Argentina/Catamarca|CMT -04 -03 -02|4g.M 40 30 20|01212121212121212121212121212121212121212123232323132321232|-20UHH.c pKnH.c Mn0 1iN0 Tb0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 MN0 2jz0 MN0 4lX0 u10 5Lb0 1pB0 Fnz0 u10 uL0 1vd0 SL0 1vd0 SL0 1vd0 17z0 1cN0 1fz0 1cN0 1cL0 1cN0 asn0 Db0 zvd0 Bz0 1tB0 TX0 1wp0 Rb0 1wq0 Ra0 1wp0 TX0 rlB0 7B0 8zb0 uL0",
+			"America/Argentina/Cordoba|CMT -04 -03 -02|4g.M 40 30 20|01212121212121212121212121212121212121212123232323132323232|-20UHH.c pKnH.c Mn0 1iN0 Tb0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 MN0 2jz0 MN0 4lX0 u10 5Lb0 1pB0 Fnz0 u10 uL0 1vd0 SL0 1vd0 SL0 1vd0 17z0 1cN0 1fz0 1cN0 1cL0 1cN0 asn0 Db0 zvd0 Bz0 1tB0 TX0 1wp0 Rb0 1wq0 Ra0 1wp0 TX0 A4p0 uL0 1qN0 WL0",
+			"America/Argentina/Jujuy|CMT -04 -03 -02|4g.M 40 30 20|012121212121212121212121212121212121212121232323121323232|-20UHH.c pKnH.c Mn0 1iN0 Tb0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 MN0 2jz0 MN0 4lX0 u10 5Lb0 1pB0 Fnz0 u10 uL0 1vd0 SL0 1vd0 SL0 1vd0 17z0 1cN0 1fz0 1cN0 1cL0 1cN0 asn0 Db0 zvd0 Bz0 1tB0 TX0 1ze0 TX0 1ld0 WK0 1wp0 TX0 A4p0 uL0",
+			"America/Argentina/La_Rioja|CMT -04 -03 -02|4g.M 40 30 20|012121212121212121212121212121212121212121232323231232321232|-20UHH.c pKnH.c Mn0 1iN0 Tb0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 MN0 2jz0 MN0 4lX0 u10 5Lb0 1pB0 Fnz0 u10 uL0 1vd0 SL0 1vd0 SL0 1vd0 17z0 1cN0 1fz0 1cN0 1cL0 1cN0 asn0 Db0 zvd0 Bz0 1tB0 TX0 1wp0 Qn0 qO0 16n0 Rb0 1wp0 TX0 rlB0 7B0 8zb0 uL0",
+			"America/Argentina/Mendoza|CMT -04 -03 -02|4g.M 40 30 20|01212121212121212121212121212121212121212123232312121321232|-20UHH.c pKnH.c Mn0 1iN0 Tb0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 MN0 2jz0 MN0 4lX0 u10 5Lb0 1pB0 Fnz0 u10 uL0 1vd0 SL0 1vd0 SL0 1vd0 17z0 1cN0 1fz0 1cN0 1cL0 1cN0 asn0 Db0 zvd0 Bz0 1tB0 TX0 1u20 SL0 1vd0 Tb0 1wp0 TW0 ri10 Op0 7TX0 uL0",
+			"America/Argentina/Rio_Gallegos|CMT -04 -03 -02|4g.M 40 30 20|01212121212121212121212121212121212121212123232323232321232|-20UHH.c pKnH.c Mn0 1iN0 Tb0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 MN0 2jz0 MN0 4lX0 u10 5Lb0 1pB0 Fnz0 u10 uL0 1vd0 SL0 1vd0 SL0 1vd0 17z0 1cN0 1fz0 1cN0 1cL0 1cN0 asn0 Db0 zvd0 Bz0 1tB0 TX0 1wp0 Rb0 1wp0 Rb0 1wp0 TX0 rlB0 7B0 8zb0 uL0",
+			"America/Argentina/Salta|CMT -04 -03 -02|4g.M 40 30 20|012121212121212121212121212121212121212121232323231323232|-20UHH.c pKnH.c Mn0 1iN0 Tb0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 MN0 2jz0 MN0 4lX0 u10 5Lb0 1pB0 Fnz0 u10 uL0 1vd0 SL0 1vd0 SL0 1vd0 17z0 1cN0 1fz0 1cN0 1cL0 1cN0 asn0 Db0 zvd0 Bz0 1tB0 TX0 1wp0 Rb0 1wq0 Ra0 1wp0 TX0 A4p0 uL0",
+			"America/Argentina/San_Juan|CMT -04 -03 -02|4g.M 40 30 20|012121212121212121212121212121212121212121232323231232321232|-20UHH.c pKnH.c Mn0 1iN0 Tb0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 MN0 2jz0 MN0 4lX0 u10 5Lb0 1pB0 Fnz0 u10 uL0 1vd0 SL0 1vd0 SL0 1vd0 17z0 1cN0 1fz0 1cN0 1cL0 1cN0 asn0 Db0 zvd0 Bz0 1tB0 TX0 1wp0 Qn0 qO0 16n0 Rb0 1wp0 TX0 rld0 m10 8lb0 uL0",
+			"America/Argentina/San_Luis|CMT -04 -03 -02|4g.M 40 30 20|012121212121212121212121212121212121212121232323121212321212|-20UHH.c pKnH.c Mn0 1iN0 Tb0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 MN0 2jz0 MN0 4lX0 u10 5Lb0 1pB0 Fnz0 u10 uL0 1vd0 SL0 1vd0 SL0 1vd0 17z0 1cN0 1fz0 1cN0 1cL0 1cN0 asn0 Db0 zvd0 Bz0 1tB0 XX0 1q20 SL0 AN0 vDb0 m10 8lb0 8L0 jd0 1qN0 WL0 1qN0",
+			"America/Argentina/Tucuman|CMT -04 -03 -02|4g.M 40 30 20|0121212121212121212121212121212121212121212323232313232123232|-20UHH.c pKnH.c Mn0 1iN0 Tb0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 MN0 2jz0 MN0 4lX0 u10 5Lb0 1pB0 Fnz0 u10 uL0 1vd0 SL0 1vd0 SL0 1vd0 17z0 1cN0 1fz0 1cN0 1cL0 1cN0 asn0 Db0 zvd0 Bz0 1tB0 TX0 1wp0 Rb0 1wq0 Ra0 1wp0 TX0 rlB0 4N0 8BX0 uL0 1qN0 WL0",
+			"America/Argentina/Ushuaia|CMT -04 -03 -02|4g.M 40 30 20|01212121212121212121212121212121212121212123232323232321232|-20UHH.c pKnH.c Mn0 1iN0 Tb0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 MN0 2jz0 MN0 4lX0 u10 5Lb0 1pB0 Fnz0 u10 uL0 1vd0 SL0 1vd0 SL0 1vd0 17z0 1cN0 1fz0 1cN0 1cL0 1cN0 asn0 Db0 zvd0 Bz0 1tB0 TX0 1wp0 Rb0 1wp0 Rb0 1wp0 TX0 rkN0 8p0 8zb0 uL0",
+			"America/Curacao|LMT -0430 AST|4z.L 4u 40|012|-2kV7o.d 28KLS.d|15e4",
+			"America/Asuncion|AMT -04 -03|3O.E 40 30|012121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212|-1x589.k 1DKM9.k 3CL0 3Dd0 10L0 1pB0 10n0 1pB0 10n0 1pB0 1cL0 1dd0 1db0 1dd0 1cL0 1dd0 1cL0 1dd0 1cL0 1dd0 1db0 1dd0 1cL0 1dd0 1cL0 1dd0 1cL0 1dd0 1db0 1dd0 1cL0 1lB0 14n0 1dd0 1cL0 1fd0 WL0 1rd0 1aL0 1dB0 Xz0 1qp0 Xb0 1qN0 10L0 1rB0 TX0 1tB0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1qN0 1cL0 WN0 1qL0 11B0 1nX0 1ip0 WL0 1qN0 WL0 1qN0 WL0 1tB0 TX0 1tB0 TX0 1tB0 19X0 1a10 1fz0 1a10 1fz0 1cN0 17b0 1ip0 17b0 1ip0 17b0 1ip0 19X0 1fB0 19X0 1fB0 19X0 1ip0 17b0 1ip0 17b0 1ip0 19X0 1fB0 19X0 1fB0 19X0 1fB0 19X0 1ip0 17b0 1ip0 17b0 1ip0 19X0 1fB0 19X0 1fB0 19X0 1ip0 17b0 1ip0 17b0 1ip0 19X0 1fB0 19X0 1fB0 19X0 1fB0 19X0 1ip0 17b0 1ip0 17b0 1ip0|28e5",
+			"America/Atikokan|CST CDT CWT CPT EST|60 50 50 50 50|0101234|-25TQ0 1in0 Rnb0 3je0 8x30 iw0|28e2",
+			"America/Bahia|LMT -03 -02|2y.4 30 20|01212121212121212121212121212121212121212121212121212121212121|-2glxp.U HdLp.U 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 1EN0 FX0 1HB0 Lz0 1EN0 Lz0 1C10 IL0 1HB0 Db0 1HB0 On0 1zd0 On0 1zd0 Lz0 1zd0 Rb0 1wN0 Wn0 1tB0 Rb0 1tB0 WL0 1tB0 Rb0 1zd0 On0 1HB0 FX0 l5B0 Rb0|27e5",
+			"America/Bahia_Banderas|LMT MST CST PST MDT CDT|71 70 60 80 60 50|0121212131414141414141414141414141414152525252525252525252525252525252525252525252525252525252|-1UQF0 deL0 8lc0 17c0 10M0 1dd0 otX0 gmN0 P2N0 13Vd0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 1fB0 WL0 1fB0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nW0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0|84e3",
+			"America/Barbados|LMT BMT AST ADT|3W.t 3W.t 40 30|01232323232|-1Q0I1.v jsM0 1ODC1.v IL0 1ip0 17b0 1ip0 17b0 1ld0 13b0|28e4",
+			"America/Belem|LMT -03 -02|3d.U 30 20|012121212121212121212121212121|-2glwK.4 HdKK.4 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0|20e5",
+			"America/Belize|LMT CST -0530 CDT|5Q.M 60 5u 50|01212121212121212121212121212121212121212121212121213131|-2kBu7.c fPA7.c Onu 1zcu Rbu 1wou Rbu 1wou Rbu 1zcu Onu 1zcu Onu 1zcu Rbu 1wou Rbu 1wou Rbu 1wou Rbu 1zcu Onu 1zcu Onu 1zcu Rbu 1wou Rbu 1wou Rbu 1zcu Onu 1zcu Onu 1zcu Onu 1zcu Rbu 1wou Rbu 1wou Rbu 1zcu Onu 1zcu Onu 1zcu Rbu 1wou Rbu 1f0Mu qn0 lxB0 mn0|57e3",
+			"America/Blanc-Sablon|AST ADT AWT APT|40 30 30 30|010230|-25TS0 1in0 UGp0 8x50 iu0|11e2",
+			"America/Boa_Vista|LMT -04 -03|42.E 40 30|0121212121212121212121212121212121|-2glvV.k HdKV.k 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 smp0 WL0 1tB0 2L0|62e2",
+			"America/Bogota|BMT -05 -04|4U.g 50 40|0121|-2eb73.I 38yo3.I 2en0|90e5",
+			"America/Boise|PST PDT MST MWT MPT MDT|80 70 70 60 60 60|0101023425252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252|-261q0 1nX0 11B0 1nX0 8C10 JCL0 8x20 ix0 QwN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 Dd0 1Kn0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|21e4",
+			"America/Cambridge_Bay|-00 MST MWT MPT MDDT MDT CST CDT EST|0 70 60 60 50 60 60 50 50|0123141515151515151515151515151515151515151515678651515151515151515151515151515151515151515151515151515151515151515151515151|-21Jc0 RO90 8x20 ix0 LCL0 1fA0 zgO0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11A0 1nX0 2K0 WQ0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|15e2",
+			"America/Campo_Grande|LMT -04 -03|3C.s 40 30|012121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212|-2glwl.w HdLl.w 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 1EN0 FX0 1HB0 Lz0 1EN0 Lz0 1C10 IL0 1HB0 Db0 1HB0 On0 1zd0 On0 1zd0 Lz0 1zd0 Rb0 1wN0 Wn0 1tB0 Rb0 1tB0 WL0 1tB0 Rb0 1zd0 On0 1HB0 FX0 1C10 Lz0 1Ip0 HX0 1zd0 On0 1HB0 IL0 1wp0 On0 1C10 Lz0 1C10 On0 1zd0 On0 1zd0 Rb0 1zd0 Lz0 1C10 Lz0 1C10 On0 1zd0 On0 1zd0 On0 1zd0 On0 1C10 Lz0 1C10 Lz0 1C10 On0 1zd0 On0 1zd0 Rb0 1wp0 On0 1C10 Lz0 1C10 On0 1zd0 On0 1zd0 On0 1zd0 On0 1C10 Lz0 1C10 Lz0 1C10 Lz0 1C10 On0 1zd0 Rb0 1wp0 On0 1C10 Lz0 1C10 On0 1zd0|77e4",
+			"America/Cancun|LMT CST EST EDT CDT|5L.4 60 50 40 50|0123232341414141414141414141414141414141412|-1UQG0 2q2o0 yLB0 1lb0 14p0 1lb0 14p0 Lz0 xB0 14p0 1nX0 11B0 1nX0 1fB0 WL0 1fB0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 Dd0|63e4",
+			"America/Caracas|CMT -0430 -04|4r.E 4u 40|01212|-2kV7w.k 28KM2.k 1IwOu kqo0|29e5",
+			"America/Cayenne|LMT -04 -03|3t.k 40 30|012|-2mrwu.E 2gWou.E|58e3",
+			"America/Panama|CMT EST|5j.A 50|01|-2uduE.o|15e5",
+			"America/Chicago|CST CDT EST CWT CPT|60 50 50 50 50|01010101010101010101010101010101010102010101010103401010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-261s0 1nX0 11B0 1nX0 1wp0 TX0 WN0 1qL0 1cN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 11B0 1Hz0 14p0 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 RB0 8x30 iw0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|92e5",
+			"America/Chihuahua|LMT MST CST CDT MDT|74.k 70 60 50 60|0121212323241414141414141414141414141414141414141414141414141414141414141414141414141414141|-1UQF0 deL0 8lc0 17c0 10M0 1dd0 2zQN0 1lb0 14p0 1lb0 14q0 1lb0 14p0 1nX0 11B0 1nX0 1fB0 WL0 1fB0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0|81e4",
+			"America/Costa_Rica|SJMT CST CDT|5A.d 60 50|0121212121|-1Xd6n.L 2lu0n.L Db0 1Kp0 Db0 pRB0 15b0 1kp0 mL0|12e5",
+			"America/Creston|MST PST|70 80|010|-29DR0 43B0|53e2",
+			"America/Cuiaba|LMT -04 -03|3I.k 40 30|0121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212|-2glwf.E HdLf.E 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 1EN0 FX0 1HB0 Lz0 1EN0 Lz0 1C10 IL0 1HB0 Db0 1HB0 On0 1zd0 On0 1zd0 Lz0 1zd0 Rb0 1wN0 Wn0 1tB0 Rb0 1tB0 WL0 1tB0 Rb0 1zd0 On0 1HB0 FX0 4a10 HX0 1zd0 On0 1HB0 IL0 1wp0 On0 1C10 Lz0 1C10 On0 1zd0 On0 1zd0 Rb0 1zd0 Lz0 1C10 Lz0 1C10 On0 1zd0 On0 1zd0 On0 1zd0 On0 1C10 Lz0 1C10 Lz0 1C10 On0 1zd0 On0 1zd0 Rb0 1wp0 On0 1C10 Lz0 1C10 On0 1zd0 On0 1zd0 On0 1zd0 On0 1C10 Lz0 1C10 Lz0 1C10 Lz0 1C10 On0 1zd0 Rb0 1wp0 On0 1C10 Lz0 1C10 On0 1zd0|54e4",
+			"America/Danmarkshavn|LMT -03 -02 GMT|1e.E 30 20 0|01212121212121212121212121212121213|-2a5WJ.k 2z5fJ.k 19U0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 DC0|8",
+			"America/Dawson|YST YDT YWT YPT YDDT PST PDT|90 80 80 80 70 80 70|0101023040565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565|-25TN0 1in0 1o10 13V0 Ser0 8x00 iz0 LCL0 1fA0 jrA0 fNd0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|13e2",
+			"America/Dawson_Creek|PST PDT PWT PPT MST|80 70 70 70 70|0102301010101010101010101010101010101010101010101010101014|-25TO0 1in0 UGp0 8x10 iy0 3NB0 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 ML0|12e3",
+			"America/Denver|MST MDT MWT MPT|70 60 60 60|01010101023010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-261r0 1nX0 11B0 1nX0 11B0 1qL0 WN0 mn0 Ord0 8x20 ix0 LCN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|26e5",
+			"America/Detroit|LMT CST EST EWT EPT EDT|5w.b 60 50 40 40 40|012342525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252|-2Cgir.N peqr.N 156L0 8x40 iv0 6fd0 11z0 XQp0 1cL0 s10 1Vz0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|37e5",
+			"America/Edmonton|LMT MST MDT MWT MPT|7x.Q 70 60 60 60|01212121212121341212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2yd4q.8 shdq.8 1in0 17d0 hz0 2dB0 1fz0 1a10 11z0 1qN0 WL0 1qN0 11z0 IGN0 8x20 ix0 3NB0 11z0 LFB0 1cL0 3Cp0 1cL0 66N0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|10e5",
+			"America/Eirunepe|LMT -05 -04|4D.s 50 40|0121212121212121212121212121212121|-2glvk.w HdLk.w 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 dPB0 On0 yTd0 d5X0|31e3",
+			"America/El_Salvador|LMT CST CDT|5U.M 60 50|012121|-1XiG3.c 2Fvc3.c WL0 1qN0 WL0|11e5",
+			"America/Tijuana|LMT MST PST PDT PWT PPT|7M.4 70 80 70 70 70|012123245232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232|-1UQE0 4PX0 8mM0 8lc0 SN0 1cL0 pHB0 83r0 zI0 5O10 1Rz0 cOO0 11A0 1o00 11A0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1o00 11A0 BUp0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 U10 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|20e5",
+			"America/Fort_Nelson|PST PDT PWT PPT MST|80 70 70 70 70|01023010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010104|-25TO0 1in0 UGp0 8x10 iy0 3NB0 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0|39e2",
+			"America/Fort_Wayne|CST CDT CWT CPT EST EDT|60 50 50 50 50 40|010101023010101010101010101040454545454545454545454545454545454545454545454545454545454545454545454|-261s0 1nX0 11B0 1nX0 QI10 Db0 RB0 8x30 iw0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 5Tz0 1o10 qLb0 1cL0 1cN0 1cL0 1qhd0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"America/Fortaleza|LMT -03 -02|2y 30 20|0121212121212121212121212121212121212121|-2glxq HdLq 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 1EN0 FX0 1HB0 Lz0 nsp0 WL0 1tB0 5z0 2mN0 On0|34e5",
+			"America/Glace_Bay|LMT AST ADT AWT APT|3X.M 40 30 30 30|012134121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2IsI0.c CwO0.c 1in0 UGp0 8x50 iu0 iq10 11z0 Jg10 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|19e3",
+			"America/Godthab|LMT -03 -02|3q.U 30 20|0121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2a5Ux.4 2z5dx.4 19U0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|17e3",
+			"America/Goose_Bay|NST NDT NST NDT NWT NPT AST ADT ADDT|3u.Q 2u.Q 3u 2u 2u 2u 40 30 20|010232323232323245232323232323232323232323232323232323232326767676767676767676767676767676767676767676768676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676|-25TSt.8 1in0 DXb0 2HbX.8 WL0 1qN0 WL0 1qN0 WL0 1tB0 TX0 1tB0 WL0 1qN0 WL0 1qN0 7UHu itu 1tB0 WL0 1qN0 WL0 1qN0 WL0 1qN0 WL0 1tB0 WL0 1ld0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 S10 g0u 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14n1 1lb0 14p0 1nW0 11C0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zcX Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|76e2",
+			"America/Grand_Turk|KMT EST EDT AST|57.b 50 40 40|01212121212121212121212121212121212121212121212121212121212121212121212121232121212121212121212121212121212121212121|-2l1uQ.N 2HHBQ.N 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 5Ip0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|37e2",
+			"America/Guatemala|LMT CST CDT|62.4 60 50|0121212121|-24KhV.U 2efXV.U An0 mtd0 Nz0 ifB0 17b0 zDB0 11z0|13e5",
+			"America/Guayaquil|QMT -05 -04|5e 50 40|0121|-1yVSK 2uILK rz0|27e5",
+			"America/Guyana|LMT -0345 -03 -04|3Q.E 3J 30 40|0123|-2dvU7.k 2r6LQ.k Bxbf|80e4",
+			"America/Halifax|LMT AST ADT AWT APT|4e.o 40 30 30 30|0121212121212121212121212121212121212121212121212134121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2IsHJ.A xzzJ.A 1db0 3I30 1in0 3HX0 IL0 1E10 ML0 1yN0 Pb0 1Bd0 Mn0 1Bd0 Rz0 1w10 Xb0 1w10 LX0 1w10 Xb0 1w10 Lz0 1C10 Jz0 1E10 OL0 1yN0 Un0 1qp0 Xb0 1qp0 11X0 1w10 Lz0 1HB0 LX0 1C10 FX0 1w10 Xb0 1qp0 Xb0 1BB0 LX0 1td0 Xb0 1qp0 Xb0 Rf0 8x50 iu0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 3Qp0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 3Qp0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 6i10 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|39e4",
+			"America/Havana|HMT CST CDT|5t.A 50 40|012121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-1Meuu.o 72zu.o ML0 sld0 An0 1Nd0 Db0 1Nd0 An0 6Ep0 An0 1Nd0 An0 JDd0 Mn0 1Ap0 On0 1fd0 11X0 1qN0 WL0 1wp0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 14n0 1ld0 14L0 1kN0 15b0 1kp0 1cL0 1cN0 1fz0 1a10 1fz0 1fB0 11z0 14p0 1nX0 11B0 1nX0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 14n0 1ld0 14n0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 1a10 1in0 1a10 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1cM0 1cM0 1fA0 17c0 1o00 11A0 1qM0 11A0 1o00 11A0 1o00 14o0 1lc0 14o0 1lc0 11A0 6i00 Rc0 1wo0 U00 1tA0 Rc0 1wo0 U00 1wo0 U00 1zc0 U00 1qM0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0|21e5",
+			"America/Hermosillo|LMT MST CST PST MDT|7n.Q 70 60 80 60|0121212131414141|-1UQF0 deL0 8lc0 17c0 10M0 1dd0 otX0 gmN0 P2N0 13Vd0 1lb0 14p0 1lb0 14p0 1lb0|64e4",
+			"America/Indiana/Knox|CST CDT CWT CPT EST|60 50 50 50 50|0101023010101010101010101010101010101040101010101010101010101010101010101010101010101010141010101010101010101010101010101010101010101010101010101010101010|-261s0 1nX0 11B0 1nX0 SgN0 8x30 iw0 3NB0 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 1fz0 1cN0 1cL0 1cN0 11z0 1o10 11z0 1o10 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 3Cn0 8wp0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 z8o0 1o00 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"America/Indiana/Marengo|CST CDT CWT CPT EST EDT|60 50 50 50 50 40|0101023010101010101010104545454545414545454545454545454545454545454545454545454545454545454545454545454|-261s0 1nX0 11B0 1nX0 SgN0 8x30 iw0 dyN0 11z0 6fd0 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 jrz0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1VA0 LA0 1BX0 1e6p0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"America/Indiana/Petersburg|CST CDT CWT CPT EST EDT|60 50 50 50 50 40|01010230101010101010101010104010101010101010101010141014545454545454545454545454545454545454545454545454545454545454|-261s0 1nX0 11B0 1nX0 SgN0 8x30 iw0 njX0 WN0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 3Fb0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 19co0 1o00 Rd0 1zb0 Oo0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"America/Indiana/Tell_City|CST CDT CWT CPT EST EDT|60 50 50 50 50 40|01010230101010101010101010101010454541010101010101010101010101010101010101010101010101010101010101010|-261s0 1nX0 11B0 1nX0 SgN0 8x30 iw0 1o10 11z0 g0p0 11z0 1o10 11z0 1qL0 WN0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 1fz0 1cN0 WL0 1qN0 1cL0 1cN0 1cL0 1cN0 caL0 1cL0 1cN0 1cL0 1qhd0 1o00 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"America/Indiana/Vevay|CST CDT CWT CPT EST EDT|60 50 50 50 50 40|010102304545454545454545454545454545454545454545454545454545454545454545454545454|-261s0 1nX0 11B0 1nX0 SgN0 8x30 iw0 kPB0 Awn0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1lnd0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"America/Indiana/Vincennes|CST CDT CWT CPT EST EDT|60 50 50 50 50 40|01010230101010101010101010101010454541014545454545454545454545454545454545454545454545454545454545454|-261s0 1nX0 11B0 1nX0 SgN0 8x30 iw0 1o10 11z0 g0p0 11z0 1o10 11z0 1qL0 WN0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 1fz0 1cN0 WL0 1qN0 1cL0 1cN0 1cL0 1cN0 caL0 1cL0 1cN0 1cL0 1qhd0 1o00 Rd0 1zb0 Oo0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"America/Indiana/Winamac|CST CDT CWT CPT EST EDT|60 50 50 50 50 40|01010230101010101010101010101010101010454541054545454545454545454545454545454545454545454545454545454545454|-261s0 1nX0 11B0 1nX0 SgN0 8x30 iw0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 1fz0 1cN0 1cL0 1cN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 jrz0 1cL0 1cN0 1cL0 1qhd0 1o00 Rd0 1za0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"America/Inuvik|-00 PST PDDT MST MDT|0 80 60 70 60|0121343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343|-FnA0 tWU0 1fA0 wPe0 2pz0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|35e2",
+			"America/Iqaluit|-00 EWT EPT EST EDDT EDT CST CDT|0 40 40 50 30 40 60 50|01234353535353535353535353535353535353535353567353535353535353535353535353535353535353535353535353535353535353535353535353|-16K00 7nX0 iv0 LCL0 1fA0 zgO0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11C0 1nX0 11A0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|67e2",
+			"America/Jamaica|KMT EST EDT|57.b 50 40|0121212121212121212121|-2l1uQ.N 2uM1Q.N 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0|94e4",
+			"America/Juneau|PST PWT PPT PDT YDT YST AKST AKDT|80 70 70 70 80 90 90 80|01203030303030303030303030403030356767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676|-17T20 8x10 iy0 Vo10 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cM0 1cM0 1cL0 1cN0 1fz0 1a10 1fz0 co0 10q0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|33e3",
+			"America/Kentucky/Louisville|CST CDT CWT CPT EST EDT|60 50 50 50 50 40|0101010102301010101010101010101010101454545454545414545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454|-261s0 1nX0 11B0 1nX0 3Fd0 Nb0 LPd0 11z0 RB0 8x30 iw0 Bb0 10N0 2bB0 8in0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 xz0 gso0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1VA0 LA0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"America/Kentucky/Monticello|CST CDT CWT CPT EST EDT|60 50 50 50 50 40|0101023010101010101010101010101010101010101010101010101010101010101010101454545454545454545454545454545454545454545454545454545454545454545454545454|-261s0 1nX0 11B0 1nX0 SgN0 8x30 iw0 SWp0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11A0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"America/La_Paz|CMT BOST -04|4w.A 3w.A 40|012|-1x37r.o 13b0|19e5",
+			"America/Lima|LMT -05 -04|58.A 50 40|0121212121212121|-2tyGP.o 1bDzP.o zX0 1aN0 1cL0 1cN0 1cL0 1PrB0 zX0 1O10 zX0 6Gp0 zX0 98p0 zX0|11e6",
+			"America/Los_Angeles|PST PDT PWT PPT|80 70 70 70|010102301010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-261q0 1nX0 11B0 1nX0 SgN0 8x10 iy0 5Wp1 1VaX 3dA0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1a00 1fA0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|15e6",
+			"America/Maceio|LMT -03 -02|2m.Q 30 20|012121212121212121212121212121212121212121|-2glxB.8 HdLB.8 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 1EN0 FX0 1HB0 Lz0 dMN0 Lz0 8Q10 WL0 1tB0 5z0 2mN0 On0|93e4",
+			"America/Managua|MMT CST EST CDT|5J.c 60 50 50|0121313121213131|-1quie.M 1yAMe.M 4mn0 9Up0 Dz0 1K10 Dz0 s3F0 1KH0 DB0 9In0 k8p0 19X0 1o30 11y0|22e5",
+			"America/Manaus|LMT -04 -03|40.4 40 30|01212121212121212121212121212121|-2glvX.U HdKX.U 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 dPB0 On0|19e5",
+			"America/Martinique|FFMT AST ADT|44.k 40 30|0121|-2mPTT.E 2LPbT.E 19X0|39e4",
+			"America/Matamoros|LMT CST CDT|6E 60 50|0121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-1UQG0 2FjC0 1nX0 i6p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 1fB0 WL0 1fB0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 U10 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|45e4",
+			"America/Mazatlan|LMT MST CST PST MDT|75.E 70 60 80 60|0121212131414141414141414141414141414141414141414141414141414141414141414141414141414141414141|-1UQF0 deL0 8lc0 17c0 10M0 1dd0 otX0 gmN0 P2N0 13Vd0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 1fB0 WL0 1fB0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0|44e4",
+			"America/Menominee|CST CDT CWT CPT EST|60 50 50 50 50|01010230101041010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-261s0 1nX0 11B0 1nX0 SgN0 8x30 iw0 1o10 11z0 LCN0 1fz0 6410 9Jb0 1cM0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|85e2",
+			"America/Merida|LMT CST EST CDT|5W.s 60 50 50|0121313131313131313131313131313131313131313131313131313131313131313131313131313131313131|-1UQG0 2q2o0 2hz0 wu30 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 1fB0 WL0 1fB0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0|11e5",
+			"America/Metlakatla|PST PWT PPT PDT AKST AKDT|80 70 70 70 90 80|0120303030303030303030303030303030454545454545454545454545454545454545454545454|-17T20 8x10 iy0 Vo10 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1hU10 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|14e2",
+			"America/Mexico_City|LMT MST CST CDT CWT|6A.A 70 60 50 50|012121232324232323232323232323232323232323232323232323232323232323232323232323232323232323232323232|-1UQF0 deL0 8lc0 17c0 10M0 1dd0 gEn0 TX0 3xd0 Jb0 6zB0 SL0 e5d0 17b0 1Pff0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 1fB0 WL0 1fB0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0|20e6",
+			"America/Miquelon|LMT AST -03 -02|3I.E 40 30 20|012323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232|-2mKkf.k 2LTAf.k gQ10 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|61e2",
+			"America/Moncton|EST AST ADT AWT APT|50 40 30 30 30|012121212121212121212134121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2IsH0 CwN0 1in0 zAo0 An0 1Nd0 An0 1Nd0 An0 1Nd0 An0 1Nd0 An0 1Nd0 An0 1K10 Lz0 1zB0 NX0 1u10 Wn0 S20 8x50 iu0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 3Cp0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14n1 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 ReX 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|64e3",
+			"America/Monterrey|LMT CST CDT|6F.g 60 50|0121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-1UQG0 2FjC0 1nX0 i6p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 1fB0 WL0 1fB0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0|41e5",
+			"America/Montevideo|MMT -0330 -03 -02 -0230|3I.I 3u 30 20 2u|012121212121212121212121213232323232324242423243232323232323232323232323232323232323232|-20UIf.g 8jzJ.g 1cLu 1dcu 1cLu 1dcu 1cLu ircu 11zu 1o0u 11zu 1o0u 11zu 1qMu WLu 1qMu WLu 1qMu WLu 1qMu 11zu 1o0u 11zu NAu 11bu 2iMu zWu Dq10 19X0 pd0 jz0 cm10 19X0 1fB0 1on0 11d0 1oL0 1nB0 1fzu 1aou 1fzu 1aou 1fzu 3nAu Jb0 3MN0 1SLu 4jzu 2PB0 Lb0 3Dd0 1pb0 ixd0 An0 1MN0 An0 1wp0 On0 1wp0 Rb0 1zd0 On0 1wp0 Rb0 s8p0 1fB0 1ip0 11z0 1ld0 14n0 1o10 11z0 1o10 11z0 1o10 14n0 1ld0 14n0 1ld0 14n0 1o10 11z0 1o10 11z0 1o10 11z0|17e5",
+			"America/Toronto|EST EDT EWT EPT|50 40 40 40|01010101010101010101010101010101010101010101012301010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-25TR0 1in0 11Wu 1nzu 1fD0 WJ0 1wr0 Nb0 1Ap0 On0 1zd0 On0 1wp0 TX0 1tB0 TX0 1tB0 TX0 1tB0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 4kM0 8x40 iv0 1o10 11z0 1nX0 11z0 1o10 11z0 1o10 1qL0 11D0 1nX0 11B0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|65e5",
+			"America/Nassau|LMT EST EDT|59.u 50 40|012121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2kNuO.u 26XdO.u 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|24e4",
+			"America/New_York|EST EDT EWT EPT|50 40 40 40|01010101010101010101010101010101010101010101010102301010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-261t0 1nX0 11B0 1nX0 11B0 1qL0 1a10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 RB0 8x40 iv0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|21e6",
+			"America/Nipigon|EST EDT EWT EPT|50 40 40 40|010123010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-25TR0 1in0 Rnb0 3je0 8x40 iv0 19yN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|16e2",
+			"America/Nome|NST NWT NPT BST BDT YST AKST AKDT|b0 a0 a0 b0 a0 90 90 80|012034343434343434343434343434343456767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676|-17SX0 8wW0 iB0 Qlb0 52O0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 cl0 10q0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|38e2",
+			"America/Noronha|LMT -02 -01|29.E 20 10|0121212121212121212121212121212121212121|-2glxO.k HdKO.k 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 1EN0 FX0 1HB0 Lz0 nsp0 WL0 1tB0 2L0 2pB0 On0|30e2",
+			"America/North_Dakota/Beulah|MST MDT MWT MPT CST CDT|70 60 60 60 60 50|010102301010101010101010101010101010101010101010101010101010101010101010101010101010101010101014545454545454545454545454545454545454545454545454545454|-261r0 1nX0 11B0 1nX0 SgN0 8x20 ix0 QwN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Oo0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"America/North_Dakota/Center|MST MDT MWT MPT CST CDT|70 60 60 60 60 50|010102301010101010101010101010101010101010101010101010101014545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454|-261r0 1nX0 11B0 1nX0 SgN0 8x20 ix0 QwN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14o0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"America/North_Dakota/New_Salem|MST MDT MWT MPT CST CDT|70 60 60 60 60 50|010102301010101010101010101010101010101010101010101010101010101010101010101010101454545454545454545454545454545454545454545454545454545454545454545454|-261r0 1nX0 11B0 1nX0 SgN0 8x20 ix0 QwN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14o0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"America/Ojinaga|LMT MST CST CDT MDT|6V.E 70 60 50 60|0121212323241414141414141414141414141414141414141414141414141414141414141414141414141414141|-1UQF0 deL0 8lc0 17c0 10M0 1dd0 2zQN0 1lb0 14p0 1lb0 14q0 1lb0 14p0 1nX0 11B0 1nX0 1fB0 WL0 1fB0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 U10 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|23e3",
+			"America/Pangnirtung|-00 AST AWT APT ADDT ADT EDT EST CST CDT|0 40 30 30 20 30 40 50 60 50|012314151515151515151515151515151515167676767689767676767676767676767676767676767676767676767676767676767676767676767676767|-1XiM0 PnG0 8x50 iu0 LCL0 1fA0 zgO0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1o00 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11C0 1nX0 11A0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|14e2",
+			"America/Paramaribo|LMT PMT PMT -0330 -03|3E.E 3E.Q 3E.A 3u 30|01234|-2nDUj.k Wqo0.c qanX.I 1yVXN.o|24e4",
+			"America/Phoenix|MST MDT MWT|70 60 60|01010202010|-261r0 1nX0 11B0 1nX0 SgN0 4Al1 Ap0 1db0 SWqX 1cL0|42e5",
+			"America/Port-au-Prince|PPMT EST EDT|4N 50 40|01212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-28RHb 2FnMb 19X0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14q0 1o00 11A0 1o00 11A0 1o00 14o0 1lc0 14o0 1lc0 14o0 1o00 11A0 1o00 11A0 1o00 14o0 1lc0 14o0 1lc0 i6n0 1nX0 11B0 1nX0 d430 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 3iN0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|23e5",
+			"America/Rio_Branco|LMT -05 -04|4v.c 50 40|01212121212121212121212121212121|-2glvs.M HdLs.M 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 NBd0 d5X0|31e4",
+			"America/Porto_Velho|LMT -04 -03|4f.A 40 30|012121212121212121212121212121|-2glvI.o HdKI.o 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0|37e4",
+			"America/Puerto_Rico|AST AWT APT|40 30 30|0120|-17lU0 7XT0 iu0|24e5",
+			"America/Punta_Arenas|SMT -05 -04 -03|4G.K 50 40 30|0102021212121212121232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323|-2q2jh.e fJAh.e 5knG.K 1Vzh.e jRAG.K 1pbh.e 11d0 1oL0 11d0 1oL0 11d0 1oL0 11d0 1pb0 11d0 nHX0 op0 blz0 ko0 Qeo0 WL0 1zd0 On0 1ip0 11z0 1o10 11z0 1qN0 WL0 1ld0 14n0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 WL0 1qN0 1cL0 1cN0 11z0 1o10 11z0 1qN0 WL0 1fB0 19X0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 17b0 1ip0 11z0 1ip0 1fz0 1fB0 11z0 1qN0 WL0 1qN0 WL0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 17b0 1ip0 11z0 1o10 19X0 1fB0 1nX0 G10 1EL0 Op0 1zb0 Rd0 1wn0 Rd0 46n0 Ap0",
+			"America/Rainy_River|CST CDT CWT CPT|60 50 50 50|010123010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-25TQ0 1in0 Rnb0 3je0 8x30 iw0 19yN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|842",
+			"America/Rankin_Inlet|-00 CST CDDT CDT EST|0 60 40 50 50|012131313131313131313131313131313131313131313431313131313131313131313131313131313131313131313131313131313131313131313131|-vDc0 keu0 1fA0 zgO0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|26e2",
+			"America/Recife|LMT -03 -02|2j.A 30 20|0121212121212121212121212121212121212121|-2glxE.o HdLE.o 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 1EN0 FX0 1HB0 Lz0 nsp0 WL0 1tB0 2L0 2pB0 On0|33e5",
+			"America/Regina|LMT MST MDT MWT MPT CST|6W.A 70 60 60 60 60|012121212121212121212121341212121212121212121212121215|-2AD51.o uHe1.o 1in0 s2L0 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 66N0 1cL0 1cN0 19X0 1fB0 1cL0 1fB0 1cL0 1cN0 1cL0 M30 8x20 ix0 1ip0 1cL0 1ip0 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 3NB0 1cL0 1cN0|19e4",
+			"America/Resolute|-00 CST CDDT CDT EST|0 60 40 50 50|012131313131313131313131313131313131313131313431313131313431313131313131313131313131313131313131313131313131313131313131|-SnA0 GWS0 1fA0 zgO0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|229",
+			"America/Santarem|LMT -04 -03|3C.M 40 30|0121212121212121212121212121212|-2glwl.c HdLl.c 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 NBd0|21e4",
+			"America/Santiago|SMT -05 -04 -03|4G.K 50 40 30|010202121212121212321232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323|-2q2jh.e fJAh.e 5knG.K 1Vzh.e jRAG.K 1pbh.e 11d0 1oL0 11d0 1oL0 11d0 1oL0 11d0 1pb0 11d0 nHX0 op0 9Bz0 jb0 1oN0 ko0 Qeo0 WL0 1zd0 On0 1ip0 11z0 1o10 11z0 1qN0 WL0 1ld0 14n0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 WL0 1qN0 1cL0 1cN0 11z0 1o10 11z0 1qN0 WL0 1fB0 19X0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 17b0 1ip0 11z0 1ip0 1fz0 1fB0 11z0 1qN0 WL0 1qN0 WL0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 17b0 1ip0 11z0 1o10 19X0 1fB0 1nX0 G10 1EL0 Op0 1zb0 Rd0 1wn0 Rd0 46n0 Ap0 1Nb0 Ap0 1Nb0 Ap0 1Nb0 Ap0 1Nb0 Ap0 1Nb0 Dd0 1Nb0 Ap0 1Nb0 Ap0 1Nb0 Ap0 1Nb0 Ap0 1Nb0 Ap0 1Nb0 Dd0 1Nb0 Ap0 1Nb0 Ap0 1Nb0 Ap0 1Nb0 Ap0 1Nb0 Dd0 1Nb0 Ap0 1Nb0 Ap0 1Nb0 Ap0 1Nb0 Ap0 1Nb0 Ap0|62e5",
+			"America/Santo_Domingo|SDMT EST EDT -0430 AST|4E 50 40 4u 40|01213131313131414|-1ttjk 1lJMk Mn0 6sp0 Lbu 1Cou yLu 1RAu wLu 1QMu xzu 1Q0u xXu 1PAu 13jB0 e00|29e5",
+			"America/Sao_Paulo|LMT -03 -02|36.s 30 20|012121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212|-2glwR.w HdKR.w 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 pTd0 PX0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 1EN0 FX0 1HB0 Lz0 1EN0 Lz0 1C10 IL0 1HB0 Db0 1HB0 On0 1zd0 On0 1zd0 Lz0 1zd0 Rb0 1wN0 Wn0 1tB0 Rb0 1tB0 WL0 1tB0 Rb0 1zd0 On0 1HB0 FX0 1C10 Lz0 1Ip0 HX0 1zd0 On0 1HB0 IL0 1wp0 On0 1C10 Lz0 1C10 On0 1zd0 On0 1zd0 Rb0 1zd0 Lz0 1C10 Lz0 1C10 On0 1zd0 On0 1zd0 On0 1zd0 On0 1C10 Lz0 1C10 Lz0 1C10 On0 1zd0 On0 1zd0 Rb0 1wp0 On0 1C10 Lz0 1C10 On0 1zd0 On0 1zd0 On0 1zd0 On0 1C10 Lz0 1C10 Lz0 1C10 Lz0 1C10 On0 1zd0 Rb0 1wp0 On0 1C10 Lz0 1C10 On0 1zd0|20e6",
+			"America/Scoresbysund|LMT -02 -01 +00|1r.Q 20 10 0|0121323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232|-2a5Ww.8 2z5ew.8 1a00 1cK0 1cL0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|452",
+			"America/Sitka|PST PWT PPT PDT YST AKST AKDT|80 70 70 70 90 90 80|01203030303030303030303030303030345656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565|-17T20 8x10 iy0 Vo10 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 co0 10q0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|90e2",
+			"America/St_Johns|NST NDT NST NDT NWT NPT NDDT|3u.Q 2u.Q 3u 2u 2u 2u 1u|01010101010101010101010101010101010102323232323232324523232323232323232323232323232323232323232323232323232323232323232323232323232323232326232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232|-28oit.8 14L0 1nB0 1in0 1gm0 Dz0 1JB0 1cL0 1cN0 1cL0 1fB0 19X0 1fB0 19X0 1fB0 19X0 1fB0 19X0 1fB0 1cL0 1cN0 1cL0 1fB0 19X0 1fB0 19X0 1fB0 19X0 1fB0 19X0 1fB0 1cL0 1fB0 19X0 1fB0 19X0 10O0 eKX.8 19X0 1iq0 WL0 1qN0 WL0 1qN0 WL0 1tB0 TX0 1tB0 WL0 1qN0 WL0 1qN0 7UHu itu 1tB0 WL0 1qN0 WL0 1qN0 WL0 1qN0 WL0 1tB0 WL0 1ld0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14n1 1lb0 14p0 1nW0 11C0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zcX Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|11e4",
+			"America/Swift_Current|LMT MST MDT MWT MPT CST|7b.k 70 60 60 60 60|012134121212121212121215|-2AD4M.E uHdM.E 1in0 UGp0 8x20 ix0 1o10 17b0 1ip0 11z0 1o10 11z0 1o10 11z0 isN0 1cL0 3Cp0 1cL0 1cN0 11z0 1qN0 WL0 pMp0|16e3",
+			"America/Tegucigalpa|LMT CST CDT|5M.Q 60 50|01212121|-1WGGb.8 2ETcb.8 WL0 1qN0 WL0 GRd0 AL0|11e5",
+			"America/Thule|LMT AST ADT|4z.8 40 30|012121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2a5To.Q 31NBo.Q 1cL0 1cN0 1cL0 1fB0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|656",
+			"America/Thunder_Bay|CST EST EWT EPT EDT|60 50 40 40 40|0123141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141|-2q5S0 1iaN0 8x40 iv0 XNB0 1cL0 1cN0 1fz0 1cN0 1cL0 3Cp0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|11e4",
+			"America/Vancouver|PST PDT PWT PPT|80 70 70 70|0102301010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-25TO0 1in0 UGp0 8x10 iy0 1o10 17b0 1ip0 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|23e5",
+			"America/Whitehorse|YST YDT YWT YPT YDDT PST PDT|90 80 80 80 70 80 70|0101023040565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565|-25TN0 1in0 1o10 13V0 Ser0 8x00 iz0 LCL0 1fA0 3NA0 vrd0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|23e3",
+			"America/Winnipeg|CST CDT CWT CPT|60 50 50 50|010101023010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-2aIi0 WL0 3ND0 1in0 Jap0 Rb0 aCN0 8x30 iw0 1tB0 11z0 1ip0 11z0 1o10 11z0 1o10 11z0 1rd0 10L0 1op0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 1cL0 1cN0 11z0 6i10 WL0 6i10 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1a00 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1a00 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 14o0 1lc0 14o0 1o00 11A0 1o00 11A0 1o00 14o0 1lc0 14o0 1lc0 14o0 1o00 11A0 1o00 11A0 1o00 14o0 1lc0 14o0 1lc0 14o0 1lc0 14o0 1o00 11A0 1o00 11A0 1o00 14o0 1lc0 14o0 1lc0 14o0 1o00 11A0 1o00 11A0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|66e4",
+			"America/Yakutat|YST YWT YPT YDT AKST AKDT|90 80 80 80 90 80|01203030303030303030303030303030304545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454|-17T10 8x00 iz0 Vo10 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 cn0 10q0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|642",
+			"America/Yellowknife|-00 MST MWT MPT MDDT MDT|0 70 60 60 50 60|012314151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151|-1pdA0 hix0 8x20 ix0 LCL0 1fA0 zgO0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|19e3",
+			"Antarctica/Casey|-00 +08 +11|0 -80 -b0|0121212|-2q00 1DjS0 T90 40P0 KL0 blz0|10",
+			"Antarctica/Davis|-00 +07 +05|0 -70 -50|01012121|-vyo0 iXt0 alj0 1D7v0 VB0 3Wn0 KN0|70",
+			"Antarctica/DumontDUrville|-00 +10|0 -a0|0101|-U0o0 cfq0 bFm0|80",
+			"Antarctica/Macquarie|AEST AEDT -00 +11|-a0 -b0 0 -b0|0102010101010101010101010101010101010101010101010101010101010101010101010101010101010101013|-29E80 19X0 4SL0 1ayy0 Lvs0 1cM0 1o00 Rc0 1wo0 Rc0 1wo0 U00 1wo0 LA0 1C00 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 11A0 1qM0 WM0 1qM0 Oo0 1zc0 Oo0 1zc0 Oo0 1wo0 WM0 1tA0 WM0 1tA0 U00 1tA0 U00 1tA0 11A0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 11A0 1o00 1io0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1cM0 1a00 1io0 1cM0 1cM0 1cM0 1cM0 1cM0|1",
+			"Antarctica/Mawson|-00 +06 +05|0 -60 -50|012|-CEo0 2fyk0|60",
+			"Pacific/Auckland|NZMT NZST NZST NZDT|-bu -cu -c0 -d0|01020202020202020202020202023232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323|-1GCVu Lz0 1tB0 11zu 1o0u 11zu 1o0u 11zu 1o0u 14nu 1lcu 14nu 1lcu 1lbu 11Au 1nXu 11Au 1nXu 11Au 1nXu 11Au 1nXu 11Au 1qLu WMu 1qLu 11Au 1n1bu IM0 1C00 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1qM0 14o0 1lc0 14o0 1lc0 14o0 1lc0 17c0 1io0 17c0 1io0 17c0 1io0 17c0 1lc0 14o0 1lc0 14o0 1lc0 17c0 1io0 17c0 1io0 17c0 1lc0 14o0 1lc0 14o0 1lc0 17c0 1io0 17c0 1io0 17c0 1io0 17c0 1io0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1io0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00|14e5",
+			"Antarctica/Palmer|-00 -03 -04 -02|0 30 40 20|0121212121213121212121212121212121212121212121212121212121212121212121212121212121|-cao0 nD0 1vd0 SL0 1vd0 17z0 1cN0 1fz0 1cN0 1cL0 1cN0 asn0 Db0 jsN0 14N0 11z0 1o10 11z0 1qN0 WL0 1qN0 WL0 1qN0 1cL0 1cN0 11z0 1o10 11z0 1qN0 WL0 1fB0 19X0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 17b0 1ip0 11z0 1ip0 1fz0 1fB0 11z0 1qN0 WL0 1qN0 WL0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 17b0 1ip0 11z0 1o10 19X0 1fB0 1nX0 G10 1EL0 Op0 1zb0 Rd0 1wn0 Rd0 46n0 Ap0|40",
+			"Antarctica/Rothera|-00 -03|0 30|01|gOo0|130",
+			"Antarctica/Syowa|-00 +03|0 -30|01|-vs00|20",
+			"Antarctica/Troll|-00 +00 +02|0 0 -20|01212121212121212121212121212121212121212121212121212121212121212121|1puo0 hd0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|40",
+			"Antarctica/Vostok|-00 +06|0 -60|01|-tjA0|25",
+			"Europe/Oslo|CET CEST|-10 -20|010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-2awM0 Qm0 W6o0 5pf0 WM0 1fA0 1cM0 1cM0 1cM0 1cM0 wJc0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1qM0 WM0 zpc0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|62e4",
+			"Asia/Riyadh|LMT +03|-36.Q -30|01|-TvD6.Q|57e5",
+			"Asia/Almaty|LMT +05 +06 +07|-57.M -50 -60 -70|012323232323232323232321232323232323232323232323232|-1Pc57.M eUo7.M 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0|15e5",
+			"Asia/Amman|LMT EET EEST|-2n.I -20 -30|0121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-1yW2n.I 1HiMn.I KL0 1oN0 11b0 1oN0 11b0 1pd0 1dz0 1cp0 11b0 1op0 11b0 fO10 1db0 1e10 1cL0 1cN0 1cL0 1cN0 1fz0 1pd0 10n0 1ld0 14n0 1hB0 15b0 1ip0 19X0 1cN0 1cL0 1cN0 17b0 1ld0 14o0 1lc0 17c0 1io0 17c0 1io0 17c0 1So0 y00 1fc0 1dc0 1co0 1dc0 1cM0 1cM0 1cM0 1o00 11A0 1lc0 17c0 1cM0 1cM0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 4bX0 Dd0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0|25e5",
+			"Asia/Anadyr|LMT +12 +13 +14 +11|-bN.U -c0 -d0 -e0 -b0|01232121212121212121214121212121212121212121212121212121212141|-1PcbN.U eUnN.U 23CL0 1db0 2q10 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 2sp0 WM0|13e3",
+			"Asia/Aqtau|LMT +04 +05 +06|-3l.4 -40 -50 -60|012323232323232323232123232312121212121212121212|-1Pc3l.4 eUnl.4 24PX0 2pX0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cN0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0|15e4",
+			"Asia/Aqtobe|LMT +04 +05 +06|-3M.E -40 -50 -60|0123232323232323232321232323232323232323232323232|-1Pc3M.E eUnM.E 23CL0 3Db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0|27e4",
+			"Asia/Ashgabat|LMT +04 +05 +06|-3R.w -40 -50 -60|0123232323232323232323212|-1Pc3R.w eUnR.w 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0|41e4",
+			"Asia/Atyrau|LMT +03 +05 +06 +04|-3r.I -30 -50 -60 -40|01232323232323232323242323232323232324242424242|-1Pc3r.I eUor.I 24PW0 2pX0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 2sp0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0",
+			"Asia/Baghdad|BMT +03 +04|-2V.A -30 -40|012121212121212121212121212121212121212121212121212121|-26BeV.A 2ACnV.A 11b0 1cp0 1dz0 1dd0 1db0 1cN0 1cp0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1de0 1dc0 1dc0 1dc0 1cM0 1dc0 1cM0 1dc0 1cM0 1dc0 1dc0 1dc0 1cM0 1dc0 1cM0 1dc0 1cM0 1dc0 1dc0 1dc0 1cM0 1dc0 1cM0 1dc0 1cM0 1dc0 1dc0 1dc0 1cM0 1dc0 1cM0 1dc0 1cM0 1dc0|66e5",
+			"Asia/Qatar|LMT +04 +03|-3q.8 -40 -30|012|-21Jfq.8 27BXq.8|96e4",
+			"Asia/Baku|LMT +03 +04 +05|-3j.o -30 -40 -50|01232323232323232323232123232323232323232323232323232323232323232|-1Pc3j.o 1jUoj.o WCL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 1cM0 9Je0 1o00 11z0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00|27e5",
+			"Asia/Bangkok|BMT +07|-6G.4 -70|01|-218SG.4|15e6",
+			"Asia/Barnaul|LMT +06 +07 +08|-5z -60 -70 -80|0123232323232323232323212323232321212121212121212121212121212121212|-21S5z pCnz 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 p90 LE0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0 3rd0",
+			"Asia/Beirut|EET EEST|-20 -30|010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-21aq0 1on0 1410 1db0 19B0 1in0 1ip0 WL0 1lQp0 11b0 1oN0 11b0 1oN0 11b0 1pd0 11b0 1oN0 11b0 q6N0 En0 1oN0 11b0 1oN0 11b0 1oN0 11b0 1pd0 11b0 1oN0 11b0 1op0 11b0 dA10 17b0 1iN0 17b0 1iN0 17b0 1iN0 17b0 1vB0 SL0 1mp0 13z0 1iN0 17b0 1iN0 17b0 1jd0 12n0 1a10 1cL0 1cN0 1cL0 1cN0 1cL0 1fB0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0|22e5",
+			"Asia/Bishkek|LMT +05 +06 +07|-4W.o -50 -60 -70|012323232323232323232321212121212121212121212121212|-1Pc4W.o eUnW.o 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2e00 1tX0 17b0 1ip0 17b0 1ip0 17b0 1ip0 17b0 1ip0 19X0 1cPu 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0|87e4",
+			"Asia/Brunei|LMT +0730 +08|-7D.E -7u -80|012|-1KITD.E gDc9.E|42e4",
+			"Asia/Kolkata|MMT IST +0630|-5l.a -5u -6u|012121|-2zOtl.a 1r2LP.a 1un0 HB0 7zX0|15e6",
+			"Asia/Chita|LMT +08 +09 +10|-7x.Q -80 -90 -a0|012323232323232323232321232323232323232323232323232323232323232312|-21Q7x.Q pAnx.Q 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0 3re0|33e4",
+			"Asia/Choibalsan|LMT +07 +08 +10 +09|-7C -70 -80 -a0 -90|0123434343434343434343434343434343434343434343424242|-2APHC 2UkoC cKn0 1da0 1dd0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1fB0 1cL0 1cN0 1cL0 1cN0 1cL0 6hD0 11z0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 3Db0 h1f0 1cJ0 1cP0 1cJ0|38e3",
+			"Asia/Shanghai|CST CDT|-80 -90|01010101010101010|-1c1I0 LX0 16p0 1jz0 1Myp0 Rb0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0|23e6",
+			"Asia/Colombo|MMT +0530 +06 +0630|-5j.w -5u -60 -6u|01231321|-2zOtj.w 1rFbN.w 1zzu 7Apu 23dz0 11zu n3cu|22e5",
+			"Asia/Dhaka|HMT +0630 +0530 +06 +07|-5R.k -6u -5u -60 -70|0121343|-18LFR.k 1unn.k HB0 m6n0 2kxbu 1i00|16e6",
+			"Asia/Damascus|LMT EET EEST|-2p.c -20 -30|01212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-21Jep.c Hep.c 17b0 1ip0 17b0 1ip0 17b0 1ip0 19X0 1xRB0 11X0 1oN0 10L0 1pB0 11b0 1oN0 10L0 1mp0 13X0 1oN0 11b0 1pd0 11b0 1oN0 11b0 1oN0 11b0 1oN0 11b0 1pd0 11b0 1oN0 11b0 1oN0 11b0 1oN0 11b0 1pd0 11b0 1oN0 Nb0 1AN0 Nb0 bcp0 19X0 1gp0 19X0 3ld0 1xX0 Vd0 1Bz0 Sp0 1vX0 10p0 1dz0 1cN0 1cL0 1db0 1db0 1g10 1an0 1ap0 1db0 1fd0 1db0 1cN0 1db0 1dd0 1db0 1cp0 1dz0 1c10 1dX0 1cN0 1db0 1dd0 1db0 1cN0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1db0 1cN0 1db0 1cN0 19z0 1fB0 1qL0 11B0 1on0 Wp0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0|26e5",
+			"Asia/Dili|LMT +08 +09|-8m.k -80 -90|01212|-2le8m.k 1dnXm.k 1nfA0 Xld0|19e4",
+			"Asia/Dubai|LMT +04|-3F.c -40|01|-21JfF.c|39e5",
+			"Asia/Dushanbe|LMT +05 +06 +07|-4z.c -50 -60 -70|012323232323232323232321|-1Pc4z.c eUnz.c 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2hB0|76e4",
+			"Asia/Famagusta|LMT EET EEST +03|-2f.M -20 -30 -30|0121212121212121212121212121212121212121212121212121212121212121212121212121212121212312121212121212121212121212121212121212121|-1Vc2f.M 2a3cf.M 1cL0 1qp0 Xz0 19B0 19X0 1fB0 1db0 1cp0 1cL0 1fB0 19X0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1fB0 1cL0 1cN0 1cL0 1cN0 1o30 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 15U0 2Ks0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00",
+			"Asia/Gaza|EET EEST IST IDT|-20 -30 -20 -30|010101010101010101010101010101012323232323232323232323232320101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-1c2q0 5Rb0 10r0 1px0 10N0 1pz0 16p0 1jB0 16p0 1jx0 pBd0 Vz0 1oN0 11b0 1oO0 10N0 1pz0 10N0 1pb0 10N0 1pb0 10N0 1pb0 10N0 1pz0 10N0 1pb0 10N0 1pb0 11d0 1oL0 dW0 hfB0 Db0 1fB0 Rb0 npB0 11z0 1C10 IL0 1s10 10n0 1o10 WL0 1zd0 On0 1ld0 11z0 1o10 14n0 1o10 14n0 1nd0 12n0 1nd0 Xz0 1q10 12n0 M10 C00 17c0 1io0 17c0 1io0 17c0 1o00 1cL0 1fB0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 17c0 1io0 18N0 1bz0 19z0 1gp0 1610 1iL0 11z0 1o10 14o0 1lA1 SKX 1xd1 MKX 1AN0 1a00 1fA0 1cL0 1cN0 1nX0 1210 1nz0 1220 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0|18e5",
+			"Asia/Hebron|EET EEST IST IDT|-20 -30 -20 -30|01010101010101010101010101010101232323232323232323232323232010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-1c2q0 5Rb0 10r0 1px0 10N0 1pz0 16p0 1jB0 16p0 1jx0 pBd0 Vz0 1oN0 11b0 1oO0 10N0 1pz0 10N0 1pb0 10N0 1pb0 10N0 1pb0 10N0 1pz0 10N0 1pb0 10N0 1pb0 11d0 1oL0 dW0 hfB0 Db0 1fB0 Rb0 npB0 11z0 1C10 IL0 1s10 10n0 1o10 WL0 1zd0 On0 1ld0 11z0 1o10 14n0 1o10 14n0 1nd0 12n0 1nd0 Xz0 1q10 12n0 M10 C00 17c0 1io0 17c0 1io0 17c0 1o00 1cL0 1fB0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 17c0 1io0 18N0 1bz0 19z0 1gp0 1610 1iL0 12L0 1mN0 14o0 1lc0 Tb0 1xd1 MKX bB0 cn0 1cN0 1a00 1fA0 1cL0 1cN0 1nX0 1210 1nz0 1220 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0|25e4",
+			"Asia/Ho_Chi_Minh|LMT PLMT +07 +08 +09|-76.E -76.u -70 -80 -90|0123423232|-2yC76.E bK00.a 1h7b6.u 5lz0 18o0 3Oq0 k5b0 aW00 BAM0|90e5",
+			"Asia/Hong_Kong|LMT HKT HKST JST|-7A.G -80 -90 -90|0121312121212121212121212121212121212121212121212121212121212121212121|-2CFHA.G 1sEP6.G 1cL0 ylu 93X0 1qQu 1tX0 Rd0 1In0 NB0 1cL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1kL0 14N0 1nX0 U10 1tz0 U10 1wn0 Rd0 1wn0 U10 1tz0 U10 1tz0 U10 1tz0 U10 1wn0 Rd0 1wn0 Rd0 1wn0 U10 1tz0 U10 1tz0 17d0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 s10 1Vz0 1cN0 1cL0 1cN0 1cL0 6fd0 14n0|73e5",
+			"Asia/Hovd|LMT +06 +07 +08|-66.A -60 -70 -80|012323232323232323232323232323232323232323232323232|-2APG6.A 2Uko6.A cKn0 1db0 1dd0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1fB0 1cL0 1cN0 1cL0 1cN0 1cL0 6hD0 11z0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 kEp0 1cJ0 1cP0 1cJ0|81e3",
+			"Asia/Irkutsk|IMT +07 +08 +09|-6V.5 -70 -80 -90|01232323232323232323232123232323232323232323232323232323232323232|-21zGV.5 pjXV.5 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0|60e4",
+			"Europe/Istanbul|IMT EET EEST +04 +03|-1U.U -20 -30 -40 -30|012121212121212121212121212121212121212121212121212121234343434342121212121212121212121212121212121212121212121212121212121212124|-2ogNU.U dzzU.U 11b0 8tB0 1on0 1410 1db0 19B0 1in0 3Rd0 Un0 1oN0 11b0 zSp0 CL0 mN0 1Vz0 1gN0 1pz0 5Rd0 1fz0 1yp0 ML0 1kp0 17b0 1ip0 17b0 1fB0 19X0 1jB0 18L0 1ip0 17z0 qdd0 xX0 3S10 Tz0 dA10 11z0 1o10 11z0 1qN0 11z0 1ze0 11B0 WM0 1qO0 WI0 1nX0 1rB0 10L0 11B0 1in0 17d0 1in0 2pX0 19E0 1fU0 16Q0 1iI0 16Q0 1iI0 1Vd0 pb0 3Kp0 14o0 1de0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1a00 1fA0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WO0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 Xc0 1qo0 WM0 1qM0 11A0 1o00 1200 1nA0 11A0 1tA0 U00 15w0|13e6",
+			"Asia/Jakarta|BMT +0720 +0730 +09 +08 WIB|-77.c -7k -7u -90 -80 -70|01232425|-1Q0Tk luM0 mPzO 8vWu 6kpu 4PXu xhcu|31e6",
+			"Asia/Jayapura|LMT +09 +0930 WIT|-9m.M -90 -9u -90|0123|-1uu9m.M sMMm.M L4nu|26e4",
+			"Asia/Jerusalem|JMT IST IDT IDDT|-2k.E -20 -30 -40|01212121212132121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-26Bek.E SyMk.E 5Rb0 10r0 1px0 10N0 1pz0 16p0 1jB0 16p0 1jx0 3LB0 Em0 or0 1cn0 1dB0 16n0 10O0 1ja0 1tC0 14o0 1cM0 1a00 11A0 1Na0 An0 1MP0 AJ0 1Kp0 LC0 1oo0 Wl0 EQN0 Db0 1fB0 Rb0 npB0 11z0 1C10 IL0 1s10 10n0 1o10 WL0 1zd0 On0 1ld0 11z0 1o10 14n0 1o10 14n0 1nd0 12n0 1nd0 Xz0 1q10 12n0 1hB0 1dX0 1ep0 1aL0 1eN0 17X0 1nf0 11z0 1tB0 19W0 1e10 17b0 1ep0 1gL0 18N0 1fz0 1eN0 17b0 1gq0 1gn0 19d0 1dz0 1c10 17X0 1hB0 1gn0 19d0 1dz0 1c10 17X0 1kp0 1dz0 1c10 1aL0 1eN0 1oL0 10N0 1oL0 10N0 1oL0 10N0 1rz0 W10 1rz0 W10 1rz0 10N0 1oL0 10N0 1oL0 10N0 1rz0 W10 1rz0 W10 1rz0 10N0 1oL0 10N0 1oL0 10N0 1oL0 10N0 1rz0 W10 1rz0 W10 1rz0 10N0 1oL0 10N0 1oL0 10N0 1rz0 W10 1rz0 W10 1rz0 W10 1rz0 10N0 1oL0 10N0 1oL0|81e4",
+			"Asia/Kabul|+04 +0430|-40 -4u|01|-10Qs0|46e5",
+			"Asia/Kamchatka|LMT +11 +12 +13|-ay.A -b0 -c0 -d0|012323232323232323232321232323232323232323232323232323232323212|-1SLKy.A ivXy.A 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 2sp0 WM0|18e4",
+			"Asia/Karachi|LMT +0530 +0630 +05 PKT PKST|-4s.c -5u -6u -50 -50 -60|012134545454|-2xoss.c 1qOKW.c 7zX0 eup0 LqMu 1fy00 1cL0 dK10 11b0 1610 1jX0|24e6",
+			"Asia/Urumqi|LMT +06|-5O.k -60|01|-1GgtO.k|32e5",
+			"Asia/Kathmandu|LMT +0530 +0545|-5F.g -5u -5J|012|-21JhF.g 2EGMb.g|12e5",
+			"Asia/Khandyga|LMT +08 +09 +10 +11|-92.d -80 -90 -a0 -b0|0123232323232323232323212323232323232323232323232343434343434343432|-21Q92.d pAp2.d 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 qK0 yN0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 17V0 7zD0|66e2",
+			"Asia/Krasnoyarsk|LMT +06 +07 +08|-6b.q -60 -70 -80|01232323232323232323232123232323232323232323232323232323232323232|-21Hib.q prAb.q 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0|10e5",
+			"Asia/Kuala_Lumpur|SMT +07 +0720 +0730 +09 +08|-6T.p -70 -7k -7u -90 -80|0123435|-2Bg6T.p 17anT.p l5XE 17bO 8Fyu 1so1u|71e5",
+			"Asia/Kuching|LMT +0730 +08 +0820 +09|-7l.k -7u -80 -8k -90|0123232323232323242|-1KITl.k gDbP.k 6ynu AnE 1O0k AnE 1NAk AnE 1NAk AnE 1NAk AnE 1O0k AnE 1NAk AnE pAk 8Fz0|13e4",
+			"Asia/Macau|LMT CST CDT|-7y.k -80 -90|012121212121212121212121212121212121212121|-2le7y.k 1XO34.k 1wn0 Rd0 1wn0 R9u 1wqu U10 1tz0 TVu 1tz0 17gu 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cJu 1cL0 1cN0 1fz0 1cN0 1cOu 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cJu 1cL0 1cN0 1fz0 1cN0 1cL0|57e4",
+			"Asia/Magadan|LMT +10 +11 +12|-a3.c -a0 -b0 -c0|012323232323232323232321232323232323232323232323232323232323232312|-1Pca3.c eUo3.c 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0 3Cq0|95e3",
+			"Asia/Makassar|LMT MMT +08 +09 WITA|-7V.A -7V.A -80 -90 -80|01234|-21JjV.A vfc0 myLV.A 8ML0|15e5",
+			"Asia/Manila|+08 +09|-80 -90|010101010|-1kJI0 AL0 cK10 65X0 mXB0 vX0 VK10 1db0|24e6",
+			"Asia/Nicosia|LMT EET EEST|-2d.s -20 -30|01212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-1Vc2d.s 2a3cd.s 1cL0 1qp0 Xz0 19B0 19X0 1fB0 1db0 1cp0 1cL0 1fB0 19X0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1fB0 1cL0 1cN0 1cL0 1cN0 1o30 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|32e4",
+			"Asia/Novokuznetsk|LMT +06 +07 +08|-5M.M -60 -70 -80|012323232323232323232321232323232323232323232323232323232323212|-1PctM.M eULM.M 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 2sp0 WM0|55e4",
+			"Asia/Novosibirsk|LMT +06 +07 +08|-5v.E -60 -70 -80|0123232323232323232323212323212121212121212121212121212121212121212|-21Qnv.E pAFv.E 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 ml0 Os0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0 4eN0|15e5",
+			"Asia/Omsk|LMT +05 +06 +07|-4R.u -50 -60 -70|01232323232323232323232123232323232323232323232323232323232323232|-224sR.u pMLR.u 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0|12e5",
+			"Asia/Oral|LMT +03 +05 +06 +04|-3p.o -30 -50 -60 -40|01232323232323232424242424242424242424242424242|-1Pc3p.o eUop.o 23CK0 3Db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 2pB0 1cM0 1fA0 1cM0 1cM0 IM0 1EM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0|27e4",
+			"Asia/Pontianak|LMT PMT +0730 +09 +08 WITA WIB|-7h.k -7h.k -7u -90 -80 -80 -70|012324256|-2ua7h.k XE00 munL.k 8Rau 6kpu 4PXu xhcu Wqnu|23e4",
+			"Asia/Pyongyang|LMT KST JST KST|-8n -8u -90 -90|01231|-2um8n 97XR 1lTzu 2Onc0|29e5",
+			"Asia/Qyzylorda|LMT +04 +05 +06|-4l.Q -40 -50 -60|0123232323232323232323232323232323232323232323|-1Pc4l.Q eUol.Q 23CL0 3Db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 3ao0 1EM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0|73e4",
+			"Asia/Rangoon|RMT +0630 +09|-6o.L -6u -90|0121|-21Jio.L SmnS.L 7j9u|48e5",
+			"Asia/Sakhalin|LMT +09 +11 +12 +10|-9u.M -90 -b0 -c0 -a0|01232323232323232323232423232323232424242424242424242424242424242|-2AGVu.M 1BoMu.M 1qFa0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 2pB0 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0 3rd0|58e4",
+			"Asia/Samarkand|LMT +04 +05 +06|-4r.R -40 -50 -60|01232323232323232323232|-1Pc4r.R eUor.R 23CL0 3Db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0|36e4",
+			"Asia/Seoul|LMT KST JST KST KDT KDT|-8r.Q -8u -90 -90 -9u -a0|0123141414141414135353|-2um8r.Q 97XV.Q 1m1zu kKo0 2I0u OL0 1FB0 Rb0 1qN0 TX0 1tB0 TX0 1tB0 TX0 1tB0 TX0 2ap0 12FBu 11A0 1o00 11A0|23e6",
+			"Asia/Srednekolymsk|LMT +10 +11 +12|-ae.Q -a0 -b0 -c0|01232323232323232323232123232323232323232323232323232323232323232|-1Pcae.Q eUoe.Q 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0|35e2",
+			"Asia/Taipei|CST JST CDT|-80 -90 -90|01020202020202020202020202020202020202020|-1iw80 joM0 1yo0 Tz0 1ip0 1jX0 1cN0 11b0 1oN0 11b0 1oN0 11b0 1oN0 11b0 10N0 1BX0 10p0 1pz0 10p0 1pz0 10p0 1db0 1dd0 1db0 1cN0 1db0 1cN0 1db0 1cN0 1db0 1BB0 ML0 1Bd0 ML0 uq10 1db0 1cN0 1db0 97B0 AL0|74e5",
+			"Asia/Tashkent|LMT +05 +06 +07|-4B.b -50 -60 -70|012323232323232323232321|-1Pc4B.b eUnB.b 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0|23e5",
+			"Asia/Tbilisi|TBMT +03 +04 +05|-2X.b -30 -40 -50|0123232323232323232323212121232323232323232323212|-1Pc2X.b 1jUnX.b WCL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 1cK0 1cL0 1cN0 1cL0 1cN0 2pz0 1cL0 1fB0 3Nz0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 An0 Os0 WM0|11e5",
+			"Asia/Tehran|LMT TMT +0330 +04 +05 +0430|-3p.I -3p.I -3u -40 -50 -4u|01234325252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252|-2btDp.I 1d3c0 1huLT.I TXu 1pz0 sN0 vAu 1cL0 1dB0 1en0 pNB0 UL0 1cN0 1dz0 1cp0 1dz0 1cp0 1dz0 1cp0 1dz0 1cp0 1dz0 1cN0 1dz0 1cp0 1dz0 1cp0 1dz0 1cp0 1dz0 1cN0 1dz0 1cp0 1dz0 1cp0 1dz0 1cp0 1dz0 1cN0 1dz0 64p0 1dz0 1cN0 1dz0 1cp0 1dz0 1cp0 1dz0 1cp0 1dz0 1cN0 1dz0 1cp0 1dz0 1cp0 1dz0 1cp0 1dz0 1cN0 1dz0 1cp0 1dz0 1cp0 1dz0 1cp0 1dz0 1cN0 1dz0 1cp0 1dz0 1cp0 1dz0 1cp0 1dz0 1cN0 1dz0 1cp0 1dz0 1cp0 1dz0 1cp0 1dz0 1cp0 1dz0 1cN0 1dz0 1cp0 1dz0 1cp0 1dz0 1cp0 1dz0 1cN0 1dz0 1cp0 1dz0 1cp0 1dz0 1cp0 1dz0|14e6",
+			"Asia/Thimphu|LMT +0530 +06|-5W.A -5u -60|012|-Su5W.A 1BGMs.A|79e3",
+			"Asia/Tokyo|JST JDT|-90 -a0|010101010|-QJH0 QL0 1lB0 13X0 1zB0 NX0 1zB0 NX0|38e6",
+			"Asia/Tomsk|LMT +06 +07 +08|-5D.P -60 -70 -80|0123232323232323232323212323232323232323232323212121212121212121212|-21NhD.P pxzD.P 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 co0 1bB0 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0 3Qp0|10e5",
+			"Asia/Ulaanbaatar|LMT +07 +08 +09|-77.w -70 -80 -90|012323232323232323232323232323232323232323232323232|-2APH7.w 2Uko7.w cKn0 1db0 1dd0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1fB0 1cL0 1cN0 1cL0 1cN0 1cL0 6hD0 11z0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 kEp0 1cJ0 1cP0 1cJ0|12e5",
+			"Asia/Ust-Nera|LMT +08 +09 +12 +11 +10|-9w.S -80 -90 -c0 -b0 -a0|012343434343434343434345434343434343434343434343434343434343434345|-21Q9w.S pApw.S 23CL0 1d90 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 17V0 7zD0|65e2",
+			"Asia/Vladivostok|LMT +09 +10 +11|-8L.v -90 -a0 -b0|01232323232323232323232123232323232323232323232323232323232323232|-1SJIL.v itXL.v 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0|60e4",
+			"Asia/Yakutsk|LMT +08 +09 +10|-8C.W -80 -90 -a0|01232323232323232323232123232323232323232323232323232323232323232|-21Q8C.W pAoC.W 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0|28e4",
+			"Asia/Yekaterinburg|LMT PMT +04 +05 +06|-42.x -3J.5 -40 -50 -60|012343434343434343434343234343434343434343434343434343434343434343|-2ag42.x 7mQh.s qBvJ.5 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0|14e5",
+			"Asia/Yerevan|LMT +03 +04 +05|-2W -30 -40 -50|0123232323232323232323212121212323232323232323232323232323232|-1Pc2W 1jUnW WCL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 4RX0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0|13e5",
+			"Atlantic/Azores|HMT -02 -01 +00 WET|1S.w 20 10 0 0|01212121212121212121212121212121212121212121232123212321232121212121212121212121212121212121212121232323232323232323232323232323234323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232|-2ldW5.s aPX5.s Sp0 LX0 1vc0 Tc0 1uM0 SM0 1vc0 Tc0 1vc0 SM0 1vc0 6600 1co0 3E00 17c0 1fA0 1a00 1io0 1a00 1io0 17c0 3I00 17c0 1cM0 1cM0 3Fc0 1cM0 1a00 1fA0 1io0 17c0 1cM0 1cM0 1a00 1fA0 1io0 1qM0 Dc0 1tA0 1cM0 1dc0 1400 gL0 IM0 s10 U00 dX0 Rc0 pd0 Rc0 gL0 Oo0 pd0 Rc0 gL0 Oo0 pd0 14o0 1cM0 1cP0 1cM0 1cM0 1cM0 1cM0 1cM0 3Co0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 qIl0 1cM0 1fA0 1cM0 1cM0 1cN0 1cL0 1cN0 1cM0 1cM0 1cM0 1cM0 1cN0 1cL0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cL0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|25e4",
+			"Atlantic/Bermuda|LMT AST ADT|4j.i 40 30|0121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-1BnRE.G 1LTbE.G 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|65e3",
+			"Atlantic/Canary|LMT -01 WET WEST|11.A 10 0 -10|01232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232|-1UtaW.o XPAW.o 1lAK0 1a10 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|54e4",
+			"Atlantic/Cape_Verde|LMT -02 -01|1y.4 20 10|01212|-2xomp.U 1qOMp.U 7zX0 1djf0|50e4",
+			"Atlantic/Faroe|LMT WET WEST|r.4 0 -10|01212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2uSnw.U 2Wgow.U 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|49e3",
+			"Atlantic/Madeira|FMT -01 +00 +01 WET WEST|17.A 10 0 -10 0 -10|01212121212121212121212121212121212121212121232123212321232121212121212121212121212121212121212121454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454|-2ldWQ.o aPWQ.o Sp0 LX0 1vc0 Tc0 1uM0 SM0 1vc0 Tc0 1vc0 SM0 1vc0 6600 1co0 3E00 17c0 1fA0 1a00 1io0 1a00 1io0 17c0 3I00 17c0 1cM0 1cM0 3Fc0 1cM0 1a00 1fA0 1io0 17c0 1cM0 1cM0 1a00 1fA0 1io0 1qM0 Dc0 1tA0 1cM0 1dc0 1400 gL0 IM0 s10 U00 dX0 Rc0 pd0 Rc0 gL0 Oo0 pd0 Rc0 gL0 Oo0 pd0 14o0 1cM0 1cP0 1cM0 1cM0 1cM0 1cM0 1cM0 3Co0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 qIl0 1cM0 1fA0 1cM0 1cM0 1cN0 1cL0 1cN0 1cM0 1cM0 1cM0 1cM0 1cN0 1cL0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|27e4",
+			"Atlantic/Reykjavik|LMT -01 +00 GMT|1s 10 0 0|012121212121212121212121212121212121212121212121212121212121212121213|-2uWmw mfaw 1Bd0 ML0 1LB0 Cn0 1LB0 3fX0 C10 HrX0 1cO0 LB0 1EL0 LA0 1C00 Oo0 1wo0 Rc0 1wo0 Rc0 1wo0 Rc0 1zc0 Oo0 1zc0 14o0 1lc0 14o0 1lc0 14o0 1o00 11A0 1lc0 14o0 1o00 14o0 1lc0 14o0 1lc0 14o0 1lc0 14o0 1lc0 14o0 1o00 14o0 1lc0 14o0 1lc0 14o0 1lc0 14o0 1lc0 14o0 1lc0 14o0 1o00 14o0 1lc0 14o0 1lc0 14o0 1lc0 14o0 1lc0 14o0 1o00 14o0|12e4",
+			"Atlantic/South_Georgia|-02|20|0||30",
+			"Atlantic/Stanley|SMT -04 -03 -02|3P.o 40 30 20|012121212121212323212121212121212121212121212121212121212121212121212|-2kJw8.A 12bA8.A 19X0 1fB0 19X0 1ip0 19X0 1fB0 19X0 1fB0 19X0 1fB0 Cn0 1Cc10 WL0 1qL0 U10 1tz0 2mN0 WN0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1tz0 U10 1tz0 WN0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1tz0 WN0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qN0 U10 1wn0 Rd0 1wn0 U10 1tz0 U10 1tz0 U10 1tz0 U10 1tz0 U10 1wn0 U10 1tz0 U10 1tz0 U10|21e2",
+			"Australia/Sydney|AEST AEDT|-a0 -b0|0101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101|-293lX xcX 10jd0 yL0 1cN0 1cL0 1fB0 19X0 17c10 LA0 1C00 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 14o0 1o00 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 U00 1qM0 WM0 1tA0 WM0 1tA0 U00 1tA0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 11A0 1o00 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 11A0 1o00 WM0 1qM0 14o0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0|40e5",
+			"Australia/Adelaide|ACST ACDT|-9u -au|0101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101|-293lt xcX 10jd0 yL0 1cN0 1cL0 1fB0 19X0 17c10 LA0 1C00 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 U00 1qM0 WM0 1tA0 WM0 1tA0 U00 1tA0 U00 1tA0 Oo0 1zc0 WM0 1qM0 Rc0 1zc0 U00 1tA0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 11A0 1o00 WM0 1qM0 14o0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0|11e5",
+			"Australia/Brisbane|AEST AEDT|-a0 -b0|01010101010101010|-293lX xcX 10jd0 yL0 1cN0 1cL0 1fB0 19X0 17c10 LA0 H1A0 Oo0 1zc0 Oo0 1zc0 Oo0|20e5",
+			"Australia/Broken_Hill|ACST ACDT|-9u -au|0101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101|-293lt xcX 10jd0 yL0 1cN0 1cL0 1fB0 19X0 17c10 LA0 1C00 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 14o0 1o00 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 U00 1qM0 WM0 1tA0 WM0 1tA0 U00 1tA0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 11A0 1o00 WM0 1qM0 14o0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0|18e3",
+			"Australia/Currie|AEST AEDT|-a0 -b0|0101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101|-29E80 19X0 10jd0 yL0 1cN0 1cL0 1fB0 19X0 17c10 LA0 1C00 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 11A0 1qM0 WM0 1qM0 Oo0 1zc0 Oo0 1zc0 Oo0 1wo0 WM0 1tA0 WM0 1tA0 U00 1tA0 U00 1tA0 11A0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 11A0 1o00 1io0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1cM0 1a00 1io0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0|746",
+			"Australia/Darwin|ACST ACDT|-9u -au|010101010|-293lt xcX 10jd0 yL0 1cN0 1cL0 1fB0 19X0|12e4",
+			"Australia/Eucla|+0845 +0945|-8J -9J|0101010101010101010|-293kI xcX 10jd0 yL0 1cN0 1cL0 1gSp0 Oo0 l5A0 Oo0 iJA0 G00 zU00 IM0 1qM0 11A0 1o00 11A0|368",
+			"Australia/Hobart|AEST AEDT|-a0 -b0|010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101|-29E80 19X0 10jd0 yL0 1cN0 1cL0 1fB0 19X0 VfB0 1cM0 1o00 Rc0 1wo0 Rc0 1wo0 U00 1wo0 LA0 1C00 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 11A0 1qM0 WM0 1qM0 Oo0 1zc0 Oo0 1zc0 Oo0 1wo0 WM0 1tA0 WM0 1tA0 U00 1tA0 U00 1tA0 11A0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 11A0 1o00 1io0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1cM0 1a00 1io0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0|21e4",
+			"Australia/Lord_Howe|AEST +1030 +1130 +11|-a0 -au -bu -b0|0121212121313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313|raC0 1zdu Rb0 1zd0 On0 1zd0 On0 1zd0 On0 1zd0 TXu 1qMu WLu 1tAu WLu 1tAu TXu 1tAu Onu 1zcu Onu 1zcu Onu 1zcu Rbu 1zcu Onu 1zcu Onu 1zcu 11zu 1o0u 11zu 1o0u 11zu 1o0u 11zu 1qMu WLu 11Au 1nXu 1qMu 11zu 1o0u 11zu 1o0u 11zu 1qMu WLu 1qMu 11zu 1o0u WLu 1qMu 14nu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1fAu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1fAu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1fzu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1fAu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1fAu 1cLu 1cMu 1cLu 1cMu|347",
+			"Australia/Lindeman|AEST AEDT|-a0 -b0|010101010101010101010|-293lX xcX 10jd0 yL0 1cN0 1cL0 1fB0 19X0 17c10 LA0 H1A0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0|10",
+			"Australia/Melbourne|AEST AEDT|-a0 -b0|0101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101|-293lX xcX 10jd0 yL0 1cN0 1cL0 1fB0 19X0 17c10 LA0 1C00 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 U00 1qM0 WM0 1qM0 11A0 1tA0 U00 1tA0 U00 1tA0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 11A0 1o00 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 11A0 1o00 WM0 1qM0 14o0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0|39e5",
+			"Australia/Perth|AWST AWDT|-80 -90|0101010101010101010|-293jX xcX 10jd0 yL0 1cN0 1cL0 1gSp0 Oo0 l5A0 Oo0 iJA0 G00 zU00 IM0 1qM0 11A0 1o00 11A0|18e5",
+			"CET|CET CEST|-10 -20|01010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-2aFe0 11d0 1iO0 11A0 1o00 11A0 Qrc0 6i00 WM0 1fA0 1cM0 1cM0 1cM0 16M0 1gMM0 1a00 1fA0 1cM0 1cM0 1cM0 1fA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00",
+			"CST6CDT|CST CDT CWT CPT|60 50 50 50|010102301010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-261s0 1nX0 11B0 1nX0 SgN0 8x30 iw0 QwN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"Pacific/Easter|EMT -07 -06 -05|7h.s 70 60 50|012121212121212121212121212123232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323|-1uSgG.w 1s4IG.w WL0 1zd0 On0 1ip0 11z0 1o10 11z0 1qN0 WL0 1ld0 14n0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 WL0 1qN0 11z0 1o10 2pA0 11z0 1o10 11z0 1qN0 WL0 1qN0 WL0 1qN0 1cL0 1cN0 11z0 1o10 11z0 1qN0 WL0 1fB0 19X0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 17b0 1ip0 11z0 1ip0 1fz0 1fB0 11z0 1qN0 WL0 1qN0 WL0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 17b0 1ip0 11z0 1o10 19X0 1fB0 1nX0 G10 1EL0 Op0 1zb0 Rd0 1wn0 Rd0 46n0 Ap0 1Nb0 Ap0 1Nb0 Ap0 1Nb0 Ap0 1Nb0 Ap0 1Nb0 Dd0 1Nb0 Ap0 1Nb0 Ap0 1Nb0 Ap0 1Nb0 Ap0 1Nb0 Ap0 1Nb0 Dd0 1Nb0 Ap0 1Nb0 Ap0 1Nb0 Ap0 1Nb0 Ap0 1Nb0 Dd0 1Nb0 Ap0 1Nb0 Ap0 1Nb0 Ap0 1Nb0 Ap0 1Nb0 Ap0|30e2",
+			"EET|EET EEST|-20 -30|010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|hDB0 1a00 1fA0 1cM0 1cM0 1cM0 1fA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00",
+			"EST|EST|50|0|",
+			"EST5EDT|EST EDT EWT EPT|50 40 40 40|010102301010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-261t0 1nX0 11B0 1nX0 SgN0 8x40 iv0 QwN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"Europe/Dublin|DMT IST GMT BST IST|p.l -y.D 0 -10 -10|01232323232324242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242|-2ax9y.D Rc0 1fzy.D 14M0 1fc0 1g00 1co0 1dc0 1co0 1oo0 1400 1dc0 19A0 1io0 1io0 WM0 1o00 14o0 1o00 17c0 1io0 17c0 1fA0 1a00 1lc0 17c0 1io0 17c0 1fA0 1a00 1io0 17c0 1io0 17c0 1fA0 1cM0 1io0 17c0 1fA0 1a00 1io0 17c0 1io0 17c0 1fA0 1a00 1io0 1qM0 Dc0 g600 14o0 1wo0 17c0 1io0 11A0 1o00 17c0 1fA0 1a00 1fA0 1cM0 1fA0 1a00 17c0 1fA0 1a00 1io0 17c0 1lc0 17c0 1fA0 1a00 1io0 17c0 1io0 17c0 1fA0 1a00 1a00 1qM0 WM0 1qM0 11A0 1o00 WM0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1tA0 IM0 90o0 U00 1tA0 U00 1tA0 U00 1tA0 U00 1tA0 WM0 1qM0 WM0 1qM0 WM0 1tA0 U00 1tA0 U00 1tA0 11z0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1o00 14o0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|12e5",
+			"Etc/GMT+0|GMT|0|0|",
+			"Etc/GMT+1|-01|10|0|",
+			"Etc/GMT+10|-10|a0|0|",
+			"Etc/GMT+11|-11|b0|0|",
+			"Etc/GMT+12|-12|c0|0|",
+			"Etc/GMT+3|-03|30|0|",
+			"Etc/GMT+4|-04|40|0|",
+			"Etc/GMT+5|-05|50|0|",
+			"Etc/GMT+6|-06|60|0|",
+			"Etc/GMT+7|-07|70|0|",
+			"Etc/GMT+8|-08|80|0|",
+			"Etc/GMT+9|-09|90|0|",
+			"Etc/GMT-1|+01|-10|0|",
+			"Pacific/Port_Moresby|+10|-a0|0||25e4",
+			"Pacific/Pohnpei|+11|-b0|0||34e3",
+			"Pacific/Tarawa|+12|-c0|0||29e3",
+			"Etc/GMT-13|+13|-d0|0|",
+			"Etc/GMT-14|+14|-e0|0|",
+			"Etc/GMT-2|+02|-20|0|",
+			"Etc/GMT-3|+03|-30|0|",
+			"Etc/GMT-4|+04|-40|0|",
+			"Etc/GMT-5|+05|-50|0|",
+			"Etc/GMT-6|+06|-60|0|",
+			"Indian/Christmas|+07|-70|0||21e2",
+			"Etc/GMT-8|+08|-80|0|",
+			"Pacific/Palau|+09|-90|0||21e3",
+			"Etc/UCT|UCT|0|0|",
+			"Etc/UTC|UTC|0|0|",
+			"Europe/Amsterdam|AMT NST +0120 +0020 CEST CET|-j.w -1j.w -1k -k -20 -10|010101010101010101010101010101010101010101012323234545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545|-2aFcj.w 11b0 1iP0 11A0 1io0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1co0 1io0 1yo0 Pc0 1a00 1fA0 1Bc0 Mo0 1tc0 Uo0 1tA0 U00 1uo0 W00 1s00 VA0 1so0 Vc0 1sM0 UM0 1wo0 Rc0 1u00 Wo0 1rA0 W00 1s00 VA0 1sM0 UM0 1w00 fV0 BCX.w 1tA0 U00 1u00 Wo0 1sm0 601k WM0 1fA0 1cM0 1cM0 1cM0 16M0 1gMM0 1a00 1fA0 1cM0 1cM0 1cM0 1fA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|16e5",
+			"Europe/Andorra|WET CET CEST|0 -10 -20|012121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-UBA0 1xIN0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|79e3",
+			"Europe/Astrakhan|LMT +03 +04 +05|-3c.c -30 -40 -50|012323232323232323212121212121212121212121212121212121212121212|-1Pcrc.c eUMc.c 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 2pB0 1cM0 1fA0 1cM0 3Co0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0 3rd0",
+			"Europe/Athens|AMT EET EEST CEST CET|-1y.Q -20 -30 -20 -10|012123434121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2a61x.Q CNbx.Q mn0 kU10 9b0 3Es0 Xa0 1fb0 1dd0 k3X0 Nz0 SCp0 1vc0 SO0 1cM0 1a00 1ao0 1fc0 1a10 1fG0 1cg0 1dX0 1bX0 1cQ0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|35e5",
+			"Europe/London|GMT BST BDST|0 -10 -20|0101010101010101010101010101010101010101010101010121212121210101210101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-2axa0 Rc0 1fA0 14M0 1fc0 1g00 1co0 1dc0 1co0 1oo0 1400 1dc0 19A0 1io0 1io0 WM0 1o00 14o0 1o00 17c0 1io0 17c0 1fA0 1a00 1lc0 17c0 1io0 17c0 1fA0 1a00 1io0 17c0 1io0 17c0 1fA0 1cM0 1io0 17c0 1fA0 1a00 1io0 17c0 1io0 17c0 1fA0 1a00 1io0 1qM0 Dc0 2Rz0 Dc0 1zc0 Oo0 1zc0 Rc0 1wo0 17c0 1iM0 FA0 xB0 1fA0 1a00 14o0 bb0 LA0 xB0 Rc0 1wo0 11A0 1o00 17c0 1fA0 1a00 1fA0 1cM0 1fA0 1a00 17c0 1fA0 1a00 1io0 17c0 1lc0 17c0 1fA0 1a00 1io0 17c0 1io0 17c0 1fA0 1a00 1a00 1qM0 WM0 1qM0 11A0 1o00 WM0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1tA0 IM0 90o0 U00 1tA0 U00 1tA0 U00 1tA0 U00 1tA0 WM0 1qM0 WM0 1qM0 WM0 1tA0 U00 1tA0 U00 1tA0 11z0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1o00 14o0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|10e6",
+			"Europe/Belgrade|CET CEST|-10 -20|01010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-19RC0 3IP0 WM0 1fA0 1cM0 1cM0 1rc0 Qo0 1vmo0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|12e5",
+			"Europe/Berlin|CET CEST CEMT|-10 -20 -30|01010101010101210101210101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-2aFe0 11d0 1iO0 11A0 1o00 11A0 Qrc0 6i00 WM0 1fA0 1cM0 1cM0 1cM0 kL0 Nc0 m10 WM0 1ao0 1cp0 dX0 jz0 Dd0 1io0 17c0 1fA0 1a00 1ehA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|41e5",
+			"Europe/Prague|CET CEST|-10 -20|010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-2aFe0 11d0 1iO0 11A0 1o00 11A0 Qrc0 6i00 WM0 1fA0 1cM0 16M0 1lc0 1tA0 17A0 11c0 1io0 17c0 1io0 17c0 1fc0 1ao0 1bNc0 1cM0 1fA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|13e5",
+			"Europe/Brussels|WET CET CEST WEST|0 -10 -20 -10|0121212103030303030303030303030303030303030303030303212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2ehc0 3zX0 11c0 1iO0 11A0 1o00 11A0 my0 Ic0 1qM0 Rc0 1EM0 UM0 1u00 10o0 1io0 1io0 17c0 1a00 1fA0 1cM0 1cM0 1io0 17c0 1fA0 1a00 1io0 1a30 1io0 17c0 1fA0 1a00 1io0 17c0 1cM0 1cM0 1a00 1io0 1cM0 1cM0 1a00 1fA0 1io0 17c0 1cM0 1cM0 1a00 1fA0 1io0 1qM0 Dc0 y00 5Wn0 WM0 1fA0 1cM0 16M0 1iM0 16M0 1C00 Uo0 1eeo0 1a00 1fA0 1cM0 1cM0 1cM0 1fA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|21e5",
+			"Europe/Bucharest|BMT EET EEST|-1I.o -20 -30|0121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-1xApI.o 20LI.o RA0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1Axc0 On0 1fA0 1a10 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cK0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cL0 1cN0 1cL0 1fB0 1nX0 11E0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|19e5",
+			"Europe/Budapest|CET CEST|-10 -20|0101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-2aFe0 11d0 1iO0 11A0 1ip0 17b0 1op0 1tb0 Q2m0 3Ne0 WM0 1fA0 1cM0 1cM0 1oJ0 1dc0 1030 1fA0 1cM0 1cM0 1cM0 1cM0 1fA0 1a00 1iM0 1fA0 8Ha0 Rb0 1wN0 Rb0 1BB0 Lz0 1C20 LB0 SNX0 1a10 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|17e5",
+			"Europe/Zurich|CET CEST|-10 -20|01010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-19Lc0 11A0 1o00 11A0 1xG10 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|38e4",
+			"Europe/Chisinau|CMT BMT EET EEST CEST CET MSK MSD|-1T -1I.o -20 -30 -20 -10 -30 -40|012323232323232323234545467676767676767676767323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232|-26jdT wGMa.A 20LI.o RA0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 27A0 2en0 39g0 WM0 1fA0 1cM0 V90 1t7z0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 gL0 WO0 1cM0 1cM0 1cK0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1fB0 1nX0 11D0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|67e4",
+			"Europe/Copenhagen|CET CEST|-10 -20|0101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-2azC0 Tz0 VuO0 60q0 WM0 1fA0 1cM0 1cM0 1cM0 S00 1HA0 Nc0 1C00 Dc0 1Nc0 Ao0 1h5A0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|12e5",
+			"Europe/Gibraltar|GMT BST BDST CET CEST|0 -10 -20 -10 -20|010101010101010101010101010101010101010101010101012121212121010121010101010101010101034343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343|-2axa0 Rc0 1fA0 14M0 1fc0 1g00 1co0 1dc0 1co0 1oo0 1400 1dc0 19A0 1io0 1io0 WM0 1o00 14o0 1o00 17c0 1io0 17c0 1fA0 1a00 1lc0 17c0 1io0 17c0 1fA0 1a00 1io0 17c0 1io0 17c0 1fA0 1cM0 1io0 17c0 1fA0 1a00 1io0 17c0 1io0 17c0 1fA0 1a00 1io0 1qM0 Dc0 2Rz0 Dc0 1zc0 Oo0 1zc0 Rc0 1wo0 17c0 1iM0 FA0 xB0 1fA0 1a00 14o0 bb0 LA0 xB0 Rc0 1wo0 11A0 1o00 17c0 1fA0 1a00 1fA0 1cM0 1fA0 1a00 17c0 1fA0 1a00 1io0 17c0 1lc0 17c0 1fA0 10Jz0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|30e3",
+			"Europe/Helsinki|HMT EET EEST|-1D.N -20 -30|0121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-1WuND.N OULD.N 1dA0 1xGq0 1cM0 1cM0 1cM0 1cN0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|12e5",
+			"Europe/Kaliningrad|CET CEST CET CEST MSK MSD EEST EET +03|-10 -20 -20 -30 -30 -40 -30 -20 -30|0101010101010232454545454545454546767676767676767676767676767676767676767676787|-2aFe0 11d0 1iO0 11A0 1o00 11A0 Qrc0 6i00 WM0 1fA0 1cM0 1cM0 Am0 Lb0 1en0 op0 1pNz0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cN0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0|44e4",
+			"Europe/Kiev|KMT EET MSK CEST CET MSD EEST|-22.4 -20 -30 -20 -10 -40 -30|0123434252525252525252525256161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161|-1Pc22.4 eUo2.4 rnz0 2Hg0 WM0 1fA0 da0 1v4m0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 Db0 3220 1cK0 1cL0 1cN0 1cL0 1cN0 1cL0 1cQ0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|34e5",
+			"Europe/Kirov|LMT +03 +04 +05|-3i.M -30 -40 -50|01232323232323232321212121212121212121212121212121212121212121|-22WM0 qH90 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 2pB0 1cM0 1fA0 1cM0 3Co0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0|48e4",
+			"Europe/Lisbon|LMT WET WEST WEMT CET CEST|A.J 0 -10 -20 -10 -20|012121212121212121212121212121212121212121212321232123212321212121212121212121212121212121212121214121212121212121212121212121212124545454212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2ldXn.f aPWn.f Sp0 LX0 1vc0 Tc0 1uM0 SM0 1vc0 Tc0 1vc0 SM0 1vc0 6600 1co0 3E00 17c0 1fA0 1a00 1io0 1a00 1io0 17c0 3I00 17c0 1cM0 1cM0 3Fc0 1cM0 1a00 1fA0 1io0 17c0 1cM0 1cM0 1a00 1fA0 1io0 1qM0 Dc0 1tA0 1cM0 1dc0 1400 gL0 IM0 s10 U00 dX0 Rc0 pd0 Rc0 gL0 Oo0 pd0 Rc0 gL0 Oo0 pd0 14o0 1cM0 1cP0 1cM0 1cM0 1cM0 1cM0 1cM0 3Co0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 pvy0 1cM0 1cM0 1fA0 1cM0 1cM0 1cN0 1cL0 1cN0 1cM0 1cM0 1cM0 1cM0 1cN0 1cL0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|27e5",
+			"Europe/Luxembourg|LMT CET CEST WET WEST WEST WET|-o.A -10 -20 0 -10 -20 -10|0121212134343434343434343434343434343434343434343434565651212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2DG0o.A t6mo.A TB0 1nX0 Up0 1o20 11A0 rW0 CM0 1qP0 R90 1EO0 UK0 1u20 10m0 1ip0 1in0 17e0 19W0 1fB0 1db0 1cp0 1in0 17d0 1fz0 1a10 1in0 1a10 1in0 17f0 1fA0 1a00 1io0 17c0 1cM0 1cM0 1a00 1io0 1cM0 1cM0 1a00 1fA0 1io0 17c0 1cM0 1cM0 1a00 1fA0 1io0 1qM0 Dc0 vA0 60L0 WM0 1fA0 1cM0 17c0 1io0 16M0 1C00 Uo0 1eeo0 1a00 1fA0 1cM0 1cM0 1cM0 1fA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|54e4",
+			"Europe/Madrid|WET WEST WEMT CET CEST|0 -10 -20 -10 -20|010101010101010101210343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343|-25Td0 19B0 1cL0 1dd0 b1z0 18p0 3HX0 17d0 1fz0 1a10 1io0 1a00 1in0 17d0 iIn0 Hd0 1cL0 bb0 1200 2s20 14n0 5aL0 Mp0 1vz0 17d0 1in0 17d0 1in0 17d0 1in0 17d0 6hX0 11B0 XHX0 1a10 1fz0 1a10 19X0 1cN0 1fz0 1a10 1fC0 1cM0 1cM0 1cM0 1fA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|62e5",
+			"Europe/Malta|CET CEST|-10 -20|0101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-2arB0 Lz0 1cN0 1db0 1410 1on0 Wp0 1qL0 17d0 1cL0 M3B0 5M20 WM0 1fA0 1co0 17c0 1iM0 16m0 1de0 1lc0 14m0 1lc0 WO0 1qM0 GTW0 On0 1C10 LA0 1C00 LA0 1EM0 LA0 1C00 LA0 1zc0 Oo0 1C00 Oo0 1co0 1cM0 1lA0 Xc0 1qq0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1iN0 19z0 1fB0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|42e4",
+			"Europe/Minsk|MMT EET MSK CEST CET MSD EEST +03|-1O -20 -30 -20 -10 -40 -30 -30|01234343252525252525252525261616161616161616161616161616161616161617|-1Pc1O eUnO qNX0 3gQ0 WM0 1fA0 1cM0 Al0 1tsn0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 3Fc0 1cN0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0|19e5",
+			"Europe/Monaco|PMT WET WEST WEMT CET CEST|-9.l 0 -10 -20 -10 -20|01212121212121212121212121212121212121212121212121232323232345454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454|-2nco9.l cNb9.l HA0 19A0 1iM0 11c0 1oo0 Wo0 1rc0 QM0 1EM0 UM0 1u00 10o0 1io0 1wo0 Rc0 1a00 1fA0 1cM0 1cM0 1io0 17c0 1fA0 1a00 1io0 1a00 1io0 17c0 1fA0 1a00 1io0 17c0 1cM0 1cM0 1a00 1io0 1cM0 1cM0 1a00 1fA0 1io0 17c0 1cM0 1cM0 1a00 1fA0 1io0 1qM0 Df0 2RV0 11z0 11B0 1ze0 WM0 1fA0 1cM0 1fa0 1aq0 16M0 1ekn0 1cL0 1fC0 1a00 1fA0 1cM0 1cM0 1cM0 1fA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|38e3",
+			"Europe/Moscow|MMT MMT MST MDST MSD MSK +05 EET EEST MSK|-2u.h -2v.j -3v.j -4v.j -40 -30 -50 -20 -30 -40|012132345464575454545454545454545458754545454545454545454545454545454545454595|-2ag2u.h 2pyW.W 1bA0 11X0 GN0 1Hb0 c4v.j ik0 3DA0 dz0 15A0 c10 2q10 iM10 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cN0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0|16e6",
+			"Europe/Paris|PMT WET WEST CEST CET WEMT|-9.l 0 -10 -20 -10 -20|0121212121212121212121212121212121212121212121212123434352543434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434|-2nco8.l cNb8.l HA0 19A0 1iM0 11c0 1oo0 Wo0 1rc0 QM0 1EM0 UM0 1u00 10o0 1io0 1wo0 Rc0 1a00 1fA0 1cM0 1cM0 1io0 17c0 1fA0 1a00 1io0 1a00 1io0 17c0 1fA0 1a00 1io0 17c0 1cM0 1cM0 1a00 1io0 1cM0 1cM0 1a00 1fA0 1io0 17c0 1cM0 1cM0 1a00 1fA0 1io0 1qM0 Df0 Ik0 5M30 WM0 1fA0 1cM0 Vx0 hB0 1aq0 16M0 1ekn0 1cL0 1fC0 1a00 1fA0 1cM0 1cM0 1cM0 1fA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|11e6",
+			"Europe/Riga|RMT LST EET MSK CEST CET MSD EEST|-1A.y -2A.y -20 -30 -20 -10 -40 -30|010102345454536363636363636363727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272|-25TzA.y 11A0 1iM0 ko0 gWm0 yDXA.y 2bX0 3fE0 WM0 1fA0 1cM0 1cM0 4m0 1sLy0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cN0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cN0 1o00 11A0 1o00 11A0 1qM0 3oo0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|64e4",
+			"Europe/Rome|CET CEST|-10 -20|0101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-2arB0 Lz0 1cN0 1db0 1410 1on0 Wp0 1qL0 17d0 1cL0 M3B0 5M20 WM0 1fA0 1cM0 16M0 1iM0 16m0 1de0 1lc0 14m0 1lc0 WO0 1qM0 GTW0 On0 1C10 LA0 1C00 LA0 1EM0 LA0 1C00 LA0 1zc0 Oo0 1C00 Oo0 1C00 LA0 1zc0 Oo0 1C00 LA0 1C00 LA0 1zc0 Oo0 1C00 Oo0 1zc0 Oo0 1fC0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|39e5",
+			"Europe/Samara|LMT +03 +04 +05|-3k.k -30 -40 -50|0123232323232323232121232323232323232323232323232323232323212|-22WM0 qH90 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 2pB0 1cM0 1fA0 2y10 14m0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 2sp0 WM0|12e5",
+			"Europe/Saratov|LMT +03 +04 +05|-34.i -30 -40 -50|012323232323232321212121212121212121212121212121212121212121212|-22WM0 qH90 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 2pB0 1cM0 1cM0 1cM0 1fA0 1cM0 3Co0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0 5810",
+			"Europe/Simferopol|SMT EET MSK CEST CET MSD EEST MSK|-2g -20 -30 -20 -10 -40 -30 -40|012343432525252525252525252161616525252616161616161616161616161616161616172|-1Pc2g eUog rEn0 2qs0 WM0 1fA0 1cM0 3V0 1u0L0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1Q00 4eL0 1cL0 1cN0 1cL0 1cN0 dX0 WL0 1cN0 1cL0 1fB0 1o30 11B0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11z0 1nW0|33e4",
+			"Europe/Sofia|EET CET CEST EEST|-20 -10 -20 -30|01212103030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030|-168L0 WM0 1fA0 1cM0 1cM0 1cN0 1mKH0 1dd0 1fb0 1ap0 1fb0 1a20 1fy0 1a30 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cK0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1fB0 1nX0 11E0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|12e5",
+			"Europe/Stockholm|CET CEST|-10 -20|01010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-2azC0 TB0 2yDe0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|15e5",
+			"Europe/Tallinn|TMT CET CEST EET MSK MSD EEST|-1D -10 -20 -20 -30 -40 -30|012103421212454545454545454546363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363|-26oND teD 11A0 1Ta0 4rXl KSLD 2FX0 2Jg0 WM0 1fA0 1cM0 18J0 1sTX0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cN0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o10 11A0 1qM0 5QM0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|41e4",
+			"Europe/Tirane|LMT CET CEST|-1j.k -10 -20|01212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2glBj.k 14pcj.k 5LC0 WM0 4M0 1fCK0 10n0 1op0 11z0 1pd0 11z0 1qN0 WL0 1qp0 Xb0 1qp0 Xb0 1qp0 11z0 1lB0 11z0 1qN0 11z0 1iN0 16n0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|42e4",
+			"Europe/Ulyanovsk|LMT +03 +04 +05 +02|-3d.A -30 -40 -50 -20|01232323232323232321214121212121212121212121212121212121212121212|-22WM0 qH90 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 2pB0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0 3rd0",
+			"Europe/Uzhgorod|CET CEST MSK MSD EET EEST|-10 -20 -30 -40 -20 -30|010101023232323232323232320454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454|-1cqL0 6i00 WM0 1fA0 1cM0 1ml0 1Cp0 1r3W0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1Q00 1Nf0 2pw0 1cL0 1cN0 1cL0 1cN0 1cL0 1cQ0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|11e4",
+			"Europe/Vienna|CET CEST|-10 -20|0101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-2aFe0 11d0 1iO0 11A0 1o00 11A0 3KM0 14o0 LA00 6i00 WM0 1fA0 1cM0 1cM0 1cM0 400 2qM0 1a00 1cM0 1cM0 1io0 17c0 1gHa0 19X0 1cP0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|18e5",
+			"Europe/Vilnius|WMT KMT CET EET MSK CEST MSD EEST|-1o -1z.A -10 -20 -30 -20 -40 -30|012324525254646464646464646473737373737373737352537373737373737373737373737373737373737373737373737373737373737373737373|-293do 6ILM.o 1Ooz.A zz0 Mfd0 29W0 3is0 WM0 1fA0 1cM0 LV0 1tgL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cN0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11B0 1o00 11A0 1qM0 8io0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|54e4",
+			"Europe/Volgograd|LMT +03 +04 +05|-2V.E -30 -40 -50|01232323232323232121212121212121212121212121212121212121212121|-21IqV.E psLV.E 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 2pB0 1cM0 1cM0 1cM0 1fA0 1cM0 3Co0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0|10e5",
+			"Europe/Warsaw|WMT CET CEST EET EEST|-1o -10 -20 -20 -30|012121234312121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2ctdo 1LXo 11d0 1iO0 11A0 1o00 11A0 1on0 11A0 6zy0 HWP0 5IM0 WM0 1fA0 1cM0 1dz0 1mL0 1en0 15B0 1aq0 1nA0 11A0 1io0 17c0 1fA0 1a00 iDX0 LA0 1cM0 1cM0 1C00 Oo0 1cM0 1cM0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1C00 LA0 uso0 1a00 1fA0 1cM0 1cM0 1cM0 1fA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cN0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|17e5",
+			"Europe/Zaporozhye|+0220 EET MSK CEST CET MSD EEST|-2k -20 -30 -20 -10 -40 -30|01234342525252525252525252526161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161|-1Pc2k eUok rdb0 2RE0 WM0 1fA0 8m0 1v9a0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cK0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cQ0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|77e4",
+			"HST|HST|a0|0|",
+			"Indian/Chagos|LMT +05 +06|-4N.E -50 -60|012|-2xosN.E 3AGLN.E|30e2",
+			"Indian/Cocos|+0630|-6u|0||596",
+			"Indian/Kerguelen|-00 +05|0 -50|01|-MG00|130",
+			"Indian/Mahe|LMT +04|-3F.M -40|01|-2yO3F.M|79e3",
+			"Indian/Maldives|MMT +05|-4S -50|01|-olgS|35e4",
+			"Indian/Mauritius|LMT +04 +05|-3O -40 -50|012121|-2xorO 34unO 14L0 12kr0 11z0|15e4",
+			"Indian/Reunion|LMT +04|-3F.Q -40|01|-2mDDF.Q|84e4",
+			"Pacific/Kwajalein|+11 -12 +12|-b0 c0 -c0|012|-AX0 W9X0|14e3",
+			"MET|MET MEST|-10 -20|01010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-2aFe0 11d0 1iO0 11A0 1o00 11A0 Qrc0 6i00 WM0 1fA0 1cM0 1cM0 1cM0 16M0 1gMM0 1a00 1fA0 1cM0 1cM0 1cM0 1fA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00",
+			"MST|MST|70|0|",
+			"MST7MDT|MST MDT MWT MPT|70 60 60 60|010102301010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-261r0 1nX0 11B0 1nX0 SgN0 8x20 ix0 QwN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"Pacific/Chatham|+1215 +1245 +1345|-cf -cJ -dJ|012121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212|-WqAf 1adef IM0 1C00 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1qM0 14o0 1lc0 14o0 1lc0 14o0 1lc0 17c0 1io0 17c0 1io0 17c0 1io0 17c0 1lc0 14o0 1lc0 14o0 1lc0 17c0 1io0 17c0 1io0 17c0 1lc0 14o0 1lc0 14o0 1lc0 17c0 1io0 17c0 1io0 17c0 1io0 17c0 1io0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1io0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00|600",
+			"PST8PDT|PST PDT PWT PPT|80 70 70 70|010102301010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-261q0 1nX0 11B0 1nX0 SgN0 8x10 iy0 QwN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"Pacific/Apia|LMT -1130 -11 -10 +14 +13|bq.U bu b0 a0 -e0 -d0|01232345454545454545454545454545454545454545454545454545454|-2nDMx.4 1yW03.4 2rRbu 1ff0 1a00 CI0 AQ0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1io0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00|37e3",
+			"Pacific/Bougainville|+10 +09 +11|-a0 -90 -b0|0102|-16Wy0 7CN0 2MQp0|18e4",
+			"Pacific/Efate|LMT +11 +12|-bd.g -b0 -c0|0121212121212121212121|-2l9nd.g 2Szcd.g 1cL0 1oN0 10L0 1fB0 19X0 1fB0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1fB0 Lz0 1Nd0 An0|66e3",
+			"Pacific/Enderbury|-12 -11 +13|c0 b0 -d0|012|nIc0 B8n0|1",
+			"Pacific/Fakaofo|-11 +13|b0 -d0|01|1Gfn0|483",
+			"Pacific/Fiji|LMT +12 +13|-bT.I -c0 -d0|0121212121212121212121212121212121212121212121212121212121212121|-2bUzT.I 3m8NT.I LA0 1EM0 IM0 nJc0 LA0 1o00 Rc0 1wo0 Ao0 1Nc0 Ao0 1Q00 xz0 1SN0 uM0 1SM0 uM0 1VA0 s00 1VA0 s00 1VA0 uM0 1SM0 uM0 1SM0 uM0 1VA0 s00 1VA0 s00 1VA0 s00 1VA0 uM0 1SM0 uM0 1SM0 uM0 1VA0 s00 1VA0 s00 1VA0 uM0 1SM0 uM0 1SM0 uM0 1VA0 s00 1VA0 s00 1VA0 s00 1VA0 uM0 1SM0 uM0 1SM0 uM0|88e4",
+			"Pacific/Galapagos|LMT -05 -06|5W.o 50 60|01212|-1yVS1.A 2dTz1.A gNd0 rz0|25e3",
+			"Pacific/Gambier|LMT -09|8X.M 90|01|-2jof0.c|125",
+			"Pacific/Guadalcanal|LMT +11|-aD.M -b0|01|-2joyD.M|11e4",
+			"Pacific/Guam|GST ChST|-a0 -a0|01|1fpq0|17e4",
+			"Pacific/Honolulu|HST HDT HST|au 9u a0|010102|-1thLu 8x0 lef0 8Pz0 46p0|37e4",
+			"Pacific/Kiritimati|-1040 -10 +14|aE a0 -e0|012|nIaE B8nk|51e2",
+			"Pacific/Kosrae|+11 +12|-b0 -c0|010|-AX0 1bdz0|66e2",
+			"Pacific/Majuro|+11 +12|-b0 -c0|01|-AX0|28e3",
+			"Pacific/Marquesas|LMT -0930|9i 9u|01|-2joeG|86e2",
+			"Pacific/Pago_Pago|LMT SST|bm.M b0|01|-2nDMB.c|37e2",
+			"Pacific/Nauru|LMT +1130 +09 +12|-b7.E -bu -90 -c0|01213|-1Xdn7.E PvzB.E 5RCu 1ouJu|10e3",
+			"Pacific/Niue|-1120 -1130 -11|bk bu b0|012|-KfME 17y0a|12e2",
+			"Pacific/Norfolk|+1112 +1130 +1230 +11|-bc -bu -cu -b0|01213|-Kgbc W01G On0 1COp0|25e4",
+			"Pacific/Noumea|LMT +11 +12|-b5.M -b0 -c0|01212121|-2l9n5.M 2EqM5.M xX0 1PB0 yn0 HeP0 Ao0|98e3",
+			"Pacific/Pitcairn|-0830 -08|8u 80|01|18Vku|56",
+			"Pacific/Rarotonga|-1030 -0930 -10|au 9u a0|012121212121212121212121212|lyWu IL0 1zcu Onu 1zcu Onu 1zcu Rbu 1zcu Onu 1zcu Onu 1zcu Onu 1zcu Onu 1zcu Onu 1zcu Rbu 1zcu Onu 1zcu Onu 1zcu Onu|13e3",
+			"Pacific/Tahiti|LMT -10|9W.g a0|01|-2joe1.I|18e4",
+			"Pacific/Tongatapu|+1220 +13 +14|-ck -d0 -e0|0121212121|-1aB0k 2n5dk 15A0 1wo0 xz0 1Q10 xz0 zWN0 s00|75e3",
+			"WET|WET WEST|0 -10|010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|hDB0 1a00 1fA0 1cM0 1cM0 1cM0 1fA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00"
+		],
+		"links": [
+			"Africa/Abidjan|Africa/Bamako",
+			"Africa/Abidjan|Africa/Banjul",
+			"Africa/Abidjan|Africa/Conakry",
+			"Africa/Abidjan|Africa/Dakar",
+			"Africa/Abidjan|Africa/Freetown",
+			"Africa/Abidjan|Africa/Lome",
+			"Africa/Abidjan|Africa/Nouakchott",
+			"Africa/Abidjan|Africa/Ouagadougou",
+			"Africa/Abidjan|Africa/Sao_Tome",
+			"Africa/Abidjan|Africa/Timbuktu",
+			"Africa/Abidjan|Atlantic/St_Helena",
+			"Africa/Cairo|Egypt",
+			"Africa/Johannesburg|Africa/Maseru",
+			"Africa/Johannesburg|Africa/Mbabane",
+			"Africa/Lagos|Africa/Bangui",
+			"Africa/Lagos|Africa/Brazzaville",
+			"Africa/Lagos|Africa/Douala",
+			"Africa/Lagos|Africa/Kinshasa",
+			"Africa/Lagos|Africa/Libreville",
+			"Africa/Lagos|Africa/Luanda",
+			"Africa/Lagos|Africa/Malabo",
+			"Africa/Lagos|Africa/Niamey",
+			"Africa/Lagos|Africa/Porto-Novo",
+			"Africa/Maputo|Africa/Blantyre",
+			"Africa/Maputo|Africa/Bujumbura",
+			"Africa/Maputo|Africa/Gaborone",
+			"Africa/Maputo|Africa/Harare",
+			"Africa/Maputo|Africa/Kigali",
+			"Africa/Maputo|Africa/Lubumbashi",
+			"Africa/Maputo|Africa/Lusaka",
+			"Africa/Nairobi|Africa/Addis_Ababa",
+			"Africa/Nairobi|Africa/Asmara",
+			"Africa/Nairobi|Africa/Asmera",
+			"Africa/Nairobi|Africa/Dar_es_Salaam",
+			"Africa/Nairobi|Africa/Djibouti",
+			"Africa/Nairobi|Africa/Kampala",
+			"Africa/Nairobi|Africa/Mogadishu",
+			"Africa/Nairobi|Indian/Antananarivo",
+			"Africa/Nairobi|Indian/Comoro",
+			"Africa/Nairobi|Indian/Mayotte",
+			"Africa/Tripoli|Libya",
+			"America/Adak|America/Atka",
+			"America/Adak|US/Aleutian",
+			"America/Anchorage|US/Alaska",
+			"America/Argentina/Buenos_Aires|America/Buenos_Aires",
+			"America/Argentina/Catamarca|America/Argentina/ComodRivadavia",
+			"America/Argentina/Catamarca|America/Catamarca",
+			"America/Argentina/Cordoba|America/Cordoba",
+			"America/Argentina/Cordoba|America/Rosario",
+			"America/Argentina/Jujuy|America/Jujuy",
+			"America/Argentina/Mendoza|America/Mendoza",
+			"America/Atikokan|America/Coral_Harbour",
+			"America/Chicago|US/Central",
+			"America/Curacao|America/Aruba",
+			"America/Curacao|America/Kralendijk",
+			"America/Curacao|America/Lower_Princes",
+			"America/Denver|America/Shiprock",
+			"America/Denver|Navajo",
+			"America/Denver|US/Mountain",
+			"America/Detroit|US/Michigan",
+			"America/Edmonton|Canada/Mountain",
+			"America/Fort_Wayne|America/Indiana/Indianapolis",
+			"America/Fort_Wayne|America/Indianapolis",
+			"America/Fort_Wayne|US/East-Indiana",
+			"America/Halifax|Canada/Atlantic",
+			"America/Havana|Cuba",
+			"America/Indiana/Knox|America/Knox_IN",
+			"America/Indiana/Knox|US/Indiana-Starke",
+			"America/Jamaica|Jamaica",
+			"America/Kentucky/Louisville|America/Louisville",
+			"America/Los_Angeles|US/Pacific",
+			"America/Los_Angeles|US/Pacific-New",
+			"America/Manaus|Brazil/West",
+			"America/Mazatlan|Mexico/BajaSur",
+			"America/Mexico_City|Mexico/General",
+			"America/New_York|US/Eastern",
+			"America/Noronha|Brazil/DeNoronha",
+			"America/Panama|America/Cayman",
+			"America/Phoenix|US/Arizona",
+			"America/Port_of_Spain|America/Anguilla",
+			"America/Port_of_Spain|America/Antigua",
+			"America/Port_of_Spain|America/Dominica",
+			"America/Port_of_Spain|America/Grenada",
+			"America/Port_of_Spain|America/Guadeloupe",
+			"America/Port_of_Spain|America/Marigot",
+			"America/Port_of_Spain|America/Montserrat",
+			"America/Port_of_Spain|America/St_Barthelemy",
+			"America/Port_of_Spain|America/St_Kitts",
+			"America/Port_of_Spain|America/St_Lucia",
+			"America/Port_of_Spain|America/St_Thomas",
+			"America/Port_of_Spain|America/St_Vincent",
+			"America/Port_of_Spain|America/Tortola",
+			"America/Port_of_Spain|America/Virgin",
+			"America/Regina|Canada/Saskatchewan",
+			"America/Rio_Branco|America/Porto_Acre",
+			"America/Rio_Branco|Brazil/Acre",
+			"America/Santiago|Chile/Continental",
+			"America/Sao_Paulo|Brazil/East",
+			"America/St_Johns|Canada/Newfoundland",
+			"America/Tijuana|America/Ensenada",
+			"America/Tijuana|America/Santa_Isabel",
+			"America/Tijuana|Mexico/BajaNorte",
+			"America/Toronto|America/Montreal",
+			"America/Toronto|Canada/Eastern",
+			"America/Vancouver|Canada/Pacific",
+			"America/Whitehorse|Canada/Yukon",
+			"America/Winnipeg|Canada/Central",
+			"Asia/Ashgabat|Asia/Ashkhabad",
+			"Asia/Bangkok|Asia/Phnom_Penh",
+			"Asia/Bangkok|Asia/Vientiane",
+			"Asia/Dhaka|Asia/Dacca",
+			"Asia/Dubai|Asia/Muscat",
+			"Asia/Ho_Chi_Minh|Asia/Saigon",
+			"Asia/Hong_Kong|Hongkong",
+			"Asia/Jerusalem|Asia/Tel_Aviv",
+			"Asia/Jerusalem|Israel",
+			"Asia/Kathmandu|Asia/Katmandu",
+			"Asia/Kolkata|Asia/Calcutta",
+			"Asia/Kuala_Lumpur|Asia/Singapore",
+			"Asia/Kuala_Lumpur|Singapore",
+			"Asia/Macau|Asia/Macao",
+			"Asia/Makassar|Asia/Ujung_Pandang",
+			"Asia/Nicosia|Europe/Nicosia",
+			"Asia/Qatar|Asia/Bahrain",
+			"Asia/Rangoon|Asia/Yangon",
+			"Asia/Riyadh|Asia/Aden",
+			"Asia/Riyadh|Asia/Kuwait",
+			"Asia/Seoul|ROK",
+			"Asia/Shanghai|Asia/Chongqing",
+			"Asia/Shanghai|Asia/Chungking",
+			"Asia/Shanghai|Asia/Harbin",
+			"Asia/Shanghai|PRC",
+			"Asia/Taipei|ROC",
+			"Asia/Tehran|Iran",
+			"Asia/Thimphu|Asia/Thimbu",
+			"Asia/Tokyo|Japan",
+			"Asia/Ulaanbaatar|Asia/Ulan_Bator",
+			"Asia/Urumqi|Asia/Kashgar",
+			"Atlantic/Faroe|Atlantic/Faeroe",
+			"Atlantic/Reykjavik|Iceland",
+			"Atlantic/South_Georgia|Etc/GMT+2",
+			"Australia/Adelaide|Australia/South",
+			"Australia/Brisbane|Australia/Queensland",
+			"Australia/Broken_Hill|Australia/Yancowinna",
+			"Australia/Darwin|Australia/North",
+			"Australia/Hobart|Australia/Tasmania",
+			"Australia/Lord_Howe|Australia/LHI",
+			"Australia/Melbourne|Australia/Victoria",
+			"Australia/Perth|Australia/West",
+			"Australia/Sydney|Australia/ACT",
+			"Australia/Sydney|Australia/Canberra",
+			"Australia/Sydney|Australia/NSW",
+			"Etc/GMT+0|Etc/GMT",
+			"Etc/GMT+0|Etc/GMT-0",
+			"Etc/GMT+0|Etc/GMT0",
+			"Etc/GMT+0|Etc/Greenwich",
+			"Etc/GMT+0|GMT",
+			"Etc/GMT+0|GMT+0",
+			"Etc/GMT+0|GMT-0",
+			"Etc/GMT+0|GMT0",
+			"Etc/GMT+0|Greenwich",
+			"Etc/UCT|UCT",
+			"Etc/UTC|Etc/Universal",
+			"Etc/UTC|Etc/Zulu",
+			"Etc/UTC|UTC",
+			"Etc/UTC|Universal",
+			"Etc/UTC|Zulu",
+			"Europe/Belgrade|Europe/Ljubljana",
+			"Europe/Belgrade|Europe/Podgorica",
+			"Europe/Belgrade|Europe/Sarajevo",
+			"Europe/Belgrade|Europe/Skopje",
+			"Europe/Belgrade|Europe/Zagreb",
+			"Europe/Chisinau|Europe/Tiraspol",
+			"Europe/Dublin|Eire",
+			"Europe/Helsinki|Europe/Mariehamn",
+			"Europe/Istanbul|Asia/Istanbul",
+			"Europe/Istanbul|Turkey",
+			"Europe/Lisbon|Portugal",
+			"Europe/London|Europe/Belfast",
+			"Europe/London|Europe/Guernsey",
+			"Europe/London|Europe/Isle_of_Man",
+			"Europe/London|Europe/Jersey",
+			"Europe/London|GB",
+			"Europe/London|GB-Eire",
+			"Europe/Moscow|W-SU",
+			"Europe/Oslo|Arctic/Longyearbyen",
+			"Europe/Oslo|Atlantic/Jan_Mayen",
+			"Europe/Prague|Europe/Bratislava",
+			"Europe/Rome|Europe/San_Marino",
+			"Europe/Rome|Europe/Vatican",
+			"Europe/Warsaw|Poland",
+			"Europe/Zurich|Europe/Busingen",
+			"Europe/Zurich|Europe/Vaduz",
+			"Indian/Christmas|Etc/GMT-7",
+			"Pacific/Auckland|Antarctica/McMurdo",
+			"Pacific/Auckland|Antarctica/South_Pole",
+			"Pacific/Auckland|NZ",
+			"Pacific/Chatham|NZ-CHAT",
+			"Pacific/Easter|Chile/EasterIsland",
+			"Pacific/Guam|Pacific/Saipan",
+			"Pacific/Honolulu|Pacific/Johnston",
+			"Pacific/Honolulu|US/Hawaii",
+			"Pacific/Kwajalein|Kwajalein",
+			"Pacific/Pago_Pago|Pacific/Midway",
+			"Pacific/Pago_Pago|Pacific/Samoa",
+			"Pacific/Pago_Pago|US/Samoa",
+			"Pacific/Palau|Etc/GMT-9",
+			"Pacific/Pohnpei|Etc/GMT-11",
+			"Pacific/Pohnpei|Pacific/Ponape",
+			"Pacific/Port_Moresby|Etc/GMT-10",
+			"Pacific/Port_Moresby|Pacific/Chuuk",
+			"Pacific/Port_Moresby|Pacific/Truk",
+			"Pacific/Port_Moresby|Pacific/Yap",
+			"Pacific/Tarawa|Etc/GMT-12",
+			"Pacific/Tarawa|Pacific/Funafuti",
+			"Pacific/Tarawa|Pacific/Wake",
+			"Pacific/Tarawa|Pacific/Wallis"
+		]
+	});
+
+
+	return moment;
+}));
diff --git a/lib/javascripts/moment.js b/lib/javascripts/moment.js
index a9947fb6934..96dce94b108 100644
--- a/lib/javascripts/moment.js
+++ b/lib/javascripts/moment.js
@@ -1,8 +1,8 @@
 //! moment.js
-//! version : 2.18.1
-//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
+//! version : 2.22.1
+//! Copyright (c) JS Foundation and other contributors
 //! license : MIT
-//! momentjs.com
+//! github.com/moment/moment
 
 ;(function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
@@ -10,4454 +10,4501 @@
     global.moment = factory()
 }(this, (function () { 'use strict';
 
-var hookCallback;
+    var hookCallback;
 
-function hooks () {
-    return hookCallback.apply(null, arguments);
-}
-
-// This is done to register the method called with moment()
-// without creating circular dependencies.
-function setHookCallback (callback) {
-    hookCallback = callback;
-}
-
-function isArray(input) {
-    return input instanceof Array || Object.prototype.toString.call(input) === '[object Array]';
-}
-
-function isObject(input) {
-    // IE8 will treat undefined and null as object if it wasn't for
-    // input != null
-    return input != null && Object.prototype.toString.call(input) === '[object Object]';
-}
-
-function isObjectEmpty(obj) {
-    var k;
-    for (k in obj) {
-        // even if its not own property I'd still call it non-empty
-        return false;
+    function hooks () {
+        return hookCallback.apply(null, arguments);
     }
-    return true;
-}
 
-function isUndefined(input) {
-    return input === void 0;
-}
-
-function isNumber(input) {
-    return typeof input === 'number' || Object.prototype.toString.call(input) === '[object Number]';
-}
-
-function isDate(input) {
-    return input instanceof Date || Object.prototype.toString.call(input) === '[object Date]';
-}
-
-function map(arr, fn) {
-    var res = [], i;
-    for (i = 0; i < arr.length; ++i) {
-        res.push(fn(arr[i], i));
+    // This is done to register the method called with moment()
+    // without creating circular dependencies.
+    function setHookCallback (callback) {
+        hookCallback = callback;
     }
-    return res;
-}
 
-function hasOwnProp(a, b) {
-    return Object.prototype.hasOwnProperty.call(a, b);
-}
+    function isArray(input) {
+        return input instanceof Array || Object.prototype.toString.call(input) === '[object Array]';
+    }
 
-function extend(a, b) {
-    for (var i in b) {
-        if (hasOwnProp(b, i)) {
-            a[i] = b[i];
+    function isObject(input) {
+        // IE8 will treat undefined and null as object if it wasn't for
+        // input != null
+        return input != null && Object.prototype.toString.call(input) === '[object Object]';
+    }
+
+    function isObjectEmpty(obj) {
+        if (Object.getOwnPropertyNames) {
+            return (Object.getOwnPropertyNames(obj).length === 0);
+        } else {
+            var k;
+            for (k in obj) {
+                if (obj.hasOwnProperty(k)) {
+                    return false;
+                }
+            }
+            return true;
         }
     }
 
-    if (hasOwnProp(b, 'toString')) {
-        a.toString = b.toString;
+    function isUndefined(input) {
+        return input === void 0;
     }
 
-    if (hasOwnProp(b, 'valueOf')) {
-        a.valueOf = b.valueOf;
+    function isNumber(input) {
+        return typeof input === 'number' || Object.prototype.toString.call(input) === '[object Number]';
     }
 
-    return a;
-}
-
-function createUTC (input, format, locale, strict) {
-    return createLocalOrUTC(input, format, locale, strict, true).utc();
-}
-
-function defaultParsingFlags() {
-    // We need to deep clone this object.
-    return {
-        empty           : false,
-        unusedTokens    : [],
-        unusedInput     : [],
-        overflow        : -2,
-        charsLeftOver   : 0,
-        nullInput       : false,
-        invalidMonth    : null,
-        invalidFormat   : false,
-        userInvalidated : false,
-        iso             : false,
-        parsedDateParts : [],
-        meridiem        : null,
-        rfc2822         : false,
-        weekdayMismatch : false
-    };
-}
-
-function getParsingFlags(m) {
-    if (m._pf == null) {
-        m._pf = defaultParsingFlags();
+    function isDate(input) {
+        return input instanceof Date || Object.prototype.toString.call(input) === '[object Date]';
     }
-    return m._pf;
-}
 
-var some;
-if (Array.prototype.some) {
-    some = Array.prototype.some;
-} else {
-    some = function (fun) {
-        var t = Object(this);
-        var len = t.length >>> 0;
+    function map(arr, fn) {
+        var res = [], i;
+        for (i = 0; i < arr.length; ++i) {
+            res.push(fn(arr[i], i));
+        }
+        return res;
+    }
 
-        for (var i = 0; i < len; i++) {
-            if (i in t && fun.call(this, t[i], i, t)) {
-                return true;
+    function hasOwnProp(a, b) {
+        return Object.prototype.hasOwnProperty.call(a, b);
+    }
+
+    function extend(a, b) {
+        for (var i in b) {
+            if (hasOwnProp(b, i)) {
+                a[i] = b[i];
             }
         }
 
-        return false;
-    };
-}
-
-var some$1 = some;
-
-function isValid(m) {
-    if (m._isValid == null) {
-        var flags = getParsingFlags(m);
-        var parsedParts = some$1.call(flags.parsedDateParts, function (i) {
-            return i != null;
-        });
-        var isNowValid = !isNaN(m._d.getTime()) &&
-            flags.overflow < 0 &&
-            !flags.empty &&
-            !flags.invalidMonth &&
-            !flags.invalidWeekday &&
-            !flags.nullInput &&
-            !flags.invalidFormat &&
-            !flags.userInvalidated &&
-            (!flags.meridiem || (flags.meridiem && parsedParts));
-
-        if (m._strict) {
-            isNowValid = isNowValid &&
-                flags.charsLeftOver === 0 &&
-                flags.unusedTokens.length === 0 &&
-                flags.bigHour === undefined;
+        if (hasOwnProp(b, 'toString')) {
+            a.toString = b.toString;
         }
 
-        if (Object.isFrozen == null || !Object.isFrozen(m)) {
-            m._isValid = isNowValid;
+        if (hasOwnProp(b, 'valueOf')) {
+            a.valueOf = b.valueOf;
+        }
+
+        return a;
+    }
+
+    function createUTC (input, format, locale, strict) {
+        return createLocalOrUTC(input, format, locale, strict, true).utc();
+    }
+
+    function defaultParsingFlags() {
+        // We need to deep clone this object.
+        return {
+            empty           : false,
+            unusedTokens    : [],
+            unusedInput     : [],
+            overflow        : -2,
+            charsLeftOver   : 0,
+            nullInput       : false,
+            invalidMonth    : null,
+            invalidFormat   : false,
+            userInvalidated : false,
+            iso             : false,
+            parsedDateParts : [],
+            meridiem        : null,
+            rfc2822         : false,
+            weekdayMismatch : false
+        };
+    }
+
+    function getParsingFlags(m) {
+        if (m._pf == null) {
+            m._pf = defaultParsingFlags();
+        }
+        return m._pf;
+    }
+
+    var some;
+    if (Array.prototype.some) {
+        some = Array.prototype.some;
+    } else {
+        some = function (fun) {
+            var t = Object(this);
+            var len = t.length >>> 0;
+
+            for (var i = 0; i < len; i++) {
+                if (i in t && fun.call(this, t[i], i, t)) {
+                    return true;
+                }
+            }
+
+            return false;
+        };
+    }
+
+    function isValid(m) {
+        if (m._isValid == null) {
+            var flags = getParsingFlags(m);
+            var parsedParts = some.call(flags.parsedDateParts, function (i) {
+                return i != null;
+            });
+            var isNowValid = !isNaN(m._d.getTime()) &&
+                flags.overflow < 0 &&
+                !flags.empty &&
+                !flags.invalidMonth &&
+                !flags.invalidWeekday &&
+                !flags.weekdayMismatch &&
+                !flags.nullInput &&
+                !flags.invalidFormat &&
+                !flags.userInvalidated &&
+                (!flags.meridiem || (flags.meridiem && parsedParts));
+
+            if (m._strict) {
+                isNowValid = isNowValid &&
+                    flags.charsLeftOver === 0 &&
+                    flags.unusedTokens.length === 0 &&
+                    flags.bigHour === undefined;
+            }
+
+            if (Object.isFrozen == null || !Object.isFrozen(m)) {
+                m._isValid = isNowValid;
+            }
+            else {
+                return isNowValid;
+            }
+        }
+        return m._isValid;
+    }
+
+    function createInvalid (flags) {
+        var m = createUTC(NaN);
+        if (flags != null) {
+            extend(getParsingFlags(m), flags);
         }
         else {
-            return isNowValid;
+            getParsingFlags(m).userInvalidated = true;
         }
-    }
-    return m._isValid;
-}
 
-function createInvalid (flags) {
-    var m = createUTC(NaN);
-    if (flags != null) {
-        extend(getParsingFlags(m), flags);
-    }
-    else {
-        getParsingFlags(m).userInvalidated = true;
+        return m;
     }
 
-    return m;
-}
+    // Plugins that add properties should also add the key here (null value),
+    // so we can properly clone ourselves.
+    var momentProperties = hooks.momentProperties = [];
 
-// Plugins that add properties should also add the key here (null value),
-// so we can properly clone ourselves.
-var momentProperties = hooks.momentProperties = [];
+    function copyConfig(to, from) {
+        var i, prop, val;
 
-function copyConfig(to, from) {
-    var i, prop, val;
-
-    if (!isUndefined(from._isAMomentObject)) {
-        to._isAMomentObject = from._isAMomentObject;
-    }
-    if (!isUndefined(from._i)) {
-        to._i = from._i;
-    }
-    if (!isUndefined(from._f)) {
-        to._f = from._f;
-    }
-    if (!isUndefined(from._l)) {
-        to._l = from._l;
-    }
-    if (!isUndefined(from._strict)) {
-        to._strict = from._strict;
-    }
-    if (!isUndefined(from._tzm)) {
-        to._tzm = from._tzm;
-    }
-    if (!isUndefined(from._isUTC)) {
-        to._isUTC = from._isUTC;
-    }
-    if (!isUndefined(from._offset)) {
-        to._offset = from._offset;
-    }
-    if (!isUndefined(from._pf)) {
-        to._pf = getParsingFlags(from);
-    }
-    if (!isUndefined(from._locale)) {
-        to._locale = from._locale;
-    }
-
-    if (momentProperties.length > 0) {
-        for (i = 0; i < momentProperties.length; i++) {
-            prop = momentProperties[i];
-            val = from[prop];
-            if (!isUndefined(val)) {
-                to[prop] = val;
-            }
+        if (!isUndefined(from._isAMomentObject)) {
+            to._isAMomentObject = from._isAMomentObject;
         }
-    }
-
-    return to;
-}
-
-var updateInProgress = false;
-
-// Moment prototype object
-function Moment(config) {
-    copyConfig(this, config);
-    this._d = new Date(config._d != null ? config._d.getTime() : NaN);
-    if (!this.isValid()) {
-        this._d = new Date(NaN);
-    }
-    // Prevent infinite loop in case updateOffset creates new moment
-    // objects.
-    if (updateInProgress === false) {
-        updateInProgress = true;
-        hooks.updateOffset(this);
-        updateInProgress = false;
-    }
-}
-
-function isMoment (obj) {
-    return obj instanceof Moment || (obj != null && obj._isAMomentObject != null);
-}
-
-function absFloor (number) {
-    if (number < 0) {
-        // -0 -> 0
-        return Math.ceil(number) || 0;
-    } else {
-        return Math.floor(number);
-    }
-}
-
-function toInt(argumentForCoercion) {
-    var coercedNumber = +argumentForCoercion,
-        value = 0;
-
-    if (coercedNumber !== 0 && isFinite(coercedNumber)) {
-        value = absFloor(coercedNumber);
-    }
-
-    return value;
-}
-
-// compare two arrays, return the number of differences
-function compareArrays(array1, array2, dontConvert) {
-    var len = Math.min(array1.length, array2.length),
-        lengthDiff = Math.abs(array1.length - array2.length),
-        diffs = 0,
-        i;
-    for (i = 0; i < len; i++) {
-        if ((dontConvert && array1[i] !== array2[i]) ||
-            (!dontConvert && toInt(array1[i]) !== toInt(array2[i]))) {
-            diffs++;
+        if (!isUndefined(from._i)) {
+            to._i = from._i;
         }
-    }
-    return diffs + lengthDiff;
-}
-
-function warn(msg) {
-    if (hooks.suppressDeprecationWarnings === false &&
-            (typeof console !==  'undefined') && console.warn) {
-        console.warn('Deprecation warning: ' + msg);
-    }
-}
-
-function deprecate(msg, fn) {
-    var firstTime = true;
-
-    return extend(function () {
-        if (hooks.deprecationHandler != null) {
-            hooks.deprecationHandler(null, msg);
+        if (!isUndefined(from._f)) {
+            to._f = from._f;
         }
-        if (firstTime) {
-            var args = [];
-            var arg;
-            for (var i = 0; i < arguments.length; i++) {
-                arg = '';
-                if (typeof arguments[i] === 'object') {
-                    arg += '\n[' + i + '] ';
-                    for (var key in arguments[0]) {
-                        arg += key + ': ' + arguments[0][key] + ', ';
-                    }
-                    arg = arg.slice(0, -2); // Remove trailing comma and space
-                } else {
-                    arg = arguments[i];
+        if (!isUndefined(from._l)) {
+            to._l = from._l;
+        }
+        if (!isUndefined(from._strict)) {
+            to._strict = from._strict;
+        }
+        if (!isUndefined(from._tzm)) {
+            to._tzm = from._tzm;
+        }
+        if (!isUndefined(from._isUTC)) {
+            to._isUTC = from._isUTC;
+        }
+        if (!isUndefined(from._offset)) {
+            to._offset = from._offset;
+        }
+        if (!isUndefined(from._pf)) {
+            to._pf = getParsingFlags(from);
+        }
+        if (!isUndefined(from._locale)) {
+            to._locale = from._locale;
+        }
+
+        if (momentProperties.length > 0) {
+            for (i = 0; i < momentProperties.length; i++) {
+                prop = momentProperties[i];
+                val = from[prop];
+                if (!isUndefined(val)) {
+                    to[prop] = val;
                 }
-                args.push(arg);
             }
-            warn(msg + '\nArguments: ' + Array.prototype.slice.call(args).join('') + '\n' + (new Error()).stack);
-            firstTime = false;
         }
-        return fn.apply(this, arguments);
-    }, fn);
-}
 
-var deprecations = {};
-
-function deprecateSimple(name, msg) {
-    if (hooks.deprecationHandler != null) {
-        hooks.deprecationHandler(name, msg);
+        return to;
     }
-    if (!deprecations[name]) {
-        warn(msg);
-        deprecations[name] = true;
+
+    var updateInProgress = false;
+
+    // Moment prototype object
+    function Moment(config) {
+        copyConfig(this, config);
+        this._d = new Date(config._d != null ? config._d.getTime() : NaN);
+        if (!this.isValid()) {
+            this._d = new Date(NaN);
+        }
+        // Prevent infinite loop in case updateOffset creates new moment
+        // objects.
+        if (updateInProgress === false) {
+            updateInProgress = true;
+            hooks.updateOffset(this);
+            updateInProgress = false;
+        }
     }
-}
 
-hooks.suppressDeprecationWarnings = false;
-hooks.deprecationHandler = null;
+    function isMoment (obj) {
+        return obj instanceof Moment || (obj != null && obj._isAMomentObject != null);
+    }
 
-function isFunction(input) {
-    return input instanceof Function || Object.prototype.toString.call(input) === '[object Function]';
-}
-
-function set (config) {
-    var prop, i;
-    for (i in config) {
-        prop = config[i];
-        if (isFunction(prop)) {
-            this[i] = prop;
+    function absFloor (number) {
+        if (number < 0) {
+            // -0 -> 0
+            return Math.ceil(number) || 0;
         } else {
-            this['_' + i] = prop;
+            return Math.floor(number);
         }
     }
-    this._config = config;
-    // Lenient ordinal parsing accepts just a number in addition to
-    // number + (possibly) stuff coming from _dayOfMonthOrdinalParse.
-    // TODO: Remove "ordinalParse" fallback in next major release.
-    this._dayOfMonthOrdinalParseLenient = new RegExp(
-        (this._dayOfMonthOrdinalParse.source || this._ordinalParse.source) +
-            '|' + (/\d{1,2}/).source);
-}
 
-function mergeConfigs(parentConfig, childConfig) {
-    var res = extend({}, parentConfig), prop;
-    for (prop in childConfig) {
-        if (hasOwnProp(childConfig, prop)) {
-            if (isObject(parentConfig[prop]) && isObject(childConfig[prop])) {
-                res[prop] = {};
-                extend(res[prop], parentConfig[prop]);
-                extend(res[prop], childConfig[prop]);
-            } else if (childConfig[prop] != null) {
-                res[prop] = childConfig[prop];
-            } else {
-                delete res[prop];
+    function toInt(argumentForCoercion) {
+        var coercedNumber = +argumentForCoercion,
+            value = 0;
+
+        if (coercedNumber !== 0 && isFinite(coercedNumber)) {
+            value = absFloor(coercedNumber);
+        }
+
+        return value;
+    }
+
+    // compare two arrays, return the number of differences
+    function compareArrays(array1, array2, dontConvert) {
+        var len = Math.min(array1.length, array2.length),
+            lengthDiff = Math.abs(array1.length - array2.length),
+            diffs = 0,
+            i;
+        for (i = 0; i < len; i++) {
+            if ((dontConvert && array1[i] !== array2[i]) ||
+                (!dontConvert && toInt(array1[i]) !== toInt(array2[i]))) {
+                diffs++;
             }
         }
+        return diffs + lengthDiff;
     }
-    for (prop in parentConfig) {
-        if (hasOwnProp(parentConfig, prop) &&
-                !hasOwnProp(childConfig, prop) &&
-                isObject(parentConfig[prop])) {
-            // make sure changes to properties don't modify parent config
-            res[prop] = extend({}, res[prop]);
+
+    function warn(msg) {
+        if (hooks.suppressDeprecationWarnings === false &&
+                (typeof console !==  'undefined') && console.warn) {
+            console.warn('Deprecation warning: ' + msg);
         }
     }
-    return res;
-}
 
-function Locale(config) {
-    if (config != null) {
-        this.set(config);
+    function deprecate(msg, fn) {
+        var firstTime = true;
+
+        return extend(function () {
+            if (hooks.deprecationHandler != null) {
+                hooks.deprecationHandler(null, msg);
+            }
+            if (firstTime) {
+                var args = [];
+                var arg;
+                for (var i = 0; i < arguments.length; i++) {
+                    arg = '';
+                    if (typeof arguments[i] === 'object') {
+                        arg += '\n[' + i + '] ';
+                        for (var key in arguments[0]) {
+                            arg += key + ': ' + arguments[0][key] + ', ';
+                        }
+                        arg = arg.slice(0, -2); // Remove trailing comma and space
+                    } else {
+                        arg = arguments[i];
+                    }
+                    args.push(arg);
+                }
+                warn(msg + '\nArguments: ' + Array.prototype.slice.call(args).join('') + '\n' + (new Error()).stack);
+                firstTime = false;
+            }
+            return fn.apply(this, arguments);
+        }, fn);
     }
-}
 
-var keys;
+    var deprecations = {};
 
-if (Object.keys) {
-    keys = Object.keys;
-} else {
-    keys = function (obj) {
-        var i, res = [];
-        for (i in obj) {
-            if (hasOwnProp(obj, i)) {
-                res.push(i);
+    function deprecateSimple(name, msg) {
+        if (hooks.deprecationHandler != null) {
+            hooks.deprecationHandler(name, msg);
+        }
+        if (!deprecations[name]) {
+            warn(msg);
+            deprecations[name] = true;
+        }
+    }
+
+    hooks.suppressDeprecationWarnings = false;
+    hooks.deprecationHandler = null;
+
+    function isFunction(input) {
+        return input instanceof Function || Object.prototype.toString.call(input) === '[object Function]';
+    }
+
+    function set (config) {
+        var prop, i;
+        for (i in config) {
+            prop = config[i];
+            if (isFunction(prop)) {
+                this[i] = prop;
+            } else {
+                this['_' + i] = prop;
+            }
+        }
+        this._config = config;
+        // Lenient ordinal parsing accepts just a number in addition to
+        // number + (possibly) stuff coming from _dayOfMonthOrdinalParse.
+        // TODO: Remove "ordinalParse" fallback in next major release.
+        this._dayOfMonthOrdinalParseLenient = new RegExp(
+            (this._dayOfMonthOrdinalParse.source || this._ordinalParse.source) +
+                '|' + (/\d{1,2}/).source);
+    }
+
+    function mergeConfigs(parentConfig, childConfig) {
+        var res = extend({}, parentConfig), prop;
+        for (prop in childConfig) {
+            if (hasOwnProp(childConfig, prop)) {
+                if (isObject(parentConfig[prop]) && isObject(childConfig[prop])) {
+                    res[prop] = {};
+                    extend(res[prop], parentConfig[prop]);
+                    extend(res[prop], childConfig[prop]);
+                } else if (childConfig[prop] != null) {
+                    res[prop] = childConfig[prop];
+                } else {
+                    delete res[prop];
+                }
+            }
+        }
+        for (prop in parentConfig) {
+            if (hasOwnProp(parentConfig, prop) &&
+                    !hasOwnProp(childConfig, prop) &&
+                    isObject(parentConfig[prop])) {
+                // make sure changes to properties don't modify parent config
+                res[prop] = extend({}, res[prop]);
             }
         }
         return res;
+    }
+
+    function Locale(config) {
+        if (config != null) {
+            this.set(config);
+        }
+    }
+
+    var keys;
+
+    if (Object.keys) {
+        keys = Object.keys;
+    } else {
+        keys = function (obj) {
+            var i, res = [];
+            for (i in obj) {
+                if (hasOwnProp(obj, i)) {
+                    res.push(i);
+                }
+            }
+            return res;
+        };
+    }
+
+    var defaultCalendar = {
+        sameDay : '[Today at] LT',
+        nextDay : '[Tomorrow at] LT',
+        nextWeek : 'dddd [at] LT',
+        lastDay : '[Yesterday at] LT',
+        lastWeek : '[Last] dddd [at] LT',
+        sameElse : 'L'
     };
-}
 
-var keys$1 = keys;
+    function calendar (key, mom, now) {
+        var output = this._calendar[key] || this._calendar['sameElse'];
+        return isFunction(output) ? output.call(mom, now) : output;
+    }
 
-var defaultCalendar = {
-    sameDay : '[Today at] LT',
-    nextDay : '[Tomorrow at] LT',
-    nextWeek : 'dddd [at] LT',
-    lastDay : '[Yesterday at] LT',
-    lastWeek : '[Last] dddd [at] LT',
-    sameElse : 'L'
-};
+    var defaultLongDateFormat = {
+        LTS  : 'h:mm:ss A',
+        LT   : 'h:mm A',
+        L    : 'MM/DD/YYYY',
+        LL   : 'MMMM D, YYYY',
+        LLL  : 'MMMM D, YYYY h:mm A',
+        LLLL : 'dddd, MMMM D, YYYY h:mm A'
+    };
 
-function calendar (key, mom, now) {
-    var output = this._calendar[key] || this._calendar['sameElse'];
-    return isFunction(output) ? output.call(mom, now) : output;
-}
+    function longDateFormat (key) {
+        var format = this._longDateFormat[key],
+            formatUpper = this._longDateFormat[key.toUpperCase()];
 
-var defaultLongDateFormat = {
-    LTS  : 'h:mm:ss A',
-    LT   : 'h:mm A',
-    L    : 'MM/DD/YYYY',
-    LL   : 'MMMM D, YYYY',
-    LLL  : 'MMMM D, YYYY h:mm A',
-    LLLL : 'dddd, MMMM D, YYYY h:mm A'
-};
+        if (format || !formatUpper) {
+            return format;
+        }
 
-function longDateFormat (key) {
-    var format = this._longDateFormat[key],
-        formatUpper = this._longDateFormat[key.toUpperCase()];
+        this._longDateFormat[key] = formatUpper.replace(/MMMM|MM|DD|dddd/g, function (val) {
+            return val.slice(1);
+        });
+
+        return this._longDateFormat[key];
+    }
+
+    var defaultInvalidDate = 'Invalid date';
+
+    function invalidDate () {
+        return this._invalidDate;
+    }
+
+    var defaultOrdinal = '%d';
+    var defaultDayOfMonthOrdinalParse = /\d{1,2}/;
+
+    function ordinal (number) {
+        return this._ordinal.replace('%d', number);
+    }
+
+    var defaultRelativeTime = {
+        future : 'in %s',
+        past   : '%s ago',
+        s  : 'a few seconds',
+        ss : '%d seconds',
+        m  : 'a minute',
+        mm : '%d minutes',
+        h  : 'an hour',
+        hh : '%d hours',
+        d  : 'a day',
+        dd : '%d days',
+        M  : 'a month',
+        MM : '%d months',
+        y  : 'a year',
+        yy : '%d years'
+    };
+
+    function relativeTime (number, withoutSuffix, string, isFuture) {
+        var output = this._relativeTime[string];
+        return (isFunction(output)) ?
+            output(number, withoutSuffix, string, isFuture) :
+            output.replace(/%d/i, number);
+    }
+
+    function pastFuture (diff, output) {
+        var format = this._relativeTime[diff > 0 ? 'future' : 'past'];
+        return isFunction(format) ? format(output) : format.replace(/%s/i, output);
+    }
+
+    var aliases = {};
+
+    function addUnitAlias (unit, shorthand) {
+        var lowerCase = unit.toLowerCase();
+        aliases[lowerCase] = aliases[lowerCase + 's'] = aliases[shorthand] = unit;
+    }
+
+    function normalizeUnits(units) {
+        return typeof units === 'string' ? aliases[units] || aliases[units.toLowerCase()] : undefined;
+    }
+
+    function normalizeObjectUnits(inputObject) {
+        var normalizedInput = {},
+            normalizedProp,
+            prop;
+
+        for (prop in inputObject) {
+            if (hasOwnProp(inputObject, prop)) {
+                normalizedProp = normalizeUnits(prop);
+                if (normalizedProp) {
+                    normalizedInput[normalizedProp] = inputObject[prop];
+                }
+            }
+        }
+
+        return normalizedInput;
+    }
+
+    var priorities = {};
+
+    function addUnitPriority(unit, priority) {
+        priorities[unit] = priority;
+    }
+
+    function getPrioritizedUnits(unitsObj) {
+        var units = [];
+        for (var u in unitsObj) {
+            units.push({unit: u, priority: priorities[u]});
+        }
+        units.sort(function (a, b) {
+            return a.priority - b.priority;
+        });
+        return units;
+    }
+
+    function zeroFill(number, targetLength, forceSign) {
+        var absNumber = '' + Math.abs(number),
+            zerosToFill = targetLength - absNumber.length,
+            sign = number >= 0;
+        return (sign ? (forceSign ? '+' : '') : '-') +
+            Math.pow(10, Math.max(0, zerosToFill)).toString().substr(1) + absNumber;
+    }
+
+    var formattingTokens = /(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g;
+
+    var localFormattingTokens = /(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g;
+
+    var formatFunctions = {};
+
+    var formatTokenFunctions = {};
+
+    // token:    'M'
+    // padded:   ['MM', 2]
+    // ordinal:  'Mo'
+    // callback: function () { this.month() + 1 }
+    function addFormatToken (token, padded, ordinal, callback) {
+        var func = callback;
+        if (typeof callback === 'string') {
+            func = function () {
+                return this[callback]();
+            };
+        }
+        if (token) {
+            formatTokenFunctions[token] = func;
+        }
+        if (padded) {
+            formatTokenFunctions[padded[0]] = function () {
+                return zeroFill(func.apply(this, arguments), padded[1], padded[2]);
+            };
+        }
+        if (ordinal) {
+            formatTokenFunctions[ordinal] = function () {
+                return this.localeData().ordinal(func.apply(this, arguments), token);
+            };
+        }
+    }
+
+    function removeFormattingTokens(input) {
+        if (input.match(/\[[\s\S]/)) {
+            return input.replace(/^\[|\]$/g, '');
+        }
+        return input.replace(/\\/g, '');
+    }
+
+    function makeFormatFunction(format) {
+        var array = format.match(formattingTokens), i, length;
+
+        for (i = 0, length = array.length; i < length; i++) {
+            if (formatTokenFunctions[array[i]]) {
+                array[i] = formatTokenFunctions[array[i]];
+            } else {
+                array[i] = removeFormattingTokens(array[i]);
+            }
+        }
+
+        return function (mom) {
+            var output = '', i;
+            for (i = 0; i < length; i++) {
+                output += isFunction(array[i]) ? array[i].call(mom, format) : array[i];
+            }
+            return output;
+        };
+    }
+
+    // format date using native date object
+    function formatMoment(m, format) {
+        if (!m.isValid()) {
+            return m.localeData().invalidDate();
+        }
+
+        format = expandFormat(format, m.localeData());
+        formatFunctions[format] = formatFunctions[format] || makeFormatFunction(format);
+
+        return formatFunctions[format](m);
+    }
+
+    function expandFormat(format, locale) {
+        var i = 5;
+
+        function replaceLongDateFormatTokens(input) {
+            return locale.longDateFormat(input) || input;
+        }
+
+        localFormattingTokens.lastIndex = 0;
+        while (i >= 0 && localFormattingTokens.test(format)) {
+            format = format.replace(localFormattingTokens, replaceLongDateFormatTokens);
+            localFormattingTokens.lastIndex = 0;
+            i -= 1;
+        }
 
-    if (format || !formatUpper) {
         return format;
     }
 
-    this._longDateFormat[key] = formatUpper.replace(/MMMM|MM|DD|dddd/g, function (val) {
-        return val.slice(1);
+    var match1         = /\d/;            //       0 - 9
+    var match2         = /\d\d/;          //      00 - 99
+    var match3         = /\d{3}/;         //     000 - 999
+    var match4         = /\d{4}/;         //    0000 - 9999
+    var match6         = /[+-]?\d{6}/;    // -999999 - 999999
+    var match1to2      = /\d\d?/;         //       0 - 99
+    var match3to4      = /\d\d\d\d?/;     //     999 - 9999
+    var match5to6      = /\d\d\d\d\d\d?/; //   99999 - 999999
+    var match1to3      = /\d{1,3}/;       //       0 - 999
+    var match1to4      = /\d{1,4}/;       //       0 - 9999
+    var match1to6      = /[+-]?\d{1,6}/;  // -999999 - 999999
+
+    var matchUnsigned  = /\d+/;           //       0 - inf
+    var matchSigned    = /[+-]?\d+/;      //    -inf - inf
+
+    var matchOffset    = /Z|[+-]\d\d:?\d\d/gi; // +00:00 -00:00 +0000 -0000 or Z
+    var matchShortOffset = /Z|[+-]\d\d(?::?\d\d)?/gi; // +00 -00 +00:00 -00:00 +0000 -0000 or Z
+
+    var matchTimestamp = /[+-]?\d+(\.\d{1,3})?/; // 123456789 123456789.123
+
+    // any word (or two) characters or numbers including two/three word month in arabic.
+    // includes scottish gaelic two word and hyphenated months
+    var matchWord = /[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFF07\uFF10-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i;
+
+    var regexes = {};
+
+    function addRegexToken (token, regex, strictRegex) {
+        regexes[token] = isFunction(regex) ? regex : function (isStrict, localeData) {
+            return (isStrict && strictRegex) ? strictRegex : regex;
+        };
+    }
+
+    function getParseRegexForToken (token, config) {
+        if (!hasOwnProp(regexes, token)) {
+            return new RegExp(unescapeFormat(token));
+        }
+
+        return regexes[token](config._strict, config._locale);
+    }
+
+    // Code from http://stackoverflow.com/questions/3561493/is-there-a-regexp-escape-function-in-javascript
+    function unescapeFormat(s) {
+        return regexEscape(s.replace('\\', '').replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g, function (matched, p1, p2, p3, p4) {
+            return p1 || p2 || p3 || p4;
+        }));
+    }
+
+    function regexEscape(s) {
+        return s.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+    }
+
+    var tokens = {};
+
+    function addParseToken (token, callback) {
+        var i, func = callback;
+        if (typeof token === 'string') {
+            token = [token];
+        }
+        if (isNumber(callback)) {
+            func = function (input, array) {
+                array[callback] = toInt(input);
+            };
+        }
+        for (i = 0; i < token.length; i++) {
+            tokens[token[i]] = func;
+        }
+    }
+
+    function addWeekParseToken (token, callback) {
+        addParseToken(token, function (input, array, config, token) {
+            config._w = config._w || {};
+            callback(input, config._w, config, token);
+        });
+    }
+
+    function addTimeToArrayFromToken(token, input, config) {
+        if (input != null && hasOwnProp(tokens, token)) {
+            tokens[token](input, config._a, config, token);
+        }
+    }
+
+    var YEAR = 0;
+    var MONTH = 1;
+    var DATE = 2;
+    var HOUR = 3;
+    var MINUTE = 4;
+    var SECOND = 5;
+    var MILLISECOND = 6;
+    var WEEK = 7;
+    var WEEKDAY = 8;
+
+    // FORMATTING
+
+    addFormatToken('Y', 0, 0, function () {
+        var y = this.year();
+        return y <= 9999 ? '' + y : '+' + y;
     });
 
-    return this._longDateFormat[key];
-}
+    addFormatToken(0, ['YY', 2], 0, function () {
+        return this.year() % 100;
+    });
 
-var defaultInvalidDate = 'Invalid date';
+    addFormatToken(0, ['YYYY',   4],       0, 'year');
+    addFormatToken(0, ['YYYYY',  5],       0, 'year');
+    addFormatToken(0, ['YYYYYY', 6, true], 0, 'year');
 
-function invalidDate () {
-    return this._invalidDate;
-}
+    // ALIASES
 
-var defaultOrdinal = '%d';
-var defaultDayOfMonthOrdinalParse = /\d{1,2}/;
+    addUnitAlias('year', 'y');
 
-function ordinal (number) {
-    return this._ordinal.replace('%d', number);
-}
+    // PRIORITIES
 
-var defaultRelativeTime = {
-    future : 'in %s',
-    past   : '%s ago',
-    s  : 'a few seconds',
-    ss : '%d seconds',
-    m  : 'a minute',
-    mm : '%d minutes',
-    h  : 'an hour',
-    hh : '%d hours',
-    d  : 'a day',
-    dd : '%d days',
-    M  : 'a month',
-    MM : '%d months',
-    y  : 'a year',
-    yy : '%d years'
-};
+    addUnitPriority('year', 1);
 
-function relativeTime (number, withoutSuffix, string, isFuture) {
-    var output = this._relativeTime[string];
-    return (isFunction(output)) ?
-        output(number, withoutSuffix, string, isFuture) :
-        output.replace(/%d/i, number);
-}
+    // PARSING
 
-function pastFuture (diff, output) {
-    var format = this._relativeTime[diff > 0 ? 'future' : 'past'];
-    return isFunction(format) ? format(output) : format.replace(/%s/i, output);
-}
+    addRegexToken('Y',      matchSigned);
+    addRegexToken('YY',     match1to2, match2);
+    addRegexToken('YYYY',   match1to4, match4);
+    addRegexToken('YYYYY',  match1to6, match6);
+    addRegexToken('YYYYYY', match1to6, match6);
 
-var aliases = {};
+    addParseToken(['YYYYY', 'YYYYYY'], YEAR);
+    addParseToken('YYYY', function (input, array) {
+        array[YEAR] = input.length === 2 ? hooks.parseTwoDigitYear(input) : toInt(input);
+    });
+    addParseToken('YY', function (input, array) {
+        array[YEAR] = hooks.parseTwoDigitYear(input);
+    });
+    addParseToken('Y', function (input, array) {
+        array[YEAR] = parseInt(input, 10);
+    });
 
-function addUnitAlias (unit, shorthand) {
-    var lowerCase = unit.toLowerCase();
-    aliases[lowerCase] = aliases[lowerCase + 's'] = aliases[shorthand] = unit;
-}
+    // HELPERS
 
-function normalizeUnits(units) {
-    return typeof units === 'string' ? aliases[units] || aliases[units.toLowerCase()] : undefined;
-}
+    function daysInYear(year) {
+        return isLeapYear(year) ? 366 : 365;
+    }
 
-function normalizeObjectUnits(inputObject) {
-    var normalizedInput = {},
-        normalizedProp,
-        prop;
+    function isLeapYear(year) {
+        return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
+    }
 
-    for (prop in inputObject) {
-        if (hasOwnProp(inputObject, prop)) {
-            normalizedProp = normalizeUnits(prop);
-            if (normalizedProp) {
-                normalizedInput[normalizedProp] = inputObject[prop];
+    // HOOKS
+
+    hooks.parseTwoDigitYear = function (input) {
+        return toInt(input) + (toInt(input) > 68 ? 1900 : 2000);
+    };
+
+    // MOMENTS
+
+    var getSetYear = makeGetSet('FullYear', true);
+
+    function getIsLeapYear () {
+        return isLeapYear(this.year());
+    }
+
+    function makeGetSet (unit, keepTime) {
+        return function (value) {
+            if (value != null) {
+                set$1(this, unit, value);
+                hooks.updateOffset(this, keepTime);
+                return this;
+            } else {
+                return get(this, unit);
+            }
+        };
+    }
+
+    function get (mom, unit) {
+        return mom.isValid() ?
+            mom._d['get' + (mom._isUTC ? 'UTC' : '') + unit]() : NaN;
+    }
+
+    function set$1 (mom, unit, value) {
+        if (mom.isValid() && !isNaN(value)) {
+            if (unit === 'FullYear' && isLeapYear(mom.year()) && mom.month() === 1 && mom.date() === 29) {
+                mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value, mom.month(), daysInMonth(value, mom.month()));
+            }
+            else {
+                mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value);
             }
         }
     }
 
-    return normalizedInput;
-}
+    // MOMENTS
 
-var priorities = {};
-
-function addUnitPriority(unit, priority) {
-    priorities[unit] = priority;
-}
-
-function getPrioritizedUnits(unitsObj) {
-    var units = [];
-    for (var u in unitsObj) {
-        units.push({unit: u, priority: priorities[u]});
-    }
-    units.sort(function (a, b) {
-        return a.priority - b.priority;
-    });
-    return units;
-}
-
-function makeGetSet (unit, keepTime) {
-    return function (value) {
-        if (value != null) {
-            set$1(this, unit, value);
-            hooks.updateOffset(this, keepTime);
-            return this;
-        } else {
-            return get(this, unit);
-        }
-    };
-}
-
-function get (mom, unit) {
-    return mom.isValid() ?
-        mom._d['get' + (mom._isUTC ? 'UTC' : '') + unit]() : NaN;
-}
-
-function set$1 (mom, unit, value) {
-    if (mom.isValid()) {
-        mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value);
-    }
-}
-
-// MOMENTS
-
-function stringGet (units) {
-    units = normalizeUnits(units);
-    if (isFunction(this[units])) {
-        return this[units]();
-    }
-    return this;
-}
-
-
-function stringSet (units, value) {
-    if (typeof units === 'object') {
-        units = normalizeObjectUnits(units);
-        var prioritized = getPrioritizedUnits(units);
-        for (var i = 0; i < prioritized.length; i++) {
-            this[prioritized[i].unit](units[prioritized[i].unit]);
-        }
-    } else {
+    function stringGet (units) {
         units = normalizeUnits(units);
         if (isFunction(this[units])) {
-            return this[units](value);
+            return this[units]();
         }
+        return this;
     }
-    return this;
-}
 
-function zeroFill(number, targetLength, forceSign) {
-    var absNumber = '' + Math.abs(number),
-        zerosToFill = targetLength - absNumber.length,
-        sign = number >= 0;
-    return (sign ? (forceSign ? '+' : '') : '-') +
-        Math.pow(10, Math.max(0, zerosToFill)).toString().substr(1) + absNumber;
-}
 
-var formattingTokens = /(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g;
-
-var localFormattingTokens = /(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g;
-
-var formatFunctions = {};
-
-var formatTokenFunctions = {};
-
-// token:    'M'
-// padded:   ['MM', 2]
-// ordinal:  'Mo'
-// callback: function () { this.month() + 1 }
-function addFormatToken (token, padded, ordinal, callback) {
-    var func = callback;
-    if (typeof callback === 'string') {
-        func = function () {
-            return this[callback]();
-        };
-    }
-    if (token) {
-        formatTokenFunctions[token] = func;
-    }
-    if (padded) {
-        formatTokenFunctions[padded[0]] = function () {
-            return zeroFill(func.apply(this, arguments), padded[1], padded[2]);
-        };
-    }
-    if (ordinal) {
-        formatTokenFunctions[ordinal] = function () {
-            return this.localeData().ordinal(func.apply(this, arguments), token);
-        };
-    }
-}
-
-function removeFormattingTokens(input) {
-    if (input.match(/\[[\s\S]/)) {
-        return input.replace(/^\[|\]$/g, '');
-    }
-    return input.replace(/\\/g, '');
-}
-
-function makeFormatFunction(format) {
-    var array = format.match(formattingTokens), i, length;
-
-    for (i = 0, length = array.length; i < length; i++) {
-        if (formatTokenFunctions[array[i]]) {
-            array[i] = formatTokenFunctions[array[i]];
+    function stringSet (units, value) {
+        if (typeof units === 'object') {
+            units = normalizeObjectUnits(units);
+            var prioritized = getPrioritizedUnits(units);
+            for (var i = 0; i < prioritized.length; i++) {
+                this[prioritized[i].unit](units[prioritized[i].unit]);
+            }
         } else {
-            array[i] = removeFormattingTokens(array[i]);
+            units = normalizeUnits(units);
+            if (isFunction(this[units])) {
+                return this[units](value);
+            }
         }
+        return this;
     }
 
-    return function (mom) {
-        var output = '', i;
-        for (i = 0; i < length; i++) {
-            output += isFunction(array[i]) ? array[i].call(mom, format) : array[i];
-        }
-        return output;
-    };
-}
-
-// format date using native date object
-function formatMoment(m, format) {
-    if (!m.isValid()) {
-        return m.localeData().invalidDate();
+    function mod(n, x) {
+        return ((n % x) + x) % x;
     }
 
-    format = expandFormat(format, m.localeData());
-    formatFunctions[format] = formatFunctions[format] || makeFormatFunction(format);
+    var indexOf;
 
-    return formatFunctions[format](m);
-}
-
-function expandFormat(format, locale) {
-    var i = 5;
-
-    function replaceLongDateFormatTokens(input) {
-        return locale.longDateFormat(input) || input;
-    }
-
-    localFormattingTokens.lastIndex = 0;
-    while (i >= 0 && localFormattingTokens.test(format)) {
-        format = format.replace(localFormattingTokens, replaceLongDateFormatTokens);
-        localFormattingTokens.lastIndex = 0;
-        i -= 1;
-    }
-
-    return format;
-}
-
-var match1         = /\d/;            //       0 - 9
-var match2         = /\d\d/;          //      00 - 99
-var match3         = /\d{3}/;         //     000 - 999
-var match4         = /\d{4}/;         //    0000 - 9999
-var match6         = /[+-]?\d{6}/;    // -999999 - 999999
-var match1to2      = /\d\d?/;         //       0 - 99
-var match3to4      = /\d\d\d\d?/;     //     999 - 9999
-var match5to6      = /\d\d\d\d\d\d?/; //   99999 - 999999
-var match1to3      = /\d{1,3}/;       //       0 - 999
-var match1to4      = /\d{1,4}/;       //       0 - 9999
-var match1to6      = /[+-]?\d{1,6}/;  // -999999 - 999999
-
-var matchUnsigned  = /\d+/;           //       0 - inf
-var matchSigned    = /[+-]?\d+/;      //    -inf - inf
-
-var matchOffset    = /Z|[+-]\d\d:?\d\d/gi; // +00:00 -00:00 +0000 -0000 or Z
-var matchShortOffset = /Z|[+-]\d\d(?::?\d\d)?/gi; // +00 -00 +00:00 -00:00 +0000 -0000 or Z
-
-var matchTimestamp = /[+-]?\d+(\.\d{1,3})?/; // 123456789 123456789.123
-
-// any word (or two) characters or numbers including two/three word month in arabic.
-// includes scottish gaelic two word and hyphenated months
-var matchWord = /[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i;
-
-
-var regexes = {};
-
-function addRegexToken (token, regex, strictRegex) {
-    regexes[token] = isFunction(regex) ? regex : function (isStrict, localeData) {
-        return (isStrict && strictRegex) ? strictRegex : regex;
-    };
-}
-
-function getParseRegexForToken (token, config) {
-    if (!hasOwnProp(regexes, token)) {
-        return new RegExp(unescapeFormat(token));
-    }
-
-    return regexes[token](config._strict, config._locale);
-}
-
-// Code from http://stackoverflow.com/questions/3561493/is-there-a-regexp-escape-function-in-javascript
-function unescapeFormat(s) {
-    return regexEscape(s.replace('\\', '').replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g, function (matched, p1, p2, p3, p4) {
-        return p1 || p2 || p3 || p4;
-    }));
-}
-
-function regexEscape(s) {
-    return s.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
-}
-
-var tokens = {};
-
-function addParseToken (token, callback) {
-    var i, func = callback;
-    if (typeof token === 'string') {
-        token = [token];
-    }
-    if (isNumber(callback)) {
-        func = function (input, array) {
-            array[callback] = toInt(input);
+    if (Array.prototype.indexOf) {
+        indexOf = Array.prototype.indexOf;
+    } else {
+        indexOf = function (o) {
+            // I know
+            var i;
+            for (i = 0; i < this.length; ++i) {
+                if (this[i] === o) {
+                    return i;
+                }
+            }
+            return -1;
         };
     }
-    for (i = 0; i < token.length; i++) {
-        tokens[token[i]] = func;
-    }
-}
 
-function addWeekParseToken (token, callback) {
-    addParseToken(token, function (input, array, config, token) {
-        config._w = config._w || {};
-        callback(input, config._w, config, token);
+    function daysInMonth(year, month) {
+        if (isNaN(year) || isNaN(month)) {
+            return NaN;
+        }
+        var modMonth = mod(month, 12);
+        year += (month - modMonth) / 12;
+        return modMonth === 1 ? (isLeapYear(year) ? 29 : 28) : (31 - modMonth % 7 % 2);
+    }
+
+    // FORMATTING
+
+    addFormatToken('M', ['MM', 2], 'Mo', function () {
+        return this.month() + 1;
     });
-}
 
-function addTimeToArrayFromToken(token, input, config) {
-    if (input != null && hasOwnProp(tokens, token)) {
-        tokens[token](input, config._a, config, token);
+    addFormatToken('MMM', 0, 0, function (format) {
+        return this.localeData().monthsShort(this, format);
+    });
+
+    addFormatToken('MMMM', 0, 0, function (format) {
+        return this.localeData().months(this, format);
+    });
+
+    // ALIASES
+
+    addUnitAlias('month', 'M');
+
+    // PRIORITY
+
+    addUnitPriority('month', 8);
+
+    // PARSING
+
+    addRegexToken('M',    match1to2);
+    addRegexToken('MM',   match1to2, match2);
+    addRegexToken('MMM',  function (isStrict, locale) {
+        return locale.monthsShortRegex(isStrict);
+    });
+    addRegexToken('MMMM', function (isStrict, locale) {
+        return locale.monthsRegex(isStrict);
+    });
+
+    addParseToken(['M', 'MM'], function (input, array) {
+        array[MONTH] = toInt(input) - 1;
+    });
+
+    addParseToken(['MMM', 'MMMM'], function (input, array, config, token) {
+        var month = config._locale.monthsParse(input, token, config._strict);
+        // if we didn't find a month name, mark the date as invalid.
+        if (month != null) {
+            array[MONTH] = month;
+        } else {
+            getParsingFlags(config).invalidMonth = input;
+        }
+    });
+
+    // LOCALES
+
+    var MONTHS_IN_FORMAT = /D[oD]?(\[[^\[\]]*\]|\s)+MMMM?/;
+    var defaultLocaleMonths = 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_');
+    function localeMonths (m, format) {
+        if (!m) {
+            return isArray(this._months) ? this._months :
+                this._months['standalone'];
+        }
+        return isArray(this._months) ? this._months[m.month()] :
+            this._months[(this._months.isFormat || MONTHS_IN_FORMAT).test(format) ? 'format' : 'standalone'][m.month()];
     }
-}
 
-var YEAR = 0;
-var MONTH = 1;
-var DATE = 2;
-var HOUR = 3;
-var MINUTE = 4;
-var SECOND = 5;
-var MILLISECOND = 6;
-var WEEK = 7;
-var WEEKDAY = 8;
+    var defaultLocaleMonthsShort = 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_');
+    function localeMonthsShort (m, format) {
+        if (!m) {
+            return isArray(this._monthsShort) ? this._monthsShort :
+                this._monthsShort['standalone'];
+        }
+        return isArray(this._monthsShort) ? this._monthsShort[m.month()] :
+            this._monthsShort[MONTHS_IN_FORMAT.test(format) ? 'format' : 'standalone'][m.month()];
+    }
 
-var indexOf;
+    function handleStrictParse(monthName, format, strict) {
+        var i, ii, mom, llc = monthName.toLocaleLowerCase();
+        if (!this._monthsParse) {
+            // this is not used
+            this._monthsParse = [];
+            this._longMonthsParse = [];
+            this._shortMonthsParse = [];
+            for (i = 0; i < 12; ++i) {
+                mom = createUTC([2000, i]);
+                this._shortMonthsParse[i] = this.monthsShort(mom, '').toLocaleLowerCase();
+                this._longMonthsParse[i] = this.months(mom, '').toLocaleLowerCase();
+            }
+        }
 
-if (Array.prototype.indexOf) {
-    indexOf = Array.prototype.indexOf;
-} else {
-    indexOf = function (o) {
-        // I know
-        var i;
-        for (i = 0; i < this.length; ++i) {
-            if (this[i] === o) {
+        if (strict) {
+            if (format === 'MMM') {
+                ii = indexOf.call(this._shortMonthsParse, llc);
+                return ii !== -1 ? ii : null;
+            } else {
+                ii = indexOf.call(this._longMonthsParse, llc);
+                return ii !== -1 ? ii : null;
+            }
+        } else {
+            if (format === 'MMM') {
+                ii = indexOf.call(this._shortMonthsParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._longMonthsParse, llc);
+                return ii !== -1 ? ii : null;
+            } else {
+                ii = indexOf.call(this._longMonthsParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._shortMonthsParse, llc);
+                return ii !== -1 ? ii : null;
+            }
+        }
+    }
+
+    function localeMonthsParse (monthName, format, strict) {
+        var i, mom, regex;
+
+        if (this._monthsParseExact) {
+            return handleStrictParse.call(this, monthName, format, strict);
+        }
+
+        if (!this._monthsParse) {
+            this._monthsParse = [];
+            this._longMonthsParse = [];
+            this._shortMonthsParse = [];
+        }
+
+        // TODO: add sorting
+        // Sorting makes sure if one month (or abbr) is a prefix of another
+        // see sorting in computeMonthsParse
+        for (i = 0; i < 12; i++) {
+            // make the regex if we don't have it already
+            mom = createUTC([2000, i]);
+            if (strict && !this._longMonthsParse[i]) {
+                this._longMonthsParse[i] = new RegExp('^' + this.months(mom, '').replace('.', '') + '$', 'i');
+                this._shortMonthsParse[i] = new RegExp('^' + this.monthsShort(mom, '').replace('.', '') + '$', 'i');
+            }
+            if (!strict && !this._monthsParse[i]) {
+                regex = '^' + this.months(mom, '') + '|^' + this.monthsShort(mom, '');
+                this._monthsParse[i] = new RegExp(regex.replace('.', ''), 'i');
+            }
+            // test the regex
+            if (strict && format === 'MMMM' && this._longMonthsParse[i].test(monthName)) {
+                return i;
+            } else if (strict && format === 'MMM' && this._shortMonthsParse[i].test(monthName)) {
+                return i;
+            } else if (!strict && this._monthsParse[i].test(monthName)) {
                 return i;
             }
         }
-        return -1;
-    };
-}
-
-var indexOf$1 = indexOf;
-
-function daysInMonth(year, month) {
-    return new Date(Date.UTC(year, month + 1, 0)).getUTCDate();
-}
-
-// FORMATTING
-
-addFormatToken('M', ['MM', 2], 'Mo', function () {
-    return this.month() + 1;
-});
-
-addFormatToken('MMM', 0, 0, function (format) {
-    return this.localeData().monthsShort(this, format);
-});
-
-addFormatToken('MMMM', 0, 0, function (format) {
-    return this.localeData().months(this, format);
-});
-
-// ALIASES
-
-addUnitAlias('month', 'M');
-
-// PRIORITY
-
-addUnitPriority('month', 8);
-
-// PARSING
-
-addRegexToken('M',    match1to2);
-addRegexToken('MM',   match1to2, match2);
-addRegexToken('MMM',  function (isStrict, locale) {
-    return locale.monthsShortRegex(isStrict);
-});
-addRegexToken('MMMM', function (isStrict, locale) {
-    return locale.monthsRegex(isStrict);
-});
-
-addParseToken(['M', 'MM'], function (input, array) {
-    array[MONTH] = toInt(input) - 1;
-});
-
-addParseToken(['MMM', 'MMMM'], function (input, array, config, token) {
-    var month = config._locale.monthsParse(input, token, config._strict);
-    // if we didn't find a month name, mark the date as invalid.
-    if (month != null) {
-        array[MONTH] = month;
-    } else {
-        getParsingFlags(config).invalidMonth = input;
     }
-});
 
-// LOCALES
+    // MOMENTS
 
-var MONTHS_IN_FORMAT = /D[oD]?(\[[^\[\]]*\]|\s)+MMMM?/;
-var defaultLocaleMonths = 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_');
-function localeMonths (m, format) {
-    if (!m) {
-        return isArray(this._months) ? this._months :
-            this._months['standalone'];
-    }
-    return isArray(this._months) ? this._months[m.month()] :
-        this._months[(this._months.isFormat || MONTHS_IN_FORMAT).test(format) ? 'format' : 'standalone'][m.month()];
-}
+    function setMonth (mom, value) {
+        var dayOfMonth;
 
-var defaultLocaleMonthsShort = 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_');
-function localeMonthsShort (m, format) {
-    if (!m) {
-        return isArray(this._monthsShort) ? this._monthsShort :
-            this._monthsShort['standalone'];
-    }
-    return isArray(this._monthsShort) ? this._monthsShort[m.month()] :
-        this._monthsShort[MONTHS_IN_FORMAT.test(format) ? 'format' : 'standalone'][m.month()];
-}
-
-function handleStrictParse(monthName, format, strict) {
-    var i, ii, mom, llc = monthName.toLocaleLowerCase();
-    if (!this._monthsParse) {
-        // this is not used
-        this._monthsParse = [];
-        this._longMonthsParse = [];
-        this._shortMonthsParse = [];
-        for (i = 0; i < 12; ++i) {
-            mom = createUTC([2000, i]);
-            this._shortMonthsParse[i] = this.monthsShort(mom, '').toLocaleLowerCase();
-            this._longMonthsParse[i] = this.months(mom, '').toLocaleLowerCase();
+        if (!mom.isValid()) {
+            // No op
+            return mom;
         }
-    }
 
-    if (strict) {
-        if (format === 'MMM') {
-            ii = indexOf$1.call(this._shortMonthsParse, llc);
-            return ii !== -1 ? ii : null;
-        } else {
-            ii = indexOf$1.call(this._longMonthsParse, llc);
-            return ii !== -1 ? ii : null;
-        }
-    } else {
-        if (format === 'MMM') {
-            ii = indexOf$1.call(this._shortMonthsParse, llc);
-            if (ii !== -1) {
-                return ii;
+        if (typeof value === 'string') {
+            if (/^\d+$/.test(value)) {
+                value = toInt(value);
+            } else {
+                value = mom.localeData().monthsParse(value);
+                // TODO: Another silent failure?
+                if (!isNumber(value)) {
+                    return mom;
+                }
             }
-            ii = indexOf$1.call(this._longMonthsParse, llc);
-            return ii !== -1 ? ii : null;
-        } else {
-            ii = indexOf$1.call(this._longMonthsParse, llc);
-            if (ii !== -1) {
-                return ii;
-            }
-            ii = indexOf$1.call(this._shortMonthsParse, llc);
-            return ii !== -1 ? ii : null;
         }
-    }
-}
 
-function localeMonthsParse (monthName, format, strict) {
-    var i, mom, regex;
-
-    if (this._monthsParseExact) {
-        return handleStrictParse.call(this, monthName, format, strict);
-    }
-
-    if (!this._monthsParse) {
-        this._monthsParse = [];
-        this._longMonthsParse = [];
-        this._shortMonthsParse = [];
-    }
-
-    // TODO: add sorting
-    // Sorting makes sure if one month (or abbr) is a prefix of another
-    // see sorting in computeMonthsParse
-    for (i = 0; i < 12; i++) {
-        // make the regex if we don't have it already
-        mom = createUTC([2000, i]);
-        if (strict && !this._longMonthsParse[i]) {
-            this._longMonthsParse[i] = new RegExp('^' + this.months(mom, '').replace('.', '') + '$', 'i');
-            this._shortMonthsParse[i] = new RegExp('^' + this.monthsShort(mom, '').replace('.', '') + '$', 'i');
-        }
-        if (!strict && !this._monthsParse[i]) {
-            regex = '^' + this.months(mom, '') + '|^' + this.monthsShort(mom, '');
-            this._monthsParse[i] = new RegExp(regex.replace('.', ''), 'i');
-        }
-        // test the regex
-        if (strict && format === 'MMMM' && this._longMonthsParse[i].test(monthName)) {
-            return i;
-        } else if (strict && format === 'MMM' && this._shortMonthsParse[i].test(monthName)) {
-            return i;
-        } else if (!strict && this._monthsParse[i].test(monthName)) {
-            return i;
-        }
-    }
-}
-
-// MOMENTS
-
-function setMonth (mom, value) {
-    var dayOfMonth;
-
-    if (!mom.isValid()) {
-        // No op
+        dayOfMonth = Math.min(mom.date(), daysInMonth(mom.year(), value));
+        mom._d['set' + (mom._isUTC ? 'UTC' : '') + 'Month'](value, dayOfMonth);
         return mom;
     }
 
-    if (typeof value === 'string') {
-        if (/^\d+$/.test(value)) {
-            value = toInt(value);
+    function getSetMonth (value) {
+        if (value != null) {
+            setMonth(this, value);
+            hooks.updateOffset(this, true);
+            return this;
         } else {
-            value = mom.localeData().monthsParse(value);
-            // TODO: Another silent failure?
-            if (!isNumber(value)) {
-                return mom;
+            return get(this, 'Month');
+        }
+    }
+
+    function getDaysInMonth () {
+        return daysInMonth(this.year(), this.month());
+    }
+
+    var defaultMonthsShortRegex = matchWord;
+    function monthsShortRegex (isStrict) {
+        if (this._monthsParseExact) {
+            if (!hasOwnProp(this, '_monthsRegex')) {
+                computeMonthsParse.call(this);
             }
-        }
-    }
-
-    dayOfMonth = Math.min(mom.date(), daysInMonth(mom.year(), value));
-    mom._d['set' + (mom._isUTC ? 'UTC' : '') + 'Month'](value, dayOfMonth);
-    return mom;
-}
-
-function getSetMonth (value) {
-    if (value != null) {
-        setMonth(this, value);
-        hooks.updateOffset(this, true);
-        return this;
-    } else {
-        return get(this, 'Month');
-    }
-}
-
-function getDaysInMonth () {
-    return daysInMonth(this.year(), this.month());
-}
-
-var defaultMonthsShortRegex = matchWord;
-function monthsShortRegex (isStrict) {
-    if (this._monthsParseExact) {
-        if (!hasOwnProp(this, '_monthsRegex')) {
-            computeMonthsParse.call(this);
-        }
-        if (isStrict) {
-            return this._monthsShortStrictRegex;
-        } else {
-            return this._monthsShortRegex;
-        }
-    } else {
-        if (!hasOwnProp(this, '_monthsShortRegex')) {
-            this._monthsShortRegex = defaultMonthsShortRegex;
-        }
-        return this._monthsShortStrictRegex && isStrict ?
-            this._monthsShortStrictRegex : this._monthsShortRegex;
-    }
-}
-
-var defaultMonthsRegex = matchWord;
-function monthsRegex (isStrict) {
-    if (this._monthsParseExact) {
-        if (!hasOwnProp(this, '_monthsRegex')) {
-            computeMonthsParse.call(this);
-        }
-        if (isStrict) {
-            return this._monthsStrictRegex;
-        } else {
-            return this._monthsRegex;
-        }
-    } else {
-        if (!hasOwnProp(this, '_monthsRegex')) {
-            this._monthsRegex = defaultMonthsRegex;
-        }
-        return this._monthsStrictRegex && isStrict ?
-            this._monthsStrictRegex : this._monthsRegex;
-    }
-}
-
-function computeMonthsParse () {
-    function cmpLenRev(a, b) {
-        return b.length - a.length;
-    }
-
-    var shortPieces = [], longPieces = [], mixedPieces = [],
-        i, mom;
-    for (i = 0; i < 12; i++) {
-        // make the regex if we don't have it already
-        mom = createUTC([2000, i]);
-        shortPieces.push(this.monthsShort(mom, ''));
-        longPieces.push(this.months(mom, ''));
-        mixedPieces.push(this.months(mom, ''));
-        mixedPieces.push(this.monthsShort(mom, ''));
-    }
-    // Sorting makes sure if one month (or abbr) is a prefix of another it
-    // will match the longer piece.
-    shortPieces.sort(cmpLenRev);
-    longPieces.sort(cmpLenRev);
-    mixedPieces.sort(cmpLenRev);
-    for (i = 0; i < 12; i++) {
-        shortPieces[i] = regexEscape(shortPieces[i]);
-        longPieces[i] = regexEscape(longPieces[i]);
-    }
-    for (i = 0; i < 24; i++) {
-        mixedPieces[i] = regexEscape(mixedPieces[i]);
-    }
-
-    this._monthsRegex = new RegExp('^(' + mixedPieces.join('|') + ')', 'i');
-    this._monthsShortRegex = this._monthsRegex;
-    this._monthsStrictRegex = new RegExp('^(' + longPieces.join('|') + ')', 'i');
-    this._monthsShortStrictRegex = new RegExp('^(' + shortPieces.join('|') + ')', 'i');
-}
-
-// FORMATTING
-
-addFormatToken('Y', 0, 0, function () {
-    var y = this.year();
-    return y <= 9999 ? '' + y : '+' + y;
-});
-
-addFormatToken(0, ['YY', 2], 0, function () {
-    return this.year() % 100;
-});
-
-addFormatToken(0, ['YYYY',   4],       0, 'year');
-addFormatToken(0, ['YYYYY',  5],       0, 'year');
-addFormatToken(0, ['YYYYYY', 6, true], 0, 'year');
-
-// ALIASES
-
-addUnitAlias('year', 'y');
-
-// PRIORITIES
-
-addUnitPriority('year', 1);
-
-// PARSING
-
-addRegexToken('Y',      matchSigned);
-addRegexToken('YY',     match1to2, match2);
-addRegexToken('YYYY',   match1to4, match4);
-addRegexToken('YYYYY',  match1to6, match6);
-addRegexToken('YYYYYY', match1to6, match6);
-
-addParseToken(['YYYYY', 'YYYYYY'], YEAR);
-addParseToken('YYYY', function (input, array) {
-    array[YEAR] = input.length === 2 ? hooks.parseTwoDigitYear(input) : toInt(input);
-});
-addParseToken('YY', function (input, array) {
-    array[YEAR] = hooks.parseTwoDigitYear(input);
-});
-addParseToken('Y', function (input, array) {
-    array[YEAR] = parseInt(input, 10);
-});
-
-// HELPERS
-
-function daysInYear(year) {
-    return isLeapYear(year) ? 366 : 365;
-}
-
-function isLeapYear(year) {
-    return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
-}
-
-// HOOKS
-
-hooks.parseTwoDigitYear = function (input) {
-    return toInt(input) + (toInt(input) > 68 ? 1900 : 2000);
-};
-
-// MOMENTS
-
-var getSetYear = makeGetSet('FullYear', true);
-
-function getIsLeapYear () {
-    return isLeapYear(this.year());
-}
-
-function createDate (y, m, d, h, M, s, ms) {
-    // can't just apply() to create a date:
-    // https://stackoverflow.com/q/181348
-    var date = new Date(y, m, d, h, M, s, ms);
-
-    // the date constructor remaps years 0-99 to 1900-1999
-    if (y < 100 && y >= 0 && isFinite(date.getFullYear())) {
-        date.setFullYear(y);
-    }
-    return date;
-}
-
-function createUTCDate (y) {
-    var date = new Date(Date.UTC.apply(null, arguments));
-
-    // the Date.UTC function remaps years 0-99 to 1900-1999
-    if (y < 100 && y >= 0 && isFinite(date.getUTCFullYear())) {
-        date.setUTCFullYear(y);
-    }
-    return date;
-}
-
-// start-of-first-week - start-of-year
-function firstWeekOffset(year, dow, doy) {
-    var // first-week day -- which january is always in the first week (4 for iso, 1 for other)
-        fwd = 7 + dow - doy,
-        // first-week day local weekday -- which local weekday is fwd
-        fwdlw = (7 + createUTCDate(year, 0, fwd).getUTCDay() - dow) % 7;
-
-    return -fwdlw + fwd - 1;
-}
-
-// https://en.wikipedia.org/wiki/ISO_week_date#Calculating_a_date_given_the_year.2C_week_number_and_weekday
-function dayOfYearFromWeeks(year, week, weekday, dow, doy) {
-    var localWeekday = (7 + weekday - dow) % 7,
-        weekOffset = firstWeekOffset(year, dow, doy),
-        dayOfYear = 1 + 7 * (week - 1) + localWeekday + weekOffset,
-        resYear, resDayOfYear;
-
-    if (dayOfYear <= 0) {
-        resYear = year - 1;
-        resDayOfYear = daysInYear(resYear) + dayOfYear;
-    } else if (dayOfYear > daysInYear(year)) {
-        resYear = year + 1;
-        resDayOfYear = dayOfYear - daysInYear(year);
-    } else {
-        resYear = year;
-        resDayOfYear = dayOfYear;
-    }
-
-    return {
-        year: resYear,
-        dayOfYear: resDayOfYear
-    };
-}
-
-function weekOfYear(mom, dow, doy) {
-    var weekOffset = firstWeekOffset(mom.year(), dow, doy),
-        week = Math.floor((mom.dayOfYear() - weekOffset - 1) / 7) + 1,
-        resWeek, resYear;
-
-    if (week < 1) {
-        resYear = mom.year() - 1;
-        resWeek = week + weeksInYear(resYear, dow, doy);
-    } else if (week > weeksInYear(mom.year(), dow, doy)) {
-        resWeek = week - weeksInYear(mom.year(), dow, doy);
-        resYear = mom.year() + 1;
-    } else {
-        resYear = mom.year();
-        resWeek = week;
-    }
-
-    return {
-        week: resWeek,
-        year: resYear
-    };
-}
-
-function weeksInYear(year, dow, doy) {
-    var weekOffset = firstWeekOffset(year, dow, doy),
-        weekOffsetNext = firstWeekOffset(year + 1, dow, doy);
-    return (daysInYear(year) - weekOffset + weekOffsetNext) / 7;
-}
-
-// FORMATTING
-
-addFormatToken('w', ['ww', 2], 'wo', 'week');
-addFormatToken('W', ['WW', 2], 'Wo', 'isoWeek');
-
-// ALIASES
-
-addUnitAlias('week', 'w');
-addUnitAlias('isoWeek', 'W');
-
-// PRIORITIES
-
-addUnitPriority('week', 5);
-addUnitPriority('isoWeek', 5);
-
-// PARSING
-
-addRegexToken('w',  match1to2);
-addRegexToken('ww', match1to2, match2);
-addRegexToken('W',  match1to2);
-addRegexToken('WW', match1to2, match2);
-
-addWeekParseToken(['w', 'ww', 'W', 'WW'], function (input, week, config, token) {
-    week[token.substr(0, 1)] = toInt(input);
-});
-
-// HELPERS
-
-// LOCALES
-
-function localeWeek (mom) {
-    return weekOfYear(mom, this._week.dow, this._week.doy).week;
-}
-
-var defaultLocaleWeek = {
-    dow : 0, // Sunday is the first day of the week.
-    doy : 6  // The week that contains Jan 1st is the first week of the year.
-};
-
-function localeFirstDayOfWeek () {
-    return this._week.dow;
-}
-
-function localeFirstDayOfYear () {
-    return this._week.doy;
-}
-
-// MOMENTS
-
-function getSetWeek (input) {
-    var week = this.localeData().week(this);
-    return input == null ? week : this.add((input - week) * 7, 'd');
-}
-
-function getSetISOWeek (input) {
-    var week = weekOfYear(this, 1, 4).week;
-    return input == null ? week : this.add((input - week) * 7, 'd');
-}
-
-// FORMATTING
-
-addFormatToken('d', 0, 'do', 'day');
-
-addFormatToken('dd', 0, 0, function (format) {
-    return this.localeData().weekdaysMin(this, format);
-});
-
-addFormatToken('ddd', 0, 0, function (format) {
-    return this.localeData().weekdaysShort(this, format);
-});
-
-addFormatToken('dddd', 0, 0, function (format) {
-    return this.localeData().weekdays(this, format);
-});
-
-addFormatToken('e', 0, 0, 'weekday');
-addFormatToken('E', 0, 0, 'isoWeekday');
-
-// ALIASES
-
-addUnitAlias('day', 'd');
-addUnitAlias('weekday', 'e');
-addUnitAlias('isoWeekday', 'E');
-
-// PRIORITY
-addUnitPriority('day', 11);
-addUnitPriority('weekday', 11);
-addUnitPriority('isoWeekday', 11);
-
-// PARSING
-
-addRegexToken('d',    match1to2);
-addRegexToken('e',    match1to2);
-addRegexToken('E',    match1to2);
-addRegexToken('dd',   function (isStrict, locale) {
-    return locale.weekdaysMinRegex(isStrict);
-});
-addRegexToken('ddd',   function (isStrict, locale) {
-    return locale.weekdaysShortRegex(isStrict);
-});
-addRegexToken('dddd',   function (isStrict, locale) {
-    return locale.weekdaysRegex(isStrict);
-});
-
-addWeekParseToken(['dd', 'ddd', 'dddd'], function (input, week, config, token) {
-    var weekday = config._locale.weekdaysParse(input, token, config._strict);
-    // if we didn't get a weekday name, mark the date as invalid
-    if (weekday != null) {
-        week.d = weekday;
-    } else {
-        getParsingFlags(config).invalidWeekday = input;
-    }
-});
-
-addWeekParseToken(['d', 'e', 'E'], function (input, week, config, token) {
-    week[token] = toInt(input);
-});
-
-// HELPERS
-
-function parseWeekday(input, locale) {
-    if (typeof input !== 'string') {
-        return input;
-    }
-
-    if (!isNaN(input)) {
-        return parseInt(input, 10);
-    }
-
-    input = locale.weekdaysParse(input);
-    if (typeof input === 'number') {
-        return input;
-    }
-
-    return null;
-}
-
-function parseIsoWeekday(input, locale) {
-    if (typeof input === 'string') {
-        return locale.weekdaysParse(input) % 7 || 7;
-    }
-    return isNaN(input) ? null : input;
-}
-
-// LOCALES
-
-var defaultLocaleWeekdays = 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_');
-function localeWeekdays (m, format) {
-    if (!m) {
-        return isArray(this._weekdays) ? this._weekdays :
-            this._weekdays['standalone'];
-    }
-    return isArray(this._weekdays) ? this._weekdays[m.day()] :
-        this._weekdays[this._weekdays.isFormat.test(format) ? 'format' : 'standalone'][m.day()];
-}
-
-var defaultLocaleWeekdaysShort = 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_');
-function localeWeekdaysShort (m) {
-    return (m) ? this._weekdaysShort[m.day()] : this._weekdaysShort;
-}
-
-var defaultLocaleWeekdaysMin = 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_');
-function localeWeekdaysMin (m) {
-    return (m) ? this._weekdaysMin[m.day()] : this._weekdaysMin;
-}
-
-function handleStrictParse$1(weekdayName, format, strict) {
-    var i, ii, mom, llc = weekdayName.toLocaleLowerCase();
-    if (!this._weekdaysParse) {
-        this._weekdaysParse = [];
-        this._shortWeekdaysParse = [];
-        this._minWeekdaysParse = [];
-
-        for (i = 0; i < 7; ++i) {
-            mom = createUTC([2000, 1]).day(i);
-            this._minWeekdaysParse[i] = this.weekdaysMin(mom, '').toLocaleLowerCase();
-            this._shortWeekdaysParse[i] = this.weekdaysShort(mom, '').toLocaleLowerCase();
-            this._weekdaysParse[i] = this.weekdays(mom, '').toLocaleLowerCase();
-        }
-    }
-
-    if (strict) {
-        if (format === 'dddd') {
-            ii = indexOf$1.call(this._weekdaysParse, llc);
-            return ii !== -1 ? ii : null;
-        } else if (format === 'ddd') {
-            ii = indexOf$1.call(this._shortWeekdaysParse, llc);
-            return ii !== -1 ? ii : null;
-        } else {
-            ii = indexOf$1.call(this._minWeekdaysParse, llc);
-            return ii !== -1 ? ii : null;
-        }
-    } else {
-        if (format === 'dddd') {
-            ii = indexOf$1.call(this._weekdaysParse, llc);
-            if (ii !== -1) {
-                return ii;
-            }
-            ii = indexOf$1.call(this._shortWeekdaysParse, llc);
-            if (ii !== -1) {
-                return ii;
-            }
-            ii = indexOf$1.call(this._minWeekdaysParse, llc);
-            return ii !== -1 ? ii : null;
-        } else if (format === 'ddd') {
-            ii = indexOf$1.call(this._shortWeekdaysParse, llc);
-            if (ii !== -1) {
-                return ii;
-            }
-            ii = indexOf$1.call(this._weekdaysParse, llc);
-            if (ii !== -1) {
-                return ii;
-            }
-            ii = indexOf$1.call(this._minWeekdaysParse, llc);
-            return ii !== -1 ? ii : null;
-        } else {
-            ii = indexOf$1.call(this._minWeekdaysParse, llc);
-            if (ii !== -1) {
-                return ii;
-            }
-            ii = indexOf$1.call(this._weekdaysParse, llc);
-            if (ii !== -1) {
-                return ii;
-            }
-            ii = indexOf$1.call(this._shortWeekdaysParse, llc);
-            return ii !== -1 ? ii : null;
-        }
-    }
-}
-
-function localeWeekdaysParse (weekdayName, format, strict) {
-    var i, mom, regex;
-
-    if (this._weekdaysParseExact) {
-        return handleStrictParse$1.call(this, weekdayName, format, strict);
-    }
-
-    if (!this._weekdaysParse) {
-        this._weekdaysParse = [];
-        this._minWeekdaysParse = [];
-        this._shortWeekdaysParse = [];
-        this._fullWeekdaysParse = [];
-    }
-
-    for (i = 0; i < 7; i++) {
-        // make the regex if we don't have it already
-
-        mom = createUTC([2000, 1]).day(i);
-        if (strict && !this._fullWeekdaysParse[i]) {
-            this._fullWeekdaysParse[i] = new RegExp('^' + this.weekdays(mom, '').replace('.', '\.?') + '$', 'i');
-            this._shortWeekdaysParse[i] = new RegExp('^' + this.weekdaysShort(mom, '').replace('.', '\.?') + '$', 'i');
-            this._minWeekdaysParse[i] = new RegExp('^' + this.weekdaysMin(mom, '').replace('.', '\.?') + '$', 'i');
-        }
-        if (!this._weekdaysParse[i]) {
-            regex = '^' + this.weekdays(mom, '') + '|^' + this.weekdaysShort(mom, '') + '|^' + this.weekdaysMin(mom, '');
-            this._weekdaysParse[i] = new RegExp(regex.replace('.', ''), 'i');
-        }
-        // test the regex
-        if (strict && format === 'dddd' && this._fullWeekdaysParse[i].test(weekdayName)) {
-            return i;
-        } else if (strict && format === 'ddd' && this._shortWeekdaysParse[i].test(weekdayName)) {
-            return i;
-        } else if (strict && format === 'dd' && this._minWeekdaysParse[i].test(weekdayName)) {
-            return i;
-        } else if (!strict && this._weekdaysParse[i].test(weekdayName)) {
-            return i;
-        }
-    }
-}
-
-// MOMENTS
-
-function getSetDayOfWeek (input) {
-    if (!this.isValid()) {
-        return input != null ? this : NaN;
-    }
-    var day = this._isUTC ? this._d.getUTCDay() : this._d.getDay();
-    if (input != null) {
-        input = parseWeekday(input, this.localeData());
-        return this.add(input - day, 'd');
-    } else {
-        return day;
-    }
-}
-
-function getSetLocaleDayOfWeek (input) {
-    if (!this.isValid()) {
-        return input != null ? this : NaN;
-    }
-    var weekday = (this.day() + 7 - this.localeData()._week.dow) % 7;
-    return input == null ? weekday : this.add(input - weekday, 'd');
-}
-
-function getSetISODayOfWeek (input) {
-    if (!this.isValid()) {
-        return input != null ? this : NaN;
-    }
-
-    // behaves the same as moment#day except
-    // as a getter, returns 7 instead of 0 (1-7 range instead of 0-6)
-    // as a setter, sunday should belong to the previous week.
-
-    if (input != null) {
-        var weekday = parseIsoWeekday(input, this.localeData());
-        return this.day(this.day() % 7 ? weekday : weekday - 7);
-    } else {
-        return this.day() || 7;
-    }
-}
-
-var defaultWeekdaysRegex = matchWord;
-function weekdaysRegex (isStrict) {
-    if (this._weekdaysParseExact) {
-        if (!hasOwnProp(this, '_weekdaysRegex')) {
-            computeWeekdaysParse.call(this);
-        }
-        if (isStrict) {
-            return this._weekdaysStrictRegex;
-        } else {
-            return this._weekdaysRegex;
-        }
-    } else {
-        if (!hasOwnProp(this, '_weekdaysRegex')) {
-            this._weekdaysRegex = defaultWeekdaysRegex;
-        }
-        return this._weekdaysStrictRegex && isStrict ?
-            this._weekdaysStrictRegex : this._weekdaysRegex;
-    }
-}
-
-var defaultWeekdaysShortRegex = matchWord;
-function weekdaysShortRegex (isStrict) {
-    if (this._weekdaysParseExact) {
-        if (!hasOwnProp(this, '_weekdaysRegex')) {
-            computeWeekdaysParse.call(this);
-        }
-        if (isStrict) {
-            return this._weekdaysShortStrictRegex;
-        } else {
-            return this._weekdaysShortRegex;
-        }
-    } else {
-        if (!hasOwnProp(this, '_weekdaysShortRegex')) {
-            this._weekdaysShortRegex = defaultWeekdaysShortRegex;
-        }
-        return this._weekdaysShortStrictRegex && isStrict ?
-            this._weekdaysShortStrictRegex : this._weekdaysShortRegex;
-    }
-}
-
-var defaultWeekdaysMinRegex = matchWord;
-function weekdaysMinRegex (isStrict) {
-    if (this._weekdaysParseExact) {
-        if (!hasOwnProp(this, '_weekdaysRegex')) {
-            computeWeekdaysParse.call(this);
-        }
-        if (isStrict) {
-            return this._weekdaysMinStrictRegex;
-        } else {
-            return this._weekdaysMinRegex;
-        }
-    } else {
-        if (!hasOwnProp(this, '_weekdaysMinRegex')) {
-            this._weekdaysMinRegex = defaultWeekdaysMinRegex;
-        }
-        return this._weekdaysMinStrictRegex && isStrict ?
-            this._weekdaysMinStrictRegex : this._weekdaysMinRegex;
-    }
-}
-
-
-function computeWeekdaysParse () {
-    function cmpLenRev(a, b) {
-        return b.length - a.length;
-    }
-
-    var minPieces = [], shortPieces = [], longPieces = [], mixedPieces = [],
-        i, mom, minp, shortp, longp;
-    for (i = 0; i < 7; i++) {
-        // make the regex if we don't have it already
-        mom = createUTC([2000, 1]).day(i);
-        minp = this.weekdaysMin(mom, '');
-        shortp = this.weekdaysShort(mom, '');
-        longp = this.weekdays(mom, '');
-        minPieces.push(minp);
-        shortPieces.push(shortp);
-        longPieces.push(longp);
-        mixedPieces.push(minp);
-        mixedPieces.push(shortp);
-        mixedPieces.push(longp);
-    }
-    // Sorting makes sure if one weekday (or abbr) is a prefix of another it
-    // will match the longer piece.
-    minPieces.sort(cmpLenRev);
-    shortPieces.sort(cmpLenRev);
-    longPieces.sort(cmpLenRev);
-    mixedPieces.sort(cmpLenRev);
-    for (i = 0; i < 7; i++) {
-        shortPieces[i] = regexEscape(shortPieces[i]);
-        longPieces[i] = regexEscape(longPieces[i]);
-        mixedPieces[i] = regexEscape(mixedPieces[i]);
-    }
-
-    this._weekdaysRegex = new RegExp('^(' + mixedPieces.join('|') + ')', 'i');
-    this._weekdaysShortRegex = this._weekdaysRegex;
-    this._weekdaysMinRegex = this._weekdaysRegex;
-
-    this._weekdaysStrictRegex = new RegExp('^(' + longPieces.join('|') + ')', 'i');
-    this._weekdaysShortStrictRegex = new RegExp('^(' + shortPieces.join('|') + ')', 'i');
-    this._weekdaysMinStrictRegex = new RegExp('^(' + minPieces.join('|') + ')', 'i');
-}
-
-// FORMATTING
-
-function hFormat() {
-    return this.hours() % 12 || 12;
-}
-
-function kFormat() {
-    return this.hours() || 24;
-}
-
-addFormatToken('H', ['HH', 2], 0, 'hour');
-addFormatToken('h', ['hh', 2], 0, hFormat);
-addFormatToken('k', ['kk', 2], 0, kFormat);
-
-addFormatToken('hmm', 0, 0, function () {
-    return '' + hFormat.apply(this) + zeroFill(this.minutes(), 2);
-});
-
-addFormatToken('hmmss', 0, 0, function () {
-    return '' + hFormat.apply(this) + zeroFill(this.minutes(), 2) +
-        zeroFill(this.seconds(), 2);
-});
-
-addFormatToken('Hmm', 0, 0, function () {
-    return '' + this.hours() + zeroFill(this.minutes(), 2);
-});
-
-addFormatToken('Hmmss', 0, 0, function () {
-    return '' + this.hours() + zeroFill(this.minutes(), 2) +
-        zeroFill(this.seconds(), 2);
-});
-
-function meridiem (token, lowercase) {
-    addFormatToken(token, 0, 0, function () {
-        return this.localeData().meridiem(this.hours(), this.minutes(), lowercase);
-    });
-}
-
-meridiem('a', true);
-meridiem('A', false);
-
-// ALIASES
-
-addUnitAlias('hour', 'h');
-
-// PRIORITY
-addUnitPriority('hour', 13);
-
-// PARSING
-
-function matchMeridiem (isStrict, locale) {
-    return locale._meridiemParse;
-}
-
-addRegexToken('a',  matchMeridiem);
-addRegexToken('A',  matchMeridiem);
-addRegexToken('H',  match1to2);
-addRegexToken('h',  match1to2);
-addRegexToken('k',  match1to2);
-addRegexToken('HH', match1to2, match2);
-addRegexToken('hh', match1to2, match2);
-addRegexToken('kk', match1to2, match2);
-
-addRegexToken('hmm', match3to4);
-addRegexToken('hmmss', match5to6);
-addRegexToken('Hmm', match3to4);
-addRegexToken('Hmmss', match5to6);
-
-addParseToken(['H', 'HH'], HOUR);
-addParseToken(['k', 'kk'], function (input, array, config) {
-    var kInput = toInt(input);
-    array[HOUR] = kInput === 24 ? 0 : kInput;
-});
-addParseToken(['a', 'A'], function (input, array, config) {
-    config._isPm = config._locale.isPM(input);
-    config._meridiem = input;
-});
-addParseToken(['h', 'hh'], function (input, array, config) {
-    array[HOUR] = toInt(input);
-    getParsingFlags(config).bigHour = true;
-});
-addParseToken('hmm', function (input, array, config) {
-    var pos = input.length - 2;
-    array[HOUR] = toInt(input.substr(0, pos));
-    array[MINUTE] = toInt(input.substr(pos));
-    getParsingFlags(config).bigHour = true;
-});
-addParseToken('hmmss', function (input, array, config) {
-    var pos1 = input.length - 4;
-    var pos2 = input.length - 2;
-    array[HOUR] = toInt(input.substr(0, pos1));
-    array[MINUTE] = toInt(input.substr(pos1, 2));
-    array[SECOND] = toInt(input.substr(pos2));
-    getParsingFlags(config).bigHour = true;
-});
-addParseToken('Hmm', function (input, array, config) {
-    var pos = input.length - 2;
-    array[HOUR] = toInt(input.substr(0, pos));
-    array[MINUTE] = toInt(input.substr(pos));
-});
-addParseToken('Hmmss', function (input, array, config) {
-    var pos1 = input.length - 4;
-    var pos2 = input.length - 2;
-    array[HOUR] = toInt(input.substr(0, pos1));
-    array[MINUTE] = toInt(input.substr(pos1, 2));
-    array[SECOND] = toInt(input.substr(pos2));
-});
-
-// LOCALES
-
-function localeIsPM (input) {
-    // IE8 Quirks Mode & IE7 Standards Mode do not allow accessing strings like arrays
-    // Using charAt should be more compatible.
-    return ((input + '').toLowerCase().charAt(0) === 'p');
-}
-
-var defaultLocaleMeridiemParse = /[ap]\.?m?\.?/i;
-function localeMeridiem (hours, minutes, isLower) {
-    if (hours > 11) {
-        return isLower ? 'pm' : 'PM';
-    } else {
-        return isLower ? 'am' : 'AM';
-    }
-}
-
-
-// MOMENTS
-
-// Setting the hour should keep the time, because the user explicitly
-// specified which hour he wants. So trying to maintain the same hour (in
-// a new timezone) makes sense. Adding/subtracting hours does not follow
-// this rule.
-var getSetHour = makeGetSet('Hours', true);
-
-// months
-// week
-// weekdays
-// meridiem
-var baseConfig = {
-    calendar: defaultCalendar,
-    longDateFormat: defaultLongDateFormat,
-    invalidDate: defaultInvalidDate,
-    ordinal: defaultOrdinal,
-    dayOfMonthOrdinalParse: defaultDayOfMonthOrdinalParse,
-    relativeTime: defaultRelativeTime,
-
-    months: defaultLocaleMonths,
-    monthsShort: defaultLocaleMonthsShort,
-
-    week: defaultLocaleWeek,
-
-    weekdays: defaultLocaleWeekdays,
-    weekdaysMin: defaultLocaleWeekdaysMin,
-    weekdaysShort: defaultLocaleWeekdaysShort,
-
-    meridiemParse: defaultLocaleMeridiemParse
-};
-
-// internal storage for locale config files
-var locales = {};
-var localeFamilies = {};
-var globalLocale;
-
-function normalizeLocale(key) {
-    return key ? key.toLowerCase().replace('_', '-') : key;
-}
-
-// pick the locale from the array
-// try ['en-au', 'en-gb'] as 'en-au', 'en-gb', 'en', as in move through the list trying each
-// substring from most specific to least, but move to the next array item if it's a more specific variant than the current root
-function chooseLocale(names) {
-    var i = 0, j, next, locale, split;
-
-    while (i < names.length) {
-        split = normalizeLocale(names[i]).split('-');
-        j = split.length;
-        next = normalizeLocale(names[i + 1]);
-        next = next ? next.split('-') : null;
-        while (j > 0) {
-            locale = loadLocale(split.slice(0, j).join('-'));
-            if (locale) {
-                return locale;
-            }
-            if (next && next.length >= j && compareArrays(split, next, true) >= j - 1) {
-                //the next array item is better than a shallower substring of this one
-                break;
-            }
-            j--;
-        }
-        i++;
-    }
-    return null;
-}
-
-function loadLocale(name) {
-    var oldLocale = null;
-    // TODO: Find a better way to register and load all the locales in Node
-    if (!locales[name] && (typeof module !== 'undefined') &&
-            module && module.exports) {
-        try {
-            oldLocale = globalLocale._abbr;
-            require('./locale/' + name);
-            // because defineLocale currently also sets the global locale, we
-            // want to undo that for lazy loaded locales
-            getSetGlobalLocale(oldLocale);
-        } catch (e) { }
-    }
-    return locales[name];
-}
-
-// This function will load locale and then set the global locale.  If
-// no arguments are passed in, it will simply return the current global
-// locale key.
-function getSetGlobalLocale (key, values) {
-    var data;
-    if (key) {
-        if (isUndefined(values)) {
-            data = getLocale(key);
-        }
-        else {
-            data = defineLocale(key, values);
-        }
-
-        if (data) {
-            // moment.duration._locale = moment._locale = data;
-            globalLocale = data;
-        }
-    }
-
-    return globalLocale._abbr;
-}
-
-function defineLocale (name, config) {
-    if (config !== null) {
-        var parentConfig = baseConfig;
-        config.abbr = name;
-        if (locales[name] != null) {
-            deprecateSimple('defineLocaleOverride',
-                    'use moment.updateLocale(localeName, config) to change ' +
-                    'an existing locale. moment.defineLocale(localeName, ' +
-                    'config) should only be used for creating a new locale ' +
-                    'See http://momentjs.com/guides/#/warnings/define-locale/ for more info.');
-            parentConfig = locales[name]._config;
-        } else if (config.parentLocale != null) {
-            if (locales[config.parentLocale] != null) {
-                parentConfig = locales[config.parentLocale]._config;
+            if (isStrict) {
+                return this._monthsShortStrictRegex;
             } else {
-                if (!localeFamilies[config.parentLocale]) {
-                    localeFamilies[config.parentLocale] = [];
-                }
-                localeFamilies[config.parentLocale].push({
-                    name: name,
-                    config: config
-                });
-                return null;
+                return this._monthsShortRegex;
             }
+        } else {
+            if (!hasOwnProp(this, '_monthsShortRegex')) {
+                this._monthsShortRegex = defaultMonthsShortRegex;
+            }
+            return this._monthsShortStrictRegex && isStrict ?
+                this._monthsShortStrictRegex : this._monthsShortRegex;
         }
-        locales[name] = new Locale(mergeConfigs(parentConfig, config));
+    }
 
-        if (localeFamilies[name]) {
-            localeFamilies[name].forEach(function (x) {
-                defineLocale(x.name, x.config);
-            });
+    var defaultMonthsRegex = matchWord;
+    function monthsRegex (isStrict) {
+        if (this._monthsParseExact) {
+            if (!hasOwnProp(this, '_monthsRegex')) {
+                computeMonthsParse.call(this);
+            }
+            if (isStrict) {
+                return this._monthsStrictRegex;
+            } else {
+                return this._monthsRegex;
+            }
+        } else {
+            if (!hasOwnProp(this, '_monthsRegex')) {
+                this._monthsRegex = defaultMonthsRegex;
+            }
+            return this._monthsStrictRegex && isStrict ?
+                this._monthsStrictRegex : this._monthsRegex;
+        }
+    }
+
+    function computeMonthsParse () {
+        function cmpLenRev(a, b) {
+            return b.length - a.length;
         }
 
-        // backwards compat for now: also set the locale
-        // make sure we set the locale AFTER all child locales have been
-        // created, so we won't end up with the child locale set.
-        getSetGlobalLocale(name);
+        var shortPieces = [], longPieces = [], mixedPieces = [],
+            i, mom;
+        for (i = 0; i < 12; i++) {
+            // make the regex if we don't have it already
+            mom = createUTC([2000, i]);
+            shortPieces.push(this.monthsShort(mom, ''));
+            longPieces.push(this.months(mom, ''));
+            mixedPieces.push(this.months(mom, ''));
+            mixedPieces.push(this.monthsShort(mom, ''));
+        }
+        // Sorting makes sure if one month (or abbr) is a prefix of another it
+        // will match the longer piece.
+        shortPieces.sort(cmpLenRev);
+        longPieces.sort(cmpLenRev);
+        mixedPieces.sort(cmpLenRev);
+        for (i = 0; i < 12; i++) {
+            shortPieces[i] = regexEscape(shortPieces[i]);
+            longPieces[i] = regexEscape(longPieces[i]);
+        }
+        for (i = 0; i < 24; i++) {
+            mixedPieces[i] = regexEscape(mixedPieces[i]);
+        }
 
+        this._monthsRegex = new RegExp('^(' + mixedPieces.join('|') + ')', 'i');
+        this._monthsShortRegex = this._monthsRegex;
+        this._monthsStrictRegex = new RegExp('^(' + longPieces.join('|') + ')', 'i');
+        this._monthsShortStrictRegex = new RegExp('^(' + shortPieces.join('|') + ')', 'i');
+    }
+
+    function createDate (y, m, d, h, M, s, ms) {
+        // can't just apply() to create a date:
+        // https://stackoverflow.com/q/181348
+        var date = new Date(y, m, d, h, M, s, ms);
+
+        // the date constructor remaps years 0-99 to 1900-1999
+        if (y < 100 && y >= 0 && isFinite(date.getFullYear())) {
+            date.setFullYear(y);
+        }
+        return date;
+    }
+
+    function createUTCDate (y) {
+        var date = new Date(Date.UTC.apply(null, arguments));
+
+        // the Date.UTC function remaps years 0-99 to 1900-1999
+        if (y < 100 && y >= 0 && isFinite(date.getUTCFullYear())) {
+            date.setUTCFullYear(y);
+        }
+        return date;
+    }
+
+    // start-of-first-week - start-of-year
+    function firstWeekOffset(year, dow, doy) {
+        var // first-week day -- which january is always in the first week (4 for iso, 1 for other)
+            fwd = 7 + dow - doy,
+            // first-week day local weekday -- which local weekday is fwd
+            fwdlw = (7 + createUTCDate(year, 0, fwd).getUTCDay() - dow) % 7;
+
+        return -fwdlw + fwd - 1;
+    }
+
+    // https://en.wikipedia.org/wiki/ISO_week_date#Calculating_a_date_given_the_year.2C_week_number_and_weekday
+    function dayOfYearFromWeeks(year, week, weekday, dow, doy) {
+        var localWeekday = (7 + weekday - dow) % 7,
+            weekOffset = firstWeekOffset(year, dow, doy),
+            dayOfYear = 1 + 7 * (week - 1) + localWeekday + weekOffset,
+            resYear, resDayOfYear;
+
+        if (dayOfYear <= 0) {
+            resYear = year - 1;
+            resDayOfYear = daysInYear(resYear) + dayOfYear;
+        } else if (dayOfYear > daysInYear(year)) {
+            resYear = year + 1;
+            resDayOfYear = dayOfYear - daysInYear(year);
+        } else {
+            resYear = year;
+            resDayOfYear = dayOfYear;
+        }
+
+        return {
+            year: resYear,
+            dayOfYear: resDayOfYear
+        };
+    }
+
+    function weekOfYear(mom, dow, doy) {
+        var weekOffset = firstWeekOffset(mom.year(), dow, doy),
+            week = Math.floor((mom.dayOfYear() - weekOffset - 1) / 7) + 1,
+            resWeek, resYear;
+
+        if (week < 1) {
+            resYear = mom.year() - 1;
+            resWeek = week + weeksInYear(resYear, dow, doy);
+        } else if (week > weeksInYear(mom.year(), dow, doy)) {
+            resWeek = week - weeksInYear(mom.year(), dow, doy);
+            resYear = mom.year() + 1;
+        } else {
+            resYear = mom.year();
+            resWeek = week;
+        }
+
+        return {
+            week: resWeek,
+            year: resYear
+        };
+    }
+
+    function weeksInYear(year, dow, doy) {
+        var weekOffset = firstWeekOffset(year, dow, doy),
+            weekOffsetNext = firstWeekOffset(year + 1, dow, doy);
+        return (daysInYear(year) - weekOffset + weekOffsetNext) / 7;
+    }
+
+    // FORMATTING
+
+    addFormatToken('w', ['ww', 2], 'wo', 'week');
+    addFormatToken('W', ['WW', 2], 'Wo', 'isoWeek');
+
+    // ALIASES
+
+    addUnitAlias('week', 'w');
+    addUnitAlias('isoWeek', 'W');
+
+    // PRIORITIES
+
+    addUnitPriority('week', 5);
+    addUnitPriority('isoWeek', 5);
+
+    // PARSING
+
+    addRegexToken('w',  match1to2);
+    addRegexToken('ww', match1to2, match2);
+    addRegexToken('W',  match1to2);
+    addRegexToken('WW', match1to2, match2);
+
+    addWeekParseToken(['w', 'ww', 'W', 'WW'], function (input, week, config, token) {
+        week[token.substr(0, 1)] = toInt(input);
+    });
+
+    // HELPERS
+
+    // LOCALES
+
+    function localeWeek (mom) {
+        return weekOfYear(mom, this._week.dow, this._week.doy).week;
+    }
+
+    var defaultLocaleWeek = {
+        dow : 0, // Sunday is the first day of the week.
+        doy : 6  // The week that contains Jan 1st is the first week of the year.
+    };
+
+    function localeFirstDayOfWeek () {
+        return this._week.dow;
+    }
+
+    function localeFirstDayOfYear () {
+        return this._week.doy;
+    }
+
+    // MOMENTS
+
+    function getSetWeek (input) {
+        var week = this.localeData().week(this);
+        return input == null ? week : this.add((input - week) * 7, 'd');
+    }
+
+    function getSetISOWeek (input) {
+        var week = weekOfYear(this, 1, 4).week;
+        return input == null ? week : this.add((input - week) * 7, 'd');
+    }
+
+    // FORMATTING
+
+    addFormatToken('d', 0, 'do', 'day');
+
+    addFormatToken('dd', 0, 0, function (format) {
+        return this.localeData().weekdaysMin(this, format);
+    });
+
+    addFormatToken('ddd', 0, 0, function (format) {
+        return this.localeData().weekdaysShort(this, format);
+    });
+
+    addFormatToken('dddd', 0, 0, function (format) {
+        return this.localeData().weekdays(this, format);
+    });
+
+    addFormatToken('e', 0, 0, 'weekday');
+    addFormatToken('E', 0, 0, 'isoWeekday');
+
+    // ALIASES
+
+    addUnitAlias('day', 'd');
+    addUnitAlias('weekday', 'e');
+    addUnitAlias('isoWeekday', 'E');
+
+    // PRIORITY
+    addUnitPriority('day', 11);
+    addUnitPriority('weekday', 11);
+    addUnitPriority('isoWeekday', 11);
+
+    // PARSING
+
+    addRegexToken('d',    match1to2);
+    addRegexToken('e',    match1to2);
+    addRegexToken('E',    match1to2);
+    addRegexToken('dd',   function (isStrict, locale) {
+        return locale.weekdaysMinRegex(isStrict);
+    });
+    addRegexToken('ddd',   function (isStrict, locale) {
+        return locale.weekdaysShortRegex(isStrict);
+    });
+    addRegexToken('dddd',   function (isStrict, locale) {
+        return locale.weekdaysRegex(isStrict);
+    });
+
+    addWeekParseToken(['dd', 'ddd', 'dddd'], function (input, week, config, token) {
+        var weekday = config._locale.weekdaysParse(input, token, config._strict);
+        // if we didn't get a weekday name, mark the date as invalid
+        if (weekday != null) {
+            week.d = weekday;
+        } else {
+            getParsingFlags(config).invalidWeekday = input;
+        }
+    });
+
+    addWeekParseToken(['d', 'e', 'E'], function (input, week, config, token) {
+        week[token] = toInt(input);
+    });
+
+    // HELPERS
+
+    function parseWeekday(input, locale) {
+        if (typeof input !== 'string') {
+            return input;
+        }
+
+        if (!isNaN(input)) {
+            return parseInt(input, 10);
+        }
+
+        input = locale.weekdaysParse(input);
+        if (typeof input === 'number') {
+            return input;
+        }
 
-        return locales[name];
-    } else {
-        // useful for testing
-        delete locales[name];
         return null;
     }
-}
 
-function updateLocale(name, config) {
-    if (config != null) {
-        var locale, parentConfig = baseConfig;
-        // MERGE
-        if (locales[name] != null) {
-            parentConfig = locales[name]._config;
+    function parseIsoWeekday(input, locale) {
+        if (typeof input === 'string') {
+            return locale.weekdaysParse(input) % 7 || 7;
         }
-        config = mergeConfigs(parentConfig, config);
-        locale = new Locale(config);
-        locale.parentLocale = locales[name];
-        locales[name] = locale;
+        return isNaN(input) ? null : input;
+    }
 
-        // backwards compat for now: also set the locale
-        getSetGlobalLocale(name);
-    } else {
-        // pass null for config to unupdate, useful for tests
-        if (locales[name] != null) {
-            if (locales[name].parentLocale != null) {
-                locales[name] = locales[name].parentLocale;
-            } else if (locales[name] != null) {
-                delete locales[name];
+    // LOCALES
+
+    var defaultLocaleWeekdays = 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_');
+    function localeWeekdays (m, format) {
+        if (!m) {
+            return isArray(this._weekdays) ? this._weekdays :
+                this._weekdays['standalone'];
+        }
+        return isArray(this._weekdays) ? this._weekdays[m.day()] :
+            this._weekdays[this._weekdays.isFormat.test(format) ? 'format' : 'standalone'][m.day()];
+    }
+
+    var defaultLocaleWeekdaysShort = 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_');
+    function localeWeekdaysShort (m) {
+        return (m) ? this._weekdaysShort[m.day()] : this._weekdaysShort;
+    }
+
+    var defaultLocaleWeekdaysMin = 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_');
+    function localeWeekdaysMin (m) {
+        return (m) ? this._weekdaysMin[m.day()] : this._weekdaysMin;
+    }
+
+    function handleStrictParse$1(weekdayName, format, strict) {
+        var i, ii, mom, llc = weekdayName.toLocaleLowerCase();
+        if (!this._weekdaysParse) {
+            this._weekdaysParse = [];
+            this._shortWeekdaysParse = [];
+            this._minWeekdaysParse = [];
+
+            for (i = 0; i < 7; ++i) {
+                mom = createUTC([2000, 1]).day(i);
+                this._minWeekdaysParse[i] = this.weekdaysMin(mom, '').toLocaleLowerCase();
+                this._shortWeekdaysParse[i] = this.weekdaysShort(mom, '').toLocaleLowerCase();
+                this._weekdaysParse[i] = this.weekdays(mom, '').toLocaleLowerCase();
+            }
+        }
+
+        if (strict) {
+            if (format === 'dddd') {
+                ii = indexOf.call(this._weekdaysParse, llc);
+                return ii !== -1 ? ii : null;
+            } else if (format === 'ddd') {
+                ii = indexOf.call(this._shortWeekdaysParse, llc);
+                return ii !== -1 ? ii : null;
+            } else {
+                ii = indexOf.call(this._minWeekdaysParse, llc);
+                return ii !== -1 ? ii : null;
+            }
+        } else {
+            if (format === 'dddd') {
+                ii = indexOf.call(this._weekdaysParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._shortWeekdaysParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._minWeekdaysParse, llc);
+                return ii !== -1 ? ii : null;
+            } else if (format === 'ddd') {
+                ii = indexOf.call(this._shortWeekdaysParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._weekdaysParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._minWeekdaysParse, llc);
+                return ii !== -1 ? ii : null;
+            } else {
+                ii = indexOf.call(this._minWeekdaysParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._weekdaysParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._shortWeekdaysParse, llc);
+                return ii !== -1 ? ii : null;
             }
         }
     }
-    return locales[name];
-}
 
-// returns locale data
-function getLocale (key) {
-    var locale;
+    function localeWeekdaysParse (weekdayName, format, strict) {
+        var i, mom, regex;
 
-    if (key && key._locale && key._locale._abbr) {
-        key = key._locale._abbr;
+        if (this._weekdaysParseExact) {
+            return handleStrictParse$1.call(this, weekdayName, format, strict);
+        }
+
+        if (!this._weekdaysParse) {
+            this._weekdaysParse = [];
+            this._minWeekdaysParse = [];
+            this._shortWeekdaysParse = [];
+            this._fullWeekdaysParse = [];
+        }
+
+        for (i = 0; i < 7; i++) {
+            // make the regex if we don't have it already
+
+            mom = createUTC([2000, 1]).day(i);
+            if (strict && !this._fullWeekdaysParse[i]) {
+                this._fullWeekdaysParse[i] = new RegExp('^' + this.weekdays(mom, '').replace('.', '\.?') + '$', 'i');
+                this._shortWeekdaysParse[i] = new RegExp('^' + this.weekdaysShort(mom, '').replace('.', '\.?') + '$', 'i');
+                this._minWeekdaysParse[i] = new RegExp('^' + this.weekdaysMin(mom, '').replace('.', '\.?') + '$', 'i');
+            }
+            if (!this._weekdaysParse[i]) {
+                regex = '^' + this.weekdays(mom, '') + '|^' + this.weekdaysShort(mom, '') + '|^' + this.weekdaysMin(mom, '');
+                this._weekdaysParse[i] = new RegExp(regex.replace('.', ''), 'i');
+            }
+            // test the regex
+            if (strict && format === 'dddd' && this._fullWeekdaysParse[i].test(weekdayName)) {
+                return i;
+            } else if (strict && format === 'ddd' && this._shortWeekdaysParse[i].test(weekdayName)) {
+                return i;
+            } else if (strict && format === 'dd' && this._minWeekdaysParse[i].test(weekdayName)) {
+                return i;
+            } else if (!strict && this._weekdaysParse[i].test(weekdayName)) {
+                return i;
+            }
+        }
     }
 
-    if (!key) {
+    // MOMENTS
+
+    function getSetDayOfWeek (input) {
+        if (!this.isValid()) {
+            return input != null ? this : NaN;
+        }
+        var day = this._isUTC ? this._d.getUTCDay() : this._d.getDay();
+        if (input != null) {
+            input = parseWeekday(input, this.localeData());
+            return this.add(input - day, 'd');
+        } else {
+            return day;
+        }
+    }
+
+    function getSetLocaleDayOfWeek (input) {
+        if (!this.isValid()) {
+            return input != null ? this : NaN;
+        }
+        var weekday = (this.day() + 7 - this.localeData()._week.dow) % 7;
+        return input == null ? weekday : this.add(input - weekday, 'd');
+    }
+
+    function getSetISODayOfWeek (input) {
+        if (!this.isValid()) {
+            return input != null ? this : NaN;
+        }
+
+        // behaves the same as moment#day except
+        // as a getter, returns 7 instead of 0 (1-7 range instead of 0-6)
+        // as a setter, sunday should belong to the previous week.
+
+        if (input != null) {
+            var weekday = parseIsoWeekday(input, this.localeData());
+            return this.day(this.day() % 7 ? weekday : weekday - 7);
+        } else {
+            return this.day() || 7;
+        }
+    }
+
+    var defaultWeekdaysRegex = matchWord;
+    function weekdaysRegex (isStrict) {
+        if (this._weekdaysParseExact) {
+            if (!hasOwnProp(this, '_weekdaysRegex')) {
+                computeWeekdaysParse.call(this);
+            }
+            if (isStrict) {
+                return this._weekdaysStrictRegex;
+            } else {
+                return this._weekdaysRegex;
+            }
+        } else {
+            if (!hasOwnProp(this, '_weekdaysRegex')) {
+                this._weekdaysRegex = defaultWeekdaysRegex;
+            }
+            return this._weekdaysStrictRegex && isStrict ?
+                this._weekdaysStrictRegex : this._weekdaysRegex;
+        }
+    }
+
+    var defaultWeekdaysShortRegex = matchWord;
+    function weekdaysShortRegex (isStrict) {
+        if (this._weekdaysParseExact) {
+            if (!hasOwnProp(this, '_weekdaysRegex')) {
+                computeWeekdaysParse.call(this);
+            }
+            if (isStrict) {
+                return this._weekdaysShortStrictRegex;
+            } else {
+                return this._weekdaysShortRegex;
+            }
+        } else {
+            if (!hasOwnProp(this, '_weekdaysShortRegex')) {
+                this._weekdaysShortRegex = defaultWeekdaysShortRegex;
+            }
+            return this._weekdaysShortStrictRegex && isStrict ?
+                this._weekdaysShortStrictRegex : this._weekdaysShortRegex;
+        }
+    }
+
+    var defaultWeekdaysMinRegex = matchWord;
+    function weekdaysMinRegex (isStrict) {
+        if (this._weekdaysParseExact) {
+            if (!hasOwnProp(this, '_weekdaysRegex')) {
+                computeWeekdaysParse.call(this);
+            }
+            if (isStrict) {
+                return this._weekdaysMinStrictRegex;
+            } else {
+                return this._weekdaysMinRegex;
+            }
+        } else {
+            if (!hasOwnProp(this, '_weekdaysMinRegex')) {
+                this._weekdaysMinRegex = defaultWeekdaysMinRegex;
+            }
+            return this._weekdaysMinStrictRegex && isStrict ?
+                this._weekdaysMinStrictRegex : this._weekdaysMinRegex;
+        }
+    }
+
+
+    function computeWeekdaysParse () {
+        function cmpLenRev(a, b) {
+            return b.length - a.length;
+        }
+
+        var minPieces = [], shortPieces = [], longPieces = [], mixedPieces = [],
+            i, mom, minp, shortp, longp;
+        for (i = 0; i < 7; i++) {
+            // make the regex if we don't have it already
+            mom = createUTC([2000, 1]).day(i);
+            minp = this.weekdaysMin(mom, '');
+            shortp = this.weekdaysShort(mom, '');
+            longp = this.weekdays(mom, '');
+            minPieces.push(minp);
+            shortPieces.push(shortp);
+            longPieces.push(longp);
+            mixedPieces.push(minp);
+            mixedPieces.push(shortp);
+            mixedPieces.push(longp);
+        }
+        // Sorting makes sure if one weekday (or abbr) is a prefix of another it
+        // will match the longer piece.
+        minPieces.sort(cmpLenRev);
+        shortPieces.sort(cmpLenRev);
+        longPieces.sort(cmpLenRev);
+        mixedPieces.sort(cmpLenRev);
+        for (i = 0; i < 7; i++) {
+            shortPieces[i] = regexEscape(shortPieces[i]);
+            longPieces[i] = regexEscape(longPieces[i]);
+            mixedPieces[i] = regexEscape(mixedPieces[i]);
+        }
+
+        this._weekdaysRegex = new RegExp('^(' + mixedPieces.join('|') + ')', 'i');
+        this._weekdaysShortRegex = this._weekdaysRegex;
+        this._weekdaysMinRegex = this._weekdaysRegex;
+
+        this._weekdaysStrictRegex = new RegExp('^(' + longPieces.join('|') + ')', 'i');
+        this._weekdaysShortStrictRegex = new RegExp('^(' + shortPieces.join('|') + ')', 'i');
+        this._weekdaysMinStrictRegex = new RegExp('^(' + minPieces.join('|') + ')', 'i');
+    }
+
+    // FORMATTING
+
+    function hFormat() {
+        return this.hours() % 12 || 12;
+    }
+
+    function kFormat() {
+        return this.hours() || 24;
+    }
+
+    addFormatToken('H', ['HH', 2], 0, 'hour');
+    addFormatToken('h', ['hh', 2], 0, hFormat);
+    addFormatToken('k', ['kk', 2], 0, kFormat);
+
+    addFormatToken('hmm', 0, 0, function () {
+        return '' + hFormat.apply(this) + zeroFill(this.minutes(), 2);
+    });
+
+    addFormatToken('hmmss', 0, 0, function () {
+        return '' + hFormat.apply(this) + zeroFill(this.minutes(), 2) +
+            zeroFill(this.seconds(), 2);
+    });
+
+    addFormatToken('Hmm', 0, 0, function () {
+        return '' + this.hours() + zeroFill(this.minutes(), 2);
+    });
+
+    addFormatToken('Hmmss', 0, 0, function () {
+        return '' + this.hours() + zeroFill(this.minutes(), 2) +
+            zeroFill(this.seconds(), 2);
+    });
+
+    function meridiem (token, lowercase) {
+        addFormatToken(token, 0, 0, function () {
+            return this.localeData().meridiem(this.hours(), this.minutes(), lowercase);
+        });
+    }
+
+    meridiem('a', true);
+    meridiem('A', false);
+
+    // ALIASES
+
+    addUnitAlias('hour', 'h');
+
+    // PRIORITY
+    addUnitPriority('hour', 13);
+
+    // PARSING
+
+    function matchMeridiem (isStrict, locale) {
+        return locale._meridiemParse;
+    }
+
+    addRegexToken('a',  matchMeridiem);
+    addRegexToken('A',  matchMeridiem);
+    addRegexToken('H',  match1to2);
+    addRegexToken('h',  match1to2);
+    addRegexToken('k',  match1to2);
+    addRegexToken('HH', match1to2, match2);
+    addRegexToken('hh', match1to2, match2);
+    addRegexToken('kk', match1to2, match2);
+
+    addRegexToken('hmm', match3to4);
+    addRegexToken('hmmss', match5to6);
+    addRegexToken('Hmm', match3to4);
+    addRegexToken('Hmmss', match5to6);
+
+    addParseToken(['H', 'HH'], HOUR);
+    addParseToken(['k', 'kk'], function (input, array, config) {
+        var kInput = toInt(input);
+        array[HOUR] = kInput === 24 ? 0 : kInput;
+    });
+    addParseToken(['a', 'A'], function (input, array, config) {
+        config._isPm = config._locale.isPM(input);
+        config._meridiem = input;
+    });
+    addParseToken(['h', 'hh'], function (input, array, config) {
+        array[HOUR] = toInt(input);
+        getParsingFlags(config).bigHour = true;
+    });
+    addParseToken('hmm', function (input, array, config) {
+        var pos = input.length - 2;
+        array[HOUR] = toInt(input.substr(0, pos));
+        array[MINUTE] = toInt(input.substr(pos));
+        getParsingFlags(config).bigHour = true;
+    });
+    addParseToken('hmmss', function (input, array, config) {
+        var pos1 = input.length - 4;
+        var pos2 = input.length - 2;
+        array[HOUR] = toInt(input.substr(0, pos1));
+        array[MINUTE] = toInt(input.substr(pos1, 2));
+        array[SECOND] = toInt(input.substr(pos2));
+        getParsingFlags(config).bigHour = true;
+    });
+    addParseToken('Hmm', function (input, array, config) {
+        var pos = input.length - 2;
+        array[HOUR] = toInt(input.substr(0, pos));
+        array[MINUTE] = toInt(input.substr(pos));
+    });
+    addParseToken('Hmmss', function (input, array, config) {
+        var pos1 = input.length - 4;
+        var pos2 = input.length - 2;
+        array[HOUR] = toInt(input.substr(0, pos1));
+        array[MINUTE] = toInt(input.substr(pos1, 2));
+        array[SECOND] = toInt(input.substr(pos2));
+    });
+
+    // LOCALES
+
+    function localeIsPM (input) {
+        // IE8 Quirks Mode & IE7 Standards Mode do not allow accessing strings like arrays
+        // Using charAt should be more compatible.
+        return ((input + '').toLowerCase().charAt(0) === 'p');
+    }
+
+    var defaultLocaleMeridiemParse = /[ap]\.?m?\.?/i;
+    function localeMeridiem (hours, minutes, isLower) {
+        if (hours > 11) {
+            return isLower ? 'pm' : 'PM';
+        } else {
+            return isLower ? 'am' : 'AM';
+        }
+    }
+
+
+    // MOMENTS
+
+    // Setting the hour should keep the time, because the user explicitly
+    // specified which hour they want. So trying to maintain the same hour (in
+    // a new timezone) makes sense. Adding/subtracting hours does not follow
+    // this rule.
+    var getSetHour = makeGetSet('Hours', true);
+
+    var baseConfig = {
+        calendar: defaultCalendar,
+        longDateFormat: defaultLongDateFormat,
+        invalidDate: defaultInvalidDate,
+        ordinal: defaultOrdinal,
+        dayOfMonthOrdinalParse: defaultDayOfMonthOrdinalParse,
+        relativeTime: defaultRelativeTime,
+
+        months: defaultLocaleMonths,
+        monthsShort: defaultLocaleMonthsShort,
+
+        week: defaultLocaleWeek,
+
+        weekdays: defaultLocaleWeekdays,
+        weekdaysMin: defaultLocaleWeekdaysMin,
+        weekdaysShort: defaultLocaleWeekdaysShort,
+
+        meridiemParse: defaultLocaleMeridiemParse
+    };
+
+    // internal storage for locale config files
+    var locales = {};
+    var localeFamilies = {};
+    var globalLocale;
+
+    function normalizeLocale(key) {
+        return key ? key.toLowerCase().replace('_', '-') : key;
+    }
+
+    // pick the locale from the array
+    // try ['en-au', 'en-gb'] as 'en-au', 'en-gb', 'en', as in move through the list trying each
+    // substring from most specific to least, but move to the next array item if it's a more specific variant than the current root
+    function chooseLocale(names) {
+        var i = 0, j, next, locale, split;
+
+        while (i < names.length) {
+            split = normalizeLocale(names[i]).split('-');
+            j = split.length;
+            next = normalizeLocale(names[i + 1]);
+            next = next ? next.split('-') : null;
+            while (j > 0) {
+                locale = loadLocale(split.slice(0, j).join('-'));
+                if (locale) {
+                    return locale;
+                }
+                if (next && next.length >= j && compareArrays(split, next, true) >= j - 1) {
+                    //the next array item is better than a shallower substring of this one
+                    break;
+                }
+                j--;
+            }
+            i++;
+        }
         return globalLocale;
     }
 
-    if (!isArray(key)) {
-        //short-circuit everything else
-        locale = loadLocale(key);
-        if (locale) {
-            return locale;
+    function loadLocale(name) {
+        var oldLocale = null;
+        // TODO: Find a better way to register and load all the locales in Node
+        if (!locales[name] && (typeof module !== 'undefined') &&
+                module && module.exports) {
+            try {
+                oldLocale = globalLocale._abbr;
+                var aliasedRequire = require;
+                aliasedRequire('./locale/' + name);
+                getSetGlobalLocale(oldLocale);
+            } catch (e) {}
         }
-        key = [key];
+        return locales[name];
     }
 
-    return chooseLocale(key);
-}
+    // This function will load locale and then set the global locale.  If
+    // no arguments are passed in, it will simply return the current global
+    // locale key.
+    function getSetGlobalLocale (key, values) {
+        var data;
+        if (key) {
+            if (isUndefined(values)) {
+                data = getLocale(key);
+            }
+            else {
+                data = defineLocale(key, values);
+            }
 
-function listLocales() {
-    return keys$1(locales);
-}
-
-function checkOverflow (m) {
-    var overflow;
-    var a = m._a;
-
-    if (a && getParsingFlags(m).overflow === -2) {
-        overflow =
-            a[MONTH]       < 0 || a[MONTH]       > 11  ? MONTH :
-            a[DATE]        < 1 || a[DATE]        > daysInMonth(a[YEAR], a[MONTH]) ? DATE :
-            a[HOUR]        < 0 || a[HOUR]        > 24 || (a[HOUR] === 24 && (a[MINUTE] !== 0 || a[SECOND] !== 0 || a[MILLISECOND] !== 0)) ? HOUR :
-            a[MINUTE]      < 0 || a[MINUTE]      > 59  ? MINUTE :
-            a[SECOND]      < 0 || a[SECOND]      > 59  ? SECOND :
-            a[MILLISECOND] < 0 || a[MILLISECOND] > 999 ? MILLISECOND :
-            -1;
-
-        if (getParsingFlags(m)._overflowDayOfYear && (overflow < YEAR || overflow > DATE)) {
-            overflow = DATE;
-        }
-        if (getParsingFlags(m)._overflowWeeks && overflow === -1) {
-            overflow = WEEK;
-        }
-        if (getParsingFlags(m)._overflowWeekday && overflow === -1) {
-            overflow = WEEKDAY;
-        }
-
-        getParsingFlags(m).overflow = overflow;
-    }
-
-    return m;
-}
-
-// iso 8601 regex
-// 0000-00-00 0000-W00 or 0000-W00-0 + T + 00 or 00:00 or 00:00:00 or 00:00:00.000 + +00:00 or +0000 or +00)
-var extendedIsoRegex = /^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/;
-var basicIsoRegex = /^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/;
-
-var tzRegex = /Z|[+-]\d\d(?::?\d\d)?/;
-
-var isoDates = [
-    ['YYYYYY-MM-DD', /[+-]\d{6}-\d\d-\d\d/],
-    ['YYYY-MM-DD', /\d{4}-\d\d-\d\d/],
-    ['GGGG-[W]WW-E', /\d{4}-W\d\d-\d/],
-    ['GGGG-[W]WW', /\d{4}-W\d\d/, false],
-    ['YYYY-DDD', /\d{4}-\d{3}/],
-    ['YYYY-MM', /\d{4}-\d\d/, false],
-    ['YYYYYYMMDD', /[+-]\d{10}/],
-    ['YYYYMMDD', /\d{8}/],
-    // YYYYMM is NOT allowed by the standard
-    ['GGGG[W]WWE', /\d{4}W\d{3}/],
-    ['GGGG[W]WW', /\d{4}W\d{2}/, false],
-    ['YYYYDDD', /\d{7}/]
-];
-
-// iso time formats and regexes
-var isoTimes = [
-    ['HH:mm:ss.SSSS', /\d\d:\d\d:\d\d\.\d+/],
-    ['HH:mm:ss,SSSS', /\d\d:\d\d:\d\d,\d+/],
-    ['HH:mm:ss', /\d\d:\d\d:\d\d/],
-    ['HH:mm', /\d\d:\d\d/],
-    ['HHmmss.SSSS', /\d\d\d\d\d\d\.\d+/],
-    ['HHmmss,SSSS', /\d\d\d\d\d\d,\d+/],
-    ['HHmmss', /\d\d\d\d\d\d/],
-    ['HHmm', /\d\d\d\d/],
-    ['HH', /\d\d/]
-];
-
-var aspNetJsonRegex = /^\/?Date\((\-?\d+)/i;
-
-// date from iso format
-function configFromISO(config) {
-    var i, l,
-        string = config._i,
-        match = extendedIsoRegex.exec(string) || basicIsoRegex.exec(string),
-        allowTime, dateFormat, timeFormat, tzFormat;
-
-    if (match) {
-        getParsingFlags(config).iso = true;
-
-        for (i = 0, l = isoDates.length; i < l; i++) {
-            if (isoDates[i][1].exec(match[1])) {
-                dateFormat = isoDates[i][0];
-                allowTime = isoDates[i][2] !== false;
-                break;
+            if (data) {
+                // moment.duration._locale = moment._locale = data;
+                globalLocale = data;
+            }
+            else {
+                if ((typeof console !==  'undefined') && console.warn) {
+                    //warn user if arguments are passed but the locale could not be set
+                    console.warn('Locale ' + key +  ' not found. Did you forget to load it?');
+                }
             }
         }
-        if (dateFormat == null) {
-            config._isValid = false;
+
+        return globalLocale._abbr;
+    }
+
+    function defineLocale (name, config) {
+        if (config !== null) {
+            var locale, parentConfig = baseConfig;
+            config.abbr = name;
+            if (locales[name] != null) {
+                deprecateSimple('defineLocaleOverride',
+                        'use moment.updateLocale(localeName, config) to change ' +
+                        'an existing locale. moment.defineLocale(localeName, ' +
+                        'config) should only be used for creating a new locale ' +
+                        'See http://momentjs.com/guides/#/warnings/define-locale/ for more info.');
+                parentConfig = locales[name]._config;
+            } else if (config.parentLocale != null) {
+                if (locales[config.parentLocale] != null) {
+                    parentConfig = locales[config.parentLocale]._config;
+                } else {
+                    locale = loadLocale(config.parentLocale);
+                    if (locale != null) {
+                        parentConfig = locale._config;
+                    } else {
+                        if (!localeFamilies[config.parentLocale]) {
+                            localeFamilies[config.parentLocale] = [];
+                        }
+                        localeFamilies[config.parentLocale].push({
+                            name: name,
+                            config: config
+                        });
+                        return null;
+                    }
+                }
+            }
+            locales[name] = new Locale(mergeConfigs(parentConfig, config));
+
+            if (localeFamilies[name]) {
+                localeFamilies[name].forEach(function (x) {
+                    defineLocale(x.name, x.config);
+                });
+            }
+
+            // backwards compat for now: also set the locale
+            // make sure we set the locale AFTER all child locales have been
+            // created, so we won't end up with the child locale set.
+            getSetGlobalLocale(name);
+
+
+            return locales[name];
+        } else {
+            // useful for testing
+            delete locales[name];
+            return null;
+        }
+    }
+
+    function updateLocale(name, config) {
+        if (config != null) {
+            var locale, tmpLocale, parentConfig = baseConfig;
+            // MERGE
+            tmpLocale = loadLocale(name);
+            if (tmpLocale != null) {
+                parentConfig = tmpLocale._config;
+            }
+            config = mergeConfigs(parentConfig, config);
+            locale = new Locale(config);
+            locale.parentLocale = locales[name];
+            locales[name] = locale;
+
+            // backwards compat for now: also set the locale
+            getSetGlobalLocale(name);
+        } else {
+            // pass null for config to unupdate, useful for tests
+            if (locales[name] != null) {
+                if (locales[name].parentLocale != null) {
+                    locales[name] = locales[name].parentLocale;
+                } else if (locales[name] != null) {
+                    delete locales[name];
+                }
+            }
+        }
+        return locales[name];
+    }
+
+    // returns locale data
+    function getLocale (key) {
+        var locale;
+
+        if (key && key._locale && key._locale._abbr) {
+            key = key._locale._abbr;
+        }
+
+        if (!key) {
+            return globalLocale;
+        }
+
+        if (!isArray(key)) {
+            //short-circuit everything else
+            locale = loadLocale(key);
+            if (locale) {
+                return locale;
+            }
+            key = [key];
+        }
+
+        return chooseLocale(key);
+    }
+
+    function listLocales() {
+        return keys(locales);
+    }
+
+    function checkOverflow (m) {
+        var overflow;
+        var a = m._a;
+
+        if (a && getParsingFlags(m).overflow === -2) {
+            overflow =
+                a[MONTH]       < 0 || a[MONTH]       > 11  ? MONTH :
+                a[DATE]        < 1 || a[DATE]        > daysInMonth(a[YEAR], a[MONTH]) ? DATE :
+                a[HOUR]        < 0 || a[HOUR]        > 24 || (a[HOUR] === 24 && (a[MINUTE] !== 0 || a[SECOND] !== 0 || a[MILLISECOND] !== 0)) ? HOUR :
+                a[MINUTE]      < 0 || a[MINUTE]      > 59  ? MINUTE :
+                a[SECOND]      < 0 || a[SECOND]      > 59  ? SECOND :
+                a[MILLISECOND] < 0 || a[MILLISECOND] > 999 ? MILLISECOND :
+                -1;
+
+            if (getParsingFlags(m)._overflowDayOfYear && (overflow < YEAR || overflow > DATE)) {
+                overflow = DATE;
+            }
+            if (getParsingFlags(m)._overflowWeeks && overflow === -1) {
+                overflow = WEEK;
+            }
+            if (getParsingFlags(m)._overflowWeekday && overflow === -1) {
+                overflow = WEEKDAY;
+            }
+
+            getParsingFlags(m).overflow = overflow;
+        }
+
+        return m;
+    }
+
+    // Pick the first defined of two or three arguments.
+    function defaults(a, b, c) {
+        if (a != null) {
+            return a;
+        }
+        if (b != null) {
+            return b;
+        }
+        return c;
+    }
+
+    function currentDateArray(config) {
+        // hooks is actually the exported moment object
+        var nowValue = new Date(hooks.now());
+        if (config._useUTC) {
+            return [nowValue.getUTCFullYear(), nowValue.getUTCMonth(), nowValue.getUTCDate()];
+        }
+        return [nowValue.getFullYear(), nowValue.getMonth(), nowValue.getDate()];
+    }
+
+    // convert an array to a date.
+    // the array should mirror the parameters below
+    // note: all values past the year are optional and will default to the lowest possible value.
+    // [year, month, day , hour, minute, second, millisecond]
+    function configFromArray (config) {
+        var i, date, input = [], currentDate, expectedWeekday, yearToUse;
+
+        if (config._d) {
             return;
         }
-        if (match[3]) {
-            for (i = 0, l = isoTimes.length; i < l; i++) {
-                if (isoTimes[i][1].exec(match[3])) {
-                    // match[2] should be 'T' or space
-                    timeFormat = (match[2] || ' ') + isoTimes[i][0];
+
+        currentDate = currentDateArray(config);
+
+        //compute day of the year from weeks and weekdays
+        if (config._w && config._a[DATE] == null && config._a[MONTH] == null) {
+            dayOfYearFromWeekInfo(config);
+        }
+
+        //if the day of the year is set, figure out what it is
+        if (config._dayOfYear != null) {
+            yearToUse = defaults(config._a[YEAR], currentDate[YEAR]);
+
+            if (config._dayOfYear > daysInYear(yearToUse) || config._dayOfYear === 0) {
+                getParsingFlags(config)._overflowDayOfYear = true;
+            }
+
+            date = createUTCDate(yearToUse, 0, config._dayOfYear);
+            config._a[MONTH] = date.getUTCMonth();
+            config._a[DATE] = date.getUTCDate();
+        }
+
+        // Default to current date.
+        // * if no year, month, day of month are given, default to today
+        // * if day of month is given, default month and year
+        // * if month is given, default only year
+        // * if year is given, don't default anything
+        for (i = 0; i < 3 && config._a[i] == null; ++i) {
+            config._a[i] = input[i] = currentDate[i];
+        }
+
+        // Zero out whatever was not defaulted, including time
+        for (; i < 7; i++) {
+            config._a[i] = input[i] = (config._a[i] == null) ? (i === 2 ? 1 : 0) : config._a[i];
+        }
+
+        // Check for 24:00:00.000
+        if (config._a[HOUR] === 24 &&
+                config._a[MINUTE] === 0 &&
+                config._a[SECOND] === 0 &&
+                config._a[MILLISECOND] === 0) {
+            config._nextDay = true;
+            config._a[HOUR] = 0;
+        }
+
+        config._d = (config._useUTC ? createUTCDate : createDate).apply(null, input);
+        expectedWeekday = config._useUTC ? config._d.getUTCDay() : config._d.getDay();
+
+        // Apply timezone offset from input. The actual utcOffset can be changed
+        // with parseZone.
+        if (config._tzm != null) {
+            config._d.setUTCMinutes(config._d.getUTCMinutes() - config._tzm);
+        }
+
+        if (config._nextDay) {
+            config._a[HOUR] = 24;
+        }
+
+        // check for mismatching day of week
+        if (config._w && typeof config._w.d !== 'undefined' && config._w.d !== expectedWeekday) {
+            getParsingFlags(config).weekdayMismatch = true;
+        }
+    }
+
+    function dayOfYearFromWeekInfo(config) {
+        var w, weekYear, week, weekday, dow, doy, temp, weekdayOverflow;
+
+        w = config._w;
+        if (w.GG != null || w.W != null || w.E != null) {
+            dow = 1;
+            doy = 4;
+
+            // TODO: We need to take the current isoWeekYear, but that depends on
+            // how we interpret now (local, utc, fixed offset). So create
+            // a now version of current config (take local/utc/offset flags, and
+            // create now).
+            weekYear = defaults(w.GG, config._a[YEAR], weekOfYear(createLocal(), 1, 4).year);
+            week = defaults(w.W, 1);
+            weekday = defaults(w.E, 1);
+            if (weekday < 1 || weekday > 7) {
+                weekdayOverflow = true;
+            }
+        } else {
+            dow = config._locale._week.dow;
+            doy = config._locale._week.doy;
+
+            var curWeek = weekOfYear(createLocal(), dow, doy);
+
+            weekYear = defaults(w.gg, config._a[YEAR], curWeek.year);
+
+            // Default to current week.
+            week = defaults(w.w, curWeek.week);
+
+            if (w.d != null) {
+                // weekday -- low day numbers are considered next week
+                weekday = w.d;
+                if (weekday < 0 || weekday > 6) {
+                    weekdayOverflow = true;
+                }
+            } else if (w.e != null) {
+                // local weekday -- counting starts from begining of week
+                weekday = w.e + dow;
+                if (w.e < 0 || w.e > 6) {
+                    weekdayOverflow = true;
+                }
+            } else {
+                // default to begining of week
+                weekday = dow;
+            }
+        }
+        if (week < 1 || week > weeksInYear(weekYear, dow, doy)) {
+            getParsingFlags(config)._overflowWeeks = true;
+        } else if (weekdayOverflow != null) {
+            getParsingFlags(config)._overflowWeekday = true;
+        } else {
+            temp = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy);
+            config._a[YEAR] = temp.year;
+            config._dayOfYear = temp.dayOfYear;
+        }
+    }
+
+    // iso 8601 regex
+    // 0000-00-00 0000-W00 or 0000-W00-0 + T + 00 or 00:00 or 00:00:00 or 00:00:00.000 + +00:00 or +0000 or +00)
+    var extendedIsoRegex = /^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/;
+    var basicIsoRegex = /^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/;
+
+    var tzRegex = /Z|[+-]\d\d(?::?\d\d)?/;
+
+    var isoDates = [
+        ['YYYYYY-MM-DD', /[+-]\d{6}-\d\d-\d\d/],
+        ['YYYY-MM-DD', /\d{4}-\d\d-\d\d/],
+        ['GGGG-[W]WW-E', /\d{4}-W\d\d-\d/],
+        ['GGGG-[W]WW', /\d{4}-W\d\d/, false],
+        ['YYYY-DDD', /\d{4}-\d{3}/],
+        ['YYYY-MM', /\d{4}-\d\d/, false],
+        ['YYYYYYMMDD', /[+-]\d{10}/],
+        ['YYYYMMDD', /\d{8}/],
+        // YYYYMM is NOT allowed by the standard
+        ['GGGG[W]WWE', /\d{4}W\d{3}/],
+        ['GGGG[W]WW', /\d{4}W\d{2}/, false],
+        ['YYYYDDD', /\d{7}/]
+    ];
+
+    // iso time formats and regexes
+    var isoTimes = [
+        ['HH:mm:ss.SSSS', /\d\d:\d\d:\d\d\.\d+/],
+        ['HH:mm:ss,SSSS', /\d\d:\d\d:\d\d,\d+/],
+        ['HH:mm:ss', /\d\d:\d\d:\d\d/],
+        ['HH:mm', /\d\d:\d\d/],
+        ['HHmmss.SSSS', /\d\d\d\d\d\d\.\d+/],
+        ['HHmmss,SSSS', /\d\d\d\d\d\d,\d+/],
+        ['HHmmss', /\d\d\d\d\d\d/],
+        ['HHmm', /\d\d\d\d/],
+        ['HH', /\d\d/]
+    ];
+
+    var aspNetJsonRegex = /^\/?Date\((\-?\d+)/i;
+
+    // date from iso format
+    function configFromISO(config) {
+        var i, l,
+            string = config._i,
+            match = extendedIsoRegex.exec(string) || basicIsoRegex.exec(string),
+            allowTime, dateFormat, timeFormat, tzFormat;
+
+        if (match) {
+            getParsingFlags(config).iso = true;
+
+            for (i = 0, l = isoDates.length; i < l; i++) {
+                if (isoDates[i][1].exec(match[1])) {
+                    dateFormat = isoDates[i][0];
+                    allowTime = isoDates[i][2] !== false;
                     break;
                 }
             }
-            if (timeFormat == null) {
+            if (dateFormat == null) {
                 config._isValid = false;
                 return;
             }
-        }
-        if (!allowTime && timeFormat != null) {
+            if (match[3]) {
+                for (i = 0, l = isoTimes.length; i < l; i++) {
+                    if (isoTimes[i][1].exec(match[3])) {
+                        // match[2] should be 'T' or space
+                        timeFormat = (match[2] || ' ') + isoTimes[i][0];
+                        break;
+                    }
+                }
+                if (timeFormat == null) {
+                    config._isValid = false;
+                    return;
+                }
+            }
+            if (!allowTime && timeFormat != null) {
+                config._isValid = false;
+                return;
+            }
+            if (match[4]) {
+                if (tzRegex.exec(match[4])) {
+                    tzFormat = 'Z';
+                } else {
+                    config._isValid = false;
+                    return;
+                }
+            }
+            config._f = dateFormat + (timeFormat || '') + (tzFormat || '');
+            configFromStringAndFormat(config);
+        } else {
             config._isValid = false;
-            return;
         }
-        if (match[4]) {
-            if (tzRegex.exec(match[4])) {
-                tzFormat = 'Z';
-            } else {
-                config._isValid = false;
-                return;
-            }
-        }
-        config._f = dateFormat + (timeFormat || '') + (tzFormat || '');
-        configFromStringAndFormat(config);
-    } else {
-        config._isValid = false;
     }
-}
 
-// RFC 2822 regex: For details see https://tools.ietf.org/html/rfc2822#section-3.3
-var basicRfcRegex = /^((?:Mon|Tue|Wed|Thu|Fri|Sat|Sun),?\s)?(\d?\d\s(?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s(?:\d\d)?\d\d\s)(\d\d:\d\d)(\:\d\d)?(\s(?:UT|GMT|[ECMP][SD]T|[A-IK-Za-ik-z]|[+-]\d{4}))$/;
+    // RFC 2822 regex: For details see https://tools.ietf.org/html/rfc2822#section-3.3
+    var rfc2822 = /^(?:(Mon|Tue|Wed|Thu|Fri|Sat|Sun),?\s)?(\d{1,2})\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s(\d{2,4})\s(\d\d):(\d\d)(?::(\d\d))?\s(?:(UT|GMT|[ECMP][SD]T)|([Zz])|([+-]\d{4}))$/;
 
-// date and time from ref 2822 format
-function configFromRFC2822(config) {
-    var string, match, dayFormat,
-        dateFormat, timeFormat, tzFormat;
-    var timezones = {
-        ' GMT': ' +0000',
-        ' EDT': ' -0400',
-        ' EST': ' -0500',
-        ' CDT': ' -0500',
-        ' CST': ' -0600',
-        ' MDT': ' -0600',
-        ' MST': ' -0700',
-        ' PDT': ' -0700',
-        ' PST': ' -0800'
-    };
-    var military = 'YXWVUTSRQPONZABCDEFGHIKLM';
-    var timezone, timezoneIndex;
+    function extractFromRFC2822Strings(yearStr, monthStr, dayStr, hourStr, minuteStr, secondStr) {
+        var result = [
+            untruncateYear(yearStr),
+            defaultLocaleMonthsShort.indexOf(monthStr),
+            parseInt(dayStr, 10),
+            parseInt(hourStr, 10),
+            parseInt(minuteStr, 10)
+        ];
 
-    string = config._i
-        .replace(/\([^\)]*\)|[\n\t]/g, ' ') // Remove comments and folding whitespace
-        .replace(/(\s\s+)/g, ' ') // Replace multiple-spaces with a single space
-        .replace(/^\s|\s$/g, ''); // Remove leading and trailing spaces
-    match = basicRfcRegex.exec(string);
+        if (secondStr) {
+            result.push(parseInt(secondStr, 10));
+        }
 
-    if (match) {
-        dayFormat = match[1] ? 'ddd' + ((match[1].length === 5) ? ', ' : ' ') : '';
-        dateFormat = 'D MMM ' + ((match[2].length > 10) ? 'YYYY ' : 'YY ');
-        timeFormat = 'HH:mm' + (match[4] ? ':ss' : '');
+        return result;
+    }
 
-        // TODO: Replace the vanilla JS Date object with an indepentent day-of-week check.
-        if (match[1]) { // day of week given
-            var momentDate = new Date(match[2]);
-            var momentDay = ['Sun','Mon','Tue','Wed','Thu','Fri','Sat'][momentDate.getDay()];
+    function untruncateYear(yearStr) {
+        var year = parseInt(yearStr, 10);
+        if (year <= 49) {
+            return 2000 + year;
+        } else if (year <= 999) {
+            return 1900 + year;
+        }
+        return year;
+    }
 
-            if (match[1].substr(0,3) !== momentDay) {
+    function preprocessRFC2822(s) {
+        // Remove comments and folding whitespace and replace multiple-spaces with a single space
+        return s.replace(/\([^)]*\)|[\n\t]/g, ' ').replace(/(\s\s+)/g, ' ').trim();
+    }
+
+    function checkWeekday(weekdayStr, parsedInput, config) {
+        if (weekdayStr) {
+            // TODO: Replace the vanilla JS Date object with an indepentent day-of-week check.
+            var weekdayProvided = defaultLocaleWeekdaysShort.indexOf(weekdayStr),
+                weekdayActual = new Date(parsedInput[0], parsedInput[1], parsedInput[2]).getDay();
+            if (weekdayProvided !== weekdayActual) {
                 getParsingFlags(config).weekdayMismatch = true;
                 config._isValid = false;
+                return false;
+            }
+        }
+        return true;
+    }
+
+    var obsOffsets = {
+        UT: 0,
+        GMT: 0,
+        EDT: -4 * 60,
+        EST: -5 * 60,
+        CDT: -5 * 60,
+        CST: -6 * 60,
+        MDT: -6 * 60,
+        MST: -7 * 60,
+        PDT: -7 * 60,
+        PST: -8 * 60
+    };
+
+    function calculateOffset(obsOffset, militaryOffset, numOffset) {
+        if (obsOffset) {
+            return obsOffsets[obsOffset];
+        } else if (militaryOffset) {
+            // the only allowed military tz is Z
+            return 0;
+        } else {
+            var hm = parseInt(numOffset, 10);
+            var m = hm % 100, h = (hm - m) / 100;
+            return h * 60 + m;
+        }
+    }
+
+    // date and time from ref 2822 format
+    function configFromRFC2822(config) {
+        var match = rfc2822.exec(preprocessRFC2822(config._i));
+        if (match) {
+            var parsedArray = extractFromRFC2822Strings(match[4], match[3], match[2], match[5], match[6], match[7]);
+            if (!checkWeekday(match[1], parsedArray, config)) {
                 return;
             }
-        }
 
-        switch (match[5].length) {
-            case 2: // military
-                if (timezoneIndex === 0) {
-                    timezone = ' +0000';
-                } else {
-                    timezoneIndex = military.indexOf(match[5][1].toUpperCase()) - 12;
-                    timezone = ((timezoneIndex < 0) ? ' -' : ' +') +
-                        (('' + timezoneIndex).replace(/^-?/, '0')).match(/..$/)[0] + '00';
-                }
-                break;
-            case 4: // Zone
-                timezone = timezones[match[5]];
-                break;
-            default: // UT or +/-9999
-                timezone = timezones[' GMT'];
-        }
-        match[5] = timezone;
-        config._i = match.splice(1).join('');
-        tzFormat = ' ZZ';
-        config._f = dayFormat + dateFormat + timeFormat + tzFormat;
-        configFromStringAndFormat(config);
-        getParsingFlags(config).rfc2822 = true;
-    } else {
-        config._isValid = false;
-    }
-}
+            config._a = parsedArray;
+            config._tzm = calculateOffset(match[8], match[9], match[10]);
 
-// date from iso format or fallback
-function configFromString(config) {
-    var matched = aspNetJsonRegex.exec(config._i);
+            config._d = createUTCDate.apply(null, config._a);
+            config._d.setUTCMinutes(config._d.getUTCMinutes() - config._tzm);
 
-    if (matched !== null) {
-        config._d = new Date(+matched[1]);
-        return;
-    }
-
-    configFromISO(config);
-    if (config._isValid === false) {
-        delete config._isValid;
-    } else {
-        return;
-    }
-
-    configFromRFC2822(config);
-    if (config._isValid === false) {
-        delete config._isValid;
-    } else {
-        return;
-    }
-
-    // Final attempt, use Input Fallback
-    hooks.createFromInputFallback(config);
-}
-
-hooks.createFromInputFallback = deprecate(
-    'value provided is not in a recognized RFC2822 or ISO format. moment construction falls back to js Date(), ' +
-    'which is not reliable across all browsers and versions. Non RFC2822/ISO date formats are ' +
-    'discouraged and will be removed in an upcoming major release. Please refer to ' +
-    'http://momentjs.com/guides/#/warnings/js-date/ for more info.',
-    function (config) {
-        config._d = new Date(config._i + (config._useUTC ? ' UTC' : ''));
-    }
-);
-
-// Pick the first defined of two or three arguments.
-function defaults(a, b, c) {
-    if (a != null) {
-        return a;
-    }
-    if (b != null) {
-        return b;
-    }
-    return c;
-}
-
-function currentDateArray(config) {
-    // hooks is actually the exported moment object
-    var nowValue = new Date(hooks.now());
-    if (config._useUTC) {
-        return [nowValue.getUTCFullYear(), nowValue.getUTCMonth(), nowValue.getUTCDate()];
-    }
-    return [nowValue.getFullYear(), nowValue.getMonth(), nowValue.getDate()];
-}
-
-// convert an array to a date.
-// the array should mirror the parameters below
-// note: all values past the year are optional and will default to the lowest possible value.
-// [year, month, day , hour, minute, second, millisecond]
-function configFromArray (config) {
-    var i, date, input = [], currentDate, yearToUse;
-
-    if (config._d) {
-        return;
-    }
-
-    currentDate = currentDateArray(config);
-
-    //compute day of the year from weeks and weekdays
-    if (config._w && config._a[DATE] == null && config._a[MONTH] == null) {
-        dayOfYearFromWeekInfo(config);
-    }
-
-    //if the day of the year is set, figure out what it is
-    if (config._dayOfYear != null) {
-        yearToUse = defaults(config._a[YEAR], currentDate[YEAR]);
-
-        if (config._dayOfYear > daysInYear(yearToUse) || config._dayOfYear === 0) {
-            getParsingFlags(config)._overflowDayOfYear = true;
-        }
-
-        date = createUTCDate(yearToUse, 0, config._dayOfYear);
-        config._a[MONTH] = date.getUTCMonth();
-        config._a[DATE] = date.getUTCDate();
-    }
-
-    // Default to current date.
-    // * if no year, month, day of month are given, default to today
-    // * if day of month is given, default month and year
-    // * if month is given, default only year
-    // * if year is given, don't default anything
-    for (i = 0; i < 3 && config._a[i] == null; ++i) {
-        config._a[i] = input[i] = currentDate[i];
-    }
-
-    // Zero out whatever was not defaulted, including time
-    for (; i < 7; i++) {
-        config._a[i] = input[i] = (config._a[i] == null) ? (i === 2 ? 1 : 0) : config._a[i];
-    }
-
-    // Check for 24:00:00.000
-    if (config._a[HOUR] === 24 &&
-            config._a[MINUTE] === 0 &&
-            config._a[SECOND] === 0 &&
-            config._a[MILLISECOND] === 0) {
-        config._nextDay = true;
-        config._a[HOUR] = 0;
-    }
-
-    config._d = (config._useUTC ? createUTCDate : createDate).apply(null, input);
-    // Apply timezone offset from input. The actual utcOffset can be changed
-    // with parseZone.
-    if (config._tzm != null) {
-        config._d.setUTCMinutes(config._d.getUTCMinutes() - config._tzm);
-    }
-
-    if (config._nextDay) {
-        config._a[HOUR] = 24;
-    }
-}
-
-function dayOfYearFromWeekInfo(config) {
-    var w, weekYear, week, weekday, dow, doy, temp, weekdayOverflow;
-
-    w = config._w;
-    if (w.GG != null || w.W != null || w.E != null) {
-        dow = 1;
-        doy = 4;
-
-        // TODO: We need to take the current isoWeekYear, but that depends on
-        // how we interpret now (local, utc, fixed offset). So create
-        // a now version of current config (take local/utc/offset flags, and
-        // create now).
-        weekYear = defaults(w.GG, config._a[YEAR], weekOfYear(createLocal(), 1, 4).year);
-        week = defaults(w.W, 1);
-        weekday = defaults(w.E, 1);
-        if (weekday < 1 || weekday > 7) {
-            weekdayOverflow = true;
-        }
-    } else {
-        dow = config._locale._week.dow;
-        doy = config._locale._week.doy;
-
-        var curWeek = weekOfYear(createLocal(), dow, doy);
-
-        weekYear = defaults(w.gg, config._a[YEAR], curWeek.year);
-
-        // Default to current week.
-        week = defaults(w.w, curWeek.week);
-
-        if (w.d != null) {
-            // weekday -- low day numbers are considered next week
-            weekday = w.d;
-            if (weekday < 0 || weekday > 6) {
-                weekdayOverflow = true;
-            }
-        } else if (w.e != null) {
-            // local weekday -- counting starts from begining of week
-            weekday = w.e + dow;
-            if (w.e < 0 || w.e > 6) {
-                weekdayOverflow = true;
-            }
+            getParsingFlags(config).rfc2822 = true;
         } else {
-            // default to begining of week
-            weekday = dow;
+            config._isValid = false;
         }
     }
-    if (week < 1 || week > weeksInYear(weekYear, dow, doy)) {
-        getParsingFlags(config)._overflowWeeks = true;
-    } else if (weekdayOverflow != null) {
-        getParsingFlags(config)._overflowWeekday = true;
-    } else {
-        temp = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy);
-        config._a[YEAR] = temp.year;
-        config._dayOfYear = temp.dayOfYear;
-    }
-}
 
-// constant that refers to the ISO standard
-hooks.ISO_8601 = function () {};
+    // date from iso format or fallback
+    function configFromString(config) {
+        var matched = aspNetJsonRegex.exec(config._i);
 
-// constant that refers to the RFC 2822 form
-hooks.RFC_2822 = function () {};
+        if (matched !== null) {
+            config._d = new Date(+matched[1]);
+            return;
+        }
 
-// date from string and format string
-function configFromStringAndFormat(config) {
-    // TODO: Move this to another part of the creation flow to prevent circular deps
-    if (config._f === hooks.ISO_8601) {
         configFromISO(config);
-        return;
-    }
-    if (config._f === hooks.RFC_2822) {
+        if (config._isValid === false) {
+            delete config._isValid;
+        } else {
+            return;
+        }
+
         configFromRFC2822(config);
-        return;
-    }
-    config._a = [];
-    getParsingFlags(config).empty = true;
-
-    // This array is used to make a Date, either with `new Date` or `Date.UTC`
-    var string = '' + config._i,
-        i, parsedInput, tokens, token, skipped,
-        stringLength = string.length,
-        totalParsedInputLength = 0;
-
-    tokens = expandFormat(config._f, config._locale).match(formattingTokens) || [];
-
-    for (i = 0; i < tokens.length; i++) {
-        token = tokens[i];
-        parsedInput = (string.match(getParseRegexForToken(token, config)) || [])[0];
-        // console.log('token', token, 'parsedInput', parsedInput,
-        //         'regex', getParseRegexForToken(token, config));
-        if (parsedInput) {
-            skipped = string.substr(0, string.indexOf(parsedInput));
-            if (skipped.length > 0) {
-                getParsingFlags(config).unusedInput.push(skipped);
-            }
-            string = string.slice(string.indexOf(parsedInput) + parsedInput.length);
-            totalParsedInputLength += parsedInput.length;
-        }
-        // don't parse if it's not a known token
-        if (formatTokenFunctions[token]) {
-            if (parsedInput) {
-                getParsingFlags(config).empty = false;
-            }
-            else {
-                getParsingFlags(config).unusedTokens.push(token);
-            }
-            addTimeToArrayFromToken(token, parsedInput, config);
-        }
-        else if (config._strict && !parsedInput) {
-            getParsingFlags(config).unusedTokens.push(token);
-        }
-    }
-
-    // add remaining unparsed input length to the string
-    getParsingFlags(config).charsLeftOver = stringLength - totalParsedInputLength;
-    if (string.length > 0) {
-        getParsingFlags(config).unusedInput.push(string);
-    }
-
-    // clear _12h flag if hour is <= 12
-    if (config._a[HOUR] <= 12 &&
-        getParsingFlags(config).bigHour === true &&
-        config._a[HOUR] > 0) {
-        getParsingFlags(config).bigHour = undefined;
-    }
-
-    getParsingFlags(config).parsedDateParts = config._a.slice(0);
-    getParsingFlags(config).meridiem = config._meridiem;
-    // handle meridiem
-    config._a[HOUR] = meridiemFixWrap(config._locale, config._a[HOUR], config._meridiem);
-
-    configFromArray(config);
-    checkOverflow(config);
-}
-
-
-function meridiemFixWrap (locale, hour, meridiem) {
-    var isPm;
-
-    if (meridiem == null) {
-        // nothing to do
-        return hour;
-    }
-    if (locale.meridiemHour != null) {
-        return locale.meridiemHour(hour, meridiem);
-    } else if (locale.isPM != null) {
-        // Fallback
-        isPm = locale.isPM(meridiem);
-        if (isPm && hour < 12) {
-            hour += 12;
-        }
-        if (!isPm && hour === 12) {
-            hour = 0;
-        }
-        return hour;
-    } else {
-        // this is not supposed to happen
-        return hour;
-    }
-}
-
-// date from string and array of format strings
-function configFromStringAndArray(config) {
-    var tempConfig,
-        bestMoment,
-
-        scoreToBeat,
-        i,
-        currentScore;
-
-    if (config._f.length === 0) {
-        getParsingFlags(config).invalidFormat = true;
-        config._d = new Date(NaN);
-        return;
-    }
-
-    for (i = 0; i < config._f.length; i++) {
-        currentScore = 0;
-        tempConfig = copyConfig({}, config);
-        if (config._useUTC != null) {
-            tempConfig._useUTC = config._useUTC;
-        }
-        tempConfig._f = config._f[i];
-        configFromStringAndFormat(tempConfig);
-
-        if (!isValid(tempConfig)) {
-            continue;
+        if (config._isValid === false) {
+            delete config._isValid;
+        } else {
+            return;
         }
 
-        // if there is any input that was not parsed add a penalty for that format
-        currentScore += getParsingFlags(tempConfig).charsLeftOver;
-
-        //or tokens
-        currentScore += getParsingFlags(tempConfig).unusedTokens.length * 10;
-
-        getParsingFlags(tempConfig).score = currentScore;
-
-        if (scoreToBeat == null || currentScore < scoreToBeat) {
-            scoreToBeat = currentScore;
-            bestMoment = tempConfig;
-        }
-    }
-
-    extend(config, bestMoment || tempConfig);
-}
-
-function configFromObject(config) {
-    if (config._d) {
-        return;
-    }
-
-    var i = normalizeObjectUnits(config._i);
-    config._a = map([i.year, i.month, i.day || i.date, i.hour, i.minute, i.second, i.millisecond], function (obj) {
-        return obj && parseInt(obj, 10);
-    });
-
-    configFromArray(config);
-}
-
-function createFromConfig (config) {
-    var res = new Moment(checkOverflow(prepareConfig(config)));
-    if (res._nextDay) {
-        // Adding is smart enough around DST
-        res.add(1, 'd');
-        res._nextDay = undefined;
-    }
-
-    return res;
-}
-
-function prepareConfig (config) {
-    var input = config._i,
-        format = config._f;
-
-    config._locale = config._locale || getLocale(config._l);
-
-    if (input === null || (format === undefined && input === '')) {
-        return createInvalid({nullInput: true});
-    }
-
-    if (typeof input === 'string') {
-        config._i = input = config._locale.preparse(input);
-    }
-
-    if (isMoment(input)) {
-        return new Moment(checkOverflow(input));
-    } else if (isDate(input)) {
-        config._d = input;
-    } else if (isArray(format)) {
-        configFromStringAndArray(config);
-    } else if (format) {
-        configFromStringAndFormat(config);
-    }  else {
-        configFromInput(config);
-    }
-
-    if (!isValid(config)) {
-        config._d = null;
-    }
-
-    return config;
-}
-
-function configFromInput(config) {
-    var input = config._i;
-    if (isUndefined(input)) {
-        config._d = new Date(hooks.now());
-    } else if (isDate(input)) {
-        config._d = new Date(input.valueOf());
-    } else if (typeof input === 'string') {
-        configFromString(config);
-    } else if (isArray(input)) {
-        config._a = map(input.slice(0), function (obj) {
-            return parseInt(obj, 10);
-        });
-        configFromArray(config);
-    } else if (isObject(input)) {
-        configFromObject(config);
-    } else if (isNumber(input)) {
-        // from milliseconds
-        config._d = new Date(input);
-    } else {
+        // Final attempt, use Input Fallback
         hooks.createFromInputFallback(config);
     }
-}
 
-function createLocalOrUTC (input, format, locale, strict, isUTC) {
-    var c = {};
+    hooks.createFromInputFallback = deprecate(
+        'value provided is not in a recognized RFC2822 or ISO format. moment construction falls back to js Date(), ' +
+        'which is not reliable across all browsers and versions. Non RFC2822/ISO date formats are ' +
+        'discouraged and will be removed in an upcoming major release. Please refer to ' +
+        'http://momentjs.com/guides/#/warnings/js-date/ for more info.',
+        function (config) {
+            config._d = new Date(config._i + (config._useUTC ? ' UTC' : ''));
+        }
+    );
 
-    if (locale === true || locale === false) {
-        strict = locale;
-        locale = undefined;
+    // constant that refers to the ISO standard
+    hooks.ISO_8601 = function () {};
+
+    // constant that refers to the RFC 2822 form
+    hooks.RFC_2822 = function () {};
+
+    // date from string and format string
+    function configFromStringAndFormat(config) {
+        // TODO: Move this to another part of the creation flow to prevent circular deps
+        if (config._f === hooks.ISO_8601) {
+            configFromISO(config);
+            return;
+        }
+        if (config._f === hooks.RFC_2822) {
+            configFromRFC2822(config);
+            return;
+        }
+        config._a = [];
+        getParsingFlags(config).empty = true;
+
+        // This array is used to make a Date, either with `new Date` or `Date.UTC`
+        var string = '' + config._i,
+            i, parsedInput, tokens, token, skipped,
+            stringLength = string.length,
+            totalParsedInputLength = 0;
+
+        tokens = expandFormat(config._f, config._locale).match(formattingTokens) || [];
+
+        for (i = 0; i < tokens.length; i++) {
+            token = tokens[i];
+            parsedInput = (string.match(getParseRegexForToken(token, config)) || [])[0];
+            // console.log('token', token, 'parsedInput', parsedInput,
+            //         'regex', getParseRegexForToken(token, config));
+            if (parsedInput) {
+                skipped = string.substr(0, string.indexOf(parsedInput));
+                if (skipped.length > 0) {
+                    getParsingFlags(config).unusedInput.push(skipped);
+                }
+                string = string.slice(string.indexOf(parsedInput) + parsedInput.length);
+                totalParsedInputLength += parsedInput.length;
+            }
+            // don't parse if it's not a known token
+            if (formatTokenFunctions[token]) {
+                if (parsedInput) {
+                    getParsingFlags(config).empty = false;
+                }
+                else {
+                    getParsingFlags(config).unusedTokens.push(token);
+                }
+                addTimeToArrayFromToken(token, parsedInput, config);
+            }
+            else if (config._strict && !parsedInput) {
+                getParsingFlags(config).unusedTokens.push(token);
+            }
+        }
+
+        // add remaining unparsed input length to the string
+        getParsingFlags(config).charsLeftOver = stringLength - totalParsedInputLength;
+        if (string.length > 0) {
+            getParsingFlags(config).unusedInput.push(string);
+        }
+
+        // clear _12h flag if hour is <= 12
+        if (config._a[HOUR] <= 12 &&
+            getParsingFlags(config).bigHour === true &&
+            config._a[HOUR] > 0) {
+            getParsingFlags(config).bigHour = undefined;
+        }
+
+        getParsingFlags(config).parsedDateParts = config._a.slice(0);
+        getParsingFlags(config).meridiem = config._meridiem;
+        // handle meridiem
+        config._a[HOUR] = meridiemFixWrap(config._locale, config._a[HOUR], config._meridiem);
+
+        configFromArray(config);
+        checkOverflow(config);
     }
 
-    if ((isObject(input) && isObjectEmpty(input)) ||
-            (isArray(input) && input.length === 0)) {
-        input = undefined;
-    }
-    // object construction must be done this way.
-    // https://github.com/moment/moment/issues/1423
-    c._isAMomentObject = true;
-    c._useUTC = c._isUTC = isUTC;
-    c._l = locale;
-    c._i = input;
-    c._f = format;
-    c._strict = strict;
 
-    return createFromConfig(c);
-}
+    function meridiemFixWrap (locale, hour, meridiem) {
+        var isPm;
 
-function createLocal (input, format, locale, strict) {
-    return createLocalOrUTC(input, format, locale, strict, false);
-}
-
-var prototypeMin = deprecate(
-    'moment().min is deprecated, use moment.max instead. http://momentjs.com/guides/#/warnings/min-max/',
-    function () {
-        var other = createLocal.apply(null, arguments);
-        if (this.isValid() && other.isValid()) {
-            return other < this ? this : other;
+        if (meridiem == null) {
+            // nothing to do
+            return hour;
+        }
+        if (locale.meridiemHour != null) {
+            return locale.meridiemHour(hour, meridiem);
+        } else if (locale.isPM != null) {
+            // Fallback
+            isPm = locale.isPM(meridiem);
+            if (isPm && hour < 12) {
+                hour += 12;
+            }
+            if (!isPm && hour === 12) {
+                hour = 0;
+            }
+            return hour;
         } else {
-            return createInvalid();
+            // this is not supposed to happen
+            return hour;
         }
     }
-);
 
-var prototypeMax = deprecate(
-    'moment().max is deprecated, use moment.min instead. http://momentjs.com/guides/#/warnings/min-max/',
-    function () {
-        var other = createLocal.apply(null, arguments);
-        if (this.isValid() && other.isValid()) {
-            return other > this ? this : other;
+    // date from string and array of format strings
+    function configFromStringAndArray(config) {
+        var tempConfig,
+            bestMoment,
+
+            scoreToBeat,
+            i,
+            currentScore;
+
+        if (config._f.length === 0) {
+            getParsingFlags(config).invalidFormat = true;
+            config._d = new Date(NaN);
+            return;
+        }
+
+        for (i = 0; i < config._f.length; i++) {
+            currentScore = 0;
+            tempConfig = copyConfig({}, config);
+            if (config._useUTC != null) {
+                tempConfig._useUTC = config._useUTC;
+            }
+            tempConfig._f = config._f[i];
+            configFromStringAndFormat(tempConfig);
+
+            if (!isValid(tempConfig)) {
+                continue;
+            }
+
+            // if there is any input that was not parsed add a penalty for that format
+            currentScore += getParsingFlags(tempConfig).charsLeftOver;
+
+            //or tokens
+            currentScore += getParsingFlags(tempConfig).unusedTokens.length * 10;
+
+            getParsingFlags(tempConfig).score = currentScore;
+
+            if (scoreToBeat == null || currentScore < scoreToBeat) {
+                scoreToBeat = currentScore;
+                bestMoment = tempConfig;
+            }
+        }
+
+        extend(config, bestMoment || tempConfig);
+    }
+
+    function configFromObject(config) {
+        if (config._d) {
+            return;
+        }
+
+        var i = normalizeObjectUnits(config._i);
+        config._a = map([i.year, i.month, i.day || i.date, i.hour, i.minute, i.second, i.millisecond], function (obj) {
+            return obj && parseInt(obj, 10);
+        });
+
+        configFromArray(config);
+    }
+
+    function createFromConfig (config) {
+        var res = new Moment(checkOverflow(prepareConfig(config)));
+        if (res._nextDay) {
+            // Adding is smart enough around DST
+            res.add(1, 'd');
+            res._nextDay = undefined;
+        }
+
+        return res;
+    }
+
+    function prepareConfig (config) {
+        var input = config._i,
+            format = config._f;
+
+        config._locale = config._locale || getLocale(config._l);
+
+        if (input === null || (format === undefined && input === '')) {
+            return createInvalid({nullInput: true});
+        }
+
+        if (typeof input === 'string') {
+            config._i = input = config._locale.preparse(input);
+        }
+
+        if (isMoment(input)) {
+            return new Moment(checkOverflow(input));
+        } else if (isDate(input)) {
+            config._d = input;
+        } else if (isArray(format)) {
+            configFromStringAndArray(config);
+        } else if (format) {
+            configFromStringAndFormat(config);
+        }  else {
+            configFromInput(config);
+        }
+
+        if (!isValid(config)) {
+            config._d = null;
+        }
+
+        return config;
+    }
+
+    function configFromInput(config) {
+        var input = config._i;
+        if (isUndefined(input)) {
+            config._d = new Date(hooks.now());
+        } else if (isDate(input)) {
+            config._d = new Date(input.valueOf());
+        } else if (typeof input === 'string') {
+            configFromString(config);
+        } else if (isArray(input)) {
+            config._a = map(input.slice(0), function (obj) {
+                return parseInt(obj, 10);
+            });
+            configFromArray(config);
+        } else if (isObject(input)) {
+            configFromObject(config);
+        } else if (isNumber(input)) {
+            // from milliseconds
+            config._d = new Date(input);
         } else {
-            return createInvalid();
+            hooks.createFromInputFallback(config);
         }
     }
-);
 
-// Pick a moment m from moments so that m[fn](other) is true for all
-// other. This relies on the function fn to be transitive.
-//
-// moments should either be an array of moment objects or an array, whose
-// first element is an array of moment objects.
-function pickBy(fn, moments) {
-    var res, i;
-    if (moments.length === 1 && isArray(moments[0])) {
-        moments = moments[0];
+    function createLocalOrUTC (input, format, locale, strict, isUTC) {
+        var c = {};
+
+        if (locale === true || locale === false) {
+            strict = locale;
+            locale = undefined;
+        }
+
+        if ((isObject(input) && isObjectEmpty(input)) ||
+                (isArray(input) && input.length === 0)) {
+            input = undefined;
+        }
+        // object construction must be done this way.
+        // https://github.com/moment/moment/issues/1423
+        c._isAMomentObject = true;
+        c._useUTC = c._isUTC = isUTC;
+        c._l = locale;
+        c._i = input;
+        c._f = format;
+        c._strict = strict;
+
+        return createFromConfig(c);
     }
-    if (!moments.length) {
-        return createLocal();
+
+    function createLocal (input, format, locale, strict) {
+        return createLocalOrUTC(input, format, locale, strict, false);
     }
-    res = moments[0];
-    for (i = 1; i < moments.length; ++i) {
-        if (!moments[i].isValid() || moments[i][fn](res)) {
-            res = moments[i];
+
+    var prototypeMin = deprecate(
+        'moment().min is deprecated, use moment.max instead. http://momentjs.com/guides/#/warnings/min-max/',
+        function () {
+            var other = createLocal.apply(null, arguments);
+            if (this.isValid() && other.isValid()) {
+                return other < this ? this : other;
+            } else {
+                return createInvalid();
+            }
+        }
+    );
+
+    var prototypeMax = deprecate(
+        'moment().max is deprecated, use moment.min instead. http://momentjs.com/guides/#/warnings/min-max/',
+        function () {
+            var other = createLocal.apply(null, arguments);
+            if (this.isValid() && other.isValid()) {
+                return other > this ? this : other;
+            } else {
+                return createInvalid();
+            }
+        }
+    );
+
+    // Pick a moment m from moments so that m[fn](other) is true for all
+    // other. This relies on the function fn to be transitive.
+    //
+    // moments should either be an array of moment objects or an array, whose
+    // first element is an array of moment objects.
+    function pickBy(fn, moments) {
+        var res, i;
+        if (moments.length === 1 && isArray(moments[0])) {
+            moments = moments[0];
+        }
+        if (!moments.length) {
+            return createLocal();
+        }
+        res = moments[0];
+        for (i = 1; i < moments.length; ++i) {
+            if (!moments[i].isValid() || moments[i][fn](res)) {
+                res = moments[i];
+            }
+        }
+        return res;
+    }
+
+    // TODO: Use [].sort instead?
+    function min () {
+        var args = [].slice.call(arguments, 0);
+
+        return pickBy('isBefore', args);
+    }
+
+    function max () {
+        var args = [].slice.call(arguments, 0);
+
+        return pickBy('isAfter', args);
+    }
+
+    var now = function () {
+        return Date.now ? Date.now() : +(new Date());
+    };
+
+    var ordering = ['year', 'quarter', 'month', 'week', 'day', 'hour', 'minute', 'second', 'millisecond'];
+
+    function isDurationValid(m) {
+        for (var key in m) {
+            if (!(indexOf.call(ordering, key) !== -1 && (m[key] == null || !isNaN(m[key])))) {
+                return false;
+            }
+        }
+
+        var unitHasDecimal = false;
+        for (var i = 0; i < ordering.length; ++i) {
+            if (m[ordering[i]]) {
+                if (unitHasDecimal) {
+                    return false; // only allow non-integers for smallest unit
+                }
+                if (parseFloat(m[ordering[i]]) !== toInt(m[ordering[i]])) {
+                    unitHasDecimal = true;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    function isValid$1() {
+        return this._isValid;
+    }
+
+    function createInvalid$1() {
+        return createDuration(NaN);
+    }
+
+    function Duration (duration) {
+        var normalizedInput = normalizeObjectUnits(duration),
+            years = normalizedInput.year || 0,
+            quarters = normalizedInput.quarter || 0,
+            months = normalizedInput.month || 0,
+            weeks = normalizedInput.week || 0,
+            days = normalizedInput.day || 0,
+            hours = normalizedInput.hour || 0,
+            minutes = normalizedInput.minute || 0,
+            seconds = normalizedInput.second || 0,
+            milliseconds = normalizedInput.millisecond || 0;
+
+        this._isValid = isDurationValid(normalizedInput);
+
+        // representation for dateAddRemove
+        this._milliseconds = +milliseconds +
+            seconds * 1e3 + // 1000
+            minutes * 6e4 + // 1000 * 60
+            hours * 1000 * 60 * 60; //using 1000 * 60 * 60 instead of 36e5 to avoid floating point rounding errors https://github.com/moment/moment/issues/2978
+        // Because of dateAddRemove treats 24 hours as different from a
+        // day when working around DST, we need to store them separately
+        this._days = +days +
+            weeks * 7;
+        // It is impossible to translate months into days without knowing
+        // which months you are are talking about, so we have to store
+        // it separately.
+        this._months = +months +
+            quarters * 3 +
+            years * 12;
+
+        this._data = {};
+
+        this._locale = getLocale();
+
+        this._bubble();
+    }
+
+    function isDuration (obj) {
+        return obj instanceof Duration;
+    }
+
+    function absRound (number) {
+        if (number < 0) {
+            return Math.round(-1 * number) * -1;
+        } else {
+            return Math.round(number);
         }
     }
-    return res;
-}
 
-// TODO: Use [].sort instead?
-function min () {
-    var args = [].slice.call(arguments, 0);
+    // FORMATTING
 
-    return pickBy('isBefore', args);
-}
+    function offset (token, separator) {
+        addFormatToken(token, 0, 0, function () {
+            var offset = this.utcOffset();
+            var sign = '+';
+            if (offset < 0) {
+                offset = -offset;
+                sign = '-';
+            }
+            return sign + zeroFill(~~(offset / 60), 2) + separator + zeroFill(~~(offset) % 60, 2);
+        });
+    }
 
-function max () {
-    var args = [].slice.call(arguments, 0);
+    offset('Z', ':');
+    offset('ZZ', '');
 
-    return pickBy('isAfter', args);
-}
+    // PARSING
 
-var now = function () {
-    return Date.now ? Date.now() : +(new Date());
-};
+    addRegexToken('Z',  matchShortOffset);
+    addRegexToken('ZZ', matchShortOffset);
+    addParseToken(['Z', 'ZZ'], function (input, array, config) {
+        config._useUTC = true;
+        config._tzm = offsetFromString(matchShortOffset, input);
+    });
 
-var ordering = ['year', 'quarter', 'month', 'week', 'day', 'hour', 'minute', 'second', 'millisecond'];
+    // HELPERS
 
-function isDurationValid(m) {
-    for (var key in m) {
-        if (!(ordering.indexOf(key) !== -1 && (m[key] == null || !isNaN(m[key])))) {
+    // timezone chunker
+    // '+10:00' > ['10',  '00']
+    // '-1530'  > ['-15', '30']
+    var chunkOffset = /([\+\-]|\d\d)/gi;
+
+    function offsetFromString(matcher, string) {
+        var matches = (string || '').match(matcher);
+
+        if (matches === null) {
+            return null;
+        }
+
+        var chunk   = matches[matches.length - 1] || [];
+        var parts   = (chunk + '').match(chunkOffset) || ['-', 0, 0];
+        var minutes = +(parts[1] * 60) + toInt(parts[2]);
+
+        return minutes === 0 ?
+          0 :
+          parts[0] === '+' ? minutes : -minutes;
+    }
+
+    // Return a moment from input, that is local/utc/zone equivalent to model.
+    function cloneWithOffset(input, model) {
+        var res, diff;
+        if (model._isUTC) {
+            res = model.clone();
+            diff = (isMoment(input) || isDate(input) ? input.valueOf() : createLocal(input).valueOf()) - res.valueOf();
+            // Use low-level api, because this fn is low-level api.
+            res._d.setTime(res._d.valueOf() + diff);
+            hooks.updateOffset(res, false);
+            return res;
+        } else {
+            return createLocal(input).local();
+        }
+    }
+
+    function getDateOffset (m) {
+        // On Firefox.24 Date#getTimezoneOffset returns a floating point.
+        // https://github.com/moment/moment/pull/1871
+        return -Math.round(m._d.getTimezoneOffset() / 15) * 15;
+    }
+
+    // HOOKS
+
+    // This function will be called whenever a moment is mutated.
+    // It is intended to keep the offset in sync with the timezone.
+    hooks.updateOffset = function () {};
+
+    // MOMENTS
+
+    // keepLocalTime = true means only change the timezone, without
+    // affecting the local hour. So 5:31:26 +0300 --[utcOffset(2, true)]-->
+    // 5:31:26 +0200 It is possible that 5:31:26 doesn't exist with offset
+    // +0200, so we adjust the time as needed, to be valid.
+    //
+    // Keeping the time actually adds/subtracts (one hour)
+    // from the actual represented time. That is why we call updateOffset
+    // a second time. In case it wants us to change the offset again
+    // _changeInProgress == true case, then we have to adjust, because
+    // there is no such time in the given timezone.
+    function getSetOffset (input, keepLocalTime, keepMinutes) {
+        var offset = this._offset || 0,
+            localAdjust;
+        if (!this.isValid()) {
+            return input != null ? this : NaN;
+        }
+        if (input != null) {
+            if (typeof input === 'string') {
+                input = offsetFromString(matchShortOffset, input);
+                if (input === null) {
+                    return this;
+                }
+            } else if (Math.abs(input) < 16 && !keepMinutes) {
+                input = input * 60;
+            }
+            if (!this._isUTC && keepLocalTime) {
+                localAdjust = getDateOffset(this);
+            }
+            this._offset = input;
+            this._isUTC = true;
+            if (localAdjust != null) {
+                this.add(localAdjust, 'm');
+            }
+            if (offset !== input) {
+                if (!keepLocalTime || this._changeInProgress) {
+                    addSubtract(this, createDuration(input - offset, 'm'), 1, false);
+                } else if (!this._changeInProgress) {
+                    this._changeInProgress = true;
+                    hooks.updateOffset(this, true);
+                    this._changeInProgress = null;
+                }
+            }
+            return this;
+        } else {
+            return this._isUTC ? offset : getDateOffset(this);
+        }
+    }
+
+    function getSetZone (input, keepLocalTime) {
+        if (input != null) {
+            if (typeof input !== 'string') {
+                input = -input;
+            }
+
+            this.utcOffset(input, keepLocalTime);
+
+            return this;
+        } else {
+            return -this.utcOffset();
+        }
+    }
+
+    function setOffsetToUTC (keepLocalTime) {
+        return this.utcOffset(0, keepLocalTime);
+    }
+
+    function setOffsetToLocal (keepLocalTime) {
+        if (this._isUTC) {
+            this.utcOffset(0, keepLocalTime);
+            this._isUTC = false;
+
+            if (keepLocalTime) {
+                this.subtract(getDateOffset(this), 'm');
+            }
+        }
+        return this;
+    }
+
+    function setOffsetToParsedOffset () {
+        if (this._tzm != null) {
+            this.utcOffset(this._tzm, false, true);
+        } else if (typeof this._i === 'string') {
+            var tZone = offsetFromString(matchOffset, this._i);
+            if (tZone != null) {
+                this.utcOffset(tZone);
+            }
+            else {
+                this.utcOffset(0, true);
+            }
+        }
+        return this;
+    }
+
+    function hasAlignedHourOffset (input) {
+        if (!this.isValid()) {
             return false;
         }
+        input = input ? createLocal(input).utcOffset() : 0;
+
+        return (this.utcOffset() - input) % 60 === 0;
     }
 
-    var unitHasDecimal = false;
-    for (var i = 0; i < ordering.length; ++i) {
-        if (m[ordering[i]]) {
-            if (unitHasDecimal) {
-                return false; // only allow non-integers for smallest unit
-            }
-            if (parseFloat(m[ordering[i]]) !== toInt(m[ordering[i]])) {
-                unitHasDecimal = true;
-            }
-        }
+    function isDaylightSavingTime () {
+        return (
+            this.utcOffset() > this.clone().month(0).utcOffset() ||
+            this.utcOffset() > this.clone().month(5).utcOffset()
+        );
     }
 
-    return true;
-}
-
-function isValid$1() {
-    return this._isValid;
-}
-
-function createInvalid$1() {
-    return createDuration(NaN);
-}
-
-function Duration (duration) {
-    var normalizedInput = normalizeObjectUnits(duration),
-        years = normalizedInput.year || 0,
-        quarters = normalizedInput.quarter || 0,
-        months = normalizedInput.month || 0,
-        weeks = normalizedInput.week || 0,
-        days = normalizedInput.day || 0,
-        hours = normalizedInput.hour || 0,
-        minutes = normalizedInput.minute || 0,
-        seconds = normalizedInput.second || 0,
-        milliseconds = normalizedInput.millisecond || 0;
-
-    this._isValid = isDurationValid(normalizedInput);
-
-    // representation for dateAddRemove
-    this._milliseconds = +milliseconds +
-        seconds * 1e3 + // 1000
-        minutes * 6e4 + // 1000 * 60
-        hours * 1000 * 60 * 60; //using 1000 * 60 * 60 instead of 36e5 to avoid floating point rounding errors https://github.com/moment/moment/issues/2978
-    // Because of dateAddRemove treats 24 hours as different from a
-    // day when working around DST, we need to store them separately
-    this._days = +days +
-        weeks * 7;
-    // It is impossible translate months into days without knowing
-    // which months you are are talking about, so we have to store
-    // it separately.
-    this._months = +months +
-        quarters * 3 +
-        years * 12;
-
-    this._data = {};
-
-    this._locale = getLocale();
-
-    this._bubble();
-}
-
-function isDuration (obj) {
-    return obj instanceof Duration;
-}
-
-function absRound (number) {
-    if (number < 0) {
-        return Math.round(-1 * number) * -1;
-    } else {
-        return Math.round(number);
-    }
-}
-
-// FORMATTING
-
-function offset (token, separator) {
-    addFormatToken(token, 0, 0, function () {
-        var offset = this.utcOffset();
-        var sign = '+';
-        if (offset < 0) {
-            offset = -offset;
-            sign = '-';
-        }
-        return sign + zeroFill(~~(offset / 60), 2) + separator + zeroFill(~~(offset) % 60, 2);
-    });
-}
-
-offset('Z', ':');
-offset('ZZ', '');
-
-// PARSING
-
-addRegexToken('Z',  matchShortOffset);
-addRegexToken('ZZ', matchShortOffset);
-addParseToken(['Z', 'ZZ'], function (input, array, config) {
-    config._useUTC = true;
-    config._tzm = offsetFromString(matchShortOffset, input);
-});
-
-// HELPERS
-
-// timezone chunker
-// '+10:00' > ['10',  '00']
-// '-1530'  > ['-15', '30']
-var chunkOffset = /([\+\-]|\d\d)/gi;
-
-function offsetFromString(matcher, string) {
-    var matches = (string || '').match(matcher);
-
-    if (matches === null) {
-        return null;
-    }
-
-    var chunk   = matches[matches.length - 1] || [];
-    var parts   = (chunk + '').match(chunkOffset) || ['-', 0, 0];
-    var minutes = +(parts[1] * 60) + toInt(parts[2]);
-
-    return minutes === 0 ?
-      0 :
-      parts[0] === '+' ? minutes : -minutes;
-}
-
-// Return a moment from input, that is local/utc/zone equivalent to model.
-function cloneWithOffset(input, model) {
-    var res, diff;
-    if (model._isUTC) {
-        res = model.clone();
-        diff = (isMoment(input) || isDate(input) ? input.valueOf() : createLocal(input).valueOf()) - res.valueOf();
-        // Use low-level api, because this fn is low-level api.
-        res._d.setTime(res._d.valueOf() + diff);
-        hooks.updateOffset(res, false);
-        return res;
-    } else {
-        return createLocal(input).local();
-    }
-}
-
-function getDateOffset (m) {
-    // On Firefox.24 Date#getTimezoneOffset returns a floating point.
-    // https://github.com/moment/moment/pull/1871
-    return -Math.round(m._d.getTimezoneOffset() / 15) * 15;
-}
-
-// HOOKS
-
-// This function will be called whenever a moment is mutated.
-// It is intended to keep the offset in sync with the timezone.
-hooks.updateOffset = function () {};
-
-// MOMENTS
-
-// keepLocalTime = true means only change the timezone, without
-// affecting the local hour. So 5:31:26 +0300 --[utcOffset(2, true)]-->
-// 5:31:26 +0200 It is possible that 5:31:26 doesn't exist with offset
-// +0200, so we adjust the time as needed, to be valid.
-//
-// Keeping the time actually adds/subtracts (one hour)
-// from the actual represented time. That is why we call updateOffset
-// a second time. In case it wants us to change the offset again
-// _changeInProgress == true case, then we have to adjust, because
-// there is no such time in the given timezone.
-function getSetOffset (input, keepLocalTime, keepMinutes) {
-    var offset = this._offset || 0,
-        localAdjust;
-    if (!this.isValid()) {
-        return input != null ? this : NaN;
-    }
-    if (input != null) {
-        if (typeof input === 'string') {
-            input = offsetFromString(matchShortOffset, input);
-            if (input === null) {
-                return this;
-            }
-        } else if (Math.abs(input) < 16 && !keepMinutes) {
-            input = input * 60;
-        }
-        if (!this._isUTC && keepLocalTime) {
-            localAdjust = getDateOffset(this);
-        }
-        this._offset = input;
-        this._isUTC = true;
-        if (localAdjust != null) {
-            this.add(localAdjust, 'm');
-        }
-        if (offset !== input) {
-            if (!keepLocalTime || this._changeInProgress) {
-                addSubtract(this, createDuration(input - offset, 'm'), 1, false);
-            } else if (!this._changeInProgress) {
-                this._changeInProgress = true;
-                hooks.updateOffset(this, true);
-                this._changeInProgress = null;
-            }
-        }
-        return this;
-    } else {
-        return this._isUTC ? offset : getDateOffset(this);
-    }
-}
-
-function getSetZone (input, keepLocalTime) {
-    if (input != null) {
-        if (typeof input !== 'string') {
-            input = -input;
+    function isDaylightSavingTimeShifted () {
+        if (!isUndefined(this._isDSTShifted)) {
+            return this._isDSTShifted;
         }
 
-        this.utcOffset(input, keepLocalTime);
+        var c = {};
 
-        return this;
-    } else {
-        return -this.utcOffset();
-    }
-}
+        copyConfig(c, this);
+        c = prepareConfig(c);
 
-function setOffsetToUTC (keepLocalTime) {
-    return this.utcOffset(0, keepLocalTime);
-}
-
-function setOffsetToLocal (keepLocalTime) {
-    if (this._isUTC) {
-        this.utcOffset(0, keepLocalTime);
-        this._isUTC = false;
-
-        if (keepLocalTime) {
-            this.subtract(getDateOffset(this), 'm');
+        if (c._a) {
+            var other = c._isUTC ? createUTC(c._a) : createLocal(c._a);
+            this._isDSTShifted = this.isValid() &&
+                compareArrays(c._a, other.toArray()) > 0;
+        } else {
+            this._isDSTShifted = false;
         }
-    }
-    return this;
-}
 
-function setOffsetToParsedOffset () {
-    if (this._tzm != null) {
-        this.utcOffset(this._tzm, false, true);
-    } else if (typeof this._i === 'string') {
-        var tZone = offsetFromString(matchOffset, this._i);
-        if (tZone != null) {
-            this.utcOffset(tZone);
-        }
-        else {
-            this.utcOffset(0, true);
-        }
-    }
-    return this;
-}
-
-function hasAlignedHourOffset (input) {
-    if (!this.isValid()) {
-        return false;
-    }
-    input = input ? createLocal(input).utcOffset() : 0;
-
-    return (this.utcOffset() - input) % 60 === 0;
-}
-
-function isDaylightSavingTime () {
-    return (
-        this.utcOffset() > this.clone().month(0).utcOffset() ||
-        this.utcOffset() > this.clone().month(5).utcOffset()
-    );
-}
-
-function isDaylightSavingTimeShifted () {
-    if (!isUndefined(this._isDSTShifted)) {
         return this._isDSTShifted;
     }
 
-    var c = {};
-
-    copyConfig(c, this);
-    c = prepareConfig(c);
-
-    if (c._a) {
-        var other = c._isUTC ? createUTC(c._a) : createLocal(c._a);
-        this._isDSTShifted = this.isValid() &&
-            compareArrays(c._a, other.toArray()) > 0;
-    } else {
-        this._isDSTShifted = false;
+    function isLocal () {
+        return this.isValid() ? !this._isUTC : false;
     }
 
-    return this._isDSTShifted;
-}
+    function isUtcOffset () {
+        return this.isValid() ? this._isUTC : false;
+    }
 
-function isLocal () {
-    return this.isValid() ? !this._isUTC : false;
-}
+    function isUtc () {
+        return this.isValid() ? this._isUTC && this._offset === 0 : false;
+    }
 
-function isUtcOffset () {
-    return this.isValid() ? this._isUTC : false;
-}
+    // ASP.NET json date format regex
+    var aspNetRegex = /^(\-|\+)?(?:(\d*)[. ])?(\d+)\:(\d+)(?:\:(\d+)(\.\d*)?)?$/;
 
-function isUtc () {
-    return this.isValid() ? this._isUTC && this._offset === 0 : false;
-}
+    // from http://docs.closure-library.googlecode.com/git/closure_goog_date_date.js.source.html
+    // somewhat more in line with 4.4.3.2 2004 spec, but allows decimal anywhere
+    // and further modified to allow for strings containing both week and day
+    var isoRegex = /^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/;
 
-// ASP.NET json date format regex
-var aspNetRegex = /^(\-)?(?:(\d*)[. ])?(\d+)\:(\d+)(?:\:(\d+)(\.\d*)?)?$/;
+    function createDuration (input, key) {
+        var duration = input,
+            // matching against regexp is expensive, do it on demand
+            match = null,
+            sign,
+            ret,
+            diffRes;
 
-// from http://docs.closure-library.googlecode.com/git/closure_goog_date_date.js.source.html
-// somewhat more in line with 4.4.3.2 2004 spec, but allows decimal anywhere
-// and further modified to allow for strings containing both week and day
-var isoRegex = /^(-)?P(?:(-?[0-9,.]*)Y)?(?:(-?[0-9,.]*)M)?(?:(-?[0-9,.]*)W)?(?:(-?[0-9,.]*)D)?(?:T(?:(-?[0-9,.]*)H)?(?:(-?[0-9,.]*)M)?(?:(-?[0-9,.]*)S)?)?$/;
+        if (isDuration(input)) {
+            duration = {
+                ms : input._milliseconds,
+                d  : input._days,
+                M  : input._months
+            };
+        } else if (isNumber(input)) {
+            duration = {};
+            if (key) {
+                duration[key] = input;
+            } else {
+                duration.milliseconds = input;
+            }
+        } else if (!!(match = aspNetRegex.exec(input))) {
+            sign = (match[1] === '-') ? -1 : 1;
+            duration = {
+                y  : 0,
+                d  : toInt(match[DATE])                         * sign,
+                h  : toInt(match[HOUR])                         * sign,
+                m  : toInt(match[MINUTE])                       * sign,
+                s  : toInt(match[SECOND])                       * sign,
+                ms : toInt(absRound(match[MILLISECOND] * 1000)) * sign // the millisecond decimal point is included in the match
+            };
+        } else if (!!(match = isoRegex.exec(input))) {
+            sign = (match[1] === '-') ? -1 : (match[1] === '+') ? 1 : 1;
+            duration = {
+                y : parseIso(match[2], sign),
+                M : parseIso(match[3], sign),
+                w : parseIso(match[4], sign),
+                d : parseIso(match[5], sign),
+                h : parseIso(match[6], sign),
+                m : parseIso(match[7], sign),
+                s : parseIso(match[8], sign)
+            };
+        } else if (duration == null) {// checks for null or undefined
+            duration = {};
+        } else if (typeof duration === 'object' && ('from' in duration || 'to' in duration)) {
+            diffRes = momentsDifference(createLocal(duration.from), createLocal(duration.to));
 
-function createDuration (input, key) {
-    var duration = input,
-        // matching against regexp is expensive, do it on demand
-        match = null,
-        sign,
-        ret,
-        diffRes;
+            duration = {};
+            duration.ms = diffRes.milliseconds;
+            duration.M = diffRes.months;
+        }
 
-    if (isDuration(input)) {
-        duration = {
-            ms : input._milliseconds,
-            d  : input._days,
-            M  : input._months
-        };
-    } else if (isNumber(input)) {
-        duration = {};
-        if (key) {
-            duration[key] = input;
+        ret = new Duration(duration);
+
+        if (isDuration(input) && hasOwnProp(input, '_locale')) {
+            ret._locale = input._locale;
+        }
+
+        return ret;
+    }
+
+    createDuration.fn = Duration.prototype;
+    createDuration.invalid = createInvalid$1;
+
+    function parseIso (inp, sign) {
+        // We'd normally use ~~inp for this, but unfortunately it also
+        // converts floats to ints.
+        // inp may be undefined, so careful calling replace on it.
+        var res = inp && parseFloat(inp.replace(',', '.'));
+        // apply sign while we're at it
+        return (isNaN(res) ? 0 : res) * sign;
+    }
+
+    function positiveMomentsDifference(base, other) {
+        var res = {milliseconds: 0, months: 0};
+
+        res.months = other.month() - base.month() +
+            (other.year() - base.year()) * 12;
+        if (base.clone().add(res.months, 'M').isAfter(other)) {
+            --res.months;
+        }
+
+        res.milliseconds = +other - +(base.clone().add(res.months, 'M'));
+
+        return res;
+    }
+
+    function momentsDifference(base, other) {
+        var res;
+        if (!(base.isValid() && other.isValid())) {
+            return {milliseconds: 0, months: 0};
+        }
+
+        other = cloneWithOffset(other, base);
+        if (base.isBefore(other)) {
+            res = positiveMomentsDifference(base, other);
         } else {
-            duration.milliseconds = input;
+            res = positiveMomentsDifference(other, base);
+            res.milliseconds = -res.milliseconds;
+            res.months = -res.months;
         }
-    } else if (!!(match = aspNetRegex.exec(input))) {
-        sign = (match[1] === '-') ? -1 : 1;
-        duration = {
-            y  : 0,
-            d  : toInt(match[DATE])                         * sign,
-            h  : toInt(match[HOUR])                         * sign,
-            m  : toInt(match[MINUTE])                       * sign,
-            s  : toInt(match[SECOND])                       * sign,
-            ms : toInt(absRound(match[MILLISECOND] * 1000)) * sign // the millisecond decimal point is included in the match
+
+        return res;
+    }
+
+    // TODO: remove 'name' arg after deprecation is removed
+    function createAdder(direction, name) {
+        return function (val, period) {
+            var dur, tmp;
+            //invert the arguments, but complain about it
+            if (period !== null && !isNaN(+period)) {
+                deprecateSimple(name, 'moment().' + name  + '(period, number) is deprecated. Please use moment().' + name + '(number, period). ' +
+                'See http://momentjs.com/guides/#/warnings/add-inverted-param/ for more info.');
+                tmp = val; val = period; period = tmp;
+            }
+
+            val = typeof val === 'string' ? +val : val;
+            dur = createDuration(val, period);
+            addSubtract(this, dur, direction);
+            return this;
         };
-    } else if (!!(match = isoRegex.exec(input))) {
-        sign = (match[1] === '-') ? -1 : 1;
-        duration = {
-            y : parseIso(match[2], sign),
-            M : parseIso(match[3], sign),
-            w : parseIso(match[4], sign),
-            d : parseIso(match[5], sign),
-            h : parseIso(match[6], sign),
-            m : parseIso(match[7], sign),
-            s : parseIso(match[8], sign)
-        };
-    } else if (duration == null) {// checks for null or undefined
-        duration = {};
-    } else if (typeof duration === 'object' && ('from' in duration || 'to' in duration)) {
-        diffRes = momentsDifference(createLocal(duration.from), createLocal(duration.to));
-
-        duration = {};
-        duration.ms = diffRes.milliseconds;
-        duration.M = diffRes.months;
     }
 
-    ret = new Duration(duration);
+    function addSubtract (mom, duration, isAdding, updateOffset) {
+        var milliseconds = duration._milliseconds,
+            days = absRound(duration._days),
+            months = absRound(duration._months);
 
-    if (isDuration(input) && hasOwnProp(input, '_locale')) {
-        ret._locale = input._locale;
-    }
-
-    return ret;
-}
-
-createDuration.fn = Duration.prototype;
-createDuration.invalid = createInvalid$1;
-
-function parseIso (inp, sign) {
-    // We'd normally use ~~inp for this, but unfortunately it also
-    // converts floats to ints.
-    // inp may be undefined, so careful calling replace on it.
-    var res = inp && parseFloat(inp.replace(',', '.'));
-    // apply sign while we're at it
-    return (isNaN(res) ? 0 : res) * sign;
-}
-
-function positiveMomentsDifference(base, other) {
-    var res = {milliseconds: 0, months: 0};
-
-    res.months = other.month() - base.month() +
-        (other.year() - base.year()) * 12;
-    if (base.clone().add(res.months, 'M').isAfter(other)) {
-        --res.months;
-    }
-
-    res.milliseconds = +other - +(base.clone().add(res.months, 'M'));
-
-    return res;
-}
-
-function momentsDifference(base, other) {
-    var res;
-    if (!(base.isValid() && other.isValid())) {
-        return {milliseconds: 0, months: 0};
-    }
-
-    other = cloneWithOffset(other, base);
-    if (base.isBefore(other)) {
-        res = positiveMomentsDifference(base, other);
-    } else {
-        res = positiveMomentsDifference(other, base);
-        res.milliseconds = -res.milliseconds;
-        res.months = -res.months;
-    }
-
-    return res;
-}
-
-// TODO: remove 'name' arg after deprecation is removed
-function createAdder(direction, name) {
-    return function (val, period) {
-        var dur, tmp;
-        //invert the arguments, but complain about it
-        if (period !== null && !isNaN(+period)) {
-            deprecateSimple(name, 'moment().' + name  + '(period, number) is deprecated. Please use moment().' + name + '(number, period). ' +
-            'See http://momentjs.com/guides/#/warnings/add-inverted-param/ for more info.');
-            tmp = val; val = period; period = tmp;
+        if (!mom.isValid()) {
+            // No op
+            return;
         }
 
-        val = typeof val === 'string' ? +val : val;
-        dur = createDuration(val, period);
-        addSubtract(this, dur, direction);
-        return this;
-    };
-}
+        updateOffset = updateOffset == null ? true : updateOffset;
 
-function addSubtract (mom, duration, isAdding, updateOffset) {
-    var milliseconds = duration._milliseconds,
-        days = absRound(duration._days),
-        months = absRound(duration._months);
-
-    if (!mom.isValid()) {
-        // No op
-        return;
-    }
-
-    updateOffset = updateOffset == null ? true : updateOffset;
-
-    if (milliseconds) {
-        mom._d.setTime(mom._d.valueOf() + milliseconds * isAdding);
-    }
-    if (days) {
-        set$1(mom, 'Date', get(mom, 'Date') + days * isAdding);
-    }
-    if (months) {
-        setMonth(mom, get(mom, 'Month') + months * isAdding);
-    }
-    if (updateOffset) {
-        hooks.updateOffset(mom, days || months);
-    }
-}
-
-var add      = createAdder(1, 'add');
-var subtract = createAdder(-1, 'subtract');
-
-function getCalendarFormat(myMoment, now) {
-    var diff = myMoment.diff(now, 'days', true);
-    return diff < -6 ? 'sameElse' :
-            diff < -1 ? 'lastWeek' :
-            diff < 0 ? 'lastDay' :
-            diff < 1 ? 'sameDay' :
-            diff < 2 ? 'nextDay' :
-            diff < 7 ? 'nextWeek' : 'sameElse';
-}
-
-function calendar$1 (time, formats) {
-    // We want to compare the start of today, vs this.
-    // Getting start-of-today depends on whether we're local/utc/offset or not.
-    var now = time || createLocal(),
-        sod = cloneWithOffset(now, this).startOf('day'),
-        format = hooks.calendarFormat(this, sod) || 'sameElse';
-
-    var output = formats && (isFunction(formats[format]) ? formats[format].call(this, now) : formats[format]);
-
-    return this.format(output || this.localeData().calendar(format, this, createLocal(now)));
-}
-
-function clone () {
-    return new Moment(this);
-}
-
-function isAfter (input, units) {
-    var localInput = isMoment(input) ? input : createLocal(input);
-    if (!(this.isValid() && localInput.isValid())) {
-        return false;
-    }
-    units = normalizeUnits(!isUndefined(units) ? units : 'millisecond');
-    if (units === 'millisecond') {
-        return this.valueOf() > localInput.valueOf();
-    } else {
-        return localInput.valueOf() < this.clone().startOf(units).valueOf();
-    }
-}
-
-function isBefore (input, units) {
-    var localInput = isMoment(input) ? input : createLocal(input);
-    if (!(this.isValid() && localInput.isValid())) {
-        return false;
-    }
-    units = normalizeUnits(!isUndefined(units) ? units : 'millisecond');
-    if (units === 'millisecond') {
-        return this.valueOf() < localInput.valueOf();
-    } else {
-        return this.clone().endOf(units).valueOf() < localInput.valueOf();
-    }
-}
-
-function isBetween (from, to, units, inclusivity) {
-    inclusivity = inclusivity || '()';
-    return (inclusivity[0] === '(' ? this.isAfter(from, units) : !this.isBefore(from, units)) &&
-        (inclusivity[1] === ')' ? this.isBefore(to, units) : !this.isAfter(to, units));
-}
-
-function isSame (input, units) {
-    var localInput = isMoment(input) ? input : createLocal(input),
-        inputMs;
-    if (!(this.isValid() && localInput.isValid())) {
-        return false;
-    }
-    units = normalizeUnits(units || 'millisecond');
-    if (units === 'millisecond') {
-        return this.valueOf() === localInput.valueOf();
-    } else {
-        inputMs = localInput.valueOf();
-        return this.clone().startOf(units).valueOf() <= inputMs && inputMs <= this.clone().endOf(units).valueOf();
-    }
-}
-
-function isSameOrAfter (input, units) {
-    return this.isSame(input, units) || this.isAfter(input,units);
-}
-
-function isSameOrBefore (input, units) {
-    return this.isSame(input, units) || this.isBefore(input,units);
-}
-
-function diff (input, units, asFloat) {
-    var that,
-        zoneDelta,
-        delta, output;
-
-    if (!this.isValid()) {
-        return NaN;
-    }
-
-    that = cloneWithOffset(input, this);
-
-    if (!that.isValid()) {
-        return NaN;
-    }
-
-    zoneDelta = (that.utcOffset() - this.utcOffset()) * 6e4;
-
-    units = normalizeUnits(units);
-
-    if (units === 'year' || units === 'month' || units === 'quarter') {
-        output = monthDiff(this, that);
-        if (units === 'quarter') {
-            output = output / 3;
-        } else if (units === 'year') {
-            output = output / 12;
+        if (months) {
+            setMonth(mom, get(mom, 'Month') + months * isAdding);
         }
-    } else {
-        delta = this - that;
-        output = units === 'second' ? delta / 1e3 : // 1000
-            units === 'minute' ? delta / 6e4 : // 1000 * 60
-            units === 'hour' ? delta / 36e5 : // 1000 * 60 * 60
-            units === 'day' ? (delta - zoneDelta) / 864e5 : // 1000 * 60 * 60 * 24, negate dst
-            units === 'week' ? (delta - zoneDelta) / 6048e5 : // 1000 * 60 * 60 * 24 * 7, negate dst
-            delta;
-    }
-    return asFloat ? output : absFloor(output);
-}
-
-function monthDiff (a, b) {
-    // difference in months
-    var wholeMonthDiff = ((b.year() - a.year()) * 12) + (b.month() - a.month()),
-        // b is in (anchor - 1 month, anchor + 1 month)
-        anchor = a.clone().add(wholeMonthDiff, 'months'),
-        anchor2, adjust;
-
-    if (b - anchor < 0) {
-        anchor2 = a.clone().add(wholeMonthDiff - 1, 'months');
-        // linear across the month
-        adjust = (b - anchor) / (anchor - anchor2);
-    } else {
-        anchor2 = a.clone().add(wholeMonthDiff + 1, 'months');
-        // linear across the month
-        adjust = (b - anchor) / (anchor2 - anchor);
-    }
-
-    //check for negative zero, return zero if negative zero
-    return -(wholeMonthDiff + adjust) || 0;
-}
-
-hooks.defaultFormat = 'YYYY-MM-DDTHH:mm:ssZ';
-hooks.defaultFormatUtc = 'YYYY-MM-DDTHH:mm:ss[Z]';
-
-function toString () {
-    return this.clone().locale('en').format('ddd MMM DD YYYY HH:mm:ss [GMT]ZZ');
-}
-
-function toISOString() {
-    if (!this.isValid()) {
-        return null;
-    }
-    var m = this.clone().utc();
-    if (m.year() < 0 || m.year() > 9999) {
-        return formatMoment(m, 'YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]');
-    }
-    if (isFunction(Date.prototype.toISOString)) {
-        // native implementation is ~50x faster, use it when we can
-        return this.toDate().toISOString();
-    }
-    return formatMoment(m, 'YYYY-MM-DD[T]HH:mm:ss.SSS[Z]');
-}
-
-/**
- * Return a human readable representation of a moment that can
- * also be evaluated to get a new moment which is the same
- *
- * @link https://nodejs.org/dist/latest/docs/api/util.html#util_custom_inspect_function_on_objects
- */
-function inspect () {
-    if (!this.isValid()) {
-        return 'moment.invalid(/* ' + this._i + ' */)';
-    }
-    var func = 'moment';
-    var zone = '';
-    if (!this.isLocal()) {
-        func = this.utcOffset() === 0 ? 'moment.utc' : 'moment.parseZone';
-        zone = 'Z';
-    }
-    var prefix = '[' + func + '("]';
-    var year = (0 <= this.year() && this.year() <= 9999) ? 'YYYY' : 'YYYYYY';
-    var datetime = '-MM-DD[T]HH:mm:ss.SSS';
-    var suffix = zone + '[")]';
-
-    return this.format(prefix + year + datetime + suffix);
-}
-
-function format (inputString) {
-    if (!inputString) {
-        inputString = this.isUtc() ? hooks.defaultFormatUtc : hooks.defaultFormat;
-    }
-    var output = formatMoment(this, inputString);
-    return this.localeData().postformat(output);
-}
-
-function from (time, withoutSuffix) {
-    if (this.isValid() &&
-            ((isMoment(time) && time.isValid()) ||
-             createLocal(time).isValid())) {
-        return createDuration({to: this, from: time}).locale(this.locale()).humanize(!withoutSuffix);
-    } else {
-        return this.localeData().invalidDate();
-    }
-}
-
-function fromNow (withoutSuffix) {
-    return this.from(createLocal(), withoutSuffix);
-}
-
-function to (time, withoutSuffix) {
-    if (this.isValid() &&
-            ((isMoment(time) && time.isValid()) ||
-             createLocal(time).isValid())) {
-        return createDuration({from: this, to: time}).locale(this.locale()).humanize(!withoutSuffix);
-    } else {
-        return this.localeData().invalidDate();
-    }
-}
-
-function toNow (withoutSuffix) {
-    return this.to(createLocal(), withoutSuffix);
-}
-
-// If passed a locale key, it will set the locale for this
-// instance.  Otherwise, it will return the locale configuration
-// variables for this instance.
-function locale (key) {
-    var newLocaleData;
-
-    if (key === undefined) {
-        return this._locale._abbr;
-    } else {
-        newLocaleData = getLocale(key);
-        if (newLocaleData != null) {
-            this._locale = newLocaleData;
+        if (days) {
+            set$1(mom, 'Date', get(mom, 'Date') + days * isAdding);
+        }
+        if (milliseconds) {
+            mom._d.setTime(mom._d.valueOf() + milliseconds * isAdding);
+        }
+        if (updateOffset) {
+            hooks.updateOffset(mom, days || months);
         }
-        return this;
     }
-}
 
-var lang = deprecate(
-    'moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.',
-    function (key) {
-        if (key === undefined) {
-            return this.localeData();
+    var add      = createAdder(1, 'add');
+    var subtract = createAdder(-1, 'subtract');
+
+    function getCalendarFormat(myMoment, now) {
+        var diff = myMoment.diff(now, 'days', true);
+        return diff < -6 ? 'sameElse' :
+                diff < -1 ? 'lastWeek' :
+                diff < 0 ? 'lastDay' :
+                diff < 1 ? 'sameDay' :
+                diff < 2 ? 'nextDay' :
+                diff < 7 ? 'nextWeek' : 'sameElse';
+    }
+
+    function calendar$1 (time, formats) {
+        // We want to compare the start of today, vs this.
+        // Getting start-of-today depends on whether we're local/utc/offset or not.
+        var now = time || createLocal(),
+            sod = cloneWithOffset(now, this).startOf('day'),
+            format = hooks.calendarFormat(this, sod) || 'sameElse';
+
+        var output = formats && (isFunction(formats[format]) ? formats[format].call(this, now) : formats[format]);
+
+        return this.format(output || this.localeData().calendar(format, this, createLocal(now)));
+    }
+
+    function clone () {
+        return new Moment(this);
+    }
+
+    function isAfter (input, units) {
+        var localInput = isMoment(input) ? input : createLocal(input);
+        if (!(this.isValid() && localInput.isValid())) {
+            return false;
+        }
+        units = normalizeUnits(!isUndefined(units) ? units : 'millisecond');
+        if (units === 'millisecond') {
+            return this.valueOf() > localInput.valueOf();
         } else {
-            return this.locale(key);
+            return localInput.valueOf() < this.clone().startOf(units).valueOf();
         }
     }
-);
 
-function localeData () {
-    return this._locale;
-}
-
-function startOf (units) {
-    units = normalizeUnits(units);
-    // the following switch intentionally omits break keywords
-    // to utilize falling through the cases.
-    switch (units) {
-        case 'year':
-            this.month(0);
-            /* falls through */
-        case 'quarter':
-        case 'month':
-            this.date(1);
-            /* falls through */
-        case 'week':
-        case 'isoWeek':
-        case 'day':
-        case 'date':
-            this.hours(0);
-            /* falls through */
-        case 'hour':
-            this.minutes(0);
-            /* falls through */
-        case 'minute':
-            this.seconds(0);
-            /* falls through */
-        case 'second':
-            this.milliseconds(0);
-    }
-
-    // weeks are a special case
-    if (units === 'week') {
-        this.weekday(0);
-    }
-    if (units === 'isoWeek') {
-        this.isoWeekday(1);
-    }
-
-    // quarters are also special
-    if (units === 'quarter') {
-        this.month(Math.floor(this.month() / 3) * 3);
-    }
-
-    return this;
-}
-
-function endOf (units) {
-    units = normalizeUnits(units);
-    if (units === undefined || units === 'millisecond') {
-        return this;
-    }
-
-    // 'date' is an alias for 'day', so it should be considered as such.
-    if (units === 'date') {
-        units = 'day';
-    }
-
-    return this.startOf(units).add(1, (units === 'isoWeek' ? 'week' : units)).subtract(1, 'ms');
-}
-
-function valueOf () {
-    return this._d.valueOf() - ((this._offset || 0) * 60000);
-}
-
-function unix () {
-    return Math.floor(this.valueOf() / 1000);
-}
-
-function toDate () {
-    return new Date(this.valueOf());
-}
-
-function toArray () {
-    var m = this;
-    return [m.year(), m.month(), m.date(), m.hour(), m.minute(), m.second(), m.millisecond()];
-}
-
-function toObject () {
-    var m = this;
-    return {
-        years: m.year(),
-        months: m.month(),
-        date: m.date(),
-        hours: m.hours(),
-        minutes: m.minutes(),
-        seconds: m.seconds(),
-        milliseconds: m.milliseconds()
-    };
-}
-
-function toJSON () {
-    // new Date(NaN).toJSON() === null
-    return this.isValid() ? this.toISOString() : null;
-}
-
-function isValid$2 () {
-    return isValid(this);
-}
-
-function parsingFlags () {
-    return extend({}, getParsingFlags(this));
-}
-
-function invalidAt () {
-    return getParsingFlags(this).overflow;
-}
-
-function creationData() {
-    return {
-        input: this._i,
-        format: this._f,
-        locale: this._locale,
-        isUTC: this._isUTC,
-        strict: this._strict
-    };
-}
-
-// FORMATTING
-
-addFormatToken(0, ['gg', 2], 0, function () {
-    return this.weekYear() % 100;
-});
-
-addFormatToken(0, ['GG', 2], 0, function () {
-    return this.isoWeekYear() % 100;
-});
-
-function addWeekYearFormatToken (token, getter) {
-    addFormatToken(0, [token, token.length], 0, getter);
-}
-
-addWeekYearFormatToken('gggg',     'weekYear');
-addWeekYearFormatToken('ggggg',    'weekYear');
-addWeekYearFormatToken('GGGG',  'isoWeekYear');
-addWeekYearFormatToken('GGGGG', 'isoWeekYear');
-
-// ALIASES
-
-addUnitAlias('weekYear', 'gg');
-addUnitAlias('isoWeekYear', 'GG');
-
-// PRIORITY
-
-addUnitPriority('weekYear', 1);
-addUnitPriority('isoWeekYear', 1);
-
-
-// PARSING
-
-addRegexToken('G',      matchSigned);
-addRegexToken('g',      matchSigned);
-addRegexToken('GG',     match1to2, match2);
-addRegexToken('gg',     match1to2, match2);
-addRegexToken('GGGG',   match1to4, match4);
-addRegexToken('gggg',   match1to4, match4);
-addRegexToken('GGGGG',  match1to6, match6);
-addRegexToken('ggggg',  match1to6, match6);
-
-addWeekParseToken(['gggg', 'ggggg', 'GGGG', 'GGGGG'], function (input, week, config, token) {
-    week[token.substr(0, 2)] = toInt(input);
-});
-
-addWeekParseToken(['gg', 'GG'], function (input, week, config, token) {
-    week[token] = hooks.parseTwoDigitYear(input);
-});
-
-// MOMENTS
-
-function getSetWeekYear (input) {
-    return getSetWeekYearHelper.call(this,
-            input,
-            this.week(),
-            this.weekday(),
-            this.localeData()._week.dow,
-            this.localeData()._week.doy);
-}
-
-function getSetISOWeekYear (input) {
-    return getSetWeekYearHelper.call(this,
-            input, this.isoWeek(), this.isoWeekday(), 1, 4);
-}
-
-function getISOWeeksInYear () {
-    return weeksInYear(this.year(), 1, 4);
-}
-
-function getWeeksInYear () {
-    var weekInfo = this.localeData()._week;
-    return weeksInYear(this.year(), weekInfo.dow, weekInfo.doy);
-}
-
-function getSetWeekYearHelper(input, week, weekday, dow, doy) {
-    var weeksTarget;
-    if (input == null) {
-        return weekOfYear(this, dow, doy).year;
-    } else {
-        weeksTarget = weeksInYear(input, dow, doy);
-        if (week > weeksTarget) {
-            week = weeksTarget;
+    function isBefore (input, units) {
+        var localInput = isMoment(input) ? input : createLocal(input);
+        if (!(this.isValid() && localInput.isValid())) {
+            return false;
+        }
+        units = normalizeUnits(!isUndefined(units) ? units : 'millisecond');
+        if (units === 'millisecond') {
+            return this.valueOf() < localInput.valueOf();
+        } else {
+            return this.clone().endOf(units).valueOf() < localInput.valueOf();
         }
-        return setWeekAll.call(this, input, week, weekday, dow, doy);
-    }
-}
-
-function setWeekAll(weekYear, week, weekday, dow, doy) {
-    var dayOfYearData = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy),
-        date = createUTCDate(dayOfYearData.year, 0, dayOfYearData.dayOfYear);
-
-    this.year(date.getUTCFullYear());
-    this.month(date.getUTCMonth());
-    this.date(date.getUTCDate());
-    return this;
-}
-
-// FORMATTING
-
-addFormatToken('Q', 0, 'Qo', 'quarter');
-
-// ALIASES
-
-addUnitAlias('quarter', 'Q');
-
-// PRIORITY
-
-addUnitPriority('quarter', 7);
-
-// PARSING
-
-addRegexToken('Q', match1);
-addParseToken('Q', function (input, array) {
-    array[MONTH] = (toInt(input) - 1) * 3;
-});
-
-// MOMENTS
-
-function getSetQuarter (input) {
-    return input == null ? Math.ceil((this.month() + 1) / 3) : this.month((input - 1) * 3 + this.month() % 3);
-}
-
-// FORMATTING
-
-addFormatToken('D', ['DD', 2], 'Do', 'date');
-
-// ALIASES
-
-addUnitAlias('date', 'D');
-
-// PRIOROITY
-addUnitPriority('date', 9);
-
-// PARSING
-
-addRegexToken('D',  match1to2);
-addRegexToken('DD', match1to2, match2);
-addRegexToken('Do', function (isStrict, locale) {
-    // TODO: Remove "ordinalParse" fallback in next major release.
-    return isStrict ?
-      (locale._dayOfMonthOrdinalParse || locale._ordinalParse) :
-      locale._dayOfMonthOrdinalParseLenient;
-});
-
-addParseToken(['D', 'DD'], DATE);
-addParseToken('Do', function (input, array) {
-    array[DATE] = toInt(input.match(match1to2)[0], 10);
-});
-
-// MOMENTS
-
-var getSetDayOfMonth = makeGetSet('Date', true);
-
-// FORMATTING
-
-addFormatToken('DDD', ['DDDD', 3], 'DDDo', 'dayOfYear');
-
-// ALIASES
-
-addUnitAlias('dayOfYear', 'DDD');
-
-// PRIORITY
-addUnitPriority('dayOfYear', 4);
-
-// PARSING
-
-addRegexToken('DDD',  match1to3);
-addRegexToken('DDDD', match3);
-addParseToken(['DDD', 'DDDD'], function (input, array, config) {
-    config._dayOfYear = toInt(input);
-});
-
-// HELPERS
-
-// MOMENTS
-
-function getSetDayOfYear (input) {
-    var dayOfYear = Math.round((this.clone().startOf('day') - this.clone().startOf('year')) / 864e5) + 1;
-    return input == null ? dayOfYear : this.add((input - dayOfYear), 'd');
-}
-
-// FORMATTING
-
-addFormatToken('m', ['mm', 2], 0, 'minute');
-
-// ALIASES
-
-addUnitAlias('minute', 'm');
-
-// PRIORITY
-
-addUnitPriority('minute', 14);
-
-// PARSING
-
-addRegexToken('m',  match1to2);
-addRegexToken('mm', match1to2, match2);
-addParseToken(['m', 'mm'], MINUTE);
-
-// MOMENTS
-
-var getSetMinute = makeGetSet('Minutes', false);
-
-// FORMATTING
-
-addFormatToken('s', ['ss', 2], 0, 'second');
-
-// ALIASES
-
-addUnitAlias('second', 's');
-
-// PRIORITY
-
-addUnitPriority('second', 15);
-
-// PARSING
-
-addRegexToken('s',  match1to2);
-addRegexToken('ss', match1to2, match2);
-addParseToken(['s', 'ss'], SECOND);
-
-// MOMENTS
-
-var getSetSecond = makeGetSet('Seconds', false);
-
-// FORMATTING
-
-addFormatToken('S', 0, 0, function () {
-    return ~~(this.millisecond() / 100);
-});
-
-addFormatToken(0, ['SS', 2], 0, function () {
-    return ~~(this.millisecond() / 10);
-});
-
-addFormatToken(0, ['SSS', 3], 0, 'millisecond');
-addFormatToken(0, ['SSSS', 4], 0, function () {
-    return this.millisecond() * 10;
-});
-addFormatToken(0, ['SSSSS', 5], 0, function () {
-    return this.millisecond() * 100;
-});
-addFormatToken(0, ['SSSSSS', 6], 0, function () {
-    return this.millisecond() * 1000;
-});
-addFormatToken(0, ['SSSSSSS', 7], 0, function () {
-    return this.millisecond() * 10000;
-});
-addFormatToken(0, ['SSSSSSSS', 8], 0, function () {
-    return this.millisecond() * 100000;
-});
-addFormatToken(0, ['SSSSSSSSS', 9], 0, function () {
-    return this.millisecond() * 1000000;
-});
-
-
-// ALIASES
-
-addUnitAlias('millisecond', 'ms');
-
-// PRIORITY
-
-addUnitPriority('millisecond', 16);
-
-// PARSING
-
-addRegexToken('S',    match1to3, match1);
-addRegexToken('SS',   match1to3, match2);
-addRegexToken('SSS',  match1to3, match3);
-
-var token;
-for (token = 'SSSS'; token.length <= 9; token += 'S') {
-    addRegexToken(token, matchUnsigned);
-}
-
-function parseMs(input, array) {
-    array[MILLISECOND] = toInt(('0.' + input) * 1000);
-}
-
-for (token = 'S'; token.length <= 9; token += 'S') {
-    addParseToken(token, parseMs);
-}
-// MOMENTS
-
-var getSetMillisecond = makeGetSet('Milliseconds', false);
-
-// FORMATTING
-
-addFormatToken('z',  0, 0, 'zoneAbbr');
-addFormatToken('zz', 0, 0, 'zoneName');
-
-// MOMENTS
-
-function getZoneAbbr () {
-    return this._isUTC ? 'UTC' : '';
-}
-
-function getZoneName () {
-    return this._isUTC ? 'Coordinated Universal Time' : '';
-}
-
-var proto = Moment.prototype;
-
-proto.add               = add;
-proto.calendar          = calendar$1;
-proto.clone             = clone;
-proto.diff              = diff;
-proto.endOf             = endOf;
-proto.format            = format;
-proto.from              = from;
-proto.fromNow           = fromNow;
-proto.to                = to;
-proto.toNow             = toNow;
-proto.get               = stringGet;
-proto.invalidAt         = invalidAt;
-proto.isAfter           = isAfter;
-proto.isBefore          = isBefore;
-proto.isBetween         = isBetween;
-proto.isSame            = isSame;
-proto.isSameOrAfter     = isSameOrAfter;
-proto.isSameOrBefore    = isSameOrBefore;
-proto.isValid           = isValid$2;
-proto.lang              = lang;
-proto.locale            = locale;
-proto.localeData        = localeData;
-proto.max               = prototypeMax;
-proto.min               = prototypeMin;
-proto.parsingFlags      = parsingFlags;
-proto.set               = stringSet;
-proto.startOf           = startOf;
-proto.subtract          = subtract;
-proto.toArray           = toArray;
-proto.toObject          = toObject;
-proto.toDate            = toDate;
-proto.toISOString       = toISOString;
-proto.inspect           = inspect;
-proto.toJSON            = toJSON;
-proto.toString          = toString;
-proto.unix              = unix;
-proto.valueOf           = valueOf;
-proto.creationData      = creationData;
-
-// Year
-proto.year       = getSetYear;
-proto.isLeapYear = getIsLeapYear;
-
-// Week Year
-proto.weekYear    = getSetWeekYear;
-proto.isoWeekYear = getSetISOWeekYear;
-
-// Quarter
-proto.quarter = proto.quarters = getSetQuarter;
-
-// Month
-proto.month       = getSetMonth;
-proto.daysInMonth = getDaysInMonth;
-
-// Week
-proto.week           = proto.weeks        = getSetWeek;
-proto.isoWeek        = proto.isoWeeks     = getSetISOWeek;
-proto.weeksInYear    = getWeeksInYear;
-proto.isoWeeksInYear = getISOWeeksInYear;
-
-// Day
-proto.date       = getSetDayOfMonth;
-proto.day        = proto.days             = getSetDayOfWeek;
-proto.weekday    = getSetLocaleDayOfWeek;
-proto.isoWeekday = getSetISODayOfWeek;
-proto.dayOfYear  = getSetDayOfYear;
-
-// Hour
-proto.hour = proto.hours = getSetHour;
-
-// Minute
-proto.minute = proto.minutes = getSetMinute;
-
-// Second
-proto.second = proto.seconds = getSetSecond;
-
-// Millisecond
-proto.millisecond = proto.milliseconds = getSetMillisecond;
-
-// Offset
-proto.utcOffset            = getSetOffset;
-proto.utc                  = setOffsetToUTC;
-proto.local                = setOffsetToLocal;
-proto.parseZone            = setOffsetToParsedOffset;
-proto.hasAlignedHourOffset = hasAlignedHourOffset;
-proto.isDST                = isDaylightSavingTime;
-proto.isLocal              = isLocal;
-proto.isUtcOffset          = isUtcOffset;
-proto.isUtc                = isUtc;
-proto.isUTC                = isUtc;
-
-// Timezone
-proto.zoneAbbr = getZoneAbbr;
-proto.zoneName = getZoneName;
-
-// Deprecations
-proto.dates  = deprecate('dates accessor is deprecated. Use date instead.', getSetDayOfMonth);
-proto.months = deprecate('months accessor is deprecated. Use month instead', getSetMonth);
-proto.years  = deprecate('years accessor is deprecated. Use year instead', getSetYear);
-proto.zone   = deprecate('moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/', getSetZone);
-proto.isDSTShifted = deprecate('isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information', isDaylightSavingTimeShifted);
-
-function createUnix (input) {
-    return createLocal(input * 1000);
-}
-
-function createInZone () {
-    return createLocal.apply(null, arguments).parseZone();
-}
-
-function preParsePostFormat (string) {
-    return string;
-}
-
-var proto$1 = Locale.prototype;
-
-proto$1.calendar        = calendar;
-proto$1.longDateFormat  = longDateFormat;
-proto$1.invalidDate     = invalidDate;
-proto$1.ordinal         = ordinal;
-proto$1.preparse        = preParsePostFormat;
-proto$1.postformat      = preParsePostFormat;
-proto$1.relativeTime    = relativeTime;
-proto$1.pastFuture      = pastFuture;
-proto$1.set             = set;
-
-// Month
-proto$1.months            =        localeMonths;
-proto$1.monthsShort       =        localeMonthsShort;
-proto$1.monthsParse       =        localeMonthsParse;
-proto$1.monthsRegex       = monthsRegex;
-proto$1.monthsShortRegex  = monthsShortRegex;
-
-// Week
-proto$1.week = localeWeek;
-proto$1.firstDayOfYear = localeFirstDayOfYear;
-proto$1.firstDayOfWeek = localeFirstDayOfWeek;
-
-// Day of Week
-proto$1.weekdays       =        localeWeekdays;
-proto$1.weekdaysMin    =        localeWeekdaysMin;
-proto$1.weekdaysShort  =        localeWeekdaysShort;
-proto$1.weekdaysParse  =        localeWeekdaysParse;
-
-proto$1.weekdaysRegex       =        weekdaysRegex;
-proto$1.weekdaysShortRegex  =        weekdaysShortRegex;
-proto$1.weekdaysMinRegex    =        weekdaysMinRegex;
-
-// Hours
-proto$1.isPM = localeIsPM;
-proto$1.meridiem = localeMeridiem;
-
-function get$1 (format, index, field, setter) {
-    var locale = getLocale();
-    var utc = createUTC().set(setter, index);
-    return locale[field](utc, format);
-}
-
-function listMonthsImpl (format, index, field) {
-    if (isNumber(format)) {
-        index = format;
-        format = undefined;
     }
 
-    format = format || '';
-
-    if (index != null) {
-        return get$1(format, index, field, 'month');
+    function isBetween (from, to, units, inclusivity) {
+        inclusivity = inclusivity || '()';
+        return (inclusivity[0] === '(' ? this.isAfter(from, units) : !this.isBefore(from, units)) &&
+            (inclusivity[1] === ')' ? this.isBefore(to, units) : !this.isAfter(to, units));
     }
 
-    var i;
-    var out = [];
-    for (i = 0; i < 12; i++) {
-        out[i] = get$1(format, i, field, 'month');
+    function isSame (input, units) {
+        var localInput = isMoment(input) ? input : createLocal(input),
+            inputMs;
+        if (!(this.isValid() && localInput.isValid())) {
+            return false;
+        }
+        units = normalizeUnits(units || 'millisecond');
+        if (units === 'millisecond') {
+            return this.valueOf() === localInput.valueOf();
+        } else {
+            inputMs = localInput.valueOf();
+            return this.clone().startOf(units).valueOf() <= inputMs && inputMs <= this.clone().endOf(units).valueOf();
+        }
     }
-    return out;
-}
 
-// ()
-// (5)
-// (fmt, 5)
-// (fmt)
-// (true)
-// (true, 5)
-// (true, fmt, 5)
-// (true, fmt)
-function listWeekdaysImpl (localeSorted, format, index, field) {
-    if (typeof localeSorted === 'boolean') {
-        if (isNumber(format)) {
-            index = format;
-            format = undefined;
+    function isSameOrAfter (input, units) {
+        return this.isSame(input, units) || this.isAfter(input,units);
+    }
+
+    function isSameOrBefore (input, units) {
+        return this.isSame(input, units) || this.isBefore(input,units);
+    }
+
+    function diff (input, units, asFloat) {
+        var that,
+            zoneDelta,
+            output;
+
+        if (!this.isValid()) {
+            return NaN;
         }
 
-        format = format || '';
-    } else {
-        format = localeSorted;
-        index = format;
-        localeSorted = false;
+        that = cloneWithOffset(input, this);
 
-        if (isNumber(format)) {
-            index = format;
-            format = undefined;
+        if (!that.isValid()) {
+            return NaN;
         }
 
-        format = format || '';
-    }
+        zoneDelta = (that.utcOffset() - this.utcOffset()) * 6e4;
 
-    var locale = getLocale(),
-        shift = localeSorted ? locale._week.dow : 0;
+        units = normalizeUnits(units);
 
-    if (index != null) {
-        return get$1(format, (index + shift) % 7, field, 'day');
-    }
-
-    var i;
-    var out = [];
-    for (i = 0; i < 7; i++) {
-        out[i] = get$1(format, (i + shift) % 7, field, 'day');
-    }
-    return out;
-}
-
-function listMonths (format, index) {
-    return listMonthsImpl(format, index, 'months');
-}
-
-function listMonthsShort (format, index) {
-    return listMonthsImpl(format, index, 'monthsShort');
-}
-
-function listWeekdays (localeSorted, format, index) {
-    return listWeekdaysImpl(localeSorted, format, index, 'weekdays');
-}
-
-function listWeekdaysShort (localeSorted, format, index) {
-    return listWeekdaysImpl(localeSorted, format, index, 'weekdaysShort');
-}
-
-function listWeekdaysMin (localeSorted, format, index) {
-    return listWeekdaysImpl(localeSorted, format, index, 'weekdaysMin');
-}
-
-getSetGlobalLocale('en', {
-    dayOfMonthOrdinalParse: /\d{1,2}(th|st|nd|rd)/,
-    ordinal : function (number) {
-        var b = number % 10,
-            output = (toInt(number % 100 / 10) === 1) ? 'th' :
-            (b === 1) ? 'st' :
-            (b === 2) ? 'nd' :
-            (b === 3) ? 'rd' : 'th';
-        return number + output;
-    }
-});
-
-// Side effect imports
-hooks.lang = deprecate('moment.lang is deprecated. Use moment.locale instead.', getSetGlobalLocale);
-hooks.langData = deprecate('moment.langData is deprecated. Use moment.localeData instead.', getLocale);
-
-var mathAbs = Math.abs;
-
-function abs () {
-    var data           = this._data;
-
-    this._milliseconds = mathAbs(this._milliseconds);
-    this._days         = mathAbs(this._days);
-    this._months       = mathAbs(this._months);
-
-    data.milliseconds  = mathAbs(data.milliseconds);
-    data.seconds       = mathAbs(data.seconds);
-    data.minutes       = mathAbs(data.minutes);
-    data.hours         = mathAbs(data.hours);
-    data.months        = mathAbs(data.months);
-    data.years         = mathAbs(data.years);
-
-    return this;
-}
-
-function addSubtract$1 (duration, input, value, direction) {
-    var other = createDuration(input, value);
-
-    duration._milliseconds += direction * other._milliseconds;
-    duration._days         += direction * other._days;
-    duration._months       += direction * other._months;
-
-    return duration._bubble();
-}
-
-// supports only 2.0-style add(1, 's') or add(duration)
-function add$1 (input, value) {
-    return addSubtract$1(this, input, value, 1);
-}
-
-// supports only 2.0-style subtract(1, 's') or subtract(duration)
-function subtract$1 (input, value) {
-    return addSubtract$1(this, input, value, -1);
-}
-
-function absCeil (number) {
-    if (number < 0) {
-        return Math.floor(number);
-    } else {
-        return Math.ceil(number);
-    }
-}
-
-function bubble () {
-    var milliseconds = this._milliseconds;
-    var days         = this._days;
-    var months       = this._months;
-    var data         = this._data;
-    var seconds, minutes, hours, years, monthsFromDays;
-
-    // if we have a mix of positive and negative values, bubble down first
-    // check: https://github.com/moment/moment/issues/2166
-    if (!((milliseconds >= 0 && days >= 0 && months >= 0) ||
-            (milliseconds <= 0 && days <= 0 && months <= 0))) {
-        milliseconds += absCeil(monthsToDays(months) + days) * 864e5;
-        days = 0;
-        months = 0;
-    }
-
-    // The following code bubbles up values, see the tests for
-    // examples of what that means.
-    data.milliseconds = milliseconds % 1000;
-
-    seconds           = absFloor(milliseconds / 1000);
-    data.seconds      = seconds % 60;
-
-    minutes           = absFloor(seconds / 60);
-    data.minutes      = minutes % 60;
-
-    hours             = absFloor(minutes / 60);
-    data.hours        = hours % 24;
-
-    days += absFloor(hours / 24);
-
-    // convert days to months
-    monthsFromDays = absFloor(daysToMonths(days));
-    months += monthsFromDays;
-    days -= absCeil(monthsToDays(monthsFromDays));
-
-    // 12 months -> 1 year
-    years = absFloor(months / 12);
-    months %= 12;
-
-    data.days   = days;
-    data.months = months;
-    data.years  = years;
-
-    return this;
-}
-
-function daysToMonths (days) {
-    // 400 years have 146097 days (taking into account leap year rules)
-    // 400 years have 12 months === 4800
-    return days * 4800 / 146097;
-}
-
-function monthsToDays (months) {
-    // the reverse of daysToMonths
-    return months * 146097 / 4800;
-}
-
-function as (units) {
-    if (!this.isValid()) {
-        return NaN;
-    }
-    var days;
-    var months;
-    var milliseconds = this._milliseconds;
-
-    units = normalizeUnits(units);
-
-    if (units === 'month' || units === 'year') {
-        days   = this._days   + milliseconds / 864e5;
-        months = this._months + daysToMonths(days);
-        return units === 'month' ? months : months / 12;
-    } else {
-        // handle milliseconds separately because of floating point math errors (issue #1867)
-        days = this._days + Math.round(monthsToDays(this._months));
         switch (units) {
-            case 'week'   : return days / 7     + milliseconds / 6048e5;
-            case 'day'    : return days         + milliseconds / 864e5;
-            case 'hour'   : return days * 24    + milliseconds / 36e5;
-            case 'minute' : return days * 1440  + milliseconds / 6e4;
-            case 'second' : return days * 86400 + milliseconds / 1000;
-            // Math.floor prevents floating point math errors here
-            case 'millisecond': return Math.floor(days * 864e5) + milliseconds;
-            default: throw new Error('Unknown unit ' + units);
+            case 'year': output = monthDiff(this, that) / 12; break;
+            case 'month': output = monthDiff(this, that); break;
+            case 'quarter': output = monthDiff(this, that) / 3; break;
+            case 'second': output = (this - that) / 1e3; break; // 1000
+            case 'minute': output = (this - that) / 6e4; break; // 1000 * 60
+            case 'hour': output = (this - that) / 36e5; break; // 1000 * 60 * 60
+            case 'day': output = (this - that - zoneDelta) / 864e5; break; // 1000 * 60 * 60 * 24, negate dst
+            case 'week': output = (this - that - zoneDelta) / 6048e5; break; // 1000 * 60 * 60 * 24 * 7, negate dst
+            default: output = this - that;
+        }
+
+        return asFloat ? output : absFloor(output);
+    }
+
+    function monthDiff (a, b) {
+        // difference in months
+        var wholeMonthDiff = ((b.year() - a.year()) * 12) + (b.month() - a.month()),
+            // b is in (anchor - 1 month, anchor + 1 month)
+            anchor = a.clone().add(wholeMonthDiff, 'months'),
+            anchor2, adjust;
+
+        if (b - anchor < 0) {
+            anchor2 = a.clone().add(wholeMonthDiff - 1, 'months');
+            // linear across the month
+            adjust = (b - anchor) / (anchor - anchor2);
+        } else {
+            anchor2 = a.clone().add(wholeMonthDiff + 1, 'months');
+            // linear across the month
+            adjust = (b - anchor) / (anchor2 - anchor);
+        }
+
+        //check for negative zero, return zero if negative zero
+        return -(wholeMonthDiff + adjust) || 0;
+    }
+
+    hooks.defaultFormat = 'YYYY-MM-DDTHH:mm:ssZ';
+    hooks.defaultFormatUtc = 'YYYY-MM-DDTHH:mm:ss[Z]';
+
+    function toString () {
+        return this.clone().locale('en').format('ddd MMM DD YYYY HH:mm:ss [GMT]ZZ');
+    }
+
+    function toISOString(keepOffset) {
+        if (!this.isValid()) {
+            return null;
+        }
+        var utc = keepOffset !== true;
+        var m = utc ? this.clone().utc() : this;
+        if (m.year() < 0 || m.year() > 9999) {
+            return formatMoment(m, utc ? 'YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]' : 'YYYYYY-MM-DD[T]HH:mm:ss.SSSZ');
+        }
+        if (isFunction(Date.prototype.toISOString)) {
+            // native implementation is ~50x faster, use it when we can
+            if (utc) {
+                return this.toDate().toISOString();
+            } else {
+                return new Date(this.valueOf() + this.utcOffset() * 60 * 1000).toISOString().replace('Z', formatMoment(m, 'Z'));
+            }
+        }
+        return formatMoment(m, utc ? 'YYYY-MM-DD[T]HH:mm:ss.SSS[Z]' : 'YYYY-MM-DD[T]HH:mm:ss.SSSZ');
+    }
+
+    /**
+     * Return a human readable representation of a moment that can
+     * also be evaluated to get a new moment which is the same
+     *
+     * @link https://nodejs.org/dist/latest/docs/api/util.html#util_custom_inspect_function_on_objects
+     */
+    function inspect () {
+        if (!this.isValid()) {
+            return 'moment.invalid(/* ' + this._i + ' */)';
+        }
+        var func = 'moment';
+        var zone = '';
+        if (!this.isLocal()) {
+            func = this.utcOffset() === 0 ? 'moment.utc' : 'moment.parseZone';
+            zone = 'Z';
+        }
+        var prefix = '[' + func + '("]';
+        var year = (0 <= this.year() && this.year() <= 9999) ? 'YYYY' : 'YYYYYY';
+        var datetime = '-MM-DD[T]HH:mm:ss.SSS';
+        var suffix = zone + '[")]';
+
+        return this.format(prefix + year + datetime + suffix);
+    }
+
+    function format (inputString) {
+        if (!inputString) {
+            inputString = this.isUtc() ? hooks.defaultFormatUtc : hooks.defaultFormat;
+        }
+        var output = formatMoment(this, inputString);
+        return this.localeData().postformat(output);
+    }
+
+    function from (time, withoutSuffix) {
+        if (this.isValid() &&
+                ((isMoment(time) && time.isValid()) ||
+                 createLocal(time).isValid())) {
+            return createDuration({to: this, from: time}).locale(this.locale()).humanize(!withoutSuffix);
+        } else {
+            return this.localeData().invalidDate();
         }
     }
-}
 
-// TODO: Use this.as('ms')?
-function valueOf$1 () {
-    if (!this.isValid()) {
-        return NaN;
+    function fromNow (withoutSuffix) {
+        return this.from(createLocal(), withoutSuffix);
     }
-    return (
-        this._milliseconds +
-        this._days * 864e5 +
-        (this._months % 12) * 2592e6 +
-        toInt(this._months / 12) * 31536e6
+
+    function to (time, withoutSuffix) {
+        if (this.isValid() &&
+                ((isMoment(time) && time.isValid()) ||
+                 createLocal(time).isValid())) {
+            return createDuration({from: this, to: time}).locale(this.locale()).humanize(!withoutSuffix);
+        } else {
+            return this.localeData().invalidDate();
+        }
+    }
+
+    function toNow (withoutSuffix) {
+        return this.to(createLocal(), withoutSuffix);
+    }
+
+    // If passed a locale key, it will set the locale for this
+    // instance.  Otherwise, it will return the locale configuration
+    // variables for this instance.
+    function locale (key) {
+        var newLocaleData;
+
+        if (key === undefined) {
+            return this._locale._abbr;
+        } else {
+            newLocaleData = getLocale(key);
+            if (newLocaleData != null) {
+                this._locale = newLocaleData;
+            }
+            return this;
+        }
+    }
+
+    var lang = deprecate(
+        'moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.',
+        function (key) {
+            if (key === undefined) {
+                return this.localeData();
+            } else {
+                return this.locale(key);
+            }
+        }
     );
-}
 
-function makeAs (alias) {
-    return function () {
-        return this.as(alias);
-    };
-}
-
-var asMilliseconds = makeAs('ms');
-var asSeconds      = makeAs('s');
-var asMinutes      = makeAs('m');
-var asHours        = makeAs('h');
-var asDays         = makeAs('d');
-var asWeeks        = makeAs('w');
-var asMonths       = makeAs('M');
-var asYears        = makeAs('y');
-
-function get$2 (units) {
-    units = normalizeUnits(units);
-    return this.isValid() ? this[units + 's']() : NaN;
-}
-
-function makeGetter(name) {
-    return function () {
-        return this.isValid() ? this._data[name] : NaN;
-    };
-}
-
-var milliseconds = makeGetter('milliseconds');
-var seconds      = makeGetter('seconds');
-var minutes      = makeGetter('minutes');
-var hours        = makeGetter('hours');
-var days         = makeGetter('days');
-var months       = makeGetter('months');
-var years        = makeGetter('years');
-
-function weeks () {
-    return absFloor(this.days() / 7);
-}
-
-var round = Math.round;
-var thresholds = {
-    ss: 44,         // a few seconds to seconds
-    s : 45,         // seconds to minute
-    m : 45,         // minutes to hour
-    h : 22,         // hours to day
-    d : 26,         // days to month
-    M : 11          // months to year
-};
-
-// helper function for moment.fn.from, moment.fn.fromNow, and moment.duration.fn.humanize
-function substituteTimeAgo(string, number, withoutSuffix, isFuture, locale) {
-    return locale.relativeTime(number || 1, !!withoutSuffix, string, isFuture);
-}
-
-function relativeTime$1 (posNegDuration, withoutSuffix, locale) {
-    var duration = createDuration(posNegDuration).abs();
-    var seconds  = round(duration.as('s'));
-    var minutes  = round(duration.as('m'));
-    var hours    = round(duration.as('h'));
-    var days     = round(duration.as('d'));
-    var months   = round(duration.as('M'));
-    var years    = round(duration.as('y'));
-
-    var a = seconds <= thresholds.ss && ['s', seconds]  ||
-            seconds < thresholds.s   && ['ss', seconds] ||
-            minutes <= 1             && ['m']           ||
-            minutes < thresholds.m   && ['mm', minutes] ||
-            hours   <= 1             && ['h']           ||
-            hours   < thresholds.h   && ['hh', hours]   ||
-            days    <= 1             && ['d']           ||
-            days    < thresholds.d   && ['dd', days]    ||
-            months  <= 1             && ['M']           ||
-            months  < thresholds.M   && ['MM', months]  ||
-            years   <= 1             && ['y']           || ['yy', years];
-
-    a[2] = withoutSuffix;
-    a[3] = +posNegDuration > 0;
-    a[4] = locale;
-    return substituteTimeAgo.apply(null, a);
-}
-
-// This function allows you to set the rounding function for relative time strings
-function getSetRelativeTimeRounding (roundingFunction) {
-    if (roundingFunction === undefined) {
-        return round;
+    function localeData () {
+        return this._locale;
     }
-    if (typeof(roundingFunction) === 'function') {
-        round = roundingFunction;
+
+    function startOf (units) {
+        units = normalizeUnits(units);
+        // the following switch intentionally omits break keywords
+        // to utilize falling through the cases.
+        switch (units) {
+            case 'year':
+                this.month(0);
+                /* falls through */
+            case 'quarter':
+            case 'month':
+                this.date(1);
+                /* falls through */
+            case 'week':
+            case 'isoWeek':
+            case 'day':
+            case 'date':
+                this.hours(0);
+                /* falls through */
+            case 'hour':
+                this.minutes(0);
+                /* falls through */
+            case 'minute':
+                this.seconds(0);
+                /* falls through */
+            case 'second':
+                this.milliseconds(0);
+        }
+
+        // weeks are a special case
+        if (units === 'week') {
+            this.weekday(0);
+        }
+        if (units === 'isoWeek') {
+            this.isoWeekday(1);
+        }
+
+        // quarters are also special
+        if (units === 'quarter') {
+            this.month(Math.floor(this.month() / 3) * 3);
+        }
+
+        return this;
+    }
+
+    function endOf (units) {
+        units = normalizeUnits(units);
+        if (units === undefined || units === 'millisecond') {
+            return this;
+        }
+
+        // 'date' is an alias for 'day', so it should be considered as such.
+        if (units === 'date') {
+            units = 'day';
+        }
+
+        return this.startOf(units).add(1, (units === 'isoWeek' ? 'week' : units)).subtract(1, 'ms');
+    }
+
+    function valueOf () {
+        return this._d.valueOf() - ((this._offset || 0) * 60000);
+    }
+
+    function unix () {
+        return Math.floor(this.valueOf() / 1000);
+    }
+
+    function toDate () {
+        return new Date(this.valueOf());
+    }
+
+    function toArray () {
+        var m = this;
+        return [m.year(), m.month(), m.date(), m.hour(), m.minute(), m.second(), m.millisecond()];
+    }
+
+    function toObject () {
+        var m = this;
+        return {
+            years: m.year(),
+            months: m.month(),
+            date: m.date(),
+            hours: m.hours(),
+            minutes: m.minutes(),
+            seconds: m.seconds(),
+            milliseconds: m.milliseconds()
+        };
+    }
+
+    function toJSON () {
+        // new Date(NaN).toJSON() === null
+        return this.isValid() ? this.toISOString() : null;
+    }
+
+    function isValid$2 () {
+        return isValid(this);
+    }
+
+    function parsingFlags () {
+        return extend({}, getParsingFlags(this));
+    }
+
+    function invalidAt () {
+        return getParsingFlags(this).overflow;
+    }
+
+    function creationData() {
+        return {
+            input: this._i,
+            format: this._f,
+            locale: this._locale,
+            isUTC: this._isUTC,
+            strict: this._strict
+        };
+    }
+
+    // FORMATTING
+
+    addFormatToken(0, ['gg', 2], 0, function () {
+        return this.weekYear() % 100;
+    });
+
+    addFormatToken(0, ['GG', 2], 0, function () {
+        return this.isoWeekYear() % 100;
+    });
+
+    function addWeekYearFormatToken (token, getter) {
+        addFormatToken(0, [token, token.length], 0, getter);
+    }
+
+    addWeekYearFormatToken('gggg',     'weekYear');
+    addWeekYearFormatToken('ggggg',    'weekYear');
+    addWeekYearFormatToken('GGGG',  'isoWeekYear');
+    addWeekYearFormatToken('GGGGG', 'isoWeekYear');
+
+    // ALIASES
+
+    addUnitAlias('weekYear', 'gg');
+    addUnitAlias('isoWeekYear', 'GG');
+
+    // PRIORITY
+
+    addUnitPriority('weekYear', 1);
+    addUnitPriority('isoWeekYear', 1);
+
+
+    // PARSING
+
+    addRegexToken('G',      matchSigned);
+    addRegexToken('g',      matchSigned);
+    addRegexToken('GG',     match1to2, match2);
+    addRegexToken('gg',     match1to2, match2);
+    addRegexToken('GGGG',   match1to4, match4);
+    addRegexToken('gggg',   match1to4, match4);
+    addRegexToken('GGGGG',  match1to6, match6);
+    addRegexToken('ggggg',  match1to6, match6);
+
+    addWeekParseToken(['gggg', 'ggggg', 'GGGG', 'GGGGG'], function (input, week, config, token) {
+        week[token.substr(0, 2)] = toInt(input);
+    });
+
+    addWeekParseToken(['gg', 'GG'], function (input, week, config, token) {
+        week[token] = hooks.parseTwoDigitYear(input);
+    });
+
+    // MOMENTS
+
+    function getSetWeekYear (input) {
+        return getSetWeekYearHelper.call(this,
+                input,
+                this.week(),
+                this.weekday(),
+                this.localeData()._week.dow,
+                this.localeData()._week.doy);
+    }
+
+    function getSetISOWeekYear (input) {
+        return getSetWeekYearHelper.call(this,
+                input, this.isoWeek(), this.isoWeekday(), 1, 4);
+    }
+
+    function getISOWeeksInYear () {
+        return weeksInYear(this.year(), 1, 4);
+    }
+
+    function getWeeksInYear () {
+        var weekInfo = this.localeData()._week;
+        return weeksInYear(this.year(), weekInfo.dow, weekInfo.doy);
+    }
+
+    function getSetWeekYearHelper(input, week, weekday, dow, doy) {
+        var weeksTarget;
+        if (input == null) {
+            return weekOfYear(this, dow, doy).year;
+        } else {
+            weeksTarget = weeksInYear(input, dow, doy);
+            if (week > weeksTarget) {
+                week = weeksTarget;
+            }
+            return setWeekAll.call(this, input, week, weekday, dow, doy);
+        }
+    }
+
+    function setWeekAll(weekYear, week, weekday, dow, doy) {
+        var dayOfYearData = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy),
+            date = createUTCDate(dayOfYearData.year, 0, dayOfYearData.dayOfYear);
+
+        this.year(date.getUTCFullYear());
+        this.month(date.getUTCMonth());
+        this.date(date.getUTCDate());
+        return this;
+    }
+
+    // FORMATTING
+
+    addFormatToken('Q', 0, 'Qo', 'quarter');
+
+    // ALIASES
+
+    addUnitAlias('quarter', 'Q');
+
+    // PRIORITY
+
+    addUnitPriority('quarter', 7);
+
+    // PARSING
+
+    addRegexToken('Q', match1);
+    addParseToken('Q', function (input, array) {
+        array[MONTH] = (toInt(input) - 1) * 3;
+    });
+
+    // MOMENTS
+
+    function getSetQuarter (input) {
+        return input == null ? Math.ceil((this.month() + 1) / 3) : this.month((input - 1) * 3 + this.month() % 3);
+    }
+
+    // FORMATTING
+
+    addFormatToken('D', ['DD', 2], 'Do', 'date');
+
+    // ALIASES
+
+    addUnitAlias('date', 'D');
+
+    // PRIORITY
+    addUnitPriority('date', 9);
+
+    // PARSING
+
+    addRegexToken('D',  match1to2);
+    addRegexToken('DD', match1to2, match2);
+    addRegexToken('Do', function (isStrict, locale) {
+        // TODO: Remove "ordinalParse" fallback in next major release.
+        return isStrict ?
+          (locale._dayOfMonthOrdinalParse || locale._ordinalParse) :
+          locale._dayOfMonthOrdinalParseLenient;
+    });
+
+    addParseToken(['D', 'DD'], DATE);
+    addParseToken('Do', function (input, array) {
+        array[DATE] = toInt(input.match(match1to2)[0]);
+    });
+
+    // MOMENTS
+
+    var getSetDayOfMonth = makeGetSet('Date', true);
+
+    // FORMATTING
+
+    addFormatToken('DDD', ['DDDD', 3], 'DDDo', 'dayOfYear');
+
+    // ALIASES
+
+    addUnitAlias('dayOfYear', 'DDD');
+
+    // PRIORITY
+    addUnitPriority('dayOfYear', 4);
+
+    // PARSING
+
+    addRegexToken('DDD',  match1to3);
+    addRegexToken('DDDD', match3);
+    addParseToken(['DDD', 'DDDD'], function (input, array, config) {
+        config._dayOfYear = toInt(input);
+    });
+
+    // HELPERS
+
+    // MOMENTS
+
+    function getSetDayOfYear (input) {
+        var dayOfYear = Math.round((this.clone().startOf('day') - this.clone().startOf('year')) / 864e5) + 1;
+        return input == null ? dayOfYear : this.add((input - dayOfYear), 'd');
+    }
+
+    // FORMATTING
+
+    addFormatToken('m', ['mm', 2], 0, 'minute');
+
+    // ALIASES
+
+    addUnitAlias('minute', 'm');
+
+    // PRIORITY
+
+    addUnitPriority('minute', 14);
+
+    // PARSING
+
+    addRegexToken('m',  match1to2);
+    addRegexToken('mm', match1to2, match2);
+    addParseToken(['m', 'mm'], MINUTE);
+
+    // MOMENTS
+
+    var getSetMinute = makeGetSet('Minutes', false);
+
+    // FORMATTING
+
+    addFormatToken('s', ['ss', 2], 0, 'second');
+
+    // ALIASES
+
+    addUnitAlias('second', 's');
+
+    // PRIORITY
+
+    addUnitPriority('second', 15);
+
+    // PARSING
+
+    addRegexToken('s',  match1to2);
+    addRegexToken('ss', match1to2, match2);
+    addParseToken(['s', 'ss'], SECOND);
+
+    // MOMENTS
+
+    var getSetSecond = makeGetSet('Seconds', false);
+
+    // FORMATTING
+
+    addFormatToken('S', 0, 0, function () {
+        return ~~(this.millisecond() / 100);
+    });
+
+    addFormatToken(0, ['SS', 2], 0, function () {
+        return ~~(this.millisecond() / 10);
+    });
+
+    addFormatToken(0, ['SSS', 3], 0, 'millisecond');
+    addFormatToken(0, ['SSSS', 4], 0, function () {
+        return this.millisecond() * 10;
+    });
+    addFormatToken(0, ['SSSSS', 5], 0, function () {
+        return this.millisecond() * 100;
+    });
+    addFormatToken(0, ['SSSSSS', 6], 0, function () {
+        return this.millisecond() * 1000;
+    });
+    addFormatToken(0, ['SSSSSSS', 7], 0, function () {
+        return this.millisecond() * 10000;
+    });
+    addFormatToken(0, ['SSSSSSSS', 8], 0, function () {
+        return this.millisecond() * 100000;
+    });
+    addFormatToken(0, ['SSSSSSSSS', 9], 0, function () {
+        return this.millisecond() * 1000000;
+    });
+
+
+    // ALIASES
+
+    addUnitAlias('millisecond', 'ms');
+
+    // PRIORITY
+
+    addUnitPriority('millisecond', 16);
+
+    // PARSING
+
+    addRegexToken('S',    match1to3, match1);
+    addRegexToken('SS',   match1to3, match2);
+    addRegexToken('SSS',  match1to3, match3);
+
+    var token;
+    for (token = 'SSSS'; token.length <= 9; token += 'S') {
+        addRegexToken(token, matchUnsigned);
+    }
+
+    function parseMs(input, array) {
+        array[MILLISECOND] = toInt(('0.' + input) * 1000);
+    }
+
+    for (token = 'S'; token.length <= 9; token += 'S') {
+        addParseToken(token, parseMs);
+    }
+    // MOMENTS
+
+    var getSetMillisecond = makeGetSet('Milliseconds', false);
+
+    // FORMATTING
+
+    addFormatToken('z',  0, 0, 'zoneAbbr');
+    addFormatToken('zz', 0, 0, 'zoneName');
+
+    // MOMENTS
+
+    function getZoneAbbr () {
+        return this._isUTC ? 'UTC' : '';
+    }
+
+    function getZoneName () {
+        return this._isUTC ? 'Coordinated Universal Time' : '';
+    }
+
+    var proto = Moment.prototype;
+
+    proto.add               = add;
+    proto.calendar          = calendar$1;
+    proto.clone             = clone;
+    proto.diff              = diff;
+    proto.endOf             = endOf;
+    proto.format            = format;
+    proto.from              = from;
+    proto.fromNow           = fromNow;
+    proto.to                = to;
+    proto.toNow             = toNow;
+    proto.get               = stringGet;
+    proto.invalidAt         = invalidAt;
+    proto.isAfter           = isAfter;
+    proto.isBefore          = isBefore;
+    proto.isBetween         = isBetween;
+    proto.isSame            = isSame;
+    proto.isSameOrAfter     = isSameOrAfter;
+    proto.isSameOrBefore    = isSameOrBefore;
+    proto.isValid           = isValid$2;
+    proto.lang              = lang;
+    proto.locale            = locale;
+    proto.localeData        = localeData;
+    proto.max               = prototypeMax;
+    proto.min               = prototypeMin;
+    proto.parsingFlags      = parsingFlags;
+    proto.set               = stringSet;
+    proto.startOf           = startOf;
+    proto.subtract          = subtract;
+    proto.toArray           = toArray;
+    proto.toObject          = toObject;
+    proto.toDate            = toDate;
+    proto.toISOString       = toISOString;
+    proto.inspect           = inspect;
+    proto.toJSON            = toJSON;
+    proto.toString          = toString;
+    proto.unix              = unix;
+    proto.valueOf           = valueOf;
+    proto.creationData      = creationData;
+    proto.year       = getSetYear;
+    proto.isLeapYear = getIsLeapYear;
+    proto.weekYear    = getSetWeekYear;
+    proto.isoWeekYear = getSetISOWeekYear;
+    proto.quarter = proto.quarters = getSetQuarter;
+    proto.month       = getSetMonth;
+    proto.daysInMonth = getDaysInMonth;
+    proto.week           = proto.weeks        = getSetWeek;
+    proto.isoWeek        = proto.isoWeeks     = getSetISOWeek;
+    proto.weeksInYear    = getWeeksInYear;
+    proto.isoWeeksInYear = getISOWeeksInYear;
+    proto.date       = getSetDayOfMonth;
+    proto.day        = proto.days             = getSetDayOfWeek;
+    proto.weekday    = getSetLocaleDayOfWeek;
+    proto.isoWeekday = getSetISODayOfWeek;
+    proto.dayOfYear  = getSetDayOfYear;
+    proto.hour = proto.hours = getSetHour;
+    proto.minute = proto.minutes = getSetMinute;
+    proto.second = proto.seconds = getSetSecond;
+    proto.millisecond = proto.milliseconds = getSetMillisecond;
+    proto.utcOffset            = getSetOffset;
+    proto.utc                  = setOffsetToUTC;
+    proto.local                = setOffsetToLocal;
+    proto.parseZone            = setOffsetToParsedOffset;
+    proto.hasAlignedHourOffset = hasAlignedHourOffset;
+    proto.isDST                = isDaylightSavingTime;
+    proto.isLocal              = isLocal;
+    proto.isUtcOffset          = isUtcOffset;
+    proto.isUtc                = isUtc;
+    proto.isUTC                = isUtc;
+    proto.zoneAbbr = getZoneAbbr;
+    proto.zoneName = getZoneName;
+    proto.dates  = deprecate('dates accessor is deprecated. Use date instead.', getSetDayOfMonth);
+    proto.months = deprecate('months accessor is deprecated. Use month instead', getSetMonth);
+    proto.years  = deprecate('years accessor is deprecated. Use year instead', getSetYear);
+    proto.zone   = deprecate('moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/', getSetZone);
+    proto.isDSTShifted = deprecate('isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information', isDaylightSavingTimeShifted);
+
+    function createUnix (input) {
+        return createLocal(input * 1000);
+    }
+
+    function createInZone () {
+        return createLocal.apply(null, arguments).parseZone();
+    }
+
+    function preParsePostFormat (string) {
+        return string;
+    }
+
+    var proto$1 = Locale.prototype;
+
+    proto$1.calendar        = calendar;
+    proto$1.longDateFormat  = longDateFormat;
+    proto$1.invalidDate     = invalidDate;
+    proto$1.ordinal         = ordinal;
+    proto$1.preparse        = preParsePostFormat;
+    proto$1.postformat      = preParsePostFormat;
+    proto$1.relativeTime    = relativeTime;
+    proto$1.pastFuture      = pastFuture;
+    proto$1.set             = set;
+
+    proto$1.months            =        localeMonths;
+    proto$1.monthsShort       =        localeMonthsShort;
+    proto$1.monthsParse       =        localeMonthsParse;
+    proto$1.monthsRegex       = monthsRegex;
+    proto$1.monthsShortRegex  = monthsShortRegex;
+    proto$1.week = localeWeek;
+    proto$1.firstDayOfYear = localeFirstDayOfYear;
+    proto$1.firstDayOfWeek = localeFirstDayOfWeek;
+
+    proto$1.weekdays       =        localeWeekdays;
+    proto$1.weekdaysMin    =        localeWeekdaysMin;
+    proto$1.weekdaysShort  =        localeWeekdaysShort;
+    proto$1.weekdaysParse  =        localeWeekdaysParse;
+
+    proto$1.weekdaysRegex       =        weekdaysRegex;
+    proto$1.weekdaysShortRegex  =        weekdaysShortRegex;
+    proto$1.weekdaysMinRegex    =        weekdaysMinRegex;
+
+    proto$1.isPM = localeIsPM;
+    proto$1.meridiem = localeMeridiem;
+
+    function get$1 (format, index, field, setter) {
+        var locale = getLocale();
+        var utc = createUTC().set(setter, index);
+        return locale[field](utc, format);
+    }
+
+    function listMonthsImpl (format, index, field) {
+        if (isNumber(format)) {
+            index = format;
+            format = undefined;
+        }
+
+        format = format || '';
+
+        if (index != null) {
+            return get$1(format, index, field, 'month');
+        }
+
+        var i;
+        var out = [];
+        for (i = 0; i < 12; i++) {
+            out[i] = get$1(format, i, field, 'month');
+        }
+        return out;
+    }
+
+    // ()
+    // (5)
+    // (fmt, 5)
+    // (fmt)
+    // (true)
+    // (true, 5)
+    // (true, fmt, 5)
+    // (true, fmt)
+    function listWeekdaysImpl (localeSorted, format, index, field) {
+        if (typeof localeSorted === 'boolean') {
+            if (isNumber(format)) {
+                index = format;
+                format = undefined;
+            }
+
+            format = format || '';
+        } else {
+            format = localeSorted;
+            index = format;
+            localeSorted = false;
+
+            if (isNumber(format)) {
+                index = format;
+                format = undefined;
+            }
+
+            format = format || '';
+        }
+
+        var locale = getLocale(),
+            shift = localeSorted ? locale._week.dow : 0;
+
+        if (index != null) {
+            return get$1(format, (index + shift) % 7, field, 'day');
+        }
+
+        var i;
+        var out = [];
+        for (i = 0; i < 7; i++) {
+            out[i] = get$1(format, (i + shift) % 7, field, 'day');
+        }
+        return out;
+    }
+
+    function listMonths (format, index) {
+        return listMonthsImpl(format, index, 'months');
+    }
+
+    function listMonthsShort (format, index) {
+        return listMonthsImpl(format, index, 'monthsShort');
+    }
+
+    function listWeekdays (localeSorted, format, index) {
+        return listWeekdaysImpl(localeSorted, format, index, 'weekdays');
+    }
+
+    function listWeekdaysShort (localeSorted, format, index) {
+        return listWeekdaysImpl(localeSorted, format, index, 'weekdaysShort');
+    }
+
+    function listWeekdaysMin (localeSorted, format, index) {
+        return listWeekdaysImpl(localeSorted, format, index, 'weekdaysMin');
+    }
+
+    getSetGlobalLocale('en', {
+        dayOfMonthOrdinalParse: /\d{1,2}(th|st|nd|rd)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (toInt(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        }
+    });
+
+    // Side effect imports
+
+    hooks.lang = deprecate('moment.lang is deprecated. Use moment.locale instead.', getSetGlobalLocale);
+    hooks.langData = deprecate('moment.langData is deprecated. Use moment.localeData instead.', getLocale);
+
+    var mathAbs = Math.abs;
+
+    function abs () {
+        var data           = this._data;
+
+        this._milliseconds = mathAbs(this._milliseconds);
+        this._days         = mathAbs(this._days);
+        this._months       = mathAbs(this._months);
+
+        data.milliseconds  = mathAbs(data.milliseconds);
+        data.seconds       = mathAbs(data.seconds);
+        data.minutes       = mathAbs(data.minutes);
+        data.hours         = mathAbs(data.hours);
+        data.months        = mathAbs(data.months);
+        data.years         = mathAbs(data.years);
+
+        return this;
+    }
+
+    function addSubtract$1 (duration, input, value, direction) {
+        var other = createDuration(input, value);
+
+        duration._milliseconds += direction * other._milliseconds;
+        duration._days         += direction * other._days;
+        duration._months       += direction * other._months;
+
+        return duration._bubble();
+    }
+
+    // supports only 2.0-style add(1, 's') or add(duration)
+    function add$1 (input, value) {
+        return addSubtract$1(this, input, value, 1);
+    }
+
+    // supports only 2.0-style subtract(1, 's') or subtract(duration)
+    function subtract$1 (input, value) {
+        return addSubtract$1(this, input, value, -1);
+    }
+
+    function absCeil (number) {
+        if (number < 0) {
+            return Math.floor(number);
+        } else {
+            return Math.ceil(number);
+        }
+    }
+
+    function bubble () {
+        var milliseconds = this._milliseconds;
+        var days         = this._days;
+        var months       = this._months;
+        var data         = this._data;
+        var seconds, minutes, hours, years, monthsFromDays;
+
+        // if we have a mix of positive and negative values, bubble down first
+        // check: https://github.com/moment/moment/issues/2166
+        if (!((milliseconds >= 0 && days >= 0 && months >= 0) ||
+                (milliseconds <= 0 && days <= 0 && months <= 0))) {
+            milliseconds += absCeil(monthsToDays(months) + days) * 864e5;
+            days = 0;
+            months = 0;
+        }
+
+        // The following code bubbles up values, see the tests for
+        // examples of what that means.
+        data.milliseconds = milliseconds % 1000;
+
+        seconds           = absFloor(milliseconds / 1000);
+        data.seconds      = seconds % 60;
+
+        minutes           = absFloor(seconds / 60);
+        data.minutes      = minutes % 60;
+
+        hours             = absFloor(minutes / 60);
+        data.hours        = hours % 24;
+
+        days += absFloor(hours / 24);
+
+        // convert days to months
+        monthsFromDays = absFloor(daysToMonths(days));
+        months += monthsFromDays;
+        days -= absCeil(monthsToDays(monthsFromDays));
+
+        // 12 months -> 1 year
+        years = absFloor(months / 12);
+        months %= 12;
+
+        data.days   = days;
+        data.months = months;
+        data.years  = years;
+
+        return this;
+    }
+
+    function daysToMonths (days) {
+        // 400 years have 146097 days (taking into account leap year rules)
+        // 400 years have 12 months === 4800
+        return days * 4800 / 146097;
+    }
+
+    function monthsToDays (months) {
+        // the reverse of daysToMonths
+        return months * 146097 / 4800;
+    }
+
+    function as (units) {
+        if (!this.isValid()) {
+            return NaN;
+        }
+        var days;
+        var months;
+        var milliseconds = this._milliseconds;
+
+        units = normalizeUnits(units);
+
+        if (units === 'month' || units === 'year') {
+            days   = this._days   + milliseconds / 864e5;
+            months = this._months + daysToMonths(days);
+            return units === 'month' ? months : months / 12;
+        } else {
+            // handle milliseconds separately because of floating point math errors (issue #1867)
+            days = this._days + Math.round(monthsToDays(this._months));
+            switch (units) {
+                case 'week'   : return days / 7     + milliseconds / 6048e5;
+                case 'day'    : return days         + milliseconds / 864e5;
+                case 'hour'   : return days * 24    + milliseconds / 36e5;
+                case 'minute' : return days * 1440  + milliseconds / 6e4;
+                case 'second' : return days * 86400 + milliseconds / 1000;
+                // Math.floor prevents floating point math errors here
+                case 'millisecond': return Math.floor(days * 864e5) + milliseconds;
+                default: throw new Error('Unknown unit ' + units);
+            }
+        }
+    }
+
+    // TODO: Use this.as('ms')?
+    function valueOf$1 () {
+        if (!this.isValid()) {
+            return NaN;
+        }
+        return (
+            this._milliseconds +
+            this._days * 864e5 +
+            (this._months % 12) * 2592e6 +
+            toInt(this._months / 12) * 31536e6
+        );
+    }
+
+    function makeAs (alias) {
+        return function () {
+            return this.as(alias);
+        };
+    }
+
+    var asMilliseconds = makeAs('ms');
+    var asSeconds      = makeAs('s');
+    var asMinutes      = makeAs('m');
+    var asHours        = makeAs('h');
+    var asDays         = makeAs('d');
+    var asWeeks        = makeAs('w');
+    var asMonths       = makeAs('M');
+    var asYears        = makeAs('y');
+
+    function clone$1 () {
+        return createDuration(this);
+    }
+
+    function get$2 (units) {
+        units = normalizeUnits(units);
+        return this.isValid() ? this[units + 's']() : NaN;
+    }
+
+    function makeGetter(name) {
+        return function () {
+            return this.isValid() ? this._data[name] : NaN;
+        };
+    }
+
+    var milliseconds = makeGetter('milliseconds');
+    var seconds      = makeGetter('seconds');
+    var minutes      = makeGetter('minutes');
+    var hours        = makeGetter('hours');
+    var days         = makeGetter('days');
+    var months       = makeGetter('months');
+    var years        = makeGetter('years');
+
+    function weeks () {
+        return absFloor(this.days() / 7);
+    }
+
+    var round = Math.round;
+    var thresholds = {
+        ss: 44,         // a few seconds to seconds
+        s : 45,         // seconds to minute
+        m : 45,         // minutes to hour
+        h : 22,         // hours to day
+        d : 26,         // days to month
+        M : 11          // months to year
+    };
+
+    // helper function for moment.fn.from, moment.fn.fromNow, and moment.duration.fn.humanize
+    function substituteTimeAgo(string, number, withoutSuffix, isFuture, locale) {
+        return locale.relativeTime(number || 1, !!withoutSuffix, string, isFuture);
+    }
+
+    function relativeTime$1 (posNegDuration, withoutSuffix, locale) {
+        var duration = createDuration(posNegDuration).abs();
+        var seconds  = round(duration.as('s'));
+        var minutes  = round(duration.as('m'));
+        var hours    = round(duration.as('h'));
+        var days     = round(duration.as('d'));
+        var months   = round(duration.as('M'));
+        var years    = round(duration.as('y'));
+
+        var a = seconds <= thresholds.ss && ['s', seconds]  ||
+                seconds < thresholds.s   && ['ss', seconds] ||
+                minutes <= 1             && ['m']           ||
+                minutes < thresholds.m   && ['mm', minutes] ||
+                hours   <= 1             && ['h']           ||
+                hours   < thresholds.h   && ['hh', hours]   ||
+                days    <= 1             && ['d']           ||
+                days    < thresholds.d   && ['dd', days]    ||
+                months  <= 1             && ['M']           ||
+                months  < thresholds.M   && ['MM', months]  ||
+                years   <= 1             && ['y']           || ['yy', years];
+
+        a[2] = withoutSuffix;
+        a[3] = +posNegDuration > 0;
+        a[4] = locale;
+        return substituteTimeAgo.apply(null, a);
+    }
+
+    // This function allows you to set the rounding function for relative time strings
+    function getSetRelativeTimeRounding (roundingFunction) {
+        if (roundingFunction === undefined) {
+            return round;
+        }
+        if (typeof(roundingFunction) === 'function') {
+            round = roundingFunction;
+            return true;
+        }
+        return false;
+    }
+
+    // This function allows you to set a threshold for relative time strings
+    function getSetRelativeTimeThreshold (threshold, limit) {
+        if (thresholds[threshold] === undefined) {
+            return false;
+        }
+        if (limit === undefined) {
+            return thresholds[threshold];
+        }
+        thresholds[threshold] = limit;
+        if (threshold === 's') {
+            thresholds.ss = limit - 1;
+        }
         return true;
     }
-    return false;
-}
 
-// This function allows you to set a threshold for relative time strings
-function getSetRelativeTimeThreshold (threshold, limit) {
-    if (thresholds[threshold] === undefined) {
-        return false;
-    }
-    if (limit === undefined) {
-        return thresholds[threshold];
-    }
-    thresholds[threshold] = limit;
-    if (threshold === 's') {
-        thresholds.ss = limit - 1;
-    }
-    return true;
-}
+    function humanize (withSuffix) {
+        if (!this.isValid()) {
+            return this.localeData().invalidDate();
+        }
 
-function humanize (withSuffix) {
-    if (!this.isValid()) {
-        return this.localeData().invalidDate();
+        var locale = this.localeData();
+        var output = relativeTime$1(this, !withSuffix, locale);
+
+        if (withSuffix) {
+            output = locale.pastFuture(+this, output);
+        }
+
+        return locale.postformat(output);
     }
 
-    var locale = this.localeData();
-    var output = relativeTime$1(this, !withSuffix, locale);
+    var abs$1 = Math.abs;
 
-    if (withSuffix) {
-        output = locale.pastFuture(+this, output);
+    function sign(x) {
+        return ((x > 0) - (x < 0)) || +x;
     }
 
-    return locale.postformat(output);
-}
+    function toISOString$1() {
+        // for ISO strings we do not use the normal bubbling rules:
+        //  * milliseconds bubble up until they become hours
+        //  * days do not bubble at all
+        //  * months bubble up until they become years
+        // This is because there is no context-free conversion between hours and days
+        // (think of clock changes)
+        // and also not between days and months (28-31 days per month)
+        if (!this.isValid()) {
+            return this.localeData().invalidDate();
+        }
 
-var abs$1 = Math.abs;
+        var seconds = abs$1(this._milliseconds) / 1000;
+        var days         = abs$1(this._days);
+        var months       = abs$1(this._months);
+        var minutes, hours, years;
 
-function toISOString$1() {
-    // for ISO strings we do not use the normal bubbling rules:
-    //  * milliseconds bubble up until they become hours
-    //  * days do not bubble at all
-    //  * months bubble up until they become years
-    // This is because there is no context-free conversion between hours and days
-    // (think of clock changes)
-    // and also not between days and months (28-31 days per month)
-    if (!this.isValid()) {
-        return this.localeData().invalidDate();
+        // 3600 seconds -> 60 minutes -> 1 hour
+        minutes           = absFloor(seconds / 60);
+        hours             = absFloor(minutes / 60);
+        seconds %= 60;
+        minutes %= 60;
+
+        // 12 months -> 1 year
+        years  = absFloor(months / 12);
+        months %= 12;
+
+
+        // inspired by https://github.com/dordille/moment-isoduration/blob/master/moment.isoduration.js
+        var Y = years;
+        var M = months;
+        var D = days;
+        var h = hours;
+        var m = minutes;
+        var s = seconds ? seconds.toFixed(3).replace(/\.?0+$/, '') : '';
+        var total = this.asSeconds();
+
+        if (!total) {
+            // this is the same as C#'s (Noda) and python (isodate)...
+            // but not other JS (goog.date)
+            return 'P0D';
+        }
+
+        var totalSign = total < 0 ? '-' : '';
+        var ymSign = sign(this._months) !== sign(total) ? '-' : '';
+        var daysSign = sign(this._days) !== sign(total) ? '-' : '';
+        var hmsSign = sign(this._milliseconds) !== sign(total) ? '-' : '';
+
+        return totalSign + 'P' +
+            (Y ? ymSign + Y + 'Y' : '') +
+            (M ? ymSign + M + 'M' : '') +
+            (D ? daysSign + D + 'D' : '') +
+            ((h || m || s) ? 'T' : '') +
+            (h ? hmsSign + h + 'H' : '') +
+            (m ? hmsSign + m + 'M' : '') +
+            (s ? hmsSign + s + 'S' : '');
     }
 
-    var seconds = abs$1(this._milliseconds) / 1000;
-    var days         = abs$1(this._days);
-    var months       = abs$1(this._months);
-    var minutes, hours, years;
+    var proto$2 = Duration.prototype;
 
-    // 3600 seconds -> 60 minutes -> 1 hour
-    minutes           = absFloor(seconds / 60);
-    hours             = absFloor(minutes / 60);
-    seconds %= 60;
-    minutes %= 60;
+    proto$2.isValid        = isValid$1;
+    proto$2.abs            = abs;
+    proto$2.add            = add$1;
+    proto$2.subtract       = subtract$1;
+    proto$2.as             = as;
+    proto$2.asMilliseconds = asMilliseconds;
+    proto$2.asSeconds      = asSeconds;
+    proto$2.asMinutes      = asMinutes;
+    proto$2.asHours        = asHours;
+    proto$2.asDays         = asDays;
+    proto$2.asWeeks        = asWeeks;
+    proto$2.asMonths       = asMonths;
+    proto$2.asYears        = asYears;
+    proto$2.valueOf        = valueOf$1;
+    proto$2._bubble        = bubble;
+    proto$2.clone          = clone$1;
+    proto$2.get            = get$2;
+    proto$2.milliseconds   = milliseconds;
+    proto$2.seconds        = seconds;
+    proto$2.minutes        = minutes;
+    proto$2.hours          = hours;
+    proto$2.days           = days;
+    proto$2.weeks          = weeks;
+    proto$2.months         = months;
+    proto$2.years          = years;
+    proto$2.humanize       = humanize;
+    proto$2.toISOString    = toISOString$1;
+    proto$2.toString       = toISOString$1;
+    proto$2.toJSON         = toISOString$1;
+    proto$2.locale         = locale;
+    proto$2.localeData     = localeData;
 
-    // 12 months -> 1 year
-    years  = absFloor(months / 12);
-    months %= 12;
+    proto$2.toIsoString = deprecate('toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)', toISOString$1);
+    proto$2.lang = lang;
+
+    // Side effect imports
+
+    // FORMATTING
+
+    addFormatToken('X', 0, 0, 'unix');
+    addFormatToken('x', 0, 0, 'valueOf');
+
+    // PARSING
+
+    addRegexToken('x', matchSigned);
+    addRegexToken('X', matchTimestamp);
+    addParseToken('X', function (input, array, config) {
+        config._d = new Date(parseFloat(input, 10) * 1000);
+    });
+    addParseToken('x', function (input, array, config) {
+        config._d = new Date(toInt(input));
+    });
+
+    // Side effect imports
 
 
-    // inspired by https://github.com/dordille/moment-isoduration/blob/master/moment.isoduration.js
-    var Y = years;
-    var M = months;
-    var D = days;
-    var h = hours;
-    var m = minutes;
-    var s = seconds;
-    var total = this.asSeconds();
+    hooks.version = '2.22.1';
 
-    if (!total) {
-        // this is the same as C#'s (Noda) and python (isodate)...
-        // but not other JS (goog.date)
-        return 'P0D';
-    }
+    setHookCallback(createLocal);
 
-    return (total < 0 ? '-' : '') +
-        'P' +
-        (Y ? Y + 'Y' : '') +
-        (M ? M + 'M' : '') +
-        (D ? D + 'D' : '') +
-        ((h || m || s) ? 'T' : '') +
-        (h ? h + 'H' : '') +
-        (m ? m + 'M' : '') +
-        (s ? s + 'S' : '');
-}
+    hooks.fn                    = proto;
+    hooks.min                   = min;
+    hooks.max                   = max;
+    hooks.now                   = now;
+    hooks.utc                   = createUTC;
+    hooks.unix                  = createUnix;
+    hooks.months                = listMonths;
+    hooks.isDate                = isDate;
+    hooks.locale                = getSetGlobalLocale;
+    hooks.invalid               = createInvalid;
+    hooks.duration              = createDuration;
+    hooks.isMoment              = isMoment;
+    hooks.weekdays              = listWeekdays;
+    hooks.parseZone             = createInZone;
+    hooks.localeData            = getLocale;
+    hooks.isDuration            = isDuration;
+    hooks.monthsShort           = listMonthsShort;
+    hooks.weekdaysMin           = listWeekdaysMin;
+    hooks.defineLocale          = defineLocale;
+    hooks.updateLocale          = updateLocale;
+    hooks.locales               = listLocales;
+    hooks.weekdaysShort         = listWeekdaysShort;
+    hooks.normalizeUnits        = normalizeUnits;
+    hooks.relativeTimeRounding  = getSetRelativeTimeRounding;
+    hooks.relativeTimeThreshold = getSetRelativeTimeThreshold;
+    hooks.calendarFormat        = getCalendarFormat;
+    hooks.prototype             = proto;
 
-var proto$2 = Duration.prototype;
+    // currently HTML5 input type only supports 24-hour formats
+    hooks.HTML5_FMT = {
+        DATETIME_LOCAL: 'YYYY-MM-DDTHH:mm',             // <input type="datetime-local" />
+        DATETIME_LOCAL_SECONDS: 'YYYY-MM-DDTHH:mm:ss',  // <input type="datetime-local" step="1" />
+        DATETIME_LOCAL_MS: 'YYYY-MM-DDTHH:mm:ss.SSS',   // <input type="datetime-local" step="0.001" />
+        DATE: 'YYYY-MM-DD',                             // <input type="date" />
+        TIME: 'HH:mm',                                  // <input type="time" />
+        TIME_SECONDS: 'HH:mm:ss',                       // <input type="time" step="1" />
+        TIME_MS: 'HH:mm:ss.SSS',                        // <input type="time" step="0.001" />
+        WEEK: 'YYYY-[W]WW',                             // <input type="week" />
+        MONTH: 'YYYY-MM'                                // <input type="month" />
+    };
 
-proto$2.isValid        = isValid$1;
-proto$2.abs            = abs;
-proto$2.add            = add$1;
-proto$2.subtract       = subtract$1;
-proto$2.as             = as;
-proto$2.asMilliseconds = asMilliseconds;
-proto$2.asSeconds      = asSeconds;
-proto$2.asMinutes      = asMinutes;
-proto$2.asHours        = asHours;
-proto$2.asDays         = asDays;
-proto$2.asWeeks        = asWeeks;
-proto$2.asMonths       = asMonths;
-proto$2.asYears        = asYears;
-proto$2.valueOf        = valueOf$1;
-proto$2._bubble        = bubble;
-proto$2.get            = get$2;
-proto$2.milliseconds   = milliseconds;
-proto$2.seconds        = seconds;
-proto$2.minutes        = minutes;
-proto$2.hours          = hours;
-proto$2.days           = days;
-proto$2.weeks          = weeks;
-proto$2.months         = months;
-proto$2.years          = years;
-proto$2.humanize       = humanize;
-proto$2.toISOString    = toISOString$1;
-proto$2.toString       = toISOString$1;
-proto$2.toJSON         = toISOString$1;
-proto$2.locale         = locale;
-proto$2.localeData     = localeData;
-
-// Deprecations
-proto$2.toIsoString = deprecate('toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)', toISOString$1);
-proto$2.lang = lang;
-
-// Side effect imports
-
-// FORMATTING
-
-addFormatToken('X', 0, 0, 'unix');
-addFormatToken('x', 0, 0, 'valueOf');
-
-// PARSING
-
-addRegexToken('x', matchSigned);
-addRegexToken('X', matchTimestamp);
-addParseToken('X', function (input, array, config) {
-    config._d = new Date(parseFloat(input, 10) * 1000);
-});
-addParseToken('x', function (input, array, config) {
-    config._d = new Date(toInt(input));
-});
-
-// Side effect imports
-
-
-hooks.version = '2.18.1';
-
-setHookCallback(createLocal);
-
-hooks.fn                    = proto;
-hooks.min                   = min;
-hooks.max                   = max;
-hooks.now                   = now;
-hooks.utc                   = createUTC;
-hooks.unix                  = createUnix;
-hooks.months                = listMonths;
-hooks.isDate                = isDate;
-hooks.locale                = getSetGlobalLocale;
-hooks.invalid               = createInvalid;
-hooks.duration              = createDuration;
-hooks.isMoment              = isMoment;
-hooks.weekdays              = listWeekdays;
-hooks.parseZone             = createInZone;
-hooks.localeData            = getLocale;
-hooks.isDuration            = isDuration;
-hooks.monthsShort           = listMonthsShort;
-hooks.weekdaysMin           = listWeekdaysMin;
-hooks.defineLocale          = defineLocale;
-hooks.updateLocale          = updateLocale;
-hooks.locales               = listLocales;
-hooks.weekdaysShort         = listWeekdaysShort;
-hooks.normalizeUnits        = normalizeUnits;
-hooks.relativeTimeRounding = getSetRelativeTimeRounding;
-hooks.relativeTimeThreshold = getSetRelativeTimeThreshold;
-hooks.calendarFormat        = getCalendarFormat;
-hooks.prototype             = proto;
-
-return hooks;
+    return hooks;
 
 })));
diff --git a/lib/javascripts/moment_locale/af.js b/lib/javascripts/moment_locale/af.js
old mode 100644
new mode 100755
index a89257fdc4c..0b2bb26e558
--- a/lib/javascripts/moment_locale/af.js
+++ b/lib/javascripts/moment_locale/af.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Afrikaans [af]
-//! author : Werner Mollentze : https://github.com/wernerm
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,64 +8,65 @@
 }(this, (function (moment) { 'use strict';
 
 
-var af = moment.defineLocale('af', {
-    months : 'Januarie_Februarie_Maart_April_Mei_Junie_Julie_Augustus_September_Oktober_November_Desember'.split('_'),
-    monthsShort : 'Jan_Feb_Mrt_Apr_Mei_Jun_Jul_Aug_Sep_Okt_Nov_Des'.split('_'),
-    weekdays : 'Sondag_Maandag_Dinsdag_Woensdag_Donderdag_Vrydag_Saterdag'.split('_'),
-    weekdaysShort : 'Son_Maa_Din_Woe_Don_Vry_Sat'.split('_'),
-    weekdaysMin : 'So_Ma_Di_Wo_Do_Vr_Sa'.split('_'),
-    meridiemParse: /vm|nm/i,
-    isPM : function (input) {
-        return /^nm$/i.test(input);
-    },
-    meridiem : function (hours, minutes, isLower) {
-        if (hours < 12) {
-            return isLower ? 'vm' : 'VM';
-        } else {
-            return isLower ? 'nm' : 'NM';
+    var af = moment.defineLocale('af', {
+        months : 'Januarie_Februarie_Maart_April_Mei_Junie_Julie_Augustus_September_Oktober_November_Desember'.split('_'),
+        monthsShort : 'Jan_Feb_Mrt_Apr_Mei_Jun_Jul_Aug_Sep_Okt_Nov_Des'.split('_'),
+        weekdays : 'Sondag_Maandag_Dinsdag_Woensdag_Donderdag_Vrydag_Saterdag'.split('_'),
+        weekdaysShort : 'Son_Maa_Din_Woe_Don_Vry_Sat'.split('_'),
+        weekdaysMin : 'So_Ma_Di_Wo_Do_Vr_Sa'.split('_'),
+        meridiemParse: /vm|nm/i,
+        isPM : function (input) {
+            return /^nm$/i.test(input);
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 12) {
+                return isLower ? 'vm' : 'VM';
+            } else {
+                return isLower ? 'nm' : 'NM';
+            }
+        },
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[Vandag om] LT',
+            nextDay : '[Môre om] LT',
+            nextWeek : 'dddd [om] LT',
+            lastDay : '[Gister om] LT',
+            lastWeek : '[Laas] dddd [om] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'oor %s',
+            past : '%s gelede',
+            s : '\'n paar sekondes',
+            ss : '%d sekondes',
+            m : '\'n minuut',
+            mm : '%d minute',
+            h : '\'n uur',
+            hh : '%d ure',
+            d : '\'n dag',
+            dd : '%d dae',
+            M : '\'n maand',
+            MM : '%d maande',
+            y : '\'n jaar',
+            yy : '%d jaar'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/,
+        ordinal : function (number) {
+            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de'); // Thanks to Joris Röling : https://github.com/jjupiter
+        },
+        week : {
+            dow : 1, // Maandag is die eerste dag van die week.
+            doy : 4  // Die week wat die 4de Januarie bevat is die eerste week van die jaar.
         }
-    },
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd, D MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay : '[Vandag om] LT',
-        nextDay : '[Môre om] LT',
-        nextWeek : 'dddd [om] LT',
-        lastDay : '[Gister om] LT',
-        lastWeek : '[Laas] dddd [om] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'oor %s',
-        past : '%s gelede',
-        s : '\'n paar sekondes',
-        m : '\'n minuut',
-        mm : '%d minute',
-        h : '\'n uur',
-        hh : '%d ure',
-        d : '\'n dag',
-        dd : '%d dae',
-        M : '\'n maand',
-        MM : '%d maande',
-        y : '\'n jaar',
-        yy : '%d jaar'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/,
-    ordinal : function (number) {
-        return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de'); // Thanks to Joris Röling : https://github.com/jjupiter
-    },
-    week : {
-        dow : 1, // Maandag is die eerste dag van die week.
-        doy : 4  // Die week wat die 4de Januarie bevat is die eerste week van die jaar.
-    }
-});
+    });
 
-return af;
+    return af;
 
 })));
diff --git a/lib/javascripts/moment_locale/ar-dz.js b/lib/javascripts/moment_locale/ar-dz.js
old mode 100644
new mode 100755
index f3945944635..26a7ccb2bd0
--- a/lib/javascripts/moment_locale/ar-dz.js
+++ b/lib/javascripts/moment_locale/ar-dz.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Arabic (Algeria) [ar-dz]
-//! author : Noureddine LOUAHEDJ : https://github.com/noureddineme
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,50 +8,51 @@
 }(this, (function (moment) { 'use strict';
 
 
-var arDz = moment.defineLocale('ar-dz', {
-    months : 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
-    monthsShort : 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
-    weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
-    weekdaysShort : 'احد_اثنين_ثلاثاء_اربعاء_خميس_جمعة_سبت'.split('_'),
-    weekdaysMin : 'أح_إث_ثلا_أر_خم_جم_سب'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd D MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay: '[اليوم على الساعة] LT',
-        nextDay: '[غدا على الساعة] LT',
-        nextWeek: 'dddd [على الساعة] LT',
-        lastDay: '[أمس على الساعة] LT',
-        lastWeek: 'dddd [على الساعة] LT',
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'في %s',
-        past : 'منذ %s',
-        s : 'ثوان',
-        m : 'دقيقة',
-        mm : '%d دقائق',
-        h : 'ساعة',
-        hh : '%d ساعات',
-        d : 'يوم',
-        dd : '%d أيام',
-        M : 'شهر',
-        MM : '%d أشهر',
-        y : 'سنة',
-        yy : '%d سنوات'
-    },
-    week : {
-        dow : 0, // Sunday is the first day of the week.
-        doy : 4  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    var arDz = moment.defineLocale('ar-dz', {
+        months : 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+        monthsShort : 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+        weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+        weekdaysShort : 'احد_اثنين_ثلاثاء_اربعاء_خميس_جمعة_سبت'.split('_'),
+        weekdaysMin : 'أح_إث_ثلا_أر_خم_جم_سب'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[اليوم على الساعة] LT',
+            nextDay: '[غدا على الساعة] LT',
+            nextWeek: 'dddd [على الساعة] LT',
+            lastDay: '[أمس على الساعة] LT',
+            lastWeek: 'dddd [على الساعة] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'في %s',
+            past : 'منذ %s',
+            s : 'ثوان',
+            ss : '%d ثانية',
+            m : 'دقيقة',
+            mm : '%d دقائق',
+            h : 'ساعة',
+            hh : '%d ساعات',
+            d : 'يوم',
+            dd : '%d أيام',
+            M : 'شهر',
+            MM : '%d أشهر',
+            y : 'سنة',
+            yy : '%d سنوات'
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 4  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
 
-return arDz;
+    return arDz;
 
 })));
diff --git a/lib/javascripts/moment_locale/ar-kw.js b/lib/javascripts/moment_locale/ar-kw.js
old mode 100644
new mode 100755
index 93c7dd54b44..10092ba39a3
--- a/lib/javascripts/moment_locale/ar-kw.js
+++ b/lib/javascripts/moment_locale/ar-kw.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Arabic (Kuwait) [ar-kw]
-//! author : Nusret Parlak: https://github.com/nusretparlak
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,50 +8,51 @@
 }(this, (function (moment) { 'use strict';
 
 
-var arKw = moment.defineLocale('ar-kw', {
-    months : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
-    monthsShort : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
-    weekdays : 'الأحد_الإتنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
-    weekdaysShort : 'احد_اتنين_ثلاثاء_اربعاء_خميس_جمعة_سبت'.split('_'),
-    weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd D MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay: '[اليوم على الساعة] LT',
-        nextDay: '[غدا على الساعة] LT',
-        nextWeek: 'dddd [على الساعة] LT',
-        lastDay: '[أمس على الساعة] LT',
-        lastWeek: 'dddd [على الساعة] LT',
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'في %s',
-        past : 'منذ %s',
-        s : 'ثوان',
-        m : 'دقيقة',
-        mm : '%d دقائق',
-        h : 'ساعة',
-        hh : '%d ساعات',
-        d : 'يوم',
-        dd : '%d أيام',
-        M : 'شهر',
-        MM : '%d أشهر',
-        y : 'سنة',
-        yy : '%d سنوات'
-    },
-    week : {
-        dow : 0, // Sunday is the first day of the week.
-        doy : 12  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    var arKw = moment.defineLocale('ar-kw', {
+        months : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
+        monthsShort : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
+        weekdays : 'الأحد_الإتنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+        weekdaysShort : 'احد_اتنين_ثلاثاء_اربعاء_خميس_جمعة_سبت'.split('_'),
+        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[اليوم على الساعة] LT',
+            nextDay: '[غدا على الساعة] LT',
+            nextWeek: 'dddd [على الساعة] LT',
+            lastDay: '[أمس على الساعة] LT',
+            lastWeek: 'dddd [على الساعة] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'في %s',
+            past : 'منذ %s',
+            s : 'ثوان',
+            ss : '%d ثانية',
+            m : 'دقيقة',
+            mm : '%d دقائق',
+            h : 'ساعة',
+            hh : '%d ساعات',
+            d : 'يوم',
+            dd : '%d أيام',
+            M : 'شهر',
+            MM : '%d أشهر',
+            y : 'سنة',
+            yy : '%d سنوات'
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 12  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
 
-return arKw;
+    return arKw;
 
 })));
diff --git a/lib/javascripts/moment_locale/ar-ly.js b/lib/javascripts/moment_locale/ar-ly.js
old mode 100644
new mode 100755
index 7180ed4ed8f..2e3cb1a73ec
--- a/lib/javascripts/moment_locale/ar-ly.js
+++ b/lib/javascripts/moment_locale/ar-ly.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Arabic (Lybia) [ar-ly]
-//! author : Ali Hmer: https://github.com/kikoanis
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,117 +8,114 @@
 }(this, (function (moment) { 'use strict';
 
 
-var symbolMap = {
-    '1': '1',
-    '2': '2',
-    '3': '3',
-    '4': '4',
-    '5': '5',
-    '6': '6',
-    '7': '7',
-    '8': '8',
-    '9': '9',
-    '0': '0'
-};
-var pluralForm = function (n) {
-    return n === 0 ? 0 : n === 1 ? 1 : n === 2 ? 2 : n % 100 >= 3 && n % 100 <= 10 ? 3 : n % 100 >= 11 ? 4 : 5;
-};
-var plurals = {
-    s : ['أقل من ثانية', 'ثانية واحدة', ['ثانيتان', 'ثانيتين'], '%d ثوان', '%d ثانية', '%d ثانية'],
-    m : ['أقل من دقيقة', 'دقيقة واحدة', ['دقيقتان', 'دقيقتين'], '%d دقائق', '%d دقيقة', '%d دقيقة'],
-    h : ['أقل من ساعة', 'ساعة واحدة', ['ساعتان', 'ساعتين'], '%d ساعات', '%d ساعة', '%d ساعة'],
-    d : ['أقل من يوم', 'يوم واحد', ['يومان', 'يومين'], '%d أيام', '%d يومًا', '%d يوم'],
-    M : ['أقل من شهر', 'شهر واحد', ['شهران', 'شهرين'], '%d أشهر', '%d شهرا', '%d شهر'],
-    y : ['أقل من عام', 'عام واحد', ['عامان', 'عامين'], '%d أعوام', '%d عامًا', '%d عام']
-};
-var pluralize = function (u) {
-    return function (number, withoutSuffix, string, isFuture) {
-        var f = pluralForm(number),
-            str = plurals[u][pluralForm(number)];
-        if (f === 2) {
-            str = str[withoutSuffix ? 0 : 1];
-        }
-        return str.replace(/%d/i, number);
-    };
-};
-var months = [
-    'يناير',
-    'فبراير',
-    'مارس',
-    'أبريل',
-    'مايو',
-    'يونيو',
-    'يوليو',
-    'أغسطس',
-    'سبتمبر',
-    'أكتوبر',
-    'نوفمبر',
-    'ديسمبر'
-];
+    var symbolMap = {
+        '1': '1',
+        '2': '2',
+        '3': '3',
+        '4': '4',
+        '5': '5',
+        '6': '6',
+        '7': '7',
+        '8': '8',
+        '9': '9',
+        '0': '0'
+    }, pluralForm = function (n) {
+        return n === 0 ? 0 : n === 1 ? 1 : n === 2 ? 2 : n % 100 >= 3 && n % 100 <= 10 ? 3 : n % 100 >= 11 ? 4 : 5;
+    }, plurals = {
+        s : ['أقل من ثانية', 'ثانية واحدة', ['ثانيتان', 'ثانيتين'], '%d ثوان', '%d ثانية', '%d ثانية'],
+        m : ['أقل من دقيقة', 'دقيقة واحدة', ['دقيقتان', 'دقيقتين'], '%d دقائق', '%d دقيقة', '%d دقيقة'],
+        h : ['أقل من ساعة', 'ساعة واحدة', ['ساعتان', 'ساعتين'], '%d ساعات', '%d ساعة', '%d ساعة'],
+        d : ['أقل من يوم', 'يوم واحد', ['يومان', 'يومين'], '%d أيام', '%d يومًا', '%d يوم'],
+        M : ['أقل من شهر', 'شهر واحد', ['شهران', 'شهرين'], '%d أشهر', '%d شهرا', '%d شهر'],
+        y : ['أقل من عام', 'عام واحد', ['عامان', 'عامين'], '%d أعوام', '%d عامًا', '%d عام']
+    }, pluralize = function (u) {
+        return function (number, withoutSuffix, string, isFuture) {
+            var f = pluralForm(number),
+                str = plurals[u][pluralForm(number)];
+            if (f === 2) {
+                str = str[withoutSuffix ? 0 : 1];
+            }
+            return str.replace(/%d/i, number);
+        };
+    }, months = [
+        'يناير',
+        'فبراير',
+        'مارس',
+        'أبريل',
+        'مايو',
+        'يونيو',
+        'يوليو',
+        'أغسطس',
+        'سبتمبر',
+        'أكتوبر',
+        'نوفمبر',
+        'ديسمبر'
+    ];
 
-var arLy = moment.defineLocale('ar-ly', {
-    months : months,
-    monthsShort : months,
-    weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
-    weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
-    weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'D/\u200FM/\u200FYYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd D MMMM YYYY HH:mm'
-    },
-    meridiemParse: /ص|م/,
-    isPM : function (input) {
-        return 'م' === input;
-    },
-    meridiem : function (hour, minute, isLower) {
-        if (hour < 12) {
-            return 'ص';
-        } else {
-            return 'م';
+    var arLy = moment.defineLocale('ar-ly', {
+        months : months,
+        monthsShort : months,
+        weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+        weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
+        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'D/\u200FM/\u200FYYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        meridiemParse: /ص|م/,
+        isPM : function (input) {
+            return 'م' === input;
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'ص';
+            } else {
+                return 'م';
+            }
+        },
+        calendar : {
+            sameDay: '[اليوم عند الساعة] LT',
+            nextDay: '[غدًا عند الساعة] LT',
+            nextWeek: 'dddd [عند الساعة] LT',
+            lastDay: '[أمس عند الساعة] LT',
+            lastWeek: 'dddd [عند الساعة] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'بعد %s',
+            past : 'منذ %s',
+            s : pluralize('s'),
+            ss : pluralize('s'),
+            m : pluralize('m'),
+            mm : pluralize('m'),
+            h : pluralize('h'),
+            hh : pluralize('h'),
+            d : pluralize('d'),
+            dd : pluralize('d'),
+            M : pluralize('M'),
+            MM : pluralize('M'),
+            y : pluralize('y'),
+            yy : pluralize('y')
+        },
+        preparse: function (string) {
+            return string.replace(/،/g, ',');
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            }).replace(/,/g, '،');
+        },
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12  // The week that contains Jan 1st is the first week of the year.
         }
-    },
-    calendar : {
-        sameDay: '[اليوم عند الساعة] LT',
-        nextDay: '[غدًا عند الساعة] LT',
-        nextWeek: 'dddd [عند الساعة] LT',
-        lastDay: '[أمس عند الساعة] LT',
-        lastWeek: 'dddd [عند الساعة] LT',
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'بعد %s',
-        past : 'منذ %s',
-        s : pluralize('s'),
-        m : pluralize('m'),
-        mm : pluralize('m'),
-        h : pluralize('h'),
-        hh : pluralize('h'),
-        d : pluralize('d'),
-        dd : pluralize('d'),
-        M : pluralize('M'),
-        MM : pluralize('M'),
-        y : pluralize('y'),
-        yy : pluralize('y')
-    },
-    preparse: function (string) {
-        return string.replace(/\u200f/g, '').replace(/،/g, ',');
-    },
-    postformat: function (string) {
-        return string.replace(/\d/g, function (match) {
-            return symbolMap[match];
-        }).replace(/,/g, '،');
-    },
-    week : {
-        dow : 6, // Saturday is the first day of the week.
-        doy : 12  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    });
 
-return arLy;
+    return arLy;
 
 })));
diff --git a/lib/javascripts/moment_locale/ar-ma.js b/lib/javascripts/moment_locale/ar-ma.js
old mode 100644
new mode 100755
index cbd810ba79b..3d8503d1705
--- a/lib/javascripts/moment_locale/ar-ma.js
+++ b/lib/javascripts/moment_locale/ar-ma.js
@@ -1,7 +1,4 @@
 //! moment.js locale configuration
-//! locale : Arabic (Morocco) [ar-ma]
-//! author : ElFadili Yassine : https://github.com/ElFadiliY
-//! author : Abdel Said : https://github.com/abdelsaid
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -11,50 +8,51 @@
 }(this, (function (moment) { 'use strict';
 
 
-var arMa = moment.defineLocale('ar-ma', {
-    months : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
-    monthsShort : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
-    weekdays : 'الأحد_الإتنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
-    weekdaysShort : 'احد_اتنين_ثلاثاء_اربعاء_خميس_جمعة_سبت'.split('_'),
-    weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd D MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay: '[اليوم على الساعة] LT',
-        nextDay: '[غدا على الساعة] LT',
-        nextWeek: 'dddd [على الساعة] LT',
-        lastDay: '[أمس على الساعة] LT',
-        lastWeek: 'dddd [على الساعة] LT',
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'في %s',
-        past : 'منذ %s',
-        s : 'ثوان',
-        m : 'دقيقة',
-        mm : '%d دقائق',
-        h : 'ساعة',
-        hh : '%d ساعات',
-        d : 'يوم',
-        dd : '%d أيام',
-        M : 'شهر',
-        MM : '%d أشهر',
-        y : 'سنة',
-        yy : '%d سنوات'
-    },
-    week : {
-        dow : 6, // Saturday is the first day of the week.
-        doy : 12  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    var arMa = moment.defineLocale('ar-ma', {
+        months : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
+        monthsShort : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
+        weekdays : 'الأحد_الإتنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+        weekdaysShort : 'احد_اتنين_ثلاثاء_اربعاء_خميس_جمعة_سبت'.split('_'),
+        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[اليوم على الساعة] LT',
+            nextDay: '[غدا على الساعة] LT',
+            nextWeek: 'dddd [على الساعة] LT',
+            lastDay: '[أمس على الساعة] LT',
+            lastWeek: 'dddd [على الساعة] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'في %s',
+            past : 'منذ %s',
+            s : 'ثوان',
+            ss : '%d ثانية',
+            m : 'دقيقة',
+            mm : '%d دقائق',
+            h : 'ساعة',
+            hh : '%d ساعات',
+            d : 'يوم',
+            dd : '%d أيام',
+            M : 'شهر',
+            MM : '%d أشهر',
+            y : 'سنة',
+            yy : '%d سنوات'
+        },
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
 
-return arMa;
+    return arMa;
 
 })));
diff --git a/lib/javascripts/moment_locale/ar-sa.js b/lib/javascripts/moment_locale/ar-sa.js
old mode 100644
new mode 100755
index dccd0d83309..a62f8da4a80
--- a/lib/javascripts/moment_locale/ar-sa.js
+++ b/lib/javascripts/moment_locale/ar-sa.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Arabic (Saudi Arabia) [ar-sa]
-//! author : Suhail Alkowaileet : https://github.com/xsoh
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,96 +8,96 @@
 }(this, (function (moment) { 'use strict';
 
 
-var symbolMap = {
-    '1': '١',
-    '2': '٢',
-    '3': '٣',
-    '4': '٤',
-    '5': '٥',
-    '6': '٦',
-    '7': '٧',
-    '8': '٨',
-    '9': '٩',
-    '0': '٠'
-};
-var numberMap = {
-    '١': '1',
-    '٢': '2',
-    '٣': '3',
-    '٤': '4',
-    '٥': '5',
-    '٦': '6',
-    '٧': '7',
-    '٨': '8',
-    '٩': '9',
-    '٠': '0'
-};
+    var symbolMap = {
+        '1': '١',
+        '2': '٢',
+        '3': '٣',
+        '4': '٤',
+        '5': '٥',
+        '6': '٦',
+        '7': '٧',
+        '8': '٨',
+        '9': '٩',
+        '0': '٠'
+    }, numberMap = {
+        '١': '1',
+        '٢': '2',
+        '٣': '3',
+        '٤': '4',
+        '٥': '5',
+        '٦': '6',
+        '٧': '7',
+        '٨': '8',
+        '٩': '9',
+        '٠': '0'
+    };
 
-var arSa = moment.defineLocale('ar-sa', {
-    months : 'يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
-    monthsShort : 'يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
-    weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
-    weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
-    weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd D MMMM YYYY HH:mm'
-    },
-    meridiemParse: /ص|م/,
-    isPM : function (input) {
-        return 'م' === input;
-    },
-    meridiem : function (hour, minute, isLower) {
-        if (hour < 12) {
-            return 'ص';
-        } else {
-            return 'م';
+    var arSa = moment.defineLocale('ar-sa', {
+        months : 'يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+        monthsShort : 'يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+        weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+        weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
+        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        meridiemParse: /ص|م/,
+        isPM : function (input) {
+            return 'م' === input;
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'ص';
+            } else {
+                return 'م';
+            }
+        },
+        calendar : {
+            sameDay: '[اليوم على الساعة] LT',
+            nextDay: '[غدا على الساعة] LT',
+            nextWeek: 'dddd [على الساعة] LT',
+            lastDay: '[أمس على الساعة] LT',
+            lastWeek: 'dddd [على الساعة] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'في %s',
+            past : 'منذ %s',
+            s : 'ثوان',
+            ss : '%d ثانية',
+            m : 'دقيقة',
+            mm : '%d دقائق',
+            h : 'ساعة',
+            hh : '%d ساعات',
+            d : 'يوم',
+            dd : '%d أيام',
+            M : 'شهر',
+            MM : '%d أشهر',
+            y : 'سنة',
+            yy : '%d سنوات'
+        },
+        preparse: function (string) {
+            return string.replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) {
+                return numberMap[match];
+            }).replace(/،/g, ',');
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            }).replace(/,/g, '،');
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 1st is the first week of the year.
         }
-    },
-    calendar : {
-        sameDay: '[اليوم على الساعة] LT',
-        nextDay: '[غدا على الساعة] LT',
-        nextWeek: 'dddd [على الساعة] LT',
-        lastDay: '[أمس على الساعة] LT',
-        lastWeek: 'dddd [على الساعة] LT',
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'في %s',
-        past : 'منذ %s',
-        s : 'ثوان',
-        m : 'دقيقة',
-        mm : '%d دقائق',
-        h : 'ساعة',
-        hh : '%d ساعات',
-        d : 'يوم',
-        dd : '%d أيام',
-        M : 'شهر',
-        MM : '%d أشهر',
-        y : 'سنة',
-        yy : '%d سنوات'
-    },
-    preparse: function (string) {
-        return string.replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) {
-            return numberMap[match];
-        }).replace(/،/g, ',');
-    },
-    postformat: function (string) {
-        return string.replace(/\d/g, function (match) {
-            return symbolMap[match];
-        }).replace(/,/g, '،');
-    },
-    week : {
-        dow : 0, // Sunday is the first day of the week.
-        doy : 6  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    });
 
-return arSa;
+    return arSa;
 
 })));
diff --git a/lib/javascripts/moment_locale/ar-tn.js b/lib/javascripts/moment_locale/ar-tn.js
old mode 100644
new mode 100755
index 5f0d38bb06e..8437717b690
--- a/lib/javascripts/moment_locale/ar-tn.js
+++ b/lib/javascripts/moment_locale/ar-tn.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale  :  Arabic (Tunisia) [ar-tn]
-//! author : Nader Toukabri : https://github.com/naderio
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,50 +8,51 @@
 }(this, (function (moment) { 'use strict';
 
 
-var arTn = moment.defineLocale('ar-tn', {
-    months: 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
-    monthsShort: 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
-    weekdays: 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
-    weekdaysShort: 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
-    weekdaysMin: 'ح_ن_ث_ر_خ_ج_س'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat: {
-        LT: 'HH:mm',
-        LTS: 'HH:mm:ss',
-        L: 'DD/MM/YYYY',
-        LL: 'D MMMM YYYY',
-        LLL: 'D MMMM YYYY HH:mm',
-        LLLL: 'dddd D MMMM YYYY HH:mm'
-    },
-    calendar: {
-        sameDay: '[اليوم على الساعة] LT',
-        nextDay: '[غدا على الساعة] LT',
-        nextWeek: 'dddd [على الساعة] LT',
-        lastDay: '[أمس على الساعة] LT',
-        lastWeek: 'dddd [على الساعة] LT',
-        sameElse: 'L'
-    },
-    relativeTime: {
-        future: 'في %s',
-        past: 'منذ %s',
-        s: 'ثوان',
-        m: 'دقيقة',
-        mm: '%d دقائق',
-        h: 'ساعة',
-        hh: '%d ساعات',
-        d: 'يوم',
-        dd: '%d أيام',
-        M: 'شهر',
-        MM: '%d أشهر',
-        y: 'سنة',
-        yy: '%d سنوات'
-    },
-    week: {
-        dow: 1, // Monday is the first day of the week.
-        doy: 4 // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    var arTn = moment.defineLocale('ar-tn', {
+        months: 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+        monthsShort: 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+        weekdays: 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+        weekdaysShort: 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
+        weekdaysMin: 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat: {
+            LT: 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L: 'DD/MM/YYYY',
+            LL: 'D MMMM YYYY',
+            LLL: 'D MMMM YYYY HH:mm',
+            LLLL: 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar: {
+            sameDay: '[اليوم على الساعة] LT',
+            nextDay: '[غدا على الساعة] LT',
+            nextWeek: 'dddd [على الساعة] LT',
+            lastDay: '[أمس على الساعة] LT',
+            lastWeek: 'dddd [على الساعة] LT',
+            sameElse: 'L'
+        },
+        relativeTime: {
+            future: 'في %s',
+            past: 'منذ %s',
+            s: 'ثوان',
+            ss : '%d ثانية',
+            m: 'دقيقة',
+            mm: '%d دقائق',
+            h: 'ساعة',
+            hh: '%d ساعات',
+            d: 'يوم',
+            dd: '%d أيام',
+            M: 'شهر',
+            MM: '%d أشهر',
+            y: 'سنة',
+            yy: '%d سنوات'
+        },
+        week: {
+            dow: 1, // Monday is the first day of the week.
+            doy: 4 // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-return arTn;
+    return arTn;
 
 })));
diff --git a/lib/javascripts/moment_locale/ar.js b/lib/javascripts/moment_locale/ar.js
old mode 100644
new mode 100755
index d263e4c4f8d..3c6506b3094
--- a/lib/javascripts/moment_locale/ar.js
+++ b/lib/javascripts/moment_locale/ar.js
@@ -1,8 +1,4 @@
 //! moment.js locale configuration
-//! locale : Arabic [ar]
-//! author : Abdel Said: https://github.com/abdelsaid
-//! author : Ahmed Elkhatib
-//! author : forabi https://github.com/forabi
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -12,131 +8,127 @@
 }(this, (function (moment) { 'use strict';
 
 
-var symbolMap = {
-    '1': '١',
-    '2': '٢',
-    '3': '٣',
-    '4': '٤',
-    '5': '٥',
-    '6': '٦',
-    '7': '٧',
-    '8': '٨',
-    '9': '٩',
-    '0': '٠'
-};
-var numberMap = {
-    '١': '1',
-    '٢': '2',
-    '٣': '3',
-    '٤': '4',
-    '٥': '5',
-    '٦': '6',
-    '٧': '7',
-    '٨': '8',
-    '٩': '9',
-    '٠': '0'
-};
-var pluralForm = function (n) {
-    return n === 0 ? 0 : n === 1 ? 1 : n === 2 ? 2 : n % 100 >= 3 && n % 100 <= 10 ? 3 : n % 100 >= 11 ? 4 : 5;
-};
-var plurals = {
-    s : ['أقل من ثانية', 'ثانية واحدة', ['ثانيتان', 'ثانيتين'], '%d ثوان', '%d ثانية', '%d ثانية'],
-    m : ['أقل من دقيقة', 'دقيقة واحدة', ['دقيقتان', 'دقيقتين'], '%d دقائق', '%d دقيقة', '%d دقيقة'],
-    h : ['أقل من ساعة', 'ساعة واحدة', ['ساعتان', 'ساعتين'], '%d ساعات', '%d ساعة', '%d ساعة'],
-    d : ['أقل من يوم', 'يوم واحد', ['يومان', 'يومين'], '%d أيام', '%d يومًا', '%d يوم'],
-    M : ['أقل من شهر', 'شهر واحد', ['شهران', 'شهرين'], '%d أشهر', '%d شهرا', '%d شهر'],
-    y : ['أقل من عام', 'عام واحد', ['عامان', 'عامين'], '%d أعوام', '%d عامًا', '%d عام']
-};
-var pluralize = function (u) {
-    return function (number, withoutSuffix, string, isFuture) {
-        var f = pluralForm(number),
-            str = plurals[u][pluralForm(number)];
-        if (f === 2) {
-            str = str[withoutSuffix ? 0 : 1];
-        }
-        return str.replace(/%d/i, number);
-    };
-};
-var months = [
-    'كانون الثاني يناير',
-    'شباط فبراير',
-    'آذار مارس',
-    'نيسان أبريل',
-    'أيار مايو',
-    'حزيران يونيو',
-    'تموز يوليو',
-    'آب أغسطس',
-    'أيلول سبتمبر',
-    'تشرين الأول أكتوبر',
-    'تشرين الثاني نوفمبر',
-    'كانون الأول ديسمبر'
-];
+    var symbolMap = {
+        '1': '١',
+        '2': '٢',
+        '3': '٣',
+        '4': '٤',
+        '5': '٥',
+        '6': '٦',
+        '7': '٧',
+        '8': '٨',
+        '9': '٩',
+        '0': '٠'
+    }, numberMap = {
+        '١': '1',
+        '٢': '2',
+        '٣': '3',
+        '٤': '4',
+        '٥': '5',
+        '٦': '6',
+        '٧': '7',
+        '٨': '8',
+        '٩': '9',
+        '٠': '0'
+    }, pluralForm = function (n) {
+        return n === 0 ? 0 : n === 1 ? 1 : n === 2 ? 2 : n % 100 >= 3 && n % 100 <= 10 ? 3 : n % 100 >= 11 ? 4 : 5;
+    }, plurals = {
+        s : ['أقل من ثانية', 'ثانية واحدة', ['ثانيتان', 'ثانيتين'], '%d ثوان', '%d ثانية', '%d ثانية'],
+        m : ['أقل من دقيقة', 'دقيقة واحدة', ['دقيقتان', 'دقيقتين'], '%d دقائق', '%d دقيقة', '%d دقيقة'],
+        h : ['أقل من ساعة', 'ساعة واحدة', ['ساعتان', 'ساعتين'], '%d ساعات', '%d ساعة', '%d ساعة'],
+        d : ['أقل من يوم', 'يوم واحد', ['يومان', 'يومين'], '%d أيام', '%d يومًا', '%d يوم'],
+        M : ['أقل من شهر', 'شهر واحد', ['شهران', 'شهرين'], '%d أشهر', '%d شهرا', '%d شهر'],
+        y : ['أقل من عام', 'عام واحد', ['عامان', 'عامين'], '%d أعوام', '%d عامًا', '%d عام']
+    }, pluralize = function (u) {
+        return function (number, withoutSuffix, string, isFuture) {
+            var f = pluralForm(number),
+                str = plurals[u][pluralForm(number)];
+            if (f === 2) {
+                str = str[withoutSuffix ? 0 : 1];
+            }
+            return str.replace(/%d/i, number);
+        };
+    }, months = [
+        'يناير',
+        'فبراير',
+        'مارس',
+        'أبريل',
+        'مايو',
+        'يونيو',
+        'يوليو',
+        'أغسطس',
+        'سبتمبر',
+        'أكتوبر',
+        'نوفمبر',
+        'ديسمبر'
+    ];
 
-var ar = moment.defineLocale('ar', {
-    months : months,
-    monthsShort : months,
-    weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
-    weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
-    weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'D/\u200FM/\u200FYYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd D MMMM YYYY HH:mm'
-    },
-    meridiemParse: /ص|م/,
-    isPM : function (input) {
-        return 'م' === input;
-    },
-    meridiem : function (hour, minute, isLower) {
-        if (hour < 12) {
-            return 'ص';
-        } else {
-            return 'م';
+    var ar = moment.defineLocale('ar', {
+        months : months,
+        monthsShort : months,
+        weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+        weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
+        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'D/\u200FM/\u200FYYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        meridiemParse: /ص|م/,
+        isPM : function (input) {
+            return 'م' === input;
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'ص';
+            } else {
+                return 'م';
+            }
+        },
+        calendar : {
+            sameDay: '[اليوم عند الساعة] LT',
+            nextDay: '[غدًا عند الساعة] LT',
+            nextWeek: 'dddd [عند الساعة] LT',
+            lastDay: '[أمس عند الساعة] LT',
+            lastWeek: 'dddd [عند الساعة] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'بعد %s',
+            past : 'منذ %s',
+            s : pluralize('s'),
+            ss : pluralize('s'),
+            m : pluralize('m'),
+            mm : pluralize('m'),
+            h : pluralize('h'),
+            hh : pluralize('h'),
+            d : pluralize('d'),
+            dd : pluralize('d'),
+            M : pluralize('M'),
+            MM : pluralize('M'),
+            y : pluralize('y'),
+            yy : pluralize('y')
+        },
+        preparse: function (string) {
+            return string.replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) {
+                return numberMap[match];
+            }).replace(/،/g, ',');
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            }).replace(/,/g, '،');
+        },
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12  // The week that contains Jan 1st is the first week of the year.
         }
-    },
-    calendar : {
-        sameDay: '[اليوم عند الساعة] LT',
-        nextDay: '[غدًا عند الساعة] LT',
-        nextWeek: 'dddd [عند الساعة] LT',
-        lastDay: '[أمس عند الساعة] LT',
-        lastWeek: 'dddd [عند الساعة] LT',
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'بعد %s',
-        past : 'منذ %s',
-        s : pluralize('s'),
-        m : pluralize('m'),
-        mm : pluralize('m'),
-        h : pluralize('h'),
-        hh : pluralize('h'),
-        d : pluralize('d'),
-        dd : pluralize('d'),
-        M : pluralize('M'),
-        MM : pluralize('M'),
-        y : pluralize('y'),
-        yy : pluralize('y')
-    },
-    preparse: function (string) {
-        return string.replace(/\u200f/g, '').replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) {
-            return numberMap[match];
-        }).replace(/،/g, ',');
-    },
-    postformat: function (string) {
-        return string.replace(/\d/g, function (match) {
-            return symbolMap[match];
-        }).replace(/,/g, '،');
-    },
-    week : {
-        dow : 6, // Saturday is the first day of the week.
-        doy : 12  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    });
 
-return ar;
+    return ar;
 
 })));
diff --git a/lib/javascripts/moment_locale/az.js b/lib/javascripts/moment_locale/az.js
old mode 100644
new mode 100755
index 56021b4463a..04930726ba4
--- a/lib/javascripts/moment_locale/az.js
+++ b/lib/javascripts/moment_locale/az.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Azerbaijani [az]
-//! author : topchiyev : https://github.com/topchiyev
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,96 +8,97 @@
 }(this, (function (moment) { 'use strict';
 
 
-var suffixes = {
-    1: '-inci',
-    5: '-inci',
-    8: '-inci',
-    70: '-inci',
-    80: '-inci',
-    2: '-nci',
-    7: '-nci',
-    20: '-nci',
-    50: '-nci',
-    3: '-üncü',
-    4: '-üncü',
-    100: '-üncü',
-    6: '-ncı',
-    9: '-uncu',
-    10: '-uncu',
-    30: '-uncu',
-    60: '-ıncı',
-    90: '-ıncı'
-};
+    var suffixes = {
+        1: '-inci',
+        5: '-inci',
+        8: '-inci',
+        70: '-inci',
+        80: '-inci',
+        2: '-nci',
+        7: '-nci',
+        20: '-nci',
+        50: '-nci',
+        3: '-üncü',
+        4: '-üncü',
+        100: '-üncü',
+        6: '-ncı',
+        9: '-uncu',
+        10: '-uncu',
+        30: '-uncu',
+        60: '-ıncı',
+        90: '-ıncı'
+    };
 
-var az = moment.defineLocale('az', {
-    months : 'yanvar_fevral_mart_aprel_may_iyun_iyul_avqust_sentyabr_oktyabr_noyabr_dekabr'.split('_'),
-    monthsShort : 'yan_fev_mar_apr_may_iyn_iyl_avq_sen_okt_noy_dek'.split('_'),
-    weekdays : 'Bazar_Bazar ertəsi_Çərşənbə axşamı_Çərşənbə_Cümə axşamı_Cümə_Şənbə'.split('_'),
-    weekdaysShort : 'Baz_BzE_ÇAx_Çər_CAx_Cüm_Şən'.split('_'),
-    weekdaysMin : 'Bz_BE_ÇA_Çə_CA_Cü_Şə'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd, D MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay : '[bugün saat] LT',
-        nextDay : '[sabah saat] LT',
-        nextWeek : '[gələn həftə] dddd [saat] LT',
-        lastDay : '[dünən] LT',
-        lastWeek : '[keçən həftə] dddd [saat] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : '%s sonra',
-        past : '%s əvvəl',
-        s : 'birneçə saniyyə',
-        m : 'bir dəqiqə',
-        mm : '%d dəqiqə',
-        h : 'bir saat',
-        hh : '%d saat',
-        d : 'bir gün',
-        dd : '%d gün',
-        M : 'bir ay',
-        MM : '%d ay',
-        y : 'bir il',
-        yy : '%d il'
-    },
-    meridiemParse: /gecə|səhər|gündüz|axşam/,
-    isPM : function (input) {
-        return /^(gündüz|axşam)$/.test(input);
-    },
-    meridiem : function (hour, minute, isLower) {
-        if (hour < 4) {
-            return 'gecə';
-        } else if (hour < 12) {
-            return 'səhər';
-        } else if (hour < 17) {
-            return 'gündüz';
-        } else {
-            return 'axşam';
+    var az = moment.defineLocale('az', {
+        months : 'yanvar_fevral_mart_aprel_may_iyun_iyul_avqust_sentyabr_oktyabr_noyabr_dekabr'.split('_'),
+        monthsShort : 'yan_fev_mar_apr_may_iyn_iyl_avq_sen_okt_noy_dek'.split('_'),
+        weekdays : 'Bazar_Bazar ertəsi_Çərşənbə axşamı_Çərşənbə_Cümə axşamı_Cümə_Şənbə'.split('_'),
+        weekdaysShort : 'Baz_BzE_ÇAx_Çər_CAx_Cüm_Şən'.split('_'),
+        weekdaysMin : 'Bz_BE_ÇA_Çə_CA_Cü_Şə'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[bugün saat] LT',
+            nextDay : '[sabah saat] LT',
+            nextWeek : '[gələn həftə] dddd [saat] LT',
+            lastDay : '[dünən] LT',
+            lastWeek : '[keçən həftə] dddd [saat] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s sonra',
+            past : '%s əvvəl',
+            s : 'birneçə saniyyə',
+            ss : '%d saniyə',
+            m : 'bir dəqiqə',
+            mm : '%d dəqiqə',
+            h : 'bir saat',
+            hh : '%d saat',
+            d : 'bir gün',
+            dd : '%d gün',
+            M : 'bir ay',
+            MM : '%d ay',
+            y : 'bir il',
+            yy : '%d il'
+        },
+        meridiemParse: /gecə|səhər|gündüz|axşam/,
+        isPM : function (input) {
+            return /^(gündüz|axşam)$/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'gecə';
+            } else if (hour < 12) {
+                return 'səhər';
+            } else if (hour < 17) {
+                return 'gündüz';
+            } else {
+                return 'axşam';
+            }
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}-(ıncı|inci|nci|üncü|ncı|uncu)/,
+        ordinal : function (number) {
+            if (number === 0) {  // special case for zero
+                return number + '-ıncı';
+            }
+            var a = number % 10,
+                b = number % 100 - a,
+                c = number >= 100 ? 100 : null;
+            return number + (suffixes[a] || suffixes[b] || suffixes[c]);
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
         }
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}-(ıncı|inci|nci|üncü|ncı|uncu)/,
-    ordinal : function (number) {
-        if (number === 0) {  // special case for zero
-            return number + '-ıncı';
-        }
-        var a = number % 10,
-            b = number % 100 - a,
-            c = number >= 100 ? 100 : null;
-        return number + (suffixes[a] || suffixes[b] || suffixes[c]);
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    });
 
-return az;
+    return az;
 
 })));
diff --git a/lib/javascripts/moment_locale/be.js b/lib/javascripts/moment_locale/be.js
old mode 100644
new mode 100755
index 83025fdc441..46a2a11f85a
--- a/lib/javascripts/moment_locale/be.js
+++ b/lib/javascripts/moment_locale/be.js
@@ -1,8 +1,4 @@
 //! moment.js locale configuration
-//! locale : Belarusian [be]
-//! author : Dmitry Demidov : https://github.com/demidov91
-//! author: Praleska: http://praleska.pro/
-//! Author : Menelion Elensúle : https://github.com/Oire
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -12,123 +8,124 @@
 }(this, (function (moment) { 'use strict';
 
 
-function plural(word, num) {
-    var forms = word.split('_');
-    return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
-}
-function relativeTimeWithPlural(number, withoutSuffix, key) {
-    var format = {
-        'mm': withoutSuffix ? 'хвіліна_хвіліны_хвілін' : 'хвіліну_хвіліны_хвілін',
-        'hh': withoutSuffix ? 'гадзіна_гадзіны_гадзін' : 'гадзіну_гадзіны_гадзін',
-        'dd': 'дзень_дні_дзён',
-        'MM': 'месяц_месяцы_месяцаў',
-        'yy': 'год_гады_гадоў'
-    };
-    if (key === 'm') {
-        return withoutSuffix ? 'хвіліна' : 'хвіліну';
+    function plural(word, num) {
+        var forms = word.split('_');
+        return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
     }
-    else if (key === 'h') {
-        return withoutSuffix ? 'гадзіна' : 'гадзіну';
+    function relativeTimeWithPlural(number, withoutSuffix, key) {
+        var format = {
+            'ss': withoutSuffix ? 'секунда_секунды_секунд' : 'секунду_секунды_секунд',
+            'mm': withoutSuffix ? 'хвіліна_хвіліны_хвілін' : 'хвіліну_хвіліны_хвілін',
+            'hh': withoutSuffix ? 'гадзіна_гадзіны_гадзін' : 'гадзіну_гадзіны_гадзін',
+            'dd': 'дзень_дні_дзён',
+            'MM': 'месяц_месяцы_месяцаў',
+            'yy': 'год_гады_гадоў'
+        };
+        if (key === 'm') {
+            return withoutSuffix ? 'хвіліна' : 'хвіліну';
+        }
+        else if (key === 'h') {
+            return withoutSuffix ? 'гадзіна' : 'гадзіну';
+        }
+        else {
+            return number + ' ' + plural(format[key], +number);
+        }
     }
-    else {
-        return number + ' ' + plural(format[key], +number);
-    }
-}
 
-var be = moment.defineLocale('be', {
-    months : {
-        format: 'студзеня_лютага_сакавіка_красавіка_траўня_чэрвеня_ліпеня_жніўня_верасня_кастрычніка_лістапада_снежня'.split('_'),
-        standalone: 'студзень_люты_сакавік_красавік_травень_чэрвень_ліпень_жнівень_верасень_кастрычнік_лістапад_снежань'.split('_')
-    },
-    monthsShort : 'студ_лют_сак_крас_трав_чэрв_ліп_жнів_вер_каст_ліст_снеж'.split('_'),
-    weekdays : {
-        format: 'нядзелю_панядзелак_аўторак_сераду_чацвер_пятніцу_суботу'.split('_'),
-        standalone: 'нядзеля_панядзелак_аўторак_серада_чацвер_пятніца_субота'.split('_'),
-        isFormat: /\[ ?[Вв] ?(?:мінулую|наступную)? ?\] ?dddd/
-    },
-    weekdaysShort : 'нд_пн_ат_ср_чц_пт_сб'.split('_'),
-    weekdaysMin : 'нд_пн_ат_ср_чц_пт_сб'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D MMMM YYYY г.',
-        LLL : 'D MMMM YYYY г., HH:mm',
-        LLLL : 'dddd, D MMMM YYYY г., HH:mm'
-    },
-    calendar : {
-        sameDay: '[Сёння ў] LT',
-        nextDay: '[Заўтра ў] LT',
-        lastDay: '[Учора ў] LT',
-        nextWeek: function () {
-            return '[У] dddd [ў] LT';
+    var be = moment.defineLocale('be', {
+        months : {
+            format: 'студзеня_лютага_сакавіка_красавіка_траўня_чэрвеня_ліпеня_жніўня_верасня_кастрычніка_лістапада_снежня'.split('_'),
+            standalone: 'студзень_люты_сакавік_красавік_травень_чэрвень_ліпень_жнівень_верасень_кастрычнік_лістапад_снежань'.split('_')
         },
-        lastWeek: function () {
-            switch (this.day()) {
-                case 0:
-                case 3:
-                case 5:
-                case 6:
-                    return '[У мінулую] dddd [ў] LT';
-                case 1:
-                case 2:
-                case 4:
-                    return '[У мінулы] dddd [ў] LT';
+        monthsShort : 'студ_лют_сак_крас_трав_чэрв_ліп_жнів_вер_каст_ліст_снеж'.split('_'),
+        weekdays : {
+            format: 'нядзелю_панядзелак_аўторак_сераду_чацвер_пятніцу_суботу'.split('_'),
+            standalone: 'нядзеля_панядзелак_аўторак_серада_чацвер_пятніца_субота'.split('_'),
+            isFormat: /\[ ?[Вв] ?(?:мінулую|наступную)? ?\] ?dddd/
+        },
+        weekdaysShort : 'нд_пн_ат_ср_чц_пт_сб'.split('_'),
+        weekdaysMin : 'нд_пн_ат_ср_чц_пт_сб'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY г.',
+            LLL : 'D MMMM YYYY г., HH:mm',
+            LLLL : 'dddd, D MMMM YYYY г., HH:mm'
+        },
+        calendar : {
+            sameDay: '[Сёння ў] LT',
+            nextDay: '[Заўтра ў] LT',
+            lastDay: '[Учора ў] LT',
+            nextWeek: function () {
+                return '[У] dddd [ў] LT';
+            },
+            lastWeek: function () {
+                switch (this.day()) {
+                    case 0:
+                    case 3:
+                    case 5:
+                    case 6:
+                        return '[У мінулую] dddd [ў] LT';
+                    case 1:
+                    case 2:
+                    case 4:
+                        return '[У мінулы] dddd [ў] LT';
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'праз %s',
+            past : '%s таму',
+            s : 'некалькі секунд',
+            m : relativeTimeWithPlural,
+            mm : relativeTimeWithPlural,
+            h : relativeTimeWithPlural,
+            hh : relativeTimeWithPlural,
+            d : 'дзень',
+            dd : relativeTimeWithPlural,
+            M : 'месяц',
+            MM : relativeTimeWithPlural,
+            y : 'год',
+            yy : relativeTimeWithPlural
+        },
+        meridiemParse: /ночы|раніцы|дня|вечара/,
+        isPM : function (input) {
+            return /^(дня|вечара)$/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'ночы';
+            } else if (hour < 12) {
+                return 'раніцы';
+            } else if (hour < 17) {
+                return 'дня';
+            } else {
+                return 'вечара';
             }
         },
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'праз %s',
-        past : '%s таму',
-        s : 'некалькі секунд',
-        m : relativeTimeWithPlural,
-        mm : relativeTimeWithPlural,
-        h : relativeTimeWithPlural,
-        hh : relativeTimeWithPlural,
-        d : 'дзень',
-        dd : relativeTimeWithPlural,
-        M : 'месяц',
-        MM : relativeTimeWithPlural,
-        y : 'год',
-        yy : relativeTimeWithPlural
-    },
-    meridiemParse: /ночы|раніцы|дня|вечара/,
-    isPM : function (input) {
-        return /^(дня|вечара)$/.test(input);
-    },
-    meridiem : function (hour, minute, isLower) {
-        if (hour < 4) {
-            return 'ночы';
-        } else if (hour < 12) {
-            return 'раніцы';
-        } else if (hour < 17) {
-            return 'дня';
-        } else {
-            return 'вечара';
+        dayOfMonthOrdinalParse: /\d{1,2}-(і|ы|га)/,
+        ordinal: function (number, period) {
+            switch (period) {
+                case 'M':
+                case 'd':
+                case 'DDD':
+                case 'w':
+                case 'W':
+                    return (number % 10 === 2 || number % 10 === 3) && (number % 100 !== 12 && number % 100 !== 13) ? number + '-і' : number + '-ы';
+                case 'D':
+                    return number + '-га';
+                default:
+                    return number;
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
         }
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}-(і|ы|га)/,
-    ordinal: function (number, period) {
-        switch (period) {
-            case 'M':
-            case 'd':
-            case 'DDD':
-            case 'w':
-            case 'W':
-                return (number % 10 === 2 || number % 10 === 3) && (number % 100 !== 12 && number % 100 !== 13) ? number + '-і' : number + '-ы';
-            case 'D':
-                return number + '-га';
-            default:
-                return number;
-        }
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    });
 
-return be;
+    return be;
 
 })));
diff --git a/lib/javascripts/moment_locale/bg.js b/lib/javascripts/moment_locale/bg.js
old mode 100644
new mode 100755
index ee06d1978ae..f8528a2ac7a
--- a/lib/javascripts/moment_locale/bg.js
+++ b/lib/javascripts/moment_locale/bg.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Bulgarian [bg]
-//! author : Krasen Borisov : https://github.com/kraz
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,81 +8,82 @@
 }(this, (function (moment) { 'use strict';
 
 
-var bg = moment.defineLocale('bg', {
-    months : 'януари_февруари_март_април_май_юни_юли_август_септември_октомври_ноември_декември'.split('_'),
-    monthsShort : 'янр_фев_мар_апр_май_юни_юли_авг_сеп_окт_ное_дек'.split('_'),
-    weekdays : 'неделя_понеделник_вторник_сряда_четвъртък_петък_събота'.split('_'),
-    weekdaysShort : 'нед_пон_вто_сря_чет_пет_съб'.split('_'),
-    weekdaysMin : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
-    longDateFormat : {
-        LT : 'H:mm',
-        LTS : 'H:mm:ss',
-        L : 'D.MM.YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY H:mm',
-        LLLL : 'dddd, D MMMM YYYY H:mm'
-    },
-    calendar : {
-        sameDay : '[Днес в] LT',
-        nextDay : '[Утре в] LT',
-        nextWeek : 'dddd [в] LT',
-        lastDay : '[Вчера в] LT',
-        lastWeek : function () {
-            switch (this.day()) {
-                case 0:
-                case 3:
-                case 6:
-                    return '[В изминалата] dddd [в] LT';
-                case 1:
-                case 2:
-                case 4:
-                case 5:
-                    return '[В изминалия] dddd [в] LT';
+    var bg = moment.defineLocale('bg', {
+        months : 'януари_февруари_март_април_май_юни_юли_август_септември_октомври_ноември_декември'.split('_'),
+        monthsShort : 'янр_фев_мар_апр_май_юни_юли_авг_сеп_окт_ное_дек'.split('_'),
+        weekdays : 'неделя_понеделник_вторник_сряда_четвъртък_петък_събота'.split('_'),
+        weekdaysShort : 'нед_пон_вто_сря_чет_пет_съб'.split('_'),
+        weekdaysMin : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'D.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY H:mm',
+            LLLL : 'dddd, D MMMM YYYY H:mm'
+        },
+        calendar : {
+            sameDay : '[Днес в] LT',
+            nextDay : '[Утре в] LT',
+            nextWeek : 'dddd [в] LT',
+            lastDay : '[Вчера в] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                    case 0:
+                    case 3:
+                    case 6:
+                        return '[В изминалата] dddd [в] LT';
+                    case 1:
+                    case 2:
+                    case 4:
+                    case 5:
+                        return '[В изминалия] dddd [в] LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'след %s',
+            past : 'преди %s',
+            s : 'няколко секунди',
+            ss : '%d секунди',
+            m : 'минута',
+            mm : '%d минути',
+            h : 'час',
+            hh : '%d часа',
+            d : 'ден',
+            dd : '%d дни',
+            M : 'месец',
+            MM : '%d месеца',
+            y : 'година',
+            yy : '%d години'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}-(ев|ен|ти|ви|ри|ми)/,
+        ordinal : function (number) {
+            var lastDigit = number % 10,
+                last2Digits = number % 100;
+            if (number === 0) {
+                return number + '-ев';
+            } else if (last2Digits === 0) {
+                return number + '-ен';
+            } else if (last2Digits > 10 && last2Digits < 20) {
+                return number + '-ти';
+            } else if (lastDigit === 1) {
+                return number + '-ви';
+            } else if (lastDigit === 2) {
+                return number + '-ри';
+            } else if (lastDigit === 7 || lastDigit === 8) {
+                return number + '-ми';
+            } else {
+                return number + '-ти';
             }
         },
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'след %s',
-        past : 'преди %s',
-        s : 'няколко секунди',
-        m : 'минута',
-        mm : '%d минути',
-        h : 'час',
-        hh : '%d часа',
-        d : 'ден',
-        dd : '%d дни',
-        M : 'месец',
-        MM : '%d месеца',
-        y : 'година',
-        yy : '%d години'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}-(ев|ен|ти|ви|ри|ми)/,
-    ordinal : function (number) {
-        var lastDigit = number % 10,
-            last2Digits = number % 100;
-        if (number === 0) {
-            return number + '-ев';
-        } else if (last2Digits === 0) {
-            return number + '-ен';
-        } else if (last2Digits > 10 && last2Digits < 20) {
-            return number + '-ти';
-        } else if (lastDigit === 1) {
-            return number + '-ви';
-        } else if (lastDigit === 2) {
-            return number + '-ри';
-        } else if (lastDigit === 7 || lastDigit === 8) {
-            return number + '-ми';
-        } else {
-            return number + '-ти';
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
         }
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    });
 
-return bg;
+    return bg;
 
 })));
diff --git a/lib/javascripts/moment_locale/bm.js b/lib/javascripts/moment_locale/bm.js
new file mode 100755
index 00000000000..2bb50f51975
--- /dev/null
+++ b/lib/javascripts/moment_locale/bm.js
@@ -0,0 +1,57 @@
+//! moment.js locale configuration
+
+;(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined'
+       && typeof require === 'function' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
+   factory(global.moment)
+}(this, (function (moment) { 'use strict';
+
+
+    var bm = moment.defineLocale('bm', {
+        months : 'Zanwuyekalo_Fewuruyekalo_Marisikalo_Awirilikalo_Mɛkalo_Zuwɛnkalo_Zuluyekalo_Utikalo_Sɛtanburukalo_ɔkutɔburukalo_Nowanburukalo_Desanburukalo'.split('_'),
+        monthsShort : 'Zan_Few_Mar_Awi_Mɛ_Zuw_Zul_Uti_Sɛt_ɔku_Now_Des'.split('_'),
+        weekdays : 'Kari_Ntɛnɛn_Tarata_Araba_Alamisa_Juma_Sibiri'.split('_'),
+        weekdaysShort : 'Kar_Ntɛ_Tar_Ara_Ala_Jum_Sib'.split('_'),
+        weekdaysMin : 'Ka_Nt_Ta_Ar_Al_Ju_Si'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'MMMM [tile] D [san] YYYY',
+            LLL : 'MMMM [tile] D [san] YYYY [lɛrɛ] HH:mm',
+            LLLL : 'dddd MMMM [tile] D [san] YYYY [lɛrɛ] HH:mm'
+        },
+        calendar : {
+            sameDay : '[Bi lɛrɛ] LT',
+            nextDay : '[Sini lɛrɛ] LT',
+            nextWeek : 'dddd [don lɛrɛ] LT',
+            lastDay : '[Kunu lɛrɛ] LT',
+            lastWeek : 'dddd [tɛmɛnen lɛrɛ] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s kɔnɔ',
+            past : 'a bɛ %s bɔ',
+            s : 'sanga dama dama',
+            ss : 'sekondi %d',
+            m : 'miniti kelen',
+            mm : 'miniti %d',
+            h : 'lɛrɛ kelen',
+            hh : 'lɛrɛ %d',
+            d : 'tile kelen',
+            dd : 'tile %d',
+            M : 'kalo kelen',
+            MM : 'kalo %d',
+            y : 'san kelen',
+            yy : 'san %d'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return bm;
+
+})));
diff --git a/lib/javascripts/moment_locale/bn.js b/lib/javascripts/moment_locale/bn.js
old mode 100644
new mode 100755
index b6f942a6dca..d7d33f53828
--- a/lib/javascripts/moment_locale/bn.js
+++ b/lib/javascripts/moment_locale/bn.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Bengali [bn]
-//! author : Kaushik Gandhi : https://github.com/kaushikgandhi
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,110 +8,111 @@
 }(this, (function (moment) { 'use strict';
 
 
-var symbolMap = {
-    '1': '১',
-    '2': '২',
-    '3': '৩',
-    '4': '৪',
-    '5': '৫',
-    '6': '৬',
-    '7': '৭',
-    '8': '৮',
-    '9': '৯',
-    '0': '০'
-};
-var numberMap = {
-    '১': '1',
-    '২': '2',
-    '৩': '3',
-    '৪': '4',
-    '৫': '5',
-    '৬': '6',
-    '৭': '7',
-    '৮': '8',
-    '৯': '9',
-    '০': '0'
-};
+    var symbolMap = {
+        '1': '১',
+        '2': '২',
+        '3': '৩',
+        '4': '৪',
+        '5': '৫',
+        '6': '৬',
+        '7': '৭',
+        '8': '৮',
+        '9': '৯',
+        '0': '০'
+    },
+    numberMap = {
+        '১': '1',
+        '২': '2',
+        '৩': '3',
+        '৪': '4',
+        '৫': '5',
+        '৬': '6',
+        '৭': '7',
+        '৮': '8',
+        '৯': '9',
+        '০': '0'
+    };
 
-var bn = moment.defineLocale('bn', {
-    months : 'জানুয়ারী_ফেব্রুয়ারি_মার্চ_এপ্রিল_মে_জুন_জুলাই_আগস্ট_সেপ্টেম্বর_অক্টোবর_নভেম্বর_ডিসেম্বর'.split('_'),
-    monthsShort : 'জানু_ফেব_মার্চ_এপ্র_মে_জুন_জুল_আগ_সেপ্ট_অক্টো_নভে_ডিসে'.split('_'),
-    weekdays : 'রবিবার_সোমবার_মঙ্গলবার_বুধবার_বৃহস্পতিবার_শুক্রবার_শনিবার'.split('_'),
-    weekdaysShort : 'রবি_সোম_মঙ্গল_বুধ_বৃহস্পতি_শুক্র_শনি'.split('_'),
-    weekdaysMin : 'রবি_সোম_মঙ্গ_বুধ_বৃহঃ_শুক্র_শনি'.split('_'),
-    longDateFormat : {
-        LT : 'A h:mm সময়',
-        LTS : 'A h:mm:ss সময়',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY, A h:mm সময়',
-        LLLL : 'dddd, D MMMM YYYY, A h:mm সময়'
-    },
-    calendar : {
-        sameDay : '[আজ] LT',
-        nextDay : '[আগামীকাল] LT',
-        nextWeek : 'dddd, LT',
-        lastDay : '[গতকাল] LT',
-        lastWeek : '[গত] dddd, LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : '%s পরে',
-        past : '%s আগে',
-        s : 'কয়েক সেকেন্ড',
-        m : 'এক মিনিট',
-        mm : '%d মিনিট',
-        h : 'এক ঘন্টা',
-        hh : '%d ঘন্টা',
-        d : 'এক দিন',
-        dd : '%d দিন',
-        M : 'এক মাস',
-        MM : '%d মাস',
-        y : 'এক বছর',
-        yy : '%d বছর'
-    },
-    preparse: function (string) {
-        return string.replace(/[১২৩৪৫৬৭৮৯০]/g, function (match) {
-            return numberMap[match];
-        });
-    },
-    postformat: function (string) {
-        return string.replace(/\d/g, function (match) {
-            return symbolMap[match];
-        });
-    },
-    meridiemParse: /রাত|সকাল|দুপুর|বিকাল|রাত/,
-    meridiemHour : function (hour, meridiem) {
-        if (hour === 12) {
-            hour = 0;
+    var bn = moment.defineLocale('bn', {
+        months : 'জানুয়ারী_ফেব্রুয়ারি_মার্চ_এপ্রিল_মে_জুন_জুলাই_আগস্ট_সেপ্টেম্বর_অক্টোবর_নভেম্বর_ডিসেম্বর'.split('_'),
+        monthsShort : 'জানু_ফেব_মার্চ_এপ্র_মে_জুন_জুল_আগ_সেপ্ট_অক্টো_নভে_ডিসে'.split('_'),
+        weekdays : 'রবিবার_সোমবার_মঙ্গলবার_বুধবার_বৃহস্পতিবার_শুক্রবার_শনিবার'.split('_'),
+        weekdaysShort : 'রবি_সোম_মঙ্গল_বুধ_বৃহস্পতি_শুক্র_শনি'.split('_'),
+        weekdaysMin : 'রবি_সোম_মঙ্গ_বুধ_বৃহঃ_শুক্র_শনি'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm সময়',
+            LTS : 'A h:mm:ss সময়',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, A h:mm সময়',
+            LLLL : 'dddd, D MMMM YYYY, A h:mm সময়'
+        },
+        calendar : {
+            sameDay : '[আজ] LT',
+            nextDay : '[আগামীকাল] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[গতকাল] LT',
+            lastWeek : '[গত] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s পরে',
+            past : '%s আগে',
+            s : 'কয়েক সেকেন্ড',
+            ss : '%d সেকেন্ড',
+            m : 'এক মিনিট',
+            mm : '%d মিনিট',
+            h : 'এক ঘন্টা',
+            hh : '%d ঘন্টা',
+            d : 'এক দিন',
+            dd : '%d দিন',
+            M : 'এক মাস',
+            MM : '%d মাস',
+            y : 'এক বছর',
+            yy : '%d বছর'
+        },
+        preparse: function (string) {
+            return string.replace(/[১২৩৪৫৬৭৮৯০]/g, function (match) {
+                return numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            });
+        },
+        meridiemParse: /রাত|সকাল|দুপুর|বিকাল|রাত/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if ((meridiem === 'রাত' && hour >= 4) ||
+                    (meridiem === 'দুপুর' && hour < 5) ||
+                    meridiem === 'বিকাল') {
+                return hour + 12;
+            } else {
+                return hour;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'রাত';
+            } else if (hour < 10) {
+                return 'সকাল';
+            } else if (hour < 17) {
+                return 'দুপুর';
+            } else if (hour < 20) {
+                return 'বিকাল';
+            } else {
+                return 'রাত';
+            }
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 1st is the first week of the year.
         }
-        if ((meridiem === 'রাত' && hour >= 4) ||
-                (meridiem === 'দুপুর' && hour < 5) ||
-                meridiem === 'বিকাল') {
-            return hour + 12;
-        } else {
-            return hour;
-        }
-    },
-    meridiem : function (hour, minute, isLower) {
-        if (hour < 4) {
-            return 'রাত';
-        } else if (hour < 10) {
-            return 'সকাল';
-        } else if (hour < 17) {
-            return 'দুপুর';
-        } else if (hour < 20) {
-            return 'বিকাল';
-        } else {
-            return 'রাত';
-        }
-    },
-    week : {
-        dow : 0, // Sunday is the first day of the week.
-        doy : 6  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    });
 
-return bn;
+    return bn;
 
 })));
diff --git a/lib/javascripts/moment_locale/bo.js b/lib/javascripts/moment_locale/bo.js
old mode 100644
new mode 100755
index eb6db476d8d..ff0dcbecd32
--- a/lib/javascripts/moment_locale/bo.js
+++ b/lib/javascripts/moment_locale/bo.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Tibetan [bo]
-//! author : Thupten N. Chakrishar : https://github.com/vajradog
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,110 +8,111 @@
 }(this, (function (moment) { 'use strict';
 
 
-var symbolMap = {
-    '1': '༡',
-    '2': '༢',
-    '3': '༣',
-    '4': '༤',
-    '5': '༥',
-    '6': '༦',
-    '7': '༧',
-    '8': '༨',
-    '9': '༩',
-    '0': '༠'
-};
-var numberMap = {
-    '༡': '1',
-    '༢': '2',
-    '༣': '3',
-    '༤': '4',
-    '༥': '5',
-    '༦': '6',
-    '༧': '7',
-    '༨': '8',
-    '༩': '9',
-    '༠': '0'
-};
+    var symbolMap = {
+        '1': '༡',
+        '2': '༢',
+        '3': '༣',
+        '4': '༤',
+        '5': '༥',
+        '6': '༦',
+        '7': '༧',
+        '8': '༨',
+        '9': '༩',
+        '0': '༠'
+    },
+    numberMap = {
+        '༡': '1',
+        '༢': '2',
+        '༣': '3',
+        '༤': '4',
+        '༥': '5',
+        '༦': '6',
+        '༧': '7',
+        '༨': '8',
+        '༩': '9',
+        '༠': '0'
+    };
 
-var bo = moment.defineLocale('bo', {
-    months : 'ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ'.split('_'),
-    monthsShort : 'ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ'.split('_'),
-    weekdays : 'གཟའ་ཉི་མ་_གཟའ་ཟླ་བ་_གཟའ་མིག་དམར་_གཟའ་ལྷག་པ་_གཟའ་ཕུར་བུ_གཟའ་པ་སངས་_གཟའ་སྤེན་པ་'.split('_'),
-    weekdaysShort : 'ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་'.split('_'),
-    weekdaysMin : 'ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་'.split('_'),
-    longDateFormat : {
-        LT : 'A h:mm',
-        LTS : 'A h:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY, A h:mm',
-        LLLL : 'dddd, D MMMM YYYY, A h:mm'
-    },
-    calendar : {
-        sameDay : '[དི་རིང] LT',
-        nextDay : '[སང་ཉིན] LT',
-        nextWeek : '[བདུན་ཕྲག་རྗེས་མ], LT',
-        lastDay : '[ཁ་སང] LT',
-        lastWeek : '[བདུན་ཕྲག་མཐའ་མ] dddd, LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : '%s ལ་',
-        past : '%s སྔན་ལ',
-        s : 'ལམ་སང',
-        m : 'སྐར་མ་གཅིག',
-        mm : '%d སྐར་མ',
-        h : 'ཆུ་ཚོད་གཅིག',
-        hh : '%d ཆུ་ཚོད',
-        d : 'ཉིན་གཅིག',
-        dd : '%d ཉིན་',
-        M : 'ཟླ་བ་གཅིག',
-        MM : '%d ཟླ་བ',
-        y : 'ལོ་གཅིག',
-        yy : '%d ལོ'
-    },
-    preparse: function (string) {
-        return string.replace(/[༡༢༣༤༥༦༧༨༩༠]/g, function (match) {
-            return numberMap[match];
-        });
-    },
-    postformat: function (string) {
-        return string.replace(/\d/g, function (match) {
-            return symbolMap[match];
-        });
-    },
-    meridiemParse: /མཚན་མོ|ཞོགས་ཀས|ཉིན་གུང|དགོང་དག|མཚན་མོ/,
-    meridiemHour : function (hour, meridiem) {
-        if (hour === 12) {
-            hour = 0;
+    var bo = moment.defineLocale('bo', {
+        months : 'ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ'.split('_'),
+        monthsShort : 'ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ'.split('_'),
+        weekdays : 'གཟའ་ཉི་མ་_གཟའ་ཟླ་བ་_གཟའ་མིག་དམར་_གཟའ་ལྷག་པ་_གཟའ་ཕུར་བུ_གཟའ་པ་སངས་_གཟའ་སྤེན་པ་'.split('_'),
+        weekdaysShort : 'ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་'.split('_'),
+        weekdaysMin : 'ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm',
+            LTS : 'A h:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, A h:mm',
+            LLLL : 'dddd, D MMMM YYYY, A h:mm'
+        },
+        calendar : {
+            sameDay : '[དི་རིང] LT',
+            nextDay : '[སང་ཉིན] LT',
+            nextWeek : '[བདུན་ཕྲག་རྗེས་མ], LT',
+            lastDay : '[ཁ་སང] LT',
+            lastWeek : '[བདུན་ཕྲག་མཐའ་མ] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s ལ་',
+            past : '%s སྔན་ལ',
+            s : 'ལམ་སང',
+            ss : '%d སྐར་ཆ།',
+            m : 'སྐར་མ་གཅིག',
+            mm : '%d སྐར་མ',
+            h : 'ཆུ་ཚོད་གཅིག',
+            hh : '%d ཆུ་ཚོད',
+            d : 'ཉིན་གཅིག',
+            dd : '%d ཉིན་',
+            M : 'ཟླ་བ་གཅིག',
+            MM : '%d ཟླ་བ',
+            y : 'ལོ་གཅིག',
+            yy : '%d ལོ'
+        },
+        preparse: function (string) {
+            return string.replace(/[༡༢༣༤༥༦༧༨༩༠]/g, function (match) {
+                return numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            });
+        },
+        meridiemParse: /མཚན་མོ|ཞོགས་ཀས|ཉིན་གུང|དགོང་དག|མཚན་མོ/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if ((meridiem === 'མཚན་མོ' && hour >= 4) ||
+                    (meridiem === 'ཉིན་གུང' && hour < 5) ||
+                    meridiem === 'དགོང་དག') {
+                return hour + 12;
+            } else {
+                return hour;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'མཚན་མོ';
+            } else if (hour < 10) {
+                return 'ཞོགས་ཀས';
+            } else if (hour < 17) {
+                return 'ཉིན་གུང';
+            } else if (hour < 20) {
+                return 'དགོང་དག';
+            } else {
+                return 'མཚན་མོ';
+            }
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 1st is the first week of the year.
         }
-        if ((meridiem === 'མཚན་མོ' && hour >= 4) ||
-                (meridiem === 'ཉིན་གུང' && hour < 5) ||
-                meridiem === 'དགོང་དག') {
-            return hour + 12;
-        } else {
-            return hour;
-        }
-    },
-    meridiem : function (hour, minute, isLower) {
-        if (hour < 4) {
-            return 'མཚན་མོ';
-        } else if (hour < 10) {
-            return 'ཞོགས་ཀས';
-        } else if (hour < 17) {
-            return 'ཉིན་གུང';
-        } else if (hour < 20) {
-            return 'དགོང་དག';
-        } else {
-            return 'མཚན་མོ';
-        }
-    },
-    week : {
-        dow : 0, // Sunday is the first day of the week.
-        doy : 6  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    });
 
-return bo;
+    return bo;
 
 })));
diff --git a/lib/javascripts/moment_locale/br.js b/lib/javascripts/moment_locale/br.js
old mode 100644
new mode 100755
index 723306315c1..42994ca65b9
--- a/lib/javascripts/moment_locale/br.js
+++ b/lib/javascripts/moment_locale/br.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Breton [br]
-//! author : Jean-Baptiste Le Duigou : https://github.com/jbleduigou
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,99 +8,100 @@
 }(this, (function (moment) { 'use strict';
 
 
-function relativeTimeWithMutation(number, withoutSuffix, key) {
-    var format = {
-        'mm': 'munutenn',
-        'MM': 'miz',
-        'dd': 'devezh'
-    };
-    return number + ' ' + mutation(format[key], number);
-}
-function specialMutationForYears(number) {
-    switch (lastNumber(number)) {
-        case 1:
-        case 3:
-        case 4:
-        case 5:
-        case 9:
-            return number + ' bloaz';
-        default:
-            return number + ' vloaz';
+    function relativeTimeWithMutation(number, withoutSuffix, key) {
+        var format = {
+            'mm': 'munutenn',
+            'MM': 'miz',
+            'dd': 'devezh'
+        };
+        return number + ' ' + mutation(format[key], number);
     }
-}
-function lastNumber(number) {
-    if (number > 9) {
-        return lastNumber(number % 10);
+    function specialMutationForYears(number) {
+        switch (lastNumber(number)) {
+            case 1:
+            case 3:
+            case 4:
+            case 5:
+            case 9:
+                return number + ' bloaz';
+            default:
+                return number + ' vloaz';
+        }
     }
-    return number;
-}
-function mutation(text, number) {
-    if (number === 2) {
-        return softMutation(text);
+    function lastNumber(number) {
+        if (number > 9) {
+            return lastNumber(number % 10);
+        }
+        return number;
     }
-    return text;
-}
-function softMutation(text) {
-    var mutationTable = {
-        'm': 'v',
-        'b': 'v',
-        'd': 'z'
-    };
-    if (mutationTable[text.charAt(0)] === undefined) {
+    function mutation(text, number) {
+        if (number === 2) {
+            return softMutation(text);
+        }
         return text;
     }
-    return mutationTable[text.charAt(0)] + text.substring(1);
-}
-
-var br = moment.defineLocale('br', {
-    months : 'Genver_C\'hwevrer_Meurzh_Ebrel_Mae_Mezheven_Gouere_Eost_Gwengolo_Here_Du_Kerzu'.split('_'),
-    monthsShort : 'Gen_C\'hwe_Meu_Ebr_Mae_Eve_Gou_Eos_Gwe_Her_Du_Ker'.split('_'),
-    weekdays : 'Sul_Lun_Meurzh_Merc\'her_Yaou_Gwener_Sadorn'.split('_'),
-    weekdaysShort : 'Sul_Lun_Meu_Mer_Yao_Gwe_Sad'.split('_'),
-    weekdaysMin : 'Su_Lu_Me_Mer_Ya_Gw_Sa'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'h[e]mm A',
-        LTS : 'h[e]mm:ss A',
-        L : 'DD/MM/YYYY',
-        LL : 'D [a viz] MMMM YYYY',
-        LLL : 'D [a viz] MMMM YYYY h[e]mm A',
-        LLLL : 'dddd, D [a viz] MMMM YYYY h[e]mm A'
-    },
-    calendar : {
-        sameDay : '[Hiziv da] LT',
-        nextDay : '[Warc\'hoazh da] LT',
-        nextWeek : 'dddd [da] LT',
-        lastDay : '[Dec\'h da] LT',
-        lastWeek : 'dddd [paset da] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'a-benn %s',
-        past : '%s \'zo',
-        s : 'un nebeud segondennoù',
-        m : 'ur vunutenn',
-        mm : relativeTimeWithMutation,
-        h : 'un eur',
-        hh : '%d eur',
-        d : 'un devezh',
-        dd : relativeTimeWithMutation,
-        M : 'ur miz',
-        MM : relativeTimeWithMutation,
-        y : 'ur bloaz',
-        yy : specialMutationForYears
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}(añ|vet)/,
-    ordinal : function (number) {
-        var output = (number === 1) ? 'añ' : 'vet';
-        return number + output;
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    function softMutation(text) {
+        var mutationTable = {
+            'm': 'v',
+            'b': 'v',
+            'd': 'z'
+        };
+        if (mutationTable[text.charAt(0)] === undefined) {
+            return text;
+        }
+        return mutationTable[text.charAt(0)] + text.substring(1);
     }
-});
 
-return br;
+    var br = moment.defineLocale('br', {
+        months : 'Genver_C\'hwevrer_Meurzh_Ebrel_Mae_Mezheven_Gouere_Eost_Gwengolo_Here_Du_Kerzu'.split('_'),
+        monthsShort : 'Gen_C\'hwe_Meu_Ebr_Mae_Eve_Gou_Eos_Gwe_Her_Du_Ker'.split('_'),
+        weekdays : 'Sul_Lun_Meurzh_Merc\'her_Yaou_Gwener_Sadorn'.split('_'),
+        weekdaysShort : 'Sul_Lun_Meu_Mer_Yao_Gwe_Sad'.split('_'),
+        weekdaysMin : 'Su_Lu_Me_Mer_Ya_Gw_Sa'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'h[e]mm A',
+            LTS : 'h[e]mm:ss A',
+            L : 'DD/MM/YYYY',
+            LL : 'D [a viz] MMMM YYYY',
+            LLL : 'D [a viz] MMMM YYYY h[e]mm A',
+            LLLL : 'dddd, D [a viz] MMMM YYYY h[e]mm A'
+        },
+        calendar : {
+            sameDay : '[Hiziv da] LT',
+            nextDay : '[Warc\'hoazh da] LT',
+            nextWeek : 'dddd [da] LT',
+            lastDay : '[Dec\'h da] LT',
+            lastWeek : 'dddd [paset da] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'a-benn %s',
+            past : '%s \'zo',
+            s : 'un nebeud segondennoù',
+            ss : '%d eilenn',
+            m : 'ur vunutenn',
+            mm : relativeTimeWithMutation,
+            h : 'un eur',
+            hh : '%d eur',
+            d : 'un devezh',
+            dd : relativeTimeWithMutation,
+            M : 'ur miz',
+            MM : relativeTimeWithMutation,
+            y : 'ur bloaz',
+            yy : specialMutationForYears
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(añ|vet)/,
+        ordinal : function (number) {
+            var output = (number === 1) ? 'añ' : 'vet';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return br;
 
 })));
diff --git a/lib/javascripts/moment_locale/bs.js b/lib/javascripts/moment_locale/bs.js
old mode 100644
new mode 100755
index 760a7867033..0aaf0e1435d
--- a/lib/javascripts/moment_locale/bs.js
+++ b/lib/javascripts/moment_locale/bs.js
@@ -1,7 +1,4 @@
 //! moment.js locale configuration
-//! locale : Bosnian [bs]
-//! author : Nedim Cholich : https://github.com/frontyard
-//! based on (hr) translation by Bojan Marković
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -11,133 +8,143 @@
 }(this, (function (moment) { 'use strict';
 
 
-function translate(number, withoutSuffix, key) {
-    var result = number + ' ';
-    switch (key) {
-        case 'm':
-            return withoutSuffix ? 'jedna minuta' : 'jedne minute';
-        case 'mm':
-            if (number === 1) {
-                result += 'minuta';
-            } else if (number === 2 || number === 3 || number === 4) {
-                result += 'minute';
-            } else {
-                result += 'minuta';
-            }
-            return result;
-        case 'h':
-            return withoutSuffix ? 'jedan sat' : 'jednog sata';
-        case 'hh':
-            if (number === 1) {
-                result += 'sat';
-            } else if (number === 2 || number === 3 || number === 4) {
-                result += 'sata';
-            } else {
-                result += 'sati';
-            }
-            return result;
-        case 'dd':
-            if (number === 1) {
-                result += 'dan';
-            } else {
-                result += 'dana';
-            }
-            return result;
-        case 'MM':
-            if (number === 1) {
-                result += 'mjesec';
-            } else if (number === 2 || number === 3 || number === 4) {
-                result += 'mjeseca';
-            } else {
-                result += 'mjeseci';
-            }
-            return result;
-        case 'yy':
-            if (number === 1) {
-                result += 'godina';
-            } else if (number === 2 || number === 3 || number === 4) {
-                result += 'godine';
-            } else {
-                result += 'godina';
-            }
-            return result;
+    function translate(number, withoutSuffix, key) {
+        var result = number + ' ';
+        switch (key) {
+            case 'ss':
+                if (number === 1) {
+                    result += 'sekunda';
+                } else if (number === 2 || number === 3 || number === 4) {
+                    result += 'sekunde';
+                } else {
+                    result += 'sekundi';
+                }
+                return result;
+            case 'm':
+                return withoutSuffix ? 'jedna minuta' : 'jedne minute';
+            case 'mm':
+                if (number === 1) {
+                    result += 'minuta';
+                } else if (number === 2 || number === 3 || number === 4) {
+                    result += 'minute';
+                } else {
+                    result += 'minuta';
+                }
+                return result;
+            case 'h':
+                return withoutSuffix ? 'jedan sat' : 'jednog sata';
+            case 'hh':
+                if (number === 1) {
+                    result += 'sat';
+                } else if (number === 2 || number === 3 || number === 4) {
+                    result += 'sata';
+                } else {
+                    result += 'sati';
+                }
+                return result;
+            case 'dd':
+                if (number === 1) {
+                    result += 'dan';
+                } else {
+                    result += 'dana';
+                }
+                return result;
+            case 'MM':
+                if (number === 1) {
+                    result += 'mjesec';
+                } else if (number === 2 || number === 3 || number === 4) {
+                    result += 'mjeseca';
+                } else {
+                    result += 'mjeseci';
+                }
+                return result;
+            case 'yy':
+                if (number === 1) {
+                    result += 'godina';
+                } else if (number === 2 || number === 3 || number === 4) {
+                    result += 'godine';
+                } else {
+                    result += 'godina';
+                }
+                return result;
+        }
     }
-}
 
-var bs = moment.defineLocale('bs', {
-    months : 'januar_februar_mart_april_maj_juni_juli_august_septembar_oktobar_novembar_decembar'.split('_'),
-    monthsShort : 'jan._feb._mar._apr._maj._jun._jul._aug._sep._okt._nov._dec.'.split('_'),
-    monthsParseExact: true,
-    weekdays : 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'),
-    weekdaysShort : 'ned._pon._uto._sri._čet._pet._sub.'.split('_'),
-    weekdaysMin : 'ne_po_ut_sr_če_pe_su'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'H:mm',
-        LTS : 'H:mm:ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D. MMMM YYYY',
-        LLL : 'D. MMMM YYYY H:mm',
-        LLLL : 'dddd, D. MMMM YYYY H:mm'
-    },
-    calendar : {
-        sameDay  : '[danas u] LT',
-        nextDay  : '[sutra u] LT',
-        nextWeek : function () {
-            switch (this.day()) {
-                case 0:
-                    return '[u] [nedjelju] [u] LT';
-                case 3:
-                    return '[u] [srijedu] [u] LT';
-                case 6:
-                    return '[u] [subotu] [u] LT';
-                case 1:
-                case 2:
-                case 4:
-                case 5:
-                    return '[u] dddd [u] LT';
-            }
+    var bs = moment.defineLocale('bs', {
+        months : 'januar_februar_mart_april_maj_juni_juli_august_septembar_oktobar_novembar_decembar'.split('_'),
+        monthsShort : 'jan._feb._mar._apr._maj._jun._jul._aug._sep._okt._nov._dec.'.split('_'),
+        monthsParseExact: true,
+        weekdays : 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'),
+        weekdaysShort : 'ned._pon._uto._sri._čet._pet._sub.'.split('_'),
+        weekdaysMin : 'ne_po_ut_sr_če_pe_su'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY H:mm',
+            LLLL : 'dddd, D. MMMM YYYY H:mm'
         },
-        lastDay  : '[jučer u] LT',
-        lastWeek : function () {
-            switch (this.day()) {
-                case 0:
-                case 3:
-                    return '[prošlu] dddd [u] LT';
-                case 6:
-                    return '[prošle] [subote] [u] LT';
-                case 1:
-                case 2:
-                case 4:
-                case 5:
-                    return '[prošli] dddd [u] LT';
-            }
+        calendar : {
+            sameDay  : '[danas u] LT',
+            nextDay  : '[sutra u] LT',
+            nextWeek : function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[u] [nedjelju] [u] LT';
+                    case 3:
+                        return '[u] [srijedu] [u] LT';
+                    case 6:
+                        return '[u] [subotu] [u] LT';
+                    case 1:
+                    case 2:
+                    case 4:
+                    case 5:
+                        return '[u] dddd [u] LT';
+                }
+            },
+            lastDay  : '[jučer u] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                    case 0:
+                    case 3:
+                        return '[prošlu] dddd [u] LT';
+                    case 6:
+                        return '[prošle] [subote] [u] LT';
+                    case 1:
+                    case 2:
+                    case 4:
+                    case 5:
+                        return '[prošli] dddd [u] LT';
+                }
+            },
+            sameElse : 'L'
         },
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'za %s',
-        past   : 'prije %s',
-        s      : 'par sekundi',
-        m      : translate,
-        mm     : translate,
-        h      : translate,
-        hh     : translate,
-        d      : 'dan',
-        dd     : translate,
-        M      : 'mjesec',
-        MM     : translate,
-        y      : 'godinu',
-        yy     : translate
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+        relativeTime : {
+            future : 'za %s',
+            past   : 'prije %s',
+            s      : 'par sekundi',
+            ss     : translate,
+            m      : translate,
+            mm     : translate,
+            h      : translate,
+            hh     : translate,
+            d      : 'dan',
+            dd     : translate,
+            M      : 'mjesec',
+            MM     : translate,
+            y      : 'godinu',
+            yy     : translate
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
 
-return bs;
+    return bs;
 
 })));
diff --git a/lib/javascripts/moment_locale/ca.js b/lib/javascripts/moment_locale/ca.js
old mode 100644
new mode 100755
index bc490a240d2..9a823b93778
--- a/lib/javascripts/moment_locale/ca.js
+++ b/lib/javascripts/moment_locale/ca.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Catalan [ca]
-//! author : Juan G. Hurtado : https://github.com/juanghurtado
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,79 +8,80 @@
 }(this, (function (moment) { 'use strict';
 
 
-var ca = moment.defineLocale('ca', {
-    months : {
-        standalone: 'gener_febrer_març_abril_maig_juny_juliol_agost_setembre_octubre_novembre_desembre'.split('_'),
-        format: 'de gener_de febrer_de març_d\'abril_de maig_de juny_de juliol_d\'agost_de setembre_d\'octubre_de novembre_de desembre'.split('_'),
-        isFormat: /D[oD]?(\s)+MMMM/
-    },
-    monthsShort : 'gen._febr._març_abr._maig_juny_jul._ag._set._oct._nov._des.'.split('_'),
-    monthsParseExact : true,
-    weekdays : 'diumenge_dilluns_dimarts_dimecres_dijous_divendres_dissabte'.split('_'),
-    weekdaysShort : 'dg._dl._dt._dc._dj._dv._ds.'.split('_'),
-    weekdaysMin : 'Dg_Dl_Dt_Dc_Dj_Dv_Ds'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'H:mm',
-        LTS : 'H:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : '[el] D MMMM [de] YYYY',
-        ll : 'D MMM YYYY',
-        LLL : '[el] D MMMM [de] YYYY [a les] H:mm',
-        lll : 'D MMM YYYY, H:mm',
-        LLLL : '[el] dddd D MMMM [de] YYYY [a les] H:mm',
-        llll : 'ddd D MMM YYYY, H:mm'
-    },
-    calendar : {
-        sameDay : function () {
-            return '[avui a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+    var ca = moment.defineLocale('ca', {
+        months : {
+            standalone: 'gener_febrer_març_abril_maig_juny_juliol_agost_setembre_octubre_novembre_desembre'.split('_'),
+            format: 'de gener_de febrer_de març_d\'abril_de maig_de juny_de juliol_d\'agost_de setembre_d\'octubre_de novembre_de desembre'.split('_'),
+            isFormat: /D[oD]?(\s)+MMMM/
         },
-        nextDay : function () {
-            return '[demà a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+        monthsShort : 'gen._febr._març_abr._maig_juny_jul._ag._set._oct._nov._des.'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'diumenge_dilluns_dimarts_dimecres_dijous_divendres_dissabte'.split('_'),
+        weekdaysShort : 'dg._dl._dt._dc._dj._dv._ds.'.split('_'),
+        weekdaysMin : 'dg_dl_dt_dc_dj_dv_ds'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM [de] YYYY',
+            ll : 'D MMM YYYY',
+            LLL : 'D MMMM [de] YYYY [a les] H:mm',
+            lll : 'D MMM YYYY, H:mm',
+            LLLL : 'dddd D MMMM [de] YYYY [a les] H:mm',
+            llll : 'ddd D MMM YYYY, H:mm'
         },
-        nextWeek : function () {
-            return 'dddd [a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+        calendar : {
+            sameDay : function () {
+                return '[avui a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+            },
+            nextDay : function () {
+                return '[demà a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+            },
+            nextWeek : function () {
+                return 'dddd [a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+            },
+            lastDay : function () {
+                return '[ahir a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+            },
+            lastWeek : function () {
+                return '[el] dddd [passat a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+            },
+            sameElse : 'L'
         },
-        lastDay : function () {
-            return '[ahir a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+        relativeTime : {
+            future : 'd\'aquí %s',
+            past : 'fa %s',
+            s : 'uns segons',
+            ss : '%d segons',
+            m : 'un minut',
+            mm : '%d minuts',
+            h : 'una hora',
+            hh : '%d hores',
+            d : 'un dia',
+            dd : '%d dies',
+            M : 'un mes',
+            MM : '%d mesos',
+            y : 'un any',
+            yy : '%d anys'
         },
-        lastWeek : function () {
-            return '[el] dddd [passat a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+        dayOfMonthOrdinalParse: /\d{1,2}(r|n|t|è|a)/,
+        ordinal : function (number, period) {
+            var output = (number === 1) ? 'r' :
+                (number === 2) ? 'n' :
+                (number === 3) ? 'r' :
+                (number === 4) ? 't' : 'è';
+            if (period === 'w' || period === 'W') {
+                output = 'a';
+            }
+            return number + output;
         },
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'd\'aquí %s',
-        past : 'fa %s',
-        s : 'uns segons',
-        m : 'un minut',
-        mm : '%d minuts',
-        h : 'una hora',
-        hh : '%d hores',
-        d : 'un dia',
-        dd : '%d dies',
-        M : 'un mes',
-        MM : '%d mesos',
-        y : 'un any',
-        yy : '%d anys'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}(r|n|t|è|a)/,
-    ordinal : function (number, period) {
-        var output = (number === 1) ? 'r' :
-            (number === 2) ? 'n' :
-            (number === 3) ? 'r' :
-            (number === 4) ? 't' : 'è';
-        if (period === 'w' || period === 'W') {
-            output = 'a';
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
-        return number + output;
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    });
 
-return ca;
+    return ca;
 
 })));
diff --git a/lib/javascripts/moment_locale/cs.js b/lib/javascripts/moment_locale/cs.js
old mode 100644
new mode 100755
index 952dc49ed5a..5ae9b627b8e
--- a/lib/javascripts/moment_locale/cs.js
+++ b/lib/javascripts/moment_locale/cs.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Czech [cs]
-//! author : petrbela : https://github.com/petrbela
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,163 +8,171 @@
 }(this, (function (moment) { 'use strict';
 
 
-var months = 'leden_únor_březen_duben_květen_červen_červenec_srpen_září_říjen_listopad_prosinec'.split('_');
-var monthsShort = 'led_úno_bře_dub_kvě_čvn_čvc_srp_zář_říj_lis_pro'.split('_');
-function plural(n) {
-    return (n > 1) && (n < 5) && (~~(n / 10) !== 1);
-}
-function translate(number, withoutSuffix, key, isFuture) {
-    var result = number + ' ';
-    switch (key) {
-        case 's':  // a few seconds / in a few seconds / a few seconds ago
-            return (withoutSuffix || isFuture) ? 'pár sekund' : 'pár sekundami';
-        case 'm':  // a minute / in a minute / a minute ago
-            return withoutSuffix ? 'minuta' : (isFuture ? 'minutu' : 'minutou');
-        case 'mm': // 9 minutes / in 9 minutes / 9 minutes ago
-            if (withoutSuffix || isFuture) {
-                return result + (plural(number) ? 'minuty' : 'minut');
-            } else {
-                return result + 'minutami';
-            }
-            break;
-        case 'h':  // an hour / in an hour / an hour ago
-            return withoutSuffix ? 'hodina' : (isFuture ? 'hodinu' : 'hodinou');
-        case 'hh': // 9 hours / in 9 hours / 9 hours ago
-            if (withoutSuffix || isFuture) {
-                return result + (plural(number) ? 'hodiny' : 'hodin');
-            } else {
-                return result + 'hodinami';
-            }
-            break;
-        case 'd':  // a day / in a day / a day ago
-            return (withoutSuffix || isFuture) ? 'den' : 'dnem';
-        case 'dd': // 9 days / in 9 days / 9 days ago
-            if (withoutSuffix || isFuture) {
-                return result + (plural(number) ? 'dny' : 'dní');
-            } else {
-                return result + 'dny';
-            }
-            break;
-        case 'M':  // a month / in a month / a month ago
-            return (withoutSuffix || isFuture) ? 'měsíc' : 'měsícem';
-        case 'MM': // 9 months / in 9 months / 9 months ago
-            if (withoutSuffix || isFuture) {
-                return result + (plural(number) ? 'měsíce' : 'měsíců');
-            } else {
-                return result + 'měsíci';
-            }
-            break;
-        case 'y':  // a year / in a year / a year ago
-            return (withoutSuffix || isFuture) ? 'rok' : 'rokem';
-        case 'yy': // 9 years / in 9 years / 9 years ago
-            if (withoutSuffix || isFuture) {
-                return result + (plural(number) ? 'roky' : 'let');
-            } else {
-                return result + 'lety';
-            }
-            break;
+    var months = 'leden_únor_březen_duben_květen_červen_červenec_srpen_září_říjen_listopad_prosinec'.split('_'),
+        monthsShort = 'led_úno_bře_dub_kvě_čvn_čvc_srp_zář_říj_lis_pro'.split('_');
+    function plural(n) {
+        return (n > 1) && (n < 5) && (~~(n / 10) !== 1);
     }
-}
-
-var cs = moment.defineLocale('cs', {
-    months : months,
-    monthsShort : monthsShort,
-    monthsParse : (function (months, monthsShort) {
-        var i, _monthsParse = [];
-        for (i = 0; i < 12; i++) {
-            // use custom parser to solve problem with July (červenec)
-            _monthsParse[i] = new RegExp('^' + months[i] + '$|^' + monthsShort[i] + '$', 'i');
+    function translate(number, withoutSuffix, key, isFuture) {
+        var result = number + ' ';
+        switch (key) {
+            case 's':  // a few seconds / in a few seconds / a few seconds ago
+                return (withoutSuffix || isFuture) ? 'pár sekund' : 'pár sekundami';
+            case 'ss': // 9 seconds / in 9 seconds / 9 seconds ago
+                if (withoutSuffix || isFuture) {
+                    return result + (plural(number) ? 'sekundy' : 'sekund');
+                } else {
+                    return result + 'sekundami';
+                }
+                break;
+            case 'm':  // a minute / in a minute / a minute ago
+                return withoutSuffix ? 'minuta' : (isFuture ? 'minutu' : 'minutou');
+            case 'mm': // 9 minutes / in 9 minutes / 9 minutes ago
+                if (withoutSuffix || isFuture) {
+                    return result + (plural(number) ? 'minuty' : 'minut');
+                } else {
+                    return result + 'minutami';
+                }
+                break;
+            case 'h':  // an hour / in an hour / an hour ago
+                return withoutSuffix ? 'hodina' : (isFuture ? 'hodinu' : 'hodinou');
+            case 'hh': // 9 hours / in 9 hours / 9 hours ago
+                if (withoutSuffix || isFuture) {
+                    return result + (plural(number) ? 'hodiny' : 'hodin');
+                } else {
+                    return result + 'hodinami';
+                }
+                break;
+            case 'd':  // a day / in a day / a day ago
+                return (withoutSuffix || isFuture) ? 'den' : 'dnem';
+            case 'dd': // 9 days / in 9 days / 9 days ago
+                if (withoutSuffix || isFuture) {
+                    return result + (plural(number) ? 'dny' : 'dní');
+                } else {
+                    return result + 'dny';
+                }
+                break;
+            case 'M':  // a month / in a month / a month ago
+                return (withoutSuffix || isFuture) ? 'měsíc' : 'měsícem';
+            case 'MM': // 9 months / in 9 months / 9 months ago
+                if (withoutSuffix || isFuture) {
+                    return result + (plural(number) ? 'měsíce' : 'měsíců');
+                } else {
+                    return result + 'měsíci';
+                }
+                break;
+            case 'y':  // a year / in a year / a year ago
+                return (withoutSuffix || isFuture) ? 'rok' : 'rokem';
+            case 'yy': // 9 years / in 9 years / 9 years ago
+                if (withoutSuffix || isFuture) {
+                    return result + (plural(number) ? 'roky' : 'let');
+                } else {
+                    return result + 'lety';
+                }
+                break;
         }
-        return _monthsParse;
-    }(months, monthsShort)),
-    shortMonthsParse : (function (monthsShort) {
-        var i, _shortMonthsParse = [];
-        for (i = 0; i < 12; i++) {
-            _shortMonthsParse[i] = new RegExp('^' + monthsShort[i] + '$', 'i');
-        }
-        return _shortMonthsParse;
-    }(monthsShort)),
-    longMonthsParse : (function (months) {
-        var i, _longMonthsParse = [];
-        for (i = 0; i < 12; i++) {
-            _longMonthsParse[i] = new RegExp('^' + months[i] + '$', 'i');
-        }
-        return _longMonthsParse;
-    }(months)),
-    weekdays : 'neděle_pondělí_úterý_středa_čtvrtek_pátek_sobota'.split('_'),
-    weekdaysShort : 'ne_po_út_st_čt_pá_so'.split('_'),
-    weekdaysMin : 'ne_po_út_st_čt_pá_so'.split('_'),
-    longDateFormat : {
-        LT: 'H:mm',
-        LTS : 'H:mm:ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D. MMMM YYYY',
-        LLL : 'D. MMMM YYYY H:mm',
-        LLLL : 'dddd D. MMMM YYYY H:mm',
-        l : 'D. M. YYYY'
-    },
-    calendar : {
-        sameDay: '[dnes v] LT',
-        nextDay: '[zítra v] LT',
-        nextWeek: function () {
-            switch (this.day()) {
-                case 0:
-                    return '[v neděli v] LT';
-                case 1:
-                case 2:
-                    return '[v] dddd [v] LT';
-                case 3:
-                    return '[ve středu v] LT';
-                case 4:
-                    return '[ve čtvrtek v] LT';
-                case 5:
-                    return '[v pátek v] LT';
-                case 6:
-                    return '[v sobotu v] LT';
-            }
-        },
-        lastDay: '[včera v] LT',
-        lastWeek: function () {
-            switch (this.day()) {
-                case 0:
-                    return '[minulou neděli v] LT';
-                case 1:
-                case 2:
-                    return '[minulé] dddd [v] LT';
-                case 3:
-                    return '[minulou středu v] LT';
-                case 4:
-                case 5:
-                    return '[minulý] dddd [v] LT';
-                case 6:
-                    return '[minulou sobotu v] LT';
-            }
-        },
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'za %s',
-        past : 'před %s',
-        s : translate,
-        m : translate,
-        mm : translate,
-        h : translate,
-        hh : translate,
-        d : translate,
-        dd : translate,
-        M : translate,
-        MM : translate,
-        y : translate,
-        yy : translate
-    },
-    dayOfMonthOrdinalParse : /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
     }
-});
 
-return cs;
+    var cs = moment.defineLocale('cs', {
+        months : months,
+        monthsShort : monthsShort,
+        monthsParse : (function (months, monthsShort) {
+            var i, _monthsParse = [];
+            for (i = 0; i < 12; i++) {
+                // use custom parser to solve problem with July (červenec)
+                _monthsParse[i] = new RegExp('^' + months[i] + '$|^' + monthsShort[i] + '$', 'i');
+            }
+            return _monthsParse;
+        }(months, monthsShort)),
+        shortMonthsParse : (function (monthsShort) {
+            var i, _shortMonthsParse = [];
+            for (i = 0; i < 12; i++) {
+                _shortMonthsParse[i] = new RegExp('^' + monthsShort[i] + '$', 'i');
+            }
+            return _shortMonthsParse;
+        }(monthsShort)),
+        longMonthsParse : (function (months) {
+            var i, _longMonthsParse = [];
+            for (i = 0; i < 12; i++) {
+                _longMonthsParse[i] = new RegExp('^' + months[i] + '$', 'i');
+            }
+            return _longMonthsParse;
+        }(months)),
+        weekdays : 'neděle_pondělí_úterý_středa_čtvrtek_pátek_sobota'.split('_'),
+        weekdaysShort : 'ne_po_út_st_čt_pá_so'.split('_'),
+        weekdaysMin : 'ne_po_út_st_čt_pá_so'.split('_'),
+        longDateFormat : {
+            LT: 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY H:mm',
+            LLLL : 'dddd D. MMMM YYYY H:mm',
+            l : 'D. M. YYYY'
+        },
+        calendar : {
+            sameDay: '[dnes v] LT',
+            nextDay: '[zítra v] LT',
+            nextWeek: function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[v neděli v] LT';
+                    case 1:
+                    case 2:
+                        return '[v] dddd [v] LT';
+                    case 3:
+                        return '[ve středu v] LT';
+                    case 4:
+                        return '[ve čtvrtek v] LT';
+                    case 5:
+                        return '[v pátek v] LT';
+                    case 6:
+                        return '[v sobotu v] LT';
+                }
+            },
+            lastDay: '[včera v] LT',
+            lastWeek: function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[minulou neděli v] LT';
+                    case 1:
+                    case 2:
+                        return '[minulé] dddd [v] LT';
+                    case 3:
+                        return '[minulou středu v] LT';
+                    case 4:
+                    case 5:
+                        return '[minulý] dddd [v] LT';
+                    case 6:
+                        return '[minulou sobotu v] LT';
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past : 'před %s',
+            s : translate,
+            ss : translate,
+            m : translate,
+            mm : translate,
+            h : translate,
+            hh : translate,
+            d : translate,
+            dd : translate,
+            M : translate,
+            MM : translate,
+            y : translate,
+            yy : translate
+        },
+        dayOfMonthOrdinalParse : /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return cs;
 
 })));
diff --git a/lib/javascripts/moment_locale/cv.js b/lib/javascripts/moment_locale/cv.js
old mode 100644
new mode 100755
index 6d207798405..9b99c3c4f98
--- a/lib/javascripts/moment_locale/cv.js
+++ b/lib/javascripts/moment_locale/cv.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Chuvash [cv]
-//! author : Anatoly Mironov : https://github.com/mirontoli
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,54 +8,55 @@
 }(this, (function (moment) { 'use strict';
 
 
-var cv = moment.defineLocale('cv', {
-    months : 'кӑрлач_нарӑс_пуш_ака_май_ҫӗртме_утӑ_ҫурла_авӑн_юпа_чӳк_раштав'.split('_'),
-    monthsShort : 'кӑр_нар_пуш_ака_май_ҫӗр_утӑ_ҫур_авн_юпа_чӳк_раш'.split('_'),
-    weekdays : 'вырсарникун_тунтикун_ытларикун_юнкун_кӗҫнерникун_эрнекун_шӑматкун'.split('_'),
-    weekdaysShort : 'выр_тун_ытл_юн_кӗҫ_эрн_шӑм'.split('_'),
-    weekdaysMin : 'вр_тн_ыт_юн_кҫ_эр_шм'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD-MM-YYYY',
-        LL : 'YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ]',
-        LLL : 'YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], HH:mm',
-        LLLL : 'dddd, YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], HH:mm'
-    },
-    calendar : {
-        sameDay: '[Паян] LT [сехетре]',
-        nextDay: '[Ыран] LT [сехетре]',
-        lastDay: '[Ӗнер] LT [сехетре]',
-        nextWeek: '[Ҫитес] dddd LT [сехетре]',
-        lastWeek: '[Иртнӗ] dddd LT [сехетре]',
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : function (output) {
-            var affix = /сехет$/i.exec(output) ? 'рен' : /ҫул$/i.exec(output) ? 'тан' : 'ран';
-            return output + affix;
+    var cv = moment.defineLocale('cv', {
+        months : 'кӑрлач_нарӑс_пуш_ака_май_ҫӗртме_утӑ_ҫурла_авӑн_юпа_чӳк_раштав'.split('_'),
+        monthsShort : 'кӑр_нар_пуш_ака_май_ҫӗр_утӑ_ҫур_авн_юпа_чӳк_раш'.split('_'),
+        weekdays : 'вырсарникун_тунтикун_ытларикун_юнкун_кӗҫнерникун_эрнекун_шӑматкун'.split('_'),
+        weekdaysShort : 'выр_тун_ытл_юн_кӗҫ_эрн_шӑм'.split('_'),
+        weekdaysMin : 'вр_тн_ыт_юн_кҫ_эр_шм'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD-MM-YYYY',
+            LL : 'YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ]',
+            LLL : 'YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], HH:mm',
+            LLLL : 'dddd, YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], HH:mm'
         },
-        past : '%s каялла',
-        s : 'пӗр-ик ҫеккунт',
-        m : 'пӗр минут',
-        mm : '%d минут',
-        h : 'пӗр сехет',
-        hh : '%d сехет',
-        d : 'пӗр кун',
-        dd : '%d кун',
-        M : 'пӗр уйӑх',
-        MM : '%d уйӑх',
-        y : 'пӗр ҫул',
-        yy : '%d ҫул'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}-мӗш/,
-    ordinal : '%d-мӗш',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+        calendar : {
+            sameDay: '[Паян] LT [сехетре]',
+            nextDay: '[Ыран] LT [сехетре]',
+            lastDay: '[Ӗнер] LT [сехетре]',
+            nextWeek: '[Ҫитес] dddd LT [сехетре]',
+            lastWeek: '[Иртнӗ] dddd LT [сехетре]',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : function (output) {
+                var affix = /сехет$/i.exec(output) ? 'рен' : /ҫул$/i.exec(output) ? 'тан' : 'ран';
+                return output + affix;
+            },
+            past : '%s каялла',
+            s : 'пӗр-ик ҫеккунт',
+            ss : '%d ҫеккунт',
+            m : 'пӗр минут',
+            mm : '%d минут',
+            h : 'пӗр сехет',
+            hh : '%d сехет',
+            d : 'пӗр кун',
+            dd : '%d кун',
+            M : 'пӗр уйӑх',
+            MM : '%d уйӑх',
+            y : 'пӗр ҫул',
+            yy : '%d ҫул'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}-мӗш/,
+        ordinal : '%d-мӗш',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
 
-return cv;
+    return cv;
 
 })));
diff --git a/lib/javascripts/moment_locale/cy.js b/lib/javascripts/moment_locale/cy.js
old mode 100644
new mode 100755
index c570c22760f..84cbd463edc
--- a/lib/javascripts/moment_locale/cy.js
+++ b/lib/javascripts/moment_locale/cy.js
@@ -1,7 +1,4 @@
 //! moment.js locale configuration
-//! locale : Welsh [cy]
-//! author : Robert Allen : https://github.com/robgallen
-//! author : https://github.com/ryangreaves
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -11,71 +8,72 @@
 }(this, (function (moment) { 'use strict';
 
 
-var cy = moment.defineLocale('cy', {
-    months: 'Ionawr_Chwefror_Mawrth_Ebrill_Mai_Mehefin_Gorffennaf_Awst_Medi_Hydref_Tachwedd_Rhagfyr'.split('_'),
-    monthsShort: 'Ion_Chwe_Maw_Ebr_Mai_Meh_Gor_Aws_Med_Hyd_Tach_Rhag'.split('_'),
-    weekdays: 'Dydd Sul_Dydd Llun_Dydd Mawrth_Dydd Mercher_Dydd Iau_Dydd Gwener_Dydd Sadwrn'.split('_'),
-    weekdaysShort: 'Sul_Llun_Maw_Mer_Iau_Gwe_Sad'.split('_'),
-    weekdaysMin: 'Su_Ll_Ma_Me_Ia_Gw_Sa'.split('_'),
-    weekdaysParseExact : true,
-    // time formats are the same as en-gb
-    longDateFormat: {
-        LT: 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L: 'DD/MM/YYYY',
-        LL: 'D MMMM YYYY',
-        LLL: 'D MMMM YYYY HH:mm',
-        LLLL: 'dddd, D MMMM YYYY HH:mm'
-    },
-    calendar: {
-        sameDay: '[Heddiw am] LT',
-        nextDay: '[Yfory am] LT',
-        nextWeek: 'dddd [am] LT',
-        lastDay: '[Ddoe am] LT',
-        lastWeek: 'dddd [diwethaf am] LT',
-        sameElse: 'L'
-    },
-    relativeTime: {
-        future: 'mewn %s',
-        past: '%s yn ôl',
-        s: 'ychydig eiliadau',
-        m: 'munud',
-        mm: '%d munud',
-        h: 'awr',
-        hh: '%d awr',
-        d: 'diwrnod',
-        dd: '%d diwrnod',
-        M: 'mis',
-        MM: '%d mis',
-        y: 'blwyddyn',
-        yy: '%d flynedd'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}(fed|ain|af|il|ydd|ed|eg)/,
-    // traditional ordinal numbers above 31 are not commonly used in colloquial Welsh
-    ordinal: function (number) {
-        var b = number,
-            output = '',
-            lookup = [
-                '', 'af', 'il', 'ydd', 'ydd', 'ed', 'ed', 'ed', 'fed', 'fed', 'fed', // 1af to 10fed
-                'eg', 'fed', 'eg', 'eg', 'fed', 'eg', 'eg', 'fed', 'eg', 'fed' // 11eg to 20fed
-            ];
-        if (b > 20) {
-            if (b === 40 || b === 50 || b === 60 || b === 80 || b === 100) {
-                output = 'fed'; // not 30ain, 70ain or 90ain
-            } else {
-                output = 'ain';
+    var cy = moment.defineLocale('cy', {
+        months: 'Ionawr_Chwefror_Mawrth_Ebrill_Mai_Mehefin_Gorffennaf_Awst_Medi_Hydref_Tachwedd_Rhagfyr'.split('_'),
+        monthsShort: 'Ion_Chwe_Maw_Ebr_Mai_Meh_Gor_Aws_Med_Hyd_Tach_Rhag'.split('_'),
+        weekdays: 'Dydd Sul_Dydd Llun_Dydd Mawrth_Dydd Mercher_Dydd Iau_Dydd Gwener_Dydd Sadwrn'.split('_'),
+        weekdaysShort: 'Sul_Llun_Maw_Mer_Iau_Gwe_Sad'.split('_'),
+        weekdaysMin: 'Su_Ll_Ma_Me_Ia_Gw_Sa'.split('_'),
+        weekdaysParseExact : true,
+        // time formats are the same as en-gb
+        longDateFormat: {
+            LT: 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L: 'DD/MM/YYYY',
+            LL: 'D MMMM YYYY',
+            LLL: 'D MMMM YYYY HH:mm',
+            LLLL: 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar: {
+            sameDay: '[Heddiw am] LT',
+            nextDay: '[Yfory am] LT',
+            nextWeek: 'dddd [am] LT',
+            lastDay: '[Ddoe am] LT',
+            lastWeek: 'dddd [diwethaf am] LT',
+            sameElse: 'L'
+        },
+        relativeTime: {
+            future: 'mewn %s',
+            past: '%s yn ôl',
+            s: 'ychydig eiliadau',
+            ss: '%d eiliad',
+            m: 'munud',
+            mm: '%d munud',
+            h: 'awr',
+            hh: '%d awr',
+            d: 'diwrnod',
+            dd: '%d diwrnod',
+            M: 'mis',
+            MM: '%d mis',
+            y: 'blwyddyn',
+            yy: '%d flynedd'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(fed|ain|af|il|ydd|ed|eg)/,
+        // traditional ordinal numbers above 31 are not commonly used in colloquial Welsh
+        ordinal: function (number) {
+            var b = number,
+                output = '',
+                lookup = [
+                    '', 'af', 'il', 'ydd', 'ydd', 'ed', 'ed', 'ed', 'fed', 'fed', 'fed', // 1af to 10fed
+                    'eg', 'fed', 'eg', 'eg', 'fed', 'eg', 'eg', 'fed', 'eg', 'fed' // 11eg to 20fed
+                ];
+            if (b > 20) {
+                if (b === 40 || b === 50 || b === 60 || b === 80 || b === 100) {
+                    output = 'fed'; // not 30ain, 70ain or 90ain
+                } else {
+                    output = 'ain';
+                }
+            } else if (b > 0) {
+                output = lookup[b];
             }
-        } else if (b > 0) {
-            output = lookup[b];
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
-        return number + output;
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    });
 
-return cy;
+    return cy;
 
 })));
diff --git a/lib/javascripts/moment_locale/da.js b/lib/javascripts/moment_locale/da.js
old mode 100644
new mode 100755
index 357d8706970..22a1a5b9993
--- a/lib/javascripts/moment_locale/da.js
+++ b/lib/javascripts/moment_locale/da.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Danish [da]
-//! author : Ulrik Nielsen : https://github.com/mrbase
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,51 +8,52 @@
 }(this, (function (moment) { 'use strict';
 
 
-var da = moment.defineLocale('da', {
-    months : 'januar_februar_marts_april_maj_juni_juli_august_september_oktober_november_december'.split('_'),
-    monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),
-    weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),
-    weekdaysShort : 'søn_man_tir_ons_tor_fre_lør'.split('_'),
-    weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D. MMMM YYYY',
-        LLL : 'D. MMMM YYYY HH:mm',
-        LLLL : 'dddd [d.] D. MMMM YYYY [kl.] HH:mm'
-    },
-    calendar : {
-        sameDay : '[i dag kl.] LT',
-        nextDay : '[i morgen kl.] LT',
-        nextWeek : 'på dddd [kl.] LT',
-        lastDay : '[i går kl.] LT',
-        lastWeek : '[i] dddd[s kl.] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'om %s',
-        past : '%s siden',
-        s : 'få sekunder',
-        m : 'et minut',
-        mm : '%d minutter',
-        h : 'en time',
-        hh : '%d timer',
-        d : 'en dag',
-        dd : '%d dage',
-        M : 'en måned',
-        MM : '%d måneder',
-        y : 'et år',
-        yy : '%d år'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    var da = moment.defineLocale('da', {
+        months : 'januar_februar_marts_april_maj_juni_juli_august_september_oktober_november_december'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),
+        weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),
+        weekdaysShort : 'søn_man_tir_ons_tor_fre_lør'.split('_'),
+        weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY HH:mm',
+            LLLL : 'dddd [d.] D. MMMM YYYY [kl.] HH:mm'
+        },
+        calendar : {
+            sameDay : '[i dag kl.] LT',
+            nextDay : '[i morgen kl.] LT',
+            nextWeek : 'på dddd [kl.] LT',
+            lastDay : '[i går kl.] LT',
+            lastWeek : '[i] dddd[s kl.] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'om %s',
+            past : '%s siden',
+            s : 'få sekunder',
+            ss : '%d sekunder',
+            m : 'et minut',
+            mm : '%d minutter',
+            h : 'en time',
+            hh : '%d timer',
+            d : 'en dag',
+            dd : '%d dage',
+            M : 'en måned',
+            MM : '%d måneder',
+            y : 'et år',
+            yy : '%d år'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-return da;
+    return da;
 
 })));
diff --git a/lib/javascripts/moment_locale/de-at.js b/lib/javascripts/moment_locale/de-at.js
old mode 100644
new mode 100755
index aee7b8cb72c..e3ac47b424f
--- a/lib/javascripts/moment_locale/de-at.js
+++ b/lib/javascripts/moment_locale/de-at.js
@@ -1,9 +1,4 @@
 //! moment.js locale configuration
-//! locale : German (Austria) [de-at]
-//! author : lluchs : https://github.com/lluchs
-//! author: Menelion Elensúle: https://github.com/Oire
-//! author : Martin Groller : https://github.com/MadMG
-//! author : Mikolaj Dadela : https://github.com/mik01aj
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -13,67 +8,68 @@
 }(this, (function (moment) { 'use strict';
 
 
-function processRelativeTime(number, withoutSuffix, key, isFuture) {
-    var format = {
-        'm': ['eine Minute', 'einer Minute'],
-        'h': ['eine Stunde', 'einer Stunde'],
-        'd': ['ein Tag', 'einem Tag'],
-        'dd': [number + ' Tage', number + ' Tagen'],
-        'M': ['ein Monat', 'einem Monat'],
-        'MM': [number + ' Monate', number + ' Monaten'],
-        'y': ['ein Jahr', 'einem Jahr'],
-        'yy': [number + ' Jahre', number + ' Jahren']
-    };
-    return withoutSuffix ? format[key][0] : format[key][1];
-}
-
-var deAt = moment.defineLocale('de-at', {
-    months : 'Jänner_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
-    monthsShort : 'Jän._Febr._Mrz._Apr._Mai_Jun._Jul._Aug._Sept._Okt._Nov._Dez.'.split('_'),
-    monthsParseExact : true,
-    weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
-    weekdaysShort : 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'),
-    weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT: 'HH:mm',
-        LTS: 'HH:mm:ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D. MMMM YYYY',
-        LLL : 'D. MMMM YYYY HH:mm',
-        LLLL : 'dddd, D. MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay: '[heute um] LT [Uhr]',
-        sameElse: 'L',
-        nextDay: '[morgen um] LT [Uhr]',
-        nextWeek: 'dddd [um] LT [Uhr]',
-        lastDay: '[gestern um] LT [Uhr]',
-        lastWeek: '[letzten] dddd [um] LT [Uhr]'
-    },
-    relativeTime : {
-        future : 'in %s',
-        past : 'vor %s',
-        s : 'ein paar Sekunden',
-        m : processRelativeTime,
-        mm : '%d Minuten',
-        h : processRelativeTime,
-        hh : '%d Stunden',
-        d : processRelativeTime,
-        dd : processRelativeTime,
-        M : processRelativeTime,
-        MM : processRelativeTime,
-        y : processRelativeTime,
-        yy : processRelativeTime
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var format = {
+            'm': ['eine Minute', 'einer Minute'],
+            'h': ['eine Stunde', 'einer Stunde'],
+            'd': ['ein Tag', 'einem Tag'],
+            'dd': [number + ' Tage', number + ' Tagen'],
+            'M': ['ein Monat', 'einem Monat'],
+            'MM': [number + ' Monate', number + ' Monaten'],
+            'y': ['ein Jahr', 'einem Jahr'],
+            'yy': [number + ' Jahre', number + ' Jahren']
+        };
+        return withoutSuffix ? format[key][0] : format[key][1];
     }
-});
 
-return deAt;
+    var deAt = moment.defineLocale('de-at', {
+        months : 'Jänner_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
+        monthsShort : 'Jän._Feb._März_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
+        weekdaysShort : 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'),
+        weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT: 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY HH:mm',
+            LLLL : 'dddd, D. MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[heute um] LT [Uhr]',
+            sameElse: 'L',
+            nextDay: '[morgen um] LT [Uhr]',
+            nextWeek: 'dddd [um] LT [Uhr]',
+            lastDay: '[gestern um] LT [Uhr]',
+            lastWeek: '[letzten] dddd [um] LT [Uhr]'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : 'vor %s',
+            s : 'ein paar Sekunden',
+            ss : '%d Sekunden',
+            m : processRelativeTime,
+            mm : '%d Minuten',
+            h : processRelativeTime,
+            hh : '%d Stunden',
+            d : processRelativeTime,
+            dd : processRelativeTime,
+            M : processRelativeTime,
+            MM : processRelativeTime,
+            y : processRelativeTime,
+            yy : processRelativeTime
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return deAt;
 
 })));
diff --git a/lib/javascripts/moment_locale/de-ch.js b/lib/javascripts/moment_locale/de-ch.js
old mode 100644
new mode 100755
index e70f5e99f97..2676afbc793
--- a/lib/javascripts/moment_locale/de-ch.js
+++ b/lib/javascripts/moment_locale/de-ch.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : German (Switzerland) [de-ch]
-//! author : sschueller : https://github.com/sschueller
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,69 +8,68 @@
 }(this, (function (moment) { 'use strict';
 
 
-// based on: https://www.bk.admin.ch/dokumentation/sprachen/04915/05016/index.html?lang=de#
-
-function processRelativeTime(number, withoutSuffix, key, isFuture) {
-    var format = {
-        'm': ['eine Minute', 'einer Minute'],
-        'h': ['eine Stunde', 'einer Stunde'],
-        'd': ['ein Tag', 'einem Tag'],
-        'dd': [number + ' Tage', number + ' Tagen'],
-        'M': ['ein Monat', 'einem Monat'],
-        'MM': [number + ' Monate', number + ' Monaten'],
-        'y': ['ein Jahr', 'einem Jahr'],
-        'yy': [number + ' Jahre', number + ' Jahren']
-    };
-    return withoutSuffix ? format[key][0] : format[key][1];
-}
-
-var deCh = moment.defineLocale('de-ch', {
-    months : 'Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
-    monthsShort : 'Jan._Febr._März_April_Mai_Juni_Juli_Aug._Sept._Okt._Nov._Dez.'.split('_'),
-    monthsParseExact : true,
-    weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
-    weekdaysShort : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
-    weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT: 'HH.mm',
-        LTS: 'HH.mm.ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D. MMMM YYYY',
-        LLL : 'D. MMMM YYYY HH.mm',
-        LLLL : 'dddd, D. MMMM YYYY HH.mm'
-    },
-    calendar : {
-        sameDay: '[heute um] LT [Uhr]',
-        sameElse: 'L',
-        nextDay: '[morgen um] LT [Uhr]',
-        nextWeek: 'dddd [um] LT [Uhr]',
-        lastDay: '[gestern um] LT [Uhr]',
-        lastWeek: '[letzten] dddd [um] LT [Uhr]'
-    },
-    relativeTime : {
-        future : 'in %s',
-        past : 'vor %s',
-        s : 'ein paar Sekunden',
-        m : processRelativeTime,
-        mm : '%d Minuten',
-        h : processRelativeTime,
-        hh : '%d Stunden',
-        d : processRelativeTime,
-        dd : processRelativeTime,
-        M : processRelativeTime,
-        MM : processRelativeTime,
-        y : processRelativeTime,
-        yy : processRelativeTime
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var format = {
+            'm': ['eine Minute', 'einer Minute'],
+            'h': ['eine Stunde', 'einer Stunde'],
+            'd': ['ein Tag', 'einem Tag'],
+            'dd': [number + ' Tage', number + ' Tagen'],
+            'M': ['ein Monat', 'einem Monat'],
+            'MM': [number + ' Monate', number + ' Monaten'],
+            'y': ['ein Jahr', 'einem Jahr'],
+            'yy': [number + ' Jahre', number + ' Jahren']
+        };
+        return withoutSuffix ? format[key][0] : format[key][1];
     }
-});
 
-return deCh;
+    var deCh = moment.defineLocale('de-ch', {
+        months : 'Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
+        monthsShort : 'Jan._Feb._März_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
+        weekdaysShort : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
+        weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT: 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY HH:mm',
+            LLLL : 'dddd, D. MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[heute um] LT [Uhr]',
+            sameElse: 'L',
+            nextDay: '[morgen um] LT [Uhr]',
+            nextWeek: 'dddd [um] LT [Uhr]',
+            lastDay: '[gestern um] LT [Uhr]',
+            lastWeek: '[letzten] dddd [um] LT [Uhr]'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : 'vor %s',
+            s : 'ein paar Sekunden',
+            ss : '%d Sekunden',
+            m : processRelativeTime,
+            mm : '%d Minuten',
+            h : processRelativeTime,
+            hh : '%d Stunden',
+            d : processRelativeTime,
+            dd : processRelativeTime,
+            M : processRelativeTime,
+            MM : processRelativeTime,
+            y : processRelativeTime,
+            yy : processRelativeTime
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return deCh;
 
 })));
diff --git a/lib/javascripts/moment_locale/de.js b/lib/javascripts/moment_locale/de.js
old mode 100644
new mode 100755
index a3263e8ca02..d5c084a2c8c
--- a/lib/javascripts/moment_locale/de.js
+++ b/lib/javascripts/moment_locale/de.js
@@ -1,8 +1,4 @@
 //! moment.js locale configuration
-//! locale : German [de]
-//! author : lluchs : https://github.com/lluchs
-//! author: Menelion Elensúle: https://github.com/Oire
-//! author : Mikolaj Dadela : https://github.com/mik01aj
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -12,67 +8,68 @@
 }(this, (function (moment) { 'use strict';
 
 
-function processRelativeTime(number, withoutSuffix, key, isFuture) {
-    var format = {
-        'm': ['eine Minute', 'einer Minute'],
-        'h': ['eine Stunde', 'einer Stunde'],
-        'd': ['ein Tag', 'einem Tag'],
-        'dd': [number + ' Tage', number + ' Tagen'],
-        'M': ['ein Monat', 'einem Monat'],
-        'MM': [number + ' Monate', number + ' Monaten'],
-        'y': ['ein Jahr', 'einem Jahr'],
-        'yy': [number + ' Jahre', number + ' Jahren']
-    };
-    return withoutSuffix ? format[key][0] : format[key][1];
-}
-
-var de = moment.defineLocale('de', {
-    months : 'Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
-    monthsShort : 'Jan._Febr._Mrz._Apr._Mai_Jun._Jul._Aug._Sept._Okt._Nov._Dez.'.split('_'),
-    monthsParseExact : true,
-    weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
-    weekdaysShort : 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'),
-    weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT: 'HH:mm',
-        LTS: 'HH:mm:ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D. MMMM YYYY',
-        LLL : 'D. MMMM YYYY HH:mm',
-        LLLL : 'dddd, D. MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay: '[heute um] LT [Uhr]',
-        sameElse: 'L',
-        nextDay: '[morgen um] LT [Uhr]',
-        nextWeek: 'dddd [um] LT [Uhr]',
-        lastDay: '[gestern um] LT [Uhr]',
-        lastWeek: '[letzten] dddd [um] LT [Uhr]'
-    },
-    relativeTime : {
-        future : 'in %s',
-        past : 'vor %s',
-        s : 'ein paar Sekunden',
-        m : processRelativeTime,
-        mm : '%d Minuten',
-        h : processRelativeTime,
-        hh : '%d Stunden',
-        d : processRelativeTime,
-        dd : processRelativeTime,
-        M : processRelativeTime,
-        MM : processRelativeTime,
-        y : processRelativeTime,
-        yy : processRelativeTime
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var format = {
+            'm': ['eine Minute', 'einer Minute'],
+            'h': ['eine Stunde', 'einer Stunde'],
+            'd': ['ein Tag', 'einem Tag'],
+            'dd': [number + ' Tage', number + ' Tagen'],
+            'M': ['ein Monat', 'einem Monat'],
+            'MM': [number + ' Monate', number + ' Monaten'],
+            'y': ['ein Jahr', 'einem Jahr'],
+            'yy': [number + ' Jahre', number + ' Jahren']
+        };
+        return withoutSuffix ? format[key][0] : format[key][1];
     }
-});
 
-return de;
+    var de = moment.defineLocale('de', {
+        months : 'Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
+        monthsShort : 'Jan._Feb._März_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
+        weekdaysShort : 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'),
+        weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT: 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY HH:mm',
+            LLLL : 'dddd, D. MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[heute um] LT [Uhr]',
+            sameElse: 'L',
+            nextDay: '[morgen um] LT [Uhr]',
+            nextWeek: 'dddd [um] LT [Uhr]',
+            lastDay: '[gestern um] LT [Uhr]',
+            lastWeek: '[letzten] dddd [um] LT [Uhr]'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : 'vor %s',
+            s : 'ein paar Sekunden',
+            ss : '%d Sekunden',
+            m : processRelativeTime,
+            mm : '%d Minuten',
+            h : processRelativeTime,
+            hh : '%d Stunden',
+            d : processRelativeTime,
+            dd : processRelativeTime,
+            M : processRelativeTime,
+            MM : processRelativeTime,
+            y : processRelativeTime,
+            yy : processRelativeTime
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return de;
 
 })));
diff --git a/lib/javascripts/moment_locale/dv.js b/lib/javascripts/moment_locale/dv.js
old mode 100644
new mode 100755
index 065df78c364..6f057ca1c44
--- a/lib/javascripts/moment_locale/dv.js
+++ b/lib/javascripts/moment_locale/dv.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Maldivian [dv]
-//! author : Jawish Hameed : https://github.com/jawish
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,91 +8,91 @@
 }(this, (function (moment) { 'use strict';
 
 
-var months = [
-    'ޖެނުއަރީ',
-    'ފެބްރުއަރީ',
-    'މާރިޗު',
-    'އޭޕްރީލު',
-    'މޭ',
-    'ޖޫން',
-    'ޖުލައި',
-    'އޯގަސްޓު',
-    'ސެޕްޓެމްބަރު',
-    'އޮކްޓޯބަރު',
-    'ނޮވެމްބަރު',
-    'ޑިސެމްބަރު'
-];
-var weekdays = [
-    'އާދިއްތަ',
-    'ހޯމަ',
-    'އަންގާރަ',
-    'ބުދަ',
-    'ބުރާސްފަތި',
-    'ހުކުރު',
-    'ހޮނިހިރު'
-];
+    var months = [
+        'ޖެނުއަރީ',
+        'ފެބްރުއަރީ',
+        'މާރިޗު',
+        'އޭޕްރީލު',
+        'މޭ',
+        'ޖޫން',
+        'ޖުލައި',
+        'އޯގަސްޓު',
+        'ސެޕްޓެމްބަރު',
+        'އޮކްޓޯބަރު',
+        'ނޮވެމްބަރު',
+        'ޑިސެމްބަރު'
+    ], weekdays = [
+        'އާދިއްތަ',
+        'ހޯމަ',
+        'އަންގާރަ',
+        'ބުދަ',
+        'ބުރާސްފަތި',
+        'ހުކުރު',
+        'ހޮނިހިރު'
+    ];
 
-var dv = moment.defineLocale('dv', {
-    months : months,
-    monthsShort : months,
-    weekdays : weekdays,
-    weekdaysShort : weekdays,
-    weekdaysMin : 'އާދި_ހޯމަ_އަން_ބުދަ_ބުރާ_ހުކު_ހޮނި'.split('_'),
-    longDateFormat : {
+    var dv = moment.defineLocale('dv', {
+        months : months,
+        monthsShort : months,
+        weekdays : weekdays,
+        weekdaysShort : weekdays,
+        weekdaysMin : 'އާދި_ހޯމަ_އަން_ބުދަ_ބުރާ_ހުކު_ހޮނި'.split('_'),
+        longDateFormat : {
 
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'D/M/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd D MMMM YYYY HH:mm'
-    },
-    meridiemParse: /މކ|މފ/,
-    isPM : function (input) {
-        return 'މފ' === input;
-    },
-    meridiem : function (hour, minute, isLower) {
-        if (hour < 12) {
-            return 'މކ';
-        } else {
-            return 'މފ';
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'D/M/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        meridiemParse: /މކ|މފ/,
+        isPM : function (input) {
+            return 'މފ' === input;
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'މކ';
+            } else {
+                return 'މފ';
+            }
+        },
+        calendar : {
+            sameDay : '[މިއަދު] LT',
+            nextDay : '[މާދަމާ] LT',
+            nextWeek : 'dddd LT',
+            lastDay : '[އިއްޔެ] LT',
+            lastWeek : '[ފާއިތުވި] dddd LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'ތެރޭގައި %s',
+            past : 'ކުރިން %s',
+            s : 'ސިކުންތުކޮޅެއް',
+            ss : 'd% ސިކުންތު',
+            m : 'މިނިޓެއް',
+            mm : 'މިނިޓު %d',
+            h : 'ގަޑިއިރެއް',
+            hh : 'ގަޑިއިރު %d',
+            d : 'ދުވަހެއް',
+            dd : 'ދުވަސް %d',
+            M : 'މަހެއް',
+            MM : 'މަސް %d',
+            y : 'އަހަރެއް',
+            yy : 'އަހަރު %d'
+        },
+        preparse: function (string) {
+            return string.replace(/،/g, ',');
+        },
+        postformat: function (string) {
+            return string.replace(/,/g, '،');
+        },
+        week : {
+            dow : 7,  // Sunday is the first day of the week.
+            doy : 12  // The week that contains Jan 1st is the first week of the year.
         }
-    },
-    calendar : {
-        sameDay : '[މިއަދު] LT',
-        nextDay : '[މާދަމާ] LT',
-        nextWeek : 'dddd LT',
-        lastDay : '[އިއްޔެ] LT',
-        lastWeek : '[ފާއިތުވި] dddd LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'ތެރޭގައި %s',
-        past : 'ކުރިން %s',
-        s : 'ސިކުންތުކޮޅެއް',
-        m : 'މިނިޓެއް',
-        mm : 'މިނިޓު %d',
-        h : 'ގަޑިއިރެއް',
-        hh : 'ގަޑިއިރު %d',
-        d : 'ދުވަހެއް',
-        dd : 'ދުވަސް %d',
-        M : 'މަހެއް',
-        MM : 'މަސް %d',
-        y : 'އަހަރެއް',
-        yy : 'އަހަރު %d'
-    },
-    preparse: function (string) {
-        return string.replace(/،/g, ',');
-    },
-    postformat: function (string) {
-        return string.replace(/,/g, '،');
-    },
-    week : {
-        dow : 7,  // Sunday is the first day of the week.
-        doy : 12  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    });
 
-return dv;
+    return dv;
 
 })));
diff --git a/lib/javascripts/moment_locale/el.js b/lib/javascripts/moment_locale/el.js
old mode 100644
new mode 100755
index bf3f4c95f70..f01fa772a61
--- a/lib/javascripts/moment_locale/el.js
+++ b/lib/javascripts/moment_locale/el.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Greek [el]
-//! author : Aggelos Karalias : https://github.com/mehiel
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -9,92 +7,93 @@
    factory(global.moment)
 }(this, (function (moment) { 'use strict';
 
-function isFunction(input) {
-    return input instanceof Function || Object.prototype.toString.call(input) === '[object Function]';
-}
+    function isFunction(input) {
+        return input instanceof Function || Object.prototype.toString.call(input) === '[object Function]';
+    }
 
 
-var el = moment.defineLocale('el', {
-    monthsNominativeEl : 'Ιανουάριος_Φεβρουάριος_Μάρτιος_Απρίλιος_Μάιος_Ιούνιος_Ιούλιος_Αύγουστος_Σεπτέμβριος_Οκτώβριος_Νοέμβριος_Δεκέμβριος'.split('_'),
-    monthsGenitiveEl : 'Ιανουαρίου_Φεβρουαρίου_Μαρτίου_Απριλίου_Μαΐου_Ιουνίου_Ιουλίου_Αυγούστου_Σεπτεμβρίου_Οκτωβρίου_Νοεμβρίου_Δεκεμβρίου'.split('_'),
-    months : function (momentToFormat, format) {
-        if (!momentToFormat) {
-            return this._monthsNominativeEl;
-        } else if (/D/.test(format.substring(0, format.indexOf('MMMM')))) { // if there is a day number before 'MMMM'
-            return this._monthsGenitiveEl[momentToFormat.month()];
-        } else {
-            return this._monthsNominativeEl[momentToFormat.month()];
-        }
-    },
-    monthsShort : 'Ιαν_Φεβ_Μαρ_Απρ_Μαϊ_Ιουν_Ιουλ_Αυγ_Σεπ_Οκτ_Νοε_Δεκ'.split('_'),
-    weekdays : 'Κυριακή_Δευτέρα_Τρίτη_Τετάρτη_Πέμπτη_Παρασκευή_Σάββατο'.split('_'),
-    weekdaysShort : 'Κυρ_Δευ_Τρι_Τετ_Πεμ_Παρ_Σαβ'.split('_'),
-    weekdaysMin : 'Κυ_Δε_Τρ_Τε_Πε_Πα_Σα'.split('_'),
-    meridiem : function (hours, minutes, isLower) {
-        if (hours > 11) {
-            return isLower ? 'μμ' : 'ΜΜ';
-        } else {
-            return isLower ? 'πμ' : 'ΠΜ';
-        }
-    },
-    isPM : function (input) {
-        return ((input + '').toLowerCase()[0] === 'μ');
-    },
-    meridiemParse : /[ΠΜ]\.?Μ?\.?/i,
-    longDateFormat : {
-        LT : 'h:mm A',
-        LTS : 'h:mm:ss A',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY h:mm A',
-        LLLL : 'dddd, D MMMM YYYY h:mm A'
-    },
-    calendarEl : {
-        sameDay : '[Σήμερα {}] LT',
-        nextDay : '[Αύριο {}] LT',
-        nextWeek : 'dddd [{}] LT',
-        lastDay : '[Χθες {}] LT',
-        lastWeek : function () {
-            switch (this.day()) {
-                case 6:
-                    return '[το προηγούμενο] dddd [{}] LT';
-                default:
-                    return '[την προηγούμενη] dddd [{}] LT';
+    var el = moment.defineLocale('el', {
+        monthsNominativeEl : 'Ιανουάριος_Φεβρουάριος_Μάρτιος_Απρίλιος_Μάιος_Ιούνιος_Ιούλιος_Αύγουστος_Σεπτέμβριος_Οκτώβριος_Νοέμβριος_Δεκέμβριος'.split('_'),
+        monthsGenitiveEl : 'Ιανουαρίου_Φεβρουαρίου_Μαρτίου_Απριλίου_Μαΐου_Ιουνίου_Ιουλίου_Αυγούστου_Σεπτεμβρίου_Οκτωβρίου_Νοεμβρίου_Δεκεμβρίου'.split('_'),
+        months : function (momentToFormat, format) {
+            if (!momentToFormat) {
+                return this._monthsNominativeEl;
+            } else if (typeof format === 'string' && /D/.test(format.substring(0, format.indexOf('MMMM')))) { // if there is a day number before 'MMMM'
+                return this._monthsGenitiveEl[momentToFormat.month()];
+            } else {
+                return this._monthsNominativeEl[momentToFormat.month()];
             }
         },
-        sameElse : 'L'
-    },
-    calendar : function (key, mom) {
-        var output = this._calendarEl[key],
-            hours = mom && mom.hours();
-        if (isFunction(output)) {
-            output = output.apply(mom);
+        monthsShort : 'Ιαν_Φεβ_Μαρ_Απρ_Μαϊ_Ιουν_Ιουλ_Αυγ_Σεπ_Οκτ_Νοε_Δεκ'.split('_'),
+        weekdays : 'Κυριακή_Δευτέρα_Τρίτη_Τετάρτη_Πέμπτη_Παρασκευή_Σάββατο'.split('_'),
+        weekdaysShort : 'Κυρ_Δευ_Τρι_Τετ_Πεμ_Παρ_Σαβ'.split('_'),
+        weekdaysMin : 'Κυ_Δε_Τρ_Τε_Πε_Πα_Σα'.split('_'),
+        meridiem : function (hours, minutes, isLower) {
+            if (hours > 11) {
+                return isLower ? 'μμ' : 'ΜΜ';
+            } else {
+                return isLower ? 'πμ' : 'ΠΜ';
+            }
+        },
+        isPM : function (input) {
+            return ((input + '').toLowerCase()[0] === 'μ');
+        },
+        meridiemParse : /[ΠΜ]\.?Μ?\.?/i,
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY h:mm A',
+            LLLL : 'dddd, D MMMM YYYY h:mm A'
+        },
+        calendarEl : {
+            sameDay : '[Σήμερα {}] LT',
+            nextDay : '[Αύριο {}] LT',
+            nextWeek : 'dddd [{}] LT',
+            lastDay : '[Χθες {}] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                    case 6:
+                        return '[το προηγούμενο] dddd [{}] LT';
+                    default:
+                        return '[την προηγούμενη] dddd [{}] LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        calendar : function (key, mom) {
+            var output = this._calendarEl[key],
+                hours = mom && mom.hours();
+            if (isFunction(output)) {
+                output = output.apply(mom);
+            }
+            return output.replace('{}', (hours % 12 === 1 ? 'στη' : 'στις'));
+        },
+        relativeTime : {
+            future : 'σε %s',
+            past : '%s πριν',
+            s : 'λίγα δευτερόλεπτα',
+            ss : '%d δευτερόλεπτα',
+            m : 'ένα λεπτό',
+            mm : '%d λεπτά',
+            h : 'μία ώρα',
+            hh : '%d ώρες',
+            d : 'μία μέρα',
+            dd : '%d μέρες',
+            M : 'ένας μήνας',
+            MM : '%d μήνες',
+            y : 'ένας χρόνος',
+            yy : '%d χρόνια'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}η/,
+        ordinal: '%dη',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4st is the first week of the year.
         }
-        return output.replace('{}', (hours % 12 === 1 ? 'στη' : 'στις'));
-    },
-    relativeTime : {
-        future : 'σε %s',
-        past : '%s πριν',
-        s : 'λίγα δευτερόλεπτα',
-        m : 'ένα λεπτό',
-        mm : '%d λεπτά',
-        h : 'μία ώρα',
-        hh : '%d ώρες',
-        d : 'μία μέρα',
-        dd : '%d μέρες',
-        M : 'ένας μήνας',
-        MM : '%d μήνες',
-        y : 'ένας χρόνος',
-        yy : '%d χρόνια'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}η/,
-    ordinal: '%dη',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4st is the first week of the year.
-    }
-});
+    });
 
-return el;
+    return el;
 
 })));
diff --git a/lib/javascripts/moment_locale/en-au.js b/lib/javascripts/moment_locale/en-au.js
old mode 100644
new mode 100755
index e8a8fdc96f7..372023786b7
--- a/lib/javascripts/moment_locale/en-au.js
+++ b/lib/javascripts/moment_locale/en-au.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : English (Australia) [en-au]
-//! author : Jared Morse : https://github.com/jarcoal
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,58 +8,59 @@
 }(this, (function (moment) { 'use strict';
 
 
-var enAu = moment.defineLocale('en-au', {
-    months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
-    monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
-    weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
-    weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
-    weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
-    longDateFormat : {
-        LT : 'h:mm A',
-        LTS : 'h:mm:ss A',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY h:mm A',
-        LLLL : 'dddd, D MMMM YYYY h:mm A'
-    },
-    calendar : {
-        sameDay : '[Today at] LT',
-        nextDay : '[Tomorrow at] LT',
-        nextWeek : 'dddd [at] LT',
-        lastDay : '[Yesterday at] LT',
-        lastWeek : '[Last] dddd [at] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'in %s',
-        past : '%s ago',
-        s : 'a few seconds',
-        m : 'a minute',
-        mm : '%d minutes',
-        h : 'an hour',
-        hh : '%d hours',
-        d : 'a day',
-        dd : '%d days',
-        M : 'a month',
-        MM : '%d months',
-        y : 'a year',
-        yy : '%d years'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
-    ordinal : function (number) {
-        var b = number % 10,
-            output = (~~(number % 100 / 10) === 1) ? 'th' :
-            (b === 1) ? 'st' :
-            (b === 2) ? 'nd' :
-            (b === 3) ? 'rd' : 'th';
-        return number + output;
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    var enAu = moment.defineLocale('en-au', {
+        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY h:mm A',
+            LLLL : 'dddd, D MMMM YYYY h:mm A'
+        },
+        calendar : {
+            sameDay : '[Today at] LT',
+            nextDay : '[Tomorrow at] LT',
+            nextWeek : 'dddd [at] LT',
+            lastDay : '[Yesterday at] LT',
+            lastWeek : '[Last] dddd [at] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : '%s ago',
+            s : 'a few seconds',
+            ss : '%d seconds',
+            m : 'a minute',
+            mm : '%d minutes',
+            h : 'an hour',
+            hh : '%d hours',
+            d : 'a day',
+            dd : '%d days',
+            M : 'a month',
+            MM : '%d months',
+            y : 'a year',
+            yy : '%d years'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-return enAu;
+    return enAu;
 
 })));
diff --git a/lib/javascripts/moment_locale/en-ca.js b/lib/javascripts/moment_locale/en-ca.js
old mode 100644
new mode 100755
index 3629bf1ab11..5d0dab08b5c
--- a/lib/javascripts/moment_locale/en-ca.js
+++ b/lib/javascripts/moment_locale/en-ca.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : English (Canada) [en-ca]
-//! author : Jonathan Abourbih : https://github.com/jonbca
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,54 +8,55 @@
 }(this, (function (moment) { 'use strict';
 
 
-var enCa = moment.defineLocale('en-ca', {
-    months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
-    monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
-    weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
-    weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
-    weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
-    longDateFormat : {
-        LT : 'h:mm A',
-        LTS : 'h:mm:ss A',
-        L : 'YYYY-MM-DD',
-        LL : 'MMMM D, YYYY',
-        LLL : 'MMMM D, YYYY h:mm A',
-        LLLL : 'dddd, MMMM D, YYYY h:mm A'
-    },
-    calendar : {
-        sameDay : '[Today at] LT',
-        nextDay : '[Tomorrow at] LT',
-        nextWeek : 'dddd [at] LT',
-        lastDay : '[Yesterday at] LT',
-        lastWeek : '[Last] dddd [at] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'in %s',
-        past : '%s ago',
-        s : 'a few seconds',
-        m : 'a minute',
-        mm : '%d minutes',
-        h : 'an hour',
-        hh : '%d hours',
-        d : 'a day',
-        dd : '%d days',
-        M : 'a month',
-        MM : '%d months',
-        y : 'a year',
-        yy : '%d years'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
-    ordinal : function (number) {
-        var b = number % 10,
-            output = (~~(number % 100 / 10) === 1) ? 'th' :
-            (b === 1) ? 'st' :
-            (b === 2) ? 'nd' :
-            (b === 3) ? 'rd' : 'th';
-        return number + output;
-    }
-});
+    var enCa = moment.defineLocale('en-ca', {
+        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'YYYY-MM-DD',
+            LL : 'MMMM D, YYYY',
+            LLL : 'MMMM D, YYYY h:mm A',
+            LLLL : 'dddd, MMMM D, YYYY h:mm A'
+        },
+        calendar : {
+            sameDay : '[Today at] LT',
+            nextDay : '[Tomorrow at] LT',
+            nextWeek : 'dddd [at] LT',
+            lastDay : '[Yesterday at] LT',
+            lastWeek : '[Last] dddd [at] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : '%s ago',
+            s : 'a few seconds',
+            ss : '%d seconds',
+            m : 'a minute',
+            mm : '%d minutes',
+            h : 'an hour',
+            hh : '%d hours',
+            d : 'a day',
+            dd : '%d days',
+            M : 'a month',
+            MM : '%d months',
+            y : 'a year',
+            yy : '%d years'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        }
+    });
 
-return enCa;
+    return enCa;
 
 })));
diff --git a/lib/javascripts/moment_locale/en-gb.js b/lib/javascripts/moment_locale/en-gb.js
old mode 100644
new mode 100755
index fe48a78cd00..85302e5d02f
--- a/lib/javascripts/moment_locale/en-gb.js
+++ b/lib/javascripts/moment_locale/en-gb.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : English (United Kingdom) [en-gb]
-//! author : Chris Gedrim : https://github.com/chrisgedrim
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,58 +8,59 @@
 }(this, (function (moment) { 'use strict';
 
 
-var enGb = moment.defineLocale('en-gb', {
-    months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
-    monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
-    weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
-    weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
-    weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd, D MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay : '[Today at] LT',
-        nextDay : '[Tomorrow at] LT',
-        nextWeek : 'dddd [at] LT',
-        lastDay : '[Yesterday at] LT',
-        lastWeek : '[Last] dddd [at] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'in %s',
-        past : '%s ago',
-        s : 'a few seconds',
-        m : 'a minute',
-        mm : '%d minutes',
-        h : 'an hour',
-        hh : '%d hours',
-        d : 'a day',
-        dd : '%d days',
-        M : 'a month',
-        MM : '%d months',
-        y : 'a year',
-        yy : '%d years'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
-    ordinal : function (number) {
-        var b = number % 10,
-            output = (~~(number % 100 / 10) === 1) ? 'th' :
-            (b === 1) ? 'st' :
-            (b === 2) ? 'nd' :
-            (b === 3) ? 'rd' : 'th';
-        return number + output;
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    var enGb = moment.defineLocale('en-gb', {
+        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[Today at] LT',
+            nextDay : '[Tomorrow at] LT',
+            nextWeek : 'dddd [at] LT',
+            lastDay : '[Yesterday at] LT',
+            lastWeek : '[Last] dddd [at] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : '%s ago',
+            s : 'a few seconds',
+            ss : '%d seconds',
+            m : 'a minute',
+            mm : '%d minutes',
+            h : 'an hour',
+            hh : '%d hours',
+            d : 'a day',
+            dd : '%d days',
+            M : 'a month',
+            MM : '%d months',
+            y : 'a year',
+            yy : '%d years'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-return enGb;
+    return enGb;
 
 })));
diff --git a/lib/javascripts/moment_locale/en-ie.js b/lib/javascripts/moment_locale/en-ie.js
old mode 100644
new mode 100755
index bb0cccef670..ede6c671a6e
--- a/lib/javascripts/moment_locale/en-ie.js
+++ b/lib/javascripts/moment_locale/en-ie.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : English (Ireland) [en-ie]
-//! author : Chris Cartlidge : https://github.com/chriscartlidge
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,58 +8,59 @@
 }(this, (function (moment) { 'use strict';
 
 
-var enIe = moment.defineLocale('en-ie', {
-    months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
-    monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
-    weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
-    weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
-    weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD-MM-YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd D MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay : '[Today at] LT',
-        nextDay : '[Tomorrow at] LT',
-        nextWeek : 'dddd [at] LT',
-        lastDay : '[Yesterday at] LT',
-        lastWeek : '[Last] dddd [at] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'in %s',
-        past : '%s ago',
-        s : 'a few seconds',
-        m : 'a minute',
-        mm : '%d minutes',
-        h : 'an hour',
-        hh : '%d hours',
-        d : 'a day',
-        dd : '%d days',
-        M : 'a month',
-        MM : '%d months',
-        y : 'a year',
-        yy : '%d years'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
-    ordinal : function (number) {
-        var b = number % 10,
-            output = (~~(number % 100 / 10) === 1) ? 'th' :
-            (b === 1) ? 'st' :
-            (b === 2) ? 'nd' :
-            (b === 3) ? 'rd' : 'th';
-        return number + output;
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    var enIe = moment.defineLocale('en-ie', {
+        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD-MM-YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[Today at] LT',
+            nextDay : '[Tomorrow at] LT',
+            nextWeek : 'dddd [at] LT',
+            lastDay : '[Yesterday at] LT',
+            lastWeek : '[Last] dddd [at] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : '%s ago',
+            s : 'a few seconds',
+            ss : '%d seconds',
+            m : 'a minute',
+            mm : '%d minutes',
+            h : 'an hour',
+            hh : '%d hours',
+            d : 'a day',
+            dd : '%d days',
+            M : 'a month',
+            MM : '%d months',
+            y : 'a year',
+            yy : '%d years'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-return enIe;
+    return enIe;
 
 })));
diff --git a/lib/javascripts/moment_locale/en-il.js b/lib/javascripts/moment_locale/en-il.js
new file mode 100755
index 00000000000..b18eab86ad2
--- /dev/null
+++ b/lib/javascripts/moment_locale/en-il.js
@@ -0,0 +1,61 @@
+//! moment.js locale configuration
+
+;(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined'
+       && typeof require === 'function' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
+   factory(global.moment)
+}(this, (function (moment) { 'use strict';
+
+
+    var enIl = moment.defineLocale('en-il', {
+        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[Today at] LT',
+            nextDay : '[Tomorrow at] LT',
+            nextWeek : 'dddd [at] LT',
+            lastDay : '[Yesterday at] LT',
+            lastWeek : '[Last] dddd [at] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : '%s ago',
+            s : 'a few seconds',
+            m : 'a minute',
+            mm : '%d minutes',
+            h : 'an hour',
+            hh : '%d hours',
+            d : 'a day',
+            dd : '%d days',
+            M : 'a month',
+            MM : '%d months',
+            y : 'a year',
+            yy : '%d years'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        }
+    });
+
+    return enIl;
+
+})));
diff --git a/lib/javascripts/moment_locale/en-nz.js b/lib/javascripts/moment_locale/en-nz.js
old mode 100644
new mode 100755
index 700523193c8..f4325d4c93d
--- a/lib/javascripts/moment_locale/en-nz.js
+++ b/lib/javascripts/moment_locale/en-nz.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : English (New Zealand) [en-nz]
-//! author : Luke McGregor : https://github.com/lukemcgregor
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,58 +8,59 @@
 }(this, (function (moment) { 'use strict';
 
 
-var enNz = moment.defineLocale('en-nz', {
-    months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
-    monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
-    weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
-    weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
-    weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
-    longDateFormat : {
-        LT : 'h:mm A',
-        LTS : 'h:mm:ss A',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY h:mm A',
-        LLLL : 'dddd, D MMMM YYYY h:mm A'
-    },
-    calendar : {
-        sameDay : '[Today at] LT',
-        nextDay : '[Tomorrow at] LT',
-        nextWeek : 'dddd [at] LT',
-        lastDay : '[Yesterday at] LT',
-        lastWeek : '[Last] dddd [at] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'in %s',
-        past : '%s ago',
-        s : 'a few seconds',
-        m : 'a minute',
-        mm : '%d minutes',
-        h : 'an hour',
-        hh : '%d hours',
-        d : 'a day',
-        dd : '%d days',
-        M : 'a month',
-        MM : '%d months',
-        y : 'a year',
-        yy : '%d years'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
-    ordinal : function (number) {
-        var b = number % 10,
-            output = (~~(number % 100 / 10) === 1) ? 'th' :
-            (b === 1) ? 'st' :
-            (b === 2) ? 'nd' :
-            (b === 3) ? 'rd' : 'th';
-        return number + output;
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    var enNz = moment.defineLocale('en-nz', {
+        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY h:mm A',
+            LLLL : 'dddd, D MMMM YYYY h:mm A'
+        },
+        calendar : {
+            sameDay : '[Today at] LT',
+            nextDay : '[Tomorrow at] LT',
+            nextWeek : 'dddd [at] LT',
+            lastDay : '[Yesterday at] LT',
+            lastWeek : '[Last] dddd [at] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : '%s ago',
+            s : 'a few seconds',
+            ss : '%d seconds',
+            m : 'a minute',
+            mm : '%d minutes',
+            h : 'an hour',
+            hh : '%d hours',
+            d : 'a day',
+            dd : '%d days',
+            M : 'a month',
+            MM : '%d months',
+            y : 'a year',
+            yy : '%d years'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-return enNz;
+    return enNz;
 
 })));
diff --git a/lib/javascripts/moment_locale/eo.js b/lib/javascripts/moment_locale/eo.js
old mode 100644
new mode 100755
index 8001c83c69f..40eaee2faf2
--- a/lib/javascripts/moment_locale/eo.js
+++ b/lib/javascripts/moment_locale/eo.js
@@ -1,8 +1,4 @@
 //! moment.js locale configuration
-//! locale : Esperanto [eo]
-//! author : Colin Dean : https://github.com/colindean
-//! author : Mia Nordentoft Imperatori : https://github.com/miestasmia
-//! comment : miestasmia corrected the translation by colindean
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -12,62 +8,63 @@
 }(this, (function (moment) { 'use strict';
 
 
-var eo = moment.defineLocale('eo', {
-    months : 'januaro_februaro_marto_aprilo_majo_junio_julio_aŭgusto_septembro_oktobro_novembro_decembro'.split('_'),
-    monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aŭg_sep_okt_nov_dec'.split('_'),
-    weekdays : 'dimanĉo_lundo_mardo_merkredo_ĵaŭdo_vendredo_sabato'.split('_'),
-    weekdaysShort : 'dim_lun_mard_merk_ĵaŭ_ven_sab'.split('_'),
-    weekdaysMin : 'di_lu_ma_me_ĵa_ve_sa'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'YYYY-MM-DD',
-        LL : 'D[-a de] MMMM, YYYY',
-        LLL : 'D[-a de] MMMM, YYYY HH:mm',
-        LLLL : 'dddd, [la] D[-a de] MMMM, YYYY HH:mm'
-    },
-    meridiemParse: /[ap]\.t\.m/i,
-    isPM: function (input) {
-        return input.charAt(0).toLowerCase() === 'p';
-    },
-    meridiem : function (hours, minutes, isLower) {
-        if (hours > 11) {
-            return isLower ? 'p.t.m.' : 'P.T.M.';
-        } else {
-            return isLower ? 'a.t.m.' : 'A.T.M.';
+    var eo = moment.defineLocale('eo', {
+        months : 'januaro_februaro_marto_aprilo_majo_junio_julio_aŭgusto_septembro_oktobro_novembro_decembro'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aŭg_sep_okt_nov_dec'.split('_'),
+        weekdays : 'dimanĉo_lundo_mardo_merkredo_ĵaŭdo_vendredo_sabato'.split('_'),
+        weekdaysShort : 'dim_lun_mard_merk_ĵaŭ_ven_sab'.split('_'),
+        weekdaysMin : 'di_lu_ma_me_ĵa_ve_sa'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'YYYY-MM-DD',
+            LL : 'D[-a de] MMMM, YYYY',
+            LLL : 'D[-a de] MMMM, YYYY HH:mm',
+            LLLL : 'dddd, [la] D[-a de] MMMM, YYYY HH:mm'
+        },
+        meridiemParse: /[ap]\.t\.m/i,
+        isPM: function (input) {
+            return input.charAt(0).toLowerCase() === 'p';
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours > 11) {
+                return isLower ? 'p.t.m.' : 'P.T.M.';
+            } else {
+                return isLower ? 'a.t.m.' : 'A.T.M.';
+            }
+        },
+        calendar : {
+            sameDay : '[Hodiaŭ je] LT',
+            nextDay : '[Morgaŭ je] LT',
+            nextWeek : 'dddd [je] LT',
+            lastDay : '[Hieraŭ je] LT',
+            lastWeek : '[pasinta] dddd [je] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'post %s',
+            past : 'antaŭ %s',
+            s : 'sekundoj',
+            ss : '%d sekundoj',
+            m : 'minuto',
+            mm : '%d minutoj',
+            h : 'horo',
+            hh : '%d horoj',
+            d : 'tago',//ne 'diurno', ĉar estas uzita por proksimumo
+            dd : '%d tagoj',
+            M : 'monato',
+            MM : '%d monatoj',
+            y : 'jaro',
+            yy : '%d jaroj'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}a/,
+        ordinal : '%da',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
         }
-    },
-    calendar : {
-        sameDay : '[Hodiaŭ je] LT',
-        nextDay : '[Morgaŭ je] LT',
-        nextWeek : 'dddd [je] LT',
-        lastDay : '[Hieraŭ je] LT',
-        lastWeek : '[pasinta] dddd [je] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'post %s',
-        past : 'antaŭ %s',
-        s : 'sekundoj',
-        m : 'minuto',
-        mm : '%d minutoj',
-        h : 'horo',
-        hh : '%d horoj',
-        d : 'tago',//ne 'diurno', ĉar estas uzita por proksimumo
-        dd : '%d tagoj',
-        M : 'monato',
-        MM : '%d monatoj',
-        y : 'jaro',
-        yy : '%d jaroj'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}a/,
-    ordinal : '%da',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    });
 
-return eo;
+    return eo;
 
 })));
diff --git a/lib/javascripts/moment_locale/es-do.js b/lib/javascripts/moment_locale/es-do.js
old mode 100644
new mode 100755
index 1af11adf374..829c2de8716
--- a/lib/javascripts/moment_locale/es-do.js
+++ b/lib/javascripts/moment_locale/es-do.js
@@ -1,5 +1,4 @@
 //! moment.js locale configuration
-//! locale : Spanish (Dominican Republic) [es-do]
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -9,74 +8,84 @@
 }(this, (function (moment) { 'use strict';
 
 
-var monthsShortDot = 'ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.'.split('_');
-var monthsShort = 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_');
+    var monthsShortDot = 'ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.'.split('_'),
+        monthsShort = 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_');
 
-var esDo = moment.defineLocale('es-do', {
-    months : 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'),
-    monthsShort : function (m, format) {
-        if (!m) {
-            return monthsShortDot;
-        } else if (/-MMM-/.test(format)) {
-            return monthsShort[m.month()];
-        } else {
-            return monthsShortDot[m.month()];
+    var monthsParse = [/^ene/i, /^feb/i, /^mar/i, /^abr/i, /^may/i, /^jun/i, /^jul/i, /^ago/i, /^sep/i, /^oct/i, /^nov/i, /^dic/i];
+    var monthsRegex = /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre|ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i;
+
+    var esDo = moment.defineLocale('es-do', {
+        months : 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'),
+        monthsShort : function (m, format) {
+            if (!m) {
+                return monthsShortDot;
+            } else if (/-MMM-/.test(format)) {
+                return monthsShort[m.month()];
+            } else {
+                return monthsShortDot[m.month()];
+            }
+        },
+        monthsRegex: monthsRegex,
+        monthsShortRegex: monthsRegex,
+        monthsStrictRegex: /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre)/i,
+        monthsShortStrictRegex: /^(ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i,
+        monthsParse: monthsParse,
+        longMonthsParse: monthsParse,
+        shortMonthsParse: monthsParse,
+        weekdays : 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'),
+        weekdaysShort : 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'),
+        weekdaysMin : 'do_lu_ma_mi_ju_vi_sá'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'DD/MM/YYYY',
+            LL : 'D [de] MMMM [de] YYYY',
+            LLL : 'D [de] MMMM [de] YYYY h:mm A',
+            LLLL : 'dddd, D [de] MMMM [de] YYYY h:mm A'
+        },
+        calendar : {
+            sameDay : function () {
+                return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            nextDay : function () {
+                return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            nextWeek : function () {
+                return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            lastDay : function () {
+                return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            lastWeek : function () {
+                return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'en %s',
+            past : 'hace %s',
+            s : 'unos segundos',
+            ss : '%d segundos',
+            m : 'un minuto',
+            mm : '%d minutos',
+            h : 'una hora',
+            hh : '%d horas',
+            d : 'un día',
+            dd : '%d días',
+            M : 'un mes',
+            MM : '%d meses',
+            y : 'un año',
+            yy : '%d años'
+        },
+        dayOfMonthOrdinalParse : /\d{1,2}º/,
+        ordinal : '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
-    },
-    monthsParseExact : true,
-    weekdays : 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'),
-    weekdaysShort : 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'),
-    weekdaysMin : 'do_lu_ma_mi_ju_vi_sá'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'h:mm A',
-        LTS : 'h:mm:ss A',
-        L : 'DD/MM/YYYY',
-        LL : 'D [de] MMMM [de] YYYY',
-        LLL : 'D [de] MMMM [de] YYYY h:mm A',
-        LLLL : 'dddd, D [de] MMMM [de] YYYY h:mm A'
-    },
-    calendar : {
-        sameDay : function () {
-            return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-        },
-        nextDay : function () {
-            return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-        },
-        nextWeek : function () {
-            return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-        },
-        lastDay : function () {
-            return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-        },
-        lastWeek : function () {
-            return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-        },
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'en %s',
-        past : 'hace %s',
-        s : 'unos segundos',
-        m : 'un minuto',
-        mm : '%d minutos',
-        h : 'una hora',
-        hh : '%d horas',
-        d : 'un día',
-        dd : '%d días',
-        M : 'un mes',
-        MM : '%d meses',
-        y : 'un año',
-        yy : '%d años'
-    },
-    dayOfMonthOrdinalParse : /\d{1,2}º/,
-    ordinal : '%dº',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    });
 
-return esDo;
+    return esDo;
 
 })));
diff --git a/lib/javascripts/moment_locale/es-us.js b/lib/javascripts/moment_locale/es-us.js
new file mode 100755
index 00000000000..c12b532697e
--- /dev/null
+++ b/lib/javascripts/moment_locale/es-us.js
@@ -0,0 +1,82 @@
+//! moment.js locale configuration
+
+;(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined'
+       && typeof require === 'function' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
+   factory(global.moment)
+}(this, (function (moment) { 'use strict';
+
+
+    var monthsShortDot = 'ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.'.split('_'),
+        monthsShort = 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_');
+
+    var esUs = moment.defineLocale('es-us', {
+        months : 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'),
+        monthsShort : function (m, format) {
+            if (!m) {
+                return monthsShortDot;
+            } else if (/-MMM-/.test(format)) {
+                return monthsShort[m.month()];
+            } else {
+                return monthsShortDot[m.month()];
+            }
+        },
+        monthsParseExact : true,
+        weekdays : 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'),
+        weekdaysShort : 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'),
+        weekdaysMin : 'do_lu_ma_mi_ju_vi_sá'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'MM/DD/YYYY',
+            LL : 'MMMM [de] D [de] YYYY',
+            LLL : 'MMMM [de] D [de] YYYY h:mm A',
+            LLLL : 'dddd, MMMM [de] D [de] YYYY h:mm A'
+        },
+        calendar : {
+            sameDay : function () {
+                return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            nextDay : function () {
+                return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            nextWeek : function () {
+                return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            lastDay : function () {
+                return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            lastWeek : function () {
+                return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'en %s',
+            past : 'hace %s',
+            s : 'unos segundos',
+            ss : '%d segundos',
+            m : 'un minuto',
+            mm : '%d minutos',
+            h : 'una hora',
+            hh : '%d horas',
+            d : 'un día',
+            dd : '%d días',
+            M : 'un mes',
+            MM : '%d meses',
+            y : 'un año',
+            yy : '%d años'
+        },
+        dayOfMonthOrdinalParse : /\d{1,2}º/,
+        ordinal : '%dº',
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return esUs;
+
+})));
diff --git a/lib/javascripts/moment_locale/es.js b/lib/javascripts/moment_locale/es.js
old mode 100644
new mode 100755
index c0dea59abd1..aed68026037
--- a/lib/javascripts/moment_locale/es.js
+++ b/lib/javascripts/moment_locale/es.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Spanish [es]
-//! author : Julio Napurí : https://github.com/julionc
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,74 +8,84 @@
 }(this, (function (moment) { 'use strict';
 
 
-var monthsShortDot = 'ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.'.split('_');
-var monthsShort = 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_');
+    var monthsShortDot = 'ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.'.split('_'),
+        monthsShort = 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_');
 
-var es = moment.defineLocale('es', {
-    months : 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'),
-    monthsShort : function (m, format) {
-        if (!m) {
-            return monthsShortDot;
-        } else if (/-MMM-/.test(format)) {
-            return monthsShort[m.month()];
-        } else {
-            return monthsShortDot[m.month()];
+    var monthsParse = [/^ene/i, /^feb/i, /^mar/i, /^abr/i, /^may/i, /^jun/i, /^jul/i, /^ago/i, /^sep/i, /^oct/i, /^nov/i, /^dic/i];
+    var monthsRegex = /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre|ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i;
+
+    var es = moment.defineLocale('es', {
+        months : 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'),
+        monthsShort : function (m, format) {
+            if (!m) {
+                return monthsShortDot;
+            } else if (/-MMM-/.test(format)) {
+                return monthsShort[m.month()];
+            } else {
+                return monthsShortDot[m.month()];
+            }
+        },
+        monthsRegex : monthsRegex,
+        monthsShortRegex : monthsRegex,
+        monthsStrictRegex : /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre)/i,
+        monthsShortStrictRegex : /^(ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i,
+        monthsParse : monthsParse,
+        longMonthsParse : monthsParse,
+        shortMonthsParse : monthsParse,
+        weekdays : 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'),
+        weekdaysShort : 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'),
+        weekdaysMin : 'do_lu_ma_mi_ju_vi_sá'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D [de] MMMM [de] YYYY',
+            LLL : 'D [de] MMMM [de] YYYY H:mm',
+            LLLL : 'dddd, D [de] MMMM [de] YYYY H:mm'
+        },
+        calendar : {
+            sameDay : function () {
+                return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            nextDay : function () {
+                return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            nextWeek : function () {
+                return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            lastDay : function () {
+                return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            lastWeek : function () {
+                return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'en %s',
+            past : 'hace %s',
+            s : 'unos segundos',
+            ss : '%d segundos',
+            m : 'un minuto',
+            mm : '%d minutos',
+            h : 'una hora',
+            hh : '%d horas',
+            d : 'un día',
+            dd : '%d días',
+            M : 'un mes',
+            MM : '%d meses',
+            y : 'un año',
+            yy : '%d años'
+        },
+        dayOfMonthOrdinalParse : /\d{1,2}º/,
+        ordinal : '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
-    },
-    monthsParseExact : true,
-    weekdays : 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'),
-    weekdaysShort : 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'),
-    weekdaysMin : 'do_lu_ma_mi_ju_vi_sá'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'H:mm',
-        LTS : 'H:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D [de] MMMM [de] YYYY',
-        LLL : 'D [de] MMMM [de] YYYY H:mm',
-        LLLL : 'dddd, D [de] MMMM [de] YYYY H:mm'
-    },
-    calendar : {
-        sameDay : function () {
-            return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-        },
-        nextDay : function () {
-            return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-        },
-        nextWeek : function () {
-            return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-        },
-        lastDay : function () {
-            return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-        },
-        lastWeek : function () {
-            return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-        },
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'en %s',
-        past : 'hace %s',
-        s : 'unos segundos',
-        m : 'un minuto',
-        mm : '%d minutos',
-        h : 'una hora',
-        hh : '%d horas',
-        d : 'un día',
-        dd : '%d días',
-        M : 'un mes',
-        MM : '%d meses',
-        y : 'un año',
-        yy : '%d años'
-    },
-    dayOfMonthOrdinalParse : /\d{1,2}º/,
-    ordinal : '%dº',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    });
 
-return es;
+    return es;
 
 })));
diff --git a/lib/javascripts/moment_locale/et.js b/lib/javascripts/moment_locale/et.js
old mode 100644
new mode 100755
index 3a759e9e89f..8a81b040833
--- a/lib/javascripts/moment_locale/et.js
+++ b/lib/javascripts/moment_locale/et.js
@@ -1,7 +1,4 @@
 //! moment.js locale configuration
-//! locale : Estonian [et]
-//! author : Henry Kehlmann : https://github.com/madhenry
-//! improvements : Illimar Tambek : https://github.com/ragulka
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -11,70 +8,72 @@
 }(this, (function (moment) { 'use strict';
 
 
-function processRelativeTime(number, withoutSuffix, key, isFuture) {
-    var format = {
-        's' : ['mõne sekundi', 'mõni sekund', 'paar sekundit'],
-        'm' : ['ühe minuti', 'üks minut'],
-        'mm': [number + ' minuti', number + ' minutit'],
-        'h' : ['ühe tunni', 'tund aega', 'üks tund'],
-        'hh': [number + ' tunni', number + ' tundi'],
-        'd' : ['ühe päeva', 'üks päev'],
-        'M' : ['kuu aja', 'kuu aega', 'üks kuu'],
-        'MM': [number + ' kuu', number + ' kuud'],
-        'y' : ['ühe aasta', 'aasta', 'üks aasta'],
-        'yy': [number + ' aasta', number + ' aastat']
-    };
-    if (withoutSuffix) {
-        return format[key][2] ? format[key][2] : format[key][1];
+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var format = {
+            's' : ['mõne sekundi', 'mõni sekund', 'paar sekundit'],
+            'ss': [number + 'sekundi', number + 'sekundit'],
+            'm' : ['ühe minuti', 'üks minut'],
+            'mm': [number + ' minuti', number + ' minutit'],
+            'h' : ['ühe tunni', 'tund aega', 'üks tund'],
+            'hh': [number + ' tunni', number + ' tundi'],
+            'd' : ['ühe päeva', 'üks päev'],
+            'M' : ['kuu aja', 'kuu aega', 'üks kuu'],
+            'MM': [number + ' kuu', number + ' kuud'],
+            'y' : ['ühe aasta', 'aasta', 'üks aasta'],
+            'yy': [number + ' aasta', number + ' aastat']
+        };
+        if (withoutSuffix) {
+            return format[key][2] ? format[key][2] : format[key][1];
+        }
+        return isFuture ? format[key][0] : format[key][1];
     }
-    return isFuture ? format[key][0] : format[key][1];
-}
 
-var et = moment.defineLocale('et', {
-    months        : 'jaanuar_veebruar_märts_aprill_mai_juuni_juuli_august_september_oktoober_november_detsember'.split('_'),
-    monthsShort   : 'jaan_veebr_märts_apr_mai_juuni_juuli_aug_sept_okt_nov_dets'.split('_'),
-    weekdays      : 'pühapäev_esmaspäev_teisipäev_kolmapäev_neljapäev_reede_laupäev'.split('_'),
-    weekdaysShort : 'P_E_T_K_N_R_L'.split('_'),
-    weekdaysMin   : 'P_E_T_K_N_R_L'.split('_'),
-    longDateFormat : {
-        LT   : 'H:mm',
-        LTS : 'H:mm:ss',
-        L    : 'DD.MM.YYYY',
-        LL   : 'D. MMMM YYYY',
-        LLL  : 'D. MMMM YYYY H:mm',
-        LLLL : 'dddd, D. MMMM YYYY H:mm'
-    },
-    calendar : {
-        sameDay  : '[Täna,] LT',
-        nextDay  : '[Homme,] LT',
-        nextWeek : '[Järgmine] dddd LT',
-        lastDay  : '[Eile,] LT',
-        lastWeek : '[Eelmine] dddd LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : '%s pärast',
-        past   : '%s tagasi',
-        s      : processRelativeTime,
-        m      : processRelativeTime,
-        mm     : processRelativeTime,
-        h      : processRelativeTime,
-        hh     : processRelativeTime,
-        d      : processRelativeTime,
-        dd     : '%d päeva',
-        M      : processRelativeTime,
-        MM     : processRelativeTime,
-        y      : processRelativeTime,
-        yy     : processRelativeTime
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    var et = moment.defineLocale('et', {
+        months        : 'jaanuar_veebruar_märts_aprill_mai_juuni_juuli_august_september_oktoober_november_detsember'.split('_'),
+        monthsShort   : 'jaan_veebr_märts_apr_mai_juuni_juuli_aug_sept_okt_nov_dets'.split('_'),
+        weekdays      : 'pühapäev_esmaspäev_teisipäev_kolmapäev_neljapäev_reede_laupäev'.split('_'),
+        weekdaysShort : 'P_E_T_K_N_R_L'.split('_'),
+        weekdaysMin   : 'P_E_T_K_N_R_L'.split('_'),
+        longDateFormat : {
+            LT   : 'H:mm',
+            LTS : 'H:mm:ss',
+            L    : 'DD.MM.YYYY',
+            LL   : 'D. MMMM YYYY',
+            LLL  : 'D. MMMM YYYY H:mm',
+            LLLL : 'dddd, D. MMMM YYYY H:mm'
+        },
+        calendar : {
+            sameDay  : '[Täna,] LT',
+            nextDay  : '[Homme,] LT',
+            nextWeek : '[Järgmine] dddd LT',
+            lastDay  : '[Eile,] LT',
+            lastWeek : '[Eelmine] dddd LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s pärast',
+            past   : '%s tagasi',
+            s      : processRelativeTime,
+            ss     : processRelativeTime,
+            m      : processRelativeTime,
+            mm     : processRelativeTime,
+            h      : processRelativeTime,
+            hh     : processRelativeTime,
+            d      : processRelativeTime,
+            dd     : '%d päeva',
+            M      : processRelativeTime,
+            MM     : processRelativeTime,
+            y      : processRelativeTime,
+            yy     : processRelativeTime
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-return et;
+    return et;
 
 })));
diff --git a/lib/javascripts/moment_locale/eu.js b/lib/javascripts/moment_locale/eu.js
old mode 100644
new mode 100755
index e2021cfa1a8..afe919fdab8
--- a/lib/javascripts/moment_locale/eu.js
+++ b/lib/javascripts/moment_locale/eu.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Basque [eu]
-//! author : Eneko Illarramendi : https://github.com/eillarra
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,57 +8,58 @@
 }(this, (function (moment) { 'use strict';
 
 
-var eu = moment.defineLocale('eu', {
-    months : 'urtarrila_otsaila_martxoa_apirila_maiatza_ekaina_uztaila_abuztua_iraila_urria_azaroa_abendua'.split('_'),
-    monthsShort : 'urt._ots._mar._api._mai._eka._uzt._abu._ira._urr._aza._abe.'.split('_'),
-    monthsParseExact : true,
-    weekdays : 'igandea_astelehena_asteartea_asteazkena_osteguna_ostirala_larunbata'.split('_'),
-    weekdaysShort : 'ig._al._ar._az._og._ol._lr.'.split('_'),
-    weekdaysMin : 'ig_al_ar_az_og_ol_lr'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'YYYY-MM-DD',
-        LL : 'YYYY[ko] MMMM[ren] D[a]',
-        LLL : 'YYYY[ko] MMMM[ren] D[a] HH:mm',
-        LLLL : 'dddd, YYYY[ko] MMMM[ren] D[a] HH:mm',
-        l : 'YYYY-M-D',
-        ll : 'YYYY[ko] MMM D[a]',
-        lll : 'YYYY[ko] MMM D[a] HH:mm',
-        llll : 'ddd, YYYY[ko] MMM D[a] HH:mm'
-    },
-    calendar : {
-        sameDay : '[gaur] LT[etan]',
-        nextDay : '[bihar] LT[etan]',
-        nextWeek : 'dddd LT[etan]',
-        lastDay : '[atzo] LT[etan]',
-        lastWeek : '[aurreko] dddd LT[etan]',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : '%s barru',
-        past : 'duela %s',
-        s : 'segundo batzuk',
-        m : 'minutu bat',
-        mm : '%d minutu',
-        h : 'ordu bat',
-        hh : '%d ordu',
-        d : 'egun bat',
-        dd : '%d egun',
-        M : 'hilabete bat',
-        MM : '%d hilabete',
-        y : 'urte bat',
-        yy : '%d urte'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    var eu = moment.defineLocale('eu', {
+        months : 'urtarrila_otsaila_martxoa_apirila_maiatza_ekaina_uztaila_abuztua_iraila_urria_azaroa_abendua'.split('_'),
+        monthsShort : 'urt._ots._mar._api._mai._eka._uzt._abu._ira._urr._aza._abe.'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'igandea_astelehena_asteartea_asteazkena_osteguna_ostirala_larunbata'.split('_'),
+        weekdaysShort : 'ig._al._ar._az._og._ol._lr.'.split('_'),
+        weekdaysMin : 'ig_al_ar_az_og_ol_lr'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'YYYY-MM-DD',
+            LL : 'YYYY[ko] MMMM[ren] D[a]',
+            LLL : 'YYYY[ko] MMMM[ren] D[a] HH:mm',
+            LLLL : 'dddd, YYYY[ko] MMMM[ren] D[a] HH:mm',
+            l : 'YYYY-M-D',
+            ll : 'YYYY[ko] MMM D[a]',
+            lll : 'YYYY[ko] MMM D[a] HH:mm',
+            llll : 'ddd, YYYY[ko] MMM D[a] HH:mm'
+        },
+        calendar : {
+            sameDay : '[gaur] LT[etan]',
+            nextDay : '[bihar] LT[etan]',
+            nextWeek : 'dddd LT[etan]',
+            lastDay : '[atzo] LT[etan]',
+            lastWeek : '[aurreko] dddd LT[etan]',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s barru',
+            past : 'duela %s',
+            s : 'segundo batzuk',
+            ss : '%d segundo',
+            m : 'minutu bat',
+            mm : '%d minutu',
+            h : 'ordu bat',
+            hh : '%d ordu',
+            d : 'egun bat',
+            dd : '%d egun',
+            M : 'hilabete bat',
+            MM : '%d hilabete',
+            y : 'urte bat',
+            yy : '%d urte'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
 
-return eu;
+    return eu;
 
 })));
diff --git a/lib/javascripts/moment_locale/fa.js b/lib/javascripts/moment_locale/fa.js
old mode 100644
new mode 100755
index e6e5619d09a..c042e315f2c
--- a/lib/javascripts/moment_locale/fa.js
+++ b/lib/javascripts/moment_locale/fa.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Persian [fa]
-//! author : Ebrahim Byagowi : https://github.com/ebraminio
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,98 +8,98 @@
 }(this, (function (moment) { 'use strict';
 
 
-var symbolMap = {
-    '1': '۱',
-    '2': '۲',
-    '3': '۳',
-    '4': '۴',
-    '5': '۵',
-    '6': '۶',
-    '7': '۷',
-    '8': '۸',
-    '9': '۹',
-    '0': '۰'
-};
-var numberMap = {
-    '۱': '1',
-    '۲': '2',
-    '۳': '3',
-    '۴': '4',
-    '۵': '5',
-    '۶': '6',
-    '۷': '7',
-    '۸': '8',
-    '۹': '9',
-    '۰': '0'
-};
+    var symbolMap = {
+        '1': '۱',
+        '2': '۲',
+        '3': '۳',
+        '4': '۴',
+        '5': '۵',
+        '6': '۶',
+        '7': '۷',
+        '8': '۸',
+        '9': '۹',
+        '0': '۰'
+    }, numberMap = {
+        '۱': '1',
+        '۲': '2',
+        '۳': '3',
+        '۴': '4',
+        '۵': '5',
+        '۶': '6',
+        '۷': '7',
+        '۸': '8',
+        '۹': '9',
+        '۰': '0'
+    };
 
-var fa = moment.defineLocale('fa', {
-    months : 'ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر'.split('_'),
-    monthsShort : 'ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر'.split('_'),
-    weekdays : 'یک\u200cشنبه_دوشنبه_سه\u200cشنبه_چهارشنبه_پنج\u200cشنبه_جمعه_شنبه'.split('_'),
-    weekdaysShort : 'یک\u200cشنبه_دوشنبه_سه\u200cشنبه_چهارشنبه_پنج\u200cشنبه_جمعه_شنبه'.split('_'),
-    weekdaysMin : 'ی_د_س_چ_پ_ج_ش'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd, D MMMM YYYY HH:mm'
-    },
-    meridiemParse: /قبل از ظهر|بعد از ظهر/,
-    isPM: function (input) {
-        return /بعد از ظهر/.test(input);
-    },
-    meridiem : function (hour, minute, isLower) {
-        if (hour < 12) {
-            return 'قبل از ظهر';
-        } else {
-            return 'بعد از ظهر';
+    var fa = moment.defineLocale('fa', {
+        months : 'ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر'.split('_'),
+        monthsShort : 'ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر'.split('_'),
+        weekdays : 'یک\u200cشنبه_دوشنبه_سه\u200cشنبه_چهارشنبه_پنج\u200cشنبه_جمعه_شنبه'.split('_'),
+        weekdaysShort : 'یک\u200cشنبه_دوشنبه_سه\u200cشنبه_چهارشنبه_پنج\u200cشنبه_جمعه_شنبه'.split('_'),
+        weekdaysMin : 'ی_د_س_چ_پ_ج_ش'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        meridiemParse: /قبل از ظهر|بعد از ظهر/,
+        isPM: function (input) {
+            return /بعد از ظهر/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'قبل از ظهر';
+            } else {
+                return 'بعد از ظهر';
+            }
+        },
+        calendar : {
+            sameDay : '[امروز ساعت] LT',
+            nextDay : '[فردا ساعت] LT',
+            nextWeek : 'dddd [ساعت] LT',
+            lastDay : '[دیروز ساعت] LT',
+            lastWeek : 'dddd [پیش] [ساعت] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'در %s',
+            past : '%s پیش',
+            s : 'چند ثانیه',
+            ss : 'ثانیه d%',
+            m : 'یک دقیقه',
+            mm : '%d دقیقه',
+            h : 'یک ساعت',
+            hh : '%d ساعت',
+            d : 'یک روز',
+            dd : '%d روز',
+            M : 'یک ماه',
+            MM : '%d ماه',
+            y : 'یک سال',
+            yy : '%d سال'
+        },
+        preparse: function (string) {
+            return string.replace(/[۰-۹]/g, function (match) {
+                return numberMap[match];
+            }).replace(/،/g, ',');
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            }).replace(/,/g, '،');
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}م/,
+        ordinal : '%dم',
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12 // The week that contains Jan 1st is the first week of the year.
         }
-    },
-    calendar : {
-        sameDay : '[امروز ساعت] LT',
-        nextDay : '[فردا ساعت] LT',
-        nextWeek : 'dddd [ساعت] LT',
-        lastDay : '[دیروز ساعت] LT',
-        lastWeek : 'dddd [پیش] [ساعت] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'در %s',
-        past : '%s پیش',
-        s : 'چند ثانیه',
-        m : 'یک دقیقه',
-        mm : '%d دقیقه',
-        h : 'یک ساعت',
-        hh : '%d ساعت',
-        d : 'یک روز',
-        dd : '%d روز',
-        M : 'یک ماه',
-        MM : '%d ماه',
-        y : 'یک سال',
-        yy : '%d سال'
-    },
-    preparse: function (string) {
-        return string.replace(/[۰-۹]/g, function (match) {
-            return numberMap[match];
-        }).replace(/،/g, ',');
-    },
-    postformat: function (string) {
-        return string.replace(/\d/g, function (match) {
-            return symbolMap[match];
-        }).replace(/,/g, '،');
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}م/,
-    ordinal : '%dم',
-    week : {
-        dow : 6, // Saturday is the first day of the week.
-        doy : 12 // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    });
 
-return fa;
+    return fa;
 
 })));
diff --git a/lib/javascripts/moment_locale/fi.js b/lib/javascripts/moment_locale/fi.js
old mode 100644
new mode 100755
index 3eeef5c14a8..b01159935a3
--- a/lib/javascripts/moment_locale/fi.js
+++ b/lib/javascripts/moment_locale/fi.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Finnish [fi]
-//! author : Tarmo Aidantausta : https://github.com/bleadof
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,98 +8,101 @@
 }(this, (function (moment) { 'use strict';
 
 
-var numbersPast = 'nolla yksi kaksi kolme neljä viisi kuusi seitsemän kahdeksan yhdeksän'.split(' ');
-var numbersFuture = [
-        'nolla', 'yhden', 'kahden', 'kolmen', 'neljän', 'viiden', 'kuuden',
-        numbersPast[7], numbersPast[8], numbersPast[9]
-    ];
-function translate(number, withoutSuffix, key, isFuture) {
-    var result = '';
-    switch (key) {
-        case 's':
-            return isFuture ? 'muutaman sekunnin' : 'muutama sekunti';
-        case 'm':
-            return isFuture ? 'minuutin' : 'minuutti';
-        case 'mm':
-            result = isFuture ? 'minuutin' : 'minuuttia';
-            break;
-        case 'h':
-            return isFuture ? 'tunnin' : 'tunti';
-        case 'hh':
-            result = isFuture ? 'tunnin' : 'tuntia';
-            break;
-        case 'd':
-            return isFuture ? 'päivän' : 'päivä';
-        case 'dd':
-            result = isFuture ? 'päivän' : 'päivää';
-            break;
-        case 'M':
-            return isFuture ? 'kuukauden' : 'kuukausi';
-        case 'MM':
-            result = isFuture ? 'kuukauden' : 'kuukautta';
-            break;
-        case 'y':
-            return isFuture ? 'vuoden' : 'vuosi';
-        case 'yy':
-            result = isFuture ? 'vuoden' : 'vuotta';
-            break;
+    var numbersPast = 'nolla yksi kaksi kolme neljä viisi kuusi seitsemän kahdeksan yhdeksän'.split(' '),
+        numbersFuture = [
+            'nolla', 'yhden', 'kahden', 'kolmen', 'neljän', 'viiden', 'kuuden',
+            numbersPast[7], numbersPast[8], numbersPast[9]
+        ];
+    function translate(number, withoutSuffix, key, isFuture) {
+        var result = '';
+        switch (key) {
+            case 's':
+                return isFuture ? 'muutaman sekunnin' : 'muutama sekunti';
+            case 'ss':
+                return isFuture ? 'sekunnin' : 'sekuntia';
+            case 'm':
+                return isFuture ? 'minuutin' : 'minuutti';
+            case 'mm':
+                result = isFuture ? 'minuutin' : 'minuuttia';
+                break;
+            case 'h':
+                return isFuture ? 'tunnin' : 'tunti';
+            case 'hh':
+                result = isFuture ? 'tunnin' : 'tuntia';
+                break;
+            case 'd':
+                return isFuture ? 'päivän' : 'päivä';
+            case 'dd':
+                result = isFuture ? 'päivän' : 'päivää';
+                break;
+            case 'M':
+                return isFuture ? 'kuukauden' : 'kuukausi';
+            case 'MM':
+                result = isFuture ? 'kuukauden' : 'kuukautta';
+                break;
+            case 'y':
+                return isFuture ? 'vuoden' : 'vuosi';
+            case 'yy':
+                result = isFuture ? 'vuoden' : 'vuotta';
+                break;
+        }
+        result = verbalNumber(number, isFuture) + ' ' + result;
+        return result;
     }
-    result = verbalNumber(number, isFuture) + ' ' + result;
-    return result;
-}
-function verbalNumber(number, isFuture) {
-    return number < 10 ? (isFuture ? numbersFuture[number] : numbersPast[number]) : number;
-}
-
-var fi = moment.defineLocale('fi', {
-    months : 'tammikuu_helmikuu_maaliskuu_huhtikuu_toukokuu_kesäkuu_heinäkuu_elokuu_syyskuu_lokakuu_marraskuu_joulukuu'.split('_'),
-    monthsShort : 'tammi_helmi_maalis_huhti_touko_kesä_heinä_elo_syys_loka_marras_joulu'.split('_'),
-    weekdays : 'sunnuntai_maanantai_tiistai_keskiviikko_torstai_perjantai_lauantai'.split('_'),
-    weekdaysShort : 'su_ma_ti_ke_to_pe_la'.split('_'),
-    weekdaysMin : 'su_ma_ti_ke_to_pe_la'.split('_'),
-    longDateFormat : {
-        LT : 'HH.mm',
-        LTS : 'HH.mm.ss',
-        L : 'DD.MM.YYYY',
-        LL : 'Do MMMM[ta] YYYY',
-        LLL : 'Do MMMM[ta] YYYY, [klo] HH.mm',
-        LLLL : 'dddd, Do MMMM[ta] YYYY, [klo] HH.mm',
-        l : 'D.M.YYYY',
-        ll : 'Do MMM YYYY',
-        lll : 'Do MMM YYYY, [klo] HH.mm',
-        llll : 'ddd, Do MMM YYYY, [klo] HH.mm'
-    },
-    calendar : {
-        sameDay : '[tänään] [klo] LT',
-        nextDay : '[huomenna] [klo] LT',
-        nextWeek : 'dddd [klo] LT',
-        lastDay : '[eilen] [klo] LT',
-        lastWeek : '[viime] dddd[na] [klo] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : '%s päästä',
-        past : '%s sitten',
-        s : translate,
-        m : translate,
-        mm : translate,
-        h : translate,
-        hh : translate,
-        d : translate,
-        dd : translate,
-        M : translate,
-        MM : translate,
-        y : translate,
-        yy : translate
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    function verbalNumber(number, isFuture) {
+        return number < 10 ? (isFuture ? numbersFuture[number] : numbersPast[number]) : number;
     }
-});
 
-return fi;
+    var fi = moment.defineLocale('fi', {
+        months : 'tammikuu_helmikuu_maaliskuu_huhtikuu_toukokuu_kesäkuu_heinäkuu_elokuu_syyskuu_lokakuu_marraskuu_joulukuu'.split('_'),
+        monthsShort : 'tammi_helmi_maalis_huhti_touko_kesä_heinä_elo_syys_loka_marras_joulu'.split('_'),
+        weekdays : 'sunnuntai_maanantai_tiistai_keskiviikko_torstai_perjantai_lauantai'.split('_'),
+        weekdaysShort : 'su_ma_ti_ke_to_pe_la'.split('_'),
+        weekdaysMin : 'su_ma_ti_ke_to_pe_la'.split('_'),
+        longDateFormat : {
+            LT : 'HH.mm',
+            LTS : 'HH.mm.ss',
+            L : 'DD.MM.YYYY',
+            LL : 'Do MMMM[ta] YYYY',
+            LLL : 'Do MMMM[ta] YYYY, [klo] HH.mm',
+            LLLL : 'dddd, Do MMMM[ta] YYYY, [klo] HH.mm',
+            l : 'D.M.YYYY',
+            ll : 'Do MMM YYYY',
+            lll : 'Do MMM YYYY, [klo] HH.mm',
+            llll : 'ddd, Do MMM YYYY, [klo] HH.mm'
+        },
+        calendar : {
+            sameDay : '[tänään] [klo] LT',
+            nextDay : '[huomenna] [klo] LT',
+            nextWeek : 'dddd [klo] LT',
+            lastDay : '[eilen] [klo] LT',
+            lastWeek : '[viime] dddd[na] [klo] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s päästä',
+            past : '%s sitten',
+            s : translate,
+            ss : translate,
+            m : translate,
+            mm : translate,
+            h : translate,
+            hh : translate,
+            d : translate,
+            dd : translate,
+            M : translate,
+            MM : translate,
+            y : translate,
+            yy : translate
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return fi;
 
 })));
diff --git a/lib/javascripts/moment_locale/fo.js b/lib/javascripts/moment_locale/fo.js
old mode 100644
new mode 100755
index eec43bc6b4b..eac46d2be50
--- a/lib/javascripts/moment_locale/fo.js
+++ b/lib/javascripts/moment_locale/fo.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Faroese [fo]
-//! author : Ragnar Johannesen : https://github.com/ragnar123
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,51 +8,52 @@
 }(this, (function (moment) { 'use strict';
 
 
-var fo = moment.defineLocale('fo', {
-    months : 'januar_februar_mars_apríl_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
-    monthsShort : 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),
-    weekdays : 'sunnudagur_mánadagur_týsdagur_mikudagur_hósdagur_fríggjadagur_leygardagur'.split('_'),
-    weekdaysShort : 'sun_mán_týs_mik_hós_frí_ley'.split('_'),
-    weekdaysMin : 'su_má_tý_mi_hó_fr_le'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd D. MMMM, YYYY HH:mm'
-    },
-    calendar : {
-        sameDay : '[Í dag kl.] LT',
-        nextDay : '[Í morgin kl.] LT',
-        nextWeek : 'dddd [kl.] LT',
-        lastDay : '[Í gjár kl.] LT',
-        lastWeek : '[síðstu] dddd [kl] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'um %s',
-        past : '%s síðani',
-        s : 'fá sekund',
-        m : 'ein minutt',
-        mm : '%d minuttir',
-        h : 'ein tími',
-        hh : '%d tímar',
-        d : 'ein dagur',
-        dd : '%d dagar',
-        M : 'ein mánaði',
-        MM : '%d mánaðir',
-        y : 'eitt ár',
-        yy : '%d ár'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    var fo = moment.defineLocale('fo', {
+        months : 'januar_februar_mars_apríl_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),
+        weekdays : 'sunnudagur_mánadagur_týsdagur_mikudagur_hósdagur_fríggjadagur_leygardagur'.split('_'),
+        weekdaysShort : 'sun_mán_týs_mik_hós_frí_ley'.split('_'),
+        weekdaysMin : 'su_má_tý_mi_hó_fr_le'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D. MMMM, YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[Í dag kl.] LT',
+            nextDay : '[Í morgin kl.] LT',
+            nextWeek : 'dddd [kl.] LT',
+            lastDay : '[Í gjár kl.] LT',
+            lastWeek : '[síðstu] dddd [kl] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'um %s',
+            past : '%s síðani',
+            s : 'fá sekund',
+            ss : '%d sekundir',
+            m : 'ein minutt',
+            mm : '%d minuttir',
+            h : 'ein tími',
+            hh : '%d tímar',
+            d : 'ein dagur',
+            dd : '%d dagar',
+            M : 'ein mánaði',
+            MM : '%d mánaðir',
+            y : 'eitt ár',
+            yy : '%d ár'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-return fo;
+    return fo;
 
 })));
diff --git a/lib/javascripts/moment_locale/fr-ca.js b/lib/javascripts/moment_locale/fr-ca.js
old mode 100644
new mode 100755
index 49e61d299df..ad1f77d5e6f
--- a/lib/javascripts/moment_locale/fr-ca.js
+++ b/lib/javascripts/moment_locale/fr-ca.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : French (Canada) [fr-ca]
-//! author : Jonathan Abourbih : https://github.com/jonbca
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,65 +8,66 @@
 }(this, (function (moment) { 'use strict';
 
 
-var frCa = moment.defineLocale('fr-ca', {
-    months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
-    monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
-    monthsParseExact : true,
-    weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
-    weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
-    weekdaysMin : 'Di_Lu_Ma_Me_Je_Ve_Sa'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'YYYY-MM-DD',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd D MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay : '[Aujourd’hui à] LT',
-        nextDay : '[Demain à] LT',
-        nextWeek : 'dddd [à] LT',
-        lastDay : '[Hier à] LT',
-        lastWeek : 'dddd [dernier à] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'dans %s',
-        past : 'il y a %s',
-        s : 'quelques secondes',
-        m : 'une minute',
-        mm : '%d minutes',
-        h : 'une heure',
-        hh : '%d heures',
-        d : 'un jour',
-        dd : '%d jours',
-        M : 'un mois',
-        MM : '%d mois',
-        y : 'un an',
-        yy : '%d ans'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}(er|e)/,
-    ordinal : function (number, period) {
-        switch (period) {
-            // Words with masculine grammatical gender: mois, trimestre, jour
-            default:
-            case 'M':
-            case 'Q':
-            case 'D':
-            case 'DDD':
-            case 'd':
-                return number + (number === 1 ? 'er' : 'e');
+    var frCa = moment.defineLocale('fr-ca', {
+        months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
+        monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
+        weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
+        weekdaysMin : 'di_lu_ma_me_je_ve_sa'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'YYYY-MM-DD',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[Aujourd’hui à] LT',
+            nextDay : '[Demain à] LT',
+            nextWeek : 'dddd [à] LT',
+            lastDay : '[Hier à] LT',
+            lastWeek : 'dddd [dernier à] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'dans %s',
+            past : 'il y a %s',
+            s : 'quelques secondes',
+            ss : '%d secondes',
+            m : 'une minute',
+            mm : '%d minutes',
+            h : 'une heure',
+            hh : '%d heures',
+            d : 'un jour',
+            dd : '%d jours',
+            M : 'un mois',
+            MM : '%d mois',
+            y : 'un an',
+            yy : '%d ans'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(er|e)/,
+        ordinal : function (number, period) {
+            switch (period) {
+                // Words with masculine grammatical gender: mois, trimestre, jour
+                default:
+                case 'M':
+                case 'Q':
+                case 'D':
+                case 'DDD':
+                case 'd':
+                    return number + (number === 1 ? 'er' : 'e');
 
-            // Words with feminine grammatical gender: semaine
-            case 'w':
-            case 'W':
-                return number + (number === 1 ? 're' : 'e');
+                // Words with feminine grammatical gender: semaine
+                case 'w':
+                case 'W':
+                    return number + (number === 1 ? 're' : 'e');
+            }
         }
-    }
-});
+    });
 
-return frCa;
+    return frCa;
 
 })));
diff --git a/lib/javascripts/moment_locale/fr-ch.js b/lib/javascripts/moment_locale/fr-ch.js
old mode 100644
new mode 100755
index 38bf858dc4c..54033d14b8e
--- a/lib/javascripts/moment_locale/fr-ch.js
+++ b/lib/javascripts/moment_locale/fr-ch.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : French (Switzerland) [fr-ch]
-//! author : Gaspard Bucher : https://github.com/gaspard
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,69 +8,70 @@
 }(this, (function (moment) { 'use strict';
 
 
-var frCh = moment.defineLocale('fr-ch', {
-    months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
-    monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
-    monthsParseExact : true,
-    weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
-    weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
-    weekdaysMin : 'Di_Lu_Ma_Me_Je_Ve_Sa'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd D MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay : '[Aujourd’hui à] LT',
-        nextDay : '[Demain à] LT',
-        nextWeek : 'dddd [à] LT',
-        lastDay : '[Hier à] LT',
-        lastWeek : 'dddd [dernier à] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'dans %s',
-        past : 'il y a %s',
-        s : 'quelques secondes',
-        m : 'une minute',
-        mm : '%d minutes',
-        h : 'une heure',
-        hh : '%d heures',
-        d : 'un jour',
-        dd : '%d jours',
-        M : 'un mois',
-        MM : '%d mois',
-        y : 'un an',
-        yy : '%d ans'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}(er|e)/,
-    ordinal : function (number, period) {
-        switch (period) {
-            // Words with masculine grammatical gender: mois, trimestre, jour
-            default:
-            case 'M':
-            case 'Q':
-            case 'D':
-            case 'DDD':
-            case 'd':
-                return number + (number === 1 ? 'er' : 'e');
+    var frCh = moment.defineLocale('fr-ch', {
+        months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
+        monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
+        weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
+        weekdaysMin : 'di_lu_ma_me_je_ve_sa'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[Aujourd’hui à] LT',
+            nextDay : '[Demain à] LT',
+            nextWeek : 'dddd [à] LT',
+            lastDay : '[Hier à] LT',
+            lastWeek : 'dddd [dernier à] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'dans %s',
+            past : 'il y a %s',
+            s : 'quelques secondes',
+            ss : '%d secondes',
+            m : 'une minute',
+            mm : '%d minutes',
+            h : 'une heure',
+            hh : '%d heures',
+            d : 'un jour',
+            dd : '%d jours',
+            M : 'un mois',
+            MM : '%d mois',
+            y : 'un an',
+            yy : '%d ans'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(er|e)/,
+        ordinal : function (number, period) {
+            switch (period) {
+                // Words with masculine grammatical gender: mois, trimestre, jour
+                default:
+                case 'M':
+                case 'Q':
+                case 'D':
+                case 'DDD':
+                case 'd':
+                    return number + (number === 1 ? 'er' : 'e');
 
-            // Words with feminine grammatical gender: semaine
-            case 'w':
-            case 'W':
-                return number + (number === 1 ? 're' : 'e');
+                // Words with feminine grammatical gender: semaine
+                case 'w':
+                case 'W':
+                    return number + (number === 1 ? 're' : 'e');
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    });
 
-return frCh;
+    return frCh;
 
 })));
diff --git a/lib/javascripts/moment_locale/fr.js b/lib/javascripts/moment_locale/fr.js
old mode 100644
new mode 100755
index 7e4cfbce8fc..92867073397
--- a/lib/javascripts/moment_locale/fr.js
+++ b/lib/javascripts/moment_locale/fr.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : French [fr]
-//! author : John Fischer : https://github.com/jfroffice
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,74 +8,75 @@
 }(this, (function (moment) { 'use strict';
 
 
-var fr = moment.defineLocale('fr', {
-    months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
-    monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
-    monthsParseExact : true,
-    weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
-    weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
-    weekdaysMin : 'Di_Lu_Ma_Me_Je_Ve_Sa'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd D MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay : '[Aujourd’hui à] LT',
-        nextDay : '[Demain à] LT',
-        nextWeek : 'dddd [à] LT',
-        lastDay : '[Hier à] LT',
-        lastWeek : 'dddd [dernier à] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'dans %s',
-        past : 'il y a %s',
-        s : 'quelques secondes',
-        m : 'une minute',
-        mm : '%d minutes',
-        h : 'une heure',
-        hh : '%d heures',
-        d : 'un jour',
-        dd : '%d jours',
-        M : 'un mois',
-        MM : '%d mois',
-        y : 'un an',
-        yy : '%d ans'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}(er|)/,
-    ordinal : function (number, period) {
-        switch (period) {
-            // TODO: Return 'e' when day of month > 1. Move this case inside
-            // block for masculine words below.
-            // See https://github.com/moment/moment/issues/3375
-            case 'D':
-                return number + (number === 1 ? 'er' : '');
+    var fr = moment.defineLocale('fr', {
+        months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
+        monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
+        weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
+        weekdaysMin : 'di_lu_ma_me_je_ve_sa'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[Aujourd’hui à] LT',
+            nextDay : '[Demain à] LT',
+            nextWeek : 'dddd [à] LT',
+            lastDay : '[Hier à] LT',
+            lastWeek : 'dddd [dernier à] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'dans %s',
+            past : 'il y a %s',
+            s : 'quelques secondes',
+            ss : '%d secondes',
+            m : 'une minute',
+            mm : '%d minutes',
+            h : 'une heure',
+            hh : '%d heures',
+            d : 'un jour',
+            dd : '%d jours',
+            M : 'un mois',
+            MM : '%d mois',
+            y : 'un an',
+            yy : '%d ans'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(er|)/,
+        ordinal : function (number, period) {
+            switch (period) {
+                // TODO: Return 'e' when day of month > 1. Move this case inside
+                // block for masculine words below.
+                // See https://github.com/moment/moment/issues/3375
+                case 'D':
+                    return number + (number === 1 ? 'er' : '');
 
-            // Words with masculine grammatical gender: mois, trimestre, jour
-            default:
-            case 'M':
-            case 'Q':
-            case 'DDD':
-            case 'd':
-                return number + (number === 1 ? 'er' : 'e');
+                // Words with masculine grammatical gender: mois, trimestre, jour
+                default:
+                case 'M':
+                case 'Q':
+                case 'DDD':
+                case 'd':
+                    return number + (number === 1 ? 'er' : 'e');
 
-            // Words with feminine grammatical gender: semaine
-            case 'w':
-            case 'W':
-                return number + (number === 1 ? 're' : 'e');
+                // Words with feminine grammatical gender: semaine
+                case 'w':
+                case 'W':
+                    return number + (number === 1 ? 're' : 'e');
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    });
 
-return fr;
+    return fr;
 
 })));
diff --git a/lib/javascripts/moment_locale/fy.js b/lib/javascripts/moment_locale/fy.js
old mode 100644
new mode 100755
index 2ed7d5b6e64..9a672bf4ffd
--- a/lib/javascripts/moment_locale/fy.js
+++ b/lib/javascripts/moment_locale/fy.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Frisian [fy]
-//! author : Robin van der Vliet : https://github.com/robin0van0der0v
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,66 +8,67 @@
 }(this, (function (moment) { 'use strict';
 
 
-var monthsShortWithDots = 'jan._feb._mrt._apr._mai_jun._jul._aug._sep._okt._nov._des.'.split('_');
-var monthsShortWithoutDots = 'jan_feb_mrt_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_');
+    var monthsShortWithDots = 'jan._feb._mrt._apr._mai_jun._jul._aug._sep._okt._nov._des.'.split('_'),
+        monthsShortWithoutDots = 'jan_feb_mrt_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_');
 
-var fy = moment.defineLocale('fy', {
-    months : 'jannewaris_febrewaris_maart_april_maaie_juny_july_augustus_septimber_oktober_novimber_desimber'.split('_'),
-    monthsShort : function (m, format) {
-        if (!m) {
-            return monthsShortWithDots;
-        } else if (/-MMM-/.test(format)) {
-            return monthsShortWithoutDots[m.month()];
-        } else {
-            return monthsShortWithDots[m.month()];
+    var fy = moment.defineLocale('fy', {
+        months : 'jannewaris_febrewaris_maart_april_maaie_juny_july_augustus_septimber_oktober_novimber_desimber'.split('_'),
+        monthsShort : function (m, format) {
+            if (!m) {
+                return monthsShortWithDots;
+            } else if (/-MMM-/.test(format)) {
+                return monthsShortWithoutDots[m.month()];
+            } else {
+                return monthsShortWithDots[m.month()];
+            }
+        },
+        monthsParseExact : true,
+        weekdays : 'snein_moandei_tiisdei_woansdei_tongersdei_freed_sneon'.split('_'),
+        weekdaysShort : 'si._mo._ti._wo._to._fr._so.'.split('_'),
+        weekdaysMin : 'Si_Mo_Ti_Wo_To_Fr_So'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD-MM-YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[hjoed om] LT',
+            nextDay: '[moarn om] LT',
+            nextWeek: 'dddd [om] LT',
+            lastDay: '[juster om] LT',
+            lastWeek: '[ôfrûne] dddd [om] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'oer %s',
+            past : '%s lyn',
+            s : 'in pear sekonden',
+            ss : '%d sekonden',
+            m : 'ien minút',
+            mm : '%d minuten',
+            h : 'ien oere',
+            hh : '%d oeren',
+            d : 'ien dei',
+            dd : '%d dagen',
+            M : 'ien moanne',
+            MM : '%d moannen',
+            y : 'ien jier',
+            yy : '%d jierren'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/,
+        ordinal : function (number) {
+            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
-    },
-    monthsParseExact : true,
-    weekdays : 'snein_moandei_tiisdei_woansdei_tongersdei_freed_sneon'.split('_'),
-    weekdaysShort : 'si._mo._ti._wo._to._fr._so.'.split('_'),
-    weekdaysMin : 'Si_Mo_Ti_Wo_To_Fr_So'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD-MM-YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd D MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay: '[hjoed om] LT',
-        nextDay: '[moarn om] LT',
-        nextWeek: 'dddd [om] LT',
-        lastDay: '[juster om] LT',
-        lastWeek: '[ôfrûne] dddd [om] LT',
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'oer %s',
-        past : '%s lyn',
-        s : 'in pear sekonden',
-        m : 'ien minút',
-        mm : '%d minuten',
-        h : 'ien oere',
-        hh : '%d oeren',
-        d : 'ien dei',
-        dd : '%d dagen',
-        M : 'ien moanne',
-        MM : '%d moannen',
-        y : 'ien jier',
-        yy : '%d jierren'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/,
-    ordinal : function (number) {
-        return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    });
 
-return fy;
+    return fy;
 
 })));
diff --git a/lib/javascripts/moment_locale/gd.js b/lib/javascripts/moment_locale/gd.js
old mode 100644
new mode 100755
index af9eec84798..4d0d88a747e
--- a/lib/javascripts/moment_locale/gd.js
+++ b/lib/javascripts/moment_locale/gd.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Scottish Gaelic [gd]
-//! author : Jon Ashdown : https://github.com/jonashdown
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,67 +8,68 @@
 }(this, (function (moment) { 'use strict';
 
 
-var months = [
-    'Am Faoilleach', 'An Gearran', 'Am Màrt', 'An Giblean', 'An Cèitean', 'An t-Ògmhios', 'An t-Iuchar', 'An Lùnastal', 'An t-Sultain', 'An Dàmhair', 'An t-Samhain', 'An Dùbhlachd'
-];
+    var months = [
+        'Am Faoilleach', 'An Gearran', 'Am Màrt', 'An Giblean', 'An Cèitean', 'An t-Ògmhios', 'An t-Iuchar', 'An Lùnastal', 'An t-Sultain', 'An Dàmhair', 'An t-Samhain', 'An Dùbhlachd'
+    ];
 
-var monthsShort = ['Faoi', 'Gear', 'Màrt', 'Gibl', 'Cèit', 'Ògmh', 'Iuch', 'Lùn', 'Sult', 'Dàmh', 'Samh', 'Dùbh'];
+    var monthsShort = ['Faoi', 'Gear', 'Màrt', 'Gibl', 'Cèit', 'Ògmh', 'Iuch', 'Lùn', 'Sult', 'Dàmh', 'Samh', 'Dùbh'];
 
-var weekdays = ['Didòmhnaich', 'Diluain', 'Dimàirt', 'Diciadain', 'Diardaoin', 'Dihaoine', 'Disathairne'];
+    var weekdays = ['Didòmhnaich', 'Diluain', 'Dimàirt', 'Diciadain', 'Diardaoin', 'Dihaoine', 'Disathairne'];
 
-var weekdaysShort = ['Did', 'Dil', 'Dim', 'Dic', 'Dia', 'Dih', 'Dis'];
+    var weekdaysShort = ['Did', 'Dil', 'Dim', 'Dic', 'Dia', 'Dih', 'Dis'];
 
-var weekdaysMin = ['Dò', 'Lu', 'Mà', 'Ci', 'Ar', 'Ha', 'Sa'];
+    var weekdaysMin = ['Dò', 'Lu', 'Mà', 'Ci', 'Ar', 'Ha', 'Sa'];
 
-var gd = moment.defineLocale('gd', {
-    months : months,
-    monthsShort : monthsShort,
-    monthsParseExact : true,
-    weekdays : weekdays,
-    weekdaysShort : weekdaysShort,
-    weekdaysMin : weekdaysMin,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd, D MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay : '[An-diugh aig] LT',
-        nextDay : '[A-màireach aig] LT',
-        nextWeek : 'dddd [aig] LT',
-        lastDay : '[An-dè aig] LT',
-        lastWeek : 'dddd [seo chaidh] [aig] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'ann an %s',
-        past : 'bho chionn %s',
-        s : 'beagan diogan',
-        m : 'mionaid',
-        mm : '%d mionaidean',
-        h : 'uair',
-        hh : '%d uairean',
-        d : 'latha',
-        dd : '%d latha',
-        M : 'mìos',
-        MM : '%d mìosan',
-        y : 'bliadhna',
-        yy : '%d bliadhna'
-    },
-    dayOfMonthOrdinalParse : /\d{1,2}(d|na|mh)/,
-    ordinal : function (number) {
-        var output = number === 1 ? 'd' : number % 10 === 2 ? 'na' : 'mh';
-        return number + output;
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    var gd = moment.defineLocale('gd', {
+        months : months,
+        monthsShort : monthsShort,
+        monthsParseExact : true,
+        weekdays : weekdays,
+        weekdaysShort : weekdaysShort,
+        weekdaysMin : weekdaysMin,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[An-diugh aig] LT',
+            nextDay : '[A-màireach aig] LT',
+            nextWeek : 'dddd [aig] LT',
+            lastDay : '[An-dè aig] LT',
+            lastWeek : 'dddd [seo chaidh] [aig] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'ann an %s',
+            past : 'bho chionn %s',
+            s : 'beagan diogan',
+            ss : '%d diogan',
+            m : 'mionaid',
+            mm : '%d mionaidean',
+            h : 'uair',
+            hh : '%d uairean',
+            d : 'latha',
+            dd : '%d latha',
+            M : 'mìos',
+            MM : '%d mìosan',
+            y : 'bliadhna',
+            yy : '%d bliadhna'
+        },
+        dayOfMonthOrdinalParse : /\d{1,2}(d|na|mh)/,
+        ordinal : function (number) {
+            var output = number === 1 ? 'd' : number % 10 === 2 ? 'na' : 'mh';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-return gd;
+    return gd;
 
 })));
diff --git a/lib/javascripts/moment_locale/gl.js b/lib/javascripts/moment_locale/gl.js
old mode 100644
new mode 100755
index e894db73516..1cc4177cccd
--- a/lib/javascripts/moment_locale/gl.js
+++ b/lib/javascripts/moment_locale/gl.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Galician [gl]
-//! author : Juan G. Hurtado : https://github.com/juanghurtado
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,68 +8,69 @@
 }(this, (function (moment) { 'use strict';
 
 
-var gl = moment.defineLocale('gl', {
-    months : 'xaneiro_febreiro_marzo_abril_maio_xuño_xullo_agosto_setembro_outubro_novembro_decembro'.split('_'),
-    monthsShort : 'xan._feb._mar._abr._mai._xuñ._xul._ago._set._out._nov._dec.'.split('_'),
-    monthsParseExact: true,
-    weekdays : 'domingo_luns_martes_mércores_xoves_venres_sábado'.split('_'),
-    weekdaysShort : 'dom._lun._mar._mér._xov._ven._sáb.'.split('_'),
-    weekdaysMin : 'do_lu_ma_mé_xo_ve_sá'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'H:mm',
-        LTS : 'H:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D [de] MMMM [de] YYYY',
-        LLL : 'D [de] MMMM [de] YYYY H:mm',
-        LLLL : 'dddd, D [de] MMMM [de] YYYY H:mm'
-    },
-    calendar : {
-        sameDay : function () {
-            return '[hoxe ' + ((this.hours() !== 1) ? 'ás' : 'á') + '] LT';
+    var gl = moment.defineLocale('gl', {
+        months : 'xaneiro_febreiro_marzo_abril_maio_xuño_xullo_agosto_setembro_outubro_novembro_decembro'.split('_'),
+        monthsShort : 'xan._feb._mar._abr._mai._xuñ._xul._ago._set._out._nov._dec.'.split('_'),
+        monthsParseExact: true,
+        weekdays : 'domingo_luns_martes_mércores_xoves_venres_sábado'.split('_'),
+        weekdaysShort : 'dom._lun._mar._mér._xov._ven._sáb.'.split('_'),
+        weekdaysMin : 'do_lu_ma_mé_xo_ve_sá'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D [de] MMMM [de] YYYY',
+            LLL : 'D [de] MMMM [de] YYYY H:mm',
+            LLLL : 'dddd, D [de] MMMM [de] YYYY H:mm'
         },
-        nextDay : function () {
-            return '[mañá ' + ((this.hours() !== 1) ? 'ás' : 'á') + '] LT';
+        calendar : {
+            sameDay : function () {
+                return '[hoxe ' + ((this.hours() !== 1) ? 'ás' : 'á') + '] LT';
+            },
+            nextDay : function () {
+                return '[mañá ' + ((this.hours() !== 1) ? 'ás' : 'á') + '] LT';
+            },
+            nextWeek : function () {
+                return 'dddd [' + ((this.hours() !== 1) ? 'ás' : 'a') + '] LT';
+            },
+            lastDay : function () {
+                return '[onte ' + ((this.hours() !== 1) ? 'á' : 'a') + '] LT';
+            },
+            lastWeek : function () {
+                return '[o] dddd [pasado ' + ((this.hours() !== 1) ? 'ás' : 'a') + '] LT';
+            },
+            sameElse : 'L'
         },
-        nextWeek : function () {
-            return 'dddd [' + ((this.hours() !== 1) ? 'ás' : 'a') + '] LT';
+        relativeTime : {
+            future : function (str) {
+                if (str.indexOf('un') === 0) {
+                    return 'n' + str;
+                }
+                return 'en ' + str;
+            },
+            past : 'hai %s',
+            s : 'uns segundos',
+            ss : '%d segundos',
+            m : 'un minuto',
+            mm : '%d minutos',
+            h : 'unha hora',
+            hh : '%d horas',
+            d : 'un día',
+            dd : '%d días',
+            M : 'un mes',
+            MM : '%d meses',
+            y : 'un ano',
+            yy : '%d anos'
         },
-        lastDay : function () {
-            return '[onte ' + ((this.hours() !== 1) ? 'á' : 'a') + '] LT';
-        },
-        lastWeek : function () {
-            return '[o] dddd [pasado ' + ((this.hours() !== 1) ? 'ás' : 'a') + '] LT';
-        },
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : function (str) {
-            if (str.indexOf('un') === 0) {
-                return 'n' + str;
-            }
-            return 'en ' + str;
-        },
-        past : 'hai %s',
-        s : 'uns segundos',
-        m : 'un minuto',
-        mm : '%d minutos',
-        h : 'unha hora',
-        hh : '%d horas',
-        d : 'un día',
-        dd : '%d días',
-        M : 'un mes',
-        MM : '%d meses',
-        y : 'un ano',
-        yy : '%d anos'
-    },
-    dayOfMonthOrdinalParse : /\d{1,2}º/,
-    ordinal : '%dº',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+        dayOfMonthOrdinalParse : /\d{1,2}º/,
+        ordinal : '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-return gl;
+    return gl;
 
 })));
diff --git a/lib/javascripts/moment_locale/gom-latn.js b/lib/javascripts/moment_locale/gom-latn.js
old mode 100644
new mode 100755
index 084b4b22602..f26f8f9cfbf
--- a/lib/javascripts/moment_locale/gom-latn.js
+++ b/lib/javascripts/moment_locale/gom-latn.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Konkani Latin script [gom-latn]
-//! author : The Discoverer : https://github.com/WikiDiscoverer
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,113 +8,115 @@
 }(this, (function (moment) { 'use strict';
 
 
-function processRelativeTime(number, withoutSuffix, key, isFuture) {
-    var format = {
-        's': ['thodde secondanim', 'thodde second'],
-        'm': ['eka mintan', 'ek minute'],
-        'mm': [number + ' mintanim', number + ' mintam'],
-        'h': ['eka horan', 'ek hor'],
-        'hh': [number + ' horanim', number + ' hor'],
-        'd': ['eka disan', 'ek dis'],
-        'dd': [number + ' disanim', number + ' dis'],
-        'M': ['eka mhoinean', 'ek mhoino'],
-        'MM': [number + ' mhoineanim', number + ' mhoine'],
-        'y': ['eka vorsan', 'ek voros'],
-        'yy': [number + ' vorsanim', number + ' vorsam']
-    };
-    return withoutSuffix ? format[key][0] : format[key][1];
-}
-
-var gomLatn = moment.defineLocale('gom-latn', {
-    months : 'Janer_Febrer_Mars_Abril_Mai_Jun_Julai_Agost_Setembr_Otubr_Novembr_Dezembr'.split('_'),
-    monthsShort : 'Jan._Feb._Mars_Abr._Mai_Jun_Jul._Ago._Set._Otu._Nov._Dez.'.split('_'),
-    monthsParseExact : true,
-    weekdays : 'Aitar_Somar_Mongllar_Budvar_Brestar_Sukrar_Son\'var'.split('_'),
-    weekdaysShort : 'Ait._Som._Mon._Bud._Bre._Suk._Son.'.split('_'),
-    weekdaysMin : 'Ai_Sm_Mo_Bu_Br_Su_Sn'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'A h:mm [vazta]',
-        LTS : 'A h:mm:ss [vazta]',
-        L : 'DD-MM-YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY A h:mm [vazta]',
-        LLLL : 'dddd, MMMM[achea] Do, YYYY, A h:mm [vazta]',
-        llll: 'ddd, D MMM YYYY, A h:mm [vazta]'
-    },
-    calendar : {
-        sameDay: '[Aiz] LT',
-        nextDay: '[Faleam] LT',
-        nextWeek: '[Ieta to] dddd[,] LT',
-        lastDay: '[Kal] LT',
-        lastWeek: '[Fatlo] dddd[,] LT',
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : '%s',
-        past : '%s adim',
-        s : processRelativeTime,
-        m : processRelativeTime,
-        mm : processRelativeTime,
-        h : processRelativeTime,
-        hh : processRelativeTime,
-        d : processRelativeTime,
-        dd : processRelativeTime,
-        M : processRelativeTime,
-        MM : processRelativeTime,
-        y : processRelativeTime,
-        yy : processRelativeTime
-    },
-    dayOfMonthOrdinalParse : /\d{1,2}(er)/,
-    ordinal : function (number, period) {
-        switch (period) {
-            // the ordinal 'er' only applies to day of the month
-            case 'D':
-                return number + 'er';
-            default:
-            case 'M':
-            case 'Q':
-            case 'DDD':
-            case 'd':
-            case 'w':
-            case 'W':
-                return number;
-        }
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    },
-    meridiemParse: /rati|sokalli|donparam|sanje/,
-    meridiemHour : function (hour, meridiem) {
-        if (hour === 12) {
-            hour = 0;
-        }
-        if (meridiem === 'rati') {
-            return hour < 4 ? hour : hour + 12;
-        } else if (meridiem === 'sokalli') {
-            return hour;
-        } else if (meridiem === 'donparam') {
-            return hour > 12 ? hour : hour + 12;
-        } else if (meridiem === 'sanje') {
-            return hour + 12;
-        }
-    },
-    meridiem : function (hour, minute, isLower) {
-        if (hour < 4) {
-            return 'rati';
-        } else if (hour < 12) {
-            return 'sokalli';
-        } else if (hour < 16) {
-            return 'donparam';
-        } else if (hour < 20) {
-            return 'sanje';
-        } else {
-            return 'rati';
-        }
+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var format = {
+            's': ['thodde secondanim', 'thodde second'],
+            'ss': [number + ' secondanim', number + ' second'],
+            'm': ['eka mintan', 'ek minute'],
+            'mm': [number + ' mintanim', number + ' mintam'],
+            'h': ['eka horan', 'ek hor'],
+            'hh': [number + ' horanim', number + ' horam'],
+            'd': ['eka disan', 'ek dis'],
+            'dd': [number + ' disanim', number + ' dis'],
+            'M': ['eka mhoinean', 'ek mhoino'],
+            'MM': [number + ' mhoineanim', number + ' mhoine'],
+            'y': ['eka vorsan', 'ek voros'],
+            'yy': [number + ' vorsanim', number + ' vorsam']
+        };
+        return withoutSuffix ? format[key][0] : format[key][1];
     }
-});
 
-return gomLatn;
+    var gomLatn = moment.defineLocale('gom-latn', {
+        months : 'Janer_Febrer_Mars_Abril_Mai_Jun_Julai_Agost_Setembr_Otubr_Novembr_Dezembr'.split('_'),
+        monthsShort : 'Jan._Feb._Mars_Abr._Mai_Jun_Jul._Ago._Set._Otu._Nov._Dez.'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'Aitar_Somar_Mongllar_Budvar_Brestar_Sukrar_Son\'var'.split('_'),
+        weekdaysShort : 'Ait._Som._Mon._Bud._Bre._Suk._Son.'.split('_'),
+        weekdaysMin : 'Ai_Sm_Mo_Bu_Br_Su_Sn'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'A h:mm [vazta]',
+            LTS : 'A h:mm:ss [vazta]',
+            L : 'DD-MM-YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY A h:mm [vazta]',
+            LLLL : 'dddd, MMMM[achea] Do, YYYY, A h:mm [vazta]',
+            llll: 'ddd, D MMM YYYY, A h:mm [vazta]'
+        },
+        calendar : {
+            sameDay: '[Aiz] LT',
+            nextDay: '[Faleam] LT',
+            nextWeek: '[Ieta to] dddd[,] LT',
+            lastDay: '[Kal] LT',
+            lastWeek: '[Fatlo] dddd[,] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : '%s',
+            past : '%s adim',
+            s : processRelativeTime,
+            ss : processRelativeTime,
+            m : processRelativeTime,
+            mm : processRelativeTime,
+            h : processRelativeTime,
+            hh : processRelativeTime,
+            d : processRelativeTime,
+            dd : processRelativeTime,
+            M : processRelativeTime,
+            MM : processRelativeTime,
+            y : processRelativeTime,
+            yy : processRelativeTime
+        },
+        dayOfMonthOrdinalParse : /\d{1,2}(er)/,
+        ordinal : function (number, period) {
+            switch (period) {
+                // the ordinal 'er' only applies to day of the month
+                case 'D':
+                    return number + 'er';
+                default:
+                case 'M':
+                case 'Q':
+                case 'DDD':
+                case 'd':
+                case 'w':
+                case 'W':
+                    return number;
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        },
+        meridiemParse: /rati|sokalli|donparam|sanje/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'rati') {
+                return hour < 4 ? hour : hour + 12;
+            } else if (meridiem === 'sokalli') {
+                return hour;
+            } else if (meridiem === 'donparam') {
+                return hour > 12 ? hour : hour + 12;
+            } else if (meridiem === 'sanje') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'rati';
+            } else if (hour < 12) {
+                return 'sokalli';
+            } else if (hour < 16) {
+                return 'donparam';
+            } else if (hour < 20) {
+                return 'sanje';
+            } else {
+                return 'rati';
+            }
+        }
+    });
+
+    return gomLatn;
 
 })));
diff --git a/lib/javascripts/moment_locale/gu.js b/lib/javascripts/moment_locale/gu.js
new file mode 100755
index 00000000000..c025aacd302
--- /dev/null
+++ b/lib/javascripts/moment_locale/gu.js
@@ -0,0 +1,123 @@
+//! moment.js locale configuration
+
+;(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined'
+       && typeof require === 'function' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
+   factory(global.moment)
+}(this, (function (moment) { 'use strict';
+
+
+    var symbolMap = {
+            '1': '૧',
+            '2': '૨',
+            '3': '૩',
+            '4': '૪',
+            '5': '૫',
+            '6': '૬',
+            '7': '૭',
+            '8': '૮',
+            '9': '૯',
+            '0': '૦'
+        },
+        numberMap = {
+            '૧': '1',
+            '૨': '2',
+            '૩': '3',
+            '૪': '4',
+            '૫': '5',
+            '૬': '6',
+            '૭': '7',
+            '૮': '8',
+            '૯': '9',
+            '૦': '0'
+        };
+
+    var gu = moment.defineLocale('gu', {
+        months: 'જાન્યુઆરી_ફેબ્રુઆરી_માર્ચ_એપ્રિલ_મે_જૂન_જુલાઈ_ઑગસ્ટ_સપ્ટેમ્બર_ઑક્ટ્બર_નવેમ્બર_ડિસેમ્બર'.split('_'),
+        monthsShort: 'જાન્યુ._ફેબ્રુ._માર્ચ_એપ્રિ._મે_જૂન_જુલા._ઑગ._સપ્ટે._ઑક્ટ્._નવે._ડિસે.'.split('_'),
+        monthsParseExact: true,
+        weekdays: 'રવિવાર_સોમવાર_મંગળવાર_બુધ્વાર_ગુરુવાર_શુક્રવાર_શનિવાર'.split('_'),
+        weekdaysShort: 'રવિ_સોમ_મંગળ_બુધ્_ગુરુ_શુક્ર_શનિ'.split('_'),
+        weekdaysMin: 'ર_સો_મં_બુ_ગુ_શુ_શ'.split('_'),
+        longDateFormat: {
+            LT: 'A h:mm વાગ્યે',
+            LTS: 'A h:mm:ss વાગ્યે',
+            L: 'DD/MM/YYYY',
+            LL: 'D MMMM YYYY',
+            LLL: 'D MMMM YYYY, A h:mm વાગ્યે',
+            LLLL: 'dddd, D MMMM YYYY, A h:mm વાગ્યે'
+        },
+        calendar: {
+            sameDay: '[આજ] LT',
+            nextDay: '[કાલે] LT',
+            nextWeek: 'dddd, LT',
+            lastDay: '[ગઇકાલે] LT',
+            lastWeek: '[પાછલા] dddd, LT',
+            sameElse: 'L'
+        },
+        relativeTime: {
+            future: '%s મા',
+            past: '%s પેહલા',
+            s: 'અમુક પળો',
+            ss: '%d સેકંડ',
+            m: 'એક મિનિટ',
+            mm: '%d મિનિટ',
+            h: 'એક કલાક',
+            hh: '%d કલાક',
+            d: 'એક દિવસ',
+            dd: '%d દિવસ',
+            M: 'એક મહિનો',
+            MM: '%d મહિનો',
+            y: 'એક વર્ષ',
+            yy: '%d વર્ષ'
+        },
+        preparse: function (string) {
+            return string.replace(/[૧૨૩૪૫૬૭૮૯૦]/g, function (match) {
+                return numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            });
+        },
+        // Gujarati notation for meridiems are quite fuzzy in practice. While there exists
+        // a rigid notion of a 'Pahar' it is not used as rigidly in modern Gujarati.
+        meridiemParse: /રાત|બપોર|સવાર|સાંજ/,
+        meridiemHour: function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'રાત') {
+                return hour < 4 ? hour : hour + 12;
+            } else if (meridiem === 'સવાર') {
+                return hour;
+            } else if (meridiem === 'બપોર') {
+                return hour >= 10 ? hour : hour + 12;
+            } else if (meridiem === 'સાંજ') {
+                return hour + 12;
+            }
+        },
+        meridiem: function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'રાત';
+            } else if (hour < 10) {
+                return 'સવાર';
+            } else if (hour < 17) {
+                return 'બપોર';
+            } else if (hour < 20) {
+                return 'સાંજ';
+            } else {
+                return 'રાત';
+            }
+        },
+        week: {
+            dow: 0, // Sunday is the first day of the week.
+            doy: 6 // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return gu;
+
+})));
diff --git a/lib/javascripts/moment_locale/he.js b/lib/javascripts/moment_locale/he.js
old mode 100644
new mode 100755
index e884381105b..7a22e8d7f15
--- a/lib/javascripts/moment_locale/he.js
+++ b/lib/javascripts/moment_locale/he.js
@@ -1,8 +1,4 @@
 //! moment.js locale configuration
-//! locale : Hebrew [he]
-//! author : Tomer Cohen : https://github.com/tomer
-//! author : Moshe Simantov : https://github.com/DevelopmentIL
-//! author : Tal Ater : https://github.com/TalAter
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -12,88 +8,89 @@
 }(this, (function (moment) { 'use strict';
 
 
-var he = moment.defineLocale('he', {
-    months : 'ינואר_פברואר_מרץ_אפריל_מאי_יוני_יולי_אוגוסט_ספטמבר_אוקטובר_נובמבר_דצמבר'.split('_'),
-    monthsShort : 'ינו׳_פבר׳_מרץ_אפר׳_מאי_יוני_יולי_אוג׳_ספט׳_אוק׳_נוב׳_דצמ׳'.split('_'),
-    weekdays : 'ראשון_שני_שלישי_רביעי_חמישי_שישי_שבת'.split('_'),
-    weekdaysShort : 'א׳_ב׳_ג׳_ד׳_ה׳_ו׳_ש׳'.split('_'),
-    weekdaysMin : 'א_ב_ג_ד_ה_ו_ש'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D [ב]MMMM YYYY',
-        LLL : 'D [ב]MMMM YYYY HH:mm',
-        LLLL : 'dddd, D [ב]MMMM YYYY HH:mm',
-        l : 'D/M/YYYY',
-        ll : 'D MMM YYYY',
-        lll : 'D MMM YYYY HH:mm',
-        llll : 'ddd, D MMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay : '[היום ב־]LT',
-        nextDay : '[מחר ב־]LT',
-        nextWeek : 'dddd [בשעה] LT',
-        lastDay : '[אתמול ב־]LT',
-        lastWeek : '[ביום] dddd [האחרון בשעה] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'בעוד %s',
-        past : 'לפני %s',
-        s : 'מספר שניות',
-        m : 'דקה',
-        mm : '%d דקות',
-        h : 'שעה',
-        hh : function (number) {
-            if (number === 2) {
-                return 'שעתיים';
-            }
-            return number + ' שעות';
+    var he = moment.defineLocale('he', {
+        months : 'ינואר_פברואר_מרץ_אפריל_מאי_יוני_יולי_אוגוסט_ספטמבר_אוקטובר_נובמבר_דצמבר'.split('_'),
+        monthsShort : 'ינו׳_פבר׳_מרץ_אפר׳_מאי_יוני_יולי_אוג׳_ספט׳_אוק׳_נוב׳_דצמ׳'.split('_'),
+        weekdays : 'ראשון_שני_שלישי_רביעי_חמישי_שישי_שבת'.split('_'),
+        weekdaysShort : 'א׳_ב׳_ג׳_ד׳_ה׳_ו׳_ש׳'.split('_'),
+        weekdaysMin : 'א_ב_ג_ד_ה_ו_ש'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D [ב]MMMM YYYY',
+            LLL : 'D [ב]MMMM YYYY HH:mm',
+            LLLL : 'dddd, D [ב]MMMM YYYY HH:mm',
+            l : 'D/M/YYYY',
+            ll : 'D MMM YYYY',
+            lll : 'D MMM YYYY HH:mm',
+            llll : 'ddd, D MMM YYYY HH:mm'
         },
-        d : 'יום',
-        dd : function (number) {
-            if (number === 2) {
-                return 'יומיים';
-            }
-            return number + ' ימים';
+        calendar : {
+            sameDay : '[היום ב־]LT',
+            nextDay : '[מחר ב־]LT',
+            nextWeek : 'dddd [בשעה] LT',
+            lastDay : '[אתמול ב־]LT',
+            lastWeek : '[ביום] dddd [האחרון בשעה] LT',
+            sameElse : 'L'
         },
-        M : 'חודש',
-        MM : function (number) {
-            if (number === 2) {
-                return 'חודשיים';
+        relativeTime : {
+            future : 'בעוד %s',
+            past : 'לפני %s',
+            s : 'מספר שניות',
+            ss : '%d שניות',
+            m : 'דקה',
+            mm : '%d דקות',
+            h : 'שעה',
+            hh : function (number) {
+                if (number === 2) {
+                    return 'שעתיים';
+                }
+                return number + ' שעות';
+            },
+            d : 'יום',
+            dd : function (number) {
+                if (number === 2) {
+                    return 'יומיים';
+                }
+                return number + ' ימים';
+            },
+            M : 'חודש',
+            MM : function (number) {
+                if (number === 2) {
+                    return 'חודשיים';
+                }
+                return number + ' חודשים';
+            },
+            y : 'שנה',
+            yy : function (number) {
+                if (number === 2) {
+                    return 'שנתיים';
+                } else if (number % 10 === 0 && number !== 10) {
+                    return number + ' שנה';
+                }
+                return number + ' שנים';
             }
-            return number + ' חודשים';
         },
-        y : 'שנה',
-        yy : function (number) {
-            if (number === 2) {
-                return 'שנתיים';
-            } else if (number % 10 === 0 && number !== 10) {
-                return number + ' שנה';
+        meridiemParse: /אחה"צ|לפנה"צ|אחרי הצהריים|לפני הצהריים|לפנות בוקר|בבוקר|בערב/i,
+        isPM : function (input) {
+            return /^(אחה"צ|אחרי הצהריים|בערב)$/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 5) {
+                return 'לפנות בוקר';
+            } else if (hour < 10) {
+                return 'בבוקר';
+            } else if (hour < 12) {
+                return isLower ? 'לפנה"צ' : 'לפני הצהריים';
+            } else if (hour < 18) {
+                return isLower ? 'אחה"צ' : 'אחרי הצהריים';
+            } else {
+                return 'בערב';
             }
-            return number + ' שנים';
         }
-    },
-    meridiemParse: /אחה"צ|לפנה"צ|אחרי הצהריים|לפני הצהריים|לפנות בוקר|בבוקר|בערב/i,
-    isPM : function (input) {
-        return /^(אחה"צ|אחרי הצהריים|בערב)$/.test(input);
-    },
-    meridiem : function (hour, minute, isLower) {
-        if (hour < 5) {
-            return 'לפנות בוקר';
-        } else if (hour < 10) {
-            return 'בבוקר';
-        } else if (hour < 12) {
-            return isLower ? 'לפנה"צ' : 'לפני הצהריים';
-        } else if (hour < 18) {
-            return isLower ? 'אחה"צ' : 'אחרי הצהריים';
-        } else {
-            return 'בערב';
-        }
-    }
-});
+    });
 
-return he;
+    return he;
 
 })));
diff --git a/lib/javascripts/moment_locale/hi.js b/lib/javascripts/moment_locale/hi.js
old mode 100644
new mode 100755
index 58afc6b1dd0..5145c31e3c4
--- a/lib/javascripts/moment_locale/hi.js
+++ b/lib/javascripts/moment_locale/hi.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Hindi [hi]
-//! author : Mayank Singhal : https://github.com/mayanksinghal
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,115 +8,116 @@
 }(this, (function (moment) { 'use strict';
 
 
-var symbolMap = {
-    '1': '१',
-    '2': '२',
-    '3': '३',
-    '4': '४',
-    '5': '५',
-    '6': '६',
-    '7': '७',
-    '8': '८',
-    '9': '९',
-    '0': '०'
-};
-var numberMap = {
-    '१': '1',
-    '२': '2',
-    '३': '3',
-    '४': '4',
-    '५': '5',
-    '६': '6',
-    '७': '7',
-    '८': '8',
-    '९': '9',
-    '०': '0'
-};
+    var symbolMap = {
+        '1': '१',
+        '2': '२',
+        '3': '३',
+        '4': '४',
+        '5': '५',
+        '6': '६',
+        '7': '७',
+        '8': '८',
+        '9': '९',
+        '0': '०'
+    },
+    numberMap = {
+        '१': '1',
+        '२': '2',
+        '३': '3',
+        '४': '4',
+        '५': '5',
+        '६': '6',
+        '७': '7',
+        '८': '8',
+        '९': '9',
+        '०': '0'
+    };
 
-var hi = moment.defineLocale('hi', {
-    months : 'जनवरी_फ़रवरी_मार्च_अप्रैल_मई_जून_जुलाई_अगस्त_सितम्बर_अक्टूबर_नवम्बर_दिसम्बर'.split('_'),
-    monthsShort : 'जन._फ़र._मार्च_अप्रै._मई_जून_जुल._अग._सित._अक्टू._नव._दिस.'.split('_'),
-    monthsParseExact: true,
-    weekdays : 'रविवार_सोमवार_मंगलवार_बुधवार_गुरूवार_शुक्रवार_शनिवार'.split('_'),
-    weekdaysShort : 'रवि_सोम_मंगल_बुध_गुरू_शुक्र_शनि'.split('_'),
-    weekdaysMin : 'र_सो_मं_बु_गु_शु_श'.split('_'),
-    longDateFormat : {
-        LT : 'A h:mm बजे',
-        LTS : 'A h:mm:ss बजे',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY, A h:mm बजे',
-        LLLL : 'dddd, D MMMM YYYY, A h:mm बजे'
-    },
-    calendar : {
-        sameDay : '[आज] LT',
-        nextDay : '[कल] LT',
-        nextWeek : 'dddd, LT',
-        lastDay : '[कल] LT',
-        lastWeek : '[पिछले] dddd, LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : '%s में',
-        past : '%s पहले',
-        s : 'कुछ ही क्षण',
-        m : 'एक मिनट',
-        mm : '%d मिनट',
-        h : 'एक घंटा',
-        hh : '%d घंटे',
-        d : 'एक दिन',
-        dd : '%d दिन',
-        M : 'एक महीने',
-        MM : '%d महीने',
-        y : 'एक वर्ष',
-        yy : '%d वर्ष'
-    },
-    preparse: function (string) {
-        return string.replace(/[१२३४५६७८९०]/g, function (match) {
-            return numberMap[match];
-        });
-    },
-    postformat: function (string) {
-        return string.replace(/\d/g, function (match) {
-            return symbolMap[match];
-        });
-    },
-    // Hindi notation for meridiems are quite fuzzy in practice. While there exists
-    // a rigid notion of a 'Pahar' it is not used as rigidly in modern Hindi.
-    meridiemParse: /रात|सुबह|दोपहर|शाम/,
-    meridiemHour : function (hour, meridiem) {
-        if (hour === 12) {
-            hour = 0;
+    var hi = moment.defineLocale('hi', {
+        months : 'जनवरी_फ़रवरी_मार्च_अप्रैल_मई_जून_जुलाई_अगस्त_सितम्बर_अक्टूबर_नवम्बर_दिसम्बर'.split('_'),
+        monthsShort : 'जन._फ़र._मार्च_अप्रै._मई_जून_जुल._अग._सित._अक्टू._नव._दिस.'.split('_'),
+        monthsParseExact: true,
+        weekdays : 'रविवार_सोमवार_मंगलवार_बुधवार_गुरूवार_शुक्रवार_शनिवार'.split('_'),
+        weekdaysShort : 'रवि_सोम_मंगल_बुध_गुरू_शुक्र_शनि'.split('_'),
+        weekdaysMin : 'र_सो_मं_बु_गु_शु_श'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm बजे',
+            LTS : 'A h:mm:ss बजे',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, A h:mm बजे',
+            LLLL : 'dddd, D MMMM YYYY, A h:mm बजे'
+        },
+        calendar : {
+            sameDay : '[आज] LT',
+            nextDay : '[कल] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[कल] LT',
+            lastWeek : '[पिछले] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s में',
+            past : '%s पहले',
+            s : 'कुछ ही क्षण',
+            ss : '%d सेकंड',
+            m : 'एक मिनट',
+            mm : '%d मिनट',
+            h : 'एक घंटा',
+            hh : '%d घंटे',
+            d : 'एक दिन',
+            dd : '%d दिन',
+            M : 'एक महीने',
+            MM : '%d महीने',
+            y : 'एक वर्ष',
+            yy : '%d वर्ष'
+        },
+        preparse: function (string) {
+            return string.replace(/[१२३४५६७८९०]/g, function (match) {
+                return numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            });
+        },
+        // Hindi notation for meridiems are quite fuzzy in practice. While there exists
+        // a rigid notion of a 'Pahar' it is not used as rigidly in modern Hindi.
+        meridiemParse: /रात|सुबह|दोपहर|शाम/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'रात') {
+                return hour < 4 ? hour : hour + 12;
+            } else if (meridiem === 'सुबह') {
+                return hour;
+            } else if (meridiem === 'दोपहर') {
+                return hour >= 10 ? hour : hour + 12;
+            } else if (meridiem === 'शाम') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'रात';
+            } else if (hour < 10) {
+                return 'सुबह';
+            } else if (hour < 17) {
+                return 'दोपहर';
+            } else if (hour < 20) {
+                return 'शाम';
+            } else {
+                return 'रात';
+            }
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 1st is the first week of the year.
         }
-        if (meridiem === 'रात') {
-            return hour < 4 ? hour : hour + 12;
-        } else if (meridiem === 'सुबह') {
-            return hour;
-        } else if (meridiem === 'दोपहर') {
-            return hour >= 10 ? hour : hour + 12;
-        } else if (meridiem === 'शाम') {
-            return hour + 12;
-        }
-    },
-    meridiem : function (hour, minute, isLower) {
-        if (hour < 4) {
-            return 'रात';
-        } else if (hour < 10) {
-            return 'सुबह';
-        } else if (hour < 17) {
-            return 'दोपहर';
-        } else if (hour < 20) {
-            return 'शाम';
-        } else {
-            return 'रात';
-        }
-    },
-    week : {
-        dow : 0, // Sunday is the first day of the week.
-        doy : 6  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    });
 
-return hi;
+    return hi;
 
 })));
diff --git a/lib/javascripts/moment_locale/hr.js b/lib/javascripts/moment_locale/hr.js
old mode 100644
new mode 100755
index 5caeec8028b..07ce5279d73
--- a/lib/javascripts/moment_locale/hr.js
+++ b/lib/javascripts/moment_locale/hr.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Croatian [hr]
-//! author : Bojan Marković : https://github.com/bmarkovic
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,136 +8,146 @@
 }(this, (function (moment) { 'use strict';
 
 
-function translate(number, withoutSuffix, key) {
-    var result = number + ' ';
-    switch (key) {
-        case 'm':
-            return withoutSuffix ? 'jedna minuta' : 'jedne minute';
-        case 'mm':
-            if (number === 1) {
-                result += 'minuta';
-            } else if (number === 2 || number === 3 || number === 4) {
-                result += 'minute';
-            } else {
-                result += 'minuta';
-            }
-            return result;
-        case 'h':
-            return withoutSuffix ? 'jedan sat' : 'jednog sata';
-        case 'hh':
-            if (number === 1) {
-                result += 'sat';
-            } else if (number === 2 || number === 3 || number === 4) {
-                result += 'sata';
-            } else {
-                result += 'sati';
-            }
-            return result;
-        case 'dd':
-            if (number === 1) {
-                result += 'dan';
-            } else {
-                result += 'dana';
-            }
-            return result;
-        case 'MM':
-            if (number === 1) {
-                result += 'mjesec';
-            } else if (number === 2 || number === 3 || number === 4) {
-                result += 'mjeseca';
-            } else {
-                result += 'mjeseci';
-            }
-            return result;
-        case 'yy':
-            if (number === 1) {
-                result += 'godina';
-            } else if (number === 2 || number === 3 || number === 4) {
-                result += 'godine';
-            } else {
-                result += 'godina';
-            }
-            return result;
+    function translate(number, withoutSuffix, key) {
+        var result = number + ' ';
+        switch (key) {
+            case 'ss':
+                if (number === 1) {
+                    result += 'sekunda';
+                } else if (number === 2 || number === 3 || number === 4) {
+                    result += 'sekunde';
+                } else {
+                    result += 'sekundi';
+                }
+                return result;
+            case 'm':
+                return withoutSuffix ? 'jedna minuta' : 'jedne minute';
+            case 'mm':
+                if (number === 1) {
+                    result += 'minuta';
+                } else if (number === 2 || number === 3 || number === 4) {
+                    result += 'minute';
+                } else {
+                    result += 'minuta';
+                }
+                return result;
+            case 'h':
+                return withoutSuffix ? 'jedan sat' : 'jednog sata';
+            case 'hh':
+                if (number === 1) {
+                    result += 'sat';
+                } else if (number === 2 || number === 3 || number === 4) {
+                    result += 'sata';
+                } else {
+                    result += 'sati';
+                }
+                return result;
+            case 'dd':
+                if (number === 1) {
+                    result += 'dan';
+                } else {
+                    result += 'dana';
+                }
+                return result;
+            case 'MM':
+                if (number === 1) {
+                    result += 'mjesec';
+                } else if (number === 2 || number === 3 || number === 4) {
+                    result += 'mjeseca';
+                } else {
+                    result += 'mjeseci';
+                }
+                return result;
+            case 'yy':
+                if (number === 1) {
+                    result += 'godina';
+                } else if (number === 2 || number === 3 || number === 4) {
+                    result += 'godine';
+                } else {
+                    result += 'godina';
+                }
+                return result;
+        }
     }
-}
 
-var hr = moment.defineLocale('hr', {
-    months : {
-        format: 'siječnja_veljače_ožujka_travnja_svibnja_lipnja_srpnja_kolovoza_rujna_listopada_studenoga_prosinca'.split('_'),
-        standalone: 'siječanj_veljača_ožujak_travanj_svibanj_lipanj_srpanj_kolovoz_rujan_listopad_studeni_prosinac'.split('_')
-    },
-    monthsShort : 'sij._velj._ožu._tra._svi._lip._srp._kol._ruj._lis._stu._pro.'.split('_'),
-    monthsParseExact: true,
-    weekdays : 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'),
-    weekdaysShort : 'ned._pon._uto._sri._čet._pet._sub.'.split('_'),
-    weekdaysMin : 'ne_po_ut_sr_če_pe_su'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'H:mm',
-        LTS : 'H:mm:ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D. MMMM YYYY',
-        LLL : 'D. MMMM YYYY H:mm',
-        LLLL : 'dddd, D. MMMM YYYY H:mm'
-    },
-    calendar : {
-        sameDay  : '[danas u] LT',
-        nextDay  : '[sutra u] LT',
-        nextWeek : function () {
-            switch (this.day()) {
-                case 0:
-                    return '[u] [nedjelju] [u] LT';
-                case 3:
-                    return '[u] [srijedu] [u] LT';
-                case 6:
-                    return '[u] [subotu] [u] LT';
-                case 1:
-                case 2:
-                case 4:
-                case 5:
-                    return '[u] dddd [u] LT';
-            }
+    var hr = moment.defineLocale('hr', {
+        months : {
+            format: 'siječnja_veljače_ožujka_travnja_svibnja_lipnja_srpnja_kolovoza_rujna_listopada_studenoga_prosinca'.split('_'),
+            standalone: 'siječanj_veljača_ožujak_travanj_svibanj_lipanj_srpanj_kolovoz_rujan_listopad_studeni_prosinac'.split('_')
         },
-        lastDay  : '[jučer u] LT',
-        lastWeek : function () {
-            switch (this.day()) {
-                case 0:
-                case 3:
-                    return '[prošlu] dddd [u] LT';
-                case 6:
-                    return '[prošle] [subote] [u] LT';
-                case 1:
-                case 2:
-                case 4:
-                case 5:
-                    return '[prošli] dddd [u] LT';
-            }
+        monthsShort : 'sij._velj._ožu._tra._svi._lip._srp._kol._ruj._lis._stu._pro.'.split('_'),
+        monthsParseExact: true,
+        weekdays : 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'),
+        weekdaysShort : 'ned._pon._uto._sri._čet._pet._sub.'.split('_'),
+        weekdaysMin : 'ne_po_ut_sr_če_pe_su'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY H:mm',
+            LLLL : 'dddd, D. MMMM YYYY H:mm'
         },
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'za %s',
-        past   : 'prije %s',
-        s      : 'par sekundi',
-        m      : translate,
-        mm     : translate,
-        h      : translate,
-        hh     : translate,
-        d      : 'dan',
-        dd     : translate,
-        M      : 'mjesec',
-        MM     : translate,
-        y      : 'godinu',
-        yy     : translate
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+        calendar : {
+            sameDay  : '[danas u] LT',
+            nextDay  : '[sutra u] LT',
+            nextWeek : function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[u] [nedjelju] [u] LT';
+                    case 3:
+                        return '[u] [srijedu] [u] LT';
+                    case 6:
+                        return '[u] [subotu] [u] LT';
+                    case 1:
+                    case 2:
+                    case 4:
+                    case 5:
+                        return '[u] dddd [u] LT';
+                }
+            },
+            lastDay  : '[jučer u] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                    case 0:
+                    case 3:
+                        return '[prošlu] dddd [u] LT';
+                    case 6:
+                        return '[prošle] [subote] [u] LT';
+                    case 1:
+                    case 2:
+                    case 4:
+                    case 5:
+                        return '[prošli] dddd [u] LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past   : 'prije %s',
+            s      : 'par sekundi',
+            ss     : translate,
+            m      : translate,
+            mm     : translate,
+            h      : translate,
+            hh     : translate,
+            d      : 'dan',
+            dd     : translate,
+            M      : 'mjesec',
+            MM     : translate,
+            y      : 'godinu',
+            yy     : translate
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
 
-return hr;
+    return hr;
 
 })));
diff --git a/lib/javascripts/moment_locale/hu.js b/lib/javascripts/moment_locale/hu.js
old mode 100644
new mode 100755
index e2158741eb8..53e9bb6eb44
--- a/lib/javascripts/moment_locale/hu.js
+++ b/lib/javascripts/moment_locale/hu.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Hungarian [hu]
-//! author : Adam Brunner : https://github.com/adambrunner
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,100 +8,102 @@
 }(this, (function (moment) { 'use strict';
 
 
-var weekEndings = 'vasárnap hétfőn kedden szerdán csütörtökön pénteken szombaton'.split(' ');
-function translate(number, withoutSuffix, key, isFuture) {
-    var num = number,
-        suffix;
-    switch (key) {
-        case 's':
-            return (isFuture || withoutSuffix) ? 'néhány másodperc' : 'néhány másodperce';
-        case 'm':
-            return 'egy' + (isFuture || withoutSuffix ? ' perc' : ' perce');
-        case 'mm':
-            return num + (isFuture || withoutSuffix ? ' perc' : ' perce');
-        case 'h':
-            return 'egy' + (isFuture || withoutSuffix ? ' óra' : ' órája');
-        case 'hh':
-            return num + (isFuture || withoutSuffix ? ' óra' : ' órája');
-        case 'd':
-            return 'egy' + (isFuture || withoutSuffix ? ' nap' : ' napja');
-        case 'dd':
-            return num + (isFuture || withoutSuffix ? ' nap' : ' napja');
-        case 'M':
-            return 'egy' + (isFuture || withoutSuffix ? ' hónap' : ' hónapja');
-        case 'MM':
-            return num + (isFuture || withoutSuffix ? ' hónap' : ' hónapja');
-        case 'y':
-            return 'egy' + (isFuture || withoutSuffix ? ' év' : ' éve');
-        case 'yy':
-            return num + (isFuture || withoutSuffix ? ' év' : ' éve');
-    }
-    return '';
-}
-function week(isFuture) {
-    return (isFuture ? '' : '[múlt] ') + '[' + weekEndings[this.day()] + '] LT[-kor]';
-}
-
-var hu = moment.defineLocale('hu', {
-    months : 'január_február_március_április_május_június_július_augusztus_szeptember_október_november_december'.split('_'),
-    monthsShort : 'jan_feb_márc_ápr_máj_jún_júl_aug_szept_okt_nov_dec'.split('_'),
-    weekdays : 'vasárnap_hétfő_kedd_szerda_csütörtök_péntek_szombat'.split('_'),
-    weekdaysShort : 'vas_hét_kedd_sze_csüt_pén_szo'.split('_'),
-    weekdaysMin : 'v_h_k_sze_cs_p_szo'.split('_'),
-    longDateFormat : {
-        LT : 'H:mm',
-        LTS : 'H:mm:ss',
-        L : 'YYYY.MM.DD.',
-        LL : 'YYYY. MMMM D.',
-        LLL : 'YYYY. MMMM D. H:mm',
-        LLLL : 'YYYY. MMMM D., dddd H:mm'
-    },
-    meridiemParse: /de|du/i,
-    isPM: function (input) {
-        return input.charAt(1).toLowerCase() === 'u';
-    },
-    meridiem : function (hours, minutes, isLower) {
-        if (hours < 12) {
-            return isLower === true ? 'de' : 'DE';
-        } else {
-            return isLower === true ? 'du' : 'DU';
+    var weekEndings = 'vasárnap hétfőn kedden szerdán csütörtökön pénteken szombaton'.split(' ');
+    function translate(number, withoutSuffix, key, isFuture) {
+        var num = number;
+        switch (key) {
+            case 's':
+                return (isFuture || withoutSuffix) ? 'néhány másodperc' : 'néhány másodperce';
+            case 'ss':
+                return num + (isFuture || withoutSuffix) ? ' másodperc' : ' másodperce';
+            case 'm':
+                return 'egy' + (isFuture || withoutSuffix ? ' perc' : ' perce');
+            case 'mm':
+                return num + (isFuture || withoutSuffix ? ' perc' : ' perce');
+            case 'h':
+                return 'egy' + (isFuture || withoutSuffix ? ' óra' : ' órája');
+            case 'hh':
+                return num + (isFuture || withoutSuffix ? ' óra' : ' órája');
+            case 'd':
+                return 'egy' + (isFuture || withoutSuffix ? ' nap' : ' napja');
+            case 'dd':
+                return num + (isFuture || withoutSuffix ? ' nap' : ' napja');
+            case 'M':
+                return 'egy' + (isFuture || withoutSuffix ? ' hónap' : ' hónapja');
+            case 'MM':
+                return num + (isFuture || withoutSuffix ? ' hónap' : ' hónapja');
+            case 'y':
+                return 'egy' + (isFuture || withoutSuffix ? ' év' : ' éve');
+            case 'yy':
+                return num + (isFuture || withoutSuffix ? ' év' : ' éve');
         }
-    },
-    calendar : {
-        sameDay : '[ma] LT[-kor]',
-        nextDay : '[holnap] LT[-kor]',
-        nextWeek : function () {
-            return week.call(this, true);
-        },
-        lastDay : '[tegnap] LT[-kor]',
-        lastWeek : function () {
-            return week.call(this, false);
-        },
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : '%s múlva',
-        past : '%s',
-        s : translate,
-        m : translate,
-        mm : translate,
-        h : translate,
-        hh : translate,
-        d : translate,
-        dd : translate,
-        M : translate,
-        MM : translate,
-        y : translate,
-        yy : translate
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
+        return '';
+    }
+    function week(isFuture) {
+        return (isFuture ? '' : '[múlt] ') + '[' + weekEndings[this.day()] + '] LT[-kor]';
     }
-});
 
-return hu;
+    var hu = moment.defineLocale('hu', {
+        months : 'január_február_március_április_május_június_július_augusztus_szeptember_október_november_december'.split('_'),
+        monthsShort : 'jan_feb_márc_ápr_máj_jún_júl_aug_szept_okt_nov_dec'.split('_'),
+        weekdays : 'vasárnap_hétfő_kedd_szerda_csütörtök_péntek_szombat'.split('_'),
+        weekdaysShort : 'vas_hét_kedd_sze_csüt_pén_szo'.split('_'),
+        weekdaysMin : 'v_h_k_sze_cs_p_szo'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'YYYY.MM.DD.',
+            LL : 'YYYY. MMMM D.',
+            LLL : 'YYYY. MMMM D. H:mm',
+            LLLL : 'YYYY. MMMM D., dddd H:mm'
+        },
+        meridiemParse: /de|du/i,
+        isPM: function (input) {
+            return input.charAt(1).toLowerCase() === 'u';
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 12) {
+                return isLower === true ? 'de' : 'DE';
+            } else {
+                return isLower === true ? 'du' : 'DU';
+            }
+        },
+        calendar : {
+            sameDay : '[ma] LT[-kor]',
+            nextDay : '[holnap] LT[-kor]',
+            nextWeek : function () {
+                return week.call(this, true);
+            },
+            lastDay : '[tegnap] LT[-kor]',
+            lastWeek : function () {
+                return week.call(this, false);
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s múlva',
+            past : '%s',
+            s : translate,
+            ss : translate,
+            m : translate,
+            mm : translate,
+            h : translate,
+            hh : translate,
+            d : translate,
+            dd : translate,
+            M : translate,
+            MM : translate,
+            y : translate,
+            yy : translate
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return hu;
 
 })));
diff --git a/lib/javascripts/moment_locale/hy-am.js b/lib/javascripts/moment_locale/hy-am.js
old mode 100644
new mode 100755
index 0b76845883d..d709d3bdc80
--- a/lib/javascripts/moment_locale/hy-am.js
+++ b/lib/javascripts/moment_locale/hy-am.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Armenian [hy-am]
-//! author : Armendarabyan : https://github.com/armendarabyan
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,86 +8,87 @@
 }(this, (function (moment) { 'use strict';
 
 
-var hyAm = moment.defineLocale('hy-am', {
-    months : {
-        format: 'հունվարի_փետրվարի_մարտի_ապրիլի_մայիսի_հունիսի_հուլիսի_օգոստոսի_սեպտեմբերի_հոկտեմբերի_նոյեմբերի_դեկտեմբերի'.split('_'),
-        standalone: 'հունվար_փետրվար_մարտ_ապրիլ_մայիս_հունիս_հուլիս_օգոստոս_սեպտեմբեր_հոկտեմբեր_նոյեմբեր_դեկտեմբեր'.split('_')
-    },
-    monthsShort : 'հնվ_փտր_մրտ_ապր_մյս_հնս_հլս_օգս_սպտ_հկտ_նմբ_դկտ'.split('_'),
-    weekdays : 'կիրակի_երկուշաբթի_երեքշաբթի_չորեքշաբթի_հինգշաբթի_ուրբաթ_շաբաթ'.split('_'),
-    weekdaysShort : 'կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ'.split('_'),
-    weekdaysMin : 'կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D MMMM YYYY թ.',
-        LLL : 'D MMMM YYYY թ., HH:mm',
-        LLLL : 'dddd, D MMMM YYYY թ., HH:mm'
-    },
-    calendar : {
-        sameDay: '[այսօր] LT',
-        nextDay: '[վաղը] LT',
-        lastDay: '[երեկ] LT',
-        nextWeek: function () {
-            return 'dddd [օրը ժամը] LT';
+    var hyAm = moment.defineLocale('hy-am', {
+        months : {
+            format: 'հունվարի_փետրվարի_մարտի_ապրիլի_մայիսի_հունիսի_հուլիսի_օգոստոսի_սեպտեմբերի_հոկտեմբերի_նոյեմբերի_դեկտեմբերի'.split('_'),
+            standalone: 'հունվար_փետրվար_մարտ_ապրիլ_մայիս_հունիս_հուլիս_օգոստոս_սեպտեմբեր_հոկտեմբեր_նոյեմբեր_դեկտեմբեր'.split('_')
         },
-        lastWeek: function () {
-            return '[անցած] dddd [օրը ժամը] LT';
+        monthsShort : 'հնվ_փտր_մրտ_ապր_մյս_հնս_հլս_օգս_սպտ_հկտ_նմբ_դկտ'.split('_'),
+        weekdays : 'կիրակի_երկուշաբթի_երեքշաբթի_չորեքշաբթի_հինգշաբթի_ուրբաթ_շաբաթ'.split('_'),
+        weekdaysShort : 'կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ'.split('_'),
+        weekdaysMin : 'կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY թ.',
+            LLL : 'D MMMM YYYY թ., HH:mm',
+            LLLL : 'dddd, D MMMM YYYY թ., HH:mm'
         },
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : '%s հետո',
-        past : '%s առաջ',
-        s : 'մի քանի վայրկյան',
-        m : 'րոպե',
-        mm : '%d րոպե',
-        h : 'ժամ',
-        hh : '%d ժամ',
-        d : 'օր',
-        dd : '%d օր',
-        M : 'ամիս',
-        MM : '%d ամիս',
-        y : 'տարի',
-        yy : '%d տարի'
-    },
-    meridiemParse: /գիշերվա|առավոտվա|ցերեկվա|երեկոյան/,
-    isPM: function (input) {
-        return /^(ցերեկվա|երեկոյան)$/.test(input);
-    },
-    meridiem : function (hour) {
-        if (hour < 4) {
-            return 'գիշերվա';
-        } else if (hour < 12) {
-            return 'առավոտվա';
-        } else if (hour < 17) {
-            return 'ցերեկվա';
-        } else {
-            return 'երեկոյան';
+        calendar : {
+            sameDay: '[այսօր] LT',
+            nextDay: '[վաղը] LT',
+            lastDay: '[երեկ] LT',
+            nextWeek: function () {
+                return 'dddd [օրը ժամը] LT';
+            },
+            lastWeek: function () {
+                return '[անցած] dddd [օրը ժամը] LT';
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : '%s հետո',
+            past : '%s առաջ',
+            s : 'մի քանի վայրկյան',
+            ss : '%d վայրկյան',
+            m : 'րոպե',
+            mm : '%d րոպե',
+            h : 'ժամ',
+            hh : '%d ժամ',
+            d : 'օր',
+            dd : '%d օր',
+            M : 'ամիս',
+            MM : '%d ամիս',
+            y : 'տարի',
+            yy : '%d տարի'
+        },
+        meridiemParse: /գիշերվա|առավոտվա|ցերեկվա|երեկոյան/,
+        isPM: function (input) {
+            return /^(ցերեկվա|երեկոյան)$/.test(input);
+        },
+        meridiem : function (hour) {
+            if (hour < 4) {
+                return 'գիշերվա';
+            } else if (hour < 12) {
+                return 'առավոտվա';
+            } else if (hour < 17) {
+                return 'ցերեկվա';
+            } else {
+                return 'երեկոյան';
+            }
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}|\d{1,2}-(ին|րդ)/,
+        ordinal: function (number, period) {
+            switch (period) {
+                case 'DDD':
+                case 'w':
+                case 'W':
+                case 'DDDo':
+                    if (number === 1) {
+                        return number + '-ին';
+                    }
+                    return number + '-րդ';
+                default:
+                    return number;
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
         }
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}|\d{1,2}-(ին|րդ)/,
-    ordinal: function (number, period) {
-        switch (period) {
-            case 'DDD':
-            case 'w':
-            case 'W':
-            case 'DDDo':
-                if (number === 1) {
-                    return number + '-ին';
-                }
-                return number + '-րդ';
-            default:
-                return number;
-        }
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    });
 
-return hyAm;
+    return hyAm;
 
 })));
diff --git a/lib/javascripts/moment_locale/id.js b/lib/javascripts/moment_locale/id.js
old mode 100644
new mode 100755
index a1cfb183459..63eb080d951
--- a/lib/javascripts/moment_locale/id.js
+++ b/lib/javascripts/moment_locale/id.js
@@ -1,7 +1,4 @@
 //! moment.js locale configuration
-//! locale : Indonesian [id]
-//! author : Mohammad Satrio Utomo : https://github.com/tyok
-//! reference: http://id.wikisource.org/wiki/Pedoman_Umum_Ejaan_Bahasa_Indonesia_yang_Disempurnakan
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -11,73 +8,74 @@
 }(this, (function (moment) { 'use strict';
 
 
-var id = moment.defineLocale('id', {
-    months : 'Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_November_Desember'.split('_'),
-    monthsShort : 'Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nov_Des'.split('_'),
-    weekdays : 'Minggu_Senin_Selasa_Rabu_Kamis_Jumat_Sabtu'.split('_'),
-    weekdaysShort : 'Min_Sen_Sel_Rab_Kam_Jum_Sab'.split('_'),
-    weekdaysMin : 'Mg_Sn_Sl_Rb_Km_Jm_Sb'.split('_'),
-    longDateFormat : {
-        LT : 'HH.mm',
-        LTS : 'HH.mm.ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY [pukul] HH.mm',
-        LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm'
-    },
-    meridiemParse: /pagi|siang|sore|malam/,
-    meridiemHour : function (hour, meridiem) {
-        if (hour === 12) {
-            hour = 0;
+    var id = moment.defineLocale('id', {
+        months : 'Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_November_Desember'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_Mei_Jun_Jul_Agt_Sep_Okt_Nov_Des'.split('_'),
+        weekdays : 'Minggu_Senin_Selasa_Rabu_Kamis_Jumat_Sabtu'.split('_'),
+        weekdaysShort : 'Min_Sen_Sel_Rab_Kam_Jum_Sab'.split('_'),
+        weekdaysMin : 'Mg_Sn_Sl_Rb_Km_Jm_Sb'.split('_'),
+        longDateFormat : {
+            LT : 'HH.mm',
+            LTS : 'HH.mm.ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY [pukul] HH.mm',
+            LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm'
+        },
+        meridiemParse: /pagi|siang|sore|malam/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'pagi') {
+                return hour;
+            } else if (meridiem === 'siang') {
+                return hour >= 11 ? hour : hour + 12;
+            } else if (meridiem === 'sore' || meridiem === 'malam') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 11) {
+                return 'pagi';
+            } else if (hours < 15) {
+                return 'siang';
+            } else if (hours < 19) {
+                return 'sore';
+            } else {
+                return 'malam';
+            }
+        },
+        calendar : {
+            sameDay : '[Hari ini pukul] LT',
+            nextDay : '[Besok pukul] LT',
+            nextWeek : 'dddd [pukul] LT',
+            lastDay : '[Kemarin pukul] LT',
+            lastWeek : 'dddd [lalu pukul] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'dalam %s',
+            past : '%s yang lalu',
+            s : 'beberapa detik',
+            ss : '%d detik',
+            m : 'semenit',
+            mm : '%d menit',
+            h : 'sejam',
+            hh : '%d jam',
+            d : 'sehari',
+            dd : '%d hari',
+            M : 'sebulan',
+            MM : '%d bulan',
+            y : 'setahun',
+            yy : '%d tahun'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
         }
-        if (meridiem === 'pagi') {
-            return hour;
-        } else if (meridiem === 'siang') {
-            return hour >= 11 ? hour : hour + 12;
-        } else if (meridiem === 'sore' || meridiem === 'malam') {
-            return hour + 12;
-        }
-    },
-    meridiem : function (hours, minutes, isLower) {
-        if (hours < 11) {
-            return 'pagi';
-        } else if (hours < 15) {
-            return 'siang';
-        } else if (hours < 19) {
-            return 'sore';
-        } else {
-            return 'malam';
-        }
-    },
-    calendar : {
-        sameDay : '[Hari ini pukul] LT',
-        nextDay : '[Besok pukul] LT',
-        nextWeek : 'dddd [pukul] LT',
-        lastDay : '[Kemarin pukul] LT',
-        lastWeek : 'dddd [lalu pukul] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'dalam %s',
-        past : '%s yang lalu',
-        s : 'beberapa detik',
-        m : 'semenit',
-        mm : '%d menit',
-        h : 'sejam',
-        hh : '%d jam',
-        d : 'sehari',
-        dd : '%d hari',
-        M : 'sebulan',
-        MM : '%d bulan',
-        y : 'setahun',
-        yy : '%d tahun'
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    });
 
-return id;
+    return id;
 
 })));
diff --git a/lib/javascripts/moment_locale/is.js b/lib/javascripts/moment_locale/is.js
old mode 100644
new mode 100755
index 541b270e5f5..9856e927aba
--- a/lib/javascripts/moment_locale/is.js
+++ b/lib/javascripts/moment_locale/is.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Icelandic [is]
-//! author : Hinrik Örn Sigurðsson : https://github.com/hinrik
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,118 +8,124 @@
 }(this, (function (moment) { 'use strict';
 
 
-function plural(n) {
-    if (n % 100 === 11) {
+    function plural(n) {
+        if (n % 100 === 11) {
+            return true;
+        } else if (n % 10 === 1) {
+            return false;
+        }
         return true;
-    } else if (n % 10 === 1) {
-        return false;
     }
-    return true;
-}
-function translate(number, withoutSuffix, key, isFuture) {
-    var result = number + ' ';
-    switch (key) {
-        case 's':
-            return withoutSuffix || isFuture ? 'nokkrar sekúndur' : 'nokkrum sekúndum';
-        case 'm':
-            return withoutSuffix ? 'mínúta' : 'mínútu';
-        case 'mm':
-            if (plural(number)) {
-                return result + (withoutSuffix || isFuture ? 'mínútur' : 'mínútum');
-            } else if (withoutSuffix) {
-                return result + 'mínúta';
-            }
-            return result + 'mínútu';
-        case 'hh':
-            if (plural(number)) {
-                return result + (withoutSuffix || isFuture ? 'klukkustundir' : 'klukkustundum');
-            }
-            return result + 'klukkustund';
-        case 'd':
-            if (withoutSuffix) {
-                return 'dagur';
-            }
-            return isFuture ? 'dag' : 'degi';
-        case 'dd':
-            if (plural(number)) {
-                if (withoutSuffix) {
-                    return result + 'dagar';
+    function translate(number, withoutSuffix, key, isFuture) {
+        var result = number + ' ';
+        switch (key) {
+            case 's':
+                return withoutSuffix || isFuture ? 'nokkrar sekúndur' : 'nokkrum sekúndum';
+            case 'ss':
+                if (plural(number)) {
+                    return result + (withoutSuffix || isFuture ? 'sekúndur' : 'sekúndum');
                 }
-                return result + (isFuture ? 'daga' : 'dögum');
-            } else if (withoutSuffix) {
-                return result + 'dagur';
-            }
-            return result + (isFuture ? 'dag' : 'degi');
-        case 'M':
-            if (withoutSuffix) {
-                return 'mánuður';
-            }
-            return isFuture ? 'mánuð' : 'mánuði';
-        case 'MM':
-            if (plural(number)) {
-                if (withoutSuffix) {
-                    return result + 'mánuðir';
+                return result + 'sekúnda';
+            case 'm':
+                return withoutSuffix ? 'mínúta' : 'mínútu';
+            case 'mm':
+                if (plural(number)) {
+                    return result + (withoutSuffix || isFuture ? 'mínútur' : 'mínútum');
+                } else if (withoutSuffix) {
+                    return result + 'mínúta';
                 }
-                return result + (isFuture ? 'mánuði' : 'mánuðum');
-            } else if (withoutSuffix) {
-                return result + 'mánuður';
-            }
-            return result + (isFuture ? 'mánuð' : 'mánuði');
-        case 'y':
-            return withoutSuffix || isFuture ? 'ár' : 'ári';
-        case 'yy':
-            if (plural(number)) {
-                return result + (withoutSuffix || isFuture ? 'ár' : 'árum');
-            }
-            return result + (withoutSuffix || isFuture ? 'ár' : 'ári');
+                return result + 'mínútu';
+            case 'hh':
+                if (plural(number)) {
+                    return result + (withoutSuffix || isFuture ? 'klukkustundir' : 'klukkustundum');
+                }
+                return result + 'klukkustund';
+            case 'd':
+                if (withoutSuffix) {
+                    return 'dagur';
+                }
+                return isFuture ? 'dag' : 'degi';
+            case 'dd':
+                if (plural(number)) {
+                    if (withoutSuffix) {
+                        return result + 'dagar';
+                    }
+                    return result + (isFuture ? 'daga' : 'dögum');
+                } else if (withoutSuffix) {
+                    return result + 'dagur';
+                }
+                return result + (isFuture ? 'dag' : 'degi');
+            case 'M':
+                if (withoutSuffix) {
+                    return 'mánuður';
+                }
+                return isFuture ? 'mánuð' : 'mánuði';
+            case 'MM':
+                if (plural(number)) {
+                    if (withoutSuffix) {
+                        return result + 'mánuðir';
+                    }
+                    return result + (isFuture ? 'mánuði' : 'mánuðum');
+                } else if (withoutSuffix) {
+                    return result + 'mánuður';
+                }
+                return result + (isFuture ? 'mánuð' : 'mánuði');
+            case 'y':
+                return withoutSuffix || isFuture ? 'ár' : 'ári';
+            case 'yy':
+                if (plural(number)) {
+                    return result + (withoutSuffix || isFuture ? 'ár' : 'árum');
+                }
+                return result + (withoutSuffix || isFuture ? 'ár' : 'ári');
+        }
     }
-}
 
-var is = moment.defineLocale('is', {
-    months : 'janúar_febrúar_mars_apríl_maí_júní_júlí_ágúst_september_október_nóvember_desember'.split('_'),
-    monthsShort : 'jan_feb_mar_apr_maí_jún_júl_ágú_sep_okt_nóv_des'.split('_'),
-    weekdays : 'sunnudagur_mánudagur_þriðjudagur_miðvikudagur_fimmtudagur_föstudagur_laugardagur'.split('_'),
-    weekdaysShort : 'sun_mán_þri_mið_fim_fös_lau'.split('_'),
-    weekdaysMin : 'Su_Má_Þr_Mi_Fi_Fö_La'.split('_'),
-    longDateFormat : {
-        LT : 'H:mm',
-        LTS : 'H:mm:ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D. MMMM YYYY',
-        LLL : 'D. MMMM YYYY [kl.] H:mm',
-        LLLL : 'dddd, D. MMMM YYYY [kl.] H:mm'
-    },
-    calendar : {
-        sameDay : '[í dag kl.] LT',
-        nextDay : '[á morgun kl.] LT',
-        nextWeek : 'dddd [kl.] LT',
-        lastDay : '[í gær kl.] LT',
-        lastWeek : '[síðasta] dddd [kl.] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'eftir %s',
-        past : 'fyrir %s síðan',
-        s : translate,
-        m : translate,
-        mm : translate,
-        h : 'klukkustund',
-        hh : translate,
-        d : translate,
-        dd : translate,
-        M : translate,
-        MM : translate,
-        y : translate,
-        yy : translate
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    var is = moment.defineLocale('is', {
+        months : 'janúar_febrúar_mars_apríl_maí_júní_júlí_ágúst_september_október_nóvember_desember'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_maí_jún_júl_ágú_sep_okt_nóv_des'.split('_'),
+        weekdays : 'sunnudagur_mánudagur_þriðjudagur_miðvikudagur_fimmtudagur_föstudagur_laugardagur'.split('_'),
+        weekdaysShort : 'sun_mán_þri_mið_fim_fös_lau'.split('_'),
+        weekdaysMin : 'Su_Má_Þr_Mi_Fi_Fö_La'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY [kl.] H:mm',
+            LLLL : 'dddd, D. MMMM YYYY [kl.] H:mm'
+        },
+        calendar : {
+            sameDay : '[í dag kl.] LT',
+            nextDay : '[á morgun kl.] LT',
+            nextWeek : 'dddd [kl.] LT',
+            lastDay : '[í gær kl.] LT',
+            lastWeek : '[síðasta] dddd [kl.] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'eftir %s',
+            past : 'fyrir %s síðan',
+            s : translate,
+            ss : translate,
+            m : translate,
+            mm : translate,
+            h : 'klukkustund',
+            hh : translate,
+            d : translate,
+            dd : translate,
+            M : translate,
+            MM : translate,
+            y : translate,
+            yy : translate
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-return is;
+    return is;
 
 })));
diff --git a/lib/javascripts/moment_locale/it.js b/lib/javascripts/moment_locale/it.js
old mode 100644
new mode 100755
index f3079cb465c..f42ff8fa5b7
--- a/lib/javascripts/moment_locale/it.js
+++ b/lib/javascripts/moment_locale/it.js
@@ -1,7 +1,4 @@
 //! moment.js locale configuration
-//! locale : Italian [it]
-//! author : Lorenzo : https://github.com/aliem
-//! author: Mattia Larentis: https://github.com/nostalgiaz
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -11,60 +8,61 @@
 }(this, (function (moment) { 'use strict';
 
 
-var it = moment.defineLocale('it', {
-    months : 'gennaio_febbraio_marzo_aprile_maggio_giugno_luglio_agosto_settembre_ottobre_novembre_dicembre'.split('_'),
-    monthsShort : 'gen_feb_mar_apr_mag_giu_lug_ago_set_ott_nov_dic'.split('_'),
-    weekdays : 'domenica_lunedì_martedì_mercoledì_giovedì_venerdì_sabato'.split('_'),
-    weekdaysShort : 'dom_lun_mar_mer_gio_ven_sab'.split('_'),
-    weekdaysMin : 'do_lu_ma_me_gi_ve_sa'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd, D MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay: '[Oggi alle] LT',
-        nextDay: '[Domani alle] LT',
-        nextWeek: 'dddd [alle] LT',
-        lastDay: '[Ieri alle] LT',
-        lastWeek: function () {
-            switch (this.day()) {
-                case 0:
-                    return '[la scorsa] dddd [alle] LT';
-                default:
-                    return '[lo scorso] dddd [alle] LT';
-            }
+    var it = moment.defineLocale('it', {
+        months : 'gennaio_febbraio_marzo_aprile_maggio_giugno_luglio_agosto_settembre_ottobre_novembre_dicembre'.split('_'),
+        monthsShort : 'gen_feb_mar_apr_mag_giu_lug_ago_set_ott_nov_dic'.split('_'),
+        weekdays : 'domenica_lunedì_martedì_mercoledì_giovedì_venerdì_sabato'.split('_'),
+        weekdaysShort : 'dom_lun_mar_mer_gio_ven_sab'.split('_'),
+        weekdaysMin : 'do_lu_ma_me_gi_ve_sa'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
         },
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : function (s) {
-            return ((/^[0-9].+$/).test(s) ? 'tra' : 'in') + ' ' + s;
+        calendar : {
+            sameDay: '[Oggi alle] LT',
+            nextDay: '[Domani alle] LT',
+            nextWeek: 'dddd [alle] LT',
+            lastDay: '[Ieri alle] LT',
+            lastWeek: function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[la scorsa] dddd [alle] LT';
+                    default:
+                        return '[lo scorso] dddd [alle] LT';
+                }
+            },
+            sameElse: 'L'
         },
-        past : '%s fa',
-        s : 'alcuni secondi',
-        m : 'un minuto',
-        mm : '%d minuti',
-        h : 'un\'ora',
-        hh : '%d ore',
-        d : 'un giorno',
-        dd : '%d giorni',
-        M : 'un mese',
-        MM : '%d mesi',
-        y : 'un anno',
-        yy : '%d anni'
-    },
-    dayOfMonthOrdinalParse : /\d{1,2}º/,
-    ordinal: '%dº',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+        relativeTime : {
+            future : function (s) {
+                return ((/^[0-9].+$/).test(s) ? 'tra' : 'in') + ' ' + s;
+            },
+            past : '%s fa',
+            s : 'alcuni secondi',
+            ss : '%d secondi',
+            m : 'un minuto',
+            mm : '%d minuti',
+            h : 'un\'ora',
+            hh : '%d ore',
+            d : 'un giorno',
+            dd : '%d giorni',
+            M : 'un mese',
+            MM : '%d mesi',
+            y : 'un anno',
+            yy : '%d anni'
+        },
+        dayOfMonthOrdinalParse : /\d{1,2}º/,
+        ordinal: '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-return it;
+    return it;
 
 })));
diff --git a/lib/javascripts/moment_locale/ja.js b/lib/javascripts/moment_locale/ja.js
old mode 100644
new mode 100755
index b2e655395e9..5ec1be53b58
--- a/lib/javascripts/moment_locale/ja.js
+++ b/lib/javascripts/moment_locale/ja.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Japanese [ja]
-//! author : LI Long : https://github.com/baryon
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,71 +8,84 @@
 }(this, (function (moment) { 'use strict';
 
 
-var ja = moment.defineLocale('ja', {
-    months : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
-    monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
-    weekdays : '日曜日_月曜日_火曜日_水曜日_木曜日_金曜日_土曜日'.split('_'),
-    weekdaysShort : '日_月_火_水_木_金_土'.split('_'),
-    weekdaysMin : '日_月_火_水_木_金_土'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'YYYY/MM/DD',
-        LL : 'YYYY年M月D日',
-        LLL : 'YYYY年M月D日 HH:mm',
-        LLLL : 'YYYY年M月D日 HH:mm dddd',
-        l : 'YYYY/MM/DD',
-        ll : 'YYYY年M月D日',
-        lll : 'YYYY年M月D日 HH:mm',
-        llll : 'YYYY年M月D日 HH:mm dddd'
-    },
-    meridiemParse: /午前|午後/i,
-    isPM : function (input) {
-        return input === '午後';
-    },
-    meridiem : function (hour, minute, isLower) {
-        if (hour < 12) {
-            return '午前';
-        } else {
-            return '午後';
+    var ja = moment.defineLocale('ja', {
+        months : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+        weekdays : '日曜日_月曜日_火曜日_水曜日_木曜日_金曜日_土曜日'.split('_'),
+        weekdaysShort : '日_月_火_水_木_金_土'.split('_'),
+        weekdaysMin : '日_月_火_水_木_金_土'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'YYYY/MM/DD',
+            LL : 'YYYY年M月D日',
+            LLL : 'YYYY年M月D日 HH:mm',
+            LLLL : 'YYYY年M月D日 dddd HH:mm',
+            l : 'YYYY/MM/DD',
+            ll : 'YYYY年M月D日',
+            lll : 'YYYY年M月D日 HH:mm',
+            llll : 'YYYY年M月D日(ddd) HH:mm'
+        },
+        meridiemParse: /午前|午後/i,
+        isPM : function (input) {
+            return input === '午後';
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return '午前';
+            } else {
+                return '午後';
+            }
+        },
+        calendar : {
+            sameDay : '[今日] LT',
+            nextDay : '[明日] LT',
+            nextWeek : function (now) {
+                if (now.week() < this.week()) {
+                    return '[来週]dddd LT';
+                } else {
+                    return 'dddd LT';
+                }
+            },
+            lastDay : '[昨日] LT',
+            lastWeek : function (now) {
+                if (this.week() < now.week()) {
+                    return '[先週]dddd LT';
+                } else {
+                    return 'dddd LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        dayOfMonthOrdinalParse : /\d{1,2}日/,
+        ordinal : function (number, period) {
+            switch (period) {
+                case 'd':
+                case 'D':
+                case 'DDD':
+                    return number + '日';
+                default:
+                    return number;
+            }
+        },
+        relativeTime : {
+            future : '%s後',
+            past : '%s前',
+            s : '数秒',
+            ss : '%d秒',
+            m : '1分',
+            mm : '%d分',
+            h : '1時間',
+            hh : '%d時間',
+            d : '1日',
+            dd : '%d日',
+            M : '1ヶ月',
+            MM : '%dヶ月',
+            y : '1年',
+            yy : '%d年'
         }
-    },
-    calendar : {
-        sameDay : '[今日] LT',
-        nextDay : '[明日] LT',
-        nextWeek : '[来週]dddd LT',
-        lastDay : '[昨日] LT',
-        lastWeek : '[前週]dddd LT',
-        sameElse : 'L'
-    },
-    dayOfMonthOrdinalParse : /\d{1,2}日/,
-    ordinal : function (number, period) {
-        switch (period) {
-            case 'd':
-            case 'D':
-            case 'DDD':
-                return number + '日';
-            default:
-                return number;
-        }
-    },
-    relativeTime : {
-        future : '%s後',
-        past : '%s前',
-        s : '数秒',
-        m : '1分',
-        mm : '%d分',
-        h : '1時間',
-        hh : '%d時間',
-        d : '1日',
-        dd : '%d日',
-        M : '1ヶ月',
-        MM : '%dヶ月',
-        y : '1年',
-        yy : '%d年'
-    }
-});
+    });
 
-return ja;
+    return ja;
 
 })));
diff --git a/lib/javascripts/moment_locale/jv.js b/lib/javascripts/moment_locale/jv.js
old mode 100644
new mode 100755
index 5b939e0fcb1..f4544a25fee
--- a/lib/javascripts/moment_locale/jv.js
+++ b/lib/javascripts/moment_locale/jv.js
@@ -1,7 +1,4 @@
 //! moment.js locale configuration
-//! locale : Javanese [jv]
-//! author : Rony Lantip : https://github.com/lantip
-//! reference: http://jv.wikipedia.org/wiki/Basa_Jawa
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -11,73 +8,74 @@
 }(this, (function (moment) { 'use strict';
 
 
-var jv = moment.defineLocale('jv', {
-    months : 'Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_Nopember_Desember'.split('_'),
-    monthsShort : 'Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nop_Des'.split('_'),
-    weekdays : 'Minggu_Senen_Seloso_Rebu_Kemis_Jemuwah_Septu'.split('_'),
-    weekdaysShort : 'Min_Sen_Sel_Reb_Kem_Jem_Sep'.split('_'),
-    weekdaysMin : 'Mg_Sn_Sl_Rb_Km_Jm_Sp'.split('_'),
-    longDateFormat : {
-        LT : 'HH.mm',
-        LTS : 'HH.mm.ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY [pukul] HH.mm',
-        LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm'
-    },
-    meridiemParse: /enjing|siyang|sonten|ndalu/,
-    meridiemHour : function (hour, meridiem) {
-        if (hour === 12) {
-            hour = 0;
+    var jv = moment.defineLocale('jv', {
+        months : 'Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_Nopember_Desember'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nop_Des'.split('_'),
+        weekdays : 'Minggu_Senen_Seloso_Rebu_Kemis_Jemuwah_Septu'.split('_'),
+        weekdaysShort : 'Min_Sen_Sel_Reb_Kem_Jem_Sep'.split('_'),
+        weekdaysMin : 'Mg_Sn_Sl_Rb_Km_Jm_Sp'.split('_'),
+        longDateFormat : {
+            LT : 'HH.mm',
+            LTS : 'HH.mm.ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY [pukul] HH.mm',
+            LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm'
+        },
+        meridiemParse: /enjing|siyang|sonten|ndalu/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'enjing') {
+                return hour;
+            } else if (meridiem === 'siyang') {
+                return hour >= 11 ? hour : hour + 12;
+            } else if (meridiem === 'sonten' || meridiem === 'ndalu') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 11) {
+                return 'enjing';
+            } else if (hours < 15) {
+                return 'siyang';
+            } else if (hours < 19) {
+                return 'sonten';
+            } else {
+                return 'ndalu';
+            }
+        },
+        calendar : {
+            sameDay : '[Dinten puniko pukul] LT',
+            nextDay : '[Mbenjang pukul] LT',
+            nextWeek : 'dddd [pukul] LT',
+            lastDay : '[Kala wingi pukul] LT',
+            lastWeek : 'dddd [kepengker pukul] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'wonten ing %s',
+            past : '%s ingkang kepengker',
+            s : 'sawetawis detik',
+            ss : '%d detik',
+            m : 'setunggal menit',
+            mm : '%d menit',
+            h : 'setunggal jam',
+            hh : '%d jam',
+            d : 'sedinten',
+            dd : '%d dinten',
+            M : 'sewulan',
+            MM : '%d wulan',
+            y : 'setaun',
+            yy : '%d taun'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
         }
-        if (meridiem === 'enjing') {
-            return hour;
-        } else if (meridiem === 'siyang') {
-            return hour >= 11 ? hour : hour + 12;
-        } else if (meridiem === 'sonten' || meridiem === 'ndalu') {
-            return hour + 12;
-        }
-    },
-    meridiem : function (hours, minutes, isLower) {
-        if (hours < 11) {
-            return 'enjing';
-        } else if (hours < 15) {
-            return 'siyang';
-        } else if (hours < 19) {
-            return 'sonten';
-        } else {
-            return 'ndalu';
-        }
-    },
-    calendar : {
-        sameDay : '[Dinten puniko pukul] LT',
-        nextDay : '[Mbenjang pukul] LT',
-        nextWeek : 'dddd [pukul] LT',
-        lastDay : '[Kala wingi pukul] LT',
-        lastWeek : 'dddd [kepengker pukul] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'wonten ing %s',
-        past : '%s ingkang kepengker',
-        s : 'sawetawis detik',
-        m : 'setunggal menit',
-        mm : '%d menit',
-        h : 'setunggal jam',
-        hh : '%d jam',
-        d : 'sedinten',
-        dd : '%d dinten',
-        M : 'sewulan',
-        MM : '%d wulan',
-        y : 'setaun',
-        yy : '%d taun'
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    });
 
-return jv;
+    return jv;
 
 })));
diff --git a/lib/javascripts/moment_locale/ka.js b/lib/javascripts/moment_locale/ka.js
old mode 100644
new mode 100755
index 2a95638a8f2..0ec5eb24ebe
--- a/lib/javascripts/moment_locale/ka.js
+++ b/lib/javascripts/moment_locale/ka.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Georgian [ka]
-//! author : Irakli Janiashvili : https://github.com/irakli-janiashvili
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,80 +8,81 @@
 }(this, (function (moment) { 'use strict';
 
 
-var ka = moment.defineLocale('ka', {
-    months : {
-        standalone: 'იანვარი_თებერვალი_მარტი_აპრილი_მაისი_ივნისი_ივლისი_აგვისტო_სექტემბერი_ოქტომბერი_ნოემბერი_დეკემბერი'.split('_'),
-        format: 'იანვარს_თებერვალს_მარტს_აპრილის_მაისს_ივნისს_ივლისს_აგვისტს_სექტემბერს_ოქტომბერს_ნოემბერს_დეკემბერს'.split('_')
-    },
-    monthsShort : 'იან_თებ_მარ_აპრ_მაი_ივნ_ივლ_აგვ_სექ_ოქტ_ნოე_დეკ'.split('_'),
-    weekdays : {
-        standalone: 'კვირა_ორშაბათი_სამშაბათი_ოთხშაბათი_ხუთშაბათი_პარასკევი_შაბათი'.split('_'),
-        format: 'კვირას_ორშაბათს_სამშაბათს_ოთხშაბათს_ხუთშაბათს_პარასკევს_შაბათს'.split('_'),
-        isFormat: /(წინა|შემდეგ)/
-    },
-    weekdaysShort : 'კვი_ორშ_სამ_ოთხ_ხუთ_პარ_შაბ'.split('_'),
-    weekdaysMin : 'კვ_ორ_სა_ოთ_ხუ_პა_შა'.split('_'),
-    longDateFormat : {
-        LT : 'h:mm A',
-        LTS : 'h:mm:ss A',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY h:mm A',
-        LLLL : 'dddd, D MMMM YYYY h:mm A'
-    },
-    calendar : {
-        sameDay : '[დღეს] LT[-ზე]',
-        nextDay : '[ხვალ] LT[-ზე]',
-        lastDay : '[გუშინ] LT[-ზე]',
-        nextWeek : '[შემდეგ] dddd LT[-ზე]',
-        lastWeek : '[წინა] dddd LT-ზე',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : function (s) {
-            return (/(წამი|წუთი|საათი|წელი)/).test(s) ?
-                s.replace(/ი$/, 'ში') :
-                s + 'ში';
+    var ka = moment.defineLocale('ka', {
+        months : {
+            standalone: 'იანვარი_თებერვალი_მარტი_აპრილი_მაისი_ივნისი_ივლისი_აგვისტო_სექტემბერი_ოქტომბერი_ნოემბერი_დეკემბერი'.split('_'),
+            format: 'იანვარს_თებერვალს_მარტს_აპრილის_მაისს_ივნისს_ივლისს_აგვისტს_სექტემბერს_ოქტომბერს_ნოემბერს_დეკემბერს'.split('_')
         },
-        past : function (s) {
-            if ((/(წამი|წუთი|საათი|დღე|თვე)/).test(s)) {
-                return s.replace(/(ი|ე)$/, 'ის უკან');
-            }
-            if ((/წელი/).test(s)) {
-                return s.replace(/წელი$/, 'წლის უკან');
-            }
+        monthsShort : 'იან_თებ_მარ_აპრ_მაი_ივნ_ივლ_აგვ_სექ_ოქტ_ნოე_დეკ'.split('_'),
+        weekdays : {
+            standalone: 'კვირა_ორშაბათი_სამშაბათი_ოთხშაბათი_ხუთშაბათი_პარასკევი_შაბათი'.split('_'),
+            format: 'კვირას_ორშაბათს_სამშაბათს_ოთხშაბათს_ხუთშაბათს_პარასკევს_შაბათს'.split('_'),
+            isFormat: /(წინა|შემდეგ)/
         },
-        s : 'რამდენიმე წამი',
-        m : 'წუთი',
-        mm : '%d წუთი',
-        h : 'საათი',
-        hh : '%d საათი',
-        d : 'დღე',
-        dd : '%d დღე',
-        M : 'თვე',
-        MM : '%d თვე',
-        y : 'წელი',
-        yy : '%d წელი'
-    },
-    dayOfMonthOrdinalParse: /0|1-ლი|მე-\d{1,2}|\d{1,2}-ე/,
-    ordinal : function (number) {
-        if (number === 0) {
-            return number;
+        weekdaysShort : 'კვი_ორშ_სამ_ოთხ_ხუთ_პარ_შაბ'.split('_'),
+        weekdaysMin : 'კვ_ორ_სა_ოთ_ხუ_პა_შა'.split('_'),
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY h:mm A',
+            LLLL : 'dddd, D MMMM YYYY h:mm A'
+        },
+        calendar : {
+            sameDay : '[დღეს] LT[-ზე]',
+            nextDay : '[ხვალ] LT[-ზე]',
+            lastDay : '[გუშინ] LT[-ზე]',
+            nextWeek : '[შემდეგ] dddd LT[-ზე]',
+            lastWeek : '[წინა] dddd LT-ზე',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : function (s) {
+                return (/(წამი|წუთი|საათი|წელი)/).test(s) ?
+                    s.replace(/ი$/, 'ში') :
+                    s + 'ში';
+            },
+            past : function (s) {
+                if ((/(წამი|წუთი|საათი|დღე|თვე)/).test(s)) {
+                    return s.replace(/(ი|ე)$/, 'ის წინ');
+                }
+                if ((/წელი/).test(s)) {
+                    return s.replace(/წელი$/, 'წლის წინ');
+                }
+            },
+            s : 'რამდენიმე წამი',
+            ss : '%d წამი',
+            m : 'წუთი',
+            mm : '%d წუთი',
+            h : 'საათი',
+            hh : '%d საათი',
+            d : 'დღე',
+            dd : '%d დღე',
+            M : 'თვე',
+            MM : '%d თვე',
+            y : 'წელი',
+            yy : '%d წელი'
+        },
+        dayOfMonthOrdinalParse: /0|1-ლი|მე-\d{1,2}|\d{1,2}-ე/,
+        ordinal : function (number) {
+            if (number === 0) {
+                return number;
+            }
+            if (number === 1) {
+                return number + '-ლი';
+            }
+            if ((number < 20) || (number <= 100 && (number % 20 === 0)) || (number % 100 === 0)) {
+                return 'მე-' + number;
+            }
+            return number + '-ე';
+        },
+        week : {
+            dow : 1,
+            doy : 7
         }
-        if (number === 1) {
-            return number + '-ლი';
-        }
-        if ((number < 20) || (number <= 100 && (number % 20 === 0)) || (number % 100 === 0)) {
-            return 'მე-' + number;
-        }
-        return number + '-ე';
-    },
-    week : {
-        dow : 1,
-        doy : 7
-    }
-});
+    });
 
-return ka;
+    return ka;
 
 })));
diff --git a/lib/javascripts/moment_locale/kk.js b/lib/javascripts/moment_locale/kk.js
old mode 100644
new mode 100755
index 777a5294de7..db9d7519ee7
--- a/lib/javascripts/moment_locale/kk.js
+++ b/lib/javascripts/moment_locale/kk.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Kazakh [kk]
-//! authors : Nurlan Rakhimzhanov : https://github.com/nurlan
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,78 +8,79 @@
 }(this, (function (moment) { 'use strict';
 
 
-var suffixes = {
-    0: '-ші',
-    1: '-ші',
-    2: '-ші',
-    3: '-ші',
-    4: '-ші',
-    5: '-ші',
-    6: '-шы',
-    7: '-ші',
-    8: '-ші',
-    9: '-шы',
-    10: '-шы',
-    20: '-шы',
-    30: '-шы',
-    40: '-шы',
-    50: '-ші',
-    60: '-шы',
-    70: '-ші',
-    80: '-ші',
-    90: '-шы',
-    100: '-ші'
-};
+    var suffixes = {
+        0: '-ші',
+        1: '-ші',
+        2: '-ші',
+        3: '-ші',
+        4: '-ші',
+        5: '-ші',
+        6: '-шы',
+        7: '-ші',
+        8: '-ші',
+        9: '-шы',
+        10: '-шы',
+        20: '-шы',
+        30: '-шы',
+        40: '-шы',
+        50: '-ші',
+        60: '-шы',
+        70: '-ші',
+        80: '-ші',
+        90: '-шы',
+        100: '-ші'
+    };
 
-var kk = moment.defineLocale('kk', {
-    months : 'қаңтар_ақпан_наурыз_сәуір_мамыр_маусым_шілде_тамыз_қыркүйек_қазан_қараша_желтоқсан'.split('_'),
-    monthsShort : 'қаң_ақп_нау_сәу_мам_мау_шіл_там_қыр_қаз_қар_жел'.split('_'),
-    weekdays : 'жексенбі_дүйсенбі_сейсенбі_сәрсенбі_бейсенбі_жұма_сенбі'.split('_'),
-    weekdaysShort : 'жек_дүй_сей_сәр_бей_жұм_сен'.split('_'),
-    weekdaysMin : 'жк_дй_сй_ср_бй_жм_сн'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd, D MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay : '[Бүгін сағат] LT',
-        nextDay : '[Ертең сағат] LT',
-        nextWeek : 'dddd [сағат] LT',
-        lastDay : '[Кеше сағат] LT',
-        lastWeek : '[Өткен аптаның] dddd [сағат] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : '%s ішінде',
-        past : '%s бұрын',
-        s : 'бірнеше секунд',
-        m : 'бір минут',
-        mm : '%d минут',
-        h : 'бір сағат',
-        hh : '%d сағат',
-        d : 'бір күн',
-        dd : '%d күн',
-        M : 'бір ай',
-        MM : '%d ай',
-        y : 'бір жыл',
-        yy : '%d жыл'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}-(ші|шы)/,
-    ordinal : function (number) {
-        var a = number % 10,
-            b = number >= 100 ? 100 : null;
-        return number + (suffixes[number] || suffixes[a] || suffixes[b]);
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    var kk = moment.defineLocale('kk', {
+        months : 'қаңтар_ақпан_наурыз_сәуір_мамыр_маусым_шілде_тамыз_қыркүйек_қазан_қараша_желтоқсан'.split('_'),
+        monthsShort : 'қаң_ақп_нау_сәу_мам_мау_шіл_там_қыр_қаз_қар_жел'.split('_'),
+        weekdays : 'жексенбі_дүйсенбі_сейсенбі_сәрсенбі_бейсенбі_жұма_сенбі'.split('_'),
+        weekdaysShort : 'жек_дүй_сей_сәр_бей_жұм_сен'.split('_'),
+        weekdaysMin : 'жк_дй_сй_ср_бй_жм_сн'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[Бүгін сағат] LT',
+            nextDay : '[Ертең сағат] LT',
+            nextWeek : 'dddd [сағат] LT',
+            lastDay : '[Кеше сағат] LT',
+            lastWeek : '[Өткен аптаның] dddd [сағат] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s ішінде',
+            past : '%s бұрын',
+            s : 'бірнеше секунд',
+            ss : '%d секунд',
+            m : 'бір минут',
+            mm : '%d минут',
+            h : 'бір сағат',
+            hh : '%d сағат',
+            d : 'бір күн',
+            dd : '%d күн',
+            M : 'бір ай',
+            MM : '%d ай',
+            y : 'бір жыл',
+            yy : '%d жыл'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}-(ші|шы)/,
+        ordinal : function (number) {
+            var a = number % 10,
+                b = number >= 100 ? 100 : null;
+            return number + (suffixes[number] || suffixes[a] || suffixes[b]);
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
 
-return kk;
+    return kk;
 
 })));
diff --git a/lib/javascripts/moment_locale/km.js b/lib/javascripts/moment_locale/km.js
old mode 100644
new mode 100755
index 71482a7b52d..fee36238aba
--- a/lib/javascripts/moment_locale/km.js
+++ b/lib/javascripts/moment_locale/km.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Cambodian [km]
-//! author : Kruy Vanna : https://github.com/kruyvanna
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,49 +8,102 @@
 }(this, (function (moment) { 'use strict';
 
 
-var km = moment.defineLocale('km', {
-    months: 'មករា_កុម្ភៈ_មីនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ'.split('_'),
-    monthsShort: 'មករា_កុម្ភៈ_មីនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ'.split('_'),
-    weekdays: 'អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍'.split('_'),
-    weekdaysShort: 'អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍'.split('_'),
-    weekdaysMin: 'អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍'.split('_'),
-    longDateFormat: {
-        LT: 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L: 'DD/MM/YYYY',
-        LL: 'D MMMM YYYY',
-        LLL: 'D MMMM YYYY HH:mm',
-        LLLL: 'dddd, D MMMM YYYY HH:mm'
-    },
-    calendar: {
-        sameDay: '[ថ្ងៃនេះ ម៉ោង] LT',
-        nextDay: '[ស្អែក ម៉ោង] LT',
-        nextWeek: 'dddd [ម៉ោង] LT',
-        lastDay: '[ម្សិលមិញ ម៉ោង] LT',
-        lastWeek: 'dddd [សប្តាហ៍មុន] [ម៉ោង] LT',
-        sameElse: 'L'
-    },
-    relativeTime: {
-        future: '%sទៀត',
-        past: '%sមុន',
-        s: 'ប៉ុន្មានវិនាទី',
-        m: 'មួយនាទី',
-        mm: '%d នាទី',
-        h: 'មួយម៉ោង',
-        hh: '%d ម៉ោង',
-        d: 'មួយថ្ងៃ',
-        dd: '%d ថ្ងៃ',
-        M: 'មួយខែ',
-        MM: '%d ខែ',
-        y: 'មួយឆ្នាំ',
-        yy: '%d ឆ្នាំ'
-    },
-    week: {
-        dow: 1, // Monday is the first day of the week.
-        doy: 4 // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    var symbolMap = {
+        '1': '១',
+        '2': '២',
+        '3': '៣',
+        '4': '៤',
+        '5': '៥',
+        '6': '៦',
+        '7': '៧',
+        '8': '៨',
+        '9': '៩',
+        '0': '០'
+    }, numberMap = {
+        '១': '1',
+        '២': '2',
+        '៣': '3',
+        '៤': '4',
+        '៥': '5',
+        '៦': '6',
+        '៧': '7',
+        '៨': '8',
+        '៩': '9',
+        '០': '0'
+    };
 
-return km;
+    var km = moment.defineLocale('km', {
+        months: 'មករា_កុម្ភៈ_មីនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ'.split(
+            '_'
+        ),
+        monthsShort: 'មករា_កុម្ភៈ_មីនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ'.split(
+            '_'
+        ),
+        weekdays: 'អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍'.split('_'),
+        weekdaysShort: 'អា_ច_អ_ព_ព្រ_សុ_ស'.split('_'),
+        weekdaysMin: 'អា_ច_អ_ព_ព្រ_សុ_ស'.split('_'),
+        weekdaysParseExact: true,
+        longDateFormat: {
+            LT: 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L: 'DD/MM/YYYY',
+            LL: 'D MMMM YYYY',
+            LLL: 'D MMMM YYYY HH:mm',
+            LLLL: 'dddd, D MMMM YYYY HH:mm'
+        },
+        meridiemParse: /ព្រឹក|ល្ងាច/,
+        isPM: function (input) {
+            return input === 'ល្ងាច';
+        },
+        meridiem: function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'ព្រឹក';
+            } else {
+                return 'ល្ងាច';
+            }
+        },
+        calendar: {
+            sameDay: '[ថ្ងៃនេះ ម៉ោង] LT',
+            nextDay: '[ស្អែក ម៉ោង] LT',
+            nextWeek: 'dddd [ម៉ោង] LT',
+            lastDay: '[ម្សិលមិញ ម៉ោង] LT',
+            lastWeek: 'dddd [សប្តាហ៍មុន] [ម៉ោង] LT',
+            sameElse: 'L'
+        },
+        relativeTime: {
+            future: '%sទៀត',
+            past: '%sមុន',
+            s: 'ប៉ុន្មានវិនាទី',
+            ss: '%d វិនាទី',
+            m: 'មួយនាទី',
+            mm: '%d នាទី',
+            h: 'មួយម៉ោង',
+            hh: '%d ម៉ោង',
+            d: 'មួយថ្ងៃ',
+            dd: '%d ថ្ងៃ',
+            M: 'មួយខែ',
+            MM: '%d ខែ',
+            y: 'មួយឆ្នាំ',
+            yy: '%d ឆ្នាំ'
+        },
+        dayOfMonthOrdinalParse : /ទី\d{1,2}/,
+        ordinal : 'ទី%d',
+        preparse: function (string) {
+            return string.replace(/[១២៣៤៥៦៧៨៩០]/g, function (match) {
+                return numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            });
+        },
+        week: {
+            dow: 1, // Monday is the first day of the week.
+            doy: 4 // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return km;
 
 })));
diff --git a/lib/javascripts/moment_locale/kn.js b/lib/javascripts/moment_locale/kn.js
old mode 100644
new mode 100755
index aeacafa6b2f..85b35cf7e2b
--- a/lib/javascripts/moment_locale/kn.js
+++ b/lib/javascripts/moment_locale/kn.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Kannada [kn]
-//! author : Rajeev Naik : https://github.com/rajeevnaikte
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,117 +8,118 @@
 }(this, (function (moment) { 'use strict';
 
 
-var symbolMap = {
-    '1': '೧',
-    '2': '೨',
-    '3': '೩',
-    '4': '೪',
-    '5': '೫',
-    '6': '೬',
-    '7': '೭',
-    '8': '೮',
-    '9': '೯',
-    '0': '೦'
-};
-var numberMap = {
-    '೧': '1',
-    '೨': '2',
-    '೩': '3',
-    '೪': '4',
-    '೫': '5',
-    '೬': '6',
-    '೭': '7',
-    '೮': '8',
-    '೯': '9',
-    '೦': '0'
-};
+    var symbolMap = {
+        '1': '೧',
+        '2': '೨',
+        '3': '೩',
+        '4': '೪',
+        '5': '೫',
+        '6': '೬',
+        '7': '೭',
+        '8': '೮',
+        '9': '೯',
+        '0': '೦'
+    },
+    numberMap = {
+        '೧': '1',
+        '೨': '2',
+        '೩': '3',
+        '೪': '4',
+        '೫': '5',
+        '೬': '6',
+        '೭': '7',
+        '೮': '8',
+        '೯': '9',
+        '೦': '0'
+    };
 
-var kn = moment.defineLocale('kn', {
-    months : 'ಜನವರಿ_ಫೆಬ್ರವರಿ_ಮಾರ್ಚ್_ಏಪ್ರಿಲ್_ಮೇ_ಜೂನ್_ಜುಲೈ_ಆಗಸ್ಟ್_ಸೆಪ್ಟೆಂಬರ್_ಅಕ್ಟೋಬರ್_ನವೆಂಬರ್_ಡಿಸೆಂಬರ್'.split('_'),
-    monthsShort : 'ಜನ_ಫೆಬ್ರ_ಮಾರ್ಚ್_ಏಪ್ರಿಲ್_ಮೇ_ಜೂನ್_ಜುಲೈ_ಆಗಸ್ಟ್_ಸೆಪ್ಟೆಂಬ_ಅಕ್ಟೋಬ_ನವೆಂಬ_ಡಿಸೆಂಬ'.split('_'),
-    monthsParseExact: true,
-    weekdays : 'ಭಾನುವಾರ_ಸೋಮವಾರ_ಮಂಗಳವಾರ_ಬುಧವಾರ_ಗುರುವಾರ_ಶುಕ್ರವಾರ_ಶನಿವಾರ'.split('_'),
-    weekdaysShort : 'ಭಾನು_ಸೋಮ_ಮಂಗಳ_ಬುಧ_ಗುರು_ಶುಕ್ರ_ಶನಿ'.split('_'),
-    weekdaysMin : 'ಭಾ_ಸೋ_ಮಂ_ಬು_ಗು_ಶು_ಶ'.split('_'),
-    longDateFormat : {
-        LT : 'A h:mm',
-        LTS : 'A h:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY, A h:mm',
-        LLLL : 'dddd, D MMMM YYYY, A h:mm'
-    },
-    calendar : {
-        sameDay : '[ಇಂದು] LT',
-        nextDay : '[ನಾಳೆ] LT',
-        nextWeek : 'dddd, LT',
-        lastDay : '[ನಿನ್ನೆ] LT',
-        lastWeek : '[ಕೊನೆಯ] dddd, LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : '%s ನಂತರ',
-        past : '%s ಹಿಂದೆ',
-        s : 'ಕೆಲವು ಕ್ಷಣಗಳು',
-        m : 'ಒಂದು ನಿಮಿಷ',
-        mm : '%d ನಿಮಿಷ',
-        h : 'ಒಂದು ಗಂಟೆ',
-        hh : '%d ಗಂಟೆ',
-        d : 'ಒಂದು ದಿನ',
-        dd : '%d ದಿನ',
-        M : 'ಒಂದು ತಿಂಗಳು',
-        MM : '%d ತಿಂಗಳು',
-        y : 'ಒಂದು ವರ್ಷ',
-        yy : '%d ವರ್ಷ'
-    },
-    preparse: function (string) {
-        return string.replace(/[೧೨೩೪೫೬೭೮೯೦]/g, function (match) {
-            return numberMap[match];
-        });
-    },
-    postformat: function (string) {
-        return string.replace(/\d/g, function (match) {
-            return symbolMap[match];
-        });
-    },
-    meridiemParse: /ರಾತ್ರಿ|ಬೆಳಿಗ್ಗೆ|ಮಧ್ಯಾಹ್ನ|ಸಂಜೆ/,
-    meridiemHour : function (hour, meridiem) {
-        if (hour === 12) {
-            hour = 0;
+    var kn = moment.defineLocale('kn', {
+        months : 'ಜನವರಿ_ಫೆಬ್ರವರಿ_ಮಾರ್ಚ್_ಏಪ್ರಿಲ್_ಮೇ_ಜೂನ್_ಜುಲೈ_ಆಗಸ್ಟ್_ಸೆಪ್ಟೆಂಬರ್_ಅಕ್ಟೋಬರ್_ನವೆಂಬರ್_ಡಿಸೆಂಬರ್'.split('_'),
+        monthsShort : 'ಜನ_ಫೆಬ್ರ_ಮಾರ್ಚ್_ಏಪ್ರಿಲ್_ಮೇ_ಜೂನ್_ಜುಲೈ_ಆಗಸ್ಟ್_ಸೆಪ್ಟೆಂ_ಅಕ್ಟೋ_ನವೆಂ_ಡಿಸೆಂ'.split('_'),
+        monthsParseExact: true,
+        weekdays : 'ಭಾನುವಾರ_ಸೋಮವಾರ_ಮಂಗಳವಾರ_ಬುಧವಾರ_ಗುರುವಾರ_ಶುಕ್ರವಾರ_ಶನಿವಾರ'.split('_'),
+        weekdaysShort : 'ಭಾನು_ಸೋಮ_ಮಂಗಳ_ಬುಧ_ಗುರು_ಶುಕ್ರ_ಶನಿ'.split('_'),
+        weekdaysMin : 'ಭಾ_ಸೋ_ಮಂ_ಬು_ಗು_ಶು_ಶ'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm',
+            LTS : 'A h:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, A h:mm',
+            LLLL : 'dddd, D MMMM YYYY, A h:mm'
+        },
+        calendar : {
+            sameDay : '[ಇಂದು] LT',
+            nextDay : '[ನಾಳೆ] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[ನಿನ್ನೆ] LT',
+            lastWeek : '[ಕೊನೆಯ] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s ನಂತರ',
+            past : '%s ಹಿಂದೆ',
+            s : 'ಕೆಲವು ಕ್ಷಣಗಳು',
+            ss : '%d ಸೆಕೆಂಡುಗಳು',
+            m : 'ಒಂದು ನಿಮಿಷ',
+            mm : '%d ನಿಮಿಷ',
+            h : 'ಒಂದು ಗಂಟೆ',
+            hh : '%d ಗಂಟೆ',
+            d : 'ಒಂದು ದಿನ',
+            dd : '%d ದಿನ',
+            M : 'ಒಂದು ತಿಂಗಳು',
+            MM : '%d ತಿಂಗಳು',
+            y : 'ಒಂದು ವರ್ಷ',
+            yy : '%d ವರ್ಷ'
+        },
+        preparse: function (string) {
+            return string.replace(/[೧೨೩೪೫೬೭೮೯೦]/g, function (match) {
+                return numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            });
+        },
+        meridiemParse: /ರಾತ್ರಿ|ಬೆಳಿಗ್ಗೆ|ಮಧ್ಯಾಹ್ನ|ಸಂಜೆ/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'ರಾತ್ರಿ') {
+                return hour < 4 ? hour : hour + 12;
+            } else if (meridiem === 'ಬೆಳಿಗ್ಗೆ') {
+                return hour;
+            } else if (meridiem === 'ಮಧ್ಯಾಹ್ನ') {
+                return hour >= 10 ? hour : hour + 12;
+            } else if (meridiem === 'ಸಂಜೆ') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'ರಾತ್ರಿ';
+            } else if (hour < 10) {
+                return 'ಬೆಳಿಗ್ಗೆ';
+            } else if (hour < 17) {
+                return 'ಮಧ್ಯಾಹ್ನ';
+            } else if (hour < 20) {
+                return 'ಸಂಜೆ';
+            } else {
+                return 'ರಾತ್ರಿ';
+            }
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(ನೇ)/,
+        ordinal : function (number) {
+            return number + 'ನೇ';
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 1st is the first week of the year.
         }
-        if (meridiem === 'ರಾತ್ರಿ') {
-            return hour < 4 ? hour : hour + 12;
-        } else if (meridiem === 'ಬೆಳಿಗ್ಗೆ') {
-            return hour;
-        } else if (meridiem === 'ಮಧ್ಯಾಹ್ನ') {
-            return hour >= 10 ? hour : hour + 12;
-        } else if (meridiem === 'ಸಂಜೆ') {
-            return hour + 12;
-        }
-    },
-    meridiem : function (hour, minute, isLower) {
-        if (hour < 4) {
-            return 'ರಾತ್ರಿ';
-        } else if (hour < 10) {
-            return 'ಬೆಳಿಗ್ಗೆ';
-        } else if (hour < 17) {
-            return 'ಮಧ್ಯಾಹ್ನ';
-        } else if (hour < 20) {
-            return 'ಸಂಜೆ';
-        } else {
-            return 'ರಾತ್ರಿ';
-        }
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}(ನೇ)/,
-    ordinal : function (number) {
-        return number + 'ನೇ';
-    },
-    week : {
-        dow : 0, // Sunday is the first day of the week.
-        doy : 6  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    });
 
-return kn;
+    return kn;
 
 })));
diff --git a/lib/javascripts/moment_locale/ko.js b/lib/javascripts/moment_locale/ko.js
old mode 100644
new mode 100755
index 13d1c4d3008..40f1bb5dc51
--- a/lib/javascripts/moment_locale/ko.js
+++ b/lib/javascripts/moment_locale/ko.js
@@ -1,7 +1,4 @@
 //! moment.js locale configuration
-//! locale : Korean [ko]
-//! author : Kyungwook, Park : https://github.com/kyungw00k
-//! author : Jeeeyul Lee <jeeeyul@gmail.com>
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -11,59 +8,73 @@
 }(this, (function (moment) { 'use strict';
 
 
-var ko = moment.defineLocale('ko', {
-    months : '1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월'.split('_'),
-    monthsShort : '1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월'.split('_'),
-    weekdays : '일요일_월요일_화요일_수요일_목요일_금요일_토요일'.split('_'),
-    weekdaysShort : '일_월_화_수_목_금_토'.split('_'),
-    weekdaysMin : '일_월_화_수_목_금_토'.split('_'),
-    longDateFormat : {
-        LT : 'A h:mm',
-        LTS : 'A h:mm:ss',
-        L : 'YYYY.MM.DD',
-        LL : 'YYYY년 MMMM D일',
-        LLL : 'YYYY년 MMMM D일 A h:mm',
-        LLLL : 'YYYY년 MMMM D일 dddd A h:mm',
-        l : 'YYYY.MM.DD',
-        ll : 'YYYY년 MMMM D일',
-        lll : 'YYYY년 MMMM D일 A h:mm',
-        llll : 'YYYY년 MMMM D일 dddd A h:mm'
-    },
-    calendar : {
-        sameDay : '오늘 LT',
-        nextDay : '내일 LT',
-        nextWeek : 'dddd LT',
-        lastDay : '어제 LT',
-        lastWeek : '지난주 dddd LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : '%s 후',
-        past : '%s 전',
-        s : '몇 초',
-        ss : '%d초',
-        m : '1분',
-        mm : '%d분',
-        h : '한 시간',
-        hh : '%d시간',
-        d : '하루',
-        dd : '%d일',
-        M : '한 달',
-        MM : '%d달',
-        y : '일 년',
-        yy : '%d년'
-    },
-    dayOfMonthOrdinalParse : /\d{1,2}일/,
-    ordinal : '%d일',
-    meridiemParse : /오전|오후/,
-    isPM : function (token) {
-        return token === '오후';
-    },
-    meridiem : function (hour, minute, isUpper) {
-        return hour < 12 ? '오전' : '오후';
-    }
-});
+    var ko = moment.defineLocale('ko', {
+        months : '1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월'.split('_'),
+        monthsShort : '1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월'.split('_'),
+        weekdays : '일요일_월요일_화요일_수요일_목요일_금요일_토요일'.split('_'),
+        weekdaysShort : '일_월_화_수_목_금_토'.split('_'),
+        weekdaysMin : '일_월_화_수_목_금_토'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm',
+            LTS : 'A h:mm:ss',
+            L : 'YYYY.MM.DD.',
+            LL : 'YYYY년 MMMM D일',
+            LLL : 'YYYY년 MMMM D일 A h:mm',
+            LLLL : 'YYYY년 MMMM D일 dddd A h:mm',
+            l : 'YYYY.MM.DD.',
+            ll : 'YYYY년 MMMM D일',
+            lll : 'YYYY년 MMMM D일 A h:mm',
+            llll : 'YYYY년 MMMM D일 dddd A h:mm'
+        },
+        calendar : {
+            sameDay : '오늘 LT',
+            nextDay : '내일 LT',
+            nextWeek : 'dddd LT',
+            lastDay : '어제 LT',
+            lastWeek : '지난주 dddd LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s 후',
+            past : '%s 전',
+            s : '몇 초',
+            ss : '%d초',
+            m : '1분',
+            mm : '%d분',
+            h : '한 시간',
+            hh : '%d시간',
+            d : '하루',
+            dd : '%d일',
+            M : '한 달',
+            MM : '%d달',
+            y : '일 년',
+            yy : '%d년'
+        },
+        dayOfMonthOrdinalParse : /\d{1,2}(일|월|주)/,
+        ordinal : function (number, period) {
+            switch (period) {
+                case 'd':
+                case 'D':
+                case 'DDD':
+                    return number + '일';
+                case 'M':
+                    return number + '월';
+                case 'w':
+                case 'W':
+                    return number + '주';
+                default:
+                    return number;
+            }
+        },
+        meridiemParse : /오전|오후/,
+        isPM : function (token) {
+            return token === '오후';
+        },
+        meridiem : function (hour, minute, isUpper) {
+            return hour < 12 ? '오전' : '오후';
+        }
+    });
 
-return ko;
+    return ko;
 
 })));
diff --git a/lib/javascripts/moment_locale/ky.js b/lib/javascripts/moment_locale/ky.js
old mode 100644
new mode 100755
index ae4053a3395..7b0c9f39e10
--- a/lib/javascripts/moment_locale/ky.js
+++ b/lib/javascripts/moment_locale/ky.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Kyrgyz [ky]
-//! author : Chyngyz Arystan uulu : https://github.com/chyngyz
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,79 +8,79 @@
 }(this, (function (moment) { 'use strict';
 
 
+    var suffixes = {
+        0: '-чү',
+        1: '-чи',
+        2: '-чи',
+        3: '-чү',
+        4: '-чү',
+        5: '-чи',
+        6: '-чы',
+        7: '-чи',
+        8: '-чи',
+        9: '-чу',
+        10: '-чу',
+        20: '-чы',
+        30: '-чу',
+        40: '-чы',
+        50: '-чү',
+        60: '-чы',
+        70: '-чи',
+        80: '-чи',
+        90: '-чу',
+        100: '-чү'
+    };
 
-var suffixes = {
-    0: '-чү',
-    1: '-чи',
-    2: '-чи',
-    3: '-чү',
-    4: '-чү',
-    5: '-чи',
-    6: '-чы',
-    7: '-чи',
-    8: '-чи',
-    9: '-чу',
-    10: '-чу',
-    20: '-чы',
-    30: '-чу',
-    40: '-чы',
-    50: '-чү',
-    60: '-чы',
-    70: '-чи',
-    80: '-чи',
-    90: '-чу',
-    100: '-чү'
-};
+    var ky = moment.defineLocale('ky', {
+        months : 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_'),
+        monthsShort : 'янв_фев_март_апр_май_июнь_июль_авг_сен_окт_ноя_дек'.split('_'),
+        weekdays : 'Жекшемби_Дүйшөмбү_Шейшемби_Шаршемби_Бейшемби_Жума_Ишемби'.split('_'),
+        weekdaysShort : 'Жек_Дүй_Шей_Шар_Бей_Жум_Ише'.split('_'),
+        weekdaysMin : 'Жк_Дй_Шй_Шр_Бй_Жм_Иш'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[Бүгүн саат] LT',
+            nextDay : '[Эртең саат] LT',
+            nextWeek : 'dddd [саат] LT',
+            lastDay : '[Кече саат] LT',
+            lastWeek : '[Өткен аптанын] dddd [күнү] [саат] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s ичинде',
+            past : '%s мурун',
+            s : 'бирнече секунд',
+            ss : '%d секунд',
+            m : 'бир мүнөт',
+            mm : '%d мүнөт',
+            h : 'бир саат',
+            hh : '%d саат',
+            d : 'бир күн',
+            dd : '%d күн',
+            M : 'бир ай',
+            MM : '%d ай',
+            y : 'бир жыл',
+            yy : '%d жыл'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}-(чи|чы|чү|чу)/,
+        ordinal : function (number) {
+            var a = number % 10,
+                b = number >= 100 ? 100 : null;
+            return number + (suffixes[number] || suffixes[a] || suffixes[b]);
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
 
-var ky = moment.defineLocale('ky', {
-    months : 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_'),
-    monthsShort : 'янв_фев_март_апр_май_июнь_июль_авг_сен_окт_ноя_дек'.split('_'),
-    weekdays : 'Жекшемби_Дүйшөмбү_Шейшемби_Шаршемби_Бейшемби_Жума_Ишемби'.split('_'),
-    weekdaysShort : 'Жек_Дүй_Шей_Шар_Бей_Жум_Ише'.split('_'),
-    weekdaysMin : 'Жк_Дй_Шй_Шр_Бй_Жм_Иш'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd, D MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay : '[Бүгүн саат] LT',
-        nextDay : '[Эртең саат] LT',
-        nextWeek : 'dddd [саат] LT',
-        lastDay : '[Кече саат] LT',
-        lastWeek : '[Өткен аптанын] dddd [күнү] [саат] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : '%s ичинде',
-        past : '%s мурун',
-        s : 'бирнече секунд',
-        m : 'бир мүнөт',
-        mm : '%d мүнөт',
-        h : 'бир саат',
-        hh : '%d саат',
-        d : 'бир күн',
-        dd : '%d күн',
-        M : 'бир ай',
-        MM : '%d ай',
-        y : 'бир жыл',
-        yy : '%d жыл'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}-(чи|чы|чү|чу)/,
-    ordinal : function (number) {
-        var a = number % 10,
-            b = number >= 100 ? 100 : null;
-        return number + (suffixes[number] || suffixes[a] || suffixes[b]);
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 1st is the first week of the year.
-    }
-});
-
-return ky;
+    return ky;
 
 })));
diff --git a/lib/javascripts/moment_locale/lb.js b/lib/javascripts/moment_locale/lb.js
old mode 100644
new mode 100755
index 56c1803900e..599a6e58b37
--- a/lib/javascripts/moment_locale/lb.js
+++ b/lib/javascripts/moment_locale/lb.js
@@ -1,7 +1,4 @@
 //! moment.js locale configuration
-//! locale : Luxembourgish [lb]
-//! author : mweimerskirch : https://github.com/mweimerskirch
-//! author : David Raison : https://github.com/kwisatz
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -11,127 +8,128 @@
 }(this, (function (moment) { 'use strict';
 
 
-function processRelativeTime(number, withoutSuffix, key, isFuture) {
-    var format = {
-        'm': ['eng Minutt', 'enger Minutt'],
-        'h': ['eng Stonn', 'enger Stonn'],
-        'd': ['een Dag', 'engem Dag'],
-        'M': ['ee Mount', 'engem Mount'],
-        'y': ['ee Joer', 'engem Joer']
-    };
-    return withoutSuffix ? format[key][0] : format[key][1];
-}
-function processFutureTime(string) {
-    var number = string.substr(0, string.indexOf(' '));
-    if (eifelerRegelAppliesToNumber(number)) {
-        return 'a ' + string;
+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var format = {
+            'm': ['eng Minutt', 'enger Minutt'],
+            'h': ['eng Stonn', 'enger Stonn'],
+            'd': ['een Dag', 'engem Dag'],
+            'M': ['ee Mount', 'engem Mount'],
+            'y': ['ee Joer', 'engem Joer']
+        };
+        return withoutSuffix ? format[key][0] : format[key][1];
     }
-    return 'an ' + string;
-}
-function processPastTime(string) {
-    var number = string.substr(0, string.indexOf(' '));
-    if (eifelerRegelAppliesToNumber(number)) {
-        return 'viru ' + string;
+    function processFutureTime(string) {
+        var number = string.substr(0, string.indexOf(' '));
+        if (eifelerRegelAppliesToNumber(number)) {
+            return 'a ' + string;
+        }
+        return 'an ' + string;
     }
-    return 'virun ' + string;
-}
-/**
- * Returns true if the word before the given number loses the '-n' ending.
- * e.g. 'an 10 Deeg' but 'a 5 Deeg'
- *
- * @param number {integer}
- * @returns {boolean}
- */
-function eifelerRegelAppliesToNumber(number) {
-    number = parseInt(number, 10);
-    if (isNaN(number)) {
-        return false;
+    function processPastTime(string) {
+        var number = string.substr(0, string.indexOf(' '));
+        if (eifelerRegelAppliesToNumber(number)) {
+            return 'viru ' + string;
+        }
+        return 'virun ' + string;
     }
-    if (number < 0) {
-        // Negative Number --> always true
-        return true;
-    } else if (number < 10) {
-        // Only 1 digit
-        if (4 <= number && number <= 7) {
+    /**
+     * Returns true if the word before the given number loses the '-n' ending.
+     * e.g. 'an 10 Deeg' but 'a 5 Deeg'
+     *
+     * @param number {integer}
+     * @returns {boolean}
+     */
+    function eifelerRegelAppliesToNumber(number) {
+        number = parseInt(number, 10);
+        if (isNaN(number)) {
+            return false;
+        }
+        if (number < 0) {
+            // Negative Number --> always true
             return true;
-        }
-        return false;
-    } else if (number < 100) {
-        // 2 digits
-        var lastDigit = number % 10, firstDigit = number / 10;
-        if (lastDigit === 0) {
-            return eifelerRegelAppliesToNumber(firstDigit);
-        }
-        return eifelerRegelAppliesToNumber(lastDigit);
-    } else if (number < 10000) {
-        // 3 or 4 digits --> recursively check first digit
-        while (number >= 10) {
-            number = number / 10;
-        }
-        return eifelerRegelAppliesToNumber(number);
-    } else {
-        // Anything larger than 4 digits: recursively check first n-3 digits
-        number = number / 1000;
-        return eifelerRegelAppliesToNumber(number);
-    }
-}
-
-var lb = moment.defineLocale('lb', {
-    months: 'Januar_Februar_Mäerz_Abrëll_Mee_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
-    monthsShort: 'Jan._Febr._Mrz._Abr._Mee_Jun._Jul._Aug._Sept._Okt._Nov._Dez.'.split('_'),
-    monthsParseExact : true,
-    weekdays: 'Sonndeg_Méindeg_Dënschdeg_Mëttwoch_Donneschdeg_Freideg_Samschdeg'.split('_'),
-    weekdaysShort: 'So._Mé._Dë._Më._Do._Fr._Sa.'.split('_'),
-    weekdaysMin: 'So_Mé_Dë_Më_Do_Fr_Sa'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat: {
-        LT: 'H:mm [Auer]',
-        LTS: 'H:mm:ss [Auer]',
-        L: 'DD.MM.YYYY',
-        LL: 'D. MMMM YYYY',
-        LLL: 'D. MMMM YYYY H:mm [Auer]',
-        LLLL: 'dddd, D. MMMM YYYY H:mm [Auer]'
-    },
-    calendar: {
-        sameDay: '[Haut um] LT',
-        sameElse: 'L',
-        nextDay: '[Muer um] LT',
-        nextWeek: 'dddd [um] LT',
-        lastDay: '[Gëschter um] LT',
-        lastWeek: function () {
-            // Different date string for 'Dënschdeg' (Tuesday) and 'Donneschdeg' (Thursday) due to phonological rule
-            switch (this.day()) {
-                case 2:
-                case 4:
-                    return '[Leschten] dddd [um] LT';
-                default:
-                    return '[Leschte] dddd [um] LT';
+        } else if (number < 10) {
+            // Only 1 digit
+            if (4 <= number && number <= 7) {
+                return true;
             }
+            return false;
+        } else if (number < 100) {
+            // 2 digits
+            var lastDigit = number % 10, firstDigit = number / 10;
+            if (lastDigit === 0) {
+                return eifelerRegelAppliesToNumber(firstDigit);
+            }
+            return eifelerRegelAppliesToNumber(lastDigit);
+        } else if (number < 10000) {
+            // 3 or 4 digits --> recursively check first digit
+            while (number >= 10) {
+                number = number / 10;
+            }
+            return eifelerRegelAppliesToNumber(number);
+        } else {
+            // Anything larger than 4 digits: recursively check first n-3 digits
+            number = number / 1000;
+            return eifelerRegelAppliesToNumber(number);
         }
-    },
-    relativeTime : {
-        future : processFutureTime,
-        past : processPastTime,
-        s : 'e puer Sekonnen',
-        m : processRelativeTime,
-        mm : '%d Minutten',
-        h : processRelativeTime,
-        hh : '%d Stonnen',
-        d : processRelativeTime,
-        dd : '%d Deeg',
-        M : processRelativeTime,
-        MM : '%d Méint',
-        y : processRelativeTime,
-        yy : '%d Joer'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal: '%d.',
-    week: {
-        dow: 1, // Monday is the first day of the week.
-        doy: 4  // The week that contains Jan 4th is the first week of the year.
     }
-});
 
-return lb;
+    var lb = moment.defineLocale('lb', {
+        months: 'Januar_Februar_Mäerz_Abrëll_Mee_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
+        monthsShort: 'Jan._Febr._Mrz._Abr._Mee_Jun._Jul._Aug._Sept._Okt._Nov._Dez.'.split('_'),
+        monthsParseExact : true,
+        weekdays: 'Sonndeg_Méindeg_Dënschdeg_Mëttwoch_Donneschdeg_Freideg_Samschdeg'.split('_'),
+        weekdaysShort: 'So._Mé._Dë._Më._Do._Fr._Sa.'.split('_'),
+        weekdaysMin: 'So_Mé_Dë_Më_Do_Fr_Sa'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat: {
+            LT: 'H:mm [Auer]',
+            LTS: 'H:mm:ss [Auer]',
+            L: 'DD.MM.YYYY',
+            LL: 'D. MMMM YYYY',
+            LLL: 'D. MMMM YYYY H:mm [Auer]',
+            LLLL: 'dddd, D. MMMM YYYY H:mm [Auer]'
+        },
+        calendar: {
+            sameDay: '[Haut um] LT',
+            sameElse: 'L',
+            nextDay: '[Muer um] LT',
+            nextWeek: 'dddd [um] LT',
+            lastDay: '[Gëschter um] LT',
+            lastWeek: function () {
+                // Different date string for 'Dënschdeg' (Tuesday) and 'Donneschdeg' (Thursday) due to phonological rule
+                switch (this.day()) {
+                    case 2:
+                    case 4:
+                        return '[Leschten] dddd [um] LT';
+                    default:
+                        return '[Leschte] dddd [um] LT';
+                }
+            }
+        },
+        relativeTime : {
+            future : processFutureTime,
+            past : processPastTime,
+            s : 'e puer Sekonnen',
+            ss : '%d Sekonnen',
+            m : processRelativeTime,
+            mm : '%d Minutten',
+            h : processRelativeTime,
+            hh : '%d Stonnen',
+            d : processRelativeTime,
+            dd : '%d Deeg',
+            M : processRelativeTime,
+            MM : '%d Méint',
+            y : processRelativeTime,
+            yy : '%d Joer'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal: '%d.',
+        week: {
+            dow: 1, // Monday is the first day of the week.
+            doy: 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return lb;
 
 })));
diff --git a/lib/javascripts/moment_locale/lo.js b/lib/javascripts/moment_locale/lo.js
old mode 100644
new mode 100755
index 8e5cdbddf28..7cd6cfc8d2f
--- a/lib/javascripts/moment_locale/lo.js
+++ b/lib/javascripts/moment_locale/lo.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Lao [lo]
-//! author : Ryan Hart : https://github.com/ryanhart2
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,61 +8,62 @@
 }(this, (function (moment) { 'use strict';
 
 
-var lo = moment.defineLocale('lo', {
-    months : 'ມັງກອນ_ກຸມພາ_ມີນາ_ເມສາ_ພຶດສະພາ_ມິຖຸນາ_ກໍລະກົດ_ສິງຫາ_ກັນຍາ_ຕຸລາ_ພະຈິກ_ທັນວາ'.split('_'),
-    monthsShort : 'ມັງກອນ_ກຸມພາ_ມີນາ_ເມສາ_ພຶດສະພາ_ມິຖຸນາ_ກໍລະກົດ_ສິງຫາ_ກັນຍາ_ຕຸລາ_ພະຈິກ_ທັນວາ'.split('_'),
-    weekdays : 'ອາທິດ_ຈັນ_ອັງຄານ_ພຸດ_ພະຫັດ_ສຸກ_ເສົາ'.split('_'),
-    weekdaysShort : 'ທິດ_ຈັນ_ອັງຄານ_ພຸດ_ພະຫັດ_ສຸກ_ເສົາ'.split('_'),
-    weekdaysMin : 'ທ_ຈ_ອຄ_ພ_ພຫ_ສກ_ສ'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'ວັນdddd D MMMM YYYY HH:mm'
-    },
-    meridiemParse: /ຕອນເຊົ້າ|ຕອນແລງ/,
-    isPM: function (input) {
-        return input === 'ຕອນແລງ';
-    },
-    meridiem : function (hour, minute, isLower) {
-        if (hour < 12) {
-            return 'ຕອນເຊົ້າ';
-        } else {
-            return 'ຕອນແລງ';
+    var lo = moment.defineLocale('lo', {
+        months : 'ມັງກອນ_ກຸມພາ_ມີນາ_ເມສາ_ພຶດສະພາ_ມິຖຸນາ_ກໍລະກົດ_ສິງຫາ_ກັນຍາ_ຕຸລາ_ພະຈິກ_ທັນວາ'.split('_'),
+        monthsShort : 'ມັງກອນ_ກຸມພາ_ມີນາ_ເມສາ_ພຶດສະພາ_ມິຖຸນາ_ກໍລະກົດ_ສິງຫາ_ກັນຍາ_ຕຸລາ_ພະຈິກ_ທັນວາ'.split('_'),
+        weekdays : 'ອາທິດ_ຈັນ_ອັງຄານ_ພຸດ_ພະຫັດ_ສຸກ_ເສົາ'.split('_'),
+        weekdaysShort : 'ທິດ_ຈັນ_ອັງຄານ_ພຸດ_ພະຫັດ_ສຸກ_ເສົາ'.split('_'),
+        weekdaysMin : 'ທ_ຈ_ອຄ_ພ_ພຫ_ສກ_ສ'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'ວັນdddd D MMMM YYYY HH:mm'
+        },
+        meridiemParse: /ຕອນເຊົ້າ|ຕອນແລງ/,
+        isPM: function (input) {
+            return input === 'ຕອນແລງ';
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'ຕອນເຊົ້າ';
+            } else {
+                return 'ຕອນແລງ';
+            }
+        },
+        calendar : {
+            sameDay : '[ມື້ນີ້ເວລາ] LT',
+            nextDay : '[ມື້ອື່ນເວລາ] LT',
+            nextWeek : '[ວັນ]dddd[ໜ້າເວລາ] LT',
+            lastDay : '[ມື້ວານນີ້ເວລາ] LT',
+            lastWeek : '[ວັນ]dddd[ແລ້ວນີ້ເວລາ] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'ອີກ %s',
+            past : '%sຜ່ານມາ',
+            s : 'ບໍ່ເທົ່າໃດວິນາທີ',
+            ss : '%d ວິນາທີ' ,
+            m : '1 ນາທີ',
+            mm : '%d ນາທີ',
+            h : '1 ຊົ່ວໂມງ',
+            hh : '%d ຊົ່ວໂມງ',
+            d : '1 ມື້',
+            dd : '%d ມື້',
+            M : '1 ເດືອນ',
+            MM : '%d ເດືອນ',
+            y : '1 ປີ',
+            yy : '%d ປີ'
+        },
+        dayOfMonthOrdinalParse: /(ທີ່)\d{1,2}/,
+        ordinal : function (number) {
+            return 'ທີ່' + number;
         }
-    },
-    calendar : {
-        sameDay : '[ມື້ນີ້ເວລາ] LT',
-        nextDay : '[ມື້ອື່ນເວລາ] LT',
-        nextWeek : '[ວັນ]dddd[ໜ້າເວລາ] LT',
-        lastDay : '[ມື້ວານນີ້ເວລາ] LT',
-        lastWeek : '[ວັນ]dddd[ແລ້ວນີ້ເວລາ] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'ອີກ %s',
-        past : '%sຜ່ານມາ',
-        s : 'ບໍ່ເທົ່າໃດວິນາທີ',
-        m : '1 ນາທີ',
-        mm : '%d ນາທີ',
-        h : '1 ຊົ່ວໂມງ',
-        hh : '%d ຊົ່ວໂມງ',
-        d : '1 ມື້',
-        dd : '%d ມື້',
-        M : '1 ເດືອນ',
-        MM : '%d ເດືອນ',
-        y : '1 ປີ',
-        yy : '%d ປີ'
-    },
-    dayOfMonthOrdinalParse: /(ທີ່)\d{1,2}/,
-    ordinal : function (number) {
-        return 'ທີ່' + number;
-    }
-});
+    });
 
-return lo;
+    return lo;
 
 })));
diff --git a/lib/javascripts/moment_locale/lt.js b/lib/javascripts/moment_locale/lt.js
old mode 100644
new mode 100755
index d2fb7603302..bc7d7e7a0a3
--- a/lib/javascripts/moment_locale/lt.js
+++ b/lib/javascripts/moment_locale/lt.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Lithuanian [lt]
-//! author : Mindaugas Mozūras : https://github.com/mmozuras
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,108 +8,110 @@
 }(this, (function (moment) { 'use strict';
 
 
-var units = {
-    'm' : 'minutė_minutės_minutę',
-    'mm': 'minutės_minučių_minutes',
-    'h' : 'valanda_valandos_valandą',
-    'hh': 'valandos_valandų_valandas',
-    'd' : 'diena_dienos_dieną',
-    'dd': 'dienos_dienų_dienas',
-    'M' : 'mėnuo_mėnesio_mėnesį',
-    'MM': 'mėnesiai_mėnesių_mėnesius',
-    'y' : 'metai_metų_metus',
-    'yy': 'metai_metų_metus'
-};
-function translateSeconds(number, withoutSuffix, key, isFuture) {
-    if (withoutSuffix) {
-        return 'kelios sekundės';
-    } else {
-        return isFuture ? 'kelių sekundžių' : 'kelias sekundes';
-    }
-}
-function translateSingular(number, withoutSuffix, key, isFuture) {
-    return withoutSuffix ? forms(key)[0] : (isFuture ? forms(key)[1] : forms(key)[2]);
-}
-function special(number) {
-    return number % 10 === 0 || (number > 10 && number < 20);
-}
-function forms(key) {
-    return units[key].split('_');
-}
-function translate(number, withoutSuffix, key, isFuture) {
-    var result = number + ' ';
-    if (number === 1) {
-        return result + translateSingular(number, withoutSuffix, key[0], isFuture);
-    } else if (withoutSuffix) {
-        return result + (special(number) ? forms(key)[1] : forms(key)[0]);
-    } else {
-        if (isFuture) {
-            return result + forms(key)[1];
+    var units = {
+        'ss' : 'sekundė_sekundžių_sekundes',
+        'm' : 'minutė_minutės_minutę',
+        'mm': 'minutės_minučių_minutes',
+        'h' : 'valanda_valandos_valandą',
+        'hh': 'valandos_valandų_valandas',
+        'd' : 'diena_dienos_dieną',
+        'dd': 'dienos_dienų_dienas',
+        'M' : 'mėnuo_mėnesio_mėnesį',
+        'MM': 'mėnesiai_mėnesių_mėnesius',
+        'y' : 'metai_metų_metus',
+        'yy': 'metai_metų_metus'
+    };
+    function translateSeconds(number, withoutSuffix, key, isFuture) {
+        if (withoutSuffix) {
+            return 'kelios sekundės';
         } else {
-            return result + (special(number) ? forms(key)[1] : forms(key)[2]);
+            return isFuture ? 'kelių sekundžių' : 'kelias sekundes';
         }
     }
-}
-var lt = moment.defineLocale('lt', {
-    months : {
-        format: 'sausio_vasario_kovo_balandžio_gegužės_birželio_liepos_rugpjūčio_rugsėjo_spalio_lapkričio_gruodžio'.split('_'),
-        standalone: 'sausis_vasaris_kovas_balandis_gegužė_birželis_liepa_rugpjūtis_rugsėjis_spalis_lapkritis_gruodis'.split('_'),
-        isFormat: /D[oD]?(\[[^\[\]]*\]|\s)+MMMM?|MMMM?(\[[^\[\]]*\]|\s)+D[oD]?/
-    },
-    monthsShort : 'sau_vas_kov_bal_geg_bir_lie_rgp_rgs_spa_lap_grd'.split('_'),
-    weekdays : {
-        format: 'sekmadienį_pirmadienį_antradienį_trečiadienį_ketvirtadienį_penktadienį_šeštadienį'.split('_'),
-        standalone: 'sekmadienis_pirmadienis_antradienis_trečiadienis_ketvirtadienis_penktadienis_šeštadienis'.split('_'),
-        isFormat: /dddd HH:mm/
-    },
-    weekdaysShort : 'Sek_Pir_Ant_Tre_Ket_Pen_Šeš'.split('_'),
-    weekdaysMin : 'S_P_A_T_K_Pn_Š'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'YYYY-MM-DD',
-        LL : 'YYYY [m.] MMMM D [d.]',
-        LLL : 'YYYY [m.] MMMM D [d.], HH:mm [val.]',
-        LLLL : 'YYYY [m.] MMMM D [d.], dddd, HH:mm [val.]',
-        l : 'YYYY-MM-DD',
-        ll : 'YYYY [m.] MMMM D [d.]',
-        lll : 'YYYY [m.] MMMM D [d.], HH:mm [val.]',
-        llll : 'YYYY [m.] MMMM D [d.], ddd, HH:mm [val.]'
-    },
-    calendar : {
-        sameDay : '[Šiandien] LT',
-        nextDay : '[Rytoj] LT',
-        nextWeek : 'dddd LT',
-        lastDay : '[Vakar] LT',
-        lastWeek : '[Praėjusį] dddd LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'po %s',
-        past : 'prieš %s',
-        s : translateSeconds,
-        m : translateSingular,
-        mm : translate,
-        h : translateSingular,
-        hh : translate,
-        d : translateSingular,
-        dd : translate,
-        M : translateSingular,
-        MM : translate,
-        y : translateSingular,
-        yy : translate
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}-oji/,
-    ordinal : function (number) {
-        return number + '-oji';
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    function translateSingular(number, withoutSuffix, key, isFuture) {
+        return withoutSuffix ? forms(key)[0] : (isFuture ? forms(key)[1] : forms(key)[2]);
     }
-});
+    function special(number) {
+        return number % 10 === 0 || (number > 10 && number < 20);
+    }
+    function forms(key) {
+        return units[key].split('_');
+    }
+    function translate(number, withoutSuffix, key, isFuture) {
+        var result = number + ' ';
+        if (number === 1) {
+            return result + translateSingular(number, withoutSuffix, key[0], isFuture);
+        } else if (withoutSuffix) {
+            return result + (special(number) ? forms(key)[1] : forms(key)[0]);
+        } else {
+            if (isFuture) {
+                return result + forms(key)[1];
+            } else {
+                return result + (special(number) ? forms(key)[1] : forms(key)[2]);
+            }
+        }
+    }
+    var lt = moment.defineLocale('lt', {
+        months : {
+            format: 'sausio_vasario_kovo_balandžio_gegužės_birželio_liepos_rugpjūčio_rugsėjo_spalio_lapkričio_gruodžio'.split('_'),
+            standalone: 'sausis_vasaris_kovas_balandis_gegužė_birželis_liepa_rugpjūtis_rugsėjis_spalis_lapkritis_gruodis'.split('_'),
+            isFormat: /D[oD]?(\[[^\[\]]*\]|\s)+MMMM?|MMMM?(\[[^\[\]]*\]|\s)+D[oD]?/
+        },
+        monthsShort : 'sau_vas_kov_bal_geg_bir_lie_rgp_rgs_spa_lap_grd'.split('_'),
+        weekdays : {
+            format: 'sekmadienį_pirmadienį_antradienį_trečiadienį_ketvirtadienį_penktadienį_šeštadienį'.split('_'),
+            standalone: 'sekmadienis_pirmadienis_antradienis_trečiadienis_ketvirtadienis_penktadienis_šeštadienis'.split('_'),
+            isFormat: /dddd HH:mm/
+        },
+        weekdaysShort : 'Sek_Pir_Ant_Tre_Ket_Pen_Šeš'.split('_'),
+        weekdaysMin : 'S_P_A_T_K_Pn_Š'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'YYYY-MM-DD',
+            LL : 'YYYY [m.] MMMM D [d.]',
+            LLL : 'YYYY [m.] MMMM D [d.], HH:mm [val.]',
+            LLLL : 'YYYY [m.] MMMM D [d.], dddd, HH:mm [val.]',
+            l : 'YYYY-MM-DD',
+            ll : 'YYYY [m.] MMMM D [d.]',
+            lll : 'YYYY [m.] MMMM D [d.], HH:mm [val.]',
+            llll : 'YYYY [m.] MMMM D [d.], ddd, HH:mm [val.]'
+        },
+        calendar : {
+            sameDay : '[Šiandien] LT',
+            nextDay : '[Rytoj] LT',
+            nextWeek : 'dddd LT',
+            lastDay : '[Vakar] LT',
+            lastWeek : '[Praėjusį] dddd LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'po %s',
+            past : 'prieš %s',
+            s : translateSeconds,
+            ss : translate,
+            m : translateSingular,
+            mm : translate,
+            h : translateSingular,
+            hh : translate,
+            d : translateSingular,
+            dd : translate,
+            M : translateSingular,
+            MM : translate,
+            y : translateSingular,
+            yy : translate
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}-oji/,
+        ordinal : function (number) {
+            return number + '-oji';
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-return lt;
+    return lt;
 
 })));
diff --git a/lib/javascripts/moment_locale/lv.js b/lib/javascripts/moment_locale/lv.js
old mode 100644
new mode 100755
index e2d988791a6..b5b8ea84304
--- a/lib/javascripts/moment_locale/lv.js
+++ b/lib/javascripts/moment_locale/lv.js
@@ -1,7 +1,4 @@
 //! moment.js locale configuration
-//! locale : Latvian [lv]
-//! author : Kristaps Karlsons : https://github.com/skakri
-//! author : Jānis Elmeris : https://github.com/JanisE
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -11,87 +8,89 @@
 }(this, (function (moment) { 'use strict';
 
 
-var units = {
-    'm': 'minūtes_minūtēm_minūte_minūtes'.split('_'),
-    'mm': 'minūtes_minūtēm_minūte_minūtes'.split('_'),
-    'h': 'stundas_stundām_stunda_stundas'.split('_'),
-    'hh': 'stundas_stundām_stunda_stundas'.split('_'),
-    'd': 'dienas_dienām_diena_dienas'.split('_'),
-    'dd': 'dienas_dienām_diena_dienas'.split('_'),
-    'M': 'mēneša_mēnešiem_mēnesis_mēneši'.split('_'),
-    'MM': 'mēneša_mēnešiem_mēnesis_mēneši'.split('_'),
-    'y': 'gada_gadiem_gads_gadi'.split('_'),
-    'yy': 'gada_gadiem_gads_gadi'.split('_')
-};
-/**
- * @param withoutSuffix boolean true = a length of time; false = before/after a period of time.
- */
-function format(forms, number, withoutSuffix) {
-    if (withoutSuffix) {
-        // E.g. "21 minūte", "3 minūtes".
-        return number % 10 === 1 && number % 100 !== 11 ? forms[2] : forms[3];
-    } else {
-        // E.g. "21 minūtes" as in "pēc 21 minūtes".
-        // E.g. "3 minūtēm" as in "pēc 3 minūtēm".
-        return number % 10 === 1 && number % 100 !== 11 ? forms[0] : forms[1];
+    var units = {
+        'ss': 'sekundes_sekundēm_sekunde_sekundes'.split('_'),
+        'm': 'minūtes_minūtēm_minūte_minūtes'.split('_'),
+        'mm': 'minūtes_minūtēm_minūte_minūtes'.split('_'),
+        'h': 'stundas_stundām_stunda_stundas'.split('_'),
+        'hh': 'stundas_stundām_stunda_stundas'.split('_'),
+        'd': 'dienas_dienām_diena_dienas'.split('_'),
+        'dd': 'dienas_dienām_diena_dienas'.split('_'),
+        'M': 'mēneša_mēnešiem_mēnesis_mēneši'.split('_'),
+        'MM': 'mēneša_mēnešiem_mēnesis_mēneši'.split('_'),
+        'y': 'gada_gadiem_gads_gadi'.split('_'),
+        'yy': 'gada_gadiem_gads_gadi'.split('_')
+    };
+    /**
+     * @param withoutSuffix boolean true = a length of time; false = before/after a period of time.
+     */
+    function format(forms, number, withoutSuffix) {
+        if (withoutSuffix) {
+            // E.g. "21 minūte", "3 minūtes".
+            return number % 10 === 1 && number % 100 !== 11 ? forms[2] : forms[3];
+        } else {
+            // E.g. "21 minūtes" as in "pēc 21 minūtes".
+            // E.g. "3 minūtēm" as in "pēc 3 minūtēm".
+            return number % 10 === 1 && number % 100 !== 11 ? forms[0] : forms[1];
+        }
     }
-}
-function relativeTimeWithPlural(number, withoutSuffix, key) {
-    return number + ' ' + format(units[key], number, withoutSuffix);
-}
-function relativeTimeWithSingular(number, withoutSuffix, key) {
-    return format(units[key], number, withoutSuffix);
-}
-function relativeSeconds(number, withoutSuffix) {
-    return withoutSuffix ? 'dažas sekundes' : 'dažām sekundēm';
-}
-
-var lv = moment.defineLocale('lv', {
-    months : 'janvāris_februāris_marts_aprīlis_maijs_jūnijs_jūlijs_augusts_septembris_oktobris_novembris_decembris'.split('_'),
-    monthsShort : 'jan_feb_mar_apr_mai_jūn_jūl_aug_sep_okt_nov_dec'.split('_'),
-    weekdays : 'svētdiena_pirmdiena_otrdiena_trešdiena_ceturtdiena_piektdiena_sestdiena'.split('_'),
-    weekdaysShort : 'Sv_P_O_T_C_Pk_S'.split('_'),
-    weekdaysMin : 'Sv_P_O_T_C_Pk_S'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD.MM.YYYY.',
-        LL : 'YYYY. [gada] D. MMMM',
-        LLL : 'YYYY. [gada] D. MMMM, HH:mm',
-        LLLL : 'YYYY. [gada] D. MMMM, dddd, HH:mm'
-    },
-    calendar : {
-        sameDay : '[Šodien pulksten] LT',
-        nextDay : '[Rīt pulksten] LT',
-        nextWeek : 'dddd [pulksten] LT',
-        lastDay : '[Vakar pulksten] LT',
-        lastWeek : '[Pagājušā] dddd [pulksten] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'pēc %s',
-        past : 'pirms %s',
-        s : relativeSeconds,
-        m : relativeTimeWithSingular,
-        mm : relativeTimeWithPlural,
-        h : relativeTimeWithSingular,
-        hh : relativeTimeWithPlural,
-        d : relativeTimeWithSingular,
-        dd : relativeTimeWithPlural,
-        M : relativeTimeWithSingular,
-        MM : relativeTimeWithPlural,
-        y : relativeTimeWithSingular,
-        yy : relativeTimeWithPlural
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    function relativeTimeWithPlural(number, withoutSuffix, key) {
+        return number + ' ' + format(units[key], number, withoutSuffix);
+    }
+    function relativeTimeWithSingular(number, withoutSuffix, key) {
+        return format(units[key], number, withoutSuffix);
+    }
+    function relativeSeconds(number, withoutSuffix) {
+        return withoutSuffix ? 'dažas sekundes' : 'dažām sekundēm';
     }
-});
 
-return lv;
+    var lv = moment.defineLocale('lv', {
+        months : 'janvāris_februāris_marts_aprīlis_maijs_jūnijs_jūlijs_augusts_septembris_oktobris_novembris_decembris'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_mai_jūn_jūl_aug_sep_okt_nov_dec'.split('_'),
+        weekdays : 'svētdiena_pirmdiena_otrdiena_trešdiena_ceturtdiena_piektdiena_sestdiena'.split('_'),
+        weekdaysShort : 'Sv_P_O_T_C_Pk_S'.split('_'),
+        weekdaysMin : 'Sv_P_O_T_C_Pk_S'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY.',
+            LL : 'YYYY. [gada] D. MMMM',
+            LLL : 'YYYY. [gada] D. MMMM, HH:mm',
+            LLLL : 'YYYY. [gada] D. MMMM, dddd, HH:mm'
+        },
+        calendar : {
+            sameDay : '[Šodien pulksten] LT',
+            nextDay : '[Rīt pulksten] LT',
+            nextWeek : 'dddd [pulksten] LT',
+            lastDay : '[Vakar pulksten] LT',
+            lastWeek : '[Pagājušā] dddd [pulksten] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'pēc %s',
+            past : 'pirms %s',
+            s : relativeSeconds,
+            ss : relativeTimeWithPlural,
+            m : relativeTimeWithSingular,
+            mm : relativeTimeWithPlural,
+            h : relativeTimeWithSingular,
+            hh : relativeTimeWithPlural,
+            d : relativeTimeWithSingular,
+            dd : relativeTimeWithPlural,
+            M : relativeTimeWithSingular,
+            MM : relativeTimeWithPlural,
+            y : relativeTimeWithSingular,
+            yy : relativeTimeWithPlural
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return lv;
 
 })));
diff --git a/lib/javascripts/moment_locale/me.js b/lib/javascripts/moment_locale/me.js
old mode 100644
new mode 100755
index 07ed6ca2a59..ee7bd3969c3
--- a/lib/javascripts/moment_locale/me.js
+++ b/lib/javascripts/moment_locale/me.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Montenegrin [me]
-//! author : Miodrag Nikač <miodrag@restartit.me> : https://github.com/miodragnikac
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,102 +8,104 @@
 }(this, (function (moment) { 'use strict';
 
 
-var translator = {
-    words: { //Different grammatical cases
-        m: ['jedan minut', 'jednog minuta'],
-        mm: ['minut', 'minuta', 'minuta'],
-        h: ['jedan sat', 'jednog sata'],
-        hh: ['sat', 'sata', 'sati'],
-        dd: ['dan', 'dana', 'dana'],
-        MM: ['mjesec', 'mjeseca', 'mjeseci'],
-        yy: ['godina', 'godine', 'godina']
-    },
-    correctGrammaticalCase: function (number, wordKey) {
-        return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
-    },
-    translate: function (number, withoutSuffix, key) {
-        var wordKey = translator.words[key];
-        if (key.length === 1) {
-            return withoutSuffix ? wordKey[0] : wordKey[1];
-        } else {
-            return number + ' ' + translator.correctGrammaticalCase(number, wordKey);
-        }
-    }
-};
-
-var me = moment.defineLocale('me', {
-    months: 'januar_februar_mart_april_maj_jun_jul_avgust_septembar_oktobar_novembar_decembar'.split('_'),
-    monthsShort: 'jan._feb._mar._apr._maj_jun_jul_avg._sep._okt._nov._dec.'.split('_'),
-    monthsParseExact : true,
-    weekdays: 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'),
-    weekdaysShort: 'ned._pon._uto._sri._čet._pet._sub.'.split('_'),
-    weekdaysMin: 'ne_po_ut_sr_če_pe_su'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat: {
-        LT: 'H:mm',
-        LTS : 'H:mm:ss',
-        L: 'DD.MM.YYYY',
-        LL: 'D. MMMM YYYY',
-        LLL: 'D. MMMM YYYY H:mm',
-        LLLL: 'dddd, D. MMMM YYYY H:mm'
-    },
-    calendar: {
-        sameDay: '[danas u] LT',
-        nextDay: '[sjutra u] LT',
-
-        nextWeek: function () {
-            switch (this.day()) {
-                case 0:
-                    return '[u] [nedjelju] [u] LT';
-                case 3:
-                    return '[u] [srijedu] [u] LT';
-                case 6:
-                    return '[u] [subotu] [u] LT';
-                case 1:
-                case 2:
-                case 4:
-                case 5:
-                    return '[u] dddd [u] LT';
+    var translator = {
+        words: { //Different grammatical cases
+            ss: ['sekund', 'sekunda', 'sekundi'],
+            m: ['jedan minut', 'jednog minuta'],
+            mm: ['minut', 'minuta', 'minuta'],
+            h: ['jedan sat', 'jednog sata'],
+            hh: ['sat', 'sata', 'sati'],
+            dd: ['dan', 'dana', 'dana'],
+            MM: ['mjesec', 'mjeseca', 'mjeseci'],
+            yy: ['godina', 'godine', 'godina']
+        },
+        correctGrammaticalCase: function (number, wordKey) {
+            return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
+        },
+        translate: function (number, withoutSuffix, key) {
+            var wordKey = translator.words[key];
+            if (key.length === 1) {
+                return withoutSuffix ? wordKey[0] : wordKey[1];
+            } else {
+                return number + ' ' + translator.correctGrammaticalCase(number, wordKey);
             }
-        },
-        lastDay  : '[juče u] LT',
-        lastWeek : function () {
-            var lastWeekDays = [
-                '[prošle] [nedjelje] [u] LT',
-                '[prošlog] [ponedjeljka] [u] LT',
-                '[prošlog] [utorka] [u] LT',
-                '[prošle] [srijede] [u] LT',
-                '[prošlog] [četvrtka] [u] LT',
-                '[prošlog] [petka] [u] LT',
-                '[prošle] [subote] [u] LT'
-            ];
-            return lastWeekDays[this.day()];
-        },
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'za %s',
-        past   : 'prije %s',
-        s      : 'nekoliko sekundi',
-        m      : translator.translate,
-        mm     : translator.translate,
-        h      : translator.translate,
-        hh     : translator.translate,
-        d      : 'dan',
-        dd     : translator.translate,
-        M      : 'mjesec',
-        MM     : translator.translate,
-        y      : 'godinu',
-        yy     : translator.translate
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+        }
+    };
 
-return me;
+    var me = moment.defineLocale('me', {
+        months: 'januar_februar_mart_april_maj_jun_jul_avgust_septembar_oktobar_novembar_decembar'.split('_'),
+        monthsShort: 'jan._feb._mar._apr._maj_jun_jul_avg._sep._okt._nov._dec.'.split('_'),
+        monthsParseExact : true,
+        weekdays: 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'),
+        weekdaysShort: 'ned._pon._uto._sri._čet._pet._sub.'.split('_'),
+        weekdaysMin: 'ne_po_ut_sr_če_pe_su'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat: {
+            LT: 'H:mm',
+            LTS : 'H:mm:ss',
+            L: 'DD.MM.YYYY',
+            LL: 'D. MMMM YYYY',
+            LLL: 'D. MMMM YYYY H:mm',
+            LLLL: 'dddd, D. MMMM YYYY H:mm'
+        },
+        calendar: {
+            sameDay: '[danas u] LT',
+            nextDay: '[sjutra u] LT',
+
+            nextWeek: function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[u] [nedjelju] [u] LT';
+                    case 3:
+                        return '[u] [srijedu] [u] LT';
+                    case 6:
+                        return '[u] [subotu] [u] LT';
+                    case 1:
+                    case 2:
+                    case 4:
+                    case 5:
+                        return '[u] dddd [u] LT';
+                }
+            },
+            lastDay  : '[juče u] LT',
+            lastWeek : function () {
+                var lastWeekDays = [
+                    '[prošle] [nedjelje] [u] LT',
+                    '[prošlog] [ponedjeljka] [u] LT',
+                    '[prošlog] [utorka] [u] LT',
+                    '[prošle] [srijede] [u] LT',
+                    '[prošlog] [četvrtka] [u] LT',
+                    '[prošlog] [petka] [u] LT',
+                    '[prošle] [subote] [u] LT'
+                ];
+                return lastWeekDays[this.day()];
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past   : 'prije %s',
+            s      : 'nekoliko sekundi',
+            ss     : translator.translate,
+            m      : translator.translate,
+            mm     : translator.translate,
+            h      : translator.translate,
+            hh     : translator.translate,
+            d      : 'dan',
+            dd     : translator.translate,
+            M      : 'mjesec',
+            MM     : translator.translate,
+            y      : 'godinu',
+            yy     : translator.translate
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return me;
 
 })));
diff --git a/lib/javascripts/moment_locale/mi.js b/lib/javascripts/moment_locale/mi.js
old mode 100644
new mode 100755
index c5cce374b73..29f1c7a3830
--- a/lib/javascripts/moment_locale/mi.js
+++ b/lib/javascripts/moment_locale/mi.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Maori [mi]
-//! author : John Corrigan <robbiecloset@gmail.com> : https://github.com/johnideal
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,55 +8,56 @@
 }(this, (function (moment) { 'use strict';
 
 
-var mi = moment.defineLocale('mi', {
-    months: 'Kohi-tāte_Hui-tanguru_Poutū-te-rangi_Paenga-whāwhā_Haratua_Pipiri_Hōngoingoi_Here-turi-kōkā_Mahuru_Whiringa-ā-nuku_Whiringa-ā-rangi_Hakihea'.split('_'),
-    monthsShort: 'Kohi_Hui_Pou_Pae_Hara_Pipi_Hōngoi_Here_Mahu_Whi-nu_Whi-ra_Haki'.split('_'),
-    monthsRegex: /(?:['a-z\u0101\u014D\u016B]+\-?){1,3}/i,
-    monthsStrictRegex: /(?:['a-z\u0101\u014D\u016B]+\-?){1,3}/i,
-    monthsShortRegex: /(?:['a-z\u0101\u014D\u016B]+\-?){1,3}/i,
-    monthsShortStrictRegex: /(?:['a-z\u0101\u014D\u016B]+\-?){1,2}/i,
-    weekdays: 'Rātapu_Mane_Tūrei_Wenerei_Tāite_Paraire_Hātarei'.split('_'),
-    weekdaysShort: 'Ta_Ma_Tū_We_Tāi_Pa_Hā'.split('_'),
-    weekdaysMin: 'Ta_Ma_Tū_We_Tāi_Pa_Hā'.split('_'),
-    longDateFormat: {
-        LT: 'HH:mm',
-        LTS: 'HH:mm:ss',
-        L: 'DD/MM/YYYY',
-        LL: 'D MMMM YYYY',
-        LLL: 'D MMMM YYYY [i] HH:mm',
-        LLLL: 'dddd, D MMMM YYYY [i] HH:mm'
-    },
-    calendar: {
-        sameDay: '[i teie mahana, i] LT',
-        nextDay: '[apopo i] LT',
-        nextWeek: 'dddd [i] LT',
-        lastDay: '[inanahi i] LT',
-        lastWeek: 'dddd [whakamutunga i] LT',
-        sameElse: 'L'
-    },
-    relativeTime: {
-        future: 'i roto i %s',
-        past: '%s i mua',
-        s: 'te hēkona ruarua',
-        m: 'he meneti',
-        mm: '%d meneti',
-        h: 'te haora',
-        hh: '%d haora',
-        d: 'he ra',
-        dd: '%d ra',
-        M: 'he marama',
-        MM: '%d marama',
-        y: 'he tau',
-        yy: '%d tau'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}º/,
-    ordinal: '%dº',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    var mi = moment.defineLocale('mi', {
+        months: 'Kohi-tāte_Hui-tanguru_Poutū-te-rangi_Paenga-whāwhā_Haratua_Pipiri_Hōngoingoi_Here-turi-kōkā_Mahuru_Whiringa-ā-nuku_Whiringa-ā-rangi_Hakihea'.split('_'),
+        monthsShort: 'Kohi_Hui_Pou_Pae_Hara_Pipi_Hōngoi_Here_Mahu_Whi-nu_Whi-ra_Haki'.split('_'),
+        monthsRegex: /(?:['a-z\u0101\u014D\u016B]+\-?){1,3}/i,
+        monthsStrictRegex: /(?:['a-z\u0101\u014D\u016B]+\-?){1,3}/i,
+        monthsShortRegex: /(?:['a-z\u0101\u014D\u016B]+\-?){1,3}/i,
+        monthsShortStrictRegex: /(?:['a-z\u0101\u014D\u016B]+\-?){1,2}/i,
+        weekdays: 'Rātapu_Mane_Tūrei_Wenerei_Tāite_Paraire_Hātarei'.split('_'),
+        weekdaysShort: 'Ta_Ma_Tū_We_Tāi_Pa_Hā'.split('_'),
+        weekdaysMin: 'Ta_Ma_Tū_We_Tāi_Pa_Hā'.split('_'),
+        longDateFormat: {
+            LT: 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L: 'DD/MM/YYYY',
+            LL: 'D MMMM YYYY',
+            LLL: 'D MMMM YYYY [i] HH:mm',
+            LLLL: 'dddd, D MMMM YYYY [i] HH:mm'
+        },
+        calendar: {
+            sameDay: '[i teie mahana, i] LT',
+            nextDay: '[apopo i] LT',
+            nextWeek: 'dddd [i] LT',
+            lastDay: '[inanahi i] LT',
+            lastWeek: 'dddd [whakamutunga i] LT',
+            sameElse: 'L'
+        },
+        relativeTime: {
+            future: 'i roto i %s',
+            past: '%s i mua',
+            s: 'te hēkona ruarua',
+            ss: '%d hēkona',
+            m: 'he meneti',
+            mm: '%d meneti',
+            h: 'te haora',
+            hh: '%d haora',
+            d: 'he ra',
+            dd: '%d ra',
+            M: 'he marama',
+            MM: '%d marama',
+            y: 'he tau',
+            yy: '%d tau'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}º/,
+        ordinal: '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-return mi;
+    return mi;
 
 })));
diff --git a/lib/javascripts/moment_locale/mk.js b/lib/javascripts/moment_locale/mk.js
old mode 100644
new mode 100755
index cdfb1e1c88b..e2d44989e8f
--- a/lib/javascripts/moment_locale/mk.js
+++ b/lib/javascripts/moment_locale/mk.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Macedonian [mk]
-//! author : Borislav Mickov : https://github.com/B0k0
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,81 +8,82 @@
 }(this, (function (moment) { 'use strict';
 
 
-var mk = moment.defineLocale('mk', {
-    months : 'јануари_февруари_март_април_мај_јуни_јули_август_септември_октомври_ноември_декември'.split('_'),
-    monthsShort : 'јан_фев_мар_апр_мај_јун_јул_авг_сеп_окт_ное_дек'.split('_'),
-    weekdays : 'недела_понеделник_вторник_среда_четврток_петок_сабота'.split('_'),
-    weekdaysShort : 'нед_пон_вто_сре_чет_пет_саб'.split('_'),
-    weekdaysMin : 'нe_пo_вт_ср_че_пе_сa'.split('_'),
-    longDateFormat : {
-        LT : 'H:mm',
-        LTS : 'H:mm:ss',
-        L : 'D.MM.YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY H:mm',
-        LLLL : 'dddd, D MMMM YYYY H:mm'
-    },
-    calendar : {
-        sameDay : '[Денес во] LT',
-        nextDay : '[Утре во] LT',
-        nextWeek : '[Во] dddd [во] LT',
-        lastDay : '[Вчера во] LT',
-        lastWeek : function () {
-            switch (this.day()) {
-                case 0:
-                case 3:
-                case 6:
-                    return '[Изминатата] dddd [во] LT';
-                case 1:
-                case 2:
-                case 4:
-                case 5:
-                    return '[Изминатиот] dddd [во] LT';
+    var mk = moment.defineLocale('mk', {
+        months : 'јануари_февруари_март_април_мај_јуни_јули_август_септември_октомври_ноември_декември'.split('_'),
+        monthsShort : 'јан_фев_мар_апр_мај_јун_јул_авг_сеп_окт_ное_дек'.split('_'),
+        weekdays : 'недела_понеделник_вторник_среда_четврток_петок_сабота'.split('_'),
+        weekdaysShort : 'нед_пон_вто_сре_чет_пет_саб'.split('_'),
+        weekdaysMin : 'нe_пo_вт_ср_че_пе_сa'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'D.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY H:mm',
+            LLLL : 'dddd, D MMMM YYYY H:mm'
+        },
+        calendar : {
+            sameDay : '[Денес во] LT',
+            nextDay : '[Утре во] LT',
+            nextWeek : '[Во] dddd [во] LT',
+            lastDay : '[Вчера во] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                    case 0:
+                    case 3:
+                    case 6:
+                        return '[Изминатата] dddd [во] LT';
+                    case 1:
+                    case 2:
+                    case 4:
+                    case 5:
+                        return '[Изминатиот] dddd [во] LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'после %s',
+            past : 'пред %s',
+            s : 'неколку секунди',
+            ss : '%d секунди',
+            m : 'минута',
+            mm : '%d минути',
+            h : 'час',
+            hh : '%d часа',
+            d : 'ден',
+            dd : '%d дена',
+            M : 'месец',
+            MM : '%d месеци',
+            y : 'година',
+            yy : '%d години'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}-(ев|ен|ти|ви|ри|ми)/,
+        ordinal : function (number) {
+            var lastDigit = number % 10,
+                last2Digits = number % 100;
+            if (number === 0) {
+                return number + '-ев';
+            } else if (last2Digits === 0) {
+                return number + '-ен';
+            } else if (last2Digits > 10 && last2Digits < 20) {
+                return number + '-ти';
+            } else if (lastDigit === 1) {
+                return number + '-ви';
+            } else if (lastDigit === 2) {
+                return number + '-ри';
+            } else if (lastDigit === 7 || lastDigit === 8) {
+                return number + '-ми';
+            } else {
+                return number + '-ти';
             }
         },
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'после %s',
-        past : 'пред %s',
-        s : 'неколку секунди',
-        m : 'минута',
-        mm : '%d минути',
-        h : 'час',
-        hh : '%d часа',
-        d : 'ден',
-        dd : '%d дена',
-        M : 'месец',
-        MM : '%d месеци',
-        y : 'година',
-        yy : '%d години'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}-(ев|ен|ти|ви|ри|ми)/,
-    ordinal : function (number) {
-        var lastDigit = number % 10,
-            last2Digits = number % 100;
-        if (number === 0) {
-            return number + '-ев';
-        } else if (last2Digits === 0) {
-            return number + '-ен';
-        } else if (last2Digits > 10 && last2Digits < 20) {
-            return number + '-ти';
-        } else if (lastDigit === 1) {
-            return number + '-ви';
-        } else if (lastDigit === 2) {
-            return number + '-ри';
-        } else if (lastDigit === 7 || lastDigit === 8) {
-            return number + '-ми';
-        } else {
-            return number + '-ти';
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
         }
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    });
 
-return mk;
+    return mk;
 
 })));
diff --git a/lib/javascripts/moment_locale/ml.js b/lib/javascripts/moment_locale/ml.js
old mode 100644
new mode 100755
index e5f52e9c9a9..806db47b9f1
--- a/lib/javascripts/moment_locale/ml.js
+++ b/lib/javascripts/moment_locale/ml.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Malayalam [ml]
-//! author : Floyd Pink : https://github.com/floydpink
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,72 +8,73 @@
 }(this, (function (moment) { 'use strict';
 
 
-var ml = moment.defineLocale('ml', {
-    months : 'ജനുവരി_ഫെബ്രുവരി_മാർച്ച്_ഏപ്രിൽ_മേയ്_ജൂൺ_ജൂലൈ_ഓഗസ്റ്റ്_സെപ്റ്റംബർ_ഒക്ടോബർ_നവംബർ_ഡിസംബർ'.split('_'),
-    monthsShort : 'ജനു._ഫെബ്രു._മാർ._ഏപ്രി._മേയ്_ജൂൺ_ജൂലൈ._ഓഗ._സെപ്റ്റ._ഒക്ടോ._നവം._ഡിസം.'.split('_'),
-    monthsParseExact : true,
-    weekdays : 'ഞായറാഴ്ച_തിങ്കളാഴ്ച_ചൊവ്വാഴ്ച_ബുധനാഴ്ച_വ്യാഴാഴ്ച_വെള്ളിയാഴ്ച_ശനിയാഴ്ച'.split('_'),
-    weekdaysShort : 'ഞായർ_തിങ്കൾ_ചൊവ്വ_ബുധൻ_വ്യാഴം_വെള്ളി_ശനി'.split('_'),
-    weekdaysMin : 'ഞാ_തി_ചൊ_ബു_വ്യാ_വെ_ശ'.split('_'),
-    longDateFormat : {
-        LT : 'A h:mm -നു',
-        LTS : 'A h:mm:ss -നു',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY, A h:mm -നു',
-        LLLL : 'dddd, D MMMM YYYY, A h:mm -നു'
-    },
-    calendar : {
-        sameDay : '[ഇന്ന്] LT',
-        nextDay : '[നാളെ] LT',
-        nextWeek : 'dddd, LT',
-        lastDay : '[ഇന്നലെ] LT',
-        lastWeek : '[കഴിഞ്ഞ] dddd, LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : '%s കഴിഞ്ഞ്',
-        past : '%s മുൻപ്',
-        s : 'അൽപ നിമിഷങ്ങൾ',
-        m : 'ഒരു മിനിറ്റ്',
-        mm : '%d മിനിറ്റ്',
-        h : 'ഒരു മണിക്കൂർ',
-        hh : '%d മണിക്കൂർ',
-        d : 'ഒരു ദിവസം',
-        dd : '%d ദിവസം',
-        M : 'ഒരു മാസം',
-        MM : '%d മാസം',
-        y : 'ഒരു വർഷം',
-        yy : '%d വർഷം'
-    },
-    meridiemParse: /രാത്രി|രാവിലെ|ഉച്ച കഴിഞ്ഞ്|വൈകുന്നേരം|രാത്രി/i,
-    meridiemHour : function (hour, meridiem) {
-        if (hour === 12) {
-            hour = 0;
+    var ml = moment.defineLocale('ml', {
+        months : 'ജനുവരി_ഫെബ്രുവരി_മാർച്ച്_ഏപ്രിൽ_മേയ്_ജൂൺ_ജൂലൈ_ഓഗസ്റ്റ്_സെപ്റ്റംബർ_ഒക്ടോബർ_നവംബർ_ഡിസംബർ'.split('_'),
+        monthsShort : 'ജനു._ഫെബ്രു._മാർ._ഏപ്രി._മേയ്_ജൂൺ_ജൂലൈ._ഓഗ._സെപ്റ്റ._ഒക്ടോ._നവം._ഡിസം.'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'ഞായറാഴ്ച_തിങ്കളാഴ്ച_ചൊവ്വാഴ്ച_ബുധനാഴ്ച_വ്യാഴാഴ്ച_വെള്ളിയാഴ്ച_ശനിയാഴ്ച'.split('_'),
+        weekdaysShort : 'ഞായർ_തിങ്കൾ_ചൊവ്വ_ബുധൻ_വ്യാഴം_വെള്ളി_ശനി'.split('_'),
+        weekdaysMin : 'ഞാ_തി_ചൊ_ബു_വ്യാ_വെ_ശ'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm -നു',
+            LTS : 'A h:mm:ss -നു',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, A h:mm -നു',
+            LLLL : 'dddd, D MMMM YYYY, A h:mm -നു'
+        },
+        calendar : {
+            sameDay : '[ഇന്ന്] LT',
+            nextDay : '[നാളെ] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[ഇന്നലെ] LT',
+            lastWeek : '[കഴിഞ്ഞ] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s കഴിഞ്ഞ്',
+            past : '%s മുൻപ്',
+            s : 'അൽപ നിമിഷങ്ങൾ',
+            ss : '%d സെക്കൻഡ്',
+            m : 'ഒരു മിനിറ്റ്',
+            mm : '%d മിനിറ്റ്',
+            h : 'ഒരു മണിക്കൂർ',
+            hh : '%d മണിക്കൂർ',
+            d : 'ഒരു ദിവസം',
+            dd : '%d ദിവസം',
+            M : 'ഒരു മാസം',
+            MM : '%d മാസം',
+            y : 'ഒരു വർഷം',
+            yy : '%d വർഷം'
+        },
+        meridiemParse: /രാത്രി|രാവിലെ|ഉച്ച കഴിഞ്ഞ്|വൈകുന്നേരം|രാത്രി/i,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if ((meridiem === 'രാത്രി' && hour >= 4) ||
+                    meridiem === 'ഉച്ച കഴിഞ്ഞ്' ||
+                    meridiem === 'വൈകുന്നേരം') {
+                return hour + 12;
+            } else {
+                return hour;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'രാത്രി';
+            } else if (hour < 12) {
+                return 'രാവിലെ';
+            } else if (hour < 17) {
+                return 'ഉച്ച കഴിഞ്ഞ്';
+            } else if (hour < 20) {
+                return 'വൈകുന്നേരം';
+            } else {
+                return 'രാത്രി';
+            }
         }
-        if ((meridiem === 'രാത്രി' && hour >= 4) ||
-                meridiem === 'ഉച്ച കഴിഞ്ഞ്' ||
-                meridiem === 'വൈകുന്നേരം') {
-            return hour + 12;
-        } else {
-            return hour;
-        }
-    },
-    meridiem : function (hour, minute, isLower) {
-        if (hour < 4) {
-            return 'രാത്രി';
-        } else if (hour < 12) {
-            return 'രാവിലെ';
-        } else if (hour < 17) {
-            return 'ഉച്ച കഴിഞ്ഞ്';
-        } else if (hour < 20) {
-            return 'വൈകുന്നേരം';
-        } else {
-            return 'രാത്രി';
-        }
-    }
-});
+    });
 
-return ml;
+    return ml;
 
 })));
diff --git a/lib/javascripts/moment_locale/mn.js b/lib/javascripts/moment_locale/mn.js
new file mode 100755
index 00000000000..f4b95c816e2
--- /dev/null
+++ b/lib/javascripts/moment_locale/mn.js
@@ -0,0 +1,103 @@
+//! moment.js locale configuration
+
+;(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined'
+       && typeof require === 'function' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
+   factory(global.moment)
+}(this, (function (moment) { 'use strict';
+
+
+    function translate(number, withoutSuffix, key, isFuture) {
+        switch (key) {
+            case 's':
+                return withoutSuffix ? 'хэдхэн секунд' : 'хэдхэн секундын';
+            case 'ss':
+                return number + (withoutSuffix ? ' секунд' : ' секундын');
+            case 'm':
+            case 'mm':
+                return number + (withoutSuffix ? ' минут' : ' минутын');
+            case 'h':
+            case 'hh':
+                return number + (withoutSuffix ? ' цаг' : ' цагийн');
+            case 'd':
+            case 'dd':
+                return number + (withoutSuffix ? ' өдөр' : ' өдрийн');
+            case 'M':
+            case 'MM':
+                return number + (withoutSuffix ? ' сар' : ' сарын');
+            case 'y':
+            case 'yy':
+                return number + (withoutSuffix ? ' жил' : ' жилийн');
+            default:
+                return number;
+        }
+    }
+
+    var mn = moment.defineLocale('mn', {
+        months : 'Нэгдүгээр сар_Хоёрдугаар сар_Гуравдугаар сар_Дөрөвдүгээр сар_Тавдугаар сар_Зургадугаар сар_Долдугаар сар_Наймдугаар сар_Есдүгээр сар_Аравдугаар сар_Арван нэгдүгээр сар_Арван хоёрдугаар сар'.split('_'),
+        monthsShort : '1 сар_2 сар_3 сар_4 сар_5 сар_6 сар_7 сар_8 сар_9 сар_10 сар_11 сар_12 сар'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'Ням_Даваа_Мягмар_Лхагва_Пүрэв_Баасан_Бямба'.split('_'),
+        weekdaysShort : 'Ням_Дав_Мяг_Лха_Пүр_Баа_Бям'.split('_'),
+        weekdaysMin : 'Ня_Да_Мя_Лх_Пү_Ба_Бя'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'YYYY-MM-DD',
+            LL : 'YYYY оны MMMMын D',
+            LLL : 'YYYY оны MMMMын D HH:mm',
+            LLLL : 'dddd, YYYY оны MMMMын D HH:mm'
+        },
+        meridiemParse: /ҮӨ|ҮХ/i,
+        isPM : function (input) {
+            return input === 'ҮХ';
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'ҮӨ';
+            } else {
+                return 'ҮХ';
+            }
+        },
+        calendar : {
+            sameDay : '[Өнөөдөр] LT',
+            nextDay : '[Маргааш] LT',
+            nextWeek : '[Ирэх] dddd LT',
+            lastDay : '[Өчигдөр] LT',
+            lastWeek : '[Өнгөрсөн] dddd LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s дараа',
+            past : '%s өмнө',
+            s : translate,
+            ss : translate,
+            m : translate,
+            mm : translate,
+            h : translate,
+            hh : translate,
+            d : translate,
+            dd : translate,
+            M : translate,
+            MM : translate,
+            y : translate,
+            yy : translate
+        },
+        dayOfMonthOrdinalParse: /\d{1,2} өдөр/,
+        ordinal : function (number, period) {
+            switch (period) {
+                case 'd':
+                case 'D':
+                case 'DDD':
+                    return number + ' өдөр';
+                default:
+                    return number;
+            }
+        }
+    });
+
+    return mn;
+
+})));
diff --git a/lib/javascripts/moment_locale/mr.js b/lib/javascripts/moment_locale/mr.js
old mode 100644
new mode 100755
index abe1024b131..fdeaa3d9b5f
--- a/lib/javascripts/moment_locale/mr.js
+++ b/lib/javascripts/moment_locale/mr.js
@@ -1,7 +1,4 @@
 //! moment.js locale configuration
-//! locale : Marathi [mr]
-//! author : Harshad Kale : https://github.com/kalehv
-//! author : Vivek Athalye : https://github.com/vnathalye
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -11,149 +8,152 @@
 }(this, (function (moment) { 'use strict';
 
 
-var symbolMap = {
-    '1': '१',
-    '2': '२',
-    '3': '३',
-    '4': '४',
-    '5': '५',
-    '6': '६',
-    '7': '७',
-    '8': '८',
-    '9': '९',
-    '0': '०'
-};
-var numberMap = {
-    '१': '1',
-    '२': '2',
-    '३': '3',
-    '४': '4',
-    '५': '5',
-    '६': '6',
-    '७': '7',
-    '८': '8',
-    '९': '9',
-    '०': '0'
-};
+    var symbolMap = {
+        '1': '१',
+        '2': '२',
+        '3': '३',
+        '4': '४',
+        '5': '५',
+        '6': '६',
+        '7': '७',
+        '8': '८',
+        '9': '९',
+        '0': '०'
+    },
+    numberMap = {
+        '१': '1',
+        '२': '2',
+        '३': '3',
+        '४': '4',
+        '५': '5',
+        '६': '6',
+        '७': '7',
+        '८': '8',
+        '९': '9',
+        '०': '0'
+    };
 
-function relativeTimeMr(number, withoutSuffix, string, isFuture)
-{
-    var output = '';
-    if (withoutSuffix) {
-        switch (string) {
-            case 's': output = 'काही सेकंद'; break;
-            case 'm': output = 'एक मिनिट'; break;
-            case 'mm': output = '%d मिनिटे'; break;
-            case 'h': output = 'एक तास'; break;
-            case 'hh': output = '%d तास'; break;
-            case 'd': output = 'एक दिवस'; break;
-            case 'dd': output = '%d दिवस'; break;
-            case 'M': output = 'एक महिना'; break;
-            case 'MM': output = '%d महिने'; break;
-            case 'y': output = 'एक वर्ष'; break;
-            case 'yy': output = '%d वर्षे'; break;
+    function relativeTimeMr(number, withoutSuffix, string, isFuture)
+    {
+        var output = '';
+        if (withoutSuffix) {
+            switch (string) {
+                case 's': output = 'काही सेकंद'; break;
+                case 'ss': output = '%d सेकंद'; break;
+                case 'm': output = 'एक मिनिट'; break;
+                case 'mm': output = '%d मिनिटे'; break;
+                case 'h': output = 'एक तास'; break;
+                case 'hh': output = '%d तास'; break;
+                case 'd': output = 'एक दिवस'; break;
+                case 'dd': output = '%d दिवस'; break;
+                case 'M': output = 'एक महिना'; break;
+                case 'MM': output = '%d महिने'; break;
+                case 'y': output = 'एक वर्ष'; break;
+                case 'yy': output = '%d वर्षे'; break;
+            }
         }
-    }
-    else {
-        switch (string) {
-            case 's': output = 'काही सेकंदां'; break;
-            case 'm': output = 'एका मिनिटा'; break;
-            case 'mm': output = '%d मिनिटां'; break;
-            case 'h': output = 'एका तासा'; break;
-            case 'hh': output = '%d तासां'; break;
-            case 'd': output = 'एका दिवसा'; break;
-            case 'dd': output = '%d दिवसां'; break;
-            case 'M': output = 'एका महिन्या'; break;
-            case 'MM': output = '%d महिन्यां'; break;
-            case 'y': output = 'एका वर्षा'; break;
-            case 'yy': output = '%d वर्षां'; break;
+        else {
+            switch (string) {
+                case 's': output = 'काही सेकंदां'; break;
+                case 'ss': output = '%d सेकंदां'; break;
+                case 'm': output = 'एका मिनिटा'; break;
+                case 'mm': output = '%d मिनिटां'; break;
+                case 'h': output = 'एका तासा'; break;
+                case 'hh': output = '%d तासां'; break;
+                case 'd': output = 'एका दिवसा'; break;
+                case 'dd': output = '%d दिवसां'; break;
+                case 'M': output = 'एका महिन्या'; break;
+                case 'MM': output = '%d महिन्यां'; break;
+                case 'y': output = 'एका वर्षा'; break;
+                case 'yy': output = '%d वर्षां'; break;
+            }
         }
+        return output.replace(/%d/i, number);
     }
-    return output.replace(/%d/i, number);
-}
 
-var mr = moment.defineLocale('mr', {
-    months : 'जानेवारी_फेब्रुवारी_मार्च_एप्रिल_मे_जून_जुलै_ऑगस्ट_सप्टेंबर_ऑक्टोबर_नोव्हेंबर_डिसेंबर'.split('_'),
-    monthsShort: 'जाने._फेब्रु._मार्च._एप्रि._मे._जून._जुलै._ऑग._सप्टें._ऑक्टो._नोव्हें._डिसें.'.split('_'),
-    monthsParseExact : true,
-    weekdays : 'रविवार_सोमवार_मंगळवार_बुधवार_गुरूवार_शुक्रवार_शनिवार'.split('_'),
-    weekdaysShort : 'रवि_सोम_मंगळ_बुध_गुरू_शुक्र_शनि'.split('_'),
-    weekdaysMin : 'र_सो_मं_बु_गु_शु_श'.split('_'),
-    longDateFormat : {
-        LT : 'A h:mm वाजता',
-        LTS : 'A h:mm:ss वाजता',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY, A h:mm वाजता',
-        LLLL : 'dddd, D MMMM YYYY, A h:mm वाजता'
-    },
-    calendar : {
-        sameDay : '[आज] LT',
-        nextDay : '[उद्या] LT',
-        nextWeek : 'dddd, LT',
-        lastDay : '[काल] LT',
-        lastWeek: '[मागील] dddd, LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future: '%sमध्ये',
-        past: '%sपूर्वी',
-        s: relativeTimeMr,
-        m: relativeTimeMr,
-        mm: relativeTimeMr,
-        h: relativeTimeMr,
-        hh: relativeTimeMr,
-        d: relativeTimeMr,
-        dd: relativeTimeMr,
-        M: relativeTimeMr,
-        MM: relativeTimeMr,
-        y: relativeTimeMr,
-        yy: relativeTimeMr
-    },
-    preparse: function (string) {
-        return string.replace(/[१२३४५६७८९०]/g, function (match) {
-            return numberMap[match];
-        });
-    },
-    postformat: function (string) {
-        return string.replace(/\d/g, function (match) {
-            return symbolMap[match];
-        });
-    },
-    meridiemParse: /रात्री|सकाळी|दुपारी|सायंकाळी/,
-    meridiemHour : function (hour, meridiem) {
-        if (hour === 12) {
-            hour = 0;
+    var mr = moment.defineLocale('mr', {
+        months : 'जानेवारी_फेब्रुवारी_मार्च_एप्रिल_मे_जून_जुलै_ऑगस्ट_सप्टेंबर_ऑक्टोबर_नोव्हेंबर_डिसेंबर'.split('_'),
+        monthsShort: 'जाने._फेब्रु._मार्च._एप्रि._मे._जून._जुलै._ऑग._सप्टें._ऑक्टो._नोव्हें._डिसें.'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'रविवार_सोमवार_मंगळवार_बुधवार_गुरूवार_शुक्रवार_शनिवार'.split('_'),
+        weekdaysShort : 'रवि_सोम_मंगळ_बुध_गुरू_शुक्र_शनि'.split('_'),
+        weekdaysMin : 'र_सो_मं_बु_गु_शु_श'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm वाजता',
+            LTS : 'A h:mm:ss वाजता',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, A h:mm वाजता',
+            LLLL : 'dddd, D MMMM YYYY, A h:mm वाजता'
+        },
+        calendar : {
+            sameDay : '[आज] LT',
+            nextDay : '[उद्या] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[काल] LT',
+            lastWeek: '[मागील] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future: '%sमध्ये',
+            past: '%sपूर्वी',
+            s: relativeTimeMr,
+            ss: relativeTimeMr,
+            m: relativeTimeMr,
+            mm: relativeTimeMr,
+            h: relativeTimeMr,
+            hh: relativeTimeMr,
+            d: relativeTimeMr,
+            dd: relativeTimeMr,
+            M: relativeTimeMr,
+            MM: relativeTimeMr,
+            y: relativeTimeMr,
+            yy: relativeTimeMr
+        },
+        preparse: function (string) {
+            return string.replace(/[१२३४५६७८९०]/g, function (match) {
+                return numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            });
+        },
+        meridiemParse: /रात्री|सकाळी|दुपारी|सायंकाळी/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'रात्री') {
+                return hour < 4 ? hour : hour + 12;
+            } else if (meridiem === 'सकाळी') {
+                return hour;
+            } else if (meridiem === 'दुपारी') {
+                return hour >= 10 ? hour : hour + 12;
+            } else if (meridiem === 'सायंकाळी') {
+                return hour + 12;
+            }
+        },
+        meridiem: function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'रात्री';
+            } else if (hour < 10) {
+                return 'सकाळी';
+            } else if (hour < 17) {
+                return 'दुपारी';
+            } else if (hour < 20) {
+                return 'सायंकाळी';
+            } else {
+                return 'रात्री';
+            }
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 1st is the first week of the year.
         }
-        if (meridiem === 'रात्री') {
-            return hour < 4 ? hour : hour + 12;
-        } else if (meridiem === 'सकाळी') {
-            return hour;
-        } else if (meridiem === 'दुपारी') {
-            return hour >= 10 ? hour : hour + 12;
-        } else if (meridiem === 'सायंकाळी') {
-            return hour + 12;
-        }
-    },
-    meridiem: function (hour, minute, isLower) {
-        if (hour < 4) {
-            return 'रात्री';
-        } else if (hour < 10) {
-            return 'सकाळी';
-        } else if (hour < 17) {
-            return 'दुपारी';
-        } else if (hour < 20) {
-            return 'सायंकाळी';
-        } else {
-            return 'रात्री';
-        }
-    },
-    week : {
-        dow : 0, // Sunday is the first day of the week.
-        doy : 6  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    });
 
-return mr;
+    return mr;
 
 })));
diff --git a/lib/javascripts/moment_locale/ms-my.js b/lib/javascripts/moment_locale/ms-my.js
old mode 100644
new mode 100755
index 0cb403d347a..721882050a7
--- a/lib/javascripts/moment_locale/ms-my.js
+++ b/lib/javascripts/moment_locale/ms-my.js
@@ -1,7 +1,4 @@
 //! moment.js locale configuration
-//! locale : Malay [ms-my]
-//! note : DEPRECATED, the correct one is [ms]
-//! author : Weldan Jamili : https://github.com/weldan
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -11,73 +8,74 @@
 }(this, (function (moment) { 'use strict';
 
 
-var msMy = moment.defineLocale('ms-my', {
-    months : 'Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember'.split('_'),
-    monthsShort : 'Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis'.split('_'),
-    weekdays : 'Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu'.split('_'),
-    weekdaysShort : 'Ahd_Isn_Sel_Rab_Kha_Jum_Sab'.split('_'),
-    weekdaysMin : 'Ah_Is_Sl_Rb_Km_Jm_Sb'.split('_'),
-    longDateFormat : {
-        LT : 'HH.mm',
-        LTS : 'HH.mm.ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY [pukul] HH.mm',
-        LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm'
-    },
-    meridiemParse: /pagi|tengahari|petang|malam/,
-    meridiemHour: function (hour, meridiem) {
-        if (hour === 12) {
-            hour = 0;
+    var msMy = moment.defineLocale('ms-my', {
+        months : 'Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember'.split('_'),
+        monthsShort : 'Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis'.split('_'),
+        weekdays : 'Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu'.split('_'),
+        weekdaysShort : 'Ahd_Isn_Sel_Rab_Kha_Jum_Sab'.split('_'),
+        weekdaysMin : 'Ah_Is_Sl_Rb_Km_Jm_Sb'.split('_'),
+        longDateFormat : {
+            LT : 'HH.mm',
+            LTS : 'HH.mm.ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY [pukul] HH.mm',
+            LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm'
+        },
+        meridiemParse: /pagi|tengahari|petang|malam/,
+        meridiemHour: function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'pagi') {
+                return hour;
+            } else if (meridiem === 'tengahari') {
+                return hour >= 11 ? hour : hour + 12;
+            } else if (meridiem === 'petang' || meridiem === 'malam') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 11) {
+                return 'pagi';
+            } else if (hours < 15) {
+                return 'tengahari';
+            } else if (hours < 19) {
+                return 'petang';
+            } else {
+                return 'malam';
+            }
+        },
+        calendar : {
+            sameDay : '[Hari ini pukul] LT',
+            nextDay : '[Esok pukul] LT',
+            nextWeek : 'dddd [pukul] LT',
+            lastDay : '[Kelmarin pukul] LT',
+            lastWeek : 'dddd [lepas pukul] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'dalam %s',
+            past : '%s yang lepas',
+            s : 'beberapa saat',
+            ss : '%d saat',
+            m : 'seminit',
+            mm : '%d minit',
+            h : 'sejam',
+            hh : '%d jam',
+            d : 'sehari',
+            dd : '%d hari',
+            M : 'sebulan',
+            MM : '%d bulan',
+            y : 'setahun',
+            yy : '%d tahun'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
         }
-        if (meridiem === 'pagi') {
-            return hour;
-        } else if (meridiem === 'tengahari') {
-            return hour >= 11 ? hour : hour + 12;
-        } else if (meridiem === 'petang' || meridiem === 'malam') {
-            return hour + 12;
-        }
-    },
-    meridiem : function (hours, minutes, isLower) {
-        if (hours < 11) {
-            return 'pagi';
-        } else if (hours < 15) {
-            return 'tengahari';
-        } else if (hours < 19) {
-            return 'petang';
-        } else {
-            return 'malam';
-        }
-    },
-    calendar : {
-        sameDay : '[Hari ini pukul] LT',
-        nextDay : '[Esok pukul] LT',
-        nextWeek : 'dddd [pukul] LT',
-        lastDay : '[Kelmarin pukul] LT',
-        lastWeek : 'dddd [lepas pukul] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'dalam %s',
-        past : '%s yang lepas',
-        s : 'beberapa saat',
-        m : 'seminit',
-        mm : '%d minit',
-        h : 'sejam',
-        hh : '%d jam',
-        d : 'sehari',
-        dd : '%d hari',
-        M : 'sebulan',
-        MM : '%d bulan',
-        y : 'setahun',
-        yy : '%d tahun'
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    });
 
-return msMy;
+    return msMy;
 
 })));
diff --git a/lib/javascripts/moment_locale/ms.js b/lib/javascripts/moment_locale/ms.js
old mode 100644
new mode 100755
index 4d4afff5dfc..1fe21443a8f
--- a/lib/javascripts/moment_locale/ms.js
+++ b/lib/javascripts/moment_locale/ms.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Malay [ms]
-//! author : Weldan Jamili : https://github.com/weldan
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,73 +8,74 @@
 }(this, (function (moment) { 'use strict';
 
 
-var ms = moment.defineLocale('ms', {
-    months : 'Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember'.split('_'),
-    monthsShort : 'Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis'.split('_'),
-    weekdays : 'Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu'.split('_'),
-    weekdaysShort : 'Ahd_Isn_Sel_Rab_Kha_Jum_Sab'.split('_'),
-    weekdaysMin : 'Ah_Is_Sl_Rb_Km_Jm_Sb'.split('_'),
-    longDateFormat : {
-        LT : 'HH.mm',
-        LTS : 'HH.mm.ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY [pukul] HH.mm',
-        LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm'
-    },
-    meridiemParse: /pagi|tengahari|petang|malam/,
-    meridiemHour: function (hour, meridiem) {
-        if (hour === 12) {
-            hour = 0;
+    var ms = moment.defineLocale('ms', {
+        months : 'Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember'.split('_'),
+        monthsShort : 'Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis'.split('_'),
+        weekdays : 'Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu'.split('_'),
+        weekdaysShort : 'Ahd_Isn_Sel_Rab_Kha_Jum_Sab'.split('_'),
+        weekdaysMin : 'Ah_Is_Sl_Rb_Km_Jm_Sb'.split('_'),
+        longDateFormat : {
+            LT : 'HH.mm',
+            LTS : 'HH.mm.ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY [pukul] HH.mm',
+            LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm'
+        },
+        meridiemParse: /pagi|tengahari|petang|malam/,
+        meridiemHour: function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'pagi') {
+                return hour;
+            } else if (meridiem === 'tengahari') {
+                return hour >= 11 ? hour : hour + 12;
+            } else if (meridiem === 'petang' || meridiem === 'malam') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 11) {
+                return 'pagi';
+            } else if (hours < 15) {
+                return 'tengahari';
+            } else if (hours < 19) {
+                return 'petang';
+            } else {
+                return 'malam';
+            }
+        },
+        calendar : {
+            sameDay : '[Hari ini pukul] LT',
+            nextDay : '[Esok pukul] LT',
+            nextWeek : 'dddd [pukul] LT',
+            lastDay : '[Kelmarin pukul] LT',
+            lastWeek : 'dddd [lepas pukul] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'dalam %s',
+            past : '%s yang lepas',
+            s : 'beberapa saat',
+            ss : '%d saat',
+            m : 'seminit',
+            mm : '%d minit',
+            h : 'sejam',
+            hh : '%d jam',
+            d : 'sehari',
+            dd : '%d hari',
+            M : 'sebulan',
+            MM : '%d bulan',
+            y : 'setahun',
+            yy : '%d tahun'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
         }
-        if (meridiem === 'pagi') {
-            return hour;
-        } else if (meridiem === 'tengahari') {
-            return hour >= 11 ? hour : hour + 12;
-        } else if (meridiem === 'petang' || meridiem === 'malam') {
-            return hour + 12;
-        }
-    },
-    meridiem : function (hours, minutes, isLower) {
-        if (hours < 11) {
-            return 'pagi';
-        } else if (hours < 15) {
-            return 'tengahari';
-        } else if (hours < 19) {
-            return 'petang';
-        } else {
-            return 'malam';
-        }
-    },
-    calendar : {
-        sameDay : '[Hari ini pukul] LT',
-        nextDay : '[Esok pukul] LT',
-        nextWeek : 'dddd [pukul] LT',
-        lastDay : '[Kelmarin pukul] LT',
-        lastWeek : 'dddd [lepas pukul] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'dalam %s',
-        past : '%s yang lepas',
-        s : 'beberapa saat',
-        m : 'seminit',
-        mm : '%d minit',
-        h : 'sejam',
-        hh : '%d jam',
-        d : 'sehari',
-        dd : '%d hari',
-        M : 'sebulan',
-        MM : '%d bulan',
-        y : 'setahun',
-        yy : '%d tahun'
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    });
 
-return ms;
+    return ms;
 
 })));
diff --git a/lib/javascripts/moment_locale/mt.js b/lib/javascripts/moment_locale/mt.js
new file mode 100755
index 00000000000..4a34c5deb27
--- /dev/null
+++ b/lib/javascripts/moment_locale/mt.js
@@ -0,0 +1,59 @@
+//! moment.js locale configuration
+
+;(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined'
+       && typeof require === 'function' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
+   factory(global.moment)
+}(this, (function (moment) { 'use strict';
+
+
+    var mt = moment.defineLocale('mt', {
+        months : 'Jannar_Frar_Marzu_April_Mejju_Ġunju_Lulju_Awwissu_Settembru_Ottubru_Novembru_Diċembru'.split('_'),
+        monthsShort : 'Jan_Fra_Mar_Apr_Mej_Ġun_Lul_Aww_Set_Ott_Nov_Diċ'.split('_'),
+        weekdays : 'Il-Ħadd_It-Tnejn_It-Tlieta_L-Erbgħa_Il-Ħamis_Il-Ġimgħa_Is-Sibt'.split('_'),
+        weekdaysShort : 'Ħad_Tne_Tli_Erb_Ħam_Ġim_Sib'.split('_'),
+        weekdaysMin : 'Ħa_Tn_Tl_Er_Ħa_Ġi_Si'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[Illum fil-]LT',
+            nextDay : '[Għada fil-]LT',
+            nextWeek : 'dddd [fil-]LT',
+            lastDay : '[Il-bieraħ fil-]LT',
+            lastWeek : 'dddd [li għadda] [fil-]LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'f’ %s',
+            past : '%s ilu',
+            s : 'ftit sekondi',
+            ss : '%d sekondi',
+            m : 'minuta',
+            mm : '%d minuti',
+            h : 'siegħa',
+            hh : '%d siegħat',
+            d : 'ġurnata',
+            dd : '%d ġranet',
+            M : 'xahar',
+            MM : '%d xhur',
+            y : 'sena',
+            yy : '%d sni'
+        },
+        dayOfMonthOrdinalParse : /\d{1,2}º/,
+        ordinal: '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return mt;
+
+})));
diff --git a/lib/javascripts/moment_locale/my.js b/lib/javascripts/moment_locale/my.js
old mode 100644
new mode 100755
index 32d67e2bae5..bc87c7f7eb8
--- a/lib/javascripts/moment_locale/my.js
+++ b/lib/javascripts/moment_locale/my.js
@@ -1,8 +1,4 @@
 //! moment.js locale configuration
-//! locale : Burmese [my]
-//! author : Squar team, mysquar.com
-//! author : David Rossellat : https://github.com/gholadr
-//! author : Tin Aung Lin : https://github.com/thanyawzinmin
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -12,85 +8,85 @@
 }(this, (function (moment) { 'use strict';
 
 
-var symbolMap = {
-    '1': '၁',
-    '2': '၂',
-    '3': '၃',
-    '4': '၄',
-    '5': '၅',
-    '6': '၆',
-    '7': '၇',
-    '8': '၈',
-    '9': '၉',
-    '0': '၀'
-};
-var numberMap = {
-    '၁': '1',
-    '၂': '2',
-    '၃': '3',
-    '၄': '4',
-    '၅': '5',
-    '၆': '6',
-    '၇': '7',
-    '၈': '8',
-    '၉': '9',
-    '၀': '0'
-};
+    var symbolMap = {
+        '1': '၁',
+        '2': '၂',
+        '3': '၃',
+        '4': '၄',
+        '5': '၅',
+        '6': '၆',
+        '7': '၇',
+        '8': '၈',
+        '9': '၉',
+        '0': '၀'
+    }, numberMap = {
+        '၁': '1',
+        '၂': '2',
+        '၃': '3',
+        '၄': '4',
+        '၅': '5',
+        '၆': '6',
+        '၇': '7',
+        '၈': '8',
+        '၉': '9',
+        '၀': '0'
+    };
 
-var my = moment.defineLocale('my', {
-    months: 'ဇန်နဝါရီ_ဖေဖော်ဝါရီ_မတ်_ဧပြီ_မေ_ဇွန်_ဇူလိုင်_သြဂုတ်_စက်တင်ဘာ_အောက်တိုဘာ_နိုဝင်ဘာ_ဒီဇင်ဘာ'.split('_'),
-    monthsShort: 'ဇန်_ဖေ_မတ်_ပြီ_မေ_ဇွန်_လိုင်_သြ_စက်_အောက်_နို_ဒီ'.split('_'),
-    weekdays: 'တနင်္ဂနွေ_တနင်္လာ_အင်္ဂါ_ဗုဒ္ဓဟူး_ကြာသပတေး_သောကြာ_စနေ'.split('_'),
-    weekdaysShort: 'နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ'.split('_'),
-    weekdaysMin: 'နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ'.split('_'),
+    var my = moment.defineLocale('my', {
+        months: 'ဇန်နဝါရီ_ဖေဖော်ဝါရီ_မတ်_ဧပြီ_မေ_ဇွန်_ဇူလိုင်_သြဂုတ်_စက်တင်ဘာ_အောက်တိုဘာ_နိုဝင်ဘာ_ဒီဇင်ဘာ'.split('_'),
+        monthsShort: 'ဇန်_ဖေ_မတ်_ပြီ_မေ_ဇွန်_လိုင်_သြ_စက်_အောက်_နို_ဒီ'.split('_'),
+        weekdays: 'တနင်္ဂနွေ_တနင်္လာ_အင်္ဂါ_ဗုဒ္ဓဟူး_ကြာသပတေး_သောကြာ_စနေ'.split('_'),
+        weekdaysShort: 'နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ'.split('_'),
+        weekdaysMin: 'နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ'.split('_'),
 
-    longDateFormat: {
-        LT: 'HH:mm',
-        LTS: 'HH:mm:ss',
-        L: 'DD/MM/YYYY',
-        LL: 'D MMMM YYYY',
-        LLL: 'D MMMM YYYY HH:mm',
-        LLLL: 'dddd D MMMM YYYY HH:mm'
-    },
-    calendar: {
-        sameDay: '[ယနေ.] LT [မှာ]',
-        nextDay: '[မနက်ဖြန်] LT [မှာ]',
-        nextWeek: 'dddd LT [မှာ]',
-        lastDay: '[မနေ.က] LT [မှာ]',
-        lastWeek: '[ပြီးခဲ့သော] dddd LT [မှာ]',
-        sameElse: 'L'
-    },
-    relativeTime: {
-        future: 'လာမည့် %s မှာ',
-        past: 'လွန်ခဲ့သော %s က',
-        s: 'စက္ကန်.အနည်းငယ်',
-        m: 'တစ်မိနစ်',
-        mm: '%d မိနစ်',
-        h: 'တစ်နာရီ',
-        hh: '%d နာရီ',
-        d: 'တစ်ရက်',
-        dd: '%d ရက်',
-        M: 'တစ်လ',
-        MM: '%d လ',
-        y: 'တစ်နှစ်',
-        yy: '%d နှစ်'
-    },
-    preparse: function (string) {
-        return string.replace(/[၁၂၃၄၅၆၇၈၉၀]/g, function (match) {
-            return numberMap[match];
-        });
-    },
-    postformat: function (string) {
-        return string.replace(/\d/g, function (match) {
-            return symbolMap[match];
-        });
-    },
-    week: {
-        dow: 1, // Monday is the first day of the week.
-        doy: 4 // The week that contains Jan 1st is the first week of the year.
-    }
-});
+        longDateFormat: {
+            LT: 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L: 'DD/MM/YYYY',
+            LL: 'D MMMM YYYY',
+            LLL: 'D MMMM YYYY HH:mm',
+            LLLL: 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar: {
+            sameDay: '[ယနေ.] LT [မှာ]',
+            nextDay: '[မနက်ဖြန်] LT [မှာ]',
+            nextWeek: 'dddd LT [မှာ]',
+            lastDay: '[မနေ.က] LT [မှာ]',
+            lastWeek: '[ပြီးခဲ့သော] dddd LT [မှာ]',
+            sameElse: 'L'
+        },
+        relativeTime: {
+            future: 'လာမည့် %s မှာ',
+            past: 'လွန်ခဲ့သော %s က',
+            s: 'စက္ကန်.အနည်းငယ်',
+            ss : '%d စက္ကန့်',
+            m: 'တစ်မိနစ်',
+            mm: '%d မိနစ်',
+            h: 'တစ်နာရီ',
+            hh: '%d နာရီ',
+            d: 'တစ်ရက်',
+            dd: '%d ရက်',
+            M: 'တစ်လ',
+            MM: '%d လ',
+            y: 'တစ်နှစ်',
+            yy: '%d နှစ်'
+        },
+        preparse: function (string) {
+            return string.replace(/[၁၂၃၄၅၆၇၈၉၀]/g, function (match) {
+                return numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            });
+        },
+        week: {
+            dow: 1, // Monday is the first day of the week.
+            doy: 4 // The week that contains Jan 1st is the first week of the year.
+        }
+    });
 
-return my;
+    return my;
 
 })));
diff --git a/lib/javascripts/moment_locale/nb.js b/lib/javascripts/moment_locale/nb.js
old mode 100644
new mode 100755
index 2cfe374f84b..f22981042e2
--- a/lib/javascripts/moment_locale/nb.js
+++ b/lib/javascripts/moment_locale/nb.js
@@ -1,7 +1,4 @@
 //! moment.js locale configuration
-//! locale : Norwegian Bokmål [nb]
-//! authors : Espen Hovlandsdal : https://github.com/rexxars
-//!           Sigurd Gartmann : https://github.com/sigurdga
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -11,53 +8,54 @@
 }(this, (function (moment) { 'use strict';
 
 
-var nb = moment.defineLocale('nb', {
-    months : 'januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
-    monthsShort : 'jan._feb._mars_april_mai_juni_juli_aug._sep._okt._nov._des.'.split('_'),
-    monthsParseExact : true,
-    weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),
-    weekdaysShort : 'sø._ma._ti._on._to._fr._lø.'.split('_'),
-    weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D. MMMM YYYY',
-        LLL : 'D. MMMM YYYY [kl.] HH:mm',
-        LLLL : 'dddd D. MMMM YYYY [kl.] HH:mm'
-    },
-    calendar : {
-        sameDay: '[i dag kl.] LT',
-        nextDay: '[i morgen kl.] LT',
-        nextWeek: 'dddd [kl.] LT',
-        lastDay: '[i går kl.] LT',
-        lastWeek: '[forrige] dddd [kl.] LT',
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'om %s',
-        past : '%s siden',
-        s : 'noen sekunder',
-        m : 'ett minutt',
-        mm : '%d minutter',
-        h : 'en time',
-        hh : '%d timer',
-        d : 'en dag',
-        dd : '%d dager',
-        M : 'en måned',
-        MM : '%d måneder',
-        y : 'ett år',
-        yy : '%d år'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    var nb = moment.defineLocale('nb', {
+        months : 'januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
+        monthsShort : 'jan._feb._mars_april_mai_juni_juli_aug._sep._okt._nov._des.'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),
+        weekdaysShort : 'sø._ma._ti._on._to._fr._lø.'.split('_'),
+        weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY [kl.] HH:mm',
+            LLLL : 'dddd D. MMMM YYYY [kl.] HH:mm'
+        },
+        calendar : {
+            sameDay: '[i dag kl.] LT',
+            nextDay: '[i morgen kl.] LT',
+            nextWeek: 'dddd [kl.] LT',
+            lastDay: '[i går kl.] LT',
+            lastWeek: '[forrige] dddd [kl.] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'om %s',
+            past : '%s siden',
+            s : 'noen sekunder',
+            ss : '%d sekunder',
+            m : 'ett minutt',
+            mm : '%d minutter',
+            h : 'en time',
+            hh : '%d timer',
+            d : 'en dag',
+            dd : '%d dager',
+            M : 'en måned',
+            MM : '%d måneder',
+            y : 'ett år',
+            yy : '%d år'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-return nb;
+    return nb;
 
 })));
diff --git a/lib/javascripts/moment_locale/ne.js b/lib/javascripts/moment_locale/ne.js
old mode 100644
new mode 100755
index a35947a9e31..2ec063eeda2
--- a/lib/javascripts/moment_locale/ne.js
+++ b/lib/javascripts/moment_locale/ne.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Nepalese [ne]
-//! author : suvash : https://github.com/suvash
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,114 +8,115 @@
 }(this, (function (moment) { 'use strict';
 
 
-var symbolMap = {
-    '1': '१',
-    '2': '२',
-    '3': '३',
-    '4': '४',
-    '5': '५',
-    '6': '६',
-    '7': '७',
-    '8': '८',
-    '9': '९',
-    '0': '०'
-};
-var numberMap = {
-    '१': '1',
-    '२': '2',
-    '३': '3',
-    '४': '4',
-    '५': '5',
-    '६': '6',
-    '७': '7',
-    '८': '8',
-    '९': '9',
-    '०': '0'
-};
+    var symbolMap = {
+        '1': '१',
+        '2': '२',
+        '3': '३',
+        '4': '४',
+        '5': '५',
+        '6': '६',
+        '7': '७',
+        '8': '८',
+        '9': '९',
+        '0': '०'
+    },
+    numberMap = {
+        '१': '1',
+        '२': '2',
+        '३': '3',
+        '४': '4',
+        '५': '5',
+        '६': '6',
+        '७': '7',
+        '८': '8',
+        '९': '9',
+        '०': '0'
+    };
 
-var ne = moment.defineLocale('ne', {
-    months : 'जनवरी_फेब्रुवरी_मार्च_अप्रिल_मई_जुन_जुलाई_अगष्ट_सेप्टेम्बर_अक्टोबर_नोभेम्बर_डिसेम्बर'.split('_'),
-    monthsShort : 'जन._फेब्रु._मार्च_अप्रि._मई_जुन_जुलाई._अग._सेप्ट._अक्टो._नोभे._डिसे.'.split('_'),
-    monthsParseExact : true,
-    weekdays : 'आइतबार_सोमबार_मङ्गलबार_बुधबार_बिहिबार_शुक्रबार_शनिबार'.split('_'),
-    weekdaysShort : 'आइत._सोम._मङ्गल._बुध._बिहि._शुक्र._शनि.'.split('_'),
-    weekdaysMin : 'आ._सो._मं._बु._बि._शु._श.'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'Aको h:mm बजे',
-        LTS : 'Aको h:mm:ss बजे',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY, Aको h:mm बजे',
-        LLLL : 'dddd, D MMMM YYYY, Aको h:mm बजे'
-    },
-    preparse: function (string) {
-        return string.replace(/[१२३४५६७८९०]/g, function (match) {
-            return numberMap[match];
-        });
-    },
-    postformat: function (string) {
-        return string.replace(/\d/g, function (match) {
-            return symbolMap[match];
-        });
-    },
-    meridiemParse: /राति|बिहान|दिउँसो|साँझ/,
-    meridiemHour : function (hour, meridiem) {
-        if (hour === 12) {
-            hour = 0;
+    var ne = moment.defineLocale('ne', {
+        months : 'जनवरी_फेब्रुवरी_मार्च_अप्रिल_मई_जुन_जुलाई_अगष्ट_सेप्टेम्बर_अक्टोबर_नोभेम्बर_डिसेम्बर'.split('_'),
+        monthsShort : 'जन._फेब्रु._मार्च_अप्रि._मई_जुन_जुलाई._अग._सेप्ट._अक्टो._नोभे._डिसे.'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'आइतबार_सोमबार_मङ्गलबार_बुधबार_बिहिबार_शुक्रबार_शनिबार'.split('_'),
+        weekdaysShort : 'आइत._सोम._मङ्गल._बुध._बिहि._शुक्र._शनि.'.split('_'),
+        weekdaysMin : 'आ._सो._मं._बु._बि._शु._श.'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'Aको h:mm बजे',
+            LTS : 'Aको h:mm:ss बजे',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, Aको h:mm बजे',
+            LLLL : 'dddd, D MMMM YYYY, Aको h:mm बजे'
+        },
+        preparse: function (string) {
+            return string.replace(/[१२३४५६७८९०]/g, function (match) {
+                return numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            });
+        },
+        meridiemParse: /राति|बिहान|दिउँसो|साँझ/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'राति') {
+                return hour < 4 ? hour : hour + 12;
+            } else if (meridiem === 'बिहान') {
+                return hour;
+            } else if (meridiem === 'दिउँसो') {
+                return hour >= 10 ? hour : hour + 12;
+            } else if (meridiem === 'साँझ') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 3) {
+                return 'राति';
+            } else if (hour < 12) {
+                return 'बिहान';
+            } else if (hour < 16) {
+                return 'दिउँसो';
+            } else if (hour < 20) {
+                return 'साँझ';
+            } else {
+                return 'राति';
+            }
+        },
+        calendar : {
+            sameDay : '[आज] LT',
+            nextDay : '[भोलि] LT',
+            nextWeek : '[आउँदो] dddd[,] LT',
+            lastDay : '[हिजो] LT',
+            lastWeek : '[गएको] dddd[,] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%sमा',
+            past : '%s अगाडि',
+            s : 'केही क्षण',
+            ss : '%d सेकेण्ड',
+            m : 'एक मिनेट',
+            mm : '%d मिनेट',
+            h : 'एक घण्टा',
+            hh : '%d घण्टा',
+            d : 'एक दिन',
+            dd : '%d दिन',
+            M : 'एक महिना',
+            MM : '%d महिना',
+            y : 'एक बर्ष',
+            yy : '%d बर्ष'
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 1st is the first week of the year.
         }
-        if (meridiem === 'राति') {
-            return hour < 4 ? hour : hour + 12;
-        } else if (meridiem === 'बिहान') {
-            return hour;
-        } else if (meridiem === 'दिउँसो') {
-            return hour >= 10 ? hour : hour + 12;
-        } else if (meridiem === 'साँझ') {
-            return hour + 12;
-        }
-    },
-    meridiem : function (hour, minute, isLower) {
-        if (hour < 3) {
-            return 'राति';
-        } else if (hour < 12) {
-            return 'बिहान';
-        } else if (hour < 16) {
-            return 'दिउँसो';
-        } else if (hour < 20) {
-            return 'साँझ';
-        } else {
-            return 'राति';
-        }
-    },
-    calendar : {
-        sameDay : '[आज] LT',
-        nextDay : '[भोलि] LT',
-        nextWeek : '[आउँदो] dddd[,] LT',
-        lastDay : '[हिजो] LT',
-        lastWeek : '[गएको] dddd[,] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : '%sमा',
-        past : '%s अगाडि',
-        s : 'केही क्षण',
-        m : 'एक मिनेट',
-        mm : '%d मिनेट',
-        h : 'एक घण्टा',
-        hh : '%d घण्टा',
-        d : 'एक दिन',
-        dd : '%d दिन',
-        M : 'एक महिना',
-        MM : '%d महिना',
-        y : 'एक बर्ष',
-        yy : '%d बर्ष'
-    },
-    week : {
-        dow : 0, // Sunday is the first day of the week.
-        doy : 6  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    });
 
-return ne;
+    return ne;
 
 })));
diff --git a/lib/javascripts/moment_locale/nl-be.js b/lib/javascripts/moment_locale/nl-be.js
old mode 100644
new mode 100755
index 8588eab4028..0e5bdc96040
--- a/lib/javascripts/moment_locale/nl-be.js
+++ b/lib/javascripts/moment_locale/nl-be.js
@@ -1,7 +1,4 @@
 //! moment.js locale configuration
-//! locale : Dutch (Belgium) [nl-be]
-//! author : Joris Röling : https://github.com/jorisroling
-//! author : Jacob Middag : https://github.com/middagj
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -11,78 +8,79 @@
 }(this, (function (moment) { 'use strict';
 
 
-var monthsShortWithDots = 'jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.'.split('_');
-var monthsShortWithoutDots = 'jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec'.split('_');
+    var monthsShortWithDots = 'jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.'.split('_'),
+        monthsShortWithoutDots = 'jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec'.split('_');
 
-var monthsParse = [/^jan/i, /^feb/i, /^maart|mrt.?$/i, /^apr/i, /^mei$/i, /^jun[i.]?$/i, /^jul[i.]?$/i, /^aug/i, /^sep/i, /^okt/i, /^nov/i, /^dec/i];
-var monthsRegex = /^(januari|februari|maart|april|mei|april|ju[nl]i|augustus|september|oktober|november|december|jan\.?|feb\.?|mrt\.?|apr\.?|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i;
+    var monthsParse = [/^jan/i, /^feb/i, /^maart|mrt.?$/i, /^apr/i, /^mei$/i, /^jun[i.]?$/i, /^jul[i.]?$/i, /^aug/i, /^sep/i, /^okt/i, /^nov/i, /^dec/i];
+    var monthsRegex = /^(januari|februari|maart|april|mei|april|ju[nl]i|augustus|september|oktober|november|december|jan\.?|feb\.?|mrt\.?|apr\.?|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i;
 
-var nlBe = moment.defineLocale('nl-be', {
-    months : 'januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december'.split('_'),
-    monthsShort : function (m, format) {
-        if (!m) {
-            return monthsShortWithDots;
-        } else if (/-MMM-/.test(format)) {
-            return monthsShortWithoutDots[m.month()];
-        } else {
-            return monthsShortWithDots[m.month()];
+    var nlBe = moment.defineLocale('nl-be', {
+        months : 'januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december'.split('_'),
+        monthsShort : function (m, format) {
+            if (!m) {
+                return monthsShortWithDots;
+            } else if (/-MMM-/.test(format)) {
+                return monthsShortWithoutDots[m.month()];
+            } else {
+                return monthsShortWithDots[m.month()];
+            }
+        },
+
+        monthsRegex: monthsRegex,
+        monthsShortRegex: monthsRegex,
+        monthsStrictRegex: /^(januari|februari|maart|mei|ju[nl]i|april|augustus|september|oktober|november|december)/i,
+        monthsShortStrictRegex: /^(jan\.?|feb\.?|mrt\.?|apr\.?|mei|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i,
+
+        monthsParse : monthsParse,
+        longMonthsParse : monthsParse,
+        shortMonthsParse : monthsParse,
+
+        weekdays : 'zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag'.split('_'),
+        weekdaysShort : 'zo._ma._di._wo._do._vr._za.'.split('_'),
+        weekdaysMin : 'zo_ma_di_wo_do_vr_za'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[vandaag om] LT',
+            nextDay: '[morgen om] LT',
+            nextWeek: 'dddd [om] LT',
+            lastDay: '[gisteren om] LT',
+            lastWeek: '[afgelopen] dddd [om] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'over %s',
+            past : '%s geleden',
+            s : 'een paar seconden',
+            ss : '%d seconden',
+            m : 'één minuut',
+            mm : '%d minuten',
+            h : 'één uur',
+            hh : '%d uur',
+            d : 'één dag',
+            dd : '%d dagen',
+            M : 'één maand',
+            MM : '%d maanden',
+            y : 'één jaar',
+            yy : '%d jaar'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/,
+        ordinal : function (number) {
+            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
-    },
+    });
 
-    monthsRegex: monthsRegex,
-    monthsShortRegex: monthsRegex,
-    monthsStrictRegex: /^(januari|februari|maart|mei|ju[nl]i|april|augustus|september|oktober|november|december)/i,
-    monthsShortStrictRegex: /^(jan\.?|feb\.?|mrt\.?|apr\.?|mei|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i,
-
-    monthsParse : monthsParse,
-    longMonthsParse : monthsParse,
-    shortMonthsParse : monthsParse,
-
-    weekdays : 'zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag'.split('_'),
-    weekdaysShort : 'zo._ma._di._wo._do._vr._za.'.split('_'),
-    weekdaysMin : 'Zo_Ma_Di_Wo_Do_Vr_Za'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd D MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay: '[vandaag om] LT',
-        nextDay: '[morgen om] LT',
-        nextWeek: 'dddd [om] LT',
-        lastDay: '[gisteren om] LT',
-        lastWeek: '[afgelopen] dddd [om] LT',
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'over %s',
-        past : '%s geleden',
-        s : 'een paar seconden',
-        m : 'één minuut',
-        mm : '%d minuten',
-        h : 'één uur',
-        hh : '%d uur',
-        d : 'één dag',
-        dd : '%d dagen',
-        M : 'één maand',
-        MM : '%d maanden',
-        y : 'één jaar',
-        yy : '%d jaar'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/,
-    ordinal : function (number) {
-        return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
-
-return nlBe;
+    return nlBe;
 
 })));
diff --git a/lib/javascripts/moment_locale/nl.js b/lib/javascripts/moment_locale/nl.js
old mode 100644
new mode 100755
index 2863b08c747..842f4fe1fab
--- a/lib/javascripts/moment_locale/nl.js
+++ b/lib/javascripts/moment_locale/nl.js
@@ -1,7 +1,4 @@
 //! moment.js locale configuration
-//! locale : Dutch [nl]
-//! author : Joris Röling : https://github.com/jorisroling
-//! author : Jacob Middag : https://github.com/middagj
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -11,78 +8,79 @@
 }(this, (function (moment) { 'use strict';
 
 
-var monthsShortWithDots = 'jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.'.split('_');
-var monthsShortWithoutDots = 'jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec'.split('_');
+    var monthsShortWithDots = 'jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.'.split('_'),
+        monthsShortWithoutDots = 'jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec'.split('_');
 
-var monthsParse = [/^jan/i, /^feb/i, /^maart|mrt.?$/i, /^apr/i, /^mei$/i, /^jun[i.]?$/i, /^jul[i.]?$/i, /^aug/i, /^sep/i, /^okt/i, /^nov/i, /^dec/i];
-var monthsRegex = /^(januari|februari|maart|april|mei|april|ju[nl]i|augustus|september|oktober|november|december|jan\.?|feb\.?|mrt\.?|apr\.?|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i;
+    var monthsParse = [/^jan/i, /^feb/i, /^maart|mrt.?$/i, /^apr/i, /^mei$/i, /^jun[i.]?$/i, /^jul[i.]?$/i, /^aug/i, /^sep/i, /^okt/i, /^nov/i, /^dec/i];
+    var monthsRegex = /^(januari|februari|maart|april|mei|april|ju[nl]i|augustus|september|oktober|november|december|jan\.?|feb\.?|mrt\.?|apr\.?|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i;
 
-var nl = moment.defineLocale('nl', {
-    months : 'januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december'.split('_'),
-    monthsShort : function (m, format) {
-        if (!m) {
-            return monthsShortWithDots;
-        } else if (/-MMM-/.test(format)) {
-            return monthsShortWithoutDots[m.month()];
-        } else {
-            return monthsShortWithDots[m.month()];
+    var nl = moment.defineLocale('nl', {
+        months : 'januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december'.split('_'),
+        monthsShort : function (m, format) {
+            if (!m) {
+                return monthsShortWithDots;
+            } else if (/-MMM-/.test(format)) {
+                return monthsShortWithoutDots[m.month()];
+            } else {
+                return monthsShortWithDots[m.month()];
+            }
+        },
+
+        monthsRegex: monthsRegex,
+        monthsShortRegex: monthsRegex,
+        monthsStrictRegex: /^(januari|februari|maart|mei|ju[nl]i|april|augustus|september|oktober|november|december)/i,
+        monthsShortStrictRegex: /^(jan\.?|feb\.?|mrt\.?|apr\.?|mei|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i,
+
+        monthsParse : monthsParse,
+        longMonthsParse : monthsParse,
+        shortMonthsParse : monthsParse,
+
+        weekdays : 'zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag'.split('_'),
+        weekdaysShort : 'zo._ma._di._wo._do._vr._za.'.split('_'),
+        weekdaysMin : 'zo_ma_di_wo_do_vr_za'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD-MM-YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[vandaag om] LT',
+            nextDay: '[morgen om] LT',
+            nextWeek: 'dddd [om] LT',
+            lastDay: '[gisteren om] LT',
+            lastWeek: '[afgelopen] dddd [om] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'over %s',
+            past : '%s geleden',
+            s : 'een paar seconden',
+            ss : '%d seconden',
+            m : 'één minuut',
+            mm : '%d minuten',
+            h : 'één uur',
+            hh : '%d uur',
+            d : 'één dag',
+            dd : '%d dagen',
+            M : 'één maand',
+            MM : '%d maanden',
+            y : 'één jaar',
+            yy : '%d jaar'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/,
+        ordinal : function (number) {
+            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
-    },
+    });
 
-    monthsRegex: monthsRegex,
-    monthsShortRegex: monthsRegex,
-    monthsStrictRegex: /^(januari|februari|maart|mei|ju[nl]i|april|augustus|september|oktober|november|december)/i,
-    monthsShortStrictRegex: /^(jan\.?|feb\.?|mrt\.?|apr\.?|mei|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i,
-
-    monthsParse : monthsParse,
-    longMonthsParse : monthsParse,
-    shortMonthsParse : monthsParse,
-
-    weekdays : 'zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag'.split('_'),
-    weekdaysShort : 'zo._ma._di._wo._do._vr._za.'.split('_'),
-    weekdaysMin : 'Zo_Ma_Di_Wo_Do_Vr_Za'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD-MM-YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd D MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay: '[vandaag om] LT',
-        nextDay: '[morgen om] LT',
-        nextWeek: 'dddd [om] LT',
-        lastDay: '[gisteren om] LT',
-        lastWeek: '[afgelopen] dddd [om] LT',
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'over %s',
-        past : '%s geleden',
-        s : 'een paar seconden',
-        m : 'één minuut',
-        mm : '%d minuten',
-        h : 'één uur',
-        hh : '%d uur',
-        d : 'één dag',
-        dd : '%d dagen',
-        M : 'één maand',
-        MM : '%d maanden',
-        y : 'één jaar',
-        yy : '%d jaar'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/,
-    ordinal : function (number) {
-        return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
-
-return nl;
+    return nl;
 
 })));
diff --git a/lib/javascripts/moment_locale/nn.js b/lib/javascripts/moment_locale/nn.js
old mode 100644
new mode 100755
index 90dda8c6c50..5fa355043f0
--- a/lib/javascripts/moment_locale/nn.js
+++ b/lib/javascripts/moment_locale/nn.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Nynorsk [nn]
-//! author : https://github.com/mechuwind
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,51 +8,52 @@
 }(this, (function (moment) { 'use strict';
 
 
-var nn = moment.defineLocale('nn', {
-    months : 'januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
-    monthsShort : 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),
-    weekdays : 'sundag_måndag_tysdag_onsdag_torsdag_fredag_laurdag'.split('_'),
-    weekdaysShort : 'sun_mån_tys_ons_tor_fre_lau'.split('_'),
-    weekdaysMin : 'su_må_ty_on_to_fr_lø'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D. MMMM YYYY',
-        LLL : 'D. MMMM YYYY [kl.] H:mm',
-        LLLL : 'dddd D. MMMM YYYY [kl.] HH:mm'
-    },
-    calendar : {
-        sameDay: '[I dag klokka] LT',
-        nextDay: '[I morgon klokka] LT',
-        nextWeek: 'dddd [klokka] LT',
-        lastDay: '[I går klokka] LT',
-        lastWeek: '[Føregåande] dddd [klokka] LT',
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'om %s',
-        past : '%s sidan',
-        s : 'nokre sekund',
-        m : 'eit minutt',
-        mm : '%d minutt',
-        h : 'ein time',
-        hh : '%d timar',
-        d : 'ein dag',
-        dd : '%d dagar',
-        M : 'ein månad',
-        MM : '%d månader',
-        y : 'eit år',
-        yy : '%d år'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    var nn = moment.defineLocale('nn', {
+        months : 'januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),
+        weekdays : 'sundag_måndag_tysdag_onsdag_torsdag_fredag_laurdag'.split('_'),
+        weekdaysShort : 'sun_mån_tys_ons_tor_fre_lau'.split('_'),
+        weekdaysMin : 'su_må_ty_on_to_fr_lø'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY [kl.] H:mm',
+            LLLL : 'dddd D. MMMM YYYY [kl.] HH:mm'
+        },
+        calendar : {
+            sameDay: '[I dag klokka] LT',
+            nextDay: '[I morgon klokka] LT',
+            nextWeek: 'dddd [klokka] LT',
+            lastDay: '[I går klokka] LT',
+            lastWeek: '[Føregåande] dddd [klokka] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'om %s',
+            past : '%s sidan',
+            s : 'nokre sekund',
+            ss : '%d sekund',
+            m : 'eit minutt',
+            mm : '%d minutt',
+            h : 'ein time',
+            hh : '%d timar',
+            d : 'ein dag',
+            dd : '%d dagar',
+            M : 'ein månad',
+            MM : '%d månader',
+            y : 'eit år',
+            yy : '%d år'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-return nn;
+    return nn;
 
 })));
diff --git a/lib/javascripts/moment_locale/pa-in.js b/lib/javascripts/moment_locale/pa-in.js
old mode 100644
new mode 100755
index 6dec8d17243..f17b8dd9ba0
--- a/lib/javascripts/moment_locale/pa-in.js
+++ b/lib/javascripts/moment_locale/pa-in.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Punjabi (India) [pa-in]
-//! author : Harpreet Singh : https://github.com/harpreetkhalsagtbit
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,115 +8,116 @@
 }(this, (function (moment) { 'use strict';
 
 
-var symbolMap = {
-    '1': '੧',
-    '2': '੨',
-    '3': '੩',
-    '4': '੪',
-    '5': '੫',
-    '6': '੬',
-    '7': '੭',
-    '8': '੮',
-    '9': '੯',
-    '0': '੦'
-};
-var numberMap = {
-    '੧': '1',
-    '੨': '2',
-    '੩': '3',
-    '੪': '4',
-    '੫': '5',
-    '੬': '6',
-    '੭': '7',
-    '੮': '8',
-    '੯': '9',
-    '੦': '0'
-};
+    var symbolMap = {
+        '1': '੧',
+        '2': '੨',
+        '3': '੩',
+        '4': '੪',
+        '5': '੫',
+        '6': '੬',
+        '7': '੭',
+        '8': '੮',
+        '9': '੯',
+        '0': '੦'
+    },
+    numberMap = {
+        '੧': '1',
+        '੨': '2',
+        '੩': '3',
+        '੪': '4',
+        '੫': '5',
+        '੬': '6',
+        '੭': '7',
+        '੮': '8',
+        '੯': '9',
+        '੦': '0'
+    };
 
-var paIn = moment.defineLocale('pa-in', {
-    // There are months name as per Nanakshahi Calender but they are not used as rigidly in modern Punjabi.
-    months : 'ਜਨਵਰੀ_ਫ਼ਰਵਰੀ_ਮਾਰਚ_ਅਪ੍ਰੈਲ_ਮਈ_ਜੂਨ_ਜੁਲਾਈ_ਅਗਸਤ_ਸਤੰਬਰ_ਅਕਤੂਬਰ_ਨਵੰਬਰ_ਦਸੰਬਰ'.split('_'),
-    monthsShort : 'ਜਨਵਰੀ_ਫ਼ਰਵਰੀ_ਮਾਰਚ_ਅਪ੍ਰੈਲ_ਮਈ_ਜੂਨ_ਜੁਲਾਈ_ਅਗਸਤ_ਸਤੰਬਰ_ਅਕਤੂਬਰ_ਨਵੰਬਰ_ਦਸੰਬਰ'.split('_'),
-    weekdays : 'ਐਤਵਾਰ_ਸੋਮਵਾਰ_ਮੰਗਲਵਾਰ_ਬੁਧਵਾਰ_ਵੀਰਵਾਰ_ਸ਼ੁੱਕਰਵਾਰ_ਸ਼ਨੀਚਰਵਾਰ'.split('_'),
-    weekdaysShort : 'ਐਤ_ਸੋਮ_ਮੰਗਲ_ਬੁਧ_ਵੀਰ_ਸ਼ੁਕਰ_ਸ਼ਨੀ'.split('_'),
-    weekdaysMin : 'ਐਤ_ਸੋਮ_ਮੰਗਲ_ਬੁਧ_ਵੀਰ_ਸ਼ੁਕਰ_ਸ਼ਨੀ'.split('_'),
-    longDateFormat : {
-        LT : 'A h:mm ਵਜੇ',
-        LTS : 'A h:mm:ss ਵਜੇ',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY, A h:mm ਵਜੇ',
-        LLLL : 'dddd, D MMMM YYYY, A h:mm ਵਜੇ'
-    },
-    calendar : {
-        sameDay : '[ਅਜ] LT',
-        nextDay : '[ਕਲ] LT',
-        nextWeek : 'dddd, LT',
-        lastDay : '[ਕਲ] LT',
-        lastWeek : '[ਪਿਛਲੇ] dddd, LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : '%s ਵਿੱਚ',
-        past : '%s ਪਿਛਲੇ',
-        s : 'ਕੁਝ ਸਕਿੰਟ',
-        m : 'ਇਕ ਮਿੰਟ',
-        mm : '%d ਮਿੰਟ',
-        h : 'ਇੱਕ ਘੰਟਾ',
-        hh : '%d ਘੰਟੇ',
-        d : 'ਇੱਕ ਦਿਨ',
-        dd : '%d ਦਿਨ',
-        M : 'ਇੱਕ ਮਹੀਨਾ',
-        MM : '%d ਮਹੀਨੇ',
-        y : 'ਇੱਕ ਸਾਲ',
-        yy : '%d ਸਾਲ'
-    },
-    preparse: function (string) {
-        return string.replace(/[੧੨੩੪੫੬੭੮੯੦]/g, function (match) {
-            return numberMap[match];
-        });
-    },
-    postformat: function (string) {
-        return string.replace(/\d/g, function (match) {
-            return symbolMap[match];
-        });
-    },
-    // Punjabi notation for meridiems are quite fuzzy in practice. While there exists
-    // a rigid notion of a 'Pahar' it is not used as rigidly in modern Punjabi.
-    meridiemParse: /ਰਾਤ|ਸਵੇਰ|ਦੁਪਹਿਰ|ਸ਼ਾਮ/,
-    meridiemHour : function (hour, meridiem) {
-        if (hour === 12) {
-            hour = 0;
+    var paIn = moment.defineLocale('pa-in', {
+        // There are months name as per Nanakshahi Calender but they are not used as rigidly in modern Punjabi.
+        months : 'ਜਨਵਰੀ_ਫ਼ਰਵਰੀ_ਮਾਰਚ_ਅਪ੍ਰੈਲ_ਮਈ_ਜੂਨ_ਜੁਲਾਈ_ਅਗਸਤ_ਸਤੰਬਰ_ਅਕਤੂਬਰ_ਨਵੰਬਰ_ਦਸੰਬਰ'.split('_'),
+        monthsShort : 'ਜਨਵਰੀ_ਫ਼ਰਵਰੀ_ਮਾਰਚ_ਅਪ੍ਰੈਲ_ਮਈ_ਜੂਨ_ਜੁਲਾਈ_ਅਗਸਤ_ਸਤੰਬਰ_ਅਕਤੂਬਰ_ਨਵੰਬਰ_ਦਸੰਬਰ'.split('_'),
+        weekdays : 'ਐਤਵਾਰ_ਸੋਮਵਾਰ_ਮੰਗਲਵਾਰ_ਬੁਧਵਾਰ_ਵੀਰਵਾਰ_ਸ਼ੁੱਕਰਵਾਰ_ਸ਼ਨੀਚਰਵਾਰ'.split('_'),
+        weekdaysShort : 'ਐਤ_ਸੋਮ_ਮੰਗਲ_ਬੁਧ_ਵੀਰ_ਸ਼ੁਕਰ_ਸ਼ਨੀ'.split('_'),
+        weekdaysMin : 'ਐਤ_ਸੋਮ_ਮੰਗਲ_ਬੁਧ_ਵੀਰ_ਸ਼ੁਕਰ_ਸ਼ਨੀ'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm ਵਜੇ',
+            LTS : 'A h:mm:ss ਵਜੇ',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, A h:mm ਵਜੇ',
+            LLLL : 'dddd, D MMMM YYYY, A h:mm ਵਜੇ'
+        },
+        calendar : {
+            sameDay : '[ਅਜ] LT',
+            nextDay : '[ਕਲ] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[ਕਲ] LT',
+            lastWeek : '[ਪਿਛਲੇ] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s ਵਿੱਚ',
+            past : '%s ਪਿਛਲੇ',
+            s : 'ਕੁਝ ਸਕਿੰਟ',
+            ss : '%d ਸਕਿੰਟ',
+            m : 'ਇਕ ਮਿੰਟ',
+            mm : '%d ਮਿੰਟ',
+            h : 'ਇੱਕ ਘੰਟਾ',
+            hh : '%d ਘੰਟੇ',
+            d : 'ਇੱਕ ਦਿਨ',
+            dd : '%d ਦਿਨ',
+            M : 'ਇੱਕ ਮਹੀਨਾ',
+            MM : '%d ਮਹੀਨੇ',
+            y : 'ਇੱਕ ਸਾਲ',
+            yy : '%d ਸਾਲ'
+        },
+        preparse: function (string) {
+            return string.replace(/[੧੨੩੪੫੬੭੮੯੦]/g, function (match) {
+                return numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            });
+        },
+        // Punjabi notation for meridiems are quite fuzzy in practice. While there exists
+        // a rigid notion of a 'Pahar' it is not used as rigidly in modern Punjabi.
+        meridiemParse: /ਰਾਤ|ਸਵੇਰ|ਦੁਪਹਿਰ|ਸ਼ਾਮ/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'ਰਾਤ') {
+                return hour < 4 ? hour : hour + 12;
+            } else if (meridiem === 'ਸਵੇਰ') {
+                return hour;
+            } else if (meridiem === 'ਦੁਪਹਿਰ') {
+                return hour >= 10 ? hour : hour + 12;
+            } else if (meridiem === 'ਸ਼ਾਮ') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'ਰਾਤ';
+            } else if (hour < 10) {
+                return 'ਸਵੇਰ';
+            } else if (hour < 17) {
+                return 'ਦੁਪਹਿਰ';
+            } else if (hour < 20) {
+                return 'ਸ਼ਾਮ';
+            } else {
+                return 'ਰਾਤ';
+            }
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 1st is the first week of the year.
         }
-        if (meridiem === 'ਰਾਤ') {
-            return hour < 4 ? hour : hour + 12;
-        } else if (meridiem === 'ਸਵੇਰ') {
-            return hour;
-        } else if (meridiem === 'ਦੁਪਹਿਰ') {
-            return hour >= 10 ? hour : hour + 12;
-        } else if (meridiem === 'ਸ਼ਾਮ') {
-            return hour + 12;
-        }
-    },
-    meridiem : function (hour, minute, isLower) {
-        if (hour < 4) {
-            return 'ਰਾਤ';
-        } else if (hour < 10) {
-            return 'ਸਵੇਰ';
-        } else if (hour < 17) {
-            return 'ਦੁਪਹਿਰ';
-        } else if (hour < 20) {
-            return 'ਸ਼ਾਮ';
-        } else {
-            return 'ਰਾਤ';
-        }
-    },
-    week : {
-        dow : 0, // Sunday is the first day of the week.
-        doy : 6  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    });
 
-return paIn;
+    return paIn;
 
 })));
diff --git a/lib/javascripts/moment_locale/pl.js b/lib/javascripts/moment_locale/pl.js
old mode 100644
new mode 100755
index af2c331f22c..4c9c71a0c63
--- a/lib/javascripts/moment_locale/pl.js
+++ b/lib/javascripts/moment_locale/pl.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Polish [pl]
-//! author : Rafal Hirsz : https://github.com/evoL
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,98 +8,118 @@
 }(this, (function (moment) { 'use strict';
 
 
-var monthsNominative = 'styczeń_luty_marzec_kwiecień_maj_czerwiec_lipiec_sierpień_wrzesień_październik_listopad_grudzień'.split('_');
-var monthsSubjective = 'stycznia_lutego_marca_kwietnia_maja_czerwca_lipca_sierpnia_września_października_listopada_grudnia'.split('_');
-function plural(n) {
-    return (n % 10 < 5) && (n % 10 > 1) && ((~~(n / 10) % 10) !== 1);
-}
-function translate(number, withoutSuffix, key) {
-    var result = number + ' ';
-    switch (key) {
-        case 'm':
-            return withoutSuffix ? 'minuta' : 'minutę';
-        case 'mm':
-            return result + (plural(number) ? 'minuty' : 'minut');
-        case 'h':
-            return withoutSuffix  ? 'godzina'  : 'godzinę';
-        case 'hh':
-            return result + (plural(number) ? 'godziny' : 'godzin');
-        case 'MM':
-            return result + (plural(number) ? 'miesiące' : 'miesięcy');
-        case 'yy':
-            return result + (plural(number) ? 'lata' : 'lat');
+    var monthsNominative = 'styczeń_luty_marzec_kwiecień_maj_czerwiec_lipiec_sierpień_wrzesień_październik_listopad_grudzień'.split('_'),
+        monthsSubjective = 'stycznia_lutego_marca_kwietnia_maja_czerwca_lipca_sierpnia_września_października_listopada_grudnia'.split('_');
+    function plural(n) {
+        return (n % 10 < 5) && (n % 10 > 1) && ((~~(n / 10) % 10) !== 1);
     }
-}
-
-var pl = moment.defineLocale('pl', {
-    months : function (momentToFormat, format) {
-        if (!momentToFormat) {
-            return monthsNominative;
-        } else if (format === '') {
-            // Hack: if format empty we know this is used to generate
-            // RegExp by moment. Give then back both valid forms of months
-            // in RegExp ready format.
-            return '(' + monthsSubjective[momentToFormat.month()] + '|' + monthsNominative[momentToFormat.month()] + ')';
-        } else if (/D MMMM/.test(format)) {
-            return monthsSubjective[momentToFormat.month()];
-        } else {
-            return monthsNominative[momentToFormat.month()];
+    function translate(number, withoutSuffix, key) {
+        var result = number + ' ';
+        switch (key) {
+            case 'ss':
+                return result + (plural(number) ? 'sekundy' : 'sekund');
+            case 'm':
+                return withoutSuffix ? 'minuta' : 'minutę';
+            case 'mm':
+                return result + (plural(number) ? 'minuty' : 'minut');
+            case 'h':
+                return withoutSuffix  ? 'godzina'  : 'godzinę';
+            case 'hh':
+                return result + (plural(number) ? 'godziny' : 'godzin');
+            case 'MM':
+                return result + (plural(number) ? 'miesiące' : 'miesięcy');
+            case 'yy':
+                return result + (plural(number) ? 'lata' : 'lat');
         }
-    },
-    monthsShort : 'sty_lut_mar_kwi_maj_cze_lip_sie_wrz_paź_lis_gru'.split('_'),
-    weekdays : 'niedziela_poniedziałek_wtorek_środa_czwartek_piątek_sobota'.split('_'),
-    weekdaysShort : 'ndz_pon_wt_śr_czw_pt_sob'.split('_'),
-    weekdaysMin : 'Nd_Pn_Wt_Śr_Cz_Pt_So'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd, D MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay: '[Dziś o] LT',
-        nextDay: '[Jutro o] LT',
-        nextWeek: '[W] dddd [o] LT',
-        lastDay: '[Wczoraj o] LT',
-        lastWeek: function () {
-            switch (this.day()) {
-                case 0:
-                    return '[W zeszłą niedzielę o] LT';
-                case 3:
-                    return '[W zeszłą środę o] LT';
-                case 6:
-                    return '[W zeszłą sobotę o] LT';
-                default:
-                    return '[W zeszły] dddd [o] LT';
+    }
+
+    var pl = moment.defineLocale('pl', {
+        months : function (momentToFormat, format) {
+            if (!momentToFormat) {
+                return monthsNominative;
+            } else if (format === '') {
+                // Hack: if format empty we know this is used to generate
+                // RegExp by moment. Give then back both valid forms of months
+                // in RegExp ready format.
+                return '(' + monthsSubjective[momentToFormat.month()] + '|' + monthsNominative[momentToFormat.month()] + ')';
+            } else if (/D MMMM/.test(format)) {
+                return monthsSubjective[momentToFormat.month()];
+            } else {
+                return monthsNominative[momentToFormat.month()];
             }
         },
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'za %s',
-        past : '%s temu',
-        s : 'kilka sekund',
-        m : translate,
-        mm : translate,
-        h : translate,
-        hh : translate,
-        d : '1 dzień',
-        dd : '%d dni',
-        M : 'miesiąc',
-        MM : translate,
-        y : 'rok',
-        yy : translate
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+        monthsShort : 'sty_lut_mar_kwi_maj_cze_lip_sie_wrz_paź_lis_gru'.split('_'),
+        weekdays : 'niedziela_poniedziałek_wtorek_środa_czwartek_piątek_sobota'.split('_'),
+        weekdaysShort : 'ndz_pon_wt_śr_czw_pt_sob'.split('_'),
+        weekdaysMin : 'Nd_Pn_Wt_Śr_Cz_Pt_So'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[Dziś o] LT',
+            nextDay: '[Jutro o] LT',
+            nextWeek: function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[W niedzielę o] LT';
 
-return pl;
+                    case 2:
+                        return '[We wtorek o] LT';
+
+                    case 3:
+                        return '[W środę o] LT';
+
+                    case 6:
+                        return '[W sobotę o] LT';
+
+                    default:
+                        return '[W] dddd [o] LT';
+                }
+            },
+            lastDay: '[Wczoraj o] LT',
+            lastWeek: function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[W zeszłą niedzielę o] LT';
+                    case 3:
+                        return '[W zeszłą środę o] LT';
+                    case 6:
+                        return '[W zeszłą sobotę o] LT';
+                    default:
+                        return '[W zeszły] dddd [o] LT';
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past : '%s temu',
+            s : 'kilka sekund',
+            ss : translate,
+            m : translate,
+            mm : translate,
+            h : translate,
+            hh : translate,
+            d : '1 dzień',
+            dd : '%d dni',
+            M : 'miesiąc',
+            MM : translate,
+            y : 'rok',
+            yy : translate
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return pl;
 
 })));
diff --git a/lib/javascripts/moment_locale/pt-br.js b/lib/javascripts/moment_locale/pt-br.js
old mode 100644
new mode 100755
index dbcd0fdc1a0..64e0d01e7df
--- a/lib/javascripts/moment_locale/pt-br.js
+++ b/lib/javascripts/moment_locale/pt-br.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Portuguese (Brazil) [pt-br]
-//! author : Caio Ribeiro Pereira : https://github.com/caio-ribeiro-pereira
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,52 +8,53 @@
 }(this, (function (moment) { 'use strict';
 
 
-var ptBr = moment.defineLocale('pt-br', {
-    months : 'Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro'.split('_'),
-    monthsShort : 'Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez'.split('_'),
-    weekdays : 'Domingo_Segunda-feira_Terça-feira_Quarta-feira_Quinta-feira_Sexta-feira_Sábado'.split('_'),
-    weekdaysShort : 'Dom_Seg_Ter_Qua_Qui_Sex_Sáb'.split('_'),
-    weekdaysMin : 'Do_2ª_3ª_4ª_5ª_6ª_Sá'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D [de] MMMM [de] YYYY',
-        LLL : 'D [de] MMMM [de] YYYY [às] HH:mm',
-        LLLL : 'dddd, D [de] MMMM [de] YYYY [às] HH:mm'
-    },
-    calendar : {
-        sameDay: '[Hoje às] LT',
-        nextDay: '[Amanhã às] LT',
-        nextWeek: 'dddd [às] LT',
-        lastDay: '[Ontem às] LT',
-        lastWeek: function () {
-            return (this.day() === 0 || this.day() === 6) ?
-                '[Último] dddd [às] LT' : // Saturday + Sunday
-                '[Última] dddd [às] LT'; // Monday - Friday
+    var ptBr = moment.defineLocale('pt-br', {
+        months : 'janeiro_fevereiro_março_abril_maio_junho_julho_agosto_setembro_outubro_novembro_dezembro'.split('_'),
+        monthsShort : 'jan_fev_mar_abr_mai_jun_jul_ago_set_out_nov_dez'.split('_'),
+        weekdays : 'Domingo_Segunda-feira_Terça-feira_Quarta-feira_Quinta-feira_Sexta-feira_Sábado'.split('_'),
+        weekdaysShort : 'Dom_Seg_Ter_Qua_Qui_Sex_Sáb'.split('_'),
+        weekdaysMin : 'Do_2ª_3ª_4ª_5ª_6ª_Sá'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D [de] MMMM [de] YYYY',
+            LLL : 'D [de] MMMM [de] YYYY [às] HH:mm',
+            LLLL : 'dddd, D [de] MMMM [de] YYYY [às] HH:mm'
         },
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'em %s',
-        past : '%s atrás',
-        s : 'poucos segundos',
-        m : 'um minuto',
-        mm : '%d minutos',
-        h : 'uma hora',
-        hh : '%d horas',
-        d : 'um dia',
-        dd : '%d dias',
-        M : 'um mês',
-        MM : '%d meses',
-        y : 'um ano',
-        yy : '%d anos'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}º/,
-    ordinal : '%dº'
-});
+        calendar : {
+            sameDay: '[Hoje às] LT',
+            nextDay: '[Amanhã às] LT',
+            nextWeek: 'dddd [às] LT',
+            lastDay: '[Ontem às] LT',
+            lastWeek: function () {
+                return (this.day() === 0 || this.day() === 6) ?
+                    '[Último] dddd [às] LT' : // Saturday + Sunday
+                    '[Última] dddd [às] LT'; // Monday - Friday
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'em %s',
+            past : 'há %s',
+            s : 'poucos segundos',
+            ss : '%d segundos',
+            m : 'um minuto',
+            mm : '%d minutos',
+            h : 'uma hora',
+            hh : '%d horas',
+            d : 'um dia',
+            dd : '%d dias',
+            M : 'um mês',
+            MM : '%d meses',
+            y : 'um ano',
+            yy : '%d anos'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}º/,
+        ordinal : '%dº'
+    });
 
-return ptBr;
+    return ptBr;
 
 })));
diff --git a/lib/javascripts/moment_locale/pt.js b/lib/javascripts/moment_locale/pt.js
old mode 100644
new mode 100755
index 2d7175cda66..b21ac45b616
--- a/lib/javascripts/moment_locale/pt.js
+++ b/lib/javascripts/moment_locale/pt.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Portuguese [pt]
-//! author : Jefferson : https://github.com/jalex79
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,56 +8,57 @@
 }(this, (function (moment) { 'use strict';
 
 
-var pt = moment.defineLocale('pt', {
-    months : 'Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro'.split('_'),
-    monthsShort : 'Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez'.split('_'),
-    weekdays : 'Domingo_Segunda-Feira_Terça-Feira_Quarta-Feira_Quinta-Feira_Sexta-Feira_Sábado'.split('_'),
-    weekdaysShort : 'Dom_Seg_Ter_Qua_Qui_Sex_Sáb'.split('_'),
-    weekdaysMin : 'Do_2ª_3ª_4ª_5ª_6ª_Sá'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D [de] MMMM [de] YYYY',
-        LLL : 'D [de] MMMM [de] YYYY HH:mm',
-        LLLL : 'dddd, D [de] MMMM [de] YYYY HH:mm'
-    },
-    calendar : {
-        sameDay: '[Hoje às] LT',
-        nextDay: '[Amanhã às] LT',
-        nextWeek: 'dddd [às] LT',
-        lastDay: '[Ontem às] LT',
-        lastWeek: function () {
-            return (this.day() === 0 || this.day() === 6) ?
-                '[Último] dddd [às] LT' : // Saturday + Sunday
-                '[Última] dddd [às] LT'; // Monday - Friday
+    var pt = moment.defineLocale('pt', {
+        months : 'janeiro_fevereiro_março_abril_maio_junho_julho_agosto_setembro_outubro_novembro_dezembro'.split('_'),
+        monthsShort : 'jan_fev_mar_abr_mai_jun_jul_ago_set_out_nov_dez'.split('_'),
+        weekdays : 'Domingo_Segunda-feira_Terça-feira_Quarta-feira_Quinta-feira_Sexta-feira_Sábado'.split('_'),
+        weekdaysShort : 'Dom_Seg_Ter_Qua_Qui_Sex_Sáb'.split('_'),
+        weekdaysMin : 'Do_2ª_3ª_4ª_5ª_6ª_Sá'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D [de] MMMM [de] YYYY',
+            LLL : 'D [de] MMMM [de] YYYY HH:mm',
+            LLLL : 'dddd, D [de] MMMM [de] YYYY HH:mm'
         },
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'em %s',
-        past : 'há %s',
-        s : 'segundos',
-        m : 'um minuto',
-        mm : '%d minutos',
-        h : 'uma hora',
-        hh : '%d horas',
-        d : 'um dia',
-        dd : '%d dias',
-        M : 'um mês',
-        MM : '%d meses',
-        y : 'um ano',
-        yy : '%d anos'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}º/,
-    ordinal : '%dº',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+        calendar : {
+            sameDay: '[Hoje às] LT',
+            nextDay: '[Amanhã às] LT',
+            nextWeek: 'dddd [às] LT',
+            lastDay: '[Ontem às] LT',
+            lastWeek: function () {
+                return (this.day() === 0 || this.day() === 6) ?
+                    '[Último] dddd [às] LT' : // Saturday + Sunday
+                    '[Última] dddd [às] LT'; // Monday - Friday
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'em %s',
+            past : 'há %s',
+            s : 'segundos',
+            ss : '%d segundos',
+            m : 'um minuto',
+            mm : '%d minutos',
+            h : 'uma hora',
+            hh : '%d horas',
+            d : 'um dia',
+            dd : '%d dias',
+            M : 'um mês',
+            MM : '%d meses',
+            y : 'um ano',
+            yy : '%d anos'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}º/,
+        ordinal : '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-return pt;
+    return pt;
 
 })));
diff --git a/lib/javascripts/moment_locale/ro.js b/lib/javascripts/moment_locale/ro.js
old mode 100644
new mode 100755
index 8a0cd7501ad..47ec3d602dc
--- a/lib/javascripts/moment_locale/ro.js
+++ b/lib/javascripts/moment_locale/ro.js
@@ -1,7 +1,4 @@
 //! moment.js locale configuration
-//! locale : Romanian [ro]
-//! author : Vlad Gurdiga : https://github.com/gurdiga
-//! author : Valentin Agachi : https://github.com/avaly
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -11,65 +8,67 @@
 }(this, (function (moment) { 'use strict';
 
 
-function relativeTimeWithPlural(number, withoutSuffix, key) {
-    var format = {
-            'mm': 'minute',
-            'hh': 'ore',
-            'dd': 'zile',
-            'MM': 'luni',
-            'yy': 'ani'
+    function relativeTimeWithPlural(number, withoutSuffix, key) {
+        var format = {
+                'ss': 'secunde',
+                'mm': 'minute',
+                'hh': 'ore',
+                'dd': 'zile',
+                'MM': 'luni',
+                'yy': 'ani'
+            },
+            separator = ' ';
+        if (number % 100 >= 20 || (number >= 100 && number % 100 === 0)) {
+            separator = ' de ';
+        }
+        return number + separator + format[key];
+    }
+
+    var ro = moment.defineLocale('ro', {
+        months : 'ianuarie_februarie_martie_aprilie_mai_iunie_iulie_august_septembrie_octombrie_noiembrie_decembrie'.split('_'),
+        monthsShort : 'ian._febr._mart._apr._mai_iun._iul._aug._sept._oct._nov._dec.'.split('_'),
+        monthsParseExact: true,
+        weekdays : 'duminică_luni_marți_miercuri_joi_vineri_sâmbătă'.split('_'),
+        weekdaysShort : 'Dum_Lun_Mar_Mie_Joi_Vin_Sâm'.split('_'),
+        weekdaysMin : 'Du_Lu_Ma_Mi_Jo_Vi_Sâ'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY H:mm',
+            LLLL : 'dddd, D MMMM YYYY H:mm'
         },
-        separator = ' ';
-    if (number % 100 >= 20 || (number >= 100 && number % 100 === 0)) {
-        separator = ' de ';
-    }
-    return number + separator + format[key];
-}
+        calendar : {
+            sameDay: '[azi la] LT',
+            nextDay: '[mâine la] LT',
+            nextWeek: 'dddd [la] LT',
+            lastDay: '[ieri la] LT',
+            lastWeek: '[fosta] dddd [la] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'peste %s',
+            past : '%s în urmă',
+            s : 'câteva secunde',
+            ss : relativeTimeWithPlural,
+            m : 'un minut',
+            mm : relativeTimeWithPlural,
+            h : 'o oră',
+            hh : relativeTimeWithPlural,
+            d : 'o zi',
+            dd : relativeTimeWithPlural,
+            M : 'o lună',
+            MM : relativeTimeWithPlural,
+            y : 'un an',
+            yy : relativeTimeWithPlural
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
 
-var ro = moment.defineLocale('ro', {
-    months : 'ianuarie_februarie_martie_aprilie_mai_iunie_iulie_august_septembrie_octombrie_noiembrie_decembrie'.split('_'),
-    monthsShort : 'ian._febr._mart._apr._mai_iun._iul._aug._sept._oct._nov._dec.'.split('_'),
-    monthsParseExact: true,
-    weekdays : 'duminică_luni_marți_miercuri_joi_vineri_sâmbătă'.split('_'),
-    weekdaysShort : 'Dum_Lun_Mar_Mie_Joi_Vin_Sâm'.split('_'),
-    weekdaysMin : 'Du_Lu_Ma_Mi_Jo_Vi_Sâ'.split('_'),
-    longDateFormat : {
-        LT : 'H:mm',
-        LTS : 'H:mm:ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY H:mm',
-        LLLL : 'dddd, D MMMM YYYY H:mm'
-    },
-    calendar : {
-        sameDay: '[azi la] LT',
-        nextDay: '[mâine la] LT',
-        nextWeek: 'dddd [la] LT',
-        lastDay: '[ieri la] LT',
-        lastWeek: '[fosta] dddd [la] LT',
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'peste %s',
-        past : '%s în urmă',
-        s : 'câteva secunde',
-        m : 'un minut',
-        mm : relativeTimeWithPlural,
-        h : 'o oră',
-        hh : relativeTimeWithPlural,
-        d : 'o zi',
-        dd : relativeTimeWithPlural,
-        M : 'o lună',
-        MM : relativeTimeWithPlural,
-        y : 'un an',
-        yy : relativeTimeWithPlural
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 1st is the first week of the year.
-    }
-});
-
-return ro;
+    return ro;
 
 })));
diff --git a/lib/javascripts/moment_locale/ru.js b/lib/javascripts/moment_locale/ru.js
old mode 100644
new mode 100755
index b45731e3688..7afb7b5d540
--- a/lib/javascripts/moment_locale/ru.js
+++ b/lib/javascripts/moment_locale/ru.js
@@ -1,8 +1,4 @@
 //! moment.js locale configuration
-//! locale : Russian [ru]
-//! author : Viktorminator : https://github.com/Viktorminator
-//! Author : Menelion Elensúle : https://github.com/Oire
-//! author : Коренберг Марк : https://github.com/socketpair
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -12,172 +8,174 @@
 }(this, (function (moment) { 'use strict';
 
 
-function plural(word, num) {
-    var forms = word.split('_');
-    return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
-}
-function relativeTimeWithPlural(number, withoutSuffix, key) {
-    var format = {
-        'mm': withoutSuffix ? 'минута_минуты_минут' : 'минуту_минуты_минут',
-        'hh': 'час_часа_часов',
-        'dd': 'день_дня_дней',
-        'MM': 'месяц_месяца_месяцев',
-        'yy': 'год_года_лет'
-    };
-    if (key === 'm') {
-        return withoutSuffix ? 'минута' : 'минуту';
+    function plural(word, num) {
+        var forms = word.split('_');
+        return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
     }
-    else {
-        return number + ' ' + plural(format[key], +number);
+    function relativeTimeWithPlural(number, withoutSuffix, key) {
+        var format = {
+            'ss': withoutSuffix ? 'секунда_секунды_секунд' : 'секунду_секунды_секунд',
+            'mm': withoutSuffix ? 'минута_минуты_минут' : 'минуту_минуты_минут',
+            'hh': 'час_часа_часов',
+            'dd': 'день_дня_дней',
+            'MM': 'месяц_месяца_месяцев',
+            'yy': 'год_года_лет'
+        };
+        if (key === 'm') {
+            return withoutSuffix ? 'минута' : 'минуту';
+        }
+        else {
+            return number + ' ' + plural(format[key], +number);
+        }
     }
-}
-var monthsParse = [/^янв/i, /^фев/i, /^мар/i, /^апр/i, /^ма[йя]/i, /^июн/i, /^июл/i, /^авг/i, /^сен/i, /^окт/i, /^ноя/i, /^дек/i];
+    var monthsParse = [/^янв/i, /^фев/i, /^мар/i, /^апр/i, /^ма[йя]/i, /^июн/i, /^июл/i, /^авг/i, /^сен/i, /^окт/i, /^ноя/i, /^дек/i];
 
-// http://new.gramota.ru/spravka/rules/139-prop : § 103
-// Сокращения месяцев: http://new.gramota.ru/spravka/buro/search-answer?s=242637
-// CLDR data:          http://www.unicode.org/cldr/charts/28/summary/ru.html#1753
-var ru = moment.defineLocale('ru', {
-    months : {
-        format: 'января_февраля_марта_апреля_мая_июня_июля_августа_сентября_октября_ноября_декабря'.split('_'),
-        standalone: 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_')
-    },
-    monthsShort : {
-        // по CLDR именно "июл." и "июн.", но какой смысл менять букву на точку ?
-        format: 'янв._февр._мар._апр._мая_июня_июля_авг._сент._окт._нояб._дек.'.split('_'),
-        standalone: 'янв._февр._март_апр._май_июнь_июль_авг._сент._окт._нояб._дек.'.split('_')
-    },
-    weekdays : {
-        standalone: 'воскресенье_понедельник_вторник_среда_четверг_пятница_суббота'.split('_'),
-        format: 'воскресенье_понедельник_вторник_среду_четверг_пятницу_субботу'.split('_'),
-        isFormat: /\[ ?[Вв] ?(?:прошлую|следующую|эту)? ?\] ?dddd/
-    },
-    weekdaysShort : 'вс_пн_вт_ср_чт_пт_сб'.split('_'),
-    weekdaysMin : 'вс_пн_вт_ср_чт_пт_сб'.split('_'),
-    monthsParse : monthsParse,
-    longMonthsParse : monthsParse,
-    shortMonthsParse : monthsParse,
+    // http://new.gramota.ru/spravka/rules/139-prop : § 103
+    // Сокращения месяцев: http://new.gramota.ru/spravka/buro/search-answer?s=242637
+    // CLDR data:          http://www.unicode.org/cldr/charts/28/summary/ru.html#1753
+    var ru = moment.defineLocale('ru', {
+        months : {
+            format: 'января_февраля_марта_апреля_мая_июня_июля_августа_сентября_октября_ноября_декабря'.split('_'),
+            standalone: 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_')
+        },
+        monthsShort : {
+            // по CLDR именно "июл." и "июн.", но какой смысл менять букву на точку ?
+            format: 'янв._февр._мар._апр._мая_июня_июля_авг._сент._окт._нояб._дек.'.split('_'),
+            standalone: 'янв._февр._март_апр._май_июнь_июль_авг._сент._окт._нояб._дек.'.split('_')
+        },
+        weekdays : {
+            standalone: 'воскресенье_понедельник_вторник_среда_четверг_пятница_суббота'.split('_'),
+            format: 'воскресенье_понедельник_вторник_среду_четверг_пятницу_субботу'.split('_'),
+            isFormat: /\[ ?[Вв] ?(?:прошлую|следующую|эту)? ?\] ?dddd/
+        },
+        weekdaysShort : 'вс_пн_вт_ср_чт_пт_сб'.split('_'),
+        weekdaysMin : 'вс_пн_вт_ср_чт_пт_сб'.split('_'),
+        monthsParse : monthsParse,
+        longMonthsParse : monthsParse,
+        shortMonthsParse : monthsParse,
 
-    // полные названия с падежами, по три буквы, для некоторых, по 4 буквы, сокращения с точкой и без точки
-    monthsRegex: /^(январ[ья]|янв\.?|феврал[ья]|февр?\.?|марта?|мар\.?|апрел[ья]|апр\.?|ма[йя]|июн[ья]|июн\.?|июл[ья]|июл\.?|августа?|авг\.?|сентябр[ья]|сент?\.?|октябр[ья]|окт\.?|ноябр[ья]|нояб?\.?|декабр[ья]|дек\.?)/i,
+        // полные названия с падежами, по три буквы, для некоторых, по 4 буквы, сокращения с точкой и без точки
+        monthsRegex: /^(январ[ья]|янв\.?|феврал[ья]|февр?\.?|марта?|мар\.?|апрел[ья]|апр\.?|ма[йя]|июн[ья]|июн\.?|июл[ья]|июл\.?|августа?|авг\.?|сентябр[ья]|сент?\.?|октябр[ья]|окт\.?|ноябр[ья]|нояб?\.?|декабр[ья]|дек\.?)/i,
 
-    // копия предыдущего
-    monthsShortRegex: /^(январ[ья]|янв\.?|феврал[ья]|февр?\.?|марта?|мар\.?|апрел[ья]|апр\.?|ма[йя]|июн[ья]|июн\.?|июл[ья]|июл\.?|августа?|авг\.?|сентябр[ья]|сент?\.?|октябр[ья]|окт\.?|ноябр[ья]|нояб?\.?|декабр[ья]|дек\.?)/i,
+        // копия предыдущего
+        monthsShortRegex: /^(январ[ья]|янв\.?|феврал[ья]|февр?\.?|марта?|мар\.?|апрел[ья]|апр\.?|ма[йя]|июн[ья]|июн\.?|июл[ья]|июл\.?|августа?|авг\.?|сентябр[ья]|сент?\.?|октябр[ья]|окт\.?|ноябр[ья]|нояб?\.?|декабр[ья]|дек\.?)/i,
 
-    // полные названия с падежами
-    monthsStrictRegex: /^(январ[яь]|феврал[яь]|марта?|апрел[яь]|ма[яй]|июн[яь]|июл[яь]|августа?|сентябр[яь]|октябр[яь]|ноябр[яь]|декабр[яь])/i,
+        // полные названия с падежами
+        monthsStrictRegex: /^(январ[яь]|феврал[яь]|марта?|апрел[яь]|ма[яй]|июн[яь]|июл[яь]|августа?|сентябр[яь]|октябр[яь]|ноябр[яь]|декабр[яь])/i,
 
-    // Выражение, которое соотвествует только сокращённым формам
-    monthsShortStrictRegex: /^(янв\.|февр?\.|мар[т.]|апр\.|ма[яй]|июн[ья.]|июл[ья.]|авг\.|сент?\.|окт\.|нояб?\.|дек\.)/i,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D MMMM YYYY г.',
-        LLL : 'D MMMM YYYY г., HH:mm',
-        LLLL : 'dddd, D MMMM YYYY г., HH:mm'
-    },
-    calendar : {
-        sameDay: '[Сегодня в] LT',
-        nextDay: '[Завтра в] LT',
-        lastDay: '[Вчера в] LT',
-        nextWeek: function (now) {
-            if (now.week() !== this.week()) {
-                switch (this.day()) {
-                    case 0:
-                        return '[В следующее] dddd [в] LT';
-                    case 1:
-                    case 2:
-                    case 4:
-                        return '[В следующий] dddd [в] LT';
-                    case 3:
-                    case 5:
-                    case 6:
-                        return '[В следующую] dddd [в] LT';
-                }
-            } else {
-                if (this.day() === 2) {
-                    return '[Во] dddd [в] LT';
+        // Выражение, которое соотвествует только сокращённым формам
+        monthsShortStrictRegex: /^(янв\.|февр?\.|мар[т.]|апр\.|ма[яй]|июн[ья.]|июл[ья.]|авг\.|сент?\.|окт\.|нояб?\.|дек\.)/i,
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY г.',
+            LLL : 'D MMMM YYYY г., H:mm',
+            LLLL : 'dddd, D MMMM YYYY г., H:mm'
+        },
+        calendar : {
+            sameDay: '[Сегодня, в] LT',
+            nextDay: '[Завтра, в] LT',
+            lastDay: '[Вчера, в] LT',
+            nextWeek: function (now) {
+                if (now.week() !== this.week()) {
+                    switch (this.day()) {
+                        case 0:
+                            return '[В следующее] dddd, [в] LT';
+                        case 1:
+                        case 2:
+                        case 4:
+                            return '[В следующий] dddd, [в] LT';
+                        case 3:
+                        case 5:
+                        case 6:
+                            return '[В следующую] dddd, [в] LT';
+                    }
                 } else {
-                    return '[В] dddd [в] LT';
+                    if (this.day() === 2) {
+                        return '[Во] dddd, [в] LT';
+                    } else {
+                        return '[В] dddd, [в] LT';
+                    }
                 }
+            },
+            lastWeek: function (now) {
+                if (now.week() !== this.week()) {
+                    switch (this.day()) {
+                        case 0:
+                            return '[В прошлое] dddd, [в] LT';
+                        case 1:
+                        case 2:
+                        case 4:
+                            return '[В прошлый] dddd, [в] LT';
+                        case 3:
+                        case 5:
+                        case 6:
+                            return '[В прошлую] dddd, [в] LT';
+                    }
+                } else {
+                    if (this.day() === 2) {
+                        return '[Во] dddd, [в] LT';
+                    } else {
+                        return '[В] dddd, [в] LT';
+                    }
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'через %s',
+            past : '%s назад',
+            s : 'несколько секунд',
+            ss : relativeTimeWithPlural,
+            m : relativeTimeWithPlural,
+            mm : relativeTimeWithPlural,
+            h : 'час',
+            hh : relativeTimeWithPlural,
+            d : 'день',
+            dd : relativeTimeWithPlural,
+            M : 'месяц',
+            MM : relativeTimeWithPlural,
+            y : 'год',
+            yy : relativeTimeWithPlural
+        },
+        meridiemParse: /ночи|утра|дня|вечера/i,
+        isPM : function (input) {
+            return /^(дня|вечера)$/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'ночи';
+            } else if (hour < 12) {
+                return 'утра';
+            } else if (hour < 17) {
+                return 'дня';
+            } else {
+                return 'вечера';
             }
         },
-        lastWeek: function (now) {
-            if (now.week() !== this.week()) {
-                switch (this.day()) {
-                    case 0:
-                        return '[В прошлое] dddd [в] LT';
-                    case 1:
-                    case 2:
-                    case 4:
-                        return '[В прошлый] dddd [в] LT';
-                    case 3:
-                    case 5:
-                    case 6:
-                        return '[В прошлую] dddd [в] LT';
-                }
-            } else {
-                if (this.day() === 2) {
-                    return '[Во] dddd [в] LT';
-                } else {
-                    return '[В] dddd [в] LT';
-                }
+        dayOfMonthOrdinalParse: /\d{1,2}-(й|го|я)/,
+        ordinal: function (number, period) {
+            switch (period) {
+                case 'M':
+                case 'd':
+                case 'DDD':
+                    return number + '-й';
+                case 'D':
+                    return number + '-го';
+                case 'w':
+                case 'W':
+                    return number + '-я';
+                default:
+                    return number;
             }
         },
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'через %s',
-        past : '%s назад',
-        s : 'несколько секунд',
-        m : relativeTimeWithPlural,
-        mm : relativeTimeWithPlural,
-        h : 'час',
-        hh : relativeTimeWithPlural,
-        d : 'день',
-        dd : relativeTimeWithPlural,
-        M : 'месяц',
-        MM : relativeTimeWithPlural,
-        y : 'год',
-        yy : relativeTimeWithPlural
-    },
-    meridiemParse: /ночи|утра|дня|вечера/i,
-    isPM : function (input) {
-        return /^(дня|вечера)$/.test(input);
-    },
-    meridiem : function (hour, minute, isLower) {
-        if (hour < 4) {
-            return 'ночи';
-        } else if (hour < 12) {
-            return 'утра';
-        } else if (hour < 17) {
-            return 'дня';
-        } else {
-            return 'вечера';
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}-(й|го|я)/,
-    ordinal: function (number, period) {
-        switch (period) {
-            case 'M':
-            case 'd':
-            case 'DDD':
-                return number + '-й';
-            case 'D':
-                return number + '-го';
-            case 'w':
-            case 'W':
-                return number + '-я';
-            default:
-                return number;
-        }
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    });
 
-return ru;
+    return ru;
 
 })));
diff --git a/lib/javascripts/moment_locale/sd.js b/lib/javascripts/moment_locale/sd.js
old mode 100644
new mode 100755
index 0fcf7e10cc9..12992382b66
--- a/lib/javascripts/moment_locale/sd.js
+++ b/lib/javascripts/moment_locale/sd.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Sindhi [sd]
-//! author : Narain Sagar : https://github.com/narainsagar
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,89 +8,90 @@
 }(this, (function (moment) { 'use strict';
 
 
-var months = [
-    'جنوري',
-    'فيبروري',
-    'مارچ',
-    'اپريل',
-    'مئي',
-    'جون',
-    'جولاءِ',
-    'آگسٽ',
-    'سيپٽمبر',
-    'آڪٽوبر',
-    'نومبر',
-    'ڊسمبر'
-];
-var days = [
-    'آچر',
-    'سومر',
-    'اڱارو',
-    'اربع',
-    'خميس',
-    'جمع',
-    'ڇنڇر'
-];
+    var months = [
+        'جنوري',
+        'فيبروري',
+        'مارچ',
+        'اپريل',
+        'مئي',
+        'جون',
+        'جولاءِ',
+        'آگسٽ',
+        'سيپٽمبر',
+        'آڪٽوبر',
+        'نومبر',
+        'ڊسمبر'
+    ];
+    var days = [
+        'آچر',
+        'سومر',
+        'اڱارو',
+        'اربع',
+        'خميس',
+        'جمع',
+        'ڇنڇر'
+    ];
 
-var sd = moment.defineLocale('sd', {
-    months : months,
-    monthsShort : months,
-    weekdays : days,
-    weekdaysShort : days,
-    weekdaysMin : days,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd، D MMMM YYYY HH:mm'
-    },
-    meridiemParse: /صبح|شام/,
-    isPM : function (input) {
-        return 'شام' === input;
-    },
-    meridiem : function (hour, minute, isLower) {
-        if (hour < 12) {
-            return 'صبح';
+    var sd = moment.defineLocale('sd', {
+        months : months,
+        monthsShort : months,
+        weekdays : days,
+        weekdaysShort : days,
+        weekdaysMin : days,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd، D MMMM YYYY HH:mm'
+        },
+        meridiemParse: /صبح|شام/,
+        isPM : function (input) {
+            return 'شام' === input;
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'صبح';
+            }
+            return 'شام';
+        },
+        calendar : {
+            sameDay : '[اڄ] LT',
+            nextDay : '[سڀاڻي] LT',
+            nextWeek : 'dddd [اڳين هفتي تي] LT',
+            lastDay : '[ڪالهه] LT',
+            lastWeek : '[گزريل هفتي] dddd [تي] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s پوء',
+            past : '%s اڳ',
+            s : 'چند سيڪنڊ',
+            ss : '%d سيڪنڊ',
+            m : 'هڪ منٽ',
+            mm : '%d منٽ',
+            h : 'هڪ ڪلاڪ',
+            hh : '%d ڪلاڪ',
+            d : 'هڪ ڏينهن',
+            dd : '%d ڏينهن',
+            M : 'هڪ مهينو',
+            MM : '%d مهينا',
+            y : 'هڪ سال',
+            yy : '%d سال'
+        },
+        preparse: function (string) {
+            return string.replace(/،/g, ',');
+        },
+        postformat: function (string) {
+            return string.replace(/,/g, '،');
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
-        return 'شام';
-    },
-    calendar : {
-        sameDay : '[اڄ] LT',
-        nextDay : '[سڀاڻي] LT',
-        nextWeek : 'dddd [اڳين هفتي تي] LT',
-        lastDay : '[ڪالهه] LT',
-        lastWeek : '[گزريل هفتي] dddd [تي] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : '%s پوء',
-        past : '%s اڳ',
-        s : 'چند سيڪنڊ',
-        m : 'هڪ منٽ',
-        mm : '%d منٽ',
-        h : 'هڪ ڪلاڪ',
-        hh : '%d ڪلاڪ',
-        d : 'هڪ ڏينهن',
-        dd : '%d ڏينهن',
-        M : 'هڪ مهينو',
-        MM : '%d مهينا',
-        y : 'هڪ سال',
-        yy : '%d سال'
-    },
-    preparse: function (string) {
-        return string.replace(/،/g, ',');
-    },
-    postformat: function (string) {
-        return string.replace(/,/g, '،');
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    });
 
-return sd;
+    return sd;
 
 })));
diff --git a/lib/javascripts/moment_locale/se.js b/lib/javascripts/moment_locale/se.js
old mode 100644
new mode 100755
index d44d0df24cd..4b04678038d
--- a/lib/javascripts/moment_locale/se.js
+++ b/lib/javascripts/moment_locale/se.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Northern Sami [se]
-//! authors : Bård Rolstad Henriksen : https://github.com/karamell
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,52 +8,52 @@
 }(this, (function (moment) { 'use strict';
 
 
+    var se = moment.defineLocale('se', {
+        months : 'ođđajagemánnu_guovvamánnu_njukčamánnu_cuoŋománnu_miessemánnu_geassemánnu_suoidnemánnu_borgemánnu_čakčamánnu_golggotmánnu_skábmamánnu_juovlamánnu'.split('_'),
+        monthsShort : 'ođđj_guov_njuk_cuo_mies_geas_suoi_borg_čakč_golg_skáb_juov'.split('_'),
+        weekdays : 'sotnabeaivi_vuossárga_maŋŋebárga_gaskavahkku_duorastat_bearjadat_lávvardat'.split('_'),
+        weekdaysShort : 'sotn_vuos_maŋ_gask_duor_bear_láv'.split('_'),
+        weekdaysMin : 's_v_m_g_d_b_L'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'MMMM D. [b.] YYYY',
+            LLL : 'MMMM D. [b.] YYYY [ti.] HH:mm',
+            LLLL : 'dddd, MMMM D. [b.] YYYY [ti.] HH:mm'
+        },
+        calendar : {
+            sameDay: '[otne ti] LT',
+            nextDay: '[ihttin ti] LT',
+            nextWeek: 'dddd [ti] LT',
+            lastDay: '[ikte ti] LT',
+            lastWeek: '[ovddit] dddd [ti] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : '%s geažes',
+            past : 'maŋit %s',
+            s : 'moadde sekunddat',
+            ss: '%d sekunddat',
+            m : 'okta minuhta',
+            mm : '%d minuhtat',
+            h : 'okta diimmu',
+            hh : '%d diimmut',
+            d : 'okta beaivi',
+            dd : '%d beaivvit',
+            M : 'okta mánnu',
+            MM : '%d mánut',
+            y : 'okta jahki',
+            yy : '%d jagit'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-var se = moment.defineLocale('se', {
-    months : 'ođđajagemánnu_guovvamánnu_njukčamánnu_cuoŋománnu_miessemánnu_geassemánnu_suoidnemánnu_borgemánnu_čakčamánnu_golggotmánnu_skábmamánnu_juovlamánnu'.split('_'),
-    monthsShort : 'ođđj_guov_njuk_cuo_mies_geas_suoi_borg_čakč_golg_skáb_juov'.split('_'),
-    weekdays : 'sotnabeaivi_vuossárga_maŋŋebárga_gaskavahkku_duorastat_bearjadat_lávvardat'.split('_'),
-    weekdaysShort : 'sotn_vuos_maŋ_gask_duor_bear_láv'.split('_'),
-    weekdaysMin : 's_v_m_g_d_b_L'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD.MM.YYYY',
-        LL : 'MMMM D. [b.] YYYY',
-        LLL : 'MMMM D. [b.] YYYY [ti.] HH:mm',
-        LLLL : 'dddd, MMMM D. [b.] YYYY [ti.] HH:mm'
-    },
-    calendar : {
-        sameDay: '[otne ti] LT',
-        nextDay: '[ihttin ti] LT',
-        nextWeek: 'dddd [ti] LT',
-        lastDay: '[ikte ti] LT',
-        lastWeek: '[ovddit] dddd [ti] LT',
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : '%s geažes',
-        past : 'maŋit %s',
-        s : 'moadde sekunddat',
-        m : 'okta minuhta',
-        mm : '%d minuhtat',
-        h : 'okta diimmu',
-        hh : '%d diimmut',
-        d : 'okta beaivi',
-        dd : '%d beaivvit',
-        M : 'okta mánnu',
-        MM : '%d mánut',
-        y : 'okta jahki',
-        yy : '%d jagit'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
-
-return se;
+    return se;
 
 })));
diff --git a/lib/javascripts/moment_locale/si.js b/lib/javascripts/moment_locale/si.js
old mode 100644
new mode 100755
index f5c124ee45f..52dc60807d9
--- a/lib/javascripts/moment_locale/si.js
+++ b/lib/javascripts/moment_locale/si.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Sinhalese [si]
-//! author : Sampath Sitinamaluwa : https://github.com/sampathsris
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,62 +8,63 @@
 }(this, (function (moment) { 'use strict';
 
 
-/*jshint -W100*/
-var si = moment.defineLocale('si', {
-    months : 'ජනවාරි_පෙබරවාරි_මාර්තු_අප්‍රේල්_මැයි_ජූනි_ජූලි_අගෝස්තු_සැප්තැම්බර්_ඔක්තෝබර්_නොවැම්බර්_දෙසැම්බර්'.split('_'),
-    monthsShort : 'ජන_පෙබ_මාර්_අප්_මැයි_ජූනි_ජූලි_අගෝ_සැප්_ඔක්_නොවැ_දෙසැ'.split('_'),
-    weekdays : 'ඉරිදා_සඳුදා_අඟහරුවාදා_බදාදා_බ්‍රහස්පතින්දා_සිකුරාදා_සෙනසුරාදා'.split('_'),
-    weekdaysShort : 'ඉරි_සඳු_අඟ_බදා_බ්‍රහ_සිකු_සෙන'.split('_'),
-    weekdaysMin : 'ඉ_ස_අ_බ_බ්‍ර_සි_සෙ'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'a h:mm',
-        LTS : 'a h:mm:ss',
-        L : 'YYYY/MM/DD',
-        LL : 'YYYY MMMM D',
-        LLL : 'YYYY MMMM D, a h:mm',
-        LLLL : 'YYYY MMMM D [වැනි] dddd, a h:mm:ss'
-    },
-    calendar : {
-        sameDay : '[අද] LT[ට]',
-        nextDay : '[හෙට] LT[ට]',
-        nextWeek : 'dddd LT[ට]',
-        lastDay : '[ඊයේ] LT[ට]',
-        lastWeek : '[පසුගිය] dddd LT[ට]',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : '%sකින්',
-        past : '%sකට පෙර',
-        s : 'තත්පර කිහිපය',
-        m : 'මිනිත්තුව',
-        mm : 'මිනිත්තු %d',
-        h : 'පැය',
-        hh : 'පැය %d',
-        d : 'දිනය',
-        dd : 'දින %d',
-        M : 'මාසය',
-        MM : 'මාස %d',
-        y : 'වසර',
-        yy : 'වසර %d'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2} වැනි/,
-    ordinal : function (number) {
-        return number + ' වැනි';
-    },
-    meridiemParse : /පෙර වරු|පස් වරු|පෙ.ව|ප.ව./,
-    isPM : function (input) {
-        return input === 'ප.ව.' || input === 'පස් වරු';
-    },
-    meridiem : function (hours, minutes, isLower) {
-        if (hours > 11) {
-            return isLower ? 'ප.ව.' : 'පස් වරු';
-        } else {
-            return isLower ? 'පෙ.ව.' : 'පෙර වරු';
+    /*jshint -W100*/
+    var si = moment.defineLocale('si', {
+        months : 'ජනවාරි_පෙබරවාරි_මාර්තු_අප්‍රේල්_මැයි_ජූනි_ජූලි_අගෝස්තු_සැප්තැම්බර්_ඔක්තෝබර්_නොවැම්බර්_දෙසැම්බර්'.split('_'),
+        monthsShort : 'ජන_පෙබ_මාර්_අප්_මැයි_ජූනි_ජූලි_අගෝ_සැප්_ඔක්_නොවැ_දෙසැ'.split('_'),
+        weekdays : 'ඉරිදා_සඳුදා_අඟහරුවාදා_බදාදා_බ්‍රහස්පතින්දා_සිකුරාදා_සෙනසුරාදා'.split('_'),
+        weekdaysShort : 'ඉරි_සඳු_අඟ_බදා_බ්‍රහ_සිකු_සෙන'.split('_'),
+        weekdaysMin : 'ඉ_ස_අ_බ_බ්‍ර_සි_සෙ'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'a h:mm',
+            LTS : 'a h:mm:ss',
+            L : 'YYYY/MM/DD',
+            LL : 'YYYY MMMM D',
+            LLL : 'YYYY MMMM D, a h:mm',
+            LLLL : 'YYYY MMMM D [වැනි] dddd, a h:mm:ss'
+        },
+        calendar : {
+            sameDay : '[අද] LT[ට]',
+            nextDay : '[හෙට] LT[ට]',
+            nextWeek : 'dddd LT[ට]',
+            lastDay : '[ඊයේ] LT[ට]',
+            lastWeek : '[පසුගිය] dddd LT[ට]',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%sකින්',
+            past : '%sකට පෙර',
+            s : 'තත්පර කිහිපය',
+            ss : 'තත්පර %d',
+            m : 'මිනිත්තුව',
+            mm : 'මිනිත්තු %d',
+            h : 'පැය',
+            hh : 'පැය %d',
+            d : 'දිනය',
+            dd : 'දින %d',
+            M : 'මාසය',
+            MM : 'මාස %d',
+            y : 'වසර',
+            yy : 'වසර %d'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2} වැනි/,
+        ordinal : function (number) {
+            return number + ' වැනි';
+        },
+        meridiemParse : /පෙර වරු|පස් වරු|පෙ.ව|ප.ව./,
+        isPM : function (input) {
+            return input === 'ප.ව.' || input === 'පස් වරු';
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours > 11) {
+                return isLower ? 'ප.ව.' : 'පස් වරු';
+            } else {
+                return isLower ? 'පෙ.ව.' : 'පෙර වරු';
+            }
         }
-    }
-});
+    });
 
-return si;
+    return si;
 
 })));
diff --git a/lib/javascripts/moment_locale/sk.js b/lib/javascripts/moment_locale/sk.js
old mode 100644
new mode 100755
index aa61da621ed..6938f95e635
--- a/lib/javascripts/moment_locale/sk.js
+++ b/lib/javascripts/moment_locale/sk.js
@@ -1,7 +1,4 @@
 //! moment.js locale configuration
-//! locale : Slovak [sk]
-//! author : Martin Minka : https://github.com/k2s
-//! based on work of petrbela : https://github.com/petrbela
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -11,140 +8,148 @@
 }(this, (function (moment) { 'use strict';
 
 
-var months = 'január_február_marec_apríl_máj_jún_júl_august_september_október_november_december'.split('_');
-var monthsShort = 'jan_feb_mar_apr_máj_jún_júl_aug_sep_okt_nov_dec'.split('_');
-function plural(n) {
-    return (n > 1) && (n < 5);
-}
-function translate(number, withoutSuffix, key, isFuture) {
-    var result = number + ' ';
-    switch (key) {
-        case 's':  // a few seconds / in a few seconds / a few seconds ago
-            return (withoutSuffix || isFuture) ? 'pár sekúnd' : 'pár sekundami';
-        case 'm':  // a minute / in a minute / a minute ago
-            return withoutSuffix ? 'minúta' : (isFuture ? 'minútu' : 'minútou');
-        case 'mm': // 9 minutes / in 9 minutes / 9 minutes ago
-            if (withoutSuffix || isFuture) {
-                return result + (plural(number) ? 'minúty' : 'minút');
-            } else {
-                return result + 'minútami';
-            }
-            break;
-        case 'h':  // an hour / in an hour / an hour ago
-            return withoutSuffix ? 'hodina' : (isFuture ? 'hodinu' : 'hodinou');
-        case 'hh': // 9 hours / in 9 hours / 9 hours ago
-            if (withoutSuffix || isFuture) {
-                return result + (plural(number) ? 'hodiny' : 'hodín');
-            } else {
-                return result + 'hodinami';
-            }
-            break;
-        case 'd':  // a day / in a day / a day ago
-            return (withoutSuffix || isFuture) ? 'deň' : 'dňom';
-        case 'dd': // 9 days / in 9 days / 9 days ago
-            if (withoutSuffix || isFuture) {
-                return result + (plural(number) ? 'dni' : 'dní');
-            } else {
-                return result + 'dňami';
-            }
-            break;
-        case 'M':  // a month / in a month / a month ago
-            return (withoutSuffix || isFuture) ? 'mesiac' : 'mesiacom';
-        case 'MM': // 9 months / in 9 months / 9 months ago
-            if (withoutSuffix || isFuture) {
-                return result + (plural(number) ? 'mesiace' : 'mesiacov');
-            } else {
-                return result + 'mesiacmi';
-            }
-            break;
-        case 'y':  // a year / in a year / a year ago
-            return (withoutSuffix || isFuture) ? 'rok' : 'rokom';
-        case 'yy': // 9 years / in 9 years / 9 years ago
-            if (withoutSuffix || isFuture) {
-                return result + (plural(number) ? 'roky' : 'rokov');
-            } else {
-                return result + 'rokmi';
-            }
-            break;
+    var months = 'január_február_marec_apríl_máj_jún_júl_august_september_október_november_december'.split('_'),
+        monthsShort = 'jan_feb_mar_apr_máj_jún_júl_aug_sep_okt_nov_dec'.split('_');
+    function plural(n) {
+        return (n > 1) && (n < 5);
     }
-}
-
-var sk = moment.defineLocale('sk', {
-    months : months,
-    monthsShort : monthsShort,
-    weekdays : 'nedeľa_pondelok_utorok_streda_štvrtok_piatok_sobota'.split('_'),
-    weekdaysShort : 'ne_po_ut_st_št_pi_so'.split('_'),
-    weekdaysMin : 'ne_po_ut_st_št_pi_so'.split('_'),
-    longDateFormat : {
-        LT: 'H:mm',
-        LTS : 'H:mm:ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D. MMMM YYYY',
-        LLL : 'D. MMMM YYYY H:mm',
-        LLLL : 'dddd D. MMMM YYYY H:mm'
-    },
-    calendar : {
-        sameDay: '[dnes o] LT',
-        nextDay: '[zajtra o] LT',
-        nextWeek: function () {
-            switch (this.day()) {
-                case 0:
-                    return '[v nedeľu o] LT';
-                case 1:
-                case 2:
-                    return '[v] dddd [o] LT';
-                case 3:
-                    return '[v stredu o] LT';
-                case 4:
-                    return '[vo štvrtok o] LT';
-                case 5:
-                    return '[v piatok o] LT';
-                case 6:
-                    return '[v sobotu o] LT';
-            }
-        },
-        lastDay: '[včera o] LT',
-        lastWeek: function () {
-            switch (this.day()) {
-                case 0:
-                    return '[minulú nedeľu o] LT';
-                case 1:
-                case 2:
-                    return '[minulý] dddd [o] LT';
-                case 3:
-                    return '[minulú stredu o] LT';
-                case 4:
-                case 5:
-                    return '[minulý] dddd [o] LT';
-                case 6:
-                    return '[minulú sobotu o] LT';
-            }
-        },
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'za %s',
-        past : 'pred %s',
-        s : translate,
-        m : translate,
-        mm : translate,
-        h : translate,
-        hh : translate,
-        d : translate,
-        dd : translate,
-        M : translate,
-        MM : translate,
-        y : translate,
-        yy : translate
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    function translate(number, withoutSuffix, key, isFuture) {
+        var result = number + ' ';
+        switch (key) {
+            case 's':  // a few seconds / in a few seconds / a few seconds ago
+                return (withoutSuffix || isFuture) ? 'pár sekúnd' : 'pár sekundami';
+            case 'ss': // 9 seconds / in 9 seconds / 9 seconds ago
+                if (withoutSuffix || isFuture) {
+                    return result + (plural(number) ? 'sekundy' : 'sekúnd');
+                } else {
+                    return result + 'sekundami';
+                }
+                break;
+            case 'm':  // a minute / in a minute / a minute ago
+                return withoutSuffix ? 'minúta' : (isFuture ? 'minútu' : 'minútou');
+            case 'mm': // 9 minutes / in 9 minutes / 9 minutes ago
+                if (withoutSuffix || isFuture) {
+                    return result + (plural(number) ? 'minúty' : 'minút');
+                } else {
+                    return result + 'minútami';
+                }
+                break;
+            case 'h':  // an hour / in an hour / an hour ago
+                return withoutSuffix ? 'hodina' : (isFuture ? 'hodinu' : 'hodinou');
+            case 'hh': // 9 hours / in 9 hours / 9 hours ago
+                if (withoutSuffix || isFuture) {
+                    return result + (plural(number) ? 'hodiny' : 'hodín');
+                } else {
+                    return result + 'hodinami';
+                }
+                break;
+            case 'd':  // a day / in a day / a day ago
+                return (withoutSuffix || isFuture) ? 'deň' : 'dňom';
+            case 'dd': // 9 days / in 9 days / 9 days ago
+                if (withoutSuffix || isFuture) {
+                    return result + (plural(number) ? 'dni' : 'dní');
+                } else {
+                    return result + 'dňami';
+                }
+                break;
+            case 'M':  // a month / in a month / a month ago
+                return (withoutSuffix || isFuture) ? 'mesiac' : 'mesiacom';
+            case 'MM': // 9 months / in 9 months / 9 months ago
+                if (withoutSuffix || isFuture) {
+                    return result + (plural(number) ? 'mesiace' : 'mesiacov');
+                } else {
+                    return result + 'mesiacmi';
+                }
+                break;
+            case 'y':  // a year / in a year / a year ago
+                return (withoutSuffix || isFuture) ? 'rok' : 'rokom';
+            case 'yy': // 9 years / in 9 years / 9 years ago
+                if (withoutSuffix || isFuture) {
+                    return result + (plural(number) ? 'roky' : 'rokov');
+                } else {
+                    return result + 'rokmi';
+                }
+                break;
+        }
     }
-});
 
-return sk;
+    var sk = moment.defineLocale('sk', {
+        months : months,
+        monthsShort : monthsShort,
+        weekdays : 'nedeľa_pondelok_utorok_streda_štvrtok_piatok_sobota'.split('_'),
+        weekdaysShort : 'ne_po_ut_st_št_pi_so'.split('_'),
+        weekdaysMin : 'ne_po_ut_st_št_pi_so'.split('_'),
+        longDateFormat : {
+            LT: 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY H:mm',
+            LLLL : 'dddd D. MMMM YYYY H:mm'
+        },
+        calendar : {
+            sameDay: '[dnes o] LT',
+            nextDay: '[zajtra o] LT',
+            nextWeek: function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[v nedeľu o] LT';
+                    case 1:
+                    case 2:
+                        return '[v] dddd [o] LT';
+                    case 3:
+                        return '[v stredu o] LT';
+                    case 4:
+                        return '[vo štvrtok o] LT';
+                    case 5:
+                        return '[v piatok o] LT';
+                    case 6:
+                        return '[v sobotu o] LT';
+                }
+            },
+            lastDay: '[včera o] LT',
+            lastWeek: function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[minulú nedeľu o] LT';
+                    case 1:
+                    case 2:
+                        return '[minulý] dddd [o] LT';
+                    case 3:
+                        return '[minulú stredu o] LT';
+                    case 4:
+                    case 5:
+                        return '[minulý] dddd [o] LT';
+                    case 6:
+                        return '[minulú sobotu o] LT';
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past : 'pred %s',
+            s : translate,
+            ss : translate,
+            m : translate,
+            mm : translate,
+            h : translate,
+            hh : translate,
+            d : translate,
+            dd : translate,
+            M : translate,
+            MM : translate,
+            y : translate,
+            yy : translate
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return sk;
 
 })));
diff --git a/lib/javascripts/moment_locale/sl.js b/lib/javascripts/moment_locale/sl.js
old mode 100644
new mode 100755
index e74b3a11c1d..8dec7813dfa
--- a/lib/javascripts/moment_locale/sl.js
+++ b/lib/javascripts/moment_locale/sl.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Slovenian [sl]
-//! author : Robert Sedovšek : https://github.com/sedovsek
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,153 +8,165 @@
 }(this, (function (moment) { 'use strict';
 
 
-function processRelativeTime(number, withoutSuffix, key, isFuture) {
-    var result = number + ' ';
-    switch (key) {
-        case 's':
-            return withoutSuffix || isFuture ? 'nekaj sekund' : 'nekaj sekundami';
-        case 'm':
-            return withoutSuffix ? 'ena minuta' : 'eno minuto';
-        case 'mm':
-            if (number === 1) {
-                result += withoutSuffix ? 'minuta' : 'minuto';
-            } else if (number === 2) {
-                result += withoutSuffix || isFuture ? 'minuti' : 'minutama';
-            } else if (number < 5) {
-                result += withoutSuffix || isFuture ? 'minute' : 'minutami';
-            } else {
-                result += withoutSuffix || isFuture ? 'minut' : 'minutami';
-            }
-            return result;
-        case 'h':
-            return withoutSuffix ? 'ena ura' : 'eno uro';
-        case 'hh':
-            if (number === 1) {
-                result += withoutSuffix ? 'ura' : 'uro';
-            } else if (number === 2) {
-                result += withoutSuffix || isFuture ? 'uri' : 'urama';
-            } else if (number < 5) {
-                result += withoutSuffix || isFuture ? 'ure' : 'urami';
-            } else {
-                result += withoutSuffix || isFuture ? 'ur' : 'urami';
-            }
-            return result;
-        case 'd':
-            return withoutSuffix || isFuture ? 'en dan' : 'enim dnem';
-        case 'dd':
-            if (number === 1) {
-                result += withoutSuffix || isFuture ? 'dan' : 'dnem';
-            } else if (number === 2) {
-                result += withoutSuffix || isFuture ? 'dni' : 'dnevoma';
-            } else {
-                result += withoutSuffix || isFuture ? 'dni' : 'dnevi';
-            }
-            return result;
-        case 'M':
-            return withoutSuffix || isFuture ? 'en mesec' : 'enim mesecem';
-        case 'MM':
-            if (number === 1) {
-                result += withoutSuffix || isFuture ? 'mesec' : 'mesecem';
-            } else if (number === 2) {
-                result += withoutSuffix || isFuture ? 'meseca' : 'mesecema';
-            } else if (number < 5) {
-                result += withoutSuffix || isFuture ? 'mesece' : 'meseci';
-            } else {
-                result += withoutSuffix || isFuture ? 'mesecev' : 'meseci';
-            }
-            return result;
-        case 'y':
-            return withoutSuffix || isFuture ? 'eno leto' : 'enim letom';
-        case 'yy':
-            if (number === 1) {
-                result += withoutSuffix || isFuture ? 'leto' : 'letom';
-            } else if (number === 2) {
-                result += withoutSuffix || isFuture ? 'leti' : 'letoma';
-            } else if (number < 5) {
-                result += withoutSuffix || isFuture ? 'leta' : 'leti';
-            } else {
-                result += withoutSuffix || isFuture ? 'let' : 'leti';
-            }
-            return result;
+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var result = number + ' ';
+        switch (key) {
+            case 's':
+                return withoutSuffix || isFuture ? 'nekaj sekund' : 'nekaj sekundami';
+            case 'ss':
+                if (number === 1) {
+                    result += withoutSuffix ? 'sekundo' : 'sekundi';
+                } else if (number === 2) {
+                    result += withoutSuffix || isFuture ? 'sekundi' : 'sekundah';
+                } else if (number < 5) {
+                    result += withoutSuffix || isFuture ? 'sekunde' : 'sekundah';
+                } else {
+                    result += withoutSuffix || isFuture ? 'sekund' : 'sekund';
+                }
+                return result;
+            case 'm':
+                return withoutSuffix ? 'ena minuta' : 'eno minuto';
+            case 'mm':
+                if (number === 1) {
+                    result += withoutSuffix ? 'minuta' : 'minuto';
+                } else if (number === 2) {
+                    result += withoutSuffix || isFuture ? 'minuti' : 'minutama';
+                } else if (number < 5) {
+                    result += withoutSuffix || isFuture ? 'minute' : 'minutami';
+                } else {
+                    result += withoutSuffix || isFuture ? 'minut' : 'minutami';
+                }
+                return result;
+            case 'h':
+                return withoutSuffix ? 'ena ura' : 'eno uro';
+            case 'hh':
+                if (number === 1) {
+                    result += withoutSuffix ? 'ura' : 'uro';
+                } else if (number === 2) {
+                    result += withoutSuffix || isFuture ? 'uri' : 'urama';
+                } else if (number < 5) {
+                    result += withoutSuffix || isFuture ? 'ure' : 'urami';
+                } else {
+                    result += withoutSuffix || isFuture ? 'ur' : 'urami';
+                }
+                return result;
+            case 'd':
+                return withoutSuffix || isFuture ? 'en dan' : 'enim dnem';
+            case 'dd':
+                if (number === 1) {
+                    result += withoutSuffix || isFuture ? 'dan' : 'dnem';
+                } else if (number === 2) {
+                    result += withoutSuffix || isFuture ? 'dni' : 'dnevoma';
+                } else {
+                    result += withoutSuffix || isFuture ? 'dni' : 'dnevi';
+                }
+                return result;
+            case 'M':
+                return withoutSuffix || isFuture ? 'en mesec' : 'enim mesecem';
+            case 'MM':
+                if (number === 1) {
+                    result += withoutSuffix || isFuture ? 'mesec' : 'mesecem';
+                } else if (number === 2) {
+                    result += withoutSuffix || isFuture ? 'meseca' : 'mesecema';
+                } else if (number < 5) {
+                    result += withoutSuffix || isFuture ? 'mesece' : 'meseci';
+                } else {
+                    result += withoutSuffix || isFuture ? 'mesecev' : 'meseci';
+                }
+                return result;
+            case 'y':
+                return withoutSuffix || isFuture ? 'eno leto' : 'enim letom';
+            case 'yy':
+                if (number === 1) {
+                    result += withoutSuffix || isFuture ? 'leto' : 'letom';
+                } else if (number === 2) {
+                    result += withoutSuffix || isFuture ? 'leti' : 'letoma';
+                } else if (number < 5) {
+                    result += withoutSuffix || isFuture ? 'leta' : 'leti';
+                } else {
+                    result += withoutSuffix || isFuture ? 'let' : 'leti';
+                }
+                return result;
+        }
     }
-}
 
-var sl = moment.defineLocale('sl', {
-    months : 'januar_februar_marec_april_maj_junij_julij_avgust_september_oktober_november_december'.split('_'),
-    monthsShort : 'jan._feb._mar._apr._maj._jun._jul._avg._sep._okt._nov._dec.'.split('_'),
-    monthsParseExact: true,
-    weekdays : 'nedelja_ponedeljek_torek_sreda_četrtek_petek_sobota'.split('_'),
-    weekdaysShort : 'ned._pon._tor._sre._čet._pet._sob.'.split('_'),
-    weekdaysMin : 'ne_po_to_sr_če_pe_so'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'H:mm',
-        LTS : 'H:mm:ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D. MMMM YYYY',
-        LLL : 'D. MMMM YYYY H:mm',
-        LLLL : 'dddd, D. MMMM YYYY H:mm'
-    },
-    calendar : {
-        sameDay  : '[danes ob] LT',
-        nextDay  : '[jutri ob] LT',
-
-        nextWeek : function () {
-            switch (this.day()) {
-                case 0:
-                    return '[v] [nedeljo] [ob] LT';
-                case 3:
-                    return '[v] [sredo] [ob] LT';
-                case 6:
-                    return '[v] [soboto] [ob] LT';
-                case 1:
-                case 2:
-                case 4:
-                case 5:
-                    return '[v] dddd [ob] LT';
-            }
+    var sl = moment.defineLocale('sl', {
+        months : 'januar_februar_marec_april_maj_junij_julij_avgust_september_oktober_november_december'.split('_'),
+        monthsShort : 'jan._feb._mar._apr._maj._jun._jul._avg._sep._okt._nov._dec.'.split('_'),
+        monthsParseExact: true,
+        weekdays : 'nedelja_ponedeljek_torek_sreda_četrtek_petek_sobota'.split('_'),
+        weekdaysShort : 'ned._pon._tor._sre._čet._pet._sob.'.split('_'),
+        weekdaysMin : 'ne_po_to_sr_če_pe_so'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY H:mm',
+            LLLL : 'dddd, D. MMMM YYYY H:mm'
         },
-        lastDay  : '[včeraj ob] LT',
-        lastWeek : function () {
-            switch (this.day()) {
-                case 0:
-                    return '[prejšnjo] [nedeljo] [ob] LT';
-                case 3:
-                    return '[prejšnjo] [sredo] [ob] LT';
-                case 6:
-                    return '[prejšnjo] [soboto] [ob] LT';
-                case 1:
-                case 2:
-                case 4:
-                case 5:
-                    return '[prejšnji] dddd [ob] LT';
-            }
-        },
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'čez %s',
-        past   : 'pred %s',
-        s      : processRelativeTime,
-        m      : processRelativeTime,
-        mm     : processRelativeTime,
-        h      : processRelativeTime,
-        hh     : processRelativeTime,
-        d      : processRelativeTime,
-        dd     : processRelativeTime,
-        M      : processRelativeTime,
-        MM     : processRelativeTime,
-        y      : processRelativeTime,
-        yy     : processRelativeTime
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+        calendar : {
+            sameDay  : '[danes ob] LT',
+            nextDay  : '[jutri ob] LT',
 
-return sl;
+            nextWeek : function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[v] [nedeljo] [ob] LT';
+                    case 3:
+                        return '[v] [sredo] [ob] LT';
+                    case 6:
+                        return '[v] [soboto] [ob] LT';
+                    case 1:
+                    case 2:
+                    case 4:
+                    case 5:
+                        return '[v] dddd [ob] LT';
+                }
+            },
+            lastDay  : '[včeraj ob] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[prejšnjo] [nedeljo] [ob] LT';
+                    case 3:
+                        return '[prejšnjo] [sredo] [ob] LT';
+                    case 6:
+                        return '[prejšnjo] [soboto] [ob] LT';
+                    case 1:
+                    case 2:
+                    case 4:
+                    case 5:
+                        return '[prejšnji] dddd [ob] LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'čez %s',
+            past   : 'pred %s',
+            s      : processRelativeTime,
+            ss     : processRelativeTime,
+            m      : processRelativeTime,
+            mm     : processRelativeTime,
+            h      : processRelativeTime,
+            hh     : processRelativeTime,
+            d      : processRelativeTime,
+            dd     : processRelativeTime,
+            M      : processRelativeTime,
+            MM     : processRelativeTime,
+            y      : processRelativeTime,
+            yy     : processRelativeTime
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return sl;
 
 })));
diff --git a/lib/javascripts/moment_locale/sq.js b/lib/javascripts/moment_locale/sq.js
old mode 100644
new mode 100755
index b92dc1726c4..eb081df060d
--- a/lib/javascripts/moment_locale/sq.js
+++ b/lib/javascripts/moment_locale/sq.js
@@ -1,8 +1,4 @@
 //! moment.js locale configuration
-//! locale : Albanian [sq]
-//! author : Flakërim Ismani : https://github.com/flakerimi
-//! author : Menelion Elensúle : https://github.com/Oire
-//! author : Oerd Cukalla : https://github.com/oerd
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -12,59 +8,60 @@
 }(this, (function (moment) { 'use strict';
 
 
-var sq = moment.defineLocale('sq', {
-    months : 'Janar_Shkurt_Mars_Prill_Maj_Qershor_Korrik_Gusht_Shtator_Tetor_Nëntor_Dhjetor'.split('_'),
-    monthsShort : 'Jan_Shk_Mar_Pri_Maj_Qer_Kor_Gus_Sht_Tet_Nën_Dhj'.split('_'),
-    weekdays : 'E Diel_E Hënë_E Martë_E Mërkurë_E Enjte_E Premte_E Shtunë'.split('_'),
-    weekdaysShort : 'Die_Hën_Mar_Mër_Enj_Pre_Sht'.split('_'),
-    weekdaysMin : 'D_H_Ma_Më_E_P_Sh'.split('_'),
-    weekdaysParseExact : true,
-    meridiemParse: /PD|MD/,
-    isPM: function (input) {
-        return input.charAt(0) === 'M';
-    },
-    meridiem : function (hours, minutes, isLower) {
-        return hours < 12 ? 'PD' : 'MD';
-    },
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd, D MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay : '[Sot në] LT',
-        nextDay : '[Nesër në] LT',
-        nextWeek : 'dddd [në] LT',
-        lastDay : '[Dje në] LT',
-        lastWeek : 'dddd [e kaluar në] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'në %s',
-        past : '%s më parë',
-        s : 'disa sekonda',
-        m : 'një minutë',
-        mm : '%d minuta',
-        h : 'një orë',
-        hh : '%d orë',
-        d : 'një ditë',
-        dd : '%d ditë',
-        M : 'një muaj',
-        MM : '%d muaj',
-        y : 'një vit',
-        yy : '%d vite'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    var sq = moment.defineLocale('sq', {
+        months : 'Janar_Shkurt_Mars_Prill_Maj_Qershor_Korrik_Gusht_Shtator_Tetor_Nëntor_Dhjetor'.split('_'),
+        monthsShort : 'Jan_Shk_Mar_Pri_Maj_Qer_Kor_Gus_Sht_Tet_Nën_Dhj'.split('_'),
+        weekdays : 'E Diel_E Hënë_E Martë_E Mërkurë_E Enjte_E Premte_E Shtunë'.split('_'),
+        weekdaysShort : 'Die_Hën_Mar_Mër_Enj_Pre_Sht'.split('_'),
+        weekdaysMin : 'D_H_Ma_Më_E_P_Sh'.split('_'),
+        weekdaysParseExact : true,
+        meridiemParse: /PD|MD/,
+        isPM: function (input) {
+            return input.charAt(0) === 'M';
+        },
+        meridiem : function (hours, minutes, isLower) {
+            return hours < 12 ? 'PD' : 'MD';
+        },
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[Sot në] LT',
+            nextDay : '[Nesër në] LT',
+            nextWeek : 'dddd [në] LT',
+            lastDay : '[Dje në] LT',
+            lastWeek : 'dddd [e kaluar në] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'në %s',
+            past : '%s më parë',
+            s : 'disa sekonda',
+            ss : '%d sekonda',
+            m : 'një minutë',
+            mm : '%d minuta',
+            h : 'një orë',
+            hh : '%d orë',
+            d : 'një ditë',
+            dd : '%d ditë',
+            M : 'një muaj',
+            MM : '%d muaj',
+            y : 'një vit',
+            yy : '%d vite'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-return sq;
+    return sq;
 
 })));
diff --git a/lib/javascripts/moment_locale/sr-cyrl.js b/lib/javascripts/moment_locale/sr-cyrl.js
old mode 100644
new mode 100755
index 3007819bd22..ccd92b958b8
--- a/lib/javascripts/moment_locale/sr-cyrl.js
+++ b/lib/javascripts/moment_locale/sr-cyrl.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Serbian Cyrillic [sr-cyrl]
-//! author : Milan Janačković<milanjanackovic@gmail.com> : https://github.com/milan-j
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,101 +8,103 @@
 }(this, (function (moment) { 'use strict';
 
 
-var translator = {
-    words: { //Different grammatical cases
-        m: ['један минут', 'једне минуте'],
-        mm: ['минут', 'минуте', 'минута'],
-        h: ['један сат', 'једног сата'],
-        hh: ['сат', 'сата', 'сати'],
-        dd: ['дан', 'дана', 'дана'],
-        MM: ['месец', 'месеца', 'месеци'],
-        yy: ['година', 'године', 'година']
-    },
-    correctGrammaticalCase: function (number, wordKey) {
-        return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
-    },
-    translate: function (number, withoutSuffix, key) {
-        var wordKey = translator.words[key];
-        if (key.length === 1) {
-            return withoutSuffix ? wordKey[0] : wordKey[1];
-        } else {
-            return number + ' ' + translator.correctGrammaticalCase(number, wordKey);
-        }
-    }
-};
-
-var srCyrl = moment.defineLocale('sr-cyrl', {
-    months: 'јануар_фебруар_март_април_мај_јун_јул_август_септембар_октобар_новембар_децембар'.split('_'),
-    monthsShort: 'јан._феб._мар._апр._мај_јун_јул_авг._сеп._окт._нов._дец.'.split('_'),
-    monthsParseExact: true,
-    weekdays: 'недеља_понедељак_уторак_среда_четвртак_петак_субота'.split('_'),
-    weekdaysShort: 'нед._пон._уто._сре._чет._пет._суб.'.split('_'),
-    weekdaysMin: 'не_по_ут_ср_че_пе_су'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat: {
-        LT: 'H:mm',
-        LTS : 'H:mm:ss',
-        L: 'DD.MM.YYYY',
-        LL: 'D. MMMM YYYY',
-        LLL: 'D. MMMM YYYY H:mm',
-        LLLL: 'dddd, D. MMMM YYYY H:mm'
-    },
-    calendar: {
-        sameDay: '[данас у] LT',
-        nextDay: '[сутра у] LT',
-        nextWeek: function () {
-            switch (this.day()) {
-                case 0:
-                    return '[у] [недељу] [у] LT';
-                case 3:
-                    return '[у] [среду] [у] LT';
-                case 6:
-                    return '[у] [суботу] [у] LT';
-                case 1:
-                case 2:
-                case 4:
-                case 5:
-                    return '[у] dddd [у] LT';
+    var translator = {
+        words: { //Different grammatical cases
+            ss: ['секунда', 'секунде', 'секунди'],
+            m: ['један минут', 'једне минуте'],
+            mm: ['минут', 'минуте', 'минута'],
+            h: ['један сат', 'једног сата'],
+            hh: ['сат', 'сата', 'сати'],
+            dd: ['дан', 'дана', 'дана'],
+            MM: ['месец', 'месеца', 'месеци'],
+            yy: ['година', 'године', 'година']
+        },
+        correctGrammaticalCase: function (number, wordKey) {
+            return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
+        },
+        translate: function (number, withoutSuffix, key) {
+            var wordKey = translator.words[key];
+            if (key.length === 1) {
+                return withoutSuffix ? wordKey[0] : wordKey[1];
+            } else {
+                return number + ' ' + translator.correctGrammaticalCase(number, wordKey);
             }
-        },
-        lastDay  : '[јуче у] LT',
-        lastWeek : function () {
-            var lastWeekDays = [
-                '[прошле] [недеље] [у] LT',
-                '[прошлог] [понедељка] [у] LT',
-                '[прошлог] [уторка] [у] LT',
-                '[прошле] [среде] [у] LT',
-                '[прошлог] [четвртка] [у] LT',
-                '[прошлог] [петка] [у] LT',
-                '[прошле] [суботе] [у] LT'
-            ];
-            return lastWeekDays[this.day()];
-        },
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'за %s',
-        past   : 'пре %s',
-        s      : 'неколико секунди',
-        m      : translator.translate,
-        mm     : translator.translate,
-        h      : translator.translate,
-        hh     : translator.translate,
-        d      : 'дан',
-        dd     : translator.translate,
-        M      : 'месец',
-        MM     : translator.translate,
-        y      : 'годину',
-        yy     : translator.translate
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+        }
+    };
 
-return srCyrl;
+    var srCyrl = moment.defineLocale('sr-cyrl', {
+        months: 'јануар_фебруар_март_април_мај_јун_јул_август_септембар_октобар_новембар_децембар'.split('_'),
+        monthsShort: 'јан._феб._мар._апр._мај_јун_јул_авг._сеп._окт._нов._дец.'.split('_'),
+        monthsParseExact: true,
+        weekdays: 'недеља_понедељак_уторак_среда_четвртак_петак_субота'.split('_'),
+        weekdaysShort: 'нед._пон._уто._сре._чет._пет._суб.'.split('_'),
+        weekdaysMin: 'не_по_ут_ср_че_пе_су'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat: {
+            LT: 'H:mm',
+            LTS : 'H:mm:ss',
+            L: 'DD.MM.YYYY',
+            LL: 'D. MMMM YYYY',
+            LLL: 'D. MMMM YYYY H:mm',
+            LLLL: 'dddd, D. MMMM YYYY H:mm'
+        },
+        calendar: {
+            sameDay: '[данас у] LT',
+            nextDay: '[сутра у] LT',
+            nextWeek: function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[у] [недељу] [у] LT';
+                    case 3:
+                        return '[у] [среду] [у] LT';
+                    case 6:
+                        return '[у] [суботу] [у] LT';
+                    case 1:
+                    case 2:
+                    case 4:
+                    case 5:
+                        return '[у] dddd [у] LT';
+                }
+            },
+            lastDay  : '[јуче у] LT',
+            lastWeek : function () {
+                var lastWeekDays = [
+                    '[прошле] [недеље] [у] LT',
+                    '[прошлог] [понедељка] [у] LT',
+                    '[прошлог] [уторка] [у] LT',
+                    '[прошле] [среде] [у] LT',
+                    '[прошлог] [четвртка] [у] LT',
+                    '[прошлог] [петка] [у] LT',
+                    '[прошле] [суботе] [у] LT'
+                ];
+                return lastWeekDays[this.day()];
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'за %s',
+            past   : 'пре %s',
+            s      : 'неколико секунди',
+            ss     : translator.translate,
+            m      : translator.translate,
+            mm     : translator.translate,
+            h      : translator.translate,
+            hh     : translator.translate,
+            d      : 'дан',
+            dd     : translator.translate,
+            M      : 'месец',
+            MM     : translator.translate,
+            y      : 'годину',
+            yy     : translator.translate
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return srCyrl;
 
 })));
diff --git a/lib/javascripts/moment_locale/sr.js b/lib/javascripts/moment_locale/sr.js
old mode 100644
new mode 100755
index 90778a9bfa8..9e1f4a3aa08
--- a/lib/javascripts/moment_locale/sr.js
+++ b/lib/javascripts/moment_locale/sr.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Serbian [sr]
-//! author : Milan Janačković<milanjanackovic@gmail.com> : https://github.com/milan-j
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,101 +8,103 @@
 }(this, (function (moment) { 'use strict';
 
 
-var translator = {
-    words: { //Different grammatical cases
-        m: ['jedan minut', 'jedne minute'],
-        mm: ['minut', 'minute', 'minuta'],
-        h: ['jedan sat', 'jednog sata'],
-        hh: ['sat', 'sata', 'sati'],
-        dd: ['dan', 'dana', 'dana'],
-        MM: ['mesec', 'meseca', 'meseci'],
-        yy: ['godina', 'godine', 'godina']
-    },
-    correctGrammaticalCase: function (number, wordKey) {
-        return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
-    },
-    translate: function (number, withoutSuffix, key) {
-        var wordKey = translator.words[key];
-        if (key.length === 1) {
-            return withoutSuffix ? wordKey[0] : wordKey[1];
-        } else {
-            return number + ' ' + translator.correctGrammaticalCase(number, wordKey);
-        }
-    }
-};
-
-var sr = moment.defineLocale('sr', {
-    months: 'januar_februar_mart_april_maj_jun_jul_avgust_septembar_oktobar_novembar_decembar'.split('_'),
-    monthsShort: 'jan._feb._mar._apr._maj_jun_jul_avg._sep._okt._nov._dec.'.split('_'),
-    monthsParseExact: true,
-    weekdays: 'nedelja_ponedeljak_utorak_sreda_četvrtak_petak_subota'.split('_'),
-    weekdaysShort: 'ned._pon._uto._sre._čet._pet._sub.'.split('_'),
-    weekdaysMin: 'ne_po_ut_sr_če_pe_su'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat: {
-        LT: 'H:mm',
-        LTS : 'H:mm:ss',
-        L: 'DD.MM.YYYY',
-        LL: 'D. MMMM YYYY',
-        LLL: 'D. MMMM YYYY H:mm',
-        LLLL: 'dddd, D. MMMM YYYY H:mm'
-    },
-    calendar: {
-        sameDay: '[danas u] LT',
-        nextDay: '[sutra u] LT',
-        nextWeek: function () {
-            switch (this.day()) {
-                case 0:
-                    return '[u] [nedelju] [u] LT';
-                case 3:
-                    return '[u] [sredu] [u] LT';
-                case 6:
-                    return '[u] [subotu] [u] LT';
-                case 1:
-                case 2:
-                case 4:
-                case 5:
-                    return '[u] dddd [u] LT';
+    var translator = {
+        words: { //Different grammatical cases
+            ss: ['sekunda', 'sekunde', 'sekundi'],
+            m: ['jedan minut', 'jedne minute'],
+            mm: ['minut', 'minute', 'minuta'],
+            h: ['jedan sat', 'jednog sata'],
+            hh: ['sat', 'sata', 'sati'],
+            dd: ['dan', 'dana', 'dana'],
+            MM: ['mesec', 'meseca', 'meseci'],
+            yy: ['godina', 'godine', 'godina']
+        },
+        correctGrammaticalCase: function (number, wordKey) {
+            return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
+        },
+        translate: function (number, withoutSuffix, key) {
+            var wordKey = translator.words[key];
+            if (key.length === 1) {
+                return withoutSuffix ? wordKey[0] : wordKey[1];
+            } else {
+                return number + ' ' + translator.correctGrammaticalCase(number, wordKey);
             }
-        },
-        lastDay  : '[juče u] LT',
-        lastWeek : function () {
-            var lastWeekDays = [
-                '[prošle] [nedelje] [u] LT',
-                '[prošlog] [ponedeljka] [u] LT',
-                '[prošlog] [utorka] [u] LT',
-                '[prošle] [srede] [u] LT',
-                '[prošlog] [četvrtka] [u] LT',
-                '[prošlog] [petka] [u] LT',
-                '[prošle] [subote] [u] LT'
-            ];
-            return lastWeekDays[this.day()];
-        },
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'za %s',
-        past   : 'pre %s',
-        s      : 'nekoliko sekundi',
-        m      : translator.translate,
-        mm     : translator.translate,
-        h      : translator.translate,
-        hh     : translator.translate,
-        d      : 'dan',
-        dd     : translator.translate,
-        M      : 'mesec',
-        MM     : translator.translate,
-        y      : 'godinu',
-        yy     : translator.translate
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+        }
+    };
 
-return sr;
+    var sr = moment.defineLocale('sr', {
+        months: 'januar_februar_mart_april_maj_jun_jul_avgust_septembar_oktobar_novembar_decembar'.split('_'),
+        monthsShort: 'jan._feb._mar._apr._maj_jun_jul_avg._sep._okt._nov._dec.'.split('_'),
+        monthsParseExact: true,
+        weekdays: 'nedelja_ponedeljak_utorak_sreda_četvrtak_petak_subota'.split('_'),
+        weekdaysShort: 'ned._pon._uto._sre._čet._pet._sub.'.split('_'),
+        weekdaysMin: 'ne_po_ut_sr_če_pe_su'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat: {
+            LT: 'H:mm',
+            LTS : 'H:mm:ss',
+            L: 'DD.MM.YYYY',
+            LL: 'D. MMMM YYYY',
+            LLL: 'D. MMMM YYYY H:mm',
+            LLLL: 'dddd, D. MMMM YYYY H:mm'
+        },
+        calendar: {
+            sameDay: '[danas u] LT',
+            nextDay: '[sutra u] LT',
+            nextWeek: function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[u] [nedelju] [u] LT';
+                    case 3:
+                        return '[u] [sredu] [u] LT';
+                    case 6:
+                        return '[u] [subotu] [u] LT';
+                    case 1:
+                    case 2:
+                    case 4:
+                    case 5:
+                        return '[u] dddd [u] LT';
+                }
+            },
+            lastDay  : '[juče u] LT',
+            lastWeek : function () {
+                var lastWeekDays = [
+                    '[prošle] [nedelje] [u] LT',
+                    '[prošlog] [ponedeljka] [u] LT',
+                    '[prošlog] [utorka] [u] LT',
+                    '[prošle] [srede] [u] LT',
+                    '[prošlog] [četvrtka] [u] LT',
+                    '[prošlog] [petka] [u] LT',
+                    '[prošle] [subote] [u] LT'
+                ];
+                return lastWeekDays[this.day()];
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past   : 'pre %s',
+            s      : 'nekoliko sekundi',
+            ss     : translator.translate,
+            m      : translator.translate,
+            mm     : translator.translate,
+            h      : translator.translate,
+            hh     : translator.translate,
+            d      : 'dan',
+            dd     : translator.translate,
+            M      : 'mesec',
+            MM     : translator.translate,
+            y      : 'godinu',
+            yy     : translator.translate
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return sr;
 
 })));
diff --git a/lib/javascripts/moment_locale/ss.js b/lib/javascripts/moment_locale/ss.js
old mode 100644
new mode 100755
index e89e2db2933..a401149c9b6
--- a/lib/javascripts/moment_locale/ss.js
+++ b/lib/javascripts/moment_locale/ss.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : siSwati [ss]
-//! author : Nicolai Davies<mail@nicolai.io> : https://github.com/nicolaidavies
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,80 +8,80 @@
 }(this, (function (moment) { 'use strict';
 
 
-
-var ss = moment.defineLocale('ss', {
-    months : "Bhimbidvwane_Indlovana_Indlov'lenkhulu_Mabasa_Inkhwekhweti_Inhlaba_Kholwane_Ingci_Inyoni_Imphala_Lweti_Ingongoni".split('_'),
-    monthsShort : 'Bhi_Ina_Inu_Mab_Ink_Inh_Kho_Igc_Iny_Imp_Lwe_Igo'.split('_'),
-    weekdays : 'Lisontfo_Umsombuluko_Lesibili_Lesitsatfu_Lesine_Lesihlanu_Umgcibelo'.split('_'),
-    weekdaysShort : 'Lis_Umb_Lsb_Les_Lsi_Lsh_Umg'.split('_'),
-    weekdaysMin : 'Li_Us_Lb_Lt_Ls_Lh_Ug'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'h:mm A',
-        LTS : 'h:mm:ss A',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY h:mm A',
-        LLLL : 'dddd, D MMMM YYYY h:mm A'
-    },
-    calendar : {
-        sameDay : '[Namuhla nga] LT',
-        nextDay : '[Kusasa nga] LT',
-        nextWeek : 'dddd [nga] LT',
-        lastDay : '[Itolo nga] LT',
-        lastWeek : 'dddd [leliphelile] [nga] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'nga %s',
-        past : 'wenteka nga %s',
-        s : 'emizuzwana lomcane',
-        m : 'umzuzu',
-        mm : '%d emizuzu',
-        h : 'lihora',
-        hh : '%d emahora',
-        d : 'lilanga',
-        dd : '%d emalanga',
-        M : 'inyanga',
-        MM : '%d tinyanga',
-        y : 'umnyaka',
-        yy : '%d iminyaka'
-    },
-    meridiemParse: /ekuseni|emini|entsambama|ebusuku/,
-    meridiem : function (hours, minutes, isLower) {
-        if (hours < 11) {
-            return 'ekuseni';
-        } else if (hours < 15) {
-            return 'emini';
-        } else if (hours < 19) {
-            return 'entsambama';
-        } else {
-            return 'ebusuku';
-        }
-    },
-    meridiemHour : function (hour, meridiem) {
-        if (hour === 12) {
-            hour = 0;
-        }
-        if (meridiem === 'ekuseni') {
-            return hour;
-        } else if (meridiem === 'emini') {
-            return hour >= 11 ? hour : hour + 12;
-        } else if (meridiem === 'entsambama' || meridiem === 'ebusuku') {
-            if (hour === 0) {
-                return 0;
+    var ss = moment.defineLocale('ss', {
+        months : "Bhimbidvwane_Indlovana_Indlov'lenkhulu_Mabasa_Inkhwekhweti_Inhlaba_Kholwane_Ingci_Inyoni_Imphala_Lweti_Ingongoni".split('_'),
+        monthsShort : 'Bhi_Ina_Inu_Mab_Ink_Inh_Kho_Igc_Iny_Imp_Lwe_Igo'.split('_'),
+        weekdays : 'Lisontfo_Umsombuluko_Lesibili_Lesitsatfu_Lesine_Lesihlanu_Umgcibelo'.split('_'),
+        weekdaysShort : 'Lis_Umb_Lsb_Les_Lsi_Lsh_Umg'.split('_'),
+        weekdaysMin : 'Li_Us_Lb_Lt_Ls_Lh_Ug'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY h:mm A',
+            LLLL : 'dddd, D MMMM YYYY h:mm A'
+        },
+        calendar : {
+            sameDay : '[Namuhla nga] LT',
+            nextDay : '[Kusasa nga] LT',
+            nextWeek : 'dddd [nga] LT',
+            lastDay : '[Itolo nga] LT',
+            lastWeek : 'dddd [leliphelile] [nga] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'nga %s',
+            past : 'wenteka nga %s',
+            s : 'emizuzwana lomcane',
+            ss : '%d mzuzwana',
+            m : 'umzuzu',
+            mm : '%d emizuzu',
+            h : 'lihora',
+            hh : '%d emahora',
+            d : 'lilanga',
+            dd : '%d emalanga',
+            M : 'inyanga',
+            MM : '%d tinyanga',
+            y : 'umnyaka',
+            yy : '%d iminyaka'
+        },
+        meridiemParse: /ekuseni|emini|entsambama|ebusuku/,
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 11) {
+                return 'ekuseni';
+            } else if (hours < 15) {
+                return 'emini';
+            } else if (hours < 19) {
+                return 'entsambama';
+            } else {
+                return 'ebusuku';
             }
-            return hour + 12;
+        },
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'ekuseni') {
+                return hour;
+            } else if (meridiem === 'emini') {
+                return hour >= 11 ? hour : hour + 12;
+            } else if (meridiem === 'entsambama' || meridiem === 'ebusuku') {
+                if (hour === 0) {
+                    return 0;
+                }
+                return hour + 12;
+            }
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}/,
+        ordinal : '%d',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}/,
-    ordinal : '%d',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    });
 
-return ss;
+    return ss;
 
 })));
diff --git a/lib/javascripts/moment_locale/sv.js b/lib/javascripts/moment_locale/sv.js
old mode 100644
new mode 100755
index 1aa76607794..494fedba03c
--- a/lib/javascripts/moment_locale/sv.js
+++ b/lib/javascripts/moment_locale/sv.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Swedish [sv]
-//! author : Jens Alm : https://github.com/ulmus
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,60 +8,61 @@
 }(this, (function (moment) { 'use strict';
 
 
-var sv = moment.defineLocale('sv', {
-    months : 'januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december'.split('_'),
-    monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),
-    weekdays : 'söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag'.split('_'),
-    weekdaysShort : 'sön_mån_tis_ons_tor_fre_lör'.split('_'),
-    weekdaysMin : 'sö_må_ti_on_to_fr_lö'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'YYYY-MM-DD',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY [kl.] HH:mm',
-        LLLL : 'dddd D MMMM YYYY [kl.] HH:mm',
-        lll : 'D MMM YYYY HH:mm',
-        llll : 'ddd D MMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay: '[Idag] LT',
-        nextDay: '[Imorgon] LT',
-        lastDay: '[Igår] LT',
-        nextWeek: '[På] dddd LT',
-        lastWeek: '[I] dddd[s] LT',
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'om %s',
-        past : 'för %s sedan',
-        s : 'några sekunder',
-        m : 'en minut',
-        mm : '%d minuter',
-        h : 'en timme',
-        hh : '%d timmar',
-        d : 'en dag',
-        dd : '%d dagar',
-        M : 'en månad',
-        MM : '%d månader',
-        y : 'ett år',
-        yy : '%d år'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}(e|a)/,
-    ordinal : function (number) {
-        var b = number % 10,
-            output = (~~(number % 100 / 10) === 1) ? 'e' :
-            (b === 1) ? 'a' :
-            (b === 2) ? 'a' :
-            (b === 3) ? 'e' : 'e';
-        return number + output;
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    var sv = moment.defineLocale('sv', {
+        months : 'januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),
+        weekdays : 'söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag'.split('_'),
+        weekdaysShort : 'sön_mån_tis_ons_tor_fre_lör'.split('_'),
+        weekdaysMin : 'sö_må_ti_on_to_fr_lö'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'YYYY-MM-DD',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY [kl.] HH:mm',
+            LLLL : 'dddd D MMMM YYYY [kl.] HH:mm',
+            lll : 'D MMM YYYY HH:mm',
+            llll : 'ddd D MMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[Idag] LT',
+            nextDay: '[Imorgon] LT',
+            lastDay: '[Igår] LT',
+            nextWeek: '[På] dddd LT',
+            lastWeek: '[I] dddd[s] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'om %s',
+            past : 'för %s sedan',
+            s : 'några sekunder',
+            ss : '%d sekunder',
+            m : 'en minut',
+            mm : '%d minuter',
+            h : 'en timme',
+            hh : '%d timmar',
+            d : 'en dag',
+            dd : '%d dagar',
+            M : 'en månad',
+            MM : '%d månader',
+            y : 'ett år',
+            yy : '%d år'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(e|a)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'e' :
+                (b === 1) ? 'a' :
+                (b === 2) ? 'a' :
+                (b === 3) ? 'e' : 'e';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-return sv;
+    return sv;
 
 })));
diff --git a/lib/javascripts/moment_locale/sw.js b/lib/javascripts/moment_locale/sw.js
old mode 100644
new mode 100755
index 9ed314f5631..1f564e099f9
--- a/lib/javascripts/moment_locale/sw.js
+++ b/lib/javascripts/moment_locale/sw.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Swahili [sw]
-//! author : Fahad Kassim : https://github.com/fadsel
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,50 +8,51 @@
 }(this, (function (moment) { 'use strict';
 
 
-var sw = moment.defineLocale('sw', {
-    months : 'Januari_Februari_Machi_Aprili_Mei_Juni_Julai_Agosti_Septemba_Oktoba_Novemba_Desemba'.split('_'),
-    monthsShort : 'Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ago_Sep_Okt_Nov_Des'.split('_'),
-    weekdays : 'Jumapili_Jumatatu_Jumanne_Jumatano_Alhamisi_Ijumaa_Jumamosi'.split('_'),
-    weekdaysShort : 'Jpl_Jtat_Jnne_Jtan_Alh_Ijm_Jmos'.split('_'),
-    weekdaysMin : 'J2_J3_J4_J5_Al_Ij_J1'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd, D MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay : '[leo saa] LT',
-        nextDay : '[kesho saa] LT',
-        nextWeek : '[wiki ijayo] dddd [saat] LT',
-        lastDay : '[jana] LT',
-        lastWeek : '[wiki iliyopita] dddd [saat] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : '%s baadaye',
-        past : 'tokea %s',
-        s : 'hivi punde',
-        m : 'dakika moja',
-        mm : 'dakika %d',
-        h : 'saa limoja',
-        hh : 'masaa %d',
-        d : 'siku moja',
-        dd : 'masiku %d',
-        M : 'mwezi mmoja',
-        MM : 'miezi %d',
-        y : 'mwaka mmoja',
-        yy : 'miaka %d'
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    var sw = moment.defineLocale('sw', {
+        months : 'Januari_Februari_Machi_Aprili_Mei_Juni_Julai_Agosti_Septemba_Oktoba_Novemba_Desemba'.split('_'),
+        monthsShort : 'Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ago_Sep_Okt_Nov_Des'.split('_'),
+        weekdays : 'Jumapili_Jumatatu_Jumanne_Jumatano_Alhamisi_Ijumaa_Jumamosi'.split('_'),
+        weekdaysShort : 'Jpl_Jtat_Jnne_Jtan_Alh_Ijm_Jmos'.split('_'),
+        weekdaysMin : 'J2_J3_J4_J5_Al_Ij_J1'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[leo saa] LT',
+            nextDay : '[kesho saa] LT',
+            nextWeek : '[wiki ijayo] dddd [saat] LT',
+            lastDay : '[jana] LT',
+            lastWeek : '[wiki iliyopita] dddd [saat] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s baadaye',
+            past : 'tokea %s',
+            s : 'hivi punde',
+            ss : 'sekunde %d',
+            m : 'dakika moja',
+            mm : 'dakika %d',
+            h : 'saa limoja',
+            hh : 'masaa %d',
+            d : 'siku moja',
+            dd : 'masiku %d',
+            M : 'mwezi mmoja',
+            MM : 'miezi %d',
+            y : 'mwaka mmoja',
+            yy : 'miaka %d'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
 
-return sw;
+    return sw;
 
 })));
diff --git a/lib/javascripts/moment_locale/ta.js b/lib/javascripts/moment_locale/ta.js
old mode 100644
new mode 100755
index d9d2555ae8e..92142c9248e
--- a/lib/javascripts/moment_locale/ta.js
+++ b/lib/javascripts/moment_locale/ta.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Tamil [ta]
-//! author : Arjunkumar Krishnamoorthy : https://github.com/tk120404
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,121 +8,121 @@
 }(this, (function (moment) { 'use strict';
 
 
-var symbolMap = {
-    '1': '௧',
-    '2': '௨',
-    '3': '௩',
-    '4': '௪',
-    '5': '௫',
-    '6': '௬',
-    '7': '௭',
-    '8': '௮',
-    '9': '௯',
-    '0': '௦'
-};
-var numberMap = {
-    '௧': '1',
-    '௨': '2',
-    '௩': '3',
-    '௪': '4',
-    '௫': '5',
-    '௬': '6',
-    '௭': '7',
-    '௮': '8',
-    '௯': '9',
-    '௦': '0'
-};
+    var symbolMap = {
+        '1': '௧',
+        '2': '௨',
+        '3': '௩',
+        '4': '௪',
+        '5': '௫',
+        '6': '௬',
+        '7': '௭',
+        '8': '௮',
+        '9': '௯',
+        '0': '௦'
+    }, numberMap = {
+        '௧': '1',
+        '௨': '2',
+        '௩': '3',
+        '௪': '4',
+        '௫': '5',
+        '௬': '6',
+        '௭': '7',
+        '௮': '8',
+        '௯': '9',
+        '௦': '0'
+    };
 
-var ta = moment.defineLocale('ta', {
-    months : 'ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்'.split('_'),
-    monthsShort : 'ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்'.split('_'),
-    weekdays : 'ஞாயிற்றுக்கிழமை_திங்கட்கிழமை_செவ்வாய்கிழமை_புதன்கிழமை_வியாழக்கிழமை_வெள்ளிக்கிழமை_சனிக்கிழமை'.split('_'),
-    weekdaysShort : 'ஞாயிறு_திங்கள்_செவ்வாய்_புதன்_வியாழன்_வெள்ளி_சனி'.split('_'),
-    weekdaysMin : 'ஞா_தி_செ_பு_வி_வெ_ச'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY, HH:mm',
-        LLLL : 'dddd, D MMMM YYYY, HH:mm'
-    },
-    calendar : {
-        sameDay : '[இன்று] LT',
-        nextDay : '[நாளை] LT',
-        nextWeek : 'dddd, LT',
-        lastDay : '[நேற்று] LT',
-        lastWeek : '[கடந்த வாரம்] dddd, LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : '%s இல்',
-        past : '%s முன்',
-        s : 'ஒரு சில விநாடிகள்',
-        m : 'ஒரு நிமிடம்',
-        mm : '%d நிமிடங்கள்',
-        h : 'ஒரு மணி நேரம்',
-        hh : '%d மணி நேரம்',
-        d : 'ஒரு நாள்',
-        dd : '%d நாட்கள்',
-        M : 'ஒரு மாதம்',
-        MM : '%d மாதங்கள்',
-        y : 'ஒரு வருடம்',
-        yy : '%d ஆண்டுகள்'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}வது/,
-    ordinal : function (number) {
-        return number + 'வது';
-    },
-    preparse: function (string) {
-        return string.replace(/[௧௨௩௪௫௬௭௮௯௦]/g, function (match) {
-            return numberMap[match];
-        });
-    },
-    postformat: function (string) {
-        return string.replace(/\d/g, function (match) {
-            return symbolMap[match];
-        });
-    },
-    // refer http://ta.wikipedia.org/s/1er1
-    meridiemParse: /யாமம்|வைகறை|காலை|நண்பகல்|எற்பாடு|மாலை/,
-    meridiem : function (hour, minute, isLower) {
-        if (hour < 2) {
-            return ' யாமம்';
-        } else if (hour < 6) {
-            return ' வைகறை';  // வைகறை
-        } else if (hour < 10) {
-            return ' காலை'; // காலை
-        } else if (hour < 14) {
-            return ' நண்பகல்'; // நண்பகல்
-        } else if (hour < 18) {
-            return ' எற்பாடு'; // எற்பாடு
-        } else if (hour < 22) {
-            return ' மாலை'; // மாலை
-        } else {
-            return ' யாமம்';
+    var ta = moment.defineLocale('ta', {
+        months : 'ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்'.split('_'),
+        monthsShort : 'ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்'.split('_'),
+        weekdays : 'ஞாயிற்றுக்கிழமை_திங்கட்கிழமை_செவ்வாய்கிழமை_புதன்கிழமை_வியாழக்கிழமை_வெள்ளிக்கிழமை_சனிக்கிழமை'.split('_'),
+        weekdaysShort : 'ஞாயிறு_திங்கள்_செவ்வாய்_புதன்_வியாழன்_வெள்ளி_சனி'.split('_'),
+        weekdaysMin : 'ஞா_தி_செ_பு_வி_வெ_ச'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, HH:mm',
+            LLLL : 'dddd, D MMMM YYYY, HH:mm'
+        },
+        calendar : {
+            sameDay : '[இன்று] LT',
+            nextDay : '[நாளை] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[நேற்று] LT',
+            lastWeek : '[கடந்த வாரம்] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s இல்',
+            past : '%s முன்',
+            s : 'ஒரு சில விநாடிகள்',
+            ss : '%d விநாடிகள்',
+            m : 'ஒரு நிமிடம்',
+            mm : '%d நிமிடங்கள்',
+            h : 'ஒரு மணி நேரம்',
+            hh : '%d மணி நேரம்',
+            d : 'ஒரு நாள்',
+            dd : '%d நாட்கள்',
+            M : 'ஒரு மாதம்',
+            MM : '%d மாதங்கள்',
+            y : 'ஒரு வருடம்',
+            yy : '%d ஆண்டுகள்'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}வது/,
+        ordinal : function (number) {
+            return number + 'வது';
+        },
+        preparse: function (string) {
+            return string.replace(/[௧௨௩௪௫௬௭௮௯௦]/g, function (match) {
+                return numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            });
+        },
+        // refer http://ta.wikipedia.org/s/1er1
+        meridiemParse: /யாமம்|வைகறை|காலை|நண்பகல்|எற்பாடு|மாலை/,
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 2) {
+                return ' யாமம்';
+            } else if (hour < 6) {
+                return ' வைகறை';  // வைகறை
+            } else if (hour < 10) {
+                return ' காலை'; // காலை
+            } else if (hour < 14) {
+                return ' நண்பகல்'; // நண்பகல்
+            } else if (hour < 18) {
+                return ' எற்பாடு'; // எற்பாடு
+            } else if (hour < 22) {
+                return ' மாலை'; // மாலை
+            } else {
+                return ' யாமம்';
+            }
+        },
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'யாமம்') {
+                return hour < 2 ? hour : hour + 12;
+            } else if (meridiem === 'வைகறை' || meridiem === 'காலை') {
+                return hour;
+            } else if (meridiem === 'நண்பகல்') {
+                return hour >= 10 ? hour : hour + 12;
+            } else {
+                return hour + 12;
+            }
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 1st is the first week of the year.
         }
-    },
-    meridiemHour : function (hour, meridiem) {
-        if (hour === 12) {
-            hour = 0;
-        }
-        if (meridiem === 'யாமம்') {
-            return hour < 2 ? hour : hour + 12;
-        } else if (meridiem === 'வைகறை' || meridiem === 'காலை') {
-            return hour;
-        } else if (meridiem === 'நண்பகல்') {
-            return hour >= 10 ? hour : hour + 12;
-        } else {
-            return hour + 12;
-        }
-    },
-    week : {
-        dow : 0, // Sunday is the first day of the week.
-        doy : 6  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    });
 
-return ta;
+    return ta;
 
 })));
diff --git a/lib/javascripts/moment_locale/te.js b/lib/javascripts/moment_locale/te.js
old mode 100644
new mode 100755
index fe339047f55..fe9ec2b33ef
--- a/lib/javascripts/moment_locale/te.js
+++ b/lib/javascripts/moment_locale/te.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Telugu [te]
-//! author : Krishna Chaitanya Thota : https://github.com/kcthota
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,80 +8,81 @@
 }(this, (function (moment) { 'use strict';
 
 
-var te = moment.defineLocale('te', {
-    months : 'జనవరి_ఫిబ్రవరి_మార్చి_ఏప్రిల్_మే_జూన్_జూలై_ఆగస్టు_సెప్టెంబర్_అక్టోబర్_నవంబర్_డిసెంబర్'.split('_'),
-    monthsShort : 'జన._ఫిబ్ర._మార్చి_ఏప్రి._మే_జూన్_జూలై_ఆగ._సెప్._అక్టో._నవ._డిసె.'.split('_'),
-    monthsParseExact : true,
-    weekdays : 'ఆదివారం_సోమవారం_మంగళవారం_బుధవారం_గురువారం_శుక్రవారం_శనివారం'.split('_'),
-    weekdaysShort : 'ఆది_సోమ_మంగళ_బుధ_గురు_శుక్ర_శని'.split('_'),
-    weekdaysMin : 'ఆ_సో_మం_బు_గు_శు_శ'.split('_'),
-    longDateFormat : {
-        LT : 'A h:mm',
-        LTS : 'A h:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY, A h:mm',
-        LLLL : 'dddd, D MMMM YYYY, A h:mm'
-    },
-    calendar : {
-        sameDay : '[నేడు] LT',
-        nextDay : '[రేపు] LT',
-        nextWeek : 'dddd, LT',
-        lastDay : '[నిన్న] LT',
-        lastWeek : '[గత] dddd, LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : '%s లో',
-        past : '%s క్రితం',
-        s : 'కొన్ని క్షణాలు',
-        m : 'ఒక నిమిషం',
-        mm : '%d నిమిషాలు',
-        h : 'ఒక గంట',
-        hh : '%d గంటలు',
-        d : 'ఒక రోజు',
-        dd : '%d రోజులు',
-        M : 'ఒక నెల',
-        MM : '%d నెలలు',
-        y : 'ఒక సంవత్సరం',
-        yy : '%d సంవత్సరాలు'
-    },
-    dayOfMonthOrdinalParse : /\d{1,2}వ/,
-    ordinal : '%dవ',
-    meridiemParse: /రాత్రి|ఉదయం|మధ్యాహ్నం|సాయంత్రం/,
-    meridiemHour : function (hour, meridiem) {
-        if (hour === 12) {
-            hour = 0;
+    var te = moment.defineLocale('te', {
+        months : 'జనవరి_ఫిబ్రవరి_మార్చి_ఏప్రిల్_మే_జూన్_జూలై_ఆగస్టు_సెప్టెంబర్_అక్టోబర్_నవంబర్_డిసెంబర్'.split('_'),
+        monthsShort : 'జన._ఫిబ్ర._మార్చి_ఏప్రి._మే_జూన్_జూలై_ఆగ._సెప్._అక్టో._నవ._డిసె.'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'ఆదివారం_సోమవారం_మంగళవారం_బుధవారం_గురువారం_శుక్రవారం_శనివారం'.split('_'),
+        weekdaysShort : 'ఆది_సోమ_మంగళ_బుధ_గురు_శుక్ర_శని'.split('_'),
+        weekdaysMin : 'ఆ_సో_మం_బు_గు_శు_శ'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm',
+            LTS : 'A h:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, A h:mm',
+            LLLL : 'dddd, D MMMM YYYY, A h:mm'
+        },
+        calendar : {
+            sameDay : '[నేడు] LT',
+            nextDay : '[రేపు] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[నిన్న] LT',
+            lastWeek : '[గత] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s లో',
+            past : '%s క్రితం',
+            s : 'కొన్ని క్షణాలు',
+            ss : '%d సెకన్లు',
+            m : 'ఒక నిమిషం',
+            mm : '%d నిమిషాలు',
+            h : 'ఒక గంట',
+            hh : '%d గంటలు',
+            d : 'ఒక రోజు',
+            dd : '%d రోజులు',
+            M : 'ఒక నెల',
+            MM : '%d నెలలు',
+            y : 'ఒక సంవత్సరం',
+            yy : '%d సంవత్సరాలు'
+        },
+        dayOfMonthOrdinalParse : /\d{1,2}వ/,
+        ordinal : '%dవ',
+        meridiemParse: /రాత్రి|ఉదయం|మధ్యాహ్నం|సాయంత్రం/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'రాత్రి') {
+                return hour < 4 ? hour : hour + 12;
+            } else if (meridiem === 'ఉదయం') {
+                return hour;
+            } else if (meridiem === 'మధ్యాహ్నం') {
+                return hour >= 10 ? hour : hour + 12;
+            } else if (meridiem === 'సాయంత్రం') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'రాత్రి';
+            } else if (hour < 10) {
+                return 'ఉదయం';
+            } else if (hour < 17) {
+                return 'మధ్యాహ్నం';
+            } else if (hour < 20) {
+                return 'సాయంత్రం';
+            } else {
+                return 'రాత్రి';
+            }
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 1st is the first week of the year.
         }
-        if (meridiem === 'రాత్రి') {
-            return hour < 4 ? hour : hour + 12;
-        } else if (meridiem === 'ఉదయం') {
-            return hour;
-        } else if (meridiem === 'మధ్యాహ్నం') {
-            return hour >= 10 ? hour : hour + 12;
-        } else if (meridiem === 'సాయంత్రం') {
-            return hour + 12;
-        }
-    },
-    meridiem : function (hour, minute, isLower) {
-        if (hour < 4) {
-            return 'రాత్రి';
-        } else if (hour < 10) {
-            return 'ఉదయం';
-        } else if (hour < 17) {
-            return 'మధ్యాహ్నం';
-        } else if (hour < 20) {
-            return 'సాయంత్రం';
-        } else {
-            return 'రాత్రి';
-        }
-    },
-    week : {
-        dow : 0, // Sunday is the first day of the week.
-        doy : 6  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    });
 
-return te;
+    return te;
 
 })));
diff --git a/lib/javascripts/moment_locale/tet.js b/lib/javascripts/moment_locale/tet.js
old mode 100644
new mode 100755
index c9c2928f5ec..efa53da1eca
--- a/lib/javascripts/moment_locale/tet.js
+++ b/lib/javascripts/moment_locale/tet.js
@@ -1,7 +1,4 @@
 //! moment.js locale configuration
-//! locale : Tetun Dili (East Timor) [tet]
-//! author : Joshua Brooks : https://github.com/joshbrooks
-//! author : Onorio De J. Afonso : https://github.com/marobo
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -11,58 +8,59 @@
 }(this, (function (moment) { 'use strict';
 
 
-var tet = moment.defineLocale('tet', {
-    months : 'Janeiru_Fevereiru_Marsu_Abril_Maiu_Juniu_Juliu_Augustu_Setembru_Outubru_Novembru_Dezembru'.split('_'),
-    monthsShort : 'Jan_Fev_Mar_Abr_Mai_Jun_Jul_Aug_Set_Out_Nov_Dez'.split('_'),
-    weekdays : 'Domingu_Segunda_Tersa_Kuarta_Kinta_Sexta_Sabadu'.split('_'),
-    weekdaysShort : 'Dom_Seg_Ters_Kua_Kint_Sext_Sab'.split('_'),
-    weekdaysMin : 'Do_Seg_Te_Ku_Ki_Sex_Sa'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd, D MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay: '[Ohin iha] LT',
-        nextDay: '[Aban iha] LT',
-        nextWeek: 'dddd [iha] LT',
-        lastDay: '[Horiseik iha] LT',
-        lastWeek: 'dddd [semana kotuk] [iha] LT',
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'iha %s',
-        past : '%s liuba',
-        s : 'minutu balun',
-        m : 'minutu ida',
-        mm : 'minutus %d',
-        h : 'horas ida',
-        hh : 'horas %d',
-        d : 'loron ida',
-        dd : 'loron %d',
-        M : 'fulan ida',
-        MM : 'fulan %d',
-        y : 'tinan ida',
-        yy : 'tinan %d'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
-    ordinal : function (number) {
-        var b = number % 10,
-            output = (~~(number % 100 / 10) === 1) ? 'th' :
-            (b === 1) ? 'st' :
-            (b === 2) ? 'nd' :
-            (b === 3) ? 'rd' : 'th';
-        return number + output;
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    var tet = moment.defineLocale('tet', {
+        months : 'Janeiru_Fevereiru_Marsu_Abril_Maiu_Juñu_Jullu_Agustu_Setembru_Outubru_Novembru_Dezembru'.split('_'),
+        monthsShort : 'Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez'.split('_'),
+        weekdays : 'Domingu_Segunda_Tersa_Kuarta_Kinta_Sesta_Sabadu'.split('_'),
+        weekdaysShort : 'Dom_Seg_Ters_Kua_Kint_Sest_Sab'.split('_'),
+        weekdaysMin : 'Do_Seg_Te_Ku_Ki_Ses_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[Ohin iha] LT',
+            nextDay: '[Aban iha] LT',
+            nextWeek: 'dddd [iha] LT',
+            lastDay: '[Horiseik iha] LT',
+            lastWeek: 'dddd [semana kotuk] [iha] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'iha %s',
+            past : '%s liuba',
+            s : 'minutu balun',
+            ss : 'minutu %d',
+            m : 'minutu ida',
+            mm : 'minutu %d',
+            h : 'oras ida',
+            hh : 'oras %d',
+            d : 'loron ida',
+            dd : 'loron %d',
+            M : 'fulan ida',
+            MM : 'fulan %d',
+            y : 'tinan ida',
+            yy : 'tinan %d'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-return tet;
+    return tet;
 
 })));
diff --git a/lib/javascripts/moment_locale/tg.js b/lib/javascripts/moment_locale/tg.js
new file mode 100755
index 00000000000..c2833680859
--- /dev/null
+++ b/lib/javascripts/moment_locale/tg.js
@@ -0,0 +1,115 @@
+//! moment.js locale configuration
+
+;(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined'
+       && typeof require === 'function' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
+   factory(global.moment)
+}(this, (function (moment) { 'use strict';
+
+
+    var suffixes = {
+        0: '-ум',
+        1: '-ум',
+        2: '-юм',
+        3: '-юм',
+        4: '-ум',
+        5: '-ум',
+        6: '-ум',
+        7: '-ум',
+        8: '-ум',
+        9: '-ум',
+        10: '-ум',
+        12: '-ум',
+        13: '-ум',
+        20: '-ум',
+        30: '-юм',
+        40: '-ум',
+        50: '-ум',
+        60: '-ум',
+        70: '-ум',
+        80: '-ум',
+        90: '-ум',
+        100: '-ум'
+    };
+
+    var tg = moment.defineLocale('tg', {
+        months : 'январ_феврал_март_апрел_май_июн_июл_август_сентябр_октябр_ноябр_декабр'.split('_'),
+        monthsShort : 'янв_фев_мар_апр_май_июн_июл_авг_сен_окт_ноя_дек'.split('_'),
+        weekdays : 'якшанбе_душанбе_сешанбе_чоршанбе_панҷшанбе_ҷумъа_шанбе'.split('_'),
+        weekdaysShort : 'яшб_дшб_сшб_чшб_пшб_ҷум_шнб'.split('_'),
+        weekdaysMin : 'яш_дш_сш_чш_пш_ҷм_шб'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[Имрӯз соати] LT',
+            nextDay : '[Пагоҳ соати] LT',
+            lastDay : '[Дирӯз соати] LT',
+            nextWeek : 'dddd[и] [ҳафтаи оянда соати] LT',
+            lastWeek : 'dddd[и] [ҳафтаи гузашта соати] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'баъди %s',
+            past : '%s пеш',
+            s : 'якчанд сония',
+            m : 'як дақиқа',
+            mm : '%d дақиқа',
+            h : 'як соат',
+            hh : '%d соат',
+            d : 'як рӯз',
+            dd : '%d рӯз',
+            M : 'як моҳ',
+            MM : '%d моҳ',
+            y : 'як сол',
+            yy : '%d сол'
+        },
+        meridiemParse: /шаб|субҳ|рӯз|бегоҳ/,
+        meridiemHour: function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'шаб') {
+                return hour < 4 ? hour : hour + 12;
+            } else if (meridiem === 'субҳ') {
+                return hour;
+            } else if (meridiem === 'рӯз') {
+                return hour >= 11 ? hour : hour + 12;
+            } else if (meridiem === 'бегоҳ') {
+                return hour + 12;
+            }
+        },
+        meridiem: function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'шаб';
+            } else if (hour < 11) {
+                return 'субҳ';
+            } else if (hour < 16) {
+                return 'рӯз';
+            } else if (hour < 19) {
+                return 'бегоҳ';
+            } else {
+                return 'шаб';
+            }
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}-(ум|юм)/,
+        ordinal: function (number) {
+            var a = number % 10,
+                b = number >= 100 ? 100 : null;
+            return number + (suffixes[number] || suffixes[a] || suffixes[b]);
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1th is the first week of the year.
+        }
+    });
+
+    return tg;
+
+})));
diff --git a/lib/javascripts/moment_locale/th.js b/lib/javascripts/moment_locale/th.js
old mode 100644
new mode 100755
index 17ec0f19026..87489a4e009
--- a/lib/javascripts/moment_locale/th.js
+++ b/lib/javascripts/moment_locale/th.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Thai [th]
-//! author : Kridsada Thanabulpong : https://github.com/sirn
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,58 +8,59 @@
 }(this, (function (moment) { 'use strict';
 
 
-var th = moment.defineLocale('th', {
-    months : 'มกราคม_กุมภาพันธ์_มีนาคม_เมษายน_พฤษภาคม_มิถุนายน_กรกฎาคม_สิงหาคม_กันยายน_ตุลาคม_พฤศจิกายน_ธันวาคม'.split('_'),
-    monthsShort : 'ม.ค._ก.พ._มี.ค._เม.ย._พ.ค._มิ.ย._ก.ค._ส.ค._ก.ย._ต.ค._พ.ย._ธ.ค.'.split('_'),
-    monthsParseExact: true,
-    weekdays : 'อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัสบดี_ศุกร์_เสาร์'.split('_'),
-    weekdaysShort : 'อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัส_ศุกร์_เสาร์'.split('_'), // yes, three characters difference
-    weekdaysMin : 'อา._จ._อ._พ._พฤ._ศ._ส.'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'H:mm',
-        LTS : 'H:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY เวลา H:mm',
-        LLLL : 'วันddddที่ D MMMM YYYY เวลา H:mm'
-    },
-    meridiemParse: /ก่อนเที่ยง|หลังเที่ยง/,
-    isPM: function (input) {
-        return input === 'หลังเที่ยง';
-    },
-    meridiem : function (hour, minute, isLower) {
-        if (hour < 12) {
-            return 'ก่อนเที่ยง';
-        } else {
-            return 'หลังเที่ยง';
+    var th = moment.defineLocale('th', {
+        months : 'มกราคม_กุมภาพันธ์_มีนาคม_เมษายน_พฤษภาคม_มิถุนายน_กรกฎาคม_สิงหาคม_กันยายน_ตุลาคม_พฤศจิกายน_ธันวาคม'.split('_'),
+        monthsShort : 'ม.ค._ก.พ._มี.ค._เม.ย._พ.ค._มิ.ย._ก.ค._ส.ค._ก.ย._ต.ค._พ.ย._ธ.ค.'.split('_'),
+        monthsParseExact: true,
+        weekdays : 'อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัสบดี_ศุกร์_เสาร์'.split('_'),
+        weekdaysShort : 'อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัส_ศุกร์_เสาร์'.split('_'), // yes, three characters difference
+        weekdaysMin : 'อา._จ._อ._พ._พฤ._ศ._ส.'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY เวลา H:mm',
+            LLLL : 'วันddddที่ D MMMM YYYY เวลา H:mm'
+        },
+        meridiemParse: /ก่อนเที่ยง|หลังเที่ยง/,
+        isPM: function (input) {
+            return input === 'หลังเที่ยง';
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'ก่อนเที่ยง';
+            } else {
+                return 'หลังเที่ยง';
+            }
+        },
+        calendar : {
+            sameDay : '[วันนี้ เวลา] LT',
+            nextDay : '[พรุ่งนี้ เวลา] LT',
+            nextWeek : 'dddd[หน้า เวลา] LT',
+            lastDay : '[เมื่อวานนี้ เวลา] LT',
+            lastWeek : '[วัน]dddd[ที่แล้ว เวลา] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'อีก %s',
+            past : '%sที่แล้ว',
+            s : 'ไม่กี่วินาที',
+            ss : '%d วินาที',
+            m : '1 นาที',
+            mm : '%d นาที',
+            h : '1 ชั่วโมง',
+            hh : '%d ชั่วโมง',
+            d : '1 วัน',
+            dd : '%d วัน',
+            M : '1 เดือน',
+            MM : '%d เดือน',
+            y : '1 ปี',
+            yy : '%d ปี'
         }
-    },
-    calendar : {
-        sameDay : '[วันนี้ เวลา] LT',
-        nextDay : '[พรุ่งนี้ เวลา] LT',
-        nextWeek : 'dddd[หน้า เวลา] LT',
-        lastDay : '[เมื่อวานนี้ เวลา] LT',
-        lastWeek : '[วัน]dddd[ที่แล้ว เวลา] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'อีก %s',
-        past : '%sที่แล้ว',
-        s : 'ไม่กี่วินาที',
-        m : '1 นาที',
-        mm : '%d นาที',
-        h : '1 ชั่วโมง',
-        hh : '%d ชั่วโมง',
-        d : '1 วัน',
-        dd : '%d วัน',
-        M : '1 เดือน',
-        MM : '%d เดือน',
-        y : '1 ปี',
-        yy : '%d ปี'
-    }
-});
+    });
 
-return th;
+    return th;
 
 })));
diff --git a/lib/javascripts/moment_locale/tl-ph.js b/lib/javascripts/moment_locale/tl-ph.js
old mode 100644
new mode 100755
index f66b022073c..3f7e45ee92a
--- a/lib/javascripts/moment_locale/tl-ph.js
+++ b/lib/javascripts/moment_locale/tl-ph.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Tagalog (Philippines) [tl-ph]
-//! author : Dan Hagman : https://github.com/hagmandan
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,53 +8,54 @@
 }(this, (function (moment) { 'use strict';
 
 
-var tlPh = moment.defineLocale('tl-ph', {
-    months : 'Enero_Pebrero_Marso_Abril_Mayo_Hunyo_Hulyo_Agosto_Setyembre_Oktubre_Nobyembre_Disyembre'.split('_'),
-    monthsShort : 'Ene_Peb_Mar_Abr_May_Hun_Hul_Ago_Set_Okt_Nob_Dis'.split('_'),
-    weekdays : 'Linggo_Lunes_Martes_Miyerkules_Huwebes_Biyernes_Sabado'.split('_'),
-    weekdaysShort : 'Lin_Lun_Mar_Miy_Huw_Biy_Sab'.split('_'),
-    weekdaysMin : 'Li_Lu_Ma_Mi_Hu_Bi_Sab'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'MM/D/YYYY',
-        LL : 'MMMM D, YYYY',
-        LLL : 'MMMM D, YYYY HH:mm',
-        LLLL : 'dddd, MMMM DD, YYYY HH:mm'
-    },
-    calendar : {
-        sameDay: 'LT [ngayong araw]',
-        nextDay: '[Bukas ng] LT',
-        nextWeek: 'LT [sa susunod na] dddd',
-        lastDay: 'LT [kahapon]',
-        lastWeek: 'LT [noong nakaraang] dddd',
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'sa loob ng %s',
-        past : '%s ang nakalipas',
-        s : 'ilang segundo',
-        m : 'isang minuto',
-        mm : '%d minuto',
-        h : 'isang oras',
-        hh : '%d oras',
-        d : 'isang araw',
-        dd : '%d araw',
-        M : 'isang buwan',
-        MM : '%d buwan',
-        y : 'isang taon',
-        yy : '%d taon'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}/,
-    ordinal : function (number) {
-        return number;
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    var tlPh = moment.defineLocale('tl-ph', {
+        months : 'Enero_Pebrero_Marso_Abril_Mayo_Hunyo_Hulyo_Agosto_Setyembre_Oktubre_Nobyembre_Disyembre'.split('_'),
+        monthsShort : 'Ene_Peb_Mar_Abr_May_Hun_Hul_Ago_Set_Okt_Nob_Dis'.split('_'),
+        weekdays : 'Linggo_Lunes_Martes_Miyerkules_Huwebes_Biyernes_Sabado'.split('_'),
+        weekdaysShort : 'Lin_Lun_Mar_Miy_Huw_Biy_Sab'.split('_'),
+        weekdaysMin : 'Li_Lu_Ma_Mi_Hu_Bi_Sab'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'MM/D/YYYY',
+            LL : 'MMMM D, YYYY',
+            LLL : 'MMMM D, YYYY HH:mm',
+            LLLL : 'dddd, MMMM DD, YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: 'LT [ngayong araw]',
+            nextDay: '[Bukas ng] LT',
+            nextWeek: 'LT [sa susunod na] dddd',
+            lastDay: 'LT [kahapon]',
+            lastWeek: 'LT [noong nakaraang] dddd',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'sa loob ng %s',
+            past : '%s ang nakalipas',
+            s : 'ilang segundo',
+            ss : '%d segundo',
+            m : 'isang minuto',
+            mm : '%d minuto',
+            h : 'isang oras',
+            hh : '%d oras',
+            d : 'isang araw',
+            dd : '%d araw',
+            M : 'isang buwan',
+            MM : '%d buwan',
+            y : 'isang taon',
+            yy : '%d taon'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}/,
+        ordinal : function (number) {
+            return number;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-return tlPh;
+    return tlPh;
 
 })));
diff --git a/lib/javascripts/moment_locale/tlh.js b/lib/javascripts/moment_locale/tlh.js
old mode 100644
new mode 100755
index 7c3123c6595..7ea953b8aae
--- a/lib/javascripts/moment_locale/tlh.js
+++ b/lib/javascripts/moment_locale/tlh.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Klingon [tlh]
-//! author : Dominika Kruk : https://github.com/amaranthrose
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,111 +8,114 @@
 }(this, (function (moment) { 'use strict';
 
 
-var numbersNouns = 'pagh_wa’_cha’_wej_loS_vagh_jav_Soch_chorgh_Hut'.split('_');
+    var numbersNouns = 'pagh_wa’_cha’_wej_loS_vagh_jav_Soch_chorgh_Hut'.split('_');
 
-function translateFuture(output) {
-    var time = output;
-    time = (output.indexOf('jaj') !== -1) ?
-    time.slice(0, -3) + 'leS' :
-    (output.indexOf('jar') !== -1) ?
-    time.slice(0, -3) + 'waQ' :
-    (output.indexOf('DIS') !== -1) ?
-    time.slice(0, -3) + 'nem' :
-    time + ' pIq';
-    return time;
-}
-
-function translatePast(output) {
-    var time = output;
-    time = (output.indexOf('jaj') !== -1) ?
-    time.slice(0, -3) + 'Hu’' :
-    (output.indexOf('jar') !== -1) ?
-    time.slice(0, -3) + 'wen' :
-    (output.indexOf('DIS') !== -1) ?
-    time.slice(0, -3) + 'ben' :
-    time + ' ret';
-    return time;
-}
-
-function translate(number, withoutSuffix, string, isFuture) {
-    var numberNoun = numberAsNoun(number);
-    switch (string) {
-        case 'mm':
-            return numberNoun + ' tup';
-        case 'hh':
-            return numberNoun + ' rep';
-        case 'dd':
-            return numberNoun + ' jaj';
-        case 'MM':
-            return numberNoun + ' jar';
-        case 'yy':
-            return numberNoun + ' DIS';
+    function translateFuture(output) {
+        var time = output;
+        time = (output.indexOf('jaj') !== -1) ?
+        time.slice(0, -3) + 'leS' :
+        (output.indexOf('jar') !== -1) ?
+        time.slice(0, -3) + 'waQ' :
+        (output.indexOf('DIS') !== -1) ?
+        time.slice(0, -3) + 'nem' :
+        time + ' pIq';
+        return time;
     }
-}
 
-function numberAsNoun(number) {
-    var hundred = Math.floor((number % 1000) / 100),
-    ten = Math.floor((number % 100) / 10),
-    one = number % 10,
-    word = '';
-    if (hundred > 0) {
-        word += numbersNouns[hundred] + 'vatlh';
+    function translatePast(output) {
+        var time = output;
+        time = (output.indexOf('jaj') !== -1) ?
+        time.slice(0, -3) + 'Hu’' :
+        (output.indexOf('jar') !== -1) ?
+        time.slice(0, -3) + 'wen' :
+        (output.indexOf('DIS') !== -1) ?
+        time.slice(0, -3) + 'ben' :
+        time + ' ret';
+        return time;
     }
-    if (ten > 0) {
-        word += ((word !== '') ? ' ' : '') + numbersNouns[ten] + 'maH';
-    }
-    if (one > 0) {
-        word += ((word !== '') ? ' ' : '') + numbersNouns[one];
-    }
-    return (word === '') ? 'pagh' : word;
-}
 
-var tlh = moment.defineLocale('tlh', {
-    months : 'tera’ jar wa’_tera’ jar cha’_tera’ jar wej_tera’ jar loS_tera’ jar vagh_tera’ jar jav_tera’ jar Soch_tera’ jar chorgh_tera’ jar Hut_tera’ jar wa’maH_tera’ jar wa’maH wa’_tera’ jar wa’maH cha’'.split('_'),
-    monthsShort : 'jar wa’_jar cha’_jar wej_jar loS_jar vagh_jar jav_jar Soch_jar chorgh_jar Hut_jar wa’maH_jar wa’maH wa’_jar wa’maH cha’'.split('_'),
-    monthsParseExact : true,
-    weekdays : 'lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj'.split('_'),
-    weekdaysShort : 'lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj'.split('_'),
-    weekdaysMin : 'lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd, D MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay: '[DaHjaj] LT',
-        nextDay: '[wa’leS] LT',
-        nextWeek: 'LLL',
-        lastDay: '[wa’Hu’] LT',
-        lastWeek: 'LLL',
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : translateFuture,
-        past : translatePast,
-        s : 'puS lup',
-        m : 'wa’ tup',
-        mm : translate,
-        h : 'wa’ rep',
-        hh : translate,
-        d : 'wa’ jaj',
-        dd : translate,
-        M : 'wa’ jar',
-        MM : translate,
-        y : 'wa’ DIS',
-        yy : translate
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    function translate(number, withoutSuffix, string, isFuture) {
+        var numberNoun = numberAsNoun(number);
+        switch (string) {
+            case 'ss':
+                return numberNoun + ' lup';
+            case 'mm':
+                return numberNoun + ' tup';
+            case 'hh':
+                return numberNoun + ' rep';
+            case 'dd':
+                return numberNoun + ' jaj';
+            case 'MM':
+                return numberNoun + ' jar';
+            case 'yy':
+                return numberNoun + ' DIS';
+        }
     }
-});
 
-return tlh;
+    function numberAsNoun(number) {
+        var hundred = Math.floor((number % 1000) / 100),
+        ten = Math.floor((number % 100) / 10),
+        one = number % 10,
+        word = '';
+        if (hundred > 0) {
+            word += numbersNouns[hundred] + 'vatlh';
+        }
+        if (ten > 0) {
+            word += ((word !== '') ? ' ' : '') + numbersNouns[ten] + 'maH';
+        }
+        if (one > 0) {
+            word += ((word !== '') ? ' ' : '') + numbersNouns[one];
+        }
+        return (word === '') ? 'pagh' : word;
+    }
+
+    var tlh = moment.defineLocale('tlh', {
+        months : 'tera’ jar wa’_tera’ jar cha’_tera’ jar wej_tera’ jar loS_tera’ jar vagh_tera’ jar jav_tera’ jar Soch_tera’ jar chorgh_tera’ jar Hut_tera’ jar wa’maH_tera’ jar wa’maH wa’_tera’ jar wa’maH cha’'.split('_'),
+        monthsShort : 'jar wa’_jar cha’_jar wej_jar loS_jar vagh_jar jav_jar Soch_jar chorgh_jar Hut_jar wa’maH_jar wa’maH wa’_jar wa’maH cha’'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj'.split('_'),
+        weekdaysShort : 'lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj'.split('_'),
+        weekdaysMin : 'lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[DaHjaj] LT',
+            nextDay: '[wa’leS] LT',
+            nextWeek: 'LLL',
+            lastDay: '[wa’Hu’] LT',
+            lastWeek: 'LLL',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : translateFuture,
+            past : translatePast,
+            s : 'puS lup',
+            ss : translate,
+            m : 'wa’ tup',
+            mm : translate,
+            h : 'wa’ rep',
+            hh : translate,
+            d : 'wa’ jaj',
+            dd : translate,
+            M : 'wa’ jar',
+            MM : translate,
+            y : 'wa’ DIS',
+            yy : translate
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return tlh;
 
 })));
diff --git a/lib/javascripts/moment_locale/tr.js b/lib/javascripts/moment_locale/tr.js
old mode 100644
new mode 100755
index c4c58ca66fc..2e1dd7307ee
--- a/lib/javascripts/moment_locale/tr.js
+++ b/lib/javascripts/moment_locale/tr.js
@@ -1,7 +1,3 @@
-//! moment.js locale configuration
-//! locale : Turkish [tr]
-//! authors : Erhan Gundogan : https://github.com/erhangundogan,
-//!           Burak Yiğit Kaya: https://github.com/BYK
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,81 +6,88 @@
    factory(global.moment)
 }(this, (function (moment) { 'use strict';
 
+    var suffixes = {
+        1: '\'inci',
+        5: '\'inci',
+        8: '\'inci',
+        70: '\'inci',
+        80: '\'inci',
+        2: '\'nci',
+        7: '\'nci',
+        20: '\'nci',
+        50: '\'nci',
+        3: '\'üncü',
+        4: '\'üncü',
+        100: '\'üncü',
+        6: '\'ncı',
+        9: '\'uncu',
+        10: '\'uncu',
+        30: '\'uncu',
+        60: '\'ıncı',
+        90: '\'ıncı'
+    };
 
-var suffixes = {
-    1: '\'inci',
-    5: '\'inci',
-    8: '\'inci',
-    70: '\'inci',
-    80: '\'inci',
-    2: '\'nci',
-    7: '\'nci',
-    20: '\'nci',
-    50: '\'nci',
-    3: '\'üncü',
-    4: '\'üncü',
-    100: '\'üncü',
-    6: '\'ncı',
-    9: '\'uncu',
-    10: '\'uncu',
-    30: '\'uncu',
-    60: '\'ıncı',
-    90: '\'ıncı'
-};
-
-var tr = moment.defineLocale('tr', {
-    months : 'Ocak_Şubat_Mart_Nisan_Mayıs_Haziran_Temmuz_Ağustos_Eylül_Ekim_Kasım_Aralık'.split('_'),
-    monthsShort : 'Oca_Şub_Mar_Nis_May_Haz_Tem_Ağu_Eyl_Eki_Kas_Ara'.split('_'),
-    weekdays : 'Pazar_Pazartesi_Salı_Çarşamba_Perşembe_Cuma_Cumartesi'.split('_'),
-    weekdaysShort : 'Paz_Pts_Sal_Çar_Per_Cum_Cts'.split('_'),
-    weekdaysMin : 'Pz_Pt_Sa_Ça_Pe_Cu_Ct'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd, D MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay : '[bugün saat] LT',
-        nextDay : '[yarın saat] LT',
-        nextWeek : '[haftaya] dddd [saat] LT',
-        lastDay : '[dün] LT',
-        lastWeek : '[geçen hafta] dddd [saat] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : '%s sonra',
-        past : '%s önce',
-        s : 'birkaç saniye',
-        m : 'bir dakika',
-        mm : '%d dakika',
-        h : 'bir saat',
-        hh : '%d saat',
-        d : 'bir gün',
-        dd : '%d gün',
-        M : 'bir ay',
-        MM : '%d ay',
-        y : 'bir yıl',
-        yy : '%d yıl'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}'(inci|nci|üncü|ncı|uncu|ıncı)/,
-    ordinal : function (number) {
-        if (number === 0) {  // special case for zero
-            return number + '\'ıncı';
+    var tr = moment.defineLocale('tr', {
+        months : 'Ocak_Şubat_Mart_Nisan_Mayıs_Haziran_Temmuz_Ağustos_Eylül_Ekim_Kasım_Aralık'.split('_'),
+        monthsShort : 'Oca_Şub_Mar_Nis_May_Haz_Tem_Ağu_Eyl_Eki_Kas_Ara'.split('_'),
+        weekdays : 'Pazar_Pazartesi_Salı_Çarşamba_Perşembe_Cuma_Cumartesi'.split('_'),
+        weekdaysShort : 'Paz_Pts_Sal_Çar_Per_Cum_Cts'.split('_'),
+        weekdaysMin : 'Pz_Pt_Sa_Ça_Pe_Cu_Ct'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[bugün saat] LT',
+            nextDay : '[yarın saat] LT',
+            nextWeek : '[gelecek] dddd [saat] LT',
+            lastDay : '[dün] LT',
+            lastWeek : '[geçen] dddd [saat] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s sonra',
+            past : '%s önce',
+            s : 'birkaç saniye',
+            ss : '%d saniye',
+            m : 'bir dakika',
+            mm : '%d dakika',
+            h : 'bir saat',
+            hh : '%d saat',
+            d : 'bir gün',
+            dd : '%d gün',
+            M : 'bir ay',
+            MM : '%d ay',
+            y : 'bir yıl',
+            yy : '%d yıl'
+        },
+        ordinal: function (number, period) {
+            switch (period) {
+                case 'd':
+                case 'D':
+                case 'Do':
+                case 'DD':
+                    return number;
+                default:
+                    if (number === 0) {  // special case for zero
+                        return number + '\'ıncı';
+                    }
+                    var a = number % 10,
+                        b = number % 100 - a,
+                        c = number >= 100 ? 100 : null;
+                    return number + (suffixes[a] || suffixes[b] || suffixes[c]);
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
         }
-        var a = number % 10,
-            b = number % 100 - a,
-            c = number >= 100 ? 100 : null;
-        return number + (suffixes[a] || suffixes[b] || suffixes[c]);
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    });
 
-return tr;
+    return tr;
 
 })));
diff --git a/lib/javascripts/moment_locale/tzl.js b/lib/javascripts/moment_locale/tzl.js
old mode 100644
new mode 100755
index 978fcb488e7..d32601bc40e
--- a/lib/javascripts/moment_locale/tzl.js
+++ b/lib/javascripts/moment_locale/tzl.js
@@ -1,7 +1,4 @@
 //! moment.js locale configuration
-//! locale : Talossan [tzl]
-//! author : Robin van der Vliet : https://github.com/robin0van0der0v
-//! author : Iustì Canun
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -11,81 +8,83 @@
 }(this, (function (moment) { 'use strict';
 
 
-// After the year there should be a slash and the amount of years since December 26, 1979 in Roman numerals.
-// This is currently too difficult (maybe even impossible) to add.
-var tzl = moment.defineLocale('tzl', {
-    months : 'Januar_Fevraglh_Març_Avrïu_Mai_Gün_Julia_Guscht_Setemvar_Listopäts_Noemvar_Zecemvar'.split('_'),
-    monthsShort : 'Jan_Fev_Mar_Avr_Mai_Gün_Jul_Gus_Set_Lis_Noe_Zec'.split('_'),
-    weekdays : 'Súladi_Lúneçi_Maitzi_Márcuri_Xhúadi_Viénerçi_Sáturi'.split('_'),
-    weekdaysShort : 'Súl_Lún_Mai_Már_Xhú_Vié_Sát'.split('_'),
-    weekdaysMin : 'Sú_Lú_Ma_Má_Xh_Vi_Sá'.split('_'),
-    longDateFormat : {
-        LT : 'HH.mm',
-        LTS : 'HH.mm.ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D. MMMM [dallas] YYYY',
-        LLL : 'D. MMMM [dallas] YYYY HH.mm',
-        LLLL : 'dddd, [li] D. MMMM [dallas] YYYY HH.mm'
-    },
-    meridiemParse: /d\'o|d\'a/i,
-    isPM : function (input) {
-        return 'd\'o' === input.toLowerCase();
-    },
-    meridiem : function (hours, minutes, isLower) {
-        if (hours > 11) {
-            return isLower ? 'd\'o' : 'D\'O';
-        } else {
-            return isLower ? 'd\'a' : 'D\'A';
+    // After the year there should be a slash and the amount of years since December 26, 1979 in Roman numerals.
+    // This is currently too difficult (maybe even impossible) to add.
+    var tzl = moment.defineLocale('tzl', {
+        months : 'Januar_Fevraglh_Març_Avrïu_Mai_Gün_Julia_Guscht_Setemvar_Listopäts_Noemvar_Zecemvar'.split('_'),
+        monthsShort : 'Jan_Fev_Mar_Avr_Mai_Gün_Jul_Gus_Set_Lis_Noe_Zec'.split('_'),
+        weekdays : 'Súladi_Lúneçi_Maitzi_Márcuri_Xhúadi_Viénerçi_Sáturi'.split('_'),
+        weekdaysShort : 'Súl_Lún_Mai_Már_Xhú_Vié_Sát'.split('_'),
+        weekdaysMin : 'Sú_Lú_Ma_Má_Xh_Vi_Sá'.split('_'),
+        longDateFormat : {
+            LT : 'HH.mm',
+            LTS : 'HH.mm.ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM [dallas] YYYY',
+            LLL : 'D. MMMM [dallas] YYYY HH.mm',
+            LLLL : 'dddd, [li] D. MMMM [dallas] YYYY HH.mm'
+        },
+        meridiemParse: /d\'o|d\'a/i,
+        isPM : function (input) {
+            return 'd\'o' === input.toLowerCase();
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours > 11) {
+                return isLower ? 'd\'o' : 'D\'O';
+            } else {
+                return isLower ? 'd\'a' : 'D\'A';
+            }
+        },
+        calendar : {
+            sameDay : '[oxhi à] LT',
+            nextDay : '[demà à] LT',
+            nextWeek : 'dddd [à] LT',
+            lastDay : '[ieiri à] LT',
+            lastWeek : '[sür el] dddd [lasteu à] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'osprei %s',
+            past : 'ja%s',
+            s : processRelativeTime,
+            ss : processRelativeTime,
+            m : processRelativeTime,
+            mm : processRelativeTime,
+            h : processRelativeTime,
+            hh : processRelativeTime,
+            d : processRelativeTime,
+            dd : processRelativeTime,
+            M : processRelativeTime,
+            MM : processRelativeTime,
+            y : processRelativeTime,
+            yy : processRelativeTime
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
-    },
-    calendar : {
-        sameDay : '[oxhi à] LT',
-        nextDay : '[demà à] LT',
-        nextWeek : 'dddd [à] LT',
-        lastDay : '[ieiri à] LT',
-        lastWeek : '[sür el] dddd [lasteu à] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'osprei %s',
-        past : 'ja%s',
-        s : processRelativeTime,
-        m : processRelativeTime,
-        mm : processRelativeTime,
-        h : processRelativeTime,
-        hh : processRelativeTime,
-        d : processRelativeTime,
-        dd : processRelativeTime,
-        M : processRelativeTime,
-        MM : processRelativeTime,
-        y : processRelativeTime,
-        yy : processRelativeTime
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    });
+
+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var format = {
+            's': ['viensas secunds', '\'iensas secunds'],
+            'ss': [number + ' secunds', '' + number + ' secunds'],
+            'm': ['\'n míut', '\'iens míut'],
+            'mm': [number + ' míuts', '' + number + ' míuts'],
+            'h': ['\'n þora', '\'iensa þora'],
+            'hh': [number + ' þoras', '' + number + ' þoras'],
+            'd': ['\'n ziua', '\'iensa ziua'],
+            'dd': [number + ' ziuas', '' + number + ' ziuas'],
+            'M': ['\'n mes', '\'iens mes'],
+            'MM': [number + ' mesen', '' + number + ' mesen'],
+            'y': ['\'n ar', '\'iens ar'],
+            'yy': [number + ' ars', '' + number + ' ars']
+        };
+        return isFuture ? format[key][0] : (withoutSuffix ? format[key][0] : format[key][1]);
     }
-});
 
-function processRelativeTime(number, withoutSuffix, key, isFuture) {
-    var format = {
-        's': ['viensas secunds', '\'iensas secunds'],
-        'm': ['\'n míut', '\'iens míut'],
-        'mm': [number + ' míuts', '' + number + ' míuts'],
-        'h': ['\'n þora', '\'iensa þora'],
-        'hh': [number + ' þoras', '' + number + ' þoras'],
-        'd': ['\'n ziua', '\'iensa ziua'],
-        'dd': [number + ' ziuas', '' + number + ' ziuas'],
-        'M': ['\'n mes', '\'iens mes'],
-        'MM': [number + ' mesen', '' + number + ' mesen'],
-        'y': ['\'n ar', '\'iens ar'],
-        'yy': [number + ' ars', '' + number + ' ars']
-    };
-    return isFuture ? format[key][0] : (withoutSuffix ? format[key][0] : format[key][1]);
-}
-
-return tzl;
+    return tzl;
 
 })));
diff --git a/lib/javascripts/moment_locale/tzm-latn.js b/lib/javascripts/moment_locale/tzm-latn.js
old mode 100644
new mode 100755
index 4d742c52fe8..2f6a6f1988f
--- a/lib/javascripts/moment_locale/tzm-latn.js
+++ b/lib/javascripts/moment_locale/tzm-latn.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Central Atlas Tamazight Latin [tzm-latn]
-//! author : Abdel Said : https://github.com/abdelsaid
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,49 +8,50 @@
 }(this, (function (moment) { 'use strict';
 
 
-var tzmLatn = moment.defineLocale('tzm-latn', {
-    months : 'innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir'.split('_'),
-    monthsShort : 'innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir'.split('_'),
-    weekdays : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
-    weekdaysShort : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
-    weekdaysMin : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd D MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay: '[asdkh g] LT',
-        nextDay: '[aska g] LT',
-        nextWeek: 'dddd [g] LT',
-        lastDay: '[assant g] LT',
-        lastWeek: 'dddd [g] LT',
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'dadkh s yan %s',
-        past : 'yan %s',
-        s : 'imik',
-        m : 'minuḍ',
-        mm : '%d minuḍ',
-        h : 'saɛa',
-        hh : '%d tassaɛin',
-        d : 'ass',
-        dd : '%d ossan',
-        M : 'ayowr',
-        MM : '%d iyyirn',
-        y : 'asgas',
-        yy : '%d isgasn'
-    },
-    week : {
-        dow : 6, // Saturday is the first day of the week.
-        doy : 12  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    var tzmLatn = moment.defineLocale('tzm-latn', {
+        months : 'innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir'.split('_'),
+        monthsShort : 'innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir'.split('_'),
+        weekdays : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
+        weekdaysShort : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
+        weekdaysMin : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[asdkh g] LT',
+            nextDay: '[aska g] LT',
+            nextWeek: 'dddd [g] LT',
+            lastDay: '[assant g] LT',
+            lastWeek: 'dddd [g] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'dadkh s yan %s',
+            past : 'yan %s',
+            s : 'imik',
+            ss : '%d imik',
+            m : 'minuḍ',
+            mm : '%d minuḍ',
+            h : 'saɛa',
+            hh : '%d tassaɛin',
+            d : 'ass',
+            dd : '%d ossan',
+            M : 'ayowr',
+            MM : '%d iyyirn',
+            y : 'asgas',
+            yy : '%d isgasn'
+        },
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
 
-return tzmLatn;
+    return tzmLatn;
 
 })));
diff --git a/lib/javascripts/moment_locale/tzm.js b/lib/javascripts/moment_locale/tzm.js
old mode 100644
new mode 100755
index 1d1c26006d3..1badf81b279
--- a/lib/javascripts/moment_locale/tzm.js
+++ b/lib/javascripts/moment_locale/tzm.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Central Atlas Tamazight [tzm]
-//! author : Abdel Said : https://github.com/abdelsaid
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,49 +8,50 @@
 }(this, (function (moment) { 'use strict';
 
 
-var tzm = moment.defineLocale('tzm', {
-    months : 'ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ'.split('_'),
-    monthsShort : 'ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ'.split('_'),
-    weekdays : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
-    weekdaysShort : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
-    weekdaysMin : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS: 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd D MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay: '[ⴰⵙⴷⵅ ⴴ] LT',
-        nextDay: '[ⴰⵙⴽⴰ ⴴ] LT',
-        nextWeek: 'dddd [ⴴ] LT',
-        lastDay: '[ⴰⵚⴰⵏⵜ ⴴ] LT',
-        lastWeek: 'dddd [ⴴ] LT',
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'ⴷⴰⴷⵅ ⵙ ⵢⴰⵏ %s',
-        past : 'ⵢⴰⵏ %s',
-        s : 'ⵉⵎⵉⴽ',
-        m : 'ⵎⵉⵏⵓⴺ',
-        mm : '%d ⵎⵉⵏⵓⴺ',
-        h : 'ⵙⴰⵄⴰ',
-        hh : '%d ⵜⴰⵙⵙⴰⵄⵉⵏ',
-        d : 'ⴰⵙⵙ',
-        dd : '%d oⵙⵙⴰⵏ',
-        M : 'ⴰⵢoⵓⵔ',
-        MM : '%d ⵉⵢⵢⵉⵔⵏ',
-        y : 'ⴰⵙⴳⴰⵙ',
-        yy : '%d ⵉⵙⴳⴰⵙⵏ'
-    },
-    week : {
-        dow : 6, // Saturday is the first day of the week.
-        doy : 12  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    var tzm = moment.defineLocale('tzm', {
+        months : 'ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ'.split('_'),
+        monthsShort : 'ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ'.split('_'),
+        weekdays : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
+        weekdaysShort : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
+        weekdaysMin : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[ⴰⵙⴷⵅ ⴴ] LT',
+            nextDay: '[ⴰⵙⴽⴰ ⴴ] LT',
+            nextWeek: 'dddd [ⴴ] LT',
+            lastDay: '[ⴰⵚⴰⵏⵜ ⴴ] LT',
+            lastWeek: 'dddd [ⴴ] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'ⴷⴰⴷⵅ ⵙ ⵢⴰⵏ %s',
+            past : 'ⵢⴰⵏ %s',
+            s : 'ⵉⵎⵉⴽ',
+            ss : '%d ⵉⵎⵉⴽ',
+            m : 'ⵎⵉⵏⵓⴺ',
+            mm : '%d ⵎⵉⵏⵓⴺ',
+            h : 'ⵙⴰⵄⴰ',
+            hh : '%d ⵜⴰⵙⵙⴰⵄⵉⵏ',
+            d : 'ⴰⵙⵙ',
+            dd : '%d oⵙⵙⴰⵏ',
+            M : 'ⴰⵢoⵓⵔ',
+            MM : '%d ⵉⵢⵢⵉⵔⵏ',
+            y : 'ⴰⵙⴳⴰⵙ',
+            yy : '%d ⵉⵙⴳⴰⵙⵏ'
+        },
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
 
-return tzm;
+    return tzm;
 
 })));
diff --git a/lib/javascripts/moment_locale/ug-cn.js b/lib/javascripts/moment_locale/ug-cn.js
new file mode 100755
index 00000000000..d6c9d654959
--- /dev/null
+++ b/lib/javascripts/moment_locale/ug-cn.js
@@ -0,0 +1,118 @@
+//! moment.js language configuration
+
+;(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined'
+       && typeof require === 'function' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
+   factory(global.moment)
+}(this, (function (moment) { 'use strict';
+
+
+    var ugCn = moment.defineLocale('ug-cn', {
+        months: 'يانۋار_فېۋرال_مارت_ئاپرېل_ماي_ئىيۇن_ئىيۇل_ئاۋغۇست_سېنتەبىر_ئۆكتەبىر_نويابىر_دېكابىر'.split(
+            '_'
+        ),
+        monthsShort: 'يانۋار_فېۋرال_مارت_ئاپرېل_ماي_ئىيۇن_ئىيۇل_ئاۋغۇست_سېنتەبىر_ئۆكتەبىر_نويابىر_دېكابىر'.split(
+            '_'
+        ),
+        weekdays: 'يەكشەنبە_دۈشەنبە_سەيشەنبە_چارشەنبە_پەيشەنبە_جۈمە_شەنبە'.split(
+            '_'
+        ),
+        weekdaysShort: 'يە_دۈ_سە_چا_پە_جۈ_شە'.split('_'),
+        weekdaysMin: 'يە_دۈ_سە_چا_پە_جۈ_شە'.split('_'),
+        longDateFormat: {
+            LT: 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L: 'YYYY-MM-DD',
+            LL: 'YYYY-يىلىM-ئاينىڭD-كۈنى',
+            LLL: 'YYYY-يىلىM-ئاينىڭD-كۈنى، HH:mm',
+            LLLL: 'dddd، YYYY-يىلىM-ئاينىڭD-كۈنى، HH:mm'
+        },
+        meridiemParse: /يېرىم كېچە|سەھەر|چۈشتىن بۇرۇن|چۈش|چۈشتىن كېيىن|كەچ/,
+        meridiemHour: function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (
+                meridiem === 'يېرىم كېچە' ||
+                meridiem === 'سەھەر' ||
+                meridiem === 'چۈشتىن بۇرۇن'
+            ) {
+                return hour;
+            } else if (meridiem === 'چۈشتىن كېيىن' || meridiem === 'كەچ') {
+                return hour + 12;
+            } else {
+                return hour >= 11 ? hour : hour + 12;
+            }
+        },
+        meridiem: function (hour, minute, isLower) {
+            var hm = hour * 100 + minute;
+            if (hm < 600) {
+                return 'يېرىم كېچە';
+            } else if (hm < 900) {
+                return 'سەھەر';
+            } else if (hm < 1130) {
+                return 'چۈشتىن بۇرۇن';
+            } else if (hm < 1230) {
+                return 'چۈش';
+            } else if (hm < 1800) {
+                return 'چۈشتىن كېيىن';
+            } else {
+                return 'كەچ';
+            }
+        },
+        calendar: {
+            sameDay: '[بۈگۈن سائەت] LT',
+            nextDay: '[ئەتە سائەت] LT',
+            nextWeek: '[كېلەركى] dddd [سائەت] LT',
+            lastDay: '[تۆنۈگۈن] LT',
+            lastWeek: '[ئالدىنقى] dddd [سائەت] LT',
+            sameElse: 'L'
+        },
+        relativeTime: {
+            future: '%s كېيىن',
+            past: '%s بۇرۇن',
+            s: 'نەچچە سېكونت',
+            ss: '%d سېكونت',
+            m: 'بىر مىنۇت',
+            mm: '%d مىنۇت',
+            h: 'بىر سائەت',
+            hh: '%d سائەت',
+            d: 'بىر كۈن',
+            dd: '%d كۈن',
+            M: 'بىر ئاي',
+            MM: '%d ئاي',
+            y: 'بىر يىل',
+            yy: '%d يىل'
+        },
+
+        dayOfMonthOrdinalParse: /\d{1,2}(-كۈنى|-ئاي|-ھەپتە)/,
+        ordinal: function (number, period) {
+            switch (period) {
+                case 'd':
+                case 'D':
+                case 'DDD':
+                    return number + '-كۈنى';
+                case 'w':
+                case 'W':
+                    return number + '-ھەپتە';
+                default:
+                    return number;
+            }
+        },
+        preparse: function (string) {
+            return string.replace(/،/g, ',');
+        },
+        postformat: function (string) {
+            return string.replace(/,/g, '،');
+        },
+        week: {
+            // GB/T 7408-1994《数据元和交换格式·信息交换·日期和时间表示法》与ISO 8601:1988等效
+            dow: 1, // Monday is the first day of the week.
+            doy: 7 // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return ugCn;
+
+})));
diff --git a/lib/javascripts/moment_locale/uk.js b/lib/javascripts/moment_locale/uk.js
old mode 100644
new mode 100755
index 1aff8c14d79..a8e7eddd48d
--- a/lib/javascripts/moment_locale/uk.js
+++ b/lib/javascripts/moment_locale/uk.js
@@ -1,7 +1,4 @@
 //! moment.js locale configuration
-//! locale : Ukrainian [uk]
-//! author : zemlanin : https://github.com/zemlanin
-//! Author : Menelion Elensúle : https://github.com/Oire
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -11,141 +8,143 @@
 }(this, (function (moment) { 'use strict';
 
 
-function plural(word, num) {
-    var forms = word.split('_');
-    return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
-}
-function relativeTimeWithPlural(number, withoutSuffix, key) {
-    var format = {
-        'mm': withoutSuffix ? 'хвилина_хвилини_хвилин' : 'хвилину_хвилини_хвилин',
-        'hh': withoutSuffix ? 'година_години_годин' : 'годину_години_годин',
-        'dd': 'день_дні_днів',
-        'MM': 'місяць_місяці_місяців',
-        'yy': 'рік_роки_років'
-    };
-    if (key === 'm') {
-        return withoutSuffix ? 'хвилина' : 'хвилину';
+    function plural(word, num) {
+        var forms = word.split('_');
+        return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
     }
-    else if (key === 'h') {
-        return withoutSuffix ? 'година' : 'годину';
+    function relativeTimeWithPlural(number, withoutSuffix, key) {
+        var format = {
+            'ss': withoutSuffix ? 'секунда_секунди_секунд' : 'секунду_секунди_секунд',
+            'mm': withoutSuffix ? 'хвилина_хвилини_хвилин' : 'хвилину_хвилини_хвилин',
+            'hh': withoutSuffix ? 'година_години_годин' : 'годину_години_годин',
+            'dd': 'день_дні_днів',
+            'MM': 'місяць_місяці_місяців',
+            'yy': 'рік_роки_років'
+        };
+        if (key === 'm') {
+            return withoutSuffix ? 'хвилина' : 'хвилину';
+        }
+        else if (key === 'h') {
+            return withoutSuffix ? 'година' : 'годину';
+        }
+        else {
+            return number + ' ' + plural(format[key], +number);
+        }
     }
-    else {
-        return number + ' ' + plural(format[key], +number);
-    }
-}
-function weekdaysCaseReplace(m, format) {
-    var weekdays = {
-        'nominative': 'неділя_понеділок_вівторок_середа_четвер_п’ятниця_субота'.split('_'),
-        'accusative': 'неділю_понеділок_вівторок_середу_четвер_п’ятницю_суботу'.split('_'),
-        'genitive': 'неділі_понеділка_вівторка_середи_четверга_п’ятниці_суботи'.split('_')
-    };
+    function weekdaysCaseReplace(m, format) {
+        var weekdays = {
+            'nominative': 'неділя_понеділок_вівторок_середа_четвер_п’ятниця_субота'.split('_'),
+            'accusative': 'неділю_понеділок_вівторок_середу_четвер_п’ятницю_суботу'.split('_'),
+            'genitive': 'неділі_понеділка_вівторка_середи_четверга_п’ятниці_суботи'.split('_')
+        };
 
-    if (!m) {
-        return weekdays['nominative'];
+        if (!m) {
+            return weekdays['nominative'];
+        }
+
+        var nounCase = (/(\[[ВвУу]\]) ?dddd/).test(format) ?
+            'accusative' :
+            ((/\[?(?:минулої|наступної)? ?\] ?dddd/).test(format) ?
+                'genitive' :
+                'nominative');
+        return weekdays[nounCase][m.day()];
+    }
+    function processHoursFunction(str) {
+        return function () {
+            return str + 'о' + (this.hours() === 11 ? 'б' : '') + '] LT';
+        };
     }
 
-    var nounCase = (/(\[[ВвУу]\]) ?dddd/).test(format) ?
-        'accusative' :
-        ((/\[?(?:минулої|наступної)? ?\] ?dddd/).test(format) ?
-            'genitive' :
-            'nominative');
-    return weekdays[nounCase][m.day()];
-}
-function processHoursFunction(str) {
-    return function () {
-        return str + 'о' + (this.hours() === 11 ? 'б' : '') + '] LT';
-    };
-}
-
-var uk = moment.defineLocale('uk', {
-    months : {
-        'format': 'січня_лютого_березня_квітня_травня_червня_липня_серпня_вересня_жовтня_листопада_грудня'.split('_'),
-        'standalone': 'січень_лютий_березень_квітень_травень_червень_липень_серпень_вересень_жовтень_листопад_грудень'.split('_')
-    },
-    monthsShort : 'січ_лют_бер_квіт_трав_черв_лип_серп_вер_жовт_лист_груд'.split('_'),
-    weekdays : weekdaysCaseReplace,
-    weekdaysShort : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
-    weekdaysMin : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D MMMM YYYY р.',
-        LLL : 'D MMMM YYYY р., HH:mm',
-        LLLL : 'dddd, D MMMM YYYY р., HH:mm'
-    },
-    calendar : {
-        sameDay: processHoursFunction('[Сьогодні '),
-        nextDay: processHoursFunction('[Завтра '),
-        lastDay: processHoursFunction('[Вчора '),
-        nextWeek: processHoursFunction('[У] dddd ['),
-        lastWeek: function () {
-            switch (this.day()) {
-                case 0:
-                case 3:
-                case 5:
-                case 6:
-                    return processHoursFunction('[Минулої] dddd [').call(this);
-                case 1:
-                case 2:
-                case 4:
-                    return processHoursFunction('[Минулого] dddd [').call(this);
+    var uk = moment.defineLocale('uk', {
+        months : {
+            'format': 'січня_лютого_березня_квітня_травня_червня_липня_серпня_вересня_жовтня_листопада_грудня'.split('_'),
+            'standalone': 'січень_лютий_березень_квітень_травень_червень_липень_серпень_вересень_жовтень_листопад_грудень'.split('_')
+        },
+        monthsShort : 'січ_лют_бер_квіт_трав_черв_лип_серп_вер_жовт_лист_груд'.split('_'),
+        weekdays : weekdaysCaseReplace,
+        weekdaysShort : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
+        weekdaysMin : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY р.',
+            LLL : 'D MMMM YYYY р., HH:mm',
+            LLLL : 'dddd, D MMMM YYYY р., HH:mm'
+        },
+        calendar : {
+            sameDay: processHoursFunction('[Сьогодні '),
+            nextDay: processHoursFunction('[Завтра '),
+            lastDay: processHoursFunction('[Вчора '),
+            nextWeek: processHoursFunction('[У] dddd ['),
+            lastWeek: function () {
+                switch (this.day()) {
+                    case 0:
+                    case 3:
+                    case 5:
+                    case 6:
+                        return processHoursFunction('[Минулої] dddd [').call(this);
+                    case 1:
+                    case 2:
+                    case 4:
+                        return processHoursFunction('[Минулого] dddd [').call(this);
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'за %s',
+            past : '%s тому',
+            s : 'декілька секунд',
+            ss : relativeTimeWithPlural,
+            m : relativeTimeWithPlural,
+            mm : relativeTimeWithPlural,
+            h : 'годину',
+            hh : relativeTimeWithPlural,
+            d : 'день',
+            dd : relativeTimeWithPlural,
+            M : 'місяць',
+            MM : relativeTimeWithPlural,
+            y : 'рік',
+            yy : relativeTimeWithPlural
+        },
+        // M. E.: those two are virtually unused but a user might want to implement them for his/her website for some reason
+        meridiemParse: /ночі|ранку|дня|вечора/,
+        isPM: function (input) {
+            return /^(дня|вечора)$/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'ночі';
+            } else if (hour < 12) {
+                return 'ранку';
+            } else if (hour < 17) {
+                return 'дня';
+            } else {
+                return 'вечора';
             }
         },
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'за %s',
-        past : '%s тому',
-        s : 'декілька секунд',
-        m : relativeTimeWithPlural,
-        mm : relativeTimeWithPlural,
-        h : 'годину',
-        hh : relativeTimeWithPlural,
-        d : 'день',
-        dd : relativeTimeWithPlural,
-        M : 'місяць',
-        MM : relativeTimeWithPlural,
-        y : 'рік',
-        yy : relativeTimeWithPlural
-    },
-    // M. E.: those two are virtually unused but a user might want to implement them for his/her website for some reason
-    meridiemParse: /ночі|ранку|дня|вечора/,
-    isPM: function (input) {
-        return /^(дня|вечора)$/.test(input);
-    },
-    meridiem : function (hour, minute, isLower) {
-        if (hour < 4) {
-            return 'ночі';
-        } else if (hour < 12) {
-            return 'ранку';
-        } else if (hour < 17) {
-            return 'дня';
-        } else {
-            return 'вечора';
+        dayOfMonthOrdinalParse: /\d{1,2}-(й|го)/,
+        ordinal: function (number, period) {
+            switch (period) {
+                case 'M':
+                case 'd':
+                case 'DDD':
+                case 'w':
+                case 'W':
+                    return number + '-й';
+                case 'D':
+                    return number + '-го';
+                default:
+                    return number;
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
         }
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}-(й|го)/,
-    ordinal: function (number, period) {
-        switch (period) {
-            case 'M':
-            case 'd':
-            case 'DDD':
-            case 'w':
-            case 'W':
-                return number + '-й';
-            case 'D':
-                return number + '-го';
-            default:
-                return number;
-        }
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    });
 
-return uk;
+    return uk;
 
 })));
diff --git a/lib/javascripts/moment_locale/ur.js b/lib/javascripts/moment_locale/ur.js
old mode 100644
new mode 100755
index 4cf1c07af9e..16093125817
--- a/lib/javascripts/moment_locale/ur.js
+++ b/lib/javascripts/moment_locale/ur.js
@@ -1,7 +1,4 @@
 //! moment.js locale configuration
-//! locale : Urdu [ur]
-//! author : Sawood Alam : https://github.com/ibnesayeed
-//! author : Zack : https://github.com/ZackVision
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -11,89 +8,90 @@
 }(this, (function (moment) { 'use strict';
 
 
-var months = [
-    'جنوری',
-    'فروری',
-    'مارچ',
-    'اپریل',
-    'مئی',
-    'جون',
-    'جولائی',
-    'اگست',
-    'ستمبر',
-    'اکتوبر',
-    'نومبر',
-    'دسمبر'
-];
-var days = [
-    'اتوار',
-    'پیر',
-    'منگل',
-    'بدھ',
-    'جمعرات',
-    'جمعہ',
-    'ہفتہ'
-];
+    var months = [
+        'جنوری',
+        'فروری',
+        'مارچ',
+        'اپریل',
+        'مئی',
+        'جون',
+        'جولائی',
+        'اگست',
+        'ستمبر',
+        'اکتوبر',
+        'نومبر',
+        'دسمبر'
+    ];
+    var days = [
+        'اتوار',
+        'پیر',
+        'منگل',
+        'بدھ',
+        'جمعرات',
+        'جمعہ',
+        'ہفتہ'
+    ];
 
-var ur = moment.defineLocale('ur', {
-    months : months,
-    monthsShort : months,
-    weekdays : days,
-    weekdaysShort : days,
-    weekdaysMin : days,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd، D MMMM YYYY HH:mm'
-    },
-    meridiemParse: /صبح|شام/,
-    isPM : function (input) {
-        return 'شام' === input;
-    },
-    meridiem : function (hour, minute, isLower) {
-        if (hour < 12) {
-            return 'صبح';
+    var ur = moment.defineLocale('ur', {
+        months : months,
+        monthsShort : months,
+        weekdays : days,
+        weekdaysShort : days,
+        weekdaysMin : days,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd، D MMMM YYYY HH:mm'
+        },
+        meridiemParse: /صبح|شام/,
+        isPM : function (input) {
+            return 'شام' === input;
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'صبح';
+            }
+            return 'شام';
+        },
+        calendar : {
+            sameDay : '[آج بوقت] LT',
+            nextDay : '[کل بوقت] LT',
+            nextWeek : 'dddd [بوقت] LT',
+            lastDay : '[گذشتہ روز بوقت] LT',
+            lastWeek : '[گذشتہ] dddd [بوقت] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s بعد',
+            past : '%s قبل',
+            s : 'چند سیکنڈ',
+            ss : '%d سیکنڈ',
+            m : 'ایک منٹ',
+            mm : '%d منٹ',
+            h : 'ایک گھنٹہ',
+            hh : '%d گھنٹے',
+            d : 'ایک دن',
+            dd : '%d دن',
+            M : 'ایک ماہ',
+            MM : '%d ماہ',
+            y : 'ایک سال',
+            yy : '%d سال'
+        },
+        preparse: function (string) {
+            return string.replace(/،/g, ',');
+        },
+        postformat: function (string) {
+            return string.replace(/,/g, '،');
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
-        return 'شام';
-    },
-    calendar : {
-        sameDay : '[آج بوقت] LT',
-        nextDay : '[کل بوقت] LT',
-        nextWeek : 'dddd [بوقت] LT',
-        lastDay : '[گذشتہ روز بوقت] LT',
-        lastWeek : '[گذشتہ] dddd [بوقت] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : '%s بعد',
-        past : '%s قبل',
-        s : 'چند سیکنڈ',
-        m : 'ایک منٹ',
-        mm : '%d منٹ',
-        h : 'ایک گھنٹہ',
-        hh : '%d گھنٹے',
-        d : 'ایک دن',
-        dd : '%d دن',
-        M : 'ایک ماہ',
-        MM : '%d ماہ',
-        y : 'ایک سال',
-        yy : '%d سال'
-    },
-    preparse: function (string) {
-        return string.replace(/،/g, ',');
-    },
-    postformat: function (string) {
-        return string.replace(/,/g, '،');
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    });
 
-return ur;
+    return ur;
 
 })));
diff --git a/lib/javascripts/moment_locale/uz-latn.js b/lib/javascripts/moment_locale/uz-latn.js
old mode 100644
new mode 100755
index 21463b76682..cb32115be34
--- a/lib/javascripts/moment_locale/uz-latn.js
+++ b/lib/javascripts/moment_locale/uz-latn.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Uzbek Latin [uz-latn]
-//! author : Rasulbek Mirzayev : github.com/Rasulbeeek
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,49 +8,50 @@
 }(this, (function (moment) { 'use strict';
 
 
-var uzLatn = moment.defineLocale('uz-latn', {
-    months : 'Yanvar_Fevral_Mart_Aprel_May_Iyun_Iyul_Avgust_Sentabr_Oktabr_Noyabr_Dekabr'.split('_'),
-    monthsShort : 'Yan_Fev_Mar_Apr_May_Iyun_Iyul_Avg_Sen_Okt_Noy_Dek'.split('_'),
-    weekdays : 'Yakshanba_Dushanba_Seshanba_Chorshanba_Payshanba_Juma_Shanba'.split('_'),
-    weekdaysShort : 'Yak_Dush_Sesh_Chor_Pay_Jum_Shan'.split('_'),
-    weekdaysMin : 'Ya_Du_Se_Cho_Pa_Ju_Sha'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'D MMMM YYYY, dddd HH:mm'
-    },
-    calendar : {
-        sameDay : '[Bugun soat] LT [da]',
-        nextDay : '[Ertaga] LT [da]',
-        nextWeek : 'dddd [kuni soat] LT [da]',
-        lastDay : '[Kecha soat] LT [da]',
-        lastWeek : '[O\'tgan] dddd [kuni soat] LT [da]',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'Yaqin %s ichida',
-        past : 'Bir necha %s oldin',
-        s : 'soniya',
-        m : 'bir daqiqa',
-        mm : '%d daqiqa',
-        h : 'bir soat',
-        hh : '%d soat',
-        d : 'bir kun',
-        dd : '%d kun',
-        M : 'bir oy',
-        MM : '%d oy',
-        y : 'bir yil',
-        yy : '%d yil'
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    var uzLatn = moment.defineLocale('uz-latn', {
+        months : 'Yanvar_Fevral_Mart_Aprel_May_Iyun_Iyul_Avgust_Sentabr_Oktabr_Noyabr_Dekabr'.split('_'),
+        monthsShort : 'Yan_Fev_Mar_Apr_May_Iyun_Iyul_Avg_Sen_Okt_Noy_Dek'.split('_'),
+        weekdays : 'Yakshanba_Dushanba_Seshanba_Chorshanba_Payshanba_Juma_Shanba'.split('_'),
+        weekdaysShort : 'Yak_Dush_Sesh_Chor_Pay_Jum_Shan'.split('_'),
+        weekdaysMin : 'Ya_Du_Se_Cho_Pa_Ju_Sha'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'D MMMM YYYY, dddd HH:mm'
+        },
+        calendar : {
+            sameDay : '[Bugun soat] LT [da]',
+            nextDay : '[Ertaga] LT [da]',
+            nextWeek : 'dddd [kuni soat] LT [da]',
+            lastDay : '[Kecha soat] LT [da]',
+            lastWeek : '[O\'tgan] dddd [kuni soat] LT [da]',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'Yaqin %s ichida',
+            past : 'Bir necha %s oldin',
+            s : 'soniya',
+            ss : '%d soniya',
+            m : 'bir daqiqa',
+            mm : '%d daqiqa',
+            h : 'bir soat',
+            hh : '%d soat',
+            d : 'bir kun',
+            dd : '%d kun',
+            M : 'bir oy',
+            MM : '%d oy',
+            y : 'bir yil',
+            yy : '%d yil'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
 
-return uzLatn;
+    return uzLatn;
 
 })));
diff --git a/lib/javascripts/moment_locale/uz.js b/lib/javascripts/moment_locale/uz.js
old mode 100644
new mode 100755
index 378461eb003..0e4ad22d202
--- a/lib/javascripts/moment_locale/uz.js
+++ b/lib/javascripts/moment_locale/uz.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Uzbek [uz]
-//! author : Sardor Muminov : https://github.com/muminoff
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,49 +8,50 @@
 }(this, (function (moment) { 'use strict';
 
 
-var uz = moment.defineLocale('uz', {
-    months : 'январ_феврал_март_апрел_май_июн_июл_август_сентябр_октябр_ноябр_декабр'.split('_'),
-    monthsShort : 'янв_фев_мар_апр_май_июн_июл_авг_сен_окт_ноя_дек'.split('_'),
-    weekdays : 'Якшанба_Душанба_Сешанба_Чоршанба_Пайшанба_Жума_Шанба'.split('_'),
-    weekdaysShort : 'Якш_Душ_Сеш_Чор_Пай_Жум_Шан'.split('_'),
-    weekdaysMin : 'Як_Ду_Се_Чо_Па_Жу_Ша'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'D MMMM YYYY, dddd HH:mm'
-    },
-    calendar : {
-        sameDay : '[Бугун соат] LT [да]',
-        nextDay : '[Эртага] LT [да]',
-        nextWeek : 'dddd [куни соат] LT [да]',
-        lastDay : '[Кеча соат] LT [да]',
-        lastWeek : '[Утган] dddd [куни соат] LT [да]',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'Якин %s ичида',
-        past : 'Бир неча %s олдин',
-        s : 'фурсат',
-        m : 'бир дакика',
-        mm : '%d дакика',
-        h : 'бир соат',
-        hh : '%d соат',
-        d : 'бир кун',
-        dd : '%d кун',
-        M : 'бир ой',
-        MM : '%d ой',
-        y : 'бир йил',
-        yy : '%d йил'
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    var uz = moment.defineLocale('uz', {
+        months : 'январ_феврал_март_апрел_май_июн_июл_август_сентябр_октябр_ноябр_декабр'.split('_'),
+        monthsShort : 'янв_фев_мар_апр_май_июн_июл_авг_сен_окт_ноя_дек'.split('_'),
+        weekdays : 'Якшанба_Душанба_Сешанба_Чоршанба_Пайшанба_Жума_Шанба'.split('_'),
+        weekdaysShort : 'Якш_Душ_Сеш_Чор_Пай_Жум_Шан'.split('_'),
+        weekdaysMin : 'Як_Ду_Се_Чо_Па_Жу_Ша'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'D MMMM YYYY, dddd HH:mm'
+        },
+        calendar : {
+            sameDay : '[Бугун соат] LT [да]',
+            nextDay : '[Эртага] LT [да]',
+            nextWeek : 'dddd [куни соат] LT [да]',
+            lastDay : '[Кеча соат] LT [да]',
+            lastWeek : '[Утган] dddd [куни соат] LT [да]',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'Якин %s ичида',
+            past : 'Бир неча %s олдин',
+            s : 'фурсат',
+            ss : '%d фурсат',
+            m : 'бир дакика',
+            mm : '%d дакика',
+            h : 'бир соат',
+            hh : '%d соат',
+            d : 'бир кун',
+            dd : '%d кун',
+            M : 'бир ой',
+            MM : '%d ой',
+            y : 'бир йил',
+            yy : '%d йил'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-return uz;
+    return uz;
 
 })));
diff --git a/lib/javascripts/moment_locale/vi.js b/lib/javascripts/moment_locale/vi.js
old mode 100644
new mode 100755
index 1adacc3a795..6fcbeafc9ad
--- a/lib/javascripts/moment_locale/vi.js
+++ b/lib/javascripts/moment_locale/vi.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Vietnamese [vi]
-//! author : Bang Nguyen : https://github.com/bangnk
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,70 +8,71 @@
 }(this, (function (moment) { 'use strict';
 
 
-var vi = moment.defineLocale('vi', {
-    months : 'tháng 1_tháng 2_tháng 3_tháng 4_tháng 5_tháng 6_tháng 7_tháng 8_tháng 9_tháng 10_tháng 11_tháng 12'.split('_'),
-    monthsShort : 'Th01_Th02_Th03_Th04_Th05_Th06_Th07_Th08_Th09_Th10_Th11_Th12'.split('_'),
-    monthsParseExact : true,
-    weekdays : 'chủ nhật_thứ hai_thứ ba_thứ tư_thứ năm_thứ sáu_thứ bảy'.split('_'),
-    weekdaysShort : 'CN_T2_T3_T4_T5_T6_T7'.split('_'),
-    weekdaysMin : 'CN_T2_T3_T4_T5_T6_T7'.split('_'),
-    weekdaysParseExact : true,
-    meridiemParse: /sa|ch/i,
-    isPM : function (input) {
-        return /^ch$/i.test(input);
-    },
-    meridiem : function (hours, minutes, isLower) {
-        if (hours < 12) {
-            return isLower ? 'sa' : 'SA';
-        } else {
-            return isLower ? 'ch' : 'CH';
+    var vi = moment.defineLocale('vi', {
+        months : 'tháng 1_tháng 2_tháng 3_tháng 4_tháng 5_tháng 6_tháng 7_tháng 8_tháng 9_tháng 10_tháng 11_tháng 12'.split('_'),
+        monthsShort : 'Th01_Th02_Th03_Th04_Th05_Th06_Th07_Th08_Th09_Th10_Th11_Th12'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'chủ nhật_thứ hai_thứ ba_thứ tư_thứ năm_thứ sáu_thứ bảy'.split('_'),
+        weekdaysShort : 'CN_T2_T3_T4_T5_T6_T7'.split('_'),
+        weekdaysMin : 'CN_T2_T3_T4_T5_T6_T7'.split('_'),
+        weekdaysParseExact : true,
+        meridiemParse: /sa|ch/i,
+        isPM : function (input) {
+            return /^ch$/i.test(input);
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 12) {
+                return isLower ? 'sa' : 'SA';
+            } else {
+                return isLower ? 'ch' : 'CH';
+            }
+        },
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM [năm] YYYY',
+            LLL : 'D MMMM [năm] YYYY HH:mm',
+            LLLL : 'dddd, D MMMM [năm] YYYY HH:mm',
+            l : 'DD/M/YYYY',
+            ll : 'D MMM YYYY',
+            lll : 'D MMM YYYY HH:mm',
+            llll : 'ddd, D MMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[Hôm nay lúc] LT',
+            nextDay: '[Ngày mai lúc] LT',
+            nextWeek: 'dddd [tuần tới lúc] LT',
+            lastDay: '[Hôm qua lúc] LT',
+            lastWeek: 'dddd [tuần rồi lúc] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : '%s tới',
+            past : '%s trước',
+            s : 'vài giây',
+            ss : '%d giây' ,
+            m : 'một phút',
+            mm : '%d phút',
+            h : 'một giờ',
+            hh : '%d giờ',
+            d : 'một ngày',
+            dd : '%d ngày',
+            M : 'một tháng',
+            MM : '%d tháng',
+            y : 'một năm',
+            yy : '%d năm'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}/,
+        ordinal : function (number) {
+            return number;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
-    },
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM [năm] YYYY',
-        LLL : 'D MMMM [năm] YYYY HH:mm',
-        LLLL : 'dddd, D MMMM [năm] YYYY HH:mm',
-        l : 'DD/M/YYYY',
-        ll : 'D MMM YYYY',
-        lll : 'D MMM YYYY HH:mm',
-        llll : 'ddd, D MMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay: '[Hôm nay lúc] LT',
-        nextDay: '[Ngày mai lúc] LT',
-        nextWeek: 'dddd [tuần tới lúc] LT',
-        lastDay: '[Hôm qua lúc] LT',
-        lastWeek: 'dddd [tuần rồi lúc] LT',
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : '%s tới',
-        past : '%s trước',
-        s : 'vài giây',
-        m : 'một phút',
-        mm : '%d phút',
-        h : 'một giờ',
-        hh : '%d giờ',
-        d : 'một ngày',
-        dd : '%d ngày',
-        M : 'một tháng',
-        MM : '%d tháng',
-        y : 'một năm',
-        yy : '%d năm'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}/,
-    ordinal : function (number) {
-        return number;
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    });
 
-return vi;
+    return vi;
 
 })));
diff --git a/lib/javascripts/moment_locale/x-pseudo.js b/lib/javascripts/moment_locale/x-pseudo.js
old mode 100644
new mode 100755
index b906e16df61..9723c7ba42d
--- a/lib/javascripts/moment_locale/x-pseudo.js
+++ b/lib/javascripts/moment_locale/x-pseudo.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Pseudo [x-pseudo]
-//! author : Andrew Hood : https://github.com/andrewhood125
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,59 +8,60 @@
 }(this, (function (moment) { 'use strict';
 
 
-var xPseudo = moment.defineLocale('x-pseudo', {
-    months : 'J~áñúá~rý_F~ébrú~árý_~Márc~h_Áp~ríl_~Máý_~Júñé~_Júl~ý_Áú~gúst~_Sép~témb~ér_Ó~ctób~ér_Ñ~óvém~bér_~Décé~mbér'.split('_'),
-    monthsShort : 'J~áñ_~Féb_~Már_~Ápr_~Máý_~Júñ_~Júl_~Áúg_~Sép_~Óct_~Ñóv_~Déc'.split('_'),
-    monthsParseExact : true,
-    weekdays : 'S~úñdá~ý_Mó~ñdáý~_Túé~sdáý~_Wéd~ñésd~áý_T~húrs~dáý_~Fríd~áý_S~átúr~dáý'.split('_'),
-    weekdaysShort : 'S~úñ_~Móñ_~Túé_~Wéd_~Thú_~Frí_~Sát'.split('_'),
-    weekdaysMin : 'S~ú_Mó~_Tú_~Wé_T~h_Fr~_Sá'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'HH:mm',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd, D MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay : '[T~ódá~ý át] LT',
-        nextDay : '[T~ómó~rró~w át] LT',
-        nextWeek : 'dddd [át] LT',
-        lastDay : '[Ý~ést~érdá~ý át] LT',
-        lastWeek : '[L~ást] dddd [át] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'í~ñ %s',
-        past : '%s á~gó',
-        s : 'á ~féw ~sécó~ñds',
-        m : 'á ~míñ~úté',
-        mm : '%d m~íñú~tés',
-        h : 'á~ñ hó~úr',
-        hh : '%d h~óúrs',
-        d : 'á ~dáý',
-        dd : '%d d~áýs',
-        M : 'á ~móñ~th',
-        MM : '%d m~óñt~hs',
-        y : 'á ~ýéár',
-        yy : '%d ý~éárs'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}(th|st|nd|rd)/,
-    ordinal : function (number) {
-        var b = number % 10,
-            output = (~~(number % 100 / 10) === 1) ? 'th' :
-            (b === 1) ? 'st' :
-            (b === 2) ? 'nd' :
-            (b === 3) ? 'rd' : 'th';
-        return number + output;
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    var xPseudo = moment.defineLocale('x-pseudo', {
+        months : 'J~áñúá~rý_F~ébrú~árý_~Márc~h_Áp~ríl_~Máý_~Júñé~_Júl~ý_Áú~gúst~_Sép~témb~ér_Ó~ctób~ér_Ñ~óvém~bér_~Décé~mbér'.split('_'),
+        monthsShort : 'J~áñ_~Féb_~Már_~Ápr_~Máý_~Júñ_~Júl_~Áúg_~Sép_~Óct_~Ñóv_~Déc'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'S~úñdá~ý_Mó~ñdáý~_Túé~sdáý~_Wéd~ñésd~áý_T~húrs~dáý_~Fríd~áý_S~átúr~dáý'.split('_'),
+        weekdaysShort : 'S~úñ_~Móñ_~Túé_~Wéd_~Thú_~Frí_~Sát'.split('_'),
+        weekdaysMin : 'S~ú_Mó~_Tú_~Wé_T~h_Fr~_Sá'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[T~ódá~ý át] LT',
+            nextDay : '[T~ómó~rró~w át] LT',
+            nextWeek : 'dddd [át] LT',
+            lastDay : '[Ý~ést~érdá~ý át] LT',
+            lastWeek : '[L~ást] dddd [át] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'í~ñ %s',
+            past : '%s á~gó',
+            s : 'á ~féw ~sécó~ñds',
+            ss : '%d s~écóñ~ds',
+            m : 'á ~míñ~úté',
+            mm : '%d m~íñú~tés',
+            h : 'á~ñ hó~úr',
+            hh : '%d h~óúrs',
+            d : 'á ~dáý',
+            dd : '%d d~áýs',
+            M : 'á ~móñ~th',
+            MM : '%d m~óñt~hs',
+            y : 'á ~ýéár',
+            yy : '%d ý~éárs'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(th|st|nd|rd)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-return xPseudo;
+    return xPseudo;
 
 })));
diff --git a/lib/javascripts/moment_locale/yo.js b/lib/javascripts/moment_locale/yo.js
old mode 100644
new mode 100755
index ec28a9122b4..1a356dcac41
--- a/lib/javascripts/moment_locale/yo.js
+++ b/lib/javascripts/moment_locale/yo.js
@@ -1,6 +1,4 @@
 //! moment.js locale configuration
-//! locale : Yoruba Nigeria [yo]
-//! author : Atolagbe Abisoye : https://github.com/andela-batolagbe
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -10,51 +8,52 @@
 }(this, (function (moment) { 'use strict';
 
 
-var yo = moment.defineLocale('yo', {
-    months : 'Sẹ́rẹ́_Èrèlè_Ẹrẹ̀nà_Ìgbé_Èbibi_Òkùdu_Agẹmo_Ògún_Owewe_Ọ̀wàrà_Bélú_Ọ̀pẹ̀̀'.split('_'),
-    monthsShort : 'Sẹ́r_Èrl_Ẹrn_Ìgb_Èbi_Òkù_Agẹ_Ògú_Owe_Ọ̀wà_Bél_Ọ̀pẹ̀̀'.split('_'),
-    weekdays : 'Àìkú_Ajé_Ìsẹ́gun_Ọjọ́rú_Ọjọ́bọ_Ẹtì_Àbámẹ́ta'.split('_'),
-    weekdaysShort : 'Àìk_Ajé_Ìsẹ́_Ọjr_Ọjb_Ẹtì_Àbá'.split('_'),
-    weekdaysMin : 'Àì_Aj_Ìs_Ọr_Ọb_Ẹt_Àb'.split('_'),
-    longDateFormat : {
-        LT : 'h:mm A',
-        LTS : 'h:mm:ss A',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY h:mm A',
-        LLLL : 'dddd, D MMMM YYYY h:mm A'
-    },
-    calendar : {
-        sameDay : '[Ònì ni] LT',
-        nextDay : '[Ọ̀la ni] LT',
-        nextWeek : 'dddd [Ọsẹ̀ tón\'bọ] [ni] LT',
-        lastDay : '[Àna ni] LT',
-        lastWeek : 'dddd [Ọsẹ̀ tólọ́] [ni] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'ní %s',
-        past : '%s kọjá',
-        s : 'ìsẹjú aayá die',
-        m : 'ìsẹjú kan',
-        mm : 'ìsẹjú %d',
-        h : 'wákati kan',
-        hh : 'wákati %d',
-        d : 'ọjọ́ kan',
-        dd : 'ọjọ́ %d',
-        M : 'osù kan',
-        MM : 'osù %d',
-        y : 'ọdún kan',
-        yy : 'ọdún %d'
-    },
-    dayOfMonthOrdinalParse : /ọjọ́\s\d{1,2}/,
-    ordinal : 'ọjọ́ %d',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4 // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    var yo = moment.defineLocale('yo', {
+        months : 'Sẹ́rẹ́_Èrèlè_Ẹrẹ̀nà_Ìgbé_Èbibi_Òkùdu_Agẹmo_Ògún_Owewe_Ọ̀wàrà_Bélú_Ọ̀pẹ̀̀'.split('_'),
+        monthsShort : 'Sẹ́r_Èrl_Ẹrn_Ìgb_Èbi_Òkù_Agẹ_Ògú_Owe_Ọ̀wà_Bél_Ọ̀pẹ̀̀'.split('_'),
+        weekdays : 'Àìkú_Ajé_Ìsẹ́gun_Ọjọ́rú_Ọjọ́bọ_Ẹtì_Àbámẹ́ta'.split('_'),
+        weekdaysShort : 'Àìk_Ajé_Ìsẹ́_Ọjr_Ọjb_Ẹtì_Àbá'.split('_'),
+        weekdaysMin : 'Àì_Aj_Ìs_Ọr_Ọb_Ẹt_Àb'.split('_'),
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY h:mm A',
+            LLLL : 'dddd, D MMMM YYYY h:mm A'
+        },
+        calendar : {
+            sameDay : '[Ònì ni] LT',
+            nextDay : '[Ọ̀la ni] LT',
+            nextWeek : 'dddd [Ọsẹ̀ tón\'bọ] [ni] LT',
+            lastDay : '[Àna ni] LT',
+            lastWeek : 'dddd [Ọsẹ̀ tólọ́] [ni] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'ní %s',
+            past : '%s kọjá',
+            s : 'ìsẹjú aayá die',
+            ss :'aayá %d',
+            m : 'ìsẹjú kan',
+            mm : 'ìsẹjú %d',
+            h : 'wákati kan',
+            hh : 'wákati %d',
+            d : 'ọjọ́ kan',
+            dd : 'ọjọ́ %d',
+            M : 'osù kan',
+            MM : 'osù %d',
+            y : 'ọdún kan',
+            yy : 'ọdún %d'
+        },
+        dayOfMonthOrdinalParse : /ọjọ́\s\d{1,2}/,
+        ordinal : 'ọjọ́ %d',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4 // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-return yo;
+    return yo;
 
 })));
diff --git a/lib/javascripts/moment_locale/zh-cn.js b/lib/javascripts/moment_locale/zh-cn.js
old mode 100644
new mode 100755
index 005e941f995..b051f33c27c
--- a/lib/javascripts/moment_locale/zh-cn.js
+++ b/lib/javascripts/moment_locale/zh-cn.js
@@ -1,7 +1,4 @@
 //! moment.js locale configuration
-//! locale : Chinese (China) [zh-cn]
-//! author : suupic : https://github.com/suupic
-//! author : Zeno Zeng : https://github.com/zenozeng
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -11,101 +8,102 @@
 }(this, (function (moment) { 'use strict';
 
 
-var zhCn = moment.defineLocale('zh-cn', {
-    months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
-    monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
-    weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
-    weekdaysShort : '周日_周一_周二_周三_周四_周五_周六'.split('_'),
-    weekdaysMin : '日_一_二_三_四_五_六'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'YYYY年MMMD日',
-        LL : 'YYYY年MMMD日',
-        LLL : 'YYYY年MMMD日Ah点mm分',
-        LLLL : 'YYYY年MMMD日ddddAh点mm分',
-        l : 'YYYY年MMMD日',
-        ll : 'YYYY年MMMD日',
-        lll : 'YYYY年MMMD日 HH:mm',
-        llll : 'YYYY年MMMD日dddd HH:mm'
-    },
-    meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
-    meridiemHour: function (hour, meridiem) {
-        if (hour === 12) {
-            hour = 0;
+    var zhCn = moment.defineLocale('zh-cn', {
+        months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
+        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+        weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
+        weekdaysShort : '周日_周一_周二_周三_周四_周五_周六'.split('_'),
+        weekdaysMin : '日_一_二_三_四_五_六'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'YYYY/MM/DD',
+            LL : 'YYYY年M月D日',
+            LLL : 'YYYY年M月D日Ah点mm分',
+            LLLL : 'YYYY年M月D日ddddAh点mm分',
+            l : 'YYYY/M/D',
+            ll : 'YYYY年M月D日',
+            lll : 'YYYY年M月D日 HH:mm',
+            llll : 'YYYY年M月D日dddd HH:mm'
+        },
+        meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
+        meridiemHour: function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === '凌晨' || meridiem === '早上' ||
+                    meridiem === '上午') {
+                return hour;
+            } else if (meridiem === '下午' || meridiem === '晚上') {
+                return hour + 12;
+            } else {
+                // '中午'
+                return hour >= 11 ? hour : hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            var hm = hour * 100 + minute;
+            if (hm < 600) {
+                return '凌晨';
+            } else if (hm < 900) {
+                return '早上';
+            } else if (hm < 1130) {
+                return '上午';
+            } else if (hm < 1230) {
+                return '中午';
+            } else if (hm < 1800) {
+                return '下午';
+            } else {
+                return '晚上';
+            }
+        },
+        calendar : {
+            sameDay : '[今天]LT',
+            nextDay : '[明天]LT',
+            nextWeek : '[下]ddddLT',
+            lastDay : '[昨天]LT',
+            lastWeek : '[上]ddddLT',
+            sameElse : 'L'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(日|月|周)/,
+        ordinal : function (number, period) {
+            switch (period) {
+                case 'd':
+                case 'D':
+                case 'DDD':
+                    return number + '日';
+                case 'M':
+                    return number + '月';
+                case 'w':
+                case 'W':
+                    return number + '周';
+                default:
+                    return number;
+            }
+        },
+        relativeTime : {
+            future : '%s内',
+            past : '%s前',
+            s : '几秒',
+            ss : '%d 秒',
+            m : '1 分钟',
+            mm : '%d 分钟',
+            h : '1 小时',
+            hh : '%d 小时',
+            d : '1 天',
+            dd : '%d 天',
+            M : '1 个月',
+            MM : '%d 个月',
+            y : '1 年',
+            yy : '%d 年'
+        },
+        week : {
+            // GB/T 7408-1994《数据元和交换格式·信息交换·日期和时间表示法》与ISO 8601:1988等效
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
-        if (meridiem === '凌晨' || meridiem === '早上' ||
-                meridiem === '上午') {
-            return hour;
-        } else if (meridiem === '下午' || meridiem === '晚上') {
-            return hour + 12;
-        } else {
-            // '中午'
-            return hour >= 11 ? hour : hour + 12;
-        }
-    },
-    meridiem : function (hour, minute, isLower) {
-        var hm = hour * 100 + minute;
-        if (hm < 600) {
-            return '凌晨';
-        } else if (hm < 900) {
-            return '早上';
-        } else if (hm < 1130) {
-            return '上午';
-        } else if (hm < 1230) {
-            return '中午';
-        } else if (hm < 1800) {
-            return '下午';
-        } else {
-            return '晚上';
-        }
-    },
-    calendar : {
-        sameDay : '[今天]LT',
-        nextDay : '[明天]LT',
-        nextWeek : '[下]ddddLT',
-        lastDay : '[昨天]LT',
-        lastWeek : '[上]ddddLT',
-        sameElse : 'L'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}(日|月|周)/,
-    ordinal : function (number, period) {
-        switch (period) {
-            case 'd':
-            case 'D':
-            case 'DDD':
-                return number + '日';
-            case 'M':
-                return number + '月';
-            case 'w':
-            case 'W':
-                return number + '周';
-            default:
-                return number;
-        }
-    },
-    relativeTime : {
-        future : '%s内',
-        past : '%s前',
-        s : '几秒',
-        m : '1 分钟',
-        mm : '%d 分钟',
-        h : '1 小时',
-        hh : '%d 小时',
-        d : '1 天',
-        dd : '%d 天',
-        M : '1 个月',
-        MM : '%d 个月',
-        y : '1 年',
-        yy : '%d 年'
-    },
-    week : {
-        // GB/T 7408-1994《数据元和交换格式·信息交换·日期和时间表示法》与ISO 8601:1988等效
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    });
 
-return zhCn;
+    return zhCn;
 
 })));
diff --git a/lib/javascripts/moment_locale/zh-hk.js b/lib/javascripts/moment_locale/zh-hk.js
old mode 100644
new mode 100755
index 5ded143d593..0ad0ae31ad0
--- a/lib/javascripts/moment_locale/zh-hk.js
+++ b/lib/javascripts/moment_locale/zh-hk.js
@@ -1,8 +1,4 @@
 //! moment.js locale configuration
-//! locale : Chinese (Hong Kong) [zh-hk]
-//! author : Ben : https://github.com/ben-lin
-//! author : Chris Lam : https://github.com/hehachris
-//! author : Konstantin : https://github.com/skfd
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -12,94 +8,95 @@
 }(this, (function (moment) { 'use strict';
 
 
-var zhHk = moment.defineLocale('zh-hk', {
-    months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
-    monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
-    weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
-    weekdaysShort : '週日_週一_週二_週三_週四_週五_週六'.split('_'),
-    weekdaysMin : '日_一_二_三_四_五_六'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'YYYY年MMMD日',
-        LL : 'YYYY年MMMD日',
-        LLL : 'YYYY年MMMD日 HH:mm',
-        LLLL : 'YYYY年MMMD日dddd HH:mm',
-        l : 'YYYY年MMMD日',
-        ll : 'YYYY年MMMD日',
-        lll : 'YYYY年MMMD日 HH:mm',
-        llll : 'YYYY年MMMD日dddd HH:mm'
-    },
-    meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
-    meridiemHour : function (hour, meridiem) {
-        if (hour === 12) {
-            hour = 0;
+    var zhHk = moment.defineLocale('zh-hk', {
+        months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
+        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+        weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
+        weekdaysShort : '週日_週一_週二_週三_週四_週五_週六'.split('_'),
+        weekdaysMin : '日_一_二_三_四_五_六'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'YYYY/MM/DD',
+            LL : 'YYYY年M月D日',
+            LLL : 'YYYY年M月D日 HH:mm',
+            LLLL : 'YYYY年M月D日dddd HH:mm',
+            l : 'YYYY/M/D',
+            ll : 'YYYY年M月D日',
+            lll : 'YYYY年M月D日 HH:mm',
+            llll : 'YYYY年M月D日dddd HH:mm'
+        },
+        meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === '凌晨' || meridiem === '早上' || meridiem === '上午') {
+                return hour;
+            } else if (meridiem === '中午') {
+                return hour >= 11 ? hour : hour + 12;
+            } else if (meridiem === '下午' || meridiem === '晚上') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            var hm = hour * 100 + minute;
+            if (hm < 600) {
+                return '凌晨';
+            } else if (hm < 900) {
+                return '早上';
+            } else if (hm < 1130) {
+                return '上午';
+            } else if (hm < 1230) {
+                return '中午';
+            } else if (hm < 1800) {
+                return '下午';
+            } else {
+                return '晚上';
+            }
+        },
+        calendar : {
+            sameDay : '[今天]LT',
+            nextDay : '[明天]LT',
+            nextWeek : '[下]ddddLT',
+            lastDay : '[昨天]LT',
+            lastWeek : '[上]ddddLT',
+            sameElse : 'L'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(日|月|週)/,
+        ordinal : function (number, period) {
+            switch (period) {
+                case 'd' :
+                case 'D' :
+                case 'DDD' :
+                    return number + '日';
+                case 'M' :
+                    return number + '月';
+                case 'w' :
+                case 'W' :
+                    return number + '週';
+                default :
+                    return number;
+            }
+        },
+        relativeTime : {
+            future : '%s內',
+            past : '%s前',
+            s : '幾秒',
+            ss : '%d 秒',
+            m : '1 分鐘',
+            mm : '%d 分鐘',
+            h : '1 小時',
+            hh : '%d 小時',
+            d : '1 天',
+            dd : '%d 天',
+            M : '1 個月',
+            MM : '%d 個月',
+            y : '1 年',
+            yy : '%d 年'
         }
-        if (meridiem === '凌晨' || meridiem === '早上' || meridiem === '上午') {
-            return hour;
-        } else if (meridiem === '中午') {
-            return hour >= 11 ? hour : hour + 12;
-        } else if (meridiem === '下午' || meridiem === '晚上') {
-            return hour + 12;
-        }
-    },
-    meridiem : function (hour, minute, isLower) {
-        var hm = hour * 100 + minute;
-        if (hm < 600) {
-            return '凌晨';
-        } else if (hm < 900) {
-            return '早上';
-        } else if (hm < 1130) {
-            return '上午';
-        } else if (hm < 1230) {
-            return '中午';
-        } else if (hm < 1800) {
-            return '下午';
-        } else {
-            return '晚上';
-        }
-    },
-    calendar : {
-        sameDay : '[今天]LT',
-        nextDay : '[明天]LT',
-        nextWeek : '[下]ddddLT',
-        lastDay : '[昨天]LT',
-        lastWeek : '[上]ddddLT',
-        sameElse : 'L'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}(日|月|週)/,
-    ordinal : function (number, period) {
-        switch (period) {
-            case 'd' :
-            case 'D' :
-            case 'DDD' :
-                return number + '日';
-            case 'M' :
-                return number + '月';
-            case 'w' :
-            case 'W' :
-                return number + '週';
-            default :
-                return number;
-        }
-    },
-    relativeTime : {
-        future : '%s內',
-        past : '%s前',
-        s : '幾秒',
-        m : '1 分鐘',
-        mm : '%d 分鐘',
-        h : '1 小時',
-        hh : '%d 小時',
-        d : '1 天',
-        dd : '%d 天',
-        M : '1 個月',
-        MM : '%d 個月',
-        y : '1 年',
-        yy : '%d 年'
-    }
-});
+    });
 
-return zhHk;
+    return zhHk;
 
 })));
diff --git a/lib/javascripts/moment_locale/zh-tw.js b/lib/javascripts/moment_locale/zh-tw.js
old mode 100644
new mode 100755
index 50a6b6a4177..6875cfed182
--- a/lib/javascripts/moment_locale/zh-tw.js
+++ b/lib/javascripts/moment_locale/zh-tw.js
@@ -1,7 +1,4 @@
 //! moment.js locale configuration
-//! locale : Chinese (Taiwan) [zh-tw]
-//! author : Ben : https://github.com/ben-lin
-//! author : Chris Lam : https://github.com/hehachris
 
 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined'
@@ -11,94 +8,95 @@
 }(this, (function (moment) { 'use strict';
 
 
-var zhTw = moment.defineLocale('zh-tw', {
-    months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
-    monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
-    weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
-    weekdaysShort : '週日_週一_週二_週三_週四_週五_週六'.split('_'),
-    weekdaysMin : '日_一_二_三_四_五_六'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'YYYY年MMMD日',
-        LL : 'YYYY年MMMD日',
-        LLL : 'YYYY年MMMD日 HH:mm',
-        LLLL : 'YYYY年MMMD日dddd HH:mm',
-        l : 'YYYY年MMMD日',
-        ll : 'YYYY年MMMD日',
-        lll : 'YYYY年MMMD日 HH:mm',
-        llll : 'YYYY年MMMD日dddd HH:mm'
-    },
-    meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
-    meridiemHour : function (hour, meridiem) {
-        if (hour === 12) {
-            hour = 0;
+    var zhTw = moment.defineLocale('zh-tw', {
+        months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
+        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+        weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
+        weekdaysShort : '週日_週一_週二_週三_週四_週五_週六'.split('_'),
+        weekdaysMin : '日_一_二_三_四_五_六'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'YYYY/MM/DD',
+            LL : 'YYYY年M月D日',
+            LLL : 'YYYY年M月D日 HH:mm',
+            LLLL : 'YYYY年M月D日dddd HH:mm',
+            l : 'YYYY/M/D',
+            ll : 'YYYY年M月D日',
+            lll : 'YYYY年M月D日 HH:mm',
+            llll : 'YYYY年M月D日dddd HH:mm'
+        },
+        meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === '凌晨' || meridiem === '早上' || meridiem === '上午') {
+                return hour;
+            } else if (meridiem === '中午') {
+                return hour >= 11 ? hour : hour + 12;
+            } else if (meridiem === '下午' || meridiem === '晚上') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            var hm = hour * 100 + minute;
+            if (hm < 600) {
+                return '凌晨';
+            } else if (hm < 900) {
+                return '早上';
+            } else if (hm < 1130) {
+                return '上午';
+            } else if (hm < 1230) {
+                return '中午';
+            } else if (hm < 1800) {
+                return '下午';
+            } else {
+                return '晚上';
+            }
+        },
+        calendar : {
+            sameDay : '[今天] LT',
+            nextDay : '[明天] LT',
+            nextWeek : '[下]dddd LT',
+            lastDay : '[昨天] LT',
+            lastWeek : '[上]dddd LT',
+            sameElse : 'L'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(日|月|週)/,
+        ordinal : function (number, period) {
+            switch (period) {
+                case 'd' :
+                case 'D' :
+                case 'DDD' :
+                    return number + '日';
+                case 'M' :
+                    return number + '月';
+                case 'w' :
+                case 'W' :
+                    return number + '週';
+                default :
+                    return number;
+            }
+        },
+        relativeTime : {
+            future : '%s內',
+            past : '%s前',
+            s : '幾秒',
+            ss : '%d 秒',
+            m : '1 分鐘',
+            mm : '%d 分鐘',
+            h : '1 小時',
+            hh : '%d 小時',
+            d : '1 天',
+            dd : '%d 天',
+            M : '1 個月',
+            MM : '%d 個月',
+            y : '1 年',
+            yy : '%d 年'
         }
-        if (meridiem === '凌晨' || meridiem === '早上' || meridiem === '上午') {
-            return hour;
-        } else if (meridiem === '中午') {
-            return hour >= 11 ? hour : hour + 12;
-        } else if (meridiem === '下午' || meridiem === '晚上') {
-            return hour + 12;
-        }
-    },
-    meridiem : function (hour, minute, isLower) {
-        var hm = hour * 100 + minute;
-        if (hm < 600) {
-            return '凌晨';
-        } else if (hm < 900) {
-            return '早上';
-        } else if (hm < 1130) {
-            return '上午';
-        } else if (hm < 1230) {
-            return '中午';
-        } else if (hm < 1800) {
-            return '下午';
-        } else {
-            return '晚上';
-        }
-    },
-    calendar : {
-        sameDay : '[今天]LT',
-        nextDay : '[明天]LT',
-        nextWeek : '[下]ddddLT',
-        lastDay : '[昨天]LT',
-        lastWeek : '[上]ddddLT',
-        sameElse : 'L'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}(日|月|週)/,
-    ordinal : function (number, period) {
-        switch (period) {
-            case 'd' :
-            case 'D' :
-            case 'DDD' :
-                return number + '日';
-            case 'M' :
-                return number + '月';
-            case 'w' :
-            case 'W' :
-                return number + '週';
-            default :
-                return number;
-        }
-    },
-    relativeTime : {
-        future : '%s內',
-        past : '%s前',
-        s : '幾秒',
-        m : '1 分鐘',
-        mm : '%d 分鐘',
-        h : '1 小時',
-        hh : '%d 小時',
-        d : '1 天',
-        dd : '%d 天',
-        M : '1 個月',
-        MM : '%d 個月',
-        y : '1 年',
-        yy : '%d 年'
-    }
-});
+    });
 
-return zhTw;
+    return zhTw;
 
 })));
diff --git a/lib/js_locale_helper.rb b/lib/js_locale_helper.rb
index 4d1b15e8a5a..24cd8d45fa8 100644
--- a/lib/js_locale_helper.rb
+++ b/lib/js_locale_helper.rb
@@ -47,7 +47,8 @@ module JsLocaleHelper
         translations = {
           locale_str => {
             'js' => {},
-            'admin_js' => {}
+            'admin_js' => {},
+            'wizard_js' => {}
           }
         }
       end
@@ -56,6 +57,7 @@ module JsLocaleHelper
       if translations[locale_str] && plugin_translations(locale_str)
         translations[locale_str]['js'].deep_merge!(plugin_translations(locale_str)['js']) if plugin_translations(locale_str)['js']
         translations[locale_str]['admin_js'].deep_merge!(plugin_translations(locale_str)['admin_js']) if plugin_translations(locale_str)['admin_js']
+        translations[locale_str]['wizard_js'].deep_merge!(plugin_translations(locale_str)['wizard_js']) if plugin_translations(locale_str)['wizard_js']
       end
 
       translations
@@ -85,6 +87,7 @@ module JsLocaleHelper
   end
 
   def self.load_translations_merged(*locales)
+    locales = locales.compact
     @loaded_merges ||= {}
     @loaded_merges[locales.join('-')] ||= begin
       all_translations = {}
@@ -101,9 +104,10 @@ module JsLocaleHelper
   end
 
   def self.translations_for(locale_str)
-    current_locale = I18n.locale
-    locale_sym     = locale_str.to_sym
-    site_locale    = SiteSetting.default_locale.to_sym
+    current_locale  = I18n.locale
+    locale_sym      = locale_str.to_sym
+    site_locale     = SiteSetting.default_locale.to_sym
+    fallback_locale = LocaleSiteSetting.fallback_locale(locale_str)
 
     I18n.locale = locale_sym
 
@@ -113,9 +117,9 @@ module JsLocaleHelper
       elsif locale_sym == :en
         load_translations(locale_sym)
       elsif locale_sym == site_locale || site_locale == :en
-        load_translations_merged(locale_sym, :en)
+        load_translations_merged(locale_sym, fallback_locale, :en)
       else
-        load_translations_merged(locale_sym, site_locale, :en)
+        load_translations_merged(locale_sym, fallback_locale, site_locale, :en)
       end
 
     I18n.locale = current_locale
@@ -125,31 +129,70 @@ module JsLocaleHelper
 
   def self.output_locale(locale)
     locale_str = locale.to_s
+    fallback_locale_str = LocaleSiteSetting.fallback_locale(locale_str)&.to_s
     translations = Marshal.load(Marshal.dump(translations_for(locale_str)))
 
     message_formats = strip_out_message_formats!(translations[locale_str]['js'])
     message_formats.merge!(strip_out_message_formats!(translations[locale_str]['admin_js']))
-    result = generate_message_format(message_formats, locale_str)
+    mf_locale, mf_filename = find_message_format_locale([locale_str], true)
+    result = generate_message_format(message_formats, mf_locale, mf_filename)
 
-    translations.keys.each do |locale|
-      translations[locale].keys.each do |k|
-        translations[locale].delete(k) unless k == "js"
+    translations.keys.each do |l|
+      translations[l].keys.each do |k|
+        translations[l].delete(k) unless k == "js"
       end
     end
 
     # I18n
     result << "I18n.translations = #{translations.to_json};\n"
     result << "I18n.locale = '#{locale_str}';\n"
-    result << "I18n.pluralizationRules.#{locale_str} = MessageFormat.locale.#{locale_str};\n" if locale_str != "en"
+    result << "I18n.fallbackLocale = '#{fallback_locale_str}';\n" if fallback_locale_str && fallback_locale_str != "en"
+    result << "I18n.pluralizationRules.#{locale_str} = MessageFormat.locale.#{mf_locale};\n" if mf_locale != "en"
 
     # moment
     result << File.read("#{Rails.root}/lib/javascripts/moment.js")
+    result << File.read("#{Rails.root}/lib/javascripts/moment-timezone-with-data.js")
     result << moment_locale(locale_str)
     result << moment_formats
 
     result
   end
 
+  def self.find_moment_locale(locale_chain)
+    path = "#{Rails.root}/lib/javascripts/moment_locale"
+
+    # moment.js uses a different naming scheme for locale files
+    locale_chain = locale_chain.map { |l| l.tr('_', '-').downcase }
+
+    find_locale(locale_chain, path, :moment_js, false)
+  end
+
+  def self.find_message_format_locale(locale_chain, fallback_to_english)
+    path = "#{Rails.root}/lib/javascripts/locale"
+    find_locale(locale_chain, path, :message_format, fallback_to_english)
+  end
+
+  def self.find_locale(locale_chain, path, type, fallback_to_english)
+    locale_chain.each do |locale|
+      plugin_locale = DiscoursePluginRegistry.locales[locale]
+      return plugin_locale[type] if plugin_locale&.has_key?(type)
+
+      filename = File.join(path, "#{locale}.js")
+      return [locale, filename] if File.exist?(filename)
+    end
+
+    # try again, but this time only with the language itself
+    locale_chain = locale_chain.map { |l| l.split(/[-_]/)[0] }
+      .uniq.reject { |l| locale_chain.include?(l) }
+    unless locale_chain.empty?
+      locale_data = find_locale(locale_chain, path, type, false)
+      return locale_data if locale_data
+    end
+
+    # English should alyways work
+    ["en", File.join(path, "en.js")] if fallback_to_english
+  end
+
   def self.moment_formats
     result = ""
     result << moment_format_function('short_date_no_year')
@@ -163,23 +206,13 @@ module JsLocaleHelper
     "moment.fn.#{name.camelize(:lower)} = function(){ return this.format('#{format}'); };\n"
   end
 
-  def self.moment_locale(locale_str)
-    # moment.js uses a different naming scheme for locale files
-    locale_str = locale_str.tr('_', '-').downcase
-    filename = "#{Rails.root}/lib/javascripts/moment_locale/#{locale_str}.js"
-
-    # try the language without the territory
-    locale_str = locale_str.split("-")[0]
-    filename = "#{Rails.root}/lib/javascripts/moment_locale/#{locale_str}.js" unless File.exists?(filename)
-
-    File.exists?(filename) ? File.read(filename) << "\n" : ""
+  def self.moment_locale(locale)
+    _, filename = find_moment_locale([locale])
+    filename && File.exist?(filename) ? File.read(filename) << "\n" : ""
   end
 
-  def self.generate_message_format(message_formats, locale_str)
-    formats = message_formats.map { |k, v| k.inspect << " : " << compile_message_format(locale_str, v) }.join(", ")
-
-    filename = "#{Rails.root}/lib/javascripts/locale/#{locale_str}.js"
-    filename = "#{Rails.root}/lib/javascripts/locale/en.js" unless File.exists?(filename)
+  def self.generate_message_format(message_formats, locale, filename)
+    formats = message_formats.map { |k, v| k.inspect << " : " << compile_message_format(filename, locale, v) }.join(", ")
 
     result = "MessageFormat = {locale: {}};\n"
     result << "I18n._compiledMFs = {#{formats}};\n"
@@ -203,10 +236,9 @@ module JsLocaleHelper
     end
   end
 
-  def self.compile_message_format(locale, format)
+  def self.compile_message_format(path, locale, format)
     with_context do |ctx|
-      path = "#{Rails.root}/lib/javascripts/locale/#{locale}.js"
-      ctx.load(path) if File.exists?(path)
+      ctx.load(path) if File.exist?(path)
       ctx.eval("mf = new MessageFormat('#{locale}');")
       ctx.eval("mf.precompile(mf.parse(#{format.inspect}))")
     end
diff --git a/lib/letter_avatar.rb b/lib/letter_avatar.rb
index 93766c4b2d1..cad64a83c5f 100644
--- a/lib/letter_avatar.rb
+++ b/lib/letter_avatar.rb
@@ -105,12 +105,16 @@ class LetterAvatar
     end
 
     def cleanup_old
-      skip = File.basename(cache_path)
-      parent_path = File.dirname(cache_path)
-      Dir.entries(parent_path).each do |path|
-        unless ['.', '..'].include?(path) || path == skip
-          FileUtils.rm_rf(parent_path + "/" + path)
+      begin
+        skip = File.basename(cache_path)
+        parent_path = File.dirname(cache_path)
+        Dir.entries(parent_path).each do |path|
+          unless ['.', '..'].include?(path) || path == skip
+            FileUtils.rm_rf(parent_path + "/" + path)
+          end
         end
+      rescue Errno::ENOENT
+        # no worries, folder doesn't exists
       end
     end
   end
diff --git a/lib/method_profiler.rb b/lib/method_profiler.rb
index c96a7f5957c..f624ea8f977 100644
--- a/lib/method_profiler.rb
+++ b/lib/method_profiler.rb
@@ -1,7 +1,16 @@
 # see https://samsaffron.com/archive/2017/10/18/fastest-way-to-profile-a-method-in-ruby
 class MethodProfiler
-  def self.patch(klass, methods, name)
+  def self.patch(klass, methods, name, no_recurse: false)
     patches = methods.map do |method_name|
+
+      recurse_protection = ""
+      if no_recurse
+        recurse_protection = <<~RUBY
+          return #{method_name}__mp_unpatched(*args, &blk) if @mp_recurse_protect_#{method_name}
+          @mp_recurse_protect_#{method_name} = true
+        RUBY
+      end
+
       <<~RUBY
       unless defined?(#{method_name}__mp_unpatched)
         alias_method :#{method_name}__mp_unpatched, :#{method_name}
@@ -9,6 +18,7 @@ class MethodProfiler
           unless prof = Thread.current[:_method_profiler]
             return #{method_name}__mp_unpatched(*args, &blk)
           end
+          #{recurse_protection}
           begin
             start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
             #{method_name}__mp_unpatched(*args, &blk)
@@ -16,6 +26,7 @@ class MethodProfiler
             data = (prof[:#{name}] ||= {duration: 0.0, calls: 0})
             data[:duration] += Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
             data[:calls] += 1
+            #{"@mp_recurse_protect_#{method_name} = false" if no_recurse}
           end
         end
       end
@@ -37,6 +48,10 @@ class MethodProfiler
     }
   end
 
+  def self.clear
+    Thread.current[:_method_profiler] = nil
+  end
+
   def self.stop
     finish = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     if data = Thread.current[:_method_profiler]
diff --git a/lib/middleware/anonymous_cache.rb b/lib/middleware/anonymous_cache.rb
index ad5f0eeff20..2a195c2f930 100644
--- a/lib/middleware/anonymous_cache.rb
+++ b/lib/middleware/anonymous_cache.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "mobile_detection"
 require_dependency "crawler_detection"
 require_dependency "guardian"
@@ -10,9 +12,9 @@ module Middleware
     end
 
     class Helper
-      USER_AGENT = "HTTP_USER_AGENT".freeze
-      RACK_SESSION = "rack.session".freeze
-      ACCEPT_ENCODING = "HTTP_ACCEPT_ENCODING".freeze
+      USER_AGENT = "HTTP_USER_AGENT"
+      RACK_SESSION = "rack.session"
+      ACCEPT_ENCODING = "HTTP_ACCEPT_ENCODING"
 
       def initialize(env)
         @env = env
@@ -86,7 +88,49 @@ module Middleware
 
       def no_cache_bypass
         request = Rack::Request.new(@env)
-        request.cookies['_bypass_cache'].nil?
+        request.cookies['_bypass_cache'].nil? &&
+          request[Auth::DefaultCurrentUserProvider::API_KEY].nil? &&
+          @env[Auth::DefaultCurrentUserProvider::USER_API_KEY].nil?
+      end
+
+      def force_anonymous!
+        @env[Auth::DefaultCurrentUserProvider::USER_API_KEY] = nil
+        @env['HTTP_COOKIE'] = nil
+        @env['rack.request.cookie.hash'] = {}
+        @env['rack.request.cookie.string'] = ''
+        @env['_bypass_cache'] = nil
+        request = Rack::Request.new(@env)
+        request.delete_param('api_username')
+        request.delete_param('api_key')
+      end
+
+      def logged_in_anon_limiter
+        @logged_in_anon_limiter ||= RateLimiter.new(
+          nil,
+          "logged_in_anon_cache_#{@env["HOST"]}/#{@env["REQUEST_URI"]}",
+          GlobalSetting.force_anonymous_min_per_10_seconds,
+          10
+        )
+      end
+
+      def check_logged_in_rate_limit!
+        !logged_in_anon_limiter.performed!(raise_error: false)
+      end
+
+      MIN_TIME_TO_CHECK = 0.05
+
+      def should_force_anonymous?
+        if (queue_time = @env['REQUEST_QUEUE_SECONDS']) && get?
+          if queue_time > GlobalSetting.force_anonymous_min_queue_seconds
+            return check_logged_in_rate_limit!
+          elsif queue_time >= MIN_TIME_TO_CHECK
+            if !logged_in_anon_limiter.can_perform?
+              return check_logged_in_rate_limit!
+            end
+          end
+        end
+
+        false
       end
 
       def cacheable?
@@ -142,13 +186,26 @@ module Middleware
 
     def call(env)
       helper = Helper.new(env)
+      force_anon = false
 
-      if helper.cacheable?
-        helper.cached || helper.cache(@app.call(env))
-      else
-        @app.call(env)
+      if helper.should_force_anonymous?
+        force_anon = env["DISCOURSE_FORCE_ANON"] = true
+        helper.force_anonymous!
       end
 
+      result =
+        if helper.cacheable?
+          helper.cached || helper.cache(@app.call(env))
+        else
+          @app.call(env)
+        end
+
+      if force_anon
+        result[1]["Set-Cookie"] = "dosp=1; Path=/"
+      end
+
+      result
+
     end
 
   end
diff --git a/lib/middleware/discourse_public_exceptions.rb b/lib/middleware/discourse_public_exceptions.rb
new file mode 100644
index 00000000000..4770b427934
--- /dev/null
+++ b/lib/middleware/discourse_public_exceptions.rb
@@ -0,0 +1,41 @@
+# since all the rescue from clauses are not caught by the application controller for matches
+# we need to handle certain exceptions here
+module Middleware
+  class DiscoursePublicExceptions < ::ActionDispatch::PublicExceptions
+
+    def initialize(path)
+      super
+    end
+
+    def call(env)
+      # this is so so gnarly
+      # sometimes we leak out exceptions prior to creating a controller instance
+      # this can happen if we have an exception in a route constraint in some cases
+      # this code re-dispatches the exception to our application controller so we can
+      # properly translate the exception to a page
+      exception = env["action_dispatch.exception"]
+      response = ActionDispatch::Response.new
+
+      if exception
+        begin
+          fake_controller = ApplicationController.new
+          fake_controller.response = response
+          fake_controller.request = ActionDispatch::Request.new(env)
+
+          if ApplicationController.rescue_with_handler(exception, object: fake_controller)
+            body = response.body
+            if String === body
+              body = [body]
+            end
+            return [response.status, response.headers, body]
+          end
+        rescue => e
+          Discourse.warn_exception(e, message: "Failed to handle exception in exception app middleware")
+        end
+
+      end
+      super
+    end
+
+  end
+end
diff --git a/lib/middleware/omniauth_bypass_middleware.rb b/lib/middleware/omniauth_bypass_middleware.rb
new file mode 100644
index 00000000000..4ee40a4f5ee
--- /dev/null
+++ b/lib/middleware/omniauth_bypass_middleware.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+# omniauth loves spending lots cycles in its magic middleware stack
+# this middleware bypasses omniauth middleware and only hits it when needed
+class Middleware::OmniauthBypassMiddleware
+
+  def initialize(app, options = {})
+    @app = app
+
+    # if you need to test this and are having ssl issues see:
+    #  http://stackoverflow.com/questions/6756460/openssl-error-using-omniauth-specified-ssl-path-but-didnt-work
+    # OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE if Rails.env.development?
+    @omniauth = OmniAuth::Builder.new(app) do
+      Discourse.authenticators.each do |authenticator|
+        authenticator.register_middleware(self)
+      end
+    end
+  end
+
+  def call(env)
+    if env["PATH_INFO"].start_with?("/auth")
+      @omniauth.call(env)
+    else
+      @app.call(env)
+    end
+  end
+
+end
diff --git a/lib/middleware/request_tracker.rb b/lib/middleware/request_tracker.rb
index 2e3fd707d6f..527741344a4 100644
--- a/lib/middleware/request_tracker.rb
+++ b/lib/middleware/request_tracker.rb
@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
 require_dependency 'middleware/anonymous_cache'
+require_dependency 'method_profiler'
 
 class Middleware::RequestTracker
 
   @@detailed_request_loggers = nil
+  @@ip_skipper = nil
 
   # register callbacks for detailed request loggers called on every request
   # example:
@@ -15,7 +17,6 @@ class Middleware::RequestTracker
   def self.register_detailed_request_logger(callback)
 
     unless @patched_instrumentation
-      require_dependency "method_profiler"
       MethodProfiler.patch(PG::Connection, [
         :exec, :async_exec, :exec_prepared, :send_query_prepared, :query
       ], :sql)
@@ -23,6 +24,14 @@ class Middleware::RequestTracker
       MethodProfiler.patch(Redis::Client, [
         :call, :call_pipeline
       ], :redis)
+
+      MethodProfiler.patch(Net::HTTP, [
+        :request
+      ], :net, no_recurse: true)
+
+      MethodProfiler.patch(Excon::Connection, [
+        :request
+      ], :net)
       @patched_instrumentation = true
     end
 
@@ -35,7 +44,26 @@ class Middleware::RequestTracker
     if @@detailed_request_loggers.length == 0
       @detailed_request_loggers = nil
     end
+  end
 
+  # used for testing
+  def self.unregister_ip_skipper
+    @@ip_skipper = nil
+  end
+
+  # Register a custom `ip_skipper`, a function that will skip rate limiting
+  # for any IP that returns true.
+  #
+  # For example, if you never wanted to rate limit 1.2.3.4
+  #
+  # ```
+  # Middleware::RequestTracker.register_ip_skipper do |ip|
+  #  ip == "1.2.3.4"
+  # end
+  # ```
+  def self.register_ip_skipper(&blk)
+    raise "IP skipper is already registered!" if @@ip_skipper
+    @@ip_skipper = blk
   end
 
   def initialize(app, settings = {})
@@ -55,6 +83,7 @@ class Middleware::RequestTracker
     if track_view
       if data[:is_crawler]
         ApplicationRequest.increment!(:page_view_crawler)
+        WebCrawlerRequest.increment!(data[:user_agent])
       elsif data[:has_auth_cookie]
         ApplicationRequest.increment!(:page_view_logged_in)
         ApplicationRequest.increment!(:page_view_logged_in_mobile) if data[:is_mobile]
@@ -97,12 +126,14 @@ class Middleware::RequestTracker
       status: status,
       is_crawler: helper.is_crawler?,
       has_auth_cookie: helper.has_auth_cookie?,
-      is_background: request.path =~ /^\/message-bus\// || request.path == /\/topics\/timings/,
+      is_background: !!(request.path =~ /^\/message-bus\// || request.path =~ /\/topics\/timings/),
       is_mobile: helper.is_mobile?,
       track_view: track_view,
-      timing: timing
-    }
-
+      timing: timing,
+      queue_seconds: env['REQUEST_QUEUE_SECONDS']
+    }.tap do |h|
+      h[:user_agent] = env['HTTP_USER_AGENT'] if h[:is_crawler]
+    end
   end
 
   def log_request_info(env, result, info)
@@ -127,33 +158,84 @@ class Middleware::RequestTracker
 
   def call(env)
     result = nil
+    log_request = true
 
-    if rate_limit(env)
+    # doing this as early as possible so we have an
+    # accurate counter
+    if queue_start = env['HTTP_X_REQUEST_START']
+      queue_start = queue_start.split("t=")[1].to_f
+      queue_time = (Time.now.to_f - queue_start)
+      env['REQUEST_QUEUE_SECONDS'] = queue_time
+    end
+
+    request = Rack::Request.new(env)
+
+    if rate_limit(request)
       result = [429, {}, ["Slow down, too Many Requests from this IP Address"]]
       return result
     end
 
+    if block_crawler(request)
+      log_request = false
+      result = [403, { 'Content-Type' => 'text/plain' }, ['Crawler is not allowed']]
+      return result
+    end
+
     env["discourse.request_tracker"] = self
-    MethodProfiler.start if @@detailed_request_loggers
+    MethodProfiler.start
     result = @app.call(env)
-    info = MethodProfiler.stop if @@detailed_request_loggers
+    info = MethodProfiler.stop
+    # possibly transferred?
+    if info && (headers = result[1])
+      headers["X-Runtime"] = "%0.6f" % info[:total_duration]
+    end
+
+    if env[Auth::DefaultCurrentUserProvider::BAD_TOKEN] && (headers = result[1])
+      headers['Discourse-Logged-Out'] = '1'
+    end
+
     result
   ensure
-    log_request_info(env, result, info) unless env["discourse.request_tracker.skip"]
+    if (limiters = env['DISCOURSE_RATE_LIMITERS']) && env['DISCOURSE_IS_ASSET_PATH']
+      limiters.each(&:rollback!)
+      env['DISCOURSE_ASSET_RATE_LIMITERS'].each do |limiter|
+        begin
+          limiter.performed!
+        rescue RateLimiter::LimitExceeded
+          # skip
+        end
+      end
+    end
+    log_request_info(env, result, info) unless !log_request || env["discourse.request_tracker.skip"]
   end
 
-  def rate_limit(env)
+  PRIVATE_IP ||= /^(127\.)|(192\.168\.)|(10\.)|(172\.1[6-9]\.)|(172\.2[0-9]\.)|(172\.3[0-1]\.)|(::1$)|([fF][cCdD])/
+
+  def is_private_ip?(ip)
+    ip = IPAddr.new(ip) rescue nil
+    !!(ip && ip.to_s.match?(PRIVATE_IP))
+  end
+
+  def rate_limit(request)
+
     if (
-      GlobalSetting.max_requests_per_ip_mode == "block" ||
-      GlobalSetting.max_requests_per_ip_mode == "warn"
+      GlobalSetting.max_reqs_per_ip_mode == "block" ||
+      GlobalSetting.max_reqs_per_ip_mode == "warn" ||
+      GlobalSetting.max_reqs_per_ip_mode == "warn+block"
     )
 
-      ip = Rack::Request.new(env).ip
+      ip = request.ip
+
+      if !GlobalSetting.max_reqs_rate_limit_on_private
+        return false if is_private_ip?(ip)
+      end
+
+      return false if @@ip_skipper&.call(ip)
 
       limiter10 = RateLimiter.new(
         nil,
         "global_ip_limit_10_#{ip}",
-        GlobalSetting.max_requests_per_ip_per_10_seconds,
+        GlobalSetting.max_reqs_per_ip_per_10_seconds,
         10,
         global: true
       )
@@ -161,20 +243,43 @@ class Middleware::RequestTracker
       limiter60 = RateLimiter.new(
         nil,
         "global_ip_limit_60_#{ip}",
-        GlobalSetting.max_requests_per_ip_per_10_seconds,
+        GlobalSetting.max_reqs_per_ip_per_10_seconds,
         10,
         global: true
       )
 
+      limiter_assets10 = RateLimiter.new(
+        nil,
+        "global_ip_limit_10_assets_#{ip}",
+        GlobalSetting.max_asset_reqs_per_ip_per_10_seconds,
+        10,
+        global: true
+      )
+
+      request.env['DISCOURSE_RATE_LIMITERS'] = [limiter10, limiter60]
+      request.env['DISCOURSE_ASSET_RATE_LIMITERS'] = [limiter_assets10]
+
+      warn = GlobalSetting.max_reqs_per_ip_mode == "warn" ||
+        GlobalSetting.max_reqs_per_ip_mode == "warn+block"
+
+      if !limiter_assets10.can_perform?
+        if warn
+          Rails.logger.warn("Global asset IP rate limit exceeded for #{ip}: 10 second rate limit, uri: #{request.env["REQUEST_URI"]}")
+        end
+
+        return !(GlobalSetting.max_reqs_per_ip_mode == "warn")
+      end
+
       type = 10
       begin
         limiter10.performed!
         type = 60
         limiter60.performed!
+        false
       rescue RateLimiter::LimitExceeded
-        if GlobalSetting.max_requests_per_ip_mode == "warn"
-          Rails.logger.warn("Global IP rate limit exceeded for #{ip}: #{type} second rate limit")
-          false
+        if warn
+          Rails.logger.warn("Global IP rate limit exceeded for #{ip}: #{type} second rate limit, uri: #{request.env["REQUEST_URI"]}")
+          !(GlobalSetting.max_reqs_per_ip_mode == "warn")
         else
           true
         end
@@ -182,6 +287,13 @@ class Middleware::RequestTracker
     end
   end
 
+  def block_crawler(request)
+    request.get? &&
+      !request.xhr? &&
+      !request.path.ends_with?('robots.txt') &&
+      CrawlerDetection.is_blocked_crawler?(request.env['HTTP_USER_AGENT'])
+  end
+
   def log_later(data, host)
     Scheduler::Defer.later("Track view", _db = nil) do
       self.class.log_request_on_site(data, host)
diff --git a/lib/migration/base_dropper.rb b/lib/migration/base_dropper.rb
new file mode 100644
index 00000000000..f36963d99ec
--- /dev/null
+++ b/lib/migration/base_dropper.rb
@@ -0,0 +1,77 @@
+module Migration
+  class BaseDropper
+    def initialize(after_migration, delay, on_drop)
+      @after_migration = after_migration
+      @on_drop = on_drop
+
+      # in production we need some extra delay to allow for slow migrations
+      @delay = delay || (Rails.env.production? ? 3600 : 0)
+    end
+
+    def delayed_drop
+      if droppable?
+        @on_drop&.call
+        execute_drop!
+
+        Discourse.reset_active_record_cache
+      end
+    end
+
+    private
+
+    def droppable?
+      raise NotImplementedError
+    end
+
+    def execute_drop!
+      raise NotImplementedError
+    end
+
+    def previous_migration_done
+      <<~SQL
+        EXISTS(
+            SELECT 1
+            FROM schema_migration_details
+            WHERE name = :after_migration AND
+                  (created_at <= (current_timestamp AT TIME ZONE 'UTC' - INTERVAL :delay) OR
+                   (SELECT created_at
+                    FROM schema_migration_details
+                    ORDER BY id ASC
+                    LIMIT 1) > (current_timestamp AT TIME ZONE 'UTC' - INTERVAL '10 minutes')
+                  )
+        )
+      SQL
+    end
+
+    def self.create_readonly_function(table_name, column_name = nil)
+      message = column_name ?
+                  "Discourse: #{column_name} in #{table_name} is readonly" :
+                  "Discourse: #{table_name} is read only"
+
+      ActiveRecord::Base.exec_sql <<~SQL
+        CREATE OR REPLACE FUNCTION #{readonly_function_name(table_name, column_name)} RETURNS trigger AS $rcr$
+          BEGIN
+            RAISE EXCEPTION '#{message}';
+          END
+        $rcr$ LANGUAGE plpgsql;
+      SQL
+    end
+    private_class_method :create_readonly_function
+
+    def self.validate_table_name(table_name)
+      raise ArgumentError.new("Invalid table name passed: #{table_name}") if table_name =~ /[^a-z0-9_]/i
+    end
+
+    def self.validate_column_name(column_name)
+      raise ArgumentError.new("Invalid column name passed to drop #{column_name}") if column_name =~ /[^a-z0-9_]/i
+    end
+
+    def self.readonly_function_name(table_name, column_name = nil)
+      ["raise", table_name, column_name, "readonly()"].compact.join("_")
+    end
+
+    def self.readonly_trigger_name(table_name, column_name = nil)
+      [table_name, column_name, "readonly"].compact.join("_")
+    end
+  end
+end
diff --git a/lib/migration/column_dropper.rb b/lib/migration/column_dropper.rb
new file mode 100644
index 00000000000..d7176505d15
--- /dev/null
+++ b/lib/migration/column_dropper.rb
@@ -0,0 +1,64 @@
+require_dependency 'migration/base_dropper'
+
+module Migration
+  class ColumnDropper < BaseDropper
+    def self.drop(table:, after_migration:, columns:, delay: nil, on_drop: nil)
+      validate_table_name(table)
+      columns.each { |column| validate_column_name(column) }
+
+      ColumnDropper.new(table, columns, after_migration, delay, on_drop).delayed_drop
+    end
+
+    def self.mark_readonly(table_name, column_name)
+      create_readonly_function(table_name, column_name)
+
+      ActiveRecord::Base.exec_sql <<~SQL
+        CREATE TRIGGER #{readonly_trigger_name(table_name, column_name)}
+        BEFORE INSERT OR UPDATE OF #{column_name}
+        ON #{table_name}
+        FOR EACH ROW
+        WHEN (NEW.#{column_name} IS NOT NULL)
+        EXECUTE PROCEDURE #{readonly_function_name(table_name, column_name)};
+      SQL
+    end
+
+    private
+
+    def initialize(table, columns, after_migration, delay, on_drop)
+      super(after_migration, delay, on_drop)
+
+      @table = table
+      @columns = columns
+    end
+
+    def droppable?
+      builder = SqlBuilder.new(<<~SQL)
+        SELECT 1
+        FROM INFORMATION_SCHEMA.COLUMNS
+        /*where*/
+        LIMIT 1
+      SQL
+
+      builder.where("table_schema = 'public'")
+        .where("table_name = :table")
+        .where("column_name IN (:columns)")
+        .where(previous_migration_done)
+        .exec(table: @table,
+              columns: @columns,
+              delay: "#{@delay} seconds",
+              after_migration: @after_migration).to_a.length > 0
+    end
+
+    def execute_drop!
+      @columns.each do |column|
+        ActiveRecord::Base.exec_sql <<~SQL
+          DROP TRIGGER IF EXISTS #{BaseDropper.readonly_trigger_name(@table, column)} ON #{@table};
+          DROP FUNCTION IF EXISTS #{BaseDropper.readonly_function_name(@table, column)} CASCADE;
+        SQL
+
+        # safe cause it is protected on method entry, can not be passed in params
+        ActiveRecord::Base.exec_sql("ALTER TABLE #{@table} DROP COLUMN IF EXISTS #{column}")
+      end
+    end
+  end
+end
diff --git a/lib/migration/safe_migrate.rb b/lib/migration/safe_migrate.rb
new file mode 100644
index 00000000000..18e1e14d308
--- /dev/null
+++ b/lib/migration/safe_migrate.rb
@@ -0,0 +1,118 @@
+module Migration; end
+
+class Discourse::InvalidMigration < StandardError; end
+
+class Migration::SafeMigrate
+  module SafeMigration
+    UNSAFE_VERSION = 20180321015220
+    @@enable_safe = true
+
+    def self.enable_safe!
+      @@enable_safe = true
+    end
+
+    def self.disable_safe!
+      @@enable_safe = false
+    end
+
+    def migrate(direction)
+      if direction == :up && version && version > UNSAFE_VERSION && @@enable_safe != false
+        Migration::SafeMigrate.enable!
+      end
+      super
+    ensure
+      Migration::SafeMigrate.disable!
+    end
+  end
+
+  module NiceErrors
+    def migrate
+      super
+    rescue => e
+      if e.cause.is_a?(Discourse::InvalidMigration)
+        def e.cause; nil; end
+        def e.backtrace
+          super.reject do |frame|
+            frame =~ /safe_migrate\.rb/ || frame =~ /schema_migration_details\.rb/
+          end
+        end
+        raise e
+      else
+        raise e
+      end
+    end
+  end
+
+  def self.enable!
+    return if PG::Connection.method_defined?(:exec_migrator_unpatched)
+
+    PG::Connection.class_eval do
+      alias_method :exec_migrator_unpatched, :exec
+      alias_method :async_exec_migrator_unpatched, :async_exec
+
+      def exec(*args, &blk)
+        Migration::SafeMigrate.protect!(args[0])
+        exec_migrator_unpatched(*args, &blk)
+      end
+
+      def async_exec(*args, &blk)
+        Migration::SafeMigrate.protect!(args[0])
+        async_exec_migrator_unpatched(*args, &blk)
+      end
+    end
+  end
+
+  def self.disable!
+    return if !PG::Connection.method_defined?(:exec_migrator_unpatched)
+    PG::Connection.class_eval do
+      alias_method :exec, :exec_migrator_unpatched
+      alias_method :async_exec, :async_exec_migrator_unpatched
+
+      remove_method :exec_migrator_unpatched
+      remove_method :async_exec_migrator_unpatched
+    end
+  end
+
+  def self.patch_active_record!
+    ActiveSupport.on_load(:active_record) do
+      ActiveRecord::Migration.prepend(SafeMigration)
+    end
+
+    if defined?(ActiveRecord::Tasks::DatabaseTasks)
+      ActiveRecord::Tasks::DatabaseTasks.singleton_class.prepend(NiceErrors)
+    end
+  end
+
+  def self.protect!(sql)
+    if sql =~ /^\s*(?:drop\s+table|alter\s+table.*rename\s+to)\s+/i
+      $stdout.puts("", <<~STR)
+        WARNING
+        -------------------------------------------------------------------------------------
+        An attempt was made to drop or rename a table in a migration
+        SQL used was: '#{sql}'
+        Please use the deferred pattern using Migration::TableDropper in db/seeds to drop
+        or rename the table.
+
+        This protection is in place to protect us against dropping tables that are currently
+        in use by live applications.
+      STR
+      raise Discourse::InvalidMigration, "Attempt was made to drop a table"
+    elsif sql =~ /^\s*alter\s+table.*(?:rename|drop)\s+/i
+      $stdout.puts("", <<~STR)
+        WARNING
+        -------------------------------------------------------------------------------------
+        An attempt was made to drop or rename a column in a migration
+        SQL used was: '#{sql}'
+        Please use the deferred pattern using Migration::ColumnDropper in db/seeds to drop
+        or rename columns.
+
+        Note, to minimize disruption use self.ignored_columns = ["column name"] on your
+        ActiveRecord model, this can be removed 6 months or so later.
+
+        This protection is in place to protect us against dropping columns that are currently
+        in use by live applications.
+      STR
+      raise Discourse::InvalidMigration, "Attempt was made to rename or delete column"
+    end
+  end
+end
diff --git a/lib/migration/table_dropper.rb b/lib/migration/table_dropper.rb
new file mode 100644
index 00000000000..78a9c7172f5
--- /dev/null
+++ b/lib/migration/table_dropper.rb
@@ -0,0 +1,77 @@
+require_dependency 'migration/base_dropper'
+
+module Migration
+  class Migration::TableDropper < BaseDropper
+    def self.delayed_drop(table_name:, after_migration:, delay: nil, on_drop: nil)
+      validate_table_name(table_name)
+
+      TableDropper.new(table_name, nil, after_migration, delay, on_drop).delayed_drop
+    end
+
+    def self.delayed_rename(old_name:, new_name:, after_migration:, delay: nil, on_drop: nil)
+      validate_table_name(old_name)
+      validate_table_name(new_name)
+
+      TableDropper.new(old_name, new_name, after_migration, delay, on_drop).delayed_drop
+    end
+
+    def self.read_only_table(table_name)
+      create_readonly_function(table_name)
+
+      ActiveRecord::Base.exec_sql <<~SQL
+        CREATE TRIGGER #{readonly_trigger_name(table_name)}
+        BEFORE INSERT OR UPDATE OR DELETE OR TRUNCATE
+        ON #{table_name}
+        FOR EACH STATEMENT
+        EXECUTE PROCEDURE #{readonly_function_name(table_name)};
+      SQL
+    end
+
+    private
+
+    def initialize(old_name, new_name, after_migration, delay, on_drop)
+      super(after_migration, delay, on_drop)
+
+      @old_name = old_name
+      @new_name = new_name
+    end
+
+    def droppable?
+      builder = SqlBuilder.new(<<~SQL)
+        SELECT 1
+        FROM INFORMATION_SCHEMA.TABLES
+        /*where*/
+        LIMIT 1
+      SQL
+
+      builder.where(table_exists(":new_name")) if @new_name.present?
+
+      builder.where("table_schema = 'public'")
+        .where(table_exists(":old_name"))
+        .where(previous_migration_done)
+        .exec(old_name: @old_name,
+              new_name: @new_name,
+              delay: "#{@delay} seconds",
+              after_migration: @after_migration).to_a.length > 0
+    end
+
+    def table_exists(table_name_placeholder)
+      <<~SQL
+        EXISTS(
+            SELECT 1
+            FROM INFORMATION_SCHEMA.TABLES
+            WHERE table_schema = 'public' AND
+                  table_name = #{table_name_placeholder}
+        )
+      SQL
+    end
+
+    def execute_drop!
+      ActiveRecord::Base.exec_sql("DROP TABLE IF EXISTS #{@old_name}")
+
+      ActiveRecord::Base.exec_sql <<~SQL
+        DROP FUNCTION IF EXISTS #{BaseDropper.readonly_function_name(@old_name)} CASCADE;
+      SQL
+    end
+  end
+end
diff --git a/lib/new_post_manager.rb b/lib/new_post_manager.rb
index 39cf75cfaff..b6965bc221e 100644
--- a/lib/new_post_manager.rb
+++ b/lib/new_post_manager.rb
@@ -68,7 +68,7 @@ class NewPostManager
   end
 
   def self.exempt_user?(user)
-    user.staff? || user.staged
+    user.staff?
   end
 
   def self.post_needs_approval?(manager)
@@ -81,7 +81,8 @@ class NewPostManager
     (manager.args[:title].present? && user.trust_level < SiteSetting.approve_new_topics_unless_trust_level.to_i) ||
     is_fast_typer?(manager) ||
     matches_auto_silence_regex?(manager) ||
-    WordWatcher.new("#{manager.args[:title]} #{manager.args[:raw]}").requires_approval?
+    WordWatcher.new("#{manager.args[:title]} #{manager.args[:raw]}").requires_approval? ||
+    (SiteSetting.approve_unless_staged && user.staged)
   end
 
   def self.default_handler(manager)
@@ -123,6 +124,7 @@ class NewPostManager
     SiteSetting.approve_post_count > 0 ||
     SiteSetting.approve_unless_trust_level.to_i > 0 ||
     SiteSetting.approve_new_topics_unless_trust_level.to_i > 0 ||
+    SiteSetting.approve_unless_staged ||
     WordWatcher.words_for_action_exists?(:require_approval) ||
     handlers.size > 1
   end
@@ -133,9 +135,9 @@ class NewPostManager
   end
 
   def perform
-    if !self.class.exempt_user?(@user) && WordWatcher.new("#{@args[:title]} #{@args[:raw]}").should_block?
+    if !self.class.exempt_user?(@user) && matches = WordWatcher.new("#{@args[:title]} #{@args[:raw]}").should_block?
       result = NewPostResult.new(:created_post, false)
-      result.errors[:base] << I18n.t('contains_blocked_words')
+      result.errors[:base] << I18n.t('contains_blocked_words', word: matches[0])
       return result
     end
 
diff --git a/lib/onebox/engine/discourse_local_onebox.rb b/lib/onebox/engine/discourse_local_onebox.rb
deleted file mode 100644
index e4560949bec..00000000000
--- a/lib/onebox/engine/discourse_local_onebox.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-module Onebox
-  module Engine
-    class DiscourseLocalOnebox
-      include Engine
-
-      # Use this onebox before others
-      def self.priority
-        1
-      end
-
-      def self.===(other)
-        url = other.to_s
-        return false unless url[Discourse.base_url]
-
-        route = Discourse.route_for(url)
-
-        !!(route[:controller] =~ /topics|uploads/)
-      rescue ActionController::RoutingError
-        false
-      end
-
-      def to_html
-        uri = URI(@url)
-        path = uri.path || ""
-        route = Discourse.route_for(uri)
-
-        case route[:controller]
-        when "uploads" then upload_html(path)
-        when "topics"  then topic_html(route)
-        end
-      end
-
-      private
-
-        def upload_html(path)
-          case File.extname(path)
-          when /^\.(mov|mp4|webm|ogv)$/i
-            "<video width='100%' height='100%' controls><source src='#{@url}'><a href='#{@url}'>#{@url}</a></video>"
-          when /^\.(mp3|ogg|wav|m4a)$/i
-            "<audio controls><source src='#{@url}'><a href='#{@url}'>#{@url}</a></audio>"
-          end
-        end
-
-        def topic_html(route)
-          link = "<a href='#{@url}'>#{@url}</a>"
-          source_topic_id = @url[/[&?]source_topic_id=(\d+)/, 1].to_i
-          source_topic = Topic.find_by(id: source_topic_id) if source_topic_id > 0
-
-          if route[:post_number].present? && route[:post_number].to_i > 1
-            post = Post.find_by(topic_id: route[:topic_id], post_number: route[:post_number])
-            return link unless can_see_post?(post, source_topic)
-
-            topic = post.topic
-            slug = Slug.for(topic.title)
-            excerpt = post.excerpt(SiteSetting.post_onebox_maxlength)
-            excerpt.gsub!(/[\r\n]+/, " ")
-            excerpt.gsub!("[/quote]", "[quote]") # don't break my quote
-
-            quote = "[quote=\"#{post.user.username}, topic:#{topic.id}, slug:#{slug}, post:#{post.post_number}\"]\n#{excerpt}\n[/quote]"
-
-            args = {}
-            args[:topic_id] = source_topic_id if source_topic_id > 0
-
-            PrettyText.cook(quote, args)
-          else
-            topic = Topic.find_by(id: route[:topic_id])
-            return link unless can_see_topic?(topic, source_topic)
-
-            first_post = topic.ordered_posts.first
-
-            args = {
-              topic_id: topic.id,
-              avatar: PrettyText.avatar_img(topic.user.avatar_template, "tiny"),
-              original_url: @url,
-              title: PrettyText.unescape_emoji(CGI::escapeHTML(topic.title)),
-              category_html: CategoryBadge.html_for(topic.category),
-              quote: first_post.excerpt(SiteSetting.post_onebox_maxlength),
-            }
-
-            template = File.read("#{Rails.root}/lib/onebox/templates/discourse_topic_onebox.hbs")
-            Mustache.render(template, args)
-          end
-        end
-
-        def can_see_post?(post, source_topic)
-          return false if post.nil? || post.hidden || post.trashed? || post.topic.nil?
-          Guardian.new.can_see_post?(post)
-        end
-
-        def can_see_topic?(topic, source_topic)
-          return false if topic.nil? || topic.trashed? || topic.private_message?
-          Guardian.new.can_see_topic?(topic)
-        end
-
-        def same_category?(category, source_topic)
-          source_topic.try(:category_id) == category.try(:id)
-        end
-
-    end
-  end
-end
diff --git a/lib/onebox/templates/discourse_topic_onebox.hbs b/lib/onebox/templates/discourse_topic_onebox.hbs
index 8b6d746b71f..856d3342d47 100644
--- a/lib/onebox/templates/discourse_topic_onebox.hbs
+++ b/lib/onebox/templates/discourse_topic_onebox.hbs
@@ -1,4 +1,4 @@
-<aside class='quote' data-post="1" data-topic="{{topic_id}}">
+<aside class='quote' data-post="{{post_number}}" data-topic="{{topic_id}}">
   <div class='title'>
     <div class='quote-controls'></div>
     {{{avatar}}}
diff --git a/lib/onebox/templates/discourse_user_onebox.hbs b/lib/onebox/templates/discourse_user_onebox.hbs
new file mode 100644
index 00000000000..079e3268ec2
--- /dev/null
+++ b/lib/onebox/templates/discourse_user_onebox.hbs
@@ -0,0 +1,24 @@
+<aside class="onebox">
+  <article class="onebox-body user-onebox">
+    {{{avatar}}}
+    <h3><a href="{{original_url}}">{{{username}}}</a></h3>
+    <div>
+      {{#name}}
+        <span class="full-name">{{name}}</span>
+      {{/name}}
+      {{#location}}
+        <span class="location"><i class="fa fa-map-marker d-icon d-icon-map-marker"></i>{{{location}}}</span>
+      {{/location}}
+      {{#website}}
+        <span>
+          <i class="fa fa-globe d-icon d-icon-globe"></i><a href="{{website}}">{{{website_name}}}</a>
+        </span>
+      {{/website}}
+    </div>
+    {{#bio}}
+      <p>{{{bio}}}</p>
+    {{/bio}}
+    <span>{{joined}} {{created_at}}</span>
+  </article>
+  <div style="clear: both"></div>
+</aside>
diff --git a/lib/oneboxer.rb b/lib/oneboxer.rb
index 121984f680d..dc5b6491572 100644
--- a/lib/oneboxer.rb
+++ b/lib/oneboxer.rb
@@ -1,3 +1,4 @@
+require 'uri'
 require_dependency "onebox/discourse_onebox_sanitize_config"
 require_dependency 'final_destination'
 
@@ -28,13 +29,13 @@ module Oneboxer
   def self.preview(url, options = nil)
     options ||= {}
     invalidate(url) if options[:invalidate_oneboxes]
-    onebox_raw(url)[:preview]
+    onebox_raw(url, options)[:preview]
   end
 
   def self.onebox(url, options = nil)
     options ||= {}
     invalidate(url) if options[:invalidate_oneboxes]
-    onebox_raw(url)[:onebox]
+    onebox_raw(url, options)[:onebox]
   end
 
   def self.cached_onebox(url)
@@ -76,19 +77,7 @@ module Oneboxer
     doc
   end
 
-  def self.append_source_topic_id(url, topic_id)
-    # hack urls to create proper expansions
-    if url =~ Regexp.new("^#{Discourse.base_url.gsub(".", "\\.")}.*$", true)
-      uri = URI.parse(url) rescue nil
-      if uri && uri.path
-        route = Rails.application.routes.recognize_path(uri.path) rescue nil
-        if route && route[:controller] == 'topics'
-          url += (url =~ /\?/ ? "&" : "?") + "source_topic_id=#{topic_id}"
-        end
-      end
-    end
-    url
-  end
+  HTML5_BLOCK_ELEMENTS ||= %w{address article aside blockquote canvas center dd div dl dt fieldset figcaption figure footer form h1 h2 h3 h4 h5 h6 header hgroup hr li main nav noscript ol output p pre section table tfoot ul video}
 
   def self.apply(string_or_doc, args = nil)
     doc = string_or_doc
@@ -96,26 +85,25 @@ module Oneboxer
     changed = false
 
     each_onebox_link(doc) do |url, element|
-      if args && args[:topic_id]
-        url = append_source_topic_id(url, args[:topic_id])
-      end
-      onebox, _preview = yield(url, element)
+      onebox, _ = yield(url, element)
       if onebox
         parsed_onebox = Nokogiri::HTML::fragment(onebox)
         next unless parsed_onebox.children.count > 0
 
-        # special logic to strip empty p elements
-        if  element.parent &&
-            element.parent.node_name &&
-            element.parent.node_name.downcase == "p" &&
-            element.parent.children.count == 1
+        if element&.parent&.node_name&.downcase == "p" &&
+           element.parent.children.count == 1 &&
+           HTML5_BLOCK_ELEMENTS.include?(parsed_onebox.children[0].node_name.downcase)
           element = element.parent
         end
+
         changed = true
         element.swap parsed_onebox.to_html
       end
     end
 
+    # strip empty <p> elements
+    doc.css("p").each { |p| p.remove if p.children.empty? }
+
     Result.new(doc, changed)
   end
 
@@ -149,7 +137,118 @@ module Oneboxer
       "onebox__#{url}"
     end
 
-    def self.onebox_raw(url)
+    def self.onebox_raw(url, opts = {})
+      url = URI(url).to_s
+      local_onebox(url, opts) || external_onebox(url)
+    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
+
+    def self.local_onebox(url, opts = {})
+      return unless route = Discourse.route_for(url)
+
+      html =
+        case route[:controller]
+        when "uploads" then local_upload_html(url)
+        when "topics"  then local_topic_html(url, route, opts)
+        when "users"   then local_user_html(url, route)
+        end
+
+      html = html.presence || "<a href='#{url}'>#{url}</a>"
+      { onebox: html, preview: html }
+    end
+
+    def self.local_upload_html(url)
+      case File.extname(URI(url).path || "")
+      when /^\.(mov|mp4|webm|ogv)$/i
+        "<video width='100%' height='100%' controls><source src='#{url}'><a href='#{url}'>#{url}</a></video>"
+      when /^\.(mp3|ogg|wav|m4a)$/i
+        "<audio controls><source src='#{url}'><a href='#{url}'>#{url}</a></audio>"
+      end
+    end
+
+    def self.local_topic_html(url, route, opts)
+      return unless current_user = User.find_by(id: opts[:user_id])
+
+      if current_category = Category.find_by(id: opts[:category_id])
+        return unless Guardian.new(current_user).can_see_category?(current_category)
+      end
+
+      if current_topic = Topic.find_by(id: opts[:topic_id])
+        return unless Guardian.new(current_user).can_see_topic?(current_topic)
+      end
+
+      topic = Topic.find_by(id: route[:topic_id])
+
+      return unless topic
+      return if topic.private_message?
+
+      if current_category&.id != topic.category_id
+        return unless Guardian.new.can_see_topic?(topic)
+      end
+
+      post_number = route[:post_number].to_i
+
+      post = post_number > 1 ?
+        topic.posts.where(post_number: post_number).first :
+        topic.ordered_posts.first
+
+      return if !post || post.hidden || post.post_type != Post.types[:regular]
+
+      if post_number > 1 && current_topic&.id == topic.id
+        excerpt = post.excerpt(SiteSetting.post_onebox_maxlength)
+        excerpt.gsub!(/[\r\n]+/, " ")
+        excerpt.gsub!("[/quote]", "[quote]") # don't break my quote
+
+        quote = "[quote=\"#{post.user.username}, topic:#{topic.id}, post:#{post.post_number}\"]\n#{excerpt}\n[/quote]"
+
+        PrettyText.cook(quote)
+      else
+        args = {
+          topic_id: topic.id,
+          post_number: post.post_number,
+          avatar: PrettyText.avatar_img(post.user.avatar_template, "tiny"),
+          original_url: url,
+          title: PrettyText.unescape_emoji(CGI::escapeHTML(topic.title)),
+          category_html: CategoryBadge.html_for(topic.category),
+          quote: PrettyText.unescape_emoji(post.excerpt(SiteSetting.post_onebox_maxlength)),
+        }
+
+        template = File.read("#{Rails.root}/lib/onebox/templates/discourse_topic_onebox.hbs")
+        Mustache.render(template, args)
+      end
+    end
+
+    def self.local_user_html(url, route)
+      username = route[:username] || ""
+
+      if user = User.find_by(username_lower: username.downcase)
+        args = {
+          user_id: user.id,
+          username: user.username,
+          avatar: PrettyText.avatar_img(user.avatar_template, "extra_large"),
+          name: user.name,
+          bio: user.user_profile.bio_excerpt(230),
+          location: user.user_profile.location,
+          joined: I18n.t('joined'),
+          created_at: user.created_at.strftime(I18n.t('datetime_formats.formats.date_only')),
+          website: user.user_profile.website,
+          website_name: UserSerializer.new(user).website_name,
+          original_url: url
+        }
+
+        template = File.read("#{Rails.root}/lib/onebox/templates/discourse_user_onebox.hbs")
+        Mustache.render(template, args)
+      else
+        nil
+      end
+    end
+
+    def self.external_onebox(url)
       Rails.cache.fetch(onebox_cache_key(url), expires_in: 1.day) do
         fd = FinalDestination.new(url, ignore_redirects: ignore_redirects, force_get_hosts: force_get_hosts)
         uri = fd.resolve
@@ -169,14 +268,8 @@ module Oneboxer
 
         r = Onebox.preview(uri.to_s, options)
 
-        { onebox: r.to_s, preview: r.try(:placeholder_html).to_s }
+        { onebox: r.to_s, preview: r&.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/pbkdf2.rb b/lib/pbkdf2.rb
index 1032b4a1ad0..c73639326b9 100644
--- a/lib/pbkdf2.rb
+++ b/lib/pbkdf2.rb
@@ -31,7 +31,7 @@ class Pbkdf2
 
   # fallback xor in case we need it for jruby ... way slower
   def self.xor(x, y)
-    x.bytes.zip(y.bytes).map { |x, y| x ^ y }.pack('c*')
+    x.bytes.zip(y.bytes).map { |a, b| a ^ b }.pack('c*')
   end
 
   def self.prf(hash_function, password, data)
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 197606da79b..81b7d7e2434 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -29,6 +29,7 @@ class Plugin::Instance
    :color_schemes,
    :initializers,
    :javascripts,
+   :locales,
    :service_workers,
    :styles,
    :themes].each do |att|
@@ -319,6 +320,14 @@ class Plugin::Instance
     javascripts << js
   end
 
+  # @option opts [String] :name
+  # @option opts [String] :nativeName
+  # @option opts [String] :fallbackLocale
+  # @option opts [Hash] :plural
+  def register_locale(locale, opts = {})
+    locales << [locale, opts]
+  end
+
   def register_custom_html(hash)
     DiscoursePluginRegistry.custom_html ||= {}
     DiscoursePluginRegistry.custom_html.merge!(hash)
@@ -329,7 +338,12 @@ class Plugin::Instance
   end
 
   def register_asset(file, opts = nil)
-    full_path = File.dirname(path) << "/assets/" << file
+    if opts && opts == :vendored_core_pretty_text
+      full_path = DiscoursePluginRegistry.core_asset_for_name(file)
+    else
+      full_path = File.dirname(path) << "/assets/" << file
+    end
+
     assets << [full_path, opts]
   end
 
@@ -427,7 +441,7 @@ JS
     end
 
     register_assets! unless assets.blank?
-
+    register_locales!
     register_service_workers!
 
     seed_data.each do |key, value|
@@ -479,6 +493,18 @@ JS
     PluginGem.load(path, name, version, opts)
   end
 
+  def hide_plugin
+    Discourse.hidden_plugins << self
+  end
+
+  def enabled_site_setting_filter(filter = nil)
+    if filter
+      @enabled_setting_filter = filter
+    else
+      @enabled_setting_filter
+    end
+  end
+
   def enabled_site_setting(setting = nil)
     if setting
       @enabled_site_setting = setting
@@ -497,6 +523,7 @@ JS
 
   def javascript_includes
     assets.map do |asset, opts|
+      next if opts == :vendored_core_pretty_text
       next if opts == :admin
       next unless asset =~ DiscoursePluginRegistry::JS_REGEX
       asset
@@ -532,6 +559,35 @@ JS
     end
   end
 
+  def register_locales!
+    root_path = File.dirname(@path)
+
+    locales.each do |locale, opts|
+      opts = opts.dup
+      opts[:client_locale_file] = File.join(root_path, "config/locales/client.#{locale}.yml")
+      opts[:server_locale_file] = File.join(root_path, "config/locales/server.#{locale}.yml")
+      opts[:js_locale_file] = File.join(root_path, "assets/locales/#{locale}.js.erb")
+
+      locale_chain = opts[:fallbackLocale] ? [locale, opts[:fallbackLocale]] : [locale]
+      lib_locale_path = File.join(root_path, "lib/javascripts/locale")
+
+      path = File.join(lib_locale_path, "message_format")
+      opts[:message_format] = find_locale_file(locale_chain, path)
+      opts[:message_format] = JsLocaleHelper.find_message_format_locale(locale_chain, false) unless opts[:message_format]
+
+      path = File.join(lib_locale_path, "moment_js")
+      opts[:moment_js] = find_locale_file(locale_chain, path)
+      opts[:moment_js] = JsLocaleHelper.find_moment_locale(locale_chain) unless opts[:moment_js]
+
+      if valid_locale?(opts)
+        DiscoursePluginRegistry.register_locale(locale, opts)
+        Rails.configuration.assets.precompile << "locales/#{locale}.js"
+      else
+        Rails.logger.error "Invalid locale! #{opts.inspect}"
+      end
+    end
+  end
+
   private
 
   def write_asset(path, contents)
@@ -553,4 +609,18 @@ JS
     yield plugin
   end
 
+  def valid_locale?(custom_locale)
+    File.exist?(custom_locale[:client_locale_file]) &&
+      File.exist?(custom_locale[:server_locale_file]) &&
+      File.exist?(custom_locale[:js_locale_file]) &&
+      custom_locale[:message_format] && custom_locale[:moment_js]
+  end
+
+  def find_locale_file(locale_chain, path)
+    locale_chain.each do |locale|
+      filename = File.join(path, "#{locale}.js")
+      return [locale, filename] if File.exist?(filename)
+    end
+    nil
+  end
 end
diff --git a/lib/plugin/metadata.rb b/lib/plugin/metadata.rb
index d516d4ccb60..097845103df 100644
--- a/lib/plugin/metadata.rb
+++ b/lib/plugin/metadata.rb
@@ -19,7 +19,6 @@ class Plugin::Metadata
     "Spoiler Alert!",
     "staff-notes",
     "GitHub badges",
-    "hosted-site",
     "lazyYT",
     "logster-rate-limit-checker",
     "poll",
@@ -32,7 +31,28 @@ class Plugin::Metadata
     "discourse-affiliate",
     "discourse-translator",
     "discourse-patreon",
-    "discourse-prometheus"
+    "discourse-prometheus",
+    "discourse-assign",
+    "discourse-narrative-bot",
+    "discourse-presence",
+    "discourse-staff-notes",
+    "discourse-voting",
+    "docker_manager",
+    "discourse-signatures",
+    "discourse-local-dates",
+    "discourse-crowd",
+    "discourse-footnote",
+    "discourse-gradle-issue",
+    "discourse-no-bump",
+    "discourse-moderator-attention",
+    "discourse-sitemap",
+    "discourse-tooltips",
+    "discourse-styleguide",
+    "discourse-saved-searches",
+    "discourse-user-card-badges",
+    "discourse-policy",
+    "discourse-github-linkback",
+
   ])
 
   FIELDS ||= [:name, :about, :version, :authors, :url, :required_version]
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index 4209d245959..62874b36277 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -52,6 +52,7 @@ class PostCreator
   #     created_at            - Topic creation time (optional)
   #     pinned_at             - Topic pinned time (optional)
   #     pinned_globally       - Is the topic pinned globally (optional)
+  #     shared_draft          - Is the topic meant to be a shared draft
   #
   def initialize(user, opts)
     # TODO: we should reload user in case it is tainted, should take in a user_id as opposed to user
@@ -130,7 +131,7 @@ class PostCreator
       return false unless skip_validations? || validate_child(topic_creator)
     else
       @topic = Topic.find_by(id: @opts[:topic_id])
-      if (@topic.blank? || !guardian.can_create?(Post, @topic))
+      unless @topic.present? && (@opts[:skip_guardian] || guardian.can_create?(Post, @topic))
         errors[:base] << I18n.t(:topic_not_found)
         return false
       end
@@ -290,22 +291,34 @@ class PostCreator
   end
 
   def auto_close
-    if @post.topic.private_message? &&
-        !@post.topic.closed &&
+    topic = @post.topic
+    is_private_message = topic.private_message?
+    topic_posts_count = @post.topic.posts_count
+
+    if is_private_message &&
+        !topic.closed &&
         SiteSetting.auto_close_messages_post_count > 0 &&
-        SiteSetting.auto_close_messages_post_count <= @post.topic.posts_count
+        SiteSetting.auto_close_messages_post_count <= topic_posts_count
 
-      @post.topic.update_status(:closed, true, Discourse.system_user,
-          message: I18n.t('topic_statuses.autoclosed_message_max_posts', count: SiteSetting.auto_close_messages_post_count))
-
-    elsif !@post.topic.private_message? &&
-        !@post.topic.closed &&
+      @post.topic.update_status(
+        :closed, true, Discourse.system_user,
+        message: I18n.t(
+          'topic_statuses.autoclosed_message_max_posts',
+          count: SiteSetting.auto_close_messages_post_count
+        )
+      )
+    elsif !is_private_message &&
+        !topic.closed &&
         SiteSetting.auto_close_topics_post_count > 0 &&
-        SiteSetting.auto_close_topics_post_count <= @post.topic.posts_count
-
-      @post.topic.update_status(:closed, true, Discourse.system_user,
-          message: I18n.t('topic_statuses.autoclosed_topic_max_posts', count: SiteSetting.auto_close_topics_post_count))
+        SiteSetting.auto_close_topics_post_count <= topic_posts_count
 
+      topic.update_status(
+        :closed, true, Discourse.system_user,
+        message: I18n.t(
+          'topic_statuses.autoclosed_topic_max_posts',
+          count: SiteSetting.auto_close_topics_post_count
+        )
+      )
     end
   end
 
@@ -365,30 +378,16 @@ class PostCreator
     return unless @topic.private_message? && @topic.id
 
     UserArchivedMessage.where(topic_id: @topic.id).pluck(:user_id).each do |user_id|
-      UserArchivedMessage.move_to_inbox!(user_id, @topic.id)
+      UserArchivedMessage.move_to_inbox!(user_id, @topic)
     end
 
     GroupArchivedMessage.where(topic_id: @topic.id).pluck(:group_id).each do |group_id|
-      GroupArchivedMessage.move_to_inbox!(group_id, @topic.id)
+      GroupArchivedMessage.move_to_inbox!(group_id, @topic)
     end
   end
 
   private
 
-  # TODO: merge the similar function in TopicCreator and fix parameter naming for `category`
-  def find_category_id
-    @opts.delete(:category) if @opts[:archetype].present? && @opts[:archetype] == Archetype.private_message
-
-    category =
-      if (@opts[:category].is_a? Integer) || (@opts[:category] =~ /^\d+$/)
-        Category.find_by(id: @opts[:category])
-      else
-        Category.find_by(name_lower: @opts[:category].try(:downcase))
-      end
-
-    category&.id
-  end
-
   def create_topic
     return if @topic
     begin
@@ -410,7 +409,7 @@ class PostCreator
       attrs[:last_posted_at] = @post.created_at
       attrs[:last_post_user_id] = @post.user_id
       attrs[:word_count] = (@topic.word_count || 0) + @post.word_count
-      attrs[:excerpt] = @post.excerpt(220, strip_links: true) if new_topic?
+      attrs[:excerpt] = @post.excerpt_for_topic if new_topic?
       attrs[:bumped_at] = @post.created_at unless @post.no_bump
       attrs[:updated_at] = 'now()'
       @topic.update_columns(attrs)
@@ -418,16 +417,20 @@ class PostCreator
   end
 
   def update_topic_auto_close
-    topic_timer = @topic.public_topic_timer
+    if @topic.closed?
+      @topic.delete_topic_timer(TopicTimer.types[:close])
+    else
+      topic_timer = @topic.public_topic_timer
 
-    if topic_timer &&
-       topic_timer.based_on_last_post &&
-       topic_timer.duration > 0
+      if topic_timer &&
+         topic_timer.based_on_last_post &&
+         topic_timer.duration > 0
 
-      @topic.set_or_create_timer(TopicTimer.types[:close],
-        topic_timer.duration,
-        based_on_last_post: topic_timer.based_on_last_post
-      )
+        @topic.set_or_create_timer(TopicTimer.types[:close],
+          topic_timer.duration,
+          based_on_last_post: topic_timer.based_on_last_post
+        )
+      end
     end
   end
 
diff --git a/lib/post_destroyer.rb b/lib/post_destroyer.rb
index 6727211b9ef..986a65a694a 100644
--- a/lib/post_destroyer.rb
+++ b/lib/post_destroyer.rb
@@ -69,7 +69,10 @@ class PostDestroyer
     topic.update_statistics
     recover_user_actions
     DiscourseEvent.trigger(:post_recovered, @post, @opts, @user)
-    DiscourseEvent.trigger(:topic_recovered, topic, @user) if @post.is_first_post?
+    if @post.is_first_post?
+      DiscourseEvent.trigger(:topic_recovered, topic, @user)
+      StaffActionLogger.new(@user).log_topic_delete_recover(topic, "recover_topic", @opts.slice(:context)) if @user.id != @post.user_id
+    end
   end
 
   def staff_recovered
@@ -115,7 +118,7 @@ class PostDestroyer
       remove_associated_replies
       remove_associated_notifications
       if @post.topic && @post.is_first_post?
-        StaffActionLogger.new(@user).log_topic_deletion(@post.topic, @opts.slice(:context)) if @user.id != @post.user_id
+        StaffActionLogger.new(@user).log_topic_delete_recover(@post.topic, "delete_topic", @opts.slice(:context)) if @user.id != @post.user_id
         @post.topic.trash!(@user)
       elsif @user.id != @post.user_id
         StaffActionLogger.new(@user).log_post_deletion(@post, @opts.slice(:context))
diff --git a/lib/post_jobs_enqueuer.rb b/lib/post_jobs_enqueuer.rb
index cb8fdb56c1a..4dde3b73afa 100644
--- a/lib/post_jobs_enqueuer.rb
+++ b/lib/post_jobs_enqueuer.rb
@@ -17,12 +17,20 @@ class PostJobsEnqueuer
       after_post_create
       after_topic_create
     end
+
+    if @topic.private_message?
+      TopicTrackingState.publish_private_message(@topic, post: @post)
+    end
   end
 
   private
 
   def enqueue_post_alerts
-    Jobs.enqueue(:post_alert, post_id: @post.id, options: @opts[:post_alert_options])
+    Jobs.enqueue(:post_alert,
+      post_id: @post.id,
+      new_record: true,
+      options: @opts[:post_alert_options],
+    )
   end
 
   def feature_topic_users
@@ -35,12 +43,11 @@ class PostJobsEnqueuer
 
   def after_post_create
     TopicTrackingState.publish_unread(@post) if @post.post_number > 1
-    TopicTrackingState.publish_latest(@topic, @post.post_type == Post.types[:whisper])
+    TopicTrackingState.publish_latest(@topic, @post.whisper?)
 
-    Jobs.enqueue_in(
-        SiteSetting.email_time_window_mins.minutes,
-        :notify_mailing_list_subscribers,
-        post_id: @post.id
+    Jobs.enqueue_in(SiteSetting.email_time_window_mins.minutes,
+      :notify_mailing_list_subscribers,
+      post_id: @post.id,
     )
   end
 
diff --git a/lib/post_locker.rb b/lib/post_locker.rb
new file mode 100644
index 00000000000..d78951231c4
--- /dev/null
+++ b/lib/post_locker.rb
@@ -0,0 +1,23 @@
+class PostLocker
+  def initialize(post, user)
+    @post, @user = post, user
+  end
+
+  def lock
+    Guardian.new(@user).ensure_can_lock_post!(@post)
+
+    Post.transaction do
+      @post.update_column(:locked_by_id, @user.id)
+      StaffActionLogger.new(@user).log_post_lock(@post, locked: true)
+    end
+  end
+
+  def unlock
+    Guardian.new(@user).ensure_can_lock_post!(@post)
+
+    Post.transaction do
+      @post.update_column(:locked_by_id, nil)
+      StaffActionLogger.new(@user).log_post_lock(@post, locked: false)
+    end
+  end
+end
diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb
index 6ae10376f66..d74e50dd95b 100644
--- a/lib/post_revisor.rb
+++ b/lib/post_revisor.rb
@@ -1,4 +1,5 @@
 require "edit_rate_limiter"
+require 'post_locker'
 
 class PostRevisor
 
@@ -68,7 +69,7 @@ class PostRevisor
   end
 
   track_topic_field(:category_id) do |tc, category_id|
-    if tc.guardian.can_create_topic_on_category?(category_id)
+    if category_id == 0 || tc.guardian.can_create_topic_on_category?(category_id)
       tc.record_change('category_id', tc.topic.category_id, category_id)
       tc.check_result(tc.topic.change_category_to_id(category_id))
     end
@@ -149,6 +150,8 @@ class PostRevisor
     @skip_revision = false
     @skip_revision = @opts[:skip_revision] if @opts.has_key?(:skip_revision)
 
+    old_raw = @post.raw
+
     Post.transaction do
       revise_post
 
@@ -165,9 +168,29 @@ class PostRevisor
       advance_draft_sequence
     end
 
+    # Lock the post by default if the appropriate setting is true
+    if (
+      SiteSetting.staff_edit_locks_post? &&
+      !@post.wiki? &&
+      @fields.has_key?('raw') &&
+      @editor.staff? &&
+      !@post.user.staff?
+    )
+      PostLocker.new(@post, @editor).lock
+    end
+
+    # We log staff edits to posts
+    if @editor.staff? && @editor.id != @post.user.id && @fields.has_key?('raw')
+      StaffActionLogger.new(@editor).log_post_edit(
+        @post,
+        old_raw: old_raw
+      )
+    end
+
     # WARNING: do not pull this into the transaction
     # it can fire events in sidekiq before the post is done saving
     # leading to corrupt state
+    QuotedPost.extract_from(@post)
     post_process_post
 
     update_topic_word_counts
@@ -176,7 +199,6 @@ class PostRevisor
     grant_badge
 
     TopicLink.extract_from(@post)
-    QuotedPost.extract_from(@post)
 
     successfully_saved_post_and_topic
   end
@@ -202,7 +224,15 @@ class PostRevisor
   end
 
   def revise_post
-    should_create_new_version? ? revise_and_create_new_version : revise
+    if should_create_new_version?
+      revise_and_create_new_version
+    else
+      unless cached_original_raw
+        self.original_raw = @post.raw
+        self.original_cooked = @post.cooked
+      end
+      revise
+    end
   end
 
   def should_create_new_version?
@@ -214,9 +244,63 @@ class PostRevisor
     @post.last_editor_id != @editor.id
   end
 
+  def original_raw_key
+    "original_raw_#{(@last_version_at.to_f * 1000).to_i}#{@post.id}"
+  end
+
+  def original_cooked_key
+    "original_cooked_#{(@last_version_at.to_f * 1000).to_i}#{@post.id}"
+  end
+
+  def cached_original_raw
+    @cached_original_raw ||= $redis.get(original_raw_key)
+  end
+
+  def cached_original_cooked
+    @cached_original_cooked ||= $redis.get(original_cooked_key)
+  end
+
+  def original_raw
+    cached_original_raw || @post.raw
+  end
+
+  def original_raw=(val)
+    @cached_original_raw = val
+    $redis.setex(original_raw_key, SiteSetting.editing_grace_period + 1, val)
+  end
+
+  def original_cooked=(val)
+    @cached_original_cooked = val
+    $redis.setex(original_cooked_key, SiteSetting.editing_grace_period + 1, val)
+  end
+
+  def diff_size(before, after)
+    changes = 0
+    ONPDiff.new(before, after).short_diff.each do |str, type|
+      next if type == :common
+      changes += str.length
+    end
+    changes
+  end
+
   def ninja_edit?
     return false if @post.has_active_flag?
-    @revised_at - @last_version_at <= SiteSetting.editing_grace_period.to_i
+    return false if (@revised_at - @last_version_at) > SiteSetting.editing_grace_period.to_i
+
+    if new_raw = @fields[:raw]
+
+      max_diff = SiteSetting.editing_grace_period_max_diff.to_i
+      if @editor.staff? || (@editor.trust_level > 1)
+        max_diff = SiteSetting.editing_grace_period_max_diff_high_trust.to_i
+      end
+
+      if (original_raw.length - new_raw.length).abs > max_diff ||
+        diff_size(original_raw, new_raw) > max_diff
+        return false
+      end
+    end
+
+    true
   end
 
   def owner_changed?
@@ -321,10 +405,15 @@ class PostRevisor
 
   def remove_flags_and_unhide_post
     return unless editing_a_flagged_and_hidden_post?
+
+    flaggers = []
     @post.post_actions.where(post_action_type_id: PostActionType.flag_types_without_custom.values).each do |action|
+      flaggers << action.user if action.user
       action.remove_act!(Discourse.system_user)
     end
+
     @post.unhide!
+    PostActionNotifier.after_post_unhide(@post, flaggers)
   end
 
   def editing_a_flagged_and_hidden_post?
@@ -356,6 +445,15 @@ class PostRevisor
 
   def create_revision
     modifications = post_changes.merge(@topic_changes.diff)
+
+    if modifications["raw"]
+      modifications["raw"][0] = cached_original_raw || modifications["raw"][0]
+    end
+
+    if modifications["cooked"]
+      modifications["cooked"][0] = cached_original_cooked || modifications["cooked"][0]
+    end
+
     PostRevision.create!(
       user_id: @post.last_editor_id,
       post_id: @post.id,
@@ -368,6 +466,7 @@ class PostRevisor
     return unless revision = PostRevision.find_by(post_id: @post.id, number: @post.version)
     revision.user_id = @post.last_editor_id
     modifications = post_changes.merge(@topic_changes.diff)
+
     modifications.each_key do |field|
       if revision.modifications.has_key?(field)
         old_value = revision.modifications[field][0].to_s
@@ -434,7 +533,7 @@ class PostRevisor
   end
 
   def update_topic_excerpt
-    excerpt = @post.excerpt(220, strip_links: true)
+    excerpt = @post.excerpt_for_topic
     @topic.update_column(:excerpt, excerpt)
     if @topic.archetype == "banner"
       ApplicationController.banner_json_cache.clear
@@ -477,7 +576,8 @@ class PostRevisor
   end
 
   def alert_users
-    PostAlerter.new.after_save_post(@post)
+    return if @editor.id == Discourse::SYSTEM_USER_ID
+    Jobs.enqueue(:post_alert, post_id: @post.id)
   end
 
   def publish_changes
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index 7655c76c8d5..83001ce8370 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -82,6 +82,8 @@ module PrettyText
     ctx_load_manifest(ctx, "markdown-it-bundle.js")
     root_path = "#{Rails.root}/app/assets/javascripts/"
 
+    apply_es6_file(ctx, root_path, "discourse/helpers/parse-html")
+    apply_es6_file(ctx, root_path, "discourse/lib/to-markdown")
     apply_es6_file(ctx, root_path, "discourse/lib/utilities")
 
     PrettyText::Helpers.instance_methods.each do |method|
@@ -101,6 +103,10 @@ module PrettyText
       end
     end
 
+    DiscoursePluginRegistry.vendored_core_pretty_text.each do |vpt|
+      ctx.eval(File.read(vpt))
+    end
+
     DiscoursePluginRegistry.vendored_pretty_text.each do |vpt|
       ctx.eval(File.read(vpt))
     end
@@ -136,25 +142,13 @@ module PrettyText
     protect do
       context = v8
 
-      paths = {
-        baseUri: Discourse::base_uri,
-        CDN: Rails.configuration.action_controller.asset_host,
-      }
-
-      if SiteSetting.Upload.enable_s3_uploads
-        if SiteSetting.Upload.s3_cdn_url.present?
-          paths[:S3CDN] = SiteSetting.Upload.s3_cdn_url
-        end
-        paths[:S3BaseUrl] = Discourse.store.absolute_base_url
-      end
-
       custom_emoji = {}
       Emoji.custom.map { |e| custom_emoji[e.name] = e.url }
 
       buffer = <<~JS
         __optInput = {};
         __optInput.siteSettings = #{SiteSetting.client_settings_json};
-        __paths = #{paths.to_json};
+        __paths = #{paths_json};
         __optInput.getURL = __getURL;
         __optInput.getCurrentUser = __getCurrentUser;
         __optInput.lookupAvatar = __lookupAvatar;
@@ -167,7 +161,6 @@ module PrettyText
         __optInput.emojiUnicodeReplacer = __emojiUnicodeReplacer;
         __optInput.lookupInlineOnebox = __lookupInlineOnebox;
         __optInput.lookupImageUrls = __lookupImageUrls;
-        #{opts[:linkify] == false ? "__optInput.linkify = false;" : ""}
         __optInput.censoredWords = #{WordWatcher.words_for_action(:censor).join('|').to_json};
       JS
 
@@ -210,10 +203,29 @@ module PrettyText
     baked
   end
 
+  def self.paths_json
+    paths = {
+      baseUri: Discourse::base_uri,
+      CDN: Rails.configuration.action_controller.asset_host,
+    }
+
+    if SiteSetting.Upload.enable_s3_uploads
+      if SiteSetting.Upload.s3_cdn_url.present?
+        paths[:S3CDN] = SiteSetting.Upload.s3_cdn_url
+      end
+      paths[:S3BaseUrl] = Discourse.store.absolute_base_url
+    end
+
+    paths.to_json
+  end
+
   # leaving this here, cause it invokes v8, don't want to implement twice
   def self.avatar_img(avatar_template, size)
     protect do
-      v8.eval("__utils.avatarImg({size: #{size.inspect}, avatarTemplate: #{avatar_template.inspect}}, __getURL);")
+      v8.eval(<<~JS)
+        __paths = #{paths_json};
+        __utils.avatarImg({size: #{size.inspect}, avatarTemplate: #{avatar_template.inspect}}, __getURL);
+      JS
     end
   end
 
@@ -222,7 +234,10 @@ module PrettyText
 
     set = SiteSetting.emoji_set.inspect
     protect do
-      v8.eval("__performEmojiUnescape(#{title.inspect}, { getURL: __getURL, emojiSet: #{set} })")
+      v8.eval(<<~JS)
+        __paths = #{paths_json};
+        __performEmojiUnescape(#{title.inspect}, { getURL: __getURL, emojiSet: #{set} });
+      JS
     end
   end
 
@@ -234,17 +249,7 @@ module PrettyText
 
     working_text = text.dup
 
-    begin
-      sanitized = markdown(working_text, options)
-    rescue MiniRacer::ScriptTerminatedError => e
-      if SiteSetting.censored_pattern.present?
-        Rails.logger.warn "Post cooking timed out. Clearing the censored_pattern setting and retrying."
-        SiteSetting.censored_pattern = nil
-        sanitized = markdown(working_text, options)
-      else
-        raise e
-      end
-    end
+    sanitized = markdown(working_text, options)
 
     doc = Nokogiri::HTML.fragment(sanitized)
 
@@ -284,6 +289,7 @@ module PrettyText
            uri.host.ends_with?("." << site_uri.host) ||
            whitelist.any? { |u| uri.host == u || uri.host.ends_with?("." << u) }
           # we are good no need for nofollow
+          l.remove_attribute("rel")
         else
           l["rel"] = "nofollow noopener"
         end
@@ -347,29 +353,36 @@ module PrettyText
     fragment.to_html
   end
 
- # Given a Nokogiri doc, convert all links to absolute
- def self.make_all_links_absolute(doc)
-   site_uri = nil
-   doc.css("a").each do |link|
-     href = link["href"].to_s
-     begin
-       uri = URI(href)
-       site_uri ||= URI(Discourse.base_url)
-       link["href"] = "#{site_uri}#{link['href']}" unless uri.host.present?
-     rescue URI::InvalidURIError, URI::InvalidComponentError
-       # leave it
-     end
-   end
- end
+  def self.make_all_links_absolute(doc)
+    site_uri = nil
+    doc.css("a").each do |link|
+      href = link["href"].to_s
+      begin
+        uri = URI(href)
+        site_uri ||= URI(Discourse.base_url)
+        link["href"] = "#{site_uri}#{link['href']}" unless uri.host.present?
+      rescue URI::InvalidURIError, URI::InvalidComponentError
+        # leave it
+      end
+    end
+  end
 
   def self.strip_image_wrapping(doc)
     doc.css(".lightbox-wrapper .meta").remove
   end
 
+  def self.convert_vimeo_iframes(doc)
+    doc.css("iframe[src*='player.vimeo.com']").each do |iframe|
+      vimeo_id = iframe['src'].split('/').last
+      iframe.replace "<p><a href='https://vimeo.com/#{vimeo_id}'>https://vimeo.com/#{vimeo_id}</a></p>"
+    end
+  end
+
   def self.format_for_email(html, post = nil)
     doc = Nokogiri::HTML.fragment(html)
     DiscourseEvent.trigger(:reduce_cooked, doc, post)
     strip_image_wrapping(doc)
+    convert_vimeo_iframes(doc)
     make_all_links_absolute(doc)
     doc.to_html
   end
diff --git a/lib/pretty_text/shims.js b/lib/pretty_text/shims.js
index aa95290e6cf..46ce2595873 100644
--- a/lib/pretty_text/shims.js
+++ b/lib/pretty_text/shims.js
@@ -73,12 +73,12 @@ function __lookupAvatar(p) {
   return __utils.avatarImg({size: "tiny", avatarTemplate: __helpers.avatar_template(p) }, __getURL);
 }
 
-function __formatUsername(u) {
-  return __helpers.format_username(u);
+function __formatUsername(username) {
+  return __helpers.format_username(username);
 }
 
-function __lookupPrimaryUserGroup(p) {
-  return __helpers.lookup_primary_user_group(p);
+function __lookupPrimaryUserGroup(username) {
+  return __helpers.lookup_primary_user_group(username);
 }
 
 function __getCurrentUser(userId) {
diff --git a/lib/promotion.rb b/lib/promotion.rb
index e40c39e10a6..d1d16b5e914 100644
--- a/lib/promotion.rb
+++ b/lib/promotion.rb
@@ -111,16 +111,16 @@ class Promotion
   def self.recalculate(user, performed_by = nil)
     # First, use the manual locked level
     unless user.manual_locked_trust_level.nil?
-      user.trust_level = user.manual_locked_trust_level
-      user.save
-      return
+      return user.update!(
+        trust_level: user.manual_locked_trust_level
+      )
     end
 
     # Then consider the group locked level
     if user.group_locked_trust_level
-      user.trust_level = user.group_locked_trust_level
-      user.save
-      return
+      return user.update!(
+        trust_level: user.group_locked_trust_level
+      )
     end
 
     user.update_column(:trust_level, TrustLevel[0])
diff --git a/lib/quote_comparer.rb b/lib/quote_comparer.rb
new file mode 100644
index 00000000000..c466d718c65
--- /dev/null
+++ b/lib/quote_comparer.rb
@@ -0,0 +1,24 @@
+class QuoteComparer
+  def self.whitespace
+    " \t\r\n".freeze
+  end
+
+  def initialize(topic_id, post_number, text)
+    @topic_id = topic_id
+    @post_number = post_number
+    @text = text
+    @parent_post = Post.where(topic_id: @topic_id, post_number: @post_number).first
+  end
+
+  # This algorithm is far from perfect, but it follows the Discourse
+  # philosophy of "catch the obvious cases, leave moderation for the
+  # complicated ones"
+  def modified?
+    return true if @text.blank? || @parent_post.blank?
+
+    parent_text = Nokogiri::HTML::fragment(@parent_post.cooked).text.delete(QuoteComparer.whitespace)
+    text = @text.delete(QuoteComparer.whitespace)
+
+    !parent_text.include?(text)
+  end
+end
diff --git a/lib/rate_limiter.rb b/lib/rate_limiter.rb
index 0b3344606f3..73d322ab11d 100644
--- a/lib/rate_limiter.rb
+++ b/lib/rate_limiter.rb
@@ -80,11 +80,17 @@ class RateLimiter
     PERFORM_LUA_SHA = Digest::SHA1.hexdigest(PERFORM_LUA)
   end
 
-  def performed!
-    return if rate_unlimited?
+  def performed!(raise_error: true)
+    return true if rate_unlimited?
     now = Time.now.to_i
-    if eval_lua(PERFORM_LUA, PERFORM_LUA_SHA, [prefixed_key], [now, @secs, @max]) == 0
-      raise RateLimiter::LimitExceeded.new(seconds_to_wait, @type)
+
+    if ((max || 0) <= 0) ||
+       (eval_lua(PERFORM_LUA, PERFORM_LUA_SHA, [prefixed_key], [now, @secs, @max]) == 0)
+
+      raise RateLimiter::LimitExceeded.new(seconds_to_wait, @type) if raise_error
+      false
+    else
+      true
     end
   rescue Redis::CommandError => e
     if e.message =~ /READONLY/
diff --git a/lib/retrieve_title.rb b/lib/retrieve_title.rb
index 37b17716b0b..c8e5f8a7ed9 100644
--- a/lib/retrieve_title.rb
+++ b/lib/retrieve_title.rb
@@ -1,10 +1,10 @@
 require_dependency 'final_destination'
 
 module RetrieveTitle
-  class ReadEnough < StandardError; end
+  CRAWL_TIMEOUT = 1
 
   def self.crawl(url)
-    extract_title(fetch_beginning(url))
+    fetch_title(url)
   rescue Exception
     # If there was a connection error, do nothing
   end
@@ -41,7 +41,7 @@ module RetrieveTitle
 
       # Amazon and YouTube leave the title until very late. Exceptions are bad
       # but these are large sites.
-      return 80 if uri.host =~ /amazon\.(com|ca|co\.uk|es|fr|de|it|com\.au|com\.br|cn|in|co\.jp|com\.mx)$/
+      return 500 if uri.host =~ /amazon\.(com|ca|co\.uk|es|fr|de|it|com\.au|com\.br|cn|in|co\.jp|com\.mx)$/
       return 300 if uri.host =~ /youtube\.com$/ || uri.host =~ /youtu.be/
 
       # default is 10k
@@ -49,27 +49,24 @@ module RetrieveTitle
     end
 
     # Fetch the beginning of a HTML document at a url
-    def self.fetch_beginning(url)
-      fd = FinalDestination.new(url)
-      uri = fd.resolve
-      return "" unless uri
+    def self.fetch_title(url)
+      fd = FinalDestination.new(url, timeout: CRAWL_TIMEOUT)
 
-      result = ""
-      streamer = lambda do |chunk, _, _|
-        result << chunk
+      current = nil
+      title = nil
 
-        # Using exceptions for flow control is really bad, but there really seems to
-        # be no sane way to get a stream to stop reading in Excon (or Net::HTTP for
-        # that matter!)
-        raise ReadEnough.new if result.size > (max_chunk_size(uri) * 1024)
+      fd.get do |_response, chunk, uri|
+
+        if current
+          current << chunk
+        else
+          current = chunk
+        end
+
+        max_size = max_chunk_size(uri) * 1024
+        title = extract_title(current)
+        throw :done if title || max_size < current.length
       end
-      Excon.get(uri.to_s, response_block: streamer, read_timeout: 20, headers: fd.request_headers)
-      result
-
-    rescue Excon::Errors::SocketError => ex
-      return result if ex.socket_error.is_a?(ReadEnough)
-      raise
-    rescue ReadEnough
-      result
+      return title
     end
 end
diff --git a/lib/s3_helper.rb b/lib/s3_helper.rb
index 9dadd71de3e..8ead961b209 100644
--- a/lib/s3_helper.rb
+++ b/lib/s3_helper.rb
@@ -4,7 +4,7 @@ class S3Helper
 
   class SettingMissing < StandardError; end
 
-  attr_reader :s3_bucket_name
+  attr_reader :s3_bucket_name, :s3_bucket_folder_path
 
   def initialize(s3_bucket_name, tombstone_prefix = '', options = {})
     @s3_options = default_s3_options.merge(options)
@@ -131,7 +131,7 @@ class S3Helper
   end
 
   def list(prefix = "")
-    s3_bucket.objects(prefix: @s3_bucket_folder_path.to_s + prefix)
+    s3_bucket.objects(prefix: "#{@s3_bucket_folder_path}/#{prefix}")
   end
 
   def tag_file(key, tags)
diff --git a/lib/scheduler/defer.rb b/lib/scheduler/defer.rb
index e63cde145a0..f8f37090bb2 100644
--- a/lib/scheduler/defer.rb
+++ b/lib/scheduler/defer.rb
@@ -21,14 +21,14 @@ module Scheduler
       @paused = false
     end
 
-    # for test
+    # for test and sidekiq
     def async=(val)
       @async = val
     end
 
     def later(desc = nil, db = RailsMultisite::ConnectionManagement.current_db, &blk)
       if @async
-        start_thread unless (@thread && @thread.alive?) || @paused
+        start_thread unless @thread&.alive? || @paused
         @queue << [db, blk, desc]
       else
         blk.call
@@ -36,13 +36,13 @@ module Scheduler
     end
 
     def stop!
-      @thread.kill if @thread && @thread.alive?
+      @thread.kill if @thread&.alive?
       @thread = nil
     end
 
     # test only
     def stopped?
-      !(@thread && @thread.alive?)
+      !@thread&.alive?
     end
 
     def do_all_work
@@ -55,12 +55,8 @@ module Scheduler
 
     def start_thread
       @mutex.synchronize do
-        return if @thread && @thread.alive?
-        @thread = Thread.new {
-          while true
-            do_work
-          end
-        }
+        return if @thread&.alive?
+        @thread = Thread.new { do_work while true }
       end
     end
 
diff --git a/lib/search.rb b/lib/search.rb
index 6f553a49457..40f80a245c4 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -1,7 +1,7 @@
 require_dependency 'search/grouped_search_results'
 
 class Search
-  INDEX_VERSION = 1.freeze
+  INDEX_VERSION = 2.freeze
 
   def self.per_facet
     5
@@ -48,8 +48,10 @@ class Search
 
   def self.prepare_data(search_data, purpose = :query)
     data = search_data.squish
-    # TODO cppjieba_rb is designed for chinese, we need something else for Korean / Japanese
-    if ['zh_TW', 'zh_CN', 'ja', 'ko'].include?(SiteSetting.default_locale) || SiteSetting.search_tokenize_chinese_japanese_korean
+    # TODO cppjieba_rb is designed for chinese, we need something else for Japanese
+    # Korean appears to be safe cause words are already space seperated
+    # For Japanese we should investigate using kakasi
+    if ['zh_TW', 'zh_CN', 'ja'].include?(SiteSetting.default_locale) || SiteSetting.search_tokenize_chinese_japanese_korean
       require 'cppjieba_rb' unless defined? CppjiebaRb
       mode = (purpose == :query ? :query : :mix)
       data = CppjiebaRb.segment(search_data, mode: mode)
@@ -73,7 +75,10 @@ class Search
 
       return if day == 0 || month == 0 || day > 31 || month > 12
 
-      return Time.zone.parse("#{year}-#{month}-#{day}") rescue nil
+      return begin
+        Time.zone.parse("#{year}-#{month}-#{day}")
+      rescue ArgumentError
+      end
     end
 
     if str.downcase == "yesterday"
@@ -180,7 +185,7 @@ class Search
 
   # Query a term
   def execute
-    if SiteSetting.log_search_queries?
+    if SiteSetting.log_search_queries? && @opts[:search_type].present?
       status, search_log_id = SearchLog.log(
         term: @term,
         search_type: @opts[:search_type],
@@ -369,6 +374,8 @@ class Search
     exact = true
 
     slug = match.to_s.split(":")
+    next if slug.empty?
+
     if slug[1]
       # sub category
       parent_category_id = Category.where(slug: slug[0].downcase, parent_category_id: nil).pluck(:id).first
@@ -409,7 +416,7 @@ class Search
         if match.to_s.length >= SiteSetting.min_search_term_length
           posts.where("posts.id IN (
             SELECT post_id FROM post_search_data pd1
-            WHERE pd1.search_data @@ #{Search.ts_query("##{match}")})")
+            WHERE pd1.search_data @@ #{Search.ts_query(term: "##{match}")})")
         end
       end
     end
@@ -511,12 +518,17 @@ class Search
           end
         end
 
+        @in_title = false
+
         if word == 'order:latest' || word == 'l'
           @order = :latest
           nil
         elsif word == 'order:latest_topic'
           @order = :latest_topic
           nil
+        elsif word == 'in:title'
+          @in_title = true
+          nil
         elsif word =~ /topic:(\d+)/
           topic_id = $1.to_i
           if topic_id > 1
@@ -652,10 +664,11 @@ class Search
         .joins(:post_search_data, :topic)
         .joins("LEFT JOIN categories ON categories.id = topics.category_id")
         .where("topics.deleted_at" => nil)
-        .where("topics.visible")
 
       is_topic_search = @search_context.present? && @search_context.is_a?(Topic)
 
+      posts = posts.where("topics.visible") unless is_topic_search
+
       if opts[:private_messages] || (is_topic_search && @search_context.private_message?)
         posts = posts.where("topics.archetype =  ?", Archetype.private_message)
 
@@ -681,10 +694,15 @@ class Search
           posts = posts.joins('JOIN users u ON u.id = posts.user_id')
           posts = posts.where("posts.raw  || ' ' || u.username || ' ' || COALESCE(u.name, '') ilike ?", "%#{term_without_quote}%")
         else
-          posts = posts.where("post_search_data.search_data @@ #{ts_query}")
+          # A is for title
+          # B is for category
+          # C is for tags
+          # D is for cooked
+          weights = @in_title ? 'A' : (SiteSetting.tagging_enabled ? 'ABCD' : 'ABD')
+          posts = posts.where("post_search_data.search_data @@ #{ts_query(weight_filter: weights)}")
           exact_terms = @term.scan(/"([^"]+)"/).flatten
           exact_terms.each do |exact|
-            posts = posts.where("posts.raw ilike ?", "%#{exact}%")
+            posts = posts.where("posts.raw ilike :exact OR topics.title ilike :exact", exact: "%#{exact}%")
           end
         end
       end
@@ -743,11 +761,9 @@ class Search
           posts = posts.order("posts.like_count DESC")
         end
       else
-        posts = posts.order("TS_RANK_CD(TO_TSVECTOR(#{default_ts_config}, topics.title), #{ts_query}) DESC")
-
         data_ranking = "TS_RANK_CD(post_search_data.search_data, #{ts_query})"
         if opts[:aggregate_search]
-          posts = posts.order("SUM(#{data_ranking}) DESC")
+          posts = posts.order("MAX(#{data_ranking}) DESC")
         else
           posts = posts.order("#{data_ranking} DESC")
         end
@@ -772,7 +788,7 @@ class Search
       self.class.default_ts_config
     end
 
-    def self.ts_query(term, ts_config = nil, joiner = "&")
+    def self.ts_query(term: , ts_config:  nil, joiner: "&", weight_filter: nil)
 
       data = Post.exec_sql("SELECT TO_TSVECTOR(:config, :term)",
                            config: 'simple',
@@ -786,16 +802,17 @@ class Search
 
       query = ActiveRecord::Base.connection.quote(
         all_terms
-          .map { |t| "'#{PG::Connection.escape_string(t)}':*" }
+          .map { |t| "'#{PG::Connection.escape_string(t)}':*#{weight_filter}" }
           .join(" #{joiner} ")
       )
 
       "TO_TSQUERY(#{ts_config || default_ts_config}, #{query})"
     end
 
-    def ts_query(ts_config = nil)
+    def ts_query(ts_config = nil, weight_filter: nil)
       @ts_query_cache ||= {}
-      @ts_query_cache["#{ts_config || default_ts_config} #{@term}"] ||= Search.ts_query(@term, ts_config)
+      @ts_query_cache["#{ts_config || default_ts_config} #{@term} #{weight_filter}"] ||=
+        Search.ts_query(term: @term, ts_config: ts_config, weight_filter: weight_filter)
     end
 
     def wrap_rows(query)
diff --git a/lib/single_sign_on.rb b/lib/single_sign_on.rb
index ba8a9035946..3e449b84629 100644
--- a/lib/single_sign_on.rb
+++ b/lib/single_sign_on.rb
@@ -1,10 +1,9 @@
 class SingleSignOn
   ACCESSORS = [:nonce, :name, :username, :email, :avatar_url, :avatar_force_update, :require_activation,
                :bio, :external_id, :return_sso_url, :admin, :moderator, :suppress_welcome_message, :title,
-               :add_groups, :remove_groups, :groups]
+               :add_groups, :remove_groups, :groups, :profile_background_url, :card_background_url]
   FIXNUMS = []
   BOOLS = [:avatar_force_update, :admin, :moderator, :require_activation, :suppress_welcome_message]
-  ARRAYS = [:groups]
   NONCE_EXPIRY_TIME = 10.minutes
 
   attr_accessor(*ACCESSORS)
@@ -41,7 +40,6 @@ class SingleSignOn
       if BOOLS.include? k
         val = ["true", "false"].include?(val) ? val == "true" : nil
       end
-      val = Array(val) if ARRAYS.include?(k) && !val.nil?
       sso.send("#{k}=", val)
     end
 
diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb
index 7701e89cfc3..412ded8bfdd 100644
--- a/lib/site_setting_extension.rb
+++ b/lib/site_setting_extension.rb
@@ -12,7 +12,10 @@ module SiteSettingExtension
   def_delegator :defaults, :has_setting?
   def_delegators 'SiteSettings::TypeSupervisor', :types, :supported_types
 
-  # part 1 of refactor, centralizing the dependency here
+  def listen_for_changes=(val)
+    @listen_for_changes = val
+  end
+
   def provider=(val)
     @provider = val
     refresh!
@@ -190,6 +193,8 @@ module SiteSettingExtension
   end
 
   def ensure_listen_for_changes
+    return if @listen_for_changes == false
+
     unless @subscribed
       MessageBus.subscribe("/site_settings") do |message|
         process_message(message)
@@ -252,13 +257,17 @@ module SiteSettingExtension
     refresh_settings.include?(name.to_sym)
   end
 
+  HOSTNAME_SETTINGS ||= %w{
+    disabled_image_download_domains onebox_domains_blacklist exclude_rel_nofollow_domains
+    email_domains_blacklist email_domains_whitelist white_listed_spam_host_domains
+  }
+
   def filter_value(name, value)
-    if %w[disabled_image_download_domains onebox_domains_blacklist exclude_rel_nofollow_domains email_domains_blacklist email_domains_whitelist white_listed_spam_host_domains].include? name
-      domain_array = []
-      value.split('|').each { |url| domain_array << get_hostname(url) }
-      value = domain_array.join("|")
+    if HOSTNAME_SETTINGS.include?(name)
+      value.split("|").map { |url| get_hostname(url) }.compact.uniq.join("|")
+    else
+      value
     end
-    value
   end
 
   def set(name, value)
@@ -274,7 +283,10 @@ module SiteSettingExtension
   def set_and_log(name, value, user = Discourse.system_user)
     prev_value = send(name)
     set(name, value)
-    StaffActionLogger.new(user).log_site_setting_change(name, prev_value, value) if has_setting?(name)
+    if has_setting?(name)
+      value = prev_value = "[FILTERED]" if name.to_s =~ /_secret/
+      StaffActionLogger.new(user).log_site_setting_change(name, prev_value, value)
+    end
   end
 
   protected
@@ -339,11 +351,21 @@ module SiteSettingExtension
   end
 
   def get_hostname(url)
-    unless (URI.parse(url).scheme rescue nil).nil?
-      url = "http://#{url}" if URI.parse(url).scheme.nil?
-      url = URI.parse(url).host
+    url.strip!
+
+    host = begin
+      URI.parse(url)&.host
+    rescue URI::InvalidURIError
+      nil
     end
-    url
+
+    host ||= begin
+      URI.parse("http://#{url}")&.host
+    rescue URI::InvalidURIError
+      nil
+    end
+
+    host.presence || url
   end
 
   private
diff --git a/lib/site_settings/db_provider.rb b/lib/site_settings/db_provider.rb
index 8aef485c933..3ad32164e98 100644
--- a/lib/site_settings/db_provider.rb
+++ b/lib/site_settings/db_provider.rb
@@ -37,7 +37,7 @@ class SiteSettings::DbProvider
     model.data_type = data_type
 
     # save! used to ensure after_commit is called
-    model.save!
+    model.save! if model.changed?
 
     true
   end
diff --git a/lib/site_settings/deprecated_settings.rb b/lib/site_settings/deprecated_settings.rb
index ca63777b4c3..f4bc23820af 100644
--- a/lib/site_settings/deprecated_settings.rb
+++ b/lib/site_settings/deprecated_settings.rb
@@ -2,7 +2,14 @@ module SiteSettings; end
 
 module SiteSettings::DeprecatedSettings
   DEPRECATED_SETTINGS = [
-    %w[use_https force_https 1.7]
+    %w[use_https force_https 1.7],
+    %w[min_private_message_post_length min_personal_message_post_length 2.0],
+    %w[min_private_message_title_length min_personal_message_title_length 2.0],
+    %w[enable_private_messages enable_personal_messages 2.0],
+    %w[enable_private_email_messages enable_personal_email_messages 2.0],
+    %w[private_email_time_window_seconds personal_email_time_window_seconds 2.0],
+    %w[max_private_messages_per_day max_personal_messages_per_day 2.0],
+    %w[default_email_private_messages default_email_personal_messages 2.0]
   ]
 
   def setup_deprecated_methods
diff --git a/lib/site_settings/type_supervisor.rb b/lib/site_settings/type_supervisor.rb
index 0cd9f272bc9..3e7c0ec3f13 100644
--- a/lib/site_settings/type_supervisor.rb
+++ b/lib/site_settings/type_supervisor.rb
@@ -6,28 +6,31 @@ module SiteSettings; end
 class SiteSettings::TypeSupervisor
   include SiteSettings::Validations
 
-  CONSUMED_OPTS = %i[enum choices type validator min max regex hidden regex_error].freeze
+  CONSUMED_OPTS = %i[enum choices type validator min max regex hidden regex_error allow_any].freeze
   VALIDATOR_OPTS = %i[min max regex hidden regex_error].freeze
 
   # For plugins, so they can tell if a feature is supported
   SUPPORTED_TYPES = %i[email username list enum].freeze
 
   def self.types
-    @types ||= Enum.new(string: 1,
-                        time: 2,
-                        integer: 3,
-                        float: 4,
-                        bool: 5,
-                        null: 6,
-                        enum: 7,
-                        list: 8,
-                        url_list: 9,
-                        host_list: 10,
-                        category_list: 11,
-                        value_list: 12,
-                        regex: 13,
-                        email: 14,
-                        username: 15)
+    @types ||= Enum.new(
+      string: 1,
+      time: 2,
+      integer: 3,
+      float: 4,
+      bool: 5,
+      null: 6,
+      enum: 7,
+      list: 8,
+      url_list: 9,
+      host_list: 10,
+      category_list: 11,
+      value_list: 12,
+      regex: 13,
+      email: 14,
+      username: 15,
+      category: 16
+    )
   end
 
   def self.parse_value_type(val)
@@ -58,6 +61,7 @@ class SiteSettings::TypeSupervisor
     @choices = {}
     @validators = {}
     @types = {}
+    @allow_any = {}
   end
 
   def load_setting(name_arg, opts = {})
@@ -80,6 +84,10 @@ class SiteSettings::TypeSupervisor
 
     if (type = opts[:type])
       @static_types[name] = type.to_sym
+
+      if type.to_sym == :list
+        @allow_any[name] = opts[:allow_any] == false ? false : true
+      end
     end
     @types[name] = get_data_type(name, @defaults_provider[name])
 
@@ -165,6 +173,16 @@ class SiteSettings::TypeSupervisor
       end
     end
 
+    if type == self.class.types[:list] || type == self.class.types[:string]
+      if @allow_any.key?(name) && !@allow_any[name]
+        split = val.to_s.split("|")
+        diff = (split - @choices[name])
+        if diff.length > 0
+          raise Discourse::InvalidParameters.new(I18n.t('errors.site_settings.invalid_choice', name: diff.join(','), count: diff.length))
+        end
+      end
+    end
+
     if (v = @validators[name])
       validator = v[:class].new(v[:opts])
       unless validator.valid_value?(val)
diff --git a/lib/slug.rb b/lib/slug.rb
index dc95095b7b1..669006c2e8e 100644
--- a/lib/slug.rb
+++ b/lib/slug.rb
@@ -6,6 +6,8 @@ module Slug
   MAX_LENGTH = 255
 
   def self.for(string, default = 'topic', max_length = MAX_LENGTH)
+    string = string.gsub(/:([\w\-+]+(?::t\d)?):/, '') if string.present? # strip emoji strings
+
     slug =
       case (SiteSetting.slug_generation_method || :ascii).to_sym
       when :ascii then self.ascii_generator(string)
diff --git a/lib/socket_server.rb b/lib/socket_server.rb
index fdd430b9a91..fda521ec0ab 100644
--- a/lib/socket_server.rb
+++ b/lib/socket_server.rb
@@ -16,7 +16,7 @@ class SocketServer
   end
 
   def stop
-    @server&.close rescue nil
+    @server&.close
     FileUtils.rm_f(@socket_path)
     @server = nil
     @blk = nil
@@ -72,7 +72,7 @@ class SocketServer
   rescue => e
     Rails.logger.warn("Failed to handle connection in stats socket #{e}:\n#{e.backtrace.join("\n")}")
   ensure
-    socket&.close rescue nil
+    socket&.close
   end
 
   def get_response(command)
diff --git a/lib/staff_constraint.rb b/lib/staff_constraint.rb
index ba4dc0a36cd..7572ada16c0 100644
--- a/lib/staff_constraint.rb
+++ b/lib/staff_constraint.rb
@@ -4,9 +4,17 @@ class StaffConstraint
 
   def matches?(request)
     provider = Discourse.current_user_provider.new(request.env)
-    provider.current_user && provider.current_user.staff?
+    provider.current_user &&
+      provider.current_user.staff? &&
+      custom_staff_check(request)
   rescue Discourse::InvalidAccess
     false
   end
 
+  # Extensibility point: plugins can overwrite this to add additional checks
+  # if they require.
+  def custom_staff_check(request)
+    true
+  end
+
 end
diff --git a/lib/staff_message_format.rb b/lib/staff_message_format.rb
new file mode 100644
index 00000000000..e6005d0fac1
--- /dev/null
+++ b/lib/staff_message_format.rb
@@ -0,0 +1,23 @@
+# This is used for formatting Suspension/Silencing messages.
+# It can be extended by plugins to provide custom message formats.
+class StaffMessageFormat
+  def initialize(type, reason, message = nil)
+    @type = type
+    @reason = reason
+    @message = message
+
+    after_initialize
+  end
+
+  # Plugins can overwrite this to munge values before formatting
+  def after_initialize
+  end
+
+  # Overwrite this to change formatting
+  def format
+    result = ""
+    result << @reason if @reason.present?
+    result << "\n\n#{@message}" if @message.present?
+    result
+  end
+end
diff --git a/lib/stylesheet/importer.rb b/lib/stylesheet/importer.rb
index 93e4c479c89..635645c5c79 100644
--- a/lib/stylesheet/importer.rb
+++ b/lib/stylesheet/importer.rb
@@ -5,14 +5,12 @@ module Stylesheet
   class Importer < SassC::Importer
     include GlobalPath
 
-    @special_imports = {}
-
     def self.special_imports
-      @special_imports
+      @special_imports ||= {}
     end
 
     def self.register_import(name, &blk)
-      @special_imports[name] = blk
+      special_imports[name] = blk
     end
 
     register_import "theme_field" do
@@ -41,6 +39,7 @@ module Stylesheet
       colors.each do |n, hex|
         contents << "$#{n}: ##{hex} !default;\n"
       end
+
       theme&.all_theme_variables&.each do |field|
         if field.type_id == ThemeField.types[:theme_upload_var]
           if upload = field.upload
@@ -48,11 +47,14 @@ module Stylesheet
             contents << "$#{field.name}: unquote(\"#{url}\");\n"
           end
         else
-          escaped = field.value.gsub('"', "\\22")
-          escaped.gsub!("\n", "\\A")
-          contents << "$#{field.name}: unquote(\"#{escaped}\");\n"
+          contents << to_scss_variable(field.name, field.value)
         end
       end
+
+      theme&.included_settings&.each do |name, value|
+        contents << to_scss_variable(name, value)
+      end
+
       Import.new("theme_variable.scss", source: contents)
     end
 
@@ -62,7 +64,7 @@ module Stylesheet
         contents << category_css(c) if c.uploaded_background&.url.present?
       end
 
-      Import.new("categoy_background.scss", source: contents)
+      Import.new("category_background.scss", source: contents)
     end
 
     register_import "embedded_theme" do
@@ -134,6 +136,12 @@ COMMENT
       "body.category-#{category.full_slug} { background-image: url(#{upload_cdn_path(category.uploaded_background.url)}) }\n"
     end
 
+    def to_scss_variable(name, value)
+      escaped = value.to_s.gsub('"', "\\22")
+      escaped.gsub!("\n", "\\A")
+      "$#{name}: unquote(\"#{escaped}\");\n"
+    end
+
     def imports(asset, parent_path)
       if asset[-1] == "*"
         Dir["#{Stylesheet::ASSET_ROOT}/#{asset}.scss"].map do |path|
diff --git a/lib/stylesheet/manager.rb b/lib/stylesheet/manager.rb
index 92442b56060..2d5f3614d10 100644
--- a/lib/stylesheet/manager.rb
+++ b/lib/stylesheet/manager.rb
@@ -34,7 +34,8 @@ class Stylesheet::Manager
       theme_key = SiteSetting.default_theme_key
     end
 
-    cache_key = "#{target}_#{theme_key}"
+    current_hostname = Discourse.current_hostname
+    cache_key = "#{target}_#{theme_key}_#{current_hostname}"
     tag = cache[cache_key]
 
     return tag.dup.html_safe if tag
@@ -45,7 +46,7 @@ class Stylesheet::Manager
         tag = ""
       else
         builder.compile unless File.exists?(builder.stylesheet_fullpath)
-        tag = %[<link href="#{builder.stylesheet_path}" media="#{media}" rel="stylesheet" data-target="#{target}"/>]
+        tag = %[<link href="#{builder.stylesheet_path(current_hostname)}" media="#{media}" rel="stylesheet" data-target="#{target}"/>]
       end
 
       cache[cache_key] = tag
@@ -109,7 +110,11 @@ class Stylesheet::Manager
       if File.exists?(stylesheet_fullpath)
         unless StylesheetCache.where(target: qualified_target, digest: digest).exists?
           begin
-            source_map = File.read(source_map_fullpath) rescue nil
+            source_map = begin
+              File.read(source_map_fullpath)
+            rescue Errno::ENOENT
+            end
+
             StylesheetCache.add(qualified_target, digest, File.read(stylesheet_fullpath), source_map)
           rescue => e
             Rails.logger.warn "Completely unexpected error adding contents of '#{stylesheet_fullpath}' to cache #{e}"
@@ -181,12 +186,12 @@ class Stylesheet::Manager
     "#{cache_fullpath}/#{stylesheet_filename_no_digest}"
   end
 
-  def stylesheet_cdnpath
-    "#{GlobalSetting.cdn_url}#{stylesheet_relpath}?__ws=#{Discourse.current_hostname}"
+  def stylesheet_cdnpath(hostname)
+    "#{GlobalSetting.cdn_url}#{stylesheet_relpath}?__ws=#{hostname}"
   end
 
-  def stylesheet_path
-    stylesheet_cdnpath
+  def stylesheet_path(hostname)
+    stylesheet_cdnpath(hostname)
   end
 
   def root_path
@@ -251,7 +256,22 @@ class Stylesheet::Manager
       raise "attempting to look up theme digest for invalid field"
     end
 
-    Digest::SHA1.hexdigest(scss.to_s + color_scheme_digest.to_s)
+    Digest::SHA1.hexdigest(scss.to_s + color_scheme_digest.to_s + settings_digest + plugins_digest)
+  end
+
+  # this protects us from situations where new versions of a plugin removed a file
+  # old instances may still be serving CSS and not aware of the change
+  # so we could end up poisoning the cache with a bad file that can not be removed
+  def plugins_digest
+    assets = []
+    assets += DiscoursePluginRegistry.stylesheets.to_a
+    assets += DiscoursePluginRegistry.mobile_stylesheets.to_a
+    assets += DiscoursePluginRegistry.desktop_stylesheets.to_a
+    Digest::SHA1.hexdigest(assets.sort.join)
+  end
+
+  def settings_digest
+    Digest::SHA1.hexdigest((theme&.included_settings || {}).to_json)
   end
 
   def color_scheme_digest
diff --git a/lib/stylesheet/watcher.rb b/lib/stylesheet/watcher.rb
index f0778b38dc2..a1150e734f9 100644
--- a/lib/stylesheet/watcher.rb
+++ b/lib/stylesheet/watcher.rb
@@ -3,6 +3,14 @@ require 'listen'
 module Stylesheet
   class Watcher
 
+    def self.theme_key=(v)
+      @theme_key = v
+    end
+
+    def self.theme_key
+      @theme_key || SiteSetting.default_theme_key
+    end
+
     def self.watch(paths = nil)
       watcher = new(paths)
       watcher.start
@@ -68,9 +76,12 @@ module Stylesheet
       Stylesheet::Manager.cache.clear
 
       message = ["desktop", "mobile", "admin"].map do |name|
-        { target: name, new_href: Stylesheet::Manager.stylesheet_href(name.to_sym) , theme_key: SiteSetting.default_theme_key }
+        {
+          target: name,
+          new_href: Stylesheet::Manager.stylesheet_href(name.to_sym),
+          theme_key: Stylesheet::Watcher.theme_key
+        }
       end
-
       MessageBus.publish '/file-change', message
     end
 
diff --git a/lib/table_migration_helper.rb b/lib/table_migration_helper.rb
deleted file mode 100644
index 605555d49f8..00000000000
--- a/lib/table_migration_helper.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-class TableMigrationHelper
-  def self.read_only_table(table_name)
-    ActiveRecord::Base.exec_sql <<-SQL
-    CREATE OR REPLACE FUNCTION raise_read_only() RETURNS trigger AS $rro$
-      BEGIN
-        RAISE EXCEPTION 'Discourse: Table is read only';
-        RETURN null;
-      END
-    $rro$ LANGUAGE plpgsql;
-    SQL
-
-    ActiveRecord::Base.exec_sql <<-SQL
-    CREATE TRIGGER #{table_name}_read_only
-    BEFORE INSERT OR UPDATE OR DELETE OR TRUNCATE
-    ON #{table_name}
-    FOR EACH STATEMENT
-    EXECUTE PROCEDURE raise_read_only();
-    SQL
-  end
-
-  def self.delayed_drop(old_name:, new_name:, after_migration:, delay: nil, on_drop: nil)
-    delay ||= Rails.env.production? ? 300 : 0
-
-   sql = <<SQL
-    SELECT 1
-    FROM INFORMATION_SCHEMA.TABLES
-    WHERE table_schema = 'public' AND
-          table_name = :old_name AND
-          EXISTS (
-            SELECT 1
-            FROM schema_migration_details
-            WHERE name = :after_migration AND
-                  created_at <= (current_timestamp at time zone 'UTC' - interval :delay)
-          )
-          AND EXISTS (
-            SELECT 1
-            FROM INFORMATION_SCHEMA.TABLES
-            WHERE table_schema = 'public' AND
-            table_name = :new_name
-          )
-    LIMIT 1
-SQL
-
-    if ActiveRecord::Base.exec_sql(sql, old_name: old_name,
-                                        new_name: new_name,
-                                        delay: "#{delay.to_i || 0} seconds",
-                                        after_migration: after_migration).to_a.length > 0
-      on_drop&.call
-
-        ActiveRecord::Base.exec_sql("DROP TABLE #{old_name}")
-    end
-  end
-end
diff --git a/lib/tasks/admin.rake b/lib/tasks/admin.rake
index c57e03b7859..d2ff44b3662 100644
--- a/lib/tasks/admin.rake
+++ b/lib/tasks/admin.rake
@@ -19,7 +19,10 @@ task "admin:invite", [:email] => [:environment] do |_, args|
 
   puts "Granting admin!"
   user.grant_admin!
-  user.change_trust_level!(4)
+  if user.trust_level < 1
+    user.change_trust_level!(1)
+  end
+
   user.email_tokens.update_all confirmed: true
 
   puts "Sending email!"
@@ -81,7 +84,9 @@ task "admin:create" => :environment do
   grant_admin = ask("Do you want to grant Admin privileges to this account? (Y/n)  ")
   if (grant_admin == "" || grant_admin.downcase == 'y')
     admin.grant_admin!
-    admin.change_trust_level!(4)
+    if admin.trust_level < 1
+      admin.change_trust_level!(1)
+    end
     admin.email_tokens.update_all confirmed: true
     admin.activate
 
diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake
index 75f7db109b1..abb83aff2b3 100644
--- a/lib/tasks/assets.rake
+++ b/lib/tasks/assets.rake
@@ -117,7 +117,7 @@ end
 
 if ENV['COMPRESS_BROTLI']&.to_i == 1
   # different brotli versions use different parameters
-  ver_out, ver_err, ver_status = Open3.capture3('brotli --version')
+  ver_out, _ver_err, ver_status = Open3.capture3('brotli --version')
   if !ver_status.success?
     # old versions of brotli don't respond to --version
     def brotli_command(path)
@@ -125,7 +125,7 @@ if ENV['COMPRESS_BROTLI']&.to_i == 1
     end
   elsif ver_out >= "brotli 1.0.0"
     def brotli_command(path)
-      "brotli --quality=11 #{path} --output=#{path}.br"
+      "brotli -f --quality=11 #{path} --output=#{path}.br"
     end
   else
     # not sure what to do here, not expecting this
diff --git a/lib/tasks/avatars.rake b/lib/tasks/avatars.rake
index 5b2df506cf6..f9bdf8e8b90 100644
--- a/lib/tasks/avatars.rake
+++ b/lib/tasks/avatars.rake
@@ -25,7 +25,11 @@ task "avatars:clean" => :environment do
                         upload_id IN (SELECT gravatar_upload_id FROM user_avatars) OR
                         upload_id IN (SELECT uploaded_avatar_id FROM users)")
     .find_each do |optimized_image|
-    optimized_image.destroy!
+    begin
+      optimized_image.destroy!
+    rescue
+      # skip
+    end
     putc "." if (i += 1) % 10 == 0
   end
 
diff --git a/lib/tasks/categories.rake b/lib/tasks/categories.rake
new file mode 100644
index 00000000000..407bf65f741
--- /dev/null
+++ b/lib/tasks/categories.rake
@@ -0,0 +1,23 @@
+task "categories:move_topics", [:from_category, :to_category] => [:environment] do |_, args|
+  from_category_id = args[:from_category]
+  to_category_id = args[:to_category]
+
+  if !from_category_id || !to_category_id
+    puts "ERROR: Expecting categories:move_topics[from_category_id,to_category_id]"
+    exit 1
+  end
+
+  from_category = Category.find(from_category_id)
+  to_category = Category.find(to_category_id)
+
+  if from_category.present? && to_category.present?
+    puts "Moving topics from #{from_category.slug} to #{to_category.slug}..."
+    Topic.where(category_id: from_category.id).update_all(category_id: to_category.id)
+    from_category.update_attribute(:topic_count, 0)
+
+    puts "Updating category stats..."
+    Category.update_stats
+  end
+
+  puts "", "Done!", ""
+end
diff --git a/lib/tasks/destroy.rake b/lib/tasks/destroy.rake
new file mode 100644
index 00000000000..c0796740488
--- /dev/null
+++ b/lib/tasks/destroy.rake
@@ -0,0 +1,39 @@
+## These tasks are destructive and are for clearing out all the
+#   content and users from your site, but keeping your site settings,
+#   theme, and category structure.
+desc "Remove all topics in a category"
+task "destroy:topics", [:category] => :environment do |t, args|
+  category = args[:category]
+  puts "Going to delete all topics in the #{category} category"
+  puts log = DestroyTask.destroy_topics(category)
+end
+
+desc "Remove all topics in all categories"
+task "destroy:topics_all_categories" => :environment do
+  puts "Going to delete all topics in all categories..."
+  puts log = DestroyTask.destroy_topics_all_categories
+end
+
+desc "Remove all private messages"
+task "destroy:private_messages" => :environment do
+  puts "Going to delete all private messages..."
+  puts log = DestroyTask.destroy_private_messages
+end
+
+desc "Destroy all groups"
+task "destroy:groups" => :environment do
+  puts "Going to delete all non-default groups..."
+  puts log = DestroyTask.destroy_groups
+end
+
+desc "Destroy all non-admin users"
+task "destroy:users" => :environment do
+  puts "Going to delete all non-admin users..."
+  puts log = DestroyTask.destroy_users
+end
+
+desc "Destroy site stats"
+task "destroy:stats" => :environment do
+  puts "Going to delete all site stats..."
+  DestroyTask.destroy_stats
+end
diff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rake
index e506eed2735..f66450a0500 100644
--- a/lib/tasks/docker.rake
+++ b/lib/tasks/docker.rake
@@ -12,6 +12,7 @@
 # => SINGLE_PLUGIN             set to plugin name to only run plugin-specific rspec tests (you'll probably want to SKIP_CORE as well)
 # => BISECT                    set to 1 to run rspec --bisect (applies to core rspec tests only)
 # => RSPEC_SEED                set to seed to use for rspec tests (applies to core rspec tests only)
+# => PAUSE_ON_TERMINATE        set to 1 to pause prior to terminating redis and pg
 #
 # Other useful environment variables (not specific to this rake task)
 # => COMMIT_HASH    used by the discourse_test docker image to load a specific commit of discourse
@@ -56,7 +57,7 @@ task 'docker:test' do
       puts "Starting background redis"
       @redis_pid = Process.spawn('redis-server --dir tmp/test_data/redis')
 
-      @postgres_bin = "/usr/lib/postgresql/9.5/bin/"
+      @postgres_bin = "/usr/lib/postgresql/10/bin/"
       `#{@postgres_bin}initdb -D tmp/test_data/pg`
 
       # speed up db, never do this in production mmmmk
@@ -73,6 +74,7 @@ task 'docker:test' do
 
       if ENV["INSTALL_OFFICIAL_PLUGINS"]
         @good &&= run_or_fail("bundle exec rake plugin:install_all_official")
+        @good &&= run_or_fail("bundle exec rails r 'puts \"installing all gems\"'")
       end
 
       unless ENV["JS_ONLY"]
@@ -118,6 +120,11 @@ task 'docker:test' do
   ensure
     puts "Terminating"
 
+    if ENV['PAUSE_ON_TERMINATE']
+      puts "Pausing prior to termination"
+      sleep
+    end
+
     Process.kill("TERM", @redis_pid) if @redis_pid
     Process.kill("TERM", @pg_pid) if @pg_pid
     Process.wait @redis_pid if @redis_pid
diff --git a/lib/tasks/emails.rake b/lib/tasks/emails.rake
index 1ab9c71d357..c4258bd9d32 100644
--- a/lib/tasks/emails.rake
+++ b/lib/tasks/emails.rake
@@ -54,3 +54,10 @@ task "emails:import" => :environment do
     RateLimiter.enable
   end
 end
+
+desc 'Send email test message'
+task 'emails:test', [:email] => [:environment] do |_, args|
+  email = args[:email]
+
+  Email::Sender.new(TestMailer.send_test(email), :test_message).send
+end
diff --git a/lib/tasks/emoji.rake b/lib/tasks/emoji.rake
index 5ff933cab7f..2ebfb4964a3 100644
--- a/lib/tasks/emoji.rake
+++ b/lib/tasks/emoji.rake
@@ -12,6 +12,17 @@ EMOJI_IMAGES_PATH ||= "public/images/emoji"
 
 EMOJI_ORDERING_URL ||= "http://www.unicode.org/emoji/charts/emoji-ordering.html"
 
+# Format is search pattern => associated emojis
+# eg: "cry" => [ "sob" ]
+# for a "cry" query should return: cry and sob
+SEARCH_ALIASES ||= {
+  "sad" => [ "frowning_face", "slightly_frowning_face", "sob", "crying_cat_face", "cry" ],
+  "cry" => [ "sob" ]
+}
+
+# emoji aliases are actually created as images
+# eg: "right_anger_bubble" => [ "anger_right" ]
+# your app will physically have right_anger_bubble.png and anger_right.png
 EMOJI_ALIASES ||= {
   "right_anger_bubble" => [ "anger_right" ],
   "ballot_box" => [ "ballot_box_with_ballot" ],
@@ -199,6 +210,7 @@ EMOJI_ALIASES ||= {
   "new_moon" => [ "moon" ],
   "oncoming_automobile" => [ "car", "automobile" ],
   "fleur_de_lis" => [ "fleur-de-lis" ],
+  "face_vomiting" => [ "puke" ]
 }
 
 EMOJI_GROUPS ||= [
@@ -363,7 +375,7 @@ EMOJI_SETS ||= {
   "apple" => "apple",
   "google" => "google",
   "google_blob" => "google_classic",
-  "facebook_messenger" => "facebook_messenger",
+  "facebook" => "facebook_messenger",
   "twitter" => "twitter",
   "emoji_one" => "emoji_one",
   "windows" => "win10",
@@ -507,7 +519,8 @@ def write_db_json(emojis)
   db = {
     "emojis" => emojis_without_tones,
     "tonableEmojis" => emoji_with_tones,
-    "aliases" => EMOJI_ALIASES
+    "aliases" => EMOJI_ALIASES,
+    "searchAliases" => SEARCH_ALIASES
   }
 
   File.write(EMOJI_DB_PATH, JSON.pretty_generate(db))
diff --git a/lib/tasks/export.rake b/lib/tasks/export.rake
index d0b80c88192..121a8647716 100644
--- a/lib/tasks/export.rake
+++ b/lib/tasks/export.rake
@@ -1,8 +1,9 @@
 desc 'Export all the categories'
 task 'export:categories', [:category_ids] => [:environment] do |_, args|
   require "import_export/import_export"
+  ids = args[:category_ids].split(" ")
 
-  ImportExport.export_categories(args[:category_ids])
+  ImportExport.export_categories(ids)
   puts "", "Done", ""
 end
 
diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake
index f26e7b30257..15458e27ccb 100644
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -19,6 +19,7 @@ task "import:ensure_consistency" => :environment do
   update_categories
   update_users
   update_groups
+  update_tag_stats
 
   log "Done!"
 end
@@ -164,7 +165,7 @@ def insert_user_options
                   , #{SiteSetting.default_email_mailing_list_mode}
                   , #{SiteSetting.default_email_mailing_list_mode_frequency}
                   , #{SiteSetting.default_email_direct}
-                  , #{SiteSetting.default_email_private_messages}
+                  , #{SiteSetting.default_email_personal_messages}
                   , #{SiteSetting.default_email_previous_replies}
                   , #{SiteSetting.default_email_in_reply_to}
                   , #{SiteSetting.default_email_digest_frequency.to_i > 0}
@@ -419,6 +420,10 @@ def update_groups
   SQL
 end
 
+def update_tag_stats
+  Tag.ensure_consistency!
+end
+
 def log(message)
   puts "[#{DateTime.now.strftime("%Y-%m-%d %H:%M:%S")}] #{message}"
 end
diff --git a/lib/tasks/posts.rake b/lib/tasks/posts.rake
index 387af78b8a0..3c17bc1e3bd 100644
--- a/lib/tasks/posts.rake
+++ b/lib/tasks/posts.rake
@@ -87,9 +87,12 @@ def rebake_posts(opts = {})
   total = Post.count
   rebaked = 0
 
-  Post.find_each do |post|
-    rebake_post(post, opts)
-    print_status(rebaked += 1, total)
+  # TODO: make this resumable because carrying around 20 million ids in memory is not a great idea long term
+  Post.order(id: :desc).pluck(:id).in_groups_of(1000, false).each do |batched_post_ids|
+    Post.order(created_at: :desc).where(id: batched_post_ids).each do |post|
+      rebake_post(post, opts)
+      print_status(rebaked += 1, total)
+    end
   end
 
   SiteSetting.disable_edit_notifications = disable_edit_notifications
@@ -274,3 +277,97 @@ task 'posts:refresh_emails', [:topic_id] => [:environment] do |_, args|
 
   puts "", "Done. #{updated} posts updated.", ""
 end
+
+desc 'Reorders all posts based on their creation_date'
+task 'posts:reorder_posts', [:topic_id] => [:environment] do |_, args|
+  Post.transaction do
+    # update sort_order and flip post_number to prevent
+    # unique constraint violations when updating post_number
+    builder = SqlBuilder.new(<<~SQL)
+      WITH ordered_posts AS (
+          SELECT
+            id,
+            ROW_NUMBER()
+            OVER (
+              PARTITION BY topic_id
+              ORDER BY created_at, post_number ) AS new_post_number
+          FROM posts
+          /*where*/
+      )
+      UPDATE posts AS p
+      SET sort_order = o.new_post_number,
+        post_number  = p.post_number * -1
+      FROM ordered_posts AS o
+      WHERE p.id = o.id AND
+            p.post_number <> o.new_post_number
+    SQL
+    builder.where("topic_id = :topic_id") if args[:topic_id]
+    builder.exec(topic_id: args[:topic_id])
+
+    Notification.exec_sql(<<~SQL)
+      UPDATE notifications AS x
+      SET post_number = p.sort_order
+      FROM posts AS p
+      WHERE x.topic_id = p.topic_id AND
+            x.post_number = ABS(p.post_number) AND
+            p.post_number < 0
+    SQL
+
+    PostTiming.exec_sql(<<~SQL)
+      UPDATE post_timings AS x
+      SET post_number = x.post_number * -1
+      FROM posts AS p
+      WHERE x.topic_id = p.topic_id AND
+            x.post_number = ABS(p.post_number) AND
+            p.post_number < 0;
+
+      UPDATE post_timings AS t
+      SET post_number = p.sort_order
+      FROM posts AS p
+      WHERE t.topic_id = p.topic_id AND
+            t.post_number = p.post_number AND
+            p.post_number < 0;
+    SQL
+
+    Post.exec_sql(<<~SQL)
+      UPDATE posts AS x
+      SET reply_to_post_number = p.sort_order
+      FROM posts AS p
+      WHERE x.topic_id = p.topic_id AND
+            x.reply_to_post_number = ABS(p.post_number) AND
+            p.post_number < 0;
+    SQL
+
+    TopicUser.exec_sql(<<~SQL)
+      UPDATE topic_users AS x
+        SET last_read_post_number = p.sort_order
+      FROM posts AS p
+      WHERE x.topic_id = p.topic_id AND
+            x.last_read_post_number = ABS(p.post_number) AND
+            p.post_number < 0;
+
+      UPDATE topic_users AS x
+        SET highest_seen_post_number = p.sort_order
+      FROM posts AS p
+      WHERE x.topic_id = p.topic_id AND
+            x.highest_seen_post_number = ABS(p.post_number) AND
+            p.post_number < 0;
+
+      UPDATE topic_users AS x
+        SET last_emailed_post_number = p.sort_order
+      FROM posts AS p
+      WHERE x.topic_id = p.topic_id AND
+            x.last_emailed_post_number = ABS(p.post_number) AND
+            p.post_number < 0;
+    SQL
+
+    # finally update the post_number
+    Post.exec_sql(<<~SQL)
+      UPDATE posts
+      SET post_number = sort_order
+      WHERE post_number < 0
+    SQL
+  end
+
+  puts "", "Done.", ""
+end
diff --git a/lib/tasks/qunit.rake b/lib/tasks/qunit.rake
index c97b26d9bc7..884cc696304 100644
--- a/lib/tasks/qunit.rake
+++ b/lib/tasks/qunit.rake
@@ -1,15 +1,21 @@
 desc "Runs the qunit test suite"
 
 task "qunit:test", [:timeout, :qunit_path] => :environment do |_, args|
-
   require "rack"
   require "socket"
+  require 'rbconfig'
 
-  unless system("command -v google-chrome >/dev/null;")
+  if RbConfig::CONFIG['host_os'][/darwin|mac os/]
+    google_chrome_cli = "/Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome"
+  else
+    google_chrome_cli = "google-chrome"
+  end
+
+  unless system("command -v \"#{google_chrome_cli}\" >/dev/null")
     abort "Chrome is not installed. Download from https://www.google.com/chrome/browser/desktop/index.html"
   end
 
-  if Gem::Version.new(`$(command -v google-chrome) --version`.match(/[\d\.]+/)[0]) < Gem::Version.new("59")
+  if Gem::Version.new(`\"#{google_chrome_cli}\" --version`.match(/[\d\.]+/)[0]) < Gem::Version.new("59")
     abort "Chrome 59 or higher is required to run tests in headless mode."
   end
 
@@ -72,7 +78,7 @@ task "qunit:test", [:timeout, :qunit_path] => :environment do |_, args|
     puts "Warming up Rails server"
     begin
       Net::HTTP.get(uri)
-    rescue Errno::ECONNREFUSED, Errno::EADDRNOTAVAIL
+    rescue Errno::ECONNREFUSED, Errno::EADDRNOTAVAIL, Net::ReadTimeout
       sleep 1
       retry unless elapsed() > 60
       puts "Timed out. Can no connect to forked server!"
@@ -80,16 +86,7 @@ task "qunit:test", [:timeout, :qunit_path] => :environment do |_, args|
     end
     puts "Rails server is warmed up"
 
-    # wait for server to respond, will exception out on failure
-    tries = 0
-    begin
-      sh(cmd)
-    rescue
-      exit if ENV['RETRY'].present? && ENV['RETRY'] == 'false'
-      sleep 2
-      tries += 1
-      retry unless tries == 3
-    end
+    sh(cmd)
 
     # A bit of a hack until we can figure this out on Travis
     tries = 0
diff --git a/lib/tasks/search.rake b/lib/tasks/search.rake
index 7d1ce3ab30c..bb609dff673 100644
--- a/lib/tasks/search.rake
+++ b/lib/tasks/search.rake
@@ -5,52 +5,37 @@ end
 def reindex_search(db = RailsMultisite::ConnectionManagement.current_db)
   puts "Reindexing '#{db}'"
   puts ""
-  puts "Posts:"
-  Post.exec_sql("select p.id, p.cooked, c.name category, t.title, p.post_number, t.id topic_id from
-                 posts p
-                 join topics t on t.id = p.topic_id
-                 left join categories c on c.id = t.category_id
-                 ").each do |p|
-    post_id = p["id"]
-    cooked = p["cooked"]
-    title = p["title"]
-    category = p["cat"]
-    post_number = p["post_number"].to_i
-    topic_id = p["topic_id"].to_i
-
-    SearchIndexer.update_posts_index(post_id, cooked, title, category)
-    SearchIndexer.update_topics_index(topic_id, title , cooked) if post_number == 1
-
+  puts "Posts"
+  Post.includes(topic: [:category, :tags]).find_each do |p|
+    if p.post_number == 1
+      SearchIndexer.index(p.topic, force: true)
+    else
+      SearchIndexer.index(p, force: true)
+    end
     putc "."
   end
 
   puts
-  puts "Users:"
-  User.exec_sql("select id, name, username from users").each do |u|
-    id = u["id"]
-    name = u["name"]
-    username = u["username"]
-    SearchIndexer.update_users_index(id, username, name)
-
+  puts "Users"
+  User.find_each do |u|
+    SearchIndexer.index(u, force: true)
     putc "."
   end
 
   puts
   puts "Categories"
 
-  Category.exec_sql("select id, name from categories").each do |c|
-    id = c["id"]
-    name = c["name"]
-    SearchIndexer.update_categories_index(id, name)
-
-    putc '.'
+  Category.find_each do |c|
+    SearchIndexer.index(c, force: true)
+    putc "."
   end
 
-  puts '', 'Tags'
+  puts
+  puts "Tags"
 
-  Tag.exec_sql('select id, name from tags').each do |t|
-    SearchIndexer.update_tags_index(t['id'], t['name'])
-    putc '.'
+  Tag.find_each do |t|
+    SearchIndexer.index(t, force: true)
+    putc "."
   end
 
   puts
diff --git a/lib/tasks/site_settings.rake b/lib/tasks/site_settings.rake
new file mode 100644
index 00000000000..692cf32b2e2
--- /dev/null
+++ b/lib/tasks/site_settings.rake
@@ -0,0 +1,32 @@
+require 'yaml'
+
+desc "Exports site settings"
+task "site_settings:export" => :environment do
+  h = SiteSettingsTask.export_to_hash
+  puts h.to_yaml
+end
+
+desc "Imports site settings"
+task "site_settings:import" => :environment do
+  yml = (STDIN.tty?) ? '' : STDIN.read
+  if yml == ''
+    puts
+    puts "Please specify a settings yml file"
+    puts "Example: rake site_settings:import < settings.yml"
+    exit 1
+  end
+
+  puts
+  puts "starting import..."
+  puts
+
+  log, counts = SiteSettingsTask.import(yml)
+
+  puts log
+
+  puts
+  puts "Results:"
+  puts " Updated:   #{counts[:updated]}"
+  puts " Not Found: #{counts[:not_found]}"
+  puts " Errors:    #{counts[:errors]}"
+end
diff --git a/lib/tasks/smoke_test.rake b/lib/tasks/smoke_test.rake
index 2558558ad8c..87b526e7f6f 100644
--- a/lib/tasks/smoke_test.rake
+++ b/lib/tasks/smoke_test.rake
@@ -26,12 +26,24 @@ task "smoke:test" do
     request.basic_auth(ENV['AUTH_USER'], ENV['AUTH_PASSWORD'])
   end
 
-  response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == 'https') do |http|
-    http.request(request)
-  end
+  dir = ENV["SMOKE_TEST_SCREENSHOT_PATH"] || 'tmp/smoke-test-screenshots'
+  FileUtils.mkdir_p(dir) unless Dir.exists?(dir)
 
-  if response.code != "200"
-    raise "TRIVIAL GET FAILED WITH #{response.code}"
+  start = Time.now
+  while true
+    response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == 'https') do |http|
+      http.request(request)
+    end
+
+    break if response.code == "200"
+
+    # retry for up to 5 minutes
+    if Time.now - start < 300
+      puts "Connection failed with #{response.code}. Retrying in 5 seconds..."
+      sleep(5)
+    else
+      raise "TRIVIAL GET FAILED WITH #{response.code}"
+    end
   end
 
   results = ""
diff --git a/lib/tasks/uploads.rake b/lib/tasks/uploads.rake
index 9ecf00c3d9a..d69f3078a73 100644
--- a/lib/tasks/uploads.rake
+++ b/lib/tasks/uploads.rake
@@ -1,12 +1,12 @@
+require "db_helper"
 require "digest/sha1"
+require "base62"
 
 ################################################################################
 #                                    gather                                    #
 ################################################################################
 
 task "uploads:gather" => :environment do
-  require "db_helper"
-
   ENV["RAILS_DB"] ? gather_uploads : gather_uploads_for_all_sites
 end
 
@@ -84,8 +84,6 @@ end
 ################################################################################
 
 task "uploads:migrate_from_s3" => :environment do
-  require "db_helper"
-
   ENV["RAILS_DB"] ? migrate_from_s3 : migrate_all_from_s3
 end
 
@@ -114,56 +112,58 @@ def migrate_from_s3
   require "file_store/s3_store"
 
   # make sure S3 is disabled
-  if SiteSetting.Uploads.enable_s3_uploads
+  if SiteSetting.Upload.enable_s3_uploads
     puts "You must disable S3 uploads before running that task."
     return
   end
 
-  # make sure S3 bucket is set
-  if SiteSetting.Upload.s3_upload_bucket.blank?
-    puts "The S3 upload bucket must be set before running that task."
-    return
-  end
-
   db = RailsMultisite::ConnectionManagement.current_db
 
   puts "Migrating uploads from S3 to local storage for '#{db}'..."
 
-  s3_base_url = FileStore::S3Store.new.absolute_base_url
   max_file_size_kb = [SiteSetting.max_image_size_kb, SiteSetting.max_attachment_size_kb].max.kilobytes
 
-  Post.unscoped.find_each do |post|
-    if post.raw[s3_base_url]
-      post.raw.scan(/(#{Regexp.escape(s3_base_url)}\/(\d+)(\h{40})\.\w+)/).each do |url, id, sha|
+  Post.where("user_id > 0 AND raw LIKE '%.s3%.amazonaws.com/%'").find_each do |post|
+    begin
+      updated = false
+
+      post.raw.gsub!(/(\/\/[\w.-]+amazonaws\.com\/(original|optimized)\/([a-z0-9]+\/)+\h{40}([\w.-]+)?)/i) do |url|
         begin
-          puts "POST ID: #{post.id}"
-          puts "UPLOAD ID: #{id}"
-          puts "UPLOAD SHA: #{sha}"
-          puts "UPLOAD URL: #{url}"
           if filename = guess_filename(url, post.raw)
-            puts "FILENAME: #{filename}"
-            file = FileHelper.download(
-              "http:#{url}",
-              max_file_size: 20.megabytes,
-              tmp_file_name: "from_s3",
-              follow_redirect: true
-            )
-            if upload = UploadCreator.new(file, filename).create_for(post.user_id || -1)
-              post.raw = post.raw.gsub(/(https?:)?#{Regexp.escape(url)}/, upload.url)
-              post.save
-              post.rebake!
-              puts "OK :)"
-            else
-              puts "KO :("
+            file = FileHelper.download("http:#{url}", max_file_size: 20.megabytes, tmp_file_name: "from_s3", follow_redirect: true)
+            sha1 = Upload.generate_digest(file)
+            origin = nil
+
+            existing_upload = Upload.find_by(sha1: sha1)
+            if existing_upload&.url&.start_with?("//")
+              filename = existing_upload.original_filename
+              origin = existing_upload.origin
+              existing_upload.destroy
+            end
+
+            new_upload = UploadCreator.new(file, filename, origin: origin).create_for(post.user_id || -1)
+            if new_upload&.save
+              updated = true
+              url = new_upload.url
             end
-            puts post.full_url, ""
-          else
-            puts "NO FILENAME :("
           end
-        rescue => e
-          puts "EXCEPTION: #{e.message}"
+
+          url
+        rescue
+          url
         end
       end
+
+      if updated
+        post.save!
+        post.rebake!
+        putc "#"
+      else
+        putc "."
+      end
+
+    rescue
+      putc "X"
     end
   end
 
@@ -177,7 +177,6 @@ end
 task "uploads:migrate_to_s3" => :environment do
   require "file_store/s3_store"
   require "file_store/local_store"
-  require "db_helper"
 
   ENV["RAILS_DB"] ? migrate_to_s3 : migrate_to_s3_all_sites
 end
@@ -342,15 +341,15 @@ end
 # list all missing uploads and optimized images
 task "uploads:missing" => :environment do
   if ENV["RAILS_DB"]
-    list_missing_uploads
+    list_missing_uploads(skip_optimized: ENV['SKIP_OPTIMIZED'])
   else
     RailsMultisite::ConnectionManagement.each_connection do |db|
-      list_missing_uploads
+      list_missing_uploads(skip_optimized: ENV['SKIP_OPTIMIZED'])
     end
   end
 end
 
-def list_missing_uploads
+def list_missing_uploads(skip_optimized: false)
   if Discourse.store.external?
     puts "This task only works for internal storages."
     return
@@ -373,20 +372,21 @@ def list_missing_uploads
     puts path if bad
   end
 
-  OptimizedImage.find_each do |optimized_image|
+  unless skip_optimized
+    OptimizedImage.find_each do |optimized_image|
+      # remote?
+      next unless optimized_image.url =~ /^\/[^\/]/
 
-    # remote?
-    next unless optimized_image.url =~ /^\/[^\/]/
+      path = "#{public_directory}#{optimized_image.url}"
 
-    path = "#{public_directory}#{optimized_image.url}"
-
-    bad = true
-    begin
-      bad = false if File.size(path) != 0
-    rescue
-      # something is messed up
+      bad = true
+      begin
+        bad = false if File.size(path) != 0
+      rescue
+        # something is messed up
+      end
+      puts path if bad
     end
-    puts path if bad
   end
 end
 
@@ -409,56 +409,80 @@ def recover_from_tombstone
   end
 
   begin
-    original_setting = SiteSetting.max_image_size_kb
-    SiteSetting.max_image_size_kb = 10240
-    current_db = RailsMultisite::ConnectionManagement.current_db
+    previous_image_size      = SiteSetting.max_image_size_kb
+    previous_attachment_size = SiteSetting.max_attachment_size_kb
+    previous_extensions      = SiteSetting.authorized_extensions
 
+    SiteSetting.max_image_size_kb      = 10 * 1024
+    SiteSetting.max_attachment_size_kb = 10 * 1024
+    SiteSetting.authorized_extensions  = "*"
+
+    current_db = RailsMultisite::ConnectionManagement.current_db
     public_path = Rails.root.join("public")
     paths = Dir.glob(File.join(public_path, 'uploads', 'tombstone', current_db, '**', '*.*'))
-    max = paths.length
+    max = paths.size
 
     paths.each_with_index do |path, index|
       filename = File.basename(path)
       printf("%9d / %d (%5.1f%%)\n", (index + 1), max, (((index + 1).to_f / max.to_f) * 100).round(1))
 
-      Post.where("raw LIKE ?", "%#{filename}%").each do |post|
+      Post.where("raw LIKE ?", "%#{filename}%").find_each do |post|
         doc = Nokogiri::HTML::fragment(post.raw)
         updated = false
 
-        doc.css("img[src]").each do |img|
-          url = img["src"]
+        image_urls = doc.css("img[src]").map { |img| img["src"] }
+        attachment_urls = doc.css("a.attachment[href]").map { |a| a["href"] }
 
-          next unless url =~ /^\/uploads\//
+        (image_urls + attachment_urls).each do |url|
+          next if !url.start_with?("/uploads/")
+          next if Upload.exists?(url: url)
 
-          upload = Upload.find_by(url: url)
+          puts "Restoring #{path}..."
+          tombstone_path = File.join(public_path, 'uploads', 'tombstone', url.gsub(/^\/uploads\//, ""))
 
-          if !upload && url
-            printf "Restoring #{path}..."
-            tombstone_path = File.join(public_path, 'uploads', 'tombstone', url.gsub(/^\/uploads\//, ""))
+          if File.exists?(tombstone_path)
+            File.open(tombstone_path) do |file|
+              new_upload = UploadCreator.new(file, File.basename(url)).create_for(Discourse::SYSTEM_USER_ID)
 
-            if File.exists?(tombstone_path)
-              File.open(tombstone_path) do |file|
-                new_upload = UploadCreator.new(file, File.basename(url)).create_for(Discourse::SYSTEM_USER_ID)
-
-                if new_upload.persisted?
-                  printf "Restored into #{new_upload.url}\n"
-                  DbHelper.remap(url, new_upload.url)
-                  updated = true
-                else
-                  puts "Failed to create upload for #{url}: #{new_upload.errors.full_messages}."
-                end
+              if new_upload.persisted?
+                puts "Restored into #{new_upload.url}"
+                DbHelper.remap(url, new_upload.url)
+                updated = true
+              else
+                puts "Failed to create upload for #{url}: #{new_upload.errors.full_messages}."
               end
-            else
-              puts "Failed to find file (#{tombstone_path}) in tombstone."
             end
+          else
+            puts "Failed to find file (#{tombstone_path}) in tombstone."
           end
         end
 
         post.rebake! if updated
       end
+
+      sha1 = File.basename(filename, File.extname(filename))
+      short_url = "upload://#{Base62.encode(sha1.hex)}"
+
+      Post.where("raw LIKE ?", "%#{short_url}%").find_each do |post|
+        puts "Restoring #{path}..."
+
+        File.open(path) do |file|
+          new_upload = UploadCreator.new(file, filename).create_for(Discourse::SYSTEM_USER_ID)
+
+          if new_upload.persisted?
+            puts "Restored into #{new_upload.short_url}"
+            DbHelper.remap(short_url, new_upload.short_url) if short_url != new_upload.short_url
+            post.rebake!
+          else
+            puts "Failed to create upload for #{filename}: #{new_upload.errors.full_messages}."
+          end
+        end
+      end
     end
   ensure
-    SiteSetting.max_image_size_kb = original_setting
+    SiteSetting.max_image_size_kb      = previous_image_size
+    SiteSetting.max_attachment_size_kb = previous_attachment_size
+    SiteSetting.authorized_extensions  = previous_extensions
   end
 end
 
diff --git a/lib/tasks/users.rake b/lib/tasks/users.rake
index d01d30b744b..877d270f68e 100644
--- a/lib/tasks/users.rake
+++ b/lib/tasks/users.rake
@@ -4,27 +4,21 @@ task "users:change_post_ownership", [:old_username, :new_username, :archetype] =
   new_username = args[:new_username]
   archetype = args[:archetype]
   archetype = archetype.downcase if archetype
+
   if !old_username || !new_username
-    puts "ERROR: Expecting rake posts:change_post_ownership[old_username,new_username,archetype]"
-    exit 1
-  end
-  old_user = User.find_by(username_lower: old_username.downcase)
-  if !old_user
-    puts "ERROR: User with username #{old_username} does not exist"
-    exit 1
-  end
-  new_user = User.find_by(username_lower: new_username.downcase)
-  if !new_user
-    puts "ERROR: User with username #{new_username} does not exist"
+    puts "ERROR: Expecting rake users:change_post_ownership[old_username,new_username,archetype]"
     exit 1
   end
 
+  old_user = find_user(old_username)
+  new_user = find_user(new_username)
+
   if archetype == "private"
     posts = Post.private_posts.where(user_id: old_user.id)
   elsif archetype == "public" || !archetype
     posts = Post.public_posts.where(user_id: old_user.id)
   else
-    puts "ERROR: Expecting rake posts:change_post_ownership[old_username,new_username,archetype] where archetype is public or private"
+    puts "ERROR: Expecting rake users:change_post_ownership[old_username,new_username,archetype] where archetype is public or private"
     exit 1
   end
 
@@ -37,3 +31,64 @@ task "users:change_post_ownership", [:old_username, :new_username, :archetype] =
   end
   puts "", "#{i} posts ownership changed!", ""
 end
+
+task "users:merge", [:source_username, :target_username] => [:environment] do |_, args|
+  source_username = args[:source_username]
+  target_username = args[:target_username]
+
+  if !source_username || !target_username
+    puts "ERROR: Expecting rake users:merge[source_username,target_username]"
+    exit 1
+  end
+
+  source_user = find_user(source_username)
+  target_user = find_user(target_username)
+
+  UserMerger.new(source_user, target_user).merge!
+  puts "", "Users merged!", ""
+end
+
+task "users:rename", [:old_username, :new_username] => [:environment] do |_, args|
+  old_username = args[:old_username]
+  new_username = args[:new_username]
+
+  if !old_username || !new_username
+    puts "ERROR: Expecting rake users:rename[old_username,new_username]"
+    exit 1
+  end
+
+  changer = UsernameChanger.new(find_user(old_username), new_username)
+  changer.change(asynchronous: false)
+  puts "", "User renamed!", ""
+end
+
+desc "Updates username in quotes and mentions. Use this if the user was renamed before proper renaming existed."
+task "users:update_posts", [:old_username, :current_username] => [:environment] do |_, args|
+  old_username = args[:old_username]
+  current_username = args[:current_username]
+
+  if !old_username || !current_username
+    puts "ERROR: Expecting rake users:update_posts[old_username,current_username]"
+    exit 1
+  end
+
+  user = find_user(current_username)
+  Jobs::UpdateUsername.new.execute(
+    user_id: user.id,
+    old_username: old_username,
+    new_username: user.username,
+    avatar_template: user.avatar_template)
+
+  puts "", "Username updated!", ""
+end
+
+def find_user(username)
+  user = User.find_by_username(username)
+
+  if !user
+    puts "ERROR: User with username #{username} does not exist"
+    exit 1
+  end
+
+  user
+end
diff --git a/lib/text_cleaner.rb b/lib/text_cleaner.rb
index 31ff605cef3..0914fe88881 100644
--- a/lib/text_cleaner.rb
+++ b/lib/text_cleaner.rb
@@ -17,7 +17,8 @@ class TextCleaner
       remove_all_periods_from_the_end: SiteSetting.title_prettify,
       remove_extraneous_space: SiteSetting.title_prettify && SiteSetting.default_locale == "en",
       fixes_interior_spaces: true,
-      strip_whitespaces: true
+      strip_whitespaces: true,
+      strip_zero_width_spaces: true
     }
   end
 
@@ -47,6 +48,8 @@ class TextCleaner
     text = normalize_whitespaces(text)
     # Strip whitespaces
     text.strip! if opts[:strip_whitespaces]
+    # Strip zero width spaces
+    text.gsub!(/\u200b/, '') if opts[:strip_zero_width_spaces]
 
     text
   end
diff --git a/lib/text_sentinel.rb b/lib/text_sentinel.rb
index fa88e647f96..e9b52320041 100644
--- a/lib/text_sentinel.rb
+++ b/lib/text_sentinel.rb
@@ -19,9 +19,9 @@ class TextSentinel
   def self.body_sentinel(text, opts = {})
     entropy = SiteSetting.body_min_entropy
     if opts[:private_message]
-      scale_entropy = SiteSetting.min_private_message_post_length.to_f / SiteSetting.min_post_length.to_f
+      scale_entropy = SiteSetting.min_personal_message_post_length.to_f / SiteSetting.min_post_length.to_f
       entropy = (entropy * scale_entropy).to_i
-      entropy = (SiteSetting.min_private_message_post_length.to_f * ENTROPY_SCALE).to_i if entropy > SiteSetting.min_private_message_post_length
+      entropy = (SiteSetting.min_personal_message_post_length.to_f * ENTROPY_SCALE).to_i if entropy > SiteSetting.min_personal_message_post_length
     else
       entropy = (SiteSetting.min_post_length.to_f * ENTROPY_SCALE).to_i if entropy > SiteSetting.min_post_length
     end
diff --git a/lib/theme_settings_manager.rb b/lib/theme_settings_manager.rb
new file mode 100644
index 00000000000..537b2c7de11
--- /dev/null
+++ b/lib/theme_settings_manager.rb
@@ -0,0 +1,157 @@
+class ThemeSettingsManager
+  attr_reader :name, :theme, :default
+
+  def self.types
+    ThemeSetting.types
+  end
+
+  def self.create(name, default, type, theme, opts = {})
+    type_name = self.types.invert[type].downcase.capitalize
+    klass = "ThemeSettingsManager::#{type_name}".constantize
+    klass.new(name, default, theme, opts)
+  end
+
+  def initialize(name, default, theme, opts = {})
+    @name = name.to_sym
+    @default = default
+    @theme = theme
+    @opts = opts
+    @types = self.class.types
+  end
+
+  def value
+    has_record? ? db_record.value : @default
+  end
+
+  def type_name
+    self.class.name.demodulize.downcase.to_sym
+  end
+
+  def type
+    @types[type_name]
+  end
+
+  def description
+    @opts[:description]
+  end
+
+  def value=(new_value)
+    ensure_is_valid_value!(new_value)
+
+    record = has_record? ? db_record : create_record!
+    record.value = new_value.to_s
+    record.save!
+    record.value
+  end
+
+  def db_record
+    ThemeSetting.where(name: @name, data_type: type, theme: @theme).first
+  end
+
+  def has_record?
+    db_record.present?
+  end
+
+  def create_record!
+    record = ThemeSetting.new(name: @name, data_type: type, theme: @theme)
+    record.save!
+    record
+  end
+
+  def is_valid_value?(new_value)
+    true
+  end
+
+  def invalid_value_error_message
+    name = type == @types[:integer] || type == @types[:float] ? "number" : type_name
+    primary_key = "themes.settings_errors.#{name}_value_not_valid"
+
+    secondary_key = primary_key
+    secondary_key += "_min" if has_min?
+    secondary_key += "_max" if has_max?
+
+    translation = I18n.t(primary_key)
+    return translation if secondary_key == primary_key
+
+    translation += " #{I18n.t(secondary_key, min: @opts[:min], max: @opts[:max])}"
+    translation
+  end
+
+  def ensure_is_valid_value!(new_value)
+    unless is_valid_value?(new_value)
+      raise Discourse::InvalidParameters.new invalid_value_error_message
+    end
+  end
+
+  def has_min?
+    min = @opts[:min]
+    (min.is_a?(::Integer) || min.is_a?(::Float)) && min != -::Float::INFINITY
+  end
+
+  def has_max?
+    max = @opts[:max]
+    (max.is_a?(::Integer) || max.is_a?(::Float)) && max != ::Float::INFINITY
+  end
+
+  class List    < self; end
+  class String  < self
+    def is_valid_value?(new_value)
+      (@opts[:min]..@opts[:max]).include? new_value.to_s.length
+    end
+  end
+
+  class Bool < self
+    def value
+      [true, "true"].include?(super)
+    end
+
+    def value=(new_value)
+      new_value = ([true, "true"].include?(new_value)).to_s
+      super(new_value)
+    end
+  end
+
+  class Integer < self
+    def value
+      super.to_i
+    end
+
+    def value=(new_value)
+      super(new_value.to_i)
+    end
+
+    def is_valid_value?(new_value)
+      (@opts[:min]..@opts[:max]).include? new_value.to_i
+    end
+  end
+
+  class Float < self
+    def value
+      super.to_f
+    end
+
+    def value=(new_value)
+      super(new_value.to_f)
+    end
+
+    def is_valid_value?(new_value)
+      (@opts[:min]..@opts[:max]).include? new_value.to_f
+    end
+  end
+
+  class Enum < self
+    def value
+      val = super
+      match = choices.find { |choice| choice == val || choice.to_s == val }
+      match || val
+    end
+
+    def is_valid_value?(new_value)
+      choices.include?(new_value) || choices.map(&:to_s).include?(new_value)
+    end
+
+    def choices
+      @opts[:choices]
+    end
+  end
+end
diff --git a/lib/theme_settings_parser.rb b/lib/theme_settings_parser.rb
new file mode 100644
index 00000000000..475d24a948e
--- /dev/null
+++ b/lib/theme_settings_parser.rb
@@ -0,0 +1,66 @@
+class ThemeSettingsParser
+  class InvalidYaml < StandardError; end
+
+  def initialize(setting_field)
+    @setting_field = setting_field
+    @types = ThemeSetting.types
+  end
+
+  def extract_description(desc)
+    return desc if desc.is_a?(String)
+
+    if desc.is_a?(Hash)
+      default_locale = SiteSetting.default_locale.to_sym
+      fallback_locale = desc.keys.find { |key| I18n.locale_available?(key) }
+      locale = desc[I18n.locale] || desc[default_locale] || desc[:en] || desc[fallback_locale]
+
+      locale if locale.is_a?(String)
+    end
+  end
+
+  def create_opts(default, type, raw_opts = {})
+    opts = {}
+    opts[:description] = extract_description(raw_opts[:description])
+
+    if type == @types[:enum]
+      choices = raw_opts[:choices]
+      choices = [] unless choices.is_a?(Array)
+      choices << default unless choices.include?(default)
+      opts[:choices] = choices
+    end
+
+    if [@types[:integer], @types[:string], @types[:float]].include?(type)
+      opts[:max] = raw_opts[:max].is_a?(Numeric) ? raw_opts[:max] : Float::INFINITY
+      opts[:min] = raw_opts[:min].is_a?(Numeric) ? raw_opts[:min] : -Float::INFINITY
+    end
+    opts
+  end
+
+  def load
+    return if @setting_field.value.blank?
+
+    begin
+      parsed = YAML.safe_load(@setting_field.value)
+    rescue Psych::SyntaxError, Psych::DisallowedClass => e
+      raise InvalidYaml.new(e.message)
+    end
+    raise InvalidYaml.new(I18n.t("themes.settings_errors.invalid_yaml")) unless parsed.is_a?(Hash)
+
+    parsed.deep_symbolize_keys!
+
+    parsed.each_pair do |setting, value|
+      if (type = ThemeSetting.guess_type(value)).present?
+        result = [setting, value, type, create_opts(value, type)]
+      elsif (hash = value).is_a?(Hash)
+        default = hash[:default]
+        type = hash.key?(:type) ? @types[hash[:type]&.to_sym] : ThemeSetting.guess_type(default)
+
+        result = [setting, default, type, create_opts(default, type, hash)]
+      else
+        result = [setting, value, nil, {}]
+      end
+
+      yield(*result)
+    end
+  end
+end
diff --git a/lib/git_importer.rb b/lib/theme_store/git_importer.rb
similarity index 64%
rename from lib/git_importer.rb
rename to lib/theme_store/git_importer.rb
index c54ec2cd02c..761aebbf3f8 100644
--- a/lib/git_importer.rb
+++ b/lib/theme_store/git_importer.rb
@@ -1,17 +1,24 @@
-class GitImporter
+module ThemeStore; end
+
+class ThemeStore::GitImporter
 
   attr_reader :url
 
-  def initialize(url)
+  def initialize(url, private_key: nil)
     @url = url
     if @url.start_with?("https://github.com") && !@url.end_with?(".git")
       @url += ".git"
     end
     @temp_folder = "#{Pathname.new(Dir.tmpdir).realpath}/discourse_theme_#{SecureRandom.hex}"
+    @private_key = private_key
   end
 
   def import!
-    Discourse::Utils.execute_command("git", "clone", @url, @temp_folder)
+    if @private_key
+      import_private!
+    else
+      import_public!
+    end
   end
 
   def commits_since(hash)
@@ -55,4 +62,26 @@ class GitImporter
     File.read(fullpath)
   end
 
+  protected
+
+  def import_public!
+    Discourse::Utils.execute_command("git", "clone", @url, @temp_folder)
+  end
+
+  def import_private!
+    ssh_folder = "#{Pathname.new(Dir.tmpdir).realpath}/discourse_theme_ssh_#{SecureRandom.hex}"
+    FileUtils.mkdir_p ssh_folder
+
+    Dir.chdir(ssh_folder) do
+      File.write('id_rsa', @private_key.strip)
+      FileUtils.chmod(0600, 'id_rsa')
+    end
+
+    Discourse::Utils.execute_command({
+      'GIT_SSH_COMMAND' => "ssh -i #{ssh_folder}/id_rsa -o StrictHostKeyChecking=no"
+    }, "git", "clone", @url, @temp_folder)
+  ensure
+    FileUtils.rm_rf ssh_folder
+  end
+
 end
diff --git a/lib/theme_store/tgz_importer.rb b/lib/theme_store/tgz_importer.rb
new file mode 100644
index 00000000000..1c651744b9c
--- /dev/null
+++ b/lib/theme_store/tgz_importer.rb
@@ -0,0 +1,47 @@
+module ThemeStore; end
+
+class ThemeStore::TgzImporter
+
+  attr_reader :url
+
+  def initialize(filename)
+    @temp_folder = "#{Pathname.new(Dir.tmpdir).realpath}/discourse_theme_#{SecureRandom.hex}"
+    @filename = filename
+  end
+
+  def import!
+    FileUtils.mkdir(@temp_folder)
+    Dir.chdir(@temp_folder) do
+      Discourse::Utils.execute_command("tar", "-xzvf", @filename, "--strip", "1")
+    end
+  end
+
+  def cleanup!
+    FileUtils.rm_rf(@temp_folder)
+  end
+
+  def version
+    ""
+  end
+
+  def real_path(relative)
+    fullpath = "#{@temp_folder}/#{relative}"
+    return nil unless File.exist?(fullpath)
+
+    # careful to handle symlinks here, don't want to expose random data
+    fullpath = Pathname.new(fullpath).realpath.to_s
+
+    if fullpath && fullpath.start_with?(@temp_folder)
+      fullpath
+    else
+      nil
+    end
+  end
+
+  def [](value)
+    fullpath = real_path(value)
+    return nil unless fullpath
+    File.read(fullpath)
+  end
+
+end
diff --git a/lib/topic_creator.rb b/lib/topic_creator.rb
index 69ca76d73cd..6394156fcb9 100644
--- a/lib/topic_creator.rb
+++ b/lib/topic_creator.rb
@@ -24,11 +24,6 @@ class TopicCreator
     # this allows us to add errors
     valid = topic.valid?
 
-    # not sure where this should go
-    if !@guardian.is_staff? && staff_only = DiscourseTagging.staff_only_tags(@opts[:tags])
-      topic.errors[:base] << I18n.t("tags.staff_tag_disallowed", tag: staff_only.join(" "))
-    end
-
     DiscourseEvent.trigger(:after_validate_topic, topic, self)
     valid &&= topic.errors.empty?
 
@@ -48,12 +43,18 @@ class TopicCreator
     save_topic(topic)
     create_warning(topic)
     watch_topic(topic)
+    create_shared_draft(topic)
 
     topic
   end
 
   private
 
+  def create_shared_draft(topic)
+    return unless @opts[:shared_draft] && @opts[:category].present?
+    SharedDraft.create(topic_id: topic.id, category_id: @opts[:category])
+  end
+
   def create_warning(topic)
     return unless @opts[:is_warning]
 
@@ -138,6 +139,10 @@ class TopicCreator
     # PM can't have a category
     @opts.delete(:category) if @opts[:archetype].present? && @opts[:archetype] == Archetype.private_message
 
+    if @opts[:shared_draft]
+      return Category.find(SiteSetting.shared_drafts_category)
+    end
+
     # Temporary fix to allow older clients to create topics.
     # When all clients are updated the category variable should
     # be set directly to the contents of the if statement.
@@ -149,7 +154,19 @@ class TopicCreator
   end
 
   def setup_tags(topic)
-    DiscourseTagging.tag_topic_by_names(topic, @guardian, @opts[:tags])
+    if @opts[:tags].blank?
+      unless @guardian.is_staff? || !guardian.can_tag?(topic)
+        # Validate minimum required tags for a category
+        category = find_category
+        if category.present? && category.minimum_required_tags > 0
+          topic.errors[:base] << I18n.t("tags.minimum_required_tags", count: category.minimum_required_tags)
+          rollback_from_errors!(topic)
+        end
+      end
+    else
+      valid_tags = DiscourseTagging.tag_topic_by_names(topic, @guardian, @opts[:tags])
+      rollback_from_errors!(topic) unless valid_tags
+    end
   end
 
   def setup_auto_close_time(topic)
diff --git a/lib/topic_publisher.rb b/lib/topic_publisher.rb
new file mode 100644
index 00000000000..a7cecb7e4fc
--- /dev/null
+++ b/lib/topic_publisher.rb
@@ -0,0 +1,46 @@
+class TopicPublisher
+
+  def initialize(topic, published_by, category_id)
+    @topic = topic
+    @published_by = published_by
+    @category_id = category_id
+  end
+
+  def publish!
+    published_at = Time.zone.now
+    TopicTimestampChanger.new(timestamp: published_at, topic: @topic).change! do
+      if @topic.private_message?
+        @topic = TopicConverter.new(@topic, @published_by)
+          .convert_to_public_topic(@category_id)
+      else
+        @topic.change_category_to_id(@category_id)
+      end
+
+      @topic.update_columns(visible: true)
+
+      StaffActionLogger.new(@published_by).log_topic_published(@topic)
+
+      # Clean up any publishing artifacts
+      SharedDraft.where(topic: @topic).delete_all
+      TopicTimer.where(topic: @topic).update_all(
+        deleted_at: DateTime.now,
+        deleted_by_id: @published_by.id
+      )
+
+      op = @topic.first_post
+      if op.present?
+        op.revisions.delete_all
+        op.update_columns(
+          version: 1,
+          public_version: 1,
+          last_version_at: published_at
+        )
+      end
+    end
+
+    MessageBus.publish("/topic/#{@topic.id}", reload_topic: true, refresh_stream: true)
+
+    @topic
+  end
+
+end
diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index 14aaaa8bbc7..563eedf67a0 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -43,7 +43,9 @@ class TopicQuery
          page
          per_page
          visible
-         no_definitions)
+         guardian
+         no_definitions
+         destination_category_id)
   end
 
   # Maps `order` to a columns in `topics`
@@ -90,7 +92,7 @@ class TopicQuery
     options.assert_valid_keys(TopicQuery.valid_options)
     @options = options.dup
     @user = user
-    @guardian = Guardian.new(@user)
+    @guardian = options[:guardian] || Guardian.new(@user)
   end
 
   def joined_topic_user(list = nil)
@@ -99,7 +101,11 @@ class TopicQuery
 
   # Return a list of suggested topics for a topic
   def list_suggested_for(topic)
-    return if topic.private_message? && !@user
+
+    # Don't suggest messages unless we have a user, and private messages are
+    # enabled.
+    return if topic.private_message? &&
+      (@user.blank? || !SiteSetting.enable_personal_messages?)
 
     builder = SuggestedTopicsBuilder.new(topic)
 
@@ -215,6 +221,16 @@ class TopicQuery
       .where('um.user_id IS NULL')
   end
 
+  def list_group_topics(group)
+    list = default_results.where("
+      topics.user_id IN (
+        SELECT user_id FROM group_users gu WHERE gu.group_id = #{group.id.to_i}
+      )
+    ")
+
+    create_list(:group_topics, {}, list)
+  end
+
   def list_private_messages(user)
     list = private_messages_for(user, :user)
 
@@ -264,10 +280,17 @@ class TopicQuery
     create_list(:private_messages, {}, list)
   end
 
+  def list_private_messages_tag(user)
+    list = private_messages_for(user, :all)
+    list = list.joins("JOIN topic_tags tt ON tt.topic_id = topics.id
+                      JOIN tags t ON t.id = tt.tag_id AND t.name = '#{@options[:tags][0]}'")
+    create_list(:private_messages, {}, list)
+  end
+
   def list_category_topic_ids(category)
     query = default_results(category: category.id)
-    pinned_ids = query.where('pinned_at IS NOT NULL AND category_id = ?', category.id).limit(nil).order('pinned_at DESC').pluck(:id)
-    non_pinned_ids = query.where('pinned_at IS NULL OR category_id <> ?', category.id).pluck(:id)
+    pinned_ids = query.where('topics.pinned_at IS NOT NULL AND topics.category_id = ?', category.id).limit(nil).order('pinned_at DESC').pluck(:id)
+    non_pinned_ids = query.where('topics.pinned_at IS NULL OR topics.category_id <> ?', category.id).pluck(:id)
     (pinned_ids + non_pinned_ids)
   end
 
@@ -412,11 +435,21 @@ class TopicQuery
 
       if type == :group
         result = result.includes(:allowed_users)
-        result = result.where("topics.id IN (SELECT topic_id FROM topic_allowed_groups
-                                              WHERE group_id IN (
-                                                  SELECT group_id FROM group_users WHERE user_id = #{user.id.to_i}) AND
-                                                         group_id IN (SELECT id FROM groups WHERE name ilike ?)
-                                             )", @options[:group_name])
+        result = result.where("
+          topics.id IN (
+            SELECT topic_id FROM topic_allowed_groups
+            WHERE (
+              group_id IN (
+                SELECT group_id
+                FROM group_users
+                WHERE user_id = #{user.id.to_i}
+                OR #{user.staff?}
+              )
+            )
+            AND group_id IN (SELECT id FROM groups WHERE name ilike ?)
+          )",
+          @options[:group_name]
+        )
       elsif type == :user
         result = result.includes(:allowed_users)
         result = result.where("topics.id IN (SELECT topic_id FROM topic_allowed_users WHERE user_id = #{user.id.to_i})")
@@ -448,6 +481,25 @@ class TopicQuery
       result
     end
 
+    def apply_shared_drafts(result, category_id, options)
+      drafts_category_id = SiteSetting.shared_drafts_category.to_i
+      viewing_shared = category_id && category_id == drafts_category_id
+
+      if guardian.can_create_shared_draft?
+        if options[:destination_category_id]
+          destination_category_id = get_category_id(options[:destination_category_id])
+          topic_ids = SharedDraft.where(category_id: destination_category_id).pluck(:topic_id)
+          return result.where(id: topic_ids)
+        elsif viewing_shared
+          result = result.includes(:shared_draft).references(:shared_draft)
+        else
+          return result.where('topics.category_id != ?', drafts_category_id)
+        end
+      end
+
+      result
+    end
+
     def apply_ordering(result, options)
       sort_column = SORTABLE_MAPPING[options[:order]] || 'default'
       sort_dir = (options[:ascending] == "true") ? "ASC" : "DESC"
@@ -511,7 +563,17 @@ class TopicQuery
         if options[:no_subcategories]
           result = result.where('categories.id = ?', category_id)
         else
-          result = result.where('categories.id = :category_id OR (categories.parent_category_id = :category_id AND categories.topic_id <> topics.id)', category_id: category_id)
+          sql = <<~SQL
+            categories.id IN (
+              SELECT c2.id FROM categories c2 WHERE c2.parent_category_id = :category_id
+              UNION ALL
+              SELECT :category_id
+            ) AND
+            topics.id NOT IN (
+              SELECT c3.topic_id FROM categories c3 WHERE c3.parent_category_id = :category_id
+            )
+          SQL
+          result = result.where(sql, category_id: category_id)
         end
         result = result.references(:categories)
 
@@ -563,6 +625,7 @@ class TopicQuery
 
       result = apply_ordering(result, options)
       result = result.listable_topics.includes(:category)
+      result = apply_shared_drafts(result, category_id, options)
 
       if options[:exclude_category_ids] && options[:exclude_category_ids].is_a?(Array) && options[:exclude_category_ids].size > 0
         result = result.where("categories.id NOT IN (?)", options[:exclude_category_ids]).references(:categories)
@@ -587,7 +650,7 @@ class TopicQuery
       end
 
       if search = options[:search]
-        result = result.where("topics.id in (select pp.topic_id from post_search_data pd join posts pp on pp.id = pd.post_id where pd.search_data @@ #{Search.ts_query(search.to_s)})")
+        result = result.where("topics.id in (select pp.topic_id from post_search_data pd join posts pp on pp.id = pd.post_id where pd.search_data @@ #{Search.ts_query(term: search.to_s)})")
       end
 
       # NOTE protect against SYM attack can be removed with Ruby 2.2
@@ -820,7 +883,12 @@ class TopicQuery
 
     def random_suggested(topic, count, excluded_topic_ids = [])
       result = default_results(unordered: true, per_page: count).where(closed: false, archived: false)
-      excluded_topic_ids += Category.topic_ids.to_a
+
+      if SiteSetting.limit_suggested_to_category
+        excluded_topic_ids += Category.where(id: topic.category_id).pluck(:id)
+      else
+        excluded_topic_ids += Category.topic_ids.to_a
+      end
       result = result.where("topics.id NOT IN (?)", excluded_topic_ids) unless excluded_topic_ids.empty?
 
       result = remove_muted_categories(result, @user)
@@ -837,7 +905,8 @@ class TopicQuery
       #
       # we over select in case cache is stale
       max = (count * 1.3).to_i
-      ids = RandomTopicSelector.next(max) + RandomTopicSelector.next(max, topic.category)
+      ids = SiteSetting.limit_suggested_to_category ? [] : RandomTopicSelector.next(max)
+      ids.concat(RandomTopicSelector.next(max, topic.category))
 
       result.where(id: ids.uniq)
     end
diff --git a/lib/topic_view.rb b/lib/topic_view.rb
index 1ad15dc8798..d2bf87de10b 100644
--- a/lib/topic_view.rb
+++ b/lib/topic_view.rb
@@ -6,7 +6,7 @@ require_dependency 'gaps'
 class TopicView
 
   attr_reader :topic, :posts, :guardian, :filtered_posts, :chunk_size, :print, :message_bus_last_id
-  attr_accessor :draft, :draft_key, :draft_sequence, :user_custom_fields, :post_custom_fields
+  attr_accessor :draft, :draft_key, :draft_sequence, :user_custom_fields, :post_custom_fields, :post_number
 
   def self.slow_chunk_size
     10
@@ -37,19 +37,23 @@ class TopicView
     wpcf.flatten.uniq
   end
 
-  def initialize(topic_id, user = nil, options = {})
-    @message_bus_last_id = MessageBus.last_id("/topic/#{topic_id}")
+  def initialize(topic_or_topic_id, user = nil, options = {})
+    @topic = find_topic(topic_or_topic_id)
     @user = user
     @guardian = Guardian.new(@user)
-    @topic = find_topic(topic_id)
-    @print = options[:print].present?
+
     check_and_raise_exceptions
 
+    @message_bus_last_id = MessageBus.last_id("/topic/#{@topic.id}")
+    @print = options[:print].present?
+
     options.each do |key, value|
       self.instance_variable_set("@#{key}".to_sym, value)
     end
 
-    @page = 1 if (!@page || @page.zero?)
+    @post_number = [@post_number.to_i, 1].max
+    @page = [@page.to_i, 1].max
+
     @chunk_size =
       case
       when options[:slow_platform] then TopicView.slow_chunk_size
@@ -82,13 +86,12 @@ class TopicView
 
   def canonical_path
     path = relative_url
-
     path <<
-      if @post_number
-        page = ((@post_number.to_i - 1) / @limit) + 1
-        (page > 1) ? "?page=#{page}" : ""
+      if @page > 1
+        "?page=#{@page}"
       else
-        (@page && @page.to_i > 1) ? "?page=#{@page}" : ""
+        page = ((@post_number - 1) / @limit) + 1
+        page > 1 ? "?page=#{page}" : ""
       end
 
     path
@@ -109,11 +112,7 @@ class TopicView
   end
 
   def prev_page
-    if @page && @page > 1 && posts.length > 0
-      @page - 1
-    else
-      nil
-    end
+    @page > 1 && posts.size > 0 ? @page - 1 : nil
   end
 
   def next_page
@@ -164,7 +163,7 @@ class TopicView
     return @desired_post if @desired_post.present?
     return nil if posts.blank?
 
-    @desired_post = posts.detect { |p| p.post_number == @post_number.to_i }
+    @desired_post = posts.detect { |p| p.post_number == @post_number }
     @desired_post ||= posts.first
     @desired_post
   end
@@ -177,17 +176,17 @@ class TopicView
   end
 
   def read_time
-    return nil if @post_number.present? && @post_number.to_i != 1 # only show for topic URLs
+    return nil if @post_number > 1 # only show for topic URLs
     (@topic.word_count / SiteSetting.read_time_word_count).floor if @topic.word_count
   end
 
   def like_count
-    return nil if @post_number.present? && @post_number.to_i != 1 # only show for topic URLs
+    return nil if @post_number > 1 # only show for topic URLs
     @topic.like_count
   end
 
   def image_url
-    if @post_number.present? && @post_number.to_i != 1 && @desired_post.present?
+    if @post_number > 1 && @desired_post.present?
       if @desired_post.image_url.present?
         @desired_post.image_url
       elsif @desired_post.user
@@ -437,10 +436,14 @@ class TopicView
     @posts
   end
 
-  def find_topic(topic_id)
-    # with_deleted covered in #check_and_raise_exceptions
-    finder = Topic.with_deleted.where(id: topic_id).includes(:category)
-    finder.first
+  def find_topic(topic_or_topic_id)
+    if topic_or_topic_id.is_a?(Topic)
+      topic_or_topic_id
+    else
+      # with_deleted covered in #check_and_raise_exceptions
+      finder = Topic.with_deleted.where(id: topic_or_topic_id).includes(:category)
+      finder.first
+    end
   end
 
   def unfiltered_posts
@@ -492,7 +495,14 @@ class TopicView
     if @topic.present? && @topic.private_message? && @user.blank?
       raise Discourse::NotLoggedIn.new
     end
+    # can user see this topic?
     raise Discourse::InvalidAccess.new("can't see #{@topic}", @topic) unless @guardian.can_see?(@topic)
+    # log personal message views
+    if SiteSetting.log_personal_messages_views && @topic.present? && @topic.private_message? && @topic.all_allowed_users.where(id: @user.id).blank?
+      unless UserHistory.where(acting_user_id: @user.id, action: UserHistory.actions[:check_personal_message], topic_id: @topic.id).where("created_at > ?", 1.hour.ago).exists?
+        StaffActionLogger.new(@user).log_check_personal_message(@topic)
+      end
+    end
   end
 
   def get_minmax_ids(post_number)
diff --git a/lib/topics_bulk_action.rb b/lib/topics_bulk_action.rb
index a3675ff4265..2d16fb5c219 100644
--- a/lib/topics_bulk_action.rb
+++ b/lib/topics_bulk_action.rb
@@ -43,9 +43,9 @@ class TopicsBulkAction
       topics.each do |t|
         if guardian.can_see?(t) && t.private_message?
           if group
-            GroupArchivedMessage.move_to_inbox!(group.id, t.id)
+            GroupArchivedMessage.move_to_inbox!(group.id, t)
           else
-            UserArchivedMessage.move_to_inbox!(@user.id, t.id)
+            UserArchivedMessage.move_to_inbox!(@user.id, t)
           end
         end
       end
@@ -56,9 +56,9 @@ class TopicsBulkAction
       topics.each do |t|
         if guardian.can_see?(t) && t.private_message?
           if group
-            GroupArchivedMessage.archive!(group.id, t.id)
+            GroupArchivedMessage.archive!(group.id, t)
           else
-            UserArchivedMessage.archive!(@user.id, t.id)
+            UserArchivedMessage.archive!(@user.id, t)
           end
         end
       end
diff --git a/lib/twitter_api.rb b/lib/twitter_api.rb
index da281fe05fe..96c3e96bae0 100644
--- a/lib/twitter_api.rb
+++ b/lib/twitter_api.rb
@@ -16,20 +16,17 @@ class TwitterApi
       result = Rinku.auto_link(text, :all, 'target="_blank"').to_s
 
       if tweet['extended_entities'] && media = tweet['extended_entities']['media']
-        result << "<div class='tweet-images'>"
         media.each do |m|
           if m['type'] == 'photo'
             if large = m['sizes']['large']
-              result << "<img class='tweet-image' src='#{m['media_url_https']}' width='#{large['w']}' height='#{large['h']}'>"
+              result << "<div class='tweet-images'><img class='tweet-image' src='#{m['media_url_https']}' width='#{large['w']}' height='#{large['h']}'></div>"
             end
           elsif m['type'] == 'video'
             if large = m['sizes']['large']
-              result << "<iframe class='tweet-video' src='https://twitter.com/i/videos/#{tweet['id_str']}' width='#{large['w']}' height='#{large['h']}' frameborder='0'></iframe>"
+              result << "<div class='tweet-images'><iframe class='tweet-video' src='https://twitter.com/i/videos/#{tweet['id_str']}' width='#{large['w']}' height='#{large['h']}' frameborder='0'></iframe></div>"
             end
           end
         end
-        result << "</div>"
-
       end
 
       result
@@ -57,27 +54,27 @@ class TwitterApi
 
     def link_handles_in(text)
       text.scan(/(?:^|\s)@(\w+)/).flatten.uniq.each do |handle|
-        text.gsub!("@#{handle}", [
-          "<a href='https://twitter.com/#{handle}' target='_blank'>",
+        text.gsub!(/(?:^|\s)@#{handle}/, [
+          " <a href='https://twitter.com/#{handle}' target='_blank'>",
             "@#{handle}",
           "</a>"
         ].join)
       end
 
-      text
+      text.strip
     end
 
     def link_hashtags_in(text)
       text.scan(/(?:^|\s)#(\w+)/).flatten.uniq.each do |hashtag|
-        text.gsub!("##{hashtag}", [
-          "<a href='https://twitter.com/search?q=%23#{hashtag}' ",
+        text.gsub!(/(?:^|\s)##{hashtag}/, [
+          " <a href='https://twitter.com/search?q=%23#{hashtag}' ",
           "target='_blank'>",
             "##{hashtag}",
           "</a>"
         ].join)
       end
 
-      text
+      text.strip
     end
 
     def user_timeline_uri_for(screen_name)
diff --git a/lib/upload_creator.rb b/lib/upload_creator.rb
index 1478477fdab..e87ddf14eeb 100644
--- a/lib/upload_creator.rb
+++ b/lib/upload_creator.rb
@@ -20,6 +20,7 @@ class UploadCreator
   #  - for_theme (boolean)
   #  - for_private_message (boolean)
   #  - pasted (boolean)
+  #  - for_export (boolean)
   def initialize(file, filename, opts = {})
     @file = file
     @filename = filename || ''
@@ -84,6 +85,7 @@ class UploadCreator
       @upload.for_private_message = true if @opts[:for_private_message]
       @upload.for_group_message   = true if @opts[:for_group_message]
       @upload.for_theme           = true if @opts[:for_theme]
+      @upload.for_export          = true if @opts[:for_export]
 
       return @upload unless @upload.save
 
@@ -105,7 +107,7 @@ class UploadCreator
       @upload
     end
   ensure
-    @file.close! rescue nil
+    @file&.close
   end
 
   def extract_image_info!
@@ -149,7 +151,7 @@ class UploadCreator
       @opts[:content_type] = "image/jpeg"
       extract_image_info!
     else
-      jpeg_tempfile.close! rescue nil
+      jpeg_tempfile&.close
     end
   end
 
diff --git a/lib/validators/censored_words_validator.rb b/lib/validators/censored_words_validator.rb
index 2fa5f0e0c0f..96749c845cd 100644
--- a/lib/validators/censored_words_validator.rb
+++ b/lib/validators/censored_words_validator.rb
@@ -5,11 +5,6 @@ class CensoredWordsValidator < ActiveModel::EachValidator
         attribute, :contains_censored_words,
         censored_words: join_censored_words(censored_words)
       )
-    elsif SiteSetting.censored_pattern.present? && (censored_words = censor_words(value, /#{SiteSetting.censored_pattern}/i)).present?
-      record.errors.add(
-        attribute, :matches_censored_pattern,
-        censored_words: join_censored_words(censored_words)
-      )
     end
   end
 
diff --git a/lib/validators/enable_local_logins_via_email_validator.rb b/lib/validators/enable_local_logins_via_email_validator.rb
new file mode 100644
index 00000000000..0537f3697e7
--- /dev/null
+++ b/lib/validators/enable_local_logins_via_email_validator.rb
@@ -0,0 +1,14 @@
+class EnableLocalLoginsViaEmailValidator
+  def initialize(opts = {})
+    @opts = opts
+  end
+
+  def valid_value?(val)
+    return true if val == 'f'
+    SiteSetting.enable_local_logins
+  end
+
+  def error_message
+    I18n.t('site_settings.errors.enable_local_logins_disabled')
+  end
+end
diff --git a/lib/validators/max_emojis_validator.rb b/lib/validators/max_emojis_validator.rb
new file mode 100644
index 00000000000..3476cd9c011
--- /dev/null
+++ b/lib/validators/max_emojis_validator.rb
@@ -0,0 +1,11 @@
+class MaxEmojisValidator < ActiveModel::EachValidator
+
+  def validate_each(record, attribute, value)
+    if Emoji.unicode_unescape(value).scan(/:([\w\-+]+(?::t\d)?):/).size > SiteSetting.max_emojis_in_title
+      record.errors.add(
+        attribute, :max_emojis,
+        max_emojis_count: SiteSetting.max_emojis_in_title
+      )
+    end
+  end
+end
diff --git a/lib/validators/post_validator.rb b/lib/validators/post_validator.rb
index a9b1f468c45..f0b7b54a014 100644
--- a/lib/validators/post_validator.rb
+++ b/lib/validators/post_validator.rb
@@ -15,7 +15,7 @@ class Validators::PostValidator < ActiveModel::Validator
     max_mention_validator(record)
     max_images_validator(record)
     max_attachments_validator(record)
-    max_links_validator(record)
+    can_post_links_validator(record)
     unique_post_validator(record)
   end
 
@@ -57,8 +57,8 @@ class Validators::PostValidator < ActiveModel::Validator
   end
 
   def watched_words(post)
-    if !post.acting_user&.staff? && !post.acting_user&.staged && WordWatcher.new(post.raw).should_block?
-      post.errors[:base] << I18n.t('contains_blocked_words')
+    if !post.acting_user&.staff? && !post.acting_user&.staged && matches = WordWatcher.new(post.raw).should_block?
+      post.errors[:base] << I18n.t('contains_blocked_words', word: matches[0])
     end
   end
 
@@ -81,8 +81,25 @@ class Validators::PostValidator < ActiveModel::Validator
 
   # Ensure new users can not put too many images in a post
   def max_images_validator(post)
-    return if acting_user_is_trusted?(post) || private_message?(post)
-    add_error_if_count_exceeded(post, :no_images_allowed, :too_many_images, post.image_count, SiteSetting.newuser_max_images)
+    return if post.acting_user.blank? || post.acting_user&.staff?
+
+    if post.acting_user.trust_level < TrustLevel[SiteSetting.min_trust_to_post_images]
+      add_error_if_count_exceeded(
+        post,
+        :no_images_allowed_trust,
+        :no_images_allowed_trust,
+        post.image_count,
+        0
+      )
+    elsif post.acting_user.trust_level == TrustLevel[0]
+      add_error_if_count_exceeded(
+        post,
+        :no_images_allowed,
+        :too_many_images,
+        post.image_count,
+        SiteSetting.newuser_max_images
+      )
+    end
   end
 
   # Ensure new users can not put too many attachments in a post
@@ -91,8 +108,19 @@ class Validators::PostValidator < ActiveModel::Validator
     add_error_if_count_exceeded(post, :no_attachments_allowed, :too_many_attachments, post.attachment_count, SiteSetting.newuser_max_attachments)
   end
 
+  def can_post_links_validator(post)
+    if (post.link_count == 0 && !post.has_oneboxes?) ||
+      Guardian.new(post.acting_user).can_post_link? ||
+      private_message?(post)
+
+      return newuser_links_validator(post)
+    end
+
+    post.errors.add(:base, I18n.t(:links_require_trust))
+  end
+
   # Ensure new users can not put too many links in a post
-  def max_links_validator(post)
+  def newuser_links_validator(post)
     return if acting_user_is_trusted?(post) || private_message?(post)
     add_error_if_count_exceeded(post, :no_links_allowed, :too_many_links, post.link_count, SiteSetting.newuser_max_links)
   end
@@ -113,8 +141,8 @@ class Validators::PostValidator < ActiveModel::Validator
 
   private
 
-  def acting_user_is_trusted?(post)
-    post.acting_user.present? && post.acting_user.has_trust_level?(TrustLevel[1])
+  def acting_user_is_trusted?(post, level = 1)
+    post.acting_user.present? && post.acting_user.has_trust_level?(TrustLevel[level])
   end
 
   def private_message?(post)
diff --git a/lib/validators/regex_presence_validator.rb b/lib/validators/regex_presence_validator.rb
new file mode 100644
index 00000000000..fcdeb4ddadc
--- /dev/null
+++ b/lib/validators/regex_presence_validator.rb
@@ -0,0 +1,16 @@
+class RegexPresenceValidator
+  include RegexSettingValidation
+
+  def initialize(opts = {})
+    @opts = opts
+    initialize_regex_opts(opts)
+  end
+
+  def valid_value?(val)
+    val.present? && regex_match?(val)
+  end
+
+  def error_message
+    I18n.t(@regex_error)
+  end
+end
diff --git a/lib/validators/reply_by_email_address_validator.rb b/lib/validators/reply_by_email_address_validator.rb
index 3c3b5698f89..a9110e0f850 100644
--- a/lib/validators/reply_by_email_address_validator.rb
+++ b/lib/validators/reply_by_email_address_validator.rb
@@ -4,11 +4,19 @@ class ReplyByEmailAddressValidator
   end
 
   def valid_value?(val)
-    return true if val.blank?
+    val&.strip!
 
-    !!val["@"] &&
-    !!val["%{reply_key}"] &&
-    val.gsub(/\+?%{reply_key}/, "") != SiteSetting.notification_email
+    return true  if val.blank?
+    return false if !val.include?("@")
+
+    value = val.dup
+
+    if SiteSetting.find_related_post_with_key
+      return false if !value.include?("%{reply_key}")
+      value.sub!(/\+?%{reply_key}/, "")
+    end
+
+    value != SiteSetting.notification_email && !value.include?(" ")
   end
 
   def error_message
diff --git a/lib/validators/upload_url_validator.rb b/lib/validators/upload_url_validator.rb
index da9c27d1fd9..7609314f9db 100644
--- a/lib/validators/upload_url_validator.rb
+++ b/lib/validators/upload_url_validator.rb
@@ -1,7 +1,11 @@
 class UploadUrlValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     if value.present?
-      uri = URI.parse(value) rescue nil
+      uri =
+        begin
+          URI.parse(value)
+        rescue URI::InvalidURIError
+        end
 
       unless uri && Discourse.store.has_been_uploaded?(value)
         record.errors[attribute] << (options[:message] || I18n.t('errors.messages.invalid'))
diff --git a/lib/validators/upload_validator.rb b/lib/validators/upload_validator.rb
index 6c2013565db..5b9da9793df 100644
--- a/lib/validators/upload_validator.rb
+++ b/lib/validators/upload_validator.rb
@@ -29,11 +29,11 @@ class Validators::UploadValidator < ActiveModel::Validator
   end
 
   def is_authorized?(upload, extension)
-    authorized_extensions(upload, extension, authorized_uploads(upload))
+    extension_authorized?(upload, extension, authorized_extensions(upload))
   end
 
   def authorized_image_extension(upload, extension)
-    authorized_extensions(upload, extension, authorized_images(upload))
+    extension_authorized?(upload, extension, authorized_images(upload))
   end
 
   def maximum_image_file_size(upload)
@@ -41,7 +41,7 @@ class Validators::UploadValidator < ActiveModel::Validator
   end
 
   def authorized_attachment_extension(upload, extension)
-    authorized_extensions(upload, extension, authorized_attachments(upload))
+    extension_authorized?(upload, extension, authorized_attachments(upload))
   end
 
   def maximum_attachment_file_size(upload)
@@ -50,38 +50,62 @@ class Validators::UploadValidator < ActiveModel::Validator
 
   private
 
-  def authorized_uploads(upload)
-    authorized_uploads = Set.new
+  def extensions_to_set(exts)
+    extensions = Set.new
 
-    extensions = upload.for_theme ? SiteSetting.theme_authorized_extensions : SiteSetting.authorized_extensions
-
-    extensions
+    exts
       .gsub(/[\s\.]+/, "")
       .downcase
       .split("|")
-      .each { |extension| authorized_uploads << extension unless extension.include?("*") }
+      .each { |extension| extensions << extension unless extension.include?("*") }
 
-    authorized_uploads
+    extensions
+  end
+
+  def authorized_extensions(upload)
+    extensions = if upload.for_theme
+      SiteSetting.theme_authorized_extensions
+    elsif upload.for_export
+      SiteSetting.export_authorized_extensions
+    else
+      SiteSetting.authorized_extensions
+    end
+    extensions_to_set(extensions)
   end
 
   def authorized_images(upload)
-    authorized_uploads(upload) & FileHelper.images
+    authorized_extensions(upload) & FileHelper.images
   end
 
   def authorized_attachments(upload)
-    authorized_uploads(upload) - FileHelper.images
+    authorized_extensions(upload) - FileHelper.images
   end
 
   def authorizes_all_extensions?(upload)
-    extensions = upload.for_theme ? SiteSetting.theme_authorized_extensions : SiteSetting.authorized_extensions
+    if upload.user&.staff?
+      return true if SiteSetting.authorized_extensions_for_staff.include?("*")
+    end
+    extensions = if upload.for_theme
+      SiteSetting.theme_authorized_extensions
+    elsif upload.for_export
+      SiteSetting.export_authorized_extensions
+    else
+      SiteSetting.authorized_extensions
+    end
     extensions.include?("*")
   end
 
-  def authorized_extensions(upload, extension, extensions)
+  def extension_authorized?(upload, extension, extensions)
     return true if authorizes_all_extensions?(upload)
 
+    staff_extensions = Set.new
+    if upload.user&.staff?
+      staff_extensions = extensions_to_set(SiteSetting.authorized_extensions_for_staff)
+      return true if staff_extensions.include?(extension.downcase)
+    end
+
     unless authorized = extensions.include?(extension.downcase)
-      message = I18n.t("upload.unauthorized", authorized_extensions: extensions.to_a.join(", "))
+      message = I18n.t("upload.unauthorized", authorized_extensions: (extensions | staff_extensions).to_a.join(", "))
       upload.errors.add(:original_filename, message)
     end
 
diff --git a/lib/version.rb b/lib/version.rb
index 9599b96fcef..aeed4d4aa95 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -2,10 +2,10 @@ module Discourse
   # work around reloader
   unless defined? ::Discourse::VERSION
     module VERSION #:nodoc:
-      MAJOR = 1
-      MINOR = 9
-      TINY  = 7
-      PRE   = nil
+      MAJOR = 2
+      MINOR = 0
+      TINY  = 0
+      PRE   = 'beta10'
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
     end
diff --git a/plugins/discourse-details/assets/stylesheets/details.scss b/plugins/discourse-details/assets/stylesheets/details.scss
index 2ab27809d2c..a0265d894e3 100644
--- a/plugins/discourse-details/assets/stylesheets/details.scss
+++ b/plugins/discourse-details/assets/stylesheets/details.scss
@@ -51,21 +51,24 @@ details .lazyYT-container {
 
   summary:before {
     content: '' !important;
+    display: none;
   }
 
   summary {
     @include unselectable;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    text-align: center;
     box-sizing: border-box;
     margin: 0;
     padding: 0;
     color: #aaa;
     background: #f1f1f1;
     border: 1px solid #ddd;
-    width: 20px;
-    display: flex;
-    text-align: center;
-    vertical-align: middle;
+    width: 21px;
     line-height: 12px;
+
   }
 
   summary:hover {
diff --git a/plugins/discourse-details/config/locales/client.ar.yml b/plugins/discourse-details/config/locales/client.ar.yml
new file mode 100644
index 00000000000..79ea4de8157
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.ar.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ar: {}
diff --git a/plugins/discourse-details/config/locales/client.bg.yml b/plugins/discourse-details/config/locales/client.bg.yml
new file mode 100644
index 00000000000..8e225fa6bb6
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.bg.yml
@@ -0,0 +1,14 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+bg:
+  js:
+    details:
+      title: Скрий детайлите
+    composer:
+      details_title: Сумарно
+      details_text: "Този текст ще бъде скрит."
diff --git a/plugins/discourse-details/config/locales/client.bs_BA.yml b/plugins/discourse-details/config/locales/client.bs_BA.yml
new file mode 100644
index 00000000000..7b73cd2f229
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.bs_BA.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+bs_BA: {}
diff --git a/plugins/discourse-details/config/locales/client.ca.yml b/plugins/discourse-details/config/locales/client.ca.yml
new file mode 100644
index 00000000000..dd67e55f50a
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.ca.yml
@@ -0,0 +1,14 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ca:
+  js:
+    details:
+      title: Amaga detalls
+    composer:
+      details_title: Resum
+      details_text: "Aquest text serà amagat"
diff --git a/plugins/discourse-details/config/locales/client.cs.yml b/plugins/discourse-details/config/locales/client.cs.yml
new file mode 100644
index 00000000000..84323e5eecd
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.cs.yml
@@ -0,0 +1,14 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+cs:
+  js:
+    details:
+      title: Skrýt detaily
+    composer:
+      details_title: Souhrn
+      details_text: "Tento text bude skrytý"
diff --git a/plugins/discourse-details/config/locales/client.da.yml b/plugins/discourse-details/config/locales/client.da.yml
new file mode 100644
index 00000000000..094d94481c6
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.da.yml
@@ -0,0 +1,14 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+da:
+  js:
+    details:
+      title: Skjul detaljer
+    composer:
+      details_title: Resume
+      details_text: "Denne tekst vil blive skjult"
diff --git a/plugins/discourse-details/config/locales/client.de.yml b/plugins/discourse-details/config/locales/client.de.yml
index a55b3688bb4..5d0428d8dae 100644
--- a/plugins/discourse-details/config/locales/client.de.yml
+++ b/plugins/discourse-details/config/locales/client.de.yml
@@ -1,3 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
 de:
   js:
     details:
diff --git a/plugins/discourse-details/config/locales/client.el.yml b/plugins/discourse-details/config/locales/client.el.yml
new file mode 100644
index 00000000000..63bf4b0e2fe
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.el.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+el: {}
diff --git a/plugins/discourse-details/config/locales/client.es.yml b/plugins/discourse-details/config/locales/client.es.yml
new file mode 100644
index 00000000000..584032ad829
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.es.yml
@@ -0,0 +1,14 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+es:
+  js:
+    details:
+      title: Ocultar detalles
+    composer:
+      details_title: Resumen
+      details_text: "Este texto estará oculto"
diff --git a/plugins/discourse-details/config/locales/client.et.yml b/plugins/discourse-details/config/locales/client.et.yml
new file mode 100644
index 00000000000..8c601aa1ed9
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.et.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+et: {}
diff --git a/plugins/discourse-details/config/locales/client.fa_IR.yml b/plugins/discourse-details/config/locales/client.fa_IR.yml
new file mode 100644
index 00000000000..9eb71210db9
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.fa_IR.yml
@@ -0,0 +1,14 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+fa_IR:
+  js:
+    details:
+      title: مخفی کردن جزئیات
+    composer:
+      details_title: خلاصه
+      details_text: "این متن پنهان خواهد شد"
diff --git a/plugins/discourse-details/config/locales/client.fi.yml b/plugins/discourse-details/config/locales/client.fi.yml
index 6b8672a7704..d1d1c244313 100644
--- a/plugins/discourse-details/config/locales/client.fi.yml
+++ b/plugins/discourse-details/config/locales/client.fi.yml
@@ -1,3 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
 fi:
   js:
     details:
diff --git a/plugins/discourse-details/config/locales/client.fr.yml b/plugins/discourse-details/config/locales/client.fr.yml
index 84f9494dd8e..3d9f59970aa 100644
--- a/plugins/discourse-details/config/locales/client.fr.yml
+++ b/plugins/discourse-details/config/locales/client.fr.yml
@@ -1,3 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
 fr:
   js:
     details:
diff --git a/plugins/discourse-details/config/locales/client.gl.yml b/plugins/discourse-details/config/locales/client.gl.yml
new file mode 100644
index 00000000000..695b5cf2879
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.gl.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+gl: {}
diff --git a/plugins/discourse-details/config/locales/client.he.yml b/plugins/discourse-details/config/locales/client.he.yml
new file mode 100644
index 00000000000..c0a6554785b
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.he.yml
@@ -0,0 +1,14 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+he:
+  js:
+    details:
+      title: הסתרת פרטים
+    composer:
+      details_title: תקציר
+      details_text: "טקסט זה יוסתר"
diff --git a/plugins/discourse-details/config/locales/client.id.yml b/plugins/discourse-details/config/locales/client.id.yml
new file mode 100644
index 00000000000..c14130cc200
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.id.yml
@@ -0,0 +1,14 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+id:
+  js:
+    details:
+      title: Sembunyikan Detail
+    composer:
+      details_title: Ringkasan
+      details_text: "Teks ini akan disembunyikan"
diff --git a/plugins/discourse-details/config/locales/client.it.yml b/plugins/discourse-details/config/locales/client.it.yml
index d5027e46860..08e9d38e7f6 100644
--- a/plugins/discourse-details/config/locales/client.it.yml
+++ b/plugins/discourse-details/config/locales/client.it.yml
@@ -1,7 +1,14 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
 it:
   js:
     details:
       title: Nascondi Dettagli
     composer:
-      details_title: Summary
+      details_title: Riepilogo
       details_text: "Questo testo verrà nascosto"
diff --git a/plugins/discourse-details/config/locales/client.ja.yml b/plugins/discourse-details/config/locales/client.ja.yml
new file mode 100644
index 00000000000..bd8974e7da9
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.ja.yml
@@ -0,0 +1,14 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ja:
+  js:
+    details:
+      title: 詳細を隠す
+    composer:
+      details_title: サマリー
+      details_text: "こちらの文字は表示させません。"
diff --git a/plugins/discourse-details/config/locales/client.ko.yml b/plugins/discourse-details/config/locales/client.ko.yml
new file mode 100644
index 00000000000..bf4e05d6f4f
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.ko.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ko: {}
diff --git a/plugins/discourse-details/config/locales/client.lv.yml b/plugins/discourse-details/config/locales/client.lv.yml
new file mode 100644
index 00000000000..dc48bb58eef
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.lv.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+lv: {}
diff --git a/plugins/discourse-details/config/locales/client.nb_NO.yml b/plugins/discourse-details/config/locales/client.nb_NO.yml
new file mode 100644
index 00000000000..3326b734c1d
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.nb_NO.yml
@@ -0,0 +1,14 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+nb_NO:
+  js:
+    details:
+      title: Skjul Detaljer
+    composer:
+      details_title: Sammendrag
+      details_text: "Denne teksten vil skjules"
diff --git a/plugins/discourse-details/config/locales/client.nl.yml b/plugins/discourse-details/config/locales/client.nl.yml
new file mode 100644
index 00000000000..3ed124da081
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.nl.yml
@@ -0,0 +1,14 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+nl:
+  js:
+    details:
+      title: Verberg details
+    composer:
+      details_title: Samenvatting
+      details_text: "Deze tekst zal worden verborgen"
diff --git a/plugins/discourse-details/config/locales/client.pl_PL.yml b/plugins/discourse-details/config/locales/client.pl_PL.yml
new file mode 100644
index 00000000000..c04d371e5a4
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.pl_PL.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+pl_PL: {}
diff --git a/plugins/discourse-details/config/locales/client.pt.yml b/plugins/discourse-details/config/locales/client.pt.yml
new file mode 100644
index 00000000000..a5afe74482f
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.pt.yml
@@ -0,0 +1,14 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+pt:
+  js:
+    details:
+      title: Ocultar detalhes
+    composer:
+      details_title: Resumo
+      details_text: "Este texto será ocultado"
diff --git a/plugins/discourse-details/config/locales/client.pt_BR.yml b/plugins/discourse-details/config/locales/client.pt_BR.yml
new file mode 100644
index 00000000000..bc85fd86b17
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.pt_BR.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+pt_BR: {}
diff --git a/plugins/discourse-details/config/locales/client.ro.yml b/plugins/discourse-details/config/locales/client.ro.yml
new file mode 100644
index 00000000000..6ec427828b4
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.ro.yml
@@ -0,0 +1,14 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ro:
+  js:
+    details:
+      title: Ascunde detaliile
+    composer:
+      details_title: Sumar
+      details_text: "Acest text va fi ascuns"
diff --git a/plugins/discourse-details/config/locales/client.ru.yml b/plugins/discourse-details/config/locales/client.ru.yml
new file mode 100644
index 00000000000..5c634ee3d33
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.ru.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ru: {}
diff --git a/plugins/discourse-details/config/locales/client.sk.yml b/plugins/discourse-details/config/locales/client.sk.yml
new file mode 100644
index 00000000000..bcc3a93dc5b
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.sk.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sk: {}
diff --git a/plugins/discourse-details/config/locales/client.sl.yml b/plugins/discourse-details/config/locales/client.sl.yml
new file mode 100644
index 00000000000..154d194f86c
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.sl.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sl: {}
diff --git a/plugins/discourse-details/config/locales/client.sq.yml b/plugins/discourse-details/config/locales/client.sq.yml
new file mode 100644
index 00000000000..4526be31621
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.sq.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sq: {}
diff --git a/plugins/discourse-details/config/locales/client.sr.yml b/plugins/discourse-details/config/locales/client.sr.yml
new file mode 100644
index 00000000000..7e57a61dd21
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.sr.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sr: {}
diff --git a/plugins/discourse-details/config/locales/client.sv.yml b/plugins/discourse-details/config/locales/client.sv.yml
new file mode 100644
index 00000000000..fd54901f750
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.sv.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sv: {}
diff --git a/plugins/discourse-details/config/locales/client.te.yml b/plugins/discourse-details/config/locales/client.te.yml
new file mode 100644
index 00000000000..49141baa040
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.te.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+te: {}
diff --git a/plugins/discourse-details/config/locales/client.th.yml b/plugins/discourse-details/config/locales/client.th.yml
new file mode 100644
index 00000000000..7ed98e15d8c
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.th.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+th: {}
diff --git a/plugins/discourse-details/config/locales/client.tr_TR.yml b/plugins/discourse-details/config/locales/client.tr_TR.yml
new file mode 100644
index 00000000000..871764bf8da
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.tr_TR.yml
@@ -0,0 +1,14 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+tr_TR:
+  js:
+    details:
+      title: Detayları Gizle
+    composer:
+      details_title: Özet
+      details_text: "Bu metin gizlenecek"
diff --git a/plugins/discourse-details/config/locales/client.uk.yml b/plugins/discourse-details/config/locales/client.uk.yml
new file mode 100644
index 00000000000..3acfff74e88
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.uk.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+uk: {}
diff --git a/plugins/discourse-details/config/locales/client.ur.yml b/plugins/discourse-details/config/locales/client.ur.yml
index 8051af44458..2148493258e 100644
--- a/plugins/discourse-details/config/locales/client.ur.yml
+++ b/plugins/discourse-details/config/locales/client.ur.yml
@@ -1,3 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
 ur:
   js:
     details:
diff --git a/plugins/discourse-details/config/locales/client.vi.yml b/plugins/discourse-details/config/locales/client.vi.yml
new file mode 100644
index 00000000000..f06d78580cb
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.vi.yml
@@ -0,0 +1,11 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+vi:
+  js:
+    details:
+      title: Ẩn thông tin
diff --git a/plugins/discourse-details/config/locales/client.zh_CN.yml b/plugins/discourse-details/config/locales/client.zh_CN.yml
new file mode 100644
index 00000000000..ba67ca12a03
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.zh_CN.yml
@@ -0,0 +1,14 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+zh_CN:
+  js:
+    details:
+      title: 隐藏详情
+    composer:
+      details_title: 总结
+      details_text: "本文本将被隐藏"
diff --git a/plugins/discourse-details/config/locales/client.zh_TW.yml b/plugins/discourse-details/config/locales/client.zh_TW.yml
new file mode 100644
index 00000000000..92c18de9aec
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.zh_TW.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+zh_TW: {}
diff --git a/plugins/discourse-details/config/locales/server.ar.yml b/plugins/discourse-details/config/locales/server.ar.yml
new file mode 100644
index 00000000000..79ea4de8157
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.ar.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ar: {}
diff --git a/plugins/discourse-details/config/locales/server.bg.yml b/plugins/discourse-details/config/locales/server.bg.yml
new file mode 100644
index 00000000000..53ef6a6fa6a
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.bg.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+bg: {}
diff --git a/plugins/discourse-details/config/locales/server.bs_BA.yml b/plugins/discourse-details/config/locales/server.bs_BA.yml
new file mode 100644
index 00000000000..7b73cd2f229
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.bs_BA.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+bs_BA: {}
diff --git a/plugins/discourse-details/config/locales/server.ca.yml b/plugins/discourse-details/config/locales/server.ca.yml
new file mode 100644
index 00000000000..e155a119c24
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.ca.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ca: {}
diff --git a/plugins/discourse-details/config/locales/server.cs.yml b/plugins/discourse-details/config/locales/server.cs.yml
new file mode 100644
index 00000000000..c0f2fec763b
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.cs.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+cs: {}
diff --git a/plugins/discourse-details/config/locales/server.da.yml b/plugins/discourse-details/config/locales/server.da.yml
new file mode 100644
index 00000000000..9ca8189621d
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.da.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+da: {}
diff --git a/plugins/discourse-details/config/locales/server.de.yml b/plugins/discourse-details/config/locales/server.de.yml
index f1f54d1be47..ac14f8ca1a8 100644
--- a/plugins/discourse-details/config/locales/server.de.yml
+++ b/plugins/discourse-details/config/locales/server.de.yml
@@ -1,3 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
 de:
   site_settings:
-    details_enabled: "Aktiviert das Details-Plugin. Wenn du dies änderst, musst du alle Beiträge neu „backen“ mit: \"rake posts:rebake\"."
+    details_enabled: "Aktiviert die Details-Funktion. Wenn du dies änderst, musst du alle Beiträge neu „backen“ mit: \"rake posts:rebake\"."
diff --git a/plugins/discourse-details/config/locales/server.el.yml b/plugins/discourse-details/config/locales/server.el.yml
new file mode 100644
index 00000000000..63bf4b0e2fe
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.el.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+el: {}
diff --git a/plugins/discourse-details/config/locales/server.en.yml b/plugins/discourse-details/config/locales/server.en.yml
index cca3dd701ce..80264438ca3 100644
--- a/plugins/discourse-details/config/locales/server.en.yml
+++ b/plugins/discourse-details/config/locales/server.en.yml
@@ -1,3 +1,3 @@
 en:
   site_settings:
-    details_enabled: "Enable the details plugin. If you change this, you must rebake all posts with: \"rake posts:rebake\"."
+    details_enabled: "Enable the details feature. If you change this, you must rebake all posts with: \"rake posts:rebake\"."
diff --git a/plugins/discourse-details/config/locales/server.es.yml b/plugins/discourse-details/config/locales/server.es.yml
new file mode 100644
index 00000000000..9fb2007d808
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.es.yml
@@ -0,0 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+es:
+  site_settings:
+    details_enabled: "Habilitar el plugin details. Si cambias esto, debes hacer un rebake en todos los posts con: \"rake post:rebake\"."
diff --git a/plugins/discourse-details/config/locales/server.et.yml b/plugins/discourse-details/config/locales/server.et.yml
new file mode 100644
index 00000000000..8c601aa1ed9
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.et.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+et: {}
diff --git a/plugins/discourse-details/config/locales/server.fa_IR.yml b/plugins/discourse-details/config/locales/server.fa_IR.yml
new file mode 100644
index 00000000000..3f564b2f111
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.fa_IR.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+fa_IR: {}
diff --git a/plugins/discourse-details/config/locales/server.fi.yml b/plugins/discourse-details/config/locales/server.fi.yml
index cc9e0208fbe..b947adbbec6 100644
--- a/plugins/discourse-details/config/locales/server.fi.yml
+++ b/plugins/discourse-details/config/locales/server.fi.yml
@@ -1,3 +1,8 @@
-fi:
-  site_settings:
-    details_enabled: "Laita yhteenveto-plugin päälle. Jos muutat: \"rake posts:rebake\"."
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+fi: {}
diff --git a/plugins/discourse-details/config/locales/server.fr.yml b/plugins/discourse-details/config/locales/server.fr.yml
index 4066a0937df..ca92bfb77f6 100644
--- a/plugins/discourse-details/config/locales/server.fr.yml
+++ b/plugins/discourse-details/config/locales/server.fr.yml
@@ -1,3 +1,8 @@
-fr:
-  site_settings:
-    details_enabled: "Activer le plugin details. Si vous modifiez ceci, vous devez exécuter la commande  \"rake posts:rebake\"."
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+fr: {}
diff --git a/plugins/discourse-details/config/locales/server.gl.yml b/plugins/discourse-details/config/locales/server.gl.yml
new file mode 100644
index 00000000000..695b5cf2879
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.gl.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+gl: {}
diff --git a/plugins/discourse-details/config/locales/server.he.yml b/plugins/discourse-details/config/locales/server.he.yml
new file mode 100644
index 00000000000..96b15d6088b
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.he.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+he: {}
diff --git a/plugins/discourse-details/config/locales/server.id.yml b/plugins/discourse-details/config/locales/server.id.yml
new file mode 100644
index 00000000000..2112cad6a27
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.id.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+id: {}
diff --git a/plugins/discourse-details/config/locales/server.it.yml b/plugins/discourse-details/config/locales/server.it.yml
new file mode 100644
index 00000000000..12c5162aabd
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.it.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+it: {}
diff --git a/plugins/discourse-details/config/locales/server.ja.yml b/plugins/discourse-details/config/locales/server.ja.yml
new file mode 100644
index 00000000000..8c2dc009047
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.ja.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ja: {}
diff --git a/plugins/discourse-details/config/locales/server.ko.yml b/plugins/discourse-details/config/locales/server.ko.yml
new file mode 100644
index 00000000000..bf4e05d6f4f
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.ko.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ko: {}
diff --git a/plugins/discourse-details/config/locales/server.lv.yml b/plugins/discourse-details/config/locales/server.lv.yml
new file mode 100644
index 00000000000..dc48bb58eef
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.lv.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+lv: {}
diff --git a/plugins/discourse-details/config/locales/server.nb_NO.yml b/plugins/discourse-details/config/locales/server.nb_NO.yml
new file mode 100644
index 00000000000..2795879881f
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.nb_NO.yml
@@ -0,0 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+nb_NO:
+  site_settings:
+    details_enabled: "Aktiver funksjonen for detaljer. Hvis du endrer dette, må du rebake alle innlegg med: \"rake posts:rebake\"."
diff --git a/plugins/discourse-details/config/locales/server.nl.yml b/plugins/discourse-details/config/locales/server.nl.yml
new file mode 100644
index 00000000000..bb31021aaae
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.nl.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+nl: {}
diff --git a/plugins/discourse-details/config/locales/server.pl_PL.yml b/plugins/discourse-details/config/locales/server.pl_PL.yml
new file mode 100644
index 00000000000..c04d371e5a4
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.pl_PL.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+pl_PL: {}
diff --git a/plugins/discourse-details/config/locales/server.pt.yml b/plugins/discourse-details/config/locales/server.pt.yml
new file mode 100644
index 00000000000..d12527a51fa
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.pt.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+pt: {}
diff --git a/plugins/discourse-details/config/locales/server.pt_BR.yml b/plugins/discourse-details/config/locales/server.pt_BR.yml
new file mode 100644
index 00000000000..bc85fd86b17
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.pt_BR.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+pt_BR: {}
diff --git a/plugins/discourse-details/config/locales/server.ro.yml b/plugins/discourse-details/config/locales/server.ro.yml
new file mode 100644
index 00000000000..31d1c440135
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.ro.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ro: {}
diff --git a/plugins/discourse-details/config/locales/server.ru.yml b/plugins/discourse-details/config/locales/server.ru.yml
new file mode 100644
index 00000000000..5c634ee3d33
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.ru.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ru: {}
diff --git a/plugins/discourse-details/config/locales/server.sk.yml b/plugins/discourse-details/config/locales/server.sk.yml
new file mode 100644
index 00000000000..bcc3a93dc5b
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.sk.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sk: {}
diff --git a/plugins/discourse-details/config/locales/server.sl.yml b/plugins/discourse-details/config/locales/server.sl.yml
new file mode 100644
index 00000000000..154d194f86c
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.sl.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sl: {}
diff --git a/plugins/discourse-details/config/locales/server.sq.yml b/plugins/discourse-details/config/locales/server.sq.yml
new file mode 100644
index 00000000000..4526be31621
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.sq.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sq: {}
diff --git a/plugins/discourse-details/config/locales/server.sr.yml b/plugins/discourse-details/config/locales/server.sr.yml
new file mode 100644
index 00000000000..7e57a61dd21
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.sr.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sr: {}
diff --git a/plugins/discourse-details/config/locales/server.sv.yml b/plugins/discourse-details/config/locales/server.sv.yml
new file mode 100644
index 00000000000..fd54901f750
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.sv.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sv: {}
diff --git a/plugins/discourse-details/config/locales/server.te.yml b/plugins/discourse-details/config/locales/server.te.yml
new file mode 100644
index 00000000000..49141baa040
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.te.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+te: {}
diff --git a/plugins/discourse-details/config/locales/server.th.yml b/plugins/discourse-details/config/locales/server.th.yml
new file mode 100644
index 00000000000..7ed98e15d8c
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.th.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+th: {}
diff --git a/plugins/discourse-details/config/locales/server.tr_TR.yml b/plugins/discourse-details/config/locales/server.tr_TR.yml
new file mode 100644
index 00000000000..00efffd6707
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.tr_TR.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+tr_TR: {}
diff --git a/plugins/discourse-details/config/locales/server.uk.yml b/plugins/discourse-details/config/locales/server.uk.yml
new file mode 100644
index 00000000000..3acfff74e88
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.uk.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+uk: {}
diff --git a/plugins/discourse-details/config/locales/server.ur.yml b/plugins/discourse-details/config/locales/server.ur.yml
index c97287e9c4a..58bc9735bcb 100644
--- a/plugins/discourse-details/config/locales/server.ur.yml
+++ b/plugins/discourse-details/config/locales/server.ur.yml
@@ -1,3 +1,8 @@
-ur:
-  site_settings:
-    details_enabled: "Enable the details plugin. If you change this, you must rebake all posts with: \"rake posts:rebake\"."
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ur: {}
diff --git a/plugins/discourse-details/config/locales/server.vi.yml b/plugins/discourse-details/config/locales/server.vi.yml
new file mode 100644
index 00000000000..fa809fe162c
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.vi.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+vi: {}
diff --git a/plugins/discourse-details/config/locales/server.zh_CN.yml b/plugins/discourse-details/config/locales/server.zh_CN.yml
new file mode 100644
index 00000000000..53c9902287c
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.zh_CN.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+zh_CN: {}
diff --git a/plugins/discourse-details/config/locales/server.zh_TW.yml b/plugins/discourse-details/config/locales/server.zh_TW.yml
new file mode 100644
index 00000000000..92c18de9aec
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.zh_TW.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+zh_TW: {}
diff --git a/plugins/discourse-details/plugin.rb b/plugins/discourse-details/plugin.rb
index 116836d74cd..a9a8883fd59 100644
--- a/plugins/discourse-details/plugin.rb
+++ b/plugins/discourse-details/plugin.rb
@@ -5,6 +5,7 @@
 # url: https://github.com/discourse/discourse/tree/master/plugins/discourse-details
 
 enabled_site_setting :details_enabled
+hide_plugin if self.respond_to?(:hide_plugin)
 
 register_asset "javascripts/details.js"
 register_asset "stylesheets/details.scss"
@@ -13,7 +14,7 @@ after_initialize do
 
   Email::Styles.register_plugin_style do |fragment|
     # remove all elided content
-    fragment.css("details.elided").each { |d| d.remove }
+    fragment.css("details.elided").each(&:remove)
 
     # replace all details with their summary in emails
     fragment.css("details").each do |details|
@@ -28,4 +29,8 @@ after_initialize do
     end
   end
 
+  on(:reduce_cooked) do |fragment|
+    fragment.css("details.elided").each(&:remove)
+  end
+
 end
diff --git a/plugins/discourse-details/spec/components/pretty_text_spec.rb b/plugins/discourse-details/spec/components/pretty_text_spec.rb
index cd03a2fb6ba..338e10f4c31 100644
--- a/plugins/discourse-details/spec/components/pretty_text_spec.rb
+++ b/plugins/discourse-details/spec/components/pretty_text_spec.rb
@@ -4,9 +4,6 @@ require 'pretty_text'
 describe PrettyText do
 
   it "supports details tag" do
-    cooked_html = "<details><summary>foo</summary>bar</details>"
-    expect(PrettyText.cook("<details><summary>foo</summary>bar</details>")).to match_html(cooked_html)
-
     cooked_html = <<~HTML
       <details>
       <summary>
@@ -14,7 +11,16 @@ describe PrettyText do
       <p>bar</p>
       </details>
     HTML
-    expect(PrettyText.cook("[details=foo]\nbar\n[/details]")).to eq(cooked_html.strip)
+
+    expect(cooked_html).to match_html(cooked_html)
+    expect(PrettyText.cook("[details=foo]\nbar\n[/details]")).to match_html(cooked_html)
+  end
+
+  it "deletes elided content" do
+    cooked_html = PrettyText.cook("Hello World\n\n<details class='elided'>42</details>")
+    mail_html   = PrettyText.cook("Hello World")
+
+    expect(PrettyText.format_for_email(cooked_html)).to match_html(mail_html)
   end
 
 end
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js b/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js
new file mode 100644
index 00000000000..c68c51a4617
--- /dev/null
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js
@@ -0,0 +1,77 @@
+(function($) {
+  $.fn.applyLocalDates = function(repeat) {
+    function _formatTimezone(timezone) {
+      return timezone.replace("_", " ").split("/");
+    }
+
+    function processElement($element, options) {
+      repeat = repeat || true;
+
+      if (this.timeout) {
+        clearTimeout(this.timeout);
+      }
+
+      var relativeTime = moment.utc(options.date + " " + options.time, "YYYY-MM-DD HH:mm");
+
+      if (options.recurring && relativeTime < moment().utc()) {
+        var parts = options.recurring.split(".");
+        var count = parseInt(parts[0], 10);
+        var type = parts[1];
+        var diff = moment().diff(relativeTime, type);
+        var add = Math.ceil(diff + count);
+
+        relativeTime = relativeTime.add(add, type);
+      }
+
+      var previews = options.timezones.split("|").map(function(timezone) {
+        var dateTime = relativeTime.tz(timezone).format(options.format);
+        var timezoneParts = _formatTimezone(timezone);
+
+        if (dateTime.match(/TZ/)) {
+          return dateTime.replace("TZ", timezoneParts.join(": "));
+        } else {
+          var output = timezoneParts[0];
+          if (timezoneParts[1]) {
+            output += " (" + timezoneParts[1] + ")";
+          }
+          output += " " + dateTime;
+          return output;
+        }
+      });
+
+      relativeTime = relativeTime.tz(moment.tz.guess()).format(options.format);
+
+      var html = "<span>";
+      html += "<i class='fa fa-globe d-icon d-icon-globe'></i>";
+      html += relativeTime.replace("TZ", _formatTimezone(moment.tz.guess()).join(": "));
+      html += "</span>";
+
+      var joinedPreviews = previews.join("\n");
+
+      $element
+        .html(html)
+        .attr("title", joinedPreviews)
+        .attr("data-tooltip", joinedPreviews)
+        .addClass("cooked");
+
+      if (repeat) {
+        this.timeout = setTimeout(function() {
+          processElement($element, options);
+        }, 10000);
+      }
+    }
+
+    return this.each(function() {
+      var $this = $(this);
+
+      var options = {};
+      options.format = $this.attr("data-format");
+      options.date = $this.attr("data-date");
+      options.time = $this.attr("data-time");
+      options.recurring = $this.attr("data-recurring");
+      options.timezones = $this.attr("data-timezones") || "Etc/UTC";
+
+      processElement($this, options);
+    });
+  };
+})(jQuery);
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6 b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6
new file mode 100644
index 00000000000..e3c1afefb5e
--- /dev/null
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6
@@ -0,0 +1,131 @@
+import computed from "ember-addons/ember-computed-decorators";
+import { observes } from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+  timeFormat: "HH:mm",
+  dateFormat: "YYYY-MM-DD",
+  dateTimeFormat: "YYYY-MM-DD HH:mm",
+  config: null,
+  date: null,
+  time: null,
+  format: null,
+  formats: null,
+  recurring: null,
+  advancedMode: false,
+
+  init() {
+    this._super();
+
+    this.set("date", moment().format(this.dateFormat));
+    this.set("time", moment().format(this.timeFormat));
+    this.set("format", `LLL`);
+    this.set("timezones", (this.siteSettings.discourse_local_dates_default_timezones || "").split("|").filter(f => f));
+    this.set("formats", (this.siteSettings.discourse_local_dates_default_formats || "").split("|"));
+  },
+
+  didInsertElement() {
+    this._super();
+
+    this._setConfig();
+  },
+
+  @computed
+  currentUserTimezone() {
+    return moment.tz.guess();
+  },
+
+  @computed("formats")
+  previewedFormats(formats) {
+    return formats.map(format => {
+      return {
+        format: format,
+        preview: moment().format(format)
+      };
+    });
+  },
+
+  @computed
+  recurringOptions() {
+    return [
+      { name: "Every day", id: "1.days" },
+      { name: "Every week", id: "1.weeks" },
+      { name: "Every two weeks", id: "2.weeks" },
+      { name: "Every month", id: "1.months" },
+      { name: "Every two months", id: "2.months" },
+      { name: "Every three months", id: "3.months" },
+      { name: "Every six months", id: "6.months" },
+      { name: "Every year", id: "1.years" },
+    ];
+  },
+
+  @computed()
+  allTimezones() {
+    return _.map(moment.tz.names(), (z) => z);
+  },
+
+  @observes("date", "time", "recurring", "format", "timezones")
+  _setConfig() {
+    const date = this.get("date");
+    const time = this.get("time");
+    const recurring = this.get("recurring");
+    const format = this.get("format");
+    const timezones = this.get("timezones");
+    const dateTime = moment(`${date} ${time}`, this.dateTimeFormat).utc();
+
+    this.set("config", {
+      date: dateTime.format(this.dateFormat),
+      time: dateTime.format(this.timeFormat),
+      dateTime,
+      recurring,
+      format,
+      timezones,
+    });
+  },
+
+  getTextConfig(config) {
+    let text = `[date=${config.date} `;
+    if (config.recurring) text += `recurring=${config.recurring} `;
+    text += `time=${config.time} `;
+    text += `format="${config.format}" `;
+    text += `timezones="${config.timezones.join("|")}"`;
+    text += `]`;
+    return text;
+  },
+
+  @computed("config.dateTime")
+  validDate(dateTime) {
+    if (!dateTime) return false;
+    return dateTime.isValid();
+  },
+
+  @computed("advancedMode")
+  toggleModeBtnLabel(advancedMode) {
+    return advancedMode ? "discourse_local_dates.create.form.simple_mode" : "discourse_local_dates.create.form.advanced_mode";
+  },
+
+  actions: {
+    advancedMode() {
+      this.toggleProperty("advancedMode");
+    },
+
+    save() {
+      this._closeModal();
+
+      const textConfig = this.getTextConfig(this.get("config"));
+      this.get("toolbarEvent").addText(textConfig);
+    },
+
+    fillFormat(format) {
+      this.set("format", format);
+    },
+
+    cancel() {
+      this._closeModal();
+    }
+  },
+
+  _closeModal() {
+    const composer = Discourse.__container__.lookup("controller:composer");
+    composer.send("closeModal");
+  }
+});
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
new file mode 100644
index 00000000000..5b7ae5fa842
--- /dev/null
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
@@ -0,0 +1,103 @@
+{{#d-modal-body
+  title="discourse_local_dates.create.modal_title"
+  subtitle="discourse_local_dates.create.modal_subtitle"
+  class="discourse-local-dates-create-modal"
+  style="overflow: auto"}}
+
+  <div class="form">
+    <div class="date-time-configuration">
+      <div class="control-group date">
+        <label class="control-label">
+          {{i18n "discourse_local_dates.create.form.date_title"}}
+        </label>
+        <div class="controls">
+          {{date-picker-future class="date-input" value=date defaultDate="DD-MM-YYYY"}}
+        </div>
+      </div>
+
+      <div class="control-group time">
+        <label class="control-label">
+          {{i18n "discourse_local_dates.create.form.time_title"}}
+        </label>
+        <div class="controls">
+          {{input type="time" value=time class="time-input"}}
+        </div>
+      </div>
+
+      <span class="preview">{{currentUserTimezone}}</span>
+    </div>
+
+    {{#unless validDate}}
+      <span class="validation-error">{{i18n "discourse_local_dates.create.form.invalid_date"}}</span>
+    {{/unless}}
+
+    <div class="control-group recurrence">
+      <label class="control-label">
+        {{i18n "discourse_local_dates.create.form.recurring_title"}}
+      </label>
+      {{#if advancedMode}}
+        <p>{{{i18n "discourse_local_dates.create.form.recurring_description"}}}</p>
+      {{/if}}
+      <div class="controls">
+        {{combo-box content=recurringOptions class="recurrence-input" value=recurring none="discourse_local_dates.create.form.recurring_none"}}
+      </div>
+    </div>
+
+    {{#if advancedMode}}
+      <div class="advanced-options">
+        <div class="control-group format">
+          <label>{{i18n "discourse_local_dates.create.form.format_title"}}</label>
+          <p>
+            {{i18n "discourse_local_dates.create.form.format_description"}}
+            <a target="_blank" rel="noopener" href="https://momentjs.com/docs/#/parsing/string-format/">
+              {{d-icon "question-circle"}}
+            </a>
+          </p>
+          <div class="controls">
+            {{text-field value=format class="format-input"}}
+          </div>
+        </div>
+        <div class="control-group">
+          <ul class="formats">
+            {{#each previewedFormats as |previewedFormat|}}
+              <li class="format">
+                <a class="moment-format" href {{action "fillFormat" previewedFormat.format}}>
+                  {{previewedFormat.format}}
+                </a>
+                <span class="previewed-format">
+                  {{previewedFormat.preview}}
+                </span>
+              </li>
+            {{/each}}
+          </ul>
+        </div>
+
+        <div class="control-group timezones">
+          <label>{{i18n "discourse_local_dates.create.form.timezones_title"}}</label>
+          <p>{{i18n "discourse_local_dates.create.form.timezones_description"}}</p>
+          <div class="controls">
+            {{multi-select class="timezones-input" allowAny=false maximum=5 content=allTimezones values=timezones}}
+          </div>
+        </div>
+      </div>
+    {{/if}}
+  </div>
+{{/d-modal-body}}
+
+<div class="modal-footer discourse-local-dates-create-modal-footer">
+  {{#if validDate}}
+    {{d-button class="btn"
+      action="save"
+      label="discourse_local_dates.create.form.insert"}}
+  {{/if}}
+
+  <a class="cancel-action" href {{action "cancel"}}>
+    {{i18n "cancel"}}
+  </a>
+
+  {{d-button
+    class="advanced-mode-btn"
+    action=(action "advancedMode")
+    icon="cog"
+    label=toggleModeBtnLabel}}
+</div>
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/modal/discourse-local-dates-create-modal.hbs b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/modal/discourse-local-dates-create-modal.hbs
new file mode 100644
index 00000000000..b5f390f8e59
--- /dev/null
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/modal/discourse-local-dates-create-modal.hbs
@@ -0,0 +1 @@
+{{discourse-local-dates-create-form config=config toolbarEvent=toolbarEvent}}
diff --git a/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js.es6 b/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js.es6
new file mode 100644
index 00000000000..395a776fb76
--- /dev/null
+++ b/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js.es6
@@ -0,0 +1,39 @@
+import { withPluginApi } from "discourse/lib/plugin-api";
+import showModal from "discourse/lib/show-modal";
+import { registerTooltip } from "discourse/lib/tooltip";
+
+function initializeDiscourseLocalDates(api) {
+  api.decorateCooked($elem => {
+    $(".discourse-local-date", $elem).applyLocalDates();
+    registerTooltip($(".discourse-local-date", $elem));
+  });
+
+  api.addToolbarPopupMenuOptionsCallback(() => {
+    return {
+      action: "insertDiscourseLocalDate",
+      icon: "globe",
+      label: "discourse_local_dates.title"
+    };
+  });
+
+  api.modifyClass('controller:composer', {
+    actions: {
+      insertDiscourseLocalDate() {
+        showModal("discourse-local-dates-create-modal").setProperties({
+          toolbarEvent: this.get("toolbarEvent")
+        });
+      }
+    }
+  });
+}
+
+export default {
+  name: "discourse-local-dates",
+
+  initialize(container) {
+    const siteSettings = container.lookup("site-settings:main");
+    if (siteSettings.discourse_local_dates_enabled) {
+      withPluginApi("0.8.8", initializeDiscourseLocalDates);
+    }
+  }
+};
diff --git a/plugins/discourse-local-dates/assets/javascripts/lib/discourse-markdown/discourse-local-dates.js.es6 b/plugins/discourse-local-dates/assets/javascripts/lib/discourse-markdown/discourse-local-dates.js.es6
new file mode 100644
index 00000000000..888bb747b77
--- /dev/null
+++ b/plugins/discourse-local-dates/assets/javascripts/lib/discourse-markdown/discourse-local-dates.js.es6
@@ -0,0 +1,78 @@
+import { parseBBCodeTag } from 'pretty-text/engines/discourse-markdown/bbcode-block';
+
+function addLocalDate(buffer, matches, state) {
+  let token;
+
+  let config = {
+    date: null,
+    time: null,
+    format: "YYYY-MM-DD HH:mm",
+    timezones: ""
+  };
+
+  let parsed = parseBBCodeTag("[date date" + matches[1] + "]", 0, matches[1].length + 11);
+
+  config.date = parsed.attrs.date;
+  config.time = parsed.attrs.time;
+  config.recurring = parsed.attrs.recurring;
+  config.format = parsed.attrs.format || config.format;
+  config.timezones = parsed.attrs.timezones || config.timezones;
+
+  token = new state.Token('span_open', 'span', 1);
+  token.attrs = [
+    ['class', 'discourse-local-date'],
+    ['data-date', config.date],
+    ['data-time', config.time],
+    ['data-format', config.format],
+    ['data-timezones', config.timezones],
+  ];
+  if (config.recurring) {
+    token.attrs.push(['data-recurring', config.recurring]);
+  }
+  buffer.push(token);
+
+  const previews = config.timezones.split("|").filter(t => t).map(timezone => {
+    const dateTime = moment
+                      .utc(`${config.date} ${config.time}`, "YYYY-MM-DD HH:mm")
+                      .tz(timezone)
+                      .format(config.format);
+
+    const formattedTimezone = timezone.replace("/", ": ").replace("_", " ");
+
+    if (dateTime.match(/TZ/)) {
+      return dateTime.replace("TZ", formattedTimezone);
+    } else {
+      return `${dateTime} (${formattedTimezone})`;
+    }
+  });
+
+  token.attrs.push(['data-email-preview', previews[0]]);
+
+  token = new state.Token('text', '', 0);
+  token.content = previews.join(", ");
+  buffer.push(token);
+
+  token = new state.Token('span_close', 'span', -1);
+  buffer.push(token);
+}
+
+export function setup(helper) {
+  helper.whiteList([
+    'span.discourse-local-date',
+    'span[data-*]',
+    'span[title]'
+  ]);
+
+  helper.registerOptions((opts, siteSettings) => {
+    opts.features['discourse-local-dates'] = !!siteSettings.discourse_local_dates_enabled;
+  });
+
+  helper.registerPlugin(md => {
+    const rule = {
+      matcher: /\[date(.+?)\]/,
+      onMatch: addLocalDate
+    };
+
+    md.core.textPostProcess.ruler.push('discourse-local-dates', rule);
+  });
+}
diff --git a/plugins/discourse-local-dates/assets/stylesheets/common/discourse-local-dates.scss b/plugins/discourse-local-dates/assets/stylesheets/common/discourse-local-dates.scss
new file mode 100644
index 00000000000..33abbd7c35f
--- /dev/null
+++ b/plugins/discourse-local-dates/assets/stylesheets/common/discourse-local-dates.scss
@@ -0,0 +1,144 @@
+.discourse-local-date {
+  display: inline-block;
+  vertical-align: top;
+
+  &.cooked {
+    color: $primary;
+    font-weight: bold;
+    cursor: pointer;
+
+    .d-icon-globe {
+      margin-right: .25em;
+      color: $primary-medium;
+
+      &:hover {
+        color: $primary-high;
+      }
+    }
+
+    &:hover .d-icon-globe {
+      color: $primary-high;
+    }
+  }
+
+  + .discourse-local-date {
+    margin-left: .5em;
+  }
+}
+
+.discourse-local-dates-create-modal-footer {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+
+  &:before, &:after {
+    content: none;
+  }
+
+  .cancel-action {
+    margin: 0 5px 5px 0;
+  }
+
+  .btn + .cancel-action {
+    margin-left: 1em;
+  }
+
+  .advanced-mode-btn {
+    margin-left: auto;
+  }
+}
+
+.discourse-local-dates-create-modal {
+  min-height: 300px;
+  display: flex;
+  flex-direction: row;
+
+  .form {
+    flex: 1;
+
+    label {
+      font-weight: 700;
+    }
+
+    .date-time-configuration {
+      display: flex;
+      align-items: center;
+
+      .date {
+        .date-input {
+          margin-right: 1em;
+
+          .date-picker {
+            padding-top: 5px;
+            bottom: 5px;
+            margin: 0;
+            width: 120px;
+            text-align: left;
+          }
+        }
+      }
+
+      .time {
+        margin-right: 1em;
+
+        .time-input {
+          margin: 0 0.5em 0 0;
+          width: 120px;
+          padding: 3.5px 10px;
+        }
+      }
+
+      .preview {
+        margin-top: 16px;
+      }
+
+      @include small-width {
+        flex-direction: column;
+        align-items: flex-start;
+
+        .date .date-input .date-picker {
+          width: 200px;
+        }
+
+        .time .time-input {
+          width: 200px;
+        }
+      }
+    }
+
+    .validation-error {
+      color: $danger;
+    }
+
+    .recurrence {
+      .recurrence-input {
+        width: 300px;
+      }
+    }
+   }
+
+   .format {
+     .format-input {
+       width: 280px;
+     }
+   }
+
+   .formats {
+     list-style: none;
+     padding: 0;
+     margin: 0;
+     .format {
+       .previewed-format {
+         color: $primary-medium;
+       }
+     }
+   }
+
+   .control-group.recurrence, .control-group.format, .control-group.timezones {
+     margin-top: 1em;
+   }
+
+  .timezones-input {
+    width: 99%;
+  }
+}
diff --git a/plugins/discourse-local-dates/config/locales/client.ar.yml b/plugins/discourse-local-dates/config/locales/client.ar.yml
new file mode 100644
index 00000000000..79ea4de8157
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.ar.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ar: {}
diff --git a/plugins/discourse-local-dates/config/locales/client.bg.yml b/plugins/discourse-local-dates/config/locales/client.bg.yml
new file mode 100644
index 00000000000..53ef6a6fa6a
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.bg.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+bg: {}
diff --git a/plugins/discourse-local-dates/config/locales/client.bs_BA.yml b/plugins/discourse-local-dates/config/locales/client.bs_BA.yml
new file mode 100644
index 00000000000..7b73cd2f229
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.bs_BA.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+bs_BA: {}
diff --git a/plugins/discourse-local-dates/config/locales/client.ca.yml b/plugins/discourse-local-dates/config/locales/client.ca.yml
new file mode 100644
index 00000000000..e155a119c24
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.ca.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ca: {}
diff --git a/plugins/discourse-local-dates/config/locales/client.cs.yml b/plugins/discourse-local-dates/config/locales/client.cs.yml
new file mode 100644
index 00000000000..c0f2fec763b
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.cs.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+cs: {}
diff --git a/plugins/discourse-local-dates/config/locales/client.da.yml b/plugins/discourse-local-dates/config/locales/client.da.yml
new file mode 100644
index 00000000000..9ca8189621d
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.da.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+da: {}
diff --git a/plugins/discourse-local-dates/config/locales/client.de.yml b/plugins/discourse-local-dates/config/locales/client.de.yml
new file mode 100644
index 00000000000..d78c4278034
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.de.yml
@@ -0,0 +1,23 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+de:
+  js:
+    discourse_local_dates:
+      title: Datum einfügen
+      create:
+        modal_title: Datum einfügen
+        form:
+          insert: Einfügen
+          advanced_mode: Erweiterter Modus
+          format_description: "Format für die Benutzeranzeige von Datumswerten. Verwende \"\\T\\Z\", um die Benutzerzeitzone in Worten darzustellen (Europe/Paris)"
+          timezones_title: Anzuzeigende Zeitzonen
+          timezones_description: Zeitzonen werden für die Anzeige von Datumswerten in der Zukunft und in der Vergangenheit verwendet.
+          recurring_title: Wiederholung
+          recurring_description: "Definiere die Wiederholung eines Ereignisses. Du kannst die Wiederholungsoptionen auch manuell bearbeiten, die vom Formular generiert wurden, und einen der folgenden Schlüssel verwenden: years, quarters, months, weeks, days, hours, minutes, seconds, milliseconds."
+          recurring_none: Keine Wiederholung
+          invalid_date: Ungültige Datumsangabe, stelle sicher, dass Datum und Zeit korrekt sind.
diff --git a/plugins/discourse-local-dates/config/locales/client.el.yml b/plugins/discourse-local-dates/config/locales/client.el.yml
new file mode 100644
index 00000000000..63bf4b0e2fe
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.el.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+el: {}
diff --git a/plugins/discourse-local-dates/config/locales/client.en.yml b/plugins/discourse-local-dates/config/locales/client.en.yml
new file mode 100644
index 00000000000..13f5ccd2b01
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.en.yml
@@ -0,0 +1,21 @@
+en:
+  js:
+    discourse_local_dates:
+      title: Insert date
+      create:
+        modal_title: Insert date
+        modal_subtitle: "We will automatically convert the date and time to the viewer’s local time zone."
+        form:
+          insert: Insert
+          advanced_mode: Advanced mode
+          simple_mode: Simple mode
+          format_description: "Format used to display the date to the user. Use \"\\T\\Z\" to display the user timezone in words (Europe/Paris)"
+          timezones_title: Timezones to display
+          timezones_description: Timezones will be used to display dates in preview and fallback.
+          recurring_title: Recurrence
+          recurring_description: "Define the recurrence of an event. You can also manually edit the recurring option generated by the form and use one of the following keys: years, quarters, months, weeks, days, hours, minutes, seconds, milliseconds."
+          recurring_none: No recurrence
+          invalid_date: Invalid date, make sure date and time are correct
+          date_title: Date
+          time_title: Time
+          format_title: Date format
diff --git a/plugins/discourse-local-dates/config/locales/client.es.yml b/plugins/discourse-local-dates/config/locales/client.es.yml
new file mode 100644
index 00000000000..33ea4a1f567
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.es.yml
@@ -0,0 +1,28 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+es:
+  js:
+    discourse_local_dates:
+      title: Insertar fecha
+      create:
+        modal_title: Insertar fecha
+        modal_subtitle: "Convertiremos automáticamente la fecha y la hora en la zona horaria local del lector."
+        form:
+          insert: Insertar
+          advanced_mode: Modo Avanzado
+          simple_mode: Modo simple
+          format_description: "Formato usado para mostrar la fecha al usuario. Use \"\\T\\Z\" para mostrar la zona horaria del usuario en palabras (Europe/Paris)"
+          timezones_title: Zonas Horarias a mostrar
+          timezones_description: Las zonas horarias se usarán para mostrar las fechas en vista previa y retroceso.
+          recurring_title: Recurrencia
+          recurring_description: "Definir la recurrencia de un evento. También puede editar manualmente la opción recurrente generada por el formulario y usar una de las siguientes claves: years, quarters, months, weeks, days, hours, minutes, seconds, milliseconds."
+          recurring_none: Sin recurrencia
+          invalid_date: Fecha inválida, asegúrese de que la fecha y la hora sean correctas
+          date_title: Fecha
+          time_title: Hora
+          format_title: Formato de Fecha
diff --git a/plugins/discourse-local-dates/config/locales/client.et.yml b/plugins/discourse-local-dates/config/locales/client.et.yml
new file mode 100644
index 00000000000..8c601aa1ed9
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.et.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+et: {}
diff --git a/plugins/discourse-local-dates/config/locales/client.fa_IR.yml b/plugins/discourse-local-dates/config/locales/client.fa_IR.yml
new file mode 100644
index 00000000000..9a874ac23e5
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.fa_IR.yml
@@ -0,0 +1,13 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+fa_IR:
+  js:
+    discourse_local_dates:
+      create:
+        form:
+          timezones_title: نمایش منطقه زمانی
diff --git a/plugins/discourse-local-dates/config/locales/client.fi.yml b/plugins/discourse-local-dates/config/locales/client.fi.yml
new file mode 100644
index 00000000000..b947adbbec6
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.fi.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+fi: {}
diff --git a/plugins/discourse-local-dates/config/locales/client.fr.yml b/plugins/discourse-local-dates/config/locales/client.fr.yml
new file mode 100644
index 00000000000..388a1c67865
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.fr.yml
@@ -0,0 +1,23 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+fr:
+  js:
+    discourse_local_dates:
+      title: Insérer date
+      create:
+        modal_title: Insérer date
+        form:
+          insert: Insérer
+          advanced_mode: Mode avancé
+          format_description: "Format utilisé pour afficher la date pour l'utilisateur. Utiliser \"\\T\\Z\" pour afficher le fuseaux horaire de l'utilisateur en toutes lettres (Europe/Paris)"
+          timezones_title: Fuseaux horaires à afficher
+          timezones_description: Les fuseaux horaires seront utilisés pour afficher les dates en aperçu et en mode recours.
+          recurring_title: Périodicité
+          recurring_description: "Définir la périodicité d'un événement. Vous pouvez aussi modifier manuellement l'option de périodicité générée par le formulaire et utiliser une des clefs suivantes: years, quarters, months, weeks, days, hours, minutes, seconds, milliseconds. "
+          recurring_none: Pas de périodicité
+          invalid_date: Date invalide, contrôler que la date et l'heure sont correctes
diff --git a/plugins/discourse-local-dates/config/locales/client.gl.yml b/plugins/discourse-local-dates/config/locales/client.gl.yml
new file mode 100644
index 00000000000..695b5cf2879
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.gl.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+gl: {}
diff --git a/plugins/discourse-local-dates/config/locales/client.he.yml b/plugins/discourse-local-dates/config/locales/client.he.yml
new file mode 100644
index 00000000000..dd210821cac
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.he.yml
@@ -0,0 +1,15 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+he:
+  js:
+    discourse_local_dates:
+      create:
+        form:
+          format_description: "תבנית להצגת תאריך המשתמש. יש להשתמש ב־„‎\\T\\Z” כדי להציג את אזור הזמן של המשתמש במילים (אסיה/ירושלים)"
+          timezones_title: אזורי זמן
+          timezones_description: באזורי זמן נעשה שימוש לטובת הצגת תאריך בתצוגה מקדימה וכבררת מחדל.
diff --git a/plugins/discourse-local-dates/config/locales/client.id.yml b/plugins/discourse-local-dates/config/locales/client.id.yml
new file mode 100644
index 00000000000..2112cad6a27
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.id.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+id: {}
diff --git a/plugins/discourse-local-dates/config/locales/client.it.yml b/plugins/discourse-local-dates/config/locales/client.it.yml
new file mode 100644
index 00000000000..207f613578d
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.it.yml
@@ -0,0 +1,11 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+it:
+  js:
+    discourse_local_dates:
+      title: Inserisci la data
diff --git a/plugins/discourse-local-dates/config/locales/client.ja.yml b/plugins/discourse-local-dates/config/locales/client.ja.yml
new file mode 100644
index 00000000000..8c2dc009047
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.ja.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ja: {}
diff --git a/plugins/discourse-local-dates/config/locales/client.ko.yml b/plugins/discourse-local-dates/config/locales/client.ko.yml
new file mode 100644
index 00000000000..bf4e05d6f4f
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.ko.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ko: {}
diff --git a/plugins/discourse-local-dates/config/locales/client.lv.yml b/plugins/discourse-local-dates/config/locales/client.lv.yml
new file mode 100644
index 00000000000..dc48bb58eef
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.lv.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+lv: {}
diff --git a/plugins/discourse-local-dates/config/locales/client.nb_NO.yml b/plugins/discourse-local-dates/config/locales/client.nb_NO.yml
new file mode 100644
index 00000000000..a4fbc12fcd3
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.nb_NO.yml
@@ -0,0 +1,23 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+nb_NO:
+  js:
+    discourse_local_dates:
+      title: Sett inn dato
+      create:
+        modal_title: Sett inn dato
+        form:
+          insert: Sett inn
+          advanced_mode: Avansert modus
+          format_description: "Format som brukes for å vise datoen til en bruker. Bruk \"\\T\\Z\" for å vise tidssonen som ord (Europe/Paris)"
+          timezones_title: Tidssoner som vises
+          timezones_description: Tidssoner vil brukes for å vise datoer i forhåndsvisninger og fallback.
+          recurring_title: Regelmessighet
+          recurring_description: "Definer regelmessigheten til en hendelse. Du kan også manuelt redigere regelmessigheten etter at den er opprettet ved å bruke de følgende nøklene: years, quarters, months, weeks, days, hours, minutes, seconds, milliseconds."
+          recurring_none: Ingen regelmessighet
+          invalid_date: Ugyldig dato, sjekk at dato og klokkeslett er korrekt
diff --git a/plugins/discourse-local-dates/config/locales/client.nl.yml b/plugins/discourse-local-dates/config/locales/client.nl.yml
new file mode 100644
index 00000000000..bb31021aaae
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.nl.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+nl: {}
diff --git a/plugins/discourse-local-dates/config/locales/client.pl_PL.yml b/plugins/discourse-local-dates/config/locales/client.pl_PL.yml
new file mode 100644
index 00000000000..c04d371e5a4
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.pl_PL.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+pl_PL: {}
diff --git a/plugins/discourse-local-dates/config/locales/client.pt.yml b/plugins/discourse-local-dates/config/locales/client.pt.yml
new file mode 100644
index 00000000000..d12527a51fa
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.pt.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+pt: {}
diff --git a/plugins/discourse-local-dates/config/locales/client.pt_BR.yml b/plugins/discourse-local-dates/config/locales/client.pt_BR.yml
new file mode 100644
index 00000000000..bc85fd86b17
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.pt_BR.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+pt_BR: {}
diff --git a/plugins/discourse-local-dates/config/locales/client.ro.yml b/plugins/discourse-local-dates/config/locales/client.ro.yml
new file mode 100644
index 00000000000..31d1c440135
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.ro.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ro: {}
diff --git a/plugins/discourse-local-dates/config/locales/client.ru.yml b/plugins/discourse-local-dates/config/locales/client.ru.yml
new file mode 100644
index 00000000000..8090c65edf7
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.ru.yml
@@ -0,0 +1,23 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ru:
+  js:
+    discourse_local_dates:
+      title: Вставить дату
+      create:
+        modal_title: Вставить дату
+        form:
+          insert: Вставить
+          advanced_mode: Расширенный режим
+          format_description: "Формат, используемый для отображения даты пользователю. Используйте \"\\T\\Z\" для отображения часового пояса пользователя в словах (Europe/Paris)"
+          timezones_title: Часовые пояса для отображения
+          timezones_description: Часовые пояса будут использоваться для отображения дат в режиме предварительного просмотра и отката назад.
+          recurring_title: Повторение
+          recurring_description: "Определите повторение события. Кроме того, можно вручную изменить параметр повтора, созданный формой, и использовать один из следующих ключей: годы, кварталы, месяцы, недели, дни, часы, минуты, секунды, миллисекунды."
+          recurring_none: Отсутствие рецидивирования
+          invalid_date: Недействительная дата, убедитесь, что дата и время верны
diff --git a/plugins/discourse-local-dates/config/locales/client.sk.yml b/plugins/discourse-local-dates/config/locales/client.sk.yml
new file mode 100644
index 00000000000..bcc3a93dc5b
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.sk.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sk: {}
diff --git a/plugins/discourse-local-dates/config/locales/client.sl.yml b/plugins/discourse-local-dates/config/locales/client.sl.yml
new file mode 100644
index 00000000000..154d194f86c
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.sl.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sl: {}
diff --git a/plugins/discourse-local-dates/config/locales/client.sq.yml b/plugins/discourse-local-dates/config/locales/client.sq.yml
new file mode 100644
index 00000000000..4526be31621
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.sq.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sq: {}
diff --git a/plugins/discourse-local-dates/config/locales/client.sr.yml b/plugins/discourse-local-dates/config/locales/client.sr.yml
new file mode 100644
index 00000000000..7e57a61dd21
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.sr.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sr: {}
diff --git a/plugins/discourse-local-dates/config/locales/client.sv.yml b/plugins/discourse-local-dates/config/locales/client.sv.yml
new file mode 100644
index 00000000000..fd54901f750
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.sv.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sv: {}
diff --git a/plugins/discourse-local-dates/config/locales/client.te.yml b/plugins/discourse-local-dates/config/locales/client.te.yml
new file mode 100644
index 00000000000..49141baa040
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.te.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+te: {}
diff --git a/plugins/discourse-local-dates/config/locales/client.th.yml b/plugins/discourse-local-dates/config/locales/client.th.yml
new file mode 100644
index 00000000000..7ed98e15d8c
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.th.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+th: {}
diff --git a/plugins/discourse-local-dates/config/locales/client.tr_TR.yml b/plugins/discourse-local-dates/config/locales/client.tr_TR.yml
new file mode 100644
index 00000000000..00efffd6707
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.tr_TR.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+tr_TR: {}
diff --git a/plugins/discourse-local-dates/config/locales/client.uk.yml b/plugins/discourse-local-dates/config/locales/client.uk.yml
new file mode 100644
index 00000000000..3acfff74e88
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.uk.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+uk: {}
diff --git a/plugins/discourse-local-dates/config/locales/client.ur.yml b/plugins/discourse-local-dates/config/locales/client.ur.yml
new file mode 100644
index 00000000000..faa31bdba7e
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.ur.yml
@@ -0,0 +1,15 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ur:
+  js:
+    discourse_local_dates:
+      create:
+        form:
+          format_description: "صارف کو تاریخ ظاہر کرنے کیلئے استعمال کیے جانے والا فارمیٹ۔ الفاظ (یورپ/پیرس) میں صارف ٹائم زَون کو ظاہر کرنے کیلئے \"\\T\\Z\" استعمال کریں"
+          timezones_title: ظاہر کیے جانے والے ٹائم زَونز
+          timezones_description: پیشگی اور فالبَیک میں تاریخیں ظاہر کرنے کیلئے ٹائم زَونز استعمال کیے جائیں گے۔
diff --git a/plugins/discourse-local-dates/config/locales/client.vi.yml b/plugins/discourse-local-dates/config/locales/client.vi.yml
new file mode 100644
index 00000000000..fa809fe162c
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.vi.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+vi: {}
diff --git a/plugins/discourse-local-dates/config/locales/client.zh_CN.yml b/plugins/discourse-local-dates/config/locales/client.zh_CN.yml
new file mode 100644
index 00000000000..6276aa128ef
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.zh_CN.yml
@@ -0,0 +1,16 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+zh_CN:
+  js:
+    discourse_local_dates:
+      title: 插入日期
+      create:
+        modal_title: 插入日期
+        form:
+          insert: 插入
+          advanced_mode: 高级模式
diff --git a/plugins/discourse-local-dates/config/locales/client.zh_TW.yml b/plugins/discourse-local-dates/config/locales/client.zh_TW.yml
new file mode 100644
index 00000000000..92c18de9aec
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.zh_TW.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+zh_TW: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.ar.yml b/plugins/discourse-local-dates/config/locales/server.ar.yml
new file mode 100644
index 00000000000..79ea4de8157
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.ar.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ar: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.bg.yml b/plugins/discourse-local-dates/config/locales/server.bg.yml
new file mode 100644
index 00000000000..53ef6a6fa6a
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.bg.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+bg: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.bs_BA.yml b/plugins/discourse-local-dates/config/locales/server.bs_BA.yml
new file mode 100644
index 00000000000..7b73cd2f229
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.bs_BA.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+bs_BA: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.ca.yml b/plugins/discourse-local-dates/config/locales/server.ca.yml
new file mode 100644
index 00000000000..e155a119c24
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.ca.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ca: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.cs.yml b/plugins/discourse-local-dates/config/locales/server.cs.yml
new file mode 100644
index 00000000000..c0f2fec763b
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.cs.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+cs: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.da.yml b/plugins/discourse-local-dates/config/locales/server.da.yml
new file mode 100644
index 00000000000..9ca8189621d
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.da.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+da: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.de.yml b/plugins/discourse-local-dates/config/locales/server.de.yml
new file mode 100644
index 00000000000..b6939fca385
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.de.yml
@@ -0,0 +1,12 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+de:
+  site_settings:
+    discourse_local_dates_enabled: "Aktiviert die discourse-local-dates-Funktion. Wenn du diese Einstellung änderst, musst du alle Beiträge mit \"rake posts:rebake\" neu generieren."
+    discourse_local_dates_default_formats: "Häufig verwendete Datums- und Zeitformate, siehe: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs string format</a>"
+    discourse_local_dates_default_timezones: "Standard-Liste von Zeitzonen, muss eine gültige <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a> sein"
diff --git a/plugins/discourse-local-dates/config/locales/server.el.yml b/plugins/discourse-local-dates/config/locales/server.el.yml
new file mode 100644
index 00000000000..63bf4b0e2fe
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.el.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+el: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.en.yml b/plugins/discourse-local-dates/config/locales/server.en.yml
new file mode 100644
index 00000000000..a952dec4c67
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.en.yml
@@ -0,0 +1,5 @@
+en:
+  site_settings:
+    discourse_local_dates_enabled: "Enable the discourse-local-dates feature. This will add support to local timezone aware dates in posts using the [date] element."
+    discourse_local_dates_default_formats: "Frequently used date time formats, see: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs string format</a>"
+    discourse_local_dates_default_timezones: "Default list of timezones, must be a valid <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a>"
diff --git a/plugins/discourse-local-dates/config/locales/server.es.yml b/plugins/discourse-local-dates/config/locales/server.es.yml
new file mode 100644
index 00000000000..37ec803c98e
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.es.yml
@@ -0,0 +1,12 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+es:
+  site_settings:
+    discourse_local_dates_enabled: "Habilitar el plugin discourse-local-dates. Esto agregará soporte a las fechas de la zona horaria local en las publicaciones que usan el elemento [date]."
+    discourse_local_dates_default_formats: "Formatos de fecha usados frecuentemente, ver: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>formato momentjs string</a>"
+    discourse_local_dates_default_timezones: "Lista por defecto de timezones, debe ser un <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a> válido"
diff --git a/plugins/discourse-local-dates/config/locales/server.et.yml b/plugins/discourse-local-dates/config/locales/server.et.yml
new file mode 100644
index 00000000000..8c601aa1ed9
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.et.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+et: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.fa_IR.yml b/plugins/discourse-local-dates/config/locales/server.fa_IR.yml
new file mode 100644
index 00000000000..3f564b2f111
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.fa_IR.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+fa_IR: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.fi.yml b/plugins/discourse-local-dates/config/locales/server.fi.yml
new file mode 100644
index 00000000000..b947adbbec6
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.fi.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+fi: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.fr.yml b/plugins/discourse-local-dates/config/locales/server.fr.yml
new file mode 100644
index 00000000000..64bad2261b6
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.fr.yml
@@ -0,0 +1,12 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+fr:
+  site_settings:
+    discourse_local_dates_enabled: "Activer la fonctionnalité discourse-local-dates. Ceci ajoutera la gestion des dates locales dans les messages, en utilisant l'élément [date]."
+    discourse_local_dates_default_formats: "Formats de date fréquemment utilisés, voir : <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs string format</a>"
+    discourse_local_dates_default_timezones: "Liste de fuseaux horaires par défaut, doit être un fuseaux horaire valide <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>Wikipedia (anglais)</a>"
diff --git a/plugins/discourse-local-dates/config/locales/server.gl.yml b/plugins/discourse-local-dates/config/locales/server.gl.yml
new file mode 100644
index 00000000000..695b5cf2879
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.gl.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+gl: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.he.yml b/plugins/discourse-local-dates/config/locales/server.he.yml
new file mode 100644
index 00000000000..dced9360b8b
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.he.yml
@@ -0,0 +1,11 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+he:
+  site_settings:
+    discourse_local_dates_default_formats: "תבניות זמן נפוצות, ניתן לעיין ב: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>תבנית מחרוזת momentjs</a>"
+    discourse_local_dates_default_timezones: "רשימת בררת מחדל של אזורי זמן, חיי להיות <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a> תקני"
diff --git a/plugins/discourse-local-dates/config/locales/server.id.yml b/plugins/discourse-local-dates/config/locales/server.id.yml
new file mode 100644
index 00000000000..2112cad6a27
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.id.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+id: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.it.yml b/plugins/discourse-local-dates/config/locales/server.it.yml
new file mode 100644
index 00000000000..12c5162aabd
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.it.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+it: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.ja.yml b/plugins/discourse-local-dates/config/locales/server.ja.yml
new file mode 100644
index 00000000000..8c2dc009047
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.ja.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ja: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.ko.yml b/plugins/discourse-local-dates/config/locales/server.ko.yml
new file mode 100644
index 00000000000..bf4e05d6f4f
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.ko.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ko: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.lv.yml b/plugins/discourse-local-dates/config/locales/server.lv.yml
new file mode 100644
index 00000000000..dc48bb58eef
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.lv.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+lv: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.nb_NO.yml b/plugins/discourse-local-dates/config/locales/server.nb_NO.yml
new file mode 100644
index 00000000000..b43afaffbd0
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.nb_NO.yml
@@ -0,0 +1,12 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+nb_NO:
+  site_settings:
+    discourse_local_dates_enabled: "Aktiver discourse-local-dates funksjonen. Dette gjør det mulig å støtte datoer som tilpasser seg lokale tidssoner i innlegg ved bruk av [date] elementet."
+    discourse_local_dates_default_formats: "Ofte brukte tidsformater, les: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs string format</a>"
+    discourse_local_dates_default_timezones: "Standard liste over tidssoner, må være en gyldig <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a>"
diff --git a/plugins/discourse-local-dates/config/locales/server.nl.yml b/plugins/discourse-local-dates/config/locales/server.nl.yml
new file mode 100644
index 00000000000..bb31021aaae
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.nl.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+nl: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.pl_PL.yml b/plugins/discourse-local-dates/config/locales/server.pl_PL.yml
new file mode 100644
index 00000000000..c04d371e5a4
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.pl_PL.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+pl_PL: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.pt.yml b/plugins/discourse-local-dates/config/locales/server.pt.yml
new file mode 100644
index 00000000000..d12527a51fa
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.pt.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+pt: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.pt_BR.yml b/plugins/discourse-local-dates/config/locales/server.pt_BR.yml
new file mode 100644
index 00000000000..bc85fd86b17
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.pt_BR.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+pt_BR: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.ro.yml b/plugins/discourse-local-dates/config/locales/server.ro.yml
new file mode 100644
index 00000000000..31d1c440135
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.ro.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ro: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.ru.yml b/plugins/discourse-local-dates/config/locales/server.ru.yml
new file mode 100644
index 00000000000..cd8414ecf7a
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.ru.yml
@@ -0,0 +1,11 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ru:
+  site_settings:
+    discourse_local_dates_default_formats: "Часто используемые форматы даты и времени, см.: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>формат строки momentjs</a>"
+    discourse_local_dates_default_timezones: "Список часовых поясов по умолчанию должен быть допустимым <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a>"
diff --git a/plugins/discourse-local-dates/config/locales/server.sk.yml b/plugins/discourse-local-dates/config/locales/server.sk.yml
new file mode 100644
index 00000000000..bcc3a93dc5b
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.sk.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sk: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.sl.yml b/plugins/discourse-local-dates/config/locales/server.sl.yml
new file mode 100644
index 00000000000..154d194f86c
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.sl.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sl: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.sq.yml b/plugins/discourse-local-dates/config/locales/server.sq.yml
new file mode 100644
index 00000000000..4526be31621
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.sq.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sq: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.sr.yml b/plugins/discourse-local-dates/config/locales/server.sr.yml
new file mode 100644
index 00000000000..7e57a61dd21
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.sr.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sr: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.sv.yml b/plugins/discourse-local-dates/config/locales/server.sv.yml
new file mode 100644
index 00000000000..fd54901f750
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.sv.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sv: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.te.yml b/plugins/discourse-local-dates/config/locales/server.te.yml
new file mode 100644
index 00000000000..49141baa040
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.te.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+te: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.th.yml b/plugins/discourse-local-dates/config/locales/server.th.yml
new file mode 100644
index 00000000000..7ed98e15d8c
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.th.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+th: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.tr_TR.yml b/plugins/discourse-local-dates/config/locales/server.tr_TR.yml
new file mode 100644
index 00000000000..00efffd6707
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.tr_TR.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+tr_TR: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.uk.yml b/plugins/discourse-local-dates/config/locales/server.uk.yml
new file mode 100644
index 00000000000..3acfff74e88
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.uk.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+uk: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.ur.yml b/plugins/discourse-local-dates/config/locales/server.ur.yml
new file mode 100644
index 00000000000..c7dda360220
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.ur.yml
@@ -0,0 +1,11 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ur:
+  site_settings:
+    discourse_local_dates_default_formats: "اکثر استعمال ہونے والے تاریخ ٹائم فارمیٹس، دیکھیے: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs سٹرِنگ فارمَیٹ</a>"
+    discourse_local_dates_default_timezones: "ٹائم زَونَوں کی ڈِیفالٹ فہرست، ایک درست <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a> ہونا لازمی ہے"
diff --git a/plugins/discourse-local-dates/config/locales/server.vi.yml b/plugins/discourse-local-dates/config/locales/server.vi.yml
new file mode 100644
index 00000000000..fa809fe162c
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.vi.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+vi: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.zh_CN.yml b/plugins/discourse-local-dates/config/locales/server.zh_CN.yml
new file mode 100644
index 00000000000..53c9902287c
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.zh_CN.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+zh_CN: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.zh_TW.yml b/plugins/discourse-local-dates/config/locales/server.zh_TW.yml
new file mode 100644
index 00000000000..92c18de9aec
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.zh_TW.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+zh_TW: {}
diff --git a/plugins/discourse-local-dates/config/settings.yml b/plugins/discourse-local-dates/config/settings.yml
new file mode 100644
index 00000000000..4f968f7cece
--- /dev/null
+++ b/plugins/discourse-local-dates/config/settings.yml
@@ -0,0 +1,12 @@
+plugins:
+  discourse_local_dates_enabled:
+    default: true
+    client: true
+  discourse_local_dates_default_formats:
+    default: "LLL|LTS|LL|LLLL"
+    client: true
+    type: list
+  discourse_local_dates_default_timezones:
+    default: "Europe/Paris|America/Los_Angeles"
+    client: true
+    type: list
diff --git a/plugins/discourse-local-dates/lib/discourse_local_dates/engine.rb b/plugins/discourse-local-dates/lib/discourse_local_dates/engine.rb
new file mode 100644
index 00000000000..ee920f06176
--- /dev/null
+++ b/plugins/discourse-local-dates/lib/discourse_local_dates/engine.rb
@@ -0,0 +1,8 @@
+module ::DiscourseLocalDates
+  PLUGIN_NAME = "discourse-local-dates"
+
+  class Engine < ::Rails::Engine
+    engine_name DiscourseLocalDates::PLUGIN_NAME
+    isolate_namespace DiscourseLocalDates
+  end
+end
diff --git a/plugins/discourse-local-dates/plugin.rb b/plugins/discourse-local-dates/plugin.rb
new file mode 100644
index 00000000000..f027e75b5f5
--- /dev/null
+++ b/plugins/discourse-local-dates/plugin.rb
@@ -0,0 +1,25 @@
+# name: discourse-local-dates
+# about: Display a date in your local timezone
+# version: 0.1
+# author: Joffrey Jaffeux
+hide_plugin if self.respond_to?(:hide_plugin)
+
+register_asset "javascripts/discourse-local-dates.js"
+register_asset "stylesheets/common/discourse-local-dates.scss"
+register_asset "moment.js", :vendored_core_pretty_text
+register_asset "moment-timezone.js", :vendored_core_pretty_text
+
+enabled_site_setting :discourse_local_dates_enabled
+
+after_initialize do
+  on(:reduce_cooked) do |fragment|
+    container = fragment.css(".discourse-local-date").first
+
+    if container && container.attributes["data-email-preview"]
+      preview = container.attributes["data-email-preview"].value
+      container.content = preview
+    end
+  end
+end
+
+load File.expand_path('../lib/discourse_local_dates/engine.rb', __FILE__)
diff --git a/plugins/discourse-local-dates/spec/lib/pretty_text_spec.rb b/plugins/discourse-local-dates/spec/lib/pretty_text_spec.rb
new file mode 100644
index 00000000000..f81f8084f99
--- /dev/null
+++ b/plugins/discourse-local-dates/spec/lib/pretty_text_spec.rb
@@ -0,0 +1,37 @@
+require 'rails_helper'
+
+describe PrettyText do
+  it 'supports inserting date' do
+    freeze_time
+    cooked = PrettyText.cook <<~MD
+      [date=2018-05-08 time=22:00 format=LLL timezones="Europe/Paris|America/Los_Angeles"]
+    MD
+
+    expect(cooked).to include('class="discourse-local-date"')
+    expect(cooked).to include('data-date="2018-05-08"')
+    expect(cooked).to include('data-format="LLL"')
+    expect(cooked).to include('data-timezones="Europe/Paris|America/Los_Angeles"')
+    expect(cooked).to include('May 8, 2018 3:00 PM (America: Los Angeles)')
+    expect(cooked).to include('May 9, 2018 12:00 AM (Europe: Paris)')
+  end
+
+  it 'uses a simplified syntax in emails' do
+    freeze_time
+    cooked = PrettyText.cook <<~MD
+      [date=2018-05-08 time=22:00 format=LLL timezones="Europe/Paris|America/Los_Angeles"]
+    MD
+    cooked_mail = <<~HTML
+      <p><span class="discourse-local-date" data-date="2018-05-08" data-time="22:00" data-format="LLL" data-timezones="Europe/Paris|America/Los_Angeles" data-email-preview="May 9, 2018 12:00 AM (Europe: Paris)">May 9, 2018 12:00 AM (Europe: Paris)</span></p>
+    HTML
+
+    expect(PrettyText.format_for_email(cooked)).to match_html(cooked_mail)
+  end
+
+  it 'needs attributes to convert to a local date' do
+    cooked = PrettyText.cook <<~MD
+      [date]
+    MD
+
+    expect(cooked).to include("<p>[date]</p>")
+  end
+end
diff --git a/plugins/discourse-narrative-bot/jobs/bot_input.rb b/plugins/discourse-narrative-bot/autoload/jobs/bot_input.rb
similarity index 100%
rename from plugins/discourse-narrative-bot/jobs/bot_input.rb
rename to plugins/discourse-narrative-bot/autoload/jobs/bot_input.rb
diff --git a/plugins/discourse-narrative-bot/jobs/narrative_init.rb b/plugins/discourse-narrative-bot/autoload/jobs/narrative_init.rb
similarity index 100%
rename from plugins/discourse-narrative-bot/jobs/narrative_init.rb
rename to plugins/discourse-narrative-bot/autoload/jobs/narrative_init.rb
diff --git a/plugins/discourse-narrative-bot/jobs/narrative_timeout.rb b/plugins/discourse-narrative-bot/autoload/jobs/narrative_timeout.rb
similarity index 100%
rename from plugins/discourse-narrative-bot/jobs/narrative_timeout.rb
rename to plugins/discourse-narrative-bot/autoload/jobs/narrative_timeout.rb
diff --git a/plugins/discourse-narrative-bot/jobs/onceoff/grant_badges.rb b/plugins/discourse-narrative-bot/autoload/jobs/onceoff/grant_badges.rb
similarity index 100%
rename from plugins/discourse-narrative-bot/jobs/onceoff/grant_badges.rb
rename to plugins/discourse-narrative-bot/autoload/jobs/onceoff/grant_badges.rb
diff --git a/plugins/discourse-narrative-bot/jobs/onceoff/remap_old_bot_images.rb b/plugins/discourse-narrative-bot/autoload/jobs/onceoff/remap_old_bot_images.rb
similarity index 100%
rename from plugins/discourse-narrative-bot/jobs/onceoff/remap_old_bot_images.rb
rename to plugins/discourse-narrative-bot/autoload/jobs/onceoff/remap_old_bot_images.rb
diff --git a/plugins/discourse-narrative-bot/jobs/send_default_welcome_message.rb b/plugins/discourse-narrative-bot/autoload/jobs/send_default_welcome_message.rb
similarity index 100%
rename from plugins/discourse-narrative-bot/jobs/send_default_welcome_message.rb
rename to plugins/discourse-narrative-bot/autoload/jobs/send_default_welcome_message.rb
diff --git a/plugins/discourse-narrative-bot/client.sr.yml b/plugins/discourse-narrative-bot/client.sr.yml
deleted file mode 100644
index d1c20b0756a..00000000000
--- a/plugins/discourse-narrative-bot/client.sr.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-sr:
-  js:
-    discourse_narrative_bot:
-      welcome_post_type:
-        new_user_track: "Započni korisnički tutorijal za sve nove korisnike"
-        welcome_message: "Pošalji svim novim korisnicima poruku dobrodošlice sa kratkim uputstvom za početnike"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.bg.yml b/plugins/discourse-narrative-bot/config/locales/client.bg.yml
new file mode 100644
index 00000000000..f5a2030170f
--- /dev/null
+++ b/plugins/discourse-narrative-bot/config/locales/client.bg.yml
@@ -0,0 +1,13 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+bg:
+  js:
+    discourse_narrative_bot:
+      welcome_post_type:
+        new_user_track: "Стартирай урока за нови потребители за всеки нов потребител."
+        welcome_message: "Изпращайте съобщение с насоки за бързо стартиране на всички нови потребители"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.fa_IR.yml b/plugins/discourse-narrative-bot/config/locales/client.fa_IR.yml
index bae00c47917..7b126f2a6c1 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.fa_IR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.fa_IR.yml
@@ -10,4 +10,4 @@ fa_IR:
     discourse_narrative_bot:
       welcome_post_type:
         new_user_track: "شروع برنامه آموزشی کاربر جدید برای تمام کاربران جدید"
-        welcome_message: "برای تمام کاربران جدید پیام خوش آمدید به همراه راهنمای شروع سریع بفرست"
+        welcome_message: "برای تمام کاربران جدید پیام \"خوش آمدید\" به همراه راهنمای \"شروع سریع\" بفرست"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.ro.yml b/plugins/discourse-narrative-bot/config/locales/client.ro.yml
index 31d1c440135..43a7a03b6ca 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.ro.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.ro.yml
@@ -5,4 +5,9 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-ro: {}
+ro:
+  js:
+    discourse_narrative_bot:
+      welcome_post_type:
+        new_user_track: "Pornește tutorialul pentru toți utilizatorii noi"
+        welcome_message: "Trimite tuturor utilizatorilor noi un mesaj de întâmpinare cu un ghid de pornire rapidă"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.sl.yml b/plugins/discourse-narrative-bot/config/locales/client.sl.yml
new file mode 100644
index 00000000000..c8f11a5bf0b
--- /dev/null
+++ b/plugins/discourse-narrative-bot/config/locales/client.sl.yml
@@ -0,0 +1,13 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sl:
+  js:
+    discourse_narrative_bot:
+      welcome_post_type:
+        new_user_track: "Začni nov uvodni vodič za vse nov uporabnike"
+        welcome_message: "Pošlji dobrodošlico s kratkimi uvodnimi navodili vsem novim uporabnikom"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.ur.yml b/plugins/discourse-narrative-bot/config/locales/client.ur.yml
index 58bc9735bcb..9e323b52791 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.ur.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.ur.yml
@@ -5,4 +5,9 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-ur: {}
+ur:
+  js:
+    discourse_narrative_bot:
+      welcome_post_type:
+        new_user_track: "تمام نئے صارفین کے لئے نیا صارف ٹیوٹوریل شروع کریں"
+        welcome_message: "تمام نئے صارفین کو جلدی سے شروعات کرنے کے ٹیوٹوریل کے ساتھ خوش آمدید کا پیغام بھیجیں"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ar.yml b/plugins/discourse-narrative-bot/config/locales/server.ar.yml
index 6d6c2f499ef..5f5194a03bd 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ar.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ar.yml
@@ -284,12 +284,6 @@ ar:
         reply: |-
           رائع! تذكر ان هذا يعمل مع الاقسام و الوسوم, اذا كانت خاصية الوسوم مفعلة بالموقع.
       change_topic_notification_level:
-        instructions: |-
-          لكل موضوع مستوي من الإشعارات. تبدأ بالوضع **العادي** حيث يتم اشعارك فقط عندما يشير احدهم اليك بشكل مباشر.
-
-          بشكل افتراضي مستوي الإشعارات للرسائل الخاصة مضبوطة علي الوضع **مراقب** حيث يتم اشعارك بكل رد جديد لكن يمكنك تعديل مستوي الإشعارات _لاي_ موضوع الي ** "مراقب" او "متابع" او "عادي" او "مكتوم" **.
-
-          دعنا نحاول تغيير مستوي الاشعارات لهذا الموضوع. في نهاية الموضوع ستجد زر مكتوب علية **مراقب**. هل يمكنك الضغط علية و اختيار الوضع **متابع**؟
         not_found: |-
           يبدوا انك ماذلت تراقب :eyes: هذا الموضوع! اذا واجهت مشكلة في إجاد رز مستوي الإشعارات. قم بالنزول إلي نهاية الصفحة علي اليمين, ستجدة هناك
         reply: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.bg.yml b/plugins/discourse-narrative-bot/config/locales/server.bg.yml
new file mode 100644
index 00000000000..f9519432a82
--- /dev/null
+++ b/plugins/discourse-narrative-bot/config/locales/server.bg.yml
@@ -0,0 +1,18 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+bg:
+  site_settings:
+    discourse_narrative_bot_enabled: 'Включете Дискорс бот-а'
+  badges:
+    certified:
+      long_description: |
+        Тази значка се присъжда при успешното преминаване на интерактивното обучение за нови потребители. Вие поехте инциативата да научите основните инструменти на дискусията и сега сте сертифицирани за това.
+  discourse_narrative_bot:
+    new_user_narrative:
+      hello:
+        title: ":robot: Привет!"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ca.yml b/plugins/discourse-narrative-bot/config/locales/server.ca.yml
index 394c6e6c7ab..d563613d13a 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ca.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ca.yml
@@ -221,7 +221,7 @@ ca:
           Seleccionant qualsevol text de la meva publicació farà que aparegui el botó <kbd>**Cita**</kbd>. També funcionarà clicant **Resposta** amb qualsevol text seleccionat. Pots tornar-ho a provar?
       bookmark:
         instructions: |-
-          Si vols saber-ne més, selecciona <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> a sota i <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **marca aquest missatge privat**. Si ho fas, potser tindràs un :gift: més endavant!
+          Si vols saber-ne més, selecciona <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> a sota i <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **marca com a preferit aquest missatge privat**. Si ho fas, potser tindràs un :gift: més endavant!
         reply: |-
           Fantàstic! Ara pots trobar fàcilment com tornar a la nostra conversa privada en qualsevol moment, exactament des de [la pestanya de favorits del teu perfil](%{profile_page_url}/activity/bookmarks). Només has de seleccionar la teva imatge de perfil a la part superior dreta &#8599;
         not_found: |-
@@ -392,14 +392,14 @@ ca:
         instructions: |-
           A vegades potser voldràs **amagar detalls** a les teves respostes:
 
-          - Quan estiguis debatent punts de la trama d'una pel·lícula o programa de televisió que podría ser considerat un spoiler.
+          - Quan estiguis debatent punts de la trama d'una pel·lícula o programa de televisió que podría ser considerat una filtració.
 
-          - Quan la teva publicació necessita molts detalls opcionals que puguin resultar aclaparadors quan es llegeixin alhora
+          - Quan la teva publicació necessita molts detalls opcionals que puguin resultar aclaparadors quan es llegeixin alhora.
 
-          [details = Selecciona-ho per veure com funciona!] 「
-          1. Selecciona l'engranatge<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> a l'editor
-          2. Selecciona "Amaga els detalls"
-          3. Edita el resum de les dades i afegeix el teu contingut
+          [details = Selecciona-ho per veure com funciona!]
+          1. Selecciona l'engranatge <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> a l'editor.
+          2. Selecciona "Amaga els detalls".
+          3. Edita el resum de les dades i afegeix el teu contingut.
           [/ detalls]
 
           Pots utilitzar l'engranatge <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> a l'editor per afegir una secció de detalls a la seva pròxima resposta?
diff --git a/plugins/discourse-narrative-bot/config/locales/server.cs.yml b/plugins/discourse-narrative-bot/config/locales/server.cs.yml
index a7647ca2610..ab8ec878be3 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.cs.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.cs.yml
@@ -7,7 +7,7 @@
 
 cs:
   site_settings:
-    discourse_narrative_bot_enabled: 'Zapnonut Discourse robota průvodce'
+    discourse_narrative_bot_enabled: 'Zapnout Discourse robota průvodce'
     disable_discourse_narrative_bot_welcome_post: "Vypnout uvítací příspěvek od Discourse robota průvodce"
     discourse_narrative_bot_ignored_usernames: "Uživatelská jména, která by měl Discourse robot průvodce ignorovat"
     discourse_narrative_bot_disable_public_replies: "Vypnout veřejné odpovědi Discourse robota průvodce"
@@ -59,12 +59,16 @@ cs:
         quote: "Neplačte proto, že je po všem, radujte se, protože se to stalo."
         author: "Dr Seuss"
       '4':
+        quote: "Pokud chcete udělat nějakou správnou věc, tak ji udělejte sami."
         author: "Charles-Guillaume Étienne"
       '5':
+        quote: "Věř tomu, že na to máš, a budeš na půli cesty k úspěchu."
         author: "Theodore Roosevelt"
       '6':
+        quote: "Život je jako bonboniéra, nikdy nevíš, co ochutnáš."
         author: "Máma Forresta Gumpa"
       '7':
+        quote: "Je to malý krůček pro člověka, ale velký skok pro lidstvo."
         author: "Neil Armstrong"
       '8':
         author: "Eleanor Roosevelt"
@@ -87,7 +91,7 @@ cs:
         '9': "Ano"
         '10': "Dle znamení ano"
         '11': "Odpověď nejistá, zeptej se znovu"
-        '12': "Zeptej se jindy"
+        '12': "Zeptej se později"
         '13': "To ti teď raději neřeknu"
         '14': "To nyní nedokážu předpovědět"
         '15': "Soustřeď se a zeptej se znovu"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.de.yml b/plugins/discourse-narrative-bot/config/locales/server.de.yml
index 20345d59f21..48a53602645 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.de.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.de.yml
@@ -175,7 +175,7 @@ de:
 
           <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
 
-          Wenn du es magst (und wer würde das nicht), gehe voran und drücke die „Gefällt mir“-Schaltfläche :hear: unter diesem Beitrag, um mich dies wissen zu lassen.
+          Wenn du es magst (und wer würde das nicht), gehe voran und drücke die „Gefällt mir“-Schaltfläche :heart: unter diesem Beitrag, um mich dies wissen zu lassen.
 
           Kannst du **mit einem Bild antworten?** Welches Bild spielt keine Rolle! Ziehe das Bild einfach ins Fenster, drücke die Hochladen-Schaltfläche, oder kopiere und füge es ein.
         reply: |-
@@ -222,7 +222,7 @@ de:
           Das Auswählen von beliebigem Text in meinem Beitrag lässt die <kbd>**Zitat**</kbd>-Schaltfläche erscheinen. Und das Drücken von **Antworten** mit einem beliebigen ausgewählten Text wird auch funktionieren! Kannst du es nochmal versuchen?
       bookmark:
         instructions: |-
-          Wenn du gerne mehr lernen würdest, wähle <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> unten und <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **Lesezeichen auf diese Nachricht setzen**.  Wenn du das macht, gibt es vielleicht ein :gift: in deiner Zukunft!
+          Wenn du gerne mehr darüber erfahren möchtest, wähle unten <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">   aus und klicke auf <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **Lesezeichen für diese Nachricht**.  Wenn du das machst, wird es demnächst vielleicht ein :gift: geben!
         reply: |-
           Hervorragend! Jetzt kannst du jederzeit über [den Lesezeichen-Reiter in deinem Profil](%{profile_page_url}/activity/bookmarks) zu unserer Unterhaltung zurückkehren. Gehe dazu einfach auf dein Profilbild oben rechts &#8599;.
         not_found: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.el.yml b/plugins/discourse-narrative-bot/config/locales/server.el.yml
index 0c7daab39fa..1035daeaa56 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.el.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.el.yml
@@ -221,8 +221,6 @@ el:
 
           Επιλέγοντας ένα τμήμα από το κείμενο της ανάρτησής μου, εμφανίζεται το κουμπί <kbd>**Παράθεση**</kbd>. Επίσης πατώντας **Απάντηση** έχωντας πρώτα επιλέξει ένα τμήμα του κειμένου, είναι το ίδιο! Μπορείς να δοκιμάσεις ξανά;
       bookmark:
-        instructions: |-
-          Αν θέλεις να μάθεις περισσότερα, διάλεξε <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> παρακάτω και <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **πρόσθεσε σελιδοδείκτη στο ΠΜ**.  Αν το κάνεις, θα λάβεις ένα :gift: σύντομα!
         reply: |-
           Καταπληκτικά! Τώρα μπορείς εύκολα να επιστρέψεις στην συνομιλία μας όποτε θελήσεις, απευθείας από [την καρτέλα σελιδοδεικτών του προφίλ σου](%{profile_page_url}/activity/bookmarks). Απλά κάνε κλικ στην εικόνα προφίλ σου στην πάνω δεξιά πλευρά &#8599;
         not_found: |-
@@ -357,12 +355,6 @@ el:
         reply: |-
           Άψογα! Να θυμάσαι ότι αυτό λειτουργεί για κατηγορίες _και_ ετικέττες, αν οι ετικέττες είναι ενεργές.
       change_topic_notification_level:
-        instructions: |-
-          Κάθε νήμα έχει το δικό του επίπεδο ειδοποιήσεων. Ξεκινάει στο 'φυσιολογικό', το οποίο σημαίνει ότι κανονικά θα λάβεις ειδοποίηση μόνο αν κάποιος μιλήσει απευθείας σε σένα.
-
-          Από προεπιλογή, το επίπεδο ειδοποιήσεων στα προσωπικά μηνύματα είναι ορισμένο στο ανώτερο επίπεδο το 'επιτηρείται', το οποίο σημαίνει ότι θα λαμβάνεις ειδοποίηση για κάθε νέα απάντηση. Μπορείς όμως να αλλάξεις το επίπεδο ειδοποιήσεων για _κάθε_ νήμα σε 'επιτηρείται', 'παρακολουθείται' ή 'σε σιγή'.
-
-          Ας δοκιμάσουμε να αλλάξουμε το επίπεδο ειδοποιήσεων σε αυτό το νήμα. Στο κάτω μέρος του νήματος, θα βρεις το κουμπί το οποίο δείχνει ότι το νήμα **επιτηρείται**. Μπορείς να αλλάξεις το επίπεδο ειδοποιήσεων σε **παρακολουθείται**;
         not_found: |-
           Δείχνει ότι ακόμα επιτηρείς :eyes: αυτό το νήμα! Αν δεν μπορείς να βρεις το κουμπί επιπέδου ειδοποιήσεων, αυτό βρίσκεται στο κάτω μέρος του νήματος.
         reply: |-
@@ -391,20 +383,6 @@ el:
           * :-1:
           [/poll]
       details:
-        instructions: |-
-          Κάποιες στιγμές θέλεις να **κρύψεις λόγια** στις απαντήσεις σου:
-
-          - Όταν συζητούνται λεπτομέρειες από μια ταινία ή μια σειρά και αυτά που γράφεις μπορεί να θεωρηθούν σπόιλερ.
-
-          - Όταν η ανάρτησή σου περιλαμβάνει πολλές προεραιτικές πληροφορίες οι οποίες θα είναι πιθανώς κουραστικές αν διαβαστούν με την μία.
-
-          [details=Πάτα εδώ για να δεις πως λειτουργεί!]
-          1. Διάλεξε το <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> γρανάζι στον editor.
-          2. Επίλεξε "κρυφό τμήμα".
-          3. Επεξεργάσου τον τίτλο των λεπτομερειών και πρόσθεσε το περιεχόμενό σου.
-          [/details]
-
-          Μπορείς να πατήσεις το <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> γρανάζι στον editor και να προσθέσεις ένα κρυφό τμήμα στην επόμενη απάντησή σου;
         not_found: |-
           Έχεις πρόβλημα να προσθέσεις ένα κρυφό τμήμα στην απάντησή σου; Προσπάθησε να συμπεριλάβεις τα παρακάτω στην απάντησή σου:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.en.yml b/plugins/discourse-narrative-bot/config/locales/server.en.yml
index da2fd0c677e..05a5c72b2f2 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.en.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.en.yml
@@ -233,7 +233,7 @@ en:
 
       bookmark:
         instructions: |-
-          If you’d like to learn more, select <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> below  and <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **bookmark this private message**.  If you do, there may be a :gift: in your future!
+          If you’d like to learn more, select <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> below  and <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **bookmark this personal message**.  If you do, there may be a :gift: in your future!
         reply: |-
           Excellent! Now you can easily find your way back to our private conversation any time, right from [the bookmarks tab on your profile](%{profile_page_url}/activity/bookmarks). Just select your profile picture at the upper right &#8599;
         not_found: |-
@@ -385,7 +385,7 @@ en:
         instructions: |-
           Every topic has a notification level. It starts at 'normal', which means you’ll normally only be notified when someone is speaking directly to you.
 
-          By default, the notification level for a private message is set to the highest level of 'watching', which means you you’ll be notified of every new reply.  But you can override the notification level for _any_ topic to 'watch', 'tracking' or 'muted'.
+          By default, the notification level for a private message is set to the highest level of 'watching', which means you’ll be notified of every new reply.  But you can override the notification level for _any_ topic to 'watch', 'tracking' or 'muted'.
 
           Let’s try changing the notification level for this topic. At the bottom of the topic, you’ll find a button which shows that you’re **watching** this topic. Can you change the notification level to **tracking**?
         not_found: |-
@@ -420,7 +420,7 @@ en:
         instructions: |-
           Sometimes you may wish to **hide details** in your replies:
 
-          - When you’re discussing plot points of a movie or TV show that would be a considered a spoiler.
+          - When you’re discussing plot points of a movie or TV show that would be considered a spoiler.
 
           - When your post needs lots of optional details that may be overwhelming when read all at once.
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.es.yml b/plugins/discourse-narrative-bot/config/locales/server.es.yml
index a36baf17416..6c25fdcc0fe 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.es.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.es.yml
@@ -25,7 +25,7 @@ es:
       long_description: |
         Este distintivo se otorga a quienes han completado el tutorial de usuario avanzado. Has dominado las herramientas avanzadas de discusión — y ahora tú eres un licenciado!
   discourse_narrative_bot:
-    bio: "Hola, no soy una persona real. Soy un bot que puede enseñarte sobre este sitio. Para interactuar conmigo, envíame un mensaje o menciona **`@%{discobot_username}`** en cualquier lugar."
+    bio: "Hola, no soy una persona real. Soy un bot que puede enseñarte sobre este sitio. Para interactuar conmigo, me envías un mensaje o me mencionas **`@%{discobot_username}`** en cualquier lugar."
     timeout:
       message: |-
         Hey @%{username}, solo estoy verificando si estás porque no he oído de tí en un tiempo.
@@ -111,9 +111,9 @@ es:
       help_trigger: 'mostrar ayuda'
       random_mention:
         reply: |-
-          ¡Hola! Para ver lo que puedo hacer, di `@%{discobot_username} %{help_trigger}`.
+          ¿Alguien me llamó? Averigua qué puedo hacer con `@%{discobot_username} %{help_trigger}`.
         tracks: |-
-          Ahora mismo puedo hacer lo siguiente:
+          Hola! Estoy conociendo cómo hacer las siguientes cosas:
 
           `@%{discobot_username} %{reset_trigger} %{default_track}`
           > Inicia una de las siguientes narraciones interactivas: %{tracks}.
@@ -128,11 +128,11 @@ es:
           > :crystal_ball: No se puede predecir ahora
       do_not_understand:
         first_response: |-
-          Oye, ¡gracias por tu respuesta!
+          Hey, gracias por tu respuesta!
           Lamentablemente, como un robot con programación muy pobre, no he podido entender lo que me has dicho. :frowning:
         track_response: Puedes intentarlo de nuevo, o bien para saltar este paso, dime `%{skip_trigger}`. Para empezar de nuevo, dime `%{reset_trigger}`.
         second_response: |-
-          Vaya, lo siento. Sigo sin entenderlo. :anguished:
+          Aw, lo siento. Sigo sin entenderlo. :anguished:
 
           Soy solo un robot, pero si quieres contactar a una persona real, mira [nuestra página de contacto](/about).
 
@@ -141,29 +141,29 @@ es:
       reset_trigger: "usuario nuevo"
       cert_title: "En reconocimiento de la finalización exitosa del tutorial de usuario nuevo"
       hello:
-        title: ":robot: ¡Saludos!"
+        title: ":robot: Saludos!"
         message: |-
-          Gracias por unirte a %{title}, ¡te damos la bienvenida!
+          Gracias por unirte a %{title}, y bienvenido!
 
           - Soy solo un robot, pero [nuestro amigable staff](/about) está también aquí para ayudar si necesitas contactar a una persona.
 
-          - Por razones de seguridad, limitamos temporalmente lo que los nuevos usuarios pueden hacer. Podrás ganar nuevas habilidades (y [distintivos](/badges)) conforme te vayamos conociendo.
+          - Por razones de seguridad, nosotros temporalmente limitamos lo que los nuevos usuarios pueden hacer. Tú podrás ganar nuevas habilidades (y [distintivos](/badges)) cuando te vayamos conociendo.
 
-          - Creemos en el [comportamiento de una comunidad civilizada](/guidelines) en todo momento.
+          - Nosotros creemos en el [comportamiento de una comunidad civilizada](/guidelines) en todo momento.
       onebox:
         instructions: |-
-          Ahora, ¿puedes compartir uno de estos enlaces conmigo? Responde con **el enlace propiamente dicho**, y automáticamente se expandirá con un breve resumen.
-          Para copiar un enlace, toca y mantén presionado en el móvil, o haz clic derecho con tu ratón:
+          Ahora, tú puedes compartir uno de estos enlaces conmigo? Responde con **el enlace propiamente dicho**, y automáticamente se expandirá con un breve resumen.
+          Para copiar un enlace, toca y mantiene presionado en el móvil, o haz clic derecho con tu mouse:
 
           - https://en.wikipedia.org/wiki/Inherently_funny_word
           - https://en.wikipedia.org/wiki/Death_by_coconut
           - https://en.wikipedia.org/wiki/Calculator_spelling
         reply: |-
-          ¡Genial! Esto funcionará en la mayoría de los <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> enlaces. Recuerda que el enlace debe ser colocado  en una _linea aparte_, sin texto ni espacios delante ni detrás del enlace.
+          ¡Genial! Esto funcionará en la mayoría de los <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> enlaces. Recuerda que debe ser colocado el enlace en una _linea aparte_, sin texto ni espacios delante ni atrás del enlace.
         not_found: |-
           Disculpa, ¡no he podido encontrar el enlace en tu respuesta! :cry:
 
-          ¿Puedes intentar agregar el siguiente enlace, en una línea aparte, en tu siguiente respuesta?
+          Puedes intentar agregar el siguiente enlace, en una línea aparte, en tu siguiente respuesta?
 
           <https://en.wikipedia.org/wiki/Exotic_Shorthair>
       images:
@@ -172,33 +172,33 @@ es:
 
           <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
 
-          Si te gusta (y a quién no) presiona el botón "me gusta" :heart: debajo del mensaje para hacerme saber que te ha gustado.
+          Si te gusta (y a quién no) presiona el botón "me gusta" :heart: debajo del post para hacerme saber que te ha gustado.
 
-          ¿Puedes **responder con otra imagen??** ¡Cualquier imagen! Arrastra y suelta la imagen desde tu PC al editor, o bien pulsa el botón de subir imagen, o también puedes copiar y pegar la imagen al editor!
+          ¿Puedes **responder con otra imagen??** ¡Cualquier imagen! Arrastra y suelta la imagen desde tu PC al editor, o bien presiona el botón de subir imagen, o también puedes copiar y pegar la imagen al editor!
         reply: |-
-          Elegante imagen – Le he dado al botón :heart: "Me gusta" para hacerte saber cuánto la aprecio :heart_eyes:
+          Elegante imagen – He presionado el botón :heart: "me gusta" para hacerte saber cuánto la aprecio :heart_eyes:
         like_not_found: |-
-          ¿Te olvidaste de dar "me gusta" :heart: a mi [post?](%{url}) :crying_cat_face:
+          Te olvidaste de dar "me gusta" :heart: a mi [post?](%{url}) :crying_cat_face:
         not_found: |-
-          Parece que no has subido ninguna imagen, así que he elegido una imagen que estoy _seguro_ que disfrutarás.
+          Parece que no subiste ninguna imagen, así que he elegido una imagen que estoy _seguro_ que disfrutarás.
           `%{image_url}`
           Trata de subir esta ahora, o bien copia el enlace de la imagen y pega el mismo en una única línea dentro del mensaje!
       formatting:
         instructions: |-
-          ¿Puedes poner algunas letras en **negrita** o _cursiva_ en tu respuesta?
+          ¿Puedes hacer algunas letras en **negrita** o _cursiva_ en tu respuesta?
 
           - escribe `**negrita**` o `_cursiva_`
 
-          - o, pulsa los botones <kbd><b>B</b></kbd> o <kbd><i>I</i></kbd> en el editor
+          - o, presiona los botones <kbd><b>B</b></kbd> o <kbd><i>I</i></kbd> en el editor
         reply: |-
-          ¡Buen trabajo! HTML y BBCode también funcionan para darle formato al texto – aprende más en [este tutorial](http://commonmark.org/help) :nerd:
+          Buen trabajo! HTML y BBCode también funcionan para darle formato al texto – aprende más en, [este tutorial](http://commonmark.org/help) :nerd:
         not_found: |-
-          Vaya, no he encontrado ningún texto con formato en tu respuesta. :pencil2:
+          Aww, no encontré ningún texto con formato en tu respuesta. :pencil2:
 
-          ¿Lo puedes intentar de nuevo? Usa los botones <kbd><b>B</b></kbd> para negrita o <kbd><i>I</i></kbd> para cursiva en el editor si no recuerdas cómo darle formato al texto.
+          Puedes intentar de nuevo? Usa los botones <kbd><b>B</b></kbd> para negrita o <kbd><i>I</i></kbd> para cursiva en el editor si no recuerdas cómo formatear texto.
       quoting:
         instructions: |-
-          ¿Puedes intentar citarme cuando me respondas, así sé exactamente a qué parte me estás respondiendo?
+          ¿Puedes intentar citarme cuando me respondes, así sé exactamente en qué parte me estás respondiendo?
           > Si esto es café, por favor trae un poco de té; pero si es té, por favor trae un poco de café.
           >
           > Una de las ventajas de hablarse a sí mismo, es que tú sabes que al menos alguien está oyendo.
@@ -207,22 +207,22 @@ es:
 
           Selecciona la parte del texto &uarr; que prefieres citar, y luego presiona el botón **citar** que aparece sobre tu selección del texto – o presiona el botón **Responder** debajo de este post.
 
-          Debajo de la cita, escribe una palabra o dos sobre por qué has escogido esa cita, que tengo curiosidad :thinking:
+          Debajo de la cita, escribe una palabra o dos sobre lo que escribí, porque soy curioso :thinking:
         reply: |-
-          Buen trabajo, ¡has elegido mi cita favorita! :left_speech_bubble:
+          Buen trabajo, elegiste mi cita favorita! :left_speech_bubble:
         not_found: |-
-          Hmm, ¿me parece que no me has citado en tu respuesta?
+          Hmm me parece que no me has citado en tu respuesta!?
           Seleccionando cualquier texto de mi mensaje, aparecerá la palabra <kbd>**Citar**</kbd>, como si fuese un botón. Y si decides presionar **Responder** habiendo seleccionado el texto, funcionará igual! ¿Puedes intentarlo de nuevo?
       bookmark:
         instructions: |-
-          Si quieres aprender más, selecciona <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> y <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **guarda como favorito este mensaje privado**.  Si lo haces, ¡podrá haber un  :gift: en tu futuro!
+          Si quieres aprender más, selecciona debajo el botón <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> y <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **marca como favorito este mensaje personal**.  Si lo haces, ¡puede haber un :gift: en tu futuro!
         reply: |-
-          ¡Excelente! Ahora puedes encontrar fácilmente las conversaciones privadas en cualquier momento, desde la [sección de marcadores de tu perfil](%{profile_page_url}/activity/bookmarks). Sólo debes seleccionar la foto de tu perfil en la parte superior derecha de la pantalla &#8599;
+          Excelente! Ahora puedes encontrar fácilmente las conversaciones privadas en cualquier momento, desde la [sección de marcadores de tu perfil](%{profile_page_url}/activity/bookmarks). Sólo debes seleccionar la foto de tu perfil en la parte superior derecha de la pantalla &#8599;
         not_found: |-
-          Oh, oh,  no veo ningún mensaje guardado en este tema. ¿Encontraste el botón para guardar debajo de cada mensaje?  Usa el mostrar más <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> para que aparezcan acciones adicionales si necesitas.
+          Uh oh,  no veo ningún mensaje guardado en este tema. ¿Encontraste el botón para guardar debajo de cada mensaje?  Usa el mostrar más <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> para que aparezcan acciones adicionales si necesitas.
       emoji:
         instructions: |-
-          A lo mejor me has visto usar pequeñas imágenes en mis respuestas :blue_car::dash: estos se llaman [emoji](https://es.wikipedia.org/wiki/Emoji). ¿Puedes **añadir un emoji** a tu próxima respuesta? Cualquiera de estos funcionará:
+          Me has visto usando pequeñas imágenes en mis respuestas :blue_car::dash: estos se llaman [emoji](https://es.wikipedia.org/wiki/Emoji). ¿Puedes **agregar un emoji** a tu próxima respuesta? Cualquiera de éstos funcionará:
 
           - Escribe `:) ;) :D :P :O`
 
@@ -230,21 +230,21 @@ es:
 
           - O bien, presionas el botón <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> en el editor, o usas el teclado de tu móvil
         reply: |-
-          Eso es :sparkles: _¡emojitástico!_ :sparkles:
+          Eso es :sparkles: _emojitastic!_ :sparkles:
         not_found: |-
-          Vaya, ¡no veo ningún Emoji en tu respuesta! ¡Oh, no! :sob:
+          Oops, no veo ningún Emoji en tu respuesta! Oh no! :sob:
 
           Prueba escribiendo primero <kbd>:</kbd> y de esa forma el foro te mostrará emojis para elegir, luego puedes seguir escribiendo el nombre del emoji que quieres seleccionar, por ejemplo `:bird:`
 
-          O, pulsa en botón <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> en el editor.
+          O, presiona en botón <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> en el editor.
 
           (Si estás en un dispositivo móvil, puedes introducir directamente un emoji desde el teclado del dispositivo.)
       mention:
         instructions: |-
-          A veces, quieres captar la atención de alguien en un debate, incluso aunque no le estés respondiendo a su mensaje directamente. Para esto, escribe `@` seguido del nombre del usuario que quieres mencionar.
-          ¿Puedes mencionar **`@%{discobot_username}`** en tu respuesta?
+          A veces, quieres captar la atención de alguien en un debate, incluso aunque no le estés respondiendo a su mensaje directamente. Para ésto, escribe `@` seguido del nombre del usuario que quieres mencionar.
+          Puedes mencionar **`@%{discobot_username}`** en tu respuesta?
         reply: |-
-          _¿¡Alguien ha dicho mi nombre!?_ :raised_hand: Creo que tú lo hiciste! :wave:  Bien, ¡aquí estoy! Gracias por mencionarme.  :ok_hand:
+          _Alguien dijo mi nombre!?_ :raised_hand: Creo que tú lo hiciste! :wave:  Bien, aquí estoy! Gracias por mencionarme.  :ok_hand:
         not_found: |-
           No veo que hayas dicho mi nombre en ningún lugar. :frowning: ¿Puedes intentar mencionarme como `@%{discobot_username}` de nuevo por favor?
 
@@ -349,7 +349,9 @@ es:
       change_topic_notification_level:
         instructions: |-
           Cada tema tiene un nivel de notificación. Comienza en 'normal', lo que significa que normalmente sólo se notificará cuando alguien está hablando directamente con usted.
-          De forma predeterminada, el nivel de notificación de un mensaje privado se establece en el nivel más alto de "observación", lo que significa que se le notificará cada nueva respuesta. Pero puede sobrescribir el nivel de notificación de _cualquier_ tema a 'vigilar', 'seguir' o 'silenciar'.
+
+          De forma predeterminada, el nivel de notificación de un mensaje privado se establece en el nivel más alto de 'observación', lo que significa que se le notificará cada nueva respuesta. Pero puede sobrescribir el nivel de notificación de _cualquier_ tema a 'vigilar', 'seguir' o 'silenciar'.
+
           Intentemos cambiar el nivel de notificación de este tema. Al final del tema, encontrarás un botón que muestra que estás **vigilando** este tema. ¿Puedes cambiar el nivel de notificación a **seguir**?
         not_found: |-
           Parece que aún estás vigilando :eyes: este tema! Si tienes problemas para encontrar el botón del nivel de notificación, el mismo está debajo de todo el tema de debate.
diff --git a/plugins/discourse-narrative-bot/config/locales/server.et.yml b/plugins/discourse-narrative-bot/config/locales/server.et.yml
index 8c601aa1ed9..cf76b5d7058 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.et.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.et.yml
@@ -5,4 +5,23 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-et: {}
+et:
+  badges:
+    licensed:
+      name: Litsenseeritud
+  discourse_narrative_bot:
+    quote:
+      trigger: "tsitaat"
+      '1':
+        author: "Albert Einstein"
+      '3':
+        author: "Dr. Seuss"
+    magic_8_ball:
+      answers:
+        '1': "See on kindel"
+        '3': "Kahtlemata"
+        '4': "Jah, kindlasti"
+        '5': "Võid sellele loota"
+        '7': "Tõenäoliselt"
+        '9': "Jah"
+        '12': "Küsi hiljem uuesti"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml b/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml
index 3fad2994116..cb766a13ec5 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml
@@ -160,6 +160,8 @@ fa_IR:
           - https://en.wikipedia.org/wiki/Inherently_funny_word
           - https://en.wikipedia.org/wiki/Death_by_coconut
           - https://en.wikipedia.org/wiki/Calculator_spelling
+        reply: |-
+          عالی! این کار برای اکثر پیوندها <img src="%{base_uri}/images/font-awesome-link.png" width="16" height="16"> صدق میکنه. به یاد داشته باش که لینک بایستی در یک خط به تنهایی و _بدون پس و پیش_ قرار بگیرد.
         not_found: |-
           متاسفم، نمیتوانم پیوند را در پاسخ شما پیدا کنم! :cry:
 
@@ -167,6 +169,14 @@ fa_IR:
 
           <https://en.wikipedia.org/wiki/Exotic_Shorthair>
       images:
+        instructions: |-
+          این عکسی از اسب تک شاخ است:
+
+          <img src="%{base_uri}/images/unicorn.png" width="520" height="520">
+
+          اگر پسندیدی (کیه که نپسنده!) برای اینکه من بدونم لطفا دکمه‌ی پسند :heart: زیر این نوشته را فشار بده.
+
+          میتونی با **یک عکس پاسخ بدهی؟** هر عکسی بذاری اشکالی نداره. میتونی عکس رو بکشی و رها کنی، یا از گزینه ی آپلود استفاده کنی، یا حتی کپی پیست کنی.
         reply: |-
           عجب عکس شگفت‌انگیزی! من دکمه‌ی پسند :heart: رو برای اینکه بفهمی چقدر قدردان آن هستم، فشار دادم.
         like_not_found: |-
@@ -211,11 +221,31 @@ fa_IR:
 
           هر متنی را که در نوشته‌ی من انتخاب کنی، کلید <kbd>**نقل‌قول**</kbd>را برایت نشان می‌دهد. همچنین انتخاب کلید **پاسخ** بعد از انتخاب متن هم همان کار را می‌کند. می‌توانی یکبار دیگر امتحان کنی؟
       bookmark:
+        instructions: |-
+          اگر می‌خواهی بیشتر یاد بگیری، در زیر <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> و <img src="%{base_uri}/images/font-awesome-bookmark.png" width="16" height="16"> **نشانه‌گذاری این پیام خصوصی** را انتخاب کن. اگر این کار را بکنی، ممکن است هدیه‌ای :gift: در آینده‌ برای شما باشد.
         reply: |-
           عالی! الان تو میتوانی راه برگشت به این پیغام خصوصی را هر زمان که دوست داشتی از [برگه‌ی نشانک‌ها در پروفایل کاربری](%{profile_page_url}/activity/bookmarks)  پیدا کنی. فقط کافی است که روی عکس پروفایل خود در بالا سمت چپ انتخاب کنی &#8598;
+        not_found: |-
+          اوه، هیچ نشانکی در این موضوع نمیبینم. آیا آیکون نشانک را زیر هر نوشته پیدا کردی؟ در صورت لزوم از آیکون "بیشتر نشان بده" <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> برای آشکار کردن دیگر قابلیت ها استفاده کن.
       emoji:
+        instructions: |-
+          شاید دیده باشی که من از عکس‌های کوچکی مثل :blue_car::dash: در پاسخ‌هایم استفاده می‌کنم. اینها [شکلک](https://en.wikipedia.org/wiki/Emoji) نام دارند. آیا می‌توانی که یک شکلک را به پاسخت اضافه کنی؟ هر یک از موارد زیر این کار را میتواند انجام بدهد:
+
+          - بنویس  `:) ;) :O`
+
+          - علامت دونقطه <kbd>:</kbd> را بنویس و سپس اسم شکلک را کامل کن `:tada:`
+
+          - کلیک شکلک <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16"> را در ویرایشگر، یا در صفحه‌کلید موبایلت فشار بده
         reply: |-
           :sparkles: خیلی شکلک شگفت انگیزی بود :sparkles:
+        not_found: |-
+          اوپس، هیچ شکلکی در پاسخت نمیبینم؟ ای وای! :sob:
+
+          سعی کن علامت دونقطه <kbd>:</kbd> رو تایپ کنی تا صفحه‌ی انتخاب شکلک رو باز کنی، سپس اولین حروف چیزی که میخوای را تایپ کن. مانند `:bird:`
+
+          یا کلید شکلک <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16"> را در ویرایشگر انتخاب کن.
+
+          (اگر با موبایلت می‌نویسی، میتوانی شکلک را مستقیما از طریق صفحه کلید خود موبایل انتخاب بکنی.)
       mention:
         instructions: |-
           شاید گاهی اوقات بخواهی که توجه شخصی را، اگرچه در حال پاسخ دادن به ایشان نیستی، جلب کنی. بنویس `@` و سپس نام کاربری ایشان را کامل کن که به ایشان اشاره کنی.
@@ -226,9 +256,27 @@ fa_IR:
         not_found: |-
           من اسم خودم را هیچ جا پیدا نکردم. :frowning: آیا میتوانی دوباره تلاش کنی که به اسم من  `@%{discobot_username}` اشاره کنی؟
       flag:
+        instructions: |-
+          ما دوست داریم که گفتگوها دوستانه باشد و به کمک شما برای [متمدنانه نگه داشتن تالار](%{guidelines_url})  احتیاج داریم. اگر مشکلی مشاهده کردی، آن را پرچم گذاری کن که به صورت نامحسوس نویسنده یا [کارکنان ما](%{about_url}) را در جریان موضوع قرار بدهی.
+
+          > :imp: من چیز زشتی اینجا نوشتم
+
+          فکر کنم بدانی که چه کار بایستی بکنید. بفرمایید این نوشته را به عنوان نامناسب **پرچم گذاری** کنید!
         reply: |-
           [کارکنان ما](/groups/staff) به طور خصوصی از پرچم گذاری شما آگاه می‌شوند. اگر اعضای تالار به تعداد کافی یک نوشته را پرچم گذاری کنند، آن نوشته به عنوان پیشگیری خود به خود پنهان می‌شود. (به خاطر اینکه من در حقیقت چیز زشتی ننوشتم :angel: خودم پرچم گذاری شما را فعلا پاک کردم.)
+        not_found: |-
+          اوه نه، نوشته‌ی زشت من هنوز پرچم گذاری نشده. :worried: آیا میتوانی با استفاده از آیکون **پرچم** <img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16"> این نوشته را به عنوان نامناسب گزارش کنی؟ فراموش نکن که برای آشکارسازی قابلیت‌های بیشتر می‌توانی کلید "بیشتر نشان بده" <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> را برای هر نوشته انتخاب کنی.
       search:
+        instructions: |-
+          من در این مبحث یک سوپرایز برای شما دارم. اگر برای یک چالش آماده ای،  **آیکون  جستجو** <img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16"> را درگوشه ی بالا سمت چپ &#8598;  انتخاب کن که جستجو اش بکنی.
+
+          سعی کن که عبارت "سنجاب" را در این مبحث جستجو کنی
+        hidden_message: |-
+          چطور تونستی این سنجاب رو نادیده بگیری؟ :wink:
+
+          <img src="%{base_uri}/images/capybara-eating.gif"/>
+
+          آیا متوجه شدی که الان تو در ابتدای مبحث هستی؟ به این سنجاب گرسنه‌ی بیچاره، با **پاسخ دادن توسط شکلک `:herb:`** (در پاسخ بنویس `:herb:`) غذا بده تا علاوه بر آن به صورت اتوماتیک به آخر مبحث برگردی.
         reply: |-
           بله پیداش کردی :tada:
 
@@ -237,6 +285,8 @@ fa_IR:
           - برای پرش به هر قسمتی از یک مبحث دراز، از کنترل‌کننده های زمانی سمت چپ (یا پایین در موبایل) استفاده بکن.
 
           - اگر یه صفحه کلید فیزیکی داری، <kbd>؟</kbd> رو فشار بده تا میانبرهای بدردبخوری که داریم را مشاهده کنی.
+        not_found: |-
+          :thinking: ظاهرا مشکلی برای شما بوجود آمده. متاسفیم. آیا دقیقا عبارت **سنجاب** را جستجو<img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16"> کردی؟
       certificate:
         alt: 'گواهی موفقیت'
     advanced_user_narrative:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fi.yml b/plugins/discourse-narrative-bot/config/locales/server.fi.yml
index 594b14b756c..5e373ebe113 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fi.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fi.yml
@@ -221,8 +221,6 @@ fi:
 
           <kbd>**Lainaa**</kbd>-painike ilmestyy, kun maalaat viestini tekstiä. **Vastaa**-painike käy yhtä hyvin, jos sinulla on tekstiä maalattuna. Kokeilisitko uudelleen?
       bookmark:
-        instructions: |-
-          Jos haluat oppia lisää, valitse <iimg src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> tämän alta ja <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **lisää tämä yksityisviestiketju kirjanmerkkeihisi**.  Jos teet niin, sinua voi odottaa :gift: tulevaisuudessa!
         reply: |-
           Erinomaista! Löydät yksityiskeskustelumme nyt helposti koska vain [profiilisi kirjanmerkkivälilehdeltä](%{profile_page_url}/activity/bookmarks). Klikkaat vain profiilikuvaasi oikeassa yläkulmasssa &#8599;
         not_found: |-
@@ -359,12 +357,6 @@ fi:
         reply: |-
           Erinomaista! Muista, että tämä toimii alueiden lisäksi myös tunnisteille, jos ne ovat käytössä täällä.
       change_topic_notification_level:
-        instructions: |-
-          Sinulla on jokaiselle ketjulle ilmoitustaso. Aluksi se on 'tavallinen', jolloin saat tavalliseen tapaan ilmoituksen vain, jos joku puhuu nimenomaan sinulle.
-
-          Oletuksena yksityisviestiketjujen ilmoitustaso on kaikkein korkein eli 'tarkkaillaan', jolloin saat ilmoituksen joka ikisestä viestistä. Voit kuitenkin valita _mille tahansa_ ketjulle ilmoitustason 'tarkkaillaan', 'seurataan' tai 'vaimennettu'.
-
-          Kokeillaanpa vaihtaa tämän ketjun ilmoitustasoa. Ketjun alla on painike, joka näyttää sinun tarkkailevan tätä ketjua. Vaihdapa ilmoitustasoksi **seurataan**.
         not_found: |-
           Näytät yhä tarkkailevan :eyes: tätä ketjua! Jollet meinaa löytää sitä, ilmoitustasopainike sijaitsee ketjun alla.
         reply: |-
@@ -393,20 +385,6 @@ fi:
           * :-1:
           [/poll]
       details:
-        instructions: |-
-          Joskus voit haluta **piilottaa yksityiskohtia** vastauksissasi:
-
-          - Kirjoitat elokuvasta tai TV-ohjelmasta jotakin, minkä voi kokea juonipaljastukseksi.
-
-          - Viestissäsi on suuria määriä yksityiskohtaista tietoa, joka ei ole kaikille olennaista ja joka voisi uuvuttaa tai häiritä lukijaa.
-
-          [details=Napauta niin näet kuinka se toimii!]
-          1. Valitse editorin <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> hammasrataskuvake.
-          2. Valitse "Piilota yksityiskohdat".
-          3. Muokkaa Yhteenveto-tekstiä, jonka taakse tiedot piilotetaan, ja lisää sisältö.
-          [/details]
-
-          Piilottaisitko yksityiskohtia editorin <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> hammasrataskuvakkeen avulla seuraavasta vastauksestasi?
         not_found: |-
           Onko ongelmia yksityiskohtatoiminnon kanssa? Kokeilepa laittaa tämä seuraavaan vastaukseesi:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fr.yml b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
index d1063d52818..4a3b47934f9 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fr.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
@@ -53,6 +53,7 @@ fr:
         quote: "La difficulté est porteuse d'occasions"
         author: "Albert Einstein"
       '2':
+        quote: "La liberté ne signifie rien s'il n'y a pas la liberté de se tromper."
         author: "Mahatma Gandhi"
       '3':
         quote: "Ne pleurez pas parce que c'est fini, souriez parce que c'est arrivé !"
@@ -160,6 +161,8 @@ fr:
           - https://fr.wikipedia.org/wiki/Jeu_de_mots
           - https://fr.wikipedia.org/wiki/Liste_de_morts_insolites
           - https://fr.wikipedia.org/wiki/Orthographe_pour_calculatrice
+        reply: |-
+          Super ! Ça fonctionne pour la plupart <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> des liens. N'oubliez pas, ils doivent être sur une ligne _vide_, sans rien devant, ni derrière.
         not_found: |-
           Désolé, je n'ai pas pu trouvé le lien dans votre réponse ! :cry:
 
@@ -167,6 +170,14 @@ fr:
 
           <https://en.wikipedia.org/wiki/Exotic_Shorthair>
       images:
+        instructions: |-
+          Voici une photo de licorne :
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
+
+          Si vous l'aimez (et qui n'aime pas les licornes ?) appuyez sur le bouton _J'aime_ :heart: sous ce message pour me le faire savoir.
+
+          Pouvez-vous **répondre avec une image ?** N'importe laquelle fera l'affaire ! Glissez et déposer, appuyez sur le bouton d'upload, ou copiez juste son lien.
         reply: |-
           Sympa la photo ! – J'ai appuyé sur le bouton :heart: J'aime pour que vous sachiez au combien je l'apprécie. :heart_eyes:
         like_not_found: |-
@@ -210,11 +221,31 @@ fr:
 
           Sectionner n'importe quel texte dans mon message fera apparaitre le bouton <kbd>**Citer**</kbd>. Et appuyer sur "Répondre" avec du texte sélectionné fonctionnera également ! Pouvez-vous essayer de nouveau ?
       bookmark:
+        instructions: |-
+          Si vous souhaitez en savoir plus, sélectionnez <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> en dessous et <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> ** marquez ce message privé**. Si vous le faites, il pourrait y avoir un :gift: dans le futur !
         reply: |-
           Excellent ! Maintenant, vous pouvez facilement retrouver notre conversation privée à tout moment, à partir de [l'onglet marque page sur votre profil](%{profile_page_url}/activity/bookmarks). Sélectionnez juste votre photo de profil dans le coin en haut à droite &#8599;
+        not_found: |-
+          Uh oh, je ne vois aucun marque page sur ce sujet ! Avez-vous trouvé le marque page sous chaque message ? Utilisez le bouton Afficher plus <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> pour dévoiler d'autres actions si nécessaire.
       emoji:
+        instructions: |-
+          Vous pouvez avoir remarqué que j'utilise des petites images dans mes réponses :blue_car::dash: Elles sont appelées [emoji](https://fr.wikipedia.org/wiki/Emoji). Pouvez-vous **ajouter un emoji** à votre réponse ? N'importe lequel sera bien:
+
+          - Tapez  `:) ;) :D :P :O`
+
+          - Tapez <kbd>:</kbd> puis complétez le nom de l'emoji  `:tada:`
+
+          - Appuyez sur le bouton emoji <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> dans l'éditeur, ou sur le clavier de votre mobile.
         reply: |-
           C'est :sparkles: _emojitastic !_ :sparkles:
+        not_found: |-
+          Oops, Je ne vois pas aucun emoji dans votre réponse ? Oh non ! :sob:
+
+          Essayez de taper <kbd>:</kbd> pour faire apparaitre la selection d'emoji, puis appuyer sur les premières lettres de ce que vous voulez, comme par exemple `:bird:`
+
+          Ou, appuyez sur le bouton emoji <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> dans l'éditeur.
+
+          (Si vous êtes sur un périphérique mobile, vous pouvez aussi entrer l'émoji directement depuis votre clavier.)
       mention:
         instructions: |-
           Parfois vous avez peut-être envie d'attirer l'attention, même si vous ne lui répondez pas directement. Tapez  `@` et complétez son pseudo pour le mentionner.
@@ -227,10 +258,28 @@ fr:
 
           (Et oui, mon nom d'utilisateur est écrit «_disco_», comme dans la folie des années 1970. J'adore [la vie nocturne!](https://www.youtube.com/watch?v=B_wGI3_sGf8) :dancer:)
       flag:
+        instructions: |-
+          Nous aimons nos discussions amicales, et nous avons besoin de votre aide pour [garder les lieux civilisés](%{guidelines_url}). Si vous voyez un problème, signalez-le s'il vous plait de façon privée à l'auteur, ou à notre [équipe](%{about_url}).
+
+          > :imp: J'ai écris quelque chose de très méchant ici
+
+          Je devine que vous savez ce que vous avez à faire. **Signalez ce message** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> comme inapproprié !
         reply: |-
           [Notre équipe](/groups/staff) sera notifié de façon privée de votre signalement. Si assez de membres de la communauté signalent un message, il sera automatiquement masqué par précaution.
           (Puisque je n'ai pas réellement écrit un article méchant :ange: j'ai anticipé et j'ai enlevé le signalement pour le moment.)
+        not_found: |-
+          Oh non, mon méchant message n'a pas encore été signalé. :worried: Pouvez-vous le signaler comme inapproprié en utilisant le **drapeau** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">? N'oubliez pas d'utiliser le bouton Afficher plus<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> pour afficher plus d'actions pour chaque message.
       search:
+        instructions: |-
+          _psst_ … J'ai caché une surprise dans ce sujet. Si vous aimez les challenges, sélectionnez **l’icône de recherche** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> en haut à droite &#8599; pour la trouver.
+
+          Essayer de chercher le terme "capy​&#8203;bara" dans ce sujet.
+        hidden_message: |-
+          Comment avez-vous pu rater le capy​bara ? :wink:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
+
+          Avez-vous remarqué que nous sommes maintenant revenu au début ? Nourrissez ce pauvre capybara en **répondant avec l'emoji `:herb:`** et vous serez automatiquement amené à la fin.
         reply: |-
           Vous l'avez trouvé :tada:
 
@@ -239,6 +288,8 @@ fr:
           - Pour naviguer n'importe où dans une longue discussion, essayez la timeline du sujet sur la droite (et en bas sur mobile).
 
           - Si vous avez un clavier physique :keyboard:, appuyez sur <kbd>?</kbd> pour voir nos raccourcis clavier pratiques.
+        not_found: |-
+          Hmm... Il semblerait que vous ayez des difficultés. J'en suis désolé. Avez-vous cherché <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> le mot **capy&#8203;bara**?
       end:
         message: |-
           Merci d'être resté avec moi @%{username}! J'ai fait ça pour vous, je pense que vous l'avez mérité :
@@ -264,17 +315,33 @@ fr:
           Tout le monde fait des erreurs. Mais ne vous inquiétez pas, vous pouvez toujours éditer vos messages pour les réparer.
 
           Pouvez-vous commencer par **éditer** le message que je viens de créer en votre nom?
+        not_found: |-
+          Il semble que vous n'avez pas encore éditer le [message](%{url}) que j'ai créé pour vous. Pouvez-vous essayer de nouveau ?
+
+          Utilisez l’icône <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-pencil.png" width="16" height="16">pour afficher l'éditeur.
         reply: |-
           Bon boulot !
 
           Remarquez que les éditions après 5 minutes seront considérés comme des modifications publiques, et qu'un petit crayon apparaitra dans le coin haut droit avec le nombre de modification.
       delete:
+        instructions: |-
+          Si vous souhaitez retirer un message que vous avez écrit, vous pouvez le supprimer.
+
+          Allons-y et **supprimez** un de vos messages précédents en utilisant la <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> **suppression**. Attention à ne pas supprimer le premier message !
+        not_found: |-
+          Je ne vois toujours aucun message supprimé ! Rappelez-vous, <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> afficher plus révélera <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> supprimer.
         reply: |-
           Whoa ! :boom:
 
           Pour préserver la continuité des discussions, les suppressions ne sont pas immédiates, et le message ne sera supprimé qu'après quelques temps.
       recover:
         deleted_post_raw: 'Pourquoi @%{discobot_username} a supprimé mon message ? :anguished:'
+        instructions: |-
+          Oh non ! J'ai l'impression que j'ai accidentellement supprimé un nouveau message que je venais de créer pour vous.
+
+          Pouvez-vous me faire une faveur et <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> le **restaurer** ?
+        not_found: |-
+          Je ne vois toujours aucun message supprimé ! Rappelez-vous, <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> afficher plus révélera <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> supprimer.
         reply: |-
           Pfiou, c'était moins une ! Merci d'avoir réparé ça ! :wink:
 
@@ -296,9 +363,9 @@ fr:
         instructions: |-
           Chaque sujet a un niveau de notification. Il démarre comme 'normal', c'est à dire que vous ne serez notifié que quand quelqu'un vous parle directement.
 
-          Par défaut, le niveau de notification pour un message privé est configuré au plus haut niveau de 'surveillance', c'est à dire que vous serez notifié et chaque nouvelle réponse. Mais vous pouvez changer le niveau de notification pour _n'importe quel_ sujet en 'Surveiller', 'Suivi', ou 'Silencieux'.
+          Par défaut, le niveau de notification pour un message privé est configuré au plus haut niveau de 'surveillance', c'est à dire que vous serez notifié à chaque nouvelle réponse. Mais vous pouvez changer le niveau de notification pour _n'importe quel_ sujet en 'Surveiller', 'Suivi', ou 'Silencieux'.
 
-          Essayons de changer le niveau de notification pour ce sujet. En bas de ce sujet, vous trouverez un bouton qui vous indique que vous **Surveillez** ce sujet. Pouvez-vous changer le niveau de notification pour **Suivi**' ?
+          Essayons de changer le niveau de notification pour ce sujet. En bas de ce sujet, vous trouverez un bouton qui vous indique que vous **Surveillez** ce sujet. Pouvez-vous changer le niveau de notification pour **Suivi**'?
         not_found: |-
           Il semble que vous êtes encore en train de Surveillez :eyes: ce sujet ! Si vous avez des difficultés à le trouver, le bouton du niveau de notification est situé sous le sujet.
         reply: |-
@@ -306,6 +373,19 @@ fr:
 
           Remarquez que quand vous répondez à un sujet, ou lisez un sujet pendant plusieurs minutes, le niveau de notification est automatiquement mis sur 'Suivi'. Vous pouvez changer cela dans [vos préférences utilisateur](/my/preferences).
       poll:
+        instructions: |-
+          Savez-vous que vous pouvez ajouter un sondage sur n'importe quel message ? Essayez en utilisant la <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> roue dans l'éditeur pour **créer un sondage**.
+        not_found: |-
+          Whooops ! Il n'y a pas de sondage dans votre réponse.
+
+          Utilisez la <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> roue dans l'éditeur, ou copiez et coller ce sondage dans votre prochaine réponse :
+
+          ```text
+          [poll]
+          * :cat:
+          * :dog:
+          [/poll]
+          ```
         reply: |-
           Hey, bon sondage ! Comment s'est passé votre formation ?
 
@@ -314,6 +394,20 @@ fr:
           :-1:
           [/poll]
       details:
+        instructions: |-
+          Parfois vous souhaitez **masquer des détails** dans vos réponses :
+
+          - Quand vous discutez d'un film ou d'une série TV et que vous pourriez spoiler la communauté.
+
+          - Quand votre message a besoin de beaucoup de détails qui peuvent rendre le sujet illisible
+
+          [details=Sélectionnez ceci pour voir comment cela fonctionne !]
+          1. Sélectionnez la roue <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> dans l'éditeur.
+          2. Sélectionnez "Cacher le texte".
+          3. Éditez le résumé et ajoutez votre contenu.
+          [/details]
+
+          Pouvez-vous utiliser la roue <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16">dans l'éditeur pour ajouter une section de détails dans votre prochaine réponse ?
         not_found: |-
           Des soucis pour créer le widget de détail ? Essayez d'inclure le texte suivant dans votre prochaine réponse :
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.id.yml b/plugins/discourse-narrative-bot/config/locales/server.id.yml
index 51c9e33e44a..0281b0adbf7 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.id.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.id.yml
@@ -286,10 +286,6 @@ id:
         reply: |-
           Hebat! Cara ini bisa digunakan pada categories _and_ tags, jika pelabelan diaktifkan.
       change_topic_notification_level:
-        instructions: |-
-          Setiap topik memiliki tingkat pemberitahuan. Pengaturan awalnya adalah tingkat tertinggi, yakni 'watching', artinya surel pemberitahuan langsung dikirim setiap ada balasan baru. Tapi Anda bisa mengatur tingkat pemberitahuan untuk _topik_ apa_saja untuk 'watch', 'tracking' atau 'muted'.
-
-          Mari coba ubah tingkat pemberitahuan untuk topik ini. Di topik paling bawah, Anda akan menemukan sebuah tombol yang menyatakan kalau anda **menyimak** atau watching topik ini. Bisakah anda mengubahnya menjadi **tracking** atau mengikuti?
         not_found: |-
           Sepertinya Anda masih menyimak :eyes: topik ini! Jika kesulitan mencari tombolnya, tombol tingkat pengaturan ada di bawah topik.
         reply: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.it.yml b/plugins/discourse-narrative-bot/config/locales/server.it.yml
index 13a7470d182..0cf6d812b4d 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.it.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.it.yml
@@ -221,8 +221,6 @@ it:
 
           Selezionare un qualsiasi testo del mio messaggio farà apparire il pulsante <kbd>**Cita**</kbd>. E anche premere **Rispondi** con qualsiasi testo selezionato funzionerà! Puoi provare di nuovo?
       bookmark:
-        instructions: |-
-          Se vuoi saperne di più, seleziona <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> qui sotto e <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> per inserire **questo messaggio privato nei segnalibri**.  Se lo farai, ci potrebbe essere un :gift: in futuro!
         reply: |-
           Eccellente! Ora potrai tornare facilmente a questa conversazione privata in ogni momento, proprio dalla [scheda segnalibri sul tuo profilo](%{profile_page_url}/activity/bookmarks). Basta selezionare l'immagine del tuo profilo in alto a destra &#8599;
         not_found: |-
@@ -359,12 +357,6 @@ it:
         reply: |-
           Eccellente! Ricorda che questo funziona per le categorie _e_ le etichette, se le etichette sono abilitate.
       change_topic_notification_level:
-        instructions: |-
-          Ogni argomento ha un livello di notifica. Parte da 'normale', il che significa che riceverai una notifica quando qualcuno parlerà direttamente con te.
-
-          Per impostazione predefinita, il livello di notifica per un messaggio privato è impostato al livello più alto 'in osservazione', il che significa che riceverai una notifica ad ogni nuovo messaggio. Ma puoi sovrascrivere il livello di notifica per _ogni_ argomento su 'in osservazione', 'seguito' o 'silenziato'.
-
-          Prova a modificare il livello di notifica per questo argomento. In fondo alla discussione, troverai un pulsante che ti mostrerà che questo argomento è **in osservazione** . Puoi modificare il livello di notifica a **seguito**?
         not_found: |-
           Sembra che stia ancora in osservazione :eyes: di questo argomento! Se hai problemi a trovarlo, il pulsante relativo al livello della notifica è situato in fondo a questo argomento.
         reply: |-
@@ -393,20 +385,6 @@ it:
           * :-1:
           [/poll]
       details:
-        instructions: |-
-          Qualche volta potresti voler **nascondere dei dettagli** nelle tue risposte:
-
-          - Quando si stanno discutento punti della trama di un film o di uno show televisivo che potrebbero essere considerati degli spoiler.
-
-          - Quando il tuo messaggio necessita di molti dettagli opzionali che potrebbero intralciare la lettura se letti tutti in una volta.
-
-          [details=Seleziona questo per vedere come funziona!]
-          1. Seleziona il pulsante <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> opzioni nell'editor.
-          2. Seleziona "Nascondi Dettagli".
-          3. Modifica il sommario e aggiungi il tuo contenuto.
-          [/details]
-
-          Puoi usare il pulsante <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> opzioni nell'editor per aggiungere una sezione dettagli nella tua prossima risposta?
         not_found: |-
           Hai problemi a creare un widget con dei dettagli? Prova a includere quello che segue nella tua prossima risposta:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ko.yml b/plugins/discourse-narrative-bot/config/locales/server.ko.yml
index 6362aa6a5a2..1ee4c2b9be3 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ko.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ko.yml
@@ -221,8 +221,6 @@ ko:
 
           내 포스트에서 아무 글이나 선택해도 <kbd>**인용하기**</kbd> 버튼이 뜰거야. 글을 선택하고 **답글쓰기** 를 눌러도 돼! 다시 한 번 해 볼래?
       bookmark:
-        instructions: |-
-          더 알고 싶다면 아래에 있는 이걸 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> 선택한 다음 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **이 개인메시지 북마크**를 하렴.  미래의 너에게 보내는 좋은 선물:gift:이 되겠지!
         reply: |-
           대단해! 이제는 [프로필의 북마크 탭](%{profile_page_url}/activity/bookmarks)만 눌러도 우리의 개인적인 대화를 손쉽게 뒤돌아 볼 수 있어. 우측 상단에 있는 프로필 사진만 선택하면 돼. &#8599;
         not_found: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml b/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
index 218cf895580..cff3eed2dc3 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
@@ -25,7 +25,7 @@ nb_NO:
       long_description: |
         Dette merket er tildelt ved fullførelse av den interaktive opplæringen for avanserte brukere. Du har mestret de avanserte verktøyene for diskusjoner — og er nå fullstendig lisensiert!
   discourse_narrative_bot:
-    bio: "Hei, jeg er ikke en virkelig person. Jeg er en robot som kan lære deg om dette nettstedet. For å kommunisere med meg, send meg en melding eller nevn **`@%{discobot_username}`** hvor som helst."
+    bio: "Hei, jeg er ikke en virkelig person. Jeg er en robot som kan lære deg om dette nettstedet. For å kommunisere med meg send meg en melding eller nevn **`@%{discobot_username}`** hvor som helst."
     timeout:
       message: |-
         Hei @%{username}, jeg bare sjekker opp på deg fordi jeg har ikke hørt fra deg på en stund.
@@ -41,6 +41,10 @@ nb_NO:
       trigger: "rull"
       invalid: |-
         Jeg beklager, det er matematisk umulig å rulle den kombinasjonen av terninger. :confounded:
+      not_enough_dice: |-
+        Jeg har bare %{num_of_dice}terninger. Jeg vet det er [flaut]  (http://www.therobotsvoice.com/2009/04/the_10_most_shameful_rpg_dice.php)!
+      out_of_range: |-
+        Visste du at [maksimalt antall sider](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) på en matematisk rettferdig terning er 120?
       results: |-
         > :game_die: %{results}
     quote:
@@ -49,24 +53,36 @@ nb_NO:
         quote: "I midten av hver utfordring finnes muligheter"
         author: "Albert Einstein"
       '2':
+        quote: "Frihet er ikke verdt å ha hvis det ikke inkluderer friheten til å gjøre feil."
         author: "Mahatma Gandhi"
       '3':
         quote: "Ikke gråt fordi det er over, smil fordi det skjedde."
+        author: "Dr Seuss"
       '4':
         quote: "Hvis du vil ha noe velgjort, gjør det selv."
+        author: "Charles-Guillaume Étienne"
       '5':
         quote: "Tro at du kan, og du finner deg selv på halvveien."
         author: "Theodore Roosevelt"
       '6':
+        quote: "Livet er som en eske konfekt. Du vet aldri hva du kommer til å få."
         author: "Forrest Gumps Mor"
       '7':
+        quote: "Et lite steg for et menneske, et gigantisk sprang for menneskeheten."
         author: "Neil Armstrong"
       '8':
         quote: "Gjør én ting om dagen som skremmer deg."
+        author: "Eleanor Roosevelt"
       '9':
         quote: "Feil kan alltid tilgis, hvis man har mot nok til å innrømme dem."
         author: "Bruce Lee"
+      '10':
+        quote: "Alt hva menneskesinnet kan unnfange og ha tro på, kan det også oppnå."
+        author: "Napoleon Hill"
+      results: |-
+        > :left_speech_bubble: _%{quote}_ &mdash; %{author}
     magic_8_ball:
+      trigger: 'spådom'
       answers:
         '1': "Det er sikkert"
         '2': "Det er virkelig slik"
@@ -97,19 +113,278 @@ nb_NO:
       random_mention:
         reply: |-
           Hei! Finn ut hva jeg kan gjøre, si `@%{discobot_username} %{help_trigger}`.
+        tracks: |-
+          For tiden vet jeg hvordan man gjør følgende oppgaver:
+
+          `@%{discobot_username} %{reset_trigger} %{default_track}`
+          > Starter en av de følgende interaktive narrativene: %{tracks}.
+        bot_actions: |-
+          `@%{discobot_username} %{dice_trigger} 2d6`
+          > :game_die: 3, 6
+
+          `@%{discobot_username} %{quote_trigger}`
+          > :left_speech_bubble: _Utfør gode gjerninger, uten forventning om belønning, trygg i vissheten om at noen en dag kanskje vil gjøre det samme for deg_ &mdash; Prinsesse Diana
+
+          `@%{discobot_username} %{magic_8_ball_trigger}`
+          > :crystal_ball: Du kan stole på det
+      do_not_understand:
+        first_response: |-
+          Hei,  takk for svaret!
+
+          Men dessverre, siden jeg er en dårlig programmert robot så skjønte jeg ikke helt hva du mente. :frowning:
+        track_response: Du kan prøve igjen, eller hvis du ønsker å hoppe over dette steget kan du svare  `%{skip_trigger}`. Hvis du vil begynne på nytt helt fra starten kan du si `%{reset_trigger}`.
+        second_response: |-
+          Æsj, unnskyld. Jeg skjønner fremdeles ingenting. :anguished:
+
+          Jeg er bare en robot, men hvis du trenger å snakke med en ekte person kan du gå til denne [siden for kontakter](/about).
+
+          I mellomtiden skal jeg ikke plage deg mer.
     new_user_narrative:
       reset_trigger: "ny bruker"
+      cert_title: "Som bevis for vellykket gjennomføring av introduksjonen for nye brukere"
       hello:
         title: ":robot: Heisann!"
+        message: |-
+          Velkommen til %{title}, takk for at du ville bli medlem!
+
+          - Jeg er bare en robot, men [den vennlige staben](/about) er også her for å hjelpe hvis du trenger assistanse fra en person.
+
+          - Av sikkerhetshensyn begrenser vi hva nye brukere kan gjøre helt i starten. Du vil gradvis få flere tillatelser (og [merker](/badges)) etterhvert som vi blir kjent med deg.
+
+          - Vi prøver å holde [samfunnets oppførsel sivilisert](/guidelines) til enhver tid.
+      onebox:
+        instructions: |-
+          Neste steg, kan du dele en av disse lenkene med meg? Svar med **en frittstående lenke på en ny linje**, da vil den automatisk utvides til å inkludere et stilig sammendrag.
+
+          For å kopiere en lenke, trykk og hold på den med en mobil enhet, eller høyreklikk med en gammeldags mus:
+
+          - https://en.wikipedia.org/wiki/Inherently_funny_word
+          - https://en.wikipedia.org/wiki/Death_by_coconut
+          - https://en.wikipedia.org/wiki/Calculator_spelling
+        reply: |-
+          Kult! Dette fungerer for de aller fleste <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> lenkene. Bare husk at de må ha en linje _helt for seg selv_ når du limer dem inn, uten noe annet foran eller bak.
+        not_found: |-
+          Unnskyld, jeg klarte ikke finne lenken i svaret ditt! :cry:
+
+          Kan du prøve å legge til den følgende lenken, på en egen linje, i det neste svaret ditt?
+
+          <https://en.wikipedia.org/wiki/Exotic_Shorthair>
+      images:
+        instructions: |-
+          Her er et bilde av en enhjørning:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
+
+          Hvis du liker bildet (og hvem i all verden er det som ikke liker sånt!) kan du trykke på knappen med :heart: på under dette innlegget så jeg får vite det.
+
+          Kan du **svare med et bilde?** Et hvilket som helst bilde duger i massevis! Trekk og slipp bildet, trykk på "Last opp" knappen, eller du kan til og med kopiere og lime inn rett fra utklippstavlen.
+        reply: |-
+          Et flott bilde - jeg trykket på :heart: knappen så du også skal få vite at jeg satte stor pris på det :heart_eyes:
+        like_not_found: |-
+          Glemte du å trykke :heart:? Liker du ikke [innlegget mitt?](%{url}) :crying_cat_face:
+        not_found: |-
+          Det ser ut som du ikke lastet opp et bilde, så da valgte jeg like godt et bilde som jeg er _sikker_ på at du synes er fint for deg.
+
+          `%{image_url}`
+
+          Prøv å laste opp dette bildet på neste forsøk, eller bare lim inn lenken til bildet på en egen linje!
+      formatting:
+        instructions: |-
+          Klarer du å gjøre noen ord **uthevet** eller _kursiv_ i svaret ditt?
+
+          - skriv `**uthevet**` eller `_kursiv_`
+
+          - eller trykk på <kbd><b>F</b></kbd> eller <kbd><i>K</i></kbd> knappene i redigeringsfeltet
+        reply: |-
+          Godt jobbet! HTML og BBCode kan også brukes til formatering av tekst - for å lære mer om formatering, [prøv denne manualen](http://commonmark.org/help):nerd:
+        not_found: |-
+          Uff, jeg fant ingen formatering i svaret ditt. :pencil2:
+
+          Kan du prøve på nytt? Det holder å bruke <kbd><b>F</b></kbd>fet eller <kbd><i>K</i></kbd> kursiv i knappelinjen hvis du står fast.
       quoting:
+        instructions: |-
+          Kan du prøve å sitere meg når du svarer, så jeg vet nøyaktig hvilken del av innlegget du svarer på?
+
+          > Hvis dette er kaffe, vennligst bring meg en kopp te; men hvis dette er te, vennligst hent meg en kopp kaffe.
+          >
+          > En fordel med å prate med deg selv er at du i det minste vet at noen lytter til hva du har å si.
+          >
+          > Noen folk kan virkelig å formulere seg, og andre folk... æh, øh, ja du vet.
+
+          Merk teksten på et av &uarr; sitatene du liker, deretter kan du trykke på **Sitat** knappen som spretter opp over den valgte teksten - eller trykk på **Svar** knappen under dette innlegget.
+
+          Under sitatet kan du skrive noen ord om hvorfor du valgte akkurat det sitatet, for jeg er litt nysgjerrig :thinking:
         reply: |-
           Godt jobbet, du valgte mitt  favorittsitat! :left_speech_bubble:
+        not_found: |-
+          Hmm, det ser ut som du ikke siterte meg i svaret ditt?
+
+          Når du merker teksten skal det sprette opp en <kbd>**Siter**</kbd> knapp. Og å trykke på **Svar** etter at du har markert tekst skal fungere det også! Kan du gjøre et nytt forsøk?
+      bookmark:
+        instructions: |-
+          Hvis du ønsker å lære mer, velg <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">under og <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16">**bokmerke denne personlige meldingen**. Hvis du gjør dette, venter det kanskje en :gift: på deg i fremtiden!
+        reply: |-
+          Strålende! Nå kan du enkelt finne tilbake til den private samtalen vår på et senere tidspunkt, rett fra [listen over bokmerker i profilen din](%{profile_page_url}/activity/bookmarks). Bare klikk på profilbildet ditt øverst til høyre. &#8599;
+        not_found: |-
+          Øh, jeg ser ingen bokmerker noe sted i dette emnet. Fant du bokmerket under hvert innlegg? Bruk "vis mer" <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> knappen for å vise flere handlinger ved behov.
+      emoji:
+        instructions: |-
+          Du har kanskje sett at jeg bruker små bilder i svarene mine :blue_car::dash: de kalles for [emoji](https://en.wikipedia.org/wiki/Emoji). Klarer du å **legge til en emoji** i svaret ditt? Alle disse metodene fungerer:
+
+          - Skriv `:) ;) :D :P :O`
+
+          - Skriv kolon <kbd>:</kbd> og deretter navnet på emojien `:tada:`
+
+          - Trykk på emoji knappen <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16">i redigeringsfeltet, eller bytt til emojitastatur på mobilen.
+        reply: |-
+          Det er helt :sparkles: _emojitastisk!_ :sparkles:
+        not_found: |-
+          Oops, jeg ser ingen Emoji i svaret ditt? Åh nei! :sob:
+
+          Prøv å taste en kolon <kbd>:</kbd> for å aktivere emojivelgeren, deretter kan du skrive de første par tegnene for emojien du leter etter, som for eksempel `:bird:`
+
+          Eller, du kan trykke på emoji-knappen <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> i redigeringsfeltet.
+
+          (Hvis du bruker en mobil enhet kan du også sette inn Emoji rett fra mobilens emojitastatur.)
+      mention:
+        instructions: |-
+          Av og til ønsker du kanskje tiltrekke noens oppmerksomhet selv om du ikke svarer dem direkte. Skriv `@` og fullfør deretter brukernavnet deres for å nevne dem.
+
+          Kan du nevne **`@%{discobot_username}`** i svaret ditt?
+        reply: |-
+          _Var det noen som sa navnet mitt!?_ :raised_hand: Jeg tror det var deg! :wave: Vel, her er jeg! Takk for at du nevnte meg. :ok_hand:
+        not_found: |-
+          Jeg ser ikke navnet mitt der noe sted :frowning: Kan du prøve å nevne meg som `@%{discobot_username}` igjen?
+
+          (Og ja, brukernavnet mitt er stavet _disco_, som i 1970s farsott på dansegulvet. Jeg er en stor [fan av nattelivet!](https://www.youtube.com/watch?v=B_wGI3_sGf8) :dancer:)
+      flag:
+        instructions: |-
+          Vi liker å holde diskusjonene våre vennlige, og vi trenger din hjelp til å [holde ting sivilisert](%{guidelines_url}). Hvis du oppdager et problem, vær grei og flagg innlegget slik at enten den som skrev det eller [vår hjelpsomme stab](%{about_url}) blir klar over det.
+          > :imp: jeg skrev noe utrivelig her!
+
+          Jeg tror du vet hva du bør gjøre. Prøv å **flagge dette innlegget**<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> som upassende
+        reply: |-
+          [Staben vår](/groups/staff) vil bli informert privat om flagget ditt. Hvis nok av medlemmene våre flagger en post, vil den også bli skjult for sikkerhets skyld. (Siden jeg ikke egentlig skrev noe utrivelig :angel: har jeg tatt meg den frihet å fjerne flagget igjen inntil videre.)
+        not_found: |-
+          Å nei, det ekle inlegget mitt har ikke blitt flagget enda. :worried: Klarer du å flagge det som upassende med **flag** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">? Ikke glem at du kan trykke "vis mer" knappen <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">for å vise flere handlinger for hvert inlegg.
+      search:
+        instructions: |-
+          _psst_ ... jeg har gjemt en overraskelse et sted i dette emnet. Hvis du tar utfordringen, **trykk på søkeikonet** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> øverst til høyre &#8599; for å lete etter den.
+
+          Prøv å søke etter ordet "capy&#8203;bara" i dette emnet
+        hidden_message: |-
+          Hvordan kunne du gå glipp av denne capybaraen? :wink:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
+
+          La du merke til at du er tilbake ved starten? Gi denne sultne capybaraen litt å spise ved å **svare med `:herb:` emojien**, da blir du automatisk tatt tilbake til slutten.
+        reply: |-
+          Hurra! Du fant den :tada:
+
+          - For mer detaljerte søk, besøk [hovedsiden for søk](%{search_url}).
+
+          - For å hoppe til et vilkårlig punkt i en lang diskusjon, bruk kontrollen for tidslinje til høyre for diskusjonen (og nederst på mobil).
+
+          - Hvis du har et fysisk :keyboard:, trykk <kbd>?</kbd> på det for å få en oversikt over hendige tastatursnarveier.
+        not_found: |-
+          Hmm... det ser ut som du kanskje har trøbbel. Beklager så mye! Brukte du <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> for å søke etter **capy&#8203;bara**?
+      end:
+        message: |-
+          Takk for at du holdt ut sammen med meg hele veien @%{username}! Jeg har laget denne til deg, jeg synes du har fortjent det:
+
+          %{certificate}
+
+          Det var alt for nå! Sjekk ut [**de siste diskusjonsemnene**](/latest) eller [**listen over kategorier**](/categories).
+          :sunglasses:
+
+          (Hvis du ønsker å snakke med meg igjen eller lære mer, bare send meg en melding eller nevn `@%{discobot_username}` når som helst!)
+      certificate:
+        alt: 'Bevis for Utmerkelse'
     advanced_user_narrative:
       reset_trigger: 'avansert bruker'
+      cert_title: "Som vitnesbyrd på bestått gjennomgang av den avanserte brukeropplæringen"
       title: ':arrow_up: Avanserte brukerfunksjoner'
+      start_message: |-
+        Nå som du er en _avansert_ bruker, har du rukket å undersøke [brukerinstillingene dine](/my/preferences) enda @%{username}? Det er mange måter å tilpasse opplevelsen, som for eksempel ved å velge mellom en lys eller mørk drakt.
+
+        Men det var en digresjon, la oss begynne!
       edit:
         bot_created_post_raw: "@%{discobot_username} er overlegent den kuleste bot-en jeg vet om :wink:"
+        instructions: |-
+          Alle kan gjøre feil. Men ikke bekymre deg, du kan alltid redigere innleggene dine for å rette dem opp!
+
+          Kan du starte med å **redigere** det nye innlegget som jeg akkurat har laget på dine vegne?
+        not_found: |-
+          Det ser ut som du ikke har rukket å redigere [innlegget](%{url}) jeg laget for deg. Kan du prøve igjen?
+
+          Bruk <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-pencil.png" width="16" height="16">knappen for å åpne redigeringsverktøyet.
+        reply: |-
+          Strålende arbeid!
+
+          Vær obs på at endringer som gjøres etter mer enn 5 minutter vil være synlig for alle som en ny revisjon, og en liten blyant som viser antall revisjoner vil være synlig i øvre høyre hjørne av innlegget.
+      delete:
+        instructions: |-
+          Hvis du ønsker å trekke tilbake et innlegg du har laget, kan du slette det.
+
+          Forsøk å **slette** hvilket som helst av innleggene dine over dette ved å bruke <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16">**slett** funksjonen. Bare ikke slett det første innlegget som startet samtalen vår!
+        not_found: |-
+          Jeg har ikke registrert at du har slettet noen innlegg enda? Husk at knappen <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">"vis mer" vil vise funksjonen <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16">"slett".
+        reply: |-
+          Whoa! :boom:
+
+          For å bevare den røde tråden i diskusjoner forsvinner ikke slettede innlegg umiddelbart, men de fjernes helt etter at det har gått en stund.
+      recover:
+        deleted_post_raw: 'Hvorfor slettet @%{discobot_username}innlegget mitt? :anguished:'
+        instructions: |-
+          Å nei! Det ser ut som jeg kom i skade for å slette et nytt innlegg som jeg akkurat hadde laget for deg.
+
+          Kan du gjøre meg en tjeneste og <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> **gjenopprette** det?
+        not_found: |-
+          Fikk du trøbbel? Husk at <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">"vis mer" vil vise knappen <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16">"genopprett"
+        reply: |-
+          Puh, det var nære på! Takk for at du ordnet opp :wink:
+
+          Men husk at du bare kan gjenopprette innlegget innen det har gått 24 timer.
+      category_hashtag:
+        instructions: |-
+          Visste du at du kan ha referanser til kategorier og stikkord i innlegget ditt? For eksempel, har du sett %{category}kategorien?
+
+          Skriv `#` i midten av en setning og velg en kategori eller et stikkord.
+        not_found: |-
+          Hmm, jeg ser ikke en kategori noe sted i det innlegget. Pass på at `#` ikke må være det første tegnet på linjen. Kan du forsøke å kopiere dette eksempelet inn i det neste svaret?
+
+          ```text
+          Jeg kan lage en lenke til kategorier med #
+          ```
+        reply: |-
+          Genialt! Husk at dette fungerer både med kategorier _og_ stikkord, hvis stikkord er aktivert.
+      change_topic_notification_level:
+        instructions: |-
+          Alle emner har et varslingsnivå. Det starter på 'normal', som betyr at du normalt bare vil bli varslet om noen snakker direkte til deg.
+
+          Som standard er varslingsnivået på private meldinger satt til det høyeste nivået 'følger', som betyr at du vil få en varsel på alle nye svar. Men du kan overstyre varslingsnivået for _hva du vil_ til 'følger', 'overvåker' eller 'ignorert'.
+
+          La oss prøve å endre varslingsnivået på dette emnet. I bunnen av emnet vil du finne en knapp som viser at du **følger** dette emnet. Kan du endre varslingsnivået til **overvåker**?
+        not_found: |-
+          Det ser ut til at du fremdeles følger :eyes: dette emnet! Hvis du har problemer med å finne knappen så er den helt i bunnen av dette emnet under de andre knappene.
+        reply: |-
+          Se der ja! Jeg håper du ikke valgte å ignorere dette emnet fordi du synes jeg skravler for mye :grin:.
+
+          Merk at når du svarer på et emne eller har lest et emne i mer enn et par minutter, vil varslingsnivået på emnet automatisk settes opp til 'overvåker'. Du kan endre på denne mekanismen hvis du vil i [instillingene dine](/my/preferences).
       poll:
+        instructions: |-
+          Visste du at du enkelt kan legge til en avstemning i et innlegg? Prøv å trykke på <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> tannhjulet i redigeringsverktøyet og **lag en avstemning**.
+        not_found: |-
+          Oops! Det var ingen avstemning i svaret ditt.
+
+          Bruk <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16">tannhjul symbolet i redigeringsverkøyet, eller kopier og lim inn denne avstemningen i det neste svaret ditt:
+
+          ```text
+          [poll]
+          * :cat:
+          * :dog:
+          [/poll]
+          ```
         reply: |-
           Hei, fin avstemning! Hvordan gjorde jeg det i opplæringsprosessen?
 
@@ -118,5 +393,38 @@ nb_NO:
           * :-1:
           [/poll]
       details:
+        instructions: |-
+          Av og til kan du ønske å **skjule detaljer** i svarene dine:
+
+          - Når du diskuterer handlingen i en film eller TV-serie som noen ville ansett som en spoiler.
+
+          - Når innlegget ditt trenger å inneholde masse detaljert informasjon som kanskje kan være overveldende hvis alt blir presantert på en gang.
+
+          [details=Se hordan dette fungerer!]
+          1. Velg <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16">tannhjulet i redigeringsverktøyet.
+          2. Velg "Skjul detaljer".
+          3. Bytt ut teksten i sammendraget med innholdet du ønsker.
+          [/details]
+
+          Klarer du å bruke <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16">tannhjulet i redigeringsverktøyet for å legge til en detaljeboks i det neste svaret ditt?
+        not_found: |-
+          Strever du med å lage en detaljeboks? Prøv å inkludere den følgende teksten i det neste svaret ditt:
+
+          ```text
+          [details=Klikk på meg for detaljer]
+          Her er detaljene
+          [/details]
+          ```
         reply: |-
           Bra jobbet — ditt _detaljarbeid_ er beundringsverdig!
+      end:
+        message: |-
+          Du blåste gjennom dette som en ekte _avansert bruker_ :bow:
+
+          %{certificate}
+
+          Nå har jeg lært deg alt jeg kan!
+
+          Takk for nå! Hvis du ønsker å snakke med igjen er det bare å sende meg en melding når som helst :sunglasses:
+      certificate:
+        alt: 'Bevis på Utmerkelse for Avanserte Brukere'
diff --git a/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml b/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
index 8d0e7d79155..75989af67dd 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
@@ -297,12 +297,6 @@ pl_PL:
         reply: |-
           Wspaniale! Pamiętaj, że działa to zarówno dla kategorii _i_ tagów, jeśli taka możliwość jest dostępna.
       change_topic_notification_level:
-        instructions: |-
-          Każdy temat ma swój poziom notyfikacji. Pierwszym poziomem jest "normalny', co oznacza, że będziesz informowany jedynie w przypadku, gdy ktoś zwróci się bezpośrednio do ciebie.
-
-          Domyślnie, poziom notyfikacji dla wiadomości prywatnych jest ustawiony na najwyższym poziomie, oznacza to, że będziesz informowany o każdej nowej odpowiedzi. Możesz zmienić poziom notyfikacji dla _każdego_ tematu na "obserwuj", "śledź" lub "wycisz".
-
-          Spróbujmy zmienić poziom notyfikacji dla tego tematu. Na dole każdego tematu znajdziesz przycisk, który pokaże, że **obserwujesz** ten temat. Czy możesz zmienić poziom notyfikacji na **śledź**?
         not_found: |-
           Wygląda na to, że ciągle obserwujesz :eyes: ten temat! Jeśli masz problem w znalezieniu, przycisk poziomu notyfikacji znajduję się na dole tego tematu.
         reply: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.pt.yml b/plugins/discourse-narrative-bot/config/locales/server.pt.yml
index 0d37e3d5ecd..d6f8fb6d76e 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pt.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pt.yml
@@ -7,7 +7,12 @@
 
 pt:
   site_settings:
+    discourse_narrative_bot_enabled: 'Ativar Discourse Narrative Bot'
+    disable_discourse_narrative_bot_welcome_post: "Desativar a publicação de boas-vindas do Discourse Narrative Bot"
+    discourse_narrative_bot_ignored_usernames: "Nomes de utilizador que o Discourse Narrative Bot deverá ignorar"
+    discourse_narrative_bot_disable_public_replies: "Desativar as respostas públicas do Discourse Narrative Bot"
     discourse_narrative_bot_welcome_post_type: "O tipo de publicação de boas-vindas que \"Discourse Narrative Bot\" deverá enviar"
+    discourse_narrative_bot_welcome_post_delay: "Aguardar (n) segundos antes de enviar a publicação de boas-vindas do Discurso Narrativa Bot."
   badges:
     certified:
       name: Certificado
diff --git a/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml b/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
index 57af13071b1..76b2222f7b1 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
@@ -53,6 +53,7 @@ pt_BR:
         quote: "No meio de toda dificuldade reside a oportunidade"
         author: "Albert Einstein"
       '2':
+        quote: "A liberdade não vale a pena se não conota liberdade para errar."
         author: "Mahatma Gandhi"
       '3':
         quote: "Não chore por que acabou, sorria por que aconteceu."
@@ -90,12 +91,16 @@ pt_BR:
         '5': "Você pode contar com ele"
         '6': "Como eu vejo, sim"
         '7': "Provavelmente"
+        '8': "Boa perspectiva"
         '9': "Sim"
+        '10': "Sinais apontam que sim"
         '12': "Pergunte novamente depois"
         '13': "Melhor não falar pra você agora"
+        '15': "Concentre-se e pergunte novamente"
         '16': "Não conte com isso"
         '17': "Minha resposta é não"
         '18': "Minhas fontes dizem que não"
+        '19': "Perspectiva não tão boa"
         '20': "Muito duvidoso"
       result: |-
         > :crystal_ball: %{result}
@@ -136,6 +141,12 @@ pt_BR:
           - Por motivos de segurança, nós temporariamente limitamos o que novos usuários podem fazer. Você vai ganhar novas habilidades (e [emblemas](/badges) ao passo que nós conhecermos melhor você.
 
           - Nós acreditamos em um {comunidade com comportamento civilizado](/guidelines) em todos os momentos.
+      onebox:
+        reply: |-
+          Legal! isto vai funcionar para a maioria dos links. Lembre-se, deve estar na linha _all by itself_, com nada na frente ou atrás.
       images:
         like_not_found: |-
           Você esqueceu de curtir :heart: meu [post?](%{url})
+      formatting:
+        reply: |-
+          Ótimo! HTML e BBCode também servem para formatação - para saber mais, [veja este tutorial](http://commonmark.org/help) :nerd:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ru.yml b/plugins/discourse-narrative-bot/config/locales/server.ru.yml
index 6440cf48c3f..9afd3a03434 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ru.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ru.yml
@@ -292,12 +292,6 @@ ru:
         reply: |-
           Отлично! Это работает для всех категорий _и_ тегов, если теги включены.
       change_topic_notification_level:
-        instructions: |-
-          Каждая тема имеет уровень уведомлений. Она начинается на 'нормальный', что означает, что вы нормально будете только получать уведомления, когда кто-то обращается непосредственно к вам.
-
-          По умолчанию, уровень уведомления на личное сообщение находится на самом высоком уровне 'смотреть', что означает, что вы будете получать уведомления о каждом новом ответе. Но вы можете переопределить уровня уведомлений для _любой_ теме 'смотреть', 'отслеживания' или 'отключен'.
-
-          Давайте попробуем изменить уровень уведомления по этой теме. Внизу темы, Вы найдете кнопку, которая показывает, что вы **смотрите** эту тему. Вы можете изменить уровень уведомления на **отслеживание**?
         not_found: |-
           Похоже, вы еще ищите :eyes: эту кнопку! Это кнопка находится в нижней части этого раздела.
         reply: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.sl.yml b/plugins/discourse-narrative-bot/config/locales/server.sl.yml
new file mode 100644
index 00000000000..7112b7e81a5
--- /dev/null
+++ b/plugins/discourse-narrative-bot/config/locales/server.sl.yml
@@ -0,0 +1,45 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sl:
+  discourse_narrative_bot:
+    quote:
+      '1':
+        author: "Albert Einstein"
+      '2':
+        author: "Mahatma Gandhi"
+      '3':
+        author: "Dr Seuss"
+      '4':
+        author: "Charles-Guillaume Étienne"
+      '5':
+        author: "Theodore Roosevelt"
+      '6':
+        author: "Forrest Gumpova mama"
+      '7':
+        author: "Neil Armstrong"
+      '8':
+        author: "Eleanor Roosevelt"
+      '9':
+        author: "Bruce Lee"
+      '10':
+        author: "Napoleon Hill"
+    magic_8_ball:
+      answers:
+        '3': "Brez dvoma"
+        '4': "Ja, zagotovo"
+        '7': "Najbrž"
+        '9': "Ja"
+        '12': "Vprašaj ponovno kasneje"
+    track_selector:
+      reset_trigger: 'začni'
+      skip_trigger: 'preskoči'
+      help_trigger: 'prikaži pomoč'
+    new_user_narrative:
+      reset_trigger: "novi uporabnik"
+      hello:
+        title: ":robot: Pozdrav!"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.sr.yml b/plugins/discourse-narrative-bot/config/locales/server.sr.yml
index 7e57a61dd21..b8ec0cf4221 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.sr.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.sr.yml
@@ -5,4 +5,19 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-sr: {}
+sr:
+  discourse_narrative_bot:
+    new_user_narrative:
+      hello:
+        title: ":robot: Pozdrav!"
+        message: |-
+          Hvala što učestvuješ i želimo ti dobrodošlicu na %{title}!
+
+          - Ja sam samo robot, ali naša [ekipa](/about) je tu da ti pomogne ako ti zatreba da kontaktiraš osobu.
+
+          - Zarad sigurnosti , ograničeno je šta novi korisnici mogu da rade. Sticaćeš nova prava (i [bedževe](/badges)) kako se vremenom budemo upoznavali.
+
+          - Verujemo u  [civilizovanu javnu raspravu](/guidelines).
+      bookmark:
+        instructions: |-
+          Ako želiš da saznaš više, klikni na <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> ispod i <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **markiraj ovu privatnu poruku**.  Ako to uradiš, možda dobiješ jedan :gift: uskoro!
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ur.yml b/plugins/discourse-narrative-bot/config/locales/server.ur.yml
index 58bc9735bcb..e1dc39a87eb 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ur.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ur.yml
@@ -5,4 +5,423 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-ur: {}
+ur:
+  site_settings:
+    discourse_narrative_bot_enabled: 'ڈِسکورس نَرَیٹِو بوٹ کو فعال کریں'
+    disable_discourse_narrative_bot_welcome_post: "ڈِسکورس نَرَیٹِو بوٹ کی طرف سے استقبالیہ پوسٹ غیر فعال کریں"
+    discourse_narrative_bot_ignored_usernames: "صارف نام جو ڈِسکورس نَرَیٹِو بوٹ نظر انداز کرے"
+    discourse_narrative_bot_disable_public_replies: "ڈِسکورس نَرَیٹِو بوٹ کی طرف سے عوامی جوابات غیر فعال کریں"
+    discourse_narrative_bot_welcome_post_type: "خوش آمدید پوسٹ کی قسم جو ڈِسکورس نَرَیٹِو بَوٹ بھیجے"
+    discourse_narrative_bot_welcome_post_delay: "ڈِسکورس نرَیٹِو بَوٹ کا خوش آمدید پوسٹ بھیجنے سے پہلے (ن) سیکنڈ کا انتظار کیا جائے"
+  badges:
+    certified:
+      name: مصدقہ
+      description: "ہمارا نیا صارف ٹیوٹوریل مکمل کیا"
+      long_description: |
+        یہ بَیج انٹرایکٹو نیا صارف ٹیوٹوریل کی کامیاب تکمیل پر دیا جاتا ہے۔ آپ نے بحث کے بنیادی اصول جاننے کے لئے پہل کی ہے، اور اب آپ تصدیق شدہ ہیں!
+    licensed:
+      name: لائسنس یافتہ
+      description: "ہمارا اَیڈوانسڈ ٹیوٹوریل مکمل کیا"
+      long_description: |
+        یہ بَیج انٹرایکٹِو اَیڈوانسڈ ٹیوٹوریل کی کامیاب تکمیل پر دیا جاتا ہے۔ آپ نے بحث کے اعلیٰ اصولوں پر مہارت حاصل کر لی ہے — اور اب آپ مکمل طور پر لائسنس یافتہ ہیں!
+  discourse_narrative_bot:
+    bio: "ہیلو، میں ایک حقیقی شخص نہیں ہوں۔ میں ایک بَوٹ ہوں جو آپ کو اس سائٹ کے بارے میں سکھا سکتا ہے۔ میرے ساتھ بات چیت کرنے کے لئے، مجھے ایک پیغام بھیجیں یا کہیں بھی **`@%{discobot_username}`** زکر کریں۔"
+    timeout:
+      message: |-
+        ارے @%{username}، بس چیک کر رہا ہوں کیونکہ میں نے کچھ دیر سے آپ سے نہیں سنا۔
+
+        - جاری رکھنے کیلئے، کسی بھی وقت مجھے جواب دیں۔
+
+        - اگر آپ اس مرحلے کو چھوڑنا چاہتے ہیں، تو `%{skip_trigger}` کہیے۔
+
+        - دوبارہ شروع کرنے کیلئے، `%{reset_trigger}` کہتیے۔
+
+        اگر آپ یہ نہیں کرنا چاہتے، تو یہ بھی ٹھیک ہے۔ میں ایک رَوبَوٹ ہوں۔ آپ میرے جذبات کو نقصان نہیں پہنچا سکتے۔ :sob:
+    dice:
+      trigger: "رول"
+      invalid: |-
+        معذرت، پانسہ کے اس مجموعہ کو چلانا ریاضی کے اصولوں کے حساب سے ناممکن ہے۔ :confounded:
+      not_enough_dice: |-
+        میرے پاس صرف %{num_of_dice} پانسہ ہیں۔ [شرمناک] (http://www.therobotsvoice.com/2009/04/the_10_most_shameful_rpg_dice.php)، میں جانتا ہوں!
+      out_of_range: |-
+        کیا آپ جانتے تھے کہ ریاضی کے حساب سے منصفانہ پانسہ کیلئے [اطراف کی زیادہ سے زیادہ تعداد] (https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) 120 ہے؟
+      results: |-
+        > :game_die: %{results}
+    quote:
+      trigger: "اقتباس کریں"
+      '1':
+        quote: "ہر مشکل کے درمیان میں ایک سنہری موقع بھی موجود ہوتا ہے"
+        author: "البرٹ آئن سٹائین"
+      '2':
+        quote: "آزادی بے فائیدہ ہے اگر اِس میں غلطی کرنے کی آزادی شامل نہ ہو۔"
+        author: "مہاتما گاندھی"
+      '3':
+        quote: "رو مت کیونکہ یہ ختم ہوا، مسکراو کیونکہ یہ ہوا۔"
+        author: "ڈاکٹر سِیوُس"
+      '4':
+        quote: "اگر آپ چاہتے ہیں کہ کوئی کام ٹھیک ہو، تو اسے خود انجام دیں۔"
+        author: "چارلس-گویلوم ایتینی"
+      '5':
+        quote: "یقین کریں کہ آپ کر سکتے ہیں۔ اورآپ آدھا کر چکے ہیں۔"
+        author: "تھیوڈور روزویلٹ"
+      '6':
+        quote: "زندگی چاکلیٹس کے ایک ڈبے کی طرح ہے۔ آپ کبھی بھی نہیں جانتے کہ آپ کو کیا ملے گا۔"
+        author: "فَورَسٹ گَمپ کی والدہ"
+      '7':
+        quote: "یہ ایک انسان کے لئے ایک چھوٹا قدم، اور انسانیت کیلئے ایک بڑی چھلانگ۔"
+        author: "نیل آرمسٹرانگ"
+      '8':
+        quote: "ہر دن وہ ایک چیز کرو جس سے تم ڈرتے ہو۔"
+        author: "اَیلَینَور رُوزوَیلٹ"
+      '9':
+        quote: "غلطیاں ہمیشہ قابلِ بخشش ہوتی ہیں، اگر کوئی ان کا اعتراف کرنے کی جرأت رکھتا ہے۔"
+        author: "برُوس لی"
+      '10':
+        quote: "جو کچھ بھی انسان کا دماغ تصور اور یقین رکھ سکتا ہے، اسے حاصل کرسکتا ہے۔"
+        author: "نَیپَولِیَن ہِل"
+      results: |-
+        > :left_speech_bubble: _%{quote}_ &mdash; %{author}
+    magic_8_ball:
+      trigger: 'قسمت'
+      answers:
+        '1': "یہ یقینی ھے"
+        '2': "واضع طور پر ایسا ہے"
+        '3': "بلا شبہ"
+        '4': "جی ہاں یقیناً"
+        '5': "آپ اس پر بھروسہ کر سکتے ہیں"
+        '6': "جیسا میں اسے دیکھتا ہوں، جی ہاں"
+        '7': "زیادہ تر امکان ہے"
+        '8': "انجام اچھا لگ رہا ہے"
+        '9': "جی ہاں"
+        '10': "نشانیاں ہاں کی طرف اشارہ کر رہی ہیں"
+        '11': "جواب دھندلا، دوبارہ کوشش کریں"
+        '12': "بعد میں دوبارہ پوچھیے"
+        '13': "بہتر ہو گا کہ آپ کو ابھی نہ بتایا جائے"
+        '14': "ابھی پیشن گوئی نہیں کی جاسکتی"
+        '15': "توجہ کریں اور دوبارہ پوچھیے"
+        '16': "اس پہ بھروسہ نہ کریں"
+        '17': "میرا جواب نہیں ہے"
+        '18': "میرے ذرائع کا کہنا ہے کہ نہیں"
+        '19': "انجام بہت اچھا نہیں لگ رہا"
+        '20': "کافی مشکوک"
+      result: |-
+        > :crystal_ball: %{result}
+    track_selector:
+      reset_trigger: 'شروع کیجیے'
+      skip_trigger: 'سکِپ کیجیے'
+      help_trigger: 'مدد دکھائیں'
+      random_mention:
+        reply: |-
+          ہیلو! جاننے کیلئے کہ میں کیا کر سکتا ہوں، `@%{discobot_username} %{help_trigger}` کہیں۔
+        tracks: |-
+          میں فی الحال مندرجہ ذیل چیزوں کو کرنا جانتا ہوں:
+
+          `@%{discobot_username} %{reset_trigger} %{default_track}`
+          > مندرجہ ذیل انٹرایکٹو نَیرَیٹِو میں سے ایک کو شروع کر دیتا ہے: %{tracks}۔
+        bot_actions: |-
+          `@%{discobot_username} %{dice_trigger} 2d6`
+          > :game_die: 3، 6
+
+          `@%{discobot_username} %{quote_trigger}`
+          > :left_speech_bubble: _رحم کا ایک بلا سوچِ سمجھے عمل کریں، بغیر کسی انعام کی توقع کے ساتھ، یہ جان کر کہ ایک دن کوئی دوسرا بھی آپ کیلئے ویسا ہی کر سکتا ہے_ &mdash; شہزادی ڈیانا
+
+          `@%{discobot_username} %{magic_8_ball_trigger}`
+          > :crystal_ball: آپ اس پر انحصار کر سکتے ہیں
+      do_not_understand:
+        first_response: |-
+          ارے، جواب کیلئے شکریہ!
+
+          بدقسمتی سے، ایک برا پروگرام شدہ بَوٹ ہونے کے طور پر، میں اس کو کچھ سمجھ نہیں پایا۔ :frowning:
+        track_response: 'آپ دوبارہ کوشش کر سکتے ہیں، یا اگر آپ اس قدم کو چھوڑنا چاہتے ہیں تو `%{skip_trigger}` کہیے۔ دوسری صورت میں، پھر سے شروع کرنے کے لئے، `%{reset_trigger}` کہیے۔ '
+        second_response: |-
+          اوہ، معذرت۔ میں ابھی بھی سمجھ نہیں پایا۔ :anguished:
+
+          میں صرف ایک بَوٹ ہوں، لیکن اگر آپ ایک حقیقی شخص تک پہنچنا چاہتے ہیں، تو [ہمارا رابطہ پیج] (/about) دیکھیے۔
+
+          اِس دوران، میں آپ کے راستے سے دور رہوں گا۔
+    new_user_narrative:
+      reset_trigger: "نیا صارف"
+      cert_title: "نیا صارف ٹیوٹوریل کی کامیاب تکمیل کے اعتراف میں"
+      hello:
+        title: ":robot: خوش آمدید!"
+        message: |-
+          %{title}میں شامل ہونے کیلئے شکریہ، اور خوش آمدید!
+
+          - میں صرف ایک رَوبَوٹ ہوں، اگر آپ کو کسی شخص سے رابطہ کرنے کی ضرورت ہو تو لیکن [ہمارا دوستانہ اسٹاف](/about) بھی یہاں موجود ہے۔
+
+          - حفاظتی وجوہات کی بنا پر، ہم عارضی طور پر نئے صارفین کی اِس سائیٹ پر کارروائیاں محدود کرتے ہیں۔ آپ کو نئی صلاحیتیں (اور [بَیج](/badges)) دیے جائیں گے جیسے جیسے ہم آپ کو بہتر جان پائیں گے۔
+
+          - ہم، ہر وقت [مہذب کمیونٹی رویے](/guidelines) پر یقین رکھتے ہیں۔
+      onebox:
+        instructions: |-
+          پھر، کیا آپ اِن لنکس میں سے ایک میرے ساتھ شئیر کر سکتے ہیں؟ **ایک لائن پر ایک لنک** کے طور پر جواب دیں، اور یہ خود بخود اُس کا ایک اچھا خلاصہ شامل کردے گا۔
+
+          ایک لنک کاپی کرنے کیلئے، موبائل پرٹَیپ اور ہولڈ کریں یا اپنے ماؤز پر دایاں کلک کریں:
+
+          - https://en.wikipedia.org/wiki/Inherently_funny_word
+          - https://en.wikipedia.org/wiki/Death_by_coconut
+          -  https://en.wikipedia.org/wiki/Calculator_spelling
+        reply: |-
+          یہ زیادہ تر <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> لنکس کے لئے کام کرے گا۔ یاد رہے کہ یہ ایک لائن پر _صرف اکیلا_ ہونا چاہئے، بغیر اس کے سامنے یا پیچھے کچھ ہوے۔
+        not_found: |-
+          معذرت، میں آپ کے جواب میں لنک تلاش نہ کر سکا! :cry:
+
+          کیا آپ اپنے اگلے جواب میں، درج ذیل لنک، اکیلا اپنی لائن پر، شامل کر سکتے ہیں؟
+
+          <https://en.wikipedia.org/wiki/Exotic_Shorthair>
+      images:
+        instructions: |-
+          یہاں ایک یُونِیکارن کی تصویر ہے:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
+
+          اگر آپ اسے پسند کرتے ہیں (اور کون نہیں کرے گا) تو مجھے بتانے کیلئے، آگے بڑھیے اور اِس پوسٹ کے نیچے لائیک :heart: کا بٹن دبائیے۔
+
+          کیا آپ **ایک تصویر کے ساتھ جواب دے سکتے ہیں؟** کوئی بھی تصویر چلے گی! ڈریگ اور ڈراپ، اپ لوڈ کا بٹن دبائیں، یا اسے اندر کاپی اور پیسٹ بھی کر سکتے ہیں۔
+        reply: |-
+          اچھی تصویر - آپ کو بتانے کیلئے کہ یہ مجھے کتنی پسند ائی ہے میں نے لائیک :heart: کا بٹن دبایا :heart_eyes:
+        like_not_found: |-
+          کیا آپ میری [پوسٹ](%{url}) کو لائیک :heart: کرنا بھول گئے؟ :crying_cat_face:
+        not_found: |-
+          لگتا ہے کہ آپ نے کوئی تصویر اَپ لوڈ نہیں کی اِس لیے میں نے ایک تصویر کومنتخب کیا جو مجھے _یقین_ ہے کہ آپ کو لطف اندوز کرے گی۔
+          `%{image_url}`
+
+          پھر اس والی کو اَپ لوڈ کرنے کی کوشش کریں، یا لنک کو ایک لائین میں اکیلا پیسٹ کریں!
+      formatting:
+        instructions: |-
+          کیا آپ اپنے جواب میں کچھ الفاظ کو **بولڈ** یا _آئیٹیلک_ بنا سکتے ہیں؟
+
+          - `** بولڈ **` یا `_آئیٹیلک_` ٹائپ کریں
+
+          - یا، ایڈیٹر میں <kbd><b>B</b></kbd> یا <kbd><i>I</i></kbd>بٹن دبائیے
+        reply: |-
+          اعلیٰ کام! HTML اور BBCode بھی فارمَیٹِنگ کیلئے کام کرتے ہیں - مزید جاننے کے لئے، [اِس ٹیوٹوریل کو آزمائیں] (http://commonmark.org/help) :nerd:
+        not_found: |-
+          اوہ، مجھے آپ کے جواب میں کوئی فارمَیٹِنگ نظر نہیں آئی۔ :pencil2:
+
+          کیا آپ دوبارہ کوشش کر سکتے ہیں؟ اگر آپ پھنس جائیں تو ایڈیٹر میں <kbd><b>B</b></kbd> بولڈ یا <kbd><i>I</i></kbd>آئیٹیلک بٹن استعمال کریں۔
+      quoting:
+        instructions: |-
+          کیا آپ جواب دیتے وقت میری پوسٹ کا اقتباس دے سکتے ہیں، تاکہ میں جان سکوں کہ آپ کس خاص حصے کا جواب دے رہے ہیں؟
+
+          > اگر یہ کافی ہے، تو براہ مہربانی میرے لیے چائے لے آئیے؛ لیکن اگر یہ چائے ہے، تو براہ مہربانی میرے لیے کافی لے آئیے۔
+          >
+          > اپنے آپ سے بات کرنے کا ایک فائدہ یہ ہے کہ آپ کو پتہ ہے کہ کم از کم ایک شخص تو سن رہا ہے
+          >
+          > کچھ لوگوں کو الفاظ، اور دوسرے لوگوں کے ساتھ ایک سلیکہ آتا ہے... اوہ، اہ،سلیکہ نہیں آتا۔
+
+          اپنی مرضی کے متن کے جملوں کو سَلَیکٹ کریں &uarr; اور پھر **اقتباس** بٹن پر کلک کریں جو آپ کے انتخاب پر پاپ اَپ کرتا ہے - یا اِس پوسٹ کے نیچے **جواب** کا بٹن۔
+
+          اقتباس کے نیچے، کیونکہ مجھے تجسس ہے، ایک یا دو الفاظ لکھیں کہ آپ نے یہ کیوں منتخب کیا :thinking:
+        reply: |-
+          اعلیٰ کام، آپ نے میرا پسندیدہ اقتباس اٹھایا! :left_speech_bubble:
+        not_found: |-
+          ہمم، ایسا لگتا ہے جیسے آپ نے اپنے جواب میں مجھے اقتباس نہیں کیا؟
+
+          میری پوسٹ میں سے کسی بھی متن کو سَلَیکٹ کرنے پر <kbd>**اقتباس**</kbd> بٹن سامنے آجاَئے گا۔ اور سَلَیکٹ کردہ متن کے ہوتے ہوے **جواب دیں** دبانے سے بھی کام چل جائے گا! کیا آپ دوبارہ کوشش کر سکتے ہیں؟
+      bookmark:
+        instructions: |-
+          اگر آپ مزید جاننا چاہتے ہیں، تو ذیل میں <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> منتخب کریں اور <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **اِس ذاتی پیغام کو بُک مارک کریں**۔ اگر آپ ایسا کرتے ہیں، تو ہو سکتا ہے کہ آپ کے مستقبل میں ایک :gift: ہو!
+        reply: |-
+          بہترین! اَب آپ [اپنی پروفائل پر موجود بُک مارکس ٹَیب](%{profile_page_url}/activity/bookmarks) کے زریعے آسانی سے ہماری نجی بات چیت تک دوبارہ رسائی حاصل کر سکتے ہیں۔ صرف اوپری دائیں طرف پر اپنی پروفائل تصویر کو سَلَیکٹ کریں &#8599;
+        not_found: |-
+          اوہ، مجھے اس ٹاپک میں کوئی بک مارکس نظر نہیں آرہے۔ کیا آپ کو ہر پوسٹ کے نیچے بُک مارک ملا؟ اگر ضرورت ہو تو اضافی کارروائیوں کو ظاہر کرنے کیلئے مزید دکھایے <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> کو استعمال کریں۔
+      emoji:
+        instructions: |-
+          آپ نے مجھے اپنے جوابات میں چھوٹی تصاویر استعمال کرتے دیکھا ہو گا :blue_car::dash: اِنہیں [اِیمَوجی](https://en.wikipedia.org/wiki/Emoji) کہا جاتا ہے۔ کیا آپ اپنے جواب کے ساتھ **ایک اِیمَوجی شامل** کر سکتے ہیں؟ ان میں سے کوئی بھی کام کرے گا:
+
+          - ٹائپ کریں `:) ;) :D :P :O`
+
+          - کالَن ٹائپ کریں <kbd>:</kbd> اور پھر اِیمَوجی کا نام مکمل کریں `:tada:`
+
+          - ایڈیٹر میں یا اپنے موبائل کی بورڈ پر اِیمَوجی بٹن <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> دبائیں
+        reply: |-
+          یہ :sparkles: _اِیمَوجِسٹَیٹِک!_ :sparkles: ہے
+        not_found: |-
+          اوہ، مجھے آپ کے جواب میں کوئی اِیمَوجی نظر نہیں آرہا؟ ارے نہیں! :sob:
+
+          اِیمَوجی چنائو کو لانے کیلۓ کالَن <kbd>:</kbd> ٹائپ کرنے کی کوشش کریں، پھر جو آپ چاہتے ہیں اس کے پہلے کچھ حروف ٹائپ کریں، جیسے کہ `:bird:`
+
+          یا، ایڈیٹر میں اِیمَوجی بٹن <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> دبائیں۔
+
+          (اگر آپ موبائل ڈیوائس پر ہیں، تو آپ براہ راست آپنے کی بورڈ سے بھی اِیمَوجی درج کر سکتے ہیں۔)
+      mention:
+        instructions: |-
+          جب آپ کسی شخص کو براہ راست جواب نہ دے رہے ہوں، تب بھی آپ کبھی کبھی اُن کو کی توجہ حاصل کرنا ہوسکتی ہے۔ `@` ٹائپ کریں پھر ان کا ذکر کرنے کیلئے اُن کا صارف نام مکمل کریں۔
+
+          کیا آپ اپنے جواب میں **`@%{discobot_username}`** کا ذکر کرسکتے ہیں؟
+        reply: |-
+          _کیا کسی نے میرا نام لیا!؟_ :raised_hand: میرے خیال میں آپ نے لیا! :wave: ٹھیک ہے، میں یہاں ہوں! میرا ذکر کرنے کیلئے شکریہ۔ :ok_hand:
+        not_found: |-
+          مجھے اپنا نام کہیں بھی نظر نہیں آرہا :frowning: کیا آپ مجھے `@%{discobot_username}` کے طور پر دوبارہ ذکر کرنے کی کوشش کر سکتے ہیں؟
+
+          (اور جی ہاں، میرا صارف نام 1970 کے رقص سنک کی طرح _ڈسکو_ ہجے کیا جاتا ہے۔ میں کرتا ہوں [رات کی زندگی سے محبت!](https://www.youtube.com/watch?v=B_wGI3_sGf8) :dancer:)
+      flag:
+        instructions: |-
+          ہمیں دوستانہ گفتگو پسند ہے، اور ہمیں [چیزوں کو مہذب رکھنے کیلئے](%{guidelines_url}) آپ کی مدد کی ضرورت ہے۔ اگر آپ کو کوئی مسئلہ نظر آتا ہے، تو براہ کرم مصنف کو، یا [ہمارے مددگار اسٹاف](%{about_url})، کو نجی طور پر اطلاع دینے کیلئے فلَیگ کریں۔
+
+          > :imp: میں نے کچھ گندا یہاں لکھا
+
+          آپ جانتے ہیں کہ آپ کو کیا کرنا ہے۔ آگے بڑھیں اور نامناسب کے طور پر **اِس پوسٹ کو فلَیگ کریں** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">!
+        reply: |-
+          [ہمارے اسٹاف](/groups/staff) کو آپ کے فلَیگ کے بارے میں نجی طور پر مطلع کیا جائے گا۔ اگر کافی کمیونٹی ممبران ایک پوسٹکو فلَیگ کرتے ہیں، تو یہ خود بخود احتیاط کے طور پر پوشیدہ کر دی جائے گا۔ (چونکہ میں نے اصل میں ایک گندی پوسٹ نہیں لکھی :angel:، میں نے ابھی فلَیگ کو ہٹا دیا ہے۔)
+        not_found: |-
+          اوہ نہیں، میری گندی پوسٹ ابھی تک فلَیگ نہیں ہوئی۔ :worried: کیا آپ **فلَیگ** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> کا استعمال کرتے ہوئے اسے غیر مناسب کے طور پر فلَیگ کر سکتے ہیں؟ ہر پوسٹ پر اضافی کارروائیوں کو ظاہر کرنے کیلئے مزید دکھایے بٹن <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> کا استعمال کرنا نہ بھولیے گا۔
+      search:
+        instructions: |-
+          _ارے_ ... میں نے اس ٹاپک میں سَرپرائیز چھپایا ہے۔ اگر آپ چیلنج کیلۓ تیار ہیں، تو اس کو تلاش کرنے کیلۓ اوپر دائیں جانب &#8599; ** سرچ کے آئکن کو سَلَیکٹ کریں** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16">۔
+
+          اِس ٹاپک میں "کَیپی&#8203;بارا" اصطلاح سرچ کرنے کی کوشش کریں
+        hidden_message: |-
+          آپ نے یہ کَیپیبارا کیسے مِس کر دیا؟ :wink:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
+
+          کیا آپ نے نوٹ کیا کہ اب آپ واپس شروع پر پہنچ گئے ہیں؟ اِس بیچارے بھوکے کَیپیبارا کو **`:herb:` اِیمَوجی سے جواب دے کر** کھانا کھلائیں اور آپ کو خود بخود آخر میں لے جایا جائے گا۔
+        reply: |-
+          شاباش آپ نے اسے ڈھونڈ لیا :tada:
+
+          - مزید تفصیلی سرچز کیلئے، [مکمل سرچ کے صفحے](%{search_url}) پر جائیں۔
+
+          - ایک طویل بحث میں کہیں بھی جانے کیلئے، دائیں پر (اور موبائل پر، سب سے نیچے) ٹاپک ٹائم لائن کنٹرولز کا اِستعمال کریں۔
+
+          - اگر آپ کے پاس اصل :keyboard: ہے، تو ہمارے آسان کی بورڈ شارٹ کٹس دیکھنے کیلئے <kbd>؟</kbd>دبائیں۔
+        not_found: |-
+          ہمم... لگتا ہے جیسے آپ کو کوئی مسئلہ درپیش ہے۔ اس کیلئے معذرت۔ کیا آپ نے اصطلاح **کَیپی&#8203;بارا** سرچ <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> کی؟
+      end:
+        message: |-
+          میرے ساتھ رہنے کا شکریہ @%{username}! میں نے آپ کیلئے یہ بنایا، میں سمجھتا ہوں کہ آپ اِس کے مستحق ہیں:
+          %{certificate}
+
+          ابھی کیلئے یہ کافی ہے! اب سب کے لئے! [** ہمارے تازہ ترین بحث کے ٹاپک**](/latest) یا [**بحث کے زمرہ جات**](/categories) چیک کریں۔ :sunglasses:
+
+          (اگر آپ مزید جاننے کیلئے مجھ سے دوبارہ بات کرنا چاہتے ہیں، تو کسی بھی وقت مجھے صرف پیغام بھیجیں یا `@%{discobot_username}` زکر کریں!)
+      certificate:
+        alt: 'کامیابی کا سرٹیفِکیٹ'
+    advanced_user_narrative:
+      reset_trigger: 'اَیڈوانسڈ صارف'
+      cert_title: "اَیڈوانسڈ صارف ٹیوٹوریل کی کامیاب تکمیل کے اعتراف میں"
+      title: ':arrow_up: اَیڈوانسڈ صارف کی صلاحیتیں'
+      start_message: |-
+        ایک _اَیڈوانسڈ_ صارف کے طور پر، کیا آپ نے ابھی تک [اپنے ترجیحات کے صفحے]() کا دورہ کیا ہے @%{username}؟ سائیٹ پر اپنے تجربے کو اپنی مرضی کے مطابق ڑھالنے کیلئے بہت سے طریقے ہیں، جیسے کہ سیاہ یا ہلکی تھِیم کو منتخب کیا جائے۔
+
+        لیکن میں اصل موضوع سے دور جا رہا ہوں، چلیں شروع کرتے ہیں!
+      edit:
+        bot_created_post_raw: "@%{discobot_username}، میری جان پہچان میں دور تک سب سے بہترین بَوٹ ہے :wink:"
+        instructions: |-
+          ہر کوئی غلطیاں کرتا ہے۔ لیکن پریشان ہوں، آپ اپنی پوسٹس ٹھیک کرنے کیلۓ ہمیشہ اُن میں ترمیم کر سکتے ہیں!
+
+          میں نے جو پوسٹ آپ کی جانب سے ابھی بنائی ہے کیا آپ اُسے **ترمیم** کر کہ شروعات کر سکتے ہیں؟
+        not_found: |-
+          لگتا ہے کہ جو [پوسٹ](%{url}) میں نے آپ کے لئے تیار کی تھی، ابھی تک آپ نے اُس میں ترمیم نہیں کی۔ کیا آپ دوبارہ کوشش کر سکتے ہیں؟
+          اَیڈیٹر کو سامنے لانے کیلئے <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-pencil.png" width="16" height="16"> آئکن کا استعمال کریں۔
+        reply: |-
+          شاندار کام!
+
+          نوٹ کریں کہ 5 منٹ کے بعد ہونے والی ترمیمیں، عوامی ترمیم رویثنز کے طور پر دکھائی جائیں گی، اور اوپر دائیں جانب رویثن شمار کے ساتھ ایک چھوٹا سا پنسل آئیکن ظاہر ہو جائے گا۔
+      delete:
+        instructions: |-
+          اگر آپ کی بنائی گئی کسی پوسٹ کو آپ واپس لینا چاہتے ہیں، تو آپ اسے حذف کرسکتے ہیں۔
+
+          آگے بڑھیے اور <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> **حذف** کارروائی کا استعمال کرتے ہوے اپنی کسی بھی پوسٹ کو **حذف** کریں **۔ اگرچہ، پہلی پوسٹ کو حذف نہ کریے گا!
+        not_found: |-
+          مجھے ابھی تک کوئی حذف کردہ پوسٹ نظر نہیں آرہیں؟ یاد رکھیے کہ <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> مزید دکھایے <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> حذف کو ظاہر کرے گا۔
+        reply: |-
+          اوہ! :boom:
+
+          گفتگو کے تسلسل کو برقرار رکھنے کیلئے، حذف فوری طور پر انجام نہیں ہوتا، لہٰذا پوسٹ کچھ وقت کے بعد ہٹا دیی جائے گی۔
+      recover:
+        deleted_post_raw: '%{discobot_username}نے میری پوسٹ کو کیوں حذف کردیا؟ :anguished:'
+        instructions: |-
+          ارے نہیں! لگتا ہے کہ جو پوسٹ میں نے آپ کیلئے بنائی تھی، اُسے غلطی سے میں نے حذف کر دیا۔
+
+          کیا آپ مجھ پر ایک احسان کر سکتے ہیں اور اُسے <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> **واپس بحال** کر دیں؟
+        not_found: |-
+          کوئی دشواری ہو رہی ہے؟ یاد رکھیے کہ <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> مزید دکھایے <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16">واپس بحال کو ظاہر کرے گا۔
+        reply: |-
+          شکر ہے، بال بال بچے! واپس درست کر دینے کیلئے شکریہ :wink:
+
+          نوٹ کریں کہ پوسٹ کو واپس بحال کرنے کیلئے آپ کے پاس صرف 24 گھنٹے ہوتے ہیں۔
+      category_hashtag:
+        instructions: |-
+          کیا آپ جانتے تھے کہ آپ اپنی پوسٹ میں زمرہ جات اور ٹیگز کا حوالہ دے سکتے ہیں؟ مثال کے طور پر، کیا آپ نے %{category} زمرہ دیکھا ہے؟
+
+          جملے کے درمیان میں `#` ٹائیپ کریں اور کسی بھی زمرہ یا ٹیگ کو منتخب کریں۔
+        not_found: |-
+          ہمم، مجھے وہاں کہیں بھی کوئی زمرہ نظر نہیں آرہا۔ نوٹ کریں کہ `#` پہلا حرف نہیں ہوسکتا۔ کیا آپ اِس کو اپنے اگلے جواب میں نقل کرسکتے ہیں؟
+
+          ```متن
+          میں # کے ذریعہ ایک زمرہ کا لنک بنا سکتا ہوں
+          ```
+        reply: |-
+          بہترین! یاد رکھیے کہ یہ دونوں زمروں _اور_ ٹیگز کیلئے کام کرتا ہے، اگر ٹیگز فعال کیے ہوے ہوں۔
+      change_topic_notification_level:
+        instructions: |-
+          ہر ٹاپک میں ایک نوٹیفکیشن لَیوَل ہوتا ہے۔ یہ 'نارمل' پر شروع ہوتا ہے، جس کا مطلب ہے کہ آپ عام طور پر صرف اِس صورت پر مطلع کیے جائیں گے جب کوئی براہ راست آپ سے بات کررہا ہو۔
+
+          پہلے سے طے شدہ طور پر، ایک نجی پیغام کے لئے نوٹیفیکیشن لَیوَل 'دیکھا جا رہا' کے اعلیٰ ترین درجے پر مقرر کی جاتی ہے، جس کا مطلب ہے کہ آپ کو ہر نئے جواب سے مطلع کیا جائے گا۔ لیکن آپ _کسی_ بھی ٹاپک کیلئے نوٹیفیکیشن لَیوَل کو 'دیکھیں'، 'ٹریکنگ' یا 'خاموش کردہ' پر تبدیل کرسکتے ہیں۔
+
+          آئیے، اِس ٹاپک کا نوٹیفیکیشن لَیوَل تبدیل کرنے کی کوشش کریں۔ ٹاپک کے نچلے حصے میں، آپ کو ایک بٹن ملے گا جس سے ظاہر ہوتا ہے کہ آپ اِس ٹاپک کو **دیکھ** رہے ہیں. کیا آپ نوٹیفیکیشن لَیوَل کو**ٹریکنگ** میں تبدیل کرسکتے ہیں؟
+        not_found: |-
+          لگتا ہے کہ آپ اب بھی اِس ٹاپک کو دیکھ :eyes: رہے ہیں! اگر آپ کو اسے تلاش کرنے میں دشواری ہوری ہے، نوٹیفیکیشن لَیوَل کا بٹن ٹاپک کے نچلے حصے میں واقع ہے۔
+        reply: |-
+          شاباش! مجھے امید ہے کہ آپ نے اس ٹاپک کو خاموش نہیں کردیا کیونکہ میں بعض اوقات تھوڑا سا باتونی ہو سکتا ہوں :grin:۔
+
+          نوٹ کریں کہ جب آپ کسی ٹاپک پر جواب دیتے ہیں یا چند منٹ سے زائد ایک ٹاپک کو پڑھتے ہیں، تو یہ خود کار طریقے سے 'ٹریکنگ' کے نوٹیفیکیشن لَیوَل پر سَیٹ کر دیا جاتا ہے۔ آپ اسے [اپنی صارف ترجیحات](/my/preferences) میں تبدیل کرسکتے ہیں۔
+      poll:
+        instructions: |-
+          کیا آپ جانتے تھے کہ آپ کسی بھی پوسٹ کو ساتھ ایک پَول شامل کرسکتے ہیں؟ **ایک پَول بنانے** کیلئے ایڈیٹر میں <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> گَیئر کا استعمال کریں۔
+        not_found: |-
+          اوہو! آپ کے جواب میں کوئی پَول نہیں تھا۔
+
+          ایڈیٹر میں <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> گَیئر آیکن کا استعمال کریں، یا یہ پَول اپنے اگلے جواب میں کاپی اور پیسٹ کریں:
+
+          ```متن
+          [poll]
+          * :cat:
+          * :dog:
+          [/poll]
+          ```
+        reply: |-
+          ارے، اچھا پَول! میں آپ کو تعلیم دینے میں کیسا رہا؟
+
+          [poll]
+          * :+1:
+          * :-1:
+          [/poll]
+      details:
+        instructions: |-
+          بعض اوقات آپ اپنے جوابات میں **تفصیلات چھپانا** چاہیں گے:
+
+          - جب آپ کسی فلم یا ٹی وی شو کے پلاٹ پوائنٹس، جو کہ سپائیلر سمجھے جائیں، پر بحث کررہے ہوں۔
+
+          - جب آپ کی پوسٹ کو بہت ساری اضافی تفصیلات کی ضرورت ہو لیکن وہ سب ایک بار میں ایک ساتھ پڑھنا بہت زیادہ لگے۔
+
+          [تفصیلات=اسے منتخب کریں دیکھنے کیلئے کہ یہ کیسے کام کرتا ہے!]
+          1. ایڈیٹر میں <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16">گَیئر منتخب کریں۔
+          2. "تفصیلات چھپائیں" منتخب کریں۔
+          3. تفصیلات کا خلاصہ ترمیم کریں اور اپنے مواد کو شامل کریں۔
+          [/ تفصیلات]
+
+          کیا آپ <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> گَیئر کا استعمال کرکہ اپنے اگلے جواب میں ایک تفصیلات کا سیکشن شامل کرسکتے ہیں؟
+        not_found: |-
+          تفصیلات ویجَیٹ بنانے میں دشواری ہو رہی ہے؟ اپنے اگلے جواب میں درج ذیل شامل کرنے کی کوشش کریں:
+
+          ```متن
+          [تفصیلات=تفصیلات کے لیے مجھے منتخب کریں]
+          یہاں تفصیلات ہیں
+          [/ تفصیلات]
+          ```
+        reply: |-
+          عظیم کام - آپ کی _تفصیل_ پہ توجہ قابل ستائش ہے!
+      end:
+        message: |-
+          آپ یقیناً ایک _اَیڈوانسڈ صارف_ کی طرح سے اِس میں سے گزر گئے :bow:
+
+          %{certificate}
+
+          بس آپ کیلئے میرے پاس یہی ہے۔
+
+          ابھی کے لئے الوداع! اگر آپ دوبارہ میرے ساتھ بات کرنا چاہیں، تو مجھے کسی بھی وقت ایک پیغام بھیجیں :sunglasses:
+      certificate:
+        alt: 'اَیڈوانسڈ صارف ٹریک کا کامیابی کا سرٹیفِکیٹ'
diff --git a/plugins/discourse-narrative-bot/config/locales/server.vi.yml b/plugins/discourse-narrative-bot/config/locales/server.vi.yml
index fa809fe162c..3d31b5ee779 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.vi.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.vi.yml
@@ -5,4 +5,7 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-vi: {}
+vi:
+  site_settings:
+    discourse_narrative_bot_enabled: 'Bật Discourse Narrative Bot'
+    disable_discourse_narrative_bot_welcome_post: "Tắt tính năng gửi lời chào từ Discourse Narrative Bot"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml b/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
index a8e8036a40e..ab6c4205687 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
@@ -221,8 +221,6 @@ zh_CN:
 
           选择我帖子中的任何文字都会弹出<kbd>**引用**</kbd>按钮。然后选中文字的同时按下**回复**按钮也可以！你可以再试一次吗？
       bookmark:
-        instructions: |-
-          如果你想了解更多，请选择下方<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">并<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16">**收藏此私信**。如果你这样做，你一会可能收到份 :gift: ！
         reply: |-
           太棒了！现在你可以轻松地找到我们的私信了。它就在[你个人页面的收藏栏](%{profile_page_url}/activity/bookmarks)中。选择右上方你的个人头像  &#8599;
         not_found: |-
@@ -357,12 +355,6 @@ zh_CN:
         reply: |-
           漂亮！记住这对分类和标签（如果站点启用了它的话）都有用。
       change_topic_notification_level:
-        instructions: |-
-          每个主题都有通知等级。默认为“普通”，只有别人直接回复你的时候才会提醒你。
-
-          默认情况下，私信中的通知等级被设为最高级“监看”，即你将收到每个新回复的提醒。但是你可以覆盖任意一个主题的通知等级至“监看”、“追踪”或“静音”。
-
-          让我们试试改变这个主题的通知等级。在主题最下方，你可以看到一个**监看**的按钮。你可以把通知等级改到**追踪**吗？
         not_found: |-
           看起来你仍在监看 :eyes: 这个主题！没找到按钮？通知等级就在主题页面的最下方。
         reply: |-
@@ -391,20 +383,6 @@ zh_CN:
           * :-1:
           [/poll]
       details:
-        instructions: |-
-          有时你可能想在回复中**隐藏详情**：
-
-          - 当你讨论电影或者电视节目中可能剧透的情节时。
-
-          - 当你帖子中有大量一次性读完可能太困难的可选细节时。
-
-          [details=点这里看它如何工作！]
-          1. 点击编辑器中的<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16">齿轮图标。
-          2. 选择“隐藏详情”。
-          3. 编辑详情概要并添加内容。
-          [/details]
-
-          你可以用编辑器中的<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16">齿轮图标在下次回复中添加一节详情吗？
         not_found: |-
           添加详情控件时碰到麻烦了？试试在下个回复中包含下列文字：
 
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/actions.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/actions.rb
index d8b6c47b1aa..349aedd5237 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/actions.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/actions.rb
@@ -32,22 +32,23 @@ module DiscourseNarrativeBot
 
     def reset_rate_limits(post)
       user = post.user
-      data = DiscourseNarrativeBot::Store.get(user.id.to_s)
 
+      duration =
+        if user && user.new_user?
+          SiteSetting.rate_limit_new_user_create_post
+        else
+          SiteSetting.rate_limit_create_post
+        end
+
+      return unless duration > 0
+
+      data = DiscourseNarrativeBot::Store.get(user.id.to_s)
       return unless data
 
       key = "#{DiscourseNarrativeBot::PLUGIN_NAME}:reset-rate-limit:#{post.topic_id}:#{data['state']}"
 
       if !(count = $redis.get(key))
         count = 0
-
-        duration =
-          if user && user.new_user?
-            SiteSetting.rate_limit_new_user_create_post
-          else
-            SiteSetting.rate_limit_create_post
-          end
-
         $redis.setex(key, duration, count)
       end
 
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb
index a503392f95b..6cf34164852 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb
@@ -176,7 +176,7 @@ module DiscourseNarrativeBot
       }
 
       if @post &&
-         @post.archetype == Archetype.private_message &&
+         @post.topic.private_message? &&
          @post.topic.topic_allowed_users.pluck(:user_id).include?(@user.id)
 
         opts = opts.merge(topic_id: @post.topic_id)
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/base.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/base.rb
index f2bbc9d3b1c..9b685d9b38b 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/base.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/base.rb
@@ -119,10 +119,12 @@ module DiscourseNarrativeBot
         date: Time.zone.now.strftime('%b %d %Y'),
         format: :svg
       }
-
       options.merge!(type: type) if type
+
       src = Discourse.base_url + DiscourseNarrativeBot::Engine.routes.url_helpers.certificate_path(options)
-      "<img class='discobot-certificate' src='#{src}' width='650' height='464' alt='#{I18n.t("#{self.class::I18N_KEY}.certificate.alt")}'>"
+      alt = CGI.escapeHTML(I18n.t("#{self.class::I18N_KEY}.certificate.alt"))
+
+      "<img class='discobot-certificate' src='#{src}' width='650' height='464' alt='#{alt}'>"
     end
 
     protected
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
index 040da62c01f..26ab1437d64 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
@@ -182,15 +182,20 @@ module DiscourseNarrativeBot
       #{instance_eval(&@next_instructions)}
       RAW
 
+      title = I18n.t("#{I18N_KEY}.hello.title", title: SiteSetting.title)
+      if SiteSetting.max_emojis_in_title == 0
+        title = title.gsub(/:([\w\-+]+(?::t\d)?):/, '').strip
+      end
+
       opts = {
-        title: I18n.t("#{I18N_KEY}.hello.title", title: SiteSetting.title),
+        title: title,
         target_usernames: @user.username,
         archetype: Archetype.private_message,
         subtype: TopicSubtype.system_message,
       }
 
       if @post &&
-         @post.archetype == Archetype.private_message &&
+         @post.topic.private_message? &&
          @post.topic.topic_allowed_users.pluck(:user_id).include?(@user.id)
 
         opts = opts.merge(topic_id: @post.topic_id)
diff --git a/plugins/discourse-narrative-bot/plugin.rb b/plugins/discourse-narrative-bot/plugin.rb
index cb95d19cba9..aaecead511c 100644
--- a/plugins/discourse-narrative-bot/plugin.rb
+++ b/plugins/discourse-narrative-bot/plugin.rb
@@ -1,10 +1,23 @@
 # name: discourse-narrative-bot
 # about: Introduces staff to Discourse
-# version: 0.0.1
-# authors: Nick Sahler (@nicksahler)
+# version: 1.0
+# authors: Nick Sahler, Alan Tan
 # url: https://github.com/discourse/discourse/tree/master/plugins/discourse-narrative-bot
 
 enabled_site_setting :discourse_narrative_bot_enabled
+hide_plugin if self.respond_to?(:hide_plugin)
+
+if Rails.env == "development"
+  # workaround, teach reloader to reload jobs
+  # if we do not do this then
+  #
+  # 1. on reload rails goes and undefines Jobs::Base
+  # 2. as a side effect this undefines Jobs::BotInput
+  # 3. we have a post_edited hook that queues a job for bot input
+  # 4. if you are not running sidekiq in dev every time you save a post it will trigger it
+  # 5. but the constant can not be autoloaded
+  Rails.configuration.autoload_paths << File.expand_path('../autoload', __FILE__)
+end
 
 require_relative 'lib/discourse_narrative_bot/welcome_post_type_site_setting.rb'
 
@@ -14,12 +27,12 @@ after_initialize do
   Mime::Type.register "image/svg+xml", :svg
 
   [
-    '../jobs/bot_input.rb',
-    '../jobs/narrative_timeout.rb',
-    '../jobs/narrative_init.rb',
-    '../jobs/send_default_welcome_message.rb',
-    '../jobs/onceoff/grant_badges.rb',
-    '../jobs/onceoff/remap_old_bot_images.rb',
+    '../autoload/jobs/bot_input.rb',
+    '../autoload/jobs/narrative_timeout.rb',
+    '../autoload/jobs/narrative_init.rb',
+    '../autoload/jobs/send_default_welcome_message.rb',
+    '../autoload/jobs/onceoff/grant_badges.rb',
+    '../autoload/jobs/onceoff/remap_old_bot_images.rb',
     '../lib/discourse_narrative_bot/actions.rb',
     '../lib/discourse_narrative_bot/base.rb',
     '../lib/discourse_narrative_bot/new_user_narrative.rb',
@@ -112,6 +125,10 @@ after_initialize do
     end
   end
 
+  self.on(:user_unstaged) do |user|
+    user.enqueue_bot_welcome_post
+  end
+
   self.add_to_class(:user, :enqueue_bot_welcome_post) do
     return if SiteSetting.disable_discourse_narrative_bot_welcome_post
 
diff --git a/plugins/discourse-narrative-bot/server.sr.yml b/plugins/discourse-narrative-bot/server.sr.yml
deleted file mode 100644
index 5380c470050..00000000000
--- a/plugins/discourse-narrative-bot/server.sr.yml
+++ /dev/null
@@ -1 +0,0 @@
-sr: {}
diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb
index 81f0e011558..8ec9fc24b93 100644
--- a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb
@@ -22,6 +22,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
   let(:reset_trigger) { DiscourseNarrativeBot::TrackSelector.reset_trigger }
 
   before do
+    SiteSetting.queue_jobs = false
     SiteSetting.discourse_narrative_bot_enabled = true
   end
 
diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
index 1fe809178bc..31ce253ce06 100644
--- a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
@@ -24,6 +24,7 @@ describe DiscourseNarrativeBot::NewUserNarrative do
   let(:reset_trigger) { DiscourseNarrativeBot::TrackSelector.reset_trigger }
 
   before do
+    SiteSetting.queue_jobs = false
     SiteSetting.discourse_narrative_bot_enabled = true
   end
 
@@ -211,6 +212,22 @@ describe DiscourseNarrativeBot::NewUserNarrative do
           expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_bookmark)
         end
 
+        describe 'when rate_limit_new_user_create_post site setting is disabled' do
+          before do
+            SiteSetting.rate_limit_new_user_create_post = 0
+          end
+
+          it 'should create the right reply' do
+            narrative.input(:reply, user, post: post)
+            new_post = Post.last
+
+            expect(new_post.raw).to eq(I18n.t(
+              'discourse_narrative_bot.new_user_narrative.bookmark.not_found',
+              base_uri: ''
+            ))
+          end
+        end
+
         describe 'when reply contains the skip trigger' do
           it 'should create the right reply' do
             post.update!(raw: "@#{discobot_user.username} #{skip_trigger.upcase}")
diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb
index 5e7594a2e72..7f0effc9068 100644
--- a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb
@@ -36,6 +36,10 @@ describe DiscourseNarrativeBot::TrackSelector do
     end_message.chomp
   end
 
+  before do
+    SiteSetting.queue_jobs = false
+  end
+
   describe '#select' do
     context 'in a PM with discobot' do
       let(:first_post) { Fabricate(:post, user: discobot_user) }
diff --git a/plugins/discourse-narrative-bot/spec/integration/discobot_certificate_spec.rb b/plugins/discourse-narrative-bot/spec/integration/discobot_certificate_spec.rb
index 5e2f58d84ee..c635a357cac 100644
--- a/plugins/discourse-narrative-bot/spec/integration/discobot_certificate_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/integration/discobot_certificate_spec.rb
@@ -28,8 +28,8 @@ describe "Discobot Certificate" do
         }
 
         params.each do |key, _|
-          expect { get '/discobot/certificate.svg', params: params.except(key) }
-            .to raise_error(Discourse::InvalidParameters)
+          get '/discobot/certificate.svg', params: params.except(key)
+          expect(response.status).to eq(400)
         end
       end
     end
diff --git a/plugins/discourse-narrative-bot/spec/integration/discobot_welcome_post_spec.rb b/plugins/discourse-narrative-bot/spec/integration/discobot_welcome_post_spec.rb
index 9ada964d7ab..f9087b74597 100644
--- a/plugins/discourse-narrative-bot/spec/integration/discobot_welcome_post_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/integration/discobot_welcome_post_spec.rb
@@ -4,7 +4,6 @@ describe "Discobot welcome post" do
   let(:user) { Fabricate(:user) }
 
   before do
-    SiteSetting.queue_jobs = true
     SiteSetting.discourse_narrative_bot_enabled = true
   end
 
diff --git a/plugins/discourse-narrative-bot/spec/user_spec.rb b/plugins/discourse-narrative-bot/spec/user_spec.rb
index 86dde81499c..216e2d66fcc 100644
--- a/plugins/discourse-narrative-bot/spec/user_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/user_spec.rb
@@ -5,6 +5,7 @@ describe User do
   let(:profile_page_url) { "#{Discourse.base_url}/users/#{user.username}" }
 
   before do
+    SiteSetting.queue_jobs = false
     SiteSetting.discourse_narrative_bot_enabled = true
   end
 
@@ -32,6 +33,21 @@ describe User do
         end
       end
 
+      context 'with title emoji disabled' do
+        before do
+          SiteSetting.disable_discourse_narrative_bot_welcome_post = false
+          SiteSetting.max_emojis_in_title = 0
+        end
+
+        it 'initiates the bot' do
+          expect { user }.to change { Topic.count }.by(1)
+
+          expect(Topic.last.title).to eq(I18n.t(
+            'discourse_narrative_bot.new_user_narrative.hello.title'
+          ).gsub(/:robot:/, '').strip)
+        end
+      end
+
       context 'enabled' do
         before do
           SiteSetting.disable_discourse_narrative_bot_welcome_post = false
@@ -63,7 +79,6 @@ describe User do
         describe 'when welcome message is configured to be delayed' do
           before do
             SiteSetting.discourse_narrative_bot_welcome_post_delay = 100
-            SiteSetting.queue_jobs = true
           end
 
           it 'should delay the welcome post until user logs in' do
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.ar.yml b/plugins/discourse-nginx-performance-report/config/locales/server.ar.yml
index 65b70e00fbe..6d72a5333e5 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.ar.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.ar.yml
@@ -1,3 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
 ar:
   site_settings:
     daily_performance_report: "تحليل سجلّات الخادم NGINX يوميًا ونشر موضوع مفصّل مع طاقم الموقع"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.bg.yml b/plugins/discourse-nginx-performance-report/config/locales/server.bg.yml
new file mode 100644
index 00000000000..53ef6a6fa6a
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.bg.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+bg: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.bs_BA.yml b/plugins/discourse-nginx-performance-report/config/locales/server.bs_BA.yml
new file mode 100644
index 00000000000..7b73cd2f229
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.bs_BA.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+bs_BA: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.ca.yml b/plugins/discourse-nginx-performance-report/config/locales/server.ca.yml
new file mode 100644
index 00000000000..aefbae799eb
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.ca.yml
@@ -0,0 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ca:
+  site_settings:
+    daily_performance_report: "Analitza els logs de NGINX diàriament, i publica un tema només per a l'equip amb els detalls"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.cs.yml b/plugins/discourse-nginx-performance-report/config/locales/server.cs.yml
new file mode 100644
index 00000000000..3ee9703c97c
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.cs.yml
@@ -0,0 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+cs:
+  site_settings:
+    daily_performance_report: "Analyzovat denní logy NGINX a zaslat téma s podrobnostmi přístupné pouze členům redakce."
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.da.yml b/plugins/discourse-nginx-performance-report/config/locales/server.da.yml
new file mode 100644
index 00000000000..9ca8189621d
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.da.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+da: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.de.yml b/plugins/discourse-nginx-performance-report/config/locales/server.de.yml
index b3614c80ca1..d03cf194457 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.de.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.de.yml
@@ -1,3 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
 de:
   site_settings:
     daily_performance_report: "Analysiere die NGINX-Logs täglich. Poste anschließend eine Zusammenfassung als Beitrag, welcher nur für Moderatoren oder Administratoren zugänglich ist."
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.el.yml b/plugins/discourse-nginx-performance-report/config/locales/server.el.yml
new file mode 100644
index 00000000000..63bf4b0e2fe
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.el.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+el: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.es.yml b/plugins/discourse-nginx-performance-report/config/locales/server.es.yml
index c825ad36cbd..b12872ac7f0 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.es.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.es.yml
@@ -1,3 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
 es:
   site_settings:
-    daily_performance_report: "Analizar registros de NGINX diariamente y publicar un tema para Administradores con los detalles"
+    daily_performance_report: "Analizar los registros de NGINX diariamente y publicar un tema para administradores con los detalles"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.et.yml b/plugins/discourse-nginx-performance-report/config/locales/server.et.yml
new file mode 100644
index 00000000000..8c601aa1ed9
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.et.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+et: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.fa_IR.yml b/plugins/discourse-nginx-performance-report/config/locales/server.fa_IR.yml
index e579400fae6..a2a48af4a4d 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.fa_IR.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.fa_IR.yml
@@ -1,3 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
 fa_IR:
   site_settings:
     daily_performance_report: "تحلیل لاگ‌های NGINX و ارسال یک پست شامل جزئیات ویژه مدیران"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.fi.yml b/plugins/discourse-nginx-performance-report/config/locales/server.fi.yml
index 960f5f31890..e438a7bf682 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.fi.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.fi.yml
@@ -1,3 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
 fi:
   site_settings:
     daily_performance_report: "Analysoi NGINX lokit päivittäin ja julkaise vain henkilökunnalle näkyvä ketju yksityiskohdista"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.fr.yml b/plugins/discourse-nginx-performance-report/config/locales/server.fr.yml
index 8164b341734..6867c869755 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.fr.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.fr.yml
@@ -1,3 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
 fr:
   site_settings:
     daily_performance_report: "Analyser les logs de NGINX quotidiennement et poster un sujet Responsables Uniquement avec les détails"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.gl.yml b/plugins/discourse-nginx-performance-report/config/locales/server.gl.yml
new file mode 100644
index 00000000000..695b5cf2879
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.gl.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+gl: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.he.yml b/plugins/discourse-nginx-performance-report/config/locales/server.he.yml
index 38bd6fc06b9..8a96541962a 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.he.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.he.yml
@@ -1,3 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
 he:
   site_settings:
     daily_performance_report: "Analyze NGINX logs daily and post a Staff Only topic with details"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.id.yml b/plugins/discourse-nginx-performance-report/config/locales/server.id.yml
new file mode 100644
index 00000000000..2112cad6a27
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.id.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+id: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.it.yml b/plugins/discourse-nginx-performance-report/config/locales/server.it.yml
new file mode 100644
index 00000000000..12c5162aabd
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.it.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+it: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.ja.yml b/plugins/discourse-nginx-performance-report/config/locales/server.ja.yml
index 3c445c8fdef..12af1da55f8 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.ja.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.ja.yml
@@ -1,3 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
 ja:
   site_settings:
     daily_performance_report: "日別のNGINXのログを解析し、Staff Onlyトピックへ詳細を投稿する"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.ko.yml b/plugins/discourse-nginx-performance-report/config/locales/server.ko.yml
index b5d846206de..7e6a71596bc 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.ko.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.ko.yml
@@ -1,3 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
 ko:
   site_settings:
     daily_performance_report: "NGINX 일별 로그를 분석하고 상세정보를 스태프들에게 글타래 게시"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.lv.yml b/plugins/discourse-nginx-performance-report/config/locales/server.lv.yml
new file mode 100644
index 00000000000..dc48bb58eef
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.lv.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+lv: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.nb_NO.yml b/plugins/discourse-nginx-performance-report/config/locales/server.nb_NO.yml
new file mode 100644
index 00000000000..9beb50d498f
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.nb_NO.yml
@@ -0,0 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+nb_NO:
+  site_settings:
+    daily_performance_report: "Analyser NGINX logger hver dag og opprett et emne for Staben med detaljer "
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.nl.yml b/plugins/discourse-nginx-performance-report/config/locales/server.nl.yml
index 63ba82f2242..e9b5e384e05 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.nl.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.nl.yml
@@ -1,3 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
 nl:
   site_settings:
     daily_performance_report: "Analyseer elke dag NGINX logs en post een Alleen Voor Medewerkers topic met de details"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.pl_PL.yml b/plugins/discourse-nginx-performance-report/config/locales/server.pl_PL.yml
new file mode 100644
index 00000000000..c04d371e5a4
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.pl_PL.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+pl_PL: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.pt.yml b/plugins/discourse-nginx-performance-report/config/locales/server.pt.yml
index ef5e821867f..894545936ba 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.pt.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.pt.yml
@@ -1,3 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
 pt:
   site_settings:
     daily_performance_report: "Analise os logs diários NGINX e publique um tópico visível apenas para o pessoal com detalhes"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.pt_BR.yml b/plugins/discourse-nginx-performance-report/config/locales/server.pt_BR.yml
index 2ed8d9a5296..f1d06bdb060 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.pt_BR.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.pt_BR.yml
@@ -1,3 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
 pt_BR:
   site_settings:
     daily_performance_report: "Analiza logs do NGINX diariamente e cria um tópico na categoria Somente Equipe com os detalhes."
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.ro.yml b/plugins/discourse-nginx-performance-report/config/locales/server.ro.yml
new file mode 100644
index 00000000000..31d1c440135
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.ro.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ro: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.ru.yml b/plugins/discourse-nginx-performance-report/config/locales/server.ru.yml
index ff0c212b4c0..c4212530c44 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.ru.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.ru.yml
@@ -1,3 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
 ru:
   site_settings:
     daily_performance_report: "Ежедневно анализировать логи сервера NGINX и отправлять сообщение с результатами анализа в тему, видимую только персоналу."
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.sk.yml b/plugins/discourse-nginx-performance-report/config/locales/server.sk.yml
index 0b53aa1a5eb..d2b1d85b8de 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.sk.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.sk.yml
@@ -1,3 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
 sk:
   site_settings:
     daily_performance_report: "Denne analyzuj NGINX logy a z detailov vytváraj témy iba pre zamestnancov."
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.sl.yml b/plugins/discourse-nginx-performance-report/config/locales/server.sl.yml
new file mode 100644
index 00000000000..154d194f86c
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.sl.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sl: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.sq.yml b/plugins/discourse-nginx-performance-report/config/locales/server.sq.yml
index 58f330c7a74..463900e4fb4 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.sq.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.sq.yml
@@ -1,3 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
 sq:
   site_settings:
     daily_performance_report: "Analyze NGINX logs daily and post a Staff Only topic with details"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.sr.yml b/plugins/discourse-nginx-performance-report/config/locales/server.sr.yml
new file mode 100644
index 00000000000..7e57a61dd21
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.sr.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sr: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.sv.yml b/plugins/discourse-nginx-performance-report/config/locales/server.sv.yml
new file mode 100644
index 00000000000..fd54901f750
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.sv.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sv: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.te.yml b/plugins/discourse-nginx-performance-report/config/locales/server.te.yml
new file mode 100644
index 00000000000..49141baa040
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.te.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+te: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.th.yml b/plugins/discourse-nginx-performance-report/config/locales/server.th.yml
new file mode 100644
index 00000000000..7ed98e15d8c
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.th.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+th: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.tr_TR.yml b/plugins/discourse-nginx-performance-report/config/locales/server.tr_TR.yml
index b10f10d50e9..c6ce04582fb 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.tr_TR.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.tr_TR.yml
@@ -1,3 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
 tr_TR:
   site_settings:
     daily_performance_report: "NGINX kayıtlarını analiz edip detaylı bir şekilde günlük Yetkili kategorisinde bir konu içerisinde paylaş."
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.uk.yml b/plugins/discourse-nginx-performance-report/config/locales/server.uk.yml
new file mode 100644
index 00000000000..3acfff74e88
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.uk.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+uk: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.ur.yml b/plugins/discourse-nginx-performance-report/config/locales/server.ur.yml
index c9ce6b0c708..0d61b8f9d59 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.ur.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.ur.yml
@@ -1,3 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
 ur:
   site_settings:
     daily_performance_report: "Analyze NGINX logs daily and post a Staff Only topic with details"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.vi.yml b/plugins/discourse-nginx-performance-report/config/locales/server.vi.yml
index 01743449ec3..0ad2a948e21 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.vi.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.vi.yml
@@ -1,3 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
 vi:
   site_settings:
     daily_performance_report: "Phân tích nhật ký NGINX hàng ngày và gửi cho BQT thông tin chi tiết"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.zh_CN.yml b/plugins/discourse-nginx-performance-report/config/locales/server.zh_CN.yml
new file mode 100644
index 00000000000..b3ee6f8f270
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.zh_CN.yml
@@ -0,0 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+zh_CN:
+  site_settings:
+    daily_performance_report: "每日分析 NGINX 日志并且发布详情主题到管理人员才能看到的主题"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.zh_TW.yml b/plugins/discourse-nginx-performance-report/config/locales/server.zh_TW.yml
new file mode 100644
index 00000000000..92c18de9aec
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.zh_TW.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+zh_TW: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.zn_CN.yml b/plugins/discourse-nginx-performance-report/config/locales/server.zn_CN.yml
deleted file mode 100644
index dd6ab319564..00000000000
--- a/plugins/discourse-nginx-performance-report/config/locales/server.zn_CN.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-zn_CN:
-  site_settings:
-    daily_performance_report: "每日分析 NGINX 日志并且发布详情主题到管理人员才能看到的主题"
diff --git a/plugins/discourse-nginx-performance-report/plugin.rb b/plugins/discourse-nginx-performance-report/plugin.rb
index 4b139778def..830ab1f69f6 100644
--- a/plugins/discourse-nginx-performance-report/plugin.rb
+++ b/plugins/discourse-nginx-performance-report/plugin.rb
@@ -3,6 +3,10 @@
 # version: 0.1
 # url: https://github.com/discourse/discourse/tree/master/plugins/discourse-nginx-performance-report
 
+enabled_site_setting :daily_performance_report
+enabled_site_setting_filter "daily_performance_report"
+hide_plugin if self.respond_to?(:hide_plugin)
+
 after_initialize do
   load File.expand_path("../app/jobs/scheduled/daily_performance_report.rb", __FILE__)
 end
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
index a16c2d2293a..296736f3c3f 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
@@ -68,6 +68,10 @@ export default Ember.Component.extend({
 
     this.clear();
 
+    if (!['reply', 'edit'].includes(this.get('action'))) {
+      return;
+    }
+
     this.publish({
       response_needed: true,
       previous: this.get('previousState'),
@@ -76,6 +80,9 @@ export default Ember.Component.extend({
       if (this.get('isDestroyed')) { return; }
       this.set('presenceUsers', r.users);
       this.set('channel', r.messagebus_channel);
+
+      if (!r.messagebus_channel) { return; }
+
       this.messageBus.subscribe(r.messagebus_channel, message => {
         if (!this.get('isDestroyed')) this.set('presenceUsers', message.users);
         this._clearTimer = Ember.run.debounce(this, 'clear', keepAliveDuration + bufferTime);
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs b/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs
index bc5d6876f33..97936135d0f 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs
+++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs
@@ -1,9 +1,10 @@
 {{#if shouldDisplay}}
   <div class="presence-users">
-    {{#each users as |user|}}
-      {{avatar user avatarTemplatePath="avatar_template" usernamePath="username" imageSize="small"}}
-    {{/each}}
-
+    <div class="presence-avatars">
+      {{#each users as |user|}}
+        {{avatar user avatarTemplatePath="avatar_template" usernamePath="username" imageSize="small"}}
+      {{/each}}
+    </div>
     <span class="presence-text">
       <span class="description">
         {{#if isReply ~}}
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/components/topic-presence-display.hbs b/plugins/discourse-presence/assets/javascripts/discourse/templates/components/topic-presence-display.hbs
index a459527ff4f..636ba39a268 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/templates/components/topic-presence-display.hbs
+++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/components/topic-presence-display.hbs
@@ -1,9 +1,10 @@
 {{#if shouldDisplay}}
   <div class="presence-users">
-    {{#each users as |user|}}
-      {{avatar user avatarTemplatePath="avatar_template" usernamePath="username" imageSize="small"}}
-    {{/each}}
-
+    <div class="presence-avatars">
+      {{#each users as |user|}}
+        {{avatar user avatarTemplatePath="avatar_template" usernamePath="username" imageSize="small"}}
+      {{/each}}
+    </div>
     <span class="presence-text">
       <span class="description">{{i18n 'presence.replying_to_topic' count=users.length}}</span>{{!-- (using comment to stop whitespace)
   --}}<span class="wave"><span class="dot">.</span><span class="dot">.</span><span class="dot">.</span></span>
diff --git a/plugins/discourse-presence/assets/stylesheets/presence.scss b/plugins/discourse-presence/assets/stylesheets/presence.scss
index bd4612817f7..3fc25f06a5b 100644
--- a/plugins/discourse-presence/assets/stylesheets/presence.scss
+++ b/plugins/discourse-presence/assets/stylesheets/presence.scss
@@ -1,15 +1,24 @@
 .presence-users {
   background-color: $secondary;
   color: $primary-medium;
-  padding: 0px 5px;
   display: flex;
-  align-items: center;
   
   span.presence-text {
     margin-left: 5px;
+    margin-right: 2px;
+    flex: 0 0 auto;
+    padding-top: 3px;    
+  }
+
+  .presence-avatars {
+    display: flex;
+    overflow: hidden;
+    flex-wrap: wrap;    
   }
 
   .wave {
+    flex: 0 0 auto;
+    
     .dot {
       display: inline-block;
       animation: wave 1.8s linear infinite;
@@ -38,13 +47,26 @@
 .composer-fields .presence-users {
   position: absolute;
   top: 18px;
-  right: 35px;
+  right: 40px;
+  @media screen and (max-width: $small-width) {
+    max-width: 318px;    
+    .presence-avatars {
+      flex-wrap: nowrap;
+    }
+  }
 }
 
 .mobile-view {
+  .presence-users {
+    font-size: $font-down-1;
+  }
   .composer-fields .presence-users {
     top: 3px;
-    right: 54px;
+    right: 65px;
+    max-width: 70px;
+    .presence-avatars {
+      flex-wrap: nowrap;
+    }
     .description {
       display:none;
     }
diff --git a/plugins/discourse-presence/config/locales/client.bg.yml b/plugins/discourse-presence/config/locales/client.bg.yml
new file mode 100644
index 00000000000..53ef6a6fa6a
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.bg.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+bg: {}
diff --git a/plugins/discourse-presence/config/locales/client.ca.yml b/plugins/discourse-presence/config/locales/client.ca.yml
index b5b08188d79..40e675bd878 100644
--- a/plugins/discourse-presence/config/locales/client.ca.yml
+++ b/plugins/discourse-presence/config/locales/client.ca.yml
@@ -10,3 +10,6 @@ ca:
     presence:
       replying: "responent"
       editing: "editant"
+      replying_to_topic:
+        one: "responent"
+        other: "responent"
diff --git a/plugins/discourse-presence/config/locales/client.cs.yml b/plugins/discourse-presence/config/locales/client.cs.yml
index c0f2fec763b..806c3fd4c06 100644
--- a/plugins/discourse-presence/config/locales/client.cs.yml
+++ b/plugins/discourse-presence/config/locales/client.cs.yml
@@ -5,4 +5,8 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-cs: {}
+cs:
+  js:
+    presence:
+      replying: "odpovídá"
+      editing: "upravuje"
diff --git a/plugins/discourse-presence/config/locales/client.de.yml b/plugins/discourse-presence/config/locales/client.de.yml
index fbd73c9c117..ebe61bdfe4d 100644
--- a/plugins/discourse-presence/config/locales/client.de.yml
+++ b/plugins/discourse-presence/config/locales/client.de.yml
@@ -12,4 +12,4 @@ de:
       editing: "bearbeitet"
       replying_to_topic:
         one: "antwortet"
-        other: "antworten"
+        other: "antwortet"
diff --git a/plugins/discourse-presence/config/locales/client.el.yml b/plugins/discourse-presence/config/locales/client.el.yml
index f73067c3034..84ad8c7d9f4 100644
--- a/plugins/discourse-presence/config/locales/client.el.yml
+++ b/plugins/discourse-presence/config/locales/client.el.yml
@@ -10,6 +10,3 @@ el:
     presence:
       replying: "απαντά"
       editing: "επεξεργάζεται"
-      replying_to_topic:
-        one: "απαντά"
-        other: "απαντάνε"
diff --git a/plugins/discourse-presence/config/locales/client.en.yml b/plugins/discourse-presence/config/locales/client.en.yml
index ea1af30f81d..b4dc7cdd869 100644
--- a/plugins/discourse-presence/config/locales/client.en.yml
+++ b/plugins/discourse-presence/config/locales/client.en.yml
@@ -4,5 +4,5 @@ en:
       replying: "replying"
       editing: "editing"
       replying_to_topic:
-        one: "is replying"
-        other: "are replying"
+        one: "replying"
+        other: "replying"
diff --git a/plugins/discourse-presence/config/locales/client.es.yml b/plugins/discourse-presence/config/locales/client.es.yml
index 464e428784b..490d54cdb7a 100644
--- a/plugins/discourse-presence/config/locales/client.es.yml
+++ b/plugins/discourse-presence/config/locales/client.es.yml
@@ -11,5 +11,5 @@ es:
       replying: "respondiendo"
       editing: "editando"
       replying_to_topic:
-        one: "está respondiendo"
-        other: "están respondiendo"
+        one: "respondiendo"
+        other: "respondiendo"
diff --git a/plugins/discourse-presence/config/locales/client.et.yml b/plugins/discourse-presence/config/locales/client.et.yml
index 8c601aa1ed9..76578a243f7 100644
--- a/plugins/discourse-presence/config/locales/client.et.yml
+++ b/plugins/discourse-presence/config/locales/client.et.yml
@@ -5,4 +5,8 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-et: {}
+et:
+  js:
+    presence:
+      replying: "vastamine"
+      editing: "muutmine"
diff --git a/plugins/discourse-presence/config/locales/client.fa_IR.yml b/plugins/discourse-presence/config/locales/client.fa_IR.yml
index 3f564b2f111..4ed565ac18e 100644
--- a/plugins/discourse-presence/config/locales/client.fa_IR.yml
+++ b/plugins/discourse-presence/config/locales/client.fa_IR.yml
@@ -5,4 +5,8 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-fa_IR: {}
+fa_IR:
+  js:
+    presence:
+      replying: "در حال نوشتن پاسخ"
+      editing: "در حال ویرایش"
diff --git a/plugins/discourse-presence/config/locales/client.fi.yml b/plugins/discourse-presence/config/locales/client.fi.yml
index 378daadb7a7..f71340ccae5 100644
--- a/plugins/discourse-presence/config/locales/client.fi.yml
+++ b/plugins/discourse-presence/config/locales/client.fi.yml
@@ -10,6 +10,3 @@ fi:
     presence:
       replying: "kirjoittaa vastausta"
       editing: "muokkaa viestiä"
-      replying_to_topic:
-        one: "kirjoittaa vastausta"
-        other: "kirjoittavat vastausta"
diff --git a/plugins/discourse-presence/config/locales/client.he.yml b/plugins/discourse-presence/config/locales/client.he.yml
index 96b15d6088b..25b15bec218 100644
--- a/plugins/discourse-presence/config/locales/client.he.yml
+++ b/plugins/discourse-presence/config/locales/client.he.yml
@@ -5,4 +5,8 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-he: {}
+he:
+  js:
+    presence:
+      replying: "תגובה"
+      editing: "עריכה"
diff --git a/plugins/discourse-presence/config/locales/client.it.yml b/plugins/discourse-presence/config/locales/client.it.yml
index 12c5162aabd..d5034ccee8e 100644
--- a/plugins/discourse-presence/config/locales/client.it.yml
+++ b/plugins/discourse-presence/config/locales/client.it.yml
@@ -5,4 +5,8 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-it: {}
+it:
+  js:
+    presence:
+      replying: "sta rispondendo"
+      editing: "modificando"
diff --git a/plugins/discourse-presence/config/locales/client.pl_PL.yml b/plugins/discourse-presence/config/locales/client.pl_PL.yml
index 77fdb6f8e80..9228a9d70f8 100644
--- a/plugins/discourse-presence/config/locales/client.pl_PL.yml
+++ b/plugins/discourse-presence/config/locales/client.pl_PL.yml
@@ -10,8 +10,3 @@ pl_PL:
     presence:
       replying: "odpowiada"
       editing: "edytuje"
-      replying_to_topic:
-        one: "odpowiada"
-        few: "odpowiada"
-        many: "odpowiada"
-        other: "odpowiada"
diff --git a/plugins/discourse-presence/config/locales/client.pt.yml b/plugins/discourse-presence/config/locales/client.pt.yml
index d12527a51fa..5fe3a9c9d18 100644
--- a/plugins/discourse-presence/config/locales/client.pt.yml
+++ b/plugins/discourse-presence/config/locales/client.pt.yml
@@ -5,4 +5,11 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-pt: {}
+pt:
+  js:
+    presence:
+      replying: "a responder"
+      editing: "a editar"
+      replying_to_topic:
+        one: "a responder"
+        other: "a responder"
diff --git a/plugins/discourse-presence/config/locales/client.ro.yml b/plugins/discourse-presence/config/locales/client.ro.yml
index 31d1c440135..2a98a275bfe 100644
--- a/plugins/discourse-presence/config/locales/client.ro.yml
+++ b/plugins/discourse-presence/config/locales/client.ro.yml
@@ -5,4 +5,8 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-ro: {}
+ro:
+  js:
+    presence:
+      replying: "răspunde"
+      editing: "editează"
diff --git a/plugins/discourse-presence/config/locales/client.sk.yml b/plugins/discourse-presence/config/locales/client.sk.yml
index bcc3a93dc5b..1a254025e05 100644
--- a/plugins/discourse-presence/config/locales/client.sk.yml
+++ b/plugins/discourse-presence/config/locales/client.sk.yml
@@ -5,4 +5,8 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-sk: {}
+sk:
+  js:
+    presence:
+      replying: "odpovedanie"
+      editing: "upravovanie"
diff --git a/plugins/discourse-presence/config/locales/client.sl.yml b/plugins/discourse-presence/config/locales/client.sl.yml
new file mode 100644
index 00000000000..957345274d4
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.sl.yml
@@ -0,0 +1,12 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sl:
+  js:
+    presence:
+      replying: "odgovarja"
+      editing: "urejanje"
diff --git a/plugins/discourse-presence/config/locales/client.tr_TR.yml b/plugins/discourse-presence/config/locales/client.tr_TR.yml
index 1d53e46fd12..c45032612ba 100644
--- a/plugins/discourse-presence/config/locales/client.tr_TR.yml
+++ b/plugins/discourse-presence/config/locales/client.tr_TR.yml
@@ -10,5 +10,3 @@ tr_TR:
     presence:
       replying: "yanıtlama"
       editing: "düzenleme"
-      replying_to_topic:
-        other: "yanıtlıyor"
diff --git a/plugins/discourse-presence/config/locales/client.ur.yml b/plugins/discourse-presence/config/locales/client.ur.yml
index 58bc9735bcb..b6719ce236c 100644
--- a/plugins/discourse-presence/config/locales/client.ur.yml
+++ b/plugins/discourse-presence/config/locales/client.ur.yml
@@ -5,4 +5,8 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-ur: {}
+ur:
+  js:
+    presence:
+      replying: "جواب دے رہے ہیں"
+      editing: "ترمیم کر رہے ہیں"
diff --git a/plugins/discourse-presence/config/locales/client.zh_TW.yml b/plugins/discourse-presence/config/locales/client.zh_TW.yml
index c4f503ecd6b..dcfc80038fd 100644
--- a/plugins/discourse-presence/config/locales/client.zh_TW.yml
+++ b/plugins/discourse-presence/config/locales/client.zh_TW.yml
@@ -10,5 +10,3 @@ zh_TW:
     presence:
       replying: "正在回覆"
       editing: "正在編輯"
-      replying_to_topic:
-        other: "正在回覆"
diff --git a/plugins/discourse-presence/config/locales/server.bg.yml b/plugins/discourse-presence/config/locales/server.bg.yml
new file mode 100644
index 00000000000..53ef6a6fa6a
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.bg.yml
@@ -0,0 +1,8 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+bg: {}
diff --git a/plugins/discourse-presence/config/locales/server.ca.yml b/plugins/discourse-presence/config/locales/server.ca.yml
index a445d949abe..ee9e24b3008 100644
--- a/plugins/discourse-presence/config/locales/server.ca.yml
+++ b/plugins/discourse-presence/config/locales/server.ca.yml
@@ -8,3 +8,4 @@
 ca:
   site_settings:
     presence_enabled: 'Mostra usuaris que en aquests moments estan responent l''actual tema  o editant l''actual entrada?'
+    presence_max_users_shown: 'Quantitat màxima d''usuaris mostrats.'
diff --git a/plugins/discourse-presence/config/locales/server.cs.yml b/plugins/discourse-presence/config/locales/server.cs.yml
index c0f2fec763b..6ca7339ff05 100644
--- a/plugins/discourse-presence/config/locales/server.cs.yml
+++ b/plugins/discourse-presence/config/locales/server.cs.yml
@@ -5,4 +5,7 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-cs: {}
+cs:
+  site_settings:
+    presence_enabled: 'Zobrazit uživatele, kteří právě odpovídají na aktuální téma nebo upravují aktuální příspěvek?'
+    presence_max_users_shown: ' Maximální počet zobrazených uživatelů.'
diff --git a/plugins/discourse-presence/config/locales/server.de.yml b/plugins/discourse-presence/config/locales/server.de.yml
index c87ab408998..803955b4b8b 100644
--- a/plugins/discourse-presence/config/locales/server.de.yml
+++ b/plugins/discourse-presence/config/locales/server.de.yml
@@ -8,3 +8,4 @@
 de:
   site_settings:
     presence_enabled: 'Benutzer anzeigen, die gerade im aktuellen Thema antworten, oder den aktuellen Beitrag bearbeiten?'
+    presence_max_users_shown: 'Maximale Anzahl an angezeigten Benutzern.'
diff --git a/plugins/discourse-presence/config/locales/server.en.yml b/plugins/discourse-presence/config/locales/server.en.yml
index 72768d3f25f..1de132d6967 100644
--- a/plugins/discourse-presence/config/locales/server.en.yml
+++ b/plugins/discourse-presence/config/locales/server.en.yml
@@ -1,3 +1,4 @@
 en:
   site_settings:
     presence_enabled: 'Show users that are currently replying to the current topic, or editing the current post?'
+    presence_max_users_shown: 'Maximum number of users shown.'
diff --git a/plugins/discourse-presence/config/locales/server.es.yml b/plugins/discourse-presence/config/locales/server.es.yml
index 2a7dd93de91..80a5721901a 100644
--- a/plugins/discourse-presence/config/locales/server.es.yml
+++ b/plugins/discourse-presence/config/locales/server.es.yml
@@ -8,3 +8,4 @@
 es:
   site_settings:
     presence_enabled: '¿Mostrar usuarios que estén respondiendo al tema, o editando el post actual?'
+    presence_max_users_shown: 'Número máximo de usuarios mostrados.'
diff --git a/plugins/discourse-presence/config/locales/server.fa_IR.yml b/plugins/discourse-presence/config/locales/server.fa_IR.yml
index 3f564b2f111..94d71c910a1 100644
--- a/plugins/discourse-presence/config/locales/server.fa_IR.yml
+++ b/plugins/discourse-presence/config/locales/server.fa_IR.yml
@@ -5,4 +5,6 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-fa_IR: {}
+fa_IR:
+  site_settings:
+    presence_enabled: 'کاربرانی که در حال حاضر به موضوع فعلی پاسخ می دهند و یا در حال یرایش پست فعلی هستند، نمایش داده شوند؟'
diff --git a/plugins/discourse-presence/config/locales/server.fr.yml b/plugins/discourse-presence/config/locales/server.fr.yml
index 6b90de77c8e..db9f40ade08 100644
--- a/plugins/discourse-presence/config/locales/server.fr.yml
+++ b/plugins/discourse-presence/config/locales/server.fr.yml
@@ -8,3 +8,4 @@
 fr:
   site_settings:
     presence_enabled: 'Afficher les utilisateurs qui sont en train de répondre au sujet actuel ou modifier le message actuel ?'
+    presence_max_users_shown: 'Nombre maximale d''utilisateurs affiché.'
diff --git a/plugins/discourse-presence/config/locales/server.he.yml b/plugins/discourse-presence/config/locales/server.he.yml
index 96b15d6088b..fffac3380d6 100644
--- a/plugins/discourse-presence/config/locales/server.he.yml
+++ b/plugins/discourse-presence/config/locales/server.he.yml
@@ -5,4 +5,6 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-he: {}
+he:
+  site_settings:
+    presence_enabled: 'להציע משתמשים שמגיבים כרגע לנושא הנוכחי או עורכים את הרשומה הנוכחית?'
diff --git a/plugins/discourse-presence/config/locales/server.it.yml b/plugins/discourse-presence/config/locales/server.it.yml
index 12c5162aabd..9183a04a3aa 100644
--- a/plugins/discourse-presence/config/locales/server.it.yml
+++ b/plugins/discourse-presence/config/locales/server.it.yml
@@ -5,4 +5,7 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-it: {}
+it:
+  site_settings:
+    presence_enabled: 'Mostrare gli utenti mentre stanno rispondendo ad un argomento oppure modificando il messaggio corrente?'
+    presence_max_users_shown: 'Massimo numero di utenti visualizzati.'
diff --git a/plugins/discourse-presence/config/locales/server.nb_NO.yml b/plugins/discourse-presence/config/locales/server.nb_NO.yml
index 508a3706c4f..66b50e40c62 100644
--- a/plugins/discourse-presence/config/locales/server.nb_NO.yml
+++ b/plugins/discourse-presence/config/locales/server.nb_NO.yml
@@ -7,4 +7,5 @@
 
 nb_NO:
   site_settings:
-    presence_enabled: 'Vis brukere som akkurat nå svarer på gjeldende emne, eller redigerer gjeldende innlegg?'
+    presence_enabled: 'Vis brukere som akkurat nå svarer på gjeldende tråd, eller redigerer gjeldende innlegg?'
+    presence_max_users_shown: 'Maksimalt antall brukere som vises.'
diff --git a/plugins/discourse-presence/config/locales/server.pt.yml b/plugins/discourse-presence/config/locales/server.pt.yml
index d12527a51fa..92bc905171a 100644
--- a/plugins/discourse-presence/config/locales/server.pt.yml
+++ b/plugins/discourse-presence/config/locales/server.pt.yml
@@ -5,4 +5,7 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-pt: {}
+pt:
+  site_settings:
+    presence_enabled: 'Mostrar os utilizadores que estão a responder no tópico atual, ou a editar a publicação atual?'
+    presence_max_users_shown: 'Número máximo de utilizadores exibidos.'
diff --git a/plugins/discourse-presence/config/locales/server.ro.yml b/plugins/discourse-presence/config/locales/server.ro.yml
index 31d1c440135..bba2871a96c 100644
--- a/plugins/discourse-presence/config/locales/server.ro.yml
+++ b/plugins/discourse-presence/config/locales/server.ro.yml
@@ -5,4 +5,7 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-ro: {}
+ro:
+  site_settings:
+    presence_enabled: 'Afișează utilizatorii care răspund acum la subiectul curent sau editează subiectul?'
+    presence_max_users_shown: 'Numărul maxim de utilizatori afișați.'
diff --git a/plugins/discourse-presence/config/locales/server.sk.yml b/plugins/discourse-presence/config/locales/server.sk.yml
index bcc3a93dc5b..f1324fa7541 100644
--- a/plugins/discourse-presence/config/locales/server.sk.yml
+++ b/plugins/discourse-presence/config/locales/server.sk.yml
@@ -5,4 +5,7 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-sk: {}
+sk:
+  site_settings:
+    presence_enabled: 'Chcete zobraziť používateľov, ktorí momentálne odpovedajú na aktuálnu tému, alebo upravujú aktuálny príspevok?'
+    presence_max_users_shown: 'Mazimálny počet zobrazených používateľov.'
diff --git a/plugins/discourse-presence/config/locales/server.sl.yml b/plugins/discourse-presence/config/locales/server.sl.yml
new file mode 100644
index 00000000000..1d087b5e6ae
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.sl.yml
@@ -0,0 +1,11 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sl:
+  site_settings:
+    presence_enabled: 'Pokaži uporabnice/ke, ki trenutno odgovarjajo na odprto temo ali urejujejo objavo?'
+    presence_max_users_shown: 'Maksimalno prikazano število uporabnikov'
diff --git a/plugins/discourse-presence/config/locales/server.ur.yml b/plugins/discourse-presence/config/locales/server.ur.yml
index 58bc9735bcb..583c94a21ad 100644
--- a/plugins/discourse-presence/config/locales/server.ur.yml
+++ b/plugins/discourse-presence/config/locales/server.ur.yml
@@ -5,4 +5,7 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-ur: {}
+ur:
+  site_settings:
+    presence_enabled: 'صارفین کو دکھائیں جو فی الحال موجودہ موضوع کا جواب دے رہے ہیں، یا موجودہ پوسٹ میں ترمیم کر رہے ہیں؟'
+    presence_max_users_shown: 'دکھائے گئے صارفین کی زیادہ سے زیادہ تعداد۔'
diff --git a/plugins/discourse-presence/config/locales/server.zh_CN.yml b/plugins/discourse-presence/config/locales/server.zh_CN.yml
index 7a40e4b86ee..75928a81760 100644
--- a/plugins/discourse-presence/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-presence/config/locales/server.zh_CN.yml
@@ -8,3 +8,4 @@
 zh_CN:
   site_settings:
     presence_enabled: '显示正在回复或者编辑当前主题的用户'
+    presence_max_users_shown: '展示用户数量的最大值。'
diff --git a/plugins/discourse-presence/config/settings.yml b/plugins/discourse-presence/config/settings.yml
index 56341eeea26..07c96c3d2b8 100644
--- a/plugins/discourse-presence/config/settings.yml
+++ b/plugins/discourse-presence/config/settings.yml
@@ -2,3 +2,7 @@ plugins:
   presence_enabled:
     default: true
     client: true
+  presence_max_users_shown:
+    default: 5
+    min: 1
+    max: 50
diff --git a/plugins/discourse-presence/plugin.rb b/plugins/discourse-presence/plugin.rb
index f1e43f3f7e0..48f12a732a6 100644
--- a/plugins/discourse-presence/plugin.rb
+++ b/plugins/discourse-presence/plugin.rb
@@ -2,13 +2,14 @@
 # about: Show which users are writing a reply to a topic
 # version: 1.0
 # authors: André Pereira, David Taylor
-# url: https://github.com/discourse/discourse-presence.git
+# url: https://github.com/discourse/discourse/tree/master/plugins/discourse-presence
 
 enabled_site_setting :presence_enabled
+hide_plugin if self.respond_to?(:hide_plugin)
 
 register_asset 'stylesheets/presence.scss'
 
-PLUGIN_NAME ||= "discourse-presence".freeze
+PLUGIN_NAME ||= -"discourse-presence"
 
 after_initialize do
 
@@ -58,7 +59,7 @@ after_initialize do
 
       topic = type == 'post' ? Post.find_by(id: id).topic : Topic.find_by(id: id)
 
-      if topic.archetype == Archetype.private_message
+      if topic.private_message?
         user_ids = User.where('admin OR moderator').pluck(:id) + topic.allowed_users.pluck(:id)
         group_ids = topic.allowed_groups.pluck(:id)
 
@@ -103,8 +104,7 @@ after_initialize do
     requires_plugin PLUGIN_NAME
     before_action :ensure_logged_in
 
-    ACTIONS   ||= %w{edit reply}.each(&:freeze)
-    MAX_USERS ||= 20
+    ACTIONS ||= [-"edit", -"reply"].freeze
 
     def publish
       data = params.permit(
@@ -158,7 +158,7 @@ after_initialize do
       {
         messagebus_channel: channel,
         messagebus_id: MessageBus.last_id(channel),
-        users: users.limit(MAX_USERS).map { |u| BasicUserSerializer.new(u, root: false) }
+        users: users.limit(SiteSetting.presence_max_users_shown).map { |u| BasicUserSerializer.new(u, root: false) }
       }
     end
 
diff --git a/plugins/discourse-presence/spec/requests/presence_controller_spec.rb b/plugins/discourse-presence/spec/requests/presence_controller_spec.rb
index 0184718bc6b..8a003a9e4e1 100644
--- a/plugins/discourse-presence/spec/requests/presence_controller_spec.rb
+++ b/plugins/discourse-presence/spec/requests/presence_controller_spec.rb
@@ -23,7 +23,8 @@ describe ::Presence::PresencesController do
 
   context 'when not logged in' do
     it 'should raise the right error' do
-      expect { post '/presence/publish.json' }.to raise_error(Discourse::NotLoggedIn)
+      post '/presence/publish.json'
+      expect(response.status).to eq(403)
     end
   end
 
diff --git a/plugins/lazyYT/plugin.rb b/plugins/lazyYT/plugin.rb
index 70475b73afa..1ca0820ac44 100644
--- a/plugins/lazyYT/plugin.rb
+++ b/plugins/lazyYT/plugin.rb
@@ -4,6 +4,8 @@
 # authors: Arpit Jalan
 # url: https://github.com/discourse/discourse/tree/master/plugins/lazyYT
 
+hide_plugin if self.respond_to?(:hide_plugin)
+
 # javascript
 register_asset "javascripts/lazyYT.js"
 
@@ -33,18 +35,18 @@ end
 
 after_initialize do
 
-  Email::Styles.register_plugin_style do |fragment|
-    # YouTube onebox can't go in emails, so replace them with clickable links
-    fragment.css('.lazyYT').each do |i|
+  on(:reduce_cooked) do |fragment|
+    fragment.css(".lazyYT").each do |yt|
       begin
-        src = "https://www.youtube.com/embed/#{i['data-youtube-id']}?autoplay=1&#{i['data-parameters']}"
-        src_uri = URI(src)
-        display_src = "https://#{src_uri.host}#{src_uri.path}"
-        i.replace "<p><a href='#{src_uri.to_s}'>#{display_src}</a><p>"
+        youtube_id = yt["data-youtube-id"]
+        parameters = yt["data-parameters"]
+        uri = URI("https://www.youtube.com/embed/#{youtube_id}?autoplay=1&#{parameters}")
+        yt.replace %{<p><a href="#{uri.to_s}">https://#{uri.host}#{uri.path}</a></p>}
       rescue URI::InvalidURIError
-        # If the URL is weird, remove it
-        i.remove
+        # remove any invalid/weird URIs
+        yt.remove
       end
     end
   end
+
 end
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 3a822f139aa..ab97861dfce 100644
--- a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
+++ b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
@@ -13,13 +13,11 @@ export default Ember.Controller.extend({
 
   @computed("regularPollType", "numberPollType", "multiplePollType")
   pollTypes(regularPollType, numberPollType, multiplePollType) {
-    let types = [];
-
-    types.push({ name: I18n.t("poll.ui_builder.poll_type.regular"), value: regularPollType });
-    types.push({ name: I18n.t("poll.ui_builder.poll_type.number"), value: numberPollType });
-    types.push({ name: I18n.t("poll.ui_builder.poll_type.multiple"), value: multiplePollType });
-
-    return types;
+    return [
+      { name: I18n.t("poll.ui_builder.poll_type.regular"), value: regularPollType },
+      { name: I18n.t("poll.ui_builder.poll_type.number"), value: numberPollType },
+      { name: I18n.t("poll.ui_builder.poll_type.multiple"), value: multiplePollType },
+    ];
   },
 
   @computed("pollType", "regularPollType")
@@ -101,8 +99,8 @@ export default Ember.Controller.extend({
     return this._comboboxOptions(1, (parseInt(pollMax) || 1) + 1);
   },
 
-  @computed("isNumber", "showMinMax", "pollType", "publicPoll", "pollOptions", "pollMin", "pollMax", "pollStep")
-  pollOutput(isNumber, showMinMax, pollType, publicPoll, pollOptions, pollMin, pollMax, pollStep) {
+  @computed("isNumber", "showMinMax", "pollType", "publicPoll", "pollOptions", "pollMin", "pollMax", "pollStep", "autoClose", "date", "time")
+  pollOutput(isNumber, showMinMax, pollType, publicPoll, pollOptions, pollMin, pollMax, pollStep, autoClose, date, time) {
     let pollHeader = '[poll';
     let output = '';
 
@@ -113,15 +111,15 @@ export default Ember.Controller.extend({
     };
 
     let step = pollStep;
-    if (step < 1) {
-      step = 1;
-    }
+    if (step < 1) { step = 1; }
 
     if (pollType) pollHeader += ` type=${pollType}`;
     if (pollMin && showMinMax) pollHeader += ` min=${pollMin}`;
     if (pollMax) pollHeader += ` max=${pollMax}`;
     if (isNumber) pollHeader += ` step=${step}`;
-    if (publicPoll) pollHeader += ' public=true';
+    if (publicPoll) pollHeader += ` public=true`;
+    if (autoClose) pollHeader += ` close=${moment(date + " " + time, "YYYY-MM-DD HH:mm").toISOString()}`;
+
     pollHeader += ']';
     output += `${pollHeader}\n`;
 
@@ -186,7 +184,10 @@ export default Ember.Controller.extend({
       pollOptions: '',
       pollMin: 1,
       pollMax: null,
-      pollStep: 1
+      pollStep: 1,
+      autoClose: false,
+      date: moment().add(1, "day").format("YYYY-DD-MM"),
+      time: moment().add(1, "hour").format("HH:mm"),
     });
   },
 
diff --git a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
index 47eaa0c1a26..04eb9a61ea3 100644
--- a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
+++ b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
@@ -1,6 +1,6 @@
 {{#d-modal-body title="poll.ui_builder.title" class="poll-ui-builder"}}
   <form class="poll-ui-builder-form form-horizontal">
-    <div class="input-group">
+    <div class="input-group poll-select">
       <label class="input-group-label">{{i18n 'poll.ui_builder.poll_type.label'}}</label>
       {{combo-box content=pollTypes
                   value=pollType
@@ -9,17 +9,17 @@
     </div>
 
     {{#if showMinMax}}
-      <div class="input-group">
+      <div class="input-group poll-number">
+        {{input-tip validation=minMaxValueValidation}}
         <label class="input-group-label">{{i18n 'poll.ui_builder.poll_config.min'}}</label>
         {{input type='number'
                 value=pollMin
                 valueAttribute="value"
                 class="poll-options-min"}}
-        {{input-tip validation=minMaxValueValidation}}
       </div>
 
 
-      <div class="input-group">
+      <div class="input-group poll-number">
         <label class="input-group-label">{{i18n 'poll.ui_builder.poll_config.max'}}</label>
         {{input type='number'
                 value=pollMax
@@ -28,7 +28,7 @@
       </div>
 
       {{#if isNumber}}
-        <div class="input-group">
+        <div class="input-group poll-number">
           <label class="input-group-label">{{i18n 'poll.ui_builder.poll_config.step'}}</label>
           {{input type='number'
                   value=pollStep
@@ -40,20 +40,35 @@
       {{/if}}
     {{/if}}
 
-    <div class="input-group">
+    {{#unless isNumber}}
+      <div class="input-group poll-textarea">
+        <label>{{i18n 'poll.ui_builder.poll_options.label'}}</label>
+        {{textarea value=pollOptions}}
+        {{input-tip validation=minNumOfOptionsValidation}}
+      </div>
+    {{/unless}}
+
+    <div class="input-group poll-checkbox">
       <label>
         {{input type='checkbox' checked=publicPoll}}
         {{i18n "poll.ui_builder.poll_public.label"}}
       </label>
     </div>
 
-    {{#unless isNumber}}
+    <div class="input-group poll-checkbox">
+      <label>
+        {{input type="checkbox" checked=autoClose}}
+        {{i18n "poll.ui_builder.automatic_close.label"}}
+      </label>
+    </div>
+
+    {{#if autoClose}}
       <div class="input-group">
-        <label>{{i18n 'poll.ui_builder.poll_options.label'}}</label>
-        {{input-tip validation=minNumOfOptionsValidation}}
-        {{textarea value=pollOptions}}
+        {{date-picker-future value=date containerId="date-container"}}
+        {{input type="time" value=time}}
+        <div id="date-container"></div>
       </div>
-    {{/unless}}
+    {{/if}}
   </form>
 {{/d-modal-body}}
 
diff --git a/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6 b/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6
index 9dbe65a4ef2..bd924882713 100644
--- a/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6
+++ b/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6
@@ -4,14 +4,17 @@ import showModal from 'discourse/lib/show-modal';
 
 function initializePollUIBuilder(api) {
   api.modifyClass('controller:composer', {
-    @computed('siteSettings.poll_enabled', 'siteSettings.poll_minimum_trust_level_to_create')
-    canBuildPoll(pollEnabled, minimumTrustLevel) {
+    @computed('siteSettings.poll_enabled', 'siteSettings.poll_minimum_trust_level_to_create', 'model.topic.pm_with_non_human_user')
+    canBuildPoll(pollEnabled, minimumTrustLevel, pmWithNonHumanUser) {
       return pollEnabled &&
-             this.currentUser &&
-             (
-               this.currentUser.staff ||
-               this.currentUser.trust_level >= minimumTrustLevel
-             );
+        (
+          pmWithNonHumanUser ||
+          this.currentUser &&
+          (
+            this.currentUser.staff ||
+            this.currentUser.trust_level >= minimumTrustLevel
+          )
+        );
     },
 
     actions: {
diff --git a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6 b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
index 0138c6f99fa..7325572bb62 100644
--- a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
+++ b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
@@ -22,6 +22,13 @@ function initializePolls(api) {
     }
   });
 
+  let _glued = [];
+  let _interval = null;
+
+  function rerender() {
+    _glued.forEach(g => g.queueRerender());
+  }
+
   api.modifyClass('model:post', {
     _polls: null,
     pollsObject: null,
@@ -41,12 +48,12 @@ function initializePolls(api) {
           }
         });
         this.set("pollsObject", this._polls);
-        _glued.forEach(g => g.queueRerender());
+        rerender();
       }
     }
   });
 
-  const _glued = [];
+
   function attachPolls($elem, helper) {
     const $polls = $('.poll', $elem);
     if (!$polls.length) { return; }
@@ -60,6 +67,8 @@ function initializePolls(api) {
     const polls = post.get("pollsObject");
     if (!polls) { return; }
 
+    _interval = _interval || setInterval(rerender, 30000);
+
     $polls.each((idx, pollElem) => {
       const $poll = $(pollElem);
       const pollName = $poll.data("poll-name");
@@ -81,7 +90,13 @@ function initializePolls(api) {
   }
 
   function cleanUpPolls() {
+    if (_interval) {
+      clearInterval(_interval);
+      _interval = null;
+    }
+
     _glued.forEach(g => g.cleanUp());
+    _glued = [];
   }
 
   api.includePostAttributes("polls", "polls_votes");
diff --git a/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6 b/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6
index ca67fa921b4..9168834b920 100644
--- a/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6
+++ b/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6
@@ -2,35 +2,7 @@
 
 const DATA_PREFIX = "data-poll-";
 const DEFAULT_POLL_NAME = "poll";
-const WHITELISTED_ATTRIBUTES = ["type", "name", "min", "max", "step", "order", "status", "public"];
-
-function getHelpText(count, min, max) {
-
-  // default values
-  if (isNaN(min) || min < 1) { min = 1; }
-  if (isNaN(max) || max > count) { max = count; }
-
-  // add some help text
-  let help;
-
-  if (max > 0) {
-    if (min === max) {
-      if (min > 1) {
-        help = I18n.t("poll.multiple.help.x_options", { count: min });
-      }
-    } else if (min > 1) {
-      if (max < count) {
-        help = I18n.t("poll.multiple.help.between_min_and_max_options", { min: min, max: max });
-      } else {
-        help = I18n.t("poll.multiple.help.at_least_min_options", { count: min });
-      }
-    } else if (max <= count) {
-      help = I18n.t("poll.multiple.help.up_to_max_options", { count: max });
-    }
-  }
-
-  return help;
-}
+const WHITELISTED_ATTRIBUTES = ["type", "name", "min", "max", "step", "order", "status", "public", "close"];
 
 function replaceToken(tokens, target, list) {
   let pos = tokens.indexOf(target);
@@ -50,7 +22,6 @@ function replaceToken(tokens, target, list) {
 
 // analyzes the block to that we have poll options
 function getListItems(tokens, startToken) {
-
   let i = tokens.length-1;
   let listItems = [];
   let buffer = [];
@@ -217,63 +188,14 @@ const rule = {
 
     token = state.push('span_open', 'span', 1);
     token.block = false;
-    token.attrs = [['class', 'info-text']];
+    token.attrs = [['class', 'info-label']];
     token = state.push('text', '', 0);
     token.content = I18n.t("poll.voters", { count: 0 });
     state.push('span_close', 'span', -1);
 
     state.push('paragraph_close', 'p', -1);
 
-    // multiple help text
-    if (attributes[DATA_PREFIX + "type"] === "multiple") {
-      let help = getHelpText(items.length, min, max);
-      if (help) {
-        state.push('paragraph_open', 'p', 1);
-        token = state.push('html_inline', '', 0);
-        token.content = help;
-        state.push('paragraph_close', 'p', -1);
-      }
-    }
-
-    if (attributes[DATA_PREFIX + 'public'] === 'true') {
-      state.push('paragraph_open', 'p', 1);
-      token = state.push('text', '', 0);
-      token.content = I18n.t('poll.public.title');
-      state.push('paragraph_close', 'p', -1);
-    }
-
     state.push('poll_close', 'div', -1);
-    state.push('poll_close', 'div', -1);
-
-    token = state.push('poll_open', 'div', 1);
-    token.attrs = [['class', 'poll-buttons']];
-
-    if (attributes[DATA_PREFIX + 'type'] === 'multiple') {
-      token = state.push('link_open', 'a', 1);
-      token.block = false;
-      token.attrs = [
-        ['class', 'button cast-votes'],
-        ['title', I18n.t('poll.cast-votes.title')]
-      ];
-
-      token = state.push('text', '', 0);
-      token.content = I18n.t('poll.cast-votes.label');
-
-      state.push('link_close', 'a', -1);
-    }
-
-    token = state.push('link_open', 'a', 1);
-    token.block = false;
-    token.attrs = [
-      ['class', 'button toggle-results'],
-      ['title', I18n.t('poll.show-results.title')]
-    ];
-
-    token = state.push('text', '', 0);
-    token.content = I18n.t("poll.show-results.label");
-
-    state.push('link_close', 'a', -1);
-
     state.push('poll_close', 'div', -1);
     state.push('poll_close', 'div', -1);
   }
@@ -299,6 +221,7 @@ export function setup(helper) {
     'div[data-*]',
     'span.info-number',
     'span.info-text',
+    'span.info-label',
     'a.button.cast-votes',
     'a.button.toggle-results',
     'li[data-*]'
diff --git a/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6 b/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
index 53061b420a2..f51c12e3add 100644
--- a/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
+++ b/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
@@ -7,6 +7,7 @@ import { popupAjaxError } from 'discourse/lib/ajax-error';
 import evenRound from "discourse/plugins/poll/lib/even-round";
 import { avatarFor } from 'discourse/widgets/post';
 import round from "discourse/lib/round";
+import { relativeAge } from 'discourse/lib/formatter';
 
 function optionHtml(option) {
   return new RawHtml({ html: `<span>${option.html}</span>` });
@@ -34,7 +35,6 @@ createWidget('discourse-poll-option', {
 
   html(attrs) {
     const result = [];
-
     const { option, vote } = attrs;
     const chosen = vote.indexOf(option.id) !== -1;
 
@@ -45,6 +45,7 @@ createWidget('discourse-poll-option', {
     }
     result.push(' ');
     result.push(optionHtml(option));
+
     return result;
   },
 
@@ -235,7 +236,6 @@ createWidget('discourse-poll-number-results', {
     const { attrs, state } = this;
 
     if (state.loaded === 'new') {
-
       fetchVoters({
         post_id: attrs.post.id,
         poll_name: attrs.poll.get('name')
@@ -258,8 +258,7 @@ createWidget('discourse-poll-number-results', {
     const voters = poll.voters;
     const average = voters === 0 ? 0 : round(totalScore / voters, -2);
     const averageRating = I18n.t("poll.average_rating", { average });
-    const results = [h('div.poll-results-number-rating',
-                       new RawHtml({ html: `<span>${averageRating}</span>` }))];
+    const results = [h('div.poll-results-number-rating', new RawHtml({ html: `<span>${averageRating}</span>` }))];
 
     if (isPublic) {
       this.fetchVoters();
@@ -283,7 +282,7 @@ createWidget('discourse-poll-container', {
   html(attrs) {
     const { poll } = attrs;
 
-    if (attrs.showResults) {
+    if (attrs.showResults || attrs.isClosed) {
       const type = poll.get('type') === 'number' ? 'number' : 'standard';
       return this.attach(`discourse-poll-${type}-results`, attrs);
     }
@@ -327,29 +326,41 @@ createWidget('discourse-poll-info', {
     const count = poll.get('voters');
     const result = [h('p', [
                      h('span.info-number', count.toString()),
-                     h('span.info-text', I18n.t('poll.voters', { count }))
+                     h('span.info-label', I18n.t('poll.voters', { count }))
                    ])];
 
     if (attrs.isMultiple) {
-      if (attrs.showResults) {
+      if (attrs.showResults || attrs.isClosed) {
         const totalVotes = poll.get('options').reduce((total, o) => {
           return total + parseInt(o.votes, 10);
         }, 0);
 
         result.push(h('p', [
                       h('span.info-number', totalVotes.toString()),
-                      h('span.info-text', I18n.t("poll.total_votes", { count: totalVotes }))
+                      h('span.info-label', I18n.t("poll.total_votes", { count: totalVotes }))
                     ]));
       } else {
         const help = this.multipleHelpText(attrs.min, attrs.max, poll.get('options.length'));
         if (help) {
-          result.push(new RawHtml({ html: `<span>${help}</span>` }));
+          result.push(new RawHtml({ html: `<span class="info-text">${help}</span>` }));
         }
       }
     }
 
-    if (!attrs.showResults && attrs.poll.get('public')) {
-      result.push(h('p', I18n.t('poll.public.title')));
+    if (!attrs.isClosed) {
+      if (!attrs.showResults && poll.get('public')) {
+        result.push(h('span.info-text', I18n.t('poll.public.title')));
+      }
+
+      if (poll.close) {
+        const closeDate = moment.utc(poll.close);
+        const title = closeDate.format("LLL");
+        const timeLeft = moment().to(closeDate.local(), true);
+
+        result.push(new RawHtml({
+          html: `<span class="info-text" title="${title}">${I18n.t("poll.automatic_close.closes_in", { timeLeft })}</span>`
+        }));
+      }
     }
 
     return result;
@@ -363,8 +374,8 @@ createWidget('discourse-poll-buttons', {
     const results = [];
     const { poll, post } = attrs;
     const topicArchived = post.get('topic.archived');
-    const isClosed = poll.get('status') === 'closed';
-    const hideResultsDisabled = isClosed || topicArchived;
+    const closed = attrs.isClosed;
+    const hideResultsDisabled = closed || topicArchived;
 
     if (attrs.isMultiple && !hideResultsDisabled) {
       const castVotesDisabled = !attrs.canCastVotes;
@@ -378,7 +389,7 @@ createWidget('discourse-poll-buttons', {
       results.push(' ');
     }
 
-    if (attrs.showResults) {
+    if (attrs.showResults || hideResultsDisabled) {
       results.push(this.attach('button', {
         className: 'btn toggle-results',
         label: 'poll.hide-results.label',
@@ -398,19 +409,31 @@ createWidget('discourse-poll-buttons', {
       }));
     }
 
+    if (attrs.isAutomaticallyClosed) {
+      const closeDate = moment.utc(poll.get("close"));
+      const title = closeDate.format("LLL");
+      const age = relativeAge(closeDate.toDate(), { addAgo: true });
+
+      results.push(new RawHtml({
+        html: `<span class="info-text" title="${title}">${I18n.t("poll.automatic_close.age", { age })}</span>`
+      }));
+    }
+
     if (this.currentUser &&
         (this.currentUser.get("id") === post.get('user_id') ||
          this.currentUser.get("staff")) &&
         !topicArchived) {
 
-      if (isClosed) {
-        results.push(this.attach('button', {
-          className: 'btn toggle-status',
-          label: 'poll.open.label',
-          title: 'poll.open.title',
-          icon: 'unlock-alt',
-          action: 'toggleStatus'
-        }));
+      if (closed) {
+        if (!attrs.isAutomaticallyClosed) {
+          results.push(this.attach('button', {
+            className: 'btn toggle-status',
+            label: 'poll.open.label',
+            title: 'poll.open.title',
+            icon: 'unlock-alt',
+            action: 'toggleStatus'
+          }));
+        }
       } else {
         results.push(this.attach('button', {
           className: 'btn toggle-status btn-danger',
@@ -422,7 +445,6 @@ createWidget('discourse-poll-buttons', {
       }
     }
 
-
     return results;
   }
 });
@@ -437,14 +459,14 @@ export default createWidget('discourse-poll', {
       "data-poll-type":   poll.get('type'),
       "data-poll-name":   poll.get('name'),
       "data-poll-status": poll.get('status'),
-      "data-poll-public": poll.get('public')
+      "data-poll-public": poll.get('public'),
+      "data-poll-close":  poll.get('close'),
     };
   },
 
   defaultState(attrs) {
-    const { poll, post } = attrs;
-    return { loading: false,
-             showResults: poll.get('isClosed') || post.get('topic.archived') };
+    const showResults = this.isClosed() || attrs.post.get('topic.archived');
+    return { loading: false, showResults };
   },
 
   html(attrs, state) {
@@ -452,9 +474,12 @@ export default createWidget('discourse-poll', {
     const newAttrs = jQuery.extend({}, attrs, {
       showResults,
       canCastVotes: this.canCastVotes(),
+      isClosed: this.isClosed(),
+      isAutomaticallyClosed: this.isAutomaticallyClosed(),
       min: this.min(),
       max: this.max()
     });
+
     return h('div', [
       this.attach('discourse-poll-container', newAttrs),
       this.attach('discourse-poll-info', newAttrs),
@@ -462,10 +487,6 @@ export default createWidget('discourse-poll', {
     ]);
   },
 
-  isClosed() {
-    return this.attrs.poll.get('status') === "closed";
-  },
-
   min() {
     let min = parseInt(this.attrs.poll.min, 10);
     if (isNaN(min) || min < 1) { min = 1; }
@@ -479,37 +500,51 @@ export default createWidget('discourse-poll', {
     return max;
   },
 
+  isAutomaticallyClosed() {
+    const { poll } = this.attrs;
+    return poll.get("close") && moment.utc(poll.get("close")) <= moment();
+  },
+
+  isClosed() {
+    const { poll } = this.attrs;
+    return poll.get("status") === "closed" || this.isAutomaticallyClosed();
+  },
+
   canCastVotes() {
     const { state, attrs } = this;
+
     if (this.isClosed() || state.showResults || state.loading) {
       return false;
     }
 
     const selectedOptionCount = attrs.vote.length;
+
     if (attrs.isMultiple) {
       return selectedOptionCount >= this.min() && selectedOptionCount <= this.max();
     }
+
     return selectedOptionCount > 0;
   },
 
   toggleStatus() {
     const { state, attrs } = this;
-    const { poll } = attrs;
-    const isClosed = poll.get('status') === 'closed';
+    const { post, poll } = attrs;
+
+    if (this.isAutomaticallyClosed()) { return; }
 
     bootbox.confirm(
-      I18n.t(isClosed ? "poll.open.confirm" : "poll.close.confirm"),
+      I18n.t(this.isClosed() ? "poll.open.confirm" : "poll.close.confirm"),
       I18n.t("no_value"),
       I18n.t("yes_value"),
       confirmed => {
         if (confirmed) {
           state.loading = true;
+          const status = this.isClosed() ? "open" : "closed";
 
-          const status = isClosed ? "open" : "closed";
           ajax("/polls/toggle_status", {
             type: "PUT",
             data: {
-              post_id: attrs.post.get('id'),
+              post_id: post.get('id'),
               poll_name: poll.get('name'),
               status,
             }
@@ -535,15 +570,15 @@ export default createWidget('discourse-poll', {
   },
 
   showLogin() {
-    const appRoute = this.register.lookup('route:application');
-    appRoute.send('showLogin');
+    this.register.lookup('route:application').send('showLogin');
   },
 
   toggleOption(option) {
+    const { attrs } = this;
+
     if (this.isClosed()) { return; }
     if (!this.currentUser) { this.showLogin(); }
 
-    const { attrs } = this;
     const { vote } = attrs;
 
     const chosenIdx = vote.indexOf(option.id);
diff --git a/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss b/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss
index 184cd20573d..404074d6100 100644
--- a/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss
+++ b/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss
@@ -1,25 +1,48 @@
 .poll-ui-builder-form {
-  margin: 0px;
-
-  .input-group {
-    padding: 10px;
-  }
+  margin: 0;
 
   label {
     font-weight: bold;
     display: inline;
   }
 
+  .tip {
+    display: block;
+    min-height: 20px;
+  }
+
   .input-group-label {
     display: inline-block;
     width: 45px;
   }
 
-  .combobox {
-    margin-right: 5px;
+  .poll-number {
+    margin: 8px 0;
+
+    .tip {
+      margin-bottom: 6px;
+    }
+
+    input {
+      width: 70px;
+    }
+
+    input + .tip {
+      margin-top: 4px;
+    }
   }
 
-  .poll-options-min, .poll-options-max, .poll-options-step {
-    width: 70px !important;
+  .poll-textarea textarea {
+    width: 100%;
+    height: 90px;
+    box-sizing: border-box;
+  }
+
+  .poll-select + .poll-textarea {
+    margin-top: 12px;
+  }
+
+  .poll-checkbox {
+    margin-top: 4px;
   }
 }
diff --git a/plugins/poll/assets/stylesheets/common/poll.scss b/plugins/poll/assets/stylesheets/common/poll.scss
index d52c6e1429a..09460788e0f 100644
--- a/plugins/poll/assets/stylesheets/common/poll.scss
+++ b/plugins/poll/assets/stylesheets/common/poll.scss
@@ -4,7 +4,7 @@ $text-color: #9E9E9E;
 $option-background: dark-light-diff($primary, $secondary, 90%, -65%);
 
 div.poll {
-  margin: 10px 0px;
+  margin: 10px 0;
   border: 1px solid $border-color;
 
   @include unselectable;
@@ -52,9 +52,14 @@ div.poll {
       font-size: 3.5em;
     }
 
-    .info-text {
+    .info-label {
       font-size: 1.7em;
     }
+
+    .info-text {
+      margin: 5px 0;
+      display: block;
+    }
   }
 
   .poll-container {
@@ -70,6 +75,10 @@ div.poll {
     button {
       float: none;
     }
+    .info-text {
+      margin: 0 5px;
+      color: $text-color;
+    }
   }
 
   .poll-voters-list {
diff --git a/plugins/poll/assets/stylesheets/desktop/poll.scss b/plugins/poll/assets/stylesheets/desktop/poll.scss
index cc8ed28ad2e..79ead5d01fa 100644
--- a/plugins/poll/assets/stylesheets/desktop/poll.scss
+++ b/plugins/poll/assets/stylesheets/desktop/poll.scss
@@ -14,7 +14,7 @@ div.poll {
       margin: 40px 20px;
     }
 
-    .info-text {
+    .info-label {
       display: block;
     }
   }
diff --git a/plugins/poll/assets/stylesheets/mobile/poll.scss b/plugins/poll/assets/stylesheets/mobile/poll.scss
index 1c35f64bb3d..2d552a5f6b5 100644
--- a/plugins/poll/assets/stylesheets/mobile/poll.scss
+++ b/plugins/poll/assets/stylesheets/mobile/poll.scss
@@ -8,6 +8,8 @@ div.poll {
   }
 
   .poll-info {
-    .info-text:before {content:"\00a0";} // nbsp
+    .info-label:before {
+      content:"\00a0"; //nbsp
+    }
   }
 }
diff --git a/plugins/poll/config/locales/client.bg.yml b/plugins/poll/config/locales/client.bg.yml
new file mode 100644
index 00000000000..8cab10c6a58
--- /dev/null
+++ b/plugins/poll/config/locales/client.bg.yml
@@ -0,0 +1,51 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+bg:
+  js:
+    poll:
+      voters:
+        one: "гласуващ"
+        other: "Гласуващи "
+      total_votes:
+        one: "общ брой гласове"
+        other: "общо гласове"
+      average_rating: "Средна отценка: <strong>%{average}</strong>."
+      public:
+        title: "Гласуването е публично."
+      multiple:
+        help:
+          at_least_min_options:
+            one: "Избери поне <strong>%{count}</strong> отговора"
+            other: "Избери поне <strong>%{count}</strong> отговора"
+      cast-votes:
+        title: "Изчислете вашите гласове"
+        label: "Гласувай сега!"
+      show-results:
+        title: "Покажи резултатите от гласуването"
+        label: "Покажи резултатите"
+      hide-results:
+        title: "Обратно към вашите гласове"
+        label: "Скрий резултатите"
+      open:
+        title: "Отвори гласуването"
+        label: "Отвори"
+        confirm: "Сигурни ли сте, че искате да отворите гласуването ?"
+      close:
+        title: "Затвори гласуването"
+        label: "Затвори"
+        confirm: "Сигурни ли сте, че искате да затворите гласуването?"
+      error_while_toggling_status: "Съжаляваме, получи се грешка при превключване статуса на тази анкета."
+      error_while_casting_votes: "Получи се грешка при подаването на гласа ви."
+      error_while_fetching_voters: "Получи се грешка при показването на гласовете."
+      ui_builder:
+        poll_type:
+          label: Тип
+        poll_config:
+          max: Максимално
+          min: Минимално
+          step: Стъпка
diff --git a/plugins/poll/config/locales/client.ca.yml b/plugins/poll/config/locales/client.ca.yml
index 68213b87b72..d93b34d32a1 100644
--- a/plugins/poll/config/locales/client.ca.yml
+++ b/plugins/poll/config/locales/client.ca.yml
@@ -55,6 +55,7 @@ ca:
         help:
           options_count: Introdueix almenys 2 opcions
           invalid_values: El valor mínim ha de ser menor que el valor màxim.
+          min_step_value: L'increment mínim és 1
         poll_type:
           label: Tipus
           regular: Elecció simple
diff --git a/plugins/poll/config/locales/client.cs.yml b/plugins/poll/config/locales/client.cs.yml
index 1fe70f3a802..4a60ddabd97 100644
--- a/plugins/poll/config/locales/client.cs.yml
+++ b/plugins/poll/config/locales/client.cs.yml
@@ -11,10 +11,12 @@ cs:
       voters:
         one: "hlasující"
         few: "hlasujících"
+        many: "hlasující"
         other: "hlasující"
       total_votes:
         one: "hlas celkem"
         few: "hlasy celkem"
+        many: "hlasů celkem"
         other: "hlasů celkem"
       average_rating: "Průměrné hodnocení: <strong>%{average}</strong>."
       public:
@@ -24,14 +26,17 @@ cs:
           at_least_min_options:
             one: "Zvolte alespoň <strong>1</strong> možnost."
             few: "Zvolte alespoň <strong>%{count}</strong> možnosti."
+            many: "Zvolte alespoň <strong>%{count}</strong> možností."
             other: "Zvolte alespoň <strong>%{count}</strong> možností."
           up_to_max_options:
             one: "Zvolte maximálně <strong>1</strong> možnost."
             few: "Zvolte maximálně <strong>%{count}</strong> možnosti."
+            many: "Zvolte maximálně <strong>%{count}</strong> možností"
             other: "Zvolte maximálně <strong>%{count}</strong> možností"
           x_options:
             one: "Zvolte <strong>1</strong> možnost."
             few: "Zvolte <strong>%{count}</strong> možnosti."
+            many: "Zvolte <strong>%{count}</strong> možností"
             other: "Zvolte <strong>%{count}</strong> možností"
           between_min_and_max_options: "Zvolte mezi <strong>%{min}</strong> a <strong>%{max}</strong> možnostmi"
       cast-votes:
@@ -60,6 +65,7 @@ cs:
         help:
           options_count: Zadejte alespoň 2 možnosti
           invalid_values: Minimální hodnota musí být menší než maximální hodnota.
+          min_step_value: Minimální hodnota kroku je 1
         poll_type:
           label: Typ
           regular: Jedna možnost
diff --git a/plugins/poll/config/locales/client.de.yml b/plugins/poll/config/locales/client.de.yml
index 99afb460b66..e267d58cb68 100644
--- a/plugins/poll/config/locales/client.de.yml
+++ b/plugins/poll/config/locales/client.de.yml
@@ -46,6 +46,9 @@ de:
         title: "Umfrage beenden"
         label: "Beenden"
         confirm: "Möchtest du diese Umfrage wirklich beenden?"
+      automatic_close:
+        closes_in: "schließt in <strong>%{timeLeft}</strong>"
+        age: "geschlossen <strong>%{age}</strong>"
       error_while_toggling_status: "Entschuldige, beim Wechseln des Status dieser Umfrage ist ein Fehler aufgetreten."
       error_while_casting_votes: "Entschuldige, beim Abgeben deiner Stimme ist ein Fehler aufgetreten."
       error_while_fetching_voters: "Entschuldige, beim Anzeigen der Teilnehmer ist ein Fehler aufgetreten."
@@ -69,3 +72,5 @@ de:
           label: Anzeigen, wer abgestimmt hat
         poll_options:
           label: Bitte gib eine Umfrageoption pro Zeile ein
+        automatic_close:
+          label: Umfrage automatisch schließen
diff --git a/plugins/poll/config/locales/client.en.yml b/plugins/poll/config/locales/client.en.yml
index 86bae641924..7e03127b051 100644
--- a/plugins/poll/config/locales/client.en.yml
+++ b/plugins/poll/config/locales/client.en.yml
@@ -65,6 +65,10 @@ en:
         label: "Close"
         confirm: "Are you sure you want to close this poll?"
 
+      automatic_close:
+        closes_in: "closes in <strong>%{timeLeft}</strong>"
+        age: "closed <strong>%{age}</strong>"
+
       error_while_toggling_status: "Sorry, there was an error toggling the status of this poll."
       error_while_casting_votes: "Sorry, there was an error casting your votes."
       error_while_fetching_voters: "Sorry, there was an error displaying the voters."
@@ -89,3 +93,5 @@ en:
           label: Show who voted
         poll_options:
           label: Enter one poll option per line
+        automatic_close:
+          label: Automatically close poll
diff --git a/plugins/poll/config/locales/client.es.yml b/plugins/poll/config/locales/client.es.yml
index 3538a726da2..65fafda66d0 100644
--- a/plugins/poll/config/locales/client.es.yml
+++ b/plugins/poll/config/locales/client.es.yml
@@ -36,7 +36,7 @@ es:
         title: "Mostrar los resultados de la encuesta"
         label: "Mostrar resultados"
       hide-results:
-        title: "Volver a los votos"
+        title: "Volver a tus votos"
         label: "Ocultar resultados"
       open:
         title: "Abrir encuesta"
@@ -46,6 +46,9 @@ es:
         title: "Cerrar la encuesta"
         label: "Cerrar"
         confirm: "¿Seguro que quieres cerrar esta encuesta?"
+      automatic_close:
+        closes_in: "cierra en <strong>%{timeLeft}</strong>"
+        age: "cerrado <strong>%{age}</strong>"
       error_while_toggling_status: "Lo sentimos, hubo un error al cambiar el estado de esta encuesta."
       error_while_casting_votes: "Lo sentimos, hubo un error al registrar tus votos."
       error_while_fetching_voters: "Lo sentimos, hubo un error al mostrar los votantes."
@@ -54,8 +57,8 @@ es:
         insert: Insertar Encuesta
         help:
           options_count: Introducir al menos 2 opciones
-          invalid_values: El valor mínimo debe ser menor que el valor máximo.
-          min_step_value: El valor mínimo por paso es 1
+          invalid_values: Valor mínimo debe ser más pequeño que el valor máximo.
+          min_step_value: El valor mínimo es 1
         poll_type:
           label: Tipo
           regular: Una opción
@@ -69,3 +72,5 @@ es:
           label: Mostrar quién votó
         poll_options:
           label: Introducir una opción de la encuesta por línea
+        automatic_close:
+          label: Cerrar encuesta automáticamente
diff --git a/plugins/poll/config/locales/client.fa_IR.yml b/plugins/poll/config/locales/client.fa_IR.yml
index a3888c8d138..d8513854ee5 100644
--- a/plugins/poll/config/locales/client.fa_IR.yml
+++ b/plugins/poll/config/locales/client.fa_IR.yml
@@ -9,8 +9,10 @@ fa_IR:
   js:
     poll:
       voters:
+        one: "رأی دهندگان"
         other: "رأی دهندگان"
       total_votes:
+        one: "مجموع آرا"
         other: "مجموع آرا"
       average_rating: "میانگین امتیاز:  <strong>%{average}</strong>."
       public:
@@ -18,10 +20,13 @@ fa_IR:
       multiple:
         help:
           at_least_min_options:
+            one: "حداقل <strong>%{count}</strong> گزینه انتخاب کنید."
             other: "حداقل <strong>%{count}</strong> گزینه انتخاب کنید."
           up_to_max_options:
+            one: "حداکثر <strong>%{count}</strong> گزینه انتخاب کنید"
             other: "حداکثر <strong>%{count}</strong> گزینه انتخاب کنید"
           x_options:
+            one: "<strong>%{count}</strong> گزینه انتخاب کنید"
             other: "<strong>%{count}</strong> گزینه انتخاب کنید"
           between_min_and_max_options: "بین <strong>%{min}</strong> تا <strong>%{max}</strong> گزینه انتخاب کنید"
       cast-votes:
diff --git a/plugins/poll/config/locales/client.fr.yml b/plugins/poll/config/locales/client.fr.yml
index 1667e83ebac..8af325d93c5 100644
--- a/plugins/poll/config/locales/client.fr.yml
+++ b/plugins/poll/config/locales/client.fr.yml
@@ -46,6 +46,9 @@ fr:
         title: "Fermer le sondage"
         label: "Fermer"
         confirm: "Êtes-vous sûr de vouloir fermer ce sondage ?"
+      automatic_close:
+        closes_in: "fermera dans <strong>%{timeLeft}</strong>"
+        age: "fermé <strong>%{age}</strong>"
       error_while_toggling_status: "Désolé, il y a eu une erreur lors du changement de statut de ce sondage."
       error_while_casting_votes: "Désolé, il y a eu une erreur lors de l'envoi de vos votes."
       error_while_fetching_voters: "Désolé, il y a eu une erreur lors de l'affichage des votants."
@@ -69,3 +72,5 @@ fr:
           label: Afficher les votants
         poll_options:
           label: Entrez une option de sondage par ligne
+        automatic_close:
+          label: Fermer sondage automatiquement
diff --git a/plugins/poll/config/locales/client.he.yml b/plugins/poll/config/locales/client.he.yml
index 452e3b3ed31..e6d429d5632 100644
--- a/plugins/poll/config/locales/client.he.yml
+++ b/plugins/poll/config/locales/client.he.yml
@@ -10,9 +10,13 @@ he:
     poll:
       voters:
         one: "מצביע"
+        two: "מצביעים"
+        many: "מצביעים"
         other: "מצביעים"
       total_votes:
         one: "מספר הצבעות כולל"
+        two: "מספר הצבעות כולל"
+        many: "מספר הצבעות כולל"
         other: "מספר הצבעות כולל"
       average_rating: "דירוג ממוצע: <strong>%{average}</strong>."
       public:
@@ -21,12 +25,18 @@ he:
         help:
           at_least_min_options:
             one: "בחרו לפחות אפשרות אחת"
+            two: "בחרו לפחות <strong>%{count}</strong> אפשרויות"
+            many: "בחרו לפחות <strong>%{count}</strong> אפשרויות"
             other: "בחרו לפחות <strong>%{count}</strong> אפשרויות"
           up_to_max_options:
             one: "בחרו לכל היותר אפשרות אחת."
+            two: "בחרו עד <strong>%{count}</strong> אפשרויות"
+            many: "בחרו עד <strong>%{count}</strong> אפשרויות"
             other: "בחרו עד <strong>%{count}</strong> אפשרויות"
           x_options:
             one: "בחרו אפשרות אחת"
+            two: "בחרו <strong>%{count}</strong> אפשרויות"
+            many: "בחרו <strong>%{count}</strong> אפשרויות"
             other: "בחרו <strong>%{count}</strong> אפשרויות"
           between_min_and_max_options: "בחרו בין <strong>%{min}</strong> ל-<strong>%{max}</strong> אפשרויות"
       cast-votes:
@@ -55,6 +65,7 @@ he:
         help:
           options_count: הכניסו לפחות 2 אפשרויות
           invalid_values: ערך מינימלי חייב להיות קטן מערך מקסימלי.
+          min_step_value: ערך הצעד המזערי הוא 1
         poll_type:
           label: סוג
           regular: בחירה בודדת
diff --git a/plugins/poll/config/locales/client.ja.yml b/plugins/poll/config/locales/client.ja.yml
index 67a397d677a..af4c2a829fc 100644
--- a/plugins/poll/config/locales/client.ja.yml
+++ b/plugins/poll/config/locales/client.ja.yml
@@ -50,6 +50,7 @@ ja:
         help:
           options_count: 少なくとも2つの選択肢を入力してください
           invalid_values: 最小値は最大値より小さくなければなりません。
+          min_step_value: 最小ステップ単位は 1 です
         poll_type:
           label: タイプ
           regular: 一つだけ選択
diff --git a/plugins/poll/config/locales/client.nb_NO.yml b/plugins/poll/config/locales/client.nb_NO.yml
index d6b93d74844..4c93e5c1078 100644
--- a/plugins/poll/config/locales/client.nb_NO.yml
+++ b/plugins/poll/config/locales/client.nb_NO.yml
@@ -46,6 +46,9 @@ nb_NO:
         title: "Lukk avstemning"
         label: "Lukk"
         confirm: "Er du sikker på at du vil lukke avstemningen?"
+      automatic_close:
+        closes_in: "stenger om <strong>%{timeLeft}</strong>"
+        age: "stengt <strong>%{age}</strong>"
       error_while_toggling_status: "Beklager, det oppstod en feil ved endring av status på denne avstemningen."
       error_while_casting_votes: "Beklager, det oppstod en feil da du ga din stemme."
       error_while_fetching_voters: "Beklager, det oppstod en feil når stemmegivere skulle vises."
@@ -69,3 +72,5 @@ nb_NO:
           label: Vis hvem som har stemt
         poll_options:
           label: Oppgi et valgalternativ for avstemning per linje
+        automatic_close:
+          label: Steng avstemningen automatisk
diff --git a/plugins/poll/config/locales/client.nl.yml b/plugins/poll/config/locales/client.nl.yml
index b35d6656cd4..0f6a052c548 100644
--- a/plugins/poll/config/locales/client.nl.yml
+++ b/plugins/poll/config/locales/client.nl.yml
@@ -55,6 +55,7 @@ nl:
         help:
           options_count: Geef ten minste 2 opties
           invalid_values: Minimale waarde moet kleiner zijn dan de maximale waarde.
+          min_step_value: De minimale waarde voor stap is 1
         poll_type:
           label: Type
           regular: Eén keuze
diff --git a/plugins/poll/config/locales/client.pt.yml b/plugins/poll/config/locales/client.pt.yml
index a871a565819..19f699a5db5 100644
--- a/plugins/poll/config/locales/client.pt.yml
+++ b/plugins/poll/config/locales/client.pt.yml
@@ -54,6 +54,8 @@ pt:
         insert: Inserir sondagem
         help:
           options_count: Insira pelo menos 2 opções
+          invalid_values: O valor mínimo deve ser menor que o valor máximo.
+          min_step_value: O valor mínimo é 1
         poll_type:
           label: Tipo
           regular: Escolha Única
diff --git a/plugins/poll/config/locales/client.ro.yml b/plugins/poll/config/locales/client.ro.yml
index df87f6641dc..9c1d31abf77 100644
--- a/plugins/poll/config/locales/client.ro.yml
+++ b/plugins/poll/config/locales/client.ro.yml
@@ -51,6 +51,9 @@ ro:
         title: "Închide sondajul"
         label: "Închide sondajul"
         confirm: "Ești sigur că vrei să închizi acest sondaj?"
+      automatic_close:
+        closes_in: "se închide în <strong>%{timeLeft}</strong>"
+        age: "închis <strong>%{age}</strong>"
       error_while_toggling_status: "Ne pare rău, a apărut o eroare la schimbarea stării acestui sondaj."
       error_while_casting_votes: "Ne pare rău, a apărut o eroare la exercitarea voturilor tale."
       error_while_fetching_voters: "Ne pare rău, a apărut o eroare la afișarea votanților."
@@ -59,6 +62,8 @@ ro:
         insert: Introdu sondaj
         help:
           options_count: Trebuie să introduci cel puțin 2 opțiuni
+          invalid_values: Valoarea minimă trebuie să fie mai mică decât valoarea maximă.
+          min_step_value: Valoarea minimă a pasului este 1
         poll_type:
           label: Tip
           regular: Opțiune unică
@@ -72,3 +77,5 @@ ro:
           label: Arată cine a votat
         poll_options:
           label: Arată o singură opțiune de sondaj pe linie
+        automatic_close:
+          label: Închide sondaj automat
diff --git a/plugins/poll/config/locales/client.sk.yml b/plugins/poll/config/locales/client.sk.yml
index 5424aff0985..8c4fc811e53 100644
--- a/plugins/poll/config/locales/client.sk.yml
+++ b/plugins/poll/config/locales/client.sk.yml
@@ -11,10 +11,12 @@ sk:
       voters:
         one: "volič"
         few: "voliči"
+        many: "účastníci"
         other: "účastníci"
       total_votes:
         one: "hlas celkom"
         few: "hlasy celkom"
+        many: "hlasov celkom"
         other: "hlasov celkom"
       average_rating: "Priemerné hodnotenie: <strong>%{average}</strong>."
       public:
@@ -24,14 +26,17 @@ sk:
           at_least_min_options:
             one: "Vyberte aspoň <strong>1</strong> možnosť"
             few: "Vyberte aspoň <strong>%{count}</strong> možnosti"
+            many: "Vyberte aspoň <strong>%{count}</strong> možností"
             other: "Vyberte aspoň <strong>%{count}</strong> možností"
           up_to_max_options:
             one: "Vyberte najviac <strong>1</strong> možnosť"
             few: "Vyberte najviac <strong>%{count}</strong> možnosti"
+            many: "Vyberte najviac <strong>%{count}</strong> možností"
             other: "Vyberte najviac <strong>%{count}</strong> možností"
           x_options:
             one: "Vyberte <strong>1</strong> možnosť"
             few: "Vyberte <strong>%{count}</strong> možnosti"
+            many: "Vyberte <strong>%{count}</strong> možností"
             other: "Vyberte <strong>%{count}</strong> možností"
           between_min_and_max_options: "Vyberte medzi <strong>%{min}</strong> a <strong>%{max}</strong> možnosťami"
       cast-votes:
@@ -60,6 +65,7 @@ sk:
         help:
           options_count: Zadajte aspoň 2 možnosti
           invalid_values: Minimálna hodnota musí byť menšia ako maximálna hodnota.
+          min_step_value: Minimálna hodnota pre krok je 1
         poll_type:
           label: Typ
           regular: Jedna možnosť
diff --git a/plugins/poll/config/locales/client.sl.yml b/plugins/poll/config/locales/client.sl.yml
new file mode 100644
index 00000000000..7ae10c002b7
--- /dev/null
+++ b/plugins/poll/config/locales/client.sl.yml
@@ -0,0 +1,22 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sl:
+  js:
+    poll:
+      voters:
+        one: "glasovalec"
+        two: "glasovalca"
+        few: "glasovalci"
+        other: "glasovalci"
+      public:
+        title: "Glasovi so javni."
+      cast-votes:
+        label: "Glasuj!"
+      show-results:
+        title: "Prikaži rezultate ankete"
+        label: "Prikaži rezultate"
diff --git a/plugins/poll/config/locales/client.tr_TR.yml b/plugins/poll/config/locales/client.tr_TR.yml
index 5487fbc5719..e98e99bbf25 100644
--- a/plugins/poll/config/locales/client.tr_TR.yml
+++ b/plugins/poll/config/locales/client.tr_TR.yml
@@ -9,8 +9,10 @@ tr_TR:
   js:
     poll:
       voters:
-        other: "oylayan"
+        one: "oylayan"
+        other: "oylayanlar"
       total_votes:
+        one: "toplam oy"
         other: "toplam oy"
       average_rating: "Ortalama oran: <strong>%{average}</strong>."
       public:
@@ -18,10 +20,13 @@ tr_TR:
       multiple:
         help:
           at_least_min_options:
+            one: "En az <strong>%{count}</strong> seçecek seçiniz"
             other: "En az <strong>%{count}</strong> seçecek seçiniz"
           up_to_max_options:
+            one: "<strong>%{count}</strong> seçeneğe kadar seçebilirsiniz"
             other: "<strong>%{count}</strong> seçeneğe kadar seçebilirsiniz"
           x_options:
+            one: "<strong>%{count}</strong>  seçenek seçiniz"
             other: "<strong>%{count}</strong>  seçenek seçiniz"
           between_min_and_max_options: "<strong>%{min}</strong> ve <strong>%{max}</strong> arasında seçenek seçiniz"
       cast-votes:
diff --git a/plugins/poll/config/locales/client.uk.yml b/plugins/poll/config/locales/client.uk.yml
index aa468da1dc8..6007d7deaf7 100644
--- a/plugins/poll/config/locales/client.uk.yml
+++ b/plugins/poll/config/locales/client.uk.yml
@@ -11,6 +11,7 @@ uk:
       total_votes:
         one: "голос"
         few: "голосів"
+        many: "голоси"
         other: "голоси"
       average_rating: "Середній рейтинг: <strong>%{average}</strong>."
       multiple:
@@ -18,6 +19,7 @@ uk:
           at_least_min_options:
             one: "Виберіть хоча б <strong>1</strong> варіант"
             few: "Виберіть хоча б <strong>%{count}</strong> варіантів"
+            many: "Виберіть хоча б <strong>%{count}</strong> варіанти"
             other: "Виберіть хоча б <strong>%{count}</strong> варіанти"
       cast-votes:
         label: "Проголосувати!"
diff --git a/plugins/poll/config/locales/client.ur.yml b/plugins/poll/config/locales/client.ur.yml
index e0ae607df44..e178e933124 100644
--- a/plugins/poll/config/locales/client.ur.yml
+++ b/plugins/poll/config/locales/client.ur.yml
@@ -54,6 +54,8 @@ ur:
         insert: پول شامل کریے
         help:
           options_count: کم از کم 2 آپشنس اینٹر کریں
+          invalid_values: کم از کم قدر زیادہ سے زیادہ قدر سے چھوٹا ہونا ضروری ہے۔
+          min_step_value: کم از کم اضافہ یا کمی کی قدر 1 ہے
         poll_type:
           label: قِسم
           regular: اکیلا انتخاب
diff --git a/plugins/poll/config/locales/client.zh_TW.yml b/plugins/poll/config/locales/client.zh_TW.yml
index 078e9f1b6da..fa2a6ee6b39 100644
--- a/plugins/poll/config/locales/client.zh_TW.yml
+++ b/plugins/poll/config/locales/client.zh_TW.yml
@@ -36,7 +36,7 @@ zh_TW:
       open:
         title: "開啟投票"
         label: "開啟"
-        confirm: "你確定要開啟這個投票麼？"
+        confirm: "你確定要開啟這個投票嗎？"
       close:
         title: "關閉投票"
         label: "關閉"
@@ -50,6 +50,7 @@ zh_TW:
         help:
           options_count: 輸入至少 2 個選項
           invalid_values: 最小值必須比最大值小。
+          min_step_value: 最小梯級階值為 1
         poll_type:
           label: 類型
           regular: 單選
diff --git a/plugins/poll/config/locales/server.ar.yml b/plugins/poll/config/locales/server.ar.yml
index 4a14499de72..b7e922904ee 100644
--- a/plugins/poll/config/locales/server.ar.yml
+++ b/plugins/poll/config/locales/server.ar.yml
@@ -34,9 +34,7 @@ ar:
     named_poll_with_multiple_choices_has_invalid_parameters: "للتصويت متعدد الخيارات ذو الاسم <strong>%{name}</strong> معلمات غير صالحة."
     requires_at_least_1_valid_option: "عليك اختيار خيار واحد صالح على الأقل."
     default_cannot_be_made_public: "التصويت المدرج به اصوات لا يمكن أن يكون مفتوح للجميع."
-    named_cannot_be_made_public: "التصويت المسمى <strong>%{name}</strong> مدرج بة أصوات ولا يمكن فتحة للجميع."
     edit_window_expired:
-      cannot_change_polls: "لا يمكنك اضافة أو حذف أو اعادة تسمية التصويتات بعد الدقائق %{minutes}  اﻷولى."
       op_cannot_edit_options: "لا يمكنك إضافة خيارات التصويت او حذفها بعد مضي %{minutes} دقائق الاولى. من فضلك راسل مشرفا إن احتجت إلى تعديل أحد خيارات التصويت."
       staff_cannot_add_or_remove_options: "لا يمكنك إضافة تصويتات، أو حذفها أو إعادة تسميتها بعد مضي %{minutes}  دقائق. عليك إغلاق هذا الموضوع وإنشاء آخر جديد عوضاً عنه."
     no_polls_associated_with_this_post: "لا تصويتات مرتبطة مع هذه المشاركة."
diff --git a/plugins/poll/config/locales/server.bg.yml b/plugins/poll/config/locales/server.bg.yml
new file mode 100644
index 00000000000..3fcfbae500f
--- /dev/null
+++ b/plugins/poll/config/locales/server.bg.yml
@@ -0,0 +1,40 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+bg:
+  site_settings:
+    poll_maximum_options: "Максимален брой опции позволени в анкетата."
+    poll_edit_window_mins: "Брой минути след създаването на анкета когато тя може да бъде редактирана."
+  poll:
+    multiple_polls_without_name: "Има много анкети без име. Използвай '<code>име</code>'  атрибута за да идентифицирате вашата публикация."
+    multiple_polls_with_same_name: "Има много анкети с това име: <strong>%{name}</strong>. Използвайте '<code>name</code>' за да се отличат вашите анкети."
+    default_poll_must_have_at_least_2_options: "Анкетата трябва да има поне 2 опции."
+    named_poll_must_have_at_least_2_options: "Анкетата <strong>%{name}</strong> трябва да има поне  2 опции."
+    default_poll_must_have_less_options:
+      one: "Анкетата трябва да има по-малко от 1 опция."
+      other: "Анкетата трябва да има по-малко от %{count} опции."
+    named_poll_must_have_less_options:
+      one: "Анкетата: <strong>%{name}</strong> трябва да има по-малко от 1 опция."
+      other: "Анкетата <strong>%{name}</strong> трябва да има по-малко от %{count} опции."
+    default_poll_must_have_different_options: "Анкетата трябва да има различни опции."
+    named_poll_must_have_different_options: "Анкетата  <strong>%{name}</strong> трябва да има различни възможни отговори."
+    default_poll_with_multiple_choices_has_invalid_parameters: "Анкетата с множество възможни избора има невалидни параметри."
+    named_poll_with_multiple_choices_has_invalid_parameters: "Анкетата <strong>%{name}</strong> е с множество възможни отговори и има невалидни параметри."
+    requires_at_least_1_valid_option: "Трябва да изберете най-малко 1 валиден вариант."
+    default_cannot_be_made_public: "Анкета с гласове не може да бъде направена публична."
+    edit_window_expired:
+      op_cannot_edit_options: "Не можете да добавяте или премахвате опции в анкетата след %{minutes} минути. Моля свържете се с модератор, ако искате да редактирате опции в анкетите."
+      staff_cannot_add_or_remove_options: "Не можете да добавяте или премахвате опции в анкетата след %{minutes} минути. Трябва да затворите тази тема и да създадете нова."
+    no_polls_associated_with_this_post: "Няма анкети които са свързани с тази публикация."
+    no_poll_with_this_name: "Няма анкета <strong>%{name}</strong> свързана с тази публикация."
+    post_is_deleted: "Не можете да извършвате действие върху изтрита публикация."
+    topic_must_be_open_to_vote: "Темата трябва да бъде отворена за да гласувате."
+    poll_must_be_open_to_vote: "Анкетата трябва да бъде отворена за да гласувате."
+    topic_must_be_open_to_toggle_status: "Темата трябва да бъде отворена за изменяне на статуса."
+    only_staff_or_op_can_toggle_status: "Само член на персонала или автора на анкетата може да измени нейния статус."
+    email:
+      link_to_poll: "Кликнете, за да видите анкетата."
diff --git a/plugins/poll/config/locales/server.bs_BA.yml b/plugins/poll/config/locales/server.bs_BA.yml
index c6aaba04299..40b3db75472 100644
--- a/plugins/poll/config/locales/server.bs_BA.yml
+++ b/plugins/poll/config/locales/server.bs_BA.yml
@@ -28,9 +28,7 @@ bs_BA:
     named_poll_with_multiple_choices_has_invalid_parameters: "Anketa nazvana <strong>%{name}</strong> s više opcija ima nevažeće parametre."
     requires_at_least_1_valid_option: "Morate odabrati barem 1 valjanu opciju."
     default_cannot_be_made_public: "Anketa s glasovima ne može biti postavljena kao javna."
-    named_cannot_be_made_public: "Anketa nazvana <strong>%{name}</strong> i ima glasove ne može biti postavljena kao javna."
     edit_window_expired:
-      cannot_change_polls: "Možete dodati, ukloniti ili preimenovati ankete nakon prvih %{minutes} minuta."
       op_cannot_edit_options: "Ne možete dodati ili ukloniti opcije ankete ankon prvih %{minutes} minuta. Molimo kontaktirajte moderatora ako morate urediti opciju ankete."
       staff_cannot_add_or_remove_options: "Ne možete dodati ili ukloniti opcije ankete nakon prvih %{minutes} minuta. Umjesto toga trebali bi prvo zatvoriti ovu temu i kreirati novu."
     no_polls_associated_with_this_post: "Nijedna anketa nije povezana sa ovim postom."
diff --git a/plugins/poll/config/locales/server.ca.yml b/plugins/poll/config/locales/server.ca.yml
index c904769304f..c888ff3b603 100644
--- a/plugins/poll/config/locales/server.ca.yml
+++ b/plugins/poll/config/locales/server.ca.yml
@@ -26,9 +26,7 @@ ca:
     named_poll_with_multiple_choices_has_invalid_parameters: "La votació anomenada <strong>%{name}</strong> multi-resposta té paràmetres invàlids."
     requires_at_least_1_valid_option: "Has de seleccionar com a mínim 1 opció vàlida."
     default_cannot_be_made_public: "Enquestes amb vots no poden fer-se públiques."
-    named_cannot_be_made_public: "L'enquesta anomenada <strong>%{name}</strong> te vots i no pot fer-se pública."
     edit_window_expired:
-      cannot_change_polls: "No pots afegir, remou-re o reanomenar enquestes passats %{minutes} minuts."
       op_cannot_edit_options: "No pots afegir o eliminar opcions d'enquestes passats %{minutes} minuts. Per favor, contacta un moderador si necessites editar una opció de l'enquesta."
       staff_cannot_add_or_remove_options: "No pots afegir o elimiminar opcions d'enquesta passats %{minutes} minuts. Hauries de tancar el tema i crear-ne un de nou."
     no_polls_associated_with_this_post: "No hi ha votacions associades a aquesta entrada."
diff --git a/plugins/poll/config/locales/server.cs.yml b/plugins/poll/config/locales/server.cs.yml
index 33f15ccdde6..12a6854165e 100644
--- a/plugins/poll/config/locales/server.cs.yml
+++ b/plugins/poll/config/locales/server.cs.yml
@@ -7,8 +7,10 @@
 
 cs:
   site_settings:
+    poll_enabled: "Povolit hlasování?"
     poll_maximum_options: "Maximální počet možností povolených v hlasování."
     poll_edit_window_mins: "Počet minut po vytvoření příspěvku, po kterých je ještě možné upravit hlasování."
+    poll_minimum_trust_level_to_create: "Nastav minimální důvěryhodnost pro vytvoření hlasování."
   poll:
     multiple_polls_without_name: "Je zde několik hlasování bez jména. Použijte atribut '<code>jméno</code>' pro jednoznačnou identifikaci Vašich hlasování."
     multiple_polls_with_same_name: "Více hlasování má stejné jméno: <strong>%{name}</strong>.  Použijte atribut '<code>name</code>' pro jednoznačnou identifikaci Vaše hlasování."
@@ -17,10 +19,12 @@ cs:
     default_poll_must_have_less_options:
       one: "Hlasování nesmí mít více než 1 možnost."
       few: "Hlasování nesmí mít více než %{count} možnosti."
+      many: "Hlasování nesmí mít více než %{count} možností."
       other: "Hlasování nesmí mít více než %{count} možností."
     named_poll_must_have_less_options:
       one: "Hlasování <strong>%{name}</strong> nesmí mít více než 1 možnost."
       few: "Hlasování <strong>%{name}</strong> nesmí mít více než %{count} možnosti."
+      many: "Hlasování <strong>%{name}</strong> nesmí mít více než %{count} možností."
       other: "Hlasování <strong>%{name}</strong> nesmí mít více než %{count} možností."
     default_poll_must_have_different_options: "Hlasování musí mít různé odpovědi."
     named_poll_must_have_different_options: "Hlasování <strong>%{name}</strong> musí mít různé odpovědi."
@@ -28,17 +32,17 @@ cs:
     named_poll_with_multiple_choices_has_invalid_parameters: "Hlasování <strong>%{name}</strong> s více možnostmi má neplatné parametry."
     requires_at_least_1_valid_option: "Musíte vybrat alespoň jednu platnou odpověď."
     default_cannot_be_made_public: "Hlasování s hlasy nemůže být zveřejněno."
-    named_cannot_be_made_public: "Hlasování <strong>%{name}</strong> s hlasy nemůže být zveřejněno."
     edit_window_expired:
-      cannot_change_polls: "Nemůžete přidávat, odebírat nebo přejmenovávat hlasování po prvních %{minutes} minutách."
       op_cannot_edit_options: "Nemůžete přidávat, odebírat nebo přejmenovávat hlasování po prvních %{minutes} minutách. Kontaktujte prosím moderátora, pokud potřebujete upravit odpověď v hlasování."
       staff_cannot_add_or_remove_options: "Nemůžete přidávat, odebírat nebo přejmenovávat hlasování po prvních %{minutes} minutách. Měli byste zavřít toto téma a vytvořit místo něj nové."
     no_polls_associated_with_this_post: "Tento příspěvek nemá žádné hlasování. "
     no_poll_with_this_name: "Tento příspěvek nemá žádné hlasování se jménem <strong>%{name}</strong>. "
     post_is_deleted: "Operaci na smazaném příspěvku nelze provést."
+    user_cant_post_in_topic: "Nemůžete hlasovat, protože v tomto tématu nemůžete odesílat příspěvky."
     topic_must_be_open_to_vote: "Téma musí být otevřené, aby bylo možné hlasovat."
     poll_must_be_open_to_vote: "Hlasování musí být otevřené, aby bylo možné hlasovat."
     topic_must_be_open_to_toggle_status: "Téma musí být otevřené, aby bylo možné změnit status."
     only_staff_or_op_can_toggle_status: "Pouze moderátor nebo přispěvatel může změnit status hlasování."
+    insufficient_rights_to_create: "Nemáte oprávnění k vytvoření hlasování."
     email:
       link_to_poll: "Klikněte pro zobrazení hlasování."
diff --git a/plugins/poll/config/locales/server.da.yml b/plugins/poll/config/locales/server.da.yml
index 50dd0c3bdc9..0f4c3d49f27 100644
--- a/plugins/poll/config/locales/server.da.yml
+++ b/plugins/poll/config/locales/server.da.yml
@@ -26,9 +26,7 @@ da:
     named_poll_with_multiple_choices_has_invalid_parameters: "Afstemningen <strong>%{name}</strong> med flere valgmuligheder har ugyldige parametre."
     requires_at_least_1_valid_option: "Du skal vælge mindst 1 gyldig mulighed."
     default_cannot_be_made_public: "En afstemning med stemmer kan ikke gøres offentlig."
-    named_cannot_be_made_public: "Afstemningen <strong>%{name}</strong> har stemmer og kan ikke gøres offentlig."
     edit_window_expired:
-      cannot_change_polls: "Du kan ikke tilføje, slette eller omdøbe en afstemning efter de første %{minutes} minutter."
       op_cannot_edit_options: "Du kan ikke tilføje eller slette afstemnings indstillinger efter de første %{minutes} minutter. Venligst kontakt en moderator hvis du har behov for at redigere en afstemning."
       staff_cannot_add_or_remove_options: "Du kan ikke tilføje eller fjerne afstemningsmuligheder efter de første %{minutes} minutter. Du bør lukke dette emne og oprette et nyt istedet."
     no_polls_associated_with_this_post: "Ingen afstemninger er associeret med dette indlæg."
diff --git a/plugins/poll/config/locales/server.de.yml b/plugins/poll/config/locales/server.de.yml
index b5848dbbab8..db28cf365de 100644
--- a/plugins/poll/config/locales/server.de.yml
+++ b/plugins/poll/config/locales/server.de.yml
@@ -30,12 +30,12 @@ de:
     default_cannot_be_made_public: "Umfragen mit abgegebenen Stimmen können nicht öffentlich gemacht werden."
     named_cannot_be_made_public: "Die Umfrage <strong>%{name}</strong> hat Stimmen und kann nicht öffentlich gemacht werden."
     edit_window_expired:
-      cannot_change_polls: "Du kannst Umfragen nur in den ersten %{minutes} Minuten hinzufügen, entfernen oder umbenennen."
       op_cannot_edit_options: "Du kannst Umfrageoptionen nur in den ersten %{minutes} Minuten hinzufügen oder entfernen. Kontaktiere bitte einen Moderator, wenn du Optionen ändern möchtest."
       staff_cannot_add_or_remove_options: "Du kannst Umfrageoptionen nur in den ersten %{minutes} Minuten hinzufügen oder entfernen. Du solltest dieses Thema schließen und stattdessen ein neues erstellen."
     no_polls_associated_with_this_post: "Diesem Beitrag sind keine Umfragen zugeordnet."
     no_poll_with_this_name: "Diesem Beitrag ist keine Umfrage mit dem Namen <strong>%{name}</strong> zugeordnet."
     post_is_deleted: "Die Aktion kann nicht durchgeführt werden, da der Beitrag gelöscht wurde."
+    user_cant_post_in_topic: "Du kannst nicht abstimmen, weil du in diesem Thema nicht schreiben kannst."
     topic_must_be_open_to_vote: "Das Thema muss zum Abstimmen geöffnet sein."
     poll_must_be_open_to_vote: "Die Umfrage muss zum Abstimmen gestartet sein."
     topic_must_be_open_to_toggle_status: "Damit du den Status ändern kannst, muss das Thema geöffnet sein."
diff --git a/plugins/poll/config/locales/server.el.yml b/plugins/poll/config/locales/server.el.yml
index 7d2ef9753ab..ef5eb2ad06c 100644
--- a/plugins/poll/config/locales/server.el.yml
+++ b/plugins/poll/config/locales/server.el.yml
@@ -28,9 +28,7 @@ el:
     named_poll_with_multiple_choices_has_invalid_parameters: "Η ψηφοφορία με όνομα <strong>%{name}</strong> και με πολλαπλές επιλογές έχει μη έγγυρες παραμέτρους"
     requires_at_least_1_valid_option: "Πρέπει να κάνεις τουλάχιστον 1 έγκυρη επιλογή."
     default_cannot_be_made_public: "Ψηφοφορία με ψήφους δεν μπορεί να γίνει δημόσια."
-    named_cannot_be_made_public: "Η ψηφοφορία με όνομα <strong>%{name}</strong> έχει ψήφους που δεν μπορούν να δημοσιοποιηθούν."
     edit_window_expired:
-      cannot_change_polls: "Δεν μπορείτε να προσθέσετε, να καταργήσετε ή να μετονομάσετε ψηφοφορίες μετά τα πρώτα %{minutes} λεπτά."
       op_cannot_edit_options: "Δεν μπορείτε να προσθέσετε ή να αφαιρέσετε επιλογές στην ψηφοφορία μετά τα πρώτα %{minutes} λεπτά. Παρακαλούμε επικοινωνήστε με έναν συντονιστή αν χρειάζεται να επεξεργαστείτε μια επιλογή για την ψηφοφορία."
       staff_cannot_add_or_remove_options: "Δεν μπορείτε να προσθέσετε ή να αφαιρέσετε επιλογές στην ψηφοφορία μετά τα πρώτα %{minutes} λεπτά. Θα πρέπει να κλείσετε αυτό το νήμα και να δημιουργήσετε ένα νέο αντ' αυτού."
     no_polls_associated_with_this_post: "Σε αυτή την ανάρτηση δεν υπάρχουν ψηφοφορίες."
diff --git a/plugins/poll/config/locales/server.en.yml b/plugins/poll/config/locales/server.en.yml
index ab2be4fd1c4..45859bb1894 100644
--- a/plugins/poll/config/locales/server.en.yml
+++ b/plugins/poll/config/locales/server.en.yml
@@ -44,10 +44,9 @@ en:
     requires_at_least_1_valid_option: "You must select at least 1 valid option."
 
     default_cannot_be_made_public: "Poll with votes cannot be made public."
-    named_cannot_be_made_public: "Poll named <strong>%{name}</strong> has votes cannot be made public."
+    named_cannot_be_made_public: "Poll named <strong>%{name}</strong> has votes and cannot be made public."
 
     edit_window_expired:
-      cannot_change_polls: "You cannot add, remove or rename polls after the first %{minutes} minutes."
       op_cannot_edit_options: "You cannot add or remove poll options after the first %{minutes} minutes. Please contact a moderator if you need to edit a poll option."
       staff_cannot_add_or_remove_options: "You cannot add or remove poll options after the first %{minutes} minutes. You should close this topic and create a new one instead."
 
@@ -56,6 +55,8 @@ en:
 
     post_is_deleted: "Cannot act on a deleted post."
 
+    user_cant_post_in_topic: "You can't vote because you can't post in this topic."
+
     topic_must_be_open_to_vote: "The topic must be open to vote."
     poll_must_be_open_to_vote: "Poll must be open to vote."
 
diff --git a/plugins/poll/config/locales/server.es.yml b/plugins/poll/config/locales/server.es.yml
index 53d314bfc9f..4053e62abd3 100644
--- a/plugins/poll/config/locales/server.es.yml
+++ b/plugins/poll/config/locales/server.es.yml
@@ -28,14 +28,14 @@ es:
     named_poll_with_multiple_choices_has_invalid_parameters: "La encuesta llamada <strong>%{name}</strong> con múltiples opciones tiene párametros no válidos."
     requires_at_least_1_valid_option: "Debes escoger al menos 1 opción válida."
     default_cannot_be_made_public: "La encuesta con votos ya registrados no puede hacerse pública."
-    named_cannot_be_made_public: "La encuesta llamada <strong>%{name}</strong> tiene votos ya registrados por lo que no puede hacerse pública."
+    named_cannot_be_made_public: "Encuesta nombrada <strong>%{name}</strong> tiene votos y no puede hacerse pública."
     edit_window_expired:
-      cannot_change_polls: "No se puede modificar, quitar o renombrar encuestas transcurridos %{minutes} minutos."
       op_cannot_edit_options: "No se puede modificar o eliminar las opciones de la encuesta transcurridos %{minutes} minutos. Por favor, contacta con un moderador si necesitas editar las opciones de la encuesta."
       staff_cannot_add_or_remove_options: "No se puede modificar o eliminar las opciones de la encuesta transcurridos %{minutes} minutos. En su lugar, deberías cerrar este tema y abrir uno nuevo."
     no_polls_associated_with_this_post: "No hay encuestas asociadas a este post."
     no_poll_with_this_name: "No hay ninguna encuesta llamada <strong>%{name}</strong> asociada con este post."
     post_is_deleted: "No se puede actuar en un post eliminado."
+    user_cant_post_in_topic: "No puedes votar porque no puedes publicar en este tema."
     topic_must_be_open_to_vote: "Este tema debe estar abierto para votar."
     poll_must_be_open_to_vote: "La encuesta debe estar abierta para votar."
     topic_must_be_open_to_toggle_status: "Este tema debe estar abierto para cambiar entre estados."
diff --git a/plugins/poll/config/locales/server.et.yml b/plugins/poll/config/locales/server.et.yml
index c763aea00b8..2b33062b8c5 100644
--- a/plugins/poll/config/locales/server.et.yml
+++ b/plugins/poll/config/locales/server.et.yml
@@ -26,9 +26,7 @@ et:
     named_poll_with_multiple_choices_has_invalid_parameters: "Mitme valikuga küsitlusel nimega <strong>%{name}</strong> on vigaseid parameetreid."
     requires_at_least_1_valid_option: "Pead tegema vähemalt 1 korrektse valiku."
     default_cannot_be_made_public: "Küsitlust millel on vastused, ei saa muuta avalikuks."
-    named_cannot_be_made_public: "Küsitlus nimega <strong>%{name}</strong> sisaldab hääli ja seda ei saa teha avalikuks."
     edit_window_expired:
-      cannot_change_polls: "Peale %{minutes} minutit ei saa küsitlusi lisada, eemaldada ja ringi nimetada."
       op_cannot_edit_options: "Pärast %{minutes} minutit ei saa küsitluse valikuid lisada ega eemaldada. Palun võta administraatoriga ühendust, kui on vaja küsitluse valikuid muuta."
       staff_cannot_add_or_remove_options: "Pärast %{minutes} minutit ei saa küsitluse valikuid lisada ega eemaldada. Peaksid teema sulgema ning uue tegema."
     no_polls_associated_with_this_post: "Postitusega pole seotud ühtegi küsitlust."
diff --git a/plugins/poll/config/locales/server.fa_IR.yml b/plugins/poll/config/locales/server.fa_IR.yml
index 2ebc151a22f..f2eaa6e7b0d 100644
--- a/plugins/poll/config/locales/server.fa_IR.yml
+++ b/plugins/poll/config/locales/server.fa_IR.yml
@@ -7,6 +7,7 @@
 
 fa_IR:
   site_settings:
+    poll_enabled: "نظرسنجی مجاز است؟"
     poll_maximum_options: "حداکثر تعداد گزینه برای نظرسنجی‌ها."
     poll_edit_window_mins: "چند دقیقه بعد از ارسال نظر می توان آن را ویرایش کرد"
   poll:
@@ -15,8 +16,10 @@ fa_IR:
     default_poll_must_have_at_least_2_options: "نظرسنجی باید حداقل 2 گزینه داشته باشد."
     named_poll_must_have_at_least_2_options: "اسم نظرسنجی <strong>%{name}</strong> باید  حداقل 2 گزینه داشته باشد. "
     default_poll_must_have_less_options:
+      one: "نظرسنجی باید کمتر از %{count} گزینه داشته باشد."
       other: "نظرسنجی باید کمتر از %{count} گزینه داشته باشد."
     named_poll_must_have_less_options:
+      one: "نظرسنجی با نام <strong>%{name}</strong> باید کمتر از %{count} گزینه داشته باشد."
       other: "نظرسنجی با نام <strong>%{name}</strong> باید کمتر از %{count} گزینه داشته باشد."
     default_poll_must_have_different_options: "نظرسنجی باید گزینه های متفاوت داشته باشد. "
     named_poll_must_have_different_options: "Poll named <strong>%{name}</strong> must have different options."
@@ -24,9 +27,7 @@ fa_IR:
     named_poll_with_multiple_choices_has_invalid_parameters: "در نظرسنجی چند گزینه‌ای با نام <strong>%{name}</strong> پارامترهای نامعتبری وجود دارد."
     requires_at_least_1_valid_option: "باید حداقل یک گزینه معتبر انتخاب کنید."
     default_cannot_be_made_public: "نظر سنجی با رای را نمی توان عمومی کرد"
-    named_cannot_be_made_public: "تعداد آرای نظر‌سنجی <strong>%{name}</strong> قابل نمایش عمومی نیست."
     edit_window_expired:
-      cannot_change_polls: "نمی‌توانید بعد از %{minutes} دقیقه نظرسنجی‌ها را اضافه و حذف کنید یا نام آن‌ها را تغییر دهید."
       op_cannot_edit_options: "بعد از %{minutes} دقیقه اول نمی‌توانید گزینه‌های نظر‌سنجی را حذف یا اضافه کنید. برای ویرایش نظرسنجی با مدیر‌ها ارتباط برقرار کنید."
       staff_cannot_add_or_remove_options: "بعد از %{minutes} دقیقه اول نمی‌توانید گزینه‌های نظر‌سنجی را حذف یا اضافه کنید. باید این موضوع را ببندید و یک موضوع جدید ایجاد کنید."
     no_polls_associated_with_this_post: "هیچ نظرسنجی‌ای با این نوشته در تماس نیستن. "
diff --git a/plugins/poll/config/locales/server.fi.yml b/plugins/poll/config/locales/server.fi.yml
index f6fd229c3be..00db7b89fa4 100644
--- a/plugins/poll/config/locales/server.fi.yml
+++ b/plugins/poll/config/locales/server.fi.yml
@@ -28,9 +28,7 @@ fi:
     named_poll_with_multiple_choices_has_invalid_parameters: "Kysely nimeltä <strong>%{name}</strong>, jossa on useampia vaihtoehtoja sisältää epäkelpoja parametreja"
     requires_at_least_1_valid_option: "Sinun täytyy valita vähintään 1 vaihtoehto."
     default_cannot_be_made_public: "Kyselyä, johon on vastattu, ei voi muuttaa julkiseksi."
-    named_cannot_be_made_public: "Äänestys <strong>%{name}</strong> on ääniä, joita ei voi julkistaa."
     edit_window_expired:
-      cannot_change_polls: "Äänestyksiä ei enää voi lisätä, poistaa tai uudelleennimetä, kun on kulunut %{minutes} minuuttia."
       op_cannot_edit_options: "Vastausvaihtoehtoja ei enää voi lisätä tai poistaa, kun on kulunut %{minutes} minuuttia. Ota yhteyttä valvojaan, jos vastausvaihtoehtoa tulisi muokata."
       staff_cannot_add_or_remove_options: "Vastausvaihtoehtoja ei enää voi lisätä tai poistaa, kun on kulunut %{minutes} minuuttia. Tämä ketju tulisi sulkea ja aloittaa uusi ketju."
     no_polls_associated_with_this_post: "Tämä viesti ei sisällä äänestyskyselyä."
diff --git a/plugins/poll/config/locales/server.fr.yml b/plugins/poll/config/locales/server.fr.yml
index c6bf69a134a..24cacf8bc32 100644
--- a/plugins/poll/config/locales/server.fr.yml
+++ b/plugins/poll/config/locales/server.fr.yml
@@ -7,7 +7,7 @@
 
 fr:
   site_settings:
-    poll_enabled: "Autoriser les sondages ?"
+    poll_enabled: "Permettre les sondages ?"
     poll_maximum_options: "Nombre maximum d'options autorisées dans un sondage."
     poll_edit_window_mins: "Nombre de minutes après la création du message durant lesquelles les sondages peuvent être modifiés."
     poll_minimum_trust_level_to_create: "Définir le niveau de confiance minimum requis pour créer des sondages."
@@ -28,18 +28,18 @@ fr:
     named_poll_with_multiple_choices_has_invalid_parameters: "Le sondage <strong>%{name}</strong> à choix multiples possède des paramètres invalides."
     requires_at_least_1_valid_option: "Vous devez sélectionner au moins 1 option valide."
     default_cannot_be_made_public: "Un sondage avec des votes ne peut pas être rendu public."
-    named_cannot_be_made_public: "Le sondage <strong>%{name}</strong> a des votes et ne peut être rendu public."
+    named_cannot_be_made_public: "Sondage <strong>%{name}</strong> a déjà des votes et ne peut pas être rendu public."
     edit_window_expired:
-      cannot_change_polls: "Vous ne pouvez pas ajouter, supprimer ou renommer les sondages après les %{minutes} premières minutes."
       op_cannot_edit_options: "Vous nous pouvez pas ajouter ou supprimer d'options de sondage après les %{minutes} premières minutes. Veuillez contacter un modérateur si vous avez besoin de le faire."
       staff_cannot_add_or_remove_options: "Vous nous pouvez pas ajouter ou supprimer d'options de sondage après les %{minutes} premières minutes. Vous devriez plutôt fermer ce sujet et en créer un nouveau."
     no_polls_associated_with_this_post: "Aucun sondage n'est associé à ce message."
     no_poll_with_this_name: "Aucun sondage nommé <strong>%{name}</strong> n'est associé avec ce message."
     post_is_deleted: "Impossible d'agir sur un message supprimé."
+    user_cant_post_in_topic: "Vous ne pouvez pas voter parce que vous ne pouvez pas publier dans ce sujet."
     topic_must_be_open_to_vote: "Le sujet doit être ouvert pour pouvoir voter."
     poll_must_be_open_to_vote: "Le sondage doit être ouvert pour pouvoir voter."
     topic_must_be_open_to_toggle_status: "Le sujet doit être ouvert pour modifier le statut."
     only_staff_or_op_can_toggle_status: "Seul un responsable ou le créateur du sujet peut modifier le statut d'un sondage."
-    insufficient_rights_to_create: "Vous n'êtes pas autorisés à créer des sondages."
+    insufficient_rights_to_create: "Vous n'avez pas la permission de créer des sondages."
     email:
       link_to_poll: "Cliquer pour voir le sondage."
diff --git a/plugins/poll/config/locales/server.he.yml b/plugins/poll/config/locales/server.he.yml
index e254c76c18a..9c160dc77a1 100644
--- a/plugins/poll/config/locales/server.he.yml
+++ b/plugins/poll/config/locales/server.he.yml
@@ -16,9 +16,13 @@ he:
     named_poll_must_have_at_least_2_options: "לסקר בשם <strong>%{name}</strong> צריך שיהיו לפחות שתי אפשרויות."
     default_poll_must_have_less_options:
       one: "לסקר חייבת להיות פחות מאפשרות אחת."
+      two: "לסקר חייבות להיות פחות מ-%{count} אפשרויות."
+      many: "לסקר חייבות להיות פחות מ-%{count} אפשרויות."
       other: "לסקר חייבות להיות פחות מ-%{count} אפשרויות."
     named_poll_must_have_less_options:
       one: "לסקר בשם <strong>%{name}</strong> צריכה להיות פחות מאפשרות אחת."
+      two: "לסקר בשם <strong>%{name}</strong> צריכות להיות פחות מ-%{count} אפשרויות."
+      many: "לסקר בשם <strong>%{name}</strong> צריכות להיות פחות מ-%{count} אפשרויות."
       other: "לסקר בשם <strong>%{name}</strong> צריכות להיות פחות מ-%{count} אפשרויות."
     default_poll_must_have_different_options: "לסקר צריך שתהיינה אפשרויות שונות. "
     named_poll_must_have_different_options: "לסקר בשם <strong>%{name}</strong> צריך שתהינה אפשרויות שונות."
@@ -26,9 +30,7 @@ he:
     named_poll_with_multiple_choices_has_invalid_parameters: "לסקר בשם <strong>%{name}</strong> עם בחירה מרובה יש פרמטרים לא תקינים."
     requires_at_least_1_valid_option: "עליך לבחור לפחות אפשרות אחת תקינה."
     default_cannot_be_made_public: "לא ניתן להפוך סקרים עם הצבעות קיימות לפומביים."
-    named_cannot_be_made_public: "הסקר <strong>%{name}</strong> מכיל הצבעות ולא יכול להפוך לפומבי."
     edit_window_expired:
-      cannot_change_polls: "אינכם יכולים להוסיף, להסיר, או לשנות שם לסקרים לאחר %{minutes} הדקות הראשונות."
       op_cannot_edit_options: "אינכם יכולים להוסיף או להסיר אופציות סקרים אחרי %{minutes} הדקות הראשונות. אנא פנו למנחה אם אתם צריכים לערוך אופציית סקר."
       staff_cannot_add_or_remove_options: "אינכם יכולים להוסיף או להסיר אופציית סקר לאחר %{minutes} הדקות הראשונות. עליכם לסגור את הנושא וליצור אחד חדש במקום."
     no_polls_associated_with_this_post: "אין סקרים שמקושרים לפוסט הזה."
diff --git a/plugins/poll/config/locales/server.id.yml b/plugins/poll/config/locales/server.id.yml
index b4361c08a8d..412317d3455 100644
--- a/plugins/poll/config/locales/server.id.yml
+++ b/plugins/poll/config/locales/server.id.yml
@@ -7,6 +7,7 @@
 
 id:
   site_settings:
+    poll_enabled: "Izinkan jajak pendapat?"
     poll_maximum_options: "Nomor maksimum dari pilihan yang diperbolehkan di sebuah polling."
     poll_edit_window_mins: "Menit setelah postingan dibuat dimana polling masih bisa diedit."
   poll:
@@ -24,9 +25,7 @@ id:
     named_poll_with_multiple_choices_has_invalid_parameters: "Polling dengan nama <strong>%{name}</strong> dengan pilihan ganda parameternya tidak benar."
     requires_at_least_1_valid_option: "Anda harus memilih setidaknya 1 pilihan yang benar."
     default_cannot_be_made_public: "Polling dengan pilihan tidak bisa dibuat publik."
-    named_cannot_be_made_public: "Polling berjudul <strong>%{name}</strong> memiliki pilihan yang tidak bisa dibuat publik."
     edit_window_expired:
-      cannot_change_polls: "Anda tidak bisa membuat, menghapus atau mengubah polling setelah %{minutes} menit."
       op_cannot_edit_options: "Anda tidak dapat menambahkan atau menghapus pilihan polling setelah %{minutes} menit pertama. Mohon hubungi moderator jika anda ingin mengubah pilihan dalam polling."
       staff_cannot_add_or_remove_options: "Anda tidak dapat menambahkan atau menghapus pilihan polling setelah %{minutes} menit. Anda disarankan menutup topik ini dan membuat topik baru."
     no_polls_associated_with_this_post: "Tidak ada polling yang terkait dengan pos ini."
diff --git a/plugins/poll/config/locales/server.it.yml b/plugins/poll/config/locales/server.it.yml
index 14ad1c92e9d..eb82db2fe50 100644
--- a/plugins/poll/config/locales/server.it.yml
+++ b/plugins/poll/config/locales/server.it.yml
@@ -7,8 +7,10 @@
 
 it:
   site_settings:
+    poll_enabled: "Permettere i sondaggi?"
     poll_maximum_options: "Numero massimo di opzioni permesse in un sondaggio."
     poll_edit_window_mins: "Numero di minuti dopo la creazione di un messaggio durante i quali i sondaggi possono ancora essere modificati."
+    poll_minimum_trust_level_to_create: "Definisce il minimo livello di esperienza necessario per poter creare sondaggi."
   poll:
     multiple_polls_without_name: "Ci sono più sondaggi privi di nome. Usa l'attributo '<code>name</code>' per identificare univocamente i tuoi sondaggi."
     multiple_polls_with_same_name: "Ci sono più sondaggi con lo stesso nome: <strong>%{name}</strong>. Usa l'attributo '<code>name</code>' per identificare univocamente i tuoi sondaggi."
@@ -26,9 +28,7 @@ it:
     named_poll_with_multiple_choices_has_invalid_parameters: "Il sondaggio a scelta multipla dal nome <strong>%{name}</strong> ha parametri non validi."
     requires_at_least_1_valid_option: "Devi scegliere almeno una opzione valida."
     default_cannot_be_made_public: "I sondaggi con voti non possono essere resi pubblici."
-    named_cannot_be_made_public: "Il sondaggio dal nome <strong>%{name}</strong> ha voti e non può essere reso pubblico."
     edit_window_expired:
-      cannot_change_polls: "Non puoi aggiungere, cancellare o rinominare i sondaggi dopo i primi %{minutes} minuti."
       op_cannot_edit_options: "Non puoi aggiungere o cancellare le voci del sondaggio dopo i primi %{minutes} minuti. Contatta un moderatore se hai bisogno di modificare una voce di sondaggio."
       staff_cannot_add_or_remove_options: "Non puoi aggiungere o cancellare le voci del sondaggio dopo i primi %{minutes} minuti. Per farlo devi chiudere questo argomento ed aprirne uno nuovo."
     no_polls_associated_with_this_post: "Non ci sono sondaggi associati con questo messaggio."
diff --git a/plugins/poll/config/locales/server.ja.yml b/plugins/poll/config/locales/server.ja.yml
index fa6ebfec126..3411bd72411 100644
--- a/plugins/poll/config/locales/server.ja.yml
+++ b/plugins/poll/config/locales/server.ja.yml
@@ -24,9 +24,7 @@ ja:
     named_poll_with_multiple_choices_has_invalid_parameters: "複数の選択肢をもつ投票 <strong>%{name}</strong> に無効なパラメータがあります。"
     requires_at_least_1_valid_option: "少なくとも1つの有効なオプションを選択する必要があります。"
     default_cannot_be_made_public: "得票済みの投票は公開することができません。"
-    named_cannot_be_made_public: "投票 <strong>%{name}</strong> は得票済みのため公開することができません。"
     edit_window_expired:
-      cannot_change_polls: "最初の%{minutes}分が経過するまで、投票の追加,  削除, 名前の変更はできません。"
       op_cannot_edit_options: "最初の%{minutes}分が経過したため投票の選択肢を編集することはできません。投票の選択肢を編集したい場合はモデレータへ連絡してください。"
       staff_cannot_add_or_remove_options: "最初の%{minutes}分が経過したため投票の選択肢を編集することはできません。このトピックを閉じて代わりに新しいトピックを作成する必要があります。"
     no_polls_associated_with_this_post: "この投稿に関連付けられた投票はありません。"
diff --git a/plugins/poll/config/locales/server.ko.yml b/plugins/poll/config/locales/server.ko.yml
index 12247712da1..57ae53962bc 100644
--- a/plugins/poll/config/locales/server.ko.yml
+++ b/plugins/poll/config/locales/server.ko.yml
@@ -24,9 +24,7 @@ ko:
     named_poll_with_multiple_choices_has_invalid_parameters: "복수응답 가능한 <strong>%{name}</strong> 투표가 잘못된 매개변수를 가지고 있습니다."
     requires_at_least_1_valid_option: "유효한 투표 항목을 적어도 1개는 선택해야 합니다."
     default_cannot_be_made_public: "이미 투표가 진행되어서 공개로 전환할 수 없습니다."
-    named_cannot_be_made_public: "<strong>%{name}</strong>는 공개 설정할 수 없는 표가 있습니다."
     edit_window_expired:
-      cannot_change_polls: "처음 %{minutes}분 동안은 투표를 추가, 제거하거나 이름을 변경할 수 없습니다."
       op_cannot_edit_options: "처음 %{minutes}분 동안은 투표를 추가하거나 삭제할 수 없습니다. 투표를 꼭 수정해야만 한다면 운영자에게 문의하시기 바랍니다."
       staff_cannot_add_or_remove_options: "처음 %{minutes}분 동안은 투표 항목을 추가하거나 삭제할 수 없습니다. 그렇지 않으면, 이 토픽을 닫고 새로운 토픽을 만들어야 합니다."
     no_polls_associated_with_this_post: "이 포스트와 관련한 투표가 없습니다."
diff --git a/plugins/poll/config/locales/server.nb_NO.yml b/plugins/poll/config/locales/server.nb_NO.yml
index cf2ab43274b..da756ccf160 100644
--- a/plugins/poll/config/locales/server.nb_NO.yml
+++ b/plugins/poll/config/locales/server.nb_NO.yml
@@ -28,18 +28,18 @@ nb_NO:
     named_poll_with_multiple_choices_has_invalid_parameters: "Avstemningen <strong>%{name}</strong> med flere svaralternativer har ugyldige parametere."
     requires_at_least_1_valid_option: "Du må velge minst 1 gyldig alternativ."
     default_cannot_be_made_public: "Avstemninger med avgitte stemmer kan ikke gjøres offentlige."
-    named_cannot_be_made_public: "Avstemningen <strong>%{name}</strong> har avgitte stemmer og kan ikke gjøres offentlig."
+    named_cannot_be_made_public: "Avstemningen med navn <strong>%{name}</strong> har eksisterende stemmer og kan ikke gjøres offentlig nå."
     edit_window_expired:
-      cannot_change_polls: "Du kan ikke legge til, fjerne eller navne om avstemninger etter de første %{minutes}  minuttene."
       op_cannot_edit_options: "Du kan ikke legge til eller fjerne svaralternativer etter de første %{minutes} minuttene. Kontakt en moderator hvis du har behov for å redigere et svaralternativ."
-      staff_cannot_add_or_remove_options: "Du kan ikke lette til eller fjerne valgalternativer for avstemningen etter de første %{minutes} minuttene. Du bør stenge dette emnet og lage et nytt i stedet."
+      staff_cannot_add_or_remove_options: "Du kan ikke lette til eller fjerne valgalternativer for avstemningen etter de første %{minutes} minuttene. Du bør stenge denne tråden og lage et nytt i stedet."
     no_polls_associated_with_this_post: "Ingen avstemning er assosiert med dette innlegget."
     no_poll_with_this_name: "Ingen avstemning med navnet <strong>%{name}</strong> er assosiert med dette innlegget."
     post_is_deleted: "Kan ikke agere på et slettet innlegg."
-    topic_must_be_open_to_vote: "Emnet må være åpent for å kunne avgi stemme."
+    user_cant_post_in_topic: "Du kan ikke stemme fordi du ikke har tillatelse til å skrive i dette emnet."
+    topic_must_be_open_to_vote: "Tråden må være åpen for å kunne avgi stemme."
     poll_must_be_open_to_vote: "Avstemningen må være åpen for å kunne avgi 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å avstemningen."
+    topic_must_be_open_to_toggle_status: "Tråden må være åpen for å endre status."
+    only_staff_or_op_can_toggle_status: "Kun et medlem av staben eller forfatteren av innlegget kan endre status for avstemningen."
     insufficient_rights_to_create: "Du har ikke lov til å opprette avstemninger."
     email:
       link_to_poll: "Klikk for å se avstemningen"
diff --git a/plugins/poll/config/locales/server.nl.yml b/plugins/poll/config/locales/server.nl.yml
index d21ae315b66..551be894b6b 100644
--- a/plugins/poll/config/locales/server.nl.yml
+++ b/plugins/poll/config/locales/server.nl.yml
@@ -7,8 +7,10 @@
 
 nl:
   site_settings:
+    poll_enabled: "Polls toestaan?"
     poll_maximum_options: "Maximale aantal toegestane opties in een poll."
     poll_edit_window_mins: "Aantal minuten na het aanmaken van een bericht waarin polls kunnen worden bewerkt."
+    poll_minimum_trust_level_to_create: "Het minimale vertrouwensniveau dat nodig is om polls aan te maken."
   poll:
     multiple_polls_without_name: "Er zijn meerdere polls zonder naam. Gebruik het attribuut '<code>naam</code>' om uw polls uniek te identificeren."
     multiple_polls_with_same_name: "Er zijn meerdere polls met dezelfde naam : <strong>%{name}</strong>. Gebruik het attribuut '<code>naam</code>' om uw polls uniek te identificeren."
@@ -26,17 +28,17 @@ nl:
     named_poll_with_multiple_choices_has_invalid_parameters: "De poll met de naam <strong>%{name}</strong> met meerdere keuzes heeft ongeldige parameters."
     requires_at_least_1_valid_option: "Kies minstens 1 geldige optie."
     default_cannot_be_made_public: "De poll met stemmen kan niet openbaar worden gemaakt."
-    named_cannot_be_made_public: "De poll met de naam <strong>%{name}</strong> heeft stemmen die niet openbaar kunnen worden gemaakt."
     edit_window_expired:
-      cannot_change_polls: "U kunt na %{minutes} minuten geen polls meer toevoegen, verwijderen of hernoemen."
       op_cannot_edit_options: "U kunt na %{minutes} minuten geen pollopties meer toevoegen of verwijderen. Neem contact op met een moderator als u een polloptie dient te bewerken."
       staff_cannot_add_or_remove_options: "U kunt na %{minutes} minuten geen pollopties meer toevoegen of verwijderen. U dient daarom dit topic te sluiten en een nieuw topic aan te maken."
     no_polls_associated_with_this_post: "Er zijn geen polls aan dit bericht gekoppeld."
     no_poll_with_this_name: "Er is geen poll met de naam <strong>%{name}</strong> aan dit bericht gekoppeld."
     post_is_deleted: "Dit kan niet bij een verwijderd bericht."
+    user_cant_post_in_topic: "Je kunt niet stemmen omdat je niet in dit topic kunt posten."
     topic_must_be_open_to_vote: "Het topic moet geopend zijn om te kunnen stemmen."
     poll_must_be_open_to_vote: "De poll moet geopend zijn om te kunnen stemmen."
     topic_must_be_open_to_toggle_status: "Het topic moet geopend zijn om de status te kunnen omschakelen."
     only_staff_or_op_can_toggle_status: "Alleen een staflid of de oorspronkelijke plaatser van een bericht kan de status van een poll omschakelen."
+    insufficient_rights_to_create: "Je hebt geen toestemming om polls te maken."
     email:
       link_to_poll: "Klik om de poll te bekijken."
diff --git a/plugins/poll/config/locales/server.pl_PL.yml b/plugins/poll/config/locales/server.pl_PL.yml
index d006e7c21ae..78a78cf1112 100644
--- a/plugins/poll/config/locales/server.pl_PL.yml
+++ b/plugins/poll/config/locales/server.pl_PL.yml
@@ -32,9 +32,7 @@ pl_PL:
     named_poll_with_multiple_choices_has_invalid_parameters: "Ankieta wielokrotnego wyboru o nazwie <strong>%{name}</strong> posiada nieprawidłowe parametry."
     requires_at_least_1_valid_option: "Musisz wybrać co najmniej 1 poprawną opcje."
     default_cannot_be_made_public: "Ankieta z głosami nie może być publiczna."
-    named_cannot_be_made_public: "Ankieta o nazwie <strong>% {name} </ strong> posiadająca głosy nie może być publiczna."
     edit_window_expired:
-      cannot_change_polls: "Po upływie pierwszych %{minutes} minut nie można dodawać, usuwać lub zmieniać ankiet."
       op_cannot_edit_options: "Po upływie pierwszych %{minutes} minut nie można dodawać lub usuwać opcji wyboru w ankietach. Skontaktuj się z moderatorem jeśli naprawdę musisz zmienić opcję w tej ankiecie."
       staff_cannot_add_or_remove_options: "Po upływie pierwszych %{minutes} minut nie można dodawać lub usuwać opcji wyboru w ankietach. Należy zamknąć ten temat i utworzyć zamiast tego nowy temat."
     no_polls_associated_with_this_post: "Wskazany wpis nie posiada przypisanych ankiet."
diff --git a/plugins/poll/config/locales/server.pt.yml b/plugins/poll/config/locales/server.pt.yml
index 083c51f08ca..47eed2fc444 100644
--- a/plugins/poll/config/locales/server.pt.yml
+++ b/plugins/poll/config/locales/server.pt.yml
@@ -7,8 +7,10 @@
 
 pt:
   site_settings:
+    poll_enabled: "Permitir 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_minimum_trust_level_to_create: "Defina o nível de confiança mínimo necessário para criar sondagens."
   poll:
     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."
@@ -26,17 +28,17 @@ pt:
     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."
     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."
+    user_cant_post_in_topic: "Não pode votar porque não pode publicar neste tópico."
     topic_must_be_open_to_vote: "O tópico tem que estar aberto para votar."
     poll_must_be_open_to_vote: "A 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 da equipa de apoio ou o autor original pode alternar o estado da sondagem."
+    insufficient_rights_to_create: "Não está autorizado para criar sondagens."
     email:
       link_to_poll: "Clique para ver a sondagem."
diff --git a/plugins/poll/config/locales/server.pt_BR.yml b/plugins/poll/config/locales/server.pt_BR.yml
index 8b9022026c6..ef5cb4a77cc 100644
--- a/plugins/poll/config/locales/server.pt_BR.yml
+++ b/plugins/poll/config/locales/server.pt_BR.yml
@@ -26,9 +26,7 @@ pt_BR:
     named_poll_with_multiple_choices_has_invalid_parameters: "Enquete chamada <strong>%{name}</strong> com múltiplas escolhas tem parâmetros inválidos."
     requires_at_least_1_valid_option: "Você deve selecionar pelo menos 1 opção válida."
     default_cannot_be_made_public: "Enquetes com votos não podem ser tornadas públicas."
-    named_cannot_be_made_public: "A enquete de nome <strong>%{name}</strong> tem votos e não pode se tornar pública."
     edit_window_expired:
-      cannot_change_polls: "Você não pode adicionar, remover ou renomear enquetes depois dos primeiros %{minutes} minutos."
       op_cannot_edit_options: "Você não pode adicionar ou remover opções das enquetes depois dos primeiros %{minutes} minutos. Por favor contate um moderador se você precisar editar uma opção da enquete."
       staff_cannot_add_or_remove_options: "Você não pode adicionar ou remover opções das enquetes depois dos primeiros %{minutes} minutos. Você deve fechar este tópico e criar um novo."
     no_polls_associated_with_this_post: "Não há votações associadas com esta mensagem."
diff --git a/plugins/poll/config/locales/server.ro.yml b/plugins/poll/config/locales/server.ro.yml
index 80260a08bbf..c906229233a 100644
--- a/plugins/poll/config/locales/server.ro.yml
+++ b/plugins/poll/config/locales/server.ro.yml
@@ -7,8 +7,10 @@
 
 ro:
   site_settings:
+    poll_enabled: "Permiți sondaje?"
     poll_maximum_options: "Numărul maxim admis de opțiuni într-un sondaj"
     poll_edit_window_mins: "Număr de minute după crearea postării pe parcursul cărora sondajele pot fi editate."
+    poll_minimum_trust_level_to_create: "Definește nivelul minim de încredere pentru a crea sondaje."
   poll:
     multiple_polls_without_name: "Există mai multe sondaje fără nume. Folosește atributul '<code>name</code>' pentru a identifica sondajele proprii"
     multiple_polls_with_same_name: "Există mai multe sondaje cu același nume: <strong>%{name}</strong>. Folosește atributul '<code>name</code>' pentru a identifica sondajele."
@@ -28,9 +30,7 @@ ro:
     named_poll_with_multiple_choices_has_invalid_parameters: "Sondajul numit <strong>%{name}</strong> cu opțiuni multiple are parametri invalizi."
     requires_at_least_1_valid_option: "Trebuie să selectezi cel puțin o opțiune validă."
     default_cannot_be_made_public: "Sondaj cu voturi - nu poate fi făcut public."
-    named_cannot_be_made_public: "Sondajul numit <strong>%{name}</strong> are voturi și nu poate fi făcut public."
     edit_window_expired:
-      cannot_change_polls: "Nu poți adăuga, șterge sau redenumi sondaje după primele %{minutes} (de) minute."
       op_cannot_edit_options: "Nu poți adăuga sau elimina opțiuni ale unui sondaj după primele %{minutes} minute. Te rugăm contactează un moderator pentru a edita o opțiune din sondaj."
       staff_cannot_add_or_remove_options: "Nu poți adăuga sau elimina opțiuni ale unui sondaj după primele %{minutes} minute. Ar trebui să închizi discuția și să creezi alta în loc."
     no_polls_associated_with_this_post: "Nu există sondaje asociate acestei postări."
@@ -40,5 +40,6 @@ ro:
     poll_must_be_open_to_vote: "Sondajul trebuie să fie deschis pentru votare."
     topic_must_be_open_to_toggle_status: "Subiectul trebuie să fie activ pentru a se schimba statutul."
     only_staff_or_op_can_toggle_status: "Doar un administrator sau autorul postării inițiale poate schimba starea unui sondaj."
+    insufficient_rights_to_create: "Nu ai permisiunea de a crea sondaje."
     email:
       link_to_poll: "Click pentru afișarea sondajului."
diff --git a/plugins/poll/config/locales/server.ru.yml b/plugins/poll/config/locales/server.ru.yml
index 19123f2a791..e9003596eed 100644
--- a/plugins/poll/config/locales/server.ru.yml
+++ b/plugins/poll/config/locales/server.ru.yml
@@ -32,9 +32,7 @@ ru:
     named_poll_with_multiple_choices_has_invalid_parameters: "Опрос под названием <strong>%{name}</strong> с множественным выбором вариантов ответов содержит неправильные параметры."
     requires_at_least_1_valid_option: "Выберите хотя бы 1 вариант ответа."
     default_cannot_be_made_public: "Опросы, в которых уже голосовали, не могут быть преобразованы в публичные."
-    named_cannot_be_made_public: "В опрос под названием named <strong>%{name}</strong> уже записаны чьи-то голоса, потому он не может быть преобразован в публичный."
     edit_window_expired:
-      cannot_change_polls: "Нельзя добавлять, удалять или переименовывать опросы через %{minutes} минут(ы) после их создания."
       op_cannot_edit_options: "Нельзя добавлять или удалять варианты ответов через %{minutes} минут(ы) после создания опроса. Чтобы отредактировать варианты ответа, обратитесь к модератору."
       staff_cannot_add_or_remove_options: "Нельзя добавлять или удалять варианты ответов через %{minutes} минут(ы) после создания опроса. Чтобы изменить опрос, закройте эту тему и создайте новую с нужным опросом."
     no_polls_associated_with_this_post: "В данном сообщении нет опросов."
diff --git a/plugins/poll/config/locales/server.sk.yml b/plugins/poll/config/locales/server.sk.yml
index 31b9c1807a5..0f2313dfd5f 100644
--- a/plugins/poll/config/locales/server.sk.yml
+++ b/plugins/poll/config/locales/server.sk.yml
@@ -7,8 +7,10 @@
 
 sk:
   site_settings:
+    poll_enabled: "Povoliť hlasovania?"
     poll_maximum_options: "Maximálny počet povolených možností v hlasovaní."
     poll_edit_window_mins: "Počet minút po vytvorení hlasovania počas ktorých môže byť hlasovanie upravené."
+    poll_minimum_trust_level_to_create: "Definuj minimálny stupeň dôvery na vytvorenie hlasonia."
   poll:
     multiple_polls_without_name: "Existujú viaceré hlasovania bez mena. Použite atribút '<code>meno</code>', aby ste hlasovanie jednoznačne rozlíšili."
     multiple_polls_with_same_name: "Existujú viaceré hlasovania s rovnakým menom: <strong>%{name}</strong>. Použite atribút '<code>meno</code>', aby ste hlasovanie jednoznačne rozlíšili."
@@ -17,10 +19,12 @@ sk:
     default_poll_must_have_less_options:
       one: "Hlasovanie musí mať menej ako jednu možnosť."
       few: "Hlasovanie musí mať menej ako %{count} možnosti."
+      many: "Hlasovanie musí mať menej ako %{count} možnosti."
       other: "Hlasovanie musí mať menej ako %{count} možnosti."
     named_poll_must_have_less_options:
       one: "Hlasovanie s názvom <strong>%{name}</strong> musí mať menej ako 1 možnost."
       few: "Hlasovanie s názvom <strong>%{name}</strong> musí mať menej ako %{count} možnosti."
+      many: "Hlasovanie s názvom <strong>%{name}</strong> musí mať menej ako %{count} možností."
       other: "Hlasovanie s názvom <strong>%{name}</strong> musí mať menej ako %{count} možností."
     default_poll_must_have_different_options: "Hlasovanie musí mať rôzne možnosti."
     named_poll_must_have_different_options: "Hlasovanie s názvom <strong>%{name}</strong> musí mať rôzne možnosti."
@@ -28,17 +32,17 @@ sk:
     named_poll_with_multiple_choices_has_invalid_parameters: "Hlasovanie s názvom <strong>%{name}</strong> s viac možnosťami má nesprávne parametre."
     requires_at_least_1_valid_option: "Musite vybrať aspoň 1 platnú možnosť."
     default_cannot_be_made_public: "Hlasovanie s hlasmi nemôže byť zverejnené."
-    named_cannot_be_made_public: "Hlasovanie s názvom <strong>%{name}</strong> má hlasy, preto nemôže byť zverejnené."
     edit_window_expired:
-      cannot_change_polls: "Po prvých %{minutes} minútach už nemôžete pridať, odstrániť alebo premenovať hlasovanie."
       op_cannot_edit_options: "Po prvých %{minutes}  minútach už nemôžete pridať alebo odstrániť možnosti hlasovania. Ak potrebujete upraviť možnosti hlasovania prosím kontaktujte moderátora."
       staff_cannot_add_or_remove_options: "Po prvých %{minutes}  minútach už nemôžete pridať alebo odstrániť možnosti hlasovania. Miesto toho by ste mali uzavrieť túto tému a miesto nej vytvoriť inú."
     no_polls_associated_with_this_post: "S týmto príspevkom nie sú spojené žiadne hlasovania."
     no_poll_with_this_name: "S týmto príspevkom nie je spojené žiadne hlasovanie s názvom <strong>%{name}</strong>."
     post_is_deleted: "Na vymazanom príspevku nie je možné vykonať."
+    user_cant_post_in_topic: "K tomuto príspevku nemôžeš prispieť a preto nemôžeš ani hlasovať."
     topic_must_be_open_to_vote: "Na odovzdanie hlasu téma otvorená."
     poll_must_be_open_to_vote: "Na odovzdanie hlasu musí byť hlasovanie otvorené."
     topic_must_be_open_to_toggle_status: "Na zmenu stavu musí byť téma otvorená."
     only_staff_or_op_can_toggle_status: "Zmeniť stav hlasovania môže iba zamestnanec alebo pôvodný prispievateľ."
+    insufficient_rights_to_create: "Nemáš povolenie na vytvorenie hlasovania."
     email:
       link_to_poll: "Kliknite na zobrazenie hlasovania."
diff --git a/plugins/poll/config/locales/server.sl.yml b/plugins/poll/config/locales/server.sl.yml
new file mode 100644
index 00000000000..33f658342f7
--- /dev/null
+++ b/plugins/poll/config/locales/server.sl.yml
@@ -0,0 +1,10 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+sl:
+  site_settings:
+    poll_enabled: "Dovoli ankete?"
diff --git a/plugins/poll/config/locales/server.sq.yml b/plugins/poll/config/locales/server.sq.yml
index e14acb21812..04563213e00 100644
--- a/plugins/poll/config/locales/server.sq.yml
+++ b/plugins/poll/config/locales/server.sq.yml
@@ -26,9 +26,7 @@ sq:
     named_poll_with_multiple_choices_has_invalid_parameters: "Poll named <strong>%{name}</strong> with multiple choice has invalid parameters."
     requires_at_least_1_valid_option: "You must select at least 1 valid option."
     default_cannot_be_made_public: "Sondazhet me vota nuk mund të jenë publikë."
-    named_cannot_be_made_public: "Sondazhi me emrin <strong>%{name}</strong> ka vota që nuk mund të bëhen publike."
     edit_window_expired:
-      cannot_change_polls: "Nuk mund të shtoni, hiqni apo riemërtoni sondazhet pas %{minutes} minutave të para."
       op_cannot_edit_options: "Nuk mund të shtoni apo hiqni alternativat e një sondazhi pas %{minutes} minutave të para. Ju lutem kontaktoni një moderues nëse keni nevojë të ndryshoni alternativat e një sondazhi."
       staff_cannot_add_or_remove_options: "Nuk mund të shtoni apo hiqni alternativat e një sondazhi pas %{minutes} minutave të para. Ju duhet ta mbyllni këtë temë dhe të krijoni një të re."
     no_polls_associated_with_this_post: "Asnjë sondazh nuk është bashkangjitur me këtë postim."
diff --git a/plugins/poll/config/locales/server.sv.yml b/plugins/poll/config/locales/server.sv.yml
index 342a492ea8d..934dddb7028 100644
--- a/plugins/poll/config/locales/server.sv.yml
+++ b/plugins/poll/config/locales/server.sv.yml
@@ -26,9 +26,7 @@ sv:
     named_poll_with_multiple_choices_has_invalid_parameters: "Omröstning med namnet <strong>%{name}</strong> med flera val har ogiltiga parametrar."
     requires_at_least_1_valid_option: "Du måste välja minst 1 giltigt alternativ."
     default_cannot_be_made_public: "Omröstning med röster kan inte offentliggöras."
-    named_cannot_be_made_public: "Omröstning med namnet <strong>%{name}</strong> har röster och kan inte offentliggöras."
     edit_window_expired:
-      cannot_change_polls: "Du kan inte lägga till, ta bort eller ändra namn på omröstningar efter de första  %{minutes} minutrarna."
       op_cannot_edit_options: "Du kan inte lägga till eller ta bort svarsalternativ efter de första %{minutes} minutrarna. Kontakta en moderator om du vill redigera ett svarsalternativ i en omröstning."
       staff_cannot_add_or_remove_options: "Du kan inte lägga till eller ta bort svarsalternativ efter de första %{minutes} minutrarna. Stäng denna diskussion och skapa en ny istället."
     no_polls_associated_with_this_post: "Inga omröstningar är knutet till detta inlägg."
diff --git a/plugins/poll/config/locales/server.th.yml b/plugins/poll/config/locales/server.th.yml
index bbbdcd027e7..dc74073fbd9 100644
--- a/plugins/poll/config/locales/server.th.yml
+++ b/plugins/poll/config/locales/server.th.yml
@@ -23,7 +23,6 @@ th:
     named_poll_with_multiple_choices_has_invalid_parameters: "แบบสำรวจพร้อมหลายตัวเลือกชื่อ <strong>%{name}</strong> มีการตั้งค่าผิด"
     requires_at_least_1_valid_option: "คุณจำเป็นต้องเลือกอย่างน้อย 1 ตัวเลือก"
     default_cannot_be_made_public: "โพลด้วยคะแนนเสียงนี้ไม่สามารถทำให้เป็นสาธารณะได้."
-    named_cannot_be_made_public: "โพลชื่อ <strong>%{name}</strong> ด้วยคะแนนเสียงนี้ไม่สามารถทำให้เป็นสาธารณะได้."
     no_polls_associated_with_this_post: "ไม่มีการสำรวจใดมีความเกี่ยวข้องกับโพสนี้"
     no_poll_with_this_name: "ไม่มีการสำรวจที่ชื่อ <strong>%{name}</strong> เกี่ยวข้องกับโพสนี้"
     post_is_deleted: "ไม่สามารถลบโพสได้"
diff --git a/plugins/poll/config/locales/server.tr_TR.yml b/plugins/poll/config/locales/server.tr_TR.yml
index 210b45b878b..07abe231d42 100644
--- a/plugins/poll/config/locales/server.tr_TR.yml
+++ b/plugins/poll/config/locales/server.tr_TR.yml
@@ -16,8 +16,10 @@ tr_TR:
     default_poll_must_have_at_least_2_options: "Ankette en az 2 seçenek olmalı."
     named_poll_must_have_at_least_2_options: "<strong>%{name}</strong> isimli ankette en az 2 seçenek olmalı."
     default_poll_must_have_less_options:
+      one: "Ankette en az %{count} seçenek olmalı."
       other: "Ankette en az %{count} seçenek olmalı."
     named_poll_must_have_less_options:
+      one: "<strong>%{name}</strong> isimli ankette en az %{count}  seçenek olmalı."
       other: "<strong>%{name}</strong> isimli ankette en az %{count}  seçenek olmalı."
     default_poll_must_have_different_options: "Anketin farklı seçenekleri olmalı."
     named_poll_must_have_different_options: "<strong>%{name}</strong> isimli anketin farklı seçenekleri olmalı."
@@ -25,9 +27,7 @@ tr_TR:
     named_poll_with_multiple_choices_has_invalid_parameters: "<strong>%{name}</strong> ile adlandırılmış ve çoklu seçim seçeneği içeren anketinizde hatalar belirlendi."
     requires_at_least_1_valid_option: "En az 1 geçerli seçim yapmalısınız."
     default_cannot_be_made_public: "Oy içeren anketler herkese açık olamaz. "
-    named_cannot_be_made_public: "<strong>%{name}</strong> isimli ankette oylamalar herkese açık yapılamaz."
     edit_window_expired:
-      cannot_change_polls: "İlk %{minutes} dakikadan sonra anket ekleyemez, silemez veya yeniden isimlendiremezsiniz."
       op_cannot_edit_options: "İlk %{minutes} dakikadan sonra anket ekleyemez veya silemezsiniz. Eğer anket seçeneklerini düzenlemeniz gerekiyorsa lütfen moderatör ile iletişime geçin."
       staff_cannot_add_or_remove_options: "İlk %{minutes} dakikadan sonra anket ekleyemez veya silemezsiniz. Bu konuyu kapatıp, yerine yeni bir konu oluşturmalısınız."
     no_polls_associated_with_this_post: "Bu gönderiyle alakalı bir anket yok."
diff --git a/plugins/poll/config/locales/server.ur.yml b/plugins/poll/config/locales/server.ur.yml
index f3d29c5175a..3eadd6a28e2 100644
--- a/plugins/poll/config/locales/server.ur.yml
+++ b/plugins/poll/config/locales/server.ur.yml
@@ -7,8 +7,10 @@
 
 ur:
   site_settings:
+    poll_enabled: "کیا صارفین کو پول بنانے کی اجازت دی جاے؟"
     poll_maximum_options: "ایک پول میں رکھے جانے والی آپشنز کی زیادہ سے زیادہ تعداد۔"
     poll_edit_window_mins: "پوسٹ بنانے کے بعد کتنے منت تک پولز کی ترمیم کی جاسکتی ہے۔"
+    poll_minimum_trust_level_to_create: "پول بنانے کیلئے کم از کم ٹرسٹ لَیول واضح کریں۔"
   poll:
     multiple_polls_without_name: "نام کے بغیر ایک سے زیادہ پولزموجود ہیں۔ اپنے پولز کو منفرد شناخت دینے کیلیے '<code>نام</code>' صفت کا استعمال کریں۔"
     multiple_polls_with_same_name: "ایک ہی نام والے ایک سے زیادہ پولزموجود ہیں: <strong>%{نام}</strong>۔ اپنے پولز کو منفرد شناخت دینے کیلیے '<code>نام</code>' صفت کا استعمال کریں۔"
@@ -26,17 +28,17 @@ ur:
     named_poll_with_multiple_choices_has_invalid_parameters: "ایک سے زیادہ انتخاب والے پول جس کا نام <strong>%{نام}</strong> ہے، کے غلط پیرامیٹرز ہیں۔"
     requires_at_least_1_valid_option: "آپ کو کم از کم 1 جائز آپشن منتخب کرنا ضروری ہے۔"
     default_cannot_be_made_public: "ووٹ کے ساتھ والے پول کو پبلک نہیں کیا جا سکتا۔"
-    named_cannot_be_made_public: "<strong>%{نام}</strong> نام والے پول کے ووٹ ہیں، جو کہ پبلک نہیں کیے جا سکتے۔"
     edit_window_expired:
-      cannot_change_polls: "آپ پہلے %{منٹ} منٹ بعد پولز میں اضافہ، کمی یا ان کے نام میں تبدیلی نہیں کر سکتے۔"
       op_cannot_edit_options: "پہلے %{منٹ} منٹ بعد آپ پول کی آپشنز میں اضافہ یا کمی نہیں کر سکتے۔ اگر آپ نے کسی پول آپشن میں ترمیم کرنی ہے تو براہ مہربانی کسی ماڈریٹر سے رابطہ کریں۔"
       staff_cannot_add_or_remove_options: "پہلے %{منٹ} منٹ بعد آپ پول کی آپشنز میں اضافہ یا کمی نہیں کر سکتے۔ اِس کے بجاے، آپ کو یہ ٹاپک بند کر کہ ایک نیا ٹاپک بنا لینا چاہیے۔"
     no_polls_associated_with_this_post: "کوئی پول اس پوسٹ کے ساتھ منسلک نہیں ہیں۔"
     no_poll_with_this_name: "کوئی پول جس کا نام <strong>%{نام}</strong> ہو، اس پوسٹ کے ساتھ منسلک نہیں ہے۔"
     post_is_deleted: "حذف کر دی گی پوست پر کام نہیں کیا جا سکتا۔"
+    user_cant_post_in_topic: "آپ ووٹ نہیں کر سکتے کیونکہ آپ اِس ٹاپک میں پوسٹ نہیں کر سکتے ہیں۔"
     topic_must_be_open_to_vote: "ووٹ کرنے کیلیے ٹاپک کا کھلا ہونا ضروری ہے۔"
     poll_must_be_open_to_vote: "ووٹ کرنے کیلیے پول کا کھلا ہونا ضروری ہے۔"
     topic_must_be_open_to_toggle_status: "سٹیٹس بدلنے کیلیے ٹاپک کا کھلا ہونا ضروری ہے۔"
     only_staff_or_op_can_toggle_status: "صرف عملے کے رکن یا اصل پوسٹر ایک پول کا سٹیٹس تبدیل کر سکتے ہیں۔"
+    insufficient_rights_to_create: "آپ کو پول بنانے کی اجازت نہیں ہے۔"
     email:
       link_to_poll: "پول دیکھنے کیلیے کلک کریں۔"
diff --git a/plugins/poll/config/locales/server.vi.yml b/plugins/poll/config/locales/server.vi.yml
index 2e97b013cb6..904e4e487b1 100644
--- a/plugins/poll/config/locales/server.vi.yml
+++ b/plugins/poll/config/locales/server.vi.yml
@@ -7,6 +7,7 @@
 
 vi:
   site_settings:
+    poll_enabled: "Cho phép bình chọn?"
     poll_maximum_options: "Số lượng tối đa tùy chọn trong một cuộc thăm dò.  "
     poll_edit_window_mins: "Số phút tình từ lúc tạo bài viết mà người dùng có quyền sửa thăm dò."
   poll:
@@ -24,9 +25,7 @@ vi:
     named_poll_with_multiple_choices_has_invalid_parameters: "Thăm dò <strong>%{name}</strong> ​​với nhiều lựa chọn có các tham số không hợp lệ. "
     requires_at_least_1_valid_option: "Bạn phải chọn ít nhất 1 lựa chọn hợp lệ."
     default_cannot_be_made_public: "Thăm dò đã tồn tại các biểu quyết không thể chuyển sang chế độ công khai."
-    named_cannot_be_made_public: "Thăm dò <strong>%{name}</strong> đã tồn tại các biểu quyết không thể chuyển sang chế độ công khai."
     edit_window_expired:
-      cannot_change_polls: "Bạn không thể thêm, xoá hay đổi tên thăm dò sau %{minutes} phút đầu tiên."
       op_cannot_edit_options: "Bạn không thể thêm, xoá hay đổi tên thăm dò sau %{minutes} phút đầu tiên. Liên hệ người quản lí nếu cần để sửa đổi thăm dò."
       staff_cannot_add_or_remove_options: "Bạn không thể thêm, xoá hay đổi tên thăm dò sau %{minutes} phút đầu tiên. Bạn nên đóng chủ đề này và tạo lại chủ đề mới."
     no_polls_associated_with_this_post: "Không có thăm dò nào liên kết với bài này."
diff --git a/plugins/poll/config/locales/server.zh_CN.yml b/plugins/poll/config/locales/server.zh_CN.yml
index 9521f21d100..c70e578b623 100644
--- a/plugins/poll/config/locales/server.zh_CN.yml
+++ b/plugins/poll/config/locales/server.zh_CN.yml
@@ -26,14 +26,13 @@ zh_CN:
     named_poll_with_multiple_choices_has_invalid_parameters: "“<strong>%{name}</strong>”多选投票有无效参数。"
     requires_at_least_1_valid_option: "你必须选择至少 1 个有效的选项。"
     default_cannot_be_made_public: "投票调查不能公开。"
-    named_cannot_be_made_public: "投票“<strong>%{name}</strong>”有投票不能公开。"
     edit_window_expired:
-      cannot_change_polls: "在创建话题%{minutes}分钟后，你不可以增加、删除或者重命名该投票。"
       op_cannot_edit_options: "在创建话题%{minutes}分钟后，你不可以增加、删除投票选项。如果你需要修改投票选项，请联系管理员。"
       staff_cannot_add_or_remove_options: "在创建话题%{minutes}分钟后，你不能增加或者删除投票选项。你可以选择删除该话题然后重新创建一个。"
     no_polls_associated_with_this_post: "这个帖子中没有投票。"
     no_poll_with_this_name: "投票“<strong>%{name}</strong>”没有被关联到帖子。"
     post_is_deleted: "帖子已经删除，无法操作。"
+    user_cant_post_in_topic: "你无法投票，因为你无法在这个主题里发帖"
     topic_must_be_open_to_vote: "主题必须未被锁定才能投票。"
     poll_must_be_open_to_vote: "投票必须开启。"
     topic_must_be_open_to_toggle_status: "主题必须未被锁定才能改变状态。"
diff --git a/plugins/poll/config/locales/server.zh_TW.yml b/plugins/poll/config/locales/server.zh_TW.yml
index 9d1efef0c07..ab242b15871 100644
--- a/plugins/poll/config/locales/server.zh_TW.yml
+++ b/plugins/poll/config/locales/server.zh_TW.yml
@@ -24,9 +24,7 @@ zh_TW:
     named_poll_with_multiple_choices_has_invalid_parameters: "“<strong>%{name}</strong>”多選投票有無效參數。"
     requires_at_least_1_valid_option: "你必須選擇至少 1 個有效的選項。"
     default_cannot_be_made_public: "投票調查不能公開。"
-    named_cannot_be_made_public: "投票“<strong>%{name}</strong>”有投票不能公開。"
     edit_window_expired:
-      cannot_change_polls: "在創建話題%{minutes}分鐘後，你不可以增加、刪除或者重命名該投票。"
       op_cannot_edit_options: "在創建話題%{minutes}分鐘後，你不可以增加、刪除投票選項。如果你需要修改投票選項，請聯繫管理員。"
       staff_cannot_add_or_remove_options: "在創建話題%{minutes}分鐘後，你不能增加或者刪除投票選項。你可以選擇刪除該話題然後重新創建一個。"
     no_polls_associated_with_this_post: "這個帖子中沒有投票。"
diff --git a/plugins/poll/jobs/regular/close_poll.rb b/plugins/poll/jobs/regular/close_poll.rb
new file mode 100644
index 00000000000..b4b25bc3e4e
--- /dev/null
+++ b/plugins/poll/jobs/regular/close_poll.rb
@@ -0,0 +1,11 @@
+module Jobs
+
+  class ClosePoll < Jobs::Base
+
+    def execute(args)
+      DiscoursePoll::Poll.toggle_status(args[:post_id], args[:poll_name], "closed", -1)
+    end
+
+  end
+
+end
diff --git a/plugins/poll/lib/polls_updater.rb b/plugins/poll/lib/polls_updater.rb
index ec5b250579b..8fa46c698f6 100644
--- a/plugins/poll/lib/polls_updater.rb
+++ b/plugins/poll/lib/polls_updater.rb
@@ -1,6 +1,6 @@
 module DiscoursePoll
   class PollsUpdater
-    VALID_POLLS_CONFIGS = %w{type min max public}.map(&:freeze)
+    VALID_POLLS_CONFIGS = %w{type min max public close}.map(&:freeze)
 
     def self.update(post, polls)
       # load previous polls
@@ -18,35 +18,18 @@ module DiscoursePoll
         poll_edit_window_mins = SiteSetting.poll_edit_window_mins
 
         if post.created_at < poll_edit_window_mins.minutes.ago && has_votes
-          # cannot add/remove/rename polls
-          if polls.keys.sort != previous_polls.keys.sort
-            post.errors.add(:base, I18n.t(
-              "poll.edit_window_expired.cannot_change_polls", minutes: poll_edit_window_mins
-            ))
-
-            return
-          end
-
           # deal with option changes
-          if User.staff.pluck(:id).include?(post.last_editor_id)
-            # staff can only edit options
+          if User.staff.where(id: post.last_editor_id).exists?
+            # staff can edit options
             polls.each_key do |poll_name|
-              if polls[poll_name]["options"].size != previous_polls[poll_name]["options"].size && previous_polls[poll_name]["voters"].to_i > 0
-                post.errors.add(:base, I18n.t(
-                  "poll.edit_window_expired.staff_cannot_add_or_remove_options",
-                  minutes: poll_edit_window_mins
-                ))
-
+              if polls.dig(poll_name, "options")&.size != previous_polls.dig(poll_name, "options")&.size && previous_polls.dig(poll_name, "voters").to_i > 0
+                post.errors.add(:base, I18n.t("poll.edit_window_expired.staff_cannot_add_or_remove_options", minutes: poll_edit_window_mins))
                 return
               end
             end
           else
             # OP cannot edit poll options
-            post.errors.add(:base, I18n.t(
-              "poll.edit_window_expired.op_cannot_edit_options",
-              minutes: poll_edit_window_mins
-            ))
-
+            post.errors.add(:base, I18n.t("poll.edit_window_expired.op_cannot_edit_options", minutes: poll_edit_window_mins))
             return
           end
         end
@@ -100,6 +83,9 @@ module DiscoursePoll
         post.custom_fields[DiscoursePoll::POLLS_CUSTOM_FIELD] = polls
         post.save_custom_fields(true)
 
+        # re-schedule jobs
+        DiscoursePoll::Poll.schedule_jobs(post)
+
         # publish the changes
         MessageBus.publish("/polls/#{post.topic_id}", post_id: post.id, polls: polls)
       end
@@ -109,9 +95,7 @@ module DiscoursePoll
       return true if (current_polls.keys.sort != previous_polls.keys.sort)
 
       current_polls.each_key do |poll_name|
-        if !previous_polls[poll_name] ||
-           (current_polls[poll_name].values_at(*VALID_POLLS_CONFIGS) != previous_polls[poll_name].values_at(*VALID_POLLS_CONFIGS))
-
+        if !previous_polls[poll_name] || (current_polls[poll_name].values_at(*VALID_POLLS_CONFIGS) != previous_polls[poll_name].values_at(*VALID_POLLS_CONFIGS))
           return true
         end
       end
@@ -134,12 +118,9 @@ module DiscoursePoll
       current_poll = current_polls[poll_name]
 
       if previous_polls["public"].nil? && current_poll["public"] == "true"
-        error =
-          if poll_name == DiscoursePoll::DEFAULT_POLL_NAME
-            I18n.t("poll.default_cannot_be_made_public")
-          else
-            I18n.t("poll.named_cannot_be_made_public", name: poll_name)
-          end
+        error = poll_name == DiscoursePoll::DEFAULT_POLL_NAME ?
+          I18n.t("poll.default_cannot_be_made_public") :
+          I18n.t("poll.named_cannot_be_made_public", name: poll_name)
 
         post.errors.add(:base, error)
         return true
diff --git a/plugins/poll/lib/polls_validator.rb b/plugins/poll/lib/polls_validator.rb
index 2321f7f0af4..26c8a9c5b01 100644
--- a/plugins/poll/lib/polls_validator.rb
+++ b/plugins/poll/lib/polls_validator.rb
@@ -7,9 +7,7 @@ module DiscoursePoll
     def validate_polls
       polls = {}
 
-      extracted_polls = DiscoursePoll::Poll::extract(@post.raw, @post.topic_id, @post.user_id)
-
-      extracted_polls.each do |poll|
+      DiscoursePoll::Poll::extract(@post.raw, @post.topic_id, @post.user_id).each do |poll|
         # polls should have a unique name
         return false unless unique_poll_name?(polls, poll)
 
diff --git a/plugins/poll/lib/post_validator.rb b/plugins/poll/lib/post_validator.rb
index 7301fdde751..2b6be2b14c0 100644
--- a/plugins/poll/lib/post_validator.rb
+++ b/plugins/poll/lib/post_validator.rb
@@ -6,17 +6,13 @@ module DiscoursePoll
 
     def validate_post
       min_trust_level = SiteSetting.poll_minimum_trust_level_to_create
-      trusted = @post&.user&.staff? ||
-                @post&.user&.trust_level >= TrustLevel[min_trust_level]
 
-      if !trusted
-        message = I18n.t("poll.insufficient_rights_to_create")
-
-        @post.errors.add(:base, message)
-        return false
+      if @post&.user&.staff? || @post&.user&.trust_level >= TrustLevel[min_trust_level]
+        true
+      else
+        @post.errors.add(:base, I18n.t("poll.insufficient_rights_to_create"))
+        false
       end
-
-      true
     end
   end
 end
diff --git a/plugins/poll/lib/votes_updater.rb b/plugins/poll/lib/votes_updater.rb
new file mode 100644
index 00000000000..ae705d51135
--- /dev/null
+++ b/plugins/poll/lib/votes_updater.rb
@@ -0,0 +1,59 @@
+module DiscoursePoll
+  class VotesUpdater
+    def self.merge_users!(source_user, target_user)
+      post_ids = PostCustomField.where(name: DiscoursePoll::VOTES_CUSTOM_FIELD)
+        .where("value :: JSON -> ? IS NOT NULL", source_user.id.to_s)
+        .pluck(:post_id)
+
+      post_ids.each do |post_id|
+        DistributedMutex.synchronize("discourse_poll-#{post_id}") do
+          post = Post.find_by(id: post_id)
+          update_votes(post, source_user, target_user) if post
+        end
+      end
+    end
+
+    def self.update_votes(post, source_user, target_user)
+      polls = post.custom_fields[DiscoursePoll::POLLS_CUSTOM_FIELD]
+      votes = post.custom_fields[DiscoursePoll::VOTES_CUSTOM_FIELD]
+      return if polls.nil? || votes.nil? || !votes.has_key?(source_user.id.to_s)
+
+      if votes.has_key?(target_user.id.to_s)
+        remove_votes(polls, votes, source_user)
+      else
+        replace_voter_id(polls, votes, source_user, target_user)
+      end
+
+      post.save_custom_fields(true)
+    end
+
+    def self.remove_votes(polls, votes, source_user)
+      votes.delete(source_user.id.to_s).each do |poll_name, option_ids|
+        poll = polls[poll_name]
+        next unless poll && option_ids
+
+        poll["options"].each do |option|
+          if option_ids.include?(option["id"])
+            option["votes"] -= 1
+
+            voter_ids = option["voter_ids"]
+            voter_ids.delete(source_user.id) if voter_ids
+          end
+        end
+      end
+    end
+
+    def self.replace_voter_id(polls, votes, source_user, target_user)
+      votes[target_user.id.to_s] = votes.delete(source_user.id.to_s)
+
+      polls.each_value do |poll|
+        next unless poll["public"] == "true"
+
+        poll["options"].each do |option|
+          voter_ids = option["voter_ids"]
+          voter_ids << target_user.id if voter_ids&.delete(source_user.id)
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/poll/plugin.rb b/plugins/poll/plugin.rb
index 017ea72a81a..c4a5adcf32a 100644
--- a/plugins/poll/plugin.rb
+++ b/plugins/poll/plugin.rb
@@ -9,19 +9,25 @@ register_asset "stylesheets/common/poll-ui-builder.scss"
 register_asset "stylesheets/desktop/poll.scss", :desktop
 register_asset "stylesheets/mobile/poll.scss", :mobile
 
-PLUGIN_NAME ||= "discourse_poll".freeze
+enabled_site_setting :poll_enabled
+hide_plugin if self.respond_to?(:hide_plugin)
 
+PLUGIN_NAME ||= "discourse_poll".freeze
 DATA_PREFIX ||= "data-poll-".freeze
 
 after_initialize do
+
+  require File.expand_path("../jobs/regular/close_poll", __FILE__)
+
   module ::DiscoursePoll
-    DEFAULT_POLL_NAME ||= "poll".freeze
+    DEFAULT_POLL_NAME  ||= "poll".freeze
     POLLS_CUSTOM_FIELD ||= "polls".freeze
     VOTES_CUSTOM_FIELD ||= "polls-votes".freeze
 
-    autoload :PostValidator, "#{Rails.root}/plugins/poll/lib/post_validator"
+    autoload :PostValidator,  "#{Rails.root}/plugins/poll/lib/post_validator"
     autoload :PollsValidator, "#{Rails.root}/plugins/poll/lib/polls_validator"
-    autoload :PollsUpdater, "#{Rails.root}/plugins/poll/lib/polls_updater"
+    autoload :PollsUpdater,   "#{Rails.root}/plugins/poll/lib/polls_updater"
+    autoload :VotesUpdater,   "#{Rails.root}/plugins/poll/lib/votes_updater"
 
     class Engine < ::Rails::Engine
       engine_name PLUGIN_NAME
@@ -47,6 +53,11 @@ after_initialize do
             raise StandardError.new I18n.t("poll.topic_must_be_open_to_vote")
           end
 
+          # user must be allowed to post in topic
+          unless Guardian.new(user).can_create_post?(post.topic)
+            raise StandardError.new I18n.t("poll.user_cant_post_in_topic")
+          end
+
           polls = post.custom_fields[DiscoursePoll::POLLS_CUSTOM_FIELD]
 
           raise StandardError.new I18n.t("poll.no_polls_associated_with_this_post") if polls.blank?
@@ -55,7 +66,17 @@ after_initialize do
 
           raise StandardError.new I18n.t("poll.no_poll_with_this_name", name: poll_name) if poll.blank?
           raise StandardError.new I18n.t("poll.poll_must_be_open_to_vote") if poll["status"] != "open"
-          public_poll = (poll["public"] == "true")
+
+          # ensure no race condition when poll is automatically closed
+          if poll["close"].present?
+            close_date =
+              begin
+                close_date = Time.zone.parse(poll["close"])
+              rescue ArgumentError
+              end
+
+            raise StandardError.new I18n.t("poll.poll_must_be_open_to_vote") if close_date && close_date <= Time.zone.now
+          end
 
           # remove options that aren't available in the poll
           available_options = poll["options"].map { |o| o["id"] }.to_set
@@ -76,6 +97,8 @@ after_initialize do
             poll["voters"] += 1 if (available_options & votes.to_set).size > 0
           end
 
+          public_poll = (poll["public"] == "true")
+
           poll["options"].each do |option|
             anonymous_votes = option["anonymous_votes"] || 0
             option["votes"] = all_options[option["id"]] + anonymous_votes
@@ -95,14 +118,11 @@ after_initialize do
           post.save_custom_fields(true)
 
           payload = { post_id: post_id, polls: polls }
-
-          if public_poll
-            payload.merge!(user: UserNameSerializer.new(user).serializable_hash)
-          end
+          payload.merge!(user: UserNameSerializer.new(user).serializable_hash) if public_poll
 
           MessageBus.publish("/polls/#{post.topic_id}", payload)
 
-          return [poll, options]
+          [poll, options]
         end
       end
 
@@ -142,36 +162,45 @@ after_initialize do
         end
       end
 
+      def schedule_jobs(post)
+        post.custom_fields[DiscoursePoll::POLLS_CUSTOM_FIELD].each do |name, poll|
+          Jobs.cancel_scheduled_job(:close_poll, post_id: post.id, poll_name: name)
+
+          if poll["status"] == "open" && poll["close"].present?
+            close_date =
+              begin
+                Time.zone.parse(poll["close"])
+              rescue ArgumentError
+              end
+
+            Jobs.enqueue_at(close_date, :close_poll, post_id: post.id, poll_name: name) if close_date && close_date > Time.zone.now
+          end
+        end
+      end
+
       def extract(raw, topic_id, user_id = nil)
         # TODO: we should fix the callback mess so that the cooked version is available
         # in the validators instead of cooking twice
         cooked = PrettyText.cook(raw, topic_id: topic_id, user_id: user_id)
-        parsed = Nokogiri::HTML(cooked)
 
-        extracted_polls = []
+        Nokogiri::HTML(cooked).css("div.poll").map do |p|
+          poll = { "options" => [], "voters" => 0, "name" => DiscoursePoll::DEFAULT_POLL_NAME }
 
-        # extract polls
-        parsed.css("div.poll").each do |p|
-          poll = { "options" => [], "voters" => 0 }
-
-          # extract attributes
+          # attributes
           p.attributes.values.each do |attribute|
             if attribute.name.start_with?(DATA_PREFIX)
               poll[attribute.name[DATA_PREFIX.length..-1]] = CGI.escapeHTML(attribute.value || "")
             end
           end
 
-          # extract options
+          # options
           p.css("li[#{DATA_PREFIX}option-id]").each do |o|
             option_id = o.attributes[DATA_PREFIX + "option-id"].value || ""
             poll["options"] << { "id" => option_id, "html" => o.inner_html, "votes" => 0 }
           end
 
-          # add the poll
-          extracted_polls << poll
+          poll
         end
-
-        extracted_polls
       end
     end
   end
@@ -221,14 +250,13 @@ after_initialize do
       raise Discourse::InvalidParameters.new("poll_name is invalid") if !poll
 
       voter_limit = (params[:voter_limit] || 25).to_i
-      voter_limit = 0 if voter_limit < 0
+      voter_limit = 0  if voter_limit < 0
       voter_limit = 50 if voter_limit > 50
 
       user_ids = []
       options = poll["options"]
 
       if poll["type"] != "number"
-
         per_option_voters = {}
 
         options.each do |option|
@@ -249,7 +277,7 @@ after_initialize do
 
         result = {}
 
-        User.where(id: user_ids).map do |user|
+        User.where(id: user_ids).each do |user|
           user_hash = UserNameSerializer.new(user).serializable_hash
 
           poll_votes[user.id.to_s][poll_name].each do |option_id|
@@ -270,12 +298,7 @@ after_initialize do
         user_ids.flatten!
         user_ids.uniq!
         user_ids = user_ids.slice((params[:offset].to_i || 0) * voter_limit, voter_limit)
-
-        result = []
-
-        User.where(id: user_ids).map do |user|
-          result << UserNameSerializer.new(user).serializable_hash
-        end
+        result = User.where(id: user_ids).map { |user| UserNameSerializer.new(user).serializable_hash }
       end
 
       render json: { poll_name => result }
@@ -366,18 +389,23 @@ after_initialize do
     if post.nil? || post.trashed?
       fragment.css(".poll, [data-poll-name]").each(&:remove)
     else
-      post_url = "#{Discourse.base_url}#{post.url}"
+      post_url = post.full_url
       fragment.css(".poll, [data-poll-name]").each do |poll|
         poll.replace "<p><a href='#{post_url}'>#{I18n.t("poll.email.link_to_poll")}</a></p>"
       end
     end
   end
 
-  # tells the front-end we have a poll for that post
   on(:post_created) do |post|
     next if post.is_first_post? || post.custom_fields[DiscoursePoll::POLLS_CUSTOM_FIELD].blank?
-    MessageBus.publish("/polls/#{post.topic_id}",                          post_id: post.id,
-                                                                           polls: post.custom_fields[DiscoursePoll::POLLS_CUSTOM_FIELD])
+    # signals the front-end we have polls for that post
+    MessageBus.publish("/polls/#{post.topic_id}", post_id: post.id, polls: post.custom_fields[DiscoursePoll::POLLS_CUSTOM_FIELD])
+    # schedule automatic close jobs
+    DiscoursePoll::Poll.schedule_jobs(post)
+  end
+
+  on(:merging_users) do |source_user, target_user|
+    DiscoursePoll::VotesUpdater.merge_users!(source_user, target_user)
   end
 
   add_to_serializer(:post, :polls, false) do
diff --git a/plugins/poll/spec/controllers/polls_controller_spec.rb b/plugins/poll/spec/controllers/polls_controller_spec.rb
index c9f353862e9..390d342f13b 100644
--- a/plugins/poll/spec/controllers/polls_controller_spec.rb
+++ b/plugins/poll/spec/controllers/polls_controller_spec.rb
@@ -55,6 +55,7 @@ describe ::DiscoursePoll::PollsController do
 
     it "works even if topic is closed" do
       topic.update_attribute(:closed, true)
+
       put :vote, params: {
         post_id: poll.id, poll_name: "poll", options: ["5c24fc1df56d764b550ceae1b9319125"]
       }, format: :json
@@ -64,6 +65,7 @@ describe ::DiscoursePoll::PollsController do
 
     it "ensures topic is not archived" do
       topic.update_attribute(:archived, true)
+
       put :vote, params: {
         post_id: poll.id, poll_name: "poll", options: ["A"]
       }, format: :json
@@ -75,6 +77,7 @@ describe ::DiscoursePoll::PollsController do
 
     it "ensures post is not trashed" do
       poll.trash!
+
       put :vote, params: {
         post_id: poll.id, poll_name: "poll", options: ["A"]
       }, format: :json
@@ -84,6 +87,18 @@ describe ::DiscoursePoll::PollsController do
       expect(json["errors"][0]).to eq(I18n.t("poll.post_is_deleted"))
     end
 
+    it "ensures user can post in topic" do
+      Guardian.any_instance.expects(:can_create_post?).returns(false)
+
+      put :vote, params: {
+        post_id: poll.id, poll_name: "poll", options: ["A"]
+      }, format: :json
+
+      expect(response).not_to be_success
+      json = ::JSON.parse(response.body)
+      expect(json["errors"][0]).to eq(I18n.t("poll.user_cant_post_in_topic"))
+    end
+
     it "ensures polls are associated with the post" do
       put :vote, params: {
         post_id: Fabricate(:post).id, poll_name: "foobar", options: ["A"]
diff --git a/plugins/poll/spec/controllers/posts_controller_spec.rb b/plugins/poll/spec/controllers/posts_controller_spec.rb
index bd39395419b..917592e53c2 100644
--- a/plugins/poll/spec/controllers/posts_controller_spec.rb
+++ b/plugins/poll/spec/controllers/posts_controller_spec.rb
@@ -35,6 +35,21 @@ describe PostsController do
       expect(json["polls"]["poll"]).to be
     end
 
+    it "schedules auto-close job" do
+      name = "auto_close"
+      close_date = 1.month.from_now
+
+      post :create, params: {
+        title: title, raw: "[poll name=#{name} close=#{close_date.iso8601}]\n- A\n- B\n[/poll]"
+      }, format: :json
+
+      expect(response).to be_success
+      json = ::JSON.parse(response.body)
+      expect(json["polls"][name]["close"]).to be
+
+      expect(Jobs.scheduled_for(:close_poll, post_id: Post.last.id, poll_name: name)).to be
+    end
+
     it "should have different options" do
       post :create, params: {
         title: title, raw: "[poll]\n- A\n- A\n[/poll]"
diff --git a/plugins/poll/spec/integration/poll_endpoints_spec.rb b/plugins/poll/spec/integration/poll_endpoints_spec.rb
index e4c8005a442..8e5e136534d 100644
--- a/plugins/poll/spec/integration/poll_endpoints_spec.rb
+++ b/plugins/poll/spec/integration/poll_endpoints_spec.rb
@@ -57,34 +57,34 @@ describe "DiscoursePoll endpoints" do
 
     describe 'when post_id is blank' do
       it 'should raise the right error' do
-        expect { get "/polls/voters.json", params: { poll_name: DiscoursePoll::DEFAULT_POLL_NAME } }
-          .to raise_error(ActionController::ParameterMissing)
+        get "/polls/voters.json", params: { poll_name: DiscoursePoll::DEFAULT_POLL_NAME }
+        expect(response.status).to eq(400)
       end
     end
 
     describe 'when post_id is not valid' do
       it 'should raise the right error' do
-        expect do
-          get "/polls/voters.json", params: {
-            post_id: -1,
-            poll_name: DiscoursePoll::DEFAULT_POLL_NAME
-          }
-        end.to raise_error(Discourse::InvalidParameters, 'post_id is invalid')
+        get "/polls/voters.json", params: {
+          post_id: -1,
+          poll_name: DiscoursePoll::DEFAULT_POLL_NAME
+        }
+        expect(response.status).to eq(400)
+        expect(response.body).to include('post_id is invalid')
       end
     end
 
     describe 'when poll_name is blank' do
       it 'should raise the right error' do
-        expect { get "/polls/voters.json", params: { post_id: post.id } }
-          .to raise_error(ActionController::ParameterMissing)
+        get "/polls/voters.json", params: { post_id: post.id }
+        expect(response.status).to eq(400)
       end
     end
 
     describe 'when poll_name is not valid' do
       it 'should raise the right error' do
-        expect do
-          get "/polls/voters.json", params: { post_id: post.id, poll_name: 'wrongpoll' }
-        end.to raise_error(Discourse::InvalidParameters, 'poll_name is invalid')
+        get "/polls/voters.json", params: { post_id: post.id, poll_name: 'wrongpoll' }
+        expect(response.status).to eq(400)
+        expect(response.body).to include('poll_name is invalid')
       end
     end
 
diff --git a/plugins/poll/spec/lib/polls_updater_spec.rb b/plugins/poll/spec/lib/polls_updater_spec.rb
index e8a6a0e4681..76d22573903 100644
--- a/plugins/poll/spec/lib/polls_updater_spec.rb
+++ b/plugins/poll/spec/lib/polls_updater_spec.rb
@@ -268,19 +268,6 @@ describe DiscoursePoll::PollsUpdater do
         )
       end
 
-      it "should not allow new polls to be added" do
-        messages = MessageBus.track_publish do
-          described_class.update(another_post, two_polls)
-        end
-
-        expect(another_post.errors[:base]).to include(I18n.t(
-          "poll.edit_window_expired.cannot_change_polls",
-          minutes: poll_edit_window_mins
-        ))
-
-        expect(messages).to eq([])
-      end
-
       it "should not allow users to edit options of current poll" do
         messages = MessageBus.track_publish do
           described_class.update(another_post, polls_with_3_options)
@@ -297,6 +284,21 @@ describe DiscoursePoll::PollsUpdater do
       context "staff" do
         let(:another_user) { Fabricate(:user) }
 
+        before do
+          another_post.update_attributes!(last_editor_id: User.staff.first.id)
+        end
+
+        it "should allow staff to add polls" do
+          message = MessageBus.track_publish do
+            described_class.update(another_post, two_polls)
+          end.first
+
+          expect(another_post.errors.full_messages).to eq([])
+
+          expect(message.data[:post_id]).to eq(another_post.id)
+          expect(message.data[:polls]).to eq(two_polls)
+        end
+
         it "should not allow staff to add options if votes have been casted" do
           another_post.update_attributes!(last_editor_id: User.staff.first.id)
 
diff --git a/plugins/poll/spec/lib/pretty_text_spec.rb b/plugins/poll/spec/lib/pretty_text_spec.rb
index 85ee2c2a00e..e01a32d5654 100644
--- a/plugins/poll/spec/lib/pretty_text_spec.rb
+++ b/plugins/poll/spec/lib/pretty_text_spec.rb
@@ -1,10 +1,9 @@
 require 'rails_helper'
-require 'html_normalize'
 
 describe PrettyText do
 
   def n(html)
-    HtmlNormalize.normalize(html)
+    html.strip
   end
 
   it 'supports multi choice polls' do
@@ -95,29 +94,22 @@ describe PrettyText do
     cooked = PrettyText.cook md
 
     expected = <<~MD
-      <div class="poll" data-poll-status="open" data-poll-name="poll" data-poll-type="multiple">
+      <div class="poll" data-poll-status="open" data-poll-type="multiple" data-poll-name="poll">
       <div>
       <div class="poll-container">
       <ol>
-      <li data-poll-option-id='b6475cbf6acb8676b20c60582cfc487a'>test 1 <img alt=':slight_smile:' class='emoji' src='/images/emoji/twitter/slight_smile.png?v=5' title=':slight_smile:'> <b>test</b>
-      </li>
-      <li data-poll-option-id='7158af352698eb1443d709818df097d4'>test 2</li>
+      <li data-poll-option-id="b6475cbf6acb8676b20c60582cfc487a">test 1 <img src="/images/emoji/twitter/slight_smile.png?v=5" title=":slight_smile:" class="emoji" alt=":slight_smile:"> <b>test</b>
       </li>
+      <li data-poll-option-id="7158af352698eb1443d709818df097d4">test 2</li>
       </ol>
       </div>
       <div class="poll-info">
       <p>
       <span class="info-number">0</span>
-      <span class="info-text">voters</span>
+      <span class="info-label">voters</span>
       </p>
-      <p>
-      Choose up to <strong>2</strong> options</p>
       </div>
       </div>
-      <div class="poll-buttons">
-      <a title="Cast your votes">Vote now!</a>
-      <a title="Display the poll results">Show results</a>
-      </div>
       </div>
     MD
 
diff --git a/plugins/poll/spec/lib/votes_updater_spec.rb b/plugins/poll/spec/lib/votes_updater_spec.rb
new file mode 100644
index 00000000000..243c5f3b853
--- /dev/null
+++ b/plugins/poll/spec/lib/votes_updater_spec.rb
@@ -0,0 +1,94 @@
+require 'rails_helper'
+
+describe DiscoursePoll::VotesUpdater do
+  let(:target_user) { Fabricate(:user_single_email, username: 'alice', email: 'alice@example.com') }
+  let(:source_user) { Fabricate(:user_single_email, username: 'alice1', email: 'alice@work.com') }
+  let(:walter) { Fabricate(:walter_white) }
+
+  let(:target_user_id) { target_user.id.to_s }
+  let(:source_user_id) { source_user.id.to_s }
+  let(:walter_id) { walter.id.to_s }
+
+  let(:post_with_two_polls) do
+    raw = <<~RAW
+      [poll type=multiple min=2 max=3 public=true]
+      - Option 1
+      - Option 2
+      - Option 3
+      [/poll]
+
+      [poll name=private_poll]
+      - Option 1
+      - Option 2
+      - Option 3
+      [/poll]
+    RAW
+
+    Fabricate(:post, raw: raw)
+  end
+
+  let(:option1_id) { "63eb791ab5d08fc4cc855a0703ac0dd1" }
+  let(:option2_id) { "773a193533027393806fff6edd6c04f7" }
+  let(:option3_id) { "f42f567ca3136ee1322d71d7745084c7" }
+
+  def vote(post, user, option_ids, poll_name = nil)
+    poll_name ||= DiscoursePoll::DEFAULT_POLL_NAME
+    DiscoursePoll::Poll.vote(post.id, poll_name, option_ids, user)
+  end
+
+  it "should move votes to the target_user when only the source_user voted" do
+    vote(post_with_two_polls, source_user, [option1_id, option3_id])
+    vote(post_with_two_polls, walter, [option1_id, option2_id])
+
+    DiscoursePoll::VotesUpdater.merge_users!(source_user, target_user)
+    post_with_two_polls.reload
+
+    polls = post_with_two_polls.custom_fields[DiscoursePoll::POLLS_CUSTOM_FIELD]
+    expect(polls["poll"]["options"][0]["votes"]).to eq(2)
+    expect(polls["poll"]["options"][1]["votes"]).to eq(1)
+    expect(polls["poll"]["options"][2]["votes"]).to eq(1)
+
+    expect(polls["poll"]["options"][0]["voter_ids"]).to contain_exactly(target_user.id, walter.id)
+    expect(polls["poll"]["options"][1]["voter_ids"]).to contain_exactly(walter.id)
+    expect(polls["poll"]["options"][2]["voter_ids"]).to contain_exactly(target_user.id)
+
+    votes = post_with_two_polls.custom_fields[DiscoursePoll::VOTES_CUSTOM_FIELD]
+    expect(votes.keys).to contain_exactly(target_user_id, walter_id)
+    expect(votes[target_user_id]["poll"]).to contain_exactly(option1_id, option3_id)
+    expect(votes[walter_id]["poll"]).to contain_exactly(option1_id, option2_id)
+  end
+
+  it "should delete votes of the source_user if the target_user voted" do
+    vote(post_with_two_polls, source_user, [option1_id, option3_id])
+    vote(post_with_two_polls, target_user, [option2_id, option3_id])
+    vote(post_with_two_polls, walter, [option1_id, option2_id])
+
+    DiscoursePoll::VotesUpdater.merge_users!(source_user, target_user)
+    post_with_two_polls.reload
+
+    polls = post_with_two_polls.custom_fields[DiscoursePoll::POLLS_CUSTOM_FIELD]
+    expect(polls["poll"]["options"][0]["votes"]).to eq(1)
+    expect(polls["poll"]["options"][1]["votes"]).to eq(2)
+    expect(polls["poll"]["options"][2]["votes"]).to eq(1)
+
+    expect(polls["poll"]["options"][0]["voter_ids"]).to contain_exactly(walter.id)
+    expect(polls["poll"]["options"][1]["voter_ids"]).to contain_exactly(target_user.id, walter.id)
+    expect(polls["poll"]["options"][2]["voter_ids"]).to contain_exactly(target_user.id)
+
+    votes = post_with_two_polls.custom_fields[DiscoursePoll::VOTES_CUSTOM_FIELD]
+    expect(votes.keys).to contain_exactly(target_user_id, walter_id)
+    expect(votes[target_user_id]["poll"]).to contain_exactly(option2_id, option3_id)
+    expect(votes[walter_id]["poll"]).to contain_exactly(option1_id, option2_id)
+  end
+
+  it "does not add voter_ids unless the poll is public" do
+    vote(post_with_two_polls, source_user, [option1_id, option3_id], "private_poll")
+    vote(post_with_two_polls, walter, [option1_id, option2_id], "private_poll")
+
+    DiscoursePoll::VotesUpdater.merge_users!(source_user, target_user)
+    post_with_two_polls.reload
+
+    polls = post_with_two_polls.custom_fields[DiscoursePoll::POLLS_CUSTOM_FIELD]
+    polls["private_poll"]["options"].each { |o| expect(o).to_not have_key("voter_ids") }
+  end
+end
diff --git a/plugins/poll/test/javascripts/acceptance/poll-builder-disabled-test.js.es6 b/plugins/poll/test/javascripts/acceptance/poll-builder-disabled-test.js.es6
index 69f9fb4365a..99f4fd300c3 100644
--- a/plugins/poll/test/javascripts/acceptance/poll-builder-disabled-test.js.es6
+++ b/plugins/poll/test/javascripts/acceptance/poll-builder-disabled-test.js.es6
@@ -1,6 +1,5 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance, replaceCurrentUser } from "helpers/qunit-helpers";
 import { displayPollBuilderButton } from "discourse/plugins/poll/helpers/display-poll-builder-button";
-import { replaceCurrentUser } from "discourse/plugins/poll/helpers/replace-current-user";
 import { clearPopupMenuOptionsCallback } from "discourse/controllers/composer";
 
 acceptance("Poll Builder - polls are disabled", {
diff --git a/plugins/poll/test/javascripts/acceptance/poll-builder-enabled-test.js.es6 b/plugins/poll/test/javascripts/acceptance/poll-builder-enabled-test.js.es6
index 4f210446f49..5f407a958fc 100644
--- a/plugins/poll/test/javascripts/acceptance/poll-builder-enabled-test.js.es6
+++ b/plugins/poll/test/javascripts/acceptance/poll-builder-enabled-test.js.es6
@@ -1,6 +1,5 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance, replaceCurrentUser } from "helpers/qunit-helpers";
 import { displayPollBuilderButton } from "discourse/plugins/poll/helpers/display-poll-builder-button";
-import { replaceCurrentUser } from "discourse/plugins/poll/helpers/replace-current-user";
 import { clearPopupMenuOptionsCallback } from "discourse/controllers/composer";
 
 acceptance("Poll Builder - polls are enabled", {
diff --git a/plugins/poll/test/javascripts/helpers/replace-current-user.js.es6 b/plugins/poll/test/javascripts/helpers/replace-current-user.js.es6
deleted file mode 100644
index 59161ed6bdb..00000000000
--- a/plugins/poll/test/javascripts/helpers/replace-current-user.js.es6
+++ /dev/null
@@ -1,5 +0,0 @@
-export function replaceCurrentUser(properties) {
-  const currentUser = Discourse.User.current();
-  currentUser.setProperties(properties);
-  Discourse.User.resetCurrent(currentUser);
-}
diff --git a/public/403.bg.html b/public/403.bg.html
new file mode 100644
index 00000000000..982465efed0
--- /dev/null
+++ b/public/403.bg.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Не може да правите това (403)</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 400%; color: #f00; line-height: 1em; }
+  </style>
+</head>
+<body>
+  <div class="dialog">
+    <h1>403</h1>
+    <p>Не може да разглеждате този ресурс!</p>
+
+    <p>Това ще бъде заменено от персонализирана страница на Discourse за 403 грешка.</p>
+  </div>
+</body>
+</html>
diff --git a/public/403.fi.html b/public/403.fi.html
index 0eb53c7edd7..5a82e514ccf 100644
--- a/public/403.fi.html
+++ b/public/403.fi.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>Et voi tehdä tuota (403)</title>
+<title>Et voi tehdä noin (403)</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <style type="text/css">
     body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
diff --git a/public/403.nb_NO.html b/public/403.nb_NO.html
index b11c804fb8e..1a7c01bea5d 100644
--- a/public/403.nb_NO.html
+++ b/public/403.nb_NO.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>Du har ikke tilgang til å gjøre dette (403)</title>
+<title>Du kan ikke gjøre det (403)</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <style type="text/css">
     body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
diff --git a/public/403.sl.html b/public/403.sl.html
new file mode 100644
index 00000000000..899e07029a9
--- /dev/null
+++ b/public/403.sl.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Tega ne moreš storiti (403)</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 400%; color: #f00; line-height: 1em; }
+  </style>
+</head>
+<body>
+  <div class="dialog">
+    <h1>403</h1>
+    <p>Te vsebine si ne moreš ogledati!</p>
+
+    <p>To bo nadomeščeno z Discourse 403 stranjo po meri.</p>
+  </div>
+</body>
+</html>
diff --git a/public/422.bg.html b/public/422.bg.html
new file mode 100644
index 00000000000..452f26005a5
--- /dev/null
+++ b/public/422.bg.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Промяната, която искахте да направите е отхвърлена (422)</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+<body>
+  <!-- This file lives in public/422.html -->
+  <div class="dialog">
+    <h1>Промяната, която искахте да направите е отхвърлена.</h1>
+    <p>Може би се опитвате да промените нещо до което нямате достъп.</p>
+  </div>
+</body>
+</html>
diff --git a/public/422.sl.html b/public/422.sl.html
new file mode 100644
index 00000000000..9894bbdd1f9
--- /dev/null
+++ b/public/422.sl.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Želena sprememba je bila zavrnjena (422)</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+<body>
+  <!-- This file lives in public/422.html -->
+  <div class="dialog">
+    <h1>Želena spremeba je bila zavrnjena.</h1>
+    <p>Morda ste poskusili spremeniti nekaj do česar nimate dostopa.</p>
+  </div>
+</body>
+</html>
diff --git a/public/500.bg.html b/public/500.bg.html
new file mode 100644
index 00000000000..f0afc335344
--- /dev/null
+++ b/public/500.bg.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Опаа - Грешка 500</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+    <h1>Опаа</h1>
+    <p>Възникна непредвидена грешка в софтуера движещ този форум. Моля да ни извините за неудобството.</p>
+    <p>Беше изпратено известие с подробна информация за грешката.</p>
+    <p>Няма нужда от повече действия от ваша страна. В случай, че грешката се повтори, може да ни изпратите допълнителна информация /как да възпроизведем проблема/, като публикувате тема в категорията за обратна връзка.</p>
+</body>
+</html>
diff --git a/public/500.cs.html b/public/500.cs.html
index a3177c6bdac..5402855206f 100644
--- a/public/500.cs.html
+++ b/public/500.cs.html
@@ -8,6 +8,6 @@
     <h1>Jejda</h1>
     <p>Software, na němž běží toto diskuzní fórum, narazil na nečekané problémy. Omlouváme se za způsobené nepříjemnosti.</p>
     <p>Podrobné informace o chybě byly zaznamenány a automatické oznámení vygenerováno. Podíváme se na to.</p>
-    <p>Žádná další akce není třeba. Pokud chyba nezmizí, můžete poskytnout podrobnosti, včetně kroků, jak chybu reprodukovat, založením nového tématu v kategorii zpětné vazby k webu.</p>
+    <p>Žádná další akce není potřeba. Ale pokud chyba přetrvá, doplňte prosím podrobnosti, včetně kroků jak chybu reprodukovat, založením nového tématu v kategorii fóra určené pro zpětnou vazbu.</p>
 </body>
 </html>
diff --git a/public/500.nb_NO.html b/public/500.nb_NO.html
index 56e2c70bdb3..c358230a105 100644
--- a/public/500.nb_NO.html
+++ b/public/500.nb_NO.html
@@ -8,6 +8,6 @@
     <h1>Oisann</h1>
     <p>Programvaren til dette diskusjonsforum fikk et uventet problem. Vi beklager dette.</p>
     <p>Detaljert informasjon om feilen ble logget, og et automatisk varsel generert. Vi vil ta en titt på det.</p>
-    <p>Ingen flere handlinger kreves. Skulle denne feilen fortsette å oppstå, kan du </p>
+    <p>Ingen ytterligere handlinger kreves. Skulle denne feilen fortsette å oppstå kan du hjelpe oss ved å fortelle hvilke steg du gjorde for å reprodusere feilmeldingen, gjerne ved å lage et nytt emne i kategorien for tilbakemeldinger.</p>
 </body>
 </html>
diff --git a/public/500.sl.html b/public/500.sl.html
new file mode 100644
index 00000000000..9336fe01f69
--- /dev/null
+++ b/public/500.sl.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Ups - Napaka 500</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+    <h1>Ups</h1>
+    <p>Programska oprema, ki poganja ta forum je naletela na nepričakovano napako. Opravičujemo se za nevšečnost.</p>
+    <p>Podatki o napaki so bili shranjeni in generiran je bil avtomatski opomnik. Zadevo bomo preverili.</p>
+    <p>Zaenkrat ni potrebna nobena dodatna aktivnost. V primeru da se napaka ponoviavlja, lahko posredujete dodatne informacije, ki vključujejo korake ki privedejo do napake, tako da objavite temo v kategoriji povratne informacije.</p>
+</body>
+</html>
diff --git a/public/503.bg.html b/public/503.bg.html
new file mode 100644
index 00000000000..b04734e644f
--- /dev/null
+++ b/public/503.bg.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Страницата е в процес на поддръжка</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+    <h1>В момента сме в процес на планирана поддръжка. </h1>
+    <p>Моля проверете пак <span id="when-to-check-back">няколко минути</span>.</p>
+    <p id="apology">Съжаляване за неудобството!</p>
+</body>
+</html>
diff --git a/public/503.sl.html b/public/503.sl.html
new file mode 100644
index 00000000000..028f5e46ccc
--- /dev/null
+++ b/public/503.sl.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Stran je v stanju vzdrževanja - Discourse.org</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+    <h1>Trenutno je stran nedosegljiva zaradi načrtovanega vzdrževanja.</h1>
+    <p>Prosim vrnite se ponovno <span id="when-to-check-back">čez nekaj minut</span>.</p>
+    <p id="apology">Opravičujemo se za nevšečnost!</p>
+</body>
+</html>
diff --git a/public/images/emoji/apple/+1.png b/public/images/emoji/apple/+1.png
index 5df9bb8540e..6f09aa90934 100644
Binary files a/public/images/emoji/apple/+1.png and b/public/images/emoji/apple/+1.png differ
diff --git a/public/images/emoji/apple/+1/2.png b/public/images/emoji/apple/+1/2.png
index f33655e0943..665bbf1b296 100644
Binary files a/public/images/emoji/apple/+1/2.png and b/public/images/emoji/apple/+1/2.png differ
diff --git a/public/images/emoji/apple/+1/3.png b/public/images/emoji/apple/+1/3.png
index e6114682607..4ef43301a88 100644
Binary files a/public/images/emoji/apple/+1/3.png and b/public/images/emoji/apple/+1/3.png differ
diff --git a/public/images/emoji/apple/+1/4.png b/public/images/emoji/apple/+1/4.png
index c07e81b31e3..2344e6f0531 100644
Binary files a/public/images/emoji/apple/+1/4.png and b/public/images/emoji/apple/+1/4.png differ
diff --git a/public/images/emoji/apple/+1/5.png b/public/images/emoji/apple/+1/5.png
index c04a6c2bd8e..23d59afc306 100644
Binary files a/public/images/emoji/apple/+1/5.png and b/public/images/emoji/apple/+1/5.png differ
diff --git a/public/images/emoji/apple/+1/6.png b/public/images/emoji/apple/+1/6.png
index 8fbc7fd36ba..924c138faff 100644
Binary files a/public/images/emoji/apple/+1/6.png and b/public/images/emoji/apple/+1/6.png differ
diff --git a/public/images/emoji/apple/-1.png b/public/images/emoji/apple/-1.png
index 74440b69c7d..6772f554edb 100644
Binary files a/public/images/emoji/apple/-1.png and b/public/images/emoji/apple/-1.png differ
diff --git a/public/images/emoji/apple/-1/2.png b/public/images/emoji/apple/-1/2.png
index 930faaf2a54..d4c46ed0e83 100644
Binary files a/public/images/emoji/apple/-1/2.png and b/public/images/emoji/apple/-1/2.png differ
diff --git a/public/images/emoji/apple/-1/3.png b/public/images/emoji/apple/-1/3.png
index 29ebfe1eefe..128a75f6f43 100644
Binary files a/public/images/emoji/apple/-1/3.png and b/public/images/emoji/apple/-1/3.png differ
diff --git a/public/images/emoji/apple/-1/4.png b/public/images/emoji/apple/-1/4.png
index 0b46e9862c2..f0415f567ba 100644
Binary files a/public/images/emoji/apple/-1/4.png and b/public/images/emoji/apple/-1/4.png differ
diff --git a/public/images/emoji/apple/-1/5.png b/public/images/emoji/apple/-1/5.png
index 5ee7db294b7..092d40df3ca 100644
Binary files a/public/images/emoji/apple/-1/5.png and b/public/images/emoji/apple/-1/5.png differ
diff --git a/public/images/emoji/apple/-1/6.png b/public/images/emoji/apple/-1/6.png
index edf1f180c89..6856269c265 100644
Binary files a/public/images/emoji/apple/-1/6.png and b/public/images/emoji/apple/-1/6.png differ
diff --git a/public/images/emoji/apple/100.png b/public/images/emoji/apple/100.png
index d3ca5571c39..99f7bc62d65 100644
Binary files a/public/images/emoji/apple/100.png and b/public/images/emoji/apple/100.png differ
diff --git a/public/images/emoji/apple/1234.png b/public/images/emoji/apple/1234.png
index 81ff81a4694..3fc7ebe1765 100644
Binary files a/public/images/emoji/apple/1234.png and b/public/images/emoji/apple/1234.png differ
diff --git a/public/images/emoji/apple/1st_place_medal.png b/public/images/emoji/apple/1st_place_medal.png
index c131644ef88..ea6751ba468 100644
Binary files a/public/images/emoji/apple/1st_place_medal.png and b/public/images/emoji/apple/1st_place_medal.png differ
diff --git a/public/images/emoji/apple/2nd_place_medal.png b/public/images/emoji/apple/2nd_place_medal.png
index ac29b9fe474..108a26b02a2 100644
Binary files a/public/images/emoji/apple/2nd_place_medal.png and b/public/images/emoji/apple/2nd_place_medal.png differ
diff --git a/public/images/emoji/apple/3rd_place_medal.png b/public/images/emoji/apple/3rd_place_medal.png
index f34e6a3966c..f8cba385f39 100644
Binary files a/public/images/emoji/apple/3rd_place_medal.png and b/public/images/emoji/apple/3rd_place_medal.png differ
diff --git a/public/images/emoji/apple/8ball.png b/public/images/emoji/apple/8ball.png
index 6eb89fb61e3..7cd6f8c105a 100644
Binary files a/public/images/emoji/apple/8ball.png and b/public/images/emoji/apple/8ball.png differ
diff --git a/public/images/emoji/apple/a.png b/public/images/emoji/apple/a.png
index e9ce7879820..c850470082e 100644
Binary files a/public/images/emoji/apple/a.png and b/public/images/emoji/apple/a.png differ
diff --git a/public/images/emoji/apple/ab.png b/public/images/emoji/apple/ab.png
index 3c25fb8158f..cb9e83e94f5 100644
Binary files a/public/images/emoji/apple/ab.png and b/public/images/emoji/apple/ab.png differ
diff --git a/public/images/emoji/apple/abc.png b/public/images/emoji/apple/abc.png
index 9178d96490a..fda6ce7afbd 100644
Binary files a/public/images/emoji/apple/abc.png and b/public/images/emoji/apple/abc.png differ
diff --git a/public/images/emoji/apple/abcd.png b/public/images/emoji/apple/abcd.png
index dbfd60ddd9c..ef0327f2ac7 100644
Binary files a/public/images/emoji/apple/abcd.png and b/public/images/emoji/apple/abcd.png differ
diff --git a/public/images/emoji/apple/accept.png b/public/images/emoji/apple/accept.png
index 95cee05ac4c..d184cfcff08 100644
Binary files a/public/images/emoji/apple/accept.png and b/public/images/emoji/apple/accept.png differ
diff --git a/public/images/emoji/apple/admission_tickets.png b/public/images/emoji/apple/admission_tickets.png
index fd35e2a4d09..aa63df9de03 100644
Binary files a/public/images/emoji/apple/admission_tickets.png and b/public/images/emoji/apple/admission_tickets.png differ
diff --git a/public/images/emoji/apple/adult.png b/public/images/emoji/apple/adult.png
index 53a5eb2ccb9..06ee593955a 100644
Binary files a/public/images/emoji/apple/adult.png and b/public/images/emoji/apple/adult.png differ
diff --git a/public/images/emoji/apple/adult/2.png b/public/images/emoji/apple/adult/2.png
index 8f30fc9e389..abfc3c90fc9 100644
Binary files a/public/images/emoji/apple/adult/2.png and b/public/images/emoji/apple/adult/2.png differ
diff --git a/public/images/emoji/apple/adult/3.png b/public/images/emoji/apple/adult/3.png
index 36a4e57d1f8..5eb018855bc 100644
Binary files a/public/images/emoji/apple/adult/3.png and b/public/images/emoji/apple/adult/3.png differ
diff --git a/public/images/emoji/apple/adult/4.png b/public/images/emoji/apple/adult/4.png
index 77c57605e93..0058111043f 100644
Binary files a/public/images/emoji/apple/adult/4.png and b/public/images/emoji/apple/adult/4.png differ
diff --git a/public/images/emoji/apple/adult/5.png b/public/images/emoji/apple/adult/5.png
index 58bcd6a2fcf..13e6cafdb14 100644
Binary files a/public/images/emoji/apple/adult/5.png and b/public/images/emoji/apple/adult/5.png differ
diff --git a/public/images/emoji/apple/adult/6.png b/public/images/emoji/apple/adult/6.png
index 3bc6b5a57a3..0de38092bfe 100644
Binary files a/public/images/emoji/apple/adult/6.png and b/public/images/emoji/apple/adult/6.png differ
diff --git a/public/images/emoji/apple/aerial_tramway.png b/public/images/emoji/apple/aerial_tramway.png
index b4e62dcc606..b2ff53aca07 100644
Binary files a/public/images/emoji/apple/aerial_tramway.png and b/public/images/emoji/apple/aerial_tramway.png differ
diff --git a/public/images/emoji/apple/afghanistan.png b/public/images/emoji/apple/afghanistan.png
index be9171edf7e..bb8739acd1f 100644
Binary files a/public/images/emoji/apple/afghanistan.png and b/public/images/emoji/apple/afghanistan.png differ
diff --git a/public/images/emoji/apple/airplane.png b/public/images/emoji/apple/airplane.png
index 5d7e55052d3..573b2c2d61e 100644
Binary files a/public/images/emoji/apple/airplane.png and b/public/images/emoji/apple/airplane.png differ
diff --git a/public/images/emoji/apple/airplane_arriving.png b/public/images/emoji/apple/airplane_arriving.png
index c716ff21866..bc6e857587f 100644
Binary files a/public/images/emoji/apple/airplane_arriving.png and b/public/images/emoji/apple/airplane_arriving.png differ
diff --git a/public/images/emoji/apple/airplane_departure.png b/public/images/emoji/apple/airplane_departure.png
index d1fcea18b8a..b6bd873830b 100644
Binary files a/public/images/emoji/apple/airplane_departure.png and b/public/images/emoji/apple/airplane_departure.png differ
diff --git a/public/images/emoji/apple/airplane_small.png b/public/images/emoji/apple/airplane_small.png
index c5823b2577e..167237a1327 100644
Binary files a/public/images/emoji/apple/airplane_small.png and b/public/images/emoji/apple/airplane_small.png differ
diff --git a/public/images/emoji/apple/aland_islands.png b/public/images/emoji/apple/aland_islands.png
index 0073114703a..3150aba31e3 100644
Binary files a/public/images/emoji/apple/aland_islands.png and b/public/images/emoji/apple/aland_islands.png differ
diff --git a/public/images/emoji/apple/alarm_clock.png b/public/images/emoji/apple/alarm_clock.png
index 696265eea7e..14319a04622 100644
Binary files a/public/images/emoji/apple/alarm_clock.png and b/public/images/emoji/apple/alarm_clock.png differ
diff --git a/public/images/emoji/apple/albania.png b/public/images/emoji/apple/albania.png
index e4a013d54b5..b3b80ce33aa 100644
Binary files a/public/images/emoji/apple/albania.png and b/public/images/emoji/apple/albania.png differ
diff --git a/public/images/emoji/apple/alembic.png b/public/images/emoji/apple/alembic.png
index 44b42839156..bb3bbb80391 100644
Binary files a/public/images/emoji/apple/alembic.png and b/public/images/emoji/apple/alembic.png differ
diff --git a/public/images/emoji/apple/algeria.png b/public/images/emoji/apple/algeria.png
index 915ddb8fd9a..f68ab9f5efd 100644
Binary files a/public/images/emoji/apple/algeria.png and b/public/images/emoji/apple/algeria.png differ
diff --git a/public/images/emoji/apple/alien.png b/public/images/emoji/apple/alien.png
index 80cfea90ce6..b6b227916fb 100644
Binary files a/public/images/emoji/apple/alien.png and b/public/images/emoji/apple/alien.png differ
diff --git a/public/images/emoji/apple/ambulance.png b/public/images/emoji/apple/ambulance.png
index 9a35a42e932..1d549f64b84 100644
Binary files a/public/images/emoji/apple/ambulance.png and b/public/images/emoji/apple/ambulance.png differ
diff --git a/public/images/emoji/apple/american_samoa.png b/public/images/emoji/apple/american_samoa.png
index 88fab81c2be..310b8d0bb1a 100644
Binary files a/public/images/emoji/apple/american_samoa.png and b/public/images/emoji/apple/american_samoa.png differ
diff --git a/public/images/emoji/apple/amphora.png b/public/images/emoji/apple/amphora.png
index 4f8112aebd2..3bf376ddc31 100644
Binary files a/public/images/emoji/apple/amphora.png and b/public/images/emoji/apple/amphora.png differ
diff --git a/public/images/emoji/apple/anchor.png b/public/images/emoji/apple/anchor.png
index 62437d71702..c1d81fc093f 100644
Binary files a/public/images/emoji/apple/anchor.png and b/public/images/emoji/apple/anchor.png differ
diff --git a/public/images/emoji/apple/andorra.png b/public/images/emoji/apple/andorra.png
index 7d3b7fd179a..aa5bc5e0312 100644
Binary files a/public/images/emoji/apple/andorra.png and b/public/images/emoji/apple/andorra.png differ
diff --git a/public/images/emoji/apple/angel.png b/public/images/emoji/apple/angel.png
index d11e1912ed8..b7115440506 100644
Binary files a/public/images/emoji/apple/angel.png and b/public/images/emoji/apple/angel.png differ
diff --git a/public/images/emoji/apple/angel/2.png b/public/images/emoji/apple/angel/2.png
index 6f0a2fd4625..7fbbf55d43d 100644
Binary files a/public/images/emoji/apple/angel/2.png and b/public/images/emoji/apple/angel/2.png differ
diff --git a/public/images/emoji/apple/angel/3.png b/public/images/emoji/apple/angel/3.png
index 1e9ee78ca88..36a8abe42cb 100644
Binary files a/public/images/emoji/apple/angel/3.png and b/public/images/emoji/apple/angel/3.png differ
diff --git a/public/images/emoji/apple/angel/4.png b/public/images/emoji/apple/angel/4.png
index 0596fa0c4c2..430e1e66cb6 100644
Binary files a/public/images/emoji/apple/angel/4.png and b/public/images/emoji/apple/angel/4.png differ
diff --git a/public/images/emoji/apple/angel/5.png b/public/images/emoji/apple/angel/5.png
index b588a1be5b9..f02a6dfe478 100644
Binary files a/public/images/emoji/apple/angel/5.png and b/public/images/emoji/apple/angel/5.png differ
diff --git a/public/images/emoji/apple/angel/6.png b/public/images/emoji/apple/angel/6.png
index 2d25ee52549..d47f668479a 100644
Binary files a/public/images/emoji/apple/angel/6.png and b/public/images/emoji/apple/angel/6.png differ
diff --git a/public/images/emoji/apple/anger.png b/public/images/emoji/apple/anger.png
index feb23ff499b..8cf14cf7664 100644
Binary files a/public/images/emoji/apple/anger.png and b/public/images/emoji/apple/anger.png differ
diff --git a/public/images/emoji/apple/anger_right.png b/public/images/emoji/apple/anger_right.png
index 95cf61d6ddc..51550711fb6 100644
Binary files a/public/images/emoji/apple/anger_right.png and b/public/images/emoji/apple/anger_right.png differ
diff --git a/public/images/emoji/apple/angola.png b/public/images/emoji/apple/angola.png
index 5427740da4e..19443e864b4 100644
Binary files a/public/images/emoji/apple/angola.png and b/public/images/emoji/apple/angola.png differ
diff --git a/public/images/emoji/apple/angry.png b/public/images/emoji/apple/angry.png
index fbc2f335555..94b937f9cad 100644
Binary files a/public/images/emoji/apple/angry.png and b/public/images/emoji/apple/angry.png differ
diff --git a/public/images/emoji/apple/anguilla.png b/public/images/emoji/apple/anguilla.png
index 9fcc3912a94..d8de3a59517 100644
Binary files a/public/images/emoji/apple/anguilla.png and b/public/images/emoji/apple/anguilla.png differ
diff --git a/public/images/emoji/apple/anguished.png b/public/images/emoji/apple/anguished.png
index 260c4677898..77f962f9148 100644
Binary files a/public/images/emoji/apple/anguished.png and b/public/images/emoji/apple/anguished.png differ
diff --git a/public/images/emoji/apple/ant.png b/public/images/emoji/apple/ant.png
index db3249a9068..8cfe5b834ec 100644
Binary files a/public/images/emoji/apple/ant.png and b/public/images/emoji/apple/ant.png differ
diff --git a/public/images/emoji/apple/antarctica.png b/public/images/emoji/apple/antarctica.png
index cb0c40bd05c..ea2b7a594a0 100644
Binary files a/public/images/emoji/apple/antarctica.png and b/public/images/emoji/apple/antarctica.png differ
diff --git a/public/images/emoji/apple/antigua_barbuda.png b/public/images/emoji/apple/antigua_barbuda.png
index 0bf69425b3c..4d0101f1e59 100644
Binary files a/public/images/emoji/apple/antigua_barbuda.png and b/public/images/emoji/apple/antigua_barbuda.png differ
diff --git a/public/images/emoji/apple/apple.png b/public/images/emoji/apple/apple.png
index 34a88220e33..c33b1efce1a 100644
Binary files a/public/images/emoji/apple/apple.png and b/public/images/emoji/apple/apple.png differ
diff --git a/public/images/emoji/apple/aquarius.png b/public/images/emoji/apple/aquarius.png
index cecfae493ea..5871939205d 100644
Binary files a/public/images/emoji/apple/aquarius.png and b/public/images/emoji/apple/aquarius.png differ
diff --git a/public/images/emoji/apple/archery.png b/public/images/emoji/apple/archery.png
index 58c5e9f05ac..b31e09120d0 100644
Binary files a/public/images/emoji/apple/archery.png and b/public/images/emoji/apple/archery.png differ
diff --git a/public/images/emoji/apple/argentina.png b/public/images/emoji/apple/argentina.png
index f8fa6a686e6..6a532115b69 100644
Binary files a/public/images/emoji/apple/argentina.png and b/public/images/emoji/apple/argentina.png differ
diff --git a/public/images/emoji/apple/aries.png b/public/images/emoji/apple/aries.png
index 88af27355ca..4bd97674e04 100644
Binary files a/public/images/emoji/apple/aries.png and b/public/images/emoji/apple/aries.png differ
diff --git a/public/images/emoji/apple/armenia.png b/public/images/emoji/apple/armenia.png
index eb12f476c28..17e55a51ccc 100644
Binary files a/public/images/emoji/apple/armenia.png and b/public/images/emoji/apple/armenia.png differ
diff --git a/public/images/emoji/apple/arrow_backward.png b/public/images/emoji/apple/arrow_backward.png
index af4ccacf834..15f1b0207bf 100644
Binary files a/public/images/emoji/apple/arrow_backward.png and b/public/images/emoji/apple/arrow_backward.png differ
diff --git a/public/images/emoji/apple/arrow_double_down.png b/public/images/emoji/apple/arrow_double_down.png
index c69979b71e8..2d1339e7954 100644
Binary files a/public/images/emoji/apple/arrow_double_down.png and b/public/images/emoji/apple/arrow_double_down.png differ
diff --git a/public/images/emoji/apple/arrow_double_up.png b/public/images/emoji/apple/arrow_double_up.png
index 2fae00bc74c..ab0b87ded3a 100644
Binary files a/public/images/emoji/apple/arrow_double_up.png and b/public/images/emoji/apple/arrow_double_up.png differ
diff --git a/public/images/emoji/apple/arrow_down.png b/public/images/emoji/apple/arrow_down.png
index 8e054f92f81..fe95a8695af 100644
Binary files a/public/images/emoji/apple/arrow_down.png and b/public/images/emoji/apple/arrow_down.png differ
diff --git a/public/images/emoji/apple/arrow_down_small.png b/public/images/emoji/apple/arrow_down_small.png
index a97cf57eba6..fb89f7dc4b3 100644
Binary files a/public/images/emoji/apple/arrow_down_small.png and b/public/images/emoji/apple/arrow_down_small.png differ
diff --git a/public/images/emoji/apple/arrow_forward.png b/public/images/emoji/apple/arrow_forward.png
index 778e5b0c50a..09ad08a4c68 100644
Binary files a/public/images/emoji/apple/arrow_forward.png and b/public/images/emoji/apple/arrow_forward.png differ
diff --git a/public/images/emoji/apple/arrow_heading_down.png b/public/images/emoji/apple/arrow_heading_down.png
index 7fb1aca1623..8c2422104b1 100644
Binary files a/public/images/emoji/apple/arrow_heading_down.png and b/public/images/emoji/apple/arrow_heading_down.png differ
diff --git a/public/images/emoji/apple/arrow_heading_up.png b/public/images/emoji/apple/arrow_heading_up.png
index c4b6e863e26..3eb43785fbd 100644
Binary files a/public/images/emoji/apple/arrow_heading_up.png and b/public/images/emoji/apple/arrow_heading_up.png differ
diff --git a/public/images/emoji/apple/arrow_left.png b/public/images/emoji/apple/arrow_left.png
index 29a6bb5543a..ebbf4105f8d 100644
Binary files a/public/images/emoji/apple/arrow_left.png and b/public/images/emoji/apple/arrow_left.png differ
diff --git a/public/images/emoji/apple/arrow_lower_left.png b/public/images/emoji/apple/arrow_lower_left.png
index c736224c87e..f3d661aa464 100644
Binary files a/public/images/emoji/apple/arrow_lower_left.png and b/public/images/emoji/apple/arrow_lower_left.png differ
diff --git a/public/images/emoji/apple/arrow_lower_right.png b/public/images/emoji/apple/arrow_lower_right.png
index c7f09fd49aa..76919846993 100644
Binary files a/public/images/emoji/apple/arrow_lower_right.png and b/public/images/emoji/apple/arrow_lower_right.png differ
diff --git a/public/images/emoji/apple/arrow_right.png b/public/images/emoji/apple/arrow_right.png
index 91db8b6de2f..028ba5c1ac9 100644
Binary files a/public/images/emoji/apple/arrow_right.png and b/public/images/emoji/apple/arrow_right.png differ
diff --git a/public/images/emoji/apple/arrow_right_hook.png b/public/images/emoji/apple/arrow_right_hook.png
index afae92c32b8..2ea6da4b11e 100644
Binary files a/public/images/emoji/apple/arrow_right_hook.png and b/public/images/emoji/apple/arrow_right_hook.png differ
diff --git a/public/images/emoji/apple/arrow_up.png b/public/images/emoji/apple/arrow_up.png
index 6133c5b73b2..98c5109c9cd 100644
Binary files a/public/images/emoji/apple/arrow_up.png and b/public/images/emoji/apple/arrow_up.png differ
diff --git a/public/images/emoji/apple/arrow_up_down.png b/public/images/emoji/apple/arrow_up_down.png
index 5d737765575..9c5e57d7879 100644
Binary files a/public/images/emoji/apple/arrow_up_down.png and b/public/images/emoji/apple/arrow_up_down.png differ
diff --git a/public/images/emoji/apple/arrow_up_small.png b/public/images/emoji/apple/arrow_up_small.png
index 1d97b9c9212..0d363325c0d 100644
Binary files a/public/images/emoji/apple/arrow_up_small.png and b/public/images/emoji/apple/arrow_up_small.png differ
diff --git a/public/images/emoji/apple/arrow_upper_left.png b/public/images/emoji/apple/arrow_upper_left.png
index f276922c10c..432944d3dae 100644
Binary files a/public/images/emoji/apple/arrow_upper_left.png and b/public/images/emoji/apple/arrow_upper_left.png differ
diff --git a/public/images/emoji/apple/arrow_upper_right.png b/public/images/emoji/apple/arrow_upper_right.png
index 3488c4919f0..4629c25520f 100644
Binary files a/public/images/emoji/apple/arrow_upper_right.png and b/public/images/emoji/apple/arrow_upper_right.png differ
diff --git a/public/images/emoji/apple/arrows_clockwise.png b/public/images/emoji/apple/arrows_clockwise.png
index 14354590998..12d7badd677 100644
Binary files a/public/images/emoji/apple/arrows_clockwise.png and b/public/images/emoji/apple/arrows_clockwise.png differ
diff --git a/public/images/emoji/apple/arrows_counterclockwise.png b/public/images/emoji/apple/arrows_counterclockwise.png
index 8c963872674..2a7fe76621b 100644
Binary files a/public/images/emoji/apple/arrows_counterclockwise.png and b/public/images/emoji/apple/arrows_counterclockwise.png differ
diff --git a/public/images/emoji/apple/art.png b/public/images/emoji/apple/art.png
index 428b2c3697b..8fac3cb8ac6 100644
Binary files a/public/images/emoji/apple/art.png and b/public/images/emoji/apple/art.png differ
diff --git a/public/images/emoji/apple/articulated_lorry.png b/public/images/emoji/apple/articulated_lorry.png
index 7af21091c95..997de7cea15 100644
Binary files a/public/images/emoji/apple/articulated_lorry.png and b/public/images/emoji/apple/articulated_lorry.png differ
diff --git a/public/images/emoji/apple/artificial_satellite.png b/public/images/emoji/apple/artificial_satellite.png
index 28b9ab2fd72..4e5e18de917 100644
Binary files a/public/images/emoji/apple/artificial_satellite.png and b/public/images/emoji/apple/artificial_satellite.png differ
diff --git a/public/images/emoji/apple/aruba.png b/public/images/emoji/apple/aruba.png
index d3ccae8f3e0..6c97eb974e4 100644
Binary files a/public/images/emoji/apple/aruba.png and b/public/images/emoji/apple/aruba.png differ
diff --git a/public/images/emoji/apple/ascension_island.png b/public/images/emoji/apple/ascension_island.png
index 694a0b8510c..12cee871e2f 100644
Binary files a/public/images/emoji/apple/ascension_island.png and b/public/images/emoji/apple/ascension_island.png differ
diff --git a/public/images/emoji/apple/asterisk.png b/public/images/emoji/apple/asterisk.png
index f847acf58c4..302650d81e4 100644
Binary files a/public/images/emoji/apple/asterisk.png and b/public/images/emoji/apple/asterisk.png differ
diff --git a/public/images/emoji/apple/astonished.png b/public/images/emoji/apple/astonished.png
index 1718adf1466..21b7a10d784 100644
Binary files a/public/images/emoji/apple/astonished.png and b/public/images/emoji/apple/astonished.png differ
diff --git a/public/images/emoji/apple/athletic_shoe.png b/public/images/emoji/apple/athletic_shoe.png
index f72d3b7fce6..c0f29fa1198 100644
Binary files a/public/images/emoji/apple/athletic_shoe.png and b/public/images/emoji/apple/athletic_shoe.png differ
diff --git a/public/images/emoji/apple/atm.png b/public/images/emoji/apple/atm.png
index 19e711fb49b..782fa7542b3 100644
Binary files a/public/images/emoji/apple/atm.png and b/public/images/emoji/apple/atm.png differ
diff --git a/public/images/emoji/apple/atom.png b/public/images/emoji/apple/atom.png
index f4debf825ba..6d42b836eb4 100644
Binary files a/public/images/emoji/apple/atom.png and b/public/images/emoji/apple/atom.png differ
diff --git a/public/images/emoji/apple/atom_symbol.png b/public/images/emoji/apple/atom_symbol.png
index f4debf825ba..6d42b836eb4 100644
Binary files a/public/images/emoji/apple/atom_symbol.png and b/public/images/emoji/apple/atom_symbol.png differ
diff --git a/public/images/emoji/apple/australia.png b/public/images/emoji/apple/australia.png
index 87eafc1fdcf..7486478cf1e 100644
Binary files a/public/images/emoji/apple/australia.png and b/public/images/emoji/apple/australia.png differ
diff --git a/public/images/emoji/apple/austria.png b/public/images/emoji/apple/austria.png
index 6cb27a834a9..1669afeba47 100644
Binary files a/public/images/emoji/apple/austria.png and b/public/images/emoji/apple/austria.png differ
diff --git a/public/images/emoji/apple/automobile.png b/public/images/emoji/apple/automobile.png
index 80e24f234bc..904a9bbb457 100644
Binary files a/public/images/emoji/apple/automobile.png and b/public/images/emoji/apple/automobile.png differ
diff --git a/public/images/emoji/apple/avocado.png b/public/images/emoji/apple/avocado.png
index 257ce74d2f2..0511c5805da 100644
Binary files a/public/images/emoji/apple/avocado.png and b/public/images/emoji/apple/avocado.png differ
diff --git a/public/images/emoji/apple/azerbaijan.png b/public/images/emoji/apple/azerbaijan.png
index 8b30f048f61..a645b946864 100644
Binary files a/public/images/emoji/apple/azerbaijan.png and b/public/images/emoji/apple/azerbaijan.png differ
diff --git a/public/images/emoji/apple/b.png b/public/images/emoji/apple/b.png
index 969e8c64b1b..899e6bca38d 100644
Binary files a/public/images/emoji/apple/b.png and b/public/images/emoji/apple/b.png differ
diff --git a/public/images/emoji/apple/baby.png b/public/images/emoji/apple/baby.png
index 53d8ea8e14c..3a867bc1c1c 100644
Binary files a/public/images/emoji/apple/baby.png and b/public/images/emoji/apple/baby.png differ
diff --git a/public/images/emoji/apple/baby/2.png b/public/images/emoji/apple/baby/2.png
index 3c43a12250b..55511c4742e 100644
Binary files a/public/images/emoji/apple/baby/2.png and b/public/images/emoji/apple/baby/2.png differ
diff --git a/public/images/emoji/apple/baby/3.png b/public/images/emoji/apple/baby/3.png
index 4d392a0f05e..930e418e116 100644
Binary files a/public/images/emoji/apple/baby/3.png and b/public/images/emoji/apple/baby/3.png differ
diff --git a/public/images/emoji/apple/baby/4.png b/public/images/emoji/apple/baby/4.png
index 25c43a52733..0558c79346a 100644
Binary files a/public/images/emoji/apple/baby/4.png and b/public/images/emoji/apple/baby/4.png differ
diff --git a/public/images/emoji/apple/baby/5.png b/public/images/emoji/apple/baby/5.png
index 4d2148d64c2..0d0dcd3dacb 100644
Binary files a/public/images/emoji/apple/baby/5.png and b/public/images/emoji/apple/baby/5.png differ
diff --git a/public/images/emoji/apple/baby/6.png b/public/images/emoji/apple/baby/6.png
index 3dbb035f9af..b04bbcfb785 100644
Binary files a/public/images/emoji/apple/baby/6.png and b/public/images/emoji/apple/baby/6.png differ
diff --git a/public/images/emoji/apple/baby_bottle.png b/public/images/emoji/apple/baby_bottle.png
index e962c738563..aadc42d20e4 100644
Binary files a/public/images/emoji/apple/baby_bottle.png and b/public/images/emoji/apple/baby_bottle.png differ
diff --git a/public/images/emoji/apple/baby_chick.png b/public/images/emoji/apple/baby_chick.png
index a6caf9dcfe0..b62342e3036 100644
Binary files a/public/images/emoji/apple/baby_chick.png and b/public/images/emoji/apple/baby_chick.png differ
diff --git a/public/images/emoji/apple/baby_symbol.png b/public/images/emoji/apple/baby_symbol.png
index a89f7c93326..6f8944c5deb 100644
Binary files a/public/images/emoji/apple/baby_symbol.png and b/public/images/emoji/apple/baby_symbol.png differ
diff --git a/public/images/emoji/apple/back.png b/public/images/emoji/apple/back.png
index 85d4fcd35e3..e470b870f21 100644
Binary files a/public/images/emoji/apple/back.png and b/public/images/emoji/apple/back.png differ
diff --git a/public/images/emoji/apple/bacon.png b/public/images/emoji/apple/bacon.png
index 4e07bcff2e6..05251d9d2dd 100644
Binary files a/public/images/emoji/apple/bacon.png and b/public/images/emoji/apple/bacon.png differ
diff --git a/public/images/emoji/apple/badminton.png b/public/images/emoji/apple/badminton.png
index 75351047f3f..d44d91a7377 100644
Binary files a/public/images/emoji/apple/badminton.png and b/public/images/emoji/apple/badminton.png differ
diff --git a/public/images/emoji/apple/baggage_claim.png b/public/images/emoji/apple/baggage_claim.png
index 57dfec3a458..c93bc8f8646 100644
Binary files a/public/images/emoji/apple/baggage_claim.png and b/public/images/emoji/apple/baggage_claim.png differ
diff --git a/public/images/emoji/apple/baguette_bread.png b/public/images/emoji/apple/baguette_bread.png
index f6b2159c238..460a67ba1fa 100644
Binary files a/public/images/emoji/apple/baguette_bread.png and b/public/images/emoji/apple/baguette_bread.png differ
diff --git a/public/images/emoji/apple/bahamas.png b/public/images/emoji/apple/bahamas.png
index 3ccd6ebf954..d157253e33a 100644
Binary files a/public/images/emoji/apple/bahamas.png and b/public/images/emoji/apple/bahamas.png differ
diff --git a/public/images/emoji/apple/bahrain.png b/public/images/emoji/apple/bahrain.png
index c3de96b0bb9..84778169d8f 100644
Binary files a/public/images/emoji/apple/bahrain.png and b/public/images/emoji/apple/bahrain.png differ
diff --git a/public/images/emoji/apple/balance_scale.png b/public/images/emoji/apple/balance_scale.png
index 5a49f802a7a..ae15720d89e 100644
Binary files a/public/images/emoji/apple/balance_scale.png and b/public/images/emoji/apple/balance_scale.png differ
diff --git a/public/images/emoji/apple/balloon.png b/public/images/emoji/apple/balloon.png
index e78b0e74d0b..a5dc53326c5 100644
Binary files a/public/images/emoji/apple/balloon.png and b/public/images/emoji/apple/balloon.png differ
diff --git a/public/images/emoji/apple/ballot_box.png b/public/images/emoji/apple/ballot_box.png
index a0894da6cd5..0cd698e3333 100644
Binary files a/public/images/emoji/apple/ballot_box.png and b/public/images/emoji/apple/ballot_box.png differ
diff --git a/public/images/emoji/apple/ballot_box_with_ballot.png b/public/images/emoji/apple/ballot_box_with_ballot.png
index a0894da6cd5..0cd698e3333 100644
Binary files a/public/images/emoji/apple/ballot_box_with_ballot.png and b/public/images/emoji/apple/ballot_box_with_ballot.png differ
diff --git a/public/images/emoji/apple/ballot_box_with_check.png b/public/images/emoji/apple/ballot_box_with_check.png
index d185b09e3a8..601c8318317 100644
Binary files a/public/images/emoji/apple/ballot_box_with_check.png and b/public/images/emoji/apple/ballot_box_with_check.png differ
diff --git a/public/images/emoji/apple/bamboo.png b/public/images/emoji/apple/bamboo.png
index 2c1c4b1bb8a..325d71e0e33 100644
Binary files a/public/images/emoji/apple/bamboo.png and b/public/images/emoji/apple/bamboo.png differ
diff --git a/public/images/emoji/apple/banana.png b/public/images/emoji/apple/banana.png
index 782b22d6650..485ae882f8d 100644
Binary files a/public/images/emoji/apple/banana.png and b/public/images/emoji/apple/banana.png differ
diff --git a/public/images/emoji/apple/bangbang.png b/public/images/emoji/apple/bangbang.png
index 20cfbaf4919..6f0eee2d70d 100644
Binary files a/public/images/emoji/apple/bangbang.png and b/public/images/emoji/apple/bangbang.png differ
diff --git a/public/images/emoji/apple/bangladesh.png b/public/images/emoji/apple/bangladesh.png
index 80d8445398c..344771c6465 100644
Binary files a/public/images/emoji/apple/bangladesh.png and b/public/images/emoji/apple/bangladesh.png differ
diff --git a/public/images/emoji/apple/bank.png b/public/images/emoji/apple/bank.png
index 49a1cffcd66..99ea133e572 100644
Binary files a/public/images/emoji/apple/bank.png and b/public/images/emoji/apple/bank.png differ
diff --git a/public/images/emoji/apple/bar_chart.png b/public/images/emoji/apple/bar_chart.png
index bab80b48cc3..3aef50559a6 100644
Binary files a/public/images/emoji/apple/bar_chart.png and b/public/images/emoji/apple/bar_chart.png differ
diff --git a/public/images/emoji/apple/barbados.png b/public/images/emoji/apple/barbados.png
index 86d7b00878a..1e931853c50 100644
Binary files a/public/images/emoji/apple/barbados.png and b/public/images/emoji/apple/barbados.png differ
diff --git a/public/images/emoji/apple/barber.png b/public/images/emoji/apple/barber.png
index 9e773ad2d9c..7aa2814715f 100644
Binary files a/public/images/emoji/apple/barber.png and b/public/images/emoji/apple/barber.png differ
diff --git a/public/images/emoji/apple/baseball.png b/public/images/emoji/apple/baseball.png
index dcea0321561..66b419a800a 100644
Binary files a/public/images/emoji/apple/baseball.png and b/public/images/emoji/apple/baseball.png differ
diff --git a/public/images/emoji/apple/basketball.png b/public/images/emoji/apple/basketball.png
index c70ae0922ec..d4e540e6ac7 100644
Binary files a/public/images/emoji/apple/basketball.png and b/public/images/emoji/apple/basketball.png differ
diff --git a/public/images/emoji/apple/basketball_man.png b/public/images/emoji/apple/basketball_man.png
index 2476fa9f0cb..4042beb4cf9 100644
Binary files a/public/images/emoji/apple/basketball_man.png and b/public/images/emoji/apple/basketball_man.png differ
diff --git a/public/images/emoji/apple/basketball_man/2.png b/public/images/emoji/apple/basketball_man/2.png
index dbec120de00..0b3d7dd7007 100644
Binary files a/public/images/emoji/apple/basketball_man/2.png and b/public/images/emoji/apple/basketball_man/2.png differ
diff --git a/public/images/emoji/apple/basketball_man/3.png b/public/images/emoji/apple/basketball_man/3.png
index a9ccd274623..86a756adcd2 100644
Binary files a/public/images/emoji/apple/basketball_man/3.png and b/public/images/emoji/apple/basketball_man/3.png differ
diff --git a/public/images/emoji/apple/basketball_man/4.png b/public/images/emoji/apple/basketball_man/4.png
index 079cd2a900b..346d2717f04 100644
Binary files a/public/images/emoji/apple/basketball_man/4.png and b/public/images/emoji/apple/basketball_man/4.png differ
diff --git a/public/images/emoji/apple/basketball_man/5.png b/public/images/emoji/apple/basketball_man/5.png
index 905f5af468e..a81c9535e2f 100644
Binary files a/public/images/emoji/apple/basketball_man/5.png and b/public/images/emoji/apple/basketball_man/5.png differ
diff --git a/public/images/emoji/apple/basketball_man/6.png b/public/images/emoji/apple/basketball_man/6.png
index c03789f5d05..2e7dd95ce85 100644
Binary files a/public/images/emoji/apple/basketball_man/6.png and b/public/images/emoji/apple/basketball_man/6.png differ
diff --git a/public/images/emoji/apple/basketball_player.png b/public/images/emoji/apple/basketball_player.png
index 2476fa9f0cb..4042beb4cf9 100644
Binary files a/public/images/emoji/apple/basketball_player.png and b/public/images/emoji/apple/basketball_player.png differ
diff --git a/public/images/emoji/apple/basketball_player/2.png b/public/images/emoji/apple/basketball_player/2.png
index dbec120de00..0b3d7dd7007 100644
Binary files a/public/images/emoji/apple/basketball_player/2.png and b/public/images/emoji/apple/basketball_player/2.png differ
diff --git a/public/images/emoji/apple/basketball_player/3.png b/public/images/emoji/apple/basketball_player/3.png
index a9ccd274623..86a756adcd2 100644
Binary files a/public/images/emoji/apple/basketball_player/3.png and b/public/images/emoji/apple/basketball_player/3.png differ
diff --git a/public/images/emoji/apple/basketball_player/4.png b/public/images/emoji/apple/basketball_player/4.png
index 079cd2a900b..346d2717f04 100644
Binary files a/public/images/emoji/apple/basketball_player/4.png and b/public/images/emoji/apple/basketball_player/4.png differ
diff --git a/public/images/emoji/apple/basketball_player/5.png b/public/images/emoji/apple/basketball_player/5.png
index 905f5af468e..a81c9535e2f 100644
Binary files a/public/images/emoji/apple/basketball_player/5.png and b/public/images/emoji/apple/basketball_player/5.png differ
diff --git a/public/images/emoji/apple/basketball_player/6.png b/public/images/emoji/apple/basketball_player/6.png
index c03789f5d05..2e7dd95ce85 100644
Binary files a/public/images/emoji/apple/basketball_player/6.png and b/public/images/emoji/apple/basketball_player/6.png differ
diff --git a/public/images/emoji/apple/basketball_woman.png b/public/images/emoji/apple/basketball_woman.png
index 306605a0f3f..cdb67736d4c 100644
Binary files a/public/images/emoji/apple/basketball_woman.png and b/public/images/emoji/apple/basketball_woman.png differ
diff --git a/public/images/emoji/apple/bat.png b/public/images/emoji/apple/bat.png
index 09f7b29e62b..508996736cc 100644
Binary files a/public/images/emoji/apple/bat.png and b/public/images/emoji/apple/bat.png differ
diff --git a/public/images/emoji/apple/bath.png b/public/images/emoji/apple/bath.png
index 9f53db4728e..b49378707ee 100644
Binary files a/public/images/emoji/apple/bath.png and b/public/images/emoji/apple/bath.png differ
diff --git a/public/images/emoji/apple/bath/2.png b/public/images/emoji/apple/bath/2.png
index 6f10b75f665..429032da3c3 100644
Binary files a/public/images/emoji/apple/bath/2.png and b/public/images/emoji/apple/bath/2.png differ
diff --git a/public/images/emoji/apple/bath/3.png b/public/images/emoji/apple/bath/3.png
index e75d9ac22ab..e38d2d04021 100644
Binary files a/public/images/emoji/apple/bath/3.png and b/public/images/emoji/apple/bath/3.png differ
diff --git a/public/images/emoji/apple/bath/4.png b/public/images/emoji/apple/bath/4.png
index 8b5d4a85e00..95d298fceb4 100644
Binary files a/public/images/emoji/apple/bath/4.png and b/public/images/emoji/apple/bath/4.png differ
diff --git a/public/images/emoji/apple/bath/5.png b/public/images/emoji/apple/bath/5.png
index d70dbc8b132..eb7b44fe4df 100644
Binary files a/public/images/emoji/apple/bath/5.png and b/public/images/emoji/apple/bath/5.png differ
diff --git a/public/images/emoji/apple/bath/6.png b/public/images/emoji/apple/bath/6.png
index be196ac2b43..11f30fbdb9e 100644
Binary files a/public/images/emoji/apple/bath/6.png and b/public/images/emoji/apple/bath/6.png differ
diff --git a/public/images/emoji/apple/bathtub.png b/public/images/emoji/apple/bathtub.png
index 247dbe10992..3c0bbea401a 100644
Binary files a/public/images/emoji/apple/bathtub.png and b/public/images/emoji/apple/bathtub.png differ
diff --git a/public/images/emoji/apple/battery.png b/public/images/emoji/apple/battery.png
index e24a27246af..c67cf8c0a6d 100644
Binary files a/public/images/emoji/apple/battery.png and b/public/images/emoji/apple/battery.png differ
diff --git a/public/images/emoji/apple/beach.png b/public/images/emoji/apple/beach.png
index 1bcdb8de9e3..462496b2414 100644
Binary files a/public/images/emoji/apple/beach.png and b/public/images/emoji/apple/beach.png differ
diff --git a/public/images/emoji/apple/beach_umbrella.png b/public/images/emoji/apple/beach_umbrella.png
index 1bcdb8de9e3..462496b2414 100644
Binary files a/public/images/emoji/apple/beach_umbrella.png and b/public/images/emoji/apple/beach_umbrella.png differ
diff --git a/public/images/emoji/apple/beach_with_umbrella.png b/public/images/emoji/apple/beach_with_umbrella.png
index 1bcdb8de9e3..462496b2414 100644
Binary files a/public/images/emoji/apple/beach_with_umbrella.png and b/public/images/emoji/apple/beach_with_umbrella.png differ
diff --git a/public/images/emoji/apple/bear.png b/public/images/emoji/apple/bear.png
index ec039286658..ba86ac777bf 100644
Binary files a/public/images/emoji/apple/bear.png and b/public/images/emoji/apple/bear.png differ
diff --git a/public/images/emoji/apple/bearded_person.png b/public/images/emoji/apple/bearded_person.png
index ed22a6cb381..22301c9fe5b 100644
Binary files a/public/images/emoji/apple/bearded_person.png and b/public/images/emoji/apple/bearded_person.png differ
diff --git a/public/images/emoji/apple/bearded_person/2.png b/public/images/emoji/apple/bearded_person/2.png
index 4a2fdeb3040..fdee892006f 100644
Binary files a/public/images/emoji/apple/bearded_person/2.png and b/public/images/emoji/apple/bearded_person/2.png differ
diff --git a/public/images/emoji/apple/bearded_person/3.png b/public/images/emoji/apple/bearded_person/3.png
index b1f6e168d7c..fe7757637c3 100644
Binary files a/public/images/emoji/apple/bearded_person/3.png and b/public/images/emoji/apple/bearded_person/3.png differ
diff --git a/public/images/emoji/apple/bearded_person/4.png b/public/images/emoji/apple/bearded_person/4.png
index f75b75a74e9..da463603512 100644
Binary files a/public/images/emoji/apple/bearded_person/4.png and b/public/images/emoji/apple/bearded_person/4.png differ
diff --git a/public/images/emoji/apple/bearded_person/5.png b/public/images/emoji/apple/bearded_person/5.png
index a9665b318a4..498911ad3c5 100644
Binary files a/public/images/emoji/apple/bearded_person/5.png and b/public/images/emoji/apple/bearded_person/5.png differ
diff --git a/public/images/emoji/apple/bearded_person/6.png b/public/images/emoji/apple/bearded_person/6.png
index a42b3caf88c..eaaca23b663 100644
Binary files a/public/images/emoji/apple/bearded_person/6.png and b/public/images/emoji/apple/bearded_person/6.png differ
diff --git a/public/images/emoji/apple/bed.png b/public/images/emoji/apple/bed.png
index e76eafea282..df0bfe3b5e8 100644
Binary files a/public/images/emoji/apple/bed.png and b/public/images/emoji/apple/bed.png differ
diff --git a/public/images/emoji/apple/bee.png b/public/images/emoji/apple/bee.png
index 82d7aa8a5af..d789bcdb795 100644
Binary files a/public/images/emoji/apple/bee.png and b/public/images/emoji/apple/bee.png differ
diff --git a/public/images/emoji/apple/beer.png b/public/images/emoji/apple/beer.png
index dee2a7426ba..8aaa96a236a 100644
Binary files a/public/images/emoji/apple/beer.png and b/public/images/emoji/apple/beer.png differ
diff --git a/public/images/emoji/apple/beers.png b/public/images/emoji/apple/beers.png
index 99347ea51fe..a2821cda607 100644
Binary files a/public/images/emoji/apple/beers.png and b/public/images/emoji/apple/beers.png differ
diff --git a/public/images/emoji/apple/beetle.png b/public/images/emoji/apple/beetle.png
index 2c5f55b06fe..646796ad2ab 100644
Binary files a/public/images/emoji/apple/beetle.png and b/public/images/emoji/apple/beetle.png differ
diff --git a/public/images/emoji/apple/beginner.png b/public/images/emoji/apple/beginner.png
index 6a4f8ce0619..fb2c76ec5fc 100644
Binary files a/public/images/emoji/apple/beginner.png and b/public/images/emoji/apple/beginner.png differ
diff --git a/public/images/emoji/apple/belarus.png b/public/images/emoji/apple/belarus.png
index 359cf42af7b..4c60caffa44 100644
Binary files a/public/images/emoji/apple/belarus.png and b/public/images/emoji/apple/belarus.png differ
diff --git a/public/images/emoji/apple/belgium.png b/public/images/emoji/apple/belgium.png
index 56c56c4fa98..1f1ba2bb77f 100644
Binary files a/public/images/emoji/apple/belgium.png and b/public/images/emoji/apple/belgium.png differ
diff --git a/public/images/emoji/apple/belize.png b/public/images/emoji/apple/belize.png
index 891e7eafa3d..02d4a78a65a 100644
Binary files a/public/images/emoji/apple/belize.png and b/public/images/emoji/apple/belize.png differ
diff --git a/public/images/emoji/apple/bell.png b/public/images/emoji/apple/bell.png
index b90bc772ed5..e388ead5806 100644
Binary files a/public/images/emoji/apple/bell.png and b/public/images/emoji/apple/bell.png differ
diff --git a/public/images/emoji/apple/bellhop.png b/public/images/emoji/apple/bellhop.png
index 69432ddeceb..062081355bd 100644
Binary files a/public/images/emoji/apple/bellhop.png and b/public/images/emoji/apple/bellhop.png differ
diff --git a/public/images/emoji/apple/bellhop_bell.png b/public/images/emoji/apple/bellhop_bell.png
index 69432ddeceb..062081355bd 100644
Binary files a/public/images/emoji/apple/bellhop_bell.png and b/public/images/emoji/apple/bellhop_bell.png differ
diff --git a/public/images/emoji/apple/benin.png b/public/images/emoji/apple/benin.png
index f9e2d82420a..1ef85c92716 100644
Binary files a/public/images/emoji/apple/benin.png and b/public/images/emoji/apple/benin.png differ
diff --git a/public/images/emoji/apple/bento.png b/public/images/emoji/apple/bento.png
index 1f51db409f0..456a32d2dff 100644
Binary files a/public/images/emoji/apple/bento.png and b/public/images/emoji/apple/bento.png differ
diff --git a/public/images/emoji/apple/bermuda.png b/public/images/emoji/apple/bermuda.png
index 396d2a914d3..4bca39c405c 100644
Binary files a/public/images/emoji/apple/bermuda.png and b/public/images/emoji/apple/bermuda.png differ
diff --git a/public/images/emoji/apple/bhutan.png b/public/images/emoji/apple/bhutan.png
index ab0b841e405..d614e3565d9 100644
Binary files a/public/images/emoji/apple/bhutan.png and b/public/images/emoji/apple/bhutan.png differ
diff --git a/public/images/emoji/apple/bicyclist.png b/public/images/emoji/apple/bicyclist.png
index 433c9308a09..140f6eb3c4f 100644
Binary files a/public/images/emoji/apple/bicyclist.png and b/public/images/emoji/apple/bicyclist.png differ
diff --git a/public/images/emoji/apple/bicyclist/2.png b/public/images/emoji/apple/bicyclist/2.png
index 0c78d1fdfb7..1908a967890 100644
Binary files a/public/images/emoji/apple/bicyclist/2.png and b/public/images/emoji/apple/bicyclist/2.png differ
diff --git a/public/images/emoji/apple/bicyclist/3.png b/public/images/emoji/apple/bicyclist/3.png
index c624c80e909..67db5db3e63 100644
Binary files a/public/images/emoji/apple/bicyclist/3.png and b/public/images/emoji/apple/bicyclist/3.png differ
diff --git a/public/images/emoji/apple/bicyclist/4.png b/public/images/emoji/apple/bicyclist/4.png
index e80a3b687ce..0cf4d94d251 100644
Binary files a/public/images/emoji/apple/bicyclist/4.png and b/public/images/emoji/apple/bicyclist/4.png differ
diff --git a/public/images/emoji/apple/bicyclist/5.png b/public/images/emoji/apple/bicyclist/5.png
index 2f1e0bdf294..16f5d2cf70e 100644
Binary files a/public/images/emoji/apple/bicyclist/5.png and b/public/images/emoji/apple/bicyclist/5.png differ
diff --git a/public/images/emoji/apple/bicyclist/6.png b/public/images/emoji/apple/bicyclist/6.png
index c9c8b683186..9be017d4a0d 100644
Binary files a/public/images/emoji/apple/bicyclist/6.png and b/public/images/emoji/apple/bicyclist/6.png differ
diff --git a/public/images/emoji/apple/bike.png b/public/images/emoji/apple/bike.png
index fc80f8e85de..a2d4328b5dc 100644
Binary files a/public/images/emoji/apple/bike.png and b/public/images/emoji/apple/bike.png differ
diff --git a/public/images/emoji/apple/biking_man.png b/public/images/emoji/apple/biking_man.png
index 433c9308a09..140f6eb3c4f 100644
Binary files a/public/images/emoji/apple/biking_man.png and b/public/images/emoji/apple/biking_man.png differ
diff --git a/public/images/emoji/apple/biking_man/2.png b/public/images/emoji/apple/biking_man/2.png
index 0c78d1fdfb7..1908a967890 100644
Binary files a/public/images/emoji/apple/biking_man/2.png and b/public/images/emoji/apple/biking_man/2.png differ
diff --git a/public/images/emoji/apple/biking_man/3.png b/public/images/emoji/apple/biking_man/3.png
index c624c80e909..67db5db3e63 100644
Binary files a/public/images/emoji/apple/biking_man/3.png and b/public/images/emoji/apple/biking_man/3.png differ
diff --git a/public/images/emoji/apple/biking_man/4.png b/public/images/emoji/apple/biking_man/4.png
index e80a3b687ce..0cf4d94d251 100644
Binary files a/public/images/emoji/apple/biking_man/4.png and b/public/images/emoji/apple/biking_man/4.png differ
diff --git a/public/images/emoji/apple/biking_man/5.png b/public/images/emoji/apple/biking_man/5.png
index 2f1e0bdf294..16f5d2cf70e 100644
Binary files a/public/images/emoji/apple/biking_man/5.png and b/public/images/emoji/apple/biking_man/5.png differ
diff --git a/public/images/emoji/apple/biking_man/6.png b/public/images/emoji/apple/biking_man/6.png
index c9c8b683186..9be017d4a0d 100644
Binary files a/public/images/emoji/apple/biking_man/6.png and b/public/images/emoji/apple/biking_man/6.png differ
diff --git a/public/images/emoji/apple/biking_woman.png b/public/images/emoji/apple/biking_woman.png
index d7a39f4be6e..a8ead1e020a 100644
Binary files a/public/images/emoji/apple/biking_woman.png and b/public/images/emoji/apple/biking_woman.png differ
diff --git a/public/images/emoji/apple/biking_woman/2.png b/public/images/emoji/apple/biking_woman/2.png
index e512f6918d6..eb840870ebd 100644
Binary files a/public/images/emoji/apple/biking_woman/2.png and b/public/images/emoji/apple/biking_woman/2.png differ
diff --git a/public/images/emoji/apple/biking_woman/3.png b/public/images/emoji/apple/biking_woman/3.png
index 71cdc8a81b6..d829a507e03 100644
Binary files a/public/images/emoji/apple/biking_woman/3.png and b/public/images/emoji/apple/biking_woman/3.png differ
diff --git a/public/images/emoji/apple/biking_woman/4.png b/public/images/emoji/apple/biking_woman/4.png
index b0b26f4d571..b5ef451fe97 100644
Binary files a/public/images/emoji/apple/biking_woman/4.png and b/public/images/emoji/apple/biking_woman/4.png differ
diff --git a/public/images/emoji/apple/biking_woman/5.png b/public/images/emoji/apple/biking_woman/5.png
index f978924aa03..083925d1a9a 100644
Binary files a/public/images/emoji/apple/biking_woman/5.png and b/public/images/emoji/apple/biking_woman/5.png differ
diff --git a/public/images/emoji/apple/biking_woman/6.png b/public/images/emoji/apple/biking_woman/6.png
index 963e2127eeb..525cb95db6f 100644
Binary files a/public/images/emoji/apple/biking_woman/6.png and b/public/images/emoji/apple/biking_woman/6.png differ
diff --git a/public/images/emoji/apple/bikini.png b/public/images/emoji/apple/bikini.png
index 68581f4ac11..1bc98e79d0f 100644
Binary files a/public/images/emoji/apple/bikini.png and b/public/images/emoji/apple/bikini.png differ
diff --git a/public/images/emoji/apple/billed_cap.png b/public/images/emoji/apple/billed_cap.png
index 5cc92e307e1..b7e9daf21e8 100644
Binary files a/public/images/emoji/apple/billed_cap.png and b/public/images/emoji/apple/billed_cap.png differ
diff --git a/public/images/emoji/apple/biohazard.png b/public/images/emoji/apple/biohazard.png
index f2e5aa7be16..f26364bf7a6 100644
Binary files a/public/images/emoji/apple/biohazard.png and b/public/images/emoji/apple/biohazard.png differ
diff --git a/public/images/emoji/apple/biohazard_sign.png b/public/images/emoji/apple/biohazard_sign.png
index f2e5aa7be16..f26364bf7a6 100644
Binary files a/public/images/emoji/apple/biohazard_sign.png and b/public/images/emoji/apple/biohazard_sign.png differ
diff --git a/public/images/emoji/apple/bird.png b/public/images/emoji/apple/bird.png
index 5eeaa1b1956..0218194ee51 100644
Binary files a/public/images/emoji/apple/bird.png and b/public/images/emoji/apple/bird.png differ
diff --git a/public/images/emoji/apple/birthday.png b/public/images/emoji/apple/birthday.png
index 7ff9d9ef735..09b32e16f4d 100644
Binary files a/public/images/emoji/apple/birthday.png and b/public/images/emoji/apple/birthday.png differ
diff --git a/public/images/emoji/apple/black_circle.png b/public/images/emoji/apple/black_circle.png
index 892b54bc762..e9201adcf3d 100644
Binary files a/public/images/emoji/apple/black_circle.png and b/public/images/emoji/apple/black_circle.png differ
diff --git a/public/images/emoji/apple/black_flag.png b/public/images/emoji/apple/black_flag.png
index 36a0a6987d1..eefde1e3330 100644
Binary files a/public/images/emoji/apple/black_flag.png and b/public/images/emoji/apple/black_flag.png differ
diff --git a/public/images/emoji/apple/black_heart.png b/public/images/emoji/apple/black_heart.png
index ccaf467692a..41f01538898 100644
Binary files a/public/images/emoji/apple/black_heart.png and b/public/images/emoji/apple/black_heart.png differ
diff --git a/public/images/emoji/apple/black_joker.png b/public/images/emoji/apple/black_joker.png
index 04612a7f1f7..583d7061e3c 100644
Binary files a/public/images/emoji/apple/black_joker.png and b/public/images/emoji/apple/black_joker.png differ
diff --git a/public/images/emoji/apple/black_large_square.png b/public/images/emoji/apple/black_large_square.png
index b578a1bbc7a..e75349792a8 100644
Binary files a/public/images/emoji/apple/black_large_square.png and b/public/images/emoji/apple/black_large_square.png differ
diff --git a/public/images/emoji/apple/black_medium_small_square.png b/public/images/emoji/apple/black_medium_small_square.png
index f1b82ecfd9c..6e1abb6b038 100644
Binary files a/public/images/emoji/apple/black_medium_small_square.png and b/public/images/emoji/apple/black_medium_small_square.png differ
diff --git a/public/images/emoji/apple/black_medium_square.png b/public/images/emoji/apple/black_medium_square.png
index 7aa31112428..681aa406bb5 100644
Binary files a/public/images/emoji/apple/black_medium_square.png and b/public/images/emoji/apple/black_medium_square.png differ
diff --git a/public/images/emoji/apple/black_nib.png b/public/images/emoji/apple/black_nib.png
index a728708b976..86a96ffecfd 100644
Binary files a/public/images/emoji/apple/black_nib.png and b/public/images/emoji/apple/black_nib.png differ
diff --git a/public/images/emoji/apple/black_small_square.png b/public/images/emoji/apple/black_small_square.png
index b49a1e165e4..cec05706c3a 100644
Binary files a/public/images/emoji/apple/black_small_square.png and b/public/images/emoji/apple/black_small_square.png differ
diff --git a/public/images/emoji/apple/black_square_button.png b/public/images/emoji/apple/black_square_button.png
index dada1ab8b88..e5814ce9b9e 100644
Binary files a/public/images/emoji/apple/black_square_button.png and b/public/images/emoji/apple/black_square_button.png differ
diff --git a/public/images/emoji/apple/blonde_man.png b/public/images/emoji/apple/blonde_man.png
index 005aeefedaa..3e55c236bd5 100644
Binary files a/public/images/emoji/apple/blonde_man.png and b/public/images/emoji/apple/blonde_man.png differ
diff --git a/public/images/emoji/apple/blonde_man/2.png b/public/images/emoji/apple/blonde_man/2.png
index 9e43423fdb2..37485d0441d 100644
Binary files a/public/images/emoji/apple/blonde_man/2.png and b/public/images/emoji/apple/blonde_man/2.png differ
diff --git a/public/images/emoji/apple/blonde_man/3.png b/public/images/emoji/apple/blonde_man/3.png
index b36f1a69db6..bf476cdb356 100644
Binary files a/public/images/emoji/apple/blonde_man/3.png and b/public/images/emoji/apple/blonde_man/3.png differ
diff --git a/public/images/emoji/apple/blonde_man/4.png b/public/images/emoji/apple/blonde_man/4.png
index 901dfcaa062..ce20be9d4ad 100644
Binary files a/public/images/emoji/apple/blonde_man/4.png and b/public/images/emoji/apple/blonde_man/4.png differ
diff --git a/public/images/emoji/apple/blonde_man/5.png b/public/images/emoji/apple/blonde_man/5.png
index 5aaa84154a1..27081164a48 100644
Binary files a/public/images/emoji/apple/blonde_man/5.png and b/public/images/emoji/apple/blonde_man/5.png differ
diff --git a/public/images/emoji/apple/blonde_man/6.png b/public/images/emoji/apple/blonde_man/6.png
index 261b2470e3b..0f1f88f9d42 100644
Binary files a/public/images/emoji/apple/blonde_man/6.png and b/public/images/emoji/apple/blonde_man/6.png differ
diff --git a/public/images/emoji/apple/blonde_woman.png b/public/images/emoji/apple/blonde_woman.png
index 1583be196e0..fd135c84544 100644
Binary files a/public/images/emoji/apple/blonde_woman.png and b/public/images/emoji/apple/blonde_woman.png differ
diff --git a/public/images/emoji/apple/blonde_woman/2.png b/public/images/emoji/apple/blonde_woman/2.png
index 9c514ac5fb4..27674c491e1 100644
Binary files a/public/images/emoji/apple/blonde_woman/2.png and b/public/images/emoji/apple/blonde_woman/2.png differ
diff --git a/public/images/emoji/apple/blonde_woman/3.png b/public/images/emoji/apple/blonde_woman/3.png
index 22de69e3d68..5d369560c04 100644
Binary files a/public/images/emoji/apple/blonde_woman/3.png and b/public/images/emoji/apple/blonde_woman/3.png differ
diff --git a/public/images/emoji/apple/blonde_woman/4.png b/public/images/emoji/apple/blonde_woman/4.png
index 7ca9f739c3b..716c4366122 100644
Binary files a/public/images/emoji/apple/blonde_woman/4.png and b/public/images/emoji/apple/blonde_woman/4.png differ
diff --git a/public/images/emoji/apple/blonde_woman/5.png b/public/images/emoji/apple/blonde_woman/5.png
index b2add0bfd7e..ee83222f709 100644
Binary files a/public/images/emoji/apple/blonde_woman/5.png and b/public/images/emoji/apple/blonde_woman/5.png differ
diff --git a/public/images/emoji/apple/blonde_woman/6.png b/public/images/emoji/apple/blonde_woman/6.png
index 741e10610e6..8c318b40997 100644
Binary files a/public/images/emoji/apple/blonde_woman/6.png and b/public/images/emoji/apple/blonde_woman/6.png differ
diff --git a/public/images/emoji/apple/blossom.png b/public/images/emoji/apple/blossom.png
index 7f7f7dd87fd..87ce379e9d1 100644
Binary files a/public/images/emoji/apple/blossom.png and b/public/images/emoji/apple/blossom.png differ
diff --git a/public/images/emoji/apple/blowfish.png b/public/images/emoji/apple/blowfish.png
index 21cea90fdfc..ed60968b6cb 100644
Binary files a/public/images/emoji/apple/blowfish.png and b/public/images/emoji/apple/blowfish.png differ
diff --git a/public/images/emoji/apple/blue_book.png b/public/images/emoji/apple/blue_book.png
index 71b8ff1069c..463a48b1d78 100644
Binary files a/public/images/emoji/apple/blue_book.png and b/public/images/emoji/apple/blue_book.png differ
diff --git a/public/images/emoji/apple/blue_car.png b/public/images/emoji/apple/blue_car.png
index 8fb4c4f6308..7215e8d868b 100644
Binary files a/public/images/emoji/apple/blue_car.png and b/public/images/emoji/apple/blue_car.png differ
diff --git a/public/images/emoji/apple/blue_heart.png b/public/images/emoji/apple/blue_heart.png
index 40b4db9b90b..0f1fe6a95ce 100644
Binary files a/public/images/emoji/apple/blue_heart.png and b/public/images/emoji/apple/blue_heart.png differ
diff --git a/public/images/emoji/apple/blush.png b/public/images/emoji/apple/blush.png
index 4bb9798c5bd..8b014a2afe4 100644
Binary files a/public/images/emoji/apple/blush.png and b/public/images/emoji/apple/blush.png differ
diff --git a/public/images/emoji/apple/boar.png b/public/images/emoji/apple/boar.png
index 79cfdfedb8f..f75e56344bb 100644
Binary files a/public/images/emoji/apple/boar.png and b/public/images/emoji/apple/boar.png differ
diff --git a/public/images/emoji/apple/boat.png b/public/images/emoji/apple/boat.png
index 1fe5602cc5f..2560fe0ef3b 100644
Binary files a/public/images/emoji/apple/boat.png and b/public/images/emoji/apple/boat.png differ
diff --git a/public/images/emoji/apple/bolivia.png b/public/images/emoji/apple/bolivia.png
index ff8bc0a0538..2345a2d559c 100644
Binary files a/public/images/emoji/apple/bolivia.png and b/public/images/emoji/apple/bolivia.png differ
diff --git a/public/images/emoji/apple/bomb.png b/public/images/emoji/apple/bomb.png
index 52472c16322..28619d8232a 100644
Binary files a/public/images/emoji/apple/bomb.png and b/public/images/emoji/apple/bomb.png differ
diff --git a/public/images/emoji/apple/book.png b/public/images/emoji/apple/book.png
index fd8d428a74a..8a53f9f32c7 100644
Binary files a/public/images/emoji/apple/book.png and b/public/images/emoji/apple/book.png differ
diff --git a/public/images/emoji/apple/bookmark.png b/public/images/emoji/apple/bookmark.png
index 7107c3db76b..cac2b8ab590 100644
Binary files a/public/images/emoji/apple/bookmark.png and b/public/images/emoji/apple/bookmark.png differ
diff --git a/public/images/emoji/apple/bookmark_tabs.png b/public/images/emoji/apple/bookmark_tabs.png
index 1728a4e9f78..1ed1abe7824 100644
Binary files a/public/images/emoji/apple/bookmark_tabs.png and b/public/images/emoji/apple/bookmark_tabs.png differ
diff --git a/public/images/emoji/apple/books.png b/public/images/emoji/apple/books.png
index 77198ad1955..d257e736803 100644
Binary files a/public/images/emoji/apple/books.png and b/public/images/emoji/apple/books.png differ
diff --git a/public/images/emoji/apple/boom.png b/public/images/emoji/apple/boom.png
index 9028c3d9fd8..02765b1b6f3 100644
Binary files a/public/images/emoji/apple/boom.png and b/public/images/emoji/apple/boom.png differ
diff --git a/public/images/emoji/apple/boot.png b/public/images/emoji/apple/boot.png
index 2af53fd8c19..3c141b5bc64 100644
Binary files a/public/images/emoji/apple/boot.png and b/public/images/emoji/apple/boot.png differ
diff --git a/public/images/emoji/apple/bosnia_herzegovina.png b/public/images/emoji/apple/bosnia_herzegovina.png
index 9dde1447db0..a52a787ef2d 100644
Binary files a/public/images/emoji/apple/bosnia_herzegovina.png and b/public/images/emoji/apple/bosnia_herzegovina.png differ
diff --git a/public/images/emoji/apple/botswana.png b/public/images/emoji/apple/botswana.png
index b9daaed0507..ad3ca997269 100644
Binary files a/public/images/emoji/apple/botswana.png and b/public/images/emoji/apple/botswana.png differ
diff --git a/public/images/emoji/apple/bottle_with_popping_cork.png b/public/images/emoji/apple/bottle_with_popping_cork.png
index 897fc5b3412..59f57a0b0f6 100644
Binary files a/public/images/emoji/apple/bottle_with_popping_cork.png and b/public/images/emoji/apple/bottle_with_popping_cork.png differ
diff --git a/public/images/emoji/apple/bouquet.png b/public/images/emoji/apple/bouquet.png
index 7267e7ca707..68b4f5c3bf8 100644
Binary files a/public/images/emoji/apple/bouquet.png and b/public/images/emoji/apple/bouquet.png differ
diff --git a/public/images/emoji/apple/bouvet_island.png b/public/images/emoji/apple/bouvet_island.png
index 5827a3d3767..17fda5559aa 100644
Binary files a/public/images/emoji/apple/bouvet_island.png and b/public/images/emoji/apple/bouvet_island.png differ
diff --git a/public/images/emoji/apple/bow.png b/public/images/emoji/apple/bow.png
index fa7f1869243..8bd246347a7 100644
Binary files a/public/images/emoji/apple/bow.png and b/public/images/emoji/apple/bow.png differ
diff --git a/public/images/emoji/apple/bow/2.png b/public/images/emoji/apple/bow/2.png
index e484dc4efe7..82a097f2feb 100644
Binary files a/public/images/emoji/apple/bow/2.png and b/public/images/emoji/apple/bow/2.png differ
diff --git a/public/images/emoji/apple/bow/3.png b/public/images/emoji/apple/bow/3.png
index 952f744efeb..c76a0261a89 100644
Binary files a/public/images/emoji/apple/bow/3.png and b/public/images/emoji/apple/bow/3.png differ
diff --git a/public/images/emoji/apple/bow/4.png b/public/images/emoji/apple/bow/4.png
index 7e7b4cc6f18..54a20eda7aa 100644
Binary files a/public/images/emoji/apple/bow/4.png and b/public/images/emoji/apple/bow/4.png differ
diff --git a/public/images/emoji/apple/bow/5.png b/public/images/emoji/apple/bow/5.png
index 6e317e21b8c..bc1d6ef537c 100644
Binary files a/public/images/emoji/apple/bow/5.png and b/public/images/emoji/apple/bow/5.png differ
diff --git a/public/images/emoji/apple/bow/6.png b/public/images/emoji/apple/bow/6.png
index 8162c9ec2ba..2d9683c2cf8 100644
Binary files a/public/images/emoji/apple/bow/6.png and b/public/images/emoji/apple/bow/6.png differ
diff --git a/public/images/emoji/apple/bow_and_arrow.png b/public/images/emoji/apple/bow_and_arrow.png
index 58c5e9f05ac..b31e09120d0 100644
Binary files a/public/images/emoji/apple/bow_and_arrow.png and b/public/images/emoji/apple/bow_and_arrow.png differ
diff --git a/public/images/emoji/apple/bowing_man.png b/public/images/emoji/apple/bowing_man.png
index fa7f1869243..8bd246347a7 100644
Binary files a/public/images/emoji/apple/bowing_man.png and b/public/images/emoji/apple/bowing_man.png differ
diff --git a/public/images/emoji/apple/bowing_man/2.png b/public/images/emoji/apple/bowing_man/2.png
index e484dc4efe7..82a097f2feb 100644
Binary files a/public/images/emoji/apple/bowing_man/2.png and b/public/images/emoji/apple/bowing_man/2.png differ
diff --git a/public/images/emoji/apple/bowing_man/3.png b/public/images/emoji/apple/bowing_man/3.png
index 952f744efeb..c76a0261a89 100644
Binary files a/public/images/emoji/apple/bowing_man/3.png and b/public/images/emoji/apple/bowing_man/3.png differ
diff --git a/public/images/emoji/apple/bowing_man/4.png b/public/images/emoji/apple/bowing_man/4.png
index 7e7b4cc6f18..54a20eda7aa 100644
Binary files a/public/images/emoji/apple/bowing_man/4.png and b/public/images/emoji/apple/bowing_man/4.png differ
diff --git a/public/images/emoji/apple/bowing_man/5.png b/public/images/emoji/apple/bowing_man/5.png
index 6e317e21b8c..bc1d6ef537c 100644
Binary files a/public/images/emoji/apple/bowing_man/5.png and b/public/images/emoji/apple/bowing_man/5.png differ
diff --git a/public/images/emoji/apple/bowing_man/6.png b/public/images/emoji/apple/bowing_man/6.png
index 8162c9ec2ba..2d9683c2cf8 100644
Binary files a/public/images/emoji/apple/bowing_man/6.png and b/public/images/emoji/apple/bowing_man/6.png differ
diff --git a/public/images/emoji/apple/bowing_woman.png b/public/images/emoji/apple/bowing_woman.png
index b7917817551..17e888d7fc3 100644
Binary files a/public/images/emoji/apple/bowing_woman.png and b/public/images/emoji/apple/bowing_woman.png differ
diff --git a/public/images/emoji/apple/bowing_woman/2.png b/public/images/emoji/apple/bowing_woman/2.png
index 887b1e699bb..e1413ac1e3a 100644
Binary files a/public/images/emoji/apple/bowing_woman/2.png and b/public/images/emoji/apple/bowing_woman/2.png differ
diff --git a/public/images/emoji/apple/bowing_woman/3.png b/public/images/emoji/apple/bowing_woman/3.png
index 9a8210b8a22..1dea9bbfe49 100644
Binary files a/public/images/emoji/apple/bowing_woman/3.png and b/public/images/emoji/apple/bowing_woman/3.png differ
diff --git a/public/images/emoji/apple/bowing_woman/4.png b/public/images/emoji/apple/bowing_woman/4.png
index f91db444962..380599b5e1e 100644
Binary files a/public/images/emoji/apple/bowing_woman/4.png and b/public/images/emoji/apple/bowing_woman/4.png differ
diff --git a/public/images/emoji/apple/bowing_woman/5.png b/public/images/emoji/apple/bowing_woman/5.png
index cb0a2271395..43ff71ee349 100644
Binary files a/public/images/emoji/apple/bowing_woman/5.png and b/public/images/emoji/apple/bowing_woman/5.png differ
diff --git a/public/images/emoji/apple/bowing_woman/6.png b/public/images/emoji/apple/bowing_woman/6.png
index 87c4e450ebd..e7502cb07fd 100644
Binary files a/public/images/emoji/apple/bowing_woman/6.png and b/public/images/emoji/apple/bowing_woman/6.png differ
diff --git a/public/images/emoji/apple/bowl_with_spoon.png b/public/images/emoji/apple/bowl_with_spoon.png
index b0d88a73b9d..7273893c456 100644
Binary files a/public/images/emoji/apple/bowl_with_spoon.png and b/public/images/emoji/apple/bowl_with_spoon.png differ
diff --git a/public/images/emoji/apple/bowling.png b/public/images/emoji/apple/bowling.png
index bb1166501e4..88a2d8970c0 100644
Binary files a/public/images/emoji/apple/bowling.png and b/public/images/emoji/apple/bowling.png differ
diff --git a/public/images/emoji/apple/boxing_glove.png b/public/images/emoji/apple/boxing_glove.png
index 7d96edb1b3c..0d2b0bcc2f3 100644
Binary files a/public/images/emoji/apple/boxing_glove.png and b/public/images/emoji/apple/boxing_glove.png differ
diff --git a/public/images/emoji/apple/boy.png b/public/images/emoji/apple/boy.png
index 13a327586dd..d5a5bda1543 100644
Binary files a/public/images/emoji/apple/boy.png and b/public/images/emoji/apple/boy.png differ
diff --git a/public/images/emoji/apple/boy/2.png b/public/images/emoji/apple/boy/2.png
index 8dfe24684a3..3b60bc9ed3d 100644
Binary files a/public/images/emoji/apple/boy/2.png and b/public/images/emoji/apple/boy/2.png differ
diff --git a/public/images/emoji/apple/boy/3.png b/public/images/emoji/apple/boy/3.png
index 6eb54dbe510..55906e97ee5 100644
Binary files a/public/images/emoji/apple/boy/3.png and b/public/images/emoji/apple/boy/3.png differ
diff --git a/public/images/emoji/apple/boy/4.png b/public/images/emoji/apple/boy/4.png
index 5b4dcc1c08f..4db107fc3cc 100644
Binary files a/public/images/emoji/apple/boy/4.png and b/public/images/emoji/apple/boy/4.png differ
diff --git a/public/images/emoji/apple/boy/5.png b/public/images/emoji/apple/boy/5.png
index dba107efaf2..e615d2aefdd 100644
Binary files a/public/images/emoji/apple/boy/5.png and b/public/images/emoji/apple/boy/5.png differ
diff --git a/public/images/emoji/apple/boy/6.png b/public/images/emoji/apple/boy/6.png
index 59c5d57bb74..9f3e71bc3d9 100644
Binary files a/public/images/emoji/apple/boy/6.png and b/public/images/emoji/apple/boy/6.png differ
diff --git a/public/images/emoji/apple/brain.png b/public/images/emoji/apple/brain.png
index c8e889faecf..933eb5c2922 100644
Binary files a/public/images/emoji/apple/brain.png and b/public/images/emoji/apple/brain.png differ
diff --git a/public/images/emoji/apple/brazil.png b/public/images/emoji/apple/brazil.png
index d14af58f546..960899fe8d9 100644
Binary files a/public/images/emoji/apple/brazil.png and b/public/images/emoji/apple/brazil.png differ
diff --git a/public/images/emoji/apple/bread.png b/public/images/emoji/apple/bread.png
index 50c753d9624..875f44ba64f 100644
Binary files a/public/images/emoji/apple/bread.png and b/public/images/emoji/apple/bread.png differ
diff --git a/public/images/emoji/apple/breast_feeding.png b/public/images/emoji/apple/breast_feeding.png
index 815538138bf..0e6a0d67756 100644
Binary files a/public/images/emoji/apple/breast_feeding.png and b/public/images/emoji/apple/breast_feeding.png differ
diff --git a/public/images/emoji/apple/breast_feeding/2.png b/public/images/emoji/apple/breast_feeding/2.png
index fb591aa4fb4..112d254d707 100644
Binary files a/public/images/emoji/apple/breast_feeding/2.png and b/public/images/emoji/apple/breast_feeding/2.png differ
diff --git a/public/images/emoji/apple/breast_feeding/3.png b/public/images/emoji/apple/breast_feeding/3.png
index 5adcffa4b94..7a8cddb1862 100644
Binary files a/public/images/emoji/apple/breast_feeding/3.png and b/public/images/emoji/apple/breast_feeding/3.png differ
diff --git a/public/images/emoji/apple/breast_feeding/4.png b/public/images/emoji/apple/breast_feeding/4.png
index d166f981b24..91e1acab2cb 100644
Binary files a/public/images/emoji/apple/breast_feeding/4.png and b/public/images/emoji/apple/breast_feeding/4.png differ
diff --git a/public/images/emoji/apple/breast_feeding/5.png b/public/images/emoji/apple/breast_feeding/5.png
index 7c8cb50a780..c8b804ea48e 100644
Binary files a/public/images/emoji/apple/breast_feeding/5.png and b/public/images/emoji/apple/breast_feeding/5.png differ
diff --git a/public/images/emoji/apple/breast_feeding/6.png b/public/images/emoji/apple/breast_feeding/6.png
index e113d8cb428..e92c87a660a 100644
Binary files a/public/images/emoji/apple/breast_feeding/6.png and b/public/images/emoji/apple/breast_feeding/6.png differ
diff --git a/public/images/emoji/apple/bride_with_veil.png b/public/images/emoji/apple/bride_with_veil.png
index f9ce59af3bd..0a960977b69 100644
Binary files a/public/images/emoji/apple/bride_with_veil.png and b/public/images/emoji/apple/bride_with_veil.png differ
diff --git a/public/images/emoji/apple/bride_with_veil/2.png b/public/images/emoji/apple/bride_with_veil/2.png
index 5cd877c475a..8bee9d40284 100644
Binary files a/public/images/emoji/apple/bride_with_veil/2.png and b/public/images/emoji/apple/bride_with_veil/2.png differ
diff --git a/public/images/emoji/apple/bride_with_veil/3.png b/public/images/emoji/apple/bride_with_veil/3.png
index be044be6e7a..142ca6d974a 100644
Binary files a/public/images/emoji/apple/bride_with_veil/3.png and b/public/images/emoji/apple/bride_with_veil/3.png differ
diff --git a/public/images/emoji/apple/bride_with_veil/4.png b/public/images/emoji/apple/bride_with_veil/4.png
index bb2f7557b0c..e0585009c95 100644
Binary files a/public/images/emoji/apple/bride_with_veil/4.png and b/public/images/emoji/apple/bride_with_veil/4.png differ
diff --git a/public/images/emoji/apple/bride_with_veil/5.png b/public/images/emoji/apple/bride_with_veil/5.png
index 3e8f677695d..009d791823f 100644
Binary files a/public/images/emoji/apple/bride_with_veil/5.png and b/public/images/emoji/apple/bride_with_veil/5.png differ
diff --git a/public/images/emoji/apple/bride_with_veil/6.png b/public/images/emoji/apple/bride_with_veil/6.png
index 32aa1a28b93..c217b7df6b7 100644
Binary files a/public/images/emoji/apple/bride_with_veil/6.png and b/public/images/emoji/apple/bride_with_veil/6.png differ
diff --git a/public/images/emoji/apple/bridge_at_night.png b/public/images/emoji/apple/bridge_at_night.png
index da38bbb900b..4f281b930e5 100644
Binary files a/public/images/emoji/apple/bridge_at_night.png and b/public/images/emoji/apple/bridge_at_night.png differ
diff --git a/public/images/emoji/apple/briefcase.png b/public/images/emoji/apple/briefcase.png
index 81d37723450..3276acb61e5 100644
Binary files a/public/images/emoji/apple/briefcase.png and b/public/images/emoji/apple/briefcase.png differ
diff --git a/public/images/emoji/apple/british_indian_ocean_territory.png b/public/images/emoji/apple/british_indian_ocean_territory.png
index 1008c45a457..2075d403af3 100644
Binary files a/public/images/emoji/apple/british_indian_ocean_territory.png and b/public/images/emoji/apple/british_indian_ocean_territory.png differ
diff --git a/public/images/emoji/apple/british_virgin_islands.png b/public/images/emoji/apple/british_virgin_islands.png
index 47312797938..01fb6fd5208 100644
Binary files a/public/images/emoji/apple/british_virgin_islands.png and b/public/images/emoji/apple/british_virgin_islands.png differ
diff --git a/public/images/emoji/apple/broccoli.png b/public/images/emoji/apple/broccoli.png
index 5e03a6d23ba..0f66b78d7dd 100644
Binary files a/public/images/emoji/apple/broccoli.png and b/public/images/emoji/apple/broccoli.png differ
diff --git a/public/images/emoji/apple/broken_heart.png b/public/images/emoji/apple/broken_heart.png
index 86e08db519a..8e2398f05c5 100644
Binary files a/public/images/emoji/apple/broken_heart.png and b/public/images/emoji/apple/broken_heart.png differ
diff --git a/public/images/emoji/apple/brunei.png b/public/images/emoji/apple/brunei.png
index 0bc99e219b7..e8b7715a1db 100644
Binary files a/public/images/emoji/apple/brunei.png and b/public/images/emoji/apple/brunei.png differ
diff --git a/public/images/emoji/apple/bug.png b/public/images/emoji/apple/bug.png
index 3bb41a0c2c1..e5122778dba 100644
Binary files a/public/images/emoji/apple/bug.png and b/public/images/emoji/apple/bug.png differ
diff --git a/public/images/emoji/apple/building_construction.png b/public/images/emoji/apple/building_construction.png
index caad1ac1287..acf077964e0 100644
Binary files a/public/images/emoji/apple/building_construction.png and b/public/images/emoji/apple/building_construction.png differ
diff --git a/public/images/emoji/apple/bulb.png b/public/images/emoji/apple/bulb.png
index 3a0343e1333..b46b9e7c109 100644
Binary files a/public/images/emoji/apple/bulb.png and b/public/images/emoji/apple/bulb.png differ
diff --git a/public/images/emoji/apple/bulgaria.png b/public/images/emoji/apple/bulgaria.png
index 92bad97fab6..1c5ebc46fbc 100644
Binary files a/public/images/emoji/apple/bulgaria.png and b/public/images/emoji/apple/bulgaria.png differ
diff --git a/public/images/emoji/apple/bullettrain_front.png b/public/images/emoji/apple/bullettrain_front.png
index 55752567d54..bea7cd3bfaa 100644
Binary files a/public/images/emoji/apple/bullettrain_front.png and b/public/images/emoji/apple/bullettrain_front.png differ
diff --git a/public/images/emoji/apple/bullettrain_side.png b/public/images/emoji/apple/bullettrain_side.png
index 7fe88b489d3..99df68884d4 100644
Binary files a/public/images/emoji/apple/bullettrain_side.png and b/public/images/emoji/apple/bullettrain_side.png differ
diff --git a/public/images/emoji/apple/burkina_faso.png b/public/images/emoji/apple/burkina_faso.png
index 61fac3c6697..9f81a52bc54 100644
Binary files a/public/images/emoji/apple/burkina_faso.png and b/public/images/emoji/apple/burkina_faso.png differ
diff --git a/public/images/emoji/apple/burrito.png b/public/images/emoji/apple/burrito.png
index c85491514d7..0c0a9acf8ef 100644
Binary files a/public/images/emoji/apple/burrito.png and b/public/images/emoji/apple/burrito.png differ
diff --git a/public/images/emoji/apple/burundi.png b/public/images/emoji/apple/burundi.png
index e029433553e..0bad9697309 100644
Binary files a/public/images/emoji/apple/burundi.png and b/public/images/emoji/apple/burundi.png differ
diff --git a/public/images/emoji/apple/bus.png b/public/images/emoji/apple/bus.png
index 5a47f74a09c..a7dc0d1d527 100644
Binary files a/public/images/emoji/apple/bus.png and b/public/images/emoji/apple/bus.png differ
diff --git a/public/images/emoji/apple/business_suit_levitating.png b/public/images/emoji/apple/business_suit_levitating.png
index 00ae1282f1d..05a2defa5aa 100644
Binary files a/public/images/emoji/apple/business_suit_levitating.png and b/public/images/emoji/apple/business_suit_levitating.png differ
diff --git a/public/images/emoji/apple/business_suit_levitating/2.png b/public/images/emoji/apple/business_suit_levitating/2.png
index 369be947839..4ba7d4edec6 100644
Binary files a/public/images/emoji/apple/business_suit_levitating/2.png and b/public/images/emoji/apple/business_suit_levitating/2.png differ
diff --git a/public/images/emoji/apple/business_suit_levitating/3.png b/public/images/emoji/apple/business_suit_levitating/3.png
index f81f47f2747..4bae1dd918d 100644
Binary files a/public/images/emoji/apple/business_suit_levitating/3.png and b/public/images/emoji/apple/business_suit_levitating/3.png differ
diff --git a/public/images/emoji/apple/business_suit_levitating/4.png b/public/images/emoji/apple/business_suit_levitating/4.png
index b355778d9f6..47922f9af65 100644
Binary files a/public/images/emoji/apple/business_suit_levitating/4.png and b/public/images/emoji/apple/business_suit_levitating/4.png differ
diff --git a/public/images/emoji/apple/business_suit_levitating/5.png b/public/images/emoji/apple/business_suit_levitating/5.png
index f348ca68e3a..52f0f634a4c 100644
Binary files a/public/images/emoji/apple/business_suit_levitating/5.png and b/public/images/emoji/apple/business_suit_levitating/5.png differ
diff --git a/public/images/emoji/apple/business_suit_levitating/6.png b/public/images/emoji/apple/business_suit_levitating/6.png
index 232f1c2dc26..d96c1e46413 100644
Binary files a/public/images/emoji/apple/business_suit_levitating/6.png and b/public/images/emoji/apple/business_suit_levitating/6.png differ
diff --git a/public/images/emoji/apple/busstop.png b/public/images/emoji/apple/busstop.png
index af813ce4aab..15feed13dee 100644
Binary files a/public/images/emoji/apple/busstop.png and b/public/images/emoji/apple/busstop.png differ
diff --git a/public/images/emoji/apple/bust_in_silhouette.png b/public/images/emoji/apple/bust_in_silhouette.png
index cc514eac845..c94834687b8 100644
Binary files a/public/images/emoji/apple/bust_in_silhouette.png and b/public/images/emoji/apple/bust_in_silhouette.png differ
diff --git a/public/images/emoji/apple/busts_in_silhouette.png b/public/images/emoji/apple/busts_in_silhouette.png
index e6b1ae07834..21146b40800 100644
Binary files a/public/images/emoji/apple/busts_in_silhouette.png and b/public/images/emoji/apple/busts_in_silhouette.png differ
diff --git a/public/images/emoji/apple/butterfly.png b/public/images/emoji/apple/butterfly.png
index baf3480c1b9..8a8593d9aa5 100644
Binary files a/public/images/emoji/apple/butterfly.png and b/public/images/emoji/apple/butterfly.png differ
diff --git a/public/images/emoji/apple/cactus.png b/public/images/emoji/apple/cactus.png
index 4ae0cca3cdb..dc0c7735f4e 100644
Binary files a/public/images/emoji/apple/cactus.png and b/public/images/emoji/apple/cactus.png differ
diff --git a/public/images/emoji/apple/cake.png b/public/images/emoji/apple/cake.png
index 61ed440e75d..fc4e510a554 100644
Binary files a/public/images/emoji/apple/cake.png and b/public/images/emoji/apple/cake.png differ
diff --git a/public/images/emoji/apple/calendar.png b/public/images/emoji/apple/calendar.png
index a98cef1cd49..f6bebc24617 100644
Binary files a/public/images/emoji/apple/calendar.png and b/public/images/emoji/apple/calendar.png differ
diff --git a/public/images/emoji/apple/calendar_spiral.png b/public/images/emoji/apple/calendar_spiral.png
index 74b98132ddc..0507e0a314e 100644
Binary files a/public/images/emoji/apple/calendar_spiral.png and b/public/images/emoji/apple/calendar_spiral.png differ
diff --git a/public/images/emoji/apple/call_me_hand.png b/public/images/emoji/apple/call_me_hand.png
index 0c58183e411..a886d73a4e0 100644
Binary files a/public/images/emoji/apple/call_me_hand.png and b/public/images/emoji/apple/call_me_hand.png differ
diff --git a/public/images/emoji/apple/call_me_hand/2.png b/public/images/emoji/apple/call_me_hand/2.png
index b29d9c3a9c5..acd60e99ef3 100644
Binary files a/public/images/emoji/apple/call_me_hand/2.png and b/public/images/emoji/apple/call_me_hand/2.png differ
diff --git a/public/images/emoji/apple/call_me_hand/3.png b/public/images/emoji/apple/call_me_hand/3.png
index 6f30225e3a1..bd644f5ef8e 100644
Binary files a/public/images/emoji/apple/call_me_hand/3.png and b/public/images/emoji/apple/call_me_hand/3.png differ
diff --git a/public/images/emoji/apple/call_me_hand/4.png b/public/images/emoji/apple/call_me_hand/4.png
index 42ac3f10636..94697c9ca0c 100644
Binary files a/public/images/emoji/apple/call_me_hand/4.png and b/public/images/emoji/apple/call_me_hand/4.png differ
diff --git a/public/images/emoji/apple/call_me_hand/5.png b/public/images/emoji/apple/call_me_hand/5.png
index 1f766292fa3..483d2b79f3e 100644
Binary files a/public/images/emoji/apple/call_me_hand/5.png and b/public/images/emoji/apple/call_me_hand/5.png differ
diff --git a/public/images/emoji/apple/call_me_hand/6.png b/public/images/emoji/apple/call_me_hand/6.png
index ff0ce24b2bd..88c37230578 100644
Binary files a/public/images/emoji/apple/call_me_hand/6.png and b/public/images/emoji/apple/call_me_hand/6.png differ
diff --git a/public/images/emoji/apple/calling.png b/public/images/emoji/apple/calling.png
index ae1e525fea8..7adcea9a1f1 100644
Binary files a/public/images/emoji/apple/calling.png and b/public/images/emoji/apple/calling.png differ
diff --git a/public/images/emoji/apple/cambodia.png b/public/images/emoji/apple/cambodia.png
index c5ee376139c..ef41c3da6a7 100644
Binary files a/public/images/emoji/apple/cambodia.png and b/public/images/emoji/apple/cambodia.png differ
diff --git a/public/images/emoji/apple/camel.png b/public/images/emoji/apple/camel.png
index 315595b24f6..0aa4844416f 100644
Binary files a/public/images/emoji/apple/camel.png and b/public/images/emoji/apple/camel.png differ
diff --git a/public/images/emoji/apple/camera.png b/public/images/emoji/apple/camera.png
index 14ef5fd4761..30fb8511c2a 100644
Binary files a/public/images/emoji/apple/camera.png and b/public/images/emoji/apple/camera.png differ
diff --git a/public/images/emoji/apple/camera_flash.png b/public/images/emoji/apple/camera_flash.png
index dcaac46221c..f2c7588cfa5 100644
Binary files a/public/images/emoji/apple/camera_flash.png and b/public/images/emoji/apple/camera_flash.png differ
diff --git a/public/images/emoji/apple/camera_with_flash.png b/public/images/emoji/apple/camera_with_flash.png
index dcaac46221c..f2c7588cfa5 100644
Binary files a/public/images/emoji/apple/camera_with_flash.png and b/public/images/emoji/apple/camera_with_flash.png differ
diff --git a/public/images/emoji/apple/cameroon.png b/public/images/emoji/apple/cameroon.png
index dc6e3db418d..6066a188c14 100644
Binary files a/public/images/emoji/apple/cameroon.png and b/public/images/emoji/apple/cameroon.png differ
diff --git a/public/images/emoji/apple/camping.png b/public/images/emoji/apple/camping.png
index 008e2a2d8eb..60eb6138568 100644
Binary files a/public/images/emoji/apple/camping.png and b/public/images/emoji/apple/camping.png differ
diff --git a/public/images/emoji/apple/canada.png b/public/images/emoji/apple/canada.png
index 85be8280f83..64e80d7d44b 100644
Binary files a/public/images/emoji/apple/canada.png and b/public/images/emoji/apple/canada.png differ
diff --git a/public/images/emoji/apple/canary_islands.png b/public/images/emoji/apple/canary_islands.png
index 9e8edf40ad9..00bbdeebcb0 100644
Binary files a/public/images/emoji/apple/canary_islands.png and b/public/images/emoji/apple/canary_islands.png differ
diff --git a/public/images/emoji/apple/cancer.png b/public/images/emoji/apple/cancer.png
index d081129bbc6..176b91f9521 100644
Binary files a/public/images/emoji/apple/cancer.png and b/public/images/emoji/apple/cancer.png differ
diff --git a/public/images/emoji/apple/candle.png b/public/images/emoji/apple/candle.png
index 5c0b463ff3d..fd7123e659e 100644
Binary files a/public/images/emoji/apple/candle.png and b/public/images/emoji/apple/candle.png differ
diff --git a/public/images/emoji/apple/candy.png b/public/images/emoji/apple/candy.png
index 2e91629c5fe..8d710f5e480 100644
Binary files a/public/images/emoji/apple/candy.png and b/public/images/emoji/apple/candy.png differ
diff --git a/public/images/emoji/apple/canned_food.png b/public/images/emoji/apple/canned_food.png
index 2e5976e9d2f..aab35611959 100644
Binary files a/public/images/emoji/apple/canned_food.png and b/public/images/emoji/apple/canned_food.png differ
diff --git a/public/images/emoji/apple/canoe.png b/public/images/emoji/apple/canoe.png
index fcac299cfac..322506507be 100644
Binary files a/public/images/emoji/apple/canoe.png and b/public/images/emoji/apple/canoe.png differ
diff --git a/public/images/emoji/apple/cape_verde.png b/public/images/emoji/apple/cape_verde.png
index b6f59e377db..b6a2a135dd6 100644
Binary files a/public/images/emoji/apple/cape_verde.png and b/public/images/emoji/apple/cape_verde.png differ
diff --git a/public/images/emoji/apple/capital_abcd.png b/public/images/emoji/apple/capital_abcd.png
index 813ebc7886a..1940b7c72c3 100644
Binary files a/public/images/emoji/apple/capital_abcd.png and b/public/images/emoji/apple/capital_abcd.png differ
diff --git a/public/images/emoji/apple/capricorn.png b/public/images/emoji/apple/capricorn.png
index 8d4950b1824..e3bb4ce5fd9 100644
Binary files a/public/images/emoji/apple/capricorn.png and b/public/images/emoji/apple/capricorn.png differ
diff --git a/public/images/emoji/apple/car.png b/public/images/emoji/apple/car.png
index 80e24f234bc..904a9bbb457 100644
Binary files a/public/images/emoji/apple/car.png and b/public/images/emoji/apple/car.png differ
diff --git a/public/images/emoji/apple/card_box.png b/public/images/emoji/apple/card_box.png
index a0a547ebafe..1b5261a8b37 100644
Binary files a/public/images/emoji/apple/card_box.png and b/public/images/emoji/apple/card_box.png differ
diff --git a/public/images/emoji/apple/card_file_box.png b/public/images/emoji/apple/card_file_box.png
index a0a547ebafe..1b5261a8b37 100644
Binary files a/public/images/emoji/apple/card_file_box.png and b/public/images/emoji/apple/card_file_box.png differ
diff --git a/public/images/emoji/apple/card_index.png b/public/images/emoji/apple/card_index.png
index 6e30338fb6e..f19dd0d4428 100644
Binary files a/public/images/emoji/apple/card_index.png and b/public/images/emoji/apple/card_index.png differ
diff --git a/public/images/emoji/apple/card_index_dividers.png b/public/images/emoji/apple/card_index_dividers.png
index 688e41bb2ff..999e527f400 100644
Binary files a/public/images/emoji/apple/card_index_dividers.png and b/public/images/emoji/apple/card_index_dividers.png differ
diff --git a/public/images/emoji/apple/caribbean_netherlands.png b/public/images/emoji/apple/caribbean_netherlands.png
index f24d3ab5dad..f50c1f036b6 100644
Binary files a/public/images/emoji/apple/caribbean_netherlands.png and b/public/images/emoji/apple/caribbean_netherlands.png differ
diff --git a/public/images/emoji/apple/carousel_horse.png b/public/images/emoji/apple/carousel_horse.png
index 84cc6f420f8..f67bbb6ca05 100644
Binary files a/public/images/emoji/apple/carousel_horse.png and b/public/images/emoji/apple/carousel_horse.png differ
diff --git a/public/images/emoji/apple/carrot.png b/public/images/emoji/apple/carrot.png
index 8d88ed15791..27a0765b4ee 100644
Binary files a/public/images/emoji/apple/carrot.png and b/public/images/emoji/apple/carrot.png differ
diff --git a/public/images/emoji/apple/cat.png b/public/images/emoji/apple/cat.png
index e106ea5da37..7faa953c6dc 100644
Binary files a/public/images/emoji/apple/cat.png and b/public/images/emoji/apple/cat.png differ
diff --git a/public/images/emoji/apple/cat2.png b/public/images/emoji/apple/cat2.png
index d644a17077c..66b0a9d846a 100644
Binary files a/public/images/emoji/apple/cat2.png and b/public/images/emoji/apple/cat2.png differ
diff --git a/public/images/emoji/apple/cayman_islands.png b/public/images/emoji/apple/cayman_islands.png
index b78af60104d..70537592a71 100644
Binary files a/public/images/emoji/apple/cayman_islands.png and b/public/images/emoji/apple/cayman_islands.png differ
diff --git a/public/images/emoji/apple/cd.png b/public/images/emoji/apple/cd.png
index e14cd808bc9..3a778cd202b 100644
Binary files a/public/images/emoji/apple/cd.png and b/public/images/emoji/apple/cd.png differ
diff --git a/public/images/emoji/apple/central_african_republic.png b/public/images/emoji/apple/central_african_republic.png
index 7ead04d8e8a..a880e65a08a 100644
Binary files a/public/images/emoji/apple/central_african_republic.png and b/public/images/emoji/apple/central_african_republic.png differ
diff --git a/public/images/emoji/apple/ceuta_and_melilla.png b/public/images/emoji/apple/ceuta_and_melilla.png
index 8fca1f0390a..186496322aa 100644
Binary files a/public/images/emoji/apple/ceuta_and_melilla.png and b/public/images/emoji/apple/ceuta_and_melilla.png differ
diff --git a/public/images/emoji/apple/chad.png b/public/images/emoji/apple/chad.png
index 9c6d1cce2b5..ff543330eb7 100644
Binary files a/public/images/emoji/apple/chad.png and b/public/images/emoji/apple/chad.png differ
diff --git a/public/images/emoji/apple/chains.png b/public/images/emoji/apple/chains.png
index a223561da73..12bc905a95d 100644
Binary files a/public/images/emoji/apple/chains.png and b/public/images/emoji/apple/chains.png differ
diff --git a/public/images/emoji/apple/champagne.png b/public/images/emoji/apple/champagne.png
index 897fc5b3412..59f57a0b0f6 100644
Binary files a/public/images/emoji/apple/champagne.png and b/public/images/emoji/apple/champagne.png differ
diff --git a/public/images/emoji/apple/chart.png b/public/images/emoji/apple/chart.png
index 87f66213e0d..0564cefeae7 100644
Binary files a/public/images/emoji/apple/chart.png and b/public/images/emoji/apple/chart.png differ
diff --git a/public/images/emoji/apple/chart_with_downwards_trend.png b/public/images/emoji/apple/chart_with_downwards_trend.png
index a592a3b6977..01b905fbca1 100644
Binary files a/public/images/emoji/apple/chart_with_downwards_trend.png and b/public/images/emoji/apple/chart_with_downwards_trend.png differ
diff --git a/public/images/emoji/apple/chart_with_upwards_trend.png b/public/images/emoji/apple/chart_with_upwards_trend.png
index 37d888eceaa..bd204319c03 100644
Binary files a/public/images/emoji/apple/chart_with_upwards_trend.png and b/public/images/emoji/apple/chart_with_upwards_trend.png differ
diff --git a/public/images/emoji/apple/checkered_flag.png b/public/images/emoji/apple/checkered_flag.png
index 0838044fbd8..f79e65f87a4 100644
Binary files a/public/images/emoji/apple/checkered_flag.png and b/public/images/emoji/apple/checkered_flag.png differ
diff --git a/public/images/emoji/apple/cheese.png b/public/images/emoji/apple/cheese.png
index 7b457c211a2..5cb0a81ea12 100644
Binary files a/public/images/emoji/apple/cheese.png and b/public/images/emoji/apple/cheese.png differ
diff --git a/public/images/emoji/apple/cheese_wedge.png b/public/images/emoji/apple/cheese_wedge.png
index 7b457c211a2..5cb0a81ea12 100644
Binary files a/public/images/emoji/apple/cheese_wedge.png and b/public/images/emoji/apple/cheese_wedge.png differ
diff --git a/public/images/emoji/apple/cherries.png b/public/images/emoji/apple/cherries.png
index 3c3684ca2a9..5841f566561 100644
Binary files a/public/images/emoji/apple/cherries.png and b/public/images/emoji/apple/cherries.png differ
diff --git a/public/images/emoji/apple/cherry_blossom.png b/public/images/emoji/apple/cherry_blossom.png
index 749e0109ff7..419b6ca34f0 100644
Binary files a/public/images/emoji/apple/cherry_blossom.png and b/public/images/emoji/apple/cherry_blossom.png differ
diff --git a/public/images/emoji/apple/chestnut.png b/public/images/emoji/apple/chestnut.png
index a427eeb8989..c975b6f93df 100644
Binary files a/public/images/emoji/apple/chestnut.png and b/public/images/emoji/apple/chestnut.png differ
diff --git a/public/images/emoji/apple/chicken.png b/public/images/emoji/apple/chicken.png
index f7b9bde9bc3..88d23a44033 100644
Binary files a/public/images/emoji/apple/chicken.png and b/public/images/emoji/apple/chicken.png differ
diff --git a/public/images/emoji/apple/child.png b/public/images/emoji/apple/child.png
index 33e50494a3a..55446155c6e 100644
Binary files a/public/images/emoji/apple/child.png and b/public/images/emoji/apple/child.png differ
diff --git a/public/images/emoji/apple/child/2.png b/public/images/emoji/apple/child/2.png
index 7a0e4f1cb75..d4f0fcce307 100644
Binary files a/public/images/emoji/apple/child/2.png and b/public/images/emoji/apple/child/2.png differ
diff --git a/public/images/emoji/apple/child/3.png b/public/images/emoji/apple/child/3.png
index 81a69110e9d..d5022c5af91 100644
Binary files a/public/images/emoji/apple/child/3.png and b/public/images/emoji/apple/child/3.png differ
diff --git a/public/images/emoji/apple/child/4.png b/public/images/emoji/apple/child/4.png
index b5c64c9cc84..ff2ab04e9a4 100644
Binary files a/public/images/emoji/apple/child/4.png and b/public/images/emoji/apple/child/4.png differ
diff --git a/public/images/emoji/apple/child/5.png b/public/images/emoji/apple/child/5.png
index 0763a8bd94c..9365581033f 100644
Binary files a/public/images/emoji/apple/child/5.png and b/public/images/emoji/apple/child/5.png differ
diff --git a/public/images/emoji/apple/child/6.png b/public/images/emoji/apple/child/6.png
index 3ed705b9025..7174a7e1236 100644
Binary files a/public/images/emoji/apple/child/6.png and b/public/images/emoji/apple/child/6.png differ
diff --git a/public/images/emoji/apple/children_crossing.png b/public/images/emoji/apple/children_crossing.png
index f19495f8ce6..a2182f281f3 100644
Binary files a/public/images/emoji/apple/children_crossing.png and b/public/images/emoji/apple/children_crossing.png differ
diff --git a/public/images/emoji/apple/chile.png b/public/images/emoji/apple/chile.png
index 0f26ed2a659..f5975c5b0e0 100644
Binary files a/public/images/emoji/apple/chile.png and b/public/images/emoji/apple/chile.png differ
diff --git a/public/images/emoji/apple/chipmunk.png b/public/images/emoji/apple/chipmunk.png
index 80de702c1b3..197f31083d6 100644
Binary files a/public/images/emoji/apple/chipmunk.png and b/public/images/emoji/apple/chipmunk.png differ
diff --git a/public/images/emoji/apple/chocolate_bar.png b/public/images/emoji/apple/chocolate_bar.png
index 06324989309..b9c250ddb68 100644
Binary files a/public/images/emoji/apple/chocolate_bar.png and b/public/images/emoji/apple/chocolate_bar.png differ
diff --git a/public/images/emoji/apple/chopsticks.png b/public/images/emoji/apple/chopsticks.png
index 57064202979..20847ac18ff 100644
Binary files a/public/images/emoji/apple/chopsticks.png and b/public/images/emoji/apple/chopsticks.png differ
diff --git a/public/images/emoji/apple/christmas_island.png b/public/images/emoji/apple/christmas_island.png
index 290b1bf6add..9b0212ad04a 100644
Binary files a/public/images/emoji/apple/christmas_island.png and b/public/images/emoji/apple/christmas_island.png differ
diff --git a/public/images/emoji/apple/christmas_tree.png b/public/images/emoji/apple/christmas_tree.png
index b0faf71d111..8445d042591 100644
Binary files a/public/images/emoji/apple/christmas_tree.png and b/public/images/emoji/apple/christmas_tree.png differ
diff --git a/public/images/emoji/apple/church.png b/public/images/emoji/apple/church.png
index 646fa925465..d60f7c7c4ba 100644
Binary files a/public/images/emoji/apple/church.png and b/public/images/emoji/apple/church.png differ
diff --git a/public/images/emoji/apple/cinema.png b/public/images/emoji/apple/cinema.png
index 186d25a795e..fd3b205a49f 100644
Binary files a/public/images/emoji/apple/cinema.png and b/public/images/emoji/apple/cinema.png differ
diff --git a/public/images/emoji/apple/circus_tent.png b/public/images/emoji/apple/circus_tent.png
index 3825c35f99d..b9108b4a947 100644
Binary files a/public/images/emoji/apple/circus_tent.png and b/public/images/emoji/apple/circus_tent.png differ
diff --git a/public/images/emoji/apple/city_dusk.png b/public/images/emoji/apple/city_dusk.png
index afd1d52ccb2..f785358b2ff 100644
Binary files a/public/images/emoji/apple/city_dusk.png and b/public/images/emoji/apple/city_dusk.png differ
diff --git a/public/images/emoji/apple/city_sunrise.png b/public/images/emoji/apple/city_sunrise.png
index fad18ff1dad..f2a8fd3b7f9 100644
Binary files a/public/images/emoji/apple/city_sunrise.png and b/public/images/emoji/apple/city_sunrise.png differ
diff --git a/public/images/emoji/apple/city_sunset.png b/public/images/emoji/apple/city_sunset.png
index afd1d52ccb2..f785358b2ff 100644
Binary files a/public/images/emoji/apple/city_sunset.png and b/public/images/emoji/apple/city_sunset.png differ
diff --git a/public/images/emoji/apple/cityscape.png b/public/images/emoji/apple/cityscape.png
index 11a4ef192b9..dea16c61d1d 100644
Binary files a/public/images/emoji/apple/cityscape.png and b/public/images/emoji/apple/cityscape.png differ
diff --git a/public/images/emoji/apple/cl.png b/public/images/emoji/apple/cl.png
index 874f19c7b7e..c73a713fa00 100644
Binary files a/public/images/emoji/apple/cl.png and b/public/images/emoji/apple/cl.png differ
diff --git a/public/images/emoji/apple/clamp.png b/public/images/emoji/apple/clamp.png
index 575a7a07895..44337c6b178 100644
Binary files a/public/images/emoji/apple/clamp.png and b/public/images/emoji/apple/clamp.png differ
diff --git a/public/images/emoji/apple/clap.png b/public/images/emoji/apple/clap.png
index 151907c90dc..59ebd1e1080 100644
Binary files a/public/images/emoji/apple/clap.png and b/public/images/emoji/apple/clap.png differ
diff --git a/public/images/emoji/apple/clap/2.png b/public/images/emoji/apple/clap/2.png
index 28ded81d6b4..751f2fa5d50 100644
Binary files a/public/images/emoji/apple/clap/2.png and b/public/images/emoji/apple/clap/2.png differ
diff --git a/public/images/emoji/apple/clap/3.png b/public/images/emoji/apple/clap/3.png
index d29bd3baf23..9daa5693f04 100644
Binary files a/public/images/emoji/apple/clap/3.png and b/public/images/emoji/apple/clap/3.png differ
diff --git a/public/images/emoji/apple/clap/4.png b/public/images/emoji/apple/clap/4.png
index e1be837a3aa..9bc3348dda7 100644
Binary files a/public/images/emoji/apple/clap/4.png and b/public/images/emoji/apple/clap/4.png differ
diff --git a/public/images/emoji/apple/clap/5.png b/public/images/emoji/apple/clap/5.png
index 4e1dfa26474..75e2a9415d6 100644
Binary files a/public/images/emoji/apple/clap/5.png and b/public/images/emoji/apple/clap/5.png differ
diff --git a/public/images/emoji/apple/clap/6.png b/public/images/emoji/apple/clap/6.png
index 4545ab4de99..b8aa171cd69 100644
Binary files a/public/images/emoji/apple/clap/6.png and b/public/images/emoji/apple/clap/6.png differ
diff --git a/public/images/emoji/apple/clapper.png b/public/images/emoji/apple/clapper.png
index 6c8d97bdf2e..f36b7b60e67 100644
Binary files a/public/images/emoji/apple/clapper.png and b/public/images/emoji/apple/clapper.png differ
diff --git a/public/images/emoji/apple/classical_building.png b/public/images/emoji/apple/classical_building.png
index fb4aa8b6b16..8488f50e7ae 100644
Binary files a/public/images/emoji/apple/classical_building.png and b/public/images/emoji/apple/classical_building.png differ
diff --git a/public/images/emoji/apple/clinking_glasses.png b/public/images/emoji/apple/clinking_glasses.png
index 88c2bd94be1..041a97532e0 100644
Binary files a/public/images/emoji/apple/clinking_glasses.png and b/public/images/emoji/apple/clinking_glasses.png differ
diff --git a/public/images/emoji/apple/clipboard.png b/public/images/emoji/apple/clipboard.png
index bd7a1aba2ae..103083518a0 100644
Binary files a/public/images/emoji/apple/clipboard.png and b/public/images/emoji/apple/clipboard.png differ
diff --git a/public/images/emoji/apple/clipperton_island.png b/public/images/emoji/apple/clipperton_island.png
index efcd5fff75f..3360b84a7fa 100644
Binary files a/public/images/emoji/apple/clipperton_island.png and b/public/images/emoji/apple/clipperton_island.png differ
diff --git a/public/images/emoji/apple/clock.png b/public/images/emoji/apple/clock.png
index bc63b3ffb2b..b7c34e46a51 100644
Binary files a/public/images/emoji/apple/clock.png and b/public/images/emoji/apple/clock.png differ
diff --git a/public/images/emoji/apple/clock1.png b/public/images/emoji/apple/clock1.png
index 653f4cf6324..27d532362cd 100644
Binary files a/public/images/emoji/apple/clock1.png and b/public/images/emoji/apple/clock1.png differ
diff --git a/public/images/emoji/apple/clock10.png b/public/images/emoji/apple/clock10.png
index 8fb74fa6d4a..9cf0bdc0c0e 100644
Binary files a/public/images/emoji/apple/clock10.png and b/public/images/emoji/apple/clock10.png differ
diff --git a/public/images/emoji/apple/clock1030.png b/public/images/emoji/apple/clock1030.png
index af110b300ed..c6facad8e83 100644
Binary files a/public/images/emoji/apple/clock1030.png and b/public/images/emoji/apple/clock1030.png differ
diff --git a/public/images/emoji/apple/clock11.png b/public/images/emoji/apple/clock11.png
index 8fe7595b61b..99c94e5f899 100644
Binary files a/public/images/emoji/apple/clock11.png and b/public/images/emoji/apple/clock11.png differ
diff --git a/public/images/emoji/apple/clock1130.png b/public/images/emoji/apple/clock1130.png
index dc1e6833b29..24a705ad062 100644
Binary files a/public/images/emoji/apple/clock1130.png and b/public/images/emoji/apple/clock1130.png differ
diff --git a/public/images/emoji/apple/clock12.png b/public/images/emoji/apple/clock12.png
index 25a5f9f3473..1fcb11cdb6b 100644
Binary files a/public/images/emoji/apple/clock12.png and b/public/images/emoji/apple/clock12.png differ
diff --git a/public/images/emoji/apple/clock1230.png b/public/images/emoji/apple/clock1230.png
index 095d024ed61..76500d93300 100644
Binary files a/public/images/emoji/apple/clock1230.png and b/public/images/emoji/apple/clock1230.png differ
diff --git a/public/images/emoji/apple/clock130.png b/public/images/emoji/apple/clock130.png
index 8df93f17067..926c28f0d8c 100644
Binary files a/public/images/emoji/apple/clock130.png and b/public/images/emoji/apple/clock130.png differ
diff --git a/public/images/emoji/apple/clock2.png b/public/images/emoji/apple/clock2.png
index 80eff85051b..3332f8e67f0 100644
Binary files a/public/images/emoji/apple/clock2.png and b/public/images/emoji/apple/clock2.png differ
diff --git a/public/images/emoji/apple/clock230.png b/public/images/emoji/apple/clock230.png
index 6dc0e845e51..ffba20fa040 100644
Binary files a/public/images/emoji/apple/clock230.png and b/public/images/emoji/apple/clock230.png differ
diff --git a/public/images/emoji/apple/clock3.png b/public/images/emoji/apple/clock3.png
index 6f22b9d3e52..b2f0ec3611e 100644
Binary files a/public/images/emoji/apple/clock3.png and b/public/images/emoji/apple/clock3.png differ
diff --git a/public/images/emoji/apple/clock330.png b/public/images/emoji/apple/clock330.png
index c07bcde8d84..c577c721fed 100644
Binary files a/public/images/emoji/apple/clock330.png and b/public/images/emoji/apple/clock330.png differ
diff --git a/public/images/emoji/apple/clock4.png b/public/images/emoji/apple/clock4.png
index e43c206941b..dc62fb4ac34 100644
Binary files a/public/images/emoji/apple/clock4.png and b/public/images/emoji/apple/clock4.png differ
diff --git a/public/images/emoji/apple/clock430.png b/public/images/emoji/apple/clock430.png
index a5e896d94ad..d3ed0071704 100644
Binary files a/public/images/emoji/apple/clock430.png and b/public/images/emoji/apple/clock430.png differ
diff --git a/public/images/emoji/apple/clock5.png b/public/images/emoji/apple/clock5.png
index 29c5a9b2ed8..0323d3eed6f 100644
Binary files a/public/images/emoji/apple/clock5.png and b/public/images/emoji/apple/clock5.png differ
diff --git a/public/images/emoji/apple/clock530.png b/public/images/emoji/apple/clock530.png
index 66f8a71ff5f..ca89c95cd92 100644
Binary files a/public/images/emoji/apple/clock530.png and b/public/images/emoji/apple/clock530.png differ
diff --git a/public/images/emoji/apple/clock6.png b/public/images/emoji/apple/clock6.png
index 51f6c3da691..d9c49779809 100644
Binary files a/public/images/emoji/apple/clock6.png and b/public/images/emoji/apple/clock6.png differ
diff --git a/public/images/emoji/apple/clock630.png b/public/images/emoji/apple/clock630.png
index bc141c25dc7..16145e29e6e 100644
Binary files a/public/images/emoji/apple/clock630.png and b/public/images/emoji/apple/clock630.png differ
diff --git a/public/images/emoji/apple/clock7.png b/public/images/emoji/apple/clock7.png
index efa19c92136..1eab8d61803 100644
Binary files a/public/images/emoji/apple/clock7.png and b/public/images/emoji/apple/clock7.png differ
diff --git a/public/images/emoji/apple/clock730.png b/public/images/emoji/apple/clock730.png
index 77fcc1eacd6..5608efda136 100644
Binary files a/public/images/emoji/apple/clock730.png and b/public/images/emoji/apple/clock730.png differ
diff --git a/public/images/emoji/apple/clock8.png b/public/images/emoji/apple/clock8.png
index 5311b001316..2378f5eb680 100644
Binary files a/public/images/emoji/apple/clock8.png and b/public/images/emoji/apple/clock8.png differ
diff --git a/public/images/emoji/apple/clock830.png b/public/images/emoji/apple/clock830.png
index 4c6239ba6d3..417a341d10d 100644
Binary files a/public/images/emoji/apple/clock830.png and b/public/images/emoji/apple/clock830.png differ
diff --git a/public/images/emoji/apple/clock9.png b/public/images/emoji/apple/clock9.png
index c279d828387..8ccd9323def 100644
Binary files a/public/images/emoji/apple/clock9.png and b/public/images/emoji/apple/clock9.png differ
diff --git a/public/images/emoji/apple/clock930.png b/public/images/emoji/apple/clock930.png
index b0f015d731a..b8df06be8af 100644
Binary files a/public/images/emoji/apple/clock930.png and b/public/images/emoji/apple/clock930.png differ
diff --git a/public/images/emoji/apple/closed_book.png b/public/images/emoji/apple/closed_book.png
index e8793e41e72..7c527ad993d 100644
Binary files a/public/images/emoji/apple/closed_book.png and b/public/images/emoji/apple/closed_book.png differ
diff --git a/public/images/emoji/apple/closed_lock_with_key.png b/public/images/emoji/apple/closed_lock_with_key.png
index f1d583dee99..2dfa83a1953 100644
Binary files a/public/images/emoji/apple/closed_lock_with_key.png and b/public/images/emoji/apple/closed_lock_with_key.png differ
diff --git a/public/images/emoji/apple/closed_umbrella.png b/public/images/emoji/apple/closed_umbrella.png
index a28d55a800b..9bafcaf5e34 100644
Binary files a/public/images/emoji/apple/closed_umbrella.png and b/public/images/emoji/apple/closed_umbrella.png differ
diff --git a/public/images/emoji/apple/cloud.png b/public/images/emoji/apple/cloud.png
index 7f3b4be9987..ad9cfad62f9 100644
Binary files a/public/images/emoji/apple/cloud.png and b/public/images/emoji/apple/cloud.png differ
diff --git a/public/images/emoji/apple/cloud_lightning.png b/public/images/emoji/apple/cloud_lightning.png
index 13845accbf5..f3ee3da67eb 100644
Binary files a/public/images/emoji/apple/cloud_lightning.png and b/public/images/emoji/apple/cloud_lightning.png differ
diff --git a/public/images/emoji/apple/cloud_rain.png b/public/images/emoji/apple/cloud_rain.png
index c8a987cf004..18ca379b58c 100644
Binary files a/public/images/emoji/apple/cloud_rain.png and b/public/images/emoji/apple/cloud_rain.png differ
diff --git a/public/images/emoji/apple/cloud_snow.png b/public/images/emoji/apple/cloud_snow.png
index 87287a2bc02..21ef67a5086 100644
Binary files a/public/images/emoji/apple/cloud_snow.png and b/public/images/emoji/apple/cloud_snow.png differ
diff --git a/public/images/emoji/apple/cloud_tornado.png b/public/images/emoji/apple/cloud_tornado.png
index 0d3985f1191..77e497f056d 100644
Binary files a/public/images/emoji/apple/cloud_tornado.png and b/public/images/emoji/apple/cloud_tornado.png differ
diff --git a/public/images/emoji/apple/cloud_with_lightning.png b/public/images/emoji/apple/cloud_with_lightning.png
index 13845accbf5..f3ee3da67eb 100644
Binary files a/public/images/emoji/apple/cloud_with_lightning.png and b/public/images/emoji/apple/cloud_with_lightning.png differ
diff --git a/public/images/emoji/apple/cloud_with_lightning_and_rain.png b/public/images/emoji/apple/cloud_with_lightning_and_rain.png
index 8f44a7726e9..8a42ddb67ac 100644
Binary files a/public/images/emoji/apple/cloud_with_lightning_and_rain.png and b/public/images/emoji/apple/cloud_with_lightning_and_rain.png differ
diff --git a/public/images/emoji/apple/cloud_with_rain.png b/public/images/emoji/apple/cloud_with_rain.png
index c8a987cf004..18ca379b58c 100644
Binary files a/public/images/emoji/apple/cloud_with_rain.png and b/public/images/emoji/apple/cloud_with_rain.png differ
diff --git a/public/images/emoji/apple/cloud_with_snow.png b/public/images/emoji/apple/cloud_with_snow.png
index 87287a2bc02..21ef67a5086 100644
Binary files a/public/images/emoji/apple/cloud_with_snow.png and b/public/images/emoji/apple/cloud_with_snow.png differ
diff --git a/public/images/emoji/apple/cloud_with_tornado.png b/public/images/emoji/apple/cloud_with_tornado.png
index 0d3985f1191..77e497f056d 100644
Binary files a/public/images/emoji/apple/cloud_with_tornado.png and b/public/images/emoji/apple/cloud_with_tornado.png differ
diff --git a/public/images/emoji/apple/clown_face.png b/public/images/emoji/apple/clown_face.png
index f091b23b6b5..759db0db8d6 100644
Binary files a/public/images/emoji/apple/clown_face.png and b/public/images/emoji/apple/clown_face.png differ
diff --git a/public/images/emoji/apple/clubs.png b/public/images/emoji/apple/clubs.png
index c7957fb3dbc..c6c28c9376c 100644
Binary files a/public/images/emoji/apple/clubs.png and b/public/images/emoji/apple/clubs.png differ
diff --git a/public/images/emoji/apple/cn.png b/public/images/emoji/apple/cn.png
index 9c969f94c50..b7611c09e48 100644
Binary files a/public/images/emoji/apple/cn.png and b/public/images/emoji/apple/cn.png differ
diff --git a/public/images/emoji/apple/coat.png b/public/images/emoji/apple/coat.png
index c409f9f4c4c..a6eeee4619e 100644
Binary files a/public/images/emoji/apple/coat.png and b/public/images/emoji/apple/coat.png differ
diff --git a/public/images/emoji/apple/cocktail.png b/public/images/emoji/apple/cocktail.png
index 89199f28df1..db03d81e1f4 100644
Binary files a/public/images/emoji/apple/cocktail.png and b/public/images/emoji/apple/cocktail.png differ
diff --git a/public/images/emoji/apple/coconut.png b/public/images/emoji/apple/coconut.png
index e76b533149f..a1adbe9f2ee 100644
Binary files a/public/images/emoji/apple/coconut.png and b/public/images/emoji/apple/coconut.png differ
diff --git a/public/images/emoji/apple/cocos_islands.png b/public/images/emoji/apple/cocos_islands.png
index 177872ece51..5fd0b9eae51 100644
Binary files a/public/images/emoji/apple/cocos_islands.png and b/public/images/emoji/apple/cocos_islands.png differ
diff --git a/public/images/emoji/apple/coffee.png b/public/images/emoji/apple/coffee.png
index 07de70653ac..9e5d342311e 100644
Binary files a/public/images/emoji/apple/coffee.png and b/public/images/emoji/apple/coffee.png differ
diff --git a/public/images/emoji/apple/coffin.png b/public/images/emoji/apple/coffin.png
index d29067750ce..4fa77adb8e0 100644
Binary files a/public/images/emoji/apple/coffin.png and b/public/images/emoji/apple/coffin.png differ
diff --git a/public/images/emoji/apple/cold_sweat.png b/public/images/emoji/apple/cold_sweat.png
index 744fa14e015..5a327e21ef3 100644
Binary files a/public/images/emoji/apple/cold_sweat.png and b/public/images/emoji/apple/cold_sweat.png differ
diff --git a/public/images/emoji/apple/colombia.png b/public/images/emoji/apple/colombia.png
index cee9fe65c3a..5f289c0d3cc 100644
Binary files a/public/images/emoji/apple/colombia.png and b/public/images/emoji/apple/colombia.png differ
diff --git a/public/images/emoji/apple/comet.png b/public/images/emoji/apple/comet.png
index 2bcbf89601d..d373df07084 100644
Binary files a/public/images/emoji/apple/comet.png and b/public/images/emoji/apple/comet.png differ
diff --git a/public/images/emoji/apple/comoros.png b/public/images/emoji/apple/comoros.png
index 7e77d800060..fc21d9c28d6 100644
Binary files a/public/images/emoji/apple/comoros.png and b/public/images/emoji/apple/comoros.png differ
diff --git a/public/images/emoji/apple/compression.png b/public/images/emoji/apple/compression.png
index 575a7a07895..44337c6b178 100644
Binary files a/public/images/emoji/apple/compression.png and b/public/images/emoji/apple/compression.png differ
diff --git a/public/images/emoji/apple/computer.png b/public/images/emoji/apple/computer.png
index f68c5454859..0357128ff39 100644
Binary files a/public/images/emoji/apple/computer.png and b/public/images/emoji/apple/computer.png differ
diff --git a/public/images/emoji/apple/computer_mouse.png b/public/images/emoji/apple/computer_mouse.png
index 3899171edc6..6fbde4a9567 100644
Binary files a/public/images/emoji/apple/computer_mouse.png and b/public/images/emoji/apple/computer_mouse.png differ
diff --git a/public/images/emoji/apple/confetti_ball.png b/public/images/emoji/apple/confetti_ball.png
index 13c22c9c62c..5555004e0a9 100644
Binary files a/public/images/emoji/apple/confetti_ball.png and b/public/images/emoji/apple/confetti_ball.png differ
diff --git a/public/images/emoji/apple/confounded.png b/public/images/emoji/apple/confounded.png
index bd4b017957f..05f21e8c5ad 100644
Binary files a/public/images/emoji/apple/confounded.png and b/public/images/emoji/apple/confounded.png differ
diff --git a/public/images/emoji/apple/confused.png b/public/images/emoji/apple/confused.png
index a3b5de92cbd..26ec0c202bc 100644
Binary files a/public/images/emoji/apple/confused.png and b/public/images/emoji/apple/confused.png differ
diff --git a/public/images/emoji/apple/congo_brazzaville.png b/public/images/emoji/apple/congo_brazzaville.png
index 4c0d656ff2c..1c376338fa2 100644
Binary files a/public/images/emoji/apple/congo_brazzaville.png and b/public/images/emoji/apple/congo_brazzaville.png differ
diff --git a/public/images/emoji/apple/congo_kinshasa.png b/public/images/emoji/apple/congo_kinshasa.png
index c933cb5659c..80a2b7d62d9 100644
Binary files a/public/images/emoji/apple/congo_kinshasa.png and b/public/images/emoji/apple/congo_kinshasa.png differ
diff --git a/public/images/emoji/apple/congratulations.png b/public/images/emoji/apple/congratulations.png
index 5b983b52b15..7d4bce08463 100644
Binary files a/public/images/emoji/apple/congratulations.png and b/public/images/emoji/apple/congratulations.png differ
diff --git a/public/images/emoji/apple/construction.png b/public/images/emoji/apple/construction.png
index 744cb5fe94b..dfe3eaebf33 100644
Binary files a/public/images/emoji/apple/construction.png and b/public/images/emoji/apple/construction.png differ
diff --git a/public/images/emoji/apple/construction_site.png b/public/images/emoji/apple/construction_site.png
index caad1ac1287..acf077964e0 100644
Binary files a/public/images/emoji/apple/construction_site.png and b/public/images/emoji/apple/construction_site.png differ
diff --git a/public/images/emoji/apple/construction_worker.png b/public/images/emoji/apple/construction_worker.png
index ab08591eb37..8f5d9d7c11b 100644
Binary files a/public/images/emoji/apple/construction_worker.png and b/public/images/emoji/apple/construction_worker.png differ
diff --git a/public/images/emoji/apple/construction_worker/2.png b/public/images/emoji/apple/construction_worker/2.png
index 0c2079a72d9..3f00fd1a224 100644
Binary files a/public/images/emoji/apple/construction_worker/2.png and b/public/images/emoji/apple/construction_worker/2.png differ
diff --git a/public/images/emoji/apple/construction_worker/3.png b/public/images/emoji/apple/construction_worker/3.png
index e4133c8ce93..8189e97a776 100644
Binary files a/public/images/emoji/apple/construction_worker/3.png and b/public/images/emoji/apple/construction_worker/3.png differ
diff --git a/public/images/emoji/apple/construction_worker/4.png b/public/images/emoji/apple/construction_worker/4.png
index 4175bd541ea..309fcee56ee 100644
Binary files a/public/images/emoji/apple/construction_worker/4.png and b/public/images/emoji/apple/construction_worker/4.png differ
diff --git a/public/images/emoji/apple/construction_worker/5.png b/public/images/emoji/apple/construction_worker/5.png
index f52f410a90b..234c75a5499 100644
Binary files a/public/images/emoji/apple/construction_worker/5.png and b/public/images/emoji/apple/construction_worker/5.png differ
diff --git a/public/images/emoji/apple/construction_worker/6.png b/public/images/emoji/apple/construction_worker/6.png
index b1976d0925d..d8dbda4a155 100644
Binary files a/public/images/emoji/apple/construction_worker/6.png and b/public/images/emoji/apple/construction_worker/6.png differ
diff --git a/public/images/emoji/apple/construction_worker_man.png b/public/images/emoji/apple/construction_worker_man.png
index ab08591eb37..8f5d9d7c11b 100644
Binary files a/public/images/emoji/apple/construction_worker_man.png and b/public/images/emoji/apple/construction_worker_man.png differ
diff --git a/public/images/emoji/apple/construction_worker_man/2.png b/public/images/emoji/apple/construction_worker_man/2.png
index 0c2079a72d9..3f00fd1a224 100644
Binary files a/public/images/emoji/apple/construction_worker_man/2.png and b/public/images/emoji/apple/construction_worker_man/2.png differ
diff --git a/public/images/emoji/apple/construction_worker_man/3.png b/public/images/emoji/apple/construction_worker_man/3.png
index e4133c8ce93..8189e97a776 100644
Binary files a/public/images/emoji/apple/construction_worker_man/3.png and b/public/images/emoji/apple/construction_worker_man/3.png differ
diff --git a/public/images/emoji/apple/construction_worker_man/4.png b/public/images/emoji/apple/construction_worker_man/4.png
index 4175bd541ea..309fcee56ee 100644
Binary files a/public/images/emoji/apple/construction_worker_man/4.png and b/public/images/emoji/apple/construction_worker_man/4.png differ
diff --git a/public/images/emoji/apple/construction_worker_man/5.png b/public/images/emoji/apple/construction_worker_man/5.png
index f52f410a90b..234c75a5499 100644
Binary files a/public/images/emoji/apple/construction_worker_man/5.png and b/public/images/emoji/apple/construction_worker_man/5.png differ
diff --git a/public/images/emoji/apple/construction_worker_man/6.png b/public/images/emoji/apple/construction_worker_man/6.png
index b1976d0925d..d8dbda4a155 100644
Binary files a/public/images/emoji/apple/construction_worker_man/6.png and b/public/images/emoji/apple/construction_worker_man/6.png differ
diff --git a/public/images/emoji/apple/construction_worker_woman.png b/public/images/emoji/apple/construction_worker_woman.png
index add71a28ef5..37d8674a4c4 100644
Binary files a/public/images/emoji/apple/construction_worker_woman.png and b/public/images/emoji/apple/construction_worker_woman.png differ
diff --git a/public/images/emoji/apple/construction_worker_woman/2.png b/public/images/emoji/apple/construction_worker_woman/2.png
index b33354210db..db7bec6f378 100644
Binary files a/public/images/emoji/apple/construction_worker_woman/2.png and b/public/images/emoji/apple/construction_worker_woman/2.png differ
diff --git a/public/images/emoji/apple/construction_worker_woman/3.png b/public/images/emoji/apple/construction_worker_woman/3.png
index 5d7b89ca851..487ef60484d 100644
Binary files a/public/images/emoji/apple/construction_worker_woman/3.png and b/public/images/emoji/apple/construction_worker_woman/3.png differ
diff --git a/public/images/emoji/apple/construction_worker_woman/4.png b/public/images/emoji/apple/construction_worker_woman/4.png
index 8f652185445..a7544be434a 100644
Binary files a/public/images/emoji/apple/construction_worker_woman/4.png and b/public/images/emoji/apple/construction_worker_woman/4.png differ
diff --git a/public/images/emoji/apple/construction_worker_woman/5.png b/public/images/emoji/apple/construction_worker_woman/5.png
index 796b99e1eb2..ade66697d7c 100644
Binary files a/public/images/emoji/apple/construction_worker_woman/5.png and b/public/images/emoji/apple/construction_worker_woman/5.png differ
diff --git a/public/images/emoji/apple/construction_worker_woman/6.png b/public/images/emoji/apple/construction_worker_woman/6.png
index 7a6ead711b3..4a7bbc25d57 100644
Binary files a/public/images/emoji/apple/construction_worker_woman/6.png and b/public/images/emoji/apple/construction_worker_woman/6.png differ
diff --git a/public/images/emoji/apple/control_knobs.png b/public/images/emoji/apple/control_knobs.png
index 1f5bb218fc4..506b5f88124 100644
Binary files a/public/images/emoji/apple/control_knobs.png and b/public/images/emoji/apple/control_knobs.png differ
diff --git a/public/images/emoji/apple/convenience_store.png b/public/images/emoji/apple/convenience_store.png
index 3de249f5239..81fd83c4394 100644
Binary files a/public/images/emoji/apple/convenience_store.png and b/public/images/emoji/apple/convenience_store.png differ
diff --git a/public/images/emoji/apple/cook_islands.png b/public/images/emoji/apple/cook_islands.png
index 1dae1bcd010..8e7fe4c352a 100644
Binary files a/public/images/emoji/apple/cook_islands.png and b/public/images/emoji/apple/cook_islands.png differ
diff --git a/public/images/emoji/apple/cookie.png b/public/images/emoji/apple/cookie.png
index 507c92c244c..e2ed2a672d5 100644
Binary files a/public/images/emoji/apple/cookie.png and b/public/images/emoji/apple/cookie.png differ
diff --git a/public/images/emoji/apple/cool.png b/public/images/emoji/apple/cool.png
index c0aabdd4944..ce87a168757 100644
Binary files a/public/images/emoji/apple/cool.png and b/public/images/emoji/apple/cool.png differ
diff --git a/public/images/emoji/apple/cop.png b/public/images/emoji/apple/cop.png
index 78591caa50b..07cb11ea32d 100644
Binary files a/public/images/emoji/apple/cop.png and b/public/images/emoji/apple/cop.png differ
diff --git a/public/images/emoji/apple/cop/2.png b/public/images/emoji/apple/cop/2.png
index 63db5721c18..90dc09122b1 100644
Binary files a/public/images/emoji/apple/cop/2.png and b/public/images/emoji/apple/cop/2.png differ
diff --git a/public/images/emoji/apple/cop/3.png b/public/images/emoji/apple/cop/3.png
index 7922a9dd3dc..26bb86e2ce6 100644
Binary files a/public/images/emoji/apple/cop/3.png and b/public/images/emoji/apple/cop/3.png differ
diff --git a/public/images/emoji/apple/cop/4.png b/public/images/emoji/apple/cop/4.png
index 16292b3eb0f..9b6c2745016 100644
Binary files a/public/images/emoji/apple/cop/4.png and b/public/images/emoji/apple/cop/4.png differ
diff --git a/public/images/emoji/apple/cop/5.png b/public/images/emoji/apple/cop/5.png
index 41cdd83a946..62d7223095d 100644
Binary files a/public/images/emoji/apple/cop/5.png and b/public/images/emoji/apple/cop/5.png differ
diff --git a/public/images/emoji/apple/cop/6.png b/public/images/emoji/apple/cop/6.png
index e2ce8f11b51..247d6c086d4 100644
Binary files a/public/images/emoji/apple/cop/6.png and b/public/images/emoji/apple/cop/6.png differ
diff --git a/public/images/emoji/apple/copyright.png b/public/images/emoji/apple/copyright.png
index e99004dcf65..b36a1b0fabf 100644
Binary files a/public/images/emoji/apple/copyright.png and b/public/images/emoji/apple/copyright.png differ
diff --git a/public/images/emoji/apple/corn.png b/public/images/emoji/apple/corn.png
index 89d311d36ea..b6fef8ca285 100644
Binary files a/public/images/emoji/apple/corn.png and b/public/images/emoji/apple/corn.png differ
diff --git a/public/images/emoji/apple/costa_rica.png b/public/images/emoji/apple/costa_rica.png
index 8a84b171e2f..eb86979402e 100644
Binary files a/public/images/emoji/apple/costa_rica.png and b/public/images/emoji/apple/costa_rica.png differ
diff --git a/public/images/emoji/apple/cote_divoire.png b/public/images/emoji/apple/cote_divoire.png
index f39c2bcfcfb..2b7eba4f11d 100644
Binary files a/public/images/emoji/apple/cote_divoire.png and b/public/images/emoji/apple/cote_divoire.png differ
diff --git a/public/images/emoji/apple/couch.png b/public/images/emoji/apple/couch.png
index bc593ea9c9a..d4933969b44 100644
Binary files a/public/images/emoji/apple/couch.png and b/public/images/emoji/apple/couch.png differ
diff --git a/public/images/emoji/apple/couch_and_lamp.png b/public/images/emoji/apple/couch_and_lamp.png
index bc593ea9c9a..d4933969b44 100644
Binary files a/public/images/emoji/apple/couch_and_lamp.png and b/public/images/emoji/apple/couch_and_lamp.png differ
diff --git a/public/images/emoji/apple/couple.png b/public/images/emoji/apple/couple.png
index 8532888498c..cc85e744e24 100644
Binary files a/public/images/emoji/apple/couple.png and b/public/images/emoji/apple/couple.png differ
diff --git a/public/images/emoji/apple/couple_with_heart.png b/public/images/emoji/apple/couple_with_heart.png
index b7eafd58df8..74c93bc6fc9 100644
Binary files a/public/images/emoji/apple/couple_with_heart.png and b/public/images/emoji/apple/couple_with_heart.png differ
diff --git a/public/images/emoji/apple/couple_with_heart_man_man.png b/public/images/emoji/apple/couple_with_heart_man_man.png
index 41f436aa541..a08b18fd363 100644
Binary files a/public/images/emoji/apple/couple_with_heart_man_man.png and b/public/images/emoji/apple/couple_with_heart_man_man.png differ
diff --git a/public/images/emoji/apple/couple_with_heart_woman_man.png b/public/images/emoji/apple/couple_with_heart_woman_man.png
index b7eafd58df8..74c93bc6fc9 100644
Binary files a/public/images/emoji/apple/couple_with_heart_woman_man.png and b/public/images/emoji/apple/couple_with_heart_woman_man.png differ
diff --git a/public/images/emoji/apple/couple_with_heart_woman_woman.png b/public/images/emoji/apple/couple_with_heart_woman_woman.png
index 8f924c75cfb..e388ccded95 100644
Binary files a/public/images/emoji/apple/couple_with_heart_woman_woman.png and b/public/images/emoji/apple/couple_with_heart_woman_woman.png differ
diff --git a/public/images/emoji/apple/couplekiss.png b/public/images/emoji/apple/couplekiss.png
index b1b5bdc9c56..33311f6218b 100644
Binary files a/public/images/emoji/apple/couplekiss.png and b/public/images/emoji/apple/couplekiss.png differ
diff --git a/public/images/emoji/apple/couplekiss_man_man.png b/public/images/emoji/apple/couplekiss_man_man.png
index 87fd1ce113e..8b3cc233394 100644
Binary files a/public/images/emoji/apple/couplekiss_man_man.png and b/public/images/emoji/apple/couplekiss_man_man.png differ
diff --git a/public/images/emoji/apple/couplekiss_man_woman.png b/public/images/emoji/apple/couplekiss_man_woman.png
index b1b5bdc9c56..33311f6218b 100644
Binary files a/public/images/emoji/apple/couplekiss_man_woman.png and b/public/images/emoji/apple/couplekiss_man_woman.png differ
diff --git a/public/images/emoji/apple/couplekiss_woman_woman.png b/public/images/emoji/apple/couplekiss_woman_woman.png
index 13d6801c47a..1cf5535a8a9 100644
Binary files a/public/images/emoji/apple/couplekiss_woman_woman.png and b/public/images/emoji/apple/couplekiss_woman_woman.png differ
diff --git a/public/images/emoji/apple/cow.png b/public/images/emoji/apple/cow.png
index 8f90b5c37f8..dcefe255769 100644
Binary files a/public/images/emoji/apple/cow.png and b/public/images/emoji/apple/cow.png differ
diff --git a/public/images/emoji/apple/cow2.png b/public/images/emoji/apple/cow2.png
index a44afd72130..0d5c0cb2dc3 100644
Binary files a/public/images/emoji/apple/cow2.png and b/public/images/emoji/apple/cow2.png differ
diff --git a/public/images/emoji/apple/cowboy_hat_face.png b/public/images/emoji/apple/cowboy_hat_face.png
index 6515c8360b4..304411b8b1e 100644
Binary files a/public/images/emoji/apple/cowboy_hat_face.png and b/public/images/emoji/apple/cowboy_hat_face.png differ
diff --git a/public/images/emoji/apple/crab.png b/public/images/emoji/apple/crab.png
index c300979a99d..7f085225e40 100644
Binary files a/public/images/emoji/apple/crab.png and b/public/images/emoji/apple/crab.png differ
diff --git a/public/images/emoji/apple/crayon.png b/public/images/emoji/apple/crayon.png
index eaf918c81f4..4c526c7b920 100644
Binary files a/public/images/emoji/apple/crayon.png and b/public/images/emoji/apple/crayon.png differ
diff --git a/public/images/emoji/apple/crazy_face.png b/public/images/emoji/apple/crazy_face.png
index 0aaa1cf7651..a220e26ca2d 100644
Binary files a/public/images/emoji/apple/crazy_face.png and b/public/images/emoji/apple/crazy_face.png differ
diff --git a/public/images/emoji/apple/credit_card.png b/public/images/emoji/apple/credit_card.png
index 47d4436b9b0..ffe558f62a2 100644
Binary files a/public/images/emoji/apple/credit_card.png and b/public/images/emoji/apple/credit_card.png differ
diff --git a/public/images/emoji/apple/crescent_moon.png b/public/images/emoji/apple/crescent_moon.png
index 5d1ec6baab8..ec81741b259 100644
Binary files a/public/images/emoji/apple/crescent_moon.png and b/public/images/emoji/apple/crescent_moon.png differ
diff --git a/public/images/emoji/apple/cricket.png b/public/images/emoji/apple/cricket.png
index 798f0499e9d..78e8c377f4a 100644
Binary files a/public/images/emoji/apple/cricket.png and b/public/images/emoji/apple/cricket.png differ
diff --git a/public/images/emoji/apple/cricket_bat_and_ball.png b/public/images/emoji/apple/cricket_bat_and_ball.png
index 798f0499e9d..f736891b9ab 100644
Binary files a/public/images/emoji/apple/cricket_bat_and_ball.png and b/public/images/emoji/apple/cricket_bat_and_ball.png differ
diff --git a/public/images/emoji/apple/cricket_bat_ball.png b/public/images/emoji/apple/cricket_bat_ball.png
index 798f0499e9d..f736891b9ab 100644
Binary files a/public/images/emoji/apple/cricket_bat_ball.png and b/public/images/emoji/apple/cricket_bat_ball.png differ
diff --git a/public/images/emoji/apple/croatia.png b/public/images/emoji/apple/croatia.png
index a93f35de737..01215c7becf 100644
Binary files a/public/images/emoji/apple/croatia.png and b/public/images/emoji/apple/croatia.png differ
diff --git a/public/images/emoji/apple/crocodile.png b/public/images/emoji/apple/crocodile.png
index 9e3e8460e3c..6a128e53f31 100644
Binary files a/public/images/emoji/apple/crocodile.png and b/public/images/emoji/apple/crocodile.png differ
diff --git a/public/images/emoji/apple/croissant.png b/public/images/emoji/apple/croissant.png
index 96e4b6e1737..4662ad17c68 100644
Binary files a/public/images/emoji/apple/croissant.png and b/public/images/emoji/apple/croissant.png differ
diff --git a/public/images/emoji/apple/cross.png b/public/images/emoji/apple/cross.png
index efc7a79034a..14319872924 100644
Binary files a/public/images/emoji/apple/cross.png and b/public/images/emoji/apple/cross.png differ
diff --git a/public/images/emoji/apple/crossed_fingers.png b/public/images/emoji/apple/crossed_fingers.png
index 76cdcabf102..b48e49f0af5 100644
Binary files a/public/images/emoji/apple/crossed_fingers.png and b/public/images/emoji/apple/crossed_fingers.png differ
diff --git a/public/images/emoji/apple/crossed_fingers/2.png b/public/images/emoji/apple/crossed_fingers/2.png
index f1efc6fd4db..f0855847510 100644
Binary files a/public/images/emoji/apple/crossed_fingers/2.png and b/public/images/emoji/apple/crossed_fingers/2.png differ
diff --git a/public/images/emoji/apple/crossed_fingers/3.png b/public/images/emoji/apple/crossed_fingers/3.png
index e4de73ffb86..d1eada37479 100644
Binary files a/public/images/emoji/apple/crossed_fingers/3.png and b/public/images/emoji/apple/crossed_fingers/3.png differ
diff --git a/public/images/emoji/apple/crossed_fingers/4.png b/public/images/emoji/apple/crossed_fingers/4.png
index e4b72cb1c22..421ccac48dc 100644
Binary files a/public/images/emoji/apple/crossed_fingers/4.png and b/public/images/emoji/apple/crossed_fingers/4.png differ
diff --git a/public/images/emoji/apple/crossed_fingers/5.png b/public/images/emoji/apple/crossed_fingers/5.png
index 37585e00ace..96f8f13b949 100644
Binary files a/public/images/emoji/apple/crossed_fingers/5.png and b/public/images/emoji/apple/crossed_fingers/5.png differ
diff --git a/public/images/emoji/apple/crossed_fingers/6.png b/public/images/emoji/apple/crossed_fingers/6.png
index 63061bea7a3..d2e8f24efbe 100644
Binary files a/public/images/emoji/apple/crossed_fingers/6.png and b/public/images/emoji/apple/crossed_fingers/6.png differ
diff --git a/public/images/emoji/apple/crossed_flags.png b/public/images/emoji/apple/crossed_flags.png
index 0a325b514fb..06f8618476d 100644
Binary files a/public/images/emoji/apple/crossed_flags.png and b/public/images/emoji/apple/crossed_flags.png differ
diff --git a/public/images/emoji/apple/crossed_swords.png b/public/images/emoji/apple/crossed_swords.png
index 39f21de50d4..e709dca4e9b 100644
Binary files a/public/images/emoji/apple/crossed_swords.png and b/public/images/emoji/apple/crossed_swords.png differ
diff --git a/public/images/emoji/apple/crown.png b/public/images/emoji/apple/crown.png
index 293ad24fd67..fe8aa5378bd 100644
Binary files a/public/images/emoji/apple/crown.png and b/public/images/emoji/apple/crown.png differ
diff --git a/public/images/emoji/apple/cruise_ship.png b/public/images/emoji/apple/cruise_ship.png
index 3bb64de0d3e..725630488ec 100644
Binary files a/public/images/emoji/apple/cruise_ship.png and b/public/images/emoji/apple/cruise_ship.png differ
diff --git a/public/images/emoji/apple/cry.png b/public/images/emoji/apple/cry.png
index 212674d33f6..051f1db9c09 100644
Binary files a/public/images/emoji/apple/cry.png and b/public/images/emoji/apple/cry.png differ
diff --git a/public/images/emoji/apple/crying_cat_face.png b/public/images/emoji/apple/crying_cat_face.png
index 1902821eea1..79971d40d79 100644
Binary files a/public/images/emoji/apple/crying_cat_face.png and b/public/images/emoji/apple/crying_cat_face.png differ
diff --git a/public/images/emoji/apple/crystal_ball.png b/public/images/emoji/apple/crystal_ball.png
index 8b777fdcea5..8c36678b74b 100644
Binary files a/public/images/emoji/apple/crystal_ball.png and b/public/images/emoji/apple/crystal_ball.png differ
diff --git a/public/images/emoji/apple/cuba.png b/public/images/emoji/apple/cuba.png
index 159170fa3d0..c95969254db 100644
Binary files a/public/images/emoji/apple/cuba.png and b/public/images/emoji/apple/cuba.png differ
diff --git a/public/images/emoji/apple/cucumber.png b/public/images/emoji/apple/cucumber.png
index ece1ce7d99d..d758d3d59f0 100644
Binary files a/public/images/emoji/apple/cucumber.png and b/public/images/emoji/apple/cucumber.png differ
diff --git a/public/images/emoji/apple/cup_with_straw.png b/public/images/emoji/apple/cup_with_straw.png
index 4b2f313f9b2..4b9d73949f7 100644
Binary files a/public/images/emoji/apple/cup_with_straw.png and b/public/images/emoji/apple/cup_with_straw.png differ
diff --git a/public/images/emoji/apple/cupid.png b/public/images/emoji/apple/cupid.png
index 65630291ab5..6e9dc6e00c3 100644
Binary files a/public/images/emoji/apple/cupid.png and b/public/images/emoji/apple/cupid.png differ
diff --git a/public/images/emoji/apple/curacao.png b/public/images/emoji/apple/curacao.png
index 004ae5eb633..8f59631351c 100644
Binary files a/public/images/emoji/apple/curacao.png and b/public/images/emoji/apple/curacao.png differ
diff --git a/public/images/emoji/apple/curling_stone.png b/public/images/emoji/apple/curling_stone.png
index 09027a2fb2e..678a2afec3c 100644
Binary files a/public/images/emoji/apple/curling_stone.png and b/public/images/emoji/apple/curling_stone.png differ
diff --git a/public/images/emoji/apple/curly_loop.png b/public/images/emoji/apple/curly_loop.png
index e6257ad8cda..0845d51b30e 100644
Binary files a/public/images/emoji/apple/curly_loop.png and b/public/images/emoji/apple/curly_loop.png differ
diff --git a/public/images/emoji/apple/currency_exchange.png b/public/images/emoji/apple/currency_exchange.png
index f5591d2bbfd..6ac4eb203b7 100644
Binary files a/public/images/emoji/apple/currency_exchange.png and b/public/images/emoji/apple/currency_exchange.png differ
diff --git a/public/images/emoji/apple/curry.png b/public/images/emoji/apple/curry.png
index f2a8e54b6f8..f503ddb5b6a 100644
Binary files a/public/images/emoji/apple/curry.png and b/public/images/emoji/apple/curry.png differ
diff --git a/public/images/emoji/apple/custard.png b/public/images/emoji/apple/custard.png
index dac6fa58e77..789b679bd15 100644
Binary files a/public/images/emoji/apple/custard.png and b/public/images/emoji/apple/custard.png differ
diff --git a/public/images/emoji/apple/customs.png b/public/images/emoji/apple/customs.png
index 53e00660175..44ea87f37fc 100644
Binary files a/public/images/emoji/apple/customs.png and b/public/images/emoji/apple/customs.png differ
diff --git a/public/images/emoji/apple/cut_of_meat.png b/public/images/emoji/apple/cut_of_meat.png
index b66d427e099..5c6aa151a51 100644
Binary files a/public/images/emoji/apple/cut_of_meat.png and b/public/images/emoji/apple/cut_of_meat.png differ
diff --git a/public/images/emoji/apple/cyclone.png b/public/images/emoji/apple/cyclone.png
index 5a6dc22b514..355ceabd839 100644
Binary files a/public/images/emoji/apple/cyclone.png and b/public/images/emoji/apple/cyclone.png differ
diff --git a/public/images/emoji/apple/cyprus.png b/public/images/emoji/apple/cyprus.png
index cfebdb9e6f4..49508d89405 100644
Binary files a/public/images/emoji/apple/cyprus.png and b/public/images/emoji/apple/cyprus.png differ
diff --git a/public/images/emoji/apple/czech_republic.png b/public/images/emoji/apple/czech_republic.png
index 33fa4c2c80f..c8538ec14f6 100644
Binary files a/public/images/emoji/apple/czech_republic.png and b/public/images/emoji/apple/czech_republic.png differ
diff --git a/public/images/emoji/apple/dagger.png b/public/images/emoji/apple/dagger.png
index 0b35842beab..eaf3644f962 100644
Binary files a/public/images/emoji/apple/dagger.png and b/public/images/emoji/apple/dagger.png differ
diff --git a/public/images/emoji/apple/dagger_knife.png b/public/images/emoji/apple/dagger_knife.png
index 0b35842beab..eaf3644f962 100644
Binary files a/public/images/emoji/apple/dagger_knife.png and b/public/images/emoji/apple/dagger_knife.png differ
diff --git a/public/images/emoji/apple/dancer.png b/public/images/emoji/apple/dancer.png
index 5ea2c10f9e7..32eb5fc678f 100644
Binary files a/public/images/emoji/apple/dancer.png and b/public/images/emoji/apple/dancer.png differ
diff --git a/public/images/emoji/apple/dancer/2.png b/public/images/emoji/apple/dancer/2.png
index 7c7f527dbe2..e74630fd95a 100644
Binary files a/public/images/emoji/apple/dancer/2.png and b/public/images/emoji/apple/dancer/2.png differ
diff --git a/public/images/emoji/apple/dancer/3.png b/public/images/emoji/apple/dancer/3.png
index 5c443068037..012728a9fbb 100644
Binary files a/public/images/emoji/apple/dancer/3.png and b/public/images/emoji/apple/dancer/3.png differ
diff --git a/public/images/emoji/apple/dancer/4.png b/public/images/emoji/apple/dancer/4.png
index e1f0389b014..b62c12ac0f9 100644
Binary files a/public/images/emoji/apple/dancer/4.png and b/public/images/emoji/apple/dancer/4.png differ
diff --git a/public/images/emoji/apple/dancer/5.png b/public/images/emoji/apple/dancer/5.png
index cba934193f3..94641cad16d 100644
Binary files a/public/images/emoji/apple/dancer/5.png and b/public/images/emoji/apple/dancer/5.png differ
diff --git a/public/images/emoji/apple/dancer/6.png b/public/images/emoji/apple/dancer/6.png
index cc8af5bc891..af9b9fb8840 100644
Binary files a/public/images/emoji/apple/dancer/6.png and b/public/images/emoji/apple/dancer/6.png differ
diff --git a/public/images/emoji/apple/dancers.png b/public/images/emoji/apple/dancers.png
index 0d07c4318bd..7a06a8623b3 100644
Binary files a/public/images/emoji/apple/dancers.png and b/public/images/emoji/apple/dancers.png differ
diff --git a/public/images/emoji/apple/dancing_men.png b/public/images/emoji/apple/dancing_men.png
index e5951ce3341..7859dc3ce28 100644
Binary files a/public/images/emoji/apple/dancing_men.png and b/public/images/emoji/apple/dancing_men.png differ
diff --git a/public/images/emoji/apple/dancing_women.png b/public/images/emoji/apple/dancing_women.png
index 0d07c4318bd..7a06a8623b3 100644
Binary files a/public/images/emoji/apple/dancing_women.png and b/public/images/emoji/apple/dancing_women.png differ
diff --git a/public/images/emoji/apple/dango.png b/public/images/emoji/apple/dango.png
index ecaf15737e5..4696aec8dd4 100644
Binary files a/public/images/emoji/apple/dango.png and b/public/images/emoji/apple/dango.png differ
diff --git a/public/images/emoji/apple/dark_sunglasses.png b/public/images/emoji/apple/dark_sunglasses.png
index 0b4696027de..5ec379bc2d7 100644
Binary files a/public/images/emoji/apple/dark_sunglasses.png and b/public/images/emoji/apple/dark_sunglasses.png differ
diff --git a/public/images/emoji/apple/dart.png b/public/images/emoji/apple/dart.png
index 1bdcca7068c..6464c535424 100644
Binary files a/public/images/emoji/apple/dart.png and b/public/images/emoji/apple/dart.png differ
diff --git a/public/images/emoji/apple/dash.png b/public/images/emoji/apple/dash.png
index 36dbc3f4449..646ac0944f5 100644
Binary files a/public/images/emoji/apple/dash.png and b/public/images/emoji/apple/dash.png differ
diff --git a/public/images/emoji/apple/date.png b/public/images/emoji/apple/date.png
index db76fcfc1da..50be9f8243c 100644
Binary files a/public/images/emoji/apple/date.png and b/public/images/emoji/apple/date.png differ
diff --git a/public/images/emoji/apple/de.png b/public/images/emoji/apple/de.png
index e7327412869..1782913da19 100644
Binary files a/public/images/emoji/apple/de.png and b/public/images/emoji/apple/de.png differ
diff --git a/public/images/emoji/apple/deciduous_tree.png b/public/images/emoji/apple/deciduous_tree.png
index 50e388a7c3e..445701c84d9 100644
Binary files a/public/images/emoji/apple/deciduous_tree.png and b/public/images/emoji/apple/deciduous_tree.png differ
diff --git a/public/images/emoji/apple/deer.png b/public/images/emoji/apple/deer.png
index 0cf37942c9e..04b77bc0244 100644
Binary files a/public/images/emoji/apple/deer.png and b/public/images/emoji/apple/deer.png differ
diff --git a/public/images/emoji/apple/denmark.png b/public/images/emoji/apple/denmark.png
index 17d683203ca..13d8c95b97e 100644
Binary files a/public/images/emoji/apple/denmark.png and b/public/images/emoji/apple/denmark.png differ
diff --git a/public/images/emoji/apple/department_store.png b/public/images/emoji/apple/department_store.png
index 07ee6e93e02..ec9a0402ffa 100644
Binary files a/public/images/emoji/apple/department_store.png and b/public/images/emoji/apple/department_store.png differ
diff --git a/public/images/emoji/apple/derelict_house.png b/public/images/emoji/apple/derelict_house.png
index f6c42518844..2b6f48ef18b 100644
Binary files a/public/images/emoji/apple/derelict_house.png and b/public/images/emoji/apple/derelict_house.png differ
diff --git a/public/images/emoji/apple/derelict_house_building.png b/public/images/emoji/apple/derelict_house_building.png
index f6c42518844..2b6f48ef18b 100644
Binary files a/public/images/emoji/apple/derelict_house_building.png and b/public/images/emoji/apple/derelict_house_building.png differ
diff --git a/public/images/emoji/apple/desert.png b/public/images/emoji/apple/desert.png
index 5839c71e7fa..8a00eab88c7 100644
Binary files a/public/images/emoji/apple/desert.png and b/public/images/emoji/apple/desert.png differ
diff --git a/public/images/emoji/apple/desert_island.png b/public/images/emoji/apple/desert_island.png
index 8b98bbead11..0d3216e5e70 100644
Binary files a/public/images/emoji/apple/desert_island.png and b/public/images/emoji/apple/desert_island.png differ
diff --git a/public/images/emoji/apple/desktop.png b/public/images/emoji/apple/desktop.png
index e1057cb3d04..26455357d76 100644
Binary files a/public/images/emoji/apple/desktop.png and b/public/images/emoji/apple/desktop.png differ
diff --git a/public/images/emoji/apple/desktop_computer.png b/public/images/emoji/apple/desktop_computer.png
index e1057cb3d04..26455357d76 100644
Binary files a/public/images/emoji/apple/desktop_computer.png and b/public/images/emoji/apple/desktop_computer.png differ
diff --git a/public/images/emoji/apple/diamond_shape_with_a_dot_inside.png b/public/images/emoji/apple/diamond_shape_with_a_dot_inside.png
index 86bcc8cbbd3..3c0504d873a 100644
Binary files a/public/images/emoji/apple/diamond_shape_with_a_dot_inside.png and b/public/images/emoji/apple/diamond_shape_with_a_dot_inside.png differ
diff --git a/public/images/emoji/apple/diamonds.png b/public/images/emoji/apple/diamonds.png
index 7d7a55b4890..20a43b947be 100644
Binary files a/public/images/emoji/apple/diamonds.png and b/public/images/emoji/apple/diamonds.png differ
diff --git a/public/images/emoji/apple/diego_garcia.png b/public/images/emoji/apple/diego_garcia.png
index 1008c45a457..2075d403af3 100644
Binary files a/public/images/emoji/apple/diego_garcia.png and b/public/images/emoji/apple/diego_garcia.png differ
diff --git a/public/images/emoji/apple/disappointed.png b/public/images/emoji/apple/disappointed.png
index 5fd6b7f39cd..ec032bc05e5 100644
Binary files a/public/images/emoji/apple/disappointed.png and b/public/images/emoji/apple/disappointed.png differ
diff --git a/public/images/emoji/apple/disappointed_relieved.png b/public/images/emoji/apple/disappointed_relieved.png
index 2f59bd508fe..6914f151063 100644
Binary files a/public/images/emoji/apple/disappointed_relieved.png and b/public/images/emoji/apple/disappointed_relieved.png differ
diff --git a/public/images/emoji/apple/dividers.png b/public/images/emoji/apple/dividers.png
index 688e41bb2ff..999e527f400 100644
Binary files a/public/images/emoji/apple/dividers.png and b/public/images/emoji/apple/dividers.png differ
diff --git a/public/images/emoji/apple/dizzy.png b/public/images/emoji/apple/dizzy.png
index e006576d514..cb23f146478 100644
Binary files a/public/images/emoji/apple/dizzy.png and b/public/images/emoji/apple/dizzy.png differ
diff --git a/public/images/emoji/apple/dizzy_face.png b/public/images/emoji/apple/dizzy_face.png
index 53dc38507e4..561dc10dfdc 100644
Binary files a/public/images/emoji/apple/dizzy_face.png and b/public/images/emoji/apple/dizzy_face.png differ
diff --git a/public/images/emoji/apple/djibouti.png b/public/images/emoji/apple/djibouti.png
index 8581bbc7d82..b34a1fbcf9e 100644
Binary files a/public/images/emoji/apple/djibouti.png and b/public/images/emoji/apple/djibouti.png differ
diff --git a/public/images/emoji/apple/do_not_litter.png b/public/images/emoji/apple/do_not_litter.png
index b4208f83f89..ee688899446 100644
Binary files a/public/images/emoji/apple/do_not_litter.png and b/public/images/emoji/apple/do_not_litter.png differ
diff --git a/public/images/emoji/apple/dog.png b/public/images/emoji/apple/dog.png
index a2145e68b5e..ef106fb24d0 100644
Binary files a/public/images/emoji/apple/dog.png and b/public/images/emoji/apple/dog.png differ
diff --git a/public/images/emoji/apple/dog2.png b/public/images/emoji/apple/dog2.png
index e0a134d4647..431bd6d5bff 100644
Binary files a/public/images/emoji/apple/dog2.png and b/public/images/emoji/apple/dog2.png differ
diff --git a/public/images/emoji/apple/dollar.png b/public/images/emoji/apple/dollar.png
index d98a38f4960..d4967fdecec 100644
Binary files a/public/images/emoji/apple/dollar.png and b/public/images/emoji/apple/dollar.png differ
diff --git a/public/images/emoji/apple/dolls.png b/public/images/emoji/apple/dolls.png
index 0e7e1bf9108..d02f67ea3b7 100644
Binary files a/public/images/emoji/apple/dolls.png and b/public/images/emoji/apple/dolls.png differ
diff --git a/public/images/emoji/apple/dolphin.png b/public/images/emoji/apple/dolphin.png
index ab393900ec7..d00d68caac3 100644
Binary files a/public/images/emoji/apple/dolphin.png and b/public/images/emoji/apple/dolphin.png differ
diff --git a/public/images/emoji/apple/dominica.png b/public/images/emoji/apple/dominica.png
index b2183a0bded..075d2eb39b3 100644
Binary files a/public/images/emoji/apple/dominica.png and b/public/images/emoji/apple/dominica.png differ
diff --git a/public/images/emoji/apple/dominican_republic.png b/public/images/emoji/apple/dominican_republic.png
index 3848b2a930c..ecbf091919f 100644
Binary files a/public/images/emoji/apple/dominican_republic.png and b/public/images/emoji/apple/dominican_republic.png differ
diff --git a/public/images/emoji/apple/door.png b/public/images/emoji/apple/door.png
index e8e2c50219c..38aab20b938 100644
Binary files a/public/images/emoji/apple/door.png and b/public/images/emoji/apple/door.png differ
diff --git a/public/images/emoji/apple/double_vertical_bar.png b/public/images/emoji/apple/double_vertical_bar.png
index 7f788fbb763..39e49f7ef1a 100644
Binary files a/public/images/emoji/apple/double_vertical_bar.png and b/public/images/emoji/apple/double_vertical_bar.png differ
diff --git a/public/images/emoji/apple/doughnut.png b/public/images/emoji/apple/doughnut.png
index 4a767f03fbc..15be547d3c6 100644
Binary files a/public/images/emoji/apple/doughnut.png and b/public/images/emoji/apple/doughnut.png differ
diff --git a/public/images/emoji/apple/dove.png b/public/images/emoji/apple/dove.png
index 59e34ff9120..42c5cc1334d 100644
Binary files a/public/images/emoji/apple/dove.png and b/public/images/emoji/apple/dove.png differ
diff --git a/public/images/emoji/apple/dove_of_peace.png b/public/images/emoji/apple/dove_of_peace.png
index 59e34ff9120..42c5cc1334d 100644
Binary files a/public/images/emoji/apple/dove_of_peace.png and b/public/images/emoji/apple/dove_of_peace.png differ
diff --git a/public/images/emoji/apple/dragon.png b/public/images/emoji/apple/dragon.png
index 14420b8e037..543d7ae1220 100644
Binary files a/public/images/emoji/apple/dragon.png and b/public/images/emoji/apple/dragon.png differ
diff --git a/public/images/emoji/apple/dragon_face.png b/public/images/emoji/apple/dragon_face.png
index 1133b422566..4ff9d159890 100644
Binary files a/public/images/emoji/apple/dragon_face.png and b/public/images/emoji/apple/dragon_face.png differ
diff --git a/public/images/emoji/apple/dress.png b/public/images/emoji/apple/dress.png
index 64d792e8d84..c7865987c56 100644
Binary files a/public/images/emoji/apple/dress.png and b/public/images/emoji/apple/dress.png differ
diff --git a/public/images/emoji/apple/dromedary_camel.png b/public/images/emoji/apple/dromedary_camel.png
index 7c42f7b8e55..1de319f7d6a 100644
Binary files a/public/images/emoji/apple/dromedary_camel.png and b/public/images/emoji/apple/dromedary_camel.png differ
diff --git a/public/images/emoji/apple/drooling_face.png b/public/images/emoji/apple/drooling_face.png
index 3c8fe7b9008..c8e06b8a0da 100644
Binary files a/public/images/emoji/apple/drooling_face.png and b/public/images/emoji/apple/drooling_face.png differ
diff --git a/public/images/emoji/apple/droplet.png b/public/images/emoji/apple/droplet.png
index e5a511f5c5b..a4e6c9b41dd 100644
Binary files a/public/images/emoji/apple/droplet.png and b/public/images/emoji/apple/droplet.png differ
diff --git a/public/images/emoji/apple/drum.png b/public/images/emoji/apple/drum.png
index 4de7a5ba7ea..5606fdebdde 100644
Binary files a/public/images/emoji/apple/drum.png and b/public/images/emoji/apple/drum.png differ
diff --git a/public/images/emoji/apple/duck.png b/public/images/emoji/apple/duck.png
index e0a5705214c..68e9416dd00 100644
Binary files a/public/images/emoji/apple/duck.png and b/public/images/emoji/apple/duck.png differ
diff --git a/public/images/emoji/apple/dumpling.png b/public/images/emoji/apple/dumpling.png
index 489a779bf69..5c98a30ad40 100644
Binary files a/public/images/emoji/apple/dumpling.png and b/public/images/emoji/apple/dumpling.png differ
diff --git a/public/images/emoji/apple/dvd.png b/public/images/emoji/apple/dvd.png
index 09d9c415f54..22f493dd84b 100644
Binary files a/public/images/emoji/apple/dvd.png and b/public/images/emoji/apple/dvd.png differ
diff --git a/public/images/emoji/apple/e-mail.png b/public/images/emoji/apple/e-mail.png
index 511be647ad4..b4a2b5b7910 100644
Binary files a/public/images/emoji/apple/e-mail.png and b/public/images/emoji/apple/e-mail.png differ
diff --git a/public/images/emoji/apple/eagle.png b/public/images/emoji/apple/eagle.png
index 445c707c0ba..f56ffa5d99b 100644
Binary files a/public/images/emoji/apple/eagle.png and b/public/images/emoji/apple/eagle.png differ
diff --git a/public/images/emoji/apple/ear.png b/public/images/emoji/apple/ear.png
index b6c7ea1c254..db2c25efd44 100644
Binary files a/public/images/emoji/apple/ear.png and b/public/images/emoji/apple/ear.png differ
diff --git a/public/images/emoji/apple/ear/2.png b/public/images/emoji/apple/ear/2.png
index ca5ccc47230..cce8dba6bc4 100644
Binary files a/public/images/emoji/apple/ear/2.png and b/public/images/emoji/apple/ear/2.png differ
diff --git a/public/images/emoji/apple/ear/3.png b/public/images/emoji/apple/ear/3.png
index 19728dcd78f..0cf6de0aaa8 100644
Binary files a/public/images/emoji/apple/ear/3.png and b/public/images/emoji/apple/ear/3.png differ
diff --git a/public/images/emoji/apple/ear/4.png b/public/images/emoji/apple/ear/4.png
index 8fb3fff3577..61fe3abaa16 100644
Binary files a/public/images/emoji/apple/ear/4.png and b/public/images/emoji/apple/ear/4.png differ
diff --git a/public/images/emoji/apple/ear/5.png b/public/images/emoji/apple/ear/5.png
index b70cc564201..50745146810 100644
Binary files a/public/images/emoji/apple/ear/5.png and b/public/images/emoji/apple/ear/5.png differ
diff --git a/public/images/emoji/apple/ear/6.png b/public/images/emoji/apple/ear/6.png
index 59b7bcc95ae..fa994902dc1 100644
Binary files a/public/images/emoji/apple/ear/6.png and b/public/images/emoji/apple/ear/6.png differ
diff --git a/public/images/emoji/apple/ear_of_rice.png b/public/images/emoji/apple/ear_of_rice.png
index 3efff570630..839874f91d5 100644
Binary files a/public/images/emoji/apple/ear_of_rice.png and b/public/images/emoji/apple/ear_of_rice.png differ
diff --git a/public/images/emoji/apple/earth_africa.png b/public/images/emoji/apple/earth_africa.png
index 19c0e250286..6a33a29aecc 100644
Binary files a/public/images/emoji/apple/earth_africa.png and b/public/images/emoji/apple/earth_africa.png differ
diff --git a/public/images/emoji/apple/earth_americas.png b/public/images/emoji/apple/earth_americas.png
index f6ab1f616b0..ebf47c581c6 100644
Binary files a/public/images/emoji/apple/earth_americas.png and b/public/images/emoji/apple/earth_americas.png differ
diff --git a/public/images/emoji/apple/earth_asia.png b/public/images/emoji/apple/earth_asia.png
index 3e7b8e61780..71f07b5d3cd 100644
Binary files a/public/images/emoji/apple/earth_asia.png and b/public/images/emoji/apple/earth_asia.png differ
diff --git a/public/images/emoji/apple/ecuador.png b/public/images/emoji/apple/ecuador.png
index 755cb280275..4e5be0ba7cf 100644
Binary files a/public/images/emoji/apple/ecuador.png and b/public/images/emoji/apple/ecuador.png differ
diff --git a/public/images/emoji/apple/egg.png b/public/images/emoji/apple/egg.png
index fb78dad2398..728a7ccea33 100644
Binary files a/public/images/emoji/apple/egg.png and b/public/images/emoji/apple/egg.png differ
diff --git a/public/images/emoji/apple/eggplant.png b/public/images/emoji/apple/eggplant.png
index f0b76c34ca9..bd97c805811 100644
Binary files a/public/images/emoji/apple/eggplant.png and b/public/images/emoji/apple/eggplant.png differ
diff --git a/public/images/emoji/apple/egypt.png b/public/images/emoji/apple/egypt.png
index 81d5764df11..992b93f42d8 100644
Binary files a/public/images/emoji/apple/egypt.png and b/public/images/emoji/apple/egypt.png differ
diff --git a/public/images/emoji/apple/eight.png b/public/images/emoji/apple/eight.png
index 6269d3b91ab..8ad89e371cf 100644
Binary files a/public/images/emoji/apple/eight.png and b/public/images/emoji/apple/eight.png differ
diff --git a/public/images/emoji/apple/eight_pointed_black_star.png b/public/images/emoji/apple/eight_pointed_black_star.png
index 231d6abc891..0808ad41d97 100644
Binary files a/public/images/emoji/apple/eight_pointed_black_star.png and b/public/images/emoji/apple/eight_pointed_black_star.png differ
diff --git a/public/images/emoji/apple/eight_spoked_asterisk.png b/public/images/emoji/apple/eight_spoked_asterisk.png
index 1f094d2de51..757b307b7a3 100644
Binary files a/public/images/emoji/apple/eight_spoked_asterisk.png and b/public/images/emoji/apple/eight_spoked_asterisk.png differ
diff --git a/public/images/emoji/apple/el_salvador.png b/public/images/emoji/apple/el_salvador.png
index 268812d6054..729c99d9ab1 100644
Binary files a/public/images/emoji/apple/el_salvador.png and b/public/images/emoji/apple/el_salvador.png differ
diff --git a/public/images/emoji/apple/electric_plug.png b/public/images/emoji/apple/electric_plug.png
index 5be3a492f2e..373124e9c6a 100644
Binary files a/public/images/emoji/apple/electric_plug.png and b/public/images/emoji/apple/electric_plug.png differ
diff --git a/public/images/emoji/apple/elephant.png b/public/images/emoji/apple/elephant.png
index 04454bb1aa3..eeddcdb7a73 100644
Binary files a/public/images/emoji/apple/elephant.png and b/public/images/emoji/apple/elephant.png differ
diff --git a/public/images/emoji/apple/elf.png b/public/images/emoji/apple/elf.png
index f8b6dd873e2..2695cd0c8d4 100644
Binary files a/public/images/emoji/apple/elf.png and b/public/images/emoji/apple/elf.png differ
diff --git a/public/images/emoji/apple/elf/2.png b/public/images/emoji/apple/elf/2.png
index 15984024f21..e6c2c292b6a 100644
Binary files a/public/images/emoji/apple/elf/2.png and b/public/images/emoji/apple/elf/2.png differ
diff --git a/public/images/emoji/apple/elf/3.png b/public/images/emoji/apple/elf/3.png
index 4689243a178..113a72895ff 100644
Binary files a/public/images/emoji/apple/elf/3.png and b/public/images/emoji/apple/elf/3.png differ
diff --git a/public/images/emoji/apple/elf/4.png b/public/images/emoji/apple/elf/4.png
index 861cbf808ca..67a73973561 100644
Binary files a/public/images/emoji/apple/elf/4.png and b/public/images/emoji/apple/elf/4.png differ
diff --git a/public/images/emoji/apple/elf/5.png b/public/images/emoji/apple/elf/5.png
index 50748760101..283f672981b 100644
Binary files a/public/images/emoji/apple/elf/5.png and b/public/images/emoji/apple/elf/5.png differ
diff --git a/public/images/emoji/apple/elf/6.png b/public/images/emoji/apple/elf/6.png
index 505c908b180..d207974c328 100644
Binary files a/public/images/emoji/apple/elf/6.png and b/public/images/emoji/apple/elf/6.png differ
diff --git a/public/images/emoji/apple/email.png b/public/images/emoji/apple/email.png
index 511be647ad4..b4a2b5b7910 100644
Binary files a/public/images/emoji/apple/email.png and b/public/images/emoji/apple/email.png differ
diff --git a/public/images/emoji/apple/end.png b/public/images/emoji/apple/end.png
index 55820b7bf92..aed5d180d69 100644
Binary files a/public/images/emoji/apple/end.png and b/public/images/emoji/apple/end.png differ
diff --git a/public/images/emoji/apple/envelope.png b/public/images/emoji/apple/envelope.png
index 511be647ad4..b4a2b5b7910 100644
Binary files a/public/images/emoji/apple/envelope.png and b/public/images/emoji/apple/envelope.png differ
diff --git a/public/images/emoji/apple/envelope_with_arrow.png b/public/images/emoji/apple/envelope_with_arrow.png
index 68e1334683f..2180b2df2b1 100644
Binary files a/public/images/emoji/apple/envelope_with_arrow.png and b/public/images/emoji/apple/envelope_with_arrow.png differ
diff --git a/public/images/emoji/apple/equatorial_guinea.png b/public/images/emoji/apple/equatorial_guinea.png
index 4f4becc0d4e..37fc9fa7d3a 100644
Binary files a/public/images/emoji/apple/equatorial_guinea.png and b/public/images/emoji/apple/equatorial_guinea.png differ
diff --git a/public/images/emoji/apple/eritrea.png b/public/images/emoji/apple/eritrea.png
index 41397be692d..5a97a373aef 100644
Binary files a/public/images/emoji/apple/eritrea.png and b/public/images/emoji/apple/eritrea.png differ
diff --git a/public/images/emoji/apple/es.png b/public/images/emoji/apple/es.png
index 8fca1f0390a..186496322aa 100644
Binary files a/public/images/emoji/apple/es.png and b/public/images/emoji/apple/es.png differ
diff --git a/public/images/emoji/apple/estonia.png b/public/images/emoji/apple/estonia.png
index 30255a24330..5f6391a4cbe 100644
Binary files a/public/images/emoji/apple/estonia.png and b/public/images/emoji/apple/estonia.png differ
diff --git a/public/images/emoji/apple/ethiopia.png b/public/images/emoji/apple/ethiopia.png
index 5c62e06a716..7ecd2deaa33 100644
Binary files a/public/images/emoji/apple/ethiopia.png and b/public/images/emoji/apple/ethiopia.png differ
diff --git a/public/images/emoji/apple/eu.png b/public/images/emoji/apple/eu.png
index 67f06084970..302a87dc1da 100644
Binary files a/public/images/emoji/apple/eu.png and b/public/images/emoji/apple/eu.png differ
diff --git a/public/images/emoji/apple/euro.png b/public/images/emoji/apple/euro.png
index 83a1a7018fe..15a28c393da 100644
Binary files a/public/images/emoji/apple/euro.png and b/public/images/emoji/apple/euro.png differ
diff --git a/public/images/emoji/apple/european_castle.png b/public/images/emoji/apple/european_castle.png
index 97fe6bad2d9..b132e706b8c 100644
Binary files a/public/images/emoji/apple/european_castle.png and b/public/images/emoji/apple/european_castle.png differ
diff --git a/public/images/emoji/apple/european_post_office.png b/public/images/emoji/apple/european_post_office.png
index c1ab53657c7..7210fa93ea1 100644
Binary files a/public/images/emoji/apple/european_post_office.png and b/public/images/emoji/apple/european_post_office.png differ
diff --git a/public/images/emoji/apple/evergreen_tree.png b/public/images/emoji/apple/evergreen_tree.png
index 4609b01c50c..a85c75f8198 100644
Binary files a/public/images/emoji/apple/evergreen_tree.png and b/public/images/emoji/apple/evergreen_tree.png differ
diff --git a/public/images/emoji/apple/exclamation.png b/public/images/emoji/apple/exclamation.png
index d074b414f8f..95618f61c2c 100644
Binary files a/public/images/emoji/apple/exclamation.png and b/public/images/emoji/apple/exclamation.png differ
diff --git a/public/images/emoji/apple/exploding_head.png b/public/images/emoji/apple/exploding_head.png
index 85532dadc7a..f5d752b1370 100644
Binary files a/public/images/emoji/apple/exploding_head.png and b/public/images/emoji/apple/exploding_head.png differ
diff --git a/public/images/emoji/apple/expressionless.png b/public/images/emoji/apple/expressionless.png
index 41cedf753e5..63dfa3ff369 100644
Binary files a/public/images/emoji/apple/expressionless.png and b/public/images/emoji/apple/expressionless.png differ
diff --git a/public/images/emoji/apple/eye.png b/public/images/emoji/apple/eye.png
index a3f3dd64f6c..1d6b0e1261e 100644
Binary files a/public/images/emoji/apple/eye.png and b/public/images/emoji/apple/eye.png differ
diff --git a/public/images/emoji/apple/eyeglasses.png b/public/images/emoji/apple/eyeglasses.png
index 8c5c74e74c2..89fcbdcbd63 100644
Binary files a/public/images/emoji/apple/eyeglasses.png and b/public/images/emoji/apple/eyeglasses.png differ
diff --git a/public/images/emoji/apple/eyes.png b/public/images/emoji/apple/eyes.png
index b28ffc8d7ae..640335ddb82 100644
Binary files a/public/images/emoji/apple/eyes.png and b/public/images/emoji/apple/eyes.png differ
diff --git a/public/images/emoji/apple/face_vomiting.png b/public/images/emoji/apple/face_vomiting.png
index cd7c3d1f2b7..9fc32f1460c 100644
Binary files a/public/images/emoji/apple/face_vomiting.png and b/public/images/emoji/apple/face_vomiting.png differ
diff --git a/public/images/emoji/apple/face_with_hand_over_mouth.png b/public/images/emoji/apple/face_with_hand_over_mouth.png
index aed8f62e0b0..f43af529149 100644
Binary files a/public/images/emoji/apple/face_with_hand_over_mouth.png and b/public/images/emoji/apple/face_with_hand_over_mouth.png differ
diff --git a/public/images/emoji/apple/face_with_head_bandage.png b/public/images/emoji/apple/face_with_head_bandage.png
index 953be45438e..d85d09f68fb 100644
Binary files a/public/images/emoji/apple/face_with_head_bandage.png and b/public/images/emoji/apple/face_with_head_bandage.png differ
diff --git a/public/images/emoji/apple/face_with_monocle.png b/public/images/emoji/apple/face_with_monocle.png
index c6fbb4481d5..284ef0b2e18 100644
Binary files a/public/images/emoji/apple/face_with_monocle.png and b/public/images/emoji/apple/face_with_monocle.png differ
diff --git a/public/images/emoji/apple/face_with_raised_eyebrow.png b/public/images/emoji/apple/face_with_raised_eyebrow.png
index 887f70e3652..b730c0bf4ea 100644
Binary files a/public/images/emoji/apple/face_with_raised_eyebrow.png and b/public/images/emoji/apple/face_with_raised_eyebrow.png differ
diff --git a/public/images/emoji/apple/face_with_rolling_eyes.png b/public/images/emoji/apple/face_with_rolling_eyes.png
index 4da789951ae..f92fc7d7011 100644
Binary files a/public/images/emoji/apple/face_with_rolling_eyes.png and b/public/images/emoji/apple/face_with_rolling_eyes.png differ
diff --git a/public/images/emoji/apple/face_with_symbols_over_mouth.png b/public/images/emoji/apple/face_with_symbols_over_mouth.png
index 84bb9ec9c53..96ca0df6973 100644
Binary files a/public/images/emoji/apple/face_with_symbols_over_mouth.png and b/public/images/emoji/apple/face_with_symbols_over_mouth.png differ
diff --git a/public/images/emoji/apple/face_with_thermometer.png b/public/images/emoji/apple/face_with_thermometer.png
index bc7076dfa31..a0226b19a9c 100644
Binary files a/public/images/emoji/apple/face_with_thermometer.png and b/public/images/emoji/apple/face_with_thermometer.png differ
diff --git a/public/images/emoji/apple/facepunch.png b/public/images/emoji/apple/facepunch.png
index c01cab21b58..724c3168a24 100644
Binary files a/public/images/emoji/apple/facepunch.png and b/public/images/emoji/apple/facepunch.png differ
diff --git a/public/images/emoji/apple/facepunch/2.png b/public/images/emoji/apple/facepunch/2.png
index 1c8dd8dbf32..9617eab4be6 100644
Binary files a/public/images/emoji/apple/facepunch/2.png and b/public/images/emoji/apple/facepunch/2.png differ
diff --git a/public/images/emoji/apple/facepunch/3.png b/public/images/emoji/apple/facepunch/3.png
index 39deb2c7e8c..bf547427b3b 100644
Binary files a/public/images/emoji/apple/facepunch/3.png and b/public/images/emoji/apple/facepunch/3.png differ
diff --git a/public/images/emoji/apple/facepunch/4.png b/public/images/emoji/apple/facepunch/4.png
index ef6df0b9330..2524c849868 100644
Binary files a/public/images/emoji/apple/facepunch/4.png and b/public/images/emoji/apple/facepunch/4.png differ
diff --git a/public/images/emoji/apple/facepunch/5.png b/public/images/emoji/apple/facepunch/5.png
index 8552732ad40..32768222836 100644
Binary files a/public/images/emoji/apple/facepunch/5.png and b/public/images/emoji/apple/facepunch/5.png differ
diff --git a/public/images/emoji/apple/facepunch/6.png b/public/images/emoji/apple/facepunch/6.png
index 24f4a3071ab..fb15dc0475b 100644
Binary files a/public/images/emoji/apple/facepunch/6.png and b/public/images/emoji/apple/facepunch/6.png differ
diff --git a/public/images/emoji/apple/factory.png b/public/images/emoji/apple/factory.png
index 28ff6cc73df..372f7ca6177 100644
Binary files a/public/images/emoji/apple/factory.png and b/public/images/emoji/apple/factory.png differ
diff --git a/public/images/emoji/apple/fairy.png b/public/images/emoji/apple/fairy.png
index 429938294b2..200eed53c2f 100644
Binary files a/public/images/emoji/apple/fairy.png and b/public/images/emoji/apple/fairy.png differ
diff --git a/public/images/emoji/apple/fairy/2.png b/public/images/emoji/apple/fairy/2.png
index 91e1de4e5dc..eb19c9ffddc 100644
Binary files a/public/images/emoji/apple/fairy/2.png and b/public/images/emoji/apple/fairy/2.png differ
diff --git a/public/images/emoji/apple/fairy/3.png b/public/images/emoji/apple/fairy/3.png
index 42821806e92..6cb5555e43c 100644
Binary files a/public/images/emoji/apple/fairy/3.png and b/public/images/emoji/apple/fairy/3.png differ
diff --git a/public/images/emoji/apple/fairy/4.png b/public/images/emoji/apple/fairy/4.png
index 9e8d3adb897..fd39c708eef 100644
Binary files a/public/images/emoji/apple/fairy/4.png and b/public/images/emoji/apple/fairy/4.png differ
diff --git a/public/images/emoji/apple/fairy/5.png b/public/images/emoji/apple/fairy/5.png
index 88d190e3926..22a175bfd7d 100644
Binary files a/public/images/emoji/apple/fairy/5.png and b/public/images/emoji/apple/fairy/5.png differ
diff --git a/public/images/emoji/apple/fairy/6.png b/public/images/emoji/apple/fairy/6.png
index e6ab8ade743..db9e296a548 100644
Binary files a/public/images/emoji/apple/fairy/6.png and b/public/images/emoji/apple/fairy/6.png differ
diff --git a/public/images/emoji/apple/falkland_islands.png b/public/images/emoji/apple/falkland_islands.png
index 74f9b4ddf4b..64d2da05a1b 100644
Binary files a/public/images/emoji/apple/falkland_islands.png and b/public/images/emoji/apple/falkland_islands.png differ
diff --git a/public/images/emoji/apple/fallen_leaf.png b/public/images/emoji/apple/fallen_leaf.png
index 62054c42fa2..97d7ceea95b 100644
Binary files a/public/images/emoji/apple/fallen_leaf.png and b/public/images/emoji/apple/fallen_leaf.png differ
diff --git a/public/images/emoji/apple/family.png b/public/images/emoji/apple/family.png
index 100c01bda8a..825dc822ebb 100644
Binary files a/public/images/emoji/apple/family.png and b/public/images/emoji/apple/family.png differ
diff --git a/public/images/emoji/apple/family_man_boy.png b/public/images/emoji/apple/family_man_boy.png
index d5e6e2a58eb..9d5c0761dfe 100644
Binary files a/public/images/emoji/apple/family_man_boy.png and b/public/images/emoji/apple/family_man_boy.png differ
diff --git a/public/images/emoji/apple/family_man_boy_boy.png b/public/images/emoji/apple/family_man_boy_boy.png
index 1a9f21b2a38..336d8920b46 100644
Binary files a/public/images/emoji/apple/family_man_boy_boy.png and b/public/images/emoji/apple/family_man_boy_boy.png differ
diff --git a/public/images/emoji/apple/family_man_girl.png b/public/images/emoji/apple/family_man_girl.png
index 9af1f5af57f..72fe2d82c2e 100644
Binary files a/public/images/emoji/apple/family_man_girl.png and b/public/images/emoji/apple/family_man_girl.png differ
diff --git a/public/images/emoji/apple/family_man_girl_boy.png b/public/images/emoji/apple/family_man_girl_boy.png
index c5900031b81..4885e6ba096 100644
Binary files a/public/images/emoji/apple/family_man_girl_boy.png and b/public/images/emoji/apple/family_man_girl_boy.png differ
diff --git a/public/images/emoji/apple/family_man_girl_girl.png b/public/images/emoji/apple/family_man_girl_girl.png
index 1f9a1557d53..a6354a63a23 100644
Binary files a/public/images/emoji/apple/family_man_girl_girl.png and b/public/images/emoji/apple/family_man_girl_girl.png differ
diff --git a/public/images/emoji/apple/family_man_man_boy.png b/public/images/emoji/apple/family_man_man_boy.png
index 40020601cb0..1c06364283c 100644
Binary files a/public/images/emoji/apple/family_man_man_boy.png and b/public/images/emoji/apple/family_man_man_boy.png differ
diff --git a/public/images/emoji/apple/family_man_man_boy_boy.png b/public/images/emoji/apple/family_man_man_boy_boy.png
index 57c7b976574..6eccd4eafcd 100644
Binary files a/public/images/emoji/apple/family_man_man_boy_boy.png and b/public/images/emoji/apple/family_man_man_boy_boy.png differ
diff --git a/public/images/emoji/apple/family_man_man_girl.png b/public/images/emoji/apple/family_man_man_girl.png
index 158384d6e36..a00e9043efa 100644
Binary files a/public/images/emoji/apple/family_man_man_girl.png and b/public/images/emoji/apple/family_man_man_girl.png differ
diff --git a/public/images/emoji/apple/family_man_man_girl_boy.png b/public/images/emoji/apple/family_man_man_girl_boy.png
index 3394121d143..38d4863159b 100644
Binary files a/public/images/emoji/apple/family_man_man_girl_boy.png and b/public/images/emoji/apple/family_man_man_girl_boy.png differ
diff --git a/public/images/emoji/apple/family_man_man_girl_girl.png b/public/images/emoji/apple/family_man_man_girl_girl.png
index 97c1f26473f..44df7295642 100644
Binary files a/public/images/emoji/apple/family_man_man_girl_girl.png and b/public/images/emoji/apple/family_man_man_girl_girl.png differ
diff --git a/public/images/emoji/apple/family_man_woman_boy.png b/public/images/emoji/apple/family_man_woman_boy.png
index 4d0ef0c5b01..6b7e1928baa 100644
Binary files a/public/images/emoji/apple/family_man_woman_boy.png and b/public/images/emoji/apple/family_man_woman_boy.png differ
diff --git a/public/images/emoji/apple/family_man_woman_boy_boy.png b/public/images/emoji/apple/family_man_woman_boy_boy.png
index 213af3e02d2..7ddafb91813 100644
Binary files a/public/images/emoji/apple/family_man_woman_boy_boy.png and b/public/images/emoji/apple/family_man_woman_boy_boy.png differ
diff --git a/public/images/emoji/apple/family_man_woman_boys.png b/public/images/emoji/apple/family_man_woman_boys.png
index 213af3e02d2..7ddafb91813 100644
Binary files a/public/images/emoji/apple/family_man_woman_boys.png and b/public/images/emoji/apple/family_man_woman_boys.png differ
diff --git a/public/images/emoji/apple/family_man_woman_girl.png b/public/images/emoji/apple/family_man_woman_girl.png
index c94e760b7aa..f5a722853e1 100644
Binary files a/public/images/emoji/apple/family_man_woman_girl.png and b/public/images/emoji/apple/family_man_woman_girl.png differ
diff --git a/public/images/emoji/apple/family_man_woman_girl_boy.png b/public/images/emoji/apple/family_man_woman_girl_boy.png
index 100c01bda8a..825dc822ebb 100644
Binary files a/public/images/emoji/apple/family_man_woman_girl_boy.png and b/public/images/emoji/apple/family_man_woman_girl_boy.png differ
diff --git a/public/images/emoji/apple/family_man_woman_girl_girl.png b/public/images/emoji/apple/family_man_woman_girl_girl.png
index 004ec8f4274..79583ba21a5 100644
Binary files a/public/images/emoji/apple/family_man_woman_girl_girl.png and b/public/images/emoji/apple/family_man_woman_girl_girl.png differ
diff --git a/public/images/emoji/apple/family_man_woman_girls.png b/public/images/emoji/apple/family_man_woman_girls.png
index 004ec8f4274..79583ba21a5 100644
Binary files a/public/images/emoji/apple/family_man_woman_girls.png and b/public/images/emoji/apple/family_man_woman_girls.png differ
diff --git a/public/images/emoji/apple/family_men_boy.png b/public/images/emoji/apple/family_men_boy.png
index 40020601cb0..1c06364283c 100644
Binary files a/public/images/emoji/apple/family_men_boy.png and b/public/images/emoji/apple/family_men_boy.png differ
diff --git a/public/images/emoji/apple/family_men_boys.png b/public/images/emoji/apple/family_men_boys.png
index 57c7b976574..6eccd4eafcd 100644
Binary files a/public/images/emoji/apple/family_men_boys.png and b/public/images/emoji/apple/family_men_boys.png differ
diff --git a/public/images/emoji/apple/family_men_girl.png b/public/images/emoji/apple/family_men_girl.png
index 158384d6e36..a00e9043efa 100644
Binary files a/public/images/emoji/apple/family_men_girl.png and b/public/images/emoji/apple/family_men_girl.png differ
diff --git a/public/images/emoji/apple/family_men_girl_boy.png b/public/images/emoji/apple/family_men_girl_boy.png
index 3394121d143..38d4863159b 100644
Binary files a/public/images/emoji/apple/family_men_girl_boy.png and b/public/images/emoji/apple/family_men_girl_boy.png differ
diff --git a/public/images/emoji/apple/family_men_girls.png b/public/images/emoji/apple/family_men_girls.png
index 97c1f26473f..44df7295642 100644
Binary files a/public/images/emoji/apple/family_men_girls.png and b/public/images/emoji/apple/family_men_girls.png differ
diff --git a/public/images/emoji/apple/family_woman_boy.png b/public/images/emoji/apple/family_woman_boy.png
index 4d16c607733..f9d0ce98af0 100644
Binary files a/public/images/emoji/apple/family_woman_boy.png and b/public/images/emoji/apple/family_woman_boy.png differ
diff --git a/public/images/emoji/apple/family_woman_boy_boy.png b/public/images/emoji/apple/family_woman_boy_boy.png
index 8713aa91e19..b97e6ee3358 100644
Binary files a/public/images/emoji/apple/family_woman_boy_boy.png and b/public/images/emoji/apple/family_woman_boy_boy.png differ
diff --git a/public/images/emoji/apple/family_woman_girl.png b/public/images/emoji/apple/family_woman_girl.png
index da7c9911315..c39f79c22fb 100644
Binary files a/public/images/emoji/apple/family_woman_girl.png and b/public/images/emoji/apple/family_woman_girl.png differ
diff --git a/public/images/emoji/apple/family_woman_girl_boy.png b/public/images/emoji/apple/family_woman_girl_boy.png
index 0c28c1f8949..b4d240c8961 100644
Binary files a/public/images/emoji/apple/family_woman_girl_boy.png and b/public/images/emoji/apple/family_woman_girl_boy.png differ
diff --git a/public/images/emoji/apple/family_woman_girl_girl.png b/public/images/emoji/apple/family_woman_girl_girl.png
index ac197a85fe5..a165a4bdff2 100644
Binary files a/public/images/emoji/apple/family_woman_girl_girl.png and b/public/images/emoji/apple/family_woman_girl_girl.png differ
diff --git a/public/images/emoji/apple/family_woman_woman_boy.png b/public/images/emoji/apple/family_woman_woman_boy.png
index 039d152d5bd..aa40b725872 100644
Binary files a/public/images/emoji/apple/family_woman_woman_boy.png and b/public/images/emoji/apple/family_woman_woman_boy.png differ
diff --git a/public/images/emoji/apple/family_woman_woman_boy_boy.png b/public/images/emoji/apple/family_woman_woman_boy_boy.png
index e70b13476b9..2f50d66b1bc 100644
Binary files a/public/images/emoji/apple/family_woman_woman_boy_boy.png and b/public/images/emoji/apple/family_woman_woman_boy_boy.png differ
diff --git a/public/images/emoji/apple/family_woman_woman_girl.png b/public/images/emoji/apple/family_woman_woman_girl.png
index c71257738d3..f2373c7666d 100644
Binary files a/public/images/emoji/apple/family_woman_woman_girl.png and b/public/images/emoji/apple/family_woman_woman_girl.png differ
diff --git a/public/images/emoji/apple/family_woman_woman_girl_boy.png b/public/images/emoji/apple/family_woman_woman_girl_boy.png
index 85f7db36571..985ef70a768 100644
Binary files a/public/images/emoji/apple/family_woman_woman_girl_boy.png and b/public/images/emoji/apple/family_woman_woman_girl_boy.png differ
diff --git a/public/images/emoji/apple/family_woman_woman_girl_girl.png b/public/images/emoji/apple/family_woman_woman_girl_girl.png
index aa6768144c7..5db77269dd2 100644
Binary files a/public/images/emoji/apple/family_woman_woman_girl_girl.png and b/public/images/emoji/apple/family_woman_woman_girl_girl.png differ
diff --git a/public/images/emoji/apple/family_women_boy.png b/public/images/emoji/apple/family_women_boy.png
index 039d152d5bd..aa40b725872 100644
Binary files a/public/images/emoji/apple/family_women_boy.png and b/public/images/emoji/apple/family_women_boy.png differ
diff --git a/public/images/emoji/apple/family_women_boys.png b/public/images/emoji/apple/family_women_boys.png
index e70b13476b9..2f50d66b1bc 100644
Binary files a/public/images/emoji/apple/family_women_boys.png and b/public/images/emoji/apple/family_women_boys.png differ
diff --git a/public/images/emoji/apple/family_women_girl.png b/public/images/emoji/apple/family_women_girl.png
index c71257738d3..f2373c7666d 100644
Binary files a/public/images/emoji/apple/family_women_girl.png and b/public/images/emoji/apple/family_women_girl.png differ
diff --git a/public/images/emoji/apple/family_women_girl_boy.png b/public/images/emoji/apple/family_women_girl_boy.png
index 85f7db36571..985ef70a768 100644
Binary files a/public/images/emoji/apple/family_women_girl_boy.png and b/public/images/emoji/apple/family_women_girl_boy.png differ
diff --git a/public/images/emoji/apple/family_women_girls.png b/public/images/emoji/apple/family_women_girls.png
index aa6768144c7..5db77269dd2 100644
Binary files a/public/images/emoji/apple/family_women_girls.png and b/public/images/emoji/apple/family_women_girls.png differ
diff --git a/public/images/emoji/apple/faroe_islands.png b/public/images/emoji/apple/faroe_islands.png
index d25d24ead60..f969a72c9df 100644
Binary files a/public/images/emoji/apple/faroe_islands.png and b/public/images/emoji/apple/faroe_islands.png differ
diff --git a/public/images/emoji/apple/fast_forward.png b/public/images/emoji/apple/fast_forward.png
index b572d4c18f6..634ed68d012 100644
Binary files a/public/images/emoji/apple/fast_forward.png and b/public/images/emoji/apple/fast_forward.png differ
diff --git a/public/images/emoji/apple/fax.png b/public/images/emoji/apple/fax.png
index 17a81c529a6..55ddc297a39 100644
Binary files a/public/images/emoji/apple/fax.png and b/public/images/emoji/apple/fax.png differ
diff --git a/public/images/emoji/apple/fearful.png b/public/images/emoji/apple/fearful.png
index 34420892eb6..6db83761dfc 100644
Binary files a/public/images/emoji/apple/fearful.png and b/public/images/emoji/apple/fearful.png differ
diff --git a/public/images/emoji/apple/feet.png b/public/images/emoji/apple/feet.png
index 90e0440afcf..ab3733bfe03 100644
Binary files a/public/images/emoji/apple/feet.png and b/public/images/emoji/apple/feet.png differ
diff --git a/public/images/emoji/apple/female_couple_with_heart.png b/public/images/emoji/apple/female_couple_with_heart.png
index 8f924c75cfb..e388ccded95 100644
Binary files a/public/images/emoji/apple/female_couple_with_heart.png and b/public/images/emoji/apple/female_couple_with_heart.png differ
diff --git a/public/images/emoji/apple/female_couplekiss.png b/public/images/emoji/apple/female_couplekiss.png
index 13d6801c47a..1cf5535a8a9 100644
Binary files a/public/images/emoji/apple/female_couplekiss.png and b/public/images/emoji/apple/female_couplekiss.png differ
diff --git a/public/images/emoji/apple/female_detective.png b/public/images/emoji/apple/female_detective.png
index 975fdf28c9c..e934802d11b 100644
Binary files a/public/images/emoji/apple/female_detective.png and b/public/images/emoji/apple/female_detective.png differ
diff --git a/public/images/emoji/apple/ferris_wheel.png b/public/images/emoji/apple/ferris_wheel.png
index a7e1395cad5..6e0ac860f39 100644
Binary files a/public/images/emoji/apple/ferris_wheel.png and b/public/images/emoji/apple/ferris_wheel.png differ
diff --git a/public/images/emoji/apple/ferry.png b/public/images/emoji/apple/ferry.png
index ee0b0e5e7ae..2d33514a531 100644
Binary files a/public/images/emoji/apple/ferry.png and b/public/images/emoji/apple/ferry.png differ
diff --git a/public/images/emoji/apple/field_hockey.png b/public/images/emoji/apple/field_hockey.png
index bccfae66577..ef8fe9ecb8c 100644
Binary files a/public/images/emoji/apple/field_hockey.png and b/public/images/emoji/apple/field_hockey.png differ
diff --git a/public/images/emoji/apple/fiji.png b/public/images/emoji/apple/fiji.png
index ed75e1a7db0..b7845aa5c62 100644
Binary files a/public/images/emoji/apple/fiji.png and b/public/images/emoji/apple/fiji.png differ
diff --git a/public/images/emoji/apple/file_cabinet.png b/public/images/emoji/apple/file_cabinet.png
index 0f2f79c9db6..3c7456b489c 100644
Binary files a/public/images/emoji/apple/file_cabinet.png and b/public/images/emoji/apple/file_cabinet.png differ
diff --git a/public/images/emoji/apple/file_folder.png b/public/images/emoji/apple/file_folder.png
index bc88b6c48c4..20806329fd9 100644
Binary files a/public/images/emoji/apple/file_folder.png and b/public/images/emoji/apple/file_folder.png differ
diff --git a/public/images/emoji/apple/film_frames.png b/public/images/emoji/apple/film_frames.png
index 043221da538..e90e37c95a4 100644
Binary files a/public/images/emoji/apple/film_frames.png and b/public/images/emoji/apple/film_frames.png differ
diff --git a/public/images/emoji/apple/film_projector.png b/public/images/emoji/apple/film_projector.png
index add4400d044..e35cf26b53b 100644
Binary files a/public/images/emoji/apple/film_projector.png and b/public/images/emoji/apple/film_projector.png differ
diff --git a/public/images/emoji/apple/film_strip.png b/public/images/emoji/apple/film_strip.png
index 043221da538..e90e37c95a4 100644
Binary files a/public/images/emoji/apple/film_strip.png and b/public/images/emoji/apple/film_strip.png differ
diff --git a/public/images/emoji/apple/finland.png b/public/images/emoji/apple/finland.png
index 89e088c5845..1d48ecf108d 100644
Binary files a/public/images/emoji/apple/finland.png and b/public/images/emoji/apple/finland.png differ
diff --git a/public/images/emoji/apple/fire.png b/public/images/emoji/apple/fire.png
index a82ae1ee4f3..e359c3ffa1e 100644
Binary files a/public/images/emoji/apple/fire.png and b/public/images/emoji/apple/fire.png differ
diff --git a/public/images/emoji/apple/fire_engine.png b/public/images/emoji/apple/fire_engine.png
index 40552da1e82..fc069800b25 100644
Binary files a/public/images/emoji/apple/fire_engine.png and b/public/images/emoji/apple/fire_engine.png differ
diff --git a/public/images/emoji/apple/fireworks.png b/public/images/emoji/apple/fireworks.png
index de37ce8bcfa..5aee8ce9196 100644
Binary files a/public/images/emoji/apple/fireworks.png and b/public/images/emoji/apple/fireworks.png differ
diff --git a/public/images/emoji/apple/first_quarter_moon.png b/public/images/emoji/apple/first_quarter_moon.png
index c7f8ed43b5e..c91eeba4d21 100644
Binary files a/public/images/emoji/apple/first_quarter_moon.png and b/public/images/emoji/apple/first_quarter_moon.png differ
diff --git a/public/images/emoji/apple/first_quarter_moon_with_face.png b/public/images/emoji/apple/first_quarter_moon_with_face.png
index dc0c46be80e..d84191ec5a4 100644
Binary files a/public/images/emoji/apple/first_quarter_moon_with_face.png and b/public/images/emoji/apple/first_quarter_moon_with_face.png differ
diff --git a/public/images/emoji/apple/fish.png b/public/images/emoji/apple/fish.png
index 0a927f82023..f716fc4e812 100644
Binary files a/public/images/emoji/apple/fish.png and b/public/images/emoji/apple/fish.png differ
diff --git a/public/images/emoji/apple/fish_cake.png b/public/images/emoji/apple/fish_cake.png
index 2babbb0dd95..a17fb7cef33 100644
Binary files a/public/images/emoji/apple/fish_cake.png and b/public/images/emoji/apple/fish_cake.png differ
diff --git a/public/images/emoji/apple/fishing_pole_and_fish.png b/public/images/emoji/apple/fishing_pole_and_fish.png
index cdece2b307f..7ec134d9b07 100644
Binary files a/public/images/emoji/apple/fishing_pole_and_fish.png and b/public/images/emoji/apple/fishing_pole_and_fish.png differ
diff --git a/public/images/emoji/apple/fist.png b/public/images/emoji/apple/fist.png
index 354355676d8..ef33fcf1597 100644
Binary files a/public/images/emoji/apple/fist.png and b/public/images/emoji/apple/fist.png differ
diff --git a/public/images/emoji/apple/fist/2.png b/public/images/emoji/apple/fist/2.png
index 56285b20a88..02cca24041c 100644
Binary files a/public/images/emoji/apple/fist/2.png and b/public/images/emoji/apple/fist/2.png differ
diff --git a/public/images/emoji/apple/fist/3.png b/public/images/emoji/apple/fist/3.png
index 65407645907..2f7954633f8 100644
Binary files a/public/images/emoji/apple/fist/3.png and b/public/images/emoji/apple/fist/3.png differ
diff --git a/public/images/emoji/apple/fist/4.png b/public/images/emoji/apple/fist/4.png
index 1ab8f2389d6..0185ec34341 100644
Binary files a/public/images/emoji/apple/fist/4.png and b/public/images/emoji/apple/fist/4.png differ
diff --git a/public/images/emoji/apple/fist/5.png b/public/images/emoji/apple/fist/5.png
index 59bf4d86638..9f01e325fa3 100644
Binary files a/public/images/emoji/apple/fist/5.png and b/public/images/emoji/apple/fist/5.png differ
diff --git a/public/images/emoji/apple/fist/6.png b/public/images/emoji/apple/fist/6.png
index 8f30f679368..433f55ad535 100644
Binary files a/public/images/emoji/apple/fist/6.png and b/public/images/emoji/apple/fist/6.png differ
diff --git a/public/images/emoji/apple/fist_left.png b/public/images/emoji/apple/fist_left.png
index e42595f193e..9119535321d 100644
Binary files a/public/images/emoji/apple/fist_left.png and b/public/images/emoji/apple/fist_left.png differ
diff --git a/public/images/emoji/apple/fist_left/2.png b/public/images/emoji/apple/fist_left/2.png
index 82e6f4dc748..e958cdfb2c1 100644
Binary files a/public/images/emoji/apple/fist_left/2.png and b/public/images/emoji/apple/fist_left/2.png differ
diff --git a/public/images/emoji/apple/fist_left/3.png b/public/images/emoji/apple/fist_left/3.png
index b478c30cbe4..04ed159bfb8 100644
Binary files a/public/images/emoji/apple/fist_left/3.png and b/public/images/emoji/apple/fist_left/3.png differ
diff --git a/public/images/emoji/apple/fist_left/4.png b/public/images/emoji/apple/fist_left/4.png
index c8784ff9610..648329ca4b4 100644
Binary files a/public/images/emoji/apple/fist_left/4.png and b/public/images/emoji/apple/fist_left/4.png differ
diff --git a/public/images/emoji/apple/fist_left/5.png b/public/images/emoji/apple/fist_left/5.png
index 4fa222dcf9c..c2ab2930ea0 100644
Binary files a/public/images/emoji/apple/fist_left/5.png and b/public/images/emoji/apple/fist_left/5.png differ
diff --git a/public/images/emoji/apple/fist_left/6.png b/public/images/emoji/apple/fist_left/6.png
index 8b21664f07f..7c571657c6a 100644
Binary files a/public/images/emoji/apple/fist_left/6.png and b/public/images/emoji/apple/fist_left/6.png differ
diff --git a/public/images/emoji/apple/fist_right.png b/public/images/emoji/apple/fist_right.png
index 297aca7b8f7..b01819c3743 100644
Binary files a/public/images/emoji/apple/fist_right.png and b/public/images/emoji/apple/fist_right.png differ
diff --git a/public/images/emoji/apple/fist_right/2.png b/public/images/emoji/apple/fist_right/2.png
index ca9bd453dcd..14e408e98ec 100644
Binary files a/public/images/emoji/apple/fist_right/2.png and b/public/images/emoji/apple/fist_right/2.png differ
diff --git a/public/images/emoji/apple/fist_right/3.png b/public/images/emoji/apple/fist_right/3.png
index e95c238d062..6360aed0238 100644
Binary files a/public/images/emoji/apple/fist_right/3.png and b/public/images/emoji/apple/fist_right/3.png differ
diff --git a/public/images/emoji/apple/fist_right/4.png b/public/images/emoji/apple/fist_right/4.png
index 787f7fdd80a..1105bafd3d0 100644
Binary files a/public/images/emoji/apple/fist_right/4.png and b/public/images/emoji/apple/fist_right/4.png differ
diff --git a/public/images/emoji/apple/fist_right/5.png b/public/images/emoji/apple/fist_right/5.png
index a32f3128f8e..5b719bde1fc 100644
Binary files a/public/images/emoji/apple/fist_right/5.png and b/public/images/emoji/apple/fist_right/5.png differ
diff --git a/public/images/emoji/apple/fist_right/6.png b/public/images/emoji/apple/fist_right/6.png
index ca7be414ac4..f8f76193e70 100644
Binary files a/public/images/emoji/apple/fist_right/6.png and b/public/images/emoji/apple/fist_right/6.png differ
diff --git a/public/images/emoji/apple/five.png b/public/images/emoji/apple/five.png
index 5c85432a268..964b73bfc6e 100644
Binary files a/public/images/emoji/apple/five.png and b/public/images/emoji/apple/five.png differ
diff --git a/public/images/emoji/apple/flag_black.png b/public/images/emoji/apple/flag_black.png
index 36a0a6987d1..eefde1e3330 100644
Binary files a/public/images/emoji/apple/flag_black.png and b/public/images/emoji/apple/flag_black.png differ
diff --git a/public/images/emoji/apple/flag_cn.png b/public/images/emoji/apple/flag_cn.png
index 9c969f94c50..b7611c09e48 100644
Binary files a/public/images/emoji/apple/flag_cn.png and b/public/images/emoji/apple/flag_cn.png differ
diff --git a/public/images/emoji/apple/flag_de.png b/public/images/emoji/apple/flag_de.png
index e7327412869..1782913da19 100644
Binary files a/public/images/emoji/apple/flag_de.png and b/public/images/emoji/apple/flag_de.png differ
diff --git a/public/images/emoji/apple/flag_es.png b/public/images/emoji/apple/flag_es.png
index 8fca1f0390a..186496322aa 100644
Binary files a/public/images/emoji/apple/flag_es.png and b/public/images/emoji/apple/flag_es.png differ
diff --git a/public/images/emoji/apple/flag_fr.png b/public/images/emoji/apple/flag_fr.png
index efcd5fff75f..3360b84a7fa 100644
Binary files a/public/images/emoji/apple/flag_fr.png and b/public/images/emoji/apple/flag_fr.png differ
diff --git a/public/images/emoji/apple/flag_gb.png b/public/images/emoji/apple/flag_gb.png
index 1d15d6cb969..13964cb5143 100644
Binary files a/public/images/emoji/apple/flag_gb.png and b/public/images/emoji/apple/flag_gb.png differ
diff --git a/public/images/emoji/apple/flag_it.png b/public/images/emoji/apple/flag_it.png
index 0e5bc29dad6..6df1491cd3d 100644
Binary files a/public/images/emoji/apple/flag_it.png and b/public/images/emoji/apple/flag_it.png differ
diff --git a/public/images/emoji/apple/flag_jp.png b/public/images/emoji/apple/flag_jp.png
index 4462748e589..d02250af7e8 100644
Binary files a/public/images/emoji/apple/flag_jp.png and b/public/images/emoji/apple/flag_jp.png differ
diff --git a/public/images/emoji/apple/flag_kr.png b/public/images/emoji/apple/flag_kr.png
index d63cf96b43c..bc8349f75db 100644
Binary files a/public/images/emoji/apple/flag_kr.png and b/public/images/emoji/apple/flag_kr.png differ
diff --git a/public/images/emoji/apple/flag_ru.png b/public/images/emoji/apple/flag_ru.png
index ebd82f4a526..ef8ffd3faf9 100644
Binary files a/public/images/emoji/apple/flag_ru.png and b/public/images/emoji/apple/flag_ru.png differ
diff --git a/public/images/emoji/apple/flag_us.png b/public/images/emoji/apple/flag_us.png
index 64a5e528d90..1ef8e462466 100644
Binary files a/public/images/emoji/apple/flag_us.png and b/public/images/emoji/apple/flag_us.png differ
diff --git a/public/images/emoji/apple/flag_white.png b/public/images/emoji/apple/flag_white.png
index 16ed8e6169c..df32f19fb81 100644
Binary files a/public/images/emoji/apple/flag_white.png and b/public/images/emoji/apple/flag_white.png differ
diff --git a/public/images/emoji/apple/flags.png b/public/images/emoji/apple/flags.png
index 30d7cf30704..f2c330cc2da 100644
Binary files a/public/images/emoji/apple/flags.png and b/public/images/emoji/apple/flags.png differ
diff --git a/public/images/emoji/apple/flame.png b/public/images/emoji/apple/flame.png
index a82ae1ee4f3..e359c3ffa1e 100644
Binary files a/public/images/emoji/apple/flame.png and b/public/images/emoji/apple/flame.png differ
diff --git a/public/images/emoji/apple/flashlight.png b/public/images/emoji/apple/flashlight.png
index 0bc1f97f799..7b16661a58e 100644
Binary files a/public/images/emoji/apple/flashlight.png and b/public/images/emoji/apple/flashlight.png differ
diff --git a/public/images/emoji/apple/fleur-de-lis.png b/public/images/emoji/apple/fleur-de-lis.png
index d0cf7fc2278..87663369bd4 100644
Binary files a/public/images/emoji/apple/fleur-de-lis.png and b/public/images/emoji/apple/fleur-de-lis.png differ
diff --git a/public/images/emoji/apple/fleur_de_lis.png b/public/images/emoji/apple/fleur_de_lis.png
index d0cf7fc2278..87663369bd4 100644
Binary files a/public/images/emoji/apple/fleur_de_lis.png and b/public/images/emoji/apple/fleur_de_lis.png differ
diff --git a/public/images/emoji/apple/flight_arrival.png b/public/images/emoji/apple/flight_arrival.png
index c716ff21866..bc6e857587f 100644
Binary files a/public/images/emoji/apple/flight_arrival.png and b/public/images/emoji/apple/flight_arrival.png differ
diff --git a/public/images/emoji/apple/flight_departure.png b/public/images/emoji/apple/flight_departure.png
index d1fcea18b8a..b6bd873830b 100644
Binary files a/public/images/emoji/apple/flight_departure.png and b/public/images/emoji/apple/flight_departure.png differ
diff --git a/public/images/emoji/apple/floppy_disk.png b/public/images/emoji/apple/floppy_disk.png
index 75b06ec087c..883b7600c94 100644
Binary files a/public/images/emoji/apple/floppy_disk.png and b/public/images/emoji/apple/floppy_disk.png differ
diff --git a/public/images/emoji/apple/flower_playing_cards.png b/public/images/emoji/apple/flower_playing_cards.png
index e3db650f43d..a1480b9493f 100644
Binary files a/public/images/emoji/apple/flower_playing_cards.png and b/public/images/emoji/apple/flower_playing_cards.png differ
diff --git a/public/images/emoji/apple/flushed.png b/public/images/emoji/apple/flushed.png
index a67fccb60e1..2766fb93123 100644
Binary files a/public/images/emoji/apple/flushed.png and b/public/images/emoji/apple/flushed.png differ
diff --git a/public/images/emoji/apple/flying_saucer.png b/public/images/emoji/apple/flying_saucer.png
index 7d5c8628554..8e3053985f3 100644
Binary files a/public/images/emoji/apple/flying_saucer.png and b/public/images/emoji/apple/flying_saucer.png differ
diff --git a/public/images/emoji/apple/fog.png b/public/images/emoji/apple/fog.png
index 7dd185d50f4..660441840d3 100644
Binary files a/public/images/emoji/apple/fog.png and b/public/images/emoji/apple/fog.png differ
diff --git a/public/images/emoji/apple/foggy.png b/public/images/emoji/apple/foggy.png
index 32200d7f8e3..d9ba29dfb05 100644
Binary files a/public/images/emoji/apple/foggy.png and b/public/images/emoji/apple/foggy.png differ
diff --git a/public/images/emoji/apple/football.png b/public/images/emoji/apple/football.png
index 40a806bd974..fa456d817ce 100644
Binary files a/public/images/emoji/apple/football.png and b/public/images/emoji/apple/football.png differ
diff --git a/public/images/emoji/apple/footprints.png b/public/images/emoji/apple/footprints.png
index 90e0440afcf..ab3733bfe03 100644
Binary files a/public/images/emoji/apple/footprints.png and b/public/images/emoji/apple/footprints.png differ
diff --git a/public/images/emoji/apple/fork_and_knife.png b/public/images/emoji/apple/fork_and_knife.png
index a01e82ebcf9..25b70c8c80c 100644
Binary files a/public/images/emoji/apple/fork_and_knife.png and b/public/images/emoji/apple/fork_and_knife.png differ
diff --git a/public/images/emoji/apple/fork_and_knife_with_plate.png b/public/images/emoji/apple/fork_and_knife_with_plate.png
index 54bd5dc10a4..d21ca8c74d5 100644
Binary files a/public/images/emoji/apple/fork_and_knife_with_plate.png and b/public/images/emoji/apple/fork_and_knife_with_plate.png differ
diff --git a/public/images/emoji/apple/fork_knife_plate.png b/public/images/emoji/apple/fork_knife_plate.png
index 54bd5dc10a4..d21ca8c74d5 100644
Binary files a/public/images/emoji/apple/fork_knife_plate.png and b/public/images/emoji/apple/fork_knife_plate.png differ
diff --git a/public/images/emoji/apple/fortune_cookie.png b/public/images/emoji/apple/fortune_cookie.png
index 94a8cdca403..e3a5d1b1771 100644
Binary files a/public/images/emoji/apple/fortune_cookie.png and b/public/images/emoji/apple/fortune_cookie.png differ
diff --git a/public/images/emoji/apple/fountain.png b/public/images/emoji/apple/fountain.png
index c6fa8ddb0c4..73a23f43589 100644
Binary files a/public/images/emoji/apple/fountain.png and b/public/images/emoji/apple/fountain.png differ
diff --git a/public/images/emoji/apple/fountain_pen.png b/public/images/emoji/apple/fountain_pen.png
index a9a947848d8..044cbf89175 100644
Binary files a/public/images/emoji/apple/fountain_pen.png and b/public/images/emoji/apple/fountain_pen.png differ
diff --git a/public/images/emoji/apple/four.png b/public/images/emoji/apple/four.png
index 3800d040764..523c26e10b7 100644
Binary files a/public/images/emoji/apple/four.png and b/public/images/emoji/apple/four.png differ
diff --git a/public/images/emoji/apple/four_leaf_clover.png b/public/images/emoji/apple/four_leaf_clover.png
index 48483d4c4cf..4b7b6d457f5 100644
Binary files a/public/images/emoji/apple/four_leaf_clover.png and b/public/images/emoji/apple/four_leaf_clover.png differ
diff --git a/public/images/emoji/apple/fox_face.png b/public/images/emoji/apple/fox_face.png
index d07aefd8421..95f18df0edc 100644
Binary files a/public/images/emoji/apple/fox_face.png and b/public/images/emoji/apple/fox_face.png differ
diff --git a/public/images/emoji/apple/fr.png b/public/images/emoji/apple/fr.png
index efcd5fff75f..3360b84a7fa 100644
Binary files a/public/images/emoji/apple/fr.png and b/public/images/emoji/apple/fr.png differ
diff --git a/public/images/emoji/apple/frame_photo.png b/public/images/emoji/apple/frame_photo.png
index aaca2338d63..642db749d30 100644
Binary files a/public/images/emoji/apple/frame_photo.png and b/public/images/emoji/apple/frame_photo.png differ
diff --git a/public/images/emoji/apple/frame_with_picture.png b/public/images/emoji/apple/frame_with_picture.png
index aaca2338d63..642db749d30 100644
Binary files a/public/images/emoji/apple/frame_with_picture.png and b/public/images/emoji/apple/frame_with_picture.png differ
diff --git a/public/images/emoji/apple/framed_picture.png b/public/images/emoji/apple/framed_picture.png
index aaca2338d63..642db749d30 100644
Binary files a/public/images/emoji/apple/framed_picture.png and b/public/images/emoji/apple/framed_picture.png differ
diff --git a/public/images/emoji/apple/free.png b/public/images/emoji/apple/free.png
index 846f230e279..5e65534318a 100644
Binary files a/public/images/emoji/apple/free.png and b/public/images/emoji/apple/free.png differ
diff --git a/public/images/emoji/apple/french_guiana.png b/public/images/emoji/apple/french_guiana.png
index a816d9029b7..d7cb1e1f7f9 100644
Binary files a/public/images/emoji/apple/french_guiana.png and b/public/images/emoji/apple/french_guiana.png differ
diff --git a/public/images/emoji/apple/french_polynesia.png b/public/images/emoji/apple/french_polynesia.png
index 995998a8163..a594976e6a0 100644
Binary files a/public/images/emoji/apple/french_polynesia.png and b/public/images/emoji/apple/french_polynesia.png differ
diff --git a/public/images/emoji/apple/french_southern_territories.png b/public/images/emoji/apple/french_southern_territories.png
index a80ba97496b..f580ff4e36b 100644
Binary files a/public/images/emoji/apple/french_southern_territories.png and b/public/images/emoji/apple/french_southern_territories.png differ
diff --git a/public/images/emoji/apple/fried_egg.png b/public/images/emoji/apple/fried_egg.png
index 3479598fdcf..8a7eb21ddb4 100644
Binary files a/public/images/emoji/apple/fried_egg.png and b/public/images/emoji/apple/fried_egg.png differ
diff --git a/public/images/emoji/apple/fried_shrimp.png b/public/images/emoji/apple/fried_shrimp.png
index b72fcc4d8d0..9624f2f3b68 100644
Binary files a/public/images/emoji/apple/fried_shrimp.png and b/public/images/emoji/apple/fried_shrimp.png differ
diff --git a/public/images/emoji/apple/fries.png b/public/images/emoji/apple/fries.png
index a0c633dab48..ed9018cf682 100644
Binary files a/public/images/emoji/apple/fries.png and b/public/images/emoji/apple/fries.png differ
diff --git a/public/images/emoji/apple/frog.png b/public/images/emoji/apple/frog.png
index 2143534e9a5..e007bcc5547 100644
Binary files a/public/images/emoji/apple/frog.png and b/public/images/emoji/apple/frog.png differ
diff --git a/public/images/emoji/apple/frowning.png b/public/images/emoji/apple/frowning.png
index b890f3162a3..0dc0ad10d96 100644
Binary files a/public/images/emoji/apple/frowning.png and b/public/images/emoji/apple/frowning.png differ
diff --git a/public/images/emoji/apple/frowning2.png b/public/images/emoji/apple/frowning2.png
index ad1715f8a4d..a61abf6dff8 100644
Binary files a/public/images/emoji/apple/frowning2.png and b/public/images/emoji/apple/frowning2.png differ
diff --git a/public/images/emoji/apple/frowning_face.png b/public/images/emoji/apple/frowning_face.png
index ad1715f8a4d..a61abf6dff8 100644
Binary files a/public/images/emoji/apple/frowning_face.png and b/public/images/emoji/apple/frowning_face.png differ
diff --git a/public/images/emoji/apple/frowning_man.png b/public/images/emoji/apple/frowning_man.png
index 3beb9a2f2d6..fc48f230d34 100644
Binary files a/public/images/emoji/apple/frowning_man.png and b/public/images/emoji/apple/frowning_man.png differ
diff --git a/public/images/emoji/apple/frowning_man/2.png b/public/images/emoji/apple/frowning_man/2.png
index 8081a99c5f9..674c28ec636 100644
Binary files a/public/images/emoji/apple/frowning_man/2.png and b/public/images/emoji/apple/frowning_man/2.png differ
diff --git a/public/images/emoji/apple/frowning_man/3.png b/public/images/emoji/apple/frowning_man/3.png
index 515f0a219b2..8e12d5a8203 100644
Binary files a/public/images/emoji/apple/frowning_man/3.png and b/public/images/emoji/apple/frowning_man/3.png differ
diff --git a/public/images/emoji/apple/frowning_man/4.png b/public/images/emoji/apple/frowning_man/4.png
index 6d128581318..7134a237a21 100644
Binary files a/public/images/emoji/apple/frowning_man/4.png and b/public/images/emoji/apple/frowning_man/4.png differ
diff --git a/public/images/emoji/apple/frowning_man/5.png b/public/images/emoji/apple/frowning_man/5.png
index 95d1122106e..ee4e2307d8d 100644
Binary files a/public/images/emoji/apple/frowning_man/5.png and b/public/images/emoji/apple/frowning_man/5.png differ
diff --git a/public/images/emoji/apple/frowning_man/6.png b/public/images/emoji/apple/frowning_man/6.png
index d1282dd94b3..4b03b49a114 100644
Binary files a/public/images/emoji/apple/frowning_man/6.png and b/public/images/emoji/apple/frowning_man/6.png differ
diff --git a/public/images/emoji/apple/frowning_woman.png b/public/images/emoji/apple/frowning_woman.png
index d06a0aa7333..2b60bebc470 100644
Binary files a/public/images/emoji/apple/frowning_woman.png and b/public/images/emoji/apple/frowning_woman.png differ
diff --git a/public/images/emoji/apple/frowning_woman/2.png b/public/images/emoji/apple/frowning_woman/2.png
index aa34de20948..88d597918b3 100644
Binary files a/public/images/emoji/apple/frowning_woman/2.png and b/public/images/emoji/apple/frowning_woman/2.png differ
diff --git a/public/images/emoji/apple/frowning_woman/3.png b/public/images/emoji/apple/frowning_woman/3.png
index 638e52f05c7..a5184a96fff 100644
Binary files a/public/images/emoji/apple/frowning_woman/3.png and b/public/images/emoji/apple/frowning_woman/3.png differ
diff --git a/public/images/emoji/apple/frowning_woman/4.png b/public/images/emoji/apple/frowning_woman/4.png
index 25be6800ca3..4b02d78f8d0 100644
Binary files a/public/images/emoji/apple/frowning_woman/4.png and b/public/images/emoji/apple/frowning_woman/4.png differ
diff --git a/public/images/emoji/apple/frowning_woman/5.png b/public/images/emoji/apple/frowning_woman/5.png
index b9efb3d134c..5ca0232347a 100644
Binary files a/public/images/emoji/apple/frowning_woman/5.png and b/public/images/emoji/apple/frowning_woman/5.png differ
diff --git a/public/images/emoji/apple/frowning_woman/6.png b/public/images/emoji/apple/frowning_woman/6.png
index f5485b28439..c61a86b7fe4 100644
Binary files a/public/images/emoji/apple/frowning_woman/6.png and b/public/images/emoji/apple/frowning_woman/6.png differ
diff --git a/public/images/emoji/apple/fu.png b/public/images/emoji/apple/fu.png
index e869cf97d15..a91fda90134 100644
Binary files a/public/images/emoji/apple/fu.png and b/public/images/emoji/apple/fu.png differ
diff --git a/public/images/emoji/apple/fu/2.png b/public/images/emoji/apple/fu/2.png
index ce95c6a8be5..3783ddff95e 100644
Binary files a/public/images/emoji/apple/fu/2.png and b/public/images/emoji/apple/fu/2.png differ
diff --git a/public/images/emoji/apple/fu/3.png b/public/images/emoji/apple/fu/3.png
index 33eec03fd41..1c4a962d013 100644
Binary files a/public/images/emoji/apple/fu/3.png and b/public/images/emoji/apple/fu/3.png differ
diff --git a/public/images/emoji/apple/fu/4.png b/public/images/emoji/apple/fu/4.png
index 10487652927..605d4bc231a 100644
Binary files a/public/images/emoji/apple/fu/4.png and b/public/images/emoji/apple/fu/4.png differ
diff --git a/public/images/emoji/apple/fu/5.png b/public/images/emoji/apple/fu/5.png
index 6f577d03de8..28af6e0dc16 100644
Binary files a/public/images/emoji/apple/fu/5.png and b/public/images/emoji/apple/fu/5.png differ
diff --git a/public/images/emoji/apple/fu/6.png b/public/images/emoji/apple/fu/6.png
index 58349f45b1f..fcb6c5c5a6e 100644
Binary files a/public/images/emoji/apple/fu/6.png and b/public/images/emoji/apple/fu/6.png differ
diff --git a/public/images/emoji/apple/fuelpump.png b/public/images/emoji/apple/fuelpump.png
index 67faaf9884e..f27a53a607c 100644
Binary files a/public/images/emoji/apple/fuelpump.png and b/public/images/emoji/apple/fuelpump.png differ
diff --git a/public/images/emoji/apple/full_moon.png b/public/images/emoji/apple/full_moon.png
index 749787daebc..cff294f27d7 100644
Binary files a/public/images/emoji/apple/full_moon.png and b/public/images/emoji/apple/full_moon.png differ
diff --git a/public/images/emoji/apple/full_moon_with_face.png b/public/images/emoji/apple/full_moon_with_face.png
index 54a7f73dc79..252ee717437 100644
Binary files a/public/images/emoji/apple/full_moon_with_face.png and b/public/images/emoji/apple/full_moon_with_face.png differ
diff --git a/public/images/emoji/apple/funeral_urn.png b/public/images/emoji/apple/funeral_urn.png
index d1af59ed33b..4e0a37e0560 100644
Binary files a/public/images/emoji/apple/funeral_urn.png and b/public/images/emoji/apple/funeral_urn.png differ
diff --git a/public/images/emoji/apple/gabon.png b/public/images/emoji/apple/gabon.png
index b32827cd188..0eda2c71fd3 100644
Binary files a/public/images/emoji/apple/gabon.png and b/public/images/emoji/apple/gabon.png differ
diff --git a/public/images/emoji/apple/gambia.png b/public/images/emoji/apple/gambia.png
index ea03e0abda4..cebd9fecbcf 100644
Binary files a/public/images/emoji/apple/gambia.png and b/public/images/emoji/apple/gambia.png differ
diff --git a/public/images/emoji/apple/game_die.png b/public/images/emoji/apple/game_die.png
index 9a7763f542a..f58f649b3d4 100644
Binary files a/public/images/emoji/apple/game_die.png and b/public/images/emoji/apple/game_die.png differ
diff --git a/public/images/emoji/apple/gb.png b/public/images/emoji/apple/gb.png
index 1d15d6cb969..13964cb5143 100644
Binary files a/public/images/emoji/apple/gb.png and b/public/images/emoji/apple/gb.png differ
diff --git a/public/images/emoji/apple/gear.png b/public/images/emoji/apple/gear.png
index 8c3241117fa..f01dfdd89f2 100644
Binary files a/public/images/emoji/apple/gear.png and b/public/images/emoji/apple/gear.png differ
diff --git a/public/images/emoji/apple/gem.png b/public/images/emoji/apple/gem.png
index ab538189b49..544c46dbf07 100644
Binary files a/public/images/emoji/apple/gem.png and b/public/images/emoji/apple/gem.png differ
diff --git a/public/images/emoji/apple/gemini.png b/public/images/emoji/apple/gemini.png
index c9ad704d3c2..04002f278f5 100644
Binary files a/public/images/emoji/apple/gemini.png and b/public/images/emoji/apple/gemini.png differ
diff --git a/public/images/emoji/apple/genie.png b/public/images/emoji/apple/genie.png
index f0eddcc91ae..b8a6eb469d7 100644
Binary files a/public/images/emoji/apple/genie.png and b/public/images/emoji/apple/genie.png differ
diff --git a/public/images/emoji/apple/georgia.png b/public/images/emoji/apple/georgia.png
index 9dc6417deec..199e2fd3960 100644
Binary files a/public/images/emoji/apple/georgia.png and b/public/images/emoji/apple/georgia.png differ
diff --git a/public/images/emoji/apple/ghana.png b/public/images/emoji/apple/ghana.png
index aa8883b16b6..aa4340aeaaf 100644
Binary files a/public/images/emoji/apple/ghana.png and b/public/images/emoji/apple/ghana.png differ
diff --git a/public/images/emoji/apple/ghost.png b/public/images/emoji/apple/ghost.png
index 76c779eea0e..b2067d002c6 100644
Binary files a/public/images/emoji/apple/ghost.png and b/public/images/emoji/apple/ghost.png differ
diff --git a/public/images/emoji/apple/gibraltar.png b/public/images/emoji/apple/gibraltar.png
index 9842b9f5fde..eda7627dcb7 100644
Binary files a/public/images/emoji/apple/gibraltar.png and b/public/images/emoji/apple/gibraltar.png differ
diff --git a/public/images/emoji/apple/gift.png b/public/images/emoji/apple/gift.png
index 1618c5808ce..6b396b67691 100644
Binary files a/public/images/emoji/apple/gift.png and b/public/images/emoji/apple/gift.png differ
diff --git a/public/images/emoji/apple/gift_heart.png b/public/images/emoji/apple/gift_heart.png
index 5967ff8ddc1..40af44fe096 100644
Binary files a/public/images/emoji/apple/gift_heart.png and b/public/images/emoji/apple/gift_heart.png differ
diff --git a/public/images/emoji/apple/giraffe.png b/public/images/emoji/apple/giraffe.png
index be0e85d2896..0c00d86c235 100644
Binary files a/public/images/emoji/apple/giraffe.png and b/public/images/emoji/apple/giraffe.png differ
diff --git a/public/images/emoji/apple/girl.png b/public/images/emoji/apple/girl.png
index 43cddda1d38..0bea4b1abc6 100644
Binary files a/public/images/emoji/apple/girl.png and b/public/images/emoji/apple/girl.png differ
diff --git a/public/images/emoji/apple/girl/2.png b/public/images/emoji/apple/girl/2.png
index fd19994a6bb..b9616edda18 100644
Binary files a/public/images/emoji/apple/girl/2.png and b/public/images/emoji/apple/girl/2.png differ
diff --git a/public/images/emoji/apple/girl/3.png b/public/images/emoji/apple/girl/3.png
index 486cfee579b..0ef21c10bdf 100644
Binary files a/public/images/emoji/apple/girl/3.png and b/public/images/emoji/apple/girl/3.png differ
diff --git a/public/images/emoji/apple/girl/4.png b/public/images/emoji/apple/girl/4.png
index 2e4bb4b2430..bba92e65745 100644
Binary files a/public/images/emoji/apple/girl/4.png and b/public/images/emoji/apple/girl/4.png differ
diff --git a/public/images/emoji/apple/girl/5.png b/public/images/emoji/apple/girl/5.png
index 1c984843ba3..971462f62a9 100644
Binary files a/public/images/emoji/apple/girl/5.png and b/public/images/emoji/apple/girl/5.png differ
diff --git a/public/images/emoji/apple/girl/6.png b/public/images/emoji/apple/girl/6.png
index 66a87a80081..6e206b2f212 100644
Binary files a/public/images/emoji/apple/girl/6.png and b/public/images/emoji/apple/girl/6.png differ
diff --git a/public/images/emoji/apple/globe_with_meridians.png b/public/images/emoji/apple/globe_with_meridians.png
index 8b868ee5e53..b14a842da32 100644
Binary files a/public/images/emoji/apple/globe_with_meridians.png and b/public/images/emoji/apple/globe_with_meridians.png differ
diff --git a/public/images/emoji/apple/gloves.png b/public/images/emoji/apple/gloves.png
index 1a11dd2c560..7c439b3d2e9 100644
Binary files a/public/images/emoji/apple/gloves.png and b/public/images/emoji/apple/gloves.png differ
diff --git a/public/images/emoji/apple/goal_net.png b/public/images/emoji/apple/goal_net.png
index 1c27b02c4d6..bae02a5d037 100644
Binary files a/public/images/emoji/apple/goal_net.png and b/public/images/emoji/apple/goal_net.png differ
diff --git a/public/images/emoji/apple/goat.png b/public/images/emoji/apple/goat.png
index 4a261e25272..44c416e0f06 100644
Binary files a/public/images/emoji/apple/goat.png and b/public/images/emoji/apple/goat.png differ
diff --git a/public/images/emoji/apple/golf.png b/public/images/emoji/apple/golf.png
index 48dcf668637..6f43447aa81 100644
Binary files a/public/images/emoji/apple/golf.png and b/public/images/emoji/apple/golf.png differ
diff --git a/public/images/emoji/apple/golfer.png b/public/images/emoji/apple/golfer.png
index 4225252a50c..a40beb96cb2 100644
Binary files a/public/images/emoji/apple/golfer.png and b/public/images/emoji/apple/golfer.png differ
diff --git a/public/images/emoji/apple/golfer/2.png b/public/images/emoji/apple/golfer/2.png
index a55b51262b3..4eb63d380a8 100644
Binary files a/public/images/emoji/apple/golfer/2.png and b/public/images/emoji/apple/golfer/2.png differ
diff --git a/public/images/emoji/apple/golfer/3.png b/public/images/emoji/apple/golfer/3.png
index 490cdfe84b2..29ec1c1215a 100644
Binary files a/public/images/emoji/apple/golfer/3.png and b/public/images/emoji/apple/golfer/3.png differ
diff --git a/public/images/emoji/apple/golfer/4.png b/public/images/emoji/apple/golfer/4.png
index 56007155262..cdeb8f24a6b 100644
Binary files a/public/images/emoji/apple/golfer/4.png and b/public/images/emoji/apple/golfer/4.png differ
diff --git a/public/images/emoji/apple/golfer/5.png b/public/images/emoji/apple/golfer/5.png
index 8218dd58726..683630018be 100644
Binary files a/public/images/emoji/apple/golfer/5.png and b/public/images/emoji/apple/golfer/5.png differ
diff --git a/public/images/emoji/apple/golfer/6.png b/public/images/emoji/apple/golfer/6.png
index 7f863e40dc3..42cde9bf18e 100644
Binary files a/public/images/emoji/apple/golfer/6.png and b/public/images/emoji/apple/golfer/6.png differ
diff --git a/public/images/emoji/apple/golfing_man.png b/public/images/emoji/apple/golfing_man.png
index 4225252a50c..a40beb96cb2 100644
Binary files a/public/images/emoji/apple/golfing_man.png and b/public/images/emoji/apple/golfing_man.png differ
diff --git a/public/images/emoji/apple/golfing_man/2.png b/public/images/emoji/apple/golfing_man/2.png
index a55b51262b3..4eb63d380a8 100644
Binary files a/public/images/emoji/apple/golfing_man/2.png and b/public/images/emoji/apple/golfing_man/2.png differ
diff --git a/public/images/emoji/apple/golfing_man/3.png b/public/images/emoji/apple/golfing_man/3.png
index 490cdfe84b2..29ec1c1215a 100644
Binary files a/public/images/emoji/apple/golfing_man/3.png and b/public/images/emoji/apple/golfing_man/3.png differ
diff --git a/public/images/emoji/apple/golfing_man/4.png b/public/images/emoji/apple/golfing_man/4.png
index 56007155262..cdeb8f24a6b 100644
Binary files a/public/images/emoji/apple/golfing_man/4.png and b/public/images/emoji/apple/golfing_man/4.png differ
diff --git a/public/images/emoji/apple/golfing_man/5.png b/public/images/emoji/apple/golfing_man/5.png
index 8218dd58726..683630018be 100644
Binary files a/public/images/emoji/apple/golfing_man/5.png and b/public/images/emoji/apple/golfing_man/5.png differ
diff --git a/public/images/emoji/apple/golfing_man/6.png b/public/images/emoji/apple/golfing_man/6.png
index 7f863e40dc3..42cde9bf18e 100644
Binary files a/public/images/emoji/apple/golfing_man/6.png and b/public/images/emoji/apple/golfing_man/6.png differ
diff --git a/public/images/emoji/apple/golfing_woman.png b/public/images/emoji/apple/golfing_woman.png
index eaa7e01ed5a..20754a5603a 100644
Binary files a/public/images/emoji/apple/golfing_woman.png and b/public/images/emoji/apple/golfing_woman.png differ
diff --git a/public/images/emoji/apple/gorilla.png b/public/images/emoji/apple/gorilla.png
index 271b4305bca..48fe98d962e 100644
Binary files a/public/images/emoji/apple/gorilla.png and b/public/images/emoji/apple/gorilla.png differ
diff --git a/public/images/emoji/apple/grandma.png b/public/images/emoji/apple/grandma.png
index 3aa8954a88a..3cac50a8fa9 100644
Binary files a/public/images/emoji/apple/grandma.png and b/public/images/emoji/apple/grandma.png differ
diff --git a/public/images/emoji/apple/grandma/2.png b/public/images/emoji/apple/grandma/2.png
index 0338c484a17..24d5795261e 100644
Binary files a/public/images/emoji/apple/grandma/2.png and b/public/images/emoji/apple/grandma/2.png differ
diff --git a/public/images/emoji/apple/grandma/3.png b/public/images/emoji/apple/grandma/3.png
index eb68885c384..c24f8ba0c23 100644
Binary files a/public/images/emoji/apple/grandma/3.png and b/public/images/emoji/apple/grandma/3.png differ
diff --git a/public/images/emoji/apple/grandma/4.png b/public/images/emoji/apple/grandma/4.png
index b0ec0d5864e..739dced78ae 100644
Binary files a/public/images/emoji/apple/grandma/4.png and b/public/images/emoji/apple/grandma/4.png differ
diff --git a/public/images/emoji/apple/grandma/5.png b/public/images/emoji/apple/grandma/5.png
index e9778d3e964..a2cfce2b1bf 100644
Binary files a/public/images/emoji/apple/grandma/5.png and b/public/images/emoji/apple/grandma/5.png differ
diff --git a/public/images/emoji/apple/grandma/6.png b/public/images/emoji/apple/grandma/6.png
index af461aed008..4e58e8f057c 100644
Binary files a/public/images/emoji/apple/grandma/6.png and b/public/images/emoji/apple/grandma/6.png differ
diff --git a/public/images/emoji/apple/grapes.png b/public/images/emoji/apple/grapes.png
index 9578699cd19..0c3421deef4 100644
Binary files a/public/images/emoji/apple/grapes.png and b/public/images/emoji/apple/grapes.png differ
diff --git a/public/images/emoji/apple/greece.png b/public/images/emoji/apple/greece.png
index adeaf2a858f..cf8fbbf6ee3 100644
Binary files a/public/images/emoji/apple/greece.png and b/public/images/emoji/apple/greece.png differ
diff --git a/public/images/emoji/apple/green_apple.png b/public/images/emoji/apple/green_apple.png
index 7b64adc98bd..c8fd04b6542 100644
Binary files a/public/images/emoji/apple/green_apple.png and b/public/images/emoji/apple/green_apple.png differ
diff --git a/public/images/emoji/apple/green_book.png b/public/images/emoji/apple/green_book.png
index cf380f49704..52f737dec47 100644
Binary files a/public/images/emoji/apple/green_book.png and b/public/images/emoji/apple/green_book.png differ
diff --git a/public/images/emoji/apple/green_heart.png b/public/images/emoji/apple/green_heart.png
index 70df64a3f11..cc9260a8a2b 100644
Binary files a/public/images/emoji/apple/green_heart.png and b/public/images/emoji/apple/green_heart.png differ
diff --git a/public/images/emoji/apple/green_salad.png b/public/images/emoji/apple/green_salad.png
index 16b2c1644f8..9856996d719 100644
Binary files a/public/images/emoji/apple/green_salad.png and b/public/images/emoji/apple/green_salad.png differ
diff --git a/public/images/emoji/apple/greenland.png b/public/images/emoji/apple/greenland.png
index e561bb86c55..b59672b7c43 100644
Binary files a/public/images/emoji/apple/greenland.png and b/public/images/emoji/apple/greenland.png differ
diff --git a/public/images/emoji/apple/grenada.png b/public/images/emoji/apple/grenada.png
index ed812a6c05a..560ee909c80 100644
Binary files a/public/images/emoji/apple/grenada.png and b/public/images/emoji/apple/grenada.png differ
diff --git a/public/images/emoji/apple/grey_exclamation.png b/public/images/emoji/apple/grey_exclamation.png
index 0ac75a3b12d..85361d040f2 100644
Binary files a/public/images/emoji/apple/grey_exclamation.png and b/public/images/emoji/apple/grey_exclamation.png differ
diff --git a/public/images/emoji/apple/grey_question.png b/public/images/emoji/apple/grey_question.png
index d1b8431a072..26dce37c243 100644
Binary files a/public/images/emoji/apple/grey_question.png and b/public/images/emoji/apple/grey_question.png differ
diff --git a/public/images/emoji/apple/grimacing.png b/public/images/emoji/apple/grimacing.png
index 58df57b80f2..33205f8477c 100644
Binary files a/public/images/emoji/apple/grimacing.png and b/public/images/emoji/apple/grimacing.png differ
diff --git a/public/images/emoji/apple/grin.png b/public/images/emoji/apple/grin.png
index 56ac5e5f6cb..e0627c715fe 100644
Binary files a/public/images/emoji/apple/grin.png and b/public/images/emoji/apple/grin.png differ
diff --git a/public/images/emoji/apple/grinning.png b/public/images/emoji/apple/grinning.png
index b8f34e83ef6..b13faa78ecb 100644
Binary files a/public/images/emoji/apple/grinning.png and b/public/images/emoji/apple/grinning.png differ
diff --git a/public/images/emoji/apple/guadeloupe.png b/public/images/emoji/apple/guadeloupe.png
index 9f34c1158db..e699c6a23a0 100644
Binary files a/public/images/emoji/apple/guadeloupe.png and b/public/images/emoji/apple/guadeloupe.png differ
diff --git a/public/images/emoji/apple/guam.png b/public/images/emoji/apple/guam.png
index 735472abe26..6cb85c26499 100644
Binary files a/public/images/emoji/apple/guam.png and b/public/images/emoji/apple/guam.png differ
diff --git a/public/images/emoji/apple/guardsman.png b/public/images/emoji/apple/guardsman.png
index bed85fc6bbb..ea6e2df3eb4 100644
Binary files a/public/images/emoji/apple/guardsman.png and b/public/images/emoji/apple/guardsman.png differ
diff --git a/public/images/emoji/apple/guardsman/2.png b/public/images/emoji/apple/guardsman/2.png
index 6c2d298e4c9..1d5b2bd8a93 100644
Binary files a/public/images/emoji/apple/guardsman/2.png and b/public/images/emoji/apple/guardsman/2.png differ
diff --git a/public/images/emoji/apple/guardsman/3.png b/public/images/emoji/apple/guardsman/3.png
index a52f6f3ca36..c8eec33a654 100644
Binary files a/public/images/emoji/apple/guardsman/3.png and b/public/images/emoji/apple/guardsman/3.png differ
diff --git a/public/images/emoji/apple/guardsman/4.png b/public/images/emoji/apple/guardsman/4.png
index 1e4a128fc0c..0cb342c5434 100644
Binary files a/public/images/emoji/apple/guardsman/4.png and b/public/images/emoji/apple/guardsman/4.png differ
diff --git a/public/images/emoji/apple/guardsman/5.png b/public/images/emoji/apple/guardsman/5.png
index 103245ac4b3..fc7f9e47bab 100644
Binary files a/public/images/emoji/apple/guardsman/5.png and b/public/images/emoji/apple/guardsman/5.png differ
diff --git a/public/images/emoji/apple/guardsman/6.png b/public/images/emoji/apple/guardsman/6.png
index cc69ea63722..b9e71079f92 100644
Binary files a/public/images/emoji/apple/guardsman/6.png and b/public/images/emoji/apple/guardsman/6.png differ
diff --git a/public/images/emoji/apple/guardswoman.png b/public/images/emoji/apple/guardswoman.png
index f4d3ba9c58f..0db9d4b03dc 100644
Binary files a/public/images/emoji/apple/guardswoman.png and b/public/images/emoji/apple/guardswoman.png differ
diff --git a/public/images/emoji/apple/guardswoman/2.png b/public/images/emoji/apple/guardswoman/2.png
index 314e41bcb3a..2834b1490cb 100644
Binary files a/public/images/emoji/apple/guardswoman/2.png and b/public/images/emoji/apple/guardswoman/2.png differ
diff --git a/public/images/emoji/apple/guardswoman/3.png b/public/images/emoji/apple/guardswoman/3.png
index 7ce9264c0ff..79bddeedba0 100644
Binary files a/public/images/emoji/apple/guardswoman/3.png and b/public/images/emoji/apple/guardswoman/3.png differ
diff --git a/public/images/emoji/apple/guardswoman/4.png b/public/images/emoji/apple/guardswoman/4.png
index 267d5ace8dc..ea0e8646b44 100644
Binary files a/public/images/emoji/apple/guardswoman/4.png and b/public/images/emoji/apple/guardswoman/4.png differ
diff --git a/public/images/emoji/apple/guardswoman/5.png b/public/images/emoji/apple/guardswoman/5.png
index f7c1e8826d9..68e6adff508 100644
Binary files a/public/images/emoji/apple/guardswoman/5.png and b/public/images/emoji/apple/guardswoman/5.png differ
diff --git a/public/images/emoji/apple/guardswoman/6.png b/public/images/emoji/apple/guardswoman/6.png
index 1082318e26e..69e4385c2ec 100644
Binary files a/public/images/emoji/apple/guardswoman/6.png and b/public/images/emoji/apple/guardswoman/6.png differ
diff --git a/public/images/emoji/apple/guatemala.png b/public/images/emoji/apple/guatemala.png
index bab42f56759..0e5c7a3d511 100644
Binary files a/public/images/emoji/apple/guatemala.png and b/public/images/emoji/apple/guatemala.png differ
diff --git a/public/images/emoji/apple/guernsey.png b/public/images/emoji/apple/guernsey.png
index 4039048d060..b62ee6763e0 100644
Binary files a/public/images/emoji/apple/guernsey.png and b/public/images/emoji/apple/guernsey.png differ
diff --git a/public/images/emoji/apple/guinea.png b/public/images/emoji/apple/guinea.png
index 6dcabb1e8e5..6a8e0efa468 100644
Binary files a/public/images/emoji/apple/guinea.png and b/public/images/emoji/apple/guinea.png differ
diff --git a/public/images/emoji/apple/guinea_bissau.png b/public/images/emoji/apple/guinea_bissau.png
index 361842d05b6..5032fe6575a 100644
Binary files a/public/images/emoji/apple/guinea_bissau.png and b/public/images/emoji/apple/guinea_bissau.png differ
diff --git a/public/images/emoji/apple/guitar.png b/public/images/emoji/apple/guitar.png
index 98e58d68cd8..fe423df9ddd 100644
Binary files a/public/images/emoji/apple/guitar.png and b/public/images/emoji/apple/guitar.png differ
diff --git a/public/images/emoji/apple/gun.png b/public/images/emoji/apple/gun.png
index e72df0c1a31..bd94ffb254a 100644
Binary files a/public/images/emoji/apple/gun.png and b/public/images/emoji/apple/gun.png differ
diff --git a/public/images/emoji/apple/guyana.png b/public/images/emoji/apple/guyana.png
index 80fac519d80..17603daa1d0 100644
Binary files a/public/images/emoji/apple/guyana.png and b/public/images/emoji/apple/guyana.png differ
diff --git a/public/images/emoji/apple/haircut.png b/public/images/emoji/apple/haircut.png
index ceac9642aa7..21b24220beb 100644
Binary files a/public/images/emoji/apple/haircut.png and b/public/images/emoji/apple/haircut.png differ
diff --git a/public/images/emoji/apple/haircut/2.png b/public/images/emoji/apple/haircut/2.png
index e9f7dfdbaa7..d5c27bae8fd 100644
Binary files a/public/images/emoji/apple/haircut/2.png and b/public/images/emoji/apple/haircut/2.png differ
diff --git a/public/images/emoji/apple/haircut/3.png b/public/images/emoji/apple/haircut/3.png
index 435b4fa32cd..d1d4642db95 100644
Binary files a/public/images/emoji/apple/haircut/3.png and b/public/images/emoji/apple/haircut/3.png differ
diff --git a/public/images/emoji/apple/haircut/4.png b/public/images/emoji/apple/haircut/4.png
index 50019797f4c..349cc6f9be6 100644
Binary files a/public/images/emoji/apple/haircut/4.png and b/public/images/emoji/apple/haircut/4.png differ
diff --git a/public/images/emoji/apple/haircut/5.png b/public/images/emoji/apple/haircut/5.png
index 2bd103d6d25..0dee401ec8c 100644
Binary files a/public/images/emoji/apple/haircut/5.png and b/public/images/emoji/apple/haircut/5.png differ
diff --git a/public/images/emoji/apple/haircut/6.png b/public/images/emoji/apple/haircut/6.png
index 4d7b1d50330..fc795822676 100644
Binary files a/public/images/emoji/apple/haircut/6.png and b/public/images/emoji/apple/haircut/6.png differ
diff --git a/public/images/emoji/apple/haircut_man.png b/public/images/emoji/apple/haircut_man.png
index c44aea56b9c..2122bbc9474 100644
Binary files a/public/images/emoji/apple/haircut_man.png and b/public/images/emoji/apple/haircut_man.png differ
diff --git a/public/images/emoji/apple/haircut_man/2.png b/public/images/emoji/apple/haircut_man/2.png
index 2965fde6562..1bb9d561f59 100644
Binary files a/public/images/emoji/apple/haircut_man/2.png and b/public/images/emoji/apple/haircut_man/2.png differ
diff --git a/public/images/emoji/apple/haircut_man/3.png b/public/images/emoji/apple/haircut_man/3.png
index 224e4f47996..ec046d31c48 100644
Binary files a/public/images/emoji/apple/haircut_man/3.png and b/public/images/emoji/apple/haircut_man/3.png differ
diff --git a/public/images/emoji/apple/haircut_man/4.png b/public/images/emoji/apple/haircut_man/4.png
index 046cc155ff6..68e0ac70e7b 100644
Binary files a/public/images/emoji/apple/haircut_man/4.png and b/public/images/emoji/apple/haircut_man/4.png differ
diff --git a/public/images/emoji/apple/haircut_man/5.png b/public/images/emoji/apple/haircut_man/5.png
index 612cb34821f..5fc5f3fadc8 100644
Binary files a/public/images/emoji/apple/haircut_man/5.png and b/public/images/emoji/apple/haircut_man/5.png differ
diff --git a/public/images/emoji/apple/haircut_man/6.png b/public/images/emoji/apple/haircut_man/6.png
index 941ba5a56d4..2d16c139598 100644
Binary files a/public/images/emoji/apple/haircut_man/6.png and b/public/images/emoji/apple/haircut_man/6.png differ
diff --git a/public/images/emoji/apple/haircut_woman.png b/public/images/emoji/apple/haircut_woman.png
index ceac9642aa7..21b24220beb 100644
Binary files a/public/images/emoji/apple/haircut_woman.png and b/public/images/emoji/apple/haircut_woman.png differ
diff --git a/public/images/emoji/apple/haircut_woman/2.png b/public/images/emoji/apple/haircut_woman/2.png
index e9f7dfdbaa7..d5c27bae8fd 100644
Binary files a/public/images/emoji/apple/haircut_woman/2.png and b/public/images/emoji/apple/haircut_woman/2.png differ
diff --git a/public/images/emoji/apple/haircut_woman/3.png b/public/images/emoji/apple/haircut_woman/3.png
index 435b4fa32cd..d1d4642db95 100644
Binary files a/public/images/emoji/apple/haircut_woman/3.png and b/public/images/emoji/apple/haircut_woman/3.png differ
diff --git a/public/images/emoji/apple/haircut_woman/4.png b/public/images/emoji/apple/haircut_woman/4.png
index 50019797f4c..349cc6f9be6 100644
Binary files a/public/images/emoji/apple/haircut_woman/4.png and b/public/images/emoji/apple/haircut_woman/4.png differ
diff --git a/public/images/emoji/apple/haircut_woman/5.png b/public/images/emoji/apple/haircut_woman/5.png
index 2bd103d6d25..0dee401ec8c 100644
Binary files a/public/images/emoji/apple/haircut_woman/5.png and b/public/images/emoji/apple/haircut_woman/5.png differ
diff --git a/public/images/emoji/apple/haircut_woman/6.png b/public/images/emoji/apple/haircut_woman/6.png
index 4d7b1d50330..fc795822676 100644
Binary files a/public/images/emoji/apple/haircut_woman/6.png and b/public/images/emoji/apple/haircut_woman/6.png differ
diff --git a/public/images/emoji/apple/haiti.png b/public/images/emoji/apple/haiti.png
index 174b5cbe3cf..5a0d36bb5f2 100644
Binary files a/public/images/emoji/apple/haiti.png and b/public/images/emoji/apple/haiti.png differ
diff --git a/public/images/emoji/apple/hamburger.png b/public/images/emoji/apple/hamburger.png
index 77ef2079689..e70323c526e 100644
Binary files a/public/images/emoji/apple/hamburger.png and b/public/images/emoji/apple/hamburger.png differ
diff --git a/public/images/emoji/apple/hammer.png b/public/images/emoji/apple/hammer.png
index 5c5a3b70526..b680220a8c5 100644
Binary files a/public/images/emoji/apple/hammer.png and b/public/images/emoji/apple/hammer.png differ
diff --git a/public/images/emoji/apple/hammer_and_pick.png b/public/images/emoji/apple/hammer_and_pick.png
index ec76955fd62..a54247eb2a1 100644
Binary files a/public/images/emoji/apple/hammer_and_pick.png and b/public/images/emoji/apple/hammer_and_pick.png differ
diff --git a/public/images/emoji/apple/hammer_and_wrench.png b/public/images/emoji/apple/hammer_and_wrench.png
index daef26722cc..a74ac1fa4d1 100644
Binary files a/public/images/emoji/apple/hammer_and_wrench.png and b/public/images/emoji/apple/hammer_and_wrench.png differ
diff --git a/public/images/emoji/apple/hammer_pick.png b/public/images/emoji/apple/hammer_pick.png
index ec76955fd62..a54247eb2a1 100644
Binary files a/public/images/emoji/apple/hammer_pick.png and b/public/images/emoji/apple/hammer_pick.png differ
diff --git a/public/images/emoji/apple/hamster.png b/public/images/emoji/apple/hamster.png
index 01450947c77..496144e231a 100644
Binary files a/public/images/emoji/apple/hamster.png and b/public/images/emoji/apple/hamster.png differ
diff --git a/public/images/emoji/apple/hand.png b/public/images/emoji/apple/hand.png
index 8b60686eebf..4ed01163152 100644
Binary files a/public/images/emoji/apple/hand.png and b/public/images/emoji/apple/hand.png differ
diff --git a/public/images/emoji/apple/hand/2.png b/public/images/emoji/apple/hand/2.png
index f0fd83faaa5..e71142e1793 100644
Binary files a/public/images/emoji/apple/hand/2.png and b/public/images/emoji/apple/hand/2.png differ
diff --git a/public/images/emoji/apple/hand/3.png b/public/images/emoji/apple/hand/3.png
index 7df90232ae7..a05b226c06b 100644
Binary files a/public/images/emoji/apple/hand/3.png and b/public/images/emoji/apple/hand/3.png differ
diff --git a/public/images/emoji/apple/hand/4.png b/public/images/emoji/apple/hand/4.png
index 979c0c414d1..cd5608ebc41 100644
Binary files a/public/images/emoji/apple/hand/4.png and b/public/images/emoji/apple/hand/4.png differ
diff --git a/public/images/emoji/apple/hand/5.png b/public/images/emoji/apple/hand/5.png
index dee9188f4d1..088705db5b0 100644
Binary files a/public/images/emoji/apple/hand/5.png and b/public/images/emoji/apple/hand/5.png differ
diff --git a/public/images/emoji/apple/hand/6.png b/public/images/emoji/apple/hand/6.png
index 9ae2da2c021..87f46ae457e 100644
Binary files a/public/images/emoji/apple/hand/6.png and b/public/images/emoji/apple/hand/6.png differ
diff --git a/public/images/emoji/apple/hand_splayed.png b/public/images/emoji/apple/hand_splayed.png
index c05031e50a0..8492596302d 100644
Binary files a/public/images/emoji/apple/hand_splayed.png and b/public/images/emoji/apple/hand_splayed.png differ
diff --git a/public/images/emoji/apple/hand_splayed/2.png b/public/images/emoji/apple/hand_splayed/2.png
index 35c3b9b3502..5cd0c98544f 100644
Binary files a/public/images/emoji/apple/hand_splayed/2.png and b/public/images/emoji/apple/hand_splayed/2.png differ
diff --git a/public/images/emoji/apple/hand_splayed/3.png b/public/images/emoji/apple/hand_splayed/3.png
index 6757e8a1e2b..e55cbf371ab 100644
Binary files a/public/images/emoji/apple/hand_splayed/3.png and b/public/images/emoji/apple/hand_splayed/3.png differ
diff --git a/public/images/emoji/apple/hand_splayed/4.png b/public/images/emoji/apple/hand_splayed/4.png
index 2583736a585..a688ca96ca6 100644
Binary files a/public/images/emoji/apple/hand_splayed/4.png and b/public/images/emoji/apple/hand_splayed/4.png differ
diff --git a/public/images/emoji/apple/hand_splayed/5.png b/public/images/emoji/apple/hand_splayed/5.png
index 11cb8caa11d..3cf22841527 100644
Binary files a/public/images/emoji/apple/hand_splayed/5.png and b/public/images/emoji/apple/hand_splayed/5.png differ
diff --git a/public/images/emoji/apple/hand_splayed/6.png b/public/images/emoji/apple/hand_splayed/6.png
index eed63072bd5..fd1a82a5237 100644
Binary files a/public/images/emoji/apple/hand_splayed/6.png and b/public/images/emoji/apple/hand_splayed/6.png differ
diff --git a/public/images/emoji/apple/handbag.png b/public/images/emoji/apple/handbag.png
index 1eaac97227b..a32391e665b 100644
Binary files a/public/images/emoji/apple/handbag.png and b/public/images/emoji/apple/handbag.png differ
diff --git a/public/images/emoji/apple/handshake.png b/public/images/emoji/apple/handshake.png
index 630d17f4212..854276da814 100644
Binary files a/public/images/emoji/apple/handshake.png and b/public/images/emoji/apple/handshake.png differ
diff --git a/public/images/emoji/apple/hankey.png b/public/images/emoji/apple/hankey.png
index a025f430028..079c223fd3a 100644
Binary files a/public/images/emoji/apple/hankey.png and b/public/images/emoji/apple/hankey.png differ
diff --git a/public/images/emoji/apple/hash.png b/public/images/emoji/apple/hash.png
index 64f9f559649..36fcb63881f 100644
Binary files a/public/images/emoji/apple/hash.png and b/public/images/emoji/apple/hash.png differ
diff --git a/public/images/emoji/apple/hatched_chick.png b/public/images/emoji/apple/hatched_chick.png
index 5f51f69249b..f3c698a2605 100644
Binary files a/public/images/emoji/apple/hatched_chick.png and b/public/images/emoji/apple/hatched_chick.png differ
diff --git a/public/images/emoji/apple/hatching_chick.png b/public/images/emoji/apple/hatching_chick.png
index c7b2e6f048c..70c8768e2d3 100644
Binary files a/public/images/emoji/apple/hatching_chick.png and b/public/images/emoji/apple/hatching_chick.png differ
diff --git a/public/images/emoji/apple/head_bandage.png b/public/images/emoji/apple/head_bandage.png
index 953be45438e..d85d09f68fb 100644
Binary files a/public/images/emoji/apple/head_bandage.png and b/public/images/emoji/apple/head_bandage.png differ
diff --git a/public/images/emoji/apple/headphones.png b/public/images/emoji/apple/headphones.png
index 62997da2664..3a8b8ec2d04 100644
Binary files a/public/images/emoji/apple/headphones.png and b/public/images/emoji/apple/headphones.png differ
diff --git a/public/images/emoji/apple/hear_no_evil.png b/public/images/emoji/apple/hear_no_evil.png
index 72e9e2f37e0..0094f326ff7 100644
Binary files a/public/images/emoji/apple/hear_no_evil.png and b/public/images/emoji/apple/hear_no_evil.png differ
diff --git a/public/images/emoji/apple/heard_and_mc_donald_islands.png b/public/images/emoji/apple/heard_and_mc_donald_islands.png
index 87eafc1fdcf..7486478cf1e 100644
Binary files a/public/images/emoji/apple/heard_and_mc_donald_islands.png and b/public/images/emoji/apple/heard_and_mc_donald_islands.png differ
diff --git a/public/images/emoji/apple/heart.png b/public/images/emoji/apple/heart.png
index 462824db64b..0f4cb526c75 100644
Binary files a/public/images/emoji/apple/heart.png and b/public/images/emoji/apple/heart.png differ
diff --git a/public/images/emoji/apple/heart_decoration.png b/public/images/emoji/apple/heart_decoration.png
index 16b43b19830..cb283093421 100644
Binary files a/public/images/emoji/apple/heart_decoration.png and b/public/images/emoji/apple/heart_decoration.png differ
diff --git a/public/images/emoji/apple/heart_exclamation.png b/public/images/emoji/apple/heart_exclamation.png
index 2b277ffc0d6..fcd1ba407a0 100644
Binary files a/public/images/emoji/apple/heart_exclamation.png and b/public/images/emoji/apple/heart_exclamation.png differ
diff --git a/public/images/emoji/apple/heart_eyes.png b/public/images/emoji/apple/heart_eyes.png
index 182e30518f2..9488944b8e7 100644
Binary files a/public/images/emoji/apple/heart_eyes.png and b/public/images/emoji/apple/heart_eyes.png differ
diff --git a/public/images/emoji/apple/heart_eyes_cat.png b/public/images/emoji/apple/heart_eyes_cat.png
index 36ff74b5a96..76fb9469f26 100644
Binary files a/public/images/emoji/apple/heart_eyes_cat.png and b/public/images/emoji/apple/heart_eyes_cat.png differ
diff --git a/public/images/emoji/apple/heartbeat.png b/public/images/emoji/apple/heartbeat.png
index 66e29a63672..a1d11e0e83d 100644
Binary files a/public/images/emoji/apple/heartbeat.png and b/public/images/emoji/apple/heartbeat.png differ
diff --git a/public/images/emoji/apple/heartpulse.png b/public/images/emoji/apple/heartpulse.png
index 72685c46656..261b980009b 100644
Binary files a/public/images/emoji/apple/heartpulse.png and b/public/images/emoji/apple/heartpulse.png differ
diff --git a/public/images/emoji/apple/hearts.png b/public/images/emoji/apple/hearts.png
index 3894fbc178e..d3a0f4b9d2a 100644
Binary files a/public/images/emoji/apple/hearts.png and b/public/images/emoji/apple/hearts.png differ
diff --git a/public/images/emoji/apple/heavy_check_mark.png b/public/images/emoji/apple/heavy_check_mark.png
index 6a4fc91c9d9..eff7b23c0c7 100644
Binary files a/public/images/emoji/apple/heavy_check_mark.png and b/public/images/emoji/apple/heavy_check_mark.png differ
diff --git a/public/images/emoji/apple/heavy_division_sign.png b/public/images/emoji/apple/heavy_division_sign.png
index 728e8fd7f5b..5a1f10e6133 100644
Binary files a/public/images/emoji/apple/heavy_division_sign.png and b/public/images/emoji/apple/heavy_division_sign.png differ
diff --git a/public/images/emoji/apple/heavy_dollar_sign.png b/public/images/emoji/apple/heavy_dollar_sign.png
index 256c942bbae..26d8cc68dc6 100644
Binary files a/public/images/emoji/apple/heavy_dollar_sign.png and b/public/images/emoji/apple/heavy_dollar_sign.png differ
diff --git a/public/images/emoji/apple/heavy_heart_exclamation.png b/public/images/emoji/apple/heavy_heart_exclamation.png
index 2b277ffc0d6..fcd1ba407a0 100644
Binary files a/public/images/emoji/apple/heavy_heart_exclamation.png and b/public/images/emoji/apple/heavy_heart_exclamation.png differ
diff --git a/public/images/emoji/apple/heavy_heart_exclamation_mark_ornament.png b/public/images/emoji/apple/heavy_heart_exclamation_mark_ornament.png
index 2b277ffc0d6..fcd1ba407a0 100644
Binary files a/public/images/emoji/apple/heavy_heart_exclamation_mark_ornament.png and b/public/images/emoji/apple/heavy_heart_exclamation_mark_ornament.png differ
diff --git a/public/images/emoji/apple/heavy_minus_sign.png b/public/images/emoji/apple/heavy_minus_sign.png
index fb4909f9dd3..59e710851fb 100644
Binary files a/public/images/emoji/apple/heavy_minus_sign.png and b/public/images/emoji/apple/heavy_minus_sign.png differ
diff --git a/public/images/emoji/apple/heavy_multiplication_x.png b/public/images/emoji/apple/heavy_multiplication_x.png
index 0b0e7d88fbe..08e248a76b9 100644
Binary files a/public/images/emoji/apple/heavy_multiplication_x.png and b/public/images/emoji/apple/heavy_multiplication_x.png differ
diff --git a/public/images/emoji/apple/heavy_plus_sign.png b/public/images/emoji/apple/heavy_plus_sign.png
index 4557910d54a..6c6b9ee2b04 100644
Binary files a/public/images/emoji/apple/heavy_plus_sign.png and b/public/images/emoji/apple/heavy_plus_sign.png differ
diff --git a/public/images/emoji/apple/hedgehog.png b/public/images/emoji/apple/hedgehog.png
index 9b978b35407..cd34276a8b0 100644
Binary files a/public/images/emoji/apple/hedgehog.png and b/public/images/emoji/apple/hedgehog.png differ
diff --git a/public/images/emoji/apple/helicopter.png b/public/images/emoji/apple/helicopter.png
index 78472fce500..c6c6031fa86 100644
Binary files a/public/images/emoji/apple/helicopter.png and b/public/images/emoji/apple/helicopter.png differ
diff --git a/public/images/emoji/apple/helmet_with_cross.png b/public/images/emoji/apple/helmet_with_cross.png
index 6440b55c340..cd03d216eb7 100644
Binary files a/public/images/emoji/apple/helmet_with_cross.png and b/public/images/emoji/apple/helmet_with_cross.png differ
diff --git a/public/images/emoji/apple/helmet_with_white_cross.png b/public/images/emoji/apple/helmet_with_white_cross.png
index 6440b55c340..cd03d216eb7 100644
Binary files a/public/images/emoji/apple/helmet_with_white_cross.png and b/public/images/emoji/apple/helmet_with_white_cross.png differ
diff --git a/public/images/emoji/apple/herb.png b/public/images/emoji/apple/herb.png
index 863fbff4b54..f51c31ae2f6 100644
Binary files a/public/images/emoji/apple/herb.png and b/public/images/emoji/apple/herb.png differ
diff --git a/public/images/emoji/apple/hibiscus.png b/public/images/emoji/apple/hibiscus.png
index c3fa3384aed..1e668f6c9f4 100644
Binary files a/public/images/emoji/apple/hibiscus.png and b/public/images/emoji/apple/hibiscus.png differ
diff --git a/public/images/emoji/apple/high_brightness.png b/public/images/emoji/apple/high_brightness.png
index e7e067344f3..68f487dfd36 100644
Binary files a/public/images/emoji/apple/high_brightness.png and b/public/images/emoji/apple/high_brightness.png differ
diff --git a/public/images/emoji/apple/high_heel.png b/public/images/emoji/apple/high_heel.png
index da1e800d375..6643cc9b467 100644
Binary files a/public/images/emoji/apple/high_heel.png and b/public/images/emoji/apple/high_heel.png differ
diff --git a/public/images/emoji/apple/hocho.png b/public/images/emoji/apple/hocho.png
index c8a63cfddd4..6cd981009ad 100644
Binary files a/public/images/emoji/apple/hocho.png and b/public/images/emoji/apple/hocho.png differ
diff --git a/public/images/emoji/apple/hockey.png b/public/images/emoji/apple/hockey.png
index e2198826de9..0d9d89374b9 100644
Binary files a/public/images/emoji/apple/hockey.png and b/public/images/emoji/apple/hockey.png differ
diff --git a/public/images/emoji/apple/hole.png b/public/images/emoji/apple/hole.png
index abdc40ae637..0b9142b3c33 100644
Binary files a/public/images/emoji/apple/hole.png and b/public/images/emoji/apple/hole.png differ
diff --git a/public/images/emoji/apple/homes.png b/public/images/emoji/apple/homes.png
index 5c9e59d1323..038eaaa715a 100644
Binary files a/public/images/emoji/apple/homes.png and b/public/images/emoji/apple/homes.png differ
diff --git a/public/images/emoji/apple/honduras.png b/public/images/emoji/apple/honduras.png
index a49bc9e6db5..7e60a884ec8 100644
Binary files a/public/images/emoji/apple/honduras.png and b/public/images/emoji/apple/honduras.png differ
diff --git a/public/images/emoji/apple/honey_pot.png b/public/images/emoji/apple/honey_pot.png
index 630a7b744b4..138169cfe70 100644
Binary files a/public/images/emoji/apple/honey_pot.png and b/public/images/emoji/apple/honey_pot.png differ
diff --git a/public/images/emoji/apple/honeybee.png b/public/images/emoji/apple/honeybee.png
index 82d7aa8a5af..d789bcdb795 100644
Binary files a/public/images/emoji/apple/honeybee.png and b/public/images/emoji/apple/honeybee.png differ
diff --git a/public/images/emoji/apple/hong_kong.png b/public/images/emoji/apple/hong_kong.png
index ad46b58eb07..65728e15609 100644
Binary files a/public/images/emoji/apple/hong_kong.png and b/public/images/emoji/apple/hong_kong.png differ
diff --git a/public/images/emoji/apple/horse.png b/public/images/emoji/apple/horse.png
index dcdc5ff6589..972390b10c5 100644
Binary files a/public/images/emoji/apple/horse.png and b/public/images/emoji/apple/horse.png differ
diff --git a/public/images/emoji/apple/horse_racing.png b/public/images/emoji/apple/horse_racing.png
index 2e3388c8066..2d6b106bc96 100644
Binary files a/public/images/emoji/apple/horse_racing.png and b/public/images/emoji/apple/horse_racing.png differ
diff --git a/public/images/emoji/apple/horse_racing/2.png b/public/images/emoji/apple/horse_racing/2.png
index 1e6ab0e0ac5..44b48edae3c 100644
Binary files a/public/images/emoji/apple/horse_racing/2.png and b/public/images/emoji/apple/horse_racing/2.png differ
diff --git a/public/images/emoji/apple/horse_racing/3.png b/public/images/emoji/apple/horse_racing/3.png
index 60a02fa6716..a8a9b084ac6 100644
Binary files a/public/images/emoji/apple/horse_racing/3.png and b/public/images/emoji/apple/horse_racing/3.png differ
diff --git a/public/images/emoji/apple/horse_racing/4.png b/public/images/emoji/apple/horse_racing/4.png
index df92a7f7cad..1b5937ff82d 100644
Binary files a/public/images/emoji/apple/horse_racing/4.png and b/public/images/emoji/apple/horse_racing/4.png differ
diff --git a/public/images/emoji/apple/horse_racing/5.png b/public/images/emoji/apple/horse_racing/5.png
index 174fe7b5cb6..80c2ad21fb3 100644
Binary files a/public/images/emoji/apple/horse_racing/5.png and b/public/images/emoji/apple/horse_racing/5.png differ
diff --git a/public/images/emoji/apple/horse_racing/6.png b/public/images/emoji/apple/horse_racing/6.png
index d46a863b60a..89a34b27731 100644
Binary files a/public/images/emoji/apple/horse_racing/6.png and b/public/images/emoji/apple/horse_racing/6.png differ
diff --git a/public/images/emoji/apple/hospital.png b/public/images/emoji/apple/hospital.png
index 9cb06311ce3..5ae24532559 100644
Binary files a/public/images/emoji/apple/hospital.png and b/public/images/emoji/apple/hospital.png differ
diff --git a/public/images/emoji/apple/hot_dog.png b/public/images/emoji/apple/hot_dog.png
index f8d63c366d0..8d12a15b062 100644
Binary files a/public/images/emoji/apple/hot_dog.png and b/public/images/emoji/apple/hot_dog.png differ
diff --git a/public/images/emoji/apple/hot_pepper.png b/public/images/emoji/apple/hot_pepper.png
index 793f6e02105..6667c4dbe98 100644
Binary files a/public/images/emoji/apple/hot_pepper.png and b/public/images/emoji/apple/hot_pepper.png differ
diff --git a/public/images/emoji/apple/hotdog.png b/public/images/emoji/apple/hotdog.png
index f8d63c366d0..8d12a15b062 100644
Binary files a/public/images/emoji/apple/hotdog.png and b/public/images/emoji/apple/hotdog.png differ
diff --git a/public/images/emoji/apple/hotel.png b/public/images/emoji/apple/hotel.png
index 7321778f170..2a27838e5e3 100644
Binary files a/public/images/emoji/apple/hotel.png and b/public/images/emoji/apple/hotel.png differ
diff --git a/public/images/emoji/apple/hotsprings.png b/public/images/emoji/apple/hotsprings.png
index 8fd9889c583..502b03ee875 100644
Binary files a/public/images/emoji/apple/hotsprings.png and b/public/images/emoji/apple/hotsprings.png differ
diff --git a/public/images/emoji/apple/hourglass.png b/public/images/emoji/apple/hourglass.png
index fce767913a1..bf1f802b1f5 100644
Binary files a/public/images/emoji/apple/hourglass.png and b/public/images/emoji/apple/hourglass.png differ
diff --git a/public/images/emoji/apple/hourglass_flowing_sand.png b/public/images/emoji/apple/hourglass_flowing_sand.png
index 842c74c9ef6..f5bef9812db 100644
Binary files a/public/images/emoji/apple/hourglass_flowing_sand.png and b/public/images/emoji/apple/hourglass_flowing_sand.png differ
diff --git a/public/images/emoji/apple/house.png b/public/images/emoji/apple/house.png
index 8b7e87943ce..81f0504564b 100644
Binary files a/public/images/emoji/apple/house.png and b/public/images/emoji/apple/house.png differ
diff --git a/public/images/emoji/apple/house_abandoned.png b/public/images/emoji/apple/house_abandoned.png
index f6c42518844..2b6f48ef18b 100644
Binary files a/public/images/emoji/apple/house_abandoned.png and b/public/images/emoji/apple/house_abandoned.png differ
diff --git a/public/images/emoji/apple/house_buildings.png b/public/images/emoji/apple/house_buildings.png
index 5c9e59d1323..038eaaa715a 100644
Binary files a/public/images/emoji/apple/house_buildings.png and b/public/images/emoji/apple/house_buildings.png differ
diff --git a/public/images/emoji/apple/house_with_garden.png b/public/images/emoji/apple/house_with_garden.png
index 78c604a69a6..29ce1b73ac1 100644
Binary files a/public/images/emoji/apple/house_with_garden.png and b/public/images/emoji/apple/house_with_garden.png differ
diff --git a/public/images/emoji/apple/houses.png b/public/images/emoji/apple/houses.png
index 5c9e59d1323..038eaaa715a 100644
Binary files a/public/images/emoji/apple/houses.png and b/public/images/emoji/apple/houses.png differ
diff --git a/public/images/emoji/apple/hugging.png b/public/images/emoji/apple/hugging.png
index 3bbffdd26fc..69391019a9c 100644
Binary files a/public/images/emoji/apple/hugging.png and b/public/images/emoji/apple/hugging.png differ
diff --git a/public/images/emoji/apple/hugging_face.png b/public/images/emoji/apple/hugging_face.png
index 3bbffdd26fc..69391019a9c 100644
Binary files a/public/images/emoji/apple/hugging_face.png and b/public/images/emoji/apple/hugging_face.png differ
diff --git a/public/images/emoji/apple/hugs.png b/public/images/emoji/apple/hugs.png
index 3bbffdd26fc..69391019a9c 100644
Binary files a/public/images/emoji/apple/hugs.png and b/public/images/emoji/apple/hugs.png differ
diff --git a/public/images/emoji/apple/hungary.png b/public/images/emoji/apple/hungary.png
index 56e8d4eda42..09552df74a5 100644
Binary files a/public/images/emoji/apple/hungary.png and b/public/images/emoji/apple/hungary.png differ
diff --git a/public/images/emoji/apple/hushed.png b/public/images/emoji/apple/hushed.png
index 062f12fa268..06b5801eb8e 100644
Binary files a/public/images/emoji/apple/hushed.png and b/public/images/emoji/apple/hushed.png differ
diff --git a/public/images/emoji/apple/ice_cream.png b/public/images/emoji/apple/ice_cream.png
index 1324a5ecbc2..b576c14d350 100644
Binary files a/public/images/emoji/apple/ice_cream.png and b/public/images/emoji/apple/ice_cream.png differ
diff --git a/public/images/emoji/apple/ice_hockey.png b/public/images/emoji/apple/ice_hockey.png
index e2198826de9..0d9d89374b9 100644
Binary files a/public/images/emoji/apple/ice_hockey.png and b/public/images/emoji/apple/ice_hockey.png differ
diff --git a/public/images/emoji/apple/ice_skate.png b/public/images/emoji/apple/ice_skate.png
index 1ce8b7220a3..1c146434572 100644
Binary files a/public/images/emoji/apple/ice_skate.png and b/public/images/emoji/apple/ice_skate.png differ
diff --git a/public/images/emoji/apple/icecream.png b/public/images/emoji/apple/icecream.png
index 20df9b4d38c..154d0a94146 100644
Binary files a/public/images/emoji/apple/icecream.png and b/public/images/emoji/apple/icecream.png differ
diff --git a/public/images/emoji/apple/iceland.png b/public/images/emoji/apple/iceland.png
index c5741f9410d..a60e55b365b 100644
Binary files a/public/images/emoji/apple/iceland.png and b/public/images/emoji/apple/iceland.png differ
diff --git a/public/images/emoji/apple/id.png b/public/images/emoji/apple/id.png
index a663a2a794a..bdee0a339b1 100644
Binary files a/public/images/emoji/apple/id.png and b/public/images/emoji/apple/id.png differ
diff --git a/public/images/emoji/apple/ideograph_advantage.png b/public/images/emoji/apple/ideograph_advantage.png
index 3572e307701..2f070c2c190 100644
Binary files a/public/images/emoji/apple/ideograph_advantage.png and b/public/images/emoji/apple/ideograph_advantage.png differ
diff --git a/public/images/emoji/apple/imp.png b/public/images/emoji/apple/imp.png
index 37f9ff7fdeb..325a5286691 100644
Binary files a/public/images/emoji/apple/imp.png and b/public/images/emoji/apple/imp.png differ
diff --git a/public/images/emoji/apple/inbox_tray.png b/public/images/emoji/apple/inbox_tray.png
index b0f49b1d668..d182d9b3b42 100644
Binary files a/public/images/emoji/apple/inbox_tray.png and b/public/images/emoji/apple/inbox_tray.png differ
diff --git a/public/images/emoji/apple/incoming_envelope.png b/public/images/emoji/apple/incoming_envelope.png
index e8013ab7a38..16761680c01 100644
Binary files a/public/images/emoji/apple/incoming_envelope.png and b/public/images/emoji/apple/incoming_envelope.png differ
diff --git a/public/images/emoji/apple/india.png b/public/images/emoji/apple/india.png
index 8f9167c0252..7f2d0a06371 100644
Binary files a/public/images/emoji/apple/india.png and b/public/images/emoji/apple/india.png differ
diff --git a/public/images/emoji/apple/indonesia.png b/public/images/emoji/apple/indonesia.png
index ca96fd3d960..742b997d104 100644
Binary files a/public/images/emoji/apple/indonesia.png and b/public/images/emoji/apple/indonesia.png differ
diff --git a/public/images/emoji/apple/information_desk_person.png b/public/images/emoji/apple/information_desk_person.png
index 4424423fa37..2486ff3b633 100644
Binary files a/public/images/emoji/apple/information_desk_person.png and b/public/images/emoji/apple/information_desk_person.png differ
diff --git a/public/images/emoji/apple/information_desk_person/2.png b/public/images/emoji/apple/information_desk_person/2.png
index 115198e5636..6f7f07a61d9 100644
Binary files a/public/images/emoji/apple/information_desk_person/2.png and b/public/images/emoji/apple/information_desk_person/2.png differ
diff --git a/public/images/emoji/apple/information_desk_person/3.png b/public/images/emoji/apple/information_desk_person/3.png
index d0593f87fbb..17b5b7b29ae 100644
Binary files a/public/images/emoji/apple/information_desk_person/3.png and b/public/images/emoji/apple/information_desk_person/3.png differ
diff --git a/public/images/emoji/apple/information_desk_person/4.png b/public/images/emoji/apple/information_desk_person/4.png
index a2f5d0294f2..fa50ac6116a 100644
Binary files a/public/images/emoji/apple/information_desk_person/4.png and b/public/images/emoji/apple/information_desk_person/4.png differ
diff --git a/public/images/emoji/apple/information_desk_person/5.png b/public/images/emoji/apple/information_desk_person/5.png
index 63d9338057f..0c57e348db2 100644
Binary files a/public/images/emoji/apple/information_desk_person/5.png and b/public/images/emoji/apple/information_desk_person/5.png differ
diff --git a/public/images/emoji/apple/information_desk_person/6.png b/public/images/emoji/apple/information_desk_person/6.png
index 30b2bd891a4..07f9e1dbd03 100644
Binary files a/public/images/emoji/apple/information_desk_person/6.png and b/public/images/emoji/apple/information_desk_person/6.png differ
diff --git a/public/images/emoji/apple/information_source.png b/public/images/emoji/apple/information_source.png
index f9e686ee2d6..d85b5d45ed9 100644
Binary files a/public/images/emoji/apple/information_source.png and b/public/images/emoji/apple/information_source.png differ
diff --git a/public/images/emoji/apple/innocent.png b/public/images/emoji/apple/innocent.png
index 2c454ee0d37..d7dd825b14e 100644
Binary files a/public/images/emoji/apple/innocent.png and b/public/images/emoji/apple/innocent.png differ
diff --git a/public/images/emoji/apple/interrobang.png b/public/images/emoji/apple/interrobang.png
index 818b6ac1a52..169d1e011d3 100644
Binary files a/public/images/emoji/apple/interrobang.png and b/public/images/emoji/apple/interrobang.png differ
diff --git a/public/images/emoji/apple/iphone.png b/public/images/emoji/apple/iphone.png
index 33ebfac21f4..58828a945c0 100644
Binary files a/public/images/emoji/apple/iphone.png and b/public/images/emoji/apple/iphone.png differ
diff --git a/public/images/emoji/apple/iran.png b/public/images/emoji/apple/iran.png
index 3d9e1356eac..e4ba534aa01 100644
Binary files a/public/images/emoji/apple/iran.png and b/public/images/emoji/apple/iran.png differ
diff --git a/public/images/emoji/apple/iraq.png b/public/images/emoji/apple/iraq.png
index 3c833ecc88c..be5ae34ae1d 100644
Binary files a/public/images/emoji/apple/iraq.png and b/public/images/emoji/apple/iraq.png differ
diff --git a/public/images/emoji/apple/ireland.png b/public/images/emoji/apple/ireland.png
index ffe6c6f3333..7e984a31074 100644
Binary files a/public/images/emoji/apple/ireland.png and b/public/images/emoji/apple/ireland.png differ
diff --git a/public/images/emoji/apple/island.png b/public/images/emoji/apple/island.png
index 8b98bbead11..0d3216e5e70 100644
Binary files a/public/images/emoji/apple/island.png and b/public/images/emoji/apple/island.png differ
diff --git a/public/images/emoji/apple/isle_of_man.png b/public/images/emoji/apple/isle_of_man.png
index b4a3ff3ef49..33d132ba693 100644
Binary files a/public/images/emoji/apple/isle_of_man.png and b/public/images/emoji/apple/isle_of_man.png differ
diff --git a/public/images/emoji/apple/israel.png b/public/images/emoji/apple/israel.png
index 20d0124b36d..c5daaecde62 100644
Binary files a/public/images/emoji/apple/israel.png and b/public/images/emoji/apple/israel.png differ
diff --git a/public/images/emoji/apple/it.png b/public/images/emoji/apple/it.png
index 0e5bc29dad6..6df1491cd3d 100644
Binary files a/public/images/emoji/apple/it.png and b/public/images/emoji/apple/it.png differ
diff --git a/public/images/emoji/apple/izakaya_lantern.png b/public/images/emoji/apple/izakaya_lantern.png
index 6b6a8fa3271..5e9b5c5ba45 100644
Binary files a/public/images/emoji/apple/izakaya_lantern.png and b/public/images/emoji/apple/izakaya_lantern.png differ
diff --git a/public/images/emoji/apple/jack_o_lantern.png b/public/images/emoji/apple/jack_o_lantern.png
index dc7f30477c1..d1a8d48cba4 100644
Binary files a/public/images/emoji/apple/jack_o_lantern.png and b/public/images/emoji/apple/jack_o_lantern.png differ
diff --git a/public/images/emoji/apple/jamaica.png b/public/images/emoji/apple/jamaica.png
index 8fe27974c57..a6339583c27 100644
Binary files a/public/images/emoji/apple/jamaica.png and b/public/images/emoji/apple/jamaica.png differ
diff --git a/public/images/emoji/apple/japan.png b/public/images/emoji/apple/japan.png
index a5ac5b6df22..6d65d9de4a6 100644
Binary files a/public/images/emoji/apple/japan.png and b/public/images/emoji/apple/japan.png differ
diff --git a/public/images/emoji/apple/japanese_castle.png b/public/images/emoji/apple/japanese_castle.png
index c70e0448b5f..760b7cfd2a3 100644
Binary files a/public/images/emoji/apple/japanese_castle.png and b/public/images/emoji/apple/japanese_castle.png differ
diff --git a/public/images/emoji/apple/japanese_goblin.png b/public/images/emoji/apple/japanese_goblin.png
index 87e48f4a06f..f2c2ed32035 100644
Binary files a/public/images/emoji/apple/japanese_goblin.png and b/public/images/emoji/apple/japanese_goblin.png differ
diff --git a/public/images/emoji/apple/japanese_ogre.png b/public/images/emoji/apple/japanese_ogre.png
index eff2422cc3c..cb98cf59ba0 100644
Binary files a/public/images/emoji/apple/japanese_ogre.png and b/public/images/emoji/apple/japanese_ogre.png differ
diff --git a/public/images/emoji/apple/jeans.png b/public/images/emoji/apple/jeans.png
index 621a6dd3372..0ad457b27c4 100644
Binary files a/public/images/emoji/apple/jeans.png and b/public/images/emoji/apple/jeans.png differ
diff --git a/public/images/emoji/apple/jersey.png b/public/images/emoji/apple/jersey.png
index 5cdb9f597cf..ed1e1ac41f7 100644
Binary files a/public/images/emoji/apple/jersey.png and b/public/images/emoji/apple/jersey.png differ
diff --git a/public/images/emoji/apple/jordan.png b/public/images/emoji/apple/jordan.png
index 7db4f23d1d3..17695eab252 100644
Binary files a/public/images/emoji/apple/jordan.png and b/public/images/emoji/apple/jordan.png differ
diff --git a/public/images/emoji/apple/joy.png b/public/images/emoji/apple/joy.png
index 89fab99cd45..7d04dac71a3 100644
Binary files a/public/images/emoji/apple/joy.png and b/public/images/emoji/apple/joy.png differ
diff --git a/public/images/emoji/apple/joy_cat.png b/public/images/emoji/apple/joy_cat.png
index 86730e80e7c..bf98ba02259 100644
Binary files a/public/images/emoji/apple/joy_cat.png and b/public/images/emoji/apple/joy_cat.png differ
diff --git a/public/images/emoji/apple/joystick.png b/public/images/emoji/apple/joystick.png
index 76220db9c2c..76d33a88c2c 100644
Binary files a/public/images/emoji/apple/joystick.png and b/public/images/emoji/apple/joystick.png differ
diff --git a/public/images/emoji/apple/jp.png b/public/images/emoji/apple/jp.png
index 4462748e589..d02250af7e8 100644
Binary files a/public/images/emoji/apple/jp.png and b/public/images/emoji/apple/jp.png differ
diff --git a/public/images/emoji/apple/kaaba.png b/public/images/emoji/apple/kaaba.png
index 383bab379ef..69c777c2638 100644
Binary files a/public/images/emoji/apple/kaaba.png and b/public/images/emoji/apple/kaaba.png differ
diff --git a/public/images/emoji/apple/kazakhstan.png b/public/images/emoji/apple/kazakhstan.png
index d3b98efcde7..b521201cbaf 100644
Binary files a/public/images/emoji/apple/kazakhstan.png and b/public/images/emoji/apple/kazakhstan.png differ
diff --git a/public/images/emoji/apple/kenya.png b/public/images/emoji/apple/kenya.png
index ad1e52279b8..05c83db143e 100644
Binary files a/public/images/emoji/apple/kenya.png and b/public/images/emoji/apple/kenya.png differ
diff --git a/public/images/emoji/apple/key.png b/public/images/emoji/apple/key.png
index 4a1779e24f6..b4b2a077baa 100644
Binary files a/public/images/emoji/apple/key.png and b/public/images/emoji/apple/key.png differ
diff --git a/public/images/emoji/apple/key2.png b/public/images/emoji/apple/key2.png
index 05715332b10..90602374732 100644
Binary files a/public/images/emoji/apple/key2.png and b/public/images/emoji/apple/key2.png differ
diff --git a/public/images/emoji/apple/keyboard.png b/public/images/emoji/apple/keyboard.png
index 835950ccf78..5d76c24996c 100644
Binary files a/public/images/emoji/apple/keyboard.png and b/public/images/emoji/apple/keyboard.png differ
diff --git a/public/images/emoji/apple/keycap_star.png b/public/images/emoji/apple/keycap_star.png
index f847acf58c4..302650d81e4 100644
Binary files a/public/images/emoji/apple/keycap_star.png and b/public/images/emoji/apple/keycap_star.png differ
diff --git a/public/images/emoji/apple/keycap_ten.png b/public/images/emoji/apple/keycap_ten.png
index 59d013deccd..d9a243b0665 100644
Binary files a/public/images/emoji/apple/keycap_ten.png and b/public/images/emoji/apple/keycap_ten.png differ
diff --git a/public/images/emoji/apple/kick_scooter.png b/public/images/emoji/apple/kick_scooter.png
index e04c09e543f..ce055fdb252 100644
Binary files a/public/images/emoji/apple/kick_scooter.png and b/public/images/emoji/apple/kick_scooter.png differ
diff --git a/public/images/emoji/apple/kimono.png b/public/images/emoji/apple/kimono.png
index af5be0c80c9..b808596f09e 100644
Binary files a/public/images/emoji/apple/kimono.png and b/public/images/emoji/apple/kimono.png differ
diff --git a/public/images/emoji/apple/kiribati.png b/public/images/emoji/apple/kiribati.png
index 2f0769690b4..a65acbc7d3d 100644
Binary files a/public/images/emoji/apple/kiribati.png and b/public/images/emoji/apple/kiribati.png differ
diff --git a/public/images/emoji/apple/kiss.png b/public/images/emoji/apple/kiss.png
index 0c2ef0e3db0..fd7ca539088 100644
Binary files a/public/images/emoji/apple/kiss.png and b/public/images/emoji/apple/kiss.png differ
diff --git a/public/images/emoji/apple/kissing.png b/public/images/emoji/apple/kissing.png
index 7fe9b7a3d15..699a8736742 100644
Binary files a/public/images/emoji/apple/kissing.png and b/public/images/emoji/apple/kissing.png differ
diff --git a/public/images/emoji/apple/kissing_cat.png b/public/images/emoji/apple/kissing_cat.png
index 3e76c73e547..c111a1af0b0 100644
Binary files a/public/images/emoji/apple/kissing_cat.png and b/public/images/emoji/apple/kissing_cat.png differ
diff --git a/public/images/emoji/apple/kissing_closed_eyes.png b/public/images/emoji/apple/kissing_closed_eyes.png
index 5c65b1da387..1f8aa2026b2 100644
Binary files a/public/images/emoji/apple/kissing_closed_eyes.png and b/public/images/emoji/apple/kissing_closed_eyes.png differ
diff --git a/public/images/emoji/apple/kissing_heart.png b/public/images/emoji/apple/kissing_heart.png
index 170e9fe110d..412902b5c7d 100644
Binary files a/public/images/emoji/apple/kissing_heart.png and b/public/images/emoji/apple/kissing_heart.png differ
diff --git a/public/images/emoji/apple/kissing_smiling_eyes.png b/public/images/emoji/apple/kissing_smiling_eyes.png
index c558e5b4c86..072beb7fd82 100644
Binary files a/public/images/emoji/apple/kissing_smiling_eyes.png and b/public/images/emoji/apple/kissing_smiling_eyes.png differ
diff --git a/public/images/emoji/apple/kiwi_fruit.png b/public/images/emoji/apple/kiwi_fruit.png
index fb4cd38885e..d8f7ea53471 100644
Binary files a/public/images/emoji/apple/kiwi_fruit.png and b/public/images/emoji/apple/kiwi_fruit.png differ
diff --git a/public/images/emoji/apple/knife.png b/public/images/emoji/apple/knife.png
index c8a63cfddd4..6cd981009ad 100644
Binary files a/public/images/emoji/apple/knife.png and b/public/images/emoji/apple/knife.png differ
diff --git a/public/images/emoji/apple/koala.png b/public/images/emoji/apple/koala.png
index 9c12e14d152..07e0bd5f641 100644
Binary files a/public/images/emoji/apple/koala.png and b/public/images/emoji/apple/koala.png differ
diff --git a/public/images/emoji/apple/koko.png b/public/images/emoji/apple/koko.png
index 30a390e8e63..189a4d45a37 100644
Binary files a/public/images/emoji/apple/koko.png and b/public/images/emoji/apple/koko.png differ
diff --git a/public/images/emoji/apple/kosovo.png b/public/images/emoji/apple/kosovo.png
index 1d721438489..94cfc655554 100644
Binary files a/public/images/emoji/apple/kosovo.png and b/public/images/emoji/apple/kosovo.png differ
diff --git a/public/images/emoji/apple/kr.png b/public/images/emoji/apple/kr.png
index d63cf96b43c..bc8349f75db 100644
Binary files a/public/images/emoji/apple/kr.png and b/public/images/emoji/apple/kr.png differ
diff --git a/public/images/emoji/apple/kuwait.png b/public/images/emoji/apple/kuwait.png
index 506e7c42499..8a8f76cb009 100644
Binary files a/public/images/emoji/apple/kuwait.png and b/public/images/emoji/apple/kuwait.png differ
diff --git a/public/images/emoji/apple/kyrgyzstan.png b/public/images/emoji/apple/kyrgyzstan.png
index 8d7ae07d916..7293cd0f320 100644
Binary files a/public/images/emoji/apple/kyrgyzstan.png and b/public/images/emoji/apple/kyrgyzstan.png differ
diff --git a/public/images/emoji/apple/label.png b/public/images/emoji/apple/label.png
index ec8d4de319f..53a9ed84da2 100644
Binary files a/public/images/emoji/apple/label.png and b/public/images/emoji/apple/label.png differ
diff --git a/public/images/emoji/apple/laos.png b/public/images/emoji/apple/laos.png
index 40db675d1c2..18f590d1a0d 100644
Binary files a/public/images/emoji/apple/laos.png and b/public/images/emoji/apple/laos.png differ
diff --git a/public/images/emoji/apple/large_blue_circle.png b/public/images/emoji/apple/large_blue_circle.png
index 6a2062451c2..40abdb4f225 100644
Binary files a/public/images/emoji/apple/large_blue_circle.png and b/public/images/emoji/apple/large_blue_circle.png differ
diff --git a/public/images/emoji/apple/large_blue_diamond.png b/public/images/emoji/apple/large_blue_diamond.png
index fd2f2178ae4..ad208a74176 100644
Binary files a/public/images/emoji/apple/large_blue_diamond.png and b/public/images/emoji/apple/large_blue_diamond.png differ
diff --git a/public/images/emoji/apple/large_orange_diamond.png b/public/images/emoji/apple/large_orange_diamond.png
index ab97bd6c123..e8af0fb6542 100644
Binary files a/public/images/emoji/apple/large_orange_diamond.png and b/public/images/emoji/apple/large_orange_diamond.png differ
diff --git a/public/images/emoji/apple/last_quarter_moon.png b/public/images/emoji/apple/last_quarter_moon.png
index 19f454d522a..2dbd0792129 100644
Binary files a/public/images/emoji/apple/last_quarter_moon.png and b/public/images/emoji/apple/last_quarter_moon.png differ
diff --git a/public/images/emoji/apple/last_quarter_moon_with_face.png b/public/images/emoji/apple/last_quarter_moon_with_face.png
index 09d75033d7e..36b0ced9f80 100644
Binary files a/public/images/emoji/apple/last_quarter_moon_with_face.png and b/public/images/emoji/apple/last_quarter_moon_with_face.png differ
diff --git a/public/images/emoji/apple/latin_cross.png b/public/images/emoji/apple/latin_cross.png
index efc7a79034a..14319872924 100644
Binary files a/public/images/emoji/apple/latin_cross.png and b/public/images/emoji/apple/latin_cross.png differ
diff --git a/public/images/emoji/apple/latvia.png b/public/images/emoji/apple/latvia.png
index b941fdcd4ca..4e8a1488223 100644
Binary files a/public/images/emoji/apple/latvia.png and b/public/images/emoji/apple/latvia.png differ
diff --git a/public/images/emoji/apple/laughing.png b/public/images/emoji/apple/laughing.png
index 7dd973daef2..eeac29f77c5 100644
Binary files a/public/images/emoji/apple/laughing.png and b/public/images/emoji/apple/laughing.png differ
diff --git a/public/images/emoji/apple/leaves.png b/public/images/emoji/apple/leaves.png
index 5a9d9c80248..12a0120288a 100644
Binary files a/public/images/emoji/apple/leaves.png and b/public/images/emoji/apple/leaves.png differ
diff --git a/public/images/emoji/apple/lebanon.png b/public/images/emoji/apple/lebanon.png
index b83364c1674..2218f2a27b6 100644
Binary files a/public/images/emoji/apple/lebanon.png and b/public/images/emoji/apple/lebanon.png differ
diff --git a/public/images/emoji/apple/ledger.png b/public/images/emoji/apple/ledger.png
index 73744147ce2..d95e8e0842a 100644
Binary files a/public/images/emoji/apple/ledger.png and b/public/images/emoji/apple/ledger.png differ
diff --git a/public/images/emoji/apple/left_luggage.png b/public/images/emoji/apple/left_luggage.png
index a27f78ca0e5..3dc5345a153 100644
Binary files a/public/images/emoji/apple/left_luggage.png and b/public/images/emoji/apple/left_luggage.png differ
diff --git a/public/images/emoji/apple/left_right_arrow.png b/public/images/emoji/apple/left_right_arrow.png
index ae4e53f32e8..57470ce1cc4 100644
Binary files a/public/images/emoji/apple/left_right_arrow.png and b/public/images/emoji/apple/left_right_arrow.png differ
diff --git a/public/images/emoji/apple/left_speech_bubble.png b/public/images/emoji/apple/left_speech_bubble.png
index 69a18462b7a..69715f3e5ff 100644
Binary files a/public/images/emoji/apple/left_speech_bubble.png and b/public/images/emoji/apple/left_speech_bubble.png differ
diff --git a/public/images/emoji/apple/leftwards_arrow_with_hook.png b/public/images/emoji/apple/leftwards_arrow_with_hook.png
index 336a4083883..7b393298aab 100644
Binary files a/public/images/emoji/apple/leftwards_arrow_with_hook.png and b/public/images/emoji/apple/leftwards_arrow_with_hook.png differ
diff --git a/public/images/emoji/apple/lemon.png b/public/images/emoji/apple/lemon.png
index 2d827455fc2..b57d52ff556 100644
Binary files a/public/images/emoji/apple/lemon.png and b/public/images/emoji/apple/lemon.png differ
diff --git a/public/images/emoji/apple/leo.png b/public/images/emoji/apple/leo.png
index 1556f8345fb..7eab2b540dc 100644
Binary files a/public/images/emoji/apple/leo.png and b/public/images/emoji/apple/leo.png differ
diff --git a/public/images/emoji/apple/leopard.png b/public/images/emoji/apple/leopard.png
index 0ece19dbb29..d06ded673f5 100644
Binary files a/public/images/emoji/apple/leopard.png and b/public/images/emoji/apple/leopard.png differ
diff --git a/public/images/emoji/apple/lesotho.png b/public/images/emoji/apple/lesotho.png
index e4f431dad80..60e5cd9a66c 100644
Binary files a/public/images/emoji/apple/lesotho.png and b/public/images/emoji/apple/lesotho.png differ
diff --git a/public/images/emoji/apple/level_slider.png b/public/images/emoji/apple/level_slider.png
index 99a962dcc15..bfd06558629 100644
Binary files a/public/images/emoji/apple/level_slider.png and b/public/images/emoji/apple/level_slider.png differ
diff --git a/public/images/emoji/apple/levitate.png b/public/images/emoji/apple/levitate.png
index 00ae1282f1d..05a2defa5aa 100644
Binary files a/public/images/emoji/apple/levitate.png and b/public/images/emoji/apple/levitate.png differ
diff --git a/public/images/emoji/apple/levitate/2.png b/public/images/emoji/apple/levitate/2.png
index 369be947839..4ba7d4edec6 100644
Binary files a/public/images/emoji/apple/levitate/2.png and b/public/images/emoji/apple/levitate/2.png differ
diff --git a/public/images/emoji/apple/levitate/3.png b/public/images/emoji/apple/levitate/3.png
index f81f47f2747..4bae1dd918d 100644
Binary files a/public/images/emoji/apple/levitate/3.png and b/public/images/emoji/apple/levitate/3.png differ
diff --git a/public/images/emoji/apple/levitate/4.png b/public/images/emoji/apple/levitate/4.png
index b355778d9f6..47922f9af65 100644
Binary files a/public/images/emoji/apple/levitate/4.png and b/public/images/emoji/apple/levitate/4.png differ
diff --git a/public/images/emoji/apple/levitate/5.png b/public/images/emoji/apple/levitate/5.png
index f348ca68e3a..52f0f634a4c 100644
Binary files a/public/images/emoji/apple/levitate/5.png and b/public/images/emoji/apple/levitate/5.png differ
diff --git a/public/images/emoji/apple/levitate/6.png b/public/images/emoji/apple/levitate/6.png
index 232f1c2dc26..d96c1e46413 100644
Binary files a/public/images/emoji/apple/levitate/6.png and b/public/images/emoji/apple/levitate/6.png differ
diff --git a/public/images/emoji/apple/liberia.png b/public/images/emoji/apple/liberia.png
index de7b2a957a9..379bc0e6d7f 100644
Binary files a/public/images/emoji/apple/liberia.png and b/public/images/emoji/apple/liberia.png differ
diff --git a/public/images/emoji/apple/libra.png b/public/images/emoji/apple/libra.png
index 5fb39d7ca22..b0c67d240e1 100644
Binary files a/public/images/emoji/apple/libra.png and b/public/images/emoji/apple/libra.png differ
diff --git a/public/images/emoji/apple/libya.png b/public/images/emoji/apple/libya.png
index 30437ab1fb3..111446a39cf 100644
Binary files a/public/images/emoji/apple/libya.png and b/public/images/emoji/apple/libya.png differ
diff --git a/public/images/emoji/apple/liechtenstein.png b/public/images/emoji/apple/liechtenstein.png
index 6046b94e9f7..f31351da2c1 100644
Binary files a/public/images/emoji/apple/liechtenstein.png and b/public/images/emoji/apple/liechtenstein.png differ
diff --git a/public/images/emoji/apple/lifter.png b/public/images/emoji/apple/lifter.png
index 9cebc0e16d5..4003c2f9a87 100644
Binary files a/public/images/emoji/apple/lifter.png and b/public/images/emoji/apple/lifter.png differ
diff --git a/public/images/emoji/apple/lifter/2.png b/public/images/emoji/apple/lifter/2.png
index df54bd55f94..6410729c55b 100644
Binary files a/public/images/emoji/apple/lifter/2.png and b/public/images/emoji/apple/lifter/2.png differ
diff --git a/public/images/emoji/apple/lifter/3.png b/public/images/emoji/apple/lifter/3.png
index dafe388c958..f44adf6bab7 100644
Binary files a/public/images/emoji/apple/lifter/3.png and b/public/images/emoji/apple/lifter/3.png differ
diff --git a/public/images/emoji/apple/lifter/4.png b/public/images/emoji/apple/lifter/4.png
index ecf9101aa9d..6d1c1d9f471 100644
Binary files a/public/images/emoji/apple/lifter/4.png and b/public/images/emoji/apple/lifter/4.png differ
diff --git a/public/images/emoji/apple/lifter/5.png b/public/images/emoji/apple/lifter/5.png
index cd1c9aad396..905c557e811 100644
Binary files a/public/images/emoji/apple/lifter/5.png and b/public/images/emoji/apple/lifter/5.png differ
diff --git a/public/images/emoji/apple/lifter/6.png b/public/images/emoji/apple/lifter/6.png
index 1afa3bea2c3..50286365b80 100644
Binary files a/public/images/emoji/apple/lifter/6.png and b/public/images/emoji/apple/lifter/6.png differ
diff --git a/public/images/emoji/apple/light_rail.png b/public/images/emoji/apple/light_rail.png
index 591c3c66143..aee65ed9f31 100644
Binary files a/public/images/emoji/apple/light_rail.png and b/public/images/emoji/apple/light_rail.png differ
diff --git a/public/images/emoji/apple/link.png b/public/images/emoji/apple/link.png
index d24ae9054b9..8e104d1c09f 100644
Binary files a/public/images/emoji/apple/link.png and b/public/images/emoji/apple/link.png differ
diff --git a/public/images/emoji/apple/linked_paperclips.png b/public/images/emoji/apple/linked_paperclips.png
index 235e2049c36..f3824c5f970 100644
Binary files a/public/images/emoji/apple/linked_paperclips.png and b/public/images/emoji/apple/linked_paperclips.png differ
diff --git a/public/images/emoji/apple/lion.png b/public/images/emoji/apple/lion.png
index f07e438beb1..47b0862903c 100644
Binary files a/public/images/emoji/apple/lion.png and b/public/images/emoji/apple/lion.png differ
diff --git a/public/images/emoji/apple/lion_face.png b/public/images/emoji/apple/lion_face.png
index f07e438beb1..47b0862903c 100644
Binary files a/public/images/emoji/apple/lion_face.png and b/public/images/emoji/apple/lion_face.png differ
diff --git a/public/images/emoji/apple/lips.png b/public/images/emoji/apple/lips.png
index bf3850fa06a..2ee8f388d32 100644
Binary files a/public/images/emoji/apple/lips.png and b/public/images/emoji/apple/lips.png differ
diff --git a/public/images/emoji/apple/lipstick.png b/public/images/emoji/apple/lipstick.png
index d4ee8baa40b..c91270c3b7d 100644
Binary files a/public/images/emoji/apple/lipstick.png and b/public/images/emoji/apple/lipstick.png differ
diff --git a/public/images/emoji/apple/lithuania.png b/public/images/emoji/apple/lithuania.png
index c6cf99bf21f..19904d6cea9 100644
Binary files a/public/images/emoji/apple/lithuania.png and b/public/images/emoji/apple/lithuania.png differ
diff --git a/public/images/emoji/apple/lizard.png b/public/images/emoji/apple/lizard.png
index 0eaa196dc18..1cb556aec7a 100644
Binary files a/public/images/emoji/apple/lizard.png and b/public/images/emoji/apple/lizard.png differ
diff --git a/public/images/emoji/apple/lock.png b/public/images/emoji/apple/lock.png
index da37d712576..76f5430678d 100644
Binary files a/public/images/emoji/apple/lock.png and b/public/images/emoji/apple/lock.png differ
diff --git a/public/images/emoji/apple/lock_with_ink_pen.png b/public/images/emoji/apple/lock_with_ink_pen.png
index 04f26eae33c..e48e560267e 100644
Binary files a/public/images/emoji/apple/lock_with_ink_pen.png and b/public/images/emoji/apple/lock_with_ink_pen.png differ
diff --git a/public/images/emoji/apple/lollipop.png b/public/images/emoji/apple/lollipop.png
index 67fa99b23e5..0a9b7192024 100644
Binary files a/public/images/emoji/apple/lollipop.png and b/public/images/emoji/apple/lollipop.png differ
diff --git a/public/images/emoji/apple/loop.png b/public/images/emoji/apple/loop.png
index 55461842899..76295b19164 100644
Binary files a/public/images/emoji/apple/loop.png and b/public/images/emoji/apple/loop.png differ
diff --git a/public/images/emoji/apple/loud_sound.png b/public/images/emoji/apple/loud_sound.png
index b5d62322860..f1f9aa24d83 100644
Binary files a/public/images/emoji/apple/loud_sound.png and b/public/images/emoji/apple/loud_sound.png differ
diff --git a/public/images/emoji/apple/loudspeaker.png b/public/images/emoji/apple/loudspeaker.png
index 532254bb105..5ca897f33b9 100644
Binary files a/public/images/emoji/apple/loudspeaker.png and b/public/images/emoji/apple/loudspeaker.png differ
diff --git a/public/images/emoji/apple/love_hotel.png b/public/images/emoji/apple/love_hotel.png
index a31a8f40a49..7d8eedbff97 100644
Binary files a/public/images/emoji/apple/love_hotel.png and b/public/images/emoji/apple/love_hotel.png differ
diff --git a/public/images/emoji/apple/love_letter.png b/public/images/emoji/apple/love_letter.png
index 452d90564a6..42b53856be7 100644
Binary files a/public/images/emoji/apple/love_letter.png and b/public/images/emoji/apple/love_letter.png differ
diff --git a/public/images/emoji/apple/love_you_gesture.png b/public/images/emoji/apple/love_you_gesture.png
index 14ef7c72b20..345384aeffe 100644
Binary files a/public/images/emoji/apple/love_you_gesture.png and b/public/images/emoji/apple/love_you_gesture.png differ
diff --git a/public/images/emoji/apple/love_you_gesture/2.png b/public/images/emoji/apple/love_you_gesture/2.png
index b70217e894c..6ddfb362ff1 100644
Binary files a/public/images/emoji/apple/love_you_gesture/2.png and b/public/images/emoji/apple/love_you_gesture/2.png differ
diff --git a/public/images/emoji/apple/love_you_gesture/3.png b/public/images/emoji/apple/love_you_gesture/3.png
index aa984ea9263..23667c40f38 100644
Binary files a/public/images/emoji/apple/love_you_gesture/3.png and b/public/images/emoji/apple/love_you_gesture/3.png differ
diff --git a/public/images/emoji/apple/love_you_gesture/4.png b/public/images/emoji/apple/love_you_gesture/4.png
index 5decb0e8008..58700ea40c7 100644
Binary files a/public/images/emoji/apple/love_you_gesture/4.png and b/public/images/emoji/apple/love_you_gesture/4.png differ
diff --git a/public/images/emoji/apple/love_you_gesture/5.png b/public/images/emoji/apple/love_you_gesture/5.png
index e0bb218cc08..52d8b68a4df 100644
Binary files a/public/images/emoji/apple/love_you_gesture/5.png and b/public/images/emoji/apple/love_you_gesture/5.png differ
diff --git a/public/images/emoji/apple/love_you_gesture/6.png b/public/images/emoji/apple/love_you_gesture/6.png
index bb51bde8bbd..dbebbeadd71 100644
Binary files a/public/images/emoji/apple/love_you_gesture/6.png and b/public/images/emoji/apple/love_you_gesture/6.png differ
diff --git a/public/images/emoji/apple/low_brightness.png b/public/images/emoji/apple/low_brightness.png
index 3602ba9cf70..4aaa12518c5 100644
Binary files a/public/images/emoji/apple/low_brightness.png and b/public/images/emoji/apple/low_brightness.png differ
diff --git a/public/images/emoji/apple/lower_left_ballpoint_pen.png b/public/images/emoji/apple/lower_left_ballpoint_pen.png
index b9e79ad2146..f4750b47391 100644
Binary files a/public/images/emoji/apple/lower_left_ballpoint_pen.png and b/public/images/emoji/apple/lower_left_ballpoint_pen.png differ
diff --git a/public/images/emoji/apple/lower_left_crayon.png b/public/images/emoji/apple/lower_left_crayon.png
index eaf918c81f4..4c526c7b920 100644
Binary files a/public/images/emoji/apple/lower_left_crayon.png and b/public/images/emoji/apple/lower_left_crayon.png differ
diff --git a/public/images/emoji/apple/lower_left_fountain_pen.png b/public/images/emoji/apple/lower_left_fountain_pen.png
index a9a947848d8..044cbf89175 100644
Binary files a/public/images/emoji/apple/lower_left_fountain_pen.png and b/public/images/emoji/apple/lower_left_fountain_pen.png differ
diff --git a/public/images/emoji/apple/lower_left_paintbrush.png b/public/images/emoji/apple/lower_left_paintbrush.png
index 2b02f0ad03a..3202e61d61b 100644
Binary files a/public/images/emoji/apple/lower_left_paintbrush.png and b/public/images/emoji/apple/lower_left_paintbrush.png differ
diff --git a/public/images/emoji/apple/luxembourg.png b/public/images/emoji/apple/luxembourg.png
index 3a2bba0528d..71e07b6a9be 100644
Binary files a/public/images/emoji/apple/luxembourg.png and b/public/images/emoji/apple/luxembourg.png differ
diff --git a/public/images/emoji/apple/lying_face.png b/public/images/emoji/apple/lying_face.png
index 2df4a358d30..4d9e54e3ef4 100644
Binary files a/public/images/emoji/apple/lying_face.png and b/public/images/emoji/apple/lying_face.png differ
diff --git a/public/images/emoji/apple/m.png b/public/images/emoji/apple/m.png
index e7c67de00e7..f3eb66e2834 100644
Binary files a/public/images/emoji/apple/m.png and b/public/images/emoji/apple/m.png differ
diff --git a/public/images/emoji/apple/macau.png b/public/images/emoji/apple/macau.png
index 6199face702..4ff58afcba6 100644
Binary files a/public/images/emoji/apple/macau.png and b/public/images/emoji/apple/macau.png differ
diff --git a/public/images/emoji/apple/macedonia.png b/public/images/emoji/apple/macedonia.png
index 4e6457d2d51..6b0be5b3e62 100644
Binary files a/public/images/emoji/apple/macedonia.png and b/public/images/emoji/apple/macedonia.png differ
diff --git a/public/images/emoji/apple/madagascar.png b/public/images/emoji/apple/madagascar.png
index a4e779a2c9d..77dd4f3ba4a 100644
Binary files a/public/images/emoji/apple/madagascar.png and b/public/images/emoji/apple/madagascar.png differ
diff --git a/public/images/emoji/apple/mag.png b/public/images/emoji/apple/mag.png
index fda41d19b8b..20e23b32d87 100644
Binary files a/public/images/emoji/apple/mag.png and b/public/images/emoji/apple/mag.png differ
diff --git a/public/images/emoji/apple/mag_right.png b/public/images/emoji/apple/mag_right.png
index 8ac9ef16178..24bf7429345 100644
Binary files a/public/images/emoji/apple/mag_right.png and b/public/images/emoji/apple/mag_right.png differ
diff --git a/public/images/emoji/apple/mage.png b/public/images/emoji/apple/mage.png
index 71c1b13f924..558f61472d0 100644
Binary files a/public/images/emoji/apple/mage.png and b/public/images/emoji/apple/mage.png differ
diff --git a/public/images/emoji/apple/mage/2.png b/public/images/emoji/apple/mage/2.png
index 823f6843fad..da735e4a6a8 100644
Binary files a/public/images/emoji/apple/mage/2.png and b/public/images/emoji/apple/mage/2.png differ
diff --git a/public/images/emoji/apple/mage/3.png b/public/images/emoji/apple/mage/3.png
index c2ff6622a04..4141860438e 100644
Binary files a/public/images/emoji/apple/mage/3.png and b/public/images/emoji/apple/mage/3.png differ
diff --git a/public/images/emoji/apple/mage/4.png b/public/images/emoji/apple/mage/4.png
index 76d0a52e374..27b18eb8b17 100644
Binary files a/public/images/emoji/apple/mage/4.png and b/public/images/emoji/apple/mage/4.png differ
diff --git a/public/images/emoji/apple/mage/5.png b/public/images/emoji/apple/mage/5.png
index ddb5de55806..e5aa11ec211 100644
Binary files a/public/images/emoji/apple/mage/5.png and b/public/images/emoji/apple/mage/5.png differ
diff --git a/public/images/emoji/apple/mage/6.png b/public/images/emoji/apple/mage/6.png
index 302dd62dfb3..424e056cc71 100644
Binary files a/public/images/emoji/apple/mage/6.png and b/public/images/emoji/apple/mage/6.png differ
diff --git a/public/images/emoji/apple/mahjong.png b/public/images/emoji/apple/mahjong.png
index 1bdcdec664d..c7bbd3cf94a 100644
Binary files a/public/images/emoji/apple/mahjong.png and b/public/images/emoji/apple/mahjong.png differ
diff --git a/public/images/emoji/apple/mailbox.png b/public/images/emoji/apple/mailbox.png
index 28f703c8ed2..083bb264929 100644
Binary files a/public/images/emoji/apple/mailbox.png and b/public/images/emoji/apple/mailbox.png differ
diff --git a/public/images/emoji/apple/mailbox_closed.png b/public/images/emoji/apple/mailbox_closed.png
index 6750b241773..6e52d20a6b1 100644
Binary files a/public/images/emoji/apple/mailbox_closed.png and b/public/images/emoji/apple/mailbox_closed.png differ
diff --git a/public/images/emoji/apple/mailbox_with_mail.png b/public/images/emoji/apple/mailbox_with_mail.png
index adf3a8218f8..d00f4789d92 100644
Binary files a/public/images/emoji/apple/mailbox_with_mail.png and b/public/images/emoji/apple/mailbox_with_mail.png differ
diff --git a/public/images/emoji/apple/mailbox_with_no_mail.png b/public/images/emoji/apple/mailbox_with_no_mail.png
index eaa51343603..7429747823f 100644
Binary files a/public/images/emoji/apple/mailbox_with_no_mail.png and b/public/images/emoji/apple/mailbox_with_no_mail.png differ
diff --git a/public/images/emoji/apple/malawi.png b/public/images/emoji/apple/malawi.png
index dea46a2af06..7efec983536 100644
Binary files a/public/images/emoji/apple/malawi.png and b/public/images/emoji/apple/malawi.png differ
diff --git a/public/images/emoji/apple/malaysia.png b/public/images/emoji/apple/malaysia.png
index 01bd5a75bd3..fcfe94bde1b 100644
Binary files a/public/images/emoji/apple/malaysia.png and b/public/images/emoji/apple/malaysia.png differ
diff --git a/public/images/emoji/apple/maldives.png b/public/images/emoji/apple/maldives.png
index 757cf7ec8d6..36848a5735f 100644
Binary files a/public/images/emoji/apple/maldives.png and b/public/images/emoji/apple/maldives.png differ
diff --git a/public/images/emoji/apple/male_couple_with_heart.png b/public/images/emoji/apple/male_couple_with_heart.png
index 41f436aa541..a08b18fd363 100644
Binary files a/public/images/emoji/apple/male_couple_with_heart.png and b/public/images/emoji/apple/male_couple_with_heart.png differ
diff --git a/public/images/emoji/apple/male_couplekiss.png b/public/images/emoji/apple/male_couplekiss.png
index 87fd1ce113e..8b3cc233394 100644
Binary files a/public/images/emoji/apple/male_couplekiss.png and b/public/images/emoji/apple/male_couplekiss.png differ
diff --git a/public/images/emoji/apple/male_detective.png b/public/images/emoji/apple/male_detective.png
index 6a7e53aff05..1e0b7a87a00 100644
Binary files a/public/images/emoji/apple/male_detective.png and b/public/images/emoji/apple/male_detective.png differ
diff --git a/public/images/emoji/apple/male_detective/2.png b/public/images/emoji/apple/male_detective/2.png
index 229e7c2986e..63db2bf139d 100644
Binary files a/public/images/emoji/apple/male_detective/2.png and b/public/images/emoji/apple/male_detective/2.png differ
diff --git a/public/images/emoji/apple/male_detective/3.png b/public/images/emoji/apple/male_detective/3.png
index 58ee54ac888..5e962f6fbb2 100644
Binary files a/public/images/emoji/apple/male_detective/3.png and b/public/images/emoji/apple/male_detective/3.png differ
diff --git a/public/images/emoji/apple/male_detective/4.png b/public/images/emoji/apple/male_detective/4.png
index 0ce63e8b7de..882cf29faf6 100644
Binary files a/public/images/emoji/apple/male_detective/4.png and b/public/images/emoji/apple/male_detective/4.png differ
diff --git a/public/images/emoji/apple/male_detective/5.png b/public/images/emoji/apple/male_detective/5.png
index 838cf318fe0..758ef9f758e 100644
Binary files a/public/images/emoji/apple/male_detective/5.png and b/public/images/emoji/apple/male_detective/5.png differ
diff --git a/public/images/emoji/apple/male_detective/6.png b/public/images/emoji/apple/male_detective/6.png
index e0cb2a0d2a6..9fa59607070 100644
Binary files a/public/images/emoji/apple/male_detective/6.png and b/public/images/emoji/apple/male_detective/6.png differ
diff --git a/public/images/emoji/apple/mali.png b/public/images/emoji/apple/mali.png
index c24e4ee765f..de88e6c2eb8 100644
Binary files a/public/images/emoji/apple/mali.png and b/public/images/emoji/apple/mali.png differ
diff --git a/public/images/emoji/apple/malta.png b/public/images/emoji/apple/malta.png
index 22e114c4357..158c1193158 100644
Binary files a/public/images/emoji/apple/malta.png and b/public/images/emoji/apple/malta.png differ
diff --git a/public/images/emoji/apple/man.png b/public/images/emoji/apple/man.png
index d0a76900ddb..c7f5f36906d 100644
Binary files a/public/images/emoji/apple/man.png and b/public/images/emoji/apple/man.png differ
diff --git a/public/images/emoji/apple/man/2.png b/public/images/emoji/apple/man/2.png
index 3e2e9ec4185..585eb0d6276 100644
Binary files a/public/images/emoji/apple/man/2.png and b/public/images/emoji/apple/man/2.png differ
diff --git a/public/images/emoji/apple/man/3.png b/public/images/emoji/apple/man/3.png
index f43bf4122f7..662f8953a12 100644
Binary files a/public/images/emoji/apple/man/3.png and b/public/images/emoji/apple/man/3.png differ
diff --git a/public/images/emoji/apple/man/4.png b/public/images/emoji/apple/man/4.png
index ad967fa0527..72e2b9f252f 100644
Binary files a/public/images/emoji/apple/man/4.png and b/public/images/emoji/apple/man/4.png differ
diff --git a/public/images/emoji/apple/man/5.png b/public/images/emoji/apple/man/5.png
index 8156d59cdba..2c6b64e7558 100644
Binary files a/public/images/emoji/apple/man/5.png and b/public/images/emoji/apple/man/5.png differ
diff --git a/public/images/emoji/apple/man/6.png b/public/images/emoji/apple/man/6.png
index 5ebceb49005..1fedd028532 100644
Binary files a/public/images/emoji/apple/man/6.png and b/public/images/emoji/apple/man/6.png differ
diff --git a/public/images/emoji/apple/man_artist.png b/public/images/emoji/apple/man_artist.png
index 8825c9dfbdf..e88801a1e49 100644
Binary files a/public/images/emoji/apple/man_artist.png and b/public/images/emoji/apple/man_artist.png differ
diff --git a/public/images/emoji/apple/man_artist/2.png b/public/images/emoji/apple/man_artist/2.png
index afbf7f49d71..554bdc0a575 100644
Binary files a/public/images/emoji/apple/man_artist/2.png and b/public/images/emoji/apple/man_artist/2.png differ
diff --git a/public/images/emoji/apple/man_artist/3.png b/public/images/emoji/apple/man_artist/3.png
index 0cdc7cb9319..1149f375bb1 100644
Binary files a/public/images/emoji/apple/man_artist/3.png and b/public/images/emoji/apple/man_artist/3.png differ
diff --git a/public/images/emoji/apple/man_artist/4.png b/public/images/emoji/apple/man_artist/4.png
index 6470b265270..a3a371ad1dd 100644
Binary files a/public/images/emoji/apple/man_artist/4.png and b/public/images/emoji/apple/man_artist/4.png differ
diff --git a/public/images/emoji/apple/man_artist/5.png b/public/images/emoji/apple/man_artist/5.png
index f365388e815..ce2abb23508 100644
Binary files a/public/images/emoji/apple/man_artist/5.png and b/public/images/emoji/apple/man_artist/5.png differ
diff --git a/public/images/emoji/apple/man_artist/6.png b/public/images/emoji/apple/man_artist/6.png
index ef1df031988..794a95d4d4f 100644
Binary files a/public/images/emoji/apple/man_artist/6.png and b/public/images/emoji/apple/man_artist/6.png differ
diff --git a/public/images/emoji/apple/man_astronaut.png b/public/images/emoji/apple/man_astronaut.png
index db6c2cf7f10..560c5198923 100644
Binary files a/public/images/emoji/apple/man_astronaut.png and b/public/images/emoji/apple/man_astronaut.png differ
diff --git a/public/images/emoji/apple/man_astronaut/2.png b/public/images/emoji/apple/man_astronaut/2.png
index 3409623591d..091d41e2115 100644
Binary files a/public/images/emoji/apple/man_astronaut/2.png and b/public/images/emoji/apple/man_astronaut/2.png differ
diff --git a/public/images/emoji/apple/man_astronaut/3.png b/public/images/emoji/apple/man_astronaut/3.png
index 5764d5d8971..a98ddcedbe7 100644
Binary files a/public/images/emoji/apple/man_astronaut/3.png and b/public/images/emoji/apple/man_astronaut/3.png differ
diff --git a/public/images/emoji/apple/man_astronaut/4.png b/public/images/emoji/apple/man_astronaut/4.png
index 45b6438095f..69e92495251 100644
Binary files a/public/images/emoji/apple/man_astronaut/4.png and b/public/images/emoji/apple/man_astronaut/4.png differ
diff --git a/public/images/emoji/apple/man_astronaut/5.png b/public/images/emoji/apple/man_astronaut/5.png
index 6d255ce511c..8393279792b 100644
Binary files a/public/images/emoji/apple/man_astronaut/5.png and b/public/images/emoji/apple/man_astronaut/5.png differ
diff --git a/public/images/emoji/apple/man_astronaut/6.png b/public/images/emoji/apple/man_astronaut/6.png
index 21bcecc02e8..b378bc9c86c 100644
Binary files a/public/images/emoji/apple/man_astronaut/6.png and b/public/images/emoji/apple/man_astronaut/6.png differ
diff --git a/public/images/emoji/apple/man_cartwheeling.png b/public/images/emoji/apple/man_cartwheeling.png
index 3ae0143de56..b8dbfa2f74e 100644
Binary files a/public/images/emoji/apple/man_cartwheeling.png and b/public/images/emoji/apple/man_cartwheeling.png differ
diff --git a/public/images/emoji/apple/man_cartwheeling/2.png b/public/images/emoji/apple/man_cartwheeling/2.png
index 8b0bc4ccb4f..0e4996d3b82 100644
Binary files a/public/images/emoji/apple/man_cartwheeling/2.png and b/public/images/emoji/apple/man_cartwheeling/2.png differ
diff --git a/public/images/emoji/apple/man_cartwheeling/3.png b/public/images/emoji/apple/man_cartwheeling/3.png
index 70a34fab0df..e9cbc62f72b 100644
Binary files a/public/images/emoji/apple/man_cartwheeling/3.png and b/public/images/emoji/apple/man_cartwheeling/3.png differ
diff --git a/public/images/emoji/apple/man_cartwheeling/4.png b/public/images/emoji/apple/man_cartwheeling/4.png
index 2b1c7918fab..cb12b99fc34 100644
Binary files a/public/images/emoji/apple/man_cartwheeling/4.png and b/public/images/emoji/apple/man_cartwheeling/4.png differ
diff --git a/public/images/emoji/apple/man_cartwheeling/5.png b/public/images/emoji/apple/man_cartwheeling/5.png
index 6b8e66c1e7f..ff29f100a71 100644
Binary files a/public/images/emoji/apple/man_cartwheeling/5.png and b/public/images/emoji/apple/man_cartwheeling/5.png differ
diff --git a/public/images/emoji/apple/man_cartwheeling/6.png b/public/images/emoji/apple/man_cartwheeling/6.png
index 000ce582f54..06be1a81254 100644
Binary files a/public/images/emoji/apple/man_cartwheeling/6.png and b/public/images/emoji/apple/man_cartwheeling/6.png differ
diff --git a/public/images/emoji/apple/man_cook.png b/public/images/emoji/apple/man_cook.png
index a011061836e..bcad059baef 100644
Binary files a/public/images/emoji/apple/man_cook.png and b/public/images/emoji/apple/man_cook.png differ
diff --git a/public/images/emoji/apple/man_cook/2.png b/public/images/emoji/apple/man_cook/2.png
index ad08f530f9b..1cf918256b5 100644
Binary files a/public/images/emoji/apple/man_cook/2.png and b/public/images/emoji/apple/man_cook/2.png differ
diff --git a/public/images/emoji/apple/man_cook/3.png b/public/images/emoji/apple/man_cook/3.png
index f99f2eab1d3..e4041509d0b 100644
Binary files a/public/images/emoji/apple/man_cook/3.png and b/public/images/emoji/apple/man_cook/3.png differ
diff --git a/public/images/emoji/apple/man_cook/4.png b/public/images/emoji/apple/man_cook/4.png
index 982cbe9d8b8..012fe4a4834 100644
Binary files a/public/images/emoji/apple/man_cook/4.png and b/public/images/emoji/apple/man_cook/4.png differ
diff --git a/public/images/emoji/apple/man_cook/5.png b/public/images/emoji/apple/man_cook/5.png
index e81965aa082..aff68541ee5 100644
Binary files a/public/images/emoji/apple/man_cook/5.png and b/public/images/emoji/apple/man_cook/5.png differ
diff --git a/public/images/emoji/apple/man_cook/6.png b/public/images/emoji/apple/man_cook/6.png
index 8879029ef8f..24af11598ba 100644
Binary files a/public/images/emoji/apple/man_cook/6.png and b/public/images/emoji/apple/man_cook/6.png differ
diff --git a/public/images/emoji/apple/man_dancing.png b/public/images/emoji/apple/man_dancing.png
index 0af681bdae3..9631bab5a39 100644
Binary files a/public/images/emoji/apple/man_dancing.png and b/public/images/emoji/apple/man_dancing.png differ
diff --git a/public/images/emoji/apple/man_dancing/2.png b/public/images/emoji/apple/man_dancing/2.png
index 1dfccb36c77..c12192fd590 100644
Binary files a/public/images/emoji/apple/man_dancing/2.png and b/public/images/emoji/apple/man_dancing/2.png differ
diff --git a/public/images/emoji/apple/man_dancing/3.png b/public/images/emoji/apple/man_dancing/3.png
index 04a83acaff1..9fa426846a3 100644
Binary files a/public/images/emoji/apple/man_dancing/3.png and b/public/images/emoji/apple/man_dancing/3.png differ
diff --git a/public/images/emoji/apple/man_dancing/4.png b/public/images/emoji/apple/man_dancing/4.png
index 33b8a9427c7..fbf0c7899d0 100644
Binary files a/public/images/emoji/apple/man_dancing/4.png and b/public/images/emoji/apple/man_dancing/4.png differ
diff --git a/public/images/emoji/apple/man_dancing/5.png b/public/images/emoji/apple/man_dancing/5.png
index 02c985dcf0f..59a7254111e 100644
Binary files a/public/images/emoji/apple/man_dancing/5.png and b/public/images/emoji/apple/man_dancing/5.png differ
diff --git a/public/images/emoji/apple/man_dancing/6.png b/public/images/emoji/apple/man_dancing/6.png
index 68e4dcd550f..72510d02b2d 100644
Binary files a/public/images/emoji/apple/man_dancing/6.png and b/public/images/emoji/apple/man_dancing/6.png differ
diff --git a/public/images/emoji/apple/man_facepalming.png b/public/images/emoji/apple/man_facepalming.png
index 543ef7e6460..2ea0ac51e8c 100644
Binary files a/public/images/emoji/apple/man_facepalming.png and b/public/images/emoji/apple/man_facepalming.png differ
diff --git a/public/images/emoji/apple/man_facepalming/2.png b/public/images/emoji/apple/man_facepalming/2.png
index ad95734385d..effe079a24e 100644
Binary files a/public/images/emoji/apple/man_facepalming/2.png and b/public/images/emoji/apple/man_facepalming/2.png differ
diff --git a/public/images/emoji/apple/man_facepalming/3.png b/public/images/emoji/apple/man_facepalming/3.png
index ef4d91dd2f1..ab29a67005b 100644
Binary files a/public/images/emoji/apple/man_facepalming/3.png and b/public/images/emoji/apple/man_facepalming/3.png differ
diff --git a/public/images/emoji/apple/man_facepalming/4.png b/public/images/emoji/apple/man_facepalming/4.png
index 365d50bf7de..e9e9fc21730 100644
Binary files a/public/images/emoji/apple/man_facepalming/4.png and b/public/images/emoji/apple/man_facepalming/4.png differ
diff --git a/public/images/emoji/apple/man_facepalming/5.png b/public/images/emoji/apple/man_facepalming/5.png
index b72399279bb..cfadc114972 100644
Binary files a/public/images/emoji/apple/man_facepalming/5.png and b/public/images/emoji/apple/man_facepalming/5.png differ
diff --git a/public/images/emoji/apple/man_facepalming/6.png b/public/images/emoji/apple/man_facepalming/6.png
index f9020c975a9..2b92dc8c445 100644
Binary files a/public/images/emoji/apple/man_facepalming/6.png and b/public/images/emoji/apple/man_facepalming/6.png differ
diff --git a/public/images/emoji/apple/man_factory_worker.png b/public/images/emoji/apple/man_factory_worker.png
index a6c98168ef8..3a42353d7b2 100644
Binary files a/public/images/emoji/apple/man_factory_worker.png and b/public/images/emoji/apple/man_factory_worker.png differ
diff --git a/public/images/emoji/apple/man_factory_worker/2.png b/public/images/emoji/apple/man_factory_worker/2.png
index 85e4c581774..758d17506a8 100644
Binary files a/public/images/emoji/apple/man_factory_worker/2.png and b/public/images/emoji/apple/man_factory_worker/2.png differ
diff --git a/public/images/emoji/apple/man_factory_worker/3.png b/public/images/emoji/apple/man_factory_worker/3.png
index 2768e7c782f..6d0a15ad282 100644
Binary files a/public/images/emoji/apple/man_factory_worker/3.png and b/public/images/emoji/apple/man_factory_worker/3.png differ
diff --git a/public/images/emoji/apple/man_factory_worker/4.png b/public/images/emoji/apple/man_factory_worker/4.png
index 5057d5ca9c5..f1281f6c10a 100644
Binary files a/public/images/emoji/apple/man_factory_worker/4.png and b/public/images/emoji/apple/man_factory_worker/4.png differ
diff --git a/public/images/emoji/apple/man_factory_worker/5.png b/public/images/emoji/apple/man_factory_worker/5.png
index bb55256aff5..3e9808f8445 100644
Binary files a/public/images/emoji/apple/man_factory_worker/5.png and b/public/images/emoji/apple/man_factory_worker/5.png differ
diff --git a/public/images/emoji/apple/man_factory_worker/6.png b/public/images/emoji/apple/man_factory_worker/6.png
index a1c8677fdb8..1e38146276f 100644
Binary files a/public/images/emoji/apple/man_factory_worker/6.png and b/public/images/emoji/apple/man_factory_worker/6.png differ
diff --git a/public/images/emoji/apple/man_farmer.png b/public/images/emoji/apple/man_farmer.png
index a6d9c8f88f2..9b599f63b12 100644
Binary files a/public/images/emoji/apple/man_farmer.png and b/public/images/emoji/apple/man_farmer.png differ
diff --git a/public/images/emoji/apple/man_farmer/2.png b/public/images/emoji/apple/man_farmer/2.png
index 252e6be1bce..6ca0fda4832 100644
Binary files a/public/images/emoji/apple/man_farmer/2.png and b/public/images/emoji/apple/man_farmer/2.png differ
diff --git a/public/images/emoji/apple/man_farmer/3.png b/public/images/emoji/apple/man_farmer/3.png
index 0ceac01ec99..3919788856c 100644
Binary files a/public/images/emoji/apple/man_farmer/3.png and b/public/images/emoji/apple/man_farmer/3.png differ
diff --git a/public/images/emoji/apple/man_farmer/4.png b/public/images/emoji/apple/man_farmer/4.png
index 85ae21b240d..d0c0c9b3852 100644
Binary files a/public/images/emoji/apple/man_farmer/4.png and b/public/images/emoji/apple/man_farmer/4.png differ
diff --git a/public/images/emoji/apple/man_farmer/5.png b/public/images/emoji/apple/man_farmer/5.png
index e38b0704e18..bd3a90658ee 100644
Binary files a/public/images/emoji/apple/man_farmer/5.png and b/public/images/emoji/apple/man_farmer/5.png differ
diff --git a/public/images/emoji/apple/man_farmer/6.png b/public/images/emoji/apple/man_farmer/6.png
index f204cf6de84..ba6030d80c1 100644
Binary files a/public/images/emoji/apple/man_farmer/6.png and b/public/images/emoji/apple/man_farmer/6.png differ
diff --git a/public/images/emoji/apple/man_firefighter.png b/public/images/emoji/apple/man_firefighter.png
index ca4f97c0dcf..1573f18ee42 100644
Binary files a/public/images/emoji/apple/man_firefighter.png and b/public/images/emoji/apple/man_firefighter.png differ
diff --git a/public/images/emoji/apple/man_firefighter/2.png b/public/images/emoji/apple/man_firefighter/2.png
index 17d673e75e1..229ba712e14 100644
Binary files a/public/images/emoji/apple/man_firefighter/2.png and b/public/images/emoji/apple/man_firefighter/2.png differ
diff --git a/public/images/emoji/apple/man_firefighter/3.png b/public/images/emoji/apple/man_firefighter/3.png
index c91a3d9a5b3..13c8bd0c88a 100644
Binary files a/public/images/emoji/apple/man_firefighter/3.png and b/public/images/emoji/apple/man_firefighter/3.png differ
diff --git a/public/images/emoji/apple/man_firefighter/4.png b/public/images/emoji/apple/man_firefighter/4.png
index b55329cb035..baf0b906f88 100644
Binary files a/public/images/emoji/apple/man_firefighter/4.png and b/public/images/emoji/apple/man_firefighter/4.png differ
diff --git a/public/images/emoji/apple/man_firefighter/5.png b/public/images/emoji/apple/man_firefighter/5.png
index b6424288c98..467028b38c6 100644
Binary files a/public/images/emoji/apple/man_firefighter/5.png and b/public/images/emoji/apple/man_firefighter/5.png differ
diff --git a/public/images/emoji/apple/man_firefighter/6.png b/public/images/emoji/apple/man_firefighter/6.png
index 767f788ad7b..f0e0a2c0ed9 100644
Binary files a/public/images/emoji/apple/man_firefighter/6.png and b/public/images/emoji/apple/man_firefighter/6.png differ
diff --git a/public/images/emoji/apple/man_health_worker.png b/public/images/emoji/apple/man_health_worker.png
index 34c3c1b819f..ed1b0cd161d 100644
Binary files a/public/images/emoji/apple/man_health_worker.png and b/public/images/emoji/apple/man_health_worker.png differ
diff --git a/public/images/emoji/apple/man_health_worker/2.png b/public/images/emoji/apple/man_health_worker/2.png
index d2f8d9bd9a0..624183f7c24 100644
Binary files a/public/images/emoji/apple/man_health_worker/2.png and b/public/images/emoji/apple/man_health_worker/2.png differ
diff --git a/public/images/emoji/apple/man_health_worker/3.png b/public/images/emoji/apple/man_health_worker/3.png
index 63ac74f7cb9..8ebb05df44c 100644
Binary files a/public/images/emoji/apple/man_health_worker/3.png and b/public/images/emoji/apple/man_health_worker/3.png differ
diff --git a/public/images/emoji/apple/man_health_worker/4.png b/public/images/emoji/apple/man_health_worker/4.png
index 977149a3ee9..ed0874fc486 100644
Binary files a/public/images/emoji/apple/man_health_worker/4.png and b/public/images/emoji/apple/man_health_worker/4.png differ
diff --git a/public/images/emoji/apple/man_health_worker/5.png b/public/images/emoji/apple/man_health_worker/5.png
index 822639db0cc..6491166815b 100644
Binary files a/public/images/emoji/apple/man_health_worker/5.png and b/public/images/emoji/apple/man_health_worker/5.png differ
diff --git a/public/images/emoji/apple/man_health_worker/6.png b/public/images/emoji/apple/man_health_worker/6.png
index 0c92a8d57c8..0d9f44f20fb 100644
Binary files a/public/images/emoji/apple/man_health_worker/6.png and b/public/images/emoji/apple/man_health_worker/6.png differ
diff --git a/public/images/emoji/apple/man_in_business_suit_levitating.png b/public/images/emoji/apple/man_in_business_suit_levitating.png
index 00ae1282f1d..05a2defa5aa 100644
Binary files a/public/images/emoji/apple/man_in_business_suit_levitating.png and b/public/images/emoji/apple/man_in_business_suit_levitating.png differ
diff --git a/public/images/emoji/apple/man_in_business_suit_levitating/2.png b/public/images/emoji/apple/man_in_business_suit_levitating/2.png
index 369be947839..4ba7d4edec6 100644
Binary files a/public/images/emoji/apple/man_in_business_suit_levitating/2.png and b/public/images/emoji/apple/man_in_business_suit_levitating/2.png differ
diff --git a/public/images/emoji/apple/man_in_business_suit_levitating/3.png b/public/images/emoji/apple/man_in_business_suit_levitating/3.png
index f81f47f2747..4bae1dd918d 100644
Binary files a/public/images/emoji/apple/man_in_business_suit_levitating/3.png and b/public/images/emoji/apple/man_in_business_suit_levitating/3.png differ
diff --git a/public/images/emoji/apple/man_in_business_suit_levitating/4.png b/public/images/emoji/apple/man_in_business_suit_levitating/4.png
index b355778d9f6..47922f9af65 100644
Binary files a/public/images/emoji/apple/man_in_business_suit_levitating/4.png and b/public/images/emoji/apple/man_in_business_suit_levitating/4.png differ
diff --git a/public/images/emoji/apple/man_in_business_suit_levitating/5.png b/public/images/emoji/apple/man_in_business_suit_levitating/5.png
index f348ca68e3a..52f0f634a4c 100644
Binary files a/public/images/emoji/apple/man_in_business_suit_levitating/5.png and b/public/images/emoji/apple/man_in_business_suit_levitating/5.png differ
diff --git a/public/images/emoji/apple/man_in_business_suit_levitating/6.png b/public/images/emoji/apple/man_in_business_suit_levitating/6.png
index 232f1c2dc26..d96c1e46413 100644
Binary files a/public/images/emoji/apple/man_in_business_suit_levitating/6.png and b/public/images/emoji/apple/man_in_business_suit_levitating/6.png differ
diff --git a/public/images/emoji/apple/man_in_tuxedo.png b/public/images/emoji/apple/man_in_tuxedo.png
index d26c5ab7485..abb68deda2c 100644
Binary files a/public/images/emoji/apple/man_in_tuxedo.png and b/public/images/emoji/apple/man_in_tuxedo.png differ
diff --git a/public/images/emoji/apple/man_in_tuxedo/2.png b/public/images/emoji/apple/man_in_tuxedo/2.png
index e111b35e4b6..9e3aecb3959 100644
Binary files a/public/images/emoji/apple/man_in_tuxedo/2.png and b/public/images/emoji/apple/man_in_tuxedo/2.png differ
diff --git a/public/images/emoji/apple/man_in_tuxedo/3.png b/public/images/emoji/apple/man_in_tuxedo/3.png
index 3f77f7170e7..181fa893c18 100644
Binary files a/public/images/emoji/apple/man_in_tuxedo/3.png and b/public/images/emoji/apple/man_in_tuxedo/3.png differ
diff --git a/public/images/emoji/apple/man_in_tuxedo/4.png b/public/images/emoji/apple/man_in_tuxedo/4.png
index b5f066bfc4a..1ab827de4d6 100644
Binary files a/public/images/emoji/apple/man_in_tuxedo/4.png and b/public/images/emoji/apple/man_in_tuxedo/4.png differ
diff --git a/public/images/emoji/apple/man_in_tuxedo/5.png b/public/images/emoji/apple/man_in_tuxedo/5.png
index 0af5ba30e45..b3ec77a8ae9 100644
Binary files a/public/images/emoji/apple/man_in_tuxedo/5.png and b/public/images/emoji/apple/man_in_tuxedo/5.png differ
diff --git a/public/images/emoji/apple/man_in_tuxedo/6.png b/public/images/emoji/apple/man_in_tuxedo/6.png
index d88356fae69..09985ec8d3b 100644
Binary files a/public/images/emoji/apple/man_in_tuxedo/6.png and b/public/images/emoji/apple/man_in_tuxedo/6.png differ
diff --git a/public/images/emoji/apple/man_judge.png b/public/images/emoji/apple/man_judge.png
index 28a239d66fd..af35a16f4ae 100644
Binary files a/public/images/emoji/apple/man_judge.png and b/public/images/emoji/apple/man_judge.png differ
diff --git a/public/images/emoji/apple/man_judge/2.png b/public/images/emoji/apple/man_judge/2.png
index ca388ecaaf9..84d37242498 100644
Binary files a/public/images/emoji/apple/man_judge/2.png and b/public/images/emoji/apple/man_judge/2.png differ
diff --git a/public/images/emoji/apple/man_judge/3.png b/public/images/emoji/apple/man_judge/3.png
index 5108fa862a5..29bca37cdc8 100644
Binary files a/public/images/emoji/apple/man_judge/3.png and b/public/images/emoji/apple/man_judge/3.png differ
diff --git a/public/images/emoji/apple/man_judge/4.png b/public/images/emoji/apple/man_judge/4.png
index ece8bf3bbee..f127f0c6daf 100644
Binary files a/public/images/emoji/apple/man_judge/4.png and b/public/images/emoji/apple/man_judge/4.png differ
diff --git a/public/images/emoji/apple/man_judge/5.png b/public/images/emoji/apple/man_judge/5.png
index 2948e550524..3852572608f 100644
Binary files a/public/images/emoji/apple/man_judge/5.png and b/public/images/emoji/apple/man_judge/5.png differ
diff --git a/public/images/emoji/apple/man_judge/6.png b/public/images/emoji/apple/man_judge/6.png
index 1dcaa33a483..fb23b74a42b 100644
Binary files a/public/images/emoji/apple/man_judge/6.png and b/public/images/emoji/apple/man_judge/6.png differ
diff --git a/public/images/emoji/apple/man_juggling.png b/public/images/emoji/apple/man_juggling.png
index 522e573120c..56fac48ea04 100644
Binary files a/public/images/emoji/apple/man_juggling.png and b/public/images/emoji/apple/man_juggling.png differ
diff --git a/public/images/emoji/apple/man_juggling/2.png b/public/images/emoji/apple/man_juggling/2.png
index c2c687f6c10..78445bb0d54 100644
Binary files a/public/images/emoji/apple/man_juggling/2.png and b/public/images/emoji/apple/man_juggling/2.png differ
diff --git a/public/images/emoji/apple/man_juggling/3.png b/public/images/emoji/apple/man_juggling/3.png
index feb24708d52..0a11e7dda75 100644
Binary files a/public/images/emoji/apple/man_juggling/3.png and b/public/images/emoji/apple/man_juggling/3.png differ
diff --git a/public/images/emoji/apple/man_juggling/4.png b/public/images/emoji/apple/man_juggling/4.png
index 2a414e5c389..4b6db559342 100644
Binary files a/public/images/emoji/apple/man_juggling/4.png and b/public/images/emoji/apple/man_juggling/4.png differ
diff --git a/public/images/emoji/apple/man_juggling/5.png b/public/images/emoji/apple/man_juggling/5.png
index eb5d2b8d633..a0558f103dc 100644
Binary files a/public/images/emoji/apple/man_juggling/5.png and b/public/images/emoji/apple/man_juggling/5.png differ
diff --git a/public/images/emoji/apple/man_juggling/6.png b/public/images/emoji/apple/man_juggling/6.png
index cd2f51c6cde..b0b60e9145a 100644
Binary files a/public/images/emoji/apple/man_juggling/6.png and b/public/images/emoji/apple/man_juggling/6.png differ
diff --git a/public/images/emoji/apple/man_mechanic.png b/public/images/emoji/apple/man_mechanic.png
index 434741acd90..5a1ce2671df 100644
Binary files a/public/images/emoji/apple/man_mechanic.png and b/public/images/emoji/apple/man_mechanic.png differ
diff --git a/public/images/emoji/apple/man_mechanic/2.png b/public/images/emoji/apple/man_mechanic/2.png
index 4bd7e9831a3..e82088788d8 100644
Binary files a/public/images/emoji/apple/man_mechanic/2.png and b/public/images/emoji/apple/man_mechanic/2.png differ
diff --git a/public/images/emoji/apple/man_mechanic/3.png b/public/images/emoji/apple/man_mechanic/3.png
index 27efe79466d..a08e2ab3604 100644
Binary files a/public/images/emoji/apple/man_mechanic/3.png and b/public/images/emoji/apple/man_mechanic/3.png differ
diff --git a/public/images/emoji/apple/man_mechanic/4.png b/public/images/emoji/apple/man_mechanic/4.png
index 8180cb61e1d..bd3a3fc3c4f 100644
Binary files a/public/images/emoji/apple/man_mechanic/4.png and b/public/images/emoji/apple/man_mechanic/4.png differ
diff --git a/public/images/emoji/apple/man_mechanic/5.png b/public/images/emoji/apple/man_mechanic/5.png
index bddf8cd8aab..c025bc1a95b 100644
Binary files a/public/images/emoji/apple/man_mechanic/5.png and b/public/images/emoji/apple/man_mechanic/5.png differ
diff --git a/public/images/emoji/apple/man_mechanic/6.png b/public/images/emoji/apple/man_mechanic/6.png
index 6524bc68928..ff505d74db3 100644
Binary files a/public/images/emoji/apple/man_mechanic/6.png and b/public/images/emoji/apple/man_mechanic/6.png differ
diff --git a/public/images/emoji/apple/man_office_worker.png b/public/images/emoji/apple/man_office_worker.png
index f571c9515bb..57ae53bb934 100644
Binary files a/public/images/emoji/apple/man_office_worker.png and b/public/images/emoji/apple/man_office_worker.png differ
diff --git a/public/images/emoji/apple/man_office_worker/2.png b/public/images/emoji/apple/man_office_worker/2.png
index 35881b6c569..cff0ff3e053 100644
Binary files a/public/images/emoji/apple/man_office_worker/2.png and b/public/images/emoji/apple/man_office_worker/2.png differ
diff --git a/public/images/emoji/apple/man_office_worker/3.png b/public/images/emoji/apple/man_office_worker/3.png
index 4b64ae8c6e5..ae03f10c00d 100644
Binary files a/public/images/emoji/apple/man_office_worker/3.png and b/public/images/emoji/apple/man_office_worker/3.png differ
diff --git a/public/images/emoji/apple/man_office_worker/4.png b/public/images/emoji/apple/man_office_worker/4.png
index c4a81e93684..39dc08828a0 100644
Binary files a/public/images/emoji/apple/man_office_worker/4.png and b/public/images/emoji/apple/man_office_worker/4.png differ
diff --git a/public/images/emoji/apple/man_office_worker/5.png b/public/images/emoji/apple/man_office_worker/5.png
index 84cc0fcf8bc..78fcbd97e11 100644
Binary files a/public/images/emoji/apple/man_office_worker/5.png and b/public/images/emoji/apple/man_office_worker/5.png differ
diff --git a/public/images/emoji/apple/man_office_worker/6.png b/public/images/emoji/apple/man_office_worker/6.png
index 4b86047b612..90d33e156b1 100644
Binary files a/public/images/emoji/apple/man_office_worker/6.png and b/public/images/emoji/apple/man_office_worker/6.png differ
diff --git a/public/images/emoji/apple/man_pilot.png b/public/images/emoji/apple/man_pilot.png
index 9a64881605c..dd9bb24d298 100644
Binary files a/public/images/emoji/apple/man_pilot.png and b/public/images/emoji/apple/man_pilot.png differ
diff --git a/public/images/emoji/apple/man_pilot/2.png b/public/images/emoji/apple/man_pilot/2.png
index 14bdcec1ce5..4fd03aaaf08 100644
Binary files a/public/images/emoji/apple/man_pilot/2.png and b/public/images/emoji/apple/man_pilot/2.png differ
diff --git a/public/images/emoji/apple/man_pilot/3.png b/public/images/emoji/apple/man_pilot/3.png
index 5966125a95c..9343427b34e 100644
Binary files a/public/images/emoji/apple/man_pilot/3.png and b/public/images/emoji/apple/man_pilot/3.png differ
diff --git a/public/images/emoji/apple/man_pilot/4.png b/public/images/emoji/apple/man_pilot/4.png
index d49ed4ceccd..9b21afbdc12 100644
Binary files a/public/images/emoji/apple/man_pilot/4.png and b/public/images/emoji/apple/man_pilot/4.png differ
diff --git a/public/images/emoji/apple/man_pilot/5.png b/public/images/emoji/apple/man_pilot/5.png
index 0cc121d2840..94aad3872e0 100644
Binary files a/public/images/emoji/apple/man_pilot/5.png and b/public/images/emoji/apple/man_pilot/5.png differ
diff --git a/public/images/emoji/apple/man_pilot/6.png b/public/images/emoji/apple/man_pilot/6.png
index d0db4df14de..ffc5e5eefef 100644
Binary files a/public/images/emoji/apple/man_pilot/6.png and b/public/images/emoji/apple/man_pilot/6.png differ
diff --git a/public/images/emoji/apple/man_playing_handball.png b/public/images/emoji/apple/man_playing_handball.png
index 05649552544..457a158e80c 100644
Binary files a/public/images/emoji/apple/man_playing_handball.png and b/public/images/emoji/apple/man_playing_handball.png differ
diff --git a/public/images/emoji/apple/man_playing_handball/2.png b/public/images/emoji/apple/man_playing_handball/2.png
index 58c4200728f..7e0a3cbc826 100644
Binary files a/public/images/emoji/apple/man_playing_handball/2.png and b/public/images/emoji/apple/man_playing_handball/2.png differ
diff --git a/public/images/emoji/apple/man_playing_handball/3.png b/public/images/emoji/apple/man_playing_handball/3.png
index b3dd093946e..0ad54c27f03 100644
Binary files a/public/images/emoji/apple/man_playing_handball/3.png and b/public/images/emoji/apple/man_playing_handball/3.png differ
diff --git a/public/images/emoji/apple/man_playing_handball/4.png b/public/images/emoji/apple/man_playing_handball/4.png
index 04f2941f2ac..06ccb563f58 100644
Binary files a/public/images/emoji/apple/man_playing_handball/4.png and b/public/images/emoji/apple/man_playing_handball/4.png differ
diff --git a/public/images/emoji/apple/man_playing_handball/5.png b/public/images/emoji/apple/man_playing_handball/5.png
index 1b777197604..56bd0bb8b36 100644
Binary files a/public/images/emoji/apple/man_playing_handball/5.png and b/public/images/emoji/apple/man_playing_handball/5.png differ
diff --git a/public/images/emoji/apple/man_playing_handball/6.png b/public/images/emoji/apple/man_playing_handball/6.png
index 596c061174c..8c05e637882 100644
Binary files a/public/images/emoji/apple/man_playing_handball/6.png and b/public/images/emoji/apple/man_playing_handball/6.png differ
diff --git a/public/images/emoji/apple/man_playing_water_polo.png b/public/images/emoji/apple/man_playing_water_polo.png
index d7f9416a7c8..029db7035d2 100644
Binary files a/public/images/emoji/apple/man_playing_water_polo.png and b/public/images/emoji/apple/man_playing_water_polo.png differ
diff --git a/public/images/emoji/apple/man_playing_water_polo/2.png b/public/images/emoji/apple/man_playing_water_polo/2.png
index ea882c2467f..56e94355f63 100644
Binary files a/public/images/emoji/apple/man_playing_water_polo/2.png and b/public/images/emoji/apple/man_playing_water_polo/2.png differ
diff --git a/public/images/emoji/apple/man_playing_water_polo/3.png b/public/images/emoji/apple/man_playing_water_polo/3.png
index 239daf01b4d..201f544c2e5 100644
Binary files a/public/images/emoji/apple/man_playing_water_polo/3.png and b/public/images/emoji/apple/man_playing_water_polo/3.png differ
diff --git a/public/images/emoji/apple/man_playing_water_polo/4.png b/public/images/emoji/apple/man_playing_water_polo/4.png
index 3c2cdc98443..c5c63b18e98 100644
Binary files a/public/images/emoji/apple/man_playing_water_polo/4.png and b/public/images/emoji/apple/man_playing_water_polo/4.png differ
diff --git a/public/images/emoji/apple/man_playing_water_polo/5.png b/public/images/emoji/apple/man_playing_water_polo/5.png
index 2601d914492..f84853e31bf 100644
Binary files a/public/images/emoji/apple/man_playing_water_polo/5.png and b/public/images/emoji/apple/man_playing_water_polo/5.png differ
diff --git a/public/images/emoji/apple/man_playing_water_polo/6.png b/public/images/emoji/apple/man_playing_water_polo/6.png
index 0fb0a970492..18f57565cd5 100644
Binary files a/public/images/emoji/apple/man_playing_water_polo/6.png and b/public/images/emoji/apple/man_playing_water_polo/6.png differ
diff --git a/public/images/emoji/apple/man_scientist.png b/public/images/emoji/apple/man_scientist.png
index bf534a9a095..ed8b9071165 100644
Binary files a/public/images/emoji/apple/man_scientist.png and b/public/images/emoji/apple/man_scientist.png differ
diff --git a/public/images/emoji/apple/man_scientist/2.png b/public/images/emoji/apple/man_scientist/2.png
index 5d4a941e816..57320e05ec5 100644
Binary files a/public/images/emoji/apple/man_scientist/2.png and b/public/images/emoji/apple/man_scientist/2.png differ
diff --git a/public/images/emoji/apple/man_scientist/3.png b/public/images/emoji/apple/man_scientist/3.png
index 75f2274b253..44b200e55a1 100644
Binary files a/public/images/emoji/apple/man_scientist/3.png and b/public/images/emoji/apple/man_scientist/3.png differ
diff --git a/public/images/emoji/apple/man_scientist/4.png b/public/images/emoji/apple/man_scientist/4.png
index dcc91d5323e..8b8af517078 100644
Binary files a/public/images/emoji/apple/man_scientist/4.png and b/public/images/emoji/apple/man_scientist/4.png differ
diff --git a/public/images/emoji/apple/man_scientist/5.png b/public/images/emoji/apple/man_scientist/5.png
index eca94862e29..ccaa719838d 100644
Binary files a/public/images/emoji/apple/man_scientist/5.png and b/public/images/emoji/apple/man_scientist/5.png differ
diff --git a/public/images/emoji/apple/man_scientist/6.png b/public/images/emoji/apple/man_scientist/6.png
index 17a37300550..6773188af83 100644
Binary files a/public/images/emoji/apple/man_scientist/6.png and b/public/images/emoji/apple/man_scientist/6.png differ
diff --git a/public/images/emoji/apple/man_shrugging.png b/public/images/emoji/apple/man_shrugging.png
index 50739842d34..9fcc84c2a7e 100644
Binary files a/public/images/emoji/apple/man_shrugging.png and b/public/images/emoji/apple/man_shrugging.png differ
diff --git a/public/images/emoji/apple/man_shrugging/2.png b/public/images/emoji/apple/man_shrugging/2.png
index 6c2939783ea..e6cedae271a 100644
Binary files a/public/images/emoji/apple/man_shrugging/2.png and b/public/images/emoji/apple/man_shrugging/2.png differ
diff --git a/public/images/emoji/apple/man_shrugging/3.png b/public/images/emoji/apple/man_shrugging/3.png
index 73e4357b305..f0822b293bb 100644
Binary files a/public/images/emoji/apple/man_shrugging/3.png and b/public/images/emoji/apple/man_shrugging/3.png differ
diff --git a/public/images/emoji/apple/man_shrugging/4.png b/public/images/emoji/apple/man_shrugging/4.png
index 1f05b6a518c..416848d92d0 100644
Binary files a/public/images/emoji/apple/man_shrugging/4.png and b/public/images/emoji/apple/man_shrugging/4.png differ
diff --git a/public/images/emoji/apple/man_shrugging/5.png b/public/images/emoji/apple/man_shrugging/5.png
index 2ac60876814..3fa86206a6e 100644
Binary files a/public/images/emoji/apple/man_shrugging/5.png and b/public/images/emoji/apple/man_shrugging/5.png differ
diff --git a/public/images/emoji/apple/man_shrugging/6.png b/public/images/emoji/apple/man_shrugging/6.png
index c0f6f9b958e..6be62c88ea0 100644
Binary files a/public/images/emoji/apple/man_shrugging/6.png and b/public/images/emoji/apple/man_shrugging/6.png differ
diff --git a/public/images/emoji/apple/man_singer.png b/public/images/emoji/apple/man_singer.png
index 7407d166f82..05b561bb535 100644
Binary files a/public/images/emoji/apple/man_singer.png and b/public/images/emoji/apple/man_singer.png differ
diff --git a/public/images/emoji/apple/man_singer/2.png b/public/images/emoji/apple/man_singer/2.png
index 90b2dba0351..37995d28e37 100644
Binary files a/public/images/emoji/apple/man_singer/2.png and b/public/images/emoji/apple/man_singer/2.png differ
diff --git a/public/images/emoji/apple/man_singer/3.png b/public/images/emoji/apple/man_singer/3.png
index 97d24670a27..a69cf9ba10d 100644
Binary files a/public/images/emoji/apple/man_singer/3.png and b/public/images/emoji/apple/man_singer/3.png differ
diff --git a/public/images/emoji/apple/man_singer/4.png b/public/images/emoji/apple/man_singer/4.png
index 1986fce0295..9232c07aced 100644
Binary files a/public/images/emoji/apple/man_singer/4.png and b/public/images/emoji/apple/man_singer/4.png differ
diff --git a/public/images/emoji/apple/man_singer/5.png b/public/images/emoji/apple/man_singer/5.png
index 4135d1d783b..a4bf0d4b4a1 100644
Binary files a/public/images/emoji/apple/man_singer/5.png and b/public/images/emoji/apple/man_singer/5.png differ
diff --git a/public/images/emoji/apple/man_singer/6.png b/public/images/emoji/apple/man_singer/6.png
index 9477f2f0db7..5e3c46b2069 100644
Binary files a/public/images/emoji/apple/man_singer/6.png and b/public/images/emoji/apple/man_singer/6.png differ
diff --git a/public/images/emoji/apple/man_student.png b/public/images/emoji/apple/man_student.png
index 6231cdce8bf..c0e973812a8 100644
Binary files a/public/images/emoji/apple/man_student.png and b/public/images/emoji/apple/man_student.png differ
diff --git a/public/images/emoji/apple/man_student/2.png b/public/images/emoji/apple/man_student/2.png
index 7749120c386..caa99d6d7b4 100644
Binary files a/public/images/emoji/apple/man_student/2.png and b/public/images/emoji/apple/man_student/2.png differ
diff --git a/public/images/emoji/apple/man_student/3.png b/public/images/emoji/apple/man_student/3.png
index 353f394418c..b2a9523cf55 100644
Binary files a/public/images/emoji/apple/man_student/3.png and b/public/images/emoji/apple/man_student/3.png differ
diff --git a/public/images/emoji/apple/man_student/4.png b/public/images/emoji/apple/man_student/4.png
index e920689633b..4d8b00f85a9 100644
Binary files a/public/images/emoji/apple/man_student/4.png and b/public/images/emoji/apple/man_student/4.png differ
diff --git a/public/images/emoji/apple/man_student/5.png b/public/images/emoji/apple/man_student/5.png
index 5586d6d5126..bd6777b6739 100644
Binary files a/public/images/emoji/apple/man_student/5.png and b/public/images/emoji/apple/man_student/5.png differ
diff --git a/public/images/emoji/apple/man_student/6.png b/public/images/emoji/apple/man_student/6.png
index f08a91b6be7..4a1b586acaa 100644
Binary files a/public/images/emoji/apple/man_student/6.png and b/public/images/emoji/apple/man_student/6.png differ
diff --git a/public/images/emoji/apple/man_teacher.png b/public/images/emoji/apple/man_teacher.png
index d858b598e3f..4f8573d3093 100644
Binary files a/public/images/emoji/apple/man_teacher.png and b/public/images/emoji/apple/man_teacher.png differ
diff --git a/public/images/emoji/apple/man_teacher/2.png b/public/images/emoji/apple/man_teacher/2.png
index 30ec2ec53f4..f386a9e7251 100644
Binary files a/public/images/emoji/apple/man_teacher/2.png and b/public/images/emoji/apple/man_teacher/2.png differ
diff --git a/public/images/emoji/apple/man_teacher/3.png b/public/images/emoji/apple/man_teacher/3.png
index de33ccd4712..d1881f9b5b1 100644
Binary files a/public/images/emoji/apple/man_teacher/3.png and b/public/images/emoji/apple/man_teacher/3.png differ
diff --git a/public/images/emoji/apple/man_teacher/4.png b/public/images/emoji/apple/man_teacher/4.png
index c7ffb9d2749..8a2db9cf6bd 100644
Binary files a/public/images/emoji/apple/man_teacher/4.png and b/public/images/emoji/apple/man_teacher/4.png differ
diff --git a/public/images/emoji/apple/man_teacher/5.png b/public/images/emoji/apple/man_teacher/5.png
index d9ade329a28..384cc8912b5 100644
Binary files a/public/images/emoji/apple/man_teacher/5.png and b/public/images/emoji/apple/man_teacher/5.png differ
diff --git a/public/images/emoji/apple/man_teacher/6.png b/public/images/emoji/apple/man_teacher/6.png
index 4f809387b09..7178ef7fe17 100644
Binary files a/public/images/emoji/apple/man_teacher/6.png and b/public/images/emoji/apple/man_teacher/6.png differ
diff --git a/public/images/emoji/apple/man_technologist.png b/public/images/emoji/apple/man_technologist.png
index b33d84dcad5..19178cd957c 100644
Binary files a/public/images/emoji/apple/man_technologist.png and b/public/images/emoji/apple/man_technologist.png differ
diff --git a/public/images/emoji/apple/man_technologist/2.png b/public/images/emoji/apple/man_technologist/2.png
index 8465d27e43a..f4f4b05f271 100644
Binary files a/public/images/emoji/apple/man_technologist/2.png and b/public/images/emoji/apple/man_technologist/2.png differ
diff --git a/public/images/emoji/apple/man_technologist/3.png b/public/images/emoji/apple/man_technologist/3.png
index 1ee89fcdab9..32c67d5f8b5 100644
Binary files a/public/images/emoji/apple/man_technologist/3.png and b/public/images/emoji/apple/man_technologist/3.png differ
diff --git a/public/images/emoji/apple/man_technologist/4.png b/public/images/emoji/apple/man_technologist/4.png
index 3efb91d3ec2..7151fb24701 100644
Binary files a/public/images/emoji/apple/man_technologist/4.png and b/public/images/emoji/apple/man_technologist/4.png differ
diff --git a/public/images/emoji/apple/man_technologist/5.png b/public/images/emoji/apple/man_technologist/5.png
index c3c4b1326cb..c0cb7bf8f4e 100644
Binary files a/public/images/emoji/apple/man_technologist/5.png and b/public/images/emoji/apple/man_technologist/5.png differ
diff --git a/public/images/emoji/apple/man_technologist/6.png b/public/images/emoji/apple/man_technologist/6.png
index 4a13c2317e7..e94bac4d154 100644
Binary files a/public/images/emoji/apple/man_technologist/6.png and b/public/images/emoji/apple/man_technologist/6.png differ
diff --git a/public/images/emoji/apple/man_with_gua_pi_mao.png b/public/images/emoji/apple/man_with_gua_pi_mao.png
index 0cd4b17a9cc..4f91cf29de3 100644
Binary files a/public/images/emoji/apple/man_with_gua_pi_mao.png and b/public/images/emoji/apple/man_with_gua_pi_mao.png differ
diff --git a/public/images/emoji/apple/man_with_gua_pi_mao/2.png b/public/images/emoji/apple/man_with_gua_pi_mao/2.png
index 893e4c62284..e2883e6ff54 100644
Binary files a/public/images/emoji/apple/man_with_gua_pi_mao/2.png and b/public/images/emoji/apple/man_with_gua_pi_mao/2.png differ
diff --git a/public/images/emoji/apple/man_with_gua_pi_mao/3.png b/public/images/emoji/apple/man_with_gua_pi_mao/3.png
index 1e39f76ff7b..0a627172fcd 100644
Binary files a/public/images/emoji/apple/man_with_gua_pi_mao/3.png and b/public/images/emoji/apple/man_with_gua_pi_mao/3.png differ
diff --git a/public/images/emoji/apple/man_with_gua_pi_mao/4.png b/public/images/emoji/apple/man_with_gua_pi_mao/4.png
index 170f9805fba..372034333a5 100644
Binary files a/public/images/emoji/apple/man_with_gua_pi_mao/4.png and b/public/images/emoji/apple/man_with_gua_pi_mao/4.png differ
diff --git a/public/images/emoji/apple/man_with_gua_pi_mao/5.png b/public/images/emoji/apple/man_with_gua_pi_mao/5.png
index ab169544bf0..ac711a5d26e 100644
Binary files a/public/images/emoji/apple/man_with_gua_pi_mao/5.png and b/public/images/emoji/apple/man_with_gua_pi_mao/5.png differ
diff --git a/public/images/emoji/apple/man_with_gua_pi_mao/6.png b/public/images/emoji/apple/man_with_gua_pi_mao/6.png
index 3a5e157eaed..c556d3a503c 100644
Binary files a/public/images/emoji/apple/man_with_gua_pi_mao/6.png and b/public/images/emoji/apple/man_with_gua_pi_mao/6.png differ
diff --git a/public/images/emoji/apple/man_with_turban.png b/public/images/emoji/apple/man_with_turban.png
index 07906a0ee26..f44de74c4d0 100644
Binary files a/public/images/emoji/apple/man_with_turban.png and b/public/images/emoji/apple/man_with_turban.png differ
diff --git a/public/images/emoji/apple/man_with_turban/2.png b/public/images/emoji/apple/man_with_turban/2.png
index ec579744b84..2179b4e702f 100644
Binary files a/public/images/emoji/apple/man_with_turban/2.png and b/public/images/emoji/apple/man_with_turban/2.png differ
diff --git a/public/images/emoji/apple/man_with_turban/3.png b/public/images/emoji/apple/man_with_turban/3.png
index 813f977ae63..4e982d4cdb5 100644
Binary files a/public/images/emoji/apple/man_with_turban/3.png and b/public/images/emoji/apple/man_with_turban/3.png differ
diff --git a/public/images/emoji/apple/man_with_turban/4.png b/public/images/emoji/apple/man_with_turban/4.png
index 53d8be863f4..cd2cf3e2119 100644
Binary files a/public/images/emoji/apple/man_with_turban/4.png and b/public/images/emoji/apple/man_with_turban/4.png differ
diff --git a/public/images/emoji/apple/man_with_turban/5.png b/public/images/emoji/apple/man_with_turban/5.png
index d09a21950c6..ee9eccde22a 100644
Binary files a/public/images/emoji/apple/man_with_turban/5.png and b/public/images/emoji/apple/man_with_turban/5.png differ
diff --git a/public/images/emoji/apple/man_with_turban/6.png b/public/images/emoji/apple/man_with_turban/6.png
index 8646fde5158..95cf085ddf2 100644
Binary files a/public/images/emoji/apple/man_with_turban/6.png and b/public/images/emoji/apple/man_with_turban/6.png differ
diff --git a/public/images/emoji/apple/mans_shoe.png b/public/images/emoji/apple/mans_shoe.png
index 99ec342c85f..86516125e41 100644
Binary files a/public/images/emoji/apple/mans_shoe.png and b/public/images/emoji/apple/mans_shoe.png differ
diff --git a/public/images/emoji/apple/mantelpiece_clock.png b/public/images/emoji/apple/mantelpiece_clock.png
index bc63b3ffb2b..b7c34e46a51 100644
Binary files a/public/images/emoji/apple/mantelpiece_clock.png and b/public/images/emoji/apple/mantelpiece_clock.png differ
diff --git a/public/images/emoji/apple/map.png b/public/images/emoji/apple/map.png
index 9cd3f7decfd..66490d07727 100644
Binary files a/public/images/emoji/apple/map.png and b/public/images/emoji/apple/map.png differ
diff --git a/public/images/emoji/apple/maple_leaf.png b/public/images/emoji/apple/maple_leaf.png
index 95be453edd5..b73f303980f 100644
Binary files a/public/images/emoji/apple/maple_leaf.png and b/public/images/emoji/apple/maple_leaf.png differ
diff --git a/public/images/emoji/apple/marshall_islands.png b/public/images/emoji/apple/marshall_islands.png
index fd5931d3039..fc99020cfe5 100644
Binary files a/public/images/emoji/apple/marshall_islands.png and b/public/images/emoji/apple/marshall_islands.png differ
diff --git a/public/images/emoji/apple/martial_arts_uniform.png b/public/images/emoji/apple/martial_arts_uniform.png
index fef9e7243dd..47008a566e5 100644
Binary files a/public/images/emoji/apple/martial_arts_uniform.png and b/public/images/emoji/apple/martial_arts_uniform.png differ
diff --git a/public/images/emoji/apple/martinique.png b/public/images/emoji/apple/martinique.png
index a0a6cfc7b67..2cdc8fed500 100644
Binary files a/public/images/emoji/apple/martinique.png and b/public/images/emoji/apple/martinique.png differ
diff --git a/public/images/emoji/apple/mask.png b/public/images/emoji/apple/mask.png
index 5100104ec4d..e5df65acd5c 100644
Binary files a/public/images/emoji/apple/mask.png and b/public/images/emoji/apple/mask.png differ
diff --git a/public/images/emoji/apple/massage.png b/public/images/emoji/apple/massage.png
index 4f7540d4d94..67730218e49 100644
Binary files a/public/images/emoji/apple/massage.png and b/public/images/emoji/apple/massage.png differ
diff --git a/public/images/emoji/apple/massage/2.png b/public/images/emoji/apple/massage/2.png
index f94c4d1120b..fbb299bf1ad 100644
Binary files a/public/images/emoji/apple/massage/2.png and b/public/images/emoji/apple/massage/2.png differ
diff --git a/public/images/emoji/apple/massage/3.png b/public/images/emoji/apple/massage/3.png
index df6b30ee779..6acd5a794e8 100644
Binary files a/public/images/emoji/apple/massage/3.png and b/public/images/emoji/apple/massage/3.png differ
diff --git a/public/images/emoji/apple/massage/4.png b/public/images/emoji/apple/massage/4.png
index 54b33592cf5..1f586fa9ba2 100644
Binary files a/public/images/emoji/apple/massage/4.png and b/public/images/emoji/apple/massage/4.png differ
diff --git a/public/images/emoji/apple/massage/5.png b/public/images/emoji/apple/massage/5.png
index 8db521b992c..39d049d87b5 100644
Binary files a/public/images/emoji/apple/massage/5.png and b/public/images/emoji/apple/massage/5.png differ
diff --git a/public/images/emoji/apple/massage/6.png b/public/images/emoji/apple/massage/6.png
index 2e34703916b..bbad028939d 100644
Binary files a/public/images/emoji/apple/massage/6.png and b/public/images/emoji/apple/massage/6.png differ
diff --git a/public/images/emoji/apple/massage_man.png b/public/images/emoji/apple/massage_man.png
index 95cc9b5a730..dd926d4acbf 100644
Binary files a/public/images/emoji/apple/massage_man.png and b/public/images/emoji/apple/massage_man.png differ
diff --git a/public/images/emoji/apple/massage_man/2.png b/public/images/emoji/apple/massage_man/2.png
index bf004f61b28..06d64ebcdc0 100644
Binary files a/public/images/emoji/apple/massage_man/2.png and b/public/images/emoji/apple/massage_man/2.png differ
diff --git a/public/images/emoji/apple/massage_man/3.png b/public/images/emoji/apple/massage_man/3.png
index 666232c3a78..3355df91e14 100644
Binary files a/public/images/emoji/apple/massage_man/3.png and b/public/images/emoji/apple/massage_man/3.png differ
diff --git a/public/images/emoji/apple/massage_man/4.png b/public/images/emoji/apple/massage_man/4.png
index a03d7b7af6b..eb5a7563506 100644
Binary files a/public/images/emoji/apple/massage_man/4.png and b/public/images/emoji/apple/massage_man/4.png differ
diff --git a/public/images/emoji/apple/massage_man/5.png b/public/images/emoji/apple/massage_man/5.png
index 8092a3dbb41..ef3207450ed 100644
Binary files a/public/images/emoji/apple/massage_man/5.png and b/public/images/emoji/apple/massage_man/5.png differ
diff --git a/public/images/emoji/apple/massage_man/6.png b/public/images/emoji/apple/massage_man/6.png
index 3913f8834a3..389ae65441f 100644
Binary files a/public/images/emoji/apple/massage_man/6.png and b/public/images/emoji/apple/massage_man/6.png differ
diff --git a/public/images/emoji/apple/massage_woman.png b/public/images/emoji/apple/massage_woman.png
index 4f7540d4d94..67730218e49 100644
Binary files a/public/images/emoji/apple/massage_woman.png and b/public/images/emoji/apple/massage_woman.png differ
diff --git a/public/images/emoji/apple/massage_woman/2.png b/public/images/emoji/apple/massage_woman/2.png
index f94c4d1120b..fbb299bf1ad 100644
Binary files a/public/images/emoji/apple/massage_woman/2.png and b/public/images/emoji/apple/massage_woman/2.png differ
diff --git a/public/images/emoji/apple/massage_woman/3.png b/public/images/emoji/apple/massage_woman/3.png
index df6b30ee779..6acd5a794e8 100644
Binary files a/public/images/emoji/apple/massage_woman/3.png and b/public/images/emoji/apple/massage_woman/3.png differ
diff --git a/public/images/emoji/apple/massage_woman/4.png b/public/images/emoji/apple/massage_woman/4.png
index 54b33592cf5..1f586fa9ba2 100644
Binary files a/public/images/emoji/apple/massage_woman/4.png and b/public/images/emoji/apple/massage_woman/4.png differ
diff --git a/public/images/emoji/apple/massage_woman/5.png b/public/images/emoji/apple/massage_woman/5.png
index 8db521b992c..39d049d87b5 100644
Binary files a/public/images/emoji/apple/massage_woman/5.png and b/public/images/emoji/apple/massage_woman/5.png differ
diff --git a/public/images/emoji/apple/massage_woman/6.png b/public/images/emoji/apple/massage_woman/6.png
index 2e34703916b..bbad028939d 100644
Binary files a/public/images/emoji/apple/massage_woman/6.png and b/public/images/emoji/apple/massage_woman/6.png differ
diff --git a/public/images/emoji/apple/mauritania.png b/public/images/emoji/apple/mauritania.png
index e65b5af0e9f..0d0a7500cec 100644
Binary files a/public/images/emoji/apple/mauritania.png and b/public/images/emoji/apple/mauritania.png differ
diff --git a/public/images/emoji/apple/mauritius.png b/public/images/emoji/apple/mauritius.png
index 75cc6eebad2..d218a455d32 100644
Binary files a/public/images/emoji/apple/mauritius.png and b/public/images/emoji/apple/mauritius.png differ
diff --git a/public/images/emoji/apple/mayotte.png b/public/images/emoji/apple/mayotte.png
index cf20209f5ed..5ac48b56528 100644
Binary files a/public/images/emoji/apple/mayotte.png and b/public/images/emoji/apple/mayotte.png differ
diff --git a/public/images/emoji/apple/meat_on_bone.png b/public/images/emoji/apple/meat_on_bone.png
index 8de6f79bd82..6c3473eaead 100644
Binary files a/public/images/emoji/apple/meat_on_bone.png and b/public/images/emoji/apple/meat_on_bone.png differ
diff --git a/public/images/emoji/apple/medal.png b/public/images/emoji/apple/medal.png
index 6e66f143863..320a405e1a8 100644
Binary files a/public/images/emoji/apple/medal.png and b/public/images/emoji/apple/medal.png differ
diff --git a/public/images/emoji/apple/medal_military.png b/public/images/emoji/apple/medal_military.png
index 1e4a132d37b..8d5c099fdca 100644
Binary files a/public/images/emoji/apple/medal_military.png and b/public/images/emoji/apple/medal_military.png differ
diff --git a/public/images/emoji/apple/medal_sports.png b/public/images/emoji/apple/medal_sports.png
index 6e66f143863..320a405e1a8 100644
Binary files a/public/images/emoji/apple/medal_sports.png and b/public/images/emoji/apple/medal_sports.png differ
diff --git a/public/images/emoji/apple/mega.png b/public/images/emoji/apple/mega.png
index 8b3ee6c2622..998092eaded 100644
Binary files a/public/images/emoji/apple/mega.png and b/public/images/emoji/apple/mega.png differ
diff --git a/public/images/emoji/apple/melon.png b/public/images/emoji/apple/melon.png
index 5006362d761..c1b1217410f 100644
Binary files a/public/images/emoji/apple/melon.png and b/public/images/emoji/apple/melon.png differ
diff --git a/public/images/emoji/apple/memo.png b/public/images/emoji/apple/memo.png
index b738536bdcd..84fef4d0ca7 100644
Binary files a/public/images/emoji/apple/memo.png and b/public/images/emoji/apple/memo.png differ
diff --git a/public/images/emoji/apple/men_wrestling.png b/public/images/emoji/apple/men_wrestling.png
index 178fd73c861..a05e9516f0f 100644
Binary files a/public/images/emoji/apple/men_wrestling.png and b/public/images/emoji/apple/men_wrestling.png differ
diff --git a/public/images/emoji/apple/menorah.png b/public/images/emoji/apple/menorah.png
index d6f382d0166..c861bb134e5 100644
Binary files a/public/images/emoji/apple/menorah.png and b/public/images/emoji/apple/menorah.png differ
diff --git a/public/images/emoji/apple/mens.png b/public/images/emoji/apple/mens.png
index 1fb3f77aefe..15bdc363878 100644
Binary files a/public/images/emoji/apple/mens.png and b/public/images/emoji/apple/mens.png differ
diff --git a/public/images/emoji/apple/mermaid.png b/public/images/emoji/apple/mermaid.png
new file mode 100644
index 00000000000..1098bea3a35
Binary files /dev/null and b/public/images/emoji/apple/mermaid.png differ
diff --git a/public/images/emoji/apple/mermaid/2.png b/public/images/emoji/apple/mermaid/2.png
new file mode 100644
index 00000000000..53d6055e1e6
Binary files /dev/null and b/public/images/emoji/apple/mermaid/2.png differ
diff --git a/public/images/emoji/apple/mermaid/3.png b/public/images/emoji/apple/mermaid/3.png
new file mode 100644
index 00000000000..1a8566d4024
Binary files /dev/null and b/public/images/emoji/apple/mermaid/3.png differ
diff --git a/public/images/emoji/apple/mermaid/4.png b/public/images/emoji/apple/mermaid/4.png
new file mode 100644
index 00000000000..e820dc9e87f
Binary files /dev/null and b/public/images/emoji/apple/mermaid/4.png differ
diff --git a/public/images/emoji/apple/mermaid/5.png b/public/images/emoji/apple/mermaid/5.png
new file mode 100644
index 00000000000..68e2b852071
Binary files /dev/null and b/public/images/emoji/apple/mermaid/5.png differ
diff --git a/public/images/emoji/apple/mermaid/6.png b/public/images/emoji/apple/mermaid/6.png
new file mode 100644
index 00000000000..206a0d0d54c
Binary files /dev/null and b/public/images/emoji/apple/mermaid/6.png differ
diff --git a/public/images/emoji/apple/merman.png b/public/images/emoji/apple/merman.png
new file mode 100644
index 00000000000..1098bea3a35
Binary files /dev/null and b/public/images/emoji/apple/merman.png differ
diff --git a/public/images/emoji/apple/merman/2.png b/public/images/emoji/apple/merman/2.png
new file mode 100644
index 00000000000..53d6055e1e6
Binary files /dev/null and b/public/images/emoji/apple/merman/2.png differ
diff --git a/public/images/emoji/apple/merman/3.png b/public/images/emoji/apple/merman/3.png
new file mode 100644
index 00000000000..1a8566d4024
Binary files /dev/null and b/public/images/emoji/apple/merman/3.png differ
diff --git a/public/images/emoji/apple/merman/4.png b/public/images/emoji/apple/merman/4.png
new file mode 100644
index 00000000000..e820dc9e87f
Binary files /dev/null and b/public/images/emoji/apple/merman/4.png differ
diff --git a/public/images/emoji/apple/merman/5.png b/public/images/emoji/apple/merman/5.png
new file mode 100644
index 00000000000..68e2b852071
Binary files /dev/null and b/public/images/emoji/apple/merman/5.png differ
diff --git a/public/images/emoji/apple/merman/6.png b/public/images/emoji/apple/merman/6.png
new file mode 100644
index 00000000000..206a0d0d54c
Binary files /dev/null and b/public/images/emoji/apple/merman/6.png differ
diff --git a/public/images/emoji/apple/merperson.png b/public/images/emoji/apple/merperson.png
index ee1b999e0dd..8e1b4b27940 100644
Binary files a/public/images/emoji/apple/merperson.png and b/public/images/emoji/apple/merperson.png differ
diff --git a/public/images/emoji/apple/merperson/2.png b/public/images/emoji/apple/merperson/2.png
index b97fbf42e35..c14e9814ba3 100644
Binary files a/public/images/emoji/apple/merperson/2.png and b/public/images/emoji/apple/merperson/2.png differ
diff --git a/public/images/emoji/apple/merperson/3.png b/public/images/emoji/apple/merperson/3.png
index 9079f60b81e..e4f2c5975b5 100644
Binary files a/public/images/emoji/apple/merperson/3.png and b/public/images/emoji/apple/merperson/3.png differ
diff --git a/public/images/emoji/apple/merperson/4.png b/public/images/emoji/apple/merperson/4.png
index decc0b58929..9f03f01d4fb 100644
Binary files a/public/images/emoji/apple/merperson/4.png and b/public/images/emoji/apple/merperson/4.png differ
diff --git a/public/images/emoji/apple/merperson/5.png b/public/images/emoji/apple/merperson/5.png
index e3e3e89cb16..d5ae2dd59ce 100644
Binary files a/public/images/emoji/apple/merperson/5.png and b/public/images/emoji/apple/merperson/5.png differ
diff --git a/public/images/emoji/apple/merperson/6.png b/public/images/emoji/apple/merperson/6.png
index 5a5f36684e5..d20964e4e8f 100644
Binary files a/public/images/emoji/apple/merperson/6.png and b/public/images/emoji/apple/merperson/6.png differ
diff --git a/public/images/emoji/apple/metal.png b/public/images/emoji/apple/metal.png
index 7518952e874..61467928ab4 100644
Binary files a/public/images/emoji/apple/metal.png and b/public/images/emoji/apple/metal.png differ
diff --git a/public/images/emoji/apple/metal/2.png b/public/images/emoji/apple/metal/2.png
index 46006766aef..0cd47f206a2 100644
Binary files a/public/images/emoji/apple/metal/2.png and b/public/images/emoji/apple/metal/2.png differ
diff --git a/public/images/emoji/apple/metal/3.png b/public/images/emoji/apple/metal/3.png
index 85aa93e844f..e29358a848b 100644
Binary files a/public/images/emoji/apple/metal/3.png and b/public/images/emoji/apple/metal/3.png differ
diff --git a/public/images/emoji/apple/metal/4.png b/public/images/emoji/apple/metal/4.png
index ff673252139..ed0771d638c 100644
Binary files a/public/images/emoji/apple/metal/4.png and b/public/images/emoji/apple/metal/4.png differ
diff --git a/public/images/emoji/apple/metal/5.png b/public/images/emoji/apple/metal/5.png
index 8f48f33a83c..349bbcea511 100644
Binary files a/public/images/emoji/apple/metal/5.png and b/public/images/emoji/apple/metal/5.png differ
diff --git a/public/images/emoji/apple/metal/6.png b/public/images/emoji/apple/metal/6.png
index beec4708b86..0d44071cdb8 100644
Binary files a/public/images/emoji/apple/metal/6.png and b/public/images/emoji/apple/metal/6.png differ
diff --git a/public/images/emoji/apple/metro.png b/public/images/emoji/apple/metro.png
index 885ed77882f..c5f12d6a30e 100644
Binary files a/public/images/emoji/apple/metro.png and b/public/images/emoji/apple/metro.png differ
diff --git a/public/images/emoji/apple/mexico.png b/public/images/emoji/apple/mexico.png
index 6debb7f70d2..e049ef23e8a 100644
Binary files a/public/images/emoji/apple/mexico.png and b/public/images/emoji/apple/mexico.png differ
diff --git a/public/images/emoji/apple/micronesia.png b/public/images/emoji/apple/micronesia.png
index 7d6874acffb..9c426d0c656 100644
Binary files a/public/images/emoji/apple/micronesia.png and b/public/images/emoji/apple/micronesia.png differ
diff --git a/public/images/emoji/apple/microphone.png b/public/images/emoji/apple/microphone.png
index 22b067d365a..87bd8b321b1 100644
Binary files a/public/images/emoji/apple/microphone.png and b/public/images/emoji/apple/microphone.png differ
diff --git a/public/images/emoji/apple/microphone2.png b/public/images/emoji/apple/microphone2.png
index 6f6e1dc3c9a..21f1c67b9ab 100644
Binary files a/public/images/emoji/apple/microphone2.png and b/public/images/emoji/apple/microphone2.png differ
diff --git a/public/images/emoji/apple/microscope.png b/public/images/emoji/apple/microscope.png
index 12f6aa3de18..d0a12f52060 100644
Binary files a/public/images/emoji/apple/microscope.png and b/public/images/emoji/apple/microscope.png differ
diff --git a/public/images/emoji/apple/middle_finger.png b/public/images/emoji/apple/middle_finger.png
index e869cf97d15..a91fda90134 100644
Binary files a/public/images/emoji/apple/middle_finger.png and b/public/images/emoji/apple/middle_finger.png differ
diff --git a/public/images/emoji/apple/middle_finger/2.png b/public/images/emoji/apple/middle_finger/2.png
index ce95c6a8be5..3783ddff95e 100644
Binary files a/public/images/emoji/apple/middle_finger/2.png and b/public/images/emoji/apple/middle_finger/2.png differ
diff --git a/public/images/emoji/apple/middle_finger/3.png b/public/images/emoji/apple/middle_finger/3.png
index 33eec03fd41..1c4a962d013 100644
Binary files a/public/images/emoji/apple/middle_finger/3.png and b/public/images/emoji/apple/middle_finger/3.png differ
diff --git a/public/images/emoji/apple/middle_finger/4.png b/public/images/emoji/apple/middle_finger/4.png
index 10487652927..605d4bc231a 100644
Binary files a/public/images/emoji/apple/middle_finger/4.png and b/public/images/emoji/apple/middle_finger/4.png differ
diff --git a/public/images/emoji/apple/middle_finger/5.png b/public/images/emoji/apple/middle_finger/5.png
index 6f577d03de8..28af6e0dc16 100644
Binary files a/public/images/emoji/apple/middle_finger/5.png and b/public/images/emoji/apple/middle_finger/5.png differ
diff --git a/public/images/emoji/apple/middle_finger/6.png b/public/images/emoji/apple/middle_finger/6.png
index 58349f45b1f..fcb6c5c5a6e 100644
Binary files a/public/images/emoji/apple/middle_finger/6.png and b/public/images/emoji/apple/middle_finger/6.png differ
diff --git a/public/images/emoji/apple/military_medal.png b/public/images/emoji/apple/military_medal.png
index 1e4a132d37b..8d5c099fdca 100644
Binary files a/public/images/emoji/apple/military_medal.png and b/public/images/emoji/apple/military_medal.png differ
diff --git a/public/images/emoji/apple/milk_glass.png b/public/images/emoji/apple/milk_glass.png
index 29991a49a7f..02e861b7a07 100644
Binary files a/public/images/emoji/apple/milk_glass.png and b/public/images/emoji/apple/milk_glass.png differ
diff --git a/public/images/emoji/apple/milky_way.png b/public/images/emoji/apple/milky_way.png
index ecf711eb367..0ad7b7c3cef 100644
Binary files a/public/images/emoji/apple/milky_way.png and b/public/images/emoji/apple/milky_way.png differ
diff --git a/public/images/emoji/apple/minibus.png b/public/images/emoji/apple/minibus.png
index f0cabe3c80c..2c1b81b1ea3 100644
Binary files a/public/images/emoji/apple/minibus.png and b/public/images/emoji/apple/minibus.png differ
diff --git a/public/images/emoji/apple/minidisc.png b/public/images/emoji/apple/minidisc.png
index b65d83439a2..f491e6ca0cd 100644
Binary files a/public/images/emoji/apple/minidisc.png and b/public/images/emoji/apple/minidisc.png differ
diff --git a/public/images/emoji/apple/mobile_phone_off.png b/public/images/emoji/apple/mobile_phone_off.png
index 7df7f6001f0..fc4f0090291 100644
Binary files a/public/images/emoji/apple/mobile_phone_off.png and b/public/images/emoji/apple/mobile_phone_off.png differ
diff --git a/public/images/emoji/apple/moldova.png b/public/images/emoji/apple/moldova.png
index caec098bd8b..38a5f59284e 100644
Binary files a/public/images/emoji/apple/moldova.png and b/public/images/emoji/apple/moldova.png differ
diff --git a/public/images/emoji/apple/monaco.png b/public/images/emoji/apple/monaco.png
index 2ec6ee610e1..2d9b7722109 100644
Binary files a/public/images/emoji/apple/monaco.png and b/public/images/emoji/apple/monaco.png differ
diff --git a/public/images/emoji/apple/money_mouth.png b/public/images/emoji/apple/money_mouth.png
index 3be4b911d44..2fd821c4c31 100644
Binary files a/public/images/emoji/apple/money_mouth.png and b/public/images/emoji/apple/money_mouth.png differ
diff --git a/public/images/emoji/apple/money_mouth_face.png b/public/images/emoji/apple/money_mouth_face.png
index 3be4b911d44..2fd821c4c31 100644
Binary files a/public/images/emoji/apple/money_mouth_face.png and b/public/images/emoji/apple/money_mouth_face.png differ
diff --git a/public/images/emoji/apple/money_with_wings.png b/public/images/emoji/apple/money_with_wings.png
index 44cabf40de0..eb32fe92c6b 100644
Binary files a/public/images/emoji/apple/money_with_wings.png and b/public/images/emoji/apple/money_with_wings.png differ
diff --git a/public/images/emoji/apple/moneybag.png b/public/images/emoji/apple/moneybag.png
index 481d7239a12..4913511064a 100644
Binary files a/public/images/emoji/apple/moneybag.png and b/public/images/emoji/apple/moneybag.png differ
diff --git a/public/images/emoji/apple/mongolia.png b/public/images/emoji/apple/mongolia.png
index 82021a2dca6..10479cbe559 100644
Binary files a/public/images/emoji/apple/mongolia.png and b/public/images/emoji/apple/mongolia.png differ
diff --git a/public/images/emoji/apple/monkey.png b/public/images/emoji/apple/monkey.png
index 3d08e6ee9cf..7a58808eb06 100644
Binary files a/public/images/emoji/apple/monkey.png and b/public/images/emoji/apple/monkey.png differ
diff --git a/public/images/emoji/apple/monkey_face.png b/public/images/emoji/apple/monkey_face.png
index 913047f7946..f727eda71db 100644
Binary files a/public/images/emoji/apple/monkey_face.png and b/public/images/emoji/apple/monkey_face.png differ
diff --git a/public/images/emoji/apple/monorail.png b/public/images/emoji/apple/monorail.png
index d62e6009333..f9ac3235ac9 100644
Binary files a/public/images/emoji/apple/monorail.png and b/public/images/emoji/apple/monorail.png differ
diff --git a/public/images/emoji/apple/montenegro.png b/public/images/emoji/apple/montenegro.png
index 0aa72733ac2..03a53090a11 100644
Binary files a/public/images/emoji/apple/montenegro.png and b/public/images/emoji/apple/montenegro.png differ
diff --git a/public/images/emoji/apple/montserrat.png b/public/images/emoji/apple/montserrat.png
index 6d3074592ab..e293fcd4bb6 100644
Binary files a/public/images/emoji/apple/montserrat.png and b/public/images/emoji/apple/montserrat.png differ
diff --git a/public/images/emoji/apple/moon.png b/public/images/emoji/apple/moon.png
index 482946e48d6..19d8192c356 100644
Binary files a/public/images/emoji/apple/moon.png and b/public/images/emoji/apple/moon.png differ
diff --git a/public/images/emoji/apple/morocco.png b/public/images/emoji/apple/morocco.png
index 061d597cd6e..5b62475168b 100644
Binary files a/public/images/emoji/apple/morocco.png and b/public/images/emoji/apple/morocco.png differ
diff --git a/public/images/emoji/apple/mortar_board.png b/public/images/emoji/apple/mortar_board.png
index b75b4c2d954..577566fc656 100644
Binary files a/public/images/emoji/apple/mortar_board.png and b/public/images/emoji/apple/mortar_board.png differ
diff --git a/public/images/emoji/apple/mosque.png b/public/images/emoji/apple/mosque.png
index a6888cdada5..c2227798702 100644
Binary files a/public/images/emoji/apple/mosque.png and b/public/images/emoji/apple/mosque.png differ
diff --git a/public/images/emoji/apple/motor_boat.png b/public/images/emoji/apple/motor_boat.png
index 1fe5602cc5f..2560fe0ef3b 100644
Binary files a/public/images/emoji/apple/motor_boat.png and b/public/images/emoji/apple/motor_boat.png differ
diff --git a/public/images/emoji/apple/motor_scooter.png b/public/images/emoji/apple/motor_scooter.png
index 6f384bbc50b..892a70b8ae8 100644
Binary files a/public/images/emoji/apple/motor_scooter.png and b/public/images/emoji/apple/motor_scooter.png differ
diff --git a/public/images/emoji/apple/motorboat.png b/public/images/emoji/apple/motorboat.png
index 1fe5602cc5f..2560fe0ef3b 100644
Binary files a/public/images/emoji/apple/motorboat.png and b/public/images/emoji/apple/motorboat.png differ
diff --git a/public/images/emoji/apple/motorcycle.png b/public/images/emoji/apple/motorcycle.png
index 4ae8f0c685c..6264237cc36 100644
Binary files a/public/images/emoji/apple/motorcycle.png and b/public/images/emoji/apple/motorcycle.png differ
diff --git a/public/images/emoji/apple/motorway.png b/public/images/emoji/apple/motorway.png
index 2f5cf97feb5..c35fabdf0b0 100644
Binary files a/public/images/emoji/apple/motorway.png and b/public/images/emoji/apple/motorway.png differ
diff --git a/public/images/emoji/apple/mount_fuji.png b/public/images/emoji/apple/mount_fuji.png
index 61beec0664a..cce5ccd2a5d 100644
Binary files a/public/images/emoji/apple/mount_fuji.png and b/public/images/emoji/apple/mount_fuji.png differ
diff --git a/public/images/emoji/apple/mountain.png b/public/images/emoji/apple/mountain.png
index 5b85ecfeb67..703c18a44b6 100644
Binary files a/public/images/emoji/apple/mountain.png and b/public/images/emoji/apple/mountain.png differ
diff --git a/public/images/emoji/apple/mountain_bicyclist.png b/public/images/emoji/apple/mountain_bicyclist.png
index 456f84a0b43..428726ec53c 100644
Binary files a/public/images/emoji/apple/mountain_bicyclist.png and b/public/images/emoji/apple/mountain_bicyclist.png differ
diff --git a/public/images/emoji/apple/mountain_bicyclist/2.png b/public/images/emoji/apple/mountain_bicyclist/2.png
index 8bc94cbd8f2..09b9ee403af 100644
Binary files a/public/images/emoji/apple/mountain_bicyclist/2.png and b/public/images/emoji/apple/mountain_bicyclist/2.png differ
diff --git a/public/images/emoji/apple/mountain_bicyclist/3.png b/public/images/emoji/apple/mountain_bicyclist/3.png
index 0d4f1dbea36..fcc6bc58cad 100644
Binary files a/public/images/emoji/apple/mountain_bicyclist/3.png and b/public/images/emoji/apple/mountain_bicyclist/3.png differ
diff --git a/public/images/emoji/apple/mountain_bicyclist/4.png b/public/images/emoji/apple/mountain_bicyclist/4.png
index dbf96f05c58..0252374f479 100644
Binary files a/public/images/emoji/apple/mountain_bicyclist/4.png and b/public/images/emoji/apple/mountain_bicyclist/4.png differ
diff --git a/public/images/emoji/apple/mountain_bicyclist/5.png b/public/images/emoji/apple/mountain_bicyclist/5.png
index 23d9f6755cf..438dfd74568 100644
Binary files a/public/images/emoji/apple/mountain_bicyclist/5.png and b/public/images/emoji/apple/mountain_bicyclist/5.png differ
diff --git a/public/images/emoji/apple/mountain_bicyclist/6.png b/public/images/emoji/apple/mountain_bicyclist/6.png
index aa1562b9622..3a321838fab 100644
Binary files a/public/images/emoji/apple/mountain_bicyclist/6.png and b/public/images/emoji/apple/mountain_bicyclist/6.png differ
diff --git a/public/images/emoji/apple/mountain_biking_man.png b/public/images/emoji/apple/mountain_biking_man.png
index 456f84a0b43..428726ec53c 100644
Binary files a/public/images/emoji/apple/mountain_biking_man.png and b/public/images/emoji/apple/mountain_biking_man.png differ
diff --git a/public/images/emoji/apple/mountain_biking_man/2.png b/public/images/emoji/apple/mountain_biking_man/2.png
index 8bc94cbd8f2..09b9ee403af 100644
Binary files a/public/images/emoji/apple/mountain_biking_man/2.png and b/public/images/emoji/apple/mountain_biking_man/2.png differ
diff --git a/public/images/emoji/apple/mountain_biking_man/3.png b/public/images/emoji/apple/mountain_biking_man/3.png
index 0d4f1dbea36..fcc6bc58cad 100644
Binary files a/public/images/emoji/apple/mountain_biking_man/3.png and b/public/images/emoji/apple/mountain_biking_man/3.png differ
diff --git a/public/images/emoji/apple/mountain_biking_man/4.png b/public/images/emoji/apple/mountain_biking_man/4.png
index dbf96f05c58..0252374f479 100644
Binary files a/public/images/emoji/apple/mountain_biking_man/4.png and b/public/images/emoji/apple/mountain_biking_man/4.png differ
diff --git a/public/images/emoji/apple/mountain_biking_man/5.png b/public/images/emoji/apple/mountain_biking_man/5.png
index 23d9f6755cf..438dfd74568 100644
Binary files a/public/images/emoji/apple/mountain_biking_man/5.png and b/public/images/emoji/apple/mountain_biking_man/5.png differ
diff --git a/public/images/emoji/apple/mountain_biking_man/6.png b/public/images/emoji/apple/mountain_biking_man/6.png
index aa1562b9622..3a321838fab 100644
Binary files a/public/images/emoji/apple/mountain_biking_man/6.png and b/public/images/emoji/apple/mountain_biking_man/6.png differ
diff --git a/public/images/emoji/apple/mountain_biking_woman.png b/public/images/emoji/apple/mountain_biking_woman.png
index b7dca39da48..5995a7180a7 100644
Binary files a/public/images/emoji/apple/mountain_biking_woman.png and b/public/images/emoji/apple/mountain_biking_woman.png differ
diff --git a/public/images/emoji/apple/mountain_biking_woman/2.png b/public/images/emoji/apple/mountain_biking_woman/2.png
index 4af0a880462..a926c9ae2b1 100644
Binary files a/public/images/emoji/apple/mountain_biking_woman/2.png and b/public/images/emoji/apple/mountain_biking_woman/2.png differ
diff --git a/public/images/emoji/apple/mountain_biking_woman/3.png b/public/images/emoji/apple/mountain_biking_woman/3.png
index b2fc069d4f3..fde8681729e 100644
Binary files a/public/images/emoji/apple/mountain_biking_woman/3.png and b/public/images/emoji/apple/mountain_biking_woman/3.png differ
diff --git a/public/images/emoji/apple/mountain_biking_woman/4.png b/public/images/emoji/apple/mountain_biking_woman/4.png
index 9e6d50755af..5282a0eade2 100644
Binary files a/public/images/emoji/apple/mountain_biking_woman/4.png and b/public/images/emoji/apple/mountain_biking_woman/4.png differ
diff --git a/public/images/emoji/apple/mountain_biking_woman/5.png b/public/images/emoji/apple/mountain_biking_woman/5.png
index 647dbae6118..3745d167dc4 100644
Binary files a/public/images/emoji/apple/mountain_biking_woman/5.png and b/public/images/emoji/apple/mountain_biking_woman/5.png differ
diff --git a/public/images/emoji/apple/mountain_biking_woman/6.png b/public/images/emoji/apple/mountain_biking_woman/6.png
index 6f60da7a843..8a474090cea 100644
Binary files a/public/images/emoji/apple/mountain_biking_woman/6.png and b/public/images/emoji/apple/mountain_biking_woman/6.png differ
diff --git a/public/images/emoji/apple/mountain_cableway.png b/public/images/emoji/apple/mountain_cableway.png
index 82ac6f30e25..62215883be6 100644
Binary files a/public/images/emoji/apple/mountain_cableway.png and b/public/images/emoji/apple/mountain_cableway.png differ
diff --git a/public/images/emoji/apple/mountain_railway.png b/public/images/emoji/apple/mountain_railway.png
index 98b481d1410..ecdc52d02f6 100644
Binary files a/public/images/emoji/apple/mountain_railway.png and b/public/images/emoji/apple/mountain_railway.png differ
diff --git a/public/images/emoji/apple/mountain_snow.png b/public/images/emoji/apple/mountain_snow.png
index 0be1ad5feea..5ed2d7362d0 100644
Binary files a/public/images/emoji/apple/mountain_snow.png and b/public/images/emoji/apple/mountain_snow.png differ
diff --git a/public/images/emoji/apple/mouse.png b/public/images/emoji/apple/mouse.png
index 7807bd36f15..1a0b8f8f3fd 100644
Binary files a/public/images/emoji/apple/mouse.png and b/public/images/emoji/apple/mouse.png differ
diff --git a/public/images/emoji/apple/mouse2.png b/public/images/emoji/apple/mouse2.png
index bf321dee2e2..cb4adb4a67b 100644
Binary files a/public/images/emoji/apple/mouse2.png and b/public/images/emoji/apple/mouse2.png differ
diff --git a/public/images/emoji/apple/mouse_three_button.png b/public/images/emoji/apple/mouse_three_button.png
index 3899171edc6..6fbde4a9567 100644
Binary files a/public/images/emoji/apple/mouse_three_button.png and b/public/images/emoji/apple/mouse_three_button.png differ
diff --git a/public/images/emoji/apple/movie_camera.png b/public/images/emoji/apple/movie_camera.png
index 56bd4903595..842d9d4e60a 100644
Binary files a/public/images/emoji/apple/movie_camera.png and b/public/images/emoji/apple/movie_camera.png differ
diff --git a/public/images/emoji/apple/moyai.png b/public/images/emoji/apple/moyai.png
index 7964d5a3565..57c5b971d52 100644
Binary files a/public/images/emoji/apple/moyai.png and b/public/images/emoji/apple/moyai.png differ
diff --git a/public/images/emoji/apple/mozambique.png b/public/images/emoji/apple/mozambique.png
index 7648e580910..bd7fd918875 100644
Binary files a/public/images/emoji/apple/mozambique.png and b/public/images/emoji/apple/mozambique.png differ
diff --git a/public/images/emoji/apple/mrs_claus.png b/public/images/emoji/apple/mrs_claus.png
index 3b97123426a..4c70998fcb2 100644
Binary files a/public/images/emoji/apple/mrs_claus.png and b/public/images/emoji/apple/mrs_claus.png differ
diff --git a/public/images/emoji/apple/mrs_claus/2.png b/public/images/emoji/apple/mrs_claus/2.png
index 759284bbd41..807977ad7b6 100644
Binary files a/public/images/emoji/apple/mrs_claus/2.png and b/public/images/emoji/apple/mrs_claus/2.png differ
diff --git a/public/images/emoji/apple/mrs_claus/3.png b/public/images/emoji/apple/mrs_claus/3.png
index 1b12a39f4ee..e98976c775b 100644
Binary files a/public/images/emoji/apple/mrs_claus/3.png and b/public/images/emoji/apple/mrs_claus/3.png differ
diff --git a/public/images/emoji/apple/mrs_claus/4.png b/public/images/emoji/apple/mrs_claus/4.png
index 3d1504ec6a9..31449a21b6e 100644
Binary files a/public/images/emoji/apple/mrs_claus/4.png and b/public/images/emoji/apple/mrs_claus/4.png differ
diff --git a/public/images/emoji/apple/mrs_claus/5.png b/public/images/emoji/apple/mrs_claus/5.png
index f770e3863eb..b9e2724e7e8 100644
Binary files a/public/images/emoji/apple/mrs_claus/5.png and b/public/images/emoji/apple/mrs_claus/5.png differ
diff --git a/public/images/emoji/apple/mrs_claus/6.png b/public/images/emoji/apple/mrs_claus/6.png
index 2df5811c706..707d98d35a1 100644
Binary files a/public/images/emoji/apple/mrs_claus/6.png and b/public/images/emoji/apple/mrs_claus/6.png differ
diff --git a/public/images/emoji/apple/muscle.png b/public/images/emoji/apple/muscle.png
index 8349486e1c4..62e89583797 100644
Binary files a/public/images/emoji/apple/muscle.png and b/public/images/emoji/apple/muscle.png differ
diff --git a/public/images/emoji/apple/muscle/2.png b/public/images/emoji/apple/muscle/2.png
index 190d6928604..e7d9a1ca585 100644
Binary files a/public/images/emoji/apple/muscle/2.png and b/public/images/emoji/apple/muscle/2.png differ
diff --git a/public/images/emoji/apple/muscle/3.png b/public/images/emoji/apple/muscle/3.png
index e706e319e64..554ec41026c 100644
Binary files a/public/images/emoji/apple/muscle/3.png and b/public/images/emoji/apple/muscle/3.png differ
diff --git a/public/images/emoji/apple/muscle/4.png b/public/images/emoji/apple/muscle/4.png
index d2b75ec1991..d8ec04d55f4 100644
Binary files a/public/images/emoji/apple/muscle/4.png and b/public/images/emoji/apple/muscle/4.png differ
diff --git a/public/images/emoji/apple/muscle/5.png b/public/images/emoji/apple/muscle/5.png
index ca8614dafdd..da41beb5be8 100644
Binary files a/public/images/emoji/apple/muscle/5.png and b/public/images/emoji/apple/muscle/5.png differ
diff --git a/public/images/emoji/apple/muscle/6.png b/public/images/emoji/apple/muscle/6.png
index 156c4dbb0cb..ac6af3bf2eb 100644
Binary files a/public/images/emoji/apple/muscle/6.png and b/public/images/emoji/apple/muscle/6.png differ
diff --git a/public/images/emoji/apple/mushroom.png b/public/images/emoji/apple/mushroom.png
index 3b3c88bbb29..500a1b74121 100644
Binary files a/public/images/emoji/apple/mushroom.png and b/public/images/emoji/apple/mushroom.png differ
diff --git a/public/images/emoji/apple/musical_keyboard.png b/public/images/emoji/apple/musical_keyboard.png
index b9fcadf652b..05c40e1ecc2 100644
Binary files a/public/images/emoji/apple/musical_keyboard.png and b/public/images/emoji/apple/musical_keyboard.png differ
diff --git a/public/images/emoji/apple/musical_note.png b/public/images/emoji/apple/musical_note.png
index c5ea389e5eb..9249006b8ac 100644
Binary files a/public/images/emoji/apple/musical_note.png and b/public/images/emoji/apple/musical_note.png differ
diff --git a/public/images/emoji/apple/musical_score.png b/public/images/emoji/apple/musical_score.png
index dd9eec6b83e..59388825aa9 100644
Binary files a/public/images/emoji/apple/musical_score.png and b/public/images/emoji/apple/musical_score.png differ
diff --git a/public/images/emoji/apple/mute.png b/public/images/emoji/apple/mute.png
index 05ae12c7a84..c8055cd899d 100644
Binary files a/public/images/emoji/apple/mute.png and b/public/images/emoji/apple/mute.png differ
diff --git a/public/images/emoji/apple/myanmar.png b/public/images/emoji/apple/myanmar.png
index 147b7b0e4e0..7f923e73555 100644
Binary files a/public/images/emoji/apple/myanmar.png and b/public/images/emoji/apple/myanmar.png differ
diff --git a/public/images/emoji/apple/nail_care.png b/public/images/emoji/apple/nail_care.png
index 256a7c96893..a8f8bb5e89a 100644
Binary files a/public/images/emoji/apple/nail_care.png and b/public/images/emoji/apple/nail_care.png differ
diff --git a/public/images/emoji/apple/nail_care/2.png b/public/images/emoji/apple/nail_care/2.png
index 509d805eb83..b4c71622e09 100644
Binary files a/public/images/emoji/apple/nail_care/2.png and b/public/images/emoji/apple/nail_care/2.png differ
diff --git a/public/images/emoji/apple/nail_care/3.png b/public/images/emoji/apple/nail_care/3.png
index 42285ce1325..10b1c25f8a6 100644
Binary files a/public/images/emoji/apple/nail_care/3.png and b/public/images/emoji/apple/nail_care/3.png differ
diff --git a/public/images/emoji/apple/nail_care/4.png b/public/images/emoji/apple/nail_care/4.png
index c0d5cce984b..53aad06cc06 100644
Binary files a/public/images/emoji/apple/nail_care/4.png and b/public/images/emoji/apple/nail_care/4.png differ
diff --git a/public/images/emoji/apple/nail_care/5.png b/public/images/emoji/apple/nail_care/5.png
index 9bd1a2437e4..b1f4147f04e 100644
Binary files a/public/images/emoji/apple/nail_care/5.png and b/public/images/emoji/apple/nail_care/5.png differ
diff --git a/public/images/emoji/apple/nail_care/6.png b/public/images/emoji/apple/nail_care/6.png
index f7d3b381279..0a64befa0ad 100644
Binary files a/public/images/emoji/apple/nail_care/6.png and b/public/images/emoji/apple/nail_care/6.png differ
diff --git a/public/images/emoji/apple/name_badge.png b/public/images/emoji/apple/name_badge.png
index 1020a8381cf..6d88a4b3097 100644
Binary files a/public/images/emoji/apple/name_badge.png and b/public/images/emoji/apple/name_badge.png differ
diff --git a/public/images/emoji/apple/namibia.png b/public/images/emoji/apple/namibia.png
index 46327a29ba7..b54cb2e0b2a 100644
Binary files a/public/images/emoji/apple/namibia.png and b/public/images/emoji/apple/namibia.png differ
diff --git a/public/images/emoji/apple/national_park.png b/public/images/emoji/apple/national_park.png
index 902d5ec8ea5..0aa1e2fdb83 100644
Binary files a/public/images/emoji/apple/national_park.png and b/public/images/emoji/apple/national_park.png differ
diff --git a/public/images/emoji/apple/nauru.png b/public/images/emoji/apple/nauru.png
index 58e819dfc7f..9bdaf4f5c5b 100644
Binary files a/public/images/emoji/apple/nauru.png and b/public/images/emoji/apple/nauru.png differ
diff --git a/public/images/emoji/apple/nauseated_face.png b/public/images/emoji/apple/nauseated_face.png
index 6b2889b71a0..68f9e627582 100644
Binary files a/public/images/emoji/apple/nauseated_face.png and b/public/images/emoji/apple/nauseated_face.png differ
diff --git a/public/images/emoji/apple/necktie.png b/public/images/emoji/apple/necktie.png
index 41b1cc08f70..24b9020324f 100644
Binary files a/public/images/emoji/apple/necktie.png and b/public/images/emoji/apple/necktie.png differ
diff --git a/public/images/emoji/apple/negative_squared_cross_mark.png b/public/images/emoji/apple/negative_squared_cross_mark.png
index 4e6039bdd27..151dcf7ca24 100644
Binary files a/public/images/emoji/apple/negative_squared_cross_mark.png and b/public/images/emoji/apple/negative_squared_cross_mark.png differ
diff --git a/public/images/emoji/apple/nepal.png b/public/images/emoji/apple/nepal.png
index 358ea54522b..8297fa42009 100644
Binary files a/public/images/emoji/apple/nepal.png and b/public/images/emoji/apple/nepal.png differ
diff --git a/public/images/emoji/apple/nerd.png b/public/images/emoji/apple/nerd.png
index 8065a619093..48ccf8cf9c2 100644
Binary files a/public/images/emoji/apple/nerd.png and b/public/images/emoji/apple/nerd.png differ
diff --git a/public/images/emoji/apple/nerd_face.png b/public/images/emoji/apple/nerd_face.png
index 8065a619093..48ccf8cf9c2 100644
Binary files a/public/images/emoji/apple/nerd_face.png and b/public/images/emoji/apple/nerd_face.png differ
diff --git a/public/images/emoji/apple/netherlands.png b/public/images/emoji/apple/netherlands.png
index 5848433e274..722da6f2807 100644
Binary files a/public/images/emoji/apple/netherlands.png and b/public/images/emoji/apple/netherlands.png differ
diff --git a/public/images/emoji/apple/neutral_face.png b/public/images/emoji/apple/neutral_face.png
index 45683f51496..322d6da0e89 100644
Binary files a/public/images/emoji/apple/neutral_face.png and b/public/images/emoji/apple/neutral_face.png differ
diff --git a/public/images/emoji/apple/new.png b/public/images/emoji/apple/new.png
index 1d386399fe8..1d1b079a944 100644
Binary files a/public/images/emoji/apple/new.png and b/public/images/emoji/apple/new.png differ
diff --git a/public/images/emoji/apple/new_caledonia.png b/public/images/emoji/apple/new_caledonia.png
index f9a1087cb3d..71d64ddc06d 100644
Binary files a/public/images/emoji/apple/new_caledonia.png and b/public/images/emoji/apple/new_caledonia.png differ
diff --git a/public/images/emoji/apple/new_moon.png b/public/images/emoji/apple/new_moon.png
index 482946e48d6..19d8192c356 100644
Binary files a/public/images/emoji/apple/new_moon.png and b/public/images/emoji/apple/new_moon.png differ
diff --git a/public/images/emoji/apple/new_moon_with_face.png b/public/images/emoji/apple/new_moon_with_face.png
index 006c6791d74..a2752e4da40 100644
Binary files a/public/images/emoji/apple/new_moon_with_face.png and b/public/images/emoji/apple/new_moon_with_face.png differ
diff --git a/public/images/emoji/apple/new_zealand.png b/public/images/emoji/apple/new_zealand.png
index bbf96fc33f9..fd19ee1e532 100644
Binary files a/public/images/emoji/apple/new_zealand.png and b/public/images/emoji/apple/new_zealand.png differ
diff --git a/public/images/emoji/apple/newspaper.png b/public/images/emoji/apple/newspaper.png
index c05c0ede5b7..123f572ae60 100644
Binary files a/public/images/emoji/apple/newspaper.png and b/public/images/emoji/apple/newspaper.png differ
diff --git a/public/images/emoji/apple/newspaper2.png b/public/images/emoji/apple/newspaper2.png
index 400b0805699..c2535585e9a 100644
Binary files a/public/images/emoji/apple/newspaper2.png and b/public/images/emoji/apple/newspaper2.png differ
diff --git a/public/images/emoji/apple/newspaper_roll.png b/public/images/emoji/apple/newspaper_roll.png
index 400b0805699..c2535585e9a 100644
Binary files a/public/images/emoji/apple/newspaper_roll.png and b/public/images/emoji/apple/newspaper_roll.png differ
diff --git a/public/images/emoji/apple/next_track.png b/public/images/emoji/apple/next_track.png
index c6c645c86db..e3fe2a82043 100644
Binary files a/public/images/emoji/apple/next_track.png and b/public/images/emoji/apple/next_track.png differ
diff --git a/public/images/emoji/apple/next_track_button.png b/public/images/emoji/apple/next_track_button.png
index c6c645c86db..e3fe2a82043 100644
Binary files a/public/images/emoji/apple/next_track_button.png and b/public/images/emoji/apple/next_track_button.png differ
diff --git a/public/images/emoji/apple/ng.png b/public/images/emoji/apple/ng.png
index d28ce65270c..8d4e1203e34 100644
Binary files a/public/images/emoji/apple/ng.png and b/public/images/emoji/apple/ng.png differ
diff --git a/public/images/emoji/apple/nicaragua.png b/public/images/emoji/apple/nicaragua.png
index f99f1916362..aef236a96a2 100644
Binary files a/public/images/emoji/apple/nicaragua.png and b/public/images/emoji/apple/nicaragua.png differ
diff --git a/public/images/emoji/apple/niger.png b/public/images/emoji/apple/niger.png
index 2d5530dd621..4dbb09fa65a 100644
Binary files a/public/images/emoji/apple/niger.png and b/public/images/emoji/apple/niger.png differ
diff --git a/public/images/emoji/apple/nigeria.png b/public/images/emoji/apple/nigeria.png
index 1bbfb8e586b..67bb007411d 100644
Binary files a/public/images/emoji/apple/nigeria.png and b/public/images/emoji/apple/nigeria.png differ
diff --git a/public/images/emoji/apple/night_with_stars.png b/public/images/emoji/apple/night_with_stars.png
index ee92a63cee4..b33a9fa6e78 100644
Binary files a/public/images/emoji/apple/night_with_stars.png and b/public/images/emoji/apple/night_with_stars.png differ
diff --git a/public/images/emoji/apple/nine.png b/public/images/emoji/apple/nine.png
index f68cbedc51c..413829efbfe 100644
Binary files a/public/images/emoji/apple/nine.png and b/public/images/emoji/apple/nine.png differ
diff --git a/public/images/emoji/apple/niue.png b/public/images/emoji/apple/niue.png
index 15f12b061c7..c220ef7fe70 100644
Binary files a/public/images/emoji/apple/niue.png and b/public/images/emoji/apple/niue.png differ
diff --git a/public/images/emoji/apple/no_bell.png b/public/images/emoji/apple/no_bell.png
index 7f6f2283e2d..fc6c501d7ca 100644
Binary files a/public/images/emoji/apple/no_bell.png and b/public/images/emoji/apple/no_bell.png differ
diff --git a/public/images/emoji/apple/no_bicycles.png b/public/images/emoji/apple/no_bicycles.png
index 877ad857c1d..08ef55b2c9a 100644
Binary files a/public/images/emoji/apple/no_bicycles.png and b/public/images/emoji/apple/no_bicycles.png differ
diff --git a/public/images/emoji/apple/no_entry.png b/public/images/emoji/apple/no_entry.png
index 2190e5290fa..f24294805d6 100644
Binary files a/public/images/emoji/apple/no_entry.png and b/public/images/emoji/apple/no_entry.png differ
diff --git a/public/images/emoji/apple/no_entry_sign.png b/public/images/emoji/apple/no_entry_sign.png
index d22e5eef382..e16a2eb4679 100644
Binary files a/public/images/emoji/apple/no_entry_sign.png and b/public/images/emoji/apple/no_entry_sign.png differ
diff --git a/public/images/emoji/apple/no_good.png b/public/images/emoji/apple/no_good.png
index 429fc1ba92e..ac7980df8fd 100644
Binary files a/public/images/emoji/apple/no_good.png and b/public/images/emoji/apple/no_good.png differ
diff --git a/public/images/emoji/apple/no_good/2.png b/public/images/emoji/apple/no_good/2.png
index 1fba8c40e4d..a4e3d86870c 100644
Binary files a/public/images/emoji/apple/no_good/2.png and b/public/images/emoji/apple/no_good/2.png differ
diff --git a/public/images/emoji/apple/no_good/3.png b/public/images/emoji/apple/no_good/3.png
index d533bd34fa8..da237444b4d 100644
Binary files a/public/images/emoji/apple/no_good/3.png and b/public/images/emoji/apple/no_good/3.png differ
diff --git a/public/images/emoji/apple/no_good/4.png b/public/images/emoji/apple/no_good/4.png
index 55ca1de6554..3560c71df19 100644
Binary files a/public/images/emoji/apple/no_good/4.png and b/public/images/emoji/apple/no_good/4.png differ
diff --git a/public/images/emoji/apple/no_good/5.png b/public/images/emoji/apple/no_good/5.png
index df889c3d3b2..b1de5351d2e 100644
Binary files a/public/images/emoji/apple/no_good/5.png and b/public/images/emoji/apple/no_good/5.png differ
diff --git a/public/images/emoji/apple/no_good/6.png b/public/images/emoji/apple/no_good/6.png
index 198d8d0828d..9018e1e1fb1 100644
Binary files a/public/images/emoji/apple/no_good/6.png and b/public/images/emoji/apple/no_good/6.png differ
diff --git a/public/images/emoji/apple/no_good_man.png b/public/images/emoji/apple/no_good_man.png
index c7e959db49a..8fdb5273ad3 100644
Binary files a/public/images/emoji/apple/no_good_man.png and b/public/images/emoji/apple/no_good_man.png differ
diff --git a/public/images/emoji/apple/no_good_man/2.png b/public/images/emoji/apple/no_good_man/2.png
index 07de44c9167..e68705b44a3 100644
Binary files a/public/images/emoji/apple/no_good_man/2.png and b/public/images/emoji/apple/no_good_man/2.png differ
diff --git a/public/images/emoji/apple/no_good_man/3.png b/public/images/emoji/apple/no_good_man/3.png
index 7194eba931e..ade6190f4a5 100644
Binary files a/public/images/emoji/apple/no_good_man/3.png and b/public/images/emoji/apple/no_good_man/3.png differ
diff --git a/public/images/emoji/apple/no_good_man/4.png b/public/images/emoji/apple/no_good_man/4.png
index 9ba6bbb3a76..7c48ae9eeca 100644
Binary files a/public/images/emoji/apple/no_good_man/4.png and b/public/images/emoji/apple/no_good_man/4.png differ
diff --git a/public/images/emoji/apple/no_good_man/5.png b/public/images/emoji/apple/no_good_man/5.png
index 88b59851566..0bc280142b4 100644
Binary files a/public/images/emoji/apple/no_good_man/5.png and b/public/images/emoji/apple/no_good_man/5.png differ
diff --git a/public/images/emoji/apple/no_good_man/6.png b/public/images/emoji/apple/no_good_man/6.png
index 235c3371e85..86afa47fca8 100644
Binary files a/public/images/emoji/apple/no_good_man/6.png and b/public/images/emoji/apple/no_good_man/6.png differ
diff --git a/public/images/emoji/apple/no_good_woman.png b/public/images/emoji/apple/no_good_woman.png
index 429fc1ba92e..ac7980df8fd 100644
Binary files a/public/images/emoji/apple/no_good_woman.png and b/public/images/emoji/apple/no_good_woman.png differ
diff --git a/public/images/emoji/apple/no_good_woman/2.png b/public/images/emoji/apple/no_good_woman/2.png
index 1fba8c40e4d..a4e3d86870c 100644
Binary files a/public/images/emoji/apple/no_good_woman/2.png and b/public/images/emoji/apple/no_good_woman/2.png differ
diff --git a/public/images/emoji/apple/no_good_woman/3.png b/public/images/emoji/apple/no_good_woman/3.png
index d533bd34fa8..da237444b4d 100644
Binary files a/public/images/emoji/apple/no_good_woman/3.png and b/public/images/emoji/apple/no_good_woman/3.png differ
diff --git a/public/images/emoji/apple/no_good_woman/4.png b/public/images/emoji/apple/no_good_woman/4.png
index 55ca1de6554..3560c71df19 100644
Binary files a/public/images/emoji/apple/no_good_woman/4.png and b/public/images/emoji/apple/no_good_woman/4.png differ
diff --git a/public/images/emoji/apple/no_good_woman/5.png b/public/images/emoji/apple/no_good_woman/5.png
index df889c3d3b2..b1de5351d2e 100644
Binary files a/public/images/emoji/apple/no_good_woman/5.png and b/public/images/emoji/apple/no_good_woman/5.png differ
diff --git a/public/images/emoji/apple/no_good_woman/6.png b/public/images/emoji/apple/no_good_woman/6.png
index 198d8d0828d..9018e1e1fb1 100644
Binary files a/public/images/emoji/apple/no_good_woman/6.png and b/public/images/emoji/apple/no_good_woman/6.png differ
diff --git a/public/images/emoji/apple/no_mobile_phones.png b/public/images/emoji/apple/no_mobile_phones.png
index c11b08bc2bc..b9bab5dba15 100644
Binary files a/public/images/emoji/apple/no_mobile_phones.png and b/public/images/emoji/apple/no_mobile_phones.png differ
diff --git a/public/images/emoji/apple/no_mouth.png b/public/images/emoji/apple/no_mouth.png
index 5560276cba1..e1ce320ef92 100644
Binary files a/public/images/emoji/apple/no_mouth.png and b/public/images/emoji/apple/no_mouth.png differ
diff --git a/public/images/emoji/apple/no_pedestrians.png b/public/images/emoji/apple/no_pedestrians.png
index c4fcc420ad6..6a77c2d7e17 100644
Binary files a/public/images/emoji/apple/no_pedestrians.png and b/public/images/emoji/apple/no_pedestrians.png differ
diff --git a/public/images/emoji/apple/no_smoking.png b/public/images/emoji/apple/no_smoking.png
index b16caf6a8b4..b8698898abb 100644
Binary files a/public/images/emoji/apple/no_smoking.png and b/public/images/emoji/apple/no_smoking.png differ
diff --git a/public/images/emoji/apple/non-potable_water.png b/public/images/emoji/apple/non-potable_water.png
index 425a8c6eefb..cec7bfe30c3 100644
Binary files a/public/images/emoji/apple/non-potable_water.png and b/public/images/emoji/apple/non-potable_water.png differ
diff --git a/public/images/emoji/apple/norfolk_island.png b/public/images/emoji/apple/norfolk_island.png
index 04a9904c8bf..aae8d7dcf1e 100644
Binary files a/public/images/emoji/apple/norfolk_island.png and b/public/images/emoji/apple/norfolk_island.png differ
diff --git a/public/images/emoji/apple/north_korea.png b/public/images/emoji/apple/north_korea.png
index 8b74a9f83c3..3f8629799b7 100644
Binary files a/public/images/emoji/apple/north_korea.png and b/public/images/emoji/apple/north_korea.png differ
diff --git a/public/images/emoji/apple/northern_mariana_islands.png b/public/images/emoji/apple/northern_mariana_islands.png
index bcfc406dd57..35186110bd8 100644
Binary files a/public/images/emoji/apple/northern_mariana_islands.png and b/public/images/emoji/apple/northern_mariana_islands.png differ
diff --git a/public/images/emoji/apple/norway.png b/public/images/emoji/apple/norway.png
index 5827a3d3767..17fda5559aa 100644
Binary files a/public/images/emoji/apple/norway.png and b/public/images/emoji/apple/norway.png differ
diff --git a/public/images/emoji/apple/nose.png b/public/images/emoji/apple/nose.png
index 5489cc0bb50..30117741f70 100644
Binary files a/public/images/emoji/apple/nose.png and b/public/images/emoji/apple/nose.png differ
diff --git a/public/images/emoji/apple/nose/2.png b/public/images/emoji/apple/nose/2.png
index 5029910fe7d..3350f912aa3 100644
Binary files a/public/images/emoji/apple/nose/2.png and b/public/images/emoji/apple/nose/2.png differ
diff --git a/public/images/emoji/apple/nose/3.png b/public/images/emoji/apple/nose/3.png
index 84406ef4800..8079bf29697 100644
Binary files a/public/images/emoji/apple/nose/3.png and b/public/images/emoji/apple/nose/3.png differ
diff --git a/public/images/emoji/apple/nose/4.png b/public/images/emoji/apple/nose/4.png
index 8c3d71db4a8..1aec624e738 100644
Binary files a/public/images/emoji/apple/nose/4.png and b/public/images/emoji/apple/nose/4.png differ
diff --git a/public/images/emoji/apple/nose/5.png b/public/images/emoji/apple/nose/5.png
index e1ed779ae6e..e77212737ff 100644
Binary files a/public/images/emoji/apple/nose/5.png and b/public/images/emoji/apple/nose/5.png differ
diff --git a/public/images/emoji/apple/nose/6.png b/public/images/emoji/apple/nose/6.png
index 59fb8938e2a..f3ed5a55fe3 100644
Binary files a/public/images/emoji/apple/nose/6.png and b/public/images/emoji/apple/nose/6.png differ
diff --git a/public/images/emoji/apple/notebook.png b/public/images/emoji/apple/notebook.png
index 974f211892f..e5aa00a7818 100644
Binary files a/public/images/emoji/apple/notebook.png and b/public/images/emoji/apple/notebook.png differ
diff --git a/public/images/emoji/apple/notebook_with_decorative_cover.png b/public/images/emoji/apple/notebook_with_decorative_cover.png
index 9bdbe23bb4a..5441b694a6a 100644
Binary files a/public/images/emoji/apple/notebook_with_decorative_cover.png and b/public/images/emoji/apple/notebook_with_decorative_cover.png differ
diff --git a/public/images/emoji/apple/notepad_spiral.png b/public/images/emoji/apple/notepad_spiral.png
index 5e4c3a2d0e2..b7ca22fbaaf 100644
Binary files a/public/images/emoji/apple/notepad_spiral.png and b/public/images/emoji/apple/notepad_spiral.png differ
diff --git a/public/images/emoji/apple/notes.png b/public/images/emoji/apple/notes.png
index 284f7eebbd3..829b1e5a72a 100644
Binary files a/public/images/emoji/apple/notes.png and b/public/images/emoji/apple/notes.png differ
diff --git a/public/images/emoji/apple/nut_and_bolt.png b/public/images/emoji/apple/nut_and_bolt.png
index 1890dc87bc2..bd7e91e1034 100644
Binary files a/public/images/emoji/apple/nut_and_bolt.png and b/public/images/emoji/apple/nut_and_bolt.png differ
diff --git a/public/images/emoji/apple/o.png b/public/images/emoji/apple/o.png
index fa8b79521d0..105d5fde0b7 100644
Binary files a/public/images/emoji/apple/o.png and b/public/images/emoji/apple/o.png differ
diff --git a/public/images/emoji/apple/o2.png b/public/images/emoji/apple/o2.png
index 5a11ac81c59..59d0e450437 100644
Binary files a/public/images/emoji/apple/o2.png and b/public/images/emoji/apple/o2.png differ
diff --git a/public/images/emoji/apple/ocean.png b/public/images/emoji/apple/ocean.png
index a619c11c488..a234b9cf275 100644
Binary files a/public/images/emoji/apple/ocean.png and b/public/images/emoji/apple/ocean.png differ
diff --git a/public/images/emoji/apple/octopus.png b/public/images/emoji/apple/octopus.png
index 1e40b5892df..60d9e009c15 100644
Binary files a/public/images/emoji/apple/octopus.png and b/public/images/emoji/apple/octopus.png differ
diff --git a/public/images/emoji/apple/oden.png b/public/images/emoji/apple/oden.png
index 78979edcbbc..edf0fdc47a4 100644
Binary files a/public/images/emoji/apple/oden.png and b/public/images/emoji/apple/oden.png differ
diff --git a/public/images/emoji/apple/office.png b/public/images/emoji/apple/office.png
index 6fb5b10e9a8..d11ea06f44d 100644
Binary files a/public/images/emoji/apple/office.png and b/public/images/emoji/apple/office.png differ
diff --git a/public/images/emoji/apple/oil.png b/public/images/emoji/apple/oil.png
index f63443d6a45..46d0f7dcb7d 100644
Binary files a/public/images/emoji/apple/oil.png and b/public/images/emoji/apple/oil.png differ
diff --git a/public/images/emoji/apple/oil_drum.png b/public/images/emoji/apple/oil_drum.png
index f63443d6a45..46d0f7dcb7d 100644
Binary files a/public/images/emoji/apple/oil_drum.png and b/public/images/emoji/apple/oil_drum.png differ
diff --git a/public/images/emoji/apple/ok.png b/public/images/emoji/apple/ok.png
index c448030e139..1b9dbb5e9bc 100644
Binary files a/public/images/emoji/apple/ok.png and b/public/images/emoji/apple/ok.png differ
diff --git a/public/images/emoji/apple/ok_hand.png b/public/images/emoji/apple/ok_hand.png
index db32febd5cb..d761954a147 100644
Binary files a/public/images/emoji/apple/ok_hand.png and b/public/images/emoji/apple/ok_hand.png differ
diff --git a/public/images/emoji/apple/ok_hand/2.png b/public/images/emoji/apple/ok_hand/2.png
index 846b068ecb4..b57ccf10858 100644
Binary files a/public/images/emoji/apple/ok_hand/2.png and b/public/images/emoji/apple/ok_hand/2.png differ
diff --git a/public/images/emoji/apple/ok_hand/3.png b/public/images/emoji/apple/ok_hand/3.png
index 51063219939..24abf882123 100644
Binary files a/public/images/emoji/apple/ok_hand/3.png and b/public/images/emoji/apple/ok_hand/3.png differ
diff --git a/public/images/emoji/apple/ok_hand/4.png b/public/images/emoji/apple/ok_hand/4.png
index bcc412fb85f..62287ce7fa5 100644
Binary files a/public/images/emoji/apple/ok_hand/4.png and b/public/images/emoji/apple/ok_hand/4.png differ
diff --git a/public/images/emoji/apple/ok_hand/5.png b/public/images/emoji/apple/ok_hand/5.png
index 1690724e43e..9b9a13cac39 100644
Binary files a/public/images/emoji/apple/ok_hand/5.png and b/public/images/emoji/apple/ok_hand/5.png differ
diff --git a/public/images/emoji/apple/ok_hand/6.png b/public/images/emoji/apple/ok_hand/6.png
index de9da6b79e6..32ba6cf7081 100644
Binary files a/public/images/emoji/apple/ok_hand/6.png and b/public/images/emoji/apple/ok_hand/6.png differ
diff --git a/public/images/emoji/apple/ok_man.png b/public/images/emoji/apple/ok_man.png
index ea8c3efa38d..ec40e7e0b45 100644
Binary files a/public/images/emoji/apple/ok_man.png and b/public/images/emoji/apple/ok_man.png differ
diff --git a/public/images/emoji/apple/ok_man/2.png b/public/images/emoji/apple/ok_man/2.png
index fc088678c8b..14c4425a79f 100644
Binary files a/public/images/emoji/apple/ok_man/2.png and b/public/images/emoji/apple/ok_man/2.png differ
diff --git a/public/images/emoji/apple/ok_man/3.png b/public/images/emoji/apple/ok_man/3.png
index d355137b7ec..fda0b70debe 100644
Binary files a/public/images/emoji/apple/ok_man/3.png and b/public/images/emoji/apple/ok_man/3.png differ
diff --git a/public/images/emoji/apple/ok_man/4.png b/public/images/emoji/apple/ok_man/4.png
index 86b6289c2be..e9216840089 100644
Binary files a/public/images/emoji/apple/ok_man/4.png and b/public/images/emoji/apple/ok_man/4.png differ
diff --git a/public/images/emoji/apple/ok_man/5.png b/public/images/emoji/apple/ok_man/5.png
index c807bcf02cd..469c7d91c9a 100644
Binary files a/public/images/emoji/apple/ok_man/5.png and b/public/images/emoji/apple/ok_man/5.png differ
diff --git a/public/images/emoji/apple/ok_man/6.png b/public/images/emoji/apple/ok_man/6.png
index 6d6e7935d80..8c8d51a27c9 100644
Binary files a/public/images/emoji/apple/ok_man/6.png and b/public/images/emoji/apple/ok_man/6.png differ
diff --git a/public/images/emoji/apple/ok_woman.png b/public/images/emoji/apple/ok_woman.png
index b0e2f9d0f39..95f78ba2658 100644
Binary files a/public/images/emoji/apple/ok_woman.png and b/public/images/emoji/apple/ok_woman.png differ
diff --git a/public/images/emoji/apple/ok_woman/2.png b/public/images/emoji/apple/ok_woman/2.png
index bd3834c91e3..9fa9f385306 100644
Binary files a/public/images/emoji/apple/ok_woman/2.png and b/public/images/emoji/apple/ok_woman/2.png differ
diff --git a/public/images/emoji/apple/ok_woman/3.png b/public/images/emoji/apple/ok_woman/3.png
index c8320428ed1..adfa36e354b 100644
Binary files a/public/images/emoji/apple/ok_woman/3.png and b/public/images/emoji/apple/ok_woman/3.png differ
diff --git a/public/images/emoji/apple/ok_woman/4.png b/public/images/emoji/apple/ok_woman/4.png
index c7865487f25..0300341a78b 100644
Binary files a/public/images/emoji/apple/ok_woman/4.png and b/public/images/emoji/apple/ok_woman/4.png differ
diff --git a/public/images/emoji/apple/ok_woman/5.png b/public/images/emoji/apple/ok_woman/5.png
index afb43cda70d..252b4926fd6 100644
Binary files a/public/images/emoji/apple/ok_woman/5.png and b/public/images/emoji/apple/ok_woman/5.png differ
diff --git a/public/images/emoji/apple/ok_woman/6.png b/public/images/emoji/apple/ok_woman/6.png
index cc400e7f1e8..c3eaccb4ccd 100644
Binary files a/public/images/emoji/apple/ok_woman/6.png and b/public/images/emoji/apple/ok_woman/6.png differ
diff --git a/public/images/emoji/apple/old_key.png b/public/images/emoji/apple/old_key.png
index 05715332b10..90602374732 100644
Binary files a/public/images/emoji/apple/old_key.png and b/public/images/emoji/apple/old_key.png differ
diff --git a/public/images/emoji/apple/older_adult.png b/public/images/emoji/apple/older_adult.png
index 8796829b876..5e043451381 100644
Binary files a/public/images/emoji/apple/older_adult.png and b/public/images/emoji/apple/older_adult.png differ
diff --git a/public/images/emoji/apple/older_adult/2.png b/public/images/emoji/apple/older_adult/2.png
index b36f41960e7..da67b9a1421 100644
Binary files a/public/images/emoji/apple/older_adult/2.png and b/public/images/emoji/apple/older_adult/2.png differ
diff --git a/public/images/emoji/apple/older_adult/3.png b/public/images/emoji/apple/older_adult/3.png
index dc1441fea56..fb142d25f56 100644
Binary files a/public/images/emoji/apple/older_adult/3.png and b/public/images/emoji/apple/older_adult/3.png differ
diff --git a/public/images/emoji/apple/older_adult/4.png b/public/images/emoji/apple/older_adult/4.png
index abc19e06c74..5689a3f00f4 100644
Binary files a/public/images/emoji/apple/older_adult/4.png and b/public/images/emoji/apple/older_adult/4.png differ
diff --git a/public/images/emoji/apple/older_adult/5.png b/public/images/emoji/apple/older_adult/5.png
index c90549f6813..ed335394de4 100644
Binary files a/public/images/emoji/apple/older_adult/5.png and b/public/images/emoji/apple/older_adult/5.png differ
diff --git a/public/images/emoji/apple/older_adult/6.png b/public/images/emoji/apple/older_adult/6.png
index 5152c9c1a3e..faf987473bb 100644
Binary files a/public/images/emoji/apple/older_adult/6.png and b/public/images/emoji/apple/older_adult/6.png differ
diff --git a/public/images/emoji/apple/older_man.png b/public/images/emoji/apple/older_man.png
index 7d61e185f69..8c0367e26b6 100644
Binary files a/public/images/emoji/apple/older_man.png and b/public/images/emoji/apple/older_man.png differ
diff --git a/public/images/emoji/apple/older_man/2.png b/public/images/emoji/apple/older_man/2.png
index 5bce0f8719a..fb2acb4234c 100644
Binary files a/public/images/emoji/apple/older_man/2.png and b/public/images/emoji/apple/older_man/2.png differ
diff --git a/public/images/emoji/apple/older_man/3.png b/public/images/emoji/apple/older_man/3.png
index abb4fbd880c..92c6cd3ac0c 100644
Binary files a/public/images/emoji/apple/older_man/3.png and b/public/images/emoji/apple/older_man/3.png differ
diff --git a/public/images/emoji/apple/older_man/4.png b/public/images/emoji/apple/older_man/4.png
index db548d5f683..b9b84818b6e 100644
Binary files a/public/images/emoji/apple/older_man/4.png and b/public/images/emoji/apple/older_man/4.png differ
diff --git a/public/images/emoji/apple/older_man/5.png b/public/images/emoji/apple/older_man/5.png
index 6b6a9d922da..598ac70b395 100644
Binary files a/public/images/emoji/apple/older_man/5.png and b/public/images/emoji/apple/older_man/5.png differ
diff --git a/public/images/emoji/apple/older_man/6.png b/public/images/emoji/apple/older_man/6.png
index dcb090572f8..98bf96ba004 100644
Binary files a/public/images/emoji/apple/older_man/6.png and b/public/images/emoji/apple/older_man/6.png differ
diff --git a/public/images/emoji/apple/older_woman.png b/public/images/emoji/apple/older_woman.png
index 3aa8954a88a..3cac50a8fa9 100644
Binary files a/public/images/emoji/apple/older_woman.png and b/public/images/emoji/apple/older_woman.png differ
diff --git a/public/images/emoji/apple/older_woman/2.png b/public/images/emoji/apple/older_woman/2.png
index 0338c484a17..24d5795261e 100644
Binary files a/public/images/emoji/apple/older_woman/2.png and b/public/images/emoji/apple/older_woman/2.png differ
diff --git a/public/images/emoji/apple/older_woman/3.png b/public/images/emoji/apple/older_woman/3.png
index eb68885c384..c24f8ba0c23 100644
Binary files a/public/images/emoji/apple/older_woman/3.png and b/public/images/emoji/apple/older_woman/3.png differ
diff --git a/public/images/emoji/apple/older_woman/4.png b/public/images/emoji/apple/older_woman/4.png
index b0ec0d5864e..739dced78ae 100644
Binary files a/public/images/emoji/apple/older_woman/4.png and b/public/images/emoji/apple/older_woman/4.png differ
diff --git a/public/images/emoji/apple/older_woman/5.png b/public/images/emoji/apple/older_woman/5.png
index e9778d3e964..a2cfce2b1bf 100644
Binary files a/public/images/emoji/apple/older_woman/5.png and b/public/images/emoji/apple/older_woman/5.png differ
diff --git a/public/images/emoji/apple/older_woman/6.png b/public/images/emoji/apple/older_woman/6.png
index af461aed008..4e58e8f057c 100644
Binary files a/public/images/emoji/apple/older_woman/6.png and b/public/images/emoji/apple/older_woman/6.png differ
diff --git a/public/images/emoji/apple/om.png b/public/images/emoji/apple/om.png
index b5b1a233e67..20d4eab3087 100644
Binary files a/public/images/emoji/apple/om.png and b/public/images/emoji/apple/om.png differ
diff --git a/public/images/emoji/apple/om_symbol.png b/public/images/emoji/apple/om_symbol.png
index b5b1a233e67..20d4eab3087 100644
Binary files a/public/images/emoji/apple/om_symbol.png and b/public/images/emoji/apple/om_symbol.png differ
diff --git a/public/images/emoji/apple/oman.png b/public/images/emoji/apple/oman.png
index de17cf8477f..1b749740fd3 100644
Binary files a/public/images/emoji/apple/oman.png and b/public/images/emoji/apple/oman.png differ
diff --git a/public/images/emoji/apple/on.png b/public/images/emoji/apple/on.png
index 46dafb2eae0..cec9c6209b3 100644
Binary files a/public/images/emoji/apple/on.png and b/public/images/emoji/apple/on.png differ
diff --git a/public/images/emoji/apple/oncoming_automobile.png b/public/images/emoji/apple/oncoming_automobile.png
index 80e24f234bc..904a9bbb457 100644
Binary files a/public/images/emoji/apple/oncoming_automobile.png and b/public/images/emoji/apple/oncoming_automobile.png differ
diff --git a/public/images/emoji/apple/oncoming_bus.png b/public/images/emoji/apple/oncoming_bus.png
index 53769420d91..9037ddc80fc 100644
Binary files a/public/images/emoji/apple/oncoming_bus.png and b/public/images/emoji/apple/oncoming_bus.png differ
diff --git a/public/images/emoji/apple/oncoming_police_car.png b/public/images/emoji/apple/oncoming_police_car.png
index 0e9d3eff9ba..f1544c4fd8f 100644
Binary files a/public/images/emoji/apple/oncoming_police_car.png and b/public/images/emoji/apple/oncoming_police_car.png differ
diff --git a/public/images/emoji/apple/oncoming_taxi.png b/public/images/emoji/apple/oncoming_taxi.png
index 7b3d37c2641..c9bc73eaa1e 100644
Binary files a/public/images/emoji/apple/oncoming_taxi.png and b/public/images/emoji/apple/oncoming_taxi.png differ
diff --git a/public/images/emoji/apple/one.png b/public/images/emoji/apple/one.png
index 04153a940f9..350636c23de 100644
Binary files a/public/images/emoji/apple/one.png and b/public/images/emoji/apple/one.png differ
diff --git a/public/images/emoji/apple/open_book.png b/public/images/emoji/apple/open_book.png
index fd8d428a74a..8a53f9f32c7 100644
Binary files a/public/images/emoji/apple/open_book.png and b/public/images/emoji/apple/open_book.png differ
diff --git a/public/images/emoji/apple/open_file_folder.png b/public/images/emoji/apple/open_file_folder.png
index a55476e3b13..8a419e072b5 100644
Binary files a/public/images/emoji/apple/open_file_folder.png and b/public/images/emoji/apple/open_file_folder.png differ
diff --git a/public/images/emoji/apple/open_hands.png b/public/images/emoji/apple/open_hands.png
index 5124bfbb924..97e351da6d0 100644
Binary files a/public/images/emoji/apple/open_hands.png and b/public/images/emoji/apple/open_hands.png differ
diff --git a/public/images/emoji/apple/open_hands/2.png b/public/images/emoji/apple/open_hands/2.png
index a34b319c254..9cbb687b8d0 100644
Binary files a/public/images/emoji/apple/open_hands/2.png and b/public/images/emoji/apple/open_hands/2.png differ
diff --git a/public/images/emoji/apple/open_hands/3.png b/public/images/emoji/apple/open_hands/3.png
index 01678c5ca79..68c421e6cb3 100644
Binary files a/public/images/emoji/apple/open_hands/3.png and b/public/images/emoji/apple/open_hands/3.png differ
diff --git a/public/images/emoji/apple/open_hands/4.png b/public/images/emoji/apple/open_hands/4.png
index 21d7feef155..ef07ab7456f 100644
Binary files a/public/images/emoji/apple/open_hands/4.png and b/public/images/emoji/apple/open_hands/4.png differ
diff --git a/public/images/emoji/apple/open_hands/5.png b/public/images/emoji/apple/open_hands/5.png
index eb7ba22d584..29bbc2f9794 100644
Binary files a/public/images/emoji/apple/open_hands/5.png and b/public/images/emoji/apple/open_hands/5.png differ
diff --git a/public/images/emoji/apple/open_hands/6.png b/public/images/emoji/apple/open_hands/6.png
index 363204276bb..a06facb85a3 100644
Binary files a/public/images/emoji/apple/open_hands/6.png and b/public/images/emoji/apple/open_hands/6.png differ
diff --git a/public/images/emoji/apple/open_mouth.png b/public/images/emoji/apple/open_mouth.png
index f4b4ae9b790..65aca75750f 100644
Binary files a/public/images/emoji/apple/open_mouth.png and b/public/images/emoji/apple/open_mouth.png differ
diff --git a/public/images/emoji/apple/open_umbrella.png b/public/images/emoji/apple/open_umbrella.png
index 1d7d1c6a5fe..57f86cc0643 100644
Binary files a/public/images/emoji/apple/open_umbrella.png and b/public/images/emoji/apple/open_umbrella.png differ
diff --git a/public/images/emoji/apple/ophiuchus.png b/public/images/emoji/apple/ophiuchus.png
index bbcaa98be90..b72258d21f6 100644
Binary files a/public/images/emoji/apple/ophiuchus.png and b/public/images/emoji/apple/ophiuchus.png differ
diff --git a/public/images/emoji/apple/orange_book.png b/public/images/emoji/apple/orange_book.png
index bfd48b8c078..d45ed16bab7 100644
Binary files a/public/images/emoji/apple/orange_book.png and b/public/images/emoji/apple/orange_book.png differ
diff --git a/public/images/emoji/apple/orange_heart.png b/public/images/emoji/apple/orange_heart.png
index f217c930a74..4f8bdc29b67 100644
Binary files a/public/images/emoji/apple/orange_heart.png and b/public/images/emoji/apple/orange_heart.png differ
diff --git a/public/images/emoji/apple/orthodox_cross.png b/public/images/emoji/apple/orthodox_cross.png
index ea6955e09a9..43051b165c9 100644
Binary files a/public/images/emoji/apple/orthodox_cross.png and b/public/images/emoji/apple/orthodox_cross.png differ
diff --git a/public/images/emoji/apple/outbox_tray.png b/public/images/emoji/apple/outbox_tray.png
index af879adaba4..b13161e266c 100644
Binary files a/public/images/emoji/apple/outbox_tray.png and b/public/images/emoji/apple/outbox_tray.png differ
diff --git a/public/images/emoji/apple/owl.png b/public/images/emoji/apple/owl.png
index 79b86eba809..bc33e6b05bb 100644
Binary files a/public/images/emoji/apple/owl.png and b/public/images/emoji/apple/owl.png differ
diff --git a/public/images/emoji/apple/ox.png b/public/images/emoji/apple/ox.png
index 33a2801ef19..127df1599ec 100644
Binary files a/public/images/emoji/apple/ox.png and b/public/images/emoji/apple/ox.png differ
diff --git a/public/images/emoji/apple/package.png b/public/images/emoji/apple/package.png
index 385a4b61e73..2ff9636538a 100644
Binary files a/public/images/emoji/apple/package.png and b/public/images/emoji/apple/package.png differ
diff --git a/public/images/emoji/apple/page_facing_up.png b/public/images/emoji/apple/page_facing_up.png
index f2961094887..5b80e87ed56 100644
Binary files a/public/images/emoji/apple/page_facing_up.png and b/public/images/emoji/apple/page_facing_up.png differ
diff --git a/public/images/emoji/apple/page_with_curl.png b/public/images/emoji/apple/page_with_curl.png
index 70c773c9e42..3e96a6b7a33 100644
Binary files a/public/images/emoji/apple/page_with_curl.png and b/public/images/emoji/apple/page_with_curl.png differ
diff --git a/public/images/emoji/apple/pager.png b/public/images/emoji/apple/pager.png
index 7cb85607e3d..9669d152799 100644
Binary files a/public/images/emoji/apple/pager.png and b/public/images/emoji/apple/pager.png differ
diff --git a/public/images/emoji/apple/paintbrush.png b/public/images/emoji/apple/paintbrush.png
index 2b02f0ad03a..3202e61d61b 100644
Binary files a/public/images/emoji/apple/paintbrush.png and b/public/images/emoji/apple/paintbrush.png differ
diff --git a/public/images/emoji/apple/pakistan.png b/public/images/emoji/apple/pakistan.png
index 38f68498fb0..be17209495a 100644
Binary files a/public/images/emoji/apple/pakistan.png and b/public/images/emoji/apple/pakistan.png differ
diff --git a/public/images/emoji/apple/palau.png b/public/images/emoji/apple/palau.png
index fead277711f..759816994b6 100644
Binary files a/public/images/emoji/apple/palau.png and b/public/images/emoji/apple/palau.png differ
diff --git a/public/images/emoji/apple/palestinian_territories.png b/public/images/emoji/apple/palestinian_territories.png
index 8ec31337f4f..33ac9207bd2 100644
Binary files a/public/images/emoji/apple/palestinian_territories.png and b/public/images/emoji/apple/palestinian_territories.png differ
diff --git a/public/images/emoji/apple/palm_tree.png b/public/images/emoji/apple/palm_tree.png
index 3f968892852..b91b03327d8 100644
Binary files a/public/images/emoji/apple/palm_tree.png and b/public/images/emoji/apple/palm_tree.png differ
diff --git a/public/images/emoji/apple/palms_up_together.png b/public/images/emoji/apple/palms_up_together.png
index fb66ba11c40..70cc9b79558 100644
Binary files a/public/images/emoji/apple/palms_up_together.png and b/public/images/emoji/apple/palms_up_together.png differ
diff --git a/public/images/emoji/apple/palms_up_together/2.png b/public/images/emoji/apple/palms_up_together/2.png
index 6d9b2fc8ccd..5209a4ecdb8 100644
Binary files a/public/images/emoji/apple/palms_up_together/2.png and b/public/images/emoji/apple/palms_up_together/2.png differ
diff --git a/public/images/emoji/apple/palms_up_together/3.png b/public/images/emoji/apple/palms_up_together/3.png
index c5d52f5c7a7..fbe4c284899 100644
Binary files a/public/images/emoji/apple/palms_up_together/3.png and b/public/images/emoji/apple/palms_up_together/3.png differ
diff --git a/public/images/emoji/apple/palms_up_together/4.png b/public/images/emoji/apple/palms_up_together/4.png
index 3d4288d10db..20ecb55638c 100644
Binary files a/public/images/emoji/apple/palms_up_together/4.png and b/public/images/emoji/apple/palms_up_together/4.png differ
diff --git a/public/images/emoji/apple/palms_up_together/5.png b/public/images/emoji/apple/palms_up_together/5.png
index 6ff36c07cbd..72fd056900a 100644
Binary files a/public/images/emoji/apple/palms_up_together/5.png and b/public/images/emoji/apple/palms_up_together/5.png differ
diff --git a/public/images/emoji/apple/palms_up_together/6.png b/public/images/emoji/apple/palms_up_together/6.png
index c25d42927d8..a688c3a3a82 100644
Binary files a/public/images/emoji/apple/palms_up_together/6.png and b/public/images/emoji/apple/palms_up_together/6.png differ
diff --git a/public/images/emoji/apple/panama.png b/public/images/emoji/apple/panama.png
index 582030b969f..9dbf5d4ffa2 100644
Binary files a/public/images/emoji/apple/panama.png and b/public/images/emoji/apple/panama.png differ
diff --git a/public/images/emoji/apple/pancakes.png b/public/images/emoji/apple/pancakes.png
index b666d15cd00..50f6768d9d2 100644
Binary files a/public/images/emoji/apple/pancakes.png and b/public/images/emoji/apple/pancakes.png differ
diff --git a/public/images/emoji/apple/panda_face.png b/public/images/emoji/apple/panda_face.png
index 27847603d95..ed5f8b6af4e 100644
Binary files a/public/images/emoji/apple/panda_face.png and b/public/images/emoji/apple/panda_face.png differ
diff --git a/public/images/emoji/apple/paperclip.png b/public/images/emoji/apple/paperclip.png
index a2c50ff2358..557ce2d6506 100644
Binary files a/public/images/emoji/apple/paperclip.png and b/public/images/emoji/apple/paperclip.png differ
diff --git a/public/images/emoji/apple/paperclips.png b/public/images/emoji/apple/paperclips.png
index 235e2049c36..f3824c5f970 100644
Binary files a/public/images/emoji/apple/paperclips.png and b/public/images/emoji/apple/paperclips.png differ
diff --git a/public/images/emoji/apple/papua_new_guinea.png b/public/images/emoji/apple/papua_new_guinea.png
index 08fc839433e..3d81502b845 100644
Binary files a/public/images/emoji/apple/papua_new_guinea.png and b/public/images/emoji/apple/papua_new_guinea.png differ
diff --git a/public/images/emoji/apple/paraguay.png b/public/images/emoji/apple/paraguay.png
index e885b821115..d9ffccd1719 100644
Binary files a/public/images/emoji/apple/paraguay.png and b/public/images/emoji/apple/paraguay.png differ
diff --git a/public/images/emoji/apple/parasol_on_ground.png b/public/images/emoji/apple/parasol_on_ground.png
index 95b1ae9fdd1..34587b671a8 100644
Binary files a/public/images/emoji/apple/parasol_on_ground.png and b/public/images/emoji/apple/parasol_on_ground.png differ
diff --git a/public/images/emoji/apple/park.png b/public/images/emoji/apple/park.png
index 902d5ec8ea5..0aa1e2fdb83 100644
Binary files a/public/images/emoji/apple/park.png and b/public/images/emoji/apple/park.png differ
diff --git a/public/images/emoji/apple/parking.png b/public/images/emoji/apple/parking.png
index 3ba3b779fd9..6073e001d85 100644
Binary files a/public/images/emoji/apple/parking.png and b/public/images/emoji/apple/parking.png differ
diff --git a/public/images/emoji/apple/part_alternation_mark.png b/public/images/emoji/apple/part_alternation_mark.png
index 6b87aac3ef4..87d0cda7c6a 100644
Binary files a/public/images/emoji/apple/part_alternation_mark.png and b/public/images/emoji/apple/part_alternation_mark.png differ
diff --git a/public/images/emoji/apple/partly_sunny.png b/public/images/emoji/apple/partly_sunny.png
index b31de05a28f..604304abf88 100644
Binary files a/public/images/emoji/apple/partly_sunny.png and b/public/images/emoji/apple/partly_sunny.png differ
diff --git a/public/images/emoji/apple/passenger_ship.png b/public/images/emoji/apple/passenger_ship.png
index 3bb64de0d3e..725630488ec 100644
Binary files a/public/images/emoji/apple/passenger_ship.png and b/public/images/emoji/apple/passenger_ship.png differ
diff --git a/public/images/emoji/apple/passport_control.png b/public/images/emoji/apple/passport_control.png
index 5f9b37f6313..f1cb5cb3e6d 100644
Binary files a/public/images/emoji/apple/passport_control.png and b/public/images/emoji/apple/passport_control.png differ
diff --git a/public/images/emoji/apple/pause_button.png b/public/images/emoji/apple/pause_button.png
index 7f788fbb763..39e49f7ef1a 100644
Binary files a/public/images/emoji/apple/pause_button.png and b/public/images/emoji/apple/pause_button.png differ
diff --git a/public/images/emoji/apple/paw_prints.png b/public/images/emoji/apple/paw_prints.png
index 26fe02e01ee..8e8a320ae58 100644
Binary files a/public/images/emoji/apple/paw_prints.png and b/public/images/emoji/apple/paw_prints.png differ
diff --git a/public/images/emoji/apple/peace.png b/public/images/emoji/apple/peace.png
index c8567db8383..e4b6a97c1d0 100644
Binary files a/public/images/emoji/apple/peace.png and b/public/images/emoji/apple/peace.png differ
diff --git a/public/images/emoji/apple/peace_symbol.png b/public/images/emoji/apple/peace_symbol.png
index c8567db8383..e4b6a97c1d0 100644
Binary files a/public/images/emoji/apple/peace_symbol.png and b/public/images/emoji/apple/peace_symbol.png differ
diff --git a/public/images/emoji/apple/peach.png b/public/images/emoji/apple/peach.png
index a9b5b7e3d4f..9a601e92cfb 100644
Binary files a/public/images/emoji/apple/peach.png and b/public/images/emoji/apple/peach.png differ
diff --git a/public/images/emoji/apple/peanuts.png b/public/images/emoji/apple/peanuts.png
index a405729d163..e38ef71f22b 100644
Binary files a/public/images/emoji/apple/peanuts.png and b/public/images/emoji/apple/peanuts.png differ
diff --git a/public/images/emoji/apple/pear.png b/public/images/emoji/apple/pear.png
index 0e8ead81cb2..278c1ef720c 100644
Binary files a/public/images/emoji/apple/pear.png and b/public/images/emoji/apple/pear.png differ
diff --git a/public/images/emoji/apple/pen.png b/public/images/emoji/apple/pen.png
index b9e79ad2146..f4750b47391 100644
Binary files a/public/images/emoji/apple/pen.png and b/public/images/emoji/apple/pen.png differ
diff --git a/public/images/emoji/apple/pen_ballpoint.png b/public/images/emoji/apple/pen_ballpoint.png
index b9e79ad2146..f4750b47391 100644
Binary files a/public/images/emoji/apple/pen_ballpoint.png and b/public/images/emoji/apple/pen_ballpoint.png differ
diff --git a/public/images/emoji/apple/pen_fountain.png b/public/images/emoji/apple/pen_fountain.png
index a9a947848d8..044cbf89175 100644
Binary files a/public/images/emoji/apple/pen_fountain.png and b/public/images/emoji/apple/pen_fountain.png differ
diff --git a/public/images/emoji/apple/pencil.png b/public/images/emoji/apple/pencil.png
index b738536bdcd..84fef4d0ca7 100644
Binary files a/public/images/emoji/apple/pencil.png and b/public/images/emoji/apple/pencil.png differ
diff --git a/public/images/emoji/apple/pencil2.png b/public/images/emoji/apple/pencil2.png
index 29298608249..f18ce27adc2 100644
Binary files a/public/images/emoji/apple/pencil2.png and b/public/images/emoji/apple/pencil2.png differ
diff --git a/public/images/emoji/apple/penguin.png b/public/images/emoji/apple/penguin.png
index de389660ecb..9ef4b3a45e8 100644
Binary files a/public/images/emoji/apple/penguin.png and b/public/images/emoji/apple/penguin.png differ
diff --git a/public/images/emoji/apple/pensive.png b/public/images/emoji/apple/pensive.png
index b5134a4d69c..711217a2c24 100644
Binary files a/public/images/emoji/apple/pensive.png and b/public/images/emoji/apple/pensive.png differ
diff --git a/public/images/emoji/apple/performing_arts.png b/public/images/emoji/apple/performing_arts.png
index 0b40da7f012..4506f271b2e 100644
Binary files a/public/images/emoji/apple/performing_arts.png and b/public/images/emoji/apple/performing_arts.png differ
diff --git a/public/images/emoji/apple/persevere.png b/public/images/emoji/apple/persevere.png
index d300caafad8..6f1c4803dee 100644
Binary files a/public/images/emoji/apple/persevere.png and b/public/images/emoji/apple/persevere.png differ
diff --git a/public/images/emoji/apple/person_climbing.png b/public/images/emoji/apple/person_climbing.png
index d8a6229d6b9..bc52713eb75 100644
Binary files a/public/images/emoji/apple/person_climbing.png and b/public/images/emoji/apple/person_climbing.png differ
diff --git a/public/images/emoji/apple/person_climbing/2.png b/public/images/emoji/apple/person_climbing/2.png
index 71330d66a8c..2fe7f4414c1 100644
Binary files a/public/images/emoji/apple/person_climbing/2.png and b/public/images/emoji/apple/person_climbing/2.png differ
diff --git a/public/images/emoji/apple/person_climbing/3.png b/public/images/emoji/apple/person_climbing/3.png
index a1345ecbd25..dcf84dd3742 100644
Binary files a/public/images/emoji/apple/person_climbing/3.png and b/public/images/emoji/apple/person_climbing/3.png differ
diff --git a/public/images/emoji/apple/person_climbing/4.png b/public/images/emoji/apple/person_climbing/4.png
index 016b920bcde..9f09667a944 100644
Binary files a/public/images/emoji/apple/person_climbing/4.png and b/public/images/emoji/apple/person_climbing/4.png differ
diff --git a/public/images/emoji/apple/person_climbing/5.png b/public/images/emoji/apple/person_climbing/5.png
index 4591eb52904..a07619cb311 100644
Binary files a/public/images/emoji/apple/person_climbing/5.png and b/public/images/emoji/apple/person_climbing/5.png differ
diff --git a/public/images/emoji/apple/person_climbing/6.png b/public/images/emoji/apple/person_climbing/6.png
index 19be3236ae9..00481e998f7 100644
Binary files a/public/images/emoji/apple/person_climbing/6.png and b/public/images/emoji/apple/person_climbing/6.png differ
diff --git a/public/images/emoji/apple/person_fencing.png b/public/images/emoji/apple/person_fencing.png
index 38293ffc2b2..4b04e8e9c30 100644
Binary files a/public/images/emoji/apple/person_fencing.png and b/public/images/emoji/apple/person_fencing.png differ
diff --git a/public/images/emoji/apple/person_frowning.png b/public/images/emoji/apple/person_frowning.png
index d06a0aa7333..2b60bebc470 100644
Binary files a/public/images/emoji/apple/person_frowning.png and b/public/images/emoji/apple/person_frowning.png differ
diff --git a/public/images/emoji/apple/person_frowning/2.png b/public/images/emoji/apple/person_frowning/2.png
index aa34de20948..88d597918b3 100644
Binary files a/public/images/emoji/apple/person_frowning/2.png and b/public/images/emoji/apple/person_frowning/2.png differ
diff --git a/public/images/emoji/apple/person_frowning/3.png b/public/images/emoji/apple/person_frowning/3.png
index 638e52f05c7..a5184a96fff 100644
Binary files a/public/images/emoji/apple/person_frowning/3.png and b/public/images/emoji/apple/person_frowning/3.png differ
diff --git a/public/images/emoji/apple/person_frowning/4.png b/public/images/emoji/apple/person_frowning/4.png
index 25be6800ca3..4b02d78f8d0 100644
Binary files a/public/images/emoji/apple/person_frowning/4.png and b/public/images/emoji/apple/person_frowning/4.png differ
diff --git a/public/images/emoji/apple/person_frowning/5.png b/public/images/emoji/apple/person_frowning/5.png
index b9efb3d134c..5ca0232347a 100644
Binary files a/public/images/emoji/apple/person_frowning/5.png and b/public/images/emoji/apple/person_frowning/5.png differ
diff --git a/public/images/emoji/apple/person_frowning/6.png b/public/images/emoji/apple/person_frowning/6.png
index f5485b28439..c61a86b7fe4 100644
Binary files a/public/images/emoji/apple/person_frowning/6.png and b/public/images/emoji/apple/person_frowning/6.png differ
diff --git a/public/images/emoji/apple/person_in_lotus_position.png b/public/images/emoji/apple/person_in_lotus_position.png
index e9404fd5255..7fd1c2ff712 100644
Binary files a/public/images/emoji/apple/person_in_lotus_position.png and b/public/images/emoji/apple/person_in_lotus_position.png differ
diff --git a/public/images/emoji/apple/person_in_lotus_position/2.png b/public/images/emoji/apple/person_in_lotus_position/2.png
index 8817578cf09..2ef8ec5a0a5 100644
Binary files a/public/images/emoji/apple/person_in_lotus_position/2.png and b/public/images/emoji/apple/person_in_lotus_position/2.png differ
diff --git a/public/images/emoji/apple/person_in_lotus_position/3.png b/public/images/emoji/apple/person_in_lotus_position/3.png
index 0e9bf46e0b6..f85900c4aa5 100644
Binary files a/public/images/emoji/apple/person_in_lotus_position/3.png and b/public/images/emoji/apple/person_in_lotus_position/3.png differ
diff --git a/public/images/emoji/apple/person_in_lotus_position/4.png b/public/images/emoji/apple/person_in_lotus_position/4.png
index 918e3d435a2..1d4d8548811 100644
Binary files a/public/images/emoji/apple/person_in_lotus_position/4.png and b/public/images/emoji/apple/person_in_lotus_position/4.png differ
diff --git a/public/images/emoji/apple/person_in_lotus_position/5.png b/public/images/emoji/apple/person_in_lotus_position/5.png
index 0c01143530e..8f81d00909a 100644
Binary files a/public/images/emoji/apple/person_in_lotus_position/5.png and b/public/images/emoji/apple/person_in_lotus_position/5.png differ
diff --git a/public/images/emoji/apple/person_in_lotus_position/6.png b/public/images/emoji/apple/person_in_lotus_position/6.png
index fed226dac29..dd83d11f7ca 100644
Binary files a/public/images/emoji/apple/person_in_lotus_position/6.png and b/public/images/emoji/apple/person_in_lotus_position/6.png differ
diff --git a/public/images/emoji/apple/person_in_steamy_room.png b/public/images/emoji/apple/person_in_steamy_room.png
index 65a0790d926..c5f4810d107 100644
Binary files a/public/images/emoji/apple/person_in_steamy_room.png and b/public/images/emoji/apple/person_in_steamy_room.png differ
diff --git a/public/images/emoji/apple/person_in_steamy_room/2.png b/public/images/emoji/apple/person_in_steamy_room/2.png
index 7260df1d154..f59df005beb 100644
Binary files a/public/images/emoji/apple/person_in_steamy_room/2.png and b/public/images/emoji/apple/person_in_steamy_room/2.png differ
diff --git a/public/images/emoji/apple/person_in_steamy_room/3.png b/public/images/emoji/apple/person_in_steamy_room/3.png
index d14580a3db3..7c467e3f6ca 100644
Binary files a/public/images/emoji/apple/person_in_steamy_room/3.png and b/public/images/emoji/apple/person_in_steamy_room/3.png differ
diff --git a/public/images/emoji/apple/person_in_steamy_room/4.png b/public/images/emoji/apple/person_in_steamy_room/4.png
index 9313ab2116b..16a7439221d 100644
Binary files a/public/images/emoji/apple/person_in_steamy_room/4.png and b/public/images/emoji/apple/person_in_steamy_room/4.png differ
diff --git a/public/images/emoji/apple/person_in_steamy_room/5.png b/public/images/emoji/apple/person_in_steamy_room/5.png
index f432b554b37..2cf136ecdcc 100644
Binary files a/public/images/emoji/apple/person_in_steamy_room/5.png and b/public/images/emoji/apple/person_in_steamy_room/5.png differ
diff --git a/public/images/emoji/apple/person_in_steamy_room/6.png b/public/images/emoji/apple/person_in_steamy_room/6.png
index dc7087e0284..2fdcf42fc33 100644
Binary files a/public/images/emoji/apple/person_in_steamy_room/6.png and b/public/images/emoji/apple/person_in_steamy_room/6.png differ
diff --git a/public/images/emoji/apple/person_with_ball.png b/public/images/emoji/apple/person_with_ball.png
index 2476fa9f0cb..4042beb4cf9 100644
Binary files a/public/images/emoji/apple/person_with_ball.png and b/public/images/emoji/apple/person_with_ball.png differ
diff --git a/public/images/emoji/apple/person_with_ball/2.png b/public/images/emoji/apple/person_with_ball/2.png
index dbec120de00..0b3d7dd7007 100644
Binary files a/public/images/emoji/apple/person_with_ball/2.png and b/public/images/emoji/apple/person_with_ball/2.png differ
diff --git a/public/images/emoji/apple/person_with_ball/3.png b/public/images/emoji/apple/person_with_ball/3.png
index a9ccd274623..86a756adcd2 100644
Binary files a/public/images/emoji/apple/person_with_ball/3.png and b/public/images/emoji/apple/person_with_ball/3.png differ
diff --git a/public/images/emoji/apple/person_with_ball/4.png b/public/images/emoji/apple/person_with_ball/4.png
index 079cd2a900b..346d2717f04 100644
Binary files a/public/images/emoji/apple/person_with_ball/4.png and b/public/images/emoji/apple/person_with_ball/4.png differ
diff --git a/public/images/emoji/apple/person_with_ball/5.png b/public/images/emoji/apple/person_with_ball/5.png
index 905f5af468e..a81c9535e2f 100644
Binary files a/public/images/emoji/apple/person_with_ball/5.png and b/public/images/emoji/apple/person_with_ball/5.png differ
diff --git a/public/images/emoji/apple/person_with_ball/6.png b/public/images/emoji/apple/person_with_ball/6.png
index c03789f5d05..2e7dd95ce85 100644
Binary files a/public/images/emoji/apple/person_with_ball/6.png and b/public/images/emoji/apple/person_with_ball/6.png differ
diff --git a/public/images/emoji/apple/person_with_blond_hair.png b/public/images/emoji/apple/person_with_blond_hair.png
index 005aeefedaa..3e55c236bd5 100644
Binary files a/public/images/emoji/apple/person_with_blond_hair.png and b/public/images/emoji/apple/person_with_blond_hair.png differ
diff --git a/public/images/emoji/apple/person_with_blond_hair/2.png b/public/images/emoji/apple/person_with_blond_hair/2.png
index 9e43423fdb2..37485d0441d 100644
Binary files a/public/images/emoji/apple/person_with_blond_hair/2.png and b/public/images/emoji/apple/person_with_blond_hair/2.png differ
diff --git a/public/images/emoji/apple/person_with_blond_hair/3.png b/public/images/emoji/apple/person_with_blond_hair/3.png
index b36f1a69db6..bf476cdb356 100644
Binary files a/public/images/emoji/apple/person_with_blond_hair/3.png and b/public/images/emoji/apple/person_with_blond_hair/3.png differ
diff --git a/public/images/emoji/apple/person_with_blond_hair/4.png b/public/images/emoji/apple/person_with_blond_hair/4.png
index 901dfcaa062..ce20be9d4ad 100644
Binary files a/public/images/emoji/apple/person_with_blond_hair/4.png and b/public/images/emoji/apple/person_with_blond_hair/4.png differ
diff --git a/public/images/emoji/apple/person_with_blond_hair/5.png b/public/images/emoji/apple/person_with_blond_hair/5.png
index 5aaa84154a1..27081164a48 100644
Binary files a/public/images/emoji/apple/person_with_blond_hair/5.png and b/public/images/emoji/apple/person_with_blond_hair/5.png differ
diff --git a/public/images/emoji/apple/person_with_blond_hair/6.png b/public/images/emoji/apple/person_with_blond_hair/6.png
index 261b2470e3b..0f1f88f9d42 100644
Binary files a/public/images/emoji/apple/person_with_blond_hair/6.png and b/public/images/emoji/apple/person_with_blond_hair/6.png differ
diff --git a/public/images/emoji/apple/person_with_pouting_face.png b/public/images/emoji/apple/person_with_pouting_face.png
index 48baa70cd72..a77fc1af3d3 100644
Binary files a/public/images/emoji/apple/person_with_pouting_face.png and b/public/images/emoji/apple/person_with_pouting_face.png differ
diff --git a/public/images/emoji/apple/person_with_pouting_face/2.png b/public/images/emoji/apple/person_with_pouting_face/2.png
index afaf1da3bc7..896dbb5d002 100644
Binary files a/public/images/emoji/apple/person_with_pouting_face/2.png and b/public/images/emoji/apple/person_with_pouting_face/2.png differ
diff --git a/public/images/emoji/apple/person_with_pouting_face/3.png b/public/images/emoji/apple/person_with_pouting_face/3.png
index fd78d2ab4de..3238106c9d1 100644
Binary files a/public/images/emoji/apple/person_with_pouting_face/3.png and b/public/images/emoji/apple/person_with_pouting_face/3.png differ
diff --git a/public/images/emoji/apple/person_with_pouting_face/4.png b/public/images/emoji/apple/person_with_pouting_face/4.png
index 3f525031d92..553a00ac9ee 100644
Binary files a/public/images/emoji/apple/person_with_pouting_face/4.png and b/public/images/emoji/apple/person_with_pouting_face/4.png differ
diff --git a/public/images/emoji/apple/person_with_pouting_face/5.png b/public/images/emoji/apple/person_with_pouting_face/5.png
index bf7bacdb73d..2fea3053878 100644
Binary files a/public/images/emoji/apple/person_with_pouting_face/5.png and b/public/images/emoji/apple/person_with_pouting_face/5.png differ
diff --git a/public/images/emoji/apple/person_with_pouting_face/6.png b/public/images/emoji/apple/person_with_pouting_face/6.png
index dbe2ffeb2ed..4ac3507c73a 100644
Binary files a/public/images/emoji/apple/person_with_pouting_face/6.png and b/public/images/emoji/apple/person_with_pouting_face/6.png differ
diff --git a/public/images/emoji/apple/peru.png b/public/images/emoji/apple/peru.png
index c4c3cf63fe8..620e9fbbb71 100644
Binary files a/public/images/emoji/apple/peru.png and b/public/images/emoji/apple/peru.png differ
diff --git a/public/images/emoji/apple/philippines.png b/public/images/emoji/apple/philippines.png
index 8059dccef1f..1af28b18387 100644
Binary files a/public/images/emoji/apple/philippines.png and b/public/images/emoji/apple/philippines.png differ
diff --git a/public/images/emoji/apple/phone.png b/public/images/emoji/apple/phone.png
index 60538e87700..6a3d60a5137 100644
Binary files a/public/images/emoji/apple/phone.png and b/public/images/emoji/apple/phone.png differ
diff --git a/public/images/emoji/apple/pick.png b/public/images/emoji/apple/pick.png
index 1cd6abf5505..3913a9f5a33 100644
Binary files a/public/images/emoji/apple/pick.png and b/public/images/emoji/apple/pick.png differ
diff --git a/public/images/emoji/apple/pie.png b/public/images/emoji/apple/pie.png
index 4f5f474d82c..6f2ac580e20 100644
Binary files a/public/images/emoji/apple/pie.png and b/public/images/emoji/apple/pie.png differ
diff --git a/public/images/emoji/apple/pig.png b/public/images/emoji/apple/pig.png
index d124fd7b8f6..5082cfda706 100644
Binary files a/public/images/emoji/apple/pig.png and b/public/images/emoji/apple/pig.png differ
diff --git a/public/images/emoji/apple/pig2.png b/public/images/emoji/apple/pig2.png
index 0a32a4668cc..4f27b2afabf 100644
Binary files a/public/images/emoji/apple/pig2.png and b/public/images/emoji/apple/pig2.png differ
diff --git a/public/images/emoji/apple/pig_nose.png b/public/images/emoji/apple/pig_nose.png
index 184594644f9..7d543f380d3 100644
Binary files a/public/images/emoji/apple/pig_nose.png and b/public/images/emoji/apple/pig_nose.png differ
diff --git a/public/images/emoji/apple/pill.png b/public/images/emoji/apple/pill.png
index 419fc999d68..d40d502a89d 100644
Binary files a/public/images/emoji/apple/pill.png and b/public/images/emoji/apple/pill.png differ
diff --git a/public/images/emoji/apple/pineapple.png b/public/images/emoji/apple/pineapple.png
index 28a1a8803f6..65fbde2a083 100644
Binary files a/public/images/emoji/apple/pineapple.png and b/public/images/emoji/apple/pineapple.png differ
diff --git a/public/images/emoji/apple/ping_pong.png b/public/images/emoji/apple/ping_pong.png
index 26d40fa9205..4d7e496e4a0 100644
Binary files a/public/images/emoji/apple/ping_pong.png and b/public/images/emoji/apple/ping_pong.png differ
diff --git a/public/images/emoji/apple/pisces.png b/public/images/emoji/apple/pisces.png
index 3101dec9df2..51055ec9dae 100644
Binary files a/public/images/emoji/apple/pisces.png and b/public/images/emoji/apple/pisces.png differ
diff --git a/public/images/emoji/apple/pitcairn_islands.png b/public/images/emoji/apple/pitcairn_islands.png
index 971137f5b58..98b20059d55 100644
Binary files a/public/images/emoji/apple/pitcairn_islands.png and b/public/images/emoji/apple/pitcairn_islands.png differ
diff --git a/public/images/emoji/apple/pizza.png b/public/images/emoji/apple/pizza.png
index 13d8433a354..635bce9f8a0 100644
Binary files a/public/images/emoji/apple/pizza.png and b/public/images/emoji/apple/pizza.png differ
diff --git a/public/images/emoji/apple/place_of_worship.png b/public/images/emoji/apple/place_of_worship.png
index c8e1cecd396..eb6997ca4ea 100644
Binary files a/public/images/emoji/apple/place_of_worship.png and b/public/images/emoji/apple/place_of_worship.png differ
diff --git a/public/images/emoji/apple/plate_with_cutlery.png b/public/images/emoji/apple/plate_with_cutlery.png
index 54bd5dc10a4..d21ca8c74d5 100644
Binary files a/public/images/emoji/apple/plate_with_cutlery.png and b/public/images/emoji/apple/plate_with_cutlery.png differ
diff --git a/public/images/emoji/apple/play_or_pause_button.png b/public/images/emoji/apple/play_or_pause_button.png
index 9eb4c375bc9..3e3fccf5e92 100644
Binary files a/public/images/emoji/apple/play_or_pause_button.png and b/public/images/emoji/apple/play_or_pause_button.png differ
diff --git a/public/images/emoji/apple/play_pause.png b/public/images/emoji/apple/play_pause.png
index 9eb4c375bc9..3e3fccf5e92 100644
Binary files a/public/images/emoji/apple/play_pause.png and b/public/images/emoji/apple/play_pause.png differ
diff --git a/public/images/emoji/apple/point_down.png b/public/images/emoji/apple/point_down.png
index 572a145a287..2cc53a315d3 100644
Binary files a/public/images/emoji/apple/point_down.png and b/public/images/emoji/apple/point_down.png differ
diff --git a/public/images/emoji/apple/point_down/2.png b/public/images/emoji/apple/point_down/2.png
index 8ce6dcdeba4..640ee707c33 100644
Binary files a/public/images/emoji/apple/point_down/2.png and b/public/images/emoji/apple/point_down/2.png differ
diff --git a/public/images/emoji/apple/point_down/3.png b/public/images/emoji/apple/point_down/3.png
index 666127f3469..79ec0441c52 100644
Binary files a/public/images/emoji/apple/point_down/3.png and b/public/images/emoji/apple/point_down/3.png differ
diff --git a/public/images/emoji/apple/point_down/4.png b/public/images/emoji/apple/point_down/4.png
index e54187bc55e..04265136278 100644
Binary files a/public/images/emoji/apple/point_down/4.png and b/public/images/emoji/apple/point_down/4.png differ
diff --git a/public/images/emoji/apple/point_down/5.png b/public/images/emoji/apple/point_down/5.png
index a45feddac88..77271968525 100644
Binary files a/public/images/emoji/apple/point_down/5.png and b/public/images/emoji/apple/point_down/5.png differ
diff --git a/public/images/emoji/apple/point_down/6.png b/public/images/emoji/apple/point_down/6.png
index 19143c345f0..10c1e1a880a 100644
Binary files a/public/images/emoji/apple/point_down/6.png and b/public/images/emoji/apple/point_down/6.png differ
diff --git a/public/images/emoji/apple/point_left.png b/public/images/emoji/apple/point_left.png
index 32e16ba611b..941d65a05c0 100644
Binary files a/public/images/emoji/apple/point_left.png and b/public/images/emoji/apple/point_left.png differ
diff --git a/public/images/emoji/apple/point_left/2.png b/public/images/emoji/apple/point_left/2.png
index 25757b17324..abd841681dc 100644
Binary files a/public/images/emoji/apple/point_left/2.png and b/public/images/emoji/apple/point_left/2.png differ
diff --git a/public/images/emoji/apple/point_left/3.png b/public/images/emoji/apple/point_left/3.png
index d8870f6fdac..519058369b6 100644
Binary files a/public/images/emoji/apple/point_left/3.png and b/public/images/emoji/apple/point_left/3.png differ
diff --git a/public/images/emoji/apple/point_left/4.png b/public/images/emoji/apple/point_left/4.png
index 1806237eb22..d02fbcecf56 100644
Binary files a/public/images/emoji/apple/point_left/4.png and b/public/images/emoji/apple/point_left/4.png differ
diff --git a/public/images/emoji/apple/point_left/5.png b/public/images/emoji/apple/point_left/5.png
index ef6da3f3cc1..4f39768c71b 100644
Binary files a/public/images/emoji/apple/point_left/5.png and b/public/images/emoji/apple/point_left/5.png differ
diff --git a/public/images/emoji/apple/point_left/6.png b/public/images/emoji/apple/point_left/6.png
index c5145d2019e..9c1f7f72d17 100644
Binary files a/public/images/emoji/apple/point_left/6.png and b/public/images/emoji/apple/point_left/6.png differ
diff --git a/public/images/emoji/apple/point_right.png b/public/images/emoji/apple/point_right.png
index 84de2651a45..ed9e93cc155 100644
Binary files a/public/images/emoji/apple/point_right.png and b/public/images/emoji/apple/point_right.png differ
diff --git a/public/images/emoji/apple/point_right/2.png b/public/images/emoji/apple/point_right/2.png
index 62f00a7a6fb..a86d1134c61 100644
Binary files a/public/images/emoji/apple/point_right/2.png and b/public/images/emoji/apple/point_right/2.png differ
diff --git a/public/images/emoji/apple/point_right/3.png b/public/images/emoji/apple/point_right/3.png
index 7917a13842a..5981646e6fa 100644
Binary files a/public/images/emoji/apple/point_right/3.png and b/public/images/emoji/apple/point_right/3.png differ
diff --git a/public/images/emoji/apple/point_right/4.png b/public/images/emoji/apple/point_right/4.png
index 9b7fffdb429..053734a7a88 100644
Binary files a/public/images/emoji/apple/point_right/4.png and b/public/images/emoji/apple/point_right/4.png differ
diff --git a/public/images/emoji/apple/point_right/5.png b/public/images/emoji/apple/point_right/5.png
index d9f0768c660..f0c5f31b17e 100644
Binary files a/public/images/emoji/apple/point_right/5.png and b/public/images/emoji/apple/point_right/5.png differ
diff --git a/public/images/emoji/apple/point_right/6.png b/public/images/emoji/apple/point_right/6.png
index 001d1dbcdc9..4ab2e7854a6 100644
Binary files a/public/images/emoji/apple/point_right/6.png and b/public/images/emoji/apple/point_right/6.png differ
diff --git a/public/images/emoji/apple/point_up.png b/public/images/emoji/apple/point_up.png
index 75c81795df9..e39b654b807 100644
Binary files a/public/images/emoji/apple/point_up.png and b/public/images/emoji/apple/point_up.png differ
diff --git a/public/images/emoji/apple/point_up/2.png b/public/images/emoji/apple/point_up/2.png
index 7d1e85ae365..a4469b57a1b 100644
Binary files a/public/images/emoji/apple/point_up/2.png and b/public/images/emoji/apple/point_up/2.png differ
diff --git a/public/images/emoji/apple/point_up/3.png b/public/images/emoji/apple/point_up/3.png
index be661ba35a0..a975689b5ab 100644
Binary files a/public/images/emoji/apple/point_up/3.png and b/public/images/emoji/apple/point_up/3.png differ
diff --git a/public/images/emoji/apple/point_up/4.png b/public/images/emoji/apple/point_up/4.png
index 8e8818d005e..7066db36014 100644
Binary files a/public/images/emoji/apple/point_up/4.png and b/public/images/emoji/apple/point_up/4.png differ
diff --git a/public/images/emoji/apple/point_up/5.png b/public/images/emoji/apple/point_up/5.png
index d85940f9dbd..e035fc23607 100644
Binary files a/public/images/emoji/apple/point_up/5.png and b/public/images/emoji/apple/point_up/5.png differ
diff --git a/public/images/emoji/apple/point_up/6.png b/public/images/emoji/apple/point_up/6.png
index 86c38835ea7..795a1754b4b 100644
Binary files a/public/images/emoji/apple/point_up/6.png and b/public/images/emoji/apple/point_up/6.png differ
diff --git a/public/images/emoji/apple/point_up_2.png b/public/images/emoji/apple/point_up_2.png
index 3a2b1e5f428..1202a959a4c 100644
Binary files a/public/images/emoji/apple/point_up_2.png and b/public/images/emoji/apple/point_up_2.png differ
diff --git a/public/images/emoji/apple/point_up_2/2.png b/public/images/emoji/apple/point_up_2/2.png
index dc15fc83d4a..e3eebed1e2f 100644
Binary files a/public/images/emoji/apple/point_up_2/2.png and b/public/images/emoji/apple/point_up_2/2.png differ
diff --git a/public/images/emoji/apple/point_up_2/3.png b/public/images/emoji/apple/point_up_2/3.png
index c064485f4fa..90a9b18ca42 100644
Binary files a/public/images/emoji/apple/point_up_2/3.png and b/public/images/emoji/apple/point_up_2/3.png differ
diff --git a/public/images/emoji/apple/point_up_2/4.png b/public/images/emoji/apple/point_up_2/4.png
index 65a4b98ad19..c52c7c860b1 100644
Binary files a/public/images/emoji/apple/point_up_2/4.png and b/public/images/emoji/apple/point_up_2/4.png differ
diff --git a/public/images/emoji/apple/point_up_2/5.png b/public/images/emoji/apple/point_up_2/5.png
index 3c4f31d2055..45e0ffd23db 100644
Binary files a/public/images/emoji/apple/point_up_2/5.png and b/public/images/emoji/apple/point_up_2/5.png differ
diff --git a/public/images/emoji/apple/point_up_2/6.png b/public/images/emoji/apple/point_up_2/6.png
index 48ed3f567bf..0315149d6f6 100644
Binary files a/public/images/emoji/apple/point_up_2/6.png and b/public/images/emoji/apple/point_up_2/6.png differ
diff --git a/public/images/emoji/apple/poland.png b/public/images/emoji/apple/poland.png
index e2fcd6dce57..dd45cbeb787 100644
Binary files a/public/images/emoji/apple/poland.png and b/public/images/emoji/apple/poland.png differ
diff --git a/public/images/emoji/apple/police_car.png b/public/images/emoji/apple/police_car.png
index a45562b4bce..3ce15de9dee 100644
Binary files a/public/images/emoji/apple/police_car.png and b/public/images/emoji/apple/police_car.png differ
diff --git a/public/images/emoji/apple/policeman.png b/public/images/emoji/apple/policeman.png
index 78591caa50b..07cb11ea32d 100644
Binary files a/public/images/emoji/apple/policeman.png and b/public/images/emoji/apple/policeman.png differ
diff --git a/public/images/emoji/apple/policeman/2.png b/public/images/emoji/apple/policeman/2.png
index 63db5721c18..90dc09122b1 100644
Binary files a/public/images/emoji/apple/policeman/2.png and b/public/images/emoji/apple/policeman/2.png differ
diff --git a/public/images/emoji/apple/policeman/3.png b/public/images/emoji/apple/policeman/3.png
index 7922a9dd3dc..26bb86e2ce6 100644
Binary files a/public/images/emoji/apple/policeman/3.png and b/public/images/emoji/apple/policeman/3.png differ
diff --git a/public/images/emoji/apple/policeman/4.png b/public/images/emoji/apple/policeman/4.png
index 16292b3eb0f..9b6c2745016 100644
Binary files a/public/images/emoji/apple/policeman/4.png and b/public/images/emoji/apple/policeman/4.png differ
diff --git a/public/images/emoji/apple/policeman/5.png b/public/images/emoji/apple/policeman/5.png
index 41cdd83a946..62d7223095d 100644
Binary files a/public/images/emoji/apple/policeman/5.png and b/public/images/emoji/apple/policeman/5.png differ
diff --git a/public/images/emoji/apple/policeman/6.png b/public/images/emoji/apple/policeman/6.png
index e2ce8f11b51..247d6c086d4 100644
Binary files a/public/images/emoji/apple/policeman/6.png and b/public/images/emoji/apple/policeman/6.png differ
diff --git a/public/images/emoji/apple/policewoman.png b/public/images/emoji/apple/policewoman.png
index 25c6e2edd8b..057113cad45 100644
Binary files a/public/images/emoji/apple/policewoman.png and b/public/images/emoji/apple/policewoman.png differ
diff --git a/public/images/emoji/apple/policewoman/2.png b/public/images/emoji/apple/policewoman/2.png
index 6a639ef226d..9101fbca9a7 100644
Binary files a/public/images/emoji/apple/policewoman/2.png and b/public/images/emoji/apple/policewoman/2.png differ
diff --git a/public/images/emoji/apple/policewoman/3.png b/public/images/emoji/apple/policewoman/3.png
index fbc5b41c907..2f6014edccf 100644
Binary files a/public/images/emoji/apple/policewoman/3.png and b/public/images/emoji/apple/policewoman/3.png differ
diff --git a/public/images/emoji/apple/policewoman/4.png b/public/images/emoji/apple/policewoman/4.png
index 35b15014709..7261b863deb 100644
Binary files a/public/images/emoji/apple/policewoman/4.png and b/public/images/emoji/apple/policewoman/4.png differ
diff --git a/public/images/emoji/apple/policewoman/5.png b/public/images/emoji/apple/policewoman/5.png
index 504fc56fdb8..f49b0e54f7d 100644
Binary files a/public/images/emoji/apple/policewoman/5.png and b/public/images/emoji/apple/policewoman/5.png differ
diff --git a/public/images/emoji/apple/policewoman/6.png b/public/images/emoji/apple/policewoman/6.png
index dc46fe34ad8..613c25d7663 100644
Binary files a/public/images/emoji/apple/policewoman/6.png and b/public/images/emoji/apple/policewoman/6.png differ
diff --git a/public/images/emoji/apple/poo.png b/public/images/emoji/apple/poo.png
index a025f430028..079c223fd3a 100644
Binary files a/public/images/emoji/apple/poo.png and b/public/images/emoji/apple/poo.png differ
diff --git a/public/images/emoji/apple/poodle.png b/public/images/emoji/apple/poodle.png
index 86bd66154fa..92279c6be85 100644
Binary files a/public/images/emoji/apple/poodle.png and b/public/images/emoji/apple/poodle.png differ
diff --git a/public/images/emoji/apple/poop.png b/public/images/emoji/apple/poop.png
index a025f430028..079c223fd3a 100644
Binary files a/public/images/emoji/apple/poop.png and b/public/images/emoji/apple/poop.png differ
diff --git a/public/images/emoji/apple/popcorn.png b/public/images/emoji/apple/popcorn.png
index 58bb4045823..f4dfb72991c 100644
Binary files a/public/images/emoji/apple/popcorn.png and b/public/images/emoji/apple/popcorn.png differ
diff --git a/public/images/emoji/apple/portugal.png b/public/images/emoji/apple/portugal.png
index 6df64adaacb..29f73fbe7d9 100644
Binary files a/public/images/emoji/apple/portugal.png and b/public/images/emoji/apple/portugal.png differ
diff --git a/public/images/emoji/apple/post_office.png b/public/images/emoji/apple/post_office.png
index 53704929e23..df75be4c798 100644
Binary files a/public/images/emoji/apple/post_office.png and b/public/images/emoji/apple/post_office.png differ
diff --git a/public/images/emoji/apple/postal_horn.png b/public/images/emoji/apple/postal_horn.png
index 5360c36fef5..4edf54b00bd 100644
Binary files a/public/images/emoji/apple/postal_horn.png and b/public/images/emoji/apple/postal_horn.png differ
diff --git a/public/images/emoji/apple/postbox.png b/public/images/emoji/apple/postbox.png
index 789fbf83eb5..5fa9f94cac2 100644
Binary files a/public/images/emoji/apple/postbox.png and b/public/images/emoji/apple/postbox.png differ
diff --git a/public/images/emoji/apple/potable_water.png b/public/images/emoji/apple/potable_water.png
index 9be9f1d272e..db14e79e63b 100644
Binary files a/public/images/emoji/apple/potable_water.png and b/public/images/emoji/apple/potable_water.png differ
diff --git a/public/images/emoji/apple/potato.png b/public/images/emoji/apple/potato.png
index 3ce42b23961..5460d506d7b 100644
Binary files a/public/images/emoji/apple/potato.png and b/public/images/emoji/apple/potato.png differ
diff --git a/public/images/emoji/apple/pouch.png b/public/images/emoji/apple/pouch.png
index b052acbdbe8..50660080553 100644
Binary files a/public/images/emoji/apple/pouch.png and b/public/images/emoji/apple/pouch.png differ
diff --git a/public/images/emoji/apple/poultry_leg.png b/public/images/emoji/apple/poultry_leg.png
index f18565b513b..f9a7066d0a8 100644
Binary files a/public/images/emoji/apple/poultry_leg.png and b/public/images/emoji/apple/poultry_leg.png differ
diff --git a/public/images/emoji/apple/pound.png b/public/images/emoji/apple/pound.png
index 4ae46e379cd..4ce0fcb7321 100644
Binary files a/public/images/emoji/apple/pound.png and b/public/images/emoji/apple/pound.png differ
diff --git a/public/images/emoji/apple/pouting_cat.png b/public/images/emoji/apple/pouting_cat.png
index f885063e910..af4e62b87f7 100644
Binary files a/public/images/emoji/apple/pouting_cat.png and b/public/images/emoji/apple/pouting_cat.png differ
diff --git a/public/images/emoji/apple/pouting_man.png b/public/images/emoji/apple/pouting_man.png
index da4378f1ca9..134cd425613 100644
Binary files a/public/images/emoji/apple/pouting_man.png and b/public/images/emoji/apple/pouting_man.png differ
diff --git a/public/images/emoji/apple/pouting_man/2.png b/public/images/emoji/apple/pouting_man/2.png
index 3709015052c..0d6b3a9b7bd 100644
Binary files a/public/images/emoji/apple/pouting_man/2.png and b/public/images/emoji/apple/pouting_man/2.png differ
diff --git a/public/images/emoji/apple/pouting_man/3.png b/public/images/emoji/apple/pouting_man/3.png
index 575b0d548c1..f54b26d1af6 100644
Binary files a/public/images/emoji/apple/pouting_man/3.png and b/public/images/emoji/apple/pouting_man/3.png differ
diff --git a/public/images/emoji/apple/pouting_man/4.png b/public/images/emoji/apple/pouting_man/4.png
index 874ed1a246d..3fa5f9bae03 100644
Binary files a/public/images/emoji/apple/pouting_man/4.png and b/public/images/emoji/apple/pouting_man/4.png differ
diff --git a/public/images/emoji/apple/pouting_man/5.png b/public/images/emoji/apple/pouting_man/5.png
index b2e792cb09c..b483b2cc392 100644
Binary files a/public/images/emoji/apple/pouting_man/5.png and b/public/images/emoji/apple/pouting_man/5.png differ
diff --git a/public/images/emoji/apple/pouting_man/6.png b/public/images/emoji/apple/pouting_man/6.png
index 43e49775265..f8ad3580507 100644
Binary files a/public/images/emoji/apple/pouting_man/6.png and b/public/images/emoji/apple/pouting_man/6.png differ
diff --git a/public/images/emoji/apple/pouting_woman.png b/public/images/emoji/apple/pouting_woman.png
index 48baa70cd72..a77fc1af3d3 100644
Binary files a/public/images/emoji/apple/pouting_woman.png and b/public/images/emoji/apple/pouting_woman.png differ
diff --git a/public/images/emoji/apple/pouting_woman/2.png b/public/images/emoji/apple/pouting_woman/2.png
index afaf1da3bc7..896dbb5d002 100644
Binary files a/public/images/emoji/apple/pouting_woman/2.png and b/public/images/emoji/apple/pouting_woman/2.png differ
diff --git a/public/images/emoji/apple/pouting_woman/3.png b/public/images/emoji/apple/pouting_woman/3.png
index fd78d2ab4de..3238106c9d1 100644
Binary files a/public/images/emoji/apple/pouting_woman/3.png and b/public/images/emoji/apple/pouting_woman/3.png differ
diff --git a/public/images/emoji/apple/pouting_woman/4.png b/public/images/emoji/apple/pouting_woman/4.png
index 3f525031d92..553a00ac9ee 100644
Binary files a/public/images/emoji/apple/pouting_woman/4.png and b/public/images/emoji/apple/pouting_woman/4.png differ
diff --git a/public/images/emoji/apple/pouting_woman/5.png b/public/images/emoji/apple/pouting_woman/5.png
index bf7bacdb73d..2fea3053878 100644
Binary files a/public/images/emoji/apple/pouting_woman/5.png and b/public/images/emoji/apple/pouting_woman/5.png differ
diff --git a/public/images/emoji/apple/pouting_woman/6.png b/public/images/emoji/apple/pouting_woman/6.png
index dbe2ffeb2ed..4ac3507c73a 100644
Binary files a/public/images/emoji/apple/pouting_woman/6.png and b/public/images/emoji/apple/pouting_woman/6.png differ
diff --git a/public/images/emoji/apple/pray.png b/public/images/emoji/apple/pray.png
index 344fc0df48d..2a5719a2b89 100644
Binary files a/public/images/emoji/apple/pray.png and b/public/images/emoji/apple/pray.png differ
diff --git a/public/images/emoji/apple/pray/2.png b/public/images/emoji/apple/pray/2.png
index 7f8fa8e3c80..ab12d8aba22 100644
Binary files a/public/images/emoji/apple/pray/2.png and b/public/images/emoji/apple/pray/2.png differ
diff --git a/public/images/emoji/apple/pray/3.png b/public/images/emoji/apple/pray/3.png
index ed1fb5987b5..40742620896 100644
Binary files a/public/images/emoji/apple/pray/3.png and b/public/images/emoji/apple/pray/3.png differ
diff --git a/public/images/emoji/apple/pray/4.png b/public/images/emoji/apple/pray/4.png
index 0037c50a878..dbb37d5c560 100644
Binary files a/public/images/emoji/apple/pray/4.png and b/public/images/emoji/apple/pray/4.png differ
diff --git a/public/images/emoji/apple/pray/5.png b/public/images/emoji/apple/pray/5.png
index 7be7121077a..7b67d0ab8b8 100644
Binary files a/public/images/emoji/apple/pray/5.png and b/public/images/emoji/apple/pray/5.png differ
diff --git a/public/images/emoji/apple/pray/6.png b/public/images/emoji/apple/pray/6.png
index 171e9171e79..2ec282a652f 100644
Binary files a/public/images/emoji/apple/pray/6.png and b/public/images/emoji/apple/pray/6.png differ
diff --git a/public/images/emoji/apple/prayer_beads.png b/public/images/emoji/apple/prayer_beads.png
index 7ef58aaec7a..52e7fcc67b3 100644
Binary files a/public/images/emoji/apple/prayer_beads.png and b/public/images/emoji/apple/prayer_beads.png differ
diff --git a/public/images/emoji/apple/pregnant_woman.png b/public/images/emoji/apple/pregnant_woman.png
index 64908a8d90a..1a1313057ce 100644
Binary files a/public/images/emoji/apple/pregnant_woman.png and b/public/images/emoji/apple/pregnant_woman.png differ
diff --git a/public/images/emoji/apple/pregnant_woman/2.png b/public/images/emoji/apple/pregnant_woman/2.png
index d50b1952607..fc777c39d2d 100644
Binary files a/public/images/emoji/apple/pregnant_woman/2.png and b/public/images/emoji/apple/pregnant_woman/2.png differ
diff --git a/public/images/emoji/apple/pregnant_woman/3.png b/public/images/emoji/apple/pregnant_woman/3.png
index 97d82970974..86d3665841f 100644
Binary files a/public/images/emoji/apple/pregnant_woman/3.png and b/public/images/emoji/apple/pregnant_woman/3.png differ
diff --git a/public/images/emoji/apple/pregnant_woman/4.png b/public/images/emoji/apple/pregnant_woman/4.png
index ef17d7c6ea7..5a220d0d7bc 100644
Binary files a/public/images/emoji/apple/pregnant_woman/4.png and b/public/images/emoji/apple/pregnant_woman/4.png differ
diff --git a/public/images/emoji/apple/pregnant_woman/5.png b/public/images/emoji/apple/pregnant_woman/5.png
index b4d981d6455..68aa318b65e 100644
Binary files a/public/images/emoji/apple/pregnant_woman/5.png and b/public/images/emoji/apple/pregnant_woman/5.png differ
diff --git a/public/images/emoji/apple/pregnant_woman/6.png b/public/images/emoji/apple/pregnant_woman/6.png
index 5c1b82cb2da..753f0fc0fec 100644
Binary files a/public/images/emoji/apple/pregnant_woman/6.png and b/public/images/emoji/apple/pregnant_woman/6.png differ
diff --git a/public/images/emoji/apple/pretzel.png b/public/images/emoji/apple/pretzel.png
index 9116d6ee9a2..cff0928b864 100644
Binary files a/public/images/emoji/apple/pretzel.png and b/public/images/emoji/apple/pretzel.png differ
diff --git a/public/images/emoji/apple/previous_track.png b/public/images/emoji/apple/previous_track.png
index 881bf59b29b..4ec9e5af70f 100644
Binary files a/public/images/emoji/apple/previous_track.png and b/public/images/emoji/apple/previous_track.png differ
diff --git a/public/images/emoji/apple/previous_track_button.png b/public/images/emoji/apple/previous_track_button.png
index 881bf59b29b..4ec9e5af70f 100644
Binary files a/public/images/emoji/apple/previous_track_button.png and b/public/images/emoji/apple/previous_track_button.png differ
diff --git a/public/images/emoji/apple/prince.png b/public/images/emoji/apple/prince.png
index 5dc77f3fdc7..37375a42422 100644
Binary files a/public/images/emoji/apple/prince.png and b/public/images/emoji/apple/prince.png differ
diff --git a/public/images/emoji/apple/prince/2.png b/public/images/emoji/apple/prince/2.png
index 38a259bee47..f0bca7a07b6 100644
Binary files a/public/images/emoji/apple/prince/2.png and b/public/images/emoji/apple/prince/2.png differ
diff --git a/public/images/emoji/apple/prince/3.png b/public/images/emoji/apple/prince/3.png
index 21878b6a2b0..cdc14b600df 100644
Binary files a/public/images/emoji/apple/prince/3.png and b/public/images/emoji/apple/prince/3.png differ
diff --git a/public/images/emoji/apple/prince/4.png b/public/images/emoji/apple/prince/4.png
index 54c1aa3bc0f..4f077297323 100644
Binary files a/public/images/emoji/apple/prince/4.png and b/public/images/emoji/apple/prince/4.png differ
diff --git a/public/images/emoji/apple/prince/5.png b/public/images/emoji/apple/prince/5.png
index 108d577bf2f..e5fed086701 100644
Binary files a/public/images/emoji/apple/prince/5.png and b/public/images/emoji/apple/prince/5.png differ
diff --git a/public/images/emoji/apple/prince/6.png b/public/images/emoji/apple/prince/6.png
index 0de534fc1e9..19a0fd3fba4 100644
Binary files a/public/images/emoji/apple/prince/6.png and b/public/images/emoji/apple/prince/6.png differ
diff --git a/public/images/emoji/apple/princess.png b/public/images/emoji/apple/princess.png
index 86cb4bd51a2..0ef86ec3a43 100644
Binary files a/public/images/emoji/apple/princess.png and b/public/images/emoji/apple/princess.png differ
diff --git a/public/images/emoji/apple/princess/2.png b/public/images/emoji/apple/princess/2.png
index fd032d30e45..cb2f336f108 100644
Binary files a/public/images/emoji/apple/princess/2.png and b/public/images/emoji/apple/princess/2.png differ
diff --git a/public/images/emoji/apple/princess/3.png b/public/images/emoji/apple/princess/3.png
index 7adb956f024..6785fcd619a 100644
Binary files a/public/images/emoji/apple/princess/3.png and b/public/images/emoji/apple/princess/3.png differ
diff --git a/public/images/emoji/apple/princess/4.png b/public/images/emoji/apple/princess/4.png
index ea48b643f71..0d674c2ddd9 100644
Binary files a/public/images/emoji/apple/princess/4.png and b/public/images/emoji/apple/princess/4.png differ
diff --git a/public/images/emoji/apple/princess/5.png b/public/images/emoji/apple/princess/5.png
index 10caffb58be..0191435dd8a 100644
Binary files a/public/images/emoji/apple/princess/5.png and b/public/images/emoji/apple/princess/5.png differ
diff --git a/public/images/emoji/apple/princess/6.png b/public/images/emoji/apple/princess/6.png
index f9d5eb42c52..521b825ea43 100644
Binary files a/public/images/emoji/apple/princess/6.png and b/public/images/emoji/apple/princess/6.png differ
diff --git a/public/images/emoji/apple/printer.png b/public/images/emoji/apple/printer.png
index 3ce50192db3..3a19678091b 100644
Binary files a/public/images/emoji/apple/printer.png and b/public/images/emoji/apple/printer.png differ
diff --git a/public/images/emoji/apple/projector.png b/public/images/emoji/apple/projector.png
index add4400d044..e35cf26b53b 100644
Binary files a/public/images/emoji/apple/projector.png and b/public/images/emoji/apple/projector.png differ
diff --git a/public/images/emoji/apple/puerto_rico.png b/public/images/emoji/apple/puerto_rico.png
index 748dff18696..0178b17a4b4 100644
Binary files a/public/images/emoji/apple/puerto_rico.png and b/public/images/emoji/apple/puerto_rico.png differ
diff --git a/public/images/emoji/apple/puke.png b/public/images/emoji/apple/puke.png
new file mode 100644
index 00000000000..9fc32f1460c
Binary files /dev/null and b/public/images/emoji/apple/puke.png differ
diff --git a/public/images/emoji/apple/punch.png b/public/images/emoji/apple/punch.png
index c01cab21b58..724c3168a24 100644
Binary files a/public/images/emoji/apple/punch.png and b/public/images/emoji/apple/punch.png differ
diff --git a/public/images/emoji/apple/punch/2.png b/public/images/emoji/apple/punch/2.png
index 1c8dd8dbf32..9617eab4be6 100644
Binary files a/public/images/emoji/apple/punch/2.png and b/public/images/emoji/apple/punch/2.png differ
diff --git a/public/images/emoji/apple/punch/3.png b/public/images/emoji/apple/punch/3.png
index 39deb2c7e8c..bf547427b3b 100644
Binary files a/public/images/emoji/apple/punch/3.png and b/public/images/emoji/apple/punch/3.png differ
diff --git a/public/images/emoji/apple/punch/4.png b/public/images/emoji/apple/punch/4.png
index ef6df0b9330..2524c849868 100644
Binary files a/public/images/emoji/apple/punch/4.png and b/public/images/emoji/apple/punch/4.png differ
diff --git a/public/images/emoji/apple/punch/5.png b/public/images/emoji/apple/punch/5.png
index 8552732ad40..32768222836 100644
Binary files a/public/images/emoji/apple/punch/5.png and b/public/images/emoji/apple/punch/5.png differ
diff --git a/public/images/emoji/apple/punch/6.png b/public/images/emoji/apple/punch/6.png
index 24f4a3071ab..fb15dc0475b 100644
Binary files a/public/images/emoji/apple/punch/6.png and b/public/images/emoji/apple/punch/6.png differ
diff --git a/public/images/emoji/apple/purple_heart.png b/public/images/emoji/apple/purple_heart.png
index 6ebc2e54197..9ebe86f8974 100644
Binary files a/public/images/emoji/apple/purple_heart.png and b/public/images/emoji/apple/purple_heart.png differ
diff --git a/public/images/emoji/apple/purse.png b/public/images/emoji/apple/purse.png
index e208e933bf8..8f7d6816cb5 100644
Binary files a/public/images/emoji/apple/purse.png and b/public/images/emoji/apple/purse.png differ
diff --git a/public/images/emoji/apple/pushpin.png b/public/images/emoji/apple/pushpin.png
index ab89e75001a..76940e48f2b 100644
Binary files a/public/images/emoji/apple/pushpin.png and b/public/images/emoji/apple/pushpin.png differ
diff --git a/public/images/emoji/apple/put_litter_in_its_place.png b/public/images/emoji/apple/put_litter_in_its_place.png
index bae7da4db60..7311adf53f8 100644
Binary files a/public/images/emoji/apple/put_litter_in_its_place.png and b/public/images/emoji/apple/put_litter_in_its_place.png differ
diff --git a/public/images/emoji/apple/qatar.png b/public/images/emoji/apple/qatar.png
index c73ce36292d..5d27a2adf0c 100644
Binary files a/public/images/emoji/apple/qatar.png and b/public/images/emoji/apple/qatar.png differ
diff --git a/public/images/emoji/apple/question.png b/public/images/emoji/apple/question.png
index 6136129e083..92692ac4e8f 100644
Binary files a/public/images/emoji/apple/question.png and b/public/images/emoji/apple/question.png differ
diff --git a/public/images/emoji/apple/rabbit.png b/public/images/emoji/apple/rabbit.png
index 33cdc5e1e83..a3b815fa4fa 100644
Binary files a/public/images/emoji/apple/rabbit.png and b/public/images/emoji/apple/rabbit.png differ
diff --git a/public/images/emoji/apple/rabbit2.png b/public/images/emoji/apple/rabbit2.png
index 77ae0528f9c..125f4e1d655 100644
Binary files a/public/images/emoji/apple/rabbit2.png and b/public/images/emoji/apple/rabbit2.png differ
diff --git a/public/images/emoji/apple/race_car.png b/public/images/emoji/apple/race_car.png
index f49f95cbbdb..deb4f107718 100644
Binary files a/public/images/emoji/apple/race_car.png and b/public/images/emoji/apple/race_car.png differ
diff --git a/public/images/emoji/apple/racehorse.png b/public/images/emoji/apple/racehorse.png
index fcd23dd3009..5c8ae7d9214 100644
Binary files a/public/images/emoji/apple/racehorse.png and b/public/images/emoji/apple/racehorse.png differ
diff --git a/public/images/emoji/apple/racing_car.png b/public/images/emoji/apple/racing_car.png
index f49f95cbbdb..deb4f107718 100644
Binary files a/public/images/emoji/apple/racing_car.png and b/public/images/emoji/apple/racing_car.png differ
diff --git a/public/images/emoji/apple/racing_motorcycle.png b/public/images/emoji/apple/racing_motorcycle.png
index 4ae8f0c685c..6264237cc36 100644
Binary files a/public/images/emoji/apple/racing_motorcycle.png and b/public/images/emoji/apple/racing_motorcycle.png differ
diff --git a/public/images/emoji/apple/radio.png b/public/images/emoji/apple/radio.png
index 89a4c7f99e4..04644fce39e 100644
Binary files a/public/images/emoji/apple/radio.png and b/public/images/emoji/apple/radio.png differ
diff --git a/public/images/emoji/apple/radio_button.png b/public/images/emoji/apple/radio_button.png
index 8ef670a1148..8868cbf441a 100644
Binary files a/public/images/emoji/apple/radio_button.png and b/public/images/emoji/apple/radio_button.png differ
diff --git a/public/images/emoji/apple/radioactive.png b/public/images/emoji/apple/radioactive.png
index 377a1f98da5..4e48821dda2 100644
Binary files a/public/images/emoji/apple/radioactive.png and b/public/images/emoji/apple/radioactive.png differ
diff --git a/public/images/emoji/apple/radioactive_sign.png b/public/images/emoji/apple/radioactive_sign.png
index 377a1f98da5..4e48821dda2 100644
Binary files a/public/images/emoji/apple/radioactive_sign.png and b/public/images/emoji/apple/radioactive_sign.png differ
diff --git a/public/images/emoji/apple/rage.png b/public/images/emoji/apple/rage.png
index d15681ce60b..cecbeac7ec2 100644
Binary files a/public/images/emoji/apple/rage.png and b/public/images/emoji/apple/rage.png differ
diff --git a/public/images/emoji/apple/railroad_track.png b/public/images/emoji/apple/railroad_track.png
index e5d9b45d901..c2144344668 100644
Binary files a/public/images/emoji/apple/railroad_track.png and b/public/images/emoji/apple/railroad_track.png differ
diff --git a/public/images/emoji/apple/railway_car.png b/public/images/emoji/apple/railway_car.png
index d75fb01377b..b6e7b522cb5 100644
Binary files a/public/images/emoji/apple/railway_car.png and b/public/images/emoji/apple/railway_car.png differ
diff --git a/public/images/emoji/apple/railway_track.png b/public/images/emoji/apple/railway_track.png
index e5d9b45d901..c2144344668 100644
Binary files a/public/images/emoji/apple/railway_track.png and b/public/images/emoji/apple/railway_track.png differ
diff --git a/public/images/emoji/apple/rainbow.png b/public/images/emoji/apple/rainbow.png
index d547ce1edc0..dea301662ae 100644
Binary files a/public/images/emoji/apple/rainbow.png and b/public/images/emoji/apple/rainbow.png differ
diff --git a/public/images/emoji/apple/rainbow_flag.png b/public/images/emoji/apple/rainbow_flag.png
index 7f6e0d9516c..cc6e77bde4e 100644
Binary files a/public/images/emoji/apple/rainbow_flag.png and b/public/images/emoji/apple/rainbow_flag.png differ
diff --git a/public/images/emoji/apple/raised_back_of_hand.png b/public/images/emoji/apple/raised_back_of_hand.png
index 298328446aa..14795782b33 100644
Binary files a/public/images/emoji/apple/raised_back_of_hand.png and b/public/images/emoji/apple/raised_back_of_hand.png differ
diff --git a/public/images/emoji/apple/raised_back_of_hand/2.png b/public/images/emoji/apple/raised_back_of_hand/2.png
index cd2aa88ab9d..8b9bd431579 100644
Binary files a/public/images/emoji/apple/raised_back_of_hand/2.png and b/public/images/emoji/apple/raised_back_of_hand/2.png differ
diff --git a/public/images/emoji/apple/raised_back_of_hand/3.png b/public/images/emoji/apple/raised_back_of_hand/3.png
index ddbf05d1eee..8179d0b73e8 100644
Binary files a/public/images/emoji/apple/raised_back_of_hand/3.png and b/public/images/emoji/apple/raised_back_of_hand/3.png differ
diff --git a/public/images/emoji/apple/raised_back_of_hand/4.png b/public/images/emoji/apple/raised_back_of_hand/4.png
index c6ab99cb9a6..42802020ad4 100644
Binary files a/public/images/emoji/apple/raised_back_of_hand/4.png and b/public/images/emoji/apple/raised_back_of_hand/4.png differ
diff --git a/public/images/emoji/apple/raised_back_of_hand/5.png b/public/images/emoji/apple/raised_back_of_hand/5.png
index e4ec5fc11e0..4af4074ce08 100644
Binary files a/public/images/emoji/apple/raised_back_of_hand/5.png and b/public/images/emoji/apple/raised_back_of_hand/5.png differ
diff --git a/public/images/emoji/apple/raised_back_of_hand/6.png b/public/images/emoji/apple/raised_back_of_hand/6.png
index c9fe1ea37be..a77a11abcb5 100644
Binary files a/public/images/emoji/apple/raised_back_of_hand/6.png and b/public/images/emoji/apple/raised_back_of_hand/6.png differ
diff --git a/public/images/emoji/apple/raised_hand.png b/public/images/emoji/apple/raised_hand.png
index 8b60686eebf..4ed01163152 100644
Binary files a/public/images/emoji/apple/raised_hand.png and b/public/images/emoji/apple/raised_hand.png differ
diff --git a/public/images/emoji/apple/raised_hand/2.png b/public/images/emoji/apple/raised_hand/2.png
index f0fd83faaa5..e71142e1793 100644
Binary files a/public/images/emoji/apple/raised_hand/2.png and b/public/images/emoji/apple/raised_hand/2.png differ
diff --git a/public/images/emoji/apple/raised_hand/3.png b/public/images/emoji/apple/raised_hand/3.png
index 7df90232ae7..a05b226c06b 100644
Binary files a/public/images/emoji/apple/raised_hand/3.png and b/public/images/emoji/apple/raised_hand/3.png differ
diff --git a/public/images/emoji/apple/raised_hand/4.png b/public/images/emoji/apple/raised_hand/4.png
index 979c0c414d1..cd5608ebc41 100644
Binary files a/public/images/emoji/apple/raised_hand/4.png and b/public/images/emoji/apple/raised_hand/4.png differ
diff --git a/public/images/emoji/apple/raised_hand/5.png b/public/images/emoji/apple/raised_hand/5.png
index dee9188f4d1..088705db5b0 100644
Binary files a/public/images/emoji/apple/raised_hand/5.png and b/public/images/emoji/apple/raised_hand/5.png differ
diff --git a/public/images/emoji/apple/raised_hand/6.png b/public/images/emoji/apple/raised_hand/6.png
index 9ae2da2c021..87f46ae457e 100644
Binary files a/public/images/emoji/apple/raised_hand/6.png and b/public/images/emoji/apple/raised_hand/6.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_fingers_splayed.png b/public/images/emoji/apple/raised_hand_with_fingers_splayed.png
index c05031e50a0..8492596302d 100644
Binary files a/public/images/emoji/apple/raised_hand_with_fingers_splayed.png and b/public/images/emoji/apple/raised_hand_with_fingers_splayed.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_fingers_splayed/2.png b/public/images/emoji/apple/raised_hand_with_fingers_splayed/2.png
index 35c3b9b3502..5cd0c98544f 100644
Binary files a/public/images/emoji/apple/raised_hand_with_fingers_splayed/2.png and b/public/images/emoji/apple/raised_hand_with_fingers_splayed/2.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_fingers_splayed/3.png b/public/images/emoji/apple/raised_hand_with_fingers_splayed/3.png
index 6757e8a1e2b..e55cbf371ab 100644
Binary files a/public/images/emoji/apple/raised_hand_with_fingers_splayed/3.png and b/public/images/emoji/apple/raised_hand_with_fingers_splayed/3.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_fingers_splayed/4.png b/public/images/emoji/apple/raised_hand_with_fingers_splayed/4.png
index 2583736a585..a688ca96ca6 100644
Binary files a/public/images/emoji/apple/raised_hand_with_fingers_splayed/4.png and b/public/images/emoji/apple/raised_hand_with_fingers_splayed/4.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_fingers_splayed/5.png b/public/images/emoji/apple/raised_hand_with_fingers_splayed/5.png
index 11cb8caa11d..3cf22841527 100644
Binary files a/public/images/emoji/apple/raised_hand_with_fingers_splayed/5.png and b/public/images/emoji/apple/raised_hand_with_fingers_splayed/5.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_fingers_splayed/6.png b/public/images/emoji/apple/raised_hand_with_fingers_splayed/6.png
index eed63072bd5..fd1a82a5237 100644
Binary files a/public/images/emoji/apple/raised_hand_with_fingers_splayed/6.png and b/public/images/emoji/apple/raised_hand_with_fingers_splayed/6.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers.png b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers.png
index 89fd1859fef..c16f6b2b8c4 100644
Binary files a/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers.png and b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/2.png b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/2.png
index 9c277890adf..d93b9be15d4 100644
Binary files a/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/2.png and b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/2.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/3.png b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/3.png
index 8d6940ee24d..10d224c22a1 100644
Binary files a/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/3.png and b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/3.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/4.png b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/4.png
index fe549c3e2c6..b2c4cb66682 100644
Binary files a/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/4.png and b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/4.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/5.png b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/5.png
index 4ad8b9df458..cfd3e64d35c 100644
Binary files a/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/5.png and b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/5.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/6.png b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/6.png
index af23814474e..80ec97d3499 100644
Binary files a/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/6.png and b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/6.png differ
diff --git a/public/images/emoji/apple/raised_hands.png b/public/images/emoji/apple/raised_hands.png
index dd497694e69..cfa08963eb4 100644
Binary files a/public/images/emoji/apple/raised_hands.png and b/public/images/emoji/apple/raised_hands.png differ
diff --git a/public/images/emoji/apple/raised_hands/2.png b/public/images/emoji/apple/raised_hands/2.png
index b365d346921..ba60a41888f 100644
Binary files a/public/images/emoji/apple/raised_hands/2.png and b/public/images/emoji/apple/raised_hands/2.png differ
diff --git a/public/images/emoji/apple/raised_hands/3.png b/public/images/emoji/apple/raised_hands/3.png
index f504e7e9f80..c237c1ca04d 100644
Binary files a/public/images/emoji/apple/raised_hands/3.png and b/public/images/emoji/apple/raised_hands/3.png differ
diff --git a/public/images/emoji/apple/raised_hands/4.png b/public/images/emoji/apple/raised_hands/4.png
index af3dc8af632..e1362ec70e9 100644
Binary files a/public/images/emoji/apple/raised_hands/4.png and b/public/images/emoji/apple/raised_hands/4.png differ
diff --git a/public/images/emoji/apple/raised_hands/5.png b/public/images/emoji/apple/raised_hands/5.png
index 9ba1a0c65e1..c6eb9f338a4 100644
Binary files a/public/images/emoji/apple/raised_hands/5.png and b/public/images/emoji/apple/raised_hands/5.png differ
diff --git a/public/images/emoji/apple/raised_hands/6.png b/public/images/emoji/apple/raised_hands/6.png
index 35e4fb95e85..beed9059338 100644
Binary files a/public/images/emoji/apple/raised_hands/6.png and b/public/images/emoji/apple/raised_hands/6.png differ
diff --git a/public/images/emoji/apple/raising_hand.png b/public/images/emoji/apple/raising_hand.png
index c66b9820a33..6e8dc854ce3 100644
Binary files a/public/images/emoji/apple/raising_hand.png and b/public/images/emoji/apple/raising_hand.png differ
diff --git a/public/images/emoji/apple/raising_hand/2.png b/public/images/emoji/apple/raising_hand/2.png
index 23451343429..16f6f6ca22d 100644
Binary files a/public/images/emoji/apple/raising_hand/2.png and b/public/images/emoji/apple/raising_hand/2.png differ
diff --git a/public/images/emoji/apple/raising_hand/3.png b/public/images/emoji/apple/raising_hand/3.png
index 25342333095..791325819e2 100644
Binary files a/public/images/emoji/apple/raising_hand/3.png and b/public/images/emoji/apple/raising_hand/3.png differ
diff --git a/public/images/emoji/apple/raising_hand/4.png b/public/images/emoji/apple/raising_hand/4.png
index a7ea94e72e0..723259d50fb 100644
Binary files a/public/images/emoji/apple/raising_hand/4.png and b/public/images/emoji/apple/raising_hand/4.png differ
diff --git a/public/images/emoji/apple/raising_hand/5.png b/public/images/emoji/apple/raising_hand/5.png
index 4a2d2775fa7..a9d7faf8a27 100644
Binary files a/public/images/emoji/apple/raising_hand/5.png and b/public/images/emoji/apple/raising_hand/5.png differ
diff --git a/public/images/emoji/apple/raising_hand/6.png b/public/images/emoji/apple/raising_hand/6.png
index f5dfa976cb7..e45c0ef8a2c 100644
Binary files a/public/images/emoji/apple/raising_hand/6.png and b/public/images/emoji/apple/raising_hand/6.png differ
diff --git a/public/images/emoji/apple/raising_hand_man.png b/public/images/emoji/apple/raising_hand_man.png
index aed3b88527f..3596761b13e 100644
Binary files a/public/images/emoji/apple/raising_hand_man.png and b/public/images/emoji/apple/raising_hand_man.png differ
diff --git a/public/images/emoji/apple/raising_hand_man/2.png b/public/images/emoji/apple/raising_hand_man/2.png
index afa72a8c874..5b292ae10a4 100644
Binary files a/public/images/emoji/apple/raising_hand_man/2.png and b/public/images/emoji/apple/raising_hand_man/2.png differ
diff --git a/public/images/emoji/apple/raising_hand_man/3.png b/public/images/emoji/apple/raising_hand_man/3.png
index 78cb3fe314d..bffca230ef2 100644
Binary files a/public/images/emoji/apple/raising_hand_man/3.png and b/public/images/emoji/apple/raising_hand_man/3.png differ
diff --git a/public/images/emoji/apple/raising_hand_man/4.png b/public/images/emoji/apple/raising_hand_man/4.png
index f47160bb3be..c8634730a84 100644
Binary files a/public/images/emoji/apple/raising_hand_man/4.png and b/public/images/emoji/apple/raising_hand_man/4.png differ
diff --git a/public/images/emoji/apple/raising_hand_man/5.png b/public/images/emoji/apple/raising_hand_man/5.png
index 096e8e74245..faac2638571 100644
Binary files a/public/images/emoji/apple/raising_hand_man/5.png and b/public/images/emoji/apple/raising_hand_man/5.png differ
diff --git a/public/images/emoji/apple/raising_hand_man/6.png b/public/images/emoji/apple/raising_hand_man/6.png
index 3aa54e5a812..0894695f539 100644
Binary files a/public/images/emoji/apple/raising_hand_man/6.png and b/public/images/emoji/apple/raising_hand_man/6.png differ
diff --git a/public/images/emoji/apple/raising_hand_woman.png b/public/images/emoji/apple/raising_hand_woman.png
index c66b9820a33..6e8dc854ce3 100644
Binary files a/public/images/emoji/apple/raising_hand_woman.png and b/public/images/emoji/apple/raising_hand_woman.png differ
diff --git a/public/images/emoji/apple/raising_hand_woman/2.png b/public/images/emoji/apple/raising_hand_woman/2.png
index 23451343429..16f6f6ca22d 100644
Binary files a/public/images/emoji/apple/raising_hand_woman/2.png and b/public/images/emoji/apple/raising_hand_woman/2.png differ
diff --git a/public/images/emoji/apple/raising_hand_woman/3.png b/public/images/emoji/apple/raising_hand_woman/3.png
index 25342333095..791325819e2 100644
Binary files a/public/images/emoji/apple/raising_hand_woman/3.png and b/public/images/emoji/apple/raising_hand_woman/3.png differ
diff --git a/public/images/emoji/apple/raising_hand_woman/4.png b/public/images/emoji/apple/raising_hand_woman/4.png
index a7ea94e72e0..723259d50fb 100644
Binary files a/public/images/emoji/apple/raising_hand_woman/4.png and b/public/images/emoji/apple/raising_hand_woman/4.png differ
diff --git a/public/images/emoji/apple/raising_hand_woman/5.png b/public/images/emoji/apple/raising_hand_woman/5.png
index 4a2d2775fa7..a9d7faf8a27 100644
Binary files a/public/images/emoji/apple/raising_hand_woman/5.png and b/public/images/emoji/apple/raising_hand_woman/5.png differ
diff --git a/public/images/emoji/apple/raising_hand_woman/6.png b/public/images/emoji/apple/raising_hand_woman/6.png
index f5dfa976cb7..e45c0ef8a2c 100644
Binary files a/public/images/emoji/apple/raising_hand_woman/6.png and b/public/images/emoji/apple/raising_hand_woman/6.png differ
diff --git a/public/images/emoji/apple/ram.png b/public/images/emoji/apple/ram.png
index 3b745d612ce..59c418583df 100644
Binary files a/public/images/emoji/apple/ram.png and b/public/images/emoji/apple/ram.png differ
diff --git a/public/images/emoji/apple/ramen.png b/public/images/emoji/apple/ramen.png
index 76688ab65dc..f985105209b 100644
Binary files a/public/images/emoji/apple/ramen.png and b/public/images/emoji/apple/ramen.png differ
diff --git a/public/images/emoji/apple/rat.png b/public/images/emoji/apple/rat.png
index 04d33163d62..d399eb4e27d 100644
Binary files a/public/images/emoji/apple/rat.png and b/public/images/emoji/apple/rat.png differ
diff --git a/public/images/emoji/apple/record_button.png b/public/images/emoji/apple/record_button.png
index 3f27cae7bac..68d8a77184c 100644
Binary files a/public/images/emoji/apple/record_button.png and b/public/images/emoji/apple/record_button.png differ
diff --git a/public/images/emoji/apple/recycle.png b/public/images/emoji/apple/recycle.png
index 26000942ba6..9f063ade437 100644
Binary files a/public/images/emoji/apple/recycle.png and b/public/images/emoji/apple/recycle.png differ
diff --git a/public/images/emoji/apple/red_car.png b/public/images/emoji/apple/red_car.png
index 2b59419e4b1..8f6ebd3ee10 100644
Binary files a/public/images/emoji/apple/red_car.png and b/public/images/emoji/apple/red_car.png differ
diff --git a/public/images/emoji/apple/red_circle.png b/public/images/emoji/apple/red_circle.png
index 83ac2291442..2393d6a1eb0 100644
Binary files a/public/images/emoji/apple/red_circle.png and b/public/images/emoji/apple/red_circle.png differ
diff --git a/public/images/emoji/apple/registered.png b/public/images/emoji/apple/registered.png
index e90bf656b99..089cf4ac83a 100644
Binary files a/public/images/emoji/apple/registered.png and b/public/images/emoji/apple/registered.png differ
diff --git a/public/images/emoji/apple/relaxed.png b/public/images/emoji/apple/relaxed.png
index 3cc28f81a34..69d1d283f03 100644
Binary files a/public/images/emoji/apple/relaxed.png and b/public/images/emoji/apple/relaxed.png differ
diff --git a/public/images/emoji/apple/relieved.png b/public/images/emoji/apple/relieved.png
index fcfcea5b746..cf40c912684 100644
Binary files a/public/images/emoji/apple/relieved.png and b/public/images/emoji/apple/relieved.png differ
diff --git a/public/images/emoji/apple/reminder_ribbon.png b/public/images/emoji/apple/reminder_ribbon.png
index b79ce8b83f6..edebeb289a4 100644
Binary files a/public/images/emoji/apple/reminder_ribbon.png and b/public/images/emoji/apple/reminder_ribbon.png differ
diff --git a/public/images/emoji/apple/repeat.png b/public/images/emoji/apple/repeat.png
index ea778f215d2..4afdd833d1f 100644
Binary files a/public/images/emoji/apple/repeat.png and b/public/images/emoji/apple/repeat.png differ
diff --git a/public/images/emoji/apple/repeat_one.png b/public/images/emoji/apple/repeat_one.png
index 660a4298dc7..6cbb2414216 100644
Binary files a/public/images/emoji/apple/repeat_one.png and b/public/images/emoji/apple/repeat_one.png differ
diff --git a/public/images/emoji/apple/rescue_worker_helmet.png b/public/images/emoji/apple/rescue_worker_helmet.png
index 6440b55c340..cd03d216eb7 100644
Binary files a/public/images/emoji/apple/rescue_worker_helmet.png and b/public/images/emoji/apple/rescue_worker_helmet.png differ
diff --git a/public/images/emoji/apple/restroom.png b/public/images/emoji/apple/restroom.png
index 7d5bef7cec4..48b113a77e3 100644
Binary files a/public/images/emoji/apple/restroom.png and b/public/images/emoji/apple/restroom.png differ
diff --git a/public/images/emoji/apple/reunion.png b/public/images/emoji/apple/reunion.png
index 6efb29e5bfe..4a2120c1da8 100644
Binary files a/public/images/emoji/apple/reunion.png and b/public/images/emoji/apple/reunion.png differ
diff --git a/public/images/emoji/apple/reversed_hand_with_middle_finger_extended.png b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended.png
index e869cf97d15..a91fda90134 100644
Binary files a/public/images/emoji/apple/reversed_hand_with_middle_finger_extended.png and b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended.png differ
diff --git a/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/2.png b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/2.png
index ce95c6a8be5..3783ddff95e 100644
Binary files a/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/2.png and b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/2.png differ
diff --git a/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/3.png b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/3.png
index 33eec03fd41..1c4a962d013 100644
Binary files a/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/3.png and b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/3.png differ
diff --git a/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/4.png b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/4.png
index 10487652927..605d4bc231a 100644
Binary files a/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/4.png and b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/4.png differ
diff --git a/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/5.png b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/5.png
index 6f577d03de8..28af6e0dc16 100644
Binary files a/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/5.png and b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/5.png differ
diff --git a/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/6.png b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/6.png
index 58349f45b1f..fcb6c5c5a6e 100644
Binary files a/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/6.png and b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/6.png differ
diff --git a/public/images/emoji/apple/revolving_hearts.png b/public/images/emoji/apple/revolving_hearts.png
index 2d1cd362003..61117289492 100644
Binary files a/public/images/emoji/apple/revolving_hearts.png and b/public/images/emoji/apple/revolving_hearts.png differ
diff --git a/public/images/emoji/apple/rewind.png b/public/images/emoji/apple/rewind.png
index 8703e2c503c..0853bdd1758 100644
Binary files a/public/images/emoji/apple/rewind.png and b/public/images/emoji/apple/rewind.png differ
diff --git a/public/images/emoji/apple/rhinoceros.png b/public/images/emoji/apple/rhinoceros.png
index 9e01ebe47e1..55af6249019 100644
Binary files a/public/images/emoji/apple/rhinoceros.png and b/public/images/emoji/apple/rhinoceros.png differ
diff --git a/public/images/emoji/apple/ribbon.png b/public/images/emoji/apple/ribbon.png
index 4d898d1526d..acbc50110f1 100644
Binary files a/public/images/emoji/apple/ribbon.png and b/public/images/emoji/apple/ribbon.png differ
diff --git a/public/images/emoji/apple/rice.png b/public/images/emoji/apple/rice.png
index c4271c4399f..1b2cb351990 100644
Binary files a/public/images/emoji/apple/rice.png and b/public/images/emoji/apple/rice.png differ
diff --git a/public/images/emoji/apple/rice_ball.png b/public/images/emoji/apple/rice_ball.png
index 7444782a08d..173ff1e070c 100644
Binary files a/public/images/emoji/apple/rice_ball.png and b/public/images/emoji/apple/rice_ball.png differ
diff --git a/public/images/emoji/apple/rice_cracker.png b/public/images/emoji/apple/rice_cracker.png
index 1b7155898cd..61555e6d5b0 100644
Binary files a/public/images/emoji/apple/rice_cracker.png and b/public/images/emoji/apple/rice_cracker.png differ
diff --git a/public/images/emoji/apple/rice_scene.png b/public/images/emoji/apple/rice_scene.png
index b3bbecd88e6..417e9102c0b 100644
Binary files a/public/images/emoji/apple/rice_scene.png and b/public/images/emoji/apple/rice_scene.png differ
diff --git a/public/images/emoji/apple/right_anger_bubble.png b/public/images/emoji/apple/right_anger_bubble.png
index 95cf61d6ddc..51550711fb6 100644
Binary files a/public/images/emoji/apple/right_anger_bubble.png and b/public/images/emoji/apple/right_anger_bubble.png differ
diff --git a/public/images/emoji/apple/ring.png b/public/images/emoji/apple/ring.png
index e70850a1708..2166d5f21b8 100644
Binary files a/public/images/emoji/apple/ring.png and b/public/images/emoji/apple/ring.png differ
diff --git a/public/images/emoji/apple/robot.png b/public/images/emoji/apple/robot.png
index f337f9b7a5e..533b41d515b 100644
Binary files a/public/images/emoji/apple/robot.png and b/public/images/emoji/apple/robot.png differ
diff --git a/public/images/emoji/apple/robot_face.png b/public/images/emoji/apple/robot_face.png
index f337f9b7a5e..533b41d515b 100644
Binary files a/public/images/emoji/apple/robot_face.png and b/public/images/emoji/apple/robot_face.png differ
diff --git a/public/images/emoji/apple/rocket.png b/public/images/emoji/apple/rocket.png
index 8ae60dfcaae..9e60da91998 100644
Binary files a/public/images/emoji/apple/rocket.png and b/public/images/emoji/apple/rocket.png differ
diff --git a/public/images/emoji/apple/rofl.png b/public/images/emoji/apple/rofl.png
index 59488bcf37c..e0dbe7e08fd 100644
Binary files a/public/images/emoji/apple/rofl.png and b/public/images/emoji/apple/rofl.png differ
diff --git a/public/images/emoji/apple/roll_eyes.png b/public/images/emoji/apple/roll_eyes.png
index 4da789951ae..f92fc7d7011 100644
Binary files a/public/images/emoji/apple/roll_eyes.png and b/public/images/emoji/apple/roll_eyes.png differ
diff --git a/public/images/emoji/apple/rolled_up_newspaper.png b/public/images/emoji/apple/rolled_up_newspaper.png
index 400b0805699..c2535585e9a 100644
Binary files a/public/images/emoji/apple/rolled_up_newspaper.png and b/public/images/emoji/apple/rolled_up_newspaper.png differ
diff --git a/public/images/emoji/apple/roller_coaster.png b/public/images/emoji/apple/roller_coaster.png
index e44cc5e7343..626acc4e1bb 100644
Binary files a/public/images/emoji/apple/roller_coaster.png and b/public/images/emoji/apple/roller_coaster.png differ
diff --git a/public/images/emoji/apple/rolling_eyes.png b/public/images/emoji/apple/rolling_eyes.png
index 4da789951ae..f92fc7d7011 100644
Binary files a/public/images/emoji/apple/rolling_eyes.png and b/public/images/emoji/apple/rolling_eyes.png differ
diff --git a/public/images/emoji/apple/romania.png b/public/images/emoji/apple/romania.png
index 2cf4dca9a17..ed721a7f75d 100644
Binary files a/public/images/emoji/apple/romania.png and b/public/images/emoji/apple/romania.png differ
diff --git a/public/images/emoji/apple/rooster.png b/public/images/emoji/apple/rooster.png
index 9811e82dde3..c3ce84659e1 100644
Binary files a/public/images/emoji/apple/rooster.png and b/public/images/emoji/apple/rooster.png differ
diff --git a/public/images/emoji/apple/rose.png b/public/images/emoji/apple/rose.png
index 1b4808817b4..1aeee077fda 100644
Binary files a/public/images/emoji/apple/rose.png and b/public/images/emoji/apple/rose.png differ
diff --git a/public/images/emoji/apple/rosette.png b/public/images/emoji/apple/rosette.png
index ddd064e4e73..01bc1adae81 100644
Binary files a/public/images/emoji/apple/rosette.png and b/public/images/emoji/apple/rosette.png differ
diff --git a/public/images/emoji/apple/rotating_light.png b/public/images/emoji/apple/rotating_light.png
index d33e164550e..e82ca469975 100644
Binary files a/public/images/emoji/apple/rotating_light.png and b/public/images/emoji/apple/rotating_light.png differ
diff --git a/public/images/emoji/apple/round_pushpin.png b/public/images/emoji/apple/round_pushpin.png
index 27ecb89da13..09f3947816c 100644
Binary files a/public/images/emoji/apple/round_pushpin.png and b/public/images/emoji/apple/round_pushpin.png differ
diff --git a/public/images/emoji/apple/rowboat.png b/public/images/emoji/apple/rowboat.png
index 412e6ed7f3b..dbb5cc0986c 100644
Binary files a/public/images/emoji/apple/rowboat.png and b/public/images/emoji/apple/rowboat.png differ
diff --git a/public/images/emoji/apple/rowboat/2.png b/public/images/emoji/apple/rowboat/2.png
index d390d56ad12..0d5a133c59b 100644
Binary files a/public/images/emoji/apple/rowboat/2.png and b/public/images/emoji/apple/rowboat/2.png differ
diff --git a/public/images/emoji/apple/rowboat/3.png b/public/images/emoji/apple/rowboat/3.png
index 6ef5342a647..3c1358828ba 100644
Binary files a/public/images/emoji/apple/rowboat/3.png and b/public/images/emoji/apple/rowboat/3.png differ
diff --git a/public/images/emoji/apple/rowboat/4.png b/public/images/emoji/apple/rowboat/4.png
index bfc368477e2..2831a3d41e4 100644
Binary files a/public/images/emoji/apple/rowboat/4.png and b/public/images/emoji/apple/rowboat/4.png differ
diff --git a/public/images/emoji/apple/rowboat/5.png b/public/images/emoji/apple/rowboat/5.png
index a1473188e94..4fbaf3e4f6e 100644
Binary files a/public/images/emoji/apple/rowboat/5.png and b/public/images/emoji/apple/rowboat/5.png differ
diff --git a/public/images/emoji/apple/rowboat/6.png b/public/images/emoji/apple/rowboat/6.png
index 93cfe0f87f7..2ca70d7c091 100644
Binary files a/public/images/emoji/apple/rowboat/6.png and b/public/images/emoji/apple/rowboat/6.png differ
diff --git a/public/images/emoji/apple/rowing_man.png b/public/images/emoji/apple/rowing_man.png
index 412e6ed7f3b..dbb5cc0986c 100644
Binary files a/public/images/emoji/apple/rowing_man.png and b/public/images/emoji/apple/rowing_man.png differ
diff --git a/public/images/emoji/apple/rowing_man/2.png b/public/images/emoji/apple/rowing_man/2.png
index d390d56ad12..0d5a133c59b 100644
Binary files a/public/images/emoji/apple/rowing_man/2.png and b/public/images/emoji/apple/rowing_man/2.png differ
diff --git a/public/images/emoji/apple/rowing_man/3.png b/public/images/emoji/apple/rowing_man/3.png
index 6ef5342a647..3c1358828ba 100644
Binary files a/public/images/emoji/apple/rowing_man/3.png and b/public/images/emoji/apple/rowing_man/3.png differ
diff --git a/public/images/emoji/apple/rowing_man/4.png b/public/images/emoji/apple/rowing_man/4.png
index bfc368477e2..2831a3d41e4 100644
Binary files a/public/images/emoji/apple/rowing_man/4.png and b/public/images/emoji/apple/rowing_man/4.png differ
diff --git a/public/images/emoji/apple/rowing_man/5.png b/public/images/emoji/apple/rowing_man/5.png
index a1473188e94..4fbaf3e4f6e 100644
Binary files a/public/images/emoji/apple/rowing_man/5.png and b/public/images/emoji/apple/rowing_man/5.png differ
diff --git a/public/images/emoji/apple/rowing_man/6.png b/public/images/emoji/apple/rowing_man/6.png
index 93cfe0f87f7..2ca70d7c091 100644
Binary files a/public/images/emoji/apple/rowing_man/6.png and b/public/images/emoji/apple/rowing_man/6.png differ
diff --git a/public/images/emoji/apple/rowing_woman.png b/public/images/emoji/apple/rowing_woman.png
index 06d080bf6f6..504933eadce 100644
Binary files a/public/images/emoji/apple/rowing_woman.png and b/public/images/emoji/apple/rowing_woman.png differ
diff --git a/public/images/emoji/apple/rowing_woman/2.png b/public/images/emoji/apple/rowing_woman/2.png
index 6ba3fb0c1ce..0f4be476bd9 100644
Binary files a/public/images/emoji/apple/rowing_woman/2.png and b/public/images/emoji/apple/rowing_woman/2.png differ
diff --git a/public/images/emoji/apple/rowing_woman/3.png b/public/images/emoji/apple/rowing_woman/3.png
index bc3b1647a1d..6440b5fd883 100644
Binary files a/public/images/emoji/apple/rowing_woman/3.png and b/public/images/emoji/apple/rowing_woman/3.png differ
diff --git a/public/images/emoji/apple/rowing_woman/4.png b/public/images/emoji/apple/rowing_woman/4.png
index 872e2d34334..119cee69b87 100644
Binary files a/public/images/emoji/apple/rowing_woman/4.png and b/public/images/emoji/apple/rowing_woman/4.png differ
diff --git a/public/images/emoji/apple/rowing_woman/5.png b/public/images/emoji/apple/rowing_woman/5.png
index b0466da8e42..fccaeec1a39 100644
Binary files a/public/images/emoji/apple/rowing_woman/5.png and b/public/images/emoji/apple/rowing_woman/5.png differ
diff --git a/public/images/emoji/apple/rowing_woman/6.png b/public/images/emoji/apple/rowing_woman/6.png
index 90854899ffa..f6af2daa03b 100644
Binary files a/public/images/emoji/apple/rowing_woman/6.png and b/public/images/emoji/apple/rowing_woman/6.png differ
diff --git a/public/images/emoji/apple/ru.png b/public/images/emoji/apple/ru.png
index ebd82f4a526..ef8ffd3faf9 100644
Binary files a/public/images/emoji/apple/ru.png and b/public/images/emoji/apple/ru.png differ
diff --git a/public/images/emoji/apple/rugby_football.png b/public/images/emoji/apple/rugby_football.png
index 6e05e18f43a..de6b820ae19 100644
Binary files a/public/images/emoji/apple/rugby_football.png and b/public/images/emoji/apple/rugby_football.png differ
diff --git a/public/images/emoji/apple/runner.png b/public/images/emoji/apple/runner.png
index a54c9f58e97..0c0303ca271 100644
Binary files a/public/images/emoji/apple/runner.png and b/public/images/emoji/apple/runner.png differ
diff --git a/public/images/emoji/apple/runner/2.png b/public/images/emoji/apple/runner/2.png
index d3efc0f73d8..8a022d8cee5 100644
Binary files a/public/images/emoji/apple/runner/2.png and b/public/images/emoji/apple/runner/2.png differ
diff --git a/public/images/emoji/apple/runner/3.png b/public/images/emoji/apple/runner/3.png
index 3647d58222d..edc02bc85eb 100644
Binary files a/public/images/emoji/apple/runner/3.png and b/public/images/emoji/apple/runner/3.png differ
diff --git a/public/images/emoji/apple/runner/4.png b/public/images/emoji/apple/runner/4.png
index 1c09cf1ec4d..e8a224d001c 100644
Binary files a/public/images/emoji/apple/runner/4.png and b/public/images/emoji/apple/runner/4.png differ
diff --git a/public/images/emoji/apple/runner/5.png b/public/images/emoji/apple/runner/5.png
index 4a9e54bd183..bd7da362220 100644
Binary files a/public/images/emoji/apple/runner/5.png and b/public/images/emoji/apple/runner/5.png differ
diff --git a/public/images/emoji/apple/runner/6.png b/public/images/emoji/apple/runner/6.png
index 79c08ed0b7d..ea453fa739f 100644
Binary files a/public/images/emoji/apple/runner/6.png and b/public/images/emoji/apple/runner/6.png differ
diff --git a/public/images/emoji/apple/running_man.png b/public/images/emoji/apple/running_man.png
index a54c9f58e97..0c0303ca271 100644
Binary files a/public/images/emoji/apple/running_man.png and b/public/images/emoji/apple/running_man.png differ
diff --git a/public/images/emoji/apple/running_man/2.png b/public/images/emoji/apple/running_man/2.png
index d3efc0f73d8..8a022d8cee5 100644
Binary files a/public/images/emoji/apple/running_man/2.png and b/public/images/emoji/apple/running_man/2.png differ
diff --git a/public/images/emoji/apple/running_man/3.png b/public/images/emoji/apple/running_man/3.png
index 3647d58222d..edc02bc85eb 100644
Binary files a/public/images/emoji/apple/running_man/3.png and b/public/images/emoji/apple/running_man/3.png differ
diff --git a/public/images/emoji/apple/running_man/4.png b/public/images/emoji/apple/running_man/4.png
index 1c09cf1ec4d..e8a224d001c 100644
Binary files a/public/images/emoji/apple/running_man/4.png and b/public/images/emoji/apple/running_man/4.png differ
diff --git a/public/images/emoji/apple/running_man/5.png b/public/images/emoji/apple/running_man/5.png
index 4a9e54bd183..bd7da362220 100644
Binary files a/public/images/emoji/apple/running_man/5.png and b/public/images/emoji/apple/running_man/5.png differ
diff --git a/public/images/emoji/apple/running_man/6.png b/public/images/emoji/apple/running_man/6.png
index 79c08ed0b7d..ea453fa739f 100644
Binary files a/public/images/emoji/apple/running_man/6.png and b/public/images/emoji/apple/running_man/6.png differ
diff --git a/public/images/emoji/apple/running_shirt_with_sash.png b/public/images/emoji/apple/running_shirt_with_sash.png
index bc14ee0a364..b70fe72bdd1 100644
Binary files a/public/images/emoji/apple/running_shirt_with_sash.png and b/public/images/emoji/apple/running_shirt_with_sash.png differ
diff --git a/public/images/emoji/apple/running_woman.png b/public/images/emoji/apple/running_woman.png
index 593cef257a9..3be71a225d4 100644
Binary files a/public/images/emoji/apple/running_woman.png and b/public/images/emoji/apple/running_woman.png differ
diff --git a/public/images/emoji/apple/running_woman/2.png b/public/images/emoji/apple/running_woman/2.png
index 6611c5ffaf4..ecb4fba184f 100644
Binary files a/public/images/emoji/apple/running_woman/2.png and b/public/images/emoji/apple/running_woman/2.png differ
diff --git a/public/images/emoji/apple/running_woman/3.png b/public/images/emoji/apple/running_woman/3.png
index 7324b8214c3..e6d1bebb2b6 100644
Binary files a/public/images/emoji/apple/running_woman/3.png and b/public/images/emoji/apple/running_woman/3.png differ
diff --git a/public/images/emoji/apple/running_woman/4.png b/public/images/emoji/apple/running_woman/4.png
index bf45719ea0b..3ba4c882afa 100644
Binary files a/public/images/emoji/apple/running_woman/4.png and b/public/images/emoji/apple/running_woman/4.png differ
diff --git a/public/images/emoji/apple/running_woman/5.png b/public/images/emoji/apple/running_woman/5.png
index d08dacb1b30..abda2379a37 100644
Binary files a/public/images/emoji/apple/running_woman/5.png and b/public/images/emoji/apple/running_woman/5.png differ
diff --git a/public/images/emoji/apple/running_woman/6.png b/public/images/emoji/apple/running_woman/6.png
index 3e061ca8eda..7eccc192de8 100644
Binary files a/public/images/emoji/apple/running_woman/6.png and b/public/images/emoji/apple/running_woman/6.png differ
diff --git a/public/images/emoji/apple/rwanda.png b/public/images/emoji/apple/rwanda.png
index 736d4cb1ef4..91501d31536 100644
Binary files a/public/images/emoji/apple/rwanda.png and b/public/images/emoji/apple/rwanda.png differ
diff --git a/public/images/emoji/apple/sa.png b/public/images/emoji/apple/sa.png
index c4c202a7ad3..5af90028998 100644
Binary files a/public/images/emoji/apple/sa.png and b/public/images/emoji/apple/sa.png differ
diff --git a/public/images/emoji/apple/sagittarius.png b/public/images/emoji/apple/sagittarius.png
index 5038b3f0bf5..f11b04f8ae5 100644
Binary files a/public/images/emoji/apple/sagittarius.png and b/public/images/emoji/apple/sagittarius.png differ
diff --git a/public/images/emoji/apple/sailboat.png b/public/images/emoji/apple/sailboat.png
index 5da9fee6962..86ebde70310 100644
Binary files a/public/images/emoji/apple/sailboat.png and b/public/images/emoji/apple/sailboat.png differ
diff --git a/public/images/emoji/apple/sake.png b/public/images/emoji/apple/sake.png
index e5321066921..827d7085e80 100644
Binary files a/public/images/emoji/apple/sake.png and b/public/images/emoji/apple/sake.png differ
diff --git a/public/images/emoji/apple/samoa.png b/public/images/emoji/apple/samoa.png
index e0bed73bf54..494fbd2ca66 100644
Binary files a/public/images/emoji/apple/samoa.png and b/public/images/emoji/apple/samoa.png differ
diff --git a/public/images/emoji/apple/san_marino.png b/public/images/emoji/apple/san_marino.png
index 6dc935be3e3..a2a84adbf5b 100644
Binary files a/public/images/emoji/apple/san_marino.png and b/public/images/emoji/apple/san_marino.png differ
diff --git a/public/images/emoji/apple/sandal.png b/public/images/emoji/apple/sandal.png
index d9945f8fea9..ab5eaa11bac 100644
Binary files a/public/images/emoji/apple/sandal.png and b/public/images/emoji/apple/sandal.png differ
diff --git a/public/images/emoji/apple/sandwich.png b/public/images/emoji/apple/sandwich.png
index ba3f9a1cdb7..5529701f8f8 100644
Binary files a/public/images/emoji/apple/sandwich.png and b/public/images/emoji/apple/sandwich.png differ
diff --git a/public/images/emoji/apple/santa.png b/public/images/emoji/apple/santa.png
index f7ddb9bcd89..89e008efb24 100644
Binary files a/public/images/emoji/apple/santa.png and b/public/images/emoji/apple/santa.png differ
diff --git a/public/images/emoji/apple/santa/2.png b/public/images/emoji/apple/santa/2.png
index f80ae96d00b..12356b09abe 100644
Binary files a/public/images/emoji/apple/santa/2.png and b/public/images/emoji/apple/santa/2.png differ
diff --git a/public/images/emoji/apple/santa/3.png b/public/images/emoji/apple/santa/3.png
index 8912ad6bec8..b0734774331 100644
Binary files a/public/images/emoji/apple/santa/3.png and b/public/images/emoji/apple/santa/3.png differ
diff --git a/public/images/emoji/apple/santa/4.png b/public/images/emoji/apple/santa/4.png
index cf828d4db67..7f5cd6b0afe 100644
Binary files a/public/images/emoji/apple/santa/4.png and b/public/images/emoji/apple/santa/4.png differ
diff --git a/public/images/emoji/apple/santa/5.png b/public/images/emoji/apple/santa/5.png
index 341545fb2a3..aca929e7248 100644
Binary files a/public/images/emoji/apple/santa/5.png and b/public/images/emoji/apple/santa/5.png differ
diff --git a/public/images/emoji/apple/santa/6.png b/public/images/emoji/apple/santa/6.png
index e9eb712028b..f390b2b6f23 100644
Binary files a/public/images/emoji/apple/santa/6.png and b/public/images/emoji/apple/santa/6.png differ
diff --git a/public/images/emoji/apple/sao_tome_principe.png b/public/images/emoji/apple/sao_tome_principe.png
index e52b743de96..eb9ff1c3332 100644
Binary files a/public/images/emoji/apple/sao_tome_principe.png and b/public/images/emoji/apple/sao_tome_principe.png differ
diff --git a/public/images/emoji/apple/satellite.png b/public/images/emoji/apple/satellite.png
index c408d5f7453..00019513cd0 100644
Binary files a/public/images/emoji/apple/satellite.png and b/public/images/emoji/apple/satellite.png differ
diff --git a/public/images/emoji/apple/satellite_orbital.png b/public/images/emoji/apple/satellite_orbital.png
index 28b9ab2fd72..4e5e18de917 100644
Binary files a/public/images/emoji/apple/satellite_orbital.png and b/public/images/emoji/apple/satellite_orbital.png differ
diff --git a/public/images/emoji/apple/satisfied.png b/public/images/emoji/apple/satisfied.png
index 7dd973daef2..eeac29f77c5 100644
Binary files a/public/images/emoji/apple/satisfied.png and b/public/images/emoji/apple/satisfied.png differ
diff --git a/public/images/emoji/apple/saudi_arabia.png b/public/images/emoji/apple/saudi_arabia.png
index a58c32dc2d9..7cd51a212c1 100644
Binary files a/public/images/emoji/apple/saudi_arabia.png and b/public/images/emoji/apple/saudi_arabia.png differ
diff --git a/public/images/emoji/apple/sauropod.png b/public/images/emoji/apple/sauropod.png
index 2f4d6199975..222c5d1ae19 100644
Binary files a/public/images/emoji/apple/sauropod.png and b/public/images/emoji/apple/sauropod.png differ
diff --git a/public/images/emoji/apple/saxophone.png b/public/images/emoji/apple/saxophone.png
index 51fa21f2de9..940a6190c64 100644
Binary files a/public/images/emoji/apple/saxophone.png and b/public/images/emoji/apple/saxophone.png differ
diff --git a/public/images/emoji/apple/scales.png b/public/images/emoji/apple/scales.png
index 5a49f802a7a..ae15720d89e 100644
Binary files a/public/images/emoji/apple/scales.png and b/public/images/emoji/apple/scales.png differ
diff --git a/public/images/emoji/apple/scarf.png b/public/images/emoji/apple/scarf.png
index 73653eee2bd..d49fa37138d 100644
Binary files a/public/images/emoji/apple/scarf.png and b/public/images/emoji/apple/scarf.png differ
diff --git a/public/images/emoji/apple/school.png b/public/images/emoji/apple/school.png
index a35e8e9d88e..66db1d056fe 100644
Binary files a/public/images/emoji/apple/school.png and b/public/images/emoji/apple/school.png differ
diff --git a/public/images/emoji/apple/school_satchel.png b/public/images/emoji/apple/school_satchel.png
index 4147b98ba67..a211308c1aa 100644
Binary files a/public/images/emoji/apple/school_satchel.png and b/public/images/emoji/apple/school_satchel.png differ
diff --git a/public/images/emoji/apple/scissors.png b/public/images/emoji/apple/scissors.png
index 7b7692a2c8b..5c411f20aed 100644
Binary files a/public/images/emoji/apple/scissors.png and b/public/images/emoji/apple/scissors.png differ
diff --git a/public/images/emoji/apple/scorpion.png b/public/images/emoji/apple/scorpion.png
index b76754f6dfe..4ecbce0997c 100644
Binary files a/public/images/emoji/apple/scorpion.png and b/public/images/emoji/apple/scorpion.png differ
diff --git a/public/images/emoji/apple/scorpius.png b/public/images/emoji/apple/scorpius.png
index 07960c5184d..06d0870209d 100644
Binary files a/public/images/emoji/apple/scorpius.png and b/public/images/emoji/apple/scorpius.png differ
diff --git a/public/images/emoji/apple/scream.png b/public/images/emoji/apple/scream.png
index 14c1f0d858d..2ace53522e9 100644
Binary files a/public/images/emoji/apple/scream.png and b/public/images/emoji/apple/scream.png differ
diff --git a/public/images/emoji/apple/scream_cat.png b/public/images/emoji/apple/scream_cat.png
index a750f130eca..ff5f63780f1 100644
Binary files a/public/images/emoji/apple/scream_cat.png and b/public/images/emoji/apple/scream_cat.png differ
diff --git a/public/images/emoji/apple/scroll.png b/public/images/emoji/apple/scroll.png
index 270de394878..50da787c065 100644
Binary files a/public/images/emoji/apple/scroll.png and b/public/images/emoji/apple/scroll.png differ
diff --git a/public/images/emoji/apple/seat.png b/public/images/emoji/apple/seat.png
index fbcefcac4c1..958567c99dc 100644
Binary files a/public/images/emoji/apple/seat.png and b/public/images/emoji/apple/seat.png differ
diff --git a/public/images/emoji/apple/secret.png b/public/images/emoji/apple/secret.png
index b434115e63e..cafe985c2fa 100644
Binary files a/public/images/emoji/apple/secret.png and b/public/images/emoji/apple/secret.png differ
diff --git a/public/images/emoji/apple/see_no_evil.png b/public/images/emoji/apple/see_no_evil.png
index 113d3c81866..37a8758f034 100644
Binary files a/public/images/emoji/apple/see_no_evil.png and b/public/images/emoji/apple/see_no_evil.png differ
diff --git a/public/images/emoji/apple/seedling.png b/public/images/emoji/apple/seedling.png
index 5f83d7530ad..3e14e959c08 100644
Binary files a/public/images/emoji/apple/seedling.png and b/public/images/emoji/apple/seedling.png differ
diff --git a/public/images/emoji/apple/selfie.png b/public/images/emoji/apple/selfie.png
index 0b36f4c531d..71e21fd1b63 100644
Binary files a/public/images/emoji/apple/selfie.png and b/public/images/emoji/apple/selfie.png differ
diff --git a/public/images/emoji/apple/selfie/2.png b/public/images/emoji/apple/selfie/2.png
index d867f24f873..286a80b52d9 100644
Binary files a/public/images/emoji/apple/selfie/2.png and b/public/images/emoji/apple/selfie/2.png differ
diff --git a/public/images/emoji/apple/selfie/3.png b/public/images/emoji/apple/selfie/3.png
index 69c7037eba9..938471668ae 100644
Binary files a/public/images/emoji/apple/selfie/3.png and b/public/images/emoji/apple/selfie/3.png differ
diff --git a/public/images/emoji/apple/selfie/4.png b/public/images/emoji/apple/selfie/4.png
index fff11d76b10..9893b7e6ad8 100644
Binary files a/public/images/emoji/apple/selfie/4.png and b/public/images/emoji/apple/selfie/4.png differ
diff --git a/public/images/emoji/apple/selfie/5.png b/public/images/emoji/apple/selfie/5.png
index e499dd49b59..5cb23a4aa79 100644
Binary files a/public/images/emoji/apple/selfie/5.png and b/public/images/emoji/apple/selfie/5.png differ
diff --git a/public/images/emoji/apple/selfie/6.png b/public/images/emoji/apple/selfie/6.png
index a5fe3859711..2a32126be73 100644
Binary files a/public/images/emoji/apple/selfie/6.png and b/public/images/emoji/apple/selfie/6.png differ
diff --git a/public/images/emoji/apple/senegal.png b/public/images/emoji/apple/senegal.png
index 41cdb2886b7..71de04a5133 100644
Binary files a/public/images/emoji/apple/senegal.png and b/public/images/emoji/apple/senegal.png differ
diff --git a/public/images/emoji/apple/serbia.png b/public/images/emoji/apple/serbia.png
index 22d8d0b7571..aca0f551989 100644
Binary files a/public/images/emoji/apple/serbia.png and b/public/images/emoji/apple/serbia.png differ
diff --git a/public/images/emoji/apple/seven.png b/public/images/emoji/apple/seven.png
index 8e280d07c46..c2239b38fc6 100644
Binary files a/public/images/emoji/apple/seven.png and b/public/images/emoji/apple/seven.png differ
diff --git a/public/images/emoji/apple/seychelles.png b/public/images/emoji/apple/seychelles.png
index 498e8ae1b6a..382854f4f2e 100644
Binary files a/public/images/emoji/apple/seychelles.png and b/public/images/emoji/apple/seychelles.png differ
diff --git a/public/images/emoji/apple/shallow_pan_of_food.png b/public/images/emoji/apple/shallow_pan_of_food.png
index e076ea5be24..b279790401c 100644
Binary files a/public/images/emoji/apple/shallow_pan_of_food.png and b/public/images/emoji/apple/shallow_pan_of_food.png differ
diff --git a/public/images/emoji/apple/shamrock.png b/public/images/emoji/apple/shamrock.png
index 596e05a1303..4d0c990a86e 100644
Binary files a/public/images/emoji/apple/shamrock.png and b/public/images/emoji/apple/shamrock.png differ
diff --git a/public/images/emoji/apple/shark.png b/public/images/emoji/apple/shark.png
index 4e10f0ddab9..17ad86bfc19 100644
Binary files a/public/images/emoji/apple/shark.png and b/public/images/emoji/apple/shark.png differ
diff --git a/public/images/emoji/apple/shaved_ice.png b/public/images/emoji/apple/shaved_ice.png
index 3756ff5b728..16f3f2c3e7f 100644
Binary files a/public/images/emoji/apple/shaved_ice.png and b/public/images/emoji/apple/shaved_ice.png differ
diff --git a/public/images/emoji/apple/sheep.png b/public/images/emoji/apple/sheep.png
index e5b60f919d5..18850b66b07 100644
Binary files a/public/images/emoji/apple/sheep.png and b/public/images/emoji/apple/sheep.png differ
diff --git a/public/images/emoji/apple/shell.png b/public/images/emoji/apple/shell.png
index 6585fb6a7e1..0a5c58bdf80 100644
Binary files a/public/images/emoji/apple/shell.png and b/public/images/emoji/apple/shell.png differ
diff --git a/public/images/emoji/apple/shield.png b/public/images/emoji/apple/shield.png
index c5ee6e40694..838288bfd49 100644
Binary files a/public/images/emoji/apple/shield.png and b/public/images/emoji/apple/shield.png differ
diff --git a/public/images/emoji/apple/shinto_shrine.png b/public/images/emoji/apple/shinto_shrine.png
index c124fe9a4a7..1f1eb0c0df5 100644
Binary files a/public/images/emoji/apple/shinto_shrine.png and b/public/images/emoji/apple/shinto_shrine.png differ
diff --git a/public/images/emoji/apple/ship.png b/public/images/emoji/apple/ship.png
index decc0e851ab..93f80210394 100644
Binary files a/public/images/emoji/apple/ship.png and b/public/images/emoji/apple/ship.png differ
diff --git a/public/images/emoji/apple/shirt.png b/public/images/emoji/apple/shirt.png
index 68a0867f0ab..fe293cf91db 100644
Binary files a/public/images/emoji/apple/shirt.png and b/public/images/emoji/apple/shirt.png differ
diff --git a/public/images/emoji/apple/shit.png b/public/images/emoji/apple/shit.png
index a025f430028..079c223fd3a 100644
Binary files a/public/images/emoji/apple/shit.png and b/public/images/emoji/apple/shit.png differ
diff --git a/public/images/emoji/apple/shopping.png b/public/images/emoji/apple/shopping.png
index a53082f3cd4..3957b45a52c 100644
Binary files a/public/images/emoji/apple/shopping.png and b/public/images/emoji/apple/shopping.png differ
diff --git a/public/images/emoji/apple/shopping_bags.png b/public/images/emoji/apple/shopping_bags.png
index a53082f3cd4..3957b45a52c 100644
Binary files a/public/images/emoji/apple/shopping_bags.png and b/public/images/emoji/apple/shopping_bags.png differ
diff --git a/public/images/emoji/apple/shopping_cart.png b/public/images/emoji/apple/shopping_cart.png
index 5601253eab6..27288b1599c 100644
Binary files a/public/images/emoji/apple/shopping_cart.png and b/public/images/emoji/apple/shopping_cart.png differ
diff --git a/public/images/emoji/apple/shower.png b/public/images/emoji/apple/shower.png
index 43e1a1b5b9f..8dea7d76f40 100644
Binary files a/public/images/emoji/apple/shower.png and b/public/images/emoji/apple/shower.png differ
diff --git a/public/images/emoji/apple/shrimp.png b/public/images/emoji/apple/shrimp.png
index 68d49971957..2a216838c49 100644
Binary files a/public/images/emoji/apple/shrimp.png and b/public/images/emoji/apple/shrimp.png differ
diff --git a/public/images/emoji/apple/shushing_face.png b/public/images/emoji/apple/shushing_face.png
index 222a912f119..6ee8fca723e 100644
Binary files a/public/images/emoji/apple/shushing_face.png and b/public/images/emoji/apple/shushing_face.png differ
diff --git a/public/images/emoji/apple/sierra_leone.png b/public/images/emoji/apple/sierra_leone.png
index 9f97f49ecf7..0b068e3134e 100644
Binary files a/public/images/emoji/apple/sierra_leone.png and b/public/images/emoji/apple/sierra_leone.png differ
diff --git a/public/images/emoji/apple/sign_of_the_horns.png b/public/images/emoji/apple/sign_of_the_horns.png
index 7518952e874..61467928ab4 100644
Binary files a/public/images/emoji/apple/sign_of_the_horns.png and b/public/images/emoji/apple/sign_of_the_horns.png differ
diff --git a/public/images/emoji/apple/sign_of_the_horns/2.png b/public/images/emoji/apple/sign_of_the_horns/2.png
index 46006766aef..0cd47f206a2 100644
Binary files a/public/images/emoji/apple/sign_of_the_horns/2.png and b/public/images/emoji/apple/sign_of_the_horns/2.png differ
diff --git a/public/images/emoji/apple/sign_of_the_horns/3.png b/public/images/emoji/apple/sign_of_the_horns/3.png
index 85aa93e844f..e29358a848b 100644
Binary files a/public/images/emoji/apple/sign_of_the_horns/3.png and b/public/images/emoji/apple/sign_of_the_horns/3.png differ
diff --git a/public/images/emoji/apple/sign_of_the_horns/4.png b/public/images/emoji/apple/sign_of_the_horns/4.png
index ff673252139..ed0771d638c 100644
Binary files a/public/images/emoji/apple/sign_of_the_horns/4.png and b/public/images/emoji/apple/sign_of_the_horns/4.png differ
diff --git a/public/images/emoji/apple/sign_of_the_horns/5.png b/public/images/emoji/apple/sign_of_the_horns/5.png
index 8f48f33a83c..349bbcea511 100644
Binary files a/public/images/emoji/apple/sign_of_the_horns/5.png and b/public/images/emoji/apple/sign_of_the_horns/5.png differ
diff --git a/public/images/emoji/apple/sign_of_the_horns/6.png b/public/images/emoji/apple/sign_of_the_horns/6.png
index beec4708b86..0d44071cdb8 100644
Binary files a/public/images/emoji/apple/sign_of_the_horns/6.png and b/public/images/emoji/apple/sign_of_the_horns/6.png differ
diff --git a/public/images/emoji/apple/signal_strength.png b/public/images/emoji/apple/signal_strength.png
index c058c63eaf9..62af149bf80 100644
Binary files a/public/images/emoji/apple/signal_strength.png and b/public/images/emoji/apple/signal_strength.png differ
diff --git a/public/images/emoji/apple/singapore.png b/public/images/emoji/apple/singapore.png
index b959a26b648..df38df077d0 100644
Binary files a/public/images/emoji/apple/singapore.png and b/public/images/emoji/apple/singapore.png differ
diff --git a/public/images/emoji/apple/sint_maarten.png b/public/images/emoji/apple/sint_maarten.png
index d56216fa0c7..56a91cd9070 100644
Binary files a/public/images/emoji/apple/sint_maarten.png and b/public/images/emoji/apple/sint_maarten.png differ
diff --git a/public/images/emoji/apple/six.png b/public/images/emoji/apple/six.png
index 230e33849b8..8ec9cdb10af 100644
Binary files a/public/images/emoji/apple/six.png and b/public/images/emoji/apple/six.png differ
diff --git a/public/images/emoji/apple/six_pointed_star.png b/public/images/emoji/apple/six_pointed_star.png
index f6f610d44c3..9b095e45eb2 100644
Binary files a/public/images/emoji/apple/six_pointed_star.png and b/public/images/emoji/apple/six_pointed_star.png differ
diff --git a/public/images/emoji/apple/skeleton.png b/public/images/emoji/apple/skeleton.png
index 9fff97187a6..779e2a6918f 100644
Binary files a/public/images/emoji/apple/skeleton.png and b/public/images/emoji/apple/skeleton.png differ
diff --git a/public/images/emoji/apple/ski.png b/public/images/emoji/apple/ski.png
index 5bd13a803b2..3f7b1a1731e 100644
Binary files a/public/images/emoji/apple/ski.png and b/public/images/emoji/apple/ski.png differ
diff --git a/public/images/emoji/apple/skier.png b/public/images/emoji/apple/skier.png
index 940aadb0af9..6863e83021f 100644
Binary files a/public/images/emoji/apple/skier.png and b/public/images/emoji/apple/skier.png differ
diff --git a/public/images/emoji/apple/skull.png b/public/images/emoji/apple/skull.png
index 9fff97187a6..779e2a6918f 100644
Binary files a/public/images/emoji/apple/skull.png and b/public/images/emoji/apple/skull.png differ
diff --git a/public/images/emoji/apple/skull_and_crossbones.png b/public/images/emoji/apple/skull_and_crossbones.png
index e819de8ce27..4050dba2c59 100644
Binary files a/public/images/emoji/apple/skull_and_crossbones.png and b/public/images/emoji/apple/skull_and_crossbones.png differ
diff --git a/public/images/emoji/apple/skull_crossbones.png b/public/images/emoji/apple/skull_crossbones.png
index e819de8ce27..4050dba2c59 100644
Binary files a/public/images/emoji/apple/skull_crossbones.png and b/public/images/emoji/apple/skull_crossbones.png differ
diff --git a/public/images/emoji/apple/sled.png b/public/images/emoji/apple/sled.png
index 01805b1fe76..615a8513f0a 100644
Binary files a/public/images/emoji/apple/sled.png and b/public/images/emoji/apple/sled.png differ
diff --git a/public/images/emoji/apple/sleeping.png b/public/images/emoji/apple/sleeping.png
index 6e50f02bf23..6c670ed972c 100644
Binary files a/public/images/emoji/apple/sleeping.png and b/public/images/emoji/apple/sleeping.png differ
diff --git a/public/images/emoji/apple/sleeping_accommodation.png b/public/images/emoji/apple/sleeping_accommodation.png
index 724d29e260a..a6e722bd3c6 100644
Binary files a/public/images/emoji/apple/sleeping_accommodation.png and b/public/images/emoji/apple/sleeping_accommodation.png differ
diff --git a/public/images/emoji/apple/sleeping_accommodation/2.png b/public/images/emoji/apple/sleeping_accommodation/2.png
new file mode 100644
index 00000000000..a6e722bd3c6
Binary files /dev/null and b/public/images/emoji/apple/sleeping_accommodation/2.png differ
diff --git a/public/images/emoji/apple/sleeping_accommodation/3.png b/public/images/emoji/apple/sleeping_accommodation/3.png
new file mode 100644
index 00000000000..a6e722bd3c6
Binary files /dev/null and b/public/images/emoji/apple/sleeping_accommodation/3.png differ
diff --git a/public/images/emoji/apple/sleeping_accommodation/4.png b/public/images/emoji/apple/sleeping_accommodation/4.png
new file mode 100644
index 00000000000..a6e722bd3c6
Binary files /dev/null and b/public/images/emoji/apple/sleeping_accommodation/4.png differ
diff --git a/public/images/emoji/apple/sleeping_accommodation/5.png b/public/images/emoji/apple/sleeping_accommodation/5.png
new file mode 100644
index 00000000000..a6e722bd3c6
Binary files /dev/null and b/public/images/emoji/apple/sleeping_accommodation/5.png differ
diff --git a/public/images/emoji/apple/sleeping_accommodation/6.png b/public/images/emoji/apple/sleeping_accommodation/6.png
new file mode 100644
index 00000000000..a6e722bd3c6
Binary files /dev/null and b/public/images/emoji/apple/sleeping_accommodation/6.png differ
diff --git a/public/images/emoji/apple/sleeping_bed.png b/public/images/emoji/apple/sleeping_bed.png
index 724d29e260a..a6e722bd3c6 100644
Binary files a/public/images/emoji/apple/sleeping_bed.png and b/public/images/emoji/apple/sleeping_bed.png differ
diff --git a/public/images/emoji/apple/sleeping_bed/2.png b/public/images/emoji/apple/sleeping_bed/2.png
new file mode 100644
index 00000000000..a6e722bd3c6
Binary files /dev/null and b/public/images/emoji/apple/sleeping_bed/2.png differ
diff --git a/public/images/emoji/apple/sleeping_bed/3.png b/public/images/emoji/apple/sleeping_bed/3.png
new file mode 100644
index 00000000000..a6e722bd3c6
Binary files /dev/null and b/public/images/emoji/apple/sleeping_bed/3.png differ
diff --git a/public/images/emoji/apple/sleeping_bed/4.png b/public/images/emoji/apple/sleeping_bed/4.png
new file mode 100644
index 00000000000..a6e722bd3c6
Binary files /dev/null and b/public/images/emoji/apple/sleeping_bed/4.png differ
diff --git a/public/images/emoji/apple/sleeping_bed/5.png b/public/images/emoji/apple/sleeping_bed/5.png
new file mode 100644
index 00000000000..a6e722bd3c6
Binary files /dev/null and b/public/images/emoji/apple/sleeping_bed/5.png differ
diff --git a/public/images/emoji/apple/sleeping_bed/6.png b/public/images/emoji/apple/sleeping_bed/6.png
new file mode 100644
index 00000000000..a6e722bd3c6
Binary files /dev/null and b/public/images/emoji/apple/sleeping_bed/6.png differ
diff --git a/public/images/emoji/apple/sleepy.png b/public/images/emoji/apple/sleepy.png
index 43de408a0a6..4cb85586c13 100644
Binary files a/public/images/emoji/apple/sleepy.png and b/public/images/emoji/apple/sleepy.png differ
diff --git a/public/images/emoji/apple/sleuth_or_spy.png b/public/images/emoji/apple/sleuth_or_spy.png
index 6a7e53aff05..1e0b7a87a00 100644
Binary files a/public/images/emoji/apple/sleuth_or_spy.png and b/public/images/emoji/apple/sleuth_or_spy.png differ
diff --git a/public/images/emoji/apple/sleuth_or_spy/2.png b/public/images/emoji/apple/sleuth_or_spy/2.png
index 229e7c2986e..63db2bf139d 100644
Binary files a/public/images/emoji/apple/sleuth_or_spy/2.png and b/public/images/emoji/apple/sleuth_or_spy/2.png differ
diff --git a/public/images/emoji/apple/sleuth_or_spy/3.png b/public/images/emoji/apple/sleuth_or_spy/3.png
index 58ee54ac888..5e962f6fbb2 100644
Binary files a/public/images/emoji/apple/sleuth_or_spy/3.png and b/public/images/emoji/apple/sleuth_or_spy/3.png differ
diff --git a/public/images/emoji/apple/sleuth_or_spy/4.png b/public/images/emoji/apple/sleuth_or_spy/4.png
index 0ce63e8b7de..882cf29faf6 100644
Binary files a/public/images/emoji/apple/sleuth_or_spy/4.png and b/public/images/emoji/apple/sleuth_or_spy/4.png differ
diff --git a/public/images/emoji/apple/sleuth_or_spy/5.png b/public/images/emoji/apple/sleuth_or_spy/5.png
index 838cf318fe0..758ef9f758e 100644
Binary files a/public/images/emoji/apple/sleuth_or_spy/5.png and b/public/images/emoji/apple/sleuth_or_spy/5.png differ
diff --git a/public/images/emoji/apple/sleuth_or_spy/6.png b/public/images/emoji/apple/sleuth_or_spy/6.png
index e0cb2a0d2a6..9fa59607070 100644
Binary files a/public/images/emoji/apple/sleuth_or_spy/6.png and b/public/images/emoji/apple/sleuth_or_spy/6.png differ
diff --git a/public/images/emoji/apple/slight_frown.png b/public/images/emoji/apple/slight_frown.png
index f70c3de7134..1dcc8689654 100644
Binary files a/public/images/emoji/apple/slight_frown.png and b/public/images/emoji/apple/slight_frown.png differ
diff --git a/public/images/emoji/apple/slight_smile.png b/public/images/emoji/apple/slight_smile.png
index 02756b99cb4..8c0ecdeaa2d 100644
Binary files a/public/images/emoji/apple/slight_smile.png and b/public/images/emoji/apple/slight_smile.png differ
diff --git a/public/images/emoji/apple/slightly_frowning_face.png b/public/images/emoji/apple/slightly_frowning_face.png
index f70c3de7134..1dcc8689654 100644
Binary files a/public/images/emoji/apple/slightly_frowning_face.png and b/public/images/emoji/apple/slightly_frowning_face.png differ
diff --git a/public/images/emoji/apple/slightly_smiling.png b/public/images/emoji/apple/slightly_smiling.png
index 02756b99cb4..8c0ecdeaa2d 100644
Binary files a/public/images/emoji/apple/slightly_smiling.png and b/public/images/emoji/apple/slightly_smiling.png differ
diff --git a/public/images/emoji/apple/slightly_smiling_face.png b/public/images/emoji/apple/slightly_smiling_face.png
index 02756b99cb4..8c0ecdeaa2d 100644
Binary files a/public/images/emoji/apple/slightly_smiling_face.png and b/public/images/emoji/apple/slightly_smiling_face.png differ
diff --git a/public/images/emoji/apple/slot_machine.png b/public/images/emoji/apple/slot_machine.png
index 26feee545c5..2032ef3c8c5 100644
Binary files a/public/images/emoji/apple/slot_machine.png and b/public/images/emoji/apple/slot_machine.png differ
diff --git a/public/images/emoji/apple/slovakia.png b/public/images/emoji/apple/slovakia.png
index 287b40bb241..317c21fb96a 100644
Binary files a/public/images/emoji/apple/slovakia.png and b/public/images/emoji/apple/slovakia.png differ
diff --git a/public/images/emoji/apple/slovenia.png b/public/images/emoji/apple/slovenia.png
index cf29751edf4..61e18ba86fb 100644
Binary files a/public/images/emoji/apple/slovenia.png and b/public/images/emoji/apple/slovenia.png differ
diff --git a/public/images/emoji/apple/small_airplane.png b/public/images/emoji/apple/small_airplane.png
index c5823b2577e..167237a1327 100644
Binary files a/public/images/emoji/apple/small_airplane.png and b/public/images/emoji/apple/small_airplane.png differ
diff --git a/public/images/emoji/apple/small_blue_diamond.png b/public/images/emoji/apple/small_blue_diamond.png
index cda760ab653..8e70edbe4a5 100644
Binary files a/public/images/emoji/apple/small_blue_diamond.png and b/public/images/emoji/apple/small_blue_diamond.png differ
diff --git a/public/images/emoji/apple/small_orange_diamond.png b/public/images/emoji/apple/small_orange_diamond.png
index b173ef91ed4..6c6914a99d8 100644
Binary files a/public/images/emoji/apple/small_orange_diamond.png and b/public/images/emoji/apple/small_orange_diamond.png differ
diff --git a/public/images/emoji/apple/small_red_triangle.png b/public/images/emoji/apple/small_red_triangle.png
index cbac1b1f3a5..b30347fa5d5 100644
Binary files a/public/images/emoji/apple/small_red_triangle.png and b/public/images/emoji/apple/small_red_triangle.png differ
diff --git a/public/images/emoji/apple/small_red_triangle_down.png b/public/images/emoji/apple/small_red_triangle_down.png
index 36a0b748351..88476a49838 100644
Binary files a/public/images/emoji/apple/small_red_triangle_down.png and b/public/images/emoji/apple/small_red_triangle_down.png differ
diff --git a/public/images/emoji/apple/smile.png b/public/images/emoji/apple/smile.png
index ec96ecb13c8..14db2a5ee0a 100644
Binary files a/public/images/emoji/apple/smile.png and b/public/images/emoji/apple/smile.png differ
diff --git a/public/images/emoji/apple/smile_cat.png b/public/images/emoji/apple/smile_cat.png
index e5d138b04c3..2565520fd92 100644
Binary files a/public/images/emoji/apple/smile_cat.png and b/public/images/emoji/apple/smile_cat.png differ
diff --git a/public/images/emoji/apple/smiley.png b/public/images/emoji/apple/smiley.png
index 3e8d067f090..7415a9f144b 100644
Binary files a/public/images/emoji/apple/smiley.png and b/public/images/emoji/apple/smiley.png differ
diff --git a/public/images/emoji/apple/smiley_cat.png b/public/images/emoji/apple/smiley_cat.png
index 0ebf0a3f266..7f9891e09e5 100644
Binary files a/public/images/emoji/apple/smiley_cat.png and b/public/images/emoji/apple/smiley_cat.png differ
diff --git a/public/images/emoji/apple/smiling_imp.png b/public/images/emoji/apple/smiling_imp.png
index 2505aca4a08..e8dd19149f9 100644
Binary files a/public/images/emoji/apple/smiling_imp.png and b/public/images/emoji/apple/smiling_imp.png differ
diff --git a/public/images/emoji/apple/smirk.png b/public/images/emoji/apple/smirk.png
index e7e894ab78f..cf777522447 100644
Binary files a/public/images/emoji/apple/smirk.png and b/public/images/emoji/apple/smirk.png differ
diff --git a/public/images/emoji/apple/smirk_cat.png b/public/images/emoji/apple/smirk_cat.png
index 5d7a656c1e4..34dbf68f768 100644
Binary files a/public/images/emoji/apple/smirk_cat.png and b/public/images/emoji/apple/smirk_cat.png differ
diff --git a/public/images/emoji/apple/smoking.png b/public/images/emoji/apple/smoking.png
index 6daba327ee5..b557256e1d8 100644
Binary files a/public/images/emoji/apple/smoking.png and b/public/images/emoji/apple/smoking.png differ
diff --git a/public/images/emoji/apple/snail.png b/public/images/emoji/apple/snail.png
index 38c1eae3a2b..71a498bed73 100644
Binary files a/public/images/emoji/apple/snail.png and b/public/images/emoji/apple/snail.png differ
diff --git a/public/images/emoji/apple/snake.png b/public/images/emoji/apple/snake.png
index ea94d95836b..91bb72c7f55 100644
Binary files a/public/images/emoji/apple/snake.png and b/public/images/emoji/apple/snake.png differ
diff --git a/public/images/emoji/apple/sneezing_face.png b/public/images/emoji/apple/sneezing_face.png
index f190bf0cb8a..6aed9bb83cb 100644
Binary files a/public/images/emoji/apple/sneezing_face.png and b/public/images/emoji/apple/sneezing_face.png differ
diff --git a/public/images/emoji/apple/snow_capped_mountain.png b/public/images/emoji/apple/snow_capped_mountain.png
index 0be1ad5feea..5ed2d7362d0 100644
Binary files a/public/images/emoji/apple/snow_capped_mountain.png and b/public/images/emoji/apple/snow_capped_mountain.png differ
diff --git a/public/images/emoji/apple/snowboarder/2.png b/public/images/emoji/apple/snowboarder/2.png
index a4f49938218..529f55f985f 100644
Binary files a/public/images/emoji/apple/snowboarder/2.png and b/public/images/emoji/apple/snowboarder/2.png differ
diff --git a/public/images/emoji/apple/snowboarder/3.png b/public/images/emoji/apple/snowboarder/3.png
index f18d5084305..529f55f985f 100644
Binary files a/public/images/emoji/apple/snowboarder/3.png and b/public/images/emoji/apple/snowboarder/3.png differ
diff --git a/public/images/emoji/apple/snowboarder/4.png b/public/images/emoji/apple/snowboarder/4.png
index 72183274200..529f55f985f 100644
Binary files a/public/images/emoji/apple/snowboarder/4.png and b/public/images/emoji/apple/snowboarder/4.png differ
diff --git a/public/images/emoji/apple/snowboarder/5.png b/public/images/emoji/apple/snowboarder/5.png
index b3372f66d7a..529f55f985f 100644
Binary files a/public/images/emoji/apple/snowboarder/5.png and b/public/images/emoji/apple/snowboarder/5.png differ
diff --git a/public/images/emoji/apple/snowboarder/6.png b/public/images/emoji/apple/snowboarder/6.png
index 245ed273019..529f55f985f 100644
Binary files a/public/images/emoji/apple/snowboarder/6.png and b/public/images/emoji/apple/snowboarder/6.png differ
diff --git a/public/images/emoji/apple/snowboarder/snowboarder/2.png b/public/images/emoji/apple/snowboarder/snowboarder/2.png
new file mode 100644
index 00000000000..a4f49938218
Binary files /dev/null and b/public/images/emoji/apple/snowboarder/snowboarder/2.png differ
diff --git a/public/images/emoji/apple/snowboarder/snowboarder/3.png b/public/images/emoji/apple/snowboarder/snowboarder/3.png
new file mode 100644
index 00000000000..f18d5084305
Binary files /dev/null and b/public/images/emoji/apple/snowboarder/snowboarder/3.png differ
diff --git a/public/images/emoji/apple/snowboarder/snowboarder/4.png b/public/images/emoji/apple/snowboarder/snowboarder/4.png
new file mode 100644
index 00000000000..72183274200
Binary files /dev/null and b/public/images/emoji/apple/snowboarder/snowboarder/4.png differ
diff --git a/public/images/emoji/apple/snowboarder/snowboarder/5.png b/public/images/emoji/apple/snowboarder/snowboarder/5.png
new file mode 100644
index 00000000000..b3372f66d7a
Binary files /dev/null and b/public/images/emoji/apple/snowboarder/snowboarder/5.png differ
diff --git a/public/images/emoji/apple/snowboarder/snowboarder/6.png b/public/images/emoji/apple/snowboarder/snowboarder/6.png
new file mode 100644
index 00000000000..245ed273019
Binary files /dev/null and b/public/images/emoji/apple/snowboarder/snowboarder/6.png differ
diff --git a/public/images/emoji/apple/snowflake.png b/public/images/emoji/apple/snowflake.png
index 4745565c4c4..e067bc7c084 100644
Binary files a/public/images/emoji/apple/snowflake.png and b/public/images/emoji/apple/snowflake.png differ
diff --git a/public/images/emoji/apple/snowman.png b/public/images/emoji/apple/snowman.png
index 13a88d60ef3..94b11a6fb38 100644
Binary files a/public/images/emoji/apple/snowman.png and b/public/images/emoji/apple/snowman.png differ
diff --git a/public/images/emoji/apple/snowman2.png b/public/images/emoji/apple/snowman2.png
index 4ae1cfb955d..d85d031d3f3 100644
Binary files a/public/images/emoji/apple/snowman2.png and b/public/images/emoji/apple/snowman2.png differ
diff --git a/public/images/emoji/apple/snowman_with_snow.png b/public/images/emoji/apple/snowman_with_snow.png
index 4ae1cfb955d..d85d031d3f3 100644
Binary files a/public/images/emoji/apple/snowman_with_snow.png and b/public/images/emoji/apple/snowman_with_snow.png differ
diff --git a/public/images/emoji/apple/sob.png b/public/images/emoji/apple/sob.png
index 5674beaff2b..d141324da9d 100644
Binary files a/public/images/emoji/apple/sob.png and b/public/images/emoji/apple/sob.png differ
diff --git a/public/images/emoji/apple/soccer.png b/public/images/emoji/apple/soccer.png
index b67be4121d5..597c137ee5f 100644
Binary files a/public/images/emoji/apple/soccer.png and b/public/images/emoji/apple/soccer.png differ
diff --git a/public/images/emoji/apple/socks.png b/public/images/emoji/apple/socks.png
index 8f2b9bbe9e3..dd0bb2afacc 100644
Binary files a/public/images/emoji/apple/socks.png and b/public/images/emoji/apple/socks.png differ
diff --git a/public/images/emoji/apple/solomon_islands.png b/public/images/emoji/apple/solomon_islands.png
index 32fd718c87e..352828d3dfa 100644
Binary files a/public/images/emoji/apple/solomon_islands.png and b/public/images/emoji/apple/solomon_islands.png differ
diff --git a/public/images/emoji/apple/somalia.png b/public/images/emoji/apple/somalia.png
index 01ec1737ff5..b08031f33cc 100644
Binary files a/public/images/emoji/apple/somalia.png and b/public/images/emoji/apple/somalia.png differ
diff --git a/public/images/emoji/apple/soon.png b/public/images/emoji/apple/soon.png
index 237fd661c56..e2b280278d7 100644
Binary files a/public/images/emoji/apple/soon.png and b/public/images/emoji/apple/soon.png differ
diff --git a/public/images/emoji/apple/sos.png b/public/images/emoji/apple/sos.png
index d5dd10cd6bf..624e6e0f155 100644
Binary files a/public/images/emoji/apple/sos.png and b/public/images/emoji/apple/sos.png differ
diff --git a/public/images/emoji/apple/sound.png b/public/images/emoji/apple/sound.png
index 2497fe0d312..58673e8005b 100644
Binary files a/public/images/emoji/apple/sound.png and b/public/images/emoji/apple/sound.png differ
diff --git a/public/images/emoji/apple/south_africa.png b/public/images/emoji/apple/south_africa.png
index e4bc22da627..7717a3b2e9f 100644
Binary files a/public/images/emoji/apple/south_africa.png and b/public/images/emoji/apple/south_africa.png differ
diff --git a/public/images/emoji/apple/south_georgia_south_sandwich_islands.png b/public/images/emoji/apple/south_georgia_south_sandwich_islands.png
index 55476e920c6..b3098fe5a67 100644
Binary files a/public/images/emoji/apple/south_georgia_south_sandwich_islands.png and b/public/images/emoji/apple/south_georgia_south_sandwich_islands.png differ
diff --git a/public/images/emoji/apple/south_sudan.png b/public/images/emoji/apple/south_sudan.png
index 725a527adc3..ede630da60d 100644
Binary files a/public/images/emoji/apple/south_sudan.png and b/public/images/emoji/apple/south_sudan.png differ
diff --git a/public/images/emoji/apple/space_invader.png b/public/images/emoji/apple/space_invader.png
index ce6123859cf..25e9d460efc 100644
Binary files a/public/images/emoji/apple/space_invader.png and b/public/images/emoji/apple/space_invader.png differ
diff --git a/public/images/emoji/apple/spades.png b/public/images/emoji/apple/spades.png
index e27b29fc4bc..3371fbd46d0 100644
Binary files a/public/images/emoji/apple/spades.png and b/public/images/emoji/apple/spades.png differ
diff --git a/public/images/emoji/apple/spaghetti.png b/public/images/emoji/apple/spaghetti.png
index d2f02f77f5a..c022b013dea 100644
Binary files a/public/images/emoji/apple/spaghetti.png and b/public/images/emoji/apple/spaghetti.png differ
diff --git a/public/images/emoji/apple/sparkle.png b/public/images/emoji/apple/sparkle.png
index 8951f218b37..8f1b3de3fe5 100644
Binary files a/public/images/emoji/apple/sparkle.png and b/public/images/emoji/apple/sparkle.png differ
diff --git a/public/images/emoji/apple/sparkler.png b/public/images/emoji/apple/sparkler.png
index 177b189a9c9..c7780557456 100644
Binary files a/public/images/emoji/apple/sparkler.png and b/public/images/emoji/apple/sparkler.png differ
diff --git a/public/images/emoji/apple/sparkles.png b/public/images/emoji/apple/sparkles.png
index b08bcfafdd4..f61a84a4cb6 100644
Binary files a/public/images/emoji/apple/sparkles.png and b/public/images/emoji/apple/sparkles.png differ
diff --git a/public/images/emoji/apple/sparkling_heart.png b/public/images/emoji/apple/sparkling_heart.png
index 26d8ae6198e..60c9d615aa8 100644
Binary files a/public/images/emoji/apple/sparkling_heart.png and b/public/images/emoji/apple/sparkling_heart.png differ
diff --git a/public/images/emoji/apple/speak_no_evil.png b/public/images/emoji/apple/speak_no_evil.png
index e52642249dd..202020263ef 100644
Binary files a/public/images/emoji/apple/speak_no_evil.png and b/public/images/emoji/apple/speak_no_evil.png differ
diff --git a/public/images/emoji/apple/speaker.png b/public/images/emoji/apple/speaker.png
index 9ef912ee4db..92d55140371 100644
Binary files a/public/images/emoji/apple/speaker.png and b/public/images/emoji/apple/speaker.png differ
diff --git a/public/images/emoji/apple/speaking_head.png b/public/images/emoji/apple/speaking_head.png
index e11319ddc24..3b53ecaf71c 100644
Binary files a/public/images/emoji/apple/speaking_head.png and b/public/images/emoji/apple/speaking_head.png differ
diff --git a/public/images/emoji/apple/speaking_head_in_silhouette.png b/public/images/emoji/apple/speaking_head_in_silhouette.png
index e11319ddc24..3b53ecaf71c 100644
Binary files a/public/images/emoji/apple/speaking_head_in_silhouette.png and b/public/images/emoji/apple/speaking_head_in_silhouette.png differ
diff --git a/public/images/emoji/apple/speech_balloon.png b/public/images/emoji/apple/speech_balloon.png
index d668842060d..7b9b92e92a6 100644
Binary files a/public/images/emoji/apple/speech_balloon.png and b/public/images/emoji/apple/speech_balloon.png differ
diff --git a/public/images/emoji/apple/speedboat.png b/public/images/emoji/apple/speedboat.png
index 34000044bd6..330a0a7e72f 100644
Binary files a/public/images/emoji/apple/speedboat.png and b/public/images/emoji/apple/speedboat.png differ
diff --git a/public/images/emoji/apple/spider.png b/public/images/emoji/apple/spider.png
index 742a820d2aa..9599e7fbd54 100644
Binary files a/public/images/emoji/apple/spider.png and b/public/images/emoji/apple/spider.png differ
diff --git a/public/images/emoji/apple/spider_web.png b/public/images/emoji/apple/spider_web.png
index 2e2f9e0baee..a5aaf2a28c3 100644
Binary files a/public/images/emoji/apple/spider_web.png and b/public/images/emoji/apple/spider_web.png differ
diff --git a/public/images/emoji/apple/spiral_calendar.png b/public/images/emoji/apple/spiral_calendar.png
index 74b98132ddc..0507e0a314e 100644
Binary files a/public/images/emoji/apple/spiral_calendar.png and b/public/images/emoji/apple/spiral_calendar.png differ
diff --git a/public/images/emoji/apple/spiral_calendar_pad.png b/public/images/emoji/apple/spiral_calendar_pad.png
index 74b98132ddc..0507e0a314e 100644
Binary files a/public/images/emoji/apple/spiral_calendar_pad.png and b/public/images/emoji/apple/spiral_calendar_pad.png differ
diff --git a/public/images/emoji/apple/spiral_note_pad.png b/public/images/emoji/apple/spiral_note_pad.png
index 5e4c3a2d0e2..b7ca22fbaaf 100644
Binary files a/public/images/emoji/apple/spiral_note_pad.png and b/public/images/emoji/apple/spiral_note_pad.png differ
diff --git a/public/images/emoji/apple/spiral_notepad.png b/public/images/emoji/apple/spiral_notepad.png
index 5e4c3a2d0e2..b7ca22fbaaf 100644
Binary files a/public/images/emoji/apple/spiral_notepad.png and b/public/images/emoji/apple/spiral_notepad.png differ
diff --git a/public/images/emoji/apple/spoon.png b/public/images/emoji/apple/spoon.png
index 0d7ccd11fe9..55586d7ebeb 100644
Binary files a/public/images/emoji/apple/spoon.png and b/public/images/emoji/apple/spoon.png differ
diff --git a/public/images/emoji/apple/sports_medal.png b/public/images/emoji/apple/sports_medal.png
index 6e66f143863..320a405e1a8 100644
Binary files a/public/images/emoji/apple/sports_medal.png and b/public/images/emoji/apple/sports_medal.png differ
diff --git a/public/images/emoji/apple/spy.png b/public/images/emoji/apple/spy.png
index 6a7e53aff05..1e0b7a87a00 100644
Binary files a/public/images/emoji/apple/spy.png and b/public/images/emoji/apple/spy.png differ
diff --git a/public/images/emoji/apple/spy/2.png b/public/images/emoji/apple/spy/2.png
index 229e7c2986e..63db2bf139d 100644
Binary files a/public/images/emoji/apple/spy/2.png and b/public/images/emoji/apple/spy/2.png differ
diff --git a/public/images/emoji/apple/spy/3.png b/public/images/emoji/apple/spy/3.png
index 58ee54ac888..5e962f6fbb2 100644
Binary files a/public/images/emoji/apple/spy/3.png and b/public/images/emoji/apple/spy/3.png differ
diff --git a/public/images/emoji/apple/spy/4.png b/public/images/emoji/apple/spy/4.png
index 0ce63e8b7de..882cf29faf6 100644
Binary files a/public/images/emoji/apple/spy/4.png and b/public/images/emoji/apple/spy/4.png differ
diff --git a/public/images/emoji/apple/spy/5.png b/public/images/emoji/apple/spy/5.png
index 838cf318fe0..758ef9f758e 100644
Binary files a/public/images/emoji/apple/spy/5.png and b/public/images/emoji/apple/spy/5.png differ
diff --git a/public/images/emoji/apple/spy/6.png b/public/images/emoji/apple/spy/6.png
index e0cb2a0d2a6..9fa59607070 100644
Binary files a/public/images/emoji/apple/spy/6.png and b/public/images/emoji/apple/spy/6.png differ
diff --git a/public/images/emoji/apple/squid.png b/public/images/emoji/apple/squid.png
index 2c06de8797b..f4d3d635a41 100644
Binary files a/public/images/emoji/apple/squid.png and b/public/images/emoji/apple/squid.png differ
diff --git a/public/images/emoji/apple/sri_lanka.png b/public/images/emoji/apple/sri_lanka.png
index 9e13db4ab69..3f93622e6cd 100644
Binary files a/public/images/emoji/apple/sri_lanka.png and b/public/images/emoji/apple/sri_lanka.png differ
diff --git a/public/images/emoji/apple/st_barthelemy.png b/public/images/emoji/apple/st_barthelemy.png
index daca6aa34a5..fc4c8807c77 100644
Binary files a/public/images/emoji/apple/st_barthelemy.png and b/public/images/emoji/apple/st_barthelemy.png differ
diff --git a/public/images/emoji/apple/st_helena.png b/public/images/emoji/apple/st_helena.png
index 694a0b8510c..12cee871e2f 100644
Binary files a/public/images/emoji/apple/st_helena.png and b/public/images/emoji/apple/st_helena.png differ
diff --git a/public/images/emoji/apple/st_kitts_nevis.png b/public/images/emoji/apple/st_kitts_nevis.png
index 18dda8f654f..d6de431053c 100644
Binary files a/public/images/emoji/apple/st_kitts_nevis.png and b/public/images/emoji/apple/st_kitts_nevis.png differ
diff --git a/public/images/emoji/apple/st_lucia.png b/public/images/emoji/apple/st_lucia.png
index 5d2d00f4db5..37e881f5c4b 100644
Binary files a/public/images/emoji/apple/st_lucia.png and b/public/images/emoji/apple/st_lucia.png differ
diff --git a/public/images/emoji/apple/st_martin.png b/public/images/emoji/apple/st_martin.png
index efcd5fff75f..3360b84a7fa 100644
Binary files a/public/images/emoji/apple/st_martin.png and b/public/images/emoji/apple/st_martin.png differ
diff --git a/public/images/emoji/apple/st_pierre_miquelon.png b/public/images/emoji/apple/st_pierre_miquelon.png
index 699bcf18994..79f75e81f19 100644
Binary files a/public/images/emoji/apple/st_pierre_miquelon.png and b/public/images/emoji/apple/st_pierre_miquelon.png differ
diff --git a/public/images/emoji/apple/st_vincent_grenadines.png b/public/images/emoji/apple/st_vincent_grenadines.png
index e06af20e140..c143bc621df 100644
Binary files a/public/images/emoji/apple/st_vincent_grenadines.png and b/public/images/emoji/apple/st_vincent_grenadines.png differ
diff --git a/public/images/emoji/apple/stadium.png b/public/images/emoji/apple/stadium.png
index bdff0d70cc5..8546e372d92 100644
Binary files a/public/images/emoji/apple/stadium.png and b/public/images/emoji/apple/stadium.png differ
diff --git a/public/images/emoji/apple/star.png b/public/images/emoji/apple/star.png
index 2778f4a5e43..b4e8e2aa098 100644
Binary files a/public/images/emoji/apple/star.png and b/public/images/emoji/apple/star.png differ
diff --git a/public/images/emoji/apple/star2.png b/public/images/emoji/apple/star2.png
index 37c8d2b0a88..e1064635a5a 100644
Binary files a/public/images/emoji/apple/star2.png and b/public/images/emoji/apple/star2.png differ
diff --git a/public/images/emoji/apple/star_and_crescent.png b/public/images/emoji/apple/star_and_crescent.png
index 720237b3caa..1dd4cabd5f9 100644
Binary files a/public/images/emoji/apple/star_and_crescent.png and b/public/images/emoji/apple/star_and_crescent.png differ
diff --git a/public/images/emoji/apple/star_of_david.png b/public/images/emoji/apple/star_of_david.png
index be2ddc89ce6..3adc56e746a 100644
Binary files a/public/images/emoji/apple/star_of_david.png and b/public/images/emoji/apple/star_of_david.png differ
diff --git a/public/images/emoji/apple/star_struck.png b/public/images/emoji/apple/star_struck.png
index 7da8183f394..0f5fd541f87 100644
Binary files a/public/images/emoji/apple/star_struck.png and b/public/images/emoji/apple/star_struck.png differ
diff --git a/public/images/emoji/apple/stars.png b/public/images/emoji/apple/stars.png
index b48e69b8206..fd173ce1939 100644
Binary files a/public/images/emoji/apple/stars.png and b/public/images/emoji/apple/stars.png differ
diff --git a/public/images/emoji/apple/station.png b/public/images/emoji/apple/station.png
index eaa21c05e70..8ed37aacf5c 100644
Binary files a/public/images/emoji/apple/station.png and b/public/images/emoji/apple/station.png differ
diff --git a/public/images/emoji/apple/statue_of_liberty.png b/public/images/emoji/apple/statue_of_liberty.png
index 58e1f0e5462..f64a93e5ea1 100644
Binary files a/public/images/emoji/apple/statue_of_liberty.png and b/public/images/emoji/apple/statue_of_liberty.png differ
diff --git a/public/images/emoji/apple/steam_locomotive.png b/public/images/emoji/apple/steam_locomotive.png
index 362fe4c2e6e..9764571608f 100644
Binary files a/public/images/emoji/apple/steam_locomotive.png and b/public/images/emoji/apple/steam_locomotive.png differ
diff --git a/public/images/emoji/apple/stew.png b/public/images/emoji/apple/stew.png
index fad912a0e50..c99a63f1180 100644
Binary files a/public/images/emoji/apple/stew.png and b/public/images/emoji/apple/stew.png differ
diff --git a/public/images/emoji/apple/stop_button.png b/public/images/emoji/apple/stop_button.png
index 3d64cca051d..da11de5be50 100644
Binary files a/public/images/emoji/apple/stop_button.png and b/public/images/emoji/apple/stop_button.png differ
diff --git a/public/images/emoji/apple/stop_sign.png b/public/images/emoji/apple/stop_sign.png
index 917da78ce62..bac482578ed 100644
Binary files a/public/images/emoji/apple/stop_sign.png and b/public/images/emoji/apple/stop_sign.png differ
diff --git a/public/images/emoji/apple/stopwatch.png b/public/images/emoji/apple/stopwatch.png
index 8661924183e..9a210f60127 100644
Binary files a/public/images/emoji/apple/stopwatch.png and b/public/images/emoji/apple/stopwatch.png differ
diff --git a/public/images/emoji/apple/straight_ruler.png b/public/images/emoji/apple/straight_ruler.png
index 01fa9244008..86340fee22a 100644
Binary files a/public/images/emoji/apple/straight_ruler.png and b/public/images/emoji/apple/straight_ruler.png differ
diff --git a/public/images/emoji/apple/strawberry.png b/public/images/emoji/apple/strawberry.png
index 2316a8bb4e4..9fbc514623e 100644
Binary files a/public/images/emoji/apple/strawberry.png and b/public/images/emoji/apple/strawberry.png differ
diff --git a/public/images/emoji/apple/stuck_out_tongue.png b/public/images/emoji/apple/stuck_out_tongue.png
index baef9b5c0eb..4c9942fd719 100644
Binary files a/public/images/emoji/apple/stuck_out_tongue.png and b/public/images/emoji/apple/stuck_out_tongue.png differ
diff --git a/public/images/emoji/apple/stuck_out_tongue_closed_eyes.png b/public/images/emoji/apple/stuck_out_tongue_closed_eyes.png
index a8ee962b464..9fff53ae361 100644
Binary files a/public/images/emoji/apple/stuck_out_tongue_closed_eyes.png and b/public/images/emoji/apple/stuck_out_tongue_closed_eyes.png differ
diff --git a/public/images/emoji/apple/stuck_out_tongue_winking_eye.png b/public/images/emoji/apple/stuck_out_tongue_winking_eye.png
index e9a0f3c0a09..1043bd34d5b 100644
Binary files a/public/images/emoji/apple/stuck_out_tongue_winking_eye.png and b/public/images/emoji/apple/stuck_out_tongue_winking_eye.png differ
diff --git a/public/images/emoji/apple/studio_microphone.png b/public/images/emoji/apple/studio_microphone.png
index 6f6e1dc3c9a..21f1c67b9ab 100644
Binary files a/public/images/emoji/apple/studio_microphone.png and b/public/images/emoji/apple/studio_microphone.png differ
diff --git a/public/images/emoji/apple/stuffed_flatbread.png b/public/images/emoji/apple/stuffed_flatbread.png
index c6d649fad70..1e462d6a09b 100644
Binary files a/public/images/emoji/apple/stuffed_flatbread.png and b/public/images/emoji/apple/stuffed_flatbread.png differ
diff --git a/public/images/emoji/apple/sudan.png b/public/images/emoji/apple/sudan.png
index 7444db0904d..c8e6c62a269 100644
Binary files a/public/images/emoji/apple/sudan.png and b/public/images/emoji/apple/sudan.png differ
diff --git a/public/images/emoji/apple/sun_behind_large_cloud.png b/public/images/emoji/apple/sun_behind_large_cloud.png
index 86329213734..fcd766cda53 100644
Binary files a/public/images/emoji/apple/sun_behind_large_cloud.png and b/public/images/emoji/apple/sun_behind_large_cloud.png differ
diff --git a/public/images/emoji/apple/sun_behind_rain_cloud.png b/public/images/emoji/apple/sun_behind_rain_cloud.png
index 16324c90c45..b938ac990b7 100644
Binary files a/public/images/emoji/apple/sun_behind_rain_cloud.png and b/public/images/emoji/apple/sun_behind_rain_cloud.png differ
diff --git a/public/images/emoji/apple/sun_behind_small_cloud.png b/public/images/emoji/apple/sun_behind_small_cloud.png
index aaaf576a064..396dd969eed 100644
Binary files a/public/images/emoji/apple/sun_behind_small_cloud.png and b/public/images/emoji/apple/sun_behind_small_cloud.png differ
diff --git a/public/images/emoji/apple/sun_with_face.png b/public/images/emoji/apple/sun_with_face.png
index 22c7765db3d..2c82a925ddf 100644
Binary files a/public/images/emoji/apple/sun_with_face.png and b/public/images/emoji/apple/sun_with_face.png differ
diff --git a/public/images/emoji/apple/sunflower.png b/public/images/emoji/apple/sunflower.png
index 3a36efe239b..786d4129406 100644
Binary files a/public/images/emoji/apple/sunflower.png and b/public/images/emoji/apple/sunflower.png differ
diff --git a/public/images/emoji/apple/sunglasses.png b/public/images/emoji/apple/sunglasses.png
index 1c02e7737b4..e85fd371cb4 100644
Binary files a/public/images/emoji/apple/sunglasses.png and b/public/images/emoji/apple/sunglasses.png differ
diff --git a/public/images/emoji/apple/sunny.png b/public/images/emoji/apple/sunny.png
index c19f975639c..f9f1b02c4c6 100644
Binary files a/public/images/emoji/apple/sunny.png and b/public/images/emoji/apple/sunny.png differ
diff --git a/public/images/emoji/apple/sunrise.png b/public/images/emoji/apple/sunrise.png
index b66b8e55674..a1e7a08049c 100644
Binary files a/public/images/emoji/apple/sunrise.png and b/public/images/emoji/apple/sunrise.png differ
diff --git a/public/images/emoji/apple/sunrise_over_mountains.png b/public/images/emoji/apple/sunrise_over_mountains.png
index d6cdfd36806..b2c021023e0 100644
Binary files a/public/images/emoji/apple/sunrise_over_mountains.png and b/public/images/emoji/apple/sunrise_over_mountains.png differ
diff --git a/public/images/emoji/apple/surfer.png b/public/images/emoji/apple/surfer.png
index 476e43df4e4..4cebee634f7 100644
Binary files a/public/images/emoji/apple/surfer.png and b/public/images/emoji/apple/surfer.png differ
diff --git a/public/images/emoji/apple/surfer/2.png b/public/images/emoji/apple/surfer/2.png
index a0482f48190..f0f6fefd606 100644
Binary files a/public/images/emoji/apple/surfer/2.png and b/public/images/emoji/apple/surfer/2.png differ
diff --git a/public/images/emoji/apple/surfer/3.png b/public/images/emoji/apple/surfer/3.png
index e4e3fe4bd3a..c37d7db30a6 100644
Binary files a/public/images/emoji/apple/surfer/3.png and b/public/images/emoji/apple/surfer/3.png differ
diff --git a/public/images/emoji/apple/surfer/4.png b/public/images/emoji/apple/surfer/4.png
index 33401ea804c..950dfd3dd6b 100644
Binary files a/public/images/emoji/apple/surfer/4.png and b/public/images/emoji/apple/surfer/4.png differ
diff --git a/public/images/emoji/apple/surfer/5.png b/public/images/emoji/apple/surfer/5.png
index a565a32f316..e436cc4102c 100644
Binary files a/public/images/emoji/apple/surfer/5.png and b/public/images/emoji/apple/surfer/5.png differ
diff --git a/public/images/emoji/apple/surfer/6.png b/public/images/emoji/apple/surfer/6.png
index 560070c2a10..e1f11305e02 100644
Binary files a/public/images/emoji/apple/surfer/6.png and b/public/images/emoji/apple/surfer/6.png differ
diff --git a/public/images/emoji/apple/surfing_man.png b/public/images/emoji/apple/surfing_man.png
index 476e43df4e4..4cebee634f7 100644
Binary files a/public/images/emoji/apple/surfing_man.png and b/public/images/emoji/apple/surfing_man.png differ
diff --git a/public/images/emoji/apple/surfing_man/2.png b/public/images/emoji/apple/surfing_man/2.png
index a0482f48190..f0f6fefd606 100644
Binary files a/public/images/emoji/apple/surfing_man/2.png and b/public/images/emoji/apple/surfing_man/2.png differ
diff --git a/public/images/emoji/apple/surfing_man/3.png b/public/images/emoji/apple/surfing_man/3.png
index e4e3fe4bd3a..c37d7db30a6 100644
Binary files a/public/images/emoji/apple/surfing_man/3.png and b/public/images/emoji/apple/surfing_man/3.png differ
diff --git a/public/images/emoji/apple/surfing_man/4.png b/public/images/emoji/apple/surfing_man/4.png
index 33401ea804c..950dfd3dd6b 100644
Binary files a/public/images/emoji/apple/surfing_man/4.png and b/public/images/emoji/apple/surfing_man/4.png differ
diff --git a/public/images/emoji/apple/surfing_man/5.png b/public/images/emoji/apple/surfing_man/5.png
index a565a32f316..e436cc4102c 100644
Binary files a/public/images/emoji/apple/surfing_man/5.png and b/public/images/emoji/apple/surfing_man/5.png differ
diff --git a/public/images/emoji/apple/surfing_man/6.png b/public/images/emoji/apple/surfing_man/6.png
index 560070c2a10..e1f11305e02 100644
Binary files a/public/images/emoji/apple/surfing_man/6.png and b/public/images/emoji/apple/surfing_man/6.png differ
diff --git a/public/images/emoji/apple/surfing_woman.png b/public/images/emoji/apple/surfing_woman.png
index 2b4606fe7c5..d427bf7b644 100644
Binary files a/public/images/emoji/apple/surfing_woman.png and b/public/images/emoji/apple/surfing_woman.png differ
diff --git a/public/images/emoji/apple/surfing_woman/2.png b/public/images/emoji/apple/surfing_woman/2.png
index 8065c6f6662..38aaf130e8b 100644
Binary files a/public/images/emoji/apple/surfing_woman/2.png and b/public/images/emoji/apple/surfing_woman/2.png differ
diff --git a/public/images/emoji/apple/surfing_woman/3.png b/public/images/emoji/apple/surfing_woman/3.png
index 6a94c33b27c..e14891f0d9a 100644
Binary files a/public/images/emoji/apple/surfing_woman/3.png and b/public/images/emoji/apple/surfing_woman/3.png differ
diff --git a/public/images/emoji/apple/surfing_woman/4.png b/public/images/emoji/apple/surfing_woman/4.png
index 20388425a2d..ddff71c4c20 100644
Binary files a/public/images/emoji/apple/surfing_woman/4.png and b/public/images/emoji/apple/surfing_woman/4.png differ
diff --git a/public/images/emoji/apple/surfing_woman/5.png b/public/images/emoji/apple/surfing_woman/5.png
index b89c8b8b2d2..fcb8bb43c28 100644
Binary files a/public/images/emoji/apple/surfing_woman/5.png and b/public/images/emoji/apple/surfing_woman/5.png differ
diff --git a/public/images/emoji/apple/surfing_woman/6.png b/public/images/emoji/apple/surfing_woman/6.png
index 8cdf1ee6f96..d59ae9e6155 100644
Binary files a/public/images/emoji/apple/surfing_woman/6.png and b/public/images/emoji/apple/surfing_woman/6.png differ
diff --git a/public/images/emoji/apple/suriname.png b/public/images/emoji/apple/suriname.png
index 5d733dba9bb..b1c3d8338ea 100644
Binary files a/public/images/emoji/apple/suriname.png and b/public/images/emoji/apple/suriname.png differ
diff --git a/public/images/emoji/apple/sushi.png b/public/images/emoji/apple/sushi.png
index 90c513ca69a..5123bd8b01e 100644
Binary files a/public/images/emoji/apple/sushi.png and b/public/images/emoji/apple/sushi.png differ
diff --git a/public/images/emoji/apple/suspension_railway.png b/public/images/emoji/apple/suspension_railway.png
index 1fb5eaac101..79319ba0e81 100644
Binary files a/public/images/emoji/apple/suspension_railway.png and b/public/images/emoji/apple/suspension_railway.png differ
diff --git a/public/images/emoji/apple/svalbard_and_jan_mayen.png b/public/images/emoji/apple/svalbard_and_jan_mayen.png
index 5827a3d3767..17fda5559aa 100644
Binary files a/public/images/emoji/apple/svalbard_and_jan_mayen.png and b/public/images/emoji/apple/svalbard_and_jan_mayen.png differ
diff --git a/public/images/emoji/apple/swaziland.png b/public/images/emoji/apple/swaziland.png
index 40b243ee995..2bd4d4aeda8 100644
Binary files a/public/images/emoji/apple/swaziland.png and b/public/images/emoji/apple/swaziland.png differ
diff --git a/public/images/emoji/apple/sweat.png b/public/images/emoji/apple/sweat.png
index 755dfe2ce23..3560fb5fee4 100644
Binary files a/public/images/emoji/apple/sweat.png and b/public/images/emoji/apple/sweat.png differ
diff --git a/public/images/emoji/apple/sweat_drops.png b/public/images/emoji/apple/sweat_drops.png
index 285e5876eff..693bbafbde4 100644
Binary files a/public/images/emoji/apple/sweat_drops.png and b/public/images/emoji/apple/sweat_drops.png differ
diff --git a/public/images/emoji/apple/sweat_smile.png b/public/images/emoji/apple/sweat_smile.png
index 586fcdb3811..3fc7f387586 100644
Binary files a/public/images/emoji/apple/sweat_smile.png and b/public/images/emoji/apple/sweat_smile.png differ
diff --git a/public/images/emoji/apple/sweden.png b/public/images/emoji/apple/sweden.png
index 2c266bf1693..d6dceed97ae 100644
Binary files a/public/images/emoji/apple/sweden.png and b/public/images/emoji/apple/sweden.png differ
diff --git a/public/images/emoji/apple/sweet_potato.png b/public/images/emoji/apple/sweet_potato.png
index c793a324c8b..76e56d1cc73 100644
Binary files a/public/images/emoji/apple/sweet_potato.png and b/public/images/emoji/apple/sweet_potato.png differ
diff --git a/public/images/emoji/apple/swimmer.png b/public/images/emoji/apple/swimmer.png
index 152e42f4857..1e310e0e8de 100644
Binary files a/public/images/emoji/apple/swimmer.png and b/public/images/emoji/apple/swimmer.png differ
diff --git a/public/images/emoji/apple/swimmer/2.png b/public/images/emoji/apple/swimmer/2.png
index f5f60e30183..04bfb961921 100644
Binary files a/public/images/emoji/apple/swimmer/2.png and b/public/images/emoji/apple/swimmer/2.png differ
diff --git a/public/images/emoji/apple/swimmer/3.png b/public/images/emoji/apple/swimmer/3.png
index 488222d2212..6c8156a7958 100644
Binary files a/public/images/emoji/apple/swimmer/3.png and b/public/images/emoji/apple/swimmer/3.png differ
diff --git a/public/images/emoji/apple/swimmer/4.png b/public/images/emoji/apple/swimmer/4.png
index eb2bcd180ab..615acbf6f25 100644
Binary files a/public/images/emoji/apple/swimmer/4.png and b/public/images/emoji/apple/swimmer/4.png differ
diff --git a/public/images/emoji/apple/swimmer/5.png b/public/images/emoji/apple/swimmer/5.png
index fc0f52b9dad..311c7c1876d 100644
Binary files a/public/images/emoji/apple/swimmer/5.png and b/public/images/emoji/apple/swimmer/5.png differ
diff --git a/public/images/emoji/apple/swimmer/6.png b/public/images/emoji/apple/swimmer/6.png
index 2a48fdc951e..e53ea9cef36 100644
Binary files a/public/images/emoji/apple/swimmer/6.png and b/public/images/emoji/apple/swimmer/6.png differ
diff --git a/public/images/emoji/apple/swimming_man.png b/public/images/emoji/apple/swimming_man.png
index 152e42f4857..1e310e0e8de 100644
Binary files a/public/images/emoji/apple/swimming_man.png and b/public/images/emoji/apple/swimming_man.png differ
diff --git a/public/images/emoji/apple/swimming_man/2.png b/public/images/emoji/apple/swimming_man/2.png
index f5f60e30183..04bfb961921 100644
Binary files a/public/images/emoji/apple/swimming_man/2.png and b/public/images/emoji/apple/swimming_man/2.png differ
diff --git a/public/images/emoji/apple/swimming_man/3.png b/public/images/emoji/apple/swimming_man/3.png
index 488222d2212..6c8156a7958 100644
Binary files a/public/images/emoji/apple/swimming_man/3.png and b/public/images/emoji/apple/swimming_man/3.png differ
diff --git a/public/images/emoji/apple/swimming_man/4.png b/public/images/emoji/apple/swimming_man/4.png
index eb2bcd180ab..615acbf6f25 100644
Binary files a/public/images/emoji/apple/swimming_man/4.png and b/public/images/emoji/apple/swimming_man/4.png differ
diff --git a/public/images/emoji/apple/swimming_man/5.png b/public/images/emoji/apple/swimming_man/5.png
index fc0f52b9dad..311c7c1876d 100644
Binary files a/public/images/emoji/apple/swimming_man/5.png and b/public/images/emoji/apple/swimming_man/5.png differ
diff --git a/public/images/emoji/apple/swimming_man/6.png b/public/images/emoji/apple/swimming_man/6.png
index 2a48fdc951e..e53ea9cef36 100644
Binary files a/public/images/emoji/apple/swimming_man/6.png and b/public/images/emoji/apple/swimming_man/6.png differ
diff --git a/public/images/emoji/apple/swimming_woman.png b/public/images/emoji/apple/swimming_woman.png
index c8439064e47..80d26ea8e56 100644
Binary files a/public/images/emoji/apple/swimming_woman.png and b/public/images/emoji/apple/swimming_woman.png differ
diff --git a/public/images/emoji/apple/swimming_woman/2.png b/public/images/emoji/apple/swimming_woman/2.png
index 357daa34c1d..32e4e7031b2 100644
Binary files a/public/images/emoji/apple/swimming_woman/2.png and b/public/images/emoji/apple/swimming_woman/2.png differ
diff --git a/public/images/emoji/apple/swimming_woman/3.png b/public/images/emoji/apple/swimming_woman/3.png
index 0d831c336fa..17d094d86f4 100644
Binary files a/public/images/emoji/apple/swimming_woman/3.png and b/public/images/emoji/apple/swimming_woman/3.png differ
diff --git a/public/images/emoji/apple/swimming_woman/4.png b/public/images/emoji/apple/swimming_woman/4.png
index 2fbc28284b7..31c18d63614 100644
Binary files a/public/images/emoji/apple/swimming_woman/4.png and b/public/images/emoji/apple/swimming_woman/4.png differ
diff --git a/public/images/emoji/apple/swimming_woman/5.png b/public/images/emoji/apple/swimming_woman/5.png
index 5523af75533..c4eec924182 100644
Binary files a/public/images/emoji/apple/swimming_woman/5.png and b/public/images/emoji/apple/swimming_woman/5.png differ
diff --git a/public/images/emoji/apple/swimming_woman/6.png b/public/images/emoji/apple/swimming_woman/6.png
index 584b88b78d6..a95e575a16d 100644
Binary files a/public/images/emoji/apple/swimming_woman/6.png and b/public/images/emoji/apple/swimming_woman/6.png differ
diff --git a/public/images/emoji/apple/switzerland.png b/public/images/emoji/apple/switzerland.png
index 50ccd594b82..796151bd535 100644
Binary files a/public/images/emoji/apple/switzerland.png and b/public/images/emoji/apple/switzerland.png differ
diff --git a/public/images/emoji/apple/symbols.png b/public/images/emoji/apple/symbols.png
index e2849c52e11..b893bc5fe65 100644
Binary files a/public/images/emoji/apple/symbols.png and b/public/images/emoji/apple/symbols.png differ
diff --git a/public/images/emoji/apple/synagogue.png b/public/images/emoji/apple/synagogue.png
index 5ceaf0f6308..87e898b3ced 100644
Binary files a/public/images/emoji/apple/synagogue.png and b/public/images/emoji/apple/synagogue.png differ
diff --git a/public/images/emoji/apple/syria.png b/public/images/emoji/apple/syria.png
index f14db54b402..7e512ccbfc0 100644
Binary files a/public/images/emoji/apple/syria.png and b/public/images/emoji/apple/syria.png differ
diff --git a/public/images/emoji/apple/syringe.png b/public/images/emoji/apple/syringe.png
index aeea9520a42..f58e5a3d7ca 100644
Binary files a/public/images/emoji/apple/syringe.png and b/public/images/emoji/apple/syringe.png differ
diff --git a/public/images/emoji/apple/t_rex.png b/public/images/emoji/apple/t_rex.png
index d8811a56382..61a25763d0f 100644
Binary files a/public/images/emoji/apple/t_rex.png and b/public/images/emoji/apple/t_rex.png differ
diff --git a/public/images/emoji/apple/table_tennis.png b/public/images/emoji/apple/table_tennis.png
index 26d40fa9205..4d7e496e4a0 100644
Binary files a/public/images/emoji/apple/table_tennis.png and b/public/images/emoji/apple/table_tennis.png differ
diff --git a/public/images/emoji/apple/taco.png b/public/images/emoji/apple/taco.png
index c4adea0e0a5..c0e38cbd95a 100644
Binary files a/public/images/emoji/apple/taco.png and b/public/images/emoji/apple/taco.png differ
diff --git a/public/images/emoji/apple/tada.png b/public/images/emoji/apple/tada.png
index f08377f3941..c02884193eb 100644
Binary files a/public/images/emoji/apple/tada.png and b/public/images/emoji/apple/tada.png differ
diff --git a/public/images/emoji/apple/taiwan.png b/public/images/emoji/apple/taiwan.png
index 70d71de7e65..ad04da50767 100644
Binary files a/public/images/emoji/apple/taiwan.png and b/public/images/emoji/apple/taiwan.png differ
diff --git a/public/images/emoji/apple/tajikistan.png b/public/images/emoji/apple/tajikistan.png
index 89eb0e30ee7..ec520e768ea 100644
Binary files a/public/images/emoji/apple/tajikistan.png and b/public/images/emoji/apple/tajikistan.png differ
diff --git a/public/images/emoji/apple/takeout_box.png b/public/images/emoji/apple/takeout_box.png
index 08aa6a4843f..bb7fa97157b 100644
Binary files a/public/images/emoji/apple/takeout_box.png and b/public/images/emoji/apple/takeout_box.png differ
diff --git a/public/images/emoji/apple/tanabata_tree.png b/public/images/emoji/apple/tanabata_tree.png
index fd1c87e338a..5317e4dd7ff 100644
Binary files a/public/images/emoji/apple/tanabata_tree.png and b/public/images/emoji/apple/tanabata_tree.png differ
diff --git a/public/images/emoji/apple/tangerine.png b/public/images/emoji/apple/tangerine.png
index e4ddd1955f4..e3fe61d8d10 100644
Binary files a/public/images/emoji/apple/tangerine.png and b/public/images/emoji/apple/tangerine.png differ
diff --git a/public/images/emoji/apple/tanzania.png b/public/images/emoji/apple/tanzania.png
index 3cd7aba2ec5..ba03894c918 100644
Binary files a/public/images/emoji/apple/tanzania.png and b/public/images/emoji/apple/tanzania.png differ
diff --git a/public/images/emoji/apple/taurus.png b/public/images/emoji/apple/taurus.png
index a57184d9f34..d45e9d070fc 100644
Binary files a/public/images/emoji/apple/taurus.png and b/public/images/emoji/apple/taurus.png differ
diff --git a/public/images/emoji/apple/taxi.png b/public/images/emoji/apple/taxi.png
index 99fc7add6e6..76f3c7a4e5a 100644
Binary files a/public/images/emoji/apple/taxi.png and b/public/images/emoji/apple/taxi.png differ
diff --git a/public/images/emoji/apple/tea.png b/public/images/emoji/apple/tea.png
index a2fafef7f94..0ddfde8dda8 100644
Binary files a/public/images/emoji/apple/tea.png and b/public/images/emoji/apple/tea.png differ
diff --git a/public/images/emoji/apple/telephone.png b/public/images/emoji/apple/telephone.png
index 60538e87700..6a3d60a5137 100644
Binary files a/public/images/emoji/apple/telephone.png and b/public/images/emoji/apple/telephone.png differ
diff --git a/public/images/emoji/apple/telephone_receiver.png b/public/images/emoji/apple/telephone_receiver.png
index a6128b53152..d23200eee7e 100644
Binary files a/public/images/emoji/apple/telephone_receiver.png and b/public/images/emoji/apple/telephone_receiver.png differ
diff --git a/public/images/emoji/apple/telescope.png b/public/images/emoji/apple/telescope.png
index 026a270cc13..4e15efb9b3d 100644
Binary files a/public/images/emoji/apple/telescope.png and b/public/images/emoji/apple/telescope.png differ
diff --git a/public/images/emoji/apple/ten.png b/public/images/emoji/apple/ten.png
index 59d013deccd..d9a243b0665 100644
Binary files a/public/images/emoji/apple/ten.png and b/public/images/emoji/apple/ten.png differ
diff --git a/public/images/emoji/apple/tennis.png b/public/images/emoji/apple/tennis.png
index 32f01c115c3..eba6ed905d4 100644
Binary files a/public/images/emoji/apple/tennis.png and b/public/images/emoji/apple/tennis.png differ
diff --git a/public/images/emoji/apple/tent.png b/public/images/emoji/apple/tent.png
index 163a5621a7a..2533d88b1ad 100644
Binary files a/public/images/emoji/apple/tent.png and b/public/images/emoji/apple/tent.png differ
diff --git a/public/images/emoji/apple/thailand.png b/public/images/emoji/apple/thailand.png
index f6e7620ff90..a331efef732 100644
Binary files a/public/images/emoji/apple/thailand.png and b/public/images/emoji/apple/thailand.png differ
diff --git a/public/images/emoji/apple/thermometer.png b/public/images/emoji/apple/thermometer.png
index a807d4cac48..96d488bbee8 100644
Binary files a/public/images/emoji/apple/thermometer.png and b/public/images/emoji/apple/thermometer.png differ
diff --git a/public/images/emoji/apple/thermometer_face.png b/public/images/emoji/apple/thermometer_face.png
index bc7076dfa31..a0226b19a9c 100644
Binary files a/public/images/emoji/apple/thermometer_face.png and b/public/images/emoji/apple/thermometer_face.png differ
diff --git a/public/images/emoji/apple/thinking.png b/public/images/emoji/apple/thinking.png
index df9001d0670..97f3b2d76aa 100644
Binary files a/public/images/emoji/apple/thinking.png and b/public/images/emoji/apple/thinking.png differ
diff --git a/public/images/emoji/apple/thinking_face.png b/public/images/emoji/apple/thinking_face.png
index df9001d0670..97f3b2d76aa 100644
Binary files a/public/images/emoji/apple/thinking_face.png and b/public/images/emoji/apple/thinking_face.png differ
diff --git a/public/images/emoji/apple/thought_balloon.png b/public/images/emoji/apple/thought_balloon.png
index 1fddc6e5829..af7cbb551cf 100644
Binary files a/public/images/emoji/apple/thought_balloon.png and b/public/images/emoji/apple/thought_balloon.png differ
diff --git a/public/images/emoji/apple/three.png b/public/images/emoji/apple/three.png
index 2b641df50a8..efec792b5b0 100644
Binary files a/public/images/emoji/apple/three.png and b/public/images/emoji/apple/three.png differ
diff --git a/public/images/emoji/apple/three_button_mouse.png b/public/images/emoji/apple/three_button_mouse.png
index 3899171edc6..6fbde4a9567 100644
Binary files a/public/images/emoji/apple/three_button_mouse.png and b/public/images/emoji/apple/three_button_mouse.png differ
diff --git a/public/images/emoji/apple/thumbsdown.png b/public/images/emoji/apple/thumbsdown.png
index 74440b69c7d..6772f554edb 100644
Binary files a/public/images/emoji/apple/thumbsdown.png and b/public/images/emoji/apple/thumbsdown.png differ
diff --git a/public/images/emoji/apple/thumbsdown/2.png b/public/images/emoji/apple/thumbsdown/2.png
index 930faaf2a54..d4c46ed0e83 100644
Binary files a/public/images/emoji/apple/thumbsdown/2.png and b/public/images/emoji/apple/thumbsdown/2.png differ
diff --git a/public/images/emoji/apple/thumbsdown/3.png b/public/images/emoji/apple/thumbsdown/3.png
index 29ebfe1eefe..128a75f6f43 100644
Binary files a/public/images/emoji/apple/thumbsdown/3.png and b/public/images/emoji/apple/thumbsdown/3.png differ
diff --git a/public/images/emoji/apple/thumbsdown/4.png b/public/images/emoji/apple/thumbsdown/4.png
index 0b46e9862c2..f0415f567ba 100644
Binary files a/public/images/emoji/apple/thumbsdown/4.png and b/public/images/emoji/apple/thumbsdown/4.png differ
diff --git a/public/images/emoji/apple/thumbsdown/5.png b/public/images/emoji/apple/thumbsdown/5.png
index 5ee7db294b7..092d40df3ca 100644
Binary files a/public/images/emoji/apple/thumbsdown/5.png and b/public/images/emoji/apple/thumbsdown/5.png differ
diff --git a/public/images/emoji/apple/thumbsdown/6.png b/public/images/emoji/apple/thumbsdown/6.png
index edf1f180c89..6856269c265 100644
Binary files a/public/images/emoji/apple/thumbsdown/6.png and b/public/images/emoji/apple/thumbsdown/6.png differ
diff --git a/public/images/emoji/apple/thumbsup.png b/public/images/emoji/apple/thumbsup.png
index 5df9bb8540e..6f09aa90934 100644
Binary files a/public/images/emoji/apple/thumbsup.png and b/public/images/emoji/apple/thumbsup.png differ
diff --git a/public/images/emoji/apple/thumbsup/2.png b/public/images/emoji/apple/thumbsup/2.png
index f33655e0943..665bbf1b296 100644
Binary files a/public/images/emoji/apple/thumbsup/2.png and b/public/images/emoji/apple/thumbsup/2.png differ
diff --git a/public/images/emoji/apple/thumbsup/3.png b/public/images/emoji/apple/thumbsup/3.png
index e6114682607..4ef43301a88 100644
Binary files a/public/images/emoji/apple/thumbsup/3.png and b/public/images/emoji/apple/thumbsup/3.png differ
diff --git a/public/images/emoji/apple/thumbsup/4.png b/public/images/emoji/apple/thumbsup/4.png
index c07e81b31e3..2344e6f0531 100644
Binary files a/public/images/emoji/apple/thumbsup/4.png and b/public/images/emoji/apple/thumbsup/4.png differ
diff --git a/public/images/emoji/apple/thumbsup/5.png b/public/images/emoji/apple/thumbsup/5.png
index c04a6c2bd8e..23d59afc306 100644
Binary files a/public/images/emoji/apple/thumbsup/5.png and b/public/images/emoji/apple/thumbsup/5.png differ
diff --git a/public/images/emoji/apple/thumbsup/6.png b/public/images/emoji/apple/thumbsup/6.png
index 8fbc7fd36ba..924c138faff 100644
Binary files a/public/images/emoji/apple/thumbsup/6.png and b/public/images/emoji/apple/thumbsup/6.png differ
diff --git a/public/images/emoji/apple/thunder_cloud_and_rain.png b/public/images/emoji/apple/thunder_cloud_and_rain.png
index 8f44a7726e9..8a42ddb67ac 100644
Binary files a/public/images/emoji/apple/thunder_cloud_and_rain.png and b/public/images/emoji/apple/thunder_cloud_and_rain.png differ
diff --git a/public/images/emoji/apple/thunder_cloud_rain.png b/public/images/emoji/apple/thunder_cloud_rain.png
index 8f44a7726e9..8a42ddb67ac 100644
Binary files a/public/images/emoji/apple/thunder_cloud_rain.png and b/public/images/emoji/apple/thunder_cloud_rain.png differ
diff --git a/public/images/emoji/apple/ticket.png b/public/images/emoji/apple/ticket.png
index 73a7b007c23..f0702b5bb0b 100644
Binary files a/public/images/emoji/apple/ticket.png and b/public/images/emoji/apple/ticket.png differ
diff --git a/public/images/emoji/apple/tickets.png b/public/images/emoji/apple/tickets.png
index fd35e2a4d09..aa63df9de03 100644
Binary files a/public/images/emoji/apple/tickets.png and b/public/images/emoji/apple/tickets.png differ
diff --git a/public/images/emoji/apple/tiger.png b/public/images/emoji/apple/tiger.png
index d9b0fbb758c..ecf740efc10 100644
Binary files a/public/images/emoji/apple/tiger.png and b/public/images/emoji/apple/tiger.png differ
diff --git a/public/images/emoji/apple/tiger2.png b/public/images/emoji/apple/tiger2.png
index 080125274aa..0184b11957f 100644
Binary files a/public/images/emoji/apple/tiger2.png and b/public/images/emoji/apple/tiger2.png differ
diff --git a/public/images/emoji/apple/timer.png b/public/images/emoji/apple/timer.png
index 306fb222cf9..121245c62ad 100644
Binary files a/public/images/emoji/apple/timer.png and b/public/images/emoji/apple/timer.png differ
diff --git a/public/images/emoji/apple/timer_clock.png b/public/images/emoji/apple/timer_clock.png
index 306fb222cf9..121245c62ad 100644
Binary files a/public/images/emoji/apple/timer_clock.png and b/public/images/emoji/apple/timer_clock.png differ
diff --git a/public/images/emoji/apple/timor_leste.png b/public/images/emoji/apple/timor_leste.png
index 25fdf935ed1..f2d38218a59 100644
Binary files a/public/images/emoji/apple/timor_leste.png and b/public/images/emoji/apple/timor_leste.png differ
diff --git a/public/images/emoji/apple/tipping_hand_man.png b/public/images/emoji/apple/tipping_hand_man.png
index 6a4098a9d3f..f7de9c7503d 100644
Binary files a/public/images/emoji/apple/tipping_hand_man.png and b/public/images/emoji/apple/tipping_hand_man.png differ
diff --git a/public/images/emoji/apple/tipping_hand_man/2.png b/public/images/emoji/apple/tipping_hand_man/2.png
index 1dd416fb2fb..d951a044ff6 100644
Binary files a/public/images/emoji/apple/tipping_hand_man/2.png and b/public/images/emoji/apple/tipping_hand_man/2.png differ
diff --git a/public/images/emoji/apple/tipping_hand_man/3.png b/public/images/emoji/apple/tipping_hand_man/3.png
index f97238add35..08776ee3681 100644
Binary files a/public/images/emoji/apple/tipping_hand_man/3.png and b/public/images/emoji/apple/tipping_hand_man/3.png differ
diff --git a/public/images/emoji/apple/tipping_hand_man/4.png b/public/images/emoji/apple/tipping_hand_man/4.png
index 4e8505eb576..b03e800260b 100644
Binary files a/public/images/emoji/apple/tipping_hand_man/4.png and b/public/images/emoji/apple/tipping_hand_man/4.png differ
diff --git a/public/images/emoji/apple/tipping_hand_man/5.png b/public/images/emoji/apple/tipping_hand_man/5.png
index ee1174f3b40..ed5642616d3 100644
Binary files a/public/images/emoji/apple/tipping_hand_man/5.png and b/public/images/emoji/apple/tipping_hand_man/5.png differ
diff --git a/public/images/emoji/apple/tipping_hand_man/6.png b/public/images/emoji/apple/tipping_hand_man/6.png
index 2198ef8ba14..c7d07c3e156 100644
Binary files a/public/images/emoji/apple/tipping_hand_man/6.png and b/public/images/emoji/apple/tipping_hand_man/6.png differ
diff --git a/public/images/emoji/apple/tipping_hand_woman.png b/public/images/emoji/apple/tipping_hand_woman.png
index 4424423fa37..2486ff3b633 100644
Binary files a/public/images/emoji/apple/tipping_hand_woman.png and b/public/images/emoji/apple/tipping_hand_woman.png differ
diff --git a/public/images/emoji/apple/tipping_hand_woman/2.png b/public/images/emoji/apple/tipping_hand_woman/2.png
index 115198e5636..6f7f07a61d9 100644
Binary files a/public/images/emoji/apple/tipping_hand_woman/2.png and b/public/images/emoji/apple/tipping_hand_woman/2.png differ
diff --git a/public/images/emoji/apple/tipping_hand_woman/3.png b/public/images/emoji/apple/tipping_hand_woman/3.png
index d0593f87fbb..17b5b7b29ae 100644
Binary files a/public/images/emoji/apple/tipping_hand_woman/3.png and b/public/images/emoji/apple/tipping_hand_woman/3.png differ
diff --git a/public/images/emoji/apple/tipping_hand_woman/4.png b/public/images/emoji/apple/tipping_hand_woman/4.png
index a2f5d0294f2..fa50ac6116a 100644
Binary files a/public/images/emoji/apple/tipping_hand_woman/4.png and b/public/images/emoji/apple/tipping_hand_woman/4.png differ
diff --git a/public/images/emoji/apple/tipping_hand_woman/5.png b/public/images/emoji/apple/tipping_hand_woman/5.png
index 63d9338057f..0c57e348db2 100644
Binary files a/public/images/emoji/apple/tipping_hand_woman/5.png and b/public/images/emoji/apple/tipping_hand_woman/5.png differ
diff --git a/public/images/emoji/apple/tipping_hand_woman/6.png b/public/images/emoji/apple/tipping_hand_woman/6.png
index 30b2bd891a4..07f9e1dbd03 100644
Binary files a/public/images/emoji/apple/tipping_hand_woman/6.png and b/public/images/emoji/apple/tipping_hand_woman/6.png differ
diff --git a/public/images/emoji/apple/tired_face.png b/public/images/emoji/apple/tired_face.png
index f1806a26fd7..db7e2fa62b1 100644
Binary files a/public/images/emoji/apple/tired_face.png and b/public/images/emoji/apple/tired_face.png differ
diff --git a/public/images/emoji/apple/tm.png b/public/images/emoji/apple/tm.png
index 03952783bbc..09bf5865e2b 100644
Binary files a/public/images/emoji/apple/tm.png and b/public/images/emoji/apple/tm.png differ
diff --git a/public/images/emoji/apple/togo.png b/public/images/emoji/apple/togo.png
index 6dc60ec10d6..d690d8e6cff 100644
Binary files a/public/images/emoji/apple/togo.png and b/public/images/emoji/apple/togo.png differ
diff --git a/public/images/emoji/apple/toilet.png b/public/images/emoji/apple/toilet.png
index ab7e58aa726..3fe2b8af098 100644
Binary files a/public/images/emoji/apple/toilet.png and b/public/images/emoji/apple/toilet.png differ
diff --git a/public/images/emoji/apple/tokelau.png b/public/images/emoji/apple/tokelau.png
index 18cbb256ea3..1aa35720108 100644
Binary files a/public/images/emoji/apple/tokelau.png and b/public/images/emoji/apple/tokelau.png differ
diff --git a/public/images/emoji/apple/tokyo_tower.png b/public/images/emoji/apple/tokyo_tower.png
index 3c3f33124c7..7a47ce82182 100644
Binary files a/public/images/emoji/apple/tokyo_tower.png and b/public/images/emoji/apple/tokyo_tower.png differ
diff --git a/public/images/emoji/apple/tomato.png b/public/images/emoji/apple/tomato.png
index 0b100a46394..39b75daa459 100644
Binary files a/public/images/emoji/apple/tomato.png and b/public/images/emoji/apple/tomato.png differ
diff --git a/public/images/emoji/apple/tonga.png b/public/images/emoji/apple/tonga.png
index d7e19e4a114..1e04adef16b 100644
Binary files a/public/images/emoji/apple/tonga.png and b/public/images/emoji/apple/tonga.png differ
diff --git a/public/images/emoji/apple/tongue.png b/public/images/emoji/apple/tongue.png
index 0f5e837862b..1e30adc33d7 100644
Binary files a/public/images/emoji/apple/tongue.png and b/public/images/emoji/apple/tongue.png differ
diff --git a/public/images/emoji/apple/tools.png b/public/images/emoji/apple/tools.png
index daef26722cc..a74ac1fa4d1 100644
Binary files a/public/images/emoji/apple/tools.png and b/public/images/emoji/apple/tools.png differ
diff --git a/public/images/emoji/apple/top.png b/public/images/emoji/apple/top.png
index 5a64e2a0b56..61dd89896c1 100644
Binary files a/public/images/emoji/apple/top.png and b/public/images/emoji/apple/top.png differ
diff --git a/public/images/emoji/apple/tophat.png b/public/images/emoji/apple/tophat.png
index 4e7fbd68525..f48b88cfc28 100644
Binary files a/public/images/emoji/apple/tophat.png and b/public/images/emoji/apple/tophat.png differ
diff --git a/public/images/emoji/apple/tornado.png b/public/images/emoji/apple/tornado.png
index 0d3985f1191..77e497f056d 100644
Binary files a/public/images/emoji/apple/tornado.png and b/public/images/emoji/apple/tornado.png differ
diff --git a/public/images/emoji/apple/tr.png b/public/images/emoji/apple/tr.png
index 00411e5a49a..966e275b07c 100644
Binary files a/public/images/emoji/apple/tr.png and b/public/images/emoji/apple/tr.png differ
diff --git a/public/images/emoji/apple/track_next.png b/public/images/emoji/apple/track_next.png
index c6c645c86db..e3fe2a82043 100644
Binary files a/public/images/emoji/apple/track_next.png and b/public/images/emoji/apple/track_next.png differ
diff --git a/public/images/emoji/apple/track_previous.png b/public/images/emoji/apple/track_previous.png
index 881bf59b29b..4ec9e5af70f 100644
Binary files a/public/images/emoji/apple/track_previous.png and b/public/images/emoji/apple/track_previous.png differ
diff --git a/public/images/emoji/apple/trackball.png b/public/images/emoji/apple/trackball.png
index 2801e64c8d5..6b50701a4f8 100644
Binary files a/public/images/emoji/apple/trackball.png and b/public/images/emoji/apple/trackball.png differ
diff --git a/public/images/emoji/apple/tractor.png b/public/images/emoji/apple/tractor.png
index fd57e2bf3b5..12d068e18e9 100644
Binary files a/public/images/emoji/apple/tractor.png and b/public/images/emoji/apple/tractor.png differ
diff --git a/public/images/emoji/apple/traffic_light.png b/public/images/emoji/apple/traffic_light.png
index 80519d2e625..49acefb6078 100644
Binary files a/public/images/emoji/apple/traffic_light.png and b/public/images/emoji/apple/traffic_light.png differ
diff --git a/public/images/emoji/apple/train.png b/public/images/emoji/apple/train.png
index ee6a95d50ac..fc7443e0c4c 100644
Binary files a/public/images/emoji/apple/train.png and b/public/images/emoji/apple/train.png differ
diff --git a/public/images/emoji/apple/train2.png b/public/images/emoji/apple/train2.png
index fe2107cc7e0..729c008f488 100644
Binary files a/public/images/emoji/apple/train2.png and b/public/images/emoji/apple/train2.png differ
diff --git a/public/images/emoji/apple/tram.png b/public/images/emoji/apple/tram.png
index 1d5bcef502e..32d19acac51 100644
Binary files a/public/images/emoji/apple/tram.png and b/public/images/emoji/apple/tram.png differ
diff --git a/public/images/emoji/apple/triangular_flag_on_post.png b/public/images/emoji/apple/triangular_flag_on_post.png
index ec0d3dfd8c9..51e01a25369 100644
Binary files a/public/images/emoji/apple/triangular_flag_on_post.png and b/public/images/emoji/apple/triangular_flag_on_post.png differ
diff --git a/public/images/emoji/apple/triangular_ruler.png b/public/images/emoji/apple/triangular_ruler.png
index 5cb2b5d5006..1b33735f095 100644
Binary files a/public/images/emoji/apple/triangular_ruler.png and b/public/images/emoji/apple/triangular_ruler.png differ
diff --git a/public/images/emoji/apple/trident.png b/public/images/emoji/apple/trident.png
index b1abb2d01fd..7d9b1304e59 100644
Binary files a/public/images/emoji/apple/trident.png and b/public/images/emoji/apple/trident.png differ
diff --git a/public/images/emoji/apple/trinidad_tobago.png b/public/images/emoji/apple/trinidad_tobago.png
index e7fa4c6183c..b89cd717a98 100644
Binary files a/public/images/emoji/apple/trinidad_tobago.png and b/public/images/emoji/apple/trinidad_tobago.png differ
diff --git a/public/images/emoji/apple/tristan_da_cunha.png b/public/images/emoji/apple/tristan_da_cunha.png
index 694a0b8510c..12cee871e2f 100644
Binary files a/public/images/emoji/apple/tristan_da_cunha.png and b/public/images/emoji/apple/tristan_da_cunha.png differ
diff --git a/public/images/emoji/apple/triumph.png b/public/images/emoji/apple/triumph.png
index 6cd8030c4f8..20fff501f01 100644
Binary files a/public/images/emoji/apple/triumph.png and b/public/images/emoji/apple/triumph.png differ
diff --git a/public/images/emoji/apple/trolleybus.png b/public/images/emoji/apple/trolleybus.png
index b0aea215bb6..171ddf3bf98 100644
Binary files a/public/images/emoji/apple/trolleybus.png and b/public/images/emoji/apple/trolleybus.png differ
diff --git a/public/images/emoji/apple/trophy.png b/public/images/emoji/apple/trophy.png
index f8a2286efe2..16f06820f58 100644
Binary files a/public/images/emoji/apple/trophy.png and b/public/images/emoji/apple/trophy.png differ
diff --git a/public/images/emoji/apple/tropical_drink.png b/public/images/emoji/apple/tropical_drink.png
index af0543b4613..95522eacee9 100644
Binary files a/public/images/emoji/apple/tropical_drink.png and b/public/images/emoji/apple/tropical_drink.png differ
diff --git a/public/images/emoji/apple/tropical_fish.png b/public/images/emoji/apple/tropical_fish.png
index 71d76b95de1..c8544a68ca3 100644
Binary files a/public/images/emoji/apple/tropical_fish.png and b/public/images/emoji/apple/tropical_fish.png differ
diff --git a/public/images/emoji/apple/truck.png b/public/images/emoji/apple/truck.png
index 1d507c61336..f02fe55f63a 100644
Binary files a/public/images/emoji/apple/truck.png and b/public/images/emoji/apple/truck.png differ
diff --git a/public/images/emoji/apple/trumpet.png b/public/images/emoji/apple/trumpet.png
index a03fbba25fc..0d01d14f6d8 100644
Binary files a/public/images/emoji/apple/trumpet.png and b/public/images/emoji/apple/trumpet.png differ
diff --git a/public/images/emoji/apple/tshirt.png b/public/images/emoji/apple/tshirt.png
index 68a0867f0ab..fe293cf91db 100644
Binary files a/public/images/emoji/apple/tshirt.png and b/public/images/emoji/apple/tshirt.png differ
diff --git a/public/images/emoji/apple/tulip.png b/public/images/emoji/apple/tulip.png
index ef9742c6c1c..594d5368619 100644
Binary files a/public/images/emoji/apple/tulip.png and b/public/images/emoji/apple/tulip.png differ
diff --git a/public/images/emoji/apple/tumbler_glass.png b/public/images/emoji/apple/tumbler_glass.png
index b2663a89537..a21fcf122b5 100644
Binary files a/public/images/emoji/apple/tumbler_glass.png and b/public/images/emoji/apple/tumbler_glass.png differ
diff --git a/public/images/emoji/apple/tunisia.png b/public/images/emoji/apple/tunisia.png
index e6e933b4fc9..22c37f85e43 100644
Binary files a/public/images/emoji/apple/tunisia.png and b/public/images/emoji/apple/tunisia.png differ
diff --git a/public/images/emoji/apple/turkey.png b/public/images/emoji/apple/turkey.png
index 9d302e2f341..ea05eed0c2f 100644
Binary files a/public/images/emoji/apple/turkey.png and b/public/images/emoji/apple/turkey.png differ
diff --git a/public/images/emoji/apple/turkmenistan.png b/public/images/emoji/apple/turkmenistan.png
index 96caa4ddf58..c9158663e92 100644
Binary files a/public/images/emoji/apple/turkmenistan.png and b/public/images/emoji/apple/turkmenistan.png differ
diff --git a/public/images/emoji/apple/turks_caicos_islands.png b/public/images/emoji/apple/turks_caicos_islands.png
index 9cd6d02a4be..861cc689f92 100644
Binary files a/public/images/emoji/apple/turks_caicos_islands.png and b/public/images/emoji/apple/turks_caicos_islands.png differ
diff --git a/public/images/emoji/apple/turtle.png b/public/images/emoji/apple/turtle.png
index ae80acb3f0a..23d24e2ecdb 100644
Binary files a/public/images/emoji/apple/turtle.png and b/public/images/emoji/apple/turtle.png differ
diff --git a/public/images/emoji/apple/tuvalu.png b/public/images/emoji/apple/tuvalu.png
index 2f943390da7..79dd992afb9 100644
Binary files a/public/images/emoji/apple/tuvalu.png and b/public/images/emoji/apple/tuvalu.png differ
diff --git a/public/images/emoji/apple/tv.png b/public/images/emoji/apple/tv.png
index 629d8504c7a..73af70cf8b0 100644
Binary files a/public/images/emoji/apple/tv.png and b/public/images/emoji/apple/tv.png differ
diff --git a/public/images/emoji/apple/twisted_rightwards_arrows.png b/public/images/emoji/apple/twisted_rightwards_arrows.png
index 4d4b63a6aaa..bf6131eeea2 100644
Binary files a/public/images/emoji/apple/twisted_rightwards_arrows.png and b/public/images/emoji/apple/twisted_rightwards_arrows.png differ
diff --git a/public/images/emoji/apple/two.png b/public/images/emoji/apple/two.png
index 6740511b38b..ecef05090d0 100644
Binary files a/public/images/emoji/apple/two.png and b/public/images/emoji/apple/two.png differ
diff --git a/public/images/emoji/apple/two_hearts.png b/public/images/emoji/apple/two_hearts.png
index 0854acf4307..adc496d8d53 100644
Binary files a/public/images/emoji/apple/two_hearts.png and b/public/images/emoji/apple/two_hearts.png differ
diff --git a/public/images/emoji/apple/two_men_holding_hands.png b/public/images/emoji/apple/two_men_holding_hands.png
index ed684ce6cda..c6f76462185 100644
Binary files a/public/images/emoji/apple/two_men_holding_hands.png and b/public/images/emoji/apple/two_men_holding_hands.png differ
diff --git a/public/images/emoji/apple/two_women_holding_hands.png b/public/images/emoji/apple/two_women_holding_hands.png
index 62082715446..edb147003f1 100644
Binary files a/public/images/emoji/apple/two_women_holding_hands.png and b/public/images/emoji/apple/two_women_holding_hands.png differ
diff --git a/public/images/emoji/apple/u5272.png b/public/images/emoji/apple/u5272.png
index 049665f4dd1..67cd063a1bb 100644
Binary files a/public/images/emoji/apple/u5272.png and b/public/images/emoji/apple/u5272.png differ
diff --git a/public/images/emoji/apple/u5408.png b/public/images/emoji/apple/u5408.png
index dd2e396699f..a2cba2c2d47 100644
Binary files a/public/images/emoji/apple/u5408.png and b/public/images/emoji/apple/u5408.png differ
diff --git a/public/images/emoji/apple/u55b6.png b/public/images/emoji/apple/u55b6.png
index 245284a11f8..c19631bd916 100644
Binary files a/public/images/emoji/apple/u55b6.png and b/public/images/emoji/apple/u55b6.png differ
diff --git a/public/images/emoji/apple/u6307.png b/public/images/emoji/apple/u6307.png
index ad9a077871a..d8405653a9d 100644
Binary files a/public/images/emoji/apple/u6307.png and b/public/images/emoji/apple/u6307.png differ
diff --git a/public/images/emoji/apple/u6708.png b/public/images/emoji/apple/u6708.png
index 9e79230f6d7..8fdcaf20c2a 100644
Binary files a/public/images/emoji/apple/u6708.png and b/public/images/emoji/apple/u6708.png differ
diff --git a/public/images/emoji/apple/u6709.png b/public/images/emoji/apple/u6709.png
index b9b24f4a5a0..bbe6e71572c 100644
Binary files a/public/images/emoji/apple/u6709.png and b/public/images/emoji/apple/u6709.png differ
diff --git a/public/images/emoji/apple/u6e80.png b/public/images/emoji/apple/u6e80.png
index 2fe46b57c07..199a8b5be95 100644
Binary files a/public/images/emoji/apple/u6e80.png and b/public/images/emoji/apple/u6e80.png differ
diff --git a/public/images/emoji/apple/u7121.png b/public/images/emoji/apple/u7121.png
index 9a1e32f38fb..290a411e871 100644
Binary files a/public/images/emoji/apple/u7121.png and b/public/images/emoji/apple/u7121.png differ
diff --git a/public/images/emoji/apple/u7533.png b/public/images/emoji/apple/u7533.png
index 68854c4e7f8..41a633ade71 100644
Binary files a/public/images/emoji/apple/u7533.png and b/public/images/emoji/apple/u7533.png differ
diff --git a/public/images/emoji/apple/u7981.png b/public/images/emoji/apple/u7981.png
index f8d1473ce7a..a4f0ffde7e7 100644
Binary files a/public/images/emoji/apple/u7981.png and b/public/images/emoji/apple/u7981.png differ
diff --git a/public/images/emoji/apple/u7a7a.png b/public/images/emoji/apple/u7a7a.png
index 9b927657551..36e5360c38e 100644
Binary files a/public/images/emoji/apple/u7a7a.png and b/public/images/emoji/apple/u7a7a.png differ
diff --git a/public/images/emoji/apple/uganda.png b/public/images/emoji/apple/uganda.png
index 02590e94cfa..a2a3413cdf4 100644
Binary files a/public/images/emoji/apple/uganda.png and b/public/images/emoji/apple/uganda.png differ
diff --git a/public/images/emoji/apple/uk.png b/public/images/emoji/apple/uk.png
index 1d15d6cb969..13964cb5143 100644
Binary files a/public/images/emoji/apple/uk.png and b/public/images/emoji/apple/uk.png differ
diff --git a/public/images/emoji/apple/ukraine.png b/public/images/emoji/apple/ukraine.png
index ac778caae3d..1c7394ddc8d 100644
Binary files a/public/images/emoji/apple/ukraine.png and b/public/images/emoji/apple/ukraine.png differ
diff --git a/public/images/emoji/apple/umbrella.png b/public/images/emoji/apple/umbrella.png
index ba24ed35bd4..34aa9dbba26 100644
Binary files a/public/images/emoji/apple/umbrella.png and b/public/images/emoji/apple/umbrella.png differ
diff --git a/public/images/emoji/apple/umbrella2.png b/public/images/emoji/apple/umbrella2.png
index 1d7d1c6a5fe..57f86cc0643 100644
Binary files a/public/images/emoji/apple/umbrella2.png and b/public/images/emoji/apple/umbrella2.png differ
diff --git a/public/images/emoji/apple/umbrella_on_ground.png b/public/images/emoji/apple/umbrella_on_ground.png
index 95b1ae9fdd1..34587b671a8 100644
Binary files a/public/images/emoji/apple/umbrella_on_ground.png and b/public/images/emoji/apple/umbrella_on_ground.png differ
diff --git a/public/images/emoji/apple/unamused.png b/public/images/emoji/apple/unamused.png
index e29e6fac8cb..496950f4e94 100644
Binary files a/public/images/emoji/apple/unamused.png and b/public/images/emoji/apple/unamused.png differ
diff --git a/public/images/emoji/apple/underage.png b/public/images/emoji/apple/underage.png
index 2e425f1d291..088529676e1 100644
Binary files a/public/images/emoji/apple/underage.png and b/public/images/emoji/apple/underage.png differ
diff --git a/public/images/emoji/apple/unicorn.png b/public/images/emoji/apple/unicorn.png
index ca52d64d995..27136c7a268 100644
Binary files a/public/images/emoji/apple/unicorn.png and b/public/images/emoji/apple/unicorn.png differ
diff --git a/public/images/emoji/apple/unicorn_face.png b/public/images/emoji/apple/unicorn_face.png
index ca52d64d995..27136c7a268 100644
Binary files a/public/images/emoji/apple/unicorn_face.png and b/public/images/emoji/apple/unicorn_face.png differ
diff --git a/public/images/emoji/apple/united_arab_emirates.png b/public/images/emoji/apple/united_arab_emirates.png
index 0f079b5cc52..05444fa567a 100644
Binary files a/public/images/emoji/apple/united_arab_emirates.png and b/public/images/emoji/apple/united_arab_emirates.png differ
diff --git a/public/images/emoji/apple/unlock.png b/public/images/emoji/apple/unlock.png
index 620245dc607..c88851a3c43 100644
Binary files a/public/images/emoji/apple/unlock.png and b/public/images/emoji/apple/unlock.png differ
diff --git a/public/images/emoji/apple/up.png b/public/images/emoji/apple/up.png
index e7d02e98e59..9d6c816abb5 100644
Binary files a/public/images/emoji/apple/up.png and b/public/images/emoji/apple/up.png differ
diff --git a/public/images/emoji/apple/upside_down.png b/public/images/emoji/apple/upside_down.png
index f60d9b623b3..2cf3cc05eb8 100644
Binary files a/public/images/emoji/apple/upside_down.png and b/public/images/emoji/apple/upside_down.png differ
diff --git a/public/images/emoji/apple/upside_down_face.png b/public/images/emoji/apple/upside_down_face.png
index f60d9b623b3..2cf3cc05eb8 100644
Binary files a/public/images/emoji/apple/upside_down_face.png and b/public/images/emoji/apple/upside_down_face.png differ
diff --git a/public/images/emoji/apple/urn.png b/public/images/emoji/apple/urn.png
index d1af59ed33b..4e0a37e0560 100644
Binary files a/public/images/emoji/apple/urn.png and b/public/images/emoji/apple/urn.png differ
diff --git a/public/images/emoji/apple/uruguay.png b/public/images/emoji/apple/uruguay.png
index a03f80a7ebb..2626e58cb06 100644
Binary files a/public/images/emoji/apple/uruguay.png and b/public/images/emoji/apple/uruguay.png differ
diff --git a/public/images/emoji/apple/us.png b/public/images/emoji/apple/us.png
index 64a5e528d90..1ef8e462466 100644
Binary files a/public/images/emoji/apple/us.png and b/public/images/emoji/apple/us.png differ
diff --git a/public/images/emoji/apple/us_outlying_islands.png b/public/images/emoji/apple/us_outlying_islands.png
index 64a5e528d90..1ef8e462466 100644
Binary files a/public/images/emoji/apple/us_outlying_islands.png and b/public/images/emoji/apple/us_outlying_islands.png differ
diff --git a/public/images/emoji/apple/us_virgin_islands.png b/public/images/emoji/apple/us_virgin_islands.png
index 4c5cb5786c9..2756e0421e4 100644
Binary files a/public/images/emoji/apple/us_virgin_islands.png and b/public/images/emoji/apple/us_virgin_islands.png differ
diff --git a/public/images/emoji/apple/uzbekistan.png b/public/images/emoji/apple/uzbekistan.png
index 9ad43eba982..f9cdc9d470c 100644
Binary files a/public/images/emoji/apple/uzbekistan.png and b/public/images/emoji/apple/uzbekistan.png differ
diff --git a/public/images/emoji/apple/v.png b/public/images/emoji/apple/v.png
index d3fc2ab19be..83b80c743cb 100644
Binary files a/public/images/emoji/apple/v.png and b/public/images/emoji/apple/v.png differ
diff --git a/public/images/emoji/apple/v/2.png b/public/images/emoji/apple/v/2.png
index 8e9dadbca36..2fe4b67aa16 100644
Binary files a/public/images/emoji/apple/v/2.png and b/public/images/emoji/apple/v/2.png differ
diff --git a/public/images/emoji/apple/v/3.png b/public/images/emoji/apple/v/3.png
index eab98d28044..ec5e26691f7 100644
Binary files a/public/images/emoji/apple/v/3.png and b/public/images/emoji/apple/v/3.png differ
diff --git a/public/images/emoji/apple/v/4.png b/public/images/emoji/apple/v/4.png
index 6e6d282f7ef..129eb2a4683 100644
Binary files a/public/images/emoji/apple/v/4.png and b/public/images/emoji/apple/v/4.png differ
diff --git a/public/images/emoji/apple/v/5.png b/public/images/emoji/apple/v/5.png
index 3b8c0e6db9f..c8a0f101359 100644
Binary files a/public/images/emoji/apple/v/5.png and b/public/images/emoji/apple/v/5.png differ
diff --git a/public/images/emoji/apple/v/6.png b/public/images/emoji/apple/v/6.png
index e6c87e1b3d6..02243813025 100644
Binary files a/public/images/emoji/apple/v/6.png and b/public/images/emoji/apple/v/6.png differ
diff --git a/public/images/emoji/apple/vampire.png b/public/images/emoji/apple/vampire.png
index 962288bd170..8602777b106 100644
Binary files a/public/images/emoji/apple/vampire.png and b/public/images/emoji/apple/vampire.png differ
diff --git a/public/images/emoji/apple/vampire/2.png b/public/images/emoji/apple/vampire/2.png
index 154f2b6e35a..3b518cc1640 100644
Binary files a/public/images/emoji/apple/vampire/2.png and b/public/images/emoji/apple/vampire/2.png differ
diff --git a/public/images/emoji/apple/vampire/3.png b/public/images/emoji/apple/vampire/3.png
index 540b48d887f..0c1f31ab4fe 100644
Binary files a/public/images/emoji/apple/vampire/3.png and b/public/images/emoji/apple/vampire/3.png differ
diff --git a/public/images/emoji/apple/vampire/4.png b/public/images/emoji/apple/vampire/4.png
index b05d3bad9ab..9fb9f5efe1c 100644
Binary files a/public/images/emoji/apple/vampire/4.png and b/public/images/emoji/apple/vampire/4.png differ
diff --git a/public/images/emoji/apple/vampire/5.png b/public/images/emoji/apple/vampire/5.png
index 2bd9a7b71bb..85b0178d4a0 100644
Binary files a/public/images/emoji/apple/vampire/5.png and b/public/images/emoji/apple/vampire/5.png differ
diff --git a/public/images/emoji/apple/vampire/6.png b/public/images/emoji/apple/vampire/6.png
index c88f4ad73bf..4652335d6ca 100644
Binary files a/public/images/emoji/apple/vampire/6.png and b/public/images/emoji/apple/vampire/6.png differ
diff --git a/public/images/emoji/apple/vanuatu.png b/public/images/emoji/apple/vanuatu.png
index 557f83f14a5..01811659b63 100644
Binary files a/public/images/emoji/apple/vanuatu.png and b/public/images/emoji/apple/vanuatu.png differ
diff --git a/public/images/emoji/apple/vatican_city.png b/public/images/emoji/apple/vatican_city.png
index 317b79b153a..351a19c03b5 100644
Binary files a/public/images/emoji/apple/vatican_city.png and b/public/images/emoji/apple/vatican_city.png differ
diff --git a/public/images/emoji/apple/venezuela.png b/public/images/emoji/apple/venezuela.png
index 38cd6eb8e34..82c3dadbae6 100644
Binary files a/public/images/emoji/apple/venezuela.png and b/public/images/emoji/apple/venezuela.png differ
diff --git a/public/images/emoji/apple/vertical_traffic_light.png b/public/images/emoji/apple/vertical_traffic_light.png
index 99179206f9b..4dd6a5e1418 100644
Binary files a/public/images/emoji/apple/vertical_traffic_light.png and b/public/images/emoji/apple/vertical_traffic_light.png differ
diff --git a/public/images/emoji/apple/vhs.png b/public/images/emoji/apple/vhs.png
index 975285a28a1..bcba845875f 100644
Binary files a/public/images/emoji/apple/vhs.png and b/public/images/emoji/apple/vhs.png differ
diff --git a/public/images/emoji/apple/vibration_mode.png b/public/images/emoji/apple/vibration_mode.png
index 5c88e13f412..4c18c9bf1b6 100644
Binary files a/public/images/emoji/apple/vibration_mode.png and b/public/images/emoji/apple/vibration_mode.png differ
diff --git a/public/images/emoji/apple/video_camera.png b/public/images/emoji/apple/video_camera.png
index c2acf77fbc1..bb89b55079c 100644
Binary files a/public/images/emoji/apple/video_camera.png and b/public/images/emoji/apple/video_camera.png differ
diff --git a/public/images/emoji/apple/video_game.png b/public/images/emoji/apple/video_game.png
index 7c08a2623cd..68a9e08ad43 100644
Binary files a/public/images/emoji/apple/video_game.png and b/public/images/emoji/apple/video_game.png differ
diff --git a/public/images/emoji/apple/vietnam.png b/public/images/emoji/apple/vietnam.png
index b67f1a10479..6d5d574ff08 100644
Binary files a/public/images/emoji/apple/vietnam.png and b/public/images/emoji/apple/vietnam.png differ
diff --git a/public/images/emoji/apple/violin.png b/public/images/emoji/apple/violin.png
index e78c6ec7da8..ecef413b3ba 100644
Binary files a/public/images/emoji/apple/violin.png and b/public/images/emoji/apple/violin.png differ
diff --git a/public/images/emoji/apple/virgo.png b/public/images/emoji/apple/virgo.png
index d32108ffe04..8553fb5ed18 100644
Binary files a/public/images/emoji/apple/virgo.png and b/public/images/emoji/apple/virgo.png differ
diff --git a/public/images/emoji/apple/volcano.png b/public/images/emoji/apple/volcano.png
index 5f5184bcd12..397e956e852 100644
Binary files a/public/images/emoji/apple/volcano.png and b/public/images/emoji/apple/volcano.png differ
diff --git a/public/images/emoji/apple/volleyball.png b/public/images/emoji/apple/volleyball.png
index 1424df5f48c..e4c9633fe14 100644
Binary files a/public/images/emoji/apple/volleyball.png and b/public/images/emoji/apple/volleyball.png differ
diff --git a/public/images/emoji/apple/vs.png b/public/images/emoji/apple/vs.png
index ce01369010d..55ffd201b01 100644
Binary files a/public/images/emoji/apple/vs.png and b/public/images/emoji/apple/vs.png differ
diff --git a/public/images/emoji/apple/vulcan.png b/public/images/emoji/apple/vulcan.png
index 89fd1859fef..c16f6b2b8c4 100644
Binary files a/public/images/emoji/apple/vulcan.png and b/public/images/emoji/apple/vulcan.png differ
diff --git a/public/images/emoji/apple/vulcan/2.png b/public/images/emoji/apple/vulcan/2.png
index 9c277890adf..d93b9be15d4 100644
Binary files a/public/images/emoji/apple/vulcan/2.png and b/public/images/emoji/apple/vulcan/2.png differ
diff --git a/public/images/emoji/apple/vulcan/3.png b/public/images/emoji/apple/vulcan/3.png
index 8d6940ee24d..10d224c22a1 100644
Binary files a/public/images/emoji/apple/vulcan/3.png and b/public/images/emoji/apple/vulcan/3.png differ
diff --git a/public/images/emoji/apple/vulcan/4.png b/public/images/emoji/apple/vulcan/4.png
index fe549c3e2c6..b2c4cb66682 100644
Binary files a/public/images/emoji/apple/vulcan/4.png and b/public/images/emoji/apple/vulcan/4.png differ
diff --git a/public/images/emoji/apple/vulcan/5.png b/public/images/emoji/apple/vulcan/5.png
index 4ad8b9df458..cfd3e64d35c 100644
Binary files a/public/images/emoji/apple/vulcan/5.png and b/public/images/emoji/apple/vulcan/5.png differ
diff --git a/public/images/emoji/apple/vulcan/6.png b/public/images/emoji/apple/vulcan/6.png
index af23814474e..80ec97d3499 100644
Binary files a/public/images/emoji/apple/vulcan/6.png and b/public/images/emoji/apple/vulcan/6.png differ
diff --git a/public/images/emoji/apple/vulcan_salute.png b/public/images/emoji/apple/vulcan_salute.png
index 89fd1859fef..c16f6b2b8c4 100644
Binary files a/public/images/emoji/apple/vulcan_salute.png and b/public/images/emoji/apple/vulcan_salute.png differ
diff --git a/public/images/emoji/apple/vulcan_salute/2.png b/public/images/emoji/apple/vulcan_salute/2.png
index 9c277890adf..d93b9be15d4 100644
Binary files a/public/images/emoji/apple/vulcan_salute/2.png and b/public/images/emoji/apple/vulcan_salute/2.png differ
diff --git a/public/images/emoji/apple/vulcan_salute/3.png b/public/images/emoji/apple/vulcan_salute/3.png
index 8d6940ee24d..10d224c22a1 100644
Binary files a/public/images/emoji/apple/vulcan_salute/3.png and b/public/images/emoji/apple/vulcan_salute/3.png differ
diff --git a/public/images/emoji/apple/vulcan_salute/4.png b/public/images/emoji/apple/vulcan_salute/4.png
index fe549c3e2c6..b2c4cb66682 100644
Binary files a/public/images/emoji/apple/vulcan_salute/4.png and b/public/images/emoji/apple/vulcan_salute/4.png differ
diff --git a/public/images/emoji/apple/vulcan_salute/5.png b/public/images/emoji/apple/vulcan_salute/5.png
index 4ad8b9df458..cfd3e64d35c 100644
Binary files a/public/images/emoji/apple/vulcan_salute/5.png and b/public/images/emoji/apple/vulcan_salute/5.png differ
diff --git a/public/images/emoji/apple/vulcan_salute/6.png b/public/images/emoji/apple/vulcan_salute/6.png
index af23814474e..80ec97d3499 100644
Binary files a/public/images/emoji/apple/vulcan_salute/6.png and b/public/images/emoji/apple/vulcan_salute/6.png differ
diff --git a/public/images/emoji/apple/walking.png b/public/images/emoji/apple/walking.png
index e647b9672b4..453ed571a71 100644
Binary files a/public/images/emoji/apple/walking.png and b/public/images/emoji/apple/walking.png differ
diff --git a/public/images/emoji/apple/walking/2.png b/public/images/emoji/apple/walking/2.png
index 8ca3ec2b825..679f0441687 100644
Binary files a/public/images/emoji/apple/walking/2.png and b/public/images/emoji/apple/walking/2.png differ
diff --git a/public/images/emoji/apple/walking/3.png b/public/images/emoji/apple/walking/3.png
index 91fd7ddc366..2b5ef8e7722 100644
Binary files a/public/images/emoji/apple/walking/3.png and b/public/images/emoji/apple/walking/3.png differ
diff --git a/public/images/emoji/apple/walking/4.png b/public/images/emoji/apple/walking/4.png
index a591da4533a..7087e766943 100644
Binary files a/public/images/emoji/apple/walking/4.png and b/public/images/emoji/apple/walking/4.png differ
diff --git a/public/images/emoji/apple/walking/5.png b/public/images/emoji/apple/walking/5.png
index ca9a5d71e13..718b7aa3b47 100644
Binary files a/public/images/emoji/apple/walking/5.png and b/public/images/emoji/apple/walking/5.png differ
diff --git a/public/images/emoji/apple/walking/6.png b/public/images/emoji/apple/walking/6.png
index 9a52e389957..02b63682019 100644
Binary files a/public/images/emoji/apple/walking/6.png and b/public/images/emoji/apple/walking/6.png differ
diff --git a/public/images/emoji/apple/walking_man.png b/public/images/emoji/apple/walking_man.png
index e647b9672b4..453ed571a71 100644
Binary files a/public/images/emoji/apple/walking_man.png and b/public/images/emoji/apple/walking_man.png differ
diff --git a/public/images/emoji/apple/walking_man/2.png b/public/images/emoji/apple/walking_man/2.png
index 8ca3ec2b825..679f0441687 100644
Binary files a/public/images/emoji/apple/walking_man/2.png and b/public/images/emoji/apple/walking_man/2.png differ
diff --git a/public/images/emoji/apple/walking_man/3.png b/public/images/emoji/apple/walking_man/3.png
index 91fd7ddc366..2b5ef8e7722 100644
Binary files a/public/images/emoji/apple/walking_man/3.png and b/public/images/emoji/apple/walking_man/3.png differ
diff --git a/public/images/emoji/apple/walking_man/4.png b/public/images/emoji/apple/walking_man/4.png
index a591da4533a..7087e766943 100644
Binary files a/public/images/emoji/apple/walking_man/4.png and b/public/images/emoji/apple/walking_man/4.png differ
diff --git a/public/images/emoji/apple/walking_man/5.png b/public/images/emoji/apple/walking_man/5.png
index ca9a5d71e13..718b7aa3b47 100644
Binary files a/public/images/emoji/apple/walking_man/5.png and b/public/images/emoji/apple/walking_man/5.png differ
diff --git a/public/images/emoji/apple/walking_man/6.png b/public/images/emoji/apple/walking_man/6.png
index 9a52e389957..02b63682019 100644
Binary files a/public/images/emoji/apple/walking_man/6.png and b/public/images/emoji/apple/walking_man/6.png differ
diff --git a/public/images/emoji/apple/walking_woman.png b/public/images/emoji/apple/walking_woman.png
index 15b622aee33..ce9bd1ca0a7 100644
Binary files a/public/images/emoji/apple/walking_woman.png and b/public/images/emoji/apple/walking_woman.png differ
diff --git a/public/images/emoji/apple/walking_woman/2.png b/public/images/emoji/apple/walking_woman/2.png
index a548a92f62f..5e1d5baf5fd 100644
Binary files a/public/images/emoji/apple/walking_woman/2.png and b/public/images/emoji/apple/walking_woman/2.png differ
diff --git a/public/images/emoji/apple/walking_woman/3.png b/public/images/emoji/apple/walking_woman/3.png
index b6a8d817b98..24438997501 100644
Binary files a/public/images/emoji/apple/walking_woman/3.png and b/public/images/emoji/apple/walking_woman/3.png differ
diff --git a/public/images/emoji/apple/walking_woman/4.png b/public/images/emoji/apple/walking_woman/4.png
index 997873d8c38..d09c4673ef7 100644
Binary files a/public/images/emoji/apple/walking_woman/4.png and b/public/images/emoji/apple/walking_woman/4.png differ
diff --git a/public/images/emoji/apple/walking_woman/5.png b/public/images/emoji/apple/walking_woman/5.png
index aa4faf95b6c..402643064ae 100644
Binary files a/public/images/emoji/apple/walking_woman/5.png and b/public/images/emoji/apple/walking_woman/5.png differ
diff --git a/public/images/emoji/apple/walking_woman/6.png b/public/images/emoji/apple/walking_woman/6.png
index f6946051c4f..b6db2f33e6b 100644
Binary files a/public/images/emoji/apple/walking_woman/6.png and b/public/images/emoji/apple/walking_woman/6.png differ
diff --git a/public/images/emoji/apple/wallis_futuna.png b/public/images/emoji/apple/wallis_futuna.png
index eae880a42f5..f68379c592c 100644
Binary files a/public/images/emoji/apple/wallis_futuna.png and b/public/images/emoji/apple/wallis_futuna.png differ
diff --git a/public/images/emoji/apple/waning_crescent_moon.png b/public/images/emoji/apple/waning_crescent_moon.png
index 8e81988d4d7..c79761693f9 100644
Binary files a/public/images/emoji/apple/waning_crescent_moon.png and b/public/images/emoji/apple/waning_crescent_moon.png differ
diff --git a/public/images/emoji/apple/waning_gibbous_moon.png b/public/images/emoji/apple/waning_gibbous_moon.png
index 777f2aafaab..80f15b18ec1 100644
Binary files a/public/images/emoji/apple/waning_gibbous_moon.png and b/public/images/emoji/apple/waning_gibbous_moon.png differ
diff --git a/public/images/emoji/apple/warning.png b/public/images/emoji/apple/warning.png
index e60055ef8aa..7698e02cc98 100644
Binary files a/public/images/emoji/apple/warning.png and b/public/images/emoji/apple/warning.png differ
diff --git a/public/images/emoji/apple/wastebasket.png b/public/images/emoji/apple/wastebasket.png
index 4ab69a6c847..f116181b7ab 100644
Binary files a/public/images/emoji/apple/wastebasket.png and b/public/images/emoji/apple/wastebasket.png differ
diff --git a/public/images/emoji/apple/watch.png b/public/images/emoji/apple/watch.png
index ed3dc504fed..ea0720f339e 100644
Binary files a/public/images/emoji/apple/watch.png and b/public/images/emoji/apple/watch.png differ
diff --git a/public/images/emoji/apple/water_buffalo.png b/public/images/emoji/apple/water_buffalo.png
index 6d7f5bd5b7b..a9900eb53bd 100644
Binary files a/public/images/emoji/apple/water_buffalo.png and b/public/images/emoji/apple/water_buffalo.png differ
diff --git a/public/images/emoji/apple/watermelon.png b/public/images/emoji/apple/watermelon.png
index 10b71a6a160..c7728d6f490 100644
Binary files a/public/images/emoji/apple/watermelon.png and b/public/images/emoji/apple/watermelon.png differ
diff --git a/public/images/emoji/apple/wave.png b/public/images/emoji/apple/wave.png
index 2c6ae426f4e..a134ae6c652 100644
Binary files a/public/images/emoji/apple/wave.png and b/public/images/emoji/apple/wave.png differ
diff --git a/public/images/emoji/apple/wave/2.png b/public/images/emoji/apple/wave/2.png
index b1f7a464672..8ff9ee2a103 100644
Binary files a/public/images/emoji/apple/wave/2.png and b/public/images/emoji/apple/wave/2.png differ
diff --git a/public/images/emoji/apple/wave/3.png b/public/images/emoji/apple/wave/3.png
index 23a515d10d8..ce3d4157c27 100644
Binary files a/public/images/emoji/apple/wave/3.png and b/public/images/emoji/apple/wave/3.png differ
diff --git a/public/images/emoji/apple/wave/4.png b/public/images/emoji/apple/wave/4.png
index fe2f453ef56..c792ef40a2a 100644
Binary files a/public/images/emoji/apple/wave/4.png and b/public/images/emoji/apple/wave/4.png differ
diff --git a/public/images/emoji/apple/wave/5.png b/public/images/emoji/apple/wave/5.png
index f40dbb9df78..1a250afc6d4 100644
Binary files a/public/images/emoji/apple/wave/5.png and b/public/images/emoji/apple/wave/5.png differ
diff --git a/public/images/emoji/apple/wave/6.png b/public/images/emoji/apple/wave/6.png
index 854b4fc22b9..0b78a9b3560 100644
Binary files a/public/images/emoji/apple/wave/6.png and b/public/images/emoji/apple/wave/6.png differ
diff --git a/public/images/emoji/apple/waving_black_flag.png b/public/images/emoji/apple/waving_black_flag.png
index 36a0a6987d1..eefde1e3330 100644
Binary files a/public/images/emoji/apple/waving_black_flag.png and b/public/images/emoji/apple/waving_black_flag.png differ
diff --git a/public/images/emoji/apple/waving_white_flag.png b/public/images/emoji/apple/waving_white_flag.png
index 16ed8e6169c..df32f19fb81 100644
Binary files a/public/images/emoji/apple/waving_white_flag.png and b/public/images/emoji/apple/waving_white_flag.png differ
diff --git a/public/images/emoji/apple/wavy_dash.png b/public/images/emoji/apple/wavy_dash.png
index 507f6f6de99..4e670d63894 100644
Binary files a/public/images/emoji/apple/wavy_dash.png and b/public/images/emoji/apple/wavy_dash.png differ
diff --git a/public/images/emoji/apple/waxing_crescent_moon.png b/public/images/emoji/apple/waxing_crescent_moon.png
index 742a4435092..9f83ad35211 100644
Binary files a/public/images/emoji/apple/waxing_crescent_moon.png and b/public/images/emoji/apple/waxing_crescent_moon.png differ
diff --git a/public/images/emoji/apple/waxing_gibbous_moon.png b/public/images/emoji/apple/waxing_gibbous_moon.png
index 704c4b4e2d5..c17057445a1 100644
Binary files a/public/images/emoji/apple/waxing_gibbous_moon.png and b/public/images/emoji/apple/waxing_gibbous_moon.png differ
diff --git a/public/images/emoji/apple/wc.png b/public/images/emoji/apple/wc.png
index 8e9d43c32fd..9fae406d61b 100644
Binary files a/public/images/emoji/apple/wc.png and b/public/images/emoji/apple/wc.png differ
diff --git a/public/images/emoji/apple/weary.png b/public/images/emoji/apple/weary.png
index 2d4e531a365..e6ddc8a4da0 100644
Binary files a/public/images/emoji/apple/weary.png and b/public/images/emoji/apple/weary.png differ
diff --git a/public/images/emoji/apple/wedding.png b/public/images/emoji/apple/wedding.png
index 223299695d8..a4bf73e5139 100644
Binary files a/public/images/emoji/apple/wedding.png and b/public/images/emoji/apple/wedding.png differ
diff --git a/public/images/emoji/apple/weight_lifter.png b/public/images/emoji/apple/weight_lifter.png
index 9cebc0e16d5..4003c2f9a87 100644
Binary files a/public/images/emoji/apple/weight_lifter.png and b/public/images/emoji/apple/weight_lifter.png differ
diff --git a/public/images/emoji/apple/weight_lifter/2.png b/public/images/emoji/apple/weight_lifter/2.png
index df54bd55f94..6410729c55b 100644
Binary files a/public/images/emoji/apple/weight_lifter/2.png and b/public/images/emoji/apple/weight_lifter/2.png differ
diff --git a/public/images/emoji/apple/weight_lifter/3.png b/public/images/emoji/apple/weight_lifter/3.png
index dafe388c958..f44adf6bab7 100644
Binary files a/public/images/emoji/apple/weight_lifter/3.png and b/public/images/emoji/apple/weight_lifter/3.png differ
diff --git a/public/images/emoji/apple/weight_lifter/4.png b/public/images/emoji/apple/weight_lifter/4.png
index ecf9101aa9d..6d1c1d9f471 100644
Binary files a/public/images/emoji/apple/weight_lifter/4.png and b/public/images/emoji/apple/weight_lifter/4.png differ
diff --git a/public/images/emoji/apple/weight_lifter/5.png b/public/images/emoji/apple/weight_lifter/5.png
index cd1c9aad396..905c557e811 100644
Binary files a/public/images/emoji/apple/weight_lifter/5.png and b/public/images/emoji/apple/weight_lifter/5.png differ
diff --git a/public/images/emoji/apple/weight_lifter/6.png b/public/images/emoji/apple/weight_lifter/6.png
index 1afa3bea2c3..50286365b80 100644
Binary files a/public/images/emoji/apple/weight_lifter/6.png and b/public/images/emoji/apple/weight_lifter/6.png differ
diff --git a/public/images/emoji/apple/weight_lifting_man.png b/public/images/emoji/apple/weight_lifting_man.png
index 9cebc0e16d5..4003c2f9a87 100644
Binary files a/public/images/emoji/apple/weight_lifting_man.png and b/public/images/emoji/apple/weight_lifting_man.png differ
diff --git a/public/images/emoji/apple/weight_lifting_man/2.png b/public/images/emoji/apple/weight_lifting_man/2.png
index df54bd55f94..6410729c55b 100644
Binary files a/public/images/emoji/apple/weight_lifting_man/2.png and b/public/images/emoji/apple/weight_lifting_man/2.png differ
diff --git a/public/images/emoji/apple/weight_lifting_man/3.png b/public/images/emoji/apple/weight_lifting_man/3.png
index dafe388c958..f44adf6bab7 100644
Binary files a/public/images/emoji/apple/weight_lifting_man/3.png and b/public/images/emoji/apple/weight_lifting_man/3.png differ
diff --git a/public/images/emoji/apple/weight_lifting_man/4.png b/public/images/emoji/apple/weight_lifting_man/4.png
index ecf9101aa9d..6d1c1d9f471 100644
Binary files a/public/images/emoji/apple/weight_lifting_man/4.png and b/public/images/emoji/apple/weight_lifting_man/4.png differ
diff --git a/public/images/emoji/apple/weight_lifting_man/5.png b/public/images/emoji/apple/weight_lifting_man/5.png
index cd1c9aad396..905c557e811 100644
Binary files a/public/images/emoji/apple/weight_lifting_man/5.png and b/public/images/emoji/apple/weight_lifting_man/5.png differ
diff --git a/public/images/emoji/apple/weight_lifting_man/6.png b/public/images/emoji/apple/weight_lifting_man/6.png
index 1afa3bea2c3..50286365b80 100644
Binary files a/public/images/emoji/apple/weight_lifting_man/6.png and b/public/images/emoji/apple/weight_lifting_man/6.png differ
diff --git a/public/images/emoji/apple/weight_lifting_woman.png b/public/images/emoji/apple/weight_lifting_woman.png
index 94ad7f2eff5..472bc2fe762 100644
Binary files a/public/images/emoji/apple/weight_lifting_woman.png and b/public/images/emoji/apple/weight_lifting_woman.png differ
diff --git a/public/images/emoji/apple/western_sahara.png b/public/images/emoji/apple/western_sahara.png
index 83216311846..04db928003b 100644
Binary files a/public/images/emoji/apple/western_sahara.png and b/public/images/emoji/apple/western_sahara.png differ
diff --git a/public/images/emoji/apple/whale.png b/public/images/emoji/apple/whale.png
index 9efadf3d483..fc6e875ac2c 100644
Binary files a/public/images/emoji/apple/whale.png and b/public/images/emoji/apple/whale.png differ
diff --git a/public/images/emoji/apple/whale2.png b/public/images/emoji/apple/whale2.png
index fb23e965fc8..93bc95ae1e3 100644
Binary files a/public/images/emoji/apple/whale2.png and b/public/images/emoji/apple/whale2.png differ
diff --git a/public/images/emoji/apple/wheel_of_dharma.png b/public/images/emoji/apple/wheel_of_dharma.png
index 272a4c3c5b8..9b810af3d42 100644
Binary files a/public/images/emoji/apple/wheel_of_dharma.png and b/public/images/emoji/apple/wheel_of_dharma.png differ
diff --git a/public/images/emoji/apple/wheelchair.png b/public/images/emoji/apple/wheelchair.png
index 51646c9b8e8..2c680933f98 100644
Binary files a/public/images/emoji/apple/wheelchair.png and b/public/images/emoji/apple/wheelchair.png differ
diff --git a/public/images/emoji/apple/white_check_mark.png b/public/images/emoji/apple/white_check_mark.png
index dd694996d38..8a70df13f2c 100644
Binary files a/public/images/emoji/apple/white_check_mark.png and b/public/images/emoji/apple/white_check_mark.png differ
diff --git a/public/images/emoji/apple/white_circle.png b/public/images/emoji/apple/white_circle.png
index 4f65906e0a0..8a88f8ad199 100644
Binary files a/public/images/emoji/apple/white_circle.png and b/public/images/emoji/apple/white_circle.png differ
diff --git a/public/images/emoji/apple/white_flag.png b/public/images/emoji/apple/white_flag.png
index 16ed8e6169c..df32f19fb81 100644
Binary files a/public/images/emoji/apple/white_flag.png and b/public/images/emoji/apple/white_flag.png differ
diff --git a/public/images/emoji/apple/white_flower.png b/public/images/emoji/apple/white_flower.png
index 81dadb26a45..2a62dcdfaf5 100644
Binary files a/public/images/emoji/apple/white_flower.png and b/public/images/emoji/apple/white_flower.png differ
diff --git a/public/images/emoji/apple/white_frowning_face.png b/public/images/emoji/apple/white_frowning_face.png
index ad1715f8a4d..a61abf6dff8 100644
Binary files a/public/images/emoji/apple/white_frowning_face.png and b/public/images/emoji/apple/white_frowning_face.png differ
diff --git a/public/images/emoji/apple/white_large_square.png b/public/images/emoji/apple/white_large_square.png
index d9fdef83570..c68c016fadc 100644
Binary files a/public/images/emoji/apple/white_large_square.png and b/public/images/emoji/apple/white_large_square.png differ
diff --git a/public/images/emoji/apple/white_medium_small_square.png b/public/images/emoji/apple/white_medium_small_square.png
index 0b61de8dc19..6ad4878f317 100644
Binary files a/public/images/emoji/apple/white_medium_small_square.png and b/public/images/emoji/apple/white_medium_small_square.png differ
diff --git a/public/images/emoji/apple/white_medium_square.png b/public/images/emoji/apple/white_medium_square.png
index ff357d5cd5f..378c5309653 100644
Binary files a/public/images/emoji/apple/white_medium_square.png and b/public/images/emoji/apple/white_medium_square.png differ
diff --git a/public/images/emoji/apple/white_small_square.png b/public/images/emoji/apple/white_small_square.png
index f662c103538..83dbd90e07b 100644
Binary files a/public/images/emoji/apple/white_small_square.png and b/public/images/emoji/apple/white_small_square.png differ
diff --git a/public/images/emoji/apple/white_square_button.png b/public/images/emoji/apple/white_square_button.png
index 1acb1dd3f0b..649efe970bf 100644
Binary files a/public/images/emoji/apple/white_square_button.png and b/public/images/emoji/apple/white_square_button.png differ
diff --git a/public/images/emoji/apple/white_sun_behind_cloud.png b/public/images/emoji/apple/white_sun_behind_cloud.png
index 86329213734..fcd766cda53 100644
Binary files a/public/images/emoji/apple/white_sun_behind_cloud.png and b/public/images/emoji/apple/white_sun_behind_cloud.png differ
diff --git a/public/images/emoji/apple/white_sun_behind_cloud_with_rain.png b/public/images/emoji/apple/white_sun_behind_cloud_with_rain.png
index 16324c90c45..b938ac990b7 100644
Binary files a/public/images/emoji/apple/white_sun_behind_cloud_with_rain.png and b/public/images/emoji/apple/white_sun_behind_cloud_with_rain.png differ
diff --git a/public/images/emoji/apple/white_sun_cloud.png b/public/images/emoji/apple/white_sun_cloud.png
index 86329213734..fcd766cda53 100644
Binary files a/public/images/emoji/apple/white_sun_cloud.png and b/public/images/emoji/apple/white_sun_cloud.png differ
diff --git a/public/images/emoji/apple/white_sun_rain_cloud.png b/public/images/emoji/apple/white_sun_rain_cloud.png
index 16324c90c45..b938ac990b7 100644
Binary files a/public/images/emoji/apple/white_sun_rain_cloud.png and b/public/images/emoji/apple/white_sun_rain_cloud.png differ
diff --git a/public/images/emoji/apple/white_sun_small_cloud.png b/public/images/emoji/apple/white_sun_small_cloud.png
index b31de05a28f..604304abf88 100644
Binary files a/public/images/emoji/apple/white_sun_small_cloud.png and b/public/images/emoji/apple/white_sun_small_cloud.png differ
diff --git a/public/images/emoji/apple/white_sun_with_small_cloud.png b/public/images/emoji/apple/white_sun_with_small_cloud.png
index b31de05a28f..604304abf88 100644
Binary files a/public/images/emoji/apple/white_sun_with_small_cloud.png and b/public/images/emoji/apple/white_sun_with_small_cloud.png differ
diff --git a/public/images/emoji/apple/wilted_flower.png b/public/images/emoji/apple/wilted_flower.png
index bbcd946b44f..0d805a7585a 100644
Binary files a/public/images/emoji/apple/wilted_flower.png and b/public/images/emoji/apple/wilted_flower.png differ
diff --git a/public/images/emoji/apple/wind_blowing_face.png b/public/images/emoji/apple/wind_blowing_face.png
index f43d48e0dae..7e680fac5b0 100644
Binary files a/public/images/emoji/apple/wind_blowing_face.png and b/public/images/emoji/apple/wind_blowing_face.png differ
diff --git a/public/images/emoji/apple/wind_chime.png b/public/images/emoji/apple/wind_chime.png
index a00ff20a213..011702dbe43 100644
Binary files a/public/images/emoji/apple/wind_chime.png and b/public/images/emoji/apple/wind_chime.png differ
diff --git a/public/images/emoji/apple/wind_face.png b/public/images/emoji/apple/wind_face.png
index f43d48e0dae..7e680fac5b0 100644
Binary files a/public/images/emoji/apple/wind_face.png and b/public/images/emoji/apple/wind_face.png differ
diff --git a/public/images/emoji/apple/wine_glass.png b/public/images/emoji/apple/wine_glass.png
index eca18cf1121..fbaf078dd18 100644
Binary files a/public/images/emoji/apple/wine_glass.png and b/public/images/emoji/apple/wine_glass.png differ
diff --git a/public/images/emoji/apple/wink.png b/public/images/emoji/apple/wink.png
index 1cd1426ddb6..197f343a9fd 100644
Binary files a/public/images/emoji/apple/wink.png and b/public/images/emoji/apple/wink.png differ
diff --git a/public/images/emoji/apple/wolf.png b/public/images/emoji/apple/wolf.png
index ab4c58d1cac..9ccf9f077d1 100644
Binary files a/public/images/emoji/apple/wolf.png and b/public/images/emoji/apple/wolf.png differ
diff --git a/public/images/emoji/apple/woman.png b/public/images/emoji/apple/woman.png
index 64a0c28d0b2..c240669cc38 100644
Binary files a/public/images/emoji/apple/woman.png and b/public/images/emoji/apple/woman.png differ
diff --git a/public/images/emoji/apple/woman/2.png b/public/images/emoji/apple/woman/2.png
index b848946811c..6c5adcba67d 100644
Binary files a/public/images/emoji/apple/woman/2.png and b/public/images/emoji/apple/woman/2.png differ
diff --git a/public/images/emoji/apple/woman/3.png b/public/images/emoji/apple/woman/3.png
index ea952c21826..a32f5004597 100644
Binary files a/public/images/emoji/apple/woman/3.png and b/public/images/emoji/apple/woman/3.png differ
diff --git a/public/images/emoji/apple/woman/4.png b/public/images/emoji/apple/woman/4.png
index 9fae54cd118..d691bb58c97 100644
Binary files a/public/images/emoji/apple/woman/4.png and b/public/images/emoji/apple/woman/4.png differ
diff --git a/public/images/emoji/apple/woman/5.png b/public/images/emoji/apple/woman/5.png
index 8313fda6b3c..15c32e2b1a1 100644
Binary files a/public/images/emoji/apple/woman/5.png and b/public/images/emoji/apple/woman/5.png differ
diff --git a/public/images/emoji/apple/woman/6.png b/public/images/emoji/apple/woman/6.png
index 89348fab652..ae65d447885 100644
Binary files a/public/images/emoji/apple/woman/6.png and b/public/images/emoji/apple/woman/6.png differ
diff --git a/public/images/emoji/apple/woman_artist.png b/public/images/emoji/apple/woman_artist.png
index 9642bb80723..fc551347944 100644
Binary files a/public/images/emoji/apple/woman_artist.png and b/public/images/emoji/apple/woman_artist.png differ
diff --git a/public/images/emoji/apple/woman_artist/2.png b/public/images/emoji/apple/woman_artist/2.png
index ee4dab5d3ca..56611d6c962 100644
Binary files a/public/images/emoji/apple/woman_artist/2.png and b/public/images/emoji/apple/woman_artist/2.png differ
diff --git a/public/images/emoji/apple/woman_artist/3.png b/public/images/emoji/apple/woman_artist/3.png
index ac267a252a4..270c0ef1db7 100644
Binary files a/public/images/emoji/apple/woman_artist/3.png and b/public/images/emoji/apple/woman_artist/3.png differ
diff --git a/public/images/emoji/apple/woman_artist/4.png b/public/images/emoji/apple/woman_artist/4.png
index 738a7d4a1ea..4e02bd11ef4 100644
Binary files a/public/images/emoji/apple/woman_artist/4.png and b/public/images/emoji/apple/woman_artist/4.png differ
diff --git a/public/images/emoji/apple/woman_artist/5.png b/public/images/emoji/apple/woman_artist/5.png
index 6a2dcb50e82..887dd162772 100644
Binary files a/public/images/emoji/apple/woman_artist/5.png and b/public/images/emoji/apple/woman_artist/5.png differ
diff --git a/public/images/emoji/apple/woman_artist/6.png b/public/images/emoji/apple/woman_artist/6.png
index 38e815ac588..cf910343c1a 100644
Binary files a/public/images/emoji/apple/woman_artist/6.png and b/public/images/emoji/apple/woman_artist/6.png differ
diff --git a/public/images/emoji/apple/woman_astronaut.png b/public/images/emoji/apple/woman_astronaut.png
index 8a8c1bdfb81..f1bf4b69731 100644
Binary files a/public/images/emoji/apple/woman_astronaut.png and b/public/images/emoji/apple/woman_astronaut.png differ
diff --git a/public/images/emoji/apple/woman_astronaut/2.png b/public/images/emoji/apple/woman_astronaut/2.png
index 7bc13d2ea43..05826c5634a 100644
Binary files a/public/images/emoji/apple/woman_astronaut/2.png and b/public/images/emoji/apple/woman_astronaut/2.png differ
diff --git a/public/images/emoji/apple/woman_astronaut/3.png b/public/images/emoji/apple/woman_astronaut/3.png
index 5bcf17df1cc..f5bb2f6e12e 100644
Binary files a/public/images/emoji/apple/woman_astronaut/3.png and b/public/images/emoji/apple/woman_astronaut/3.png differ
diff --git a/public/images/emoji/apple/woman_astronaut/4.png b/public/images/emoji/apple/woman_astronaut/4.png
index f513f6d8c2f..75e2a352d3a 100644
Binary files a/public/images/emoji/apple/woman_astronaut/4.png and b/public/images/emoji/apple/woman_astronaut/4.png differ
diff --git a/public/images/emoji/apple/woman_astronaut/5.png b/public/images/emoji/apple/woman_astronaut/5.png
index d88a04a16dd..53c23ed4645 100644
Binary files a/public/images/emoji/apple/woman_astronaut/5.png and b/public/images/emoji/apple/woman_astronaut/5.png differ
diff --git a/public/images/emoji/apple/woman_astronaut/6.png b/public/images/emoji/apple/woman_astronaut/6.png
index b1e0a11e446..bc5b80cc2c3 100644
Binary files a/public/images/emoji/apple/woman_astronaut/6.png and b/public/images/emoji/apple/woman_astronaut/6.png differ
diff --git a/public/images/emoji/apple/woman_cartwheeling.png b/public/images/emoji/apple/woman_cartwheeling.png
index ffd3de76f09..e19d5877023 100644
Binary files a/public/images/emoji/apple/woman_cartwheeling.png and b/public/images/emoji/apple/woman_cartwheeling.png differ
diff --git a/public/images/emoji/apple/woman_cartwheeling/2.png b/public/images/emoji/apple/woman_cartwheeling/2.png
index 1d43aa981c8..81a85006ea5 100644
Binary files a/public/images/emoji/apple/woman_cartwheeling/2.png and b/public/images/emoji/apple/woman_cartwheeling/2.png differ
diff --git a/public/images/emoji/apple/woman_cartwheeling/3.png b/public/images/emoji/apple/woman_cartwheeling/3.png
index 1f8e3b0b117..5fec3656f12 100644
Binary files a/public/images/emoji/apple/woman_cartwheeling/3.png and b/public/images/emoji/apple/woman_cartwheeling/3.png differ
diff --git a/public/images/emoji/apple/woman_cartwheeling/4.png b/public/images/emoji/apple/woman_cartwheeling/4.png
index 522105a8429..14a94b5490e 100644
Binary files a/public/images/emoji/apple/woman_cartwheeling/4.png and b/public/images/emoji/apple/woman_cartwheeling/4.png differ
diff --git a/public/images/emoji/apple/woman_cartwheeling/5.png b/public/images/emoji/apple/woman_cartwheeling/5.png
index 41d40d2970d..a85ea11b7b5 100644
Binary files a/public/images/emoji/apple/woman_cartwheeling/5.png and b/public/images/emoji/apple/woman_cartwheeling/5.png differ
diff --git a/public/images/emoji/apple/woman_cartwheeling/6.png b/public/images/emoji/apple/woman_cartwheeling/6.png
index d1f21426b9f..3ee84f8ed79 100644
Binary files a/public/images/emoji/apple/woman_cartwheeling/6.png and b/public/images/emoji/apple/woman_cartwheeling/6.png differ
diff --git a/public/images/emoji/apple/woman_climbing.png b/public/images/emoji/apple/woman_climbing.png
new file mode 100644
index 00000000000..bc52713eb75
Binary files /dev/null and b/public/images/emoji/apple/woman_climbing.png differ
diff --git a/public/images/emoji/apple/woman_climbing/2.png b/public/images/emoji/apple/woman_climbing/2.png
new file mode 100644
index 00000000000..2fe7f4414c1
Binary files /dev/null and b/public/images/emoji/apple/woman_climbing/2.png differ
diff --git a/public/images/emoji/apple/woman_climbing/3.png b/public/images/emoji/apple/woman_climbing/3.png
new file mode 100644
index 00000000000..dcf84dd3742
Binary files /dev/null and b/public/images/emoji/apple/woman_climbing/3.png differ
diff --git a/public/images/emoji/apple/woman_climbing/4.png b/public/images/emoji/apple/woman_climbing/4.png
new file mode 100644
index 00000000000..9f09667a944
Binary files /dev/null and b/public/images/emoji/apple/woman_climbing/4.png differ
diff --git a/public/images/emoji/apple/woman_climbing/5.png b/public/images/emoji/apple/woman_climbing/5.png
new file mode 100644
index 00000000000..a07619cb311
Binary files /dev/null and b/public/images/emoji/apple/woman_climbing/5.png differ
diff --git a/public/images/emoji/apple/woman_climbing/6.png b/public/images/emoji/apple/woman_climbing/6.png
new file mode 100644
index 00000000000..00481e998f7
Binary files /dev/null and b/public/images/emoji/apple/woman_climbing/6.png differ
diff --git a/public/images/emoji/apple/woman_cook.png b/public/images/emoji/apple/woman_cook.png
index e9a2694266d..f0ff34b1c65 100644
Binary files a/public/images/emoji/apple/woman_cook.png and b/public/images/emoji/apple/woman_cook.png differ
diff --git a/public/images/emoji/apple/woman_cook/2.png b/public/images/emoji/apple/woman_cook/2.png
index c8e70d26cbe..b357ede8155 100644
Binary files a/public/images/emoji/apple/woman_cook/2.png and b/public/images/emoji/apple/woman_cook/2.png differ
diff --git a/public/images/emoji/apple/woman_cook/3.png b/public/images/emoji/apple/woman_cook/3.png
index 670fd0afe4d..464771e8c34 100644
Binary files a/public/images/emoji/apple/woman_cook/3.png and b/public/images/emoji/apple/woman_cook/3.png differ
diff --git a/public/images/emoji/apple/woman_cook/4.png b/public/images/emoji/apple/woman_cook/4.png
index 734d2ff0ee0..b6248dda3c1 100644
Binary files a/public/images/emoji/apple/woman_cook/4.png and b/public/images/emoji/apple/woman_cook/4.png differ
diff --git a/public/images/emoji/apple/woman_cook/5.png b/public/images/emoji/apple/woman_cook/5.png
index 1569e9a25fb..f4ad591e927 100644
Binary files a/public/images/emoji/apple/woman_cook/5.png and b/public/images/emoji/apple/woman_cook/5.png differ
diff --git a/public/images/emoji/apple/woman_cook/6.png b/public/images/emoji/apple/woman_cook/6.png
index b2c927026ae..7a4862a38fa 100644
Binary files a/public/images/emoji/apple/woman_cook/6.png and b/public/images/emoji/apple/woman_cook/6.png differ
diff --git a/public/images/emoji/apple/woman_facepalming.png b/public/images/emoji/apple/woman_facepalming.png
index 71b21b81326..611bed1ac7f 100644
Binary files a/public/images/emoji/apple/woman_facepalming.png and b/public/images/emoji/apple/woman_facepalming.png differ
diff --git a/public/images/emoji/apple/woman_facepalming/2.png b/public/images/emoji/apple/woman_facepalming/2.png
index c9be4b7d975..a31de26660e 100644
Binary files a/public/images/emoji/apple/woman_facepalming/2.png and b/public/images/emoji/apple/woman_facepalming/2.png differ
diff --git a/public/images/emoji/apple/woman_facepalming/3.png b/public/images/emoji/apple/woman_facepalming/3.png
index c6c8ea4b30e..f002bde6f71 100644
Binary files a/public/images/emoji/apple/woman_facepalming/3.png and b/public/images/emoji/apple/woman_facepalming/3.png differ
diff --git a/public/images/emoji/apple/woman_facepalming/4.png b/public/images/emoji/apple/woman_facepalming/4.png
index a8fe42901e0..4ad1ef8686f 100644
Binary files a/public/images/emoji/apple/woman_facepalming/4.png and b/public/images/emoji/apple/woman_facepalming/4.png differ
diff --git a/public/images/emoji/apple/woman_facepalming/5.png b/public/images/emoji/apple/woman_facepalming/5.png
index 478fd88d9ab..a3274da5de2 100644
Binary files a/public/images/emoji/apple/woman_facepalming/5.png and b/public/images/emoji/apple/woman_facepalming/5.png differ
diff --git a/public/images/emoji/apple/woman_facepalming/6.png b/public/images/emoji/apple/woman_facepalming/6.png
index 80167ff2260..b3dc9e5b4a3 100644
Binary files a/public/images/emoji/apple/woman_facepalming/6.png and b/public/images/emoji/apple/woman_facepalming/6.png differ
diff --git a/public/images/emoji/apple/woman_factory_worker.png b/public/images/emoji/apple/woman_factory_worker.png
index 80a66cfcb4d..6c8d0a738d7 100644
Binary files a/public/images/emoji/apple/woman_factory_worker.png and b/public/images/emoji/apple/woman_factory_worker.png differ
diff --git a/public/images/emoji/apple/woman_factory_worker/2.png b/public/images/emoji/apple/woman_factory_worker/2.png
index c8eb4d41f14..c19d64d1fd4 100644
Binary files a/public/images/emoji/apple/woman_factory_worker/2.png and b/public/images/emoji/apple/woman_factory_worker/2.png differ
diff --git a/public/images/emoji/apple/woman_factory_worker/3.png b/public/images/emoji/apple/woman_factory_worker/3.png
index b2a064fe65c..67fc9c286a3 100644
Binary files a/public/images/emoji/apple/woman_factory_worker/3.png and b/public/images/emoji/apple/woman_factory_worker/3.png differ
diff --git a/public/images/emoji/apple/woman_factory_worker/4.png b/public/images/emoji/apple/woman_factory_worker/4.png
index 577493d152f..1fc56b7da8a 100644
Binary files a/public/images/emoji/apple/woman_factory_worker/4.png and b/public/images/emoji/apple/woman_factory_worker/4.png differ
diff --git a/public/images/emoji/apple/woman_factory_worker/5.png b/public/images/emoji/apple/woman_factory_worker/5.png
index f5ea3f592ae..5945885dea0 100644
Binary files a/public/images/emoji/apple/woman_factory_worker/5.png and b/public/images/emoji/apple/woman_factory_worker/5.png differ
diff --git a/public/images/emoji/apple/woman_factory_worker/6.png b/public/images/emoji/apple/woman_factory_worker/6.png
index 2d3b220796a..19d8e93feba 100644
Binary files a/public/images/emoji/apple/woman_factory_worker/6.png and b/public/images/emoji/apple/woman_factory_worker/6.png differ
diff --git a/public/images/emoji/apple/woman_farmer.png b/public/images/emoji/apple/woman_farmer.png
index cb73fb9b424..49489bd04a3 100644
Binary files a/public/images/emoji/apple/woman_farmer.png and b/public/images/emoji/apple/woman_farmer.png differ
diff --git a/public/images/emoji/apple/woman_farmer/2.png b/public/images/emoji/apple/woman_farmer/2.png
index 3e846f6229c..ffe3e281510 100644
Binary files a/public/images/emoji/apple/woman_farmer/2.png and b/public/images/emoji/apple/woman_farmer/2.png differ
diff --git a/public/images/emoji/apple/woman_farmer/3.png b/public/images/emoji/apple/woman_farmer/3.png
index 0f85dd55e3e..3369a82f3ea 100644
Binary files a/public/images/emoji/apple/woman_farmer/3.png and b/public/images/emoji/apple/woman_farmer/3.png differ
diff --git a/public/images/emoji/apple/woman_farmer/4.png b/public/images/emoji/apple/woman_farmer/4.png
index 060fe1343ff..c517398fda2 100644
Binary files a/public/images/emoji/apple/woman_farmer/4.png and b/public/images/emoji/apple/woman_farmer/4.png differ
diff --git a/public/images/emoji/apple/woman_farmer/5.png b/public/images/emoji/apple/woman_farmer/5.png
index 69175036658..1fc489e4659 100644
Binary files a/public/images/emoji/apple/woman_farmer/5.png and b/public/images/emoji/apple/woman_farmer/5.png differ
diff --git a/public/images/emoji/apple/woman_farmer/6.png b/public/images/emoji/apple/woman_farmer/6.png
index 2537d80d572..e8646afbfea 100644
Binary files a/public/images/emoji/apple/woman_farmer/6.png and b/public/images/emoji/apple/woman_farmer/6.png differ
diff --git a/public/images/emoji/apple/woman_firefighter.png b/public/images/emoji/apple/woman_firefighter.png
index f5714b011cf..a7ff4f6b82a 100644
Binary files a/public/images/emoji/apple/woman_firefighter.png and b/public/images/emoji/apple/woman_firefighter.png differ
diff --git a/public/images/emoji/apple/woman_firefighter/2.png b/public/images/emoji/apple/woman_firefighter/2.png
index 92722663c99..3106303afc9 100644
Binary files a/public/images/emoji/apple/woman_firefighter/2.png and b/public/images/emoji/apple/woman_firefighter/2.png differ
diff --git a/public/images/emoji/apple/woman_firefighter/3.png b/public/images/emoji/apple/woman_firefighter/3.png
index a5e90cb633d..723c45085f3 100644
Binary files a/public/images/emoji/apple/woman_firefighter/3.png and b/public/images/emoji/apple/woman_firefighter/3.png differ
diff --git a/public/images/emoji/apple/woman_firefighter/4.png b/public/images/emoji/apple/woman_firefighter/4.png
index 4b56a830642..e43e3dcbfa9 100644
Binary files a/public/images/emoji/apple/woman_firefighter/4.png and b/public/images/emoji/apple/woman_firefighter/4.png differ
diff --git a/public/images/emoji/apple/woman_firefighter/5.png b/public/images/emoji/apple/woman_firefighter/5.png
index 9b53eed2046..016bc75fc09 100644
Binary files a/public/images/emoji/apple/woman_firefighter/5.png and b/public/images/emoji/apple/woman_firefighter/5.png differ
diff --git a/public/images/emoji/apple/woman_firefighter/6.png b/public/images/emoji/apple/woman_firefighter/6.png
index e788760f72d..7c36d006b05 100644
Binary files a/public/images/emoji/apple/woman_firefighter/6.png and b/public/images/emoji/apple/woman_firefighter/6.png differ
diff --git a/public/images/emoji/apple/woman_genie.png b/public/images/emoji/apple/woman_genie.png
new file mode 100644
index 00000000000..ac7e321f29b
Binary files /dev/null and b/public/images/emoji/apple/woman_genie.png differ
diff --git a/public/images/emoji/apple/woman_health_worker.png b/public/images/emoji/apple/woman_health_worker.png
index 76e63a86e90..1aa3ece3d60 100644
Binary files a/public/images/emoji/apple/woman_health_worker.png and b/public/images/emoji/apple/woman_health_worker.png differ
diff --git a/public/images/emoji/apple/woman_health_worker/2.png b/public/images/emoji/apple/woman_health_worker/2.png
index fd3aaebd20f..92bb8458c58 100644
Binary files a/public/images/emoji/apple/woman_health_worker/2.png and b/public/images/emoji/apple/woman_health_worker/2.png differ
diff --git a/public/images/emoji/apple/woman_health_worker/3.png b/public/images/emoji/apple/woman_health_worker/3.png
index 606e2e81d67..a2ed876b625 100644
Binary files a/public/images/emoji/apple/woman_health_worker/3.png and b/public/images/emoji/apple/woman_health_worker/3.png differ
diff --git a/public/images/emoji/apple/woman_health_worker/4.png b/public/images/emoji/apple/woman_health_worker/4.png
index eec739e9fc3..4bdf36cfb25 100644
Binary files a/public/images/emoji/apple/woman_health_worker/4.png and b/public/images/emoji/apple/woman_health_worker/4.png differ
diff --git a/public/images/emoji/apple/woman_health_worker/5.png b/public/images/emoji/apple/woman_health_worker/5.png
index 6d2500304b2..32a1554cbea 100644
Binary files a/public/images/emoji/apple/woman_health_worker/5.png and b/public/images/emoji/apple/woman_health_worker/5.png differ
diff --git a/public/images/emoji/apple/woman_health_worker/6.png b/public/images/emoji/apple/woman_health_worker/6.png
index 2819c0f5a49..08bea9904c5 100644
Binary files a/public/images/emoji/apple/woman_health_worker/6.png and b/public/images/emoji/apple/woman_health_worker/6.png differ
diff --git a/public/images/emoji/apple/woman_in_lotus_position.png b/public/images/emoji/apple/woman_in_lotus_position.png
new file mode 100644
index 00000000000..7fd1c2ff712
Binary files /dev/null and b/public/images/emoji/apple/woman_in_lotus_position.png differ
diff --git a/public/images/emoji/apple/woman_in_lotus_position/2.png b/public/images/emoji/apple/woman_in_lotus_position/2.png
new file mode 100644
index 00000000000..2ef8ec5a0a5
Binary files /dev/null and b/public/images/emoji/apple/woman_in_lotus_position/2.png differ
diff --git a/public/images/emoji/apple/woman_in_lotus_position/3.png b/public/images/emoji/apple/woman_in_lotus_position/3.png
new file mode 100644
index 00000000000..f85900c4aa5
Binary files /dev/null and b/public/images/emoji/apple/woman_in_lotus_position/3.png differ
diff --git a/public/images/emoji/apple/woman_in_lotus_position/4.png b/public/images/emoji/apple/woman_in_lotus_position/4.png
new file mode 100644
index 00000000000..1d4d8548811
Binary files /dev/null and b/public/images/emoji/apple/woman_in_lotus_position/4.png differ
diff --git a/public/images/emoji/apple/woman_in_lotus_position/5.png b/public/images/emoji/apple/woman_in_lotus_position/5.png
new file mode 100644
index 00000000000..8f81d00909a
Binary files /dev/null and b/public/images/emoji/apple/woman_in_lotus_position/5.png differ
diff --git a/public/images/emoji/apple/woman_in_lotus_position/6.png b/public/images/emoji/apple/woman_in_lotus_position/6.png
new file mode 100644
index 00000000000..dd83d11f7ca
Binary files /dev/null and b/public/images/emoji/apple/woman_in_lotus_position/6.png differ
diff --git a/public/images/emoji/apple/woman_in_steamy_room.png b/public/images/emoji/apple/woman_in_steamy_room.png
new file mode 100644
index 00000000000..6b2a1122efa
Binary files /dev/null and b/public/images/emoji/apple/woman_in_steamy_room.png differ
diff --git a/public/images/emoji/apple/woman_in_steamy_room/2.png b/public/images/emoji/apple/woman_in_steamy_room/2.png
new file mode 100644
index 00000000000..51ddfd9b98b
Binary files /dev/null and b/public/images/emoji/apple/woman_in_steamy_room/2.png differ
diff --git a/public/images/emoji/apple/woman_in_steamy_room/3.png b/public/images/emoji/apple/woman_in_steamy_room/3.png
new file mode 100644
index 00000000000..5ef6ae1af57
Binary files /dev/null and b/public/images/emoji/apple/woman_in_steamy_room/3.png differ
diff --git a/public/images/emoji/apple/woman_in_steamy_room/4.png b/public/images/emoji/apple/woman_in_steamy_room/4.png
new file mode 100644
index 00000000000..9b148985940
Binary files /dev/null and b/public/images/emoji/apple/woman_in_steamy_room/4.png differ
diff --git a/public/images/emoji/apple/woman_in_steamy_room/5.png b/public/images/emoji/apple/woman_in_steamy_room/5.png
new file mode 100644
index 00000000000..b4a00db1407
Binary files /dev/null and b/public/images/emoji/apple/woman_in_steamy_room/5.png differ
diff --git a/public/images/emoji/apple/woman_in_steamy_room/6.png b/public/images/emoji/apple/woman_in_steamy_room/6.png
new file mode 100644
index 00000000000..611329f4df3
Binary files /dev/null and b/public/images/emoji/apple/woman_in_steamy_room/6.png differ
diff --git a/public/images/emoji/apple/woman_judge.png b/public/images/emoji/apple/woman_judge.png
index c67f17e1304..e2baa6f039f 100644
Binary files a/public/images/emoji/apple/woman_judge.png and b/public/images/emoji/apple/woman_judge.png differ
diff --git a/public/images/emoji/apple/woman_judge/2.png b/public/images/emoji/apple/woman_judge/2.png
index 5a0ad48c267..cdb4b32727a 100644
Binary files a/public/images/emoji/apple/woman_judge/2.png and b/public/images/emoji/apple/woman_judge/2.png differ
diff --git a/public/images/emoji/apple/woman_judge/3.png b/public/images/emoji/apple/woman_judge/3.png
index 45124f3c700..b7145ec00cd 100644
Binary files a/public/images/emoji/apple/woman_judge/3.png and b/public/images/emoji/apple/woman_judge/3.png differ
diff --git a/public/images/emoji/apple/woman_judge/4.png b/public/images/emoji/apple/woman_judge/4.png
index 00a22677ee6..55692840c9c 100644
Binary files a/public/images/emoji/apple/woman_judge/4.png and b/public/images/emoji/apple/woman_judge/4.png differ
diff --git a/public/images/emoji/apple/woman_judge/5.png b/public/images/emoji/apple/woman_judge/5.png
index b346b615587..a8683b6bdeb 100644
Binary files a/public/images/emoji/apple/woman_judge/5.png and b/public/images/emoji/apple/woman_judge/5.png differ
diff --git a/public/images/emoji/apple/woman_judge/6.png b/public/images/emoji/apple/woman_judge/6.png
index 9fa2d247868..02fd32ec1ed 100644
Binary files a/public/images/emoji/apple/woman_judge/6.png and b/public/images/emoji/apple/woman_judge/6.png differ
diff --git a/public/images/emoji/apple/woman_juggling.png b/public/images/emoji/apple/woman_juggling.png
index ffd612a1935..64473237a82 100644
Binary files a/public/images/emoji/apple/woman_juggling.png and b/public/images/emoji/apple/woman_juggling.png differ
diff --git a/public/images/emoji/apple/woman_juggling/2.png b/public/images/emoji/apple/woman_juggling/2.png
index 4387658e448..9ac9ac1746e 100644
Binary files a/public/images/emoji/apple/woman_juggling/2.png and b/public/images/emoji/apple/woman_juggling/2.png differ
diff --git a/public/images/emoji/apple/woman_juggling/3.png b/public/images/emoji/apple/woman_juggling/3.png
index 10749861f28..a0687d715bb 100644
Binary files a/public/images/emoji/apple/woman_juggling/3.png and b/public/images/emoji/apple/woman_juggling/3.png differ
diff --git a/public/images/emoji/apple/woman_juggling/4.png b/public/images/emoji/apple/woman_juggling/4.png
index 86e73768b77..13c141d0703 100644
Binary files a/public/images/emoji/apple/woman_juggling/4.png and b/public/images/emoji/apple/woman_juggling/4.png differ
diff --git a/public/images/emoji/apple/woman_juggling/5.png b/public/images/emoji/apple/woman_juggling/5.png
index 9ab0c98d84c..b7a9898b403 100644
Binary files a/public/images/emoji/apple/woman_juggling/5.png and b/public/images/emoji/apple/woman_juggling/5.png differ
diff --git a/public/images/emoji/apple/woman_juggling/6.png b/public/images/emoji/apple/woman_juggling/6.png
index d5fdb9a3a7c..da808310791 100644
Binary files a/public/images/emoji/apple/woman_juggling/6.png and b/public/images/emoji/apple/woman_juggling/6.png differ
diff --git a/public/images/emoji/apple/woman_mage.png b/public/images/emoji/apple/woman_mage.png
new file mode 100644
index 00000000000..558f61472d0
Binary files /dev/null and b/public/images/emoji/apple/woman_mage.png differ
diff --git a/public/images/emoji/apple/woman_mage/2.png b/public/images/emoji/apple/woman_mage/2.png
new file mode 100644
index 00000000000..da735e4a6a8
Binary files /dev/null and b/public/images/emoji/apple/woman_mage/2.png differ
diff --git a/public/images/emoji/apple/woman_mage/3.png b/public/images/emoji/apple/woman_mage/3.png
new file mode 100644
index 00000000000..4141860438e
Binary files /dev/null and b/public/images/emoji/apple/woman_mage/3.png differ
diff --git a/public/images/emoji/apple/woman_mage/4.png b/public/images/emoji/apple/woman_mage/4.png
new file mode 100644
index 00000000000..27b18eb8b17
Binary files /dev/null and b/public/images/emoji/apple/woman_mage/4.png differ
diff --git a/public/images/emoji/apple/woman_mage/5.png b/public/images/emoji/apple/woman_mage/5.png
new file mode 100644
index 00000000000..e5aa11ec211
Binary files /dev/null and b/public/images/emoji/apple/woman_mage/5.png differ
diff --git a/public/images/emoji/apple/woman_mage/6.png b/public/images/emoji/apple/woman_mage/6.png
new file mode 100644
index 00000000000..424e056cc71
Binary files /dev/null and b/public/images/emoji/apple/woman_mage/6.png differ
diff --git a/public/images/emoji/apple/woman_mechanic.png b/public/images/emoji/apple/woman_mechanic.png
index 4f44652939e..d73e8e1f7c1 100644
Binary files a/public/images/emoji/apple/woman_mechanic.png and b/public/images/emoji/apple/woman_mechanic.png differ
diff --git a/public/images/emoji/apple/woman_mechanic/2.png b/public/images/emoji/apple/woman_mechanic/2.png
index 17da6e1c33e..e4a2983eb0b 100644
Binary files a/public/images/emoji/apple/woman_mechanic/2.png and b/public/images/emoji/apple/woman_mechanic/2.png differ
diff --git a/public/images/emoji/apple/woman_mechanic/3.png b/public/images/emoji/apple/woman_mechanic/3.png
index 14b322a0d9f..de91aa39283 100644
Binary files a/public/images/emoji/apple/woman_mechanic/3.png and b/public/images/emoji/apple/woman_mechanic/3.png differ
diff --git a/public/images/emoji/apple/woman_mechanic/4.png b/public/images/emoji/apple/woman_mechanic/4.png
index f9b7cb8bef0..e155f868a05 100644
Binary files a/public/images/emoji/apple/woman_mechanic/4.png and b/public/images/emoji/apple/woman_mechanic/4.png differ
diff --git a/public/images/emoji/apple/woman_mechanic/5.png b/public/images/emoji/apple/woman_mechanic/5.png
index a307279650c..00a44f93ab8 100644
Binary files a/public/images/emoji/apple/woman_mechanic/5.png and b/public/images/emoji/apple/woman_mechanic/5.png differ
diff --git a/public/images/emoji/apple/woman_mechanic/6.png b/public/images/emoji/apple/woman_mechanic/6.png
index 4bf700c6283..6d326380d35 100644
Binary files a/public/images/emoji/apple/woman_mechanic/6.png and b/public/images/emoji/apple/woman_mechanic/6.png differ
diff --git a/public/images/emoji/apple/woman_office_worker.png b/public/images/emoji/apple/woman_office_worker.png
index ad0661cbf02..307bae3426b 100644
Binary files a/public/images/emoji/apple/woman_office_worker.png and b/public/images/emoji/apple/woman_office_worker.png differ
diff --git a/public/images/emoji/apple/woman_office_worker/2.png b/public/images/emoji/apple/woman_office_worker/2.png
index cb9105925a1..76a85bc20f8 100644
Binary files a/public/images/emoji/apple/woman_office_worker/2.png and b/public/images/emoji/apple/woman_office_worker/2.png differ
diff --git a/public/images/emoji/apple/woman_office_worker/3.png b/public/images/emoji/apple/woman_office_worker/3.png
index 967eecf0bf8..cb7f26fdcc3 100644
Binary files a/public/images/emoji/apple/woman_office_worker/3.png and b/public/images/emoji/apple/woman_office_worker/3.png differ
diff --git a/public/images/emoji/apple/woman_office_worker/4.png b/public/images/emoji/apple/woman_office_worker/4.png
index 58c9a785935..07c3b4c3bc3 100644
Binary files a/public/images/emoji/apple/woman_office_worker/4.png and b/public/images/emoji/apple/woman_office_worker/4.png differ
diff --git a/public/images/emoji/apple/woman_office_worker/5.png b/public/images/emoji/apple/woman_office_worker/5.png
index 14e8166360e..94ef0556c61 100644
Binary files a/public/images/emoji/apple/woman_office_worker/5.png and b/public/images/emoji/apple/woman_office_worker/5.png differ
diff --git a/public/images/emoji/apple/woman_office_worker/6.png b/public/images/emoji/apple/woman_office_worker/6.png
index b400c31a3e4..2f1c8933bb9 100644
Binary files a/public/images/emoji/apple/woman_office_worker/6.png and b/public/images/emoji/apple/woman_office_worker/6.png differ
diff --git a/public/images/emoji/apple/woman_pilot.png b/public/images/emoji/apple/woman_pilot.png
index 671d7235bd7..b19c8fdc8e2 100644
Binary files a/public/images/emoji/apple/woman_pilot.png and b/public/images/emoji/apple/woman_pilot.png differ
diff --git a/public/images/emoji/apple/woman_pilot/2.png b/public/images/emoji/apple/woman_pilot/2.png
index 8c6a4256635..e05706c1e1c 100644
Binary files a/public/images/emoji/apple/woman_pilot/2.png and b/public/images/emoji/apple/woman_pilot/2.png differ
diff --git a/public/images/emoji/apple/woman_pilot/3.png b/public/images/emoji/apple/woman_pilot/3.png
index a8b2af7235f..511f86e90fc 100644
Binary files a/public/images/emoji/apple/woman_pilot/3.png and b/public/images/emoji/apple/woman_pilot/3.png differ
diff --git a/public/images/emoji/apple/woman_pilot/4.png b/public/images/emoji/apple/woman_pilot/4.png
index ba132cad0ff..49be952cbe2 100644
Binary files a/public/images/emoji/apple/woman_pilot/4.png and b/public/images/emoji/apple/woman_pilot/4.png differ
diff --git a/public/images/emoji/apple/woman_pilot/5.png b/public/images/emoji/apple/woman_pilot/5.png
index 080cf511369..d61c948ca2f 100644
Binary files a/public/images/emoji/apple/woman_pilot/5.png and b/public/images/emoji/apple/woman_pilot/5.png differ
diff --git a/public/images/emoji/apple/woman_pilot/6.png b/public/images/emoji/apple/woman_pilot/6.png
index 75029fcc0da..a8992d96beb 100644
Binary files a/public/images/emoji/apple/woman_pilot/6.png and b/public/images/emoji/apple/woman_pilot/6.png differ
diff --git a/public/images/emoji/apple/woman_playing_handball.png b/public/images/emoji/apple/woman_playing_handball.png
index 9a03e9c23bd..62354c3b0bd 100644
Binary files a/public/images/emoji/apple/woman_playing_handball.png and b/public/images/emoji/apple/woman_playing_handball.png differ
diff --git a/public/images/emoji/apple/woman_playing_handball/2.png b/public/images/emoji/apple/woman_playing_handball/2.png
index 346119656ce..59bd06eb6c8 100644
Binary files a/public/images/emoji/apple/woman_playing_handball/2.png and b/public/images/emoji/apple/woman_playing_handball/2.png differ
diff --git a/public/images/emoji/apple/woman_playing_handball/3.png b/public/images/emoji/apple/woman_playing_handball/3.png
index 3d61de41b42..1780946d56f 100644
Binary files a/public/images/emoji/apple/woman_playing_handball/3.png and b/public/images/emoji/apple/woman_playing_handball/3.png differ
diff --git a/public/images/emoji/apple/woman_playing_handball/4.png b/public/images/emoji/apple/woman_playing_handball/4.png
index 1048ef59663..bcc1150fbb2 100644
Binary files a/public/images/emoji/apple/woman_playing_handball/4.png and b/public/images/emoji/apple/woman_playing_handball/4.png differ
diff --git a/public/images/emoji/apple/woman_playing_handball/5.png b/public/images/emoji/apple/woman_playing_handball/5.png
index b3364ccfe61..d54d6fb0177 100644
Binary files a/public/images/emoji/apple/woman_playing_handball/5.png and b/public/images/emoji/apple/woman_playing_handball/5.png differ
diff --git a/public/images/emoji/apple/woman_playing_handball/6.png b/public/images/emoji/apple/woman_playing_handball/6.png
index ca6f7369d9c..e57fd68002f 100644
Binary files a/public/images/emoji/apple/woman_playing_handball/6.png and b/public/images/emoji/apple/woman_playing_handball/6.png differ
diff --git a/public/images/emoji/apple/woman_playing_water_polo.png b/public/images/emoji/apple/woman_playing_water_polo.png
index adf9f3114e0..352c39ca59d 100644
Binary files a/public/images/emoji/apple/woman_playing_water_polo.png and b/public/images/emoji/apple/woman_playing_water_polo.png differ
diff --git a/public/images/emoji/apple/woman_playing_water_polo/2.png b/public/images/emoji/apple/woman_playing_water_polo/2.png
index 73f8e3b6acc..bc8a39007e8 100644
Binary files a/public/images/emoji/apple/woman_playing_water_polo/2.png and b/public/images/emoji/apple/woman_playing_water_polo/2.png differ
diff --git a/public/images/emoji/apple/woman_playing_water_polo/3.png b/public/images/emoji/apple/woman_playing_water_polo/3.png
index 47daa87211e..3c5a760a479 100644
Binary files a/public/images/emoji/apple/woman_playing_water_polo/3.png and b/public/images/emoji/apple/woman_playing_water_polo/3.png differ
diff --git a/public/images/emoji/apple/woman_playing_water_polo/4.png b/public/images/emoji/apple/woman_playing_water_polo/4.png
index 58c5f97a44c..af11ad5c451 100644
Binary files a/public/images/emoji/apple/woman_playing_water_polo/4.png and b/public/images/emoji/apple/woman_playing_water_polo/4.png differ
diff --git a/public/images/emoji/apple/woman_playing_water_polo/5.png b/public/images/emoji/apple/woman_playing_water_polo/5.png
index d06753b0e27..e4eefe84437 100644
Binary files a/public/images/emoji/apple/woman_playing_water_polo/5.png and b/public/images/emoji/apple/woman_playing_water_polo/5.png differ
diff --git a/public/images/emoji/apple/woman_playing_water_polo/6.png b/public/images/emoji/apple/woman_playing_water_polo/6.png
index 6072d770976..efcaf069bed 100644
Binary files a/public/images/emoji/apple/woman_playing_water_polo/6.png and b/public/images/emoji/apple/woman_playing_water_polo/6.png differ
diff --git a/public/images/emoji/apple/woman_scientist.png b/public/images/emoji/apple/woman_scientist.png
index 0b250021df5..33fe6fd3a05 100644
Binary files a/public/images/emoji/apple/woman_scientist.png and b/public/images/emoji/apple/woman_scientist.png differ
diff --git a/public/images/emoji/apple/woman_scientist/2.png b/public/images/emoji/apple/woman_scientist/2.png
index 491be8a6848..5d756690079 100644
Binary files a/public/images/emoji/apple/woman_scientist/2.png and b/public/images/emoji/apple/woman_scientist/2.png differ
diff --git a/public/images/emoji/apple/woman_scientist/3.png b/public/images/emoji/apple/woman_scientist/3.png
index ff4749d3950..5a93feae535 100644
Binary files a/public/images/emoji/apple/woman_scientist/3.png and b/public/images/emoji/apple/woman_scientist/3.png differ
diff --git a/public/images/emoji/apple/woman_scientist/4.png b/public/images/emoji/apple/woman_scientist/4.png
index 5cabb438c95..1d238ec6e3f 100644
Binary files a/public/images/emoji/apple/woman_scientist/4.png and b/public/images/emoji/apple/woman_scientist/4.png differ
diff --git a/public/images/emoji/apple/woman_scientist/5.png b/public/images/emoji/apple/woman_scientist/5.png
index 28758853ed1..25408c7780b 100644
Binary files a/public/images/emoji/apple/woman_scientist/5.png and b/public/images/emoji/apple/woman_scientist/5.png differ
diff --git a/public/images/emoji/apple/woman_scientist/6.png b/public/images/emoji/apple/woman_scientist/6.png
index 298a13fbe6d..9d982894346 100644
Binary files a/public/images/emoji/apple/woman_scientist/6.png and b/public/images/emoji/apple/woman_scientist/6.png differ
diff --git a/public/images/emoji/apple/woman_shrugging.png b/public/images/emoji/apple/woman_shrugging.png
index 412e490d8cd..51c534d421c 100644
Binary files a/public/images/emoji/apple/woman_shrugging.png and b/public/images/emoji/apple/woman_shrugging.png differ
diff --git a/public/images/emoji/apple/woman_shrugging/2.png b/public/images/emoji/apple/woman_shrugging/2.png
index bdfc9f7ad2c..b7f2ceb7dd8 100644
Binary files a/public/images/emoji/apple/woman_shrugging/2.png and b/public/images/emoji/apple/woman_shrugging/2.png differ
diff --git a/public/images/emoji/apple/woman_shrugging/3.png b/public/images/emoji/apple/woman_shrugging/3.png
index f68633a993f..2620d9005d4 100644
Binary files a/public/images/emoji/apple/woman_shrugging/3.png and b/public/images/emoji/apple/woman_shrugging/3.png differ
diff --git a/public/images/emoji/apple/woman_shrugging/4.png b/public/images/emoji/apple/woman_shrugging/4.png
index 7038c11ae21..ed0c984a0ea 100644
Binary files a/public/images/emoji/apple/woman_shrugging/4.png and b/public/images/emoji/apple/woman_shrugging/4.png differ
diff --git a/public/images/emoji/apple/woman_shrugging/5.png b/public/images/emoji/apple/woman_shrugging/5.png
index e8245f18e4b..ef144803f81 100644
Binary files a/public/images/emoji/apple/woman_shrugging/5.png and b/public/images/emoji/apple/woman_shrugging/5.png differ
diff --git a/public/images/emoji/apple/woman_shrugging/6.png b/public/images/emoji/apple/woman_shrugging/6.png
index 96cf350ee3a..246047e12d8 100644
Binary files a/public/images/emoji/apple/woman_shrugging/6.png and b/public/images/emoji/apple/woman_shrugging/6.png differ
diff --git a/public/images/emoji/apple/woman_singer.png b/public/images/emoji/apple/woman_singer.png
index 9f248dab13e..3bbb5d3fbae 100644
Binary files a/public/images/emoji/apple/woman_singer.png and b/public/images/emoji/apple/woman_singer.png differ
diff --git a/public/images/emoji/apple/woman_singer/2.png b/public/images/emoji/apple/woman_singer/2.png
index 2008017cde1..b11ab7fa450 100644
Binary files a/public/images/emoji/apple/woman_singer/2.png and b/public/images/emoji/apple/woman_singer/2.png differ
diff --git a/public/images/emoji/apple/woman_singer/3.png b/public/images/emoji/apple/woman_singer/3.png
index 2875ffda445..b46bd0bc8d3 100644
Binary files a/public/images/emoji/apple/woman_singer/3.png and b/public/images/emoji/apple/woman_singer/3.png differ
diff --git a/public/images/emoji/apple/woman_singer/4.png b/public/images/emoji/apple/woman_singer/4.png
index 25f64dc20e2..7561064d8f3 100644
Binary files a/public/images/emoji/apple/woman_singer/4.png and b/public/images/emoji/apple/woman_singer/4.png differ
diff --git a/public/images/emoji/apple/woman_singer/5.png b/public/images/emoji/apple/woman_singer/5.png
index e4dbaf142cc..9d7c24c1971 100644
Binary files a/public/images/emoji/apple/woman_singer/5.png and b/public/images/emoji/apple/woman_singer/5.png differ
diff --git a/public/images/emoji/apple/woman_singer/6.png b/public/images/emoji/apple/woman_singer/6.png
index 18e544431fe..70348954baf 100644
Binary files a/public/images/emoji/apple/woman_singer/6.png and b/public/images/emoji/apple/woman_singer/6.png differ
diff --git a/public/images/emoji/apple/woman_student.png b/public/images/emoji/apple/woman_student.png
index 6fcfe2aba05..ca90c58aac4 100644
Binary files a/public/images/emoji/apple/woman_student.png and b/public/images/emoji/apple/woman_student.png differ
diff --git a/public/images/emoji/apple/woman_student/2.png b/public/images/emoji/apple/woman_student/2.png
index 38aa863d956..800d985811e 100644
Binary files a/public/images/emoji/apple/woman_student/2.png and b/public/images/emoji/apple/woman_student/2.png differ
diff --git a/public/images/emoji/apple/woman_student/3.png b/public/images/emoji/apple/woman_student/3.png
index 312ab89a73a..2d82000de6e 100644
Binary files a/public/images/emoji/apple/woman_student/3.png and b/public/images/emoji/apple/woman_student/3.png differ
diff --git a/public/images/emoji/apple/woman_student/4.png b/public/images/emoji/apple/woman_student/4.png
index da8216b827c..627947e3a5d 100644
Binary files a/public/images/emoji/apple/woman_student/4.png and b/public/images/emoji/apple/woman_student/4.png differ
diff --git a/public/images/emoji/apple/woman_student/5.png b/public/images/emoji/apple/woman_student/5.png
index 7bc31e0318e..5368e1a8044 100644
Binary files a/public/images/emoji/apple/woman_student/5.png and b/public/images/emoji/apple/woman_student/5.png differ
diff --git a/public/images/emoji/apple/woman_student/6.png b/public/images/emoji/apple/woman_student/6.png
index 25e6123843c..6b622591ff4 100644
Binary files a/public/images/emoji/apple/woman_student/6.png and b/public/images/emoji/apple/woman_student/6.png differ
diff --git a/public/images/emoji/apple/woman_teacher.png b/public/images/emoji/apple/woman_teacher.png
index 7f3b5516b27..851f4749c19 100644
Binary files a/public/images/emoji/apple/woman_teacher.png and b/public/images/emoji/apple/woman_teacher.png differ
diff --git a/public/images/emoji/apple/woman_teacher/2.png b/public/images/emoji/apple/woman_teacher/2.png
index c0f4abf643b..9f5bca10531 100644
Binary files a/public/images/emoji/apple/woman_teacher/2.png and b/public/images/emoji/apple/woman_teacher/2.png differ
diff --git a/public/images/emoji/apple/woman_teacher/3.png b/public/images/emoji/apple/woman_teacher/3.png
index 6c14f58aa51..f299fe1b5cc 100644
Binary files a/public/images/emoji/apple/woman_teacher/3.png and b/public/images/emoji/apple/woman_teacher/3.png differ
diff --git a/public/images/emoji/apple/woman_teacher/4.png b/public/images/emoji/apple/woman_teacher/4.png
index faf928beaa5..9b7fa9c5af7 100644
Binary files a/public/images/emoji/apple/woman_teacher/4.png and b/public/images/emoji/apple/woman_teacher/4.png differ
diff --git a/public/images/emoji/apple/woman_teacher/5.png b/public/images/emoji/apple/woman_teacher/5.png
index 1ccaf76ca6f..364a6823a20 100644
Binary files a/public/images/emoji/apple/woman_teacher/5.png and b/public/images/emoji/apple/woman_teacher/5.png differ
diff --git a/public/images/emoji/apple/woman_teacher/6.png b/public/images/emoji/apple/woman_teacher/6.png
index 607e69c1c46..c43efec2de5 100644
Binary files a/public/images/emoji/apple/woman_teacher/6.png and b/public/images/emoji/apple/woman_teacher/6.png differ
diff --git a/public/images/emoji/apple/woman_technologist.png b/public/images/emoji/apple/woman_technologist.png
index 2398b1c24ec..f7e0e3b34de 100644
Binary files a/public/images/emoji/apple/woman_technologist.png and b/public/images/emoji/apple/woman_technologist.png differ
diff --git a/public/images/emoji/apple/woman_technologist/2.png b/public/images/emoji/apple/woman_technologist/2.png
index 3992fec1bdd..d8e0f9e728f 100644
Binary files a/public/images/emoji/apple/woman_technologist/2.png and b/public/images/emoji/apple/woman_technologist/2.png differ
diff --git a/public/images/emoji/apple/woman_technologist/3.png b/public/images/emoji/apple/woman_technologist/3.png
index f7a1a66347a..3987bf35efc 100644
Binary files a/public/images/emoji/apple/woman_technologist/3.png and b/public/images/emoji/apple/woman_technologist/3.png differ
diff --git a/public/images/emoji/apple/woman_technologist/4.png b/public/images/emoji/apple/woman_technologist/4.png
index f44b39dfedf..8f78fcc0ae4 100644
Binary files a/public/images/emoji/apple/woman_technologist/4.png and b/public/images/emoji/apple/woman_technologist/4.png differ
diff --git a/public/images/emoji/apple/woman_technologist/5.png b/public/images/emoji/apple/woman_technologist/5.png
index 32e393d56de..bad095ee678 100644
Binary files a/public/images/emoji/apple/woman_technologist/5.png and b/public/images/emoji/apple/woman_technologist/5.png differ
diff --git a/public/images/emoji/apple/woman_technologist/6.png b/public/images/emoji/apple/woman_technologist/6.png
index 50958f787b3..c7be5c0f8de 100644
Binary files a/public/images/emoji/apple/woman_technologist/6.png and b/public/images/emoji/apple/woman_technologist/6.png differ
diff --git a/public/images/emoji/apple/woman_with_headscarf.png b/public/images/emoji/apple/woman_with_headscarf.png
index 6b3731cac84..41706208a4a 100644
Binary files a/public/images/emoji/apple/woman_with_headscarf.png and b/public/images/emoji/apple/woman_with_headscarf.png differ
diff --git a/public/images/emoji/apple/woman_with_headscarf/2.png b/public/images/emoji/apple/woman_with_headscarf/2.png
index 511414ad6c6..dad2f65496d 100644
Binary files a/public/images/emoji/apple/woman_with_headscarf/2.png and b/public/images/emoji/apple/woman_with_headscarf/2.png differ
diff --git a/public/images/emoji/apple/woman_with_headscarf/3.png b/public/images/emoji/apple/woman_with_headscarf/3.png
index af954353790..e21abf59849 100644
Binary files a/public/images/emoji/apple/woman_with_headscarf/3.png and b/public/images/emoji/apple/woman_with_headscarf/3.png differ
diff --git a/public/images/emoji/apple/woman_with_headscarf/4.png b/public/images/emoji/apple/woman_with_headscarf/4.png
index 355bdeb6361..e2c6442a858 100644
Binary files a/public/images/emoji/apple/woman_with_headscarf/4.png and b/public/images/emoji/apple/woman_with_headscarf/4.png differ
diff --git a/public/images/emoji/apple/woman_with_headscarf/5.png b/public/images/emoji/apple/woman_with_headscarf/5.png
index 8d0ad7202e3..4b8541e9667 100644
Binary files a/public/images/emoji/apple/woman_with_headscarf/5.png and b/public/images/emoji/apple/woman_with_headscarf/5.png differ
diff --git a/public/images/emoji/apple/woman_with_headscarf/6.png b/public/images/emoji/apple/woman_with_headscarf/6.png
index 3c49195f876..981d638f573 100644
Binary files a/public/images/emoji/apple/woman_with_headscarf/6.png and b/public/images/emoji/apple/woman_with_headscarf/6.png differ
diff --git a/public/images/emoji/apple/woman_with_turban.png b/public/images/emoji/apple/woman_with_turban.png
index b9b6f95c5c7..953b64dbe83 100644
Binary files a/public/images/emoji/apple/woman_with_turban.png and b/public/images/emoji/apple/woman_with_turban.png differ
diff --git a/public/images/emoji/apple/woman_with_turban/2.png b/public/images/emoji/apple/woman_with_turban/2.png
index 3be821a5f75..5a40f0f07cf 100644
Binary files a/public/images/emoji/apple/woman_with_turban/2.png and b/public/images/emoji/apple/woman_with_turban/2.png differ
diff --git a/public/images/emoji/apple/woman_with_turban/3.png b/public/images/emoji/apple/woman_with_turban/3.png
index cb19d35ab3f..98f99085e2e 100644
Binary files a/public/images/emoji/apple/woman_with_turban/3.png and b/public/images/emoji/apple/woman_with_turban/3.png differ
diff --git a/public/images/emoji/apple/woman_with_turban/4.png b/public/images/emoji/apple/woman_with_turban/4.png
index 45392c41307..8f92589c325 100644
Binary files a/public/images/emoji/apple/woman_with_turban/4.png and b/public/images/emoji/apple/woman_with_turban/4.png differ
diff --git a/public/images/emoji/apple/woman_with_turban/5.png b/public/images/emoji/apple/woman_with_turban/5.png
index e5b510d196a..1f7ae62c04a 100644
Binary files a/public/images/emoji/apple/woman_with_turban/5.png and b/public/images/emoji/apple/woman_with_turban/5.png differ
diff --git a/public/images/emoji/apple/woman_with_turban/6.png b/public/images/emoji/apple/woman_with_turban/6.png
index d89b94bd4ba..956f1c4f422 100644
Binary files a/public/images/emoji/apple/woman_with_turban/6.png and b/public/images/emoji/apple/woman_with_turban/6.png differ
diff --git a/public/images/emoji/apple/woman_zombie.png b/public/images/emoji/apple/woman_zombie.png
new file mode 100644
index 00000000000..7be4e7ac0e2
Binary files /dev/null and b/public/images/emoji/apple/woman_zombie.png differ
diff --git a/public/images/emoji/apple/womans_clothes.png b/public/images/emoji/apple/womans_clothes.png
index 3552fb64836..31fe350d9ae 100644
Binary files a/public/images/emoji/apple/womans_clothes.png and b/public/images/emoji/apple/womans_clothes.png differ
diff --git a/public/images/emoji/apple/womans_hat.png b/public/images/emoji/apple/womans_hat.png
index 6244f5c30e7..8d9cf0647bc 100644
Binary files a/public/images/emoji/apple/womans_hat.png and b/public/images/emoji/apple/womans_hat.png differ
diff --git a/public/images/emoji/apple/women_wrestling.png b/public/images/emoji/apple/women_wrestling.png
index d344fc9cc3f..b71824c0592 100644
Binary files a/public/images/emoji/apple/women_wrestling.png and b/public/images/emoji/apple/women_wrestling.png differ
diff --git a/public/images/emoji/apple/womens.png b/public/images/emoji/apple/womens.png
index 0518592460a..714a5942fc3 100644
Binary files a/public/images/emoji/apple/womens.png and b/public/images/emoji/apple/womens.png differ
diff --git a/public/images/emoji/apple/world_map.png b/public/images/emoji/apple/world_map.png
index 9cd3f7decfd..66490d07727 100644
Binary files a/public/images/emoji/apple/world_map.png and b/public/images/emoji/apple/world_map.png differ
diff --git a/public/images/emoji/apple/worried.png b/public/images/emoji/apple/worried.png
index 41d4c7c12a5..c4a67d8f9f0 100644
Binary files a/public/images/emoji/apple/worried.png and b/public/images/emoji/apple/worried.png differ
diff --git a/public/images/emoji/apple/worship_symbol.png b/public/images/emoji/apple/worship_symbol.png
index c8e1cecd396..eb6997ca4ea 100644
Binary files a/public/images/emoji/apple/worship_symbol.png and b/public/images/emoji/apple/worship_symbol.png differ
diff --git a/public/images/emoji/apple/wrench.png b/public/images/emoji/apple/wrench.png
index d958ea664ae..14dac7ae646 100644
Binary files a/public/images/emoji/apple/wrench.png and b/public/images/emoji/apple/wrench.png differ
diff --git a/public/images/emoji/apple/writing_hand.png b/public/images/emoji/apple/writing_hand.png
index 68122879507..b85d1c390c6 100644
Binary files a/public/images/emoji/apple/writing_hand.png and b/public/images/emoji/apple/writing_hand.png differ
diff --git a/public/images/emoji/apple/writing_hand/2.png b/public/images/emoji/apple/writing_hand/2.png
index c017804a1a2..8e65526a610 100644
Binary files a/public/images/emoji/apple/writing_hand/2.png and b/public/images/emoji/apple/writing_hand/2.png differ
diff --git a/public/images/emoji/apple/writing_hand/3.png b/public/images/emoji/apple/writing_hand/3.png
index 59764dd649d..202637f2844 100644
Binary files a/public/images/emoji/apple/writing_hand/3.png and b/public/images/emoji/apple/writing_hand/3.png differ
diff --git a/public/images/emoji/apple/writing_hand/4.png b/public/images/emoji/apple/writing_hand/4.png
index 158aa52f05d..54450b24c26 100644
Binary files a/public/images/emoji/apple/writing_hand/4.png and b/public/images/emoji/apple/writing_hand/4.png differ
diff --git a/public/images/emoji/apple/writing_hand/5.png b/public/images/emoji/apple/writing_hand/5.png
index 85d3b01ade9..bbd179c9bef 100644
Binary files a/public/images/emoji/apple/writing_hand/5.png and b/public/images/emoji/apple/writing_hand/5.png differ
diff --git a/public/images/emoji/apple/writing_hand/6.png b/public/images/emoji/apple/writing_hand/6.png
index ca23a54b76d..8f4096c8408 100644
Binary files a/public/images/emoji/apple/writing_hand/6.png and b/public/images/emoji/apple/writing_hand/6.png differ
diff --git a/public/images/emoji/apple/x.png b/public/images/emoji/apple/x.png
index 1ecd7f42a25..ce5d1eb6b40 100644
Binary files a/public/images/emoji/apple/x.png and b/public/images/emoji/apple/x.png differ
diff --git a/public/images/emoji/apple/yellow_heart.png b/public/images/emoji/apple/yellow_heart.png
index f554224f088..38add0add48 100644
Binary files a/public/images/emoji/apple/yellow_heart.png and b/public/images/emoji/apple/yellow_heart.png differ
diff --git a/public/images/emoji/apple/yemen.png b/public/images/emoji/apple/yemen.png
index d3ac4e1ed62..5edbd5394ab 100644
Binary files a/public/images/emoji/apple/yemen.png and b/public/images/emoji/apple/yemen.png differ
diff --git a/public/images/emoji/apple/yen.png b/public/images/emoji/apple/yen.png
index 4ec18abab35..4b39a3bfd38 100644
Binary files a/public/images/emoji/apple/yen.png and b/public/images/emoji/apple/yen.png differ
diff --git a/public/images/emoji/apple/yin_yang.png b/public/images/emoji/apple/yin_yang.png
index 9e466a86932..19f2add788c 100644
Binary files a/public/images/emoji/apple/yin_yang.png and b/public/images/emoji/apple/yin_yang.png differ
diff --git a/public/images/emoji/apple/yum.png b/public/images/emoji/apple/yum.png
index 1d849d566f4..f6008b1f030 100644
Binary files a/public/images/emoji/apple/yum.png and b/public/images/emoji/apple/yum.png differ
diff --git a/public/images/emoji/apple/zambia.png b/public/images/emoji/apple/zambia.png
index 04dfc3bdb23..9dd990b24b7 100644
Binary files a/public/images/emoji/apple/zambia.png and b/public/images/emoji/apple/zambia.png differ
diff --git a/public/images/emoji/apple/zap.png b/public/images/emoji/apple/zap.png
index c517566427f..2fe9925de66 100644
Binary files a/public/images/emoji/apple/zap.png and b/public/images/emoji/apple/zap.png differ
diff --git a/public/images/emoji/apple/zebra.png b/public/images/emoji/apple/zebra.png
index 6faa14f55dc..9f7b745b435 100644
Binary files a/public/images/emoji/apple/zebra.png and b/public/images/emoji/apple/zebra.png differ
diff --git a/public/images/emoji/apple/zero.png b/public/images/emoji/apple/zero.png
index 4b2b38dce0a..c95d92d98d7 100644
Binary files a/public/images/emoji/apple/zero.png and b/public/images/emoji/apple/zero.png differ
diff --git a/public/images/emoji/apple/zimbabwe.png b/public/images/emoji/apple/zimbabwe.png
index 0470d4dd941..90cd4cd0d33 100644
Binary files a/public/images/emoji/apple/zimbabwe.png and b/public/images/emoji/apple/zimbabwe.png differ
diff --git a/public/images/emoji/apple/zipper_mouth.png b/public/images/emoji/apple/zipper_mouth.png
index 8aaf44f5fdf..7783c9c08ea 100644
Binary files a/public/images/emoji/apple/zipper_mouth.png and b/public/images/emoji/apple/zipper_mouth.png differ
diff --git a/public/images/emoji/apple/zipper_mouth_face.png b/public/images/emoji/apple/zipper_mouth_face.png
index 8aaf44f5fdf..7783c9c08ea 100644
Binary files a/public/images/emoji/apple/zipper_mouth_face.png and b/public/images/emoji/apple/zipper_mouth_face.png differ
diff --git a/public/images/emoji/apple/zombie.png b/public/images/emoji/apple/zombie.png
index 1bf288fcd4c..d28648fe487 100644
Binary files a/public/images/emoji/apple/zombie.png and b/public/images/emoji/apple/zombie.png differ
diff --git a/public/images/emoji/apple/zzz.png b/public/images/emoji/apple/zzz.png
index c8b4142b9f7..4647baf0cb9 100644
Binary files a/public/images/emoji/apple/zzz.png and b/public/images/emoji/apple/zzz.png differ
diff --git a/public/images/emoji/emoji_one/mermaid.png b/public/images/emoji/emoji_one/mermaid.png
new file mode 100644
index 00000000000..785b587fecf
Binary files /dev/null and b/public/images/emoji/emoji_one/mermaid.png differ
diff --git a/public/images/emoji/emoji_one/mermaid/2.png b/public/images/emoji/emoji_one/mermaid/2.png
new file mode 100644
index 00000000000..e9619aa522c
Binary files /dev/null and b/public/images/emoji/emoji_one/mermaid/2.png differ
diff --git a/public/images/emoji/emoji_one/mermaid/3.png b/public/images/emoji/emoji_one/mermaid/3.png
new file mode 100644
index 00000000000..0c4dc9e5e0f
Binary files /dev/null and b/public/images/emoji/emoji_one/mermaid/3.png differ
diff --git a/public/images/emoji/emoji_one/mermaid/4.png b/public/images/emoji/emoji_one/mermaid/4.png
new file mode 100644
index 00000000000..f14097564fb
Binary files /dev/null and b/public/images/emoji/emoji_one/mermaid/4.png differ
diff --git a/public/images/emoji/emoji_one/mermaid/5.png b/public/images/emoji/emoji_one/mermaid/5.png
new file mode 100644
index 00000000000..7b79d563160
Binary files /dev/null and b/public/images/emoji/emoji_one/mermaid/5.png differ
diff --git a/public/images/emoji/emoji_one/mermaid/6.png b/public/images/emoji/emoji_one/mermaid/6.png
new file mode 100644
index 00000000000..cd862603d2d
Binary files /dev/null and b/public/images/emoji/emoji_one/mermaid/6.png differ
diff --git a/public/images/emoji/emoji_one/merman.png b/public/images/emoji/emoji_one/merman.png
new file mode 100644
index 00000000000..f4b3aeb37d1
Binary files /dev/null and b/public/images/emoji/emoji_one/merman.png differ
diff --git a/public/images/emoji/emoji_one/merman/2.png b/public/images/emoji/emoji_one/merman/2.png
new file mode 100644
index 00000000000..92ccf37b962
Binary files /dev/null and b/public/images/emoji/emoji_one/merman/2.png differ
diff --git a/public/images/emoji/emoji_one/merman/3.png b/public/images/emoji/emoji_one/merman/3.png
new file mode 100644
index 00000000000..16450e5fbc4
Binary files /dev/null and b/public/images/emoji/emoji_one/merman/3.png differ
diff --git a/public/images/emoji/emoji_one/merman/4.png b/public/images/emoji/emoji_one/merman/4.png
new file mode 100644
index 00000000000..5f5d891bb1c
Binary files /dev/null and b/public/images/emoji/emoji_one/merman/4.png differ
diff --git a/public/images/emoji/emoji_one/merman/5.png b/public/images/emoji/emoji_one/merman/5.png
new file mode 100644
index 00000000000..fcff6a9adb0
Binary files /dev/null and b/public/images/emoji/emoji_one/merman/5.png differ
diff --git a/public/images/emoji/emoji_one/merman/6.png b/public/images/emoji/emoji_one/merman/6.png
new file mode 100644
index 00000000000..be614e51035
Binary files /dev/null and b/public/images/emoji/emoji_one/merman/6.png differ
diff --git a/public/images/emoji/emoji_one/puke.png b/public/images/emoji/emoji_one/puke.png
new file mode 100644
index 00000000000..60b8fb4babd
Binary files /dev/null and b/public/images/emoji/emoji_one/puke.png differ
diff --git a/public/images/emoji/emoji_one/woman_climbing.png b/public/images/emoji/emoji_one/woman_climbing.png
new file mode 100644
index 00000000000..5f602e7921d
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_climbing.png differ
diff --git a/public/images/emoji/emoji_one/woman_climbing/2.png b/public/images/emoji/emoji_one/woman_climbing/2.png
new file mode 100644
index 00000000000..4215248b4de
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_climbing/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_climbing/3.png b/public/images/emoji/emoji_one/woman_climbing/3.png
new file mode 100644
index 00000000000..6e078544429
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_climbing/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_climbing/4.png b/public/images/emoji/emoji_one/woman_climbing/4.png
new file mode 100644
index 00000000000..f88dcf1a0ee
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_climbing/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_climbing/5.png b/public/images/emoji/emoji_one/woman_climbing/5.png
new file mode 100644
index 00000000000..67ddf47872b
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_climbing/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_climbing/6.png b/public/images/emoji/emoji_one/woman_climbing/6.png
new file mode 100644
index 00000000000..fcd36f345ad
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_climbing/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_genie.png b/public/images/emoji/emoji_one/woman_genie.png
new file mode 100644
index 00000000000..c0f55e5fca2
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_genie.png differ
diff --git a/public/images/emoji/emoji_one/woman_in_lotus_position.png b/public/images/emoji/emoji_one/woman_in_lotus_position.png
new file mode 100644
index 00000000000..85b467093b3
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_in_lotus_position.png differ
diff --git a/public/images/emoji/emoji_one/woman_in_lotus_position/2.png b/public/images/emoji/emoji_one/woman_in_lotus_position/2.png
new file mode 100644
index 00000000000..339d2cd5157
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_in_lotus_position/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_in_lotus_position/3.png b/public/images/emoji/emoji_one/woman_in_lotus_position/3.png
new file mode 100644
index 00000000000..bc379d16bf3
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_in_lotus_position/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_in_lotus_position/4.png b/public/images/emoji/emoji_one/woman_in_lotus_position/4.png
new file mode 100644
index 00000000000..50fcaa6ee3e
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_in_lotus_position/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_in_lotus_position/5.png b/public/images/emoji/emoji_one/woman_in_lotus_position/5.png
new file mode 100644
index 00000000000..be94a8bc336
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_in_lotus_position/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_in_lotus_position/6.png b/public/images/emoji/emoji_one/woman_in_lotus_position/6.png
new file mode 100644
index 00000000000..35c5fba8856
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_in_lotus_position/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_in_steamy_room.png b/public/images/emoji/emoji_one/woman_in_steamy_room.png
new file mode 100644
index 00000000000..c83e9d0c9a1
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_in_steamy_room.png differ
diff --git a/public/images/emoji/emoji_one/woman_in_steamy_room/2.png b/public/images/emoji/emoji_one/woman_in_steamy_room/2.png
new file mode 100644
index 00000000000..8b02528d603
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_in_steamy_room/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_in_steamy_room/3.png b/public/images/emoji/emoji_one/woman_in_steamy_room/3.png
new file mode 100644
index 00000000000..d95e31e3a35
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_in_steamy_room/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_in_steamy_room/4.png b/public/images/emoji/emoji_one/woman_in_steamy_room/4.png
new file mode 100644
index 00000000000..573911f2595
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_in_steamy_room/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_in_steamy_room/5.png b/public/images/emoji/emoji_one/woman_in_steamy_room/5.png
new file mode 100644
index 00000000000..0ded387a6c7
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_in_steamy_room/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_in_steamy_room/6.png b/public/images/emoji/emoji_one/woman_in_steamy_room/6.png
new file mode 100644
index 00000000000..381e454934e
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_in_steamy_room/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_mage.png b/public/images/emoji/emoji_one/woman_mage.png
new file mode 100644
index 00000000000..1c259a872c7
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_mage.png differ
diff --git a/public/images/emoji/emoji_one/woman_mage/2.png b/public/images/emoji/emoji_one/woman_mage/2.png
new file mode 100644
index 00000000000..257a3f7e073
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_mage/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_mage/3.png b/public/images/emoji/emoji_one/woman_mage/3.png
new file mode 100644
index 00000000000..698da1569c4
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_mage/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_mage/4.png b/public/images/emoji/emoji_one/woman_mage/4.png
new file mode 100644
index 00000000000..7664ec51ec8
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_mage/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_mage/5.png b/public/images/emoji/emoji_one/woman_mage/5.png
new file mode 100644
index 00000000000..d791d4eb110
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_mage/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_mage/6.png b/public/images/emoji/emoji_one/woman_mage/6.png
new file mode 100644
index 00000000000..d3a31e9de8a
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_mage/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_zombie.png b/public/images/emoji/emoji_one/woman_zombie.png
new file mode 100644
index 00000000000..d46f18de17b
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_zombie.png differ
diff --git a/public/images/emoji/facebook_messenger/+1.png b/public/images/emoji/facebook_messenger/+1.png
index 6621dc4a7bd..53f1b3d0756 100644
Binary files a/public/images/emoji/facebook_messenger/+1.png and b/public/images/emoji/facebook_messenger/+1.png differ
diff --git a/public/images/emoji/facebook_messenger/+1/2.png b/public/images/emoji/facebook_messenger/+1/2.png
index 37b29f3252d..eb5da604ede 100644
Binary files a/public/images/emoji/facebook_messenger/+1/2.png and b/public/images/emoji/facebook_messenger/+1/2.png differ
diff --git a/public/images/emoji/facebook_messenger/+1/3.png b/public/images/emoji/facebook_messenger/+1/3.png
index c7aa5375582..192910cdc26 100644
Binary files a/public/images/emoji/facebook_messenger/+1/3.png and b/public/images/emoji/facebook_messenger/+1/3.png differ
diff --git a/public/images/emoji/facebook_messenger/+1/4.png b/public/images/emoji/facebook_messenger/+1/4.png
index 1e24d40e565..ec447b30766 100644
Binary files a/public/images/emoji/facebook_messenger/+1/4.png and b/public/images/emoji/facebook_messenger/+1/4.png differ
diff --git a/public/images/emoji/facebook_messenger/+1/5.png b/public/images/emoji/facebook_messenger/+1/5.png
index 5b1740d87b2..e09b86a9f12 100644
Binary files a/public/images/emoji/facebook_messenger/+1/5.png and b/public/images/emoji/facebook_messenger/+1/5.png differ
diff --git a/public/images/emoji/facebook_messenger/+1/6.png b/public/images/emoji/facebook_messenger/+1/6.png
index e67bd06a2ac..b43fad6805e 100644
Binary files a/public/images/emoji/facebook_messenger/+1/6.png and b/public/images/emoji/facebook_messenger/+1/6.png differ
diff --git a/public/images/emoji/facebook_messenger/-1.png b/public/images/emoji/facebook_messenger/-1.png
index 1f6f64836b5..6a7dce2614d 100644
Binary files a/public/images/emoji/facebook_messenger/-1.png and b/public/images/emoji/facebook_messenger/-1.png differ
diff --git a/public/images/emoji/facebook_messenger/-1/2.png b/public/images/emoji/facebook_messenger/-1/2.png
index e706d7c7a54..ceaa32b82f6 100644
Binary files a/public/images/emoji/facebook_messenger/-1/2.png and b/public/images/emoji/facebook_messenger/-1/2.png differ
diff --git a/public/images/emoji/facebook_messenger/-1/3.png b/public/images/emoji/facebook_messenger/-1/3.png
index 9bf7711367e..c6d370ce27a 100644
Binary files a/public/images/emoji/facebook_messenger/-1/3.png and b/public/images/emoji/facebook_messenger/-1/3.png differ
diff --git a/public/images/emoji/facebook_messenger/-1/4.png b/public/images/emoji/facebook_messenger/-1/4.png
index 35fc141cba2..212f843ce9d 100644
Binary files a/public/images/emoji/facebook_messenger/-1/4.png and b/public/images/emoji/facebook_messenger/-1/4.png differ
diff --git a/public/images/emoji/facebook_messenger/-1/5.png b/public/images/emoji/facebook_messenger/-1/5.png
index bd43bad3049..2b2cf805484 100644
Binary files a/public/images/emoji/facebook_messenger/-1/5.png and b/public/images/emoji/facebook_messenger/-1/5.png differ
diff --git a/public/images/emoji/facebook_messenger/-1/6.png b/public/images/emoji/facebook_messenger/-1/6.png
index 5b682877029..deb44ca2b37 100644
Binary files a/public/images/emoji/facebook_messenger/-1/6.png and b/public/images/emoji/facebook_messenger/-1/6.png differ
diff --git a/public/images/emoji/facebook_messenger/100.png b/public/images/emoji/facebook_messenger/100.png
index d6b5336e120..78dfa21ffb4 100644
Binary files a/public/images/emoji/facebook_messenger/100.png and b/public/images/emoji/facebook_messenger/100.png differ
diff --git a/public/images/emoji/facebook_messenger/1234.png b/public/images/emoji/facebook_messenger/1234.png
index 44d2a4fc663..7419d45eafb 100644
Binary files a/public/images/emoji/facebook_messenger/1234.png and b/public/images/emoji/facebook_messenger/1234.png differ
diff --git a/public/images/emoji/facebook_messenger/1st_place_medal.png b/public/images/emoji/facebook_messenger/1st_place_medal.png
index 92235c693c6..2e7efd77c86 100644
Binary files a/public/images/emoji/facebook_messenger/1st_place_medal.png and b/public/images/emoji/facebook_messenger/1st_place_medal.png differ
diff --git a/public/images/emoji/facebook_messenger/2nd_place_medal.png b/public/images/emoji/facebook_messenger/2nd_place_medal.png
index 6eb5db8e21f..531865180af 100644
Binary files a/public/images/emoji/facebook_messenger/2nd_place_medal.png and b/public/images/emoji/facebook_messenger/2nd_place_medal.png differ
diff --git a/public/images/emoji/facebook_messenger/3rd_place_medal.png b/public/images/emoji/facebook_messenger/3rd_place_medal.png
index 4676f24e21a..f4f0c3562e5 100644
Binary files a/public/images/emoji/facebook_messenger/3rd_place_medal.png and b/public/images/emoji/facebook_messenger/3rd_place_medal.png differ
diff --git a/public/images/emoji/facebook_messenger/8ball.png b/public/images/emoji/facebook_messenger/8ball.png
index 771ad025693..11cc716c117 100644
Binary files a/public/images/emoji/facebook_messenger/8ball.png and b/public/images/emoji/facebook_messenger/8ball.png differ
diff --git a/public/images/emoji/facebook_messenger/a.png b/public/images/emoji/facebook_messenger/a.png
index 501883feb4a..55b11f4ec0d 100644
Binary files a/public/images/emoji/facebook_messenger/a.png and b/public/images/emoji/facebook_messenger/a.png differ
diff --git a/public/images/emoji/facebook_messenger/ab.png b/public/images/emoji/facebook_messenger/ab.png
index e00355202a4..963d76b0532 100644
Binary files a/public/images/emoji/facebook_messenger/ab.png and b/public/images/emoji/facebook_messenger/ab.png differ
diff --git a/public/images/emoji/facebook_messenger/abc.png b/public/images/emoji/facebook_messenger/abc.png
index 1428e8a0ea6..baaa45c9b21 100644
Binary files a/public/images/emoji/facebook_messenger/abc.png and b/public/images/emoji/facebook_messenger/abc.png differ
diff --git a/public/images/emoji/facebook_messenger/abcd.png b/public/images/emoji/facebook_messenger/abcd.png
index d1ce86be981..09f754c8b6c 100644
Binary files a/public/images/emoji/facebook_messenger/abcd.png and b/public/images/emoji/facebook_messenger/abcd.png differ
diff --git a/public/images/emoji/facebook_messenger/accept.png b/public/images/emoji/facebook_messenger/accept.png
index 178a26fea0e..958f0f77880 100644
Binary files a/public/images/emoji/facebook_messenger/accept.png and b/public/images/emoji/facebook_messenger/accept.png differ
diff --git a/public/images/emoji/facebook_messenger/admission_tickets.png b/public/images/emoji/facebook_messenger/admission_tickets.png
index 295e9bbdc6d..e863f088be8 100644
Binary files a/public/images/emoji/facebook_messenger/admission_tickets.png and b/public/images/emoji/facebook_messenger/admission_tickets.png differ
diff --git a/public/images/emoji/facebook_messenger/adult.png b/public/images/emoji/facebook_messenger/adult.png
index 53a5eb2ccb9..d70004b157d 100644
Binary files a/public/images/emoji/facebook_messenger/adult.png and b/public/images/emoji/facebook_messenger/adult.png differ
diff --git a/public/images/emoji/facebook_messenger/adult/2.png b/public/images/emoji/facebook_messenger/adult/2.png
index 8f30fc9e389..c63a8b3197b 100644
Binary files a/public/images/emoji/facebook_messenger/adult/2.png and b/public/images/emoji/facebook_messenger/adult/2.png differ
diff --git a/public/images/emoji/facebook_messenger/adult/3.png b/public/images/emoji/facebook_messenger/adult/3.png
index 36a4e57d1f8..dd38f3bd9ff 100644
Binary files a/public/images/emoji/facebook_messenger/adult/3.png and b/public/images/emoji/facebook_messenger/adult/3.png differ
diff --git a/public/images/emoji/facebook_messenger/adult/4.png b/public/images/emoji/facebook_messenger/adult/4.png
index 77c57605e93..94747d11cf7 100644
Binary files a/public/images/emoji/facebook_messenger/adult/4.png and b/public/images/emoji/facebook_messenger/adult/4.png differ
diff --git a/public/images/emoji/facebook_messenger/adult/5.png b/public/images/emoji/facebook_messenger/adult/5.png
index 58bcd6a2fcf..73a7293ce57 100644
Binary files a/public/images/emoji/facebook_messenger/adult/5.png and b/public/images/emoji/facebook_messenger/adult/5.png differ
diff --git a/public/images/emoji/facebook_messenger/adult/6.png b/public/images/emoji/facebook_messenger/adult/6.png
index 3bc6b5a57a3..15932aaea86 100644
Binary files a/public/images/emoji/facebook_messenger/adult/6.png and b/public/images/emoji/facebook_messenger/adult/6.png differ
diff --git a/public/images/emoji/facebook_messenger/aerial_tramway.png b/public/images/emoji/facebook_messenger/aerial_tramway.png
index 417aad58449..278811eaf6e 100644
Binary files a/public/images/emoji/facebook_messenger/aerial_tramway.png and b/public/images/emoji/facebook_messenger/aerial_tramway.png differ
diff --git a/public/images/emoji/facebook_messenger/afghanistan.png b/public/images/emoji/facebook_messenger/afghanistan.png
index 50c4c6b272e..e4bd70e0cc8 100644
Binary files a/public/images/emoji/facebook_messenger/afghanistan.png and b/public/images/emoji/facebook_messenger/afghanistan.png differ
diff --git a/public/images/emoji/facebook_messenger/airplane.png b/public/images/emoji/facebook_messenger/airplane.png
index 4cd01455cde..1591f52a462 100644
Binary files a/public/images/emoji/facebook_messenger/airplane.png and b/public/images/emoji/facebook_messenger/airplane.png differ
diff --git a/public/images/emoji/facebook_messenger/airplane_arriving.png b/public/images/emoji/facebook_messenger/airplane_arriving.png
index 0585a1c36c2..4e228666469 100644
Binary files a/public/images/emoji/facebook_messenger/airplane_arriving.png and b/public/images/emoji/facebook_messenger/airplane_arriving.png differ
diff --git a/public/images/emoji/facebook_messenger/airplane_departure.png b/public/images/emoji/facebook_messenger/airplane_departure.png
index dc86670a865..bfa84966f77 100644
Binary files a/public/images/emoji/facebook_messenger/airplane_departure.png and b/public/images/emoji/facebook_messenger/airplane_departure.png differ
diff --git a/public/images/emoji/facebook_messenger/airplane_small.png b/public/images/emoji/facebook_messenger/airplane_small.png
index 47399184f72..110df284553 100644
Binary files a/public/images/emoji/facebook_messenger/airplane_small.png and b/public/images/emoji/facebook_messenger/airplane_small.png differ
diff --git a/public/images/emoji/facebook_messenger/aland_islands.png b/public/images/emoji/facebook_messenger/aland_islands.png
index 2ce958b9202..27ccf56b7ba 100644
Binary files a/public/images/emoji/facebook_messenger/aland_islands.png and b/public/images/emoji/facebook_messenger/aland_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/alarm_clock.png b/public/images/emoji/facebook_messenger/alarm_clock.png
index 8b2669f0cee..bf68033cbca 100644
Binary files a/public/images/emoji/facebook_messenger/alarm_clock.png and b/public/images/emoji/facebook_messenger/alarm_clock.png differ
diff --git a/public/images/emoji/facebook_messenger/albania.png b/public/images/emoji/facebook_messenger/albania.png
index 8d428869d47..86e6ef78a7d 100644
Binary files a/public/images/emoji/facebook_messenger/albania.png and b/public/images/emoji/facebook_messenger/albania.png differ
diff --git a/public/images/emoji/facebook_messenger/alembic.png b/public/images/emoji/facebook_messenger/alembic.png
index cc2853f6d92..06f6bcfea7a 100644
Binary files a/public/images/emoji/facebook_messenger/alembic.png and b/public/images/emoji/facebook_messenger/alembic.png differ
diff --git a/public/images/emoji/facebook_messenger/algeria.png b/public/images/emoji/facebook_messenger/algeria.png
index cd3dc01ab28..e00db341e12 100644
Binary files a/public/images/emoji/facebook_messenger/algeria.png and b/public/images/emoji/facebook_messenger/algeria.png differ
diff --git a/public/images/emoji/facebook_messenger/alien.png b/public/images/emoji/facebook_messenger/alien.png
index 00c53ca2bd1..4f74102854e 100644
Binary files a/public/images/emoji/facebook_messenger/alien.png and b/public/images/emoji/facebook_messenger/alien.png differ
diff --git a/public/images/emoji/facebook_messenger/ambulance.png b/public/images/emoji/facebook_messenger/ambulance.png
index 2700dcd39ce..38215b61f89 100644
Binary files a/public/images/emoji/facebook_messenger/ambulance.png and b/public/images/emoji/facebook_messenger/ambulance.png differ
diff --git a/public/images/emoji/facebook_messenger/american_samoa.png b/public/images/emoji/facebook_messenger/american_samoa.png
index f4f58e2e257..61d8eab2fe0 100644
Binary files a/public/images/emoji/facebook_messenger/american_samoa.png and b/public/images/emoji/facebook_messenger/american_samoa.png differ
diff --git a/public/images/emoji/facebook_messenger/amphora.png b/public/images/emoji/facebook_messenger/amphora.png
index 550f047067a..d6548cfcc4b 100644
Binary files a/public/images/emoji/facebook_messenger/amphora.png and b/public/images/emoji/facebook_messenger/amphora.png differ
diff --git a/public/images/emoji/facebook_messenger/anchor.png b/public/images/emoji/facebook_messenger/anchor.png
index ff5a1a69fb5..b3114bceefb 100644
Binary files a/public/images/emoji/facebook_messenger/anchor.png and b/public/images/emoji/facebook_messenger/anchor.png differ
diff --git a/public/images/emoji/facebook_messenger/andorra.png b/public/images/emoji/facebook_messenger/andorra.png
index 0fd73782c23..fdf8c39b427 100644
Binary files a/public/images/emoji/facebook_messenger/andorra.png and b/public/images/emoji/facebook_messenger/andorra.png differ
diff --git a/public/images/emoji/facebook_messenger/angel.png b/public/images/emoji/facebook_messenger/angel.png
index 8e51518eef7..d7b42390ae4 100644
Binary files a/public/images/emoji/facebook_messenger/angel.png and b/public/images/emoji/facebook_messenger/angel.png differ
diff --git a/public/images/emoji/facebook_messenger/angel/2.png b/public/images/emoji/facebook_messenger/angel/2.png
index e0ca086f4cc..9f6366e1f17 100644
Binary files a/public/images/emoji/facebook_messenger/angel/2.png and b/public/images/emoji/facebook_messenger/angel/2.png differ
diff --git a/public/images/emoji/facebook_messenger/angel/3.png b/public/images/emoji/facebook_messenger/angel/3.png
index 6157d5e417d..152b7ed700d 100644
Binary files a/public/images/emoji/facebook_messenger/angel/3.png and b/public/images/emoji/facebook_messenger/angel/3.png differ
diff --git a/public/images/emoji/facebook_messenger/angel/4.png b/public/images/emoji/facebook_messenger/angel/4.png
index 2e46b4983e7..721ed57f211 100644
Binary files a/public/images/emoji/facebook_messenger/angel/4.png and b/public/images/emoji/facebook_messenger/angel/4.png differ
diff --git a/public/images/emoji/facebook_messenger/angel/5.png b/public/images/emoji/facebook_messenger/angel/5.png
index 08691516484..88f9a9804e6 100644
Binary files a/public/images/emoji/facebook_messenger/angel/5.png and b/public/images/emoji/facebook_messenger/angel/5.png differ
diff --git a/public/images/emoji/facebook_messenger/angel/6.png b/public/images/emoji/facebook_messenger/angel/6.png
index 82c7fcb3cf9..5edcf9d8f6b 100644
Binary files a/public/images/emoji/facebook_messenger/angel/6.png and b/public/images/emoji/facebook_messenger/angel/6.png differ
diff --git a/public/images/emoji/facebook_messenger/anger.png b/public/images/emoji/facebook_messenger/anger.png
index 689a10c00fa..4eb6dccaa2c 100644
Binary files a/public/images/emoji/facebook_messenger/anger.png and b/public/images/emoji/facebook_messenger/anger.png differ
diff --git a/public/images/emoji/facebook_messenger/anger_right.png b/public/images/emoji/facebook_messenger/anger_right.png
index 3d3ee7dcfad..c9f3e48c81d 100644
Binary files a/public/images/emoji/facebook_messenger/anger_right.png and b/public/images/emoji/facebook_messenger/anger_right.png differ
diff --git a/public/images/emoji/facebook_messenger/angola.png b/public/images/emoji/facebook_messenger/angola.png
index 5aca11a07e4..a1a98b7e2a9 100644
Binary files a/public/images/emoji/facebook_messenger/angola.png and b/public/images/emoji/facebook_messenger/angola.png differ
diff --git a/public/images/emoji/facebook_messenger/angry.png b/public/images/emoji/facebook_messenger/angry.png
index cedaec8a4d2..e6b2466095b 100644
Binary files a/public/images/emoji/facebook_messenger/angry.png and b/public/images/emoji/facebook_messenger/angry.png differ
diff --git a/public/images/emoji/facebook_messenger/anguilla.png b/public/images/emoji/facebook_messenger/anguilla.png
index d1006c6c19b..66f543a1eca 100644
Binary files a/public/images/emoji/facebook_messenger/anguilla.png and b/public/images/emoji/facebook_messenger/anguilla.png differ
diff --git a/public/images/emoji/facebook_messenger/anguished.png b/public/images/emoji/facebook_messenger/anguished.png
index 52899f30da4..41ea3c16c8f 100644
Binary files a/public/images/emoji/facebook_messenger/anguished.png and b/public/images/emoji/facebook_messenger/anguished.png differ
diff --git a/public/images/emoji/facebook_messenger/ant.png b/public/images/emoji/facebook_messenger/ant.png
index 2bab6a6f12a..c4388256a3c 100644
Binary files a/public/images/emoji/facebook_messenger/ant.png and b/public/images/emoji/facebook_messenger/ant.png differ
diff --git a/public/images/emoji/facebook_messenger/antarctica.png b/public/images/emoji/facebook_messenger/antarctica.png
index 5a6759de63e..387d47f5bbf 100644
Binary files a/public/images/emoji/facebook_messenger/antarctica.png and b/public/images/emoji/facebook_messenger/antarctica.png differ
diff --git a/public/images/emoji/facebook_messenger/antigua_barbuda.png b/public/images/emoji/facebook_messenger/antigua_barbuda.png
index e3ff113cbae..0655dfa9d8a 100644
Binary files a/public/images/emoji/facebook_messenger/antigua_barbuda.png and b/public/images/emoji/facebook_messenger/antigua_barbuda.png differ
diff --git a/public/images/emoji/facebook_messenger/apple.png b/public/images/emoji/facebook_messenger/apple.png
index 97c4bbdd6df..46ec06ea24e 100644
Binary files a/public/images/emoji/facebook_messenger/apple.png and b/public/images/emoji/facebook_messenger/apple.png differ
diff --git a/public/images/emoji/facebook_messenger/aquarius.png b/public/images/emoji/facebook_messenger/aquarius.png
index bee7380c6cc..f81db33ca6a 100644
Binary files a/public/images/emoji/facebook_messenger/aquarius.png and b/public/images/emoji/facebook_messenger/aquarius.png differ
diff --git a/public/images/emoji/facebook_messenger/archery.png b/public/images/emoji/facebook_messenger/archery.png
index f50a1389fef..eba0a0deebe 100644
Binary files a/public/images/emoji/facebook_messenger/archery.png and b/public/images/emoji/facebook_messenger/archery.png differ
diff --git a/public/images/emoji/facebook_messenger/argentina.png b/public/images/emoji/facebook_messenger/argentina.png
index 1e5e8150987..b8581e08d7a 100644
Binary files a/public/images/emoji/facebook_messenger/argentina.png and b/public/images/emoji/facebook_messenger/argentina.png differ
diff --git a/public/images/emoji/facebook_messenger/aries.png b/public/images/emoji/facebook_messenger/aries.png
index 270321de177..0223295e508 100644
Binary files a/public/images/emoji/facebook_messenger/aries.png and b/public/images/emoji/facebook_messenger/aries.png differ
diff --git a/public/images/emoji/facebook_messenger/armenia.png b/public/images/emoji/facebook_messenger/armenia.png
index 846307fcf33..546e4c9fae2 100644
Binary files a/public/images/emoji/facebook_messenger/armenia.png and b/public/images/emoji/facebook_messenger/armenia.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_backward.png b/public/images/emoji/facebook_messenger/arrow_backward.png
index 31bc57f66ea..130d8182266 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_backward.png and b/public/images/emoji/facebook_messenger/arrow_backward.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_double_down.png b/public/images/emoji/facebook_messenger/arrow_double_down.png
index 0d55a3b8a53..3ba9966d5c7 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_double_down.png and b/public/images/emoji/facebook_messenger/arrow_double_down.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_double_up.png b/public/images/emoji/facebook_messenger/arrow_double_up.png
index 3e26428da13..fd19d0666af 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_double_up.png and b/public/images/emoji/facebook_messenger/arrow_double_up.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_down.png b/public/images/emoji/facebook_messenger/arrow_down.png
index cea37e3f45c..12849775a26 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_down.png and b/public/images/emoji/facebook_messenger/arrow_down.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_down_small.png b/public/images/emoji/facebook_messenger/arrow_down_small.png
index 26f28620d3b..1902d03537c 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_down_small.png and b/public/images/emoji/facebook_messenger/arrow_down_small.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_forward.png b/public/images/emoji/facebook_messenger/arrow_forward.png
index b7f0770bfac..e6061821e4c 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_forward.png and b/public/images/emoji/facebook_messenger/arrow_forward.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_heading_down.png b/public/images/emoji/facebook_messenger/arrow_heading_down.png
index d0031653e00..6a6228d3f08 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_heading_down.png and b/public/images/emoji/facebook_messenger/arrow_heading_down.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_heading_up.png b/public/images/emoji/facebook_messenger/arrow_heading_up.png
index d95ee952c3f..3123994b1df 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_heading_up.png and b/public/images/emoji/facebook_messenger/arrow_heading_up.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_left.png b/public/images/emoji/facebook_messenger/arrow_left.png
index 0bd799e8661..ae620c31d6f 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_left.png and b/public/images/emoji/facebook_messenger/arrow_left.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_lower_left.png b/public/images/emoji/facebook_messenger/arrow_lower_left.png
index 230b491ccb8..4288a049eff 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_lower_left.png and b/public/images/emoji/facebook_messenger/arrow_lower_left.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_lower_right.png b/public/images/emoji/facebook_messenger/arrow_lower_right.png
index 2cb9ab11bbd..385137287d2 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_lower_right.png and b/public/images/emoji/facebook_messenger/arrow_lower_right.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_right.png b/public/images/emoji/facebook_messenger/arrow_right.png
index 08a9c6e85b6..eecdb6a67a7 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_right.png and b/public/images/emoji/facebook_messenger/arrow_right.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_right_hook.png b/public/images/emoji/facebook_messenger/arrow_right_hook.png
index 10e84d8f5db..400f8be14c6 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_right_hook.png and b/public/images/emoji/facebook_messenger/arrow_right_hook.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_up.png b/public/images/emoji/facebook_messenger/arrow_up.png
index d87df932aa0..c45961fece1 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_up.png and b/public/images/emoji/facebook_messenger/arrow_up.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_up_down.png b/public/images/emoji/facebook_messenger/arrow_up_down.png
index 0262977544e..d41e69dd891 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_up_down.png and b/public/images/emoji/facebook_messenger/arrow_up_down.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_up_small.png b/public/images/emoji/facebook_messenger/arrow_up_small.png
index f2eff4c9047..7022016ea7f 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_up_small.png and b/public/images/emoji/facebook_messenger/arrow_up_small.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_upper_left.png b/public/images/emoji/facebook_messenger/arrow_upper_left.png
index 8ac358c63fd..73041d2f30d 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_upper_left.png and b/public/images/emoji/facebook_messenger/arrow_upper_left.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_upper_right.png b/public/images/emoji/facebook_messenger/arrow_upper_right.png
index 29700d0bf7c..96382a22c79 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_upper_right.png and b/public/images/emoji/facebook_messenger/arrow_upper_right.png differ
diff --git a/public/images/emoji/facebook_messenger/arrows_clockwise.png b/public/images/emoji/facebook_messenger/arrows_clockwise.png
index 04755b39234..45ae5473a52 100644
Binary files a/public/images/emoji/facebook_messenger/arrows_clockwise.png and b/public/images/emoji/facebook_messenger/arrows_clockwise.png differ
diff --git a/public/images/emoji/facebook_messenger/arrows_counterclockwise.png b/public/images/emoji/facebook_messenger/arrows_counterclockwise.png
index 8d164545167..dc32223232a 100644
Binary files a/public/images/emoji/facebook_messenger/arrows_counterclockwise.png and b/public/images/emoji/facebook_messenger/arrows_counterclockwise.png differ
diff --git a/public/images/emoji/facebook_messenger/art.png b/public/images/emoji/facebook_messenger/art.png
index 416c995030d..7f2a8693483 100644
Binary files a/public/images/emoji/facebook_messenger/art.png and b/public/images/emoji/facebook_messenger/art.png differ
diff --git a/public/images/emoji/facebook_messenger/articulated_lorry.png b/public/images/emoji/facebook_messenger/articulated_lorry.png
index d965f6a4903..6a01eb5f962 100644
Binary files a/public/images/emoji/facebook_messenger/articulated_lorry.png and b/public/images/emoji/facebook_messenger/articulated_lorry.png differ
diff --git a/public/images/emoji/facebook_messenger/artificial_satellite.png b/public/images/emoji/facebook_messenger/artificial_satellite.png
index 81715516af6..d50cf919548 100644
Binary files a/public/images/emoji/facebook_messenger/artificial_satellite.png and b/public/images/emoji/facebook_messenger/artificial_satellite.png differ
diff --git a/public/images/emoji/facebook_messenger/aruba.png b/public/images/emoji/facebook_messenger/aruba.png
index 459facc13b1..bbd1acac5d9 100644
Binary files a/public/images/emoji/facebook_messenger/aruba.png and b/public/images/emoji/facebook_messenger/aruba.png differ
diff --git a/public/images/emoji/facebook_messenger/ascension_island.png b/public/images/emoji/facebook_messenger/ascension_island.png
index 2e3a1fdd737..1f04f48a0c5 100644
Binary files a/public/images/emoji/facebook_messenger/ascension_island.png and b/public/images/emoji/facebook_messenger/ascension_island.png differ
diff --git a/public/images/emoji/facebook_messenger/asterisk.png b/public/images/emoji/facebook_messenger/asterisk.png
index 2bfefce2bec..a009bc2cdad 100644
Binary files a/public/images/emoji/facebook_messenger/asterisk.png and b/public/images/emoji/facebook_messenger/asterisk.png differ
diff --git a/public/images/emoji/facebook_messenger/astonished.png b/public/images/emoji/facebook_messenger/astonished.png
index 915e4818899..0cb60d865e9 100644
Binary files a/public/images/emoji/facebook_messenger/astonished.png and b/public/images/emoji/facebook_messenger/astonished.png differ
diff --git a/public/images/emoji/facebook_messenger/athletic_shoe.png b/public/images/emoji/facebook_messenger/athletic_shoe.png
index 5c5909a17d5..dab191424b9 100644
Binary files a/public/images/emoji/facebook_messenger/athletic_shoe.png and b/public/images/emoji/facebook_messenger/athletic_shoe.png differ
diff --git a/public/images/emoji/facebook_messenger/atm.png b/public/images/emoji/facebook_messenger/atm.png
index 4cfeb25e641..fb14b328e7c 100644
Binary files a/public/images/emoji/facebook_messenger/atm.png and b/public/images/emoji/facebook_messenger/atm.png differ
diff --git a/public/images/emoji/facebook_messenger/atom.png b/public/images/emoji/facebook_messenger/atom.png
index 3d27cd89537..de8f524127c 100644
Binary files a/public/images/emoji/facebook_messenger/atom.png and b/public/images/emoji/facebook_messenger/atom.png differ
diff --git a/public/images/emoji/facebook_messenger/atom_symbol.png b/public/images/emoji/facebook_messenger/atom_symbol.png
index 3d27cd89537..de8f524127c 100644
Binary files a/public/images/emoji/facebook_messenger/atom_symbol.png and b/public/images/emoji/facebook_messenger/atom_symbol.png differ
diff --git a/public/images/emoji/facebook_messenger/australia.png b/public/images/emoji/facebook_messenger/australia.png
index edd74bfd734..fa2f3852cba 100644
Binary files a/public/images/emoji/facebook_messenger/australia.png and b/public/images/emoji/facebook_messenger/australia.png differ
diff --git a/public/images/emoji/facebook_messenger/austria.png b/public/images/emoji/facebook_messenger/austria.png
index c0e176217bd..54a96ff5f97 100644
Binary files a/public/images/emoji/facebook_messenger/austria.png and b/public/images/emoji/facebook_messenger/austria.png differ
diff --git a/public/images/emoji/facebook_messenger/automobile.png b/public/images/emoji/facebook_messenger/automobile.png
index 024cdb23b51..ba661ecefdf 100644
Binary files a/public/images/emoji/facebook_messenger/automobile.png and b/public/images/emoji/facebook_messenger/automobile.png differ
diff --git a/public/images/emoji/facebook_messenger/avocado.png b/public/images/emoji/facebook_messenger/avocado.png
index faa8c8fbe79..1c54fda2c7f 100644
Binary files a/public/images/emoji/facebook_messenger/avocado.png and b/public/images/emoji/facebook_messenger/avocado.png differ
diff --git a/public/images/emoji/facebook_messenger/azerbaijan.png b/public/images/emoji/facebook_messenger/azerbaijan.png
index 59b4ecf2a0a..a5689d93da0 100644
Binary files a/public/images/emoji/facebook_messenger/azerbaijan.png and b/public/images/emoji/facebook_messenger/azerbaijan.png differ
diff --git a/public/images/emoji/facebook_messenger/b.png b/public/images/emoji/facebook_messenger/b.png
index 4e3c3241ee3..9679d4109bd 100644
Binary files a/public/images/emoji/facebook_messenger/b.png and b/public/images/emoji/facebook_messenger/b.png differ
diff --git a/public/images/emoji/facebook_messenger/baby.png b/public/images/emoji/facebook_messenger/baby.png
index 3250db1a61a..192b1e3aa43 100644
Binary files a/public/images/emoji/facebook_messenger/baby.png and b/public/images/emoji/facebook_messenger/baby.png differ
diff --git a/public/images/emoji/facebook_messenger/baby/2.png b/public/images/emoji/facebook_messenger/baby/2.png
index ba7d05faa16..27e7de7446b 100644
Binary files a/public/images/emoji/facebook_messenger/baby/2.png and b/public/images/emoji/facebook_messenger/baby/2.png differ
diff --git a/public/images/emoji/facebook_messenger/baby/3.png b/public/images/emoji/facebook_messenger/baby/3.png
index 02393b8bf14..617a54702df 100644
Binary files a/public/images/emoji/facebook_messenger/baby/3.png and b/public/images/emoji/facebook_messenger/baby/3.png differ
diff --git a/public/images/emoji/facebook_messenger/baby/4.png b/public/images/emoji/facebook_messenger/baby/4.png
index 43b9d1234c0..c81aacca05c 100644
Binary files a/public/images/emoji/facebook_messenger/baby/4.png and b/public/images/emoji/facebook_messenger/baby/4.png differ
diff --git a/public/images/emoji/facebook_messenger/baby/5.png b/public/images/emoji/facebook_messenger/baby/5.png
index 8d394e75d94..940b70c960f 100644
Binary files a/public/images/emoji/facebook_messenger/baby/5.png and b/public/images/emoji/facebook_messenger/baby/5.png differ
diff --git a/public/images/emoji/facebook_messenger/baby/6.png b/public/images/emoji/facebook_messenger/baby/6.png
index db838c47904..95153c3a122 100644
Binary files a/public/images/emoji/facebook_messenger/baby/6.png and b/public/images/emoji/facebook_messenger/baby/6.png differ
diff --git a/public/images/emoji/facebook_messenger/baby_bottle.png b/public/images/emoji/facebook_messenger/baby_bottle.png
index 8a7f5d04096..7ffbf050da2 100644
Binary files a/public/images/emoji/facebook_messenger/baby_bottle.png and b/public/images/emoji/facebook_messenger/baby_bottle.png differ
diff --git a/public/images/emoji/facebook_messenger/baby_chick.png b/public/images/emoji/facebook_messenger/baby_chick.png
index c01948acd5e..35031b2b1d9 100644
Binary files a/public/images/emoji/facebook_messenger/baby_chick.png and b/public/images/emoji/facebook_messenger/baby_chick.png differ
diff --git a/public/images/emoji/facebook_messenger/baby_symbol.png b/public/images/emoji/facebook_messenger/baby_symbol.png
index d90dc597c14..29d467e1c3e 100644
Binary files a/public/images/emoji/facebook_messenger/baby_symbol.png and b/public/images/emoji/facebook_messenger/baby_symbol.png differ
diff --git a/public/images/emoji/facebook_messenger/back.png b/public/images/emoji/facebook_messenger/back.png
index b38f5260627..74adb96ec80 100644
Binary files a/public/images/emoji/facebook_messenger/back.png and b/public/images/emoji/facebook_messenger/back.png differ
diff --git a/public/images/emoji/facebook_messenger/bacon.png b/public/images/emoji/facebook_messenger/bacon.png
index b1cfa9dc3b5..a1641e680ec 100644
Binary files a/public/images/emoji/facebook_messenger/bacon.png and b/public/images/emoji/facebook_messenger/bacon.png differ
diff --git a/public/images/emoji/facebook_messenger/badminton.png b/public/images/emoji/facebook_messenger/badminton.png
index 3b5d0df295d..6c76fb84fb0 100644
Binary files a/public/images/emoji/facebook_messenger/badminton.png and b/public/images/emoji/facebook_messenger/badminton.png differ
diff --git a/public/images/emoji/facebook_messenger/baggage_claim.png b/public/images/emoji/facebook_messenger/baggage_claim.png
index 62234d5dba4..1e2b83d35fc 100644
Binary files a/public/images/emoji/facebook_messenger/baggage_claim.png and b/public/images/emoji/facebook_messenger/baggage_claim.png differ
diff --git a/public/images/emoji/facebook_messenger/baguette_bread.png b/public/images/emoji/facebook_messenger/baguette_bread.png
index 3be5a539033..91558c2a202 100644
Binary files a/public/images/emoji/facebook_messenger/baguette_bread.png and b/public/images/emoji/facebook_messenger/baguette_bread.png differ
diff --git a/public/images/emoji/facebook_messenger/bahamas.png b/public/images/emoji/facebook_messenger/bahamas.png
index ed95128e196..ad1fccb6f09 100644
Binary files a/public/images/emoji/facebook_messenger/bahamas.png and b/public/images/emoji/facebook_messenger/bahamas.png differ
diff --git a/public/images/emoji/facebook_messenger/bahrain.png b/public/images/emoji/facebook_messenger/bahrain.png
index 815a93ef0bf..34935840477 100644
Binary files a/public/images/emoji/facebook_messenger/bahrain.png and b/public/images/emoji/facebook_messenger/bahrain.png differ
diff --git a/public/images/emoji/facebook_messenger/balance_scale.png b/public/images/emoji/facebook_messenger/balance_scale.png
index 75713abc23d..a9e4f53e97a 100644
Binary files a/public/images/emoji/facebook_messenger/balance_scale.png and b/public/images/emoji/facebook_messenger/balance_scale.png differ
diff --git a/public/images/emoji/facebook_messenger/balloon.png b/public/images/emoji/facebook_messenger/balloon.png
index 4c1986ac6fb..a2257da1cd4 100644
Binary files a/public/images/emoji/facebook_messenger/balloon.png and b/public/images/emoji/facebook_messenger/balloon.png differ
diff --git a/public/images/emoji/facebook_messenger/ballot_box.png b/public/images/emoji/facebook_messenger/ballot_box.png
index 59bfa2ae2fc..5536b98437d 100644
Binary files a/public/images/emoji/facebook_messenger/ballot_box.png and b/public/images/emoji/facebook_messenger/ballot_box.png differ
diff --git a/public/images/emoji/facebook_messenger/ballot_box_with_ballot.png b/public/images/emoji/facebook_messenger/ballot_box_with_ballot.png
index 59bfa2ae2fc..5536b98437d 100644
Binary files a/public/images/emoji/facebook_messenger/ballot_box_with_ballot.png and b/public/images/emoji/facebook_messenger/ballot_box_with_ballot.png differ
diff --git a/public/images/emoji/facebook_messenger/ballot_box_with_check.png b/public/images/emoji/facebook_messenger/ballot_box_with_check.png
index 80b2e3fda4f..ff72c536028 100644
Binary files a/public/images/emoji/facebook_messenger/ballot_box_with_check.png and b/public/images/emoji/facebook_messenger/ballot_box_with_check.png differ
diff --git a/public/images/emoji/facebook_messenger/bamboo.png b/public/images/emoji/facebook_messenger/bamboo.png
index f364eba710c..2cbf57618ca 100644
Binary files a/public/images/emoji/facebook_messenger/bamboo.png and b/public/images/emoji/facebook_messenger/bamboo.png differ
diff --git a/public/images/emoji/facebook_messenger/banana.png b/public/images/emoji/facebook_messenger/banana.png
index cf8781b5eff..302581faf9d 100644
Binary files a/public/images/emoji/facebook_messenger/banana.png and b/public/images/emoji/facebook_messenger/banana.png differ
diff --git a/public/images/emoji/facebook_messenger/bangbang.png b/public/images/emoji/facebook_messenger/bangbang.png
index f14ac06077a..8e9678240d6 100644
Binary files a/public/images/emoji/facebook_messenger/bangbang.png and b/public/images/emoji/facebook_messenger/bangbang.png differ
diff --git a/public/images/emoji/facebook_messenger/bangladesh.png b/public/images/emoji/facebook_messenger/bangladesh.png
index caab400018c..30cef30b4ed 100644
Binary files a/public/images/emoji/facebook_messenger/bangladesh.png and b/public/images/emoji/facebook_messenger/bangladesh.png differ
diff --git a/public/images/emoji/facebook_messenger/bank.png b/public/images/emoji/facebook_messenger/bank.png
index bb8a2828011..b38b5bb1e5a 100644
Binary files a/public/images/emoji/facebook_messenger/bank.png and b/public/images/emoji/facebook_messenger/bank.png differ
diff --git a/public/images/emoji/facebook_messenger/bar_chart.png b/public/images/emoji/facebook_messenger/bar_chart.png
index 2cd9961c950..d9b4b6e1060 100644
Binary files a/public/images/emoji/facebook_messenger/bar_chart.png and b/public/images/emoji/facebook_messenger/bar_chart.png differ
diff --git a/public/images/emoji/facebook_messenger/barbados.png b/public/images/emoji/facebook_messenger/barbados.png
index 830578344d9..4a2d7d30505 100644
Binary files a/public/images/emoji/facebook_messenger/barbados.png and b/public/images/emoji/facebook_messenger/barbados.png differ
diff --git a/public/images/emoji/facebook_messenger/barber.png b/public/images/emoji/facebook_messenger/barber.png
index 2cdda450a89..2b4c6ab3052 100644
Binary files a/public/images/emoji/facebook_messenger/barber.png and b/public/images/emoji/facebook_messenger/barber.png differ
diff --git a/public/images/emoji/facebook_messenger/baseball.png b/public/images/emoji/facebook_messenger/baseball.png
index 20a21d567ee..f39fbbf0990 100644
Binary files a/public/images/emoji/facebook_messenger/baseball.png and b/public/images/emoji/facebook_messenger/baseball.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball.png b/public/images/emoji/facebook_messenger/basketball.png
index fbff78ffbbe..702a48a1a5f 100644
Binary files a/public/images/emoji/facebook_messenger/basketball.png and b/public/images/emoji/facebook_messenger/basketball.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_man.png b/public/images/emoji/facebook_messenger/basketball_man.png
index ac6a6c2c9f1..fc307b60c9c 100644
Binary files a/public/images/emoji/facebook_messenger/basketball_man.png and b/public/images/emoji/facebook_messenger/basketball_man.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_man/2.png b/public/images/emoji/facebook_messenger/basketball_man/2.png
index 4dad1da7dbe..cdd5c25469c 100644
Binary files a/public/images/emoji/facebook_messenger/basketball_man/2.png and b/public/images/emoji/facebook_messenger/basketball_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_man/3.png b/public/images/emoji/facebook_messenger/basketball_man/3.png
index 739f1de58c0..e4630e522c6 100644
Binary files a/public/images/emoji/facebook_messenger/basketball_man/3.png and b/public/images/emoji/facebook_messenger/basketball_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_man/4.png b/public/images/emoji/facebook_messenger/basketball_man/4.png
index 62a23de4665..8fbdb822fc6 100644
Binary files a/public/images/emoji/facebook_messenger/basketball_man/4.png and b/public/images/emoji/facebook_messenger/basketball_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_man/5.png b/public/images/emoji/facebook_messenger/basketball_man/5.png
index 2cd9628b760..047897cbf51 100644
Binary files a/public/images/emoji/facebook_messenger/basketball_man/5.png and b/public/images/emoji/facebook_messenger/basketball_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_man/6.png b/public/images/emoji/facebook_messenger/basketball_man/6.png
index 85bfaeb5785..4592818525d 100644
Binary files a/public/images/emoji/facebook_messenger/basketball_man/6.png and b/public/images/emoji/facebook_messenger/basketball_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_player.png b/public/images/emoji/facebook_messenger/basketball_player.png
index ac6a6c2c9f1..fc307b60c9c 100644
Binary files a/public/images/emoji/facebook_messenger/basketball_player.png and b/public/images/emoji/facebook_messenger/basketball_player.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_player/2.png b/public/images/emoji/facebook_messenger/basketball_player/2.png
index 4dad1da7dbe..cdd5c25469c 100644
Binary files a/public/images/emoji/facebook_messenger/basketball_player/2.png and b/public/images/emoji/facebook_messenger/basketball_player/2.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_player/3.png b/public/images/emoji/facebook_messenger/basketball_player/3.png
index 739f1de58c0..e4630e522c6 100644
Binary files a/public/images/emoji/facebook_messenger/basketball_player/3.png and b/public/images/emoji/facebook_messenger/basketball_player/3.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_player/4.png b/public/images/emoji/facebook_messenger/basketball_player/4.png
index 62a23de4665..8fbdb822fc6 100644
Binary files a/public/images/emoji/facebook_messenger/basketball_player/4.png and b/public/images/emoji/facebook_messenger/basketball_player/4.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_player/5.png b/public/images/emoji/facebook_messenger/basketball_player/5.png
index 2cd9628b760..047897cbf51 100644
Binary files a/public/images/emoji/facebook_messenger/basketball_player/5.png and b/public/images/emoji/facebook_messenger/basketball_player/5.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_player/6.png b/public/images/emoji/facebook_messenger/basketball_player/6.png
index 85bfaeb5785..4592818525d 100644
Binary files a/public/images/emoji/facebook_messenger/basketball_player/6.png and b/public/images/emoji/facebook_messenger/basketball_player/6.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_woman.png b/public/images/emoji/facebook_messenger/basketball_woman.png
index 7df66bcfb7b..febb3c03b65 100644
Binary files a/public/images/emoji/facebook_messenger/basketball_woman.png and b/public/images/emoji/facebook_messenger/basketball_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/bat.png b/public/images/emoji/facebook_messenger/bat.png
index d997111fc5f..8e046d85092 100644
Binary files a/public/images/emoji/facebook_messenger/bat.png and b/public/images/emoji/facebook_messenger/bat.png differ
diff --git a/public/images/emoji/facebook_messenger/bath.png b/public/images/emoji/facebook_messenger/bath.png
index 2173defed8e..ed123b48c6b 100644
Binary files a/public/images/emoji/facebook_messenger/bath.png and b/public/images/emoji/facebook_messenger/bath.png differ
diff --git a/public/images/emoji/facebook_messenger/bath/2.png b/public/images/emoji/facebook_messenger/bath/2.png
index 9ca3e7b1cbc..8c46841369f 100644
Binary files a/public/images/emoji/facebook_messenger/bath/2.png and b/public/images/emoji/facebook_messenger/bath/2.png differ
diff --git a/public/images/emoji/facebook_messenger/bath/3.png b/public/images/emoji/facebook_messenger/bath/3.png
index 2ffaa936809..2e138cde56d 100644
Binary files a/public/images/emoji/facebook_messenger/bath/3.png and b/public/images/emoji/facebook_messenger/bath/3.png differ
diff --git a/public/images/emoji/facebook_messenger/bath/4.png b/public/images/emoji/facebook_messenger/bath/4.png
index 008ff97772e..dae85ebae19 100644
Binary files a/public/images/emoji/facebook_messenger/bath/4.png and b/public/images/emoji/facebook_messenger/bath/4.png differ
diff --git a/public/images/emoji/facebook_messenger/bath/5.png b/public/images/emoji/facebook_messenger/bath/5.png
index 09c0ac3fe92..5dad5eb07f7 100644
Binary files a/public/images/emoji/facebook_messenger/bath/5.png and b/public/images/emoji/facebook_messenger/bath/5.png differ
diff --git a/public/images/emoji/facebook_messenger/bath/6.png b/public/images/emoji/facebook_messenger/bath/6.png
index 857b92f2319..9f10640cf6e 100644
Binary files a/public/images/emoji/facebook_messenger/bath/6.png and b/public/images/emoji/facebook_messenger/bath/6.png differ
diff --git a/public/images/emoji/facebook_messenger/bathtub.png b/public/images/emoji/facebook_messenger/bathtub.png
index 6ac723e1c82..924ff3acd4f 100644
Binary files a/public/images/emoji/facebook_messenger/bathtub.png and b/public/images/emoji/facebook_messenger/bathtub.png differ
diff --git a/public/images/emoji/facebook_messenger/battery.png b/public/images/emoji/facebook_messenger/battery.png
index a63f16624f7..2b390fa736a 100644
Binary files a/public/images/emoji/facebook_messenger/battery.png and b/public/images/emoji/facebook_messenger/battery.png differ
diff --git a/public/images/emoji/facebook_messenger/beach.png b/public/images/emoji/facebook_messenger/beach.png
index 894e33bee13..953bbe38d60 100644
Binary files a/public/images/emoji/facebook_messenger/beach.png and b/public/images/emoji/facebook_messenger/beach.png differ
diff --git a/public/images/emoji/facebook_messenger/beach_umbrella.png b/public/images/emoji/facebook_messenger/beach_umbrella.png
index 894e33bee13..953bbe38d60 100644
Binary files a/public/images/emoji/facebook_messenger/beach_umbrella.png and b/public/images/emoji/facebook_messenger/beach_umbrella.png differ
diff --git a/public/images/emoji/facebook_messenger/beach_with_umbrella.png b/public/images/emoji/facebook_messenger/beach_with_umbrella.png
index 894e33bee13..953bbe38d60 100644
Binary files a/public/images/emoji/facebook_messenger/beach_with_umbrella.png and b/public/images/emoji/facebook_messenger/beach_with_umbrella.png differ
diff --git a/public/images/emoji/facebook_messenger/bear.png b/public/images/emoji/facebook_messenger/bear.png
index 8e052d9adbe..5622d9c5ca2 100644
Binary files a/public/images/emoji/facebook_messenger/bear.png and b/public/images/emoji/facebook_messenger/bear.png differ
diff --git a/public/images/emoji/facebook_messenger/bearded_person.png b/public/images/emoji/facebook_messenger/bearded_person.png
index ed22a6cb381..d43b7a11249 100644
Binary files a/public/images/emoji/facebook_messenger/bearded_person.png and b/public/images/emoji/facebook_messenger/bearded_person.png differ
diff --git a/public/images/emoji/facebook_messenger/bearded_person/2.png b/public/images/emoji/facebook_messenger/bearded_person/2.png
index 4a2fdeb3040..65a4e8b6cae 100644
Binary files a/public/images/emoji/facebook_messenger/bearded_person/2.png and b/public/images/emoji/facebook_messenger/bearded_person/2.png differ
diff --git a/public/images/emoji/facebook_messenger/bearded_person/3.png b/public/images/emoji/facebook_messenger/bearded_person/3.png
index b1f6e168d7c..71be9e86c61 100644
Binary files a/public/images/emoji/facebook_messenger/bearded_person/3.png and b/public/images/emoji/facebook_messenger/bearded_person/3.png differ
diff --git a/public/images/emoji/facebook_messenger/bearded_person/4.png b/public/images/emoji/facebook_messenger/bearded_person/4.png
index f75b75a74e9..76d3f66b6f5 100644
Binary files a/public/images/emoji/facebook_messenger/bearded_person/4.png and b/public/images/emoji/facebook_messenger/bearded_person/4.png differ
diff --git a/public/images/emoji/facebook_messenger/bearded_person/5.png b/public/images/emoji/facebook_messenger/bearded_person/5.png
index a9665b318a4..f927d59a801 100644
Binary files a/public/images/emoji/facebook_messenger/bearded_person/5.png and b/public/images/emoji/facebook_messenger/bearded_person/5.png differ
diff --git a/public/images/emoji/facebook_messenger/bearded_person/6.png b/public/images/emoji/facebook_messenger/bearded_person/6.png
index a42b3caf88c..225c35f2b0e 100644
Binary files a/public/images/emoji/facebook_messenger/bearded_person/6.png and b/public/images/emoji/facebook_messenger/bearded_person/6.png differ
diff --git a/public/images/emoji/facebook_messenger/bed.png b/public/images/emoji/facebook_messenger/bed.png
index 98d795e8476..fb92a4795b8 100644
Binary files a/public/images/emoji/facebook_messenger/bed.png and b/public/images/emoji/facebook_messenger/bed.png differ
diff --git a/public/images/emoji/facebook_messenger/bee.png b/public/images/emoji/facebook_messenger/bee.png
index b4b2bff015b..649181cf286 100644
Binary files a/public/images/emoji/facebook_messenger/bee.png and b/public/images/emoji/facebook_messenger/bee.png differ
diff --git a/public/images/emoji/facebook_messenger/beer.png b/public/images/emoji/facebook_messenger/beer.png
index 035842b0056..7a4c1270f22 100644
Binary files a/public/images/emoji/facebook_messenger/beer.png and b/public/images/emoji/facebook_messenger/beer.png differ
diff --git a/public/images/emoji/facebook_messenger/beers.png b/public/images/emoji/facebook_messenger/beers.png
index f69c94220ed..b2a335ec472 100644
Binary files a/public/images/emoji/facebook_messenger/beers.png and b/public/images/emoji/facebook_messenger/beers.png differ
diff --git a/public/images/emoji/facebook_messenger/beetle.png b/public/images/emoji/facebook_messenger/beetle.png
index 01bc9362c18..03698c3175c 100644
Binary files a/public/images/emoji/facebook_messenger/beetle.png and b/public/images/emoji/facebook_messenger/beetle.png differ
diff --git a/public/images/emoji/facebook_messenger/beginner.png b/public/images/emoji/facebook_messenger/beginner.png
index 80429e29ecb..61fd22318de 100644
Binary files a/public/images/emoji/facebook_messenger/beginner.png and b/public/images/emoji/facebook_messenger/beginner.png differ
diff --git a/public/images/emoji/facebook_messenger/belarus.png b/public/images/emoji/facebook_messenger/belarus.png
index e75dc9ec50b..18bec8aa65a 100644
Binary files a/public/images/emoji/facebook_messenger/belarus.png and b/public/images/emoji/facebook_messenger/belarus.png differ
diff --git a/public/images/emoji/facebook_messenger/belgium.png b/public/images/emoji/facebook_messenger/belgium.png
index faa710e2110..e73dfdf9b4c 100644
Binary files a/public/images/emoji/facebook_messenger/belgium.png and b/public/images/emoji/facebook_messenger/belgium.png differ
diff --git a/public/images/emoji/facebook_messenger/belize.png b/public/images/emoji/facebook_messenger/belize.png
index 5f6dded80bf..b2b1118cbf2 100644
Binary files a/public/images/emoji/facebook_messenger/belize.png and b/public/images/emoji/facebook_messenger/belize.png differ
diff --git a/public/images/emoji/facebook_messenger/bell.png b/public/images/emoji/facebook_messenger/bell.png
index 50bd10b5db9..6bce0105239 100644
Binary files a/public/images/emoji/facebook_messenger/bell.png and b/public/images/emoji/facebook_messenger/bell.png differ
diff --git a/public/images/emoji/facebook_messenger/bellhop.png b/public/images/emoji/facebook_messenger/bellhop.png
index 21a073029d1..6d356446ff5 100644
Binary files a/public/images/emoji/facebook_messenger/bellhop.png and b/public/images/emoji/facebook_messenger/bellhop.png differ
diff --git a/public/images/emoji/facebook_messenger/bellhop_bell.png b/public/images/emoji/facebook_messenger/bellhop_bell.png
index 21a073029d1..6d356446ff5 100644
Binary files a/public/images/emoji/facebook_messenger/bellhop_bell.png and b/public/images/emoji/facebook_messenger/bellhop_bell.png differ
diff --git a/public/images/emoji/facebook_messenger/benin.png b/public/images/emoji/facebook_messenger/benin.png
index bb74e98818a..8886562e358 100644
Binary files a/public/images/emoji/facebook_messenger/benin.png and b/public/images/emoji/facebook_messenger/benin.png differ
diff --git a/public/images/emoji/facebook_messenger/bento.png b/public/images/emoji/facebook_messenger/bento.png
index 6f1ce980f39..b67d8ba2573 100644
Binary files a/public/images/emoji/facebook_messenger/bento.png and b/public/images/emoji/facebook_messenger/bento.png differ
diff --git a/public/images/emoji/facebook_messenger/bermuda.png b/public/images/emoji/facebook_messenger/bermuda.png
index 75f2fac7609..2dd999ea257 100644
Binary files a/public/images/emoji/facebook_messenger/bermuda.png and b/public/images/emoji/facebook_messenger/bermuda.png differ
diff --git a/public/images/emoji/facebook_messenger/bhutan.png b/public/images/emoji/facebook_messenger/bhutan.png
index d9a2d20fc1f..0d670c8383d 100644
Binary files a/public/images/emoji/facebook_messenger/bhutan.png and b/public/images/emoji/facebook_messenger/bhutan.png differ
diff --git a/public/images/emoji/facebook_messenger/bicyclist.png b/public/images/emoji/facebook_messenger/bicyclist.png
index e2079b8040e..9866c2131ce 100644
Binary files a/public/images/emoji/facebook_messenger/bicyclist.png and b/public/images/emoji/facebook_messenger/bicyclist.png differ
diff --git a/public/images/emoji/facebook_messenger/bicyclist/2.png b/public/images/emoji/facebook_messenger/bicyclist/2.png
index 120dba4f56c..37071ba134e 100644
Binary files a/public/images/emoji/facebook_messenger/bicyclist/2.png and b/public/images/emoji/facebook_messenger/bicyclist/2.png differ
diff --git a/public/images/emoji/facebook_messenger/bicyclist/3.png b/public/images/emoji/facebook_messenger/bicyclist/3.png
index 108f8765b6c..89fb037c3df 100644
Binary files a/public/images/emoji/facebook_messenger/bicyclist/3.png and b/public/images/emoji/facebook_messenger/bicyclist/3.png differ
diff --git a/public/images/emoji/facebook_messenger/bicyclist/4.png b/public/images/emoji/facebook_messenger/bicyclist/4.png
index 96e0fc4e076..9f7da1d5f03 100644
Binary files a/public/images/emoji/facebook_messenger/bicyclist/4.png and b/public/images/emoji/facebook_messenger/bicyclist/4.png differ
diff --git a/public/images/emoji/facebook_messenger/bicyclist/5.png b/public/images/emoji/facebook_messenger/bicyclist/5.png
index 37d2867b23f..19552d15aa4 100644
Binary files a/public/images/emoji/facebook_messenger/bicyclist/5.png and b/public/images/emoji/facebook_messenger/bicyclist/5.png differ
diff --git a/public/images/emoji/facebook_messenger/bicyclist/6.png b/public/images/emoji/facebook_messenger/bicyclist/6.png
index 454968531e7..b73dbf92b37 100644
Binary files a/public/images/emoji/facebook_messenger/bicyclist/6.png and b/public/images/emoji/facebook_messenger/bicyclist/6.png differ
diff --git a/public/images/emoji/facebook_messenger/bike.png b/public/images/emoji/facebook_messenger/bike.png
index 56d1d538d50..5e72b9eb627 100644
Binary files a/public/images/emoji/facebook_messenger/bike.png and b/public/images/emoji/facebook_messenger/bike.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_man.png b/public/images/emoji/facebook_messenger/biking_man.png
index e2079b8040e..9866c2131ce 100644
Binary files a/public/images/emoji/facebook_messenger/biking_man.png and b/public/images/emoji/facebook_messenger/biking_man.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_man/2.png b/public/images/emoji/facebook_messenger/biking_man/2.png
index 120dba4f56c..37071ba134e 100644
Binary files a/public/images/emoji/facebook_messenger/biking_man/2.png and b/public/images/emoji/facebook_messenger/biking_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_man/3.png b/public/images/emoji/facebook_messenger/biking_man/3.png
index 108f8765b6c..89fb037c3df 100644
Binary files a/public/images/emoji/facebook_messenger/biking_man/3.png and b/public/images/emoji/facebook_messenger/biking_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_man/4.png b/public/images/emoji/facebook_messenger/biking_man/4.png
index 96e0fc4e076..9f7da1d5f03 100644
Binary files a/public/images/emoji/facebook_messenger/biking_man/4.png and b/public/images/emoji/facebook_messenger/biking_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_man/5.png b/public/images/emoji/facebook_messenger/biking_man/5.png
index 37d2867b23f..19552d15aa4 100644
Binary files a/public/images/emoji/facebook_messenger/biking_man/5.png and b/public/images/emoji/facebook_messenger/biking_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_man/6.png b/public/images/emoji/facebook_messenger/biking_man/6.png
index 454968531e7..b73dbf92b37 100644
Binary files a/public/images/emoji/facebook_messenger/biking_man/6.png and b/public/images/emoji/facebook_messenger/biking_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_woman.png b/public/images/emoji/facebook_messenger/biking_woman.png
index eab8bcf9f62..3980ebe6225 100644
Binary files a/public/images/emoji/facebook_messenger/biking_woman.png and b/public/images/emoji/facebook_messenger/biking_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_woman/2.png b/public/images/emoji/facebook_messenger/biking_woman/2.png
index 39b2f70d9a6..975a1c38f76 100644
Binary files a/public/images/emoji/facebook_messenger/biking_woman/2.png and b/public/images/emoji/facebook_messenger/biking_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_woman/3.png b/public/images/emoji/facebook_messenger/biking_woman/3.png
index 1cdb55d7bd1..430ba5933f6 100644
Binary files a/public/images/emoji/facebook_messenger/biking_woman/3.png and b/public/images/emoji/facebook_messenger/biking_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_woman/4.png b/public/images/emoji/facebook_messenger/biking_woman/4.png
index 1479fbc064f..1cfd7753321 100644
Binary files a/public/images/emoji/facebook_messenger/biking_woman/4.png and b/public/images/emoji/facebook_messenger/biking_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_woman/5.png b/public/images/emoji/facebook_messenger/biking_woman/5.png
index 521d5bf8850..217cad51c21 100644
Binary files a/public/images/emoji/facebook_messenger/biking_woman/5.png and b/public/images/emoji/facebook_messenger/biking_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_woman/6.png b/public/images/emoji/facebook_messenger/biking_woman/6.png
index bb3897810e7..dd18e1a4013 100644
Binary files a/public/images/emoji/facebook_messenger/biking_woman/6.png and b/public/images/emoji/facebook_messenger/biking_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/bikini.png b/public/images/emoji/facebook_messenger/bikini.png
index 9ddf6bbc4ac..0efa62c3244 100644
Binary files a/public/images/emoji/facebook_messenger/bikini.png and b/public/images/emoji/facebook_messenger/bikini.png differ
diff --git a/public/images/emoji/facebook_messenger/billed_cap.png b/public/images/emoji/facebook_messenger/billed_cap.png
index 5cc92e307e1..dae491812e8 100644
Binary files a/public/images/emoji/facebook_messenger/billed_cap.png and b/public/images/emoji/facebook_messenger/billed_cap.png differ
diff --git a/public/images/emoji/facebook_messenger/biohazard.png b/public/images/emoji/facebook_messenger/biohazard.png
index 95f312482cb..d9ebf1c0443 100644
Binary files a/public/images/emoji/facebook_messenger/biohazard.png and b/public/images/emoji/facebook_messenger/biohazard.png differ
diff --git a/public/images/emoji/facebook_messenger/biohazard_sign.png b/public/images/emoji/facebook_messenger/biohazard_sign.png
index 95f312482cb..d9ebf1c0443 100644
Binary files a/public/images/emoji/facebook_messenger/biohazard_sign.png and b/public/images/emoji/facebook_messenger/biohazard_sign.png differ
diff --git a/public/images/emoji/facebook_messenger/bird.png b/public/images/emoji/facebook_messenger/bird.png
index 23e76124179..549fc66244b 100644
Binary files a/public/images/emoji/facebook_messenger/bird.png and b/public/images/emoji/facebook_messenger/bird.png differ
diff --git a/public/images/emoji/facebook_messenger/birthday.png b/public/images/emoji/facebook_messenger/birthday.png
index 1d1dd505858..ee788fa4556 100644
Binary files a/public/images/emoji/facebook_messenger/birthday.png and b/public/images/emoji/facebook_messenger/birthday.png differ
diff --git a/public/images/emoji/facebook_messenger/black_circle.png b/public/images/emoji/facebook_messenger/black_circle.png
index b6dd0cc78b1..426b5c11ef8 100644
Binary files a/public/images/emoji/facebook_messenger/black_circle.png and b/public/images/emoji/facebook_messenger/black_circle.png differ
diff --git a/public/images/emoji/facebook_messenger/black_flag.png b/public/images/emoji/facebook_messenger/black_flag.png
index 5c1237bdad2..bc52913998d 100644
Binary files a/public/images/emoji/facebook_messenger/black_flag.png and b/public/images/emoji/facebook_messenger/black_flag.png differ
diff --git a/public/images/emoji/facebook_messenger/black_heart.png b/public/images/emoji/facebook_messenger/black_heart.png
index b2378197554..7a582c18a8b 100644
Binary files a/public/images/emoji/facebook_messenger/black_heart.png and b/public/images/emoji/facebook_messenger/black_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/black_joker.png b/public/images/emoji/facebook_messenger/black_joker.png
index 5666f561d15..7a459073041 100644
Binary files a/public/images/emoji/facebook_messenger/black_joker.png and b/public/images/emoji/facebook_messenger/black_joker.png differ
diff --git a/public/images/emoji/facebook_messenger/black_large_square.png b/public/images/emoji/facebook_messenger/black_large_square.png
index b9af66d4328..302a41b45e7 100644
Binary files a/public/images/emoji/facebook_messenger/black_large_square.png and b/public/images/emoji/facebook_messenger/black_large_square.png differ
diff --git a/public/images/emoji/facebook_messenger/black_medium_small_square.png b/public/images/emoji/facebook_messenger/black_medium_small_square.png
index 7fe4d1187d6..cb53eac3bc2 100644
Binary files a/public/images/emoji/facebook_messenger/black_medium_small_square.png and b/public/images/emoji/facebook_messenger/black_medium_small_square.png differ
diff --git a/public/images/emoji/facebook_messenger/black_medium_square.png b/public/images/emoji/facebook_messenger/black_medium_square.png
index 5e67a2f95d1..21e0c608e7f 100644
Binary files a/public/images/emoji/facebook_messenger/black_medium_square.png and b/public/images/emoji/facebook_messenger/black_medium_square.png differ
diff --git a/public/images/emoji/facebook_messenger/black_nib.png b/public/images/emoji/facebook_messenger/black_nib.png
index 6bc6df45cb2..531ca550878 100644
Binary files a/public/images/emoji/facebook_messenger/black_nib.png and b/public/images/emoji/facebook_messenger/black_nib.png differ
diff --git a/public/images/emoji/facebook_messenger/black_small_square.png b/public/images/emoji/facebook_messenger/black_small_square.png
index 7a9dac388b4..9354131059a 100644
Binary files a/public/images/emoji/facebook_messenger/black_small_square.png and b/public/images/emoji/facebook_messenger/black_small_square.png differ
diff --git a/public/images/emoji/facebook_messenger/black_square_button.png b/public/images/emoji/facebook_messenger/black_square_button.png
index acdb7812c3e..29c9e138853 100644
Binary files a/public/images/emoji/facebook_messenger/black_square_button.png and b/public/images/emoji/facebook_messenger/black_square_button.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_man.png b/public/images/emoji/facebook_messenger/blonde_man.png
index cfe7273eb3a..f19dc6ff1d2 100644
Binary files a/public/images/emoji/facebook_messenger/blonde_man.png and b/public/images/emoji/facebook_messenger/blonde_man.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_man/2.png b/public/images/emoji/facebook_messenger/blonde_man/2.png
index aee96b85a74..88d69b3062c 100644
Binary files a/public/images/emoji/facebook_messenger/blonde_man/2.png and b/public/images/emoji/facebook_messenger/blonde_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_man/3.png b/public/images/emoji/facebook_messenger/blonde_man/3.png
index b4fffd5a303..ee68c1bb33a 100644
Binary files a/public/images/emoji/facebook_messenger/blonde_man/3.png and b/public/images/emoji/facebook_messenger/blonde_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_man/4.png b/public/images/emoji/facebook_messenger/blonde_man/4.png
index d8d6a0de15e..36062b098ef 100644
Binary files a/public/images/emoji/facebook_messenger/blonde_man/4.png and b/public/images/emoji/facebook_messenger/blonde_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_man/5.png b/public/images/emoji/facebook_messenger/blonde_man/5.png
index 6a573ffb48a..6e6f29b2142 100644
Binary files a/public/images/emoji/facebook_messenger/blonde_man/5.png and b/public/images/emoji/facebook_messenger/blonde_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_man/6.png b/public/images/emoji/facebook_messenger/blonde_man/6.png
index 1cefe68636a..e773f424817 100644
Binary files a/public/images/emoji/facebook_messenger/blonde_man/6.png and b/public/images/emoji/facebook_messenger/blonde_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_woman.png b/public/images/emoji/facebook_messenger/blonde_woman.png
index 11e258fa617..cb1c51ac23d 100644
Binary files a/public/images/emoji/facebook_messenger/blonde_woman.png and b/public/images/emoji/facebook_messenger/blonde_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_woman/2.png b/public/images/emoji/facebook_messenger/blonde_woman/2.png
index 70e3888d3eb..e274131cedc 100644
Binary files a/public/images/emoji/facebook_messenger/blonde_woman/2.png and b/public/images/emoji/facebook_messenger/blonde_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_woman/3.png b/public/images/emoji/facebook_messenger/blonde_woman/3.png
index 52e92bb7d6b..34f72e75f7b 100644
Binary files a/public/images/emoji/facebook_messenger/blonde_woman/3.png and b/public/images/emoji/facebook_messenger/blonde_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_woman/4.png b/public/images/emoji/facebook_messenger/blonde_woman/4.png
index 37108efb1f2..f1bc0dbe525 100644
Binary files a/public/images/emoji/facebook_messenger/blonde_woman/4.png and b/public/images/emoji/facebook_messenger/blonde_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_woman/5.png b/public/images/emoji/facebook_messenger/blonde_woman/5.png
index a7c2fcdfd9b..be390b7bb97 100644
Binary files a/public/images/emoji/facebook_messenger/blonde_woman/5.png and b/public/images/emoji/facebook_messenger/blonde_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_woman/6.png b/public/images/emoji/facebook_messenger/blonde_woman/6.png
index 0a8ee484ce3..8a4eda74fa1 100644
Binary files a/public/images/emoji/facebook_messenger/blonde_woman/6.png and b/public/images/emoji/facebook_messenger/blonde_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/blossom.png b/public/images/emoji/facebook_messenger/blossom.png
index cc6fb6e6176..a2a7b6db3cb 100644
Binary files a/public/images/emoji/facebook_messenger/blossom.png and b/public/images/emoji/facebook_messenger/blossom.png differ
diff --git a/public/images/emoji/facebook_messenger/blowfish.png b/public/images/emoji/facebook_messenger/blowfish.png
index 5d39475b064..828264cc858 100644
Binary files a/public/images/emoji/facebook_messenger/blowfish.png and b/public/images/emoji/facebook_messenger/blowfish.png differ
diff --git a/public/images/emoji/facebook_messenger/blue_book.png b/public/images/emoji/facebook_messenger/blue_book.png
index ce96b52fc34..4423cca14d5 100644
Binary files a/public/images/emoji/facebook_messenger/blue_book.png and b/public/images/emoji/facebook_messenger/blue_book.png differ
diff --git a/public/images/emoji/facebook_messenger/blue_car.png b/public/images/emoji/facebook_messenger/blue_car.png
index b4976f11243..b48a962405c 100644
Binary files a/public/images/emoji/facebook_messenger/blue_car.png and b/public/images/emoji/facebook_messenger/blue_car.png differ
diff --git a/public/images/emoji/facebook_messenger/blue_heart.png b/public/images/emoji/facebook_messenger/blue_heart.png
index b81cebfba17..6f707d91a84 100644
Binary files a/public/images/emoji/facebook_messenger/blue_heart.png and b/public/images/emoji/facebook_messenger/blue_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/blush.png b/public/images/emoji/facebook_messenger/blush.png
index 5db3f3a78c9..1d15bde80bc 100644
Binary files a/public/images/emoji/facebook_messenger/blush.png and b/public/images/emoji/facebook_messenger/blush.png differ
diff --git a/public/images/emoji/facebook_messenger/boar.png b/public/images/emoji/facebook_messenger/boar.png
index 09614c37228..22967fe532b 100644
Binary files a/public/images/emoji/facebook_messenger/boar.png and b/public/images/emoji/facebook_messenger/boar.png differ
diff --git a/public/images/emoji/facebook_messenger/boat.png b/public/images/emoji/facebook_messenger/boat.png
index 3eba365766f..d17e9287e5b 100644
Binary files a/public/images/emoji/facebook_messenger/boat.png and b/public/images/emoji/facebook_messenger/boat.png differ
diff --git a/public/images/emoji/facebook_messenger/bolivia.png b/public/images/emoji/facebook_messenger/bolivia.png
index af9bd4d5e7a..bb8c24688be 100644
Binary files a/public/images/emoji/facebook_messenger/bolivia.png and b/public/images/emoji/facebook_messenger/bolivia.png differ
diff --git a/public/images/emoji/facebook_messenger/bomb.png b/public/images/emoji/facebook_messenger/bomb.png
index 5afa9092b4a..b08b877e95b 100644
Binary files a/public/images/emoji/facebook_messenger/bomb.png and b/public/images/emoji/facebook_messenger/bomb.png differ
diff --git a/public/images/emoji/facebook_messenger/book.png b/public/images/emoji/facebook_messenger/book.png
index 466a96d4dc2..724a71aeb9d 100644
Binary files a/public/images/emoji/facebook_messenger/book.png and b/public/images/emoji/facebook_messenger/book.png differ
diff --git a/public/images/emoji/facebook_messenger/bookmark.png b/public/images/emoji/facebook_messenger/bookmark.png
index 896268d22bd..2667d0cf468 100644
Binary files a/public/images/emoji/facebook_messenger/bookmark.png and b/public/images/emoji/facebook_messenger/bookmark.png differ
diff --git a/public/images/emoji/facebook_messenger/bookmark_tabs.png b/public/images/emoji/facebook_messenger/bookmark_tabs.png
index b26787ae8a1..d631d3c5367 100644
Binary files a/public/images/emoji/facebook_messenger/bookmark_tabs.png and b/public/images/emoji/facebook_messenger/bookmark_tabs.png differ
diff --git a/public/images/emoji/facebook_messenger/books.png b/public/images/emoji/facebook_messenger/books.png
index 77002adc857..f8411f5717a 100644
Binary files a/public/images/emoji/facebook_messenger/books.png and b/public/images/emoji/facebook_messenger/books.png differ
diff --git a/public/images/emoji/facebook_messenger/boom.png b/public/images/emoji/facebook_messenger/boom.png
index 786e74def77..04269ded8c6 100644
Binary files a/public/images/emoji/facebook_messenger/boom.png and b/public/images/emoji/facebook_messenger/boom.png differ
diff --git a/public/images/emoji/facebook_messenger/boot.png b/public/images/emoji/facebook_messenger/boot.png
index 8675b479402..9b6e9c76c09 100644
Binary files a/public/images/emoji/facebook_messenger/boot.png and b/public/images/emoji/facebook_messenger/boot.png differ
diff --git a/public/images/emoji/facebook_messenger/bosnia_herzegovina.png b/public/images/emoji/facebook_messenger/bosnia_herzegovina.png
index 91493ade758..bd99de522c7 100644
Binary files a/public/images/emoji/facebook_messenger/bosnia_herzegovina.png and b/public/images/emoji/facebook_messenger/bosnia_herzegovina.png differ
diff --git a/public/images/emoji/facebook_messenger/botswana.png b/public/images/emoji/facebook_messenger/botswana.png
index 3697a723dd3..80636409e1a 100644
Binary files a/public/images/emoji/facebook_messenger/botswana.png and b/public/images/emoji/facebook_messenger/botswana.png differ
diff --git a/public/images/emoji/facebook_messenger/bottle_with_popping_cork.png b/public/images/emoji/facebook_messenger/bottle_with_popping_cork.png
index 49ea37f3899..428019d3823 100644
Binary files a/public/images/emoji/facebook_messenger/bottle_with_popping_cork.png and b/public/images/emoji/facebook_messenger/bottle_with_popping_cork.png differ
diff --git a/public/images/emoji/facebook_messenger/bouquet.png b/public/images/emoji/facebook_messenger/bouquet.png
index 7bf622d7361..35bf8501a65 100644
Binary files a/public/images/emoji/facebook_messenger/bouquet.png and b/public/images/emoji/facebook_messenger/bouquet.png differ
diff --git a/public/images/emoji/facebook_messenger/bouvet_island.png b/public/images/emoji/facebook_messenger/bouvet_island.png
index 801a5776543..d2cd8f67f28 100644
Binary files a/public/images/emoji/facebook_messenger/bouvet_island.png and b/public/images/emoji/facebook_messenger/bouvet_island.png differ
diff --git a/public/images/emoji/facebook_messenger/bow.png b/public/images/emoji/facebook_messenger/bow.png
index 8bcfb359109..d2ca3b5c9c1 100644
Binary files a/public/images/emoji/facebook_messenger/bow.png and b/public/images/emoji/facebook_messenger/bow.png differ
diff --git a/public/images/emoji/facebook_messenger/bow/2.png b/public/images/emoji/facebook_messenger/bow/2.png
index dbcc662a1dc..126ecfeffc3 100644
Binary files a/public/images/emoji/facebook_messenger/bow/2.png and b/public/images/emoji/facebook_messenger/bow/2.png differ
diff --git a/public/images/emoji/facebook_messenger/bow/3.png b/public/images/emoji/facebook_messenger/bow/3.png
index e764892f5be..90000670ef1 100644
Binary files a/public/images/emoji/facebook_messenger/bow/3.png and b/public/images/emoji/facebook_messenger/bow/3.png differ
diff --git a/public/images/emoji/facebook_messenger/bow/4.png b/public/images/emoji/facebook_messenger/bow/4.png
index 0a33d718d2b..f7d1ba77457 100644
Binary files a/public/images/emoji/facebook_messenger/bow/4.png and b/public/images/emoji/facebook_messenger/bow/4.png differ
diff --git a/public/images/emoji/facebook_messenger/bow/5.png b/public/images/emoji/facebook_messenger/bow/5.png
index f6f4b24775b..9f10f1da008 100644
Binary files a/public/images/emoji/facebook_messenger/bow/5.png and b/public/images/emoji/facebook_messenger/bow/5.png differ
diff --git a/public/images/emoji/facebook_messenger/bow/6.png b/public/images/emoji/facebook_messenger/bow/6.png
index ef61032004b..ba8f4eb367c 100644
Binary files a/public/images/emoji/facebook_messenger/bow/6.png and b/public/images/emoji/facebook_messenger/bow/6.png differ
diff --git a/public/images/emoji/facebook_messenger/bow_and_arrow.png b/public/images/emoji/facebook_messenger/bow_and_arrow.png
index f50a1389fef..eba0a0deebe 100644
Binary files a/public/images/emoji/facebook_messenger/bow_and_arrow.png and b/public/images/emoji/facebook_messenger/bow_and_arrow.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_man.png b/public/images/emoji/facebook_messenger/bowing_man.png
index 8bcfb359109..d2ca3b5c9c1 100644
Binary files a/public/images/emoji/facebook_messenger/bowing_man.png and b/public/images/emoji/facebook_messenger/bowing_man.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_man/2.png b/public/images/emoji/facebook_messenger/bowing_man/2.png
index dbcc662a1dc..126ecfeffc3 100644
Binary files a/public/images/emoji/facebook_messenger/bowing_man/2.png and b/public/images/emoji/facebook_messenger/bowing_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_man/3.png b/public/images/emoji/facebook_messenger/bowing_man/3.png
index e764892f5be..90000670ef1 100644
Binary files a/public/images/emoji/facebook_messenger/bowing_man/3.png and b/public/images/emoji/facebook_messenger/bowing_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_man/4.png b/public/images/emoji/facebook_messenger/bowing_man/4.png
index 0a33d718d2b..f7d1ba77457 100644
Binary files a/public/images/emoji/facebook_messenger/bowing_man/4.png and b/public/images/emoji/facebook_messenger/bowing_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_man/5.png b/public/images/emoji/facebook_messenger/bowing_man/5.png
index f6f4b24775b..9f10f1da008 100644
Binary files a/public/images/emoji/facebook_messenger/bowing_man/5.png and b/public/images/emoji/facebook_messenger/bowing_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_man/6.png b/public/images/emoji/facebook_messenger/bowing_man/6.png
index ef61032004b..ba8f4eb367c 100644
Binary files a/public/images/emoji/facebook_messenger/bowing_man/6.png and b/public/images/emoji/facebook_messenger/bowing_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_woman.png b/public/images/emoji/facebook_messenger/bowing_woman.png
index bbe859ce678..7b2cefa3428 100644
Binary files a/public/images/emoji/facebook_messenger/bowing_woman.png and b/public/images/emoji/facebook_messenger/bowing_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_woman/2.png b/public/images/emoji/facebook_messenger/bowing_woman/2.png
index e6fa7ca7f53..b8a6f0fc8f8 100644
Binary files a/public/images/emoji/facebook_messenger/bowing_woman/2.png and b/public/images/emoji/facebook_messenger/bowing_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_woman/3.png b/public/images/emoji/facebook_messenger/bowing_woman/3.png
index 206a3687086..75cadf33764 100644
Binary files a/public/images/emoji/facebook_messenger/bowing_woman/3.png and b/public/images/emoji/facebook_messenger/bowing_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_woman/4.png b/public/images/emoji/facebook_messenger/bowing_woman/4.png
index 047411f9662..76660ba20d4 100644
Binary files a/public/images/emoji/facebook_messenger/bowing_woman/4.png and b/public/images/emoji/facebook_messenger/bowing_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_woman/5.png b/public/images/emoji/facebook_messenger/bowing_woman/5.png
index 9d43cffab0a..5417adf3562 100644
Binary files a/public/images/emoji/facebook_messenger/bowing_woman/5.png and b/public/images/emoji/facebook_messenger/bowing_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_woman/6.png b/public/images/emoji/facebook_messenger/bowing_woman/6.png
index 85a701f354e..abe63e985d8 100644
Binary files a/public/images/emoji/facebook_messenger/bowing_woman/6.png and b/public/images/emoji/facebook_messenger/bowing_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/bowl_with_spoon.png b/public/images/emoji/facebook_messenger/bowl_with_spoon.png
index b0d88a73b9d..d8c2f02a72f 100644
Binary files a/public/images/emoji/facebook_messenger/bowl_with_spoon.png and b/public/images/emoji/facebook_messenger/bowl_with_spoon.png differ
diff --git a/public/images/emoji/facebook_messenger/bowling.png b/public/images/emoji/facebook_messenger/bowling.png
index 4b480dd9bf2..4848c6d1936 100644
Binary files a/public/images/emoji/facebook_messenger/bowling.png and b/public/images/emoji/facebook_messenger/bowling.png differ
diff --git a/public/images/emoji/facebook_messenger/boxing_glove.png b/public/images/emoji/facebook_messenger/boxing_glove.png
index abb4d248341..a95603e47c8 100644
Binary files a/public/images/emoji/facebook_messenger/boxing_glove.png and b/public/images/emoji/facebook_messenger/boxing_glove.png differ
diff --git a/public/images/emoji/facebook_messenger/boy.png b/public/images/emoji/facebook_messenger/boy.png
index 28d4189bc1a..5c511ccc33e 100644
Binary files a/public/images/emoji/facebook_messenger/boy.png and b/public/images/emoji/facebook_messenger/boy.png differ
diff --git a/public/images/emoji/facebook_messenger/boy/2.png b/public/images/emoji/facebook_messenger/boy/2.png
index 0a447532d81..fb50209c599 100644
Binary files a/public/images/emoji/facebook_messenger/boy/2.png and b/public/images/emoji/facebook_messenger/boy/2.png differ
diff --git a/public/images/emoji/facebook_messenger/boy/3.png b/public/images/emoji/facebook_messenger/boy/3.png
index 777a3f9cfbe..309cb98165f 100644
Binary files a/public/images/emoji/facebook_messenger/boy/3.png and b/public/images/emoji/facebook_messenger/boy/3.png differ
diff --git a/public/images/emoji/facebook_messenger/boy/4.png b/public/images/emoji/facebook_messenger/boy/4.png
index d0d67a57f5a..8607ad6a48d 100644
Binary files a/public/images/emoji/facebook_messenger/boy/4.png and b/public/images/emoji/facebook_messenger/boy/4.png differ
diff --git a/public/images/emoji/facebook_messenger/boy/5.png b/public/images/emoji/facebook_messenger/boy/5.png
index 0d04819d226..4cad8e27a69 100644
Binary files a/public/images/emoji/facebook_messenger/boy/5.png and b/public/images/emoji/facebook_messenger/boy/5.png differ
diff --git a/public/images/emoji/facebook_messenger/boy/6.png b/public/images/emoji/facebook_messenger/boy/6.png
index c817adeeeb7..cfdf901ef3c 100644
Binary files a/public/images/emoji/facebook_messenger/boy/6.png and b/public/images/emoji/facebook_messenger/boy/6.png differ
diff --git a/public/images/emoji/facebook_messenger/brain.png b/public/images/emoji/facebook_messenger/brain.png
index c8e889faecf..76b43744dcf 100644
Binary files a/public/images/emoji/facebook_messenger/brain.png and b/public/images/emoji/facebook_messenger/brain.png differ
diff --git a/public/images/emoji/facebook_messenger/brazil.png b/public/images/emoji/facebook_messenger/brazil.png
index f510542abc8..e620c5eb37e 100644
Binary files a/public/images/emoji/facebook_messenger/brazil.png and b/public/images/emoji/facebook_messenger/brazil.png differ
diff --git a/public/images/emoji/facebook_messenger/bread.png b/public/images/emoji/facebook_messenger/bread.png
index 4d4011d4490..e11f314c2d5 100644
Binary files a/public/images/emoji/facebook_messenger/bread.png and b/public/images/emoji/facebook_messenger/bread.png differ
diff --git a/public/images/emoji/facebook_messenger/breast_feeding.png b/public/images/emoji/facebook_messenger/breast_feeding.png
index 815538138bf..c3a78fdfc52 100644
Binary files a/public/images/emoji/facebook_messenger/breast_feeding.png and b/public/images/emoji/facebook_messenger/breast_feeding.png differ
diff --git a/public/images/emoji/facebook_messenger/breast_feeding/2.png b/public/images/emoji/facebook_messenger/breast_feeding/2.png
index fb591aa4fb4..0b4325d6aed 100644
Binary files a/public/images/emoji/facebook_messenger/breast_feeding/2.png and b/public/images/emoji/facebook_messenger/breast_feeding/2.png differ
diff --git a/public/images/emoji/facebook_messenger/breast_feeding/3.png b/public/images/emoji/facebook_messenger/breast_feeding/3.png
index 5adcffa4b94..05390c718e6 100644
Binary files a/public/images/emoji/facebook_messenger/breast_feeding/3.png and b/public/images/emoji/facebook_messenger/breast_feeding/3.png differ
diff --git a/public/images/emoji/facebook_messenger/breast_feeding/4.png b/public/images/emoji/facebook_messenger/breast_feeding/4.png
index d166f981b24..c71cea1cb7a 100644
Binary files a/public/images/emoji/facebook_messenger/breast_feeding/4.png and b/public/images/emoji/facebook_messenger/breast_feeding/4.png differ
diff --git a/public/images/emoji/facebook_messenger/breast_feeding/5.png b/public/images/emoji/facebook_messenger/breast_feeding/5.png
index 7c8cb50a780..efc8aa64bb3 100644
Binary files a/public/images/emoji/facebook_messenger/breast_feeding/5.png and b/public/images/emoji/facebook_messenger/breast_feeding/5.png differ
diff --git a/public/images/emoji/facebook_messenger/breast_feeding/6.png b/public/images/emoji/facebook_messenger/breast_feeding/6.png
index e113d8cb428..be68ef2ddeb 100644
Binary files a/public/images/emoji/facebook_messenger/breast_feeding/6.png and b/public/images/emoji/facebook_messenger/breast_feeding/6.png differ
diff --git a/public/images/emoji/facebook_messenger/bride_with_veil.png b/public/images/emoji/facebook_messenger/bride_with_veil.png
index ffb60049020..7a8894f5bf2 100644
Binary files a/public/images/emoji/facebook_messenger/bride_with_veil.png and b/public/images/emoji/facebook_messenger/bride_with_veil.png differ
diff --git a/public/images/emoji/facebook_messenger/bride_with_veil/2.png b/public/images/emoji/facebook_messenger/bride_with_veil/2.png
index f279c55580a..1e3f3aea369 100644
Binary files a/public/images/emoji/facebook_messenger/bride_with_veil/2.png and b/public/images/emoji/facebook_messenger/bride_with_veil/2.png differ
diff --git a/public/images/emoji/facebook_messenger/bride_with_veil/3.png b/public/images/emoji/facebook_messenger/bride_with_veil/3.png
index 016fae0a30c..6889e54f508 100644
Binary files a/public/images/emoji/facebook_messenger/bride_with_veil/3.png and b/public/images/emoji/facebook_messenger/bride_with_veil/3.png differ
diff --git a/public/images/emoji/facebook_messenger/bride_with_veil/4.png b/public/images/emoji/facebook_messenger/bride_with_veil/4.png
index d257eb58b75..c54095f40ec 100644
Binary files a/public/images/emoji/facebook_messenger/bride_with_veil/4.png and b/public/images/emoji/facebook_messenger/bride_with_veil/4.png differ
diff --git a/public/images/emoji/facebook_messenger/bride_with_veil/5.png b/public/images/emoji/facebook_messenger/bride_with_veil/5.png
index 76478e5f9c2..cc31e23355c 100644
Binary files a/public/images/emoji/facebook_messenger/bride_with_veil/5.png and b/public/images/emoji/facebook_messenger/bride_with_veil/5.png differ
diff --git a/public/images/emoji/facebook_messenger/bride_with_veil/6.png b/public/images/emoji/facebook_messenger/bride_with_veil/6.png
index 3b592cdefb8..7a9a872bada 100644
Binary files a/public/images/emoji/facebook_messenger/bride_with_veil/6.png and b/public/images/emoji/facebook_messenger/bride_with_veil/6.png differ
diff --git a/public/images/emoji/facebook_messenger/bridge_at_night.png b/public/images/emoji/facebook_messenger/bridge_at_night.png
index 742e0629fd5..cd7ad472ebe 100644
Binary files a/public/images/emoji/facebook_messenger/bridge_at_night.png and b/public/images/emoji/facebook_messenger/bridge_at_night.png differ
diff --git a/public/images/emoji/facebook_messenger/briefcase.png b/public/images/emoji/facebook_messenger/briefcase.png
index 0dbe9606a3f..8c63d39e4c9 100644
Binary files a/public/images/emoji/facebook_messenger/briefcase.png and b/public/images/emoji/facebook_messenger/briefcase.png differ
diff --git a/public/images/emoji/facebook_messenger/british_indian_ocean_territory.png b/public/images/emoji/facebook_messenger/british_indian_ocean_territory.png
index e3d2479344f..2c48fa114c9 100644
Binary files a/public/images/emoji/facebook_messenger/british_indian_ocean_territory.png and b/public/images/emoji/facebook_messenger/british_indian_ocean_territory.png differ
diff --git a/public/images/emoji/facebook_messenger/british_virgin_islands.png b/public/images/emoji/facebook_messenger/british_virgin_islands.png
index 9f758979a16..039c5f66171 100644
Binary files a/public/images/emoji/facebook_messenger/british_virgin_islands.png and b/public/images/emoji/facebook_messenger/british_virgin_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/broccoli.png b/public/images/emoji/facebook_messenger/broccoli.png
index 5e03a6d23ba..350b31d1381 100644
Binary files a/public/images/emoji/facebook_messenger/broccoli.png and b/public/images/emoji/facebook_messenger/broccoli.png differ
diff --git a/public/images/emoji/facebook_messenger/broken_heart.png b/public/images/emoji/facebook_messenger/broken_heart.png
index 3f16d80d9e8..08d023a94a1 100644
Binary files a/public/images/emoji/facebook_messenger/broken_heart.png and b/public/images/emoji/facebook_messenger/broken_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/brunei.png b/public/images/emoji/facebook_messenger/brunei.png
index 647e1c4d79b..9cc73ebf71f 100644
Binary files a/public/images/emoji/facebook_messenger/brunei.png and b/public/images/emoji/facebook_messenger/brunei.png differ
diff --git a/public/images/emoji/facebook_messenger/bug.png b/public/images/emoji/facebook_messenger/bug.png
index bea8c8c0b6f..c0990ce9b04 100644
Binary files a/public/images/emoji/facebook_messenger/bug.png and b/public/images/emoji/facebook_messenger/bug.png differ
diff --git a/public/images/emoji/facebook_messenger/building_construction.png b/public/images/emoji/facebook_messenger/building_construction.png
index 24cdec2e5fd..74cd30792b9 100644
Binary files a/public/images/emoji/facebook_messenger/building_construction.png and b/public/images/emoji/facebook_messenger/building_construction.png differ
diff --git a/public/images/emoji/facebook_messenger/bulb.png b/public/images/emoji/facebook_messenger/bulb.png
index 485bf7f6a45..f018dd1e1b3 100644
Binary files a/public/images/emoji/facebook_messenger/bulb.png and b/public/images/emoji/facebook_messenger/bulb.png differ
diff --git a/public/images/emoji/facebook_messenger/bulgaria.png b/public/images/emoji/facebook_messenger/bulgaria.png
index 5185700c636..e82767d588c 100644
Binary files a/public/images/emoji/facebook_messenger/bulgaria.png and b/public/images/emoji/facebook_messenger/bulgaria.png differ
diff --git a/public/images/emoji/facebook_messenger/bullettrain_front.png b/public/images/emoji/facebook_messenger/bullettrain_front.png
index 70218a9ea2c..415d45cf363 100644
Binary files a/public/images/emoji/facebook_messenger/bullettrain_front.png and b/public/images/emoji/facebook_messenger/bullettrain_front.png differ
diff --git a/public/images/emoji/facebook_messenger/bullettrain_side.png b/public/images/emoji/facebook_messenger/bullettrain_side.png
index 8e23c7097cb..100c02226fd 100644
Binary files a/public/images/emoji/facebook_messenger/bullettrain_side.png and b/public/images/emoji/facebook_messenger/bullettrain_side.png differ
diff --git a/public/images/emoji/facebook_messenger/burkina_faso.png b/public/images/emoji/facebook_messenger/burkina_faso.png
index c519f8a954c..5f562008658 100644
Binary files a/public/images/emoji/facebook_messenger/burkina_faso.png and b/public/images/emoji/facebook_messenger/burkina_faso.png differ
diff --git a/public/images/emoji/facebook_messenger/burrito.png b/public/images/emoji/facebook_messenger/burrito.png
index 74894241cc2..f9bf2b0fae8 100644
Binary files a/public/images/emoji/facebook_messenger/burrito.png and b/public/images/emoji/facebook_messenger/burrito.png differ
diff --git a/public/images/emoji/facebook_messenger/burundi.png b/public/images/emoji/facebook_messenger/burundi.png
index 83e731cc34f..55eedeabd43 100644
Binary files a/public/images/emoji/facebook_messenger/burundi.png and b/public/images/emoji/facebook_messenger/burundi.png differ
diff --git a/public/images/emoji/facebook_messenger/bus.png b/public/images/emoji/facebook_messenger/bus.png
index a8a91afa97b..6a253e989d2 100644
Binary files a/public/images/emoji/facebook_messenger/bus.png and b/public/images/emoji/facebook_messenger/bus.png differ
diff --git a/public/images/emoji/facebook_messenger/business_suit_levitating.png b/public/images/emoji/facebook_messenger/business_suit_levitating.png
index 5231c708a03..12436f98884 100644
Binary files a/public/images/emoji/facebook_messenger/business_suit_levitating.png and b/public/images/emoji/facebook_messenger/business_suit_levitating.png differ
diff --git a/public/images/emoji/facebook_messenger/business_suit_levitating/2.png b/public/images/emoji/facebook_messenger/business_suit_levitating/2.png
index 753693b093b..7d66f0d7b6a 100644
Binary files a/public/images/emoji/facebook_messenger/business_suit_levitating/2.png and b/public/images/emoji/facebook_messenger/business_suit_levitating/2.png differ
diff --git a/public/images/emoji/facebook_messenger/business_suit_levitating/3.png b/public/images/emoji/facebook_messenger/business_suit_levitating/3.png
index f56875edac9..775f49d6447 100644
Binary files a/public/images/emoji/facebook_messenger/business_suit_levitating/3.png and b/public/images/emoji/facebook_messenger/business_suit_levitating/3.png differ
diff --git a/public/images/emoji/facebook_messenger/business_suit_levitating/4.png b/public/images/emoji/facebook_messenger/business_suit_levitating/4.png
index 37d74f5c97d..6906ed18450 100644
Binary files a/public/images/emoji/facebook_messenger/business_suit_levitating/4.png and b/public/images/emoji/facebook_messenger/business_suit_levitating/4.png differ
diff --git a/public/images/emoji/facebook_messenger/business_suit_levitating/5.png b/public/images/emoji/facebook_messenger/business_suit_levitating/5.png
index 5a48f961920..28849bdcc70 100644
Binary files a/public/images/emoji/facebook_messenger/business_suit_levitating/5.png and b/public/images/emoji/facebook_messenger/business_suit_levitating/5.png differ
diff --git a/public/images/emoji/facebook_messenger/business_suit_levitating/6.png b/public/images/emoji/facebook_messenger/business_suit_levitating/6.png
index 61507408172..cb80f23fc28 100644
Binary files a/public/images/emoji/facebook_messenger/business_suit_levitating/6.png and b/public/images/emoji/facebook_messenger/business_suit_levitating/6.png differ
diff --git a/public/images/emoji/facebook_messenger/busstop.png b/public/images/emoji/facebook_messenger/busstop.png
index ac57b9d39f1..5f0c87e31c5 100644
Binary files a/public/images/emoji/facebook_messenger/busstop.png and b/public/images/emoji/facebook_messenger/busstop.png differ
diff --git a/public/images/emoji/facebook_messenger/bust_in_silhouette.png b/public/images/emoji/facebook_messenger/bust_in_silhouette.png
index 74594226111..67ea1319574 100644
Binary files a/public/images/emoji/facebook_messenger/bust_in_silhouette.png and b/public/images/emoji/facebook_messenger/bust_in_silhouette.png differ
diff --git a/public/images/emoji/facebook_messenger/busts_in_silhouette.png b/public/images/emoji/facebook_messenger/busts_in_silhouette.png
index ecb85a45666..72ec2d844a0 100644
Binary files a/public/images/emoji/facebook_messenger/busts_in_silhouette.png and b/public/images/emoji/facebook_messenger/busts_in_silhouette.png differ
diff --git a/public/images/emoji/facebook_messenger/butterfly.png b/public/images/emoji/facebook_messenger/butterfly.png
index 995ea58f802..b2c9a28a086 100644
Binary files a/public/images/emoji/facebook_messenger/butterfly.png and b/public/images/emoji/facebook_messenger/butterfly.png differ
diff --git a/public/images/emoji/facebook_messenger/cactus.png b/public/images/emoji/facebook_messenger/cactus.png
index 8b7a55a0fa0..ba88add8c03 100644
Binary files a/public/images/emoji/facebook_messenger/cactus.png and b/public/images/emoji/facebook_messenger/cactus.png differ
diff --git a/public/images/emoji/facebook_messenger/cake.png b/public/images/emoji/facebook_messenger/cake.png
index e89e914f1a5..379bd5b9200 100644
Binary files a/public/images/emoji/facebook_messenger/cake.png and b/public/images/emoji/facebook_messenger/cake.png differ
diff --git a/public/images/emoji/facebook_messenger/calendar.png b/public/images/emoji/facebook_messenger/calendar.png
index b8b14b579a3..3eb35553eee 100644
Binary files a/public/images/emoji/facebook_messenger/calendar.png and b/public/images/emoji/facebook_messenger/calendar.png differ
diff --git a/public/images/emoji/facebook_messenger/calendar_spiral.png b/public/images/emoji/facebook_messenger/calendar_spiral.png
index 8cd3bd7e57f..ee07d24cb16 100644
Binary files a/public/images/emoji/facebook_messenger/calendar_spiral.png and b/public/images/emoji/facebook_messenger/calendar_spiral.png differ
diff --git a/public/images/emoji/facebook_messenger/call_me_hand.png b/public/images/emoji/facebook_messenger/call_me_hand.png
index 6e50aea9ee9..b6167359c4d 100644
Binary files a/public/images/emoji/facebook_messenger/call_me_hand.png and b/public/images/emoji/facebook_messenger/call_me_hand.png differ
diff --git a/public/images/emoji/facebook_messenger/call_me_hand/2.png b/public/images/emoji/facebook_messenger/call_me_hand/2.png
index 31a89ad6336..d3f73861bde 100644
Binary files a/public/images/emoji/facebook_messenger/call_me_hand/2.png and b/public/images/emoji/facebook_messenger/call_me_hand/2.png differ
diff --git a/public/images/emoji/facebook_messenger/call_me_hand/3.png b/public/images/emoji/facebook_messenger/call_me_hand/3.png
index d619e0b8d79..e27340161a4 100644
Binary files a/public/images/emoji/facebook_messenger/call_me_hand/3.png and b/public/images/emoji/facebook_messenger/call_me_hand/3.png differ
diff --git a/public/images/emoji/facebook_messenger/call_me_hand/4.png b/public/images/emoji/facebook_messenger/call_me_hand/4.png
index f99492eb6c9..11464e73d01 100644
Binary files a/public/images/emoji/facebook_messenger/call_me_hand/4.png and b/public/images/emoji/facebook_messenger/call_me_hand/4.png differ
diff --git a/public/images/emoji/facebook_messenger/call_me_hand/5.png b/public/images/emoji/facebook_messenger/call_me_hand/5.png
index 02be2857ff6..5d0fa6a7129 100644
Binary files a/public/images/emoji/facebook_messenger/call_me_hand/5.png and b/public/images/emoji/facebook_messenger/call_me_hand/5.png differ
diff --git a/public/images/emoji/facebook_messenger/call_me_hand/6.png b/public/images/emoji/facebook_messenger/call_me_hand/6.png
index f0c258b55b7..b1d253a42fd 100644
Binary files a/public/images/emoji/facebook_messenger/call_me_hand/6.png and b/public/images/emoji/facebook_messenger/call_me_hand/6.png differ
diff --git a/public/images/emoji/facebook_messenger/calling.png b/public/images/emoji/facebook_messenger/calling.png
index a6891ba5bdf..bebcdc4bc65 100644
Binary files a/public/images/emoji/facebook_messenger/calling.png and b/public/images/emoji/facebook_messenger/calling.png differ
diff --git a/public/images/emoji/facebook_messenger/cambodia.png b/public/images/emoji/facebook_messenger/cambodia.png
index 0a7ca06fb42..9ae1378cddc 100644
Binary files a/public/images/emoji/facebook_messenger/cambodia.png and b/public/images/emoji/facebook_messenger/cambodia.png differ
diff --git a/public/images/emoji/facebook_messenger/camel.png b/public/images/emoji/facebook_messenger/camel.png
index 5f3c565b697..929b1d55a06 100644
Binary files a/public/images/emoji/facebook_messenger/camel.png and b/public/images/emoji/facebook_messenger/camel.png differ
diff --git a/public/images/emoji/facebook_messenger/camera.png b/public/images/emoji/facebook_messenger/camera.png
index fd24f1b440c..3e815fdce7d 100644
Binary files a/public/images/emoji/facebook_messenger/camera.png and b/public/images/emoji/facebook_messenger/camera.png differ
diff --git a/public/images/emoji/facebook_messenger/camera_flash.png b/public/images/emoji/facebook_messenger/camera_flash.png
index fd49394ac1d..868eae6a703 100644
Binary files a/public/images/emoji/facebook_messenger/camera_flash.png and b/public/images/emoji/facebook_messenger/camera_flash.png differ
diff --git a/public/images/emoji/facebook_messenger/camera_with_flash.png b/public/images/emoji/facebook_messenger/camera_with_flash.png
index fd49394ac1d..868eae6a703 100644
Binary files a/public/images/emoji/facebook_messenger/camera_with_flash.png and b/public/images/emoji/facebook_messenger/camera_with_flash.png differ
diff --git a/public/images/emoji/facebook_messenger/cameroon.png b/public/images/emoji/facebook_messenger/cameroon.png
index b9aaf463487..38777f3dd23 100644
Binary files a/public/images/emoji/facebook_messenger/cameroon.png and b/public/images/emoji/facebook_messenger/cameroon.png differ
diff --git a/public/images/emoji/facebook_messenger/camping.png b/public/images/emoji/facebook_messenger/camping.png
index 414dc9caf6f..c77eb36e6ea 100644
Binary files a/public/images/emoji/facebook_messenger/camping.png and b/public/images/emoji/facebook_messenger/camping.png differ
diff --git a/public/images/emoji/facebook_messenger/canada.png b/public/images/emoji/facebook_messenger/canada.png
index 4ee3f2c1fdd..846e0f2cdab 100644
Binary files a/public/images/emoji/facebook_messenger/canada.png and b/public/images/emoji/facebook_messenger/canada.png differ
diff --git a/public/images/emoji/facebook_messenger/canary_islands.png b/public/images/emoji/facebook_messenger/canary_islands.png
index 68ccf48d0df..6bd488163d5 100644
Binary files a/public/images/emoji/facebook_messenger/canary_islands.png and b/public/images/emoji/facebook_messenger/canary_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/cancer.png b/public/images/emoji/facebook_messenger/cancer.png
index f413b1e61f7..afd6e4cd9ff 100644
Binary files a/public/images/emoji/facebook_messenger/cancer.png and b/public/images/emoji/facebook_messenger/cancer.png differ
diff --git a/public/images/emoji/facebook_messenger/candle.png b/public/images/emoji/facebook_messenger/candle.png
index 0a27def4ef1..ed5e7899527 100644
Binary files a/public/images/emoji/facebook_messenger/candle.png and b/public/images/emoji/facebook_messenger/candle.png differ
diff --git a/public/images/emoji/facebook_messenger/candy.png b/public/images/emoji/facebook_messenger/candy.png
index 2eb0b1616f3..5c66cf87f05 100644
Binary files a/public/images/emoji/facebook_messenger/candy.png and b/public/images/emoji/facebook_messenger/candy.png differ
diff --git a/public/images/emoji/facebook_messenger/canned_food.png b/public/images/emoji/facebook_messenger/canned_food.png
index 2e5976e9d2f..74b5ad355eb 100644
Binary files a/public/images/emoji/facebook_messenger/canned_food.png and b/public/images/emoji/facebook_messenger/canned_food.png differ
diff --git a/public/images/emoji/facebook_messenger/canoe.png b/public/images/emoji/facebook_messenger/canoe.png
index 4ee3c9caa7e..e7dfc9fcc8d 100644
Binary files a/public/images/emoji/facebook_messenger/canoe.png and b/public/images/emoji/facebook_messenger/canoe.png differ
diff --git a/public/images/emoji/facebook_messenger/cape_verde.png b/public/images/emoji/facebook_messenger/cape_verde.png
index 1252c37a6d8..64efb89b75b 100644
Binary files a/public/images/emoji/facebook_messenger/cape_verde.png and b/public/images/emoji/facebook_messenger/cape_verde.png differ
diff --git a/public/images/emoji/facebook_messenger/capital_abcd.png b/public/images/emoji/facebook_messenger/capital_abcd.png
index 0d4c9eba175..7a5024cc86b 100644
Binary files a/public/images/emoji/facebook_messenger/capital_abcd.png and b/public/images/emoji/facebook_messenger/capital_abcd.png differ
diff --git a/public/images/emoji/facebook_messenger/capricorn.png b/public/images/emoji/facebook_messenger/capricorn.png
index f7e1446d117..cc28532c9b8 100644
Binary files a/public/images/emoji/facebook_messenger/capricorn.png and b/public/images/emoji/facebook_messenger/capricorn.png differ
diff --git a/public/images/emoji/facebook_messenger/car.png b/public/images/emoji/facebook_messenger/car.png
index 024cdb23b51..ba661ecefdf 100644
Binary files a/public/images/emoji/facebook_messenger/car.png and b/public/images/emoji/facebook_messenger/car.png differ
diff --git a/public/images/emoji/facebook_messenger/card_box.png b/public/images/emoji/facebook_messenger/card_box.png
index 5f2766de915..9090e436a3d 100644
Binary files a/public/images/emoji/facebook_messenger/card_box.png and b/public/images/emoji/facebook_messenger/card_box.png differ
diff --git a/public/images/emoji/facebook_messenger/card_file_box.png b/public/images/emoji/facebook_messenger/card_file_box.png
index 5f2766de915..9090e436a3d 100644
Binary files a/public/images/emoji/facebook_messenger/card_file_box.png and b/public/images/emoji/facebook_messenger/card_file_box.png differ
diff --git a/public/images/emoji/facebook_messenger/card_index.png b/public/images/emoji/facebook_messenger/card_index.png
index b608bb66a14..5083f6735c3 100644
Binary files a/public/images/emoji/facebook_messenger/card_index.png and b/public/images/emoji/facebook_messenger/card_index.png differ
diff --git a/public/images/emoji/facebook_messenger/card_index_dividers.png b/public/images/emoji/facebook_messenger/card_index_dividers.png
index b1e27091c92..8df2040c735 100644
Binary files a/public/images/emoji/facebook_messenger/card_index_dividers.png and b/public/images/emoji/facebook_messenger/card_index_dividers.png differ
diff --git a/public/images/emoji/facebook_messenger/caribbean_netherlands.png b/public/images/emoji/facebook_messenger/caribbean_netherlands.png
index 7780a4a0367..7b0a02ff572 100644
Binary files a/public/images/emoji/facebook_messenger/caribbean_netherlands.png and b/public/images/emoji/facebook_messenger/caribbean_netherlands.png differ
diff --git a/public/images/emoji/facebook_messenger/carousel_horse.png b/public/images/emoji/facebook_messenger/carousel_horse.png
index 66a3f29830c..94d5d288c45 100644
Binary files a/public/images/emoji/facebook_messenger/carousel_horse.png and b/public/images/emoji/facebook_messenger/carousel_horse.png differ
diff --git a/public/images/emoji/facebook_messenger/carrot.png b/public/images/emoji/facebook_messenger/carrot.png
index 939b6874ea3..02b18cec6d2 100644
Binary files a/public/images/emoji/facebook_messenger/carrot.png and b/public/images/emoji/facebook_messenger/carrot.png differ
diff --git a/public/images/emoji/facebook_messenger/cat.png b/public/images/emoji/facebook_messenger/cat.png
index bcbd9a26d2b..f27d90591ce 100644
Binary files a/public/images/emoji/facebook_messenger/cat.png and b/public/images/emoji/facebook_messenger/cat.png differ
diff --git a/public/images/emoji/facebook_messenger/cat2.png b/public/images/emoji/facebook_messenger/cat2.png
index 9c7f4536bfe..7002c9d87c9 100644
Binary files a/public/images/emoji/facebook_messenger/cat2.png and b/public/images/emoji/facebook_messenger/cat2.png differ
diff --git a/public/images/emoji/facebook_messenger/cayman_islands.png b/public/images/emoji/facebook_messenger/cayman_islands.png
index 70d8309d8c6..086ac829fe0 100644
Binary files a/public/images/emoji/facebook_messenger/cayman_islands.png and b/public/images/emoji/facebook_messenger/cayman_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/cd.png b/public/images/emoji/facebook_messenger/cd.png
index 411ec9a7a10..f01b522c8c4 100644
Binary files a/public/images/emoji/facebook_messenger/cd.png and b/public/images/emoji/facebook_messenger/cd.png differ
diff --git a/public/images/emoji/facebook_messenger/central_african_republic.png b/public/images/emoji/facebook_messenger/central_african_republic.png
index a344cb3ae87..7cc5e769c7c 100644
Binary files a/public/images/emoji/facebook_messenger/central_african_republic.png and b/public/images/emoji/facebook_messenger/central_african_republic.png differ
diff --git a/public/images/emoji/facebook_messenger/ceuta_and_melilla.png b/public/images/emoji/facebook_messenger/ceuta_and_melilla.png
index e0da30d5a6c..5d2f27537fd 100644
Binary files a/public/images/emoji/facebook_messenger/ceuta_and_melilla.png and b/public/images/emoji/facebook_messenger/ceuta_and_melilla.png differ
diff --git a/public/images/emoji/facebook_messenger/chad.png b/public/images/emoji/facebook_messenger/chad.png
index 26b77c821c1..e8452a8acf4 100644
Binary files a/public/images/emoji/facebook_messenger/chad.png and b/public/images/emoji/facebook_messenger/chad.png differ
diff --git a/public/images/emoji/facebook_messenger/chains.png b/public/images/emoji/facebook_messenger/chains.png
index 610d0e4734b..1d9343f2c9c 100644
Binary files a/public/images/emoji/facebook_messenger/chains.png and b/public/images/emoji/facebook_messenger/chains.png differ
diff --git a/public/images/emoji/facebook_messenger/champagne.png b/public/images/emoji/facebook_messenger/champagne.png
index 49ea37f3899..428019d3823 100644
Binary files a/public/images/emoji/facebook_messenger/champagne.png and b/public/images/emoji/facebook_messenger/champagne.png differ
diff --git a/public/images/emoji/facebook_messenger/chart.png b/public/images/emoji/facebook_messenger/chart.png
index 5d933361d5c..a14b1cb1ca6 100644
Binary files a/public/images/emoji/facebook_messenger/chart.png and b/public/images/emoji/facebook_messenger/chart.png differ
diff --git a/public/images/emoji/facebook_messenger/chart_with_downwards_trend.png b/public/images/emoji/facebook_messenger/chart_with_downwards_trend.png
index be24239508c..ad71c303991 100644
Binary files a/public/images/emoji/facebook_messenger/chart_with_downwards_trend.png and b/public/images/emoji/facebook_messenger/chart_with_downwards_trend.png differ
diff --git a/public/images/emoji/facebook_messenger/chart_with_upwards_trend.png b/public/images/emoji/facebook_messenger/chart_with_upwards_trend.png
index 6e8de585ec9..93230e3ca2f 100644
Binary files a/public/images/emoji/facebook_messenger/chart_with_upwards_trend.png and b/public/images/emoji/facebook_messenger/chart_with_upwards_trend.png differ
diff --git a/public/images/emoji/facebook_messenger/checkered_flag.png b/public/images/emoji/facebook_messenger/checkered_flag.png
index 1c819a0386f..518e7feebec 100644
Binary files a/public/images/emoji/facebook_messenger/checkered_flag.png and b/public/images/emoji/facebook_messenger/checkered_flag.png differ
diff --git a/public/images/emoji/facebook_messenger/cheese.png b/public/images/emoji/facebook_messenger/cheese.png
index c3a4b402b18..d4aaac5dc6c 100644
Binary files a/public/images/emoji/facebook_messenger/cheese.png and b/public/images/emoji/facebook_messenger/cheese.png differ
diff --git a/public/images/emoji/facebook_messenger/cheese_wedge.png b/public/images/emoji/facebook_messenger/cheese_wedge.png
index c3a4b402b18..d4aaac5dc6c 100644
Binary files a/public/images/emoji/facebook_messenger/cheese_wedge.png and b/public/images/emoji/facebook_messenger/cheese_wedge.png differ
diff --git a/public/images/emoji/facebook_messenger/cherries.png b/public/images/emoji/facebook_messenger/cherries.png
index 5a700ed9d89..3cbc7a6f35a 100644
Binary files a/public/images/emoji/facebook_messenger/cherries.png and b/public/images/emoji/facebook_messenger/cherries.png differ
diff --git a/public/images/emoji/facebook_messenger/cherry_blossom.png b/public/images/emoji/facebook_messenger/cherry_blossom.png
index 16bf728cdd0..7ed25a03baf 100644
Binary files a/public/images/emoji/facebook_messenger/cherry_blossom.png and b/public/images/emoji/facebook_messenger/cherry_blossom.png differ
diff --git a/public/images/emoji/facebook_messenger/chestnut.png b/public/images/emoji/facebook_messenger/chestnut.png
index 1f50ca97131..a93a2af0f8d 100644
Binary files a/public/images/emoji/facebook_messenger/chestnut.png and b/public/images/emoji/facebook_messenger/chestnut.png differ
diff --git a/public/images/emoji/facebook_messenger/chicken.png b/public/images/emoji/facebook_messenger/chicken.png
index a87033991a9..ec3d58893dd 100644
Binary files a/public/images/emoji/facebook_messenger/chicken.png and b/public/images/emoji/facebook_messenger/chicken.png differ
diff --git a/public/images/emoji/facebook_messenger/child.png b/public/images/emoji/facebook_messenger/child.png
index 33e50494a3a..5f8b2383ddf 100644
Binary files a/public/images/emoji/facebook_messenger/child.png and b/public/images/emoji/facebook_messenger/child.png differ
diff --git a/public/images/emoji/facebook_messenger/child/2.png b/public/images/emoji/facebook_messenger/child/2.png
index 7a0e4f1cb75..47736506ff5 100644
Binary files a/public/images/emoji/facebook_messenger/child/2.png and b/public/images/emoji/facebook_messenger/child/2.png differ
diff --git a/public/images/emoji/facebook_messenger/child/3.png b/public/images/emoji/facebook_messenger/child/3.png
index 81a69110e9d..e349306585b 100644
Binary files a/public/images/emoji/facebook_messenger/child/3.png and b/public/images/emoji/facebook_messenger/child/3.png differ
diff --git a/public/images/emoji/facebook_messenger/child/4.png b/public/images/emoji/facebook_messenger/child/4.png
index b5c64c9cc84..78636a33ec5 100644
Binary files a/public/images/emoji/facebook_messenger/child/4.png and b/public/images/emoji/facebook_messenger/child/4.png differ
diff --git a/public/images/emoji/facebook_messenger/child/5.png b/public/images/emoji/facebook_messenger/child/5.png
index 0763a8bd94c..eeaf9608f1c 100644
Binary files a/public/images/emoji/facebook_messenger/child/5.png and b/public/images/emoji/facebook_messenger/child/5.png differ
diff --git a/public/images/emoji/facebook_messenger/child/6.png b/public/images/emoji/facebook_messenger/child/6.png
index 3ed705b9025..6389e29f731 100644
Binary files a/public/images/emoji/facebook_messenger/child/6.png and b/public/images/emoji/facebook_messenger/child/6.png differ
diff --git a/public/images/emoji/facebook_messenger/children_crossing.png b/public/images/emoji/facebook_messenger/children_crossing.png
index 10479dbe19c..e08351b44c5 100644
Binary files a/public/images/emoji/facebook_messenger/children_crossing.png and b/public/images/emoji/facebook_messenger/children_crossing.png differ
diff --git a/public/images/emoji/facebook_messenger/chile.png b/public/images/emoji/facebook_messenger/chile.png
index e150c074788..f52a03a2ea4 100644
Binary files a/public/images/emoji/facebook_messenger/chile.png and b/public/images/emoji/facebook_messenger/chile.png differ
diff --git a/public/images/emoji/facebook_messenger/chipmunk.png b/public/images/emoji/facebook_messenger/chipmunk.png
index e46b2790d62..92d32c95cbe 100644
Binary files a/public/images/emoji/facebook_messenger/chipmunk.png and b/public/images/emoji/facebook_messenger/chipmunk.png differ
diff --git a/public/images/emoji/facebook_messenger/chocolate_bar.png b/public/images/emoji/facebook_messenger/chocolate_bar.png
index 8efd86eddf8..137a7efd319 100644
Binary files a/public/images/emoji/facebook_messenger/chocolate_bar.png and b/public/images/emoji/facebook_messenger/chocolate_bar.png differ
diff --git a/public/images/emoji/facebook_messenger/chopsticks.png b/public/images/emoji/facebook_messenger/chopsticks.png
index 57064202979..cbc90cf9809 100644
Binary files a/public/images/emoji/facebook_messenger/chopsticks.png and b/public/images/emoji/facebook_messenger/chopsticks.png differ
diff --git a/public/images/emoji/facebook_messenger/christmas_island.png b/public/images/emoji/facebook_messenger/christmas_island.png
index 6958b7d8d8f..bd3bd24ac9b 100644
Binary files a/public/images/emoji/facebook_messenger/christmas_island.png and b/public/images/emoji/facebook_messenger/christmas_island.png differ
diff --git a/public/images/emoji/facebook_messenger/christmas_tree.png b/public/images/emoji/facebook_messenger/christmas_tree.png
index ce421a823fc..8708c9f8c69 100644
Binary files a/public/images/emoji/facebook_messenger/christmas_tree.png and b/public/images/emoji/facebook_messenger/christmas_tree.png differ
diff --git a/public/images/emoji/facebook_messenger/church.png b/public/images/emoji/facebook_messenger/church.png
index e365f1b5d76..19930de136e 100644
Binary files a/public/images/emoji/facebook_messenger/church.png and b/public/images/emoji/facebook_messenger/church.png differ
diff --git a/public/images/emoji/facebook_messenger/cinema.png b/public/images/emoji/facebook_messenger/cinema.png
index 64864074f2e..294d9904395 100644
Binary files a/public/images/emoji/facebook_messenger/cinema.png and b/public/images/emoji/facebook_messenger/cinema.png differ
diff --git a/public/images/emoji/facebook_messenger/circus_tent.png b/public/images/emoji/facebook_messenger/circus_tent.png
index 6fafd2ced01..255c1f6c979 100644
Binary files a/public/images/emoji/facebook_messenger/circus_tent.png and b/public/images/emoji/facebook_messenger/circus_tent.png differ
diff --git a/public/images/emoji/facebook_messenger/city_dusk.png b/public/images/emoji/facebook_messenger/city_dusk.png
index 75c2bb97d65..82ef3e31cb0 100644
Binary files a/public/images/emoji/facebook_messenger/city_dusk.png and b/public/images/emoji/facebook_messenger/city_dusk.png differ
diff --git a/public/images/emoji/facebook_messenger/city_sunrise.png b/public/images/emoji/facebook_messenger/city_sunrise.png
index 41b4c09ddcd..7733873a9d3 100644
Binary files a/public/images/emoji/facebook_messenger/city_sunrise.png and b/public/images/emoji/facebook_messenger/city_sunrise.png differ
diff --git a/public/images/emoji/facebook_messenger/city_sunset.png b/public/images/emoji/facebook_messenger/city_sunset.png
index 75c2bb97d65..82ef3e31cb0 100644
Binary files a/public/images/emoji/facebook_messenger/city_sunset.png and b/public/images/emoji/facebook_messenger/city_sunset.png differ
diff --git a/public/images/emoji/facebook_messenger/cityscape.png b/public/images/emoji/facebook_messenger/cityscape.png
index 24bcea239ba..8fe74129971 100644
Binary files a/public/images/emoji/facebook_messenger/cityscape.png and b/public/images/emoji/facebook_messenger/cityscape.png differ
diff --git a/public/images/emoji/facebook_messenger/cl.png b/public/images/emoji/facebook_messenger/cl.png
index c3ea87fdbe3..9fb3fddb97f 100644
Binary files a/public/images/emoji/facebook_messenger/cl.png and b/public/images/emoji/facebook_messenger/cl.png differ
diff --git a/public/images/emoji/facebook_messenger/clamp.png b/public/images/emoji/facebook_messenger/clamp.png
index e17edcfc70e..c10411d5bd1 100644
Binary files a/public/images/emoji/facebook_messenger/clamp.png and b/public/images/emoji/facebook_messenger/clamp.png differ
diff --git a/public/images/emoji/facebook_messenger/clap.png b/public/images/emoji/facebook_messenger/clap.png
index 40529017634..4c10caf428f 100644
Binary files a/public/images/emoji/facebook_messenger/clap.png and b/public/images/emoji/facebook_messenger/clap.png differ
diff --git a/public/images/emoji/facebook_messenger/clap/2.png b/public/images/emoji/facebook_messenger/clap/2.png
index a60881e1075..f1962537692 100644
Binary files a/public/images/emoji/facebook_messenger/clap/2.png and b/public/images/emoji/facebook_messenger/clap/2.png differ
diff --git a/public/images/emoji/facebook_messenger/clap/3.png b/public/images/emoji/facebook_messenger/clap/3.png
index 44e6d82998a..f1962537692 100644
Binary files a/public/images/emoji/facebook_messenger/clap/3.png and b/public/images/emoji/facebook_messenger/clap/3.png differ
diff --git a/public/images/emoji/facebook_messenger/clap/4.png b/public/images/emoji/facebook_messenger/clap/4.png
index d01e802f640..44b1d65fc5e 100644
Binary files a/public/images/emoji/facebook_messenger/clap/4.png and b/public/images/emoji/facebook_messenger/clap/4.png differ
diff --git a/public/images/emoji/facebook_messenger/clap/5.png b/public/images/emoji/facebook_messenger/clap/5.png
index a08c620dd77..98c8e532952 100644
Binary files a/public/images/emoji/facebook_messenger/clap/5.png and b/public/images/emoji/facebook_messenger/clap/5.png differ
diff --git a/public/images/emoji/facebook_messenger/clap/6.png b/public/images/emoji/facebook_messenger/clap/6.png
index 55a4e45e2b0..907060335df 100644
Binary files a/public/images/emoji/facebook_messenger/clap/6.png and b/public/images/emoji/facebook_messenger/clap/6.png differ
diff --git a/public/images/emoji/facebook_messenger/clapper.png b/public/images/emoji/facebook_messenger/clapper.png
index 5024b9412d9..fa560c7bc46 100644
Binary files a/public/images/emoji/facebook_messenger/clapper.png and b/public/images/emoji/facebook_messenger/clapper.png differ
diff --git a/public/images/emoji/facebook_messenger/classical_building.png b/public/images/emoji/facebook_messenger/classical_building.png
index 00dfbe29d32..23ed0b02877 100644
Binary files a/public/images/emoji/facebook_messenger/classical_building.png and b/public/images/emoji/facebook_messenger/classical_building.png differ
diff --git a/public/images/emoji/facebook_messenger/clinking_glasses.png b/public/images/emoji/facebook_messenger/clinking_glasses.png
index 1b24d16ae00..95a68131c82 100644
Binary files a/public/images/emoji/facebook_messenger/clinking_glasses.png and b/public/images/emoji/facebook_messenger/clinking_glasses.png differ
diff --git a/public/images/emoji/facebook_messenger/clipboard.png b/public/images/emoji/facebook_messenger/clipboard.png
index 8159f1d4d58..75f931105e1 100644
Binary files a/public/images/emoji/facebook_messenger/clipboard.png and b/public/images/emoji/facebook_messenger/clipboard.png differ
diff --git a/public/images/emoji/facebook_messenger/clipperton_island.png b/public/images/emoji/facebook_messenger/clipperton_island.png
index 7943b73f671..2ef71d792ab 100644
Binary files a/public/images/emoji/facebook_messenger/clipperton_island.png and b/public/images/emoji/facebook_messenger/clipperton_island.png differ
diff --git a/public/images/emoji/facebook_messenger/clock.png b/public/images/emoji/facebook_messenger/clock.png
index 62a0e894592..78008e45b65 100644
Binary files a/public/images/emoji/facebook_messenger/clock.png and b/public/images/emoji/facebook_messenger/clock.png differ
diff --git a/public/images/emoji/facebook_messenger/clock1.png b/public/images/emoji/facebook_messenger/clock1.png
index 54ab69b0e96..d2fe7a734f8 100644
Binary files a/public/images/emoji/facebook_messenger/clock1.png and b/public/images/emoji/facebook_messenger/clock1.png differ
diff --git a/public/images/emoji/facebook_messenger/clock10.png b/public/images/emoji/facebook_messenger/clock10.png
index b584c2d3817..c29bb23b17e 100644
Binary files a/public/images/emoji/facebook_messenger/clock10.png and b/public/images/emoji/facebook_messenger/clock10.png differ
diff --git a/public/images/emoji/facebook_messenger/clock1030.png b/public/images/emoji/facebook_messenger/clock1030.png
index bff9bd0f0a8..3820f6c771b 100644
Binary files a/public/images/emoji/facebook_messenger/clock1030.png and b/public/images/emoji/facebook_messenger/clock1030.png differ
diff --git a/public/images/emoji/facebook_messenger/clock11.png b/public/images/emoji/facebook_messenger/clock11.png
index d2bf76b159a..28e8a3fa9df 100644
Binary files a/public/images/emoji/facebook_messenger/clock11.png and b/public/images/emoji/facebook_messenger/clock11.png differ
diff --git a/public/images/emoji/facebook_messenger/clock1130.png b/public/images/emoji/facebook_messenger/clock1130.png
index 252f51565e1..d09766e18c5 100644
Binary files a/public/images/emoji/facebook_messenger/clock1130.png and b/public/images/emoji/facebook_messenger/clock1130.png differ
diff --git a/public/images/emoji/facebook_messenger/clock12.png b/public/images/emoji/facebook_messenger/clock12.png
index 067c79fbe32..1e2ebb6b7e4 100644
Binary files a/public/images/emoji/facebook_messenger/clock12.png and b/public/images/emoji/facebook_messenger/clock12.png differ
diff --git a/public/images/emoji/facebook_messenger/clock1230.png b/public/images/emoji/facebook_messenger/clock1230.png
index b50c5854305..af50bf9da1e 100644
Binary files a/public/images/emoji/facebook_messenger/clock1230.png and b/public/images/emoji/facebook_messenger/clock1230.png differ
diff --git a/public/images/emoji/facebook_messenger/clock130.png b/public/images/emoji/facebook_messenger/clock130.png
index 44a6ef348ac..4a40410585d 100644
Binary files a/public/images/emoji/facebook_messenger/clock130.png and b/public/images/emoji/facebook_messenger/clock130.png differ
diff --git a/public/images/emoji/facebook_messenger/clock2.png b/public/images/emoji/facebook_messenger/clock2.png
index 1abb0b3dcfe..22005744058 100644
Binary files a/public/images/emoji/facebook_messenger/clock2.png and b/public/images/emoji/facebook_messenger/clock2.png differ
diff --git a/public/images/emoji/facebook_messenger/clock230.png b/public/images/emoji/facebook_messenger/clock230.png
index e36cfd6faf2..0b754503184 100644
Binary files a/public/images/emoji/facebook_messenger/clock230.png and b/public/images/emoji/facebook_messenger/clock230.png differ
diff --git a/public/images/emoji/facebook_messenger/clock3.png b/public/images/emoji/facebook_messenger/clock3.png
index 3818ab1cbb7..c06ab4efdf0 100644
Binary files a/public/images/emoji/facebook_messenger/clock3.png and b/public/images/emoji/facebook_messenger/clock3.png differ
diff --git a/public/images/emoji/facebook_messenger/clock330.png b/public/images/emoji/facebook_messenger/clock330.png
index c6631cdc263..f2227efb444 100644
Binary files a/public/images/emoji/facebook_messenger/clock330.png and b/public/images/emoji/facebook_messenger/clock330.png differ
diff --git a/public/images/emoji/facebook_messenger/clock4.png b/public/images/emoji/facebook_messenger/clock4.png
index ebc3cfd4ded..ab02a47af13 100644
Binary files a/public/images/emoji/facebook_messenger/clock4.png and b/public/images/emoji/facebook_messenger/clock4.png differ
diff --git a/public/images/emoji/facebook_messenger/clock430.png b/public/images/emoji/facebook_messenger/clock430.png
index bf513491300..983319af15f 100644
Binary files a/public/images/emoji/facebook_messenger/clock430.png and b/public/images/emoji/facebook_messenger/clock430.png differ
diff --git a/public/images/emoji/facebook_messenger/clock5.png b/public/images/emoji/facebook_messenger/clock5.png
index ea2c4adcbcb..85df9f23b2d 100644
Binary files a/public/images/emoji/facebook_messenger/clock5.png and b/public/images/emoji/facebook_messenger/clock5.png differ
diff --git a/public/images/emoji/facebook_messenger/clock530.png b/public/images/emoji/facebook_messenger/clock530.png
index 77fba2691e4..445e19120bc 100644
Binary files a/public/images/emoji/facebook_messenger/clock530.png and b/public/images/emoji/facebook_messenger/clock530.png differ
diff --git a/public/images/emoji/facebook_messenger/clock6.png b/public/images/emoji/facebook_messenger/clock6.png
index af72ddd43a5..f0d0abde11e 100644
Binary files a/public/images/emoji/facebook_messenger/clock6.png and b/public/images/emoji/facebook_messenger/clock6.png differ
diff --git a/public/images/emoji/facebook_messenger/clock630.png b/public/images/emoji/facebook_messenger/clock630.png
index 4dff8b77570..ff6e85b7fae 100644
Binary files a/public/images/emoji/facebook_messenger/clock630.png and b/public/images/emoji/facebook_messenger/clock630.png differ
diff --git a/public/images/emoji/facebook_messenger/clock7.png b/public/images/emoji/facebook_messenger/clock7.png
index b3a11943912..eabd472dcbe 100644
Binary files a/public/images/emoji/facebook_messenger/clock7.png and b/public/images/emoji/facebook_messenger/clock7.png differ
diff --git a/public/images/emoji/facebook_messenger/clock730.png b/public/images/emoji/facebook_messenger/clock730.png
index f52c3608984..bf655fee5ee 100644
Binary files a/public/images/emoji/facebook_messenger/clock730.png and b/public/images/emoji/facebook_messenger/clock730.png differ
diff --git a/public/images/emoji/facebook_messenger/clock8.png b/public/images/emoji/facebook_messenger/clock8.png
index 505234ede54..fc1f2059878 100644
Binary files a/public/images/emoji/facebook_messenger/clock8.png and b/public/images/emoji/facebook_messenger/clock8.png differ
diff --git a/public/images/emoji/facebook_messenger/clock830.png b/public/images/emoji/facebook_messenger/clock830.png
index c3ff77cd7fa..e6c8c9ece94 100644
Binary files a/public/images/emoji/facebook_messenger/clock830.png and b/public/images/emoji/facebook_messenger/clock830.png differ
diff --git a/public/images/emoji/facebook_messenger/clock9.png b/public/images/emoji/facebook_messenger/clock9.png
index 972becb6d47..b650d63c031 100644
Binary files a/public/images/emoji/facebook_messenger/clock9.png and b/public/images/emoji/facebook_messenger/clock9.png differ
diff --git a/public/images/emoji/facebook_messenger/clock930.png b/public/images/emoji/facebook_messenger/clock930.png
index 8ec20ac7dc6..bdcf428fe0b 100644
Binary files a/public/images/emoji/facebook_messenger/clock930.png and b/public/images/emoji/facebook_messenger/clock930.png differ
diff --git a/public/images/emoji/facebook_messenger/closed_book.png b/public/images/emoji/facebook_messenger/closed_book.png
index ddf42b7ab7a..ea4dfba9181 100644
Binary files a/public/images/emoji/facebook_messenger/closed_book.png and b/public/images/emoji/facebook_messenger/closed_book.png differ
diff --git a/public/images/emoji/facebook_messenger/closed_lock_with_key.png b/public/images/emoji/facebook_messenger/closed_lock_with_key.png
index 7ef1a8ab5ea..696082fe3e9 100644
Binary files a/public/images/emoji/facebook_messenger/closed_lock_with_key.png and b/public/images/emoji/facebook_messenger/closed_lock_with_key.png differ
diff --git a/public/images/emoji/facebook_messenger/closed_umbrella.png b/public/images/emoji/facebook_messenger/closed_umbrella.png
index 680ef4cd1ea..2c419306b3f 100644
Binary files a/public/images/emoji/facebook_messenger/closed_umbrella.png and b/public/images/emoji/facebook_messenger/closed_umbrella.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud.png b/public/images/emoji/facebook_messenger/cloud.png
index 8f1746d0759..0cdcd5e3f68 100644
Binary files a/public/images/emoji/facebook_messenger/cloud.png and b/public/images/emoji/facebook_messenger/cloud.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud_lightning.png b/public/images/emoji/facebook_messenger/cloud_lightning.png
index f45cd421995..0bce1c26154 100644
Binary files a/public/images/emoji/facebook_messenger/cloud_lightning.png and b/public/images/emoji/facebook_messenger/cloud_lightning.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud_rain.png b/public/images/emoji/facebook_messenger/cloud_rain.png
index ffd91a25b44..22c872b509a 100644
Binary files a/public/images/emoji/facebook_messenger/cloud_rain.png and b/public/images/emoji/facebook_messenger/cloud_rain.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud_snow.png b/public/images/emoji/facebook_messenger/cloud_snow.png
index 24834e2de3c..c3b2df96579 100644
Binary files a/public/images/emoji/facebook_messenger/cloud_snow.png and b/public/images/emoji/facebook_messenger/cloud_snow.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud_tornado.png b/public/images/emoji/facebook_messenger/cloud_tornado.png
index fd843824ed3..2de8ec4a694 100644
Binary files a/public/images/emoji/facebook_messenger/cloud_tornado.png and b/public/images/emoji/facebook_messenger/cloud_tornado.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud_with_lightning.png b/public/images/emoji/facebook_messenger/cloud_with_lightning.png
index f45cd421995..0bce1c26154 100644
Binary files a/public/images/emoji/facebook_messenger/cloud_with_lightning.png and b/public/images/emoji/facebook_messenger/cloud_with_lightning.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud_with_lightning_and_rain.png b/public/images/emoji/facebook_messenger/cloud_with_lightning_and_rain.png
index be44d531a75..943482554f5 100644
Binary files a/public/images/emoji/facebook_messenger/cloud_with_lightning_and_rain.png and b/public/images/emoji/facebook_messenger/cloud_with_lightning_and_rain.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud_with_rain.png b/public/images/emoji/facebook_messenger/cloud_with_rain.png
index ffd91a25b44..22c872b509a 100644
Binary files a/public/images/emoji/facebook_messenger/cloud_with_rain.png and b/public/images/emoji/facebook_messenger/cloud_with_rain.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud_with_snow.png b/public/images/emoji/facebook_messenger/cloud_with_snow.png
index 24834e2de3c..c3b2df96579 100644
Binary files a/public/images/emoji/facebook_messenger/cloud_with_snow.png and b/public/images/emoji/facebook_messenger/cloud_with_snow.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud_with_tornado.png b/public/images/emoji/facebook_messenger/cloud_with_tornado.png
index fd843824ed3..2de8ec4a694 100644
Binary files a/public/images/emoji/facebook_messenger/cloud_with_tornado.png and b/public/images/emoji/facebook_messenger/cloud_with_tornado.png differ
diff --git a/public/images/emoji/facebook_messenger/clown_face.png b/public/images/emoji/facebook_messenger/clown_face.png
index c78134fdee3..dafd3b5c0d8 100644
Binary files a/public/images/emoji/facebook_messenger/clown_face.png and b/public/images/emoji/facebook_messenger/clown_face.png differ
diff --git a/public/images/emoji/facebook_messenger/clubs.png b/public/images/emoji/facebook_messenger/clubs.png
index e0889a39fd3..993580971fe 100644
Binary files a/public/images/emoji/facebook_messenger/clubs.png and b/public/images/emoji/facebook_messenger/clubs.png differ
diff --git a/public/images/emoji/facebook_messenger/cn.png b/public/images/emoji/facebook_messenger/cn.png
index a9325fc771c..ddad4d83158 100644
Binary files a/public/images/emoji/facebook_messenger/cn.png and b/public/images/emoji/facebook_messenger/cn.png differ
diff --git a/public/images/emoji/facebook_messenger/coat.png b/public/images/emoji/facebook_messenger/coat.png
index c409f9f4c4c..d7a1a07d05c 100644
Binary files a/public/images/emoji/facebook_messenger/coat.png and b/public/images/emoji/facebook_messenger/coat.png differ
diff --git a/public/images/emoji/facebook_messenger/cocktail.png b/public/images/emoji/facebook_messenger/cocktail.png
index 7226b15e04b..9231d1c0100 100644
Binary files a/public/images/emoji/facebook_messenger/cocktail.png and b/public/images/emoji/facebook_messenger/cocktail.png differ
diff --git a/public/images/emoji/facebook_messenger/coconut.png b/public/images/emoji/facebook_messenger/coconut.png
index e76b533149f..5c0ddcf15bb 100644
Binary files a/public/images/emoji/facebook_messenger/coconut.png and b/public/images/emoji/facebook_messenger/coconut.png differ
diff --git a/public/images/emoji/facebook_messenger/cocos_islands.png b/public/images/emoji/facebook_messenger/cocos_islands.png
index c9025e34e4b..8aaf9f3d82a 100644
Binary files a/public/images/emoji/facebook_messenger/cocos_islands.png and b/public/images/emoji/facebook_messenger/cocos_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/coffee.png b/public/images/emoji/facebook_messenger/coffee.png
index 00f0517ca5c..7b032b193cd 100644
Binary files a/public/images/emoji/facebook_messenger/coffee.png and b/public/images/emoji/facebook_messenger/coffee.png differ
diff --git a/public/images/emoji/facebook_messenger/coffin.png b/public/images/emoji/facebook_messenger/coffin.png
index cbf6ba5696d..311c61cbfef 100644
Binary files a/public/images/emoji/facebook_messenger/coffin.png and b/public/images/emoji/facebook_messenger/coffin.png differ
diff --git a/public/images/emoji/facebook_messenger/cold_sweat.png b/public/images/emoji/facebook_messenger/cold_sweat.png
index aef91ca8523..35b8bb68619 100644
Binary files a/public/images/emoji/facebook_messenger/cold_sweat.png and b/public/images/emoji/facebook_messenger/cold_sweat.png differ
diff --git a/public/images/emoji/facebook_messenger/colombia.png b/public/images/emoji/facebook_messenger/colombia.png
index f8ac0baf8bd..ff797a76310 100644
Binary files a/public/images/emoji/facebook_messenger/colombia.png and b/public/images/emoji/facebook_messenger/colombia.png differ
diff --git a/public/images/emoji/facebook_messenger/comet.png b/public/images/emoji/facebook_messenger/comet.png
index fceafe31e07..13f4a3e1f78 100644
Binary files a/public/images/emoji/facebook_messenger/comet.png and b/public/images/emoji/facebook_messenger/comet.png differ
diff --git a/public/images/emoji/facebook_messenger/comoros.png b/public/images/emoji/facebook_messenger/comoros.png
index e765f507156..443a8fb64fe 100644
Binary files a/public/images/emoji/facebook_messenger/comoros.png and b/public/images/emoji/facebook_messenger/comoros.png differ
diff --git a/public/images/emoji/facebook_messenger/compression.png b/public/images/emoji/facebook_messenger/compression.png
index e17edcfc70e..c10411d5bd1 100644
Binary files a/public/images/emoji/facebook_messenger/compression.png and b/public/images/emoji/facebook_messenger/compression.png differ
diff --git a/public/images/emoji/facebook_messenger/computer.png b/public/images/emoji/facebook_messenger/computer.png
index 16df1b45902..0444ab77d18 100644
Binary files a/public/images/emoji/facebook_messenger/computer.png and b/public/images/emoji/facebook_messenger/computer.png differ
diff --git a/public/images/emoji/facebook_messenger/computer_mouse.png b/public/images/emoji/facebook_messenger/computer_mouse.png
index 3a71c800c68..53fdef1f76f 100644
Binary files a/public/images/emoji/facebook_messenger/computer_mouse.png and b/public/images/emoji/facebook_messenger/computer_mouse.png differ
diff --git a/public/images/emoji/facebook_messenger/confetti_ball.png b/public/images/emoji/facebook_messenger/confetti_ball.png
index d198bb4654c..a814a64b1f3 100644
Binary files a/public/images/emoji/facebook_messenger/confetti_ball.png and b/public/images/emoji/facebook_messenger/confetti_ball.png differ
diff --git a/public/images/emoji/facebook_messenger/confounded.png b/public/images/emoji/facebook_messenger/confounded.png
index 556801a6c17..9113d51adff 100644
Binary files a/public/images/emoji/facebook_messenger/confounded.png and b/public/images/emoji/facebook_messenger/confounded.png differ
diff --git a/public/images/emoji/facebook_messenger/confused.png b/public/images/emoji/facebook_messenger/confused.png
index 8a37c428cb2..fda747e0ac6 100644
Binary files a/public/images/emoji/facebook_messenger/confused.png and b/public/images/emoji/facebook_messenger/confused.png differ
diff --git a/public/images/emoji/facebook_messenger/congo_brazzaville.png b/public/images/emoji/facebook_messenger/congo_brazzaville.png
index 2eef1d6c176..d2bfc4f6b8f 100644
Binary files a/public/images/emoji/facebook_messenger/congo_brazzaville.png and b/public/images/emoji/facebook_messenger/congo_brazzaville.png differ
diff --git a/public/images/emoji/facebook_messenger/congo_kinshasa.png b/public/images/emoji/facebook_messenger/congo_kinshasa.png
index a34af9d64a3..c3a26864c15 100644
Binary files a/public/images/emoji/facebook_messenger/congo_kinshasa.png and b/public/images/emoji/facebook_messenger/congo_kinshasa.png differ
diff --git a/public/images/emoji/facebook_messenger/congratulations.png b/public/images/emoji/facebook_messenger/congratulations.png
index eb88827ad02..9234bd13ae6 100644
Binary files a/public/images/emoji/facebook_messenger/congratulations.png and b/public/images/emoji/facebook_messenger/congratulations.png differ
diff --git a/public/images/emoji/facebook_messenger/construction.png b/public/images/emoji/facebook_messenger/construction.png
index 5d09fb084fc..b4bbfc71513 100644
Binary files a/public/images/emoji/facebook_messenger/construction.png and b/public/images/emoji/facebook_messenger/construction.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_site.png b/public/images/emoji/facebook_messenger/construction_site.png
index 24cdec2e5fd..74cd30792b9 100644
Binary files a/public/images/emoji/facebook_messenger/construction_site.png and b/public/images/emoji/facebook_messenger/construction_site.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker.png b/public/images/emoji/facebook_messenger/construction_worker.png
index 5feb48f134f..df0e868cf3e 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker.png and b/public/images/emoji/facebook_messenger/construction_worker.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker/2.png b/public/images/emoji/facebook_messenger/construction_worker/2.png
index bd490932a39..9cfbbb85506 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker/2.png and b/public/images/emoji/facebook_messenger/construction_worker/2.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker/3.png b/public/images/emoji/facebook_messenger/construction_worker/3.png
index ff712fcd477..0b2de1f8024 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker/3.png and b/public/images/emoji/facebook_messenger/construction_worker/3.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker/4.png b/public/images/emoji/facebook_messenger/construction_worker/4.png
index e59a2e70386..6a9fd06961a 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker/4.png and b/public/images/emoji/facebook_messenger/construction_worker/4.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker/5.png b/public/images/emoji/facebook_messenger/construction_worker/5.png
index 95e6d6a842e..eaff63ea759 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker/5.png and b/public/images/emoji/facebook_messenger/construction_worker/5.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker/6.png b/public/images/emoji/facebook_messenger/construction_worker/6.png
index 721415e844e..0d997a9be5f 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker/6.png and b/public/images/emoji/facebook_messenger/construction_worker/6.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_man.png b/public/images/emoji/facebook_messenger/construction_worker_man.png
index 5feb48f134f..df0e868cf3e 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker_man.png and b/public/images/emoji/facebook_messenger/construction_worker_man.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_man/2.png b/public/images/emoji/facebook_messenger/construction_worker_man/2.png
index bd490932a39..9cfbbb85506 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker_man/2.png and b/public/images/emoji/facebook_messenger/construction_worker_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_man/3.png b/public/images/emoji/facebook_messenger/construction_worker_man/3.png
index ff712fcd477..0b2de1f8024 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker_man/3.png and b/public/images/emoji/facebook_messenger/construction_worker_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_man/4.png b/public/images/emoji/facebook_messenger/construction_worker_man/4.png
index e59a2e70386..6a9fd06961a 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker_man/4.png and b/public/images/emoji/facebook_messenger/construction_worker_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_man/5.png b/public/images/emoji/facebook_messenger/construction_worker_man/5.png
index 95e6d6a842e..eaff63ea759 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker_man/5.png and b/public/images/emoji/facebook_messenger/construction_worker_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_man/6.png b/public/images/emoji/facebook_messenger/construction_worker_man/6.png
index 721415e844e..0d997a9be5f 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker_man/6.png and b/public/images/emoji/facebook_messenger/construction_worker_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_woman.png b/public/images/emoji/facebook_messenger/construction_worker_woman.png
index 79632626060..c5299dd7b9f 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker_woman.png and b/public/images/emoji/facebook_messenger/construction_worker_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_woman/2.png b/public/images/emoji/facebook_messenger/construction_worker_woman/2.png
index 63998c76ae0..547ad227644 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker_woman/2.png and b/public/images/emoji/facebook_messenger/construction_worker_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_woman/3.png b/public/images/emoji/facebook_messenger/construction_worker_woman/3.png
index 83eb2d87495..6ebc97eeab5 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker_woman/3.png and b/public/images/emoji/facebook_messenger/construction_worker_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_woman/4.png b/public/images/emoji/facebook_messenger/construction_worker_woman/4.png
index b518850876c..34942768743 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker_woman/4.png and b/public/images/emoji/facebook_messenger/construction_worker_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_woman/5.png b/public/images/emoji/facebook_messenger/construction_worker_woman/5.png
index 80eacbdd523..4bbc0d60d60 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker_woman/5.png and b/public/images/emoji/facebook_messenger/construction_worker_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_woman/6.png b/public/images/emoji/facebook_messenger/construction_worker_woman/6.png
index 34a1e9e2c0d..92b38dece71 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker_woman/6.png and b/public/images/emoji/facebook_messenger/construction_worker_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/control_knobs.png b/public/images/emoji/facebook_messenger/control_knobs.png
index 471e812ed30..102fea6aea8 100644
Binary files a/public/images/emoji/facebook_messenger/control_knobs.png and b/public/images/emoji/facebook_messenger/control_knobs.png differ
diff --git a/public/images/emoji/facebook_messenger/convenience_store.png b/public/images/emoji/facebook_messenger/convenience_store.png
index 7cf81e3889c..6cf8b990a98 100644
Binary files a/public/images/emoji/facebook_messenger/convenience_store.png and b/public/images/emoji/facebook_messenger/convenience_store.png differ
diff --git a/public/images/emoji/facebook_messenger/cook_islands.png b/public/images/emoji/facebook_messenger/cook_islands.png
index d1e4afbacae..f42617d6fd3 100644
Binary files a/public/images/emoji/facebook_messenger/cook_islands.png and b/public/images/emoji/facebook_messenger/cook_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/cookie.png b/public/images/emoji/facebook_messenger/cookie.png
index 5037c4bc648..69739eb017b 100644
Binary files a/public/images/emoji/facebook_messenger/cookie.png and b/public/images/emoji/facebook_messenger/cookie.png differ
diff --git a/public/images/emoji/facebook_messenger/cool.png b/public/images/emoji/facebook_messenger/cool.png
index 8e1dccf987e..d68afbc36ac 100644
Binary files a/public/images/emoji/facebook_messenger/cool.png and b/public/images/emoji/facebook_messenger/cool.png differ
diff --git a/public/images/emoji/facebook_messenger/cop.png b/public/images/emoji/facebook_messenger/cop.png
index 4efbb5500d1..089df5b5962 100644
Binary files a/public/images/emoji/facebook_messenger/cop.png and b/public/images/emoji/facebook_messenger/cop.png differ
diff --git a/public/images/emoji/facebook_messenger/cop/2.png b/public/images/emoji/facebook_messenger/cop/2.png
index 02f646d46fb..2bf0af607ad 100644
Binary files a/public/images/emoji/facebook_messenger/cop/2.png and b/public/images/emoji/facebook_messenger/cop/2.png differ
diff --git a/public/images/emoji/facebook_messenger/cop/3.png b/public/images/emoji/facebook_messenger/cop/3.png
index fc0d621ff81..0f03ba24e49 100644
Binary files a/public/images/emoji/facebook_messenger/cop/3.png and b/public/images/emoji/facebook_messenger/cop/3.png differ
diff --git a/public/images/emoji/facebook_messenger/cop/4.png b/public/images/emoji/facebook_messenger/cop/4.png
index 607565d83dd..f0fb4bd4d1d 100644
Binary files a/public/images/emoji/facebook_messenger/cop/4.png and b/public/images/emoji/facebook_messenger/cop/4.png differ
diff --git a/public/images/emoji/facebook_messenger/cop/5.png b/public/images/emoji/facebook_messenger/cop/5.png
index d54b5e01abd..bba1ef04c92 100644
Binary files a/public/images/emoji/facebook_messenger/cop/5.png and b/public/images/emoji/facebook_messenger/cop/5.png differ
diff --git a/public/images/emoji/facebook_messenger/cop/6.png b/public/images/emoji/facebook_messenger/cop/6.png
index cc17ff14df0..7b2ccb41094 100644
Binary files a/public/images/emoji/facebook_messenger/cop/6.png and b/public/images/emoji/facebook_messenger/cop/6.png differ
diff --git a/public/images/emoji/facebook_messenger/copyright.png b/public/images/emoji/facebook_messenger/copyright.png
index e7ed95e52ae..61cb4f64b6e 100644
Binary files a/public/images/emoji/facebook_messenger/copyright.png and b/public/images/emoji/facebook_messenger/copyright.png differ
diff --git a/public/images/emoji/facebook_messenger/corn.png b/public/images/emoji/facebook_messenger/corn.png
index 7d6bd73005b..e025602738b 100644
Binary files a/public/images/emoji/facebook_messenger/corn.png and b/public/images/emoji/facebook_messenger/corn.png differ
diff --git a/public/images/emoji/facebook_messenger/costa_rica.png b/public/images/emoji/facebook_messenger/costa_rica.png
index e6c16e4ea0b..3c8348c05c1 100644
Binary files a/public/images/emoji/facebook_messenger/costa_rica.png and b/public/images/emoji/facebook_messenger/costa_rica.png differ
diff --git a/public/images/emoji/facebook_messenger/cote_divoire.png b/public/images/emoji/facebook_messenger/cote_divoire.png
index c8e9c1eacef..29dd8bdb36f 100644
Binary files a/public/images/emoji/facebook_messenger/cote_divoire.png and b/public/images/emoji/facebook_messenger/cote_divoire.png differ
diff --git a/public/images/emoji/facebook_messenger/couch.png b/public/images/emoji/facebook_messenger/couch.png
index e46d4de8590..678c13d7339 100644
Binary files a/public/images/emoji/facebook_messenger/couch.png and b/public/images/emoji/facebook_messenger/couch.png differ
diff --git a/public/images/emoji/facebook_messenger/couch_and_lamp.png b/public/images/emoji/facebook_messenger/couch_and_lamp.png
index e46d4de8590..678c13d7339 100644
Binary files a/public/images/emoji/facebook_messenger/couch_and_lamp.png and b/public/images/emoji/facebook_messenger/couch_and_lamp.png differ
diff --git a/public/images/emoji/facebook_messenger/couple.png b/public/images/emoji/facebook_messenger/couple.png
index 955b98c386f..d30ab40ac95 100644
Binary files a/public/images/emoji/facebook_messenger/couple.png and b/public/images/emoji/facebook_messenger/couple.png differ
diff --git a/public/images/emoji/facebook_messenger/couple_with_heart.png b/public/images/emoji/facebook_messenger/couple_with_heart.png
index 30aa3b83291..00012f6fdc4 100644
Binary files a/public/images/emoji/facebook_messenger/couple_with_heart.png and b/public/images/emoji/facebook_messenger/couple_with_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/couple_with_heart_man_man.png b/public/images/emoji/facebook_messenger/couple_with_heart_man_man.png
index 8fcabbd4300..50c3f8f81fc 100644
Binary files a/public/images/emoji/facebook_messenger/couple_with_heart_man_man.png and b/public/images/emoji/facebook_messenger/couple_with_heart_man_man.png differ
diff --git a/public/images/emoji/facebook_messenger/couple_with_heart_woman_man.png b/public/images/emoji/facebook_messenger/couple_with_heart_woman_man.png
index 30aa3b83291..00012f6fdc4 100644
Binary files a/public/images/emoji/facebook_messenger/couple_with_heart_woman_man.png and b/public/images/emoji/facebook_messenger/couple_with_heart_woman_man.png differ
diff --git a/public/images/emoji/facebook_messenger/couple_with_heart_woman_woman.png b/public/images/emoji/facebook_messenger/couple_with_heart_woman_woman.png
index b82bbf04b49..ab3c64daed3 100644
Binary files a/public/images/emoji/facebook_messenger/couple_with_heart_woman_woman.png and b/public/images/emoji/facebook_messenger/couple_with_heart_woman_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/couplekiss.png b/public/images/emoji/facebook_messenger/couplekiss.png
index 07ab022382d..27f53aa0cd1 100644
Binary files a/public/images/emoji/facebook_messenger/couplekiss.png and b/public/images/emoji/facebook_messenger/couplekiss.png differ
diff --git a/public/images/emoji/facebook_messenger/couplekiss_man_man.png b/public/images/emoji/facebook_messenger/couplekiss_man_man.png
index 842c5a4e22d..e626b7eb92a 100644
Binary files a/public/images/emoji/facebook_messenger/couplekiss_man_man.png and b/public/images/emoji/facebook_messenger/couplekiss_man_man.png differ
diff --git a/public/images/emoji/facebook_messenger/couplekiss_man_woman.png b/public/images/emoji/facebook_messenger/couplekiss_man_woman.png
index 07ab022382d..27f53aa0cd1 100644
Binary files a/public/images/emoji/facebook_messenger/couplekiss_man_woman.png and b/public/images/emoji/facebook_messenger/couplekiss_man_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/couplekiss_woman_woman.png b/public/images/emoji/facebook_messenger/couplekiss_woman_woman.png
index 4f1324e09f1..cb33b1daf94 100644
Binary files a/public/images/emoji/facebook_messenger/couplekiss_woman_woman.png and b/public/images/emoji/facebook_messenger/couplekiss_woman_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/cow.png b/public/images/emoji/facebook_messenger/cow.png
index 21b6b7be8f4..03134a53004 100644
Binary files a/public/images/emoji/facebook_messenger/cow.png and b/public/images/emoji/facebook_messenger/cow.png differ
diff --git a/public/images/emoji/facebook_messenger/cow2.png b/public/images/emoji/facebook_messenger/cow2.png
index 0aee85e1837..acb8e68aec5 100644
Binary files a/public/images/emoji/facebook_messenger/cow2.png and b/public/images/emoji/facebook_messenger/cow2.png differ
diff --git a/public/images/emoji/facebook_messenger/cowboy_hat_face.png b/public/images/emoji/facebook_messenger/cowboy_hat_face.png
index efe2c6fcd17..fb0178aef0e 100644
Binary files a/public/images/emoji/facebook_messenger/cowboy_hat_face.png and b/public/images/emoji/facebook_messenger/cowboy_hat_face.png differ
diff --git a/public/images/emoji/facebook_messenger/crab.png b/public/images/emoji/facebook_messenger/crab.png
index 549988455da..29d38bb172a 100644
Binary files a/public/images/emoji/facebook_messenger/crab.png and b/public/images/emoji/facebook_messenger/crab.png differ
diff --git a/public/images/emoji/facebook_messenger/crayon.png b/public/images/emoji/facebook_messenger/crayon.png
index 0ad5b02c2dc..5f920abb85a 100644
Binary files a/public/images/emoji/facebook_messenger/crayon.png and b/public/images/emoji/facebook_messenger/crayon.png differ
diff --git a/public/images/emoji/facebook_messenger/crazy_face.png b/public/images/emoji/facebook_messenger/crazy_face.png
index 0aaa1cf7651..c98503796fc 100644
Binary files a/public/images/emoji/facebook_messenger/crazy_face.png and b/public/images/emoji/facebook_messenger/crazy_face.png differ
diff --git a/public/images/emoji/facebook_messenger/credit_card.png b/public/images/emoji/facebook_messenger/credit_card.png
index 818c05713d7..8274ccb05d1 100644
Binary files a/public/images/emoji/facebook_messenger/credit_card.png and b/public/images/emoji/facebook_messenger/credit_card.png differ
diff --git a/public/images/emoji/facebook_messenger/crescent_moon.png b/public/images/emoji/facebook_messenger/crescent_moon.png
index 8094a7c2055..423e9adf48b 100644
Binary files a/public/images/emoji/facebook_messenger/crescent_moon.png and b/public/images/emoji/facebook_messenger/crescent_moon.png differ
diff --git a/public/images/emoji/facebook_messenger/cricket.png b/public/images/emoji/facebook_messenger/cricket.png
index 1e3c9dfa382..21f51073b77 100644
Binary files a/public/images/emoji/facebook_messenger/cricket.png and b/public/images/emoji/facebook_messenger/cricket.png differ
diff --git a/public/images/emoji/facebook_messenger/cricket_bat_and_ball.png b/public/images/emoji/facebook_messenger/cricket_bat_and_ball.png
index 8a0bf65a6c7..3247402fc5d 100644
Binary files a/public/images/emoji/facebook_messenger/cricket_bat_and_ball.png and b/public/images/emoji/facebook_messenger/cricket_bat_and_ball.png differ
diff --git a/public/images/emoji/facebook_messenger/cricket_bat_ball.png b/public/images/emoji/facebook_messenger/cricket_bat_ball.png
index 8a0bf65a6c7..3247402fc5d 100644
Binary files a/public/images/emoji/facebook_messenger/cricket_bat_ball.png and b/public/images/emoji/facebook_messenger/cricket_bat_ball.png differ
diff --git a/public/images/emoji/facebook_messenger/croatia.png b/public/images/emoji/facebook_messenger/croatia.png
index 6cc9a0e7485..4b0c90ed4a1 100644
Binary files a/public/images/emoji/facebook_messenger/croatia.png and b/public/images/emoji/facebook_messenger/croatia.png differ
diff --git a/public/images/emoji/facebook_messenger/crocodile.png b/public/images/emoji/facebook_messenger/crocodile.png
index 64740f53d5d..0794c39b523 100644
Binary files a/public/images/emoji/facebook_messenger/crocodile.png and b/public/images/emoji/facebook_messenger/crocodile.png differ
diff --git a/public/images/emoji/facebook_messenger/croissant.png b/public/images/emoji/facebook_messenger/croissant.png
index c2cea2221f9..3675ac294e3 100644
Binary files a/public/images/emoji/facebook_messenger/croissant.png and b/public/images/emoji/facebook_messenger/croissant.png differ
diff --git a/public/images/emoji/facebook_messenger/cross.png b/public/images/emoji/facebook_messenger/cross.png
index f11e296dd97..705cfc1e6f3 100644
Binary files a/public/images/emoji/facebook_messenger/cross.png and b/public/images/emoji/facebook_messenger/cross.png differ
diff --git a/public/images/emoji/facebook_messenger/crossed_fingers.png b/public/images/emoji/facebook_messenger/crossed_fingers.png
index 9ba3b1ff090..63e4b4c1550 100644
Binary files a/public/images/emoji/facebook_messenger/crossed_fingers.png and b/public/images/emoji/facebook_messenger/crossed_fingers.png differ
diff --git a/public/images/emoji/facebook_messenger/crossed_fingers/2.png b/public/images/emoji/facebook_messenger/crossed_fingers/2.png
index 7ce5cd5811a..f785dff7c8f 100644
Binary files a/public/images/emoji/facebook_messenger/crossed_fingers/2.png and b/public/images/emoji/facebook_messenger/crossed_fingers/2.png differ
diff --git a/public/images/emoji/facebook_messenger/crossed_fingers/3.png b/public/images/emoji/facebook_messenger/crossed_fingers/3.png
index c6297b1c63b..54dac6d1170 100644
Binary files a/public/images/emoji/facebook_messenger/crossed_fingers/3.png and b/public/images/emoji/facebook_messenger/crossed_fingers/3.png differ
diff --git a/public/images/emoji/facebook_messenger/crossed_fingers/4.png b/public/images/emoji/facebook_messenger/crossed_fingers/4.png
index 8ae4d9b0f90..35c320e4b3e 100644
Binary files a/public/images/emoji/facebook_messenger/crossed_fingers/4.png and b/public/images/emoji/facebook_messenger/crossed_fingers/4.png differ
diff --git a/public/images/emoji/facebook_messenger/crossed_fingers/5.png b/public/images/emoji/facebook_messenger/crossed_fingers/5.png
index f3529e25376..863900fd715 100644
Binary files a/public/images/emoji/facebook_messenger/crossed_fingers/5.png and b/public/images/emoji/facebook_messenger/crossed_fingers/5.png differ
diff --git a/public/images/emoji/facebook_messenger/crossed_fingers/6.png b/public/images/emoji/facebook_messenger/crossed_fingers/6.png
index 0265996d383..0180a4bd6cd 100644
Binary files a/public/images/emoji/facebook_messenger/crossed_fingers/6.png and b/public/images/emoji/facebook_messenger/crossed_fingers/6.png differ
diff --git a/public/images/emoji/facebook_messenger/crossed_flags.png b/public/images/emoji/facebook_messenger/crossed_flags.png
index c168bb1ba50..2c2802055eb 100644
Binary files a/public/images/emoji/facebook_messenger/crossed_flags.png and b/public/images/emoji/facebook_messenger/crossed_flags.png differ
diff --git a/public/images/emoji/facebook_messenger/crossed_swords.png b/public/images/emoji/facebook_messenger/crossed_swords.png
index ec1da04367b..1c2e4956cb5 100644
Binary files a/public/images/emoji/facebook_messenger/crossed_swords.png and b/public/images/emoji/facebook_messenger/crossed_swords.png differ
diff --git a/public/images/emoji/facebook_messenger/crown.png b/public/images/emoji/facebook_messenger/crown.png
index 8a0b6d323db..8b4003b8132 100644
Binary files a/public/images/emoji/facebook_messenger/crown.png and b/public/images/emoji/facebook_messenger/crown.png differ
diff --git a/public/images/emoji/facebook_messenger/cruise_ship.png b/public/images/emoji/facebook_messenger/cruise_ship.png
index b1ee5613467..a79fe563a40 100644
Binary files a/public/images/emoji/facebook_messenger/cruise_ship.png and b/public/images/emoji/facebook_messenger/cruise_ship.png differ
diff --git a/public/images/emoji/facebook_messenger/cry.png b/public/images/emoji/facebook_messenger/cry.png
index f77cfe7b5aa..35274e43590 100644
Binary files a/public/images/emoji/facebook_messenger/cry.png and b/public/images/emoji/facebook_messenger/cry.png differ
diff --git a/public/images/emoji/facebook_messenger/crying_cat_face.png b/public/images/emoji/facebook_messenger/crying_cat_face.png
index ea06ae025cd..37e7c91b31b 100644
Binary files a/public/images/emoji/facebook_messenger/crying_cat_face.png and b/public/images/emoji/facebook_messenger/crying_cat_face.png differ
diff --git a/public/images/emoji/facebook_messenger/crystal_ball.png b/public/images/emoji/facebook_messenger/crystal_ball.png
index 0a119e84f45..4274254a14b 100644
Binary files a/public/images/emoji/facebook_messenger/crystal_ball.png and b/public/images/emoji/facebook_messenger/crystal_ball.png differ
diff --git a/public/images/emoji/facebook_messenger/cuba.png b/public/images/emoji/facebook_messenger/cuba.png
index 4436dee31e9..154462eb04a 100644
Binary files a/public/images/emoji/facebook_messenger/cuba.png and b/public/images/emoji/facebook_messenger/cuba.png differ
diff --git a/public/images/emoji/facebook_messenger/cucumber.png b/public/images/emoji/facebook_messenger/cucumber.png
index 392fdddcc1c..1331599e45c 100644
Binary files a/public/images/emoji/facebook_messenger/cucumber.png and b/public/images/emoji/facebook_messenger/cucumber.png differ
diff --git a/public/images/emoji/facebook_messenger/cup_with_straw.png b/public/images/emoji/facebook_messenger/cup_with_straw.png
index 4b2f313f9b2..18d6fea1f50 100644
Binary files a/public/images/emoji/facebook_messenger/cup_with_straw.png and b/public/images/emoji/facebook_messenger/cup_with_straw.png differ
diff --git a/public/images/emoji/facebook_messenger/cupid.png b/public/images/emoji/facebook_messenger/cupid.png
index d6c771a319a..8d936d1e240 100644
Binary files a/public/images/emoji/facebook_messenger/cupid.png and b/public/images/emoji/facebook_messenger/cupid.png differ
diff --git a/public/images/emoji/facebook_messenger/curacao.png b/public/images/emoji/facebook_messenger/curacao.png
index e29bde1f8b5..7425765f9ae 100644
Binary files a/public/images/emoji/facebook_messenger/curacao.png and b/public/images/emoji/facebook_messenger/curacao.png differ
diff --git a/public/images/emoji/facebook_messenger/curling_stone.png b/public/images/emoji/facebook_messenger/curling_stone.png
index 09027a2fb2e..b19fa356172 100644
Binary files a/public/images/emoji/facebook_messenger/curling_stone.png and b/public/images/emoji/facebook_messenger/curling_stone.png differ
diff --git a/public/images/emoji/facebook_messenger/curly_loop.png b/public/images/emoji/facebook_messenger/curly_loop.png
index dc1db4da407..6128a316908 100644
Binary files a/public/images/emoji/facebook_messenger/curly_loop.png and b/public/images/emoji/facebook_messenger/curly_loop.png differ
diff --git a/public/images/emoji/facebook_messenger/currency_exchange.png b/public/images/emoji/facebook_messenger/currency_exchange.png
index e3bdddf3927..3747db6ca6d 100644
Binary files a/public/images/emoji/facebook_messenger/currency_exchange.png and b/public/images/emoji/facebook_messenger/currency_exchange.png differ
diff --git a/public/images/emoji/facebook_messenger/curry.png b/public/images/emoji/facebook_messenger/curry.png
index 383f800e954..11bda1ff92f 100644
Binary files a/public/images/emoji/facebook_messenger/curry.png and b/public/images/emoji/facebook_messenger/curry.png differ
diff --git a/public/images/emoji/facebook_messenger/custard.png b/public/images/emoji/facebook_messenger/custard.png
index dc16af3ad2f..f829264bd34 100644
Binary files a/public/images/emoji/facebook_messenger/custard.png and b/public/images/emoji/facebook_messenger/custard.png differ
diff --git a/public/images/emoji/facebook_messenger/customs.png b/public/images/emoji/facebook_messenger/customs.png
index 9c0dc646a1c..301caea47c7 100644
Binary files a/public/images/emoji/facebook_messenger/customs.png and b/public/images/emoji/facebook_messenger/customs.png differ
diff --git a/public/images/emoji/facebook_messenger/cut_of_meat.png b/public/images/emoji/facebook_messenger/cut_of_meat.png
index b66d427e099..b6f4714c46f 100644
Binary files a/public/images/emoji/facebook_messenger/cut_of_meat.png and b/public/images/emoji/facebook_messenger/cut_of_meat.png differ
diff --git a/public/images/emoji/facebook_messenger/cyclone.png b/public/images/emoji/facebook_messenger/cyclone.png
index cf2b568c069..dfbeb83774b 100644
Binary files a/public/images/emoji/facebook_messenger/cyclone.png and b/public/images/emoji/facebook_messenger/cyclone.png differ
diff --git a/public/images/emoji/facebook_messenger/cyprus.png b/public/images/emoji/facebook_messenger/cyprus.png
index 7f80f4ed578..71ef3428ca3 100644
Binary files a/public/images/emoji/facebook_messenger/cyprus.png and b/public/images/emoji/facebook_messenger/cyprus.png differ
diff --git a/public/images/emoji/facebook_messenger/czech_republic.png b/public/images/emoji/facebook_messenger/czech_republic.png
index 88558e4ab2a..c7b22d1dbc1 100644
Binary files a/public/images/emoji/facebook_messenger/czech_republic.png and b/public/images/emoji/facebook_messenger/czech_republic.png differ
diff --git a/public/images/emoji/facebook_messenger/dagger.png b/public/images/emoji/facebook_messenger/dagger.png
index 8e56922aa62..18965532b4f 100644
Binary files a/public/images/emoji/facebook_messenger/dagger.png and b/public/images/emoji/facebook_messenger/dagger.png differ
diff --git a/public/images/emoji/facebook_messenger/dagger_knife.png b/public/images/emoji/facebook_messenger/dagger_knife.png
index 8e56922aa62..18965532b4f 100644
Binary files a/public/images/emoji/facebook_messenger/dagger_knife.png and b/public/images/emoji/facebook_messenger/dagger_knife.png differ
diff --git a/public/images/emoji/facebook_messenger/dancer.png b/public/images/emoji/facebook_messenger/dancer.png
index e05d6372362..1626b805d8a 100644
Binary files a/public/images/emoji/facebook_messenger/dancer.png and b/public/images/emoji/facebook_messenger/dancer.png differ
diff --git a/public/images/emoji/facebook_messenger/dancer/2.png b/public/images/emoji/facebook_messenger/dancer/2.png
index cec2b05df7d..afea33901da 100644
Binary files a/public/images/emoji/facebook_messenger/dancer/2.png and b/public/images/emoji/facebook_messenger/dancer/2.png differ
diff --git a/public/images/emoji/facebook_messenger/dancer/3.png b/public/images/emoji/facebook_messenger/dancer/3.png
index 208851079d5..80d6678c2d9 100644
Binary files a/public/images/emoji/facebook_messenger/dancer/3.png and b/public/images/emoji/facebook_messenger/dancer/3.png differ
diff --git a/public/images/emoji/facebook_messenger/dancer/4.png b/public/images/emoji/facebook_messenger/dancer/4.png
index c68c9968abe..144deb45f03 100644
Binary files a/public/images/emoji/facebook_messenger/dancer/4.png and b/public/images/emoji/facebook_messenger/dancer/4.png differ
diff --git a/public/images/emoji/facebook_messenger/dancer/5.png b/public/images/emoji/facebook_messenger/dancer/5.png
index 7927c186748..bab54cc0342 100644
Binary files a/public/images/emoji/facebook_messenger/dancer/5.png and b/public/images/emoji/facebook_messenger/dancer/5.png differ
diff --git a/public/images/emoji/facebook_messenger/dancer/6.png b/public/images/emoji/facebook_messenger/dancer/6.png
index 13b20521304..cbbd1ede9a8 100644
Binary files a/public/images/emoji/facebook_messenger/dancer/6.png and b/public/images/emoji/facebook_messenger/dancer/6.png differ
diff --git a/public/images/emoji/facebook_messenger/dancers.png b/public/images/emoji/facebook_messenger/dancers.png
index 8a83bc31d2c..8514dea420c 100644
Binary files a/public/images/emoji/facebook_messenger/dancers.png and b/public/images/emoji/facebook_messenger/dancers.png differ
diff --git a/public/images/emoji/facebook_messenger/dancing_men.png b/public/images/emoji/facebook_messenger/dancing_men.png
index dec9fb054b6..873562db0ad 100644
Binary files a/public/images/emoji/facebook_messenger/dancing_men.png and b/public/images/emoji/facebook_messenger/dancing_men.png differ
diff --git a/public/images/emoji/facebook_messenger/dancing_women.png b/public/images/emoji/facebook_messenger/dancing_women.png
index 8a83bc31d2c..8514dea420c 100644
Binary files a/public/images/emoji/facebook_messenger/dancing_women.png and b/public/images/emoji/facebook_messenger/dancing_women.png differ
diff --git a/public/images/emoji/facebook_messenger/dango.png b/public/images/emoji/facebook_messenger/dango.png
index f90ec298ada..549edddc9cb 100644
Binary files a/public/images/emoji/facebook_messenger/dango.png and b/public/images/emoji/facebook_messenger/dango.png differ
diff --git a/public/images/emoji/facebook_messenger/dark_sunglasses.png b/public/images/emoji/facebook_messenger/dark_sunglasses.png
index a4a0514f9c4..666c6f13d56 100644
Binary files a/public/images/emoji/facebook_messenger/dark_sunglasses.png and b/public/images/emoji/facebook_messenger/dark_sunglasses.png differ
diff --git a/public/images/emoji/facebook_messenger/dart.png b/public/images/emoji/facebook_messenger/dart.png
index ff79ba245d8..d1054c65162 100644
Binary files a/public/images/emoji/facebook_messenger/dart.png and b/public/images/emoji/facebook_messenger/dart.png differ
diff --git a/public/images/emoji/facebook_messenger/dash.png b/public/images/emoji/facebook_messenger/dash.png
index 72b36c8e4fc..99da43cb754 100644
Binary files a/public/images/emoji/facebook_messenger/dash.png and b/public/images/emoji/facebook_messenger/dash.png differ
diff --git a/public/images/emoji/facebook_messenger/date.png b/public/images/emoji/facebook_messenger/date.png
index adfdfd42560..5816566750f 100644
Binary files a/public/images/emoji/facebook_messenger/date.png and b/public/images/emoji/facebook_messenger/date.png differ
diff --git a/public/images/emoji/facebook_messenger/de.png b/public/images/emoji/facebook_messenger/de.png
index 964116acbb5..8a375afccd6 100644
Binary files a/public/images/emoji/facebook_messenger/de.png and b/public/images/emoji/facebook_messenger/de.png differ
diff --git a/public/images/emoji/facebook_messenger/deciduous_tree.png b/public/images/emoji/facebook_messenger/deciduous_tree.png
index a6df67b2a99..99ec0af6559 100644
Binary files a/public/images/emoji/facebook_messenger/deciduous_tree.png and b/public/images/emoji/facebook_messenger/deciduous_tree.png differ
diff --git a/public/images/emoji/facebook_messenger/deer.png b/public/images/emoji/facebook_messenger/deer.png
index 92aa546e945..c9b03cc45f6 100644
Binary files a/public/images/emoji/facebook_messenger/deer.png and b/public/images/emoji/facebook_messenger/deer.png differ
diff --git a/public/images/emoji/facebook_messenger/denmark.png b/public/images/emoji/facebook_messenger/denmark.png
index bb8ef11ea58..182974982d5 100644
Binary files a/public/images/emoji/facebook_messenger/denmark.png and b/public/images/emoji/facebook_messenger/denmark.png differ
diff --git a/public/images/emoji/facebook_messenger/department_store.png b/public/images/emoji/facebook_messenger/department_store.png
index b6b6f440ed9..96222f81e8d 100644
Binary files a/public/images/emoji/facebook_messenger/department_store.png and b/public/images/emoji/facebook_messenger/department_store.png differ
diff --git a/public/images/emoji/facebook_messenger/derelict_house.png b/public/images/emoji/facebook_messenger/derelict_house.png
index a48da604946..a03480bd67d 100644
Binary files a/public/images/emoji/facebook_messenger/derelict_house.png and b/public/images/emoji/facebook_messenger/derelict_house.png differ
diff --git a/public/images/emoji/facebook_messenger/derelict_house_building.png b/public/images/emoji/facebook_messenger/derelict_house_building.png
index a48da604946..a03480bd67d 100644
Binary files a/public/images/emoji/facebook_messenger/derelict_house_building.png and b/public/images/emoji/facebook_messenger/derelict_house_building.png differ
diff --git a/public/images/emoji/facebook_messenger/desert.png b/public/images/emoji/facebook_messenger/desert.png
index 3ec8a867b45..2b62e0a1111 100644
Binary files a/public/images/emoji/facebook_messenger/desert.png and b/public/images/emoji/facebook_messenger/desert.png differ
diff --git a/public/images/emoji/facebook_messenger/desert_island.png b/public/images/emoji/facebook_messenger/desert_island.png
index 2d2e8919fff..7a1f87faf9e 100644
Binary files a/public/images/emoji/facebook_messenger/desert_island.png and b/public/images/emoji/facebook_messenger/desert_island.png differ
diff --git a/public/images/emoji/facebook_messenger/desktop.png b/public/images/emoji/facebook_messenger/desktop.png
index 120faa75360..afd2e0ab2b8 100644
Binary files a/public/images/emoji/facebook_messenger/desktop.png and b/public/images/emoji/facebook_messenger/desktop.png differ
diff --git a/public/images/emoji/facebook_messenger/desktop_computer.png b/public/images/emoji/facebook_messenger/desktop_computer.png
index 120faa75360..afd2e0ab2b8 100644
Binary files a/public/images/emoji/facebook_messenger/desktop_computer.png and b/public/images/emoji/facebook_messenger/desktop_computer.png differ
diff --git a/public/images/emoji/facebook_messenger/diamond_shape_with_a_dot_inside.png b/public/images/emoji/facebook_messenger/diamond_shape_with_a_dot_inside.png
index 5b51721f2e7..bc8c27c99bc 100644
Binary files a/public/images/emoji/facebook_messenger/diamond_shape_with_a_dot_inside.png and b/public/images/emoji/facebook_messenger/diamond_shape_with_a_dot_inside.png differ
diff --git a/public/images/emoji/facebook_messenger/diamonds.png b/public/images/emoji/facebook_messenger/diamonds.png
index e416a8ce5d2..51ceb38b9ef 100644
Binary files a/public/images/emoji/facebook_messenger/diamonds.png and b/public/images/emoji/facebook_messenger/diamonds.png differ
diff --git a/public/images/emoji/facebook_messenger/diego_garcia.png b/public/images/emoji/facebook_messenger/diego_garcia.png
index 881e01a927f..2c48fa114c9 100644
Binary files a/public/images/emoji/facebook_messenger/diego_garcia.png and b/public/images/emoji/facebook_messenger/diego_garcia.png differ
diff --git a/public/images/emoji/facebook_messenger/disappointed.png b/public/images/emoji/facebook_messenger/disappointed.png
index 26ca83eeb56..60fff2810e6 100644
Binary files a/public/images/emoji/facebook_messenger/disappointed.png and b/public/images/emoji/facebook_messenger/disappointed.png differ
diff --git a/public/images/emoji/facebook_messenger/disappointed_relieved.png b/public/images/emoji/facebook_messenger/disappointed_relieved.png
index 0537746c4cb..ff9396b6413 100644
Binary files a/public/images/emoji/facebook_messenger/disappointed_relieved.png and b/public/images/emoji/facebook_messenger/disappointed_relieved.png differ
diff --git a/public/images/emoji/facebook_messenger/dividers.png b/public/images/emoji/facebook_messenger/dividers.png
index b1e27091c92..8df2040c735 100644
Binary files a/public/images/emoji/facebook_messenger/dividers.png and b/public/images/emoji/facebook_messenger/dividers.png differ
diff --git a/public/images/emoji/facebook_messenger/dizzy.png b/public/images/emoji/facebook_messenger/dizzy.png
index 0894ceafb58..28e7fc09be0 100644
Binary files a/public/images/emoji/facebook_messenger/dizzy.png and b/public/images/emoji/facebook_messenger/dizzy.png differ
diff --git a/public/images/emoji/facebook_messenger/dizzy_face.png b/public/images/emoji/facebook_messenger/dizzy_face.png
index 24f1af2db30..762b12e5d94 100644
Binary files a/public/images/emoji/facebook_messenger/dizzy_face.png and b/public/images/emoji/facebook_messenger/dizzy_face.png differ
diff --git a/public/images/emoji/facebook_messenger/djibouti.png b/public/images/emoji/facebook_messenger/djibouti.png
index 606fe6a1ee5..cfd80d614f5 100644
Binary files a/public/images/emoji/facebook_messenger/djibouti.png and b/public/images/emoji/facebook_messenger/djibouti.png differ
diff --git a/public/images/emoji/facebook_messenger/do_not_litter.png b/public/images/emoji/facebook_messenger/do_not_litter.png
index f53f8fa83d7..255f8d94ab5 100644
Binary files a/public/images/emoji/facebook_messenger/do_not_litter.png and b/public/images/emoji/facebook_messenger/do_not_litter.png differ
diff --git a/public/images/emoji/facebook_messenger/dog.png b/public/images/emoji/facebook_messenger/dog.png
index 8f398512300..b478ca4e398 100644
Binary files a/public/images/emoji/facebook_messenger/dog.png and b/public/images/emoji/facebook_messenger/dog.png differ
diff --git a/public/images/emoji/facebook_messenger/dog2.png b/public/images/emoji/facebook_messenger/dog2.png
index afb48d19e87..476d447a772 100644
Binary files a/public/images/emoji/facebook_messenger/dog2.png and b/public/images/emoji/facebook_messenger/dog2.png differ
diff --git a/public/images/emoji/facebook_messenger/dollar.png b/public/images/emoji/facebook_messenger/dollar.png
index cc6d41c785a..d523c3ad2ea 100644
Binary files a/public/images/emoji/facebook_messenger/dollar.png and b/public/images/emoji/facebook_messenger/dollar.png differ
diff --git a/public/images/emoji/facebook_messenger/dolls.png b/public/images/emoji/facebook_messenger/dolls.png
index effc75342ee..f92c9d90fdf 100644
Binary files a/public/images/emoji/facebook_messenger/dolls.png and b/public/images/emoji/facebook_messenger/dolls.png differ
diff --git a/public/images/emoji/facebook_messenger/dolphin.png b/public/images/emoji/facebook_messenger/dolphin.png
index bae7802d5e0..0229c106b75 100644
Binary files a/public/images/emoji/facebook_messenger/dolphin.png and b/public/images/emoji/facebook_messenger/dolphin.png differ
diff --git a/public/images/emoji/facebook_messenger/dominica.png b/public/images/emoji/facebook_messenger/dominica.png
index 588ece3f433..f25264e8a21 100644
Binary files a/public/images/emoji/facebook_messenger/dominica.png and b/public/images/emoji/facebook_messenger/dominica.png differ
diff --git a/public/images/emoji/facebook_messenger/dominican_republic.png b/public/images/emoji/facebook_messenger/dominican_republic.png
index de48ff449ca..124c0ea10f2 100644
Binary files a/public/images/emoji/facebook_messenger/dominican_republic.png and b/public/images/emoji/facebook_messenger/dominican_republic.png differ
diff --git a/public/images/emoji/facebook_messenger/door.png b/public/images/emoji/facebook_messenger/door.png
index bcb88cd2b52..c3ded83934b 100644
Binary files a/public/images/emoji/facebook_messenger/door.png and b/public/images/emoji/facebook_messenger/door.png differ
diff --git a/public/images/emoji/facebook_messenger/double_vertical_bar.png b/public/images/emoji/facebook_messenger/double_vertical_bar.png
index 624e2df7118..de512cc09fd 100644
Binary files a/public/images/emoji/facebook_messenger/double_vertical_bar.png and b/public/images/emoji/facebook_messenger/double_vertical_bar.png differ
diff --git a/public/images/emoji/facebook_messenger/doughnut.png b/public/images/emoji/facebook_messenger/doughnut.png
index edfa5ccac9e..7882858ed47 100644
Binary files a/public/images/emoji/facebook_messenger/doughnut.png and b/public/images/emoji/facebook_messenger/doughnut.png differ
diff --git a/public/images/emoji/facebook_messenger/dove.png b/public/images/emoji/facebook_messenger/dove.png
index 9fdcff829ad..fbd53b289dd 100644
Binary files a/public/images/emoji/facebook_messenger/dove.png and b/public/images/emoji/facebook_messenger/dove.png differ
diff --git a/public/images/emoji/facebook_messenger/dove_of_peace.png b/public/images/emoji/facebook_messenger/dove_of_peace.png
index 9fdcff829ad..fbd53b289dd 100644
Binary files a/public/images/emoji/facebook_messenger/dove_of_peace.png and b/public/images/emoji/facebook_messenger/dove_of_peace.png differ
diff --git a/public/images/emoji/facebook_messenger/dragon.png b/public/images/emoji/facebook_messenger/dragon.png
index c67e4d4b5e0..7493c8bcbe4 100644
Binary files a/public/images/emoji/facebook_messenger/dragon.png and b/public/images/emoji/facebook_messenger/dragon.png differ
diff --git a/public/images/emoji/facebook_messenger/dragon_face.png b/public/images/emoji/facebook_messenger/dragon_face.png
index cea46ab094f..c664b08192a 100644
Binary files a/public/images/emoji/facebook_messenger/dragon_face.png and b/public/images/emoji/facebook_messenger/dragon_face.png differ
diff --git a/public/images/emoji/facebook_messenger/dress.png b/public/images/emoji/facebook_messenger/dress.png
index ef0e02eb6a4..ff6572470de 100644
Binary files a/public/images/emoji/facebook_messenger/dress.png and b/public/images/emoji/facebook_messenger/dress.png differ
diff --git a/public/images/emoji/facebook_messenger/dromedary_camel.png b/public/images/emoji/facebook_messenger/dromedary_camel.png
index 30fba91ffe7..b9632cf2fc6 100644
Binary files a/public/images/emoji/facebook_messenger/dromedary_camel.png and b/public/images/emoji/facebook_messenger/dromedary_camel.png differ
diff --git a/public/images/emoji/facebook_messenger/drooling_face.png b/public/images/emoji/facebook_messenger/drooling_face.png
index 2ad3f8a41b1..677d0d3bfd9 100644
Binary files a/public/images/emoji/facebook_messenger/drooling_face.png and b/public/images/emoji/facebook_messenger/drooling_face.png differ
diff --git a/public/images/emoji/facebook_messenger/droplet.png b/public/images/emoji/facebook_messenger/droplet.png
index 186137dfb4d..1bd974bb047 100644
Binary files a/public/images/emoji/facebook_messenger/droplet.png and b/public/images/emoji/facebook_messenger/droplet.png differ
diff --git a/public/images/emoji/facebook_messenger/drum.png b/public/images/emoji/facebook_messenger/drum.png
index d0c94c34e49..94383bf3802 100644
Binary files a/public/images/emoji/facebook_messenger/drum.png and b/public/images/emoji/facebook_messenger/drum.png differ
diff --git a/public/images/emoji/facebook_messenger/duck.png b/public/images/emoji/facebook_messenger/duck.png
index 6adaf8cddb3..f6c09dd677d 100644
Binary files a/public/images/emoji/facebook_messenger/duck.png and b/public/images/emoji/facebook_messenger/duck.png differ
diff --git a/public/images/emoji/facebook_messenger/dumpling.png b/public/images/emoji/facebook_messenger/dumpling.png
index 489a779bf69..43d8c922755 100644
Binary files a/public/images/emoji/facebook_messenger/dumpling.png and b/public/images/emoji/facebook_messenger/dumpling.png differ
diff --git a/public/images/emoji/facebook_messenger/dvd.png b/public/images/emoji/facebook_messenger/dvd.png
index d2cfd45f3ce..c81bf2e1e88 100644
Binary files a/public/images/emoji/facebook_messenger/dvd.png and b/public/images/emoji/facebook_messenger/dvd.png differ
diff --git a/public/images/emoji/facebook_messenger/e-mail.png b/public/images/emoji/facebook_messenger/e-mail.png
index e160129faf7..e50d4fc6375 100644
Binary files a/public/images/emoji/facebook_messenger/e-mail.png and b/public/images/emoji/facebook_messenger/e-mail.png differ
diff --git a/public/images/emoji/facebook_messenger/eagle.png b/public/images/emoji/facebook_messenger/eagle.png
index c9cce258ae2..c152a6f0225 100644
Binary files a/public/images/emoji/facebook_messenger/eagle.png and b/public/images/emoji/facebook_messenger/eagle.png differ
diff --git a/public/images/emoji/facebook_messenger/ear.png b/public/images/emoji/facebook_messenger/ear.png
index 654ee589830..c2cc0b53927 100644
Binary files a/public/images/emoji/facebook_messenger/ear.png and b/public/images/emoji/facebook_messenger/ear.png differ
diff --git a/public/images/emoji/facebook_messenger/ear/2.png b/public/images/emoji/facebook_messenger/ear/2.png
index 16c75ee0c1d..bac35be734e 100644
Binary files a/public/images/emoji/facebook_messenger/ear/2.png and b/public/images/emoji/facebook_messenger/ear/2.png differ
diff --git a/public/images/emoji/facebook_messenger/ear/3.png b/public/images/emoji/facebook_messenger/ear/3.png
index f62ef93bf8e..80e98fa9654 100644
Binary files a/public/images/emoji/facebook_messenger/ear/3.png and b/public/images/emoji/facebook_messenger/ear/3.png differ
diff --git a/public/images/emoji/facebook_messenger/ear/4.png b/public/images/emoji/facebook_messenger/ear/4.png
index 4b1179a35b8..eb0577cbf2b 100644
Binary files a/public/images/emoji/facebook_messenger/ear/4.png and b/public/images/emoji/facebook_messenger/ear/4.png differ
diff --git a/public/images/emoji/facebook_messenger/ear/5.png b/public/images/emoji/facebook_messenger/ear/5.png
index 2388c5ce034..f0f8a211879 100644
Binary files a/public/images/emoji/facebook_messenger/ear/5.png and b/public/images/emoji/facebook_messenger/ear/5.png differ
diff --git a/public/images/emoji/facebook_messenger/ear/6.png b/public/images/emoji/facebook_messenger/ear/6.png
index 6b2e51b85e8..32498024b78 100644
Binary files a/public/images/emoji/facebook_messenger/ear/6.png and b/public/images/emoji/facebook_messenger/ear/6.png differ
diff --git a/public/images/emoji/facebook_messenger/ear_of_rice.png b/public/images/emoji/facebook_messenger/ear_of_rice.png
index 5273991fabb..5c443c28e31 100644
Binary files a/public/images/emoji/facebook_messenger/ear_of_rice.png and b/public/images/emoji/facebook_messenger/ear_of_rice.png differ
diff --git a/public/images/emoji/facebook_messenger/earth_africa.png b/public/images/emoji/facebook_messenger/earth_africa.png
index f659e02dbe9..760ac582189 100644
Binary files a/public/images/emoji/facebook_messenger/earth_africa.png and b/public/images/emoji/facebook_messenger/earth_africa.png differ
diff --git a/public/images/emoji/facebook_messenger/earth_americas.png b/public/images/emoji/facebook_messenger/earth_americas.png
index 26fbfc97142..4ea93a75898 100644
Binary files a/public/images/emoji/facebook_messenger/earth_americas.png and b/public/images/emoji/facebook_messenger/earth_americas.png differ
diff --git a/public/images/emoji/facebook_messenger/earth_asia.png b/public/images/emoji/facebook_messenger/earth_asia.png
index 030250142f5..63dd04b6477 100644
Binary files a/public/images/emoji/facebook_messenger/earth_asia.png and b/public/images/emoji/facebook_messenger/earth_asia.png differ
diff --git a/public/images/emoji/facebook_messenger/ecuador.png b/public/images/emoji/facebook_messenger/ecuador.png
index cf86fbaad62..38527eed7f5 100644
Binary files a/public/images/emoji/facebook_messenger/ecuador.png and b/public/images/emoji/facebook_messenger/ecuador.png differ
diff --git a/public/images/emoji/facebook_messenger/egg.png b/public/images/emoji/facebook_messenger/egg.png
index cec55b549a2..49d700ec264 100644
Binary files a/public/images/emoji/facebook_messenger/egg.png and b/public/images/emoji/facebook_messenger/egg.png differ
diff --git a/public/images/emoji/facebook_messenger/eggplant.png b/public/images/emoji/facebook_messenger/eggplant.png
index 4f60ef799da..aba93476d82 100644
Binary files a/public/images/emoji/facebook_messenger/eggplant.png and b/public/images/emoji/facebook_messenger/eggplant.png differ
diff --git a/public/images/emoji/facebook_messenger/egypt.png b/public/images/emoji/facebook_messenger/egypt.png
index bbbdefa653f..82c3bedbdbf 100644
Binary files a/public/images/emoji/facebook_messenger/egypt.png and b/public/images/emoji/facebook_messenger/egypt.png differ
diff --git a/public/images/emoji/facebook_messenger/eight.png b/public/images/emoji/facebook_messenger/eight.png
index 12c277e5858..fa9597b5cd5 100644
Binary files a/public/images/emoji/facebook_messenger/eight.png and b/public/images/emoji/facebook_messenger/eight.png differ
diff --git a/public/images/emoji/facebook_messenger/eight_pointed_black_star.png b/public/images/emoji/facebook_messenger/eight_pointed_black_star.png
index af0cf9dabab..89a35ee8a67 100644
Binary files a/public/images/emoji/facebook_messenger/eight_pointed_black_star.png and b/public/images/emoji/facebook_messenger/eight_pointed_black_star.png differ
diff --git a/public/images/emoji/facebook_messenger/eight_spoked_asterisk.png b/public/images/emoji/facebook_messenger/eight_spoked_asterisk.png
index 09351f437d7..62d86d58334 100644
Binary files a/public/images/emoji/facebook_messenger/eight_spoked_asterisk.png and b/public/images/emoji/facebook_messenger/eight_spoked_asterisk.png differ
diff --git a/public/images/emoji/facebook_messenger/el_salvador.png b/public/images/emoji/facebook_messenger/el_salvador.png
index 0f24a983698..b761864c8af 100644
Binary files a/public/images/emoji/facebook_messenger/el_salvador.png and b/public/images/emoji/facebook_messenger/el_salvador.png differ
diff --git a/public/images/emoji/facebook_messenger/electric_plug.png b/public/images/emoji/facebook_messenger/electric_plug.png
index b6c91f603b9..9dba32a38a6 100644
Binary files a/public/images/emoji/facebook_messenger/electric_plug.png and b/public/images/emoji/facebook_messenger/electric_plug.png differ
diff --git a/public/images/emoji/facebook_messenger/elephant.png b/public/images/emoji/facebook_messenger/elephant.png
index d7dc652e62b..964f62c9f4b 100644
Binary files a/public/images/emoji/facebook_messenger/elephant.png and b/public/images/emoji/facebook_messenger/elephant.png differ
diff --git a/public/images/emoji/facebook_messenger/elf.png b/public/images/emoji/facebook_messenger/elf.png
index f8b6dd873e2..28df7d45513 100644
Binary files a/public/images/emoji/facebook_messenger/elf.png and b/public/images/emoji/facebook_messenger/elf.png differ
diff --git a/public/images/emoji/facebook_messenger/elf/2.png b/public/images/emoji/facebook_messenger/elf/2.png
index 15984024f21..471706456a6 100644
Binary files a/public/images/emoji/facebook_messenger/elf/2.png and b/public/images/emoji/facebook_messenger/elf/2.png differ
diff --git a/public/images/emoji/facebook_messenger/elf/3.png b/public/images/emoji/facebook_messenger/elf/3.png
index 4689243a178..9d127ad8666 100644
Binary files a/public/images/emoji/facebook_messenger/elf/3.png and b/public/images/emoji/facebook_messenger/elf/3.png differ
diff --git a/public/images/emoji/facebook_messenger/elf/4.png b/public/images/emoji/facebook_messenger/elf/4.png
index 861cbf808ca..a095c2f4947 100644
Binary files a/public/images/emoji/facebook_messenger/elf/4.png and b/public/images/emoji/facebook_messenger/elf/4.png differ
diff --git a/public/images/emoji/facebook_messenger/elf/5.png b/public/images/emoji/facebook_messenger/elf/5.png
index 50748760101..ee9752e7dd2 100644
Binary files a/public/images/emoji/facebook_messenger/elf/5.png and b/public/images/emoji/facebook_messenger/elf/5.png differ
diff --git a/public/images/emoji/facebook_messenger/elf/6.png b/public/images/emoji/facebook_messenger/elf/6.png
index 505c908b180..9319cac89ca 100644
Binary files a/public/images/emoji/facebook_messenger/elf/6.png and b/public/images/emoji/facebook_messenger/elf/6.png differ
diff --git a/public/images/emoji/facebook_messenger/email.png b/public/images/emoji/facebook_messenger/email.png
index e160129faf7..e50d4fc6375 100644
Binary files a/public/images/emoji/facebook_messenger/email.png and b/public/images/emoji/facebook_messenger/email.png differ
diff --git a/public/images/emoji/facebook_messenger/end.png b/public/images/emoji/facebook_messenger/end.png
index fb13367f7f9..4fb09e928b8 100644
Binary files a/public/images/emoji/facebook_messenger/end.png and b/public/images/emoji/facebook_messenger/end.png differ
diff --git a/public/images/emoji/facebook_messenger/envelope.png b/public/images/emoji/facebook_messenger/envelope.png
index e160129faf7..e50d4fc6375 100644
Binary files a/public/images/emoji/facebook_messenger/envelope.png and b/public/images/emoji/facebook_messenger/envelope.png differ
diff --git a/public/images/emoji/facebook_messenger/envelope_with_arrow.png b/public/images/emoji/facebook_messenger/envelope_with_arrow.png
index ea1f5e5b37d..815f2e8c92e 100644
Binary files a/public/images/emoji/facebook_messenger/envelope_with_arrow.png and b/public/images/emoji/facebook_messenger/envelope_with_arrow.png differ
diff --git a/public/images/emoji/facebook_messenger/equatorial_guinea.png b/public/images/emoji/facebook_messenger/equatorial_guinea.png
index 38e992318c3..8d75e77f6c3 100644
Binary files a/public/images/emoji/facebook_messenger/equatorial_guinea.png and b/public/images/emoji/facebook_messenger/equatorial_guinea.png differ
diff --git a/public/images/emoji/facebook_messenger/eritrea.png b/public/images/emoji/facebook_messenger/eritrea.png
index 630fd664150..66814696cfd 100644
Binary files a/public/images/emoji/facebook_messenger/eritrea.png and b/public/images/emoji/facebook_messenger/eritrea.png differ
diff --git a/public/images/emoji/facebook_messenger/es.png b/public/images/emoji/facebook_messenger/es.png
index 82d50c036e3..5d2f27537fd 100644
Binary files a/public/images/emoji/facebook_messenger/es.png and b/public/images/emoji/facebook_messenger/es.png differ
diff --git a/public/images/emoji/facebook_messenger/estonia.png b/public/images/emoji/facebook_messenger/estonia.png
index 2553a5dbf7d..54e6980bbf6 100644
Binary files a/public/images/emoji/facebook_messenger/estonia.png and b/public/images/emoji/facebook_messenger/estonia.png differ
diff --git a/public/images/emoji/facebook_messenger/ethiopia.png b/public/images/emoji/facebook_messenger/ethiopia.png
index d0d78350cdf..53d71bf466c 100644
Binary files a/public/images/emoji/facebook_messenger/ethiopia.png and b/public/images/emoji/facebook_messenger/ethiopia.png differ
diff --git a/public/images/emoji/facebook_messenger/eu.png b/public/images/emoji/facebook_messenger/eu.png
index 938b488ddb8..206c2b3f621 100644
Binary files a/public/images/emoji/facebook_messenger/eu.png and b/public/images/emoji/facebook_messenger/eu.png differ
diff --git a/public/images/emoji/facebook_messenger/euro.png b/public/images/emoji/facebook_messenger/euro.png
index bdfc11b7f67..fccf055f993 100644
Binary files a/public/images/emoji/facebook_messenger/euro.png and b/public/images/emoji/facebook_messenger/euro.png differ
diff --git a/public/images/emoji/facebook_messenger/european_castle.png b/public/images/emoji/facebook_messenger/european_castle.png
index 5eeee24e643..67966275e06 100644
Binary files a/public/images/emoji/facebook_messenger/european_castle.png and b/public/images/emoji/facebook_messenger/european_castle.png differ
diff --git a/public/images/emoji/facebook_messenger/european_post_office.png b/public/images/emoji/facebook_messenger/european_post_office.png
index fb3da8bf709..8dfaea0d1af 100644
Binary files a/public/images/emoji/facebook_messenger/european_post_office.png and b/public/images/emoji/facebook_messenger/european_post_office.png differ
diff --git a/public/images/emoji/facebook_messenger/evergreen_tree.png b/public/images/emoji/facebook_messenger/evergreen_tree.png
index ce75d328c3e..a37979eb966 100644
Binary files a/public/images/emoji/facebook_messenger/evergreen_tree.png and b/public/images/emoji/facebook_messenger/evergreen_tree.png differ
diff --git a/public/images/emoji/facebook_messenger/exclamation.png b/public/images/emoji/facebook_messenger/exclamation.png
index e7230e1697e..1903c396ed8 100644
Binary files a/public/images/emoji/facebook_messenger/exclamation.png and b/public/images/emoji/facebook_messenger/exclamation.png differ
diff --git a/public/images/emoji/facebook_messenger/exploding_head.png b/public/images/emoji/facebook_messenger/exploding_head.png
index 85532dadc7a..a9f5841a2e0 100644
Binary files a/public/images/emoji/facebook_messenger/exploding_head.png and b/public/images/emoji/facebook_messenger/exploding_head.png differ
diff --git a/public/images/emoji/facebook_messenger/expressionless.png b/public/images/emoji/facebook_messenger/expressionless.png
index ace98269b51..37263d3cf06 100644
Binary files a/public/images/emoji/facebook_messenger/expressionless.png and b/public/images/emoji/facebook_messenger/expressionless.png differ
diff --git a/public/images/emoji/facebook_messenger/eye.png b/public/images/emoji/facebook_messenger/eye.png
index 5c77590cb21..ddc87463780 100644
Binary files a/public/images/emoji/facebook_messenger/eye.png and b/public/images/emoji/facebook_messenger/eye.png differ
diff --git a/public/images/emoji/facebook_messenger/eyeglasses.png b/public/images/emoji/facebook_messenger/eyeglasses.png
index 04830b29aba..21197b6c819 100644
Binary files a/public/images/emoji/facebook_messenger/eyeglasses.png and b/public/images/emoji/facebook_messenger/eyeglasses.png differ
diff --git a/public/images/emoji/facebook_messenger/eyes.png b/public/images/emoji/facebook_messenger/eyes.png
index 711c98965b0..6a8386702e2 100644
Binary files a/public/images/emoji/facebook_messenger/eyes.png and b/public/images/emoji/facebook_messenger/eyes.png differ
diff --git a/public/images/emoji/facebook_messenger/face_vomiting.png b/public/images/emoji/facebook_messenger/face_vomiting.png
index cd7c3d1f2b7..5d01c9ce3d2 100644
Binary files a/public/images/emoji/facebook_messenger/face_vomiting.png and b/public/images/emoji/facebook_messenger/face_vomiting.png differ
diff --git a/public/images/emoji/facebook_messenger/face_with_hand_over_mouth.png b/public/images/emoji/facebook_messenger/face_with_hand_over_mouth.png
index aed8f62e0b0..823c498bf2c 100644
Binary files a/public/images/emoji/facebook_messenger/face_with_hand_over_mouth.png and b/public/images/emoji/facebook_messenger/face_with_hand_over_mouth.png differ
diff --git a/public/images/emoji/facebook_messenger/face_with_head_bandage.png b/public/images/emoji/facebook_messenger/face_with_head_bandage.png
index 97bec4d11f6..602886ae28b 100644
Binary files a/public/images/emoji/facebook_messenger/face_with_head_bandage.png and b/public/images/emoji/facebook_messenger/face_with_head_bandage.png differ
diff --git a/public/images/emoji/facebook_messenger/face_with_monocle.png b/public/images/emoji/facebook_messenger/face_with_monocle.png
index c6fbb4481d5..3fcf2d871df 100644
Binary files a/public/images/emoji/facebook_messenger/face_with_monocle.png and b/public/images/emoji/facebook_messenger/face_with_monocle.png differ
diff --git a/public/images/emoji/facebook_messenger/face_with_raised_eyebrow.png b/public/images/emoji/facebook_messenger/face_with_raised_eyebrow.png
index 887f70e3652..f79d400eae5 100644
Binary files a/public/images/emoji/facebook_messenger/face_with_raised_eyebrow.png and b/public/images/emoji/facebook_messenger/face_with_raised_eyebrow.png differ
diff --git a/public/images/emoji/facebook_messenger/face_with_rolling_eyes.png b/public/images/emoji/facebook_messenger/face_with_rolling_eyes.png
index 8a864a00bdf..06b96d4c457 100644
Binary files a/public/images/emoji/facebook_messenger/face_with_rolling_eyes.png and b/public/images/emoji/facebook_messenger/face_with_rolling_eyes.png differ
diff --git a/public/images/emoji/facebook_messenger/face_with_symbols_over_mouth.png b/public/images/emoji/facebook_messenger/face_with_symbols_over_mouth.png
index 84bb9ec9c53..1d7963a9344 100644
Binary files a/public/images/emoji/facebook_messenger/face_with_symbols_over_mouth.png and b/public/images/emoji/facebook_messenger/face_with_symbols_over_mouth.png differ
diff --git a/public/images/emoji/facebook_messenger/face_with_thermometer.png b/public/images/emoji/facebook_messenger/face_with_thermometer.png
index c9440239c0d..9c4da3e1fc6 100644
Binary files a/public/images/emoji/facebook_messenger/face_with_thermometer.png and b/public/images/emoji/facebook_messenger/face_with_thermometer.png differ
diff --git a/public/images/emoji/facebook_messenger/facepunch.png b/public/images/emoji/facebook_messenger/facepunch.png
index ed3c41bc0d1..9db84ed1fd7 100644
Binary files a/public/images/emoji/facebook_messenger/facepunch.png and b/public/images/emoji/facebook_messenger/facepunch.png differ
diff --git a/public/images/emoji/facebook_messenger/facepunch/2.png b/public/images/emoji/facebook_messenger/facepunch/2.png
index e499d8d0fac..b14e4d79848 100644
Binary files a/public/images/emoji/facebook_messenger/facepunch/2.png and b/public/images/emoji/facebook_messenger/facepunch/2.png differ
diff --git a/public/images/emoji/facebook_messenger/facepunch/3.png b/public/images/emoji/facebook_messenger/facepunch/3.png
index f56ee4a1ff4..4972f25e1e7 100644
Binary files a/public/images/emoji/facebook_messenger/facepunch/3.png and b/public/images/emoji/facebook_messenger/facepunch/3.png differ
diff --git a/public/images/emoji/facebook_messenger/facepunch/4.png b/public/images/emoji/facebook_messenger/facepunch/4.png
index bc6cebcbf63..4233ef0d5af 100644
Binary files a/public/images/emoji/facebook_messenger/facepunch/4.png and b/public/images/emoji/facebook_messenger/facepunch/4.png differ
diff --git a/public/images/emoji/facebook_messenger/facepunch/5.png b/public/images/emoji/facebook_messenger/facepunch/5.png
index c8313f984fb..a82a5785859 100644
Binary files a/public/images/emoji/facebook_messenger/facepunch/5.png and b/public/images/emoji/facebook_messenger/facepunch/5.png differ
diff --git a/public/images/emoji/facebook_messenger/facepunch/6.png b/public/images/emoji/facebook_messenger/facepunch/6.png
index cf2064a1ad3..73efba003b3 100644
Binary files a/public/images/emoji/facebook_messenger/facepunch/6.png and b/public/images/emoji/facebook_messenger/facepunch/6.png differ
diff --git a/public/images/emoji/facebook_messenger/factory.png b/public/images/emoji/facebook_messenger/factory.png
index 188462d1b7c..48500df3486 100644
Binary files a/public/images/emoji/facebook_messenger/factory.png and b/public/images/emoji/facebook_messenger/factory.png differ
diff --git a/public/images/emoji/facebook_messenger/fairy.png b/public/images/emoji/facebook_messenger/fairy.png
index 429938294b2..578c0af4598 100644
Binary files a/public/images/emoji/facebook_messenger/fairy.png and b/public/images/emoji/facebook_messenger/fairy.png differ
diff --git a/public/images/emoji/facebook_messenger/fairy/2.png b/public/images/emoji/facebook_messenger/fairy/2.png
index 91e1de4e5dc..578c0af4598 100644
Binary files a/public/images/emoji/facebook_messenger/fairy/2.png and b/public/images/emoji/facebook_messenger/fairy/2.png differ
diff --git a/public/images/emoji/facebook_messenger/fairy/3.png b/public/images/emoji/facebook_messenger/fairy/3.png
index 42821806e92..578c0af4598 100644
Binary files a/public/images/emoji/facebook_messenger/fairy/3.png and b/public/images/emoji/facebook_messenger/fairy/3.png differ
diff --git a/public/images/emoji/facebook_messenger/fairy/4.png b/public/images/emoji/facebook_messenger/fairy/4.png
index 9e8d3adb897..578c0af4598 100644
Binary files a/public/images/emoji/facebook_messenger/fairy/4.png and b/public/images/emoji/facebook_messenger/fairy/4.png differ
diff --git a/public/images/emoji/facebook_messenger/fairy/5.png b/public/images/emoji/facebook_messenger/fairy/5.png
index 88d190e3926..578c0af4598 100644
Binary files a/public/images/emoji/facebook_messenger/fairy/5.png and b/public/images/emoji/facebook_messenger/fairy/5.png differ
diff --git a/public/images/emoji/facebook_messenger/fairy/6.png b/public/images/emoji/facebook_messenger/fairy/6.png
index e6ab8ade743..578c0af4598 100644
Binary files a/public/images/emoji/facebook_messenger/fairy/6.png and b/public/images/emoji/facebook_messenger/fairy/6.png differ
diff --git a/public/images/emoji/facebook_messenger/falkland_islands.png b/public/images/emoji/facebook_messenger/falkland_islands.png
index d97a84cea15..d92d34fb2fc 100644
Binary files a/public/images/emoji/facebook_messenger/falkland_islands.png and b/public/images/emoji/facebook_messenger/falkland_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/fallen_leaf.png b/public/images/emoji/facebook_messenger/fallen_leaf.png
index f349fd56d10..c36b650a353 100644
Binary files a/public/images/emoji/facebook_messenger/fallen_leaf.png and b/public/images/emoji/facebook_messenger/fallen_leaf.png differ
diff --git a/public/images/emoji/facebook_messenger/family.png b/public/images/emoji/facebook_messenger/family.png
index 08b4d427baa..f062b56d63e 100644
Binary files a/public/images/emoji/facebook_messenger/family.png and b/public/images/emoji/facebook_messenger/family.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_boy.png b/public/images/emoji/facebook_messenger/family_man_boy.png
index d31b0f6209a..d5f9acd8449 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_boy.png and b/public/images/emoji/facebook_messenger/family_man_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_boy_boy.png b/public/images/emoji/facebook_messenger/family_man_boy_boy.png
index 67d15f282cf..7071038f698 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_boy_boy.png and b/public/images/emoji/facebook_messenger/family_man_boy_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_girl.png b/public/images/emoji/facebook_messenger/family_man_girl.png
index 4bb3d823f80..19a459b2ec3 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_girl.png and b/public/images/emoji/facebook_messenger/family_man_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_girl_boy.png b/public/images/emoji/facebook_messenger/family_man_girl_boy.png
index a8b6469dcb1..23143257d58 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_girl_boy.png and b/public/images/emoji/facebook_messenger/family_man_girl_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_girl_girl.png b/public/images/emoji/facebook_messenger/family_man_girl_girl.png
index e1aa1a80db0..b3954a2ca38 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_girl_girl.png and b/public/images/emoji/facebook_messenger/family_man_girl_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_man_boy.png b/public/images/emoji/facebook_messenger/family_man_man_boy.png
index 02c84cb2374..1f70963cb52 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_man_boy.png and b/public/images/emoji/facebook_messenger/family_man_man_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_man_boy_boy.png b/public/images/emoji/facebook_messenger/family_man_man_boy_boy.png
index b26bb9ae075..f0042698f3a 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_man_boy_boy.png and b/public/images/emoji/facebook_messenger/family_man_man_boy_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_man_girl.png b/public/images/emoji/facebook_messenger/family_man_man_girl.png
index b8aa492934b..ad0d796e1a0 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_man_girl.png and b/public/images/emoji/facebook_messenger/family_man_man_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_man_girl_boy.png b/public/images/emoji/facebook_messenger/family_man_man_girl_boy.png
index e5f46611b54..38c179099dd 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_man_girl_boy.png and b/public/images/emoji/facebook_messenger/family_man_man_girl_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_man_girl_girl.png b/public/images/emoji/facebook_messenger/family_man_man_girl_girl.png
index 569ee332e2e..137ef25dee1 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_man_girl_girl.png and b/public/images/emoji/facebook_messenger/family_man_man_girl_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_woman_boy.png b/public/images/emoji/facebook_messenger/family_man_woman_boy.png
index d6749b798dd..632185dca71 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_woman_boy.png and b/public/images/emoji/facebook_messenger/family_man_woman_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_woman_boy_boy.png b/public/images/emoji/facebook_messenger/family_man_woman_boy_boy.png
index 34b21628a19..e5355a098a9 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_woman_boy_boy.png and b/public/images/emoji/facebook_messenger/family_man_woman_boy_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_woman_boys.png b/public/images/emoji/facebook_messenger/family_man_woman_boys.png
index 34b21628a19..e5355a098a9 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_woman_boys.png and b/public/images/emoji/facebook_messenger/family_man_woman_boys.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_woman_girl.png b/public/images/emoji/facebook_messenger/family_man_woman_girl.png
index ff4539599f6..bdecab4e744 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_woman_girl.png and b/public/images/emoji/facebook_messenger/family_man_woman_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_woman_girl_boy.png b/public/images/emoji/facebook_messenger/family_man_woman_girl_boy.png
index 08b4d427baa..f062b56d63e 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_woman_girl_boy.png and b/public/images/emoji/facebook_messenger/family_man_woman_girl_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_woman_girl_girl.png b/public/images/emoji/facebook_messenger/family_man_woman_girl_girl.png
index 2e160431664..c5871f65e1a 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_woman_girl_girl.png and b/public/images/emoji/facebook_messenger/family_man_woman_girl_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_woman_girls.png b/public/images/emoji/facebook_messenger/family_man_woman_girls.png
index 2e160431664..c5871f65e1a 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_woman_girls.png and b/public/images/emoji/facebook_messenger/family_man_woman_girls.png differ
diff --git a/public/images/emoji/facebook_messenger/family_men_boy.png b/public/images/emoji/facebook_messenger/family_men_boy.png
index 02c84cb2374..1f70963cb52 100644
Binary files a/public/images/emoji/facebook_messenger/family_men_boy.png and b/public/images/emoji/facebook_messenger/family_men_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_men_boys.png b/public/images/emoji/facebook_messenger/family_men_boys.png
index b26bb9ae075..f0042698f3a 100644
Binary files a/public/images/emoji/facebook_messenger/family_men_boys.png and b/public/images/emoji/facebook_messenger/family_men_boys.png differ
diff --git a/public/images/emoji/facebook_messenger/family_men_girl.png b/public/images/emoji/facebook_messenger/family_men_girl.png
index b8aa492934b..ad0d796e1a0 100644
Binary files a/public/images/emoji/facebook_messenger/family_men_girl.png and b/public/images/emoji/facebook_messenger/family_men_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_men_girl_boy.png b/public/images/emoji/facebook_messenger/family_men_girl_boy.png
index e5f46611b54..38c179099dd 100644
Binary files a/public/images/emoji/facebook_messenger/family_men_girl_boy.png and b/public/images/emoji/facebook_messenger/family_men_girl_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_men_girls.png b/public/images/emoji/facebook_messenger/family_men_girls.png
index 569ee332e2e..137ef25dee1 100644
Binary files a/public/images/emoji/facebook_messenger/family_men_girls.png and b/public/images/emoji/facebook_messenger/family_men_girls.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_boy.png b/public/images/emoji/facebook_messenger/family_woman_boy.png
index 3b0f755fd8c..85b90bce15f 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_boy.png and b/public/images/emoji/facebook_messenger/family_woman_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_boy_boy.png b/public/images/emoji/facebook_messenger/family_woman_boy_boy.png
index f9a18137382..8ad5c0ef74a 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_boy_boy.png and b/public/images/emoji/facebook_messenger/family_woman_boy_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_girl.png b/public/images/emoji/facebook_messenger/family_woman_girl.png
index 966c36a0b90..88006bf99a0 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_girl.png and b/public/images/emoji/facebook_messenger/family_woman_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_girl_boy.png b/public/images/emoji/facebook_messenger/family_woman_girl_boy.png
index 68b96718176..6a75a1fdf83 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_girl_boy.png and b/public/images/emoji/facebook_messenger/family_woman_girl_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_girl_girl.png b/public/images/emoji/facebook_messenger/family_woman_girl_girl.png
index 1e1995f8bf4..b4507cee6d6 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_girl_girl.png and b/public/images/emoji/facebook_messenger/family_woman_girl_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_woman_boy.png b/public/images/emoji/facebook_messenger/family_woman_woman_boy.png
index 7246ed2b02f..114275fe534 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_woman_boy.png and b/public/images/emoji/facebook_messenger/family_woman_woman_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_woman_boy_boy.png b/public/images/emoji/facebook_messenger/family_woman_woman_boy_boy.png
index 734955bf4a8..9b3324a616d 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_woman_boy_boy.png and b/public/images/emoji/facebook_messenger/family_woman_woman_boy_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_woman_girl.png b/public/images/emoji/facebook_messenger/family_woman_woman_girl.png
index a702d02e5b7..776eb9c96d5 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_woman_girl.png and b/public/images/emoji/facebook_messenger/family_woman_woman_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_woman_girl_boy.png b/public/images/emoji/facebook_messenger/family_woman_woman_girl_boy.png
index d21b40444d9..21669217fce 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_woman_girl_boy.png and b/public/images/emoji/facebook_messenger/family_woman_woman_girl_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_woman_girl_girl.png b/public/images/emoji/facebook_messenger/family_woman_woman_girl_girl.png
index 5f3f8b821ef..61d3425d94c 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_woman_girl_girl.png and b/public/images/emoji/facebook_messenger/family_woman_woman_girl_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_women_boy.png b/public/images/emoji/facebook_messenger/family_women_boy.png
index 7246ed2b02f..114275fe534 100644
Binary files a/public/images/emoji/facebook_messenger/family_women_boy.png and b/public/images/emoji/facebook_messenger/family_women_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_women_boys.png b/public/images/emoji/facebook_messenger/family_women_boys.png
index 734955bf4a8..9b3324a616d 100644
Binary files a/public/images/emoji/facebook_messenger/family_women_boys.png and b/public/images/emoji/facebook_messenger/family_women_boys.png differ
diff --git a/public/images/emoji/facebook_messenger/family_women_girl.png b/public/images/emoji/facebook_messenger/family_women_girl.png
index a702d02e5b7..776eb9c96d5 100644
Binary files a/public/images/emoji/facebook_messenger/family_women_girl.png and b/public/images/emoji/facebook_messenger/family_women_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_women_girl_boy.png b/public/images/emoji/facebook_messenger/family_women_girl_boy.png
index d21b40444d9..21669217fce 100644
Binary files a/public/images/emoji/facebook_messenger/family_women_girl_boy.png and b/public/images/emoji/facebook_messenger/family_women_girl_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_women_girls.png b/public/images/emoji/facebook_messenger/family_women_girls.png
index 5f3f8b821ef..61d3425d94c 100644
Binary files a/public/images/emoji/facebook_messenger/family_women_girls.png and b/public/images/emoji/facebook_messenger/family_women_girls.png differ
diff --git a/public/images/emoji/facebook_messenger/faroe_islands.png b/public/images/emoji/facebook_messenger/faroe_islands.png
index 5da7953f8d0..6968ee7c57c 100644
Binary files a/public/images/emoji/facebook_messenger/faroe_islands.png and b/public/images/emoji/facebook_messenger/faroe_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/fast_forward.png b/public/images/emoji/facebook_messenger/fast_forward.png
index 3e26428da13..2a0a36fdfad 100644
Binary files a/public/images/emoji/facebook_messenger/fast_forward.png and b/public/images/emoji/facebook_messenger/fast_forward.png differ
diff --git a/public/images/emoji/facebook_messenger/fax.png b/public/images/emoji/facebook_messenger/fax.png
index c28739d4599..5fe54424db4 100644
Binary files a/public/images/emoji/facebook_messenger/fax.png and b/public/images/emoji/facebook_messenger/fax.png differ
diff --git a/public/images/emoji/facebook_messenger/fearful.png b/public/images/emoji/facebook_messenger/fearful.png
index c42b60ae3b7..cac14ad2d04 100644
Binary files a/public/images/emoji/facebook_messenger/fearful.png and b/public/images/emoji/facebook_messenger/fearful.png differ
diff --git a/public/images/emoji/facebook_messenger/feet.png b/public/images/emoji/facebook_messenger/feet.png
index 47eb29d7b8d..19555800a93 100644
Binary files a/public/images/emoji/facebook_messenger/feet.png and b/public/images/emoji/facebook_messenger/feet.png differ
diff --git a/public/images/emoji/facebook_messenger/female_couple_with_heart.png b/public/images/emoji/facebook_messenger/female_couple_with_heart.png
index b82bbf04b49..ab3c64daed3 100644
Binary files a/public/images/emoji/facebook_messenger/female_couple_with_heart.png and b/public/images/emoji/facebook_messenger/female_couple_with_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/female_couplekiss.png b/public/images/emoji/facebook_messenger/female_couplekiss.png
index 4f1324e09f1..cb33b1daf94 100644
Binary files a/public/images/emoji/facebook_messenger/female_couplekiss.png and b/public/images/emoji/facebook_messenger/female_couplekiss.png differ
diff --git a/public/images/emoji/facebook_messenger/female_detective.png b/public/images/emoji/facebook_messenger/female_detective.png
index c1703a7c869..0c05fc2b6cc 100644
Binary files a/public/images/emoji/facebook_messenger/female_detective.png and b/public/images/emoji/facebook_messenger/female_detective.png differ
diff --git a/public/images/emoji/facebook_messenger/ferris_wheel.png b/public/images/emoji/facebook_messenger/ferris_wheel.png
index d88a5881ce8..ed9b3bad6cf 100644
Binary files a/public/images/emoji/facebook_messenger/ferris_wheel.png and b/public/images/emoji/facebook_messenger/ferris_wheel.png differ
diff --git a/public/images/emoji/facebook_messenger/ferry.png b/public/images/emoji/facebook_messenger/ferry.png
index b56a1cb3ff3..094d57bc697 100644
Binary files a/public/images/emoji/facebook_messenger/ferry.png and b/public/images/emoji/facebook_messenger/ferry.png differ
diff --git a/public/images/emoji/facebook_messenger/field_hockey.png b/public/images/emoji/facebook_messenger/field_hockey.png
index fb4f1e573a1..170a99ef0da 100644
Binary files a/public/images/emoji/facebook_messenger/field_hockey.png and b/public/images/emoji/facebook_messenger/field_hockey.png differ
diff --git a/public/images/emoji/facebook_messenger/fiji.png b/public/images/emoji/facebook_messenger/fiji.png
index df504caef6c..664e772e598 100644
Binary files a/public/images/emoji/facebook_messenger/fiji.png and b/public/images/emoji/facebook_messenger/fiji.png differ
diff --git a/public/images/emoji/facebook_messenger/file_cabinet.png b/public/images/emoji/facebook_messenger/file_cabinet.png
index f94b0fd46ae..65fd2c5c291 100644
Binary files a/public/images/emoji/facebook_messenger/file_cabinet.png and b/public/images/emoji/facebook_messenger/file_cabinet.png differ
diff --git a/public/images/emoji/facebook_messenger/file_folder.png b/public/images/emoji/facebook_messenger/file_folder.png
index 131226b2b45..f0767e0c857 100644
Binary files a/public/images/emoji/facebook_messenger/file_folder.png and b/public/images/emoji/facebook_messenger/file_folder.png differ
diff --git a/public/images/emoji/facebook_messenger/film_frames.png b/public/images/emoji/facebook_messenger/film_frames.png
index f0fcd6fc1dc..a52d79d20f5 100644
Binary files a/public/images/emoji/facebook_messenger/film_frames.png and b/public/images/emoji/facebook_messenger/film_frames.png differ
diff --git a/public/images/emoji/facebook_messenger/film_projector.png b/public/images/emoji/facebook_messenger/film_projector.png
index 3acb6ea9c3f..61cf7f7bacb 100644
Binary files a/public/images/emoji/facebook_messenger/film_projector.png and b/public/images/emoji/facebook_messenger/film_projector.png differ
diff --git a/public/images/emoji/facebook_messenger/film_strip.png b/public/images/emoji/facebook_messenger/film_strip.png
index f0fcd6fc1dc..a52d79d20f5 100644
Binary files a/public/images/emoji/facebook_messenger/film_strip.png and b/public/images/emoji/facebook_messenger/film_strip.png differ
diff --git a/public/images/emoji/facebook_messenger/finland.png b/public/images/emoji/facebook_messenger/finland.png
index 3e6178f10a4..b912331641a 100644
Binary files a/public/images/emoji/facebook_messenger/finland.png and b/public/images/emoji/facebook_messenger/finland.png differ
diff --git a/public/images/emoji/facebook_messenger/fire.png b/public/images/emoji/facebook_messenger/fire.png
index d871ffb8a4d..6915f6350ee 100644
Binary files a/public/images/emoji/facebook_messenger/fire.png and b/public/images/emoji/facebook_messenger/fire.png differ
diff --git a/public/images/emoji/facebook_messenger/fire_engine.png b/public/images/emoji/facebook_messenger/fire_engine.png
index 66b69e4f300..2638586eee0 100644
Binary files a/public/images/emoji/facebook_messenger/fire_engine.png and b/public/images/emoji/facebook_messenger/fire_engine.png differ
diff --git a/public/images/emoji/facebook_messenger/fireworks.png b/public/images/emoji/facebook_messenger/fireworks.png
index e4367bbe5dd..2668be13978 100644
Binary files a/public/images/emoji/facebook_messenger/fireworks.png and b/public/images/emoji/facebook_messenger/fireworks.png differ
diff --git a/public/images/emoji/facebook_messenger/first_quarter_moon.png b/public/images/emoji/facebook_messenger/first_quarter_moon.png
index 1ac1c39d87a..d0e1d4e755f 100644
Binary files a/public/images/emoji/facebook_messenger/first_quarter_moon.png and b/public/images/emoji/facebook_messenger/first_quarter_moon.png differ
diff --git a/public/images/emoji/facebook_messenger/first_quarter_moon_with_face.png b/public/images/emoji/facebook_messenger/first_quarter_moon_with_face.png
index 144e9976c5c..08066c164a8 100644
Binary files a/public/images/emoji/facebook_messenger/first_quarter_moon_with_face.png and b/public/images/emoji/facebook_messenger/first_quarter_moon_with_face.png differ
diff --git a/public/images/emoji/facebook_messenger/fish.png b/public/images/emoji/facebook_messenger/fish.png
index 73ab8a00678..1d94061c4b5 100644
Binary files a/public/images/emoji/facebook_messenger/fish.png and b/public/images/emoji/facebook_messenger/fish.png differ
diff --git a/public/images/emoji/facebook_messenger/fish_cake.png b/public/images/emoji/facebook_messenger/fish_cake.png
index 89982e42bf1..7337b4a9736 100644
Binary files a/public/images/emoji/facebook_messenger/fish_cake.png and b/public/images/emoji/facebook_messenger/fish_cake.png differ
diff --git a/public/images/emoji/facebook_messenger/fishing_pole_and_fish.png b/public/images/emoji/facebook_messenger/fishing_pole_and_fish.png
index 827a249f5f2..1d90b0b3c49 100644
Binary files a/public/images/emoji/facebook_messenger/fishing_pole_and_fish.png and b/public/images/emoji/facebook_messenger/fishing_pole_and_fish.png differ
diff --git a/public/images/emoji/facebook_messenger/fist.png b/public/images/emoji/facebook_messenger/fist.png
index 735826472a0..51a0bdaec08 100644
Binary files a/public/images/emoji/facebook_messenger/fist.png and b/public/images/emoji/facebook_messenger/fist.png differ
diff --git a/public/images/emoji/facebook_messenger/fist/2.png b/public/images/emoji/facebook_messenger/fist/2.png
index 5731ed8c0af..e756904eae3 100644
Binary files a/public/images/emoji/facebook_messenger/fist/2.png and b/public/images/emoji/facebook_messenger/fist/2.png differ
diff --git a/public/images/emoji/facebook_messenger/fist/3.png b/public/images/emoji/facebook_messenger/fist/3.png
index db84dee200e..cd164def815 100644
Binary files a/public/images/emoji/facebook_messenger/fist/3.png and b/public/images/emoji/facebook_messenger/fist/3.png differ
diff --git a/public/images/emoji/facebook_messenger/fist/4.png b/public/images/emoji/facebook_messenger/fist/4.png
index 6390df800dd..b27b1cee5b8 100644
Binary files a/public/images/emoji/facebook_messenger/fist/4.png and b/public/images/emoji/facebook_messenger/fist/4.png differ
diff --git a/public/images/emoji/facebook_messenger/fist/5.png b/public/images/emoji/facebook_messenger/fist/5.png
index 32890d75b7c..3d78025350c 100644
Binary files a/public/images/emoji/facebook_messenger/fist/5.png and b/public/images/emoji/facebook_messenger/fist/5.png differ
diff --git a/public/images/emoji/facebook_messenger/fist/6.png b/public/images/emoji/facebook_messenger/fist/6.png
index 36ed9f43f1e..10e9008aae4 100644
Binary files a/public/images/emoji/facebook_messenger/fist/6.png and b/public/images/emoji/facebook_messenger/fist/6.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_left.png b/public/images/emoji/facebook_messenger/fist_left.png
index f1ebb97514a..77c33b2da81 100644
Binary files a/public/images/emoji/facebook_messenger/fist_left.png and b/public/images/emoji/facebook_messenger/fist_left.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_left/2.png b/public/images/emoji/facebook_messenger/fist_left/2.png
index 1360d252cef..c3ed95ea3ff 100644
Binary files a/public/images/emoji/facebook_messenger/fist_left/2.png and b/public/images/emoji/facebook_messenger/fist_left/2.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_left/3.png b/public/images/emoji/facebook_messenger/fist_left/3.png
index 270de69cd23..620e7210978 100644
Binary files a/public/images/emoji/facebook_messenger/fist_left/3.png and b/public/images/emoji/facebook_messenger/fist_left/3.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_left/4.png b/public/images/emoji/facebook_messenger/fist_left/4.png
index 99e8ae08f3f..227ca9af959 100644
Binary files a/public/images/emoji/facebook_messenger/fist_left/4.png and b/public/images/emoji/facebook_messenger/fist_left/4.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_left/5.png b/public/images/emoji/facebook_messenger/fist_left/5.png
index 5600a525fbb..cca670bc26f 100644
Binary files a/public/images/emoji/facebook_messenger/fist_left/5.png and b/public/images/emoji/facebook_messenger/fist_left/5.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_left/6.png b/public/images/emoji/facebook_messenger/fist_left/6.png
index 4db9f46f345..db7f571ea18 100644
Binary files a/public/images/emoji/facebook_messenger/fist_left/6.png and b/public/images/emoji/facebook_messenger/fist_left/6.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_right.png b/public/images/emoji/facebook_messenger/fist_right.png
index 010432f2013..9b7ef4d8a49 100644
Binary files a/public/images/emoji/facebook_messenger/fist_right.png and b/public/images/emoji/facebook_messenger/fist_right.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_right/2.png b/public/images/emoji/facebook_messenger/fist_right/2.png
index a71348e322b..e23940f9732 100644
Binary files a/public/images/emoji/facebook_messenger/fist_right/2.png and b/public/images/emoji/facebook_messenger/fist_right/2.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_right/3.png b/public/images/emoji/facebook_messenger/fist_right/3.png
index b62317eca5a..58e6dbbb435 100644
Binary files a/public/images/emoji/facebook_messenger/fist_right/3.png and b/public/images/emoji/facebook_messenger/fist_right/3.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_right/4.png b/public/images/emoji/facebook_messenger/fist_right/4.png
index abceea04345..8879b93b4a1 100644
Binary files a/public/images/emoji/facebook_messenger/fist_right/4.png and b/public/images/emoji/facebook_messenger/fist_right/4.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_right/5.png b/public/images/emoji/facebook_messenger/fist_right/5.png
index e64682dfe54..dde48c74db8 100644
Binary files a/public/images/emoji/facebook_messenger/fist_right/5.png and b/public/images/emoji/facebook_messenger/fist_right/5.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_right/6.png b/public/images/emoji/facebook_messenger/fist_right/6.png
index daa257c5c26..e097677184d 100644
Binary files a/public/images/emoji/facebook_messenger/fist_right/6.png and b/public/images/emoji/facebook_messenger/fist_right/6.png differ
diff --git a/public/images/emoji/facebook_messenger/five.png b/public/images/emoji/facebook_messenger/five.png
index cea258d2f05..e7b38107ebb 100644
Binary files a/public/images/emoji/facebook_messenger/five.png and b/public/images/emoji/facebook_messenger/five.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_black.png b/public/images/emoji/facebook_messenger/flag_black.png
index 5c1237bdad2..bc52913998d 100644
Binary files a/public/images/emoji/facebook_messenger/flag_black.png and b/public/images/emoji/facebook_messenger/flag_black.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_cn.png b/public/images/emoji/facebook_messenger/flag_cn.png
index a9325fc771c..ddad4d83158 100644
Binary files a/public/images/emoji/facebook_messenger/flag_cn.png and b/public/images/emoji/facebook_messenger/flag_cn.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_de.png b/public/images/emoji/facebook_messenger/flag_de.png
index 964116acbb5..8a375afccd6 100644
Binary files a/public/images/emoji/facebook_messenger/flag_de.png and b/public/images/emoji/facebook_messenger/flag_de.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_es.png b/public/images/emoji/facebook_messenger/flag_es.png
index 82d50c036e3..5d2f27537fd 100644
Binary files a/public/images/emoji/facebook_messenger/flag_es.png and b/public/images/emoji/facebook_messenger/flag_es.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_fr.png b/public/images/emoji/facebook_messenger/flag_fr.png
index f8afe536517..2ef71d792ab 100644
Binary files a/public/images/emoji/facebook_messenger/flag_fr.png and b/public/images/emoji/facebook_messenger/flag_fr.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_gb.png b/public/images/emoji/facebook_messenger/flag_gb.png
index bc850e7890e..8ba8cda3ac0 100644
Binary files a/public/images/emoji/facebook_messenger/flag_gb.png and b/public/images/emoji/facebook_messenger/flag_gb.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_it.png b/public/images/emoji/facebook_messenger/flag_it.png
index e5e0646c21a..1b5c5906b33 100644
Binary files a/public/images/emoji/facebook_messenger/flag_it.png and b/public/images/emoji/facebook_messenger/flag_it.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_jp.png b/public/images/emoji/facebook_messenger/flag_jp.png
index ab749c77f7d..ef2bc7b48fa 100644
Binary files a/public/images/emoji/facebook_messenger/flag_jp.png and b/public/images/emoji/facebook_messenger/flag_jp.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_kr.png b/public/images/emoji/facebook_messenger/flag_kr.png
index 73c4454e7fe..4bd85faa98d 100644
Binary files a/public/images/emoji/facebook_messenger/flag_kr.png and b/public/images/emoji/facebook_messenger/flag_kr.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_ru.png b/public/images/emoji/facebook_messenger/flag_ru.png
index f3932d9f3cc..89692b70ef6 100644
Binary files a/public/images/emoji/facebook_messenger/flag_ru.png and b/public/images/emoji/facebook_messenger/flag_ru.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_us.png b/public/images/emoji/facebook_messenger/flag_us.png
index b0c3a76dd6a..103498e0095 100644
Binary files a/public/images/emoji/facebook_messenger/flag_us.png and b/public/images/emoji/facebook_messenger/flag_us.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_white.png b/public/images/emoji/facebook_messenger/flag_white.png
index 5f052fff2af..34dfcb802ac 100644
Binary files a/public/images/emoji/facebook_messenger/flag_white.png and b/public/images/emoji/facebook_messenger/flag_white.png differ
diff --git a/public/images/emoji/facebook_messenger/flags.png b/public/images/emoji/facebook_messenger/flags.png
index 52e8a4a95f3..3ff68d9b476 100644
Binary files a/public/images/emoji/facebook_messenger/flags.png and b/public/images/emoji/facebook_messenger/flags.png differ
diff --git a/public/images/emoji/facebook_messenger/flame.png b/public/images/emoji/facebook_messenger/flame.png
index d871ffb8a4d..6915f6350ee 100644
Binary files a/public/images/emoji/facebook_messenger/flame.png and b/public/images/emoji/facebook_messenger/flame.png differ
diff --git a/public/images/emoji/facebook_messenger/flashlight.png b/public/images/emoji/facebook_messenger/flashlight.png
index 3bb5512763d..7ea2a2ff840 100644
Binary files a/public/images/emoji/facebook_messenger/flashlight.png and b/public/images/emoji/facebook_messenger/flashlight.png differ
diff --git a/public/images/emoji/facebook_messenger/fleur-de-lis.png b/public/images/emoji/facebook_messenger/fleur-de-lis.png
index 27cd209049a..4066f0646ac 100644
Binary files a/public/images/emoji/facebook_messenger/fleur-de-lis.png and b/public/images/emoji/facebook_messenger/fleur-de-lis.png differ
diff --git a/public/images/emoji/facebook_messenger/fleur_de_lis.png b/public/images/emoji/facebook_messenger/fleur_de_lis.png
index 27cd209049a..4066f0646ac 100644
Binary files a/public/images/emoji/facebook_messenger/fleur_de_lis.png and b/public/images/emoji/facebook_messenger/fleur_de_lis.png differ
diff --git a/public/images/emoji/facebook_messenger/flight_arrival.png b/public/images/emoji/facebook_messenger/flight_arrival.png
index 0585a1c36c2..4e228666469 100644
Binary files a/public/images/emoji/facebook_messenger/flight_arrival.png and b/public/images/emoji/facebook_messenger/flight_arrival.png differ
diff --git a/public/images/emoji/facebook_messenger/flight_departure.png b/public/images/emoji/facebook_messenger/flight_departure.png
index dc86670a865..bfa84966f77 100644
Binary files a/public/images/emoji/facebook_messenger/flight_departure.png and b/public/images/emoji/facebook_messenger/flight_departure.png differ
diff --git a/public/images/emoji/facebook_messenger/floppy_disk.png b/public/images/emoji/facebook_messenger/floppy_disk.png
index 25bd410b023..2efaf0997a6 100644
Binary files a/public/images/emoji/facebook_messenger/floppy_disk.png and b/public/images/emoji/facebook_messenger/floppy_disk.png differ
diff --git a/public/images/emoji/facebook_messenger/flower_playing_cards.png b/public/images/emoji/facebook_messenger/flower_playing_cards.png
index baf5f9ddded..2bb67f87db8 100644
Binary files a/public/images/emoji/facebook_messenger/flower_playing_cards.png and b/public/images/emoji/facebook_messenger/flower_playing_cards.png differ
diff --git a/public/images/emoji/facebook_messenger/flushed.png b/public/images/emoji/facebook_messenger/flushed.png
index 7b4667ad26f..b1de1c333ac 100644
Binary files a/public/images/emoji/facebook_messenger/flushed.png and b/public/images/emoji/facebook_messenger/flushed.png differ
diff --git a/public/images/emoji/facebook_messenger/flying_saucer.png b/public/images/emoji/facebook_messenger/flying_saucer.png
index 7d5c8628554..012c32faf95 100644
Binary files a/public/images/emoji/facebook_messenger/flying_saucer.png and b/public/images/emoji/facebook_messenger/flying_saucer.png differ
diff --git a/public/images/emoji/facebook_messenger/fog.png b/public/images/emoji/facebook_messenger/fog.png
index f8aee2c7b5e..5684bd24671 100644
Binary files a/public/images/emoji/facebook_messenger/fog.png and b/public/images/emoji/facebook_messenger/fog.png differ
diff --git a/public/images/emoji/facebook_messenger/foggy.png b/public/images/emoji/facebook_messenger/foggy.png
index e5dcb6812ad..711fe0d85de 100644
Binary files a/public/images/emoji/facebook_messenger/foggy.png and b/public/images/emoji/facebook_messenger/foggy.png differ
diff --git a/public/images/emoji/facebook_messenger/football.png b/public/images/emoji/facebook_messenger/football.png
index 65f4c1147af..4db67dcfe85 100644
Binary files a/public/images/emoji/facebook_messenger/football.png and b/public/images/emoji/facebook_messenger/football.png differ
diff --git a/public/images/emoji/facebook_messenger/footprints.png b/public/images/emoji/facebook_messenger/footprints.png
index 47eb29d7b8d..19555800a93 100644
Binary files a/public/images/emoji/facebook_messenger/footprints.png and b/public/images/emoji/facebook_messenger/footprints.png differ
diff --git a/public/images/emoji/facebook_messenger/fork_and_knife.png b/public/images/emoji/facebook_messenger/fork_and_knife.png
index e233399e521..4dd1ed6f5cd 100644
Binary files a/public/images/emoji/facebook_messenger/fork_and_knife.png and b/public/images/emoji/facebook_messenger/fork_and_knife.png differ
diff --git a/public/images/emoji/facebook_messenger/fork_and_knife_with_plate.png b/public/images/emoji/facebook_messenger/fork_and_knife_with_plate.png
index df63dcc4f4f..84fd7bba6a0 100644
Binary files a/public/images/emoji/facebook_messenger/fork_and_knife_with_plate.png and b/public/images/emoji/facebook_messenger/fork_and_knife_with_plate.png differ
diff --git a/public/images/emoji/facebook_messenger/fork_knife_plate.png b/public/images/emoji/facebook_messenger/fork_knife_plate.png
index df63dcc4f4f..84fd7bba6a0 100644
Binary files a/public/images/emoji/facebook_messenger/fork_knife_plate.png and b/public/images/emoji/facebook_messenger/fork_knife_plate.png differ
diff --git a/public/images/emoji/facebook_messenger/fortune_cookie.png b/public/images/emoji/facebook_messenger/fortune_cookie.png
index 94a8cdca403..d023dc45dd7 100644
Binary files a/public/images/emoji/facebook_messenger/fortune_cookie.png and b/public/images/emoji/facebook_messenger/fortune_cookie.png differ
diff --git a/public/images/emoji/facebook_messenger/fountain.png b/public/images/emoji/facebook_messenger/fountain.png
index c128b6075ea..13cc69f0d7f 100644
Binary files a/public/images/emoji/facebook_messenger/fountain.png and b/public/images/emoji/facebook_messenger/fountain.png differ
diff --git a/public/images/emoji/facebook_messenger/fountain_pen.png b/public/images/emoji/facebook_messenger/fountain_pen.png
index 96584c9f579..2e7296057be 100644
Binary files a/public/images/emoji/facebook_messenger/fountain_pen.png and b/public/images/emoji/facebook_messenger/fountain_pen.png differ
diff --git a/public/images/emoji/facebook_messenger/four.png b/public/images/emoji/facebook_messenger/four.png
index f728effd4a7..bf7e0c444d7 100644
Binary files a/public/images/emoji/facebook_messenger/four.png and b/public/images/emoji/facebook_messenger/four.png differ
diff --git a/public/images/emoji/facebook_messenger/four_leaf_clover.png b/public/images/emoji/facebook_messenger/four_leaf_clover.png
index 99d39c965cb..6bb57731213 100644
Binary files a/public/images/emoji/facebook_messenger/four_leaf_clover.png and b/public/images/emoji/facebook_messenger/four_leaf_clover.png differ
diff --git a/public/images/emoji/facebook_messenger/fox_face.png b/public/images/emoji/facebook_messenger/fox_face.png
index 74bcddb7e72..ddc3a4e751c 100644
Binary files a/public/images/emoji/facebook_messenger/fox_face.png and b/public/images/emoji/facebook_messenger/fox_face.png differ
diff --git a/public/images/emoji/facebook_messenger/fr.png b/public/images/emoji/facebook_messenger/fr.png
index f8afe536517..2ef71d792ab 100644
Binary files a/public/images/emoji/facebook_messenger/fr.png and b/public/images/emoji/facebook_messenger/fr.png differ
diff --git a/public/images/emoji/facebook_messenger/frame_photo.png b/public/images/emoji/facebook_messenger/frame_photo.png
index ad38ccf08da..9a61cd3cd76 100644
Binary files a/public/images/emoji/facebook_messenger/frame_photo.png and b/public/images/emoji/facebook_messenger/frame_photo.png differ
diff --git a/public/images/emoji/facebook_messenger/frame_with_picture.png b/public/images/emoji/facebook_messenger/frame_with_picture.png
index ad38ccf08da..9a61cd3cd76 100644
Binary files a/public/images/emoji/facebook_messenger/frame_with_picture.png and b/public/images/emoji/facebook_messenger/frame_with_picture.png differ
diff --git a/public/images/emoji/facebook_messenger/framed_picture.png b/public/images/emoji/facebook_messenger/framed_picture.png
index ad38ccf08da..9a61cd3cd76 100644
Binary files a/public/images/emoji/facebook_messenger/framed_picture.png and b/public/images/emoji/facebook_messenger/framed_picture.png differ
diff --git a/public/images/emoji/facebook_messenger/free.png b/public/images/emoji/facebook_messenger/free.png
index 1b4d5a6973b..8079e733265 100644
Binary files a/public/images/emoji/facebook_messenger/free.png and b/public/images/emoji/facebook_messenger/free.png differ
diff --git a/public/images/emoji/facebook_messenger/french_guiana.png b/public/images/emoji/facebook_messenger/french_guiana.png
index b67d58af241..9a989f2cb18 100644
Binary files a/public/images/emoji/facebook_messenger/french_guiana.png and b/public/images/emoji/facebook_messenger/french_guiana.png differ
diff --git a/public/images/emoji/facebook_messenger/french_polynesia.png b/public/images/emoji/facebook_messenger/french_polynesia.png
index 8e67281736f..18c22d5625f 100644
Binary files a/public/images/emoji/facebook_messenger/french_polynesia.png and b/public/images/emoji/facebook_messenger/french_polynesia.png differ
diff --git a/public/images/emoji/facebook_messenger/french_southern_territories.png b/public/images/emoji/facebook_messenger/french_southern_territories.png
index ecc9bec0fa6..3e6643ad038 100644
Binary files a/public/images/emoji/facebook_messenger/french_southern_territories.png and b/public/images/emoji/facebook_messenger/french_southern_territories.png differ
diff --git a/public/images/emoji/facebook_messenger/fried_egg.png b/public/images/emoji/facebook_messenger/fried_egg.png
index 20578913f18..9020c53b0c8 100644
Binary files a/public/images/emoji/facebook_messenger/fried_egg.png and b/public/images/emoji/facebook_messenger/fried_egg.png differ
diff --git a/public/images/emoji/facebook_messenger/fried_shrimp.png b/public/images/emoji/facebook_messenger/fried_shrimp.png
index e3ffbd88884..16fca0768d7 100644
Binary files a/public/images/emoji/facebook_messenger/fried_shrimp.png and b/public/images/emoji/facebook_messenger/fried_shrimp.png differ
diff --git a/public/images/emoji/facebook_messenger/fries.png b/public/images/emoji/facebook_messenger/fries.png
index 49655d58273..e5b1893c87f 100644
Binary files a/public/images/emoji/facebook_messenger/fries.png and b/public/images/emoji/facebook_messenger/fries.png differ
diff --git a/public/images/emoji/facebook_messenger/frog.png b/public/images/emoji/facebook_messenger/frog.png
index 33274868db2..3dfa411b725 100644
Binary files a/public/images/emoji/facebook_messenger/frog.png and b/public/images/emoji/facebook_messenger/frog.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning.png b/public/images/emoji/facebook_messenger/frowning.png
index 55d6c9d4605..971c37f998c 100644
Binary files a/public/images/emoji/facebook_messenger/frowning.png and b/public/images/emoji/facebook_messenger/frowning.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning2.png b/public/images/emoji/facebook_messenger/frowning2.png
index 1c5988a20b5..e35c8cec021 100644
Binary files a/public/images/emoji/facebook_messenger/frowning2.png and b/public/images/emoji/facebook_messenger/frowning2.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_face.png b/public/images/emoji/facebook_messenger/frowning_face.png
index 1c5988a20b5..e35c8cec021 100644
Binary files a/public/images/emoji/facebook_messenger/frowning_face.png and b/public/images/emoji/facebook_messenger/frowning_face.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_man.png b/public/images/emoji/facebook_messenger/frowning_man.png
index e10ce817f85..87a0828c37a 100644
Binary files a/public/images/emoji/facebook_messenger/frowning_man.png and b/public/images/emoji/facebook_messenger/frowning_man.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_man/2.png b/public/images/emoji/facebook_messenger/frowning_man/2.png
index 5f04a5370d7..47aa4d9bee4 100644
Binary files a/public/images/emoji/facebook_messenger/frowning_man/2.png and b/public/images/emoji/facebook_messenger/frowning_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_man/3.png b/public/images/emoji/facebook_messenger/frowning_man/3.png
index 8be682c19d4..9c5aa561709 100644
Binary files a/public/images/emoji/facebook_messenger/frowning_man/3.png and b/public/images/emoji/facebook_messenger/frowning_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_man/4.png b/public/images/emoji/facebook_messenger/frowning_man/4.png
index 28b79908428..9583a2c59a5 100644
Binary files a/public/images/emoji/facebook_messenger/frowning_man/4.png and b/public/images/emoji/facebook_messenger/frowning_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_man/5.png b/public/images/emoji/facebook_messenger/frowning_man/5.png
index 5f8463196b4..2da1fb63d54 100644
Binary files a/public/images/emoji/facebook_messenger/frowning_man/5.png and b/public/images/emoji/facebook_messenger/frowning_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_man/6.png b/public/images/emoji/facebook_messenger/frowning_man/6.png
index 8c92a9c484b..80482863240 100644
Binary files a/public/images/emoji/facebook_messenger/frowning_man/6.png and b/public/images/emoji/facebook_messenger/frowning_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_woman.png b/public/images/emoji/facebook_messenger/frowning_woman.png
index 1e5f89e7b57..1b7de19871e 100644
Binary files a/public/images/emoji/facebook_messenger/frowning_woman.png and b/public/images/emoji/facebook_messenger/frowning_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_woman/2.png b/public/images/emoji/facebook_messenger/frowning_woman/2.png
index db018f2e812..d4e0b4aa13c 100644
Binary files a/public/images/emoji/facebook_messenger/frowning_woman/2.png and b/public/images/emoji/facebook_messenger/frowning_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_woman/3.png b/public/images/emoji/facebook_messenger/frowning_woman/3.png
index 2a32b70d58a..dc65835b2b7 100644
Binary files a/public/images/emoji/facebook_messenger/frowning_woman/3.png and b/public/images/emoji/facebook_messenger/frowning_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_woman/4.png b/public/images/emoji/facebook_messenger/frowning_woman/4.png
index 824a0bea02b..0b4c6946066 100644
Binary files a/public/images/emoji/facebook_messenger/frowning_woman/4.png and b/public/images/emoji/facebook_messenger/frowning_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_woman/5.png b/public/images/emoji/facebook_messenger/frowning_woman/5.png
index ca476ecf1f3..402b54502f7 100644
Binary files a/public/images/emoji/facebook_messenger/frowning_woman/5.png and b/public/images/emoji/facebook_messenger/frowning_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_woman/6.png b/public/images/emoji/facebook_messenger/frowning_woman/6.png
index c36b369e0b8..265d4fcffd5 100644
Binary files a/public/images/emoji/facebook_messenger/frowning_woman/6.png and b/public/images/emoji/facebook_messenger/frowning_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/fu.png b/public/images/emoji/facebook_messenger/fu.png
index 8e7fce2f49b..7f227d2d232 100644
Binary files a/public/images/emoji/facebook_messenger/fu.png and b/public/images/emoji/facebook_messenger/fu.png differ
diff --git a/public/images/emoji/facebook_messenger/fu/2.png b/public/images/emoji/facebook_messenger/fu/2.png
index 992338bb2b6..14c75b484fb 100644
Binary files a/public/images/emoji/facebook_messenger/fu/2.png and b/public/images/emoji/facebook_messenger/fu/2.png differ
diff --git a/public/images/emoji/facebook_messenger/fu/3.png b/public/images/emoji/facebook_messenger/fu/3.png
index aadc06129fe..e403a196a5c 100644
Binary files a/public/images/emoji/facebook_messenger/fu/3.png and b/public/images/emoji/facebook_messenger/fu/3.png differ
diff --git a/public/images/emoji/facebook_messenger/fu/4.png b/public/images/emoji/facebook_messenger/fu/4.png
index 8ad10be1169..d8507a7f628 100644
Binary files a/public/images/emoji/facebook_messenger/fu/4.png and b/public/images/emoji/facebook_messenger/fu/4.png differ
diff --git a/public/images/emoji/facebook_messenger/fu/5.png b/public/images/emoji/facebook_messenger/fu/5.png
index 695c4a6cb9c..e67c93cb2a4 100644
Binary files a/public/images/emoji/facebook_messenger/fu/5.png and b/public/images/emoji/facebook_messenger/fu/5.png differ
diff --git a/public/images/emoji/facebook_messenger/fu/6.png b/public/images/emoji/facebook_messenger/fu/6.png
index 3457e01312c..c3bd0d882f6 100644
Binary files a/public/images/emoji/facebook_messenger/fu/6.png and b/public/images/emoji/facebook_messenger/fu/6.png differ
diff --git a/public/images/emoji/facebook_messenger/fuelpump.png b/public/images/emoji/facebook_messenger/fuelpump.png
index 75df52ada8f..c0e4d0debb5 100644
Binary files a/public/images/emoji/facebook_messenger/fuelpump.png and b/public/images/emoji/facebook_messenger/fuelpump.png differ
diff --git a/public/images/emoji/facebook_messenger/full_moon.png b/public/images/emoji/facebook_messenger/full_moon.png
index 9d4cd0c36b7..2a7748b936b 100644
Binary files a/public/images/emoji/facebook_messenger/full_moon.png and b/public/images/emoji/facebook_messenger/full_moon.png differ
diff --git a/public/images/emoji/facebook_messenger/full_moon_with_face.png b/public/images/emoji/facebook_messenger/full_moon_with_face.png
index ff164d2be14..8fa6950024c 100644
Binary files a/public/images/emoji/facebook_messenger/full_moon_with_face.png and b/public/images/emoji/facebook_messenger/full_moon_with_face.png differ
diff --git a/public/images/emoji/facebook_messenger/funeral_urn.png b/public/images/emoji/facebook_messenger/funeral_urn.png
index 56112c50ed4..818fa27fb89 100644
Binary files a/public/images/emoji/facebook_messenger/funeral_urn.png and b/public/images/emoji/facebook_messenger/funeral_urn.png differ
diff --git a/public/images/emoji/facebook_messenger/gabon.png b/public/images/emoji/facebook_messenger/gabon.png
index 6563b2a69f0..c1a2fb11fcc 100644
Binary files a/public/images/emoji/facebook_messenger/gabon.png and b/public/images/emoji/facebook_messenger/gabon.png differ
diff --git a/public/images/emoji/facebook_messenger/gambia.png b/public/images/emoji/facebook_messenger/gambia.png
index 707ca2a121b..33622c52aeb 100644
Binary files a/public/images/emoji/facebook_messenger/gambia.png and b/public/images/emoji/facebook_messenger/gambia.png differ
diff --git a/public/images/emoji/facebook_messenger/game_die.png b/public/images/emoji/facebook_messenger/game_die.png
index 9ed66afdac8..4c6642d7987 100644
Binary files a/public/images/emoji/facebook_messenger/game_die.png and b/public/images/emoji/facebook_messenger/game_die.png differ
diff --git a/public/images/emoji/facebook_messenger/gb.png b/public/images/emoji/facebook_messenger/gb.png
index bc850e7890e..8ba8cda3ac0 100644
Binary files a/public/images/emoji/facebook_messenger/gb.png and b/public/images/emoji/facebook_messenger/gb.png differ
diff --git a/public/images/emoji/facebook_messenger/gear.png b/public/images/emoji/facebook_messenger/gear.png
index 6a9d3b8d1b1..dae873e04f5 100644
Binary files a/public/images/emoji/facebook_messenger/gear.png and b/public/images/emoji/facebook_messenger/gear.png differ
diff --git a/public/images/emoji/facebook_messenger/gem.png b/public/images/emoji/facebook_messenger/gem.png
index 7ffd84c773c..e4544a4fe58 100644
Binary files a/public/images/emoji/facebook_messenger/gem.png and b/public/images/emoji/facebook_messenger/gem.png differ
diff --git a/public/images/emoji/facebook_messenger/gemini.png b/public/images/emoji/facebook_messenger/gemini.png
index a08a5b768b7..7af737f442f 100644
Binary files a/public/images/emoji/facebook_messenger/gemini.png and b/public/images/emoji/facebook_messenger/gemini.png differ
diff --git a/public/images/emoji/facebook_messenger/genie.png b/public/images/emoji/facebook_messenger/genie.png
index f0eddcc91ae..e6eec0fe3c6 100644
Binary files a/public/images/emoji/facebook_messenger/genie.png and b/public/images/emoji/facebook_messenger/genie.png differ
diff --git a/public/images/emoji/facebook_messenger/georgia.png b/public/images/emoji/facebook_messenger/georgia.png
index 673f81ef6ff..34dc6a41893 100644
Binary files a/public/images/emoji/facebook_messenger/georgia.png and b/public/images/emoji/facebook_messenger/georgia.png differ
diff --git a/public/images/emoji/facebook_messenger/ghana.png b/public/images/emoji/facebook_messenger/ghana.png
index f1b8829dbab..968d76a9f99 100644
Binary files a/public/images/emoji/facebook_messenger/ghana.png and b/public/images/emoji/facebook_messenger/ghana.png differ
diff --git a/public/images/emoji/facebook_messenger/ghost.png b/public/images/emoji/facebook_messenger/ghost.png
index 45ea4f57b9b..a863a1583c2 100644
Binary files a/public/images/emoji/facebook_messenger/ghost.png and b/public/images/emoji/facebook_messenger/ghost.png differ
diff --git a/public/images/emoji/facebook_messenger/gibraltar.png b/public/images/emoji/facebook_messenger/gibraltar.png
index cbe9f11a125..95f4bde22ba 100644
Binary files a/public/images/emoji/facebook_messenger/gibraltar.png and b/public/images/emoji/facebook_messenger/gibraltar.png differ
diff --git a/public/images/emoji/facebook_messenger/gift.png b/public/images/emoji/facebook_messenger/gift.png
index d4abb27460e..f472a530a3d 100644
Binary files a/public/images/emoji/facebook_messenger/gift.png and b/public/images/emoji/facebook_messenger/gift.png differ
diff --git a/public/images/emoji/facebook_messenger/gift_heart.png b/public/images/emoji/facebook_messenger/gift_heart.png
index 7cb11440d2e..dc0ebbf3afe 100644
Binary files a/public/images/emoji/facebook_messenger/gift_heart.png and b/public/images/emoji/facebook_messenger/gift_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/giraffe.png b/public/images/emoji/facebook_messenger/giraffe.png
index be0e85d2896..38971ced073 100644
Binary files a/public/images/emoji/facebook_messenger/giraffe.png and b/public/images/emoji/facebook_messenger/giraffe.png differ
diff --git a/public/images/emoji/facebook_messenger/girl.png b/public/images/emoji/facebook_messenger/girl.png
index cef329322b0..6d02f25aefc 100644
Binary files a/public/images/emoji/facebook_messenger/girl.png and b/public/images/emoji/facebook_messenger/girl.png differ
diff --git a/public/images/emoji/facebook_messenger/girl/2.png b/public/images/emoji/facebook_messenger/girl/2.png
index 94ef7ffcde0..071073c959b 100644
Binary files a/public/images/emoji/facebook_messenger/girl/2.png and b/public/images/emoji/facebook_messenger/girl/2.png differ
diff --git a/public/images/emoji/facebook_messenger/girl/3.png b/public/images/emoji/facebook_messenger/girl/3.png
index 84c7e27b997..ee03e8afbea 100644
Binary files a/public/images/emoji/facebook_messenger/girl/3.png and b/public/images/emoji/facebook_messenger/girl/3.png differ
diff --git a/public/images/emoji/facebook_messenger/girl/4.png b/public/images/emoji/facebook_messenger/girl/4.png
index f542d343c02..5bb7a64adc0 100644
Binary files a/public/images/emoji/facebook_messenger/girl/4.png and b/public/images/emoji/facebook_messenger/girl/4.png differ
diff --git a/public/images/emoji/facebook_messenger/girl/5.png b/public/images/emoji/facebook_messenger/girl/5.png
index c4d0909ec8c..6805e5eca4f 100644
Binary files a/public/images/emoji/facebook_messenger/girl/5.png and b/public/images/emoji/facebook_messenger/girl/5.png differ
diff --git a/public/images/emoji/facebook_messenger/girl/6.png b/public/images/emoji/facebook_messenger/girl/6.png
index 74133163aa7..1347749d1f6 100644
Binary files a/public/images/emoji/facebook_messenger/girl/6.png and b/public/images/emoji/facebook_messenger/girl/6.png differ
diff --git a/public/images/emoji/facebook_messenger/globe_with_meridians.png b/public/images/emoji/facebook_messenger/globe_with_meridians.png
index fec4f1ea63c..01de6026559 100644
Binary files a/public/images/emoji/facebook_messenger/globe_with_meridians.png and b/public/images/emoji/facebook_messenger/globe_with_meridians.png differ
diff --git a/public/images/emoji/facebook_messenger/gloves.png b/public/images/emoji/facebook_messenger/gloves.png
index 1a11dd2c560..f0c79270aa3 100644
Binary files a/public/images/emoji/facebook_messenger/gloves.png and b/public/images/emoji/facebook_messenger/gloves.png differ
diff --git a/public/images/emoji/facebook_messenger/goal_net.png b/public/images/emoji/facebook_messenger/goal_net.png
index 4773a63cf9d..1587bf485a0 100644
Binary files a/public/images/emoji/facebook_messenger/goal_net.png and b/public/images/emoji/facebook_messenger/goal_net.png differ
diff --git a/public/images/emoji/facebook_messenger/goat.png b/public/images/emoji/facebook_messenger/goat.png
index 7c66018bd40..2b433344ab6 100644
Binary files a/public/images/emoji/facebook_messenger/goat.png and b/public/images/emoji/facebook_messenger/goat.png differ
diff --git a/public/images/emoji/facebook_messenger/golf.png b/public/images/emoji/facebook_messenger/golf.png
index 750595fb3c9..c4d3e9825a6 100644
Binary files a/public/images/emoji/facebook_messenger/golf.png and b/public/images/emoji/facebook_messenger/golf.png differ
diff --git a/public/images/emoji/facebook_messenger/golfer.png b/public/images/emoji/facebook_messenger/golfer.png
index 36609a56707..b9b3813b610 100644
Binary files a/public/images/emoji/facebook_messenger/golfer.png and b/public/images/emoji/facebook_messenger/golfer.png differ
diff --git a/public/images/emoji/facebook_messenger/golfer/2.png b/public/images/emoji/facebook_messenger/golfer/2.png
index 93df509c6ee..e71a8996407 100644
Binary files a/public/images/emoji/facebook_messenger/golfer/2.png and b/public/images/emoji/facebook_messenger/golfer/2.png differ
diff --git a/public/images/emoji/facebook_messenger/golfer/3.png b/public/images/emoji/facebook_messenger/golfer/3.png
index d986fe75018..de815eac1da 100644
Binary files a/public/images/emoji/facebook_messenger/golfer/3.png and b/public/images/emoji/facebook_messenger/golfer/3.png differ
diff --git a/public/images/emoji/facebook_messenger/golfer/4.png b/public/images/emoji/facebook_messenger/golfer/4.png
index 3fa61820b6a..7d7b540a1c7 100644
Binary files a/public/images/emoji/facebook_messenger/golfer/4.png and b/public/images/emoji/facebook_messenger/golfer/4.png differ
diff --git a/public/images/emoji/facebook_messenger/golfer/5.png b/public/images/emoji/facebook_messenger/golfer/5.png
index 22116c217a3..173a8e6d72f 100644
Binary files a/public/images/emoji/facebook_messenger/golfer/5.png and b/public/images/emoji/facebook_messenger/golfer/5.png differ
diff --git a/public/images/emoji/facebook_messenger/golfer/6.png b/public/images/emoji/facebook_messenger/golfer/6.png
index ebbc3263e20..0b390802afd 100644
Binary files a/public/images/emoji/facebook_messenger/golfer/6.png and b/public/images/emoji/facebook_messenger/golfer/6.png differ
diff --git a/public/images/emoji/facebook_messenger/golfing_man.png b/public/images/emoji/facebook_messenger/golfing_man.png
index 36609a56707..b9b3813b610 100644
Binary files a/public/images/emoji/facebook_messenger/golfing_man.png and b/public/images/emoji/facebook_messenger/golfing_man.png differ
diff --git a/public/images/emoji/facebook_messenger/golfing_man/2.png b/public/images/emoji/facebook_messenger/golfing_man/2.png
index 93df509c6ee..e71a8996407 100644
Binary files a/public/images/emoji/facebook_messenger/golfing_man/2.png and b/public/images/emoji/facebook_messenger/golfing_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/golfing_man/3.png b/public/images/emoji/facebook_messenger/golfing_man/3.png
index d986fe75018..de815eac1da 100644
Binary files a/public/images/emoji/facebook_messenger/golfing_man/3.png and b/public/images/emoji/facebook_messenger/golfing_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/golfing_man/4.png b/public/images/emoji/facebook_messenger/golfing_man/4.png
index 3fa61820b6a..7d7b540a1c7 100644
Binary files a/public/images/emoji/facebook_messenger/golfing_man/4.png and b/public/images/emoji/facebook_messenger/golfing_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/golfing_man/5.png b/public/images/emoji/facebook_messenger/golfing_man/5.png
index 22116c217a3..173a8e6d72f 100644
Binary files a/public/images/emoji/facebook_messenger/golfing_man/5.png and b/public/images/emoji/facebook_messenger/golfing_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/golfing_man/6.png b/public/images/emoji/facebook_messenger/golfing_man/6.png
index ebbc3263e20..0b390802afd 100644
Binary files a/public/images/emoji/facebook_messenger/golfing_man/6.png and b/public/images/emoji/facebook_messenger/golfing_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/golfing_woman.png b/public/images/emoji/facebook_messenger/golfing_woman.png
index 115ceac8f08..6892a2c001e 100644
Binary files a/public/images/emoji/facebook_messenger/golfing_woman.png and b/public/images/emoji/facebook_messenger/golfing_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/gorilla.png b/public/images/emoji/facebook_messenger/gorilla.png
index bd7d3d17fb5..2b6c8127476 100644
Binary files a/public/images/emoji/facebook_messenger/gorilla.png and b/public/images/emoji/facebook_messenger/gorilla.png differ
diff --git a/public/images/emoji/facebook_messenger/grandma.png b/public/images/emoji/facebook_messenger/grandma.png
index 02e8230771c..e03cb5c7795 100644
Binary files a/public/images/emoji/facebook_messenger/grandma.png and b/public/images/emoji/facebook_messenger/grandma.png differ
diff --git a/public/images/emoji/facebook_messenger/grandma/2.png b/public/images/emoji/facebook_messenger/grandma/2.png
index 8e4a01cfccf..86ef258ed8a 100644
Binary files a/public/images/emoji/facebook_messenger/grandma/2.png and b/public/images/emoji/facebook_messenger/grandma/2.png differ
diff --git a/public/images/emoji/facebook_messenger/grandma/3.png b/public/images/emoji/facebook_messenger/grandma/3.png
index 4f8be8c914b..2982fa1d6fa 100644
Binary files a/public/images/emoji/facebook_messenger/grandma/3.png and b/public/images/emoji/facebook_messenger/grandma/3.png differ
diff --git a/public/images/emoji/facebook_messenger/grandma/4.png b/public/images/emoji/facebook_messenger/grandma/4.png
index 0d7aa5e0d9a..7ab3d41b2aa 100644
Binary files a/public/images/emoji/facebook_messenger/grandma/4.png and b/public/images/emoji/facebook_messenger/grandma/4.png differ
diff --git a/public/images/emoji/facebook_messenger/grandma/5.png b/public/images/emoji/facebook_messenger/grandma/5.png
index 41f7e664386..3b8a10b0c7c 100644
Binary files a/public/images/emoji/facebook_messenger/grandma/5.png and b/public/images/emoji/facebook_messenger/grandma/5.png differ
diff --git a/public/images/emoji/facebook_messenger/grandma/6.png b/public/images/emoji/facebook_messenger/grandma/6.png
index 6de06114965..a77762c3ad7 100644
Binary files a/public/images/emoji/facebook_messenger/grandma/6.png and b/public/images/emoji/facebook_messenger/grandma/6.png differ
diff --git a/public/images/emoji/facebook_messenger/grapes.png b/public/images/emoji/facebook_messenger/grapes.png
index 6503af87cc3..23ae219f03c 100644
Binary files a/public/images/emoji/facebook_messenger/grapes.png and b/public/images/emoji/facebook_messenger/grapes.png differ
diff --git a/public/images/emoji/facebook_messenger/greece.png b/public/images/emoji/facebook_messenger/greece.png
index c274ffb629c..b14999baafe 100644
Binary files a/public/images/emoji/facebook_messenger/greece.png and b/public/images/emoji/facebook_messenger/greece.png differ
diff --git a/public/images/emoji/facebook_messenger/green_apple.png b/public/images/emoji/facebook_messenger/green_apple.png
index 4955c0c8cae..a86a4bae2e4 100644
Binary files a/public/images/emoji/facebook_messenger/green_apple.png and b/public/images/emoji/facebook_messenger/green_apple.png differ
diff --git a/public/images/emoji/facebook_messenger/green_book.png b/public/images/emoji/facebook_messenger/green_book.png
index 535329d5920..77b7cfc9ae7 100644
Binary files a/public/images/emoji/facebook_messenger/green_book.png and b/public/images/emoji/facebook_messenger/green_book.png differ
diff --git a/public/images/emoji/facebook_messenger/green_heart.png b/public/images/emoji/facebook_messenger/green_heart.png
index 9c3f439624c..56b2d8c32a6 100644
Binary files a/public/images/emoji/facebook_messenger/green_heart.png and b/public/images/emoji/facebook_messenger/green_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/green_salad.png b/public/images/emoji/facebook_messenger/green_salad.png
index e3325b048e5..e2c0f4eb12e 100644
Binary files a/public/images/emoji/facebook_messenger/green_salad.png and b/public/images/emoji/facebook_messenger/green_salad.png differ
diff --git a/public/images/emoji/facebook_messenger/greenland.png b/public/images/emoji/facebook_messenger/greenland.png
index 31c8707a434..0ff15a9ce58 100644
Binary files a/public/images/emoji/facebook_messenger/greenland.png and b/public/images/emoji/facebook_messenger/greenland.png differ
diff --git a/public/images/emoji/facebook_messenger/grenada.png b/public/images/emoji/facebook_messenger/grenada.png
index 87f17a6ff22..daa85edf80b 100644
Binary files a/public/images/emoji/facebook_messenger/grenada.png and b/public/images/emoji/facebook_messenger/grenada.png differ
diff --git a/public/images/emoji/facebook_messenger/grey_exclamation.png b/public/images/emoji/facebook_messenger/grey_exclamation.png
index 2e4d806cfd2..a44d73e9dd3 100644
Binary files a/public/images/emoji/facebook_messenger/grey_exclamation.png and b/public/images/emoji/facebook_messenger/grey_exclamation.png differ
diff --git a/public/images/emoji/facebook_messenger/grey_question.png b/public/images/emoji/facebook_messenger/grey_question.png
index 22c7edad284..959bc4b17f1 100644
Binary files a/public/images/emoji/facebook_messenger/grey_question.png and b/public/images/emoji/facebook_messenger/grey_question.png differ
diff --git a/public/images/emoji/facebook_messenger/grimacing.png b/public/images/emoji/facebook_messenger/grimacing.png
index 768958e1304..99ef127b0a5 100644
Binary files a/public/images/emoji/facebook_messenger/grimacing.png and b/public/images/emoji/facebook_messenger/grimacing.png differ
diff --git a/public/images/emoji/facebook_messenger/grin.png b/public/images/emoji/facebook_messenger/grin.png
index 47c8a262760..897ca7c7f2a 100644
Binary files a/public/images/emoji/facebook_messenger/grin.png and b/public/images/emoji/facebook_messenger/grin.png differ
diff --git a/public/images/emoji/facebook_messenger/grinning.png b/public/images/emoji/facebook_messenger/grinning.png
index 508ab37205e..96c64315a79 100644
Binary files a/public/images/emoji/facebook_messenger/grinning.png and b/public/images/emoji/facebook_messenger/grinning.png differ
diff --git a/public/images/emoji/facebook_messenger/guadeloupe.png b/public/images/emoji/facebook_messenger/guadeloupe.png
index c9c437901df..a971544962a 100644
Binary files a/public/images/emoji/facebook_messenger/guadeloupe.png and b/public/images/emoji/facebook_messenger/guadeloupe.png differ
diff --git a/public/images/emoji/facebook_messenger/guam.png b/public/images/emoji/facebook_messenger/guam.png
index d291c89c97c..fe22a2d2031 100644
Binary files a/public/images/emoji/facebook_messenger/guam.png and b/public/images/emoji/facebook_messenger/guam.png differ
diff --git a/public/images/emoji/facebook_messenger/guardsman.png b/public/images/emoji/facebook_messenger/guardsman.png
index 66df4e7a1b4..31878125c27 100644
Binary files a/public/images/emoji/facebook_messenger/guardsman.png and b/public/images/emoji/facebook_messenger/guardsman.png differ
diff --git a/public/images/emoji/facebook_messenger/guardsman/2.png b/public/images/emoji/facebook_messenger/guardsman/2.png
index 819233d197f..2917f252a06 100644
Binary files a/public/images/emoji/facebook_messenger/guardsman/2.png and b/public/images/emoji/facebook_messenger/guardsman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/guardsman/3.png b/public/images/emoji/facebook_messenger/guardsman/3.png
index 17d12bc5b1c..69491a0a931 100644
Binary files a/public/images/emoji/facebook_messenger/guardsman/3.png and b/public/images/emoji/facebook_messenger/guardsman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/guardsman/4.png b/public/images/emoji/facebook_messenger/guardsman/4.png
index 57dbe514275..8508c714ce6 100644
Binary files a/public/images/emoji/facebook_messenger/guardsman/4.png and b/public/images/emoji/facebook_messenger/guardsman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/guardsman/5.png b/public/images/emoji/facebook_messenger/guardsman/5.png
index 3d2088de4a7..bb42fd21e77 100644
Binary files a/public/images/emoji/facebook_messenger/guardsman/5.png and b/public/images/emoji/facebook_messenger/guardsman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/guardsman/6.png b/public/images/emoji/facebook_messenger/guardsman/6.png
index 38b5ea50035..d621c7d22c6 100644
Binary files a/public/images/emoji/facebook_messenger/guardsman/6.png and b/public/images/emoji/facebook_messenger/guardsman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/guardswoman.png b/public/images/emoji/facebook_messenger/guardswoman.png
index fefb6c23e59..97b1b0cdf44 100644
Binary files a/public/images/emoji/facebook_messenger/guardswoman.png and b/public/images/emoji/facebook_messenger/guardswoman.png differ
diff --git a/public/images/emoji/facebook_messenger/guardswoman/2.png b/public/images/emoji/facebook_messenger/guardswoman/2.png
index 9b3ea56a62d..07c14be7d41 100644
Binary files a/public/images/emoji/facebook_messenger/guardswoman/2.png and b/public/images/emoji/facebook_messenger/guardswoman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/guardswoman/3.png b/public/images/emoji/facebook_messenger/guardswoman/3.png
index 0ab6714e8dc..0967765b398 100644
Binary files a/public/images/emoji/facebook_messenger/guardswoman/3.png and b/public/images/emoji/facebook_messenger/guardswoman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/guardswoman/4.png b/public/images/emoji/facebook_messenger/guardswoman/4.png
index 4fde6f1fd6b..dad2e88196e 100644
Binary files a/public/images/emoji/facebook_messenger/guardswoman/4.png and b/public/images/emoji/facebook_messenger/guardswoman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/guardswoman/5.png b/public/images/emoji/facebook_messenger/guardswoman/5.png
index 42349efadde..85be424b6e5 100644
Binary files a/public/images/emoji/facebook_messenger/guardswoman/5.png and b/public/images/emoji/facebook_messenger/guardswoman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/guardswoman/6.png b/public/images/emoji/facebook_messenger/guardswoman/6.png
index 77ae53aaf1d..2c4767adc4e 100644
Binary files a/public/images/emoji/facebook_messenger/guardswoman/6.png and b/public/images/emoji/facebook_messenger/guardswoman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/guatemala.png b/public/images/emoji/facebook_messenger/guatemala.png
index b7e7259bc83..d2f304231b0 100644
Binary files a/public/images/emoji/facebook_messenger/guatemala.png and b/public/images/emoji/facebook_messenger/guatemala.png differ
diff --git a/public/images/emoji/facebook_messenger/guernsey.png b/public/images/emoji/facebook_messenger/guernsey.png
index f92e78a3246..f44090afdfe 100644
Binary files a/public/images/emoji/facebook_messenger/guernsey.png and b/public/images/emoji/facebook_messenger/guernsey.png differ
diff --git a/public/images/emoji/facebook_messenger/guinea.png b/public/images/emoji/facebook_messenger/guinea.png
index dd1482188c6..f5be8aae5a2 100644
Binary files a/public/images/emoji/facebook_messenger/guinea.png and b/public/images/emoji/facebook_messenger/guinea.png differ
diff --git a/public/images/emoji/facebook_messenger/guinea_bissau.png b/public/images/emoji/facebook_messenger/guinea_bissau.png
index c2ab6fb5073..28a2c2389fd 100644
Binary files a/public/images/emoji/facebook_messenger/guinea_bissau.png and b/public/images/emoji/facebook_messenger/guinea_bissau.png differ
diff --git a/public/images/emoji/facebook_messenger/guitar.png b/public/images/emoji/facebook_messenger/guitar.png
index 7e8246bd693..e0ef8db988e 100644
Binary files a/public/images/emoji/facebook_messenger/guitar.png and b/public/images/emoji/facebook_messenger/guitar.png differ
diff --git a/public/images/emoji/facebook_messenger/gun.png b/public/images/emoji/facebook_messenger/gun.png
index 0d269b9bbd5..d2c1b3e7371 100644
Binary files a/public/images/emoji/facebook_messenger/gun.png and b/public/images/emoji/facebook_messenger/gun.png differ
diff --git a/public/images/emoji/facebook_messenger/guyana.png b/public/images/emoji/facebook_messenger/guyana.png
index 2ceb411ad23..8e4eb44c47b 100644
Binary files a/public/images/emoji/facebook_messenger/guyana.png and b/public/images/emoji/facebook_messenger/guyana.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut.png b/public/images/emoji/facebook_messenger/haircut.png
index b6c6486938e..cbf2b9410f6 100644
Binary files a/public/images/emoji/facebook_messenger/haircut.png and b/public/images/emoji/facebook_messenger/haircut.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut/2.png b/public/images/emoji/facebook_messenger/haircut/2.png
index e211f4d8bbe..3d0393ea91d 100644
Binary files a/public/images/emoji/facebook_messenger/haircut/2.png and b/public/images/emoji/facebook_messenger/haircut/2.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut/3.png b/public/images/emoji/facebook_messenger/haircut/3.png
index 47626a4a9e5..2278b679bf4 100644
Binary files a/public/images/emoji/facebook_messenger/haircut/3.png and b/public/images/emoji/facebook_messenger/haircut/3.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut/4.png b/public/images/emoji/facebook_messenger/haircut/4.png
index 210b78048c0..1e19c15c80b 100644
Binary files a/public/images/emoji/facebook_messenger/haircut/4.png and b/public/images/emoji/facebook_messenger/haircut/4.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut/5.png b/public/images/emoji/facebook_messenger/haircut/5.png
index 543c86e14d0..6ef92159ed0 100644
Binary files a/public/images/emoji/facebook_messenger/haircut/5.png and b/public/images/emoji/facebook_messenger/haircut/5.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut/6.png b/public/images/emoji/facebook_messenger/haircut/6.png
index 3e21e1099be..9131582aa03 100644
Binary files a/public/images/emoji/facebook_messenger/haircut/6.png and b/public/images/emoji/facebook_messenger/haircut/6.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_man.png b/public/images/emoji/facebook_messenger/haircut_man.png
index b5a80561e42..a497d7c559d 100644
Binary files a/public/images/emoji/facebook_messenger/haircut_man.png and b/public/images/emoji/facebook_messenger/haircut_man.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_man/2.png b/public/images/emoji/facebook_messenger/haircut_man/2.png
index 2be41d13bcd..00fcc30cfb9 100644
Binary files a/public/images/emoji/facebook_messenger/haircut_man/2.png and b/public/images/emoji/facebook_messenger/haircut_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_man/3.png b/public/images/emoji/facebook_messenger/haircut_man/3.png
index 2fab3a1ac2c..ef7300663fe 100644
Binary files a/public/images/emoji/facebook_messenger/haircut_man/3.png and b/public/images/emoji/facebook_messenger/haircut_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_man/4.png b/public/images/emoji/facebook_messenger/haircut_man/4.png
index 7e6d5998c77..4387f105e34 100644
Binary files a/public/images/emoji/facebook_messenger/haircut_man/4.png and b/public/images/emoji/facebook_messenger/haircut_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_man/5.png b/public/images/emoji/facebook_messenger/haircut_man/5.png
index 5787ce4a5ba..7301a8e23a9 100644
Binary files a/public/images/emoji/facebook_messenger/haircut_man/5.png and b/public/images/emoji/facebook_messenger/haircut_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_man/6.png b/public/images/emoji/facebook_messenger/haircut_man/6.png
index f5d2a283126..abeacc627f2 100644
Binary files a/public/images/emoji/facebook_messenger/haircut_man/6.png and b/public/images/emoji/facebook_messenger/haircut_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_woman.png b/public/images/emoji/facebook_messenger/haircut_woman.png
index b6c6486938e..cbf2b9410f6 100644
Binary files a/public/images/emoji/facebook_messenger/haircut_woman.png and b/public/images/emoji/facebook_messenger/haircut_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_woman/2.png b/public/images/emoji/facebook_messenger/haircut_woman/2.png
index e211f4d8bbe..3d0393ea91d 100644
Binary files a/public/images/emoji/facebook_messenger/haircut_woman/2.png and b/public/images/emoji/facebook_messenger/haircut_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_woman/3.png b/public/images/emoji/facebook_messenger/haircut_woman/3.png
index 47626a4a9e5..2278b679bf4 100644
Binary files a/public/images/emoji/facebook_messenger/haircut_woman/3.png and b/public/images/emoji/facebook_messenger/haircut_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_woman/4.png b/public/images/emoji/facebook_messenger/haircut_woman/4.png
index 210b78048c0..1e19c15c80b 100644
Binary files a/public/images/emoji/facebook_messenger/haircut_woman/4.png and b/public/images/emoji/facebook_messenger/haircut_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_woman/5.png b/public/images/emoji/facebook_messenger/haircut_woman/5.png
index 543c86e14d0..6ef92159ed0 100644
Binary files a/public/images/emoji/facebook_messenger/haircut_woman/5.png and b/public/images/emoji/facebook_messenger/haircut_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_woman/6.png b/public/images/emoji/facebook_messenger/haircut_woman/6.png
index 3e21e1099be..9131582aa03 100644
Binary files a/public/images/emoji/facebook_messenger/haircut_woman/6.png and b/public/images/emoji/facebook_messenger/haircut_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/haiti.png b/public/images/emoji/facebook_messenger/haiti.png
index 53d2160f9a6..19dfa549987 100644
Binary files a/public/images/emoji/facebook_messenger/haiti.png and b/public/images/emoji/facebook_messenger/haiti.png differ
diff --git a/public/images/emoji/facebook_messenger/hamburger.png b/public/images/emoji/facebook_messenger/hamburger.png
index c5843ee75b1..f97e8ccbde3 100644
Binary files a/public/images/emoji/facebook_messenger/hamburger.png and b/public/images/emoji/facebook_messenger/hamburger.png differ
diff --git a/public/images/emoji/facebook_messenger/hammer.png b/public/images/emoji/facebook_messenger/hammer.png
index 7d18dc8fd34..69487b597d2 100644
Binary files a/public/images/emoji/facebook_messenger/hammer.png and b/public/images/emoji/facebook_messenger/hammer.png differ
diff --git a/public/images/emoji/facebook_messenger/hammer_and_pick.png b/public/images/emoji/facebook_messenger/hammer_and_pick.png
index 71bb73f2c59..585f3afe9d3 100644
Binary files a/public/images/emoji/facebook_messenger/hammer_and_pick.png and b/public/images/emoji/facebook_messenger/hammer_and_pick.png differ
diff --git a/public/images/emoji/facebook_messenger/hammer_and_wrench.png b/public/images/emoji/facebook_messenger/hammer_and_wrench.png
index 2b7c33b2077..ed213028696 100644
Binary files a/public/images/emoji/facebook_messenger/hammer_and_wrench.png and b/public/images/emoji/facebook_messenger/hammer_and_wrench.png differ
diff --git a/public/images/emoji/facebook_messenger/hammer_pick.png b/public/images/emoji/facebook_messenger/hammer_pick.png
index 71bb73f2c59..585f3afe9d3 100644
Binary files a/public/images/emoji/facebook_messenger/hammer_pick.png and b/public/images/emoji/facebook_messenger/hammer_pick.png differ
diff --git a/public/images/emoji/facebook_messenger/hamster.png b/public/images/emoji/facebook_messenger/hamster.png
index efd899ad5a6..04a6d2fd05c 100644
Binary files a/public/images/emoji/facebook_messenger/hamster.png and b/public/images/emoji/facebook_messenger/hamster.png differ
diff --git a/public/images/emoji/facebook_messenger/hand.png b/public/images/emoji/facebook_messenger/hand.png
index a0097d9b71a..17f858c2fa8 100644
Binary files a/public/images/emoji/facebook_messenger/hand.png and b/public/images/emoji/facebook_messenger/hand.png differ
diff --git a/public/images/emoji/facebook_messenger/hand/2.png b/public/images/emoji/facebook_messenger/hand/2.png
index d23202d6c36..8a4a4e6f847 100644
Binary files a/public/images/emoji/facebook_messenger/hand/2.png and b/public/images/emoji/facebook_messenger/hand/2.png differ
diff --git a/public/images/emoji/facebook_messenger/hand/3.png b/public/images/emoji/facebook_messenger/hand/3.png
index 7ff91aea009..8dd6e6e7095 100644
Binary files a/public/images/emoji/facebook_messenger/hand/3.png and b/public/images/emoji/facebook_messenger/hand/3.png differ
diff --git a/public/images/emoji/facebook_messenger/hand/4.png b/public/images/emoji/facebook_messenger/hand/4.png
index 635801f6479..93dcc99aeee 100644
Binary files a/public/images/emoji/facebook_messenger/hand/4.png and b/public/images/emoji/facebook_messenger/hand/4.png differ
diff --git a/public/images/emoji/facebook_messenger/hand/5.png b/public/images/emoji/facebook_messenger/hand/5.png
index 63bc01077e0..dbf83f95236 100644
Binary files a/public/images/emoji/facebook_messenger/hand/5.png and b/public/images/emoji/facebook_messenger/hand/5.png differ
diff --git a/public/images/emoji/facebook_messenger/hand/6.png b/public/images/emoji/facebook_messenger/hand/6.png
index 244c30c3821..05c48ac0bb6 100644
Binary files a/public/images/emoji/facebook_messenger/hand/6.png and b/public/images/emoji/facebook_messenger/hand/6.png differ
diff --git a/public/images/emoji/facebook_messenger/hand_splayed.png b/public/images/emoji/facebook_messenger/hand_splayed.png
index f41f01af47b..600cb22c58f 100644
Binary files a/public/images/emoji/facebook_messenger/hand_splayed.png and b/public/images/emoji/facebook_messenger/hand_splayed.png differ
diff --git a/public/images/emoji/facebook_messenger/hand_splayed/2.png b/public/images/emoji/facebook_messenger/hand_splayed/2.png
index 37a9048ad78..0550a92fe4a 100644
Binary files a/public/images/emoji/facebook_messenger/hand_splayed/2.png and b/public/images/emoji/facebook_messenger/hand_splayed/2.png differ
diff --git a/public/images/emoji/facebook_messenger/hand_splayed/3.png b/public/images/emoji/facebook_messenger/hand_splayed/3.png
index 6ddd74b5862..ed89af340fe 100644
Binary files a/public/images/emoji/facebook_messenger/hand_splayed/3.png and b/public/images/emoji/facebook_messenger/hand_splayed/3.png differ
diff --git a/public/images/emoji/facebook_messenger/hand_splayed/4.png b/public/images/emoji/facebook_messenger/hand_splayed/4.png
index 1d901925fe9..6318255a294 100644
Binary files a/public/images/emoji/facebook_messenger/hand_splayed/4.png and b/public/images/emoji/facebook_messenger/hand_splayed/4.png differ
diff --git a/public/images/emoji/facebook_messenger/hand_splayed/5.png b/public/images/emoji/facebook_messenger/hand_splayed/5.png
index 5fcac72a703..6ce8d07a141 100644
Binary files a/public/images/emoji/facebook_messenger/hand_splayed/5.png and b/public/images/emoji/facebook_messenger/hand_splayed/5.png differ
diff --git a/public/images/emoji/facebook_messenger/hand_splayed/6.png b/public/images/emoji/facebook_messenger/hand_splayed/6.png
index 74fa972cade..d382007e54f 100644
Binary files a/public/images/emoji/facebook_messenger/hand_splayed/6.png and b/public/images/emoji/facebook_messenger/hand_splayed/6.png differ
diff --git a/public/images/emoji/facebook_messenger/handbag.png b/public/images/emoji/facebook_messenger/handbag.png
index 401416b2863..f722ba09c12 100644
Binary files a/public/images/emoji/facebook_messenger/handbag.png and b/public/images/emoji/facebook_messenger/handbag.png differ
diff --git a/public/images/emoji/facebook_messenger/handshake.png b/public/images/emoji/facebook_messenger/handshake.png
index 6ac8b5fdf6f..9f333022615 100644
Binary files a/public/images/emoji/facebook_messenger/handshake.png and b/public/images/emoji/facebook_messenger/handshake.png differ
diff --git a/public/images/emoji/facebook_messenger/hankey.png b/public/images/emoji/facebook_messenger/hankey.png
index e175a1dfffc..7c3e5199220 100644
Binary files a/public/images/emoji/facebook_messenger/hankey.png and b/public/images/emoji/facebook_messenger/hankey.png differ
diff --git a/public/images/emoji/facebook_messenger/hash.png b/public/images/emoji/facebook_messenger/hash.png
index 1ce55028690..72b73a8fc50 100644
Binary files a/public/images/emoji/facebook_messenger/hash.png and b/public/images/emoji/facebook_messenger/hash.png differ
diff --git a/public/images/emoji/facebook_messenger/hatched_chick.png b/public/images/emoji/facebook_messenger/hatched_chick.png
index 3034639583b..3da991ab2c6 100644
Binary files a/public/images/emoji/facebook_messenger/hatched_chick.png and b/public/images/emoji/facebook_messenger/hatched_chick.png differ
diff --git a/public/images/emoji/facebook_messenger/hatching_chick.png b/public/images/emoji/facebook_messenger/hatching_chick.png
index fb7d92ec9b4..d4f74aa4d5e 100644
Binary files a/public/images/emoji/facebook_messenger/hatching_chick.png and b/public/images/emoji/facebook_messenger/hatching_chick.png differ
diff --git a/public/images/emoji/facebook_messenger/head_bandage.png b/public/images/emoji/facebook_messenger/head_bandage.png
index 97bec4d11f6..602886ae28b 100644
Binary files a/public/images/emoji/facebook_messenger/head_bandage.png and b/public/images/emoji/facebook_messenger/head_bandage.png differ
diff --git a/public/images/emoji/facebook_messenger/headphones.png b/public/images/emoji/facebook_messenger/headphones.png
index 366b1c8cef4..ace9eda596a 100644
Binary files a/public/images/emoji/facebook_messenger/headphones.png and b/public/images/emoji/facebook_messenger/headphones.png differ
diff --git a/public/images/emoji/facebook_messenger/hear_no_evil.png b/public/images/emoji/facebook_messenger/hear_no_evil.png
index cf3508c82c6..f03d4ad4a5b 100644
Binary files a/public/images/emoji/facebook_messenger/hear_no_evil.png and b/public/images/emoji/facebook_messenger/hear_no_evil.png differ
diff --git a/public/images/emoji/facebook_messenger/heard_and_mc_donald_islands.png b/public/images/emoji/facebook_messenger/heard_and_mc_donald_islands.png
index 1b5bf7b178f..fa2f3852cba 100644
Binary files a/public/images/emoji/facebook_messenger/heard_and_mc_donald_islands.png and b/public/images/emoji/facebook_messenger/heard_and_mc_donald_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/heart.png b/public/images/emoji/facebook_messenger/heart.png
index 87f15c3a771..2d978901636 100644
Binary files a/public/images/emoji/facebook_messenger/heart.png and b/public/images/emoji/facebook_messenger/heart.png differ
diff --git a/public/images/emoji/facebook_messenger/heart_decoration.png b/public/images/emoji/facebook_messenger/heart_decoration.png
index ad8a16d330d..61a8cf5b25e 100644
Binary files a/public/images/emoji/facebook_messenger/heart_decoration.png and b/public/images/emoji/facebook_messenger/heart_decoration.png differ
diff --git a/public/images/emoji/facebook_messenger/heart_exclamation.png b/public/images/emoji/facebook_messenger/heart_exclamation.png
index 1cb11ddf8bf..026082fabba 100644
Binary files a/public/images/emoji/facebook_messenger/heart_exclamation.png and b/public/images/emoji/facebook_messenger/heart_exclamation.png differ
diff --git a/public/images/emoji/facebook_messenger/heart_eyes.png b/public/images/emoji/facebook_messenger/heart_eyes.png
index 8e6d3851906..50a43d9081d 100644
Binary files a/public/images/emoji/facebook_messenger/heart_eyes.png and b/public/images/emoji/facebook_messenger/heart_eyes.png differ
diff --git a/public/images/emoji/facebook_messenger/heart_eyes_cat.png b/public/images/emoji/facebook_messenger/heart_eyes_cat.png
index e0803aeb180..48f8910a5e2 100644
Binary files a/public/images/emoji/facebook_messenger/heart_eyes_cat.png and b/public/images/emoji/facebook_messenger/heart_eyes_cat.png differ
diff --git a/public/images/emoji/facebook_messenger/heartbeat.png b/public/images/emoji/facebook_messenger/heartbeat.png
index 8d6aaa7b938..1dff4e5be8c 100644
Binary files a/public/images/emoji/facebook_messenger/heartbeat.png and b/public/images/emoji/facebook_messenger/heartbeat.png differ
diff --git a/public/images/emoji/facebook_messenger/heartpulse.png b/public/images/emoji/facebook_messenger/heartpulse.png
index 99e48c36ca7..e789909dec1 100644
Binary files a/public/images/emoji/facebook_messenger/heartpulse.png and b/public/images/emoji/facebook_messenger/heartpulse.png differ
diff --git a/public/images/emoji/facebook_messenger/hearts.png b/public/images/emoji/facebook_messenger/hearts.png
index 11d94403aee..d2cd3477ecc 100644
Binary files a/public/images/emoji/facebook_messenger/hearts.png and b/public/images/emoji/facebook_messenger/hearts.png differ
diff --git a/public/images/emoji/facebook_messenger/heavy_check_mark.png b/public/images/emoji/facebook_messenger/heavy_check_mark.png
index 54b5613486f..00d59ba534e 100644
Binary files a/public/images/emoji/facebook_messenger/heavy_check_mark.png and b/public/images/emoji/facebook_messenger/heavy_check_mark.png differ
diff --git a/public/images/emoji/facebook_messenger/heavy_division_sign.png b/public/images/emoji/facebook_messenger/heavy_division_sign.png
index d9e495f28ee..2bb364dd8a7 100644
Binary files a/public/images/emoji/facebook_messenger/heavy_division_sign.png and b/public/images/emoji/facebook_messenger/heavy_division_sign.png differ
diff --git a/public/images/emoji/facebook_messenger/heavy_dollar_sign.png b/public/images/emoji/facebook_messenger/heavy_dollar_sign.png
index 21f0df3b74f..e356de42d55 100644
Binary files a/public/images/emoji/facebook_messenger/heavy_dollar_sign.png and b/public/images/emoji/facebook_messenger/heavy_dollar_sign.png differ
diff --git a/public/images/emoji/facebook_messenger/heavy_heart_exclamation.png b/public/images/emoji/facebook_messenger/heavy_heart_exclamation.png
index 1cb11ddf8bf..026082fabba 100644
Binary files a/public/images/emoji/facebook_messenger/heavy_heart_exclamation.png and b/public/images/emoji/facebook_messenger/heavy_heart_exclamation.png differ
diff --git a/public/images/emoji/facebook_messenger/heavy_heart_exclamation_mark_ornament.png b/public/images/emoji/facebook_messenger/heavy_heart_exclamation_mark_ornament.png
index 1cb11ddf8bf..026082fabba 100644
Binary files a/public/images/emoji/facebook_messenger/heavy_heart_exclamation_mark_ornament.png and b/public/images/emoji/facebook_messenger/heavy_heart_exclamation_mark_ornament.png differ
diff --git a/public/images/emoji/facebook_messenger/heavy_minus_sign.png b/public/images/emoji/facebook_messenger/heavy_minus_sign.png
index 666b6d50385..9f9d9d165f6 100644
Binary files a/public/images/emoji/facebook_messenger/heavy_minus_sign.png and b/public/images/emoji/facebook_messenger/heavy_minus_sign.png differ
diff --git a/public/images/emoji/facebook_messenger/heavy_multiplication_x.png b/public/images/emoji/facebook_messenger/heavy_multiplication_x.png
index f442fec0c91..846b870e887 100644
Binary files a/public/images/emoji/facebook_messenger/heavy_multiplication_x.png and b/public/images/emoji/facebook_messenger/heavy_multiplication_x.png differ
diff --git a/public/images/emoji/facebook_messenger/heavy_plus_sign.png b/public/images/emoji/facebook_messenger/heavy_plus_sign.png
index c40c5c83fbb..3cb405cab21 100644
Binary files a/public/images/emoji/facebook_messenger/heavy_plus_sign.png and b/public/images/emoji/facebook_messenger/heavy_plus_sign.png differ
diff --git a/public/images/emoji/facebook_messenger/hedgehog.png b/public/images/emoji/facebook_messenger/hedgehog.png
index 9b978b35407..d877234ff99 100644
Binary files a/public/images/emoji/facebook_messenger/hedgehog.png and b/public/images/emoji/facebook_messenger/hedgehog.png differ
diff --git a/public/images/emoji/facebook_messenger/helicopter.png b/public/images/emoji/facebook_messenger/helicopter.png
index e4ecb07aac9..d66ada6082c 100644
Binary files a/public/images/emoji/facebook_messenger/helicopter.png and b/public/images/emoji/facebook_messenger/helicopter.png differ
diff --git a/public/images/emoji/facebook_messenger/helmet_with_cross.png b/public/images/emoji/facebook_messenger/helmet_with_cross.png
index ad220c2eefe..959efb0fb0a 100644
Binary files a/public/images/emoji/facebook_messenger/helmet_with_cross.png and b/public/images/emoji/facebook_messenger/helmet_with_cross.png differ
diff --git a/public/images/emoji/facebook_messenger/helmet_with_white_cross.png b/public/images/emoji/facebook_messenger/helmet_with_white_cross.png
index ad220c2eefe..959efb0fb0a 100644
Binary files a/public/images/emoji/facebook_messenger/helmet_with_white_cross.png and b/public/images/emoji/facebook_messenger/helmet_with_white_cross.png differ
diff --git a/public/images/emoji/facebook_messenger/herb.png b/public/images/emoji/facebook_messenger/herb.png
index 610292c362d..537c88ff2e8 100644
Binary files a/public/images/emoji/facebook_messenger/herb.png and b/public/images/emoji/facebook_messenger/herb.png differ
diff --git a/public/images/emoji/facebook_messenger/hibiscus.png b/public/images/emoji/facebook_messenger/hibiscus.png
index 5655dc87de1..0f40ef1f0ee 100644
Binary files a/public/images/emoji/facebook_messenger/hibiscus.png and b/public/images/emoji/facebook_messenger/hibiscus.png differ
diff --git a/public/images/emoji/facebook_messenger/high_brightness.png b/public/images/emoji/facebook_messenger/high_brightness.png
index ff1e1212803..bfe3eff100e 100644
Binary files a/public/images/emoji/facebook_messenger/high_brightness.png and b/public/images/emoji/facebook_messenger/high_brightness.png differ
diff --git a/public/images/emoji/facebook_messenger/high_heel.png b/public/images/emoji/facebook_messenger/high_heel.png
index a93d0c41ef0..1f252a71f25 100644
Binary files a/public/images/emoji/facebook_messenger/high_heel.png and b/public/images/emoji/facebook_messenger/high_heel.png differ
diff --git a/public/images/emoji/facebook_messenger/hocho.png b/public/images/emoji/facebook_messenger/hocho.png
index c606db130a5..963153dd295 100644
Binary files a/public/images/emoji/facebook_messenger/hocho.png and b/public/images/emoji/facebook_messenger/hocho.png differ
diff --git a/public/images/emoji/facebook_messenger/hockey.png b/public/images/emoji/facebook_messenger/hockey.png
index 7b5a1105c39..a8776ad0b37 100644
Binary files a/public/images/emoji/facebook_messenger/hockey.png and b/public/images/emoji/facebook_messenger/hockey.png differ
diff --git a/public/images/emoji/facebook_messenger/hole.png b/public/images/emoji/facebook_messenger/hole.png
index 6df8ea8c4c8..54686d04288 100644
Binary files a/public/images/emoji/facebook_messenger/hole.png and b/public/images/emoji/facebook_messenger/hole.png differ
diff --git a/public/images/emoji/facebook_messenger/homes.png b/public/images/emoji/facebook_messenger/homes.png
index 5f9a0a658b7..8e3698a5726 100644
Binary files a/public/images/emoji/facebook_messenger/homes.png and b/public/images/emoji/facebook_messenger/homes.png differ
diff --git a/public/images/emoji/facebook_messenger/honduras.png b/public/images/emoji/facebook_messenger/honduras.png
index d0aff11833e..e1eb11f5a7e 100644
Binary files a/public/images/emoji/facebook_messenger/honduras.png and b/public/images/emoji/facebook_messenger/honduras.png differ
diff --git a/public/images/emoji/facebook_messenger/honey_pot.png b/public/images/emoji/facebook_messenger/honey_pot.png
index a23e57415a9..dde7e17e7c4 100644
Binary files a/public/images/emoji/facebook_messenger/honey_pot.png and b/public/images/emoji/facebook_messenger/honey_pot.png differ
diff --git a/public/images/emoji/facebook_messenger/honeybee.png b/public/images/emoji/facebook_messenger/honeybee.png
index b4b2bff015b..649181cf286 100644
Binary files a/public/images/emoji/facebook_messenger/honeybee.png and b/public/images/emoji/facebook_messenger/honeybee.png differ
diff --git a/public/images/emoji/facebook_messenger/hong_kong.png b/public/images/emoji/facebook_messenger/hong_kong.png
index 786a0401560..01ac6e241cc 100644
Binary files a/public/images/emoji/facebook_messenger/hong_kong.png and b/public/images/emoji/facebook_messenger/hong_kong.png differ
diff --git a/public/images/emoji/facebook_messenger/horse.png b/public/images/emoji/facebook_messenger/horse.png
index befd5ea865e..54ad115988f 100644
Binary files a/public/images/emoji/facebook_messenger/horse.png and b/public/images/emoji/facebook_messenger/horse.png differ
diff --git a/public/images/emoji/facebook_messenger/horse_racing.png b/public/images/emoji/facebook_messenger/horse_racing.png
index 7aacc88528a..436c3d0b236 100644
Binary files a/public/images/emoji/facebook_messenger/horse_racing.png and b/public/images/emoji/facebook_messenger/horse_racing.png differ
diff --git a/public/images/emoji/facebook_messenger/horse_racing/2.png b/public/images/emoji/facebook_messenger/horse_racing/2.png
index 07a007cec6a..0fbfcf23120 100644
Binary files a/public/images/emoji/facebook_messenger/horse_racing/2.png and b/public/images/emoji/facebook_messenger/horse_racing/2.png differ
diff --git a/public/images/emoji/facebook_messenger/horse_racing/3.png b/public/images/emoji/facebook_messenger/horse_racing/3.png
index 999574cf488..3435a8688dd 100644
Binary files a/public/images/emoji/facebook_messenger/horse_racing/3.png and b/public/images/emoji/facebook_messenger/horse_racing/3.png differ
diff --git a/public/images/emoji/facebook_messenger/horse_racing/4.png b/public/images/emoji/facebook_messenger/horse_racing/4.png
index f4cf9ba39df..1caf1598d7d 100644
Binary files a/public/images/emoji/facebook_messenger/horse_racing/4.png and b/public/images/emoji/facebook_messenger/horse_racing/4.png differ
diff --git a/public/images/emoji/facebook_messenger/horse_racing/5.png b/public/images/emoji/facebook_messenger/horse_racing/5.png
index b697e37867f..8b97dc9b830 100644
Binary files a/public/images/emoji/facebook_messenger/horse_racing/5.png and b/public/images/emoji/facebook_messenger/horse_racing/5.png differ
diff --git a/public/images/emoji/facebook_messenger/horse_racing/6.png b/public/images/emoji/facebook_messenger/horse_racing/6.png
index ab5119fd2db..dc66a429b22 100644
Binary files a/public/images/emoji/facebook_messenger/horse_racing/6.png and b/public/images/emoji/facebook_messenger/horse_racing/6.png differ
diff --git a/public/images/emoji/facebook_messenger/hospital.png b/public/images/emoji/facebook_messenger/hospital.png
index 87adf354275..aadcadf4aa9 100644
Binary files a/public/images/emoji/facebook_messenger/hospital.png and b/public/images/emoji/facebook_messenger/hospital.png differ
diff --git a/public/images/emoji/facebook_messenger/hot_dog.png b/public/images/emoji/facebook_messenger/hot_dog.png
index 0fe32af15f7..e45ce386c45 100644
Binary files a/public/images/emoji/facebook_messenger/hot_dog.png and b/public/images/emoji/facebook_messenger/hot_dog.png differ
diff --git a/public/images/emoji/facebook_messenger/hot_pepper.png b/public/images/emoji/facebook_messenger/hot_pepper.png
index d72eba3a1a2..abb26552187 100644
Binary files a/public/images/emoji/facebook_messenger/hot_pepper.png and b/public/images/emoji/facebook_messenger/hot_pepper.png differ
diff --git a/public/images/emoji/facebook_messenger/hotdog.png b/public/images/emoji/facebook_messenger/hotdog.png
index 0fe32af15f7..e45ce386c45 100644
Binary files a/public/images/emoji/facebook_messenger/hotdog.png and b/public/images/emoji/facebook_messenger/hotdog.png differ
diff --git a/public/images/emoji/facebook_messenger/hotel.png b/public/images/emoji/facebook_messenger/hotel.png
index b689dbc3762..47b7b539261 100644
Binary files a/public/images/emoji/facebook_messenger/hotel.png and b/public/images/emoji/facebook_messenger/hotel.png differ
diff --git a/public/images/emoji/facebook_messenger/hotsprings.png b/public/images/emoji/facebook_messenger/hotsprings.png
index 9a31e886bdc..a5ceefcb10b 100644
Binary files a/public/images/emoji/facebook_messenger/hotsprings.png and b/public/images/emoji/facebook_messenger/hotsprings.png differ
diff --git a/public/images/emoji/facebook_messenger/hourglass.png b/public/images/emoji/facebook_messenger/hourglass.png
index e139fe10770..5d65df75583 100644
Binary files a/public/images/emoji/facebook_messenger/hourglass.png and b/public/images/emoji/facebook_messenger/hourglass.png differ
diff --git a/public/images/emoji/facebook_messenger/hourglass_flowing_sand.png b/public/images/emoji/facebook_messenger/hourglass_flowing_sand.png
index cff6f63bee1..b3cf6c1c4e6 100644
Binary files a/public/images/emoji/facebook_messenger/hourglass_flowing_sand.png and b/public/images/emoji/facebook_messenger/hourglass_flowing_sand.png differ
diff --git a/public/images/emoji/facebook_messenger/house.png b/public/images/emoji/facebook_messenger/house.png
index 6775ff48828..e8b95ddeee2 100644
Binary files a/public/images/emoji/facebook_messenger/house.png and b/public/images/emoji/facebook_messenger/house.png differ
diff --git a/public/images/emoji/facebook_messenger/house_abandoned.png b/public/images/emoji/facebook_messenger/house_abandoned.png
index a48da604946..a03480bd67d 100644
Binary files a/public/images/emoji/facebook_messenger/house_abandoned.png and b/public/images/emoji/facebook_messenger/house_abandoned.png differ
diff --git a/public/images/emoji/facebook_messenger/house_buildings.png b/public/images/emoji/facebook_messenger/house_buildings.png
index 5f9a0a658b7..8e3698a5726 100644
Binary files a/public/images/emoji/facebook_messenger/house_buildings.png and b/public/images/emoji/facebook_messenger/house_buildings.png differ
diff --git a/public/images/emoji/facebook_messenger/house_with_garden.png b/public/images/emoji/facebook_messenger/house_with_garden.png
index 763eaa1b8f6..a0f69a0e535 100644
Binary files a/public/images/emoji/facebook_messenger/house_with_garden.png and b/public/images/emoji/facebook_messenger/house_with_garden.png differ
diff --git a/public/images/emoji/facebook_messenger/houses.png b/public/images/emoji/facebook_messenger/houses.png
index 5f9a0a658b7..8e3698a5726 100644
Binary files a/public/images/emoji/facebook_messenger/houses.png and b/public/images/emoji/facebook_messenger/houses.png differ
diff --git a/public/images/emoji/facebook_messenger/hugging.png b/public/images/emoji/facebook_messenger/hugging.png
index f0eb7db3220..b9d48c43a19 100644
Binary files a/public/images/emoji/facebook_messenger/hugging.png and b/public/images/emoji/facebook_messenger/hugging.png differ
diff --git a/public/images/emoji/facebook_messenger/hugging_face.png b/public/images/emoji/facebook_messenger/hugging_face.png
index f0eb7db3220..b9d48c43a19 100644
Binary files a/public/images/emoji/facebook_messenger/hugging_face.png and b/public/images/emoji/facebook_messenger/hugging_face.png differ
diff --git a/public/images/emoji/facebook_messenger/hugs.png b/public/images/emoji/facebook_messenger/hugs.png
index f0eb7db3220..b9d48c43a19 100644
Binary files a/public/images/emoji/facebook_messenger/hugs.png and b/public/images/emoji/facebook_messenger/hugs.png differ
diff --git a/public/images/emoji/facebook_messenger/hungary.png b/public/images/emoji/facebook_messenger/hungary.png
index 98963a97c99..ce5faad3cfd 100644
Binary files a/public/images/emoji/facebook_messenger/hungary.png and b/public/images/emoji/facebook_messenger/hungary.png differ
diff --git a/public/images/emoji/facebook_messenger/hushed.png b/public/images/emoji/facebook_messenger/hushed.png
index e8b83c13b76..fe5922c1b16 100644
Binary files a/public/images/emoji/facebook_messenger/hushed.png and b/public/images/emoji/facebook_messenger/hushed.png differ
diff --git a/public/images/emoji/facebook_messenger/ice_cream.png b/public/images/emoji/facebook_messenger/ice_cream.png
index 7db482a6972..6eb4419cf6c 100644
Binary files a/public/images/emoji/facebook_messenger/ice_cream.png and b/public/images/emoji/facebook_messenger/ice_cream.png differ
diff --git a/public/images/emoji/facebook_messenger/ice_hockey.png b/public/images/emoji/facebook_messenger/ice_hockey.png
index 7b5a1105c39..a8776ad0b37 100644
Binary files a/public/images/emoji/facebook_messenger/ice_hockey.png and b/public/images/emoji/facebook_messenger/ice_hockey.png differ
diff --git a/public/images/emoji/facebook_messenger/ice_skate.png b/public/images/emoji/facebook_messenger/ice_skate.png
index a9e9fcbbe52..0d6fc562247 100644
Binary files a/public/images/emoji/facebook_messenger/ice_skate.png and b/public/images/emoji/facebook_messenger/ice_skate.png differ
diff --git a/public/images/emoji/facebook_messenger/icecream.png b/public/images/emoji/facebook_messenger/icecream.png
index fe53d60a2e8..e4b11920b42 100644
Binary files a/public/images/emoji/facebook_messenger/icecream.png and b/public/images/emoji/facebook_messenger/icecream.png differ
diff --git a/public/images/emoji/facebook_messenger/iceland.png b/public/images/emoji/facebook_messenger/iceland.png
index 399f5a4e85d..61ae322bfaa 100644
Binary files a/public/images/emoji/facebook_messenger/iceland.png and b/public/images/emoji/facebook_messenger/iceland.png differ
diff --git a/public/images/emoji/facebook_messenger/id.png b/public/images/emoji/facebook_messenger/id.png
index 73c4ab4da33..46bab338b3b 100644
Binary files a/public/images/emoji/facebook_messenger/id.png and b/public/images/emoji/facebook_messenger/id.png differ
diff --git a/public/images/emoji/facebook_messenger/ideograph_advantage.png b/public/images/emoji/facebook_messenger/ideograph_advantage.png
index 17f27bb535d..4d5ba3582af 100644
Binary files a/public/images/emoji/facebook_messenger/ideograph_advantage.png and b/public/images/emoji/facebook_messenger/ideograph_advantage.png differ
diff --git a/public/images/emoji/facebook_messenger/imp.png b/public/images/emoji/facebook_messenger/imp.png
index 86b6277008b..ee24b8fabd0 100644
Binary files a/public/images/emoji/facebook_messenger/imp.png and b/public/images/emoji/facebook_messenger/imp.png differ
diff --git a/public/images/emoji/facebook_messenger/inbox_tray.png b/public/images/emoji/facebook_messenger/inbox_tray.png
index ebf4a42d5bc..260a984f1ef 100644
Binary files a/public/images/emoji/facebook_messenger/inbox_tray.png and b/public/images/emoji/facebook_messenger/inbox_tray.png differ
diff --git a/public/images/emoji/facebook_messenger/incoming_envelope.png b/public/images/emoji/facebook_messenger/incoming_envelope.png
index da989200ebd..6379db7cf16 100644
Binary files a/public/images/emoji/facebook_messenger/incoming_envelope.png and b/public/images/emoji/facebook_messenger/incoming_envelope.png differ
diff --git a/public/images/emoji/facebook_messenger/india.png b/public/images/emoji/facebook_messenger/india.png
index 3ae5f9b82b9..b903a37759f 100644
Binary files a/public/images/emoji/facebook_messenger/india.png and b/public/images/emoji/facebook_messenger/india.png differ
diff --git a/public/images/emoji/facebook_messenger/indonesia.png b/public/images/emoji/facebook_messenger/indonesia.png
index c3906b37059..d3945cc22a3 100644
Binary files a/public/images/emoji/facebook_messenger/indonesia.png and b/public/images/emoji/facebook_messenger/indonesia.png differ
diff --git a/public/images/emoji/facebook_messenger/information_desk_person.png b/public/images/emoji/facebook_messenger/information_desk_person.png
index 17d66f473bd..45ca8d273d9 100644
Binary files a/public/images/emoji/facebook_messenger/information_desk_person.png and b/public/images/emoji/facebook_messenger/information_desk_person.png differ
diff --git a/public/images/emoji/facebook_messenger/information_desk_person/2.png b/public/images/emoji/facebook_messenger/information_desk_person/2.png
index 92055ff0cd9..ee2883ad57c 100644
Binary files a/public/images/emoji/facebook_messenger/information_desk_person/2.png and b/public/images/emoji/facebook_messenger/information_desk_person/2.png differ
diff --git a/public/images/emoji/facebook_messenger/information_desk_person/3.png b/public/images/emoji/facebook_messenger/information_desk_person/3.png
index 2c8a485a1f4..e98fdbc0e28 100644
Binary files a/public/images/emoji/facebook_messenger/information_desk_person/3.png and b/public/images/emoji/facebook_messenger/information_desk_person/3.png differ
diff --git a/public/images/emoji/facebook_messenger/information_desk_person/4.png b/public/images/emoji/facebook_messenger/information_desk_person/4.png
index 890ae929d22..a74a2177985 100644
Binary files a/public/images/emoji/facebook_messenger/information_desk_person/4.png and b/public/images/emoji/facebook_messenger/information_desk_person/4.png differ
diff --git a/public/images/emoji/facebook_messenger/information_desk_person/5.png b/public/images/emoji/facebook_messenger/information_desk_person/5.png
index c7228bf6a8c..03f6a7303e2 100644
Binary files a/public/images/emoji/facebook_messenger/information_desk_person/5.png and b/public/images/emoji/facebook_messenger/information_desk_person/5.png differ
diff --git a/public/images/emoji/facebook_messenger/information_desk_person/6.png b/public/images/emoji/facebook_messenger/information_desk_person/6.png
index f02f68988a0..994308cee8c 100644
Binary files a/public/images/emoji/facebook_messenger/information_desk_person/6.png and b/public/images/emoji/facebook_messenger/information_desk_person/6.png differ
diff --git a/public/images/emoji/facebook_messenger/information_source.png b/public/images/emoji/facebook_messenger/information_source.png
index a8fd945655e..0494b223841 100644
Binary files a/public/images/emoji/facebook_messenger/information_source.png and b/public/images/emoji/facebook_messenger/information_source.png differ
diff --git a/public/images/emoji/facebook_messenger/innocent.png b/public/images/emoji/facebook_messenger/innocent.png
index 11d735eb665..ae87d6ced4d 100644
Binary files a/public/images/emoji/facebook_messenger/innocent.png and b/public/images/emoji/facebook_messenger/innocent.png differ
diff --git a/public/images/emoji/facebook_messenger/interrobang.png b/public/images/emoji/facebook_messenger/interrobang.png
index 3128a2b638f..bcf63f7d25a 100644
Binary files a/public/images/emoji/facebook_messenger/interrobang.png and b/public/images/emoji/facebook_messenger/interrobang.png differ
diff --git a/public/images/emoji/facebook_messenger/iphone.png b/public/images/emoji/facebook_messenger/iphone.png
index dafb42d72e0..d5ac577d7f2 100644
Binary files a/public/images/emoji/facebook_messenger/iphone.png and b/public/images/emoji/facebook_messenger/iphone.png differ
diff --git a/public/images/emoji/facebook_messenger/iran.png b/public/images/emoji/facebook_messenger/iran.png
index e30df4c1f50..d40dd835472 100644
Binary files a/public/images/emoji/facebook_messenger/iran.png and b/public/images/emoji/facebook_messenger/iran.png differ
diff --git a/public/images/emoji/facebook_messenger/iraq.png b/public/images/emoji/facebook_messenger/iraq.png
index cccd140ba3c..b9f8e328f04 100644
Binary files a/public/images/emoji/facebook_messenger/iraq.png and b/public/images/emoji/facebook_messenger/iraq.png differ
diff --git a/public/images/emoji/facebook_messenger/ireland.png b/public/images/emoji/facebook_messenger/ireland.png
index e71a1f1e63e..a9a69ad3b8b 100644
Binary files a/public/images/emoji/facebook_messenger/ireland.png and b/public/images/emoji/facebook_messenger/ireland.png differ
diff --git a/public/images/emoji/facebook_messenger/island.png b/public/images/emoji/facebook_messenger/island.png
index 2d2e8919fff..7a1f87faf9e 100644
Binary files a/public/images/emoji/facebook_messenger/island.png and b/public/images/emoji/facebook_messenger/island.png differ
diff --git a/public/images/emoji/facebook_messenger/isle_of_man.png b/public/images/emoji/facebook_messenger/isle_of_man.png
index 7829f538f8e..d5a7846ed84 100644
Binary files a/public/images/emoji/facebook_messenger/isle_of_man.png and b/public/images/emoji/facebook_messenger/isle_of_man.png differ
diff --git a/public/images/emoji/facebook_messenger/israel.png b/public/images/emoji/facebook_messenger/israel.png
index 548d97611ff..58146f46cb5 100644
Binary files a/public/images/emoji/facebook_messenger/israel.png and b/public/images/emoji/facebook_messenger/israel.png differ
diff --git a/public/images/emoji/facebook_messenger/it.png b/public/images/emoji/facebook_messenger/it.png
index e5e0646c21a..1b5c5906b33 100644
Binary files a/public/images/emoji/facebook_messenger/it.png and b/public/images/emoji/facebook_messenger/it.png differ
diff --git a/public/images/emoji/facebook_messenger/izakaya_lantern.png b/public/images/emoji/facebook_messenger/izakaya_lantern.png
index 8dde73ba952..91f1eb3b69d 100644
Binary files a/public/images/emoji/facebook_messenger/izakaya_lantern.png and b/public/images/emoji/facebook_messenger/izakaya_lantern.png differ
diff --git a/public/images/emoji/facebook_messenger/jack_o_lantern.png b/public/images/emoji/facebook_messenger/jack_o_lantern.png
index b6e2ad00dfa..815cf3eb4e6 100644
Binary files a/public/images/emoji/facebook_messenger/jack_o_lantern.png and b/public/images/emoji/facebook_messenger/jack_o_lantern.png differ
diff --git a/public/images/emoji/facebook_messenger/jamaica.png b/public/images/emoji/facebook_messenger/jamaica.png
index dc2c8075112..e569aa9ee95 100644
Binary files a/public/images/emoji/facebook_messenger/jamaica.png and b/public/images/emoji/facebook_messenger/jamaica.png differ
diff --git a/public/images/emoji/facebook_messenger/japan.png b/public/images/emoji/facebook_messenger/japan.png
index 1720c3d9b10..718d526368a 100644
Binary files a/public/images/emoji/facebook_messenger/japan.png and b/public/images/emoji/facebook_messenger/japan.png differ
diff --git a/public/images/emoji/facebook_messenger/japanese_castle.png b/public/images/emoji/facebook_messenger/japanese_castle.png
index 0ba2b78fa4e..9b7faba9071 100644
Binary files a/public/images/emoji/facebook_messenger/japanese_castle.png and b/public/images/emoji/facebook_messenger/japanese_castle.png differ
diff --git a/public/images/emoji/facebook_messenger/japanese_goblin.png b/public/images/emoji/facebook_messenger/japanese_goblin.png
index 77c502d606b..3df2f0ed510 100644
Binary files a/public/images/emoji/facebook_messenger/japanese_goblin.png and b/public/images/emoji/facebook_messenger/japanese_goblin.png differ
diff --git a/public/images/emoji/facebook_messenger/japanese_ogre.png b/public/images/emoji/facebook_messenger/japanese_ogre.png
index dd7075f444f..761225433ff 100644
Binary files a/public/images/emoji/facebook_messenger/japanese_ogre.png and b/public/images/emoji/facebook_messenger/japanese_ogre.png differ
diff --git a/public/images/emoji/facebook_messenger/jeans.png b/public/images/emoji/facebook_messenger/jeans.png
index 3287ca8815b..f692b7ce50b 100644
Binary files a/public/images/emoji/facebook_messenger/jeans.png and b/public/images/emoji/facebook_messenger/jeans.png differ
diff --git a/public/images/emoji/facebook_messenger/jersey.png b/public/images/emoji/facebook_messenger/jersey.png
index adfdbc3c1a6..1c294698e3a 100644
Binary files a/public/images/emoji/facebook_messenger/jersey.png and b/public/images/emoji/facebook_messenger/jersey.png differ
diff --git a/public/images/emoji/facebook_messenger/jordan.png b/public/images/emoji/facebook_messenger/jordan.png
index 43a2f9139f4..2211150a8e7 100644
Binary files a/public/images/emoji/facebook_messenger/jordan.png and b/public/images/emoji/facebook_messenger/jordan.png differ
diff --git a/public/images/emoji/facebook_messenger/joy.png b/public/images/emoji/facebook_messenger/joy.png
index 9c6e7ee1477..b61ad326bea 100644
Binary files a/public/images/emoji/facebook_messenger/joy.png and b/public/images/emoji/facebook_messenger/joy.png differ
diff --git a/public/images/emoji/facebook_messenger/joy_cat.png b/public/images/emoji/facebook_messenger/joy_cat.png
index db84adf5ef5..be20cd66c40 100644
Binary files a/public/images/emoji/facebook_messenger/joy_cat.png and b/public/images/emoji/facebook_messenger/joy_cat.png differ
diff --git a/public/images/emoji/facebook_messenger/joystick.png b/public/images/emoji/facebook_messenger/joystick.png
index 8e5c09d59be..7ae3e89d17c 100644
Binary files a/public/images/emoji/facebook_messenger/joystick.png and b/public/images/emoji/facebook_messenger/joystick.png differ
diff --git a/public/images/emoji/facebook_messenger/jp.png b/public/images/emoji/facebook_messenger/jp.png
index ab749c77f7d..ef2bc7b48fa 100644
Binary files a/public/images/emoji/facebook_messenger/jp.png and b/public/images/emoji/facebook_messenger/jp.png differ
diff --git a/public/images/emoji/facebook_messenger/kaaba.png b/public/images/emoji/facebook_messenger/kaaba.png
index 73219d28c1c..292dd5e2e13 100644
Binary files a/public/images/emoji/facebook_messenger/kaaba.png and b/public/images/emoji/facebook_messenger/kaaba.png differ
diff --git a/public/images/emoji/facebook_messenger/kazakhstan.png b/public/images/emoji/facebook_messenger/kazakhstan.png
index 731858e2cfa..799739df89d 100644
Binary files a/public/images/emoji/facebook_messenger/kazakhstan.png and b/public/images/emoji/facebook_messenger/kazakhstan.png differ
diff --git a/public/images/emoji/facebook_messenger/kenya.png b/public/images/emoji/facebook_messenger/kenya.png
index cc55fd69815..5bd6cbce8ed 100644
Binary files a/public/images/emoji/facebook_messenger/kenya.png and b/public/images/emoji/facebook_messenger/kenya.png differ
diff --git a/public/images/emoji/facebook_messenger/key.png b/public/images/emoji/facebook_messenger/key.png
index 84889b66f5e..40070453657 100644
Binary files a/public/images/emoji/facebook_messenger/key.png and b/public/images/emoji/facebook_messenger/key.png differ
diff --git a/public/images/emoji/facebook_messenger/key2.png b/public/images/emoji/facebook_messenger/key2.png
index 18b93994322..4452b17fb5e 100644
Binary files a/public/images/emoji/facebook_messenger/key2.png and b/public/images/emoji/facebook_messenger/key2.png differ
diff --git a/public/images/emoji/facebook_messenger/keyboard.png b/public/images/emoji/facebook_messenger/keyboard.png
index a16457d5339..6a3d63d1e03 100644
Binary files a/public/images/emoji/facebook_messenger/keyboard.png and b/public/images/emoji/facebook_messenger/keyboard.png differ
diff --git a/public/images/emoji/facebook_messenger/keycap_star.png b/public/images/emoji/facebook_messenger/keycap_star.png
index 2bfefce2bec..a009bc2cdad 100644
Binary files a/public/images/emoji/facebook_messenger/keycap_star.png and b/public/images/emoji/facebook_messenger/keycap_star.png differ
diff --git a/public/images/emoji/facebook_messenger/keycap_ten.png b/public/images/emoji/facebook_messenger/keycap_ten.png
index 12264637b0b..c0beb67e22a 100644
Binary files a/public/images/emoji/facebook_messenger/keycap_ten.png and b/public/images/emoji/facebook_messenger/keycap_ten.png differ
diff --git a/public/images/emoji/facebook_messenger/kick_scooter.png b/public/images/emoji/facebook_messenger/kick_scooter.png
index f04615710f9..262f386ccfc 100644
Binary files a/public/images/emoji/facebook_messenger/kick_scooter.png and b/public/images/emoji/facebook_messenger/kick_scooter.png differ
diff --git a/public/images/emoji/facebook_messenger/kimono.png b/public/images/emoji/facebook_messenger/kimono.png
index 8459c5ef5f7..0647cd4e986 100644
Binary files a/public/images/emoji/facebook_messenger/kimono.png and b/public/images/emoji/facebook_messenger/kimono.png differ
diff --git a/public/images/emoji/facebook_messenger/kiribati.png b/public/images/emoji/facebook_messenger/kiribati.png
index 138fd3f2b5b..ca481a9860d 100644
Binary files a/public/images/emoji/facebook_messenger/kiribati.png and b/public/images/emoji/facebook_messenger/kiribati.png differ
diff --git a/public/images/emoji/facebook_messenger/kiss.png b/public/images/emoji/facebook_messenger/kiss.png
index 24195789729..a9748f359a2 100644
Binary files a/public/images/emoji/facebook_messenger/kiss.png and b/public/images/emoji/facebook_messenger/kiss.png differ
diff --git a/public/images/emoji/facebook_messenger/kissing.png b/public/images/emoji/facebook_messenger/kissing.png
index e1fe9088c12..00ac7351758 100644
Binary files a/public/images/emoji/facebook_messenger/kissing.png and b/public/images/emoji/facebook_messenger/kissing.png differ
diff --git a/public/images/emoji/facebook_messenger/kissing_cat.png b/public/images/emoji/facebook_messenger/kissing_cat.png
index 42882123c54..8f406299d2c 100644
Binary files a/public/images/emoji/facebook_messenger/kissing_cat.png and b/public/images/emoji/facebook_messenger/kissing_cat.png differ
diff --git a/public/images/emoji/facebook_messenger/kissing_closed_eyes.png b/public/images/emoji/facebook_messenger/kissing_closed_eyes.png
index 68c5f1c4fd8..b128cee450b 100644
Binary files a/public/images/emoji/facebook_messenger/kissing_closed_eyes.png and b/public/images/emoji/facebook_messenger/kissing_closed_eyes.png differ
diff --git a/public/images/emoji/facebook_messenger/kissing_heart.png b/public/images/emoji/facebook_messenger/kissing_heart.png
index 70ac23c2fce..9678efe0c97 100644
Binary files a/public/images/emoji/facebook_messenger/kissing_heart.png and b/public/images/emoji/facebook_messenger/kissing_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/kissing_smiling_eyes.png b/public/images/emoji/facebook_messenger/kissing_smiling_eyes.png
index 7e32d050e66..1a3dcb4d2a9 100644
Binary files a/public/images/emoji/facebook_messenger/kissing_smiling_eyes.png and b/public/images/emoji/facebook_messenger/kissing_smiling_eyes.png differ
diff --git a/public/images/emoji/facebook_messenger/kiwi_fruit.png b/public/images/emoji/facebook_messenger/kiwi_fruit.png
index 1abebdab603..07613f83aa6 100644
Binary files a/public/images/emoji/facebook_messenger/kiwi_fruit.png and b/public/images/emoji/facebook_messenger/kiwi_fruit.png differ
diff --git a/public/images/emoji/facebook_messenger/knife.png b/public/images/emoji/facebook_messenger/knife.png
index c606db130a5..963153dd295 100644
Binary files a/public/images/emoji/facebook_messenger/knife.png and b/public/images/emoji/facebook_messenger/knife.png differ
diff --git a/public/images/emoji/facebook_messenger/koala.png b/public/images/emoji/facebook_messenger/koala.png
index b181cd8aeef..dbf611f2996 100644
Binary files a/public/images/emoji/facebook_messenger/koala.png and b/public/images/emoji/facebook_messenger/koala.png differ
diff --git a/public/images/emoji/facebook_messenger/koko.png b/public/images/emoji/facebook_messenger/koko.png
index 277172ed84d..3d1a4f4b56e 100644
Binary files a/public/images/emoji/facebook_messenger/koko.png and b/public/images/emoji/facebook_messenger/koko.png differ
diff --git a/public/images/emoji/facebook_messenger/kosovo.png b/public/images/emoji/facebook_messenger/kosovo.png
index efea0b70bde..9b8d095d51c 100644
Binary files a/public/images/emoji/facebook_messenger/kosovo.png and b/public/images/emoji/facebook_messenger/kosovo.png differ
diff --git a/public/images/emoji/facebook_messenger/kr.png b/public/images/emoji/facebook_messenger/kr.png
index 73c4454e7fe..4bd85faa98d 100644
Binary files a/public/images/emoji/facebook_messenger/kr.png and b/public/images/emoji/facebook_messenger/kr.png differ
diff --git a/public/images/emoji/facebook_messenger/kuwait.png b/public/images/emoji/facebook_messenger/kuwait.png
index 32b00e4806d..447fbdd84ac 100644
Binary files a/public/images/emoji/facebook_messenger/kuwait.png and b/public/images/emoji/facebook_messenger/kuwait.png differ
diff --git a/public/images/emoji/facebook_messenger/kyrgyzstan.png b/public/images/emoji/facebook_messenger/kyrgyzstan.png
index 6ecfc717c9b..60ab151c049 100644
Binary files a/public/images/emoji/facebook_messenger/kyrgyzstan.png and b/public/images/emoji/facebook_messenger/kyrgyzstan.png differ
diff --git a/public/images/emoji/facebook_messenger/label.png b/public/images/emoji/facebook_messenger/label.png
index 36f91eb31c0..1a8034cbe6e 100644
Binary files a/public/images/emoji/facebook_messenger/label.png and b/public/images/emoji/facebook_messenger/label.png differ
diff --git a/public/images/emoji/facebook_messenger/laos.png b/public/images/emoji/facebook_messenger/laos.png
index 5dca502f80e..becdf43c9bf 100644
Binary files a/public/images/emoji/facebook_messenger/laos.png and b/public/images/emoji/facebook_messenger/laos.png differ
diff --git a/public/images/emoji/facebook_messenger/large_blue_circle.png b/public/images/emoji/facebook_messenger/large_blue_circle.png
index e79a949ccb4..13a06c1babb 100644
Binary files a/public/images/emoji/facebook_messenger/large_blue_circle.png and b/public/images/emoji/facebook_messenger/large_blue_circle.png differ
diff --git a/public/images/emoji/facebook_messenger/large_blue_diamond.png b/public/images/emoji/facebook_messenger/large_blue_diamond.png
index fc1a8547165..b37360628a4 100644
Binary files a/public/images/emoji/facebook_messenger/large_blue_diamond.png and b/public/images/emoji/facebook_messenger/large_blue_diamond.png differ
diff --git a/public/images/emoji/facebook_messenger/large_orange_diamond.png b/public/images/emoji/facebook_messenger/large_orange_diamond.png
index ecc594465b8..f3e122848ee 100644
Binary files a/public/images/emoji/facebook_messenger/large_orange_diamond.png and b/public/images/emoji/facebook_messenger/large_orange_diamond.png differ
diff --git a/public/images/emoji/facebook_messenger/last_quarter_moon.png b/public/images/emoji/facebook_messenger/last_quarter_moon.png
index aa083f2b817..c6ffbfa2801 100644
Binary files a/public/images/emoji/facebook_messenger/last_quarter_moon.png and b/public/images/emoji/facebook_messenger/last_quarter_moon.png differ
diff --git a/public/images/emoji/facebook_messenger/last_quarter_moon_with_face.png b/public/images/emoji/facebook_messenger/last_quarter_moon_with_face.png
index 33bf88b07b1..b7404f7719a 100644
Binary files a/public/images/emoji/facebook_messenger/last_quarter_moon_with_face.png and b/public/images/emoji/facebook_messenger/last_quarter_moon_with_face.png differ
diff --git a/public/images/emoji/facebook_messenger/latin_cross.png b/public/images/emoji/facebook_messenger/latin_cross.png
index f11e296dd97..705cfc1e6f3 100644
Binary files a/public/images/emoji/facebook_messenger/latin_cross.png and b/public/images/emoji/facebook_messenger/latin_cross.png differ
diff --git a/public/images/emoji/facebook_messenger/latvia.png b/public/images/emoji/facebook_messenger/latvia.png
index a23d4c4e2e6..50284332005 100644
Binary files a/public/images/emoji/facebook_messenger/latvia.png and b/public/images/emoji/facebook_messenger/latvia.png differ
diff --git a/public/images/emoji/facebook_messenger/laughing.png b/public/images/emoji/facebook_messenger/laughing.png
index 68cbb0f1481..039f7f9d6d2 100644
Binary files a/public/images/emoji/facebook_messenger/laughing.png and b/public/images/emoji/facebook_messenger/laughing.png differ
diff --git a/public/images/emoji/facebook_messenger/leaves.png b/public/images/emoji/facebook_messenger/leaves.png
index a4cbbe176cb..20f7a4c8aa5 100644
Binary files a/public/images/emoji/facebook_messenger/leaves.png and b/public/images/emoji/facebook_messenger/leaves.png differ
diff --git a/public/images/emoji/facebook_messenger/lebanon.png b/public/images/emoji/facebook_messenger/lebanon.png
index 5b8710dfd72..462daf5b45f 100644
Binary files a/public/images/emoji/facebook_messenger/lebanon.png and b/public/images/emoji/facebook_messenger/lebanon.png differ
diff --git a/public/images/emoji/facebook_messenger/ledger.png b/public/images/emoji/facebook_messenger/ledger.png
index 0801a71d891..2b4ea73fe3e 100644
Binary files a/public/images/emoji/facebook_messenger/ledger.png and b/public/images/emoji/facebook_messenger/ledger.png differ
diff --git a/public/images/emoji/facebook_messenger/left_luggage.png b/public/images/emoji/facebook_messenger/left_luggage.png
index 8a3acbaf3ac..a384686dd9c 100644
Binary files a/public/images/emoji/facebook_messenger/left_luggage.png and b/public/images/emoji/facebook_messenger/left_luggage.png differ
diff --git a/public/images/emoji/facebook_messenger/left_right_arrow.png b/public/images/emoji/facebook_messenger/left_right_arrow.png
index 86df388cca2..db907768e0f 100644
Binary files a/public/images/emoji/facebook_messenger/left_right_arrow.png and b/public/images/emoji/facebook_messenger/left_right_arrow.png differ
diff --git a/public/images/emoji/facebook_messenger/left_speech_bubble.png b/public/images/emoji/facebook_messenger/left_speech_bubble.png
index 8cb3b728e0e..80195d47270 100644
Binary files a/public/images/emoji/facebook_messenger/left_speech_bubble.png and b/public/images/emoji/facebook_messenger/left_speech_bubble.png differ
diff --git a/public/images/emoji/facebook_messenger/leftwards_arrow_with_hook.png b/public/images/emoji/facebook_messenger/leftwards_arrow_with_hook.png
index 0a60642fa65..b7c7dd6baa3 100644
Binary files a/public/images/emoji/facebook_messenger/leftwards_arrow_with_hook.png and b/public/images/emoji/facebook_messenger/leftwards_arrow_with_hook.png differ
diff --git a/public/images/emoji/facebook_messenger/lemon.png b/public/images/emoji/facebook_messenger/lemon.png
index 14773e7d99b..a5d4c812adc 100644
Binary files a/public/images/emoji/facebook_messenger/lemon.png and b/public/images/emoji/facebook_messenger/lemon.png differ
diff --git a/public/images/emoji/facebook_messenger/leo.png b/public/images/emoji/facebook_messenger/leo.png
index 0050c7afb39..3b92fc4b102 100644
Binary files a/public/images/emoji/facebook_messenger/leo.png and b/public/images/emoji/facebook_messenger/leo.png differ
diff --git a/public/images/emoji/facebook_messenger/leopard.png b/public/images/emoji/facebook_messenger/leopard.png
index 4a602a95bb1..e04426afa86 100644
Binary files a/public/images/emoji/facebook_messenger/leopard.png and b/public/images/emoji/facebook_messenger/leopard.png differ
diff --git a/public/images/emoji/facebook_messenger/lesotho.png b/public/images/emoji/facebook_messenger/lesotho.png
index 136ea59d3dc..dcb3b92128d 100644
Binary files a/public/images/emoji/facebook_messenger/lesotho.png and b/public/images/emoji/facebook_messenger/lesotho.png differ
diff --git a/public/images/emoji/facebook_messenger/level_slider.png b/public/images/emoji/facebook_messenger/level_slider.png
index d7c8408ead3..bad2d4c7e5d 100644
Binary files a/public/images/emoji/facebook_messenger/level_slider.png and b/public/images/emoji/facebook_messenger/level_slider.png differ
diff --git a/public/images/emoji/facebook_messenger/levitate.png b/public/images/emoji/facebook_messenger/levitate.png
index 5231c708a03..12436f98884 100644
Binary files a/public/images/emoji/facebook_messenger/levitate.png and b/public/images/emoji/facebook_messenger/levitate.png differ
diff --git a/public/images/emoji/facebook_messenger/levitate/2.png b/public/images/emoji/facebook_messenger/levitate/2.png
index 753693b093b..7d66f0d7b6a 100644
Binary files a/public/images/emoji/facebook_messenger/levitate/2.png and b/public/images/emoji/facebook_messenger/levitate/2.png differ
diff --git a/public/images/emoji/facebook_messenger/levitate/3.png b/public/images/emoji/facebook_messenger/levitate/3.png
index f56875edac9..775f49d6447 100644
Binary files a/public/images/emoji/facebook_messenger/levitate/3.png and b/public/images/emoji/facebook_messenger/levitate/3.png differ
diff --git a/public/images/emoji/facebook_messenger/levitate/4.png b/public/images/emoji/facebook_messenger/levitate/4.png
index 37d74f5c97d..6906ed18450 100644
Binary files a/public/images/emoji/facebook_messenger/levitate/4.png and b/public/images/emoji/facebook_messenger/levitate/4.png differ
diff --git a/public/images/emoji/facebook_messenger/levitate/5.png b/public/images/emoji/facebook_messenger/levitate/5.png
index 5a48f961920..28849bdcc70 100644
Binary files a/public/images/emoji/facebook_messenger/levitate/5.png and b/public/images/emoji/facebook_messenger/levitate/5.png differ
diff --git a/public/images/emoji/facebook_messenger/levitate/6.png b/public/images/emoji/facebook_messenger/levitate/6.png
index 61507408172..cb80f23fc28 100644
Binary files a/public/images/emoji/facebook_messenger/levitate/6.png and b/public/images/emoji/facebook_messenger/levitate/6.png differ
diff --git a/public/images/emoji/facebook_messenger/liberia.png b/public/images/emoji/facebook_messenger/liberia.png
index 2828cee4c87..0a04c6709fc 100644
Binary files a/public/images/emoji/facebook_messenger/liberia.png and b/public/images/emoji/facebook_messenger/liberia.png differ
diff --git a/public/images/emoji/facebook_messenger/libra.png b/public/images/emoji/facebook_messenger/libra.png
index 54f93f04d9f..96ce4968753 100644
Binary files a/public/images/emoji/facebook_messenger/libra.png and b/public/images/emoji/facebook_messenger/libra.png differ
diff --git a/public/images/emoji/facebook_messenger/libya.png b/public/images/emoji/facebook_messenger/libya.png
index a6c90e15d4f..263d4f56ccb 100644
Binary files a/public/images/emoji/facebook_messenger/libya.png and b/public/images/emoji/facebook_messenger/libya.png differ
diff --git a/public/images/emoji/facebook_messenger/liechtenstein.png b/public/images/emoji/facebook_messenger/liechtenstein.png
index 93605ebfd57..888fa7a2d87 100644
Binary files a/public/images/emoji/facebook_messenger/liechtenstein.png and b/public/images/emoji/facebook_messenger/liechtenstein.png differ
diff --git a/public/images/emoji/facebook_messenger/lifter.png b/public/images/emoji/facebook_messenger/lifter.png
index be0473304d5..1ce69661539 100644
Binary files a/public/images/emoji/facebook_messenger/lifter.png and b/public/images/emoji/facebook_messenger/lifter.png differ
diff --git a/public/images/emoji/facebook_messenger/lifter/2.png b/public/images/emoji/facebook_messenger/lifter/2.png
index 8d680f5b12c..e29ccc9b4bc 100644
Binary files a/public/images/emoji/facebook_messenger/lifter/2.png and b/public/images/emoji/facebook_messenger/lifter/2.png differ
diff --git a/public/images/emoji/facebook_messenger/lifter/3.png b/public/images/emoji/facebook_messenger/lifter/3.png
index e4e961d5d5d..e21fa2a3741 100644
Binary files a/public/images/emoji/facebook_messenger/lifter/3.png and b/public/images/emoji/facebook_messenger/lifter/3.png differ
diff --git a/public/images/emoji/facebook_messenger/lifter/4.png b/public/images/emoji/facebook_messenger/lifter/4.png
index bcdf20d1757..e7ac09f9c7d 100644
Binary files a/public/images/emoji/facebook_messenger/lifter/4.png and b/public/images/emoji/facebook_messenger/lifter/4.png differ
diff --git a/public/images/emoji/facebook_messenger/lifter/5.png b/public/images/emoji/facebook_messenger/lifter/5.png
index 9b91906952e..1fbe8f888fc 100644
Binary files a/public/images/emoji/facebook_messenger/lifter/5.png and b/public/images/emoji/facebook_messenger/lifter/5.png differ
diff --git a/public/images/emoji/facebook_messenger/lifter/6.png b/public/images/emoji/facebook_messenger/lifter/6.png
index c3ce145e9e1..731280ee0c7 100644
Binary files a/public/images/emoji/facebook_messenger/lifter/6.png and b/public/images/emoji/facebook_messenger/lifter/6.png differ
diff --git a/public/images/emoji/facebook_messenger/light_rail.png b/public/images/emoji/facebook_messenger/light_rail.png
index e1aecd7aefa..510c368879f 100644
Binary files a/public/images/emoji/facebook_messenger/light_rail.png and b/public/images/emoji/facebook_messenger/light_rail.png differ
diff --git a/public/images/emoji/facebook_messenger/link.png b/public/images/emoji/facebook_messenger/link.png
index a428a15a9b6..c3fd6f5f230 100644
Binary files a/public/images/emoji/facebook_messenger/link.png and b/public/images/emoji/facebook_messenger/link.png differ
diff --git a/public/images/emoji/facebook_messenger/linked_paperclips.png b/public/images/emoji/facebook_messenger/linked_paperclips.png
index b4080878f68..998be6d8ba7 100644
Binary files a/public/images/emoji/facebook_messenger/linked_paperclips.png and b/public/images/emoji/facebook_messenger/linked_paperclips.png differ
diff --git a/public/images/emoji/facebook_messenger/lion.png b/public/images/emoji/facebook_messenger/lion.png
index aace4fa00bf..d77e8423218 100644
Binary files a/public/images/emoji/facebook_messenger/lion.png and b/public/images/emoji/facebook_messenger/lion.png differ
diff --git a/public/images/emoji/facebook_messenger/lion_face.png b/public/images/emoji/facebook_messenger/lion_face.png
index aace4fa00bf..d77e8423218 100644
Binary files a/public/images/emoji/facebook_messenger/lion_face.png and b/public/images/emoji/facebook_messenger/lion_face.png differ
diff --git a/public/images/emoji/facebook_messenger/lips.png b/public/images/emoji/facebook_messenger/lips.png
index 6e6f4164211..9d54a3869b1 100644
Binary files a/public/images/emoji/facebook_messenger/lips.png and b/public/images/emoji/facebook_messenger/lips.png differ
diff --git a/public/images/emoji/facebook_messenger/lipstick.png b/public/images/emoji/facebook_messenger/lipstick.png
index f42fefcebcb..dc1a810cca4 100644
Binary files a/public/images/emoji/facebook_messenger/lipstick.png and b/public/images/emoji/facebook_messenger/lipstick.png differ
diff --git a/public/images/emoji/facebook_messenger/lithuania.png b/public/images/emoji/facebook_messenger/lithuania.png
index d4e7e6766a2..6682b7d1255 100644
Binary files a/public/images/emoji/facebook_messenger/lithuania.png and b/public/images/emoji/facebook_messenger/lithuania.png differ
diff --git a/public/images/emoji/facebook_messenger/lizard.png b/public/images/emoji/facebook_messenger/lizard.png
index 302081914b6..55488c67b05 100644
Binary files a/public/images/emoji/facebook_messenger/lizard.png and b/public/images/emoji/facebook_messenger/lizard.png differ
diff --git a/public/images/emoji/facebook_messenger/lock.png b/public/images/emoji/facebook_messenger/lock.png
index c584b6db28d..a64f3f01e96 100644
Binary files a/public/images/emoji/facebook_messenger/lock.png and b/public/images/emoji/facebook_messenger/lock.png differ
diff --git a/public/images/emoji/facebook_messenger/lock_with_ink_pen.png b/public/images/emoji/facebook_messenger/lock_with_ink_pen.png
index a8c6259a9bf..e3878e7c73d 100644
Binary files a/public/images/emoji/facebook_messenger/lock_with_ink_pen.png and b/public/images/emoji/facebook_messenger/lock_with_ink_pen.png differ
diff --git a/public/images/emoji/facebook_messenger/lollipop.png b/public/images/emoji/facebook_messenger/lollipop.png
index ec7f17ed110..6519cba46c0 100644
Binary files a/public/images/emoji/facebook_messenger/lollipop.png and b/public/images/emoji/facebook_messenger/lollipop.png differ
diff --git a/public/images/emoji/facebook_messenger/loop.png b/public/images/emoji/facebook_messenger/loop.png
index 103b356312c..45ecb253f05 100644
Binary files a/public/images/emoji/facebook_messenger/loop.png and b/public/images/emoji/facebook_messenger/loop.png differ
diff --git a/public/images/emoji/facebook_messenger/loud_sound.png b/public/images/emoji/facebook_messenger/loud_sound.png
index e5201112af4..c44ba01abec 100644
Binary files a/public/images/emoji/facebook_messenger/loud_sound.png and b/public/images/emoji/facebook_messenger/loud_sound.png differ
diff --git a/public/images/emoji/facebook_messenger/loudspeaker.png b/public/images/emoji/facebook_messenger/loudspeaker.png
index c1c1fcbf23f..a1cd49a51e6 100644
Binary files a/public/images/emoji/facebook_messenger/loudspeaker.png and b/public/images/emoji/facebook_messenger/loudspeaker.png differ
diff --git a/public/images/emoji/facebook_messenger/love_hotel.png b/public/images/emoji/facebook_messenger/love_hotel.png
index 88ff0d0c97b..488c2b9bda6 100644
Binary files a/public/images/emoji/facebook_messenger/love_hotel.png and b/public/images/emoji/facebook_messenger/love_hotel.png differ
diff --git a/public/images/emoji/facebook_messenger/love_letter.png b/public/images/emoji/facebook_messenger/love_letter.png
index 6042cea7360..a45da6bdcc1 100644
Binary files a/public/images/emoji/facebook_messenger/love_letter.png and b/public/images/emoji/facebook_messenger/love_letter.png differ
diff --git a/public/images/emoji/facebook_messenger/love_you_gesture.png b/public/images/emoji/facebook_messenger/love_you_gesture.png
index 14ef7c72b20..2421a6f2aad 100644
Binary files a/public/images/emoji/facebook_messenger/love_you_gesture.png and b/public/images/emoji/facebook_messenger/love_you_gesture.png differ
diff --git a/public/images/emoji/facebook_messenger/love_you_gesture/2.png b/public/images/emoji/facebook_messenger/love_you_gesture/2.png
index b70217e894c..a55a2d6d246 100644
Binary files a/public/images/emoji/facebook_messenger/love_you_gesture/2.png and b/public/images/emoji/facebook_messenger/love_you_gesture/2.png differ
diff --git a/public/images/emoji/facebook_messenger/love_you_gesture/3.png b/public/images/emoji/facebook_messenger/love_you_gesture/3.png
index aa984ea9263..65c07334264 100644
Binary files a/public/images/emoji/facebook_messenger/love_you_gesture/3.png and b/public/images/emoji/facebook_messenger/love_you_gesture/3.png differ
diff --git a/public/images/emoji/facebook_messenger/love_you_gesture/4.png b/public/images/emoji/facebook_messenger/love_you_gesture/4.png
index 5decb0e8008..5f3e11565cd 100644
Binary files a/public/images/emoji/facebook_messenger/love_you_gesture/4.png and b/public/images/emoji/facebook_messenger/love_you_gesture/4.png differ
diff --git a/public/images/emoji/facebook_messenger/love_you_gesture/5.png b/public/images/emoji/facebook_messenger/love_you_gesture/5.png
index e0bb218cc08..a120ea1d5ca 100644
Binary files a/public/images/emoji/facebook_messenger/love_you_gesture/5.png and b/public/images/emoji/facebook_messenger/love_you_gesture/5.png differ
diff --git a/public/images/emoji/facebook_messenger/love_you_gesture/6.png b/public/images/emoji/facebook_messenger/love_you_gesture/6.png
index bb51bde8bbd..5cff9667a89 100644
Binary files a/public/images/emoji/facebook_messenger/love_you_gesture/6.png and b/public/images/emoji/facebook_messenger/love_you_gesture/6.png differ
diff --git a/public/images/emoji/facebook_messenger/low_brightness.png b/public/images/emoji/facebook_messenger/low_brightness.png
index f7dfde34ed4..5663f2c871b 100644
Binary files a/public/images/emoji/facebook_messenger/low_brightness.png and b/public/images/emoji/facebook_messenger/low_brightness.png differ
diff --git a/public/images/emoji/facebook_messenger/lower_left_ballpoint_pen.png b/public/images/emoji/facebook_messenger/lower_left_ballpoint_pen.png
index 6219ae26cc1..399b2fbf22d 100644
Binary files a/public/images/emoji/facebook_messenger/lower_left_ballpoint_pen.png and b/public/images/emoji/facebook_messenger/lower_left_ballpoint_pen.png differ
diff --git a/public/images/emoji/facebook_messenger/lower_left_crayon.png b/public/images/emoji/facebook_messenger/lower_left_crayon.png
index 0ad5b02c2dc..5f920abb85a 100644
Binary files a/public/images/emoji/facebook_messenger/lower_left_crayon.png and b/public/images/emoji/facebook_messenger/lower_left_crayon.png differ
diff --git a/public/images/emoji/facebook_messenger/lower_left_fountain_pen.png b/public/images/emoji/facebook_messenger/lower_left_fountain_pen.png
index 96584c9f579..2e7296057be 100644
Binary files a/public/images/emoji/facebook_messenger/lower_left_fountain_pen.png and b/public/images/emoji/facebook_messenger/lower_left_fountain_pen.png differ
diff --git a/public/images/emoji/facebook_messenger/lower_left_paintbrush.png b/public/images/emoji/facebook_messenger/lower_left_paintbrush.png
index c7d649a3781..6044b9caff8 100644
Binary files a/public/images/emoji/facebook_messenger/lower_left_paintbrush.png and b/public/images/emoji/facebook_messenger/lower_left_paintbrush.png differ
diff --git a/public/images/emoji/facebook_messenger/luxembourg.png b/public/images/emoji/facebook_messenger/luxembourg.png
index a8c6737d1b6..68575f78175 100644
Binary files a/public/images/emoji/facebook_messenger/luxembourg.png and b/public/images/emoji/facebook_messenger/luxembourg.png differ
diff --git a/public/images/emoji/facebook_messenger/lying_face.png b/public/images/emoji/facebook_messenger/lying_face.png
index e31e547296e..811777b16de 100644
Binary files a/public/images/emoji/facebook_messenger/lying_face.png and b/public/images/emoji/facebook_messenger/lying_face.png differ
diff --git a/public/images/emoji/facebook_messenger/m.png b/public/images/emoji/facebook_messenger/m.png
index 84fef974e00..05105497d20 100644
Binary files a/public/images/emoji/facebook_messenger/m.png and b/public/images/emoji/facebook_messenger/m.png differ
diff --git a/public/images/emoji/facebook_messenger/macau.png b/public/images/emoji/facebook_messenger/macau.png
index 6690c383f81..9e4a5f7f2b5 100644
Binary files a/public/images/emoji/facebook_messenger/macau.png and b/public/images/emoji/facebook_messenger/macau.png differ
diff --git a/public/images/emoji/facebook_messenger/macedonia.png b/public/images/emoji/facebook_messenger/macedonia.png
index a4c8ef41d2f..ed777390654 100644
Binary files a/public/images/emoji/facebook_messenger/macedonia.png and b/public/images/emoji/facebook_messenger/macedonia.png differ
diff --git a/public/images/emoji/facebook_messenger/madagascar.png b/public/images/emoji/facebook_messenger/madagascar.png
index 708ec7416ce..cb90e63b626 100644
Binary files a/public/images/emoji/facebook_messenger/madagascar.png and b/public/images/emoji/facebook_messenger/madagascar.png differ
diff --git a/public/images/emoji/facebook_messenger/mag.png b/public/images/emoji/facebook_messenger/mag.png
index a0881161e4b..f17f5bc03d0 100644
Binary files a/public/images/emoji/facebook_messenger/mag.png and b/public/images/emoji/facebook_messenger/mag.png differ
diff --git a/public/images/emoji/facebook_messenger/mag_right.png b/public/images/emoji/facebook_messenger/mag_right.png
index 0ba4cfeff04..953a397b6e4 100644
Binary files a/public/images/emoji/facebook_messenger/mag_right.png and b/public/images/emoji/facebook_messenger/mag_right.png differ
diff --git a/public/images/emoji/facebook_messenger/mage.png b/public/images/emoji/facebook_messenger/mage.png
index 71c1b13f924..339eb4c0c76 100644
Binary files a/public/images/emoji/facebook_messenger/mage.png and b/public/images/emoji/facebook_messenger/mage.png differ
diff --git a/public/images/emoji/facebook_messenger/mage/2.png b/public/images/emoji/facebook_messenger/mage/2.png
index 823f6843fad..b46050143be 100644
Binary files a/public/images/emoji/facebook_messenger/mage/2.png and b/public/images/emoji/facebook_messenger/mage/2.png differ
diff --git a/public/images/emoji/facebook_messenger/mage/3.png b/public/images/emoji/facebook_messenger/mage/3.png
index c2ff6622a04..d547fd68780 100644
Binary files a/public/images/emoji/facebook_messenger/mage/3.png and b/public/images/emoji/facebook_messenger/mage/3.png differ
diff --git a/public/images/emoji/facebook_messenger/mage/4.png b/public/images/emoji/facebook_messenger/mage/4.png
index 76d0a52e374..be66447aee9 100644
Binary files a/public/images/emoji/facebook_messenger/mage/4.png and b/public/images/emoji/facebook_messenger/mage/4.png differ
diff --git a/public/images/emoji/facebook_messenger/mage/5.png b/public/images/emoji/facebook_messenger/mage/5.png
index ddb5de55806..70e39d3617e 100644
Binary files a/public/images/emoji/facebook_messenger/mage/5.png and b/public/images/emoji/facebook_messenger/mage/5.png differ
diff --git a/public/images/emoji/facebook_messenger/mage/6.png b/public/images/emoji/facebook_messenger/mage/6.png
index 302dd62dfb3..4e0837d6905 100644
Binary files a/public/images/emoji/facebook_messenger/mage/6.png and b/public/images/emoji/facebook_messenger/mage/6.png differ
diff --git a/public/images/emoji/facebook_messenger/mahjong.png b/public/images/emoji/facebook_messenger/mahjong.png
index 5766d97ecfe..636fe30a68f 100644
Binary files a/public/images/emoji/facebook_messenger/mahjong.png and b/public/images/emoji/facebook_messenger/mahjong.png differ
diff --git a/public/images/emoji/facebook_messenger/mailbox.png b/public/images/emoji/facebook_messenger/mailbox.png
index 1ee01907c39..73ddcb39eb0 100644
Binary files a/public/images/emoji/facebook_messenger/mailbox.png and b/public/images/emoji/facebook_messenger/mailbox.png differ
diff --git a/public/images/emoji/facebook_messenger/mailbox_closed.png b/public/images/emoji/facebook_messenger/mailbox_closed.png
index 4d7c0ac6200..b631ad84145 100644
Binary files a/public/images/emoji/facebook_messenger/mailbox_closed.png and b/public/images/emoji/facebook_messenger/mailbox_closed.png differ
diff --git a/public/images/emoji/facebook_messenger/mailbox_with_mail.png b/public/images/emoji/facebook_messenger/mailbox_with_mail.png
index 724bab14ab1..d75eca10f84 100644
Binary files a/public/images/emoji/facebook_messenger/mailbox_with_mail.png and b/public/images/emoji/facebook_messenger/mailbox_with_mail.png differ
diff --git a/public/images/emoji/facebook_messenger/mailbox_with_no_mail.png b/public/images/emoji/facebook_messenger/mailbox_with_no_mail.png
index a3ae327980d..524dac77771 100644
Binary files a/public/images/emoji/facebook_messenger/mailbox_with_no_mail.png and b/public/images/emoji/facebook_messenger/mailbox_with_no_mail.png differ
diff --git a/public/images/emoji/facebook_messenger/malawi.png b/public/images/emoji/facebook_messenger/malawi.png
index 854fd4ce854..6f25fc26b4f 100644
Binary files a/public/images/emoji/facebook_messenger/malawi.png and b/public/images/emoji/facebook_messenger/malawi.png differ
diff --git a/public/images/emoji/facebook_messenger/malaysia.png b/public/images/emoji/facebook_messenger/malaysia.png
index dbf3a912985..dc5ec8d4e9e 100644
Binary files a/public/images/emoji/facebook_messenger/malaysia.png and b/public/images/emoji/facebook_messenger/malaysia.png differ
diff --git a/public/images/emoji/facebook_messenger/maldives.png b/public/images/emoji/facebook_messenger/maldives.png
index e0fec7e04b4..c8fa5b60b9a 100644
Binary files a/public/images/emoji/facebook_messenger/maldives.png and b/public/images/emoji/facebook_messenger/maldives.png differ
diff --git a/public/images/emoji/facebook_messenger/male_couple_with_heart.png b/public/images/emoji/facebook_messenger/male_couple_with_heart.png
index 8fcabbd4300..50c3f8f81fc 100644
Binary files a/public/images/emoji/facebook_messenger/male_couple_with_heart.png and b/public/images/emoji/facebook_messenger/male_couple_with_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/male_couplekiss.png b/public/images/emoji/facebook_messenger/male_couplekiss.png
index 842c5a4e22d..e626b7eb92a 100644
Binary files a/public/images/emoji/facebook_messenger/male_couplekiss.png and b/public/images/emoji/facebook_messenger/male_couplekiss.png differ
diff --git a/public/images/emoji/facebook_messenger/male_detective.png b/public/images/emoji/facebook_messenger/male_detective.png
index 587e506d98d..6734c6bde0b 100644
Binary files a/public/images/emoji/facebook_messenger/male_detective.png and b/public/images/emoji/facebook_messenger/male_detective.png differ
diff --git a/public/images/emoji/facebook_messenger/male_detective/2.png b/public/images/emoji/facebook_messenger/male_detective/2.png
index a25d5ea4d44..04383914af4 100644
Binary files a/public/images/emoji/facebook_messenger/male_detective/2.png and b/public/images/emoji/facebook_messenger/male_detective/2.png differ
diff --git a/public/images/emoji/facebook_messenger/male_detective/3.png b/public/images/emoji/facebook_messenger/male_detective/3.png
index f100fd13a45..1a6c3ca89ca 100644
Binary files a/public/images/emoji/facebook_messenger/male_detective/3.png and b/public/images/emoji/facebook_messenger/male_detective/3.png differ
diff --git a/public/images/emoji/facebook_messenger/male_detective/4.png b/public/images/emoji/facebook_messenger/male_detective/4.png
index 775a8b2f2b0..0778fa99eb2 100644
Binary files a/public/images/emoji/facebook_messenger/male_detective/4.png and b/public/images/emoji/facebook_messenger/male_detective/4.png differ
diff --git a/public/images/emoji/facebook_messenger/male_detective/5.png b/public/images/emoji/facebook_messenger/male_detective/5.png
index c9703ba9946..4479cc79cc7 100644
Binary files a/public/images/emoji/facebook_messenger/male_detective/5.png and b/public/images/emoji/facebook_messenger/male_detective/5.png differ
diff --git a/public/images/emoji/facebook_messenger/male_detective/6.png b/public/images/emoji/facebook_messenger/male_detective/6.png
index 55cc03db8d4..2602f4c409c 100644
Binary files a/public/images/emoji/facebook_messenger/male_detective/6.png and b/public/images/emoji/facebook_messenger/male_detective/6.png differ
diff --git a/public/images/emoji/facebook_messenger/mali.png b/public/images/emoji/facebook_messenger/mali.png
index ef19c197c7b..4798e46becd 100644
Binary files a/public/images/emoji/facebook_messenger/mali.png and b/public/images/emoji/facebook_messenger/mali.png differ
diff --git a/public/images/emoji/facebook_messenger/malta.png b/public/images/emoji/facebook_messenger/malta.png
index f6850d62764..fb79203a5e7 100644
Binary files a/public/images/emoji/facebook_messenger/malta.png and b/public/images/emoji/facebook_messenger/malta.png differ
diff --git a/public/images/emoji/facebook_messenger/man.png b/public/images/emoji/facebook_messenger/man.png
index 51dd587074c..8559060c616 100644
Binary files a/public/images/emoji/facebook_messenger/man.png and b/public/images/emoji/facebook_messenger/man.png differ
diff --git a/public/images/emoji/facebook_messenger/man/2.png b/public/images/emoji/facebook_messenger/man/2.png
index 619a4af214e..b73ee5274e7 100644
Binary files a/public/images/emoji/facebook_messenger/man/2.png and b/public/images/emoji/facebook_messenger/man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man/3.png b/public/images/emoji/facebook_messenger/man/3.png
index c75a2f06c7f..cdae4a55107 100644
Binary files a/public/images/emoji/facebook_messenger/man/3.png and b/public/images/emoji/facebook_messenger/man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man/4.png b/public/images/emoji/facebook_messenger/man/4.png
index 3289978982c..639fb3c4cfc 100644
Binary files a/public/images/emoji/facebook_messenger/man/4.png and b/public/images/emoji/facebook_messenger/man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man/5.png b/public/images/emoji/facebook_messenger/man/5.png
index c77e49351fd..18731b3f428 100644
Binary files a/public/images/emoji/facebook_messenger/man/5.png and b/public/images/emoji/facebook_messenger/man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man/6.png b/public/images/emoji/facebook_messenger/man/6.png
index fe6e80f2160..1d706af22a3 100644
Binary files a/public/images/emoji/facebook_messenger/man/6.png and b/public/images/emoji/facebook_messenger/man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_artist.png b/public/images/emoji/facebook_messenger/man_artist.png
index 1cc66506970..4a540590d30 100644
Binary files a/public/images/emoji/facebook_messenger/man_artist.png and b/public/images/emoji/facebook_messenger/man_artist.png differ
diff --git a/public/images/emoji/facebook_messenger/man_artist/2.png b/public/images/emoji/facebook_messenger/man_artist/2.png
index 4bacb1ea060..5cebe53d073 100644
Binary files a/public/images/emoji/facebook_messenger/man_artist/2.png and b/public/images/emoji/facebook_messenger/man_artist/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_artist/3.png b/public/images/emoji/facebook_messenger/man_artist/3.png
index 05d4d810aa6..1a0411b4f91 100644
Binary files a/public/images/emoji/facebook_messenger/man_artist/3.png and b/public/images/emoji/facebook_messenger/man_artist/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_artist/4.png b/public/images/emoji/facebook_messenger/man_artist/4.png
index 4f62b719230..9030c4d11f4 100644
Binary files a/public/images/emoji/facebook_messenger/man_artist/4.png and b/public/images/emoji/facebook_messenger/man_artist/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_artist/5.png b/public/images/emoji/facebook_messenger/man_artist/5.png
index 87b201e1066..8f600331162 100644
Binary files a/public/images/emoji/facebook_messenger/man_artist/5.png and b/public/images/emoji/facebook_messenger/man_artist/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_artist/6.png b/public/images/emoji/facebook_messenger/man_artist/6.png
index d3c5344420f..ffc904a06fc 100644
Binary files a/public/images/emoji/facebook_messenger/man_artist/6.png and b/public/images/emoji/facebook_messenger/man_artist/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_astronaut.png b/public/images/emoji/facebook_messenger/man_astronaut.png
index 3248c7ea4bb..0cd5eaeecfb 100644
Binary files a/public/images/emoji/facebook_messenger/man_astronaut.png and b/public/images/emoji/facebook_messenger/man_astronaut.png differ
diff --git a/public/images/emoji/facebook_messenger/man_astronaut/2.png b/public/images/emoji/facebook_messenger/man_astronaut/2.png
index 3f4608453cb..0cd5eaeecfb 100644
Binary files a/public/images/emoji/facebook_messenger/man_astronaut/2.png and b/public/images/emoji/facebook_messenger/man_astronaut/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_astronaut/3.png b/public/images/emoji/facebook_messenger/man_astronaut/3.png
index dfb79a0fa12..0cd5eaeecfb 100644
Binary files a/public/images/emoji/facebook_messenger/man_astronaut/3.png and b/public/images/emoji/facebook_messenger/man_astronaut/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_astronaut/4.png b/public/images/emoji/facebook_messenger/man_astronaut/4.png
index ecffb4b3dcd..0cd5eaeecfb 100644
Binary files a/public/images/emoji/facebook_messenger/man_astronaut/4.png and b/public/images/emoji/facebook_messenger/man_astronaut/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_astronaut/5.png b/public/images/emoji/facebook_messenger/man_astronaut/5.png
index 30a01501b69..0cd5eaeecfb 100644
Binary files a/public/images/emoji/facebook_messenger/man_astronaut/5.png and b/public/images/emoji/facebook_messenger/man_astronaut/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_astronaut/6.png b/public/images/emoji/facebook_messenger/man_astronaut/6.png
index 1b5c86eeb3e..0cd5eaeecfb 100644
Binary files a/public/images/emoji/facebook_messenger/man_astronaut/6.png and b/public/images/emoji/facebook_messenger/man_astronaut/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cartwheeling.png b/public/images/emoji/facebook_messenger/man_cartwheeling.png
index aaf7c70f746..49633f68510 100644
Binary files a/public/images/emoji/facebook_messenger/man_cartwheeling.png and b/public/images/emoji/facebook_messenger/man_cartwheeling.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cartwheeling/2.png b/public/images/emoji/facebook_messenger/man_cartwheeling/2.png
index 431a4461e3c..2da4606eb7d 100644
Binary files a/public/images/emoji/facebook_messenger/man_cartwheeling/2.png and b/public/images/emoji/facebook_messenger/man_cartwheeling/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cartwheeling/3.png b/public/images/emoji/facebook_messenger/man_cartwheeling/3.png
index fb4421abb07..926cdd7280d 100644
Binary files a/public/images/emoji/facebook_messenger/man_cartwheeling/3.png and b/public/images/emoji/facebook_messenger/man_cartwheeling/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cartwheeling/4.png b/public/images/emoji/facebook_messenger/man_cartwheeling/4.png
index 277e11f0c50..8e8125e73fe 100644
Binary files a/public/images/emoji/facebook_messenger/man_cartwheeling/4.png and b/public/images/emoji/facebook_messenger/man_cartwheeling/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cartwheeling/5.png b/public/images/emoji/facebook_messenger/man_cartwheeling/5.png
index dfd446bd8d2..1ae0a7eaabb 100644
Binary files a/public/images/emoji/facebook_messenger/man_cartwheeling/5.png and b/public/images/emoji/facebook_messenger/man_cartwheeling/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cartwheeling/6.png b/public/images/emoji/facebook_messenger/man_cartwheeling/6.png
index 8877efb2711..d817b4a0209 100644
Binary files a/public/images/emoji/facebook_messenger/man_cartwheeling/6.png and b/public/images/emoji/facebook_messenger/man_cartwheeling/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cook.png b/public/images/emoji/facebook_messenger/man_cook.png
index 8fb843406f5..61961e6d46a 100644
Binary files a/public/images/emoji/facebook_messenger/man_cook.png and b/public/images/emoji/facebook_messenger/man_cook.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cook/2.png b/public/images/emoji/facebook_messenger/man_cook/2.png
index 4dfed228556..8becc5f528a 100644
Binary files a/public/images/emoji/facebook_messenger/man_cook/2.png and b/public/images/emoji/facebook_messenger/man_cook/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cook/3.png b/public/images/emoji/facebook_messenger/man_cook/3.png
index 072ab0c4753..a873ab19277 100644
Binary files a/public/images/emoji/facebook_messenger/man_cook/3.png and b/public/images/emoji/facebook_messenger/man_cook/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cook/4.png b/public/images/emoji/facebook_messenger/man_cook/4.png
index 0d3c6b85351..387fd7d972d 100644
Binary files a/public/images/emoji/facebook_messenger/man_cook/4.png and b/public/images/emoji/facebook_messenger/man_cook/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cook/5.png b/public/images/emoji/facebook_messenger/man_cook/5.png
index 805aa4fcf67..5deb2fd9aec 100644
Binary files a/public/images/emoji/facebook_messenger/man_cook/5.png and b/public/images/emoji/facebook_messenger/man_cook/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cook/6.png b/public/images/emoji/facebook_messenger/man_cook/6.png
index 60d2b62aa26..5ab58fc8ef0 100644
Binary files a/public/images/emoji/facebook_messenger/man_cook/6.png and b/public/images/emoji/facebook_messenger/man_cook/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_dancing.png b/public/images/emoji/facebook_messenger/man_dancing.png
index f3f2a5b04c7..a0792b73559 100644
Binary files a/public/images/emoji/facebook_messenger/man_dancing.png and b/public/images/emoji/facebook_messenger/man_dancing.png differ
diff --git a/public/images/emoji/facebook_messenger/man_dancing/2.png b/public/images/emoji/facebook_messenger/man_dancing/2.png
index 040218520e4..e6e7acb78be 100644
Binary files a/public/images/emoji/facebook_messenger/man_dancing/2.png and b/public/images/emoji/facebook_messenger/man_dancing/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_dancing/3.png b/public/images/emoji/facebook_messenger/man_dancing/3.png
index 8aec654d0ed..9acbfb02f4a 100644
Binary files a/public/images/emoji/facebook_messenger/man_dancing/3.png and b/public/images/emoji/facebook_messenger/man_dancing/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_dancing/4.png b/public/images/emoji/facebook_messenger/man_dancing/4.png
index 3d74099cbba..411c3c32603 100644
Binary files a/public/images/emoji/facebook_messenger/man_dancing/4.png and b/public/images/emoji/facebook_messenger/man_dancing/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_dancing/5.png b/public/images/emoji/facebook_messenger/man_dancing/5.png
index d41bc277889..d8959106797 100644
Binary files a/public/images/emoji/facebook_messenger/man_dancing/5.png and b/public/images/emoji/facebook_messenger/man_dancing/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_dancing/6.png b/public/images/emoji/facebook_messenger/man_dancing/6.png
index 01ee2f8efeb..38040f16c08 100644
Binary files a/public/images/emoji/facebook_messenger/man_dancing/6.png and b/public/images/emoji/facebook_messenger/man_dancing/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_facepalming.png b/public/images/emoji/facebook_messenger/man_facepalming.png
index c819f4029a4..acce29638a1 100644
Binary files a/public/images/emoji/facebook_messenger/man_facepalming.png and b/public/images/emoji/facebook_messenger/man_facepalming.png differ
diff --git a/public/images/emoji/facebook_messenger/man_facepalming/2.png b/public/images/emoji/facebook_messenger/man_facepalming/2.png
index 890aa9695fe..0f3c375494d 100644
Binary files a/public/images/emoji/facebook_messenger/man_facepalming/2.png and b/public/images/emoji/facebook_messenger/man_facepalming/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_facepalming/3.png b/public/images/emoji/facebook_messenger/man_facepalming/3.png
index 58aee73c581..e858efc6353 100644
Binary files a/public/images/emoji/facebook_messenger/man_facepalming/3.png and b/public/images/emoji/facebook_messenger/man_facepalming/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_facepalming/4.png b/public/images/emoji/facebook_messenger/man_facepalming/4.png
index 94355c5acad..75102dff1b7 100644
Binary files a/public/images/emoji/facebook_messenger/man_facepalming/4.png and b/public/images/emoji/facebook_messenger/man_facepalming/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_facepalming/5.png b/public/images/emoji/facebook_messenger/man_facepalming/5.png
index ddd6d4a05ab..885189f2a64 100644
Binary files a/public/images/emoji/facebook_messenger/man_facepalming/5.png and b/public/images/emoji/facebook_messenger/man_facepalming/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_facepalming/6.png b/public/images/emoji/facebook_messenger/man_facepalming/6.png
index 9263f225568..f1bfe541697 100644
Binary files a/public/images/emoji/facebook_messenger/man_facepalming/6.png and b/public/images/emoji/facebook_messenger/man_facepalming/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_factory_worker.png b/public/images/emoji/facebook_messenger/man_factory_worker.png
index 4f8d7b6339f..225a58bae30 100644
Binary files a/public/images/emoji/facebook_messenger/man_factory_worker.png and b/public/images/emoji/facebook_messenger/man_factory_worker.png differ
diff --git a/public/images/emoji/facebook_messenger/man_factory_worker/2.png b/public/images/emoji/facebook_messenger/man_factory_worker/2.png
index ac0c07e8d58..e46e58e9d0c 100644
Binary files a/public/images/emoji/facebook_messenger/man_factory_worker/2.png and b/public/images/emoji/facebook_messenger/man_factory_worker/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_factory_worker/3.png b/public/images/emoji/facebook_messenger/man_factory_worker/3.png
index f5b09e3c747..6fec8f9e6e0 100644
Binary files a/public/images/emoji/facebook_messenger/man_factory_worker/3.png and b/public/images/emoji/facebook_messenger/man_factory_worker/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_factory_worker/4.png b/public/images/emoji/facebook_messenger/man_factory_worker/4.png
index d9e2f4f8f99..8cad9721617 100644
Binary files a/public/images/emoji/facebook_messenger/man_factory_worker/4.png and b/public/images/emoji/facebook_messenger/man_factory_worker/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_factory_worker/5.png b/public/images/emoji/facebook_messenger/man_factory_worker/5.png
index c6fb8f9c463..4143a15d4c9 100644
Binary files a/public/images/emoji/facebook_messenger/man_factory_worker/5.png and b/public/images/emoji/facebook_messenger/man_factory_worker/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_factory_worker/6.png b/public/images/emoji/facebook_messenger/man_factory_worker/6.png
index 196de5ae668..3d8951f6fdd 100644
Binary files a/public/images/emoji/facebook_messenger/man_factory_worker/6.png and b/public/images/emoji/facebook_messenger/man_factory_worker/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_farmer.png b/public/images/emoji/facebook_messenger/man_farmer.png
index a275fe56a76..0db3f286767 100644
Binary files a/public/images/emoji/facebook_messenger/man_farmer.png and b/public/images/emoji/facebook_messenger/man_farmer.png differ
diff --git a/public/images/emoji/facebook_messenger/man_farmer/2.png b/public/images/emoji/facebook_messenger/man_farmer/2.png
index cf79c4c3110..996bc0e255a 100644
Binary files a/public/images/emoji/facebook_messenger/man_farmer/2.png and b/public/images/emoji/facebook_messenger/man_farmer/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_farmer/3.png b/public/images/emoji/facebook_messenger/man_farmer/3.png
index b0c9648562a..a5812d99935 100644
Binary files a/public/images/emoji/facebook_messenger/man_farmer/3.png and b/public/images/emoji/facebook_messenger/man_farmer/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_farmer/4.png b/public/images/emoji/facebook_messenger/man_farmer/4.png
index 89249787904..fc0109d9063 100644
Binary files a/public/images/emoji/facebook_messenger/man_farmer/4.png and b/public/images/emoji/facebook_messenger/man_farmer/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_farmer/5.png b/public/images/emoji/facebook_messenger/man_farmer/5.png
index dc6e22dbc16..379326ef2d6 100644
Binary files a/public/images/emoji/facebook_messenger/man_farmer/5.png and b/public/images/emoji/facebook_messenger/man_farmer/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_farmer/6.png b/public/images/emoji/facebook_messenger/man_farmer/6.png
index e7df59313d1..56439a8ec01 100644
Binary files a/public/images/emoji/facebook_messenger/man_farmer/6.png and b/public/images/emoji/facebook_messenger/man_farmer/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_firefighter.png b/public/images/emoji/facebook_messenger/man_firefighter.png
index a43787bc209..af2a62e44ea 100644
Binary files a/public/images/emoji/facebook_messenger/man_firefighter.png and b/public/images/emoji/facebook_messenger/man_firefighter.png differ
diff --git a/public/images/emoji/facebook_messenger/man_firefighter/2.png b/public/images/emoji/facebook_messenger/man_firefighter/2.png
index 9788ff223ed..cdf9f0a58aa 100644
Binary files a/public/images/emoji/facebook_messenger/man_firefighter/2.png and b/public/images/emoji/facebook_messenger/man_firefighter/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_firefighter/3.png b/public/images/emoji/facebook_messenger/man_firefighter/3.png
index b92f6491359..a14bd782101 100644
Binary files a/public/images/emoji/facebook_messenger/man_firefighter/3.png and b/public/images/emoji/facebook_messenger/man_firefighter/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_firefighter/4.png b/public/images/emoji/facebook_messenger/man_firefighter/4.png
index 2494826b0d1..b7f9f92a5b3 100644
Binary files a/public/images/emoji/facebook_messenger/man_firefighter/4.png and b/public/images/emoji/facebook_messenger/man_firefighter/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_firefighter/5.png b/public/images/emoji/facebook_messenger/man_firefighter/5.png
index 74caaf3d670..cdd6cad4431 100644
Binary files a/public/images/emoji/facebook_messenger/man_firefighter/5.png and b/public/images/emoji/facebook_messenger/man_firefighter/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_firefighter/6.png b/public/images/emoji/facebook_messenger/man_firefighter/6.png
index 87b1460b99a..2b2be60962d 100644
Binary files a/public/images/emoji/facebook_messenger/man_firefighter/6.png and b/public/images/emoji/facebook_messenger/man_firefighter/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_health_worker.png b/public/images/emoji/facebook_messenger/man_health_worker.png
index 266219eec10..d25197ffc41 100644
Binary files a/public/images/emoji/facebook_messenger/man_health_worker.png and b/public/images/emoji/facebook_messenger/man_health_worker.png differ
diff --git a/public/images/emoji/facebook_messenger/man_health_worker/2.png b/public/images/emoji/facebook_messenger/man_health_worker/2.png
index 07434ed5781..a9fd818b4b9 100644
Binary files a/public/images/emoji/facebook_messenger/man_health_worker/2.png and b/public/images/emoji/facebook_messenger/man_health_worker/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_health_worker/3.png b/public/images/emoji/facebook_messenger/man_health_worker/3.png
index a233efb0c7a..f3e52bde198 100644
Binary files a/public/images/emoji/facebook_messenger/man_health_worker/3.png and b/public/images/emoji/facebook_messenger/man_health_worker/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_health_worker/4.png b/public/images/emoji/facebook_messenger/man_health_worker/4.png
index 9dbd254708e..248e2431669 100644
Binary files a/public/images/emoji/facebook_messenger/man_health_worker/4.png and b/public/images/emoji/facebook_messenger/man_health_worker/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_health_worker/5.png b/public/images/emoji/facebook_messenger/man_health_worker/5.png
index 3e13cf5b0dc..32d88c43cbe 100644
Binary files a/public/images/emoji/facebook_messenger/man_health_worker/5.png and b/public/images/emoji/facebook_messenger/man_health_worker/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_health_worker/6.png b/public/images/emoji/facebook_messenger/man_health_worker/6.png
index 6fe28eed3cd..f9ba0ef2dc6 100644
Binary files a/public/images/emoji/facebook_messenger/man_health_worker/6.png and b/public/images/emoji/facebook_messenger/man_health_worker/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating.png b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating.png
index 5231c708a03..12436f98884 100644
Binary files a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating.png and b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/2.png b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/2.png
index 753693b093b..7d66f0d7b6a 100644
Binary files a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/2.png and b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/3.png b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/3.png
index f56875edac9..775f49d6447 100644
Binary files a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/3.png and b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/4.png b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/4.png
index 37d74f5c97d..6906ed18450 100644
Binary files a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/4.png and b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/5.png b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/5.png
index 5a48f961920..28849bdcc70 100644
Binary files a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/5.png and b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/6.png b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/6.png
index 61507408172..cb80f23fc28 100644
Binary files a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/6.png and b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_tuxedo.png b/public/images/emoji/facebook_messenger/man_in_tuxedo.png
index 68a5498555d..c1e78a356a4 100644
Binary files a/public/images/emoji/facebook_messenger/man_in_tuxedo.png and b/public/images/emoji/facebook_messenger/man_in_tuxedo.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_tuxedo/2.png b/public/images/emoji/facebook_messenger/man_in_tuxedo/2.png
index 9115065434d..1c7de609640 100644
Binary files a/public/images/emoji/facebook_messenger/man_in_tuxedo/2.png and b/public/images/emoji/facebook_messenger/man_in_tuxedo/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_tuxedo/3.png b/public/images/emoji/facebook_messenger/man_in_tuxedo/3.png
index 7d21e355055..28ea67dcdae 100644
Binary files a/public/images/emoji/facebook_messenger/man_in_tuxedo/3.png and b/public/images/emoji/facebook_messenger/man_in_tuxedo/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_tuxedo/4.png b/public/images/emoji/facebook_messenger/man_in_tuxedo/4.png
index 5560c73e7c2..9791f6a44a6 100644
Binary files a/public/images/emoji/facebook_messenger/man_in_tuxedo/4.png and b/public/images/emoji/facebook_messenger/man_in_tuxedo/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_tuxedo/5.png b/public/images/emoji/facebook_messenger/man_in_tuxedo/5.png
index 0507a8bc08e..e3f97a3cb70 100644
Binary files a/public/images/emoji/facebook_messenger/man_in_tuxedo/5.png and b/public/images/emoji/facebook_messenger/man_in_tuxedo/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_tuxedo/6.png b/public/images/emoji/facebook_messenger/man_in_tuxedo/6.png
index 7e5b9118602..511c2298688 100644
Binary files a/public/images/emoji/facebook_messenger/man_in_tuxedo/6.png and b/public/images/emoji/facebook_messenger/man_in_tuxedo/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_judge.png b/public/images/emoji/facebook_messenger/man_judge.png
index b20c0cd7349..672fb5f7dff 100644
Binary files a/public/images/emoji/facebook_messenger/man_judge.png and b/public/images/emoji/facebook_messenger/man_judge.png differ
diff --git a/public/images/emoji/facebook_messenger/man_judge/2.png b/public/images/emoji/facebook_messenger/man_judge/2.png
index bdfee1817bb..efe1b2e3b67 100644
Binary files a/public/images/emoji/facebook_messenger/man_judge/2.png and b/public/images/emoji/facebook_messenger/man_judge/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_judge/3.png b/public/images/emoji/facebook_messenger/man_judge/3.png
index 052c0b0fa21..c0c4dc18a14 100644
Binary files a/public/images/emoji/facebook_messenger/man_judge/3.png and b/public/images/emoji/facebook_messenger/man_judge/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_judge/4.png b/public/images/emoji/facebook_messenger/man_judge/4.png
index ddd7e0530df..6ac1280767d 100644
Binary files a/public/images/emoji/facebook_messenger/man_judge/4.png and b/public/images/emoji/facebook_messenger/man_judge/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_judge/5.png b/public/images/emoji/facebook_messenger/man_judge/5.png
index 1a374e14850..8d7983da9ce 100644
Binary files a/public/images/emoji/facebook_messenger/man_judge/5.png and b/public/images/emoji/facebook_messenger/man_judge/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_judge/6.png b/public/images/emoji/facebook_messenger/man_judge/6.png
index 4d5fac75dfe..8e3454517da 100644
Binary files a/public/images/emoji/facebook_messenger/man_judge/6.png and b/public/images/emoji/facebook_messenger/man_judge/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_juggling.png b/public/images/emoji/facebook_messenger/man_juggling.png
index d6cc6a380df..afa07527b32 100644
Binary files a/public/images/emoji/facebook_messenger/man_juggling.png and b/public/images/emoji/facebook_messenger/man_juggling.png differ
diff --git a/public/images/emoji/facebook_messenger/man_juggling/2.png b/public/images/emoji/facebook_messenger/man_juggling/2.png
index 631afe697f6..0401075bb3e 100644
Binary files a/public/images/emoji/facebook_messenger/man_juggling/2.png and b/public/images/emoji/facebook_messenger/man_juggling/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_juggling/3.png b/public/images/emoji/facebook_messenger/man_juggling/3.png
index c28f2a5db9f..f8a42dc9c7e 100644
Binary files a/public/images/emoji/facebook_messenger/man_juggling/3.png and b/public/images/emoji/facebook_messenger/man_juggling/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_juggling/4.png b/public/images/emoji/facebook_messenger/man_juggling/4.png
index 12d32ecb86a..fdbd69344b8 100644
Binary files a/public/images/emoji/facebook_messenger/man_juggling/4.png and b/public/images/emoji/facebook_messenger/man_juggling/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_juggling/5.png b/public/images/emoji/facebook_messenger/man_juggling/5.png
index f04ba21ece3..9a0b00d4bf8 100644
Binary files a/public/images/emoji/facebook_messenger/man_juggling/5.png and b/public/images/emoji/facebook_messenger/man_juggling/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_juggling/6.png b/public/images/emoji/facebook_messenger/man_juggling/6.png
index 4b5b1a7d5c6..4e546c6ca1e 100644
Binary files a/public/images/emoji/facebook_messenger/man_juggling/6.png and b/public/images/emoji/facebook_messenger/man_juggling/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_mechanic.png b/public/images/emoji/facebook_messenger/man_mechanic.png
index df912ad2558..c79d7989e93 100644
Binary files a/public/images/emoji/facebook_messenger/man_mechanic.png and b/public/images/emoji/facebook_messenger/man_mechanic.png differ
diff --git a/public/images/emoji/facebook_messenger/man_mechanic/2.png b/public/images/emoji/facebook_messenger/man_mechanic/2.png
index 2d9a40a7b64..9845ab06e43 100644
Binary files a/public/images/emoji/facebook_messenger/man_mechanic/2.png and b/public/images/emoji/facebook_messenger/man_mechanic/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_mechanic/3.png b/public/images/emoji/facebook_messenger/man_mechanic/3.png
index 0b6093c5612..5f974ea240f 100644
Binary files a/public/images/emoji/facebook_messenger/man_mechanic/3.png and b/public/images/emoji/facebook_messenger/man_mechanic/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_mechanic/4.png b/public/images/emoji/facebook_messenger/man_mechanic/4.png
index 4b776c98ef2..d31883ff772 100644
Binary files a/public/images/emoji/facebook_messenger/man_mechanic/4.png and b/public/images/emoji/facebook_messenger/man_mechanic/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_mechanic/5.png b/public/images/emoji/facebook_messenger/man_mechanic/5.png
index 994526ddb9e..f5bd0ff9330 100644
Binary files a/public/images/emoji/facebook_messenger/man_mechanic/5.png and b/public/images/emoji/facebook_messenger/man_mechanic/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_mechanic/6.png b/public/images/emoji/facebook_messenger/man_mechanic/6.png
index e95117df24a..8e07938caf0 100644
Binary files a/public/images/emoji/facebook_messenger/man_mechanic/6.png and b/public/images/emoji/facebook_messenger/man_mechanic/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_office_worker.png b/public/images/emoji/facebook_messenger/man_office_worker.png
index 641784af029..fe5637f8cfc 100644
Binary files a/public/images/emoji/facebook_messenger/man_office_worker.png and b/public/images/emoji/facebook_messenger/man_office_worker.png differ
diff --git a/public/images/emoji/facebook_messenger/man_office_worker/2.png b/public/images/emoji/facebook_messenger/man_office_worker/2.png
index db95aa14314..8a32d340a8c 100644
Binary files a/public/images/emoji/facebook_messenger/man_office_worker/2.png and b/public/images/emoji/facebook_messenger/man_office_worker/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_office_worker/3.png b/public/images/emoji/facebook_messenger/man_office_worker/3.png
index 0da3a36f501..031d6b54f2d 100644
Binary files a/public/images/emoji/facebook_messenger/man_office_worker/3.png and b/public/images/emoji/facebook_messenger/man_office_worker/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_office_worker/4.png b/public/images/emoji/facebook_messenger/man_office_worker/4.png
index 0e7d62291b0..1b95e48b1a6 100644
Binary files a/public/images/emoji/facebook_messenger/man_office_worker/4.png and b/public/images/emoji/facebook_messenger/man_office_worker/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_office_worker/5.png b/public/images/emoji/facebook_messenger/man_office_worker/5.png
index b2ef2f04209..6420095e1dc 100644
Binary files a/public/images/emoji/facebook_messenger/man_office_worker/5.png and b/public/images/emoji/facebook_messenger/man_office_worker/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_office_worker/6.png b/public/images/emoji/facebook_messenger/man_office_worker/6.png
index f237971ab0d..d6a5b556e55 100644
Binary files a/public/images/emoji/facebook_messenger/man_office_worker/6.png and b/public/images/emoji/facebook_messenger/man_office_worker/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_pilot.png b/public/images/emoji/facebook_messenger/man_pilot.png
index 196949a366f..9dc41236492 100644
Binary files a/public/images/emoji/facebook_messenger/man_pilot.png and b/public/images/emoji/facebook_messenger/man_pilot.png differ
diff --git a/public/images/emoji/facebook_messenger/man_pilot/2.png b/public/images/emoji/facebook_messenger/man_pilot/2.png
index 0b3fe7f3492..f54faef6f5f 100644
Binary files a/public/images/emoji/facebook_messenger/man_pilot/2.png and b/public/images/emoji/facebook_messenger/man_pilot/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_pilot/3.png b/public/images/emoji/facebook_messenger/man_pilot/3.png
index 2af0c956d9d..f5bd685c188 100644
Binary files a/public/images/emoji/facebook_messenger/man_pilot/3.png and b/public/images/emoji/facebook_messenger/man_pilot/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_pilot/4.png b/public/images/emoji/facebook_messenger/man_pilot/4.png
index 7098a598caa..ffcc8a415bf 100644
Binary files a/public/images/emoji/facebook_messenger/man_pilot/4.png and b/public/images/emoji/facebook_messenger/man_pilot/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_pilot/5.png b/public/images/emoji/facebook_messenger/man_pilot/5.png
index 790ecc7051e..5663bd1e023 100644
Binary files a/public/images/emoji/facebook_messenger/man_pilot/5.png and b/public/images/emoji/facebook_messenger/man_pilot/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_pilot/6.png b/public/images/emoji/facebook_messenger/man_pilot/6.png
index 7082b178d78..8f8912718fe 100644
Binary files a/public/images/emoji/facebook_messenger/man_pilot/6.png and b/public/images/emoji/facebook_messenger/man_pilot/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_handball.png b/public/images/emoji/facebook_messenger/man_playing_handball.png
index 8d9964cf037..8a8ae125d6b 100644
Binary files a/public/images/emoji/facebook_messenger/man_playing_handball.png and b/public/images/emoji/facebook_messenger/man_playing_handball.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_handball/2.png b/public/images/emoji/facebook_messenger/man_playing_handball/2.png
index 33b1d7c764b..671bbd65624 100644
Binary files a/public/images/emoji/facebook_messenger/man_playing_handball/2.png and b/public/images/emoji/facebook_messenger/man_playing_handball/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_handball/3.png b/public/images/emoji/facebook_messenger/man_playing_handball/3.png
index 1f3f9215d08..a850d9c3b4a 100644
Binary files a/public/images/emoji/facebook_messenger/man_playing_handball/3.png and b/public/images/emoji/facebook_messenger/man_playing_handball/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_handball/4.png b/public/images/emoji/facebook_messenger/man_playing_handball/4.png
index 20d6288ed7a..4f73532a1c7 100644
Binary files a/public/images/emoji/facebook_messenger/man_playing_handball/4.png and b/public/images/emoji/facebook_messenger/man_playing_handball/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_handball/5.png b/public/images/emoji/facebook_messenger/man_playing_handball/5.png
index b653112d27f..7c5a9fadd55 100644
Binary files a/public/images/emoji/facebook_messenger/man_playing_handball/5.png and b/public/images/emoji/facebook_messenger/man_playing_handball/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_handball/6.png b/public/images/emoji/facebook_messenger/man_playing_handball/6.png
index c7dce8c231c..f67334e6ec5 100644
Binary files a/public/images/emoji/facebook_messenger/man_playing_handball/6.png and b/public/images/emoji/facebook_messenger/man_playing_handball/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_water_polo.png b/public/images/emoji/facebook_messenger/man_playing_water_polo.png
index 14bc7c68d11..520bca4a68b 100644
Binary files a/public/images/emoji/facebook_messenger/man_playing_water_polo.png and b/public/images/emoji/facebook_messenger/man_playing_water_polo.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_water_polo/2.png b/public/images/emoji/facebook_messenger/man_playing_water_polo/2.png
index 4f343861d3c..7721dfcf57b 100644
Binary files a/public/images/emoji/facebook_messenger/man_playing_water_polo/2.png and b/public/images/emoji/facebook_messenger/man_playing_water_polo/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_water_polo/3.png b/public/images/emoji/facebook_messenger/man_playing_water_polo/3.png
index 3548a2ef8db..38150a1247c 100644
Binary files a/public/images/emoji/facebook_messenger/man_playing_water_polo/3.png and b/public/images/emoji/facebook_messenger/man_playing_water_polo/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_water_polo/4.png b/public/images/emoji/facebook_messenger/man_playing_water_polo/4.png
index 7b45751b64d..885cdce85e0 100644
Binary files a/public/images/emoji/facebook_messenger/man_playing_water_polo/4.png and b/public/images/emoji/facebook_messenger/man_playing_water_polo/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_water_polo/5.png b/public/images/emoji/facebook_messenger/man_playing_water_polo/5.png
index 3247752e194..aa77b65de37 100644
Binary files a/public/images/emoji/facebook_messenger/man_playing_water_polo/5.png and b/public/images/emoji/facebook_messenger/man_playing_water_polo/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_water_polo/6.png b/public/images/emoji/facebook_messenger/man_playing_water_polo/6.png
index bd6e616eb20..465e02d7230 100644
Binary files a/public/images/emoji/facebook_messenger/man_playing_water_polo/6.png and b/public/images/emoji/facebook_messenger/man_playing_water_polo/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_scientist.png b/public/images/emoji/facebook_messenger/man_scientist.png
index af1f36d1cd5..d2d1336eb2d 100644
Binary files a/public/images/emoji/facebook_messenger/man_scientist.png and b/public/images/emoji/facebook_messenger/man_scientist.png differ
diff --git a/public/images/emoji/facebook_messenger/man_scientist/2.png b/public/images/emoji/facebook_messenger/man_scientist/2.png
index 5a1e488e80b..cfce7faf307 100644
Binary files a/public/images/emoji/facebook_messenger/man_scientist/2.png and b/public/images/emoji/facebook_messenger/man_scientist/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_scientist/3.png b/public/images/emoji/facebook_messenger/man_scientist/3.png
index 7c7d6b849e0..e23b413b4ed 100644
Binary files a/public/images/emoji/facebook_messenger/man_scientist/3.png and b/public/images/emoji/facebook_messenger/man_scientist/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_scientist/4.png b/public/images/emoji/facebook_messenger/man_scientist/4.png
index ff16a5535f7..c85ac7c4b45 100644
Binary files a/public/images/emoji/facebook_messenger/man_scientist/4.png and b/public/images/emoji/facebook_messenger/man_scientist/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_scientist/5.png b/public/images/emoji/facebook_messenger/man_scientist/5.png
index 179479a6969..1618248f9d0 100644
Binary files a/public/images/emoji/facebook_messenger/man_scientist/5.png and b/public/images/emoji/facebook_messenger/man_scientist/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_scientist/6.png b/public/images/emoji/facebook_messenger/man_scientist/6.png
index b02e169aaff..e2445f75966 100644
Binary files a/public/images/emoji/facebook_messenger/man_scientist/6.png and b/public/images/emoji/facebook_messenger/man_scientist/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_shrugging.png b/public/images/emoji/facebook_messenger/man_shrugging.png
index 61e00fd0b01..378c4151702 100644
Binary files a/public/images/emoji/facebook_messenger/man_shrugging.png and b/public/images/emoji/facebook_messenger/man_shrugging.png differ
diff --git a/public/images/emoji/facebook_messenger/man_shrugging/2.png b/public/images/emoji/facebook_messenger/man_shrugging/2.png
index 6db5885ddbd..8fc5ac7a9b2 100644
Binary files a/public/images/emoji/facebook_messenger/man_shrugging/2.png and b/public/images/emoji/facebook_messenger/man_shrugging/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_shrugging/3.png b/public/images/emoji/facebook_messenger/man_shrugging/3.png
index f1fc833e9c7..d377aeb2db1 100644
Binary files a/public/images/emoji/facebook_messenger/man_shrugging/3.png and b/public/images/emoji/facebook_messenger/man_shrugging/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_shrugging/4.png b/public/images/emoji/facebook_messenger/man_shrugging/4.png
index 9ca39fce99b..8069a9d9db7 100644
Binary files a/public/images/emoji/facebook_messenger/man_shrugging/4.png and b/public/images/emoji/facebook_messenger/man_shrugging/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_shrugging/5.png b/public/images/emoji/facebook_messenger/man_shrugging/5.png
index ab9cd50150c..4df62e3042b 100644
Binary files a/public/images/emoji/facebook_messenger/man_shrugging/5.png and b/public/images/emoji/facebook_messenger/man_shrugging/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_shrugging/6.png b/public/images/emoji/facebook_messenger/man_shrugging/6.png
index a805a9fe340..f4f961b6d42 100644
Binary files a/public/images/emoji/facebook_messenger/man_shrugging/6.png and b/public/images/emoji/facebook_messenger/man_shrugging/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_singer.png b/public/images/emoji/facebook_messenger/man_singer.png
index f3df8810282..f7a8eb225d5 100644
Binary files a/public/images/emoji/facebook_messenger/man_singer.png and b/public/images/emoji/facebook_messenger/man_singer.png differ
diff --git a/public/images/emoji/facebook_messenger/man_singer/2.png b/public/images/emoji/facebook_messenger/man_singer/2.png
index 4e65783bfd5..1bf8b0b4f74 100644
Binary files a/public/images/emoji/facebook_messenger/man_singer/2.png and b/public/images/emoji/facebook_messenger/man_singer/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_singer/3.png b/public/images/emoji/facebook_messenger/man_singer/3.png
index 516eb98afb5..3c88ddc9074 100644
Binary files a/public/images/emoji/facebook_messenger/man_singer/3.png and b/public/images/emoji/facebook_messenger/man_singer/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_singer/4.png b/public/images/emoji/facebook_messenger/man_singer/4.png
index 89326187fbb..7af903db09f 100644
Binary files a/public/images/emoji/facebook_messenger/man_singer/4.png and b/public/images/emoji/facebook_messenger/man_singer/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_singer/5.png b/public/images/emoji/facebook_messenger/man_singer/5.png
index b899d241e70..7de133ed795 100644
Binary files a/public/images/emoji/facebook_messenger/man_singer/5.png and b/public/images/emoji/facebook_messenger/man_singer/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_singer/6.png b/public/images/emoji/facebook_messenger/man_singer/6.png
index a13d0b8c926..e3624cba7e5 100644
Binary files a/public/images/emoji/facebook_messenger/man_singer/6.png and b/public/images/emoji/facebook_messenger/man_singer/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_student.png b/public/images/emoji/facebook_messenger/man_student.png
index 897c8af4123..6f424bf5723 100644
Binary files a/public/images/emoji/facebook_messenger/man_student.png and b/public/images/emoji/facebook_messenger/man_student.png differ
diff --git a/public/images/emoji/facebook_messenger/man_student/2.png b/public/images/emoji/facebook_messenger/man_student/2.png
index 7acaf3e280b..6110707218c 100644
Binary files a/public/images/emoji/facebook_messenger/man_student/2.png and b/public/images/emoji/facebook_messenger/man_student/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_student/3.png b/public/images/emoji/facebook_messenger/man_student/3.png
index c24cb607301..e64638d38e6 100644
Binary files a/public/images/emoji/facebook_messenger/man_student/3.png and b/public/images/emoji/facebook_messenger/man_student/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_student/4.png b/public/images/emoji/facebook_messenger/man_student/4.png
index f0789f0b596..7092eb890d4 100644
Binary files a/public/images/emoji/facebook_messenger/man_student/4.png and b/public/images/emoji/facebook_messenger/man_student/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_student/5.png b/public/images/emoji/facebook_messenger/man_student/5.png
index 8471ef972a0..31356b49162 100644
Binary files a/public/images/emoji/facebook_messenger/man_student/5.png and b/public/images/emoji/facebook_messenger/man_student/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_student/6.png b/public/images/emoji/facebook_messenger/man_student/6.png
index 985678e804c..509da6e840a 100644
Binary files a/public/images/emoji/facebook_messenger/man_student/6.png and b/public/images/emoji/facebook_messenger/man_student/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_teacher.png b/public/images/emoji/facebook_messenger/man_teacher.png
index b85d9054667..86ce6c107de 100644
Binary files a/public/images/emoji/facebook_messenger/man_teacher.png and b/public/images/emoji/facebook_messenger/man_teacher.png differ
diff --git a/public/images/emoji/facebook_messenger/man_teacher/2.png b/public/images/emoji/facebook_messenger/man_teacher/2.png
index e7cdd5b69aa..c8da3fcb8b7 100644
Binary files a/public/images/emoji/facebook_messenger/man_teacher/2.png and b/public/images/emoji/facebook_messenger/man_teacher/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_teacher/3.png b/public/images/emoji/facebook_messenger/man_teacher/3.png
index 00f91851cbd..5a2ccc4e136 100644
Binary files a/public/images/emoji/facebook_messenger/man_teacher/3.png and b/public/images/emoji/facebook_messenger/man_teacher/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_teacher/4.png b/public/images/emoji/facebook_messenger/man_teacher/4.png
index a82ddfb1401..61f131f683d 100644
Binary files a/public/images/emoji/facebook_messenger/man_teacher/4.png and b/public/images/emoji/facebook_messenger/man_teacher/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_teacher/5.png b/public/images/emoji/facebook_messenger/man_teacher/5.png
index d4140998d30..64f1f87d55f 100644
Binary files a/public/images/emoji/facebook_messenger/man_teacher/5.png and b/public/images/emoji/facebook_messenger/man_teacher/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_teacher/6.png b/public/images/emoji/facebook_messenger/man_teacher/6.png
index ed08c11d2b3..1ef09aab804 100644
Binary files a/public/images/emoji/facebook_messenger/man_teacher/6.png and b/public/images/emoji/facebook_messenger/man_teacher/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_technologist.png b/public/images/emoji/facebook_messenger/man_technologist.png
index 4d8208bbe1f..f20d3a50f6d 100644
Binary files a/public/images/emoji/facebook_messenger/man_technologist.png and b/public/images/emoji/facebook_messenger/man_technologist.png differ
diff --git a/public/images/emoji/facebook_messenger/man_technologist/2.png b/public/images/emoji/facebook_messenger/man_technologist/2.png
index aed10e4c384..ecc01084d6a 100644
Binary files a/public/images/emoji/facebook_messenger/man_technologist/2.png and b/public/images/emoji/facebook_messenger/man_technologist/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_technologist/3.png b/public/images/emoji/facebook_messenger/man_technologist/3.png
index 21b1243f7d8..76f0e40961c 100644
Binary files a/public/images/emoji/facebook_messenger/man_technologist/3.png and b/public/images/emoji/facebook_messenger/man_technologist/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_technologist/4.png b/public/images/emoji/facebook_messenger/man_technologist/4.png
index f8d2f531dc3..def0175bbd8 100644
Binary files a/public/images/emoji/facebook_messenger/man_technologist/4.png and b/public/images/emoji/facebook_messenger/man_technologist/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_technologist/5.png b/public/images/emoji/facebook_messenger/man_technologist/5.png
index 27ea1004131..a19e3af21ed 100644
Binary files a/public/images/emoji/facebook_messenger/man_technologist/5.png and b/public/images/emoji/facebook_messenger/man_technologist/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_technologist/6.png b/public/images/emoji/facebook_messenger/man_technologist/6.png
index e6c6bccfffd..604b73f669e 100644
Binary files a/public/images/emoji/facebook_messenger/man_technologist/6.png and b/public/images/emoji/facebook_messenger/man_technologist/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao.png b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao.png
index 12733f7310e..76cd44df79f 100644
Binary files a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao.png and b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/2.png b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/2.png
index 5be20536905..f56c9005fb1 100644
Binary files a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/2.png and b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/3.png b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/3.png
index d6fe373e5dc..c72344831c7 100644
Binary files a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/3.png and b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/4.png b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/4.png
index ed8e0fa95f0..309865e7cfa 100644
Binary files a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/4.png and b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/5.png b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/5.png
index 37ebcedaf7a..b45996b4a0e 100644
Binary files a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/5.png and b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/6.png b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/6.png
index 0fd02d1709c..a9b2226c274 100644
Binary files a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/6.png and b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_turban.png b/public/images/emoji/facebook_messenger/man_with_turban.png
index 658845d182b..39194b7c4f5 100644
Binary files a/public/images/emoji/facebook_messenger/man_with_turban.png and b/public/images/emoji/facebook_messenger/man_with_turban.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_turban/2.png b/public/images/emoji/facebook_messenger/man_with_turban/2.png
index fd2a2c17e33..67d214dd150 100644
Binary files a/public/images/emoji/facebook_messenger/man_with_turban/2.png and b/public/images/emoji/facebook_messenger/man_with_turban/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_turban/3.png b/public/images/emoji/facebook_messenger/man_with_turban/3.png
index 0fd074ec85e..02de1f9adc9 100644
Binary files a/public/images/emoji/facebook_messenger/man_with_turban/3.png and b/public/images/emoji/facebook_messenger/man_with_turban/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_turban/4.png b/public/images/emoji/facebook_messenger/man_with_turban/4.png
index 88ef725c328..26a8f043aa9 100644
Binary files a/public/images/emoji/facebook_messenger/man_with_turban/4.png and b/public/images/emoji/facebook_messenger/man_with_turban/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_turban/5.png b/public/images/emoji/facebook_messenger/man_with_turban/5.png
index 924ab084d28..ae0b4806759 100644
Binary files a/public/images/emoji/facebook_messenger/man_with_turban/5.png and b/public/images/emoji/facebook_messenger/man_with_turban/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_turban/6.png b/public/images/emoji/facebook_messenger/man_with_turban/6.png
index fa49843cb69..c5dce37c2e1 100644
Binary files a/public/images/emoji/facebook_messenger/man_with_turban/6.png and b/public/images/emoji/facebook_messenger/man_with_turban/6.png differ
diff --git a/public/images/emoji/facebook_messenger/mans_shoe.png b/public/images/emoji/facebook_messenger/mans_shoe.png
index e9157aa9a55..82f9de4e315 100644
Binary files a/public/images/emoji/facebook_messenger/mans_shoe.png and b/public/images/emoji/facebook_messenger/mans_shoe.png differ
diff --git a/public/images/emoji/facebook_messenger/mantelpiece_clock.png b/public/images/emoji/facebook_messenger/mantelpiece_clock.png
index 62a0e894592..78008e45b65 100644
Binary files a/public/images/emoji/facebook_messenger/mantelpiece_clock.png and b/public/images/emoji/facebook_messenger/mantelpiece_clock.png differ
diff --git a/public/images/emoji/facebook_messenger/map.png b/public/images/emoji/facebook_messenger/map.png
index 8c102ea49de..f387ba2fd76 100644
Binary files a/public/images/emoji/facebook_messenger/map.png and b/public/images/emoji/facebook_messenger/map.png differ
diff --git a/public/images/emoji/facebook_messenger/maple_leaf.png b/public/images/emoji/facebook_messenger/maple_leaf.png
index d9ec4056552..eeced53f250 100644
Binary files a/public/images/emoji/facebook_messenger/maple_leaf.png and b/public/images/emoji/facebook_messenger/maple_leaf.png differ
diff --git a/public/images/emoji/facebook_messenger/marshall_islands.png b/public/images/emoji/facebook_messenger/marshall_islands.png
index 35a77d3ec6a..acd27f3eba4 100644
Binary files a/public/images/emoji/facebook_messenger/marshall_islands.png and b/public/images/emoji/facebook_messenger/marshall_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/martial_arts_uniform.png b/public/images/emoji/facebook_messenger/martial_arts_uniform.png
index 50e9d87cd53..04258b2bb5d 100644
Binary files a/public/images/emoji/facebook_messenger/martial_arts_uniform.png and b/public/images/emoji/facebook_messenger/martial_arts_uniform.png differ
diff --git a/public/images/emoji/facebook_messenger/martinique.png b/public/images/emoji/facebook_messenger/martinique.png
index 20265c357af..05e5005493b 100644
Binary files a/public/images/emoji/facebook_messenger/martinique.png and b/public/images/emoji/facebook_messenger/martinique.png differ
diff --git a/public/images/emoji/facebook_messenger/mask.png b/public/images/emoji/facebook_messenger/mask.png
index 3fb3c370ede..56eefc66845 100644
Binary files a/public/images/emoji/facebook_messenger/mask.png and b/public/images/emoji/facebook_messenger/mask.png differ
diff --git a/public/images/emoji/facebook_messenger/massage.png b/public/images/emoji/facebook_messenger/massage.png
index 963acc0b3b3..7bd3bc26942 100644
Binary files a/public/images/emoji/facebook_messenger/massage.png and b/public/images/emoji/facebook_messenger/massage.png differ
diff --git a/public/images/emoji/facebook_messenger/massage/2.png b/public/images/emoji/facebook_messenger/massage/2.png
index 908482b905c..78c034b61e4 100644
Binary files a/public/images/emoji/facebook_messenger/massage/2.png and b/public/images/emoji/facebook_messenger/massage/2.png differ
diff --git a/public/images/emoji/facebook_messenger/massage/3.png b/public/images/emoji/facebook_messenger/massage/3.png
index c6349e91464..58f96b7d535 100644
Binary files a/public/images/emoji/facebook_messenger/massage/3.png and b/public/images/emoji/facebook_messenger/massage/3.png differ
diff --git a/public/images/emoji/facebook_messenger/massage/4.png b/public/images/emoji/facebook_messenger/massage/4.png
index 83899fc1936..6db57cc07e8 100644
Binary files a/public/images/emoji/facebook_messenger/massage/4.png and b/public/images/emoji/facebook_messenger/massage/4.png differ
diff --git a/public/images/emoji/facebook_messenger/massage/5.png b/public/images/emoji/facebook_messenger/massage/5.png
index 8645741a675..196fe018f41 100644
Binary files a/public/images/emoji/facebook_messenger/massage/5.png and b/public/images/emoji/facebook_messenger/massage/5.png differ
diff --git a/public/images/emoji/facebook_messenger/massage/6.png b/public/images/emoji/facebook_messenger/massage/6.png
index 6ebddf72f97..c2872a961b9 100644
Binary files a/public/images/emoji/facebook_messenger/massage/6.png and b/public/images/emoji/facebook_messenger/massage/6.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_man.png b/public/images/emoji/facebook_messenger/massage_man.png
index b2d809725e0..1c94d6a3fec 100644
Binary files a/public/images/emoji/facebook_messenger/massage_man.png and b/public/images/emoji/facebook_messenger/massage_man.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_man/2.png b/public/images/emoji/facebook_messenger/massage_man/2.png
index 892e43bd6aa..78fa85eef1f 100644
Binary files a/public/images/emoji/facebook_messenger/massage_man/2.png and b/public/images/emoji/facebook_messenger/massage_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_man/3.png b/public/images/emoji/facebook_messenger/massage_man/3.png
index e9668ae1d81..eb58f3dbae1 100644
Binary files a/public/images/emoji/facebook_messenger/massage_man/3.png and b/public/images/emoji/facebook_messenger/massage_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_man/4.png b/public/images/emoji/facebook_messenger/massage_man/4.png
index f891cc952f1..786b19d92eb 100644
Binary files a/public/images/emoji/facebook_messenger/massage_man/4.png and b/public/images/emoji/facebook_messenger/massage_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_man/5.png b/public/images/emoji/facebook_messenger/massage_man/5.png
index 8295da5a875..bad5a489ae9 100644
Binary files a/public/images/emoji/facebook_messenger/massage_man/5.png and b/public/images/emoji/facebook_messenger/massage_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_man/6.png b/public/images/emoji/facebook_messenger/massage_man/6.png
index 549596cc7c1..1f10070bd6f 100644
Binary files a/public/images/emoji/facebook_messenger/massage_man/6.png and b/public/images/emoji/facebook_messenger/massage_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_woman.png b/public/images/emoji/facebook_messenger/massage_woman.png
index 963acc0b3b3..7bd3bc26942 100644
Binary files a/public/images/emoji/facebook_messenger/massage_woman.png and b/public/images/emoji/facebook_messenger/massage_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_woman/2.png b/public/images/emoji/facebook_messenger/massage_woman/2.png
index 908482b905c..78c034b61e4 100644
Binary files a/public/images/emoji/facebook_messenger/massage_woman/2.png and b/public/images/emoji/facebook_messenger/massage_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_woman/3.png b/public/images/emoji/facebook_messenger/massage_woman/3.png
index c6349e91464..58f96b7d535 100644
Binary files a/public/images/emoji/facebook_messenger/massage_woman/3.png and b/public/images/emoji/facebook_messenger/massage_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_woman/4.png b/public/images/emoji/facebook_messenger/massage_woman/4.png
index 83899fc1936..6db57cc07e8 100644
Binary files a/public/images/emoji/facebook_messenger/massage_woman/4.png and b/public/images/emoji/facebook_messenger/massage_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_woman/5.png b/public/images/emoji/facebook_messenger/massage_woman/5.png
index 8645741a675..196fe018f41 100644
Binary files a/public/images/emoji/facebook_messenger/massage_woman/5.png and b/public/images/emoji/facebook_messenger/massage_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_woman/6.png b/public/images/emoji/facebook_messenger/massage_woman/6.png
index 6ebddf72f97..c2872a961b9 100644
Binary files a/public/images/emoji/facebook_messenger/massage_woman/6.png and b/public/images/emoji/facebook_messenger/massage_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/mauritania.png b/public/images/emoji/facebook_messenger/mauritania.png
index 23fa26e4ced..3c104391494 100644
Binary files a/public/images/emoji/facebook_messenger/mauritania.png and b/public/images/emoji/facebook_messenger/mauritania.png differ
diff --git a/public/images/emoji/facebook_messenger/mauritius.png b/public/images/emoji/facebook_messenger/mauritius.png
index 846272e3670..048d2357486 100644
Binary files a/public/images/emoji/facebook_messenger/mauritius.png and b/public/images/emoji/facebook_messenger/mauritius.png differ
diff --git a/public/images/emoji/facebook_messenger/mayotte.png b/public/images/emoji/facebook_messenger/mayotte.png
index 43a7879d247..d719a9d2d3e 100644
Binary files a/public/images/emoji/facebook_messenger/mayotte.png and b/public/images/emoji/facebook_messenger/mayotte.png differ
diff --git a/public/images/emoji/facebook_messenger/meat_on_bone.png b/public/images/emoji/facebook_messenger/meat_on_bone.png
index 545091e6d71..4d06e486e99 100644
Binary files a/public/images/emoji/facebook_messenger/meat_on_bone.png and b/public/images/emoji/facebook_messenger/meat_on_bone.png differ
diff --git a/public/images/emoji/facebook_messenger/medal.png b/public/images/emoji/facebook_messenger/medal.png
index 57fbc8512fc..2f481eb2812 100644
Binary files a/public/images/emoji/facebook_messenger/medal.png and b/public/images/emoji/facebook_messenger/medal.png differ
diff --git a/public/images/emoji/facebook_messenger/medal_military.png b/public/images/emoji/facebook_messenger/medal_military.png
index 857488da67c..8d80e8b4c60 100644
Binary files a/public/images/emoji/facebook_messenger/medal_military.png and b/public/images/emoji/facebook_messenger/medal_military.png differ
diff --git a/public/images/emoji/facebook_messenger/medal_sports.png b/public/images/emoji/facebook_messenger/medal_sports.png
index 57fbc8512fc..2f481eb2812 100644
Binary files a/public/images/emoji/facebook_messenger/medal_sports.png and b/public/images/emoji/facebook_messenger/medal_sports.png differ
diff --git a/public/images/emoji/facebook_messenger/mega.png b/public/images/emoji/facebook_messenger/mega.png
index 0b8649ee37a..7e2d03af65f 100644
Binary files a/public/images/emoji/facebook_messenger/mega.png and b/public/images/emoji/facebook_messenger/mega.png differ
diff --git a/public/images/emoji/facebook_messenger/melon.png b/public/images/emoji/facebook_messenger/melon.png
index 474cf5ae568..bcc37342213 100644
Binary files a/public/images/emoji/facebook_messenger/melon.png and b/public/images/emoji/facebook_messenger/melon.png differ
diff --git a/public/images/emoji/facebook_messenger/memo.png b/public/images/emoji/facebook_messenger/memo.png
index 8a9a0a4d8cf..57d00e040ef 100644
Binary files a/public/images/emoji/facebook_messenger/memo.png and b/public/images/emoji/facebook_messenger/memo.png differ
diff --git a/public/images/emoji/facebook_messenger/men_wrestling.png b/public/images/emoji/facebook_messenger/men_wrestling.png
index ab63e2f4f0f..1e179aa03a1 100644
Binary files a/public/images/emoji/facebook_messenger/men_wrestling.png and b/public/images/emoji/facebook_messenger/men_wrestling.png differ
diff --git a/public/images/emoji/facebook_messenger/menorah.png b/public/images/emoji/facebook_messenger/menorah.png
index fe2a128793a..292658d6229 100644
Binary files a/public/images/emoji/facebook_messenger/menorah.png and b/public/images/emoji/facebook_messenger/menorah.png differ
diff --git a/public/images/emoji/facebook_messenger/mens.png b/public/images/emoji/facebook_messenger/mens.png
index 4cddf230fb2..306dc4c6e10 100644
Binary files a/public/images/emoji/facebook_messenger/mens.png and b/public/images/emoji/facebook_messenger/mens.png differ
diff --git a/public/images/emoji/facebook_messenger/mermaid.png b/public/images/emoji/facebook_messenger/mermaid.png
new file mode 100644
index 00000000000..a2b11f2232e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mermaid.png differ
diff --git a/public/images/emoji/facebook_messenger/mermaid/2.png b/public/images/emoji/facebook_messenger/mermaid/2.png
new file mode 100644
index 00000000000..a28740baf0b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mermaid/2.png differ
diff --git a/public/images/emoji/facebook_messenger/mermaid/3.png b/public/images/emoji/facebook_messenger/mermaid/3.png
new file mode 100644
index 00000000000..a5cdf4705ff
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mermaid/3.png differ
diff --git a/public/images/emoji/facebook_messenger/mermaid/4.png b/public/images/emoji/facebook_messenger/mermaid/4.png
new file mode 100644
index 00000000000..74973225cdd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mermaid/4.png differ
diff --git a/public/images/emoji/facebook_messenger/mermaid/5.png b/public/images/emoji/facebook_messenger/mermaid/5.png
new file mode 100644
index 00000000000..3ae662eefa0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mermaid/5.png differ
diff --git a/public/images/emoji/facebook_messenger/mermaid/6.png b/public/images/emoji/facebook_messenger/mermaid/6.png
new file mode 100644
index 00000000000..16256cdfe83
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mermaid/6.png differ
diff --git a/public/images/emoji/facebook_messenger/merman.png b/public/images/emoji/facebook_messenger/merman.png
new file mode 100644
index 00000000000..8f80f7787f7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/merman.png differ
diff --git a/public/images/emoji/facebook_messenger/merman/2.png b/public/images/emoji/facebook_messenger/merman/2.png
new file mode 100644
index 00000000000..101ade74b04
Binary files /dev/null and b/public/images/emoji/facebook_messenger/merman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/merman/3.png b/public/images/emoji/facebook_messenger/merman/3.png
new file mode 100644
index 00000000000..2f0fb0025b5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/merman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/merman/4.png b/public/images/emoji/facebook_messenger/merman/4.png
new file mode 100644
index 00000000000..83f0807482d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/merman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/merman/5.png b/public/images/emoji/facebook_messenger/merman/5.png
new file mode 100644
index 00000000000..359e5ba901b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/merman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/merman/6.png b/public/images/emoji/facebook_messenger/merman/6.png
new file mode 100644
index 00000000000..5ba060a11e4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/merman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/merperson.png b/public/images/emoji/facebook_messenger/merperson.png
index ee1b999e0dd..a2b11f2232e 100644
Binary files a/public/images/emoji/facebook_messenger/merperson.png and b/public/images/emoji/facebook_messenger/merperson.png differ
diff --git a/public/images/emoji/facebook_messenger/merperson/2.png b/public/images/emoji/facebook_messenger/merperson/2.png
index b97fbf42e35..a28740baf0b 100644
Binary files a/public/images/emoji/facebook_messenger/merperson/2.png and b/public/images/emoji/facebook_messenger/merperson/2.png differ
diff --git a/public/images/emoji/facebook_messenger/merperson/3.png b/public/images/emoji/facebook_messenger/merperson/3.png
index 9079f60b81e..a5cdf4705ff 100644
Binary files a/public/images/emoji/facebook_messenger/merperson/3.png and b/public/images/emoji/facebook_messenger/merperson/3.png differ
diff --git a/public/images/emoji/facebook_messenger/merperson/4.png b/public/images/emoji/facebook_messenger/merperson/4.png
index decc0b58929..74973225cdd 100644
Binary files a/public/images/emoji/facebook_messenger/merperson/4.png and b/public/images/emoji/facebook_messenger/merperson/4.png differ
diff --git a/public/images/emoji/facebook_messenger/merperson/5.png b/public/images/emoji/facebook_messenger/merperson/5.png
index e3e3e89cb16..3ae662eefa0 100644
Binary files a/public/images/emoji/facebook_messenger/merperson/5.png and b/public/images/emoji/facebook_messenger/merperson/5.png differ
diff --git a/public/images/emoji/facebook_messenger/merperson/6.png b/public/images/emoji/facebook_messenger/merperson/6.png
index 5a5f36684e5..16256cdfe83 100644
Binary files a/public/images/emoji/facebook_messenger/merperson/6.png and b/public/images/emoji/facebook_messenger/merperson/6.png differ
diff --git a/public/images/emoji/facebook_messenger/metal.png b/public/images/emoji/facebook_messenger/metal.png
index 72d987aadc3..42ebf7a6e4d 100644
Binary files a/public/images/emoji/facebook_messenger/metal.png and b/public/images/emoji/facebook_messenger/metal.png differ
diff --git a/public/images/emoji/facebook_messenger/metal/2.png b/public/images/emoji/facebook_messenger/metal/2.png
index 8d87aab277f..f5b6ff33ee5 100644
Binary files a/public/images/emoji/facebook_messenger/metal/2.png and b/public/images/emoji/facebook_messenger/metal/2.png differ
diff --git a/public/images/emoji/facebook_messenger/metal/3.png b/public/images/emoji/facebook_messenger/metal/3.png
index 39a19cd401f..a4df883cbdb 100644
Binary files a/public/images/emoji/facebook_messenger/metal/3.png and b/public/images/emoji/facebook_messenger/metal/3.png differ
diff --git a/public/images/emoji/facebook_messenger/metal/4.png b/public/images/emoji/facebook_messenger/metal/4.png
index 73bedb2c022..0b59f79fddd 100644
Binary files a/public/images/emoji/facebook_messenger/metal/4.png and b/public/images/emoji/facebook_messenger/metal/4.png differ
diff --git a/public/images/emoji/facebook_messenger/metal/5.png b/public/images/emoji/facebook_messenger/metal/5.png
index 36413ab8cfb..5a6b7f17575 100644
Binary files a/public/images/emoji/facebook_messenger/metal/5.png and b/public/images/emoji/facebook_messenger/metal/5.png differ
diff --git a/public/images/emoji/facebook_messenger/metal/6.png b/public/images/emoji/facebook_messenger/metal/6.png
index 1cb1b661b95..e700d4afb2e 100644
Binary files a/public/images/emoji/facebook_messenger/metal/6.png and b/public/images/emoji/facebook_messenger/metal/6.png differ
diff --git a/public/images/emoji/facebook_messenger/metro.png b/public/images/emoji/facebook_messenger/metro.png
index b4b77dd6bac..b8b8874e589 100644
Binary files a/public/images/emoji/facebook_messenger/metro.png and b/public/images/emoji/facebook_messenger/metro.png differ
diff --git a/public/images/emoji/facebook_messenger/mexico.png b/public/images/emoji/facebook_messenger/mexico.png
index 0bed6bc4643..79c41a695c7 100644
Binary files a/public/images/emoji/facebook_messenger/mexico.png and b/public/images/emoji/facebook_messenger/mexico.png differ
diff --git a/public/images/emoji/facebook_messenger/micronesia.png b/public/images/emoji/facebook_messenger/micronesia.png
index 549d03fdc7c..21c61529007 100644
Binary files a/public/images/emoji/facebook_messenger/micronesia.png and b/public/images/emoji/facebook_messenger/micronesia.png differ
diff --git a/public/images/emoji/facebook_messenger/microphone.png b/public/images/emoji/facebook_messenger/microphone.png
index 2b72052cc93..7ebc72a14cf 100644
Binary files a/public/images/emoji/facebook_messenger/microphone.png and b/public/images/emoji/facebook_messenger/microphone.png differ
diff --git a/public/images/emoji/facebook_messenger/microphone2.png b/public/images/emoji/facebook_messenger/microphone2.png
index d10b32281fc..ed24a78f7f2 100644
Binary files a/public/images/emoji/facebook_messenger/microphone2.png and b/public/images/emoji/facebook_messenger/microphone2.png differ
diff --git a/public/images/emoji/facebook_messenger/microscope.png b/public/images/emoji/facebook_messenger/microscope.png
index 9881d1fa04d..6a4530f6230 100644
Binary files a/public/images/emoji/facebook_messenger/microscope.png and b/public/images/emoji/facebook_messenger/microscope.png differ
diff --git a/public/images/emoji/facebook_messenger/middle_finger.png b/public/images/emoji/facebook_messenger/middle_finger.png
index 8e7fce2f49b..7f227d2d232 100644
Binary files a/public/images/emoji/facebook_messenger/middle_finger.png and b/public/images/emoji/facebook_messenger/middle_finger.png differ
diff --git a/public/images/emoji/facebook_messenger/middle_finger/2.png b/public/images/emoji/facebook_messenger/middle_finger/2.png
index 992338bb2b6..14c75b484fb 100644
Binary files a/public/images/emoji/facebook_messenger/middle_finger/2.png and b/public/images/emoji/facebook_messenger/middle_finger/2.png differ
diff --git a/public/images/emoji/facebook_messenger/middle_finger/3.png b/public/images/emoji/facebook_messenger/middle_finger/3.png
index aadc06129fe..e403a196a5c 100644
Binary files a/public/images/emoji/facebook_messenger/middle_finger/3.png and b/public/images/emoji/facebook_messenger/middle_finger/3.png differ
diff --git a/public/images/emoji/facebook_messenger/middle_finger/4.png b/public/images/emoji/facebook_messenger/middle_finger/4.png
index 8ad10be1169..d8507a7f628 100644
Binary files a/public/images/emoji/facebook_messenger/middle_finger/4.png and b/public/images/emoji/facebook_messenger/middle_finger/4.png differ
diff --git a/public/images/emoji/facebook_messenger/middle_finger/5.png b/public/images/emoji/facebook_messenger/middle_finger/5.png
index 695c4a6cb9c..e67c93cb2a4 100644
Binary files a/public/images/emoji/facebook_messenger/middle_finger/5.png and b/public/images/emoji/facebook_messenger/middle_finger/5.png differ
diff --git a/public/images/emoji/facebook_messenger/middle_finger/6.png b/public/images/emoji/facebook_messenger/middle_finger/6.png
index 3457e01312c..c3bd0d882f6 100644
Binary files a/public/images/emoji/facebook_messenger/middle_finger/6.png and b/public/images/emoji/facebook_messenger/middle_finger/6.png differ
diff --git a/public/images/emoji/facebook_messenger/military_medal.png b/public/images/emoji/facebook_messenger/military_medal.png
index 857488da67c..8d80e8b4c60 100644
Binary files a/public/images/emoji/facebook_messenger/military_medal.png and b/public/images/emoji/facebook_messenger/military_medal.png differ
diff --git a/public/images/emoji/facebook_messenger/milk_glass.png b/public/images/emoji/facebook_messenger/milk_glass.png
index d2de8252bba..45c736ee877 100644
Binary files a/public/images/emoji/facebook_messenger/milk_glass.png and b/public/images/emoji/facebook_messenger/milk_glass.png differ
diff --git a/public/images/emoji/facebook_messenger/milky_way.png b/public/images/emoji/facebook_messenger/milky_way.png
index e3073f128a0..3183e2b6b7f 100644
Binary files a/public/images/emoji/facebook_messenger/milky_way.png and b/public/images/emoji/facebook_messenger/milky_way.png differ
diff --git a/public/images/emoji/facebook_messenger/minibus.png b/public/images/emoji/facebook_messenger/minibus.png
index aee0cb3011c..bed2cfab322 100644
Binary files a/public/images/emoji/facebook_messenger/minibus.png and b/public/images/emoji/facebook_messenger/minibus.png differ
diff --git a/public/images/emoji/facebook_messenger/minidisc.png b/public/images/emoji/facebook_messenger/minidisc.png
index 0c8fa7297a7..6ef24a0c5d6 100644
Binary files a/public/images/emoji/facebook_messenger/minidisc.png and b/public/images/emoji/facebook_messenger/minidisc.png differ
diff --git a/public/images/emoji/facebook_messenger/mobile_phone_off.png b/public/images/emoji/facebook_messenger/mobile_phone_off.png
index 21e170f6fd2..0cba945b119 100644
Binary files a/public/images/emoji/facebook_messenger/mobile_phone_off.png and b/public/images/emoji/facebook_messenger/mobile_phone_off.png differ
diff --git a/public/images/emoji/facebook_messenger/moldova.png b/public/images/emoji/facebook_messenger/moldova.png
index d4463a01473..13d3d636809 100644
Binary files a/public/images/emoji/facebook_messenger/moldova.png and b/public/images/emoji/facebook_messenger/moldova.png differ
diff --git a/public/images/emoji/facebook_messenger/monaco.png b/public/images/emoji/facebook_messenger/monaco.png
index 17833f535af..3d30b55f812 100644
Binary files a/public/images/emoji/facebook_messenger/monaco.png and b/public/images/emoji/facebook_messenger/monaco.png differ
diff --git a/public/images/emoji/facebook_messenger/money_mouth.png b/public/images/emoji/facebook_messenger/money_mouth.png
index cd2459518eb..4ef96ba5f71 100644
Binary files a/public/images/emoji/facebook_messenger/money_mouth.png and b/public/images/emoji/facebook_messenger/money_mouth.png differ
diff --git a/public/images/emoji/facebook_messenger/money_mouth_face.png b/public/images/emoji/facebook_messenger/money_mouth_face.png
index cd2459518eb..4ef96ba5f71 100644
Binary files a/public/images/emoji/facebook_messenger/money_mouth_face.png and b/public/images/emoji/facebook_messenger/money_mouth_face.png differ
diff --git a/public/images/emoji/facebook_messenger/money_with_wings.png b/public/images/emoji/facebook_messenger/money_with_wings.png
index 6b3ed315add..4f500ee513a 100644
Binary files a/public/images/emoji/facebook_messenger/money_with_wings.png and b/public/images/emoji/facebook_messenger/money_with_wings.png differ
diff --git a/public/images/emoji/facebook_messenger/moneybag.png b/public/images/emoji/facebook_messenger/moneybag.png
index abd97b89044..0b80bcf56a1 100644
Binary files a/public/images/emoji/facebook_messenger/moneybag.png and b/public/images/emoji/facebook_messenger/moneybag.png differ
diff --git a/public/images/emoji/facebook_messenger/mongolia.png b/public/images/emoji/facebook_messenger/mongolia.png
index cf978945085..19672874f3a 100644
Binary files a/public/images/emoji/facebook_messenger/mongolia.png and b/public/images/emoji/facebook_messenger/mongolia.png differ
diff --git a/public/images/emoji/facebook_messenger/monkey.png b/public/images/emoji/facebook_messenger/monkey.png
index c47f55ca638..e6e32df3c24 100644
Binary files a/public/images/emoji/facebook_messenger/monkey.png and b/public/images/emoji/facebook_messenger/monkey.png differ
diff --git a/public/images/emoji/facebook_messenger/monkey_face.png b/public/images/emoji/facebook_messenger/monkey_face.png
index 590a3057c96..a1cc715ede8 100644
Binary files a/public/images/emoji/facebook_messenger/monkey_face.png and b/public/images/emoji/facebook_messenger/monkey_face.png differ
diff --git a/public/images/emoji/facebook_messenger/monorail.png b/public/images/emoji/facebook_messenger/monorail.png
index 2dcf74036c9..c746ad48f73 100644
Binary files a/public/images/emoji/facebook_messenger/monorail.png and b/public/images/emoji/facebook_messenger/monorail.png differ
diff --git a/public/images/emoji/facebook_messenger/montenegro.png b/public/images/emoji/facebook_messenger/montenegro.png
index 7cbd07cef3c..d3410524813 100644
Binary files a/public/images/emoji/facebook_messenger/montenegro.png and b/public/images/emoji/facebook_messenger/montenegro.png differ
diff --git a/public/images/emoji/facebook_messenger/montserrat.png b/public/images/emoji/facebook_messenger/montserrat.png
index 28712de519d..e93e3f1ad55 100644
Binary files a/public/images/emoji/facebook_messenger/montserrat.png and b/public/images/emoji/facebook_messenger/montserrat.png differ
diff --git a/public/images/emoji/facebook_messenger/moon.png b/public/images/emoji/facebook_messenger/moon.png
index c20fb89b189..6c643e99fb5 100644
Binary files a/public/images/emoji/facebook_messenger/moon.png and b/public/images/emoji/facebook_messenger/moon.png differ
diff --git a/public/images/emoji/facebook_messenger/morocco.png b/public/images/emoji/facebook_messenger/morocco.png
index 7f16d0a66de..deb941c3528 100644
Binary files a/public/images/emoji/facebook_messenger/morocco.png and b/public/images/emoji/facebook_messenger/morocco.png differ
diff --git a/public/images/emoji/facebook_messenger/mortar_board.png b/public/images/emoji/facebook_messenger/mortar_board.png
index d06f52a4383..682dea333c5 100644
Binary files a/public/images/emoji/facebook_messenger/mortar_board.png and b/public/images/emoji/facebook_messenger/mortar_board.png differ
diff --git a/public/images/emoji/facebook_messenger/mosque.png b/public/images/emoji/facebook_messenger/mosque.png
index b0a68fffb5a..eb379aabfc2 100644
Binary files a/public/images/emoji/facebook_messenger/mosque.png and b/public/images/emoji/facebook_messenger/mosque.png differ
diff --git a/public/images/emoji/facebook_messenger/motor_boat.png b/public/images/emoji/facebook_messenger/motor_boat.png
index 3eba365766f..d17e9287e5b 100644
Binary files a/public/images/emoji/facebook_messenger/motor_boat.png and b/public/images/emoji/facebook_messenger/motor_boat.png differ
diff --git a/public/images/emoji/facebook_messenger/motor_scooter.png b/public/images/emoji/facebook_messenger/motor_scooter.png
index b9659e99a3e..bcf8f5edf4a 100644
Binary files a/public/images/emoji/facebook_messenger/motor_scooter.png and b/public/images/emoji/facebook_messenger/motor_scooter.png differ
diff --git a/public/images/emoji/facebook_messenger/motorboat.png b/public/images/emoji/facebook_messenger/motorboat.png
index 3eba365766f..d17e9287e5b 100644
Binary files a/public/images/emoji/facebook_messenger/motorboat.png and b/public/images/emoji/facebook_messenger/motorboat.png differ
diff --git a/public/images/emoji/facebook_messenger/motorcycle.png b/public/images/emoji/facebook_messenger/motorcycle.png
index ba7fb373bad..a23e4817084 100644
Binary files a/public/images/emoji/facebook_messenger/motorcycle.png and b/public/images/emoji/facebook_messenger/motorcycle.png differ
diff --git a/public/images/emoji/facebook_messenger/motorway.png b/public/images/emoji/facebook_messenger/motorway.png
index 2d5622664b6..9519c6cc3ba 100644
Binary files a/public/images/emoji/facebook_messenger/motorway.png and b/public/images/emoji/facebook_messenger/motorway.png differ
diff --git a/public/images/emoji/facebook_messenger/mount_fuji.png b/public/images/emoji/facebook_messenger/mount_fuji.png
index e987911d265..2c07a998e7d 100644
Binary files a/public/images/emoji/facebook_messenger/mount_fuji.png and b/public/images/emoji/facebook_messenger/mount_fuji.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain.png b/public/images/emoji/facebook_messenger/mountain.png
index 6b545f00584..d5fd7c1c0f6 100644
Binary files a/public/images/emoji/facebook_messenger/mountain.png and b/public/images/emoji/facebook_messenger/mountain.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_bicyclist.png b/public/images/emoji/facebook_messenger/mountain_bicyclist.png
index 31e00446a8c..9f8962cf5a1 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_bicyclist.png and b/public/images/emoji/facebook_messenger/mountain_bicyclist.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_bicyclist/2.png b/public/images/emoji/facebook_messenger/mountain_bicyclist/2.png
index 19ecb982e3c..23530f12629 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_bicyclist/2.png and b/public/images/emoji/facebook_messenger/mountain_bicyclist/2.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_bicyclist/3.png b/public/images/emoji/facebook_messenger/mountain_bicyclist/3.png
index 0c96a1744f3..8751f40de52 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_bicyclist/3.png and b/public/images/emoji/facebook_messenger/mountain_bicyclist/3.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_bicyclist/4.png b/public/images/emoji/facebook_messenger/mountain_bicyclist/4.png
index a407ca499f6..b976c8c7f25 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_bicyclist/4.png and b/public/images/emoji/facebook_messenger/mountain_bicyclist/4.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_bicyclist/5.png b/public/images/emoji/facebook_messenger/mountain_bicyclist/5.png
index 1d87023abe9..962102cd964 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_bicyclist/5.png and b/public/images/emoji/facebook_messenger/mountain_bicyclist/5.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_bicyclist/6.png b/public/images/emoji/facebook_messenger/mountain_bicyclist/6.png
index 74eafbd22ed..e20d86857ef 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_bicyclist/6.png and b/public/images/emoji/facebook_messenger/mountain_bicyclist/6.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_man.png b/public/images/emoji/facebook_messenger/mountain_biking_man.png
index 31e00446a8c..9f8962cf5a1 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_biking_man.png and b/public/images/emoji/facebook_messenger/mountain_biking_man.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_man/2.png b/public/images/emoji/facebook_messenger/mountain_biking_man/2.png
index 19ecb982e3c..23530f12629 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_biking_man/2.png and b/public/images/emoji/facebook_messenger/mountain_biking_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_man/3.png b/public/images/emoji/facebook_messenger/mountain_biking_man/3.png
index 0c96a1744f3..8751f40de52 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_biking_man/3.png and b/public/images/emoji/facebook_messenger/mountain_biking_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_man/4.png b/public/images/emoji/facebook_messenger/mountain_biking_man/4.png
index a407ca499f6..b976c8c7f25 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_biking_man/4.png and b/public/images/emoji/facebook_messenger/mountain_biking_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_man/5.png b/public/images/emoji/facebook_messenger/mountain_biking_man/5.png
index 1d87023abe9..962102cd964 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_biking_man/5.png and b/public/images/emoji/facebook_messenger/mountain_biking_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_man/6.png b/public/images/emoji/facebook_messenger/mountain_biking_man/6.png
index 74eafbd22ed..e20d86857ef 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_biking_man/6.png and b/public/images/emoji/facebook_messenger/mountain_biking_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_woman.png b/public/images/emoji/facebook_messenger/mountain_biking_woman.png
index f752e9cdf3c..848ae248abd 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_biking_woman.png and b/public/images/emoji/facebook_messenger/mountain_biking_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_woman/2.png b/public/images/emoji/facebook_messenger/mountain_biking_woman/2.png
index 78e8c2577b8..7ff787cb16b 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_biking_woman/2.png and b/public/images/emoji/facebook_messenger/mountain_biking_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_woman/3.png b/public/images/emoji/facebook_messenger/mountain_biking_woman/3.png
index 2e4e5a891d4..705db4d7f4d 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_biking_woman/3.png and b/public/images/emoji/facebook_messenger/mountain_biking_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_woman/4.png b/public/images/emoji/facebook_messenger/mountain_biking_woman/4.png
index ee9fd92c8d7..c4144da9fad 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_biking_woman/4.png and b/public/images/emoji/facebook_messenger/mountain_biking_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_woman/5.png b/public/images/emoji/facebook_messenger/mountain_biking_woman/5.png
index 6f663ca4c08..50d5ffc2926 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_biking_woman/5.png and b/public/images/emoji/facebook_messenger/mountain_biking_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_woman/6.png b/public/images/emoji/facebook_messenger/mountain_biking_woman/6.png
index f49e7054c91..040d2497113 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_biking_woman/6.png and b/public/images/emoji/facebook_messenger/mountain_biking_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_cableway.png b/public/images/emoji/facebook_messenger/mountain_cableway.png
index e2423930304..05e5c2cd34a 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_cableway.png and b/public/images/emoji/facebook_messenger/mountain_cableway.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_railway.png b/public/images/emoji/facebook_messenger/mountain_railway.png
index eee5c10a52d..55752f0549b 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_railway.png and b/public/images/emoji/facebook_messenger/mountain_railway.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_snow.png b/public/images/emoji/facebook_messenger/mountain_snow.png
index b3e246f09b9..5529c620de3 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_snow.png and b/public/images/emoji/facebook_messenger/mountain_snow.png differ
diff --git a/public/images/emoji/facebook_messenger/mouse.png b/public/images/emoji/facebook_messenger/mouse.png
index 8e52012ef31..b451d033345 100644
Binary files a/public/images/emoji/facebook_messenger/mouse.png and b/public/images/emoji/facebook_messenger/mouse.png differ
diff --git a/public/images/emoji/facebook_messenger/mouse2.png b/public/images/emoji/facebook_messenger/mouse2.png
index 08163d834a6..92e3d7efd6c 100644
Binary files a/public/images/emoji/facebook_messenger/mouse2.png and b/public/images/emoji/facebook_messenger/mouse2.png differ
diff --git a/public/images/emoji/facebook_messenger/mouse_three_button.png b/public/images/emoji/facebook_messenger/mouse_three_button.png
index 3a71c800c68..53fdef1f76f 100644
Binary files a/public/images/emoji/facebook_messenger/mouse_three_button.png and b/public/images/emoji/facebook_messenger/mouse_three_button.png differ
diff --git a/public/images/emoji/facebook_messenger/movie_camera.png b/public/images/emoji/facebook_messenger/movie_camera.png
index e074b30c839..0e7c8535d24 100644
Binary files a/public/images/emoji/facebook_messenger/movie_camera.png and b/public/images/emoji/facebook_messenger/movie_camera.png differ
diff --git a/public/images/emoji/facebook_messenger/moyai.png b/public/images/emoji/facebook_messenger/moyai.png
index 454250431e6..9358b9ee334 100644
Binary files a/public/images/emoji/facebook_messenger/moyai.png and b/public/images/emoji/facebook_messenger/moyai.png differ
diff --git a/public/images/emoji/facebook_messenger/mozambique.png b/public/images/emoji/facebook_messenger/mozambique.png
index 07d5cd56f0e..e2fb9eb03ec 100644
Binary files a/public/images/emoji/facebook_messenger/mozambique.png and b/public/images/emoji/facebook_messenger/mozambique.png differ
diff --git a/public/images/emoji/facebook_messenger/mrs_claus.png b/public/images/emoji/facebook_messenger/mrs_claus.png
index 1923fbd8e93..8530a11d5de 100644
Binary files a/public/images/emoji/facebook_messenger/mrs_claus.png and b/public/images/emoji/facebook_messenger/mrs_claus.png differ
diff --git a/public/images/emoji/facebook_messenger/mrs_claus/2.png b/public/images/emoji/facebook_messenger/mrs_claus/2.png
index a6e57fc30b2..8d7a74743ac 100644
Binary files a/public/images/emoji/facebook_messenger/mrs_claus/2.png and b/public/images/emoji/facebook_messenger/mrs_claus/2.png differ
diff --git a/public/images/emoji/facebook_messenger/mrs_claus/3.png b/public/images/emoji/facebook_messenger/mrs_claus/3.png
index 48e81212564..0f0aac82e8f 100644
Binary files a/public/images/emoji/facebook_messenger/mrs_claus/3.png and b/public/images/emoji/facebook_messenger/mrs_claus/3.png differ
diff --git a/public/images/emoji/facebook_messenger/mrs_claus/4.png b/public/images/emoji/facebook_messenger/mrs_claus/4.png
index cdefbc93405..1c2a4a85090 100644
Binary files a/public/images/emoji/facebook_messenger/mrs_claus/4.png and b/public/images/emoji/facebook_messenger/mrs_claus/4.png differ
diff --git a/public/images/emoji/facebook_messenger/mrs_claus/5.png b/public/images/emoji/facebook_messenger/mrs_claus/5.png
index de7de0327ab..76b059691ff 100644
Binary files a/public/images/emoji/facebook_messenger/mrs_claus/5.png and b/public/images/emoji/facebook_messenger/mrs_claus/5.png differ
diff --git a/public/images/emoji/facebook_messenger/mrs_claus/6.png b/public/images/emoji/facebook_messenger/mrs_claus/6.png
index 25324ab4205..a391685f6e3 100644
Binary files a/public/images/emoji/facebook_messenger/mrs_claus/6.png and b/public/images/emoji/facebook_messenger/mrs_claus/6.png differ
diff --git a/public/images/emoji/facebook_messenger/muscle.png b/public/images/emoji/facebook_messenger/muscle.png
index 756a72d513a..9bbaec8da57 100644
Binary files a/public/images/emoji/facebook_messenger/muscle.png and b/public/images/emoji/facebook_messenger/muscle.png differ
diff --git a/public/images/emoji/facebook_messenger/muscle/2.png b/public/images/emoji/facebook_messenger/muscle/2.png
index 305d54c21b8..ec266b8303d 100644
Binary files a/public/images/emoji/facebook_messenger/muscle/2.png and b/public/images/emoji/facebook_messenger/muscle/2.png differ
diff --git a/public/images/emoji/facebook_messenger/muscle/3.png b/public/images/emoji/facebook_messenger/muscle/3.png
index e8ebb0250a1..5465ebb8374 100644
Binary files a/public/images/emoji/facebook_messenger/muscle/3.png and b/public/images/emoji/facebook_messenger/muscle/3.png differ
diff --git a/public/images/emoji/facebook_messenger/muscle/4.png b/public/images/emoji/facebook_messenger/muscle/4.png
index 83ba3d4bfde..895e4247ccc 100644
Binary files a/public/images/emoji/facebook_messenger/muscle/4.png and b/public/images/emoji/facebook_messenger/muscle/4.png differ
diff --git a/public/images/emoji/facebook_messenger/muscle/5.png b/public/images/emoji/facebook_messenger/muscle/5.png
index eb0d6edff46..2340650569d 100644
Binary files a/public/images/emoji/facebook_messenger/muscle/5.png and b/public/images/emoji/facebook_messenger/muscle/5.png differ
diff --git a/public/images/emoji/facebook_messenger/muscle/6.png b/public/images/emoji/facebook_messenger/muscle/6.png
index ddd35e74784..a11fd2afee3 100644
Binary files a/public/images/emoji/facebook_messenger/muscle/6.png and b/public/images/emoji/facebook_messenger/muscle/6.png differ
diff --git a/public/images/emoji/facebook_messenger/mushroom.png b/public/images/emoji/facebook_messenger/mushroom.png
index 03d8b063f3b..bf49f207ee7 100644
Binary files a/public/images/emoji/facebook_messenger/mushroom.png and b/public/images/emoji/facebook_messenger/mushroom.png differ
diff --git a/public/images/emoji/facebook_messenger/musical_keyboard.png b/public/images/emoji/facebook_messenger/musical_keyboard.png
index 8248f6d20ce..68d5e55021d 100644
Binary files a/public/images/emoji/facebook_messenger/musical_keyboard.png and b/public/images/emoji/facebook_messenger/musical_keyboard.png differ
diff --git a/public/images/emoji/facebook_messenger/musical_note.png b/public/images/emoji/facebook_messenger/musical_note.png
index 401fc305688..5d00c5d49ae 100644
Binary files a/public/images/emoji/facebook_messenger/musical_note.png and b/public/images/emoji/facebook_messenger/musical_note.png differ
diff --git a/public/images/emoji/facebook_messenger/musical_score.png b/public/images/emoji/facebook_messenger/musical_score.png
index 1ccebe791d0..a666aeee4c2 100644
Binary files a/public/images/emoji/facebook_messenger/musical_score.png and b/public/images/emoji/facebook_messenger/musical_score.png differ
diff --git a/public/images/emoji/facebook_messenger/mute.png b/public/images/emoji/facebook_messenger/mute.png
index 6f1b18791ad..b63a966af3e 100644
Binary files a/public/images/emoji/facebook_messenger/mute.png and b/public/images/emoji/facebook_messenger/mute.png differ
diff --git a/public/images/emoji/facebook_messenger/myanmar.png b/public/images/emoji/facebook_messenger/myanmar.png
index 345829e2a3e..b181354b0c5 100644
Binary files a/public/images/emoji/facebook_messenger/myanmar.png and b/public/images/emoji/facebook_messenger/myanmar.png differ
diff --git a/public/images/emoji/facebook_messenger/nail_care.png b/public/images/emoji/facebook_messenger/nail_care.png
index be33983b208..3e11be15102 100644
Binary files a/public/images/emoji/facebook_messenger/nail_care.png and b/public/images/emoji/facebook_messenger/nail_care.png differ
diff --git a/public/images/emoji/facebook_messenger/nail_care/2.png b/public/images/emoji/facebook_messenger/nail_care/2.png
index 78df4c65649..a6140dad02c 100644
Binary files a/public/images/emoji/facebook_messenger/nail_care/2.png and b/public/images/emoji/facebook_messenger/nail_care/2.png differ
diff --git a/public/images/emoji/facebook_messenger/nail_care/3.png b/public/images/emoji/facebook_messenger/nail_care/3.png
index 146f82f51de..0a28750dd37 100644
Binary files a/public/images/emoji/facebook_messenger/nail_care/3.png and b/public/images/emoji/facebook_messenger/nail_care/3.png differ
diff --git a/public/images/emoji/facebook_messenger/nail_care/4.png b/public/images/emoji/facebook_messenger/nail_care/4.png
index bcfc28f1be9..e3b154e4537 100644
Binary files a/public/images/emoji/facebook_messenger/nail_care/4.png and b/public/images/emoji/facebook_messenger/nail_care/4.png differ
diff --git a/public/images/emoji/facebook_messenger/nail_care/5.png b/public/images/emoji/facebook_messenger/nail_care/5.png
index b4a35b65408..86ddbb635f5 100644
Binary files a/public/images/emoji/facebook_messenger/nail_care/5.png and b/public/images/emoji/facebook_messenger/nail_care/5.png differ
diff --git a/public/images/emoji/facebook_messenger/nail_care/6.png b/public/images/emoji/facebook_messenger/nail_care/6.png
index 923baa7cd88..32b982f60fd 100644
Binary files a/public/images/emoji/facebook_messenger/nail_care/6.png and b/public/images/emoji/facebook_messenger/nail_care/6.png differ
diff --git a/public/images/emoji/facebook_messenger/name_badge.png b/public/images/emoji/facebook_messenger/name_badge.png
index 3aec1b2f8e5..b6004838b0f 100644
Binary files a/public/images/emoji/facebook_messenger/name_badge.png and b/public/images/emoji/facebook_messenger/name_badge.png differ
diff --git a/public/images/emoji/facebook_messenger/namibia.png b/public/images/emoji/facebook_messenger/namibia.png
index f505b371fd5..f5ca04c8221 100644
Binary files a/public/images/emoji/facebook_messenger/namibia.png and b/public/images/emoji/facebook_messenger/namibia.png differ
diff --git a/public/images/emoji/facebook_messenger/national_park.png b/public/images/emoji/facebook_messenger/national_park.png
index db29d2dff96..38452f9b927 100644
Binary files a/public/images/emoji/facebook_messenger/national_park.png and b/public/images/emoji/facebook_messenger/national_park.png differ
diff --git a/public/images/emoji/facebook_messenger/nauru.png b/public/images/emoji/facebook_messenger/nauru.png
index 443c1a5e935..eab0c09add8 100644
Binary files a/public/images/emoji/facebook_messenger/nauru.png and b/public/images/emoji/facebook_messenger/nauru.png differ
diff --git a/public/images/emoji/facebook_messenger/nauseated_face.png b/public/images/emoji/facebook_messenger/nauseated_face.png
index 0ec48392c20..c50528789c6 100644
Binary files a/public/images/emoji/facebook_messenger/nauseated_face.png and b/public/images/emoji/facebook_messenger/nauseated_face.png differ
diff --git a/public/images/emoji/facebook_messenger/necktie.png b/public/images/emoji/facebook_messenger/necktie.png
index c872774b802..3b0b644091b 100644
Binary files a/public/images/emoji/facebook_messenger/necktie.png and b/public/images/emoji/facebook_messenger/necktie.png differ
diff --git a/public/images/emoji/facebook_messenger/negative_squared_cross_mark.png b/public/images/emoji/facebook_messenger/negative_squared_cross_mark.png
index 24a2cfa27d2..7a5b77824a5 100644
Binary files a/public/images/emoji/facebook_messenger/negative_squared_cross_mark.png and b/public/images/emoji/facebook_messenger/negative_squared_cross_mark.png differ
diff --git a/public/images/emoji/facebook_messenger/nepal.png b/public/images/emoji/facebook_messenger/nepal.png
index cd57822d801..52db0406738 100644
Binary files a/public/images/emoji/facebook_messenger/nepal.png and b/public/images/emoji/facebook_messenger/nepal.png differ
diff --git a/public/images/emoji/facebook_messenger/nerd.png b/public/images/emoji/facebook_messenger/nerd.png
index b844baf25b2..2c83c277321 100644
Binary files a/public/images/emoji/facebook_messenger/nerd.png and b/public/images/emoji/facebook_messenger/nerd.png differ
diff --git a/public/images/emoji/facebook_messenger/nerd_face.png b/public/images/emoji/facebook_messenger/nerd_face.png
index b844baf25b2..2c83c277321 100644
Binary files a/public/images/emoji/facebook_messenger/nerd_face.png and b/public/images/emoji/facebook_messenger/nerd_face.png differ
diff --git a/public/images/emoji/facebook_messenger/netherlands.png b/public/images/emoji/facebook_messenger/netherlands.png
index b01d79e5ee4..d939e8d0ab4 100644
Binary files a/public/images/emoji/facebook_messenger/netherlands.png and b/public/images/emoji/facebook_messenger/netherlands.png differ
diff --git a/public/images/emoji/facebook_messenger/neutral_face.png b/public/images/emoji/facebook_messenger/neutral_face.png
index e617f1227ad..0272013bb9b 100644
Binary files a/public/images/emoji/facebook_messenger/neutral_face.png and b/public/images/emoji/facebook_messenger/neutral_face.png differ
diff --git a/public/images/emoji/facebook_messenger/new.png b/public/images/emoji/facebook_messenger/new.png
index 3def1bf7711..399ac34b5b9 100644
Binary files a/public/images/emoji/facebook_messenger/new.png and b/public/images/emoji/facebook_messenger/new.png differ
diff --git a/public/images/emoji/facebook_messenger/new_caledonia.png b/public/images/emoji/facebook_messenger/new_caledonia.png
index 45914c48c7d..95db4553b7e 100644
Binary files a/public/images/emoji/facebook_messenger/new_caledonia.png and b/public/images/emoji/facebook_messenger/new_caledonia.png differ
diff --git a/public/images/emoji/facebook_messenger/new_moon.png b/public/images/emoji/facebook_messenger/new_moon.png
index c20fb89b189..6c643e99fb5 100644
Binary files a/public/images/emoji/facebook_messenger/new_moon.png and b/public/images/emoji/facebook_messenger/new_moon.png differ
diff --git a/public/images/emoji/facebook_messenger/new_moon_with_face.png b/public/images/emoji/facebook_messenger/new_moon_with_face.png
index 70599fc0db2..a73dd1035d9 100644
Binary files a/public/images/emoji/facebook_messenger/new_moon_with_face.png and b/public/images/emoji/facebook_messenger/new_moon_with_face.png differ
diff --git a/public/images/emoji/facebook_messenger/new_zealand.png b/public/images/emoji/facebook_messenger/new_zealand.png
index 9d86ff873c4..6e5d8b040e8 100644
Binary files a/public/images/emoji/facebook_messenger/new_zealand.png and b/public/images/emoji/facebook_messenger/new_zealand.png differ
diff --git a/public/images/emoji/facebook_messenger/newspaper.png b/public/images/emoji/facebook_messenger/newspaper.png
index f0dd5da17e6..0f17e09c376 100644
Binary files a/public/images/emoji/facebook_messenger/newspaper.png and b/public/images/emoji/facebook_messenger/newspaper.png differ
diff --git a/public/images/emoji/facebook_messenger/newspaper2.png b/public/images/emoji/facebook_messenger/newspaper2.png
index 052dcce75f0..785c9d17670 100644
Binary files a/public/images/emoji/facebook_messenger/newspaper2.png and b/public/images/emoji/facebook_messenger/newspaper2.png differ
diff --git a/public/images/emoji/facebook_messenger/newspaper_roll.png b/public/images/emoji/facebook_messenger/newspaper_roll.png
index 052dcce75f0..785c9d17670 100644
Binary files a/public/images/emoji/facebook_messenger/newspaper_roll.png and b/public/images/emoji/facebook_messenger/newspaper_roll.png differ
diff --git a/public/images/emoji/facebook_messenger/next_track.png b/public/images/emoji/facebook_messenger/next_track.png
index 13953da5d7f..73c5fae8b86 100644
Binary files a/public/images/emoji/facebook_messenger/next_track.png and b/public/images/emoji/facebook_messenger/next_track.png differ
diff --git a/public/images/emoji/facebook_messenger/next_track_button.png b/public/images/emoji/facebook_messenger/next_track_button.png
index 13953da5d7f..73c5fae8b86 100644
Binary files a/public/images/emoji/facebook_messenger/next_track_button.png and b/public/images/emoji/facebook_messenger/next_track_button.png differ
diff --git a/public/images/emoji/facebook_messenger/ng.png b/public/images/emoji/facebook_messenger/ng.png
index fbf8bf7d8e0..77d4f0bc5d1 100644
Binary files a/public/images/emoji/facebook_messenger/ng.png and b/public/images/emoji/facebook_messenger/ng.png differ
diff --git a/public/images/emoji/facebook_messenger/nicaragua.png b/public/images/emoji/facebook_messenger/nicaragua.png
index e405151e2d1..f173f6e56fe 100644
Binary files a/public/images/emoji/facebook_messenger/nicaragua.png and b/public/images/emoji/facebook_messenger/nicaragua.png differ
diff --git a/public/images/emoji/facebook_messenger/niger.png b/public/images/emoji/facebook_messenger/niger.png
index fb6c4a4d372..7a63027982d 100644
Binary files a/public/images/emoji/facebook_messenger/niger.png and b/public/images/emoji/facebook_messenger/niger.png differ
diff --git a/public/images/emoji/facebook_messenger/nigeria.png b/public/images/emoji/facebook_messenger/nigeria.png
index 23c9d9a7627..fef6a35192c 100644
Binary files a/public/images/emoji/facebook_messenger/nigeria.png and b/public/images/emoji/facebook_messenger/nigeria.png differ
diff --git a/public/images/emoji/facebook_messenger/night_with_stars.png b/public/images/emoji/facebook_messenger/night_with_stars.png
index 8e42c84cad0..e4dbd0f925a 100644
Binary files a/public/images/emoji/facebook_messenger/night_with_stars.png and b/public/images/emoji/facebook_messenger/night_with_stars.png differ
diff --git a/public/images/emoji/facebook_messenger/nine.png b/public/images/emoji/facebook_messenger/nine.png
index 15cd82061e5..78c2b33ae45 100644
Binary files a/public/images/emoji/facebook_messenger/nine.png and b/public/images/emoji/facebook_messenger/nine.png differ
diff --git a/public/images/emoji/facebook_messenger/niue.png b/public/images/emoji/facebook_messenger/niue.png
index daaa26cc166..f60cff48dd2 100644
Binary files a/public/images/emoji/facebook_messenger/niue.png and b/public/images/emoji/facebook_messenger/niue.png differ
diff --git a/public/images/emoji/facebook_messenger/no_bell.png b/public/images/emoji/facebook_messenger/no_bell.png
index 30cc5f68ba3..0d7043bfe70 100644
Binary files a/public/images/emoji/facebook_messenger/no_bell.png and b/public/images/emoji/facebook_messenger/no_bell.png differ
diff --git a/public/images/emoji/facebook_messenger/no_bicycles.png b/public/images/emoji/facebook_messenger/no_bicycles.png
index 81d14e9d8ba..5d365336c4e 100644
Binary files a/public/images/emoji/facebook_messenger/no_bicycles.png and b/public/images/emoji/facebook_messenger/no_bicycles.png differ
diff --git a/public/images/emoji/facebook_messenger/no_entry.png b/public/images/emoji/facebook_messenger/no_entry.png
index f3db9deb401..b251f243c3c 100644
Binary files a/public/images/emoji/facebook_messenger/no_entry.png and b/public/images/emoji/facebook_messenger/no_entry.png differ
diff --git a/public/images/emoji/facebook_messenger/no_entry_sign.png b/public/images/emoji/facebook_messenger/no_entry_sign.png
index 930838c69bc..3fb90983da5 100644
Binary files a/public/images/emoji/facebook_messenger/no_entry_sign.png and b/public/images/emoji/facebook_messenger/no_entry_sign.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good.png b/public/images/emoji/facebook_messenger/no_good.png
index 1b39244154e..35ea5e5a2e7 100644
Binary files a/public/images/emoji/facebook_messenger/no_good.png and b/public/images/emoji/facebook_messenger/no_good.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good/2.png b/public/images/emoji/facebook_messenger/no_good/2.png
index ae600f93d1d..4f4639fb71a 100644
Binary files a/public/images/emoji/facebook_messenger/no_good/2.png and b/public/images/emoji/facebook_messenger/no_good/2.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good/3.png b/public/images/emoji/facebook_messenger/no_good/3.png
index aaa680f7ab9..150dac45e35 100644
Binary files a/public/images/emoji/facebook_messenger/no_good/3.png and b/public/images/emoji/facebook_messenger/no_good/3.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good/4.png b/public/images/emoji/facebook_messenger/no_good/4.png
index f96e628a3ad..5ba774f3065 100644
Binary files a/public/images/emoji/facebook_messenger/no_good/4.png and b/public/images/emoji/facebook_messenger/no_good/4.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good/5.png b/public/images/emoji/facebook_messenger/no_good/5.png
index 10cf1a4bec4..96e240b5735 100644
Binary files a/public/images/emoji/facebook_messenger/no_good/5.png and b/public/images/emoji/facebook_messenger/no_good/5.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good/6.png b/public/images/emoji/facebook_messenger/no_good/6.png
index 2bf5e240084..3f75a33ea6f 100644
Binary files a/public/images/emoji/facebook_messenger/no_good/6.png and b/public/images/emoji/facebook_messenger/no_good/6.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_man.png b/public/images/emoji/facebook_messenger/no_good_man.png
index 482a4698d1e..04525ff5a90 100644
Binary files a/public/images/emoji/facebook_messenger/no_good_man.png and b/public/images/emoji/facebook_messenger/no_good_man.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_man/2.png b/public/images/emoji/facebook_messenger/no_good_man/2.png
index faf146004d6..cf86d2818ed 100644
Binary files a/public/images/emoji/facebook_messenger/no_good_man/2.png and b/public/images/emoji/facebook_messenger/no_good_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_man/3.png b/public/images/emoji/facebook_messenger/no_good_man/3.png
index 27ba65f98b2..81d84e412b4 100644
Binary files a/public/images/emoji/facebook_messenger/no_good_man/3.png and b/public/images/emoji/facebook_messenger/no_good_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_man/4.png b/public/images/emoji/facebook_messenger/no_good_man/4.png
index cb7608b4e9c..adf18cd8588 100644
Binary files a/public/images/emoji/facebook_messenger/no_good_man/4.png and b/public/images/emoji/facebook_messenger/no_good_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_man/5.png b/public/images/emoji/facebook_messenger/no_good_man/5.png
index 6498b6f0827..f9365edc5cc 100644
Binary files a/public/images/emoji/facebook_messenger/no_good_man/5.png and b/public/images/emoji/facebook_messenger/no_good_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_man/6.png b/public/images/emoji/facebook_messenger/no_good_man/6.png
index 0bac0f4cd47..86ff6953e27 100644
Binary files a/public/images/emoji/facebook_messenger/no_good_man/6.png and b/public/images/emoji/facebook_messenger/no_good_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_woman.png b/public/images/emoji/facebook_messenger/no_good_woman.png
index 1b39244154e..35ea5e5a2e7 100644
Binary files a/public/images/emoji/facebook_messenger/no_good_woman.png and b/public/images/emoji/facebook_messenger/no_good_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_woman/2.png b/public/images/emoji/facebook_messenger/no_good_woman/2.png
index ae600f93d1d..4f4639fb71a 100644
Binary files a/public/images/emoji/facebook_messenger/no_good_woman/2.png and b/public/images/emoji/facebook_messenger/no_good_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_woman/3.png b/public/images/emoji/facebook_messenger/no_good_woman/3.png
index aaa680f7ab9..150dac45e35 100644
Binary files a/public/images/emoji/facebook_messenger/no_good_woman/3.png and b/public/images/emoji/facebook_messenger/no_good_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_woman/4.png b/public/images/emoji/facebook_messenger/no_good_woman/4.png
index f96e628a3ad..5ba774f3065 100644
Binary files a/public/images/emoji/facebook_messenger/no_good_woman/4.png and b/public/images/emoji/facebook_messenger/no_good_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_woman/5.png b/public/images/emoji/facebook_messenger/no_good_woman/5.png
index 10cf1a4bec4..96e240b5735 100644
Binary files a/public/images/emoji/facebook_messenger/no_good_woman/5.png and b/public/images/emoji/facebook_messenger/no_good_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_woman/6.png b/public/images/emoji/facebook_messenger/no_good_woman/6.png
index 2bf5e240084..3f75a33ea6f 100644
Binary files a/public/images/emoji/facebook_messenger/no_good_woman/6.png and b/public/images/emoji/facebook_messenger/no_good_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/no_mobile_phones.png b/public/images/emoji/facebook_messenger/no_mobile_phones.png
index 26a54246de5..64444baa035 100644
Binary files a/public/images/emoji/facebook_messenger/no_mobile_phones.png and b/public/images/emoji/facebook_messenger/no_mobile_phones.png differ
diff --git a/public/images/emoji/facebook_messenger/no_mouth.png b/public/images/emoji/facebook_messenger/no_mouth.png
index 609faa8c373..e3626f448bc 100644
Binary files a/public/images/emoji/facebook_messenger/no_mouth.png and b/public/images/emoji/facebook_messenger/no_mouth.png differ
diff --git a/public/images/emoji/facebook_messenger/no_pedestrians.png b/public/images/emoji/facebook_messenger/no_pedestrians.png
index afccb3291ff..cf2e6202f06 100644
Binary files a/public/images/emoji/facebook_messenger/no_pedestrians.png and b/public/images/emoji/facebook_messenger/no_pedestrians.png differ
diff --git a/public/images/emoji/facebook_messenger/no_smoking.png b/public/images/emoji/facebook_messenger/no_smoking.png
index 06ff47b0a91..6d5f7caf456 100644
Binary files a/public/images/emoji/facebook_messenger/no_smoking.png and b/public/images/emoji/facebook_messenger/no_smoking.png differ
diff --git a/public/images/emoji/facebook_messenger/non-potable_water.png b/public/images/emoji/facebook_messenger/non-potable_water.png
index 7efa68146e1..6c3d2c5d995 100644
Binary files a/public/images/emoji/facebook_messenger/non-potable_water.png and b/public/images/emoji/facebook_messenger/non-potable_water.png differ
diff --git a/public/images/emoji/facebook_messenger/norfolk_island.png b/public/images/emoji/facebook_messenger/norfolk_island.png
index 574acba1009..1a56f41ccb1 100644
Binary files a/public/images/emoji/facebook_messenger/norfolk_island.png and b/public/images/emoji/facebook_messenger/norfolk_island.png differ
diff --git a/public/images/emoji/facebook_messenger/north_korea.png b/public/images/emoji/facebook_messenger/north_korea.png
index d15d10aecec..0a0621583c6 100644
Binary files a/public/images/emoji/facebook_messenger/north_korea.png and b/public/images/emoji/facebook_messenger/north_korea.png differ
diff --git a/public/images/emoji/facebook_messenger/northern_mariana_islands.png b/public/images/emoji/facebook_messenger/northern_mariana_islands.png
index 962a6171b9c..0adddf1ed54 100644
Binary files a/public/images/emoji/facebook_messenger/northern_mariana_islands.png and b/public/images/emoji/facebook_messenger/northern_mariana_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/norway.png b/public/images/emoji/facebook_messenger/norway.png
index 3a2439e1505..d2cd8f67f28 100644
Binary files a/public/images/emoji/facebook_messenger/norway.png and b/public/images/emoji/facebook_messenger/norway.png differ
diff --git a/public/images/emoji/facebook_messenger/nose.png b/public/images/emoji/facebook_messenger/nose.png
index 8f583249c5a..9ab35d4ee4c 100644
Binary files a/public/images/emoji/facebook_messenger/nose.png and b/public/images/emoji/facebook_messenger/nose.png differ
diff --git a/public/images/emoji/facebook_messenger/nose/2.png b/public/images/emoji/facebook_messenger/nose/2.png
index c61a3cd9b2b..1d2e0547fff 100644
Binary files a/public/images/emoji/facebook_messenger/nose/2.png and b/public/images/emoji/facebook_messenger/nose/2.png differ
diff --git a/public/images/emoji/facebook_messenger/nose/3.png b/public/images/emoji/facebook_messenger/nose/3.png
index 5024bbcac6f..3c137a6258d 100644
Binary files a/public/images/emoji/facebook_messenger/nose/3.png and b/public/images/emoji/facebook_messenger/nose/3.png differ
diff --git a/public/images/emoji/facebook_messenger/nose/4.png b/public/images/emoji/facebook_messenger/nose/4.png
index acc16c879d9..d8bb8a826b5 100644
Binary files a/public/images/emoji/facebook_messenger/nose/4.png and b/public/images/emoji/facebook_messenger/nose/4.png differ
diff --git a/public/images/emoji/facebook_messenger/nose/5.png b/public/images/emoji/facebook_messenger/nose/5.png
index 79221668f38..64c5795c933 100644
Binary files a/public/images/emoji/facebook_messenger/nose/5.png and b/public/images/emoji/facebook_messenger/nose/5.png differ
diff --git a/public/images/emoji/facebook_messenger/nose/6.png b/public/images/emoji/facebook_messenger/nose/6.png
index 2b29d4ef609..66f3c65fcc6 100644
Binary files a/public/images/emoji/facebook_messenger/nose/6.png and b/public/images/emoji/facebook_messenger/nose/6.png differ
diff --git a/public/images/emoji/facebook_messenger/notebook.png b/public/images/emoji/facebook_messenger/notebook.png
index 30c97ad185a..f22f2f93182 100644
Binary files a/public/images/emoji/facebook_messenger/notebook.png and b/public/images/emoji/facebook_messenger/notebook.png differ
diff --git a/public/images/emoji/facebook_messenger/notebook_with_decorative_cover.png b/public/images/emoji/facebook_messenger/notebook_with_decorative_cover.png
index bfdf9849b5d..b6c301f963e 100644
Binary files a/public/images/emoji/facebook_messenger/notebook_with_decorative_cover.png and b/public/images/emoji/facebook_messenger/notebook_with_decorative_cover.png differ
diff --git a/public/images/emoji/facebook_messenger/notepad_spiral.png b/public/images/emoji/facebook_messenger/notepad_spiral.png
index b8ebfe080a3..e441801b07d 100644
Binary files a/public/images/emoji/facebook_messenger/notepad_spiral.png and b/public/images/emoji/facebook_messenger/notepad_spiral.png differ
diff --git a/public/images/emoji/facebook_messenger/notes.png b/public/images/emoji/facebook_messenger/notes.png
index ff9430ffdc0..d2d297c574d 100644
Binary files a/public/images/emoji/facebook_messenger/notes.png and b/public/images/emoji/facebook_messenger/notes.png differ
diff --git a/public/images/emoji/facebook_messenger/nut_and_bolt.png b/public/images/emoji/facebook_messenger/nut_and_bolt.png
index ff4e024188e..f33cc46acdb 100644
Binary files a/public/images/emoji/facebook_messenger/nut_and_bolt.png and b/public/images/emoji/facebook_messenger/nut_and_bolt.png differ
diff --git a/public/images/emoji/facebook_messenger/o.png b/public/images/emoji/facebook_messenger/o.png
index 65518db51fb..bd9e2bce250 100644
Binary files a/public/images/emoji/facebook_messenger/o.png and b/public/images/emoji/facebook_messenger/o.png differ
diff --git a/public/images/emoji/facebook_messenger/o2.png b/public/images/emoji/facebook_messenger/o2.png
index 7293a012e80..d56cd0c2aa7 100644
Binary files a/public/images/emoji/facebook_messenger/o2.png and b/public/images/emoji/facebook_messenger/o2.png differ
diff --git a/public/images/emoji/facebook_messenger/ocean.png b/public/images/emoji/facebook_messenger/ocean.png
index f4ce329fce3..1d0e349a947 100644
Binary files a/public/images/emoji/facebook_messenger/ocean.png and b/public/images/emoji/facebook_messenger/ocean.png differ
diff --git a/public/images/emoji/facebook_messenger/octopus.png b/public/images/emoji/facebook_messenger/octopus.png
index b6a1b5acbf8..7b841775011 100644
Binary files a/public/images/emoji/facebook_messenger/octopus.png and b/public/images/emoji/facebook_messenger/octopus.png differ
diff --git a/public/images/emoji/facebook_messenger/oden.png b/public/images/emoji/facebook_messenger/oden.png
index c497a79d04b..621476b0b99 100644
Binary files a/public/images/emoji/facebook_messenger/oden.png and b/public/images/emoji/facebook_messenger/oden.png differ
diff --git a/public/images/emoji/facebook_messenger/office.png b/public/images/emoji/facebook_messenger/office.png
index e231c280ac1..d5ed4d845a1 100644
Binary files a/public/images/emoji/facebook_messenger/office.png and b/public/images/emoji/facebook_messenger/office.png differ
diff --git a/public/images/emoji/facebook_messenger/oil.png b/public/images/emoji/facebook_messenger/oil.png
index 7c6d9e728f1..9e49ad7667e 100644
Binary files a/public/images/emoji/facebook_messenger/oil.png and b/public/images/emoji/facebook_messenger/oil.png differ
diff --git a/public/images/emoji/facebook_messenger/oil_drum.png b/public/images/emoji/facebook_messenger/oil_drum.png
index 7c6d9e728f1..9e49ad7667e 100644
Binary files a/public/images/emoji/facebook_messenger/oil_drum.png and b/public/images/emoji/facebook_messenger/oil_drum.png differ
diff --git a/public/images/emoji/facebook_messenger/ok.png b/public/images/emoji/facebook_messenger/ok.png
index 200b86672b1..32ee0173f0a 100644
Binary files a/public/images/emoji/facebook_messenger/ok.png and b/public/images/emoji/facebook_messenger/ok.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_hand.png b/public/images/emoji/facebook_messenger/ok_hand.png
index e1d5e568ae9..b5ff9c0f8dd 100644
Binary files a/public/images/emoji/facebook_messenger/ok_hand.png and b/public/images/emoji/facebook_messenger/ok_hand.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_hand/2.png b/public/images/emoji/facebook_messenger/ok_hand/2.png
index e7fc3a26ca9..0acf0527b5f 100644
Binary files a/public/images/emoji/facebook_messenger/ok_hand/2.png and b/public/images/emoji/facebook_messenger/ok_hand/2.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_hand/3.png b/public/images/emoji/facebook_messenger/ok_hand/3.png
index 963f15614e5..51ee9e1f037 100644
Binary files a/public/images/emoji/facebook_messenger/ok_hand/3.png and b/public/images/emoji/facebook_messenger/ok_hand/3.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_hand/4.png b/public/images/emoji/facebook_messenger/ok_hand/4.png
index 93c785d3e18..72cc89f62e1 100644
Binary files a/public/images/emoji/facebook_messenger/ok_hand/4.png and b/public/images/emoji/facebook_messenger/ok_hand/4.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_hand/5.png b/public/images/emoji/facebook_messenger/ok_hand/5.png
index 57dfe1cdc47..0cac5bbd11f 100644
Binary files a/public/images/emoji/facebook_messenger/ok_hand/5.png and b/public/images/emoji/facebook_messenger/ok_hand/5.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_hand/6.png b/public/images/emoji/facebook_messenger/ok_hand/6.png
index 428fa0ef4f7..3c6b913db27 100644
Binary files a/public/images/emoji/facebook_messenger/ok_hand/6.png and b/public/images/emoji/facebook_messenger/ok_hand/6.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_man.png b/public/images/emoji/facebook_messenger/ok_man.png
index a409be9d6e3..526277ebe0d 100644
Binary files a/public/images/emoji/facebook_messenger/ok_man.png and b/public/images/emoji/facebook_messenger/ok_man.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_man/2.png b/public/images/emoji/facebook_messenger/ok_man/2.png
index a053dbd980e..8057cf8bc34 100644
Binary files a/public/images/emoji/facebook_messenger/ok_man/2.png and b/public/images/emoji/facebook_messenger/ok_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_man/3.png b/public/images/emoji/facebook_messenger/ok_man/3.png
index e16633321f5..14b9444bda2 100644
Binary files a/public/images/emoji/facebook_messenger/ok_man/3.png and b/public/images/emoji/facebook_messenger/ok_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_man/4.png b/public/images/emoji/facebook_messenger/ok_man/4.png
index 4634976b5e4..74c24deabb5 100644
Binary files a/public/images/emoji/facebook_messenger/ok_man/4.png and b/public/images/emoji/facebook_messenger/ok_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_man/5.png b/public/images/emoji/facebook_messenger/ok_man/5.png
index f0003c09eb6..715a67da30c 100644
Binary files a/public/images/emoji/facebook_messenger/ok_man/5.png and b/public/images/emoji/facebook_messenger/ok_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_man/6.png b/public/images/emoji/facebook_messenger/ok_man/6.png
index 39c7357546e..4f3bce3c132 100644
Binary files a/public/images/emoji/facebook_messenger/ok_man/6.png and b/public/images/emoji/facebook_messenger/ok_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_woman.png b/public/images/emoji/facebook_messenger/ok_woman.png
index e5ed37b4391..00a58e844c2 100644
Binary files a/public/images/emoji/facebook_messenger/ok_woman.png and b/public/images/emoji/facebook_messenger/ok_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_woman/2.png b/public/images/emoji/facebook_messenger/ok_woman/2.png
index 11e28436c08..bed8dab5a9b 100644
Binary files a/public/images/emoji/facebook_messenger/ok_woman/2.png and b/public/images/emoji/facebook_messenger/ok_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_woman/3.png b/public/images/emoji/facebook_messenger/ok_woman/3.png
index 4d341255eee..b699b753cce 100644
Binary files a/public/images/emoji/facebook_messenger/ok_woman/3.png and b/public/images/emoji/facebook_messenger/ok_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_woman/4.png b/public/images/emoji/facebook_messenger/ok_woman/4.png
index b6dc29569ab..5102e7eba77 100644
Binary files a/public/images/emoji/facebook_messenger/ok_woman/4.png and b/public/images/emoji/facebook_messenger/ok_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_woman/5.png b/public/images/emoji/facebook_messenger/ok_woman/5.png
index df017318692..d869755fab1 100644
Binary files a/public/images/emoji/facebook_messenger/ok_woman/5.png and b/public/images/emoji/facebook_messenger/ok_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_woman/6.png b/public/images/emoji/facebook_messenger/ok_woman/6.png
index 825602b97d3..b9aabced9ba 100644
Binary files a/public/images/emoji/facebook_messenger/ok_woman/6.png and b/public/images/emoji/facebook_messenger/ok_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/old_key.png b/public/images/emoji/facebook_messenger/old_key.png
index 18b93994322..4452b17fb5e 100644
Binary files a/public/images/emoji/facebook_messenger/old_key.png and b/public/images/emoji/facebook_messenger/old_key.png differ
diff --git a/public/images/emoji/facebook_messenger/older_adult.png b/public/images/emoji/facebook_messenger/older_adult.png
index 8796829b876..6bad6392629 100644
Binary files a/public/images/emoji/facebook_messenger/older_adult.png and b/public/images/emoji/facebook_messenger/older_adult.png differ
diff --git a/public/images/emoji/facebook_messenger/older_adult/2.png b/public/images/emoji/facebook_messenger/older_adult/2.png
index b36f41960e7..40a8bceac08 100644
Binary files a/public/images/emoji/facebook_messenger/older_adult/2.png and b/public/images/emoji/facebook_messenger/older_adult/2.png differ
diff --git a/public/images/emoji/facebook_messenger/older_adult/3.png b/public/images/emoji/facebook_messenger/older_adult/3.png
index dc1441fea56..7f643c9064b 100644
Binary files a/public/images/emoji/facebook_messenger/older_adult/3.png and b/public/images/emoji/facebook_messenger/older_adult/3.png differ
diff --git a/public/images/emoji/facebook_messenger/older_adult/4.png b/public/images/emoji/facebook_messenger/older_adult/4.png
index abc19e06c74..0bf64871aa3 100644
Binary files a/public/images/emoji/facebook_messenger/older_adult/4.png and b/public/images/emoji/facebook_messenger/older_adult/4.png differ
diff --git a/public/images/emoji/facebook_messenger/older_adult/5.png b/public/images/emoji/facebook_messenger/older_adult/5.png
index c90549f6813..e94e38b2556 100644
Binary files a/public/images/emoji/facebook_messenger/older_adult/5.png and b/public/images/emoji/facebook_messenger/older_adult/5.png differ
diff --git a/public/images/emoji/facebook_messenger/older_adult/6.png b/public/images/emoji/facebook_messenger/older_adult/6.png
index 5152c9c1a3e..168819ec896 100644
Binary files a/public/images/emoji/facebook_messenger/older_adult/6.png and b/public/images/emoji/facebook_messenger/older_adult/6.png differ
diff --git a/public/images/emoji/facebook_messenger/older_man.png b/public/images/emoji/facebook_messenger/older_man.png
index 47e7cef9993..db5c5681d10 100644
Binary files a/public/images/emoji/facebook_messenger/older_man.png and b/public/images/emoji/facebook_messenger/older_man.png differ
diff --git a/public/images/emoji/facebook_messenger/older_man/2.png b/public/images/emoji/facebook_messenger/older_man/2.png
index 2fb0c5a7e5a..8d005a368c7 100644
Binary files a/public/images/emoji/facebook_messenger/older_man/2.png and b/public/images/emoji/facebook_messenger/older_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/older_man/3.png b/public/images/emoji/facebook_messenger/older_man/3.png
index 7e4e62a615f..cff7b90a73f 100644
Binary files a/public/images/emoji/facebook_messenger/older_man/3.png and b/public/images/emoji/facebook_messenger/older_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/older_man/4.png b/public/images/emoji/facebook_messenger/older_man/4.png
index 2414ae1dfe1..b98f815607b 100644
Binary files a/public/images/emoji/facebook_messenger/older_man/4.png and b/public/images/emoji/facebook_messenger/older_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/older_man/5.png b/public/images/emoji/facebook_messenger/older_man/5.png
index 7f3d54e6895..25e842a8082 100644
Binary files a/public/images/emoji/facebook_messenger/older_man/5.png and b/public/images/emoji/facebook_messenger/older_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/older_man/6.png b/public/images/emoji/facebook_messenger/older_man/6.png
index 07eb64ff158..00f50b3f67e 100644
Binary files a/public/images/emoji/facebook_messenger/older_man/6.png and b/public/images/emoji/facebook_messenger/older_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/older_woman.png b/public/images/emoji/facebook_messenger/older_woman.png
index 02e8230771c..e03cb5c7795 100644
Binary files a/public/images/emoji/facebook_messenger/older_woman.png and b/public/images/emoji/facebook_messenger/older_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/older_woman/2.png b/public/images/emoji/facebook_messenger/older_woman/2.png
index 8e4a01cfccf..86ef258ed8a 100644
Binary files a/public/images/emoji/facebook_messenger/older_woman/2.png and b/public/images/emoji/facebook_messenger/older_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/older_woman/3.png b/public/images/emoji/facebook_messenger/older_woman/3.png
index 4f8be8c914b..2982fa1d6fa 100644
Binary files a/public/images/emoji/facebook_messenger/older_woman/3.png and b/public/images/emoji/facebook_messenger/older_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/older_woman/4.png b/public/images/emoji/facebook_messenger/older_woman/4.png
index 0d7aa5e0d9a..7ab3d41b2aa 100644
Binary files a/public/images/emoji/facebook_messenger/older_woman/4.png and b/public/images/emoji/facebook_messenger/older_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/older_woman/5.png b/public/images/emoji/facebook_messenger/older_woman/5.png
index 41f7e664386..3b8a10b0c7c 100644
Binary files a/public/images/emoji/facebook_messenger/older_woman/5.png and b/public/images/emoji/facebook_messenger/older_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/older_woman/6.png b/public/images/emoji/facebook_messenger/older_woman/6.png
index 6de06114965..a77762c3ad7 100644
Binary files a/public/images/emoji/facebook_messenger/older_woman/6.png and b/public/images/emoji/facebook_messenger/older_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/om.png b/public/images/emoji/facebook_messenger/om.png
index bcd7113141c..8b75e5ff06d 100644
Binary files a/public/images/emoji/facebook_messenger/om.png and b/public/images/emoji/facebook_messenger/om.png differ
diff --git a/public/images/emoji/facebook_messenger/om_symbol.png b/public/images/emoji/facebook_messenger/om_symbol.png
index bcd7113141c..8b75e5ff06d 100644
Binary files a/public/images/emoji/facebook_messenger/om_symbol.png and b/public/images/emoji/facebook_messenger/om_symbol.png differ
diff --git a/public/images/emoji/facebook_messenger/oman.png b/public/images/emoji/facebook_messenger/oman.png
index 59e0df087e4..29ecf6f5794 100644
Binary files a/public/images/emoji/facebook_messenger/oman.png and b/public/images/emoji/facebook_messenger/oman.png differ
diff --git a/public/images/emoji/facebook_messenger/on.png b/public/images/emoji/facebook_messenger/on.png
index bd14ab9d486..1cb4c2240cf 100644
Binary files a/public/images/emoji/facebook_messenger/on.png and b/public/images/emoji/facebook_messenger/on.png differ
diff --git a/public/images/emoji/facebook_messenger/oncoming_automobile.png b/public/images/emoji/facebook_messenger/oncoming_automobile.png
index 024cdb23b51..ba661ecefdf 100644
Binary files a/public/images/emoji/facebook_messenger/oncoming_automobile.png and b/public/images/emoji/facebook_messenger/oncoming_automobile.png differ
diff --git a/public/images/emoji/facebook_messenger/oncoming_bus.png b/public/images/emoji/facebook_messenger/oncoming_bus.png
index 19dfdd08c5c..9f3ab610b34 100644
Binary files a/public/images/emoji/facebook_messenger/oncoming_bus.png and b/public/images/emoji/facebook_messenger/oncoming_bus.png differ
diff --git a/public/images/emoji/facebook_messenger/oncoming_police_car.png b/public/images/emoji/facebook_messenger/oncoming_police_car.png
index cacce06c49d..c902b647261 100644
Binary files a/public/images/emoji/facebook_messenger/oncoming_police_car.png and b/public/images/emoji/facebook_messenger/oncoming_police_car.png differ
diff --git a/public/images/emoji/facebook_messenger/oncoming_taxi.png b/public/images/emoji/facebook_messenger/oncoming_taxi.png
index c3d11c9bb82..bfd23e66a69 100644
Binary files a/public/images/emoji/facebook_messenger/oncoming_taxi.png and b/public/images/emoji/facebook_messenger/oncoming_taxi.png differ
diff --git a/public/images/emoji/facebook_messenger/one.png b/public/images/emoji/facebook_messenger/one.png
index 8cf9c776565..76300042c2a 100644
Binary files a/public/images/emoji/facebook_messenger/one.png and b/public/images/emoji/facebook_messenger/one.png differ
diff --git a/public/images/emoji/facebook_messenger/open_book.png b/public/images/emoji/facebook_messenger/open_book.png
index 466a96d4dc2..724a71aeb9d 100644
Binary files a/public/images/emoji/facebook_messenger/open_book.png and b/public/images/emoji/facebook_messenger/open_book.png differ
diff --git a/public/images/emoji/facebook_messenger/open_file_folder.png b/public/images/emoji/facebook_messenger/open_file_folder.png
index 1c7e6b1be08..a8a486e9bbf 100644
Binary files a/public/images/emoji/facebook_messenger/open_file_folder.png and b/public/images/emoji/facebook_messenger/open_file_folder.png differ
diff --git a/public/images/emoji/facebook_messenger/open_hands.png b/public/images/emoji/facebook_messenger/open_hands.png
index a85e8a6c4bb..8c8ecb9b6b9 100644
Binary files a/public/images/emoji/facebook_messenger/open_hands.png and b/public/images/emoji/facebook_messenger/open_hands.png differ
diff --git a/public/images/emoji/facebook_messenger/open_hands/2.png b/public/images/emoji/facebook_messenger/open_hands/2.png
index c45027d8ad4..8018ad442ff 100644
Binary files a/public/images/emoji/facebook_messenger/open_hands/2.png and b/public/images/emoji/facebook_messenger/open_hands/2.png differ
diff --git a/public/images/emoji/facebook_messenger/open_hands/3.png b/public/images/emoji/facebook_messenger/open_hands/3.png
index 0422b884348..a58735a00c7 100644
Binary files a/public/images/emoji/facebook_messenger/open_hands/3.png and b/public/images/emoji/facebook_messenger/open_hands/3.png differ
diff --git a/public/images/emoji/facebook_messenger/open_hands/4.png b/public/images/emoji/facebook_messenger/open_hands/4.png
index d36a5224386..09557382f49 100644
Binary files a/public/images/emoji/facebook_messenger/open_hands/4.png and b/public/images/emoji/facebook_messenger/open_hands/4.png differ
diff --git a/public/images/emoji/facebook_messenger/open_hands/5.png b/public/images/emoji/facebook_messenger/open_hands/5.png
index 0e41b410c5d..a90afbffccc 100644
Binary files a/public/images/emoji/facebook_messenger/open_hands/5.png and b/public/images/emoji/facebook_messenger/open_hands/5.png differ
diff --git a/public/images/emoji/facebook_messenger/open_hands/6.png b/public/images/emoji/facebook_messenger/open_hands/6.png
index 473c50cb3d8..f9517d43e71 100644
Binary files a/public/images/emoji/facebook_messenger/open_hands/6.png and b/public/images/emoji/facebook_messenger/open_hands/6.png differ
diff --git a/public/images/emoji/facebook_messenger/open_mouth.png b/public/images/emoji/facebook_messenger/open_mouth.png
index 5857e8dcca3..faf523c0871 100644
Binary files a/public/images/emoji/facebook_messenger/open_mouth.png and b/public/images/emoji/facebook_messenger/open_mouth.png differ
diff --git a/public/images/emoji/facebook_messenger/open_umbrella.png b/public/images/emoji/facebook_messenger/open_umbrella.png
index ec99aeb164e..d84b97cb0c4 100644
Binary files a/public/images/emoji/facebook_messenger/open_umbrella.png and b/public/images/emoji/facebook_messenger/open_umbrella.png differ
diff --git a/public/images/emoji/facebook_messenger/ophiuchus.png b/public/images/emoji/facebook_messenger/ophiuchus.png
index 785022965e5..d6b543d1e28 100644
Binary files a/public/images/emoji/facebook_messenger/ophiuchus.png and b/public/images/emoji/facebook_messenger/ophiuchus.png differ
diff --git a/public/images/emoji/facebook_messenger/orange_book.png b/public/images/emoji/facebook_messenger/orange_book.png
index f740242a401..7d665061df7 100644
Binary files a/public/images/emoji/facebook_messenger/orange_book.png and b/public/images/emoji/facebook_messenger/orange_book.png differ
diff --git a/public/images/emoji/facebook_messenger/orange_heart.png b/public/images/emoji/facebook_messenger/orange_heart.png
index f217c930a74..3d53e3eeae1 100644
Binary files a/public/images/emoji/facebook_messenger/orange_heart.png and b/public/images/emoji/facebook_messenger/orange_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/orthodox_cross.png b/public/images/emoji/facebook_messenger/orthodox_cross.png
index 5b398f5cf28..f8f3aa79dcc 100644
Binary files a/public/images/emoji/facebook_messenger/orthodox_cross.png and b/public/images/emoji/facebook_messenger/orthodox_cross.png differ
diff --git a/public/images/emoji/facebook_messenger/outbox_tray.png b/public/images/emoji/facebook_messenger/outbox_tray.png
index 3749f9e0c56..50b5392576c 100644
Binary files a/public/images/emoji/facebook_messenger/outbox_tray.png and b/public/images/emoji/facebook_messenger/outbox_tray.png differ
diff --git a/public/images/emoji/facebook_messenger/owl.png b/public/images/emoji/facebook_messenger/owl.png
index 905115e7122..8d0fc40856f 100644
Binary files a/public/images/emoji/facebook_messenger/owl.png and b/public/images/emoji/facebook_messenger/owl.png differ
diff --git a/public/images/emoji/facebook_messenger/ox.png b/public/images/emoji/facebook_messenger/ox.png
index f1389ed7656..76087acb709 100644
Binary files a/public/images/emoji/facebook_messenger/ox.png and b/public/images/emoji/facebook_messenger/ox.png differ
diff --git a/public/images/emoji/facebook_messenger/package.png b/public/images/emoji/facebook_messenger/package.png
index 5252e91f82d..ab5e2dc92cc 100644
Binary files a/public/images/emoji/facebook_messenger/package.png and b/public/images/emoji/facebook_messenger/package.png differ
diff --git a/public/images/emoji/facebook_messenger/page_facing_up.png b/public/images/emoji/facebook_messenger/page_facing_up.png
index a3e3e6dac9a..77bd0e595fc 100644
Binary files a/public/images/emoji/facebook_messenger/page_facing_up.png and b/public/images/emoji/facebook_messenger/page_facing_up.png differ
diff --git a/public/images/emoji/facebook_messenger/page_with_curl.png b/public/images/emoji/facebook_messenger/page_with_curl.png
index 1b6042549f9..24af18b4045 100644
Binary files a/public/images/emoji/facebook_messenger/page_with_curl.png and b/public/images/emoji/facebook_messenger/page_with_curl.png differ
diff --git a/public/images/emoji/facebook_messenger/pager.png b/public/images/emoji/facebook_messenger/pager.png
index 9e3cb953032..b7b4372d705 100644
Binary files a/public/images/emoji/facebook_messenger/pager.png and b/public/images/emoji/facebook_messenger/pager.png differ
diff --git a/public/images/emoji/facebook_messenger/paintbrush.png b/public/images/emoji/facebook_messenger/paintbrush.png
index c7d649a3781..6044b9caff8 100644
Binary files a/public/images/emoji/facebook_messenger/paintbrush.png and b/public/images/emoji/facebook_messenger/paintbrush.png differ
diff --git a/public/images/emoji/facebook_messenger/pakistan.png b/public/images/emoji/facebook_messenger/pakistan.png
index f4c74d1d49c..4f31345513c 100644
Binary files a/public/images/emoji/facebook_messenger/pakistan.png and b/public/images/emoji/facebook_messenger/pakistan.png differ
diff --git a/public/images/emoji/facebook_messenger/palau.png b/public/images/emoji/facebook_messenger/palau.png
index 69aace7555f..c92ad17134f 100644
Binary files a/public/images/emoji/facebook_messenger/palau.png and b/public/images/emoji/facebook_messenger/palau.png differ
diff --git a/public/images/emoji/facebook_messenger/palestinian_territories.png b/public/images/emoji/facebook_messenger/palestinian_territories.png
index 2e4399d7627..b1f0426ac46 100644
Binary files a/public/images/emoji/facebook_messenger/palestinian_territories.png and b/public/images/emoji/facebook_messenger/palestinian_territories.png differ
diff --git a/public/images/emoji/facebook_messenger/palm_tree.png b/public/images/emoji/facebook_messenger/palm_tree.png
index 8644ca6a57b..d4df51746c1 100644
Binary files a/public/images/emoji/facebook_messenger/palm_tree.png and b/public/images/emoji/facebook_messenger/palm_tree.png differ
diff --git a/public/images/emoji/facebook_messenger/palms_up_together.png b/public/images/emoji/facebook_messenger/palms_up_together.png
index fb66ba11c40..376dbb58ad9 100644
Binary files a/public/images/emoji/facebook_messenger/palms_up_together.png and b/public/images/emoji/facebook_messenger/palms_up_together.png differ
diff --git a/public/images/emoji/facebook_messenger/palms_up_together/2.png b/public/images/emoji/facebook_messenger/palms_up_together/2.png
index 6d9b2fc8ccd..751923bee44 100644
Binary files a/public/images/emoji/facebook_messenger/palms_up_together/2.png and b/public/images/emoji/facebook_messenger/palms_up_together/2.png differ
diff --git a/public/images/emoji/facebook_messenger/palms_up_together/3.png b/public/images/emoji/facebook_messenger/palms_up_together/3.png
index c5d52f5c7a7..2c1a54b8e3a 100644
Binary files a/public/images/emoji/facebook_messenger/palms_up_together/3.png and b/public/images/emoji/facebook_messenger/palms_up_together/3.png differ
diff --git a/public/images/emoji/facebook_messenger/palms_up_together/4.png b/public/images/emoji/facebook_messenger/palms_up_together/4.png
index 3d4288d10db..076a52dde47 100644
Binary files a/public/images/emoji/facebook_messenger/palms_up_together/4.png and b/public/images/emoji/facebook_messenger/palms_up_together/4.png differ
diff --git a/public/images/emoji/facebook_messenger/palms_up_together/5.png b/public/images/emoji/facebook_messenger/palms_up_together/5.png
index 6ff36c07cbd..2249e208e83 100644
Binary files a/public/images/emoji/facebook_messenger/palms_up_together/5.png and b/public/images/emoji/facebook_messenger/palms_up_together/5.png differ
diff --git a/public/images/emoji/facebook_messenger/palms_up_together/6.png b/public/images/emoji/facebook_messenger/palms_up_together/6.png
index c25d42927d8..e5065ba3de8 100644
Binary files a/public/images/emoji/facebook_messenger/palms_up_together/6.png and b/public/images/emoji/facebook_messenger/palms_up_together/6.png differ
diff --git a/public/images/emoji/facebook_messenger/panama.png b/public/images/emoji/facebook_messenger/panama.png
index 2a564db4266..63384f44602 100644
Binary files a/public/images/emoji/facebook_messenger/panama.png and b/public/images/emoji/facebook_messenger/panama.png differ
diff --git a/public/images/emoji/facebook_messenger/pancakes.png b/public/images/emoji/facebook_messenger/pancakes.png
index ebd14eecd02..cc145982be3 100644
Binary files a/public/images/emoji/facebook_messenger/pancakes.png and b/public/images/emoji/facebook_messenger/pancakes.png differ
diff --git a/public/images/emoji/facebook_messenger/panda_face.png b/public/images/emoji/facebook_messenger/panda_face.png
index 328e9216193..682db9fd233 100644
Binary files a/public/images/emoji/facebook_messenger/panda_face.png and b/public/images/emoji/facebook_messenger/panda_face.png differ
diff --git a/public/images/emoji/facebook_messenger/paperclip.png b/public/images/emoji/facebook_messenger/paperclip.png
index 42329aa2d2a..43ddbeabd82 100644
Binary files a/public/images/emoji/facebook_messenger/paperclip.png and b/public/images/emoji/facebook_messenger/paperclip.png differ
diff --git a/public/images/emoji/facebook_messenger/paperclips.png b/public/images/emoji/facebook_messenger/paperclips.png
index b4080878f68..998be6d8ba7 100644
Binary files a/public/images/emoji/facebook_messenger/paperclips.png and b/public/images/emoji/facebook_messenger/paperclips.png differ
diff --git a/public/images/emoji/facebook_messenger/papua_new_guinea.png b/public/images/emoji/facebook_messenger/papua_new_guinea.png
index b449d67794a..eb43e174115 100644
Binary files a/public/images/emoji/facebook_messenger/papua_new_guinea.png and b/public/images/emoji/facebook_messenger/papua_new_guinea.png differ
diff --git a/public/images/emoji/facebook_messenger/paraguay.png b/public/images/emoji/facebook_messenger/paraguay.png
index d9eab9434ce..649c4a12e0c 100644
Binary files a/public/images/emoji/facebook_messenger/paraguay.png and b/public/images/emoji/facebook_messenger/paraguay.png differ
diff --git a/public/images/emoji/facebook_messenger/parasol_on_ground.png b/public/images/emoji/facebook_messenger/parasol_on_ground.png
index 2bb23697b7f..946097af1c3 100644
Binary files a/public/images/emoji/facebook_messenger/parasol_on_ground.png and b/public/images/emoji/facebook_messenger/parasol_on_ground.png differ
diff --git a/public/images/emoji/facebook_messenger/park.png b/public/images/emoji/facebook_messenger/park.png
index db29d2dff96..38452f9b927 100644
Binary files a/public/images/emoji/facebook_messenger/park.png and b/public/images/emoji/facebook_messenger/park.png differ
diff --git a/public/images/emoji/facebook_messenger/parking.png b/public/images/emoji/facebook_messenger/parking.png
index 49ea56e3224..cc8b01b40bb 100644
Binary files a/public/images/emoji/facebook_messenger/parking.png and b/public/images/emoji/facebook_messenger/parking.png differ
diff --git a/public/images/emoji/facebook_messenger/part_alternation_mark.png b/public/images/emoji/facebook_messenger/part_alternation_mark.png
index e1bf14a9476..5da9ee8653b 100644
Binary files a/public/images/emoji/facebook_messenger/part_alternation_mark.png and b/public/images/emoji/facebook_messenger/part_alternation_mark.png differ
diff --git a/public/images/emoji/facebook_messenger/partly_sunny.png b/public/images/emoji/facebook_messenger/partly_sunny.png
index 51953bf6959..8258b2f793b 100644
Binary files a/public/images/emoji/facebook_messenger/partly_sunny.png and b/public/images/emoji/facebook_messenger/partly_sunny.png differ
diff --git a/public/images/emoji/facebook_messenger/passenger_ship.png b/public/images/emoji/facebook_messenger/passenger_ship.png
index b1ee5613467..a79fe563a40 100644
Binary files a/public/images/emoji/facebook_messenger/passenger_ship.png and b/public/images/emoji/facebook_messenger/passenger_ship.png differ
diff --git a/public/images/emoji/facebook_messenger/passport_control.png b/public/images/emoji/facebook_messenger/passport_control.png
index 87ab1cb24e7..c1df6e0f18e 100644
Binary files a/public/images/emoji/facebook_messenger/passport_control.png and b/public/images/emoji/facebook_messenger/passport_control.png differ
diff --git a/public/images/emoji/facebook_messenger/pause_button.png b/public/images/emoji/facebook_messenger/pause_button.png
index 624e2df7118..de512cc09fd 100644
Binary files a/public/images/emoji/facebook_messenger/pause_button.png and b/public/images/emoji/facebook_messenger/pause_button.png differ
diff --git a/public/images/emoji/facebook_messenger/paw_prints.png b/public/images/emoji/facebook_messenger/paw_prints.png
index ccd6e7503e1..f102be92103 100644
Binary files a/public/images/emoji/facebook_messenger/paw_prints.png and b/public/images/emoji/facebook_messenger/paw_prints.png differ
diff --git a/public/images/emoji/facebook_messenger/peace.png b/public/images/emoji/facebook_messenger/peace.png
index 4eeaef2b556..f900713ae38 100644
Binary files a/public/images/emoji/facebook_messenger/peace.png and b/public/images/emoji/facebook_messenger/peace.png differ
diff --git a/public/images/emoji/facebook_messenger/peace_symbol.png b/public/images/emoji/facebook_messenger/peace_symbol.png
index 4eeaef2b556..f900713ae38 100644
Binary files a/public/images/emoji/facebook_messenger/peace_symbol.png and b/public/images/emoji/facebook_messenger/peace_symbol.png differ
diff --git a/public/images/emoji/facebook_messenger/peach.png b/public/images/emoji/facebook_messenger/peach.png
index 30e37f15888..f3af1b0a0e6 100644
Binary files a/public/images/emoji/facebook_messenger/peach.png and b/public/images/emoji/facebook_messenger/peach.png differ
diff --git a/public/images/emoji/facebook_messenger/peanuts.png b/public/images/emoji/facebook_messenger/peanuts.png
index 34f4eed2d5f..55adb32d2bc 100644
Binary files a/public/images/emoji/facebook_messenger/peanuts.png and b/public/images/emoji/facebook_messenger/peanuts.png differ
diff --git a/public/images/emoji/facebook_messenger/pear.png b/public/images/emoji/facebook_messenger/pear.png
index b1ec7e04ec0..6ac15abff26 100644
Binary files a/public/images/emoji/facebook_messenger/pear.png and b/public/images/emoji/facebook_messenger/pear.png differ
diff --git a/public/images/emoji/facebook_messenger/pen.png b/public/images/emoji/facebook_messenger/pen.png
index 6219ae26cc1..399b2fbf22d 100644
Binary files a/public/images/emoji/facebook_messenger/pen.png and b/public/images/emoji/facebook_messenger/pen.png differ
diff --git a/public/images/emoji/facebook_messenger/pen_ballpoint.png b/public/images/emoji/facebook_messenger/pen_ballpoint.png
index 6219ae26cc1..399b2fbf22d 100644
Binary files a/public/images/emoji/facebook_messenger/pen_ballpoint.png and b/public/images/emoji/facebook_messenger/pen_ballpoint.png differ
diff --git a/public/images/emoji/facebook_messenger/pen_fountain.png b/public/images/emoji/facebook_messenger/pen_fountain.png
index 96584c9f579..2e7296057be 100644
Binary files a/public/images/emoji/facebook_messenger/pen_fountain.png and b/public/images/emoji/facebook_messenger/pen_fountain.png differ
diff --git a/public/images/emoji/facebook_messenger/pencil.png b/public/images/emoji/facebook_messenger/pencil.png
index 8a9a0a4d8cf..57d00e040ef 100644
Binary files a/public/images/emoji/facebook_messenger/pencil.png and b/public/images/emoji/facebook_messenger/pencil.png differ
diff --git a/public/images/emoji/facebook_messenger/pencil2.png b/public/images/emoji/facebook_messenger/pencil2.png
index 2f90e4ed7da..5b48c58c806 100644
Binary files a/public/images/emoji/facebook_messenger/pencil2.png and b/public/images/emoji/facebook_messenger/pencil2.png differ
diff --git a/public/images/emoji/facebook_messenger/penguin.png b/public/images/emoji/facebook_messenger/penguin.png
index 6936f1c999f..2633a1f1306 100644
Binary files a/public/images/emoji/facebook_messenger/penguin.png and b/public/images/emoji/facebook_messenger/penguin.png differ
diff --git a/public/images/emoji/facebook_messenger/pensive.png b/public/images/emoji/facebook_messenger/pensive.png
index f72ca15c11e..df42076659a 100644
Binary files a/public/images/emoji/facebook_messenger/pensive.png and b/public/images/emoji/facebook_messenger/pensive.png differ
diff --git a/public/images/emoji/facebook_messenger/performing_arts.png b/public/images/emoji/facebook_messenger/performing_arts.png
index 08d06a7377d..80cca586086 100644
Binary files a/public/images/emoji/facebook_messenger/performing_arts.png and b/public/images/emoji/facebook_messenger/performing_arts.png differ
diff --git a/public/images/emoji/facebook_messenger/persevere.png b/public/images/emoji/facebook_messenger/persevere.png
index 741dec170ce..619272dafab 100644
Binary files a/public/images/emoji/facebook_messenger/persevere.png and b/public/images/emoji/facebook_messenger/persevere.png differ
diff --git a/public/images/emoji/facebook_messenger/person_climbing.png b/public/images/emoji/facebook_messenger/person_climbing.png
index d8a6229d6b9..a0001a92f52 100644
Binary files a/public/images/emoji/facebook_messenger/person_climbing.png and b/public/images/emoji/facebook_messenger/person_climbing.png differ
diff --git a/public/images/emoji/facebook_messenger/person_climbing/2.png b/public/images/emoji/facebook_messenger/person_climbing/2.png
index 71330d66a8c..59145fcd6f1 100644
Binary files a/public/images/emoji/facebook_messenger/person_climbing/2.png and b/public/images/emoji/facebook_messenger/person_climbing/2.png differ
diff --git a/public/images/emoji/facebook_messenger/person_climbing/3.png b/public/images/emoji/facebook_messenger/person_climbing/3.png
index a1345ecbd25..c2527e50b6f 100644
Binary files a/public/images/emoji/facebook_messenger/person_climbing/3.png and b/public/images/emoji/facebook_messenger/person_climbing/3.png differ
diff --git a/public/images/emoji/facebook_messenger/person_climbing/4.png b/public/images/emoji/facebook_messenger/person_climbing/4.png
index 016b920bcde..edcef648fba 100644
Binary files a/public/images/emoji/facebook_messenger/person_climbing/4.png and b/public/images/emoji/facebook_messenger/person_climbing/4.png differ
diff --git a/public/images/emoji/facebook_messenger/person_climbing/5.png b/public/images/emoji/facebook_messenger/person_climbing/5.png
index 4591eb52904..c2fd3da64f9 100644
Binary files a/public/images/emoji/facebook_messenger/person_climbing/5.png and b/public/images/emoji/facebook_messenger/person_climbing/5.png differ
diff --git a/public/images/emoji/facebook_messenger/person_climbing/6.png b/public/images/emoji/facebook_messenger/person_climbing/6.png
index 19be3236ae9..12be569e540 100644
Binary files a/public/images/emoji/facebook_messenger/person_climbing/6.png and b/public/images/emoji/facebook_messenger/person_climbing/6.png differ
diff --git a/public/images/emoji/facebook_messenger/person_fencing.png b/public/images/emoji/facebook_messenger/person_fencing.png
index 064b747aaec..5a2d7381a3d 100644
Binary files a/public/images/emoji/facebook_messenger/person_fencing.png and b/public/images/emoji/facebook_messenger/person_fencing.png differ
diff --git a/public/images/emoji/facebook_messenger/person_frowning.png b/public/images/emoji/facebook_messenger/person_frowning.png
index 1e5f89e7b57..1b7de19871e 100644
Binary files a/public/images/emoji/facebook_messenger/person_frowning.png and b/public/images/emoji/facebook_messenger/person_frowning.png differ
diff --git a/public/images/emoji/facebook_messenger/person_frowning/2.png b/public/images/emoji/facebook_messenger/person_frowning/2.png
index db018f2e812..d4e0b4aa13c 100644
Binary files a/public/images/emoji/facebook_messenger/person_frowning/2.png and b/public/images/emoji/facebook_messenger/person_frowning/2.png differ
diff --git a/public/images/emoji/facebook_messenger/person_frowning/3.png b/public/images/emoji/facebook_messenger/person_frowning/3.png
index 2a32b70d58a..dc65835b2b7 100644
Binary files a/public/images/emoji/facebook_messenger/person_frowning/3.png and b/public/images/emoji/facebook_messenger/person_frowning/3.png differ
diff --git a/public/images/emoji/facebook_messenger/person_frowning/4.png b/public/images/emoji/facebook_messenger/person_frowning/4.png
index 824a0bea02b..0b4c6946066 100644
Binary files a/public/images/emoji/facebook_messenger/person_frowning/4.png and b/public/images/emoji/facebook_messenger/person_frowning/4.png differ
diff --git a/public/images/emoji/facebook_messenger/person_frowning/5.png b/public/images/emoji/facebook_messenger/person_frowning/5.png
index ca476ecf1f3..402b54502f7 100644
Binary files a/public/images/emoji/facebook_messenger/person_frowning/5.png and b/public/images/emoji/facebook_messenger/person_frowning/5.png differ
diff --git a/public/images/emoji/facebook_messenger/person_frowning/6.png b/public/images/emoji/facebook_messenger/person_frowning/6.png
index c36b369e0b8..265d4fcffd5 100644
Binary files a/public/images/emoji/facebook_messenger/person_frowning/6.png and b/public/images/emoji/facebook_messenger/person_frowning/6.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_lotus_position.png b/public/images/emoji/facebook_messenger/person_in_lotus_position.png
index e9404fd5255..3e265ed93eb 100644
Binary files a/public/images/emoji/facebook_messenger/person_in_lotus_position.png and b/public/images/emoji/facebook_messenger/person_in_lotus_position.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_lotus_position/2.png b/public/images/emoji/facebook_messenger/person_in_lotus_position/2.png
index 8817578cf09..2c08ad4b599 100644
Binary files a/public/images/emoji/facebook_messenger/person_in_lotus_position/2.png and b/public/images/emoji/facebook_messenger/person_in_lotus_position/2.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_lotus_position/3.png b/public/images/emoji/facebook_messenger/person_in_lotus_position/3.png
index 0e9bf46e0b6..66c5a5cf2a1 100644
Binary files a/public/images/emoji/facebook_messenger/person_in_lotus_position/3.png and b/public/images/emoji/facebook_messenger/person_in_lotus_position/3.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_lotus_position/4.png b/public/images/emoji/facebook_messenger/person_in_lotus_position/4.png
index 918e3d435a2..d95ea803310 100644
Binary files a/public/images/emoji/facebook_messenger/person_in_lotus_position/4.png and b/public/images/emoji/facebook_messenger/person_in_lotus_position/4.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_lotus_position/5.png b/public/images/emoji/facebook_messenger/person_in_lotus_position/5.png
index 0c01143530e..defd5dce1dc 100644
Binary files a/public/images/emoji/facebook_messenger/person_in_lotus_position/5.png and b/public/images/emoji/facebook_messenger/person_in_lotus_position/5.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_lotus_position/6.png b/public/images/emoji/facebook_messenger/person_in_lotus_position/6.png
index fed226dac29..35bf1715387 100644
Binary files a/public/images/emoji/facebook_messenger/person_in_lotus_position/6.png and b/public/images/emoji/facebook_messenger/person_in_lotus_position/6.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_steamy_room.png b/public/images/emoji/facebook_messenger/person_in_steamy_room.png
index 65a0790d926..00fecc6ce13 100644
Binary files a/public/images/emoji/facebook_messenger/person_in_steamy_room.png and b/public/images/emoji/facebook_messenger/person_in_steamy_room.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_steamy_room/2.png b/public/images/emoji/facebook_messenger/person_in_steamy_room/2.png
index 7260df1d154..17665c8cbf5 100644
Binary files a/public/images/emoji/facebook_messenger/person_in_steamy_room/2.png and b/public/images/emoji/facebook_messenger/person_in_steamy_room/2.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_steamy_room/3.png b/public/images/emoji/facebook_messenger/person_in_steamy_room/3.png
index d14580a3db3..36a1a8f394a 100644
Binary files a/public/images/emoji/facebook_messenger/person_in_steamy_room/3.png and b/public/images/emoji/facebook_messenger/person_in_steamy_room/3.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_steamy_room/4.png b/public/images/emoji/facebook_messenger/person_in_steamy_room/4.png
index 9313ab2116b..5cb9f8c69bb 100644
Binary files a/public/images/emoji/facebook_messenger/person_in_steamy_room/4.png and b/public/images/emoji/facebook_messenger/person_in_steamy_room/4.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_steamy_room/5.png b/public/images/emoji/facebook_messenger/person_in_steamy_room/5.png
index f432b554b37..17a44630be0 100644
Binary files a/public/images/emoji/facebook_messenger/person_in_steamy_room/5.png and b/public/images/emoji/facebook_messenger/person_in_steamy_room/5.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_steamy_room/6.png b/public/images/emoji/facebook_messenger/person_in_steamy_room/6.png
index dc7087e0284..6a5710ea45b 100644
Binary files a/public/images/emoji/facebook_messenger/person_in_steamy_room/6.png and b/public/images/emoji/facebook_messenger/person_in_steamy_room/6.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_ball.png b/public/images/emoji/facebook_messenger/person_with_ball.png
index ac6a6c2c9f1..fc307b60c9c 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_ball.png and b/public/images/emoji/facebook_messenger/person_with_ball.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_ball/2.png b/public/images/emoji/facebook_messenger/person_with_ball/2.png
index 4dad1da7dbe..cdd5c25469c 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_ball/2.png and b/public/images/emoji/facebook_messenger/person_with_ball/2.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_ball/3.png b/public/images/emoji/facebook_messenger/person_with_ball/3.png
index 739f1de58c0..e4630e522c6 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_ball/3.png and b/public/images/emoji/facebook_messenger/person_with_ball/3.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_ball/4.png b/public/images/emoji/facebook_messenger/person_with_ball/4.png
index 62a23de4665..8fbdb822fc6 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_ball/4.png and b/public/images/emoji/facebook_messenger/person_with_ball/4.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_ball/5.png b/public/images/emoji/facebook_messenger/person_with_ball/5.png
index 2cd9628b760..047897cbf51 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_ball/5.png and b/public/images/emoji/facebook_messenger/person_with_ball/5.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_ball/6.png b/public/images/emoji/facebook_messenger/person_with_ball/6.png
index 85bfaeb5785..4592818525d 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_ball/6.png and b/public/images/emoji/facebook_messenger/person_with_ball/6.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_blond_hair.png b/public/images/emoji/facebook_messenger/person_with_blond_hair.png
index cfe7273eb3a..f19dc6ff1d2 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_blond_hair.png and b/public/images/emoji/facebook_messenger/person_with_blond_hair.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_blond_hair/2.png b/public/images/emoji/facebook_messenger/person_with_blond_hair/2.png
index aee96b85a74..88d69b3062c 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_blond_hair/2.png and b/public/images/emoji/facebook_messenger/person_with_blond_hair/2.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_blond_hair/3.png b/public/images/emoji/facebook_messenger/person_with_blond_hair/3.png
index b4fffd5a303..ee68c1bb33a 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_blond_hair/3.png and b/public/images/emoji/facebook_messenger/person_with_blond_hair/3.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_blond_hair/4.png b/public/images/emoji/facebook_messenger/person_with_blond_hair/4.png
index d8d6a0de15e..36062b098ef 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_blond_hair/4.png and b/public/images/emoji/facebook_messenger/person_with_blond_hair/4.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_blond_hair/5.png b/public/images/emoji/facebook_messenger/person_with_blond_hair/5.png
index 6a573ffb48a..6e6f29b2142 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_blond_hair/5.png and b/public/images/emoji/facebook_messenger/person_with_blond_hair/5.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_blond_hair/6.png b/public/images/emoji/facebook_messenger/person_with_blond_hair/6.png
index 1cefe68636a..e773f424817 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_blond_hair/6.png and b/public/images/emoji/facebook_messenger/person_with_blond_hair/6.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_pouting_face.png b/public/images/emoji/facebook_messenger/person_with_pouting_face.png
index 038973f9400..0a66b08a912 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_pouting_face.png and b/public/images/emoji/facebook_messenger/person_with_pouting_face.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_pouting_face/2.png b/public/images/emoji/facebook_messenger/person_with_pouting_face/2.png
index 65473cdbce9..edd22d5222c 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_pouting_face/2.png and b/public/images/emoji/facebook_messenger/person_with_pouting_face/2.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_pouting_face/3.png b/public/images/emoji/facebook_messenger/person_with_pouting_face/3.png
index 82e31162c07..17d2ba1ee3a 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_pouting_face/3.png and b/public/images/emoji/facebook_messenger/person_with_pouting_face/3.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_pouting_face/4.png b/public/images/emoji/facebook_messenger/person_with_pouting_face/4.png
index 838df0d6569..260cfdba5cf 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_pouting_face/4.png and b/public/images/emoji/facebook_messenger/person_with_pouting_face/4.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_pouting_face/5.png b/public/images/emoji/facebook_messenger/person_with_pouting_face/5.png
index cedf79afd20..12ad6a1f5c4 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_pouting_face/5.png and b/public/images/emoji/facebook_messenger/person_with_pouting_face/5.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_pouting_face/6.png b/public/images/emoji/facebook_messenger/person_with_pouting_face/6.png
index 7bb2a217dbc..3829aed5abc 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_pouting_face/6.png and b/public/images/emoji/facebook_messenger/person_with_pouting_face/6.png differ
diff --git a/public/images/emoji/facebook_messenger/peru.png b/public/images/emoji/facebook_messenger/peru.png
index bbb5523f939..bc70d26c8be 100644
Binary files a/public/images/emoji/facebook_messenger/peru.png and b/public/images/emoji/facebook_messenger/peru.png differ
diff --git a/public/images/emoji/facebook_messenger/philippines.png b/public/images/emoji/facebook_messenger/philippines.png
index 33fcf38a3ce..b353a66a206 100644
Binary files a/public/images/emoji/facebook_messenger/philippines.png and b/public/images/emoji/facebook_messenger/philippines.png differ
diff --git a/public/images/emoji/facebook_messenger/phone.png b/public/images/emoji/facebook_messenger/phone.png
index b8bbec494d3..13b38ac3c69 100644
Binary files a/public/images/emoji/facebook_messenger/phone.png and b/public/images/emoji/facebook_messenger/phone.png differ
diff --git a/public/images/emoji/facebook_messenger/pick.png b/public/images/emoji/facebook_messenger/pick.png
index cc216bfcae1..96098782851 100644
Binary files a/public/images/emoji/facebook_messenger/pick.png and b/public/images/emoji/facebook_messenger/pick.png differ
diff --git a/public/images/emoji/facebook_messenger/pie.png b/public/images/emoji/facebook_messenger/pie.png
index 4f5f474d82c..0e3e08b5969 100644
Binary files a/public/images/emoji/facebook_messenger/pie.png and b/public/images/emoji/facebook_messenger/pie.png differ
diff --git a/public/images/emoji/facebook_messenger/pig.png b/public/images/emoji/facebook_messenger/pig.png
index f1785f8302c..8c5e07caf4a 100644
Binary files a/public/images/emoji/facebook_messenger/pig.png and b/public/images/emoji/facebook_messenger/pig.png differ
diff --git a/public/images/emoji/facebook_messenger/pig2.png b/public/images/emoji/facebook_messenger/pig2.png
index fe2fe97e23e..5dbdfafb562 100644
Binary files a/public/images/emoji/facebook_messenger/pig2.png and b/public/images/emoji/facebook_messenger/pig2.png differ
diff --git a/public/images/emoji/facebook_messenger/pig_nose.png b/public/images/emoji/facebook_messenger/pig_nose.png
index d17e33d638f..63162feb5a3 100644
Binary files a/public/images/emoji/facebook_messenger/pig_nose.png and b/public/images/emoji/facebook_messenger/pig_nose.png differ
diff --git a/public/images/emoji/facebook_messenger/pill.png b/public/images/emoji/facebook_messenger/pill.png
index 70b65c6a31f..c1014ba8123 100644
Binary files a/public/images/emoji/facebook_messenger/pill.png and b/public/images/emoji/facebook_messenger/pill.png differ
diff --git a/public/images/emoji/facebook_messenger/pineapple.png b/public/images/emoji/facebook_messenger/pineapple.png
index 3dbd743222e..68c125bb0e7 100644
Binary files a/public/images/emoji/facebook_messenger/pineapple.png and b/public/images/emoji/facebook_messenger/pineapple.png differ
diff --git a/public/images/emoji/facebook_messenger/ping_pong.png b/public/images/emoji/facebook_messenger/ping_pong.png
index 935993c8608..4b18adbad40 100644
Binary files a/public/images/emoji/facebook_messenger/ping_pong.png and b/public/images/emoji/facebook_messenger/ping_pong.png differ
diff --git a/public/images/emoji/facebook_messenger/pisces.png b/public/images/emoji/facebook_messenger/pisces.png
index 628b9b0706b..1ff18a40d1e 100644
Binary files a/public/images/emoji/facebook_messenger/pisces.png and b/public/images/emoji/facebook_messenger/pisces.png differ
diff --git a/public/images/emoji/facebook_messenger/pitcairn_islands.png b/public/images/emoji/facebook_messenger/pitcairn_islands.png
index 3e3d79bca5c..65730670ad9 100644
Binary files a/public/images/emoji/facebook_messenger/pitcairn_islands.png and b/public/images/emoji/facebook_messenger/pitcairn_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/pizza.png b/public/images/emoji/facebook_messenger/pizza.png
index 5f34afb51d8..2fb11e22996 100644
Binary files a/public/images/emoji/facebook_messenger/pizza.png and b/public/images/emoji/facebook_messenger/pizza.png differ
diff --git a/public/images/emoji/facebook_messenger/place_of_worship.png b/public/images/emoji/facebook_messenger/place_of_worship.png
index 19e1150b303..0f9025c3c49 100644
Binary files a/public/images/emoji/facebook_messenger/place_of_worship.png and b/public/images/emoji/facebook_messenger/place_of_worship.png differ
diff --git a/public/images/emoji/facebook_messenger/plate_with_cutlery.png b/public/images/emoji/facebook_messenger/plate_with_cutlery.png
index df63dcc4f4f..84fd7bba6a0 100644
Binary files a/public/images/emoji/facebook_messenger/plate_with_cutlery.png and b/public/images/emoji/facebook_messenger/plate_with_cutlery.png differ
diff --git a/public/images/emoji/facebook_messenger/play_or_pause_button.png b/public/images/emoji/facebook_messenger/play_or_pause_button.png
index 64b99985414..3bd3854902a 100644
Binary files a/public/images/emoji/facebook_messenger/play_or_pause_button.png and b/public/images/emoji/facebook_messenger/play_or_pause_button.png differ
diff --git a/public/images/emoji/facebook_messenger/play_pause.png b/public/images/emoji/facebook_messenger/play_pause.png
index 64b99985414..3bd3854902a 100644
Binary files a/public/images/emoji/facebook_messenger/play_pause.png and b/public/images/emoji/facebook_messenger/play_pause.png differ
diff --git a/public/images/emoji/facebook_messenger/point_down.png b/public/images/emoji/facebook_messenger/point_down.png
index 0532b9ae9c9..7fcb9445f81 100644
Binary files a/public/images/emoji/facebook_messenger/point_down.png and b/public/images/emoji/facebook_messenger/point_down.png differ
diff --git a/public/images/emoji/facebook_messenger/point_down/2.png b/public/images/emoji/facebook_messenger/point_down/2.png
index d0b150916e5..36b4e8f4953 100644
Binary files a/public/images/emoji/facebook_messenger/point_down/2.png and b/public/images/emoji/facebook_messenger/point_down/2.png differ
diff --git a/public/images/emoji/facebook_messenger/point_down/3.png b/public/images/emoji/facebook_messenger/point_down/3.png
index 6230cc4801e..d9ef0c3fac9 100644
Binary files a/public/images/emoji/facebook_messenger/point_down/3.png and b/public/images/emoji/facebook_messenger/point_down/3.png differ
diff --git a/public/images/emoji/facebook_messenger/point_down/4.png b/public/images/emoji/facebook_messenger/point_down/4.png
index 114adc6a210..edb5fc7fd87 100644
Binary files a/public/images/emoji/facebook_messenger/point_down/4.png and b/public/images/emoji/facebook_messenger/point_down/4.png differ
diff --git a/public/images/emoji/facebook_messenger/point_down/5.png b/public/images/emoji/facebook_messenger/point_down/5.png
index 0717726383a..ba633e5099b 100644
Binary files a/public/images/emoji/facebook_messenger/point_down/5.png and b/public/images/emoji/facebook_messenger/point_down/5.png differ
diff --git a/public/images/emoji/facebook_messenger/point_down/6.png b/public/images/emoji/facebook_messenger/point_down/6.png
index 38d0116c827..ff56444732d 100644
Binary files a/public/images/emoji/facebook_messenger/point_down/6.png and b/public/images/emoji/facebook_messenger/point_down/6.png differ
diff --git a/public/images/emoji/facebook_messenger/point_left.png b/public/images/emoji/facebook_messenger/point_left.png
index d4a84e5d312..96875e51949 100644
Binary files a/public/images/emoji/facebook_messenger/point_left.png and b/public/images/emoji/facebook_messenger/point_left.png differ
diff --git a/public/images/emoji/facebook_messenger/point_left/2.png b/public/images/emoji/facebook_messenger/point_left/2.png
index d43212ff56d..6c8e8c967d6 100644
Binary files a/public/images/emoji/facebook_messenger/point_left/2.png and b/public/images/emoji/facebook_messenger/point_left/2.png differ
diff --git a/public/images/emoji/facebook_messenger/point_left/3.png b/public/images/emoji/facebook_messenger/point_left/3.png
index 48753a68efd..89cc0cf4611 100644
Binary files a/public/images/emoji/facebook_messenger/point_left/3.png and b/public/images/emoji/facebook_messenger/point_left/3.png differ
diff --git a/public/images/emoji/facebook_messenger/point_left/4.png b/public/images/emoji/facebook_messenger/point_left/4.png
index e5bda27630d..5b0ec8095bb 100644
Binary files a/public/images/emoji/facebook_messenger/point_left/4.png and b/public/images/emoji/facebook_messenger/point_left/4.png differ
diff --git a/public/images/emoji/facebook_messenger/point_left/5.png b/public/images/emoji/facebook_messenger/point_left/5.png
index 51200df95ae..4a46e5b5c5c 100644
Binary files a/public/images/emoji/facebook_messenger/point_left/5.png and b/public/images/emoji/facebook_messenger/point_left/5.png differ
diff --git a/public/images/emoji/facebook_messenger/point_left/6.png b/public/images/emoji/facebook_messenger/point_left/6.png
index fd6c930fc82..535f6db8830 100644
Binary files a/public/images/emoji/facebook_messenger/point_left/6.png and b/public/images/emoji/facebook_messenger/point_left/6.png differ
diff --git a/public/images/emoji/facebook_messenger/point_right.png b/public/images/emoji/facebook_messenger/point_right.png
index 56f542c20ab..1a15c51878b 100644
Binary files a/public/images/emoji/facebook_messenger/point_right.png and b/public/images/emoji/facebook_messenger/point_right.png differ
diff --git a/public/images/emoji/facebook_messenger/point_right/2.png b/public/images/emoji/facebook_messenger/point_right/2.png
index 8e85edee2bd..8526515e70f 100644
Binary files a/public/images/emoji/facebook_messenger/point_right/2.png and b/public/images/emoji/facebook_messenger/point_right/2.png differ
diff --git a/public/images/emoji/facebook_messenger/point_right/3.png b/public/images/emoji/facebook_messenger/point_right/3.png
index 5f8007ca82a..78dac1621c5 100644
Binary files a/public/images/emoji/facebook_messenger/point_right/3.png and b/public/images/emoji/facebook_messenger/point_right/3.png differ
diff --git a/public/images/emoji/facebook_messenger/point_right/4.png b/public/images/emoji/facebook_messenger/point_right/4.png
index 4076a56aa18..ce284c3113d 100644
Binary files a/public/images/emoji/facebook_messenger/point_right/4.png and b/public/images/emoji/facebook_messenger/point_right/4.png differ
diff --git a/public/images/emoji/facebook_messenger/point_right/5.png b/public/images/emoji/facebook_messenger/point_right/5.png
index 7a2f0f80330..d4aa856c6df 100644
Binary files a/public/images/emoji/facebook_messenger/point_right/5.png and b/public/images/emoji/facebook_messenger/point_right/5.png differ
diff --git a/public/images/emoji/facebook_messenger/point_right/6.png b/public/images/emoji/facebook_messenger/point_right/6.png
index df280e5a7ec..1dbdbecb9a0 100644
Binary files a/public/images/emoji/facebook_messenger/point_right/6.png and b/public/images/emoji/facebook_messenger/point_right/6.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up.png b/public/images/emoji/facebook_messenger/point_up.png
index fd27f92492e..1a96d5a2625 100644
Binary files a/public/images/emoji/facebook_messenger/point_up.png and b/public/images/emoji/facebook_messenger/point_up.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up/2.png b/public/images/emoji/facebook_messenger/point_up/2.png
index 375079cacf9..7bc263020bd 100644
Binary files a/public/images/emoji/facebook_messenger/point_up/2.png and b/public/images/emoji/facebook_messenger/point_up/2.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up/3.png b/public/images/emoji/facebook_messenger/point_up/3.png
index 7087cdd806b..1fe851a11a1 100644
Binary files a/public/images/emoji/facebook_messenger/point_up/3.png and b/public/images/emoji/facebook_messenger/point_up/3.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up/4.png b/public/images/emoji/facebook_messenger/point_up/4.png
index 22ceb6d0bd1..50451f71a49 100644
Binary files a/public/images/emoji/facebook_messenger/point_up/4.png and b/public/images/emoji/facebook_messenger/point_up/4.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up/5.png b/public/images/emoji/facebook_messenger/point_up/5.png
index 4a7973ef638..aafee59f67e 100644
Binary files a/public/images/emoji/facebook_messenger/point_up/5.png and b/public/images/emoji/facebook_messenger/point_up/5.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up/6.png b/public/images/emoji/facebook_messenger/point_up/6.png
index 85cb47d273d..e0db9d8979c 100644
Binary files a/public/images/emoji/facebook_messenger/point_up/6.png and b/public/images/emoji/facebook_messenger/point_up/6.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up_2.png b/public/images/emoji/facebook_messenger/point_up_2.png
index ebf21760c65..4461114a60f 100644
Binary files a/public/images/emoji/facebook_messenger/point_up_2.png and b/public/images/emoji/facebook_messenger/point_up_2.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up_2/2.png b/public/images/emoji/facebook_messenger/point_up_2/2.png
index b6d3fddfe68..70f4b7b275a 100644
Binary files a/public/images/emoji/facebook_messenger/point_up_2/2.png and b/public/images/emoji/facebook_messenger/point_up_2/2.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up_2/3.png b/public/images/emoji/facebook_messenger/point_up_2/3.png
index ba3389e362c..97c2272512b 100644
Binary files a/public/images/emoji/facebook_messenger/point_up_2/3.png and b/public/images/emoji/facebook_messenger/point_up_2/3.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up_2/4.png b/public/images/emoji/facebook_messenger/point_up_2/4.png
index bce3cbdfa88..cf1b6b5d25a 100644
Binary files a/public/images/emoji/facebook_messenger/point_up_2/4.png and b/public/images/emoji/facebook_messenger/point_up_2/4.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up_2/5.png b/public/images/emoji/facebook_messenger/point_up_2/5.png
index 71f95adf24e..854958f027d 100644
Binary files a/public/images/emoji/facebook_messenger/point_up_2/5.png and b/public/images/emoji/facebook_messenger/point_up_2/5.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up_2/6.png b/public/images/emoji/facebook_messenger/point_up_2/6.png
index 7fc4a4877b2..edad89b6316 100644
Binary files a/public/images/emoji/facebook_messenger/point_up_2/6.png and b/public/images/emoji/facebook_messenger/point_up_2/6.png differ
diff --git a/public/images/emoji/facebook_messenger/poland.png b/public/images/emoji/facebook_messenger/poland.png
index 78057f600c8..1f2087f5926 100644
Binary files a/public/images/emoji/facebook_messenger/poland.png and b/public/images/emoji/facebook_messenger/poland.png differ
diff --git a/public/images/emoji/facebook_messenger/police_car.png b/public/images/emoji/facebook_messenger/police_car.png
index c77c1c05a8d..123fb4dd833 100644
Binary files a/public/images/emoji/facebook_messenger/police_car.png and b/public/images/emoji/facebook_messenger/police_car.png differ
diff --git a/public/images/emoji/facebook_messenger/policeman.png b/public/images/emoji/facebook_messenger/policeman.png
index 4efbb5500d1..089df5b5962 100644
Binary files a/public/images/emoji/facebook_messenger/policeman.png and b/public/images/emoji/facebook_messenger/policeman.png differ
diff --git a/public/images/emoji/facebook_messenger/policeman/2.png b/public/images/emoji/facebook_messenger/policeman/2.png
index 02f646d46fb..2bf0af607ad 100644
Binary files a/public/images/emoji/facebook_messenger/policeman/2.png and b/public/images/emoji/facebook_messenger/policeman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/policeman/3.png b/public/images/emoji/facebook_messenger/policeman/3.png
index fc0d621ff81..0f03ba24e49 100644
Binary files a/public/images/emoji/facebook_messenger/policeman/3.png and b/public/images/emoji/facebook_messenger/policeman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/policeman/4.png b/public/images/emoji/facebook_messenger/policeman/4.png
index 607565d83dd..f0fb4bd4d1d 100644
Binary files a/public/images/emoji/facebook_messenger/policeman/4.png and b/public/images/emoji/facebook_messenger/policeman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/policeman/5.png b/public/images/emoji/facebook_messenger/policeman/5.png
index d54b5e01abd..bba1ef04c92 100644
Binary files a/public/images/emoji/facebook_messenger/policeman/5.png and b/public/images/emoji/facebook_messenger/policeman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/policeman/6.png b/public/images/emoji/facebook_messenger/policeman/6.png
index cc17ff14df0..7b2ccb41094 100644
Binary files a/public/images/emoji/facebook_messenger/policeman/6.png and b/public/images/emoji/facebook_messenger/policeman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/policewoman.png b/public/images/emoji/facebook_messenger/policewoman.png
index 566f93771b3..baa67bd5caa 100644
Binary files a/public/images/emoji/facebook_messenger/policewoman.png and b/public/images/emoji/facebook_messenger/policewoman.png differ
diff --git a/public/images/emoji/facebook_messenger/policewoman/2.png b/public/images/emoji/facebook_messenger/policewoman/2.png
index f319e4af5db..438998317dd 100644
Binary files a/public/images/emoji/facebook_messenger/policewoman/2.png and b/public/images/emoji/facebook_messenger/policewoman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/policewoman/3.png b/public/images/emoji/facebook_messenger/policewoman/3.png
index c1652f098c4..bf0c4a33d1d 100644
Binary files a/public/images/emoji/facebook_messenger/policewoman/3.png and b/public/images/emoji/facebook_messenger/policewoman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/policewoman/4.png b/public/images/emoji/facebook_messenger/policewoman/4.png
index 92fe65ff978..2117a5f9df0 100644
Binary files a/public/images/emoji/facebook_messenger/policewoman/4.png and b/public/images/emoji/facebook_messenger/policewoman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/policewoman/5.png b/public/images/emoji/facebook_messenger/policewoman/5.png
index 0bf22ab60db..4c4751a0638 100644
Binary files a/public/images/emoji/facebook_messenger/policewoman/5.png and b/public/images/emoji/facebook_messenger/policewoman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/policewoman/6.png b/public/images/emoji/facebook_messenger/policewoman/6.png
index 13ab6c5e904..f0aa3b71cd1 100644
Binary files a/public/images/emoji/facebook_messenger/policewoman/6.png and b/public/images/emoji/facebook_messenger/policewoman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/poo.png b/public/images/emoji/facebook_messenger/poo.png
index e175a1dfffc..7c3e5199220 100644
Binary files a/public/images/emoji/facebook_messenger/poo.png and b/public/images/emoji/facebook_messenger/poo.png differ
diff --git a/public/images/emoji/facebook_messenger/poodle.png b/public/images/emoji/facebook_messenger/poodle.png
index b9cad43ce13..795f8400731 100644
Binary files a/public/images/emoji/facebook_messenger/poodle.png and b/public/images/emoji/facebook_messenger/poodle.png differ
diff --git a/public/images/emoji/facebook_messenger/poop.png b/public/images/emoji/facebook_messenger/poop.png
index e175a1dfffc..7c3e5199220 100644
Binary files a/public/images/emoji/facebook_messenger/poop.png and b/public/images/emoji/facebook_messenger/poop.png differ
diff --git a/public/images/emoji/facebook_messenger/popcorn.png b/public/images/emoji/facebook_messenger/popcorn.png
index ccdc42f6c6c..1ff9913d740 100644
Binary files a/public/images/emoji/facebook_messenger/popcorn.png and b/public/images/emoji/facebook_messenger/popcorn.png differ
diff --git a/public/images/emoji/facebook_messenger/portugal.png b/public/images/emoji/facebook_messenger/portugal.png
index 77ff0993940..a21775bee9d 100644
Binary files a/public/images/emoji/facebook_messenger/portugal.png and b/public/images/emoji/facebook_messenger/portugal.png differ
diff --git a/public/images/emoji/facebook_messenger/post_office.png b/public/images/emoji/facebook_messenger/post_office.png
index 18aa7cdb7ae..3e78559866a 100644
Binary files a/public/images/emoji/facebook_messenger/post_office.png and b/public/images/emoji/facebook_messenger/post_office.png differ
diff --git a/public/images/emoji/facebook_messenger/postal_horn.png b/public/images/emoji/facebook_messenger/postal_horn.png
index 9a03ae187c4..e5fe95fcd95 100644
Binary files a/public/images/emoji/facebook_messenger/postal_horn.png and b/public/images/emoji/facebook_messenger/postal_horn.png differ
diff --git a/public/images/emoji/facebook_messenger/postbox.png b/public/images/emoji/facebook_messenger/postbox.png
index 2f590112183..e9fa1145293 100644
Binary files a/public/images/emoji/facebook_messenger/postbox.png and b/public/images/emoji/facebook_messenger/postbox.png differ
diff --git a/public/images/emoji/facebook_messenger/potable_water.png b/public/images/emoji/facebook_messenger/potable_water.png
index 220cacc7cbd..de49c67324c 100644
Binary files a/public/images/emoji/facebook_messenger/potable_water.png and b/public/images/emoji/facebook_messenger/potable_water.png differ
diff --git a/public/images/emoji/facebook_messenger/potato.png b/public/images/emoji/facebook_messenger/potato.png
index 3f097365d9f..fa933340d32 100644
Binary files a/public/images/emoji/facebook_messenger/potato.png and b/public/images/emoji/facebook_messenger/potato.png differ
diff --git a/public/images/emoji/facebook_messenger/pouch.png b/public/images/emoji/facebook_messenger/pouch.png
index dd0ff200546..9f7276a17d0 100644
Binary files a/public/images/emoji/facebook_messenger/pouch.png and b/public/images/emoji/facebook_messenger/pouch.png differ
diff --git a/public/images/emoji/facebook_messenger/poultry_leg.png b/public/images/emoji/facebook_messenger/poultry_leg.png
index 9c2d26a096b..a04a253a01a 100644
Binary files a/public/images/emoji/facebook_messenger/poultry_leg.png and b/public/images/emoji/facebook_messenger/poultry_leg.png differ
diff --git a/public/images/emoji/facebook_messenger/pound.png b/public/images/emoji/facebook_messenger/pound.png
index 8b25b67c8ec..8e210f98c61 100644
Binary files a/public/images/emoji/facebook_messenger/pound.png and b/public/images/emoji/facebook_messenger/pound.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_cat.png b/public/images/emoji/facebook_messenger/pouting_cat.png
index bebe99a8aad..51e21f5413b 100644
Binary files a/public/images/emoji/facebook_messenger/pouting_cat.png and b/public/images/emoji/facebook_messenger/pouting_cat.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_man.png b/public/images/emoji/facebook_messenger/pouting_man.png
index c6392b40a64..94f4177368b 100644
Binary files a/public/images/emoji/facebook_messenger/pouting_man.png and b/public/images/emoji/facebook_messenger/pouting_man.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_man/2.png b/public/images/emoji/facebook_messenger/pouting_man/2.png
index b5f4f2999a6..5b0bc09a1d0 100644
Binary files a/public/images/emoji/facebook_messenger/pouting_man/2.png and b/public/images/emoji/facebook_messenger/pouting_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_man/3.png b/public/images/emoji/facebook_messenger/pouting_man/3.png
index 7ca74c419eb..faed5e8dbec 100644
Binary files a/public/images/emoji/facebook_messenger/pouting_man/3.png and b/public/images/emoji/facebook_messenger/pouting_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_man/4.png b/public/images/emoji/facebook_messenger/pouting_man/4.png
index 0e99fe45b11..f974f060ef1 100644
Binary files a/public/images/emoji/facebook_messenger/pouting_man/4.png and b/public/images/emoji/facebook_messenger/pouting_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_man/5.png b/public/images/emoji/facebook_messenger/pouting_man/5.png
index 91faf90cf59..db6d87d8a1c 100644
Binary files a/public/images/emoji/facebook_messenger/pouting_man/5.png and b/public/images/emoji/facebook_messenger/pouting_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_man/6.png b/public/images/emoji/facebook_messenger/pouting_man/6.png
index 07156230630..aa08b03bb1b 100644
Binary files a/public/images/emoji/facebook_messenger/pouting_man/6.png and b/public/images/emoji/facebook_messenger/pouting_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_woman.png b/public/images/emoji/facebook_messenger/pouting_woman.png
index 038973f9400..0a66b08a912 100644
Binary files a/public/images/emoji/facebook_messenger/pouting_woman.png and b/public/images/emoji/facebook_messenger/pouting_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_woman/2.png b/public/images/emoji/facebook_messenger/pouting_woman/2.png
index 65473cdbce9..edd22d5222c 100644
Binary files a/public/images/emoji/facebook_messenger/pouting_woman/2.png and b/public/images/emoji/facebook_messenger/pouting_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_woman/3.png b/public/images/emoji/facebook_messenger/pouting_woman/3.png
index 82e31162c07..17d2ba1ee3a 100644
Binary files a/public/images/emoji/facebook_messenger/pouting_woman/3.png and b/public/images/emoji/facebook_messenger/pouting_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_woman/4.png b/public/images/emoji/facebook_messenger/pouting_woman/4.png
index 838df0d6569..260cfdba5cf 100644
Binary files a/public/images/emoji/facebook_messenger/pouting_woman/4.png and b/public/images/emoji/facebook_messenger/pouting_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_woman/5.png b/public/images/emoji/facebook_messenger/pouting_woman/5.png
index cedf79afd20..12ad6a1f5c4 100644
Binary files a/public/images/emoji/facebook_messenger/pouting_woman/5.png and b/public/images/emoji/facebook_messenger/pouting_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_woman/6.png b/public/images/emoji/facebook_messenger/pouting_woman/6.png
index 7bb2a217dbc..3829aed5abc 100644
Binary files a/public/images/emoji/facebook_messenger/pouting_woman/6.png and b/public/images/emoji/facebook_messenger/pouting_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/pray.png b/public/images/emoji/facebook_messenger/pray.png
index ef38e898582..1a069bcab0a 100644
Binary files a/public/images/emoji/facebook_messenger/pray.png and b/public/images/emoji/facebook_messenger/pray.png differ
diff --git a/public/images/emoji/facebook_messenger/pray/2.png b/public/images/emoji/facebook_messenger/pray/2.png
index 0d60a4c0e93..54525f1055d 100644
Binary files a/public/images/emoji/facebook_messenger/pray/2.png and b/public/images/emoji/facebook_messenger/pray/2.png differ
diff --git a/public/images/emoji/facebook_messenger/pray/3.png b/public/images/emoji/facebook_messenger/pray/3.png
index 11b9f064628..4343b2c3e0f 100644
Binary files a/public/images/emoji/facebook_messenger/pray/3.png and b/public/images/emoji/facebook_messenger/pray/3.png differ
diff --git a/public/images/emoji/facebook_messenger/pray/4.png b/public/images/emoji/facebook_messenger/pray/4.png
index ab26567ae26..5747f4d709b 100644
Binary files a/public/images/emoji/facebook_messenger/pray/4.png and b/public/images/emoji/facebook_messenger/pray/4.png differ
diff --git a/public/images/emoji/facebook_messenger/pray/5.png b/public/images/emoji/facebook_messenger/pray/5.png
index 97ddc0f08bf..892e083833b 100644
Binary files a/public/images/emoji/facebook_messenger/pray/5.png and b/public/images/emoji/facebook_messenger/pray/5.png differ
diff --git a/public/images/emoji/facebook_messenger/pray/6.png b/public/images/emoji/facebook_messenger/pray/6.png
index bf6a32e3470..3383ad62330 100644
Binary files a/public/images/emoji/facebook_messenger/pray/6.png and b/public/images/emoji/facebook_messenger/pray/6.png differ
diff --git a/public/images/emoji/facebook_messenger/prayer_beads.png b/public/images/emoji/facebook_messenger/prayer_beads.png
index 71d6e55ae05..9fe4026f772 100644
Binary files a/public/images/emoji/facebook_messenger/prayer_beads.png and b/public/images/emoji/facebook_messenger/prayer_beads.png differ
diff --git a/public/images/emoji/facebook_messenger/pregnant_woman.png b/public/images/emoji/facebook_messenger/pregnant_woman.png
index d965748c88b..b63c159fd25 100644
Binary files a/public/images/emoji/facebook_messenger/pregnant_woman.png and b/public/images/emoji/facebook_messenger/pregnant_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/pregnant_woman/2.png b/public/images/emoji/facebook_messenger/pregnant_woman/2.png
index 5b633046347..e3227b2eceb 100644
Binary files a/public/images/emoji/facebook_messenger/pregnant_woman/2.png and b/public/images/emoji/facebook_messenger/pregnant_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/pregnant_woman/3.png b/public/images/emoji/facebook_messenger/pregnant_woman/3.png
index 5ff2e3c4321..a5b40edbb4c 100644
Binary files a/public/images/emoji/facebook_messenger/pregnant_woman/3.png and b/public/images/emoji/facebook_messenger/pregnant_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/pregnant_woman/4.png b/public/images/emoji/facebook_messenger/pregnant_woman/4.png
index 6b6241fefc4..d3727ba9df1 100644
Binary files a/public/images/emoji/facebook_messenger/pregnant_woman/4.png and b/public/images/emoji/facebook_messenger/pregnant_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/pregnant_woman/5.png b/public/images/emoji/facebook_messenger/pregnant_woman/5.png
index ddc0648e8e4..135d60bad32 100644
Binary files a/public/images/emoji/facebook_messenger/pregnant_woman/5.png and b/public/images/emoji/facebook_messenger/pregnant_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/pregnant_woman/6.png b/public/images/emoji/facebook_messenger/pregnant_woman/6.png
index 04918ba7384..cbdf43e299f 100644
Binary files a/public/images/emoji/facebook_messenger/pregnant_woman/6.png and b/public/images/emoji/facebook_messenger/pregnant_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/pretzel.png b/public/images/emoji/facebook_messenger/pretzel.png
index 9116d6ee9a2..d2704035f80 100644
Binary files a/public/images/emoji/facebook_messenger/pretzel.png and b/public/images/emoji/facebook_messenger/pretzel.png differ
diff --git a/public/images/emoji/facebook_messenger/previous_track.png b/public/images/emoji/facebook_messenger/previous_track.png
index ada39abc337..5794a548e01 100644
Binary files a/public/images/emoji/facebook_messenger/previous_track.png and b/public/images/emoji/facebook_messenger/previous_track.png differ
diff --git a/public/images/emoji/facebook_messenger/previous_track_button.png b/public/images/emoji/facebook_messenger/previous_track_button.png
index ada39abc337..5794a548e01 100644
Binary files a/public/images/emoji/facebook_messenger/previous_track_button.png and b/public/images/emoji/facebook_messenger/previous_track_button.png differ
diff --git a/public/images/emoji/facebook_messenger/prince.png b/public/images/emoji/facebook_messenger/prince.png
index 5ec0ddf76be..6757b6dfec8 100644
Binary files a/public/images/emoji/facebook_messenger/prince.png and b/public/images/emoji/facebook_messenger/prince.png differ
diff --git a/public/images/emoji/facebook_messenger/prince/2.png b/public/images/emoji/facebook_messenger/prince/2.png
index dd91dd02fa8..e19a6da4ac7 100644
Binary files a/public/images/emoji/facebook_messenger/prince/2.png and b/public/images/emoji/facebook_messenger/prince/2.png differ
diff --git a/public/images/emoji/facebook_messenger/prince/3.png b/public/images/emoji/facebook_messenger/prince/3.png
index d3e36181843..26ca89e073f 100644
Binary files a/public/images/emoji/facebook_messenger/prince/3.png and b/public/images/emoji/facebook_messenger/prince/3.png differ
diff --git a/public/images/emoji/facebook_messenger/prince/4.png b/public/images/emoji/facebook_messenger/prince/4.png
index a00e9eb039d..4a2ab0fbc30 100644
Binary files a/public/images/emoji/facebook_messenger/prince/4.png and b/public/images/emoji/facebook_messenger/prince/4.png differ
diff --git a/public/images/emoji/facebook_messenger/prince/5.png b/public/images/emoji/facebook_messenger/prince/5.png
index 2d2fabb6ec9..38ce9dcac5e 100644
Binary files a/public/images/emoji/facebook_messenger/prince/5.png and b/public/images/emoji/facebook_messenger/prince/5.png differ
diff --git a/public/images/emoji/facebook_messenger/prince/6.png b/public/images/emoji/facebook_messenger/prince/6.png
index 5f7f4ec8914..958ed526845 100644
Binary files a/public/images/emoji/facebook_messenger/prince/6.png and b/public/images/emoji/facebook_messenger/prince/6.png differ
diff --git a/public/images/emoji/facebook_messenger/princess.png b/public/images/emoji/facebook_messenger/princess.png
index 83b1de6c499..6f6aad8f438 100644
Binary files a/public/images/emoji/facebook_messenger/princess.png and b/public/images/emoji/facebook_messenger/princess.png differ
diff --git a/public/images/emoji/facebook_messenger/princess/2.png b/public/images/emoji/facebook_messenger/princess/2.png
index f44ba4578b9..971ffc3e61b 100644
Binary files a/public/images/emoji/facebook_messenger/princess/2.png and b/public/images/emoji/facebook_messenger/princess/2.png differ
diff --git a/public/images/emoji/facebook_messenger/princess/3.png b/public/images/emoji/facebook_messenger/princess/3.png
index 49933ec338e..ba1b72b84c8 100644
Binary files a/public/images/emoji/facebook_messenger/princess/3.png and b/public/images/emoji/facebook_messenger/princess/3.png differ
diff --git a/public/images/emoji/facebook_messenger/princess/4.png b/public/images/emoji/facebook_messenger/princess/4.png
index 2af30a213b2..44536b62e13 100644
Binary files a/public/images/emoji/facebook_messenger/princess/4.png and b/public/images/emoji/facebook_messenger/princess/4.png differ
diff --git a/public/images/emoji/facebook_messenger/princess/5.png b/public/images/emoji/facebook_messenger/princess/5.png
index 08e62a5795e..66018a5819a 100644
Binary files a/public/images/emoji/facebook_messenger/princess/5.png and b/public/images/emoji/facebook_messenger/princess/5.png differ
diff --git a/public/images/emoji/facebook_messenger/princess/6.png b/public/images/emoji/facebook_messenger/princess/6.png
index 6ee3cd3da16..854e0bfd416 100644
Binary files a/public/images/emoji/facebook_messenger/princess/6.png and b/public/images/emoji/facebook_messenger/princess/6.png differ
diff --git a/public/images/emoji/facebook_messenger/printer.png b/public/images/emoji/facebook_messenger/printer.png
index 3fbfb20f27e..51d12393ef9 100644
Binary files a/public/images/emoji/facebook_messenger/printer.png and b/public/images/emoji/facebook_messenger/printer.png differ
diff --git a/public/images/emoji/facebook_messenger/projector.png b/public/images/emoji/facebook_messenger/projector.png
index 3acb6ea9c3f..61cf7f7bacb 100644
Binary files a/public/images/emoji/facebook_messenger/projector.png and b/public/images/emoji/facebook_messenger/projector.png differ
diff --git a/public/images/emoji/facebook_messenger/puerto_rico.png b/public/images/emoji/facebook_messenger/puerto_rico.png
index 5270bb9f87a..62984354a8d 100644
Binary files a/public/images/emoji/facebook_messenger/puerto_rico.png and b/public/images/emoji/facebook_messenger/puerto_rico.png differ
diff --git a/public/images/emoji/facebook_messenger/puke.png b/public/images/emoji/facebook_messenger/puke.png
new file mode 100644
index 00000000000..5d01c9ce3d2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/puke.png differ
diff --git a/public/images/emoji/facebook_messenger/punch.png b/public/images/emoji/facebook_messenger/punch.png
index ed3c41bc0d1..9db84ed1fd7 100644
Binary files a/public/images/emoji/facebook_messenger/punch.png and b/public/images/emoji/facebook_messenger/punch.png differ
diff --git a/public/images/emoji/facebook_messenger/punch/2.png b/public/images/emoji/facebook_messenger/punch/2.png
index e499d8d0fac..b14e4d79848 100644
Binary files a/public/images/emoji/facebook_messenger/punch/2.png and b/public/images/emoji/facebook_messenger/punch/2.png differ
diff --git a/public/images/emoji/facebook_messenger/punch/3.png b/public/images/emoji/facebook_messenger/punch/3.png
index f56ee4a1ff4..4972f25e1e7 100644
Binary files a/public/images/emoji/facebook_messenger/punch/3.png and b/public/images/emoji/facebook_messenger/punch/3.png differ
diff --git a/public/images/emoji/facebook_messenger/punch/4.png b/public/images/emoji/facebook_messenger/punch/4.png
index bc6cebcbf63..4233ef0d5af 100644
Binary files a/public/images/emoji/facebook_messenger/punch/4.png and b/public/images/emoji/facebook_messenger/punch/4.png differ
diff --git a/public/images/emoji/facebook_messenger/punch/5.png b/public/images/emoji/facebook_messenger/punch/5.png
index c8313f984fb..a82a5785859 100644
Binary files a/public/images/emoji/facebook_messenger/punch/5.png and b/public/images/emoji/facebook_messenger/punch/5.png differ
diff --git a/public/images/emoji/facebook_messenger/punch/6.png b/public/images/emoji/facebook_messenger/punch/6.png
index cf2064a1ad3..73efba003b3 100644
Binary files a/public/images/emoji/facebook_messenger/punch/6.png and b/public/images/emoji/facebook_messenger/punch/6.png differ
diff --git a/public/images/emoji/facebook_messenger/purple_heart.png b/public/images/emoji/facebook_messenger/purple_heart.png
index f055ac431c3..fbc2b035fdd 100644
Binary files a/public/images/emoji/facebook_messenger/purple_heart.png and b/public/images/emoji/facebook_messenger/purple_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/purse.png b/public/images/emoji/facebook_messenger/purse.png
index ec56d3b10a1..75f4318ca04 100644
Binary files a/public/images/emoji/facebook_messenger/purse.png and b/public/images/emoji/facebook_messenger/purse.png differ
diff --git a/public/images/emoji/facebook_messenger/pushpin.png b/public/images/emoji/facebook_messenger/pushpin.png
index 79cf94cf556..783a05ec840 100644
Binary files a/public/images/emoji/facebook_messenger/pushpin.png and b/public/images/emoji/facebook_messenger/pushpin.png differ
diff --git a/public/images/emoji/facebook_messenger/put_litter_in_its_place.png b/public/images/emoji/facebook_messenger/put_litter_in_its_place.png
index fae27e6a258..fcf7e4d8fce 100644
Binary files a/public/images/emoji/facebook_messenger/put_litter_in_its_place.png and b/public/images/emoji/facebook_messenger/put_litter_in_its_place.png differ
diff --git a/public/images/emoji/facebook_messenger/qatar.png b/public/images/emoji/facebook_messenger/qatar.png
index f51ae1d0ffd..35e3a77782c 100644
Binary files a/public/images/emoji/facebook_messenger/qatar.png and b/public/images/emoji/facebook_messenger/qatar.png differ
diff --git a/public/images/emoji/facebook_messenger/question.png b/public/images/emoji/facebook_messenger/question.png
index 7e87b10732a..c1fb56fd017 100644
Binary files a/public/images/emoji/facebook_messenger/question.png and b/public/images/emoji/facebook_messenger/question.png differ
diff --git a/public/images/emoji/facebook_messenger/rabbit.png b/public/images/emoji/facebook_messenger/rabbit.png
index 637d9d57d77..83b69e3e772 100644
Binary files a/public/images/emoji/facebook_messenger/rabbit.png and b/public/images/emoji/facebook_messenger/rabbit.png differ
diff --git a/public/images/emoji/facebook_messenger/rabbit2.png b/public/images/emoji/facebook_messenger/rabbit2.png
index 63b2bb144bf..1f448ab0083 100644
Binary files a/public/images/emoji/facebook_messenger/rabbit2.png and b/public/images/emoji/facebook_messenger/rabbit2.png differ
diff --git a/public/images/emoji/facebook_messenger/race_car.png b/public/images/emoji/facebook_messenger/race_car.png
index 894f1b62c24..7f4a20f3e53 100644
Binary files a/public/images/emoji/facebook_messenger/race_car.png and b/public/images/emoji/facebook_messenger/race_car.png differ
diff --git a/public/images/emoji/facebook_messenger/racehorse.png b/public/images/emoji/facebook_messenger/racehorse.png
index 986b22d2b29..81bfe0d2569 100644
Binary files a/public/images/emoji/facebook_messenger/racehorse.png and b/public/images/emoji/facebook_messenger/racehorse.png differ
diff --git a/public/images/emoji/facebook_messenger/racing_car.png b/public/images/emoji/facebook_messenger/racing_car.png
index 894f1b62c24..7f4a20f3e53 100644
Binary files a/public/images/emoji/facebook_messenger/racing_car.png and b/public/images/emoji/facebook_messenger/racing_car.png differ
diff --git a/public/images/emoji/facebook_messenger/racing_motorcycle.png b/public/images/emoji/facebook_messenger/racing_motorcycle.png
index ba7fb373bad..a23e4817084 100644
Binary files a/public/images/emoji/facebook_messenger/racing_motorcycle.png and b/public/images/emoji/facebook_messenger/racing_motorcycle.png differ
diff --git a/public/images/emoji/facebook_messenger/radio.png b/public/images/emoji/facebook_messenger/radio.png
index ee26ea72d43..f9be30dc8a8 100644
Binary files a/public/images/emoji/facebook_messenger/radio.png and b/public/images/emoji/facebook_messenger/radio.png differ
diff --git a/public/images/emoji/facebook_messenger/radio_button.png b/public/images/emoji/facebook_messenger/radio_button.png
index 2e744fd1512..a0abadd2f34 100644
Binary files a/public/images/emoji/facebook_messenger/radio_button.png and b/public/images/emoji/facebook_messenger/radio_button.png differ
diff --git a/public/images/emoji/facebook_messenger/radioactive.png b/public/images/emoji/facebook_messenger/radioactive.png
index 8fdf276cd29..9d347aea252 100644
Binary files a/public/images/emoji/facebook_messenger/radioactive.png and b/public/images/emoji/facebook_messenger/radioactive.png differ
diff --git a/public/images/emoji/facebook_messenger/radioactive_sign.png b/public/images/emoji/facebook_messenger/radioactive_sign.png
index 8fdf276cd29..9d347aea252 100644
Binary files a/public/images/emoji/facebook_messenger/radioactive_sign.png and b/public/images/emoji/facebook_messenger/radioactive_sign.png differ
diff --git a/public/images/emoji/facebook_messenger/rage.png b/public/images/emoji/facebook_messenger/rage.png
index 70ce2bd0c9a..668631f0b30 100644
Binary files a/public/images/emoji/facebook_messenger/rage.png and b/public/images/emoji/facebook_messenger/rage.png differ
diff --git a/public/images/emoji/facebook_messenger/railroad_track.png b/public/images/emoji/facebook_messenger/railroad_track.png
index 7b456ff579a..b15ae4cb9b8 100644
Binary files a/public/images/emoji/facebook_messenger/railroad_track.png and b/public/images/emoji/facebook_messenger/railroad_track.png differ
diff --git a/public/images/emoji/facebook_messenger/railway_car.png b/public/images/emoji/facebook_messenger/railway_car.png
index dedb706da24..e6e20a0b258 100644
Binary files a/public/images/emoji/facebook_messenger/railway_car.png and b/public/images/emoji/facebook_messenger/railway_car.png differ
diff --git a/public/images/emoji/facebook_messenger/railway_track.png b/public/images/emoji/facebook_messenger/railway_track.png
index 7b456ff579a..b15ae4cb9b8 100644
Binary files a/public/images/emoji/facebook_messenger/railway_track.png and b/public/images/emoji/facebook_messenger/railway_track.png differ
diff --git a/public/images/emoji/facebook_messenger/rainbow.png b/public/images/emoji/facebook_messenger/rainbow.png
index 4d82fd066df..9f1a380b392 100644
Binary files a/public/images/emoji/facebook_messenger/rainbow.png and b/public/images/emoji/facebook_messenger/rainbow.png differ
diff --git a/public/images/emoji/facebook_messenger/rainbow_flag.png b/public/images/emoji/facebook_messenger/rainbow_flag.png
index af14c94a4f2..e0e4ae944c4 100644
Binary files a/public/images/emoji/facebook_messenger/rainbow_flag.png and b/public/images/emoji/facebook_messenger/rainbow_flag.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_back_of_hand.png b/public/images/emoji/facebook_messenger/raised_back_of_hand.png
index 7e8bd4c6ad9..abb7de33c56 100644
Binary files a/public/images/emoji/facebook_messenger/raised_back_of_hand.png and b/public/images/emoji/facebook_messenger/raised_back_of_hand.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_back_of_hand/2.png b/public/images/emoji/facebook_messenger/raised_back_of_hand/2.png
index a65c925100b..c622368d5d8 100644
Binary files a/public/images/emoji/facebook_messenger/raised_back_of_hand/2.png and b/public/images/emoji/facebook_messenger/raised_back_of_hand/2.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_back_of_hand/3.png b/public/images/emoji/facebook_messenger/raised_back_of_hand/3.png
index 527e2055be7..c0475b7eb69 100644
Binary files a/public/images/emoji/facebook_messenger/raised_back_of_hand/3.png and b/public/images/emoji/facebook_messenger/raised_back_of_hand/3.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_back_of_hand/4.png b/public/images/emoji/facebook_messenger/raised_back_of_hand/4.png
index 35a4c34bc74..160b1392bb7 100644
Binary files a/public/images/emoji/facebook_messenger/raised_back_of_hand/4.png and b/public/images/emoji/facebook_messenger/raised_back_of_hand/4.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_back_of_hand/5.png b/public/images/emoji/facebook_messenger/raised_back_of_hand/5.png
index 3a75748ef90..2bff5ba4944 100644
Binary files a/public/images/emoji/facebook_messenger/raised_back_of_hand/5.png and b/public/images/emoji/facebook_messenger/raised_back_of_hand/5.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_back_of_hand/6.png b/public/images/emoji/facebook_messenger/raised_back_of_hand/6.png
index db1c8f050cf..1ee0d693d8d 100644
Binary files a/public/images/emoji/facebook_messenger/raised_back_of_hand/6.png and b/public/images/emoji/facebook_messenger/raised_back_of_hand/6.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand.png b/public/images/emoji/facebook_messenger/raised_hand.png
index a0097d9b71a..17f858c2fa8 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand.png and b/public/images/emoji/facebook_messenger/raised_hand.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand/2.png b/public/images/emoji/facebook_messenger/raised_hand/2.png
index d23202d6c36..8a4a4e6f847 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand/2.png and b/public/images/emoji/facebook_messenger/raised_hand/2.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand/3.png b/public/images/emoji/facebook_messenger/raised_hand/3.png
index 7ff91aea009..8dd6e6e7095 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand/3.png and b/public/images/emoji/facebook_messenger/raised_hand/3.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand/4.png b/public/images/emoji/facebook_messenger/raised_hand/4.png
index 635801f6479..93dcc99aeee 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand/4.png and b/public/images/emoji/facebook_messenger/raised_hand/4.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand/5.png b/public/images/emoji/facebook_messenger/raised_hand/5.png
index 63bc01077e0..dbf83f95236 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand/5.png and b/public/images/emoji/facebook_messenger/raised_hand/5.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand/6.png b/public/images/emoji/facebook_messenger/raised_hand/6.png
index 244c30c3821..05c48ac0bb6 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand/6.png and b/public/images/emoji/facebook_messenger/raised_hand/6.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed.png b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed.png
index f41f01af47b..600cb22c58f 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed.png and b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/2.png b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/2.png
index 37a9048ad78..0550a92fe4a 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/2.png and b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/2.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/3.png b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/3.png
index 6ddd74b5862..ed89af340fe 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/3.png and b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/3.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/4.png b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/4.png
index 1d901925fe9..6318255a294 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/4.png and b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/4.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/5.png b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/5.png
index 5fcac72a703..6ce8d07a141 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/5.png and b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/5.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/6.png b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/6.png
index 74fa972cade..d382007e54f 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/6.png and b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/6.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers.png b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers.png
index 62459294572..af49237861b 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers.png and b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/2.png b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/2.png
index 5cdfab6d9a3..125b8d015ee 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/2.png and b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/2.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/3.png b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/3.png
index a469f9b420e..193de9bcedc 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/3.png and b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/3.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/4.png b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/4.png
index a8803b88169..51453315d74 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/4.png and b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/4.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/5.png b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/5.png
index 2d9def823e5..444ed219e96 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/5.png and b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/5.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/6.png b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/6.png
index bbcb6dc0d34..a4b6672c649 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/6.png and b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/6.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hands.png b/public/images/emoji/facebook_messenger/raised_hands.png
index c162e955583..4bdb955cc56 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hands.png and b/public/images/emoji/facebook_messenger/raised_hands.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hands/2.png b/public/images/emoji/facebook_messenger/raised_hands/2.png
index ba129063104..34cc85cede4 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hands/2.png and b/public/images/emoji/facebook_messenger/raised_hands/2.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hands/3.png b/public/images/emoji/facebook_messenger/raised_hands/3.png
index e377f7180f9..21bddf28cd5 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hands/3.png and b/public/images/emoji/facebook_messenger/raised_hands/3.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hands/4.png b/public/images/emoji/facebook_messenger/raised_hands/4.png
index 79139782eaf..2b124dcda93 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hands/4.png and b/public/images/emoji/facebook_messenger/raised_hands/4.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hands/5.png b/public/images/emoji/facebook_messenger/raised_hands/5.png
index b7ae99b4c53..c9112c05a64 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hands/5.png and b/public/images/emoji/facebook_messenger/raised_hands/5.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hands/6.png b/public/images/emoji/facebook_messenger/raised_hands/6.png
index 15dc25b2b2a..a0642e5b15b 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hands/6.png and b/public/images/emoji/facebook_messenger/raised_hands/6.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand.png b/public/images/emoji/facebook_messenger/raising_hand.png
index 0a94688c881..1e03e1bde12 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand.png and b/public/images/emoji/facebook_messenger/raising_hand.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand/2.png b/public/images/emoji/facebook_messenger/raising_hand/2.png
index 342d6fafd01..400080c70e4 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand/2.png and b/public/images/emoji/facebook_messenger/raising_hand/2.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand/3.png b/public/images/emoji/facebook_messenger/raising_hand/3.png
index 6a27504e81f..347e5f871e2 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand/3.png and b/public/images/emoji/facebook_messenger/raising_hand/3.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand/4.png b/public/images/emoji/facebook_messenger/raising_hand/4.png
index daa638dc6a5..20a6a4c9b36 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand/4.png and b/public/images/emoji/facebook_messenger/raising_hand/4.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand/5.png b/public/images/emoji/facebook_messenger/raising_hand/5.png
index 457f7ed4c50..059d3028794 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand/5.png and b/public/images/emoji/facebook_messenger/raising_hand/5.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand/6.png b/public/images/emoji/facebook_messenger/raising_hand/6.png
index 1d3bc70cc98..ae530be026a 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand/6.png and b/public/images/emoji/facebook_messenger/raising_hand/6.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_man.png b/public/images/emoji/facebook_messenger/raising_hand_man.png
index 888c2e010f1..cf96d698db8 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand_man.png and b/public/images/emoji/facebook_messenger/raising_hand_man.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_man/2.png b/public/images/emoji/facebook_messenger/raising_hand_man/2.png
index 358c2c878bd..f61b7a8f535 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand_man/2.png and b/public/images/emoji/facebook_messenger/raising_hand_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_man/3.png b/public/images/emoji/facebook_messenger/raising_hand_man/3.png
index ebe5b4b0eb9..d94d91daad1 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand_man/3.png and b/public/images/emoji/facebook_messenger/raising_hand_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_man/4.png b/public/images/emoji/facebook_messenger/raising_hand_man/4.png
index a2d3d552bbf..546d3143609 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand_man/4.png and b/public/images/emoji/facebook_messenger/raising_hand_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_man/5.png b/public/images/emoji/facebook_messenger/raising_hand_man/5.png
index 385867923f6..00499a04c62 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand_man/5.png and b/public/images/emoji/facebook_messenger/raising_hand_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_man/6.png b/public/images/emoji/facebook_messenger/raising_hand_man/6.png
index 21a811c9976..8adb5702f58 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand_man/6.png and b/public/images/emoji/facebook_messenger/raising_hand_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_woman.png b/public/images/emoji/facebook_messenger/raising_hand_woman.png
index 0a94688c881..1e03e1bde12 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand_woman.png and b/public/images/emoji/facebook_messenger/raising_hand_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_woman/2.png b/public/images/emoji/facebook_messenger/raising_hand_woman/2.png
index 342d6fafd01..400080c70e4 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand_woman/2.png and b/public/images/emoji/facebook_messenger/raising_hand_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_woman/3.png b/public/images/emoji/facebook_messenger/raising_hand_woman/3.png
index 6a27504e81f..347e5f871e2 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand_woman/3.png and b/public/images/emoji/facebook_messenger/raising_hand_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_woman/4.png b/public/images/emoji/facebook_messenger/raising_hand_woman/4.png
index daa638dc6a5..20a6a4c9b36 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand_woman/4.png and b/public/images/emoji/facebook_messenger/raising_hand_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_woman/5.png b/public/images/emoji/facebook_messenger/raising_hand_woman/5.png
index 457f7ed4c50..059d3028794 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand_woman/5.png and b/public/images/emoji/facebook_messenger/raising_hand_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_woman/6.png b/public/images/emoji/facebook_messenger/raising_hand_woman/6.png
index 1d3bc70cc98..ae530be026a 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand_woman/6.png and b/public/images/emoji/facebook_messenger/raising_hand_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/ram.png b/public/images/emoji/facebook_messenger/ram.png
index 4b0dd9f559a..112d5fe61ae 100644
Binary files a/public/images/emoji/facebook_messenger/ram.png and b/public/images/emoji/facebook_messenger/ram.png differ
diff --git a/public/images/emoji/facebook_messenger/ramen.png b/public/images/emoji/facebook_messenger/ramen.png
index 19d41b3efec..d9f74704a96 100644
Binary files a/public/images/emoji/facebook_messenger/ramen.png and b/public/images/emoji/facebook_messenger/ramen.png differ
diff --git a/public/images/emoji/facebook_messenger/rat.png b/public/images/emoji/facebook_messenger/rat.png
index 54c84f57786..6178f5c85ba 100644
Binary files a/public/images/emoji/facebook_messenger/rat.png and b/public/images/emoji/facebook_messenger/rat.png differ
diff --git a/public/images/emoji/facebook_messenger/record_button.png b/public/images/emoji/facebook_messenger/record_button.png
index 9015b0fde15..b876f26aeab 100644
Binary files a/public/images/emoji/facebook_messenger/record_button.png and b/public/images/emoji/facebook_messenger/record_button.png differ
diff --git a/public/images/emoji/facebook_messenger/recycle.png b/public/images/emoji/facebook_messenger/recycle.png
index aa374a2d34e..79627cb74de 100644
Binary files a/public/images/emoji/facebook_messenger/recycle.png and b/public/images/emoji/facebook_messenger/recycle.png differ
diff --git a/public/images/emoji/facebook_messenger/red_car.png b/public/images/emoji/facebook_messenger/red_car.png
index 15024a56bd0..8f5d52b2495 100644
Binary files a/public/images/emoji/facebook_messenger/red_car.png and b/public/images/emoji/facebook_messenger/red_car.png differ
diff --git a/public/images/emoji/facebook_messenger/red_circle.png b/public/images/emoji/facebook_messenger/red_circle.png
index fef186ba910..381aa5eae28 100644
Binary files a/public/images/emoji/facebook_messenger/red_circle.png and b/public/images/emoji/facebook_messenger/red_circle.png differ
diff --git a/public/images/emoji/facebook_messenger/registered.png b/public/images/emoji/facebook_messenger/registered.png
index b2242fe470b..aaa5b08f6f2 100644
Binary files a/public/images/emoji/facebook_messenger/registered.png and b/public/images/emoji/facebook_messenger/registered.png differ
diff --git a/public/images/emoji/facebook_messenger/relaxed.png b/public/images/emoji/facebook_messenger/relaxed.png
index 749a05960d4..a22687bafc8 100644
Binary files a/public/images/emoji/facebook_messenger/relaxed.png and b/public/images/emoji/facebook_messenger/relaxed.png differ
diff --git a/public/images/emoji/facebook_messenger/relieved.png b/public/images/emoji/facebook_messenger/relieved.png
index faceb08c806..8e7ec320472 100644
Binary files a/public/images/emoji/facebook_messenger/relieved.png and b/public/images/emoji/facebook_messenger/relieved.png differ
diff --git a/public/images/emoji/facebook_messenger/reminder_ribbon.png b/public/images/emoji/facebook_messenger/reminder_ribbon.png
index 09d8d0e3081..0375adc7c0c 100644
Binary files a/public/images/emoji/facebook_messenger/reminder_ribbon.png and b/public/images/emoji/facebook_messenger/reminder_ribbon.png differ
diff --git a/public/images/emoji/facebook_messenger/repeat.png b/public/images/emoji/facebook_messenger/repeat.png
index 73597ff253f..449fbd98528 100644
Binary files a/public/images/emoji/facebook_messenger/repeat.png and b/public/images/emoji/facebook_messenger/repeat.png differ
diff --git a/public/images/emoji/facebook_messenger/repeat_one.png b/public/images/emoji/facebook_messenger/repeat_one.png
index 832543f62da..cd67c1061e6 100644
Binary files a/public/images/emoji/facebook_messenger/repeat_one.png and b/public/images/emoji/facebook_messenger/repeat_one.png differ
diff --git a/public/images/emoji/facebook_messenger/rescue_worker_helmet.png b/public/images/emoji/facebook_messenger/rescue_worker_helmet.png
index ad220c2eefe..959efb0fb0a 100644
Binary files a/public/images/emoji/facebook_messenger/rescue_worker_helmet.png and b/public/images/emoji/facebook_messenger/rescue_worker_helmet.png differ
diff --git a/public/images/emoji/facebook_messenger/restroom.png b/public/images/emoji/facebook_messenger/restroom.png
index 9322abb6bfa..d6bbaeb20c2 100644
Binary files a/public/images/emoji/facebook_messenger/restroom.png and b/public/images/emoji/facebook_messenger/restroom.png differ
diff --git a/public/images/emoji/facebook_messenger/reunion.png b/public/images/emoji/facebook_messenger/reunion.png
index 1679d4c5b9c..6104c8cbe6e 100644
Binary files a/public/images/emoji/facebook_messenger/reunion.png and b/public/images/emoji/facebook_messenger/reunion.png differ
diff --git a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended.png b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended.png
index 8e7fce2f49b..7f227d2d232 100644
Binary files a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended.png and b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended.png differ
diff --git a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/2.png b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/2.png
index 992338bb2b6..14c75b484fb 100644
Binary files a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/2.png and b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/2.png differ
diff --git a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/3.png b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/3.png
index aadc06129fe..e403a196a5c 100644
Binary files a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/3.png and b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/3.png differ
diff --git a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/4.png b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/4.png
index 8ad10be1169..d8507a7f628 100644
Binary files a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/4.png and b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/4.png differ
diff --git a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/5.png b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/5.png
index 695c4a6cb9c..e67c93cb2a4 100644
Binary files a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/5.png and b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/5.png differ
diff --git a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/6.png b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/6.png
index 3457e01312c..c3bd0d882f6 100644
Binary files a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/6.png and b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/6.png differ
diff --git a/public/images/emoji/facebook_messenger/revolving_hearts.png b/public/images/emoji/facebook_messenger/revolving_hearts.png
index 9a6f39ef710..f9ce2123489 100644
Binary files a/public/images/emoji/facebook_messenger/revolving_hearts.png and b/public/images/emoji/facebook_messenger/revolving_hearts.png differ
diff --git a/public/images/emoji/facebook_messenger/rewind.png b/public/images/emoji/facebook_messenger/rewind.png
index 685f57f86cd..4dac9537684 100644
Binary files a/public/images/emoji/facebook_messenger/rewind.png and b/public/images/emoji/facebook_messenger/rewind.png differ
diff --git a/public/images/emoji/facebook_messenger/rhinoceros.png b/public/images/emoji/facebook_messenger/rhinoceros.png
index e81681a6031..9e5f1a55f4e 100644
Binary files a/public/images/emoji/facebook_messenger/rhinoceros.png and b/public/images/emoji/facebook_messenger/rhinoceros.png differ
diff --git a/public/images/emoji/facebook_messenger/ribbon.png b/public/images/emoji/facebook_messenger/ribbon.png
index 2a236f2a138..1a031384e00 100644
Binary files a/public/images/emoji/facebook_messenger/ribbon.png and b/public/images/emoji/facebook_messenger/ribbon.png differ
diff --git a/public/images/emoji/facebook_messenger/rice.png b/public/images/emoji/facebook_messenger/rice.png
index 60de4a64f27..fcf702b5677 100644
Binary files a/public/images/emoji/facebook_messenger/rice.png and b/public/images/emoji/facebook_messenger/rice.png differ
diff --git a/public/images/emoji/facebook_messenger/rice_ball.png b/public/images/emoji/facebook_messenger/rice_ball.png
index 13a97cc4ef4..660f25d854e 100644
Binary files a/public/images/emoji/facebook_messenger/rice_ball.png and b/public/images/emoji/facebook_messenger/rice_ball.png differ
diff --git a/public/images/emoji/facebook_messenger/rice_cracker.png b/public/images/emoji/facebook_messenger/rice_cracker.png
index ad821b75758..d366fe9c830 100644
Binary files a/public/images/emoji/facebook_messenger/rice_cracker.png and b/public/images/emoji/facebook_messenger/rice_cracker.png differ
diff --git a/public/images/emoji/facebook_messenger/rice_scene.png b/public/images/emoji/facebook_messenger/rice_scene.png
index a9ff32238aa..e54a58e2044 100644
Binary files a/public/images/emoji/facebook_messenger/rice_scene.png and b/public/images/emoji/facebook_messenger/rice_scene.png differ
diff --git a/public/images/emoji/facebook_messenger/right_anger_bubble.png b/public/images/emoji/facebook_messenger/right_anger_bubble.png
index 3d3ee7dcfad..c9f3e48c81d 100644
Binary files a/public/images/emoji/facebook_messenger/right_anger_bubble.png and b/public/images/emoji/facebook_messenger/right_anger_bubble.png differ
diff --git a/public/images/emoji/facebook_messenger/ring.png b/public/images/emoji/facebook_messenger/ring.png
index 88f8ad512b3..226998089e3 100644
Binary files a/public/images/emoji/facebook_messenger/ring.png and b/public/images/emoji/facebook_messenger/ring.png differ
diff --git a/public/images/emoji/facebook_messenger/robot.png b/public/images/emoji/facebook_messenger/robot.png
index c728ecf9c1a..9d5170fb7fa 100644
Binary files a/public/images/emoji/facebook_messenger/robot.png and b/public/images/emoji/facebook_messenger/robot.png differ
diff --git a/public/images/emoji/facebook_messenger/robot_face.png b/public/images/emoji/facebook_messenger/robot_face.png
index c728ecf9c1a..9d5170fb7fa 100644
Binary files a/public/images/emoji/facebook_messenger/robot_face.png and b/public/images/emoji/facebook_messenger/robot_face.png differ
diff --git a/public/images/emoji/facebook_messenger/rocket.png b/public/images/emoji/facebook_messenger/rocket.png
index 518c778f8b8..00b96d3c7d1 100644
Binary files a/public/images/emoji/facebook_messenger/rocket.png and b/public/images/emoji/facebook_messenger/rocket.png differ
diff --git a/public/images/emoji/facebook_messenger/rofl.png b/public/images/emoji/facebook_messenger/rofl.png
index ab648dd83df..7e75f50e65f 100644
Binary files a/public/images/emoji/facebook_messenger/rofl.png and b/public/images/emoji/facebook_messenger/rofl.png differ
diff --git a/public/images/emoji/facebook_messenger/roll_eyes.png b/public/images/emoji/facebook_messenger/roll_eyes.png
index 8a864a00bdf..06b96d4c457 100644
Binary files a/public/images/emoji/facebook_messenger/roll_eyes.png and b/public/images/emoji/facebook_messenger/roll_eyes.png differ
diff --git a/public/images/emoji/facebook_messenger/rolled_up_newspaper.png b/public/images/emoji/facebook_messenger/rolled_up_newspaper.png
index 052dcce75f0..785c9d17670 100644
Binary files a/public/images/emoji/facebook_messenger/rolled_up_newspaper.png and b/public/images/emoji/facebook_messenger/rolled_up_newspaper.png differ
diff --git a/public/images/emoji/facebook_messenger/roller_coaster.png b/public/images/emoji/facebook_messenger/roller_coaster.png
index 1d1919e0cd9..8523147fc42 100644
Binary files a/public/images/emoji/facebook_messenger/roller_coaster.png and b/public/images/emoji/facebook_messenger/roller_coaster.png differ
diff --git a/public/images/emoji/facebook_messenger/rolling_eyes.png b/public/images/emoji/facebook_messenger/rolling_eyes.png
index 8a864a00bdf..06b96d4c457 100644
Binary files a/public/images/emoji/facebook_messenger/rolling_eyes.png and b/public/images/emoji/facebook_messenger/rolling_eyes.png differ
diff --git a/public/images/emoji/facebook_messenger/romania.png b/public/images/emoji/facebook_messenger/romania.png
index 2b163248784..7b7ea9a3fef 100644
Binary files a/public/images/emoji/facebook_messenger/romania.png and b/public/images/emoji/facebook_messenger/romania.png differ
diff --git a/public/images/emoji/facebook_messenger/rooster.png b/public/images/emoji/facebook_messenger/rooster.png
index 33608158147..d07cd892439 100644
Binary files a/public/images/emoji/facebook_messenger/rooster.png and b/public/images/emoji/facebook_messenger/rooster.png differ
diff --git a/public/images/emoji/facebook_messenger/rose.png b/public/images/emoji/facebook_messenger/rose.png
index be7bcb7ae7c..11e4246a1c6 100644
Binary files a/public/images/emoji/facebook_messenger/rose.png and b/public/images/emoji/facebook_messenger/rose.png differ
diff --git a/public/images/emoji/facebook_messenger/rosette.png b/public/images/emoji/facebook_messenger/rosette.png
index b21ae33e63b..732127dac64 100644
Binary files a/public/images/emoji/facebook_messenger/rosette.png and b/public/images/emoji/facebook_messenger/rosette.png differ
diff --git a/public/images/emoji/facebook_messenger/rotating_light.png b/public/images/emoji/facebook_messenger/rotating_light.png
index a6ac22f351d..a11a19e8cc0 100644
Binary files a/public/images/emoji/facebook_messenger/rotating_light.png and b/public/images/emoji/facebook_messenger/rotating_light.png differ
diff --git a/public/images/emoji/facebook_messenger/round_pushpin.png b/public/images/emoji/facebook_messenger/round_pushpin.png
index 35ccf8b9436..28b4cb9e2ae 100644
Binary files a/public/images/emoji/facebook_messenger/round_pushpin.png and b/public/images/emoji/facebook_messenger/round_pushpin.png differ
diff --git a/public/images/emoji/facebook_messenger/rowboat.png b/public/images/emoji/facebook_messenger/rowboat.png
index 7b73bd927a7..1c1a5704b6f 100644
Binary files a/public/images/emoji/facebook_messenger/rowboat.png and b/public/images/emoji/facebook_messenger/rowboat.png differ
diff --git a/public/images/emoji/facebook_messenger/rowboat/2.png b/public/images/emoji/facebook_messenger/rowboat/2.png
new file mode 100644
index 00000000000..31315712866
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rowboat/2.png differ
diff --git a/public/images/emoji/facebook_messenger/rowboat/3.png b/public/images/emoji/facebook_messenger/rowboat/3.png
new file mode 100644
index 00000000000..d3ac9aa6c7c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rowboat/3.png differ
diff --git a/public/images/emoji/facebook_messenger/rowboat/4.png b/public/images/emoji/facebook_messenger/rowboat/4.png
new file mode 100644
index 00000000000..0d7547330b5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rowboat/4.png differ
diff --git a/public/images/emoji/facebook_messenger/rowboat/5.png b/public/images/emoji/facebook_messenger/rowboat/5.png
new file mode 100644
index 00000000000..6031915acca
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rowboat/5.png differ
diff --git a/public/images/emoji/facebook_messenger/rowboat/6.png b/public/images/emoji/facebook_messenger/rowboat/6.png
new file mode 100644
index 00000000000..30615bee854
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rowboat/6.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_man.png b/public/images/emoji/facebook_messenger/rowing_man.png
index 7b73bd927a7..1c1a5704b6f 100644
Binary files a/public/images/emoji/facebook_messenger/rowing_man.png and b/public/images/emoji/facebook_messenger/rowing_man.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_man/2.png b/public/images/emoji/facebook_messenger/rowing_man/2.png
new file mode 100644
index 00000000000..31315712866
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rowing_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_man/3.png b/public/images/emoji/facebook_messenger/rowing_man/3.png
new file mode 100644
index 00000000000..d3ac9aa6c7c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rowing_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_man/4.png b/public/images/emoji/facebook_messenger/rowing_man/4.png
new file mode 100644
index 00000000000..0d7547330b5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rowing_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_man/5.png b/public/images/emoji/facebook_messenger/rowing_man/5.png
new file mode 100644
index 00000000000..6031915acca
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rowing_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_man/6.png b/public/images/emoji/facebook_messenger/rowing_man/6.png
new file mode 100644
index 00000000000..30615bee854
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rowing_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_woman.png b/public/images/emoji/facebook_messenger/rowing_woman.png
index 621b0acc040..d81db325149 100644
Binary files a/public/images/emoji/facebook_messenger/rowing_woman.png and b/public/images/emoji/facebook_messenger/rowing_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_woman/2.png b/public/images/emoji/facebook_messenger/rowing_woman/2.png
index 0bee4147be6..12f847664ad 100644
Binary files a/public/images/emoji/facebook_messenger/rowing_woman/2.png and b/public/images/emoji/facebook_messenger/rowing_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_woman/3.png b/public/images/emoji/facebook_messenger/rowing_woman/3.png
index f51db263218..6aa5e552ac1 100644
Binary files a/public/images/emoji/facebook_messenger/rowing_woman/3.png and b/public/images/emoji/facebook_messenger/rowing_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_woman/4.png b/public/images/emoji/facebook_messenger/rowing_woman/4.png
index e61c949d0d6..5bc95b3cd1a 100644
Binary files a/public/images/emoji/facebook_messenger/rowing_woman/4.png and b/public/images/emoji/facebook_messenger/rowing_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_woman/5.png b/public/images/emoji/facebook_messenger/rowing_woman/5.png
index b21bb84ca6f..f6f2e002046 100644
Binary files a/public/images/emoji/facebook_messenger/rowing_woman/5.png and b/public/images/emoji/facebook_messenger/rowing_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_woman/6.png b/public/images/emoji/facebook_messenger/rowing_woman/6.png
index cc2a55e7672..51574e6f1bd 100644
Binary files a/public/images/emoji/facebook_messenger/rowing_woman/6.png and b/public/images/emoji/facebook_messenger/rowing_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/ru.png b/public/images/emoji/facebook_messenger/ru.png
index f3932d9f3cc..89692b70ef6 100644
Binary files a/public/images/emoji/facebook_messenger/ru.png and b/public/images/emoji/facebook_messenger/ru.png differ
diff --git a/public/images/emoji/facebook_messenger/rugby_football.png b/public/images/emoji/facebook_messenger/rugby_football.png
index 6ce225a2ec4..21cde2c8677 100644
Binary files a/public/images/emoji/facebook_messenger/rugby_football.png and b/public/images/emoji/facebook_messenger/rugby_football.png differ
diff --git a/public/images/emoji/facebook_messenger/runner.png b/public/images/emoji/facebook_messenger/runner.png
index d1db4d17965..046d9b5ae69 100644
Binary files a/public/images/emoji/facebook_messenger/runner.png and b/public/images/emoji/facebook_messenger/runner.png differ
diff --git a/public/images/emoji/facebook_messenger/runner/2.png b/public/images/emoji/facebook_messenger/runner/2.png
index d45b1ccb14b..0492c8fffcb 100644
Binary files a/public/images/emoji/facebook_messenger/runner/2.png and b/public/images/emoji/facebook_messenger/runner/2.png differ
diff --git a/public/images/emoji/facebook_messenger/runner/3.png b/public/images/emoji/facebook_messenger/runner/3.png
index 67bb67e9797..1b7bd5d0692 100644
Binary files a/public/images/emoji/facebook_messenger/runner/3.png and b/public/images/emoji/facebook_messenger/runner/3.png differ
diff --git a/public/images/emoji/facebook_messenger/runner/4.png b/public/images/emoji/facebook_messenger/runner/4.png
index da3404f1357..0f25ac7d6ae 100644
Binary files a/public/images/emoji/facebook_messenger/runner/4.png and b/public/images/emoji/facebook_messenger/runner/4.png differ
diff --git a/public/images/emoji/facebook_messenger/runner/5.png b/public/images/emoji/facebook_messenger/runner/5.png
index 02b731334ac..47623d1de72 100644
Binary files a/public/images/emoji/facebook_messenger/runner/5.png and b/public/images/emoji/facebook_messenger/runner/5.png differ
diff --git a/public/images/emoji/facebook_messenger/runner/6.png b/public/images/emoji/facebook_messenger/runner/6.png
index 0a0dcc7d844..13b236ea664 100644
Binary files a/public/images/emoji/facebook_messenger/runner/6.png and b/public/images/emoji/facebook_messenger/runner/6.png differ
diff --git a/public/images/emoji/facebook_messenger/running_man.png b/public/images/emoji/facebook_messenger/running_man.png
index d1db4d17965..046d9b5ae69 100644
Binary files a/public/images/emoji/facebook_messenger/running_man.png and b/public/images/emoji/facebook_messenger/running_man.png differ
diff --git a/public/images/emoji/facebook_messenger/running_man/2.png b/public/images/emoji/facebook_messenger/running_man/2.png
index d45b1ccb14b..0492c8fffcb 100644
Binary files a/public/images/emoji/facebook_messenger/running_man/2.png and b/public/images/emoji/facebook_messenger/running_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/running_man/3.png b/public/images/emoji/facebook_messenger/running_man/3.png
index 67bb67e9797..1b7bd5d0692 100644
Binary files a/public/images/emoji/facebook_messenger/running_man/3.png and b/public/images/emoji/facebook_messenger/running_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/running_man/4.png b/public/images/emoji/facebook_messenger/running_man/4.png
index da3404f1357..0f25ac7d6ae 100644
Binary files a/public/images/emoji/facebook_messenger/running_man/4.png and b/public/images/emoji/facebook_messenger/running_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/running_man/5.png b/public/images/emoji/facebook_messenger/running_man/5.png
index 02b731334ac..47623d1de72 100644
Binary files a/public/images/emoji/facebook_messenger/running_man/5.png and b/public/images/emoji/facebook_messenger/running_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/running_man/6.png b/public/images/emoji/facebook_messenger/running_man/6.png
index 0a0dcc7d844..13b236ea664 100644
Binary files a/public/images/emoji/facebook_messenger/running_man/6.png and b/public/images/emoji/facebook_messenger/running_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/running_shirt_with_sash.png b/public/images/emoji/facebook_messenger/running_shirt_with_sash.png
index 960b63b65b2..a513c91a734 100644
Binary files a/public/images/emoji/facebook_messenger/running_shirt_with_sash.png and b/public/images/emoji/facebook_messenger/running_shirt_with_sash.png differ
diff --git a/public/images/emoji/facebook_messenger/running_woman.png b/public/images/emoji/facebook_messenger/running_woman.png
index 01418f1a8da..d2e300af47b 100644
Binary files a/public/images/emoji/facebook_messenger/running_woman.png and b/public/images/emoji/facebook_messenger/running_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/running_woman/2.png b/public/images/emoji/facebook_messenger/running_woman/2.png
index cde0a287031..951aa8aa1f3 100644
Binary files a/public/images/emoji/facebook_messenger/running_woman/2.png and b/public/images/emoji/facebook_messenger/running_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/running_woman/3.png b/public/images/emoji/facebook_messenger/running_woman/3.png
index a9b8ba20cec..114b6ef06ae 100644
Binary files a/public/images/emoji/facebook_messenger/running_woman/3.png and b/public/images/emoji/facebook_messenger/running_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/running_woman/4.png b/public/images/emoji/facebook_messenger/running_woman/4.png
index e14cb3884a9..d660a4234c1 100644
Binary files a/public/images/emoji/facebook_messenger/running_woman/4.png and b/public/images/emoji/facebook_messenger/running_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/running_woman/5.png b/public/images/emoji/facebook_messenger/running_woman/5.png
index 54b0cb838b2..ce17b899ad3 100644
Binary files a/public/images/emoji/facebook_messenger/running_woman/5.png and b/public/images/emoji/facebook_messenger/running_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/running_woman/6.png b/public/images/emoji/facebook_messenger/running_woman/6.png
index 114138c0b68..fcd3eb33499 100644
Binary files a/public/images/emoji/facebook_messenger/running_woman/6.png and b/public/images/emoji/facebook_messenger/running_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/rwanda.png b/public/images/emoji/facebook_messenger/rwanda.png
index a45a988ff58..fa02c79c7cd 100644
Binary files a/public/images/emoji/facebook_messenger/rwanda.png and b/public/images/emoji/facebook_messenger/rwanda.png differ
diff --git a/public/images/emoji/facebook_messenger/sa.png b/public/images/emoji/facebook_messenger/sa.png
index 67fffa68f83..4d0d6162a30 100644
Binary files a/public/images/emoji/facebook_messenger/sa.png and b/public/images/emoji/facebook_messenger/sa.png differ
diff --git a/public/images/emoji/facebook_messenger/sagittarius.png b/public/images/emoji/facebook_messenger/sagittarius.png
index d8580b190b2..d834fda81f4 100644
Binary files a/public/images/emoji/facebook_messenger/sagittarius.png and b/public/images/emoji/facebook_messenger/sagittarius.png differ
diff --git a/public/images/emoji/facebook_messenger/sailboat.png b/public/images/emoji/facebook_messenger/sailboat.png
index 73cb6717ef4..7ec6f21e9b7 100644
Binary files a/public/images/emoji/facebook_messenger/sailboat.png and b/public/images/emoji/facebook_messenger/sailboat.png differ
diff --git a/public/images/emoji/facebook_messenger/sake.png b/public/images/emoji/facebook_messenger/sake.png
index 7e9b170b68a..1017b9015bb 100644
Binary files a/public/images/emoji/facebook_messenger/sake.png and b/public/images/emoji/facebook_messenger/sake.png differ
diff --git a/public/images/emoji/facebook_messenger/samoa.png b/public/images/emoji/facebook_messenger/samoa.png
index de81c048d01..294802b0a1a 100644
Binary files a/public/images/emoji/facebook_messenger/samoa.png and b/public/images/emoji/facebook_messenger/samoa.png differ
diff --git a/public/images/emoji/facebook_messenger/san_marino.png b/public/images/emoji/facebook_messenger/san_marino.png
index fa20a008086..b5d217c0643 100644
Binary files a/public/images/emoji/facebook_messenger/san_marino.png and b/public/images/emoji/facebook_messenger/san_marino.png differ
diff --git a/public/images/emoji/facebook_messenger/sandal.png b/public/images/emoji/facebook_messenger/sandal.png
index f48e7f3a235..2d306464900 100644
Binary files a/public/images/emoji/facebook_messenger/sandal.png and b/public/images/emoji/facebook_messenger/sandal.png differ
diff --git a/public/images/emoji/facebook_messenger/sandwich.png b/public/images/emoji/facebook_messenger/sandwich.png
index ba3f9a1cdb7..7052154c7d6 100644
Binary files a/public/images/emoji/facebook_messenger/sandwich.png and b/public/images/emoji/facebook_messenger/sandwich.png differ
diff --git a/public/images/emoji/facebook_messenger/santa.png b/public/images/emoji/facebook_messenger/santa.png
index 4995fdca211..89485822581 100644
Binary files a/public/images/emoji/facebook_messenger/santa.png and b/public/images/emoji/facebook_messenger/santa.png differ
diff --git a/public/images/emoji/facebook_messenger/santa/2.png b/public/images/emoji/facebook_messenger/santa/2.png
index 5a6ef2f00d8..703b2b2f4be 100644
Binary files a/public/images/emoji/facebook_messenger/santa/2.png and b/public/images/emoji/facebook_messenger/santa/2.png differ
diff --git a/public/images/emoji/facebook_messenger/santa/3.png b/public/images/emoji/facebook_messenger/santa/3.png
index 52b0fb27059..ee1433a8f6e 100644
Binary files a/public/images/emoji/facebook_messenger/santa/3.png and b/public/images/emoji/facebook_messenger/santa/3.png differ
diff --git a/public/images/emoji/facebook_messenger/santa/4.png b/public/images/emoji/facebook_messenger/santa/4.png
index 6181e6ccc34..f4ee3b04f3f 100644
Binary files a/public/images/emoji/facebook_messenger/santa/4.png and b/public/images/emoji/facebook_messenger/santa/4.png differ
diff --git a/public/images/emoji/facebook_messenger/santa/5.png b/public/images/emoji/facebook_messenger/santa/5.png
index 215b68451d3..c977279e6dc 100644
Binary files a/public/images/emoji/facebook_messenger/santa/5.png and b/public/images/emoji/facebook_messenger/santa/5.png differ
diff --git a/public/images/emoji/facebook_messenger/santa/6.png b/public/images/emoji/facebook_messenger/santa/6.png
index 390a6a2550a..ede35701275 100644
Binary files a/public/images/emoji/facebook_messenger/santa/6.png and b/public/images/emoji/facebook_messenger/santa/6.png differ
diff --git a/public/images/emoji/facebook_messenger/sao_tome_principe.png b/public/images/emoji/facebook_messenger/sao_tome_principe.png
index bbfcbd18df3..3bb369a8863 100644
Binary files a/public/images/emoji/facebook_messenger/sao_tome_principe.png and b/public/images/emoji/facebook_messenger/sao_tome_principe.png differ
diff --git a/public/images/emoji/facebook_messenger/satellite.png b/public/images/emoji/facebook_messenger/satellite.png
index 48510c86cf5..f44c779fdbc 100644
Binary files a/public/images/emoji/facebook_messenger/satellite.png and b/public/images/emoji/facebook_messenger/satellite.png differ
diff --git a/public/images/emoji/facebook_messenger/satellite_orbital.png b/public/images/emoji/facebook_messenger/satellite_orbital.png
index 81715516af6..d50cf919548 100644
Binary files a/public/images/emoji/facebook_messenger/satellite_orbital.png and b/public/images/emoji/facebook_messenger/satellite_orbital.png differ
diff --git a/public/images/emoji/facebook_messenger/satisfied.png b/public/images/emoji/facebook_messenger/satisfied.png
index 68cbb0f1481..039f7f9d6d2 100644
Binary files a/public/images/emoji/facebook_messenger/satisfied.png and b/public/images/emoji/facebook_messenger/satisfied.png differ
diff --git a/public/images/emoji/facebook_messenger/saudi_arabia.png b/public/images/emoji/facebook_messenger/saudi_arabia.png
index dc3a6b29f60..338ee58ddfe 100644
Binary files a/public/images/emoji/facebook_messenger/saudi_arabia.png and b/public/images/emoji/facebook_messenger/saudi_arabia.png differ
diff --git a/public/images/emoji/facebook_messenger/sauropod.png b/public/images/emoji/facebook_messenger/sauropod.png
index 2f4d6199975..9643afaf9dc 100644
Binary files a/public/images/emoji/facebook_messenger/sauropod.png and b/public/images/emoji/facebook_messenger/sauropod.png differ
diff --git a/public/images/emoji/facebook_messenger/saxophone.png b/public/images/emoji/facebook_messenger/saxophone.png
index 8740f0d6883..3b93d50275d 100644
Binary files a/public/images/emoji/facebook_messenger/saxophone.png and b/public/images/emoji/facebook_messenger/saxophone.png differ
diff --git a/public/images/emoji/facebook_messenger/scales.png b/public/images/emoji/facebook_messenger/scales.png
index 75713abc23d..a9e4f53e97a 100644
Binary files a/public/images/emoji/facebook_messenger/scales.png and b/public/images/emoji/facebook_messenger/scales.png differ
diff --git a/public/images/emoji/facebook_messenger/scarf.png b/public/images/emoji/facebook_messenger/scarf.png
index 73653eee2bd..78c876e3c5d 100644
Binary files a/public/images/emoji/facebook_messenger/scarf.png and b/public/images/emoji/facebook_messenger/scarf.png differ
diff --git a/public/images/emoji/facebook_messenger/school.png b/public/images/emoji/facebook_messenger/school.png
index a5d6791d939..0fd055c3859 100644
Binary files a/public/images/emoji/facebook_messenger/school.png and b/public/images/emoji/facebook_messenger/school.png differ
diff --git a/public/images/emoji/facebook_messenger/school_satchel.png b/public/images/emoji/facebook_messenger/school_satchel.png
index cfc748f8652..b9b685cf625 100644
Binary files a/public/images/emoji/facebook_messenger/school_satchel.png and b/public/images/emoji/facebook_messenger/school_satchel.png differ
diff --git a/public/images/emoji/facebook_messenger/scissors.png b/public/images/emoji/facebook_messenger/scissors.png
index 546ee1babbc..2dbf8355e2d 100644
Binary files a/public/images/emoji/facebook_messenger/scissors.png and b/public/images/emoji/facebook_messenger/scissors.png differ
diff --git a/public/images/emoji/facebook_messenger/scorpion.png b/public/images/emoji/facebook_messenger/scorpion.png
index 2215d4642fd..1b3291654fe 100644
Binary files a/public/images/emoji/facebook_messenger/scorpion.png and b/public/images/emoji/facebook_messenger/scorpion.png differ
diff --git a/public/images/emoji/facebook_messenger/scorpius.png b/public/images/emoji/facebook_messenger/scorpius.png
index 22f33ac23b4..dbbb9d5fd94 100644
Binary files a/public/images/emoji/facebook_messenger/scorpius.png and b/public/images/emoji/facebook_messenger/scorpius.png differ
diff --git a/public/images/emoji/facebook_messenger/scream.png b/public/images/emoji/facebook_messenger/scream.png
index 76a4e2f5c71..37cb489464f 100644
Binary files a/public/images/emoji/facebook_messenger/scream.png and b/public/images/emoji/facebook_messenger/scream.png differ
diff --git a/public/images/emoji/facebook_messenger/scream_cat.png b/public/images/emoji/facebook_messenger/scream_cat.png
index 1ff4b8e92aa..5d23cfbc1eb 100644
Binary files a/public/images/emoji/facebook_messenger/scream_cat.png and b/public/images/emoji/facebook_messenger/scream_cat.png differ
diff --git a/public/images/emoji/facebook_messenger/scroll.png b/public/images/emoji/facebook_messenger/scroll.png
index 82c810dd5bc..f3aee23f12e 100644
Binary files a/public/images/emoji/facebook_messenger/scroll.png and b/public/images/emoji/facebook_messenger/scroll.png differ
diff --git a/public/images/emoji/facebook_messenger/seat.png b/public/images/emoji/facebook_messenger/seat.png
index 850e39dafe9..05ab633a3f8 100644
Binary files a/public/images/emoji/facebook_messenger/seat.png and b/public/images/emoji/facebook_messenger/seat.png differ
diff --git a/public/images/emoji/facebook_messenger/secret.png b/public/images/emoji/facebook_messenger/secret.png
index 652e4f7ca96..228ac6c33ce 100644
Binary files a/public/images/emoji/facebook_messenger/secret.png and b/public/images/emoji/facebook_messenger/secret.png differ
diff --git a/public/images/emoji/facebook_messenger/see_no_evil.png b/public/images/emoji/facebook_messenger/see_no_evil.png
index 3b73a085a88..95dd3c76d77 100644
Binary files a/public/images/emoji/facebook_messenger/see_no_evil.png and b/public/images/emoji/facebook_messenger/see_no_evil.png differ
diff --git a/public/images/emoji/facebook_messenger/seedling.png b/public/images/emoji/facebook_messenger/seedling.png
index 990126746a7..66f2bfabd76 100644
Binary files a/public/images/emoji/facebook_messenger/seedling.png and b/public/images/emoji/facebook_messenger/seedling.png differ
diff --git a/public/images/emoji/facebook_messenger/selfie.png b/public/images/emoji/facebook_messenger/selfie.png
index f6411e5444c..85482791df1 100644
Binary files a/public/images/emoji/facebook_messenger/selfie.png and b/public/images/emoji/facebook_messenger/selfie.png differ
diff --git a/public/images/emoji/facebook_messenger/selfie/2.png b/public/images/emoji/facebook_messenger/selfie/2.png
index 24a81ca396a..0e278a55456 100644
Binary files a/public/images/emoji/facebook_messenger/selfie/2.png and b/public/images/emoji/facebook_messenger/selfie/2.png differ
diff --git a/public/images/emoji/facebook_messenger/selfie/3.png b/public/images/emoji/facebook_messenger/selfie/3.png
index 712bc730000..96522950a51 100644
Binary files a/public/images/emoji/facebook_messenger/selfie/3.png and b/public/images/emoji/facebook_messenger/selfie/3.png differ
diff --git a/public/images/emoji/facebook_messenger/selfie/4.png b/public/images/emoji/facebook_messenger/selfie/4.png
index 77139915b79..71c3961ea7f 100644
Binary files a/public/images/emoji/facebook_messenger/selfie/4.png and b/public/images/emoji/facebook_messenger/selfie/4.png differ
diff --git a/public/images/emoji/facebook_messenger/selfie/5.png b/public/images/emoji/facebook_messenger/selfie/5.png
index f326d7825d1..c246ac059c7 100644
Binary files a/public/images/emoji/facebook_messenger/selfie/5.png and b/public/images/emoji/facebook_messenger/selfie/5.png differ
diff --git a/public/images/emoji/facebook_messenger/selfie/6.png b/public/images/emoji/facebook_messenger/selfie/6.png
index de9106c369f..f81cb0293cd 100644
Binary files a/public/images/emoji/facebook_messenger/selfie/6.png and b/public/images/emoji/facebook_messenger/selfie/6.png differ
diff --git a/public/images/emoji/facebook_messenger/senegal.png b/public/images/emoji/facebook_messenger/senegal.png
index 2d32427625a..6537571def9 100644
Binary files a/public/images/emoji/facebook_messenger/senegal.png and b/public/images/emoji/facebook_messenger/senegal.png differ
diff --git a/public/images/emoji/facebook_messenger/serbia.png b/public/images/emoji/facebook_messenger/serbia.png
index a7af1346e56..ffefd9cbbc2 100644
Binary files a/public/images/emoji/facebook_messenger/serbia.png and b/public/images/emoji/facebook_messenger/serbia.png differ
diff --git a/public/images/emoji/facebook_messenger/seven.png b/public/images/emoji/facebook_messenger/seven.png
index 967f9092615..dabca5cf612 100644
Binary files a/public/images/emoji/facebook_messenger/seven.png and b/public/images/emoji/facebook_messenger/seven.png differ
diff --git a/public/images/emoji/facebook_messenger/seychelles.png b/public/images/emoji/facebook_messenger/seychelles.png
index e69ca6add18..41e622e1ac1 100644
Binary files a/public/images/emoji/facebook_messenger/seychelles.png and b/public/images/emoji/facebook_messenger/seychelles.png differ
diff --git a/public/images/emoji/facebook_messenger/shallow_pan_of_food.png b/public/images/emoji/facebook_messenger/shallow_pan_of_food.png
index 300f700fcc4..6957af4a312 100644
Binary files a/public/images/emoji/facebook_messenger/shallow_pan_of_food.png and b/public/images/emoji/facebook_messenger/shallow_pan_of_food.png differ
diff --git a/public/images/emoji/facebook_messenger/shamrock.png b/public/images/emoji/facebook_messenger/shamrock.png
index dfad1cfc708..af8d5459bcc 100644
Binary files a/public/images/emoji/facebook_messenger/shamrock.png and b/public/images/emoji/facebook_messenger/shamrock.png differ
diff --git a/public/images/emoji/facebook_messenger/shark.png b/public/images/emoji/facebook_messenger/shark.png
index 856894743dd..1e85effc03f 100644
Binary files a/public/images/emoji/facebook_messenger/shark.png and b/public/images/emoji/facebook_messenger/shark.png differ
diff --git a/public/images/emoji/facebook_messenger/shaved_ice.png b/public/images/emoji/facebook_messenger/shaved_ice.png
index d00270a6629..83190071670 100644
Binary files a/public/images/emoji/facebook_messenger/shaved_ice.png and b/public/images/emoji/facebook_messenger/shaved_ice.png differ
diff --git a/public/images/emoji/facebook_messenger/sheep.png b/public/images/emoji/facebook_messenger/sheep.png
index c6deaa70632..af3e4fe23d8 100644
Binary files a/public/images/emoji/facebook_messenger/sheep.png and b/public/images/emoji/facebook_messenger/sheep.png differ
diff --git a/public/images/emoji/facebook_messenger/shell.png b/public/images/emoji/facebook_messenger/shell.png
index dd46b772a4b..6a3641d11d7 100644
Binary files a/public/images/emoji/facebook_messenger/shell.png and b/public/images/emoji/facebook_messenger/shell.png differ
diff --git a/public/images/emoji/facebook_messenger/shield.png b/public/images/emoji/facebook_messenger/shield.png
index 4fbc6a59153..18219f103f1 100644
Binary files a/public/images/emoji/facebook_messenger/shield.png and b/public/images/emoji/facebook_messenger/shield.png differ
diff --git a/public/images/emoji/facebook_messenger/shinto_shrine.png b/public/images/emoji/facebook_messenger/shinto_shrine.png
index 52c368a6a6f..b08ebea1555 100644
Binary files a/public/images/emoji/facebook_messenger/shinto_shrine.png and b/public/images/emoji/facebook_messenger/shinto_shrine.png differ
diff --git a/public/images/emoji/facebook_messenger/ship.png b/public/images/emoji/facebook_messenger/ship.png
index 80df6b31433..c51ac926ff2 100644
Binary files a/public/images/emoji/facebook_messenger/ship.png and b/public/images/emoji/facebook_messenger/ship.png differ
diff --git a/public/images/emoji/facebook_messenger/shirt.png b/public/images/emoji/facebook_messenger/shirt.png
index f24f758f681..27ba96bfa08 100644
Binary files a/public/images/emoji/facebook_messenger/shirt.png and b/public/images/emoji/facebook_messenger/shirt.png differ
diff --git a/public/images/emoji/facebook_messenger/shit.png b/public/images/emoji/facebook_messenger/shit.png
index e175a1dfffc..7c3e5199220 100644
Binary files a/public/images/emoji/facebook_messenger/shit.png and b/public/images/emoji/facebook_messenger/shit.png differ
diff --git a/public/images/emoji/facebook_messenger/shopping.png b/public/images/emoji/facebook_messenger/shopping.png
index ee15abd9933..872a4daba7a 100644
Binary files a/public/images/emoji/facebook_messenger/shopping.png and b/public/images/emoji/facebook_messenger/shopping.png differ
diff --git a/public/images/emoji/facebook_messenger/shopping_bags.png b/public/images/emoji/facebook_messenger/shopping_bags.png
index ee15abd9933..872a4daba7a 100644
Binary files a/public/images/emoji/facebook_messenger/shopping_bags.png and b/public/images/emoji/facebook_messenger/shopping_bags.png differ
diff --git a/public/images/emoji/facebook_messenger/shopping_cart.png b/public/images/emoji/facebook_messenger/shopping_cart.png
index 419cc70376a..6989a2a4cdc 100644
Binary files a/public/images/emoji/facebook_messenger/shopping_cart.png and b/public/images/emoji/facebook_messenger/shopping_cart.png differ
diff --git a/public/images/emoji/facebook_messenger/shower.png b/public/images/emoji/facebook_messenger/shower.png
index 1070d46a501..2e0a7b2d9ec 100644
Binary files a/public/images/emoji/facebook_messenger/shower.png and b/public/images/emoji/facebook_messenger/shower.png differ
diff --git a/public/images/emoji/facebook_messenger/shrimp.png b/public/images/emoji/facebook_messenger/shrimp.png
index e45d741b479..c04a8102965 100644
Binary files a/public/images/emoji/facebook_messenger/shrimp.png and b/public/images/emoji/facebook_messenger/shrimp.png differ
diff --git a/public/images/emoji/facebook_messenger/sierra_leone.png b/public/images/emoji/facebook_messenger/sierra_leone.png
index 816f090002a..f7235d0a41b 100644
Binary files a/public/images/emoji/facebook_messenger/sierra_leone.png and b/public/images/emoji/facebook_messenger/sierra_leone.png differ
diff --git a/public/images/emoji/facebook_messenger/sign_of_the_horns.png b/public/images/emoji/facebook_messenger/sign_of_the_horns.png
index 72d987aadc3..42ebf7a6e4d 100644
Binary files a/public/images/emoji/facebook_messenger/sign_of_the_horns.png and b/public/images/emoji/facebook_messenger/sign_of_the_horns.png differ
diff --git a/public/images/emoji/facebook_messenger/sign_of_the_horns/2.png b/public/images/emoji/facebook_messenger/sign_of_the_horns/2.png
index 8d87aab277f..f5b6ff33ee5 100644
Binary files a/public/images/emoji/facebook_messenger/sign_of_the_horns/2.png and b/public/images/emoji/facebook_messenger/sign_of_the_horns/2.png differ
diff --git a/public/images/emoji/facebook_messenger/sign_of_the_horns/3.png b/public/images/emoji/facebook_messenger/sign_of_the_horns/3.png
index 39a19cd401f..a4df883cbdb 100644
Binary files a/public/images/emoji/facebook_messenger/sign_of_the_horns/3.png and b/public/images/emoji/facebook_messenger/sign_of_the_horns/3.png differ
diff --git a/public/images/emoji/facebook_messenger/sign_of_the_horns/4.png b/public/images/emoji/facebook_messenger/sign_of_the_horns/4.png
index 73bedb2c022..0b59f79fddd 100644
Binary files a/public/images/emoji/facebook_messenger/sign_of_the_horns/4.png and b/public/images/emoji/facebook_messenger/sign_of_the_horns/4.png differ
diff --git a/public/images/emoji/facebook_messenger/sign_of_the_horns/5.png b/public/images/emoji/facebook_messenger/sign_of_the_horns/5.png
index 36413ab8cfb..5a6b7f17575 100644
Binary files a/public/images/emoji/facebook_messenger/sign_of_the_horns/5.png and b/public/images/emoji/facebook_messenger/sign_of_the_horns/5.png differ
diff --git a/public/images/emoji/facebook_messenger/sign_of_the_horns/6.png b/public/images/emoji/facebook_messenger/sign_of_the_horns/6.png
index 1cb1b661b95..e700d4afb2e 100644
Binary files a/public/images/emoji/facebook_messenger/sign_of_the_horns/6.png and b/public/images/emoji/facebook_messenger/sign_of_the_horns/6.png differ
diff --git a/public/images/emoji/facebook_messenger/signal_strength.png b/public/images/emoji/facebook_messenger/signal_strength.png
index 8ff27d11762..54045b69a3d 100644
Binary files a/public/images/emoji/facebook_messenger/signal_strength.png and b/public/images/emoji/facebook_messenger/signal_strength.png differ
diff --git a/public/images/emoji/facebook_messenger/singapore.png b/public/images/emoji/facebook_messenger/singapore.png
index 42a338884d2..f8efcc863f7 100644
Binary files a/public/images/emoji/facebook_messenger/singapore.png and b/public/images/emoji/facebook_messenger/singapore.png differ
diff --git a/public/images/emoji/facebook_messenger/sint_maarten.png b/public/images/emoji/facebook_messenger/sint_maarten.png
index 5248152aba9..87863f9b566 100644
Binary files a/public/images/emoji/facebook_messenger/sint_maarten.png and b/public/images/emoji/facebook_messenger/sint_maarten.png differ
diff --git a/public/images/emoji/facebook_messenger/six.png b/public/images/emoji/facebook_messenger/six.png
index 5208c51d592..304bf0eda85 100644
Binary files a/public/images/emoji/facebook_messenger/six.png and b/public/images/emoji/facebook_messenger/six.png differ
diff --git a/public/images/emoji/facebook_messenger/six_pointed_star.png b/public/images/emoji/facebook_messenger/six_pointed_star.png
index 3a640a6c915..70238181af5 100644
Binary files a/public/images/emoji/facebook_messenger/six_pointed_star.png and b/public/images/emoji/facebook_messenger/six_pointed_star.png differ
diff --git a/public/images/emoji/facebook_messenger/skeleton.png b/public/images/emoji/facebook_messenger/skeleton.png
index 9ff2306a450..c60e9f8a9f4 100644
Binary files a/public/images/emoji/facebook_messenger/skeleton.png and b/public/images/emoji/facebook_messenger/skeleton.png differ
diff --git a/public/images/emoji/facebook_messenger/ski.png b/public/images/emoji/facebook_messenger/ski.png
index 919452aacca..7faded1449d 100644
Binary files a/public/images/emoji/facebook_messenger/ski.png and b/public/images/emoji/facebook_messenger/ski.png differ
diff --git a/public/images/emoji/facebook_messenger/skier.png b/public/images/emoji/facebook_messenger/skier.png
index a4cffe7aca6..34e63f01c7c 100644
Binary files a/public/images/emoji/facebook_messenger/skier.png and b/public/images/emoji/facebook_messenger/skier.png differ
diff --git a/public/images/emoji/facebook_messenger/skull.png b/public/images/emoji/facebook_messenger/skull.png
index 9ff2306a450..c60e9f8a9f4 100644
Binary files a/public/images/emoji/facebook_messenger/skull.png and b/public/images/emoji/facebook_messenger/skull.png differ
diff --git a/public/images/emoji/facebook_messenger/skull_and_crossbones.png b/public/images/emoji/facebook_messenger/skull_and_crossbones.png
index df4531d2b0a..686fd5afa97 100644
Binary files a/public/images/emoji/facebook_messenger/skull_and_crossbones.png and b/public/images/emoji/facebook_messenger/skull_and_crossbones.png differ
diff --git a/public/images/emoji/facebook_messenger/skull_crossbones.png b/public/images/emoji/facebook_messenger/skull_crossbones.png
index df4531d2b0a..686fd5afa97 100644
Binary files a/public/images/emoji/facebook_messenger/skull_crossbones.png and b/public/images/emoji/facebook_messenger/skull_crossbones.png differ
diff --git a/public/images/emoji/facebook_messenger/sled.png b/public/images/emoji/facebook_messenger/sled.png
index 01805b1fe76..68b35f49191 100644
Binary files a/public/images/emoji/facebook_messenger/sled.png and b/public/images/emoji/facebook_messenger/sled.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping.png b/public/images/emoji/facebook_messenger/sleeping.png
index f0f03bd3a8b..cad0d4518e2 100644
Binary files a/public/images/emoji/facebook_messenger/sleeping.png and b/public/images/emoji/facebook_messenger/sleeping.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_accommodation.png b/public/images/emoji/facebook_messenger/sleeping_accommodation.png
index 70398fd0978..9fd8cfc18a7 100644
Binary files a/public/images/emoji/facebook_messenger/sleeping_accommodation.png and b/public/images/emoji/facebook_messenger/sleeping_accommodation.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_accommodation/2.png b/public/images/emoji/facebook_messenger/sleeping_accommodation/2.png
index feb77c5dac0..32f7f7153ff 100644
Binary files a/public/images/emoji/facebook_messenger/sleeping_accommodation/2.png and b/public/images/emoji/facebook_messenger/sleeping_accommodation/2.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_accommodation/3.png b/public/images/emoji/facebook_messenger/sleeping_accommodation/3.png
index 6934d93973f..fb634a33ad9 100644
Binary files a/public/images/emoji/facebook_messenger/sleeping_accommodation/3.png and b/public/images/emoji/facebook_messenger/sleeping_accommodation/3.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_accommodation/4.png b/public/images/emoji/facebook_messenger/sleeping_accommodation/4.png
index e7705b515e9..9fd8cfc18a7 100644
Binary files a/public/images/emoji/facebook_messenger/sleeping_accommodation/4.png and b/public/images/emoji/facebook_messenger/sleeping_accommodation/4.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_accommodation/5.png b/public/images/emoji/facebook_messenger/sleeping_accommodation/5.png
index 76d7ae664b3..32f7f7153ff 100644
Binary files a/public/images/emoji/facebook_messenger/sleeping_accommodation/5.png and b/public/images/emoji/facebook_messenger/sleeping_accommodation/5.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_accommodation/6.png b/public/images/emoji/facebook_messenger/sleeping_accommodation/6.png
index 6ea7b534620..32f7f7153ff 100644
Binary files a/public/images/emoji/facebook_messenger/sleeping_accommodation/6.png and b/public/images/emoji/facebook_messenger/sleeping_accommodation/6.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_bed.png b/public/images/emoji/facebook_messenger/sleeping_bed.png
index 70398fd0978..9fd8cfc18a7 100644
Binary files a/public/images/emoji/facebook_messenger/sleeping_bed.png and b/public/images/emoji/facebook_messenger/sleeping_bed.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_bed/2.png b/public/images/emoji/facebook_messenger/sleeping_bed/2.png
index feb77c5dac0..32f7f7153ff 100644
Binary files a/public/images/emoji/facebook_messenger/sleeping_bed/2.png and b/public/images/emoji/facebook_messenger/sleeping_bed/2.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_bed/3.png b/public/images/emoji/facebook_messenger/sleeping_bed/3.png
index 6934d93973f..fb634a33ad9 100644
Binary files a/public/images/emoji/facebook_messenger/sleeping_bed/3.png and b/public/images/emoji/facebook_messenger/sleeping_bed/3.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_bed/4.png b/public/images/emoji/facebook_messenger/sleeping_bed/4.png
index e7705b515e9..9fd8cfc18a7 100644
Binary files a/public/images/emoji/facebook_messenger/sleeping_bed/4.png and b/public/images/emoji/facebook_messenger/sleeping_bed/4.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_bed/5.png b/public/images/emoji/facebook_messenger/sleeping_bed/5.png
index 76d7ae664b3..32f7f7153ff 100644
Binary files a/public/images/emoji/facebook_messenger/sleeping_bed/5.png and b/public/images/emoji/facebook_messenger/sleeping_bed/5.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_bed/6.png b/public/images/emoji/facebook_messenger/sleeping_bed/6.png
index 6ea7b534620..32f7f7153ff 100644
Binary files a/public/images/emoji/facebook_messenger/sleeping_bed/6.png and b/public/images/emoji/facebook_messenger/sleeping_bed/6.png differ
diff --git a/public/images/emoji/facebook_messenger/sleepy.png b/public/images/emoji/facebook_messenger/sleepy.png
index d6d67475bc3..8fc4a251bf1 100644
Binary files a/public/images/emoji/facebook_messenger/sleepy.png and b/public/images/emoji/facebook_messenger/sleepy.png differ
diff --git a/public/images/emoji/facebook_messenger/sleuth_or_spy.png b/public/images/emoji/facebook_messenger/sleuth_or_spy.png
index 587e506d98d..6734c6bde0b 100644
Binary files a/public/images/emoji/facebook_messenger/sleuth_or_spy.png and b/public/images/emoji/facebook_messenger/sleuth_or_spy.png differ
diff --git a/public/images/emoji/facebook_messenger/sleuth_or_spy/2.png b/public/images/emoji/facebook_messenger/sleuth_or_spy/2.png
index a25d5ea4d44..04383914af4 100644
Binary files a/public/images/emoji/facebook_messenger/sleuth_or_spy/2.png and b/public/images/emoji/facebook_messenger/sleuth_or_spy/2.png differ
diff --git a/public/images/emoji/facebook_messenger/sleuth_or_spy/3.png b/public/images/emoji/facebook_messenger/sleuth_or_spy/3.png
index f100fd13a45..1a6c3ca89ca 100644
Binary files a/public/images/emoji/facebook_messenger/sleuth_or_spy/3.png and b/public/images/emoji/facebook_messenger/sleuth_or_spy/3.png differ
diff --git a/public/images/emoji/facebook_messenger/sleuth_or_spy/4.png b/public/images/emoji/facebook_messenger/sleuth_or_spy/4.png
index 775a8b2f2b0..0778fa99eb2 100644
Binary files a/public/images/emoji/facebook_messenger/sleuth_or_spy/4.png and b/public/images/emoji/facebook_messenger/sleuth_or_spy/4.png differ
diff --git a/public/images/emoji/facebook_messenger/sleuth_or_spy/5.png b/public/images/emoji/facebook_messenger/sleuth_or_spy/5.png
index c9703ba9946..4479cc79cc7 100644
Binary files a/public/images/emoji/facebook_messenger/sleuth_or_spy/5.png and b/public/images/emoji/facebook_messenger/sleuth_or_spy/5.png differ
diff --git a/public/images/emoji/facebook_messenger/sleuth_or_spy/6.png b/public/images/emoji/facebook_messenger/sleuth_or_spy/6.png
index 55cc03db8d4..2602f4c409c 100644
Binary files a/public/images/emoji/facebook_messenger/sleuth_or_spy/6.png and b/public/images/emoji/facebook_messenger/sleuth_or_spy/6.png differ
diff --git a/public/images/emoji/facebook_messenger/slight_frown.png b/public/images/emoji/facebook_messenger/slight_frown.png
index d7dfe0e8486..8f4af59ea1c 100644
Binary files a/public/images/emoji/facebook_messenger/slight_frown.png and b/public/images/emoji/facebook_messenger/slight_frown.png differ
diff --git a/public/images/emoji/facebook_messenger/slight_smile.png b/public/images/emoji/facebook_messenger/slight_smile.png
index 2c240c1bb80..adb507495fd 100644
Binary files a/public/images/emoji/facebook_messenger/slight_smile.png and b/public/images/emoji/facebook_messenger/slight_smile.png differ
diff --git a/public/images/emoji/facebook_messenger/slightly_frowning_face.png b/public/images/emoji/facebook_messenger/slightly_frowning_face.png
index d7dfe0e8486..8f4af59ea1c 100644
Binary files a/public/images/emoji/facebook_messenger/slightly_frowning_face.png and b/public/images/emoji/facebook_messenger/slightly_frowning_face.png differ
diff --git a/public/images/emoji/facebook_messenger/slightly_smiling.png b/public/images/emoji/facebook_messenger/slightly_smiling.png
index 2c240c1bb80..adb507495fd 100644
Binary files a/public/images/emoji/facebook_messenger/slightly_smiling.png and b/public/images/emoji/facebook_messenger/slightly_smiling.png differ
diff --git a/public/images/emoji/facebook_messenger/slightly_smiling_face.png b/public/images/emoji/facebook_messenger/slightly_smiling_face.png
index 2c240c1bb80..adb507495fd 100644
Binary files a/public/images/emoji/facebook_messenger/slightly_smiling_face.png and b/public/images/emoji/facebook_messenger/slightly_smiling_face.png differ
diff --git a/public/images/emoji/facebook_messenger/slot_machine.png b/public/images/emoji/facebook_messenger/slot_machine.png
index a67edf96be9..13646f57dff 100644
Binary files a/public/images/emoji/facebook_messenger/slot_machine.png and b/public/images/emoji/facebook_messenger/slot_machine.png differ
diff --git a/public/images/emoji/facebook_messenger/slovakia.png b/public/images/emoji/facebook_messenger/slovakia.png
index 9b716032fd8..9b947a59feb 100644
Binary files a/public/images/emoji/facebook_messenger/slovakia.png and b/public/images/emoji/facebook_messenger/slovakia.png differ
diff --git a/public/images/emoji/facebook_messenger/slovenia.png b/public/images/emoji/facebook_messenger/slovenia.png
index 6dfbe6eae24..355664c7859 100644
Binary files a/public/images/emoji/facebook_messenger/slovenia.png and b/public/images/emoji/facebook_messenger/slovenia.png differ
diff --git a/public/images/emoji/facebook_messenger/small_airplane.png b/public/images/emoji/facebook_messenger/small_airplane.png
index 47399184f72..110df284553 100644
Binary files a/public/images/emoji/facebook_messenger/small_airplane.png and b/public/images/emoji/facebook_messenger/small_airplane.png differ
diff --git a/public/images/emoji/facebook_messenger/small_blue_diamond.png b/public/images/emoji/facebook_messenger/small_blue_diamond.png
index e5b2ce33f20..e1808f68bcf 100644
Binary files a/public/images/emoji/facebook_messenger/small_blue_diamond.png and b/public/images/emoji/facebook_messenger/small_blue_diamond.png differ
diff --git a/public/images/emoji/facebook_messenger/small_orange_diamond.png b/public/images/emoji/facebook_messenger/small_orange_diamond.png
index ce3ffc859be..5505c64f79e 100644
Binary files a/public/images/emoji/facebook_messenger/small_orange_diamond.png and b/public/images/emoji/facebook_messenger/small_orange_diamond.png differ
diff --git a/public/images/emoji/facebook_messenger/small_red_triangle.png b/public/images/emoji/facebook_messenger/small_red_triangle.png
index ff5080276e5..8062fa40d79 100644
Binary files a/public/images/emoji/facebook_messenger/small_red_triangle.png and b/public/images/emoji/facebook_messenger/small_red_triangle.png differ
diff --git a/public/images/emoji/facebook_messenger/small_red_triangle_down.png b/public/images/emoji/facebook_messenger/small_red_triangle_down.png
index ffc0b20b6da..b1a444e202a 100644
Binary files a/public/images/emoji/facebook_messenger/small_red_triangle_down.png and b/public/images/emoji/facebook_messenger/small_red_triangle_down.png differ
diff --git a/public/images/emoji/facebook_messenger/smile.png b/public/images/emoji/facebook_messenger/smile.png
index b38ee2bad13..4597ec0c8aa 100644
Binary files a/public/images/emoji/facebook_messenger/smile.png and b/public/images/emoji/facebook_messenger/smile.png differ
diff --git a/public/images/emoji/facebook_messenger/smile_cat.png b/public/images/emoji/facebook_messenger/smile_cat.png
index 07733f39a42..09b32fa39e5 100644
Binary files a/public/images/emoji/facebook_messenger/smile_cat.png and b/public/images/emoji/facebook_messenger/smile_cat.png differ
diff --git a/public/images/emoji/facebook_messenger/smiley.png b/public/images/emoji/facebook_messenger/smiley.png
index 3df89f4799f..479bfc2ffa2 100644
Binary files a/public/images/emoji/facebook_messenger/smiley.png and b/public/images/emoji/facebook_messenger/smiley.png differ
diff --git a/public/images/emoji/facebook_messenger/smiley_cat.png b/public/images/emoji/facebook_messenger/smiley_cat.png
index c64dead5286..81a35eb9142 100644
Binary files a/public/images/emoji/facebook_messenger/smiley_cat.png and b/public/images/emoji/facebook_messenger/smiley_cat.png differ
diff --git a/public/images/emoji/facebook_messenger/smiling_imp.png b/public/images/emoji/facebook_messenger/smiling_imp.png
index ad5ca558493..e06a7ca2c96 100644
Binary files a/public/images/emoji/facebook_messenger/smiling_imp.png and b/public/images/emoji/facebook_messenger/smiling_imp.png differ
diff --git a/public/images/emoji/facebook_messenger/smirk.png b/public/images/emoji/facebook_messenger/smirk.png
index cf36fecf96b..44728afa88e 100644
Binary files a/public/images/emoji/facebook_messenger/smirk.png and b/public/images/emoji/facebook_messenger/smirk.png differ
diff --git a/public/images/emoji/facebook_messenger/smirk_cat.png b/public/images/emoji/facebook_messenger/smirk_cat.png
index 0981c4f0921..b01633d8f15 100644
Binary files a/public/images/emoji/facebook_messenger/smirk_cat.png and b/public/images/emoji/facebook_messenger/smirk_cat.png differ
diff --git a/public/images/emoji/facebook_messenger/smoking.png b/public/images/emoji/facebook_messenger/smoking.png
index f3d1dd8b089..cc203be6509 100644
Binary files a/public/images/emoji/facebook_messenger/smoking.png and b/public/images/emoji/facebook_messenger/smoking.png differ
diff --git a/public/images/emoji/facebook_messenger/snail.png b/public/images/emoji/facebook_messenger/snail.png
index 4ca88c40fed..845a66020aa 100644
Binary files a/public/images/emoji/facebook_messenger/snail.png and b/public/images/emoji/facebook_messenger/snail.png differ
diff --git a/public/images/emoji/facebook_messenger/snake.png b/public/images/emoji/facebook_messenger/snake.png
index 45d642454c2..81dfa138a05 100644
Binary files a/public/images/emoji/facebook_messenger/snake.png and b/public/images/emoji/facebook_messenger/snake.png differ
diff --git a/public/images/emoji/facebook_messenger/sneezing_face.png b/public/images/emoji/facebook_messenger/sneezing_face.png
index b1801ae41ff..2b885dea7ab 100644
Binary files a/public/images/emoji/facebook_messenger/sneezing_face.png and b/public/images/emoji/facebook_messenger/sneezing_face.png differ
diff --git a/public/images/emoji/facebook_messenger/snow_capped_mountain.png b/public/images/emoji/facebook_messenger/snow_capped_mountain.png
index b3e246f09b9..5529c620de3 100644
Binary files a/public/images/emoji/facebook_messenger/snow_capped_mountain.png and b/public/images/emoji/facebook_messenger/snow_capped_mountain.png differ
diff --git a/public/images/emoji/facebook_messenger/snowboarder.png b/public/images/emoji/facebook_messenger/snowboarder.png
index 1c6f59397b0..f9e77e2139e 100644
Binary files a/public/images/emoji/facebook_messenger/snowboarder.png and b/public/images/emoji/facebook_messenger/snowboarder.png differ
diff --git a/public/images/emoji/facebook_messenger/snowboarder/2.png b/public/images/emoji/facebook_messenger/snowboarder/2.png
index 6d3da25d658..f9e77e2139e 100644
Binary files a/public/images/emoji/facebook_messenger/snowboarder/2.png and b/public/images/emoji/facebook_messenger/snowboarder/2.png differ
diff --git a/public/images/emoji/facebook_messenger/snowboarder/3.png b/public/images/emoji/facebook_messenger/snowboarder/3.png
index cf8c1f336df..f9e77e2139e 100644
Binary files a/public/images/emoji/facebook_messenger/snowboarder/3.png and b/public/images/emoji/facebook_messenger/snowboarder/3.png differ
diff --git a/public/images/emoji/facebook_messenger/snowboarder/4.png b/public/images/emoji/facebook_messenger/snowboarder/4.png
index 7c5a44116e4..f9e77e2139e 100644
Binary files a/public/images/emoji/facebook_messenger/snowboarder/4.png and b/public/images/emoji/facebook_messenger/snowboarder/4.png differ
diff --git a/public/images/emoji/facebook_messenger/snowboarder/5.png b/public/images/emoji/facebook_messenger/snowboarder/5.png
index e7cea154901..f9e77e2139e 100644
Binary files a/public/images/emoji/facebook_messenger/snowboarder/5.png and b/public/images/emoji/facebook_messenger/snowboarder/5.png differ
diff --git a/public/images/emoji/facebook_messenger/snowboarder/6.png b/public/images/emoji/facebook_messenger/snowboarder/6.png
index abe744f0fe2..f9e77e2139e 100644
Binary files a/public/images/emoji/facebook_messenger/snowboarder/6.png and b/public/images/emoji/facebook_messenger/snowboarder/6.png differ
diff --git a/public/images/emoji/facebook_messenger/snowflake.png b/public/images/emoji/facebook_messenger/snowflake.png
index bc25658a748..23f9a19a0f8 100644
Binary files a/public/images/emoji/facebook_messenger/snowflake.png and b/public/images/emoji/facebook_messenger/snowflake.png differ
diff --git a/public/images/emoji/facebook_messenger/snowman.png b/public/images/emoji/facebook_messenger/snowman.png
index edb003e3623..e93ebca64f3 100644
Binary files a/public/images/emoji/facebook_messenger/snowman.png and b/public/images/emoji/facebook_messenger/snowman.png differ
diff --git a/public/images/emoji/facebook_messenger/snowman2.png b/public/images/emoji/facebook_messenger/snowman2.png
index abefab72343..d616df2b4bb 100644
Binary files a/public/images/emoji/facebook_messenger/snowman2.png and b/public/images/emoji/facebook_messenger/snowman2.png differ
diff --git a/public/images/emoji/facebook_messenger/snowman_with_snow.png b/public/images/emoji/facebook_messenger/snowman_with_snow.png
index abefab72343..d616df2b4bb 100644
Binary files a/public/images/emoji/facebook_messenger/snowman_with_snow.png and b/public/images/emoji/facebook_messenger/snowman_with_snow.png differ
diff --git a/public/images/emoji/facebook_messenger/sob.png b/public/images/emoji/facebook_messenger/sob.png
index 825639b5668..fbc4a2e292c 100644
Binary files a/public/images/emoji/facebook_messenger/sob.png and b/public/images/emoji/facebook_messenger/sob.png differ
diff --git a/public/images/emoji/facebook_messenger/soccer.png b/public/images/emoji/facebook_messenger/soccer.png
index 5b34f824748..628f907dfb9 100644
Binary files a/public/images/emoji/facebook_messenger/soccer.png and b/public/images/emoji/facebook_messenger/soccer.png differ
diff --git a/public/images/emoji/facebook_messenger/socks.png b/public/images/emoji/facebook_messenger/socks.png
index 8f2b9bbe9e3..98b6a363391 100644
Binary files a/public/images/emoji/facebook_messenger/socks.png and b/public/images/emoji/facebook_messenger/socks.png differ
diff --git a/public/images/emoji/facebook_messenger/solomon_islands.png b/public/images/emoji/facebook_messenger/solomon_islands.png
index e4476e18806..dfb732444b5 100644
Binary files a/public/images/emoji/facebook_messenger/solomon_islands.png and b/public/images/emoji/facebook_messenger/solomon_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/somalia.png b/public/images/emoji/facebook_messenger/somalia.png
index 209fffeaed0..c55dd202032 100644
Binary files a/public/images/emoji/facebook_messenger/somalia.png and b/public/images/emoji/facebook_messenger/somalia.png differ
diff --git a/public/images/emoji/facebook_messenger/soon.png b/public/images/emoji/facebook_messenger/soon.png
index 06de16d0912..49397d0dddb 100644
Binary files a/public/images/emoji/facebook_messenger/soon.png and b/public/images/emoji/facebook_messenger/soon.png differ
diff --git a/public/images/emoji/facebook_messenger/sos.png b/public/images/emoji/facebook_messenger/sos.png
index d8ddeba4e08..9335e8bd34c 100644
Binary files a/public/images/emoji/facebook_messenger/sos.png and b/public/images/emoji/facebook_messenger/sos.png differ
diff --git a/public/images/emoji/facebook_messenger/sound.png b/public/images/emoji/facebook_messenger/sound.png
index 2311f6534cb..6cfe4a1333d 100644
Binary files a/public/images/emoji/facebook_messenger/sound.png and b/public/images/emoji/facebook_messenger/sound.png differ
diff --git a/public/images/emoji/facebook_messenger/south_africa.png b/public/images/emoji/facebook_messenger/south_africa.png
index 967b98eb846..db47d38be5e 100644
Binary files a/public/images/emoji/facebook_messenger/south_africa.png and b/public/images/emoji/facebook_messenger/south_africa.png differ
diff --git a/public/images/emoji/facebook_messenger/south_georgia_south_sandwich_islands.png b/public/images/emoji/facebook_messenger/south_georgia_south_sandwich_islands.png
index 58f47bcd9b9..8e6393d3d10 100644
Binary files a/public/images/emoji/facebook_messenger/south_georgia_south_sandwich_islands.png and b/public/images/emoji/facebook_messenger/south_georgia_south_sandwich_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/south_sudan.png b/public/images/emoji/facebook_messenger/south_sudan.png
index c7cbc6967c2..d2bf1017344 100644
Binary files a/public/images/emoji/facebook_messenger/south_sudan.png and b/public/images/emoji/facebook_messenger/south_sudan.png differ
diff --git a/public/images/emoji/facebook_messenger/space_invader.png b/public/images/emoji/facebook_messenger/space_invader.png
index ef0cc6b6458..862aa6326d4 100644
Binary files a/public/images/emoji/facebook_messenger/space_invader.png and b/public/images/emoji/facebook_messenger/space_invader.png differ
diff --git a/public/images/emoji/facebook_messenger/spades.png b/public/images/emoji/facebook_messenger/spades.png
index d8caab8d911..c7ba3971e8c 100644
Binary files a/public/images/emoji/facebook_messenger/spades.png and b/public/images/emoji/facebook_messenger/spades.png differ
diff --git a/public/images/emoji/facebook_messenger/spaghetti.png b/public/images/emoji/facebook_messenger/spaghetti.png
index 8276dcbec6a..595cb7cdb93 100644
Binary files a/public/images/emoji/facebook_messenger/spaghetti.png and b/public/images/emoji/facebook_messenger/spaghetti.png differ
diff --git a/public/images/emoji/facebook_messenger/sparkle.png b/public/images/emoji/facebook_messenger/sparkle.png
index b63a7dea208..357e7e5e00a 100644
Binary files a/public/images/emoji/facebook_messenger/sparkle.png and b/public/images/emoji/facebook_messenger/sparkle.png differ
diff --git a/public/images/emoji/facebook_messenger/sparkler.png b/public/images/emoji/facebook_messenger/sparkler.png
index 71550c5313e..78696de313e 100644
Binary files a/public/images/emoji/facebook_messenger/sparkler.png and b/public/images/emoji/facebook_messenger/sparkler.png differ
diff --git a/public/images/emoji/facebook_messenger/sparkles.png b/public/images/emoji/facebook_messenger/sparkles.png
index 081aa8bea4b..028864b8cce 100644
Binary files a/public/images/emoji/facebook_messenger/sparkles.png and b/public/images/emoji/facebook_messenger/sparkles.png differ
diff --git a/public/images/emoji/facebook_messenger/sparkling_heart.png b/public/images/emoji/facebook_messenger/sparkling_heart.png
index db195de7cd8..33f0d7d4acc 100644
Binary files a/public/images/emoji/facebook_messenger/sparkling_heart.png and b/public/images/emoji/facebook_messenger/sparkling_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/speak_no_evil.png b/public/images/emoji/facebook_messenger/speak_no_evil.png
index 4e7665f8319..c65adb7ad2e 100644
Binary files a/public/images/emoji/facebook_messenger/speak_no_evil.png and b/public/images/emoji/facebook_messenger/speak_no_evil.png differ
diff --git a/public/images/emoji/facebook_messenger/speaker.png b/public/images/emoji/facebook_messenger/speaker.png
index 5ce21108798..b84def26e7a 100644
Binary files a/public/images/emoji/facebook_messenger/speaker.png and b/public/images/emoji/facebook_messenger/speaker.png differ
diff --git a/public/images/emoji/facebook_messenger/speaking_head.png b/public/images/emoji/facebook_messenger/speaking_head.png
index edf252b9bdc..64d53b0d1c6 100644
Binary files a/public/images/emoji/facebook_messenger/speaking_head.png and b/public/images/emoji/facebook_messenger/speaking_head.png differ
diff --git a/public/images/emoji/facebook_messenger/speaking_head_in_silhouette.png b/public/images/emoji/facebook_messenger/speaking_head_in_silhouette.png
index edf252b9bdc..64d53b0d1c6 100644
Binary files a/public/images/emoji/facebook_messenger/speaking_head_in_silhouette.png and b/public/images/emoji/facebook_messenger/speaking_head_in_silhouette.png differ
diff --git a/public/images/emoji/facebook_messenger/speech_balloon.png b/public/images/emoji/facebook_messenger/speech_balloon.png
index ec17855d07a..586a5bb2635 100644
Binary files a/public/images/emoji/facebook_messenger/speech_balloon.png and b/public/images/emoji/facebook_messenger/speech_balloon.png differ
diff --git a/public/images/emoji/facebook_messenger/speedboat.png b/public/images/emoji/facebook_messenger/speedboat.png
index cf31f7eac16..f126b63d946 100644
Binary files a/public/images/emoji/facebook_messenger/speedboat.png and b/public/images/emoji/facebook_messenger/speedboat.png differ
diff --git a/public/images/emoji/facebook_messenger/spider.png b/public/images/emoji/facebook_messenger/spider.png
index 12ef291fa03..6eeffa4d4bc 100644
Binary files a/public/images/emoji/facebook_messenger/spider.png and b/public/images/emoji/facebook_messenger/spider.png differ
diff --git a/public/images/emoji/facebook_messenger/spider_web.png b/public/images/emoji/facebook_messenger/spider_web.png
index 568c1dec8ac..fdcf6eb8cc2 100644
Binary files a/public/images/emoji/facebook_messenger/spider_web.png and b/public/images/emoji/facebook_messenger/spider_web.png differ
diff --git a/public/images/emoji/facebook_messenger/spiral_calendar.png b/public/images/emoji/facebook_messenger/spiral_calendar.png
index 8cd3bd7e57f..ee07d24cb16 100644
Binary files a/public/images/emoji/facebook_messenger/spiral_calendar.png and b/public/images/emoji/facebook_messenger/spiral_calendar.png differ
diff --git a/public/images/emoji/facebook_messenger/spiral_calendar_pad.png b/public/images/emoji/facebook_messenger/spiral_calendar_pad.png
index 8cd3bd7e57f..ee07d24cb16 100644
Binary files a/public/images/emoji/facebook_messenger/spiral_calendar_pad.png and b/public/images/emoji/facebook_messenger/spiral_calendar_pad.png differ
diff --git a/public/images/emoji/facebook_messenger/spiral_note_pad.png b/public/images/emoji/facebook_messenger/spiral_note_pad.png
index b8ebfe080a3..e441801b07d 100644
Binary files a/public/images/emoji/facebook_messenger/spiral_note_pad.png and b/public/images/emoji/facebook_messenger/spiral_note_pad.png differ
diff --git a/public/images/emoji/facebook_messenger/spiral_notepad.png b/public/images/emoji/facebook_messenger/spiral_notepad.png
index b8ebfe080a3..e441801b07d 100644
Binary files a/public/images/emoji/facebook_messenger/spiral_notepad.png and b/public/images/emoji/facebook_messenger/spiral_notepad.png differ
diff --git a/public/images/emoji/facebook_messenger/spoon.png b/public/images/emoji/facebook_messenger/spoon.png
index 960cba2bf7f..61ceb0552de 100644
Binary files a/public/images/emoji/facebook_messenger/spoon.png and b/public/images/emoji/facebook_messenger/spoon.png differ
diff --git a/public/images/emoji/facebook_messenger/sports_medal.png b/public/images/emoji/facebook_messenger/sports_medal.png
index 57fbc8512fc..2f481eb2812 100644
Binary files a/public/images/emoji/facebook_messenger/sports_medal.png and b/public/images/emoji/facebook_messenger/sports_medal.png differ
diff --git a/public/images/emoji/facebook_messenger/spy.png b/public/images/emoji/facebook_messenger/spy.png
index 587e506d98d..6734c6bde0b 100644
Binary files a/public/images/emoji/facebook_messenger/spy.png and b/public/images/emoji/facebook_messenger/spy.png differ
diff --git a/public/images/emoji/facebook_messenger/spy/2.png b/public/images/emoji/facebook_messenger/spy/2.png
index a25d5ea4d44..04383914af4 100644
Binary files a/public/images/emoji/facebook_messenger/spy/2.png and b/public/images/emoji/facebook_messenger/spy/2.png differ
diff --git a/public/images/emoji/facebook_messenger/spy/3.png b/public/images/emoji/facebook_messenger/spy/3.png
index f100fd13a45..1a6c3ca89ca 100644
Binary files a/public/images/emoji/facebook_messenger/spy/3.png and b/public/images/emoji/facebook_messenger/spy/3.png differ
diff --git a/public/images/emoji/facebook_messenger/spy/4.png b/public/images/emoji/facebook_messenger/spy/4.png
index 775a8b2f2b0..0778fa99eb2 100644
Binary files a/public/images/emoji/facebook_messenger/spy/4.png and b/public/images/emoji/facebook_messenger/spy/4.png differ
diff --git a/public/images/emoji/facebook_messenger/spy/5.png b/public/images/emoji/facebook_messenger/spy/5.png
index c9703ba9946..4479cc79cc7 100644
Binary files a/public/images/emoji/facebook_messenger/spy/5.png and b/public/images/emoji/facebook_messenger/spy/5.png differ
diff --git a/public/images/emoji/facebook_messenger/spy/6.png b/public/images/emoji/facebook_messenger/spy/6.png
index 55cc03db8d4..2602f4c409c 100644
Binary files a/public/images/emoji/facebook_messenger/spy/6.png and b/public/images/emoji/facebook_messenger/spy/6.png differ
diff --git a/public/images/emoji/facebook_messenger/squid.png b/public/images/emoji/facebook_messenger/squid.png
index 8e1b95f60e9..4b589aef41e 100644
Binary files a/public/images/emoji/facebook_messenger/squid.png and b/public/images/emoji/facebook_messenger/squid.png differ
diff --git a/public/images/emoji/facebook_messenger/sri_lanka.png b/public/images/emoji/facebook_messenger/sri_lanka.png
index f15b9be56dd..39e770f5fd6 100644
Binary files a/public/images/emoji/facebook_messenger/sri_lanka.png and b/public/images/emoji/facebook_messenger/sri_lanka.png differ
diff --git a/public/images/emoji/facebook_messenger/st_barthelemy.png b/public/images/emoji/facebook_messenger/st_barthelemy.png
index e213bf7e406..b0acdb50ffe 100644
Binary files a/public/images/emoji/facebook_messenger/st_barthelemy.png and b/public/images/emoji/facebook_messenger/st_barthelemy.png differ
diff --git a/public/images/emoji/facebook_messenger/st_helena.png b/public/images/emoji/facebook_messenger/st_helena.png
index 90fefd0cab2..d1fb896890a 100644
Binary files a/public/images/emoji/facebook_messenger/st_helena.png and b/public/images/emoji/facebook_messenger/st_helena.png differ
diff --git a/public/images/emoji/facebook_messenger/st_kitts_nevis.png b/public/images/emoji/facebook_messenger/st_kitts_nevis.png
index d7686f8b603..429af8b89e1 100644
Binary files a/public/images/emoji/facebook_messenger/st_kitts_nevis.png and b/public/images/emoji/facebook_messenger/st_kitts_nevis.png differ
diff --git a/public/images/emoji/facebook_messenger/st_lucia.png b/public/images/emoji/facebook_messenger/st_lucia.png
index 92eafffe947..0642436de48 100644
Binary files a/public/images/emoji/facebook_messenger/st_lucia.png and b/public/images/emoji/facebook_messenger/st_lucia.png differ
diff --git a/public/images/emoji/facebook_messenger/st_martin.png b/public/images/emoji/facebook_messenger/st_martin.png
index 7943b73f671..2ef71d792ab 100644
Binary files a/public/images/emoji/facebook_messenger/st_martin.png and b/public/images/emoji/facebook_messenger/st_martin.png differ
diff --git a/public/images/emoji/facebook_messenger/st_pierre_miquelon.png b/public/images/emoji/facebook_messenger/st_pierre_miquelon.png
index b05828b47cb..697bcd6280e 100644
Binary files a/public/images/emoji/facebook_messenger/st_pierre_miquelon.png and b/public/images/emoji/facebook_messenger/st_pierre_miquelon.png differ
diff --git a/public/images/emoji/facebook_messenger/st_vincent_grenadines.png b/public/images/emoji/facebook_messenger/st_vincent_grenadines.png
index ddfd25fd227..30c54fb34a5 100644
Binary files a/public/images/emoji/facebook_messenger/st_vincent_grenadines.png and b/public/images/emoji/facebook_messenger/st_vincent_grenadines.png differ
diff --git a/public/images/emoji/facebook_messenger/stadium.png b/public/images/emoji/facebook_messenger/stadium.png
index 0ad57f80a41..c599f90bfb7 100644
Binary files a/public/images/emoji/facebook_messenger/stadium.png and b/public/images/emoji/facebook_messenger/stadium.png differ
diff --git a/public/images/emoji/facebook_messenger/star.png b/public/images/emoji/facebook_messenger/star.png
index 7381725ef41..38172061706 100644
Binary files a/public/images/emoji/facebook_messenger/star.png and b/public/images/emoji/facebook_messenger/star.png differ
diff --git a/public/images/emoji/facebook_messenger/star2.png b/public/images/emoji/facebook_messenger/star2.png
index 43cfbee5cb4..5a5acfa6407 100644
Binary files a/public/images/emoji/facebook_messenger/star2.png and b/public/images/emoji/facebook_messenger/star2.png differ
diff --git a/public/images/emoji/facebook_messenger/star_and_crescent.png b/public/images/emoji/facebook_messenger/star_and_crescent.png
index a89f689ad59..977efca749b 100644
Binary files a/public/images/emoji/facebook_messenger/star_and_crescent.png and b/public/images/emoji/facebook_messenger/star_and_crescent.png differ
diff --git a/public/images/emoji/facebook_messenger/star_of_david.png b/public/images/emoji/facebook_messenger/star_of_david.png
index 96462ffd58f..a01e9c19e02 100644
Binary files a/public/images/emoji/facebook_messenger/star_of_david.png and b/public/images/emoji/facebook_messenger/star_of_david.png differ
diff --git a/public/images/emoji/facebook_messenger/star_struck.png b/public/images/emoji/facebook_messenger/star_struck.png
index 7da8183f394..88dde6c46b6 100644
Binary files a/public/images/emoji/facebook_messenger/star_struck.png and b/public/images/emoji/facebook_messenger/star_struck.png differ
diff --git a/public/images/emoji/facebook_messenger/stars.png b/public/images/emoji/facebook_messenger/stars.png
index a7cfe72b881..72443a819af 100644
Binary files a/public/images/emoji/facebook_messenger/stars.png and b/public/images/emoji/facebook_messenger/stars.png differ
diff --git a/public/images/emoji/facebook_messenger/station.png b/public/images/emoji/facebook_messenger/station.png
index 66b496b9a24..68f40b18daa 100644
Binary files a/public/images/emoji/facebook_messenger/station.png and b/public/images/emoji/facebook_messenger/station.png differ
diff --git a/public/images/emoji/facebook_messenger/statue_of_liberty.png b/public/images/emoji/facebook_messenger/statue_of_liberty.png
index 0bf418a00b5..e1bdc292d97 100644
Binary files a/public/images/emoji/facebook_messenger/statue_of_liberty.png and b/public/images/emoji/facebook_messenger/statue_of_liberty.png differ
diff --git a/public/images/emoji/facebook_messenger/steam_locomotive.png b/public/images/emoji/facebook_messenger/steam_locomotive.png
index 1c5caa9a1c6..551bc94b956 100644
Binary files a/public/images/emoji/facebook_messenger/steam_locomotive.png and b/public/images/emoji/facebook_messenger/steam_locomotive.png differ
diff --git a/public/images/emoji/facebook_messenger/stew.png b/public/images/emoji/facebook_messenger/stew.png
index e2c6063d238..9dd0cb75463 100644
Binary files a/public/images/emoji/facebook_messenger/stew.png and b/public/images/emoji/facebook_messenger/stew.png differ
diff --git a/public/images/emoji/facebook_messenger/stop_button.png b/public/images/emoji/facebook_messenger/stop_button.png
index bbdb0b7b75a..564c1884562 100644
Binary files a/public/images/emoji/facebook_messenger/stop_button.png and b/public/images/emoji/facebook_messenger/stop_button.png differ
diff --git a/public/images/emoji/facebook_messenger/stop_sign.png b/public/images/emoji/facebook_messenger/stop_sign.png
index cf08756ebf4..2977d191412 100644
Binary files a/public/images/emoji/facebook_messenger/stop_sign.png and b/public/images/emoji/facebook_messenger/stop_sign.png differ
diff --git a/public/images/emoji/facebook_messenger/stopwatch.png b/public/images/emoji/facebook_messenger/stopwatch.png
index 74bff440042..f8e1dffd085 100644
Binary files a/public/images/emoji/facebook_messenger/stopwatch.png and b/public/images/emoji/facebook_messenger/stopwatch.png differ
diff --git a/public/images/emoji/facebook_messenger/straight_ruler.png b/public/images/emoji/facebook_messenger/straight_ruler.png
index 96957387625..020871473d8 100644
Binary files a/public/images/emoji/facebook_messenger/straight_ruler.png and b/public/images/emoji/facebook_messenger/straight_ruler.png differ
diff --git a/public/images/emoji/facebook_messenger/strawberry.png b/public/images/emoji/facebook_messenger/strawberry.png
index 0b2dd5ba438..a3528642ecb 100644
Binary files a/public/images/emoji/facebook_messenger/strawberry.png and b/public/images/emoji/facebook_messenger/strawberry.png differ
diff --git a/public/images/emoji/facebook_messenger/stuck_out_tongue.png b/public/images/emoji/facebook_messenger/stuck_out_tongue.png
index 1bc67678616..e5beeb121a0 100644
Binary files a/public/images/emoji/facebook_messenger/stuck_out_tongue.png and b/public/images/emoji/facebook_messenger/stuck_out_tongue.png differ
diff --git a/public/images/emoji/facebook_messenger/stuck_out_tongue_closed_eyes.png b/public/images/emoji/facebook_messenger/stuck_out_tongue_closed_eyes.png
index fc6eb0cb994..8b8d41b4e12 100644
Binary files a/public/images/emoji/facebook_messenger/stuck_out_tongue_closed_eyes.png and b/public/images/emoji/facebook_messenger/stuck_out_tongue_closed_eyes.png differ
diff --git a/public/images/emoji/facebook_messenger/stuck_out_tongue_winking_eye.png b/public/images/emoji/facebook_messenger/stuck_out_tongue_winking_eye.png
index 227eebc6ad3..649eba9a43a 100644
Binary files a/public/images/emoji/facebook_messenger/stuck_out_tongue_winking_eye.png and b/public/images/emoji/facebook_messenger/stuck_out_tongue_winking_eye.png differ
diff --git a/public/images/emoji/facebook_messenger/studio_microphone.png b/public/images/emoji/facebook_messenger/studio_microphone.png
index d10b32281fc..ed24a78f7f2 100644
Binary files a/public/images/emoji/facebook_messenger/studio_microphone.png and b/public/images/emoji/facebook_messenger/studio_microphone.png differ
diff --git a/public/images/emoji/facebook_messenger/stuffed_flatbread.png b/public/images/emoji/facebook_messenger/stuffed_flatbread.png
index f5dca14bd2b..b8e739742a1 100644
Binary files a/public/images/emoji/facebook_messenger/stuffed_flatbread.png and b/public/images/emoji/facebook_messenger/stuffed_flatbread.png differ
diff --git a/public/images/emoji/facebook_messenger/sudan.png b/public/images/emoji/facebook_messenger/sudan.png
index 3974a07328c..11efec7ed1e 100644
Binary files a/public/images/emoji/facebook_messenger/sudan.png and b/public/images/emoji/facebook_messenger/sudan.png differ
diff --git a/public/images/emoji/facebook_messenger/sun_behind_large_cloud.png b/public/images/emoji/facebook_messenger/sun_behind_large_cloud.png
index 3ceb40a9ec0..17a5f1ff823 100644
Binary files a/public/images/emoji/facebook_messenger/sun_behind_large_cloud.png and b/public/images/emoji/facebook_messenger/sun_behind_large_cloud.png differ
diff --git a/public/images/emoji/facebook_messenger/sun_behind_rain_cloud.png b/public/images/emoji/facebook_messenger/sun_behind_rain_cloud.png
index ef892f1f889..ec92c38a2b8 100644
Binary files a/public/images/emoji/facebook_messenger/sun_behind_rain_cloud.png and b/public/images/emoji/facebook_messenger/sun_behind_rain_cloud.png differ
diff --git a/public/images/emoji/facebook_messenger/sun_behind_small_cloud.png b/public/images/emoji/facebook_messenger/sun_behind_small_cloud.png
index 90af3591e04..0a6ad08a985 100644
Binary files a/public/images/emoji/facebook_messenger/sun_behind_small_cloud.png and b/public/images/emoji/facebook_messenger/sun_behind_small_cloud.png differ
diff --git a/public/images/emoji/facebook_messenger/sun_with_face.png b/public/images/emoji/facebook_messenger/sun_with_face.png
index 5c3125e2128..60cdafd79ee 100644
Binary files a/public/images/emoji/facebook_messenger/sun_with_face.png and b/public/images/emoji/facebook_messenger/sun_with_face.png differ
diff --git a/public/images/emoji/facebook_messenger/sunflower.png b/public/images/emoji/facebook_messenger/sunflower.png
index f5ef9ec1df0..939ff0818b7 100644
Binary files a/public/images/emoji/facebook_messenger/sunflower.png and b/public/images/emoji/facebook_messenger/sunflower.png differ
diff --git a/public/images/emoji/facebook_messenger/sunglasses.png b/public/images/emoji/facebook_messenger/sunglasses.png
index e1ed3118061..430be8ac236 100644
Binary files a/public/images/emoji/facebook_messenger/sunglasses.png and b/public/images/emoji/facebook_messenger/sunglasses.png differ
diff --git a/public/images/emoji/facebook_messenger/sunny.png b/public/images/emoji/facebook_messenger/sunny.png
index 02632bb3dfe..0bbab9a719e 100644
Binary files a/public/images/emoji/facebook_messenger/sunny.png and b/public/images/emoji/facebook_messenger/sunny.png differ
diff --git a/public/images/emoji/facebook_messenger/sunrise.png b/public/images/emoji/facebook_messenger/sunrise.png
index b10c95a0e97..e5f45ef92cf 100644
Binary files a/public/images/emoji/facebook_messenger/sunrise.png and b/public/images/emoji/facebook_messenger/sunrise.png differ
diff --git a/public/images/emoji/facebook_messenger/sunrise_over_mountains.png b/public/images/emoji/facebook_messenger/sunrise_over_mountains.png
index 5642e6c0ca7..b5529673aa4 100644
Binary files a/public/images/emoji/facebook_messenger/sunrise_over_mountains.png and b/public/images/emoji/facebook_messenger/sunrise_over_mountains.png differ
diff --git a/public/images/emoji/facebook_messenger/surfer.png b/public/images/emoji/facebook_messenger/surfer.png
index 0d12c43c8bf..1cbae8ae1fa 100644
Binary files a/public/images/emoji/facebook_messenger/surfer.png and b/public/images/emoji/facebook_messenger/surfer.png differ
diff --git a/public/images/emoji/facebook_messenger/surfer/2.png b/public/images/emoji/facebook_messenger/surfer/2.png
index 596085dc017..04d624820bd 100644
Binary files a/public/images/emoji/facebook_messenger/surfer/2.png and b/public/images/emoji/facebook_messenger/surfer/2.png differ
diff --git a/public/images/emoji/facebook_messenger/surfer/3.png b/public/images/emoji/facebook_messenger/surfer/3.png
index 2ddb34c2507..998fb376d92 100644
Binary files a/public/images/emoji/facebook_messenger/surfer/3.png and b/public/images/emoji/facebook_messenger/surfer/3.png differ
diff --git a/public/images/emoji/facebook_messenger/surfer/4.png b/public/images/emoji/facebook_messenger/surfer/4.png
index 46785c0494c..643c9ef7245 100644
Binary files a/public/images/emoji/facebook_messenger/surfer/4.png and b/public/images/emoji/facebook_messenger/surfer/4.png differ
diff --git a/public/images/emoji/facebook_messenger/surfer/5.png b/public/images/emoji/facebook_messenger/surfer/5.png
index d241b79d590..afd256b0eb6 100644
Binary files a/public/images/emoji/facebook_messenger/surfer/5.png and b/public/images/emoji/facebook_messenger/surfer/5.png differ
diff --git a/public/images/emoji/facebook_messenger/surfer/6.png b/public/images/emoji/facebook_messenger/surfer/6.png
index d6b178659cb..62e204af783 100644
Binary files a/public/images/emoji/facebook_messenger/surfer/6.png and b/public/images/emoji/facebook_messenger/surfer/6.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_man.png b/public/images/emoji/facebook_messenger/surfing_man.png
index 0d12c43c8bf..1cbae8ae1fa 100644
Binary files a/public/images/emoji/facebook_messenger/surfing_man.png and b/public/images/emoji/facebook_messenger/surfing_man.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_man/2.png b/public/images/emoji/facebook_messenger/surfing_man/2.png
index 596085dc017..04d624820bd 100644
Binary files a/public/images/emoji/facebook_messenger/surfing_man/2.png and b/public/images/emoji/facebook_messenger/surfing_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_man/3.png b/public/images/emoji/facebook_messenger/surfing_man/3.png
index 2ddb34c2507..998fb376d92 100644
Binary files a/public/images/emoji/facebook_messenger/surfing_man/3.png and b/public/images/emoji/facebook_messenger/surfing_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_man/4.png b/public/images/emoji/facebook_messenger/surfing_man/4.png
index 46785c0494c..643c9ef7245 100644
Binary files a/public/images/emoji/facebook_messenger/surfing_man/4.png and b/public/images/emoji/facebook_messenger/surfing_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_man/5.png b/public/images/emoji/facebook_messenger/surfing_man/5.png
index d241b79d590..afd256b0eb6 100644
Binary files a/public/images/emoji/facebook_messenger/surfing_man/5.png and b/public/images/emoji/facebook_messenger/surfing_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_man/6.png b/public/images/emoji/facebook_messenger/surfing_man/6.png
index d6b178659cb..62e204af783 100644
Binary files a/public/images/emoji/facebook_messenger/surfing_man/6.png and b/public/images/emoji/facebook_messenger/surfing_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_woman.png b/public/images/emoji/facebook_messenger/surfing_woman.png
index 5a5e1cefda9..c48f0ec9b38 100644
Binary files a/public/images/emoji/facebook_messenger/surfing_woman.png and b/public/images/emoji/facebook_messenger/surfing_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_woman/2.png b/public/images/emoji/facebook_messenger/surfing_woman/2.png
index c66e258d1c7..b660f1eb446 100644
Binary files a/public/images/emoji/facebook_messenger/surfing_woman/2.png and b/public/images/emoji/facebook_messenger/surfing_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_woman/3.png b/public/images/emoji/facebook_messenger/surfing_woman/3.png
index 0e9b7989d64..7f75d6f39f3 100644
Binary files a/public/images/emoji/facebook_messenger/surfing_woman/3.png and b/public/images/emoji/facebook_messenger/surfing_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_woman/4.png b/public/images/emoji/facebook_messenger/surfing_woman/4.png
index 50f43ce0700..1df15c3023e 100644
Binary files a/public/images/emoji/facebook_messenger/surfing_woman/4.png and b/public/images/emoji/facebook_messenger/surfing_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_woman/5.png b/public/images/emoji/facebook_messenger/surfing_woman/5.png
index 99d3d275355..449f23efc86 100644
Binary files a/public/images/emoji/facebook_messenger/surfing_woman/5.png and b/public/images/emoji/facebook_messenger/surfing_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_woman/6.png b/public/images/emoji/facebook_messenger/surfing_woman/6.png
index f30dff2f5a9..3f90f910e43 100644
Binary files a/public/images/emoji/facebook_messenger/surfing_woman/6.png and b/public/images/emoji/facebook_messenger/surfing_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/suriname.png b/public/images/emoji/facebook_messenger/suriname.png
index 48afc4adac5..86caff504a7 100644
Binary files a/public/images/emoji/facebook_messenger/suriname.png and b/public/images/emoji/facebook_messenger/suriname.png differ
diff --git a/public/images/emoji/facebook_messenger/sushi.png b/public/images/emoji/facebook_messenger/sushi.png
index a388ce9d65a..f4bd6263b6e 100644
Binary files a/public/images/emoji/facebook_messenger/sushi.png and b/public/images/emoji/facebook_messenger/sushi.png differ
diff --git a/public/images/emoji/facebook_messenger/suspension_railway.png b/public/images/emoji/facebook_messenger/suspension_railway.png
index 3dd6dc2e8a0..bab0b96ae44 100644
Binary files a/public/images/emoji/facebook_messenger/suspension_railway.png and b/public/images/emoji/facebook_messenger/suspension_railway.png differ
diff --git a/public/images/emoji/facebook_messenger/svalbard_and_jan_mayen.png b/public/images/emoji/facebook_messenger/svalbard_and_jan_mayen.png
index 004a11d8308..d2cd8f67f28 100644
Binary files a/public/images/emoji/facebook_messenger/svalbard_and_jan_mayen.png and b/public/images/emoji/facebook_messenger/svalbard_and_jan_mayen.png differ
diff --git a/public/images/emoji/facebook_messenger/swaziland.png b/public/images/emoji/facebook_messenger/swaziland.png
index fb5ee97ba24..8e83a676aec 100644
Binary files a/public/images/emoji/facebook_messenger/swaziland.png and b/public/images/emoji/facebook_messenger/swaziland.png differ
diff --git a/public/images/emoji/facebook_messenger/sweat.png b/public/images/emoji/facebook_messenger/sweat.png
index 0f6075cbcce..4dfa75e54db 100644
Binary files a/public/images/emoji/facebook_messenger/sweat.png and b/public/images/emoji/facebook_messenger/sweat.png differ
diff --git a/public/images/emoji/facebook_messenger/sweat_drops.png b/public/images/emoji/facebook_messenger/sweat_drops.png
index 2555ca7db40..6f417fbfc15 100644
Binary files a/public/images/emoji/facebook_messenger/sweat_drops.png and b/public/images/emoji/facebook_messenger/sweat_drops.png differ
diff --git a/public/images/emoji/facebook_messenger/sweat_smile.png b/public/images/emoji/facebook_messenger/sweat_smile.png
index f910451ae6c..dc7c2a0f1ef 100644
Binary files a/public/images/emoji/facebook_messenger/sweat_smile.png and b/public/images/emoji/facebook_messenger/sweat_smile.png differ
diff --git a/public/images/emoji/facebook_messenger/sweden.png b/public/images/emoji/facebook_messenger/sweden.png
index 7274789f2eb..2235439563b 100644
Binary files a/public/images/emoji/facebook_messenger/sweden.png and b/public/images/emoji/facebook_messenger/sweden.png differ
diff --git a/public/images/emoji/facebook_messenger/sweet_potato.png b/public/images/emoji/facebook_messenger/sweet_potato.png
index cf664331449..a977184a2bf 100644
Binary files a/public/images/emoji/facebook_messenger/sweet_potato.png and b/public/images/emoji/facebook_messenger/sweet_potato.png differ
diff --git a/public/images/emoji/facebook_messenger/swimmer.png b/public/images/emoji/facebook_messenger/swimmer.png
index 4ef1cc186fa..f60b6a5a321 100644
Binary files a/public/images/emoji/facebook_messenger/swimmer.png and b/public/images/emoji/facebook_messenger/swimmer.png differ
diff --git a/public/images/emoji/facebook_messenger/swimmer/2.png b/public/images/emoji/facebook_messenger/swimmer/2.png
index c6140b93bb3..4f00d13f3e7 100644
Binary files a/public/images/emoji/facebook_messenger/swimmer/2.png and b/public/images/emoji/facebook_messenger/swimmer/2.png differ
diff --git a/public/images/emoji/facebook_messenger/swimmer/3.png b/public/images/emoji/facebook_messenger/swimmer/3.png
index cdb3af693aa..1a09aba9437 100644
Binary files a/public/images/emoji/facebook_messenger/swimmer/3.png and b/public/images/emoji/facebook_messenger/swimmer/3.png differ
diff --git a/public/images/emoji/facebook_messenger/swimmer/4.png b/public/images/emoji/facebook_messenger/swimmer/4.png
index 989a36b8c83..6bae69f3708 100644
Binary files a/public/images/emoji/facebook_messenger/swimmer/4.png and b/public/images/emoji/facebook_messenger/swimmer/4.png differ
diff --git a/public/images/emoji/facebook_messenger/swimmer/5.png b/public/images/emoji/facebook_messenger/swimmer/5.png
index ab6537f51e7..938f5a497f0 100644
Binary files a/public/images/emoji/facebook_messenger/swimmer/5.png and b/public/images/emoji/facebook_messenger/swimmer/5.png differ
diff --git a/public/images/emoji/facebook_messenger/swimmer/6.png b/public/images/emoji/facebook_messenger/swimmer/6.png
index d49ea483d20..a45e2917c19 100644
Binary files a/public/images/emoji/facebook_messenger/swimmer/6.png and b/public/images/emoji/facebook_messenger/swimmer/6.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_man.png b/public/images/emoji/facebook_messenger/swimming_man.png
index 4ef1cc186fa..f60b6a5a321 100644
Binary files a/public/images/emoji/facebook_messenger/swimming_man.png and b/public/images/emoji/facebook_messenger/swimming_man.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_man/2.png b/public/images/emoji/facebook_messenger/swimming_man/2.png
index c6140b93bb3..4f00d13f3e7 100644
Binary files a/public/images/emoji/facebook_messenger/swimming_man/2.png and b/public/images/emoji/facebook_messenger/swimming_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_man/3.png b/public/images/emoji/facebook_messenger/swimming_man/3.png
index cdb3af693aa..1a09aba9437 100644
Binary files a/public/images/emoji/facebook_messenger/swimming_man/3.png and b/public/images/emoji/facebook_messenger/swimming_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_man/4.png b/public/images/emoji/facebook_messenger/swimming_man/4.png
index 989a36b8c83..6bae69f3708 100644
Binary files a/public/images/emoji/facebook_messenger/swimming_man/4.png and b/public/images/emoji/facebook_messenger/swimming_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_man/5.png b/public/images/emoji/facebook_messenger/swimming_man/5.png
index ab6537f51e7..938f5a497f0 100644
Binary files a/public/images/emoji/facebook_messenger/swimming_man/5.png and b/public/images/emoji/facebook_messenger/swimming_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_man/6.png b/public/images/emoji/facebook_messenger/swimming_man/6.png
index d49ea483d20..a45e2917c19 100644
Binary files a/public/images/emoji/facebook_messenger/swimming_man/6.png and b/public/images/emoji/facebook_messenger/swimming_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_woman.png b/public/images/emoji/facebook_messenger/swimming_woman.png
index 9963221f611..3c6323c0c8b 100644
Binary files a/public/images/emoji/facebook_messenger/swimming_woman.png and b/public/images/emoji/facebook_messenger/swimming_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_woman/2.png b/public/images/emoji/facebook_messenger/swimming_woman/2.png
index 59dad2c3e13..16a14ad260e 100644
Binary files a/public/images/emoji/facebook_messenger/swimming_woman/2.png and b/public/images/emoji/facebook_messenger/swimming_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_woman/3.png b/public/images/emoji/facebook_messenger/swimming_woman/3.png
index 66e962335cf..789b80a56e0 100644
Binary files a/public/images/emoji/facebook_messenger/swimming_woman/3.png and b/public/images/emoji/facebook_messenger/swimming_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_woman/4.png b/public/images/emoji/facebook_messenger/swimming_woman/4.png
index 9414644c3e8..acf859962a4 100644
Binary files a/public/images/emoji/facebook_messenger/swimming_woman/4.png and b/public/images/emoji/facebook_messenger/swimming_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_woman/5.png b/public/images/emoji/facebook_messenger/swimming_woman/5.png
index ebde0eb37c5..44696ca0c4d 100644
Binary files a/public/images/emoji/facebook_messenger/swimming_woman/5.png and b/public/images/emoji/facebook_messenger/swimming_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_woman/6.png b/public/images/emoji/facebook_messenger/swimming_woman/6.png
index d294454be94..b7774e020fe 100644
Binary files a/public/images/emoji/facebook_messenger/swimming_woman/6.png and b/public/images/emoji/facebook_messenger/swimming_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/switzerland.png b/public/images/emoji/facebook_messenger/switzerland.png
index 9e47fad1aed..dc6c36ac898 100644
Binary files a/public/images/emoji/facebook_messenger/switzerland.png and b/public/images/emoji/facebook_messenger/switzerland.png differ
diff --git a/public/images/emoji/facebook_messenger/symbols.png b/public/images/emoji/facebook_messenger/symbols.png
index def3faa02a7..87e3f439b63 100644
Binary files a/public/images/emoji/facebook_messenger/symbols.png and b/public/images/emoji/facebook_messenger/symbols.png differ
diff --git a/public/images/emoji/facebook_messenger/synagogue.png b/public/images/emoji/facebook_messenger/synagogue.png
index c72b028f247..b4499308213 100644
Binary files a/public/images/emoji/facebook_messenger/synagogue.png and b/public/images/emoji/facebook_messenger/synagogue.png differ
diff --git a/public/images/emoji/facebook_messenger/syria.png b/public/images/emoji/facebook_messenger/syria.png
index 53606f3e075..cc83b9c6a26 100644
Binary files a/public/images/emoji/facebook_messenger/syria.png and b/public/images/emoji/facebook_messenger/syria.png differ
diff --git a/public/images/emoji/facebook_messenger/syringe.png b/public/images/emoji/facebook_messenger/syringe.png
index 45cf34b2a12..188e7156c68 100644
Binary files a/public/images/emoji/facebook_messenger/syringe.png and b/public/images/emoji/facebook_messenger/syringe.png differ
diff --git a/public/images/emoji/facebook_messenger/t_rex.png b/public/images/emoji/facebook_messenger/t_rex.png
index d8811a56382..d0d1c7b5d7a 100644
Binary files a/public/images/emoji/facebook_messenger/t_rex.png and b/public/images/emoji/facebook_messenger/t_rex.png differ
diff --git a/public/images/emoji/facebook_messenger/table_tennis.png b/public/images/emoji/facebook_messenger/table_tennis.png
index 935993c8608..4b18adbad40 100644
Binary files a/public/images/emoji/facebook_messenger/table_tennis.png and b/public/images/emoji/facebook_messenger/table_tennis.png differ
diff --git a/public/images/emoji/facebook_messenger/taco.png b/public/images/emoji/facebook_messenger/taco.png
index 14247eb307a..a9e6dda0e06 100644
Binary files a/public/images/emoji/facebook_messenger/taco.png and b/public/images/emoji/facebook_messenger/taco.png differ
diff --git a/public/images/emoji/facebook_messenger/tada.png b/public/images/emoji/facebook_messenger/tada.png
index ae95549f3ba..ad69b893f86 100644
Binary files a/public/images/emoji/facebook_messenger/tada.png and b/public/images/emoji/facebook_messenger/tada.png differ
diff --git a/public/images/emoji/facebook_messenger/taiwan.png b/public/images/emoji/facebook_messenger/taiwan.png
index dde348b40da..d214347a7bf 100644
Binary files a/public/images/emoji/facebook_messenger/taiwan.png and b/public/images/emoji/facebook_messenger/taiwan.png differ
diff --git a/public/images/emoji/facebook_messenger/tajikistan.png b/public/images/emoji/facebook_messenger/tajikistan.png
index 7b3697952d5..f3a67c9a97d 100644
Binary files a/public/images/emoji/facebook_messenger/tajikistan.png and b/public/images/emoji/facebook_messenger/tajikistan.png differ
diff --git a/public/images/emoji/facebook_messenger/takeout_box.png b/public/images/emoji/facebook_messenger/takeout_box.png
index 08aa6a4843f..17c638d5c47 100644
Binary files a/public/images/emoji/facebook_messenger/takeout_box.png and b/public/images/emoji/facebook_messenger/takeout_box.png differ
diff --git a/public/images/emoji/facebook_messenger/tanabata_tree.png b/public/images/emoji/facebook_messenger/tanabata_tree.png
index ddf022c97fa..6c160bc7b3a 100644
Binary files a/public/images/emoji/facebook_messenger/tanabata_tree.png and b/public/images/emoji/facebook_messenger/tanabata_tree.png differ
diff --git a/public/images/emoji/facebook_messenger/tangerine.png b/public/images/emoji/facebook_messenger/tangerine.png
index 369113f279e..f6b80683966 100644
Binary files a/public/images/emoji/facebook_messenger/tangerine.png and b/public/images/emoji/facebook_messenger/tangerine.png differ
diff --git a/public/images/emoji/facebook_messenger/tanzania.png b/public/images/emoji/facebook_messenger/tanzania.png
index d4026fea320..d79422df003 100644
Binary files a/public/images/emoji/facebook_messenger/tanzania.png and b/public/images/emoji/facebook_messenger/tanzania.png differ
diff --git a/public/images/emoji/facebook_messenger/taurus.png b/public/images/emoji/facebook_messenger/taurus.png
index 0fc8505969d..6064dce482e 100644
Binary files a/public/images/emoji/facebook_messenger/taurus.png and b/public/images/emoji/facebook_messenger/taurus.png differ
diff --git a/public/images/emoji/facebook_messenger/taxi.png b/public/images/emoji/facebook_messenger/taxi.png
index 3097c343af5..4e97b62afcb 100644
Binary files a/public/images/emoji/facebook_messenger/taxi.png and b/public/images/emoji/facebook_messenger/taxi.png differ
diff --git a/public/images/emoji/facebook_messenger/tea.png b/public/images/emoji/facebook_messenger/tea.png
index e8ea9431140..0b8d1891a90 100644
Binary files a/public/images/emoji/facebook_messenger/tea.png and b/public/images/emoji/facebook_messenger/tea.png differ
diff --git a/public/images/emoji/facebook_messenger/telephone.png b/public/images/emoji/facebook_messenger/telephone.png
index b8bbec494d3..13b38ac3c69 100644
Binary files a/public/images/emoji/facebook_messenger/telephone.png and b/public/images/emoji/facebook_messenger/telephone.png differ
diff --git a/public/images/emoji/facebook_messenger/telephone_receiver.png b/public/images/emoji/facebook_messenger/telephone_receiver.png
index ec5f5e89cc7..d903dbd15b7 100644
Binary files a/public/images/emoji/facebook_messenger/telephone_receiver.png and b/public/images/emoji/facebook_messenger/telephone_receiver.png differ
diff --git a/public/images/emoji/facebook_messenger/telescope.png b/public/images/emoji/facebook_messenger/telescope.png
index e01c0f8aaca..cc1a4c5b00d 100644
Binary files a/public/images/emoji/facebook_messenger/telescope.png and b/public/images/emoji/facebook_messenger/telescope.png differ
diff --git a/public/images/emoji/facebook_messenger/ten.png b/public/images/emoji/facebook_messenger/ten.png
index 12264637b0b..c0beb67e22a 100644
Binary files a/public/images/emoji/facebook_messenger/ten.png and b/public/images/emoji/facebook_messenger/ten.png differ
diff --git a/public/images/emoji/facebook_messenger/tennis.png b/public/images/emoji/facebook_messenger/tennis.png
index bddde41f5ac..bc7770211a2 100644
Binary files a/public/images/emoji/facebook_messenger/tennis.png and b/public/images/emoji/facebook_messenger/tennis.png differ
diff --git a/public/images/emoji/facebook_messenger/tent.png b/public/images/emoji/facebook_messenger/tent.png
index 22617eb275f..c6d5353e418 100644
Binary files a/public/images/emoji/facebook_messenger/tent.png and b/public/images/emoji/facebook_messenger/tent.png differ
diff --git a/public/images/emoji/facebook_messenger/thailand.png b/public/images/emoji/facebook_messenger/thailand.png
index 81499f16168..62cc8d3d17f 100644
Binary files a/public/images/emoji/facebook_messenger/thailand.png and b/public/images/emoji/facebook_messenger/thailand.png differ
diff --git a/public/images/emoji/facebook_messenger/thermometer.png b/public/images/emoji/facebook_messenger/thermometer.png
index eef50895b07..77638009bd9 100644
Binary files a/public/images/emoji/facebook_messenger/thermometer.png and b/public/images/emoji/facebook_messenger/thermometer.png differ
diff --git a/public/images/emoji/facebook_messenger/thermometer_face.png b/public/images/emoji/facebook_messenger/thermometer_face.png
index c9440239c0d..9c4da3e1fc6 100644
Binary files a/public/images/emoji/facebook_messenger/thermometer_face.png and b/public/images/emoji/facebook_messenger/thermometer_face.png differ
diff --git a/public/images/emoji/facebook_messenger/thinking.png b/public/images/emoji/facebook_messenger/thinking.png
index f1bc0726a29..2d0aeb611bb 100644
Binary files a/public/images/emoji/facebook_messenger/thinking.png and b/public/images/emoji/facebook_messenger/thinking.png differ
diff --git a/public/images/emoji/facebook_messenger/thinking_face.png b/public/images/emoji/facebook_messenger/thinking_face.png
index f1bc0726a29..2d0aeb611bb 100644
Binary files a/public/images/emoji/facebook_messenger/thinking_face.png and b/public/images/emoji/facebook_messenger/thinking_face.png differ
diff --git a/public/images/emoji/facebook_messenger/thought_balloon.png b/public/images/emoji/facebook_messenger/thought_balloon.png
index a8cae3276a5..0c698c1a868 100644
Binary files a/public/images/emoji/facebook_messenger/thought_balloon.png and b/public/images/emoji/facebook_messenger/thought_balloon.png differ
diff --git a/public/images/emoji/facebook_messenger/three.png b/public/images/emoji/facebook_messenger/three.png
index e57e2a8272d..3fb7f86e6ca 100644
Binary files a/public/images/emoji/facebook_messenger/three.png and b/public/images/emoji/facebook_messenger/three.png differ
diff --git a/public/images/emoji/facebook_messenger/three_button_mouse.png b/public/images/emoji/facebook_messenger/three_button_mouse.png
index 3a71c800c68..53fdef1f76f 100644
Binary files a/public/images/emoji/facebook_messenger/three_button_mouse.png and b/public/images/emoji/facebook_messenger/three_button_mouse.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsdown.png b/public/images/emoji/facebook_messenger/thumbsdown.png
index 1f6f64836b5..6a7dce2614d 100644
Binary files a/public/images/emoji/facebook_messenger/thumbsdown.png and b/public/images/emoji/facebook_messenger/thumbsdown.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsdown/2.png b/public/images/emoji/facebook_messenger/thumbsdown/2.png
index e706d7c7a54..ceaa32b82f6 100644
Binary files a/public/images/emoji/facebook_messenger/thumbsdown/2.png and b/public/images/emoji/facebook_messenger/thumbsdown/2.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsdown/3.png b/public/images/emoji/facebook_messenger/thumbsdown/3.png
index 9bf7711367e..c6d370ce27a 100644
Binary files a/public/images/emoji/facebook_messenger/thumbsdown/3.png and b/public/images/emoji/facebook_messenger/thumbsdown/3.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsdown/4.png b/public/images/emoji/facebook_messenger/thumbsdown/4.png
index 35fc141cba2..212f843ce9d 100644
Binary files a/public/images/emoji/facebook_messenger/thumbsdown/4.png and b/public/images/emoji/facebook_messenger/thumbsdown/4.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsdown/5.png b/public/images/emoji/facebook_messenger/thumbsdown/5.png
index bd43bad3049..2b2cf805484 100644
Binary files a/public/images/emoji/facebook_messenger/thumbsdown/5.png and b/public/images/emoji/facebook_messenger/thumbsdown/5.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsdown/6.png b/public/images/emoji/facebook_messenger/thumbsdown/6.png
index 5b682877029..deb44ca2b37 100644
Binary files a/public/images/emoji/facebook_messenger/thumbsdown/6.png and b/public/images/emoji/facebook_messenger/thumbsdown/6.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsup.png b/public/images/emoji/facebook_messenger/thumbsup.png
index 6621dc4a7bd..53f1b3d0756 100644
Binary files a/public/images/emoji/facebook_messenger/thumbsup.png and b/public/images/emoji/facebook_messenger/thumbsup.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsup/2.png b/public/images/emoji/facebook_messenger/thumbsup/2.png
index 37b29f3252d..eb5da604ede 100644
Binary files a/public/images/emoji/facebook_messenger/thumbsup/2.png and b/public/images/emoji/facebook_messenger/thumbsup/2.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsup/3.png b/public/images/emoji/facebook_messenger/thumbsup/3.png
index c7aa5375582..192910cdc26 100644
Binary files a/public/images/emoji/facebook_messenger/thumbsup/3.png and b/public/images/emoji/facebook_messenger/thumbsup/3.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsup/4.png b/public/images/emoji/facebook_messenger/thumbsup/4.png
index 1e24d40e565..ec447b30766 100644
Binary files a/public/images/emoji/facebook_messenger/thumbsup/4.png and b/public/images/emoji/facebook_messenger/thumbsup/4.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsup/5.png b/public/images/emoji/facebook_messenger/thumbsup/5.png
index 5b1740d87b2..e09b86a9f12 100644
Binary files a/public/images/emoji/facebook_messenger/thumbsup/5.png and b/public/images/emoji/facebook_messenger/thumbsup/5.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsup/6.png b/public/images/emoji/facebook_messenger/thumbsup/6.png
index e67bd06a2ac..b43fad6805e 100644
Binary files a/public/images/emoji/facebook_messenger/thumbsup/6.png and b/public/images/emoji/facebook_messenger/thumbsup/6.png differ
diff --git a/public/images/emoji/facebook_messenger/thunder_cloud_and_rain.png b/public/images/emoji/facebook_messenger/thunder_cloud_and_rain.png
index be44d531a75..943482554f5 100644
Binary files a/public/images/emoji/facebook_messenger/thunder_cloud_and_rain.png and b/public/images/emoji/facebook_messenger/thunder_cloud_and_rain.png differ
diff --git a/public/images/emoji/facebook_messenger/thunder_cloud_rain.png b/public/images/emoji/facebook_messenger/thunder_cloud_rain.png
index be44d531a75..943482554f5 100644
Binary files a/public/images/emoji/facebook_messenger/thunder_cloud_rain.png and b/public/images/emoji/facebook_messenger/thunder_cloud_rain.png differ
diff --git a/public/images/emoji/facebook_messenger/ticket.png b/public/images/emoji/facebook_messenger/ticket.png
index 2894d403000..60ce4aea217 100644
Binary files a/public/images/emoji/facebook_messenger/ticket.png and b/public/images/emoji/facebook_messenger/ticket.png differ
diff --git a/public/images/emoji/facebook_messenger/tickets.png b/public/images/emoji/facebook_messenger/tickets.png
index 295e9bbdc6d..e863f088be8 100644
Binary files a/public/images/emoji/facebook_messenger/tickets.png and b/public/images/emoji/facebook_messenger/tickets.png differ
diff --git a/public/images/emoji/facebook_messenger/tiger.png b/public/images/emoji/facebook_messenger/tiger.png
index c393c38d499..ddfd859a666 100644
Binary files a/public/images/emoji/facebook_messenger/tiger.png and b/public/images/emoji/facebook_messenger/tiger.png differ
diff --git a/public/images/emoji/facebook_messenger/tiger2.png b/public/images/emoji/facebook_messenger/tiger2.png
index 9934d6e85b4..9f117a09580 100644
Binary files a/public/images/emoji/facebook_messenger/tiger2.png and b/public/images/emoji/facebook_messenger/tiger2.png differ
diff --git a/public/images/emoji/facebook_messenger/timer.png b/public/images/emoji/facebook_messenger/timer.png
index 31f31d89371..e3142522f78 100644
Binary files a/public/images/emoji/facebook_messenger/timer.png and b/public/images/emoji/facebook_messenger/timer.png differ
diff --git a/public/images/emoji/facebook_messenger/timer_clock.png b/public/images/emoji/facebook_messenger/timer_clock.png
index 31f31d89371..e3142522f78 100644
Binary files a/public/images/emoji/facebook_messenger/timer_clock.png and b/public/images/emoji/facebook_messenger/timer_clock.png differ
diff --git a/public/images/emoji/facebook_messenger/timor_leste.png b/public/images/emoji/facebook_messenger/timor_leste.png
index 6706def9912..68b2faeb7a5 100644
Binary files a/public/images/emoji/facebook_messenger/timor_leste.png and b/public/images/emoji/facebook_messenger/timor_leste.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_man.png b/public/images/emoji/facebook_messenger/tipping_hand_man.png
index 63e5492220b..775e5ad35da 100644
Binary files a/public/images/emoji/facebook_messenger/tipping_hand_man.png and b/public/images/emoji/facebook_messenger/tipping_hand_man.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_man/2.png b/public/images/emoji/facebook_messenger/tipping_hand_man/2.png
index aec62f49f46..5ab668a8caa 100644
Binary files a/public/images/emoji/facebook_messenger/tipping_hand_man/2.png and b/public/images/emoji/facebook_messenger/tipping_hand_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_man/3.png b/public/images/emoji/facebook_messenger/tipping_hand_man/3.png
index 92e1fe7d224..ddef3f13e9e 100644
Binary files a/public/images/emoji/facebook_messenger/tipping_hand_man/3.png and b/public/images/emoji/facebook_messenger/tipping_hand_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_man/4.png b/public/images/emoji/facebook_messenger/tipping_hand_man/4.png
index 813113bb9c5..5e996a9924d 100644
Binary files a/public/images/emoji/facebook_messenger/tipping_hand_man/4.png and b/public/images/emoji/facebook_messenger/tipping_hand_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_man/5.png b/public/images/emoji/facebook_messenger/tipping_hand_man/5.png
index a2f29fdac94..7fd82d72744 100644
Binary files a/public/images/emoji/facebook_messenger/tipping_hand_man/5.png and b/public/images/emoji/facebook_messenger/tipping_hand_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_man/6.png b/public/images/emoji/facebook_messenger/tipping_hand_man/6.png
index fa68bdb53aa..8200d03e20c 100644
Binary files a/public/images/emoji/facebook_messenger/tipping_hand_man/6.png and b/public/images/emoji/facebook_messenger/tipping_hand_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_woman.png b/public/images/emoji/facebook_messenger/tipping_hand_woman.png
index 17d66f473bd..45ca8d273d9 100644
Binary files a/public/images/emoji/facebook_messenger/tipping_hand_woman.png and b/public/images/emoji/facebook_messenger/tipping_hand_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_woman/2.png b/public/images/emoji/facebook_messenger/tipping_hand_woman/2.png
index 92055ff0cd9..ee2883ad57c 100644
Binary files a/public/images/emoji/facebook_messenger/tipping_hand_woman/2.png and b/public/images/emoji/facebook_messenger/tipping_hand_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_woman/3.png b/public/images/emoji/facebook_messenger/tipping_hand_woman/3.png
index 2c8a485a1f4..e98fdbc0e28 100644
Binary files a/public/images/emoji/facebook_messenger/tipping_hand_woman/3.png and b/public/images/emoji/facebook_messenger/tipping_hand_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_woman/4.png b/public/images/emoji/facebook_messenger/tipping_hand_woman/4.png
index 890ae929d22..a74a2177985 100644
Binary files a/public/images/emoji/facebook_messenger/tipping_hand_woman/4.png and b/public/images/emoji/facebook_messenger/tipping_hand_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_woman/5.png b/public/images/emoji/facebook_messenger/tipping_hand_woman/5.png
index c7228bf6a8c..03f6a7303e2 100644
Binary files a/public/images/emoji/facebook_messenger/tipping_hand_woman/5.png and b/public/images/emoji/facebook_messenger/tipping_hand_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_woman/6.png b/public/images/emoji/facebook_messenger/tipping_hand_woman/6.png
index f02f68988a0..994308cee8c 100644
Binary files a/public/images/emoji/facebook_messenger/tipping_hand_woman/6.png and b/public/images/emoji/facebook_messenger/tipping_hand_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/tired_face.png b/public/images/emoji/facebook_messenger/tired_face.png
index d1d6a8b748b..311464115c2 100644
Binary files a/public/images/emoji/facebook_messenger/tired_face.png and b/public/images/emoji/facebook_messenger/tired_face.png differ
diff --git a/public/images/emoji/facebook_messenger/tm.png b/public/images/emoji/facebook_messenger/tm.png
index d18a8b8004d..9d86f2f7066 100644
Binary files a/public/images/emoji/facebook_messenger/tm.png and b/public/images/emoji/facebook_messenger/tm.png differ
diff --git a/public/images/emoji/facebook_messenger/togo.png b/public/images/emoji/facebook_messenger/togo.png
index 7a542547e05..260a81c7024 100644
Binary files a/public/images/emoji/facebook_messenger/togo.png and b/public/images/emoji/facebook_messenger/togo.png differ
diff --git a/public/images/emoji/facebook_messenger/toilet.png b/public/images/emoji/facebook_messenger/toilet.png
index 99d7a913ceb..273f4f16a80 100644
Binary files a/public/images/emoji/facebook_messenger/toilet.png and b/public/images/emoji/facebook_messenger/toilet.png differ
diff --git a/public/images/emoji/facebook_messenger/tokelau.png b/public/images/emoji/facebook_messenger/tokelau.png
index f42f8686314..86fd2423cb5 100644
Binary files a/public/images/emoji/facebook_messenger/tokelau.png and b/public/images/emoji/facebook_messenger/tokelau.png differ
diff --git a/public/images/emoji/facebook_messenger/tokyo_tower.png b/public/images/emoji/facebook_messenger/tokyo_tower.png
index f2e7e714e00..d47cd011263 100644
Binary files a/public/images/emoji/facebook_messenger/tokyo_tower.png and b/public/images/emoji/facebook_messenger/tokyo_tower.png differ
diff --git a/public/images/emoji/facebook_messenger/tomato.png b/public/images/emoji/facebook_messenger/tomato.png
index 245cf164624..ed7ad8276bb 100644
Binary files a/public/images/emoji/facebook_messenger/tomato.png and b/public/images/emoji/facebook_messenger/tomato.png differ
diff --git a/public/images/emoji/facebook_messenger/tonga.png b/public/images/emoji/facebook_messenger/tonga.png
index bfff80acf4d..c30d9f93122 100644
Binary files a/public/images/emoji/facebook_messenger/tonga.png and b/public/images/emoji/facebook_messenger/tonga.png differ
diff --git a/public/images/emoji/facebook_messenger/tongue.png b/public/images/emoji/facebook_messenger/tongue.png
index 34fe6e63884..7b1a28827e9 100644
Binary files a/public/images/emoji/facebook_messenger/tongue.png and b/public/images/emoji/facebook_messenger/tongue.png differ
diff --git a/public/images/emoji/facebook_messenger/tools.png b/public/images/emoji/facebook_messenger/tools.png
index 2b7c33b2077..ed213028696 100644
Binary files a/public/images/emoji/facebook_messenger/tools.png and b/public/images/emoji/facebook_messenger/tools.png differ
diff --git a/public/images/emoji/facebook_messenger/top.png b/public/images/emoji/facebook_messenger/top.png
index 323068a7089..da7fbdd93b3 100644
Binary files a/public/images/emoji/facebook_messenger/top.png and b/public/images/emoji/facebook_messenger/top.png differ
diff --git a/public/images/emoji/facebook_messenger/tophat.png b/public/images/emoji/facebook_messenger/tophat.png
index 57b63124678..6bbf03199d1 100644
Binary files a/public/images/emoji/facebook_messenger/tophat.png and b/public/images/emoji/facebook_messenger/tophat.png differ
diff --git a/public/images/emoji/facebook_messenger/tornado.png b/public/images/emoji/facebook_messenger/tornado.png
index fd843824ed3..2de8ec4a694 100644
Binary files a/public/images/emoji/facebook_messenger/tornado.png and b/public/images/emoji/facebook_messenger/tornado.png differ
diff --git a/public/images/emoji/facebook_messenger/tr.png b/public/images/emoji/facebook_messenger/tr.png
index 0658b52963d..8f3fa9a9332 100644
Binary files a/public/images/emoji/facebook_messenger/tr.png and b/public/images/emoji/facebook_messenger/tr.png differ
diff --git a/public/images/emoji/facebook_messenger/track_next.png b/public/images/emoji/facebook_messenger/track_next.png
index 13953da5d7f..73c5fae8b86 100644
Binary files a/public/images/emoji/facebook_messenger/track_next.png and b/public/images/emoji/facebook_messenger/track_next.png differ
diff --git a/public/images/emoji/facebook_messenger/track_previous.png b/public/images/emoji/facebook_messenger/track_previous.png
index ada39abc337..5794a548e01 100644
Binary files a/public/images/emoji/facebook_messenger/track_previous.png and b/public/images/emoji/facebook_messenger/track_previous.png differ
diff --git a/public/images/emoji/facebook_messenger/trackball.png b/public/images/emoji/facebook_messenger/trackball.png
index c2258edc121..39989279795 100644
Binary files a/public/images/emoji/facebook_messenger/trackball.png and b/public/images/emoji/facebook_messenger/trackball.png differ
diff --git a/public/images/emoji/facebook_messenger/tractor.png b/public/images/emoji/facebook_messenger/tractor.png
index a1c1b2765e6..32e2263b83b 100644
Binary files a/public/images/emoji/facebook_messenger/tractor.png and b/public/images/emoji/facebook_messenger/tractor.png differ
diff --git a/public/images/emoji/facebook_messenger/traffic_light.png b/public/images/emoji/facebook_messenger/traffic_light.png
index 2d1a5425a0d..aa315f4d9cd 100644
Binary files a/public/images/emoji/facebook_messenger/traffic_light.png and b/public/images/emoji/facebook_messenger/traffic_light.png differ
diff --git a/public/images/emoji/facebook_messenger/train.png b/public/images/emoji/facebook_messenger/train.png
index 4c70d251dad..9374ae6ca73 100644
Binary files a/public/images/emoji/facebook_messenger/train.png and b/public/images/emoji/facebook_messenger/train.png differ
diff --git a/public/images/emoji/facebook_messenger/train2.png b/public/images/emoji/facebook_messenger/train2.png
index 76fff478a5e..6ffca5b139b 100644
Binary files a/public/images/emoji/facebook_messenger/train2.png and b/public/images/emoji/facebook_messenger/train2.png differ
diff --git a/public/images/emoji/facebook_messenger/tram.png b/public/images/emoji/facebook_messenger/tram.png
index 5b2069a40b5..c0ad1d67690 100644
Binary files a/public/images/emoji/facebook_messenger/tram.png and b/public/images/emoji/facebook_messenger/tram.png differ
diff --git a/public/images/emoji/facebook_messenger/triangular_flag_on_post.png b/public/images/emoji/facebook_messenger/triangular_flag_on_post.png
index e6ff9b471ce..03f9a63b3e3 100644
Binary files a/public/images/emoji/facebook_messenger/triangular_flag_on_post.png and b/public/images/emoji/facebook_messenger/triangular_flag_on_post.png differ
diff --git a/public/images/emoji/facebook_messenger/triangular_ruler.png b/public/images/emoji/facebook_messenger/triangular_ruler.png
index 1a7453442f6..db0ffd4fb44 100644
Binary files a/public/images/emoji/facebook_messenger/triangular_ruler.png and b/public/images/emoji/facebook_messenger/triangular_ruler.png differ
diff --git a/public/images/emoji/facebook_messenger/trident.png b/public/images/emoji/facebook_messenger/trident.png
index fc10c3aa637..c1ad0e9c651 100644
Binary files a/public/images/emoji/facebook_messenger/trident.png and b/public/images/emoji/facebook_messenger/trident.png differ
diff --git a/public/images/emoji/facebook_messenger/trinidad_tobago.png b/public/images/emoji/facebook_messenger/trinidad_tobago.png
index 14355ce15f6..bd3d9c18137 100644
Binary files a/public/images/emoji/facebook_messenger/trinidad_tobago.png and b/public/images/emoji/facebook_messenger/trinidad_tobago.png differ
diff --git a/public/images/emoji/facebook_messenger/tristan_da_cunha.png b/public/images/emoji/facebook_messenger/tristan_da_cunha.png
index dff4791d41b..9939cb1c313 100644
Binary files a/public/images/emoji/facebook_messenger/tristan_da_cunha.png and b/public/images/emoji/facebook_messenger/tristan_da_cunha.png differ
diff --git a/public/images/emoji/facebook_messenger/triumph.png b/public/images/emoji/facebook_messenger/triumph.png
index 3ee0215c96b..d04981c806c 100644
Binary files a/public/images/emoji/facebook_messenger/triumph.png and b/public/images/emoji/facebook_messenger/triumph.png differ
diff --git a/public/images/emoji/facebook_messenger/trolleybus.png b/public/images/emoji/facebook_messenger/trolleybus.png
index 061adebdbf4..05631ee3be3 100644
Binary files a/public/images/emoji/facebook_messenger/trolleybus.png and b/public/images/emoji/facebook_messenger/trolleybus.png differ
diff --git a/public/images/emoji/facebook_messenger/trophy.png b/public/images/emoji/facebook_messenger/trophy.png
index 6724dbaa0df..3c2036979d6 100644
Binary files a/public/images/emoji/facebook_messenger/trophy.png and b/public/images/emoji/facebook_messenger/trophy.png differ
diff --git a/public/images/emoji/facebook_messenger/tropical_drink.png b/public/images/emoji/facebook_messenger/tropical_drink.png
index 25045a45fa0..f2ca1ee7f98 100644
Binary files a/public/images/emoji/facebook_messenger/tropical_drink.png and b/public/images/emoji/facebook_messenger/tropical_drink.png differ
diff --git a/public/images/emoji/facebook_messenger/tropical_fish.png b/public/images/emoji/facebook_messenger/tropical_fish.png
index 6bc8cc88554..653439ee0de 100644
Binary files a/public/images/emoji/facebook_messenger/tropical_fish.png and b/public/images/emoji/facebook_messenger/tropical_fish.png differ
diff --git a/public/images/emoji/facebook_messenger/truck.png b/public/images/emoji/facebook_messenger/truck.png
index 439548faef2..4a6f2a03e86 100644
Binary files a/public/images/emoji/facebook_messenger/truck.png and b/public/images/emoji/facebook_messenger/truck.png differ
diff --git a/public/images/emoji/facebook_messenger/trumpet.png b/public/images/emoji/facebook_messenger/trumpet.png
index 7a17221d89b..50410df53e8 100644
Binary files a/public/images/emoji/facebook_messenger/trumpet.png and b/public/images/emoji/facebook_messenger/trumpet.png differ
diff --git a/public/images/emoji/facebook_messenger/tshirt.png b/public/images/emoji/facebook_messenger/tshirt.png
index f24f758f681..27ba96bfa08 100644
Binary files a/public/images/emoji/facebook_messenger/tshirt.png and b/public/images/emoji/facebook_messenger/tshirt.png differ
diff --git a/public/images/emoji/facebook_messenger/tulip.png b/public/images/emoji/facebook_messenger/tulip.png
index c4eb133b62f..f7bb519dfda 100644
Binary files a/public/images/emoji/facebook_messenger/tulip.png and b/public/images/emoji/facebook_messenger/tulip.png differ
diff --git a/public/images/emoji/facebook_messenger/tumbler_glass.png b/public/images/emoji/facebook_messenger/tumbler_glass.png
index 78db9d6036f..c00c2abcec6 100644
Binary files a/public/images/emoji/facebook_messenger/tumbler_glass.png and b/public/images/emoji/facebook_messenger/tumbler_glass.png differ
diff --git a/public/images/emoji/facebook_messenger/tunisia.png b/public/images/emoji/facebook_messenger/tunisia.png
index 2691b42f09a..d6f02aca4d9 100644
Binary files a/public/images/emoji/facebook_messenger/tunisia.png and b/public/images/emoji/facebook_messenger/tunisia.png differ
diff --git a/public/images/emoji/facebook_messenger/turkey.png b/public/images/emoji/facebook_messenger/turkey.png
index 829f5ffdfca..dadd27b6c2d 100644
Binary files a/public/images/emoji/facebook_messenger/turkey.png and b/public/images/emoji/facebook_messenger/turkey.png differ
diff --git a/public/images/emoji/facebook_messenger/turkmenistan.png b/public/images/emoji/facebook_messenger/turkmenistan.png
index a0729e2c292..de872e5ab39 100644
Binary files a/public/images/emoji/facebook_messenger/turkmenistan.png and b/public/images/emoji/facebook_messenger/turkmenistan.png differ
diff --git a/public/images/emoji/facebook_messenger/turks_caicos_islands.png b/public/images/emoji/facebook_messenger/turks_caicos_islands.png
index bb04d27666c..57e7224b056 100644
Binary files a/public/images/emoji/facebook_messenger/turks_caicos_islands.png and b/public/images/emoji/facebook_messenger/turks_caicos_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/turtle.png b/public/images/emoji/facebook_messenger/turtle.png
index 5095da28535..a70d666d426 100644
Binary files a/public/images/emoji/facebook_messenger/turtle.png and b/public/images/emoji/facebook_messenger/turtle.png differ
diff --git a/public/images/emoji/facebook_messenger/tuvalu.png b/public/images/emoji/facebook_messenger/tuvalu.png
index 60fad11afce..4ab8afadb55 100644
Binary files a/public/images/emoji/facebook_messenger/tuvalu.png and b/public/images/emoji/facebook_messenger/tuvalu.png differ
diff --git a/public/images/emoji/facebook_messenger/tv.png b/public/images/emoji/facebook_messenger/tv.png
index fa8441fc9c0..39b6acee99e 100644
Binary files a/public/images/emoji/facebook_messenger/tv.png and b/public/images/emoji/facebook_messenger/tv.png differ
diff --git a/public/images/emoji/facebook_messenger/twisted_rightwards_arrows.png b/public/images/emoji/facebook_messenger/twisted_rightwards_arrows.png
index f393dfd6d0c..a9505e05ec3 100644
Binary files a/public/images/emoji/facebook_messenger/twisted_rightwards_arrows.png and b/public/images/emoji/facebook_messenger/twisted_rightwards_arrows.png differ
diff --git a/public/images/emoji/facebook_messenger/two.png b/public/images/emoji/facebook_messenger/two.png
index 9bc86e3bec9..735d778dae8 100644
Binary files a/public/images/emoji/facebook_messenger/two.png and b/public/images/emoji/facebook_messenger/two.png differ
diff --git a/public/images/emoji/facebook_messenger/two_hearts.png b/public/images/emoji/facebook_messenger/two_hearts.png
index 33db2c6b331..11ea8487993 100644
Binary files a/public/images/emoji/facebook_messenger/two_hearts.png and b/public/images/emoji/facebook_messenger/two_hearts.png differ
diff --git a/public/images/emoji/facebook_messenger/two_men_holding_hands.png b/public/images/emoji/facebook_messenger/two_men_holding_hands.png
index ab6ad0d2698..7187ed27cdf 100644
Binary files a/public/images/emoji/facebook_messenger/two_men_holding_hands.png and b/public/images/emoji/facebook_messenger/two_men_holding_hands.png differ
diff --git a/public/images/emoji/facebook_messenger/two_women_holding_hands.png b/public/images/emoji/facebook_messenger/two_women_holding_hands.png
index 3ec3b2d8ad8..1de782a8050 100644
Binary files a/public/images/emoji/facebook_messenger/two_women_holding_hands.png and b/public/images/emoji/facebook_messenger/two_women_holding_hands.png differ
diff --git a/public/images/emoji/facebook_messenger/u5272.png b/public/images/emoji/facebook_messenger/u5272.png
index 3622c9a5a1f..58417da4bb0 100644
Binary files a/public/images/emoji/facebook_messenger/u5272.png and b/public/images/emoji/facebook_messenger/u5272.png differ
diff --git a/public/images/emoji/facebook_messenger/u5408.png b/public/images/emoji/facebook_messenger/u5408.png
index 43a08ae3abe..34730b3531f 100644
Binary files a/public/images/emoji/facebook_messenger/u5408.png and b/public/images/emoji/facebook_messenger/u5408.png differ
diff --git a/public/images/emoji/facebook_messenger/u55b6.png b/public/images/emoji/facebook_messenger/u55b6.png
index 03daff78726..524eb808cb0 100644
Binary files a/public/images/emoji/facebook_messenger/u55b6.png and b/public/images/emoji/facebook_messenger/u55b6.png differ
diff --git a/public/images/emoji/facebook_messenger/u6307.png b/public/images/emoji/facebook_messenger/u6307.png
index 976f45493a7..f60c4c036b5 100644
Binary files a/public/images/emoji/facebook_messenger/u6307.png and b/public/images/emoji/facebook_messenger/u6307.png differ
diff --git a/public/images/emoji/facebook_messenger/u6708.png b/public/images/emoji/facebook_messenger/u6708.png
index 510628a9ea8..b01f8cf322b 100644
Binary files a/public/images/emoji/facebook_messenger/u6708.png and b/public/images/emoji/facebook_messenger/u6708.png differ
diff --git a/public/images/emoji/facebook_messenger/u6709.png b/public/images/emoji/facebook_messenger/u6709.png
index 425c1597b01..30a499cd4fe 100644
Binary files a/public/images/emoji/facebook_messenger/u6709.png and b/public/images/emoji/facebook_messenger/u6709.png differ
diff --git a/public/images/emoji/facebook_messenger/u6e80.png b/public/images/emoji/facebook_messenger/u6e80.png
index 47b86f38fd6..781042283b9 100644
Binary files a/public/images/emoji/facebook_messenger/u6e80.png and b/public/images/emoji/facebook_messenger/u6e80.png differ
diff --git a/public/images/emoji/facebook_messenger/u7121.png b/public/images/emoji/facebook_messenger/u7121.png
index 13d13a211a6..430203639d1 100644
Binary files a/public/images/emoji/facebook_messenger/u7121.png and b/public/images/emoji/facebook_messenger/u7121.png differ
diff --git a/public/images/emoji/facebook_messenger/u7533.png b/public/images/emoji/facebook_messenger/u7533.png
index e724d38ddf2..2300499e3ed 100644
Binary files a/public/images/emoji/facebook_messenger/u7533.png and b/public/images/emoji/facebook_messenger/u7533.png differ
diff --git a/public/images/emoji/facebook_messenger/u7981.png b/public/images/emoji/facebook_messenger/u7981.png
index ee222f8d86c..489e87cad90 100644
Binary files a/public/images/emoji/facebook_messenger/u7981.png and b/public/images/emoji/facebook_messenger/u7981.png differ
diff --git a/public/images/emoji/facebook_messenger/u7a7a.png b/public/images/emoji/facebook_messenger/u7a7a.png
index a65626c0727..4b01a34b75c 100644
Binary files a/public/images/emoji/facebook_messenger/u7a7a.png and b/public/images/emoji/facebook_messenger/u7a7a.png differ
diff --git a/public/images/emoji/facebook_messenger/uganda.png b/public/images/emoji/facebook_messenger/uganda.png
index 9541a9fe432..8d6457b4962 100644
Binary files a/public/images/emoji/facebook_messenger/uganda.png and b/public/images/emoji/facebook_messenger/uganda.png differ
diff --git a/public/images/emoji/facebook_messenger/uk.png b/public/images/emoji/facebook_messenger/uk.png
index bc850e7890e..8ba8cda3ac0 100644
Binary files a/public/images/emoji/facebook_messenger/uk.png and b/public/images/emoji/facebook_messenger/uk.png differ
diff --git a/public/images/emoji/facebook_messenger/ukraine.png b/public/images/emoji/facebook_messenger/ukraine.png
index d24b4e827b0..ca0845ef17d 100644
Binary files a/public/images/emoji/facebook_messenger/ukraine.png and b/public/images/emoji/facebook_messenger/ukraine.png differ
diff --git a/public/images/emoji/facebook_messenger/umbrella.png b/public/images/emoji/facebook_messenger/umbrella.png
index adc7a914742..f4b2475b4d8 100644
Binary files a/public/images/emoji/facebook_messenger/umbrella.png and b/public/images/emoji/facebook_messenger/umbrella.png differ
diff --git a/public/images/emoji/facebook_messenger/umbrella2.png b/public/images/emoji/facebook_messenger/umbrella2.png
index ec99aeb164e..d84b97cb0c4 100644
Binary files a/public/images/emoji/facebook_messenger/umbrella2.png and b/public/images/emoji/facebook_messenger/umbrella2.png differ
diff --git a/public/images/emoji/facebook_messenger/umbrella_on_ground.png b/public/images/emoji/facebook_messenger/umbrella_on_ground.png
index 2bb23697b7f..946097af1c3 100644
Binary files a/public/images/emoji/facebook_messenger/umbrella_on_ground.png and b/public/images/emoji/facebook_messenger/umbrella_on_ground.png differ
diff --git a/public/images/emoji/facebook_messenger/unamused.png b/public/images/emoji/facebook_messenger/unamused.png
index 7a753e914af..cc89284c391 100644
Binary files a/public/images/emoji/facebook_messenger/unamused.png and b/public/images/emoji/facebook_messenger/unamused.png differ
diff --git a/public/images/emoji/facebook_messenger/underage.png b/public/images/emoji/facebook_messenger/underage.png
index a1f8047bce4..7bbe01d86a9 100644
Binary files a/public/images/emoji/facebook_messenger/underage.png and b/public/images/emoji/facebook_messenger/underage.png differ
diff --git a/public/images/emoji/facebook_messenger/unicorn.png b/public/images/emoji/facebook_messenger/unicorn.png
index 7b53a8b310a..82f69e1c5c9 100644
Binary files a/public/images/emoji/facebook_messenger/unicorn.png and b/public/images/emoji/facebook_messenger/unicorn.png differ
diff --git a/public/images/emoji/facebook_messenger/unicorn_face.png b/public/images/emoji/facebook_messenger/unicorn_face.png
index 7b53a8b310a..82f69e1c5c9 100644
Binary files a/public/images/emoji/facebook_messenger/unicorn_face.png and b/public/images/emoji/facebook_messenger/unicorn_face.png differ
diff --git a/public/images/emoji/facebook_messenger/united_arab_emirates.png b/public/images/emoji/facebook_messenger/united_arab_emirates.png
index aad7e052856..808d5c203d1 100644
Binary files a/public/images/emoji/facebook_messenger/united_arab_emirates.png and b/public/images/emoji/facebook_messenger/united_arab_emirates.png differ
diff --git a/public/images/emoji/facebook_messenger/united_nations.png b/public/images/emoji/facebook_messenger/united_nations.png
index d695a5cac09..5b27fad62ab 100644
Binary files a/public/images/emoji/facebook_messenger/united_nations.png and b/public/images/emoji/facebook_messenger/united_nations.png differ
diff --git a/public/images/emoji/facebook_messenger/unlock.png b/public/images/emoji/facebook_messenger/unlock.png
index c810256c58d..1a4f4f8c79a 100644
Binary files a/public/images/emoji/facebook_messenger/unlock.png and b/public/images/emoji/facebook_messenger/unlock.png differ
diff --git a/public/images/emoji/facebook_messenger/up.png b/public/images/emoji/facebook_messenger/up.png
index 19b5fb73b4d..f6732b83b23 100644
Binary files a/public/images/emoji/facebook_messenger/up.png and b/public/images/emoji/facebook_messenger/up.png differ
diff --git a/public/images/emoji/facebook_messenger/upside_down.png b/public/images/emoji/facebook_messenger/upside_down.png
index 85c96142cf9..8cb26e59689 100644
Binary files a/public/images/emoji/facebook_messenger/upside_down.png and b/public/images/emoji/facebook_messenger/upside_down.png differ
diff --git a/public/images/emoji/facebook_messenger/upside_down_face.png b/public/images/emoji/facebook_messenger/upside_down_face.png
index 85c96142cf9..8cb26e59689 100644
Binary files a/public/images/emoji/facebook_messenger/upside_down_face.png and b/public/images/emoji/facebook_messenger/upside_down_face.png differ
diff --git a/public/images/emoji/facebook_messenger/urn.png b/public/images/emoji/facebook_messenger/urn.png
index 56112c50ed4..818fa27fb89 100644
Binary files a/public/images/emoji/facebook_messenger/urn.png and b/public/images/emoji/facebook_messenger/urn.png differ
diff --git a/public/images/emoji/facebook_messenger/uruguay.png b/public/images/emoji/facebook_messenger/uruguay.png
index 8196541e261..7a8a93ca675 100644
Binary files a/public/images/emoji/facebook_messenger/uruguay.png and b/public/images/emoji/facebook_messenger/uruguay.png differ
diff --git a/public/images/emoji/facebook_messenger/us.png b/public/images/emoji/facebook_messenger/us.png
index b0c3a76dd6a..103498e0095 100644
Binary files a/public/images/emoji/facebook_messenger/us.png and b/public/images/emoji/facebook_messenger/us.png differ
diff --git a/public/images/emoji/facebook_messenger/us_outlying_islands.png b/public/images/emoji/facebook_messenger/us_outlying_islands.png
index 450853eca47..103498e0095 100644
Binary files a/public/images/emoji/facebook_messenger/us_outlying_islands.png and b/public/images/emoji/facebook_messenger/us_outlying_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/us_virgin_islands.png b/public/images/emoji/facebook_messenger/us_virgin_islands.png
index 2352c2610b8..b4f7cd6f27a 100644
Binary files a/public/images/emoji/facebook_messenger/us_virgin_islands.png and b/public/images/emoji/facebook_messenger/us_virgin_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/uzbekistan.png b/public/images/emoji/facebook_messenger/uzbekistan.png
index c268b7f0b2a..887f5016ab6 100644
Binary files a/public/images/emoji/facebook_messenger/uzbekistan.png and b/public/images/emoji/facebook_messenger/uzbekistan.png differ
diff --git a/public/images/emoji/facebook_messenger/v.png b/public/images/emoji/facebook_messenger/v.png
index 03395c9e323..0518ccd01a2 100644
Binary files a/public/images/emoji/facebook_messenger/v.png and b/public/images/emoji/facebook_messenger/v.png differ
diff --git a/public/images/emoji/facebook_messenger/v/2.png b/public/images/emoji/facebook_messenger/v/2.png
index 6acc777aaf6..8455b96e5f4 100644
Binary files a/public/images/emoji/facebook_messenger/v/2.png and b/public/images/emoji/facebook_messenger/v/2.png differ
diff --git a/public/images/emoji/facebook_messenger/v/3.png b/public/images/emoji/facebook_messenger/v/3.png
index 698acefd9b4..90cf1e05dcf 100644
Binary files a/public/images/emoji/facebook_messenger/v/3.png and b/public/images/emoji/facebook_messenger/v/3.png differ
diff --git a/public/images/emoji/facebook_messenger/v/4.png b/public/images/emoji/facebook_messenger/v/4.png
index 07596c84129..18d5ad72850 100644
Binary files a/public/images/emoji/facebook_messenger/v/4.png and b/public/images/emoji/facebook_messenger/v/4.png differ
diff --git a/public/images/emoji/facebook_messenger/v/5.png b/public/images/emoji/facebook_messenger/v/5.png
index 7afa597f1a1..63865d9e28b 100644
Binary files a/public/images/emoji/facebook_messenger/v/5.png and b/public/images/emoji/facebook_messenger/v/5.png differ
diff --git a/public/images/emoji/facebook_messenger/v/6.png b/public/images/emoji/facebook_messenger/v/6.png
index fc65442c4cf..ab4985b2f43 100644
Binary files a/public/images/emoji/facebook_messenger/v/6.png and b/public/images/emoji/facebook_messenger/v/6.png differ
diff --git a/public/images/emoji/facebook_messenger/vampire.png b/public/images/emoji/facebook_messenger/vampire.png
index 962288bd170..3f8b0cc23fc 100644
Binary files a/public/images/emoji/facebook_messenger/vampire.png and b/public/images/emoji/facebook_messenger/vampire.png differ
diff --git a/public/images/emoji/facebook_messenger/vampire/2.png b/public/images/emoji/facebook_messenger/vampire/2.png
index 154f2b6e35a..3f8b0cc23fc 100644
Binary files a/public/images/emoji/facebook_messenger/vampire/2.png and b/public/images/emoji/facebook_messenger/vampire/2.png differ
diff --git a/public/images/emoji/facebook_messenger/vampire/3.png b/public/images/emoji/facebook_messenger/vampire/3.png
index 540b48d887f..3f8b0cc23fc 100644
Binary files a/public/images/emoji/facebook_messenger/vampire/3.png and b/public/images/emoji/facebook_messenger/vampire/3.png differ
diff --git a/public/images/emoji/facebook_messenger/vampire/4.png b/public/images/emoji/facebook_messenger/vampire/4.png
index b05d3bad9ab..3f8b0cc23fc 100644
Binary files a/public/images/emoji/facebook_messenger/vampire/4.png and b/public/images/emoji/facebook_messenger/vampire/4.png differ
diff --git a/public/images/emoji/facebook_messenger/vampire/5.png b/public/images/emoji/facebook_messenger/vampire/5.png
index 2bd9a7b71bb..3f8b0cc23fc 100644
Binary files a/public/images/emoji/facebook_messenger/vampire/5.png and b/public/images/emoji/facebook_messenger/vampire/5.png differ
diff --git a/public/images/emoji/facebook_messenger/vampire/6.png b/public/images/emoji/facebook_messenger/vampire/6.png
index c88f4ad73bf..3f8b0cc23fc 100644
Binary files a/public/images/emoji/facebook_messenger/vampire/6.png and b/public/images/emoji/facebook_messenger/vampire/6.png differ
diff --git a/public/images/emoji/facebook_messenger/vanuatu.png b/public/images/emoji/facebook_messenger/vanuatu.png
index ebf4b693156..068442e9374 100644
Binary files a/public/images/emoji/facebook_messenger/vanuatu.png and b/public/images/emoji/facebook_messenger/vanuatu.png differ
diff --git a/public/images/emoji/facebook_messenger/vatican_city.png b/public/images/emoji/facebook_messenger/vatican_city.png
index a91fed8815c..e38e58bb8bc 100644
Binary files a/public/images/emoji/facebook_messenger/vatican_city.png and b/public/images/emoji/facebook_messenger/vatican_city.png differ
diff --git a/public/images/emoji/facebook_messenger/venezuela.png b/public/images/emoji/facebook_messenger/venezuela.png
index e2b7cff1d89..177c0326af5 100644
Binary files a/public/images/emoji/facebook_messenger/venezuela.png and b/public/images/emoji/facebook_messenger/venezuela.png differ
diff --git a/public/images/emoji/facebook_messenger/vertical_traffic_light.png b/public/images/emoji/facebook_messenger/vertical_traffic_light.png
index 5d21d73d791..6721eb9b545 100644
Binary files a/public/images/emoji/facebook_messenger/vertical_traffic_light.png and b/public/images/emoji/facebook_messenger/vertical_traffic_light.png differ
diff --git a/public/images/emoji/facebook_messenger/vhs.png b/public/images/emoji/facebook_messenger/vhs.png
index 951ee0caa87..76058d7c5d7 100644
Binary files a/public/images/emoji/facebook_messenger/vhs.png and b/public/images/emoji/facebook_messenger/vhs.png differ
diff --git a/public/images/emoji/facebook_messenger/vibration_mode.png b/public/images/emoji/facebook_messenger/vibration_mode.png
index a0c69eb824f..02151e2ba65 100644
Binary files a/public/images/emoji/facebook_messenger/vibration_mode.png and b/public/images/emoji/facebook_messenger/vibration_mode.png differ
diff --git a/public/images/emoji/facebook_messenger/video_camera.png b/public/images/emoji/facebook_messenger/video_camera.png
index 799525309f6..a116affff58 100644
Binary files a/public/images/emoji/facebook_messenger/video_camera.png and b/public/images/emoji/facebook_messenger/video_camera.png differ
diff --git a/public/images/emoji/facebook_messenger/video_game.png b/public/images/emoji/facebook_messenger/video_game.png
index d564ba844f2..c1e5d534dad 100644
Binary files a/public/images/emoji/facebook_messenger/video_game.png and b/public/images/emoji/facebook_messenger/video_game.png differ
diff --git a/public/images/emoji/facebook_messenger/vietnam.png b/public/images/emoji/facebook_messenger/vietnam.png
index 57e44ae1752..e23af84a1eb 100644
Binary files a/public/images/emoji/facebook_messenger/vietnam.png and b/public/images/emoji/facebook_messenger/vietnam.png differ
diff --git a/public/images/emoji/facebook_messenger/violin.png b/public/images/emoji/facebook_messenger/violin.png
index cdf1bf735b5..a37cee2212d 100644
Binary files a/public/images/emoji/facebook_messenger/violin.png and b/public/images/emoji/facebook_messenger/violin.png differ
diff --git a/public/images/emoji/facebook_messenger/virgo.png b/public/images/emoji/facebook_messenger/virgo.png
index d75d83bbd49..584296d4042 100644
Binary files a/public/images/emoji/facebook_messenger/virgo.png and b/public/images/emoji/facebook_messenger/virgo.png differ
diff --git a/public/images/emoji/facebook_messenger/volcano.png b/public/images/emoji/facebook_messenger/volcano.png
index 5258533d2a4..40ae1681f41 100644
Binary files a/public/images/emoji/facebook_messenger/volcano.png and b/public/images/emoji/facebook_messenger/volcano.png differ
diff --git a/public/images/emoji/facebook_messenger/volleyball.png b/public/images/emoji/facebook_messenger/volleyball.png
index 5d6921c81e9..1ff3855a5e4 100644
Binary files a/public/images/emoji/facebook_messenger/volleyball.png and b/public/images/emoji/facebook_messenger/volleyball.png differ
diff --git a/public/images/emoji/facebook_messenger/vs.png b/public/images/emoji/facebook_messenger/vs.png
index 761b7a9f02c..5e9b02045e5 100644
Binary files a/public/images/emoji/facebook_messenger/vs.png and b/public/images/emoji/facebook_messenger/vs.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan.png b/public/images/emoji/facebook_messenger/vulcan.png
index 62459294572..af49237861b 100644
Binary files a/public/images/emoji/facebook_messenger/vulcan.png and b/public/images/emoji/facebook_messenger/vulcan.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan/2.png b/public/images/emoji/facebook_messenger/vulcan/2.png
index 5cdfab6d9a3..125b8d015ee 100644
Binary files a/public/images/emoji/facebook_messenger/vulcan/2.png and b/public/images/emoji/facebook_messenger/vulcan/2.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan/3.png b/public/images/emoji/facebook_messenger/vulcan/3.png
index a469f9b420e..193de9bcedc 100644
Binary files a/public/images/emoji/facebook_messenger/vulcan/3.png and b/public/images/emoji/facebook_messenger/vulcan/3.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan/4.png b/public/images/emoji/facebook_messenger/vulcan/4.png
index a8803b88169..51453315d74 100644
Binary files a/public/images/emoji/facebook_messenger/vulcan/4.png and b/public/images/emoji/facebook_messenger/vulcan/4.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan/5.png b/public/images/emoji/facebook_messenger/vulcan/5.png
index 2d9def823e5..444ed219e96 100644
Binary files a/public/images/emoji/facebook_messenger/vulcan/5.png and b/public/images/emoji/facebook_messenger/vulcan/5.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan/6.png b/public/images/emoji/facebook_messenger/vulcan/6.png
index bbcb6dc0d34..a4b6672c649 100644
Binary files a/public/images/emoji/facebook_messenger/vulcan/6.png and b/public/images/emoji/facebook_messenger/vulcan/6.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan_salute.png b/public/images/emoji/facebook_messenger/vulcan_salute.png
index 62459294572..af49237861b 100644
Binary files a/public/images/emoji/facebook_messenger/vulcan_salute.png and b/public/images/emoji/facebook_messenger/vulcan_salute.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan_salute/2.png b/public/images/emoji/facebook_messenger/vulcan_salute/2.png
index 5cdfab6d9a3..125b8d015ee 100644
Binary files a/public/images/emoji/facebook_messenger/vulcan_salute/2.png and b/public/images/emoji/facebook_messenger/vulcan_salute/2.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan_salute/3.png b/public/images/emoji/facebook_messenger/vulcan_salute/3.png
index a469f9b420e..193de9bcedc 100644
Binary files a/public/images/emoji/facebook_messenger/vulcan_salute/3.png and b/public/images/emoji/facebook_messenger/vulcan_salute/3.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan_salute/4.png b/public/images/emoji/facebook_messenger/vulcan_salute/4.png
index a8803b88169..51453315d74 100644
Binary files a/public/images/emoji/facebook_messenger/vulcan_salute/4.png and b/public/images/emoji/facebook_messenger/vulcan_salute/4.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan_salute/5.png b/public/images/emoji/facebook_messenger/vulcan_salute/5.png
index 2d9def823e5..444ed219e96 100644
Binary files a/public/images/emoji/facebook_messenger/vulcan_salute/5.png and b/public/images/emoji/facebook_messenger/vulcan_salute/5.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan_salute/6.png b/public/images/emoji/facebook_messenger/vulcan_salute/6.png
index bbcb6dc0d34..a4b6672c649 100644
Binary files a/public/images/emoji/facebook_messenger/vulcan_salute/6.png and b/public/images/emoji/facebook_messenger/vulcan_salute/6.png differ
diff --git a/public/images/emoji/facebook_messenger/walking.png b/public/images/emoji/facebook_messenger/walking.png
index 23da7224aa4..5805c83f64d 100644
Binary files a/public/images/emoji/facebook_messenger/walking.png and b/public/images/emoji/facebook_messenger/walking.png differ
diff --git a/public/images/emoji/facebook_messenger/walking/2.png b/public/images/emoji/facebook_messenger/walking/2.png
index c9dcb4569e6..c5bccf4e8d6 100644
Binary files a/public/images/emoji/facebook_messenger/walking/2.png and b/public/images/emoji/facebook_messenger/walking/2.png differ
diff --git a/public/images/emoji/facebook_messenger/walking/3.png b/public/images/emoji/facebook_messenger/walking/3.png
index 61e714afb1a..3b58908b224 100644
Binary files a/public/images/emoji/facebook_messenger/walking/3.png and b/public/images/emoji/facebook_messenger/walking/3.png differ
diff --git a/public/images/emoji/facebook_messenger/walking/4.png b/public/images/emoji/facebook_messenger/walking/4.png
index 3cf55665cd3..4f27d9ee191 100644
Binary files a/public/images/emoji/facebook_messenger/walking/4.png and b/public/images/emoji/facebook_messenger/walking/4.png differ
diff --git a/public/images/emoji/facebook_messenger/walking/5.png b/public/images/emoji/facebook_messenger/walking/5.png
index 1a0a252797a..f42fde8a23a 100644
Binary files a/public/images/emoji/facebook_messenger/walking/5.png and b/public/images/emoji/facebook_messenger/walking/5.png differ
diff --git a/public/images/emoji/facebook_messenger/walking/6.png b/public/images/emoji/facebook_messenger/walking/6.png
index 022aeb90ec3..9435870ed55 100644
Binary files a/public/images/emoji/facebook_messenger/walking/6.png and b/public/images/emoji/facebook_messenger/walking/6.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_man.png b/public/images/emoji/facebook_messenger/walking_man.png
index 23da7224aa4..5805c83f64d 100644
Binary files a/public/images/emoji/facebook_messenger/walking_man.png and b/public/images/emoji/facebook_messenger/walking_man.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_man/2.png b/public/images/emoji/facebook_messenger/walking_man/2.png
index c9dcb4569e6..c5bccf4e8d6 100644
Binary files a/public/images/emoji/facebook_messenger/walking_man/2.png and b/public/images/emoji/facebook_messenger/walking_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_man/3.png b/public/images/emoji/facebook_messenger/walking_man/3.png
index 61e714afb1a..3b58908b224 100644
Binary files a/public/images/emoji/facebook_messenger/walking_man/3.png and b/public/images/emoji/facebook_messenger/walking_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_man/4.png b/public/images/emoji/facebook_messenger/walking_man/4.png
index 3cf55665cd3..4f27d9ee191 100644
Binary files a/public/images/emoji/facebook_messenger/walking_man/4.png and b/public/images/emoji/facebook_messenger/walking_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_man/5.png b/public/images/emoji/facebook_messenger/walking_man/5.png
index 1a0a252797a..f42fde8a23a 100644
Binary files a/public/images/emoji/facebook_messenger/walking_man/5.png and b/public/images/emoji/facebook_messenger/walking_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_man/6.png b/public/images/emoji/facebook_messenger/walking_man/6.png
index 022aeb90ec3..9435870ed55 100644
Binary files a/public/images/emoji/facebook_messenger/walking_man/6.png and b/public/images/emoji/facebook_messenger/walking_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_woman.png b/public/images/emoji/facebook_messenger/walking_woman.png
index 5541bff1ede..4815b287d79 100644
Binary files a/public/images/emoji/facebook_messenger/walking_woman.png and b/public/images/emoji/facebook_messenger/walking_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_woman/2.png b/public/images/emoji/facebook_messenger/walking_woman/2.png
index 3e8f7832c4c..33d2f4d7093 100644
Binary files a/public/images/emoji/facebook_messenger/walking_woman/2.png and b/public/images/emoji/facebook_messenger/walking_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_woman/3.png b/public/images/emoji/facebook_messenger/walking_woman/3.png
index 3876ee6e63d..2d0691eee42 100644
Binary files a/public/images/emoji/facebook_messenger/walking_woman/3.png and b/public/images/emoji/facebook_messenger/walking_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_woman/4.png b/public/images/emoji/facebook_messenger/walking_woman/4.png
index 0aad2bc840d..58bb25ccec1 100644
Binary files a/public/images/emoji/facebook_messenger/walking_woman/4.png and b/public/images/emoji/facebook_messenger/walking_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_woman/5.png b/public/images/emoji/facebook_messenger/walking_woman/5.png
index c4d8fc9c356..be2acf77096 100644
Binary files a/public/images/emoji/facebook_messenger/walking_woman/5.png and b/public/images/emoji/facebook_messenger/walking_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_woman/6.png b/public/images/emoji/facebook_messenger/walking_woman/6.png
index 54cb211d6b9..11493962420 100644
Binary files a/public/images/emoji/facebook_messenger/walking_woman/6.png and b/public/images/emoji/facebook_messenger/walking_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/wallis_futuna.png b/public/images/emoji/facebook_messenger/wallis_futuna.png
index 4672eabedba..33309207451 100644
Binary files a/public/images/emoji/facebook_messenger/wallis_futuna.png and b/public/images/emoji/facebook_messenger/wallis_futuna.png differ
diff --git a/public/images/emoji/facebook_messenger/waning_crescent_moon.png b/public/images/emoji/facebook_messenger/waning_crescent_moon.png
index f315a7566fb..1320dfb8b2a 100644
Binary files a/public/images/emoji/facebook_messenger/waning_crescent_moon.png and b/public/images/emoji/facebook_messenger/waning_crescent_moon.png differ
diff --git a/public/images/emoji/facebook_messenger/waning_gibbous_moon.png b/public/images/emoji/facebook_messenger/waning_gibbous_moon.png
index 2f5450b752b..3ec83220db2 100644
Binary files a/public/images/emoji/facebook_messenger/waning_gibbous_moon.png and b/public/images/emoji/facebook_messenger/waning_gibbous_moon.png differ
diff --git a/public/images/emoji/facebook_messenger/warning.png b/public/images/emoji/facebook_messenger/warning.png
index 4bf669d8260..c4b09beb7c1 100644
Binary files a/public/images/emoji/facebook_messenger/warning.png and b/public/images/emoji/facebook_messenger/warning.png differ
diff --git a/public/images/emoji/facebook_messenger/wastebasket.png b/public/images/emoji/facebook_messenger/wastebasket.png
index 65b0729097e..94f3b101137 100644
Binary files a/public/images/emoji/facebook_messenger/wastebasket.png and b/public/images/emoji/facebook_messenger/wastebasket.png differ
diff --git a/public/images/emoji/facebook_messenger/watch.png b/public/images/emoji/facebook_messenger/watch.png
index b3b9b84eb89..b245572fa6a 100644
Binary files a/public/images/emoji/facebook_messenger/watch.png and b/public/images/emoji/facebook_messenger/watch.png differ
diff --git a/public/images/emoji/facebook_messenger/water_buffalo.png b/public/images/emoji/facebook_messenger/water_buffalo.png
index 93c10bcd960..3c99cb01576 100644
Binary files a/public/images/emoji/facebook_messenger/water_buffalo.png and b/public/images/emoji/facebook_messenger/water_buffalo.png differ
diff --git a/public/images/emoji/facebook_messenger/watermelon.png b/public/images/emoji/facebook_messenger/watermelon.png
index bdb353b4b9f..d901fc0a6cd 100644
Binary files a/public/images/emoji/facebook_messenger/watermelon.png and b/public/images/emoji/facebook_messenger/watermelon.png differ
diff --git a/public/images/emoji/facebook_messenger/wave.png b/public/images/emoji/facebook_messenger/wave.png
index 99a9bc135ad..3deca9f946c 100644
Binary files a/public/images/emoji/facebook_messenger/wave.png and b/public/images/emoji/facebook_messenger/wave.png differ
diff --git a/public/images/emoji/facebook_messenger/wave/2.png b/public/images/emoji/facebook_messenger/wave/2.png
index 57bd2ffb66d..167dbfeadd7 100644
Binary files a/public/images/emoji/facebook_messenger/wave/2.png and b/public/images/emoji/facebook_messenger/wave/2.png differ
diff --git a/public/images/emoji/facebook_messenger/wave/3.png b/public/images/emoji/facebook_messenger/wave/3.png
index de52c86f75c..be7fd355f70 100644
Binary files a/public/images/emoji/facebook_messenger/wave/3.png and b/public/images/emoji/facebook_messenger/wave/3.png differ
diff --git a/public/images/emoji/facebook_messenger/wave/4.png b/public/images/emoji/facebook_messenger/wave/4.png
index aaa49bca4ed..0085b2042cd 100644
Binary files a/public/images/emoji/facebook_messenger/wave/4.png and b/public/images/emoji/facebook_messenger/wave/4.png differ
diff --git a/public/images/emoji/facebook_messenger/wave/5.png b/public/images/emoji/facebook_messenger/wave/5.png
index 187177e4786..11027e15b6e 100644
Binary files a/public/images/emoji/facebook_messenger/wave/5.png and b/public/images/emoji/facebook_messenger/wave/5.png differ
diff --git a/public/images/emoji/facebook_messenger/wave/6.png b/public/images/emoji/facebook_messenger/wave/6.png
index 52951b965ae..36ffc629ca1 100644
Binary files a/public/images/emoji/facebook_messenger/wave/6.png and b/public/images/emoji/facebook_messenger/wave/6.png differ
diff --git a/public/images/emoji/facebook_messenger/waving_black_flag.png b/public/images/emoji/facebook_messenger/waving_black_flag.png
index 5c1237bdad2..bc52913998d 100644
Binary files a/public/images/emoji/facebook_messenger/waving_black_flag.png and b/public/images/emoji/facebook_messenger/waving_black_flag.png differ
diff --git a/public/images/emoji/facebook_messenger/waving_white_flag.png b/public/images/emoji/facebook_messenger/waving_white_flag.png
index 5f052fff2af..34dfcb802ac 100644
Binary files a/public/images/emoji/facebook_messenger/waving_white_flag.png and b/public/images/emoji/facebook_messenger/waving_white_flag.png differ
diff --git a/public/images/emoji/facebook_messenger/wavy_dash.png b/public/images/emoji/facebook_messenger/wavy_dash.png
index fab5f74c45c..4d8d75af548 100644
Binary files a/public/images/emoji/facebook_messenger/wavy_dash.png and b/public/images/emoji/facebook_messenger/wavy_dash.png differ
diff --git a/public/images/emoji/facebook_messenger/waxing_crescent_moon.png b/public/images/emoji/facebook_messenger/waxing_crescent_moon.png
index 35560d1aaeb..29c239ac4a8 100644
Binary files a/public/images/emoji/facebook_messenger/waxing_crescent_moon.png and b/public/images/emoji/facebook_messenger/waxing_crescent_moon.png differ
diff --git a/public/images/emoji/facebook_messenger/waxing_gibbous_moon.png b/public/images/emoji/facebook_messenger/waxing_gibbous_moon.png
index afe59e7f4e8..3fe69a76310 100644
Binary files a/public/images/emoji/facebook_messenger/waxing_gibbous_moon.png and b/public/images/emoji/facebook_messenger/waxing_gibbous_moon.png differ
diff --git a/public/images/emoji/facebook_messenger/wc.png b/public/images/emoji/facebook_messenger/wc.png
index 55e92707a14..b22fc41385e 100644
Binary files a/public/images/emoji/facebook_messenger/wc.png and b/public/images/emoji/facebook_messenger/wc.png differ
diff --git a/public/images/emoji/facebook_messenger/weary.png b/public/images/emoji/facebook_messenger/weary.png
index 097b31cf81f..edf1b9b1a47 100644
Binary files a/public/images/emoji/facebook_messenger/weary.png and b/public/images/emoji/facebook_messenger/weary.png differ
diff --git a/public/images/emoji/facebook_messenger/wedding.png b/public/images/emoji/facebook_messenger/wedding.png
index 9e4cb772257..daa33093130 100644
Binary files a/public/images/emoji/facebook_messenger/wedding.png and b/public/images/emoji/facebook_messenger/wedding.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifter.png b/public/images/emoji/facebook_messenger/weight_lifter.png
index be0473304d5..1ce69661539 100644
Binary files a/public/images/emoji/facebook_messenger/weight_lifter.png and b/public/images/emoji/facebook_messenger/weight_lifter.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifter/2.png b/public/images/emoji/facebook_messenger/weight_lifter/2.png
index 8d680f5b12c..e29ccc9b4bc 100644
Binary files a/public/images/emoji/facebook_messenger/weight_lifter/2.png and b/public/images/emoji/facebook_messenger/weight_lifter/2.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifter/3.png b/public/images/emoji/facebook_messenger/weight_lifter/3.png
index e4e961d5d5d..e21fa2a3741 100644
Binary files a/public/images/emoji/facebook_messenger/weight_lifter/3.png and b/public/images/emoji/facebook_messenger/weight_lifter/3.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifter/4.png b/public/images/emoji/facebook_messenger/weight_lifter/4.png
index bcdf20d1757..e7ac09f9c7d 100644
Binary files a/public/images/emoji/facebook_messenger/weight_lifter/4.png and b/public/images/emoji/facebook_messenger/weight_lifter/4.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifter/5.png b/public/images/emoji/facebook_messenger/weight_lifter/5.png
index 9b91906952e..1fbe8f888fc 100644
Binary files a/public/images/emoji/facebook_messenger/weight_lifter/5.png and b/public/images/emoji/facebook_messenger/weight_lifter/5.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifter/6.png b/public/images/emoji/facebook_messenger/weight_lifter/6.png
index c3ce145e9e1..731280ee0c7 100644
Binary files a/public/images/emoji/facebook_messenger/weight_lifter/6.png and b/public/images/emoji/facebook_messenger/weight_lifter/6.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifting_man.png b/public/images/emoji/facebook_messenger/weight_lifting_man.png
index be0473304d5..1ce69661539 100644
Binary files a/public/images/emoji/facebook_messenger/weight_lifting_man.png and b/public/images/emoji/facebook_messenger/weight_lifting_man.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifting_man/2.png b/public/images/emoji/facebook_messenger/weight_lifting_man/2.png
index 8d680f5b12c..e29ccc9b4bc 100644
Binary files a/public/images/emoji/facebook_messenger/weight_lifting_man/2.png and b/public/images/emoji/facebook_messenger/weight_lifting_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifting_man/3.png b/public/images/emoji/facebook_messenger/weight_lifting_man/3.png
index e4e961d5d5d..e21fa2a3741 100644
Binary files a/public/images/emoji/facebook_messenger/weight_lifting_man/3.png and b/public/images/emoji/facebook_messenger/weight_lifting_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifting_man/4.png b/public/images/emoji/facebook_messenger/weight_lifting_man/4.png
index bcdf20d1757..e7ac09f9c7d 100644
Binary files a/public/images/emoji/facebook_messenger/weight_lifting_man/4.png and b/public/images/emoji/facebook_messenger/weight_lifting_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifting_man/5.png b/public/images/emoji/facebook_messenger/weight_lifting_man/5.png
index 9b91906952e..1fbe8f888fc 100644
Binary files a/public/images/emoji/facebook_messenger/weight_lifting_man/5.png and b/public/images/emoji/facebook_messenger/weight_lifting_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifting_man/6.png b/public/images/emoji/facebook_messenger/weight_lifting_man/6.png
index c3ce145e9e1..731280ee0c7 100644
Binary files a/public/images/emoji/facebook_messenger/weight_lifting_man/6.png and b/public/images/emoji/facebook_messenger/weight_lifting_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifting_woman.png b/public/images/emoji/facebook_messenger/weight_lifting_woman.png
index 2279709c85b..2c58497d146 100644
Binary files a/public/images/emoji/facebook_messenger/weight_lifting_woman.png and b/public/images/emoji/facebook_messenger/weight_lifting_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/western_sahara.png b/public/images/emoji/facebook_messenger/western_sahara.png
index 44c0ea20dd7..2492b90de60 100644
Binary files a/public/images/emoji/facebook_messenger/western_sahara.png and b/public/images/emoji/facebook_messenger/western_sahara.png differ
diff --git a/public/images/emoji/facebook_messenger/whale.png b/public/images/emoji/facebook_messenger/whale.png
index 7356dc7f43a..94486fb19f9 100644
Binary files a/public/images/emoji/facebook_messenger/whale.png and b/public/images/emoji/facebook_messenger/whale.png differ
diff --git a/public/images/emoji/facebook_messenger/whale2.png b/public/images/emoji/facebook_messenger/whale2.png
index 029e9adf6c9..4463fc2a4ec 100644
Binary files a/public/images/emoji/facebook_messenger/whale2.png and b/public/images/emoji/facebook_messenger/whale2.png differ
diff --git a/public/images/emoji/facebook_messenger/wheel_of_dharma.png b/public/images/emoji/facebook_messenger/wheel_of_dharma.png
index 8792718a1e0..0ba685ffa90 100644
Binary files a/public/images/emoji/facebook_messenger/wheel_of_dharma.png and b/public/images/emoji/facebook_messenger/wheel_of_dharma.png differ
diff --git a/public/images/emoji/facebook_messenger/wheelchair.png b/public/images/emoji/facebook_messenger/wheelchair.png
index b90964dd4a7..a0470f71cec 100644
Binary files a/public/images/emoji/facebook_messenger/wheelchair.png and b/public/images/emoji/facebook_messenger/wheelchair.png differ
diff --git a/public/images/emoji/facebook_messenger/white_check_mark.png b/public/images/emoji/facebook_messenger/white_check_mark.png
index 3b00d70f904..1f1fe8a9dd5 100644
Binary files a/public/images/emoji/facebook_messenger/white_check_mark.png and b/public/images/emoji/facebook_messenger/white_check_mark.png differ
diff --git a/public/images/emoji/facebook_messenger/white_circle.png b/public/images/emoji/facebook_messenger/white_circle.png
index 81e7ee83745..69710af3c20 100644
Binary files a/public/images/emoji/facebook_messenger/white_circle.png and b/public/images/emoji/facebook_messenger/white_circle.png differ
diff --git a/public/images/emoji/facebook_messenger/white_flag.png b/public/images/emoji/facebook_messenger/white_flag.png
index 5f052fff2af..34dfcb802ac 100644
Binary files a/public/images/emoji/facebook_messenger/white_flag.png and b/public/images/emoji/facebook_messenger/white_flag.png differ
diff --git a/public/images/emoji/facebook_messenger/white_flower.png b/public/images/emoji/facebook_messenger/white_flower.png
index e7975caf5bc..7762659e8bc 100644
Binary files a/public/images/emoji/facebook_messenger/white_flower.png and b/public/images/emoji/facebook_messenger/white_flower.png differ
diff --git a/public/images/emoji/facebook_messenger/white_frowning_face.png b/public/images/emoji/facebook_messenger/white_frowning_face.png
index 1c5988a20b5..e35c8cec021 100644
Binary files a/public/images/emoji/facebook_messenger/white_frowning_face.png and b/public/images/emoji/facebook_messenger/white_frowning_face.png differ
diff --git a/public/images/emoji/facebook_messenger/white_large_square.png b/public/images/emoji/facebook_messenger/white_large_square.png
index b0652e666b4..de0cffdc2f5 100644
Binary files a/public/images/emoji/facebook_messenger/white_large_square.png and b/public/images/emoji/facebook_messenger/white_large_square.png differ
diff --git a/public/images/emoji/facebook_messenger/white_medium_small_square.png b/public/images/emoji/facebook_messenger/white_medium_small_square.png
index d6ab186f389..c3674c5635d 100644
Binary files a/public/images/emoji/facebook_messenger/white_medium_small_square.png and b/public/images/emoji/facebook_messenger/white_medium_small_square.png differ
diff --git a/public/images/emoji/facebook_messenger/white_medium_square.png b/public/images/emoji/facebook_messenger/white_medium_square.png
index 8f96f4ecd8f..a77236a2184 100644
Binary files a/public/images/emoji/facebook_messenger/white_medium_square.png and b/public/images/emoji/facebook_messenger/white_medium_square.png differ
diff --git a/public/images/emoji/facebook_messenger/white_small_square.png b/public/images/emoji/facebook_messenger/white_small_square.png
index 328248a3de7..4ef6be82582 100644
Binary files a/public/images/emoji/facebook_messenger/white_small_square.png and b/public/images/emoji/facebook_messenger/white_small_square.png differ
diff --git a/public/images/emoji/facebook_messenger/white_square_button.png b/public/images/emoji/facebook_messenger/white_square_button.png
index 6162783a0dc..ce68bbbef71 100644
Binary files a/public/images/emoji/facebook_messenger/white_square_button.png and b/public/images/emoji/facebook_messenger/white_square_button.png differ
diff --git a/public/images/emoji/facebook_messenger/white_sun_behind_cloud.png b/public/images/emoji/facebook_messenger/white_sun_behind_cloud.png
index 3ceb40a9ec0..17a5f1ff823 100644
Binary files a/public/images/emoji/facebook_messenger/white_sun_behind_cloud.png and b/public/images/emoji/facebook_messenger/white_sun_behind_cloud.png differ
diff --git a/public/images/emoji/facebook_messenger/white_sun_behind_cloud_with_rain.png b/public/images/emoji/facebook_messenger/white_sun_behind_cloud_with_rain.png
index ef892f1f889..ec92c38a2b8 100644
Binary files a/public/images/emoji/facebook_messenger/white_sun_behind_cloud_with_rain.png and b/public/images/emoji/facebook_messenger/white_sun_behind_cloud_with_rain.png differ
diff --git a/public/images/emoji/facebook_messenger/white_sun_cloud.png b/public/images/emoji/facebook_messenger/white_sun_cloud.png
index 3ceb40a9ec0..17a5f1ff823 100644
Binary files a/public/images/emoji/facebook_messenger/white_sun_cloud.png and b/public/images/emoji/facebook_messenger/white_sun_cloud.png differ
diff --git a/public/images/emoji/facebook_messenger/white_sun_rain_cloud.png b/public/images/emoji/facebook_messenger/white_sun_rain_cloud.png
index ef892f1f889..ec92c38a2b8 100644
Binary files a/public/images/emoji/facebook_messenger/white_sun_rain_cloud.png and b/public/images/emoji/facebook_messenger/white_sun_rain_cloud.png differ
diff --git a/public/images/emoji/facebook_messenger/white_sun_small_cloud.png b/public/images/emoji/facebook_messenger/white_sun_small_cloud.png
index 51953bf6959..8258b2f793b 100644
Binary files a/public/images/emoji/facebook_messenger/white_sun_small_cloud.png and b/public/images/emoji/facebook_messenger/white_sun_small_cloud.png differ
diff --git a/public/images/emoji/facebook_messenger/white_sun_with_small_cloud.png b/public/images/emoji/facebook_messenger/white_sun_with_small_cloud.png
index 51953bf6959..8258b2f793b 100644
Binary files a/public/images/emoji/facebook_messenger/white_sun_with_small_cloud.png and b/public/images/emoji/facebook_messenger/white_sun_with_small_cloud.png differ
diff --git a/public/images/emoji/facebook_messenger/wilted_flower.png b/public/images/emoji/facebook_messenger/wilted_flower.png
index a4e69ff073b..f858df1886b 100644
Binary files a/public/images/emoji/facebook_messenger/wilted_flower.png and b/public/images/emoji/facebook_messenger/wilted_flower.png differ
diff --git a/public/images/emoji/facebook_messenger/wind_blowing_face.png b/public/images/emoji/facebook_messenger/wind_blowing_face.png
index f89ef444f72..5b7f972f445 100644
Binary files a/public/images/emoji/facebook_messenger/wind_blowing_face.png and b/public/images/emoji/facebook_messenger/wind_blowing_face.png differ
diff --git a/public/images/emoji/facebook_messenger/wind_chime.png b/public/images/emoji/facebook_messenger/wind_chime.png
index 279f3ce2a2b..b32d537e648 100644
Binary files a/public/images/emoji/facebook_messenger/wind_chime.png and b/public/images/emoji/facebook_messenger/wind_chime.png differ
diff --git a/public/images/emoji/facebook_messenger/wind_face.png b/public/images/emoji/facebook_messenger/wind_face.png
index f89ef444f72..5b7f972f445 100644
Binary files a/public/images/emoji/facebook_messenger/wind_face.png and b/public/images/emoji/facebook_messenger/wind_face.png differ
diff --git a/public/images/emoji/facebook_messenger/wine_glass.png b/public/images/emoji/facebook_messenger/wine_glass.png
index 765420b74f5..e4d124c360c 100644
Binary files a/public/images/emoji/facebook_messenger/wine_glass.png and b/public/images/emoji/facebook_messenger/wine_glass.png differ
diff --git a/public/images/emoji/facebook_messenger/wink.png b/public/images/emoji/facebook_messenger/wink.png
index b592f594ee5..52da6c4d182 100644
Binary files a/public/images/emoji/facebook_messenger/wink.png and b/public/images/emoji/facebook_messenger/wink.png differ
diff --git a/public/images/emoji/facebook_messenger/wolf.png b/public/images/emoji/facebook_messenger/wolf.png
index ce3e33bbcaf..8cd9baec98c 100644
Binary files a/public/images/emoji/facebook_messenger/wolf.png and b/public/images/emoji/facebook_messenger/wolf.png differ
diff --git a/public/images/emoji/facebook_messenger/woman.png b/public/images/emoji/facebook_messenger/woman.png
index 071afe7e94e..c4a18fd7ff6 100644
Binary files a/public/images/emoji/facebook_messenger/woman.png and b/public/images/emoji/facebook_messenger/woman.png differ
diff --git a/public/images/emoji/facebook_messenger/woman/2.png b/public/images/emoji/facebook_messenger/woman/2.png
index f030836e287..20cc2e881a1 100644
Binary files a/public/images/emoji/facebook_messenger/woman/2.png and b/public/images/emoji/facebook_messenger/woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman/3.png b/public/images/emoji/facebook_messenger/woman/3.png
index 85fc02b9c67..6264e45eaa0 100644
Binary files a/public/images/emoji/facebook_messenger/woman/3.png and b/public/images/emoji/facebook_messenger/woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman/4.png b/public/images/emoji/facebook_messenger/woman/4.png
index 8320ed83f69..8319da4e1cd 100644
Binary files a/public/images/emoji/facebook_messenger/woman/4.png and b/public/images/emoji/facebook_messenger/woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman/5.png b/public/images/emoji/facebook_messenger/woman/5.png
index da30bd1d99c..fd10c72122f 100644
Binary files a/public/images/emoji/facebook_messenger/woman/5.png and b/public/images/emoji/facebook_messenger/woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman/6.png b/public/images/emoji/facebook_messenger/woman/6.png
index 4818fd47397..2c7d12dedde 100644
Binary files a/public/images/emoji/facebook_messenger/woman/6.png and b/public/images/emoji/facebook_messenger/woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_artist.png b/public/images/emoji/facebook_messenger/woman_artist.png
index 59bef6499ad..d2ad4d7589f 100644
Binary files a/public/images/emoji/facebook_messenger/woman_artist.png and b/public/images/emoji/facebook_messenger/woman_artist.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_artist/2.png b/public/images/emoji/facebook_messenger/woman_artist/2.png
index 1f10ebc442d..4c7c2085672 100644
Binary files a/public/images/emoji/facebook_messenger/woman_artist/2.png and b/public/images/emoji/facebook_messenger/woman_artist/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_artist/3.png b/public/images/emoji/facebook_messenger/woman_artist/3.png
index 4b6fe289bce..9a591f32f91 100644
Binary files a/public/images/emoji/facebook_messenger/woman_artist/3.png and b/public/images/emoji/facebook_messenger/woman_artist/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_artist/4.png b/public/images/emoji/facebook_messenger/woman_artist/4.png
index 70d36d0287b..32d92efb73e 100644
Binary files a/public/images/emoji/facebook_messenger/woman_artist/4.png and b/public/images/emoji/facebook_messenger/woman_artist/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_artist/5.png b/public/images/emoji/facebook_messenger/woman_artist/5.png
index ab8ce935d1d..44286db27db 100644
Binary files a/public/images/emoji/facebook_messenger/woman_artist/5.png and b/public/images/emoji/facebook_messenger/woman_artist/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_artist/6.png b/public/images/emoji/facebook_messenger/woman_artist/6.png
index 5513232d02c..391f6e78477 100644
Binary files a/public/images/emoji/facebook_messenger/woman_artist/6.png and b/public/images/emoji/facebook_messenger/woman_artist/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_astronaut.png b/public/images/emoji/facebook_messenger/woman_astronaut.png
index cdd72ce56da..40f8b2cf100 100644
Binary files a/public/images/emoji/facebook_messenger/woman_astronaut.png and b/public/images/emoji/facebook_messenger/woman_astronaut.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_astronaut/2.png b/public/images/emoji/facebook_messenger/woman_astronaut/2.png
index 51af6656685..40f8b2cf100 100644
Binary files a/public/images/emoji/facebook_messenger/woman_astronaut/2.png and b/public/images/emoji/facebook_messenger/woman_astronaut/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_astronaut/3.png b/public/images/emoji/facebook_messenger/woman_astronaut/3.png
index f1505464c9d..40f8b2cf100 100644
Binary files a/public/images/emoji/facebook_messenger/woman_astronaut/3.png and b/public/images/emoji/facebook_messenger/woman_astronaut/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_astronaut/4.png b/public/images/emoji/facebook_messenger/woman_astronaut/4.png
index f5716b1882c..40f8b2cf100 100644
Binary files a/public/images/emoji/facebook_messenger/woman_astronaut/4.png and b/public/images/emoji/facebook_messenger/woman_astronaut/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_astronaut/5.png b/public/images/emoji/facebook_messenger/woman_astronaut/5.png
index 5f8e97f970f..40f8b2cf100 100644
Binary files a/public/images/emoji/facebook_messenger/woman_astronaut/5.png and b/public/images/emoji/facebook_messenger/woman_astronaut/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_astronaut/6.png b/public/images/emoji/facebook_messenger/woman_astronaut/6.png
index d07a48eaacc..40f8b2cf100 100644
Binary files a/public/images/emoji/facebook_messenger/woman_astronaut/6.png and b/public/images/emoji/facebook_messenger/woman_astronaut/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cartwheeling.png b/public/images/emoji/facebook_messenger/woman_cartwheeling.png
index 124763691f3..7ae0cac2ffd 100644
Binary files a/public/images/emoji/facebook_messenger/woman_cartwheeling.png and b/public/images/emoji/facebook_messenger/woman_cartwheeling.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cartwheeling/2.png b/public/images/emoji/facebook_messenger/woman_cartwheeling/2.png
index cbda90bf9f8..37605443528 100644
Binary files a/public/images/emoji/facebook_messenger/woman_cartwheeling/2.png and b/public/images/emoji/facebook_messenger/woman_cartwheeling/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cartwheeling/3.png b/public/images/emoji/facebook_messenger/woman_cartwheeling/3.png
index 133d630aae8..12b4a460a0a 100644
Binary files a/public/images/emoji/facebook_messenger/woman_cartwheeling/3.png and b/public/images/emoji/facebook_messenger/woman_cartwheeling/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cartwheeling/4.png b/public/images/emoji/facebook_messenger/woman_cartwheeling/4.png
index 399f4807f8f..8ac7900f8da 100644
Binary files a/public/images/emoji/facebook_messenger/woman_cartwheeling/4.png and b/public/images/emoji/facebook_messenger/woman_cartwheeling/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cartwheeling/5.png b/public/images/emoji/facebook_messenger/woman_cartwheeling/5.png
index bb0785b5022..15d4bc6a111 100644
Binary files a/public/images/emoji/facebook_messenger/woman_cartwheeling/5.png and b/public/images/emoji/facebook_messenger/woman_cartwheeling/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cartwheeling/6.png b/public/images/emoji/facebook_messenger/woman_cartwheeling/6.png
index 90454bc8b96..f725a3bbf85 100644
Binary files a/public/images/emoji/facebook_messenger/woman_cartwheeling/6.png and b/public/images/emoji/facebook_messenger/woman_cartwheeling/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_climbing.png b/public/images/emoji/facebook_messenger/woman_climbing.png
new file mode 100644
index 00000000000..a0001a92f52
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_climbing.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_climbing/2.png b/public/images/emoji/facebook_messenger/woman_climbing/2.png
new file mode 100644
index 00000000000..59145fcd6f1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_climbing/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_climbing/3.png b/public/images/emoji/facebook_messenger/woman_climbing/3.png
new file mode 100644
index 00000000000..c2527e50b6f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_climbing/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_climbing/4.png b/public/images/emoji/facebook_messenger/woman_climbing/4.png
new file mode 100644
index 00000000000..edcef648fba
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_climbing/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_climbing/5.png b/public/images/emoji/facebook_messenger/woman_climbing/5.png
new file mode 100644
index 00000000000..c2fd3da64f9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_climbing/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_climbing/6.png b/public/images/emoji/facebook_messenger/woman_climbing/6.png
new file mode 100644
index 00000000000..12be569e540
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_climbing/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cook.png b/public/images/emoji/facebook_messenger/woman_cook.png
index fb473698634..3afd6c3e3fa 100644
Binary files a/public/images/emoji/facebook_messenger/woman_cook.png and b/public/images/emoji/facebook_messenger/woman_cook.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cook/2.png b/public/images/emoji/facebook_messenger/woman_cook/2.png
index dcf2163a16d..786bb7e4974 100644
Binary files a/public/images/emoji/facebook_messenger/woman_cook/2.png and b/public/images/emoji/facebook_messenger/woman_cook/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cook/3.png b/public/images/emoji/facebook_messenger/woman_cook/3.png
index 00a32101071..af7839cf2de 100644
Binary files a/public/images/emoji/facebook_messenger/woman_cook/3.png and b/public/images/emoji/facebook_messenger/woman_cook/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cook/4.png b/public/images/emoji/facebook_messenger/woman_cook/4.png
index ea9400ce130..01167c14103 100644
Binary files a/public/images/emoji/facebook_messenger/woman_cook/4.png and b/public/images/emoji/facebook_messenger/woman_cook/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cook/5.png b/public/images/emoji/facebook_messenger/woman_cook/5.png
index 9c90c090d73..1bb72c42831 100644
Binary files a/public/images/emoji/facebook_messenger/woman_cook/5.png and b/public/images/emoji/facebook_messenger/woman_cook/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cook/6.png b/public/images/emoji/facebook_messenger/woman_cook/6.png
index 6745e5324ec..feeeb1dd411 100644
Binary files a/public/images/emoji/facebook_messenger/woman_cook/6.png and b/public/images/emoji/facebook_messenger/woman_cook/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_facepalming.png b/public/images/emoji/facebook_messenger/woman_facepalming.png
index 0862f45755f..b9e200299ed 100644
Binary files a/public/images/emoji/facebook_messenger/woman_facepalming.png and b/public/images/emoji/facebook_messenger/woman_facepalming.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_facepalming/2.png b/public/images/emoji/facebook_messenger/woman_facepalming/2.png
index c2a0c5583d9..a7cabf9e6f4 100644
Binary files a/public/images/emoji/facebook_messenger/woman_facepalming/2.png and b/public/images/emoji/facebook_messenger/woman_facepalming/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_facepalming/3.png b/public/images/emoji/facebook_messenger/woman_facepalming/3.png
index 2efbdb0954d..d7f7e234696 100644
Binary files a/public/images/emoji/facebook_messenger/woman_facepalming/3.png and b/public/images/emoji/facebook_messenger/woman_facepalming/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_facepalming/4.png b/public/images/emoji/facebook_messenger/woman_facepalming/4.png
index 93d1697b834..641a5774fc0 100644
Binary files a/public/images/emoji/facebook_messenger/woman_facepalming/4.png and b/public/images/emoji/facebook_messenger/woman_facepalming/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_facepalming/5.png b/public/images/emoji/facebook_messenger/woman_facepalming/5.png
index 5e7da37f052..1d78ad4ed84 100644
Binary files a/public/images/emoji/facebook_messenger/woman_facepalming/5.png and b/public/images/emoji/facebook_messenger/woman_facepalming/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_facepalming/6.png b/public/images/emoji/facebook_messenger/woman_facepalming/6.png
index d7dcd8dfc0f..59aca5cb9e1 100644
Binary files a/public/images/emoji/facebook_messenger/woman_facepalming/6.png and b/public/images/emoji/facebook_messenger/woman_facepalming/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_factory_worker.png b/public/images/emoji/facebook_messenger/woman_factory_worker.png
index 22e9ab5b8d3..3db83b0a455 100644
Binary files a/public/images/emoji/facebook_messenger/woman_factory_worker.png and b/public/images/emoji/facebook_messenger/woman_factory_worker.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_factory_worker/2.png b/public/images/emoji/facebook_messenger/woman_factory_worker/2.png
index 8124db7497d..d7b620c5061 100644
Binary files a/public/images/emoji/facebook_messenger/woman_factory_worker/2.png and b/public/images/emoji/facebook_messenger/woman_factory_worker/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_factory_worker/3.png b/public/images/emoji/facebook_messenger/woman_factory_worker/3.png
index 2e3ad0ee377..403883f6d22 100644
Binary files a/public/images/emoji/facebook_messenger/woman_factory_worker/3.png and b/public/images/emoji/facebook_messenger/woman_factory_worker/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_factory_worker/4.png b/public/images/emoji/facebook_messenger/woman_factory_worker/4.png
index 461a4dcb8fb..11a26ff0aa5 100644
Binary files a/public/images/emoji/facebook_messenger/woman_factory_worker/4.png and b/public/images/emoji/facebook_messenger/woman_factory_worker/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_factory_worker/5.png b/public/images/emoji/facebook_messenger/woman_factory_worker/5.png
index a1e2b6fedf5..a4d70e7b872 100644
Binary files a/public/images/emoji/facebook_messenger/woman_factory_worker/5.png and b/public/images/emoji/facebook_messenger/woman_factory_worker/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_factory_worker/6.png b/public/images/emoji/facebook_messenger/woman_factory_worker/6.png
index 8bb53fe8342..e5382394aa0 100644
Binary files a/public/images/emoji/facebook_messenger/woman_factory_worker/6.png and b/public/images/emoji/facebook_messenger/woman_factory_worker/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_farmer.png b/public/images/emoji/facebook_messenger/woman_farmer.png
index edb763b8c0d..f2c4eeee032 100644
Binary files a/public/images/emoji/facebook_messenger/woman_farmer.png and b/public/images/emoji/facebook_messenger/woman_farmer.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_farmer/2.png b/public/images/emoji/facebook_messenger/woman_farmer/2.png
index b8b38757986..fc72b3b67f9 100644
Binary files a/public/images/emoji/facebook_messenger/woman_farmer/2.png and b/public/images/emoji/facebook_messenger/woman_farmer/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_farmer/3.png b/public/images/emoji/facebook_messenger/woman_farmer/3.png
index 50bca0a619b..7c18b10dd32 100644
Binary files a/public/images/emoji/facebook_messenger/woman_farmer/3.png and b/public/images/emoji/facebook_messenger/woman_farmer/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_farmer/4.png b/public/images/emoji/facebook_messenger/woman_farmer/4.png
index f990a8c7997..aacb27def53 100644
Binary files a/public/images/emoji/facebook_messenger/woman_farmer/4.png and b/public/images/emoji/facebook_messenger/woman_farmer/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_farmer/5.png b/public/images/emoji/facebook_messenger/woman_farmer/5.png
index bbdeaac7784..57e78a4347d 100644
Binary files a/public/images/emoji/facebook_messenger/woman_farmer/5.png and b/public/images/emoji/facebook_messenger/woman_farmer/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_farmer/6.png b/public/images/emoji/facebook_messenger/woman_farmer/6.png
index 680f352c0a0..4e917fc2c71 100644
Binary files a/public/images/emoji/facebook_messenger/woman_farmer/6.png and b/public/images/emoji/facebook_messenger/woman_farmer/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_firefighter.png b/public/images/emoji/facebook_messenger/woman_firefighter.png
index ec9fc0dd0ae..1476297bdc5 100644
Binary files a/public/images/emoji/facebook_messenger/woman_firefighter.png and b/public/images/emoji/facebook_messenger/woman_firefighter.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_firefighter/2.png b/public/images/emoji/facebook_messenger/woman_firefighter/2.png
index 4108b65e648..9e9b5dbc37c 100644
Binary files a/public/images/emoji/facebook_messenger/woman_firefighter/2.png and b/public/images/emoji/facebook_messenger/woman_firefighter/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_firefighter/3.png b/public/images/emoji/facebook_messenger/woman_firefighter/3.png
index 648fd207ef9..afad8c2651c 100644
Binary files a/public/images/emoji/facebook_messenger/woman_firefighter/3.png and b/public/images/emoji/facebook_messenger/woman_firefighter/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_firefighter/4.png b/public/images/emoji/facebook_messenger/woman_firefighter/4.png
index 366f946a1c4..57e79e7e804 100644
Binary files a/public/images/emoji/facebook_messenger/woman_firefighter/4.png and b/public/images/emoji/facebook_messenger/woman_firefighter/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_firefighter/5.png b/public/images/emoji/facebook_messenger/woman_firefighter/5.png
index cfd3ac72703..3e6b551e71a 100644
Binary files a/public/images/emoji/facebook_messenger/woman_firefighter/5.png and b/public/images/emoji/facebook_messenger/woman_firefighter/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_firefighter/6.png b/public/images/emoji/facebook_messenger/woman_firefighter/6.png
index 6da20434d92..e875cceab94 100644
Binary files a/public/images/emoji/facebook_messenger/woman_firefighter/6.png and b/public/images/emoji/facebook_messenger/woman_firefighter/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_genie.png b/public/images/emoji/facebook_messenger/woman_genie.png
new file mode 100644
index 00000000000..475a0df4cf4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_genie.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_health_worker.png b/public/images/emoji/facebook_messenger/woman_health_worker.png
index bdd57f781c7..ed0c321bf8c 100644
Binary files a/public/images/emoji/facebook_messenger/woman_health_worker.png and b/public/images/emoji/facebook_messenger/woman_health_worker.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_health_worker/2.png b/public/images/emoji/facebook_messenger/woman_health_worker/2.png
index 7e0d10c1f09..83f2b764d53 100644
Binary files a/public/images/emoji/facebook_messenger/woman_health_worker/2.png and b/public/images/emoji/facebook_messenger/woman_health_worker/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_health_worker/3.png b/public/images/emoji/facebook_messenger/woman_health_worker/3.png
index 06e678a9dbc..895f1047da6 100644
Binary files a/public/images/emoji/facebook_messenger/woman_health_worker/3.png and b/public/images/emoji/facebook_messenger/woman_health_worker/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_health_worker/4.png b/public/images/emoji/facebook_messenger/woman_health_worker/4.png
index 86876a9e634..4bbfad98817 100644
Binary files a/public/images/emoji/facebook_messenger/woman_health_worker/4.png and b/public/images/emoji/facebook_messenger/woman_health_worker/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_health_worker/5.png b/public/images/emoji/facebook_messenger/woman_health_worker/5.png
index 922e25ee9a2..62594f79b6a 100644
Binary files a/public/images/emoji/facebook_messenger/woman_health_worker/5.png and b/public/images/emoji/facebook_messenger/woman_health_worker/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_health_worker/6.png b/public/images/emoji/facebook_messenger/woman_health_worker/6.png
index cae11d93383..0b01955c059 100644
Binary files a/public/images/emoji/facebook_messenger/woman_health_worker/6.png and b/public/images/emoji/facebook_messenger/woman_health_worker/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_in_lotus_position.png b/public/images/emoji/facebook_messenger/woman_in_lotus_position.png
new file mode 100644
index 00000000000..3e265ed93eb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_in_lotus_position.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_in_lotus_position/2.png b/public/images/emoji/facebook_messenger/woman_in_lotus_position/2.png
new file mode 100644
index 00000000000..2c08ad4b599
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_in_lotus_position/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_in_lotus_position/3.png b/public/images/emoji/facebook_messenger/woman_in_lotus_position/3.png
new file mode 100644
index 00000000000..66c5a5cf2a1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_in_lotus_position/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_in_lotus_position/4.png b/public/images/emoji/facebook_messenger/woman_in_lotus_position/4.png
new file mode 100644
index 00000000000..d95ea803310
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_in_lotus_position/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_in_lotus_position/5.png b/public/images/emoji/facebook_messenger/woman_in_lotus_position/5.png
new file mode 100644
index 00000000000..defd5dce1dc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_in_lotus_position/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_in_lotus_position/6.png b/public/images/emoji/facebook_messenger/woman_in_lotus_position/6.png
new file mode 100644
index 00000000000..35bf1715387
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_in_lotus_position/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_in_steamy_room.png b/public/images/emoji/facebook_messenger/woman_in_steamy_room.png
new file mode 100644
index 00000000000..00fecc6ce13
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_in_steamy_room.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_in_steamy_room/2.png b/public/images/emoji/facebook_messenger/woman_in_steamy_room/2.png
new file mode 100644
index 00000000000..17665c8cbf5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_in_steamy_room/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_in_steamy_room/3.png b/public/images/emoji/facebook_messenger/woman_in_steamy_room/3.png
new file mode 100644
index 00000000000..36a1a8f394a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_in_steamy_room/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_in_steamy_room/4.png b/public/images/emoji/facebook_messenger/woman_in_steamy_room/4.png
new file mode 100644
index 00000000000..5cb9f8c69bb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_in_steamy_room/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_in_steamy_room/5.png b/public/images/emoji/facebook_messenger/woman_in_steamy_room/5.png
new file mode 100644
index 00000000000..17a44630be0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_in_steamy_room/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_in_steamy_room/6.png b/public/images/emoji/facebook_messenger/woman_in_steamy_room/6.png
new file mode 100644
index 00000000000..6a5710ea45b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_in_steamy_room/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_judge.png b/public/images/emoji/facebook_messenger/woman_judge.png
index 302f1fbdd70..c90b782a4e8 100644
Binary files a/public/images/emoji/facebook_messenger/woman_judge.png and b/public/images/emoji/facebook_messenger/woman_judge.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_judge/2.png b/public/images/emoji/facebook_messenger/woman_judge/2.png
index ba942e11df6..bf667a94fa1 100644
Binary files a/public/images/emoji/facebook_messenger/woman_judge/2.png and b/public/images/emoji/facebook_messenger/woman_judge/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_judge/3.png b/public/images/emoji/facebook_messenger/woman_judge/3.png
index 943dc444e8a..7521a082648 100644
Binary files a/public/images/emoji/facebook_messenger/woman_judge/3.png and b/public/images/emoji/facebook_messenger/woman_judge/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_judge/4.png b/public/images/emoji/facebook_messenger/woman_judge/4.png
index 901c7c2fb9b..fe033d99c78 100644
Binary files a/public/images/emoji/facebook_messenger/woman_judge/4.png and b/public/images/emoji/facebook_messenger/woman_judge/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_judge/5.png b/public/images/emoji/facebook_messenger/woman_judge/5.png
index be61917660f..d1e0aed50c9 100644
Binary files a/public/images/emoji/facebook_messenger/woman_judge/5.png and b/public/images/emoji/facebook_messenger/woman_judge/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_judge/6.png b/public/images/emoji/facebook_messenger/woman_judge/6.png
index 3be5920c27d..afe8c4f731f 100644
Binary files a/public/images/emoji/facebook_messenger/woman_judge/6.png and b/public/images/emoji/facebook_messenger/woman_judge/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_juggling.png b/public/images/emoji/facebook_messenger/woman_juggling.png
index 5c3deb2d493..afa07527b32 100644
Binary files a/public/images/emoji/facebook_messenger/woman_juggling.png and b/public/images/emoji/facebook_messenger/woman_juggling.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_juggling/2.png b/public/images/emoji/facebook_messenger/woman_juggling/2.png
index 7e0822fd89d..0401075bb3e 100644
Binary files a/public/images/emoji/facebook_messenger/woman_juggling/2.png and b/public/images/emoji/facebook_messenger/woman_juggling/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_juggling/3.png b/public/images/emoji/facebook_messenger/woman_juggling/3.png
index 9427c61849f..f8a42dc9c7e 100644
Binary files a/public/images/emoji/facebook_messenger/woman_juggling/3.png and b/public/images/emoji/facebook_messenger/woman_juggling/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_juggling/4.png b/public/images/emoji/facebook_messenger/woman_juggling/4.png
index 710119d96b5..fdbd69344b8 100644
Binary files a/public/images/emoji/facebook_messenger/woman_juggling/4.png and b/public/images/emoji/facebook_messenger/woman_juggling/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_juggling/5.png b/public/images/emoji/facebook_messenger/woman_juggling/5.png
index 2a8d51aaa99..9a0b00d4bf8 100644
Binary files a/public/images/emoji/facebook_messenger/woman_juggling/5.png and b/public/images/emoji/facebook_messenger/woman_juggling/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_juggling/6.png b/public/images/emoji/facebook_messenger/woman_juggling/6.png
index 37a7391cfe7..4e546c6ca1e 100644
Binary files a/public/images/emoji/facebook_messenger/woman_juggling/6.png and b/public/images/emoji/facebook_messenger/woman_juggling/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_mage.png b/public/images/emoji/facebook_messenger/woman_mage.png
new file mode 100644
index 00000000000..29435771b84
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_mage.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_mage/2.png b/public/images/emoji/facebook_messenger/woman_mage/2.png
new file mode 100644
index 00000000000..0099b3ccc0c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_mage/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_mage/3.png b/public/images/emoji/facebook_messenger/woman_mage/3.png
new file mode 100644
index 00000000000..1d24d6b81fb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_mage/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_mage/4.png b/public/images/emoji/facebook_messenger/woman_mage/4.png
new file mode 100644
index 00000000000..7b911df05c6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_mage/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_mage/5.png b/public/images/emoji/facebook_messenger/woman_mage/5.png
new file mode 100644
index 00000000000..ed3c6114a2e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_mage/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_mage/6.png b/public/images/emoji/facebook_messenger/woman_mage/6.png
new file mode 100644
index 00000000000..52c87462a04
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_mage/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_mechanic.png b/public/images/emoji/facebook_messenger/woman_mechanic.png
index 00c01f4dc78..5b3b9f8ff6c 100644
Binary files a/public/images/emoji/facebook_messenger/woman_mechanic.png and b/public/images/emoji/facebook_messenger/woman_mechanic.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_mechanic/2.png b/public/images/emoji/facebook_messenger/woman_mechanic/2.png
index 2dd109611ef..106676a028e 100644
Binary files a/public/images/emoji/facebook_messenger/woman_mechanic/2.png and b/public/images/emoji/facebook_messenger/woman_mechanic/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_mechanic/3.png b/public/images/emoji/facebook_messenger/woman_mechanic/3.png
index 3029459512e..e30580df934 100644
Binary files a/public/images/emoji/facebook_messenger/woman_mechanic/3.png and b/public/images/emoji/facebook_messenger/woman_mechanic/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_mechanic/4.png b/public/images/emoji/facebook_messenger/woman_mechanic/4.png
index fd6be2cb760..d1ba1ecf12e 100644
Binary files a/public/images/emoji/facebook_messenger/woman_mechanic/4.png and b/public/images/emoji/facebook_messenger/woman_mechanic/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_mechanic/5.png b/public/images/emoji/facebook_messenger/woman_mechanic/5.png
index baec0ca3c51..92491bf1e67 100644
Binary files a/public/images/emoji/facebook_messenger/woman_mechanic/5.png and b/public/images/emoji/facebook_messenger/woman_mechanic/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_mechanic/6.png b/public/images/emoji/facebook_messenger/woman_mechanic/6.png
index de62d29f061..6ad4e620e79 100644
Binary files a/public/images/emoji/facebook_messenger/woman_mechanic/6.png and b/public/images/emoji/facebook_messenger/woman_mechanic/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_office_worker.png b/public/images/emoji/facebook_messenger/woman_office_worker.png
index 3ed967832b7..8b4e28646a2 100644
Binary files a/public/images/emoji/facebook_messenger/woman_office_worker.png and b/public/images/emoji/facebook_messenger/woman_office_worker.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_office_worker/2.png b/public/images/emoji/facebook_messenger/woman_office_worker/2.png
index 17b377b41ca..d43be5251f1 100644
Binary files a/public/images/emoji/facebook_messenger/woman_office_worker/2.png and b/public/images/emoji/facebook_messenger/woman_office_worker/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_office_worker/3.png b/public/images/emoji/facebook_messenger/woman_office_worker/3.png
index 70fea252b05..d2d3bba4a16 100644
Binary files a/public/images/emoji/facebook_messenger/woman_office_worker/3.png and b/public/images/emoji/facebook_messenger/woman_office_worker/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_office_worker/4.png b/public/images/emoji/facebook_messenger/woman_office_worker/4.png
index 59cd9724190..330109159b2 100644
Binary files a/public/images/emoji/facebook_messenger/woman_office_worker/4.png and b/public/images/emoji/facebook_messenger/woman_office_worker/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_office_worker/5.png b/public/images/emoji/facebook_messenger/woman_office_worker/5.png
index 410d6e42cf9..89ec56ce742 100644
Binary files a/public/images/emoji/facebook_messenger/woman_office_worker/5.png and b/public/images/emoji/facebook_messenger/woman_office_worker/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_office_worker/6.png b/public/images/emoji/facebook_messenger/woman_office_worker/6.png
index 77c1ab6c3cd..03be15a51f2 100644
Binary files a/public/images/emoji/facebook_messenger/woman_office_worker/6.png and b/public/images/emoji/facebook_messenger/woman_office_worker/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_pilot.png b/public/images/emoji/facebook_messenger/woman_pilot.png
index bdb1f781ee9..1962bba0103 100644
Binary files a/public/images/emoji/facebook_messenger/woman_pilot.png and b/public/images/emoji/facebook_messenger/woman_pilot.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_pilot/2.png b/public/images/emoji/facebook_messenger/woman_pilot/2.png
index 18357b611a1..6baec73b906 100644
Binary files a/public/images/emoji/facebook_messenger/woman_pilot/2.png and b/public/images/emoji/facebook_messenger/woman_pilot/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_pilot/3.png b/public/images/emoji/facebook_messenger/woman_pilot/3.png
index 6ef43682bc7..244cda95217 100644
Binary files a/public/images/emoji/facebook_messenger/woman_pilot/3.png and b/public/images/emoji/facebook_messenger/woman_pilot/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_pilot/4.png b/public/images/emoji/facebook_messenger/woman_pilot/4.png
index 5b46123bc29..7b95b224d37 100644
Binary files a/public/images/emoji/facebook_messenger/woman_pilot/4.png and b/public/images/emoji/facebook_messenger/woman_pilot/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_pilot/5.png b/public/images/emoji/facebook_messenger/woman_pilot/5.png
index c13b55013ec..aec2ed5e901 100644
Binary files a/public/images/emoji/facebook_messenger/woman_pilot/5.png and b/public/images/emoji/facebook_messenger/woman_pilot/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_pilot/6.png b/public/images/emoji/facebook_messenger/woman_pilot/6.png
index fb7ec93f0ca..a49756308ce 100644
Binary files a/public/images/emoji/facebook_messenger/woman_pilot/6.png and b/public/images/emoji/facebook_messenger/woman_pilot/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_handball.png b/public/images/emoji/facebook_messenger/woman_playing_handball.png
index 731f747ab26..9eb1c81dbf1 100644
Binary files a/public/images/emoji/facebook_messenger/woman_playing_handball.png and b/public/images/emoji/facebook_messenger/woman_playing_handball.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_handball/2.png b/public/images/emoji/facebook_messenger/woman_playing_handball/2.png
index 52f1ac332db..4afbc636a1c 100644
Binary files a/public/images/emoji/facebook_messenger/woman_playing_handball/2.png and b/public/images/emoji/facebook_messenger/woman_playing_handball/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_handball/3.png b/public/images/emoji/facebook_messenger/woman_playing_handball/3.png
index 57ff251cbe3..0fdd867dff6 100644
Binary files a/public/images/emoji/facebook_messenger/woman_playing_handball/3.png and b/public/images/emoji/facebook_messenger/woman_playing_handball/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_handball/4.png b/public/images/emoji/facebook_messenger/woman_playing_handball/4.png
index 8b21c5f954e..3d6ced251fc 100644
Binary files a/public/images/emoji/facebook_messenger/woman_playing_handball/4.png and b/public/images/emoji/facebook_messenger/woman_playing_handball/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_handball/5.png b/public/images/emoji/facebook_messenger/woman_playing_handball/5.png
index c09e12ad349..1a2d6bcaafe 100644
Binary files a/public/images/emoji/facebook_messenger/woman_playing_handball/5.png and b/public/images/emoji/facebook_messenger/woman_playing_handball/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_handball/6.png b/public/images/emoji/facebook_messenger/woman_playing_handball/6.png
index 25a5c4edd8e..9d0e5b64aef 100644
Binary files a/public/images/emoji/facebook_messenger/woman_playing_handball/6.png and b/public/images/emoji/facebook_messenger/woman_playing_handball/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_water_polo.png b/public/images/emoji/facebook_messenger/woman_playing_water_polo.png
index 9f1a2e79e9d..9f1c1c7d15d 100644
Binary files a/public/images/emoji/facebook_messenger/woman_playing_water_polo.png and b/public/images/emoji/facebook_messenger/woman_playing_water_polo.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_water_polo/2.png b/public/images/emoji/facebook_messenger/woman_playing_water_polo/2.png
index 74118cdc896..5ecc204eab7 100644
Binary files a/public/images/emoji/facebook_messenger/woman_playing_water_polo/2.png and b/public/images/emoji/facebook_messenger/woman_playing_water_polo/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_water_polo/3.png b/public/images/emoji/facebook_messenger/woman_playing_water_polo/3.png
index 02a40bc83d7..46fca4221d7 100644
Binary files a/public/images/emoji/facebook_messenger/woman_playing_water_polo/3.png and b/public/images/emoji/facebook_messenger/woman_playing_water_polo/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_water_polo/4.png b/public/images/emoji/facebook_messenger/woman_playing_water_polo/4.png
index 28e04bc113c..21ae6351891 100644
Binary files a/public/images/emoji/facebook_messenger/woman_playing_water_polo/4.png and b/public/images/emoji/facebook_messenger/woman_playing_water_polo/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_water_polo/5.png b/public/images/emoji/facebook_messenger/woman_playing_water_polo/5.png
index f112c330bc3..0e80e1a7d7b 100644
Binary files a/public/images/emoji/facebook_messenger/woman_playing_water_polo/5.png and b/public/images/emoji/facebook_messenger/woman_playing_water_polo/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_water_polo/6.png b/public/images/emoji/facebook_messenger/woman_playing_water_polo/6.png
index dd3f628ee91..e1bcd099a19 100644
Binary files a/public/images/emoji/facebook_messenger/woman_playing_water_polo/6.png and b/public/images/emoji/facebook_messenger/woman_playing_water_polo/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_scientist.png b/public/images/emoji/facebook_messenger/woman_scientist.png
index debc8aa07e2..398ed0c15b9 100644
Binary files a/public/images/emoji/facebook_messenger/woman_scientist.png and b/public/images/emoji/facebook_messenger/woman_scientist.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_scientist/2.png b/public/images/emoji/facebook_messenger/woman_scientist/2.png
index 84b54c10bb0..2a6e8cbb906 100644
Binary files a/public/images/emoji/facebook_messenger/woman_scientist/2.png and b/public/images/emoji/facebook_messenger/woman_scientist/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_scientist/3.png b/public/images/emoji/facebook_messenger/woman_scientist/3.png
index e7aa385a93c..22568f84523 100644
Binary files a/public/images/emoji/facebook_messenger/woman_scientist/3.png and b/public/images/emoji/facebook_messenger/woman_scientist/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_scientist/4.png b/public/images/emoji/facebook_messenger/woman_scientist/4.png
index 9d294761afa..5c8d8f5465b 100644
Binary files a/public/images/emoji/facebook_messenger/woman_scientist/4.png and b/public/images/emoji/facebook_messenger/woman_scientist/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_scientist/5.png b/public/images/emoji/facebook_messenger/woman_scientist/5.png
index bfc9f7b48c5..5c34317ffe9 100644
Binary files a/public/images/emoji/facebook_messenger/woman_scientist/5.png and b/public/images/emoji/facebook_messenger/woman_scientist/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_scientist/6.png b/public/images/emoji/facebook_messenger/woman_scientist/6.png
index 70ebc5bc4f3..083c49ef3cf 100644
Binary files a/public/images/emoji/facebook_messenger/woman_scientist/6.png and b/public/images/emoji/facebook_messenger/woman_scientist/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_shrugging.png b/public/images/emoji/facebook_messenger/woman_shrugging.png
index 3839c5eacdf..128d1554077 100644
Binary files a/public/images/emoji/facebook_messenger/woman_shrugging.png and b/public/images/emoji/facebook_messenger/woman_shrugging.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_shrugging/2.png b/public/images/emoji/facebook_messenger/woman_shrugging/2.png
index 3ae10f1008d..25b069d3c95 100644
Binary files a/public/images/emoji/facebook_messenger/woman_shrugging/2.png and b/public/images/emoji/facebook_messenger/woman_shrugging/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_shrugging/3.png b/public/images/emoji/facebook_messenger/woman_shrugging/3.png
index 1be387d41e1..d304304d3c0 100644
Binary files a/public/images/emoji/facebook_messenger/woman_shrugging/3.png and b/public/images/emoji/facebook_messenger/woman_shrugging/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_shrugging/4.png b/public/images/emoji/facebook_messenger/woman_shrugging/4.png
index 9fbf38dfeab..aaf368bafa4 100644
Binary files a/public/images/emoji/facebook_messenger/woman_shrugging/4.png and b/public/images/emoji/facebook_messenger/woman_shrugging/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_shrugging/5.png b/public/images/emoji/facebook_messenger/woman_shrugging/5.png
index 349d86171e0..9d705cdb44e 100644
Binary files a/public/images/emoji/facebook_messenger/woman_shrugging/5.png and b/public/images/emoji/facebook_messenger/woman_shrugging/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_shrugging/6.png b/public/images/emoji/facebook_messenger/woman_shrugging/6.png
index 82a2b9f0528..e94b7ba8fa0 100644
Binary files a/public/images/emoji/facebook_messenger/woman_shrugging/6.png and b/public/images/emoji/facebook_messenger/woman_shrugging/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_singer.png b/public/images/emoji/facebook_messenger/woman_singer.png
index 07f59ab15f2..911dbe2dff5 100644
Binary files a/public/images/emoji/facebook_messenger/woman_singer.png and b/public/images/emoji/facebook_messenger/woman_singer.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_singer/2.png b/public/images/emoji/facebook_messenger/woman_singer/2.png
index 96578ef833f..29eef65012f 100644
Binary files a/public/images/emoji/facebook_messenger/woman_singer/2.png and b/public/images/emoji/facebook_messenger/woman_singer/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_singer/3.png b/public/images/emoji/facebook_messenger/woman_singer/3.png
index 3a613507ef2..091973246e7 100644
Binary files a/public/images/emoji/facebook_messenger/woman_singer/3.png and b/public/images/emoji/facebook_messenger/woman_singer/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_singer/4.png b/public/images/emoji/facebook_messenger/woman_singer/4.png
index 439f929fb0b..8122d175cec 100644
Binary files a/public/images/emoji/facebook_messenger/woman_singer/4.png and b/public/images/emoji/facebook_messenger/woman_singer/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_singer/5.png b/public/images/emoji/facebook_messenger/woman_singer/5.png
index f615d7ef3c0..792b00db21a 100644
Binary files a/public/images/emoji/facebook_messenger/woman_singer/5.png and b/public/images/emoji/facebook_messenger/woman_singer/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_singer/6.png b/public/images/emoji/facebook_messenger/woman_singer/6.png
index 4d919b04534..c403f805df8 100644
Binary files a/public/images/emoji/facebook_messenger/woman_singer/6.png and b/public/images/emoji/facebook_messenger/woman_singer/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_student.png b/public/images/emoji/facebook_messenger/woman_student.png
index 60e3c075ebb..c321c0d38da 100644
Binary files a/public/images/emoji/facebook_messenger/woman_student.png and b/public/images/emoji/facebook_messenger/woman_student.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_student/2.png b/public/images/emoji/facebook_messenger/woman_student/2.png
index b02489086fd..76f04a80d3b 100644
Binary files a/public/images/emoji/facebook_messenger/woman_student/2.png and b/public/images/emoji/facebook_messenger/woman_student/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_student/3.png b/public/images/emoji/facebook_messenger/woman_student/3.png
index f6488d33900..f4d5c491fba 100644
Binary files a/public/images/emoji/facebook_messenger/woman_student/3.png and b/public/images/emoji/facebook_messenger/woman_student/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_student/4.png b/public/images/emoji/facebook_messenger/woman_student/4.png
index 05f82e21622..09b7f076708 100644
Binary files a/public/images/emoji/facebook_messenger/woman_student/4.png and b/public/images/emoji/facebook_messenger/woman_student/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_student/5.png b/public/images/emoji/facebook_messenger/woman_student/5.png
index 26ceb123206..74fd1a64ff8 100644
Binary files a/public/images/emoji/facebook_messenger/woman_student/5.png and b/public/images/emoji/facebook_messenger/woman_student/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_student/6.png b/public/images/emoji/facebook_messenger/woman_student/6.png
index 7fca961910f..df0ba30713a 100644
Binary files a/public/images/emoji/facebook_messenger/woman_student/6.png and b/public/images/emoji/facebook_messenger/woman_student/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_teacher.png b/public/images/emoji/facebook_messenger/woman_teacher.png
index d98448f85bd..84b8d807b57 100644
Binary files a/public/images/emoji/facebook_messenger/woman_teacher.png and b/public/images/emoji/facebook_messenger/woman_teacher.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_teacher/2.png b/public/images/emoji/facebook_messenger/woman_teacher/2.png
index 6f980a37166..35019819a37 100644
Binary files a/public/images/emoji/facebook_messenger/woman_teacher/2.png and b/public/images/emoji/facebook_messenger/woman_teacher/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_teacher/3.png b/public/images/emoji/facebook_messenger/woman_teacher/3.png
index 0fb8f0904a8..198fe3d32b3 100644
Binary files a/public/images/emoji/facebook_messenger/woman_teacher/3.png and b/public/images/emoji/facebook_messenger/woman_teacher/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_teacher/4.png b/public/images/emoji/facebook_messenger/woman_teacher/4.png
index a8021347936..8262557386a 100644
Binary files a/public/images/emoji/facebook_messenger/woman_teacher/4.png and b/public/images/emoji/facebook_messenger/woman_teacher/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_teacher/5.png b/public/images/emoji/facebook_messenger/woman_teacher/5.png
index dcceb1add1a..c8851eac03c 100644
Binary files a/public/images/emoji/facebook_messenger/woman_teacher/5.png and b/public/images/emoji/facebook_messenger/woman_teacher/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_teacher/6.png b/public/images/emoji/facebook_messenger/woman_teacher/6.png
index 41dc97c0786..f9807127864 100644
Binary files a/public/images/emoji/facebook_messenger/woman_teacher/6.png and b/public/images/emoji/facebook_messenger/woman_teacher/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_technologist.png b/public/images/emoji/facebook_messenger/woman_technologist.png
index d74e604a64c..f81b5b4b6c0 100644
Binary files a/public/images/emoji/facebook_messenger/woman_technologist.png and b/public/images/emoji/facebook_messenger/woman_technologist.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_technologist/2.png b/public/images/emoji/facebook_messenger/woman_technologist/2.png
index 931f1fd2bdd..4a82324b137 100644
Binary files a/public/images/emoji/facebook_messenger/woman_technologist/2.png and b/public/images/emoji/facebook_messenger/woman_technologist/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_technologist/3.png b/public/images/emoji/facebook_messenger/woman_technologist/3.png
index 2cb918f752a..9476baabdad 100644
Binary files a/public/images/emoji/facebook_messenger/woman_technologist/3.png and b/public/images/emoji/facebook_messenger/woman_technologist/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_technologist/4.png b/public/images/emoji/facebook_messenger/woman_technologist/4.png
index f1cb4062e80..b0cf3a7aaae 100644
Binary files a/public/images/emoji/facebook_messenger/woman_technologist/4.png and b/public/images/emoji/facebook_messenger/woman_technologist/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_technologist/5.png b/public/images/emoji/facebook_messenger/woman_technologist/5.png
index 5154939f5b0..4789d8321e5 100644
Binary files a/public/images/emoji/facebook_messenger/woman_technologist/5.png and b/public/images/emoji/facebook_messenger/woman_technologist/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_technologist/6.png b/public/images/emoji/facebook_messenger/woman_technologist/6.png
index a427628a98e..001f9fb242b 100644
Binary files a/public/images/emoji/facebook_messenger/woman_technologist/6.png and b/public/images/emoji/facebook_messenger/woman_technologist/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_headscarf.png b/public/images/emoji/facebook_messenger/woman_with_headscarf.png
index 6b3731cac84..cf3f0f615c8 100644
Binary files a/public/images/emoji/facebook_messenger/woman_with_headscarf.png and b/public/images/emoji/facebook_messenger/woman_with_headscarf.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_headscarf/2.png b/public/images/emoji/facebook_messenger/woman_with_headscarf/2.png
index 511414ad6c6..2d5d61b5efb 100644
Binary files a/public/images/emoji/facebook_messenger/woman_with_headscarf/2.png and b/public/images/emoji/facebook_messenger/woman_with_headscarf/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_headscarf/3.png b/public/images/emoji/facebook_messenger/woman_with_headscarf/3.png
index af954353790..fc14029e001 100644
Binary files a/public/images/emoji/facebook_messenger/woman_with_headscarf/3.png and b/public/images/emoji/facebook_messenger/woman_with_headscarf/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_headscarf/4.png b/public/images/emoji/facebook_messenger/woman_with_headscarf/4.png
index 355bdeb6361..c99b5c6cfb9 100644
Binary files a/public/images/emoji/facebook_messenger/woman_with_headscarf/4.png and b/public/images/emoji/facebook_messenger/woman_with_headscarf/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_headscarf/5.png b/public/images/emoji/facebook_messenger/woman_with_headscarf/5.png
index 8d0ad7202e3..299ab391948 100644
Binary files a/public/images/emoji/facebook_messenger/woman_with_headscarf/5.png and b/public/images/emoji/facebook_messenger/woman_with_headscarf/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_headscarf/6.png b/public/images/emoji/facebook_messenger/woman_with_headscarf/6.png
index 3c49195f876..615f12490d7 100644
Binary files a/public/images/emoji/facebook_messenger/woman_with_headscarf/6.png and b/public/images/emoji/facebook_messenger/woman_with_headscarf/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_turban.png b/public/images/emoji/facebook_messenger/woman_with_turban.png
index 884af5800cf..ae9465ead00 100644
Binary files a/public/images/emoji/facebook_messenger/woman_with_turban.png and b/public/images/emoji/facebook_messenger/woman_with_turban.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_turban/2.png b/public/images/emoji/facebook_messenger/woman_with_turban/2.png
index f4904a0f1c8..e8b659d6fed 100644
Binary files a/public/images/emoji/facebook_messenger/woman_with_turban/2.png and b/public/images/emoji/facebook_messenger/woman_with_turban/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_turban/3.png b/public/images/emoji/facebook_messenger/woman_with_turban/3.png
index 1629f28e0b1..af222d5c7fc 100644
Binary files a/public/images/emoji/facebook_messenger/woman_with_turban/3.png and b/public/images/emoji/facebook_messenger/woman_with_turban/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_turban/4.png b/public/images/emoji/facebook_messenger/woman_with_turban/4.png
index be7cbbeb4ee..c4056633ae4 100644
Binary files a/public/images/emoji/facebook_messenger/woman_with_turban/4.png and b/public/images/emoji/facebook_messenger/woman_with_turban/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_turban/5.png b/public/images/emoji/facebook_messenger/woman_with_turban/5.png
index 28845305df9..20bac38ef7e 100644
Binary files a/public/images/emoji/facebook_messenger/woman_with_turban/5.png and b/public/images/emoji/facebook_messenger/woman_with_turban/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_turban/6.png b/public/images/emoji/facebook_messenger/woman_with_turban/6.png
index 1831d062fee..be824964c44 100644
Binary files a/public/images/emoji/facebook_messenger/woman_with_turban/6.png and b/public/images/emoji/facebook_messenger/woman_with_turban/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_zombie.png b/public/images/emoji/facebook_messenger/woman_zombie.png
new file mode 100644
index 00000000000..6623ffe5d31
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_zombie.png differ
diff --git a/public/images/emoji/facebook_messenger/womans_clothes.png b/public/images/emoji/facebook_messenger/womans_clothes.png
index 69c438bcbc4..1d3125eb563 100644
Binary files a/public/images/emoji/facebook_messenger/womans_clothes.png and b/public/images/emoji/facebook_messenger/womans_clothes.png differ
diff --git a/public/images/emoji/facebook_messenger/womans_hat.png b/public/images/emoji/facebook_messenger/womans_hat.png
index bcbde01af25..dc29f80127b 100644
Binary files a/public/images/emoji/facebook_messenger/womans_hat.png and b/public/images/emoji/facebook_messenger/womans_hat.png differ
diff --git a/public/images/emoji/facebook_messenger/women_wrestling.png b/public/images/emoji/facebook_messenger/women_wrestling.png
index 11fa66fd954..fad1a7af59a 100644
Binary files a/public/images/emoji/facebook_messenger/women_wrestling.png and b/public/images/emoji/facebook_messenger/women_wrestling.png differ
diff --git a/public/images/emoji/facebook_messenger/womens.png b/public/images/emoji/facebook_messenger/womens.png
index 4223ed07e68..1a8b1d2f754 100644
Binary files a/public/images/emoji/facebook_messenger/womens.png and b/public/images/emoji/facebook_messenger/womens.png differ
diff --git a/public/images/emoji/facebook_messenger/world_map.png b/public/images/emoji/facebook_messenger/world_map.png
index 8c102ea49de..f387ba2fd76 100644
Binary files a/public/images/emoji/facebook_messenger/world_map.png and b/public/images/emoji/facebook_messenger/world_map.png differ
diff --git a/public/images/emoji/facebook_messenger/worried.png b/public/images/emoji/facebook_messenger/worried.png
index c4614d9bef1..ac743e0e243 100644
Binary files a/public/images/emoji/facebook_messenger/worried.png and b/public/images/emoji/facebook_messenger/worried.png differ
diff --git a/public/images/emoji/facebook_messenger/worship_symbol.png b/public/images/emoji/facebook_messenger/worship_symbol.png
index 19e1150b303..0f9025c3c49 100644
Binary files a/public/images/emoji/facebook_messenger/worship_symbol.png and b/public/images/emoji/facebook_messenger/worship_symbol.png differ
diff --git a/public/images/emoji/facebook_messenger/wrench.png b/public/images/emoji/facebook_messenger/wrench.png
index d91bd45269e..1b1bf131afc 100644
Binary files a/public/images/emoji/facebook_messenger/wrench.png and b/public/images/emoji/facebook_messenger/wrench.png differ
diff --git a/public/images/emoji/facebook_messenger/writing_hand.png b/public/images/emoji/facebook_messenger/writing_hand.png
index 8ec2032bf40..524c4ec5c00 100644
Binary files a/public/images/emoji/facebook_messenger/writing_hand.png and b/public/images/emoji/facebook_messenger/writing_hand.png differ
diff --git a/public/images/emoji/facebook_messenger/writing_hand/2.png b/public/images/emoji/facebook_messenger/writing_hand/2.png
index 37ac5fc0895..cd1d39abd06 100644
Binary files a/public/images/emoji/facebook_messenger/writing_hand/2.png and b/public/images/emoji/facebook_messenger/writing_hand/2.png differ
diff --git a/public/images/emoji/facebook_messenger/writing_hand/3.png b/public/images/emoji/facebook_messenger/writing_hand/3.png
index 38606d26637..0942bf8fe96 100644
Binary files a/public/images/emoji/facebook_messenger/writing_hand/3.png and b/public/images/emoji/facebook_messenger/writing_hand/3.png differ
diff --git a/public/images/emoji/facebook_messenger/writing_hand/4.png b/public/images/emoji/facebook_messenger/writing_hand/4.png
index 84ae862921f..d09b3b006d8 100644
Binary files a/public/images/emoji/facebook_messenger/writing_hand/4.png and b/public/images/emoji/facebook_messenger/writing_hand/4.png differ
diff --git a/public/images/emoji/facebook_messenger/writing_hand/5.png b/public/images/emoji/facebook_messenger/writing_hand/5.png
index 89644b2736d..a305c9bfdbe 100644
Binary files a/public/images/emoji/facebook_messenger/writing_hand/5.png and b/public/images/emoji/facebook_messenger/writing_hand/5.png differ
diff --git a/public/images/emoji/facebook_messenger/writing_hand/6.png b/public/images/emoji/facebook_messenger/writing_hand/6.png
index c9e50cd3522..472eab2ddd2 100644
Binary files a/public/images/emoji/facebook_messenger/writing_hand/6.png and b/public/images/emoji/facebook_messenger/writing_hand/6.png differ
diff --git a/public/images/emoji/facebook_messenger/x.png b/public/images/emoji/facebook_messenger/x.png
index fbb75f26265..e73307a7384 100644
Binary files a/public/images/emoji/facebook_messenger/x.png and b/public/images/emoji/facebook_messenger/x.png differ
diff --git a/public/images/emoji/facebook_messenger/yellow_heart.png b/public/images/emoji/facebook_messenger/yellow_heart.png
index 5d2ed7dc209..8dbc5972f42 100644
Binary files a/public/images/emoji/facebook_messenger/yellow_heart.png and b/public/images/emoji/facebook_messenger/yellow_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/yemen.png b/public/images/emoji/facebook_messenger/yemen.png
index 3a37c850413..56f80a8d749 100644
Binary files a/public/images/emoji/facebook_messenger/yemen.png and b/public/images/emoji/facebook_messenger/yemen.png differ
diff --git a/public/images/emoji/facebook_messenger/yen.png b/public/images/emoji/facebook_messenger/yen.png
index 237355971e4..556fad7ed54 100644
Binary files a/public/images/emoji/facebook_messenger/yen.png and b/public/images/emoji/facebook_messenger/yen.png differ
diff --git a/public/images/emoji/facebook_messenger/yin_yang.png b/public/images/emoji/facebook_messenger/yin_yang.png
index 9e6fbd048a1..d37875455ba 100644
Binary files a/public/images/emoji/facebook_messenger/yin_yang.png and b/public/images/emoji/facebook_messenger/yin_yang.png differ
diff --git a/public/images/emoji/facebook_messenger/yum.png b/public/images/emoji/facebook_messenger/yum.png
index 83d4dc62db2..0912dc8749b 100644
Binary files a/public/images/emoji/facebook_messenger/yum.png and b/public/images/emoji/facebook_messenger/yum.png differ
diff --git a/public/images/emoji/facebook_messenger/zambia.png b/public/images/emoji/facebook_messenger/zambia.png
index 3e7d4cbea56..333fa806ca8 100644
Binary files a/public/images/emoji/facebook_messenger/zambia.png and b/public/images/emoji/facebook_messenger/zambia.png differ
diff --git a/public/images/emoji/facebook_messenger/zap.png b/public/images/emoji/facebook_messenger/zap.png
index e7a3c9cdfc3..5fbf5ee4c11 100644
Binary files a/public/images/emoji/facebook_messenger/zap.png and b/public/images/emoji/facebook_messenger/zap.png differ
diff --git a/public/images/emoji/facebook_messenger/zebra.png b/public/images/emoji/facebook_messenger/zebra.png
index 6faa14f55dc..66dcfd1729e 100644
Binary files a/public/images/emoji/facebook_messenger/zebra.png and b/public/images/emoji/facebook_messenger/zebra.png differ
diff --git a/public/images/emoji/facebook_messenger/zero.png b/public/images/emoji/facebook_messenger/zero.png
index a8ff7b88d91..98029040503 100644
Binary files a/public/images/emoji/facebook_messenger/zero.png and b/public/images/emoji/facebook_messenger/zero.png differ
diff --git a/public/images/emoji/facebook_messenger/zimbabwe.png b/public/images/emoji/facebook_messenger/zimbabwe.png
index c3af3c54d7e..5f6e8647a35 100644
Binary files a/public/images/emoji/facebook_messenger/zimbabwe.png and b/public/images/emoji/facebook_messenger/zimbabwe.png differ
diff --git a/public/images/emoji/facebook_messenger/zipper_mouth.png b/public/images/emoji/facebook_messenger/zipper_mouth.png
index d764a0fe1ac..b7f5d243283 100644
Binary files a/public/images/emoji/facebook_messenger/zipper_mouth.png and b/public/images/emoji/facebook_messenger/zipper_mouth.png differ
diff --git a/public/images/emoji/facebook_messenger/zipper_mouth_face.png b/public/images/emoji/facebook_messenger/zipper_mouth_face.png
index d764a0fe1ac..b7f5d243283 100644
Binary files a/public/images/emoji/facebook_messenger/zipper_mouth_face.png and b/public/images/emoji/facebook_messenger/zipper_mouth_face.png differ
diff --git a/public/images/emoji/facebook_messenger/zombie.png b/public/images/emoji/facebook_messenger/zombie.png
index 1bf288fcd4c..6623ffe5d31 100644
Binary files a/public/images/emoji/facebook_messenger/zombie.png and b/public/images/emoji/facebook_messenger/zombie.png differ
diff --git a/public/images/emoji/facebook_messenger/zzz.png b/public/images/emoji/facebook_messenger/zzz.png
index 3ec9ff90039..b57261cb2d8 100644
Binary files a/public/images/emoji/facebook_messenger/zzz.png and b/public/images/emoji/facebook_messenger/zzz.png differ
diff --git a/public/images/emoji/google/+1.png b/public/images/emoji/google/+1.png
index b03f09eb007..7e440eb6a8d 100644
Binary files a/public/images/emoji/google/+1.png and b/public/images/emoji/google/+1.png differ
diff --git a/public/images/emoji/google/+1/2.png b/public/images/emoji/google/+1/2.png
index a3a855f569e..d31652eaf5c 100644
Binary files a/public/images/emoji/google/+1/2.png and b/public/images/emoji/google/+1/2.png differ
diff --git a/public/images/emoji/google/+1/3.png b/public/images/emoji/google/+1/3.png
index c8e515c99bb..5b1760d7a31 100644
Binary files a/public/images/emoji/google/+1/3.png and b/public/images/emoji/google/+1/3.png differ
diff --git a/public/images/emoji/google/+1/4.png b/public/images/emoji/google/+1/4.png
index 4a388dd5fc0..2ba4abddc42 100644
Binary files a/public/images/emoji/google/+1/4.png and b/public/images/emoji/google/+1/4.png differ
diff --git a/public/images/emoji/google/+1/5.png b/public/images/emoji/google/+1/5.png
index 5bf6c233fd2..b9fdc0019db 100644
Binary files a/public/images/emoji/google/+1/5.png and b/public/images/emoji/google/+1/5.png differ
diff --git a/public/images/emoji/google/+1/6.png b/public/images/emoji/google/+1/6.png
index fed5d03000e..d4944089c6c 100644
Binary files a/public/images/emoji/google/+1/6.png and b/public/images/emoji/google/+1/6.png differ
diff --git a/public/images/emoji/google/-1.png b/public/images/emoji/google/-1.png
index f2e7da55f6a..01e3d0ffa18 100644
Binary files a/public/images/emoji/google/-1.png and b/public/images/emoji/google/-1.png differ
diff --git a/public/images/emoji/google/-1/2.png b/public/images/emoji/google/-1/2.png
index 86d0319a4ab..d2bcecf2c36 100644
Binary files a/public/images/emoji/google/-1/2.png and b/public/images/emoji/google/-1/2.png differ
diff --git a/public/images/emoji/google/-1/3.png b/public/images/emoji/google/-1/3.png
index c50a57e11ec..e7665e4bafb 100644
Binary files a/public/images/emoji/google/-1/3.png and b/public/images/emoji/google/-1/3.png differ
diff --git a/public/images/emoji/google/-1/4.png b/public/images/emoji/google/-1/4.png
index 979e09adf86..0ec1f2e3a0e 100644
Binary files a/public/images/emoji/google/-1/4.png and b/public/images/emoji/google/-1/4.png differ
diff --git a/public/images/emoji/google/-1/5.png b/public/images/emoji/google/-1/5.png
index bf4f10d81ab..3f3bd72ef44 100644
Binary files a/public/images/emoji/google/-1/5.png and b/public/images/emoji/google/-1/5.png differ
diff --git a/public/images/emoji/google/-1/6.png b/public/images/emoji/google/-1/6.png
index ecab34a9829..65825685672 100644
Binary files a/public/images/emoji/google/-1/6.png and b/public/images/emoji/google/-1/6.png differ
diff --git a/public/images/emoji/google/100.png b/public/images/emoji/google/100.png
index f72792d350f..947d38dc2f4 100644
Binary files a/public/images/emoji/google/100.png and b/public/images/emoji/google/100.png differ
diff --git a/public/images/emoji/google/1234.png b/public/images/emoji/google/1234.png
index 53d00b47171..4c52b73db1d 100644
Binary files a/public/images/emoji/google/1234.png and b/public/images/emoji/google/1234.png differ
diff --git a/public/images/emoji/google/1st_place_medal.png b/public/images/emoji/google/1st_place_medal.png
index 8b13dfec619..27865431cbc 100644
Binary files a/public/images/emoji/google/1st_place_medal.png and b/public/images/emoji/google/1st_place_medal.png differ
diff --git a/public/images/emoji/google/2nd_place_medal.png b/public/images/emoji/google/2nd_place_medal.png
index dbd2ef99141..f49b7bc555c 100644
Binary files a/public/images/emoji/google/2nd_place_medal.png and b/public/images/emoji/google/2nd_place_medal.png differ
diff --git a/public/images/emoji/google/3rd_place_medal.png b/public/images/emoji/google/3rd_place_medal.png
index a6e4ff3b4bf..474e5890f6d 100644
Binary files a/public/images/emoji/google/3rd_place_medal.png and b/public/images/emoji/google/3rd_place_medal.png differ
diff --git a/public/images/emoji/google/8ball.png b/public/images/emoji/google/8ball.png
index ab42869644a..731079eb75d 100644
Binary files a/public/images/emoji/google/8ball.png and b/public/images/emoji/google/8ball.png differ
diff --git a/public/images/emoji/google/a.png b/public/images/emoji/google/a.png
index 97451b60768..dcc2e925cd2 100644
Binary files a/public/images/emoji/google/a.png and b/public/images/emoji/google/a.png differ
diff --git a/public/images/emoji/google/ab.png b/public/images/emoji/google/ab.png
index da29c555997..bc471620545 100644
Binary files a/public/images/emoji/google/ab.png and b/public/images/emoji/google/ab.png differ
diff --git a/public/images/emoji/google/abc.png b/public/images/emoji/google/abc.png
index 5c9880cf93c..0aa4d7fa440 100644
Binary files a/public/images/emoji/google/abc.png and b/public/images/emoji/google/abc.png differ
diff --git a/public/images/emoji/google/abcd.png b/public/images/emoji/google/abcd.png
index 0aeeb0eb9d7..7f5c5cd6798 100644
Binary files a/public/images/emoji/google/abcd.png and b/public/images/emoji/google/abcd.png differ
diff --git a/public/images/emoji/google/accept.png b/public/images/emoji/google/accept.png
index 3a8259c2a65..85ac66b4ed3 100644
Binary files a/public/images/emoji/google/accept.png and b/public/images/emoji/google/accept.png differ
diff --git a/public/images/emoji/google/admission_tickets.png b/public/images/emoji/google/admission_tickets.png
index d4a4f20a291..64ccba10db2 100644
Binary files a/public/images/emoji/google/admission_tickets.png and b/public/images/emoji/google/admission_tickets.png differ
diff --git a/public/images/emoji/google/adult.png b/public/images/emoji/google/adult.png
index b1e573ea796..48535bf92df 100644
Binary files a/public/images/emoji/google/adult.png and b/public/images/emoji/google/adult.png differ
diff --git a/public/images/emoji/google/adult/2.png b/public/images/emoji/google/adult/2.png
index 49b6323c700..7a492817636 100644
Binary files a/public/images/emoji/google/adult/2.png and b/public/images/emoji/google/adult/2.png differ
diff --git a/public/images/emoji/google/adult/3.png b/public/images/emoji/google/adult/3.png
index 74211085d4c..886b418f7c2 100644
Binary files a/public/images/emoji/google/adult/3.png and b/public/images/emoji/google/adult/3.png differ
diff --git a/public/images/emoji/google/adult/4.png b/public/images/emoji/google/adult/4.png
index 3d1fea5870e..d66179bbdc4 100644
Binary files a/public/images/emoji/google/adult/4.png and b/public/images/emoji/google/adult/4.png differ
diff --git a/public/images/emoji/google/adult/5.png b/public/images/emoji/google/adult/5.png
index 4308a403887..c7cdcf9f143 100644
Binary files a/public/images/emoji/google/adult/5.png and b/public/images/emoji/google/adult/5.png differ
diff --git a/public/images/emoji/google/adult/6.png b/public/images/emoji/google/adult/6.png
index 402c4664ec2..a4c55373f35 100644
Binary files a/public/images/emoji/google/adult/6.png and b/public/images/emoji/google/adult/6.png differ
diff --git a/public/images/emoji/google/aerial_tramway.png b/public/images/emoji/google/aerial_tramway.png
index 98f5d590e07..0e66e38b1f3 100644
Binary files a/public/images/emoji/google/aerial_tramway.png and b/public/images/emoji/google/aerial_tramway.png differ
diff --git a/public/images/emoji/google/afghanistan.png b/public/images/emoji/google/afghanistan.png
index e9738a1765d..4872b2f545f 100644
Binary files a/public/images/emoji/google/afghanistan.png and b/public/images/emoji/google/afghanistan.png differ
diff --git a/public/images/emoji/google/airplane.png b/public/images/emoji/google/airplane.png
index 98772ecd4ce..482fb4f4ae9 100644
Binary files a/public/images/emoji/google/airplane.png and b/public/images/emoji/google/airplane.png differ
diff --git a/public/images/emoji/google/airplane_arriving.png b/public/images/emoji/google/airplane_arriving.png
index e50c3233c24..baf6de740c7 100644
Binary files a/public/images/emoji/google/airplane_arriving.png and b/public/images/emoji/google/airplane_arriving.png differ
diff --git a/public/images/emoji/google/airplane_departure.png b/public/images/emoji/google/airplane_departure.png
index 0536d2b45ba..c5b13dc0883 100644
Binary files a/public/images/emoji/google/airplane_departure.png and b/public/images/emoji/google/airplane_departure.png differ
diff --git a/public/images/emoji/google/airplane_small.png b/public/images/emoji/google/airplane_small.png
index 5342466c300..1a44e4a7d11 100644
Binary files a/public/images/emoji/google/airplane_small.png and b/public/images/emoji/google/airplane_small.png differ
diff --git a/public/images/emoji/google/aland_islands.png b/public/images/emoji/google/aland_islands.png
index 3da364d6153..5a1349cf6ad 100644
Binary files a/public/images/emoji/google/aland_islands.png and b/public/images/emoji/google/aland_islands.png differ
diff --git a/public/images/emoji/google/alarm_clock.png b/public/images/emoji/google/alarm_clock.png
index c0278db2680..3ad07b27e5c 100644
Binary files a/public/images/emoji/google/alarm_clock.png and b/public/images/emoji/google/alarm_clock.png differ
diff --git a/public/images/emoji/google/albania.png b/public/images/emoji/google/albania.png
index 03ed7ebf0ae..b83555df6bc 100644
Binary files a/public/images/emoji/google/albania.png and b/public/images/emoji/google/albania.png differ
diff --git a/public/images/emoji/google/alembic.png b/public/images/emoji/google/alembic.png
index 436090af681..f6e68a91c63 100644
Binary files a/public/images/emoji/google/alembic.png and b/public/images/emoji/google/alembic.png differ
diff --git a/public/images/emoji/google/algeria.png b/public/images/emoji/google/algeria.png
index aaabbe9432b..ccbb1441875 100644
Binary files a/public/images/emoji/google/algeria.png and b/public/images/emoji/google/algeria.png differ
diff --git a/public/images/emoji/google/alien.png b/public/images/emoji/google/alien.png
index b21fb58a8e9..90150e0ef03 100644
Binary files a/public/images/emoji/google/alien.png and b/public/images/emoji/google/alien.png differ
diff --git a/public/images/emoji/google/ambulance.png b/public/images/emoji/google/ambulance.png
index af5dba3d2dc..95238d2858e 100644
Binary files a/public/images/emoji/google/ambulance.png and b/public/images/emoji/google/ambulance.png differ
diff --git a/public/images/emoji/google/american_samoa.png b/public/images/emoji/google/american_samoa.png
index 7c6a59dc3db..267bb361f17 100644
Binary files a/public/images/emoji/google/american_samoa.png and b/public/images/emoji/google/american_samoa.png differ
diff --git a/public/images/emoji/google/amphora.png b/public/images/emoji/google/amphora.png
index ad738586d46..cb69f341d8e 100644
Binary files a/public/images/emoji/google/amphora.png and b/public/images/emoji/google/amphora.png differ
diff --git a/public/images/emoji/google/anchor.png b/public/images/emoji/google/anchor.png
index 9ad6ffcef08..5ae2388b721 100644
Binary files a/public/images/emoji/google/anchor.png and b/public/images/emoji/google/anchor.png differ
diff --git a/public/images/emoji/google/andorra.png b/public/images/emoji/google/andorra.png
index ce11d436920..ffcf0a6ee52 100644
Binary files a/public/images/emoji/google/andorra.png and b/public/images/emoji/google/andorra.png differ
diff --git a/public/images/emoji/google/angel.png b/public/images/emoji/google/angel.png
index 93195336c2c..4c755b48274 100644
Binary files a/public/images/emoji/google/angel.png and b/public/images/emoji/google/angel.png differ
diff --git a/public/images/emoji/google/angel/2.png b/public/images/emoji/google/angel/2.png
index f2b3b918a5c..6721a8191c5 100644
Binary files a/public/images/emoji/google/angel/2.png and b/public/images/emoji/google/angel/2.png differ
diff --git a/public/images/emoji/google/angel/3.png b/public/images/emoji/google/angel/3.png
index d40d3c8ba69..6f349efa419 100644
Binary files a/public/images/emoji/google/angel/3.png and b/public/images/emoji/google/angel/3.png differ
diff --git a/public/images/emoji/google/angel/4.png b/public/images/emoji/google/angel/4.png
index 894cfb72e7e..07b176ab3e4 100644
Binary files a/public/images/emoji/google/angel/4.png and b/public/images/emoji/google/angel/4.png differ
diff --git a/public/images/emoji/google/angel/5.png b/public/images/emoji/google/angel/5.png
index 196efe7c9d2..363ec979924 100644
Binary files a/public/images/emoji/google/angel/5.png and b/public/images/emoji/google/angel/5.png differ
diff --git a/public/images/emoji/google/angel/6.png b/public/images/emoji/google/angel/6.png
index ba65e5bcd2c..9c2e9f1451d 100644
Binary files a/public/images/emoji/google/angel/6.png and b/public/images/emoji/google/angel/6.png differ
diff --git a/public/images/emoji/google/anger.png b/public/images/emoji/google/anger.png
index 6aa9f61415f..eb5c4886c3a 100644
Binary files a/public/images/emoji/google/anger.png and b/public/images/emoji/google/anger.png differ
diff --git a/public/images/emoji/google/anger_right.png b/public/images/emoji/google/anger_right.png
index 27b4462cbb4..9ba99a5b358 100644
Binary files a/public/images/emoji/google/anger_right.png and b/public/images/emoji/google/anger_right.png differ
diff --git a/public/images/emoji/google/angola.png b/public/images/emoji/google/angola.png
index f6a8d186edc..0a4c13a436d 100644
Binary files a/public/images/emoji/google/angola.png and b/public/images/emoji/google/angola.png differ
diff --git a/public/images/emoji/google/angry.png b/public/images/emoji/google/angry.png
index 6649257e2a9..c0e39aa290f 100644
Binary files a/public/images/emoji/google/angry.png and b/public/images/emoji/google/angry.png differ
diff --git a/public/images/emoji/google/anguilla.png b/public/images/emoji/google/anguilla.png
index 20311cb75cb..6ba27e284c5 100644
Binary files a/public/images/emoji/google/anguilla.png and b/public/images/emoji/google/anguilla.png differ
diff --git a/public/images/emoji/google/anguished.png b/public/images/emoji/google/anguished.png
index 5b943bac34d..e2059f1bf09 100644
Binary files a/public/images/emoji/google/anguished.png and b/public/images/emoji/google/anguished.png differ
diff --git a/public/images/emoji/google/ant.png b/public/images/emoji/google/ant.png
index c0399ae6e5b..8c66dbf0c77 100644
Binary files a/public/images/emoji/google/ant.png and b/public/images/emoji/google/ant.png differ
diff --git a/public/images/emoji/google/antarctica.png b/public/images/emoji/google/antarctica.png
index f4eee7ffa90..4aeb8e774ce 100644
Binary files a/public/images/emoji/google/antarctica.png and b/public/images/emoji/google/antarctica.png differ
diff --git a/public/images/emoji/google/antigua_barbuda.png b/public/images/emoji/google/antigua_barbuda.png
index d9ac68ec8c5..8be446d903c 100644
Binary files a/public/images/emoji/google/antigua_barbuda.png and b/public/images/emoji/google/antigua_barbuda.png differ
diff --git a/public/images/emoji/google/apple.png b/public/images/emoji/google/apple.png
index a3df2037159..452dc362147 100644
Binary files a/public/images/emoji/google/apple.png and b/public/images/emoji/google/apple.png differ
diff --git a/public/images/emoji/google/aquarius.png b/public/images/emoji/google/aquarius.png
index 52d8d5000be..322e51a6947 100644
Binary files a/public/images/emoji/google/aquarius.png and b/public/images/emoji/google/aquarius.png differ
diff --git a/public/images/emoji/google/archery.png b/public/images/emoji/google/archery.png
index 6539d3b37e8..130e029ea5b 100644
Binary files a/public/images/emoji/google/archery.png and b/public/images/emoji/google/archery.png differ
diff --git a/public/images/emoji/google/argentina.png b/public/images/emoji/google/argentina.png
index 5f44faeddde..6bdb15abe20 100644
Binary files a/public/images/emoji/google/argentina.png and b/public/images/emoji/google/argentina.png differ
diff --git a/public/images/emoji/google/aries.png b/public/images/emoji/google/aries.png
index ab7fc9b03c0..7d59f6ec860 100644
Binary files a/public/images/emoji/google/aries.png and b/public/images/emoji/google/aries.png differ
diff --git a/public/images/emoji/google/armenia.png b/public/images/emoji/google/armenia.png
index 4af6686cb60..1a585dd67f6 100644
Binary files a/public/images/emoji/google/armenia.png and b/public/images/emoji/google/armenia.png differ
diff --git a/public/images/emoji/google/arrow_backward.png b/public/images/emoji/google/arrow_backward.png
index 2bec2d7c448..81b77f24445 100644
Binary files a/public/images/emoji/google/arrow_backward.png and b/public/images/emoji/google/arrow_backward.png differ
diff --git a/public/images/emoji/google/arrow_double_down.png b/public/images/emoji/google/arrow_double_down.png
index efbad59f092..b0bd62ec65f 100644
Binary files a/public/images/emoji/google/arrow_double_down.png and b/public/images/emoji/google/arrow_double_down.png differ
diff --git a/public/images/emoji/google/arrow_double_up.png b/public/images/emoji/google/arrow_double_up.png
index 76f5e0ae149..1c5aea8cc33 100644
Binary files a/public/images/emoji/google/arrow_double_up.png and b/public/images/emoji/google/arrow_double_up.png differ
diff --git a/public/images/emoji/google/arrow_down.png b/public/images/emoji/google/arrow_down.png
index 0b9865184ca..3adc1455526 100644
Binary files a/public/images/emoji/google/arrow_down.png and b/public/images/emoji/google/arrow_down.png differ
diff --git a/public/images/emoji/google/arrow_down_small.png b/public/images/emoji/google/arrow_down_small.png
index 48297676a93..0a0d134044d 100644
Binary files a/public/images/emoji/google/arrow_down_small.png and b/public/images/emoji/google/arrow_down_small.png differ
diff --git a/public/images/emoji/google/arrow_forward.png b/public/images/emoji/google/arrow_forward.png
index 3a6466fca7a..a2521f3646e 100644
Binary files a/public/images/emoji/google/arrow_forward.png and b/public/images/emoji/google/arrow_forward.png differ
diff --git a/public/images/emoji/google/arrow_heading_down.png b/public/images/emoji/google/arrow_heading_down.png
index c8597ae17b1..00503be9fab 100644
Binary files a/public/images/emoji/google/arrow_heading_down.png and b/public/images/emoji/google/arrow_heading_down.png differ
diff --git a/public/images/emoji/google/arrow_heading_up.png b/public/images/emoji/google/arrow_heading_up.png
index fe00d096491..b9c2461d3b2 100644
Binary files a/public/images/emoji/google/arrow_heading_up.png and b/public/images/emoji/google/arrow_heading_up.png differ
diff --git a/public/images/emoji/google/arrow_left.png b/public/images/emoji/google/arrow_left.png
index bff1717f9b7..535043666be 100644
Binary files a/public/images/emoji/google/arrow_left.png and b/public/images/emoji/google/arrow_left.png differ
diff --git a/public/images/emoji/google/arrow_lower_left.png b/public/images/emoji/google/arrow_lower_left.png
index 517892c9130..92e1a5c5a90 100644
Binary files a/public/images/emoji/google/arrow_lower_left.png and b/public/images/emoji/google/arrow_lower_left.png differ
diff --git a/public/images/emoji/google/arrow_lower_right.png b/public/images/emoji/google/arrow_lower_right.png
index a2ff7573d7d..0c704dec18d 100644
Binary files a/public/images/emoji/google/arrow_lower_right.png and b/public/images/emoji/google/arrow_lower_right.png differ
diff --git a/public/images/emoji/google/arrow_right.png b/public/images/emoji/google/arrow_right.png
index b61cb914e58..1188727ffac 100644
Binary files a/public/images/emoji/google/arrow_right.png and b/public/images/emoji/google/arrow_right.png differ
diff --git a/public/images/emoji/google/arrow_right_hook.png b/public/images/emoji/google/arrow_right_hook.png
index 1024ba2c28f..508a10100a2 100644
Binary files a/public/images/emoji/google/arrow_right_hook.png and b/public/images/emoji/google/arrow_right_hook.png differ
diff --git a/public/images/emoji/google/arrow_up.png b/public/images/emoji/google/arrow_up.png
index 012d625c6aa..a2b5a49c8f6 100644
Binary files a/public/images/emoji/google/arrow_up.png and b/public/images/emoji/google/arrow_up.png differ
diff --git a/public/images/emoji/google/arrow_up_down.png b/public/images/emoji/google/arrow_up_down.png
index 063fa8766c3..a9a7dd73961 100644
Binary files a/public/images/emoji/google/arrow_up_down.png and b/public/images/emoji/google/arrow_up_down.png differ
diff --git a/public/images/emoji/google/arrow_up_small.png b/public/images/emoji/google/arrow_up_small.png
index 6f44a810205..4ed38f7095c 100644
Binary files a/public/images/emoji/google/arrow_up_small.png and b/public/images/emoji/google/arrow_up_small.png differ
diff --git a/public/images/emoji/google/arrow_upper_left.png b/public/images/emoji/google/arrow_upper_left.png
index 8187a46b08a..0c6e3a65d8c 100644
Binary files a/public/images/emoji/google/arrow_upper_left.png and b/public/images/emoji/google/arrow_upper_left.png differ
diff --git a/public/images/emoji/google/arrow_upper_right.png b/public/images/emoji/google/arrow_upper_right.png
index c59c2f3585f..a1df4c37f65 100644
Binary files a/public/images/emoji/google/arrow_upper_right.png and b/public/images/emoji/google/arrow_upper_right.png differ
diff --git a/public/images/emoji/google/arrows_clockwise.png b/public/images/emoji/google/arrows_clockwise.png
index 63cb99ff897..0806b60608a 100644
Binary files a/public/images/emoji/google/arrows_clockwise.png and b/public/images/emoji/google/arrows_clockwise.png differ
diff --git a/public/images/emoji/google/arrows_counterclockwise.png b/public/images/emoji/google/arrows_counterclockwise.png
index 9811cdcec52..3362a4b424d 100644
Binary files a/public/images/emoji/google/arrows_counterclockwise.png and b/public/images/emoji/google/arrows_counterclockwise.png differ
diff --git a/public/images/emoji/google/art.png b/public/images/emoji/google/art.png
index 9bb7a1d9f9a..38b3aa804d5 100644
Binary files a/public/images/emoji/google/art.png and b/public/images/emoji/google/art.png differ
diff --git a/public/images/emoji/google/articulated_lorry.png b/public/images/emoji/google/articulated_lorry.png
index 35b3d9b9917..8680f6b472b 100644
Binary files a/public/images/emoji/google/articulated_lorry.png and b/public/images/emoji/google/articulated_lorry.png differ
diff --git a/public/images/emoji/google/artificial_satellite.png b/public/images/emoji/google/artificial_satellite.png
index 6b94efd773e..8f60cf4fc4b 100644
Binary files a/public/images/emoji/google/artificial_satellite.png and b/public/images/emoji/google/artificial_satellite.png differ
diff --git a/public/images/emoji/google/aruba.png b/public/images/emoji/google/aruba.png
index 74245636f22..2f6f6ab2524 100644
Binary files a/public/images/emoji/google/aruba.png and b/public/images/emoji/google/aruba.png differ
diff --git a/public/images/emoji/google/ascension_island.png b/public/images/emoji/google/ascension_island.png
index 708a3c64aa9..d314bbbc78b 100644
Binary files a/public/images/emoji/google/ascension_island.png and b/public/images/emoji/google/ascension_island.png differ
diff --git a/public/images/emoji/google/asterisk.png b/public/images/emoji/google/asterisk.png
index 9c0101c7d7e..ff8fbb50918 100644
Binary files a/public/images/emoji/google/asterisk.png and b/public/images/emoji/google/asterisk.png differ
diff --git a/public/images/emoji/google/astonished.png b/public/images/emoji/google/astonished.png
index 3016c48f586..ffa8c01680e 100644
Binary files a/public/images/emoji/google/astonished.png and b/public/images/emoji/google/astonished.png differ
diff --git a/public/images/emoji/google/athletic_shoe.png b/public/images/emoji/google/athletic_shoe.png
index 9c169666aa8..e3da2abcc59 100644
Binary files a/public/images/emoji/google/athletic_shoe.png and b/public/images/emoji/google/athletic_shoe.png differ
diff --git a/public/images/emoji/google/atm.png b/public/images/emoji/google/atm.png
index 1479b91ddba..475ac6578a5 100644
Binary files a/public/images/emoji/google/atm.png and b/public/images/emoji/google/atm.png differ
diff --git a/public/images/emoji/google/atom.png b/public/images/emoji/google/atom.png
index 1bb290c8514..9a6fb28ddf8 100644
Binary files a/public/images/emoji/google/atom.png and b/public/images/emoji/google/atom.png differ
diff --git a/public/images/emoji/google/atom_symbol.png b/public/images/emoji/google/atom_symbol.png
index 1bb290c8514..9a6fb28ddf8 100644
Binary files a/public/images/emoji/google/atom_symbol.png and b/public/images/emoji/google/atom_symbol.png differ
diff --git a/public/images/emoji/google/australia.png b/public/images/emoji/google/australia.png
index 7ef6056c335..fe795f0891f 100644
Binary files a/public/images/emoji/google/australia.png and b/public/images/emoji/google/australia.png differ
diff --git a/public/images/emoji/google/austria.png b/public/images/emoji/google/austria.png
index 84a21b7c852..c7854b7e0b8 100644
Binary files a/public/images/emoji/google/austria.png and b/public/images/emoji/google/austria.png differ
diff --git a/public/images/emoji/google/automobile.png b/public/images/emoji/google/automobile.png
index 56f5cddc276..7df8de6eb86 100644
Binary files a/public/images/emoji/google/automobile.png and b/public/images/emoji/google/automobile.png differ
diff --git a/public/images/emoji/google/avocado.png b/public/images/emoji/google/avocado.png
index 7f3e78d55f6..b72b7d07983 100644
Binary files a/public/images/emoji/google/avocado.png and b/public/images/emoji/google/avocado.png differ
diff --git a/public/images/emoji/google/azerbaijan.png b/public/images/emoji/google/azerbaijan.png
index 2ca8b332402..11022dcdf76 100644
Binary files a/public/images/emoji/google/azerbaijan.png and b/public/images/emoji/google/azerbaijan.png differ
diff --git a/public/images/emoji/google/b.png b/public/images/emoji/google/b.png
index 0c37cfbcc92..b095d78ac3f 100644
Binary files a/public/images/emoji/google/b.png and b/public/images/emoji/google/b.png differ
diff --git a/public/images/emoji/google/baby.png b/public/images/emoji/google/baby.png
index 7bb8284202e..b4a87685e0a 100644
Binary files a/public/images/emoji/google/baby.png and b/public/images/emoji/google/baby.png differ
diff --git a/public/images/emoji/google/baby/2.png b/public/images/emoji/google/baby/2.png
index 1b453f752ef..5ad7bfd76f0 100644
Binary files a/public/images/emoji/google/baby/2.png and b/public/images/emoji/google/baby/2.png differ
diff --git a/public/images/emoji/google/baby/3.png b/public/images/emoji/google/baby/3.png
index e8bef481c91..5c828b27a78 100644
Binary files a/public/images/emoji/google/baby/3.png and b/public/images/emoji/google/baby/3.png differ
diff --git a/public/images/emoji/google/baby/4.png b/public/images/emoji/google/baby/4.png
index 3b6af055b6a..c36b0e68603 100644
Binary files a/public/images/emoji/google/baby/4.png and b/public/images/emoji/google/baby/4.png differ
diff --git a/public/images/emoji/google/baby/5.png b/public/images/emoji/google/baby/5.png
index 7a6ffedb961..1305a0f27ca 100644
Binary files a/public/images/emoji/google/baby/5.png and b/public/images/emoji/google/baby/5.png differ
diff --git a/public/images/emoji/google/baby/6.png b/public/images/emoji/google/baby/6.png
index 8c0d6788e4f..fb94e05fb5e 100644
Binary files a/public/images/emoji/google/baby/6.png and b/public/images/emoji/google/baby/6.png differ
diff --git a/public/images/emoji/google/baby_bottle.png b/public/images/emoji/google/baby_bottle.png
index 1db2ef3b010..927df75cff7 100644
Binary files a/public/images/emoji/google/baby_bottle.png and b/public/images/emoji/google/baby_bottle.png differ
diff --git a/public/images/emoji/google/baby_chick.png b/public/images/emoji/google/baby_chick.png
index 109f05c0d43..06c417f3fb7 100644
Binary files a/public/images/emoji/google/baby_chick.png and b/public/images/emoji/google/baby_chick.png differ
diff --git a/public/images/emoji/google/baby_symbol.png b/public/images/emoji/google/baby_symbol.png
index 8c3fcd2dccb..fa6939a61bf 100644
Binary files a/public/images/emoji/google/baby_symbol.png and b/public/images/emoji/google/baby_symbol.png differ
diff --git a/public/images/emoji/google/back.png b/public/images/emoji/google/back.png
index 457e8dc3aca..0bd77817ce2 100644
Binary files a/public/images/emoji/google/back.png and b/public/images/emoji/google/back.png differ
diff --git a/public/images/emoji/google/bacon.png b/public/images/emoji/google/bacon.png
index 96187058dd9..f5c163e0fa0 100644
Binary files a/public/images/emoji/google/bacon.png and b/public/images/emoji/google/bacon.png differ
diff --git a/public/images/emoji/google/badminton.png b/public/images/emoji/google/badminton.png
index 23d81a01c26..882a71ee34a 100644
Binary files a/public/images/emoji/google/badminton.png and b/public/images/emoji/google/badminton.png differ
diff --git a/public/images/emoji/google/baggage_claim.png b/public/images/emoji/google/baggage_claim.png
index b64147d6a63..156124dc9b4 100644
Binary files a/public/images/emoji/google/baggage_claim.png and b/public/images/emoji/google/baggage_claim.png differ
diff --git a/public/images/emoji/google/baguette_bread.png b/public/images/emoji/google/baguette_bread.png
index b05d2fd9720..6ebe4711d3e 100644
Binary files a/public/images/emoji/google/baguette_bread.png and b/public/images/emoji/google/baguette_bread.png differ
diff --git a/public/images/emoji/google/bahamas.png b/public/images/emoji/google/bahamas.png
index eb3e9140a63..2bc67c15e63 100644
Binary files a/public/images/emoji/google/bahamas.png and b/public/images/emoji/google/bahamas.png differ
diff --git a/public/images/emoji/google/bahrain.png b/public/images/emoji/google/bahrain.png
index defa6c0297f..cd454e4fbd1 100644
Binary files a/public/images/emoji/google/bahrain.png and b/public/images/emoji/google/bahrain.png differ
diff --git a/public/images/emoji/google/balance_scale.png b/public/images/emoji/google/balance_scale.png
index b13e29f36c2..179fce72575 100644
Binary files a/public/images/emoji/google/balance_scale.png and b/public/images/emoji/google/balance_scale.png differ
diff --git a/public/images/emoji/google/balloon.png b/public/images/emoji/google/balloon.png
index e1d5408014f..9d3b69e1c1c 100644
Binary files a/public/images/emoji/google/balloon.png and b/public/images/emoji/google/balloon.png differ
diff --git a/public/images/emoji/google/ballot_box.png b/public/images/emoji/google/ballot_box.png
index 874b7e277f0..4b730a859a5 100644
Binary files a/public/images/emoji/google/ballot_box.png and b/public/images/emoji/google/ballot_box.png differ
diff --git a/public/images/emoji/google/ballot_box_with_ballot.png b/public/images/emoji/google/ballot_box_with_ballot.png
index 874b7e277f0..4b730a859a5 100644
Binary files a/public/images/emoji/google/ballot_box_with_ballot.png and b/public/images/emoji/google/ballot_box_with_ballot.png differ
diff --git a/public/images/emoji/google/ballot_box_with_check.png b/public/images/emoji/google/ballot_box_with_check.png
index f18496deaf4..39d739cd097 100644
Binary files a/public/images/emoji/google/ballot_box_with_check.png and b/public/images/emoji/google/ballot_box_with_check.png differ
diff --git a/public/images/emoji/google/bamboo.png b/public/images/emoji/google/bamboo.png
index e9dc72c9f80..4d788829146 100644
Binary files a/public/images/emoji/google/bamboo.png and b/public/images/emoji/google/bamboo.png differ
diff --git a/public/images/emoji/google/banana.png b/public/images/emoji/google/banana.png
index f01da669425..300ab267ca4 100644
Binary files a/public/images/emoji/google/banana.png and b/public/images/emoji/google/banana.png differ
diff --git a/public/images/emoji/google/bangbang.png b/public/images/emoji/google/bangbang.png
index 5160aad2a08..ea825f75f0d 100644
Binary files a/public/images/emoji/google/bangbang.png and b/public/images/emoji/google/bangbang.png differ
diff --git a/public/images/emoji/google/bangladesh.png b/public/images/emoji/google/bangladesh.png
index 523e5928265..78dc4059588 100644
Binary files a/public/images/emoji/google/bangladesh.png and b/public/images/emoji/google/bangladesh.png differ
diff --git a/public/images/emoji/google/bank.png b/public/images/emoji/google/bank.png
index 4011d56208b..89b62c90e83 100644
Binary files a/public/images/emoji/google/bank.png and b/public/images/emoji/google/bank.png differ
diff --git a/public/images/emoji/google/bar_chart.png b/public/images/emoji/google/bar_chart.png
index f32d1a3aa87..4428742d91d 100644
Binary files a/public/images/emoji/google/bar_chart.png and b/public/images/emoji/google/bar_chart.png differ
diff --git a/public/images/emoji/google/barbados.png b/public/images/emoji/google/barbados.png
index de435239cb7..523c99a550d 100644
Binary files a/public/images/emoji/google/barbados.png and b/public/images/emoji/google/barbados.png differ
diff --git a/public/images/emoji/google/barber.png b/public/images/emoji/google/barber.png
index ba56bc5c97c..cd0b1e0c91d 100644
Binary files a/public/images/emoji/google/barber.png and b/public/images/emoji/google/barber.png differ
diff --git a/public/images/emoji/google/baseball.png b/public/images/emoji/google/baseball.png
index 97a73f6f8ed..1c302367d9c 100644
Binary files a/public/images/emoji/google/baseball.png and b/public/images/emoji/google/baseball.png differ
diff --git a/public/images/emoji/google/basketball.png b/public/images/emoji/google/basketball.png
index c7362826e64..12ac7e4720f 100644
Binary files a/public/images/emoji/google/basketball.png and b/public/images/emoji/google/basketball.png differ
diff --git a/public/images/emoji/google/basketball_man.png b/public/images/emoji/google/basketball_man.png
index 2f234c1261c..4441fc46c5a 100644
Binary files a/public/images/emoji/google/basketball_man.png and b/public/images/emoji/google/basketball_man.png differ
diff --git a/public/images/emoji/google/basketball_man/2.png b/public/images/emoji/google/basketball_man/2.png
index 511ad7125cd..d8c44421c81 100644
Binary files a/public/images/emoji/google/basketball_man/2.png and b/public/images/emoji/google/basketball_man/2.png differ
diff --git a/public/images/emoji/google/basketball_man/3.png b/public/images/emoji/google/basketball_man/3.png
index 652a2149b8f..fbd4d90e0d1 100644
Binary files a/public/images/emoji/google/basketball_man/3.png and b/public/images/emoji/google/basketball_man/3.png differ
diff --git a/public/images/emoji/google/basketball_man/4.png b/public/images/emoji/google/basketball_man/4.png
index 3ea11741d3e..2c84919a157 100644
Binary files a/public/images/emoji/google/basketball_man/4.png and b/public/images/emoji/google/basketball_man/4.png differ
diff --git a/public/images/emoji/google/basketball_man/5.png b/public/images/emoji/google/basketball_man/5.png
index 28b8f863258..2e9df18f9ff 100644
Binary files a/public/images/emoji/google/basketball_man/5.png and b/public/images/emoji/google/basketball_man/5.png differ
diff --git a/public/images/emoji/google/basketball_man/6.png b/public/images/emoji/google/basketball_man/6.png
index 5450f40d54e..77fb03716f2 100644
Binary files a/public/images/emoji/google/basketball_man/6.png and b/public/images/emoji/google/basketball_man/6.png differ
diff --git a/public/images/emoji/google/basketball_player.png b/public/images/emoji/google/basketball_player.png
index 2f234c1261c..4441fc46c5a 100644
Binary files a/public/images/emoji/google/basketball_player.png and b/public/images/emoji/google/basketball_player.png differ
diff --git a/public/images/emoji/google/basketball_player/2.png b/public/images/emoji/google/basketball_player/2.png
index 511ad7125cd..d8c44421c81 100644
Binary files a/public/images/emoji/google/basketball_player/2.png and b/public/images/emoji/google/basketball_player/2.png differ
diff --git a/public/images/emoji/google/basketball_player/3.png b/public/images/emoji/google/basketball_player/3.png
index 652a2149b8f..fbd4d90e0d1 100644
Binary files a/public/images/emoji/google/basketball_player/3.png and b/public/images/emoji/google/basketball_player/3.png differ
diff --git a/public/images/emoji/google/basketball_player/4.png b/public/images/emoji/google/basketball_player/4.png
index 3ea11741d3e..2c84919a157 100644
Binary files a/public/images/emoji/google/basketball_player/4.png and b/public/images/emoji/google/basketball_player/4.png differ
diff --git a/public/images/emoji/google/basketball_player/5.png b/public/images/emoji/google/basketball_player/5.png
index 28b8f863258..2e9df18f9ff 100644
Binary files a/public/images/emoji/google/basketball_player/5.png and b/public/images/emoji/google/basketball_player/5.png differ
diff --git a/public/images/emoji/google/basketball_player/6.png b/public/images/emoji/google/basketball_player/6.png
index 5450f40d54e..77fb03716f2 100644
Binary files a/public/images/emoji/google/basketball_player/6.png and b/public/images/emoji/google/basketball_player/6.png differ
diff --git a/public/images/emoji/google/basketball_woman.png b/public/images/emoji/google/basketball_woman.png
index 1ebaa145024..1c90300615e 100644
Binary files a/public/images/emoji/google/basketball_woman.png and b/public/images/emoji/google/basketball_woman.png differ
diff --git a/public/images/emoji/google/bat.png b/public/images/emoji/google/bat.png
index 7bcc07be3a6..99551fb570d 100644
Binary files a/public/images/emoji/google/bat.png and b/public/images/emoji/google/bat.png differ
diff --git a/public/images/emoji/google/bath.png b/public/images/emoji/google/bath.png
index 7446865226a..bb1ec3f5c02 100644
Binary files a/public/images/emoji/google/bath.png and b/public/images/emoji/google/bath.png differ
diff --git a/public/images/emoji/google/bath/2.png b/public/images/emoji/google/bath/2.png
index 6fe566d964b..8ef30d762ae 100644
Binary files a/public/images/emoji/google/bath/2.png and b/public/images/emoji/google/bath/2.png differ
diff --git a/public/images/emoji/google/bath/3.png b/public/images/emoji/google/bath/3.png
index 918c109395a..ad7963b9b64 100644
Binary files a/public/images/emoji/google/bath/3.png and b/public/images/emoji/google/bath/3.png differ
diff --git a/public/images/emoji/google/bath/4.png b/public/images/emoji/google/bath/4.png
index aa4fe481daa..a4b5e2f6cf1 100644
Binary files a/public/images/emoji/google/bath/4.png and b/public/images/emoji/google/bath/4.png differ
diff --git a/public/images/emoji/google/bath/5.png b/public/images/emoji/google/bath/5.png
index be0bcdbc28f..dc4657b0d05 100644
Binary files a/public/images/emoji/google/bath/5.png and b/public/images/emoji/google/bath/5.png differ
diff --git a/public/images/emoji/google/bath/6.png b/public/images/emoji/google/bath/6.png
index 476327e201a..4c66c159df1 100644
Binary files a/public/images/emoji/google/bath/6.png and b/public/images/emoji/google/bath/6.png differ
diff --git a/public/images/emoji/google/bathtub.png b/public/images/emoji/google/bathtub.png
index 99c7d1ba918..f77fa95bf6c 100644
Binary files a/public/images/emoji/google/bathtub.png and b/public/images/emoji/google/bathtub.png differ
diff --git a/public/images/emoji/google/battery.png b/public/images/emoji/google/battery.png
index f8f68e028dc..0e64ef1e5cd 100644
Binary files a/public/images/emoji/google/battery.png and b/public/images/emoji/google/battery.png differ
diff --git a/public/images/emoji/google/beach.png b/public/images/emoji/google/beach.png
index ac106a0f036..859c09dff48 100644
Binary files a/public/images/emoji/google/beach.png and b/public/images/emoji/google/beach.png differ
diff --git a/public/images/emoji/google/beach_umbrella.png b/public/images/emoji/google/beach_umbrella.png
index ac106a0f036..859c09dff48 100644
Binary files a/public/images/emoji/google/beach_umbrella.png and b/public/images/emoji/google/beach_umbrella.png differ
diff --git a/public/images/emoji/google/beach_with_umbrella.png b/public/images/emoji/google/beach_with_umbrella.png
index ac106a0f036..859c09dff48 100644
Binary files a/public/images/emoji/google/beach_with_umbrella.png and b/public/images/emoji/google/beach_with_umbrella.png differ
diff --git a/public/images/emoji/google/bear.png b/public/images/emoji/google/bear.png
index 6d486b65605..aeaf931f71a 100644
Binary files a/public/images/emoji/google/bear.png and b/public/images/emoji/google/bear.png differ
diff --git a/public/images/emoji/google/bearded_person.png b/public/images/emoji/google/bearded_person.png
index 1cbeab61ab8..8f22a466165 100644
Binary files a/public/images/emoji/google/bearded_person.png and b/public/images/emoji/google/bearded_person.png differ
diff --git a/public/images/emoji/google/bearded_person/2.png b/public/images/emoji/google/bearded_person/2.png
index 4bebe194407..1bbb888fb62 100644
Binary files a/public/images/emoji/google/bearded_person/2.png and b/public/images/emoji/google/bearded_person/2.png differ
diff --git a/public/images/emoji/google/bearded_person/3.png b/public/images/emoji/google/bearded_person/3.png
index 1468f3cfaeb..786779b45cb 100644
Binary files a/public/images/emoji/google/bearded_person/3.png and b/public/images/emoji/google/bearded_person/3.png differ
diff --git a/public/images/emoji/google/bearded_person/4.png b/public/images/emoji/google/bearded_person/4.png
index bb0753cf8e8..94184c46ca2 100644
Binary files a/public/images/emoji/google/bearded_person/4.png and b/public/images/emoji/google/bearded_person/4.png differ
diff --git a/public/images/emoji/google/bearded_person/5.png b/public/images/emoji/google/bearded_person/5.png
index 9178fbef0a7..7b1ddea84dc 100644
Binary files a/public/images/emoji/google/bearded_person/5.png and b/public/images/emoji/google/bearded_person/5.png differ
diff --git a/public/images/emoji/google/bearded_person/6.png b/public/images/emoji/google/bearded_person/6.png
index ecbca1e8453..4b93f63cdab 100644
Binary files a/public/images/emoji/google/bearded_person/6.png and b/public/images/emoji/google/bearded_person/6.png differ
diff --git a/public/images/emoji/google/bed.png b/public/images/emoji/google/bed.png
index 0044d37c514..54f63be23f5 100644
Binary files a/public/images/emoji/google/bed.png and b/public/images/emoji/google/bed.png differ
diff --git a/public/images/emoji/google/bee.png b/public/images/emoji/google/bee.png
index 4bcf0f5a5ce..4f0f41d104a 100644
Binary files a/public/images/emoji/google/bee.png and b/public/images/emoji/google/bee.png differ
diff --git a/public/images/emoji/google/beer.png b/public/images/emoji/google/beer.png
index 8f28caa27d7..48aaa236e35 100644
Binary files a/public/images/emoji/google/beer.png and b/public/images/emoji/google/beer.png differ
diff --git a/public/images/emoji/google/beers.png b/public/images/emoji/google/beers.png
index b92d90adc69..4e8a97b982e 100644
Binary files a/public/images/emoji/google/beers.png and b/public/images/emoji/google/beers.png differ
diff --git a/public/images/emoji/google/beetle.png b/public/images/emoji/google/beetle.png
index 62d39a1f559..ea8c81a3f1e 100644
Binary files a/public/images/emoji/google/beetle.png and b/public/images/emoji/google/beetle.png differ
diff --git a/public/images/emoji/google/beginner.png b/public/images/emoji/google/beginner.png
index 30582c207b4..5bb5dd09e8c 100644
Binary files a/public/images/emoji/google/beginner.png and b/public/images/emoji/google/beginner.png differ
diff --git a/public/images/emoji/google/belarus.png b/public/images/emoji/google/belarus.png
index b177eb3d5c3..4a38227469c 100644
Binary files a/public/images/emoji/google/belarus.png and b/public/images/emoji/google/belarus.png differ
diff --git a/public/images/emoji/google/belgium.png b/public/images/emoji/google/belgium.png
index 23dec0aa5a7..cf4a8b353ba 100644
Binary files a/public/images/emoji/google/belgium.png and b/public/images/emoji/google/belgium.png differ
diff --git a/public/images/emoji/google/belize.png b/public/images/emoji/google/belize.png
index 40c0e4247e9..b101bfc474f 100644
Binary files a/public/images/emoji/google/belize.png and b/public/images/emoji/google/belize.png differ
diff --git a/public/images/emoji/google/bell.png b/public/images/emoji/google/bell.png
index 54f61d27d7d..33b7e0231b8 100644
Binary files a/public/images/emoji/google/bell.png and b/public/images/emoji/google/bell.png differ
diff --git a/public/images/emoji/google/bellhop.png b/public/images/emoji/google/bellhop.png
index fa5165b0f2f..6c5233fc306 100644
Binary files a/public/images/emoji/google/bellhop.png and b/public/images/emoji/google/bellhop.png differ
diff --git a/public/images/emoji/google/bellhop_bell.png b/public/images/emoji/google/bellhop_bell.png
index fa5165b0f2f..6c5233fc306 100644
Binary files a/public/images/emoji/google/bellhop_bell.png and b/public/images/emoji/google/bellhop_bell.png differ
diff --git a/public/images/emoji/google/benin.png b/public/images/emoji/google/benin.png
index c05de3702a4..ea2a4d89817 100644
Binary files a/public/images/emoji/google/benin.png and b/public/images/emoji/google/benin.png differ
diff --git a/public/images/emoji/google/bento.png b/public/images/emoji/google/bento.png
index 412d219fa43..e172064a1b3 100644
Binary files a/public/images/emoji/google/bento.png and b/public/images/emoji/google/bento.png differ
diff --git a/public/images/emoji/google/bermuda.png b/public/images/emoji/google/bermuda.png
index 8eb79e2f0dc..c3f27a2def6 100644
Binary files a/public/images/emoji/google/bermuda.png and b/public/images/emoji/google/bermuda.png differ
diff --git a/public/images/emoji/google/bhutan.png b/public/images/emoji/google/bhutan.png
index 7812ea3b2a1..4d12abfba10 100644
Binary files a/public/images/emoji/google/bhutan.png and b/public/images/emoji/google/bhutan.png differ
diff --git a/public/images/emoji/google/bicyclist.png b/public/images/emoji/google/bicyclist.png
index 90af3135045..5423030f495 100644
Binary files a/public/images/emoji/google/bicyclist.png and b/public/images/emoji/google/bicyclist.png differ
diff --git a/public/images/emoji/google/bicyclist/2.png b/public/images/emoji/google/bicyclist/2.png
index 9c7240de480..0768cee6f75 100644
Binary files a/public/images/emoji/google/bicyclist/2.png and b/public/images/emoji/google/bicyclist/2.png differ
diff --git a/public/images/emoji/google/bicyclist/3.png b/public/images/emoji/google/bicyclist/3.png
index 4c9ec6b5cf0..bd8b54401d8 100644
Binary files a/public/images/emoji/google/bicyclist/3.png and b/public/images/emoji/google/bicyclist/3.png differ
diff --git a/public/images/emoji/google/bicyclist/4.png b/public/images/emoji/google/bicyclist/4.png
index c24ba48c30e..5efa9dadcc2 100644
Binary files a/public/images/emoji/google/bicyclist/4.png and b/public/images/emoji/google/bicyclist/4.png differ
diff --git a/public/images/emoji/google/bicyclist/5.png b/public/images/emoji/google/bicyclist/5.png
index 20784cbbb5e..be123afd7ac 100644
Binary files a/public/images/emoji/google/bicyclist/5.png and b/public/images/emoji/google/bicyclist/5.png differ
diff --git a/public/images/emoji/google/bicyclist/6.png b/public/images/emoji/google/bicyclist/6.png
index 30dfc6a26d2..4bb5f74af1e 100644
Binary files a/public/images/emoji/google/bicyclist/6.png and b/public/images/emoji/google/bicyclist/6.png differ
diff --git a/public/images/emoji/google/bike.png b/public/images/emoji/google/bike.png
index aae5fc30661..05106eee6c9 100644
Binary files a/public/images/emoji/google/bike.png and b/public/images/emoji/google/bike.png differ
diff --git a/public/images/emoji/google/biking_man.png b/public/images/emoji/google/biking_man.png
index 90af3135045..5423030f495 100644
Binary files a/public/images/emoji/google/biking_man.png and b/public/images/emoji/google/biking_man.png differ
diff --git a/public/images/emoji/google/biking_man/2.png b/public/images/emoji/google/biking_man/2.png
index 9c7240de480..0768cee6f75 100644
Binary files a/public/images/emoji/google/biking_man/2.png and b/public/images/emoji/google/biking_man/2.png differ
diff --git a/public/images/emoji/google/biking_man/3.png b/public/images/emoji/google/biking_man/3.png
index 4c9ec6b5cf0..bd8b54401d8 100644
Binary files a/public/images/emoji/google/biking_man/3.png and b/public/images/emoji/google/biking_man/3.png differ
diff --git a/public/images/emoji/google/biking_man/4.png b/public/images/emoji/google/biking_man/4.png
index c24ba48c30e..5efa9dadcc2 100644
Binary files a/public/images/emoji/google/biking_man/4.png and b/public/images/emoji/google/biking_man/4.png differ
diff --git a/public/images/emoji/google/biking_man/5.png b/public/images/emoji/google/biking_man/5.png
index 20784cbbb5e..be123afd7ac 100644
Binary files a/public/images/emoji/google/biking_man/5.png and b/public/images/emoji/google/biking_man/5.png differ
diff --git a/public/images/emoji/google/biking_man/6.png b/public/images/emoji/google/biking_man/6.png
index 30dfc6a26d2..4bb5f74af1e 100644
Binary files a/public/images/emoji/google/biking_man/6.png and b/public/images/emoji/google/biking_man/6.png differ
diff --git a/public/images/emoji/google/biking_woman.png b/public/images/emoji/google/biking_woman.png
index d6a192f9b81..bb318aab4c7 100644
Binary files a/public/images/emoji/google/biking_woman.png and b/public/images/emoji/google/biking_woman.png differ
diff --git a/public/images/emoji/google/biking_woman/2.png b/public/images/emoji/google/biking_woman/2.png
index e7eb57701dc..bb0bf1e73a0 100644
Binary files a/public/images/emoji/google/biking_woman/2.png and b/public/images/emoji/google/biking_woman/2.png differ
diff --git a/public/images/emoji/google/biking_woman/3.png b/public/images/emoji/google/biking_woman/3.png
index 6d80a1fe33d..730624fe954 100644
Binary files a/public/images/emoji/google/biking_woman/3.png and b/public/images/emoji/google/biking_woman/3.png differ
diff --git a/public/images/emoji/google/biking_woman/4.png b/public/images/emoji/google/biking_woman/4.png
index d7613910d91..9fd19b7b4b8 100644
Binary files a/public/images/emoji/google/biking_woman/4.png and b/public/images/emoji/google/biking_woman/4.png differ
diff --git a/public/images/emoji/google/biking_woman/5.png b/public/images/emoji/google/biking_woman/5.png
index bd543a4c643..079e7399af8 100644
Binary files a/public/images/emoji/google/biking_woman/5.png and b/public/images/emoji/google/biking_woman/5.png differ
diff --git a/public/images/emoji/google/biking_woman/6.png b/public/images/emoji/google/biking_woman/6.png
index 25465277d74..d605a656ffc 100644
Binary files a/public/images/emoji/google/biking_woman/6.png and b/public/images/emoji/google/biking_woman/6.png differ
diff --git a/public/images/emoji/google/bikini.png b/public/images/emoji/google/bikini.png
index ad6fdaff311..9882db89fd5 100644
Binary files a/public/images/emoji/google/bikini.png and b/public/images/emoji/google/bikini.png differ
diff --git a/public/images/emoji/google/billed_cap.png b/public/images/emoji/google/billed_cap.png
index a09913e21b6..a4739440f33 100644
Binary files a/public/images/emoji/google/billed_cap.png and b/public/images/emoji/google/billed_cap.png differ
diff --git a/public/images/emoji/google/biohazard.png b/public/images/emoji/google/biohazard.png
index 867acac4099..e345fcc45fe 100644
Binary files a/public/images/emoji/google/biohazard.png and b/public/images/emoji/google/biohazard.png differ
diff --git a/public/images/emoji/google/biohazard_sign.png b/public/images/emoji/google/biohazard_sign.png
index 867acac4099..e345fcc45fe 100644
Binary files a/public/images/emoji/google/biohazard_sign.png and b/public/images/emoji/google/biohazard_sign.png differ
diff --git a/public/images/emoji/google/bird.png b/public/images/emoji/google/bird.png
index f29f1aa9036..1231be5e0a6 100644
Binary files a/public/images/emoji/google/bird.png and b/public/images/emoji/google/bird.png differ
diff --git a/public/images/emoji/google/birthday.png b/public/images/emoji/google/birthday.png
index 9800dbc9aed..fd23ead864c 100644
Binary files a/public/images/emoji/google/birthday.png and b/public/images/emoji/google/birthday.png differ
diff --git a/public/images/emoji/google/black_circle.png b/public/images/emoji/google/black_circle.png
index 19a1b9ebc13..4e51b2a577a 100644
Binary files a/public/images/emoji/google/black_circle.png and b/public/images/emoji/google/black_circle.png differ
diff --git a/public/images/emoji/google/black_flag.png b/public/images/emoji/google/black_flag.png
index a7fce0c5812..fd30f1d8823 100644
Binary files a/public/images/emoji/google/black_flag.png and b/public/images/emoji/google/black_flag.png differ
diff --git a/public/images/emoji/google/black_heart.png b/public/images/emoji/google/black_heart.png
index 38b5ac9fa5c..4c4f97fcaee 100644
Binary files a/public/images/emoji/google/black_heart.png and b/public/images/emoji/google/black_heart.png differ
diff --git a/public/images/emoji/google/black_joker.png b/public/images/emoji/google/black_joker.png
index 5a2de82787b..f483d06284b 100644
Binary files a/public/images/emoji/google/black_joker.png and b/public/images/emoji/google/black_joker.png differ
diff --git a/public/images/emoji/google/black_large_square.png b/public/images/emoji/google/black_large_square.png
index 5d5a3e00872..f55e1e34b50 100644
Binary files a/public/images/emoji/google/black_large_square.png and b/public/images/emoji/google/black_large_square.png differ
diff --git a/public/images/emoji/google/black_medium_small_square.png b/public/images/emoji/google/black_medium_small_square.png
index 2e1abb616ed..d61362f516a 100644
Binary files a/public/images/emoji/google/black_medium_small_square.png and b/public/images/emoji/google/black_medium_small_square.png differ
diff --git a/public/images/emoji/google/black_medium_square.png b/public/images/emoji/google/black_medium_square.png
index e632311ccbc..f2b911b63bc 100644
Binary files a/public/images/emoji/google/black_medium_square.png and b/public/images/emoji/google/black_medium_square.png differ
diff --git a/public/images/emoji/google/black_nib.png b/public/images/emoji/google/black_nib.png
index 730254037f6..3efcc08d131 100644
Binary files a/public/images/emoji/google/black_nib.png and b/public/images/emoji/google/black_nib.png differ
diff --git a/public/images/emoji/google/black_small_square.png b/public/images/emoji/google/black_small_square.png
index bbdcbef554b..1afd623ea04 100644
Binary files a/public/images/emoji/google/black_small_square.png and b/public/images/emoji/google/black_small_square.png differ
diff --git a/public/images/emoji/google/black_square_button.png b/public/images/emoji/google/black_square_button.png
index 242889f0639..8241ed313e0 100644
Binary files a/public/images/emoji/google/black_square_button.png and b/public/images/emoji/google/black_square_button.png differ
diff --git a/public/images/emoji/google/blonde_man.png b/public/images/emoji/google/blonde_man.png
index 69d6b0b5a7e..f5d7e0009ba 100644
Binary files a/public/images/emoji/google/blonde_man.png and b/public/images/emoji/google/blonde_man.png differ
diff --git a/public/images/emoji/google/blonde_man/2.png b/public/images/emoji/google/blonde_man/2.png
index 71286ddbf4e..2845b0f0d3d 100644
Binary files a/public/images/emoji/google/blonde_man/2.png and b/public/images/emoji/google/blonde_man/2.png differ
diff --git a/public/images/emoji/google/blonde_man/3.png b/public/images/emoji/google/blonde_man/3.png
index f5ccb5bc267..e9866fd956f 100644
Binary files a/public/images/emoji/google/blonde_man/3.png and b/public/images/emoji/google/blonde_man/3.png differ
diff --git a/public/images/emoji/google/blonde_man/4.png b/public/images/emoji/google/blonde_man/4.png
index 2d068f1de93..9a83dc6e5f1 100644
Binary files a/public/images/emoji/google/blonde_man/4.png and b/public/images/emoji/google/blonde_man/4.png differ
diff --git a/public/images/emoji/google/blonde_man/5.png b/public/images/emoji/google/blonde_man/5.png
index af6fe7aa988..99604000060 100644
Binary files a/public/images/emoji/google/blonde_man/5.png and b/public/images/emoji/google/blonde_man/5.png differ
diff --git a/public/images/emoji/google/blonde_man/6.png b/public/images/emoji/google/blonde_man/6.png
index 85e4e9885b0..c2a4a4256b3 100644
Binary files a/public/images/emoji/google/blonde_man/6.png and b/public/images/emoji/google/blonde_man/6.png differ
diff --git a/public/images/emoji/google/blonde_woman.png b/public/images/emoji/google/blonde_woman.png
index 30bdd3f9d7b..9264a40c97d 100644
Binary files a/public/images/emoji/google/blonde_woman.png and b/public/images/emoji/google/blonde_woman.png differ
diff --git a/public/images/emoji/google/blonde_woman/2.png b/public/images/emoji/google/blonde_woman/2.png
index 470f202beea..bb4e1469197 100644
Binary files a/public/images/emoji/google/blonde_woman/2.png and b/public/images/emoji/google/blonde_woman/2.png differ
diff --git a/public/images/emoji/google/blonde_woman/3.png b/public/images/emoji/google/blonde_woman/3.png
index 932587e8d52..d20c874e842 100644
Binary files a/public/images/emoji/google/blonde_woman/3.png and b/public/images/emoji/google/blonde_woman/3.png differ
diff --git a/public/images/emoji/google/blonde_woman/4.png b/public/images/emoji/google/blonde_woman/4.png
index c142bc62cf7..8a09e1cffef 100644
Binary files a/public/images/emoji/google/blonde_woman/4.png and b/public/images/emoji/google/blonde_woman/4.png differ
diff --git a/public/images/emoji/google/blonde_woman/5.png b/public/images/emoji/google/blonde_woman/5.png
index 2d5d18886fe..ec93bfc36d1 100644
Binary files a/public/images/emoji/google/blonde_woman/5.png and b/public/images/emoji/google/blonde_woman/5.png differ
diff --git a/public/images/emoji/google/blonde_woman/6.png b/public/images/emoji/google/blonde_woman/6.png
index fb1e8757ea8..ad669e118fd 100644
Binary files a/public/images/emoji/google/blonde_woman/6.png and b/public/images/emoji/google/blonde_woman/6.png differ
diff --git a/public/images/emoji/google/blossom.png b/public/images/emoji/google/blossom.png
index 0f3b661adb1..3fc27e61b1a 100644
Binary files a/public/images/emoji/google/blossom.png and b/public/images/emoji/google/blossom.png differ
diff --git a/public/images/emoji/google/blowfish.png b/public/images/emoji/google/blowfish.png
index 1ab19958f19..0c18d3477c1 100644
Binary files a/public/images/emoji/google/blowfish.png and b/public/images/emoji/google/blowfish.png differ
diff --git a/public/images/emoji/google/blue_book.png b/public/images/emoji/google/blue_book.png
index 5edf72ede75..27a97ee236d 100644
Binary files a/public/images/emoji/google/blue_book.png and b/public/images/emoji/google/blue_book.png differ
diff --git a/public/images/emoji/google/blue_car.png b/public/images/emoji/google/blue_car.png
index 6234478d686..c51bfe3e316 100644
Binary files a/public/images/emoji/google/blue_car.png and b/public/images/emoji/google/blue_car.png differ
diff --git a/public/images/emoji/google/blue_heart.png b/public/images/emoji/google/blue_heart.png
index 31a8f805dbe..6e0ba37fe1b 100644
Binary files a/public/images/emoji/google/blue_heart.png and b/public/images/emoji/google/blue_heart.png differ
diff --git a/public/images/emoji/google/blush.png b/public/images/emoji/google/blush.png
index eea497bc22e..67b84af327e 100644
Binary files a/public/images/emoji/google/blush.png and b/public/images/emoji/google/blush.png differ
diff --git a/public/images/emoji/google/boar.png b/public/images/emoji/google/boar.png
index aeb75ed0f3e..131508ad8e9 100644
Binary files a/public/images/emoji/google/boar.png and b/public/images/emoji/google/boar.png differ
diff --git a/public/images/emoji/google/boat.png b/public/images/emoji/google/boat.png
index 42799a3b742..e26c5116c41 100644
Binary files a/public/images/emoji/google/boat.png and b/public/images/emoji/google/boat.png differ
diff --git a/public/images/emoji/google/bolivia.png b/public/images/emoji/google/bolivia.png
index 0f16302055a..f25eb38f7a9 100644
Binary files a/public/images/emoji/google/bolivia.png and b/public/images/emoji/google/bolivia.png differ
diff --git a/public/images/emoji/google/bomb.png b/public/images/emoji/google/bomb.png
index 9cd29f7a6ca..7fb5f4e05d6 100644
Binary files a/public/images/emoji/google/bomb.png and b/public/images/emoji/google/bomb.png differ
diff --git a/public/images/emoji/google/book.png b/public/images/emoji/google/book.png
index 2f4edfa0328..fa30a7da661 100644
Binary files a/public/images/emoji/google/book.png and b/public/images/emoji/google/book.png differ
diff --git a/public/images/emoji/google/bookmark.png b/public/images/emoji/google/bookmark.png
index e74cd346146..494dc306a8c 100644
Binary files a/public/images/emoji/google/bookmark.png and b/public/images/emoji/google/bookmark.png differ
diff --git a/public/images/emoji/google/bookmark_tabs.png b/public/images/emoji/google/bookmark_tabs.png
index a582c199451..058dad05182 100644
Binary files a/public/images/emoji/google/bookmark_tabs.png and b/public/images/emoji/google/bookmark_tabs.png differ
diff --git a/public/images/emoji/google/books.png b/public/images/emoji/google/books.png
index 9e065d7caaf..d703234b81c 100644
Binary files a/public/images/emoji/google/books.png and b/public/images/emoji/google/books.png differ
diff --git a/public/images/emoji/google/boom.png b/public/images/emoji/google/boom.png
index 3f9acdb1ccd..43bddade273 100644
Binary files a/public/images/emoji/google/boom.png and b/public/images/emoji/google/boom.png differ
diff --git a/public/images/emoji/google/boot.png b/public/images/emoji/google/boot.png
index 6a96d4f3b7d..f37a13893d1 100644
Binary files a/public/images/emoji/google/boot.png and b/public/images/emoji/google/boot.png differ
diff --git a/public/images/emoji/google/bosnia_herzegovina.png b/public/images/emoji/google/bosnia_herzegovina.png
index 34109f18c90..4245196945f 100644
Binary files a/public/images/emoji/google/bosnia_herzegovina.png and b/public/images/emoji/google/bosnia_herzegovina.png differ
diff --git a/public/images/emoji/google/botswana.png b/public/images/emoji/google/botswana.png
index ebb46a9fd0d..46d7ba7540b 100644
Binary files a/public/images/emoji/google/botswana.png and b/public/images/emoji/google/botswana.png differ
diff --git a/public/images/emoji/google/bottle_with_popping_cork.png b/public/images/emoji/google/bottle_with_popping_cork.png
index ea9d7ec6bca..998f04124e2 100644
Binary files a/public/images/emoji/google/bottle_with_popping_cork.png and b/public/images/emoji/google/bottle_with_popping_cork.png differ
diff --git a/public/images/emoji/google/bouquet.png b/public/images/emoji/google/bouquet.png
index 94582587d6b..2bc758860f7 100644
Binary files a/public/images/emoji/google/bouquet.png and b/public/images/emoji/google/bouquet.png differ
diff --git a/public/images/emoji/google/bouvet_island.png b/public/images/emoji/google/bouvet_island.png
index 5330d9794c3..d348a446ad7 100644
Binary files a/public/images/emoji/google/bouvet_island.png and b/public/images/emoji/google/bouvet_island.png differ
diff --git a/public/images/emoji/google/bow.png b/public/images/emoji/google/bow.png
index 3a5c6371d11..9d660d3d6ca 100644
Binary files a/public/images/emoji/google/bow.png and b/public/images/emoji/google/bow.png differ
diff --git a/public/images/emoji/google/bow/2.png b/public/images/emoji/google/bow/2.png
index b8f3b1fb52b..565acc695a2 100644
Binary files a/public/images/emoji/google/bow/2.png and b/public/images/emoji/google/bow/2.png differ
diff --git a/public/images/emoji/google/bow/3.png b/public/images/emoji/google/bow/3.png
index e41b4963a86..06457156bc8 100644
Binary files a/public/images/emoji/google/bow/3.png and b/public/images/emoji/google/bow/3.png differ
diff --git a/public/images/emoji/google/bow/4.png b/public/images/emoji/google/bow/4.png
index 95236132809..59f0a8d2be8 100644
Binary files a/public/images/emoji/google/bow/4.png and b/public/images/emoji/google/bow/4.png differ
diff --git a/public/images/emoji/google/bow/5.png b/public/images/emoji/google/bow/5.png
index e4d4e3c8942..87330605478 100644
Binary files a/public/images/emoji/google/bow/5.png and b/public/images/emoji/google/bow/5.png differ
diff --git a/public/images/emoji/google/bow/6.png b/public/images/emoji/google/bow/6.png
index 94bce13825c..b78d09b2617 100644
Binary files a/public/images/emoji/google/bow/6.png and b/public/images/emoji/google/bow/6.png differ
diff --git a/public/images/emoji/google/bow_and_arrow.png b/public/images/emoji/google/bow_and_arrow.png
index 6539d3b37e8..130e029ea5b 100644
Binary files a/public/images/emoji/google/bow_and_arrow.png and b/public/images/emoji/google/bow_and_arrow.png differ
diff --git a/public/images/emoji/google/bowing_man.png b/public/images/emoji/google/bowing_man.png
index 3a5c6371d11..9d660d3d6ca 100644
Binary files a/public/images/emoji/google/bowing_man.png and b/public/images/emoji/google/bowing_man.png differ
diff --git a/public/images/emoji/google/bowing_man/2.png b/public/images/emoji/google/bowing_man/2.png
index b8f3b1fb52b..565acc695a2 100644
Binary files a/public/images/emoji/google/bowing_man/2.png and b/public/images/emoji/google/bowing_man/2.png differ
diff --git a/public/images/emoji/google/bowing_man/3.png b/public/images/emoji/google/bowing_man/3.png
index e41b4963a86..06457156bc8 100644
Binary files a/public/images/emoji/google/bowing_man/3.png and b/public/images/emoji/google/bowing_man/3.png differ
diff --git a/public/images/emoji/google/bowing_man/4.png b/public/images/emoji/google/bowing_man/4.png
index 95236132809..59f0a8d2be8 100644
Binary files a/public/images/emoji/google/bowing_man/4.png and b/public/images/emoji/google/bowing_man/4.png differ
diff --git a/public/images/emoji/google/bowing_man/5.png b/public/images/emoji/google/bowing_man/5.png
index e4d4e3c8942..87330605478 100644
Binary files a/public/images/emoji/google/bowing_man/5.png and b/public/images/emoji/google/bowing_man/5.png differ
diff --git a/public/images/emoji/google/bowing_man/6.png b/public/images/emoji/google/bowing_man/6.png
index 94bce13825c..b78d09b2617 100644
Binary files a/public/images/emoji/google/bowing_man/6.png and b/public/images/emoji/google/bowing_man/6.png differ
diff --git a/public/images/emoji/google/bowing_woman.png b/public/images/emoji/google/bowing_woman.png
index 44e482e39fa..b8cd8240c81 100644
Binary files a/public/images/emoji/google/bowing_woman.png and b/public/images/emoji/google/bowing_woman.png differ
diff --git a/public/images/emoji/google/bowing_woman/2.png b/public/images/emoji/google/bowing_woman/2.png
index 5b4930a1df5..31d767ddd48 100644
Binary files a/public/images/emoji/google/bowing_woman/2.png and b/public/images/emoji/google/bowing_woman/2.png differ
diff --git a/public/images/emoji/google/bowing_woman/3.png b/public/images/emoji/google/bowing_woman/3.png
index 24063f7eac8..f2a3cbe805e 100644
Binary files a/public/images/emoji/google/bowing_woman/3.png and b/public/images/emoji/google/bowing_woman/3.png differ
diff --git a/public/images/emoji/google/bowing_woman/4.png b/public/images/emoji/google/bowing_woman/4.png
index 1352161b085..6ff58d8a937 100644
Binary files a/public/images/emoji/google/bowing_woman/4.png and b/public/images/emoji/google/bowing_woman/4.png differ
diff --git a/public/images/emoji/google/bowing_woman/5.png b/public/images/emoji/google/bowing_woman/5.png
index 989caced3b7..e7a0eb31385 100644
Binary files a/public/images/emoji/google/bowing_woman/5.png and b/public/images/emoji/google/bowing_woman/5.png differ
diff --git a/public/images/emoji/google/bowing_woman/6.png b/public/images/emoji/google/bowing_woman/6.png
index 3631f79ed4c..32ae32c519f 100644
Binary files a/public/images/emoji/google/bowing_woman/6.png and b/public/images/emoji/google/bowing_woman/6.png differ
diff --git a/public/images/emoji/google/bowl_with_spoon.png b/public/images/emoji/google/bowl_with_spoon.png
index 95d115c676c..1766741e16e 100644
Binary files a/public/images/emoji/google/bowl_with_spoon.png and b/public/images/emoji/google/bowl_with_spoon.png differ
diff --git a/public/images/emoji/google/bowling.png b/public/images/emoji/google/bowling.png
index 3b751677423..0f930211483 100644
Binary files a/public/images/emoji/google/bowling.png and b/public/images/emoji/google/bowling.png differ
diff --git a/public/images/emoji/google/boxing_glove.png b/public/images/emoji/google/boxing_glove.png
index 96fba7e038a..1dd45489f75 100644
Binary files a/public/images/emoji/google/boxing_glove.png and b/public/images/emoji/google/boxing_glove.png differ
diff --git a/public/images/emoji/google/boy.png b/public/images/emoji/google/boy.png
index 7764083787a..8450f1acf21 100644
Binary files a/public/images/emoji/google/boy.png and b/public/images/emoji/google/boy.png differ
diff --git a/public/images/emoji/google/boy/2.png b/public/images/emoji/google/boy/2.png
index a2bc54b5202..2cd5abdb538 100644
Binary files a/public/images/emoji/google/boy/2.png and b/public/images/emoji/google/boy/2.png differ
diff --git a/public/images/emoji/google/boy/3.png b/public/images/emoji/google/boy/3.png
index 1d1a18acac6..e0ce4c35c35 100644
Binary files a/public/images/emoji/google/boy/3.png and b/public/images/emoji/google/boy/3.png differ
diff --git a/public/images/emoji/google/boy/4.png b/public/images/emoji/google/boy/4.png
index 732aa7ae8fd..a3667b49366 100644
Binary files a/public/images/emoji/google/boy/4.png and b/public/images/emoji/google/boy/4.png differ
diff --git a/public/images/emoji/google/boy/5.png b/public/images/emoji/google/boy/5.png
index c90aaa9978a..7207674a19f 100644
Binary files a/public/images/emoji/google/boy/5.png and b/public/images/emoji/google/boy/5.png differ
diff --git a/public/images/emoji/google/boy/6.png b/public/images/emoji/google/boy/6.png
index dc62add0fa3..839cb2fa51d 100644
Binary files a/public/images/emoji/google/boy/6.png and b/public/images/emoji/google/boy/6.png differ
diff --git a/public/images/emoji/google/brain.png b/public/images/emoji/google/brain.png
index a25c3629732..ca90998fde1 100644
Binary files a/public/images/emoji/google/brain.png and b/public/images/emoji/google/brain.png differ
diff --git a/public/images/emoji/google/brazil.png b/public/images/emoji/google/brazil.png
index 0b4cf93fd6f..209e7838940 100644
Binary files a/public/images/emoji/google/brazil.png and b/public/images/emoji/google/brazil.png differ
diff --git a/public/images/emoji/google/bread.png b/public/images/emoji/google/bread.png
index 35c1d102474..521d17d1bcc 100644
Binary files a/public/images/emoji/google/bread.png and b/public/images/emoji/google/bread.png differ
diff --git a/public/images/emoji/google/breast_feeding.png b/public/images/emoji/google/breast_feeding.png
index 06bf48a8ddd..78abcbe47e0 100644
Binary files a/public/images/emoji/google/breast_feeding.png and b/public/images/emoji/google/breast_feeding.png differ
diff --git a/public/images/emoji/google/breast_feeding/2.png b/public/images/emoji/google/breast_feeding/2.png
index 0a1c42a6de4..48298615778 100644
Binary files a/public/images/emoji/google/breast_feeding/2.png and b/public/images/emoji/google/breast_feeding/2.png differ
diff --git a/public/images/emoji/google/breast_feeding/3.png b/public/images/emoji/google/breast_feeding/3.png
index e57faa9745e..43f0b1f078c 100644
Binary files a/public/images/emoji/google/breast_feeding/3.png and b/public/images/emoji/google/breast_feeding/3.png differ
diff --git a/public/images/emoji/google/breast_feeding/4.png b/public/images/emoji/google/breast_feeding/4.png
index 0732edb9fae..267ea7a66d0 100644
Binary files a/public/images/emoji/google/breast_feeding/4.png and b/public/images/emoji/google/breast_feeding/4.png differ
diff --git a/public/images/emoji/google/breast_feeding/5.png b/public/images/emoji/google/breast_feeding/5.png
index 9f013ec1998..e88ee7c22ee 100644
Binary files a/public/images/emoji/google/breast_feeding/5.png and b/public/images/emoji/google/breast_feeding/5.png differ
diff --git a/public/images/emoji/google/breast_feeding/6.png b/public/images/emoji/google/breast_feeding/6.png
index b18f79b1afe..26daaf68f52 100644
Binary files a/public/images/emoji/google/breast_feeding/6.png and b/public/images/emoji/google/breast_feeding/6.png differ
diff --git a/public/images/emoji/google/bride_with_veil.png b/public/images/emoji/google/bride_with_veil.png
index 4734c8155f7..f8318247325 100644
Binary files a/public/images/emoji/google/bride_with_veil.png and b/public/images/emoji/google/bride_with_veil.png differ
diff --git a/public/images/emoji/google/bride_with_veil/2.png b/public/images/emoji/google/bride_with_veil/2.png
index 8ec4d883504..a60e401976a 100644
Binary files a/public/images/emoji/google/bride_with_veil/2.png and b/public/images/emoji/google/bride_with_veil/2.png differ
diff --git a/public/images/emoji/google/bride_with_veil/3.png b/public/images/emoji/google/bride_with_veil/3.png
index fa3fe8746b8..0cf6db53384 100644
Binary files a/public/images/emoji/google/bride_with_veil/3.png and b/public/images/emoji/google/bride_with_veil/3.png differ
diff --git a/public/images/emoji/google/bride_with_veil/4.png b/public/images/emoji/google/bride_with_veil/4.png
index fce877ded3e..1f686e545b4 100644
Binary files a/public/images/emoji/google/bride_with_veil/4.png and b/public/images/emoji/google/bride_with_veil/4.png differ
diff --git a/public/images/emoji/google/bride_with_veil/5.png b/public/images/emoji/google/bride_with_veil/5.png
index 00368c7c7ba..ec4ea0748a8 100644
Binary files a/public/images/emoji/google/bride_with_veil/5.png and b/public/images/emoji/google/bride_with_veil/5.png differ
diff --git a/public/images/emoji/google/bride_with_veil/6.png b/public/images/emoji/google/bride_with_veil/6.png
index 5a898b3cb22..2d57cca4ae0 100644
Binary files a/public/images/emoji/google/bride_with_veil/6.png and b/public/images/emoji/google/bride_with_veil/6.png differ
diff --git a/public/images/emoji/google/bridge_at_night.png b/public/images/emoji/google/bridge_at_night.png
index d80d5367f1f..cba4aa13a6c 100644
Binary files a/public/images/emoji/google/bridge_at_night.png and b/public/images/emoji/google/bridge_at_night.png differ
diff --git a/public/images/emoji/google/briefcase.png b/public/images/emoji/google/briefcase.png
index 56d1fa4c3a8..4823cdbd64f 100644
Binary files a/public/images/emoji/google/briefcase.png and b/public/images/emoji/google/briefcase.png differ
diff --git a/public/images/emoji/google/british_indian_ocean_territory.png b/public/images/emoji/google/british_indian_ocean_territory.png
index 570ac967306..b450c90ccde 100644
Binary files a/public/images/emoji/google/british_indian_ocean_territory.png and b/public/images/emoji/google/british_indian_ocean_territory.png differ
diff --git a/public/images/emoji/google/british_virgin_islands.png b/public/images/emoji/google/british_virgin_islands.png
index dd3399c2138..3a79c95c9f7 100644
Binary files a/public/images/emoji/google/british_virgin_islands.png and b/public/images/emoji/google/british_virgin_islands.png differ
diff --git a/public/images/emoji/google/broccoli.png b/public/images/emoji/google/broccoli.png
index 067cfa08e4e..842c33be492 100644
Binary files a/public/images/emoji/google/broccoli.png and b/public/images/emoji/google/broccoli.png differ
diff --git a/public/images/emoji/google/broken_heart.png b/public/images/emoji/google/broken_heart.png
index 115bf873f22..0c82944d8bf 100644
Binary files a/public/images/emoji/google/broken_heart.png and b/public/images/emoji/google/broken_heart.png differ
diff --git a/public/images/emoji/google/brunei.png b/public/images/emoji/google/brunei.png
index f6257892f4d..15bf9bb5b4c 100644
Binary files a/public/images/emoji/google/brunei.png and b/public/images/emoji/google/brunei.png differ
diff --git a/public/images/emoji/google/bug.png b/public/images/emoji/google/bug.png
index f690ec234fb..f5c28156222 100644
Binary files a/public/images/emoji/google/bug.png and b/public/images/emoji/google/bug.png differ
diff --git a/public/images/emoji/google/building_construction.png b/public/images/emoji/google/building_construction.png
index 625247fd7c8..444e3cd1abf 100644
Binary files a/public/images/emoji/google/building_construction.png and b/public/images/emoji/google/building_construction.png differ
diff --git a/public/images/emoji/google/bulb.png b/public/images/emoji/google/bulb.png
index 92456879f71..002db3330c2 100644
Binary files a/public/images/emoji/google/bulb.png and b/public/images/emoji/google/bulb.png differ
diff --git a/public/images/emoji/google/bulgaria.png b/public/images/emoji/google/bulgaria.png
index d8a43cd03bb..69e671d4036 100644
Binary files a/public/images/emoji/google/bulgaria.png and b/public/images/emoji/google/bulgaria.png differ
diff --git a/public/images/emoji/google/bullettrain_front.png b/public/images/emoji/google/bullettrain_front.png
index 3c117d8bace..ff0ac0cdfa1 100644
Binary files a/public/images/emoji/google/bullettrain_front.png and b/public/images/emoji/google/bullettrain_front.png differ
diff --git a/public/images/emoji/google/bullettrain_side.png b/public/images/emoji/google/bullettrain_side.png
index dae0881c98e..948d6598cb0 100644
Binary files a/public/images/emoji/google/bullettrain_side.png and b/public/images/emoji/google/bullettrain_side.png differ
diff --git a/public/images/emoji/google/burkina_faso.png b/public/images/emoji/google/burkina_faso.png
index ebebb32fbde..eea5085cacc 100644
Binary files a/public/images/emoji/google/burkina_faso.png and b/public/images/emoji/google/burkina_faso.png differ
diff --git a/public/images/emoji/google/burrito.png b/public/images/emoji/google/burrito.png
index 807f0aa5337..cb5d4857770 100644
Binary files a/public/images/emoji/google/burrito.png and b/public/images/emoji/google/burrito.png differ
diff --git a/public/images/emoji/google/burundi.png b/public/images/emoji/google/burundi.png
index 487c4ccd613..1289ce06728 100644
Binary files a/public/images/emoji/google/burundi.png and b/public/images/emoji/google/burundi.png differ
diff --git a/public/images/emoji/google/bus.png b/public/images/emoji/google/bus.png
index 210d7f2ae9f..bcd70c5080b 100644
Binary files a/public/images/emoji/google/bus.png and b/public/images/emoji/google/bus.png differ
diff --git a/public/images/emoji/google/business_suit_levitating.png b/public/images/emoji/google/business_suit_levitating.png
index 88918f97b31..b7eea2e0143 100644
Binary files a/public/images/emoji/google/business_suit_levitating.png and b/public/images/emoji/google/business_suit_levitating.png differ
diff --git a/public/images/emoji/google/business_suit_levitating/2.png b/public/images/emoji/google/business_suit_levitating/2.png
index ddeda2a43bb..28bf50d0d26 100644
Binary files a/public/images/emoji/google/business_suit_levitating/2.png and b/public/images/emoji/google/business_suit_levitating/2.png differ
diff --git a/public/images/emoji/google/business_suit_levitating/3.png b/public/images/emoji/google/business_suit_levitating/3.png
index e62d08a901f..2e9ca43ed91 100644
Binary files a/public/images/emoji/google/business_suit_levitating/3.png and b/public/images/emoji/google/business_suit_levitating/3.png differ
diff --git a/public/images/emoji/google/business_suit_levitating/4.png b/public/images/emoji/google/business_suit_levitating/4.png
index 27012dfbe98..1f9720f9622 100644
Binary files a/public/images/emoji/google/business_suit_levitating/4.png and b/public/images/emoji/google/business_suit_levitating/4.png differ
diff --git a/public/images/emoji/google/business_suit_levitating/5.png b/public/images/emoji/google/business_suit_levitating/5.png
index c8863f58335..889a3dcd0bb 100644
Binary files a/public/images/emoji/google/business_suit_levitating/5.png and b/public/images/emoji/google/business_suit_levitating/5.png differ
diff --git a/public/images/emoji/google/business_suit_levitating/6.png b/public/images/emoji/google/business_suit_levitating/6.png
index 62e5e00578f..6b55d4fcd7a 100644
Binary files a/public/images/emoji/google/business_suit_levitating/6.png and b/public/images/emoji/google/business_suit_levitating/6.png differ
diff --git a/public/images/emoji/google/busstop.png b/public/images/emoji/google/busstop.png
index a5f1d98efdb..a6bfe6945eb 100644
Binary files a/public/images/emoji/google/busstop.png and b/public/images/emoji/google/busstop.png differ
diff --git a/public/images/emoji/google/bust_in_silhouette.png b/public/images/emoji/google/bust_in_silhouette.png
index 37e0afd46ec..cab90109685 100644
Binary files a/public/images/emoji/google/bust_in_silhouette.png and b/public/images/emoji/google/bust_in_silhouette.png differ
diff --git a/public/images/emoji/google/busts_in_silhouette.png b/public/images/emoji/google/busts_in_silhouette.png
index d6dc081cdc2..9457af969eb 100644
Binary files a/public/images/emoji/google/busts_in_silhouette.png and b/public/images/emoji/google/busts_in_silhouette.png differ
diff --git a/public/images/emoji/google/butterfly.png b/public/images/emoji/google/butterfly.png
index 02337caf6de..6f98b123ed3 100644
Binary files a/public/images/emoji/google/butterfly.png and b/public/images/emoji/google/butterfly.png differ
diff --git a/public/images/emoji/google/cactus.png b/public/images/emoji/google/cactus.png
index b0fcc9ae76b..7d67af3c9e5 100644
Binary files a/public/images/emoji/google/cactus.png and b/public/images/emoji/google/cactus.png differ
diff --git a/public/images/emoji/google/cake.png b/public/images/emoji/google/cake.png
index 9e7af8c5ec2..d7a4947df90 100644
Binary files a/public/images/emoji/google/cake.png and b/public/images/emoji/google/cake.png differ
diff --git a/public/images/emoji/google/calendar.png b/public/images/emoji/google/calendar.png
index 748d582db3e..c216fcd633e 100644
Binary files a/public/images/emoji/google/calendar.png and b/public/images/emoji/google/calendar.png differ
diff --git a/public/images/emoji/google/calendar_spiral.png b/public/images/emoji/google/calendar_spiral.png
index 0997b42f0c2..8c19dc81046 100644
Binary files a/public/images/emoji/google/calendar_spiral.png and b/public/images/emoji/google/calendar_spiral.png differ
diff --git a/public/images/emoji/google/call_me_hand.png b/public/images/emoji/google/call_me_hand.png
index 2e60f8c84ce..1aabe9df1d9 100644
Binary files a/public/images/emoji/google/call_me_hand.png and b/public/images/emoji/google/call_me_hand.png differ
diff --git a/public/images/emoji/google/call_me_hand/2.png b/public/images/emoji/google/call_me_hand/2.png
index 4fb8a6c066d..4f7bcee52fd 100644
Binary files a/public/images/emoji/google/call_me_hand/2.png and b/public/images/emoji/google/call_me_hand/2.png differ
diff --git a/public/images/emoji/google/call_me_hand/3.png b/public/images/emoji/google/call_me_hand/3.png
index 3144c7a46c1..2060bf0d3a7 100644
Binary files a/public/images/emoji/google/call_me_hand/3.png and b/public/images/emoji/google/call_me_hand/3.png differ
diff --git a/public/images/emoji/google/call_me_hand/4.png b/public/images/emoji/google/call_me_hand/4.png
index 440776f8857..73690838b18 100644
Binary files a/public/images/emoji/google/call_me_hand/4.png and b/public/images/emoji/google/call_me_hand/4.png differ
diff --git a/public/images/emoji/google/call_me_hand/5.png b/public/images/emoji/google/call_me_hand/5.png
index 6eb543f4cce..dcc7588aa41 100644
Binary files a/public/images/emoji/google/call_me_hand/5.png and b/public/images/emoji/google/call_me_hand/5.png differ
diff --git a/public/images/emoji/google/call_me_hand/6.png b/public/images/emoji/google/call_me_hand/6.png
index 99f568f9b1f..8b1ececb371 100644
Binary files a/public/images/emoji/google/call_me_hand/6.png and b/public/images/emoji/google/call_me_hand/6.png differ
diff --git a/public/images/emoji/google/calling.png b/public/images/emoji/google/calling.png
index 4d3bfd087fa..d64cb99599b 100644
Binary files a/public/images/emoji/google/calling.png and b/public/images/emoji/google/calling.png differ
diff --git a/public/images/emoji/google/cambodia.png b/public/images/emoji/google/cambodia.png
index cfbedf91ac5..fa94a8925b7 100644
Binary files a/public/images/emoji/google/cambodia.png and b/public/images/emoji/google/cambodia.png differ
diff --git a/public/images/emoji/google/camel.png b/public/images/emoji/google/camel.png
index 5da0d4620a9..55ed7d6703c 100644
Binary files a/public/images/emoji/google/camel.png and b/public/images/emoji/google/camel.png differ
diff --git a/public/images/emoji/google/camera.png b/public/images/emoji/google/camera.png
index 56a6109fd42..d656e290fa1 100644
Binary files a/public/images/emoji/google/camera.png and b/public/images/emoji/google/camera.png differ
diff --git a/public/images/emoji/google/camera_flash.png b/public/images/emoji/google/camera_flash.png
index 327fbd507e9..2d9bccceebd 100644
Binary files a/public/images/emoji/google/camera_flash.png and b/public/images/emoji/google/camera_flash.png differ
diff --git a/public/images/emoji/google/camera_with_flash.png b/public/images/emoji/google/camera_with_flash.png
index 327fbd507e9..2d9bccceebd 100644
Binary files a/public/images/emoji/google/camera_with_flash.png and b/public/images/emoji/google/camera_with_flash.png differ
diff --git a/public/images/emoji/google/cameroon.png b/public/images/emoji/google/cameroon.png
index 0c49ba9df81..32cfd8f65c1 100644
Binary files a/public/images/emoji/google/cameroon.png and b/public/images/emoji/google/cameroon.png differ
diff --git a/public/images/emoji/google/camping.png b/public/images/emoji/google/camping.png
index eb062ee1e4a..c8f98531ba1 100644
Binary files a/public/images/emoji/google/camping.png and b/public/images/emoji/google/camping.png differ
diff --git a/public/images/emoji/google/canada.png b/public/images/emoji/google/canada.png
index 97744af556a..f4d80e26037 100644
Binary files a/public/images/emoji/google/canada.png and b/public/images/emoji/google/canada.png differ
diff --git a/public/images/emoji/google/canary_islands.png b/public/images/emoji/google/canary_islands.png
index 4a33a5b653c..aec8595da19 100644
Binary files a/public/images/emoji/google/canary_islands.png and b/public/images/emoji/google/canary_islands.png differ
diff --git a/public/images/emoji/google/cancer.png b/public/images/emoji/google/cancer.png
index 275373bd958..84f5880338a 100644
Binary files a/public/images/emoji/google/cancer.png and b/public/images/emoji/google/cancer.png differ
diff --git a/public/images/emoji/google/candle.png b/public/images/emoji/google/candle.png
index e131340388c..bbea78b1011 100644
Binary files a/public/images/emoji/google/candle.png and b/public/images/emoji/google/candle.png differ
diff --git a/public/images/emoji/google/candy.png b/public/images/emoji/google/candy.png
index 40a0b252b5c..758fe2a6dcf 100644
Binary files a/public/images/emoji/google/candy.png and b/public/images/emoji/google/candy.png differ
diff --git a/public/images/emoji/google/canned_food.png b/public/images/emoji/google/canned_food.png
index 2fdb07a070b..dfed4b50beb 100644
Binary files a/public/images/emoji/google/canned_food.png and b/public/images/emoji/google/canned_food.png differ
diff --git a/public/images/emoji/google/canoe.png b/public/images/emoji/google/canoe.png
index 7464ae1e29a..2b64f578326 100644
Binary files a/public/images/emoji/google/canoe.png and b/public/images/emoji/google/canoe.png differ
diff --git a/public/images/emoji/google/cape_verde.png b/public/images/emoji/google/cape_verde.png
index 42fc1f87f64..20058f65435 100644
Binary files a/public/images/emoji/google/cape_verde.png and b/public/images/emoji/google/cape_verde.png differ
diff --git a/public/images/emoji/google/capital_abcd.png b/public/images/emoji/google/capital_abcd.png
index 3c2d4dd68c3..7fc35935d3c 100644
Binary files a/public/images/emoji/google/capital_abcd.png and b/public/images/emoji/google/capital_abcd.png differ
diff --git a/public/images/emoji/google/capricorn.png b/public/images/emoji/google/capricorn.png
index f4dd4a18804..6d9df53e658 100644
Binary files a/public/images/emoji/google/capricorn.png and b/public/images/emoji/google/capricorn.png differ
diff --git a/public/images/emoji/google/car.png b/public/images/emoji/google/car.png
index 56f5cddc276..7df8de6eb86 100644
Binary files a/public/images/emoji/google/car.png and b/public/images/emoji/google/car.png differ
diff --git a/public/images/emoji/google/card_box.png b/public/images/emoji/google/card_box.png
index 68c5cb59351..40e8eea8182 100644
Binary files a/public/images/emoji/google/card_box.png and b/public/images/emoji/google/card_box.png differ
diff --git a/public/images/emoji/google/card_file_box.png b/public/images/emoji/google/card_file_box.png
index 68c5cb59351..40e8eea8182 100644
Binary files a/public/images/emoji/google/card_file_box.png and b/public/images/emoji/google/card_file_box.png differ
diff --git a/public/images/emoji/google/card_index.png b/public/images/emoji/google/card_index.png
index 0403d3f48b3..ea1769deea8 100644
Binary files a/public/images/emoji/google/card_index.png and b/public/images/emoji/google/card_index.png differ
diff --git a/public/images/emoji/google/card_index_dividers.png b/public/images/emoji/google/card_index_dividers.png
index dd8929d64ac..b07bdc1135c 100644
Binary files a/public/images/emoji/google/card_index_dividers.png and b/public/images/emoji/google/card_index_dividers.png differ
diff --git a/public/images/emoji/google/caribbean_netherlands.png b/public/images/emoji/google/caribbean_netherlands.png
index dad0f8ce650..4faf7e252ef 100644
Binary files a/public/images/emoji/google/caribbean_netherlands.png and b/public/images/emoji/google/caribbean_netherlands.png differ
diff --git a/public/images/emoji/google/carousel_horse.png b/public/images/emoji/google/carousel_horse.png
index cbe2d1c7cba..0b88504ac85 100644
Binary files a/public/images/emoji/google/carousel_horse.png and b/public/images/emoji/google/carousel_horse.png differ
diff --git a/public/images/emoji/google/carrot.png b/public/images/emoji/google/carrot.png
index 08bde96748f..de775a0ac41 100644
Binary files a/public/images/emoji/google/carrot.png and b/public/images/emoji/google/carrot.png differ
diff --git a/public/images/emoji/google/cat.png b/public/images/emoji/google/cat.png
index 78249af6b10..5c5cb3cf38c 100644
Binary files a/public/images/emoji/google/cat.png and b/public/images/emoji/google/cat.png differ
diff --git a/public/images/emoji/google/cat2.png b/public/images/emoji/google/cat2.png
index 90f7ccac424..ebde91befea 100644
Binary files a/public/images/emoji/google/cat2.png and b/public/images/emoji/google/cat2.png differ
diff --git a/public/images/emoji/google/cayman_islands.png b/public/images/emoji/google/cayman_islands.png
index d08b13b5ff0..d0abde39fc5 100644
Binary files a/public/images/emoji/google/cayman_islands.png and b/public/images/emoji/google/cayman_islands.png differ
diff --git a/public/images/emoji/google/cd.png b/public/images/emoji/google/cd.png
index a8eb5143702..487a77fe2ec 100644
Binary files a/public/images/emoji/google/cd.png and b/public/images/emoji/google/cd.png differ
diff --git a/public/images/emoji/google/central_african_republic.png b/public/images/emoji/google/central_african_republic.png
index c848f392e01..45370670709 100644
Binary files a/public/images/emoji/google/central_african_republic.png and b/public/images/emoji/google/central_african_republic.png differ
diff --git a/public/images/emoji/google/ceuta_and_melilla.png b/public/images/emoji/google/ceuta_and_melilla.png
index dad0f8ce650..4faf7e252ef 100644
Binary files a/public/images/emoji/google/ceuta_and_melilla.png and b/public/images/emoji/google/ceuta_and_melilla.png differ
diff --git a/public/images/emoji/google/chad.png b/public/images/emoji/google/chad.png
index 969e249fa0f..522d7b59a2f 100644
Binary files a/public/images/emoji/google/chad.png and b/public/images/emoji/google/chad.png differ
diff --git a/public/images/emoji/google/chains.png b/public/images/emoji/google/chains.png
index 21b9cba7ad5..b80ecc7991f 100644
Binary files a/public/images/emoji/google/chains.png and b/public/images/emoji/google/chains.png differ
diff --git a/public/images/emoji/google/champagne.png b/public/images/emoji/google/champagne.png
index ea9d7ec6bca..998f04124e2 100644
Binary files a/public/images/emoji/google/champagne.png and b/public/images/emoji/google/champagne.png differ
diff --git a/public/images/emoji/google/chart.png b/public/images/emoji/google/chart.png
index 63e45562f47..11cbf557d35 100644
Binary files a/public/images/emoji/google/chart.png and b/public/images/emoji/google/chart.png differ
diff --git a/public/images/emoji/google/chart_with_downwards_trend.png b/public/images/emoji/google/chart_with_downwards_trend.png
index b7b1f63b8af..b92c1479b87 100644
Binary files a/public/images/emoji/google/chart_with_downwards_trend.png and b/public/images/emoji/google/chart_with_downwards_trend.png differ
diff --git a/public/images/emoji/google/chart_with_upwards_trend.png b/public/images/emoji/google/chart_with_upwards_trend.png
index 61fe759b330..b1427d92b38 100644
Binary files a/public/images/emoji/google/chart_with_upwards_trend.png and b/public/images/emoji/google/chart_with_upwards_trend.png differ
diff --git a/public/images/emoji/google/checkered_flag.png b/public/images/emoji/google/checkered_flag.png
index f3bb7f449b9..15a07fcdb2e 100644
Binary files a/public/images/emoji/google/checkered_flag.png and b/public/images/emoji/google/checkered_flag.png differ
diff --git a/public/images/emoji/google/cheese.png b/public/images/emoji/google/cheese.png
index 383912db45e..4ec9446dd95 100644
Binary files a/public/images/emoji/google/cheese.png and b/public/images/emoji/google/cheese.png differ
diff --git a/public/images/emoji/google/cheese_wedge.png b/public/images/emoji/google/cheese_wedge.png
index 383912db45e..4ec9446dd95 100644
Binary files a/public/images/emoji/google/cheese_wedge.png and b/public/images/emoji/google/cheese_wedge.png differ
diff --git a/public/images/emoji/google/cherries.png b/public/images/emoji/google/cherries.png
index f73b77ea8ed..3e8eeeea52b 100644
Binary files a/public/images/emoji/google/cherries.png and b/public/images/emoji/google/cherries.png differ
diff --git a/public/images/emoji/google/cherry_blossom.png b/public/images/emoji/google/cherry_blossom.png
index f390147a2f5..14464430d39 100644
Binary files a/public/images/emoji/google/cherry_blossom.png and b/public/images/emoji/google/cherry_blossom.png differ
diff --git a/public/images/emoji/google/chestnut.png b/public/images/emoji/google/chestnut.png
index f6357e32208..18a18705b72 100644
Binary files a/public/images/emoji/google/chestnut.png and b/public/images/emoji/google/chestnut.png differ
diff --git a/public/images/emoji/google/chicken.png b/public/images/emoji/google/chicken.png
index 7afff72f1a1..4d38939cd6f 100644
Binary files a/public/images/emoji/google/chicken.png and b/public/images/emoji/google/chicken.png differ
diff --git a/public/images/emoji/google/child.png b/public/images/emoji/google/child.png
index 50c98992c4b..c3bfaaab092 100644
Binary files a/public/images/emoji/google/child.png and b/public/images/emoji/google/child.png differ
diff --git a/public/images/emoji/google/child/2.png b/public/images/emoji/google/child/2.png
index fcb4518f4c3..3c06b8edfd7 100644
Binary files a/public/images/emoji/google/child/2.png and b/public/images/emoji/google/child/2.png differ
diff --git a/public/images/emoji/google/child/3.png b/public/images/emoji/google/child/3.png
index 14d11ce1f02..8254c852c88 100644
Binary files a/public/images/emoji/google/child/3.png and b/public/images/emoji/google/child/3.png differ
diff --git a/public/images/emoji/google/child/4.png b/public/images/emoji/google/child/4.png
index 8e1f733e470..81fea678727 100644
Binary files a/public/images/emoji/google/child/4.png and b/public/images/emoji/google/child/4.png differ
diff --git a/public/images/emoji/google/child/5.png b/public/images/emoji/google/child/5.png
index bd7cf557ced..808be3a3859 100644
Binary files a/public/images/emoji/google/child/5.png and b/public/images/emoji/google/child/5.png differ
diff --git a/public/images/emoji/google/child/6.png b/public/images/emoji/google/child/6.png
index 9a20bf5feb5..4bb61f349f4 100644
Binary files a/public/images/emoji/google/child/6.png and b/public/images/emoji/google/child/6.png differ
diff --git a/public/images/emoji/google/children_crossing.png b/public/images/emoji/google/children_crossing.png
index 070212c0b32..773c93de5ab 100644
Binary files a/public/images/emoji/google/children_crossing.png and b/public/images/emoji/google/children_crossing.png differ
diff --git a/public/images/emoji/google/chile.png b/public/images/emoji/google/chile.png
index 26d789675a1..e35e328a2f5 100644
Binary files a/public/images/emoji/google/chile.png and b/public/images/emoji/google/chile.png differ
diff --git a/public/images/emoji/google/chipmunk.png b/public/images/emoji/google/chipmunk.png
index b1a971d38c8..cacd8b96061 100644
Binary files a/public/images/emoji/google/chipmunk.png and b/public/images/emoji/google/chipmunk.png differ
diff --git a/public/images/emoji/google/chocolate_bar.png b/public/images/emoji/google/chocolate_bar.png
index 71998f818e4..5e3313d8dbb 100644
Binary files a/public/images/emoji/google/chocolate_bar.png and b/public/images/emoji/google/chocolate_bar.png differ
diff --git a/public/images/emoji/google/chopsticks.png b/public/images/emoji/google/chopsticks.png
index 1f37514d5a4..75b7fb31381 100644
Binary files a/public/images/emoji/google/chopsticks.png and b/public/images/emoji/google/chopsticks.png differ
diff --git a/public/images/emoji/google/christmas_island.png b/public/images/emoji/google/christmas_island.png
index 48f139fdceb..9b48743ac69 100644
Binary files a/public/images/emoji/google/christmas_island.png and b/public/images/emoji/google/christmas_island.png differ
diff --git a/public/images/emoji/google/christmas_tree.png b/public/images/emoji/google/christmas_tree.png
index fdaa2f2f2a9..4f345005460 100644
Binary files a/public/images/emoji/google/christmas_tree.png and b/public/images/emoji/google/christmas_tree.png differ
diff --git a/public/images/emoji/google/church.png b/public/images/emoji/google/church.png
index 0efd95ee047..d1d186d7e96 100644
Binary files a/public/images/emoji/google/church.png and b/public/images/emoji/google/church.png differ
diff --git a/public/images/emoji/google/cinema.png b/public/images/emoji/google/cinema.png
index 615ec6150ba..5f0b648f951 100644
Binary files a/public/images/emoji/google/cinema.png and b/public/images/emoji/google/cinema.png differ
diff --git a/public/images/emoji/google/circus_tent.png b/public/images/emoji/google/circus_tent.png
index 4e49fd8ab7e..71f546a4caf 100644
Binary files a/public/images/emoji/google/circus_tent.png and b/public/images/emoji/google/circus_tent.png differ
diff --git a/public/images/emoji/google/city_dusk.png b/public/images/emoji/google/city_dusk.png
index a04bf365511..846f9e2ff4b 100644
Binary files a/public/images/emoji/google/city_dusk.png and b/public/images/emoji/google/city_dusk.png differ
diff --git a/public/images/emoji/google/city_sunrise.png b/public/images/emoji/google/city_sunrise.png
index 760a68ca829..94d6d5d5dc3 100644
Binary files a/public/images/emoji/google/city_sunrise.png and b/public/images/emoji/google/city_sunrise.png differ
diff --git a/public/images/emoji/google/city_sunset.png b/public/images/emoji/google/city_sunset.png
index a04bf365511..846f9e2ff4b 100644
Binary files a/public/images/emoji/google/city_sunset.png and b/public/images/emoji/google/city_sunset.png differ
diff --git a/public/images/emoji/google/cityscape.png b/public/images/emoji/google/cityscape.png
index 431e0bbffd9..eeb70dfd685 100644
Binary files a/public/images/emoji/google/cityscape.png and b/public/images/emoji/google/cityscape.png differ
diff --git a/public/images/emoji/google/cl.png b/public/images/emoji/google/cl.png
index 1368a85cd1c..5a9debdf288 100644
Binary files a/public/images/emoji/google/cl.png and b/public/images/emoji/google/cl.png differ
diff --git a/public/images/emoji/google/clamp.png b/public/images/emoji/google/clamp.png
index 245635724e4..b70ff095928 100644
Binary files a/public/images/emoji/google/clamp.png and b/public/images/emoji/google/clamp.png differ
diff --git a/public/images/emoji/google/clap.png b/public/images/emoji/google/clap.png
index 8270b96203d..4834ca7b4f5 100644
Binary files a/public/images/emoji/google/clap.png and b/public/images/emoji/google/clap.png differ
diff --git a/public/images/emoji/google/clap/2.png b/public/images/emoji/google/clap/2.png
index 7497ec0698d..5d20e2117d4 100644
Binary files a/public/images/emoji/google/clap/2.png and b/public/images/emoji/google/clap/2.png differ
diff --git a/public/images/emoji/google/clap/3.png b/public/images/emoji/google/clap/3.png
index 77229e9f2b8..7ebd8f7ffab 100644
Binary files a/public/images/emoji/google/clap/3.png and b/public/images/emoji/google/clap/3.png differ
diff --git a/public/images/emoji/google/clap/4.png b/public/images/emoji/google/clap/4.png
index 34365ff5487..1dc1e20c5b6 100644
Binary files a/public/images/emoji/google/clap/4.png and b/public/images/emoji/google/clap/4.png differ
diff --git a/public/images/emoji/google/clap/5.png b/public/images/emoji/google/clap/5.png
index 699baff1d63..b91203671a3 100644
Binary files a/public/images/emoji/google/clap/5.png and b/public/images/emoji/google/clap/5.png differ
diff --git a/public/images/emoji/google/clap/6.png b/public/images/emoji/google/clap/6.png
index 8015a4ffa6d..bfba44033eb 100644
Binary files a/public/images/emoji/google/clap/6.png and b/public/images/emoji/google/clap/6.png differ
diff --git a/public/images/emoji/google/clapper.png b/public/images/emoji/google/clapper.png
index 88272203106..8cef95f95f3 100644
Binary files a/public/images/emoji/google/clapper.png and b/public/images/emoji/google/clapper.png differ
diff --git a/public/images/emoji/google/classical_building.png b/public/images/emoji/google/classical_building.png
index b0a41c6c346..430c44a81c8 100644
Binary files a/public/images/emoji/google/classical_building.png and b/public/images/emoji/google/classical_building.png differ
diff --git a/public/images/emoji/google/clinking_glasses.png b/public/images/emoji/google/clinking_glasses.png
index e5a357035d2..3fabb8679f2 100644
Binary files a/public/images/emoji/google/clinking_glasses.png and b/public/images/emoji/google/clinking_glasses.png differ
diff --git a/public/images/emoji/google/clipboard.png b/public/images/emoji/google/clipboard.png
index 4b831ffb8b5..b146b4383bb 100644
Binary files a/public/images/emoji/google/clipboard.png and b/public/images/emoji/google/clipboard.png differ
diff --git a/public/images/emoji/google/clipperton_island.png b/public/images/emoji/google/clipperton_island.png
index bc63af1def5..b836e555dea 100644
Binary files a/public/images/emoji/google/clipperton_island.png and b/public/images/emoji/google/clipperton_island.png differ
diff --git a/public/images/emoji/google/clock.png b/public/images/emoji/google/clock.png
index b326630c04a..ae0fcb7c981 100644
Binary files a/public/images/emoji/google/clock.png and b/public/images/emoji/google/clock.png differ
diff --git a/public/images/emoji/google/clock1.png b/public/images/emoji/google/clock1.png
index ee992f671f3..b969d97237a 100644
Binary files a/public/images/emoji/google/clock1.png and b/public/images/emoji/google/clock1.png differ
diff --git a/public/images/emoji/google/clock10.png b/public/images/emoji/google/clock10.png
index 41ec385cf8f..0e3e8cc0987 100644
Binary files a/public/images/emoji/google/clock10.png and b/public/images/emoji/google/clock10.png differ
diff --git a/public/images/emoji/google/clock1030.png b/public/images/emoji/google/clock1030.png
index 19ca949e662..e4229a52d1b 100644
Binary files a/public/images/emoji/google/clock1030.png and b/public/images/emoji/google/clock1030.png differ
diff --git a/public/images/emoji/google/clock11.png b/public/images/emoji/google/clock11.png
index 43add251aae..1056075d741 100644
Binary files a/public/images/emoji/google/clock11.png and b/public/images/emoji/google/clock11.png differ
diff --git a/public/images/emoji/google/clock1130.png b/public/images/emoji/google/clock1130.png
index c28f78163cd..46b4f4b8dfc 100644
Binary files a/public/images/emoji/google/clock1130.png and b/public/images/emoji/google/clock1130.png differ
diff --git a/public/images/emoji/google/clock12.png b/public/images/emoji/google/clock12.png
index 63f46ae2a4c..5528c719bf4 100644
Binary files a/public/images/emoji/google/clock12.png and b/public/images/emoji/google/clock12.png differ
diff --git a/public/images/emoji/google/clock1230.png b/public/images/emoji/google/clock1230.png
index 23772963603..38e78462a51 100644
Binary files a/public/images/emoji/google/clock1230.png and b/public/images/emoji/google/clock1230.png differ
diff --git a/public/images/emoji/google/clock130.png b/public/images/emoji/google/clock130.png
index 677203adc49..9312f24f4e6 100644
Binary files a/public/images/emoji/google/clock130.png and b/public/images/emoji/google/clock130.png differ
diff --git a/public/images/emoji/google/clock2.png b/public/images/emoji/google/clock2.png
index eecb3ab9b5f..dd6f8e81bf7 100644
Binary files a/public/images/emoji/google/clock2.png and b/public/images/emoji/google/clock2.png differ
diff --git a/public/images/emoji/google/clock230.png b/public/images/emoji/google/clock230.png
index 1042202b561..13043c02fcf 100644
Binary files a/public/images/emoji/google/clock230.png and b/public/images/emoji/google/clock230.png differ
diff --git a/public/images/emoji/google/clock3.png b/public/images/emoji/google/clock3.png
index b7bc5fad42b..8518680fd98 100644
Binary files a/public/images/emoji/google/clock3.png and b/public/images/emoji/google/clock3.png differ
diff --git a/public/images/emoji/google/clock330.png b/public/images/emoji/google/clock330.png
index a03cc49d9b7..97074ef6803 100644
Binary files a/public/images/emoji/google/clock330.png and b/public/images/emoji/google/clock330.png differ
diff --git a/public/images/emoji/google/clock4.png b/public/images/emoji/google/clock4.png
index 9691167de8f..18ba2d702f7 100644
Binary files a/public/images/emoji/google/clock4.png and b/public/images/emoji/google/clock4.png differ
diff --git a/public/images/emoji/google/clock430.png b/public/images/emoji/google/clock430.png
index e3f45cb4709..6f88dab03aa 100644
Binary files a/public/images/emoji/google/clock430.png and b/public/images/emoji/google/clock430.png differ
diff --git a/public/images/emoji/google/clock5.png b/public/images/emoji/google/clock5.png
index 9915dc19a18..021346475eb 100644
Binary files a/public/images/emoji/google/clock5.png and b/public/images/emoji/google/clock5.png differ
diff --git a/public/images/emoji/google/clock530.png b/public/images/emoji/google/clock530.png
index 235ea8c4c37..577fd77c302 100644
Binary files a/public/images/emoji/google/clock530.png and b/public/images/emoji/google/clock530.png differ
diff --git a/public/images/emoji/google/clock6.png b/public/images/emoji/google/clock6.png
index e66f2b61912..dd2a20cae58 100644
Binary files a/public/images/emoji/google/clock6.png and b/public/images/emoji/google/clock6.png differ
diff --git a/public/images/emoji/google/clock630.png b/public/images/emoji/google/clock630.png
index 2f27e90a38c..0fe5b0a7464 100644
Binary files a/public/images/emoji/google/clock630.png and b/public/images/emoji/google/clock630.png differ
diff --git a/public/images/emoji/google/clock7.png b/public/images/emoji/google/clock7.png
index 709337d8f71..c2d3db29db5 100644
Binary files a/public/images/emoji/google/clock7.png and b/public/images/emoji/google/clock7.png differ
diff --git a/public/images/emoji/google/clock730.png b/public/images/emoji/google/clock730.png
index d625bebd2a4..918bda86c48 100644
Binary files a/public/images/emoji/google/clock730.png and b/public/images/emoji/google/clock730.png differ
diff --git a/public/images/emoji/google/clock8.png b/public/images/emoji/google/clock8.png
index dd9c9eae546..eb74217338b 100644
Binary files a/public/images/emoji/google/clock8.png and b/public/images/emoji/google/clock8.png differ
diff --git a/public/images/emoji/google/clock830.png b/public/images/emoji/google/clock830.png
index bc476488cd1..b2c8a9d9d76 100644
Binary files a/public/images/emoji/google/clock830.png and b/public/images/emoji/google/clock830.png differ
diff --git a/public/images/emoji/google/clock9.png b/public/images/emoji/google/clock9.png
index f582c8a3ccf..70deddca37e 100644
Binary files a/public/images/emoji/google/clock9.png and b/public/images/emoji/google/clock9.png differ
diff --git a/public/images/emoji/google/clock930.png b/public/images/emoji/google/clock930.png
index 36a3615e97f..cadf2f184e5 100644
Binary files a/public/images/emoji/google/clock930.png and b/public/images/emoji/google/clock930.png differ
diff --git a/public/images/emoji/google/closed_book.png b/public/images/emoji/google/closed_book.png
index 99d377f072c..7ba63b11282 100644
Binary files a/public/images/emoji/google/closed_book.png and b/public/images/emoji/google/closed_book.png differ
diff --git a/public/images/emoji/google/closed_lock_with_key.png b/public/images/emoji/google/closed_lock_with_key.png
index 8dba5354a84..d3c4cbefc90 100644
Binary files a/public/images/emoji/google/closed_lock_with_key.png and b/public/images/emoji/google/closed_lock_with_key.png differ
diff --git a/public/images/emoji/google/closed_umbrella.png b/public/images/emoji/google/closed_umbrella.png
index cdc2739a518..d62331eb2fb 100644
Binary files a/public/images/emoji/google/closed_umbrella.png and b/public/images/emoji/google/closed_umbrella.png differ
diff --git a/public/images/emoji/google/cloud.png b/public/images/emoji/google/cloud.png
index 31008df2a0a..cf348825c65 100644
Binary files a/public/images/emoji/google/cloud.png and b/public/images/emoji/google/cloud.png differ
diff --git a/public/images/emoji/google/cloud_lightning.png b/public/images/emoji/google/cloud_lightning.png
index 945a25d0661..0b7c9b0e4cd 100644
Binary files a/public/images/emoji/google/cloud_lightning.png and b/public/images/emoji/google/cloud_lightning.png differ
diff --git a/public/images/emoji/google/cloud_rain.png b/public/images/emoji/google/cloud_rain.png
index 2795a159175..736dc436593 100644
Binary files a/public/images/emoji/google/cloud_rain.png and b/public/images/emoji/google/cloud_rain.png differ
diff --git a/public/images/emoji/google/cloud_snow.png b/public/images/emoji/google/cloud_snow.png
index cdaf2830b50..c941135d9c9 100644
Binary files a/public/images/emoji/google/cloud_snow.png and b/public/images/emoji/google/cloud_snow.png differ
diff --git a/public/images/emoji/google/cloud_tornado.png b/public/images/emoji/google/cloud_tornado.png
index 7f488bc983f..b2e18065c1c 100644
Binary files a/public/images/emoji/google/cloud_tornado.png and b/public/images/emoji/google/cloud_tornado.png differ
diff --git a/public/images/emoji/google/cloud_with_lightning.png b/public/images/emoji/google/cloud_with_lightning.png
index 945a25d0661..0b7c9b0e4cd 100644
Binary files a/public/images/emoji/google/cloud_with_lightning.png and b/public/images/emoji/google/cloud_with_lightning.png differ
diff --git a/public/images/emoji/google/cloud_with_lightning_and_rain.png b/public/images/emoji/google/cloud_with_lightning_and_rain.png
index 5cb64e49e46..8cf3322c7d3 100644
Binary files a/public/images/emoji/google/cloud_with_lightning_and_rain.png and b/public/images/emoji/google/cloud_with_lightning_and_rain.png differ
diff --git a/public/images/emoji/google/cloud_with_rain.png b/public/images/emoji/google/cloud_with_rain.png
index 2795a159175..736dc436593 100644
Binary files a/public/images/emoji/google/cloud_with_rain.png and b/public/images/emoji/google/cloud_with_rain.png differ
diff --git a/public/images/emoji/google/cloud_with_snow.png b/public/images/emoji/google/cloud_with_snow.png
index cdaf2830b50..c941135d9c9 100644
Binary files a/public/images/emoji/google/cloud_with_snow.png and b/public/images/emoji/google/cloud_with_snow.png differ
diff --git a/public/images/emoji/google/cloud_with_tornado.png b/public/images/emoji/google/cloud_with_tornado.png
index 7f488bc983f..b2e18065c1c 100644
Binary files a/public/images/emoji/google/cloud_with_tornado.png and b/public/images/emoji/google/cloud_with_tornado.png differ
diff --git a/public/images/emoji/google/clown_face.png b/public/images/emoji/google/clown_face.png
index 0f3fdf1fccc..7bb43404b18 100644
Binary files a/public/images/emoji/google/clown_face.png and b/public/images/emoji/google/clown_face.png differ
diff --git a/public/images/emoji/google/clubs.png b/public/images/emoji/google/clubs.png
index 5a5b71f15d5..3be8fce7dac 100644
Binary files a/public/images/emoji/google/clubs.png and b/public/images/emoji/google/clubs.png differ
diff --git a/public/images/emoji/google/cn.png b/public/images/emoji/google/cn.png
index 010dddd1076..05a72fed32f 100644
Binary files a/public/images/emoji/google/cn.png and b/public/images/emoji/google/cn.png differ
diff --git a/public/images/emoji/google/coat.png b/public/images/emoji/google/coat.png
index f7726506705..661f213c45f 100644
Binary files a/public/images/emoji/google/coat.png and b/public/images/emoji/google/coat.png differ
diff --git a/public/images/emoji/google/cocktail.png b/public/images/emoji/google/cocktail.png
index 48c95fd64fa..b62109ebf3f 100644
Binary files a/public/images/emoji/google/cocktail.png and b/public/images/emoji/google/cocktail.png differ
diff --git a/public/images/emoji/google/coconut.png b/public/images/emoji/google/coconut.png
index 273946dcdd5..fcb9d4f13b5 100644
Binary files a/public/images/emoji/google/coconut.png and b/public/images/emoji/google/coconut.png differ
diff --git a/public/images/emoji/google/cocos_islands.png b/public/images/emoji/google/cocos_islands.png
index 040fe6aa8b8..a89d19e5155 100644
Binary files a/public/images/emoji/google/cocos_islands.png and b/public/images/emoji/google/cocos_islands.png differ
diff --git a/public/images/emoji/google/coffee.png b/public/images/emoji/google/coffee.png
index 06756dc5392..49ab8d26854 100644
Binary files a/public/images/emoji/google/coffee.png and b/public/images/emoji/google/coffee.png differ
diff --git a/public/images/emoji/google/coffin.png b/public/images/emoji/google/coffin.png
index ec867a66357..0a7e93cf875 100644
Binary files a/public/images/emoji/google/coffin.png and b/public/images/emoji/google/coffin.png differ
diff --git a/public/images/emoji/google/cold_sweat.png b/public/images/emoji/google/cold_sweat.png
index dc7c922d647..ea6ce856534 100644
Binary files a/public/images/emoji/google/cold_sweat.png and b/public/images/emoji/google/cold_sweat.png differ
diff --git a/public/images/emoji/google/colombia.png b/public/images/emoji/google/colombia.png
index e7c1d5e6601..34b679f6b08 100644
Binary files a/public/images/emoji/google/colombia.png and b/public/images/emoji/google/colombia.png differ
diff --git a/public/images/emoji/google/comet.png b/public/images/emoji/google/comet.png
index 5eb8e547503..a733737ca67 100644
Binary files a/public/images/emoji/google/comet.png and b/public/images/emoji/google/comet.png differ
diff --git a/public/images/emoji/google/comoros.png b/public/images/emoji/google/comoros.png
index 7f2ee7da428..5ba20ffe6a6 100644
Binary files a/public/images/emoji/google/comoros.png and b/public/images/emoji/google/comoros.png differ
diff --git a/public/images/emoji/google/compression.png b/public/images/emoji/google/compression.png
index 245635724e4..b70ff095928 100644
Binary files a/public/images/emoji/google/compression.png and b/public/images/emoji/google/compression.png differ
diff --git a/public/images/emoji/google/computer.png b/public/images/emoji/google/computer.png
index 9185ea466f0..cd6240d2043 100644
Binary files a/public/images/emoji/google/computer.png and b/public/images/emoji/google/computer.png differ
diff --git a/public/images/emoji/google/computer_mouse.png b/public/images/emoji/google/computer_mouse.png
index 606ada2ed4f..28785439fc2 100644
Binary files a/public/images/emoji/google/computer_mouse.png and b/public/images/emoji/google/computer_mouse.png differ
diff --git a/public/images/emoji/google/confetti_ball.png b/public/images/emoji/google/confetti_ball.png
index 301f662e21f..a5e8d180de7 100644
Binary files a/public/images/emoji/google/confetti_ball.png and b/public/images/emoji/google/confetti_ball.png differ
diff --git a/public/images/emoji/google/confounded.png b/public/images/emoji/google/confounded.png
index 05468a6f908..bcb5fe85453 100644
Binary files a/public/images/emoji/google/confounded.png and b/public/images/emoji/google/confounded.png differ
diff --git a/public/images/emoji/google/confused.png b/public/images/emoji/google/confused.png
index 10f68535024..d87de27196c 100644
Binary files a/public/images/emoji/google/confused.png and b/public/images/emoji/google/confused.png differ
diff --git a/public/images/emoji/google/congo_brazzaville.png b/public/images/emoji/google/congo_brazzaville.png
index 86ba2b7c534..2ee620fd1fd 100644
Binary files a/public/images/emoji/google/congo_brazzaville.png and b/public/images/emoji/google/congo_brazzaville.png differ
diff --git a/public/images/emoji/google/congo_kinshasa.png b/public/images/emoji/google/congo_kinshasa.png
index bc6103b9920..ad278a35a81 100644
Binary files a/public/images/emoji/google/congo_kinshasa.png and b/public/images/emoji/google/congo_kinshasa.png differ
diff --git a/public/images/emoji/google/congratulations.png b/public/images/emoji/google/congratulations.png
index bdf20971b09..8ec344c39fd 100644
Binary files a/public/images/emoji/google/congratulations.png and b/public/images/emoji/google/congratulations.png differ
diff --git a/public/images/emoji/google/construction.png b/public/images/emoji/google/construction.png
index 2410e41ffb4..879a85c1bf0 100644
Binary files a/public/images/emoji/google/construction.png and b/public/images/emoji/google/construction.png differ
diff --git a/public/images/emoji/google/construction_site.png b/public/images/emoji/google/construction_site.png
index 625247fd7c8..444e3cd1abf 100644
Binary files a/public/images/emoji/google/construction_site.png and b/public/images/emoji/google/construction_site.png differ
diff --git a/public/images/emoji/google/construction_worker.png b/public/images/emoji/google/construction_worker.png
index aadfbfd27fb..5b258a44083 100644
Binary files a/public/images/emoji/google/construction_worker.png and b/public/images/emoji/google/construction_worker.png differ
diff --git a/public/images/emoji/google/construction_worker/2.png b/public/images/emoji/google/construction_worker/2.png
index 72c777135a5..d6a3e5d691b 100644
Binary files a/public/images/emoji/google/construction_worker/2.png and b/public/images/emoji/google/construction_worker/2.png differ
diff --git a/public/images/emoji/google/construction_worker/3.png b/public/images/emoji/google/construction_worker/3.png
index 68b5d586a17..e5d3e980475 100644
Binary files a/public/images/emoji/google/construction_worker/3.png and b/public/images/emoji/google/construction_worker/3.png differ
diff --git a/public/images/emoji/google/construction_worker/4.png b/public/images/emoji/google/construction_worker/4.png
index e20b2d69ce6..7879c3c2f9b 100644
Binary files a/public/images/emoji/google/construction_worker/4.png and b/public/images/emoji/google/construction_worker/4.png differ
diff --git a/public/images/emoji/google/construction_worker/5.png b/public/images/emoji/google/construction_worker/5.png
index 256587ff5a4..13f64f14e72 100644
Binary files a/public/images/emoji/google/construction_worker/5.png and b/public/images/emoji/google/construction_worker/5.png differ
diff --git a/public/images/emoji/google/construction_worker/6.png b/public/images/emoji/google/construction_worker/6.png
index 2f4c5c40ab2..4a1287f9c51 100644
Binary files a/public/images/emoji/google/construction_worker/6.png and b/public/images/emoji/google/construction_worker/6.png differ
diff --git a/public/images/emoji/google/construction_worker_man.png b/public/images/emoji/google/construction_worker_man.png
index aadfbfd27fb..5b258a44083 100644
Binary files a/public/images/emoji/google/construction_worker_man.png and b/public/images/emoji/google/construction_worker_man.png differ
diff --git a/public/images/emoji/google/construction_worker_man/2.png b/public/images/emoji/google/construction_worker_man/2.png
index 72c777135a5..d6a3e5d691b 100644
Binary files a/public/images/emoji/google/construction_worker_man/2.png and b/public/images/emoji/google/construction_worker_man/2.png differ
diff --git a/public/images/emoji/google/construction_worker_man/3.png b/public/images/emoji/google/construction_worker_man/3.png
index 68b5d586a17..e5d3e980475 100644
Binary files a/public/images/emoji/google/construction_worker_man/3.png and b/public/images/emoji/google/construction_worker_man/3.png differ
diff --git a/public/images/emoji/google/construction_worker_man/4.png b/public/images/emoji/google/construction_worker_man/4.png
index e20b2d69ce6..7879c3c2f9b 100644
Binary files a/public/images/emoji/google/construction_worker_man/4.png and b/public/images/emoji/google/construction_worker_man/4.png differ
diff --git a/public/images/emoji/google/construction_worker_man/5.png b/public/images/emoji/google/construction_worker_man/5.png
index 256587ff5a4..13f64f14e72 100644
Binary files a/public/images/emoji/google/construction_worker_man/5.png and b/public/images/emoji/google/construction_worker_man/5.png differ
diff --git a/public/images/emoji/google/construction_worker_man/6.png b/public/images/emoji/google/construction_worker_man/6.png
index 2f4c5c40ab2..4a1287f9c51 100644
Binary files a/public/images/emoji/google/construction_worker_man/6.png and b/public/images/emoji/google/construction_worker_man/6.png differ
diff --git a/public/images/emoji/google/construction_worker_woman.png b/public/images/emoji/google/construction_worker_woman.png
index 3c8f4806a7f..854f6106beb 100644
Binary files a/public/images/emoji/google/construction_worker_woman.png and b/public/images/emoji/google/construction_worker_woman.png differ
diff --git a/public/images/emoji/google/construction_worker_woman/2.png b/public/images/emoji/google/construction_worker_woman/2.png
index cae3c67fd53..6e29153ce04 100644
Binary files a/public/images/emoji/google/construction_worker_woman/2.png and b/public/images/emoji/google/construction_worker_woman/2.png differ
diff --git a/public/images/emoji/google/construction_worker_woman/3.png b/public/images/emoji/google/construction_worker_woman/3.png
index 3dc7ae5dfcb..5607b249d55 100644
Binary files a/public/images/emoji/google/construction_worker_woman/3.png and b/public/images/emoji/google/construction_worker_woman/3.png differ
diff --git a/public/images/emoji/google/construction_worker_woman/4.png b/public/images/emoji/google/construction_worker_woman/4.png
index f20f783509b..ee676808b2a 100644
Binary files a/public/images/emoji/google/construction_worker_woman/4.png and b/public/images/emoji/google/construction_worker_woman/4.png differ
diff --git a/public/images/emoji/google/construction_worker_woman/5.png b/public/images/emoji/google/construction_worker_woman/5.png
index 7e9217adbc4..9b3b5fc25fa 100644
Binary files a/public/images/emoji/google/construction_worker_woman/5.png and b/public/images/emoji/google/construction_worker_woman/5.png differ
diff --git a/public/images/emoji/google/construction_worker_woman/6.png b/public/images/emoji/google/construction_worker_woman/6.png
index 1098adbc8bf..92c67a29e85 100644
Binary files a/public/images/emoji/google/construction_worker_woman/6.png and b/public/images/emoji/google/construction_worker_woman/6.png differ
diff --git a/public/images/emoji/google/control_knobs.png b/public/images/emoji/google/control_knobs.png
index ac664d80573..46c651d40da 100644
Binary files a/public/images/emoji/google/control_knobs.png and b/public/images/emoji/google/control_knobs.png differ
diff --git a/public/images/emoji/google/convenience_store.png b/public/images/emoji/google/convenience_store.png
index 5043fa66116..327f9635ce7 100644
Binary files a/public/images/emoji/google/convenience_store.png and b/public/images/emoji/google/convenience_store.png differ
diff --git a/public/images/emoji/google/cook_islands.png b/public/images/emoji/google/cook_islands.png
index fda8d2ba622..65c4c79bf24 100644
Binary files a/public/images/emoji/google/cook_islands.png and b/public/images/emoji/google/cook_islands.png differ
diff --git a/public/images/emoji/google/cookie.png b/public/images/emoji/google/cookie.png
index 8db73aa8f6c..486a52c7c43 100644
Binary files a/public/images/emoji/google/cookie.png and b/public/images/emoji/google/cookie.png differ
diff --git a/public/images/emoji/google/cool.png b/public/images/emoji/google/cool.png
index 7b61153634d..2601ef888a5 100644
Binary files a/public/images/emoji/google/cool.png and b/public/images/emoji/google/cool.png differ
diff --git a/public/images/emoji/google/cop.png b/public/images/emoji/google/cop.png
index c6e424f54a1..7cdf83e122b 100644
Binary files a/public/images/emoji/google/cop.png and b/public/images/emoji/google/cop.png differ
diff --git a/public/images/emoji/google/cop/2.png b/public/images/emoji/google/cop/2.png
index 74bc0da8f2c..12d64038104 100644
Binary files a/public/images/emoji/google/cop/2.png and b/public/images/emoji/google/cop/2.png differ
diff --git a/public/images/emoji/google/cop/3.png b/public/images/emoji/google/cop/3.png
index d461370fdbf..119290b976e 100644
Binary files a/public/images/emoji/google/cop/3.png and b/public/images/emoji/google/cop/3.png differ
diff --git a/public/images/emoji/google/cop/4.png b/public/images/emoji/google/cop/4.png
index 12d654b4e5e..49d3df03398 100644
Binary files a/public/images/emoji/google/cop/4.png and b/public/images/emoji/google/cop/4.png differ
diff --git a/public/images/emoji/google/cop/5.png b/public/images/emoji/google/cop/5.png
index d555c18f792..7e961289d27 100644
Binary files a/public/images/emoji/google/cop/5.png and b/public/images/emoji/google/cop/5.png differ
diff --git a/public/images/emoji/google/cop/6.png b/public/images/emoji/google/cop/6.png
index 0542d87a6a2..8e59e6654e4 100644
Binary files a/public/images/emoji/google/cop/6.png and b/public/images/emoji/google/cop/6.png differ
diff --git a/public/images/emoji/google/copyright.png b/public/images/emoji/google/copyright.png
index 220384e7ca5..3ea187513da 100644
Binary files a/public/images/emoji/google/copyright.png and b/public/images/emoji/google/copyright.png differ
diff --git a/public/images/emoji/google/corn.png b/public/images/emoji/google/corn.png
index d608093dcaa..86acf71da5b 100644
Binary files a/public/images/emoji/google/corn.png and b/public/images/emoji/google/corn.png differ
diff --git a/public/images/emoji/google/costa_rica.png b/public/images/emoji/google/costa_rica.png
index 57d6736bf1c..d8602d36dc2 100644
Binary files a/public/images/emoji/google/costa_rica.png and b/public/images/emoji/google/costa_rica.png differ
diff --git a/public/images/emoji/google/cote_divoire.png b/public/images/emoji/google/cote_divoire.png
index 44cd3a3842d..76dfead63ef 100644
Binary files a/public/images/emoji/google/cote_divoire.png and b/public/images/emoji/google/cote_divoire.png differ
diff --git a/public/images/emoji/google/couch.png b/public/images/emoji/google/couch.png
index 3e22d05afad..3d13dbc4e73 100644
Binary files a/public/images/emoji/google/couch.png and b/public/images/emoji/google/couch.png differ
diff --git a/public/images/emoji/google/couch_and_lamp.png b/public/images/emoji/google/couch_and_lamp.png
index 3e22d05afad..3d13dbc4e73 100644
Binary files a/public/images/emoji/google/couch_and_lamp.png and b/public/images/emoji/google/couch_and_lamp.png differ
diff --git a/public/images/emoji/google/couple.png b/public/images/emoji/google/couple.png
index e4faa7aca49..cb562811b28 100644
Binary files a/public/images/emoji/google/couple.png and b/public/images/emoji/google/couple.png differ
diff --git a/public/images/emoji/google/couple_with_heart.png b/public/images/emoji/google/couple_with_heart.png
index 8964580850c..d201b1a7840 100644
Binary files a/public/images/emoji/google/couple_with_heart.png and b/public/images/emoji/google/couple_with_heart.png differ
diff --git a/public/images/emoji/google/couple_with_heart_man_man.png b/public/images/emoji/google/couple_with_heart_man_man.png
index 8c30736f98d..edfa25c9a0c 100644
Binary files a/public/images/emoji/google/couple_with_heart_man_man.png and b/public/images/emoji/google/couple_with_heart_man_man.png differ
diff --git a/public/images/emoji/google/couple_with_heart_woman_man.png b/public/images/emoji/google/couple_with_heart_woman_man.png
index 8964580850c..d201b1a7840 100644
Binary files a/public/images/emoji/google/couple_with_heart_woman_man.png and b/public/images/emoji/google/couple_with_heart_woman_man.png differ
diff --git a/public/images/emoji/google/couple_with_heart_woman_woman.png b/public/images/emoji/google/couple_with_heart_woman_woman.png
index 8eda1e8d848..f4b433aa950 100644
Binary files a/public/images/emoji/google/couple_with_heart_woman_woman.png and b/public/images/emoji/google/couple_with_heart_woman_woman.png differ
diff --git a/public/images/emoji/google/couplekiss.png b/public/images/emoji/google/couplekiss.png
index 0b0adb59f65..eb5249499a0 100644
Binary files a/public/images/emoji/google/couplekiss.png and b/public/images/emoji/google/couplekiss.png differ
diff --git a/public/images/emoji/google/couplekiss_man_man.png b/public/images/emoji/google/couplekiss_man_man.png
index 60aff93dd76..231fc8e523c 100644
Binary files a/public/images/emoji/google/couplekiss_man_man.png and b/public/images/emoji/google/couplekiss_man_man.png differ
diff --git a/public/images/emoji/google/couplekiss_man_woman.png b/public/images/emoji/google/couplekiss_man_woman.png
index 0b0adb59f65..eb5249499a0 100644
Binary files a/public/images/emoji/google/couplekiss_man_woman.png and b/public/images/emoji/google/couplekiss_man_woman.png differ
diff --git a/public/images/emoji/google/couplekiss_woman_woman.png b/public/images/emoji/google/couplekiss_woman_woman.png
index 7cd2d2ebdd7..0e516e93768 100644
Binary files a/public/images/emoji/google/couplekiss_woman_woman.png and b/public/images/emoji/google/couplekiss_woman_woman.png differ
diff --git a/public/images/emoji/google/cow.png b/public/images/emoji/google/cow.png
index 5cfba503983..3b0ed308f1c 100644
Binary files a/public/images/emoji/google/cow.png and b/public/images/emoji/google/cow.png differ
diff --git a/public/images/emoji/google/cow2.png b/public/images/emoji/google/cow2.png
index 0253a702630..443b2109000 100644
Binary files a/public/images/emoji/google/cow2.png and b/public/images/emoji/google/cow2.png differ
diff --git a/public/images/emoji/google/cowboy_hat_face.png b/public/images/emoji/google/cowboy_hat_face.png
index 40f43ca47c5..69a4bf6684c 100644
Binary files a/public/images/emoji/google/cowboy_hat_face.png and b/public/images/emoji/google/cowboy_hat_face.png differ
diff --git a/public/images/emoji/google/crab.png b/public/images/emoji/google/crab.png
index 3385c068feb..ba5e08c3bf4 100644
Binary files a/public/images/emoji/google/crab.png and b/public/images/emoji/google/crab.png differ
diff --git a/public/images/emoji/google/crayon.png b/public/images/emoji/google/crayon.png
index e82c0d2d5e6..bec3b705731 100644
Binary files a/public/images/emoji/google/crayon.png and b/public/images/emoji/google/crayon.png differ
diff --git a/public/images/emoji/google/crazy_face.png b/public/images/emoji/google/crazy_face.png
index bdd2c62740d..8637fa7bf48 100644
Binary files a/public/images/emoji/google/crazy_face.png and b/public/images/emoji/google/crazy_face.png differ
diff --git a/public/images/emoji/google/credit_card.png b/public/images/emoji/google/credit_card.png
index ba1d605923f..37ba1069d27 100644
Binary files a/public/images/emoji/google/credit_card.png and b/public/images/emoji/google/credit_card.png differ
diff --git a/public/images/emoji/google/crescent_moon.png b/public/images/emoji/google/crescent_moon.png
index dd893e982f7..50e2bdb4a51 100644
Binary files a/public/images/emoji/google/crescent_moon.png and b/public/images/emoji/google/crescent_moon.png differ
diff --git a/public/images/emoji/google/cricket.png b/public/images/emoji/google/cricket.png
index 46b39fae4a7..fc747258e89 100644
Binary files a/public/images/emoji/google/cricket.png and b/public/images/emoji/google/cricket.png differ
diff --git a/public/images/emoji/google/cricket_bat_and_ball.png b/public/images/emoji/google/cricket_bat_and_ball.png
index 98bac43e6c1..d5309a36267 100644
Binary files a/public/images/emoji/google/cricket_bat_and_ball.png and b/public/images/emoji/google/cricket_bat_and_ball.png differ
diff --git a/public/images/emoji/google/cricket_bat_ball.png b/public/images/emoji/google/cricket_bat_ball.png
index 98bac43e6c1..d5309a36267 100644
Binary files a/public/images/emoji/google/cricket_bat_ball.png and b/public/images/emoji/google/cricket_bat_ball.png differ
diff --git a/public/images/emoji/google/croatia.png b/public/images/emoji/google/croatia.png
index 3dff9861d01..744eb40abab 100644
Binary files a/public/images/emoji/google/croatia.png and b/public/images/emoji/google/croatia.png differ
diff --git a/public/images/emoji/google/crocodile.png b/public/images/emoji/google/crocodile.png
index 1269841e366..c8363736bab 100644
Binary files a/public/images/emoji/google/crocodile.png and b/public/images/emoji/google/crocodile.png differ
diff --git a/public/images/emoji/google/croissant.png b/public/images/emoji/google/croissant.png
index 879284fcb08..48be4a4c35e 100644
Binary files a/public/images/emoji/google/croissant.png and b/public/images/emoji/google/croissant.png differ
diff --git a/public/images/emoji/google/cross.png b/public/images/emoji/google/cross.png
index 0a367b0233e..f0608264bb6 100644
Binary files a/public/images/emoji/google/cross.png and b/public/images/emoji/google/cross.png differ
diff --git a/public/images/emoji/google/crossed_fingers.png b/public/images/emoji/google/crossed_fingers.png
index cae9b3d41c7..6fd03b7dcfa 100644
Binary files a/public/images/emoji/google/crossed_fingers.png and b/public/images/emoji/google/crossed_fingers.png differ
diff --git a/public/images/emoji/google/crossed_fingers/2.png b/public/images/emoji/google/crossed_fingers/2.png
index 0ebff8d5b47..824f3acf9ed 100644
Binary files a/public/images/emoji/google/crossed_fingers/2.png and b/public/images/emoji/google/crossed_fingers/2.png differ
diff --git a/public/images/emoji/google/crossed_fingers/3.png b/public/images/emoji/google/crossed_fingers/3.png
index 122c1d7ca1f..e5e0112fdfa 100644
Binary files a/public/images/emoji/google/crossed_fingers/3.png and b/public/images/emoji/google/crossed_fingers/3.png differ
diff --git a/public/images/emoji/google/crossed_fingers/4.png b/public/images/emoji/google/crossed_fingers/4.png
index dd5c35e1785..10a4126fa9d 100644
Binary files a/public/images/emoji/google/crossed_fingers/4.png and b/public/images/emoji/google/crossed_fingers/4.png differ
diff --git a/public/images/emoji/google/crossed_fingers/5.png b/public/images/emoji/google/crossed_fingers/5.png
index 3371fbf4134..675c367ad90 100644
Binary files a/public/images/emoji/google/crossed_fingers/5.png and b/public/images/emoji/google/crossed_fingers/5.png differ
diff --git a/public/images/emoji/google/crossed_fingers/6.png b/public/images/emoji/google/crossed_fingers/6.png
index c22fcea63df..36edbcc63b4 100644
Binary files a/public/images/emoji/google/crossed_fingers/6.png and b/public/images/emoji/google/crossed_fingers/6.png differ
diff --git a/public/images/emoji/google/crossed_flags.png b/public/images/emoji/google/crossed_flags.png
index 852ba9a702e..a73fd11f40e 100644
Binary files a/public/images/emoji/google/crossed_flags.png and b/public/images/emoji/google/crossed_flags.png differ
diff --git a/public/images/emoji/google/crossed_swords.png b/public/images/emoji/google/crossed_swords.png
index aa8ef85a770..ce64a831085 100644
Binary files a/public/images/emoji/google/crossed_swords.png and b/public/images/emoji/google/crossed_swords.png differ
diff --git a/public/images/emoji/google/crown.png b/public/images/emoji/google/crown.png
index 1c9d776e822..8b8fc97136b 100644
Binary files a/public/images/emoji/google/crown.png and b/public/images/emoji/google/crown.png differ
diff --git a/public/images/emoji/google/cruise_ship.png b/public/images/emoji/google/cruise_ship.png
index 5ffa1e17dcd..be03fc1343b 100644
Binary files a/public/images/emoji/google/cruise_ship.png and b/public/images/emoji/google/cruise_ship.png differ
diff --git a/public/images/emoji/google/cry.png b/public/images/emoji/google/cry.png
index 0e9daa41ef5..793dc9c1c93 100644
Binary files a/public/images/emoji/google/cry.png and b/public/images/emoji/google/cry.png differ
diff --git a/public/images/emoji/google/crying_cat_face.png b/public/images/emoji/google/crying_cat_face.png
index 9bf1a397aff..e79e6ab2f4f 100644
Binary files a/public/images/emoji/google/crying_cat_face.png and b/public/images/emoji/google/crying_cat_face.png differ
diff --git a/public/images/emoji/google/crystal_ball.png b/public/images/emoji/google/crystal_ball.png
index e27b2c5c8d2..af498548844 100644
Binary files a/public/images/emoji/google/crystal_ball.png and b/public/images/emoji/google/crystal_ball.png differ
diff --git a/public/images/emoji/google/cuba.png b/public/images/emoji/google/cuba.png
index feae50ff4b2..0167f57462d 100644
Binary files a/public/images/emoji/google/cuba.png and b/public/images/emoji/google/cuba.png differ
diff --git a/public/images/emoji/google/cucumber.png b/public/images/emoji/google/cucumber.png
index 28bb40fe291..959ee6e3a7c 100644
Binary files a/public/images/emoji/google/cucumber.png and b/public/images/emoji/google/cucumber.png differ
diff --git a/public/images/emoji/google/cup_with_straw.png b/public/images/emoji/google/cup_with_straw.png
index cb421be671e..5ee2beb2abd 100644
Binary files a/public/images/emoji/google/cup_with_straw.png and b/public/images/emoji/google/cup_with_straw.png differ
diff --git a/public/images/emoji/google/cupid.png b/public/images/emoji/google/cupid.png
index 6e26e46afd3..f5652e31c00 100644
Binary files a/public/images/emoji/google/cupid.png and b/public/images/emoji/google/cupid.png differ
diff --git a/public/images/emoji/google/curacao.png b/public/images/emoji/google/curacao.png
index 6853a1c99fc..7fbc2eda4ea 100644
Binary files a/public/images/emoji/google/curacao.png and b/public/images/emoji/google/curacao.png differ
diff --git a/public/images/emoji/google/curling_stone.png b/public/images/emoji/google/curling_stone.png
index 99dace03469..2403ad66993 100644
Binary files a/public/images/emoji/google/curling_stone.png and b/public/images/emoji/google/curling_stone.png differ
diff --git a/public/images/emoji/google/curly_loop.png b/public/images/emoji/google/curly_loop.png
index 860b72bf406..5e5f2c88c16 100644
Binary files a/public/images/emoji/google/curly_loop.png and b/public/images/emoji/google/curly_loop.png differ
diff --git a/public/images/emoji/google/currency_exchange.png b/public/images/emoji/google/currency_exchange.png
index 55b41fd570a..adeb33caa78 100644
Binary files a/public/images/emoji/google/currency_exchange.png and b/public/images/emoji/google/currency_exchange.png differ
diff --git a/public/images/emoji/google/curry.png b/public/images/emoji/google/curry.png
index 2d1f9270533..02d76bbf846 100644
Binary files a/public/images/emoji/google/curry.png and b/public/images/emoji/google/curry.png differ
diff --git a/public/images/emoji/google/custard.png b/public/images/emoji/google/custard.png
index 6373ce2a546..8d9ab7e81ea 100644
Binary files a/public/images/emoji/google/custard.png and b/public/images/emoji/google/custard.png differ
diff --git a/public/images/emoji/google/customs.png b/public/images/emoji/google/customs.png
index 58801f20462..90af5690faa 100644
Binary files a/public/images/emoji/google/customs.png and b/public/images/emoji/google/customs.png differ
diff --git a/public/images/emoji/google/cut_of_meat.png b/public/images/emoji/google/cut_of_meat.png
index f801d2c4803..c224fe3616c 100644
Binary files a/public/images/emoji/google/cut_of_meat.png and b/public/images/emoji/google/cut_of_meat.png differ
diff --git a/public/images/emoji/google/cyclone.png b/public/images/emoji/google/cyclone.png
index e172a92653f..cd30e745365 100644
Binary files a/public/images/emoji/google/cyclone.png and b/public/images/emoji/google/cyclone.png differ
diff --git a/public/images/emoji/google/cyprus.png b/public/images/emoji/google/cyprus.png
index e063ccf4dfb..0111d9915cb 100644
Binary files a/public/images/emoji/google/cyprus.png and b/public/images/emoji/google/cyprus.png differ
diff --git a/public/images/emoji/google/czech_republic.png b/public/images/emoji/google/czech_republic.png
index c9b0edb988f..84be3832e76 100644
Binary files a/public/images/emoji/google/czech_republic.png and b/public/images/emoji/google/czech_republic.png differ
diff --git a/public/images/emoji/google/dagger.png b/public/images/emoji/google/dagger.png
index 8e191507791..64e94594cfa 100644
Binary files a/public/images/emoji/google/dagger.png and b/public/images/emoji/google/dagger.png differ
diff --git a/public/images/emoji/google/dagger_knife.png b/public/images/emoji/google/dagger_knife.png
index 8e191507791..64e94594cfa 100644
Binary files a/public/images/emoji/google/dagger_knife.png and b/public/images/emoji/google/dagger_knife.png differ
diff --git a/public/images/emoji/google/dancer.png b/public/images/emoji/google/dancer.png
index 415741ec13f..243ede417d0 100644
Binary files a/public/images/emoji/google/dancer.png and b/public/images/emoji/google/dancer.png differ
diff --git a/public/images/emoji/google/dancer/2.png b/public/images/emoji/google/dancer/2.png
index 74d9350f386..f0973ccb977 100644
Binary files a/public/images/emoji/google/dancer/2.png and b/public/images/emoji/google/dancer/2.png differ
diff --git a/public/images/emoji/google/dancer/3.png b/public/images/emoji/google/dancer/3.png
index 5d1b9b2e84c..b14009fe349 100644
Binary files a/public/images/emoji/google/dancer/3.png and b/public/images/emoji/google/dancer/3.png differ
diff --git a/public/images/emoji/google/dancer/4.png b/public/images/emoji/google/dancer/4.png
index e34f3fd12fc..0ab4b166b92 100644
Binary files a/public/images/emoji/google/dancer/4.png and b/public/images/emoji/google/dancer/4.png differ
diff --git a/public/images/emoji/google/dancer/5.png b/public/images/emoji/google/dancer/5.png
index 7bceb0c9c62..df38959f004 100644
Binary files a/public/images/emoji/google/dancer/5.png and b/public/images/emoji/google/dancer/5.png differ
diff --git a/public/images/emoji/google/dancer/6.png b/public/images/emoji/google/dancer/6.png
index 6483f6966c7..5cd0842d70b 100644
Binary files a/public/images/emoji/google/dancer/6.png and b/public/images/emoji/google/dancer/6.png differ
diff --git a/public/images/emoji/google/dancers.png b/public/images/emoji/google/dancers.png
index 30018f29ed9..7f6e7c3747e 100644
Binary files a/public/images/emoji/google/dancers.png and b/public/images/emoji/google/dancers.png differ
diff --git a/public/images/emoji/google/dancing_men.png b/public/images/emoji/google/dancing_men.png
index 879d26a98dd..fc5f8d1ec5d 100644
Binary files a/public/images/emoji/google/dancing_men.png and b/public/images/emoji/google/dancing_men.png differ
diff --git a/public/images/emoji/google/dancing_women.png b/public/images/emoji/google/dancing_women.png
index 30018f29ed9..7f6e7c3747e 100644
Binary files a/public/images/emoji/google/dancing_women.png and b/public/images/emoji/google/dancing_women.png differ
diff --git a/public/images/emoji/google/dango.png b/public/images/emoji/google/dango.png
index a9e27e8991b..e53b08a7eb2 100644
Binary files a/public/images/emoji/google/dango.png and b/public/images/emoji/google/dango.png differ
diff --git a/public/images/emoji/google/dark_sunglasses.png b/public/images/emoji/google/dark_sunglasses.png
index 34866a4a060..c808bd9c1f0 100644
Binary files a/public/images/emoji/google/dark_sunglasses.png and b/public/images/emoji/google/dark_sunglasses.png differ
diff --git a/public/images/emoji/google/dart.png b/public/images/emoji/google/dart.png
index 4748ca6846b..e001162b8ac 100644
Binary files a/public/images/emoji/google/dart.png and b/public/images/emoji/google/dart.png differ
diff --git a/public/images/emoji/google/dash.png b/public/images/emoji/google/dash.png
index 53fb9f18322..ae2834b322b 100644
Binary files a/public/images/emoji/google/dash.png and b/public/images/emoji/google/dash.png differ
diff --git a/public/images/emoji/google/date.png b/public/images/emoji/google/date.png
index 91125e15b7c..6318265bb9d 100644
Binary files a/public/images/emoji/google/date.png and b/public/images/emoji/google/date.png differ
diff --git a/public/images/emoji/google/de.png b/public/images/emoji/google/de.png
index e18953b9bee..5110b322d19 100644
Binary files a/public/images/emoji/google/de.png and b/public/images/emoji/google/de.png differ
diff --git a/public/images/emoji/google/deciduous_tree.png b/public/images/emoji/google/deciduous_tree.png
index 7ef80df7802..33c2ff94ef3 100644
Binary files a/public/images/emoji/google/deciduous_tree.png and b/public/images/emoji/google/deciduous_tree.png differ
diff --git a/public/images/emoji/google/deer.png b/public/images/emoji/google/deer.png
index 72ce4475935..1b957d53e96 100644
Binary files a/public/images/emoji/google/deer.png and b/public/images/emoji/google/deer.png differ
diff --git a/public/images/emoji/google/denmark.png b/public/images/emoji/google/denmark.png
index c56dcdfb177..936d7cbb878 100644
Binary files a/public/images/emoji/google/denmark.png and b/public/images/emoji/google/denmark.png differ
diff --git a/public/images/emoji/google/department_store.png b/public/images/emoji/google/department_store.png
index ebb3b4f1131..f92d750cea8 100644
Binary files a/public/images/emoji/google/department_store.png and b/public/images/emoji/google/department_store.png differ
diff --git a/public/images/emoji/google/derelict_house.png b/public/images/emoji/google/derelict_house.png
index 5a4faead956..7b14c6c6cdf 100644
Binary files a/public/images/emoji/google/derelict_house.png and b/public/images/emoji/google/derelict_house.png differ
diff --git a/public/images/emoji/google/derelict_house_building.png b/public/images/emoji/google/derelict_house_building.png
index 5a4faead956..7b14c6c6cdf 100644
Binary files a/public/images/emoji/google/derelict_house_building.png and b/public/images/emoji/google/derelict_house_building.png differ
diff --git a/public/images/emoji/google/desert.png b/public/images/emoji/google/desert.png
index 10cb404801a..410b28f0a7f 100644
Binary files a/public/images/emoji/google/desert.png and b/public/images/emoji/google/desert.png differ
diff --git a/public/images/emoji/google/desert_island.png b/public/images/emoji/google/desert_island.png
index 30ee864648a..e68a3fe14f4 100644
Binary files a/public/images/emoji/google/desert_island.png and b/public/images/emoji/google/desert_island.png differ
diff --git a/public/images/emoji/google/desktop.png b/public/images/emoji/google/desktop.png
index d967edd0e7b..8345b9fd6fe 100644
Binary files a/public/images/emoji/google/desktop.png and b/public/images/emoji/google/desktop.png differ
diff --git a/public/images/emoji/google/desktop_computer.png b/public/images/emoji/google/desktop_computer.png
index d967edd0e7b..8345b9fd6fe 100644
Binary files a/public/images/emoji/google/desktop_computer.png and b/public/images/emoji/google/desktop_computer.png differ
diff --git a/public/images/emoji/google/diamond_shape_with_a_dot_inside.png b/public/images/emoji/google/diamond_shape_with_a_dot_inside.png
index aeda139b224..f9c79355cea 100644
Binary files a/public/images/emoji/google/diamond_shape_with_a_dot_inside.png and b/public/images/emoji/google/diamond_shape_with_a_dot_inside.png differ
diff --git a/public/images/emoji/google/diamonds.png b/public/images/emoji/google/diamonds.png
index 13d047c0fe8..055e6b8c9b8 100644
Binary files a/public/images/emoji/google/diamonds.png and b/public/images/emoji/google/diamonds.png differ
diff --git a/public/images/emoji/google/diego_garcia.png b/public/images/emoji/google/diego_garcia.png
index dad0f8ce650..4faf7e252ef 100644
Binary files a/public/images/emoji/google/diego_garcia.png and b/public/images/emoji/google/diego_garcia.png differ
diff --git a/public/images/emoji/google/disappointed.png b/public/images/emoji/google/disappointed.png
index f7e0e453e8a..4c532a6af40 100644
Binary files a/public/images/emoji/google/disappointed.png and b/public/images/emoji/google/disappointed.png differ
diff --git a/public/images/emoji/google/disappointed_relieved.png b/public/images/emoji/google/disappointed_relieved.png
index 70d7736cd4a..c867494906e 100644
Binary files a/public/images/emoji/google/disappointed_relieved.png and b/public/images/emoji/google/disappointed_relieved.png differ
diff --git a/public/images/emoji/google/dividers.png b/public/images/emoji/google/dividers.png
index dd8929d64ac..b07bdc1135c 100644
Binary files a/public/images/emoji/google/dividers.png and b/public/images/emoji/google/dividers.png differ
diff --git a/public/images/emoji/google/dizzy.png b/public/images/emoji/google/dizzy.png
index 6792b1f955f..bc4b31029ad 100644
Binary files a/public/images/emoji/google/dizzy.png and b/public/images/emoji/google/dizzy.png differ
diff --git a/public/images/emoji/google/dizzy_face.png b/public/images/emoji/google/dizzy_face.png
index eccac861a83..2956cb9e23c 100644
Binary files a/public/images/emoji/google/dizzy_face.png and b/public/images/emoji/google/dizzy_face.png differ
diff --git a/public/images/emoji/google/djibouti.png b/public/images/emoji/google/djibouti.png
index 7bc474b64de..18f4c83cff2 100644
Binary files a/public/images/emoji/google/djibouti.png and b/public/images/emoji/google/djibouti.png differ
diff --git a/public/images/emoji/google/do_not_litter.png b/public/images/emoji/google/do_not_litter.png
index 8aab5b26dc3..64e22aa45af 100644
Binary files a/public/images/emoji/google/do_not_litter.png and b/public/images/emoji/google/do_not_litter.png differ
diff --git a/public/images/emoji/google/dog.png b/public/images/emoji/google/dog.png
index 76429a4bdb1..10d887f5ecc 100644
Binary files a/public/images/emoji/google/dog.png and b/public/images/emoji/google/dog.png differ
diff --git a/public/images/emoji/google/dog2.png b/public/images/emoji/google/dog2.png
index 6b987ceb724..4ae8781a8b3 100644
Binary files a/public/images/emoji/google/dog2.png and b/public/images/emoji/google/dog2.png differ
diff --git a/public/images/emoji/google/dollar.png b/public/images/emoji/google/dollar.png
index b85051719ca..cd2a5892d45 100644
Binary files a/public/images/emoji/google/dollar.png and b/public/images/emoji/google/dollar.png differ
diff --git a/public/images/emoji/google/dolls.png b/public/images/emoji/google/dolls.png
index b92315527ef..1462ab55582 100644
Binary files a/public/images/emoji/google/dolls.png and b/public/images/emoji/google/dolls.png differ
diff --git a/public/images/emoji/google/dolphin.png b/public/images/emoji/google/dolphin.png
index e768e4031c0..6a4db6a8b34 100644
Binary files a/public/images/emoji/google/dolphin.png and b/public/images/emoji/google/dolphin.png differ
diff --git a/public/images/emoji/google/dominica.png b/public/images/emoji/google/dominica.png
index b9a27a68469..857e5d3db0f 100644
Binary files a/public/images/emoji/google/dominica.png and b/public/images/emoji/google/dominica.png differ
diff --git a/public/images/emoji/google/dominican_republic.png b/public/images/emoji/google/dominican_republic.png
index 19dd042bb6e..ab8c9c25704 100644
Binary files a/public/images/emoji/google/dominican_republic.png and b/public/images/emoji/google/dominican_republic.png differ
diff --git a/public/images/emoji/google/door.png b/public/images/emoji/google/door.png
index 71ad017a2a8..9cd796acf38 100644
Binary files a/public/images/emoji/google/door.png and b/public/images/emoji/google/door.png differ
diff --git a/public/images/emoji/google/double_vertical_bar.png b/public/images/emoji/google/double_vertical_bar.png
index 31613a93208..6e0b69634e2 100644
Binary files a/public/images/emoji/google/double_vertical_bar.png and b/public/images/emoji/google/double_vertical_bar.png differ
diff --git a/public/images/emoji/google/doughnut.png b/public/images/emoji/google/doughnut.png
index ff13ae964db..9e5d43ee745 100644
Binary files a/public/images/emoji/google/doughnut.png and b/public/images/emoji/google/doughnut.png differ
diff --git a/public/images/emoji/google/dove.png b/public/images/emoji/google/dove.png
index 985b5454939..60bc1f9e9ae 100644
Binary files a/public/images/emoji/google/dove.png and b/public/images/emoji/google/dove.png differ
diff --git a/public/images/emoji/google/dove_of_peace.png b/public/images/emoji/google/dove_of_peace.png
index 985b5454939..60bc1f9e9ae 100644
Binary files a/public/images/emoji/google/dove_of_peace.png and b/public/images/emoji/google/dove_of_peace.png differ
diff --git a/public/images/emoji/google/dragon.png b/public/images/emoji/google/dragon.png
index ec1ae432331..618bbf15994 100644
Binary files a/public/images/emoji/google/dragon.png and b/public/images/emoji/google/dragon.png differ
diff --git a/public/images/emoji/google/dragon_face.png b/public/images/emoji/google/dragon_face.png
index a22bf81f9a6..b256dc53114 100644
Binary files a/public/images/emoji/google/dragon_face.png and b/public/images/emoji/google/dragon_face.png differ
diff --git a/public/images/emoji/google/dress.png b/public/images/emoji/google/dress.png
index fade5244a6e..981f76bbe5a 100644
Binary files a/public/images/emoji/google/dress.png and b/public/images/emoji/google/dress.png differ
diff --git a/public/images/emoji/google/dromedary_camel.png b/public/images/emoji/google/dromedary_camel.png
index 4a107228007..ca3eb91d09b 100644
Binary files a/public/images/emoji/google/dromedary_camel.png and b/public/images/emoji/google/dromedary_camel.png differ
diff --git a/public/images/emoji/google/drooling_face.png b/public/images/emoji/google/drooling_face.png
index ea720c91253..9659d5c56dd 100644
Binary files a/public/images/emoji/google/drooling_face.png and b/public/images/emoji/google/drooling_face.png differ
diff --git a/public/images/emoji/google/droplet.png b/public/images/emoji/google/droplet.png
index 2e57daba012..6c0d7d2e069 100644
Binary files a/public/images/emoji/google/droplet.png and b/public/images/emoji/google/droplet.png differ
diff --git a/public/images/emoji/google/drum.png b/public/images/emoji/google/drum.png
index 884c12370a4..769b8750eea 100644
Binary files a/public/images/emoji/google/drum.png and b/public/images/emoji/google/drum.png differ
diff --git a/public/images/emoji/google/duck.png b/public/images/emoji/google/duck.png
index 3a00bf45275..c010d6687ba 100644
Binary files a/public/images/emoji/google/duck.png and b/public/images/emoji/google/duck.png differ
diff --git a/public/images/emoji/google/dumpling.png b/public/images/emoji/google/dumpling.png
index c013fe1d7af..86a7034319a 100644
Binary files a/public/images/emoji/google/dumpling.png and b/public/images/emoji/google/dumpling.png differ
diff --git a/public/images/emoji/google/dvd.png b/public/images/emoji/google/dvd.png
index ae360226398..467a13c313c 100644
Binary files a/public/images/emoji/google/dvd.png and b/public/images/emoji/google/dvd.png differ
diff --git a/public/images/emoji/google/e-mail.png b/public/images/emoji/google/e-mail.png
index 333a70ea08b..8d22dbe77c1 100644
Binary files a/public/images/emoji/google/e-mail.png and b/public/images/emoji/google/e-mail.png differ
diff --git a/public/images/emoji/google/eagle.png b/public/images/emoji/google/eagle.png
index 8bed5acca57..4450af32f59 100644
Binary files a/public/images/emoji/google/eagle.png and b/public/images/emoji/google/eagle.png differ
diff --git a/public/images/emoji/google/ear.png b/public/images/emoji/google/ear.png
index 48c27113ff7..79f258c08c2 100644
Binary files a/public/images/emoji/google/ear.png and b/public/images/emoji/google/ear.png differ
diff --git a/public/images/emoji/google/ear/2.png b/public/images/emoji/google/ear/2.png
index 7d3c1ad12a2..2c6a11e6ed4 100644
Binary files a/public/images/emoji/google/ear/2.png and b/public/images/emoji/google/ear/2.png differ
diff --git a/public/images/emoji/google/ear/3.png b/public/images/emoji/google/ear/3.png
index 68b0ce88581..6b5d1eb2634 100644
Binary files a/public/images/emoji/google/ear/3.png and b/public/images/emoji/google/ear/3.png differ
diff --git a/public/images/emoji/google/ear/4.png b/public/images/emoji/google/ear/4.png
index b8b95f071ff..954725c0f9d 100644
Binary files a/public/images/emoji/google/ear/4.png and b/public/images/emoji/google/ear/4.png differ
diff --git a/public/images/emoji/google/ear/5.png b/public/images/emoji/google/ear/5.png
index 80974cba323..e993393e33f 100644
Binary files a/public/images/emoji/google/ear/5.png and b/public/images/emoji/google/ear/5.png differ
diff --git a/public/images/emoji/google/ear/6.png b/public/images/emoji/google/ear/6.png
index c8daaed81e9..aabe4328a36 100644
Binary files a/public/images/emoji/google/ear/6.png and b/public/images/emoji/google/ear/6.png differ
diff --git a/public/images/emoji/google/ear_of_rice.png b/public/images/emoji/google/ear_of_rice.png
index ae65174881d..be92823950c 100644
Binary files a/public/images/emoji/google/ear_of_rice.png and b/public/images/emoji/google/ear_of_rice.png differ
diff --git a/public/images/emoji/google/earth_africa.png b/public/images/emoji/google/earth_africa.png
index cd2cb281dc1..0f37c9adade 100644
Binary files a/public/images/emoji/google/earth_africa.png and b/public/images/emoji/google/earth_africa.png differ
diff --git a/public/images/emoji/google/earth_americas.png b/public/images/emoji/google/earth_americas.png
index fa95574e900..c7d6b9f10db 100644
Binary files a/public/images/emoji/google/earth_americas.png and b/public/images/emoji/google/earth_americas.png differ
diff --git a/public/images/emoji/google/earth_asia.png b/public/images/emoji/google/earth_asia.png
index 0706e95e920..778ed8f5e86 100644
Binary files a/public/images/emoji/google/earth_asia.png and b/public/images/emoji/google/earth_asia.png differ
diff --git a/public/images/emoji/google/ecuador.png b/public/images/emoji/google/ecuador.png
index a4c0b557b01..af0505296c0 100644
Binary files a/public/images/emoji/google/ecuador.png and b/public/images/emoji/google/ecuador.png differ
diff --git a/public/images/emoji/google/egg.png b/public/images/emoji/google/egg.png
index 5c2ba19f51e..a90281c8398 100644
Binary files a/public/images/emoji/google/egg.png and b/public/images/emoji/google/egg.png differ
diff --git a/public/images/emoji/google/eggplant.png b/public/images/emoji/google/eggplant.png
index ef1fcd659f8..3f9e3935877 100644
Binary files a/public/images/emoji/google/eggplant.png and b/public/images/emoji/google/eggplant.png differ
diff --git a/public/images/emoji/google/egypt.png b/public/images/emoji/google/egypt.png
index dc64def716d..59854066ef0 100644
Binary files a/public/images/emoji/google/egypt.png and b/public/images/emoji/google/egypt.png differ
diff --git a/public/images/emoji/google/eight.png b/public/images/emoji/google/eight.png
index d6bfa97b33b..c1d5dfc9e5c 100644
Binary files a/public/images/emoji/google/eight.png and b/public/images/emoji/google/eight.png differ
diff --git a/public/images/emoji/google/eight_pointed_black_star.png b/public/images/emoji/google/eight_pointed_black_star.png
index c579846b3c4..a1a4e41a563 100644
Binary files a/public/images/emoji/google/eight_pointed_black_star.png and b/public/images/emoji/google/eight_pointed_black_star.png differ
diff --git a/public/images/emoji/google/eight_spoked_asterisk.png b/public/images/emoji/google/eight_spoked_asterisk.png
index ac9a777cd1e..58d1ad6b24d 100644
Binary files a/public/images/emoji/google/eight_spoked_asterisk.png and b/public/images/emoji/google/eight_spoked_asterisk.png differ
diff --git a/public/images/emoji/google/el_salvador.png b/public/images/emoji/google/el_salvador.png
index f5bf8e8fbda..d76c5efd169 100644
Binary files a/public/images/emoji/google/el_salvador.png and b/public/images/emoji/google/el_salvador.png differ
diff --git a/public/images/emoji/google/electric_plug.png b/public/images/emoji/google/electric_plug.png
index 0ed89732718..e42fcabaeec 100644
Binary files a/public/images/emoji/google/electric_plug.png and b/public/images/emoji/google/electric_plug.png differ
diff --git a/public/images/emoji/google/elephant.png b/public/images/emoji/google/elephant.png
index 82ffbef3661..35d2d389539 100644
Binary files a/public/images/emoji/google/elephant.png and b/public/images/emoji/google/elephant.png differ
diff --git a/public/images/emoji/google/elf.png b/public/images/emoji/google/elf.png
index 7f13711c3ed..7a5181c2a61 100644
Binary files a/public/images/emoji/google/elf.png and b/public/images/emoji/google/elf.png differ
diff --git a/public/images/emoji/google/elf/2.png b/public/images/emoji/google/elf/2.png
index 18183cdf5d5..b2de301099d 100644
Binary files a/public/images/emoji/google/elf/2.png and b/public/images/emoji/google/elf/2.png differ
diff --git a/public/images/emoji/google/elf/3.png b/public/images/emoji/google/elf/3.png
index 5f3bd85830a..1262ce02d6d 100644
Binary files a/public/images/emoji/google/elf/3.png and b/public/images/emoji/google/elf/3.png differ
diff --git a/public/images/emoji/google/elf/4.png b/public/images/emoji/google/elf/4.png
index 7b936f8f597..02b1f1fbdee 100644
Binary files a/public/images/emoji/google/elf/4.png and b/public/images/emoji/google/elf/4.png differ
diff --git a/public/images/emoji/google/elf/5.png b/public/images/emoji/google/elf/5.png
index 5af1e1f219c..0c7eb72d409 100644
Binary files a/public/images/emoji/google/elf/5.png and b/public/images/emoji/google/elf/5.png differ
diff --git a/public/images/emoji/google/elf/6.png b/public/images/emoji/google/elf/6.png
index 3db350cc167..b8e8a301837 100644
Binary files a/public/images/emoji/google/elf/6.png and b/public/images/emoji/google/elf/6.png differ
diff --git a/public/images/emoji/google/email.png b/public/images/emoji/google/email.png
index 333a70ea08b..8d22dbe77c1 100644
Binary files a/public/images/emoji/google/email.png and b/public/images/emoji/google/email.png differ
diff --git a/public/images/emoji/google/end.png b/public/images/emoji/google/end.png
index 2ff3a095e69..c19398bc5a3 100644
Binary files a/public/images/emoji/google/end.png and b/public/images/emoji/google/end.png differ
diff --git a/public/images/emoji/google/envelope.png b/public/images/emoji/google/envelope.png
index 333a70ea08b..8d22dbe77c1 100644
Binary files a/public/images/emoji/google/envelope.png and b/public/images/emoji/google/envelope.png differ
diff --git a/public/images/emoji/google/envelope_with_arrow.png b/public/images/emoji/google/envelope_with_arrow.png
index 29ddb7ea638..ea4cfc79c42 100644
Binary files a/public/images/emoji/google/envelope_with_arrow.png and b/public/images/emoji/google/envelope_with_arrow.png differ
diff --git a/public/images/emoji/google/equatorial_guinea.png b/public/images/emoji/google/equatorial_guinea.png
index 1847227c712..61fe3a6ae7d 100644
Binary files a/public/images/emoji/google/equatorial_guinea.png and b/public/images/emoji/google/equatorial_guinea.png differ
diff --git a/public/images/emoji/google/eritrea.png b/public/images/emoji/google/eritrea.png
index fbd7ce17bbd..7a8134e58d8 100644
Binary files a/public/images/emoji/google/eritrea.png and b/public/images/emoji/google/eritrea.png differ
diff --git a/public/images/emoji/google/es.png b/public/images/emoji/google/es.png
index 55bba051719..d46ba958442 100644
Binary files a/public/images/emoji/google/es.png and b/public/images/emoji/google/es.png differ
diff --git a/public/images/emoji/google/estonia.png b/public/images/emoji/google/estonia.png
index cbee9fc6ae1..f7957ed2235 100644
Binary files a/public/images/emoji/google/estonia.png and b/public/images/emoji/google/estonia.png differ
diff --git a/public/images/emoji/google/ethiopia.png b/public/images/emoji/google/ethiopia.png
index 7ba22073ebd..026e49b2542 100644
Binary files a/public/images/emoji/google/ethiopia.png and b/public/images/emoji/google/ethiopia.png differ
diff --git a/public/images/emoji/google/eu.png b/public/images/emoji/google/eu.png
index 02f79b58a5e..23496febc78 100644
Binary files a/public/images/emoji/google/eu.png and b/public/images/emoji/google/eu.png differ
diff --git a/public/images/emoji/google/euro.png b/public/images/emoji/google/euro.png
index 4bd0e68827c..d9d4013aba6 100644
Binary files a/public/images/emoji/google/euro.png and b/public/images/emoji/google/euro.png differ
diff --git a/public/images/emoji/google/european_castle.png b/public/images/emoji/google/european_castle.png
index 0be9efa5395..b818e32b18c 100644
Binary files a/public/images/emoji/google/european_castle.png and b/public/images/emoji/google/european_castle.png differ
diff --git a/public/images/emoji/google/european_post_office.png b/public/images/emoji/google/european_post_office.png
index 4f6fc8c247c..39fb3f261b5 100644
Binary files a/public/images/emoji/google/european_post_office.png and b/public/images/emoji/google/european_post_office.png differ
diff --git a/public/images/emoji/google/evergreen_tree.png b/public/images/emoji/google/evergreen_tree.png
index 5df8a196dbe..1e29a1be5af 100644
Binary files a/public/images/emoji/google/evergreen_tree.png and b/public/images/emoji/google/evergreen_tree.png differ
diff --git a/public/images/emoji/google/exclamation.png b/public/images/emoji/google/exclamation.png
index 71429ae6497..b9037e77aac 100644
Binary files a/public/images/emoji/google/exclamation.png and b/public/images/emoji/google/exclamation.png differ
diff --git a/public/images/emoji/google/exploding_head.png b/public/images/emoji/google/exploding_head.png
index fc76cf40b3b..42ea76dc0b5 100644
Binary files a/public/images/emoji/google/exploding_head.png and b/public/images/emoji/google/exploding_head.png differ
diff --git a/public/images/emoji/google/expressionless.png b/public/images/emoji/google/expressionless.png
index 8a57855d705..6ffc551b69b 100644
Binary files a/public/images/emoji/google/expressionless.png and b/public/images/emoji/google/expressionless.png differ
diff --git a/public/images/emoji/google/eye.png b/public/images/emoji/google/eye.png
index 3f7c1820944..6dbd5a03416 100644
Binary files a/public/images/emoji/google/eye.png and b/public/images/emoji/google/eye.png differ
diff --git a/public/images/emoji/google/eyeglasses.png b/public/images/emoji/google/eyeglasses.png
index 8507c7f9abb..eff784e5d3c 100644
Binary files a/public/images/emoji/google/eyeglasses.png and b/public/images/emoji/google/eyeglasses.png differ
diff --git a/public/images/emoji/google/eyes.png b/public/images/emoji/google/eyes.png
index 52dd4f221df..35e9ed21bee 100644
Binary files a/public/images/emoji/google/eyes.png and b/public/images/emoji/google/eyes.png differ
diff --git a/public/images/emoji/google/face_vomiting.png b/public/images/emoji/google/face_vomiting.png
index 017495f7e0b..d3ce5f69bdc 100644
Binary files a/public/images/emoji/google/face_vomiting.png and b/public/images/emoji/google/face_vomiting.png differ
diff --git a/public/images/emoji/google/face_with_hand_over_mouth.png b/public/images/emoji/google/face_with_hand_over_mouth.png
index 1f15c0df7ea..d965e07a831 100644
Binary files a/public/images/emoji/google/face_with_hand_over_mouth.png and b/public/images/emoji/google/face_with_hand_over_mouth.png differ
diff --git a/public/images/emoji/google/face_with_head_bandage.png b/public/images/emoji/google/face_with_head_bandage.png
index e07d929a276..8618abf0ee2 100644
Binary files a/public/images/emoji/google/face_with_head_bandage.png and b/public/images/emoji/google/face_with_head_bandage.png differ
diff --git a/public/images/emoji/google/face_with_monocle.png b/public/images/emoji/google/face_with_monocle.png
index 129e9e4f54c..b08f7680880 100644
Binary files a/public/images/emoji/google/face_with_monocle.png and b/public/images/emoji/google/face_with_monocle.png differ
diff --git a/public/images/emoji/google/face_with_raised_eyebrow.png b/public/images/emoji/google/face_with_raised_eyebrow.png
index f407c190e3e..778435a9393 100644
Binary files a/public/images/emoji/google/face_with_raised_eyebrow.png and b/public/images/emoji/google/face_with_raised_eyebrow.png differ
diff --git a/public/images/emoji/google/face_with_rolling_eyes.png b/public/images/emoji/google/face_with_rolling_eyes.png
index 8485fcbe1cc..55577e34a98 100644
Binary files a/public/images/emoji/google/face_with_rolling_eyes.png and b/public/images/emoji/google/face_with_rolling_eyes.png differ
diff --git a/public/images/emoji/google/face_with_symbols_over_mouth.png b/public/images/emoji/google/face_with_symbols_over_mouth.png
index 43d27aea0b4..ae0735e8bf4 100644
Binary files a/public/images/emoji/google/face_with_symbols_over_mouth.png and b/public/images/emoji/google/face_with_symbols_over_mouth.png differ
diff --git a/public/images/emoji/google/face_with_thermometer.png b/public/images/emoji/google/face_with_thermometer.png
index 82bdbf6335b..296fe80618c 100644
Binary files a/public/images/emoji/google/face_with_thermometer.png and b/public/images/emoji/google/face_with_thermometer.png differ
diff --git a/public/images/emoji/google/facepunch.png b/public/images/emoji/google/facepunch.png
index f05a3f6d14c..2ef7ed20914 100644
Binary files a/public/images/emoji/google/facepunch.png and b/public/images/emoji/google/facepunch.png differ
diff --git a/public/images/emoji/google/facepunch/2.png b/public/images/emoji/google/facepunch/2.png
index bba3d6fe12b..a545c376acb 100644
Binary files a/public/images/emoji/google/facepunch/2.png and b/public/images/emoji/google/facepunch/2.png differ
diff --git a/public/images/emoji/google/facepunch/3.png b/public/images/emoji/google/facepunch/3.png
index 123e4450309..03e2a4fc1b9 100644
Binary files a/public/images/emoji/google/facepunch/3.png and b/public/images/emoji/google/facepunch/3.png differ
diff --git a/public/images/emoji/google/facepunch/4.png b/public/images/emoji/google/facepunch/4.png
index 974055c6286..bfb48350fcc 100644
Binary files a/public/images/emoji/google/facepunch/4.png and b/public/images/emoji/google/facepunch/4.png differ
diff --git a/public/images/emoji/google/facepunch/5.png b/public/images/emoji/google/facepunch/5.png
index 3f068a0f950..5f57f2ba464 100644
Binary files a/public/images/emoji/google/facepunch/5.png and b/public/images/emoji/google/facepunch/5.png differ
diff --git a/public/images/emoji/google/facepunch/6.png b/public/images/emoji/google/facepunch/6.png
index 798a95d9fd6..66067147f93 100644
Binary files a/public/images/emoji/google/facepunch/6.png and b/public/images/emoji/google/facepunch/6.png differ
diff --git a/public/images/emoji/google/factory.png b/public/images/emoji/google/factory.png
index 4ba2516a850..5ba250b02e9 100644
Binary files a/public/images/emoji/google/factory.png and b/public/images/emoji/google/factory.png differ
diff --git a/public/images/emoji/google/fairy.png b/public/images/emoji/google/fairy.png
index a50d75d6243..ddec9b83381 100644
Binary files a/public/images/emoji/google/fairy.png and b/public/images/emoji/google/fairy.png differ
diff --git a/public/images/emoji/google/fairy/2.png b/public/images/emoji/google/fairy/2.png
index 71db8fcbb2a..3f47fea29de 100644
Binary files a/public/images/emoji/google/fairy/2.png and b/public/images/emoji/google/fairy/2.png differ
diff --git a/public/images/emoji/google/fairy/3.png b/public/images/emoji/google/fairy/3.png
index 939c3fec826..d3979eaa6d4 100644
Binary files a/public/images/emoji/google/fairy/3.png and b/public/images/emoji/google/fairy/3.png differ
diff --git a/public/images/emoji/google/fairy/4.png b/public/images/emoji/google/fairy/4.png
index 4f7ea1dac7f..702f5401b7f 100644
Binary files a/public/images/emoji/google/fairy/4.png and b/public/images/emoji/google/fairy/4.png differ
diff --git a/public/images/emoji/google/fairy/5.png b/public/images/emoji/google/fairy/5.png
index 80e3e07ff9e..0b30afcb042 100644
Binary files a/public/images/emoji/google/fairy/5.png and b/public/images/emoji/google/fairy/5.png differ
diff --git a/public/images/emoji/google/fairy/6.png b/public/images/emoji/google/fairy/6.png
index 72e4457ec19..795a0d301f1 100644
Binary files a/public/images/emoji/google/fairy/6.png and b/public/images/emoji/google/fairy/6.png differ
diff --git a/public/images/emoji/google/falkland_islands.png b/public/images/emoji/google/falkland_islands.png
index dad0f8ce650..4faf7e252ef 100644
Binary files a/public/images/emoji/google/falkland_islands.png and b/public/images/emoji/google/falkland_islands.png differ
diff --git a/public/images/emoji/google/fallen_leaf.png b/public/images/emoji/google/fallen_leaf.png
index a64ee52526a..36558e98e38 100644
Binary files a/public/images/emoji/google/fallen_leaf.png and b/public/images/emoji/google/fallen_leaf.png differ
diff --git a/public/images/emoji/google/family.png b/public/images/emoji/google/family.png
index 3b719a82a08..8ab2ce0b953 100644
Binary files a/public/images/emoji/google/family.png and b/public/images/emoji/google/family.png differ
diff --git a/public/images/emoji/google/family_man_boy.png b/public/images/emoji/google/family_man_boy.png
index ea1ba13d527..93014de1c24 100644
Binary files a/public/images/emoji/google/family_man_boy.png and b/public/images/emoji/google/family_man_boy.png differ
diff --git a/public/images/emoji/google/family_man_boy_boy.png b/public/images/emoji/google/family_man_boy_boy.png
index 6739fec8282..210034c60cc 100644
Binary files a/public/images/emoji/google/family_man_boy_boy.png and b/public/images/emoji/google/family_man_boy_boy.png differ
diff --git a/public/images/emoji/google/family_man_girl.png b/public/images/emoji/google/family_man_girl.png
index 0bd8bb90855..8b78af075fc 100644
Binary files a/public/images/emoji/google/family_man_girl.png and b/public/images/emoji/google/family_man_girl.png differ
diff --git a/public/images/emoji/google/family_man_girl_boy.png b/public/images/emoji/google/family_man_girl_boy.png
index 407f88f33b1..1c0e714a743 100644
Binary files a/public/images/emoji/google/family_man_girl_boy.png and b/public/images/emoji/google/family_man_girl_boy.png differ
diff --git a/public/images/emoji/google/family_man_girl_girl.png b/public/images/emoji/google/family_man_girl_girl.png
index f9626d9ef6d..4de877ae333 100644
Binary files a/public/images/emoji/google/family_man_girl_girl.png and b/public/images/emoji/google/family_man_girl_girl.png differ
diff --git a/public/images/emoji/google/family_man_man_boy.png b/public/images/emoji/google/family_man_man_boy.png
index 47f7d7b3a47..207ec96ce5e 100644
Binary files a/public/images/emoji/google/family_man_man_boy.png and b/public/images/emoji/google/family_man_man_boy.png differ
diff --git a/public/images/emoji/google/family_man_man_boy_boy.png b/public/images/emoji/google/family_man_man_boy_boy.png
index 631a4aa6f2e..50cb7f5225c 100644
Binary files a/public/images/emoji/google/family_man_man_boy_boy.png and b/public/images/emoji/google/family_man_man_boy_boy.png differ
diff --git a/public/images/emoji/google/family_man_man_girl.png b/public/images/emoji/google/family_man_man_girl.png
index 58e99a1d31e..efd6fcfeb71 100644
Binary files a/public/images/emoji/google/family_man_man_girl.png and b/public/images/emoji/google/family_man_man_girl.png differ
diff --git a/public/images/emoji/google/family_man_man_girl_boy.png b/public/images/emoji/google/family_man_man_girl_boy.png
index 9f482921516..b2cab1c97df 100644
Binary files a/public/images/emoji/google/family_man_man_girl_boy.png and b/public/images/emoji/google/family_man_man_girl_boy.png differ
diff --git a/public/images/emoji/google/family_man_man_girl_girl.png b/public/images/emoji/google/family_man_man_girl_girl.png
index 31b20d2aa84..e913a910fcc 100644
Binary files a/public/images/emoji/google/family_man_man_girl_girl.png and b/public/images/emoji/google/family_man_man_girl_girl.png differ
diff --git a/public/images/emoji/google/family_man_woman_boy.png b/public/images/emoji/google/family_man_woman_boy.png
index da5b683e78c..141f756a55f 100644
Binary files a/public/images/emoji/google/family_man_woman_boy.png and b/public/images/emoji/google/family_man_woman_boy.png differ
diff --git a/public/images/emoji/google/family_man_woman_boy_boy.png b/public/images/emoji/google/family_man_woman_boy_boy.png
index 2322faad907..6eb38cba5b7 100644
Binary files a/public/images/emoji/google/family_man_woman_boy_boy.png and b/public/images/emoji/google/family_man_woman_boy_boy.png differ
diff --git a/public/images/emoji/google/family_man_woman_boys.png b/public/images/emoji/google/family_man_woman_boys.png
index 2322faad907..6eb38cba5b7 100644
Binary files a/public/images/emoji/google/family_man_woman_boys.png and b/public/images/emoji/google/family_man_woman_boys.png differ
diff --git a/public/images/emoji/google/family_man_woman_girl.png b/public/images/emoji/google/family_man_woman_girl.png
index 63af73ac223..4ba95b4bde7 100644
Binary files a/public/images/emoji/google/family_man_woman_girl.png and b/public/images/emoji/google/family_man_woman_girl.png differ
diff --git a/public/images/emoji/google/family_man_woman_girl_boy.png b/public/images/emoji/google/family_man_woman_girl_boy.png
index 3b719a82a08..8ab2ce0b953 100644
Binary files a/public/images/emoji/google/family_man_woman_girl_boy.png and b/public/images/emoji/google/family_man_woman_girl_boy.png differ
diff --git a/public/images/emoji/google/family_man_woman_girl_girl.png b/public/images/emoji/google/family_man_woman_girl_girl.png
index c62b2c0e812..83d6ec866f7 100644
Binary files a/public/images/emoji/google/family_man_woman_girl_girl.png and b/public/images/emoji/google/family_man_woman_girl_girl.png differ
diff --git a/public/images/emoji/google/family_man_woman_girls.png b/public/images/emoji/google/family_man_woman_girls.png
index c62b2c0e812..83d6ec866f7 100644
Binary files a/public/images/emoji/google/family_man_woman_girls.png and b/public/images/emoji/google/family_man_woman_girls.png differ
diff --git a/public/images/emoji/google/family_men_boy.png b/public/images/emoji/google/family_men_boy.png
index 47f7d7b3a47..207ec96ce5e 100644
Binary files a/public/images/emoji/google/family_men_boy.png and b/public/images/emoji/google/family_men_boy.png differ
diff --git a/public/images/emoji/google/family_men_boys.png b/public/images/emoji/google/family_men_boys.png
index 631a4aa6f2e..50cb7f5225c 100644
Binary files a/public/images/emoji/google/family_men_boys.png and b/public/images/emoji/google/family_men_boys.png differ
diff --git a/public/images/emoji/google/family_men_girl.png b/public/images/emoji/google/family_men_girl.png
index 58e99a1d31e..efd6fcfeb71 100644
Binary files a/public/images/emoji/google/family_men_girl.png and b/public/images/emoji/google/family_men_girl.png differ
diff --git a/public/images/emoji/google/family_men_girl_boy.png b/public/images/emoji/google/family_men_girl_boy.png
index 9f482921516..b2cab1c97df 100644
Binary files a/public/images/emoji/google/family_men_girl_boy.png and b/public/images/emoji/google/family_men_girl_boy.png differ
diff --git a/public/images/emoji/google/family_men_girls.png b/public/images/emoji/google/family_men_girls.png
index 31b20d2aa84..e913a910fcc 100644
Binary files a/public/images/emoji/google/family_men_girls.png and b/public/images/emoji/google/family_men_girls.png differ
diff --git a/public/images/emoji/google/family_woman_boy.png b/public/images/emoji/google/family_woman_boy.png
index 7c96ecd94f4..2858bbedf1d 100644
Binary files a/public/images/emoji/google/family_woman_boy.png and b/public/images/emoji/google/family_woman_boy.png differ
diff --git a/public/images/emoji/google/family_woman_boy_boy.png b/public/images/emoji/google/family_woman_boy_boy.png
index 0a8214dd6b1..7f45656e368 100644
Binary files a/public/images/emoji/google/family_woman_boy_boy.png and b/public/images/emoji/google/family_woman_boy_boy.png differ
diff --git a/public/images/emoji/google/family_woman_girl.png b/public/images/emoji/google/family_woman_girl.png
index 16fd9b1e564..2948674f293 100644
Binary files a/public/images/emoji/google/family_woman_girl.png and b/public/images/emoji/google/family_woman_girl.png differ
diff --git a/public/images/emoji/google/family_woman_girl_boy.png b/public/images/emoji/google/family_woman_girl_boy.png
index 0e36fc3fe3b..50a2510a74e 100644
Binary files a/public/images/emoji/google/family_woman_girl_boy.png and b/public/images/emoji/google/family_woman_girl_boy.png differ
diff --git a/public/images/emoji/google/family_woman_girl_girl.png b/public/images/emoji/google/family_woman_girl_girl.png
index 7d261d1806b..4751357bb05 100644
Binary files a/public/images/emoji/google/family_woman_girl_girl.png and b/public/images/emoji/google/family_woman_girl_girl.png differ
diff --git a/public/images/emoji/google/family_woman_woman_boy.png b/public/images/emoji/google/family_woman_woman_boy.png
index 55c5716c6b6..55a0ea58146 100644
Binary files a/public/images/emoji/google/family_woman_woman_boy.png and b/public/images/emoji/google/family_woman_woman_boy.png differ
diff --git a/public/images/emoji/google/family_woman_woman_boy_boy.png b/public/images/emoji/google/family_woman_woman_boy_boy.png
index a0c6560b50c..793d5e34326 100644
Binary files a/public/images/emoji/google/family_woman_woman_boy_boy.png and b/public/images/emoji/google/family_woman_woman_boy_boy.png differ
diff --git a/public/images/emoji/google/family_woman_woman_girl.png b/public/images/emoji/google/family_woman_woman_girl.png
index dfd392a489e..abafe71f600 100644
Binary files a/public/images/emoji/google/family_woman_woman_girl.png and b/public/images/emoji/google/family_woman_woman_girl.png differ
diff --git a/public/images/emoji/google/family_woman_woman_girl_boy.png b/public/images/emoji/google/family_woman_woman_girl_boy.png
index 4f9d9b92ce8..7a2c267fc77 100644
Binary files a/public/images/emoji/google/family_woman_woman_girl_boy.png and b/public/images/emoji/google/family_woman_woman_girl_boy.png differ
diff --git a/public/images/emoji/google/family_woman_woman_girl_girl.png b/public/images/emoji/google/family_woman_woman_girl_girl.png
index 1c1cbe3dd48..7e07c19c2e5 100644
Binary files a/public/images/emoji/google/family_woman_woman_girl_girl.png and b/public/images/emoji/google/family_woman_woman_girl_girl.png differ
diff --git a/public/images/emoji/google/family_women_boy.png b/public/images/emoji/google/family_women_boy.png
index 55c5716c6b6..55a0ea58146 100644
Binary files a/public/images/emoji/google/family_women_boy.png and b/public/images/emoji/google/family_women_boy.png differ
diff --git a/public/images/emoji/google/family_women_boys.png b/public/images/emoji/google/family_women_boys.png
index a0c6560b50c..793d5e34326 100644
Binary files a/public/images/emoji/google/family_women_boys.png and b/public/images/emoji/google/family_women_boys.png differ
diff --git a/public/images/emoji/google/family_women_girl.png b/public/images/emoji/google/family_women_girl.png
index dfd392a489e..abafe71f600 100644
Binary files a/public/images/emoji/google/family_women_girl.png and b/public/images/emoji/google/family_women_girl.png differ
diff --git a/public/images/emoji/google/family_women_girl_boy.png b/public/images/emoji/google/family_women_girl_boy.png
index 4f9d9b92ce8..7a2c267fc77 100644
Binary files a/public/images/emoji/google/family_women_girl_boy.png and b/public/images/emoji/google/family_women_girl_boy.png differ
diff --git a/public/images/emoji/google/family_women_girls.png b/public/images/emoji/google/family_women_girls.png
index 1c1cbe3dd48..7e07c19c2e5 100644
Binary files a/public/images/emoji/google/family_women_girls.png and b/public/images/emoji/google/family_women_girls.png differ
diff --git a/public/images/emoji/google/faroe_islands.png b/public/images/emoji/google/faroe_islands.png
index 310868b9810..70546f10e17 100644
Binary files a/public/images/emoji/google/faroe_islands.png and b/public/images/emoji/google/faroe_islands.png differ
diff --git a/public/images/emoji/google/fast_forward.png b/public/images/emoji/google/fast_forward.png
index 55a179f18e0..b71d3c68ba3 100644
Binary files a/public/images/emoji/google/fast_forward.png and b/public/images/emoji/google/fast_forward.png differ
diff --git a/public/images/emoji/google/fax.png b/public/images/emoji/google/fax.png
index fc119f74087..633119cf9a8 100644
Binary files a/public/images/emoji/google/fax.png and b/public/images/emoji/google/fax.png differ
diff --git a/public/images/emoji/google/fearful.png b/public/images/emoji/google/fearful.png
index c0ff5ed9a3c..04e86b5709e 100644
Binary files a/public/images/emoji/google/fearful.png and b/public/images/emoji/google/fearful.png differ
diff --git a/public/images/emoji/google/feet.png b/public/images/emoji/google/feet.png
index 31748106285..afb31661513 100644
Binary files a/public/images/emoji/google/feet.png and b/public/images/emoji/google/feet.png differ
diff --git a/public/images/emoji/google/female_couple_with_heart.png b/public/images/emoji/google/female_couple_with_heart.png
index 8eda1e8d848..f4b433aa950 100644
Binary files a/public/images/emoji/google/female_couple_with_heart.png and b/public/images/emoji/google/female_couple_with_heart.png differ
diff --git a/public/images/emoji/google/female_couplekiss.png b/public/images/emoji/google/female_couplekiss.png
index 7cd2d2ebdd7..0e516e93768 100644
Binary files a/public/images/emoji/google/female_couplekiss.png and b/public/images/emoji/google/female_couplekiss.png differ
diff --git a/public/images/emoji/google/female_detective.png b/public/images/emoji/google/female_detective.png
index 2b5f2e9dcc9..256199d4aa1 100644
Binary files a/public/images/emoji/google/female_detective.png and b/public/images/emoji/google/female_detective.png differ
diff --git a/public/images/emoji/google/ferris_wheel.png b/public/images/emoji/google/ferris_wheel.png
index 2ebf2a6fab9..ef08c478ac0 100644
Binary files a/public/images/emoji/google/ferris_wheel.png and b/public/images/emoji/google/ferris_wheel.png differ
diff --git a/public/images/emoji/google/ferry.png b/public/images/emoji/google/ferry.png
index 67e10337a26..e81c20eddc9 100644
Binary files a/public/images/emoji/google/ferry.png and b/public/images/emoji/google/ferry.png differ
diff --git a/public/images/emoji/google/field_hockey.png b/public/images/emoji/google/field_hockey.png
index 1ef09cb540c..af49131fb24 100644
Binary files a/public/images/emoji/google/field_hockey.png and b/public/images/emoji/google/field_hockey.png differ
diff --git a/public/images/emoji/google/fiji.png b/public/images/emoji/google/fiji.png
index fd2325f7964..1ce07af931b 100644
Binary files a/public/images/emoji/google/fiji.png and b/public/images/emoji/google/fiji.png differ
diff --git a/public/images/emoji/google/file_cabinet.png b/public/images/emoji/google/file_cabinet.png
index 1b038f0701e..dd1ded02b5c 100644
Binary files a/public/images/emoji/google/file_cabinet.png and b/public/images/emoji/google/file_cabinet.png differ
diff --git a/public/images/emoji/google/file_folder.png b/public/images/emoji/google/file_folder.png
index b35d7b6615d..202bf1217f3 100644
Binary files a/public/images/emoji/google/file_folder.png and b/public/images/emoji/google/file_folder.png differ
diff --git a/public/images/emoji/google/film_frames.png b/public/images/emoji/google/film_frames.png
index 16a6d1da41c..ddd02c16eb4 100644
Binary files a/public/images/emoji/google/film_frames.png and b/public/images/emoji/google/film_frames.png differ
diff --git a/public/images/emoji/google/film_projector.png b/public/images/emoji/google/film_projector.png
index f957286ba21..a420005a790 100644
Binary files a/public/images/emoji/google/film_projector.png and b/public/images/emoji/google/film_projector.png differ
diff --git a/public/images/emoji/google/film_strip.png b/public/images/emoji/google/film_strip.png
index 16a6d1da41c..ddd02c16eb4 100644
Binary files a/public/images/emoji/google/film_strip.png and b/public/images/emoji/google/film_strip.png differ
diff --git a/public/images/emoji/google/finland.png b/public/images/emoji/google/finland.png
index 861e00aea2d..2e4109ca0c2 100644
Binary files a/public/images/emoji/google/finland.png and b/public/images/emoji/google/finland.png differ
diff --git a/public/images/emoji/google/fire.png b/public/images/emoji/google/fire.png
index 7b17db8d7a0..56800b219db 100644
Binary files a/public/images/emoji/google/fire.png and b/public/images/emoji/google/fire.png differ
diff --git a/public/images/emoji/google/fire_engine.png b/public/images/emoji/google/fire_engine.png
index e144b15efde..b64569c9cd4 100644
Binary files a/public/images/emoji/google/fire_engine.png and b/public/images/emoji/google/fire_engine.png differ
diff --git a/public/images/emoji/google/fireworks.png b/public/images/emoji/google/fireworks.png
index aa6c7d7ea66..48bd693d790 100644
Binary files a/public/images/emoji/google/fireworks.png and b/public/images/emoji/google/fireworks.png differ
diff --git a/public/images/emoji/google/first_quarter_moon.png b/public/images/emoji/google/first_quarter_moon.png
index 1137028aa8d..bca9cc51abd 100644
Binary files a/public/images/emoji/google/first_quarter_moon.png and b/public/images/emoji/google/first_quarter_moon.png differ
diff --git a/public/images/emoji/google/first_quarter_moon_with_face.png b/public/images/emoji/google/first_quarter_moon_with_face.png
index f16569616f9..7699a212d82 100644
Binary files a/public/images/emoji/google/first_quarter_moon_with_face.png and b/public/images/emoji/google/first_quarter_moon_with_face.png differ
diff --git a/public/images/emoji/google/fish.png b/public/images/emoji/google/fish.png
index eaafb3810e9..f83107734a6 100644
Binary files a/public/images/emoji/google/fish.png and b/public/images/emoji/google/fish.png differ
diff --git a/public/images/emoji/google/fish_cake.png b/public/images/emoji/google/fish_cake.png
index 8d6ef5e6714..e35ca0af9ab 100644
Binary files a/public/images/emoji/google/fish_cake.png and b/public/images/emoji/google/fish_cake.png differ
diff --git a/public/images/emoji/google/fishing_pole_and_fish.png b/public/images/emoji/google/fishing_pole_and_fish.png
index ddecf5b68fd..15989dda8a8 100644
Binary files a/public/images/emoji/google/fishing_pole_and_fish.png and b/public/images/emoji/google/fishing_pole_and_fish.png differ
diff --git a/public/images/emoji/google/fist.png b/public/images/emoji/google/fist.png
index 78968a9a09e..c552652293d 100644
Binary files a/public/images/emoji/google/fist.png and b/public/images/emoji/google/fist.png differ
diff --git a/public/images/emoji/google/fist/2.png b/public/images/emoji/google/fist/2.png
index 0d41260837b..e8d51cb253c 100644
Binary files a/public/images/emoji/google/fist/2.png and b/public/images/emoji/google/fist/2.png differ
diff --git a/public/images/emoji/google/fist/3.png b/public/images/emoji/google/fist/3.png
index 14849f92d14..19e06ca32e5 100644
Binary files a/public/images/emoji/google/fist/3.png and b/public/images/emoji/google/fist/3.png differ
diff --git a/public/images/emoji/google/fist/4.png b/public/images/emoji/google/fist/4.png
index 46d18a88521..0aee1206917 100644
Binary files a/public/images/emoji/google/fist/4.png and b/public/images/emoji/google/fist/4.png differ
diff --git a/public/images/emoji/google/fist/5.png b/public/images/emoji/google/fist/5.png
index fc1435be796..57435b97ce4 100644
Binary files a/public/images/emoji/google/fist/5.png and b/public/images/emoji/google/fist/5.png differ
diff --git a/public/images/emoji/google/fist/6.png b/public/images/emoji/google/fist/6.png
index 21a74197bd6..682dcdb550b 100644
Binary files a/public/images/emoji/google/fist/6.png and b/public/images/emoji/google/fist/6.png differ
diff --git a/public/images/emoji/google/fist_left.png b/public/images/emoji/google/fist_left.png
index 170444849ce..8f6421169bd 100644
Binary files a/public/images/emoji/google/fist_left.png and b/public/images/emoji/google/fist_left.png differ
diff --git a/public/images/emoji/google/fist_left/2.png b/public/images/emoji/google/fist_left/2.png
index 724c63a7678..63c730b9bc2 100644
Binary files a/public/images/emoji/google/fist_left/2.png and b/public/images/emoji/google/fist_left/2.png differ
diff --git a/public/images/emoji/google/fist_left/3.png b/public/images/emoji/google/fist_left/3.png
index 8ab98131502..42b24e5ab7d 100644
Binary files a/public/images/emoji/google/fist_left/3.png and b/public/images/emoji/google/fist_left/3.png differ
diff --git a/public/images/emoji/google/fist_left/4.png b/public/images/emoji/google/fist_left/4.png
index c7d58e309b2..829fb996f3c 100644
Binary files a/public/images/emoji/google/fist_left/4.png and b/public/images/emoji/google/fist_left/4.png differ
diff --git a/public/images/emoji/google/fist_left/5.png b/public/images/emoji/google/fist_left/5.png
index 06684b2a477..967d0226339 100644
Binary files a/public/images/emoji/google/fist_left/5.png and b/public/images/emoji/google/fist_left/5.png differ
diff --git a/public/images/emoji/google/fist_left/6.png b/public/images/emoji/google/fist_left/6.png
index 2070d12016f..591f8d463ab 100644
Binary files a/public/images/emoji/google/fist_left/6.png and b/public/images/emoji/google/fist_left/6.png differ
diff --git a/public/images/emoji/google/fist_right.png b/public/images/emoji/google/fist_right.png
index 8b5c83ae577..619830874c7 100644
Binary files a/public/images/emoji/google/fist_right.png and b/public/images/emoji/google/fist_right.png differ
diff --git a/public/images/emoji/google/fist_right/2.png b/public/images/emoji/google/fist_right/2.png
index 07e2e7bbfce..6289ded635d 100644
Binary files a/public/images/emoji/google/fist_right/2.png and b/public/images/emoji/google/fist_right/2.png differ
diff --git a/public/images/emoji/google/fist_right/3.png b/public/images/emoji/google/fist_right/3.png
index 86dbaf843b1..e930c9414ec 100644
Binary files a/public/images/emoji/google/fist_right/3.png and b/public/images/emoji/google/fist_right/3.png differ
diff --git a/public/images/emoji/google/fist_right/4.png b/public/images/emoji/google/fist_right/4.png
index 4cd975fa2d1..265cef2f21b 100644
Binary files a/public/images/emoji/google/fist_right/4.png and b/public/images/emoji/google/fist_right/4.png differ
diff --git a/public/images/emoji/google/fist_right/5.png b/public/images/emoji/google/fist_right/5.png
index c6cc84c9b7c..387686201d3 100644
Binary files a/public/images/emoji/google/fist_right/5.png and b/public/images/emoji/google/fist_right/5.png differ
diff --git a/public/images/emoji/google/fist_right/6.png b/public/images/emoji/google/fist_right/6.png
index b30ad1986f8..418ea9a4160 100644
Binary files a/public/images/emoji/google/fist_right/6.png and b/public/images/emoji/google/fist_right/6.png differ
diff --git a/public/images/emoji/google/five.png b/public/images/emoji/google/five.png
index e3557d2324a..b1fa2d376d5 100644
Binary files a/public/images/emoji/google/five.png and b/public/images/emoji/google/five.png differ
diff --git a/public/images/emoji/google/flag_black.png b/public/images/emoji/google/flag_black.png
index a7fce0c5812..fd30f1d8823 100644
Binary files a/public/images/emoji/google/flag_black.png and b/public/images/emoji/google/flag_black.png differ
diff --git a/public/images/emoji/google/flag_cn.png b/public/images/emoji/google/flag_cn.png
index 010dddd1076..05a72fed32f 100644
Binary files a/public/images/emoji/google/flag_cn.png and b/public/images/emoji/google/flag_cn.png differ
diff --git a/public/images/emoji/google/flag_de.png b/public/images/emoji/google/flag_de.png
index e18953b9bee..5110b322d19 100644
Binary files a/public/images/emoji/google/flag_de.png and b/public/images/emoji/google/flag_de.png differ
diff --git a/public/images/emoji/google/flag_es.png b/public/images/emoji/google/flag_es.png
index 55bba051719..d46ba958442 100644
Binary files a/public/images/emoji/google/flag_es.png and b/public/images/emoji/google/flag_es.png differ
diff --git a/public/images/emoji/google/flag_fr.png b/public/images/emoji/google/flag_fr.png
index bc63af1def5..b836e555dea 100644
Binary files a/public/images/emoji/google/flag_fr.png and b/public/images/emoji/google/flag_fr.png differ
diff --git a/public/images/emoji/google/flag_gb.png b/public/images/emoji/google/flag_gb.png
index 798328a1ee2..e7f3da7ea8c 100644
Binary files a/public/images/emoji/google/flag_gb.png and b/public/images/emoji/google/flag_gb.png differ
diff --git a/public/images/emoji/google/flag_it.png b/public/images/emoji/google/flag_it.png
index 5ae7c53b6ff..605e1280127 100644
Binary files a/public/images/emoji/google/flag_it.png and b/public/images/emoji/google/flag_it.png differ
diff --git a/public/images/emoji/google/flag_jp.png b/public/images/emoji/google/flag_jp.png
index 72cbebef789..c75dad0d106 100644
Binary files a/public/images/emoji/google/flag_jp.png and b/public/images/emoji/google/flag_jp.png differ
diff --git a/public/images/emoji/google/flag_kr.png b/public/images/emoji/google/flag_kr.png
index 33ead18d8c6..048ceeb3e46 100644
Binary files a/public/images/emoji/google/flag_kr.png and b/public/images/emoji/google/flag_kr.png differ
diff --git a/public/images/emoji/google/flag_ru.png b/public/images/emoji/google/flag_ru.png
index a92bbdbb8a7..f42d2705cf8 100644
Binary files a/public/images/emoji/google/flag_ru.png and b/public/images/emoji/google/flag_ru.png differ
diff --git a/public/images/emoji/google/flag_us.png b/public/images/emoji/google/flag_us.png
index fae42715118..44daa439470 100644
Binary files a/public/images/emoji/google/flag_us.png and b/public/images/emoji/google/flag_us.png differ
diff --git a/public/images/emoji/google/flag_white.png b/public/images/emoji/google/flag_white.png
index 7876a1b95cc..07d1f0ac704 100644
Binary files a/public/images/emoji/google/flag_white.png and b/public/images/emoji/google/flag_white.png differ
diff --git a/public/images/emoji/google/flags.png b/public/images/emoji/google/flags.png
index ed7ac4373a8..43fb86cb942 100644
Binary files a/public/images/emoji/google/flags.png and b/public/images/emoji/google/flags.png differ
diff --git a/public/images/emoji/google/flame.png b/public/images/emoji/google/flame.png
index 7b17db8d7a0..56800b219db 100644
Binary files a/public/images/emoji/google/flame.png and b/public/images/emoji/google/flame.png differ
diff --git a/public/images/emoji/google/flashlight.png b/public/images/emoji/google/flashlight.png
index 5a7b9949948..9fa7a8855dd 100644
Binary files a/public/images/emoji/google/flashlight.png and b/public/images/emoji/google/flashlight.png differ
diff --git a/public/images/emoji/google/fleur-de-lis.png b/public/images/emoji/google/fleur-de-lis.png
index 04b03079f5c..84f1ecdcd79 100644
Binary files a/public/images/emoji/google/fleur-de-lis.png and b/public/images/emoji/google/fleur-de-lis.png differ
diff --git a/public/images/emoji/google/fleur_de_lis.png b/public/images/emoji/google/fleur_de_lis.png
index 04b03079f5c..84f1ecdcd79 100644
Binary files a/public/images/emoji/google/fleur_de_lis.png and b/public/images/emoji/google/fleur_de_lis.png differ
diff --git a/public/images/emoji/google/flight_arrival.png b/public/images/emoji/google/flight_arrival.png
index e50c3233c24..baf6de740c7 100644
Binary files a/public/images/emoji/google/flight_arrival.png and b/public/images/emoji/google/flight_arrival.png differ
diff --git a/public/images/emoji/google/flight_departure.png b/public/images/emoji/google/flight_departure.png
index 0536d2b45ba..c5b13dc0883 100644
Binary files a/public/images/emoji/google/flight_departure.png and b/public/images/emoji/google/flight_departure.png differ
diff --git a/public/images/emoji/google/floppy_disk.png b/public/images/emoji/google/floppy_disk.png
index bb0382d33a9..e94e5adb092 100644
Binary files a/public/images/emoji/google/floppy_disk.png and b/public/images/emoji/google/floppy_disk.png differ
diff --git a/public/images/emoji/google/flower_playing_cards.png b/public/images/emoji/google/flower_playing_cards.png
index 46102e1a479..347bf56aca1 100644
Binary files a/public/images/emoji/google/flower_playing_cards.png and b/public/images/emoji/google/flower_playing_cards.png differ
diff --git a/public/images/emoji/google/flushed.png b/public/images/emoji/google/flushed.png
index 710d69d885c..023cde180d7 100644
Binary files a/public/images/emoji/google/flushed.png and b/public/images/emoji/google/flushed.png differ
diff --git a/public/images/emoji/google/flying_saucer.png b/public/images/emoji/google/flying_saucer.png
index 084840430f5..c1a5dc84ce2 100644
Binary files a/public/images/emoji/google/flying_saucer.png and b/public/images/emoji/google/flying_saucer.png differ
diff --git a/public/images/emoji/google/fog.png b/public/images/emoji/google/fog.png
index 223bc9d4ed5..6693869c10d 100644
Binary files a/public/images/emoji/google/fog.png and b/public/images/emoji/google/fog.png differ
diff --git a/public/images/emoji/google/foggy.png b/public/images/emoji/google/foggy.png
index 825600a6279..88b02cdbbd0 100644
Binary files a/public/images/emoji/google/foggy.png and b/public/images/emoji/google/foggy.png differ
diff --git a/public/images/emoji/google/football.png b/public/images/emoji/google/football.png
index 99b3759397a..40a9177beb9 100644
Binary files a/public/images/emoji/google/football.png and b/public/images/emoji/google/football.png differ
diff --git a/public/images/emoji/google/footprints.png b/public/images/emoji/google/footprints.png
index 31748106285..afb31661513 100644
Binary files a/public/images/emoji/google/footprints.png and b/public/images/emoji/google/footprints.png differ
diff --git a/public/images/emoji/google/fork_and_knife.png b/public/images/emoji/google/fork_and_knife.png
index ef075aaa230..25d8e5a2a4b 100644
Binary files a/public/images/emoji/google/fork_and_knife.png and b/public/images/emoji/google/fork_and_knife.png differ
diff --git a/public/images/emoji/google/fork_and_knife_with_plate.png b/public/images/emoji/google/fork_and_knife_with_plate.png
index a990ed2cbe4..c0ed1e0ed6b 100644
Binary files a/public/images/emoji/google/fork_and_knife_with_plate.png and b/public/images/emoji/google/fork_and_knife_with_plate.png differ
diff --git a/public/images/emoji/google/fork_knife_plate.png b/public/images/emoji/google/fork_knife_plate.png
index a990ed2cbe4..c0ed1e0ed6b 100644
Binary files a/public/images/emoji/google/fork_knife_plate.png and b/public/images/emoji/google/fork_knife_plate.png differ
diff --git a/public/images/emoji/google/fortune_cookie.png b/public/images/emoji/google/fortune_cookie.png
index 2a869b3482a..9874e4d428a 100644
Binary files a/public/images/emoji/google/fortune_cookie.png and b/public/images/emoji/google/fortune_cookie.png differ
diff --git a/public/images/emoji/google/fountain.png b/public/images/emoji/google/fountain.png
index 991937cf771..69e14cd2ea9 100644
Binary files a/public/images/emoji/google/fountain.png and b/public/images/emoji/google/fountain.png differ
diff --git a/public/images/emoji/google/fountain_pen.png b/public/images/emoji/google/fountain_pen.png
index a06fcdc40e4..3d8ba60471d 100644
Binary files a/public/images/emoji/google/fountain_pen.png and b/public/images/emoji/google/fountain_pen.png differ
diff --git a/public/images/emoji/google/four.png b/public/images/emoji/google/four.png
index 819b70348c2..fa8956aeb5b 100644
Binary files a/public/images/emoji/google/four.png and b/public/images/emoji/google/four.png differ
diff --git a/public/images/emoji/google/four_leaf_clover.png b/public/images/emoji/google/four_leaf_clover.png
index cdd7c8219ae..120a9a6dd84 100644
Binary files a/public/images/emoji/google/four_leaf_clover.png and b/public/images/emoji/google/four_leaf_clover.png differ
diff --git a/public/images/emoji/google/fox_face.png b/public/images/emoji/google/fox_face.png
index 4cbbe2f5665..c53e2395718 100644
Binary files a/public/images/emoji/google/fox_face.png and b/public/images/emoji/google/fox_face.png differ
diff --git a/public/images/emoji/google/fr.png b/public/images/emoji/google/fr.png
index bc63af1def5..b836e555dea 100644
Binary files a/public/images/emoji/google/fr.png and b/public/images/emoji/google/fr.png differ
diff --git a/public/images/emoji/google/frame_photo.png b/public/images/emoji/google/frame_photo.png
index 2e0fbe54bb7..ff74a48b6e7 100644
Binary files a/public/images/emoji/google/frame_photo.png and b/public/images/emoji/google/frame_photo.png differ
diff --git a/public/images/emoji/google/frame_with_picture.png b/public/images/emoji/google/frame_with_picture.png
index 2e0fbe54bb7..ff74a48b6e7 100644
Binary files a/public/images/emoji/google/frame_with_picture.png and b/public/images/emoji/google/frame_with_picture.png differ
diff --git a/public/images/emoji/google/framed_picture.png b/public/images/emoji/google/framed_picture.png
index 2e0fbe54bb7..ff74a48b6e7 100644
Binary files a/public/images/emoji/google/framed_picture.png and b/public/images/emoji/google/framed_picture.png differ
diff --git a/public/images/emoji/google/free.png b/public/images/emoji/google/free.png
index ae1a169d4da..45019d566ad 100644
Binary files a/public/images/emoji/google/free.png and b/public/images/emoji/google/free.png differ
diff --git a/public/images/emoji/google/french_guiana.png b/public/images/emoji/google/french_guiana.png
index dad0f8ce650..4faf7e252ef 100644
Binary files a/public/images/emoji/google/french_guiana.png and b/public/images/emoji/google/french_guiana.png differ
diff --git a/public/images/emoji/google/french_polynesia.png b/public/images/emoji/google/french_polynesia.png
index 2950f28c7a5..c9bdb3ae62b 100644
Binary files a/public/images/emoji/google/french_polynesia.png and b/public/images/emoji/google/french_polynesia.png differ
diff --git a/public/images/emoji/google/french_southern_territories.png b/public/images/emoji/google/french_southern_territories.png
index dad0f8ce650..4faf7e252ef 100644
Binary files a/public/images/emoji/google/french_southern_territories.png and b/public/images/emoji/google/french_southern_territories.png differ
diff --git a/public/images/emoji/google/fried_egg.png b/public/images/emoji/google/fried_egg.png
index 5259cc766c7..3091a829017 100644
Binary files a/public/images/emoji/google/fried_egg.png and b/public/images/emoji/google/fried_egg.png differ
diff --git a/public/images/emoji/google/fried_shrimp.png b/public/images/emoji/google/fried_shrimp.png
index 6fd40834eae..03d4376047c 100644
Binary files a/public/images/emoji/google/fried_shrimp.png and b/public/images/emoji/google/fried_shrimp.png differ
diff --git a/public/images/emoji/google/fries.png b/public/images/emoji/google/fries.png
index be0344d9c23..fa6218a5f12 100644
Binary files a/public/images/emoji/google/fries.png and b/public/images/emoji/google/fries.png differ
diff --git a/public/images/emoji/google/frog.png b/public/images/emoji/google/frog.png
index 52eb71fa2b6..f29051d8179 100644
Binary files a/public/images/emoji/google/frog.png and b/public/images/emoji/google/frog.png differ
diff --git a/public/images/emoji/google/frowning.png b/public/images/emoji/google/frowning.png
index 401412e202c..6ea95a7ce09 100644
Binary files a/public/images/emoji/google/frowning.png and b/public/images/emoji/google/frowning.png differ
diff --git a/public/images/emoji/google/frowning2.png b/public/images/emoji/google/frowning2.png
index 7248eaba8ac..a8a41ad7c25 100644
Binary files a/public/images/emoji/google/frowning2.png and b/public/images/emoji/google/frowning2.png differ
diff --git a/public/images/emoji/google/frowning_face.png b/public/images/emoji/google/frowning_face.png
index 7248eaba8ac..a8a41ad7c25 100644
Binary files a/public/images/emoji/google/frowning_face.png and b/public/images/emoji/google/frowning_face.png differ
diff --git a/public/images/emoji/google/frowning_man.png b/public/images/emoji/google/frowning_man.png
index e09bd0a7906..7c04b60e67d 100644
Binary files a/public/images/emoji/google/frowning_man.png and b/public/images/emoji/google/frowning_man.png differ
diff --git a/public/images/emoji/google/frowning_man/2.png b/public/images/emoji/google/frowning_man/2.png
index 8f5bbc4c8c5..f62a4e43e92 100644
Binary files a/public/images/emoji/google/frowning_man/2.png and b/public/images/emoji/google/frowning_man/2.png differ
diff --git a/public/images/emoji/google/frowning_man/3.png b/public/images/emoji/google/frowning_man/3.png
index 57bbd5e6452..dc9c7b19e9f 100644
Binary files a/public/images/emoji/google/frowning_man/3.png and b/public/images/emoji/google/frowning_man/3.png differ
diff --git a/public/images/emoji/google/frowning_man/4.png b/public/images/emoji/google/frowning_man/4.png
index b012c61440f..3b6d32f2d86 100644
Binary files a/public/images/emoji/google/frowning_man/4.png and b/public/images/emoji/google/frowning_man/4.png differ
diff --git a/public/images/emoji/google/frowning_man/5.png b/public/images/emoji/google/frowning_man/5.png
index a78912cd69d..c7f3f3af057 100644
Binary files a/public/images/emoji/google/frowning_man/5.png and b/public/images/emoji/google/frowning_man/5.png differ
diff --git a/public/images/emoji/google/frowning_man/6.png b/public/images/emoji/google/frowning_man/6.png
index 4da9b0198e5..81b5c20f8a2 100644
Binary files a/public/images/emoji/google/frowning_man/6.png and b/public/images/emoji/google/frowning_man/6.png differ
diff --git a/public/images/emoji/google/frowning_woman.png b/public/images/emoji/google/frowning_woman.png
index 4667b907ddf..0378dfe42ed 100644
Binary files a/public/images/emoji/google/frowning_woman.png and b/public/images/emoji/google/frowning_woman.png differ
diff --git a/public/images/emoji/google/frowning_woman/2.png b/public/images/emoji/google/frowning_woman/2.png
index 16f321b8aeb..5dfe5baa820 100644
Binary files a/public/images/emoji/google/frowning_woman/2.png and b/public/images/emoji/google/frowning_woman/2.png differ
diff --git a/public/images/emoji/google/frowning_woman/3.png b/public/images/emoji/google/frowning_woman/3.png
index bd6c5e162fb..7078357053e 100644
Binary files a/public/images/emoji/google/frowning_woman/3.png and b/public/images/emoji/google/frowning_woman/3.png differ
diff --git a/public/images/emoji/google/frowning_woman/4.png b/public/images/emoji/google/frowning_woman/4.png
index 72f848c863c..6671e11299d 100644
Binary files a/public/images/emoji/google/frowning_woman/4.png and b/public/images/emoji/google/frowning_woman/4.png differ
diff --git a/public/images/emoji/google/frowning_woman/5.png b/public/images/emoji/google/frowning_woman/5.png
index 863caa54338..9d0a301c074 100644
Binary files a/public/images/emoji/google/frowning_woman/5.png and b/public/images/emoji/google/frowning_woman/5.png differ
diff --git a/public/images/emoji/google/frowning_woman/6.png b/public/images/emoji/google/frowning_woman/6.png
index d1936f11235..f41f82046b7 100644
Binary files a/public/images/emoji/google/frowning_woman/6.png and b/public/images/emoji/google/frowning_woman/6.png differ
diff --git a/public/images/emoji/google/fu.png b/public/images/emoji/google/fu.png
index 8ce128b147d..71e8d8b3e9c 100644
Binary files a/public/images/emoji/google/fu.png and b/public/images/emoji/google/fu.png differ
diff --git a/public/images/emoji/google/fu/2.png b/public/images/emoji/google/fu/2.png
index 3313e7e2f07..da4e50ac5e1 100644
Binary files a/public/images/emoji/google/fu/2.png and b/public/images/emoji/google/fu/2.png differ
diff --git a/public/images/emoji/google/fu/3.png b/public/images/emoji/google/fu/3.png
index 916b42be04a..785bc194551 100644
Binary files a/public/images/emoji/google/fu/3.png and b/public/images/emoji/google/fu/3.png differ
diff --git a/public/images/emoji/google/fu/4.png b/public/images/emoji/google/fu/4.png
index 7ab3507e2cd..f55cc136fc4 100644
Binary files a/public/images/emoji/google/fu/4.png and b/public/images/emoji/google/fu/4.png differ
diff --git a/public/images/emoji/google/fu/5.png b/public/images/emoji/google/fu/5.png
index aeb15696e62..a2ed1b0443a 100644
Binary files a/public/images/emoji/google/fu/5.png and b/public/images/emoji/google/fu/5.png differ
diff --git a/public/images/emoji/google/fu/6.png b/public/images/emoji/google/fu/6.png
index 8e864665145..cf73dfc6402 100644
Binary files a/public/images/emoji/google/fu/6.png and b/public/images/emoji/google/fu/6.png differ
diff --git a/public/images/emoji/google/fuelpump.png b/public/images/emoji/google/fuelpump.png
index 1c64f34d066..7f5ed77e62d 100644
Binary files a/public/images/emoji/google/fuelpump.png and b/public/images/emoji/google/fuelpump.png differ
diff --git a/public/images/emoji/google/full_moon.png b/public/images/emoji/google/full_moon.png
index 8e591964a89..52e5f1b1d4b 100644
Binary files a/public/images/emoji/google/full_moon.png and b/public/images/emoji/google/full_moon.png differ
diff --git a/public/images/emoji/google/full_moon_with_face.png b/public/images/emoji/google/full_moon_with_face.png
index b43bda183a1..cdafaa94a1b 100644
Binary files a/public/images/emoji/google/full_moon_with_face.png and b/public/images/emoji/google/full_moon_with_face.png differ
diff --git a/public/images/emoji/google/funeral_urn.png b/public/images/emoji/google/funeral_urn.png
index 864d903a351..22764683568 100644
Binary files a/public/images/emoji/google/funeral_urn.png and b/public/images/emoji/google/funeral_urn.png differ
diff --git a/public/images/emoji/google/gabon.png b/public/images/emoji/google/gabon.png
index 34a24616483..0d07cbdb152 100644
Binary files a/public/images/emoji/google/gabon.png and b/public/images/emoji/google/gabon.png differ
diff --git a/public/images/emoji/google/gambia.png b/public/images/emoji/google/gambia.png
index 96e8ea845c8..09cf69ab20d 100644
Binary files a/public/images/emoji/google/gambia.png and b/public/images/emoji/google/gambia.png differ
diff --git a/public/images/emoji/google/game_die.png b/public/images/emoji/google/game_die.png
index 4e0b58ab279..90def81e5df 100644
Binary files a/public/images/emoji/google/game_die.png and b/public/images/emoji/google/game_die.png differ
diff --git a/public/images/emoji/google/gb.png b/public/images/emoji/google/gb.png
index 798328a1ee2..e7f3da7ea8c 100644
Binary files a/public/images/emoji/google/gb.png and b/public/images/emoji/google/gb.png differ
diff --git a/public/images/emoji/google/gear.png b/public/images/emoji/google/gear.png
index 10881a48026..388f1cc6b58 100644
Binary files a/public/images/emoji/google/gear.png and b/public/images/emoji/google/gear.png differ
diff --git a/public/images/emoji/google/gem.png b/public/images/emoji/google/gem.png
index d5e8f5220e0..f0518d8cf9e 100644
Binary files a/public/images/emoji/google/gem.png and b/public/images/emoji/google/gem.png differ
diff --git a/public/images/emoji/google/gemini.png b/public/images/emoji/google/gemini.png
index 08e86865dd9..a7c2a1448ea 100644
Binary files a/public/images/emoji/google/gemini.png and b/public/images/emoji/google/gemini.png differ
diff --git a/public/images/emoji/google/genie.png b/public/images/emoji/google/genie.png
index 2edad6a9a15..19c606d424c 100644
Binary files a/public/images/emoji/google/genie.png and b/public/images/emoji/google/genie.png differ
diff --git a/public/images/emoji/google/georgia.png b/public/images/emoji/google/georgia.png
index 0bb8fbc7384..9f21b04f7ec 100644
Binary files a/public/images/emoji/google/georgia.png and b/public/images/emoji/google/georgia.png differ
diff --git a/public/images/emoji/google/ghana.png b/public/images/emoji/google/ghana.png
index e9a9cef6a17..f145d43c5a4 100644
Binary files a/public/images/emoji/google/ghana.png and b/public/images/emoji/google/ghana.png differ
diff --git a/public/images/emoji/google/ghost.png b/public/images/emoji/google/ghost.png
index 5a480fdd902..0733991c67a 100644
Binary files a/public/images/emoji/google/ghost.png and b/public/images/emoji/google/ghost.png differ
diff --git a/public/images/emoji/google/gibraltar.png b/public/images/emoji/google/gibraltar.png
index c84d89c6eca..e874972a0f1 100644
Binary files a/public/images/emoji/google/gibraltar.png and b/public/images/emoji/google/gibraltar.png differ
diff --git a/public/images/emoji/google/gift.png b/public/images/emoji/google/gift.png
index 4b64280a4a1..15442c00b8f 100644
Binary files a/public/images/emoji/google/gift.png and b/public/images/emoji/google/gift.png differ
diff --git a/public/images/emoji/google/gift_heart.png b/public/images/emoji/google/gift_heart.png
index 095265e17ab..5cfe77ab2e8 100644
Binary files a/public/images/emoji/google/gift_heart.png and b/public/images/emoji/google/gift_heart.png differ
diff --git a/public/images/emoji/google/giraffe.png b/public/images/emoji/google/giraffe.png
index 1bfe48b2ce2..9f5d19d3b48 100644
Binary files a/public/images/emoji/google/giraffe.png and b/public/images/emoji/google/giraffe.png differ
diff --git a/public/images/emoji/google/girl.png b/public/images/emoji/google/girl.png
index e7c8862e089..8d0daa3dcde 100644
Binary files a/public/images/emoji/google/girl.png and b/public/images/emoji/google/girl.png differ
diff --git a/public/images/emoji/google/girl/2.png b/public/images/emoji/google/girl/2.png
index 6116182f27b..8e0b69c2cdd 100644
Binary files a/public/images/emoji/google/girl/2.png and b/public/images/emoji/google/girl/2.png differ
diff --git a/public/images/emoji/google/girl/3.png b/public/images/emoji/google/girl/3.png
index 0179a03094e..b279f785ce0 100644
Binary files a/public/images/emoji/google/girl/3.png and b/public/images/emoji/google/girl/3.png differ
diff --git a/public/images/emoji/google/girl/4.png b/public/images/emoji/google/girl/4.png
index 46b6a6a7082..037a44bb3c3 100644
Binary files a/public/images/emoji/google/girl/4.png and b/public/images/emoji/google/girl/4.png differ
diff --git a/public/images/emoji/google/girl/5.png b/public/images/emoji/google/girl/5.png
index 49613bc6c33..25ac6201968 100644
Binary files a/public/images/emoji/google/girl/5.png and b/public/images/emoji/google/girl/5.png differ
diff --git a/public/images/emoji/google/girl/6.png b/public/images/emoji/google/girl/6.png
index d8532bee944..9462caebecd 100644
Binary files a/public/images/emoji/google/girl/6.png and b/public/images/emoji/google/girl/6.png differ
diff --git a/public/images/emoji/google/globe_with_meridians.png b/public/images/emoji/google/globe_with_meridians.png
index fbf3a52cc58..fb2d85c999d 100644
Binary files a/public/images/emoji/google/globe_with_meridians.png and b/public/images/emoji/google/globe_with_meridians.png differ
diff --git a/public/images/emoji/google/gloves.png b/public/images/emoji/google/gloves.png
index 099b209a922..f7a133190a2 100644
Binary files a/public/images/emoji/google/gloves.png and b/public/images/emoji/google/gloves.png differ
diff --git a/public/images/emoji/google/goal_net.png b/public/images/emoji/google/goal_net.png
index b697e2a2e3d..12e3b0dc32e 100644
Binary files a/public/images/emoji/google/goal_net.png and b/public/images/emoji/google/goal_net.png differ
diff --git a/public/images/emoji/google/goat.png b/public/images/emoji/google/goat.png
index 9b4be817e33..7958b1d38f6 100644
Binary files a/public/images/emoji/google/goat.png and b/public/images/emoji/google/goat.png differ
diff --git a/public/images/emoji/google/golf.png b/public/images/emoji/google/golf.png
index 79a7bca0743..894702a9b0c 100644
Binary files a/public/images/emoji/google/golf.png and b/public/images/emoji/google/golf.png differ
diff --git a/public/images/emoji/google/golfer.png b/public/images/emoji/google/golfer.png
index c1f1277d413..62d945bfe86 100644
Binary files a/public/images/emoji/google/golfer.png and b/public/images/emoji/google/golfer.png differ
diff --git a/public/images/emoji/google/golfer/2.png b/public/images/emoji/google/golfer/2.png
index e0a520c4c1f..766db891383 100644
Binary files a/public/images/emoji/google/golfer/2.png and b/public/images/emoji/google/golfer/2.png differ
diff --git a/public/images/emoji/google/golfer/3.png b/public/images/emoji/google/golfer/3.png
index dc70809ff37..59371d55eaa 100644
Binary files a/public/images/emoji/google/golfer/3.png and b/public/images/emoji/google/golfer/3.png differ
diff --git a/public/images/emoji/google/golfer/4.png b/public/images/emoji/google/golfer/4.png
index 482d5d5dad6..61c8022fe1e 100644
Binary files a/public/images/emoji/google/golfer/4.png and b/public/images/emoji/google/golfer/4.png differ
diff --git a/public/images/emoji/google/golfer/5.png b/public/images/emoji/google/golfer/5.png
index e3a8b44424c..cd5dffdc33c 100644
Binary files a/public/images/emoji/google/golfer/5.png and b/public/images/emoji/google/golfer/5.png differ
diff --git a/public/images/emoji/google/golfer/6.png b/public/images/emoji/google/golfer/6.png
index 19550ce7ceb..8f34f5bdb9b 100644
Binary files a/public/images/emoji/google/golfer/6.png and b/public/images/emoji/google/golfer/6.png differ
diff --git a/public/images/emoji/google/golfing_man.png b/public/images/emoji/google/golfing_man.png
index c1f1277d413..62d945bfe86 100644
Binary files a/public/images/emoji/google/golfing_man.png and b/public/images/emoji/google/golfing_man.png differ
diff --git a/public/images/emoji/google/golfing_man/2.png b/public/images/emoji/google/golfing_man/2.png
index e0a520c4c1f..766db891383 100644
Binary files a/public/images/emoji/google/golfing_man/2.png and b/public/images/emoji/google/golfing_man/2.png differ
diff --git a/public/images/emoji/google/golfing_man/3.png b/public/images/emoji/google/golfing_man/3.png
index dc70809ff37..59371d55eaa 100644
Binary files a/public/images/emoji/google/golfing_man/3.png and b/public/images/emoji/google/golfing_man/3.png differ
diff --git a/public/images/emoji/google/golfing_man/4.png b/public/images/emoji/google/golfing_man/4.png
index 482d5d5dad6..61c8022fe1e 100644
Binary files a/public/images/emoji/google/golfing_man/4.png and b/public/images/emoji/google/golfing_man/4.png differ
diff --git a/public/images/emoji/google/golfing_man/5.png b/public/images/emoji/google/golfing_man/5.png
index e3a8b44424c..cd5dffdc33c 100644
Binary files a/public/images/emoji/google/golfing_man/5.png and b/public/images/emoji/google/golfing_man/5.png differ
diff --git a/public/images/emoji/google/golfing_man/6.png b/public/images/emoji/google/golfing_man/6.png
index 19550ce7ceb..8f34f5bdb9b 100644
Binary files a/public/images/emoji/google/golfing_man/6.png and b/public/images/emoji/google/golfing_man/6.png differ
diff --git a/public/images/emoji/google/golfing_woman.png b/public/images/emoji/google/golfing_woman.png
index 652de949dcd..0b2cec74114 100644
Binary files a/public/images/emoji/google/golfing_woman.png and b/public/images/emoji/google/golfing_woman.png differ
diff --git a/public/images/emoji/google/gorilla.png b/public/images/emoji/google/gorilla.png
index 979e729d224..89bd5c51edb 100644
Binary files a/public/images/emoji/google/gorilla.png and b/public/images/emoji/google/gorilla.png differ
diff --git a/public/images/emoji/google/grandma.png b/public/images/emoji/google/grandma.png
index 4aeba637f78..1d07afb892d 100644
Binary files a/public/images/emoji/google/grandma.png and b/public/images/emoji/google/grandma.png differ
diff --git a/public/images/emoji/google/grandma/2.png b/public/images/emoji/google/grandma/2.png
index 905e8a98b37..f90619f8b69 100644
Binary files a/public/images/emoji/google/grandma/2.png and b/public/images/emoji/google/grandma/2.png differ
diff --git a/public/images/emoji/google/grandma/3.png b/public/images/emoji/google/grandma/3.png
index 7d9c997674c..2147d16fd6e 100644
Binary files a/public/images/emoji/google/grandma/3.png and b/public/images/emoji/google/grandma/3.png differ
diff --git a/public/images/emoji/google/grandma/4.png b/public/images/emoji/google/grandma/4.png
index 69a9c179106..696d222a849 100644
Binary files a/public/images/emoji/google/grandma/4.png and b/public/images/emoji/google/grandma/4.png differ
diff --git a/public/images/emoji/google/grandma/5.png b/public/images/emoji/google/grandma/5.png
index 7ae4d8ea045..a23935d452a 100644
Binary files a/public/images/emoji/google/grandma/5.png and b/public/images/emoji/google/grandma/5.png differ
diff --git a/public/images/emoji/google/grandma/6.png b/public/images/emoji/google/grandma/6.png
index 89542a23302..00c9ec642c4 100644
Binary files a/public/images/emoji/google/grandma/6.png and b/public/images/emoji/google/grandma/6.png differ
diff --git a/public/images/emoji/google/grapes.png b/public/images/emoji/google/grapes.png
index c089a8c087d..391f9005dcb 100644
Binary files a/public/images/emoji/google/grapes.png and b/public/images/emoji/google/grapes.png differ
diff --git a/public/images/emoji/google/greece.png b/public/images/emoji/google/greece.png
index 151e38cec94..a54c5a38534 100644
Binary files a/public/images/emoji/google/greece.png and b/public/images/emoji/google/greece.png differ
diff --git a/public/images/emoji/google/green_apple.png b/public/images/emoji/google/green_apple.png
index 5ed58e60e15..1ce9eaa20ec 100644
Binary files a/public/images/emoji/google/green_apple.png and b/public/images/emoji/google/green_apple.png differ
diff --git a/public/images/emoji/google/green_book.png b/public/images/emoji/google/green_book.png
index 635cf13f993..ae6885adc5c 100644
Binary files a/public/images/emoji/google/green_book.png and b/public/images/emoji/google/green_book.png differ
diff --git a/public/images/emoji/google/green_heart.png b/public/images/emoji/google/green_heart.png
index dc4d3acea35..cde0bf984ec 100644
Binary files a/public/images/emoji/google/green_heart.png and b/public/images/emoji/google/green_heart.png differ
diff --git a/public/images/emoji/google/green_salad.png b/public/images/emoji/google/green_salad.png
index adce2051802..4f88c9842e1 100644
Binary files a/public/images/emoji/google/green_salad.png and b/public/images/emoji/google/green_salad.png differ
diff --git a/public/images/emoji/google/greenland.png b/public/images/emoji/google/greenland.png
index 01d30e7701b..1ab257cd064 100644
Binary files a/public/images/emoji/google/greenland.png and b/public/images/emoji/google/greenland.png differ
diff --git a/public/images/emoji/google/grenada.png b/public/images/emoji/google/grenada.png
index f010bf6f4e9..43f6d8c2cd2 100644
Binary files a/public/images/emoji/google/grenada.png and b/public/images/emoji/google/grenada.png differ
diff --git a/public/images/emoji/google/grey_exclamation.png b/public/images/emoji/google/grey_exclamation.png
index 61587566bee..fe132124ae3 100644
Binary files a/public/images/emoji/google/grey_exclamation.png and b/public/images/emoji/google/grey_exclamation.png differ
diff --git a/public/images/emoji/google/grey_question.png b/public/images/emoji/google/grey_question.png
index 7ac39ecd096..2078b5ed745 100644
Binary files a/public/images/emoji/google/grey_question.png and b/public/images/emoji/google/grey_question.png differ
diff --git a/public/images/emoji/google/grimacing.png b/public/images/emoji/google/grimacing.png
index 7ea69942a8b..6053a903cbd 100644
Binary files a/public/images/emoji/google/grimacing.png and b/public/images/emoji/google/grimacing.png differ
diff --git a/public/images/emoji/google/grin.png b/public/images/emoji/google/grin.png
index 09a880d2f09..963c41fa42a 100644
Binary files a/public/images/emoji/google/grin.png and b/public/images/emoji/google/grin.png differ
diff --git a/public/images/emoji/google/grinning.png b/public/images/emoji/google/grinning.png
index 4ab16b8d763..75116805a9b 100644
Binary files a/public/images/emoji/google/grinning.png and b/public/images/emoji/google/grinning.png differ
diff --git a/public/images/emoji/google/guadeloupe.png b/public/images/emoji/google/guadeloupe.png
index dad0f8ce650..4faf7e252ef 100644
Binary files a/public/images/emoji/google/guadeloupe.png and b/public/images/emoji/google/guadeloupe.png differ
diff --git a/public/images/emoji/google/guam.png b/public/images/emoji/google/guam.png
index efc6cb9d32e..9a679174cb3 100644
Binary files a/public/images/emoji/google/guam.png and b/public/images/emoji/google/guam.png differ
diff --git a/public/images/emoji/google/guardsman.png b/public/images/emoji/google/guardsman.png
index 019f2c6bbaa..bbaa4b095f2 100644
Binary files a/public/images/emoji/google/guardsman.png and b/public/images/emoji/google/guardsman.png differ
diff --git a/public/images/emoji/google/guardsman/2.png b/public/images/emoji/google/guardsman/2.png
index d8e776c409f..f5a8770fed7 100644
Binary files a/public/images/emoji/google/guardsman/2.png and b/public/images/emoji/google/guardsman/2.png differ
diff --git a/public/images/emoji/google/guardsman/3.png b/public/images/emoji/google/guardsman/3.png
index eae8cd6091e..e124be18fa3 100644
Binary files a/public/images/emoji/google/guardsman/3.png and b/public/images/emoji/google/guardsman/3.png differ
diff --git a/public/images/emoji/google/guardsman/4.png b/public/images/emoji/google/guardsman/4.png
index 497251d3503..29c835d935e 100644
Binary files a/public/images/emoji/google/guardsman/4.png and b/public/images/emoji/google/guardsman/4.png differ
diff --git a/public/images/emoji/google/guardsman/5.png b/public/images/emoji/google/guardsman/5.png
index ce94c2f9348..e790f16f051 100644
Binary files a/public/images/emoji/google/guardsman/5.png and b/public/images/emoji/google/guardsman/5.png differ
diff --git a/public/images/emoji/google/guardsman/6.png b/public/images/emoji/google/guardsman/6.png
index 5474f51f938..d54280f95e8 100644
Binary files a/public/images/emoji/google/guardsman/6.png and b/public/images/emoji/google/guardsman/6.png differ
diff --git a/public/images/emoji/google/guardswoman.png b/public/images/emoji/google/guardswoman.png
index 4719e71121d..b7b1af5e2c9 100644
Binary files a/public/images/emoji/google/guardswoman.png and b/public/images/emoji/google/guardswoman.png differ
diff --git a/public/images/emoji/google/guardswoman/2.png b/public/images/emoji/google/guardswoman/2.png
index 511ba38698c..a0d6429c1e8 100644
Binary files a/public/images/emoji/google/guardswoman/2.png and b/public/images/emoji/google/guardswoman/2.png differ
diff --git a/public/images/emoji/google/guardswoman/3.png b/public/images/emoji/google/guardswoman/3.png
index 9c07dc8ed1f..ead71af605c 100644
Binary files a/public/images/emoji/google/guardswoman/3.png and b/public/images/emoji/google/guardswoman/3.png differ
diff --git a/public/images/emoji/google/guardswoman/4.png b/public/images/emoji/google/guardswoman/4.png
index 3b0958971e0..8b20610b98b 100644
Binary files a/public/images/emoji/google/guardswoman/4.png and b/public/images/emoji/google/guardswoman/4.png differ
diff --git a/public/images/emoji/google/guardswoman/5.png b/public/images/emoji/google/guardswoman/5.png
index 4596eb5248d..80f525f6c94 100644
Binary files a/public/images/emoji/google/guardswoman/5.png and b/public/images/emoji/google/guardswoman/5.png differ
diff --git a/public/images/emoji/google/guardswoman/6.png b/public/images/emoji/google/guardswoman/6.png
index dff612d4cae..332a4191f97 100644
Binary files a/public/images/emoji/google/guardswoman/6.png and b/public/images/emoji/google/guardswoman/6.png differ
diff --git a/public/images/emoji/google/guatemala.png b/public/images/emoji/google/guatemala.png
index 48293adac15..e0e6188ff71 100644
Binary files a/public/images/emoji/google/guatemala.png and b/public/images/emoji/google/guatemala.png differ
diff --git a/public/images/emoji/google/guernsey.png b/public/images/emoji/google/guernsey.png
index 3afd4eb9434..8d162841236 100644
Binary files a/public/images/emoji/google/guernsey.png and b/public/images/emoji/google/guernsey.png differ
diff --git a/public/images/emoji/google/guinea.png b/public/images/emoji/google/guinea.png
index d366654a2bc..86b4aa84b0c 100644
Binary files a/public/images/emoji/google/guinea.png and b/public/images/emoji/google/guinea.png differ
diff --git a/public/images/emoji/google/guinea_bissau.png b/public/images/emoji/google/guinea_bissau.png
index 0eb63867a43..0fc5486c2a8 100644
Binary files a/public/images/emoji/google/guinea_bissau.png and b/public/images/emoji/google/guinea_bissau.png differ
diff --git a/public/images/emoji/google/guitar.png b/public/images/emoji/google/guitar.png
index 7e84d2f4291..4fd8cccea58 100644
Binary files a/public/images/emoji/google/guitar.png and b/public/images/emoji/google/guitar.png differ
diff --git a/public/images/emoji/google/gun.png b/public/images/emoji/google/gun.png
index d13d1f81a6e..0e86cc080a6 100644
Binary files a/public/images/emoji/google/gun.png and b/public/images/emoji/google/gun.png differ
diff --git a/public/images/emoji/google/guyana.png b/public/images/emoji/google/guyana.png
index 53a0bdf172e..3452f5bf8d2 100644
Binary files a/public/images/emoji/google/guyana.png and b/public/images/emoji/google/guyana.png differ
diff --git a/public/images/emoji/google/haircut.png b/public/images/emoji/google/haircut.png
index b64dccf57d0..dad82f0f4e8 100644
Binary files a/public/images/emoji/google/haircut.png and b/public/images/emoji/google/haircut.png differ
diff --git a/public/images/emoji/google/haircut/2.png b/public/images/emoji/google/haircut/2.png
index 9b287229ed8..35bccc0cebb 100644
Binary files a/public/images/emoji/google/haircut/2.png and b/public/images/emoji/google/haircut/2.png differ
diff --git a/public/images/emoji/google/haircut/3.png b/public/images/emoji/google/haircut/3.png
index 4f8a650ba75..a4e9d3e382a 100644
Binary files a/public/images/emoji/google/haircut/3.png and b/public/images/emoji/google/haircut/3.png differ
diff --git a/public/images/emoji/google/haircut/4.png b/public/images/emoji/google/haircut/4.png
index b2132465b8a..091d0ae377c 100644
Binary files a/public/images/emoji/google/haircut/4.png and b/public/images/emoji/google/haircut/4.png differ
diff --git a/public/images/emoji/google/haircut/5.png b/public/images/emoji/google/haircut/5.png
index e90a8932a01..4a1f0e9f28e 100644
Binary files a/public/images/emoji/google/haircut/5.png and b/public/images/emoji/google/haircut/5.png differ
diff --git a/public/images/emoji/google/haircut/6.png b/public/images/emoji/google/haircut/6.png
index ae756aad3db..195e7d84093 100644
Binary files a/public/images/emoji/google/haircut/6.png and b/public/images/emoji/google/haircut/6.png differ
diff --git a/public/images/emoji/google/haircut_man.png b/public/images/emoji/google/haircut_man.png
index b3a1d14243f..f629747bf67 100644
Binary files a/public/images/emoji/google/haircut_man.png and b/public/images/emoji/google/haircut_man.png differ
diff --git a/public/images/emoji/google/haircut_man/2.png b/public/images/emoji/google/haircut_man/2.png
index fbc63a18f4e..92768708df8 100644
Binary files a/public/images/emoji/google/haircut_man/2.png and b/public/images/emoji/google/haircut_man/2.png differ
diff --git a/public/images/emoji/google/haircut_man/3.png b/public/images/emoji/google/haircut_man/3.png
index 97bc65feea7..473925915db 100644
Binary files a/public/images/emoji/google/haircut_man/3.png and b/public/images/emoji/google/haircut_man/3.png differ
diff --git a/public/images/emoji/google/haircut_man/4.png b/public/images/emoji/google/haircut_man/4.png
index b3cc9b94d25..8dcd25e46e9 100644
Binary files a/public/images/emoji/google/haircut_man/4.png and b/public/images/emoji/google/haircut_man/4.png differ
diff --git a/public/images/emoji/google/haircut_man/5.png b/public/images/emoji/google/haircut_man/5.png
index 1a8e477d57d..060ecb08cad 100644
Binary files a/public/images/emoji/google/haircut_man/5.png and b/public/images/emoji/google/haircut_man/5.png differ
diff --git a/public/images/emoji/google/haircut_man/6.png b/public/images/emoji/google/haircut_man/6.png
index 1194faf9848..45759953092 100644
Binary files a/public/images/emoji/google/haircut_man/6.png and b/public/images/emoji/google/haircut_man/6.png differ
diff --git a/public/images/emoji/google/haircut_woman.png b/public/images/emoji/google/haircut_woman.png
index b64dccf57d0..dad82f0f4e8 100644
Binary files a/public/images/emoji/google/haircut_woman.png and b/public/images/emoji/google/haircut_woman.png differ
diff --git a/public/images/emoji/google/haircut_woman/2.png b/public/images/emoji/google/haircut_woman/2.png
index 9b287229ed8..35bccc0cebb 100644
Binary files a/public/images/emoji/google/haircut_woman/2.png and b/public/images/emoji/google/haircut_woman/2.png differ
diff --git a/public/images/emoji/google/haircut_woman/3.png b/public/images/emoji/google/haircut_woman/3.png
index 4f8a650ba75..a4e9d3e382a 100644
Binary files a/public/images/emoji/google/haircut_woman/3.png and b/public/images/emoji/google/haircut_woman/3.png differ
diff --git a/public/images/emoji/google/haircut_woman/4.png b/public/images/emoji/google/haircut_woman/4.png
index b2132465b8a..091d0ae377c 100644
Binary files a/public/images/emoji/google/haircut_woman/4.png and b/public/images/emoji/google/haircut_woman/4.png differ
diff --git a/public/images/emoji/google/haircut_woman/5.png b/public/images/emoji/google/haircut_woman/5.png
index e90a8932a01..4a1f0e9f28e 100644
Binary files a/public/images/emoji/google/haircut_woman/5.png and b/public/images/emoji/google/haircut_woman/5.png differ
diff --git a/public/images/emoji/google/haircut_woman/6.png b/public/images/emoji/google/haircut_woman/6.png
index ae756aad3db..195e7d84093 100644
Binary files a/public/images/emoji/google/haircut_woman/6.png and b/public/images/emoji/google/haircut_woman/6.png differ
diff --git a/public/images/emoji/google/haiti.png b/public/images/emoji/google/haiti.png
index 31aabf88a10..14359b7264c 100644
Binary files a/public/images/emoji/google/haiti.png and b/public/images/emoji/google/haiti.png differ
diff --git a/public/images/emoji/google/hamburger.png b/public/images/emoji/google/hamburger.png
index 7b5619b619d..9cf2945dbe3 100644
Binary files a/public/images/emoji/google/hamburger.png and b/public/images/emoji/google/hamburger.png differ
diff --git a/public/images/emoji/google/hammer.png b/public/images/emoji/google/hammer.png
index 055b25f23a5..9de50231ece 100644
Binary files a/public/images/emoji/google/hammer.png and b/public/images/emoji/google/hammer.png differ
diff --git a/public/images/emoji/google/hammer_and_pick.png b/public/images/emoji/google/hammer_and_pick.png
index 8477e47e4c0..fe453343d86 100644
Binary files a/public/images/emoji/google/hammer_and_pick.png and b/public/images/emoji/google/hammer_and_pick.png differ
diff --git a/public/images/emoji/google/hammer_and_wrench.png b/public/images/emoji/google/hammer_and_wrench.png
index 174926ff02e..f0fe70817f3 100644
Binary files a/public/images/emoji/google/hammer_and_wrench.png and b/public/images/emoji/google/hammer_and_wrench.png differ
diff --git a/public/images/emoji/google/hammer_pick.png b/public/images/emoji/google/hammer_pick.png
index 8477e47e4c0..fe453343d86 100644
Binary files a/public/images/emoji/google/hammer_pick.png and b/public/images/emoji/google/hammer_pick.png differ
diff --git a/public/images/emoji/google/hamster.png b/public/images/emoji/google/hamster.png
index cdb2d29d8aa..8a5c4cb4795 100644
Binary files a/public/images/emoji/google/hamster.png and b/public/images/emoji/google/hamster.png differ
diff --git a/public/images/emoji/google/hand.png b/public/images/emoji/google/hand.png
index b916dc7f878..de95a849815 100644
Binary files a/public/images/emoji/google/hand.png and b/public/images/emoji/google/hand.png differ
diff --git a/public/images/emoji/google/hand/2.png b/public/images/emoji/google/hand/2.png
index e60690c77eb..d836026dac2 100644
Binary files a/public/images/emoji/google/hand/2.png and b/public/images/emoji/google/hand/2.png differ
diff --git a/public/images/emoji/google/hand/3.png b/public/images/emoji/google/hand/3.png
index 9aabb63f85f..be7f2cba1c3 100644
Binary files a/public/images/emoji/google/hand/3.png and b/public/images/emoji/google/hand/3.png differ
diff --git a/public/images/emoji/google/hand/4.png b/public/images/emoji/google/hand/4.png
index 86696653b53..e19034a4e0f 100644
Binary files a/public/images/emoji/google/hand/4.png and b/public/images/emoji/google/hand/4.png differ
diff --git a/public/images/emoji/google/hand/5.png b/public/images/emoji/google/hand/5.png
index 1e92c70971d..d564c273c7d 100644
Binary files a/public/images/emoji/google/hand/5.png and b/public/images/emoji/google/hand/5.png differ
diff --git a/public/images/emoji/google/hand/6.png b/public/images/emoji/google/hand/6.png
index 1e260d44614..6d24244b388 100644
Binary files a/public/images/emoji/google/hand/6.png and b/public/images/emoji/google/hand/6.png differ
diff --git a/public/images/emoji/google/hand_splayed.png b/public/images/emoji/google/hand_splayed.png
index f99fef5296b..12fee02f173 100644
Binary files a/public/images/emoji/google/hand_splayed.png and b/public/images/emoji/google/hand_splayed.png differ
diff --git a/public/images/emoji/google/hand_splayed/2.png b/public/images/emoji/google/hand_splayed/2.png
index 3f6b667ebe2..f9b441bae21 100644
Binary files a/public/images/emoji/google/hand_splayed/2.png and b/public/images/emoji/google/hand_splayed/2.png differ
diff --git a/public/images/emoji/google/hand_splayed/3.png b/public/images/emoji/google/hand_splayed/3.png
index 0a811f93d51..46bb5b97c32 100644
Binary files a/public/images/emoji/google/hand_splayed/3.png and b/public/images/emoji/google/hand_splayed/3.png differ
diff --git a/public/images/emoji/google/hand_splayed/4.png b/public/images/emoji/google/hand_splayed/4.png
index 21a92e444c9..244dbb61a6f 100644
Binary files a/public/images/emoji/google/hand_splayed/4.png and b/public/images/emoji/google/hand_splayed/4.png differ
diff --git a/public/images/emoji/google/hand_splayed/5.png b/public/images/emoji/google/hand_splayed/5.png
index f40f860c160..f2c26a02670 100644
Binary files a/public/images/emoji/google/hand_splayed/5.png and b/public/images/emoji/google/hand_splayed/5.png differ
diff --git a/public/images/emoji/google/hand_splayed/6.png b/public/images/emoji/google/hand_splayed/6.png
index b87967ff847..2cc07edb58a 100644
Binary files a/public/images/emoji/google/hand_splayed/6.png and b/public/images/emoji/google/hand_splayed/6.png differ
diff --git a/public/images/emoji/google/handbag.png b/public/images/emoji/google/handbag.png
index 3c9e331817b..2c20f745fb4 100644
Binary files a/public/images/emoji/google/handbag.png and b/public/images/emoji/google/handbag.png differ
diff --git a/public/images/emoji/google/handshake.png b/public/images/emoji/google/handshake.png
index 39a65a8d66b..26dd6b5491a 100644
Binary files a/public/images/emoji/google/handshake.png and b/public/images/emoji/google/handshake.png differ
diff --git a/public/images/emoji/google/hankey.png b/public/images/emoji/google/hankey.png
index b1d921d96c2..de476df01c1 100644
Binary files a/public/images/emoji/google/hankey.png and b/public/images/emoji/google/hankey.png differ
diff --git a/public/images/emoji/google/hash.png b/public/images/emoji/google/hash.png
index 3110e701f70..c0b84b964a8 100644
Binary files a/public/images/emoji/google/hash.png and b/public/images/emoji/google/hash.png differ
diff --git a/public/images/emoji/google/hatched_chick.png b/public/images/emoji/google/hatched_chick.png
index 59513c6a1da..aea53232bde 100644
Binary files a/public/images/emoji/google/hatched_chick.png and b/public/images/emoji/google/hatched_chick.png differ
diff --git a/public/images/emoji/google/hatching_chick.png b/public/images/emoji/google/hatching_chick.png
index 65b2c5b2781..cb467cf4d93 100644
Binary files a/public/images/emoji/google/hatching_chick.png and b/public/images/emoji/google/hatching_chick.png differ
diff --git a/public/images/emoji/google/head_bandage.png b/public/images/emoji/google/head_bandage.png
index e07d929a276..8618abf0ee2 100644
Binary files a/public/images/emoji/google/head_bandage.png and b/public/images/emoji/google/head_bandage.png differ
diff --git a/public/images/emoji/google/headphones.png b/public/images/emoji/google/headphones.png
index 294982aa8ec..d1927003594 100644
Binary files a/public/images/emoji/google/headphones.png and b/public/images/emoji/google/headphones.png differ
diff --git a/public/images/emoji/google/hear_no_evil.png b/public/images/emoji/google/hear_no_evil.png
index 31f768cf1af..babbbc3114e 100644
Binary files a/public/images/emoji/google/hear_no_evil.png and b/public/images/emoji/google/hear_no_evil.png differ
diff --git a/public/images/emoji/google/heard_and_mc_donald_islands.png b/public/images/emoji/google/heard_and_mc_donald_islands.png
index 7ef6056c335..fe795f0891f 100644
Binary files a/public/images/emoji/google/heard_and_mc_donald_islands.png and b/public/images/emoji/google/heard_and_mc_donald_islands.png differ
diff --git a/public/images/emoji/google/heart.png b/public/images/emoji/google/heart.png
index ab5223c5a0e..efe5045aaf4 100644
Binary files a/public/images/emoji/google/heart.png and b/public/images/emoji/google/heart.png differ
diff --git a/public/images/emoji/google/heart_decoration.png b/public/images/emoji/google/heart_decoration.png
index 7b44e071535..61efd3a7d01 100644
Binary files a/public/images/emoji/google/heart_decoration.png and b/public/images/emoji/google/heart_decoration.png differ
diff --git a/public/images/emoji/google/heart_exclamation.png b/public/images/emoji/google/heart_exclamation.png
index dd204a5c3e9..a465293831e 100644
Binary files a/public/images/emoji/google/heart_exclamation.png and b/public/images/emoji/google/heart_exclamation.png differ
diff --git a/public/images/emoji/google/heart_eyes.png b/public/images/emoji/google/heart_eyes.png
index 20585dfdec0..153a1932971 100644
Binary files a/public/images/emoji/google/heart_eyes.png and b/public/images/emoji/google/heart_eyes.png differ
diff --git a/public/images/emoji/google/heart_eyes_cat.png b/public/images/emoji/google/heart_eyes_cat.png
index 767f119d779..bcfeed0d8a9 100644
Binary files a/public/images/emoji/google/heart_eyes_cat.png and b/public/images/emoji/google/heart_eyes_cat.png differ
diff --git a/public/images/emoji/google/heartbeat.png b/public/images/emoji/google/heartbeat.png
index f60c3b9565c..eb73e5b128c 100644
Binary files a/public/images/emoji/google/heartbeat.png and b/public/images/emoji/google/heartbeat.png differ
diff --git a/public/images/emoji/google/heartpulse.png b/public/images/emoji/google/heartpulse.png
index 130312d82cd..6afab2f1edf 100644
Binary files a/public/images/emoji/google/heartpulse.png and b/public/images/emoji/google/heartpulse.png differ
diff --git a/public/images/emoji/google/hearts.png b/public/images/emoji/google/hearts.png
index c081114da50..80a50d493cb 100644
Binary files a/public/images/emoji/google/hearts.png and b/public/images/emoji/google/hearts.png differ
diff --git a/public/images/emoji/google/heavy_check_mark.png b/public/images/emoji/google/heavy_check_mark.png
index 73e2a7ccc6c..633cf8d619d 100644
Binary files a/public/images/emoji/google/heavy_check_mark.png and b/public/images/emoji/google/heavy_check_mark.png differ
diff --git a/public/images/emoji/google/heavy_division_sign.png b/public/images/emoji/google/heavy_division_sign.png
index 10cfd95b24c..0f8274255cd 100644
Binary files a/public/images/emoji/google/heavy_division_sign.png and b/public/images/emoji/google/heavy_division_sign.png differ
diff --git a/public/images/emoji/google/heavy_dollar_sign.png b/public/images/emoji/google/heavy_dollar_sign.png
index 7958910d977..9ca374652a3 100644
Binary files a/public/images/emoji/google/heavy_dollar_sign.png and b/public/images/emoji/google/heavy_dollar_sign.png differ
diff --git a/public/images/emoji/google/heavy_heart_exclamation.png b/public/images/emoji/google/heavy_heart_exclamation.png
index dd204a5c3e9..a465293831e 100644
Binary files a/public/images/emoji/google/heavy_heart_exclamation.png and b/public/images/emoji/google/heavy_heart_exclamation.png differ
diff --git a/public/images/emoji/google/heavy_heart_exclamation_mark_ornament.png b/public/images/emoji/google/heavy_heart_exclamation_mark_ornament.png
index dd204a5c3e9..a465293831e 100644
Binary files a/public/images/emoji/google/heavy_heart_exclamation_mark_ornament.png and b/public/images/emoji/google/heavy_heart_exclamation_mark_ornament.png differ
diff --git a/public/images/emoji/google/heavy_minus_sign.png b/public/images/emoji/google/heavy_minus_sign.png
index c5be3ff05f1..3f6a7458724 100644
Binary files a/public/images/emoji/google/heavy_minus_sign.png and b/public/images/emoji/google/heavy_minus_sign.png differ
diff --git a/public/images/emoji/google/heavy_multiplication_x.png b/public/images/emoji/google/heavy_multiplication_x.png
index ec8c4701815..ea6c96babec 100644
Binary files a/public/images/emoji/google/heavy_multiplication_x.png and b/public/images/emoji/google/heavy_multiplication_x.png differ
diff --git a/public/images/emoji/google/heavy_plus_sign.png b/public/images/emoji/google/heavy_plus_sign.png
index 3a092fdb300..c018223ed06 100644
Binary files a/public/images/emoji/google/heavy_plus_sign.png and b/public/images/emoji/google/heavy_plus_sign.png differ
diff --git a/public/images/emoji/google/hedgehog.png b/public/images/emoji/google/hedgehog.png
index fc0a8233761..e7de055476a 100644
Binary files a/public/images/emoji/google/hedgehog.png and b/public/images/emoji/google/hedgehog.png differ
diff --git a/public/images/emoji/google/helicopter.png b/public/images/emoji/google/helicopter.png
index eeefbae5904..c60b6ed1ee5 100644
Binary files a/public/images/emoji/google/helicopter.png and b/public/images/emoji/google/helicopter.png differ
diff --git a/public/images/emoji/google/helmet_with_cross.png b/public/images/emoji/google/helmet_with_cross.png
index e1306b90dc3..8d3d37d3eaf 100644
Binary files a/public/images/emoji/google/helmet_with_cross.png and b/public/images/emoji/google/helmet_with_cross.png differ
diff --git a/public/images/emoji/google/helmet_with_white_cross.png b/public/images/emoji/google/helmet_with_white_cross.png
index e1306b90dc3..8d3d37d3eaf 100644
Binary files a/public/images/emoji/google/helmet_with_white_cross.png and b/public/images/emoji/google/helmet_with_white_cross.png differ
diff --git a/public/images/emoji/google/herb.png b/public/images/emoji/google/herb.png
index ced3a53f7b5..8527bdd60b9 100644
Binary files a/public/images/emoji/google/herb.png and b/public/images/emoji/google/herb.png differ
diff --git a/public/images/emoji/google/hibiscus.png b/public/images/emoji/google/hibiscus.png
index 085184daa1c..5addab1524f 100644
Binary files a/public/images/emoji/google/hibiscus.png and b/public/images/emoji/google/hibiscus.png differ
diff --git a/public/images/emoji/google/high_brightness.png b/public/images/emoji/google/high_brightness.png
index 16527f5ed2f..1251c058e2d 100644
Binary files a/public/images/emoji/google/high_brightness.png and b/public/images/emoji/google/high_brightness.png differ
diff --git a/public/images/emoji/google/high_heel.png b/public/images/emoji/google/high_heel.png
index 80446be7eb6..521b4c044c8 100644
Binary files a/public/images/emoji/google/high_heel.png and b/public/images/emoji/google/high_heel.png differ
diff --git a/public/images/emoji/google/hocho.png b/public/images/emoji/google/hocho.png
index f0260024b6a..d9e532c12b9 100644
Binary files a/public/images/emoji/google/hocho.png and b/public/images/emoji/google/hocho.png differ
diff --git a/public/images/emoji/google/hockey.png b/public/images/emoji/google/hockey.png
index ded1adbd2bd..81cb026d246 100644
Binary files a/public/images/emoji/google/hockey.png and b/public/images/emoji/google/hockey.png differ
diff --git a/public/images/emoji/google/hole.png b/public/images/emoji/google/hole.png
index 7889e64531e..10eff943c19 100644
Binary files a/public/images/emoji/google/hole.png and b/public/images/emoji/google/hole.png differ
diff --git a/public/images/emoji/google/homes.png b/public/images/emoji/google/homes.png
index fa9363ada4b..4e312a67687 100644
Binary files a/public/images/emoji/google/homes.png and b/public/images/emoji/google/homes.png differ
diff --git a/public/images/emoji/google/honduras.png b/public/images/emoji/google/honduras.png
index 3c021c40ef3..fa15bde301c 100644
Binary files a/public/images/emoji/google/honduras.png and b/public/images/emoji/google/honduras.png differ
diff --git a/public/images/emoji/google/honey_pot.png b/public/images/emoji/google/honey_pot.png
index e52dc00f237..da49c8ce708 100644
Binary files a/public/images/emoji/google/honey_pot.png and b/public/images/emoji/google/honey_pot.png differ
diff --git a/public/images/emoji/google/honeybee.png b/public/images/emoji/google/honeybee.png
index 4bcf0f5a5ce..4f0f41d104a 100644
Binary files a/public/images/emoji/google/honeybee.png and b/public/images/emoji/google/honeybee.png differ
diff --git a/public/images/emoji/google/hong_kong.png b/public/images/emoji/google/hong_kong.png
index 691da0cc65e..1ec01f15899 100644
Binary files a/public/images/emoji/google/hong_kong.png and b/public/images/emoji/google/hong_kong.png differ
diff --git a/public/images/emoji/google/horse.png b/public/images/emoji/google/horse.png
index 0dd1dc3140d..0bcd34f330b 100644
Binary files a/public/images/emoji/google/horse.png and b/public/images/emoji/google/horse.png differ
diff --git a/public/images/emoji/google/horse_racing.png b/public/images/emoji/google/horse_racing.png
index d347767aa92..c6f10035c3c 100644
Binary files a/public/images/emoji/google/horse_racing.png and b/public/images/emoji/google/horse_racing.png differ
diff --git a/public/images/emoji/google/horse_racing/2.png b/public/images/emoji/google/horse_racing/2.png
index c16c586ab6e..9a5d5b307c6 100644
Binary files a/public/images/emoji/google/horse_racing/2.png and b/public/images/emoji/google/horse_racing/2.png differ
diff --git a/public/images/emoji/google/horse_racing/3.png b/public/images/emoji/google/horse_racing/3.png
index 5bff25a2e8c..ca11236a219 100644
Binary files a/public/images/emoji/google/horse_racing/3.png and b/public/images/emoji/google/horse_racing/3.png differ
diff --git a/public/images/emoji/google/horse_racing/4.png b/public/images/emoji/google/horse_racing/4.png
index c0f4c4db36c..d92917a7c61 100644
Binary files a/public/images/emoji/google/horse_racing/4.png and b/public/images/emoji/google/horse_racing/4.png differ
diff --git a/public/images/emoji/google/horse_racing/5.png b/public/images/emoji/google/horse_racing/5.png
index 0f3be6013f0..df6de2b6560 100644
Binary files a/public/images/emoji/google/horse_racing/5.png and b/public/images/emoji/google/horse_racing/5.png differ
diff --git a/public/images/emoji/google/horse_racing/6.png b/public/images/emoji/google/horse_racing/6.png
index 749f989220b..90418360bea 100644
Binary files a/public/images/emoji/google/horse_racing/6.png and b/public/images/emoji/google/horse_racing/6.png differ
diff --git a/public/images/emoji/google/hospital.png b/public/images/emoji/google/hospital.png
index f7fefbaad86..93842ebe240 100644
Binary files a/public/images/emoji/google/hospital.png and b/public/images/emoji/google/hospital.png differ
diff --git a/public/images/emoji/google/hot_dog.png b/public/images/emoji/google/hot_dog.png
index 1221191c3f2..535696a755a 100644
Binary files a/public/images/emoji/google/hot_dog.png and b/public/images/emoji/google/hot_dog.png differ
diff --git a/public/images/emoji/google/hot_pepper.png b/public/images/emoji/google/hot_pepper.png
index 87d576a9503..81ec80a8f13 100644
Binary files a/public/images/emoji/google/hot_pepper.png and b/public/images/emoji/google/hot_pepper.png differ
diff --git a/public/images/emoji/google/hotdog.png b/public/images/emoji/google/hotdog.png
index 1221191c3f2..535696a755a 100644
Binary files a/public/images/emoji/google/hotdog.png and b/public/images/emoji/google/hotdog.png differ
diff --git a/public/images/emoji/google/hotel.png b/public/images/emoji/google/hotel.png
index 661f6f4d2a5..4ba11ec09db 100644
Binary files a/public/images/emoji/google/hotel.png and b/public/images/emoji/google/hotel.png differ
diff --git a/public/images/emoji/google/hotsprings.png b/public/images/emoji/google/hotsprings.png
index 9cd9a447c9a..f4e7d6e15c6 100644
Binary files a/public/images/emoji/google/hotsprings.png and b/public/images/emoji/google/hotsprings.png differ
diff --git a/public/images/emoji/google/hourglass.png b/public/images/emoji/google/hourglass.png
index dc20e70e26b..20ef82a19e8 100644
Binary files a/public/images/emoji/google/hourglass.png and b/public/images/emoji/google/hourglass.png differ
diff --git a/public/images/emoji/google/hourglass_flowing_sand.png b/public/images/emoji/google/hourglass_flowing_sand.png
index 2947ddb2303..31203e46e57 100644
Binary files a/public/images/emoji/google/hourglass_flowing_sand.png and b/public/images/emoji/google/hourglass_flowing_sand.png differ
diff --git a/public/images/emoji/google/house.png b/public/images/emoji/google/house.png
index c34cf9df678..c16b89e3e35 100644
Binary files a/public/images/emoji/google/house.png and b/public/images/emoji/google/house.png differ
diff --git a/public/images/emoji/google/house_abandoned.png b/public/images/emoji/google/house_abandoned.png
index 5a4faead956..7b14c6c6cdf 100644
Binary files a/public/images/emoji/google/house_abandoned.png and b/public/images/emoji/google/house_abandoned.png differ
diff --git a/public/images/emoji/google/house_buildings.png b/public/images/emoji/google/house_buildings.png
index fa9363ada4b..4e312a67687 100644
Binary files a/public/images/emoji/google/house_buildings.png and b/public/images/emoji/google/house_buildings.png differ
diff --git a/public/images/emoji/google/house_with_garden.png b/public/images/emoji/google/house_with_garden.png
index 1c31e2d1415..a0007d6608d 100644
Binary files a/public/images/emoji/google/house_with_garden.png and b/public/images/emoji/google/house_with_garden.png differ
diff --git a/public/images/emoji/google/houses.png b/public/images/emoji/google/houses.png
index fa9363ada4b..4e312a67687 100644
Binary files a/public/images/emoji/google/houses.png and b/public/images/emoji/google/houses.png differ
diff --git a/public/images/emoji/google/hugging.png b/public/images/emoji/google/hugging.png
index bf104611e9b..f951d015c89 100644
Binary files a/public/images/emoji/google/hugging.png and b/public/images/emoji/google/hugging.png differ
diff --git a/public/images/emoji/google/hugging_face.png b/public/images/emoji/google/hugging_face.png
index bf104611e9b..f951d015c89 100644
Binary files a/public/images/emoji/google/hugging_face.png and b/public/images/emoji/google/hugging_face.png differ
diff --git a/public/images/emoji/google/hugs.png b/public/images/emoji/google/hugs.png
index bf104611e9b..f951d015c89 100644
Binary files a/public/images/emoji/google/hugs.png and b/public/images/emoji/google/hugs.png differ
diff --git a/public/images/emoji/google/hungary.png b/public/images/emoji/google/hungary.png
index 2fbf82b0e41..94646900ed5 100644
Binary files a/public/images/emoji/google/hungary.png and b/public/images/emoji/google/hungary.png differ
diff --git a/public/images/emoji/google/hushed.png b/public/images/emoji/google/hushed.png
index 1017735584d..c9e3b896ef0 100644
Binary files a/public/images/emoji/google/hushed.png and b/public/images/emoji/google/hushed.png differ
diff --git a/public/images/emoji/google/ice_cream.png b/public/images/emoji/google/ice_cream.png
index 82e6d5352ee..3c8459f6f8d 100644
Binary files a/public/images/emoji/google/ice_cream.png and b/public/images/emoji/google/ice_cream.png differ
diff --git a/public/images/emoji/google/ice_hockey.png b/public/images/emoji/google/ice_hockey.png
index ded1adbd2bd..81cb026d246 100644
Binary files a/public/images/emoji/google/ice_hockey.png and b/public/images/emoji/google/ice_hockey.png differ
diff --git a/public/images/emoji/google/ice_skate.png b/public/images/emoji/google/ice_skate.png
index 06a7f168f57..bee3a0681f7 100644
Binary files a/public/images/emoji/google/ice_skate.png and b/public/images/emoji/google/ice_skate.png differ
diff --git a/public/images/emoji/google/icecream.png b/public/images/emoji/google/icecream.png
index 14d831d0dab..b3c6bac259c 100644
Binary files a/public/images/emoji/google/icecream.png and b/public/images/emoji/google/icecream.png differ
diff --git a/public/images/emoji/google/iceland.png b/public/images/emoji/google/iceland.png
index cfc4b15f17c..21e1e414712 100644
Binary files a/public/images/emoji/google/iceland.png and b/public/images/emoji/google/iceland.png differ
diff --git a/public/images/emoji/google/id.png b/public/images/emoji/google/id.png
index 9d2fc98421d..4d7df3b1d6e 100644
Binary files a/public/images/emoji/google/id.png and b/public/images/emoji/google/id.png differ
diff --git a/public/images/emoji/google/ideograph_advantage.png b/public/images/emoji/google/ideograph_advantage.png
index 8e230f80749..02338e73e38 100644
Binary files a/public/images/emoji/google/ideograph_advantage.png and b/public/images/emoji/google/ideograph_advantage.png differ
diff --git a/public/images/emoji/google/imp.png b/public/images/emoji/google/imp.png
index 391197c7976..fc24a432372 100644
Binary files a/public/images/emoji/google/imp.png and b/public/images/emoji/google/imp.png differ
diff --git a/public/images/emoji/google/inbox_tray.png b/public/images/emoji/google/inbox_tray.png
index f4adb557350..2b63923817e 100644
Binary files a/public/images/emoji/google/inbox_tray.png and b/public/images/emoji/google/inbox_tray.png differ
diff --git a/public/images/emoji/google/incoming_envelope.png b/public/images/emoji/google/incoming_envelope.png
index 3be1a3b5ac5..4ada98ed641 100644
Binary files a/public/images/emoji/google/incoming_envelope.png and b/public/images/emoji/google/incoming_envelope.png differ
diff --git a/public/images/emoji/google/india.png b/public/images/emoji/google/india.png
index 3d7da87187b..e8b79d2986f 100644
Binary files a/public/images/emoji/google/india.png and b/public/images/emoji/google/india.png differ
diff --git a/public/images/emoji/google/indonesia.png b/public/images/emoji/google/indonesia.png
index b2c334fd91d..a409c19f42b 100644
Binary files a/public/images/emoji/google/indonesia.png and b/public/images/emoji/google/indonesia.png differ
diff --git a/public/images/emoji/google/information_desk_person.png b/public/images/emoji/google/information_desk_person.png
index f84a2e02813..5a1a1083dd7 100644
Binary files a/public/images/emoji/google/information_desk_person.png and b/public/images/emoji/google/information_desk_person.png differ
diff --git a/public/images/emoji/google/information_desk_person/2.png b/public/images/emoji/google/information_desk_person/2.png
index 448acc172ad..57d49cd71ec 100644
Binary files a/public/images/emoji/google/information_desk_person/2.png and b/public/images/emoji/google/information_desk_person/2.png differ
diff --git a/public/images/emoji/google/information_desk_person/3.png b/public/images/emoji/google/information_desk_person/3.png
index 23c4c592bc8..acd7d01ccd1 100644
Binary files a/public/images/emoji/google/information_desk_person/3.png and b/public/images/emoji/google/information_desk_person/3.png differ
diff --git a/public/images/emoji/google/information_desk_person/4.png b/public/images/emoji/google/information_desk_person/4.png
index be3b2d1e72a..57834f9c194 100644
Binary files a/public/images/emoji/google/information_desk_person/4.png and b/public/images/emoji/google/information_desk_person/4.png differ
diff --git a/public/images/emoji/google/information_desk_person/5.png b/public/images/emoji/google/information_desk_person/5.png
index 35c12c49030..aef6e618290 100644
Binary files a/public/images/emoji/google/information_desk_person/5.png and b/public/images/emoji/google/information_desk_person/5.png differ
diff --git a/public/images/emoji/google/information_desk_person/6.png b/public/images/emoji/google/information_desk_person/6.png
index 67e0a0ca12b..e5e401338af 100644
Binary files a/public/images/emoji/google/information_desk_person/6.png and b/public/images/emoji/google/information_desk_person/6.png differ
diff --git a/public/images/emoji/google/information_source.png b/public/images/emoji/google/information_source.png
index b9c0993fc9d..7e44ae84e91 100644
Binary files a/public/images/emoji/google/information_source.png and b/public/images/emoji/google/information_source.png differ
diff --git a/public/images/emoji/google/innocent.png b/public/images/emoji/google/innocent.png
index f2eaaf228c9..acaf768d45f 100644
Binary files a/public/images/emoji/google/innocent.png and b/public/images/emoji/google/innocent.png differ
diff --git a/public/images/emoji/google/interrobang.png b/public/images/emoji/google/interrobang.png
index 12d21b9834e..d7edc4dc6d0 100644
Binary files a/public/images/emoji/google/interrobang.png and b/public/images/emoji/google/interrobang.png differ
diff --git a/public/images/emoji/google/iphone.png b/public/images/emoji/google/iphone.png
index 93dcb50850d..bf384be4615 100644
Binary files a/public/images/emoji/google/iphone.png and b/public/images/emoji/google/iphone.png differ
diff --git a/public/images/emoji/google/iran.png b/public/images/emoji/google/iran.png
index 846c6558501..1105d156fd6 100644
Binary files a/public/images/emoji/google/iran.png and b/public/images/emoji/google/iran.png differ
diff --git a/public/images/emoji/google/iraq.png b/public/images/emoji/google/iraq.png
index 7afbf0e6dac..b5ae6b8de9f 100644
Binary files a/public/images/emoji/google/iraq.png and b/public/images/emoji/google/iraq.png differ
diff --git a/public/images/emoji/google/ireland.png b/public/images/emoji/google/ireland.png
index 1a3efeb4ce6..9d5cc188757 100644
Binary files a/public/images/emoji/google/ireland.png and b/public/images/emoji/google/ireland.png differ
diff --git a/public/images/emoji/google/island.png b/public/images/emoji/google/island.png
index 30ee864648a..e68a3fe14f4 100644
Binary files a/public/images/emoji/google/island.png and b/public/images/emoji/google/island.png differ
diff --git a/public/images/emoji/google/isle_of_man.png b/public/images/emoji/google/isle_of_man.png
index 81b217b4d36..4f30ad3ffd2 100644
Binary files a/public/images/emoji/google/isle_of_man.png and b/public/images/emoji/google/isle_of_man.png differ
diff --git a/public/images/emoji/google/israel.png b/public/images/emoji/google/israel.png
index 6554f75f87c..e32f46c9c2e 100644
Binary files a/public/images/emoji/google/israel.png and b/public/images/emoji/google/israel.png differ
diff --git a/public/images/emoji/google/it.png b/public/images/emoji/google/it.png
index 5ae7c53b6ff..605e1280127 100644
Binary files a/public/images/emoji/google/it.png and b/public/images/emoji/google/it.png differ
diff --git a/public/images/emoji/google/izakaya_lantern.png b/public/images/emoji/google/izakaya_lantern.png
index d8407f417f0..3e34d70fd1c 100644
Binary files a/public/images/emoji/google/izakaya_lantern.png and b/public/images/emoji/google/izakaya_lantern.png differ
diff --git a/public/images/emoji/google/jack_o_lantern.png b/public/images/emoji/google/jack_o_lantern.png
index fe92e2bbabd..60a23639756 100644
Binary files a/public/images/emoji/google/jack_o_lantern.png and b/public/images/emoji/google/jack_o_lantern.png differ
diff --git a/public/images/emoji/google/jamaica.png b/public/images/emoji/google/jamaica.png
index a956adfab90..71f190ac1c2 100644
Binary files a/public/images/emoji/google/jamaica.png and b/public/images/emoji/google/jamaica.png differ
diff --git a/public/images/emoji/google/japan.png b/public/images/emoji/google/japan.png
index 19a1aceed1a..79fd5a80af1 100644
Binary files a/public/images/emoji/google/japan.png and b/public/images/emoji/google/japan.png differ
diff --git a/public/images/emoji/google/japanese_castle.png b/public/images/emoji/google/japanese_castle.png
index d42ac569fe7..fc55df18a35 100644
Binary files a/public/images/emoji/google/japanese_castle.png and b/public/images/emoji/google/japanese_castle.png differ
diff --git a/public/images/emoji/google/japanese_goblin.png b/public/images/emoji/google/japanese_goblin.png
index 0ebf700398f..c4c1181803d 100644
Binary files a/public/images/emoji/google/japanese_goblin.png and b/public/images/emoji/google/japanese_goblin.png differ
diff --git a/public/images/emoji/google/japanese_ogre.png b/public/images/emoji/google/japanese_ogre.png
index 4a08e8e81be..5dfe0cb0391 100644
Binary files a/public/images/emoji/google/japanese_ogre.png and b/public/images/emoji/google/japanese_ogre.png differ
diff --git a/public/images/emoji/google/jeans.png b/public/images/emoji/google/jeans.png
index 3bdd9ca3ba6..2c85072f3c1 100644
Binary files a/public/images/emoji/google/jeans.png and b/public/images/emoji/google/jeans.png differ
diff --git a/public/images/emoji/google/jersey.png b/public/images/emoji/google/jersey.png
index 47b536a6211..03fc51703e5 100644
Binary files a/public/images/emoji/google/jersey.png and b/public/images/emoji/google/jersey.png differ
diff --git a/public/images/emoji/google/jordan.png b/public/images/emoji/google/jordan.png
index f8c6ca07eb7..53697f64ca2 100644
Binary files a/public/images/emoji/google/jordan.png and b/public/images/emoji/google/jordan.png differ
diff --git a/public/images/emoji/google/joy.png b/public/images/emoji/google/joy.png
index 098ce2f4f98..30bc7110dda 100644
Binary files a/public/images/emoji/google/joy.png and b/public/images/emoji/google/joy.png differ
diff --git a/public/images/emoji/google/joy_cat.png b/public/images/emoji/google/joy_cat.png
index a858d4615e0..dc7e21465fe 100644
Binary files a/public/images/emoji/google/joy_cat.png and b/public/images/emoji/google/joy_cat.png differ
diff --git a/public/images/emoji/google/joystick.png b/public/images/emoji/google/joystick.png
index f5aa91b2d49..18598ecb9a2 100644
Binary files a/public/images/emoji/google/joystick.png and b/public/images/emoji/google/joystick.png differ
diff --git a/public/images/emoji/google/jp.png b/public/images/emoji/google/jp.png
index 72cbebef789..c75dad0d106 100644
Binary files a/public/images/emoji/google/jp.png and b/public/images/emoji/google/jp.png differ
diff --git a/public/images/emoji/google/kaaba.png b/public/images/emoji/google/kaaba.png
index 82aaffbd957..9e552ab0f6e 100644
Binary files a/public/images/emoji/google/kaaba.png and b/public/images/emoji/google/kaaba.png differ
diff --git a/public/images/emoji/google/kazakhstan.png b/public/images/emoji/google/kazakhstan.png
index ec2cffaecf1..d2a5e07df64 100644
Binary files a/public/images/emoji/google/kazakhstan.png and b/public/images/emoji/google/kazakhstan.png differ
diff --git a/public/images/emoji/google/kenya.png b/public/images/emoji/google/kenya.png
index 59f5ae68a7e..f1bf3365971 100644
Binary files a/public/images/emoji/google/kenya.png and b/public/images/emoji/google/kenya.png differ
diff --git a/public/images/emoji/google/key.png b/public/images/emoji/google/key.png
index 7aca32f21d5..e54c3b358c4 100644
Binary files a/public/images/emoji/google/key.png and b/public/images/emoji/google/key.png differ
diff --git a/public/images/emoji/google/key2.png b/public/images/emoji/google/key2.png
index d6739c8457c..6083982335b 100644
Binary files a/public/images/emoji/google/key2.png and b/public/images/emoji/google/key2.png differ
diff --git a/public/images/emoji/google/keyboard.png b/public/images/emoji/google/keyboard.png
index f6190e74af4..d040041c67b 100644
Binary files a/public/images/emoji/google/keyboard.png and b/public/images/emoji/google/keyboard.png differ
diff --git a/public/images/emoji/google/keycap_star.png b/public/images/emoji/google/keycap_star.png
index 9c0101c7d7e..ff8fbb50918 100644
Binary files a/public/images/emoji/google/keycap_star.png and b/public/images/emoji/google/keycap_star.png differ
diff --git a/public/images/emoji/google/keycap_ten.png b/public/images/emoji/google/keycap_ten.png
index 60b3c3787c0..26d2af616c1 100644
Binary files a/public/images/emoji/google/keycap_ten.png and b/public/images/emoji/google/keycap_ten.png differ
diff --git a/public/images/emoji/google/kick_scooter.png b/public/images/emoji/google/kick_scooter.png
index ebe5c370826..12949d8c6e3 100644
Binary files a/public/images/emoji/google/kick_scooter.png and b/public/images/emoji/google/kick_scooter.png differ
diff --git a/public/images/emoji/google/kimono.png b/public/images/emoji/google/kimono.png
index b252f0f2a74..2699b7cc0f2 100644
Binary files a/public/images/emoji/google/kimono.png and b/public/images/emoji/google/kimono.png differ
diff --git a/public/images/emoji/google/kiribati.png b/public/images/emoji/google/kiribati.png
index 2f005d2487d..98ccbd9c5a8 100644
Binary files a/public/images/emoji/google/kiribati.png and b/public/images/emoji/google/kiribati.png differ
diff --git a/public/images/emoji/google/kiss.png b/public/images/emoji/google/kiss.png
index a7f50bbe04e..96fbc506de8 100644
Binary files a/public/images/emoji/google/kiss.png and b/public/images/emoji/google/kiss.png differ
diff --git a/public/images/emoji/google/kissing.png b/public/images/emoji/google/kissing.png
index 6033b2eb123..e4c9b7196c1 100644
Binary files a/public/images/emoji/google/kissing.png and b/public/images/emoji/google/kissing.png differ
diff --git a/public/images/emoji/google/kissing_cat.png b/public/images/emoji/google/kissing_cat.png
index 96ab3ba308b..d5d9962f76a 100644
Binary files a/public/images/emoji/google/kissing_cat.png and b/public/images/emoji/google/kissing_cat.png differ
diff --git a/public/images/emoji/google/kissing_closed_eyes.png b/public/images/emoji/google/kissing_closed_eyes.png
index 5118f05e7a3..90c7791db56 100644
Binary files a/public/images/emoji/google/kissing_closed_eyes.png and b/public/images/emoji/google/kissing_closed_eyes.png differ
diff --git a/public/images/emoji/google/kissing_heart.png b/public/images/emoji/google/kissing_heart.png
index 1b16a522c9b..99c1f3981e2 100644
Binary files a/public/images/emoji/google/kissing_heart.png and b/public/images/emoji/google/kissing_heart.png differ
diff --git a/public/images/emoji/google/kissing_smiling_eyes.png b/public/images/emoji/google/kissing_smiling_eyes.png
index 32d9aed1522..e376812155a 100644
Binary files a/public/images/emoji/google/kissing_smiling_eyes.png and b/public/images/emoji/google/kissing_smiling_eyes.png differ
diff --git a/public/images/emoji/google/kiwi_fruit.png b/public/images/emoji/google/kiwi_fruit.png
index d2834a517ad..fee1445b0f5 100644
Binary files a/public/images/emoji/google/kiwi_fruit.png and b/public/images/emoji/google/kiwi_fruit.png differ
diff --git a/public/images/emoji/google/knife.png b/public/images/emoji/google/knife.png
index f0260024b6a..d9e532c12b9 100644
Binary files a/public/images/emoji/google/knife.png and b/public/images/emoji/google/knife.png differ
diff --git a/public/images/emoji/google/koala.png b/public/images/emoji/google/koala.png
index bcdca18c766..a70f78e23d9 100644
Binary files a/public/images/emoji/google/koala.png and b/public/images/emoji/google/koala.png differ
diff --git a/public/images/emoji/google/koko.png b/public/images/emoji/google/koko.png
index eb223efbb57..ccabba44490 100644
Binary files a/public/images/emoji/google/koko.png and b/public/images/emoji/google/koko.png differ
diff --git a/public/images/emoji/google/kosovo.png b/public/images/emoji/google/kosovo.png
index dad0f8ce650..4faf7e252ef 100644
Binary files a/public/images/emoji/google/kosovo.png and b/public/images/emoji/google/kosovo.png differ
diff --git a/public/images/emoji/google/kr.png b/public/images/emoji/google/kr.png
index 33ead18d8c6..048ceeb3e46 100644
Binary files a/public/images/emoji/google/kr.png and b/public/images/emoji/google/kr.png differ
diff --git a/public/images/emoji/google/kuwait.png b/public/images/emoji/google/kuwait.png
index bf42ac971d1..da41db123e5 100644
Binary files a/public/images/emoji/google/kuwait.png and b/public/images/emoji/google/kuwait.png differ
diff --git a/public/images/emoji/google/kyrgyzstan.png b/public/images/emoji/google/kyrgyzstan.png
index 9ee2d3808fa..1fb2105a91f 100644
Binary files a/public/images/emoji/google/kyrgyzstan.png and b/public/images/emoji/google/kyrgyzstan.png differ
diff --git a/public/images/emoji/google/label.png b/public/images/emoji/google/label.png
index 2473deefe6e..2544282029c 100644
Binary files a/public/images/emoji/google/label.png and b/public/images/emoji/google/label.png differ
diff --git a/public/images/emoji/google/laos.png b/public/images/emoji/google/laos.png
index 5762ccf2973..2ac96b742b9 100644
Binary files a/public/images/emoji/google/laos.png and b/public/images/emoji/google/laos.png differ
diff --git a/public/images/emoji/google/large_blue_circle.png b/public/images/emoji/google/large_blue_circle.png
index 183d6c3791a..79e1630641a 100644
Binary files a/public/images/emoji/google/large_blue_circle.png and b/public/images/emoji/google/large_blue_circle.png differ
diff --git a/public/images/emoji/google/large_blue_diamond.png b/public/images/emoji/google/large_blue_diamond.png
index 5479de75b34..2086e95adbd 100644
Binary files a/public/images/emoji/google/large_blue_diamond.png and b/public/images/emoji/google/large_blue_diamond.png differ
diff --git a/public/images/emoji/google/large_orange_diamond.png b/public/images/emoji/google/large_orange_diamond.png
index 41af4a51d41..fce5aeae50b 100644
Binary files a/public/images/emoji/google/large_orange_diamond.png and b/public/images/emoji/google/large_orange_diamond.png differ
diff --git a/public/images/emoji/google/last_quarter_moon.png b/public/images/emoji/google/last_quarter_moon.png
index ae12e2a821c..474ad185a61 100644
Binary files a/public/images/emoji/google/last_quarter_moon.png and b/public/images/emoji/google/last_quarter_moon.png differ
diff --git a/public/images/emoji/google/last_quarter_moon_with_face.png b/public/images/emoji/google/last_quarter_moon_with_face.png
index 7900a9f9429..c4bea25ef71 100644
Binary files a/public/images/emoji/google/last_quarter_moon_with_face.png and b/public/images/emoji/google/last_quarter_moon_with_face.png differ
diff --git a/public/images/emoji/google/latin_cross.png b/public/images/emoji/google/latin_cross.png
index 0a367b0233e..f0608264bb6 100644
Binary files a/public/images/emoji/google/latin_cross.png and b/public/images/emoji/google/latin_cross.png differ
diff --git a/public/images/emoji/google/latvia.png b/public/images/emoji/google/latvia.png
index 963f774bb22..8bd9d34140a 100644
Binary files a/public/images/emoji/google/latvia.png and b/public/images/emoji/google/latvia.png differ
diff --git a/public/images/emoji/google/laughing.png b/public/images/emoji/google/laughing.png
index 1b64148f973..2fdeacfbbcb 100644
Binary files a/public/images/emoji/google/laughing.png and b/public/images/emoji/google/laughing.png differ
diff --git a/public/images/emoji/google/leaves.png b/public/images/emoji/google/leaves.png
index 5dc15b3da44..68220fe003a 100644
Binary files a/public/images/emoji/google/leaves.png and b/public/images/emoji/google/leaves.png differ
diff --git a/public/images/emoji/google/lebanon.png b/public/images/emoji/google/lebanon.png
index b8b47090432..bbcf9c9cf5c 100644
Binary files a/public/images/emoji/google/lebanon.png and b/public/images/emoji/google/lebanon.png differ
diff --git a/public/images/emoji/google/ledger.png b/public/images/emoji/google/ledger.png
index 78915dd655a..759754c471b 100644
Binary files a/public/images/emoji/google/ledger.png and b/public/images/emoji/google/ledger.png differ
diff --git a/public/images/emoji/google/left_luggage.png b/public/images/emoji/google/left_luggage.png
index a81a7f4048f..53fdbe4e476 100644
Binary files a/public/images/emoji/google/left_luggage.png and b/public/images/emoji/google/left_luggage.png differ
diff --git a/public/images/emoji/google/left_right_arrow.png b/public/images/emoji/google/left_right_arrow.png
index dc064561f02..cbc0c43e0e7 100644
Binary files a/public/images/emoji/google/left_right_arrow.png and b/public/images/emoji/google/left_right_arrow.png differ
diff --git a/public/images/emoji/google/left_speech_bubble.png b/public/images/emoji/google/left_speech_bubble.png
index 4dd9f1330e0..f9c1779ebec 100644
Binary files a/public/images/emoji/google/left_speech_bubble.png and b/public/images/emoji/google/left_speech_bubble.png differ
diff --git a/public/images/emoji/google/leftwards_arrow_with_hook.png b/public/images/emoji/google/leftwards_arrow_with_hook.png
index da648022ba3..6ea31fa3315 100644
Binary files a/public/images/emoji/google/leftwards_arrow_with_hook.png and b/public/images/emoji/google/leftwards_arrow_with_hook.png differ
diff --git a/public/images/emoji/google/lemon.png b/public/images/emoji/google/lemon.png
index f2748b54b35..c4fb9838ffe 100644
Binary files a/public/images/emoji/google/lemon.png and b/public/images/emoji/google/lemon.png differ
diff --git a/public/images/emoji/google/leo.png b/public/images/emoji/google/leo.png
index ddb39122b65..1397081a265 100644
Binary files a/public/images/emoji/google/leo.png and b/public/images/emoji/google/leo.png differ
diff --git a/public/images/emoji/google/leopard.png b/public/images/emoji/google/leopard.png
index cc31eb647e7..bef21cdd354 100644
Binary files a/public/images/emoji/google/leopard.png and b/public/images/emoji/google/leopard.png differ
diff --git a/public/images/emoji/google/lesotho.png b/public/images/emoji/google/lesotho.png
index d0455846dda..d175a10c77a 100644
Binary files a/public/images/emoji/google/lesotho.png and b/public/images/emoji/google/lesotho.png differ
diff --git a/public/images/emoji/google/level_slider.png b/public/images/emoji/google/level_slider.png
index 5991ab94a8d..e3840083c25 100644
Binary files a/public/images/emoji/google/level_slider.png and b/public/images/emoji/google/level_slider.png differ
diff --git a/public/images/emoji/google/levitate.png b/public/images/emoji/google/levitate.png
index 88918f97b31..b7eea2e0143 100644
Binary files a/public/images/emoji/google/levitate.png and b/public/images/emoji/google/levitate.png differ
diff --git a/public/images/emoji/google/levitate/2.png b/public/images/emoji/google/levitate/2.png
index ddeda2a43bb..28bf50d0d26 100644
Binary files a/public/images/emoji/google/levitate/2.png and b/public/images/emoji/google/levitate/2.png differ
diff --git a/public/images/emoji/google/levitate/3.png b/public/images/emoji/google/levitate/3.png
index e62d08a901f..2e9ca43ed91 100644
Binary files a/public/images/emoji/google/levitate/3.png and b/public/images/emoji/google/levitate/3.png differ
diff --git a/public/images/emoji/google/levitate/4.png b/public/images/emoji/google/levitate/4.png
index 27012dfbe98..1f9720f9622 100644
Binary files a/public/images/emoji/google/levitate/4.png and b/public/images/emoji/google/levitate/4.png differ
diff --git a/public/images/emoji/google/levitate/5.png b/public/images/emoji/google/levitate/5.png
index c8863f58335..889a3dcd0bb 100644
Binary files a/public/images/emoji/google/levitate/5.png and b/public/images/emoji/google/levitate/5.png differ
diff --git a/public/images/emoji/google/levitate/6.png b/public/images/emoji/google/levitate/6.png
index 62e5e00578f..6b55d4fcd7a 100644
Binary files a/public/images/emoji/google/levitate/6.png and b/public/images/emoji/google/levitate/6.png differ
diff --git a/public/images/emoji/google/liberia.png b/public/images/emoji/google/liberia.png
index 388c2f35d70..7e962415d4a 100644
Binary files a/public/images/emoji/google/liberia.png and b/public/images/emoji/google/liberia.png differ
diff --git a/public/images/emoji/google/libra.png b/public/images/emoji/google/libra.png
index 1d8132623b2..55862258b11 100644
Binary files a/public/images/emoji/google/libra.png and b/public/images/emoji/google/libra.png differ
diff --git a/public/images/emoji/google/libya.png b/public/images/emoji/google/libya.png
index 303b3fc66f3..ec473782aed 100644
Binary files a/public/images/emoji/google/libya.png and b/public/images/emoji/google/libya.png differ
diff --git a/public/images/emoji/google/liechtenstein.png b/public/images/emoji/google/liechtenstein.png
index 3c90874cca3..e429b5bc3ea 100644
Binary files a/public/images/emoji/google/liechtenstein.png and b/public/images/emoji/google/liechtenstein.png differ
diff --git a/public/images/emoji/google/lifter.png b/public/images/emoji/google/lifter.png
index 47689fc2921..d570f812ae3 100644
Binary files a/public/images/emoji/google/lifter.png and b/public/images/emoji/google/lifter.png differ
diff --git a/public/images/emoji/google/lifter/2.png b/public/images/emoji/google/lifter/2.png
index 56ac45601aa..711814184f6 100644
Binary files a/public/images/emoji/google/lifter/2.png and b/public/images/emoji/google/lifter/2.png differ
diff --git a/public/images/emoji/google/lifter/3.png b/public/images/emoji/google/lifter/3.png
index e4f89233ed0..87ea4ab0bd2 100644
Binary files a/public/images/emoji/google/lifter/3.png and b/public/images/emoji/google/lifter/3.png differ
diff --git a/public/images/emoji/google/lifter/4.png b/public/images/emoji/google/lifter/4.png
index a0a5133cf44..7b424da2ad5 100644
Binary files a/public/images/emoji/google/lifter/4.png and b/public/images/emoji/google/lifter/4.png differ
diff --git a/public/images/emoji/google/lifter/5.png b/public/images/emoji/google/lifter/5.png
index a38a3c841a9..62304ee8eae 100644
Binary files a/public/images/emoji/google/lifter/5.png and b/public/images/emoji/google/lifter/5.png differ
diff --git a/public/images/emoji/google/lifter/6.png b/public/images/emoji/google/lifter/6.png
index f5b56144633..e1a4357862a 100644
Binary files a/public/images/emoji/google/lifter/6.png and b/public/images/emoji/google/lifter/6.png differ
diff --git a/public/images/emoji/google/light_rail.png b/public/images/emoji/google/light_rail.png
index 3864cc38794..514374ec9ec 100644
Binary files a/public/images/emoji/google/light_rail.png and b/public/images/emoji/google/light_rail.png differ
diff --git a/public/images/emoji/google/link.png b/public/images/emoji/google/link.png
index 5c4d7c49230..cda895e3503 100644
Binary files a/public/images/emoji/google/link.png and b/public/images/emoji/google/link.png differ
diff --git a/public/images/emoji/google/linked_paperclips.png b/public/images/emoji/google/linked_paperclips.png
index b3b7e0de41d..56d7279a5ca 100644
Binary files a/public/images/emoji/google/linked_paperclips.png and b/public/images/emoji/google/linked_paperclips.png differ
diff --git a/public/images/emoji/google/lion.png b/public/images/emoji/google/lion.png
index d8b4d7e2249..52448031ce7 100644
Binary files a/public/images/emoji/google/lion.png and b/public/images/emoji/google/lion.png differ
diff --git a/public/images/emoji/google/lion_face.png b/public/images/emoji/google/lion_face.png
index d8b4d7e2249..52448031ce7 100644
Binary files a/public/images/emoji/google/lion_face.png and b/public/images/emoji/google/lion_face.png differ
diff --git a/public/images/emoji/google/lips.png b/public/images/emoji/google/lips.png
index 93bbe027d50..9f78922d420 100644
Binary files a/public/images/emoji/google/lips.png and b/public/images/emoji/google/lips.png differ
diff --git a/public/images/emoji/google/lipstick.png b/public/images/emoji/google/lipstick.png
index 9e0b3713864..86b59270fdf 100644
Binary files a/public/images/emoji/google/lipstick.png and b/public/images/emoji/google/lipstick.png differ
diff --git a/public/images/emoji/google/lithuania.png b/public/images/emoji/google/lithuania.png
index 41d85c692ba..598a8e56637 100644
Binary files a/public/images/emoji/google/lithuania.png and b/public/images/emoji/google/lithuania.png differ
diff --git a/public/images/emoji/google/lizard.png b/public/images/emoji/google/lizard.png
index 4932ac5dbbf..1026acfbcd6 100644
Binary files a/public/images/emoji/google/lizard.png and b/public/images/emoji/google/lizard.png differ
diff --git a/public/images/emoji/google/lock.png b/public/images/emoji/google/lock.png
index 07550237ed4..b74fad6ead1 100644
Binary files a/public/images/emoji/google/lock.png and b/public/images/emoji/google/lock.png differ
diff --git a/public/images/emoji/google/lock_with_ink_pen.png b/public/images/emoji/google/lock_with_ink_pen.png
index 69b7d0cc636..dc89f2c993d 100644
Binary files a/public/images/emoji/google/lock_with_ink_pen.png and b/public/images/emoji/google/lock_with_ink_pen.png differ
diff --git a/public/images/emoji/google/lollipop.png b/public/images/emoji/google/lollipop.png
index 2d016c365e5..a381976a266 100644
Binary files a/public/images/emoji/google/lollipop.png and b/public/images/emoji/google/lollipop.png differ
diff --git a/public/images/emoji/google/loop.png b/public/images/emoji/google/loop.png
index 633119f0fc3..14faa3939e4 100644
Binary files a/public/images/emoji/google/loop.png and b/public/images/emoji/google/loop.png differ
diff --git a/public/images/emoji/google/loud_sound.png b/public/images/emoji/google/loud_sound.png
index dc3879609da..749dc5a816a 100644
Binary files a/public/images/emoji/google/loud_sound.png and b/public/images/emoji/google/loud_sound.png differ
diff --git a/public/images/emoji/google/loudspeaker.png b/public/images/emoji/google/loudspeaker.png
index 94402b054d0..b844d9ce7c6 100644
Binary files a/public/images/emoji/google/loudspeaker.png and b/public/images/emoji/google/loudspeaker.png differ
diff --git a/public/images/emoji/google/love_hotel.png b/public/images/emoji/google/love_hotel.png
index f56e26d106b..eed33686f4f 100644
Binary files a/public/images/emoji/google/love_hotel.png and b/public/images/emoji/google/love_hotel.png differ
diff --git a/public/images/emoji/google/love_letter.png b/public/images/emoji/google/love_letter.png
index 198be2dce1d..5edb3681f0b 100644
Binary files a/public/images/emoji/google/love_letter.png and b/public/images/emoji/google/love_letter.png differ
diff --git a/public/images/emoji/google/love_you_gesture.png b/public/images/emoji/google/love_you_gesture.png
index d1b677e4fe8..ad51606a934 100644
Binary files a/public/images/emoji/google/love_you_gesture.png and b/public/images/emoji/google/love_you_gesture.png differ
diff --git a/public/images/emoji/google/love_you_gesture/2.png b/public/images/emoji/google/love_you_gesture/2.png
index 2731aa143f3..892e9facdf9 100644
Binary files a/public/images/emoji/google/love_you_gesture/2.png and b/public/images/emoji/google/love_you_gesture/2.png differ
diff --git a/public/images/emoji/google/love_you_gesture/3.png b/public/images/emoji/google/love_you_gesture/3.png
index 153ab728aff..bb03327925d 100644
Binary files a/public/images/emoji/google/love_you_gesture/3.png and b/public/images/emoji/google/love_you_gesture/3.png differ
diff --git a/public/images/emoji/google/love_you_gesture/4.png b/public/images/emoji/google/love_you_gesture/4.png
index 4a7b85c9ff6..985e2904724 100644
Binary files a/public/images/emoji/google/love_you_gesture/4.png and b/public/images/emoji/google/love_you_gesture/4.png differ
diff --git a/public/images/emoji/google/love_you_gesture/5.png b/public/images/emoji/google/love_you_gesture/5.png
index bac00236ea2..6fc51bef3a2 100644
Binary files a/public/images/emoji/google/love_you_gesture/5.png and b/public/images/emoji/google/love_you_gesture/5.png differ
diff --git a/public/images/emoji/google/love_you_gesture/6.png b/public/images/emoji/google/love_you_gesture/6.png
index aac2741530e..a4db7e8fbaa 100644
Binary files a/public/images/emoji/google/love_you_gesture/6.png and b/public/images/emoji/google/love_you_gesture/6.png differ
diff --git a/public/images/emoji/google/low_brightness.png b/public/images/emoji/google/low_brightness.png
index 0a7d09ad2dc..26fe0fc95fa 100644
Binary files a/public/images/emoji/google/low_brightness.png and b/public/images/emoji/google/low_brightness.png differ
diff --git a/public/images/emoji/google/lower_left_ballpoint_pen.png b/public/images/emoji/google/lower_left_ballpoint_pen.png
index a67644b0ac7..a3312810ecd 100644
Binary files a/public/images/emoji/google/lower_left_ballpoint_pen.png and b/public/images/emoji/google/lower_left_ballpoint_pen.png differ
diff --git a/public/images/emoji/google/lower_left_crayon.png b/public/images/emoji/google/lower_left_crayon.png
index e82c0d2d5e6..bec3b705731 100644
Binary files a/public/images/emoji/google/lower_left_crayon.png and b/public/images/emoji/google/lower_left_crayon.png differ
diff --git a/public/images/emoji/google/lower_left_fountain_pen.png b/public/images/emoji/google/lower_left_fountain_pen.png
index a06fcdc40e4..3d8ba60471d 100644
Binary files a/public/images/emoji/google/lower_left_fountain_pen.png and b/public/images/emoji/google/lower_left_fountain_pen.png differ
diff --git a/public/images/emoji/google/lower_left_paintbrush.png b/public/images/emoji/google/lower_left_paintbrush.png
index 58697366466..bde63a80920 100644
Binary files a/public/images/emoji/google/lower_left_paintbrush.png and b/public/images/emoji/google/lower_left_paintbrush.png differ
diff --git a/public/images/emoji/google/luxembourg.png b/public/images/emoji/google/luxembourg.png
index d86b5c65bb2..f1b83bbc523 100644
Binary files a/public/images/emoji/google/luxembourg.png and b/public/images/emoji/google/luxembourg.png differ
diff --git a/public/images/emoji/google/lying_face.png b/public/images/emoji/google/lying_face.png
index aeb972bd265..8a33f01cf52 100644
Binary files a/public/images/emoji/google/lying_face.png and b/public/images/emoji/google/lying_face.png differ
diff --git a/public/images/emoji/google/m.png b/public/images/emoji/google/m.png
index 7d37bedb9bf..eac88f2c316 100644
Binary files a/public/images/emoji/google/m.png and b/public/images/emoji/google/m.png differ
diff --git a/public/images/emoji/google/macau.png b/public/images/emoji/google/macau.png
index 918444ff165..551bd77cf09 100644
Binary files a/public/images/emoji/google/macau.png and b/public/images/emoji/google/macau.png differ
diff --git a/public/images/emoji/google/macedonia.png b/public/images/emoji/google/macedonia.png
index 68d7eeda312..f1f975d94db 100644
Binary files a/public/images/emoji/google/macedonia.png and b/public/images/emoji/google/macedonia.png differ
diff --git a/public/images/emoji/google/madagascar.png b/public/images/emoji/google/madagascar.png
index b166d103c70..36745e26264 100644
Binary files a/public/images/emoji/google/madagascar.png and b/public/images/emoji/google/madagascar.png differ
diff --git a/public/images/emoji/google/mag.png b/public/images/emoji/google/mag.png
index 009a8b29e7c..ef6581c19e1 100644
Binary files a/public/images/emoji/google/mag.png and b/public/images/emoji/google/mag.png differ
diff --git a/public/images/emoji/google/mag_right.png b/public/images/emoji/google/mag_right.png
index 48158489f90..3a6245beb79 100644
Binary files a/public/images/emoji/google/mag_right.png and b/public/images/emoji/google/mag_right.png differ
diff --git a/public/images/emoji/google/mage.png b/public/images/emoji/google/mage.png
index 95b77cab85f..887a5bbfa95 100644
Binary files a/public/images/emoji/google/mage.png and b/public/images/emoji/google/mage.png differ
diff --git a/public/images/emoji/google/mage/2.png b/public/images/emoji/google/mage/2.png
index 45f93bbf667..8b011be490c 100644
Binary files a/public/images/emoji/google/mage/2.png and b/public/images/emoji/google/mage/2.png differ
diff --git a/public/images/emoji/google/mage/3.png b/public/images/emoji/google/mage/3.png
index 11ad26c1204..1144565e1a4 100644
Binary files a/public/images/emoji/google/mage/3.png and b/public/images/emoji/google/mage/3.png differ
diff --git a/public/images/emoji/google/mage/4.png b/public/images/emoji/google/mage/4.png
index 4af7b2eb6b0..2f1a7b2a2c4 100644
Binary files a/public/images/emoji/google/mage/4.png and b/public/images/emoji/google/mage/4.png differ
diff --git a/public/images/emoji/google/mage/5.png b/public/images/emoji/google/mage/5.png
index 76ef339d1c7..58aef187b79 100644
Binary files a/public/images/emoji/google/mage/5.png and b/public/images/emoji/google/mage/5.png differ
diff --git a/public/images/emoji/google/mage/6.png b/public/images/emoji/google/mage/6.png
index 1563142f306..86d9fc7929a 100644
Binary files a/public/images/emoji/google/mage/6.png and b/public/images/emoji/google/mage/6.png differ
diff --git a/public/images/emoji/google/mahjong.png b/public/images/emoji/google/mahjong.png
index 28e9b95f36a..c235b290bf1 100644
Binary files a/public/images/emoji/google/mahjong.png and b/public/images/emoji/google/mahjong.png differ
diff --git a/public/images/emoji/google/mailbox.png b/public/images/emoji/google/mailbox.png
index 5eaa0962304..b61b523ab85 100644
Binary files a/public/images/emoji/google/mailbox.png and b/public/images/emoji/google/mailbox.png differ
diff --git a/public/images/emoji/google/mailbox_closed.png b/public/images/emoji/google/mailbox_closed.png
index 6a9717aa1e9..c8c931456ce 100644
Binary files a/public/images/emoji/google/mailbox_closed.png and b/public/images/emoji/google/mailbox_closed.png differ
diff --git a/public/images/emoji/google/mailbox_with_mail.png b/public/images/emoji/google/mailbox_with_mail.png
index f7ce167ec04..5d4408c2ebe 100644
Binary files a/public/images/emoji/google/mailbox_with_mail.png and b/public/images/emoji/google/mailbox_with_mail.png differ
diff --git a/public/images/emoji/google/mailbox_with_no_mail.png b/public/images/emoji/google/mailbox_with_no_mail.png
index d6a6a1c5349..b08cbc6c3ae 100644
Binary files a/public/images/emoji/google/mailbox_with_no_mail.png and b/public/images/emoji/google/mailbox_with_no_mail.png differ
diff --git a/public/images/emoji/google/malawi.png b/public/images/emoji/google/malawi.png
index acc82bc5af6..3c510c7b2b3 100644
Binary files a/public/images/emoji/google/malawi.png and b/public/images/emoji/google/malawi.png differ
diff --git a/public/images/emoji/google/malaysia.png b/public/images/emoji/google/malaysia.png
index 2e693c11ebe..e26107e19d1 100644
Binary files a/public/images/emoji/google/malaysia.png and b/public/images/emoji/google/malaysia.png differ
diff --git a/public/images/emoji/google/maldives.png b/public/images/emoji/google/maldives.png
index 99b18ac8d3d..6b87598488f 100644
Binary files a/public/images/emoji/google/maldives.png and b/public/images/emoji/google/maldives.png differ
diff --git a/public/images/emoji/google/male_couple_with_heart.png b/public/images/emoji/google/male_couple_with_heart.png
index 8c30736f98d..edfa25c9a0c 100644
Binary files a/public/images/emoji/google/male_couple_with_heart.png and b/public/images/emoji/google/male_couple_with_heart.png differ
diff --git a/public/images/emoji/google/male_couplekiss.png b/public/images/emoji/google/male_couplekiss.png
index 60aff93dd76..231fc8e523c 100644
Binary files a/public/images/emoji/google/male_couplekiss.png and b/public/images/emoji/google/male_couplekiss.png differ
diff --git a/public/images/emoji/google/male_detective.png b/public/images/emoji/google/male_detective.png
index 13ef63b0aa6..cee46f48616 100644
Binary files a/public/images/emoji/google/male_detective.png and b/public/images/emoji/google/male_detective.png differ
diff --git a/public/images/emoji/google/male_detective/2.png b/public/images/emoji/google/male_detective/2.png
index 130424ff539..2bc4718252b 100644
Binary files a/public/images/emoji/google/male_detective/2.png and b/public/images/emoji/google/male_detective/2.png differ
diff --git a/public/images/emoji/google/male_detective/3.png b/public/images/emoji/google/male_detective/3.png
index 6fb56a789c9..a867a4d30ef 100644
Binary files a/public/images/emoji/google/male_detective/3.png and b/public/images/emoji/google/male_detective/3.png differ
diff --git a/public/images/emoji/google/male_detective/4.png b/public/images/emoji/google/male_detective/4.png
index c021157981c..2a1935a30cb 100644
Binary files a/public/images/emoji/google/male_detective/4.png and b/public/images/emoji/google/male_detective/4.png differ
diff --git a/public/images/emoji/google/male_detective/5.png b/public/images/emoji/google/male_detective/5.png
index fcd34112328..f261d8dc3b0 100644
Binary files a/public/images/emoji/google/male_detective/5.png and b/public/images/emoji/google/male_detective/5.png differ
diff --git a/public/images/emoji/google/male_detective/6.png b/public/images/emoji/google/male_detective/6.png
index e4b939c908b..ffa90c53929 100644
Binary files a/public/images/emoji/google/male_detective/6.png and b/public/images/emoji/google/male_detective/6.png differ
diff --git a/public/images/emoji/google/mali.png b/public/images/emoji/google/mali.png
index 8e30b34eb97..00d9d28bfd3 100644
Binary files a/public/images/emoji/google/mali.png and b/public/images/emoji/google/mali.png differ
diff --git a/public/images/emoji/google/malta.png b/public/images/emoji/google/malta.png
index dc1cf128cab..11ac5dc5988 100644
Binary files a/public/images/emoji/google/malta.png and b/public/images/emoji/google/malta.png differ
diff --git a/public/images/emoji/google/man.png b/public/images/emoji/google/man.png
index 419b9c8365c..73248596d21 100644
Binary files a/public/images/emoji/google/man.png and b/public/images/emoji/google/man.png differ
diff --git a/public/images/emoji/google/man/2.png b/public/images/emoji/google/man/2.png
index 91680466036..4752f1d694e 100644
Binary files a/public/images/emoji/google/man/2.png and b/public/images/emoji/google/man/2.png differ
diff --git a/public/images/emoji/google/man/3.png b/public/images/emoji/google/man/3.png
index c07120932fd..e608e1167c3 100644
Binary files a/public/images/emoji/google/man/3.png and b/public/images/emoji/google/man/3.png differ
diff --git a/public/images/emoji/google/man/4.png b/public/images/emoji/google/man/4.png
index d8174a6ff05..d645f40ced6 100644
Binary files a/public/images/emoji/google/man/4.png and b/public/images/emoji/google/man/4.png differ
diff --git a/public/images/emoji/google/man/5.png b/public/images/emoji/google/man/5.png
index b21c4b7b442..8e630d025ea 100644
Binary files a/public/images/emoji/google/man/5.png and b/public/images/emoji/google/man/5.png differ
diff --git a/public/images/emoji/google/man/6.png b/public/images/emoji/google/man/6.png
index f8c77a50ea7..2eea24cdfd9 100644
Binary files a/public/images/emoji/google/man/6.png and b/public/images/emoji/google/man/6.png differ
diff --git a/public/images/emoji/google/man_artist.png b/public/images/emoji/google/man_artist.png
index 79ed156b477..a2d882de415 100644
Binary files a/public/images/emoji/google/man_artist.png and b/public/images/emoji/google/man_artist.png differ
diff --git a/public/images/emoji/google/man_artist/2.png b/public/images/emoji/google/man_artist/2.png
index 7a1da707a07..4d766bb4759 100644
Binary files a/public/images/emoji/google/man_artist/2.png and b/public/images/emoji/google/man_artist/2.png differ
diff --git a/public/images/emoji/google/man_artist/3.png b/public/images/emoji/google/man_artist/3.png
index aa84048bbd0..a58aa5796e2 100644
Binary files a/public/images/emoji/google/man_artist/3.png and b/public/images/emoji/google/man_artist/3.png differ
diff --git a/public/images/emoji/google/man_artist/4.png b/public/images/emoji/google/man_artist/4.png
index fa5cf0518ed..a59069b802f 100644
Binary files a/public/images/emoji/google/man_artist/4.png and b/public/images/emoji/google/man_artist/4.png differ
diff --git a/public/images/emoji/google/man_artist/5.png b/public/images/emoji/google/man_artist/5.png
index 6614041b7e0..05c79b5215e 100644
Binary files a/public/images/emoji/google/man_artist/5.png and b/public/images/emoji/google/man_artist/5.png differ
diff --git a/public/images/emoji/google/man_artist/6.png b/public/images/emoji/google/man_artist/6.png
index f03ed789670..c6af86c0a17 100644
Binary files a/public/images/emoji/google/man_artist/6.png and b/public/images/emoji/google/man_artist/6.png differ
diff --git a/public/images/emoji/google/man_astronaut.png b/public/images/emoji/google/man_astronaut.png
index 7d4997a28b5..f471dfb2ea9 100644
Binary files a/public/images/emoji/google/man_astronaut.png and b/public/images/emoji/google/man_astronaut.png differ
diff --git a/public/images/emoji/google/man_astronaut/2.png b/public/images/emoji/google/man_astronaut/2.png
index b43a058475e..ff2868d4a57 100644
Binary files a/public/images/emoji/google/man_astronaut/2.png and b/public/images/emoji/google/man_astronaut/2.png differ
diff --git a/public/images/emoji/google/man_astronaut/3.png b/public/images/emoji/google/man_astronaut/3.png
index 95b1bd81499..d36d98dd514 100644
Binary files a/public/images/emoji/google/man_astronaut/3.png and b/public/images/emoji/google/man_astronaut/3.png differ
diff --git a/public/images/emoji/google/man_astronaut/4.png b/public/images/emoji/google/man_astronaut/4.png
index 2ed638ebb50..c9ddcaaae38 100644
Binary files a/public/images/emoji/google/man_astronaut/4.png and b/public/images/emoji/google/man_astronaut/4.png differ
diff --git a/public/images/emoji/google/man_astronaut/5.png b/public/images/emoji/google/man_astronaut/5.png
index 72d62f9a047..105afa516df 100644
Binary files a/public/images/emoji/google/man_astronaut/5.png and b/public/images/emoji/google/man_astronaut/5.png differ
diff --git a/public/images/emoji/google/man_astronaut/6.png b/public/images/emoji/google/man_astronaut/6.png
index da9e12ed5d7..08c72787718 100644
Binary files a/public/images/emoji/google/man_astronaut/6.png and b/public/images/emoji/google/man_astronaut/6.png differ
diff --git a/public/images/emoji/google/man_cartwheeling.png b/public/images/emoji/google/man_cartwheeling.png
index dbc6a774277..eee329a7263 100644
Binary files a/public/images/emoji/google/man_cartwheeling.png and b/public/images/emoji/google/man_cartwheeling.png differ
diff --git a/public/images/emoji/google/man_cartwheeling/2.png b/public/images/emoji/google/man_cartwheeling/2.png
index 46199977e2a..247ce004c17 100644
Binary files a/public/images/emoji/google/man_cartwheeling/2.png and b/public/images/emoji/google/man_cartwheeling/2.png differ
diff --git a/public/images/emoji/google/man_cartwheeling/3.png b/public/images/emoji/google/man_cartwheeling/3.png
index 66d5a06d751..b0fa95cc032 100644
Binary files a/public/images/emoji/google/man_cartwheeling/3.png and b/public/images/emoji/google/man_cartwheeling/3.png differ
diff --git a/public/images/emoji/google/man_cartwheeling/4.png b/public/images/emoji/google/man_cartwheeling/4.png
index 1a209c3ec2d..2073c987134 100644
Binary files a/public/images/emoji/google/man_cartwheeling/4.png and b/public/images/emoji/google/man_cartwheeling/4.png differ
diff --git a/public/images/emoji/google/man_cartwheeling/5.png b/public/images/emoji/google/man_cartwheeling/5.png
index 433b97cc8d0..1d2b18aee1c 100644
Binary files a/public/images/emoji/google/man_cartwheeling/5.png and b/public/images/emoji/google/man_cartwheeling/5.png differ
diff --git a/public/images/emoji/google/man_cartwheeling/6.png b/public/images/emoji/google/man_cartwheeling/6.png
index 518d6d31b7e..db5a0311638 100644
Binary files a/public/images/emoji/google/man_cartwheeling/6.png and b/public/images/emoji/google/man_cartwheeling/6.png differ
diff --git a/public/images/emoji/google/man_cook.png b/public/images/emoji/google/man_cook.png
index da49a409855..bddc359d006 100644
Binary files a/public/images/emoji/google/man_cook.png and b/public/images/emoji/google/man_cook.png differ
diff --git a/public/images/emoji/google/man_cook/2.png b/public/images/emoji/google/man_cook/2.png
index 05d57fdb538..a70c566849e 100644
Binary files a/public/images/emoji/google/man_cook/2.png and b/public/images/emoji/google/man_cook/2.png differ
diff --git a/public/images/emoji/google/man_cook/3.png b/public/images/emoji/google/man_cook/3.png
index 4c279c0b172..fddd25e38dc 100644
Binary files a/public/images/emoji/google/man_cook/3.png and b/public/images/emoji/google/man_cook/3.png differ
diff --git a/public/images/emoji/google/man_cook/4.png b/public/images/emoji/google/man_cook/4.png
index eabdead72a3..9dc4869ef12 100644
Binary files a/public/images/emoji/google/man_cook/4.png and b/public/images/emoji/google/man_cook/4.png differ
diff --git a/public/images/emoji/google/man_cook/5.png b/public/images/emoji/google/man_cook/5.png
index 586449d287d..3fa465444b8 100644
Binary files a/public/images/emoji/google/man_cook/5.png and b/public/images/emoji/google/man_cook/5.png differ
diff --git a/public/images/emoji/google/man_cook/6.png b/public/images/emoji/google/man_cook/6.png
index 50b95d4b16d..ec99bd19cd3 100644
Binary files a/public/images/emoji/google/man_cook/6.png and b/public/images/emoji/google/man_cook/6.png differ
diff --git a/public/images/emoji/google/man_dancing.png b/public/images/emoji/google/man_dancing.png
index 7c06dae7815..f2ffd6a849b 100644
Binary files a/public/images/emoji/google/man_dancing.png and b/public/images/emoji/google/man_dancing.png differ
diff --git a/public/images/emoji/google/man_dancing/2.png b/public/images/emoji/google/man_dancing/2.png
index dfcc4522e16..874e361e335 100644
Binary files a/public/images/emoji/google/man_dancing/2.png and b/public/images/emoji/google/man_dancing/2.png differ
diff --git a/public/images/emoji/google/man_dancing/3.png b/public/images/emoji/google/man_dancing/3.png
index 671d89d6f44..8bcff4dcf53 100644
Binary files a/public/images/emoji/google/man_dancing/3.png and b/public/images/emoji/google/man_dancing/3.png differ
diff --git a/public/images/emoji/google/man_dancing/4.png b/public/images/emoji/google/man_dancing/4.png
index a5575df5310..9e86eada925 100644
Binary files a/public/images/emoji/google/man_dancing/4.png and b/public/images/emoji/google/man_dancing/4.png differ
diff --git a/public/images/emoji/google/man_dancing/5.png b/public/images/emoji/google/man_dancing/5.png
index b33d213a826..aac4988a072 100644
Binary files a/public/images/emoji/google/man_dancing/5.png and b/public/images/emoji/google/man_dancing/5.png differ
diff --git a/public/images/emoji/google/man_dancing/6.png b/public/images/emoji/google/man_dancing/6.png
index faed7a09855..53cefd0abd0 100644
Binary files a/public/images/emoji/google/man_dancing/6.png and b/public/images/emoji/google/man_dancing/6.png differ
diff --git a/public/images/emoji/google/man_facepalming.png b/public/images/emoji/google/man_facepalming.png
index 59aa5d58f31..2b20104ca77 100644
Binary files a/public/images/emoji/google/man_facepalming.png and b/public/images/emoji/google/man_facepalming.png differ
diff --git a/public/images/emoji/google/man_facepalming/2.png b/public/images/emoji/google/man_facepalming/2.png
index cfb55f58667..7c4dbfad2db 100644
Binary files a/public/images/emoji/google/man_facepalming/2.png and b/public/images/emoji/google/man_facepalming/2.png differ
diff --git a/public/images/emoji/google/man_facepalming/3.png b/public/images/emoji/google/man_facepalming/3.png
index 01e26582fd1..10622b9ab16 100644
Binary files a/public/images/emoji/google/man_facepalming/3.png and b/public/images/emoji/google/man_facepalming/3.png differ
diff --git a/public/images/emoji/google/man_facepalming/4.png b/public/images/emoji/google/man_facepalming/4.png
index ccfae915f2d..10a220278f7 100644
Binary files a/public/images/emoji/google/man_facepalming/4.png and b/public/images/emoji/google/man_facepalming/4.png differ
diff --git a/public/images/emoji/google/man_facepalming/5.png b/public/images/emoji/google/man_facepalming/5.png
index 9ac68142d95..a734425018d 100644
Binary files a/public/images/emoji/google/man_facepalming/5.png and b/public/images/emoji/google/man_facepalming/5.png differ
diff --git a/public/images/emoji/google/man_facepalming/6.png b/public/images/emoji/google/man_facepalming/6.png
index 23a150b9009..342546aa606 100644
Binary files a/public/images/emoji/google/man_facepalming/6.png and b/public/images/emoji/google/man_facepalming/6.png differ
diff --git a/public/images/emoji/google/man_factory_worker.png b/public/images/emoji/google/man_factory_worker.png
index b85f161ad43..ccb3ff070d3 100644
Binary files a/public/images/emoji/google/man_factory_worker.png and b/public/images/emoji/google/man_factory_worker.png differ
diff --git a/public/images/emoji/google/man_factory_worker/2.png b/public/images/emoji/google/man_factory_worker/2.png
index 9bf74715106..dbffa21f784 100644
Binary files a/public/images/emoji/google/man_factory_worker/2.png and b/public/images/emoji/google/man_factory_worker/2.png differ
diff --git a/public/images/emoji/google/man_factory_worker/3.png b/public/images/emoji/google/man_factory_worker/3.png
index 438a21a2911..f76776b1d0f 100644
Binary files a/public/images/emoji/google/man_factory_worker/3.png and b/public/images/emoji/google/man_factory_worker/3.png differ
diff --git a/public/images/emoji/google/man_factory_worker/4.png b/public/images/emoji/google/man_factory_worker/4.png
index 2a04997fb2f..f2ec1060fac 100644
Binary files a/public/images/emoji/google/man_factory_worker/4.png and b/public/images/emoji/google/man_factory_worker/4.png differ
diff --git a/public/images/emoji/google/man_factory_worker/5.png b/public/images/emoji/google/man_factory_worker/5.png
index 864292c4beb..3690155cf47 100644
Binary files a/public/images/emoji/google/man_factory_worker/5.png and b/public/images/emoji/google/man_factory_worker/5.png differ
diff --git a/public/images/emoji/google/man_factory_worker/6.png b/public/images/emoji/google/man_factory_worker/6.png
index 6b517faebc6..758fcf8c021 100644
Binary files a/public/images/emoji/google/man_factory_worker/6.png and b/public/images/emoji/google/man_factory_worker/6.png differ
diff --git a/public/images/emoji/google/man_farmer.png b/public/images/emoji/google/man_farmer.png
index 58f7f37810f..434efc59f41 100644
Binary files a/public/images/emoji/google/man_farmer.png and b/public/images/emoji/google/man_farmer.png differ
diff --git a/public/images/emoji/google/man_farmer/2.png b/public/images/emoji/google/man_farmer/2.png
index 6e581d42d27..1890e698676 100644
Binary files a/public/images/emoji/google/man_farmer/2.png and b/public/images/emoji/google/man_farmer/2.png differ
diff --git a/public/images/emoji/google/man_farmer/3.png b/public/images/emoji/google/man_farmer/3.png
index a50fbcc5787..6ac0aa9b121 100644
Binary files a/public/images/emoji/google/man_farmer/3.png and b/public/images/emoji/google/man_farmer/3.png differ
diff --git a/public/images/emoji/google/man_farmer/4.png b/public/images/emoji/google/man_farmer/4.png
index 3a9d3709411..e830d97a5cd 100644
Binary files a/public/images/emoji/google/man_farmer/4.png and b/public/images/emoji/google/man_farmer/4.png differ
diff --git a/public/images/emoji/google/man_farmer/5.png b/public/images/emoji/google/man_farmer/5.png
index 5e9190d0e57..ba40355354d 100644
Binary files a/public/images/emoji/google/man_farmer/5.png and b/public/images/emoji/google/man_farmer/5.png differ
diff --git a/public/images/emoji/google/man_farmer/6.png b/public/images/emoji/google/man_farmer/6.png
index 20d193dbbac..479933bb41a 100644
Binary files a/public/images/emoji/google/man_farmer/6.png and b/public/images/emoji/google/man_farmer/6.png differ
diff --git a/public/images/emoji/google/man_firefighter.png b/public/images/emoji/google/man_firefighter.png
index 3949db60f68..4422f5aa0a6 100644
Binary files a/public/images/emoji/google/man_firefighter.png and b/public/images/emoji/google/man_firefighter.png differ
diff --git a/public/images/emoji/google/man_firefighter/2.png b/public/images/emoji/google/man_firefighter/2.png
index 658b3422526..0be93314c47 100644
Binary files a/public/images/emoji/google/man_firefighter/2.png and b/public/images/emoji/google/man_firefighter/2.png differ
diff --git a/public/images/emoji/google/man_firefighter/3.png b/public/images/emoji/google/man_firefighter/3.png
index 178231b6b3f..5b870844717 100644
Binary files a/public/images/emoji/google/man_firefighter/3.png and b/public/images/emoji/google/man_firefighter/3.png differ
diff --git a/public/images/emoji/google/man_firefighter/4.png b/public/images/emoji/google/man_firefighter/4.png
index df7e09de2a9..830ab3ef2fd 100644
Binary files a/public/images/emoji/google/man_firefighter/4.png and b/public/images/emoji/google/man_firefighter/4.png differ
diff --git a/public/images/emoji/google/man_firefighter/5.png b/public/images/emoji/google/man_firefighter/5.png
index 4dece2f32b9..6351e5d02ff 100644
Binary files a/public/images/emoji/google/man_firefighter/5.png and b/public/images/emoji/google/man_firefighter/5.png differ
diff --git a/public/images/emoji/google/man_firefighter/6.png b/public/images/emoji/google/man_firefighter/6.png
index 05ec509ffcd..069cbe95876 100644
Binary files a/public/images/emoji/google/man_firefighter/6.png and b/public/images/emoji/google/man_firefighter/6.png differ
diff --git a/public/images/emoji/google/man_health_worker.png b/public/images/emoji/google/man_health_worker.png
index 1e8e92d26cf..68ceb2fc837 100644
Binary files a/public/images/emoji/google/man_health_worker.png and b/public/images/emoji/google/man_health_worker.png differ
diff --git a/public/images/emoji/google/man_health_worker/2.png b/public/images/emoji/google/man_health_worker/2.png
index 11b275b3bdb..124e63aee42 100644
Binary files a/public/images/emoji/google/man_health_worker/2.png and b/public/images/emoji/google/man_health_worker/2.png differ
diff --git a/public/images/emoji/google/man_health_worker/3.png b/public/images/emoji/google/man_health_worker/3.png
index 9f066054524..605b41a6939 100644
Binary files a/public/images/emoji/google/man_health_worker/3.png and b/public/images/emoji/google/man_health_worker/3.png differ
diff --git a/public/images/emoji/google/man_health_worker/4.png b/public/images/emoji/google/man_health_worker/4.png
index 48c60e1a122..7f135bc4917 100644
Binary files a/public/images/emoji/google/man_health_worker/4.png and b/public/images/emoji/google/man_health_worker/4.png differ
diff --git a/public/images/emoji/google/man_health_worker/5.png b/public/images/emoji/google/man_health_worker/5.png
index b289707381b..ad818285cf9 100644
Binary files a/public/images/emoji/google/man_health_worker/5.png and b/public/images/emoji/google/man_health_worker/5.png differ
diff --git a/public/images/emoji/google/man_health_worker/6.png b/public/images/emoji/google/man_health_worker/6.png
index 92f231e3fc6..f2e18722fe6 100644
Binary files a/public/images/emoji/google/man_health_worker/6.png and b/public/images/emoji/google/man_health_worker/6.png differ
diff --git a/public/images/emoji/google/man_in_business_suit_levitating.png b/public/images/emoji/google/man_in_business_suit_levitating.png
index 88918f97b31..b7eea2e0143 100644
Binary files a/public/images/emoji/google/man_in_business_suit_levitating.png and b/public/images/emoji/google/man_in_business_suit_levitating.png differ
diff --git a/public/images/emoji/google/man_in_business_suit_levitating/2.png b/public/images/emoji/google/man_in_business_suit_levitating/2.png
index ddeda2a43bb..28bf50d0d26 100644
Binary files a/public/images/emoji/google/man_in_business_suit_levitating/2.png and b/public/images/emoji/google/man_in_business_suit_levitating/2.png differ
diff --git a/public/images/emoji/google/man_in_business_suit_levitating/3.png b/public/images/emoji/google/man_in_business_suit_levitating/3.png
index e62d08a901f..2e9ca43ed91 100644
Binary files a/public/images/emoji/google/man_in_business_suit_levitating/3.png and b/public/images/emoji/google/man_in_business_suit_levitating/3.png differ
diff --git a/public/images/emoji/google/man_in_business_suit_levitating/4.png b/public/images/emoji/google/man_in_business_suit_levitating/4.png
index 27012dfbe98..1f9720f9622 100644
Binary files a/public/images/emoji/google/man_in_business_suit_levitating/4.png and b/public/images/emoji/google/man_in_business_suit_levitating/4.png differ
diff --git a/public/images/emoji/google/man_in_business_suit_levitating/5.png b/public/images/emoji/google/man_in_business_suit_levitating/5.png
index c8863f58335..889a3dcd0bb 100644
Binary files a/public/images/emoji/google/man_in_business_suit_levitating/5.png and b/public/images/emoji/google/man_in_business_suit_levitating/5.png differ
diff --git a/public/images/emoji/google/man_in_business_suit_levitating/6.png b/public/images/emoji/google/man_in_business_suit_levitating/6.png
index 62e5e00578f..6b55d4fcd7a 100644
Binary files a/public/images/emoji/google/man_in_business_suit_levitating/6.png and b/public/images/emoji/google/man_in_business_suit_levitating/6.png differ
diff --git a/public/images/emoji/google/man_in_tuxedo.png b/public/images/emoji/google/man_in_tuxedo.png
index 5b96a66a351..3e63dafa409 100644
Binary files a/public/images/emoji/google/man_in_tuxedo.png and b/public/images/emoji/google/man_in_tuxedo.png differ
diff --git a/public/images/emoji/google/man_in_tuxedo/2.png b/public/images/emoji/google/man_in_tuxedo/2.png
index 88cc2266e2f..b1c030abfa3 100644
Binary files a/public/images/emoji/google/man_in_tuxedo/2.png and b/public/images/emoji/google/man_in_tuxedo/2.png differ
diff --git a/public/images/emoji/google/man_in_tuxedo/3.png b/public/images/emoji/google/man_in_tuxedo/3.png
index 82a068f725e..8c8145f71f5 100644
Binary files a/public/images/emoji/google/man_in_tuxedo/3.png and b/public/images/emoji/google/man_in_tuxedo/3.png differ
diff --git a/public/images/emoji/google/man_in_tuxedo/4.png b/public/images/emoji/google/man_in_tuxedo/4.png
index 8572971df08..60cdd2992f0 100644
Binary files a/public/images/emoji/google/man_in_tuxedo/4.png and b/public/images/emoji/google/man_in_tuxedo/4.png differ
diff --git a/public/images/emoji/google/man_in_tuxedo/5.png b/public/images/emoji/google/man_in_tuxedo/5.png
index 1122dfdd0fe..499f3b96f77 100644
Binary files a/public/images/emoji/google/man_in_tuxedo/5.png and b/public/images/emoji/google/man_in_tuxedo/5.png differ
diff --git a/public/images/emoji/google/man_in_tuxedo/6.png b/public/images/emoji/google/man_in_tuxedo/6.png
index 6c1febff298..9f4c8aacf3b 100644
Binary files a/public/images/emoji/google/man_in_tuxedo/6.png and b/public/images/emoji/google/man_in_tuxedo/6.png differ
diff --git a/public/images/emoji/google/man_judge.png b/public/images/emoji/google/man_judge.png
index b33b3f9bea5..f9368e5c718 100644
Binary files a/public/images/emoji/google/man_judge.png and b/public/images/emoji/google/man_judge.png differ
diff --git a/public/images/emoji/google/man_judge/2.png b/public/images/emoji/google/man_judge/2.png
index ca912638464..17f8dec0ef7 100644
Binary files a/public/images/emoji/google/man_judge/2.png and b/public/images/emoji/google/man_judge/2.png differ
diff --git a/public/images/emoji/google/man_judge/3.png b/public/images/emoji/google/man_judge/3.png
index e0161ccba91..c6d01660c32 100644
Binary files a/public/images/emoji/google/man_judge/3.png and b/public/images/emoji/google/man_judge/3.png differ
diff --git a/public/images/emoji/google/man_judge/4.png b/public/images/emoji/google/man_judge/4.png
index 843abe2fa76..596d85d2ab7 100644
Binary files a/public/images/emoji/google/man_judge/4.png and b/public/images/emoji/google/man_judge/4.png differ
diff --git a/public/images/emoji/google/man_judge/5.png b/public/images/emoji/google/man_judge/5.png
index 06337e0c95e..38da72a6cda 100644
Binary files a/public/images/emoji/google/man_judge/5.png and b/public/images/emoji/google/man_judge/5.png differ
diff --git a/public/images/emoji/google/man_judge/6.png b/public/images/emoji/google/man_judge/6.png
index 1368c778314..0f039a6aceb 100644
Binary files a/public/images/emoji/google/man_judge/6.png and b/public/images/emoji/google/man_judge/6.png differ
diff --git a/public/images/emoji/google/man_juggling.png b/public/images/emoji/google/man_juggling.png
index 0806890aec4..ff435cc4eea 100644
Binary files a/public/images/emoji/google/man_juggling.png and b/public/images/emoji/google/man_juggling.png differ
diff --git a/public/images/emoji/google/man_juggling/2.png b/public/images/emoji/google/man_juggling/2.png
index 284272fad79..4766ad0951d 100644
Binary files a/public/images/emoji/google/man_juggling/2.png and b/public/images/emoji/google/man_juggling/2.png differ
diff --git a/public/images/emoji/google/man_juggling/3.png b/public/images/emoji/google/man_juggling/3.png
index 97f9a1b02df..413c57d2b7b 100644
Binary files a/public/images/emoji/google/man_juggling/3.png and b/public/images/emoji/google/man_juggling/3.png differ
diff --git a/public/images/emoji/google/man_juggling/4.png b/public/images/emoji/google/man_juggling/4.png
index 27743f990f9..62947379531 100644
Binary files a/public/images/emoji/google/man_juggling/4.png and b/public/images/emoji/google/man_juggling/4.png differ
diff --git a/public/images/emoji/google/man_juggling/5.png b/public/images/emoji/google/man_juggling/5.png
index 9d92c8162bc..ce57ddb2384 100644
Binary files a/public/images/emoji/google/man_juggling/5.png and b/public/images/emoji/google/man_juggling/5.png differ
diff --git a/public/images/emoji/google/man_juggling/6.png b/public/images/emoji/google/man_juggling/6.png
index f58c338c0c3..1d4061d1aa5 100644
Binary files a/public/images/emoji/google/man_juggling/6.png and b/public/images/emoji/google/man_juggling/6.png differ
diff --git a/public/images/emoji/google/man_mechanic.png b/public/images/emoji/google/man_mechanic.png
index 25b420bee0c..0bf3f5cc6f6 100644
Binary files a/public/images/emoji/google/man_mechanic.png and b/public/images/emoji/google/man_mechanic.png differ
diff --git a/public/images/emoji/google/man_mechanic/2.png b/public/images/emoji/google/man_mechanic/2.png
index 6a09785396f..b8d02ec84cc 100644
Binary files a/public/images/emoji/google/man_mechanic/2.png and b/public/images/emoji/google/man_mechanic/2.png differ
diff --git a/public/images/emoji/google/man_mechanic/3.png b/public/images/emoji/google/man_mechanic/3.png
index a1301ff2312..6a4838a7723 100644
Binary files a/public/images/emoji/google/man_mechanic/3.png and b/public/images/emoji/google/man_mechanic/3.png differ
diff --git a/public/images/emoji/google/man_mechanic/4.png b/public/images/emoji/google/man_mechanic/4.png
index 1bab61fb6ee..419e26193ff 100644
Binary files a/public/images/emoji/google/man_mechanic/4.png and b/public/images/emoji/google/man_mechanic/4.png differ
diff --git a/public/images/emoji/google/man_mechanic/5.png b/public/images/emoji/google/man_mechanic/5.png
index b345797f35d..749ce99c4f2 100644
Binary files a/public/images/emoji/google/man_mechanic/5.png and b/public/images/emoji/google/man_mechanic/5.png differ
diff --git a/public/images/emoji/google/man_mechanic/6.png b/public/images/emoji/google/man_mechanic/6.png
index a66ccdb6b47..b6849c4fc16 100644
Binary files a/public/images/emoji/google/man_mechanic/6.png and b/public/images/emoji/google/man_mechanic/6.png differ
diff --git a/public/images/emoji/google/man_office_worker.png b/public/images/emoji/google/man_office_worker.png
index 9ef011e6e07..d771e728e2a 100644
Binary files a/public/images/emoji/google/man_office_worker.png and b/public/images/emoji/google/man_office_worker.png differ
diff --git a/public/images/emoji/google/man_office_worker/2.png b/public/images/emoji/google/man_office_worker/2.png
index b555f03d963..97bd0b03aa9 100644
Binary files a/public/images/emoji/google/man_office_worker/2.png and b/public/images/emoji/google/man_office_worker/2.png differ
diff --git a/public/images/emoji/google/man_office_worker/3.png b/public/images/emoji/google/man_office_worker/3.png
index 8b709a73bb7..437133eb44f 100644
Binary files a/public/images/emoji/google/man_office_worker/3.png and b/public/images/emoji/google/man_office_worker/3.png differ
diff --git a/public/images/emoji/google/man_office_worker/4.png b/public/images/emoji/google/man_office_worker/4.png
index 31948b5cdfe..f520236e8c3 100644
Binary files a/public/images/emoji/google/man_office_worker/4.png and b/public/images/emoji/google/man_office_worker/4.png differ
diff --git a/public/images/emoji/google/man_office_worker/5.png b/public/images/emoji/google/man_office_worker/5.png
index d4911d564d1..a244f78c1d8 100644
Binary files a/public/images/emoji/google/man_office_worker/5.png and b/public/images/emoji/google/man_office_worker/5.png differ
diff --git a/public/images/emoji/google/man_office_worker/6.png b/public/images/emoji/google/man_office_worker/6.png
index a6d7cbc948c..bbf24bee5dc 100644
Binary files a/public/images/emoji/google/man_office_worker/6.png and b/public/images/emoji/google/man_office_worker/6.png differ
diff --git a/public/images/emoji/google/man_pilot.png b/public/images/emoji/google/man_pilot.png
index 0c9e600e5d8..1bc2daaa54c 100644
Binary files a/public/images/emoji/google/man_pilot.png and b/public/images/emoji/google/man_pilot.png differ
diff --git a/public/images/emoji/google/man_pilot/2.png b/public/images/emoji/google/man_pilot/2.png
index a6ec1f2266a..b113f14f255 100644
Binary files a/public/images/emoji/google/man_pilot/2.png and b/public/images/emoji/google/man_pilot/2.png differ
diff --git a/public/images/emoji/google/man_pilot/3.png b/public/images/emoji/google/man_pilot/3.png
index 3679a9a1d41..eede0c46a78 100644
Binary files a/public/images/emoji/google/man_pilot/3.png and b/public/images/emoji/google/man_pilot/3.png differ
diff --git a/public/images/emoji/google/man_pilot/4.png b/public/images/emoji/google/man_pilot/4.png
index 31bab226b54..dc1fdbc299f 100644
Binary files a/public/images/emoji/google/man_pilot/4.png and b/public/images/emoji/google/man_pilot/4.png differ
diff --git a/public/images/emoji/google/man_pilot/5.png b/public/images/emoji/google/man_pilot/5.png
index 4b4b8224950..5b4e518a5e4 100644
Binary files a/public/images/emoji/google/man_pilot/5.png and b/public/images/emoji/google/man_pilot/5.png differ
diff --git a/public/images/emoji/google/man_pilot/6.png b/public/images/emoji/google/man_pilot/6.png
index 5c6a33a8820..cfb0ba6796b 100644
Binary files a/public/images/emoji/google/man_pilot/6.png and b/public/images/emoji/google/man_pilot/6.png differ
diff --git a/public/images/emoji/google/man_playing_handball.png b/public/images/emoji/google/man_playing_handball.png
index 2bfaab08959..34abedad545 100644
Binary files a/public/images/emoji/google/man_playing_handball.png and b/public/images/emoji/google/man_playing_handball.png differ
diff --git a/public/images/emoji/google/man_playing_handball/2.png b/public/images/emoji/google/man_playing_handball/2.png
index 234808c8d37..10273cbc11d 100644
Binary files a/public/images/emoji/google/man_playing_handball/2.png and b/public/images/emoji/google/man_playing_handball/2.png differ
diff --git a/public/images/emoji/google/man_playing_handball/3.png b/public/images/emoji/google/man_playing_handball/3.png
index d9b0951d087..f989e399880 100644
Binary files a/public/images/emoji/google/man_playing_handball/3.png and b/public/images/emoji/google/man_playing_handball/3.png differ
diff --git a/public/images/emoji/google/man_playing_handball/4.png b/public/images/emoji/google/man_playing_handball/4.png
index 82d7d77964c..2195421e60d 100644
Binary files a/public/images/emoji/google/man_playing_handball/4.png and b/public/images/emoji/google/man_playing_handball/4.png differ
diff --git a/public/images/emoji/google/man_playing_handball/5.png b/public/images/emoji/google/man_playing_handball/5.png
index f6d4dc625c0..f77e5c06f85 100644
Binary files a/public/images/emoji/google/man_playing_handball/5.png and b/public/images/emoji/google/man_playing_handball/5.png differ
diff --git a/public/images/emoji/google/man_playing_handball/6.png b/public/images/emoji/google/man_playing_handball/6.png
index cbf4e936c49..644ae02227d 100644
Binary files a/public/images/emoji/google/man_playing_handball/6.png and b/public/images/emoji/google/man_playing_handball/6.png differ
diff --git a/public/images/emoji/google/man_playing_water_polo.png b/public/images/emoji/google/man_playing_water_polo.png
index 92f9700c12c..4ad26fc79ce 100644
Binary files a/public/images/emoji/google/man_playing_water_polo.png and b/public/images/emoji/google/man_playing_water_polo.png differ
diff --git a/public/images/emoji/google/man_playing_water_polo/2.png b/public/images/emoji/google/man_playing_water_polo/2.png
index ce100a54c59..232cc743e0c 100644
Binary files a/public/images/emoji/google/man_playing_water_polo/2.png and b/public/images/emoji/google/man_playing_water_polo/2.png differ
diff --git a/public/images/emoji/google/man_playing_water_polo/3.png b/public/images/emoji/google/man_playing_water_polo/3.png
index e40d5a9132e..23abbc3d934 100644
Binary files a/public/images/emoji/google/man_playing_water_polo/3.png and b/public/images/emoji/google/man_playing_water_polo/3.png differ
diff --git a/public/images/emoji/google/man_playing_water_polo/4.png b/public/images/emoji/google/man_playing_water_polo/4.png
index 7cfed1d0c93..3f48f2f98cf 100644
Binary files a/public/images/emoji/google/man_playing_water_polo/4.png and b/public/images/emoji/google/man_playing_water_polo/4.png differ
diff --git a/public/images/emoji/google/man_playing_water_polo/5.png b/public/images/emoji/google/man_playing_water_polo/5.png
index 24419842aac..e364ec2ff43 100644
Binary files a/public/images/emoji/google/man_playing_water_polo/5.png and b/public/images/emoji/google/man_playing_water_polo/5.png differ
diff --git a/public/images/emoji/google/man_playing_water_polo/6.png b/public/images/emoji/google/man_playing_water_polo/6.png
index e8ca7705a54..5a96561fd8e 100644
Binary files a/public/images/emoji/google/man_playing_water_polo/6.png and b/public/images/emoji/google/man_playing_water_polo/6.png differ
diff --git a/public/images/emoji/google/man_scientist.png b/public/images/emoji/google/man_scientist.png
index cda779ea51c..945ac639a9c 100644
Binary files a/public/images/emoji/google/man_scientist.png and b/public/images/emoji/google/man_scientist.png differ
diff --git a/public/images/emoji/google/man_scientist/2.png b/public/images/emoji/google/man_scientist/2.png
index 40f51c3c139..62cba4c0a31 100644
Binary files a/public/images/emoji/google/man_scientist/2.png and b/public/images/emoji/google/man_scientist/2.png differ
diff --git a/public/images/emoji/google/man_scientist/3.png b/public/images/emoji/google/man_scientist/3.png
index 9fbac46c1b9..376e7a7f459 100644
Binary files a/public/images/emoji/google/man_scientist/3.png and b/public/images/emoji/google/man_scientist/3.png differ
diff --git a/public/images/emoji/google/man_scientist/4.png b/public/images/emoji/google/man_scientist/4.png
index f122058b2df..84dedd0bb36 100644
Binary files a/public/images/emoji/google/man_scientist/4.png and b/public/images/emoji/google/man_scientist/4.png differ
diff --git a/public/images/emoji/google/man_scientist/5.png b/public/images/emoji/google/man_scientist/5.png
index 005259ae05e..4b0214d37c9 100644
Binary files a/public/images/emoji/google/man_scientist/5.png and b/public/images/emoji/google/man_scientist/5.png differ
diff --git a/public/images/emoji/google/man_scientist/6.png b/public/images/emoji/google/man_scientist/6.png
index 20cba10600e..4fc8cc5377f 100644
Binary files a/public/images/emoji/google/man_scientist/6.png and b/public/images/emoji/google/man_scientist/6.png differ
diff --git a/public/images/emoji/google/man_shrugging.png b/public/images/emoji/google/man_shrugging.png
index 1085867c73b..a48a2eeae58 100644
Binary files a/public/images/emoji/google/man_shrugging.png and b/public/images/emoji/google/man_shrugging.png differ
diff --git a/public/images/emoji/google/man_shrugging/2.png b/public/images/emoji/google/man_shrugging/2.png
index 79f62f05374..e5dd55ddbfd 100644
Binary files a/public/images/emoji/google/man_shrugging/2.png and b/public/images/emoji/google/man_shrugging/2.png differ
diff --git a/public/images/emoji/google/man_shrugging/3.png b/public/images/emoji/google/man_shrugging/3.png
index 4b2cf918290..d16defb263b 100644
Binary files a/public/images/emoji/google/man_shrugging/3.png and b/public/images/emoji/google/man_shrugging/3.png differ
diff --git a/public/images/emoji/google/man_shrugging/4.png b/public/images/emoji/google/man_shrugging/4.png
index 2fc5dec156a..7a449732f10 100644
Binary files a/public/images/emoji/google/man_shrugging/4.png and b/public/images/emoji/google/man_shrugging/4.png differ
diff --git a/public/images/emoji/google/man_shrugging/5.png b/public/images/emoji/google/man_shrugging/5.png
index e333c6e8258..976ea1e42e8 100644
Binary files a/public/images/emoji/google/man_shrugging/5.png and b/public/images/emoji/google/man_shrugging/5.png differ
diff --git a/public/images/emoji/google/man_shrugging/6.png b/public/images/emoji/google/man_shrugging/6.png
index 80de645fd50..8cd4edaa449 100644
Binary files a/public/images/emoji/google/man_shrugging/6.png and b/public/images/emoji/google/man_shrugging/6.png differ
diff --git a/public/images/emoji/google/man_singer.png b/public/images/emoji/google/man_singer.png
index b75730020a8..33a6d672130 100644
Binary files a/public/images/emoji/google/man_singer.png and b/public/images/emoji/google/man_singer.png differ
diff --git a/public/images/emoji/google/man_singer/2.png b/public/images/emoji/google/man_singer/2.png
index f3615c790f8..ef9f6ff2c75 100644
Binary files a/public/images/emoji/google/man_singer/2.png and b/public/images/emoji/google/man_singer/2.png differ
diff --git a/public/images/emoji/google/man_singer/3.png b/public/images/emoji/google/man_singer/3.png
index 4a87204dd32..75a66437889 100644
Binary files a/public/images/emoji/google/man_singer/3.png and b/public/images/emoji/google/man_singer/3.png differ
diff --git a/public/images/emoji/google/man_singer/4.png b/public/images/emoji/google/man_singer/4.png
index 503e7212956..25903dcf595 100644
Binary files a/public/images/emoji/google/man_singer/4.png and b/public/images/emoji/google/man_singer/4.png differ
diff --git a/public/images/emoji/google/man_singer/5.png b/public/images/emoji/google/man_singer/5.png
index 8e27920ade0..efba76b8ed7 100644
Binary files a/public/images/emoji/google/man_singer/5.png and b/public/images/emoji/google/man_singer/5.png differ
diff --git a/public/images/emoji/google/man_singer/6.png b/public/images/emoji/google/man_singer/6.png
index 98b7b97e2db..33b5d670ad4 100644
Binary files a/public/images/emoji/google/man_singer/6.png and b/public/images/emoji/google/man_singer/6.png differ
diff --git a/public/images/emoji/google/man_student.png b/public/images/emoji/google/man_student.png
index ce6609832a4..9de5aec6374 100644
Binary files a/public/images/emoji/google/man_student.png and b/public/images/emoji/google/man_student.png differ
diff --git a/public/images/emoji/google/man_student/2.png b/public/images/emoji/google/man_student/2.png
index 510bbd28578..034e3113cc5 100644
Binary files a/public/images/emoji/google/man_student/2.png and b/public/images/emoji/google/man_student/2.png differ
diff --git a/public/images/emoji/google/man_student/3.png b/public/images/emoji/google/man_student/3.png
index f3473301ba6..0d8478bcad4 100644
Binary files a/public/images/emoji/google/man_student/3.png and b/public/images/emoji/google/man_student/3.png differ
diff --git a/public/images/emoji/google/man_student/4.png b/public/images/emoji/google/man_student/4.png
index 0e4c8a1eb68..9a85a6d1d4a 100644
Binary files a/public/images/emoji/google/man_student/4.png and b/public/images/emoji/google/man_student/4.png differ
diff --git a/public/images/emoji/google/man_student/5.png b/public/images/emoji/google/man_student/5.png
index 3c116251129..5f627b153c0 100644
Binary files a/public/images/emoji/google/man_student/5.png and b/public/images/emoji/google/man_student/5.png differ
diff --git a/public/images/emoji/google/man_student/6.png b/public/images/emoji/google/man_student/6.png
index 287b380aa95..099d5a126b1 100644
Binary files a/public/images/emoji/google/man_student/6.png and b/public/images/emoji/google/man_student/6.png differ
diff --git a/public/images/emoji/google/man_teacher.png b/public/images/emoji/google/man_teacher.png
index 16762fdece5..1854c8e5cac 100644
Binary files a/public/images/emoji/google/man_teacher.png and b/public/images/emoji/google/man_teacher.png differ
diff --git a/public/images/emoji/google/man_teacher/2.png b/public/images/emoji/google/man_teacher/2.png
index d9212996f05..e01193b6ce0 100644
Binary files a/public/images/emoji/google/man_teacher/2.png and b/public/images/emoji/google/man_teacher/2.png differ
diff --git a/public/images/emoji/google/man_teacher/3.png b/public/images/emoji/google/man_teacher/3.png
index cc2a7d242fa..1f1be057aa6 100644
Binary files a/public/images/emoji/google/man_teacher/3.png and b/public/images/emoji/google/man_teacher/3.png differ
diff --git a/public/images/emoji/google/man_teacher/4.png b/public/images/emoji/google/man_teacher/4.png
index 7099b3286ae..c3a0321399f 100644
Binary files a/public/images/emoji/google/man_teacher/4.png and b/public/images/emoji/google/man_teacher/4.png differ
diff --git a/public/images/emoji/google/man_teacher/5.png b/public/images/emoji/google/man_teacher/5.png
index 10b6a7acf3f..3b2f369372f 100644
Binary files a/public/images/emoji/google/man_teacher/5.png and b/public/images/emoji/google/man_teacher/5.png differ
diff --git a/public/images/emoji/google/man_teacher/6.png b/public/images/emoji/google/man_teacher/6.png
index a37590307c5..0c943f38348 100644
Binary files a/public/images/emoji/google/man_teacher/6.png and b/public/images/emoji/google/man_teacher/6.png differ
diff --git a/public/images/emoji/google/man_technologist.png b/public/images/emoji/google/man_technologist.png
index b8d03288c1b..2f055257ba8 100644
Binary files a/public/images/emoji/google/man_technologist.png and b/public/images/emoji/google/man_technologist.png differ
diff --git a/public/images/emoji/google/man_technologist/2.png b/public/images/emoji/google/man_technologist/2.png
index 1f17bfa5ec0..5d01bf44daf 100644
Binary files a/public/images/emoji/google/man_technologist/2.png and b/public/images/emoji/google/man_technologist/2.png differ
diff --git a/public/images/emoji/google/man_technologist/3.png b/public/images/emoji/google/man_technologist/3.png
index 2a709961341..395e61347cb 100644
Binary files a/public/images/emoji/google/man_technologist/3.png and b/public/images/emoji/google/man_technologist/3.png differ
diff --git a/public/images/emoji/google/man_technologist/4.png b/public/images/emoji/google/man_technologist/4.png
index c5ef8e56f20..def49c17512 100644
Binary files a/public/images/emoji/google/man_technologist/4.png and b/public/images/emoji/google/man_technologist/4.png differ
diff --git a/public/images/emoji/google/man_technologist/5.png b/public/images/emoji/google/man_technologist/5.png
index e6fe4f56060..5c0a5d1fb7a 100644
Binary files a/public/images/emoji/google/man_technologist/5.png and b/public/images/emoji/google/man_technologist/5.png differ
diff --git a/public/images/emoji/google/man_technologist/6.png b/public/images/emoji/google/man_technologist/6.png
index 640ac73aea7..4c97d64e940 100644
Binary files a/public/images/emoji/google/man_technologist/6.png and b/public/images/emoji/google/man_technologist/6.png differ
diff --git a/public/images/emoji/google/man_with_gua_pi_mao.png b/public/images/emoji/google/man_with_gua_pi_mao.png
index fb65d54ebe7..039935db1e0 100644
Binary files a/public/images/emoji/google/man_with_gua_pi_mao.png and b/public/images/emoji/google/man_with_gua_pi_mao.png differ
diff --git a/public/images/emoji/google/man_with_gua_pi_mao/2.png b/public/images/emoji/google/man_with_gua_pi_mao/2.png
index c0303446600..bbaafaa7891 100644
Binary files a/public/images/emoji/google/man_with_gua_pi_mao/2.png and b/public/images/emoji/google/man_with_gua_pi_mao/2.png differ
diff --git a/public/images/emoji/google/man_with_gua_pi_mao/3.png b/public/images/emoji/google/man_with_gua_pi_mao/3.png
index 26fc71e6744..b4bfd04ec44 100644
Binary files a/public/images/emoji/google/man_with_gua_pi_mao/3.png and b/public/images/emoji/google/man_with_gua_pi_mao/3.png differ
diff --git a/public/images/emoji/google/man_with_gua_pi_mao/4.png b/public/images/emoji/google/man_with_gua_pi_mao/4.png
index 54d074db469..a023ea76d1b 100644
Binary files a/public/images/emoji/google/man_with_gua_pi_mao/4.png and b/public/images/emoji/google/man_with_gua_pi_mao/4.png differ
diff --git a/public/images/emoji/google/man_with_gua_pi_mao/5.png b/public/images/emoji/google/man_with_gua_pi_mao/5.png
index b44d21527dd..d66feb6e461 100644
Binary files a/public/images/emoji/google/man_with_gua_pi_mao/5.png and b/public/images/emoji/google/man_with_gua_pi_mao/5.png differ
diff --git a/public/images/emoji/google/man_with_gua_pi_mao/6.png b/public/images/emoji/google/man_with_gua_pi_mao/6.png
index 02f8d4bec98..2b0484202c5 100644
Binary files a/public/images/emoji/google/man_with_gua_pi_mao/6.png and b/public/images/emoji/google/man_with_gua_pi_mao/6.png differ
diff --git a/public/images/emoji/google/man_with_turban.png b/public/images/emoji/google/man_with_turban.png
index 6552b1777c4..bfb08a06071 100644
Binary files a/public/images/emoji/google/man_with_turban.png and b/public/images/emoji/google/man_with_turban.png differ
diff --git a/public/images/emoji/google/man_with_turban/2.png b/public/images/emoji/google/man_with_turban/2.png
index 717d147cef4..fc88d224a19 100644
Binary files a/public/images/emoji/google/man_with_turban/2.png and b/public/images/emoji/google/man_with_turban/2.png differ
diff --git a/public/images/emoji/google/man_with_turban/3.png b/public/images/emoji/google/man_with_turban/3.png
index 33ffa778239..47c6897e206 100644
Binary files a/public/images/emoji/google/man_with_turban/3.png and b/public/images/emoji/google/man_with_turban/3.png differ
diff --git a/public/images/emoji/google/man_with_turban/4.png b/public/images/emoji/google/man_with_turban/4.png
index c28c0ddf414..0e6578801f3 100644
Binary files a/public/images/emoji/google/man_with_turban/4.png and b/public/images/emoji/google/man_with_turban/4.png differ
diff --git a/public/images/emoji/google/man_with_turban/5.png b/public/images/emoji/google/man_with_turban/5.png
index 130ab75787d..9d9e332642d 100644
Binary files a/public/images/emoji/google/man_with_turban/5.png and b/public/images/emoji/google/man_with_turban/5.png differ
diff --git a/public/images/emoji/google/man_with_turban/6.png b/public/images/emoji/google/man_with_turban/6.png
index 55c5969cb24..5486d181332 100644
Binary files a/public/images/emoji/google/man_with_turban/6.png and b/public/images/emoji/google/man_with_turban/6.png differ
diff --git a/public/images/emoji/google/mans_shoe.png b/public/images/emoji/google/mans_shoe.png
index 1192b8766f9..c2c6bc15147 100644
Binary files a/public/images/emoji/google/mans_shoe.png and b/public/images/emoji/google/mans_shoe.png differ
diff --git a/public/images/emoji/google/mantelpiece_clock.png b/public/images/emoji/google/mantelpiece_clock.png
index b326630c04a..ae0fcb7c981 100644
Binary files a/public/images/emoji/google/mantelpiece_clock.png and b/public/images/emoji/google/mantelpiece_clock.png differ
diff --git a/public/images/emoji/google/map.png b/public/images/emoji/google/map.png
index dccb5d0512b..349e4d46c38 100644
Binary files a/public/images/emoji/google/map.png and b/public/images/emoji/google/map.png differ
diff --git a/public/images/emoji/google/maple_leaf.png b/public/images/emoji/google/maple_leaf.png
index 21701f9d6a1..3d4f34c4d5a 100644
Binary files a/public/images/emoji/google/maple_leaf.png and b/public/images/emoji/google/maple_leaf.png differ
diff --git a/public/images/emoji/google/marshall_islands.png b/public/images/emoji/google/marshall_islands.png
index dfc0b63f0e9..d32ede8967f 100644
Binary files a/public/images/emoji/google/marshall_islands.png and b/public/images/emoji/google/marshall_islands.png differ
diff --git a/public/images/emoji/google/martial_arts_uniform.png b/public/images/emoji/google/martial_arts_uniform.png
index b9572f75428..7f0523ab927 100644
Binary files a/public/images/emoji/google/martial_arts_uniform.png and b/public/images/emoji/google/martial_arts_uniform.png differ
diff --git a/public/images/emoji/google/martinique.png b/public/images/emoji/google/martinique.png
index dad0f8ce650..4faf7e252ef 100644
Binary files a/public/images/emoji/google/martinique.png and b/public/images/emoji/google/martinique.png differ
diff --git a/public/images/emoji/google/mask.png b/public/images/emoji/google/mask.png
index 74dca611cb0..cd6590ac5e7 100644
Binary files a/public/images/emoji/google/mask.png and b/public/images/emoji/google/mask.png differ
diff --git a/public/images/emoji/google/massage.png b/public/images/emoji/google/massage.png
index b52a93fddb8..7ebc6c09403 100644
Binary files a/public/images/emoji/google/massage.png and b/public/images/emoji/google/massage.png differ
diff --git a/public/images/emoji/google/massage/2.png b/public/images/emoji/google/massage/2.png
index b1d3dd0467d..ec08c2820b6 100644
Binary files a/public/images/emoji/google/massage/2.png and b/public/images/emoji/google/massage/2.png differ
diff --git a/public/images/emoji/google/massage/3.png b/public/images/emoji/google/massage/3.png
index ca82149d559..0ce3dba7000 100644
Binary files a/public/images/emoji/google/massage/3.png and b/public/images/emoji/google/massage/3.png differ
diff --git a/public/images/emoji/google/massage/4.png b/public/images/emoji/google/massage/4.png
index 89c98ef9048..c1ac9a26f1d 100644
Binary files a/public/images/emoji/google/massage/4.png and b/public/images/emoji/google/massage/4.png differ
diff --git a/public/images/emoji/google/massage/5.png b/public/images/emoji/google/massage/5.png
index 5ec0746086a..c1dbfbec23a 100644
Binary files a/public/images/emoji/google/massage/5.png and b/public/images/emoji/google/massage/5.png differ
diff --git a/public/images/emoji/google/massage/6.png b/public/images/emoji/google/massage/6.png
index 46aa9ce8321..40ea5266459 100644
Binary files a/public/images/emoji/google/massage/6.png and b/public/images/emoji/google/massage/6.png differ
diff --git a/public/images/emoji/google/massage_man.png b/public/images/emoji/google/massage_man.png
index 44beaa030b2..d329e3ffac3 100644
Binary files a/public/images/emoji/google/massage_man.png and b/public/images/emoji/google/massage_man.png differ
diff --git a/public/images/emoji/google/massage_man/2.png b/public/images/emoji/google/massage_man/2.png
index f49c27433b3..bfbdedaa67c 100644
Binary files a/public/images/emoji/google/massage_man/2.png and b/public/images/emoji/google/massage_man/2.png differ
diff --git a/public/images/emoji/google/massage_man/3.png b/public/images/emoji/google/massage_man/3.png
index bc3e5faff57..95f56e37d3c 100644
Binary files a/public/images/emoji/google/massage_man/3.png and b/public/images/emoji/google/massage_man/3.png differ
diff --git a/public/images/emoji/google/massage_man/4.png b/public/images/emoji/google/massage_man/4.png
index 78891ec1f05..08b78e6e174 100644
Binary files a/public/images/emoji/google/massage_man/4.png and b/public/images/emoji/google/massage_man/4.png differ
diff --git a/public/images/emoji/google/massage_man/5.png b/public/images/emoji/google/massage_man/5.png
index d2ed9d7d51a..a9312c185c6 100644
Binary files a/public/images/emoji/google/massage_man/5.png and b/public/images/emoji/google/massage_man/5.png differ
diff --git a/public/images/emoji/google/massage_man/6.png b/public/images/emoji/google/massage_man/6.png
index 170a4bb4443..e22f74ab2d3 100644
Binary files a/public/images/emoji/google/massage_man/6.png and b/public/images/emoji/google/massage_man/6.png differ
diff --git a/public/images/emoji/google/massage_woman.png b/public/images/emoji/google/massage_woman.png
index b52a93fddb8..7ebc6c09403 100644
Binary files a/public/images/emoji/google/massage_woman.png and b/public/images/emoji/google/massage_woman.png differ
diff --git a/public/images/emoji/google/massage_woman/2.png b/public/images/emoji/google/massage_woman/2.png
index b1d3dd0467d..ec08c2820b6 100644
Binary files a/public/images/emoji/google/massage_woman/2.png and b/public/images/emoji/google/massage_woman/2.png differ
diff --git a/public/images/emoji/google/massage_woman/3.png b/public/images/emoji/google/massage_woman/3.png
index ca82149d559..0ce3dba7000 100644
Binary files a/public/images/emoji/google/massage_woman/3.png and b/public/images/emoji/google/massage_woman/3.png differ
diff --git a/public/images/emoji/google/massage_woman/4.png b/public/images/emoji/google/massage_woman/4.png
index 89c98ef9048..c1ac9a26f1d 100644
Binary files a/public/images/emoji/google/massage_woman/4.png and b/public/images/emoji/google/massage_woman/4.png differ
diff --git a/public/images/emoji/google/massage_woman/5.png b/public/images/emoji/google/massage_woman/5.png
index 5ec0746086a..c1dbfbec23a 100644
Binary files a/public/images/emoji/google/massage_woman/5.png and b/public/images/emoji/google/massage_woman/5.png differ
diff --git a/public/images/emoji/google/massage_woman/6.png b/public/images/emoji/google/massage_woman/6.png
index 46aa9ce8321..40ea5266459 100644
Binary files a/public/images/emoji/google/massage_woman/6.png and b/public/images/emoji/google/massage_woman/6.png differ
diff --git a/public/images/emoji/google/mauritania.png b/public/images/emoji/google/mauritania.png
index 0e778d4d7e2..2e2ef05ee8d 100644
Binary files a/public/images/emoji/google/mauritania.png and b/public/images/emoji/google/mauritania.png differ
diff --git a/public/images/emoji/google/mauritius.png b/public/images/emoji/google/mauritius.png
index 91307b714b0..e6808bc0ef9 100644
Binary files a/public/images/emoji/google/mauritius.png and b/public/images/emoji/google/mauritius.png differ
diff --git a/public/images/emoji/google/mayotte.png b/public/images/emoji/google/mayotte.png
index dad0f8ce650..4faf7e252ef 100644
Binary files a/public/images/emoji/google/mayotte.png and b/public/images/emoji/google/mayotte.png differ
diff --git a/public/images/emoji/google/meat_on_bone.png b/public/images/emoji/google/meat_on_bone.png
index fbb5eef5410..e7e76e39e4c 100644
Binary files a/public/images/emoji/google/meat_on_bone.png and b/public/images/emoji/google/meat_on_bone.png differ
diff --git a/public/images/emoji/google/medal.png b/public/images/emoji/google/medal.png
index 3d321d89ed8..2ff8d191cbe 100644
Binary files a/public/images/emoji/google/medal.png and b/public/images/emoji/google/medal.png differ
diff --git a/public/images/emoji/google/medal_military.png b/public/images/emoji/google/medal_military.png
index 51c5c7027b3..bf10fca3d84 100644
Binary files a/public/images/emoji/google/medal_military.png and b/public/images/emoji/google/medal_military.png differ
diff --git a/public/images/emoji/google/medal_sports.png b/public/images/emoji/google/medal_sports.png
index 3d321d89ed8..2ff8d191cbe 100644
Binary files a/public/images/emoji/google/medal_sports.png and b/public/images/emoji/google/medal_sports.png differ
diff --git a/public/images/emoji/google/mega.png b/public/images/emoji/google/mega.png
index f821145f10f..4695a60e2f6 100644
Binary files a/public/images/emoji/google/mega.png and b/public/images/emoji/google/mega.png differ
diff --git a/public/images/emoji/google/melon.png b/public/images/emoji/google/melon.png
index 67e5836ef3d..0e104f75ee3 100644
Binary files a/public/images/emoji/google/melon.png and b/public/images/emoji/google/melon.png differ
diff --git a/public/images/emoji/google/memo.png b/public/images/emoji/google/memo.png
index 355dcfe22da..5a3bd6cd09d 100644
Binary files a/public/images/emoji/google/memo.png and b/public/images/emoji/google/memo.png differ
diff --git a/public/images/emoji/google/men_wrestling.png b/public/images/emoji/google/men_wrestling.png
index 8264daa9d36..e501870c4cd 100644
Binary files a/public/images/emoji/google/men_wrestling.png and b/public/images/emoji/google/men_wrestling.png differ
diff --git a/public/images/emoji/google/menorah.png b/public/images/emoji/google/menorah.png
index 260477a2d4b..377b9099c69 100644
Binary files a/public/images/emoji/google/menorah.png and b/public/images/emoji/google/menorah.png differ
diff --git a/public/images/emoji/google/mens.png b/public/images/emoji/google/mens.png
index cf8bd65a188..a2fee620c9f 100644
Binary files a/public/images/emoji/google/mens.png and b/public/images/emoji/google/mens.png differ
diff --git a/public/images/emoji/google/mermaid.png b/public/images/emoji/google/mermaid.png
new file mode 100644
index 00000000000..712ace66b6a
Binary files /dev/null and b/public/images/emoji/google/mermaid.png differ
diff --git a/public/images/emoji/google/mermaid/2.png b/public/images/emoji/google/mermaid/2.png
new file mode 100644
index 00000000000..0fe0f2cd140
Binary files /dev/null and b/public/images/emoji/google/mermaid/2.png differ
diff --git a/public/images/emoji/google/mermaid/3.png b/public/images/emoji/google/mermaid/3.png
new file mode 100644
index 00000000000..312e72e6401
Binary files /dev/null and b/public/images/emoji/google/mermaid/3.png differ
diff --git a/public/images/emoji/google/mermaid/4.png b/public/images/emoji/google/mermaid/4.png
new file mode 100644
index 00000000000..b94a1cef41b
Binary files /dev/null and b/public/images/emoji/google/mermaid/4.png differ
diff --git a/public/images/emoji/google/mermaid/5.png b/public/images/emoji/google/mermaid/5.png
new file mode 100644
index 00000000000..0d7e9b424c8
Binary files /dev/null and b/public/images/emoji/google/mermaid/5.png differ
diff --git a/public/images/emoji/google/mermaid/6.png b/public/images/emoji/google/mermaid/6.png
new file mode 100644
index 00000000000..b81b43d903a
Binary files /dev/null and b/public/images/emoji/google/mermaid/6.png differ
diff --git a/public/images/emoji/google/merman.png b/public/images/emoji/google/merman.png
new file mode 100644
index 00000000000..ce644bfbb5e
Binary files /dev/null and b/public/images/emoji/google/merman.png differ
diff --git a/public/images/emoji/google/merman/2.png b/public/images/emoji/google/merman/2.png
new file mode 100644
index 00000000000..e0a1e7a4229
Binary files /dev/null and b/public/images/emoji/google/merman/2.png differ
diff --git a/public/images/emoji/google/merman/3.png b/public/images/emoji/google/merman/3.png
new file mode 100644
index 00000000000..aae42d8792d
Binary files /dev/null and b/public/images/emoji/google/merman/3.png differ
diff --git a/public/images/emoji/google/merman/4.png b/public/images/emoji/google/merman/4.png
new file mode 100644
index 00000000000..8c4a18c5c6e
Binary files /dev/null and b/public/images/emoji/google/merman/4.png differ
diff --git a/public/images/emoji/google/merman/5.png b/public/images/emoji/google/merman/5.png
new file mode 100644
index 00000000000..801c675b87f
Binary files /dev/null and b/public/images/emoji/google/merman/5.png differ
diff --git a/public/images/emoji/google/merman/6.png b/public/images/emoji/google/merman/6.png
new file mode 100644
index 00000000000..5fcf86c4219
Binary files /dev/null and b/public/images/emoji/google/merman/6.png differ
diff --git a/public/images/emoji/google/merperson.png b/public/images/emoji/google/merperson.png
index 52ddaf75997..712ace66b6a 100644
Binary files a/public/images/emoji/google/merperson.png and b/public/images/emoji/google/merperson.png differ
diff --git a/public/images/emoji/google/merperson/2.png b/public/images/emoji/google/merperson/2.png
index d39e1bf4b70..0fe0f2cd140 100644
Binary files a/public/images/emoji/google/merperson/2.png and b/public/images/emoji/google/merperson/2.png differ
diff --git a/public/images/emoji/google/merperson/3.png b/public/images/emoji/google/merperson/3.png
index 2f56a42407c..312e72e6401 100644
Binary files a/public/images/emoji/google/merperson/3.png and b/public/images/emoji/google/merperson/3.png differ
diff --git a/public/images/emoji/google/merperson/4.png b/public/images/emoji/google/merperson/4.png
index 31c61fadd46..b94a1cef41b 100644
Binary files a/public/images/emoji/google/merperson/4.png and b/public/images/emoji/google/merperson/4.png differ
diff --git a/public/images/emoji/google/merperson/5.png b/public/images/emoji/google/merperson/5.png
index 183057d962d..0d7e9b424c8 100644
Binary files a/public/images/emoji/google/merperson/5.png and b/public/images/emoji/google/merperson/5.png differ
diff --git a/public/images/emoji/google/merperson/6.png b/public/images/emoji/google/merperson/6.png
index 8b3e5dd2937..b81b43d903a 100644
Binary files a/public/images/emoji/google/merperson/6.png and b/public/images/emoji/google/merperson/6.png differ
diff --git a/public/images/emoji/google/metal.png b/public/images/emoji/google/metal.png
index eeac747c65e..8d868d12d5b 100644
Binary files a/public/images/emoji/google/metal.png and b/public/images/emoji/google/metal.png differ
diff --git a/public/images/emoji/google/metal/2.png b/public/images/emoji/google/metal/2.png
index 614947ba817..310f52dfaca 100644
Binary files a/public/images/emoji/google/metal/2.png and b/public/images/emoji/google/metal/2.png differ
diff --git a/public/images/emoji/google/metal/3.png b/public/images/emoji/google/metal/3.png
index 2f9891b4805..74809c09468 100644
Binary files a/public/images/emoji/google/metal/3.png and b/public/images/emoji/google/metal/3.png differ
diff --git a/public/images/emoji/google/metal/4.png b/public/images/emoji/google/metal/4.png
index 44e8fc124cc..11bf6e93c3b 100644
Binary files a/public/images/emoji/google/metal/4.png and b/public/images/emoji/google/metal/4.png differ
diff --git a/public/images/emoji/google/metal/5.png b/public/images/emoji/google/metal/5.png
index 7016d1f0f82..767f7543d05 100644
Binary files a/public/images/emoji/google/metal/5.png and b/public/images/emoji/google/metal/5.png differ
diff --git a/public/images/emoji/google/metal/6.png b/public/images/emoji/google/metal/6.png
index 39216902504..f336dca8007 100644
Binary files a/public/images/emoji/google/metal/6.png and b/public/images/emoji/google/metal/6.png differ
diff --git a/public/images/emoji/google/metro.png b/public/images/emoji/google/metro.png
index 87ac46e6e78..2efb9ec09a3 100644
Binary files a/public/images/emoji/google/metro.png and b/public/images/emoji/google/metro.png differ
diff --git a/public/images/emoji/google/mexico.png b/public/images/emoji/google/mexico.png
index bfc31b76df7..687334adf57 100644
Binary files a/public/images/emoji/google/mexico.png and b/public/images/emoji/google/mexico.png differ
diff --git a/public/images/emoji/google/micronesia.png b/public/images/emoji/google/micronesia.png
index 86cd1a6c806..b75cc40ccf5 100644
Binary files a/public/images/emoji/google/micronesia.png and b/public/images/emoji/google/micronesia.png differ
diff --git a/public/images/emoji/google/microphone.png b/public/images/emoji/google/microphone.png
index d003da3ba16..7fe93419b73 100644
Binary files a/public/images/emoji/google/microphone.png and b/public/images/emoji/google/microphone.png differ
diff --git a/public/images/emoji/google/microphone2.png b/public/images/emoji/google/microphone2.png
index 9394168839c..070e657d8c8 100644
Binary files a/public/images/emoji/google/microphone2.png and b/public/images/emoji/google/microphone2.png differ
diff --git a/public/images/emoji/google/microscope.png b/public/images/emoji/google/microscope.png
index 1022205955c..0aa19f044a1 100644
Binary files a/public/images/emoji/google/microscope.png and b/public/images/emoji/google/microscope.png differ
diff --git a/public/images/emoji/google/middle_finger.png b/public/images/emoji/google/middle_finger.png
index 8ce128b147d..71e8d8b3e9c 100644
Binary files a/public/images/emoji/google/middle_finger.png and b/public/images/emoji/google/middle_finger.png differ
diff --git a/public/images/emoji/google/middle_finger/2.png b/public/images/emoji/google/middle_finger/2.png
index 3313e7e2f07..da4e50ac5e1 100644
Binary files a/public/images/emoji/google/middle_finger/2.png and b/public/images/emoji/google/middle_finger/2.png differ
diff --git a/public/images/emoji/google/middle_finger/3.png b/public/images/emoji/google/middle_finger/3.png
index 916b42be04a..785bc194551 100644
Binary files a/public/images/emoji/google/middle_finger/3.png and b/public/images/emoji/google/middle_finger/3.png differ
diff --git a/public/images/emoji/google/middle_finger/4.png b/public/images/emoji/google/middle_finger/4.png
index 7ab3507e2cd..f55cc136fc4 100644
Binary files a/public/images/emoji/google/middle_finger/4.png and b/public/images/emoji/google/middle_finger/4.png differ
diff --git a/public/images/emoji/google/middle_finger/5.png b/public/images/emoji/google/middle_finger/5.png
index aeb15696e62..a2ed1b0443a 100644
Binary files a/public/images/emoji/google/middle_finger/5.png and b/public/images/emoji/google/middle_finger/5.png differ
diff --git a/public/images/emoji/google/middle_finger/6.png b/public/images/emoji/google/middle_finger/6.png
index 8e864665145..cf73dfc6402 100644
Binary files a/public/images/emoji/google/middle_finger/6.png and b/public/images/emoji/google/middle_finger/6.png differ
diff --git a/public/images/emoji/google/military_medal.png b/public/images/emoji/google/military_medal.png
index 51c5c7027b3..bf10fca3d84 100644
Binary files a/public/images/emoji/google/military_medal.png and b/public/images/emoji/google/military_medal.png differ
diff --git a/public/images/emoji/google/milk_glass.png b/public/images/emoji/google/milk_glass.png
index 256b562d4f2..1313cda8683 100644
Binary files a/public/images/emoji/google/milk_glass.png and b/public/images/emoji/google/milk_glass.png differ
diff --git a/public/images/emoji/google/milky_way.png b/public/images/emoji/google/milky_way.png
index af10ffa7e85..9af21154a31 100644
Binary files a/public/images/emoji/google/milky_way.png and b/public/images/emoji/google/milky_way.png differ
diff --git a/public/images/emoji/google/minibus.png b/public/images/emoji/google/minibus.png
index 2a9731584a4..8a37e23c910 100644
Binary files a/public/images/emoji/google/minibus.png and b/public/images/emoji/google/minibus.png differ
diff --git a/public/images/emoji/google/minidisc.png b/public/images/emoji/google/minidisc.png
index e9b2420fa97..089fd50de9c 100644
Binary files a/public/images/emoji/google/minidisc.png and b/public/images/emoji/google/minidisc.png differ
diff --git a/public/images/emoji/google/mobile_phone_off.png b/public/images/emoji/google/mobile_phone_off.png
index 2eb131de419..53fed218655 100644
Binary files a/public/images/emoji/google/mobile_phone_off.png and b/public/images/emoji/google/mobile_phone_off.png differ
diff --git a/public/images/emoji/google/moldova.png b/public/images/emoji/google/moldova.png
index bdd1daad75e..a961b32adc6 100644
Binary files a/public/images/emoji/google/moldova.png and b/public/images/emoji/google/moldova.png differ
diff --git a/public/images/emoji/google/monaco.png b/public/images/emoji/google/monaco.png
index 30c904e1694..459a8490958 100644
Binary files a/public/images/emoji/google/monaco.png and b/public/images/emoji/google/monaco.png differ
diff --git a/public/images/emoji/google/money_mouth.png b/public/images/emoji/google/money_mouth.png
index 15b7188abea..1d6bc0dc9e9 100644
Binary files a/public/images/emoji/google/money_mouth.png and b/public/images/emoji/google/money_mouth.png differ
diff --git a/public/images/emoji/google/money_mouth_face.png b/public/images/emoji/google/money_mouth_face.png
index 15b7188abea..1d6bc0dc9e9 100644
Binary files a/public/images/emoji/google/money_mouth_face.png and b/public/images/emoji/google/money_mouth_face.png differ
diff --git a/public/images/emoji/google/money_with_wings.png b/public/images/emoji/google/money_with_wings.png
index 7852c7b9be2..b7f80015f84 100644
Binary files a/public/images/emoji/google/money_with_wings.png and b/public/images/emoji/google/money_with_wings.png differ
diff --git a/public/images/emoji/google/moneybag.png b/public/images/emoji/google/moneybag.png
index 18995016eaa..9f0d81f2fe9 100644
Binary files a/public/images/emoji/google/moneybag.png and b/public/images/emoji/google/moneybag.png differ
diff --git a/public/images/emoji/google/mongolia.png b/public/images/emoji/google/mongolia.png
index fc2c4d69d0d..7beb51c703f 100644
Binary files a/public/images/emoji/google/mongolia.png and b/public/images/emoji/google/mongolia.png differ
diff --git a/public/images/emoji/google/monkey.png b/public/images/emoji/google/monkey.png
index 06a97625d41..f8930cb0e33 100644
Binary files a/public/images/emoji/google/monkey.png and b/public/images/emoji/google/monkey.png differ
diff --git a/public/images/emoji/google/monkey_face.png b/public/images/emoji/google/monkey_face.png
index 7a726c3a785..d6b5f2a58b2 100644
Binary files a/public/images/emoji/google/monkey_face.png and b/public/images/emoji/google/monkey_face.png differ
diff --git a/public/images/emoji/google/monorail.png b/public/images/emoji/google/monorail.png
index b6e7072262f..160117ab2c4 100644
Binary files a/public/images/emoji/google/monorail.png and b/public/images/emoji/google/monorail.png differ
diff --git a/public/images/emoji/google/montenegro.png b/public/images/emoji/google/montenegro.png
index 364f5af9bdb..0e2cca21b9a 100644
Binary files a/public/images/emoji/google/montenegro.png and b/public/images/emoji/google/montenegro.png differ
diff --git a/public/images/emoji/google/montserrat.png b/public/images/emoji/google/montserrat.png
index 3b15005541b..a6069d92960 100644
Binary files a/public/images/emoji/google/montserrat.png and b/public/images/emoji/google/montserrat.png differ
diff --git a/public/images/emoji/google/moon.png b/public/images/emoji/google/moon.png
index 948d36d6a4f..878497f3f8f 100644
Binary files a/public/images/emoji/google/moon.png and b/public/images/emoji/google/moon.png differ
diff --git a/public/images/emoji/google/morocco.png b/public/images/emoji/google/morocco.png
index f9b158fd8c6..8cdf1480ef1 100644
Binary files a/public/images/emoji/google/morocco.png and b/public/images/emoji/google/morocco.png differ
diff --git a/public/images/emoji/google/mortar_board.png b/public/images/emoji/google/mortar_board.png
index 584c09dd0de..d1e7fa12830 100644
Binary files a/public/images/emoji/google/mortar_board.png and b/public/images/emoji/google/mortar_board.png differ
diff --git a/public/images/emoji/google/mosque.png b/public/images/emoji/google/mosque.png
index c2f372979f9..b3fe9a91844 100644
Binary files a/public/images/emoji/google/mosque.png and b/public/images/emoji/google/mosque.png differ
diff --git a/public/images/emoji/google/motor_boat.png b/public/images/emoji/google/motor_boat.png
index 42799a3b742..e26c5116c41 100644
Binary files a/public/images/emoji/google/motor_boat.png and b/public/images/emoji/google/motor_boat.png differ
diff --git a/public/images/emoji/google/motor_scooter.png b/public/images/emoji/google/motor_scooter.png
index 1a80fb5f2e2..ad0290cec4d 100644
Binary files a/public/images/emoji/google/motor_scooter.png and b/public/images/emoji/google/motor_scooter.png differ
diff --git a/public/images/emoji/google/motorboat.png b/public/images/emoji/google/motorboat.png
index 42799a3b742..e26c5116c41 100644
Binary files a/public/images/emoji/google/motorboat.png and b/public/images/emoji/google/motorboat.png differ
diff --git a/public/images/emoji/google/motorcycle.png b/public/images/emoji/google/motorcycle.png
index d153c400edb..f665d143ef0 100644
Binary files a/public/images/emoji/google/motorcycle.png and b/public/images/emoji/google/motorcycle.png differ
diff --git a/public/images/emoji/google/motorway.png b/public/images/emoji/google/motorway.png
index e37d6fa63c0..1c8e95fed0f 100644
Binary files a/public/images/emoji/google/motorway.png and b/public/images/emoji/google/motorway.png differ
diff --git a/public/images/emoji/google/mount_fuji.png b/public/images/emoji/google/mount_fuji.png
index f0a58a3715c..2a6de78a107 100644
Binary files a/public/images/emoji/google/mount_fuji.png and b/public/images/emoji/google/mount_fuji.png differ
diff --git a/public/images/emoji/google/mountain.png b/public/images/emoji/google/mountain.png
index 27d83350935..fac790f782c 100644
Binary files a/public/images/emoji/google/mountain.png and b/public/images/emoji/google/mountain.png differ
diff --git a/public/images/emoji/google/mountain_bicyclist.png b/public/images/emoji/google/mountain_bicyclist.png
index 126a776acc0..238e3f052ee 100644
Binary files a/public/images/emoji/google/mountain_bicyclist.png and b/public/images/emoji/google/mountain_bicyclist.png differ
diff --git a/public/images/emoji/google/mountain_bicyclist/2.png b/public/images/emoji/google/mountain_bicyclist/2.png
index 7d49e1c916d..40ecb4142a5 100644
Binary files a/public/images/emoji/google/mountain_bicyclist/2.png and b/public/images/emoji/google/mountain_bicyclist/2.png differ
diff --git a/public/images/emoji/google/mountain_bicyclist/3.png b/public/images/emoji/google/mountain_bicyclist/3.png
index bcb2c823188..940cf0f6f13 100644
Binary files a/public/images/emoji/google/mountain_bicyclist/3.png and b/public/images/emoji/google/mountain_bicyclist/3.png differ
diff --git a/public/images/emoji/google/mountain_bicyclist/4.png b/public/images/emoji/google/mountain_bicyclist/4.png
index f864ee5ea94..9e955fae894 100644
Binary files a/public/images/emoji/google/mountain_bicyclist/4.png and b/public/images/emoji/google/mountain_bicyclist/4.png differ
diff --git a/public/images/emoji/google/mountain_bicyclist/5.png b/public/images/emoji/google/mountain_bicyclist/5.png
index c9c73598b1b..42bf24527ab 100644
Binary files a/public/images/emoji/google/mountain_bicyclist/5.png and b/public/images/emoji/google/mountain_bicyclist/5.png differ
diff --git a/public/images/emoji/google/mountain_bicyclist/6.png b/public/images/emoji/google/mountain_bicyclist/6.png
index 4cce156c14e..e8e32ae2bd5 100644
Binary files a/public/images/emoji/google/mountain_bicyclist/6.png and b/public/images/emoji/google/mountain_bicyclist/6.png differ
diff --git a/public/images/emoji/google/mountain_biking_man.png b/public/images/emoji/google/mountain_biking_man.png
index 126a776acc0..238e3f052ee 100644
Binary files a/public/images/emoji/google/mountain_biking_man.png and b/public/images/emoji/google/mountain_biking_man.png differ
diff --git a/public/images/emoji/google/mountain_biking_man/2.png b/public/images/emoji/google/mountain_biking_man/2.png
index 7d49e1c916d..40ecb4142a5 100644
Binary files a/public/images/emoji/google/mountain_biking_man/2.png and b/public/images/emoji/google/mountain_biking_man/2.png differ
diff --git a/public/images/emoji/google/mountain_biking_man/3.png b/public/images/emoji/google/mountain_biking_man/3.png
index bcb2c823188..940cf0f6f13 100644
Binary files a/public/images/emoji/google/mountain_biking_man/3.png and b/public/images/emoji/google/mountain_biking_man/3.png differ
diff --git a/public/images/emoji/google/mountain_biking_man/4.png b/public/images/emoji/google/mountain_biking_man/4.png
index f864ee5ea94..9e955fae894 100644
Binary files a/public/images/emoji/google/mountain_biking_man/4.png and b/public/images/emoji/google/mountain_biking_man/4.png differ
diff --git a/public/images/emoji/google/mountain_biking_man/5.png b/public/images/emoji/google/mountain_biking_man/5.png
index c9c73598b1b..42bf24527ab 100644
Binary files a/public/images/emoji/google/mountain_biking_man/5.png and b/public/images/emoji/google/mountain_biking_man/5.png differ
diff --git a/public/images/emoji/google/mountain_biking_man/6.png b/public/images/emoji/google/mountain_biking_man/6.png
index 4cce156c14e..e8e32ae2bd5 100644
Binary files a/public/images/emoji/google/mountain_biking_man/6.png and b/public/images/emoji/google/mountain_biking_man/6.png differ
diff --git a/public/images/emoji/google/mountain_biking_woman.png b/public/images/emoji/google/mountain_biking_woman.png
index 94b07d31ac1..1c22d49f947 100644
Binary files a/public/images/emoji/google/mountain_biking_woman.png and b/public/images/emoji/google/mountain_biking_woman.png differ
diff --git a/public/images/emoji/google/mountain_biking_woman/2.png b/public/images/emoji/google/mountain_biking_woman/2.png
index a9b93276928..20e3e8ebb10 100644
Binary files a/public/images/emoji/google/mountain_biking_woman/2.png and b/public/images/emoji/google/mountain_biking_woman/2.png differ
diff --git a/public/images/emoji/google/mountain_biking_woman/3.png b/public/images/emoji/google/mountain_biking_woman/3.png
index f41c9306801..75b20db35e6 100644
Binary files a/public/images/emoji/google/mountain_biking_woman/3.png and b/public/images/emoji/google/mountain_biking_woman/3.png differ
diff --git a/public/images/emoji/google/mountain_biking_woman/4.png b/public/images/emoji/google/mountain_biking_woman/4.png
index f1c13c6e0cc..cbb335ef004 100644
Binary files a/public/images/emoji/google/mountain_biking_woman/4.png and b/public/images/emoji/google/mountain_biking_woman/4.png differ
diff --git a/public/images/emoji/google/mountain_biking_woman/5.png b/public/images/emoji/google/mountain_biking_woman/5.png
index 27b10c24fb4..91f7999230d 100644
Binary files a/public/images/emoji/google/mountain_biking_woman/5.png and b/public/images/emoji/google/mountain_biking_woman/5.png differ
diff --git a/public/images/emoji/google/mountain_biking_woman/6.png b/public/images/emoji/google/mountain_biking_woman/6.png
index d9f6ba7bba9..bda4352f7cc 100644
Binary files a/public/images/emoji/google/mountain_biking_woman/6.png and b/public/images/emoji/google/mountain_biking_woman/6.png differ
diff --git a/public/images/emoji/google/mountain_cableway.png b/public/images/emoji/google/mountain_cableway.png
index 109f4804191..02ec4de0898 100644
Binary files a/public/images/emoji/google/mountain_cableway.png and b/public/images/emoji/google/mountain_cableway.png differ
diff --git a/public/images/emoji/google/mountain_railway.png b/public/images/emoji/google/mountain_railway.png
index c68849f3576..47931821187 100644
Binary files a/public/images/emoji/google/mountain_railway.png and b/public/images/emoji/google/mountain_railway.png differ
diff --git a/public/images/emoji/google/mountain_snow.png b/public/images/emoji/google/mountain_snow.png
index f7ab7c2c747..394c96bb616 100644
Binary files a/public/images/emoji/google/mountain_snow.png and b/public/images/emoji/google/mountain_snow.png differ
diff --git a/public/images/emoji/google/mouse.png b/public/images/emoji/google/mouse.png
index 2e10c6001aa..1e157c89c09 100644
Binary files a/public/images/emoji/google/mouse.png and b/public/images/emoji/google/mouse.png differ
diff --git a/public/images/emoji/google/mouse2.png b/public/images/emoji/google/mouse2.png
index f32d8e136f4..4c93a0d2482 100644
Binary files a/public/images/emoji/google/mouse2.png and b/public/images/emoji/google/mouse2.png differ
diff --git a/public/images/emoji/google/mouse_three_button.png b/public/images/emoji/google/mouse_three_button.png
index 606ada2ed4f..28785439fc2 100644
Binary files a/public/images/emoji/google/mouse_three_button.png and b/public/images/emoji/google/mouse_three_button.png differ
diff --git a/public/images/emoji/google/movie_camera.png b/public/images/emoji/google/movie_camera.png
index c09d290c013..b1ba75a16d1 100644
Binary files a/public/images/emoji/google/movie_camera.png and b/public/images/emoji/google/movie_camera.png differ
diff --git a/public/images/emoji/google/moyai.png b/public/images/emoji/google/moyai.png
index f9da2311849..723cd7c6260 100644
Binary files a/public/images/emoji/google/moyai.png and b/public/images/emoji/google/moyai.png differ
diff --git a/public/images/emoji/google/mozambique.png b/public/images/emoji/google/mozambique.png
index 72b32c188f9..363860590d9 100644
Binary files a/public/images/emoji/google/mozambique.png and b/public/images/emoji/google/mozambique.png differ
diff --git a/public/images/emoji/google/mrs_claus.png b/public/images/emoji/google/mrs_claus.png
index 694316523a1..2edec50ec41 100644
Binary files a/public/images/emoji/google/mrs_claus.png and b/public/images/emoji/google/mrs_claus.png differ
diff --git a/public/images/emoji/google/mrs_claus/2.png b/public/images/emoji/google/mrs_claus/2.png
index dbb37173d70..db51cca09c4 100644
Binary files a/public/images/emoji/google/mrs_claus/2.png and b/public/images/emoji/google/mrs_claus/2.png differ
diff --git a/public/images/emoji/google/mrs_claus/3.png b/public/images/emoji/google/mrs_claus/3.png
index c311381bce7..0cd2668f063 100644
Binary files a/public/images/emoji/google/mrs_claus/3.png and b/public/images/emoji/google/mrs_claus/3.png differ
diff --git a/public/images/emoji/google/mrs_claus/4.png b/public/images/emoji/google/mrs_claus/4.png
index bc74e33fe1c..10ab1f76c90 100644
Binary files a/public/images/emoji/google/mrs_claus/4.png and b/public/images/emoji/google/mrs_claus/4.png differ
diff --git a/public/images/emoji/google/mrs_claus/5.png b/public/images/emoji/google/mrs_claus/5.png
index ce7bb7cd120..394064f8909 100644
Binary files a/public/images/emoji/google/mrs_claus/5.png and b/public/images/emoji/google/mrs_claus/5.png differ
diff --git a/public/images/emoji/google/mrs_claus/6.png b/public/images/emoji/google/mrs_claus/6.png
index c9fd8609bb0..b9a60a1ffe8 100644
Binary files a/public/images/emoji/google/mrs_claus/6.png and b/public/images/emoji/google/mrs_claus/6.png differ
diff --git a/public/images/emoji/google/muscle.png b/public/images/emoji/google/muscle.png
index 2f4e8a9d487..b905e7189c9 100644
Binary files a/public/images/emoji/google/muscle.png and b/public/images/emoji/google/muscle.png differ
diff --git a/public/images/emoji/google/muscle/2.png b/public/images/emoji/google/muscle/2.png
index f5742eda91d..229ef9fad75 100644
Binary files a/public/images/emoji/google/muscle/2.png and b/public/images/emoji/google/muscle/2.png differ
diff --git a/public/images/emoji/google/muscle/3.png b/public/images/emoji/google/muscle/3.png
index 4dd7352f778..e720691100e 100644
Binary files a/public/images/emoji/google/muscle/3.png and b/public/images/emoji/google/muscle/3.png differ
diff --git a/public/images/emoji/google/muscle/4.png b/public/images/emoji/google/muscle/4.png
index 44dacb8a0c2..02304a24e1f 100644
Binary files a/public/images/emoji/google/muscle/4.png and b/public/images/emoji/google/muscle/4.png differ
diff --git a/public/images/emoji/google/muscle/5.png b/public/images/emoji/google/muscle/5.png
index e8affdf4546..3490fc9d1f4 100644
Binary files a/public/images/emoji/google/muscle/5.png and b/public/images/emoji/google/muscle/5.png differ
diff --git a/public/images/emoji/google/muscle/6.png b/public/images/emoji/google/muscle/6.png
index 042948c39a7..53cf41e4d05 100644
Binary files a/public/images/emoji/google/muscle/6.png and b/public/images/emoji/google/muscle/6.png differ
diff --git a/public/images/emoji/google/mushroom.png b/public/images/emoji/google/mushroom.png
index 3bd413f2688..bdddb34cd82 100644
Binary files a/public/images/emoji/google/mushroom.png and b/public/images/emoji/google/mushroom.png differ
diff --git a/public/images/emoji/google/musical_keyboard.png b/public/images/emoji/google/musical_keyboard.png
index d1bf210a77b..cc794312f63 100644
Binary files a/public/images/emoji/google/musical_keyboard.png and b/public/images/emoji/google/musical_keyboard.png differ
diff --git a/public/images/emoji/google/musical_note.png b/public/images/emoji/google/musical_note.png
index ca4bd871c2e..4e7e9a306db 100644
Binary files a/public/images/emoji/google/musical_note.png and b/public/images/emoji/google/musical_note.png differ
diff --git a/public/images/emoji/google/musical_score.png b/public/images/emoji/google/musical_score.png
index 38e5a652abc..4df0ffb8be7 100644
Binary files a/public/images/emoji/google/musical_score.png and b/public/images/emoji/google/musical_score.png differ
diff --git a/public/images/emoji/google/mute.png b/public/images/emoji/google/mute.png
index 9c9dc80824d..af176d1cda7 100644
Binary files a/public/images/emoji/google/mute.png and b/public/images/emoji/google/mute.png differ
diff --git a/public/images/emoji/google/myanmar.png b/public/images/emoji/google/myanmar.png
index 521999380c9..d28635d2962 100644
Binary files a/public/images/emoji/google/myanmar.png and b/public/images/emoji/google/myanmar.png differ
diff --git a/public/images/emoji/google/nail_care.png b/public/images/emoji/google/nail_care.png
index e22ff7d1a62..a845554d6cc 100644
Binary files a/public/images/emoji/google/nail_care.png and b/public/images/emoji/google/nail_care.png differ
diff --git a/public/images/emoji/google/nail_care/2.png b/public/images/emoji/google/nail_care/2.png
index 7959b94c396..eb0803d46b8 100644
Binary files a/public/images/emoji/google/nail_care/2.png and b/public/images/emoji/google/nail_care/2.png differ
diff --git a/public/images/emoji/google/nail_care/3.png b/public/images/emoji/google/nail_care/3.png
index 735f0fd5c3e..94f132b3860 100644
Binary files a/public/images/emoji/google/nail_care/3.png and b/public/images/emoji/google/nail_care/3.png differ
diff --git a/public/images/emoji/google/nail_care/4.png b/public/images/emoji/google/nail_care/4.png
index e45bd79054f..12ec1166af5 100644
Binary files a/public/images/emoji/google/nail_care/4.png and b/public/images/emoji/google/nail_care/4.png differ
diff --git a/public/images/emoji/google/nail_care/5.png b/public/images/emoji/google/nail_care/5.png
index 55a09777d70..47ae039cfd6 100644
Binary files a/public/images/emoji/google/nail_care/5.png and b/public/images/emoji/google/nail_care/5.png differ
diff --git a/public/images/emoji/google/nail_care/6.png b/public/images/emoji/google/nail_care/6.png
index 8f8a1668de7..d1b0bfe1f3a 100644
Binary files a/public/images/emoji/google/nail_care/6.png and b/public/images/emoji/google/nail_care/6.png differ
diff --git a/public/images/emoji/google/name_badge.png b/public/images/emoji/google/name_badge.png
index 6de01068dbf..0627940cc76 100644
Binary files a/public/images/emoji/google/name_badge.png and b/public/images/emoji/google/name_badge.png differ
diff --git a/public/images/emoji/google/namibia.png b/public/images/emoji/google/namibia.png
index ff94010440c..ccc0114785e 100644
Binary files a/public/images/emoji/google/namibia.png and b/public/images/emoji/google/namibia.png differ
diff --git a/public/images/emoji/google/national_park.png b/public/images/emoji/google/national_park.png
index 669eb54fbf1..d98082e0cd2 100644
Binary files a/public/images/emoji/google/national_park.png and b/public/images/emoji/google/national_park.png differ
diff --git a/public/images/emoji/google/nauru.png b/public/images/emoji/google/nauru.png
index d62600569a2..5a3001c3209 100644
Binary files a/public/images/emoji/google/nauru.png and b/public/images/emoji/google/nauru.png differ
diff --git a/public/images/emoji/google/nauseated_face.png b/public/images/emoji/google/nauseated_face.png
index 004026f11e9..59787d849e2 100644
Binary files a/public/images/emoji/google/nauseated_face.png and b/public/images/emoji/google/nauseated_face.png differ
diff --git a/public/images/emoji/google/necktie.png b/public/images/emoji/google/necktie.png
index f8e16d4a1f4..8b011b7da6e 100644
Binary files a/public/images/emoji/google/necktie.png and b/public/images/emoji/google/necktie.png differ
diff --git a/public/images/emoji/google/negative_squared_cross_mark.png b/public/images/emoji/google/negative_squared_cross_mark.png
index 3a8695d5f4e..7dc46a44bae 100644
Binary files a/public/images/emoji/google/negative_squared_cross_mark.png and b/public/images/emoji/google/negative_squared_cross_mark.png differ
diff --git a/public/images/emoji/google/nepal.png b/public/images/emoji/google/nepal.png
index 737e60dcc8d..0936526831f 100644
Binary files a/public/images/emoji/google/nepal.png and b/public/images/emoji/google/nepal.png differ
diff --git a/public/images/emoji/google/nerd.png b/public/images/emoji/google/nerd.png
index 0028a1fe44b..3d7385639fc 100644
Binary files a/public/images/emoji/google/nerd.png and b/public/images/emoji/google/nerd.png differ
diff --git a/public/images/emoji/google/nerd_face.png b/public/images/emoji/google/nerd_face.png
index 0028a1fe44b..3d7385639fc 100644
Binary files a/public/images/emoji/google/nerd_face.png and b/public/images/emoji/google/nerd_face.png differ
diff --git a/public/images/emoji/google/netherlands.png b/public/images/emoji/google/netherlands.png
index a4701766ec6..a7cce659569 100644
Binary files a/public/images/emoji/google/netherlands.png and b/public/images/emoji/google/netherlands.png differ
diff --git a/public/images/emoji/google/neutral_face.png b/public/images/emoji/google/neutral_face.png
index 67d8c2ef3dd..440cbb20326 100644
Binary files a/public/images/emoji/google/neutral_face.png and b/public/images/emoji/google/neutral_face.png differ
diff --git a/public/images/emoji/google/new.png b/public/images/emoji/google/new.png
index 85ad0cc6536..d3577384f7f 100644
Binary files a/public/images/emoji/google/new.png and b/public/images/emoji/google/new.png differ
diff --git a/public/images/emoji/google/new_caledonia.png b/public/images/emoji/google/new_caledonia.png
index dad0f8ce650..4faf7e252ef 100644
Binary files a/public/images/emoji/google/new_caledonia.png and b/public/images/emoji/google/new_caledonia.png differ
diff --git a/public/images/emoji/google/new_moon.png b/public/images/emoji/google/new_moon.png
index 948d36d6a4f..878497f3f8f 100644
Binary files a/public/images/emoji/google/new_moon.png and b/public/images/emoji/google/new_moon.png differ
diff --git a/public/images/emoji/google/new_moon_with_face.png b/public/images/emoji/google/new_moon_with_face.png
index ccc3826641c..927390dd781 100644
Binary files a/public/images/emoji/google/new_moon_with_face.png and b/public/images/emoji/google/new_moon_with_face.png differ
diff --git a/public/images/emoji/google/new_zealand.png b/public/images/emoji/google/new_zealand.png
index 7b9a30256c3..0fed03d9d8a 100644
Binary files a/public/images/emoji/google/new_zealand.png and b/public/images/emoji/google/new_zealand.png differ
diff --git a/public/images/emoji/google/newspaper.png b/public/images/emoji/google/newspaper.png
index 2138c8f8cd9..1012580dc65 100644
Binary files a/public/images/emoji/google/newspaper.png and b/public/images/emoji/google/newspaper.png differ
diff --git a/public/images/emoji/google/newspaper2.png b/public/images/emoji/google/newspaper2.png
index 13fb2454713..3cdda353aca 100644
Binary files a/public/images/emoji/google/newspaper2.png and b/public/images/emoji/google/newspaper2.png differ
diff --git a/public/images/emoji/google/newspaper_roll.png b/public/images/emoji/google/newspaper_roll.png
index 13fb2454713..3cdda353aca 100644
Binary files a/public/images/emoji/google/newspaper_roll.png and b/public/images/emoji/google/newspaper_roll.png differ
diff --git a/public/images/emoji/google/next_track.png b/public/images/emoji/google/next_track.png
index 85f7bba60f7..1faa13a2d5d 100644
Binary files a/public/images/emoji/google/next_track.png and b/public/images/emoji/google/next_track.png differ
diff --git a/public/images/emoji/google/next_track_button.png b/public/images/emoji/google/next_track_button.png
index 85f7bba60f7..1faa13a2d5d 100644
Binary files a/public/images/emoji/google/next_track_button.png and b/public/images/emoji/google/next_track_button.png differ
diff --git a/public/images/emoji/google/ng.png b/public/images/emoji/google/ng.png
index 9f2e1f1f893..2a26ea50f96 100644
Binary files a/public/images/emoji/google/ng.png and b/public/images/emoji/google/ng.png differ
diff --git a/public/images/emoji/google/nicaragua.png b/public/images/emoji/google/nicaragua.png
index cf00cb5749c..8280f1dcf88 100644
Binary files a/public/images/emoji/google/nicaragua.png and b/public/images/emoji/google/nicaragua.png differ
diff --git a/public/images/emoji/google/niger.png b/public/images/emoji/google/niger.png
index b03af80215f..cc986c395c4 100644
Binary files a/public/images/emoji/google/niger.png and b/public/images/emoji/google/niger.png differ
diff --git a/public/images/emoji/google/nigeria.png b/public/images/emoji/google/nigeria.png
index a4562939c78..755a7ba2914 100644
Binary files a/public/images/emoji/google/nigeria.png and b/public/images/emoji/google/nigeria.png differ
diff --git a/public/images/emoji/google/night_with_stars.png b/public/images/emoji/google/night_with_stars.png
index d4d2aadd83d..f408f477ab8 100644
Binary files a/public/images/emoji/google/night_with_stars.png and b/public/images/emoji/google/night_with_stars.png differ
diff --git a/public/images/emoji/google/nine.png b/public/images/emoji/google/nine.png
index 2af7f8b823a..f228da9f19a 100644
Binary files a/public/images/emoji/google/nine.png and b/public/images/emoji/google/nine.png differ
diff --git a/public/images/emoji/google/niue.png b/public/images/emoji/google/niue.png
index 6d08f75c6b8..af0081c41d5 100644
Binary files a/public/images/emoji/google/niue.png and b/public/images/emoji/google/niue.png differ
diff --git a/public/images/emoji/google/no_bell.png b/public/images/emoji/google/no_bell.png
index a14d2bffaeb..f3530a07062 100644
Binary files a/public/images/emoji/google/no_bell.png and b/public/images/emoji/google/no_bell.png differ
diff --git a/public/images/emoji/google/no_bicycles.png b/public/images/emoji/google/no_bicycles.png
index bfe7b1dc021..71aec38e09f 100644
Binary files a/public/images/emoji/google/no_bicycles.png and b/public/images/emoji/google/no_bicycles.png differ
diff --git a/public/images/emoji/google/no_entry.png b/public/images/emoji/google/no_entry.png
index 3544be5b036..6a5c2cb600c 100644
Binary files a/public/images/emoji/google/no_entry.png and b/public/images/emoji/google/no_entry.png differ
diff --git a/public/images/emoji/google/no_entry_sign.png b/public/images/emoji/google/no_entry_sign.png
index caa3f51d2ea..6b52bda422b 100644
Binary files a/public/images/emoji/google/no_entry_sign.png and b/public/images/emoji/google/no_entry_sign.png differ
diff --git a/public/images/emoji/google/no_good.png b/public/images/emoji/google/no_good.png
index 797c435b70e..a639813593b 100644
Binary files a/public/images/emoji/google/no_good.png and b/public/images/emoji/google/no_good.png differ
diff --git a/public/images/emoji/google/no_good/2.png b/public/images/emoji/google/no_good/2.png
index c90ee91006a..ac5db483fd0 100644
Binary files a/public/images/emoji/google/no_good/2.png and b/public/images/emoji/google/no_good/2.png differ
diff --git a/public/images/emoji/google/no_good/3.png b/public/images/emoji/google/no_good/3.png
index b6ec827f382..ada3101256f 100644
Binary files a/public/images/emoji/google/no_good/3.png and b/public/images/emoji/google/no_good/3.png differ
diff --git a/public/images/emoji/google/no_good/4.png b/public/images/emoji/google/no_good/4.png
index 8df51e056f1..dc4f99f1110 100644
Binary files a/public/images/emoji/google/no_good/4.png and b/public/images/emoji/google/no_good/4.png differ
diff --git a/public/images/emoji/google/no_good/5.png b/public/images/emoji/google/no_good/5.png
index 232495b5aa6..a3aad8046b7 100644
Binary files a/public/images/emoji/google/no_good/5.png and b/public/images/emoji/google/no_good/5.png differ
diff --git a/public/images/emoji/google/no_good/6.png b/public/images/emoji/google/no_good/6.png
index dc52c7b5d24..a57ae2f5119 100644
Binary files a/public/images/emoji/google/no_good/6.png and b/public/images/emoji/google/no_good/6.png differ
diff --git a/public/images/emoji/google/no_good_man.png b/public/images/emoji/google/no_good_man.png
index 72455cef938..e938d0243c1 100644
Binary files a/public/images/emoji/google/no_good_man.png and b/public/images/emoji/google/no_good_man.png differ
diff --git a/public/images/emoji/google/no_good_man/2.png b/public/images/emoji/google/no_good_man/2.png
index 24c952374a5..7c15073a39d 100644
Binary files a/public/images/emoji/google/no_good_man/2.png and b/public/images/emoji/google/no_good_man/2.png differ
diff --git a/public/images/emoji/google/no_good_man/3.png b/public/images/emoji/google/no_good_man/3.png
index b5746a4c788..83f6f6f6996 100644
Binary files a/public/images/emoji/google/no_good_man/3.png and b/public/images/emoji/google/no_good_man/3.png differ
diff --git a/public/images/emoji/google/no_good_man/4.png b/public/images/emoji/google/no_good_man/4.png
index 92eded52fb4..3d07c645f2a 100644
Binary files a/public/images/emoji/google/no_good_man/4.png and b/public/images/emoji/google/no_good_man/4.png differ
diff --git a/public/images/emoji/google/no_good_man/5.png b/public/images/emoji/google/no_good_man/5.png
index a7a0fb9d5b9..0be42e86b3a 100644
Binary files a/public/images/emoji/google/no_good_man/5.png and b/public/images/emoji/google/no_good_man/5.png differ
diff --git a/public/images/emoji/google/no_good_man/6.png b/public/images/emoji/google/no_good_man/6.png
index 77663e59341..249e8909d0f 100644
Binary files a/public/images/emoji/google/no_good_man/6.png and b/public/images/emoji/google/no_good_man/6.png differ
diff --git a/public/images/emoji/google/no_good_woman.png b/public/images/emoji/google/no_good_woman.png
index 797c435b70e..a639813593b 100644
Binary files a/public/images/emoji/google/no_good_woman.png and b/public/images/emoji/google/no_good_woman.png differ
diff --git a/public/images/emoji/google/no_good_woman/2.png b/public/images/emoji/google/no_good_woman/2.png
index c90ee91006a..ac5db483fd0 100644
Binary files a/public/images/emoji/google/no_good_woman/2.png and b/public/images/emoji/google/no_good_woman/2.png differ
diff --git a/public/images/emoji/google/no_good_woman/3.png b/public/images/emoji/google/no_good_woman/3.png
index b6ec827f382..ada3101256f 100644
Binary files a/public/images/emoji/google/no_good_woman/3.png and b/public/images/emoji/google/no_good_woman/3.png differ
diff --git a/public/images/emoji/google/no_good_woman/4.png b/public/images/emoji/google/no_good_woman/4.png
index 8df51e056f1..dc4f99f1110 100644
Binary files a/public/images/emoji/google/no_good_woman/4.png and b/public/images/emoji/google/no_good_woman/4.png differ
diff --git a/public/images/emoji/google/no_good_woman/5.png b/public/images/emoji/google/no_good_woman/5.png
index 232495b5aa6..a3aad8046b7 100644
Binary files a/public/images/emoji/google/no_good_woman/5.png and b/public/images/emoji/google/no_good_woman/5.png differ
diff --git a/public/images/emoji/google/no_good_woman/6.png b/public/images/emoji/google/no_good_woman/6.png
index dc52c7b5d24..a57ae2f5119 100644
Binary files a/public/images/emoji/google/no_good_woman/6.png and b/public/images/emoji/google/no_good_woman/6.png differ
diff --git a/public/images/emoji/google/no_mobile_phones.png b/public/images/emoji/google/no_mobile_phones.png
index efec493cae4..e3b14e14158 100644
Binary files a/public/images/emoji/google/no_mobile_phones.png and b/public/images/emoji/google/no_mobile_phones.png differ
diff --git a/public/images/emoji/google/no_mouth.png b/public/images/emoji/google/no_mouth.png
index 8dd7edd4584..04ffae31a1b 100644
Binary files a/public/images/emoji/google/no_mouth.png and b/public/images/emoji/google/no_mouth.png differ
diff --git a/public/images/emoji/google/no_pedestrians.png b/public/images/emoji/google/no_pedestrians.png
index f948f3d2554..1098d68e2a3 100644
Binary files a/public/images/emoji/google/no_pedestrians.png and b/public/images/emoji/google/no_pedestrians.png differ
diff --git a/public/images/emoji/google/no_smoking.png b/public/images/emoji/google/no_smoking.png
index bf662e9a8fe..43a3b70f7df 100644
Binary files a/public/images/emoji/google/no_smoking.png and b/public/images/emoji/google/no_smoking.png differ
diff --git a/public/images/emoji/google/non-potable_water.png b/public/images/emoji/google/non-potable_water.png
index d2daa6662c3..28ca6fbfbd3 100644
Binary files a/public/images/emoji/google/non-potable_water.png and b/public/images/emoji/google/non-potable_water.png differ
diff --git a/public/images/emoji/google/norfolk_island.png b/public/images/emoji/google/norfolk_island.png
index cf150763d95..113c7827c2a 100644
Binary files a/public/images/emoji/google/norfolk_island.png and b/public/images/emoji/google/norfolk_island.png differ
diff --git a/public/images/emoji/google/north_korea.png b/public/images/emoji/google/north_korea.png
index 6bc5813b61d..bc3460d32ed 100644
Binary files a/public/images/emoji/google/north_korea.png and b/public/images/emoji/google/north_korea.png differ
diff --git a/public/images/emoji/google/northern_mariana_islands.png b/public/images/emoji/google/northern_mariana_islands.png
index 1e3243d7e56..5bc53d8da21 100644
Binary files a/public/images/emoji/google/northern_mariana_islands.png and b/public/images/emoji/google/northern_mariana_islands.png differ
diff --git a/public/images/emoji/google/norway.png b/public/images/emoji/google/norway.png
index 5330d9794c3..d348a446ad7 100644
Binary files a/public/images/emoji/google/norway.png and b/public/images/emoji/google/norway.png differ
diff --git a/public/images/emoji/google/nose.png b/public/images/emoji/google/nose.png
index 7561d03c25d..6ae23f4271e 100644
Binary files a/public/images/emoji/google/nose.png and b/public/images/emoji/google/nose.png differ
diff --git a/public/images/emoji/google/nose/2.png b/public/images/emoji/google/nose/2.png
index c474e1b2af3..2506ec2fefe 100644
Binary files a/public/images/emoji/google/nose/2.png and b/public/images/emoji/google/nose/2.png differ
diff --git a/public/images/emoji/google/nose/3.png b/public/images/emoji/google/nose/3.png
index a04dbf7c8af..544c6317f71 100644
Binary files a/public/images/emoji/google/nose/3.png and b/public/images/emoji/google/nose/3.png differ
diff --git a/public/images/emoji/google/nose/4.png b/public/images/emoji/google/nose/4.png
index f198511ec0e..c0933765fe6 100644
Binary files a/public/images/emoji/google/nose/4.png and b/public/images/emoji/google/nose/4.png differ
diff --git a/public/images/emoji/google/nose/5.png b/public/images/emoji/google/nose/5.png
index 48b7dab4fc4..78377bc5c15 100644
Binary files a/public/images/emoji/google/nose/5.png and b/public/images/emoji/google/nose/5.png differ
diff --git a/public/images/emoji/google/nose/6.png b/public/images/emoji/google/nose/6.png
index 90e8771126b..ea5d304216c 100644
Binary files a/public/images/emoji/google/nose/6.png and b/public/images/emoji/google/nose/6.png differ
diff --git a/public/images/emoji/google/notebook.png b/public/images/emoji/google/notebook.png
index ff3e8f08b01..31238241c92 100644
Binary files a/public/images/emoji/google/notebook.png and b/public/images/emoji/google/notebook.png differ
diff --git a/public/images/emoji/google/notebook_with_decorative_cover.png b/public/images/emoji/google/notebook_with_decorative_cover.png
index 175bdd76a2f..12176ab45d2 100644
Binary files a/public/images/emoji/google/notebook_with_decorative_cover.png and b/public/images/emoji/google/notebook_with_decorative_cover.png differ
diff --git a/public/images/emoji/google/notepad_spiral.png b/public/images/emoji/google/notepad_spiral.png
index ff382324e5e..72e515dc604 100644
Binary files a/public/images/emoji/google/notepad_spiral.png and b/public/images/emoji/google/notepad_spiral.png differ
diff --git a/public/images/emoji/google/notes.png b/public/images/emoji/google/notes.png
index 0303907dafb..e4c0acc7be2 100644
Binary files a/public/images/emoji/google/notes.png and b/public/images/emoji/google/notes.png differ
diff --git a/public/images/emoji/google/nut_and_bolt.png b/public/images/emoji/google/nut_and_bolt.png
index 2ec42d068f5..4e788ca5ccc 100644
Binary files a/public/images/emoji/google/nut_and_bolt.png and b/public/images/emoji/google/nut_and_bolt.png differ
diff --git a/public/images/emoji/google/o.png b/public/images/emoji/google/o.png
index 958cb3858f5..214e7b57db0 100644
Binary files a/public/images/emoji/google/o.png and b/public/images/emoji/google/o.png differ
diff --git a/public/images/emoji/google/o2.png b/public/images/emoji/google/o2.png
index 60974e106d4..2c809565c23 100644
Binary files a/public/images/emoji/google/o2.png and b/public/images/emoji/google/o2.png differ
diff --git a/public/images/emoji/google/ocean.png b/public/images/emoji/google/ocean.png
index db5786f95bc..d536ba9b4b3 100644
Binary files a/public/images/emoji/google/ocean.png and b/public/images/emoji/google/ocean.png differ
diff --git a/public/images/emoji/google/octopus.png b/public/images/emoji/google/octopus.png
index 356f9f3c647..34e1fa5ace0 100644
Binary files a/public/images/emoji/google/octopus.png and b/public/images/emoji/google/octopus.png differ
diff --git a/public/images/emoji/google/oden.png b/public/images/emoji/google/oden.png
index e23a091cbfc..0175691f499 100644
Binary files a/public/images/emoji/google/oden.png and b/public/images/emoji/google/oden.png differ
diff --git a/public/images/emoji/google/office.png b/public/images/emoji/google/office.png
index e12836eef91..e0da8d29ca8 100644
Binary files a/public/images/emoji/google/office.png and b/public/images/emoji/google/office.png differ
diff --git a/public/images/emoji/google/oil.png b/public/images/emoji/google/oil.png
index 12f7f469aa1..e2bea27a974 100644
Binary files a/public/images/emoji/google/oil.png and b/public/images/emoji/google/oil.png differ
diff --git a/public/images/emoji/google/oil_drum.png b/public/images/emoji/google/oil_drum.png
index 12f7f469aa1..e2bea27a974 100644
Binary files a/public/images/emoji/google/oil_drum.png and b/public/images/emoji/google/oil_drum.png differ
diff --git a/public/images/emoji/google/ok.png b/public/images/emoji/google/ok.png
index ae8f6be07ac..c596df58e5c 100644
Binary files a/public/images/emoji/google/ok.png and b/public/images/emoji/google/ok.png differ
diff --git a/public/images/emoji/google/ok_hand.png b/public/images/emoji/google/ok_hand.png
index e1adb5fc014..446cfd05466 100644
Binary files a/public/images/emoji/google/ok_hand.png and b/public/images/emoji/google/ok_hand.png differ
diff --git a/public/images/emoji/google/ok_hand/2.png b/public/images/emoji/google/ok_hand/2.png
index 22dd5a64093..6b67a1e33e8 100644
Binary files a/public/images/emoji/google/ok_hand/2.png and b/public/images/emoji/google/ok_hand/2.png differ
diff --git a/public/images/emoji/google/ok_hand/3.png b/public/images/emoji/google/ok_hand/3.png
index 3f6b9eefb62..38e38139900 100644
Binary files a/public/images/emoji/google/ok_hand/3.png and b/public/images/emoji/google/ok_hand/3.png differ
diff --git a/public/images/emoji/google/ok_hand/4.png b/public/images/emoji/google/ok_hand/4.png
index 74f9267b311..15ed6f49a0a 100644
Binary files a/public/images/emoji/google/ok_hand/4.png and b/public/images/emoji/google/ok_hand/4.png differ
diff --git a/public/images/emoji/google/ok_hand/5.png b/public/images/emoji/google/ok_hand/5.png
index a2b4e9acc0d..75ab5099f62 100644
Binary files a/public/images/emoji/google/ok_hand/5.png and b/public/images/emoji/google/ok_hand/5.png differ
diff --git a/public/images/emoji/google/ok_hand/6.png b/public/images/emoji/google/ok_hand/6.png
index 244e16aa6c6..c351df92440 100644
Binary files a/public/images/emoji/google/ok_hand/6.png and b/public/images/emoji/google/ok_hand/6.png differ
diff --git a/public/images/emoji/google/ok_man.png b/public/images/emoji/google/ok_man.png
index c4636c1ae9b..f508195e7c7 100644
Binary files a/public/images/emoji/google/ok_man.png and b/public/images/emoji/google/ok_man.png differ
diff --git a/public/images/emoji/google/ok_man/2.png b/public/images/emoji/google/ok_man/2.png
index 8da030b7342..ea8ec53b285 100644
Binary files a/public/images/emoji/google/ok_man/2.png and b/public/images/emoji/google/ok_man/2.png differ
diff --git a/public/images/emoji/google/ok_man/3.png b/public/images/emoji/google/ok_man/3.png
index d945cd09b48..04be7cd9ec8 100644
Binary files a/public/images/emoji/google/ok_man/3.png and b/public/images/emoji/google/ok_man/3.png differ
diff --git a/public/images/emoji/google/ok_man/4.png b/public/images/emoji/google/ok_man/4.png
index f871e308c5f..1c2511328c6 100644
Binary files a/public/images/emoji/google/ok_man/4.png and b/public/images/emoji/google/ok_man/4.png differ
diff --git a/public/images/emoji/google/ok_man/5.png b/public/images/emoji/google/ok_man/5.png
index ef9c47d55bb..b536c2112d4 100644
Binary files a/public/images/emoji/google/ok_man/5.png and b/public/images/emoji/google/ok_man/5.png differ
diff --git a/public/images/emoji/google/ok_man/6.png b/public/images/emoji/google/ok_man/6.png
index bf469bf1f07..019f7565642 100644
Binary files a/public/images/emoji/google/ok_man/6.png and b/public/images/emoji/google/ok_man/6.png differ
diff --git a/public/images/emoji/google/ok_woman.png b/public/images/emoji/google/ok_woman.png
index fc51dcfb069..4b8c844a3d3 100644
Binary files a/public/images/emoji/google/ok_woman.png and b/public/images/emoji/google/ok_woman.png differ
diff --git a/public/images/emoji/google/ok_woman/2.png b/public/images/emoji/google/ok_woman/2.png
index 52cf1392a6c..c040ca8334d 100644
Binary files a/public/images/emoji/google/ok_woman/2.png and b/public/images/emoji/google/ok_woman/2.png differ
diff --git a/public/images/emoji/google/ok_woman/3.png b/public/images/emoji/google/ok_woman/3.png
index a8b9d7ec9af..b54ac12b4a4 100644
Binary files a/public/images/emoji/google/ok_woman/3.png and b/public/images/emoji/google/ok_woman/3.png differ
diff --git a/public/images/emoji/google/ok_woman/4.png b/public/images/emoji/google/ok_woman/4.png
index cbedc79d8dd..499f0052d76 100644
Binary files a/public/images/emoji/google/ok_woman/4.png and b/public/images/emoji/google/ok_woman/4.png differ
diff --git a/public/images/emoji/google/ok_woman/5.png b/public/images/emoji/google/ok_woman/5.png
index 7a6da71e874..6b31246feb1 100644
Binary files a/public/images/emoji/google/ok_woman/5.png and b/public/images/emoji/google/ok_woman/5.png differ
diff --git a/public/images/emoji/google/ok_woman/6.png b/public/images/emoji/google/ok_woman/6.png
index 3236ad424f0..049c4eb71f6 100644
Binary files a/public/images/emoji/google/ok_woman/6.png and b/public/images/emoji/google/ok_woman/6.png differ
diff --git a/public/images/emoji/google/old_key.png b/public/images/emoji/google/old_key.png
index d6739c8457c..6083982335b 100644
Binary files a/public/images/emoji/google/old_key.png and b/public/images/emoji/google/old_key.png differ
diff --git a/public/images/emoji/google/older_adult.png b/public/images/emoji/google/older_adult.png
index 3b4a3661719..7d94d0b3290 100644
Binary files a/public/images/emoji/google/older_adult.png and b/public/images/emoji/google/older_adult.png differ
diff --git a/public/images/emoji/google/older_adult/2.png b/public/images/emoji/google/older_adult/2.png
index ffcda163087..e8afae7cec0 100644
Binary files a/public/images/emoji/google/older_adult/2.png and b/public/images/emoji/google/older_adult/2.png differ
diff --git a/public/images/emoji/google/older_adult/3.png b/public/images/emoji/google/older_adult/3.png
index 46fb7440351..b7dd4c996f2 100644
Binary files a/public/images/emoji/google/older_adult/3.png and b/public/images/emoji/google/older_adult/3.png differ
diff --git a/public/images/emoji/google/older_adult/4.png b/public/images/emoji/google/older_adult/4.png
index 3c05309e58b..4b35a671817 100644
Binary files a/public/images/emoji/google/older_adult/4.png and b/public/images/emoji/google/older_adult/4.png differ
diff --git a/public/images/emoji/google/older_adult/5.png b/public/images/emoji/google/older_adult/5.png
index 1acf2a4a545..9c85efcd7c7 100644
Binary files a/public/images/emoji/google/older_adult/5.png and b/public/images/emoji/google/older_adult/5.png differ
diff --git a/public/images/emoji/google/older_adult/6.png b/public/images/emoji/google/older_adult/6.png
index 6ca350992a7..51b2ec72bfd 100644
Binary files a/public/images/emoji/google/older_adult/6.png and b/public/images/emoji/google/older_adult/6.png differ
diff --git a/public/images/emoji/google/older_man.png b/public/images/emoji/google/older_man.png
index 1efe6018b17..d2de212e7a5 100644
Binary files a/public/images/emoji/google/older_man.png and b/public/images/emoji/google/older_man.png differ
diff --git a/public/images/emoji/google/older_man/2.png b/public/images/emoji/google/older_man/2.png
index 53d70985978..feb0107a1e7 100644
Binary files a/public/images/emoji/google/older_man/2.png and b/public/images/emoji/google/older_man/2.png differ
diff --git a/public/images/emoji/google/older_man/3.png b/public/images/emoji/google/older_man/3.png
index c6175d65006..be1cb5d1c1f 100644
Binary files a/public/images/emoji/google/older_man/3.png and b/public/images/emoji/google/older_man/3.png differ
diff --git a/public/images/emoji/google/older_man/4.png b/public/images/emoji/google/older_man/4.png
index 5b25856d3bb..c20c0805aba 100644
Binary files a/public/images/emoji/google/older_man/4.png and b/public/images/emoji/google/older_man/4.png differ
diff --git a/public/images/emoji/google/older_man/5.png b/public/images/emoji/google/older_man/5.png
index ed9270ac9c9..0605d4fa066 100644
Binary files a/public/images/emoji/google/older_man/5.png and b/public/images/emoji/google/older_man/5.png differ
diff --git a/public/images/emoji/google/older_man/6.png b/public/images/emoji/google/older_man/6.png
index 507b2337036..3502b1d3bfe 100644
Binary files a/public/images/emoji/google/older_man/6.png and b/public/images/emoji/google/older_man/6.png differ
diff --git a/public/images/emoji/google/older_woman.png b/public/images/emoji/google/older_woman.png
index 4aeba637f78..1d07afb892d 100644
Binary files a/public/images/emoji/google/older_woman.png and b/public/images/emoji/google/older_woman.png differ
diff --git a/public/images/emoji/google/older_woman/2.png b/public/images/emoji/google/older_woman/2.png
index 905e8a98b37..f90619f8b69 100644
Binary files a/public/images/emoji/google/older_woman/2.png and b/public/images/emoji/google/older_woman/2.png differ
diff --git a/public/images/emoji/google/older_woman/3.png b/public/images/emoji/google/older_woman/3.png
index 7d9c997674c..2147d16fd6e 100644
Binary files a/public/images/emoji/google/older_woman/3.png and b/public/images/emoji/google/older_woman/3.png differ
diff --git a/public/images/emoji/google/older_woman/4.png b/public/images/emoji/google/older_woman/4.png
index 69a9c179106..696d222a849 100644
Binary files a/public/images/emoji/google/older_woman/4.png and b/public/images/emoji/google/older_woman/4.png differ
diff --git a/public/images/emoji/google/older_woman/5.png b/public/images/emoji/google/older_woman/5.png
index 7ae4d8ea045..a23935d452a 100644
Binary files a/public/images/emoji/google/older_woman/5.png and b/public/images/emoji/google/older_woman/5.png differ
diff --git a/public/images/emoji/google/older_woman/6.png b/public/images/emoji/google/older_woman/6.png
index 89542a23302..00c9ec642c4 100644
Binary files a/public/images/emoji/google/older_woman/6.png and b/public/images/emoji/google/older_woman/6.png differ
diff --git a/public/images/emoji/google/om.png b/public/images/emoji/google/om.png
index 1d732d75b37..f77f1842b1a 100644
Binary files a/public/images/emoji/google/om.png and b/public/images/emoji/google/om.png differ
diff --git a/public/images/emoji/google/om_symbol.png b/public/images/emoji/google/om_symbol.png
index 1d732d75b37..f77f1842b1a 100644
Binary files a/public/images/emoji/google/om_symbol.png and b/public/images/emoji/google/om_symbol.png differ
diff --git a/public/images/emoji/google/oman.png b/public/images/emoji/google/oman.png
index 7b20f241a47..23a64ef5d6c 100644
Binary files a/public/images/emoji/google/oman.png and b/public/images/emoji/google/oman.png differ
diff --git a/public/images/emoji/google/on.png b/public/images/emoji/google/on.png
index b29c550cff6..8dbf1247282 100644
Binary files a/public/images/emoji/google/on.png and b/public/images/emoji/google/on.png differ
diff --git a/public/images/emoji/google/oncoming_automobile.png b/public/images/emoji/google/oncoming_automobile.png
index 56f5cddc276..7df8de6eb86 100644
Binary files a/public/images/emoji/google/oncoming_automobile.png and b/public/images/emoji/google/oncoming_automobile.png differ
diff --git a/public/images/emoji/google/oncoming_bus.png b/public/images/emoji/google/oncoming_bus.png
index b0684aa0b45..ed61c147263 100644
Binary files a/public/images/emoji/google/oncoming_bus.png and b/public/images/emoji/google/oncoming_bus.png differ
diff --git a/public/images/emoji/google/oncoming_police_car.png b/public/images/emoji/google/oncoming_police_car.png
index 7f3f138ccd5..39015e59af3 100644
Binary files a/public/images/emoji/google/oncoming_police_car.png and b/public/images/emoji/google/oncoming_police_car.png differ
diff --git a/public/images/emoji/google/oncoming_taxi.png b/public/images/emoji/google/oncoming_taxi.png
index af2ad6f3fa8..8732bafedf4 100644
Binary files a/public/images/emoji/google/oncoming_taxi.png and b/public/images/emoji/google/oncoming_taxi.png differ
diff --git a/public/images/emoji/google/one.png b/public/images/emoji/google/one.png
index 332d4cc90d1..b6f6dac44f1 100644
Binary files a/public/images/emoji/google/one.png and b/public/images/emoji/google/one.png differ
diff --git a/public/images/emoji/google/open_book.png b/public/images/emoji/google/open_book.png
index 2f4edfa0328..fa30a7da661 100644
Binary files a/public/images/emoji/google/open_book.png and b/public/images/emoji/google/open_book.png differ
diff --git a/public/images/emoji/google/open_file_folder.png b/public/images/emoji/google/open_file_folder.png
index 342dc9e0d39..e057711924b 100644
Binary files a/public/images/emoji/google/open_file_folder.png and b/public/images/emoji/google/open_file_folder.png differ
diff --git a/public/images/emoji/google/open_hands.png b/public/images/emoji/google/open_hands.png
index 49e8ab878cb..ba6ecd42f45 100644
Binary files a/public/images/emoji/google/open_hands.png and b/public/images/emoji/google/open_hands.png differ
diff --git a/public/images/emoji/google/open_hands/2.png b/public/images/emoji/google/open_hands/2.png
index 2d5120ea0be..4ff87f7e866 100644
Binary files a/public/images/emoji/google/open_hands/2.png and b/public/images/emoji/google/open_hands/2.png differ
diff --git a/public/images/emoji/google/open_hands/3.png b/public/images/emoji/google/open_hands/3.png
index a6e32d60784..9ba390136bf 100644
Binary files a/public/images/emoji/google/open_hands/3.png and b/public/images/emoji/google/open_hands/3.png differ
diff --git a/public/images/emoji/google/open_hands/4.png b/public/images/emoji/google/open_hands/4.png
index 79494951e34..5fa966e0a18 100644
Binary files a/public/images/emoji/google/open_hands/4.png and b/public/images/emoji/google/open_hands/4.png differ
diff --git a/public/images/emoji/google/open_hands/5.png b/public/images/emoji/google/open_hands/5.png
index 61f31b1cc47..37a10ea6d2c 100644
Binary files a/public/images/emoji/google/open_hands/5.png and b/public/images/emoji/google/open_hands/5.png differ
diff --git a/public/images/emoji/google/open_hands/6.png b/public/images/emoji/google/open_hands/6.png
index b57f1f5cb3c..10c1825ab64 100644
Binary files a/public/images/emoji/google/open_hands/6.png and b/public/images/emoji/google/open_hands/6.png differ
diff --git a/public/images/emoji/google/open_mouth.png b/public/images/emoji/google/open_mouth.png
index d3afb4c6ebb..6d8a0306056 100644
Binary files a/public/images/emoji/google/open_mouth.png and b/public/images/emoji/google/open_mouth.png differ
diff --git a/public/images/emoji/google/open_umbrella.png b/public/images/emoji/google/open_umbrella.png
index 21b025ea515..fb2f8bb58b0 100644
Binary files a/public/images/emoji/google/open_umbrella.png and b/public/images/emoji/google/open_umbrella.png differ
diff --git a/public/images/emoji/google/ophiuchus.png b/public/images/emoji/google/ophiuchus.png
index 9dfcee2d479..ecb28221538 100644
Binary files a/public/images/emoji/google/ophiuchus.png and b/public/images/emoji/google/ophiuchus.png differ
diff --git a/public/images/emoji/google/orange_book.png b/public/images/emoji/google/orange_book.png
index 6a2a262aff0..909be4d8558 100644
Binary files a/public/images/emoji/google/orange_book.png and b/public/images/emoji/google/orange_book.png differ
diff --git a/public/images/emoji/google/orange_heart.png b/public/images/emoji/google/orange_heart.png
index 2239788f680..5f66108e036 100644
Binary files a/public/images/emoji/google/orange_heart.png and b/public/images/emoji/google/orange_heart.png differ
diff --git a/public/images/emoji/google/orthodox_cross.png b/public/images/emoji/google/orthodox_cross.png
index b7dd064c8f7..98bda28535a 100644
Binary files a/public/images/emoji/google/orthodox_cross.png and b/public/images/emoji/google/orthodox_cross.png differ
diff --git a/public/images/emoji/google/outbox_tray.png b/public/images/emoji/google/outbox_tray.png
index abac46b590a..4204b736762 100644
Binary files a/public/images/emoji/google/outbox_tray.png and b/public/images/emoji/google/outbox_tray.png differ
diff --git a/public/images/emoji/google/owl.png b/public/images/emoji/google/owl.png
index cf6ae83d807..b5b8d7775a1 100644
Binary files a/public/images/emoji/google/owl.png and b/public/images/emoji/google/owl.png differ
diff --git a/public/images/emoji/google/ox.png b/public/images/emoji/google/ox.png
index 796bfe4a843..c0e276e6d58 100644
Binary files a/public/images/emoji/google/ox.png and b/public/images/emoji/google/ox.png differ
diff --git a/public/images/emoji/google/package.png b/public/images/emoji/google/package.png
index 17b5db0e250..253553a2f21 100644
Binary files a/public/images/emoji/google/package.png and b/public/images/emoji/google/package.png differ
diff --git a/public/images/emoji/google/page_facing_up.png b/public/images/emoji/google/page_facing_up.png
index b3002ed4c31..a2c7af4a795 100644
Binary files a/public/images/emoji/google/page_facing_up.png and b/public/images/emoji/google/page_facing_up.png differ
diff --git a/public/images/emoji/google/page_with_curl.png b/public/images/emoji/google/page_with_curl.png
index 0a71b54c91c..d4d9805e358 100644
Binary files a/public/images/emoji/google/page_with_curl.png and b/public/images/emoji/google/page_with_curl.png differ
diff --git a/public/images/emoji/google/pager.png b/public/images/emoji/google/pager.png
index e0e980854a9..446e4dc64d0 100644
Binary files a/public/images/emoji/google/pager.png and b/public/images/emoji/google/pager.png differ
diff --git a/public/images/emoji/google/paintbrush.png b/public/images/emoji/google/paintbrush.png
index 58697366466..bde63a80920 100644
Binary files a/public/images/emoji/google/paintbrush.png and b/public/images/emoji/google/paintbrush.png differ
diff --git a/public/images/emoji/google/pakistan.png b/public/images/emoji/google/pakistan.png
index e136514c9a4..908744de362 100644
Binary files a/public/images/emoji/google/pakistan.png and b/public/images/emoji/google/pakistan.png differ
diff --git a/public/images/emoji/google/palau.png b/public/images/emoji/google/palau.png
index bcbfdea7854..959e48a6304 100644
Binary files a/public/images/emoji/google/palau.png and b/public/images/emoji/google/palau.png differ
diff --git a/public/images/emoji/google/palestinian_territories.png b/public/images/emoji/google/palestinian_territories.png
index 3a690eb7cce..ca3ab3a3b27 100644
Binary files a/public/images/emoji/google/palestinian_territories.png and b/public/images/emoji/google/palestinian_territories.png differ
diff --git a/public/images/emoji/google/palm_tree.png b/public/images/emoji/google/palm_tree.png
index 8d7a39f271e..54f17fcab53 100644
Binary files a/public/images/emoji/google/palm_tree.png and b/public/images/emoji/google/palm_tree.png differ
diff --git a/public/images/emoji/google/palms_up_together.png b/public/images/emoji/google/palms_up_together.png
index 8878837866c..91f2aee46bc 100644
Binary files a/public/images/emoji/google/palms_up_together.png and b/public/images/emoji/google/palms_up_together.png differ
diff --git a/public/images/emoji/google/palms_up_together/2.png b/public/images/emoji/google/palms_up_together/2.png
index c25936413e0..fe1dbc8bf7d 100644
Binary files a/public/images/emoji/google/palms_up_together/2.png and b/public/images/emoji/google/palms_up_together/2.png differ
diff --git a/public/images/emoji/google/palms_up_together/3.png b/public/images/emoji/google/palms_up_together/3.png
index f2db60ab8b5..e6a6d86e8f5 100644
Binary files a/public/images/emoji/google/palms_up_together/3.png and b/public/images/emoji/google/palms_up_together/3.png differ
diff --git a/public/images/emoji/google/palms_up_together/4.png b/public/images/emoji/google/palms_up_together/4.png
index f3e88da1682..af928c71657 100644
Binary files a/public/images/emoji/google/palms_up_together/4.png and b/public/images/emoji/google/palms_up_together/4.png differ
diff --git a/public/images/emoji/google/palms_up_together/5.png b/public/images/emoji/google/palms_up_together/5.png
index a11b9fac7a0..9fff316304b 100644
Binary files a/public/images/emoji/google/palms_up_together/5.png and b/public/images/emoji/google/palms_up_together/5.png differ
diff --git a/public/images/emoji/google/palms_up_together/6.png b/public/images/emoji/google/palms_up_together/6.png
index 93c4a67f411..6847f7cb596 100644
Binary files a/public/images/emoji/google/palms_up_together/6.png and b/public/images/emoji/google/palms_up_together/6.png differ
diff --git a/public/images/emoji/google/panama.png b/public/images/emoji/google/panama.png
index 62e08e4bcc5..b673e35fd6a 100644
Binary files a/public/images/emoji/google/panama.png and b/public/images/emoji/google/panama.png differ
diff --git a/public/images/emoji/google/pancakes.png b/public/images/emoji/google/pancakes.png
index ea40ec4e7b8..b4afd25781a 100644
Binary files a/public/images/emoji/google/pancakes.png and b/public/images/emoji/google/pancakes.png differ
diff --git a/public/images/emoji/google/panda_face.png b/public/images/emoji/google/panda_face.png
index 6f560198c26..db4f8c79af3 100644
Binary files a/public/images/emoji/google/panda_face.png and b/public/images/emoji/google/panda_face.png differ
diff --git a/public/images/emoji/google/paperclip.png b/public/images/emoji/google/paperclip.png
index 791d9a70f3e..ff080399305 100644
Binary files a/public/images/emoji/google/paperclip.png and b/public/images/emoji/google/paperclip.png differ
diff --git a/public/images/emoji/google/paperclips.png b/public/images/emoji/google/paperclips.png
index b3b7e0de41d..56d7279a5ca 100644
Binary files a/public/images/emoji/google/paperclips.png and b/public/images/emoji/google/paperclips.png differ
diff --git a/public/images/emoji/google/papua_new_guinea.png b/public/images/emoji/google/papua_new_guinea.png
index c3bc9e2bf8f..6f90f6e1471 100644
Binary files a/public/images/emoji/google/papua_new_guinea.png and b/public/images/emoji/google/papua_new_guinea.png differ
diff --git a/public/images/emoji/google/paraguay.png b/public/images/emoji/google/paraguay.png
index 5f81d2d2f0b..81f2b67ed00 100644
Binary files a/public/images/emoji/google/paraguay.png and b/public/images/emoji/google/paraguay.png differ
diff --git a/public/images/emoji/google/parasol_on_ground.png b/public/images/emoji/google/parasol_on_ground.png
index 2a16b4d32a7..c7358ec9499 100644
Binary files a/public/images/emoji/google/parasol_on_ground.png and b/public/images/emoji/google/parasol_on_ground.png differ
diff --git a/public/images/emoji/google/park.png b/public/images/emoji/google/park.png
index 669eb54fbf1..d98082e0cd2 100644
Binary files a/public/images/emoji/google/park.png and b/public/images/emoji/google/park.png differ
diff --git a/public/images/emoji/google/parking.png b/public/images/emoji/google/parking.png
index 3450cb75c29..03dfb7c3db0 100644
Binary files a/public/images/emoji/google/parking.png and b/public/images/emoji/google/parking.png differ
diff --git a/public/images/emoji/google/part_alternation_mark.png b/public/images/emoji/google/part_alternation_mark.png
index 41a93424e8f..01e88ba9456 100644
Binary files a/public/images/emoji/google/part_alternation_mark.png and b/public/images/emoji/google/part_alternation_mark.png differ
diff --git a/public/images/emoji/google/partly_sunny.png b/public/images/emoji/google/partly_sunny.png
index ca30e8990bd..91998ebb313 100644
Binary files a/public/images/emoji/google/partly_sunny.png and b/public/images/emoji/google/partly_sunny.png differ
diff --git a/public/images/emoji/google/passenger_ship.png b/public/images/emoji/google/passenger_ship.png
index 5ffa1e17dcd..be03fc1343b 100644
Binary files a/public/images/emoji/google/passenger_ship.png and b/public/images/emoji/google/passenger_ship.png differ
diff --git a/public/images/emoji/google/passport_control.png b/public/images/emoji/google/passport_control.png
index 92fd116fff8..a061db82570 100644
Binary files a/public/images/emoji/google/passport_control.png and b/public/images/emoji/google/passport_control.png differ
diff --git a/public/images/emoji/google/pause_button.png b/public/images/emoji/google/pause_button.png
index 31613a93208..6e0b69634e2 100644
Binary files a/public/images/emoji/google/pause_button.png and b/public/images/emoji/google/pause_button.png differ
diff --git a/public/images/emoji/google/paw_prints.png b/public/images/emoji/google/paw_prints.png
index 29f068aaf05..6e4aa216959 100644
Binary files a/public/images/emoji/google/paw_prints.png and b/public/images/emoji/google/paw_prints.png differ
diff --git a/public/images/emoji/google/peace.png b/public/images/emoji/google/peace.png
index c085022e7db..54452f3f19d 100644
Binary files a/public/images/emoji/google/peace.png and b/public/images/emoji/google/peace.png differ
diff --git a/public/images/emoji/google/peace_symbol.png b/public/images/emoji/google/peace_symbol.png
index c085022e7db..54452f3f19d 100644
Binary files a/public/images/emoji/google/peace_symbol.png and b/public/images/emoji/google/peace_symbol.png differ
diff --git a/public/images/emoji/google/peach.png b/public/images/emoji/google/peach.png
index 19d86b3013a..e386582c380 100644
Binary files a/public/images/emoji/google/peach.png and b/public/images/emoji/google/peach.png differ
diff --git a/public/images/emoji/google/peanuts.png b/public/images/emoji/google/peanuts.png
index ba87793ec1d..55433e7b6cb 100644
Binary files a/public/images/emoji/google/peanuts.png and b/public/images/emoji/google/peanuts.png differ
diff --git a/public/images/emoji/google/pear.png b/public/images/emoji/google/pear.png
index e622f3eaf85..cc672a6a2ed 100644
Binary files a/public/images/emoji/google/pear.png and b/public/images/emoji/google/pear.png differ
diff --git a/public/images/emoji/google/pen.png b/public/images/emoji/google/pen.png
index a67644b0ac7..a3312810ecd 100644
Binary files a/public/images/emoji/google/pen.png and b/public/images/emoji/google/pen.png differ
diff --git a/public/images/emoji/google/pen_ballpoint.png b/public/images/emoji/google/pen_ballpoint.png
index a67644b0ac7..a3312810ecd 100644
Binary files a/public/images/emoji/google/pen_ballpoint.png and b/public/images/emoji/google/pen_ballpoint.png differ
diff --git a/public/images/emoji/google/pen_fountain.png b/public/images/emoji/google/pen_fountain.png
index a06fcdc40e4..3d8ba60471d 100644
Binary files a/public/images/emoji/google/pen_fountain.png and b/public/images/emoji/google/pen_fountain.png differ
diff --git a/public/images/emoji/google/pencil.png b/public/images/emoji/google/pencil.png
index 355dcfe22da..5a3bd6cd09d 100644
Binary files a/public/images/emoji/google/pencil.png and b/public/images/emoji/google/pencil.png differ
diff --git a/public/images/emoji/google/pencil2.png b/public/images/emoji/google/pencil2.png
index e10b99fe925..7f7ebda566f 100644
Binary files a/public/images/emoji/google/pencil2.png and b/public/images/emoji/google/pencil2.png differ
diff --git a/public/images/emoji/google/penguin.png b/public/images/emoji/google/penguin.png
index b31a77b5b9a..4f4d284cc3d 100644
Binary files a/public/images/emoji/google/penguin.png and b/public/images/emoji/google/penguin.png differ
diff --git a/public/images/emoji/google/pensive.png b/public/images/emoji/google/pensive.png
index 6cb7d76597c..22e6e65f5ba 100644
Binary files a/public/images/emoji/google/pensive.png and b/public/images/emoji/google/pensive.png differ
diff --git a/public/images/emoji/google/performing_arts.png b/public/images/emoji/google/performing_arts.png
index dbcd3799110..96908a75335 100644
Binary files a/public/images/emoji/google/performing_arts.png and b/public/images/emoji/google/performing_arts.png differ
diff --git a/public/images/emoji/google/persevere.png b/public/images/emoji/google/persevere.png
index fd1501221d3..7183637f2fc 100644
Binary files a/public/images/emoji/google/persevere.png and b/public/images/emoji/google/persevere.png differ
diff --git a/public/images/emoji/google/person_climbing.png b/public/images/emoji/google/person_climbing.png
index 4064c30b89a..021a0b719a5 100644
Binary files a/public/images/emoji/google/person_climbing.png and b/public/images/emoji/google/person_climbing.png differ
diff --git a/public/images/emoji/google/person_climbing/2.png b/public/images/emoji/google/person_climbing/2.png
index ec05fe0695d..652d3789cfd 100644
Binary files a/public/images/emoji/google/person_climbing/2.png and b/public/images/emoji/google/person_climbing/2.png differ
diff --git a/public/images/emoji/google/person_climbing/3.png b/public/images/emoji/google/person_climbing/3.png
index 790a278e9b8..22ec77f1110 100644
Binary files a/public/images/emoji/google/person_climbing/3.png and b/public/images/emoji/google/person_climbing/3.png differ
diff --git a/public/images/emoji/google/person_climbing/4.png b/public/images/emoji/google/person_climbing/4.png
index 9fffed69e16..1fde8236151 100644
Binary files a/public/images/emoji/google/person_climbing/4.png and b/public/images/emoji/google/person_climbing/4.png differ
diff --git a/public/images/emoji/google/person_climbing/5.png b/public/images/emoji/google/person_climbing/5.png
index cbd54a8b860..fbd6c35f9f1 100644
Binary files a/public/images/emoji/google/person_climbing/5.png and b/public/images/emoji/google/person_climbing/5.png differ
diff --git a/public/images/emoji/google/person_climbing/6.png b/public/images/emoji/google/person_climbing/6.png
index 66b247fa5a0..be71fe1419b 100644
Binary files a/public/images/emoji/google/person_climbing/6.png and b/public/images/emoji/google/person_climbing/6.png differ
diff --git a/public/images/emoji/google/person_fencing.png b/public/images/emoji/google/person_fencing.png
index 2f191738880..d088819d7a8 100644
Binary files a/public/images/emoji/google/person_fencing.png and b/public/images/emoji/google/person_fencing.png differ
diff --git a/public/images/emoji/google/person_frowning.png b/public/images/emoji/google/person_frowning.png
index 4667b907ddf..0378dfe42ed 100644
Binary files a/public/images/emoji/google/person_frowning.png and b/public/images/emoji/google/person_frowning.png differ
diff --git a/public/images/emoji/google/person_frowning/2.png b/public/images/emoji/google/person_frowning/2.png
index 16f321b8aeb..5dfe5baa820 100644
Binary files a/public/images/emoji/google/person_frowning/2.png and b/public/images/emoji/google/person_frowning/2.png differ
diff --git a/public/images/emoji/google/person_frowning/3.png b/public/images/emoji/google/person_frowning/3.png
index bd6c5e162fb..7078357053e 100644
Binary files a/public/images/emoji/google/person_frowning/3.png and b/public/images/emoji/google/person_frowning/3.png differ
diff --git a/public/images/emoji/google/person_frowning/4.png b/public/images/emoji/google/person_frowning/4.png
index 72f848c863c..6671e11299d 100644
Binary files a/public/images/emoji/google/person_frowning/4.png and b/public/images/emoji/google/person_frowning/4.png differ
diff --git a/public/images/emoji/google/person_frowning/5.png b/public/images/emoji/google/person_frowning/5.png
index 863caa54338..9d0a301c074 100644
Binary files a/public/images/emoji/google/person_frowning/5.png and b/public/images/emoji/google/person_frowning/5.png differ
diff --git a/public/images/emoji/google/person_frowning/6.png b/public/images/emoji/google/person_frowning/6.png
index d1936f11235..f41f82046b7 100644
Binary files a/public/images/emoji/google/person_frowning/6.png and b/public/images/emoji/google/person_frowning/6.png differ
diff --git a/public/images/emoji/google/person_in_lotus_position.png b/public/images/emoji/google/person_in_lotus_position.png
index d0be0a3bb06..17aaf80ab6f 100644
Binary files a/public/images/emoji/google/person_in_lotus_position.png and b/public/images/emoji/google/person_in_lotus_position.png differ
diff --git a/public/images/emoji/google/person_in_lotus_position/2.png b/public/images/emoji/google/person_in_lotus_position/2.png
index 2ccd6c72540..bfee0b81386 100644
Binary files a/public/images/emoji/google/person_in_lotus_position/2.png and b/public/images/emoji/google/person_in_lotus_position/2.png differ
diff --git a/public/images/emoji/google/person_in_lotus_position/3.png b/public/images/emoji/google/person_in_lotus_position/3.png
index ac3ae39e31d..a915b1535a0 100644
Binary files a/public/images/emoji/google/person_in_lotus_position/3.png and b/public/images/emoji/google/person_in_lotus_position/3.png differ
diff --git a/public/images/emoji/google/person_in_lotus_position/4.png b/public/images/emoji/google/person_in_lotus_position/4.png
index 37446ec6e39..c73d4b0acc2 100644
Binary files a/public/images/emoji/google/person_in_lotus_position/4.png and b/public/images/emoji/google/person_in_lotus_position/4.png differ
diff --git a/public/images/emoji/google/person_in_lotus_position/5.png b/public/images/emoji/google/person_in_lotus_position/5.png
index d6734f1e3d2..632ae6aa519 100644
Binary files a/public/images/emoji/google/person_in_lotus_position/5.png and b/public/images/emoji/google/person_in_lotus_position/5.png differ
diff --git a/public/images/emoji/google/person_in_lotus_position/6.png b/public/images/emoji/google/person_in_lotus_position/6.png
index 79852cb807d..1551833ad25 100644
Binary files a/public/images/emoji/google/person_in_lotus_position/6.png and b/public/images/emoji/google/person_in_lotus_position/6.png differ
diff --git a/public/images/emoji/google/person_in_steamy_room.png b/public/images/emoji/google/person_in_steamy_room.png
index 2e6d5c2069f..1395f737c39 100644
Binary files a/public/images/emoji/google/person_in_steamy_room.png and b/public/images/emoji/google/person_in_steamy_room.png differ
diff --git a/public/images/emoji/google/person_in_steamy_room/2.png b/public/images/emoji/google/person_in_steamy_room/2.png
index c85e42308d1..a1da82b2f69 100644
Binary files a/public/images/emoji/google/person_in_steamy_room/2.png and b/public/images/emoji/google/person_in_steamy_room/2.png differ
diff --git a/public/images/emoji/google/person_in_steamy_room/3.png b/public/images/emoji/google/person_in_steamy_room/3.png
index 9e3488f99ba..e47ef7c9516 100644
Binary files a/public/images/emoji/google/person_in_steamy_room/3.png and b/public/images/emoji/google/person_in_steamy_room/3.png differ
diff --git a/public/images/emoji/google/person_in_steamy_room/4.png b/public/images/emoji/google/person_in_steamy_room/4.png
index 9028b985f3f..fd476ea7d08 100644
Binary files a/public/images/emoji/google/person_in_steamy_room/4.png and b/public/images/emoji/google/person_in_steamy_room/4.png differ
diff --git a/public/images/emoji/google/person_in_steamy_room/5.png b/public/images/emoji/google/person_in_steamy_room/5.png
index 840f346f830..a1f21491a0d 100644
Binary files a/public/images/emoji/google/person_in_steamy_room/5.png and b/public/images/emoji/google/person_in_steamy_room/5.png differ
diff --git a/public/images/emoji/google/person_in_steamy_room/6.png b/public/images/emoji/google/person_in_steamy_room/6.png
index 54dbe80a395..7a990547616 100644
Binary files a/public/images/emoji/google/person_in_steamy_room/6.png and b/public/images/emoji/google/person_in_steamy_room/6.png differ
diff --git a/public/images/emoji/google/person_with_ball.png b/public/images/emoji/google/person_with_ball.png
index 2f234c1261c..4441fc46c5a 100644
Binary files a/public/images/emoji/google/person_with_ball.png and b/public/images/emoji/google/person_with_ball.png differ
diff --git a/public/images/emoji/google/person_with_ball/2.png b/public/images/emoji/google/person_with_ball/2.png
index 511ad7125cd..d8c44421c81 100644
Binary files a/public/images/emoji/google/person_with_ball/2.png and b/public/images/emoji/google/person_with_ball/2.png differ
diff --git a/public/images/emoji/google/person_with_ball/3.png b/public/images/emoji/google/person_with_ball/3.png
index 652a2149b8f..fbd4d90e0d1 100644
Binary files a/public/images/emoji/google/person_with_ball/3.png and b/public/images/emoji/google/person_with_ball/3.png differ
diff --git a/public/images/emoji/google/person_with_ball/4.png b/public/images/emoji/google/person_with_ball/4.png
index 3ea11741d3e..2c84919a157 100644
Binary files a/public/images/emoji/google/person_with_ball/4.png and b/public/images/emoji/google/person_with_ball/4.png differ
diff --git a/public/images/emoji/google/person_with_ball/5.png b/public/images/emoji/google/person_with_ball/5.png
index 28b8f863258..2e9df18f9ff 100644
Binary files a/public/images/emoji/google/person_with_ball/5.png and b/public/images/emoji/google/person_with_ball/5.png differ
diff --git a/public/images/emoji/google/person_with_ball/6.png b/public/images/emoji/google/person_with_ball/6.png
index 5450f40d54e..77fb03716f2 100644
Binary files a/public/images/emoji/google/person_with_ball/6.png and b/public/images/emoji/google/person_with_ball/6.png differ
diff --git a/public/images/emoji/google/person_with_blond_hair.png b/public/images/emoji/google/person_with_blond_hair.png
index 69d6b0b5a7e..f5d7e0009ba 100644
Binary files a/public/images/emoji/google/person_with_blond_hair.png and b/public/images/emoji/google/person_with_blond_hair.png differ
diff --git a/public/images/emoji/google/person_with_blond_hair/2.png b/public/images/emoji/google/person_with_blond_hair/2.png
index 71286ddbf4e..2845b0f0d3d 100644
Binary files a/public/images/emoji/google/person_with_blond_hair/2.png and b/public/images/emoji/google/person_with_blond_hair/2.png differ
diff --git a/public/images/emoji/google/person_with_blond_hair/3.png b/public/images/emoji/google/person_with_blond_hair/3.png
index f5ccb5bc267..e9866fd956f 100644
Binary files a/public/images/emoji/google/person_with_blond_hair/3.png and b/public/images/emoji/google/person_with_blond_hair/3.png differ
diff --git a/public/images/emoji/google/person_with_blond_hair/4.png b/public/images/emoji/google/person_with_blond_hair/4.png
index 2d068f1de93..9a83dc6e5f1 100644
Binary files a/public/images/emoji/google/person_with_blond_hair/4.png and b/public/images/emoji/google/person_with_blond_hair/4.png differ
diff --git a/public/images/emoji/google/person_with_blond_hair/5.png b/public/images/emoji/google/person_with_blond_hair/5.png
index af6fe7aa988..99604000060 100644
Binary files a/public/images/emoji/google/person_with_blond_hair/5.png and b/public/images/emoji/google/person_with_blond_hair/5.png differ
diff --git a/public/images/emoji/google/person_with_blond_hair/6.png b/public/images/emoji/google/person_with_blond_hair/6.png
index 85e4e9885b0..c2a4a4256b3 100644
Binary files a/public/images/emoji/google/person_with_blond_hair/6.png and b/public/images/emoji/google/person_with_blond_hair/6.png differ
diff --git a/public/images/emoji/google/person_with_pouting_face.png b/public/images/emoji/google/person_with_pouting_face.png
index 3cfb0b6d15d..db8208ab0d0 100644
Binary files a/public/images/emoji/google/person_with_pouting_face.png and b/public/images/emoji/google/person_with_pouting_face.png differ
diff --git a/public/images/emoji/google/person_with_pouting_face/2.png b/public/images/emoji/google/person_with_pouting_face/2.png
index f63af15d1d6..554b23915a4 100644
Binary files a/public/images/emoji/google/person_with_pouting_face/2.png and b/public/images/emoji/google/person_with_pouting_face/2.png differ
diff --git a/public/images/emoji/google/person_with_pouting_face/3.png b/public/images/emoji/google/person_with_pouting_face/3.png
index 02d18d8a15e..e23a6a6c5df 100644
Binary files a/public/images/emoji/google/person_with_pouting_face/3.png and b/public/images/emoji/google/person_with_pouting_face/3.png differ
diff --git a/public/images/emoji/google/person_with_pouting_face/4.png b/public/images/emoji/google/person_with_pouting_face/4.png
index 9590fed0e8b..eaa2ddcbf0b 100644
Binary files a/public/images/emoji/google/person_with_pouting_face/4.png and b/public/images/emoji/google/person_with_pouting_face/4.png differ
diff --git a/public/images/emoji/google/person_with_pouting_face/5.png b/public/images/emoji/google/person_with_pouting_face/5.png
index 88232fbee9f..8f46e8c8197 100644
Binary files a/public/images/emoji/google/person_with_pouting_face/5.png and b/public/images/emoji/google/person_with_pouting_face/5.png differ
diff --git a/public/images/emoji/google/person_with_pouting_face/6.png b/public/images/emoji/google/person_with_pouting_face/6.png
index 80d274c07aa..037d9627b59 100644
Binary files a/public/images/emoji/google/person_with_pouting_face/6.png and b/public/images/emoji/google/person_with_pouting_face/6.png differ
diff --git a/public/images/emoji/google/peru.png b/public/images/emoji/google/peru.png
index e468cd48844..84281c7ec82 100644
Binary files a/public/images/emoji/google/peru.png and b/public/images/emoji/google/peru.png differ
diff --git a/public/images/emoji/google/philippines.png b/public/images/emoji/google/philippines.png
index bdb66d85244..117684b4041 100644
Binary files a/public/images/emoji/google/philippines.png and b/public/images/emoji/google/philippines.png differ
diff --git a/public/images/emoji/google/phone.png b/public/images/emoji/google/phone.png
index 24450536868..3eca2e7d803 100644
Binary files a/public/images/emoji/google/phone.png and b/public/images/emoji/google/phone.png differ
diff --git a/public/images/emoji/google/pick.png b/public/images/emoji/google/pick.png
index 81bdd231595..372dbef256d 100644
Binary files a/public/images/emoji/google/pick.png and b/public/images/emoji/google/pick.png differ
diff --git a/public/images/emoji/google/pie.png b/public/images/emoji/google/pie.png
index 71919170c9a..0aa66b4de86 100644
Binary files a/public/images/emoji/google/pie.png and b/public/images/emoji/google/pie.png differ
diff --git a/public/images/emoji/google/pig.png b/public/images/emoji/google/pig.png
index 246085679cf..028092eb838 100644
Binary files a/public/images/emoji/google/pig.png and b/public/images/emoji/google/pig.png differ
diff --git a/public/images/emoji/google/pig2.png b/public/images/emoji/google/pig2.png
index 36bc51f9cfd..25e4e10a3a0 100644
Binary files a/public/images/emoji/google/pig2.png and b/public/images/emoji/google/pig2.png differ
diff --git a/public/images/emoji/google/pig_nose.png b/public/images/emoji/google/pig_nose.png
index 909362877f1..6633f595195 100644
Binary files a/public/images/emoji/google/pig_nose.png and b/public/images/emoji/google/pig_nose.png differ
diff --git a/public/images/emoji/google/pill.png b/public/images/emoji/google/pill.png
index 2db3e8c5ea7..9d589f89064 100644
Binary files a/public/images/emoji/google/pill.png and b/public/images/emoji/google/pill.png differ
diff --git a/public/images/emoji/google/pineapple.png b/public/images/emoji/google/pineapple.png
index 1bc45c75c94..92a53419e5e 100644
Binary files a/public/images/emoji/google/pineapple.png and b/public/images/emoji/google/pineapple.png differ
diff --git a/public/images/emoji/google/ping_pong.png b/public/images/emoji/google/ping_pong.png
index 8390f27bb8b..60444a0a3a2 100644
Binary files a/public/images/emoji/google/ping_pong.png and b/public/images/emoji/google/ping_pong.png differ
diff --git a/public/images/emoji/google/pisces.png b/public/images/emoji/google/pisces.png
index 11390d483ec..c3983ce4d84 100644
Binary files a/public/images/emoji/google/pisces.png and b/public/images/emoji/google/pisces.png differ
diff --git a/public/images/emoji/google/pitcairn_islands.png b/public/images/emoji/google/pitcairn_islands.png
index 36e2e4183f0..09a98b8ef6a 100644
Binary files a/public/images/emoji/google/pitcairn_islands.png and b/public/images/emoji/google/pitcairn_islands.png differ
diff --git a/public/images/emoji/google/pizza.png b/public/images/emoji/google/pizza.png
index b8073d8d823..72b60d49346 100644
Binary files a/public/images/emoji/google/pizza.png and b/public/images/emoji/google/pizza.png differ
diff --git a/public/images/emoji/google/place_of_worship.png b/public/images/emoji/google/place_of_worship.png
index 0cc3774779c..6e4d8a92484 100644
Binary files a/public/images/emoji/google/place_of_worship.png and b/public/images/emoji/google/place_of_worship.png differ
diff --git a/public/images/emoji/google/plate_with_cutlery.png b/public/images/emoji/google/plate_with_cutlery.png
index a990ed2cbe4..c0ed1e0ed6b 100644
Binary files a/public/images/emoji/google/plate_with_cutlery.png and b/public/images/emoji/google/plate_with_cutlery.png differ
diff --git a/public/images/emoji/google/play_or_pause_button.png b/public/images/emoji/google/play_or_pause_button.png
index 75254d8a0e6..962fbe1652e 100644
Binary files a/public/images/emoji/google/play_or_pause_button.png and b/public/images/emoji/google/play_or_pause_button.png differ
diff --git a/public/images/emoji/google/play_pause.png b/public/images/emoji/google/play_pause.png
index 75254d8a0e6..962fbe1652e 100644
Binary files a/public/images/emoji/google/play_pause.png and b/public/images/emoji/google/play_pause.png differ
diff --git a/public/images/emoji/google/point_down.png b/public/images/emoji/google/point_down.png
index 6530e95cff7..303aeb3c0c6 100644
Binary files a/public/images/emoji/google/point_down.png and b/public/images/emoji/google/point_down.png differ
diff --git a/public/images/emoji/google/point_down/2.png b/public/images/emoji/google/point_down/2.png
index 86a151d38c2..0f163a339c1 100644
Binary files a/public/images/emoji/google/point_down/2.png and b/public/images/emoji/google/point_down/2.png differ
diff --git a/public/images/emoji/google/point_down/3.png b/public/images/emoji/google/point_down/3.png
index a051834bf11..8566f42d0ff 100644
Binary files a/public/images/emoji/google/point_down/3.png and b/public/images/emoji/google/point_down/3.png differ
diff --git a/public/images/emoji/google/point_down/4.png b/public/images/emoji/google/point_down/4.png
index 88a08aeb952..1946563ec86 100644
Binary files a/public/images/emoji/google/point_down/4.png and b/public/images/emoji/google/point_down/4.png differ
diff --git a/public/images/emoji/google/point_down/5.png b/public/images/emoji/google/point_down/5.png
index 78d1d82aa45..d142003d7e8 100644
Binary files a/public/images/emoji/google/point_down/5.png and b/public/images/emoji/google/point_down/5.png differ
diff --git a/public/images/emoji/google/point_down/6.png b/public/images/emoji/google/point_down/6.png
index a7e3837f239..7b4ef163613 100644
Binary files a/public/images/emoji/google/point_down/6.png and b/public/images/emoji/google/point_down/6.png differ
diff --git a/public/images/emoji/google/point_left.png b/public/images/emoji/google/point_left.png
index aa813b51d30..a8ff5b2c6ac 100644
Binary files a/public/images/emoji/google/point_left.png and b/public/images/emoji/google/point_left.png differ
diff --git a/public/images/emoji/google/point_left/2.png b/public/images/emoji/google/point_left/2.png
index f574ba95583..a0d6683e9c3 100644
Binary files a/public/images/emoji/google/point_left/2.png and b/public/images/emoji/google/point_left/2.png differ
diff --git a/public/images/emoji/google/point_left/3.png b/public/images/emoji/google/point_left/3.png
index 157a2286ff5..2dc98d0ed99 100644
Binary files a/public/images/emoji/google/point_left/3.png and b/public/images/emoji/google/point_left/3.png differ
diff --git a/public/images/emoji/google/point_left/4.png b/public/images/emoji/google/point_left/4.png
index 3a5b3c24eff..4645880970a 100644
Binary files a/public/images/emoji/google/point_left/4.png and b/public/images/emoji/google/point_left/4.png differ
diff --git a/public/images/emoji/google/point_left/5.png b/public/images/emoji/google/point_left/5.png
index fb4b460b5bc..2596416722b 100644
Binary files a/public/images/emoji/google/point_left/5.png and b/public/images/emoji/google/point_left/5.png differ
diff --git a/public/images/emoji/google/point_left/6.png b/public/images/emoji/google/point_left/6.png
index f8e91dad488..19b94402332 100644
Binary files a/public/images/emoji/google/point_left/6.png and b/public/images/emoji/google/point_left/6.png differ
diff --git a/public/images/emoji/google/point_right.png b/public/images/emoji/google/point_right.png
index ec4187d7baf..118d3b2010f 100644
Binary files a/public/images/emoji/google/point_right.png and b/public/images/emoji/google/point_right.png differ
diff --git a/public/images/emoji/google/point_right/2.png b/public/images/emoji/google/point_right/2.png
index 4e682eebbb2..d622311c892 100644
Binary files a/public/images/emoji/google/point_right/2.png and b/public/images/emoji/google/point_right/2.png differ
diff --git a/public/images/emoji/google/point_right/3.png b/public/images/emoji/google/point_right/3.png
index ca02a74b537..02c12cd8cf6 100644
Binary files a/public/images/emoji/google/point_right/3.png and b/public/images/emoji/google/point_right/3.png differ
diff --git a/public/images/emoji/google/point_right/4.png b/public/images/emoji/google/point_right/4.png
index 8ae8ced01ff..755a5295cea 100644
Binary files a/public/images/emoji/google/point_right/4.png and b/public/images/emoji/google/point_right/4.png differ
diff --git a/public/images/emoji/google/point_right/5.png b/public/images/emoji/google/point_right/5.png
index 388e88f4aca..28b5a4c3f17 100644
Binary files a/public/images/emoji/google/point_right/5.png and b/public/images/emoji/google/point_right/5.png differ
diff --git a/public/images/emoji/google/point_right/6.png b/public/images/emoji/google/point_right/6.png
index be0960e5d0f..4e7f18d4009 100644
Binary files a/public/images/emoji/google/point_right/6.png and b/public/images/emoji/google/point_right/6.png differ
diff --git a/public/images/emoji/google/point_up.png b/public/images/emoji/google/point_up.png
index 7589c68d4f3..eb2ecf782d8 100644
Binary files a/public/images/emoji/google/point_up.png and b/public/images/emoji/google/point_up.png differ
diff --git a/public/images/emoji/google/point_up/2.png b/public/images/emoji/google/point_up/2.png
index bf48906da65..a77ba82567e 100644
Binary files a/public/images/emoji/google/point_up/2.png and b/public/images/emoji/google/point_up/2.png differ
diff --git a/public/images/emoji/google/point_up/3.png b/public/images/emoji/google/point_up/3.png
index 8de6a0c4c97..3bd9cd9069d 100644
Binary files a/public/images/emoji/google/point_up/3.png and b/public/images/emoji/google/point_up/3.png differ
diff --git a/public/images/emoji/google/point_up/4.png b/public/images/emoji/google/point_up/4.png
index b7196bafcce..4291ee59cc2 100644
Binary files a/public/images/emoji/google/point_up/4.png and b/public/images/emoji/google/point_up/4.png differ
diff --git a/public/images/emoji/google/point_up/5.png b/public/images/emoji/google/point_up/5.png
index a9a3f6fdc02..c49da450312 100644
Binary files a/public/images/emoji/google/point_up/5.png and b/public/images/emoji/google/point_up/5.png differ
diff --git a/public/images/emoji/google/point_up/6.png b/public/images/emoji/google/point_up/6.png
index 8c6f7ba9569..a38173ef498 100644
Binary files a/public/images/emoji/google/point_up/6.png and b/public/images/emoji/google/point_up/6.png differ
diff --git a/public/images/emoji/google/point_up_2.png b/public/images/emoji/google/point_up_2.png
index 99b63169d9f..d10b6dd3f81 100644
Binary files a/public/images/emoji/google/point_up_2.png and b/public/images/emoji/google/point_up_2.png differ
diff --git a/public/images/emoji/google/point_up_2/2.png b/public/images/emoji/google/point_up_2/2.png
index 7064adcd53c..1266504f875 100644
Binary files a/public/images/emoji/google/point_up_2/2.png and b/public/images/emoji/google/point_up_2/2.png differ
diff --git a/public/images/emoji/google/point_up_2/3.png b/public/images/emoji/google/point_up_2/3.png
index e74c10fac40..a62af94ad04 100644
Binary files a/public/images/emoji/google/point_up_2/3.png and b/public/images/emoji/google/point_up_2/3.png differ
diff --git a/public/images/emoji/google/point_up_2/4.png b/public/images/emoji/google/point_up_2/4.png
index 034e80952cf..e57c38bf585 100644
Binary files a/public/images/emoji/google/point_up_2/4.png and b/public/images/emoji/google/point_up_2/4.png differ
diff --git a/public/images/emoji/google/point_up_2/5.png b/public/images/emoji/google/point_up_2/5.png
index 3e5fdceccaf..d070fec84f8 100644
Binary files a/public/images/emoji/google/point_up_2/5.png and b/public/images/emoji/google/point_up_2/5.png differ
diff --git a/public/images/emoji/google/point_up_2/6.png b/public/images/emoji/google/point_up_2/6.png
index 14eec3497e4..b0829a6f413 100644
Binary files a/public/images/emoji/google/point_up_2/6.png and b/public/images/emoji/google/point_up_2/6.png differ
diff --git a/public/images/emoji/google/poland.png b/public/images/emoji/google/poland.png
index f8f096e9cf7..0299ecfd9ba 100644
Binary files a/public/images/emoji/google/poland.png and b/public/images/emoji/google/poland.png differ
diff --git a/public/images/emoji/google/police_car.png b/public/images/emoji/google/police_car.png
index 9dc3c17e9bf..2b15c56b32b 100644
Binary files a/public/images/emoji/google/police_car.png and b/public/images/emoji/google/police_car.png differ
diff --git a/public/images/emoji/google/policeman.png b/public/images/emoji/google/policeman.png
index c6e424f54a1..7cdf83e122b 100644
Binary files a/public/images/emoji/google/policeman.png and b/public/images/emoji/google/policeman.png differ
diff --git a/public/images/emoji/google/policeman/2.png b/public/images/emoji/google/policeman/2.png
index 74bc0da8f2c..12d64038104 100644
Binary files a/public/images/emoji/google/policeman/2.png and b/public/images/emoji/google/policeman/2.png differ
diff --git a/public/images/emoji/google/policeman/3.png b/public/images/emoji/google/policeman/3.png
index d461370fdbf..119290b976e 100644
Binary files a/public/images/emoji/google/policeman/3.png and b/public/images/emoji/google/policeman/3.png differ
diff --git a/public/images/emoji/google/policeman/4.png b/public/images/emoji/google/policeman/4.png
index 12d654b4e5e..49d3df03398 100644
Binary files a/public/images/emoji/google/policeman/4.png and b/public/images/emoji/google/policeman/4.png differ
diff --git a/public/images/emoji/google/policeman/5.png b/public/images/emoji/google/policeman/5.png
index d555c18f792..7e961289d27 100644
Binary files a/public/images/emoji/google/policeman/5.png and b/public/images/emoji/google/policeman/5.png differ
diff --git a/public/images/emoji/google/policeman/6.png b/public/images/emoji/google/policeman/6.png
index 0542d87a6a2..8e59e6654e4 100644
Binary files a/public/images/emoji/google/policeman/6.png and b/public/images/emoji/google/policeman/6.png differ
diff --git a/public/images/emoji/google/policewoman.png b/public/images/emoji/google/policewoman.png
index b00f14d2fd1..b0834ac8c7f 100644
Binary files a/public/images/emoji/google/policewoman.png and b/public/images/emoji/google/policewoman.png differ
diff --git a/public/images/emoji/google/policewoman/2.png b/public/images/emoji/google/policewoman/2.png
index 5e7e99b42e3..7aa2a483bf0 100644
Binary files a/public/images/emoji/google/policewoman/2.png and b/public/images/emoji/google/policewoman/2.png differ
diff --git a/public/images/emoji/google/policewoman/3.png b/public/images/emoji/google/policewoman/3.png
index cc435948393..9babe96cfc1 100644
Binary files a/public/images/emoji/google/policewoman/3.png and b/public/images/emoji/google/policewoman/3.png differ
diff --git a/public/images/emoji/google/policewoman/4.png b/public/images/emoji/google/policewoman/4.png
index b9109d47d62..57ddf867657 100644
Binary files a/public/images/emoji/google/policewoman/4.png and b/public/images/emoji/google/policewoman/4.png differ
diff --git a/public/images/emoji/google/policewoman/5.png b/public/images/emoji/google/policewoman/5.png
index b44c2ea1e0a..3baa77253fd 100644
Binary files a/public/images/emoji/google/policewoman/5.png and b/public/images/emoji/google/policewoman/5.png differ
diff --git a/public/images/emoji/google/policewoman/6.png b/public/images/emoji/google/policewoman/6.png
index cd94a46c766..e074132c773 100644
Binary files a/public/images/emoji/google/policewoman/6.png and b/public/images/emoji/google/policewoman/6.png differ
diff --git a/public/images/emoji/google/poo.png b/public/images/emoji/google/poo.png
index b1d921d96c2..de476df01c1 100644
Binary files a/public/images/emoji/google/poo.png and b/public/images/emoji/google/poo.png differ
diff --git a/public/images/emoji/google/poodle.png b/public/images/emoji/google/poodle.png
index c8aa1889e4b..34b13b44d5a 100644
Binary files a/public/images/emoji/google/poodle.png and b/public/images/emoji/google/poodle.png differ
diff --git a/public/images/emoji/google/poop.png b/public/images/emoji/google/poop.png
index b1d921d96c2..de476df01c1 100644
Binary files a/public/images/emoji/google/poop.png and b/public/images/emoji/google/poop.png differ
diff --git a/public/images/emoji/google/popcorn.png b/public/images/emoji/google/popcorn.png
index 9041ab3d1fb..0fb9b10c89b 100644
Binary files a/public/images/emoji/google/popcorn.png and b/public/images/emoji/google/popcorn.png differ
diff --git a/public/images/emoji/google/portugal.png b/public/images/emoji/google/portugal.png
index 70685125ba4..c7fb67e041f 100644
Binary files a/public/images/emoji/google/portugal.png and b/public/images/emoji/google/portugal.png differ
diff --git a/public/images/emoji/google/post_office.png b/public/images/emoji/google/post_office.png
index 7a2fb070072..c18d81cdb8b 100644
Binary files a/public/images/emoji/google/post_office.png and b/public/images/emoji/google/post_office.png differ
diff --git a/public/images/emoji/google/postal_horn.png b/public/images/emoji/google/postal_horn.png
index 43646f03df6..a942600f88c 100644
Binary files a/public/images/emoji/google/postal_horn.png and b/public/images/emoji/google/postal_horn.png differ
diff --git a/public/images/emoji/google/postbox.png b/public/images/emoji/google/postbox.png
index 67b9059a7c6..8b1601ae396 100644
Binary files a/public/images/emoji/google/postbox.png and b/public/images/emoji/google/postbox.png differ
diff --git a/public/images/emoji/google/potable_water.png b/public/images/emoji/google/potable_water.png
index b40de98bdc0..9f92c3e6fe7 100644
Binary files a/public/images/emoji/google/potable_water.png and b/public/images/emoji/google/potable_water.png differ
diff --git a/public/images/emoji/google/potato.png b/public/images/emoji/google/potato.png
index 065939c3827..cb25568ac58 100644
Binary files a/public/images/emoji/google/potato.png and b/public/images/emoji/google/potato.png differ
diff --git a/public/images/emoji/google/pouch.png b/public/images/emoji/google/pouch.png
index 88a91f76f2a..87b988753dc 100644
Binary files a/public/images/emoji/google/pouch.png and b/public/images/emoji/google/pouch.png differ
diff --git a/public/images/emoji/google/poultry_leg.png b/public/images/emoji/google/poultry_leg.png
index acb0f99d720..4cc37087c58 100644
Binary files a/public/images/emoji/google/poultry_leg.png and b/public/images/emoji/google/poultry_leg.png differ
diff --git a/public/images/emoji/google/pound.png b/public/images/emoji/google/pound.png
index a44b7a12982..67f5f4abbab 100644
Binary files a/public/images/emoji/google/pound.png and b/public/images/emoji/google/pound.png differ
diff --git a/public/images/emoji/google/pouting_cat.png b/public/images/emoji/google/pouting_cat.png
index bdfc781f7b3..b904b3dc757 100644
Binary files a/public/images/emoji/google/pouting_cat.png and b/public/images/emoji/google/pouting_cat.png differ
diff --git a/public/images/emoji/google/pouting_man.png b/public/images/emoji/google/pouting_man.png
index 07bb3d8bdf2..3cee46d8829 100644
Binary files a/public/images/emoji/google/pouting_man.png and b/public/images/emoji/google/pouting_man.png differ
diff --git a/public/images/emoji/google/pouting_man/2.png b/public/images/emoji/google/pouting_man/2.png
index 7e8ab5ac36f..4669180e954 100644
Binary files a/public/images/emoji/google/pouting_man/2.png and b/public/images/emoji/google/pouting_man/2.png differ
diff --git a/public/images/emoji/google/pouting_man/3.png b/public/images/emoji/google/pouting_man/3.png
index 7d01cfbe5cd..ba2c656db84 100644
Binary files a/public/images/emoji/google/pouting_man/3.png and b/public/images/emoji/google/pouting_man/3.png differ
diff --git a/public/images/emoji/google/pouting_man/4.png b/public/images/emoji/google/pouting_man/4.png
index e6ad0ebd972..7e77249097e 100644
Binary files a/public/images/emoji/google/pouting_man/4.png and b/public/images/emoji/google/pouting_man/4.png differ
diff --git a/public/images/emoji/google/pouting_man/5.png b/public/images/emoji/google/pouting_man/5.png
index 6a52e8697e7..2da543a78a5 100644
Binary files a/public/images/emoji/google/pouting_man/5.png and b/public/images/emoji/google/pouting_man/5.png differ
diff --git a/public/images/emoji/google/pouting_man/6.png b/public/images/emoji/google/pouting_man/6.png
index d39407f1a3c..e87f4da27d0 100644
Binary files a/public/images/emoji/google/pouting_man/6.png and b/public/images/emoji/google/pouting_man/6.png differ
diff --git a/public/images/emoji/google/pouting_woman.png b/public/images/emoji/google/pouting_woman.png
index 3cfb0b6d15d..db8208ab0d0 100644
Binary files a/public/images/emoji/google/pouting_woman.png and b/public/images/emoji/google/pouting_woman.png differ
diff --git a/public/images/emoji/google/pouting_woman/2.png b/public/images/emoji/google/pouting_woman/2.png
index f63af15d1d6..554b23915a4 100644
Binary files a/public/images/emoji/google/pouting_woman/2.png and b/public/images/emoji/google/pouting_woman/2.png differ
diff --git a/public/images/emoji/google/pouting_woman/3.png b/public/images/emoji/google/pouting_woman/3.png
index 02d18d8a15e..e23a6a6c5df 100644
Binary files a/public/images/emoji/google/pouting_woman/3.png and b/public/images/emoji/google/pouting_woman/3.png differ
diff --git a/public/images/emoji/google/pouting_woman/4.png b/public/images/emoji/google/pouting_woman/4.png
index 9590fed0e8b..eaa2ddcbf0b 100644
Binary files a/public/images/emoji/google/pouting_woman/4.png and b/public/images/emoji/google/pouting_woman/4.png differ
diff --git a/public/images/emoji/google/pouting_woman/5.png b/public/images/emoji/google/pouting_woman/5.png
index 88232fbee9f..8f46e8c8197 100644
Binary files a/public/images/emoji/google/pouting_woman/5.png and b/public/images/emoji/google/pouting_woman/5.png differ
diff --git a/public/images/emoji/google/pouting_woman/6.png b/public/images/emoji/google/pouting_woman/6.png
index 80d274c07aa..037d9627b59 100644
Binary files a/public/images/emoji/google/pouting_woman/6.png and b/public/images/emoji/google/pouting_woman/6.png differ
diff --git a/public/images/emoji/google/pray.png b/public/images/emoji/google/pray.png
index eb1892ae029..7a42c71cf89 100644
Binary files a/public/images/emoji/google/pray.png and b/public/images/emoji/google/pray.png differ
diff --git a/public/images/emoji/google/pray/2.png b/public/images/emoji/google/pray/2.png
index 9c54413a720..72edc95dbbc 100644
Binary files a/public/images/emoji/google/pray/2.png and b/public/images/emoji/google/pray/2.png differ
diff --git a/public/images/emoji/google/pray/3.png b/public/images/emoji/google/pray/3.png
index 6281185ef7d..578c30db820 100644
Binary files a/public/images/emoji/google/pray/3.png and b/public/images/emoji/google/pray/3.png differ
diff --git a/public/images/emoji/google/pray/4.png b/public/images/emoji/google/pray/4.png
index 23334af3ad9..273735a0d18 100644
Binary files a/public/images/emoji/google/pray/4.png and b/public/images/emoji/google/pray/4.png differ
diff --git a/public/images/emoji/google/pray/5.png b/public/images/emoji/google/pray/5.png
index 7304df459a5..6e1d4453989 100644
Binary files a/public/images/emoji/google/pray/5.png and b/public/images/emoji/google/pray/5.png differ
diff --git a/public/images/emoji/google/pray/6.png b/public/images/emoji/google/pray/6.png
index 3b67bdd5227..e99fe2fc138 100644
Binary files a/public/images/emoji/google/pray/6.png and b/public/images/emoji/google/pray/6.png differ
diff --git a/public/images/emoji/google/prayer_beads.png b/public/images/emoji/google/prayer_beads.png
index e67ffc8c3a6..4fa186fdec8 100644
Binary files a/public/images/emoji/google/prayer_beads.png and b/public/images/emoji/google/prayer_beads.png differ
diff --git a/public/images/emoji/google/pregnant_woman.png b/public/images/emoji/google/pregnant_woman.png
index c56f668d183..1c88f42f6d4 100644
Binary files a/public/images/emoji/google/pregnant_woman.png and b/public/images/emoji/google/pregnant_woman.png differ
diff --git a/public/images/emoji/google/pregnant_woman/2.png b/public/images/emoji/google/pregnant_woman/2.png
index 3c439cfa610..a8061b7e171 100644
Binary files a/public/images/emoji/google/pregnant_woman/2.png and b/public/images/emoji/google/pregnant_woman/2.png differ
diff --git a/public/images/emoji/google/pregnant_woman/3.png b/public/images/emoji/google/pregnant_woman/3.png
index ac810fa3051..d04662f5205 100644
Binary files a/public/images/emoji/google/pregnant_woman/3.png and b/public/images/emoji/google/pregnant_woman/3.png differ
diff --git a/public/images/emoji/google/pregnant_woman/4.png b/public/images/emoji/google/pregnant_woman/4.png
index 893dc91287d..619fc6abf79 100644
Binary files a/public/images/emoji/google/pregnant_woman/4.png and b/public/images/emoji/google/pregnant_woman/4.png differ
diff --git a/public/images/emoji/google/pregnant_woman/5.png b/public/images/emoji/google/pregnant_woman/5.png
index e3b1bb4e546..04c6b5f121f 100644
Binary files a/public/images/emoji/google/pregnant_woman/5.png and b/public/images/emoji/google/pregnant_woman/5.png differ
diff --git a/public/images/emoji/google/pregnant_woman/6.png b/public/images/emoji/google/pregnant_woman/6.png
index 5b9b93f1fa8..add2c122840 100644
Binary files a/public/images/emoji/google/pregnant_woman/6.png and b/public/images/emoji/google/pregnant_woman/6.png differ
diff --git a/public/images/emoji/google/pretzel.png b/public/images/emoji/google/pretzel.png
index 615e11503a1..dd725a6360a 100644
Binary files a/public/images/emoji/google/pretzel.png and b/public/images/emoji/google/pretzel.png differ
diff --git a/public/images/emoji/google/previous_track.png b/public/images/emoji/google/previous_track.png
index 559086b3c06..87e948c0809 100644
Binary files a/public/images/emoji/google/previous_track.png and b/public/images/emoji/google/previous_track.png differ
diff --git a/public/images/emoji/google/previous_track_button.png b/public/images/emoji/google/previous_track_button.png
index 559086b3c06..87e948c0809 100644
Binary files a/public/images/emoji/google/previous_track_button.png and b/public/images/emoji/google/previous_track_button.png differ
diff --git a/public/images/emoji/google/prince.png b/public/images/emoji/google/prince.png
index 9829fa23d6d..035304bda19 100644
Binary files a/public/images/emoji/google/prince.png and b/public/images/emoji/google/prince.png differ
diff --git a/public/images/emoji/google/prince/2.png b/public/images/emoji/google/prince/2.png
index cb34d61e3cf..f5a4deaa09d 100644
Binary files a/public/images/emoji/google/prince/2.png and b/public/images/emoji/google/prince/2.png differ
diff --git a/public/images/emoji/google/prince/3.png b/public/images/emoji/google/prince/3.png
index 362d7c4ec44..4c793c71775 100644
Binary files a/public/images/emoji/google/prince/3.png and b/public/images/emoji/google/prince/3.png differ
diff --git a/public/images/emoji/google/prince/4.png b/public/images/emoji/google/prince/4.png
index 57cb400ea26..decf85c8cbd 100644
Binary files a/public/images/emoji/google/prince/4.png and b/public/images/emoji/google/prince/4.png differ
diff --git a/public/images/emoji/google/prince/5.png b/public/images/emoji/google/prince/5.png
index 28598ace62f..ad0ce91baac 100644
Binary files a/public/images/emoji/google/prince/5.png and b/public/images/emoji/google/prince/5.png differ
diff --git a/public/images/emoji/google/prince/6.png b/public/images/emoji/google/prince/6.png
index 68fa20f10bd..167df9b9466 100644
Binary files a/public/images/emoji/google/prince/6.png and b/public/images/emoji/google/prince/6.png differ
diff --git a/public/images/emoji/google/princess.png b/public/images/emoji/google/princess.png
index de506646b47..094e61c4e5f 100644
Binary files a/public/images/emoji/google/princess.png and b/public/images/emoji/google/princess.png differ
diff --git a/public/images/emoji/google/princess/2.png b/public/images/emoji/google/princess/2.png
index d576ce4df82..5676db47689 100644
Binary files a/public/images/emoji/google/princess/2.png and b/public/images/emoji/google/princess/2.png differ
diff --git a/public/images/emoji/google/princess/3.png b/public/images/emoji/google/princess/3.png
index 96484ff7914..1346fd208de 100644
Binary files a/public/images/emoji/google/princess/3.png and b/public/images/emoji/google/princess/3.png differ
diff --git a/public/images/emoji/google/princess/4.png b/public/images/emoji/google/princess/4.png
index 7429f3ed815..4c8e9681eca 100644
Binary files a/public/images/emoji/google/princess/4.png and b/public/images/emoji/google/princess/4.png differ
diff --git a/public/images/emoji/google/princess/5.png b/public/images/emoji/google/princess/5.png
index a1a476332a0..f03e15f69c7 100644
Binary files a/public/images/emoji/google/princess/5.png and b/public/images/emoji/google/princess/5.png differ
diff --git a/public/images/emoji/google/princess/6.png b/public/images/emoji/google/princess/6.png
index 5599020832a..523d6eac1ed 100644
Binary files a/public/images/emoji/google/princess/6.png and b/public/images/emoji/google/princess/6.png differ
diff --git a/public/images/emoji/google/printer.png b/public/images/emoji/google/printer.png
index bc356b7b5ce..76bf56bfdf7 100644
Binary files a/public/images/emoji/google/printer.png and b/public/images/emoji/google/printer.png differ
diff --git a/public/images/emoji/google/projector.png b/public/images/emoji/google/projector.png
index f957286ba21..a420005a790 100644
Binary files a/public/images/emoji/google/projector.png and b/public/images/emoji/google/projector.png differ
diff --git a/public/images/emoji/google/puerto_rico.png b/public/images/emoji/google/puerto_rico.png
index 8762d9ce24c..4787f3af457 100644
Binary files a/public/images/emoji/google/puerto_rico.png and b/public/images/emoji/google/puerto_rico.png differ
diff --git a/public/images/emoji/google/puke.png b/public/images/emoji/google/puke.png
new file mode 100644
index 00000000000..d3ce5f69bdc
Binary files /dev/null and b/public/images/emoji/google/puke.png differ
diff --git a/public/images/emoji/google/punch.png b/public/images/emoji/google/punch.png
index f05a3f6d14c..2ef7ed20914 100644
Binary files a/public/images/emoji/google/punch.png and b/public/images/emoji/google/punch.png differ
diff --git a/public/images/emoji/google/punch/2.png b/public/images/emoji/google/punch/2.png
index bba3d6fe12b..a545c376acb 100644
Binary files a/public/images/emoji/google/punch/2.png and b/public/images/emoji/google/punch/2.png differ
diff --git a/public/images/emoji/google/punch/3.png b/public/images/emoji/google/punch/3.png
index 123e4450309..03e2a4fc1b9 100644
Binary files a/public/images/emoji/google/punch/3.png and b/public/images/emoji/google/punch/3.png differ
diff --git a/public/images/emoji/google/punch/4.png b/public/images/emoji/google/punch/4.png
index 974055c6286..bfb48350fcc 100644
Binary files a/public/images/emoji/google/punch/4.png and b/public/images/emoji/google/punch/4.png differ
diff --git a/public/images/emoji/google/punch/5.png b/public/images/emoji/google/punch/5.png
index 3f068a0f950..5f57f2ba464 100644
Binary files a/public/images/emoji/google/punch/5.png and b/public/images/emoji/google/punch/5.png differ
diff --git a/public/images/emoji/google/punch/6.png b/public/images/emoji/google/punch/6.png
index 798a95d9fd6..66067147f93 100644
Binary files a/public/images/emoji/google/punch/6.png and b/public/images/emoji/google/punch/6.png differ
diff --git a/public/images/emoji/google/purple_heart.png b/public/images/emoji/google/purple_heart.png
index dab19a7cb7c..70c7bbd206b 100644
Binary files a/public/images/emoji/google/purple_heart.png and b/public/images/emoji/google/purple_heart.png differ
diff --git a/public/images/emoji/google/purse.png b/public/images/emoji/google/purse.png
index 728bd8fd536..fe533f5c17d 100644
Binary files a/public/images/emoji/google/purse.png and b/public/images/emoji/google/purse.png differ
diff --git a/public/images/emoji/google/pushpin.png b/public/images/emoji/google/pushpin.png
index cb6e075c9c6..0dfa0a3779e 100644
Binary files a/public/images/emoji/google/pushpin.png and b/public/images/emoji/google/pushpin.png differ
diff --git a/public/images/emoji/google/put_litter_in_its_place.png b/public/images/emoji/google/put_litter_in_its_place.png
index ec4606998f8..a19ae024c87 100644
Binary files a/public/images/emoji/google/put_litter_in_its_place.png and b/public/images/emoji/google/put_litter_in_its_place.png differ
diff --git a/public/images/emoji/google/qatar.png b/public/images/emoji/google/qatar.png
index 8e058678efa..02db227af77 100644
Binary files a/public/images/emoji/google/qatar.png and b/public/images/emoji/google/qatar.png differ
diff --git a/public/images/emoji/google/question.png b/public/images/emoji/google/question.png
index 36d2465b862..691e7345f89 100644
Binary files a/public/images/emoji/google/question.png and b/public/images/emoji/google/question.png differ
diff --git a/public/images/emoji/google/rabbit.png b/public/images/emoji/google/rabbit.png
index 1ec796818c5..65970504198 100644
Binary files a/public/images/emoji/google/rabbit.png and b/public/images/emoji/google/rabbit.png differ
diff --git a/public/images/emoji/google/rabbit2.png b/public/images/emoji/google/rabbit2.png
index 06be3a3850f..3f5ce5c83ae 100644
Binary files a/public/images/emoji/google/rabbit2.png and b/public/images/emoji/google/rabbit2.png differ
diff --git a/public/images/emoji/google/race_car.png b/public/images/emoji/google/race_car.png
index 60577b2803c..efee3e6d654 100644
Binary files a/public/images/emoji/google/race_car.png and b/public/images/emoji/google/race_car.png differ
diff --git a/public/images/emoji/google/racehorse.png b/public/images/emoji/google/racehorse.png
index 3ce637440ef..4d15d59b81d 100644
Binary files a/public/images/emoji/google/racehorse.png and b/public/images/emoji/google/racehorse.png differ
diff --git a/public/images/emoji/google/racing_car.png b/public/images/emoji/google/racing_car.png
index 60577b2803c..efee3e6d654 100644
Binary files a/public/images/emoji/google/racing_car.png and b/public/images/emoji/google/racing_car.png differ
diff --git a/public/images/emoji/google/racing_motorcycle.png b/public/images/emoji/google/racing_motorcycle.png
index d153c400edb..f665d143ef0 100644
Binary files a/public/images/emoji/google/racing_motorcycle.png and b/public/images/emoji/google/racing_motorcycle.png differ
diff --git a/public/images/emoji/google/radio.png b/public/images/emoji/google/radio.png
index 2b6ebf3c6c0..57b9231d1f7 100644
Binary files a/public/images/emoji/google/radio.png and b/public/images/emoji/google/radio.png differ
diff --git a/public/images/emoji/google/radio_button.png b/public/images/emoji/google/radio_button.png
index 0175b6c9aa8..24b7e14c1b6 100644
Binary files a/public/images/emoji/google/radio_button.png and b/public/images/emoji/google/radio_button.png differ
diff --git a/public/images/emoji/google/radioactive.png b/public/images/emoji/google/radioactive.png
index 0f447cc8a73..bbac164719b 100644
Binary files a/public/images/emoji/google/radioactive.png and b/public/images/emoji/google/radioactive.png differ
diff --git a/public/images/emoji/google/radioactive_sign.png b/public/images/emoji/google/radioactive_sign.png
index 0f447cc8a73..bbac164719b 100644
Binary files a/public/images/emoji/google/radioactive_sign.png and b/public/images/emoji/google/radioactive_sign.png differ
diff --git a/public/images/emoji/google/rage.png b/public/images/emoji/google/rage.png
index c7ae736cad8..b7ad83ce851 100644
Binary files a/public/images/emoji/google/rage.png and b/public/images/emoji/google/rage.png differ
diff --git a/public/images/emoji/google/railroad_track.png b/public/images/emoji/google/railroad_track.png
index 6c11df97547..fc0f3211f68 100644
Binary files a/public/images/emoji/google/railroad_track.png and b/public/images/emoji/google/railroad_track.png differ
diff --git a/public/images/emoji/google/railway_car.png b/public/images/emoji/google/railway_car.png
index a84af6e421c..47347e49db7 100644
Binary files a/public/images/emoji/google/railway_car.png and b/public/images/emoji/google/railway_car.png differ
diff --git a/public/images/emoji/google/railway_track.png b/public/images/emoji/google/railway_track.png
index 6c11df97547..fc0f3211f68 100644
Binary files a/public/images/emoji/google/railway_track.png and b/public/images/emoji/google/railway_track.png differ
diff --git a/public/images/emoji/google/rainbow.png b/public/images/emoji/google/rainbow.png
index 2292152e0d2..93cda09148f 100644
Binary files a/public/images/emoji/google/rainbow.png and b/public/images/emoji/google/rainbow.png differ
diff --git a/public/images/emoji/google/rainbow_flag.png b/public/images/emoji/google/rainbow_flag.png
index d77a7706714..994f82d4730 100644
Binary files a/public/images/emoji/google/rainbow_flag.png and b/public/images/emoji/google/rainbow_flag.png differ
diff --git a/public/images/emoji/google/raised_back_of_hand.png b/public/images/emoji/google/raised_back_of_hand.png
index ffda7881dc7..694ded58aad 100644
Binary files a/public/images/emoji/google/raised_back_of_hand.png and b/public/images/emoji/google/raised_back_of_hand.png differ
diff --git a/public/images/emoji/google/raised_back_of_hand/2.png b/public/images/emoji/google/raised_back_of_hand/2.png
index cf4b3376bb7..98f2c0e2ac3 100644
Binary files a/public/images/emoji/google/raised_back_of_hand/2.png and b/public/images/emoji/google/raised_back_of_hand/2.png differ
diff --git a/public/images/emoji/google/raised_back_of_hand/3.png b/public/images/emoji/google/raised_back_of_hand/3.png
index 4febc58f7df..a0af20b9f88 100644
Binary files a/public/images/emoji/google/raised_back_of_hand/3.png and b/public/images/emoji/google/raised_back_of_hand/3.png differ
diff --git a/public/images/emoji/google/raised_back_of_hand/4.png b/public/images/emoji/google/raised_back_of_hand/4.png
index 1de5dbde5a7..92c07c8107c 100644
Binary files a/public/images/emoji/google/raised_back_of_hand/4.png and b/public/images/emoji/google/raised_back_of_hand/4.png differ
diff --git a/public/images/emoji/google/raised_back_of_hand/5.png b/public/images/emoji/google/raised_back_of_hand/5.png
index 68e1158c3e1..98f8f30824e 100644
Binary files a/public/images/emoji/google/raised_back_of_hand/5.png and b/public/images/emoji/google/raised_back_of_hand/5.png differ
diff --git a/public/images/emoji/google/raised_back_of_hand/6.png b/public/images/emoji/google/raised_back_of_hand/6.png
index 505506833f0..b3443ccca9d 100644
Binary files a/public/images/emoji/google/raised_back_of_hand/6.png and b/public/images/emoji/google/raised_back_of_hand/6.png differ
diff --git a/public/images/emoji/google/raised_hand.png b/public/images/emoji/google/raised_hand.png
index b916dc7f878..de95a849815 100644
Binary files a/public/images/emoji/google/raised_hand.png and b/public/images/emoji/google/raised_hand.png differ
diff --git a/public/images/emoji/google/raised_hand/2.png b/public/images/emoji/google/raised_hand/2.png
index e60690c77eb..d836026dac2 100644
Binary files a/public/images/emoji/google/raised_hand/2.png and b/public/images/emoji/google/raised_hand/2.png differ
diff --git a/public/images/emoji/google/raised_hand/3.png b/public/images/emoji/google/raised_hand/3.png
index 9aabb63f85f..be7f2cba1c3 100644
Binary files a/public/images/emoji/google/raised_hand/3.png and b/public/images/emoji/google/raised_hand/3.png differ
diff --git a/public/images/emoji/google/raised_hand/4.png b/public/images/emoji/google/raised_hand/4.png
index 86696653b53..e19034a4e0f 100644
Binary files a/public/images/emoji/google/raised_hand/4.png and b/public/images/emoji/google/raised_hand/4.png differ
diff --git a/public/images/emoji/google/raised_hand/5.png b/public/images/emoji/google/raised_hand/5.png
index 1e92c70971d..d564c273c7d 100644
Binary files a/public/images/emoji/google/raised_hand/5.png and b/public/images/emoji/google/raised_hand/5.png differ
diff --git a/public/images/emoji/google/raised_hand/6.png b/public/images/emoji/google/raised_hand/6.png
index 1e260d44614..6d24244b388 100644
Binary files a/public/images/emoji/google/raised_hand/6.png and b/public/images/emoji/google/raised_hand/6.png differ
diff --git a/public/images/emoji/google/raised_hand_with_fingers_splayed.png b/public/images/emoji/google/raised_hand_with_fingers_splayed.png
index f99fef5296b..12fee02f173 100644
Binary files a/public/images/emoji/google/raised_hand_with_fingers_splayed.png and b/public/images/emoji/google/raised_hand_with_fingers_splayed.png differ
diff --git a/public/images/emoji/google/raised_hand_with_fingers_splayed/2.png b/public/images/emoji/google/raised_hand_with_fingers_splayed/2.png
index 3f6b667ebe2..f9b441bae21 100644
Binary files a/public/images/emoji/google/raised_hand_with_fingers_splayed/2.png and b/public/images/emoji/google/raised_hand_with_fingers_splayed/2.png differ
diff --git a/public/images/emoji/google/raised_hand_with_fingers_splayed/3.png b/public/images/emoji/google/raised_hand_with_fingers_splayed/3.png
index 0a811f93d51..46bb5b97c32 100644
Binary files a/public/images/emoji/google/raised_hand_with_fingers_splayed/3.png and b/public/images/emoji/google/raised_hand_with_fingers_splayed/3.png differ
diff --git a/public/images/emoji/google/raised_hand_with_fingers_splayed/4.png b/public/images/emoji/google/raised_hand_with_fingers_splayed/4.png
index 21a92e444c9..244dbb61a6f 100644
Binary files a/public/images/emoji/google/raised_hand_with_fingers_splayed/4.png and b/public/images/emoji/google/raised_hand_with_fingers_splayed/4.png differ
diff --git a/public/images/emoji/google/raised_hand_with_fingers_splayed/5.png b/public/images/emoji/google/raised_hand_with_fingers_splayed/5.png
index f40f860c160..f2c26a02670 100644
Binary files a/public/images/emoji/google/raised_hand_with_fingers_splayed/5.png and b/public/images/emoji/google/raised_hand_with_fingers_splayed/5.png differ
diff --git a/public/images/emoji/google/raised_hand_with_fingers_splayed/6.png b/public/images/emoji/google/raised_hand_with_fingers_splayed/6.png
index b87967ff847..2cc07edb58a 100644
Binary files a/public/images/emoji/google/raised_hand_with_fingers_splayed/6.png and b/public/images/emoji/google/raised_hand_with_fingers_splayed/6.png differ
diff --git a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers.png b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers.png
index e672a711f11..bbedc6b2dcb 100644
Binary files a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers.png and b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers.png differ
diff --git a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/2.png b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/2.png
index 635aa1f7757..08e5bca6058 100644
Binary files a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/2.png and b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/2.png differ
diff --git a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/3.png b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/3.png
index d6c303152c4..c1059af3e0e 100644
Binary files a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/3.png and b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/3.png differ
diff --git a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/4.png b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/4.png
index 645ad295a80..a6cc78518c9 100644
Binary files a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/4.png and b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/4.png differ
diff --git a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/5.png b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/5.png
index cbb240d2c67..b4d9b458f90 100644
Binary files a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/5.png and b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/5.png differ
diff --git a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/6.png b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/6.png
index 0e727c865aa..815b2959ece 100644
Binary files a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/6.png and b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/6.png differ
diff --git a/public/images/emoji/google/raised_hands.png b/public/images/emoji/google/raised_hands.png
index 49cb6a53aaf..f9dcc714d3f 100644
Binary files a/public/images/emoji/google/raised_hands.png and b/public/images/emoji/google/raised_hands.png differ
diff --git a/public/images/emoji/google/raised_hands/2.png b/public/images/emoji/google/raised_hands/2.png
index d03fdc2ea49..efb3e4fdf3a 100644
Binary files a/public/images/emoji/google/raised_hands/2.png and b/public/images/emoji/google/raised_hands/2.png differ
diff --git a/public/images/emoji/google/raised_hands/3.png b/public/images/emoji/google/raised_hands/3.png
index 37e9b1277ec..9f0b17f2c25 100644
Binary files a/public/images/emoji/google/raised_hands/3.png and b/public/images/emoji/google/raised_hands/3.png differ
diff --git a/public/images/emoji/google/raised_hands/4.png b/public/images/emoji/google/raised_hands/4.png
index c45d7f3cbaa..54aabe3fe2c 100644
Binary files a/public/images/emoji/google/raised_hands/4.png and b/public/images/emoji/google/raised_hands/4.png differ
diff --git a/public/images/emoji/google/raised_hands/5.png b/public/images/emoji/google/raised_hands/5.png
index 3ce79a95f75..104fb2054fe 100644
Binary files a/public/images/emoji/google/raised_hands/5.png and b/public/images/emoji/google/raised_hands/5.png differ
diff --git a/public/images/emoji/google/raised_hands/6.png b/public/images/emoji/google/raised_hands/6.png
index b32c537c1f3..8fa4e188374 100644
Binary files a/public/images/emoji/google/raised_hands/6.png and b/public/images/emoji/google/raised_hands/6.png differ
diff --git a/public/images/emoji/google/raising_hand.png b/public/images/emoji/google/raising_hand.png
index 72ea7e6bd70..96a4c2b148f 100644
Binary files a/public/images/emoji/google/raising_hand.png and b/public/images/emoji/google/raising_hand.png differ
diff --git a/public/images/emoji/google/raising_hand/2.png b/public/images/emoji/google/raising_hand/2.png
index 110f5edf80e..9a8b0b0398e 100644
Binary files a/public/images/emoji/google/raising_hand/2.png and b/public/images/emoji/google/raising_hand/2.png differ
diff --git a/public/images/emoji/google/raising_hand/3.png b/public/images/emoji/google/raising_hand/3.png
index 5fc1015a025..28ce85f8912 100644
Binary files a/public/images/emoji/google/raising_hand/3.png and b/public/images/emoji/google/raising_hand/3.png differ
diff --git a/public/images/emoji/google/raising_hand/4.png b/public/images/emoji/google/raising_hand/4.png
index 022eb60392f..d6e2bfb18e3 100644
Binary files a/public/images/emoji/google/raising_hand/4.png and b/public/images/emoji/google/raising_hand/4.png differ
diff --git a/public/images/emoji/google/raising_hand/5.png b/public/images/emoji/google/raising_hand/5.png
index 76bad2a8938..d1e7919136c 100644
Binary files a/public/images/emoji/google/raising_hand/5.png and b/public/images/emoji/google/raising_hand/5.png differ
diff --git a/public/images/emoji/google/raising_hand/6.png b/public/images/emoji/google/raising_hand/6.png
index fb799887687..d5ccdd78b6d 100644
Binary files a/public/images/emoji/google/raising_hand/6.png and b/public/images/emoji/google/raising_hand/6.png differ
diff --git a/public/images/emoji/google/raising_hand_man.png b/public/images/emoji/google/raising_hand_man.png
index 268f7a5236e..0d2e1c82e0d 100644
Binary files a/public/images/emoji/google/raising_hand_man.png and b/public/images/emoji/google/raising_hand_man.png differ
diff --git a/public/images/emoji/google/raising_hand_man/2.png b/public/images/emoji/google/raising_hand_man/2.png
index 79002d2fec8..ff2411b1053 100644
Binary files a/public/images/emoji/google/raising_hand_man/2.png and b/public/images/emoji/google/raising_hand_man/2.png differ
diff --git a/public/images/emoji/google/raising_hand_man/3.png b/public/images/emoji/google/raising_hand_man/3.png
index 8983fe4677c..f67bfa954bc 100644
Binary files a/public/images/emoji/google/raising_hand_man/3.png and b/public/images/emoji/google/raising_hand_man/3.png differ
diff --git a/public/images/emoji/google/raising_hand_man/4.png b/public/images/emoji/google/raising_hand_man/4.png
index 274389fca0c..c8e7b7dee6c 100644
Binary files a/public/images/emoji/google/raising_hand_man/4.png and b/public/images/emoji/google/raising_hand_man/4.png differ
diff --git a/public/images/emoji/google/raising_hand_man/5.png b/public/images/emoji/google/raising_hand_man/5.png
index ae8b451a195..a3645d58f9b 100644
Binary files a/public/images/emoji/google/raising_hand_man/5.png and b/public/images/emoji/google/raising_hand_man/5.png differ
diff --git a/public/images/emoji/google/raising_hand_man/6.png b/public/images/emoji/google/raising_hand_man/6.png
index 7eb18142ed2..3c4bad3a0ba 100644
Binary files a/public/images/emoji/google/raising_hand_man/6.png and b/public/images/emoji/google/raising_hand_man/6.png differ
diff --git a/public/images/emoji/google/raising_hand_woman.png b/public/images/emoji/google/raising_hand_woman.png
index 72ea7e6bd70..96a4c2b148f 100644
Binary files a/public/images/emoji/google/raising_hand_woman.png and b/public/images/emoji/google/raising_hand_woman.png differ
diff --git a/public/images/emoji/google/raising_hand_woman/2.png b/public/images/emoji/google/raising_hand_woman/2.png
index 110f5edf80e..9a8b0b0398e 100644
Binary files a/public/images/emoji/google/raising_hand_woman/2.png and b/public/images/emoji/google/raising_hand_woman/2.png differ
diff --git a/public/images/emoji/google/raising_hand_woman/3.png b/public/images/emoji/google/raising_hand_woman/3.png
index 5fc1015a025..28ce85f8912 100644
Binary files a/public/images/emoji/google/raising_hand_woman/3.png and b/public/images/emoji/google/raising_hand_woman/3.png differ
diff --git a/public/images/emoji/google/raising_hand_woman/4.png b/public/images/emoji/google/raising_hand_woman/4.png
index 022eb60392f..d6e2bfb18e3 100644
Binary files a/public/images/emoji/google/raising_hand_woman/4.png and b/public/images/emoji/google/raising_hand_woman/4.png differ
diff --git a/public/images/emoji/google/raising_hand_woman/5.png b/public/images/emoji/google/raising_hand_woman/5.png
index 76bad2a8938..d1e7919136c 100644
Binary files a/public/images/emoji/google/raising_hand_woman/5.png and b/public/images/emoji/google/raising_hand_woman/5.png differ
diff --git a/public/images/emoji/google/raising_hand_woman/6.png b/public/images/emoji/google/raising_hand_woman/6.png
index fb799887687..d5ccdd78b6d 100644
Binary files a/public/images/emoji/google/raising_hand_woman/6.png and b/public/images/emoji/google/raising_hand_woman/6.png differ
diff --git a/public/images/emoji/google/ram.png b/public/images/emoji/google/ram.png
index c79fd6878a1..9fb9628a5a8 100644
Binary files a/public/images/emoji/google/ram.png and b/public/images/emoji/google/ram.png differ
diff --git a/public/images/emoji/google/ramen.png b/public/images/emoji/google/ramen.png
index 029ccc226c4..ae507fd1df4 100644
Binary files a/public/images/emoji/google/ramen.png and b/public/images/emoji/google/ramen.png differ
diff --git a/public/images/emoji/google/rat.png b/public/images/emoji/google/rat.png
index 01ab9f59450..0dd92253dc1 100644
Binary files a/public/images/emoji/google/rat.png and b/public/images/emoji/google/rat.png differ
diff --git a/public/images/emoji/google/record_button.png b/public/images/emoji/google/record_button.png
index b8c614bb0c0..e82b55b21b4 100644
Binary files a/public/images/emoji/google/record_button.png and b/public/images/emoji/google/record_button.png differ
diff --git a/public/images/emoji/google/recycle.png b/public/images/emoji/google/recycle.png
index 0d1c9d45a4d..6058f1eda67 100644
Binary files a/public/images/emoji/google/recycle.png and b/public/images/emoji/google/recycle.png differ
diff --git a/public/images/emoji/google/red_car.png b/public/images/emoji/google/red_car.png
index f1184f7d47e..b57c33d210e 100644
Binary files a/public/images/emoji/google/red_car.png and b/public/images/emoji/google/red_car.png differ
diff --git a/public/images/emoji/google/red_circle.png b/public/images/emoji/google/red_circle.png
index 3d750cab491..dc7cdfef397 100644
Binary files a/public/images/emoji/google/red_circle.png and b/public/images/emoji/google/red_circle.png differ
diff --git a/public/images/emoji/google/registered.png b/public/images/emoji/google/registered.png
index ba6ad077210..744b55c9680 100644
Binary files a/public/images/emoji/google/registered.png and b/public/images/emoji/google/registered.png differ
diff --git a/public/images/emoji/google/relaxed.png b/public/images/emoji/google/relaxed.png
index d68bd3607fc..cb971a027e1 100644
Binary files a/public/images/emoji/google/relaxed.png and b/public/images/emoji/google/relaxed.png differ
diff --git a/public/images/emoji/google/relieved.png b/public/images/emoji/google/relieved.png
index bdf352d1324..363596dd5cb 100644
Binary files a/public/images/emoji/google/relieved.png and b/public/images/emoji/google/relieved.png differ
diff --git a/public/images/emoji/google/reminder_ribbon.png b/public/images/emoji/google/reminder_ribbon.png
index fe8d47927da..6464fd8f7de 100644
Binary files a/public/images/emoji/google/reminder_ribbon.png and b/public/images/emoji/google/reminder_ribbon.png differ
diff --git a/public/images/emoji/google/repeat.png b/public/images/emoji/google/repeat.png
index 650c52935cd..a62308dc77e 100644
Binary files a/public/images/emoji/google/repeat.png and b/public/images/emoji/google/repeat.png differ
diff --git a/public/images/emoji/google/repeat_one.png b/public/images/emoji/google/repeat_one.png
index 92240cc2c49..714c35cad57 100644
Binary files a/public/images/emoji/google/repeat_one.png and b/public/images/emoji/google/repeat_one.png differ
diff --git a/public/images/emoji/google/rescue_worker_helmet.png b/public/images/emoji/google/rescue_worker_helmet.png
index e1306b90dc3..8d3d37d3eaf 100644
Binary files a/public/images/emoji/google/rescue_worker_helmet.png and b/public/images/emoji/google/rescue_worker_helmet.png differ
diff --git a/public/images/emoji/google/restroom.png b/public/images/emoji/google/restroom.png
index 7c2b5160a63..1ffe8d00658 100644
Binary files a/public/images/emoji/google/restroom.png and b/public/images/emoji/google/restroom.png differ
diff --git a/public/images/emoji/google/reunion.png b/public/images/emoji/google/reunion.png
index dad0f8ce650..4faf7e252ef 100644
Binary files a/public/images/emoji/google/reunion.png and b/public/images/emoji/google/reunion.png differ
diff --git a/public/images/emoji/google/reversed_hand_with_middle_finger_extended.png b/public/images/emoji/google/reversed_hand_with_middle_finger_extended.png
index 8ce128b147d..71e8d8b3e9c 100644
Binary files a/public/images/emoji/google/reversed_hand_with_middle_finger_extended.png and b/public/images/emoji/google/reversed_hand_with_middle_finger_extended.png differ
diff --git a/public/images/emoji/google/reversed_hand_with_middle_finger_extended/2.png b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/2.png
index 3313e7e2f07..da4e50ac5e1 100644
Binary files a/public/images/emoji/google/reversed_hand_with_middle_finger_extended/2.png and b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/2.png differ
diff --git a/public/images/emoji/google/reversed_hand_with_middle_finger_extended/3.png b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/3.png
index 916b42be04a..785bc194551 100644
Binary files a/public/images/emoji/google/reversed_hand_with_middle_finger_extended/3.png and b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/3.png differ
diff --git a/public/images/emoji/google/reversed_hand_with_middle_finger_extended/4.png b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/4.png
index 7ab3507e2cd..f55cc136fc4 100644
Binary files a/public/images/emoji/google/reversed_hand_with_middle_finger_extended/4.png and b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/4.png differ
diff --git a/public/images/emoji/google/reversed_hand_with_middle_finger_extended/5.png b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/5.png
index aeb15696e62..a2ed1b0443a 100644
Binary files a/public/images/emoji/google/reversed_hand_with_middle_finger_extended/5.png and b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/5.png differ
diff --git a/public/images/emoji/google/reversed_hand_with_middle_finger_extended/6.png b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/6.png
index 8e864665145..cf73dfc6402 100644
Binary files a/public/images/emoji/google/reversed_hand_with_middle_finger_extended/6.png and b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/6.png differ
diff --git a/public/images/emoji/google/revolving_hearts.png b/public/images/emoji/google/revolving_hearts.png
index c4e9aae2155..bb76af83535 100644
Binary files a/public/images/emoji/google/revolving_hearts.png and b/public/images/emoji/google/revolving_hearts.png differ
diff --git a/public/images/emoji/google/rewind.png b/public/images/emoji/google/rewind.png
index e88ecfcd92e..cd0363422b4 100644
Binary files a/public/images/emoji/google/rewind.png and b/public/images/emoji/google/rewind.png differ
diff --git a/public/images/emoji/google/rhinoceros.png b/public/images/emoji/google/rhinoceros.png
index 438c4c6b2e3..fbb1a761324 100644
Binary files a/public/images/emoji/google/rhinoceros.png and b/public/images/emoji/google/rhinoceros.png differ
diff --git a/public/images/emoji/google/ribbon.png b/public/images/emoji/google/ribbon.png
index 86fa7f01cd4..d67963e857f 100644
Binary files a/public/images/emoji/google/ribbon.png and b/public/images/emoji/google/ribbon.png differ
diff --git a/public/images/emoji/google/rice.png b/public/images/emoji/google/rice.png
index 9ad2d64fe3e..22fdceeda60 100644
Binary files a/public/images/emoji/google/rice.png and b/public/images/emoji/google/rice.png differ
diff --git a/public/images/emoji/google/rice_ball.png b/public/images/emoji/google/rice_ball.png
index 6ac20600510..5251001691c 100644
Binary files a/public/images/emoji/google/rice_ball.png and b/public/images/emoji/google/rice_ball.png differ
diff --git a/public/images/emoji/google/rice_cracker.png b/public/images/emoji/google/rice_cracker.png
index 62da6d7ab51..73a04eaf775 100644
Binary files a/public/images/emoji/google/rice_cracker.png and b/public/images/emoji/google/rice_cracker.png differ
diff --git a/public/images/emoji/google/rice_scene.png b/public/images/emoji/google/rice_scene.png
index 7d05cb36043..623ca5c0db7 100644
Binary files a/public/images/emoji/google/rice_scene.png and b/public/images/emoji/google/rice_scene.png differ
diff --git a/public/images/emoji/google/right_anger_bubble.png b/public/images/emoji/google/right_anger_bubble.png
index 27b4462cbb4..9ba99a5b358 100644
Binary files a/public/images/emoji/google/right_anger_bubble.png and b/public/images/emoji/google/right_anger_bubble.png differ
diff --git a/public/images/emoji/google/ring.png b/public/images/emoji/google/ring.png
index 5b547518912..e7f4193fe70 100644
Binary files a/public/images/emoji/google/ring.png and b/public/images/emoji/google/ring.png differ
diff --git a/public/images/emoji/google/robot.png b/public/images/emoji/google/robot.png
index d65ed7bb331..efc8bfc3403 100644
Binary files a/public/images/emoji/google/robot.png and b/public/images/emoji/google/robot.png differ
diff --git a/public/images/emoji/google/robot_face.png b/public/images/emoji/google/robot_face.png
index d65ed7bb331..efc8bfc3403 100644
Binary files a/public/images/emoji/google/robot_face.png and b/public/images/emoji/google/robot_face.png differ
diff --git a/public/images/emoji/google/rocket.png b/public/images/emoji/google/rocket.png
index de37e29dff1..25c442966fe 100644
Binary files a/public/images/emoji/google/rocket.png and b/public/images/emoji/google/rocket.png differ
diff --git a/public/images/emoji/google/rofl.png b/public/images/emoji/google/rofl.png
index c0e4eee11f4..047f61002fd 100644
Binary files a/public/images/emoji/google/rofl.png and b/public/images/emoji/google/rofl.png differ
diff --git a/public/images/emoji/google/roll_eyes.png b/public/images/emoji/google/roll_eyes.png
index 8485fcbe1cc..55577e34a98 100644
Binary files a/public/images/emoji/google/roll_eyes.png and b/public/images/emoji/google/roll_eyes.png differ
diff --git a/public/images/emoji/google/rolled_up_newspaper.png b/public/images/emoji/google/rolled_up_newspaper.png
index 13fb2454713..3cdda353aca 100644
Binary files a/public/images/emoji/google/rolled_up_newspaper.png and b/public/images/emoji/google/rolled_up_newspaper.png differ
diff --git a/public/images/emoji/google/roller_coaster.png b/public/images/emoji/google/roller_coaster.png
index 70e2c112ea7..3c40783864f 100644
Binary files a/public/images/emoji/google/roller_coaster.png and b/public/images/emoji/google/roller_coaster.png differ
diff --git a/public/images/emoji/google/rolling_eyes.png b/public/images/emoji/google/rolling_eyes.png
index 8485fcbe1cc..55577e34a98 100644
Binary files a/public/images/emoji/google/rolling_eyes.png and b/public/images/emoji/google/rolling_eyes.png differ
diff --git a/public/images/emoji/google/romania.png b/public/images/emoji/google/romania.png
index 898174d640d..1fe9c40916d 100644
Binary files a/public/images/emoji/google/romania.png and b/public/images/emoji/google/romania.png differ
diff --git a/public/images/emoji/google/rooster.png b/public/images/emoji/google/rooster.png
index 1a4a6bf2f69..72917b8397a 100644
Binary files a/public/images/emoji/google/rooster.png and b/public/images/emoji/google/rooster.png differ
diff --git a/public/images/emoji/google/rose.png b/public/images/emoji/google/rose.png
index 5dfe4d8a42f..aee576a9bf7 100644
Binary files a/public/images/emoji/google/rose.png and b/public/images/emoji/google/rose.png differ
diff --git a/public/images/emoji/google/rosette.png b/public/images/emoji/google/rosette.png
index 784fd522700..85f9409308c 100644
Binary files a/public/images/emoji/google/rosette.png and b/public/images/emoji/google/rosette.png differ
diff --git a/public/images/emoji/google/rotating_light.png b/public/images/emoji/google/rotating_light.png
index 0abf3669b03..49ffae8ea7b 100644
Binary files a/public/images/emoji/google/rotating_light.png and b/public/images/emoji/google/rotating_light.png differ
diff --git a/public/images/emoji/google/round_pushpin.png b/public/images/emoji/google/round_pushpin.png
index d0f5f58a5b9..f17c6ab799a 100644
Binary files a/public/images/emoji/google/round_pushpin.png and b/public/images/emoji/google/round_pushpin.png differ
diff --git a/public/images/emoji/google/rowboat.png b/public/images/emoji/google/rowboat.png
index 01e3f04148e..7e8acc54412 100644
Binary files a/public/images/emoji/google/rowboat.png and b/public/images/emoji/google/rowboat.png differ
diff --git a/public/images/emoji/google/rowboat/2.png b/public/images/emoji/google/rowboat/2.png
index 0845805397f..092ad2f7331 100644
Binary files a/public/images/emoji/google/rowboat/2.png and b/public/images/emoji/google/rowboat/2.png differ
diff --git a/public/images/emoji/google/rowboat/3.png b/public/images/emoji/google/rowboat/3.png
index 670f5ef3093..748a3c624ee 100644
Binary files a/public/images/emoji/google/rowboat/3.png and b/public/images/emoji/google/rowboat/3.png differ
diff --git a/public/images/emoji/google/rowboat/4.png b/public/images/emoji/google/rowboat/4.png
index 00d83be28ec..8b77d3d4771 100644
Binary files a/public/images/emoji/google/rowboat/4.png and b/public/images/emoji/google/rowboat/4.png differ
diff --git a/public/images/emoji/google/rowboat/5.png b/public/images/emoji/google/rowboat/5.png
index c01f2289d4b..d9e7e76d2cb 100644
Binary files a/public/images/emoji/google/rowboat/5.png and b/public/images/emoji/google/rowboat/5.png differ
diff --git a/public/images/emoji/google/rowboat/6.png b/public/images/emoji/google/rowboat/6.png
index 76b008246dd..1c6a43b6c8d 100644
Binary files a/public/images/emoji/google/rowboat/6.png and b/public/images/emoji/google/rowboat/6.png differ
diff --git a/public/images/emoji/google/rowing_man.png b/public/images/emoji/google/rowing_man.png
index 01e3f04148e..7e8acc54412 100644
Binary files a/public/images/emoji/google/rowing_man.png and b/public/images/emoji/google/rowing_man.png differ
diff --git a/public/images/emoji/google/rowing_man/2.png b/public/images/emoji/google/rowing_man/2.png
index 0845805397f..092ad2f7331 100644
Binary files a/public/images/emoji/google/rowing_man/2.png and b/public/images/emoji/google/rowing_man/2.png differ
diff --git a/public/images/emoji/google/rowing_man/3.png b/public/images/emoji/google/rowing_man/3.png
index 670f5ef3093..748a3c624ee 100644
Binary files a/public/images/emoji/google/rowing_man/3.png and b/public/images/emoji/google/rowing_man/3.png differ
diff --git a/public/images/emoji/google/rowing_man/4.png b/public/images/emoji/google/rowing_man/4.png
index 00d83be28ec..8b77d3d4771 100644
Binary files a/public/images/emoji/google/rowing_man/4.png and b/public/images/emoji/google/rowing_man/4.png differ
diff --git a/public/images/emoji/google/rowing_man/5.png b/public/images/emoji/google/rowing_man/5.png
index c01f2289d4b..d9e7e76d2cb 100644
Binary files a/public/images/emoji/google/rowing_man/5.png and b/public/images/emoji/google/rowing_man/5.png differ
diff --git a/public/images/emoji/google/rowing_man/6.png b/public/images/emoji/google/rowing_man/6.png
index 76b008246dd..1c6a43b6c8d 100644
Binary files a/public/images/emoji/google/rowing_man/6.png and b/public/images/emoji/google/rowing_man/6.png differ
diff --git a/public/images/emoji/google/rowing_woman.png b/public/images/emoji/google/rowing_woman.png
index 4fe824a2b93..03fbe7b97c7 100644
Binary files a/public/images/emoji/google/rowing_woman.png and b/public/images/emoji/google/rowing_woman.png differ
diff --git a/public/images/emoji/google/rowing_woman/2.png b/public/images/emoji/google/rowing_woman/2.png
index b83bbb6e81c..b3f8d9fc5ce 100644
Binary files a/public/images/emoji/google/rowing_woman/2.png and b/public/images/emoji/google/rowing_woman/2.png differ
diff --git a/public/images/emoji/google/rowing_woman/3.png b/public/images/emoji/google/rowing_woman/3.png
index 93fef46fea4..85ae2a7111c 100644
Binary files a/public/images/emoji/google/rowing_woman/3.png and b/public/images/emoji/google/rowing_woman/3.png differ
diff --git a/public/images/emoji/google/rowing_woman/4.png b/public/images/emoji/google/rowing_woman/4.png
index 036d969d884..52e6a2dc6e4 100644
Binary files a/public/images/emoji/google/rowing_woman/4.png and b/public/images/emoji/google/rowing_woman/4.png differ
diff --git a/public/images/emoji/google/rowing_woman/5.png b/public/images/emoji/google/rowing_woman/5.png
index 1a0f5d5b6d5..a2e00a062f8 100644
Binary files a/public/images/emoji/google/rowing_woman/5.png and b/public/images/emoji/google/rowing_woman/5.png differ
diff --git a/public/images/emoji/google/rowing_woman/6.png b/public/images/emoji/google/rowing_woman/6.png
index 17841ebb877..7df3771c1d6 100644
Binary files a/public/images/emoji/google/rowing_woman/6.png and b/public/images/emoji/google/rowing_woman/6.png differ
diff --git a/public/images/emoji/google/ru.png b/public/images/emoji/google/ru.png
index a92bbdbb8a7..f42d2705cf8 100644
Binary files a/public/images/emoji/google/ru.png and b/public/images/emoji/google/ru.png differ
diff --git a/public/images/emoji/google/rugby_football.png b/public/images/emoji/google/rugby_football.png
index b8a0b8f62dd..0b417bd28cf 100644
Binary files a/public/images/emoji/google/rugby_football.png and b/public/images/emoji/google/rugby_football.png differ
diff --git a/public/images/emoji/google/runner.png b/public/images/emoji/google/runner.png
index 86592f29758..cc56401f9b2 100644
Binary files a/public/images/emoji/google/runner.png and b/public/images/emoji/google/runner.png differ
diff --git a/public/images/emoji/google/runner/2.png b/public/images/emoji/google/runner/2.png
index 546cb4791d4..71e01490936 100644
Binary files a/public/images/emoji/google/runner/2.png and b/public/images/emoji/google/runner/2.png differ
diff --git a/public/images/emoji/google/runner/3.png b/public/images/emoji/google/runner/3.png
index 635f3203ef8..3f9e444eaad 100644
Binary files a/public/images/emoji/google/runner/3.png and b/public/images/emoji/google/runner/3.png differ
diff --git a/public/images/emoji/google/runner/4.png b/public/images/emoji/google/runner/4.png
index 97d2cc1e034..0c609ca247b 100644
Binary files a/public/images/emoji/google/runner/4.png and b/public/images/emoji/google/runner/4.png differ
diff --git a/public/images/emoji/google/runner/5.png b/public/images/emoji/google/runner/5.png
index 678a308cc47..1dd8d9fd3ea 100644
Binary files a/public/images/emoji/google/runner/5.png and b/public/images/emoji/google/runner/5.png differ
diff --git a/public/images/emoji/google/runner/6.png b/public/images/emoji/google/runner/6.png
index 2f012dee701..849ce0542ca 100644
Binary files a/public/images/emoji/google/runner/6.png and b/public/images/emoji/google/runner/6.png differ
diff --git a/public/images/emoji/google/running_man.png b/public/images/emoji/google/running_man.png
index 86592f29758..cc56401f9b2 100644
Binary files a/public/images/emoji/google/running_man.png and b/public/images/emoji/google/running_man.png differ
diff --git a/public/images/emoji/google/running_man/2.png b/public/images/emoji/google/running_man/2.png
index 546cb4791d4..71e01490936 100644
Binary files a/public/images/emoji/google/running_man/2.png and b/public/images/emoji/google/running_man/2.png differ
diff --git a/public/images/emoji/google/running_man/3.png b/public/images/emoji/google/running_man/3.png
index 635f3203ef8..3f9e444eaad 100644
Binary files a/public/images/emoji/google/running_man/3.png and b/public/images/emoji/google/running_man/3.png differ
diff --git a/public/images/emoji/google/running_man/4.png b/public/images/emoji/google/running_man/4.png
index 97d2cc1e034..0c609ca247b 100644
Binary files a/public/images/emoji/google/running_man/4.png and b/public/images/emoji/google/running_man/4.png differ
diff --git a/public/images/emoji/google/running_man/5.png b/public/images/emoji/google/running_man/5.png
index 678a308cc47..1dd8d9fd3ea 100644
Binary files a/public/images/emoji/google/running_man/5.png and b/public/images/emoji/google/running_man/5.png differ
diff --git a/public/images/emoji/google/running_man/6.png b/public/images/emoji/google/running_man/6.png
index 2f012dee701..849ce0542ca 100644
Binary files a/public/images/emoji/google/running_man/6.png and b/public/images/emoji/google/running_man/6.png differ
diff --git a/public/images/emoji/google/running_shirt_with_sash.png b/public/images/emoji/google/running_shirt_with_sash.png
index c1ff4c4d34d..4bd73a93547 100644
Binary files a/public/images/emoji/google/running_shirt_with_sash.png and b/public/images/emoji/google/running_shirt_with_sash.png differ
diff --git a/public/images/emoji/google/running_woman.png b/public/images/emoji/google/running_woman.png
index d5908236a3e..a8f12eae56b 100644
Binary files a/public/images/emoji/google/running_woman.png and b/public/images/emoji/google/running_woman.png differ
diff --git a/public/images/emoji/google/running_woman/2.png b/public/images/emoji/google/running_woman/2.png
index f6b51471f82..983395d1792 100644
Binary files a/public/images/emoji/google/running_woman/2.png and b/public/images/emoji/google/running_woman/2.png differ
diff --git a/public/images/emoji/google/running_woman/3.png b/public/images/emoji/google/running_woman/3.png
index b1a8400b208..c7bc28a0102 100644
Binary files a/public/images/emoji/google/running_woman/3.png and b/public/images/emoji/google/running_woman/3.png differ
diff --git a/public/images/emoji/google/running_woman/4.png b/public/images/emoji/google/running_woman/4.png
index 9899a688fa6..bbbc76306b9 100644
Binary files a/public/images/emoji/google/running_woman/4.png and b/public/images/emoji/google/running_woman/4.png differ
diff --git a/public/images/emoji/google/running_woman/5.png b/public/images/emoji/google/running_woman/5.png
index 2c2c34bc600..51bd8fc87be 100644
Binary files a/public/images/emoji/google/running_woman/5.png and b/public/images/emoji/google/running_woman/5.png differ
diff --git a/public/images/emoji/google/running_woman/6.png b/public/images/emoji/google/running_woman/6.png
index 45633617962..b647ec30cd4 100644
Binary files a/public/images/emoji/google/running_woman/6.png and b/public/images/emoji/google/running_woman/6.png differ
diff --git a/public/images/emoji/google/rwanda.png b/public/images/emoji/google/rwanda.png
index 4bbe4a97780..85b83fb107a 100644
Binary files a/public/images/emoji/google/rwanda.png and b/public/images/emoji/google/rwanda.png differ
diff --git a/public/images/emoji/google/sa.png b/public/images/emoji/google/sa.png
index 88b8b42a165..a6f433f3fbc 100644
Binary files a/public/images/emoji/google/sa.png and b/public/images/emoji/google/sa.png differ
diff --git a/public/images/emoji/google/sagittarius.png b/public/images/emoji/google/sagittarius.png
index 5c020b111aa..f54041679a6 100644
Binary files a/public/images/emoji/google/sagittarius.png and b/public/images/emoji/google/sagittarius.png differ
diff --git a/public/images/emoji/google/sailboat.png b/public/images/emoji/google/sailboat.png
index c10b6a24ccc..e80c768d224 100644
Binary files a/public/images/emoji/google/sailboat.png and b/public/images/emoji/google/sailboat.png differ
diff --git a/public/images/emoji/google/sake.png b/public/images/emoji/google/sake.png
index f9975bda7f0..525fa28751c 100644
Binary files a/public/images/emoji/google/sake.png and b/public/images/emoji/google/sake.png differ
diff --git a/public/images/emoji/google/samoa.png b/public/images/emoji/google/samoa.png
index 6f56f82623b..34ebac11101 100644
Binary files a/public/images/emoji/google/samoa.png and b/public/images/emoji/google/samoa.png differ
diff --git a/public/images/emoji/google/san_marino.png b/public/images/emoji/google/san_marino.png
index 18aa756e026..d5f8895dd6e 100644
Binary files a/public/images/emoji/google/san_marino.png and b/public/images/emoji/google/san_marino.png differ
diff --git a/public/images/emoji/google/sandal.png b/public/images/emoji/google/sandal.png
index ab091981b85..809f5f3fd4c 100644
Binary files a/public/images/emoji/google/sandal.png and b/public/images/emoji/google/sandal.png differ
diff --git a/public/images/emoji/google/sandwich.png b/public/images/emoji/google/sandwich.png
index 37dbc0c81eb..e602240b1e4 100644
Binary files a/public/images/emoji/google/sandwich.png and b/public/images/emoji/google/sandwich.png differ
diff --git a/public/images/emoji/google/santa.png b/public/images/emoji/google/santa.png
index 38c66269e07..85a8bed419d 100644
Binary files a/public/images/emoji/google/santa.png and b/public/images/emoji/google/santa.png differ
diff --git a/public/images/emoji/google/santa/2.png b/public/images/emoji/google/santa/2.png
index cf273d91793..f76865b839f 100644
Binary files a/public/images/emoji/google/santa/2.png and b/public/images/emoji/google/santa/2.png differ
diff --git a/public/images/emoji/google/santa/3.png b/public/images/emoji/google/santa/3.png
index 46c7989b346..f1134e0b8d1 100644
Binary files a/public/images/emoji/google/santa/3.png and b/public/images/emoji/google/santa/3.png differ
diff --git a/public/images/emoji/google/santa/4.png b/public/images/emoji/google/santa/4.png
index d5f6bfc1133..b6fd36e84c7 100644
Binary files a/public/images/emoji/google/santa/4.png and b/public/images/emoji/google/santa/4.png differ
diff --git a/public/images/emoji/google/santa/5.png b/public/images/emoji/google/santa/5.png
index 791442b674f..5987fdc060e 100644
Binary files a/public/images/emoji/google/santa/5.png and b/public/images/emoji/google/santa/5.png differ
diff --git a/public/images/emoji/google/santa/6.png b/public/images/emoji/google/santa/6.png
index 1d98e5de0d7..e33ad8a435a 100644
Binary files a/public/images/emoji/google/santa/6.png and b/public/images/emoji/google/santa/6.png differ
diff --git a/public/images/emoji/google/sao_tome_principe.png b/public/images/emoji/google/sao_tome_principe.png
index 10a206cd598..6cda2118f92 100644
Binary files a/public/images/emoji/google/sao_tome_principe.png and b/public/images/emoji/google/sao_tome_principe.png differ
diff --git a/public/images/emoji/google/satellite.png b/public/images/emoji/google/satellite.png
index 1a8fea811c9..c529409ae3b 100644
Binary files a/public/images/emoji/google/satellite.png and b/public/images/emoji/google/satellite.png differ
diff --git a/public/images/emoji/google/satellite_orbital.png b/public/images/emoji/google/satellite_orbital.png
index 6b94efd773e..8f60cf4fc4b 100644
Binary files a/public/images/emoji/google/satellite_orbital.png and b/public/images/emoji/google/satellite_orbital.png differ
diff --git a/public/images/emoji/google/satisfied.png b/public/images/emoji/google/satisfied.png
index 1b64148f973..2fdeacfbbcb 100644
Binary files a/public/images/emoji/google/satisfied.png and b/public/images/emoji/google/satisfied.png differ
diff --git a/public/images/emoji/google/saudi_arabia.png b/public/images/emoji/google/saudi_arabia.png
index 6282420b70a..62a83e09cc6 100644
Binary files a/public/images/emoji/google/saudi_arabia.png and b/public/images/emoji/google/saudi_arabia.png differ
diff --git a/public/images/emoji/google/sauropod.png b/public/images/emoji/google/sauropod.png
index aa85e189ac8..12b0a2f966d 100644
Binary files a/public/images/emoji/google/sauropod.png and b/public/images/emoji/google/sauropod.png differ
diff --git a/public/images/emoji/google/saxophone.png b/public/images/emoji/google/saxophone.png
index 663c56cd02c..60d7d1917af 100644
Binary files a/public/images/emoji/google/saxophone.png and b/public/images/emoji/google/saxophone.png differ
diff --git a/public/images/emoji/google/scales.png b/public/images/emoji/google/scales.png
index b13e29f36c2..179fce72575 100644
Binary files a/public/images/emoji/google/scales.png and b/public/images/emoji/google/scales.png differ
diff --git a/public/images/emoji/google/scarf.png b/public/images/emoji/google/scarf.png
index 597ecba8ec9..87f561fc752 100644
Binary files a/public/images/emoji/google/scarf.png and b/public/images/emoji/google/scarf.png differ
diff --git a/public/images/emoji/google/school.png b/public/images/emoji/google/school.png
index 7e9102aafba..0f166fd45df 100644
Binary files a/public/images/emoji/google/school.png and b/public/images/emoji/google/school.png differ
diff --git a/public/images/emoji/google/school_satchel.png b/public/images/emoji/google/school_satchel.png
index 8948df417fa..72303930de4 100644
Binary files a/public/images/emoji/google/school_satchel.png and b/public/images/emoji/google/school_satchel.png differ
diff --git a/public/images/emoji/google/scissors.png b/public/images/emoji/google/scissors.png
index e7e2187f88e..10ace8ca7b0 100644
Binary files a/public/images/emoji/google/scissors.png and b/public/images/emoji/google/scissors.png differ
diff --git a/public/images/emoji/google/scorpion.png b/public/images/emoji/google/scorpion.png
index 0dbc1a62874..05355917496 100644
Binary files a/public/images/emoji/google/scorpion.png and b/public/images/emoji/google/scorpion.png differ
diff --git a/public/images/emoji/google/scorpius.png b/public/images/emoji/google/scorpius.png
index cf32395936e..af75a5b21b9 100644
Binary files a/public/images/emoji/google/scorpius.png and b/public/images/emoji/google/scorpius.png differ
diff --git a/public/images/emoji/google/scream.png b/public/images/emoji/google/scream.png
index 33a272b8441..48b36234768 100644
Binary files a/public/images/emoji/google/scream.png and b/public/images/emoji/google/scream.png differ
diff --git a/public/images/emoji/google/scream_cat.png b/public/images/emoji/google/scream_cat.png
index 6e99397d585..a4d252e85db 100644
Binary files a/public/images/emoji/google/scream_cat.png and b/public/images/emoji/google/scream_cat.png differ
diff --git a/public/images/emoji/google/scroll.png b/public/images/emoji/google/scroll.png
index 029314138ae..94d259b5c99 100644
Binary files a/public/images/emoji/google/scroll.png and b/public/images/emoji/google/scroll.png differ
diff --git a/public/images/emoji/google/seat.png b/public/images/emoji/google/seat.png
index b8af47c1d7e..58846847626 100644
Binary files a/public/images/emoji/google/seat.png and b/public/images/emoji/google/seat.png differ
diff --git a/public/images/emoji/google/secret.png b/public/images/emoji/google/secret.png
index b095eae8861..624efa4bc68 100644
Binary files a/public/images/emoji/google/secret.png and b/public/images/emoji/google/secret.png differ
diff --git a/public/images/emoji/google/see_no_evil.png b/public/images/emoji/google/see_no_evil.png
index 2a7a930b26c..0e2efd450d1 100644
Binary files a/public/images/emoji/google/see_no_evil.png and b/public/images/emoji/google/see_no_evil.png differ
diff --git a/public/images/emoji/google/seedling.png b/public/images/emoji/google/seedling.png
index eb787b4d2af..76962e82520 100644
Binary files a/public/images/emoji/google/seedling.png and b/public/images/emoji/google/seedling.png differ
diff --git a/public/images/emoji/google/selfie.png b/public/images/emoji/google/selfie.png
index 05126770ad8..d8a24342356 100644
Binary files a/public/images/emoji/google/selfie.png and b/public/images/emoji/google/selfie.png differ
diff --git a/public/images/emoji/google/selfie/2.png b/public/images/emoji/google/selfie/2.png
index 0145a3946d9..2480ca28192 100644
Binary files a/public/images/emoji/google/selfie/2.png and b/public/images/emoji/google/selfie/2.png differ
diff --git a/public/images/emoji/google/selfie/3.png b/public/images/emoji/google/selfie/3.png
index 917474197d9..2434d11d797 100644
Binary files a/public/images/emoji/google/selfie/3.png and b/public/images/emoji/google/selfie/3.png differ
diff --git a/public/images/emoji/google/selfie/4.png b/public/images/emoji/google/selfie/4.png
index 17a6d18372e..b7efd58061d 100644
Binary files a/public/images/emoji/google/selfie/4.png and b/public/images/emoji/google/selfie/4.png differ
diff --git a/public/images/emoji/google/selfie/5.png b/public/images/emoji/google/selfie/5.png
index 6f17c4b78ff..30c5dac6096 100644
Binary files a/public/images/emoji/google/selfie/5.png and b/public/images/emoji/google/selfie/5.png differ
diff --git a/public/images/emoji/google/selfie/6.png b/public/images/emoji/google/selfie/6.png
index 34b10c5b5e2..d6f81418c3c 100644
Binary files a/public/images/emoji/google/selfie/6.png and b/public/images/emoji/google/selfie/6.png differ
diff --git a/public/images/emoji/google/senegal.png b/public/images/emoji/google/senegal.png
index 4ab925eace3..e6421d59ed1 100644
Binary files a/public/images/emoji/google/senegal.png and b/public/images/emoji/google/senegal.png differ
diff --git a/public/images/emoji/google/serbia.png b/public/images/emoji/google/serbia.png
index 4207dfd6f82..c7f08aabf64 100644
Binary files a/public/images/emoji/google/serbia.png and b/public/images/emoji/google/serbia.png differ
diff --git a/public/images/emoji/google/seven.png b/public/images/emoji/google/seven.png
index e9ad2080000..dc175f12435 100644
Binary files a/public/images/emoji/google/seven.png and b/public/images/emoji/google/seven.png differ
diff --git a/public/images/emoji/google/seychelles.png b/public/images/emoji/google/seychelles.png
index 9d95603b802..1974c8861b2 100644
Binary files a/public/images/emoji/google/seychelles.png and b/public/images/emoji/google/seychelles.png differ
diff --git a/public/images/emoji/google/shallow_pan_of_food.png b/public/images/emoji/google/shallow_pan_of_food.png
index aa16e17fb43..b25a76c85d1 100644
Binary files a/public/images/emoji/google/shallow_pan_of_food.png and b/public/images/emoji/google/shallow_pan_of_food.png differ
diff --git a/public/images/emoji/google/shamrock.png b/public/images/emoji/google/shamrock.png
index 5e974646fa4..e0fb96fcc43 100644
Binary files a/public/images/emoji/google/shamrock.png and b/public/images/emoji/google/shamrock.png differ
diff --git a/public/images/emoji/google/shark.png b/public/images/emoji/google/shark.png
index a8421e10060..7df57eff4c5 100644
Binary files a/public/images/emoji/google/shark.png and b/public/images/emoji/google/shark.png differ
diff --git a/public/images/emoji/google/shaved_ice.png b/public/images/emoji/google/shaved_ice.png
index c2c199eed1a..c08647fe445 100644
Binary files a/public/images/emoji/google/shaved_ice.png and b/public/images/emoji/google/shaved_ice.png differ
diff --git a/public/images/emoji/google/sheep.png b/public/images/emoji/google/sheep.png
index 5fd7a2952cc..62e783dadd5 100644
Binary files a/public/images/emoji/google/sheep.png and b/public/images/emoji/google/sheep.png differ
diff --git a/public/images/emoji/google/shell.png b/public/images/emoji/google/shell.png
index 82a821de447..5c3d10c973e 100644
Binary files a/public/images/emoji/google/shell.png and b/public/images/emoji/google/shell.png differ
diff --git a/public/images/emoji/google/shield.png b/public/images/emoji/google/shield.png
index 5b4713e2084..050fe14fc5b 100644
Binary files a/public/images/emoji/google/shield.png and b/public/images/emoji/google/shield.png differ
diff --git a/public/images/emoji/google/shinto_shrine.png b/public/images/emoji/google/shinto_shrine.png
index 38f34726324..a226f5947e7 100644
Binary files a/public/images/emoji/google/shinto_shrine.png and b/public/images/emoji/google/shinto_shrine.png differ
diff --git a/public/images/emoji/google/ship.png b/public/images/emoji/google/ship.png
index 6e6e94527b2..82a74d11804 100644
Binary files a/public/images/emoji/google/ship.png and b/public/images/emoji/google/ship.png differ
diff --git a/public/images/emoji/google/shirt.png b/public/images/emoji/google/shirt.png
index ef0745cb181..d93268cc4e2 100644
Binary files a/public/images/emoji/google/shirt.png and b/public/images/emoji/google/shirt.png differ
diff --git a/public/images/emoji/google/shit.png b/public/images/emoji/google/shit.png
index b1d921d96c2..de476df01c1 100644
Binary files a/public/images/emoji/google/shit.png and b/public/images/emoji/google/shit.png differ
diff --git a/public/images/emoji/google/shopping.png b/public/images/emoji/google/shopping.png
index ddc2cb76516..4d0d5bfe2b4 100644
Binary files a/public/images/emoji/google/shopping.png and b/public/images/emoji/google/shopping.png differ
diff --git a/public/images/emoji/google/shopping_bags.png b/public/images/emoji/google/shopping_bags.png
index ddc2cb76516..4d0d5bfe2b4 100644
Binary files a/public/images/emoji/google/shopping_bags.png and b/public/images/emoji/google/shopping_bags.png differ
diff --git a/public/images/emoji/google/shopping_cart.png b/public/images/emoji/google/shopping_cart.png
index 81e394561b6..37fdb5ac238 100644
Binary files a/public/images/emoji/google/shopping_cart.png and b/public/images/emoji/google/shopping_cart.png differ
diff --git a/public/images/emoji/google/shower.png b/public/images/emoji/google/shower.png
index 19a13378a84..5036bfeb130 100644
Binary files a/public/images/emoji/google/shower.png and b/public/images/emoji/google/shower.png differ
diff --git a/public/images/emoji/google/shrimp.png b/public/images/emoji/google/shrimp.png
index 7d78c74866a..9f20fcf1d7d 100644
Binary files a/public/images/emoji/google/shrimp.png and b/public/images/emoji/google/shrimp.png differ
diff --git a/public/images/emoji/google/sierra_leone.png b/public/images/emoji/google/sierra_leone.png
index 1718e666023..309f4e33877 100644
Binary files a/public/images/emoji/google/sierra_leone.png and b/public/images/emoji/google/sierra_leone.png differ
diff --git a/public/images/emoji/google/sign_of_the_horns.png b/public/images/emoji/google/sign_of_the_horns.png
index eeac747c65e..8d868d12d5b 100644
Binary files a/public/images/emoji/google/sign_of_the_horns.png and b/public/images/emoji/google/sign_of_the_horns.png differ
diff --git a/public/images/emoji/google/sign_of_the_horns/2.png b/public/images/emoji/google/sign_of_the_horns/2.png
index 614947ba817..310f52dfaca 100644
Binary files a/public/images/emoji/google/sign_of_the_horns/2.png and b/public/images/emoji/google/sign_of_the_horns/2.png differ
diff --git a/public/images/emoji/google/sign_of_the_horns/3.png b/public/images/emoji/google/sign_of_the_horns/3.png
index 2f9891b4805..74809c09468 100644
Binary files a/public/images/emoji/google/sign_of_the_horns/3.png and b/public/images/emoji/google/sign_of_the_horns/3.png differ
diff --git a/public/images/emoji/google/sign_of_the_horns/4.png b/public/images/emoji/google/sign_of_the_horns/4.png
index 44e8fc124cc..11bf6e93c3b 100644
Binary files a/public/images/emoji/google/sign_of_the_horns/4.png and b/public/images/emoji/google/sign_of_the_horns/4.png differ
diff --git a/public/images/emoji/google/sign_of_the_horns/5.png b/public/images/emoji/google/sign_of_the_horns/5.png
index 7016d1f0f82..767f7543d05 100644
Binary files a/public/images/emoji/google/sign_of_the_horns/5.png and b/public/images/emoji/google/sign_of_the_horns/5.png differ
diff --git a/public/images/emoji/google/sign_of_the_horns/6.png b/public/images/emoji/google/sign_of_the_horns/6.png
index 39216902504..f336dca8007 100644
Binary files a/public/images/emoji/google/sign_of_the_horns/6.png and b/public/images/emoji/google/sign_of_the_horns/6.png differ
diff --git a/public/images/emoji/google/signal_strength.png b/public/images/emoji/google/signal_strength.png
index d0c76c4b5c8..80c88538894 100644
Binary files a/public/images/emoji/google/signal_strength.png and b/public/images/emoji/google/signal_strength.png differ
diff --git a/public/images/emoji/google/singapore.png b/public/images/emoji/google/singapore.png
index 170347d34d9..184f6b243d6 100644
Binary files a/public/images/emoji/google/singapore.png and b/public/images/emoji/google/singapore.png differ
diff --git a/public/images/emoji/google/sint_maarten.png b/public/images/emoji/google/sint_maarten.png
index b43ec362126..a7e338f0250 100644
Binary files a/public/images/emoji/google/sint_maarten.png and b/public/images/emoji/google/sint_maarten.png differ
diff --git a/public/images/emoji/google/six.png b/public/images/emoji/google/six.png
index 5972360e7f5..a88e7401fb4 100644
Binary files a/public/images/emoji/google/six.png and b/public/images/emoji/google/six.png differ
diff --git a/public/images/emoji/google/six_pointed_star.png b/public/images/emoji/google/six_pointed_star.png
index 23d2ecd1c48..83f018d0e4f 100644
Binary files a/public/images/emoji/google/six_pointed_star.png and b/public/images/emoji/google/six_pointed_star.png differ
diff --git a/public/images/emoji/google/skeleton.png b/public/images/emoji/google/skeleton.png
index 614ae5c8494..569ca61771a 100644
Binary files a/public/images/emoji/google/skeleton.png and b/public/images/emoji/google/skeleton.png differ
diff --git a/public/images/emoji/google/ski.png b/public/images/emoji/google/ski.png
index 270878a24fa..7791a0ff971 100644
Binary files a/public/images/emoji/google/ski.png and b/public/images/emoji/google/ski.png differ
diff --git a/public/images/emoji/google/skier.png b/public/images/emoji/google/skier.png
index f33dfdfce8b..ff1e017863a 100644
Binary files a/public/images/emoji/google/skier.png and b/public/images/emoji/google/skier.png differ
diff --git a/public/images/emoji/google/skull.png b/public/images/emoji/google/skull.png
index 614ae5c8494..569ca61771a 100644
Binary files a/public/images/emoji/google/skull.png and b/public/images/emoji/google/skull.png differ
diff --git a/public/images/emoji/google/skull_and_crossbones.png b/public/images/emoji/google/skull_and_crossbones.png
index 2a3b044107c..4a4dccb02f3 100644
Binary files a/public/images/emoji/google/skull_and_crossbones.png and b/public/images/emoji/google/skull_and_crossbones.png differ
diff --git a/public/images/emoji/google/skull_crossbones.png b/public/images/emoji/google/skull_crossbones.png
index 2a3b044107c..4a4dccb02f3 100644
Binary files a/public/images/emoji/google/skull_crossbones.png and b/public/images/emoji/google/skull_crossbones.png differ
diff --git a/public/images/emoji/google/sled.png b/public/images/emoji/google/sled.png
index 872e5c23d60..60a1a502e9a 100644
Binary files a/public/images/emoji/google/sled.png and b/public/images/emoji/google/sled.png differ
diff --git a/public/images/emoji/google/sleeping.png b/public/images/emoji/google/sleeping.png
index 2a3f2bd0849..2a5ff936b9e 100644
Binary files a/public/images/emoji/google/sleeping.png and b/public/images/emoji/google/sleeping.png differ
diff --git a/public/images/emoji/google/sleeping_accommodation.png b/public/images/emoji/google/sleeping_accommodation.png
index 90e49164e5a..be40bf9c434 100644
Binary files a/public/images/emoji/google/sleeping_accommodation.png and b/public/images/emoji/google/sleeping_accommodation.png differ
diff --git a/public/images/emoji/google/sleeping_accommodation/2.png b/public/images/emoji/google/sleeping_accommodation/2.png
index 39216918ee5..2c55362aca2 100644
Binary files a/public/images/emoji/google/sleeping_accommodation/2.png and b/public/images/emoji/google/sleeping_accommodation/2.png differ
diff --git a/public/images/emoji/google/sleeping_accommodation/3.png b/public/images/emoji/google/sleeping_accommodation/3.png
index bdbecbff6d1..dc2951d80bc 100644
Binary files a/public/images/emoji/google/sleeping_accommodation/3.png and b/public/images/emoji/google/sleeping_accommodation/3.png differ
diff --git a/public/images/emoji/google/sleeping_accommodation/4.png b/public/images/emoji/google/sleeping_accommodation/4.png
index 8ce4902bcd3..0e1ee293eaf 100644
Binary files a/public/images/emoji/google/sleeping_accommodation/4.png and b/public/images/emoji/google/sleeping_accommodation/4.png differ
diff --git a/public/images/emoji/google/sleeping_accommodation/5.png b/public/images/emoji/google/sleeping_accommodation/5.png
index 76b824d5d93..0d409a54a88 100644
Binary files a/public/images/emoji/google/sleeping_accommodation/5.png and b/public/images/emoji/google/sleeping_accommodation/5.png differ
diff --git a/public/images/emoji/google/sleeping_accommodation/6.png b/public/images/emoji/google/sleeping_accommodation/6.png
index 05f754a6a63..eb39d438bd8 100644
Binary files a/public/images/emoji/google/sleeping_accommodation/6.png and b/public/images/emoji/google/sleeping_accommodation/6.png differ
diff --git a/public/images/emoji/google/sleeping_bed.png b/public/images/emoji/google/sleeping_bed.png
index 90e49164e5a..be40bf9c434 100644
Binary files a/public/images/emoji/google/sleeping_bed.png and b/public/images/emoji/google/sleeping_bed.png differ
diff --git a/public/images/emoji/google/sleeping_bed/2.png b/public/images/emoji/google/sleeping_bed/2.png
index 39216918ee5..2c55362aca2 100644
Binary files a/public/images/emoji/google/sleeping_bed/2.png and b/public/images/emoji/google/sleeping_bed/2.png differ
diff --git a/public/images/emoji/google/sleeping_bed/3.png b/public/images/emoji/google/sleeping_bed/3.png
index bdbecbff6d1..dc2951d80bc 100644
Binary files a/public/images/emoji/google/sleeping_bed/3.png and b/public/images/emoji/google/sleeping_bed/3.png differ
diff --git a/public/images/emoji/google/sleeping_bed/4.png b/public/images/emoji/google/sleeping_bed/4.png
index 8ce4902bcd3..0e1ee293eaf 100644
Binary files a/public/images/emoji/google/sleeping_bed/4.png and b/public/images/emoji/google/sleeping_bed/4.png differ
diff --git a/public/images/emoji/google/sleeping_bed/5.png b/public/images/emoji/google/sleeping_bed/5.png
index 76b824d5d93..0d409a54a88 100644
Binary files a/public/images/emoji/google/sleeping_bed/5.png and b/public/images/emoji/google/sleeping_bed/5.png differ
diff --git a/public/images/emoji/google/sleeping_bed/6.png b/public/images/emoji/google/sleeping_bed/6.png
index 05f754a6a63..eb39d438bd8 100644
Binary files a/public/images/emoji/google/sleeping_bed/6.png and b/public/images/emoji/google/sleeping_bed/6.png differ
diff --git a/public/images/emoji/google/sleepy.png b/public/images/emoji/google/sleepy.png
index 7a53d542342..0c8a806699d 100644
Binary files a/public/images/emoji/google/sleepy.png and b/public/images/emoji/google/sleepy.png differ
diff --git a/public/images/emoji/google/sleuth_or_spy.png b/public/images/emoji/google/sleuth_or_spy.png
index 13ef63b0aa6..cee46f48616 100644
Binary files a/public/images/emoji/google/sleuth_or_spy.png and b/public/images/emoji/google/sleuth_or_spy.png differ
diff --git a/public/images/emoji/google/sleuth_or_spy/2.png b/public/images/emoji/google/sleuth_or_spy/2.png
index 130424ff539..2bc4718252b 100644
Binary files a/public/images/emoji/google/sleuth_or_spy/2.png and b/public/images/emoji/google/sleuth_or_spy/2.png differ
diff --git a/public/images/emoji/google/sleuth_or_spy/3.png b/public/images/emoji/google/sleuth_or_spy/3.png
index 6fb56a789c9..a867a4d30ef 100644
Binary files a/public/images/emoji/google/sleuth_or_spy/3.png and b/public/images/emoji/google/sleuth_or_spy/3.png differ
diff --git a/public/images/emoji/google/sleuth_or_spy/4.png b/public/images/emoji/google/sleuth_or_spy/4.png
index c021157981c..2a1935a30cb 100644
Binary files a/public/images/emoji/google/sleuth_or_spy/4.png and b/public/images/emoji/google/sleuth_or_spy/4.png differ
diff --git a/public/images/emoji/google/sleuth_or_spy/5.png b/public/images/emoji/google/sleuth_or_spy/5.png
index fcd34112328..f261d8dc3b0 100644
Binary files a/public/images/emoji/google/sleuth_or_spy/5.png and b/public/images/emoji/google/sleuth_or_spy/5.png differ
diff --git a/public/images/emoji/google/sleuth_or_spy/6.png b/public/images/emoji/google/sleuth_or_spy/6.png
index e4b939c908b..ffa90c53929 100644
Binary files a/public/images/emoji/google/sleuth_or_spy/6.png and b/public/images/emoji/google/sleuth_or_spy/6.png differ
diff --git a/public/images/emoji/google/slight_frown.png b/public/images/emoji/google/slight_frown.png
index abe8592d677..5cf676c7972 100644
Binary files a/public/images/emoji/google/slight_frown.png and b/public/images/emoji/google/slight_frown.png differ
diff --git a/public/images/emoji/google/slight_smile.png b/public/images/emoji/google/slight_smile.png
index dc605beeb3f..7689ff0d4fc 100644
Binary files a/public/images/emoji/google/slight_smile.png and b/public/images/emoji/google/slight_smile.png differ
diff --git a/public/images/emoji/google/slightly_frowning_face.png b/public/images/emoji/google/slightly_frowning_face.png
index abe8592d677..5cf676c7972 100644
Binary files a/public/images/emoji/google/slightly_frowning_face.png and b/public/images/emoji/google/slightly_frowning_face.png differ
diff --git a/public/images/emoji/google/slightly_smiling.png b/public/images/emoji/google/slightly_smiling.png
index dc605beeb3f..7689ff0d4fc 100644
Binary files a/public/images/emoji/google/slightly_smiling.png and b/public/images/emoji/google/slightly_smiling.png differ
diff --git a/public/images/emoji/google/slightly_smiling_face.png b/public/images/emoji/google/slightly_smiling_face.png
index dc605beeb3f..7689ff0d4fc 100644
Binary files a/public/images/emoji/google/slightly_smiling_face.png and b/public/images/emoji/google/slightly_smiling_face.png differ
diff --git a/public/images/emoji/google/slot_machine.png b/public/images/emoji/google/slot_machine.png
index 59ce7cde1de..bb8f1a9ab71 100644
Binary files a/public/images/emoji/google/slot_machine.png and b/public/images/emoji/google/slot_machine.png differ
diff --git a/public/images/emoji/google/slovakia.png b/public/images/emoji/google/slovakia.png
index 1fc1c9392cc..ee2249e8099 100644
Binary files a/public/images/emoji/google/slovakia.png and b/public/images/emoji/google/slovakia.png differ
diff --git a/public/images/emoji/google/slovenia.png b/public/images/emoji/google/slovenia.png
index d21d260ac24..3972876b0ac 100644
Binary files a/public/images/emoji/google/slovenia.png and b/public/images/emoji/google/slovenia.png differ
diff --git a/public/images/emoji/google/small_airplane.png b/public/images/emoji/google/small_airplane.png
index 5342466c300..1a44e4a7d11 100644
Binary files a/public/images/emoji/google/small_airplane.png and b/public/images/emoji/google/small_airplane.png differ
diff --git a/public/images/emoji/google/small_blue_diamond.png b/public/images/emoji/google/small_blue_diamond.png
index 4dc56355d04..40e9b333b69 100644
Binary files a/public/images/emoji/google/small_blue_diamond.png and b/public/images/emoji/google/small_blue_diamond.png differ
diff --git a/public/images/emoji/google/small_orange_diamond.png b/public/images/emoji/google/small_orange_diamond.png
index 4c2603b3a9b..1e46d414ba1 100644
Binary files a/public/images/emoji/google/small_orange_diamond.png and b/public/images/emoji/google/small_orange_diamond.png differ
diff --git a/public/images/emoji/google/small_red_triangle.png b/public/images/emoji/google/small_red_triangle.png
index 0e045262de4..e9ed94ddced 100644
Binary files a/public/images/emoji/google/small_red_triangle.png and b/public/images/emoji/google/small_red_triangle.png differ
diff --git a/public/images/emoji/google/small_red_triangle_down.png b/public/images/emoji/google/small_red_triangle_down.png
index 222ca47a56c..e1265da028c 100644
Binary files a/public/images/emoji/google/small_red_triangle_down.png and b/public/images/emoji/google/small_red_triangle_down.png differ
diff --git a/public/images/emoji/google/smile.png b/public/images/emoji/google/smile.png
index c3bfe595c56..6a936c21378 100644
Binary files a/public/images/emoji/google/smile.png and b/public/images/emoji/google/smile.png differ
diff --git a/public/images/emoji/google/smile_cat.png b/public/images/emoji/google/smile_cat.png
index bfb387136cb..5fb633152cb 100644
Binary files a/public/images/emoji/google/smile_cat.png and b/public/images/emoji/google/smile_cat.png differ
diff --git a/public/images/emoji/google/smiley.png b/public/images/emoji/google/smiley.png
index 9ebae5eed08..eed981022c8 100644
Binary files a/public/images/emoji/google/smiley.png and b/public/images/emoji/google/smiley.png differ
diff --git a/public/images/emoji/google/smiley_cat.png b/public/images/emoji/google/smiley_cat.png
index a50aed54430..ad018ba4a49 100644
Binary files a/public/images/emoji/google/smiley_cat.png and b/public/images/emoji/google/smiley_cat.png differ
diff --git a/public/images/emoji/google/smiling_imp.png b/public/images/emoji/google/smiling_imp.png
index 3790fe743b4..f5b64b98d00 100644
Binary files a/public/images/emoji/google/smiling_imp.png and b/public/images/emoji/google/smiling_imp.png differ
diff --git a/public/images/emoji/google/smirk.png b/public/images/emoji/google/smirk.png
index 80900d21266..61c04754311 100644
Binary files a/public/images/emoji/google/smirk.png and b/public/images/emoji/google/smirk.png differ
diff --git a/public/images/emoji/google/smirk_cat.png b/public/images/emoji/google/smirk_cat.png
index 73c3b5e5bb6..c3b8c295f45 100644
Binary files a/public/images/emoji/google/smirk_cat.png and b/public/images/emoji/google/smirk_cat.png differ
diff --git a/public/images/emoji/google/smoking.png b/public/images/emoji/google/smoking.png
index 7d424c18d78..d91ab4e6973 100644
Binary files a/public/images/emoji/google/smoking.png and b/public/images/emoji/google/smoking.png differ
diff --git a/public/images/emoji/google/snail.png b/public/images/emoji/google/snail.png
index b160cdc2c9d..bb4fa4ebe5f 100644
Binary files a/public/images/emoji/google/snail.png and b/public/images/emoji/google/snail.png differ
diff --git a/public/images/emoji/google/snake.png b/public/images/emoji/google/snake.png
index 5904faf3398..e17372a1614 100644
Binary files a/public/images/emoji/google/snake.png and b/public/images/emoji/google/snake.png differ
diff --git a/public/images/emoji/google/sneezing_face.png b/public/images/emoji/google/sneezing_face.png
index 39fc4ecb4dd..b14d1a3ec73 100644
Binary files a/public/images/emoji/google/sneezing_face.png and b/public/images/emoji/google/sneezing_face.png differ
diff --git a/public/images/emoji/google/snow_capped_mountain.png b/public/images/emoji/google/snow_capped_mountain.png
index f7ab7c2c747..394c96bb616 100644
Binary files a/public/images/emoji/google/snow_capped_mountain.png and b/public/images/emoji/google/snow_capped_mountain.png differ
diff --git a/public/images/emoji/google/snowboarder.png b/public/images/emoji/google/snowboarder.png
index 3d66a4cc84d..31d43ca7445 100644
Binary files a/public/images/emoji/google/snowboarder.png and b/public/images/emoji/google/snowboarder.png differ
diff --git a/public/images/emoji/google/snowboarder/2.png b/public/images/emoji/google/snowboarder/2.png
index 6e5f70db4f0..5e8784446fb 100644
Binary files a/public/images/emoji/google/snowboarder/2.png and b/public/images/emoji/google/snowboarder/2.png differ
diff --git a/public/images/emoji/google/snowboarder/3.png b/public/images/emoji/google/snowboarder/3.png
index a295d3ea8e1..396579f0e1f 100644
Binary files a/public/images/emoji/google/snowboarder/3.png and b/public/images/emoji/google/snowboarder/3.png differ
diff --git a/public/images/emoji/google/snowboarder/4.png b/public/images/emoji/google/snowboarder/4.png
index d7c1c0f881e..584f8bf9333 100644
Binary files a/public/images/emoji/google/snowboarder/4.png and b/public/images/emoji/google/snowboarder/4.png differ
diff --git a/public/images/emoji/google/snowboarder/5.png b/public/images/emoji/google/snowboarder/5.png
index 682c1a1c268..3908864ebdb 100644
Binary files a/public/images/emoji/google/snowboarder/5.png and b/public/images/emoji/google/snowboarder/5.png differ
diff --git a/public/images/emoji/google/snowboarder/6.png b/public/images/emoji/google/snowboarder/6.png
index 1f676454cd4..6879b0e4248 100644
Binary files a/public/images/emoji/google/snowboarder/6.png and b/public/images/emoji/google/snowboarder/6.png differ
diff --git a/public/images/emoji/google/snowflake.png b/public/images/emoji/google/snowflake.png
index 3fe9831aca6..1b1101c81cd 100644
Binary files a/public/images/emoji/google/snowflake.png and b/public/images/emoji/google/snowflake.png differ
diff --git a/public/images/emoji/google/snowman.png b/public/images/emoji/google/snowman.png
index 881f87d60d5..b619f102523 100644
Binary files a/public/images/emoji/google/snowman.png and b/public/images/emoji/google/snowman.png differ
diff --git a/public/images/emoji/google/snowman2.png b/public/images/emoji/google/snowman2.png
index 9388e9d4bfd..a013b61937e 100644
Binary files a/public/images/emoji/google/snowman2.png and b/public/images/emoji/google/snowman2.png differ
diff --git a/public/images/emoji/google/snowman_with_snow.png b/public/images/emoji/google/snowman_with_snow.png
index 9388e9d4bfd..a013b61937e 100644
Binary files a/public/images/emoji/google/snowman_with_snow.png and b/public/images/emoji/google/snowman_with_snow.png differ
diff --git a/public/images/emoji/google/sob.png b/public/images/emoji/google/sob.png
index 060ac2ddbf1..9de97eb13f1 100644
Binary files a/public/images/emoji/google/sob.png and b/public/images/emoji/google/sob.png differ
diff --git a/public/images/emoji/google/soccer.png b/public/images/emoji/google/soccer.png
index 0c13f98e343..60f7c6c99a5 100644
Binary files a/public/images/emoji/google/soccer.png and b/public/images/emoji/google/soccer.png differ
diff --git a/public/images/emoji/google/socks.png b/public/images/emoji/google/socks.png
index eb275ca49c2..6916b59ea54 100644
Binary files a/public/images/emoji/google/socks.png and b/public/images/emoji/google/socks.png differ
diff --git a/public/images/emoji/google/solomon_islands.png b/public/images/emoji/google/solomon_islands.png
index bbdc2f61021..72e36316444 100644
Binary files a/public/images/emoji/google/solomon_islands.png and b/public/images/emoji/google/solomon_islands.png differ
diff --git a/public/images/emoji/google/somalia.png b/public/images/emoji/google/somalia.png
index 0f51db4c94f..9e24767ddea 100644
Binary files a/public/images/emoji/google/somalia.png and b/public/images/emoji/google/somalia.png differ
diff --git a/public/images/emoji/google/soon.png b/public/images/emoji/google/soon.png
index a04a1d9f71d..4c4a7befe36 100644
Binary files a/public/images/emoji/google/soon.png and b/public/images/emoji/google/soon.png differ
diff --git a/public/images/emoji/google/sos.png b/public/images/emoji/google/sos.png
index 62637e71c3f..87ec93daa9f 100644
Binary files a/public/images/emoji/google/sos.png and b/public/images/emoji/google/sos.png differ
diff --git a/public/images/emoji/google/sound.png b/public/images/emoji/google/sound.png
index dfef71bfd04..fd28f9552c8 100644
Binary files a/public/images/emoji/google/sound.png and b/public/images/emoji/google/sound.png differ
diff --git a/public/images/emoji/google/south_africa.png b/public/images/emoji/google/south_africa.png
index 802bd272f7f..4651afef50d 100644
Binary files a/public/images/emoji/google/south_africa.png and b/public/images/emoji/google/south_africa.png differ
diff --git a/public/images/emoji/google/south_georgia_south_sandwich_islands.png b/public/images/emoji/google/south_georgia_south_sandwich_islands.png
index dad0f8ce650..4faf7e252ef 100644
Binary files a/public/images/emoji/google/south_georgia_south_sandwich_islands.png and b/public/images/emoji/google/south_georgia_south_sandwich_islands.png differ
diff --git a/public/images/emoji/google/south_sudan.png b/public/images/emoji/google/south_sudan.png
index f26d9bdc6e4..2b5eec6f839 100644
Binary files a/public/images/emoji/google/south_sudan.png and b/public/images/emoji/google/south_sudan.png differ
diff --git a/public/images/emoji/google/space_invader.png b/public/images/emoji/google/space_invader.png
index 5488ca700cc..bb7ab9d328e 100644
Binary files a/public/images/emoji/google/space_invader.png and b/public/images/emoji/google/space_invader.png differ
diff --git a/public/images/emoji/google/spades.png b/public/images/emoji/google/spades.png
index 8e3ca45c39d..c431765c1bb 100644
Binary files a/public/images/emoji/google/spades.png and b/public/images/emoji/google/spades.png differ
diff --git a/public/images/emoji/google/spaghetti.png b/public/images/emoji/google/spaghetti.png
index e3e5079fa53..8ac16a61e6a 100644
Binary files a/public/images/emoji/google/spaghetti.png and b/public/images/emoji/google/spaghetti.png differ
diff --git a/public/images/emoji/google/sparkle.png b/public/images/emoji/google/sparkle.png
index ca4a4d9d32c..1cd76f241c6 100644
Binary files a/public/images/emoji/google/sparkle.png and b/public/images/emoji/google/sparkle.png differ
diff --git a/public/images/emoji/google/sparkler.png b/public/images/emoji/google/sparkler.png
index d86bc80ac6a..5d6b45741fc 100644
Binary files a/public/images/emoji/google/sparkler.png and b/public/images/emoji/google/sparkler.png differ
diff --git a/public/images/emoji/google/sparkles.png b/public/images/emoji/google/sparkles.png
index 0240f1ff543..f24a561af9f 100644
Binary files a/public/images/emoji/google/sparkles.png and b/public/images/emoji/google/sparkles.png differ
diff --git a/public/images/emoji/google/sparkling_heart.png b/public/images/emoji/google/sparkling_heart.png
index 202e7b21873..b8fa996c0fd 100644
Binary files a/public/images/emoji/google/sparkling_heart.png and b/public/images/emoji/google/sparkling_heart.png differ
diff --git a/public/images/emoji/google/speak_no_evil.png b/public/images/emoji/google/speak_no_evil.png
index 9cbc9b10023..b693b6d5d65 100644
Binary files a/public/images/emoji/google/speak_no_evil.png and b/public/images/emoji/google/speak_no_evil.png differ
diff --git a/public/images/emoji/google/speaker.png b/public/images/emoji/google/speaker.png
index 100295eec93..717ac0b814b 100644
Binary files a/public/images/emoji/google/speaker.png and b/public/images/emoji/google/speaker.png differ
diff --git a/public/images/emoji/google/speaking_head.png b/public/images/emoji/google/speaking_head.png
index 62fb598f389..e59ef7c3d66 100644
Binary files a/public/images/emoji/google/speaking_head.png and b/public/images/emoji/google/speaking_head.png differ
diff --git a/public/images/emoji/google/speaking_head_in_silhouette.png b/public/images/emoji/google/speaking_head_in_silhouette.png
index 62fb598f389..e59ef7c3d66 100644
Binary files a/public/images/emoji/google/speaking_head_in_silhouette.png and b/public/images/emoji/google/speaking_head_in_silhouette.png differ
diff --git a/public/images/emoji/google/speech_balloon.png b/public/images/emoji/google/speech_balloon.png
index 40395744029..aa4c10145af 100644
Binary files a/public/images/emoji/google/speech_balloon.png and b/public/images/emoji/google/speech_balloon.png differ
diff --git a/public/images/emoji/google/speedboat.png b/public/images/emoji/google/speedboat.png
index 4f7a4e3dbe9..9141b21d1b9 100644
Binary files a/public/images/emoji/google/speedboat.png and b/public/images/emoji/google/speedboat.png differ
diff --git a/public/images/emoji/google/spider.png b/public/images/emoji/google/spider.png
index 18018efcb48..dda421e4078 100644
Binary files a/public/images/emoji/google/spider.png and b/public/images/emoji/google/spider.png differ
diff --git a/public/images/emoji/google/spider_web.png b/public/images/emoji/google/spider_web.png
index 97a6010501c..ee898cd60ec 100644
Binary files a/public/images/emoji/google/spider_web.png and b/public/images/emoji/google/spider_web.png differ
diff --git a/public/images/emoji/google/spiral_calendar.png b/public/images/emoji/google/spiral_calendar.png
index 0997b42f0c2..8c19dc81046 100644
Binary files a/public/images/emoji/google/spiral_calendar.png and b/public/images/emoji/google/spiral_calendar.png differ
diff --git a/public/images/emoji/google/spiral_calendar_pad.png b/public/images/emoji/google/spiral_calendar_pad.png
index 0997b42f0c2..8c19dc81046 100644
Binary files a/public/images/emoji/google/spiral_calendar_pad.png and b/public/images/emoji/google/spiral_calendar_pad.png differ
diff --git a/public/images/emoji/google/spiral_note_pad.png b/public/images/emoji/google/spiral_note_pad.png
index ff382324e5e..72e515dc604 100644
Binary files a/public/images/emoji/google/spiral_note_pad.png and b/public/images/emoji/google/spiral_note_pad.png differ
diff --git a/public/images/emoji/google/spiral_notepad.png b/public/images/emoji/google/spiral_notepad.png
index ff382324e5e..72e515dc604 100644
Binary files a/public/images/emoji/google/spiral_notepad.png and b/public/images/emoji/google/spiral_notepad.png differ
diff --git a/public/images/emoji/google/spoon.png b/public/images/emoji/google/spoon.png
index 583fa80861c..2cb2c2fb311 100644
Binary files a/public/images/emoji/google/spoon.png and b/public/images/emoji/google/spoon.png differ
diff --git a/public/images/emoji/google/sports_medal.png b/public/images/emoji/google/sports_medal.png
index 3d321d89ed8..2ff8d191cbe 100644
Binary files a/public/images/emoji/google/sports_medal.png and b/public/images/emoji/google/sports_medal.png differ
diff --git a/public/images/emoji/google/spy.png b/public/images/emoji/google/spy.png
index 13ef63b0aa6..cee46f48616 100644
Binary files a/public/images/emoji/google/spy.png and b/public/images/emoji/google/spy.png differ
diff --git a/public/images/emoji/google/spy/2.png b/public/images/emoji/google/spy/2.png
index 130424ff539..2bc4718252b 100644
Binary files a/public/images/emoji/google/spy/2.png and b/public/images/emoji/google/spy/2.png differ
diff --git a/public/images/emoji/google/spy/3.png b/public/images/emoji/google/spy/3.png
index 6fb56a789c9..a867a4d30ef 100644
Binary files a/public/images/emoji/google/spy/3.png and b/public/images/emoji/google/spy/3.png differ
diff --git a/public/images/emoji/google/spy/4.png b/public/images/emoji/google/spy/4.png
index c021157981c..2a1935a30cb 100644
Binary files a/public/images/emoji/google/spy/4.png and b/public/images/emoji/google/spy/4.png differ
diff --git a/public/images/emoji/google/spy/5.png b/public/images/emoji/google/spy/5.png
index fcd34112328..f261d8dc3b0 100644
Binary files a/public/images/emoji/google/spy/5.png and b/public/images/emoji/google/spy/5.png differ
diff --git a/public/images/emoji/google/spy/6.png b/public/images/emoji/google/spy/6.png
index e4b939c908b..ffa90c53929 100644
Binary files a/public/images/emoji/google/spy/6.png and b/public/images/emoji/google/spy/6.png differ
diff --git a/public/images/emoji/google/squid.png b/public/images/emoji/google/squid.png
index 2c80acaa681..62b19a17eb9 100644
Binary files a/public/images/emoji/google/squid.png and b/public/images/emoji/google/squid.png differ
diff --git a/public/images/emoji/google/sri_lanka.png b/public/images/emoji/google/sri_lanka.png
index fbbb925b804..9ebcd7343fe 100644
Binary files a/public/images/emoji/google/sri_lanka.png and b/public/images/emoji/google/sri_lanka.png differ
diff --git a/public/images/emoji/google/st_barthelemy.png b/public/images/emoji/google/st_barthelemy.png
index dad0f8ce650..4faf7e252ef 100644
Binary files a/public/images/emoji/google/st_barthelemy.png and b/public/images/emoji/google/st_barthelemy.png differ
diff --git a/public/images/emoji/google/st_helena.png b/public/images/emoji/google/st_helena.png
index de4db593989..18266707694 100644
Binary files a/public/images/emoji/google/st_helena.png and b/public/images/emoji/google/st_helena.png differ
diff --git a/public/images/emoji/google/st_kitts_nevis.png b/public/images/emoji/google/st_kitts_nevis.png
index ae2720530ef..0fa2a78ac5f 100644
Binary files a/public/images/emoji/google/st_kitts_nevis.png and b/public/images/emoji/google/st_kitts_nevis.png differ
diff --git a/public/images/emoji/google/st_lucia.png b/public/images/emoji/google/st_lucia.png
index ba2a134ef0f..d1620548fb6 100644
Binary files a/public/images/emoji/google/st_lucia.png and b/public/images/emoji/google/st_lucia.png differ
diff --git a/public/images/emoji/google/st_martin.png b/public/images/emoji/google/st_martin.png
index dad0f8ce650..4faf7e252ef 100644
Binary files a/public/images/emoji/google/st_martin.png and b/public/images/emoji/google/st_martin.png differ
diff --git a/public/images/emoji/google/st_pierre_miquelon.png b/public/images/emoji/google/st_pierre_miquelon.png
index dad0f8ce650..4faf7e252ef 100644
Binary files a/public/images/emoji/google/st_pierre_miquelon.png and b/public/images/emoji/google/st_pierre_miquelon.png differ
diff --git a/public/images/emoji/google/st_vincent_grenadines.png b/public/images/emoji/google/st_vincent_grenadines.png
index d2a9b7fad72..df27c5e9be5 100644
Binary files a/public/images/emoji/google/st_vincent_grenadines.png and b/public/images/emoji/google/st_vincent_grenadines.png differ
diff --git a/public/images/emoji/google/stadium.png b/public/images/emoji/google/stadium.png
index b69d81ebaad..67c816ed4a2 100644
Binary files a/public/images/emoji/google/stadium.png and b/public/images/emoji/google/stadium.png differ
diff --git a/public/images/emoji/google/star.png b/public/images/emoji/google/star.png
index 363ff892741..9005baa0f22 100644
Binary files a/public/images/emoji/google/star.png and b/public/images/emoji/google/star.png differ
diff --git a/public/images/emoji/google/star2.png b/public/images/emoji/google/star2.png
index 7253e078cfc..926f65170af 100644
Binary files a/public/images/emoji/google/star2.png and b/public/images/emoji/google/star2.png differ
diff --git a/public/images/emoji/google/star_and_crescent.png b/public/images/emoji/google/star_and_crescent.png
index 273c92af0e8..978b71111ab 100644
Binary files a/public/images/emoji/google/star_and_crescent.png and b/public/images/emoji/google/star_and_crescent.png differ
diff --git a/public/images/emoji/google/star_of_david.png b/public/images/emoji/google/star_of_david.png
index 688528fa84d..5b2e88e995a 100644
Binary files a/public/images/emoji/google/star_of_david.png and b/public/images/emoji/google/star_of_david.png differ
diff --git a/public/images/emoji/google/star_struck.png b/public/images/emoji/google/star_struck.png
index e7b8b6f9a8d..9cc6aebfbb7 100644
Binary files a/public/images/emoji/google/star_struck.png and b/public/images/emoji/google/star_struck.png differ
diff --git a/public/images/emoji/google/stars.png b/public/images/emoji/google/stars.png
index 7a7afc7d897..9e996a147b4 100644
Binary files a/public/images/emoji/google/stars.png and b/public/images/emoji/google/stars.png differ
diff --git a/public/images/emoji/google/station.png b/public/images/emoji/google/station.png
index 47f4ba93fad..75759512a7b 100644
Binary files a/public/images/emoji/google/station.png and b/public/images/emoji/google/station.png differ
diff --git a/public/images/emoji/google/statue_of_liberty.png b/public/images/emoji/google/statue_of_liberty.png
index fd78f0e1313..b7322ad3b07 100644
Binary files a/public/images/emoji/google/statue_of_liberty.png and b/public/images/emoji/google/statue_of_liberty.png differ
diff --git a/public/images/emoji/google/steam_locomotive.png b/public/images/emoji/google/steam_locomotive.png
index 8691eafbb6d..0367f96b6a8 100644
Binary files a/public/images/emoji/google/steam_locomotive.png and b/public/images/emoji/google/steam_locomotive.png differ
diff --git a/public/images/emoji/google/stew.png b/public/images/emoji/google/stew.png
index 84304bfcc65..8dbd3a9c58f 100644
Binary files a/public/images/emoji/google/stew.png and b/public/images/emoji/google/stew.png differ
diff --git a/public/images/emoji/google/stop_button.png b/public/images/emoji/google/stop_button.png
index 791b42fa2fa..26b01fc233e 100644
Binary files a/public/images/emoji/google/stop_button.png and b/public/images/emoji/google/stop_button.png differ
diff --git a/public/images/emoji/google/stop_sign.png b/public/images/emoji/google/stop_sign.png
index c84adb179fe..4e310d0abff 100644
Binary files a/public/images/emoji/google/stop_sign.png and b/public/images/emoji/google/stop_sign.png differ
diff --git a/public/images/emoji/google/stopwatch.png b/public/images/emoji/google/stopwatch.png
index c061a24e3e8..beca2281594 100644
Binary files a/public/images/emoji/google/stopwatch.png and b/public/images/emoji/google/stopwatch.png differ
diff --git a/public/images/emoji/google/straight_ruler.png b/public/images/emoji/google/straight_ruler.png
index 59fbedc93d0..5c04bdb434c 100644
Binary files a/public/images/emoji/google/straight_ruler.png and b/public/images/emoji/google/straight_ruler.png differ
diff --git a/public/images/emoji/google/strawberry.png b/public/images/emoji/google/strawberry.png
index 4e683c12805..31be9c87300 100644
Binary files a/public/images/emoji/google/strawberry.png and b/public/images/emoji/google/strawberry.png differ
diff --git a/public/images/emoji/google/stuck_out_tongue.png b/public/images/emoji/google/stuck_out_tongue.png
index 2d2367ebcf6..c5d4dd18243 100644
Binary files a/public/images/emoji/google/stuck_out_tongue.png and b/public/images/emoji/google/stuck_out_tongue.png differ
diff --git a/public/images/emoji/google/stuck_out_tongue_closed_eyes.png b/public/images/emoji/google/stuck_out_tongue_closed_eyes.png
index 4d6aee5361b..262d610b211 100644
Binary files a/public/images/emoji/google/stuck_out_tongue_closed_eyes.png and b/public/images/emoji/google/stuck_out_tongue_closed_eyes.png differ
diff --git a/public/images/emoji/google/stuck_out_tongue_winking_eye.png b/public/images/emoji/google/stuck_out_tongue_winking_eye.png
index 579284e7a22..81693a1e817 100644
Binary files a/public/images/emoji/google/stuck_out_tongue_winking_eye.png and b/public/images/emoji/google/stuck_out_tongue_winking_eye.png differ
diff --git a/public/images/emoji/google/studio_microphone.png b/public/images/emoji/google/studio_microphone.png
index 9394168839c..070e657d8c8 100644
Binary files a/public/images/emoji/google/studio_microphone.png and b/public/images/emoji/google/studio_microphone.png differ
diff --git a/public/images/emoji/google/stuffed_flatbread.png b/public/images/emoji/google/stuffed_flatbread.png
index ac839e32ca3..e4e0713a28b 100644
Binary files a/public/images/emoji/google/stuffed_flatbread.png and b/public/images/emoji/google/stuffed_flatbread.png differ
diff --git a/public/images/emoji/google/sudan.png b/public/images/emoji/google/sudan.png
index aaae2ea590f..d159d9b693b 100644
Binary files a/public/images/emoji/google/sudan.png and b/public/images/emoji/google/sudan.png differ
diff --git a/public/images/emoji/google/sun_behind_large_cloud.png b/public/images/emoji/google/sun_behind_large_cloud.png
index e3a78dca903..2adf6fc83ef 100644
Binary files a/public/images/emoji/google/sun_behind_large_cloud.png and b/public/images/emoji/google/sun_behind_large_cloud.png differ
diff --git a/public/images/emoji/google/sun_behind_rain_cloud.png b/public/images/emoji/google/sun_behind_rain_cloud.png
index 4fc26cb31b6..1d5cfc81bf0 100644
Binary files a/public/images/emoji/google/sun_behind_rain_cloud.png and b/public/images/emoji/google/sun_behind_rain_cloud.png differ
diff --git a/public/images/emoji/google/sun_behind_small_cloud.png b/public/images/emoji/google/sun_behind_small_cloud.png
index 6686bc8d5a1..0e1dfbf0b44 100644
Binary files a/public/images/emoji/google/sun_behind_small_cloud.png and b/public/images/emoji/google/sun_behind_small_cloud.png differ
diff --git a/public/images/emoji/google/sun_with_face.png b/public/images/emoji/google/sun_with_face.png
index 4ebe4329c16..e21136c7c47 100644
Binary files a/public/images/emoji/google/sun_with_face.png and b/public/images/emoji/google/sun_with_face.png differ
diff --git a/public/images/emoji/google/sunflower.png b/public/images/emoji/google/sunflower.png
index b844443198b..2d2ae55d7fe 100644
Binary files a/public/images/emoji/google/sunflower.png and b/public/images/emoji/google/sunflower.png differ
diff --git a/public/images/emoji/google/sunglasses.png b/public/images/emoji/google/sunglasses.png
index 99271ece612..acc11c1414b 100644
Binary files a/public/images/emoji/google/sunglasses.png and b/public/images/emoji/google/sunglasses.png differ
diff --git a/public/images/emoji/google/sunny.png b/public/images/emoji/google/sunny.png
index c983cbc0700..67141b1fc5c 100644
Binary files a/public/images/emoji/google/sunny.png and b/public/images/emoji/google/sunny.png differ
diff --git a/public/images/emoji/google/sunrise.png b/public/images/emoji/google/sunrise.png
index ba83c231262..c11803c6d57 100644
Binary files a/public/images/emoji/google/sunrise.png and b/public/images/emoji/google/sunrise.png differ
diff --git a/public/images/emoji/google/sunrise_over_mountains.png b/public/images/emoji/google/sunrise_over_mountains.png
index 3c27efd19a0..59eb7cbe360 100644
Binary files a/public/images/emoji/google/sunrise_over_mountains.png and b/public/images/emoji/google/sunrise_over_mountains.png differ
diff --git a/public/images/emoji/google/surfer.png b/public/images/emoji/google/surfer.png
index 1e2f330d861..c8b5a34eeea 100644
Binary files a/public/images/emoji/google/surfer.png and b/public/images/emoji/google/surfer.png differ
diff --git a/public/images/emoji/google/surfer/2.png b/public/images/emoji/google/surfer/2.png
index c77d90b246d..e3093c45add 100644
Binary files a/public/images/emoji/google/surfer/2.png and b/public/images/emoji/google/surfer/2.png differ
diff --git a/public/images/emoji/google/surfer/3.png b/public/images/emoji/google/surfer/3.png
index fa1ed7963bc..b770754b057 100644
Binary files a/public/images/emoji/google/surfer/3.png and b/public/images/emoji/google/surfer/3.png differ
diff --git a/public/images/emoji/google/surfer/4.png b/public/images/emoji/google/surfer/4.png
index 1a8f8c59dd9..1184feb14ff 100644
Binary files a/public/images/emoji/google/surfer/4.png and b/public/images/emoji/google/surfer/4.png differ
diff --git a/public/images/emoji/google/surfer/5.png b/public/images/emoji/google/surfer/5.png
index 600963a330e..ccf5993c2b9 100644
Binary files a/public/images/emoji/google/surfer/5.png and b/public/images/emoji/google/surfer/5.png differ
diff --git a/public/images/emoji/google/surfer/6.png b/public/images/emoji/google/surfer/6.png
index da93a4d5bab..ab82543c178 100644
Binary files a/public/images/emoji/google/surfer/6.png and b/public/images/emoji/google/surfer/6.png differ
diff --git a/public/images/emoji/google/surfing_man.png b/public/images/emoji/google/surfing_man.png
index 1e2f330d861..c8b5a34eeea 100644
Binary files a/public/images/emoji/google/surfing_man.png and b/public/images/emoji/google/surfing_man.png differ
diff --git a/public/images/emoji/google/surfing_man/2.png b/public/images/emoji/google/surfing_man/2.png
index c77d90b246d..e3093c45add 100644
Binary files a/public/images/emoji/google/surfing_man/2.png and b/public/images/emoji/google/surfing_man/2.png differ
diff --git a/public/images/emoji/google/surfing_man/3.png b/public/images/emoji/google/surfing_man/3.png
index fa1ed7963bc..b770754b057 100644
Binary files a/public/images/emoji/google/surfing_man/3.png and b/public/images/emoji/google/surfing_man/3.png differ
diff --git a/public/images/emoji/google/surfing_man/4.png b/public/images/emoji/google/surfing_man/4.png
index 1a8f8c59dd9..1184feb14ff 100644
Binary files a/public/images/emoji/google/surfing_man/4.png and b/public/images/emoji/google/surfing_man/4.png differ
diff --git a/public/images/emoji/google/surfing_man/5.png b/public/images/emoji/google/surfing_man/5.png
index 600963a330e..ccf5993c2b9 100644
Binary files a/public/images/emoji/google/surfing_man/5.png and b/public/images/emoji/google/surfing_man/5.png differ
diff --git a/public/images/emoji/google/surfing_man/6.png b/public/images/emoji/google/surfing_man/6.png
index da93a4d5bab..ab82543c178 100644
Binary files a/public/images/emoji/google/surfing_man/6.png and b/public/images/emoji/google/surfing_man/6.png differ
diff --git a/public/images/emoji/google/surfing_woman.png b/public/images/emoji/google/surfing_woman.png
index 5833789ebe4..d8812f2391f 100644
Binary files a/public/images/emoji/google/surfing_woman.png and b/public/images/emoji/google/surfing_woman.png differ
diff --git a/public/images/emoji/google/surfing_woman/2.png b/public/images/emoji/google/surfing_woman/2.png
index c0497f10e81..7d4d31cdd79 100644
Binary files a/public/images/emoji/google/surfing_woman/2.png and b/public/images/emoji/google/surfing_woman/2.png differ
diff --git a/public/images/emoji/google/surfing_woman/3.png b/public/images/emoji/google/surfing_woman/3.png
index 27f3c517835..fdc008cda80 100644
Binary files a/public/images/emoji/google/surfing_woman/3.png and b/public/images/emoji/google/surfing_woman/3.png differ
diff --git a/public/images/emoji/google/surfing_woman/4.png b/public/images/emoji/google/surfing_woman/4.png
index 37937a50855..f29b91fb208 100644
Binary files a/public/images/emoji/google/surfing_woman/4.png and b/public/images/emoji/google/surfing_woman/4.png differ
diff --git a/public/images/emoji/google/surfing_woman/5.png b/public/images/emoji/google/surfing_woman/5.png
index 4185bf21d2a..f1f28b3de5f 100644
Binary files a/public/images/emoji/google/surfing_woman/5.png and b/public/images/emoji/google/surfing_woman/5.png differ
diff --git a/public/images/emoji/google/surfing_woman/6.png b/public/images/emoji/google/surfing_woman/6.png
index 170fefa657d..7117ad81c48 100644
Binary files a/public/images/emoji/google/surfing_woman/6.png and b/public/images/emoji/google/surfing_woman/6.png differ
diff --git a/public/images/emoji/google/suriname.png b/public/images/emoji/google/suriname.png
index 4113fc0a4ce..190b80cfafa 100644
Binary files a/public/images/emoji/google/suriname.png and b/public/images/emoji/google/suriname.png differ
diff --git a/public/images/emoji/google/sushi.png b/public/images/emoji/google/sushi.png
index 9bc4d0d8a9b..0beae8fa266 100644
Binary files a/public/images/emoji/google/sushi.png and b/public/images/emoji/google/sushi.png differ
diff --git a/public/images/emoji/google/suspension_railway.png b/public/images/emoji/google/suspension_railway.png
index 4bb8e576ee3..90daf5684bb 100644
Binary files a/public/images/emoji/google/suspension_railway.png and b/public/images/emoji/google/suspension_railway.png differ
diff --git a/public/images/emoji/google/svalbard_and_jan_mayen.png b/public/images/emoji/google/svalbard_and_jan_mayen.png
index 5330d9794c3..d348a446ad7 100644
Binary files a/public/images/emoji/google/svalbard_and_jan_mayen.png and b/public/images/emoji/google/svalbard_and_jan_mayen.png differ
diff --git a/public/images/emoji/google/swaziland.png b/public/images/emoji/google/swaziland.png
index d1d715c2963..598a3c5dd7b 100644
Binary files a/public/images/emoji/google/swaziland.png and b/public/images/emoji/google/swaziland.png differ
diff --git a/public/images/emoji/google/sweat.png b/public/images/emoji/google/sweat.png
index 71c1442f13e..97a87884a8e 100644
Binary files a/public/images/emoji/google/sweat.png and b/public/images/emoji/google/sweat.png differ
diff --git a/public/images/emoji/google/sweat_drops.png b/public/images/emoji/google/sweat_drops.png
index 6b3d498af28..b00dcc47cbf 100644
Binary files a/public/images/emoji/google/sweat_drops.png and b/public/images/emoji/google/sweat_drops.png differ
diff --git a/public/images/emoji/google/sweat_smile.png b/public/images/emoji/google/sweat_smile.png
index 07b2b315bca..d062356602a 100644
Binary files a/public/images/emoji/google/sweat_smile.png and b/public/images/emoji/google/sweat_smile.png differ
diff --git a/public/images/emoji/google/sweden.png b/public/images/emoji/google/sweden.png
index d784af61fcb..63a38804ec6 100644
Binary files a/public/images/emoji/google/sweden.png and b/public/images/emoji/google/sweden.png differ
diff --git a/public/images/emoji/google/sweet_potato.png b/public/images/emoji/google/sweet_potato.png
index 338ecbc998b..c5127703520 100644
Binary files a/public/images/emoji/google/sweet_potato.png and b/public/images/emoji/google/sweet_potato.png differ
diff --git a/public/images/emoji/google/swimmer.png b/public/images/emoji/google/swimmer.png
index bc899762801..e244fc68057 100644
Binary files a/public/images/emoji/google/swimmer.png and b/public/images/emoji/google/swimmer.png differ
diff --git a/public/images/emoji/google/swimmer/2.png b/public/images/emoji/google/swimmer/2.png
index f744028af4d..1b6e3e63adf 100644
Binary files a/public/images/emoji/google/swimmer/2.png and b/public/images/emoji/google/swimmer/2.png differ
diff --git a/public/images/emoji/google/swimmer/3.png b/public/images/emoji/google/swimmer/3.png
index f2f524c92b3..eb396167892 100644
Binary files a/public/images/emoji/google/swimmer/3.png and b/public/images/emoji/google/swimmer/3.png differ
diff --git a/public/images/emoji/google/swimmer/4.png b/public/images/emoji/google/swimmer/4.png
index 72156ef8f96..027eb2681b8 100644
Binary files a/public/images/emoji/google/swimmer/4.png and b/public/images/emoji/google/swimmer/4.png differ
diff --git a/public/images/emoji/google/swimmer/5.png b/public/images/emoji/google/swimmer/5.png
index 6f0b853600b..0341a0beaf5 100644
Binary files a/public/images/emoji/google/swimmer/5.png and b/public/images/emoji/google/swimmer/5.png differ
diff --git a/public/images/emoji/google/swimmer/6.png b/public/images/emoji/google/swimmer/6.png
index 5f6222134e6..7e148f04526 100644
Binary files a/public/images/emoji/google/swimmer/6.png and b/public/images/emoji/google/swimmer/6.png differ
diff --git a/public/images/emoji/google/swimming_man.png b/public/images/emoji/google/swimming_man.png
index bc899762801..e244fc68057 100644
Binary files a/public/images/emoji/google/swimming_man.png and b/public/images/emoji/google/swimming_man.png differ
diff --git a/public/images/emoji/google/swimming_man/2.png b/public/images/emoji/google/swimming_man/2.png
index f744028af4d..1b6e3e63adf 100644
Binary files a/public/images/emoji/google/swimming_man/2.png and b/public/images/emoji/google/swimming_man/2.png differ
diff --git a/public/images/emoji/google/swimming_man/3.png b/public/images/emoji/google/swimming_man/3.png
index f2f524c92b3..eb396167892 100644
Binary files a/public/images/emoji/google/swimming_man/3.png and b/public/images/emoji/google/swimming_man/3.png differ
diff --git a/public/images/emoji/google/swimming_man/4.png b/public/images/emoji/google/swimming_man/4.png
index 72156ef8f96..027eb2681b8 100644
Binary files a/public/images/emoji/google/swimming_man/4.png and b/public/images/emoji/google/swimming_man/4.png differ
diff --git a/public/images/emoji/google/swimming_man/5.png b/public/images/emoji/google/swimming_man/5.png
index 6f0b853600b..0341a0beaf5 100644
Binary files a/public/images/emoji/google/swimming_man/5.png and b/public/images/emoji/google/swimming_man/5.png differ
diff --git a/public/images/emoji/google/swimming_man/6.png b/public/images/emoji/google/swimming_man/6.png
index 5f6222134e6..7e148f04526 100644
Binary files a/public/images/emoji/google/swimming_man/6.png and b/public/images/emoji/google/swimming_man/6.png differ
diff --git a/public/images/emoji/google/swimming_woman.png b/public/images/emoji/google/swimming_woman.png
index c96906cbfa0..12835c023c9 100644
Binary files a/public/images/emoji/google/swimming_woman.png and b/public/images/emoji/google/swimming_woman.png differ
diff --git a/public/images/emoji/google/swimming_woman/2.png b/public/images/emoji/google/swimming_woman/2.png
index e7937a5e948..ef5e874eea2 100644
Binary files a/public/images/emoji/google/swimming_woman/2.png and b/public/images/emoji/google/swimming_woman/2.png differ
diff --git a/public/images/emoji/google/swimming_woman/3.png b/public/images/emoji/google/swimming_woman/3.png
index c43eac0982e..17dc9cf567c 100644
Binary files a/public/images/emoji/google/swimming_woman/3.png and b/public/images/emoji/google/swimming_woman/3.png differ
diff --git a/public/images/emoji/google/swimming_woman/4.png b/public/images/emoji/google/swimming_woman/4.png
index 7a01d161136..a6da6318cdb 100644
Binary files a/public/images/emoji/google/swimming_woman/4.png and b/public/images/emoji/google/swimming_woman/4.png differ
diff --git a/public/images/emoji/google/swimming_woman/5.png b/public/images/emoji/google/swimming_woman/5.png
index 32e34241e2d..693120bc69b 100644
Binary files a/public/images/emoji/google/swimming_woman/5.png and b/public/images/emoji/google/swimming_woman/5.png differ
diff --git a/public/images/emoji/google/swimming_woman/6.png b/public/images/emoji/google/swimming_woman/6.png
index 26346ec2729..69fe561dd0b 100644
Binary files a/public/images/emoji/google/swimming_woman/6.png and b/public/images/emoji/google/swimming_woman/6.png differ
diff --git a/public/images/emoji/google/switzerland.png b/public/images/emoji/google/switzerland.png
index 1ef2b0ce41f..9c404cf21df 100644
Binary files a/public/images/emoji/google/switzerland.png and b/public/images/emoji/google/switzerland.png differ
diff --git a/public/images/emoji/google/symbols.png b/public/images/emoji/google/symbols.png
index 182f0a46e2e..9453639f604 100644
Binary files a/public/images/emoji/google/symbols.png and b/public/images/emoji/google/symbols.png differ
diff --git a/public/images/emoji/google/synagogue.png b/public/images/emoji/google/synagogue.png
index a09c7104085..f9e15d15afa 100644
Binary files a/public/images/emoji/google/synagogue.png and b/public/images/emoji/google/synagogue.png differ
diff --git a/public/images/emoji/google/syria.png b/public/images/emoji/google/syria.png
index 9048b71158c..64ca1a62251 100644
Binary files a/public/images/emoji/google/syria.png and b/public/images/emoji/google/syria.png differ
diff --git a/public/images/emoji/google/syringe.png b/public/images/emoji/google/syringe.png
index ae2ef5f2655..dbccda32ef7 100644
Binary files a/public/images/emoji/google/syringe.png and b/public/images/emoji/google/syringe.png differ
diff --git a/public/images/emoji/google/t_rex.png b/public/images/emoji/google/t_rex.png
index 27102b89dea..7c3482e6495 100644
Binary files a/public/images/emoji/google/t_rex.png and b/public/images/emoji/google/t_rex.png differ
diff --git a/public/images/emoji/google/table_tennis.png b/public/images/emoji/google/table_tennis.png
index 8390f27bb8b..60444a0a3a2 100644
Binary files a/public/images/emoji/google/table_tennis.png and b/public/images/emoji/google/table_tennis.png differ
diff --git a/public/images/emoji/google/taco.png b/public/images/emoji/google/taco.png
index dcdee39c821..f62f76fa27a 100644
Binary files a/public/images/emoji/google/taco.png and b/public/images/emoji/google/taco.png differ
diff --git a/public/images/emoji/google/tada.png b/public/images/emoji/google/tada.png
index 6737d2d1d73..43e51421204 100644
Binary files a/public/images/emoji/google/tada.png and b/public/images/emoji/google/tada.png differ
diff --git a/public/images/emoji/google/taiwan.png b/public/images/emoji/google/taiwan.png
index b0fdb2c49eb..098f9b22ac3 100644
Binary files a/public/images/emoji/google/taiwan.png and b/public/images/emoji/google/taiwan.png differ
diff --git a/public/images/emoji/google/tajikistan.png b/public/images/emoji/google/tajikistan.png
index 0cecf7088ae..037e6bf599d 100644
Binary files a/public/images/emoji/google/tajikistan.png and b/public/images/emoji/google/tajikistan.png differ
diff --git a/public/images/emoji/google/takeout_box.png b/public/images/emoji/google/takeout_box.png
index dab274ddfc0..82a48a4faa6 100644
Binary files a/public/images/emoji/google/takeout_box.png and b/public/images/emoji/google/takeout_box.png differ
diff --git a/public/images/emoji/google/tanabata_tree.png b/public/images/emoji/google/tanabata_tree.png
index 7e50cf9972a..434827a75d0 100644
Binary files a/public/images/emoji/google/tanabata_tree.png and b/public/images/emoji/google/tanabata_tree.png differ
diff --git a/public/images/emoji/google/tangerine.png b/public/images/emoji/google/tangerine.png
index ee0912c1e0c..049fe86ae0c 100644
Binary files a/public/images/emoji/google/tangerine.png and b/public/images/emoji/google/tangerine.png differ
diff --git a/public/images/emoji/google/tanzania.png b/public/images/emoji/google/tanzania.png
index 290a513c36d..43eae86742d 100644
Binary files a/public/images/emoji/google/tanzania.png and b/public/images/emoji/google/tanzania.png differ
diff --git a/public/images/emoji/google/taurus.png b/public/images/emoji/google/taurus.png
index 53fdc1438a6..b2cc9dd0327 100644
Binary files a/public/images/emoji/google/taurus.png and b/public/images/emoji/google/taurus.png differ
diff --git a/public/images/emoji/google/taxi.png b/public/images/emoji/google/taxi.png
index 5c023688467..73acc0dea2a 100644
Binary files a/public/images/emoji/google/taxi.png and b/public/images/emoji/google/taxi.png differ
diff --git a/public/images/emoji/google/tea.png b/public/images/emoji/google/tea.png
index f3e8ede67bd..0c42b544e1a 100644
Binary files a/public/images/emoji/google/tea.png and b/public/images/emoji/google/tea.png differ
diff --git a/public/images/emoji/google/telephone.png b/public/images/emoji/google/telephone.png
index 24450536868..3eca2e7d803 100644
Binary files a/public/images/emoji/google/telephone.png and b/public/images/emoji/google/telephone.png differ
diff --git a/public/images/emoji/google/telephone_receiver.png b/public/images/emoji/google/telephone_receiver.png
index 087c5fa29b5..1fbf0f5d360 100644
Binary files a/public/images/emoji/google/telephone_receiver.png and b/public/images/emoji/google/telephone_receiver.png differ
diff --git a/public/images/emoji/google/telescope.png b/public/images/emoji/google/telescope.png
index 96f65d87e77..d1b0cfafda7 100644
Binary files a/public/images/emoji/google/telescope.png and b/public/images/emoji/google/telescope.png differ
diff --git a/public/images/emoji/google/ten.png b/public/images/emoji/google/ten.png
index 60b3c3787c0..26d2af616c1 100644
Binary files a/public/images/emoji/google/ten.png and b/public/images/emoji/google/ten.png differ
diff --git a/public/images/emoji/google/tennis.png b/public/images/emoji/google/tennis.png
index 2ca385feb1a..d99dbd1fa71 100644
Binary files a/public/images/emoji/google/tennis.png and b/public/images/emoji/google/tennis.png differ
diff --git a/public/images/emoji/google/tent.png b/public/images/emoji/google/tent.png
index 8eb56114f0f..ad3fa23f390 100644
Binary files a/public/images/emoji/google/tent.png and b/public/images/emoji/google/tent.png differ
diff --git a/public/images/emoji/google/thailand.png b/public/images/emoji/google/thailand.png
index a3ac84b8fa2..acb9054331a 100644
Binary files a/public/images/emoji/google/thailand.png and b/public/images/emoji/google/thailand.png differ
diff --git a/public/images/emoji/google/thermometer.png b/public/images/emoji/google/thermometer.png
index 23398cba6ce..0b37dbfe0a5 100644
Binary files a/public/images/emoji/google/thermometer.png and b/public/images/emoji/google/thermometer.png differ
diff --git a/public/images/emoji/google/thermometer_face.png b/public/images/emoji/google/thermometer_face.png
index 82bdbf6335b..296fe80618c 100644
Binary files a/public/images/emoji/google/thermometer_face.png and b/public/images/emoji/google/thermometer_face.png differ
diff --git a/public/images/emoji/google/thinking.png b/public/images/emoji/google/thinking.png
index a99dc4d85a5..afcbc3d3b14 100644
Binary files a/public/images/emoji/google/thinking.png and b/public/images/emoji/google/thinking.png differ
diff --git a/public/images/emoji/google/thinking_face.png b/public/images/emoji/google/thinking_face.png
index a99dc4d85a5..afcbc3d3b14 100644
Binary files a/public/images/emoji/google/thinking_face.png and b/public/images/emoji/google/thinking_face.png differ
diff --git a/public/images/emoji/google/thought_balloon.png b/public/images/emoji/google/thought_balloon.png
index fd55816c8fd..3a2ac4e7662 100644
Binary files a/public/images/emoji/google/thought_balloon.png and b/public/images/emoji/google/thought_balloon.png differ
diff --git a/public/images/emoji/google/three.png b/public/images/emoji/google/three.png
index 0914fd78113..ec65e3f24ce 100644
Binary files a/public/images/emoji/google/three.png and b/public/images/emoji/google/three.png differ
diff --git a/public/images/emoji/google/three_button_mouse.png b/public/images/emoji/google/three_button_mouse.png
index 606ada2ed4f..28785439fc2 100644
Binary files a/public/images/emoji/google/three_button_mouse.png and b/public/images/emoji/google/three_button_mouse.png differ
diff --git a/public/images/emoji/google/thumbsdown.png b/public/images/emoji/google/thumbsdown.png
index f2e7da55f6a..01e3d0ffa18 100644
Binary files a/public/images/emoji/google/thumbsdown.png and b/public/images/emoji/google/thumbsdown.png differ
diff --git a/public/images/emoji/google/thumbsdown/2.png b/public/images/emoji/google/thumbsdown/2.png
index 86d0319a4ab..d2bcecf2c36 100644
Binary files a/public/images/emoji/google/thumbsdown/2.png and b/public/images/emoji/google/thumbsdown/2.png differ
diff --git a/public/images/emoji/google/thumbsdown/3.png b/public/images/emoji/google/thumbsdown/3.png
index c50a57e11ec..e7665e4bafb 100644
Binary files a/public/images/emoji/google/thumbsdown/3.png and b/public/images/emoji/google/thumbsdown/3.png differ
diff --git a/public/images/emoji/google/thumbsdown/4.png b/public/images/emoji/google/thumbsdown/4.png
index 979e09adf86..0ec1f2e3a0e 100644
Binary files a/public/images/emoji/google/thumbsdown/4.png and b/public/images/emoji/google/thumbsdown/4.png differ
diff --git a/public/images/emoji/google/thumbsdown/5.png b/public/images/emoji/google/thumbsdown/5.png
index bf4f10d81ab..3f3bd72ef44 100644
Binary files a/public/images/emoji/google/thumbsdown/5.png and b/public/images/emoji/google/thumbsdown/5.png differ
diff --git a/public/images/emoji/google/thumbsdown/6.png b/public/images/emoji/google/thumbsdown/6.png
index ecab34a9829..65825685672 100644
Binary files a/public/images/emoji/google/thumbsdown/6.png and b/public/images/emoji/google/thumbsdown/6.png differ
diff --git a/public/images/emoji/google/thumbsup.png b/public/images/emoji/google/thumbsup.png
index b03f09eb007..7e440eb6a8d 100644
Binary files a/public/images/emoji/google/thumbsup.png and b/public/images/emoji/google/thumbsup.png differ
diff --git a/public/images/emoji/google/thumbsup/2.png b/public/images/emoji/google/thumbsup/2.png
index a3a855f569e..d31652eaf5c 100644
Binary files a/public/images/emoji/google/thumbsup/2.png and b/public/images/emoji/google/thumbsup/2.png differ
diff --git a/public/images/emoji/google/thumbsup/3.png b/public/images/emoji/google/thumbsup/3.png
index c8e515c99bb..5b1760d7a31 100644
Binary files a/public/images/emoji/google/thumbsup/3.png and b/public/images/emoji/google/thumbsup/3.png differ
diff --git a/public/images/emoji/google/thumbsup/4.png b/public/images/emoji/google/thumbsup/4.png
index 4a388dd5fc0..2ba4abddc42 100644
Binary files a/public/images/emoji/google/thumbsup/4.png and b/public/images/emoji/google/thumbsup/4.png differ
diff --git a/public/images/emoji/google/thumbsup/5.png b/public/images/emoji/google/thumbsup/5.png
index 5bf6c233fd2..b9fdc0019db 100644
Binary files a/public/images/emoji/google/thumbsup/5.png and b/public/images/emoji/google/thumbsup/5.png differ
diff --git a/public/images/emoji/google/thumbsup/6.png b/public/images/emoji/google/thumbsup/6.png
index fed5d03000e..d4944089c6c 100644
Binary files a/public/images/emoji/google/thumbsup/6.png and b/public/images/emoji/google/thumbsup/6.png differ
diff --git a/public/images/emoji/google/thunder_cloud_and_rain.png b/public/images/emoji/google/thunder_cloud_and_rain.png
index 5cb64e49e46..8cf3322c7d3 100644
Binary files a/public/images/emoji/google/thunder_cloud_and_rain.png and b/public/images/emoji/google/thunder_cloud_and_rain.png differ
diff --git a/public/images/emoji/google/thunder_cloud_rain.png b/public/images/emoji/google/thunder_cloud_rain.png
index 5cb64e49e46..8cf3322c7d3 100644
Binary files a/public/images/emoji/google/thunder_cloud_rain.png and b/public/images/emoji/google/thunder_cloud_rain.png differ
diff --git a/public/images/emoji/google/ticket.png b/public/images/emoji/google/ticket.png
index 9523d73fe99..6bd78c83299 100644
Binary files a/public/images/emoji/google/ticket.png and b/public/images/emoji/google/ticket.png differ
diff --git a/public/images/emoji/google/tickets.png b/public/images/emoji/google/tickets.png
index d4a4f20a291..64ccba10db2 100644
Binary files a/public/images/emoji/google/tickets.png and b/public/images/emoji/google/tickets.png differ
diff --git a/public/images/emoji/google/tiger.png b/public/images/emoji/google/tiger.png
index bcb497cda71..2c24a0e1cd6 100644
Binary files a/public/images/emoji/google/tiger.png and b/public/images/emoji/google/tiger.png differ
diff --git a/public/images/emoji/google/tiger2.png b/public/images/emoji/google/tiger2.png
index 9dc79730d9c..1b3d49a0ccc 100644
Binary files a/public/images/emoji/google/tiger2.png and b/public/images/emoji/google/tiger2.png differ
diff --git a/public/images/emoji/google/timer.png b/public/images/emoji/google/timer.png
index 970e7bdee46..fde01751ff9 100644
Binary files a/public/images/emoji/google/timer.png and b/public/images/emoji/google/timer.png differ
diff --git a/public/images/emoji/google/timer_clock.png b/public/images/emoji/google/timer_clock.png
index 970e7bdee46..fde01751ff9 100644
Binary files a/public/images/emoji/google/timer_clock.png and b/public/images/emoji/google/timer_clock.png differ
diff --git a/public/images/emoji/google/timor_leste.png b/public/images/emoji/google/timor_leste.png
index 9f5447a9c5b..e88ff74a770 100644
Binary files a/public/images/emoji/google/timor_leste.png and b/public/images/emoji/google/timor_leste.png differ
diff --git a/public/images/emoji/google/tipping_hand_man.png b/public/images/emoji/google/tipping_hand_man.png
index a6eaa688174..1eb3a089aaf 100644
Binary files a/public/images/emoji/google/tipping_hand_man.png and b/public/images/emoji/google/tipping_hand_man.png differ
diff --git a/public/images/emoji/google/tipping_hand_man/2.png b/public/images/emoji/google/tipping_hand_man/2.png
index 5252cee381f..4fd4272ba56 100644
Binary files a/public/images/emoji/google/tipping_hand_man/2.png and b/public/images/emoji/google/tipping_hand_man/2.png differ
diff --git a/public/images/emoji/google/tipping_hand_man/3.png b/public/images/emoji/google/tipping_hand_man/3.png
index 52eada652a7..5ceec8d5beb 100644
Binary files a/public/images/emoji/google/tipping_hand_man/3.png and b/public/images/emoji/google/tipping_hand_man/3.png differ
diff --git a/public/images/emoji/google/tipping_hand_man/4.png b/public/images/emoji/google/tipping_hand_man/4.png
index 0cfa09e361d..636d7991830 100644
Binary files a/public/images/emoji/google/tipping_hand_man/4.png and b/public/images/emoji/google/tipping_hand_man/4.png differ
diff --git a/public/images/emoji/google/tipping_hand_man/5.png b/public/images/emoji/google/tipping_hand_man/5.png
index 78ea0089828..539e480f526 100644
Binary files a/public/images/emoji/google/tipping_hand_man/5.png and b/public/images/emoji/google/tipping_hand_man/5.png differ
diff --git a/public/images/emoji/google/tipping_hand_man/6.png b/public/images/emoji/google/tipping_hand_man/6.png
index 7ee2daef290..0f5d4f5c4e3 100644
Binary files a/public/images/emoji/google/tipping_hand_man/6.png and b/public/images/emoji/google/tipping_hand_man/6.png differ
diff --git a/public/images/emoji/google/tipping_hand_woman.png b/public/images/emoji/google/tipping_hand_woman.png
index f84a2e02813..5a1a1083dd7 100644
Binary files a/public/images/emoji/google/tipping_hand_woman.png and b/public/images/emoji/google/tipping_hand_woman.png differ
diff --git a/public/images/emoji/google/tipping_hand_woman/2.png b/public/images/emoji/google/tipping_hand_woman/2.png
index 448acc172ad..57d49cd71ec 100644
Binary files a/public/images/emoji/google/tipping_hand_woman/2.png and b/public/images/emoji/google/tipping_hand_woman/2.png differ
diff --git a/public/images/emoji/google/tipping_hand_woman/3.png b/public/images/emoji/google/tipping_hand_woman/3.png
index 23c4c592bc8..acd7d01ccd1 100644
Binary files a/public/images/emoji/google/tipping_hand_woman/3.png and b/public/images/emoji/google/tipping_hand_woman/3.png differ
diff --git a/public/images/emoji/google/tipping_hand_woman/4.png b/public/images/emoji/google/tipping_hand_woman/4.png
index be3b2d1e72a..57834f9c194 100644
Binary files a/public/images/emoji/google/tipping_hand_woman/4.png and b/public/images/emoji/google/tipping_hand_woman/4.png differ
diff --git a/public/images/emoji/google/tipping_hand_woman/5.png b/public/images/emoji/google/tipping_hand_woman/5.png
index 35c12c49030..aef6e618290 100644
Binary files a/public/images/emoji/google/tipping_hand_woman/5.png and b/public/images/emoji/google/tipping_hand_woman/5.png differ
diff --git a/public/images/emoji/google/tipping_hand_woman/6.png b/public/images/emoji/google/tipping_hand_woman/6.png
index 67e0a0ca12b..e5e401338af 100644
Binary files a/public/images/emoji/google/tipping_hand_woman/6.png and b/public/images/emoji/google/tipping_hand_woman/6.png differ
diff --git a/public/images/emoji/google/tired_face.png b/public/images/emoji/google/tired_face.png
index 0b6f36462de..c89739037b6 100644
Binary files a/public/images/emoji/google/tired_face.png and b/public/images/emoji/google/tired_face.png differ
diff --git a/public/images/emoji/google/tm.png b/public/images/emoji/google/tm.png
index eb251084017..6957cfe1f2d 100644
Binary files a/public/images/emoji/google/tm.png and b/public/images/emoji/google/tm.png differ
diff --git a/public/images/emoji/google/togo.png b/public/images/emoji/google/togo.png
index 31f107a8f9c..9d20ca89fd5 100644
Binary files a/public/images/emoji/google/togo.png and b/public/images/emoji/google/togo.png differ
diff --git a/public/images/emoji/google/toilet.png b/public/images/emoji/google/toilet.png
index 08dbd74daa4..b13d4f4cb71 100644
Binary files a/public/images/emoji/google/toilet.png and b/public/images/emoji/google/toilet.png differ
diff --git a/public/images/emoji/google/tokelau.png b/public/images/emoji/google/tokelau.png
index 52c3213be57..5e5337f2237 100644
Binary files a/public/images/emoji/google/tokelau.png and b/public/images/emoji/google/tokelau.png differ
diff --git a/public/images/emoji/google/tokyo_tower.png b/public/images/emoji/google/tokyo_tower.png
index 6ae9f3923b1..0405e763721 100644
Binary files a/public/images/emoji/google/tokyo_tower.png and b/public/images/emoji/google/tokyo_tower.png differ
diff --git a/public/images/emoji/google/tomato.png b/public/images/emoji/google/tomato.png
index 5211b2c2f2e..6ed016c0cec 100644
Binary files a/public/images/emoji/google/tomato.png and b/public/images/emoji/google/tomato.png differ
diff --git a/public/images/emoji/google/tonga.png b/public/images/emoji/google/tonga.png
index aabcbefa5c7..dd067f20f3d 100644
Binary files a/public/images/emoji/google/tonga.png and b/public/images/emoji/google/tonga.png differ
diff --git a/public/images/emoji/google/tongue.png b/public/images/emoji/google/tongue.png
index 2bb68dd3a57..bdca4a075c6 100644
Binary files a/public/images/emoji/google/tongue.png and b/public/images/emoji/google/tongue.png differ
diff --git a/public/images/emoji/google/tools.png b/public/images/emoji/google/tools.png
index 174926ff02e..f0fe70817f3 100644
Binary files a/public/images/emoji/google/tools.png and b/public/images/emoji/google/tools.png differ
diff --git a/public/images/emoji/google/top.png b/public/images/emoji/google/top.png
index a0065f57a3a..c348a87084f 100644
Binary files a/public/images/emoji/google/top.png and b/public/images/emoji/google/top.png differ
diff --git a/public/images/emoji/google/tophat.png b/public/images/emoji/google/tophat.png
index 516e982d623..8ef667b90f8 100644
Binary files a/public/images/emoji/google/tophat.png and b/public/images/emoji/google/tophat.png differ
diff --git a/public/images/emoji/google/tornado.png b/public/images/emoji/google/tornado.png
index 7f488bc983f..b2e18065c1c 100644
Binary files a/public/images/emoji/google/tornado.png and b/public/images/emoji/google/tornado.png differ
diff --git a/public/images/emoji/google/tr.png b/public/images/emoji/google/tr.png
index 1b52acea75f..d1c0e608864 100644
Binary files a/public/images/emoji/google/tr.png and b/public/images/emoji/google/tr.png differ
diff --git a/public/images/emoji/google/track_next.png b/public/images/emoji/google/track_next.png
index 85f7bba60f7..1faa13a2d5d 100644
Binary files a/public/images/emoji/google/track_next.png and b/public/images/emoji/google/track_next.png differ
diff --git a/public/images/emoji/google/track_previous.png b/public/images/emoji/google/track_previous.png
index 559086b3c06..87e948c0809 100644
Binary files a/public/images/emoji/google/track_previous.png and b/public/images/emoji/google/track_previous.png differ
diff --git a/public/images/emoji/google/trackball.png b/public/images/emoji/google/trackball.png
index d0891896ec9..82db185aa2f 100644
Binary files a/public/images/emoji/google/trackball.png and b/public/images/emoji/google/trackball.png differ
diff --git a/public/images/emoji/google/tractor.png b/public/images/emoji/google/tractor.png
index 0de0ab08a85..9732a429ba4 100644
Binary files a/public/images/emoji/google/tractor.png and b/public/images/emoji/google/tractor.png differ
diff --git a/public/images/emoji/google/traffic_light.png b/public/images/emoji/google/traffic_light.png
index 43e9c0da20f..c3c6814d714 100644
Binary files a/public/images/emoji/google/traffic_light.png and b/public/images/emoji/google/traffic_light.png differ
diff --git a/public/images/emoji/google/train.png b/public/images/emoji/google/train.png
index 6f34e414844..24b28d47672 100644
Binary files a/public/images/emoji/google/train.png and b/public/images/emoji/google/train.png differ
diff --git a/public/images/emoji/google/train2.png b/public/images/emoji/google/train2.png
index 10105bc8d2b..5e514a07453 100644
Binary files a/public/images/emoji/google/train2.png and b/public/images/emoji/google/train2.png differ
diff --git a/public/images/emoji/google/tram.png b/public/images/emoji/google/tram.png
index 0d81f430a86..b85824ca9cf 100644
Binary files a/public/images/emoji/google/tram.png and b/public/images/emoji/google/tram.png differ
diff --git a/public/images/emoji/google/triangular_flag_on_post.png b/public/images/emoji/google/triangular_flag_on_post.png
index 495e1ee22af..1357e1e60d7 100644
Binary files a/public/images/emoji/google/triangular_flag_on_post.png and b/public/images/emoji/google/triangular_flag_on_post.png differ
diff --git a/public/images/emoji/google/triangular_ruler.png b/public/images/emoji/google/triangular_ruler.png
index 2419f0f5a05..9c3d45e3f44 100644
Binary files a/public/images/emoji/google/triangular_ruler.png and b/public/images/emoji/google/triangular_ruler.png differ
diff --git a/public/images/emoji/google/trident.png b/public/images/emoji/google/trident.png
index 45536a1ac1f..068d173f4a3 100644
Binary files a/public/images/emoji/google/trident.png and b/public/images/emoji/google/trident.png differ
diff --git a/public/images/emoji/google/trinidad_tobago.png b/public/images/emoji/google/trinidad_tobago.png
index 52bc446d8d0..050048d1a33 100644
Binary files a/public/images/emoji/google/trinidad_tobago.png and b/public/images/emoji/google/trinidad_tobago.png differ
diff --git a/public/images/emoji/google/tristan_da_cunha.png b/public/images/emoji/google/tristan_da_cunha.png
index 4dd6ecd04e5..49802d9dc68 100644
Binary files a/public/images/emoji/google/tristan_da_cunha.png and b/public/images/emoji/google/tristan_da_cunha.png differ
diff --git a/public/images/emoji/google/triumph.png b/public/images/emoji/google/triumph.png
index eae6985d997..0f05869abeb 100644
Binary files a/public/images/emoji/google/triumph.png and b/public/images/emoji/google/triumph.png differ
diff --git a/public/images/emoji/google/trolleybus.png b/public/images/emoji/google/trolleybus.png
index ab8c570e6ab..f53242ed7ed 100644
Binary files a/public/images/emoji/google/trolleybus.png and b/public/images/emoji/google/trolleybus.png differ
diff --git a/public/images/emoji/google/trophy.png b/public/images/emoji/google/trophy.png
index eb969912a94..efa8d1d2ed1 100644
Binary files a/public/images/emoji/google/trophy.png and b/public/images/emoji/google/trophy.png differ
diff --git a/public/images/emoji/google/tropical_drink.png b/public/images/emoji/google/tropical_drink.png
index b4e30786863..6ded42bfeee 100644
Binary files a/public/images/emoji/google/tropical_drink.png and b/public/images/emoji/google/tropical_drink.png differ
diff --git a/public/images/emoji/google/tropical_fish.png b/public/images/emoji/google/tropical_fish.png
index ff9c276b1cf..03ae21be6a0 100644
Binary files a/public/images/emoji/google/tropical_fish.png and b/public/images/emoji/google/tropical_fish.png differ
diff --git a/public/images/emoji/google/truck.png b/public/images/emoji/google/truck.png
index 0fbb5b4f669..88143531a56 100644
Binary files a/public/images/emoji/google/truck.png and b/public/images/emoji/google/truck.png differ
diff --git a/public/images/emoji/google/trumpet.png b/public/images/emoji/google/trumpet.png
index c1e906641fa..2d82a5dd9a3 100644
Binary files a/public/images/emoji/google/trumpet.png and b/public/images/emoji/google/trumpet.png differ
diff --git a/public/images/emoji/google/tshirt.png b/public/images/emoji/google/tshirt.png
index ef0745cb181..d93268cc4e2 100644
Binary files a/public/images/emoji/google/tshirt.png and b/public/images/emoji/google/tshirt.png differ
diff --git a/public/images/emoji/google/tulip.png b/public/images/emoji/google/tulip.png
index e841a28bba3..c881369686f 100644
Binary files a/public/images/emoji/google/tulip.png and b/public/images/emoji/google/tulip.png differ
diff --git a/public/images/emoji/google/tumbler_glass.png b/public/images/emoji/google/tumbler_glass.png
index 6fc6c89628f..565017fe1f1 100644
Binary files a/public/images/emoji/google/tumbler_glass.png and b/public/images/emoji/google/tumbler_glass.png differ
diff --git a/public/images/emoji/google/tunisia.png b/public/images/emoji/google/tunisia.png
index 9ba90c6c15c..0d947c90e93 100644
Binary files a/public/images/emoji/google/tunisia.png and b/public/images/emoji/google/tunisia.png differ
diff --git a/public/images/emoji/google/turkey.png b/public/images/emoji/google/turkey.png
index c0aae847c91..04781c09f9e 100644
Binary files a/public/images/emoji/google/turkey.png and b/public/images/emoji/google/turkey.png differ
diff --git a/public/images/emoji/google/turkmenistan.png b/public/images/emoji/google/turkmenistan.png
index 6c3dfed67a1..6e9a7883cb1 100644
Binary files a/public/images/emoji/google/turkmenistan.png and b/public/images/emoji/google/turkmenistan.png differ
diff --git a/public/images/emoji/google/turks_caicos_islands.png b/public/images/emoji/google/turks_caicos_islands.png
index e3f57dfe984..7eb5cd1fff4 100644
Binary files a/public/images/emoji/google/turks_caicos_islands.png and b/public/images/emoji/google/turks_caicos_islands.png differ
diff --git a/public/images/emoji/google/turtle.png b/public/images/emoji/google/turtle.png
index fce25a40ce3..aa422d075d3 100644
Binary files a/public/images/emoji/google/turtle.png and b/public/images/emoji/google/turtle.png differ
diff --git a/public/images/emoji/google/tuvalu.png b/public/images/emoji/google/tuvalu.png
index 179aa46066f..ad163e6a52c 100644
Binary files a/public/images/emoji/google/tuvalu.png and b/public/images/emoji/google/tuvalu.png differ
diff --git a/public/images/emoji/google/tv.png b/public/images/emoji/google/tv.png
index 5cd554ac60d..5b28652dfb1 100644
Binary files a/public/images/emoji/google/tv.png and b/public/images/emoji/google/tv.png differ
diff --git a/public/images/emoji/google/twisted_rightwards_arrows.png b/public/images/emoji/google/twisted_rightwards_arrows.png
index a187bc9b57b..6fa5fe3dd02 100644
Binary files a/public/images/emoji/google/twisted_rightwards_arrows.png and b/public/images/emoji/google/twisted_rightwards_arrows.png differ
diff --git a/public/images/emoji/google/two.png b/public/images/emoji/google/two.png
index 37c3fa792f7..481a50da6cf 100644
Binary files a/public/images/emoji/google/two.png and b/public/images/emoji/google/two.png differ
diff --git a/public/images/emoji/google/two_hearts.png b/public/images/emoji/google/two_hearts.png
index be2de5c738d..98b87b653dd 100644
Binary files a/public/images/emoji/google/two_hearts.png and b/public/images/emoji/google/two_hearts.png differ
diff --git a/public/images/emoji/google/two_men_holding_hands.png b/public/images/emoji/google/two_men_holding_hands.png
index 2c28894a112..ffbd370b8cf 100644
Binary files a/public/images/emoji/google/two_men_holding_hands.png and b/public/images/emoji/google/two_men_holding_hands.png differ
diff --git a/public/images/emoji/google/two_women_holding_hands.png b/public/images/emoji/google/two_women_holding_hands.png
index ea96bde5449..adde4bc2c18 100644
Binary files a/public/images/emoji/google/two_women_holding_hands.png and b/public/images/emoji/google/two_women_holding_hands.png differ
diff --git a/public/images/emoji/google/u5272.png b/public/images/emoji/google/u5272.png
index c0b6e8b67ac..49cec56a31b 100644
Binary files a/public/images/emoji/google/u5272.png and b/public/images/emoji/google/u5272.png differ
diff --git a/public/images/emoji/google/u5408.png b/public/images/emoji/google/u5408.png
index f74e250d0ff..3bedae2e119 100644
Binary files a/public/images/emoji/google/u5408.png and b/public/images/emoji/google/u5408.png differ
diff --git a/public/images/emoji/google/u55b6.png b/public/images/emoji/google/u55b6.png
index 48b07a4ed5d..1760e7153bc 100644
Binary files a/public/images/emoji/google/u55b6.png and b/public/images/emoji/google/u55b6.png differ
diff --git a/public/images/emoji/google/u6307.png b/public/images/emoji/google/u6307.png
index 8d5ad589b68..284502f7c37 100644
Binary files a/public/images/emoji/google/u6307.png and b/public/images/emoji/google/u6307.png differ
diff --git a/public/images/emoji/google/u6708.png b/public/images/emoji/google/u6708.png
index 18f9397f5e3..77ea2c0a7ad 100644
Binary files a/public/images/emoji/google/u6708.png and b/public/images/emoji/google/u6708.png differ
diff --git a/public/images/emoji/google/u6709.png b/public/images/emoji/google/u6709.png
index 29df4c52277..ec40330a6d1 100644
Binary files a/public/images/emoji/google/u6709.png and b/public/images/emoji/google/u6709.png differ
diff --git a/public/images/emoji/google/u6e80.png b/public/images/emoji/google/u6e80.png
index 749f759aa62..9bf638e0e0e 100644
Binary files a/public/images/emoji/google/u6e80.png and b/public/images/emoji/google/u6e80.png differ
diff --git a/public/images/emoji/google/u7121.png b/public/images/emoji/google/u7121.png
index d34fef0b4da..bc74187293f 100644
Binary files a/public/images/emoji/google/u7121.png and b/public/images/emoji/google/u7121.png differ
diff --git a/public/images/emoji/google/u7533.png b/public/images/emoji/google/u7533.png
index 73a7bf1d66a..47807c431e7 100644
Binary files a/public/images/emoji/google/u7533.png and b/public/images/emoji/google/u7533.png differ
diff --git a/public/images/emoji/google/u7981.png b/public/images/emoji/google/u7981.png
index bc603461a2e..cb0a60d06e9 100644
Binary files a/public/images/emoji/google/u7981.png and b/public/images/emoji/google/u7981.png differ
diff --git a/public/images/emoji/google/u7a7a.png b/public/images/emoji/google/u7a7a.png
index 12ab0fc2563..b28ebcaf6a2 100644
Binary files a/public/images/emoji/google/u7a7a.png and b/public/images/emoji/google/u7a7a.png differ
diff --git a/public/images/emoji/google/uganda.png b/public/images/emoji/google/uganda.png
index e897ff257c7..9f5dda6aa20 100644
Binary files a/public/images/emoji/google/uganda.png and b/public/images/emoji/google/uganda.png differ
diff --git a/public/images/emoji/google/uk.png b/public/images/emoji/google/uk.png
index 798328a1ee2..e7f3da7ea8c 100644
Binary files a/public/images/emoji/google/uk.png and b/public/images/emoji/google/uk.png differ
diff --git a/public/images/emoji/google/ukraine.png b/public/images/emoji/google/ukraine.png
index 5603cf126c2..a45fa0d5b12 100644
Binary files a/public/images/emoji/google/ukraine.png and b/public/images/emoji/google/ukraine.png differ
diff --git a/public/images/emoji/google/umbrella.png b/public/images/emoji/google/umbrella.png
index 61415439186..acd0e9db075 100644
Binary files a/public/images/emoji/google/umbrella.png and b/public/images/emoji/google/umbrella.png differ
diff --git a/public/images/emoji/google/umbrella2.png b/public/images/emoji/google/umbrella2.png
index 21b025ea515..fb2f8bb58b0 100644
Binary files a/public/images/emoji/google/umbrella2.png and b/public/images/emoji/google/umbrella2.png differ
diff --git a/public/images/emoji/google/umbrella_on_ground.png b/public/images/emoji/google/umbrella_on_ground.png
index 2a16b4d32a7..c7358ec9499 100644
Binary files a/public/images/emoji/google/umbrella_on_ground.png and b/public/images/emoji/google/umbrella_on_ground.png differ
diff --git a/public/images/emoji/google/unamused.png b/public/images/emoji/google/unamused.png
index 864cb335795..6086fa81e57 100644
Binary files a/public/images/emoji/google/unamused.png and b/public/images/emoji/google/unamused.png differ
diff --git a/public/images/emoji/google/underage.png b/public/images/emoji/google/underage.png
index 09e967fcad1..bdbc8778857 100644
Binary files a/public/images/emoji/google/underage.png and b/public/images/emoji/google/underage.png differ
diff --git a/public/images/emoji/google/unicorn.png b/public/images/emoji/google/unicorn.png
index b32a890bec6..63f23b29713 100644
Binary files a/public/images/emoji/google/unicorn.png and b/public/images/emoji/google/unicorn.png differ
diff --git a/public/images/emoji/google/unicorn_face.png b/public/images/emoji/google/unicorn_face.png
index b32a890bec6..63f23b29713 100644
Binary files a/public/images/emoji/google/unicorn_face.png and b/public/images/emoji/google/unicorn_face.png differ
diff --git a/public/images/emoji/google/united_arab_emirates.png b/public/images/emoji/google/united_arab_emirates.png
index 0e19ed7007c..34cae172b24 100644
Binary files a/public/images/emoji/google/united_arab_emirates.png and b/public/images/emoji/google/united_arab_emirates.png differ
diff --git a/public/images/emoji/google/united_nations.png b/public/images/emoji/google/united_nations.png
index 721551f2b17..2319f40a5d2 100644
Binary files a/public/images/emoji/google/united_nations.png and b/public/images/emoji/google/united_nations.png differ
diff --git a/public/images/emoji/google/unlock.png b/public/images/emoji/google/unlock.png
index 3f04497713d..e85fdcb0ed3 100644
Binary files a/public/images/emoji/google/unlock.png and b/public/images/emoji/google/unlock.png differ
diff --git a/public/images/emoji/google/up.png b/public/images/emoji/google/up.png
index ce2b306ca68..e755f1c17c1 100644
Binary files a/public/images/emoji/google/up.png and b/public/images/emoji/google/up.png differ
diff --git a/public/images/emoji/google/upside_down.png b/public/images/emoji/google/upside_down.png
index 17905e15783..9a2cb935c3a 100644
Binary files a/public/images/emoji/google/upside_down.png and b/public/images/emoji/google/upside_down.png differ
diff --git a/public/images/emoji/google/upside_down_face.png b/public/images/emoji/google/upside_down_face.png
index 17905e15783..9a2cb935c3a 100644
Binary files a/public/images/emoji/google/upside_down_face.png and b/public/images/emoji/google/upside_down_face.png differ
diff --git a/public/images/emoji/google/urn.png b/public/images/emoji/google/urn.png
index 864d903a351..22764683568 100644
Binary files a/public/images/emoji/google/urn.png and b/public/images/emoji/google/urn.png differ
diff --git a/public/images/emoji/google/uruguay.png b/public/images/emoji/google/uruguay.png
index 2e547a48ff6..67e76bd9d7a 100644
Binary files a/public/images/emoji/google/uruguay.png and b/public/images/emoji/google/uruguay.png differ
diff --git a/public/images/emoji/google/us.png b/public/images/emoji/google/us.png
index fae42715118..44daa439470 100644
Binary files a/public/images/emoji/google/us.png and b/public/images/emoji/google/us.png differ
diff --git a/public/images/emoji/google/us_outlying_islands.png b/public/images/emoji/google/us_outlying_islands.png
index fae42715118..44daa439470 100644
Binary files a/public/images/emoji/google/us_outlying_islands.png and b/public/images/emoji/google/us_outlying_islands.png differ
diff --git a/public/images/emoji/google/us_virgin_islands.png b/public/images/emoji/google/us_virgin_islands.png
index ddfe6616738..dc8b621abc1 100644
Binary files a/public/images/emoji/google/us_virgin_islands.png and b/public/images/emoji/google/us_virgin_islands.png differ
diff --git a/public/images/emoji/google/uzbekistan.png b/public/images/emoji/google/uzbekistan.png
index f460a0ee46f..69a3a188df5 100644
Binary files a/public/images/emoji/google/uzbekistan.png and b/public/images/emoji/google/uzbekistan.png differ
diff --git a/public/images/emoji/google/v.png b/public/images/emoji/google/v.png
index b8cbb64306b..f27b956aad0 100644
Binary files a/public/images/emoji/google/v.png and b/public/images/emoji/google/v.png differ
diff --git a/public/images/emoji/google/v/2.png b/public/images/emoji/google/v/2.png
index 1645b2899b5..ac53779b9f1 100644
Binary files a/public/images/emoji/google/v/2.png and b/public/images/emoji/google/v/2.png differ
diff --git a/public/images/emoji/google/v/3.png b/public/images/emoji/google/v/3.png
index 15dc6dd3d36..f8ba0bf5cef 100644
Binary files a/public/images/emoji/google/v/3.png and b/public/images/emoji/google/v/3.png differ
diff --git a/public/images/emoji/google/v/4.png b/public/images/emoji/google/v/4.png
index b79939791b8..807fa076d5c 100644
Binary files a/public/images/emoji/google/v/4.png and b/public/images/emoji/google/v/4.png differ
diff --git a/public/images/emoji/google/v/5.png b/public/images/emoji/google/v/5.png
index a7211c352cf..fedf80a7b3f 100644
Binary files a/public/images/emoji/google/v/5.png and b/public/images/emoji/google/v/5.png differ
diff --git a/public/images/emoji/google/v/6.png b/public/images/emoji/google/v/6.png
index 9f9b21f325b..dc52fdbfca5 100644
Binary files a/public/images/emoji/google/v/6.png and b/public/images/emoji/google/v/6.png differ
diff --git a/public/images/emoji/google/vampire.png b/public/images/emoji/google/vampire.png
index 01bd481c60d..ddfba45650b 100644
Binary files a/public/images/emoji/google/vampire.png and b/public/images/emoji/google/vampire.png differ
diff --git a/public/images/emoji/google/vampire/2.png b/public/images/emoji/google/vampire/2.png
index 548e6e82840..18bcd1cae15 100644
Binary files a/public/images/emoji/google/vampire/2.png and b/public/images/emoji/google/vampire/2.png differ
diff --git a/public/images/emoji/google/vampire/3.png b/public/images/emoji/google/vampire/3.png
index 6498305d066..a2809d10c22 100644
Binary files a/public/images/emoji/google/vampire/3.png and b/public/images/emoji/google/vampire/3.png differ
diff --git a/public/images/emoji/google/vampire/4.png b/public/images/emoji/google/vampire/4.png
index dab2ba096ee..320e3877e66 100644
Binary files a/public/images/emoji/google/vampire/4.png and b/public/images/emoji/google/vampire/4.png differ
diff --git a/public/images/emoji/google/vampire/5.png b/public/images/emoji/google/vampire/5.png
index dac38cae74c..898e8a066e9 100644
Binary files a/public/images/emoji/google/vampire/5.png and b/public/images/emoji/google/vampire/5.png differ
diff --git a/public/images/emoji/google/vampire/6.png b/public/images/emoji/google/vampire/6.png
index 3ad64b3710e..792e078db6c 100644
Binary files a/public/images/emoji/google/vampire/6.png and b/public/images/emoji/google/vampire/6.png differ
diff --git a/public/images/emoji/google/vanuatu.png b/public/images/emoji/google/vanuatu.png
index 3fc2e85ac8f..7ef97a06658 100644
Binary files a/public/images/emoji/google/vanuatu.png and b/public/images/emoji/google/vanuatu.png differ
diff --git a/public/images/emoji/google/vatican_city.png b/public/images/emoji/google/vatican_city.png
index 1fad5c92691..932dc6f9dbc 100644
Binary files a/public/images/emoji/google/vatican_city.png and b/public/images/emoji/google/vatican_city.png differ
diff --git a/public/images/emoji/google/venezuela.png b/public/images/emoji/google/venezuela.png
index 2e340a521a9..b62256b1716 100644
Binary files a/public/images/emoji/google/venezuela.png and b/public/images/emoji/google/venezuela.png differ
diff --git a/public/images/emoji/google/vertical_traffic_light.png b/public/images/emoji/google/vertical_traffic_light.png
index 795439a0f29..716a33c3ac4 100644
Binary files a/public/images/emoji/google/vertical_traffic_light.png and b/public/images/emoji/google/vertical_traffic_light.png differ
diff --git a/public/images/emoji/google/vhs.png b/public/images/emoji/google/vhs.png
index e3789dc34fd..6f90d54b09e 100644
Binary files a/public/images/emoji/google/vhs.png and b/public/images/emoji/google/vhs.png differ
diff --git a/public/images/emoji/google/vibration_mode.png b/public/images/emoji/google/vibration_mode.png
index a8f2fe50fe9..fe9ec4f2bdb 100644
Binary files a/public/images/emoji/google/vibration_mode.png and b/public/images/emoji/google/vibration_mode.png differ
diff --git a/public/images/emoji/google/video_camera.png b/public/images/emoji/google/video_camera.png
index fd426e4ad33..cdafa01e10f 100644
Binary files a/public/images/emoji/google/video_camera.png and b/public/images/emoji/google/video_camera.png differ
diff --git a/public/images/emoji/google/video_game.png b/public/images/emoji/google/video_game.png
index 66a883da313..6e25166a2f2 100644
Binary files a/public/images/emoji/google/video_game.png and b/public/images/emoji/google/video_game.png differ
diff --git a/public/images/emoji/google/vietnam.png b/public/images/emoji/google/vietnam.png
index 38ccc85e780..2f7e14c2d23 100644
Binary files a/public/images/emoji/google/vietnam.png and b/public/images/emoji/google/vietnam.png differ
diff --git a/public/images/emoji/google/violin.png b/public/images/emoji/google/violin.png
index e2d69249193..1c97e6b86b5 100644
Binary files a/public/images/emoji/google/violin.png and b/public/images/emoji/google/violin.png differ
diff --git a/public/images/emoji/google/virgo.png b/public/images/emoji/google/virgo.png
index 45473446ff4..686f14ed27c 100644
Binary files a/public/images/emoji/google/virgo.png and b/public/images/emoji/google/virgo.png differ
diff --git a/public/images/emoji/google/volcano.png b/public/images/emoji/google/volcano.png
index 0baf6540823..2002387c66a 100644
Binary files a/public/images/emoji/google/volcano.png and b/public/images/emoji/google/volcano.png differ
diff --git a/public/images/emoji/google/volleyball.png b/public/images/emoji/google/volleyball.png
index 4cb7f03b3c2..29570e66d3f 100644
Binary files a/public/images/emoji/google/volleyball.png and b/public/images/emoji/google/volleyball.png differ
diff --git a/public/images/emoji/google/vs.png b/public/images/emoji/google/vs.png
index 2fe23e57cec..3a5791a6cb5 100644
Binary files a/public/images/emoji/google/vs.png and b/public/images/emoji/google/vs.png differ
diff --git a/public/images/emoji/google/vulcan.png b/public/images/emoji/google/vulcan.png
index e672a711f11..bbedc6b2dcb 100644
Binary files a/public/images/emoji/google/vulcan.png and b/public/images/emoji/google/vulcan.png differ
diff --git a/public/images/emoji/google/vulcan/2.png b/public/images/emoji/google/vulcan/2.png
index 635aa1f7757..08e5bca6058 100644
Binary files a/public/images/emoji/google/vulcan/2.png and b/public/images/emoji/google/vulcan/2.png differ
diff --git a/public/images/emoji/google/vulcan/3.png b/public/images/emoji/google/vulcan/3.png
index d6c303152c4..c1059af3e0e 100644
Binary files a/public/images/emoji/google/vulcan/3.png and b/public/images/emoji/google/vulcan/3.png differ
diff --git a/public/images/emoji/google/vulcan/4.png b/public/images/emoji/google/vulcan/4.png
index 645ad295a80..a6cc78518c9 100644
Binary files a/public/images/emoji/google/vulcan/4.png and b/public/images/emoji/google/vulcan/4.png differ
diff --git a/public/images/emoji/google/vulcan/5.png b/public/images/emoji/google/vulcan/5.png
index cbb240d2c67..b4d9b458f90 100644
Binary files a/public/images/emoji/google/vulcan/5.png and b/public/images/emoji/google/vulcan/5.png differ
diff --git a/public/images/emoji/google/vulcan/6.png b/public/images/emoji/google/vulcan/6.png
index 0e727c865aa..815b2959ece 100644
Binary files a/public/images/emoji/google/vulcan/6.png and b/public/images/emoji/google/vulcan/6.png differ
diff --git a/public/images/emoji/google/vulcan_salute.png b/public/images/emoji/google/vulcan_salute.png
index e672a711f11..bbedc6b2dcb 100644
Binary files a/public/images/emoji/google/vulcan_salute.png and b/public/images/emoji/google/vulcan_salute.png differ
diff --git a/public/images/emoji/google/vulcan_salute/2.png b/public/images/emoji/google/vulcan_salute/2.png
index 635aa1f7757..08e5bca6058 100644
Binary files a/public/images/emoji/google/vulcan_salute/2.png and b/public/images/emoji/google/vulcan_salute/2.png differ
diff --git a/public/images/emoji/google/vulcan_salute/3.png b/public/images/emoji/google/vulcan_salute/3.png
index d6c303152c4..c1059af3e0e 100644
Binary files a/public/images/emoji/google/vulcan_salute/3.png and b/public/images/emoji/google/vulcan_salute/3.png differ
diff --git a/public/images/emoji/google/vulcan_salute/4.png b/public/images/emoji/google/vulcan_salute/4.png
index 645ad295a80..a6cc78518c9 100644
Binary files a/public/images/emoji/google/vulcan_salute/4.png and b/public/images/emoji/google/vulcan_salute/4.png differ
diff --git a/public/images/emoji/google/vulcan_salute/5.png b/public/images/emoji/google/vulcan_salute/5.png
index cbb240d2c67..b4d9b458f90 100644
Binary files a/public/images/emoji/google/vulcan_salute/5.png and b/public/images/emoji/google/vulcan_salute/5.png differ
diff --git a/public/images/emoji/google/vulcan_salute/6.png b/public/images/emoji/google/vulcan_salute/6.png
index 0e727c865aa..815b2959ece 100644
Binary files a/public/images/emoji/google/vulcan_salute/6.png and b/public/images/emoji/google/vulcan_salute/6.png differ
diff --git a/public/images/emoji/google/walking.png b/public/images/emoji/google/walking.png
index 509a8cdabec..56b2b543795 100644
Binary files a/public/images/emoji/google/walking.png and b/public/images/emoji/google/walking.png differ
diff --git a/public/images/emoji/google/walking/2.png b/public/images/emoji/google/walking/2.png
index e20ab752606..8aaf7b8bb14 100644
Binary files a/public/images/emoji/google/walking/2.png and b/public/images/emoji/google/walking/2.png differ
diff --git a/public/images/emoji/google/walking/3.png b/public/images/emoji/google/walking/3.png
index 766cfec327a..86999750136 100644
Binary files a/public/images/emoji/google/walking/3.png and b/public/images/emoji/google/walking/3.png differ
diff --git a/public/images/emoji/google/walking/4.png b/public/images/emoji/google/walking/4.png
index a2a6fe42cf9..87a2a6ee098 100644
Binary files a/public/images/emoji/google/walking/4.png and b/public/images/emoji/google/walking/4.png differ
diff --git a/public/images/emoji/google/walking/5.png b/public/images/emoji/google/walking/5.png
index 855ebfa8c7c..10a74048e18 100644
Binary files a/public/images/emoji/google/walking/5.png and b/public/images/emoji/google/walking/5.png differ
diff --git a/public/images/emoji/google/walking/6.png b/public/images/emoji/google/walking/6.png
index 80df101bfdd..8c0fd45250b 100644
Binary files a/public/images/emoji/google/walking/6.png and b/public/images/emoji/google/walking/6.png differ
diff --git a/public/images/emoji/google/walking_man.png b/public/images/emoji/google/walking_man.png
index 509a8cdabec..56b2b543795 100644
Binary files a/public/images/emoji/google/walking_man.png and b/public/images/emoji/google/walking_man.png differ
diff --git a/public/images/emoji/google/walking_man/2.png b/public/images/emoji/google/walking_man/2.png
index e20ab752606..8aaf7b8bb14 100644
Binary files a/public/images/emoji/google/walking_man/2.png and b/public/images/emoji/google/walking_man/2.png differ
diff --git a/public/images/emoji/google/walking_man/3.png b/public/images/emoji/google/walking_man/3.png
index 766cfec327a..86999750136 100644
Binary files a/public/images/emoji/google/walking_man/3.png and b/public/images/emoji/google/walking_man/3.png differ
diff --git a/public/images/emoji/google/walking_man/4.png b/public/images/emoji/google/walking_man/4.png
index a2a6fe42cf9..87a2a6ee098 100644
Binary files a/public/images/emoji/google/walking_man/4.png and b/public/images/emoji/google/walking_man/4.png differ
diff --git a/public/images/emoji/google/walking_man/5.png b/public/images/emoji/google/walking_man/5.png
index 855ebfa8c7c..10a74048e18 100644
Binary files a/public/images/emoji/google/walking_man/5.png and b/public/images/emoji/google/walking_man/5.png differ
diff --git a/public/images/emoji/google/walking_man/6.png b/public/images/emoji/google/walking_man/6.png
index 80df101bfdd..8c0fd45250b 100644
Binary files a/public/images/emoji/google/walking_man/6.png and b/public/images/emoji/google/walking_man/6.png differ
diff --git a/public/images/emoji/google/walking_woman.png b/public/images/emoji/google/walking_woman.png
index 5f70f0657fb..2b87e8537aa 100644
Binary files a/public/images/emoji/google/walking_woman.png and b/public/images/emoji/google/walking_woman.png differ
diff --git a/public/images/emoji/google/walking_woman/2.png b/public/images/emoji/google/walking_woman/2.png
index 10c82332c25..8e3a0e8987f 100644
Binary files a/public/images/emoji/google/walking_woman/2.png and b/public/images/emoji/google/walking_woman/2.png differ
diff --git a/public/images/emoji/google/walking_woman/3.png b/public/images/emoji/google/walking_woman/3.png
index e99c4be9afc..b9a582918af 100644
Binary files a/public/images/emoji/google/walking_woman/3.png and b/public/images/emoji/google/walking_woman/3.png differ
diff --git a/public/images/emoji/google/walking_woman/4.png b/public/images/emoji/google/walking_woman/4.png
index b06773ed466..793ab915a59 100644
Binary files a/public/images/emoji/google/walking_woman/4.png and b/public/images/emoji/google/walking_woman/4.png differ
diff --git a/public/images/emoji/google/walking_woman/5.png b/public/images/emoji/google/walking_woman/5.png
index dadb3e34161..b41933d1b47 100644
Binary files a/public/images/emoji/google/walking_woman/5.png and b/public/images/emoji/google/walking_woman/5.png differ
diff --git a/public/images/emoji/google/walking_woman/6.png b/public/images/emoji/google/walking_woman/6.png
index a2b5f60343d..fe3f3a0ca42 100644
Binary files a/public/images/emoji/google/walking_woman/6.png and b/public/images/emoji/google/walking_woman/6.png differ
diff --git a/public/images/emoji/google/wallis_futuna.png b/public/images/emoji/google/wallis_futuna.png
index dad0f8ce650..4faf7e252ef 100644
Binary files a/public/images/emoji/google/wallis_futuna.png and b/public/images/emoji/google/wallis_futuna.png differ
diff --git a/public/images/emoji/google/waning_crescent_moon.png b/public/images/emoji/google/waning_crescent_moon.png
index 308cad43ead..58c850524b9 100644
Binary files a/public/images/emoji/google/waning_crescent_moon.png and b/public/images/emoji/google/waning_crescent_moon.png differ
diff --git a/public/images/emoji/google/waning_gibbous_moon.png b/public/images/emoji/google/waning_gibbous_moon.png
index a3d48ca2219..ccf5a37369c 100644
Binary files a/public/images/emoji/google/waning_gibbous_moon.png and b/public/images/emoji/google/waning_gibbous_moon.png differ
diff --git a/public/images/emoji/google/warning.png b/public/images/emoji/google/warning.png
index 9e3a4f3afeb..f33839b22a8 100644
Binary files a/public/images/emoji/google/warning.png and b/public/images/emoji/google/warning.png differ
diff --git a/public/images/emoji/google/wastebasket.png b/public/images/emoji/google/wastebasket.png
index 874a3480e88..a7f3c2c755b 100644
Binary files a/public/images/emoji/google/wastebasket.png and b/public/images/emoji/google/wastebasket.png differ
diff --git a/public/images/emoji/google/watch.png b/public/images/emoji/google/watch.png
index d405c22176a..23dd7198008 100644
Binary files a/public/images/emoji/google/watch.png and b/public/images/emoji/google/watch.png differ
diff --git a/public/images/emoji/google/water_buffalo.png b/public/images/emoji/google/water_buffalo.png
index 1b2f9c7e59f..4875eabcf8d 100644
Binary files a/public/images/emoji/google/water_buffalo.png and b/public/images/emoji/google/water_buffalo.png differ
diff --git a/public/images/emoji/google/watermelon.png b/public/images/emoji/google/watermelon.png
index db68e490110..d42382a85f1 100644
Binary files a/public/images/emoji/google/watermelon.png and b/public/images/emoji/google/watermelon.png differ
diff --git a/public/images/emoji/google/wave.png b/public/images/emoji/google/wave.png
index 90bca6de08a..03d613d6e3b 100644
Binary files a/public/images/emoji/google/wave.png and b/public/images/emoji/google/wave.png differ
diff --git a/public/images/emoji/google/wave/2.png b/public/images/emoji/google/wave/2.png
index 5c034714b0d..afa3ea3147b 100644
Binary files a/public/images/emoji/google/wave/2.png and b/public/images/emoji/google/wave/2.png differ
diff --git a/public/images/emoji/google/wave/3.png b/public/images/emoji/google/wave/3.png
index 9a2825e24e4..f660986817c 100644
Binary files a/public/images/emoji/google/wave/3.png and b/public/images/emoji/google/wave/3.png differ
diff --git a/public/images/emoji/google/wave/4.png b/public/images/emoji/google/wave/4.png
index bfbb943f5bc..1620086b5b4 100644
Binary files a/public/images/emoji/google/wave/4.png and b/public/images/emoji/google/wave/4.png differ
diff --git a/public/images/emoji/google/wave/5.png b/public/images/emoji/google/wave/5.png
index f4233b8168e..7f7915f2a72 100644
Binary files a/public/images/emoji/google/wave/5.png and b/public/images/emoji/google/wave/5.png differ
diff --git a/public/images/emoji/google/wave/6.png b/public/images/emoji/google/wave/6.png
index d403d79c6fe..318a34130c5 100644
Binary files a/public/images/emoji/google/wave/6.png and b/public/images/emoji/google/wave/6.png differ
diff --git a/public/images/emoji/google/waving_black_flag.png b/public/images/emoji/google/waving_black_flag.png
index a7fce0c5812..fd30f1d8823 100644
Binary files a/public/images/emoji/google/waving_black_flag.png and b/public/images/emoji/google/waving_black_flag.png differ
diff --git a/public/images/emoji/google/waving_white_flag.png b/public/images/emoji/google/waving_white_flag.png
index 7876a1b95cc..07d1f0ac704 100644
Binary files a/public/images/emoji/google/waving_white_flag.png and b/public/images/emoji/google/waving_white_flag.png differ
diff --git a/public/images/emoji/google/wavy_dash.png b/public/images/emoji/google/wavy_dash.png
index a11c57148d4..89ce4b99759 100644
Binary files a/public/images/emoji/google/wavy_dash.png and b/public/images/emoji/google/wavy_dash.png differ
diff --git a/public/images/emoji/google/waxing_crescent_moon.png b/public/images/emoji/google/waxing_crescent_moon.png
index eafecdf5738..e3c40420854 100644
Binary files a/public/images/emoji/google/waxing_crescent_moon.png and b/public/images/emoji/google/waxing_crescent_moon.png differ
diff --git a/public/images/emoji/google/waxing_gibbous_moon.png b/public/images/emoji/google/waxing_gibbous_moon.png
index 358209cb644..046e3415c89 100644
Binary files a/public/images/emoji/google/waxing_gibbous_moon.png and b/public/images/emoji/google/waxing_gibbous_moon.png differ
diff --git a/public/images/emoji/google/wc.png b/public/images/emoji/google/wc.png
index b56cd1743b0..4ded4875ad8 100644
Binary files a/public/images/emoji/google/wc.png and b/public/images/emoji/google/wc.png differ
diff --git a/public/images/emoji/google/weary.png b/public/images/emoji/google/weary.png
index 16b0783cec0..819cd5cc46c 100644
Binary files a/public/images/emoji/google/weary.png and b/public/images/emoji/google/weary.png differ
diff --git a/public/images/emoji/google/wedding.png b/public/images/emoji/google/wedding.png
index 750e7e0c4a0..1edc1ca2e6c 100644
Binary files a/public/images/emoji/google/wedding.png and b/public/images/emoji/google/wedding.png differ
diff --git a/public/images/emoji/google/weight_lifter.png b/public/images/emoji/google/weight_lifter.png
index 47689fc2921..d570f812ae3 100644
Binary files a/public/images/emoji/google/weight_lifter.png and b/public/images/emoji/google/weight_lifter.png differ
diff --git a/public/images/emoji/google/weight_lifter/2.png b/public/images/emoji/google/weight_lifter/2.png
index 56ac45601aa..711814184f6 100644
Binary files a/public/images/emoji/google/weight_lifter/2.png and b/public/images/emoji/google/weight_lifter/2.png differ
diff --git a/public/images/emoji/google/weight_lifter/3.png b/public/images/emoji/google/weight_lifter/3.png
index e4f89233ed0..87ea4ab0bd2 100644
Binary files a/public/images/emoji/google/weight_lifter/3.png and b/public/images/emoji/google/weight_lifter/3.png differ
diff --git a/public/images/emoji/google/weight_lifter/4.png b/public/images/emoji/google/weight_lifter/4.png
index a0a5133cf44..7b424da2ad5 100644
Binary files a/public/images/emoji/google/weight_lifter/4.png and b/public/images/emoji/google/weight_lifter/4.png differ
diff --git a/public/images/emoji/google/weight_lifter/5.png b/public/images/emoji/google/weight_lifter/5.png
index a38a3c841a9..62304ee8eae 100644
Binary files a/public/images/emoji/google/weight_lifter/5.png and b/public/images/emoji/google/weight_lifter/5.png differ
diff --git a/public/images/emoji/google/weight_lifter/6.png b/public/images/emoji/google/weight_lifter/6.png
index f5b56144633..e1a4357862a 100644
Binary files a/public/images/emoji/google/weight_lifter/6.png and b/public/images/emoji/google/weight_lifter/6.png differ
diff --git a/public/images/emoji/google/weight_lifting_man.png b/public/images/emoji/google/weight_lifting_man.png
index 47689fc2921..d570f812ae3 100644
Binary files a/public/images/emoji/google/weight_lifting_man.png and b/public/images/emoji/google/weight_lifting_man.png differ
diff --git a/public/images/emoji/google/weight_lifting_man/2.png b/public/images/emoji/google/weight_lifting_man/2.png
index 56ac45601aa..711814184f6 100644
Binary files a/public/images/emoji/google/weight_lifting_man/2.png and b/public/images/emoji/google/weight_lifting_man/2.png differ
diff --git a/public/images/emoji/google/weight_lifting_man/3.png b/public/images/emoji/google/weight_lifting_man/3.png
index e4f89233ed0..87ea4ab0bd2 100644
Binary files a/public/images/emoji/google/weight_lifting_man/3.png and b/public/images/emoji/google/weight_lifting_man/3.png differ
diff --git a/public/images/emoji/google/weight_lifting_man/4.png b/public/images/emoji/google/weight_lifting_man/4.png
index a0a5133cf44..7b424da2ad5 100644
Binary files a/public/images/emoji/google/weight_lifting_man/4.png and b/public/images/emoji/google/weight_lifting_man/4.png differ
diff --git a/public/images/emoji/google/weight_lifting_man/5.png b/public/images/emoji/google/weight_lifting_man/5.png
index a38a3c841a9..62304ee8eae 100644
Binary files a/public/images/emoji/google/weight_lifting_man/5.png and b/public/images/emoji/google/weight_lifting_man/5.png differ
diff --git a/public/images/emoji/google/weight_lifting_man/6.png b/public/images/emoji/google/weight_lifting_man/6.png
index f5b56144633..e1a4357862a 100644
Binary files a/public/images/emoji/google/weight_lifting_man/6.png and b/public/images/emoji/google/weight_lifting_man/6.png differ
diff --git a/public/images/emoji/google/weight_lifting_woman.png b/public/images/emoji/google/weight_lifting_woman.png
index 52b046d7d83..d47ac9688c7 100644
Binary files a/public/images/emoji/google/weight_lifting_woman.png and b/public/images/emoji/google/weight_lifting_woman.png differ
diff --git a/public/images/emoji/google/western_sahara.png b/public/images/emoji/google/western_sahara.png
index dad0f8ce650..4faf7e252ef 100644
Binary files a/public/images/emoji/google/western_sahara.png and b/public/images/emoji/google/western_sahara.png differ
diff --git a/public/images/emoji/google/whale.png b/public/images/emoji/google/whale.png
index 114853b6262..698ee64a11d 100644
Binary files a/public/images/emoji/google/whale.png and b/public/images/emoji/google/whale.png differ
diff --git a/public/images/emoji/google/whale2.png b/public/images/emoji/google/whale2.png
index 0b96c8556b5..93eac3af509 100644
Binary files a/public/images/emoji/google/whale2.png and b/public/images/emoji/google/whale2.png differ
diff --git a/public/images/emoji/google/wheel_of_dharma.png b/public/images/emoji/google/wheel_of_dharma.png
index 71da4ccd167..08c8f26116d 100644
Binary files a/public/images/emoji/google/wheel_of_dharma.png and b/public/images/emoji/google/wheel_of_dharma.png differ
diff --git a/public/images/emoji/google/wheelchair.png b/public/images/emoji/google/wheelchair.png
index 96ac605b623..8dcf463590c 100644
Binary files a/public/images/emoji/google/wheelchair.png and b/public/images/emoji/google/wheelchair.png differ
diff --git a/public/images/emoji/google/white_check_mark.png b/public/images/emoji/google/white_check_mark.png
index 5c357f7c11c..2383fb4046e 100644
Binary files a/public/images/emoji/google/white_check_mark.png and b/public/images/emoji/google/white_check_mark.png differ
diff --git a/public/images/emoji/google/white_circle.png b/public/images/emoji/google/white_circle.png
index 6723e92a5f0..ac6931ad0fb 100644
Binary files a/public/images/emoji/google/white_circle.png and b/public/images/emoji/google/white_circle.png differ
diff --git a/public/images/emoji/google/white_flag.png b/public/images/emoji/google/white_flag.png
index 7876a1b95cc..07d1f0ac704 100644
Binary files a/public/images/emoji/google/white_flag.png and b/public/images/emoji/google/white_flag.png differ
diff --git a/public/images/emoji/google/white_flower.png b/public/images/emoji/google/white_flower.png
index dfa80abfe72..578e06c4231 100644
Binary files a/public/images/emoji/google/white_flower.png and b/public/images/emoji/google/white_flower.png differ
diff --git a/public/images/emoji/google/white_frowning_face.png b/public/images/emoji/google/white_frowning_face.png
index 7248eaba8ac..a8a41ad7c25 100644
Binary files a/public/images/emoji/google/white_frowning_face.png and b/public/images/emoji/google/white_frowning_face.png differ
diff --git a/public/images/emoji/google/white_large_square.png b/public/images/emoji/google/white_large_square.png
index 79debc6d730..78b8fc961a3 100644
Binary files a/public/images/emoji/google/white_large_square.png and b/public/images/emoji/google/white_large_square.png differ
diff --git a/public/images/emoji/google/white_medium_small_square.png b/public/images/emoji/google/white_medium_small_square.png
index 9067cd7ef9a..56d54d96ab9 100644
Binary files a/public/images/emoji/google/white_medium_small_square.png and b/public/images/emoji/google/white_medium_small_square.png differ
diff --git a/public/images/emoji/google/white_medium_square.png b/public/images/emoji/google/white_medium_square.png
index cfdbe99458e..9f5e3266fa0 100644
Binary files a/public/images/emoji/google/white_medium_square.png and b/public/images/emoji/google/white_medium_square.png differ
diff --git a/public/images/emoji/google/white_small_square.png b/public/images/emoji/google/white_small_square.png
index 57078785603..574c4681f06 100644
Binary files a/public/images/emoji/google/white_small_square.png and b/public/images/emoji/google/white_small_square.png differ
diff --git a/public/images/emoji/google/white_square_button.png b/public/images/emoji/google/white_square_button.png
index 7e68a0c8ba5..8450f158147 100644
Binary files a/public/images/emoji/google/white_square_button.png and b/public/images/emoji/google/white_square_button.png differ
diff --git a/public/images/emoji/google/white_sun_behind_cloud.png b/public/images/emoji/google/white_sun_behind_cloud.png
index e3a78dca903..2adf6fc83ef 100644
Binary files a/public/images/emoji/google/white_sun_behind_cloud.png and b/public/images/emoji/google/white_sun_behind_cloud.png differ
diff --git a/public/images/emoji/google/white_sun_behind_cloud_with_rain.png b/public/images/emoji/google/white_sun_behind_cloud_with_rain.png
index 4fc26cb31b6..1d5cfc81bf0 100644
Binary files a/public/images/emoji/google/white_sun_behind_cloud_with_rain.png and b/public/images/emoji/google/white_sun_behind_cloud_with_rain.png differ
diff --git a/public/images/emoji/google/white_sun_cloud.png b/public/images/emoji/google/white_sun_cloud.png
index e3a78dca903..2adf6fc83ef 100644
Binary files a/public/images/emoji/google/white_sun_cloud.png and b/public/images/emoji/google/white_sun_cloud.png differ
diff --git a/public/images/emoji/google/white_sun_rain_cloud.png b/public/images/emoji/google/white_sun_rain_cloud.png
index 4fc26cb31b6..1d5cfc81bf0 100644
Binary files a/public/images/emoji/google/white_sun_rain_cloud.png and b/public/images/emoji/google/white_sun_rain_cloud.png differ
diff --git a/public/images/emoji/google/white_sun_small_cloud.png b/public/images/emoji/google/white_sun_small_cloud.png
index ca30e8990bd..91998ebb313 100644
Binary files a/public/images/emoji/google/white_sun_small_cloud.png and b/public/images/emoji/google/white_sun_small_cloud.png differ
diff --git a/public/images/emoji/google/white_sun_with_small_cloud.png b/public/images/emoji/google/white_sun_with_small_cloud.png
index ca30e8990bd..91998ebb313 100644
Binary files a/public/images/emoji/google/white_sun_with_small_cloud.png and b/public/images/emoji/google/white_sun_with_small_cloud.png differ
diff --git a/public/images/emoji/google/wilted_flower.png b/public/images/emoji/google/wilted_flower.png
index 58be454893f..837b38c2e3c 100644
Binary files a/public/images/emoji/google/wilted_flower.png and b/public/images/emoji/google/wilted_flower.png differ
diff --git a/public/images/emoji/google/wind_blowing_face.png b/public/images/emoji/google/wind_blowing_face.png
index b7184aa468f..9d4564b7d82 100644
Binary files a/public/images/emoji/google/wind_blowing_face.png and b/public/images/emoji/google/wind_blowing_face.png differ
diff --git a/public/images/emoji/google/wind_chime.png b/public/images/emoji/google/wind_chime.png
index ba76dbc1bfd..ffe151334ab 100644
Binary files a/public/images/emoji/google/wind_chime.png and b/public/images/emoji/google/wind_chime.png differ
diff --git a/public/images/emoji/google/wind_face.png b/public/images/emoji/google/wind_face.png
index b7184aa468f..9d4564b7d82 100644
Binary files a/public/images/emoji/google/wind_face.png and b/public/images/emoji/google/wind_face.png differ
diff --git a/public/images/emoji/google/wine_glass.png b/public/images/emoji/google/wine_glass.png
index dc515b30655..4bbae3e7313 100644
Binary files a/public/images/emoji/google/wine_glass.png and b/public/images/emoji/google/wine_glass.png differ
diff --git a/public/images/emoji/google/wink.png b/public/images/emoji/google/wink.png
index 4a06288ae65..10bad34b209 100644
Binary files a/public/images/emoji/google/wink.png and b/public/images/emoji/google/wink.png differ
diff --git a/public/images/emoji/google/wolf.png b/public/images/emoji/google/wolf.png
index f6bfb3f47c2..65207a1ec62 100644
Binary files a/public/images/emoji/google/wolf.png and b/public/images/emoji/google/wolf.png differ
diff --git a/public/images/emoji/google/woman.png b/public/images/emoji/google/woman.png
index 058ac922a70..3435d4c5a6d 100644
Binary files a/public/images/emoji/google/woman.png and b/public/images/emoji/google/woman.png differ
diff --git a/public/images/emoji/google/woman/2.png b/public/images/emoji/google/woman/2.png
index 99a6a7c4287..7f2b3959b9d 100644
Binary files a/public/images/emoji/google/woman/2.png and b/public/images/emoji/google/woman/2.png differ
diff --git a/public/images/emoji/google/woman/3.png b/public/images/emoji/google/woman/3.png
index 35beb7b0469..c36d3c7980e 100644
Binary files a/public/images/emoji/google/woman/3.png and b/public/images/emoji/google/woman/3.png differ
diff --git a/public/images/emoji/google/woman/4.png b/public/images/emoji/google/woman/4.png
index 2b783f6a8c7..5913bb1e7b5 100644
Binary files a/public/images/emoji/google/woman/4.png and b/public/images/emoji/google/woman/4.png differ
diff --git a/public/images/emoji/google/woman/5.png b/public/images/emoji/google/woman/5.png
index 734c78d6467..f8be9a29d55 100644
Binary files a/public/images/emoji/google/woman/5.png and b/public/images/emoji/google/woman/5.png differ
diff --git a/public/images/emoji/google/woman/6.png b/public/images/emoji/google/woman/6.png
index c0a3986e5ff..af6e1a6ea52 100644
Binary files a/public/images/emoji/google/woman/6.png and b/public/images/emoji/google/woman/6.png differ
diff --git a/public/images/emoji/google/woman_artist.png b/public/images/emoji/google/woman_artist.png
index 8f158f24503..c9f5f021150 100644
Binary files a/public/images/emoji/google/woman_artist.png and b/public/images/emoji/google/woman_artist.png differ
diff --git a/public/images/emoji/google/woman_artist/2.png b/public/images/emoji/google/woman_artist/2.png
index 001ca83b260..d3e38907b93 100644
Binary files a/public/images/emoji/google/woman_artist/2.png and b/public/images/emoji/google/woman_artist/2.png differ
diff --git a/public/images/emoji/google/woman_artist/3.png b/public/images/emoji/google/woman_artist/3.png
index 5f41ea5f823..b54bdfd47e7 100644
Binary files a/public/images/emoji/google/woman_artist/3.png and b/public/images/emoji/google/woman_artist/3.png differ
diff --git a/public/images/emoji/google/woman_artist/4.png b/public/images/emoji/google/woman_artist/4.png
index 5b5e3fcd504..a1ade3bce21 100644
Binary files a/public/images/emoji/google/woman_artist/4.png and b/public/images/emoji/google/woman_artist/4.png differ
diff --git a/public/images/emoji/google/woman_artist/5.png b/public/images/emoji/google/woman_artist/5.png
index cefcb973326..fc13f109f66 100644
Binary files a/public/images/emoji/google/woman_artist/5.png and b/public/images/emoji/google/woman_artist/5.png differ
diff --git a/public/images/emoji/google/woman_artist/6.png b/public/images/emoji/google/woman_artist/6.png
index 93ae8562d58..2bcca7c8b94 100644
Binary files a/public/images/emoji/google/woman_artist/6.png and b/public/images/emoji/google/woman_artist/6.png differ
diff --git a/public/images/emoji/google/woman_astronaut.png b/public/images/emoji/google/woman_astronaut.png
index 5505538a5cf..1c5f4fc51f0 100644
Binary files a/public/images/emoji/google/woman_astronaut.png and b/public/images/emoji/google/woman_astronaut.png differ
diff --git a/public/images/emoji/google/woman_astronaut/2.png b/public/images/emoji/google/woman_astronaut/2.png
index aae23cda090..5b63c9f3b43 100644
Binary files a/public/images/emoji/google/woman_astronaut/2.png and b/public/images/emoji/google/woman_astronaut/2.png differ
diff --git a/public/images/emoji/google/woman_astronaut/3.png b/public/images/emoji/google/woman_astronaut/3.png
index c109ee20f32..7fd9d6be8df 100644
Binary files a/public/images/emoji/google/woman_astronaut/3.png and b/public/images/emoji/google/woman_astronaut/3.png differ
diff --git a/public/images/emoji/google/woman_astronaut/4.png b/public/images/emoji/google/woman_astronaut/4.png
index 5bc3c000831..6cc43f4cd66 100644
Binary files a/public/images/emoji/google/woman_astronaut/4.png and b/public/images/emoji/google/woman_astronaut/4.png differ
diff --git a/public/images/emoji/google/woman_astronaut/5.png b/public/images/emoji/google/woman_astronaut/5.png
index f431f727879..88779d27bd0 100644
Binary files a/public/images/emoji/google/woman_astronaut/5.png and b/public/images/emoji/google/woman_astronaut/5.png differ
diff --git a/public/images/emoji/google/woman_astronaut/6.png b/public/images/emoji/google/woman_astronaut/6.png
index 44168800937..36369c36508 100644
Binary files a/public/images/emoji/google/woman_astronaut/6.png and b/public/images/emoji/google/woman_astronaut/6.png differ
diff --git a/public/images/emoji/google/woman_cartwheeling.png b/public/images/emoji/google/woman_cartwheeling.png
index fda8a2d50b9..4bb67d8513b 100644
Binary files a/public/images/emoji/google/woman_cartwheeling.png and b/public/images/emoji/google/woman_cartwheeling.png differ
diff --git a/public/images/emoji/google/woman_cartwheeling/2.png b/public/images/emoji/google/woman_cartwheeling/2.png
index df68948dc86..38176a6d0d6 100644
Binary files a/public/images/emoji/google/woman_cartwheeling/2.png and b/public/images/emoji/google/woman_cartwheeling/2.png differ
diff --git a/public/images/emoji/google/woman_cartwheeling/3.png b/public/images/emoji/google/woman_cartwheeling/3.png
index 67712e50056..4f6cddbabf5 100644
Binary files a/public/images/emoji/google/woman_cartwheeling/3.png and b/public/images/emoji/google/woman_cartwheeling/3.png differ
diff --git a/public/images/emoji/google/woman_cartwheeling/4.png b/public/images/emoji/google/woman_cartwheeling/4.png
index 6a56eb65396..638c5678c1d 100644
Binary files a/public/images/emoji/google/woman_cartwheeling/4.png and b/public/images/emoji/google/woman_cartwheeling/4.png differ
diff --git a/public/images/emoji/google/woman_cartwheeling/5.png b/public/images/emoji/google/woman_cartwheeling/5.png
index ae2760e26ba..4d2ac50b7ad 100644
Binary files a/public/images/emoji/google/woman_cartwheeling/5.png and b/public/images/emoji/google/woman_cartwheeling/5.png differ
diff --git a/public/images/emoji/google/woman_cartwheeling/6.png b/public/images/emoji/google/woman_cartwheeling/6.png
index 92171ba2086..9fae2a8d098 100644
Binary files a/public/images/emoji/google/woman_cartwheeling/6.png and b/public/images/emoji/google/woman_cartwheeling/6.png differ
diff --git a/public/images/emoji/google/woman_climbing.png b/public/images/emoji/google/woman_climbing.png
new file mode 100644
index 00000000000..021a0b719a5
Binary files /dev/null and b/public/images/emoji/google/woman_climbing.png differ
diff --git a/public/images/emoji/google/woman_climbing/2.png b/public/images/emoji/google/woman_climbing/2.png
new file mode 100644
index 00000000000..652d3789cfd
Binary files /dev/null and b/public/images/emoji/google/woman_climbing/2.png differ
diff --git a/public/images/emoji/google/woman_climbing/3.png b/public/images/emoji/google/woman_climbing/3.png
new file mode 100644
index 00000000000..22ec77f1110
Binary files /dev/null and b/public/images/emoji/google/woman_climbing/3.png differ
diff --git a/public/images/emoji/google/woman_climbing/4.png b/public/images/emoji/google/woman_climbing/4.png
new file mode 100644
index 00000000000..1fde8236151
Binary files /dev/null and b/public/images/emoji/google/woman_climbing/4.png differ
diff --git a/public/images/emoji/google/woman_climbing/5.png b/public/images/emoji/google/woman_climbing/5.png
new file mode 100644
index 00000000000..fbd6c35f9f1
Binary files /dev/null and b/public/images/emoji/google/woman_climbing/5.png differ
diff --git a/public/images/emoji/google/woman_climbing/6.png b/public/images/emoji/google/woman_climbing/6.png
new file mode 100644
index 00000000000..be71fe1419b
Binary files /dev/null and b/public/images/emoji/google/woman_climbing/6.png differ
diff --git a/public/images/emoji/google/woman_cook.png b/public/images/emoji/google/woman_cook.png
index 293d1bf583f..2d3c1889ea1 100644
Binary files a/public/images/emoji/google/woman_cook.png and b/public/images/emoji/google/woman_cook.png differ
diff --git a/public/images/emoji/google/woman_cook/2.png b/public/images/emoji/google/woman_cook/2.png
index c05237df598..cbbf29c743b 100644
Binary files a/public/images/emoji/google/woman_cook/2.png and b/public/images/emoji/google/woman_cook/2.png differ
diff --git a/public/images/emoji/google/woman_cook/3.png b/public/images/emoji/google/woman_cook/3.png
index 63cdde05b88..dc17fdbbb05 100644
Binary files a/public/images/emoji/google/woman_cook/3.png and b/public/images/emoji/google/woman_cook/3.png differ
diff --git a/public/images/emoji/google/woman_cook/4.png b/public/images/emoji/google/woman_cook/4.png
index e5546526e76..633d9d3bac2 100644
Binary files a/public/images/emoji/google/woman_cook/4.png and b/public/images/emoji/google/woman_cook/4.png differ
diff --git a/public/images/emoji/google/woman_cook/5.png b/public/images/emoji/google/woman_cook/5.png
index 07a5ca711b6..53b11f21280 100644
Binary files a/public/images/emoji/google/woman_cook/5.png and b/public/images/emoji/google/woman_cook/5.png differ
diff --git a/public/images/emoji/google/woman_cook/6.png b/public/images/emoji/google/woman_cook/6.png
index b08c20bb85a..e94157a7ca6 100644
Binary files a/public/images/emoji/google/woman_cook/6.png and b/public/images/emoji/google/woman_cook/6.png differ
diff --git a/public/images/emoji/google/woman_facepalming.png b/public/images/emoji/google/woman_facepalming.png
index 545a28a2ab8..fd224744565 100644
Binary files a/public/images/emoji/google/woman_facepalming.png and b/public/images/emoji/google/woman_facepalming.png differ
diff --git a/public/images/emoji/google/woman_facepalming/2.png b/public/images/emoji/google/woman_facepalming/2.png
index b4c1b9189f4..3a0109e29a4 100644
Binary files a/public/images/emoji/google/woman_facepalming/2.png and b/public/images/emoji/google/woman_facepalming/2.png differ
diff --git a/public/images/emoji/google/woman_facepalming/3.png b/public/images/emoji/google/woman_facepalming/3.png
index 34678c776b1..09f1a1a7ac7 100644
Binary files a/public/images/emoji/google/woman_facepalming/3.png and b/public/images/emoji/google/woman_facepalming/3.png differ
diff --git a/public/images/emoji/google/woman_facepalming/4.png b/public/images/emoji/google/woman_facepalming/4.png
index a951cc15b77..3a0c56a0cca 100644
Binary files a/public/images/emoji/google/woman_facepalming/4.png and b/public/images/emoji/google/woman_facepalming/4.png differ
diff --git a/public/images/emoji/google/woman_facepalming/5.png b/public/images/emoji/google/woman_facepalming/5.png
index 54e377054f9..48ed68232f3 100644
Binary files a/public/images/emoji/google/woman_facepalming/5.png and b/public/images/emoji/google/woman_facepalming/5.png differ
diff --git a/public/images/emoji/google/woman_facepalming/6.png b/public/images/emoji/google/woman_facepalming/6.png
index 5a432ab436f..d1f5e4c347b 100644
Binary files a/public/images/emoji/google/woman_facepalming/6.png and b/public/images/emoji/google/woman_facepalming/6.png differ
diff --git a/public/images/emoji/google/woman_factory_worker.png b/public/images/emoji/google/woman_factory_worker.png
index ea445420a5c..8e050581c84 100644
Binary files a/public/images/emoji/google/woman_factory_worker.png and b/public/images/emoji/google/woman_factory_worker.png differ
diff --git a/public/images/emoji/google/woman_factory_worker/2.png b/public/images/emoji/google/woman_factory_worker/2.png
index a529dbdf458..c6ba714cdd9 100644
Binary files a/public/images/emoji/google/woman_factory_worker/2.png and b/public/images/emoji/google/woman_factory_worker/2.png differ
diff --git a/public/images/emoji/google/woman_factory_worker/3.png b/public/images/emoji/google/woman_factory_worker/3.png
index 99fa60a9361..a784cc3de7c 100644
Binary files a/public/images/emoji/google/woman_factory_worker/3.png and b/public/images/emoji/google/woman_factory_worker/3.png differ
diff --git a/public/images/emoji/google/woman_factory_worker/4.png b/public/images/emoji/google/woman_factory_worker/4.png
index f189a16315b..911dd709b42 100644
Binary files a/public/images/emoji/google/woman_factory_worker/4.png and b/public/images/emoji/google/woman_factory_worker/4.png differ
diff --git a/public/images/emoji/google/woman_factory_worker/5.png b/public/images/emoji/google/woman_factory_worker/5.png
index 1dcc1598475..a3cb7c1718d 100644
Binary files a/public/images/emoji/google/woman_factory_worker/5.png and b/public/images/emoji/google/woman_factory_worker/5.png differ
diff --git a/public/images/emoji/google/woman_factory_worker/6.png b/public/images/emoji/google/woman_factory_worker/6.png
index fd6e058e78b..1e4349664f0 100644
Binary files a/public/images/emoji/google/woman_factory_worker/6.png and b/public/images/emoji/google/woman_factory_worker/6.png differ
diff --git a/public/images/emoji/google/woman_farmer.png b/public/images/emoji/google/woman_farmer.png
index d894f4a079f..7a3a131c26c 100644
Binary files a/public/images/emoji/google/woman_farmer.png and b/public/images/emoji/google/woman_farmer.png differ
diff --git a/public/images/emoji/google/woman_farmer/2.png b/public/images/emoji/google/woman_farmer/2.png
index 2097b976bbf..30449e7a500 100644
Binary files a/public/images/emoji/google/woman_farmer/2.png and b/public/images/emoji/google/woman_farmer/2.png differ
diff --git a/public/images/emoji/google/woman_farmer/3.png b/public/images/emoji/google/woman_farmer/3.png
index f442f76cb92..6dcd2c519b9 100644
Binary files a/public/images/emoji/google/woman_farmer/3.png and b/public/images/emoji/google/woman_farmer/3.png differ
diff --git a/public/images/emoji/google/woman_farmer/4.png b/public/images/emoji/google/woman_farmer/4.png
index 0062e66b21f..c9768e0ac0a 100644
Binary files a/public/images/emoji/google/woman_farmer/4.png and b/public/images/emoji/google/woman_farmer/4.png differ
diff --git a/public/images/emoji/google/woman_farmer/5.png b/public/images/emoji/google/woman_farmer/5.png
index 443fd921def..d1937e68840 100644
Binary files a/public/images/emoji/google/woman_farmer/5.png and b/public/images/emoji/google/woman_farmer/5.png differ
diff --git a/public/images/emoji/google/woman_farmer/6.png b/public/images/emoji/google/woman_farmer/6.png
index 09c1847f811..300706280ef 100644
Binary files a/public/images/emoji/google/woman_farmer/6.png and b/public/images/emoji/google/woman_farmer/6.png differ
diff --git a/public/images/emoji/google/woman_firefighter.png b/public/images/emoji/google/woman_firefighter.png
index fcd02ecb2dd..b6d109ae505 100644
Binary files a/public/images/emoji/google/woman_firefighter.png and b/public/images/emoji/google/woman_firefighter.png differ
diff --git a/public/images/emoji/google/woman_firefighter/2.png b/public/images/emoji/google/woman_firefighter/2.png
index bd4c141f494..db97e4ffac2 100644
Binary files a/public/images/emoji/google/woman_firefighter/2.png and b/public/images/emoji/google/woman_firefighter/2.png differ
diff --git a/public/images/emoji/google/woman_firefighter/3.png b/public/images/emoji/google/woman_firefighter/3.png
index 72fe9dd61d6..05da18a1e35 100644
Binary files a/public/images/emoji/google/woman_firefighter/3.png and b/public/images/emoji/google/woman_firefighter/3.png differ
diff --git a/public/images/emoji/google/woman_firefighter/4.png b/public/images/emoji/google/woman_firefighter/4.png
index 68e5aba4ce5..a85f02b9dd2 100644
Binary files a/public/images/emoji/google/woman_firefighter/4.png and b/public/images/emoji/google/woman_firefighter/4.png differ
diff --git a/public/images/emoji/google/woman_firefighter/5.png b/public/images/emoji/google/woman_firefighter/5.png
index b98ba5dc9a4..62fc451281c 100644
Binary files a/public/images/emoji/google/woman_firefighter/5.png and b/public/images/emoji/google/woman_firefighter/5.png differ
diff --git a/public/images/emoji/google/woman_firefighter/6.png b/public/images/emoji/google/woman_firefighter/6.png
index e936ad67bee..8e815d0c932 100644
Binary files a/public/images/emoji/google/woman_firefighter/6.png and b/public/images/emoji/google/woman_firefighter/6.png differ
diff --git a/public/images/emoji/google/woman_genie.png b/public/images/emoji/google/woman_genie.png
new file mode 100644
index 00000000000..19c606d424c
Binary files /dev/null and b/public/images/emoji/google/woman_genie.png differ
diff --git a/public/images/emoji/google/woman_health_worker.png b/public/images/emoji/google/woman_health_worker.png
index 455bd7b24b7..810c445fc2d 100644
Binary files a/public/images/emoji/google/woman_health_worker.png and b/public/images/emoji/google/woman_health_worker.png differ
diff --git a/public/images/emoji/google/woman_health_worker/2.png b/public/images/emoji/google/woman_health_worker/2.png
index b668529d5d4..7c86db8120e 100644
Binary files a/public/images/emoji/google/woman_health_worker/2.png and b/public/images/emoji/google/woman_health_worker/2.png differ
diff --git a/public/images/emoji/google/woman_health_worker/3.png b/public/images/emoji/google/woman_health_worker/3.png
index 09b136615b2..d6a034db86f 100644
Binary files a/public/images/emoji/google/woman_health_worker/3.png and b/public/images/emoji/google/woman_health_worker/3.png differ
diff --git a/public/images/emoji/google/woman_health_worker/4.png b/public/images/emoji/google/woman_health_worker/4.png
index fc8edda1fd3..a5cb06d79b3 100644
Binary files a/public/images/emoji/google/woman_health_worker/4.png and b/public/images/emoji/google/woman_health_worker/4.png differ
diff --git a/public/images/emoji/google/woman_health_worker/5.png b/public/images/emoji/google/woman_health_worker/5.png
index a007e1d6c35..e0e743323c4 100644
Binary files a/public/images/emoji/google/woman_health_worker/5.png and b/public/images/emoji/google/woman_health_worker/5.png differ
diff --git a/public/images/emoji/google/woman_health_worker/6.png b/public/images/emoji/google/woman_health_worker/6.png
index bda7018049b..1c0ce717659 100644
Binary files a/public/images/emoji/google/woman_health_worker/6.png and b/public/images/emoji/google/woman_health_worker/6.png differ
diff --git a/public/images/emoji/google/woman_in_lotus_position.png b/public/images/emoji/google/woman_in_lotus_position.png
new file mode 100644
index 00000000000..17aaf80ab6f
Binary files /dev/null and b/public/images/emoji/google/woman_in_lotus_position.png differ
diff --git a/public/images/emoji/google/woman_in_lotus_position/2.png b/public/images/emoji/google/woman_in_lotus_position/2.png
new file mode 100644
index 00000000000..bfee0b81386
Binary files /dev/null and b/public/images/emoji/google/woman_in_lotus_position/2.png differ
diff --git a/public/images/emoji/google/woman_in_lotus_position/3.png b/public/images/emoji/google/woman_in_lotus_position/3.png
new file mode 100644
index 00000000000..a915b1535a0
Binary files /dev/null and b/public/images/emoji/google/woman_in_lotus_position/3.png differ
diff --git a/public/images/emoji/google/woman_in_lotus_position/4.png b/public/images/emoji/google/woman_in_lotus_position/4.png
new file mode 100644
index 00000000000..c73d4b0acc2
Binary files /dev/null and b/public/images/emoji/google/woman_in_lotus_position/4.png differ
diff --git a/public/images/emoji/google/woman_in_lotus_position/5.png b/public/images/emoji/google/woman_in_lotus_position/5.png
new file mode 100644
index 00000000000..632ae6aa519
Binary files /dev/null and b/public/images/emoji/google/woman_in_lotus_position/5.png differ
diff --git a/public/images/emoji/google/woman_in_lotus_position/6.png b/public/images/emoji/google/woman_in_lotus_position/6.png
new file mode 100644
index 00000000000..1551833ad25
Binary files /dev/null and b/public/images/emoji/google/woman_in_lotus_position/6.png differ
diff --git a/public/images/emoji/google/woman_in_steamy_room.png b/public/images/emoji/google/woman_in_steamy_room.png
new file mode 100644
index 00000000000..1395f737c39
Binary files /dev/null and b/public/images/emoji/google/woman_in_steamy_room.png differ
diff --git a/public/images/emoji/google/woman_in_steamy_room/2.png b/public/images/emoji/google/woman_in_steamy_room/2.png
new file mode 100644
index 00000000000..a1da82b2f69
Binary files /dev/null and b/public/images/emoji/google/woman_in_steamy_room/2.png differ
diff --git a/public/images/emoji/google/woman_in_steamy_room/3.png b/public/images/emoji/google/woman_in_steamy_room/3.png
new file mode 100644
index 00000000000..e47ef7c9516
Binary files /dev/null and b/public/images/emoji/google/woman_in_steamy_room/3.png differ
diff --git a/public/images/emoji/google/woman_in_steamy_room/4.png b/public/images/emoji/google/woman_in_steamy_room/4.png
new file mode 100644
index 00000000000..fd476ea7d08
Binary files /dev/null and b/public/images/emoji/google/woman_in_steamy_room/4.png differ
diff --git a/public/images/emoji/google/woman_in_steamy_room/5.png b/public/images/emoji/google/woman_in_steamy_room/5.png
new file mode 100644
index 00000000000..a1f21491a0d
Binary files /dev/null and b/public/images/emoji/google/woman_in_steamy_room/5.png differ
diff --git a/public/images/emoji/google/woman_in_steamy_room/6.png b/public/images/emoji/google/woman_in_steamy_room/6.png
new file mode 100644
index 00000000000..7a990547616
Binary files /dev/null and b/public/images/emoji/google/woman_in_steamy_room/6.png differ
diff --git a/public/images/emoji/google/woman_judge.png b/public/images/emoji/google/woman_judge.png
index ae2d4f1060b..ebee12d4a9b 100644
Binary files a/public/images/emoji/google/woman_judge.png and b/public/images/emoji/google/woman_judge.png differ
diff --git a/public/images/emoji/google/woman_judge/2.png b/public/images/emoji/google/woman_judge/2.png
index 198e959987f..135cb8ee4ff 100644
Binary files a/public/images/emoji/google/woman_judge/2.png and b/public/images/emoji/google/woman_judge/2.png differ
diff --git a/public/images/emoji/google/woman_judge/3.png b/public/images/emoji/google/woman_judge/3.png
index 65193777b87..745e7efd37a 100644
Binary files a/public/images/emoji/google/woman_judge/3.png and b/public/images/emoji/google/woman_judge/3.png differ
diff --git a/public/images/emoji/google/woman_judge/4.png b/public/images/emoji/google/woman_judge/4.png
index 27d70a95801..6fcae23c419 100644
Binary files a/public/images/emoji/google/woman_judge/4.png and b/public/images/emoji/google/woman_judge/4.png differ
diff --git a/public/images/emoji/google/woman_judge/5.png b/public/images/emoji/google/woman_judge/5.png
index 107b1df76ae..43ebd2dd5df 100644
Binary files a/public/images/emoji/google/woman_judge/5.png and b/public/images/emoji/google/woman_judge/5.png differ
diff --git a/public/images/emoji/google/woman_judge/6.png b/public/images/emoji/google/woman_judge/6.png
index 10aae699cab..7959a31a1b2 100644
Binary files a/public/images/emoji/google/woman_judge/6.png and b/public/images/emoji/google/woman_judge/6.png differ
diff --git a/public/images/emoji/google/woman_juggling.png b/public/images/emoji/google/woman_juggling.png
index 189098d6164..b843d5530c1 100644
Binary files a/public/images/emoji/google/woman_juggling.png and b/public/images/emoji/google/woman_juggling.png differ
diff --git a/public/images/emoji/google/woman_juggling/2.png b/public/images/emoji/google/woman_juggling/2.png
index e999b0923cb..baeb075b40f 100644
Binary files a/public/images/emoji/google/woman_juggling/2.png and b/public/images/emoji/google/woman_juggling/2.png differ
diff --git a/public/images/emoji/google/woman_juggling/3.png b/public/images/emoji/google/woman_juggling/3.png
index 6ff879f5e46..31d71f287b5 100644
Binary files a/public/images/emoji/google/woman_juggling/3.png and b/public/images/emoji/google/woman_juggling/3.png differ
diff --git a/public/images/emoji/google/woman_juggling/4.png b/public/images/emoji/google/woman_juggling/4.png
index 2827bd824e4..11f129b22af 100644
Binary files a/public/images/emoji/google/woman_juggling/4.png and b/public/images/emoji/google/woman_juggling/4.png differ
diff --git a/public/images/emoji/google/woman_juggling/5.png b/public/images/emoji/google/woman_juggling/5.png
index 60e76455f9b..14339481430 100644
Binary files a/public/images/emoji/google/woman_juggling/5.png and b/public/images/emoji/google/woman_juggling/5.png differ
diff --git a/public/images/emoji/google/woman_juggling/6.png b/public/images/emoji/google/woman_juggling/6.png
index caa0d3c91d6..3285908a251 100644
Binary files a/public/images/emoji/google/woman_juggling/6.png and b/public/images/emoji/google/woman_juggling/6.png differ
diff --git a/public/images/emoji/google/woman_mage.png b/public/images/emoji/google/woman_mage.png
new file mode 100644
index 00000000000..887a5bbfa95
Binary files /dev/null and b/public/images/emoji/google/woman_mage.png differ
diff --git a/public/images/emoji/google/woman_mage/2.png b/public/images/emoji/google/woman_mage/2.png
new file mode 100644
index 00000000000..8b011be490c
Binary files /dev/null and b/public/images/emoji/google/woman_mage/2.png differ
diff --git a/public/images/emoji/google/woman_mage/3.png b/public/images/emoji/google/woman_mage/3.png
new file mode 100644
index 00000000000..1144565e1a4
Binary files /dev/null and b/public/images/emoji/google/woman_mage/3.png differ
diff --git a/public/images/emoji/google/woman_mage/4.png b/public/images/emoji/google/woman_mage/4.png
new file mode 100644
index 00000000000..2f1a7b2a2c4
Binary files /dev/null and b/public/images/emoji/google/woman_mage/4.png differ
diff --git a/public/images/emoji/google/woman_mage/5.png b/public/images/emoji/google/woman_mage/5.png
new file mode 100644
index 00000000000..58aef187b79
Binary files /dev/null and b/public/images/emoji/google/woman_mage/5.png differ
diff --git a/public/images/emoji/google/woman_mage/6.png b/public/images/emoji/google/woman_mage/6.png
new file mode 100644
index 00000000000..86d9fc7929a
Binary files /dev/null and b/public/images/emoji/google/woman_mage/6.png differ
diff --git a/public/images/emoji/google/woman_mechanic.png b/public/images/emoji/google/woman_mechanic.png
index 7eeb2ef6bc6..70af3085a4b 100644
Binary files a/public/images/emoji/google/woman_mechanic.png and b/public/images/emoji/google/woman_mechanic.png differ
diff --git a/public/images/emoji/google/woman_mechanic/2.png b/public/images/emoji/google/woman_mechanic/2.png
index e1ef75546d0..d7eec2aaca8 100644
Binary files a/public/images/emoji/google/woman_mechanic/2.png and b/public/images/emoji/google/woman_mechanic/2.png differ
diff --git a/public/images/emoji/google/woman_mechanic/3.png b/public/images/emoji/google/woman_mechanic/3.png
index c39f8a474f1..3bfe4d6db0f 100644
Binary files a/public/images/emoji/google/woman_mechanic/3.png and b/public/images/emoji/google/woman_mechanic/3.png differ
diff --git a/public/images/emoji/google/woman_mechanic/4.png b/public/images/emoji/google/woman_mechanic/4.png
index bac5d42b8d1..6618a664e11 100644
Binary files a/public/images/emoji/google/woman_mechanic/4.png and b/public/images/emoji/google/woman_mechanic/4.png differ
diff --git a/public/images/emoji/google/woman_mechanic/5.png b/public/images/emoji/google/woman_mechanic/5.png
index 4fc2caffd8a..d248676a60f 100644
Binary files a/public/images/emoji/google/woman_mechanic/5.png and b/public/images/emoji/google/woman_mechanic/5.png differ
diff --git a/public/images/emoji/google/woman_mechanic/6.png b/public/images/emoji/google/woman_mechanic/6.png
index a5351ed74c1..80fe3befe10 100644
Binary files a/public/images/emoji/google/woman_mechanic/6.png and b/public/images/emoji/google/woman_mechanic/6.png differ
diff --git a/public/images/emoji/google/woman_office_worker.png b/public/images/emoji/google/woman_office_worker.png
index ee71c20cecf..7778c685379 100644
Binary files a/public/images/emoji/google/woman_office_worker.png and b/public/images/emoji/google/woman_office_worker.png differ
diff --git a/public/images/emoji/google/woman_office_worker/2.png b/public/images/emoji/google/woman_office_worker/2.png
index 0ca85ae238c..36322659e0a 100644
Binary files a/public/images/emoji/google/woman_office_worker/2.png and b/public/images/emoji/google/woman_office_worker/2.png differ
diff --git a/public/images/emoji/google/woman_office_worker/3.png b/public/images/emoji/google/woman_office_worker/3.png
index db57388467e..a4eaaf79665 100644
Binary files a/public/images/emoji/google/woman_office_worker/3.png and b/public/images/emoji/google/woman_office_worker/3.png differ
diff --git a/public/images/emoji/google/woman_office_worker/4.png b/public/images/emoji/google/woman_office_worker/4.png
index 19919209801..7133b0b5ded 100644
Binary files a/public/images/emoji/google/woman_office_worker/4.png and b/public/images/emoji/google/woman_office_worker/4.png differ
diff --git a/public/images/emoji/google/woman_office_worker/5.png b/public/images/emoji/google/woman_office_worker/5.png
index df9bce7b2f2..fdcb19fd4a8 100644
Binary files a/public/images/emoji/google/woman_office_worker/5.png and b/public/images/emoji/google/woman_office_worker/5.png differ
diff --git a/public/images/emoji/google/woman_office_worker/6.png b/public/images/emoji/google/woman_office_worker/6.png
index 935bcfebc2d..36d13687aaf 100644
Binary files a/public/images/emoji/google/woman_office_worker/6.png and b/public/images/emoji/google/woman_office_worker/6.png differ
diff --git a/public/images/emoji/google/woman_pilot.png b/public/images/emoji/google/woman_pilot.png
index 20cc8707161..5b3ad9ff31f 100644
Binary files a/public/images/emoji/google/woman_pilot.png and b/public/images/emoji/google/woman_pilot.png differ
diff --git a/public/images/emoji/google/woman_pilot/2.png b/public/images/emoji/google/woman_pilot/2.png
index 378e61efe14..aa799abf01a 100644
Binary files a/public/images/emoji/google/woman_pilot/2.png and b/public/images/emoji/google/woman_pilot/2.png differ
diff --git a/public/images/emoji/google/woman_pilot/3.png b/public/images/emoji/google/woman_pilot/3.png
index e2484c4785f..6e7648a9bcb 100644
Binary files a/public/images/emoji/google/woman_pilot/3.png and b/public/images/emoji/google/woman_pilot/3.png differ
diff --git a/public/images/emoji/google/woman_pilot/4.png b/public/images/emoji/google/woman_pilot/4.png
index f59c81321fd..0fe55e61a2d 100644
Binary files a/public/images/emoji/google/woman_pilot/4.png and b/public/images/emoji/google/woman_pilot/4.png differ
diff --git a/public/images/emoji/google/woman_pilot/5.png b/public/images/emoji/google/woman_pilot/5.png
index 7a3b523ab91..2c45e9286db 100644
Binary files a/public/images/emoji/google/woman_pilot/5.png and b/public/images/emoji/google/woman_pilot/5.png differ
diff --git a/public/images/emoji/google/woman_pilot/6.png b/public/images/emoji/google/woman_pilot/6.png
index d0e729e4775..ed8420a82b6 100644
Binary files a/public/images/emoji/google/woman_pilot/6.png and b/public/images/emoji/google/woman_pilot/6.png differ
diff --git a/public/images/emoji/google/woman_playing_handball.png b/public/images/emoji/google/woman_playing_handball.png
index 00c62370167..f2043215264 100644
Binary files a/public/images/emoji/google/woman_playing_handball.png and b/public/images/emoji/google/woman_playing_handball.png differ
diff --git a/public/images/emoji/google/woman_playing_handball/2.png b/public/images/emoji/google/woman_playing_handball/2.png
index 2396626d8e6..04259642e64 100644
Binary files a/public/images/emoji/google/woman_playing_handball/2.png and b/public/images/emoji/google/woman_playing_handball/2.png differ
diff --git a/public/images/emoji/google/woman_playing_handball/3.png b/public/images/emoji/google/woman_playing_handball/3.png
index b49ba0f3bb5..0e20761ca13 100644
Binary files a/public/images/emoji/google/woman_playing_handball/3.png and b/public/images/emoji/google/woman_playing_handball/3.png differ
diff --git a/public/images/emoji/google/woman_playing_handball/4.png b/public/images/emoji/google/woman_playing_handball/4.png
index 70db301bf57..cec20257ce9 100644
Binary files a/public/images/emoji/google/woman_playing_handball/4.png and b/public/images/emoji/google/woman_playing_handball/4.png differ
diff --git a/public/images/emoji/google/woman_playing_handball/5.png b/public/images/emoji/google/woman_playing_handball/5.png
index bc5b60a12a3..15dc46e700b 100644
Binary files a/public/images/emoji/google/woman_playing_handball/5.png and b/public/images/emoji/google/woman_playing_handball/5.png differ
diff --git a/public/images/emoji/google/woman_playing_handball/6.png b/public/images/emoji/google/woman_playing_handball/6.png
index 5e7574d8604..585f5ba3cab 100644
Binary files a/public/images/emoji/google/woman_playing_handball/6.png and b/public/images/emoji/google/woman_playing_handball/6.png differ
diff --git a/public/images/emoji/google/woman_playing_water_polo.png b/public/images/emoji/google/woman_playing_water_polo.png
index fe24b5346da..e83877e5ee3 100644
Binary files a/public/images/emoji/google/woman_playing_water_polo.png and b/public/images/emoji/google/woman_playing_water_polo.png differ
diff --git a/public/images/emoji/google/woman_playing_water_polo/2.png b/public/images/emoji/google/woman_playing_water_polo/2.png
index 3f3798dd662..8b33e9553f2 100644
Binary files a/public/images/emoji/google/woman_playing_water_polo/2.png and b/public/images/emoji/google/woman_playing_water_polo/2.png differ
diff --git a/public/images/emoji/google/woman_playing_water_polo/3.png b/public/images/emoji/google/woman_playing_water_polo/3.png
index e3db492fa53..563950d5203 100644
Binary files a/public/images/emoji/google/woman_playing_water_polo/3.png and b/public/images/emoji/google/woman_playing_water_polo/3.png differ
diff --git a/public/images/emoji/google/woman_playing_water_polo/4.png b/public/images/emoji/google/woman_playing_water_polo/4.png
index 9a80e701a64..82a829d7a94 100644
Binary files a/public/images/emoji/google/woman_playing_water_polo/4.png and b/public/images/emoji/google/woman_playing_water_polo/4.png differ
diff --git a/public/images/emoji/google/woman_playing_water_polo/5.png b/public/images/emoji/google/woman_playing_water_polo/5.png
index 8c706e9fde8..9489d15ffb5 100644
Binary files a/public/images/emoji/google/woman_playing_water_polo/5.png and b/public/images/emoji/google/woman_playing_water_polo/5.png differ
diff --git a/public/images/emoji/google/woman_playing_water_polo/6.png b/public/images/emoji/google/woman_playing_water_polo/6.png
index e4f4e19089d..622fb451569 100644
Binary files a/public/images/emoji/google/woman_playing_water_polo/6.png and b/public/images/emoji/google/woman_playing_water_polo/6.png differ
diff --git a/public/images/emoji/google/woman_scientist.png b/public/images/emoji/google/woman_scientist.png
index 7d873ea4c40..fc03c53a8bd 100644
Binary files a/public/images/emoji/google/woman_scientist.png and b/public/images/emoji/google/woman_scientist.png differ
diff --git a/public/images/emoji/google/woman_scientist/2.png b/public/images/emoji/google/woman_scientist/2.png
index c439bdb25fa..dc6872e3232 100644
Binary files a/public/images/emoji/google/woman_scientist/2.png and b/public/images/emoji/google/woman_scientist/2.png differ
diff --git a/public/images/emoji/google/woman_scientist/3.png b/public/images/emoji/google/woman_scientist/3.png
index 724f5e11bf8..0b5c3962bd1 100644
Binary files a/public/images/emoji/google/woman_scientist/3.png and b/public/images/emoji/google/woman_scientist/3.png differ
diff --git a/public/images/emoji/google/woman_scientist/4.png b/public/images/emoji/google/woman_scientist/4.png
index b11657a04a2..459f4a9cc03 100644
Binary files a/public/images/emoji/google/woman_scientist/4.png and b/public/images/emoji/google/woman_scientist/4.png differ
diff --git a/public/images/emoji/google/woman_scientist/5.png b/public/images/emoji/google/woman_scientist/5.png
index 6233cf55f3e..264af8b170b 100644
Binary files a/public/images/emoji/google/woman_scientist/5.png and b/public/images/emoji/google/woman_scientist/5.png differ
diff --git a/public/images/emoji/google/woman_scientist/6.png b/public/images/emoji/google/woman_scientist/6.png
index c5010fee976..983ec7f2e10 100644
Binary files a/public/images/emoji/google/woman_scientist/6.png and b/public/images/emoji/google/woman_scientist/6.png differ
diff --git a/public/images/emoji/google/woman_shrugging.png b/public/images/emoji/google/woman_shrugging.png
index 9a455a54570..4de665abd37 100644
Binary files a/public/images/emoji/google/woman_shrugging.png and b/public/images/emoji/google/woman_shrugging.png differ
diff --git a/public/images/emoji/google/woman_shrugging/2.png b/public/images/emoji/google/woman_shrugging/2.png
index 0b85abb35a5..7e7a3291d31 100644
Binary files a/public/images/emoji/google/woman_shrugging/2.png and b/public/images/emoji/google/woman_shrugging/2.png differ
diff --git a/public/images/emoji/google/woman_shrugging/3.png b/public/images/emoji/google/woman_shrugging/3.png
index e8bfa2f22d2..80229941399 100644
Binary files a/public/images/emoji/google/woman_shrugging/3.png and b/public/images/emoji/google/woman_shrugging/3.png differ
diff --git a/public/images/emoji/google/woman_shrugging/4.png b/public/images/emoji/google/woman_shrugging/4.png
index f74a732db01..1ce1b06fc74 100644
Binary files a/public/images/emoji/google/woman_shrugging/4.png and b/public/images/emoji/google/woman_shrugging/4.png differ
diff --git a/public/images/emoji/google/woman_shrugging/5.png b/public/images/emoji/google/woman_shrugging/5.png
index 00a173acd5a..925ba404b31 100644
Binary files a/public/images/emoji/google/woman_shrugging/5.png and b/public/images/emoji/google/woman_shrugging/5.png differ
diff --git a/public/images/emoji/google/woman_shrugging/6.png b/public/images/emoji/google/woman_shrugging/6.png
index 4a03c01d43f..1b642633add 100644
Binary files a/public/images/emoji/google/woman_shrugging/6.png and b/public/images/emoji/google/woman_shrugging/6.png differ
diff --git a/public/images/emoji/google/woman_singer.png b/public/images/emoji/google/woman_singer.png
index 2b3f46e2ea1..b6fb24c2c54 100644
Binary files a/public/images/emoji/google/woman_singer.png and b/public/images/emoji/google/woman_singer.png differ
diff --git a/public/images/emoji/google/woman_singer/2.png b/public/images/emoji/google/woman_singer/2.png
index dff5bef3ed3..12484935c4f 100644
Binary files a/public/images/emoji/google/woman_singer/2.png and b/public/images/emoji/google/woman_singer/2.png differ
diff --git a/public/images/emoji/google/woman_singer/3.png b/public/images/emoji/google/woman_singer/3.png
index d71d68d9529..647ee3f250a 100644
Binary files a/public/images/emoji/google/woman_singer/3.png and b/public/images/emoji/google/woman_singer/3.png differ
diff --git a/public/images/emoji/google/woman_singer/4.png b/public/images/emoji/google/woman_singer/4.png
index 7b411c99d03..751cb333e88 100644
Binary files a/public/images/emoji/google/woman_singer/4.png and b/public/images/emoji/google/woman_singer/4.png differ
diff --git a/public/images/emoji/google/woman_singer/5.png b/public/images/emoji/google/woman_singer/5.png
index 46cac26e5b0..a9ec10212d5 100644
Binary files a/public/images/emoji/google/woman_singer/5.png and b/public/images/emoji/google/woman_singer/5.png differ
diff --git a/public/images/emoji/google/woman_singer/6.png b/public/images/emoji/google/woman_singer/6.png
index b4459b9db40..b426ef53f2f 100644
Binary files a/public/images/emoji/google/woman_singer/6.png and b/public/images/emoji/google/woman_singer/6.png differ
diff --git a/public/images/emoji/google/woman_student.png b/public/images/emoji/google/woman_student.png
index c6f2c7c8e62..6b80f9e6e18 100644
Binary files a/public/images/emoji/google/woman_student.png and b/public/images/emoji/google/woman_student.png differ
diff --git a/public/images/emoji/google/woman_student/2.png b/public/images/emoji/google/woman_student/2.png
index 01db6368f62..c773e00beaa 100644
Binary files a/public/images/emoji/google/woman_student/2.png and b/public/images/emoji/google/woman_student/2.png differ
diff --git a/public/images/emoji/google/woman_student/3.png b/public/images/emoji/google/woman_student/3.png
index 9a6770954ff..a58117f73e8 100644
Binary files a/public/images/emoji/google/woman_student/3.png and b/public/images/emoji/google/woman_student/3.png differ
diff --git a/public/images/emoji/google/woman_student/4.png b/public/images/emoji/google/woman_student/4.png
index 61ab96dcbe1..a80a3591927 100644
Binary files a/public/images/emoji/google/woman_student/4.png and b/public/images/emoji/google/woman_student/4.png differ
diff --git a/public/images/emoji/google/woman_student/5.png b/public/images/emoji/google/woman_student/5.png
index 8f227c084ff..8604f5b2897 100644
Binary files a/public/images/emoji/google/woman_student/5.png and b/public/images/emoji/google/woman_student/5.png differ
diff --git a/public/images/emoji/google/woman_student/6.png b/public/images/emoji/google/woman_student/6.png
index 398e1cf36f4..a9759936982 100644
Binary files a/public/images/emoji/google/woman_student/6.png and b/public/images/emoji/google/woman_student/6.png differ
diff --git a/public/images/emoji/google/woman_teacher.png b/public/images/emoji/google/woman_teacher.png
index 243e1125d99..7c14455208a 100644
Binary files a/public/images/emoji/google/woman_teacher.png and b/public/images/emoji/google/woman_teacher.png differ
diff --git a/public/images/emoji/google/woman_teacher/2.png b/public/images/emoji/google/woman_teacher/2.png
index f7ebad6af96..6cfbee3ac88 100644
Binary files a/public/images/emoji/google/woman_teacher/2.png and b/public/images/emoji/google/woman_teacher/2.png differ
diff --git a/public/images/emoji/google/woman_teacher/3.png b/public/images/emoji/google/woman_teacher/3.png
index b64d09473cf..5cfa9f3ad86 100644
Binary files a/public/images/emoji/google/woman_teacher/3.png and b/public/images/emoji/google/woman_teacher/3.png differ
diff --git a/public/images/emoji/google/woman_teacher/4.png b/public/images/emoji/google/woman_teacher/4.png
index 5e214716fd1..7ba9749ff88 100644
Binary files a/public/images/emoji/google/woman_teacher/4.png and b/public/images/emoji/google/woman_teacher/4.png differ
diff --git a/public/images/emoji/google/woman_teacher/5.png b/public/images/emoji/google/woman_teacher/5.png
index c3934da4858..3d455d8c9d8 100644
Binary files a/public/images/emoji/google/woman_teacher/5.png and b/public/images/emoji/google/woman_teacher/5.png differ
diff --git a/public/images/emoji/google/woman_teacher/6.png b/public/images/emoji/google/woman_teacher/6.png
index 14333f1df3f..318bb76b686 100644
Binary files a/public/images/emoji/google/woman_teacher/6.png and b/public/images/emoji/google/woman_teacher/6.png differ
diff --git a/public/images/emoji/google/woman_technologist.png b/public/images/emoji/google/woman_technologist.png
index 68344dd63fc..aa4d0dbfbda 100644
Binary files a/public/images/emoji/google/woman_technologist.png and b/public/images/emoji/google/woman_technologist.png differ
diff --git a/public/images/emoji/google/woman_technologist/2.png b/public/images/emoji/google/woman_technologist/2.png
index 516715d48f4..46ac8cef64c 100644
Binary files a/public/images/emoji/google/woman_technologist/2.png and b/public/images/emoji/google/woman_technologist/2.png differ
diff --git a/public/images/emoji/google/woman_technologist/3.png b/public/images/emoji/google/woman_technologist/3.png
index 707fbcd9531..ab8c4b68961 100644
Binary files a/public/images/emoji/google/woman_technologist/3.png and b/public/images/emoji/google/woman_technologist/3.png differ
diff --git a/public/images/emoji/google/woman_technologist/4.png b/public/images/emoji/google/woman_technologist/4.png
index 5551b445ab3..1e0f2704b15 100644
Binary files a/public/images/emoji/google/woman_technologist/4.png and b/public/images/emoji/google/woman_technologist/4.png differ
diff --git a/public/images/emoji/google/woman_technologist/5.png b/public/images/emoji/google/woman_technologist/5.png
index d6d2929d8d8..2e12f3c2c17 100644
Binary files a/public/images/emoji/google/woman_technologist/5.png and b/public/images/emoji/google/woman_technologist/5.png differ
diff --git a/public/images/emoji/google/woman_technologist/6.png b/public/images/emoji/google/woman_technologist/6.png
index f039e596c00..4e9cccfeb6c 100644
Binary files a/public/images/emoji/google/woman_technologist/6.png and b/public/images/emoji/google/woman_technologist/6.png differ
diff --git a/public/images/emoji/google/woman_with_headscarf.png b/public/images/emoji/google/woman_with_headscarf.png
index 8768a6131f0..a7618a078ed 100644
Binary files a/public/images/emoji/google/woman_with_headscarf.png and b/public/images/emoji/google/woman_with_headscarf.png differ
diff --git a/public/images/emoji/google/woman_with_headscarf/2.png b/public/images/emoji/google/woman_with_headscarf/2.png
index f4d75cbb46e..19b72e62640 100644
Binary files a/public/images/emoji/google/woman_with_headscarf/2.png and b/public/images/emoji/google/woman_with_headscarf/2.png differ
diff --git a/public/images/emoji/google/woman_with_headscarf/3.png b/public/images/emoji/google/woman_with_headscarf/3.png
index c6e1efa92c7..1c7bb29e78b 100644
Binary files a/public/images/emoji/google/woman_with_headscarf/3.png and b/public/images/emoji/google/woman_with_headscarf/3.png differ
diff --git a/public/images/emoji/google/woman_with_headscarf/4.png b/public/images/emoji/google/woman_with_headscarf/4.png
index eb6826e4f16..ea7daf690a4 100644
Binary files a/public/images/emoji/google/woman_with_headscarf/4.png and b/public/images/emoji/google/woman_with_headscarf/4.png differ
diff --git a/public/images/emoji/google/woman_with_headscarf/5.png b/public/images/emoji/google/woman_with_headscarf/5.png
index a3f1e85d5b9..30d673c201c 100644
Binary files a/public/images/emoji/google/woman_with_headscarf/5.png and b/public/images/emoji/google/woman_with_headscarf/5.png differ
diff --git a/public/images/emoji/google/woman_with_headscarf/6.png b/public/images/emoji/google/woman_with_headscarf/6.png
index 99d1f26240e..9d88655d9b8 100644
Binary files a/public/images/emoji/google/woman_with_headscarf/6.png and b/public/images/emoji/google/woman_with_headscarf/6.png differ
diff --git a/public/images/emoji/google/woman_with_turban.png b/public/images/emoji/google/woman_with_turban.png
index 45e6b5af7a9..b185935f8af 100644
Binary files a/public/images/emoji/google/woman_with_turban.png and b/public/images/emoji/google/woman_with_turban.png differ
diff --git a/public/images/emoji/google/woman_with_turban/2.png b/public/images/emoji/google/woman_with_turban/2.png
index 083ddb6b4c3..1a1469b4420 100644
Binary files a/public/images/emoji/google/woman_with_turban/2.png and b/public/images/emoji/google/woman_with_turban/2.png differ
diff --git a/public/images/emoji/google/woman_with_turban/3.png b/public/images/emoji/google/woman_with_turban/3.png
index dc7c168a024..f6e87b7937b 100644
Binary files a/public/images/emoji/google/woman_with_turban/3.png and b/public/images/emoji/google/woman_with_turban/3.png differ
diff --git a/public/images/emoji/google/woman_with_turban/4.png b/public/images/emoji/google/woman_with_turban/4.png
index b17ff8bbc54..6d5ee85437b 100644
Binary files a/public/images/emoji/google/woman_with_turban/4.png and b/public/images/emoji/google/woman_with_turban/4.png differ
diff --git a/public/images/emoji/google/woman_with_turban/5.png b/public/images/emoji/google/woman_with_turban/5.png
index ff542288658..6b6cc696ce6 100644
Binary files a/public/images/emoji/google/woman_with_turban/5.png and b/public/images/emoji/google/woman_with_turban/5.png differ
diff --git a/public/images/emoji/google/woman_with_turban/6.png b/public/images/emoji/google/woman_with_turban/6.png
index 5739b78d287..810cf2a145c 100644
Binary files a/public/images/emoji/google/woman_with_turban/6.png and b/public/images/emoji/google/woman_with_turban/6.png differ
diff --git a/public/images/emoji/google/woman_zombie.png b/public/images/emoji/google/woman_zombie.png
new file mode 100644
index 00000000000..10ad1aa869f
Binary files /dev/null and b/public/images/emoji/google/woman_zombie.png differ
diff --git a/public/images/emoji/google/womans_clothes.png b/public/images/emoji/google/womans_clothes.png
index 5585c0d59ce..3d25e5f0fb6 100644
Binary files a/public/images/emoji/google/womans_clothes.png and b/public/images/emoji/google/womans_clothes.png differ
diff --git a/public/images/emoji/google/womans_hat.png b/public/images/emoji/google/womans_hat.png
index 0785e654922..aeb6810c689 100644
Binary files a/public/images/emoji/google/womans_hat.png and b/public/images/emoji/google/womans_hat.png differ
diff --git a/public/images/emoji/google/women_wrestling.png b/public/images/emoji/google/women_wrestling.png
index 757fa6cf862..e36f803bc12 100644
Binary files a/public/images/emoji/google/women_wrestling.png and b/public/images/emoji/google/women_wrestling.png differ
diff --git a/public/images/emoji/google/womens.png b/public/images/emoji/google/womens.png
index cb8ddb829b5..fbed7885778 100644
Binary files a/public/images/emoji/google/womens.png and b/public/images/emoji/google/womens.png differ
diff --git a/public/images/emoji/google/world_map.png b/public/images/emoji/google/world_map.png
index dccb5d0512b..349e4d46c38 100644
Binary files a/public/images/emoji/google/world_map.png and b/public/images/emoji/google/world_map.png differ
diff --git a/public/images/emoji/google/worried.png b/public/images/emoji/google/worried.png
index d45ecb4af43..d8b79a0027d 100644
Binary files a/public/images/emoji/google/worried.png and b/public/images/emoji/google/worried.png differ
diff --git a/public/images/emoji/google/worship_symbol.png b/public/images/emoji/google/worship_symbol.png
index 0cc3774779c..6e4d8a92484 100644
Binary files a/public/images/emoji/google/worship_symbol.png and b/public/images/emoji/google/worship_symbol.png differ
diff --git a/public/images/emoji/google/wrench.png b/public/images/emoji/google/wrench.png
index 7babf38ac64..0e29e42350f 100644
Binary files a/public/images/emoji/google/wrench.png and b/public/images/emoji/google/wrench.png differ
diff --git a/public/images/emoji/google/writing_hand.png b/public/images/emoji/google/writing_hand.png
index 02c6ba744ff..1b2437ce16d 100644
Binary files a/public/images/emoji/google/writing_hand.png and b/public/images/emoji/google/writing_hand.png differ
diff --git a/public/images/emoji/google/writing_hand/2.png b/public/images/emoji/google/writing_hand/2.png
index 247f8dafc4c..c185354d750 100644
Binary files a/public/images/emoji/google/writing_hand/2.png and b/public/images/emoji/google/writing_hand/2.png differ
diff --git a/public/images/emoji/google/writing_hand/3.png b/public/images/emoji/google/writing_hand/3.png
index be2d6888fde..4fac69eba6f 100644
Binary files a/public/images/emoji/google/writing_hand/3.png and b/public/images/emoji/google/writing_hand/3.png differ
diff --git a/public/images/emoji/google/writing_hand/4.png b/public/images/emoji/google/writing_hand/4.png
index e1158445cf4..299796f0f55 100644
Binary files a/public/images/emoji/google/writing_hand/4.png and b/public/images/emoji/google/writing_hand/4.png differ
diff --git a/public/images/emoji/google/writing_hand/5.png b/public/images/emoji/google/writing_hand/5.png
index c7aa68796d6..d566e7ea233 100644
Binary files a/public/images/emoji/google/writing_hand/5.png and b/public/images/emoji/google/writing_hand/5.png differ
diff --git a/public/images/emoji/google/writing_hand/6.png b/public/images/emoji/google/writing_hand/6.png
index beecc36dd1f..bdbdcb1dda4 100644
Binary files a/public/images/emoji/google/writing_hand/6.png and b/public/images/emoji/google/writing_hand/6.png differ
diff --git a/public/images/emoji/google/x.png b/public/images/emoji/google/x.png
index 56233b4e593..ad0b48ae1dc 100644
Binary files a/public/images/emoji/google/x.png and b/public/images/emoji/google/x.png differ
diff --git a/public/images/emoji/google/yellow_heart.png b/public/images/emoji/google/yellow_heart.png
index 5849f2d9b41..2257f32872b 100644
Binary files a/public/images/emoji/google/yellow_heart.png and b/public/images/emoji/google/yellow_heart.png differ
diff --git a/public/images/emoji/google/yemen.png b/public/images/emoji/google/yemen.png
index 494e2072dfe..625b5004464 100644
Binary files a/public/images/emoji/google/yemen.png and b/public/images/emoji/google/yemen.png differ
diff --git a/public/images/emoji/google/yen.png b/public/images/emoji/google/yen.png
index a6c8a80c7ed..68278ea1696 100644
Binary files a/public/images/emoji/google/yen.png and b/public/images/emoji/google/yen.png differ
diff --git a/public/images/emoji/google/yin_yang.png b/public/images/emoji/google/yin_yang.png
index 629675cfe9c..c3734210393 100644
Binary files a/public/images/emoji/google/yin_yang.png and b/public/images/emoji/google/yin_yang.png differ
diff --git a/public/images/emoji/google/yum.png b/public/images/emoji/google/yum.png
index c454d73b4c0..745c3142d8f 100644
Binary files a/public/images/emoji/google/yum.png and b/public/images/emoji/google/yum.png differ
diff --git a/public/images/emoji/google/zambia.png b/public/images/emoji/google/zambia.png
index 4ca566d8d41..7792a4e44ad 100644
Binary files a/public/images/emoji/google/zambia.png and b/public/images/emoji/google/zambia.png differ
diff --git a/public/images/emoji/google/zap.png b/public/images/emoji/google/zap.png
index a457b5fc1cf..5b3e5105eb6 100644
Binary files a/public/images/emoji/google/zap.png and b/public/images/emoji/google/zap.png differ
diff --git a/public/images/emoji/google/zebra.png b/public/images/emoji/google/zebra.png
index c98ffa79f0e..b00eceb4ba4 100644
Binary files a/public/images/emoji/google/zebra.png and b/public/images/emoji/google/zebra.png differ
diff --git a/public/images/emoji/google/zero.png b/public/images/emoji/google/zero.png
index 28b42505406..532f2f316d8 100644
Binary files a/public/images/emoji/google/zero.png and b/public/images/emoji/google/zero.png differ
diff --git a/public/images/emoji/google/zimbabwe.png b/public/images/emoji/google/zimbabwe.png
index 6d337f40e2d..5cb7e4bf1af 100644
Binary files a/public/images/emoji/google/zimbabwe.png and b/public/images/emoji/google/zimbabwe.png differ
diff --git a/public/images/emoji/google/zipper_mouth.png b/public/images/emoji/google/zipper_mouth.png
index 1fb69244fea..9743cd48eb9 100644
Binary files a/public/images/emoji/google/zipper_mouth.png and b/public/images/emoji/google/zipper_mouth.png differ
diff --git a/public/images/emoji/google/zipper_mouth_face.png b/public/images/emoji/google/zipper_mouth_face.png
index 1fb69244fea..9743cd48eb9 100644
Binary files a/public/images/emoji/google/zipper_mouth_face.png and b/public/images/emoji/google/zipper_mouth_face.png differ
diff --git a/public/images/emoji/google/zombie.png b/public/images/emoji/google/zombie.png
index 6d152046609..10ad1aa869f 100644
Binary files a/public/images/emoji/google/zombie.png and b/public/images/emoji/google/zombie.png differ
diff --git a/public/images/emoji/google/zzz.png b/public/images/emoji/google/zzz.png
index 35f09724ee1..7f0b4a2577b 100644
Binary files a/public/images/emoji/google/zzz.png and b/public/images/emoji/google/zzz.png differ
diff --git a/public/images/emoji/google_classic/merperson.png b/public/images/emoji/google_classic/mermaid.png
similarity index 100%
rename from public/images/emoji/google_classic/merperson.png
rename to public/images/emoji/google_classic/mermaid.png
diff --git a/public/images/emoji/google_classic/merperson/2.png b/public/images/emoji/google_classic/mermaid/2.png
similarity index 100%
rename from public/images/emoji/google_classic/merperson/2.png
rename to public/images/emoji/google_classic/mermaid/2.png
diff --git a/public/images/emoji/google_classic/merperson/3.png b/public/images/emoji/google_classic/mermaid/3.png
similarity index 100%
rename from public/images/emoji/google_classic/merperson/3.png
rename to public/images/emoji/google_classic/mermaid/3.png
diff --git a/public/images/emoji/google_classic/merperson/4.png b/public/images/emoji/google_classic/mermaid/4.png
similarity index 100%
rename from public/images/emoji/google_classic/merperson/4.png
rename to public/images/emoji/google_classic/mermaid/4.png
diff --git a/public/images/emoji/google_classic/merperson/5.png b/public/images/emoji/google_classic/mermaid/5.png
similarity index 100%
rename from public/images/emoji/google_classic/merperson/5.png
rename to public/images/emoji/google_classic/mermaid/5.png
diff --git a/public/images/emoji/google_classic/merperson/6.png b/public/images/emoji/google_classic/mermaid/6.png
similarity index 100%
rename from public/images/emoji/google_classic/merperson/6.png
rename to public/images/emoji/google_classic/mermaid/6.png
diff --git a/public/images/emoji/google_classic/merman.png b/public/images/emoji/google_classic/merman.png
new file mode 100644
index 00000000000..ab9e1915368
Binary files /dev/null and b/public/images/emoji/google_classic/merman.png differ
diff --git a/public/images/emoji/google_classic/merman/2.png b/public/images/emoji/google_classic/merman/2.png
new file mode 100644
index 00000000000..26559c71918
Binary files /dev/null and b/public/images/emoji/google_classic/merman/2.png differ
diff --git a/public/images/emoji/google_classic/merman/3.png b/public/images/emoji/google_classic/merman/3.png
new file mode 100644
index 00000000000..03b158b3abb
Binary files /dev/null and b/public/images/emoji/google_classic/merman/3.png differ
diff --git a/public/images/emoji/google_classic/merman/4.png b/public/images/emoji/google_classic/merman/4.png
new file mode 100644
index 00000000000..dcf2293f1fc
Binary files /dev/null and b/public/images/emoji/google_classic/merman/4.png differ
diff --git a/public/images/emoji/google_classic/merman/5.png b/public/images/emoji/google_classic/merman/5.png
new file mode 100644
index 00000000000..f9ba085a54d
Binary files /dev/null and b/public/images/emoji/google_classic/merman/5.png differ
diff --git a/public/images/emoji/google_classic/merman/6.png b/public/images/emoji/google_classic/merman/6.png
new file mode 100644
index 00000000000..55145fbd843
Binary files /dev/null and b/public/images/emoji/google_classic/merman/6.png differ
diff --git a/public/images/emoji/google_classic/puke.png b/public/images/emoji/google_classic/puke.png
new file mode 100644
index 00000000000..cd7c3d1f2b7
Binary files /dev/null and b/public/images/emoji/google_classic/puke.png differ
diff --git a/public/images/emoji/google_classic/woman_climbing.png b/public/images/emoji/google_classic/woman_climbing.png
new file mode 100644
index 00000000000..590704f805c
Binary files /dev/null and b/public/images/emoji/google_classic/woman_climbing.png differ
diff --git a/public/images/emoji/google_classic/woman_climbing/2.png b/public/images/emoji/google_classic/woman_climbing/2.png
new file mode 100644
index 00000000000..562de284d05
Binary files /dev/null and b/public/images/emoji/google_classic/woman_climbing/2.png differ
diff --git a/public/images/emoji/google_classic/woman_climbing/3.png b/public/images/emoji/google_classic/woman_climbing/3.png
new file mode 100644
index 00000000000..d33361c84b8
Binary files /dev/null and b/public/images/emoji/google_classic/woman_climbing/3.png differ
diff --git a/public/images/emoji/google_classic/woman_climbing/4.png b/public/images/emoji/google_classic/woman_climbing/4.png
new file mode 100644
index 00000000000..9514256cc64
Binary files /dev/null and b/public/images/emoji/google_classic/woman_climbing/4.png differ
diff --git a/public/images/emoji/google_classic/woman_climbing/5.png b/public/images/emoji/google_classic/woman_climbing/5.png
new file mode 100644
index 00000000000..0dc0aecb4e1
Binary files /dev/null and b/public/images/emoji/google_classic/woman_climbing/5.png differ
diff --git a/public/images/emoji/google_classic/woman_climbing/6.png b/public/images/emoji/google_classic/woman_climbing/6.png
new file mode 100644
index 00000000000..f387ea1d070
Binary files /dev/null and b/public/images/emoji/google_classic/woman_climbing/6.png differ
diff --git a/public/images/emoji/google_classic/woman_genie.png b/public/images/emoji/google_classic/woman_genie.png
new file mode 100644
index 00000000000..88743cfd1f4
Binary files /dev/null and b/public/images/emoji/google_classic/woman_genie.png differ
diff --git a/public/images/emoji/google_classic/woman_in_lotus_position.png b/public/images/emoji/google_classic/woman_in_lotus_position.png
new file mode 100644
index 00000000000..85de0d5c025
Binary files /dev/null and b/public/images/emoji/google_classic/woman_in_lotus_position.png differ
diff --git a/public/images/emoji/google_classic/woman_in_lotus_position/2.png b/public/images/emoji/google_classic/woman_in_lotus_position/2.png
new file mode 100644
index 00000000000..e1e04b08d2e
Binary files /dev/null and b/public/images/emoji/google_classic/woman_in_lotus_position/2.png differ
diff --git a/public/images/emoji/google_classic/woman_in_lotus_position/3.png b/public/images/emoji/google_classic/woman_in_lotus_position/3.png
new file mode 100644
index 00000000000..39822531387
Binary files /dev/null and b/public/images/emoji/google_classic/woman_in_lotus_position/3.png differ
diff --git a/public/images/emoji/google_classic/woman_in_lotus_position/4.png b/public/images/emoji/google_classic/woman_in_lotus_position/4.png
new file mode 100644
index 00000000000..cdf495b030b
Binary files /dev/null and b/public/images/emoji/google_classic/woman_in_lotus_position/4.png differ
diff --git a/public/images/emoji/google_classic/woman_in_lotus_position/5.png b/public/images/emoji/google_classic/woman_in_lotus_position/5.png
new file mode 100644
index 00000000000..8b34df2289b
Binary files /dev/null and b/public/images/emoji/google_classic/woman_in_lotus_position/5.png differ
diff --git a/public/images/emoji/google_classic/woman_in_lotus_position/6.png b/public/images/emoji/google_classic/woman_in_lotus_position/6.png
new file mode 100644
index 00000000000..6a2afb85a89
Binary files /dev/null and b/public/images/emoji/google_classic/woman_in_lotus_position/6.png differ
diff --git a/public/images/emoji/google_classic/woman_in_steamy_room.png b/public/images/emoji/google_classic/woman_in_steamy_room.png
new file mode 100644
index 00000000000..fe4d976d22e
Binary files /dev/null and b/public/images/emoji/google_classic/woman_in_steamy_room.png differ
diff --git a/public/images/emoji/google_classic/woman_in_steamy_room/2.png b/public/images/emoji/google_classic/woman_in_steamy_room/2.png
new file mode 100644
index 00000000000..51be085cf32
Binary files /dev/null and b/public/images/emoji/google_classic/woman_in_steamy_room/2.png differ
diff --git a/public/images/emoji/google_classic/woman_in_steamy_room/3.png b/public/images/emoji/google_classic/woman_in_steamy_room/3.png
new file mode 100644
index 00000000000..99560e118dd
Binary files /dev/null and b/public/images/emoji/google_classic/woman_in_steamy_room/3.png differ
diff --git a/public/images/emoji/google_classic/woman_in_steamy_room/4.png b/public/images/emoji/google_classic/woman_in_steamy_room/4.png
new file mode 100644
index 00000000000..56d64ccadf2
Binary files /dev/null and b/public/images/emoji/google_classic/woman_in_steamy_room/4.png differ
diff --git a/public/images/emoji/google_classic/woman_in_steamy_room/5.png b/public/images/emoji/google_classic/woman_in_steamy_room/5.png
new file mode 100644
index 00000000000..f432b554b37
Binary files /dev/null and b/public/images/emoji/google_classic/woman_in_steamy_room/5.png differ
diff --git a/public/images/emoji/google_classic/woman_in_steamy_room/6.png b/public/images/emoji/google_classic/woman_in_steamy_room/6.png
new file mode 100644
index 00000000000..dc7087e0284
Binary files /dev/null and b/public/images/emoji/google_classic/woman_in_steamy_room/6.png differ
diff --git a/public/images/emoji/google_classic/woman_mage.png b/public/images/emoji/google_classic/woman_mage.png
new file mode 100644
index 00000000000..cf6c7d25691
Binary files /dev/null and b/public/images/emoji/google_classic/woman_mage.png differ
diff --git a/public/images/emoji/google_classic/woman_mage/2.png b/public/images/emoji/google_classic/woman_mage/2.png
new file mode 100644
index 00000000000..99684cd5df6
Binary files /dev/null and b/public/images/emoji/google_classic/woman_mage/2.png differ
diff --git a/public/images/emoji/google_classic/woman_mage/3.png b/public/images/emoji/google_classic/woman_mage/3.png
new file mode 100644
index 00000000000..c974a0be377
Binary files /dev/null and b/public/images/emoji/google_classic/woman_mage/3.png differ
diff --git a/public/images/emoji/google_classic/woman_mage/4.png b/public/images/emoji/google_classic/woman_mage/4.png
new file mode 100644
index 00000000000..0c0e055915b
Binary files /dev/null and b/public/images/emoji/google_classic/woman_mage/4.png differ
diff --git a/public/images/emoji/google_classic/woman_mage/5.png b/public/images/emoji/google_classic/woman_mage/5.png
new file mode 100644
index 00000000000..33d5ab14827
Binary files /dev/null and b/public/images/emoji/google_classic/woman_mage/5.png differ
diff --git a/public/images/emoji/google_classic/woman_mage/6.png b/public/images/emoji/google_classic/woman_mage/6.png
new file mode 100644
index 00000000000..8eff92ef763
Binary files /dev/null and b/public/images/emoji/google_classic/woman_mage/6.png differ
diff --git a/public/images/emoji/google_classic/woman_zombie.png b/public/images/emoji/google_classic/woman_zombie.png
new file mode 100644
index 00000000000..2f740b721f5
Binary files /dev/null and b/public/images/emoji/google_classic/woman_zombie.png differ
diff --git a/public/images/emoji/twitter/mermaid.png b/public/images/emoji/twitter/mermaid.png
new file mode 100644
index 00000000000..ee1b999e0dd
Binary files /dev/null and b/public/images/emoji/twitter/mermaid.png differ
diff --git a/public/images/emoji/twitter/mermaid/2.png b/public/images/emoji/twitter/mermaid/2.png
new file mode 100644
index 00000000000..b97fbf42e35
Binary files /dev/null and b/public/images/emoji/twitter/mermaid/2.png differ
diff --git a/public/images/emoji/twitter/mermaid/3.png b/public/images/emoji/twitter/mermaid/3.png
new file mode 100644
index 00000000000..9079f60b81e
Binary files /dev/null and b/public/images/emoji/twitter/mermaid/3.png differ
diff --git a/public/images/emoji/twitter/mermaid/4.png b/public/images/emoji/twitter/mermaid/4.png
new file mode 100644
index 00000000000..decc0b58929
Binary files /dev/null and b/public/images/emoji/twitter/mermaid/4.png differ
diff --git a/public/images/emoji/twitter/mermaid/5.png b/public/images/emoji/twitter/mermaid/5.png
new file mode 100644
index 00000000000..e3e3e89cb16
Binary files /dev/null and b/public/images/emoji/twitter/mermaid/5.png differ
diff --git a/public/images/emoji/twitter/mermaid/6.png b/public/images/emoji/twitter/mermaid/6.png
new file mode 100644
index 00000000000..5a5f36684e5
Binary files /dev/null and b/public/images/emoji/twitter/mermaid/6.png differ
diff --git a/public/images/emoji/twitter/merman.png b/public/images/emoji/twitter/merman.png
new file mode 100644
index 00000000000..ab9e1915368
Binary files /dev/null and b/public/images/emoji/twitter/merman.png differ
diff --git a/public/images/emoji/twitter/merman/2.png b/public/images/emoji/twitter/merman/2.png
new file mode 100644
index 00000000000..26559c71918
Binary files /dev/null and b/public/images/emoji/twitter/merman/2.png differ
diff --git a/public/images/emoji/twitter/merman/3.png b/public/images/emoji/twitter/merman/3.png
new file mode 100644
index 00000000000..03b158b3abb
Binary files /dev/null and b/public/images/emoji/twitter/merman/3.png differ
diff --git a/public/images/emoji/twitter/merman/4.png b/public/images/emoji/twitter/merman/4.png
new file mode 100644
index 00000000000..dcf2293f1fc
Binary files /dev/null and b/public/images/emoji/twitter/merman/4.png differ
diff --git a/public/images/emoji/twitter/merman/5.png b/public/images/emoji/twitter/merman/5.png
new file mode 100644
index 00000000000..f9ba085a54d
Binary files /dev/null and b/public/images/emoji/twitter/merman/5.png differ
diff --git a/public/images/emoji/twitter/merman/6.png b/public/images/emoji/twitter/merman/6.png
new file mode 100644
index 00000000000..55145fbd843
Binary files /dev/null and b/public/images/emoji/twitter/merman/6.png differ
diff --git a/public/images/emoji/twitter/puke.png b/public/images/emoji/twitter/puke.png
new file mode 100644
index 00000000000..cd7c3d1f2b7
Binary files /dev/null and b/public/images/emoji/twitter/puke.png differ
diff --git a/public/images/emoji/twitter/woman_climbing.png b/public/images/emoji/twitter/woman_climbing.png
new file mode 100644
index 00000000000..590704f805c
Binary files /dev/null and b/public/images/emoji/twitter/woman_climbing.png differ
diff --git a/public/images/emoji/twitter/woman_climbing/2.png b/public/images/emoji/twitter/woman_climbing/2.png
new file mode 100644
index 00000000000..562de284d05
Binary files /dev/null and b/public/images/emoji/twitter/woman_climbing/2.png differ
diff --git a/public/images/emoji/twitter/woman_climbing/3.png b/public/images/emoji/twitter/woman_climbing/3.png
new file mode 100644
index 00000000000..d33361c84b8
Binary files /dev/null and b/public/images/emoji/twitter/woman_climbing/3.png differ
diff --git a/public/images/emoji/twitter/woman_climbing/4.png b/public/images/emoji/twitter/woman_climbing/4.png
new file mode 100644
index 00000000000..9514256cc64
Binary files /dev/null and b/public/images/emoji/twitter/woman_climbing/4.png differ
diff --git a/public/images/emoji/twitter/woman_climbing/5.png b/public/images/emoji/twitter/woman_climbing/5.png
new file mode 100644
index 00000000000..0dc0aecb4e1
Binary files /dev/null and b/public/images/emoji/twitter/woman_climbing/5.png differ
diff --git a/public/images/emoji/twitter/woman_climbing/6.png b/public/images/emoji/twitter/woman_climbing/6.png
new file mode 100644
index 00000000000..f387ea1d070
Binary files /dev/null and b/public/images/emoji/twitter/woman_climbing/6.png differ
diff --git a/public/images/emoji/twitter/woman_genie.png b/public/images/emoji/twitter/woman_genie.png
new file mode 100644
index 00000000000..88743cfd1f4
Binary files /dev/null and b/public/images/emoji/twitter/woman_genie.png differ
diff --git a/public/images/emoji/twitter/woman_in_lotus_position.png b/public/images/emoji/twitter/woman_in_lotus_position.png
new file mode 100644
index 00000000000..85de0d5c025
Binary files /dev/null and b/public/images/emoji/twitter/woman_in_lotus_position.png differ
diff --git a/public/images/emoji/twitter/woman_in_lotus_position/2.png b/public/images/emoji/twitter/woman_in_lotus_position/2.png
new file mode 100644
index 00000000000..e1e04b08d2e
Binary files /dev/null and b/public/images/emoji/twitter/woman_in_lotus_position/2.png differ
diff --git a/public/images/emoji/twitter/woman_in_lotus_position/3.png b/public/images/emoji/twitter/woman_in_lotus_position/3.png
new file mode 100644
index 00000000000..39822531387
Binary files /dev/null and b/public/images/emoji/twitter/woman_in_lotus_position/3.png differ
diff --git a/public/images/emoji/twitter/woman_in_lotus_position/4.png b/public/images/emoji/twitter/woman_in_lotus_position/4.png
new file mode 100644
index 00000000000..cdf495b030b
Binary files /dev/null and b/public/images/emoji/twitter/woman_in_lotus_position/4.png differ
diff --git a/public/images/emoji/twitter/woman_in_lotus_position/5.png b/public/images/emoji/twitter/woman_in_lotus_position/5.png
new file mode 100644
index 00000000000..8b34df2289b
Binary files /dev/null and b/public/images/emoji/twitter/woman_in_lotus_position/5.png differ
diff --git a/public/images/emoji/twitter/woman_in_lotus_position/6.png b/public/images/emoji/twitter/woman_in_lotus_position/6.png
new file mode 100644
index 00000000000..6a2afb85a89
Binary files /dev/null and b/public/images/emoji/twitter/woman_in_lotus_position/6.png differ
diff --git a/public/images/emoji/twitter/woman_in_steamy_room.png b/public/images/emoji/twitter/woman_in_steamy_room.png
new file mode 100644
index 00000000000..fe4d976d22e
Binary files /dev/null and b/public/images/emoji/twitter/woman_in_steamy_room.png differ
diff --git a/public/images/emoji/twitter/woman_in_steamy_room/2.png b/public/images/emoji/twitter/woman_in_steamy_room/2.png
new file mode 100644
index 00000000000..51be085cf32
Binary files /dev/null and b/public/images/emoji/twitter/woman_in_steamy_room/2.png differ
diff --git a/public/images/emoji/twitter/woman_in_steamy_room/3.png b/public/images/emoji/twitter/woman_in_steamy_room/3.png
new file mode 100644
index 00000000000..99560e118dd
Binary files /dev/null and b/public/images/emoji/twitter/woman_in_steamy_room/3.png differ
diff --git a/public/images/emoji/twitter/woman_in_steamy_room/4.png b/public/images/emoji/twitter/woman_in_steamy_room/4.png
new file mode 100644
index 00000000000..56d64ccadf2
Binary files /dev/null and b/public/images/emoji/twitter/woman_in_steamy_room/4.png differ
diff --git a/public/images/emoji/twitter/woman_in_steamy_room/5.png b/public/images/emoji/twitter/woman_in_steamy_room/5.png
new file mode 100644
index 00000000000..f432b554b37
Binary files /dev/null and b/public/images/emoji/twitter/woman_in_steamy_room/5.png differ
diff --git a/public/images/emoji/twitter/woman_in_steamy_room/6.png b/public/images/emoji/twitter/woman_in_steamy_room/6.png
new file mode 100644
index 00000000000..dc7087e0284
Binary files /dev/null and b/public/images/emoji/twitter/woman_in_steamy_room/6.png differ
diff --git a/public/images/emoji/twitter/woman_mage.png b/public/images/emoji/twitter/woman_mage.png
new file mode 100644
index 00000000000..cf6c7d25691
Binary files /dev/null and b/public/images/emoji/twitter/woman_mage.png differ
diff --git a/public/images/emoji/twitter/woman_mage/2.png b/public/images/emoji/twitter/woman_mage/2.png
new file mode 100644
index 00000000000..99684cd5df6
Binary files /dev/null and b/public/images/emoji/twitter/woman_mage/2.png differ
diff --git a/public/images/emoji/twitter/woman_mage/3.png b/public/images/emoji/twitter/woman_mage/3.png
new file mode 100644
index 00000000000..c974a0be377
Binary files /dev/null and b/public/images/emoji/twitter/woman_mage/3.png differ
diff --git a/public/images/emoji/twitter/woman_mage/4.png b/public/images/emoji/twitter/woman_mage/4.png
new file mode 100644
index 00000000000..0c0e055915b
Binary files /dev/null and b/public/images/emoji/twitter/woman_mage/4.png differ
diff --git a/public/images/emoji/twitter/woman_mage/5.png b/public/images/emoji/twitter/woman_mage/5.png
new file mode 100644
index 00000000000..33d5ab14827
Binary files /dev/null and b/public/images/emoji/twitter/woman_mage/5.png differ
diff --git a/public/images/emoji/twitter/woman_mage/6.png b/public/images/emoji/twitter/woman_mage/6.png
new file mode 100644
index 00000000000..8eff92ef763
Binary files /dev/null and b/public/images/emoji/twitter/woman_mage/6.png differ
diff --git a/public/images/emoji/twitter/woman_zombie.png b/public/images/emoji/twitter/woman_zombie.png
new file mode 100644
index 00000000000..2f740b721f5
Binary files /dev/null and b/public/images/emoji/twitter/woman_zombie.png differ
diff --git a/public/images/emoji/win10/adult.png b/public/images/emoji/win10/adult.png
index 53a5eb2ccb9..a4d609c91b1 100644
Binary files a/public/images/emoji/win10/adult.png and b/public/images/emoji/win10/adult.png differ
diff --git a/public/images/emoji/win10/adult/2.png b/public/images/emoji/win10/adult/2.png
index 8f30fc9e389..e29d30c26be 100644
Binary files a/public/images/emoji/win10/adult/2.png and b/public/images/emoji/win10/adult/2.png differ
diff --git a/public/images/emoji/win10/adult/3.png b/public/images/emoji/win10/adult/3.png
index 36a4e57d1f8..4cabf1aeca5 100644
Binary files a/public/images/emoji/win10/adult/3.png and b/public/images/emoji/win10/adult/3.png differ
diff --git a/public/images/emoji/win10/adult/4.png b/public/images/emoji/win10/adult/4.png
index 77c57605e93..231f6d90088 100644
Binary files a/public/images/emoji/win10/adult/4.png and b/public/images/emoji/win10/adult/4.png differ
diff --git a/public/images/emoji/win10/adult/5.png b/public/images/emoji/win10/adult/5.png
index 58bcd6a2fcf..e520bd28ca5 100644
Binary files a/public/images/emoji/win10/adult/5.png and b/public/images/emoji/win10/adult/5.png differ
diff --git a/public/images/emoji/win10/adult/6.png b/public/images/emoji/win10/adult/6.png
index 3bc6b5a57a3..ffda3c8b47d 100644
Binary files a/public/images/emoji/win10/adult/6.png and b/public/images/emoji/win10/adult/6.png differ
diff --git a/public/images/emoji/win10/aries.png b/public/images/emoji/win10/aries.png
index 0bae150e420..bc1b24306c9 100644
Binary files a/public/images/emoji/win10/aries.png and b/public/images/emoji/win10/aries.png differ
diff --git a/public/images/emoji/win10/arrow_double_up.png b/public/images/emoji/win10/arrow_double_up.png
index a47f2cbb72e..7107df7a35b 100644
Binary files a/public/images/emoji/win10/arrow_double_up.png and b/public/images/emoji/win10/arrow_double_up.png differ
diff --git a/public/images/emoji/win10/arrow_lower_left.png b/public/images/emoji/win10/arrow_lower_left.png
index 478b3eacc59..fdaa04f0935 100644
Binary files a/public/images/emoji/win10/arrow_lower_left.png and b/public/images/emoji/win10/arrow_lower_left.png differ
diff --git a/public/images/emoji/win10/arrow_right.png b/public/images/emoji/win10/arrow_right.png
index 5787b784b5e..ad8a2e1cfb7 100644
Binary files a/public/images/emoji/win10/arrow_right.png and b/public/images/emoji/win10/arrow_right.png differ
diff --git a/public/images/emoji/win10/arrow_up_down.png b/public/images/emoji/win10/arrow_up_down.png
index fd1049d13fc..8f28dafbc53 100644
Binary files a/public/images/emoji/win10/arrow_up_down.png and b/public/images/emoji/win10/arrow_up_down.png differ
diff --git a/public/images/emoji/win10/arrow_upper_left.png b/public/images/emoji/win10/arrow_upper_left.png
index bee46945131..4d97fac8974 100644
Binary files a/public/images/emoji/win10/arrow_upper_left.png and b/public/images/emoji/win10/arrow_upper_left.png differ
diff --git a/public/images/emoji/win10/asterisk.png b/public/images/emoji/win10/asterisk.png
index f847acf58c4..302650d81e4 100644
Binary files a/public/images/emoji/win10/asterisk.png and b/public/images/emoji/win10/asterisk.png differ
diff --git a/public/images/emoji/win10/baggage_claim.png b/public/images/emoji/win10/baggage_claim.png
index ce5b0611976..e3aadd8d6a6 100644
Binary files a/public/images/emoji/win10/baggage_claim.png and b/public/images/emoji/win10/baggage_claim.png differ
diff --git a/public/images/emoji/win10/ballot_box_with_check.png b/public/images/emoji/win10/ballot_box_with_check.png
index 5f7d368b565..1ff2d7eed7b 100644
Binary files a/public/images/emoji/win10/ballot_box_with_check.png and b/public/images/emoji/win10/ballot_box_with_check.png differ
diff --git a/public/images/emoji/win10/bamboo.png b/public/images/emoji/win10/bamboo.png
index 4062f9bd3d1..d074c3a6211 100644
Binary files a/public/images/emoji/win10/bamboo.png and b/public/images/emoji/win10/bamboo.png differ
diff --git a/public/images/emoji/win10/bar_chart.png b/public/images/emoji/win10/bar_chart.png
index 203e5a694aa..9c1ba7bbafc 100644
Binary files a/public/images/emoji/win10/bar_chart.png and b/public/images/emoji/win10/bar_chart.png differ
diff --git a/public/images/emoji/win10/bearded_person.png b/public/images/emoji/win10/bearded_person.png
index ed22a6cb381..05cc7932f11 100644
Binary files a/public/images/emoji/win10/bearded_person.png and b/public/images/emoji/win10/bearded_person.png differ
diff --git a/public/images/emoji/win10/bearded_person/2.png b/public/images/emoji/win10/bearded_person/2.png
index 4a2fdeb3040..ab55eb6f33b 100644
Binary files a/public/images/emoji/win10/bearded_person/2.png and b/public/images/emoji/win10/bearded_person/2.png differ
diff --git a/public/images/emoji/win10/bearded_person/3.png b/public/images/emoji/win10/bearded_person/3.png
index b1f6e168d7c..a65fd6d7cf3 100644
Binary files a/public/images/emoji/win10/bearded_person/3.png and b/public/images/emoji/win10/bearded_person/3.png differ
diff --git a/public/images/emoji/win10/bearded_person/4.png b/public/images/emoji/win10/bearded_person/4.png
index f75b75a74e9..56fcb841455 100644
Binary files a/public/images/emoji/win10/bearded_person/4.png and b/public/images/emoji/win10/bearded_person/4.png differ
diff --git a/public/images/emoji/win10/bearded_person/5.png b/public/images/emoji/win10/bearded_person/5.png
index a9665b318a4..c86776aafc0 100644
Binary files a/public/images/emoji/win10/bearded_person/5.png and b/public/images/emoji/win10/bearded_person/5.png differ
diff --git a/public/images/emoji/win10/bearded_person/6.png b/public/images/emoji/win10/bearded_person/6.png
index a42b3caf88c..830c34db3cd 100644
Binary files a/public/images/emoji/win10/bearded_person/6.png and b/public/images/emoji/win10/bearded_person/6.png differ
diff --git a/public/images/emoji/win10/beer.png b/public/images/emoji/win10/beer.png
index 364d468648c..bf725599d5e 100644
Binary files a/public/images/emoji/win10/beer.png and b/public/images/emoji/win10/beer.png differ
diff --git a/public/images/emoji/win10/beers.png b/public/images/emoji/win10/beers.png
index 42d8caaa2ed..5df26f26335 100644
Binary files a/public/images/emoji/win10/beers.png and b/public/images/emoji/win10/beers.png differ
diff --git a/public/images/emoji/win10/billed_cap.png b/public/images/emoji/win10/billed_cap.png
index 5cc92e307e1..1b52c7bf31e 100644
Binary files a/public/images/emoji/win10/billed_cap.png and b/public/images/emoji/win10/billed_cap.png differ
diff --git a/public/images/emoji/win10/bowl_with_spoon.png b/public/images/emoji/win10/bowl_with_spoon.png
index b0d88a73b9d..4984bcb0b2a 100644
Binary files a/public/images/emoji/win10/bowl_with_spoon.png and b/public/images/emoji/win10/bowl_with_spoon.png differ
diff --git a/public/images/emoji/win10/brain.png b/public/images/emoji/win10/brain.png
index c8e889faecf..f84e986c006 100644
Binary files a/public/images/emoji/win10/brain.png and b/public/images/emoji/win10/brain.png differ
diff --git a/public/images/emoji/win10/breast_feeding.png b/public/images/emoji/win10/breast_feeding.png
index 815538138bf..944cbcc8a13 100644
Binary files a/public/images/emoji/win10/breast_feeding.png and b/public/images/emoji/win10/breast_feeding.png differ
diff --git a/public/images/emoji/win10/breast_feeding/2.png b/public/images/emoji/win10/breast_feeding/2.png
index fb591aa4fb4..aefb2f0b2f0 100644
Binary files a/public/images/emoji/win10/breast_feeding/2.png and b/public/images/emoji/win10/breast_feeding/2.png differ
diff --git a/public/images/emoji/win10/breast_feeding/3.png b/public/images/emoji/win10/breast_feeding/3.png
index 5adcffa4b94..2499126d335 100644
Binary files a/public/images/emoji/win10/breast_feeding/3.png and b/public/images/emoji/win10/breast_feeding/3.png differ
diff --git a/public/images/emoji/win10/breast_feeding/4.png b/public/images/emoji/win10/breast_feeding/4.png
index d166f981b24..05402b93d78 100644
Binary files a/public/images/emoji/win10/breast_feeding/4.png and b/public/images/emoji/win10/breast_feeding/4.png differ
diff --git a/public/images/emoji/win10/breast_feeding/5.png b/public/images/emoji/win10/breast_feeding/5.png
index 7c8cb50a780..12f8498fc6c 100644
Binary files a/public/images/emoji/win10/breast_feeding/5.png and b/public/images/emoji/win10/breast_feeding/5.png differ
diff --git a/public/images/emoji/win10/breast_feeding/6.png b/public/images/emoji/win10/breast_feeding/6.png
index e113d8cb428..7232ea138f8 100644
Binary files a/public/images/emoji/win10/breast_feeding/6.png and b/public/images/emoji/win10/breast_feeding/6.png differ
diff --git a/public/images/emoji/win10/briefcase.png b/public/images/emoji/win10/briefcase.png
index 0a4a8dc13d3..334359e8d13 100644
Binary files a/public/images/emoji/win10/briefcase.png and b/public/images/emoji/win10/briefcase.png differ
diff --git a/public/images/emoji/win10/broccoli.png b/public/images/emoji/win10/broccoli.png
index 5e03a6d23ba..a27e39b319a 100644
Binary files a/public/images/emoji/win10/broccoli.png and b/public/images/emoji/win10/broccoli.png differ
diff --git a/public/images/emoji/win10/bus.png b/public/images/emoji/win10/bus.png
index cacbb692f3c..3ea4baafb1f 100644
Binary files a/public/images/emoji/win10/bus.png and b/public/images/emoji/win10/bus.png differ
diff --git a/public/images/emoji/win10/calendar.png b/public/images/emoji/win10/calendar.png
index a6ccecc8b6d..f5a6268fc26 100644
Binary files a/public/images/emoji/win10/calendar.png and b/public/images/emoji/win10/calendar.png differ
diff --git a/public/images/emoji/win10/calling.png b/public/images/emoji/win10/calling.png
index eabf4882d0c..d69a110e08f 100644
Binary files a/public/images/emoji/win10/calling.png and b/public/images/emoji/win10/calling.png differ
diff --git a/public/images/emoji/win10/canned_food.png b/public/images/emoji/win10/canned_food.png
index 2e5976e9d2f..73d12d81d46 100644
Binary files a/public/images/emoji/win10/canned_food.png and b/public/images/emoji/win10/canned_food.png differ
diff --git a/public/images/emoji/win10/card_index.png b/public/images/emoji/win10/card_index.png
index 779b63ec55d..4e0ce4e49b6 100644
Binary files a/public/images/emoji/win10/card_index.png and b/public/images/emoji/win10/card_index.png differ
diff --git a/public/images/emoji/win10/carousel_horse.png b/public/images/emoji/win10/carousel_horse.png
index 9b68ee76ab6..5c7375c41cc 100644
Binary files a/public/images/emoji/win10/carousel_horse.png and b/public/images/emoji/win10/carousel_horse.png differ
diff --git a/public/images/emoji/win10/chart_with_downwards_trend.png b/public/images/emoji/win10/chart_with_downwards_trend.png
index cf1474ce501..270b84bd8c9 100644
Binary files a/public/images/emoji/win10/chart_with_downwards_trend.png and b/public/images/emoji/win10/chart_with_downwards_trend.png differ
diff --git a/public/images/emoji/win10/child.png b/public/images/emoji/win10/child.png
index 33e50494a3a..3b81b1f0236 100644
Binary files a/public/images/emoji/win10/child.png and b/public/images/emoji/win10/child.png differ
diff --git a/public/images/emoji/win10/child/2.png b/public/images/emoji/win10/child/2.png
index 7a0e4f1cb75..65182c7a760 100644
Binary files a/public/images/emoji/win10/child/2.png and b/public/images/emoji/win10/child/2.png differ
diff --git a/public/images/emoji/win10/child/3.png b/public/images/emoji/win10/child/3.png
index 81a69110e9d..04b0ec721e1 100644
Binary files a/public/images/emoji/win10/child/3.png and b/public/images/emoji/win10/child/3.png differ
diff --git a/public/images/emoji/win10/child/4.png b/public/images/emoji/win10/child/4.png
index b5c64c9cc84..5768fbe3d79 100644
Binary files a/public/images/emoji/win10/child/4.png and b/public/images/emoji/win10/child/4.png differ
diff --git a/public/images/emoji/win10/child/5.png b/public/images/emoji/win10/child/5.png
index 0763a8bd94c..473c3319b8e 100644
Binary files a/public/images/emoji/win10/child/5.png and b/public/images/emoji/win10/child/5.png differ
diff --git a/public/images/emoji/win10/child/6.png b/public/images/emoji/win10/child/6.png
index 3ed705b9025..1ba3b2b9e15 100644
Binary files a/public/images/emoji/win10/child/6.png and b/public/images/emoji/win10/child/6.png differ
diff --git a/public/images/emoji/win10/chopsticks.png b/public/images/emoji/win10/chopsticks.png
index 57064202979..c7b19ef0e6e 100644
Binary files a/public/images/emoji/win10/chopsticks.png and b/public/images/emoji/win10/chopsticks.png differ
diff --git a/public/images/emoji/win10/cinema.png b/public/images/emoji/win10/cinema.png
index cba90ade5d6..84e6c9c2048 100644
Binary files a/public/images/emoji/win10/cinema.png and b/public/images/emoji/win10/cinema.png differ
diff --git a/public/images/emoji/win10/cityscape.png b/public/images/emoji/win10/cityscape.png
index 780e8ac22c3..12e419373f5 100644
Binary files a/public/images/emoji/win10/cityscape.png and b/public/images/emoji/win10/cityscape.png differ
diff --git a/public/images/emoji/win10/classical_building.png b/public/images/emoji/win10/classical_building.png
index dde5669f7e0..858c8978ef0 100644
Binary files a/public/images/emoji/win10/classical_building.png and b/public/images/emoji/win10/classical_building.png differ
diff --git a/public/images/emoji/win10/clinking_glasses.png b/public/images/emoji/win10/clinking_glasses.png
index 1114b6a3c6a..d622e6bb820 100644
Binary files a/public/images/emoji/win10/clinking_glasses.png and b/public/images/emoji/win10/clinking_glasses.png differ
diff --git a/public/images/emoji/win10/clock.png b/public/images/emoji/win10/clock.png
index 8ff54293234..ce1971e0dae 100644
Binary files a/public/images/emoji/win10/clock.png and b/public/images/emoji/win10/clock.png differ
diff --git a/public/images/emoji/win10/clock930.png b/public/images/emoji/win10/clock930.png
index 1b78a000e9d..fcf3a377efa 100644
Binary files a/public/images/emoji/win10/clock930.png and b/public/images/emoji/win10/clock930.png differ
diff --git a/public/images/emoji/win10/coat.png b/public/images/emoji/win10/coat.png
index c409f9f4c4c..9124f4aa37f 100644
Binary files a/public/images/emoji/win10/coat.png and b/public/images/emoji/win10/coat.png differ
diff --git a/public/images/emoji/win10/cocktail.png b/public/images/emoji/win10/cocktail.png
index 3137eac5c21..2a3ca6ef8f4 100644
Binary files a/public/images/emoji/win10/cocktail.png and b/public/images/emoji/win10/cocktail.png differ
diff --git a/public/images/emoji/win10/coconut.png b/public/images/emoji/win10/coconut.png
index e76b533149f..c785c7c3f47 100644
Binary files a/public/images/emoji/win10/coconut.png and b/public/images/emoji/win10/coconut.png differ
diff --git a/public/images/emoji/win10/computer.png b/public/images/emoji/win10/computer.png
index cf7a30e8302..95314bf9e17 100644
Binary files a/public/images/emoji/win10/computer.png and b/public/images/emoji/win10/computer.png differ
diff --git a/public/images/emoji/win10/construction.png b/public/images/emoji/win10/construction.png
index 7df66cf77c9..5e9c00de613 100644
Binary files a/public/images/emoji/win10/construction.png and b/public/images/emoji/win10/construction.png differ
diff --git a/public/images/emoji/win10/control_knobs.png b/public/images/emoji/win10/control_knobs.png
index f26864d4db7..07fe9654072 100644
Binary files a/public/images/emoji/win10/control_knobs.png and b/public/images/emoji/win10/control_knobs.png differ
diff --git a/public/images/emoji/win10/crazy_face.png b/public/images/emoji/win10/crazy_face.png
index 0aaa1cf7651..0f606e54290 100644
Binary files a/public/images/emoji/win10/crazy_face.png and b/public/images/emoji/win10/crazy_face.png differ
diff --git a/public/images/emoji/win10/cricket.png b/public/images/emoji/win10/cricket.png
index 1714e0d8502..1873410694f 100644
Binary files a/public/images/emoji/win10/cricket.png and b/public/images/emoji/win10/cricket.png differ
diff --git a/public/images/emoji/win10/cross.png b/public/images/emoji/win10/cross.png
index a94333be743..75afdd6613b 100644
Binary files a/public/images/emoji/win10/cross.png and b/public/images/emoji/win10/cross.png differ
diff --git a/public/images/emoji/win10/cup_with_straw.png b/public/images/emoji/win10/cup_with_straw.png
index 4b2f313f9b2..f9ef3de859a 100644
Binary files a/public/images/emoji/win10/cup_with_straw.png and b/public/images/emoji/win10/cup_with_straw.png differ
diff --git a/public/images/emoji/win10/curling_stone.png b/public/images/emoji/win10/curling_stone.png
index 09027a2fb2e..253e352417a 100644
Binary files a/public/images/emoji/win10/curling_stone.png and b/public/images/emoji/win10/curling_stone.png differ
diff --git a/public/images/emoji/win10/cut_of_meat.png b/public/images/emoji/win10/cut_of_meat.png
index b66d427e099..7bb042e3249 100644
Binary files a/public/images/emoji/win10/cut_of_meat.png and b/public/images/emoji/win10/cut_of_meat.png differ
diff --git a/public/images/emoji/win10/department_store.png b/public/images/emoji/win10/department_store.png
index 61279e47bf2..f0e33f2fe45 100644
Binary files a/public/images/emoji/win10/department_store.png and b/public/images/emoji/win10/department_store.png differ
diff --git a/public/images/emoji/win10/dumpling.png b/public/images/emoji/win10/dumpling.png
index 489a779bf69..8ec08b500f4 100644
Binary files a/public/images/emoji/win10/dumpling.png and b/public/images/emoji/win10/dumpling.png differ
diff --git a/public/images/emoji/win10/eight.png b/public/images/emoji/win10/eight.png
index 6269d3b91ab..8ad89e371cf 100644
Binary files a/public/images/emoji/win10/eight.png and b/public/images/emoji/win10/eight.png differ
diff --git a/public/images/emoji/win10/eight_spoked_asterisk.png b/public/images/emoji/win10/eight_spoked_asterisk.png
index 3eabdcd2ba6..cc35580e572 100644
Binary files a/public/images/emoji/win10/eight_spoked_asterisk.png and b/public/images/emoji/win10/eight_spoked_asterisk.png differ
diff --git a/public/images/emoji/win10/elf.png b/public/images/emoji/win10/elf.png
index f8b6dd873e2..7668068ebff 100644
Binary files a/public/images/emoji/win10/elf.png and b/public/images/emoji/win10/elf.png differ
diff --git a/public/images/emoji/win10/elf/2.png b/public/images/emoji/win10/elf/2.png
index 15984024f21..c69e7492a35 100644
Binary files a/public/images/emoji/win10/elf/2.png and b/public/images/emoji/win10/elf/2.png differ
diff --git a/public/images/emoji/win10/elf/3.png b/public/images/emoji/win10/elf/3.png
index 4689243a178..218607138ce 100644
Binary files a/public/images/emoji/win10/elf/3.png and b/public/images/emoji/win10/elf/3.png differ
diff --git a/public/images/emoji/win10/elf/4.png b/public/images/emoji/win10/elf/4.png
index 861cbf808ca..fc8c7ce890a 100644
Binary files a/public/images/emoji/win10/elf/4.png and b/public/images/emoji/win10/elf/4.png differ
diff --git a/public/images/emoji/win10/elf/5.png b/public/images/emoji/win10/elf/5.png
index 50748760101..a8f93039c96 100644
Binary files a/public/images/emoji/win10/elf/5.png and b/public/images/emoji/win10/elf/5.png differ
diff --git a/public/images/emoji/win10/elf/6.png b/public/images/emoji/win10/elf/6.png
index 505c908b180..2f0de955273 100644
Binary files a/public/images/emoji/win10/elf/6.png and b/public/images/emoji/win10/elf/6.png differ
diff --git a/public/images/emoji/win10/envelope_with_arrow.png b/public/images/emoji/win10/envelope_with_arrow.png
index 7c99d1e2d93..522d0b29fcc 100644
Binary files a/public/images/emoji/win10/envelope_with_arrow.png and b/public/images/emoji/win10/envelope_with_arrow.png differ
diff --git a/public/images/emoji/win10/exploding_head.png b/public/images/emoji/win10/exploding_head.png
index 85532dadc7a..bb55db580a1 100644
Binary files a/public/images/emoji/win10/exploding_head.png and b/public/images/emoji/win10/exploding_head.png differ
diff --git a/public/images/emoji/win10/face_vomiting.png b/public/images/emoji/win10/face_vomiting.png
index cd7c3d1f2b7..6f2d6319f67 100644
Binary files a/public/images/emoji/win10/face_vomiting.png and b/public/images/emoji/win10/face_vomiting.png differ
diff --git a/public/images/emoji/win10/face_with_hand_over_mouth.png b/public/images/emoji/win10/face_with_hand_over_mouth.png
index aed8f62e0b0..dd6cbd14837 100644
Binary files a/public/images/emoji/win10/face_with_hand_over_mouth.png and b/public/images/emoji/win10/face_with_hand_over_mouth.png differ
diff --git a/public/images/emoji/win10/face_with_monocle.png b/public/images/emoji/win10/face_with_monocle.png
index c6fbb4481d5..3a951a59aad 100644
Binary files a/public/images/emoji/win10/face_with_monocle.png and b/public/images/emoji/win10/face_with_monocle.png differ
diff --git a/public/images/emoji/win10/face_with_raised_eyebrow.png b/public/images/emoji/win10/face_with_raised_eyebrow.png
index 887f70e3652..aed4bbacf38 100644
Binary files a/public/images/emoji/win10/face_with_raised_eyebrow.png and b/public/images/emoji/win10/face_with_raised_eyebrow.png differ
diff --git a/public/images/emoji/win10/face_with_symbols_over_mouth.png b/public/images/emoji/win10/face_with_symbols_over_mouth.png
index 84bb9ec9c53..9dfe5793e28 100644
Binary files a/public/images/emoji/win10/face_with_symbols_over_mouth.png and b/public/images/emoji/win10/face_with_symbols_over_mouth.png differ
diff --git a/public/images/emoji/win10/fairy.png b/public/images/emoji/win10/fairy.png
index 429938294b2..ebb60345dfb 100644
Binary files a/public/images/emoji/win10/fairy.png and b/public/images/emoji/win10/fairy.png differ
diff --git a/public/images/emoji/win10/fairy/2.png b/public/images/emoji/win10/fairy/2.png
index 91e1de4e5dc..50542a6b158 100644
Binary files a/public/images/emoji/win10/fairy/2.png and b/public/images/emoji/win10/fairy/2.png differ
diff --git a/public/images/emoji/win10/fairy/3.png b/public/images/emoji/win10/fairy/3.png
index 42821806e92..53bf85fd37d 100644
Binary files a/public/images/emoji/win10/fairy/3.png and b/public/images/emoji/win10/fairy/3.png differ
diff --git a/public/images/emoji/win10/fairy/4.png b/public/images/emoji/win10/fairy/4.png
index 9e8d3adb897..6f50f0d97e5 100644
Binary files a/public/images/emoji/win10/fairy/4.png and b/public/images/emoji/win10/fairy/4.png differ
diff --git a/public/images/emoji/win10/fairy/5.png b/public/images/emoji/win10/fairy/5.png
index 88d190e3926..c99528ad0e1 100644
Binary files a/public/images/emoji/win10/fairy/5.png and b/public/images/emoji/win10/fairy/5.png differ
diff --git a/public/images/emoji/win10/fairy/6.png b/public/images/emoji/win10/fairy/6.png
index e6ab8ade743..a3d4c417e42 100644
Binary files a/public/images/emoji/win10/fairy/6.png and b/public/images/emoji/win10/fairy/6.png differ
diff --git a/public/images/emoji/win10/fax.png b/public/images/emoji/win10/fax.png
index be415263f5e..4400ab4bdc4 100644
Binary files a/public/images/emoji/win10/fax.png and b/public/images/emoji/win10/fax.png differ
diff --git a/public/images/emoji/win10/film_frames.png b/public/images/emoji/win10/film_frames.png
index 09256e78ea2..6a965da389f 100644
Binary files a/public/images/emoji/win10/film_frames.png and b/public/images/emoji/win10/film_frames.png differ
diff --git a/public/images/emoji/win10/film_strip.png b/public/images/emoji/win10/film_strip.png
index 09256e78ea2..6a965da389f 100644
Binary files a/public/images/emoji/win10/film_strip.png and b/public/images/emoji/win10/film_strip.png differ
diff --git a/public/images/emoji/win10/five.png b/public/images/emoji/win10/five.png
index 5c85432a268..964b73bfc6e 100644
Binary files a/public/images/emoji/win10/five.png and b/public/images/emoji/win10/five.png differ
diff --git a/public/images/emoji/win10/flying_saucer.png b/public/images/emoji/win10/flying_saucer.png
index 7d5c8628554..8fe851c6910 100644
Binary files a/public/images/emoji/win10/flying_saucer.png and b/public/images/emoji/win10/flying_saucer.png differ
diff --git a/public/images/emoji/win10/fortune_cookie.png b/public/images/emoji/win10/fortune_cookie.png
index 94a8cdca403..62499678436 100644
Binary files a/public/images/emoji/win10/fortune_cookie.png and b/public/images/emoji/win10/fortune_cookie.png differ
diff --git a/public/images/emoji/win10/four.png b/public/images/emoji/win10/four.png
index 3800d040764..523c26e10b7 100644
Binary files a/public/images/emoji/win10/four.png and b/public/images/emoji/win10/four.png differ
diff --git a/public/images/emoji/win10/frowning_man/4.png b/public/images/emoji/win10/frowning_man/4.png
index 9701d81ee0a..8669d92b369 100644
Binary files a/public/images/emoji/win10/frowning_man/4.png and b/public/images/emoji/win10/frowning_man/4.png differ
diff --git a/public/images/emoji/win10/gear.png b/public/images/emoji/win10/gear.png
index 80abe6d2812..5d7faeebddf 100644
Binary files a/public/images/emoji/win10/gear.png and b/public/images/emoji/win10/gear.png differ
diff --git a/public/images/emoji/win10/genie.png b/public/images/emoji/win10/genie.png
index f0eddcc91ae..a7338882729 100644
Binary files a/public/images/emoji/win10/genie.png and b/public/images/emoji/win10/genie.png differ
diff --git a/public/images/emoji/win10/giraffe.png b/public/images/emoji/win10/giraffe.png
index be0e85d2896..3196b64167c 100644
Binary files a/public/images/emoji/win10/giraffe.png and b/public/images/emoji/win10/giraffe.png differ
diff --git a/public/images/emoji/win10/gloves.png b/public/images/emoji/win10/gloves.png
index 1a11dd2c560..d82369e38b9 100644
Binary files a/public/images/emoji/win10/gloves.png and b/public/images/emoji/win10/gloves.png differ
diff --git a/public/images/emoji/win10/green_book.png b/public/images/emoji/win10/green_book.png
index 91fa146e322..25485d4fe24 100644
Binary files a/public/images/emoji/win10/green_book.png and b/public/images/emoji/win10/green_book.png differ
diff --git a/public/images/emoji/win10/grimacing.png b/public/images/emoji/win10/grimacing.png
index 764458e23c6..91a7f0b68c5 100644
Binary files a/public/images/emoji/win10/grimacing.png and b/public/images/emoji/win10/grimacing.png differ
diff --git a/public/images/emoji/win10/hamburger.png b/public/images/emoji/win10/hamburger.png
index dec4b47bfb2..33980b0371f 100644
Binary files a/public/images/emoji/win10/hamburger.png and b/public/images/emoji/win10/hamburger.png differ
diff --git a/public/images/emoji/win10/hash.png b/public/images/emoji/win10/hash.png
index 64f9f559649..36fcb63881f 100644
Binary files a/public/images/emoji/win10/hash.png and b/public/images/emoji/win10/hash.png differ
diff --git a/public/images/emoji/win10/heart.png b/public/images/emoji/win10/heart.png
index af5a7990e4d..3df2a01dfe2 100644
Binary files a/public/images/emoji/win10/heart.png and b/public/images/emoji/win10/heart.png differ
diff --git a/public/images/emoji/win10/heart_decoration.png b/public/images/emoji/win10/heart_decoration.png
index df519fd4d8b..87331517471 100644
Binary files a/public/images/emoji/win10/heart_decoration.png and b/public/images/emoji/win10/heart_decoration.png differ
diff --git a/public/images/emoji/win10/heavy_check_mark.png b/public/images/emoji/win10/heavy_check_mark.png
index f17dbc3ab3c..5193701fdac 100644
Binary files a/public/images/emoji/win10/heavy_check_mark.png and b/public/images/emoji/win10/heavy_check_mark.png differ
diff --git a/public/images/emoji/win10/heavy_division_sign.png b/public/images/emoji/win10/heavy_division_sign.png
index 512afc5269c..6a662ff0371 100644
Binary files a/public/images/emoji/win10/heavy_division_sign.png and b/public/images/emoji/win10/heavy_division_sign.png differ
diff --git a/public/images/emoji/win10/heavy_multiplication_x.png b/public/images/emoji/win10/heavy_multiplication_x.png
index c0fef198738..3d480f92506 100644
Binary files a/public/images/emoji/win10/heavy_multiplication_x.png and b/public/images/emoji/win10/heavy_multiplication_x.png differ
diff --git a/public/images/emoji/win10/hedgehog.png b/public/images/emoji/win10/hedgehog.png
index 9b978b35407..311d54f00c5 100644
Binary files a/public/images/emoji/win10/hedgehog.png and b/public/images/emoji/win10/hedgehog.png differ
diff --git a/public/images/emoji/win10/helmet_with_cross.png b/public/images/emoji/win10/helmet_with_cross.png
index 79e1a5801c1..3dc162b5fd7 100644
Binary files a/public/images/emoji/win10/helmet_with_cross.png and b/public/images/emoji/win10/helmet_with_cross.png differ
diff --git a/public/images/emoji/win10/helmet_with_white_cross.png b/public/images/emoji/win10/helmet_with_white_cross.png
index 79e1a5801c1..3dc162b5fd7 100644
Binary files a/public/images/emoji/win10/helmet_with_white_cross.png and b/public/images/emoji/win10/helmet_with_white_cross.png differ
diff --git a/public/images/emoji/win10/hospital.png b/public/images/emoji/win10/hospital.png
index f2fac228eaa..9a63ec2bd07 100644
Binary files a/public/images/emoji/win10/hospital.png and b/public/images/emoji/win10/hospital.png differ
diff --git a/public/images/emoji/win10/hotel.png b/public/images/emoji/win10/hotel.png
index 27a95fb9425..a06db90deed 100644
Binary files a/public/images/emoji/win10/hotel.png and b/public/images/emoji/win10/hotel.png differ
diff --git a/public/images/emoji/win10/joy.png b/public/images/emoji/win10/joy.png
index 021828c5052..1561756b4f3 100644
Binary files a/public/images/emoji/win10/joy.png and b/public/images/emoji/win10/joy.png differ
diff --git a/public/images/emoji/win10/keyboard.png b/public/images/emoji/win10/keyboard.png
index 025fe93c86e..0d463d4be88 100644
Binary files a/public/images/emoji/win10/keyboard.png and b/public/images/emoji/win10/keyboard.png differ
diff --git a/public/images/emoji/win10/keycap_star.png b/public/images/emoji/win10/keycap_star.png
index f847acf58c4..302650d81e4 100644
Binary files a/public/images/emoji/win10/keycap_star.png and b/public/images/emoji/win10/keycap_star.png differ
diff --git a/public/images/emoji/win10/latin_cross.png b/public/images/emoji/win10/latin_cross.png
index a94333be743..75afdd6613b 100644
Binary files a/public/images/emoji/win10/latin_cross.png and b/public/images/emoji/win10/latin_cross.png differ
diff --git a/public/images/emoji/win10/ledger.png b/public/images/emoji/win10/ledger.png
index 75fde131693..1abcbcc34c2 100644
Binary files a/public/images/emoji/win10/ledger.png and b/public/images/emoji/win10/ledger.png differ
diff --git a/public/images/emoji/win10/left_luggage.png b/public/images/emoji/win10/left_luggage.png
index eddcb48e868..90567de4d49 100644
Binary files a/public/images/emoji/win10/left_luggage.png and b/public/images/emoji/win10/left_luggage.png differ
diff --git a/public/images/emoji/win10/left_right_arrow.png b/public/images/emoji/win10/left_right_arrow.png
index fcaf7a3550b..e55832e7942 100644
Binary files a/public/images/emoji/win10/left_right_arrow.png and b/public/images/emoji/win10/left_right_arrow.png differ
diff --git a/public/images/emoji/win10/left_speech_bubble.png b/public/images/emoji/win10/left_speech_bubble.png
index d5abfccee7a..e56fe0e74c5 100644
Binary files a/public/images/emoji/win10/left_speech_bubble.png and b/public/images/emoji/win10/left_speech_bubble.png differ
diff --git a/public/images/emoji/win10/love_hotel.png b/public/images/emoji/win10/love_hotel.png
index a67551d5c9d..426dfcf8877 100644
Binary files a/public/images/emoji/win10/love_hotel.png and b/public/images/emoji/win10/love_hotel.png differ
diff --git a/public/images/emoji/win10/love_you_gesture.png b/public/images/emoji/win10/love_you_gesture.png
index 14ef7c72b20..4af2a520d8d 100644
Binary files a/public/images/emoji/win10/love_you_gesture.png and b/public/images/emoji/win10/love_you_gesture.png differ
diff --git a/public/images/emoji/win10/love_you_gesture/2.png b/public/images/emoji/win10/love_you_gesture/2.png
index b70217e894c..f18c6396522 100644
Binary files a/public/images/emoji/win10/love_you_gesture/2.png and b/public/images/emoji/win10/love_you_gesture/2.png differ
diff --git a/public/images/emoji/win10/love_you_gesture/3.png b/public/images/emoji/win10/love_you_gesture/3.png
index aa984ea9263..898ce3e056e 100644
Binary files a/public/images/emoji/win10/love_you_gesture/3.png and b/public/images/emoji/win10/love_you_gesture/3.png differ
diff --git a/public/images/emoji/win10/love_you_gesture/4.png b/public/images/emoji/win10/love_you_gesture/4.png
index 5decb0e8008..65cffe154a9 100644
Binary files a/public/images/emoji/win10/love_you_gesture/4.png and b/public/images/emoji/win10/love_you_gesture/4.png differ
diff --git a/public/images/emoji/win10/love_you_gesture/5.png b/public/images/emoji/win10/love_you_gesture/5.png
index e0bb218cc08..af2fedb12ec 100644
Binary files a/public/images/emoji/win10/love_you_gesture/5.png and b/public/images/emoji/win10/love_you_gesture/5.png differ
diff --git a/public/images/emoji/win10/love_you_gesture/6.png b/public/images/emoji/win10/love_you_gesture/6.png
index bb51bde8bbd..ab1090f5fee 100644
Binary files a/public/images/emoji/win10/love_you_gesture/6.png and b/public/images/emoji/win10/love_you_gesture/6.png differ
diff --git a/public/images/emoji/win10/mage.png b/public/images/emoji/win10/mage.png
index 71c1b13f924..f8f2257036d 100644
Binary files a/public/images/emoji/win10/mage.png and b/public/images/emoji/win10/mage.png differ
diff --git a/public/images/emoji/win10/mage/2.png b/public/images/emoji/win10/mage/2.png
index 823f6843fad..52962fc821d 100644
Binary files a/public/images/emoji/win10/mage/2.png and b/public/images/emoji/win10/mage/2.png differ
diff --git a/public/images/emoji/win10/mage/3.png b/public/images/emoji/win10/mage/3.png
index c2ff6622a04..bf4d8c34ff2 100644
Binary files a/public/images/emoji/win10/mage/3.png and b/public/images/emoji/win10/mage/3.png differ
diff --git a/public/images/emoji/win10/mage/4.png b/public/images/emoji/win10/mage/4.png
index 76d0a52e374..953cacae5f2 100644
Binary files a/public/images/emoji/win10/mage/4.png and b/public/images/emoji/win10/mage/4.png differ
diff --git a/public/images/emoji/win10/mage/5.png b/public/images/emoji/win10/mage/5.png
index ddb5de55806..da7f03c24f8 100644
Binary files a/public/images/emoji/win10/mage/5.png and b/public/images/emoji/win10/mage/5.png differ
diff --git a/public/images/emoji/win10/mage/6.png b/public/images/emoji/win10/mage/6.png
index 302dd62dfb3..612f48ba1c0 100644
Binary files a/public/images/emoji/win10/mage/6.png and b/public/images/emoji/win10/mage/6.png differ
diff --git a/public/images/emoji/win10/mahjong.png b/public/images/emoji/win10/mahjong.png
index 8b2a4b19333..6934cfd75e2 100644
Binary files a/public/images/emoji/win10/mahjong.png and b/public/images/emoji/win10/mahjong.png differ
diff --git a/public/images/emoji/win10/mailbox.png b/public/images/emoji/win10/mailbox.png
index 6629d118b3e..44c159dd8c6 100644
Binary files a/public/images/emoji/win10/mailbox.png and b/public/images/emoji/win10/mailbox.png differ
diff --git a/public/images/emoji/win10/man_student/6.png b/public/images/emoji/win10/man_student/6.png
index 95f73fc6bfb..1d352ad4e10 100644
Binary files a/public/images/emoji/win10/man_student/6.png and b/public/images/emoji/win10/man_student/6.png differ
diff --git a/public/images/emoji/win10/mantelpiece_clock.png b/public/images/emoji/win10/mantelpiece_clock.png
index 8ff54293234..ce1971e0dae 100644
Binary files a/public/images/emoji/win10/mantelpiece_clock.png and b/public/images/emoji/win10/mantelpiece_clock.png differ
diff --git a/public/images/emoji/win10/mermaid.png b/public/images/emoji/win10/mermaid.png
new file mode 100644
index 00000000000..a0a9d4e5409
Binary files /dev/null and b/public/images/emoji/win10/mermaid.png differ
diff --git a/public/images/emoji/win10/mermaid/2.png b/public/images/emoji/win10/mermaid/2.png
new file mode 100644
index 00000000000..39fc48c86b8
Binary files /dev/null and b/public/images/emoji/win10/mermaid/2.png differ
diff --git a/public/images/emoji/win10/mermaid/3.png b/public/images/emoji/win10/mermaid/3.png
new file mode 100644
index 00000000000..10b1f472c93
Binary files /dev/null and b/public/images/emoji/win10/mermaid/3.png differ
diff --git a/public/images/emoji/win10/mermaid/4.png b/public/images/emoji/win10/mermaid/4.png
new file mode 100644
index 00000000000..501d59a38ce
Binary files /dev/null and b/public/images/emoji/win10/mermaid/4.png differ
diff --git a/public/images/emoji/win10/mermaid/5.png b/public/images/emoji/win10/mermaid/5.png
new file mode 100644
index 00000000000..df9312ddf23
Binary files /dev/null and b/public/images/emoji/win10/mermaid/5.png differ
diff --git a/public/images/emoji/win10/mermaid/6.png b/public/images/emoji/win10/mermaid/6.png
new file mode 100644
index 00000000000..5cfda93a9dc
Binary files /dev/null and b/public/images/emoji/win10/mermaid/6.png differ
diff --git a/public/images/emoji/win10/merman.png b/public/images/emoji/win10/merman.png
new file mode 100644
index 00000000000..574126713af
Binary files /dev/null and b/public/images/emoji/win10/merman.png differ
diff --git a/public/images/emoji/win10/merman/2.png b/public/images/emoji/win10/merman/2.png
new file mode 100644
index 00000000000..96636460f56
Binary files /dev/null and b/public/images/emoji/win10/merman/2.png differ
diff --git a/public/images/emoji/win10/merman/3.png b/public/images/emoji/win10/merman/3.png
new file mode 100644
index 00000000000..de97ece6403
Binary files /dev/null and b/public/images/emoji/win10/merman/3.png differ
diff --git a/public/images/emoji/win10/merman/4.png b/public/images/emoji/win10/merman/4.png
new file mode 100644
index 00000000000..5443ef99a3a
Binary files /dev/null and b/public/images/emoji/win10/merman/4.png differ
diff --git a/public/images/emoji/win10/merman/5.png b/public/images/emoji/win10/merman/5.png
new file mode 100644
index 00000000000..90ea1d250d2
Binary files /dev/null and b/public/images/emoji/win10/merman/5.png differ
diff --git a/public/images/emoji/win10/merman/6.png b/public/images/emoji/win10/merman/6.png
new file mode 100644
index 00000000000..5f113ae1977
Binary files /dev/null and b/public/images/emoji/win10/merman/6.png differ
diff --git a/public/images/emoji/win10/merperson.png b/public/images/emoji/win10/merperson.png
index ee1b999e0dd..a0a9d4e5409 100644
Binary files a/public/images/emoji/win10/merperson.png and b/public/images/emoji/win10/merperson.png differ
diff --git a/public/images/emoji/win10/merperson/2.png b/public/images/emoji/win10/merperson/2.png
index b97fbf42e35..39fc48c86b8 100644
Binary files a/public/images/emoji/win10/merperson/2.png and b/public/images/emoji/win10/merperson/2.png differ
diff --git a/public/images/emoji/win10/merperson/3.png b/public/images/emoji/win10/merperson/3.png
index 9079f60b81e..10b1f472c93 100644
Binary files a/public/images/emoji/win10/merperson/3.png and b/public/images/emoji/win10/merperson/3.png differ
diff --git a/public/images/emoji/win10/merperson/4.png b/public/images/emoji/win10/merperson/4.png
index decc0b58929..501d59a38ce 100644
Binary files a/public/images/emoji/win10/merperson/4.png and b/public/images/emoji/win10/merperson/4.png differ
diff --git a/public/images/emoji/win10/merperson/5.png b/public/images/emoji/win10/merperson/5.png
index e3e3e89cb16..df9312ddf23 100644
Binary files a/public/images/emoji/win10/merperson/5.png and b/public/images/emoji/win10/merperson/5.png differ
diff --git a/public/images/emoji/win10/merperson/6.png b/public/images/emoji/win10/merperson/6.png
index 5a5f36684e5..5cfda93a9dc 100644
Binary files a/public/images/emoji/win10/merperson/6.png and b/public/images/emoji/win10/merperson/6.png differ
diff --git a/public/images/emoji/win10/nerd.png b/public/images/emoji/win10/nerd.png
index 38bf7ae0f2f..a50a63e416c 100644
Binary files a/public/images/emoji/win10/nerd.png and b/public/images/emoji/win10/nerd.png differ
diff --git a/public/images/emoji/win10/nerd_face.png b/public/images/emoji/win10/nerd_face.png
index 38bf7ae0f2f..a50a63e416c 100644
Binary files a/public/images/emoji/win10/nerd_face.png and b/public/images/emoji/win10/nerd_face.png differ
diff --git a/public/images/emoji/win10/nine.png b/public/images/emoji/win10/nine.png
index f68cbedc51c..413829efbfe 100644
Binary files a/public/images/emoji/win10/nine.png and b/public/images/emoji/win10/nine.png differ
diff --git a/public/images/emoji/win10/notebook.png b/public/images/emoji/win10/notebook.png
index 906984de429..3452a259dfe 100644
Binary files a/public/images/emoji/win10/notebook.png and b/public/images/emoji/win10/notebook.png differ
diff --git a/public/images/emoji/win10/nut_and_bolt.png b/public/images/emoji/win10/nut_and_bolt.png
index e65b44916d1..0fce7569af2 100644
Binary files a/public/images/emoji/win10/nut_and_bolt.png and b/public/images/emoji/win10/nut_and_bolt.png differ
diff --git a/public/images/emoji/win10/older_adult.png b/public/images/emoji/win10/older_adult.png
index 8796829b876..8aec22e27d9 100644
Binary files a/public/images/emoji/win10/older_adult.png and b/public/images/emoji/win10/older_adult.png differ
diff --git a/public/images/emoji/win10/older_adult/2.png b/public/images/emoji/win10/older_adult/2.png
index b36f41960e7..cf13c71b316 100644
Binary files a/public/images/emoji/win10/older_adult/2.png and b/public/images/emoji/win10/older_adult/2.png differ
diff --git a/public/images/emoji/win10/older_adult/3.png b/public/images/emoji/win10/older_adult/3.png
index dc1441fea56..7c2119727ef 100644
Binary files a/public/images/emoji/win10/older_adult/3.png and b/public/images/emoji/win10/older_adult/3.png differ
diff --git a/public/images/emoji/win10/older_adult/4.png b/public/images/emoji/win10/older_adult/4.png
index abc19e06c74..8bd3a474136 100644
Binary files a/public/images/emoji/win10/older_adult/4.png and b/public/images/emoji/win10/older_adult/4.png differ
diff --git a/public/images/emoji/win10/older_adult/5.png b/public/images/emoji/win10/older_adult/5.png
index c90549f6813..631a93e90ea 100644
Binary files a/public/images/emoji/win10/older_adult/5.png and b/public/images/emoji/win10/older_adult/5.png differ
diff --git a/public/images/emoji/win10/older_adult/6.png b/public/images/emoji/win10/older_adult/6.png
index 5152c9c1a3e..99581e8e157 100644
Binary files a/public/images/emoji/win10/older_adult/6.png and b/public/images/emoji/win10/older_adult/6.png differ
diff --git a/public/images/emoji/win10/one.png b/public/images/emoji/win10/one.png
index 04153a940f9..350636c23de 100644
Binary files a/public/images/emoji/win10/one.png and b/public/images/emoji/win10/one.png differ
diff --git a/public/images/emoji/win10/ophiuchus.png b/public/images/emoji/win10/ophiuchus.png
index 8e28684ac97..b1b7b0d5945 100644
Binary files a/public/images/emoji/win10/ophiuchus.png and b/public/images/emoji/win10/ophiuchus.png differ
diff --git a/public/images/emoji/win10/orange_heart.png b/public/images/emoji/win10/orange_heart.png
index f217c930a74..9fdb0d27061 100644
Binary files a/public/images/emoji/win10/orange_heart.png and b/public/images/emoji/win10/orange_heart.png differ
diff --git a/public/images/emoji/win10/page_facing_up.png b/public/images/emoji/win10/page_facing_up.png
index 6239d67f0db..6c20aafec7d 100644
Binary files a/public/images/emoji/win10/page_facing_up.png and b/public/images/emoji/win10/page_facing_up.png differ
diff --git a/public/images/emoji/win10/pager.png b/public/images/emoji/win10/pager.png
index a11383a9734..d3a4bc8d89d 100644
Binary files a/public/images/emoji/win10/pager.png and b/public/images/emoji/win10/pager.png differ
diff --git a/public/images/emoji/win10/palms_up_together.png b/public/images/emoji/win10/palms_up_together.png
index fb66ba11c40..6c4d662bd91 100644
Binary files a/public/images/emoji/win10/palms_up_together.png and b/public/images/emoji/win10/palms_up_together.png differ
diff --git a/public/images/emoji/win10/palms_up_together/2.png b/public/images/emoji/win10/palms_up_together/2.png
index 6d9b2fc8ccd..62d1cc6d444 100644
Binary files a/public/images/emoji/win10/palms_up_together/2.png and b/public/images/emoji/win10/palms_up_together/2.png differ
diff --git a/public/images/emoji/win10/palms_up_together/3.png b/public/images/emoji/win10/palms_up_together/3.png
index c5d52f5c7a7..2d559186f17 100644
Binary files a/public/images/emoji/win10/palms_up_together/3.png and b/public/images/emoji/win10/palms_up_together/3.png differ
diff --git a/public/images/emoji/win10/palms_up_together/4.png b/public/images/emoji/win10/palms_up_together/4.png
index 3d4288d10db..ed8cc989ca6 100644
Binary files a/public/images/emoji/win10/palms_up_together/4.png and b/public/images/emoji/win10/palms_up_together/4.png differ
diff --git a/public/images/emoji/win10/palms_up_together/5.png b/public/images/emoji/win10/palms_up_together/5.png
index 6ff36c07cbd..aef2b0eb35e 100644
Binary files a/public/images/emoji/win10/palms_up_together/5.png and b/public/images/emoji/win10/palms_up_together/5.png differ
diff --git a/public/images/emoji/win10/palms_up_together/6.png b/public/images/emoji/win10/palms_up_together/6.png
index c25d42927d8..da1e2e24e1f 100644
Binary files a/public/images/emoji/win10/palms_up_together/6.png and b/public/images/emoji/win10/palms_up_together/6.png differ
diff --git a/public/images/emoji/win10/person_climbing.png b/public/images/emoji/win10/person_climbing.png
index d8a6229d6b9..f58cb7ffc74 100644
Binary files a/public/images/emoji/win10/person_climbing.png and b/public/images/emoji/win10/person_climbing.png differ
diff --git a/public/images/emoji/win10/person_climbing/2.png b/public/images/emoji/win10/person_climbing/2.png
index 71330d66a8c..4a5dda73932 100644
Binary files a/public/images/emoji/win10/person_climbing/2.png and b/public/images/emoji/win10/person_climbing/2.png differ
diff --git a/public/images/emoji/win10/person_climbing/3.png b/public/images/emoji/win10/person_climbing/3.png
index a1345ecbd25..c881026d45a 100644
Binary files a/public/images/emoji/win10/person_climbing/3.png and b/public/images/emoji/win10/person_climbing/3.png differ
diff --git a/public/images/emoji/win10/person_climbing/4.png b/public/images/emoji/win10/person_climbing/4.png
index 016b920bcde..07d71406d28 100644
Binary files a/public/images/emoji/win10/person_climbing/4.png and b/public/images/emoji/win10/person_climbing/4.png differ
diff --git a/public/images/emoji/win10/person_climbing/5.png b/public/images/emoji/win10/person_climbing/5.png
index 4591eb52904..6f9fce12c0a 100644
Binary files a/public/images/emoji/win10/person_climbing/5.png and b/public/images/emoji/win10/person_climbing/5.png differ
diff --git a/public/images/emoji/win10/person_climbing/6.png b/public/images/emoji/win10/person_climbing/6.png
index 19be3236ae9..cfd6bae7242 100644
Binary files a/public/images/emoji/win10/person_climbing/6.png and b/public/images/emoji/win10/person_climbing/6.png differ
diff --git a/public/images/emoji/win10/person_in_lotus_position.png b/public/images/emoji/win10/person_in_lotus_position.png
index e9404fd5255..34536d3d8ad 100644
Binary files a/public/images/emoji/win10/person_in_lotus_position.png and b/public/images/emoji/win10/person_in_lotus_position.png differ
diff --git a/public/images/emoji/win10/person_in_lotus_position/2.png b/public/images/emoji/win10/person_in_lotus_position/2.png
index 8817578cf09..f5998abf743 100644
Binary files a/public/images/emoji/win10/person_in_lotus_position/2.png and b/public/images/emoji/win10/person_in_lotus_position/2.png differ
diff --git a/public/images/emoji/win10/person_in_lotus_position/3.png b/public/images/emoji/win10/person_in_lotus_position/3.png
index 0e9bf46e0b6..6c1894a45d7 100644
Binary files a/public/images/emoji/win10/person_in_lotus_position/3.png and b/public/images/emoji/win10/person_in_lotus_position/3.png differ
diff --git a/public/images/emoji/win10/person_in_lotus_position/4.png b/public/images/emoji/win10/person_in_lotus_position/4.png
index 918e3d435a2..f6b1875c755 100644
Binary files a/public/images/emoji/win10/person_in_lotus_position/4.png and b/public/images/emoji/win10/person_in_lotus_position/4.png differ
diff --git a/public/images/emoji/win10/person_in_lotus_position/5.png b/public/images/emoji/win10/person_in_lotus_position/5.png
index 0c01143530e..80bd1b4f222 100644
Binary files a/public/images/emoji/win10/person_in_lotus_position/5.png and b/public/images/emoji/win10/person_in_lotus_position/5.png differ
diff --git a/public/images/emoji/win10/person_in_lotus_position/6.png b/public/images/emoji/win10/person_in_lotus_position/6.png
index fed226dac29..34ccf247a4f 100644
Binary files a/public/images/emoji/win10/person_in_lotus_position/6.png and b/public/images/emoji/win10/person_in_lotus_position/6.png differ
diff --git a/public/images/emoji/win10/person_in_steamy_room.png b/public/images/emoji/win10/person_in_steamy_room.png
index 65a0790d926..74a1bc84631 100644
Binary files a/public/images/emoji/win10/person_in_steamy_room.png and b/public/images/emoji/win10/person_in_steamy_room.png differ
diff --git a/public/images/emoji/win10/person_in_steamy_room/2.png b/public/images/emoji/win10/person_in_steamy_room/2.png
index 7260df1d154..bbadc1e7cbe 100644
Binary files a/public/images/emoji/win10/person_in_steamy_room/2.png and b/public/images/emoji/win10/person_in_steamy_room/2.png differ
diff --git a/public/images/emoji/win10/person_in_steamy_room/3.png b/public/images/emoji/win10/person_in_steamy_room/3.png
index d14580a3db3..a40bf87b1e3 100644
Binary files a/public/images/emoji/win10/person_in_steamy_room/3.png and b/public/images/emoji/win10/person_in_steamy_room/3.png differ
diff --git a/public/images/emoji/win10/person_in_steamy_room/4.png b/public/images/emoji/win10/person_in_steamy_room/4.png
index 9313ab2116b..933f13b97d4 100644
Binary files a/public/images/emoji/win10/person_in_steamy_room/4.png and b/public/images/emoji/win10/person_in_steamy_room/4.png differ
diff --git a/public/images/emoji/win10/person_in_steamy_room/5.png b/public/images/emoji/win10/person_in_steamy_room/5.png
index f432b554b37..4cddc2fbf97 100644
Binary files a/public/images/emoji/win10/person_in_steamy_room/5.png and b/public/images/emoji/win10/person_in_steamy_room/5.png differ
diff --git a/public/images/emoji/win10/person_in_steamy_room/6.png b/public/images/emoji/win10/person_in_steamy_room/6.png
index dc7087e0284..8fb3a4c62b5 100644
Binary files a/public/images/emoji/win10/person_in_steamy_room/6.png and b/public/images/emoji/win10/person_in_steamy_room/6.png differ
diff --git a/public/images/emoji/win10/pie.png b/public/images/emoji/win10/pie.png
index 4f5f474d82c..3e1298d46e8 100644
Binary files a/public/images/emoji/win10/pie.png and b/public/images/emoji/win10/pie.png differ
diff --git a/public/images/emoji/win10/pray.png b/public/images/emoji/win10/pray.png
index fbd3eea81f8..7d088517ae1 100644
Binary files a/public/images/emoji/win10/pray.png and b/public/images/emoji/win10/pray.png differ
diff --git a/public/images/emoji/win10/pray/2.png b/public/images/emoji/win10/pray/2.png
index 16ef86a4e69..66d91b3f123 100644
Binary files a/public/images/emoji/win10/pray/2.png and b/public/images/emoji/win10/pray/2.png differ
diff --git a/public/images/emoji/win10/pray/3.png b/public/images/emoji/win10/pray/3.png
index 845363fe624..2459302f528 100644
Binary files a/public/images/emoji/win10/pray/3.png and b/public/images/emoji/win10/pray/3.png differ
diff --git a/public/images/emoji/win10/pray/4.png b/public/images/emoji/win10/pray/4.png
index 271cff1b585..da87baf804a 100644
Binary files a/public/images/emoji/win10/pray/4.png and b/public/images/emoji/win10/pray/4.png differ
diff --git a/public/images/emoji/win10/pray/5.png b/public/images/emoji/win10/pray/5.png
index a822e6adda5..29c6e33cd79 100644
Binary files a/public/images/emoji/win10/pray/5.png and b/public/images/emoji/win10/pray/5.png differ
diff --git a/public/images/emoji/win10/pray/6.png b/public/images/emoji/win10/pray/6.png
index 77bdd570461..eb6c75f9a1b 100644
Binary files a/public/images/emoji/win10/pray/6.png and b/public/images/emoji/win10/pray/6.png differ
diff --git a/public/images/emoji/win10/pretzel.png b/public/images/emoji/win10/pretzel.png
index 9116d6ee9a2..42534f8d347 100644
Binary files a/public/images/emoji/win10/pretzel.png and b/public/images/emoji/win10/pretzel.png differ
diff --git a/public/images/emoji/win10/puke.png b/public/images/emoji/win10/puke.png
new file mode 100644
index 00000000000..6f2d6319f67
Binary files /dev/null and b/public/images/emoji/win10/puke.png differ
diff --git a/public/images/emoji/win10/raised_hands.png b/public/images/emoji/win10/raised_hands.png
index 17d73ef6ea3..edd897af371 100644
Binary files a/public/images/emoji/win10/raised_hands.png and b/public/images/emoji/win10/raised_hands.png differ
diff --git a/public/images/emoji/win10/raised_hands/2.png b/public/images/emoji/win10/raised_hands/2.png
index 5f85dc188ca..10b8c66a25d 100644
Binary files a/public/images/emoji/win10/raised_hands/2.png and b/public/images/emoji/win10/raised_hands/2.png differ
diff --git a/public/images/emoji/win10/raised_hands/3.png b/public/images/emoji/win10/raised_hands/3.png
index e8bcd0bd6c2..9eddd2d59e7 100644
Binary files a/public/images/emoji/win10/raised_hands/3.png and b/public/images/emoji/win10/raised_hands/3.png differ
diff --git a/public/images/emoji/win10/raised_hands/4.png b/public/images/emoji/win10/raised_hands/4.png
index faa47587a41..e72a8fec4ce 100644
Binary files a/public/images/emoji/win10/raised_hands/4.png and b/public/images/emoji/win10/raised_hands/4.png differ
diff --git a/public/images/emoji/win10/raised_hands/5.png b/public/images/emoji/win10/raised_hands/5.png
index 74d02ec7f8a..c708a724b0b 100644
Binary files a/public/images/emoji/win10/raised_hands/5.png and b/public/images/emoji/win10/raised_hands/5.png differ
diff --git a/public/images/emoji/win10/raised_hands/6.png b/public/images/emoji/win10/raised_hands/6.png
index 86c5f066fcb..12adf5a90dd 100644
Binary files a/public/images/emoji/win10/raised_hands/6.png and b/public/images/emoji/win10/raised_hands/6.png differ
diff --git a/public/images/emoji/win10/rescue_worker_helmet.png b/public/images/emoji/win10/rescue_worker_helmet.png
index 79e1a5801c1..3dc162b5fd7 100644
Binary files a/public/images/emoji/win10/rescue_worker_helmet.png and b/public/images/emoji/win10/rescue_worker_helmet.png differ
diff --git a/public/images/emoji/win10/rofl.png b/public/images/emoji/win10/rofl.png
index 39f60567f64..47cf2e8e38e 100644
Binary files a/public/images/emoji/win10/rofl.png and b/public/images/emoji/win10/rofl.png differ
diff --git a/public/images/emoji/win10/sagittarius.png b/public/images/emoji/win10/sagittarius.png
index 4478e79db3c..5c9a9df9110 100644
Binary files a/public/images/emoji/win10/sagittarius.png and b/public/images/emoji/win10/sagittarius.png differ
diff --git a/public/images/emoji/win10/sandwich.png b/public/images/emoji/win10/sandwich.png
index ba3f9a1cdb7..7ebb7c7eae1 100644
Binary files a/public/images/emoji/win10/sandwich.png and b/public/images/emoji/win10/sandwich.png differ
diff --git a/public/images/emoji/win10/satellite.png b/public/images/emoji/win10/satellite.png
index ee00094f52d..271073f7a94 100644
Binary files a/public/images/emoji/win10/satellite.png and b/public/images/emoji/win10/satellite.png differ
diff --git a/public/images/emoji/win10/sauropod.png b/public/images/emoji/win10/sauropod.png
index 2f4d6199975..d3d552b548f 100644
Binary files a/public/images/emoji/win10/sauropod.png and b/public/images/emoji/win10/sauropod.png differ
diff --git a/public/images/emoji/win10/scarf.png b/public/images/emoji/win10/scarf.png
index 73653eee2bd..238a852a4a2 100644
Binary files a/public/images/emoji/win10/scarf.png and b/public/images/emoji/win10/scarf.png differ
diff --git a/public/images/emoji/win10/scroll.png b/public/images/emoji/win10/scroll.png
index 93f0604938f..d4e5be14e6f 100644
Binary files a/public/images/emoji/win10/scroll.png and b/public/images/emoji/win10/scroll.png differ
diff --git a/public/images/emoji/win10/seven.png b/public/images/emoji/win10/seven.png
index 8e280d07c46..c2239b38fc6 100644
Binary files a/public/images/emoji/win10/seven.png and b/public/images/emoji/win10/seven.png differ
diff --git a/public/images/emoji/win10/signal_strength.png b/public/images/emoji/win10/signal_strength.png
index 14b2b379c57..0a549c476c1 100644
Binary files a/public/images/emoji/win10/signal_strength.png and b/public/images/emoji/win10/signal_strength.png differ
diff --git a/public/images/emoji/win10/six.png b/public/images/emoji/win10/six.png
index 230e33849b8..8ec9cdb10af 100644
Binary files a/public/images/emoji/win10/six.png and b/public/images/emoji/win10/six.png differ
diff --git a/public/images/emoji/win10/sled.png b/public/images/emoji/win10/sled.png
index 01805b1fe76..89d58851f47 100644
Binary files a/public/images/emoji/win10/sled.png and b/public/images/emoji/win10/sled.png differ
diff --git a/public/images/emoji/win10/sob.png b/public/images/emoji/win10/sob.png
index d109ee0268e..135f9df4203 100644
Binary files a/public/images/emoji/win10/sob.png and b/public/images/emoji/win10/sob.png differ
diff --git a/public/images/emoji/win10/socks.png b/public/images/emoji/win10/socks.png
index 8f2b9bbe9e3..f607f41d70c 100644
Binary files a/public/images/emoji/win10/socks.png and b/public/images/emoji/win10/socks.png differ
diff --git a/public/images/emoji/win10/star_and_crescent.png b/public/images/emoji/win10/star_and_crescent.png
index cec4a053a96..579290375ee 100644
Binary files a/public/images/emoji/win10/star_and_crescent.png and b/public/images/emoji/win10/star_and_crescent.png differ
diff --git a/public/images/emoji/win10/star_struck.png b/public/images/emoji/win10/star_struck.png
index 7da8183f394..60e2d24679e 100644
Binary files a/public/images/emoji/win10/star_struck.png and b/public/images/emoji/win10/star_struck.png differ
diff --git a/public/images/emoji/win10/stew.png b/public/images/emoji/win10/stew.png
index b19f21b661d..cd79b344ae1 100644
Binary files a/public/images/emoji/win10/stew.png and b/public/images/emoji/win10/stew.png differ
diff --git a/public/images/emoji/win10/stop_sign.png b/public/images/emoji/win10/stop_sign.png
index ca997dac302..780c388ec8d 100644
Binary files a/public/images/emoji/win10/stop_sign.png and b/public/images/emoji/win10/stop_sign.png differ
diff --git a/public/images/emoji/win10/t_rex.png b/public/images/emoji/win10/t_rex.png
index d8811a56382..0eec0dcc37b 100644
Binary files a/public/images/emoji/win10/t_rex.png and b/public/images/emoji/win10/t_rex.png differ
diff --git a/public/images/emoji/win10/takeout_box.png b/public/images/emoji/win10/takeout_box.png
index 08aa6a4843f..4d166e121c0 100644
Binary files a/public/images/emoji/win10/takeout_box.png and b/public/images/emoji/win10/takeout_box.png differ
diff --git a/public/images/emoji/win10/taurus.png b/public/images/emoji/win10/taurus.png
index 4061e9565f8..778a218f8ee 100644
Binary files a/public/images/emoji/win10/taurus.png and b/public/images/emoji/win10/taurus.png differ
diff --git a/public/images/emoji/win10/thermometer.png b/public/images/emoji/win10/thermometer.png
index 0feb41ac907..f66b4ea88eb 100644
Binary files a/public/images/emoji/win10/thermometer.png and b/public/images/emoji/win10/thermometer.png differ
diff --git a/public/images/emoji/win10/thought_balloon.png b/public/images/emoji/win10/thought_balloon.png
index c9cc241daee..bae2af4754e 100644
Binary files a/public/images/emoji/win10/thought_balloon.png and b/public/images/emoji/win10/thought_balloon.png differ
diff --git a/public/images/emoji/win10/three.png b/public/images/emoji/win10/three.png
index 2b641df50a8..efec792b5b0 100644
Binary files a/public/images/emoji/win10/three.png and b/public/images/emoji/win10/three.png differ
diff --git a/public/images/emoji/win10/ticket.png b/public/images/emoji/win10/ticket.png
index 3e8b8080737..83acbc42f55 100644
Binary files a/public/images/emoji/win10/ticket.png and b/public/images/emoji/win10/ticket.png differ
diff --git a/public/images/emoji/win10/toilet.png b/public/images/emoji/win10/toilet.png
index c2d40384279..1e5cb4ffeff 100644
Binary files a/public/images/emoji/win10/toilet.png and b/public/images/emoji/win10/toilet.png differ
diff --git a/public/images/emoji/win10/trophy.png b/public/images/emoji/win10/trophy.png
index fa9d3a5605a..e899afa083b 100644
Binary files a/public/images/emoji/win10/trophy.png and b/public/images/emoji/win10/trophy.png differ
diff --git a/public/images/emoji/win10/tropical_drink.png b/public/images/emoji/win10/tropical_drink.png
index a4d10d2047b..080025e11b3 100644
Binary files a/public/images/emoji/win10/tropical_drink.png and b/public/images/emoji/win10/tropical_drink.png differ
diff --git a/public/images/emoji/win10/tumbler_glass.png b/public/images/emoji/win10/tumbler_glass.png
index 4cfe2053c2d..7413927c50e 100644
Binary files a/public/images/emoji/win10/tumbler_glass.png and b/public/images/emoji/win10/tumbler_glass.png differ
diff --git a/public/images/emoji/win10/two.png b/public/images/emoji/win10/two.png
index 6740511b38b..ecef05090d0 100644
Binary files a/public/images/emoji/win10/two.png and b/public/images/emoji/win10/two.png differ
diff --git a/public/images/emoji/win10/u6307.png b/public/images/emoji/win10/u6307.png
index b7e2e1b4d96..8f5e6fe06b0 100644
Binary files a/public/images/emoji/win10/u6307.png and b/public/images/emoji/win10/u6307.png differ
diff --git a/public/images/emoji/win10/u7533.png b/public/images/emoji/win10/u7533.png
index 89891d189d9..bbbb8e097af 100644
Binary files a/public/images/emoji/win10/u7533.png and b/public/images/emoji/win10/u7533.png differ
diff --git a/public/images/emoji/win10/upside_down.png b/public/images/emoji/win10/upside_down.png
index 31842efe30f..f7880140cdc 100644
Binary files a/public/images/emoji/win10/upside_down.png and b/public/images/emoji/win10/upside_down.png differ
diff --git a/public/images/emoji/win10/upside_down_face.png b/public/images/emoji/win10/upside_down_face.png
index 31842efe30f..f7880140cdc 100644
Binary files a/public/images/emoji/win10/upside_down_face.png and b/public/images/emoji/win10/upside_down_face.png differ
diff --git a/public/images/emoji/win10/vampire.png b/public/images/emoji/win10/vampire.png
index 962288bd170..031ba7db154 100644
Binary files a/public/images/emoji/win10/vampire.png and b/public/images/emoji/win10/vampire.png differ
diff --git a/public/images/emoji/win10/vampire/2.png b/public/images/emoji/win10/vampire/2.png
index 154f2b6e35a..41bb9b49d9b 100644
Binary files a/public/images/emoji/win10/vampire/2.png and b/public/images/emoji/win10/vampire/2.png differ
diff --git a/public/images/emoji/win10/vampire/3.png b/public/images/emoji/win10/vampire/3.png
index 540b48d887f..07cb96f2766 100644
Binary files a/public/images/emoji/win10/vampire/3.png and b/public/images/emoji/win10/vampire/3.png differ
diff --git a/public/images/emoji/win10/vampire/4.png b/public/images/emoji/win10/vampire/4.png
index b05d3bad9ab..eb487cc9837 100644
Binary files a/public/images/emoji/win10/vampire/4.png and b/public/images/emoji/win10/vampire/4.png differ
diff --git a/public/images/emoji/win10/vampire/5.png b/public/images/emoji/win10/vampire/5.png
index 2bd9a7b71bb..d2591a3a386 100644
Binary files a/public/images/emoji/win10/vampire/5.png and b/public/images/emoji/win10/vampire/5.png differ
diff --git a/public/images/emoji/win10/vampire/6.png b/public/images/emoji/win10/vampire/6.png
index c88f4ad73bf..529feecf962 100644
Binary files a/public/images/emoji/win10/vampire/6.png and b/public/images/emoji/win10/vampire/6.png differ
diff --git a/public/images/emoji/win10/vertical_traffic_light.png b/public/images/emoji/win10/vertical_traffic_light.png
index 77868406f63..33b5eba7906 100644
Binary files a/public/images/emoji/win10/vertical_traffic_light.png and b/public/images/emoji/win10/vertical_traffic_light.png differ
diff --git a/public/images/emoji/win10/video_camera.png b/public/images/emoji/win10/video_camera.png
index daf9ec7b96d..47d7fc79200 100644
Binary files a/public/images/emoji/win10/video_camera.png and b/public/images/emoji/win10/video_camera.png differ
diff --git a/public/images/emoji/win10/virgo.png b/public/images/emoji/win10/virgo.png
index 8a8067bdfa2..b28b9ca192f 100644
Binary files a/public/images/emoji/win10/virgo.png and b/public/images/emoji/win10/virgo.png differ
diff --git a/public/images/emoji/win10/wastebasket.png b/public/images/emoji/win10/wastebasket.png
index 6263ba153d4..a0ddcddad68 100644
Binary files a/public/images/emoji/win10/wastebasket.png and b/public/images/emoji/win10/wastebasket.png differ
diff --git a/public/images/emoji/win10/watermelon.png b/public/images/emoji/win10/watermelon.png
index 67c2acd531d..0311f8c44ba 100644
Binary files a/public/images/emoji/win10/watermelon.png and b/public/images/emoji/win10/watermelon.png differ
diff --git a/public/images/emoji/win10/wedding.png b/public/images/emoji/win10/wedding.png
index 4919c5bea79..50b3cb4ad9e 100644
Binary files a/public/images/emoji/win10/wedding.png and b/public/images/emoji/win10/wedding.png differ
diff --git a/public/images/emoji/win10/white_check_mark.png b/public/images/emoji/win10/white_check_mark.png
index 4f77f8a2671..9c6d33d9185 100644
Binary files a/public/images/emoji/win10/white_check_mark.png and b/public/images/emoji/win10/white_check_mark.png differ
diff --git a/public/images/emoji/win10/wine_glass.png b/public/images/emoji/win10/wine_glass.png
index 3a7b55a50f8..79a7359693f 100644
Binary files a/public/images/emoji/win10/wine_glass.png and b/public/images/emoji/win10/wine_glass.png differ
diff --git a/public/images/emoji/win10/woman_climbing.png b/public/images/emoji/win10/woman_climbing.png
new file mode 100644
index 00000000000..108a59f6f8f
Binary files /dev/null and b/public/images/emoji/win10/woman_climbing.png differ
diff --git a/public/images/emoji/win10/woman_climbing/2.png b/public/images/emoji/win10/woman_climbing/2.png
new file mode 100644
index 00000000000..d51ffd3b5c2
Binary files /dev/null and b/public/images/emoji/win10/woman_climbing/2.png differ
diff --git a/public/images/emoji/win10/woman_climbing/3.png b/public/images/emoji/win10/woman_climbing/3.png
new file mode 100644
index 00000000000..ce09aa6269a
Binary files /dev/null and b/public/images/emoji/win10/woman_climbing/3.png differ
diff --git a/public/images/emoji/win10/woman_climbing/4.png b/public/images/emoji/win10/woman_climbing/4.png
new file mode 100644
index 00000000000..b9637408fb7
Binary files /dev/null and b/public/images/emoji/win10/woman_climbing/4.png differ
diff --git a/public/images/emoji/win10/woman_climbing/5.png b/public/images/emoji/win10/woman_climbing/5.png
new file mode 100644
index 00000000000..8776fc61605
Binary files /dev/null and b/public/images/emoji/win10/woman_climbing/5.png differ
diff --git a/public/images/emoji/win10/woman_climbing/6.png b/public/images/emoji/win10/woman_climbing/6.png
new file mode 100644
index 00000000000..0a10b1a1f62
Binary files /dev/null and b/public/images/emoji/win10/woman_climbing/6.png differ
diff --git a/public/images/emoji/win10/woman_genie.png b/public/images/emoji/win10/woman_genie.png
new file mode 100644
index 00000000000..357c5d697f5
Binary files /dev/null and b/public/images/emoji/win10/woman_genie.png differ
diff --git a/public/images/emoji/win10/woman_health_worker.png b/public/images/emoji/win10/woman_health_worker.png
index 01b54dbed46..4ac68a892ee 100644
Binary files a/public/images/emoji/win10/woman_health_worker.png and b/public/images/emoji/win10/woman_health_worker.png differ
diff --git a/public/images/emoji/win10/woman_in_lotus_position.png b/public/images/emoji/win10/woman_in_lotus_position.png
new file mode 100644
index 00000000000..34536d3d8ad
Binary files /dev/null and b/public/images/emoji/win10/woman_in_lotus_position.png differ
diff --git a/public/images/emoji/win10/woman_in_lotus_position/2.png b/public/images/emoji/win10/woman_in_lotus_position/2.png
new file mode 100644
index 00000000000..f5998abf743
Binary files /dev/null and b/public/images/emoji/win10/woman_in_lotus_position/2.png differ
diff --git a/public/images/emoji/win10/woman_in_lotus_position/3.png b/public/images/emoji/win10/woman_in_lotus_position/3.png
new file mode 100644
index 00000000000..6c1894a45d7
Binary files /dev/null and b/public/images/emoji/win10/woman_in_lotus_position/3.png differ
diff --git a/public/images/emoji/win10/woman_in_lotus_position/4.png b/public/images/emoji/win10/woman_in_lotus_position/4.png
new file mode 100644
index 00000000000..f6b1875c755
Binary files /dev/null and b/public/images/emoji/win10/woman_in_lotus_position/4.png differ
diff --git a/public/images/emoji/win10/woman_in_lotus_position/5.png b/public/images/emoji/win10/woman_in_lotus_position/5.png
new file mode 100644
index 00000000000..80bd1b4f222
Binary files /dev/null and b/public/images/emoji/win10/woman_in_lotus_position/5.png differ
diff --git a/public/images/emoji/win10/woman_in_lotus_position/6.png b/public/images/emoji/win10/woman_in_lotus_position/6.png
new file mode 100644
index 00000000000..34ccf247a4f
Binary files /dev/null and b/public/images/emoji/win10/woman_in_lotus_position/6.png differ
diff --git a/public/images/emoji/win10/woman_in_steamy_room.png b/public/images/emoji/win10/woman_in_steamy_room.png
new file mode 100644
index 00000000000..74a1bc84631
Binary files /dev/null and b/public/images/emoji/win10/woman_in_steamy_room.png differ
diff --git a/public/images/emoji/win10/woman_in_steamy_room/2.png b/public/images/emoji/win10/woman_in_steamy_room/2.png
new file mode 100644
index 00000000000..bbadc1e7cbe
Binary files /dev/null and b/public/images/emoji/win10/woman_in_steamy_room/2.png differ
diff --git a/public/images/emoji/win10/woman_in_steamy_room/3.png b/public/images/emoji/win10/woman_in_steamy_room/3.png
new file mode 100644
index 00000000000..a40bf87b1e3
Binary files /dev/null and b/public/images/emoji/win10/woman_in_steamy_room/3.png differ
diff --git a/public/images/emoji/win10/woman_in_steamy_room/4.png b/public/images/emoji/win10/woman_in_steamy_room/4.png
new file mode 100644
index 00000000000..933f13b97d4
Binary files /dev/null and b/public/images/emoji/win10/woman_in_steamy_room/4.png differ
diff --git a/public/images/emoji/win10/woman_in_steamy_room/5.png b/public/images/emoji/win10/woman_in_steamy_room/5.png
new file mode 100644
index 00000000000..4cddc2fbf97
Binary files /dev/null and b/public/images/emoji/win10/woman_in_steamy_room/5.png differ
diff --git a/public/images/emoji/win10/woman_in_steamy_room/6.png b/public/images/emoji/win10/woman_in_steamy_room/6.png
new file mode 100644
index 00000000000..8fb3a4c62b5
Binary files /dev/null and b/public/images/emoji/win10/woman_in_steamy_room/6.png differ
diff --git a/public/images/emoji/win10/woman_mage.png b/public/images/emoji/win10/woman_mage.png
new file mode 100644
index 00000000000..50ec9d47e4f
Binary files /dev/null and b/public/images/emoji/win10/woman_mage.png differ
diff --git a/public/images/emoji/win10/woman_mage/2.png b/public/images/emoji/win10/woman_mage/2.png
new file mode 100644
index 00000000000..1469b4c1582
Binary files /dev/null and b/public/images/emoji/win10/woman_mage/2.png differ
diff --git a/public/images/emoji/win10/woman_mage/3.png b/public/images/emoji/win10/woman_mage/3.png
new file mode 100644
index 00000000000..82040ce506c
Binary files /dev/null and b/public/images/emoji/win10/woman_mage/3.png differ
diff --git a/public/images/emoji/win10/woman_mage/4.png b/public/images/emoji/win10/woman_mage/4.png
new file mode 100644
index 00000000000..8bb877974b4
Binary files /dev/null and b/public/images/emoji/win10/woman_mage/4.png differ
diff --git a/public/images/emoji/win10/woman_mage/5.png b/public/images/emoji/win10/woman_mage/5.png
new file mode 100644
index 00000000000..2a0d8b6f98c
Binary files /dev/null and b/public/images/emoji/win10/woman_mage/5.png differ
diff --git a/public/images/emoji/win10/woman_mage/6.png b/public/images/emoji/win10/woman_mage/6.png
new file mode 100644
index 00000000000..a394c4a96fe
Binary files /dev/null and b/public/images/emoji/win10/woman_mage/6.png differ
diff --git a/public/images/emoji/win10/woman_mechanic/3.png b/public/images/emoji/win10/woman_mechanic/3.png
index be260498e6f..fc86f68f599 100644
Binary files a/public/images/emoji/win10/woman_mechanic/3.png and b/public/images/emoji/win10/woman_mechanic/3.png differ
diff --git a/public/images/emoji/win10/woman_mechanic/6.png b/public/images/emoji/win10/woman_mechanic/6.png
index cc5fac7aa4f..e58aa22f27c 100644
Binary files a/public/images/emoji/win10/woman_mechanic/6.png and b/public/images/emoji/win10/woman_mechanic/6.png differ
diff --git a/public/images/emoji/win10/woman_with_headscarf.png b/public/images/emoji/win10/woman_with_headscarf.png
index 6b3731cac84..4c30bb9305a 100644
Binary files a/public/images/emoji/win10/woman_with_headscarf.png and b/public/images/emoji/win10/woman_with_headscarf.png differ
diff --git a/public/images/emoji/win10/woman_with_headscarf/2.png b/public/images/emoji/win10/woman_with_headscarf/2.png
index 511414ad6c6..1fcb32c3a2d 100644
Binary files a/public/images/emoji/win10/woman_with_headscarf/2.png and b/public/images/emoji/win10/woman_with_headscarf/2.png differ
diff --git a/public/images/emoji/win10/woman_with_headscarf/3.png b/public/images/emoji/win10/woman_with_headscarf/3.png
index af954353790..fad924d8b4f 100644
Binary files a/public/images/emoji/win10/woman_with_headscarf/3.png and b/public/images/emoji/win10/woman_with_headscarf/3.png differ
diff --git a/public/images/emoji/win10/woman_with_headscarf/4.png b/public/images/emoji/win10/woman_with_headscarf/4.png
index 355bdeb6361..c1f5345f546 100644
Binary files a/public/images/emoji/win10/woman_with_headscarf/4.png and b/public/images/emoji/win10/woman_with_headscarf/4.png differ
diff --git a/public/images/emoji/win10/woman_with_headscarf/5.png b/public/images/emoji/win10/woman_with_headscarf/5.png
index 8d0ad7202e3..078e3c0b108 100644
Binary files a/public/images/emoji/win10/woman_with_headscarf/5.png and b/public/images/emoji/win10/woman_with_headscarf/5.png differ
diff --git a/public/images/emoji/win10/woman_with_headscarf/6.png b/public/images/emoji/win10/woman_with_headscarf/6.png
index 3c49195f876..a6291044556 100644
Binary files a/public/images/emoji/win10/woman_with_headscarf/6.png and b/public/images/emoji/win10/woman_with_headscarf/6.png differ
diff --git a/public/images/emoji/win10/woman_zombie.png b/public/images/emoji/win10/woman_zombie.png
new file mode 100644
index 00000000000..76ea3f5cb91
Binary files /dev/null and b/public/images/emoji/win10/woman_zombie.png differ
diff --git a/public/images/emoji/win10/x.png b/public/images/emoji/win10/x.png
index dc04f3d0085..ea0ff9ba473 100644
Binary files a/public/images/emoji/win10/x.png and b/public/images/emoji/win10/x.png differ
diff --git a/public/images/emoji/win10/zebra.png b/public/images/emoji/win10/zebra.png
index 6faa14f55dc..2ec32233392 100644
Binary files a/public/images/emoji/win10/zebra.png and b/public/images/emoji/win10/zebra.png differ
diff --git a/public/images/emoji/win10/zero.png b/public/images/emoji/win10/zero.png
index 4b2b38dce0a..c95d92d98d7 100644
Binary files a/public/images/emoji/win10/zero.png and b/public/images/emoji/win10/zero.png differ
diff --git a/public/images/emoji/win10/zombie.png b/public/images/emoji/win10/zombie.png
index 1bf288fcd4c..722514c5a18 100644
Binary files a/public/images/emoji/win10/zombie.png and b/public/images/emoji/win10/zombie.png differ
diff --git a/public/javascripts/Chart.min.js b/public/javascripts/Chart.min.js
index 76eafe6ea1f..dbf22c4f84e 100644
--- a/public/javascripts/Chart.min.js
+++ b/public/javascripts/Chart.min.js
@@ -1,14 +1,10 @@
-!function t(e,i,a){function s(n,r){if(!i[n]){if(!e[n]){var l="function"==typeof require&&require;if(!r&&l)return l(n,!0);if(o)return o(n,!0);var h=new Error("Cannot find module '"+n+"'");throw h.code="MODULE_NOT_FOUND",h}var c=i[n]={exports:{}};e[n][0].call(c.exports,function(t){var i=e[n][1][t];return s(i?i:t)},c,c.exports,t,e,i,a)}return i[n].exports}for(var o="function"==typeof require&&require,n=0;n<a.length;n++)s(a[n]);return s}({1:[function(t,e,i){},{}],2:[function(t,e,i){var a=t("color-convert"),s=t("color-string"),o=function(t){if(t instanceof o)return t;if(!(this instanceof o))return new o(t);if(this.values={rgb:[0,0,0],hsl:[0,0,0],hsv:[0,0,0],hwb:[0,0,0],cmyk:[0,0,0,0],alpha:1},"string"==typeof t){var e=s.getRgba(t);if(e)this.setValues("rgb",e);else if(e=s.getHsla(t))this.setValues("hsl",e);else{if(!(e=s.getHwb(t)))throw new Error('Unable to parse color from string "'+t+'"');this.setValues("hwb",e)}}else if("object"==typeof t){var e=t;if(void 0!==e.r||void 0!==e.red)this.setValues("rgb",e);else if(void 0!==e.l||void 0!==e.lightness)this.setValues("hsl",e);else if(void 0!==e.v||void 0!==e.value)this.setValues("hsv",e);else if(void 0!==e.w||void 0!==e.whiteness)this.setValues("hwb",e);else{if(void 0===e.c&&void 0===e.cyan)throw new Error("Unable to parse color from object "+JSON.stringify(t));this.setValues("cmyk",e)}}};o.prototype={rgb:function(t){return this.setSpace("rgb",arguments)},hsl:function(t){return this.setSpace("hsl",arguments)},hsv:function(t){return this.setSpace("hsv",arguments)},hwb:function(t){return this.setSpace("hwb",arguments)},cmyk:function(t){return this.setSpace("cmyk",arguments)},rgbArray:function(){return this.values.rgb},hslArray:function(){return this.values.hsl},hsvArray:function(){return this.values.hsv},hwbArray:function(){return 1!==this.values.alpha?this.values.hwb.concat([this.values.alpha]):this.values.hwb},cmykArray:function(){return this.values.cmyk},rgbaArray:function(){var t=this.values.rgb;return t.concat([this.values.alpha])},hslaArray:function(){var t=this.values.hsl;return t.concat([this.values.alpha])},alpha:function(t){return void 0===t?this.values.alpha:(this.setValues("alpha",t),this)},red:function(t){return this.setChannel("rgb",0,t)},green:function(t){return this.setChannel("rgb",1,t)},blue:function(t){return this.setChannel("rgb",2,t)},hue:function(t){return this.setChannel("hsl",0,t)},saturation:function(t){return this.setChannel("hsl",1,t)},lightness:function(t){return this.setChannel("hsl",2,t)},saturationv:function(t){return this.setChannel("hsv",1,t)},whiteness:function(t){return this.setChannel("hwb",1,t)},blackness:function(t){return this.setChannel("hwb",2,t)},value:function(t){return this.setChannel("hsv",2,t)},cyan:function(t){return this.setChannel("cmyk",0,t)},magenta:function(t){return this.setChannel("cmyk",1,t)},yellow:function(t){return this.setChannel("cmyk",2,t)},black:function(t){return this.setChannel("cmyk",3,t)},hexString:function(){return s.hexString(this.values.rgb)},rgbString:function(){return s.rgbString(this.values.rgb,this.values.alpha)},rgbaString:function(){return s.rgbaString(this.values.rgb,this.values.alpha)},percentString:function(){return s.percentString(this.values.rgb,this.values.alpha)},hslString:function(){return s.hslString(this.values.hsl,this.values.alpha)},hslaString:function(){return s.hslaString(this.values.hsl,this.values.alpha)},hwbString:function(){return s.hwbString(this.values.hwb,this.values.alpha)},keyword:function(){return s.keyword(this.values.rgb,this.values.alpha)},rgbNumber:function(){return this.values.rgb[0]<<16|this.values.rgb[1]<<8|this.values.rgb[2]},luminosity:function(){for(var t=this.values.rgb,e=[],i=0;i<t.length;i++){var a=t[i]/255;e[i]=.03928>=a?a/12.92:Math.pow((a+.055)/1.055,2.4)}return.2126*e[0]+.7152*e[1]+.0722*e[2]},contrast:function(t){var e=this.luminosity(),i=t.luminosity();return e>i?(e+.05)/(i+.05):(i+.05)/(e+.05)},level:function(t){var e=this.contrast(t);return e>=7.1?"AAA":e>=4.5?"AA":""},dark:function(){var t=this.values.rgb,e=(299*t[0]+587*t[1]+114*t[2])/1e3;return 128>e},light:function(){return!this.dark()},negate:function(){for(var t=[],e=0;3>e;e++)t[e]=255-this.values.rgb[e];return this.setValues("rgb",t),this},lighten:function(t){return this.values.hsl[2]+=this.values.hsl[2]*t,this.setValues("hsl",this.values.hsl),this},darken:function(t){return this.values.hsl[2]-=this.values.hsl[2]*t,this.setValues("hsl",this.values.hsl),this},saturate:function(t){return this.values.hsl[1]+=this.values.hsl[1]*t,this.setValues("hsl",this.values.hsl),this},desaturate:function(t){return this.values.hsl[1]-=this.values.hsl[1]*t,this.setValues("hsl",this.values.hsl),this},whiten:function(t){return this.values.hwb[1]+=this.values.hwb[1]*t,this.setValues("hwb",this.values.hwb),this},blacken:function(t){return this.values.hwb[2]+=this.values.hwb[2]*t,this.setValues("hwb",this.values.hwb),this},greyscale:function(){var t=this.values.rgb,e=.3*t[0]+.59*t[1]+.11*t[2];return this.setValues("rgb",[e,e,e]),this},clearer:function(t){return this.setValues("alpha",this.values.alpha-this.values.alpha*t),this},opaquer:function(t){return this.setValues("alpha",this.values.alpha+this.values.alpha*t),this},rotate:function(t){var e=this.values.hsl[0];return e=(e+t)%360,e=0>e?360+e:e,this.values.hsl[0]=e,this.setValues("hsl",this.values.hsl),this},mix:function(t,e){e=1-(null==e?.5:e);for(var i=2*e-1,a=this.alpha()-t.alpha(),s=((i*a==-1?i:(i+a)/(1+i*a))+1)/2,o=1-s,n=this.rgbArray(),r=t.rgbArray(),l=0;l<n.length;l++)n[l]=n[l]*s+r[l]*o;this.setValues("rgb",n);var h=this.alpha()*e+t.alpha()*(1-e);return this.setValues("alpha",h),this},toJSON:function(){return this.rgb()},clone:function(){return new o(this.rgb())}},o.prototype.getValues=function(t){for(var e={},i=0;i<t.length;i++)e[t.charAt(i)]=this.values[t][i];return 1!=this.values.alpha&&(e.a=this.values.alpha),e},o.prototype.setValues=function(t,e){var i={rgb:["red","green","blue"],hsl:["hue","saturation","lightness"],hsv:["hue","saturation","value"],hwb:["hue","whiteness","blackness"],cmyk:["cyan","magenta","yellow","black"]},s={rgb:[255,255,255],hsl:[360,100,100],hsv:[360,100,100],hwb:[360,100,100],cmyk:[100,100,100,100]},o=1;if("alpha"==t)o=e;else if(e.length)this.values[t]=e.slice(0,t.length),o=e[t.length];else if(void 0!==e[t.charAt(0)]){for(var n=0;n<t.length;n++)this.values[t][n]=e[t.charAt(n)];o=e.a}else if(void 0!==e[i[t][0]]){for(var r=i[t],n=0;n<t.length;n++)this.values[t][n]=e[r[n]];o=e.alpha}if(this.values.alpha=Math.max(0,Math.min(1,void 0!==o?o:this.values.alpha)),"alpha"!=t){for(var n=0;n<t.length;n++){var l=Math.max(0,Math.min(s[t][n],this.values[t][n]));this.values[t][n]=Math.round(l)}for(var h in i){h!=t&&(this.values[h]=a[t][h](this.values[t]));for(var n=0;n<h.length;n++){var l=Math.max(0,Math.min(s[h][n],this.values[h][n]));this.values[h][n]=Math.round(l)}}return!0}},o.prototype.setSpace=function(t,e){var i=e[0];return void 0===i?this.getValues(t):("number"==typeof i&&(i=Array.prototype.slice.call(e)),this.setValues(t,i),this)},o.prototype.setChannel=function(t,e,i){return void 0===i?this.values[t][e]:(this.values[t][e]=i,this.setValues(t,this.values[t]),this)},window.Color=e.exports=o},{"color-convert":4,"color-string":6}],3:[function(t,e,i){function a(t){var e,i,a,s=t[0]/255,o=t[1]/255,n=t[2]/255,r=Math.min(s,o,n),l=Math.max(s,o,n),h=l-r;return l==r?e=0:s==l?e=(o-n)/h:o==l?e=2+(n-s)/h:n==l&&(e=4+(s-o)/h),e=Math.min(60*e,360),0>e&&(e+=360),a=(r+l)/2,i=l==r?0:.5>=a?h/(l+r):h/(2-l-r),[e,100*i,100*a]}function s(t){var e,i,a,s=t[0],o=t[1],n=t[2],r=Math.min(s,o,n),l=Math.max(s,o,n),h=l-r;return i=0==l?0:h/l*1e3/10,l==r?e=0:s==l?e=(o-n)/h:o==l?e=2+(n-s)/h:n==l&&(e=4+(s-o)/h),e=Math.min(60*e,360),0>e&&(e+=360),a=l/255*1e3/10,[e,i,a]}function o(t){var e=t[0],i=t[1],s=t[2],o=a(t)[0],n=1/255*Math.min(e,Math.min(i,s)),s=1-1/255*Math.max(e,Math.max(i,s));return[o,100*n,100*s]}function n(t){var e,i,a,s,o=t[0]/255,n=t[1]/255,r=t[2]/255;return s=Math.min(1-o,1-n,1-r),e=(1-o-s)/(1-s)||0,i=(1-n-s)/(1-s)||0,a=(1-r-s)/(1-s)||0,[100*e,100*i,100*a,100*s]}function l(t){return G[JSON.stringify(t)]}function h(t){var e=t[0]/255,i=t[1]/255,a=t[2]/255;e=e>.04045?Math.pow((e+.055)/1.055,2.4):e/12.92,i=i>.04045?Math.pow((i+.055)/1.055,2.4):i/12.92,a=a>.04045?Math.pow((a+.055)/1.055,2.4):a/12.92;var s=.4124*e+.3576*i+.1805*a,o=.2126*e+.7152*i+.0722*a,n=.0193*e+.1192*i+.9505*a;return[100*s,100*o,100*n]}function c(t){var e,i,a,s=h(t),o=s[0],n=s[1],r=s[2];return o/=95.047,n/=100,r/=108.883,o=o>.008856?Math.pow(o,1/3):7.787*o+16/116,n=n>.008856?Math.pow(n,1/3):7.787*n+16/116,r=r>.008856?Math.pow(r,1/3):7.787*r+16/116,e=116*n-16,i=500*(o-n),a=200*(n-r),[e,i,a]}function d(t){return W(c(t))}function u(t){var e,i,a,s,o,n=t[0]/360,r=t[1]/100,l=t[2]/100;if(0==r)return o=255*l,[o,o,o];i=.5>l?l*(1+r):l+r-l*r,e=2*l-i,s=[0,0,0];for(var h=0;3>h;h++)a=n+1/3*-(h-1),0>a&&a++,a>1&&a--,o=1>6*a?e+6*(i-e)*a:1>2*a?i:2>3*a?e+(i-e)*(2/3-a)*6:e,s[h]=255*o;return s}function f(t){var e,i,a=t[0],s=t[1]/100,o=t[2]/100;return 0===o?[0,0,0]:(o*=2,s*=1>=o?o:2-o,i=(o+s)/2,e=2*s/(o+s),[a,100*e,100*i])}function m(t){return o(u(t))}function p(t){return n(u(t))}function x(t){return l(u(t))}function v(t){var e=t[0]/60,i=t[1]/100,a=t[2]/100,s=Math.floor(e)%6,o=e-Math.floor(e),n=255*a*(1-i),r=255*a*(1-i*o),l=255*a*(1-i*(1-o)),a=255*a;switch(s){case 0:return[a,l,n];case 1:return[r,a,n];case 2:return[n,a,l];case 3:return[n,r,a];case 4:return[l,n,a];case 5:return[a,n,r]}}function y(t){var e,i,a=t[0],s=t[1]/100,o=t[2]/100;return i=(2-s)*o,e=s*o,e/=1>=i?i:2-i,e=e||0,i/=2,[a,100*e,100*i]}function k(t){return o(v(t))}function D(t){return n(v(t))}function S(t){return l(v(t))}function C(t){var e,i,a,s,o=t[0]/360,n=t[1]/100,l=t[2]/100,h=n+l;switch(h>1&&(n/=h,l/=h),e=Math.floor(6*o),i=1-l,a=6*o-e,0!=(1&e)&&(a=1-a),s=n+a*(i-n),e){default:case 6:case 0:r=i,g=s,b=n;break;case 1:r=s,g=i,b=n;break;case 2:r=n,g=i,b=s;break;case 3:r=n,g=s,b=i;break;case 4:r=s,g=n,b=i;break;case 5:r=i,g=n,b=s}return[255*r,255*g,255*b]}function w(t){return a(C(t))}function _(t){return s(C(t))}function A(t){return n(C(t))}function I(t){return l(C(t))}function M(t){var e,i,a,s=t[0]/100,o=t[1]/100,n=t[2]/100,r=t[3]/100;return e=1-Math.min(1,s*(1-r)+r),i=1-Math.min(1,o*(1-r)+r),a=1-Math.min(1,n*(1-r)+r),[255*e,255*i,255*a]}function F(t){return a(M(t))}function P(t){return s(M(t))}function T(t){return o(M(t))}function V(t){return l(M(t))}function R(t){var e,i,a,s=t[0]/100,o=t[1]/100,n=t[2]/100;return e=3.2406*s+-1.5372*o+n*-.4986,i=s*-.9689+1.8758*o+.0415*n,a=.0557*s+o*-.204+1.057*n,e=e>.0031308?1.055*Math.pow(e,1/2.4)-.055:e=12.92*e,i=i>.0031308?1.055*Math.pow(i,1/2.4)-.055:i=12.92*i,a=a>.0031308?1.055*Math.pow(a,1/2.4)-.055:a=12.92*a,e=Math.min(Math.max(0,e),1),i=Math.min(Math.max(0,i),1),a=Math.min(Math.max(0,a),1),[255*e,255*i,255*a]}function O(t){var e,i,a,s=t[0],o=t[1],n=t[2];return s/=95.047,o/=100,n/=108.883,s=s>.008856?Math.pow(s,1/3):7.787*s+16/116,o=o>.008856?Math.pow(o,1/3):7.787*o+16/116,n=n>.008856?Math.pow(n,1/3):7.787*n+16/116,e=116*o-16,i=500*(s-o),a=200*(o-n),[e,i,a]}function L(t){return W(O(t))}function z(t){var e,i,a,s,o=t[0],n=t[1],r=t[2];return 8>=o?(i=100*o/903.3,s=7.787*(i/100)+16/116):(i=100*Math.pow((o+16)/116,3),s=Math.pow(i/100,1/3)),e=.008856>=e/95.047?e=95.047*(n/500+s-16/116)/7.787:95.047*Math.pow(n/500+s,3),a=.008859>=a/108.883?a=108.883*(s-r/200-16/116)/7.787:108.883*Math.pow(s-r/200,3),[e,i,a]}function W(t){var e,i,a,s=t[0],o=t[1],n=t[2];return e=Math.atan2(n,o),i=360*e/2/Math.PI,0>i&&(i+=360),a=Math.sqrt(o*o+n*n),[s,a,i]}function B(t){return R(z(t))}function N(t){var e,i,a,s=t[0],o=t[1],n=t[2];return a=n/360*2*Math.PI,e=o*Math.cos(a),i=o*Math.sin(a),[s,e,i]}function H(t){return z(N(t))}function E(t){return B(N(t))}function U(t){return X[t]}function j(t){return a(U(t))}function q(t){return s(U(t))}function Y(t){return o(U(t))}function Q(t){return n(U(t))}function J(t){return c(U(t))}function Z(t){return h(U(t))}e.exports={rgb2hsl:a,rgb2hsv:s,rgb2hwb:o,rgb2cmyk:n,rgb2keyword:l,rgb2xyz:h,rgb2lab:c,rgb2lch:d,hsl2rgb:u,hsl2hsv:f,hsl2hwb:m,hsl2cmyk:p,hsl2keyword:x,hsv2rgb:v,hsv2hsl:y,hsv2hwb:k,hsv2cmyk:D,hsv2keyword:S,hwb2rgb:C,hwb2hsl:w,hwb2hsv:_,hwb2cmyk:A,hwb2keyword:I,cmyk2rgb:M,cmyk2hsl:F,cmyk2hsv:P,cmyk2hwb:T,cmyk2keyword:V,keyword2rgb:U,keyword2hsl:j,keyword2hsv:q,keyword2hwb:Y,keyword2cmyk:Q,keyword2lab:J,keyword2xyz:Z,xyz2rgb:R,xyz2lab:O,xyz2lch:L,lab2xyz:z,lab2rgb:B,lab2lch:W,lch2lab:N,lch2xyz:H,lch2rgb:E};var X={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},G={};for(var $ in X)G[JSON.stringify(X[$])]=$},{}],4:[function(t,e,i){var a=t("./conversions"),s=function(){return new h};for(var o in a){s[o+"Raw"]=function(t){return function(e){return"number"==typeof e&&(e=Array.prototype.slice.call(arguments)),a[t](e)}}(o);var n=/(\w+)2(\w+)/.exec(o),r=n[1],l=n[2];s[r]=s[r]||{},s[r][l]=s[o]=function(t){return function(e){"number"==typeof e&&(e=Array.prototype.slice.call(arguments));var i=a[t](e);if("string"==typeof i||void 0===i)return i;for(var s=0;s<i.length;s++)i[s]=Math.round(i[s]);return i}}(o)}var h=function(){this.convs={}};h.prototype.routeSpace=function(t,e){var i=e[0];return void 0===i?this.getValues(t):("number"==typeof i&&(i=Array.prototype.slice.call(e)),this.setValues(t,i))},h.prototype.setValues=function(t,e){return this.space=t,this.convs={},this.convs[t]=e,this},h.prototype.getValues=function(t){var e=this.convs[t];if(!e){var i=this.space,a=this.convs[i];e=s[i][t](a),this.convs[t]=e}return e},["rgb","hsl","hsv","cmyk","keyword"].forEach(function(t){h.prototype[t]=function(e){return this.routeSpace(t,arguments)}}),e.exports=s},{"./conversions":3}],5:[function(t,e,i){e.exports={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]}},{}],6:[function(t,e,i){function a(t){if(t){var e=/^#([a-fA-F0-9]{3})$/,i=/^#([a-fA-F0-9]{6})$/,a=/^rgba?\(\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/,s=/^rgba?\(\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/,o=/(\w+)/,n=[0,0,0],r=1,l=t.match(e);if(l){l=l[1];for(var h=0;h<n.length;h++)n[h]=parseInt(l[h]+l[h],16)}else if(l=t.match(i)){l=l[1];for(var h=0;h<n.length;h++)n[h]=parseInt(l.slice(2*h,2*h+2),16)}else if(l=t.match(a)){for(var h=0;h<n.length;h++)n[h]=parseInt(l[h+1]);r=parseFloat(l[4])}else if(l=t.match(s)){for(var h=0;h<n.length;h++)n[h]=Math.round(2.55*parseFloat(l[h+1]));r=parseFloat(l[4])}else if(l=t.match(o)){if("transparent"==l[1])return[0,0,0,0];if(n=y[l[1]],!n)return}for(var h=0;h<n.length;h++)n[h]=x(n[h],0,255);return r=r||0==r?x(r,0,1):1,n[3]=r,n}}function s(t){if(t){var e=/^hsla?\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/,i=t.match(e);if(i){var a=parseFloat(i[4]),s=x(parseInt(i[1]),0,360),o=x(parseFloat(i[2]),0,100),n=x(parseFloat(i[3]),0,100),r=x(isNaN(a)?1:a,0,1);return[s,o,n,r]}}}function o(t){if(t){var e=/^hwb\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/,i=t.match(e);if(i){var a=parseFloat(i[4]),s=x(parseInt(i[1]),0,360),o=x(parseFloat(i[2]),0,100),n=x(parseFloat(i[3]),0,100),r=x(isNaN(a)?1:a,0,1);return[s,o,n,r]}}}function n(t){var e=a(t);return e&&e.slice(0,3)}function r(t){var e=s(t);return e&&e.slice(0,3)}function l(t){var e=a(t);return e?e[3]:(e=s(t))?e[3]:(e=o(t))?e[3]:void 0}function h(t){return"#"+v(t[0])+v(t[1])+v(t[2])}function c(t,e){return 1>e||t[3]&&t[3]<1?d(t,e):"rgb("+t[0]+", "+t[1]+", "+t[2]+")"}function d(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"rgba("+t[0]+", "+t[1]+", "+t[2]+", "+e+")"}function u(t,e){if(1>e||t[3]&&t[3]<1)return g(t,e);var i=Math.round(t[0]/255*100),a=Math.round(t[1]/255*100),s=Math.round(t[2]/255*100);return"rgb("+i+"%, "+a+"%, "+s+"%)"}function g(t,e){var i=Math.round(t[0]/255*100),a=Math.round(t[1]/255*100),s=Math.round(t[2]/255*100);return"rgba("+i+"%, "+a+"%, "+s+"%, "+(e||t[3]||1)+")"}function f(t,e){return 1>e||t[3]&&t[3]<1?m(t,e):"hsl("+t[0]+", "+t[1]+"%, "+t[2]+"%)"}function m(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"hsla("+t[0]+", "+t[1]+"%, "+t[2]+"%, "+e+")"}function p(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"hwb("+t[0]+", "+t[1]+"%, "+t[2]+"%"+(void 0!==e&&1!==e?", "+e:"")+")"}function b(t){return k[t.slice(0,3)]}function x(t,e,i){return Math.min(Math.max(e,t),i)}function v(t){var e=t.toString(16).toUpperCase();return e.length<2?"0"+e:e}var y=t("color-name");e.exports={getRgba:a,getHsla:s,getRgb:n,getHsl:r,getHwb:o,getAlpha:l,hexString:h,rgbString:c,rgbaString:d,percentString:u,percentaString:g,hslString:f,hslaString:m,hwbString:p,keyword:b};var k={};for(var D in y)k[y[D]]=D},{"color-name":5}],7:[function(t,e,i){/*!
+/*!
  * Chart.js
  * http://chartjs.org/
- * Version: 2.0.0
+ * Version: 2.7.2
  *
- * Copyright 2015 Nick Downie
+ * Copyright 2018 Chart.js Contributors
  * Released under the MIT license
- * https://github.com/nnnick/Chart.js/blob/master/LICENSE.md
+ * https://github.com/chartjs/Chart.js/blob/master/LICENSE.md
  */
-var a=t("./core/core.js")();t("./core/core.helpers")(a),t("./core/core.element")(a),t("./core/core.animation")(a),t("./core/core.controller")(a),t("./core/core.datasetController")(a),t("./core/core.layoutService")(a),t("./core/core.legend")(a),t("./core/core.scale")(a),t("./core/core.scaleService")(a),t("./core/core.title")(a),t("./core/core.tooltip")(a),t("./controllers/controller.bar")(a),t("./controllers/controller.bubble")(a),t("./controllers/controller.doughnut")(a),t("./controllers/controller.line")(a),t("./controllers/controller.polarArea")(a),t("./controllers/controller.radar")(a),t("./scales/scale.category")(a),t("./scales/scale.linear")(a),t("./scales/scale.logarithmic")(a),t("./scales/scale.radialLinear")(a),t("./scales/scale.time")(a),t("./elements/element.arc")(a),t("./elements/element.line")(a),t("./elements/element.point")(a),t("./elements/element.rectangle")(a),t("./charts/Chart.Bar")(a),t("./charts/Chart.Bubble")(a),t("./charts/Chart.Doughnut")(a),t("./charts/Chart.Line")(a),t("./charts/Chart.PolarArea")(a),t("./charts/Chart.Radar")(a),t("./charts/Chart.Scatter")(a),window.Chart=e.exports=a},{"./charts/Chart.Bar":8,"./charts/Chart.Bubble":9,"./charts/Chart.Doughnut":10,"./charts/Chart.Line":11,"./charts/Chart.PolarArea":12,"./charts/Chart.Radar":13,"./charts/Chart.Scatter":14,"./controllers/controller.bar":15,"./controllers/controller.bubble":16,"./controllers/controller.doughnut":17,"./controllers/controller.line":18,"./controllers/controller.polarArea":19,"./controllers/controller.radar":20,"./core/core.animation":21,"./core/core.controller":22,"./core/core.datasetController":23,"./core/core.element":24,"./core/core.helpers":25,"./core/core.js":26,"./core/core.layoutService":27,"./core/core.legend":28,"./core/core.scale":29,"./core/core.scaleService":30,"./core/core.title":31,"./core/core.tooltip":32,"./elements/element.arc":33,"./elements/element.line":34,"./elements/element.point":35,"./elements/element.rectangle":36,"./scales/scale.category":37,"./scales/scale.linear":38,"./scales/scale.logarithmic":39,"./scales/scale.radialLinear":40,"./scales/scale.time":41}],8:[function(t,e,i){"use strict";e.exports=function(t){t.Bar=function(e,i){return i.type="bar",new t(e,i)}}},{}],9:[function(t,e,i){"use strict";e.exports=function(t){t.Bubble=function(e,i){return i.type="bubble",new t(e,i)}}},{}],10:[function(t,e,i){"use strict";e.exports=function(t){t.Doughnut=function(e,i){return i.type="doughnut",new t(e,i)}}},{}],11:[function(t,e,i){"use strict";e.exports=function(t){t.Line=function(e,i){return i.type="line",new t(e,i)}}},{}],12:[function(t,e,i){"use strict";e.exports=function(t){t.PolarArea=function(e,i){return i.type="polarArea",new t(e,i)}}},{}],13:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers,i={aspectRatio:1};t.Radar=function(a,s){return s.options=e.configMerge(i,s.options),s.type="radar",new t(a,s)}}},{}],14:[function(t,e,i){"use strict";e.exports=function(t){var e={hover:{mode:"single"},scales:{xAxes:[{type:"linear",position:"bottom",id:"x-axis-1"}],yAxes:[{type:"linear",position:"left",id:"y-axis-1"}]},tooltips:{callbacks:{title:function(t,e){return""},label:function(t,e){return"("+t.xLabel+", "+t.yLabel+")"}}}};t.defaults.scatter=e,t.controllers.scatter=t.controllers.line,t.Scatter=function(e,i){return i.type="scatter",new t(e,i)}}},{}],15:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.defaults.bar={hover:{mode:"label"},scales:{xAxes:[{type:"category",categoryPercentage:.8,barPercentage:.9,gridLines:{offsetGridLines:!0}}],yAxes:[{type:"linear"}]}},t.controllers.bar=t.DatasetController.extend({initialize:function(e,i){t.DatasetController.prototype.initialize.call(this,e,i),this.getDataset().bar=!0},getBarCount:function(){var t=0;return e.each(this.chart.data.datasets,function(i){e.isDatasetVisible(i)&&i.bar&&++t}),t},addElements:function(){this.getDataset().metaData=this.getDataset().metaData||[],e.each(this.getDataset().data,function(e,i){this.getDataset().metaData[i]=this.getDataset().metaData[i]||new t.elements.Rectangle({_chart:this.chart.chart,_datasetIndex:this.index,_index:i})},this)},addElementAndReset:function(e){this.getDataset().metaData=this.getDataset().metaData||[];var i=new t.elements.Rectangle({_chart:this.chart.chart,_datasetIndex:this.index,_index:e}),a=this.getBarCount();this.updateElement(i,e,!0,a),this.getDataset().metaData.splice(e,0,i)},update:function(t){var i=this.getBarCount();e.each(this.getDataset().metaData,function(e,a){this.updateElement(e,a,t,i)},this)},updateElement:function(t,i,a,s){var o,n=this.getScaleForId(this.getDataset().xAxisID),r=this.getScaleForId(this.getDataset().yAxisID);o=r.min<0&&r.max<0?r.getPixelForValue(r.max):r.min>0&&r.max>0?r.getPixelForValue(r.min):r.getPixelForValue(0),e.extend(t,{_chart:this.chart.chart,_xScale:n,_yScale:r,_datasetIndex:this.index,_index:i,_model:{x:this.calculateBarX(i,this.index),y:a?o:this.calculateBarY(i,this.index),label:this.chart.data.labels[i],datasetLabel:this.getDataset().label,base:a?o:this.calculateBarBase(this.index,i),width:this.calculateBarWidth(s),backgroundColor:t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:e.getValueAtIndexOrDefault(this.getDataset().backgroundColor,i,this.chart.options.elements.rectangle.backgroundColor),borderSkipped:t.custom&&t.custom.borderSkipped?t.custom.borderSkipped:this.chart.options.elements.rectangle.borderSkipped,borderColor:t.custom&&t.custom.borderColor?t.custom.borderColor:e.getValueAtIndexOrDefault(this.getDataset().borderColor,i,this.chart.options.elements.rectangle.borderColor),borderWidth:t.custom&&t.custom.borderWidth?t.custom.borderWidth:e.getValueAtIndexOrDefault(this.getDataset().borderWidth,i,this.chart.options.elements.rectangle.borderWidth)}}),t.pivot()},calculateBarBase:function(t,i){var a=(this.getScaleForId(this.getDataset().xAxisID),this.getScaleForId(this.getDataset().yAxisID)),s=0;if(a.options.stacked){var o=this.chart.data.datasets[t].data[i];if(0>o)for(var n=0;t>n;n++){var r=this.chart.data.datasets[n];e.isDatasetVisible(r)&&r.yAxisID===a.id&&r.bar&&(s+=r.data[i]<0?r.data[i]:0)}else for(var l=0;t>l;l++){var h=this.chart.data.datasets[l];e.isDatasetVisible(h)&&h.yAxisID===a.id&&h.bar&&(s+=h.data[i]>0?h.data[i]:0)}return a.getPixelForValue(s)}return s=a.getPixelForValue(a.min),a.beginAtZero||a.min<=0&&a.max>=0||a.min>=0&&a.max<=0?s=a.getPixelForValue(0,0):a.min<0&&a.max<0&&(s=a.getPixelForValue(a.max)),s},getRuler:function(){var t=this.getScaleForId(this.getDataset().xAxisID),e=(this.getScaleForId(this.getDataset().yAxisID),this.getBarCount()),i=function(){for(var e=t.getPixelForTick(1)-t.getPixelForTick(0),i=2;i<this.getDataset().data.length;i++)e=Math.min(t.getPixelForTick(i)-t.getPixelForTick(i-1),e);return e}.call(this),a=i*t.options.categoryPercentage,s=(i-i*t.options.categoryPercentage)/2,o=a/e,n=o*t.options.barPercentage,r=o-o*t.options.barPercentage;return{datasetCount:e,tickWidth:i,categoryWidth:a,categorySpacing:s,fullBarWidth:o,barWidth:n,barSpacing:r}},calculateBarWidth:function(){var t=this.getScaleForId(this.getDataset().xAxisID),e=this.getRuler();return t.options.stacked?e.categoryWidth:e.barWidth},getBarIndex:function(t){for(var i=0,a=0;t>a;++a)e.isDatasetVisible(this.chart.data.datasets[a])&&this.chart.data.datasets[a].bar&&++i;return i},calculateBarX:function(t,e){var i=(this.getScaleForId(this.getDataset().yAxisID),this.getScaleForId(this.getDataset().xAxisID)),a=this.getBarIndex(e),s=this.getRuler(),o=i.getPixelForValue(null,t,e,this.chart.isCombo);return o-=this.chart.isCombo?s.tickWidth/2:0,i.options.stacked?o+s.categoryWidth/2+s.categorySpacing:o+s.barWidth/2+s.categorySpacing+s.barWidth*a+s.barSpacing/2+s.barSpacing*a},calculateBarY:function(t,i){var a=(this.getScaleForId(this.getDataset().xAxisID),this.getScaleForId(this.getDataset().yAxisID)),s=this.getDataset().data[t];if(a.options.stacked){for(var o=0,n=0,r=0;i>r;r++){var l=this.chart.data.datasets[r];e.isDatasetVisible(l)&&l.bar&&l.yAxisID===a.id&&(l.data[t]<0?n+=l.data[t]||0:o+=l.data[t]||0)}return 0>s?a.getPixelForValue(n+s):a.getPixelForValue(o+s)}return a.getPixelForValue(s)},draw:function(t){var i=t||1;e.each(this.getDataset().metaData,function(t,e){var a=this.getDataset().data[e];null===a||void 0===a||isNaN(a)||t.transition(i).draw()},this)},setHoverStyle:function(t){var i=this.chart.data.datasets[t._datasetIndex],a=t._index;t._model.backgroundColor=t.custom&&t.custom.hoverBackgroundColor?t.custom.hoverBackgroundColor:e.getValueAtIndexOrDefault(i.hoverBackgroundColor,a,e.color(t._model.backgroundColor).saturate(.5).darken(.1).rgbString()),t._model.borderColor=t.custom&&t.custom.hoverBorderColor?t.custom.hoverBorderColor:e.getValueAtIndexOrDefault(i.hoverBorderColor,a,e.color(t._model.borderColor).saturate(.5).darken(.1).rgbString()),t._model.borderWidth=t.custom&&t.custom.hoverBorderWidth?t.custom.hoverBorderWidth:e.getValueAtIndexOrDefault(i.hoverBorderWidth,a,t._model.borderWidth)},removeHoverStyle:function(t){var i=(this.chart.data.datasets[t._datasetIndex],t._index);t._model.backgroundColor=t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:e.getValueAtIndexOrDefault(this.getDataset().backgroundColor,i,this.chart.options.elements.rectangle.backgroundColor),t._model.borderColor=t.custom&&t.custom.borderColor?t.custom.borderColor:e.getValueAtIndexOrDefault(this.getDataset().borderColor,i,this.chart.options.elements.rectangle.borderColor),t._model.borderWidth=t.custom&&t.custom.borderWidth?t.custom.borderWidth:e.getValueAtIndexOrDefault(this.getDataset().borderWidth,i,this.chart.options.elements.rectangle.borderWidth)}})}},{}],16:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.defaults.bubble={hover:{mode:"single"},scales:{xAxes:[{type:"linear",position:"bottom",id:"x-axis-0"}],yAxes:[{type:"linear",position:"left",id:"y-axis-0"}]},tooltips:{callbacks:{title:function(t,e){return""},label:function(t,e){var i=e.datasets[t.datasetIndex].label||"",a=e.datasets[t.datasetIndex].data[t.index];return i+": ("+a.x+", "+a.y+", "+a.r+")"}}}},t.controllers.bubble=t.DatasetController.extend({addElements:function(){this.getDataset().metaData=this.getDataset().metaData||[],e.each(this.getDataset().data,function(e,i){this.getDataset().metaData[i]=this.getDataset().metaData[i]||new t.elements.Point({_chart:this.chart.chart,_datasetIndex:this.index,_index:i})},this)},addElementAndReset:function(e){this.getDataset().metaData=this.getDataset().metaData||[];var i=new t.elements.Point({_chart:this.chart.chart,_datasetIndex:this.index,_index:e});this.updateElement(i,e,!0),this.getDataset().metaData.splice(e,0,i)},update:function(t){var i,a=this.getDataset().metaData,s=this.getScaleForId(this.getDataset().yAxisID);this.getScaleForId(this.getDataset().xAxisID);i=s.min<0&&s.max<0?s.getPixelForValue(s.max):s.min>0&&s.max>0?s.getPixelForValue(s.min):s.getPixelForValue(0),e.each(a,function(e,i){this.updateElement(e,i,t)},this)},updateElement:function(t,i,a){var s,o=this.getScaleForId(this.getDataset().yAxisID),n=this.getScaleForId(this.getDataset().xAxisID);s=o.min<0&&o.max<0?o.getPixelForValue(o.max):o.min>0&&o.max>0?o.getPixelForValue(o.min):o.getPixelForValue(0),e.extend(t,{_chart:this.chart.chart,_xScale:n,_yScale:o,_datasetIndex:this.index,_index:i,_model:{x:a?n.getPixelForDecimal(.5):n.getPixelForValue(this.getDataset().data[i],i,this.index,this.chart.isCombo),y:a?s:o.getPixelForValue(this.getDataset().data[i],i,this.index),radius:a?0:t.custom&&t.custom.radius?t.custom.radius:this.getRadius(this.getDataset().data[i]),backgroundColor:t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:e.getValueAtIndexOrDefault(this.getDataset().backgroundColor,i,this.chart.options.elements.point.backgroundColor),borderColor:t.custom&&t.custom.borderColor?t.custom.borderColor:e.getValueAtIndexOrDefault(this.getDataset().borderColor,i,this.chart.options.elements.point.borderColor),borderWidth:t.custom&&t.custom.borderWidth?t.custom.borderWidth:e.getValueAtIndexOrDefault(this.getDataset().borderWidth,i,this.chart.options.elements.point.borderWidth),hitRadius:t.custom&&t.custom.hitRadius?t.custom.hitRadius:e.getValueAtIndexOrDefault(this.getDataset().hitRadius,i,this.chart.options.elements.point.hitRadius)}}),t._model.skip=t.custom&&t.custom.skip?t.custom.skip:isNaN(t._model.x)||isNaN(t._model.y),t.pivot()},getRadius:function(t){return t.r||this.chart.options.elements.point.radius},draw:function(t){var i=t||1;e.each(this.getDataset().metaData,function(t,e){t.transition(i),t.draw()})},setHoverStyle:function(t){var i=this.chart.data.datasets[t._datasetIndex],a=t._index;t._model.radius=t.custom&&t.custom.hoverRadius?t.custom.hoverRadius:e.getValueAtIndexOrDefault(i.hoverRadius,a,this.chart.options.elements.point.hoverRadius)+this.getRadius(this.getDataset().data[t._index]),t._model.backgroundColor=t.custom&&t.custom.hoverBackgroundColor?t.custom.hoverBackgroundColor:e.getValueAtIndexOrDefault(i.hoverBackgroundColor,a,e.color(t._model.backgroundColor).saturate(.5).darken(.1).rgbString()),t._model.borderColor=t.custom&&t.custom.hoverBorderColor?t.custom.hoverBorderColor:e.getValueAtIndexOrDefault(i.hoverBorderColor,a,e.color(t._model.borderColor).saturate(.5).darken(.1).rgbString()),t._model.borderWidth=t.custom&&t.custom.hoverBorderWidth?t.custom.hoverBorderWidth:e.getValueAtIndexOrDefault(i.hoverBorderWidth,a,t._model.borderWidth)},removeHoverStyle:function(t){var i=(this.chart.data.datasets[t._datasetIndex],t._index);t._model.radius=t.custom&&t.custom.radius?t.custom.radius:this.getRadius(this.getDataset().data[t._index]),t._model.backgroundColor=t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:e.getValueAtIndexOrDefault(this.getDataset().backgroundColor,i,this.chart.options.elements.point.backgroundColor),t._model.borderColor=t.custom&&t.custom.borderColor?t.custom.borderColor:e.getValueAtIndexOrDefault(this.getDataset().borderColor,i,this.chart.options.elements.point.borderColor),t._model.borderWidth=t.custom&&t.custom.borderWidth?t.custom.borderWidth:e.getValueAtIndexOrDefault(this.getDataset().borderWidth,i,this.chart.options.elements.point.borderWidth)}})}},{}],17:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.defaults.doughnut={animation:{animateRotate:!0,animateScale:!1},aspectRatio:1,hover:{mode:"single"},legendCallback:function(t){var e=[];if(e.push('<ul class="'+t.id+'-legend">'),t.data.datasets.length)for(var i=0;i<t.data.datasets[0].data.length;++i)e.push('<li><span style="background-color:'+t.data.datasets[0].backgroundColor[i]+'">'),t.data.labels[i]&&e.push(t.data.labels[i]),e.push("</span></li>");return e.push("</ul>"),e.join("")},legend:{labels:{generateLabels:function(t){return t.labels.length&&t.datasets.length?t.labels.map(function(e,i){return{text:e,fillStyle:t.datasets[0].backgroundColor[i],hidden:isNaN(t.datasets[0].data[i]),index:i}}):[]}},onClick:function(t,i){e.each(this.chart.data.datasets,function(t){t.metaHiddenData=t.metaHiddenData||[];var e=i.index;isNaN(t.data[e])?isNaN(t.metaHiddenData[e])||(t.data[e]=t.metaHiddenData[e]):(t.metaHiddenData[e]=t.data[e],t.data[e]=NaN)}),this.chart.update()}},cutoutPercentage:50,tooltips:{callbacks:{title:function(){return""},label:function(t,e){return e.labels[t.index]+": "+e.datasets[t.datasetIndex].data[t.index]}}}},t.defaults.pie=e.clone(t.defaults.doughnut),e.extend(t.defaults.pie,{cutoutPercentage:0}),t.controllers.doughnut=t.controllers.pie=t.DatasetController.extend({linkScales:function(){},addElements:function(){this.getDataset().metaData=this.getDataset().metaData||[],e.each(this.getDataset().data,function(e,i){this.getDataset().metaData[i]=this.getDataset().metaData[i]||new t.elements.Arc({_chart:this.chart.chart,_datasetIndex:this.index,_index:i})},this)},addElementAndReset:function(i,a){this.getDataset().metaData=this.getDataset().metaData||[];var s=new t.elements.Arc({_chart:this.chart.chart,_datasetIndex:this.index,_index:i});a&&e.isArray(this.getDataset().backgroundColor)&&this.getDataset().backgroundColor.splice(i,0,a),this.updateElement(s,i,!0),this.getDataset().metaData.splice(i,0,s)},getVisibleDatasetCount:function(){return e.where(this.chart.data.datasets,function(t){return e.isDatasetVisible(t)}).length},getRingIndex:function(t){for(var i=0,a=0;t>a;++a)e.isDatasetVisible(this.chart.data.datasets[a])&&++i;return i},update:function(t){var i=Math.min(this.chart.chartArea.right-this.chart.chartArea.left,this.chart.chartArea.bottom-this.chart.chartArea.top);this.chart.outerRadius=Math.max(i/2-this.chart.options.elements.arc.borderWidth/2,0),this.chart.innerRadius=Math.max(this.chart.options.cutoutPercentage?this.chart.outerRadius/100*this.chart.options.cutoutPercentage:1,0),this.chart.radiusLength=(this.chart.outerRadius-this.chart.innerRadius)/this.getVisibleDatasetCount(),this.getDataset().total=0,e.each(this.getDataset().data,function(t){isNaN(t)||(this.getDataset().total+=Math.abs(t))},this),this.outerRadius=this.chart.outerRadius-this.chart.radiusLength*this.getRingIndex(this.index),this.innerRadius=this.outerRadius-this.chart.radiusLength,e.each(this.getDataset().metaData,function(e,i){this.updateElement(e,i,t)},this)},updateElement:function(t,i,a){var s=(this.chart.chartArea.left+this.chart.chartArea.right)/2,o=(this.chart.chartArea.top+this.chart.chartArea.bottom)/2,n=Math.PI*-.5,r=Math.PI*-.5,l=a&&this.chart.options.animation.animateRotate?0:this.calculateCircumference(this.getDataset().data[i]),h=a&&this.chart.options.animation.animateScale?0:this.innerRadius,c=a&&this.chart.options.animation.animateScale?0:this.outerRadius;e.extend(t,{_chart:this.chart.chart,_datasetIndex:this.index,_index:i,_model:{x:s,y:o,startAngle:n,endAngle:r,circumference:l,outerRadius:c,innerRadius:h,backgroundColor:t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:e.getValueAtIndexOrDefault(this.getDataset().backgroundColor,i,this.chart.options.elements.arc.backgroundColor),hoverBackgroundColor:t.custom&&t.custom.hoverBackgroundColor?t.custom.hoverBackgroundColor:e.getValueAtIndexOrDefault(this.getDataset().hoverBackgroundColor,i,this.chart.options.elements.arc.hoverBackgroundColor),borderWidth:t.custom&&t.custom.borderWidth?t.custom.borderWidth:e.getValueAtIndexOrDefault(this.getDataset().borderWidth,i,this.chart.options.elements.arc.borderWidth),borderColor:t.custom&&t.custom.borderColor?t.custom.borderColor:e.getValueAtIndexOrDefault(this.getDataset().borderColor,i,this.chart.options.elements.arc.borderColor),label:e.getValueAtIndexOrDefault(this.getDataset().label,i,this.chart.data.labels[i])}}),a||(0===i?t._model.startAngle=Math.PI*-.5:t._model.startAngle=this.getDataset().metaData[i-1]._model.endAngle,t._model.endAngle=t._model.startAngle+t._model.circumference),t.pivot()},draw:function(t){var i=t||1;e.each(this.getDataset().metaData,function(t,e){t.transition(i).draw()})},setHoverStyle:function(t){var i=this.chart.data.datasets[t._datasetIndex],a=t._index;t._model.backgroundColor=t.custom&&t.custom.hoverBackgroundColor?t.custom.hoverBackgroundColor:e.getValueAtIndexOrDefault(i.hoverBackgroundColor,a,e.color(t._model.backgroundColor).saturate(.5).darken(.1).rgbString()),t._model.borderColor=t.custom&&t.custom.hoverBorderColor?t.custom.hoverBorderColor:e.getValueAtIndexOrDefault(i.hoverBorderColor,a,e.color(t._model.borderColor).saturate(.5).darken(.1).rgbString()),t._model.borderWidth=t.custom&&t.custom.hoverBorderWidth?t.custom.hoverBorderWidth:e.getValueAtIndexOrDefault(i.hoverBorderWidth,a,t._model.borderWidth)},removeHoverStyle:function(t){var i=(this.chart.data.datasets[t._datasetIndex],t._index);t._model.backgroundColor=t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:e.getValueAtIndexOrDefault(this.getDataset().backgroundColor,i,this.chart.options.elements.arc.backgroundColor),t._model.borderColor=t.custom&&t.custom.borderColor?t.custom.borderColor:e.getValueAtIndexOrDefault(this.getDataset().borderColor,i,this.chart.options.elements.arc.borderColor),t._model.borderWidth=t.custom&&t.custom.borderWidth?t.custom.borderWidth:e.getValueAtIndexOrDefault(this.getDataset().borderWidth,i,this.chart.options.elements.arc.borderWidth)},calculateCircumference:function(t){return this.getDataset().total>0&&!isNaN(t)?1.999999*Math.PI*(t/this.getDataset().total):0}})}},{}],18:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.defaults.line={showLines:!0,hover:{mode:"label"},scales:{xAxes:[{type:"category",id:"x-axis-0"}],yAxes:[{type:"linear",id:"y-axis-0"}]}},t.controllers.line=t.DatasetController.extend({addElements:function(){this.getDataset().metaData=this.getDataset().metaData||[],this.getDataset().metaDataset=this.getDataset().metaDataset||new t.elements.Line({_chart:this.chart.chart,_datasetIndex:this.index,_points:this.getDataset().metaData}),e.each(this.getDataset().data,function(e,i){this.getDataset().metaData[i]=this.getDataset().metaData[i]||new t.elements.Point({_chart:this.chart.chart,_datasetIndex:this.index,_index:i})},this)},addElementAndReset:function(e){this.getDataset().metaData=this.getDataset().metaData||[];var i=new t.elements.Point({_chart:this.chart.chart,_datasetIndex:this.index,_index:e});this.updateElement(i,e,!0),this.getDataset().metaData.splice(e,0,i),this.chart.options.showLines&&0!==this.chart.options.elements.line.tension&&this.updateBezierControlPoints()},update:function(t){var i,a=this.getDataset().metaDataset,s=this.getDataset().metaData,o=this.getScaleForId(this.getDataset().yAxisID);this.getScaleForId(this.getDataset().xAxisID);i=o.min<0&&o.max<0?o.getPixelForValue(o.max):o.min>0&&o.max>0?o.getPixelForValue(o.min):o.getPixelForValue(0),this.chart.options.showLines&&(a._scale=o,a._datasetIndex=this.index,a._children=s,a._model={tension:a.custom&&a.custom.tension?a.custom.tension:e.getValueOrDefault(this.getDataset().tension,this.chart.options.elements.line.tension),backgroundColor:a.custom&&a.custom.backgroundColor?a.custom.backgroundColor:this.getDataset().backgroundColor||this.chart.options.elements.line.backgroundColor,borderWidth:a.custom&&a.custom.borderWidth?a.custom.borderWidth:this.getDataset().borderWidth||this.chart.options.elements.line.borderWidth,borderColor:a.custom&&a.custom.borderColor?a.custom.borderColor:this.getDataset().borderColor||this.chart.options.elements.line.borderColor,borderCapStyle:a.custom&&a.custom.borderCapStyle?a.custom.borderCapStyle:this.getDataset().borderCapStyle||this.chart.options.elements.line.borderCapStyle,borderDash:a.custom&&a.custom.borderDash?a.custom.borderDash:this.getDataset().borderDash||this.chart.options.elements.line.borderDash,borderDashOffset:a.custom&&a.custom.borderDashOffset?a.custom.borderDashOffset:this.getDataset().borderDashOffset||this.chart.options.elements.line.borderDashOffset,borderJoinStyle:a.custom&&a.custom.borderJoinStyle?a.custom.borderJoinStyle:this.getDataset().borderJoinStyle||this.chart.options.elements.line.borderJoinStyle,fill:a.custom&&a.custom.fill?a.custom.fill:void 0!==this.getDataset().fill?this.getDataset().fill:this.chart.options.elements.line.fill,scaleTop:o.top,scaleBottom:o.bottom,scaleZero:i},a.pivot()),e.each(s,function(e,i){this.updateElement(e,i,t)},this),this.chart.options.showLines&&0!==this.chart.options.elements.line.tension&&this.updateBezierControlPoints()},getPointBackgroundColor:function(t,i){var a=this.chart.options.elements.point.backgroundColor,s=this.getDataset();return t.custom&&t.custom.backgroundColor?a=t.custom.backgroundColor:s.pointBackgroundColor?a=e.getValueAtIndexOrDefault(s.pointBackgroundColor,i,a):s.backgroundColor&&(a=s.backgroundColor),a},getPointBorderColor:function(t,i){var a=this.chart.options.elements.point.borderColor,s=this.getDataset();return t.custom&&t.custom.borderColor?a=t.custom.borderColor:s.pointBorderColor?a=e.getValueAtIndexOrDefault(this.getDataset().pointBorderColor,i,a):s.borderColor&&(a=s.borderColor),a},getPointBorderWidth:function(t,i){var a=this.chart.options.elements.point.borderWidth,s=this.getDataset();return t.custom&&void 0!==t.custom.borderWidth?a=t.custom.borderWidth:void 0!==s.pointBorderWidth?a=e.getValueAtIndexOrDefault(s.pointBorderWidth,i,a):void 0!==s.borderWidth&&(a=s.borderWidth),a},updateElement:function(t,i,a){var s,o=this.getScaleForId(this.getDataset().yAxisID),n=this.getScaleForId(this.getDataset().xAxisID);s=o.min<0&&o.max<0?o.getPixelForValue(o.max):o.min>0&&o.max>0?o.getPixelForValue(o.min):o.getPixelForValue(0),t._chart=this.chart.chart,t._xScale=n,t._yScale=o,t._datasetIndex=this.index,t._index=i,t._model={x:n.getPixelForValue(this.getDataset().data[i],i,this.index,this.chart.isCombo),y:a?s:this.calculatePointY(this.getDataset().data[i],i,this.index,this.chart.isCombo),tension:t.custom&&t.custom.tension?t.custom.tension:e.getValueOrDefault(this.getDataset().tension,this.chart.options.elements.line.tension),radius:t.custom&&t.custom.radius?t.custom.radius:e.getValueAtIndexOrDefault(this.getDataset().radius,i,this.chart.options.elements.point.radius),pointStyle:t.custom&&t.custom.pointStyle?t.custom.pointStyle:e.getValueAtIndexOrDefault(this.getDataset().pointStyle,i,this.chart.options.elements.point.pointStyle),backgroundColor:this.getPointBackgroundColor(t,i),borderColor:this.getPointBorderColor(t,i),borderWidth:this.getPointBorderWidth(t,i),hitRadius:t.custom&&t.custom.hitRadius?t.custom.hitRadius:e.getValueAtIndexOrDefault(this.getDataset().hitRadius,i,this.chart.options.elements.point.hitRadius)},t._model.skip=t.custom&&t.custom.skip?t.custom.skip:isNaN(t._model.x)||isNaN(t._model.y)},calculatePointY:function(t,i,a,s){var o=(this.getScaleForId(this.getDataset().xAxisID),this.getScaleForId(this.getDataset().yAxisID));if(o.options.stacked){for(var n=0,r=0,l=0;a>l;l++){var h=this.chart.data.datasets[l];"line"===h.type&&e.isDatasetVisible(h)&&(h.data[i]<0?r+=h.data[i]||0:n+=h.data[i]||0)}return 0>t?o.getPixelForValue(r+t):o.getPixelForValue(n+t)}return o.getPixelForValue(t)},updateBezierControlPoints:function(){e.each(this.getDataset().metaData,function(t,i){var a=e.splineCurve(e.previousItem(this.getDataset().metaData,i)._model,t._model,e.nextItem(this.getDataset().metaData,i)._model,t._model.tension);t._model.controlPointPreviousX=Math.max(Math.min(a.previous.x,this.chart.chartArea.right),this.chart.chartArea.left),t._model.controlPointPreviousY=Math.max(Math.min(a.previous.y,this.chart.chartArea.bottom),this.chart.chartArea.top),t._model.controlPointNextX=Math.max(Math.min(a.next.x,this.chart.chartArea.right),this.chart.chartArea.left),t._model.controlPointNextY=Math.max(Math.min(a.next.y,this.chart.chartArea.bottom),this.chart.chartArea.top),t.pivot()},this)},draw:function(t){var i=t||1;e.each(this.getDataset().metaData,function(t){t.transition(i)}),this.chart.options.showLines&&this.getDataset().metaDataset.transition(i).draw(),e.each(this.getDataset().metaData,function(t){t.draw()})},setHoverStyle:function(t){var i=this.chart.data.datasets[t._datasetIndex],a=t._index;t._model.radius=t.custom&&t.custom.hoverRadius?t.custom.hoverRadius:e.getValueAtIndexOrDefault(i.pointHoverRadius,a,this.chart.options.elements.point.hoverRadius),t._model.backgroundColor=t.custom&&t.custom.hoverBackgroundColor?t.custom.hoverBackgroundColor:e.getValueAtIndexOrDefault(i.pointHoverBackgroundColor,a,e.color(t._model.backgroundColor).saturate(.5).darken(.1).rgbString()),t._model.borderColor=t.custom&&t.custom.hoverBorderColor?t.custom.hoverBorderColor:e.getValueAtIndexOrDefault(i.pointHoverBorderColor,a,e.color(t._model.borderColor).saturate(.5).darken(.1).rgbString()),t._model.borderWidth=t.custom&&t.custom.hoverBorderWidth?t.custom.hoverBorderWidth:e.getValueAtIndexOrDefault(i.pointHoverBorderWidth,a,t._model.borderWidth)},removeHoverStyle:function(t){var i=(this.chart.data.datasets[t._datasetIndex],t._index);t._model.radius=t.custom&&t.custom.radius?t.custom.radius:e.getValueAtIndexOrDefault(this.getDataset().radius,i,this.chart.options.elements.point.radius),t._model.backgroundColor=this.getPointBackgroundColor(t,i),t._model.borderColor=this.getPointBorderColor(t,i),t._model.borderWidth=this.getPointBorderWidth(t,i)}})}},{}],19:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.defaults.polarArea={scale:{type:"radialLinear",lineArc:!0},animateRotate:!0,animateScale:!0,aspectRatio:1,legendCallback:function(t){var e=[];if(e.push('<ul class="'+t.id+'-legend">'),t.data.datasets.length)for(var i=0;i<t.data.datasets[0].data.length;++i)e.push('<li><span style="background-color:'+t.data.datasets[0].backgroundColor[i]+'">'),t.data.labels[i]&&e.push(t.data.labels[i]),e.push("</span></li>");return e.push("</ul>"),e.join("")},legend:{labels:{generateLabels:function(t){return t.labels.length&&t.datasets.length?t.labels.map(function(e,i){return{text:e,fillStyle:t.datasets[0].backgroundColor[i],hidden:isNaN(t.datasets[0].data[i]),index:i}}):[]}},onClick:function(t,i){e.each(this.chart.data.datasets,function(t){t.metaHiddenData=t.metaHiddenData||[];var e=i.index;isNaN(t.data[e])?isNaN(t.metaHiddenData[e])||(t.data[e]=t.metaHiddenData[e]):(t.metaHiddenData[e]=t.data[e],t.data[e]=NaN)}),this.chart.update()}},tooltips:{callbacks:{title:function(){return""},label:function(t,e){return e.labels[t.index]+": "+t.yLabel}}}},t.controllers.polarArea=t.DatasetController.extend({linkScales:function(){},addElements:function(){this.getDataset().metaData=this.getDataset().metaData||[],e.each(this.getDataset().data,function(e,i){this.getDataset().metaData[i]=this.getDataset().metaData[i]||new t.elements.Arc({_chart:this.chart.chart,_datasetIndex:this.index,_index:i})},this)},addElementAndReset:function(e){this.getDataset().metaData=this.getDataset().metaData||[];var i=new t.elements.Arc({_chart:this.chart.chart,_datasetIndex:this.index,_index:e});this.updateElement(i,e,!0),this.getDataset().metaData.splice(e,0,i)},getVisibleDatasetCount:function(){return e.where(this.chart.data.datasets,function(t){return e.isDatasetVisible(t)}).length},update:function(t){var i=Math.min(this.chart.chartArea.right-this.chart.chartArea.left,this.chart.chartArea.bottom-this.chart.chartArea.top);this.chart.outerRadius=Math.max((i-this.chart.options.elements.arc.borderWidth/2)/2,0),this.chart.innerRadius=Math.max(this.chart.options.cutoutPercentage?this.chart.outerRadius/100*this.chart.options.cutoutPercentage:1,0),this.chart.radiusLength=(this.chart.outerRadius-this.chart.innerRadius)/this.getVisibleDatasetCount(),this.getDataset().total=0,e.each(this.getDataset().data,function(t){this.getDataset().total+=Math.abs(t)},this),this.outerRadius=this.chart.outerRadius-this.chart.radiusLength*this.index,this.innerRadius=this.outerRadius-this.chart.radiusLength,e.each(this.getDataset().metaData,function(e,i){this.updateElement(e,i,t)},this)},updateElement:function(t,i,a){for(var s=this.calculateCircumference(this.getDataset().data[i]),o=(this.chart.chartArea.left+this.chart.chartArea.right)/2,n=(this.chart.chartArea.top+this.chart.chartArea.bottom)/2,r=0,l=0;i>l;++l)isNaN(this.getDataset().data[l])||++r;var h=-.5*Math.PI+s*r,c=h+s,d={x:o,y:n,innerRadius:0,outerRadius:this.chart.options.animateScale?0:this.chart.scale.getDistanceFromCenterForValue(this.getDataset().data[i]),startAngle:this.chart.options.animateRotate?Math.PI*-.5:h,endAngle:this.chart.options.animateRotate?Math.PI*-.5:c,backgroundColor:t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:e.getValueAtIndexOrDefault(this.getDataset().backgroundColor,i,this.chart.options.elements.arc.backgroundColor),borderWidth:t.custom&&t.custom.borderWidth?t.custom.borderWidth:e.getValueAtIndexOrDefault(this.getDataset().borderWidth,i,this.chart.options.elements.arc.borderWidth),borderColor:t.custom&&t.custom.borderColor?t.custom.borderColor:e.getValueAtIndexOrDefault(this.getDataset().borderColor,i,this.chart.options.elements.arc.borderColor),label:e.getValueAtIndexOrDefault(this.chart.data.labels,i,this.chart.data.labels[i])};e.extend(t,{_chart:this.chart.chart,_datasetIndex:this.index,_index:i,_scale:this.chart.scale,_model:a?d:{x:o,y:n,innerRadius:0,
-outerRadius:this.chart.scale.getDistanceFromCenterForValue(this.getDataset().data[i]),startAngle:h,endAngle:c,backgroundColor:t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:e.getValueAtIndexOrDefault(this.getDataset().backgroundColor,i,this.chart.options.elements.arc.backgroundColor),borderWidth:t.custom&&t.custom.borderWidth?t.custom.borderWidth:e.getValueAtIndexOrDefault(this.getDataset().borderWidth,i,this.chart.options.elements.arc.borderWidth),borderColor:t.custom&&t.custom.borderColor?t.custom.borderColor:e.getValueAtIndexOrDefault(this.getDataset().borderColor,i,this.chart.options.elements.arc.borderColor),label:e.getValueAtIndexOrDefault(this.chart.data.labels,i,this.chart.data.labels[i])}}),t.pivot()},draw:function(t){var i=t||1;e.each(this.getDataset().metaData,function(t,e){t.transition(i).draw()})},setHoverStyle:function(t){var i=this.chart.data.datasets[t._datasetIndex],a=t._index;t._model.backgroundColor=t.custom&&t.custom.hoverBackgroundColor?t.custom.hoverBackgroundColor:e.getValueAtIndexOrDefault(i.hoverBackgroundColor,a,e.color(t._model.backgroundColor).saturate(.5).darken(.1).rgbString()),t._model.borderColor=t.custom&&t.custom.hoverBorderColor?t.custom.hoverBorderColor:e.getValueAtIndexOrDefault(i.hoverBorderColor,a,e.color(t._model.borderColor).saturate(.5).darken(.1).rgbString()),t._model.borderWidth=t.custom&&t.custom.hoverBorderWidth?t.custom.hoverBorderWidth:e.getValueAtIndexOrDefault(i.hoverBorderWidth,a,t._model.borderWidth)},removeHoverStyle:function(t){var i=(this.chart.data.datasets[t._datasetIndex],t._index);t._model.backgroundColor=t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:e.getValueAtIndexOrDefault(this.getDataset().backgroundColor,i,this.chart.options.elements.arc.backgroundColor),t._model.borderColor=t.custom&&t.custom.borderColor?t.custom.borderColor:e.getValueAtIndexOrDefault(this.getDataset().borderColor,i,this.chart.options.elements.arc.borderColor),t._model.borderWidth=t.custom&&t.custom.borderWidth?t.custom.borderWidth:e.getValueAtIndexOrDefault(this.getDataset().borderWidth,i,this.chart.options.elements.arc.borderWidth)},calculateCircumference:function(t){if(isNaN(t))return 0;var i=e.where(this.getDataset().data,function(t){return isNaN(t)}).length;return 2*Math.PI/(this.getDataset().data.length-i)}})}},{}],20:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.defaults.radar={scale:{type:"radialLinear"},elements:{line:{tension:0}}},t.controllers.radar=t.DatasetController.extend({linkScales:function(){},addElements:function(){this.getDataset().metaData=this.getDataset().metaData||[],this.getDataset().metaDataset=this.getDataset().metaDataset||new t.elements.Line({_chart:this.chart.chart,_datasetIndex:this.index,_points:this.getDataset().metaData,_loop:!0}),e.each(this.getDataset().data,function(e,i){this.getDataset().metaData[i]=this.getDataset().metaData[i]||new t.elements.Point({_chart:this.chart.chart,_datasetIndex:this.index,_index:i,_model:{x:0,y:0}})},this)},addElementAndReset:function(e){this.getDataset().metaData=this.getDataset().metaData||[];var i=new t.elements.Point({_chart:this.chart.chart,_datasetIndex:this.index,_index:e});this.updateElement(i,e,!0),this.getDataset().metaData.splice(e,0,i),this.updateBezierControlPoints()},update:function(t){var i,a=this.getDataset().metaDataset,s=this.getDataset().metaData,o=this.chart.scale;i=o.min<0&&o.max<0?o.getPointPositionForValue(0,o.max):o.min>0&&o.max>0?o.getPointPositionForValue(0,o.min):o.getPointPositionForValue(0,0),e.extend(this.getDataset().metaDataset,{_datasetIndex:this.index,_children:this.getDataset().metaData,_model:{tension:a.custom&&a.custom.tension?a.custom.tension:e.getValueOrDefault(this.getDataset().tension,this.chart.options.elements.line.tension),backgroundColor:a.custom&&a.custom.backgroundColor?a.custom.backgroundColor:this.getDataset().backgroundColor||this.chart.options.elements.line.backgroundColor,borderWidth:a.custom&&a.custom.borderWidth?a.custom.borderWidth:this.getDataset().borderWidth||this.chart.options.elements.line.borderWidth,borderColor:a.custom&&a.custom.borderColor?a.custom.borderColor:this.getDataset().borderColor||this.chart.options.elements.line.borderColor,fill:a.custom&&a.custom.fill?a.custom.fill:void 0!==this.getDataset().fill?this.getDataset().fill:this.chart.options.elements.line.fill,borderCapStyle:a.custom&&a.custom.borderCapStyle?a.custom.borderCapStyle:this.getDataset().borderCapStyle||this.chart.options.elements.line.borderCapStyle,borderDash:a.custom&&a.custom.borderDash?a.custom.borderDash:this.getDataset().borderDash||this.chart.options.elements.line.borderDash,borderDashOffset:a.custom&&a.custom.borderDashOffset?a.custom.borderDashOffset:this.getDataset().borderDashOffset||this.chart.options.elements.line.borderDashOffset,borderJoinStyle:a.custom&&a.custom.borderJoinStyle?a.custom.borderJoinStyle:this.getDataset().borderJoinStyle||this.chart.options.elements.line.borderJoinStyle,scaleTop:o.top,scaleBottom:o.bottom,scaleZero:i}}),this.getDataset().metaDataset.pivot(),e.each(s,function(e,i){this.updateElement(e,i,t)},this),this.updateBezierControlPoints()},updateElement:function(t,i,a){var s=this.chart.scale.getPointPositionForValue(i,this.getDataset().data[i]);e.extend(t,{_datasetIndex:this.index,_index:i,_scale:this.chart.scale,_model:{x:a?this.chart.scale.xCenter:s.x,y:a?this.chart.scale.yCenter:s.y,tension:t.custom&&t.custom.tension?t.custom.tension:e.getValueOrDefault(this.getDataset().tension,this.chart.options.elements.line.tension),radius:t.custom&&t.custom.radius?t.custom.radius:e.getValueAtIndexOrDefault(this.getDataset().pointRadius,i,this.chart.options.elements.point.radius),backgroundColor:t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:e.getValueAtIndexOrDefault(this.getDataset().pointBackgroundColor,i,this.chart.options.elements.point.backgroundColor),borderColor:t.custom&&t.custom.borderColor?t.custom.borderColor:e.getValueAtIndexOrDefault(this.getDataset().pointBorderColor,i,this.chart.options.elements.point.borderColor),borderWidth:t.custom&&t.custom.borderWidth?t.custom.borderWidth:e.getValueAtIndexOrDefault(this.getDataset().pointBorderWidth,i,this.chart.options.elements.point.borderWidth),pointStyle:t.custom&&t.custom.pointStyle?t.custom.pointStyle:e.getValueAtIndexOrDefault(this.getDataset().pointStyle,i,this.chart.options.elements.point.pointStyle),hitRadius:t.custom&&t.custom.hitRadius?t.custom.hitRadius:e.getValueAtIndexOrDefault(this.getDataset().hitRadius,i,this.chart.options.elements.point.hitRadius)}}),t._model.skip=t.custom&&t.custom.skip?t.custom.skip:isNaN(t._model.x)||isNaN(t._model.y)},updateBezierControlPoints:function(){e.each(this.getDataset().metaData,function(t,i){var a=e.splineCurve(e.previousItem(this.getDataset().metaData,i,!0)._model,t._model,e.nextItem(this.getDataset().metaData,i,!0)._model,t._model.tension);t._model.controlPointPreviousX=Math.max(Math.min(a.previous.x,this.chart.chartArea.right),this.chart.chartArea.left),t._model.controlPointPreviousY=Math.max(Math.min(a.previous.y,this.chart.chartArea.bottom),this.chart.chartArea.top),t._model.controlPointNextX=Math.max(Math.min(a.next.x,this.chart.chartArea.right),this.chart.chartArea.left),t._model.controlPointNextY=Math.max(Math.min(a.next.y,this.chart.chartArea.bottom),this.chart.chartArea.top),t.pivot()},this)},draw:function(t){var i=t||1;e.each(this.getDataset().metaData,function(t,e){t.transition(i)}),this.getDataset().metaDataset.transition(i).draw(),e.each(this.getDataset().metaData,function(t){t.draw()})},setHoverStyle:function(t){var i=this.chart.data.datasets[t._datasetIndex],a=t._index;t._model.radius=t.custom&&t.custom.hoverRadius?t.custom.hoverRadius:e.getValueAtIndexOrDefault(i.pointHoverRadius,a,this.chart.options.elements.point.hoverRadius),t._model.backgroundColor=t.custom&&t.custom.hoverBackgroundColor?t.custom.hoverBackgroundColor:e.getValueAtIndexOrDefault(i.pointHoverBackgroundColor,a,e.color(t._model.backgroundColor).saturate(.5).darken(.1).rgbString()),t._model.borderColor=t.custom&&t.custom.hoverBorderColor?t.custom.hoverBorderColor:e.getValueAtIndexOrDefault(i.pointHoverBorderColor,a,e.color(t._model.borderColor).saturate(.5).darken(.1).rgbString()),t._model.borderWidth=t.custom&&t.custom.hoverBorderWidth?t.custom.hoverBorderWidth:e.getValueAtIndexOrDefault(i.pointHoverBorderWidth,a,t._model.borderWidth)},removeHoverStyle:function(t){var i=(this.chart.data.datasets[t._datasetIndex],t._index);t._model.radius=t.custom&&t.custom.radius?t.custom.radius:e.getValueAtIndexOrDefault(this.getDataset().radius,i,this.chart.options.elements.point.radius),t._model.backgroundColor=t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:e.getValueAtIndexOrDefault(this.getDataset().pointBackgroundColor,i,this.chart.options.elements.point.backgroundColor),t._model.borderColor=t.custom&&t.custom.borderColor?t.custom.borderColor:e.getValueAtIndexOrDefault(this.getDataset().pointBorderColor,i,this.chart.options.elements.point.borderColor),t._model.borderWidth=t.custom&&t.custom.borderWidth?t.custom.borderWidth:e.getValueAtIndexOrDefault(this.getDataset().pointBorderWidth,i,this.chart.options.elements.point.borderWidth)}})}},{}],21:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.defaults.global.animation={duration:1e3,easing:"easeOutQuart",onProgress:e.noop,onComplete:e.noop},t.Animation=t.Element.extend({currentStep:null,numSteps:60,easing:"",render:null,onAnimationProgress:null,onAnimationComplete:null}),t.animationService={frameDuration:17,animations:[],dropFrames:0,addAnimation:function(t,i,a,s){s||(t.animating=!0);for(var o=0;o<this.animations.length;++o)if(this.animations[o].chartInstance===t)return void(this.animations[o].animationObject=i);this.animations.push({chartInstance:t,animationObject:i}),1===this.animations.length&&e.requestAnimFrame.call(window,this.digestWrapper)},cancelAnimation:function(t){var i=e.findIndex(this.animations,function(e){return e.chartInstance===t});-1!==i&&(this.animations.splice(i,1),t.animating=!1)},digestWrapper:function(){t.animationService.startDigest.call(t.animationService)},startDigest:function(){var t=Date.now(),i=0;this.dropFrames>1&&(i=Math.floor(this.dropFrames),this.dropFrames=this.dropFrames%1);for(var a=0;a<this.animations.length;)null===this.animations[a].animationObject.currentStep&&(this.animations[a].animationObject.currentStep=0),this.animations[a].animationObject.currentStep+=1+i,this.animations[a].animationObject.currentStep>this.animations[a].animationObject.numSteps&&(this.animations[a].animationObject.currentStep=this.animations[a].animationObject.numSteps),this.animations[a].animationObject.render(this.animations[a].chartInstance,this.animations[a].animationObject),this.animations[a].animationObject.onAnimationProgress&&this.animations[a].animationObject.onAnimationProgress.call&&this.animations[a].animationObject.onAnimationProgress.call(this.animations[a].chartInstance,this.animations[a]),this.animations[a].animationObject.currentStep===this.animations[a].animationObject.numSteps?(this.animations[a].animationObject.onAnimationComplete&&this.animations[a].animationObject.onAnimationComplete.call&&this.animations[a].animationObject.onAnimationComplete.call(this.animations[a].chartInstance,this.animations[a]),this.animations[a].chartInstance.animating=!1,this.animations.splice(a,1)):++a;var s=Date.now(),o=(s-t)/this.frameDuration;this.dropFrames+=o,this.animations.length>0&&e.requestAnimFrame.call(window,this.digestWrapper)}}}},{}],22:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.types={},t.instances={},t.controllers={},t.Controller=function(i){return this.chart=i,this.config=i.config,this.options=this.config.options=e.configMerge(t.defaults.global,t.defaults[this.config.type],this.config.options||{}),this.id=e.uid(),Object.defineProperty(this,"data",{get:function(){return this.config.data}}),t.instances[this.id]=this,this.options.responsive&&this.resize(!0),this.initialize(),this},e.extend(t.Controller.prototype,{initialize:function(){return this.bindEvents(),this.ensureScalesHaveIDs(),this.buildOrUpdateControllers(),this.buildScales(),this.buildSurroundingItems(),this.updateLayout(),this.resetElements(),this.initToolTip(),this.update(),this},clear:function(){return e.clear(this.chart),this},stop:function(){return t.animationService.cancelAnimation(this),this},resize:function(t){var i=this.chart.canvas,a=e.getMaximumWidth(this.chart.canvas),s=this.options.maintainAspectRatio&&isNaN(this.chart.aspectRatio)===!1&&isFinite(this.chart.aspectRatio)&&0!==this.chart.aspectRatio?a/this.chart.aspectRatio:e.getMaximumHeight(this.chart.canvas),o=this.chart.width!==a||this.chart.height!==s;return o?(i.width=this.chart.width=a,i.height=this.chart.height=s,e.retinaScale(this.chart),t||(this.stop(),this.update(this.options.responsiveAnimationDuration)),this):this},ensureScalesHaveIDs:function(){var t="x-axis-",i="y-axis-";this.options.scales&&(this.options.scales.xAxes&&this.options.scales.xAxes.length&&e.each(this.options.scales.xAxes,function(e,i){e.id=e.id||t+i}),this.options.scales.yAxes&&this.options.scales.yAxes.length&&e.each(this.options.scales.yAxes,function(t,e){t.id=t.id||i+e}))},buildScales:function(){if(this.scales={},this.options.scales&&(this.options.scales.xAxes&&this.options.scales.xAxes.length&&e.each(this.options.scales.xAxes,function(i,a){var s=e.getValueOrDefault(i.type,"category"),o=t.scaleService.getScaleConstructor(s);if(o){var n=new o({ctx:this.chart.ctx,options:i,chart:this,id:i.id});this.scales[n.id]=n}},this),this.options.scales.yAxes&&this.options.scales.yAxes.length&&e.each(this.options.scales.yAxes,function(i,a){var s=e.getValueOrDefault(i.type,"linear"),o=t.scaleService.getScaleConstructor(s);if(o){var n=new o({ctx:this.chart.ctx,options:i,chart:this,id:i.id});this.scales[n.id]=n}},this)),this.options.scale){var i=t.scaleService.getScaleConstructor(this.options.scale.type);if(i){var a=new i({ctx:this.chart.ctx,options:this.options.scale,chart:this});this.scale=a,this.scales.radialScale=a}}t.scaleService.addScalesToLayout(this)},buildSurroundingItems:function(){this.options.title&&(this.titleBlock=new t.Title({ctx:this.chart.ctx,options:this.options.title,chart:this}),t.layoutService.addBox(this,this.titleBlock)),this.options.legend&&(this.legend=new t.Legend({ctx:this.chart.ctx,options:this.options.legend,chart:this}),t.layoutService.addBox(this,this.legend))},updateLayout:function(){t.layoutService.update(this,this.chart.width,this.chart.height)},buildOrUpdateControllers:function(){var i=[],a=[];if(e.each(this.data.datasets,function(e,s){e.type||(e.type=this.config.type);var o=e.type;i.push(o),e.controller?e.controller.updateIndex(s):(e.controller=new t.controllers[o](this,s),a.push(e.controller))},this),i.length>1)for(var s=1;s<i.length;s++)if(i[s]!==i[s-1]){this.isCombo=!0;break}return a},resetElements:function(){e.each(this.data.datasets,function(t,e){t.controller.reset()})},update:function(i,a){this.tooltip._data=this.data;var s=this.buildOrUpdateControllers();t.layoutService.update(this,this.chart.width,this.chart.height),e.each(s,function(t){t.reset()}),e.each(this.data.datasets,function(t,e){t.controller.buildOrUpdateElements()}),e.each(this.data.datasets,function(t,e){t.controller.update()}),this.render(i,a)},render:function(i,a){if(this.options.animation&&("undefined"!=typeof i&&0!==i||"undefined"==typeof i&&0!==this.options.animation.duration)){var s=new t.Animation;s.numSteps=(i||this.options.animation.duration)/16.66,s.easing=this.options.animation.easing,s.render=function(t,i){var a=e.easingEffects[i.easing],s=i.currentStep/i.numSteps,o=a(s);t.draw(o,s,i.currentStep)},s.onAnimationProgress=this.options.animation.onProgress,s.onAnimationComplete=this.options.animation.onComplete,t.animationService.addAnimation(this,s,i,a)}else this.draw(),this.options.animation&&this.options.animation.onComplete&&this.options.animation.onComplete.call&&this.options.animation.onComplete.call(this);return this},draw:function(t){var i=t||1;this.clear(),e.each(this.boxes,function(t){t.draw(this.chartArea)},this),this.scale&&this.scale.draw(),this.chart.ctx.save(),this.chart.ctx.beginPath(),this.chart.ctx.rect(this.chartArea.left,this.chartArea.top,this.chartArea.right-this.chartArea.left,this.chartArea.bottom-this.chartArea.top),this.chart.ctx.clip(),e.each(this.data.datasets,function(i,a){e.isDatasetVisible(i)&&i.controller.draw(t)},null,!0),this.chart.ctx.restore(),this.tooltip.transition(i).draw()},getElementAtEvent:function(t){var i=e.getRelativePosition(t,this.chart),a=[];return e.each(this.data.datasets,function(t,s){e.isDatasetVisible(t)&&e.each(t.metaData,function(t,e){return t.inRange(i.x,i.y)?(a.push(t),a):void 0})}),a},getElementsAtEvent:function(t){var i=e.getRelativePosition(t,this.chart),a=[],s=function(){if(this.data.datasets)for(var t=0;t<this.data.datasets.length;t++)if(e.isDatasetVisible(this.data.datasets[t]))for(var a=0;a<this.data.datasets[t].metaData.length;a++)if(this.data.datasets[t].metaData[a].inRange(i.x,i.y))return this.data.datasets[t].metaData[a]}.call(this);return s?(e.each(this.data.datasets,function(t,i){e.isDatasetVisible(t)&&a.push(t.metaData[s._index])}),a):a},getDatasetAtEvent:function(t){var e=this.getElementAtEvent(t);return e.length>0&&(e=this.data.datasets[e[0]._datasetIndex].metaData),e},generateLegend:function(){return this.options.legendCallback(this)},destroy:function(){this.clear(),e.unbindEvents(this,this.events),e.removeResizeListener(this.chart.canvas.parentNode);var i=this.chart.canvas;i.width=this.chart.width,i.height=this.chart.height,void 0!==this.chart.originalDevicePixelRatio&&this.chart.ctx.scale(1/this.chart.originalDevicePixelRatio,1/this.chart.originalDevicePixelRatio),i.style.width=this.chart.originalCanvasStyleWidth,i.style.height=this.chart.originalCanvasStyleHeight,delete t.instances[this.id]},toBase64Image:function(){return this.chart.canvas.toDataURL.apply(this.chart.canvas,arguments)},initToolTip:function(){this.tooltip=new t.Tooltip({_chart:this.chart,_chartInstance:this,_data:this.data,_options:this.options},this)},bindEvents:function(){e.bindEvents(this,this.options.events,function(t){this.eventHandler(t)})},eventHandler:function(t){if(this.lastActive=this.lastActive||[],this.lastTooltipActive=this.lastTooltipActive||[],"mouseout"===t.type)this.active=[],this.tooltipActive=[];else{var i=this,a=function(e){switch(e){case"single":return i.getElementAtEvent(t);case"label":return i.getElementsAtEvent(t);case"dataset":return i.getDatasetAtEvent(t);default:return t}};this.active=a(this.options.hover.mode),this.tooltipActive=a(this.options.tooltips.mode)}this.options.hover.onHover&&this.options.hover.onHover.call(this,this.active),("mouseup"===t.type||"click"===t.type)&&(this.options.onClick&&this.options.onClick.call(this,t,this.active),this.legend&&this.legend.handleEvent&&this.legend.handleEvent(t));if(this.lastActive.length)switch(this.options.hover.mode){case"single":this.data.datasets[this.lastActive[0]._datasetIndex].controller.removeHoverStyle(this.lastActive[0],this.lastActive[0]._datasetIndex,this.lastActive[0]._index);break;case"label":case"dataset":for(var s=0;s<this.lastActive.length;s++)this.lastActive[s]&&this.data.datasets[this.lastActive[s]._datasetIndex].controller.removeHoverStyle(this.lastActive[s],this.lastActive[s]._datasetIndex,this.lastActive[s]._index)}if(this.active.length&&this.options.hover.mode)switch(this.options.hover.mode){case"single":this.data.datasets[this.active[0]._datasetIndex].controller.setHoverStyle(this.active[0]);break;case"label":case"dataset":for(var o=0;o<this.active.length;o++)this.active[o]&&this.data.datasets[this.active[o]._datasetIndex].controller.setHoverStyle(this.active[o])}if((this.options.tooltips.enabled||this.options.tooltips.custom)&&(this.tooltip.initialize(),this.tooltip._active=this.tooltipActive,this.tooltip.update()),this.tooltip.pivot(),!this.animating){var n;e.each(this.active,function(t,e){t!==this.lastActive[e]&&(n=!0)},this),e.each(this.tooltipActive,function(t,e){t!==this.lastTooltipActive[e]&&(n=!0)},this),(this.lastActive.length!==this.active.length||this.lastTooltipActive.length!==this.tooltipActive.length||n)&&(this.stop(),(this.options.tooltips.enabled||this.options.tooltips.custom)&&this.tooltip.update(!0),this.render(this.options.hover.animationDuration,!0))}return this.lastActive=this.active,this.lastTooltipActive=this.tooltipActive,this}})}},{}],23:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.DatasetController=function(t,e){this.initialize.call(this,t,e)},e.extend(t.DatasetController.prototype,{initialize:function(t,e){this.chart=t,this.index=e,this.linkScales(),this.addElements()},updateIndex:function(t){this.index=t},linkScales:function(){this.getDataset().xAxisID||(this.getDataset().xAxisID=this.chart.options.scales.xAxes[0].id),this.getDataset().yAxisID||(this.getDataset().yAxisID=this.chart.options.scales.yAxes[0].id)},getDataset:function(){return this.chart.data.datasets[this.index]},getScaleForId:function(t){return this.chart.scales[t]},reset:function(){this.update(!0)},buildOrUpdateElements:function(){var t=this.getDataset().data.length,e=this.getDataset().metaData.length;if(e>t)this.getDataset().metaData.splice(t,e-t);else if(t>e)for(var i=e;t>i;++i)this.addElementAndReset(i)},addElements:e.noop,addElementAndReset:e.noop,draw:e.noop,removeHoverStyle:e.noop,setHoverStyle:e.noop,update:e.noop}),t.DatasetController.extend=e.inherits}},{}],24:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.elements={},t.Element=function(t){e.extend(this,t),this.initialize.apply(this,arguments)},e.extend(t.Element.prototype,{initialize:function(){},pivot:function(){return this._view||(this._view=e.clone(this._model)),this._start=e.clone(this._view),this},transition:function(t){return this._view||(this._view=e.clone(this._model)),1===t?(this._view=this._model,this._start=null,this):(this._start||this.pivot(),e.each(this._model,function(i,a){if("_"!==a[0]&&this._model.hasOwnProperty(a))if(this._view.hasOwnProperty(a))if(i===this._view[a]);else if("string"==typeof i)try{var s=e.color(this._start[a]).mix(e.color(this._model[a]),t);this._view[a]=s.rgbString()}catch(o){this._view[a]=i}else if("number"==typeof i){var n=void 0!==this._start[a]&&isNaN(this._start[a])===!1?this._start[a]:0;this._view[a]=(this._model[a]-n)*t+n}else this._view[a]=i;else"number"!=typeof i||isNaN(this._view[a])?this._view[a]=i:this._view[a]=i*t;else;},this),this)},tooltipPosition:function(){return{x:this._model.x,y:this._model.y}},hasValue:function(){return e.isNumber(this._model.x)&&e.isNumber(this._model.y)}}),t.Element.extend=e.inherits}},{}],25:[function(t,e,i){"use strict";var a=t("chartjs-color");e.exports=function(t){function e(t,e,i){var a;return"string"==typeof t?(a=parseInt(t,10),-1!=t.indexOf("%")&&(a=a/100*e.parentNode[i])):a=t,a}function i(t,i,a){var s,o=document.defaultView.getComputedStyle(t)[i],n=document.defaultView.getComputedStyle(t.parentNode)[i],r=null!==o&&"none"!==o,l=null!==n&&"none"!==n;return(r||l)&&(s=Math.min(r?e(o,t,a):Number.POSITIVE_INFINITY,l?e(n,t.parentNode,a):Number.POSITIVE_INFINITY)),s}var s=t.helpers={};s.each=function(t,e,i,a){var o,n;if(s.isArray(t))if(n=t.length,a)for(o=n-1;o>=0;o--)e.call(i,t[o],o);else for(o=0;n>o;o++)e.call(i,t[o],o);else if("object"==typeof t){var r=Object.keys(t);for(n=r.length,o=0;n>o;o++)e.call(i,t[r[o]],r[o])}},s.clone=function(t){var e={};return s.each(t,function(i,a){t.hasOwnProperty(a)&&(s.isArray(i)?e[a]=i.slice(0):"object"==typeof i&&null!==i?e[a]=s.clone(i):e[a]=i)}),e},s.extend=function(t){for(var e=arguments.length,i=[],a=1;e>a;a++)i.push(arguments[a]);return s.each(i,function(e){s.each(e,function(i,a){e.hasOwnProperty(a)&&(t[a]=i)})}),t},s.configMerge=function(e){var i=s.clone(e);return s.each(Array.prototype.slice.call(arguments,1),function(e){s.each(e,function(a,o){if(e.hasOwnProperty(o))if("scales"===o)i[o]=s.scaleMerge(i.hasOwnProperty(o)?i[o]:{},a);else if("scale"===o)i[o]=s.configMerge(i.hasOwnProperty(o)?i[o]:{},t.scaleService.getScaleDefaults(a.type),a);else if(i.hasOwnProperty(o)&&s.isArray(i[o])&&s.isArray(a)){var n=i[o];s.each(a,function(t,e){e<n.length?"object"==typeof n[e]&&null!==n[e]&&"object"==typeof t&&null!==t?n[e]=s.configMerge(n[e],t):n[e]=t:n.push(t)})}else i.hasOwnProperty(o)&&"object"==typeof i[o]&&null!==i[o]&&"object"==typeof a?i[o]=s.configMerge(i[o],a):i[o]=a})}),i},s.extendDeep=function(t){function e(t){return s.each(arguments,function(i){i!==t&&s.each(i,function(i,a){t[a]&&t[a].constructor&&t[a].constructor===Object?e(t[a],i):t[a]=i})}),t}return e.apply(this,arguments)},s.scaleMerge=function(e,i){var a=s.clone(e);return s.each(i,function(e,o){i.hasOwnProperty(o)&&("xAxes"===o||"yAxes"===o?a.hasOwnProperty(o)?s.each(e,function(e,i){var n=s.getValueOrDefault(e.type,"xAxes"===o?"category":"linear"),r=t.scaleService.getScaleDefaults(n);i>=a[o].length||!a[o][i].type?a[o].push(s.configMerge(r,e)):e.type&&e.type!==a[o][i].type?a[o][i]=s.configMerge(a[o][i],r,e):a[o][i]=s.configMerge(a[o][i],e)}):(a[o]=[],s.each(e,function(e){var i=s.getValueOrDefault(e.type,"xAxes"===o?"category":"linear");a[o].push(s.configMerge(t.scaleService.getScaleDefaults(i),e))})):a.hasOwnProperty(o)&&"object"==typeof a[o]&&null!==a[o]&&"object"==typeof e?a[o]=s.configMerge(a[o],e):a[o]=e)}),a},s.getValueAtIndexOrDefault=function(t,e,i){return void 0===t||null===t?i:s.isArray(t)?e<t.length?t[e]:i:t},s.getValueOrDefault=function(t,e){return void 0===t?e:t},s.indexOf=function(t,e){if(Array.prototype.indexOf)return t.indexOf(e);for(var i=0;i<t.length;i++)if(t[i]===e)return i;return-1},s.where=function(t,e){var i=[];return s.each(t,function(t){e(t)&&i.push(t)}),i},s.findIndex=function(t,e,i){var a=-1;if(Array.prototype.findIndex)a=t.findIndex(e,i);else for(var s=0;s<t.length;++s)if(i=void 0!==i?i:t,e.call(i,t[s],s,t)){a=s;break}return a},s.findNextWhere=function(t,e,i){(void 0===i||null===i)&&(i=-1);for(var a=i+1;a<t.length;a++){var s=t[a];if(e(s))return s}},s.findPreviousWhere=function(t,e,i){(void 0===i||null===i)&&(i=t.length);for(var a=i-1;a>=0;a--){var s=t[a];if(e(s))return s}},s.inherits=function(t){var e=this,i=t&&t.hasOwnProperty("constructor")?t.constructor:function(){return e.apply(this,arguments)},a=function(){this.constructor=i};return a.prototype=e.prototype,i.prototype=new a,i.extend=s.inherits,t&&s.extend(i.prototype,t),i.__super__=e.prototype,i},s.noop=function(){},s.uid=function(){var t=0;return function(){return"chart-"+t++}}(),s.warn=function(t){console&&"function"==typeof console.warn&&console.warn(t)},s.isNumber=function(t){return!isNaN(parseFloat(t))&&isFinite(t)},s.almostEquals=function(t,e,i){return Math.abs(t-e)<i},s.max=function(t){return t.reduce(function(t,e){return isNaN(e)?t:Math.max(t,e)},Number.NEGATIVE_INFINITY)},s.min=function(t){return t.reduce(function(t,e){return isNaN(e)?t:Math.min(t,e)},Number.POSITIVE_INFINITY)},s.sign=function(t){return Math.sign?Math.sign(t):(t=+t,0===t||isNaN(t)?t:t>0?1:-1)},s.log10=function(t){return Math.log10?Math.log10(t):Math.log(t)/Math.LN10},s.toRadians=function(t){return t*(Math.PI/180)},s.toDegrees=function(t){return t*(180/Math.PI)},s.getAngleFromPoint=function(t,e){var i=e.x-t.x,a=e.y-t.y,s=Math.sqrt(i*i+a*a),o=Math.atan2(a,i);return o<-.5*Math.PI&&(o+=2*Math.PI),{angle:o,distance:s}},s.aliasPixel=function(t){return t%2===0?0:.5},s.splineCurve=function(t,e,i,a){var s=t.skip?e:t,o=e,n=i.skip?e:i,r=Math.sqrt(Math.pow(o.x-s.x,2)+Math.pow(o.y-s.y,2)),l=Math.sqrt(Math.pow(n.x-o.x,2)+Math.pow(n.y-o.y,2)),h=r/(r+l),c=l/(r+l);h=isNaN(h)?0:h,c=isNaN(c)?0:c;var d=a*h,u=a*c;return{previous:{x:o.x-d*(n.x-s.x),y:o.y-d*(n.y-s.y)},next:{x:o.x+u*(n.x-s.x),y:o.y+u*(n.y-s.y)}}},s.nextItem=function(t,e,i){return i?e>=t.length-1?t[0]:t[e+1]:e>=t.length-1?t[t.length-1]:t[e+1]},s.previousItem=function(t,e,i){return i?0>=e?t[t.length-1]:t[e-1]:0>=e?t[0]:t[e-1]},s.niceNum=function(t,e){var i,a=Math.floor(s.log10(t)),o=t/Math.pow(10,a);return i=e?1.5>o?1:3>o?2:7>o?5:10:1>=o?1:2>=o?2:5>=o?5:10,i*Math.pow(10,a)};var o=s.easingEffects={linear:function(t){return t},easeInQuad:function(t){return t*t},easeOutQuad:function(t){return-1*t*(t-2)},easeInOutQuad:function(t){return(t/=.5)<1?.5*t*t:-0.5*(--t*(t-2)-1)},easeInCubic:function(t){return t*t*t},easeOutCubic:function(t){return 1*((t=t/1-1)*t*t+1)},easeInOutCubic:function(t){return(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},easeInQuart:function(t){return t*t*t*t},easeOutQuart:function(t){return-1*((t=t/1-1)*t*t*t-1)},easeInOutQuart:function(t){return(t/=.5)<1?.5*t*t*t*t:-0.5*((t-=2)*t*t*t-2)},easeInQuint:function(t){return 1*(t/=1)*t*t*t*t},easeOutQuint:function(t){return 1*((t=t/1-1)*t*t*t*t+1)},easeInOutQuint:function(t){return(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},easeInSine:function(t){return-1*Math.cos(t/1*(Math.PI/2))+1},easeOutSine:function(t){return 1*Math.sin(t/1*(Math.PI/2))},easeInOutSine:function(t){return-0.5*(Math.cos(Math.PI*t/1)-1)},easeInExpo:function(t){return 0===t?1:1*Math.pow(2,10*(t/1-1))},easeOutExpo:function(t){return 1===t?1:1*(-Math.pow(2,-10*t/1)+1)},easeInOutExpo:function(t){return 0===t?0:1===t?1:(t/=.5)<1?.5*Math.pow(2,10*(t-1)):.5*(-Math.pow(2,-10*--t)+2)},easeInCirc:function(t){return t>=1?t:-1*(Math.sqrt(1-(t/=1)*t)-1)},easeOutCirc:function(t){return 1*Math.sqrt(1-(t=t/1-1)*t)},easeInOutCirc:function(t){return(t/=.5)<1?-0.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},easeInElastic:function(t){var e=1.70158,i=0,a=1;return 0===t?0:1===(t/=1)?1:(i||(i=.3),a<Math.abs(1)?(a=1,e=i/4):e=i/(2*Math.PI)*Math.asin(1/a),-(a*Math.pow(2,10*(t-=1))*Math.sin((1*t-e)*(2*Math.PI)/i)))},easeOutElastic:function(t){var e=1.70158,i=0,a=1;return 0===t?0:1===(t/=1)?1:(i||(i=.3),a<Math.abs(1)?(a=1,e=i/4):e=i/(2*Math.PI)*Math.asin(1/a),a*Math.pow(2,-10*t)*Math.sin((1*t-e)*(2*Math.PI)/i)+1)},easeInOutElastic:function(t){var e=1.70158,i=0,a=1;return 0===t?0:2===(t/=.5)?1:(i||(i=1*(.3*1.5)),a<Math.abs(1)?(a=1,e=i/4):e=i/(2*Math.PI)*Math.asin(1/a),1>t?-.5*(a*Math.pow(2,10*(t-=1))*Math.sin((1*t-e)*(2*Math.PI)/i)):a*Math.pow(2,-10*(t-=1))*Math.sin((1*t-e)*(2*Math.PI)/i)*.5+1)},easeInBack:function(t){var e=1.70158;return 1*(t/=1)*t*((e+1)*t-e)},easeOutBack:function(t){var e=1.70158;return 1*((t=t/1-1)*t*((e+1)*t+e)+1)},easeInOutBack:function(t){var e=1.70158;return(t/=.5)<1?.5*(t*t*(((e*=1.525)+1)*t-e)):.5*((t-=2)*t*(((e*=1.525)+1)*t+e)+2)},easeInBounce:function(t){return 1-o.easeOutBounce(1-t)},easeOutBounce:function(t){return(t/=1)<1/2.75?1*(7.5625*t*t):2/2.75>t?1*(7.5625*(t-=1.5/2.75)*t+.75):2.5/2.75>t?1*(7.5625*(t-=2.25/2.75)*t+.9375):1*(7.5625*(t-=2.625/2.75)*t+.984375)},easeInOutBounce:function(t){return.5>t?.5*o.easeInBounce(2*t):.5*o.easeOutBounce(2*t-1)+.5}};s.requestAnimFrame=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(t){return window.setTimeout(t,1e3/60)}}(),s.cancelAnimFrame=function(){return window.cancelAnimationFrame||window.webkitCancelAnimationFrame||window.mozCancelAnimationFrame||window.oCancelAnimationFrame||window.msCancelAnimationFrame||function(t){return window.clearTimeout(t,1e3/60)}}(),s.getRelativePosition=function(t,e){var i,a,o=t.originalEvent||t,n=t.currentTarget||t.srcElement,r=n.getBoundingClientRect();o.touches&&o.touches.length>0?(i=o.touches[0].clientX,a=o.touches[0].clientY):(i=o.clientX,a=o.clientY);var l=parseFloat(s.getStyle(n,"padding-left")),h=parseFloat(s.getStyle(n,"padding-top")),c=parseFloat(s.getStyle(n,"padding-right")),d=parseFloat(s.getStyle(n,"padding-bottom")),u=r.right-r.left-l-c,g=r.bottom-r.top-h-d;return i=Math.round((i-r.left-l)/u*n.width/e.currentDevicePixelRatio),a=Math.round((a-r.top-h)/g*n.height/e.currentDevicePixelRatio),{x:i,y:a}},s.addEvent=function(t,e,i){t.addEventListener?t.addEventListener(e,i):t.attachEvent?t.attachEvent("on"+e,i):t["on"+e]=i;
-},s.removeEvent=function(t,e,i){t.removeEventListener?t.removeEventListener(e,i,!1):t.detachEvent?t.detachEvent("on"+e,i):t["on"+e]=s.noop},s.bindEvents=function(t,e,i){t.events||(t.events={}),s.each(e,function(e){t.events[e]=function(){i.apply(t,arguments)},s.addEvent(t.chart.canvas,e,t.events[e])})},s.unbindEvents=function(t,e){s.each(e,function(e,i){s.removeEvent(t.chart.canvas,i,e)})},s.getConstraintWidth=function(t){return i(t,"max-width","clientWidth")},s.getConstraintHeight=function(t){return i(t,"max-height","clientHeight")},s.getMaximumWidth=function(t){var e=t.parentNode,i=parseInt(s.getStyle(e,"padding-left"))+parseInt(s.getStyle(e,"padding-right")),a=e.clientWidth-i,o=s.getConstraintWidth(t);return void 0!==o&&(a=Math.min(a,o)),a},s.getMaximumHeight=function(t){var e=t.parentNode,i=parseInt(s.getStyle(e,"padding-top"))+parseInt(s.getStyle(e,"padding-bottom")),a=e.clientHeight-i,o=s.getConstraintHeight(t);return void 0!==o&&(a=Math.min(a,o)),a},s.getStyle=function(t,e){return t.currentStyle?t.currentStyle[e]:document.defaultView.getComputedStyle(t,null).getPropertyValue(e)},s.retinaScale=function(t){var e=t.ctx,i=t.canvas.width,a=t.canvas.height,s=t.currentDevicePixelRatio=window.devicePixelRatio||1;1!==s&&(e.canvas.height=a*s,e.canvas.width=i*s,e.scale(s,s),t.originalDevicePixelRatio=t.originalDevicePixelRatio||s),e.canvas.style.width=i+"px",e.canvas.style.height=a+"px"},s.clear=function(t){t.ctx.clearRect(0,0,t.width,t.height)},s.fontString=function(t,e,i){return e+" "+t+"px "+i},s.longestText=function(t,e,i,a){a=a||{},a.data=a.data||{},a.garbageCollect=a.garbageCollect||[],a.font!==e&&(a.data={},a.garbageCollect=[],a.font=e),t.font=e;var o=0;s.each(i,function(e){if(void 0!==e&&null!==e){var i=a.data[e];i||(i=a.data[e]=t.measureText(e).width,a.garbageCollect.push(e)),i>o&&(o=i)}});var n=a.garbageCollect.length/2;if(n>i.length){for(var r=0;n>r;r++)delete a.data[a.garbageCollect[r]];a.garbageCollect.splice(0,n)}return o},s.drawRoundedRectangle=function(t,e,i,a,s,o){t.beginPath(),t.moveTo(e+o,i),t.lineTo(e+a-o,i),t.quadraticCurveTo(e+a,i,e+a,i+o),t.lineTo(e+a,i+s-o),t.quadraticCurveTo(e+a,i+s,e+a-o,i+s),t.lineTo(e+o,i+s),t.quadraticCurveTo(e,i+s,e,i+s-o),t.lineTo(e,i+o),t.quadraticCurveTo(e,i,e+o,i),t.closePath()},s.color=function(e){return a?a(e instanceof CanvasGradient?t.defaults.global.defaultColor:e):(console.log("Color.js not found!"),e)},s.addResizeListener=function(t,e){var i=document.createElement("iframe"),a="chartjs-hidden-iframe";i.classlist?i.classlist.add(a):i.setAttribute("class",a),i.style.width="100%",i.style.display="block",i.style.border=0,i.style.height=0,i.style.margin=0,i.style.position="absolute",i.style.left=0,i.style.right=0,i.style.top=0,i.style.bottom=0,t.insertBefore(i,t.firstChild),(i.contentWindow||i).onresize=function(){e&&e()}},s.removeResizeListener=function(t){var e=t.querySelector(".chartjs-hidden-iframe");e&&e.parentNode.removeChild(e)},s.isArray=function(t){return Array.isArray?Array.isArray(t):"[object Array]"===Object.prototype.toString.call(t)},s.pushAllIfDefined=function(t,e){"undefined"!=typeof t&&(s.isArray(t)?e.push.apply(e,t):e.push(t))},s.isDatasetVisible=function(t){return!t.hidden},s.callCallback=function(t,e,i){t&&"function"==typeof t.call&&t.apply(i,e)}}},{"chartjs-color":2}],26:[function(t,e,i){"use strict";e.exports=function(){var t=function(e,i){this.config=i,e.length&&e[0].getContext&&(e=e[0]),e.getContext&&(e=e.getContext("2d")),this.ctx=e,this.canvas=e.canvas,this.width=e.canvas.width||parseInt(t.helpers.getStyle(e.canvas,"width"))||t.helpers.getMaximumWidth(e.canvas),this.height=e.canvas.height||parseInt(t.helpers.getStyle(e.canvas,"height"))||t.helpers.getMaximumHeight(e.canvas),this.aspectRatio=this.width/this.height,(isNaN(this.aspectRatio)||isFinite(this.aspectRatio)===!1)&&(this.aspectRatio=void 0!==i.aspectRatio?i.aspectRatio:2),this.originalCanvasStyleWidth=e.canvas.style.width,this.originalCanvasStyleHeight=e.canvas.style.height,t.helpers.retinaScale(this),i&&(this.controller=new t.Controller(this));var a=this;return t.helpers.addResizeListener(e.canvas.parentNode,function(){a.controller&&a.controller.config.options.responsive&&a.controller.resize()}),this.controller?this.controller:this};return t.defaults={global:{responsive:!0,responsiveAnimationDuration:0,maintainAspectRatio:!0,events:["mousemove","mouseout","click","touchstart","touchmove"],hover:{onHover:null,mode:"single",animationDuration:400},onClick:null,defaultColor:"rgba(0,0,0,0.1)",defaultFontColor:"#666",defaultFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",defaultFontSize:12,defaultFontStyle:"normal",showLines:!0,elements:{},legendCallback:function(t){var e=[];e.push('<ul class="'+t.id+'-legend">');for(var i=0;i<t.data.datasets.length;i++)e.push('<li><span style="background-color:'+t.data.datasets[i].backgroundColor+'"></span>'),t.data.datasets[i].label&&e.push(t.data.datasets[i].label),e.push("</li>");return e.push("</ul>"),e.join("")}}},t}},{}],27:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.layoutService={defaults:{},addBox:function(t,e){t.boxes||(t.boxes=[]),t.boxes.push(e)},removeBox:function(t,e){t.boxes&&t.boxes.splice(t.boxes.indexOf(e),1)},update:function(t,i,a){function s(t){var e,i=t.isHorizontal();i?(e=t.update(t.options.fullWidth?m:k,y),D-=e.height):(e=t.update(v,x),k-=e.width),S.push({horizontal:i,minSize:e,box:t})}function o(t){var i=e.findNextWhere(S,function(e){return e.box===t});if(i)if(t.isHorizontal()){var a={left:C,right:w,top:0,bottom:0};t.update(t.options.fullWidth?m:k,p/2,a)}else t.update(i.minSize.width,D)}function n(t){var i=e.findNextWhere(S,function(e){return e.box===t}),a={left:0,right:0,top:_,bottom:A};i&&t.update(i.minSize.width,D,a)}function r(t){t.isHorizontal()?(t.left=t.options.fullWidth?l:C,t.right=t.options.fullWidth?i-l:C+k,t.top=P,t.bottom=P+t.height,P=t.bottom):(t.left=F,t.right=F+t.width,t.top=_,t.bottom=_+D,F=t.right)}if(t){var l=0,h=0,c=e.where(t.boxes,function(t){return"left"===t.options.position}),d=e.where(t.boxes,function(t){return"right"===t.options.position}),u=e.where(t.boxes,function(t){return"top"===t.options.position}),g=e.where(t.boxes,function(t){return"bottom"===t.options.position}),f=e.where(t.boxes,function(t){return"chartArea"===t.options.position});u.sort(function(t,e){return(e.options.fullWidth?1:0)-(t.options.fullWidth?1:0)}),g.sort(function(t,e){return(t.options.fullWidth?1:0)-(e.options.fullWidth?1:0)});var m=i-2*l,p=a-2*h,b=m/2,x=p/2,v=(i-b)/(c.length+d.length),y=(a-x)/(u.length+g.length),k=m,D=p,S=[];e.each(c.concat(d,u,g),s);var C=l,w=l,_=h,A=h;e.each(c.concat(d),o),e.each(c,function(t){C+=t.width}),e.each(d,function(t){w+=t.width}),e.each(u.concat(g),o),e.each(u,function(t){_+=t.height}),e.each(g,function(t){A+=t.height}),e.each(c.concat(d),n),C=l,w=l,_=h,A=h,e.each(c,function(t){C+=t.width}),e.each(d,function(t){w+=t.width}),e.each(u,function(t){_+=t.height}),e.each(g,function(t){A+=t.height});var I=a-_-A,M=i-C-w;(M!==k||I!==D)&&(e.each(c,function(t){t.height=I}),e.each(d,function(t){t.height=I}),e.each(u,function(t){t.width=M}),e.each(g,function(t){t.width=M}),D=I,k=M);var F=l,P=h;e.each(c.concat(u),r),F+=k,P+=D,e.each(d,r),e.each(g,r),t.chartArea={left:C,top:_,right:C+k,bottom:_+D},e.each(f,function(e){e.left=t.chartArea.left,e.top=t.chartArea.top,e.right=t.chartArea.right,e.bottom=t.chartArea.bottom,e.update(k,D)})}}}}},{}],28:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.defaults.global.legend={display:!0,position:"top",fullWidth:!0,reverse:!1,onClick:function(t,e){var i=this.chart.data.datasets[e.datasetIndex];i.hidden=!i.hidden,this.chart.update()},labels:{boxWidth:40,padding:10,generateLabels:function(t){return e.isArray(t.datasets)?t.datasets.map(function(t,e){return{text:t.label,fillStyle:t.backgroundColor,hidden:t.hidden,lineCap:t.borderCapStyle,lineDash:t.borderDash,lineDashOffset:t.borderDashOffset,lineJoin:t.borderJoinStyle,lineWidth:t.borderWidth,strokeStyle:t.borderColor,datasetIndex:e}},this):[]}}},t.Legend=t.Element.extend({initialize:function(t){e.extend(this,t),this.legendHitBoxes=[],this.doughnutMode=!1},beforeUpdate:e.noop,update:function(t,e,i){return this.beforeUpdate(),this.maxWidth=t,this.maxHeight=e,this.margins=i,this.beforeSetDimensions(),this.setDimensions(),this.afterSetDimensions(),this.beforeBuildLabels(),this.buildLabels(),this.afterBuildLabels(),this.beforeFit(),this.fit(),this.afterFit(),this.afterUpdate(),this.minSize},afterUpdate:e.noop,beforeSetDimensions:e.noop,setDimensions:function(){this.isHorizontal()?(this.width=this.maxWidth,this.left=0,this.right=this.width):(this.height=this.maxHeight,this.top=0,this.bottom=this.height),this.paddingLeft=0,this.paddingTop=0,this.paddingRight=0,this.paddingBottom=0,this.minSize={width:0,height:0}},afterSetDimensions:e.noop,beforeBuildLabels:e.noop,buildLabels:function(){this.legendItems=this.options.labels.generateLabels.call(this,this.chart.data),this.options.reverse&&this.legendItems.reverse()},afterBuildLabels:e.noop,beforeFit:e.noop,fit:function(){var i=this.ctx,a=e.getValueOrDefault(this.options.labels.fontSize,t.defaults.global.defaultFontSize),s=e.getValueOrDefault(this.options.labels.fontStyle,t.defaults.global.defaultFontStyle),o=e.getValueOrDefault(this.options.labels.fontFamily,t.defaults.global.defaultFontFamily),n=e.fontString(a,s,o);if(this.legendHitBoxes=[],this.isHorizontal()?this.minSize.width=this.maxWidth:this.minSize.width=this.options.display?10:0,this.isHorizontal()?this.minSize.height=this.options.display?10:0:this.minSize.height=this.maxHeight,this.options.display&&this.isHorizontal()){this.lineWidths=[0];var r=this.legendItems.length?a+this.options.labels.padding:0;i.textAlign="left",i.textBaseline="top",i.font=n,e.each(this.legendItems,function(t,e){var s=this.options.labels.boxWidth+a/2+i.measureText(t.text).width;this.lineWidths[this.lineWidths.length-1]+s+this.options.labels.padding>=this.width&&(r+=a+this.options.labels.padding,this.lineWidths[this.lineWidths.length]=this.left),this.legendHitBoxes[e]={left:0,top:0,width:s,height:a},this.lineWidths[this.lineWidths.length-1]+=s+this.options.labels.padding},this),this.minSize.height+=r}this.width=this.minSize.width,this.height=this.minSize.height},afterFit:e.noop,isHorizontal:function(){return"top"===this.options.position||"bottom"===this.options.position},draw:function(){if(this.options.display){var i=this.ctx,a={x:this.left+(this.width-this.lineWidths[0])/2,y:this.top+this.options.labels.padding,line:0},s=e.getValueOrDefault(this.options.labels.fontColor,t.defaults.global.defaultFontColor),o=e.getValueOrDefault(this.options.labels.fontSize,t.defaults.global.defaultFontSize),n=e.getValueOrDefault(this.options.labels.fontStyle,t.defaults.global.defaultFontStyle),r=e.getValueOrDefault(this.options.labels.fontFamily,t.defaults.global.defaultFontFamily),l=e.fontString(o,n,r);this.isHorizontal()&&(i.textAlign="left",i.textBaseline="top",i.lineWidth=.5,i.strokeStyle=s,i.fillStyle=s,i.font=l,e.each(this.legendItems,function(e,s){var n=i.measureText(e.text).width,r=this.options.labels.boxWidth+o/2+n;a.x+r>=this.width&&(a.y+=o+this.options.labels.padding,a.line++,a.x=this.left+(this.width-this.lineWidths[a.line])/2),i.save();var l=function(t,e){return void 0!==t?t:e};i.fillStyle=l(e.fillStyle,t.defaults.global.defaultColor),i.lineCap=l(e.lineCap,t.defaults.global.elements.line.borderCapStyle),i.lineDashOffset=l(e.lineDashOffset,t.defaults.global.elements.line.borderDashOffset),i.lineJoin=l(e.lineJoin,t.defaults.global.elements.line.borderJoinStyle),i.lineWidth=l(e.lineWidth,t.defaults.global.elements.line.borderWidth),i.strokeStyle=l(e.strokeStyle,t.defaults.global.defaultColor),i.setLineDash&&i.setLineDash(l(e.lineDash,t.defaults.global.elements.line.borderDash)),i.strokeRect(a.x,a.y,this.options.labels.boxWidth,o),i.fillRect(a.x,a.y,this.options.labels.boxWidth,o),i.restore(),this.legendHitBoxes[s].left=a.x,this.legendHitBoxes[s].top=a.y,i.fillText(e.text,this.options.labels.boxWidth+o/2+a.x,a.y),e.hidden&&(i.beginPath(),i.lineWidth=2,i.moveTo(this.options.labels.boxWidth+o/2+a.x,a.y+o/2),i.lineTo(this.options.labels.boxWidth+o/2+a.x+n,a.y+o/2),i.stroke()),a.x+=r+this.options.labels.padding},this))}},handleEvent:function(t){var i=e.getRelativePosition(t,this.chart.chart);if(i.x>=this.left&&i.x<=this.right&&i.y>=this.top&&i.y<=this.bottom)for(var a=0;a<this.legendHitBoxes.length;++a){var s=this.legendHitBoxes[a];if(i.x>=s.left&&i.x<=s.left+s.width&&i.y>=s.top&&i.y<=s.top+s.height){this.options.onClick&&this.options.onClick.call(this,t,this.legendItems[a]);break}}}})}},{}],29:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.defaults.scale={display:!0,gridLines:{display:!0,color:"rgba(0, 0, 0, 0.1)",lineWidth:1,drawOnChartArea:!0,drawTicks:!0,zeroLineWidth:1,zeroLineColor:"rgba(0,0,0,0.25)",offsetGridLines:!1},scaleLabel:{labelString:"",display:!1},ticks:{beginAtZero:!1,maxRotation:90,mirror:!1,padding:10,reverse:!1,display:!0,autoSkip:!0,autoSkipPadding:20,callback:function(t){return""+t}}},t.Scale=t.Element.extend({beforeUpdate:function(){e.callCallback(this.options.beforeUpdate,[this])},update:function(t,i,a){return this.beforeUpdate(),this.maxWidth=t,this.maxHeight=i,this.margins=e.extend({left:0,right:0,top:0,bottom:0},a),this.beforeSetDimensions(),this.setDimensions(),this.afterSetDimensions(),this.beforeDataLimits(),this.determineDataLimits(),this.afterDataLimits(),this.beforeBuildTicks(),this.buildTicks(),this.afterBuildTicks(),this.beforeTickToLabelConversion(),this.convertTicksToLabels(),this.afterTickToLabelConversion(),this.beforeCalculateTickRotation(),this.calculateTickRotation(),this.afterCalculateTickRotation(),this.beforeFit(),this.fit(),this.afterFit(),this.afterUpdate(),this.minSize},afterUpdate:function(){e.callCallback(this.options.afterUpdate,[this])},beforeSetDimensions:function(){e.callCallback(this.options.beforeSetDimensions,[this])},setDimensions:function(){this.isHorizontal()?(this.width=this.maxWidth,this.left=0,this.right=this.width):(this.height=this.maxHeight,this.top=0,this.bottom=this.height),this.paddingLeft=0,this.paddingTop=0,this.paddingRight=0,this.paddingBottom=0},afterSetDimensions:function(){e.callCallback(this.options.afterSetDimensions,[this])},beforeDataLimits:function(){e.callCallback(this.options.beforeDataLimits,[this])},determineDataLimits:e.noop,afterDataLimits:function(){e.callCallback(this.options.afterDataLimits,[this])},beforeBuildTicks:function(){e.callCallback(this.options.beforeBuildTicks,[this])},buildTicks:e.noop,afterBuildTicks:function(){e.callCallback(this.options.afterBuildTicks,[this])},beforeTickToLabelConversion:function(){e.callCallback(this.options.beforeTickToLabelConversion,[this])},convertTicksToLabels:function(){this.ticks=this.ticks.map(function(t,e,i){return this.options.ticks.userCallback?this.options.ticks.userCallback(t,e,i):this.options.ticks.callback(t,e,i)},this)},afterTickToLabelConversion:function(){e.callCallback(this.options.afterTickToLabelConversion,[this])},beforeCalculateTickRotation:function(){e.callCallback(this.options.beforeCalculateTickRotation,[this])},calculateTickRotation:function(){var i=e.getValueOrDefault(this.options.ticks.fontSize,t.defaults.global.defaultFontSize),a=e.getValueOrDefault(this.options.ticks.fontStyle,t.defaults.global.defaultFontStyle),s=e.getValueOrDefault(this.options.ticks.fontFamily,t.defaults.global.defaultFontFamily),o=e.fontString(i,a,s);this.ctx.font=o;var n,r=this.ctx.measureText(this.ticks[0]).width,l=this.ctx.measureText(this.ticks[this.ticks.length-1]).width;if(this.labelRotation=0,this.paddingRight=0,this.paddingLeft=0,this.options.display&&this.isHorizontal()){this.paddingRight=l/2+3,this.paddingLeft=r/2+3,this.longestTextCache||(this.longestTextCache={});for(var h,c,d=e.longestText(this.ctx,o,this.ticks,this.longestTextCache),u=d,g=this.getPixelForTick(1)-this.getPixelForTick(0)-6;u>g&&this.labelRotation<this.options.ticks.maxRotation;){if(h=Math.cos(e.toRadians(this.labelRotation)),c=Math.sin(e.toRadians(this.labelRotation)),n=h*r,n+i/2>this.yLabelWidth&&(this.paddingLeft=n+i/2),this.paddingRight=i/2,c*d>this.maxHeight){this.labelRotation--;break}this.labelRotation++,u=h*d}}this.margins&&(this.paddingLeft=Math.max(this.paddingLeft-this.margins.left,0),this.paddingRight=Math.max(this.paddingRight-this.margins.right,0))},afterCalculateTickRotation:function(){e.callCallback(this.options.afterCalculateTickRotation,[this])},beforeFit:function(){e.callCallback(this.options.beforeFit,[this])},fit:function(){this.minSize={width:0,height:0};var i=e.getValueOrDefault(this.options.ticks.fontSize,t.defaults.global.defaultFontSize),a=e.getValueOrDefault(this.options.ticks.fontStyle,t.defaults.global.defaultFontStyle),s=e.getValueOrDefault(this.options.ticks.fontFamily,t.defaults.global.defaultFontFamily),o=e.fontString(i,a,s),n=e.getValueOrDefault(this.options.scaleLabel.fontSize,t.defaults.global.defaultFontSize),r=e.getValueOrDefault(this.options.scaleLabel.fontStyle,t.defaults.global.defaultFontStyle),l=e.getValueOrDefault(this.options.scaleLabel.fontFamily,t.defaults.global.defaultFontFamily);e.fontString(n,r,l);if(this.isHorizontal()?this.minSize.width=this.isFullWidth()?this.maxWidth-this.margins.left-this.margins.right:this.maxWidth:this.minSize.width=this.options.gridLines.display&&this.options.display?10:0,this.isHorizontal()?this.minSize.height=this.options.gridLines.display&&this.options.display?10:0:this.minSize.height=this.maxHeight,this.options.scaleLabel.display&&(this.isHorizontal()?this.minSize.height+=1.5*n:this.minSize.width+=1.5*n),this.options.ticks.display&&this.options.display){this.longestTextCache||(this.longestTextCache={});var h=e.longestText(this.ctx,o,this.ticks,this.longestTextCache);if(this.isHorizontal()){this.longestLabelWidth=h;var c=Math.sin(e.toRadians(this.labelRotation))*this.longestLabelWidth+1.5*i;this.minSize.height=Math.min(this.maxHeight,this.minSize.height+c),this.ctx.font=o;var d=this.ctx.measureText(this.ticks[0]).width,u=this.ctx.measureText(this.ticks[this.ticks.length-1]).width,g=Math.cos(e.toRadians(this.labelRotation)),f=Math.sin(e.toRadians(this.labelRotation));this.paddingLeft=0!==this.labelRotation?g*d+3:d/2+3,this.paddingRight=0!==this.labelRotation?f*(i/2)+3:u/2+3}else{var m=this.maxWidth-this.minSize.width;this.options.ticks.mirror||(h+=this.options.ticks.padding),m>h?this.minSize.width+=h:this.minSize.width=this.maxWidth,this.paddingTop=i/2,this.paddingBottom=i/2}}this.margins&&(this.paddingLeft=Math.max(this.paddingLeft-this.margins.left,0),this.paddingTop=Math.max(this.paddingTop-this.margins.top,0),this.paddingRight=Math.max(this.paddingRight-this.margins.right,0),this.paddingBottom=Math.max(this.paddingBottom-this.margins.bottom,0)),this.width=this.minSize.width,this.height=this.minSize.height},afterFit:function(){e.callCallback(this.options.afterFit,[this])},isHorizontal:function(){return"top"===this.options.position||"bottom"===this.options.position},isFullWidth:function(){return this.options.fullWidth},getRightValue:function i(t){return null===t||"undefined"==typeof t?NaN:"number"==typeof t&&isNaN(t)?NaN:"object"==typeof t?t instanceof Date?t:i(this.isHorizontal()?t.x:t.y):t},getLabelForIndex:e.noop,getPixelForValue:e.noop,getPixelForTick:function(t,e){if(this.isHorizontal()){var i=this.width-(this.paddingLeft+this.paddingRight),a=i/Math.max(this.ticks.length-(this.options.gridLines.offsetGridLines?0:1),1),s=a*t+this.paddingLeft;e&&(s+=a/2);var o=this.left+Math.round(s);return o+=this.isFullWidth()?this.margins.left:0}var n=this.height-(this.paddingTop+this.paddingBottom);return this.top+t*(n/(this.ticks.length-1))},getPixelForDecimal:function(t){if(this.isHorizontal()){var e=this.width-(this.paddingLeft+this.paddingRight),i=e*t+this.paddingLeft,a=this.left+Math.round(i);return a+=this.isFullWidth()?this.margins.left:0}return this.top+t*this.height},draw:function(i){if(this.options.display){var a,s,o,n,r,l=0!==this.labelRotation,h=this.options.ticks.autoSkip;this.options.ticks.maxTicksLimit&&(r=this.options.ticks.maxTicksLimit);var c=e.getValueOrDefault(this.options.ticks.fontColor,t.defaults.global.defaultFontColor),d=e.getValueOrDefault(this.options.ticks.fontSize,t.defaults.global.defaultFontSize),u=e.getValueOrDefault(this.options.ticks.fontStyle,t.defaults.global.defaultFontStyle),g=e.getValueOrDefault(this.options.ticks.fontFamily,t.defaults.global.defaultFontFamily),f=e.fontString(d,u,g),m=e.getValueOrDefault(this.options.scaleLabel.fontColor,t.defaults.global.defaultFontColor),p=e.getValueOrDefault(this.options.scaleLabel.fontSize,t.defaults.global.defaultFontSize),b=e.getValueOrDefault(this.options.scaleLabel.fontStyle,t.defaults.global.defaultFontStyle),x=e.getValueOrDefault(this.options.scaleLabel.fontFamily,t.defaults.global.defaultFontFamily),v=e.fontString(p,b,x),y=Math.cos(e.toRadians(this.labelRotation)),k=(Math.sin(e.toRadians(this.labelRotation)),this.longestLabelWidth*y);if(this.ctx.fillStyle=c,this.isHorizontal()){a=!0;var D="bottom"===this.options.position?this.top:this.bottom-10,S="bottom"===this.options.position?this.top+10:this.bottom;if(s=!1,(k/2+this.options.ticks.autoSkipPadding)*this.ticks.length>this.width-(this.paddingLeft+this.paddingRight)&&(s=1+Math.floor((k/2+this.options.ticks.autoSkipPadding)*this.ticks.length/(this.width-(this.paddingLeft+this.paddingRight)))),r&&this.ticks.length>r)for(;!s||this.ticks.length/(s||1)>r;)s||(s=1),s+=1;h||(s=!1),e.each(this.ticks,function(t,o){var n=this.ticks.length===o+1,r=s>1&&o%s>0||o%s===0&&o+s>this.ticks.length;if((!r||n)&&void 0!==t&&null!==t){var h=this.getPixelForTick(o),c=this.getPixelForTick(o,this.options.gridLines.offsetGridLines);this.options.gridLines.display&&(o===("undefined"!=typeof this.zeroLineIndex?this.zeroLineIndex:0)?(this.ctx.lineWidth=this.options.gridLines.zeroLineWidth,this.ctx.strokeStyle=this.options.gridLines.zeroLineColor,a=!0):a&&(this.ctx.lineWidth=this.options.gridLines.lineWidth,this.ctx.strokeStyle=this.options.gridLines.color,a=!1),h+=e.aliasPixel(this.ctx.lineWidth),this.ctx.beginPath(),this.options.gridLines.drawTicks&&(this.ctx.moveTo(h,D),this.ctx.lineTo(h,S)),this.options.gridLines.drawOnChartArea&&(this.ctx.moveTo(h,i.top),this.ctx.lineTo(h,i.bottom)),this.ctx.stroke()),this.options.ticks.display&&(this.ctx.save(),this.ctx.translate(c,l?this.top+12:"top"===this.options.position?this.bottom-10:this.top+10),this.ctx.rotate(-1*e.toRadians(this.labelRotation)),this.ctx.font=f,this.ctx.textAlign=l?"right":"center",this.ctx.textBaseline=l?"middle":"top"===this.options.position?"bottom":"top",this.ctx.fillText(t,0,0),this.ctx.restore())}},this),this.options.scaleLabel.display&&(this.ctx.textAlign="center",this.ctx.textBaseline="middle",this.ctx.fillStyle=m,this.ctx.font=v,o=this.left+(this.right-this.left)/2,n="bottom"===this.options.position?this.bottom-p/2:this.top+p/2,this.ctx.fillText(this.options.scaleLabel.labelString,o,n))}else{a=!0;var C="right"===this.options.position?this.left:this.right-5,w="right"===this.options.position?this.left+5:this.right;if(e.each(this.ticks,function(t,s){if(void 0!==t&&null!==t){var o=this.getPixelForTick(s);if(this.options.gridLines.display&&(s===("undefined"!=typeof this.zeroLineIndex?this.zeroLineIndex:0)?(this.ctx.lineWidth=this.options.gridLines.zeroLineWidth,this.ctx.strokeStyle=this.options.gridLines.zeroLineColor,a=!0):a&&(this.ctx.lineWidth=this.options.gridLines.lineWidth,this.ctx.strokeStyle=this.options.gridLines.color,a=!1),o+=e.aliasPixel(this.ctx.lineWidth),this.ctx.beginPath(),this.options.gridLines.drawTicks&&(this.ctx.moveTo(C,o),this.ctx.lineTo(w,o)),this.options.gridLines.drawOnChartArea&&(this.ctx.moveTo(i.left,o),this.ctx.lineTo(i.right,o)),this.ctx.stroke()),this.options.ticks.display){var n,r=this.getPixelForTick(s,this.options.gridLines.offsetGridLines);this.ctx.save(),"left"===this.options.position?this.options.ticks.mirror?(n=this.right+this.options.ticks.padding,this.ctx.textAlign="left"):(n=this.right-this.options.ticks.padding,this.ctx.textAlign="right"):this.options.ticks.mirror?(n=this.left-this.options.ticks.padding,this.ctx.textAlign="right"):(n=this.left+this.options.ticks.padding,this.ctx.textAlign="left"),this.ctx.translate(n,r),this.ctx.rotate(-1*e.toRadians(this.labelRotation)),this.ctx.font=f,this.ctx.textBaseline="middle",this.ctx.fillText(t,0,0),this.ctx.restore()}}},this),this.options.scaleLabel.display){o="left"===this.options.position?this.left+p/2:this.right-p/2,n=this.top+(this.bottom-this.top)/2;var _="left"===this.options.position?-.5*Math.PI:.5*Math.PI;this.ctx.save(),this.ctx.translate(o,n),this.ctx.rotate(_),this.ctx.textAlign="center",this.ctx.fillStyle=m,this.ctx.font=v,this.ctx.textBaseline="middle",this.ctx.fillText(this.options.scaleLabel.labelString,0,0),this.ctx.restore()}}this.ctx.lineWidth=this.options.gridLines.lineWidth,this.ctx.strokeStyle=this.options.gridLines.color;var A=this.left,I=this.right,M=this.top,F=this.bottom;this.isHorizontal()?(M=F="top"===this.options.position?this.bottom:this.top,M+=e.aliasPixel(this.ctx.lineWidth),F+=e.aliasPixel(this.ctx.lineWidth)):(A=I="left"===this.options.position?this.right:this.left,A+=e.aliasPixel(this.ctx.lineWidth),I+=e.aliasPixel(this.ctx.lineWidth)),this.ctx.beginPath(),this.ctx.moveTo(A,M),this.ctx.lineTo(I,F),this.ctx.stroke()}}})}},{}],30:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.scaleService={constructors:{},defaults:{},registerScaleType:function(t,i,a){this.constructors[t]=i,this.defaults[t]=e.clone(a)},getScaleConstructor:function(t){return this.constructors.hasOwnProperty(t)?this.constructors[t]:void 0},getScaleDefaults:function(i){return this.defaults.hasOwnProperty(i)?e.scaleMerge(t.defaults.scale,this.defaults[i]):{}},addScalesToLayout:function(i){e.each(i.scales,function(e){t.layoutService.addBox(i,e)})}}}},{}],31:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.defaults.global.title={display:!1,position:"top",fullWidth:!0,fontStyle:"bold",padding:10,text:""},t.Title=t.Element.extend({initialize:function(i){e.extend(this,i),this.options=e.configMerge(t.defaults.global.title,i.options),this.legendHitBoxes=[]},beforeUpdate:e.noop,update:function(t,e,i){return this.beforeUpdate(),this.maxWidth=t,this.maxHeight=e,this.margins=i,this.beforeSetDimensions(),this.setDimensions(),this.afterSetDimensions(),this.beforeBuildLabels(),this.buildLabels(),this.afterBuildLabels(),this.beforeFit(),this.fit(),this.afterFit(),this.afterUpdate(),this.minSize},afterUpdate:e.noop,beforeSetDimensions:e.noop,setDimensions:function(){this.isHorizontal()?(this.width=this.maxWidth,this.left=0,this.right=this.width):(this.height=this.maxHeight,this.top=0,this.bottom=this.height),this.paddingLeft=0,this.paddingTop=0,this.paddingRight=0,this.paddingBottom=0,this.minSize={width:0,height:0}},afterSetDimensions:e.noop,beforeBuildLabels:e.noop,buildLabels:e.noop,afterBuildLabels:e.noop,beforeFit:e.noop,fit:function(){var i=(this.ctx,e.getValueOrDefault(this.options.fontSize,t.defaults.global.defaultFontSize)),a=e.getValueOrDefault(this.options.fontStyle,t.defaults.global.defaultFontStyle),s=e.getValueOrDefault(this.options.fontFamily,t.defaults.global.defaultFontFamily);e.fontString(i,a,s);this.isHorizontal()?this.minSize.width=this.maxWidth:this.minSize.width=0,this.isHorizontal()?this.minSize.height=0:this.minSize.height=this.maxHeight,this.isHorizontal()?this.options.display&&(this.minSize.height+=i+2*this.options.padding):this.options.display&&(this.minSize.width+=i+2*this.options.padding),this.width=this.minSize.width,this.height=this.minSize.height},afterFit:e.noop,isHorizontal:function(){return"top"===this.options.position||"bottom"===this.options.position},draw:function(){if(this.options.display){var i,a,s=this.ctx,o=e.getValueOrDefault(this.options.fontColor,t.defaults.global.defaultFontColor),n=e.getValueOrDefault(this.options.fontSize,t.defaults.global.defaultFontSize),r=e.getValueOrDefault(this.options.fontStyle,t.defaults.global.defaultFontStyle),l=e.getValueOrDefault(this.options.fontFamily,t.defaults.global.defaultFontFamily),h=e.fontString(n,r,l);if(s.fillStyle=o,s.font=h,this.isHorizontal())s.textAlign="center",s.textBaseline="middle",i=this.left+(this.right-this.left)/2,a=this.top+(this.bottom-this.top)/2,s.fillText(this.options.text,i,a);else{i="left"===this.options.position?this.left+n/2:this.right-n/2,a=this.top+(this.bottom-this.top)/2;var c="left"===this.options.position?-.5*Math.PI:.5*Math.PI;s.save(),s.translate(i,a),s.rotate(c),s.textAlign="center",s.textBaseline="middle",s.fillText(this.options.text,0,0),s.restore()}}}})}},{}],32:[function(t,e,i){"use strict";e.exports=function(t){function e(t,e){return e&&(i.isArray(e)?t=t.concat(e):t.push(e)),t}var i=t.helpers;t.defaults.global.tooltips={enabled:!0,custom:null,mode:"single",backgroundColor:"rgba(0,0,0,0.8)",titleFontStyle:"bold",titleSpacing:2,titleMarginBottom:6,titleColor:"#fff",titleAlign:"left",bodySpacing:2,bodyColor:"#fff",bodyAlign:"left",footerFontStyle:"bold",footerSpacing:2,footerMarginTop:6,footerColor:"#fff",footerAlign:"left",yPadding:6,xPadding:6,yAlign:"center",xAlign:"center",caretSize:5,cornerRadius:6,multiKeyBackground:"#fff",callbacks:{beforeTitle:i.noop,title:function(t,e){var i="";return t.length>0&&(t[0].xLabel?i=t[0].xLabel:e.labels.length>0&&t[0].index<e.labels.length&&(i=e.labels[t[0].index])),i},afterTitle:i.noop,beforeBody:i.noop,beforeLabel:i.noop,label:function(t,e){var i=e.datasets[t.datasetIndex].label||"";return i+": "+t.yLabel},afterLabel:i.noop,afterBody:i.noop,beforeFooter:i.noop,footer:i.noop,afterFooter:i.noop}},t.Tooltip=t.Element.extend({initialize:function(){var e=this._options;i.extend(this,{_model:{xPadding:e.tooltips.xPadding,yPadding:e.tooltips.yPadding,xAlign:e.tooltips.yAlign,yAlign:e.tooltips.xAlign,bodyColor:e.tooltips.bodyColor,_bodyFontFamily:i.getValueOrDefault(e.tooltips.bodyFontFamily,t.defaults.global.defaultFontFamily),_bodyFontStyle:i.getValueOrDefault(e.tooltips.bodyFontStyle,t.defaults.global.defaultFontStyle),_bodyAlign:e.tooltips.bodyAlign,bodyFontSize:i.getValueOrDefault(e.tooltips.bodyFontSize,t.defaults.global.defaultFontSize),bodySpacing:e.tooltips.bodySpacing,titleColor:e.tooltips.titleColor,_titleFontFamily:i.getValueOrDefault(e.tooltips.titleFontFamily,t.defaults.global.defaultFontFamily),_titleFontStyle:i.getValueOrDefault(e.tooltips.titleFontStyle,t.defaults.global.defaultFontStyle),titleFontSize:i.getValueOrDefault(e.tooltips.titleFontSize,t.defaults.global.defaultFontSize),_titleAlign:e.tooltips.titleAlign,titleSpacing:e.tooltips.titleSpacing,titleMarginBottom:e.tooltips.titleMarginBottom,footerColor:e.tooltips.footerColor,_footerFontFamily:i.getValueOrDefault(e.tooltips.footerFontFamily,t.defaults.global.defaultFontFamily),_footerFontStyle:i.getValueOrDefault(e.tooltips.footerFontStyle,t.defaults.global.defaultFontStyle),footerFontSize:i.getValueOrDefault(e.tooltips.footerFontSize,t.defaults.global.defaultFontSize),_footerAlign:e.tooltips.footerAlign,footerSpacing:e.tooltips.footerSpacing,footerMarginTop:e.tooltips.footerMarginTop,caretSize:e.tooltips.caretSize,cornerRadius:e.tooltips.cornerRadius,backgroundColor:e.tooltips.backgroundColor,opacity:0,legendColorBackground:e.tooltips.multiKeyBackground}})},getTitle:function(){var t=this._options.tooltips.callbacks.beforeTitle.apply(this,arguments),i=this._options.tooltips.callbacks.title.apply(this,arguments),a=this._options.tooltips.callbacks.afterTitle.apply(this,arguments),s=[];return s=e(s,t),s=e(s,i),s=e(s,a)},getBeforeBody:function(){var t=this._options.tooltips.callbacks.beforeBody.apply(this,arguments);return i.isArray(t)?t:void 0!==t?[t]:[]},getBody:function(t,e){var a=[];return i.each(t,function(t){i.pushAllIfDefined(this._options.tooltips.callbacks.beforeLabel.call(this,t,e),a),i.pushAllIfDefined(this._options.tooltips.callbacks.label.call(this,t,e),a),i.pushAllIfDefined(this._options.tooltips.callbacks.afterLabel.call(this,t,e),a);
-},this),a},getAfterBody:function(){var t=this._options.tooltips.callbacks.afterBody.apply(this,arguments);return i.isArray(t)?t:void 0!==t?[t]:[]},getFooter:function(){var t=this._options.tooltips.callbacks.beforeFooter.apply(this,arguments),i=this._options.tooltips.callbacks.footer.apply(this,arguments),a=this._options.tooltips.callbacks.afterFooter.apply(this,arguments),s=[];return s=e(s,t),s=e(s,i),s=e(s,a)},getAveragePosition:function(t){if(!t.length)return!1;var e=[],a=[];i.each(t,function(t){if(t){var i=t.tooltipPosition();e.push(i.x),a.push(i.y)}});for(var s=0,o=0,n=0;n<e.length;n++)s+=e[n],o+=a[n];return{x:Math.round(s/e.length),y:Math.round(o/e.length)}},update:function(t){if(this._active.length){this._model.opacity=1;var e,a=this._active[0],s=[],o=[];if("single"===this._options.tooltips.mode){var n=a._yScale||a._scale;o.push({xLabel:a._xScale?a._xScale.getLabelForIndex(a._index,a._datasetIndex):"",yLabel:n?n.getLabelForIndex(a._index,a._datasetIndex):"",index:a._index,datasetIndex:a._datasetIndex}),e=this.getAveragePosition(this._active)}else i.each(this._data.datasets,function(t,e){if(i.isDatasetVisible(t)){var s=t.metaData[a._index];if(s){var n=a._yScale||a._scale;o.push({xLabel:s._xScale?s._xScale.getLabelForIndex(s._index,s._datasetIndex):"",yLabel:n?n.getLabelForIndex(s._index,s._datasetIndex):"",index:a._index,datasetIndex:e})}}},null,a._yScale.options.stacked),i.each(this._active,function(t){t&&s.push({borderColor:t._view.borderColor,backgroundColor:t._view.backgroundColor})},null,a._yScale.options.stacked),e=this.getAveragePosition(this._active),e.y=this._active[0]._yScale.getPixelForDecimal(.5);i.extend(this._model,{title:this.getTitle(o,this._data),beforeBody:this.getBeforeBody(o,this._data),body:this.getBody(o,this._data),afterBody:this.getAfterBody(o,this._data),footer:this.getFooter(o,this._data)}),i.extend(this._model,{x:Math.round(e.x),y:Math.round(e.y),caretPadding:i.getValueOrDefault(e.padding,2),labelColors:s});var r=this.getTooltipSize(this._model);this.determineAlignment(r),i.extend(this._model,this.getBackgroundPoint(this._model,r))}else this._model.opacity=0;return t&&this._options.tooltips.custom&&this._options.tooltips.custom.call(this,this._model),this},getTooltipSize:function(t){var e=this._chart.ctx,a={height:2*t.yPadding,width:0},s=t.body.length+t.beforeBody.length+t.afterBody.length;return a.height+=t.title.length*t.titleFontSize,a.height+=(t.title.length-1)*t.titleSpacing,a.height+=t.title.length?t.titleMarginBottom:0,a.height+=s*t.bodyFontSize,a.height+=s?(s-1)*t.bodySpacing:0,a.height+=t.footer.length?t.footerMarginTop:0,a.height+=t.footer.length*t.footerFontSize,a.height+=t.footer.length?(t.footer.length-1)*t.footerSpacing:0,e.font=i.fontString(t.titleFontSize,t._titleFontStyle,t._titleFontFamily),i.each(t.title,function(t){a.width=Math.max(a.width,e.measureText(t).width)}),e.font=i.fontString(t.bodyFontSize,t._bodyFontStyle,t._bodyFontFamily),i.each(t.beforeBody.concat(t.afterBody),function(t){a.width=Math.max(a.width,e.measureText(t).width)}),i.each(t.body,function(i){a.width=Math.max(a.width,e.measureText(i).width+("single"!==this._options.tooltips.mode?t.bodyFontSize+2:0))},this),e.font=i.fontString(t.footerFontSize,t._footerFontStyle,t._footerFontFamily),i.each(t.footer,function(t){a.width=Math.max(a.width,e.measureText(t).width)}),a.width+=2*t.xPadding,a},determineAlignment:function(t){this._model.y<t.height?this._model.yAlign="top":this._model.y>this._chart.height-t.height&&(this._model.yAlign="bottom");var e,i,a,s,o,n=this,r=(this._chartInstance.chartArea.left+this._chartInstance.chartArea.right)/2,l=(this._chartInstance.chartArea.top+this._chartInstance.chartArea.bottom)/2;"center"===this._model.yAlign?(e=function(t){return r>=t},i=function(t){return t>r}):(e=function(e){return e<=t.width/2},i=function(e){return e>=n._chart.width-t.width/2}),a=function(e){return e+t.width>n._chart.width},s=function(e){return e-t.width<0},o=function(t){return l>=t?"top":"bottom"},e(this._model.x)?(this._model.xAlign="left",a(this._model.x)&&(this._model.xAlign="center",this._model.yAlign=o(this._model.y))):i(this._model.x)&&(this._model.xAlign="right",s(this._model.x)&&(this._model.xAlign="center",this._model.yAlign=o(this._model.y)))},getBackgroundPoint:function(t,e){var i={x:t.x,y:t.y};return"right"===t.xAlign?i.x-=e.width:"center"===t.xAlign&&(i.x-=e.width/2),"top"===t.yAlign?i.y+=t.caretPadding+t.caretSize:"bottom"===t.yAlign?i.y-=e.height+t.caretPadding+t.caretSize:i.y-=e.height/2,"center"===t.yAlign?"left"===t.xAlign?i.x+=t.caretPadding+t.caretSize:"right"===t.xAlign&&(i.x-=t.caretPadding+t.caretSize):"left"===t.xAlign?i.x-=t.cornerRadius+t.caretPadding:"right"===t.xAlign&&(i.x+=t.cornerRadius+t.caretPadding),i},drawCaret:function(t,e,a,s){var o,n,r,l,h,c,d=this._view,u=this._chart.ctx;"center"===d.yAlign?("left"===d.xAlign?(o=t.x,n=o-d.caretSize,r=o):(o=t.x+e.width,n=o+d.caretSize,r=o),h=t.y+e.height/2,l=h-d.caretSize,c=h+d.caretSize):("left"===d.xAlign?(o=t.x+d.cornerRadius,n=o+d.caretSize,r=n+d.caretSize):"right"===d.xAlign?(o=t.x+e.width-d.cornerRadius,n=o-d.caretSize,r=n-d.caretSize):(n=t.x+e.width/2,o=n-d.caretSize,r=n+d.caretSize),"top"===d.yAlign?(l=t.y,h=l-d.caretSize,c=l):(l=t.y+e.height,h=l+d.caretSize,c=l));var g=i.color(d.backgroundColor);u.fillStyle=g.alpha(a*g.alpha()).rgbString(),u.beginPath(),u.moveTo(o,l),u.lineTo(n,h),u.lineTo(r,c),u.closePath(),u.fill()},drawTitle:function(t,e,a,s){if(e.title.length){a.textAlign=e._titleAlign,a.textBaseline="top";var o=i.color(e.titleColor);a.fillStyle=o.alpha(s*o.alpha()).rgbString(),a.font=i.fontString(e.titleFontSize,e._titleFontStyle,e._titleFontFamily),i.each(e.title,function(i,s){a.fillText(i,t.x,t.y),t.y+=e.titleFontSize+e.titleSpacing,s+1===e.title.length&&(t.y+=e.titleMarginBottom-e.titleSpacing)})}},drawBody:function(t,e,a,s){a.textAlign=e._bodyAlign,a.textBaseline="top";var o=i.color(e.bodyColor);a.fillStyle=o.alpha(s*o.alpha()).rgbString(),a.font=i.fontString(e.bodyFontSize,e._bodyFontStyle,e._bodyFontFamily),i.each(e.beforeBody,function(i){a.fillText(i,t.x,t.y),t.y+=e.bodyFontSize+e.bodySpacing}),i.each(e.body,function(o,n){"single"!==this._options.tooltips.mode&&(a.fillStyle=i.color(e.legendColorBackground).alpha(s).rgbaString(),a.fillRect(t.x,t.y,e.bodyFontSize,e.bodyFontSize),a.strokeStyle=i.color(e.labelColors[n].borderColor).alpha(s).rgbaString(),a.strokeRect(t.x,t.y,e.bodyFontSize,e.bodyFontSize),a.fillStyle=i.color(e.labelColors[n].backgroundColor).alpha(s).rgbaString(),a.fillRect(t.x+1,t.y+1,e.bodyFontSize-2,e.bodyFontSize-2),a.fillStyle=i.color(e.bodyColor).alpha(s).rgbaString()),a.fillText(o,t.x+("single"!==this._options.tooltips.mode?e.bodyFontSize+2:0),t.y),t.y+=e.bodyFontSize+e.bodySpacing},this),i.each(e.afterBody,function(i){a.fillText(i,t.x,t.y),t.y+=e.bodyFontSize}),t.y-=e.bodySpacing},drawFooter:function(t,e,a,s){if(e.footer.length){t.y+=e.footerMarginTop,a.textAlign=e._footerAlign,a.textBaseline="top";var o=i.color(e.footerColor);a.fillStyle=o.alpha(s*o.alpha()).rgbString(),a.font=i.fontString(e.footerFontSize,e._footerFontStyle,e._footerFontFamily),i.each(e.footer,function(i){a.fillText(i,t.x,t.y),t.y+=e.footerFontSize+e.footerSpacing})}},draw:function(){var t=this._chart.ctx,e=this._view;if(0!==e.opacity){var a=e.caretPadding,s=this.getTooltipSize(e),o={x:e.x,y:e.y},n=Math.abs(e.opacity<.001)?0:e.opacity;if(this._options.tooltips.enabled){var r=i.color(e.backgroundColor);t.fillStyle=r.alpha(n*r.alpha()).rgbString(),i.drawRoundedRectangle(t,o.x,o.y,s.width,s.height,e.cornerRadius),t.fill(),this.drawCaret(o,s,n,a),o.x+=e.xPadding,o.y+=e.yPadding,this.drawTitle(o,e,t,n),this.drawBody(o,e,t,n),this.drawFooter(o,e,t,n)}}}})}},{}],33:[function(t,e,i){"use strict";e.exports=function(t,e){var i=t.helpers;t.defaults.global.elements.arc={backgroundColor:t.defaults.global.defaultColor,borderColor:"#fff",borderWidth:2},t.elements.Arc=t.Element.extend({inLabelRange:function(t){var e=this._view;return e?Math.pow(t-e.x,2)<Math.pow(e.radius+e.hoverRadius,2):!1},inRange:function(t,e){var a=this._view;if(a){var s=i.getAngleFromPoint(a,{x:t,y:e}),o=a.startAngle<-.5*Math.PI?a.startAngle+2*Math.PI:a.startAngle>1.5*Math.PI?a.startAngle-2*Math.PI:a.startAngle,n=a.endAngle<-.5*Math.PI?a.endAngle+2*Math.PI:a.endAngle>1.5*Math.PI?a.endAngle-2*Math.PI:a.endAngle,r=s.angle>=o&&s.angle<=n,l=s.distance>=a.innerRadius&&s.distance<=a.outerRadius;return r&&l}return!1},tooltipPosition:function(){var t=this._view,e=t.startAngle+(t.endAngle-t.startAngle)/2,i=(t.outerRadius-t.innerRadius)/2+t.innerRadius;return{x:t.x+Math.cos(e)*i,y:t.y+Math.sin(e)*i}},draw:function(){var t=this._chart.ctx,e=this._view;t.beginPath(),t.arc(e.x,e.y,e.outerRadius,e.startAngle,e.endAngle),t.arc(e.x,e.y,e.innerRadius,e.endAngle,e.startAngle,!0),t.closePath(),t.strokeStyle=e.borderColor,t.lineWidth=e.borderWidth,t.fillStyle=e.backgroundColor,t.fill(),t.lineJoin="bevel",e.borderWidth&&t.stroke()}})}},{}],34:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.defaults.global.elements.line={tension:.4,backgroundColor:t.defaults.global.defaultColor,borderWidth:3,borderColor:t.defaults.global.defaultColor,borderCapStyle:"butt",borderDash:[],borderDashOffset:0,borderJoinStyle:"miter",fill:!0},t.elements.Line=t.Element.extend({lineToNextPoint:function(t,e,i,a,s){var o=this._chart.ctx;e._view.skip?a.call(this,t,e,i):t._view.skip?s.call(this,t,e,i):0===e._view.tension?o.lineTo(e._view.x,e._view.y):o.bezierCurveTo(t._view.controlPointNextX,t._view.controlPointNextY,e._view.controlPointPreviousX,e._view.controlPointPreviousY,e._view.x,e._view.y)},draw:function(){function i(t){n._view.skip||r._view.skip?t&&o.lineTo(a._view.scaleZero.x,a._view.scaleZero.y):o.bezierCurveTo(r._view.controlPointNextX,r._view.controlPointNextY,n._view.controlPointPreviousX,n._view.controlPointPreviousY,n._view.x,n._view.y)}var a=this,s=this._view,o=this._chart.ctx,n=this._children[0],r=this._children[this._children.length-1];o.save(),this._children.length>0&&s.fill&&(o.beginPath(),e.each(this._children,function(t,i){var a=e.previousItem(this._children,i),n=e.nextItem(this._children,i);0===i?(this._loop?o.moveTo(s.scaleZero.x,s.scaleZero.y):o.moveTo(t._view.x,s.scaleZero),t._view.skip?this._loop||o.moveTo(n._view.x,this._view.scaleZero):o.lineTo(t._view.x,t._view.y)):this.lineToNextPoint(a,t,n,function(t,e,i){this._loop?o.lineTo(this._view.scaleZero.x,this._view.scaleZero.y):(o.lineTo(t._view.x,this._view.scaleZero),o.moveTo(i._view.x,this._view.scaleZero))},function(t,e){o.lineTo(e._view.x,e._view.y)})},this),this._loop?i(!0):(o.lineTo(this._children[this._children.length-1]._view.x,s.scaleZero),o.lineTo(this._children[0]._view.x,s.scaleZero)),o.fillStyle=s.backgroundColor||t.defaults.global.defaultColor,o.closePath(),o.fill()),o.lineCap=s.borderCapStyle||t.defaults.global.elements.line.borderCapStyle,o.setLineDash&&o.setLineDash(s.borderDash||t.defaults.global.elements.line.borderDash),o.lineDashOffset=s.borderDashOffset||t.defaults.global.elements.line.borderDashOffset,o.lineJoin=s.borderJoinStyle||t.defaults.global.elements.line.borderJoinStyle,o.lineWidth=s.borderWidth||t.defaults.global.elements.line.borderWidth,o.strokeStyle=s.borderColor||t.defaults.global.defaultColor,o.beginPath(),e.each(this._children,function(t,i){var a=e.previousItem(this._children,i),s=e.nextItem(this._children,i);0===i?o.moveTo(t._view.x,t._view.y):this.lineToNextPoint(a,t,s,function(t,e,i){o.moveTo(i._view.x,i._view.y)},function(t,e){o.moveTo(e._view.x,e._view.y)})},this),this._loop&&this._children.length>0&&i(),o.stroke(),o.restore()}})}},{}],35:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.defaults.global.elements.point={radius:3,pointStyle:"circle",backgroundColor:t.defaults.global.defaultColor,borderWidth:1,borderColor:t.defaults.global.defaultColor,hitRadius:1,hoverRadius:4,hoverBorderWidth:1},t.elements.Point=t.Element.extend({inRange:function(t,e){var i=this._view;if(i){var a=i.hitRadius+i.radius;return Math.pow(t-i.x,2)+Math.pow(e-i.y,2)<Math.pow(a,2)}return!1},inLabelRange:function(t){var e=this._view;return e?Math.pow(t-e.x,2)<Math.pow(e.radius+e.hitRadius,2):!1},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y,padding:t.radius+t.borderWidth}},draw:function(){var i=this._view,a=this._chart.ctx;if(!i.skip){if("object"==typeof i.pointStyle&&("[object HTMLImageElement]"===i.pointStyle.toString()||"[object HTMLCanvasElement]"===i.pointStyle.toString()))return void a.drawImage(i.pointStyle,i.x-i.pointStyle.width/2,i.y-i.pointStyle.height/2);if(!isNaN(i.radius)&&i.radius>0){a.strokeStyle=i.borderColor||t.defaults.global.defaultColor,a.lineWidth=e.getValueOrDefault(i.borderWidth,t.defaults.global.elements.point.borderWidth),a.fillStyle=i.backgroundColor||t.defaults.global.defaultColor;var s,o,n=i.radius;switch(i.pointStyle){default:a.beginPath(),a.arc(i.x,i.y,n,0,2*Math.PI),a.closePath(),a.fill();break;case"triangle":a.beginPath();var r=3*n/Math.sqrt(3),l=r*Math.sqrt(3)/2;a.moveTo(i.x-r/2,i.y+l/3),a.lineTo(i.x+r/2,i.y+l/3),a.lineTo(i.x,i.y-2*l/3),a.closePath(),a.fill();break;case"rect":a.fillRect(i.x-1/Math.SQRT2*n,i.y-1/Math.SQRT2*n,2/Math.SQRT2*n,2/Math.SQRT2*n),a.strokeRect(i.x-1/Math.SQRT2*n,i.y-1/Math.SQRT2*n,2/Math.SQRT2*n,2/Math.SQRT2*n);break;case"rectRot":a.translate(i.x,i.y),a.rotate(Math.PI/4),a.fillRect(-1/Math.SQRT2*n,-1/Math.SQRT2*n,2/Math.SQRT2*n,2/Math.SQRT2*n),a.strokeRect(-1/Math.SQRT2*n,-1/Math.SQRT2*n,2/Math.SQRT2*n,2/Math.SQRT2*n),a.setTransform(1,0,0,1,0,0);break;case"cross":a.beginPath(),a.moveTo(i.x,i.y+n),a.lineTo(i.x,i.y-n),a.moveTo(i.x-n,i.y),a.lineTo(i.x+n,i.y),a.closePath();break;case"crossRot":a.beginPath(),s=Math.cos(Math.PI/4)*n,o=Math.sin(Math.PI/4)*n,a.moveTo(i.x-s,i.y-o),a.lineTo(i.x+s,i.y+o),a.moveTo(i.x-s,i.y+o),a.lineTo(i.x+s,i.y-o),a.closePath();break;case"star":a.beginPath(),a.moveTo(i.x,i.y+n),a.lineTo(i.x,i.y-n),a.moveTo(i.x-n,i.y),a.lineTo(i.x+n,i.y),s=Math.cos(Math.PI/4)*n,o=Math.sin(Math.PI/4)*n,a.moveTo(i.x-s,i.y-o),a.lineTo(i.x+s,i.y+o),a.moveTo(i.x-s,i.y+o),a.lineTo(i.x+s,i.y-o),a.closePath();break;case"line":a.beginPath(),a.moveTo(i.x-n,i.y),a.lineTo(i.x+n,i.y),a.closePath();break;case"dash":a.beginPath(),a.moveTo(i.x,i.y),a.lineTo(i.x+n,i.y),a.closePath()}a.stroke()}}}})}},{}],36:[function(t,e,i){"use strict";e.exports=function(t){t.helpers;t.defaults.global.elements.rectangle={backgroundColor:t.defaults.global.defaultColor,borderWidth:0,borderColor:t.defaults.global.defaultColor,borderSkipped:"bottom"},t.elements.Rectangle=t.Element.extend({draw:function(){function t(t){return l[(c+t)%4]}var e=this._chart.ctx,i=this._view,a=i.width/2,s=i.x-a,o=i.x+a,n=i.base-(i.base-i.y),r=i.borderWidth/2;i.borderWidth&&(s+=r,o-=r,n+=r),e.beginPath(),e.fillStyle=i.backgroundColor,e.strokeStyle=i.borderColor,e.lineWidth=i.borderWidth;var l=[[s,i.base],[s,n],[o,n],[o,i.base]],h=["bottom","left","top","right"],c=h.indexOf(i.borderSkipped,0);-1===c&&(c=0),e.moveTo.apply(e,t(0));for(var d=1;4>d;d++)e.lineTo.apply(e,t(d));e.fill(),i.borderWidth&&e.stroke()},height:function(){var t=this._view;return t.base-t.y},inRange:function(t,e){var i=this._view,a=!1;return i&&(a=i.y<i.base?t>=i.x-i.width/2&&t<=i.x+i.width/2&&e>=i.y&&e<=i.base:t>=i.x-i.width/2&&t<=i.x+i.width/2&&e>=i.base&&e<=i.y),a},inLabelRange:function(t){var e=this._view;return e?t>=e.x-e.width/2&&t<=e.x+e.width/2:!1},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y}}})}},{}],37:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers,i={position:"bottom"},a=t.Scale.extend({buildTicks:function(t){this.startIndex=0,this.endIndex=this.chart.data.labels.length;var i;void 0!==this.options.ticks.min&&(i=e.indexOf(this.chart.data.labels,this.options.ticks.min),this.startIndex=-1!==i?i:this.startIndex),void 0!==this.options.ticks.max&&(i=e.indexOf(this.chart.data.labels,this.options.ticks.max),this.endIndex=-1!==i?i:this.endIndex),this.ticks=0===this.startIndex&&this.endIndex===this.chart.data.labels.length?this.chart.data.labels:this.chart.data.labels.slice(this.startIndex,this.endIndex+1)},getLabelForIndex:function(t,e){return this.ticks[t]},getPixelForValue:function(t,e,i,a){var s=Math.max(this.ticks.length-(this.options.gridLines.offsetGridLines?0:1),1);if(this.isHorizontal()){var o=this.width-(this.paddingLeft+this.paddingRight),n=o/s,r=n*(e-this.startIndex)+this.paddingLeft;return this.options.gridLines.offsetGridLines&&a&&(r+=n/2),this.left+Math.round(r)}var l=this.height-(this.paddingTop+this.paddingBottom),h=l/s,c=h*(e-this.startIndex)+this.paddingTop;return this.options.gridLines.offsetGridLines&&a&&(c+=h/2),this.top+Math.round(c)},getPixelForTick:function(t,e){return this.getPixelForValue(this.ticks[t],t+this.startIndex,null,e)}});t.scaleService.registerScaleType("category",a,i)}},{}],38:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers,i={position:"left",ticks:{callback:function(t,i,a){var s=a[1]-a[0];Math.abs(s)>1&&t!==Math.floor(t)&&(s=t-Math.floor(t));var o=e.log10(Math.abs(s)),n="";if(0!==t){var r=-1*Math.floor(o);r=Math.max(Math.min(r,20),0),n=t.toFixed(r)}else n="0";return n}}},a=t.Scale.extend({determineDataLimits:function(){if(this.min=null,this.max=null,this.options.stacked){var t={},i=!1,a=!1;e.each(this.chart.data.datasets,function(s){void 0===t[s.type]&&(t[s.type]={positiveValues:[],negativeValues:[]});var o=t[s.type].positiveValues,n=t[s.type].negativeValues;e.isDatasetVisible(s)&&(this.isHorizontal()?s.xAxisID===this.id:s.yAxisID===this.id)&&e.each(s.data,function(t,e){var s=+this.getRightValue(t);isNaN(s)||(o[e]=o[e]||0,n[e]=n[e]||0,this.options.relativePoints?o[e]=100:0>s?(a=!0,n[e]+=s):(i=!0,o[e]+=s))},this)},this),e.each(t,function(t){var i=t.positiveValues.concat(t.negativeValues),a=e.min(i),s=e.max(i);this.min=null===this.min?a:Math.min(this.min,a),this.max=null===this.max?s:Math.max(this.max,s)},this)}else e.each(this.chart.data.datasets,function(t){e.isDatasetVisible(t)&&(this.isHorizontal()?t.xAxisID===this.id:t.yAxisID===this.id)&&e.each(t.data,function(t,e){var i=+this.getRightValue(t);isNaN(i)||(null===this.min?this.min=i:i<this.min&&(this.min=i),null===this.max?this.max=i:i>this.max&&(this.max=i))},this)},this);if(this.options.ticks.beginAtZero){var s=e.sign(this.min),o=e.sign(this.max);0>s&&0>o?this.max=0:s>0&&o>0&&(this.min=0)}void 0!==this.options.ticks.min?this.min=this.options.ticks.min:void 0!==this.options.ticks.suggestedMin&&(this.min=Math.min(this.min,this.options.ticks.suggestedMin)),void 0!==this.options.ticks.max?this.max=this.options.ticks.max:void 0!==this.options.ticks.suggestedMax&&(this.max=Math.max(this.max,this.options.ticks.suggestedMax)),this.min===this.max&&(this.min--,this.max++)},buildTicks:function(){this.ticks=[];var i;if(this.isHorizontal())i=Math.min(this.options.ticks.maxTicksLimit?this.options.ticks.maxTicksLimit:11,Math.ceil(this.width/50));else{var a=e.getValueOrDefault(this.options.ticks.fontSize,t.defaults.global.defaultFontSize);i=Math.min(this.options.ticks.maxTicksLimit?this.options.ticks.maxTicksLimit:11,Math.ceil(this.height/(2*a)))}i=Math.max(2,i);var s,o=this.options.ticks.fixedStepSize&&this.options.ticks.fixedStepSize>0||this.options.ticks.stepSize&&this.options.ticks.stepSize>0;if(o)s=e.getValueOrDefault(this.options.ticks.fixedStepSize,this.options.ticks.stepSize);else{var n=e.niceNum(this.max-this.min,!1);s=e.niceNum(n/(i-1),!0)}var r=Math.floor(this.min/s)*s,l=Math.ceil(this.max/s)*s,h=(l-r)/s;h=e.almostEquals(h,Math.round(h),s/1e3)?Math.round(h):Math.ceil(h),this.ticks.push(void 0!==this.options.ticks.min?this.options.ticks.min:r);for(var c=1;h>c;++c)this.ticks.push(r+c*s);this.ticks.push(void 0!==this.options.ticks.max?this.options.ticks.max:l),("left"===this.options.position||"right"===this.options.position)&&this.ticks.reverse(),this.max=e.max(this.ticks),this.min=e.min(this.ticks),this.options.ticks.reverse?(this.ticks.reverse(),this.start=this.max,this.end=this.min):(this.start=this.min,this.end=this.max)},getLabelForIndex:function(t,e){return+this.getRightValue(this.chart.data.datasets[e].data[t])},convertTicksToLabels:function(){this.ticksAsNumbers=this.ticks.slice(),this.zeroLineIndex=this.ticks.indexOf(0),t.Scale.prototype.convertTicksToLabels.call(this)},getPixelForValue:function(t,e,i,a){var s,o=+this.getRightValue(t),n=this.end-this.start;if(this.isHorizontal()){var r=this.width-(this.paddingLeft+this.paddingRight);return s=this.left+r/n*(o-this.start),Math.round(s+this.paddingLeft)}var l=this.height-(this.paddingTop+this.paddingBottom);return s=this.bottom-this.paddingBottom-l/n*(o-this.start),Math.round(s)},getPixelForTick:function(t,e){return this.getPixelForValue(this.ticksAsNumbers[t],null,null,e)}});t.scaleService.registerScaleType("linear",a,i)}},{}],39:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers,i={position:"left",ticks:{callback:function(e,i,a){var s=e/Math.pow(10,Math.floor(t.helpers.log10(e)));return 1===s||2===s||5===s||0===i||i===a.length-1?e.toExponential():""}}},a=t.Scale.extend({determineDataLimits:function(){if(this.min=null,this.max=null,this.options.stacked){var t={};e.each(this.chart.data.datasets,function(i){e.isDatasetVisible(i)&&(this.isHorizontal()?i.xAxisID===this.id:i.yAxisID===this.id)&&(void 0===t[i.type]&&(t[i.type]=[]),e.each(i.data,function(e,a){var s=t[i.type],o=+this.getRightValue(e);isNaN(o)||(s[a]=s[a]||0,this.options.relativePoints?s[a]=100:s[a]+=o)},this))},this),e.each(t,function(t){var i=e.min(t),a=e.max(t);this.min=null===this.min?i:Math.min(this.min,i),this.max=null===this.max?a:Math.max(this.max,a)},this)}else e.each(this.chart.data.datasets,function(t){e.isDatasetVisible(t)&&(this.isHorizontal()?t.xAxisID===this.id:t.yAxisID===this.id)&&e.each(t.data,function(t,e){var i=+this.getRightValue(t);isNaN(i)||(null===this.min?this.min=i:i<this.min&&(this.min=i),null===this.max?this.max=i:i>this.max&&(this.max=i))},this)},this);this.min=void 0!==this.options.ticks.min?this.options.ticks.min:this.min,this.max=void 0!==this.options.ticks.max?this.options.ticks.max:this.max,this.min===this.max&&(0!==this.min&&null!==this.min?(this.min=Math.pow(10,Math.floor(e.log10(this.min))-1),this.max=Math.pow(10,Math.floor(e.log10(this.max))+1)):(this.min=1,this.max=10))},buildTicks:function(){this.ticks=[];for(var t=void 0!==this.options.ticks.min?this.options.ticks.min:Math.pow(10,Math.floor(e.log10(this.min)));t<this.max;){this.ticks.push(t);var i=Math.floor(e.log10(t)),a=Math.floor(t/Math.pow(10,i))+1;10===a&&(a=1,++i),t=a*Math.pow(10,i)}var s=void 0!==this.options.ticks.max?this.options.ticks.max:t;this.ticks.push(s),("left"===this.options.position||"right"===this.options.position)&&this.ticks.reverse(),this.max=e.max(this.ticks),this.min=e.min(this.ticks),this.options.ticks.reverse?(this.ticks.reverse(),this.start=this.max,this.end=this.min):(this.start=this.min,this.end=this.max)},convertTicksToLabels:function(){this.tickValues=this.ticks.slice(),t.Scale.prototype.convertTicksToLabels.call(this)},getLabelForIndex:function(t,e){return+this.getRightValue(this.chart.data.datasets[e].data[t])},getPixelForTick:function(t,e){return this.getPixelForValue(this.tickValues[t],null,null,e)},getPixelForValue:function(t,i,a,s){var o,n=+this.getRightValue(t),r=e.log10(this.end)-e.log10(this.start);if(this.isHorizontal())if(0===n)o=this.left+this.paddingLeft;else{var l=this.width-(this.paddingLeft+this.paddingRight);o=this.left+l/r*(e.log10(n)-e.log10(this.start)),o+=this.paddingLeft}else if(0===n)o=this.top+this.paddingTop;else{var h=this.height-(this.paddingTop+this.paddingBottom);o=this.bottom-this.paddingBottom-h/r*(e.log10(n)-e.log10(this.start))}return o}});t.scaleService.registerScaleType("logarithmic",a,i)}},{}],40:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers,i={display:!0,animate:!0,lineArc:!1,position:"chartArea",angleLines:{display:!0,color:"rgba(0, 0, 0, 0.1)",lineWidth:1},ticks:{showLabelBackdrop:!0,backdropColor:"rgba(255,255,255,0.75)",backdropPaddingY:2,backdropPaddingX:2},pointLabels:{fontSize:10,callback:function(t){return t}}},a=t.Scale.extend({getValueCount:function(){return this.chart.data.labels.length},setDimensions:function(){this.width=this.maxWidth,this.height=this.maxHeight,this.xCenter=Math.round(this.width/2),this.yCenter=Math.round(this.height/2);var i=e.min([this.height,this.width]),a=e.getValueOrDefault(this.options.ticks.fontSize,t.defaults.global.defaultFontSize);this.drawingArea=this.options.display?i/2-(a/2+this.options.ticks.backdropPaddingY):i/2},determineDataLimits:function(){if(this.min=null,this.max=null,e.each(this.chart.data.datasets,function(t){e.isDatasetVisible(t)&&e.each(t.data,function(t,e){var i=+this.getRightValue(t);isNaN(i)||(null===this.min?this.min=i:i<this.min&&(this.min=i),null===this.max?this.max=i:i>this.max&&(this.max=i))},this)},this),this.options.ticks.beginAtZero){var t=e.sign(this.min),i=e.sign(this.max);0>t&&0>i?this.max=0:t>0&&i>0&&(this.min=0)}void 0!==this.options.ticks.min?this.min=this.options.ticks.min:void 0!==this.options.ticks.suggestedMin&&(this.min=Math.min(this.min,this.options.ticks.suggestedMin)),void 0!==this.options.ticks.max?this.max=this.options.ticks.max:void 0!==this.options.ticks.suggestedMax&&(this.max=Math.max(this.max,this.options.ticks.suggestedMax)),this.min===this.max&&(this.min--,this.max++)},buildTicks:function(){this.ticks=[];var i=e.getValueOrDefault(this.options.ticks.fontSize,t.defaults.global.defaultFontSize),a=Math.min(this.options.ticks.maxTicksLimit?this.options.ticks.maxTicksLimit:11,Math.ceil(this.drawingArea/(1.5*i)));a=Math.max(2,a);var s=e.niceNum(this.max-this.min,!1),o=e.niceNum(s/(a-1),!0),n=Math.floor(this.min/o)*o,r=Math.ceil(this.max/o)*o,l=Math.ceil((r-n)/o);this.ticks.push(void 0!==this.options.ticks.min?this.options.ticks.min:n);for(var h=1;l>h;++h)this.ticks.push(n+h*o);this.ticks.push(void 0!==this.options.ticks.max?this.options.ticks.max:r),this.max=e.max(this.ticks),this.min=e.min(this.ticks),this.options.ticks.reverse?(this.ticks.reverse(),this.start=this.max,this.end=this.min):(this.start=this.min,this.end=this.max),this.zeroLineIndex=this.ticks.indexOf(0)},convertTicksToLabels:function(){t.Scale.prototype.convertTicksToLabels.call(this),this.pointLabels=this.chart.data.labels.map(this.options.pointLabels.callback,this)},getLabelForIndex:function(t,e){return+this.getRightValue(this.chart.data.datasets[e].data[t])},fit:function(){var i,a,s,o,n,r,l,h,c,d,u,g,f=e.getValueOrDefault(this.options.pointLabels.fontSize,t.defaults.global.defaultFontSize),m=e.getValueOrDefault(this.options.pointLabels.fontStyle,t.defaults.global.defaultFontStyle),p=e.getValueOrDefault(this.options.pointLabels.fontFamily,t.defaults.global.defaultFontFamily),b=e.fontString(f,m,p),x=e.min([this.height/2-f-5,this.width/2]),v=this.width,y=0;for(this.ctx.font=b,a=0;a<this.getValueCount();a++)i=this.getPointPosition(a,x),s=this.ctx.measureText(this.pointLabels[a]?this.pointLabels[a]:"").width+5,0===a||a===this.getValueCount()/2?(o=s/2,i.x+o>v&&(v=i.x+o,n=a),i.x-o<y&&(y=i.x-o,l=a)):a<this.getValueCount()/2?i.x+s>v&&(v=i.x+s,n=a):a>this.getValueCount()/2&&i.x-s<y&&(y=i.x-s,l=a);c=y,d=Math.ceil(v-this.width),r=this.getIndexAngle(n),h=this.getIndexAngle(l),u=d/Math.sin(r+Math.PI/2),g=c/Math.sin(h+Math.PI/2),u=e.isNumber(u)?u:0,g=e.isNumber(g)?g:0,this.drawingArea=Math.round(x-(g+u)/2),this.setCenterPoint(g,u)},setCenterPoint:function(t,e){var i=this.width-e-this.drawingArea,a=t+this.drawingArea;this.xCenter=Math.round((a+i)/2+this.left),this.yCenter=Math.round(this.height/2+this.top)},getIndexAngle:function(t){var e=2*Math.PI/this.getValueCount();return t*e-Math.PI/2},getDistanceFromCenterForValue:function(t){if(null===t)return 0;var e=this.drawingArea/(this.max-this.min);return this.options.reverse?(this.max-t)*e:(t-this.min)*e},getPointPosition:function(t,e){var i=this.getIndexAngle(t);return{x:Math.round(Math.cos(i)*e)+this.xCenter,y:Math.round(Math.sin(i)*e)+this.yCenter}},getPointPositionForValue:function(t,e){return this.getPointPosition(t,this.getDistanceFromCenterForValue(e))},draw:function(){if(this.options.display){var i=this.ctx;if(e.each(this.ticks,function(a,s){if(s>0||this.options.reverse){var o=this.getDistanceFromCenterForValue(this.ticks[s]),n=this.yCenter-o;if(this.options.gridLines.display)if(i.strokeStyle=this.options.gridLines.color,i.lineWidth=this.options.gridLines.lineWidth,this.options.lineArc)i.beginPath(),i.arc(this.xCenter,this.yCenter,o,0,2*Math.PI),i.closePath(),i.stroke();else{i.beginPath();for(var r=0;r<this.getValueCount();r++){var l=this.getPointPosition(r,this.getDistanceFromCenterForValue(this.ticks[s]));0===r?i.moveTo(l.x,l.y):i.lineTo(l.x,l.y)}i.closePath(),i.stroke()}if(this.options.ticks.display){var h=e.getValueOrDefault(this.options.ticks.fontColor,t.defaults.global.defaultFontColor),c=e.getValueOrDefault(this.options.ticks.fontSize,t.defaults.global.defaultFontSize),d=e.getValueOrDefault(this.options.ticks.fontStyle,t.defaults.global.defaultFontStyle),u=e.getValueOrDefault(this.options.ticks.fontFamily,t.defaults.global.defaultFontFamily),g=e.fontString(c,d,u);if(i.font=g,this.options.ticks.showLabelBackdrop){var f=i.measureText(a).width;i.fillStyle=this.options.ticks.backdropColor,i.fillRect(this.xCenter-f/2-this.options.ticks.backdropPaddingX,n-c/2-this.options.ticks.backdropPaddingY,f+2*this.options.ticks.backdropPaddingX,c+2*this.options.ticks.backdropPaddingY)}i.textAlign="center",i.textBaseline="middle",i.fillStyle=h,i.fillText(a,this.xCenter,n)}}},this),!this.options.lineArc){i.lineWidth=this.options.angleLines.lineWidth,i.strokeStyle=this.options.angleLines.color;for(var a=this.getValueCount()-1;a>=0;a--){if(this.options.angleLines.display){var s=this.getPointPosition(a,this.getDistanceFromCenterForValue(this.options.reverse?this.min:this.max));i.beginPath(),i.moveTo(this.xCenter,this.yCenter),i.lineTo(s.x,s.y),i.stroke(),i.closePath()}var o=this.getPointPosition(a,this.getDistanceFromCenterForValue(this.options.reverse?this.min:this.max)+5),n=e.getValueOrDefault(this.options.pointLabels.fontColor,t.defaults.global.defaultFontColor),r=e.getValueOrDefault(this.options.pointLabels.fontSize,t.defaults.global.defaultFontSize),l=e.getValueOrDefault(this.options.pointLabels.fontStyle,t.defaults.global.defaultFontStyle),h=e.getValueOrDefault(this.options.pointLabels.fontFamily,t.defaults.global.defaultFontFamily),c=e.fontString(r,l,h);i.font=c,i.fillStyle=n;var d=this.pointLabels.length,u=this.pointLabels.length/2,g=u/2,f=g>a||a>d-g,m=a===g||a===d-g;0===a?i.textAlign="center":a===u?i.textAlign="center":u>a?i.textAlign="left":i.textAlign="right",m?i.textBaseline="middle":f?i.textBaseline="bottom":i.textBaseline="top",i.fillText(this.pointLabels[a]?this.pointLabels[a]:"",o.x,o.y)}}}}});t.scaleService.registerScaleType("radialLinear",a,i)}},{}],41:[function(t,e,i){"use strict";var a=t("moment");a="function"==typeof a?a:window.moment,e.exports=function(t){var e=t.helpers,i={units:[{name:"millisecond",steps:[1,2,5,10,20,50,100,250,500]},{name:"second",steps:[1,2,5,10,30]},{name:"minute",steps:[1,2,5,10,30]},{name:"hour",steps:[1,2,3,6,12]},{name:"day",steps:[1,2,5]},{name:"week",maxStep:4},{name:"month",maxStep:3},{name:"quarter",maxStep:4},{name:"year",maxStep:!1}]},s={position:"bottom",time:{parser:!1,format:!1,unit:!1,round:!1,displayFormat:!1,displayFormats:{millisecond:"h:mm:ss.SSS a",second:"h:mm:ss a",minute:"h:mm:ss a",hour:"MMM D, hA",day:"ll",week:"ll",month:"MMM YYYY",quarter:"[Q]Q - YYYY",year:"YYYY"}},ticks:{autoSkip:!1}},o=t.Scale.extend({initialize:function(){if(!a)throw new Error("Chart.js - Moment.js could not be found! You must include it before Chart.js to use the time scale. Download at https://momentjs.com");t.Scale.prototype.initialize.call(this)},getLabelMoment:function(t,e){return this.labelMoments[t][e]},determineDataLimits:function(){this.labelMoments=[];var t=[];this.chart.data.labels&&this.chart.data.labels.length>0?(e.each(this.chart.data.labels,function(e,i){var a=this.parseTime(e);this.options.time.round&&a.startOf(this.options.time.round),
-t.push(a)},this),this.firstTick=a.min.call(this,t),this.lastTick=a.max.call(this,t)):(this.firstTick=null,this.lastTick=null),e.each(this.chart.data.datasets,function(i,s){var o=[];"object"==typeof i.data[0]?e.each(i.data,function(t,e){var i=this.parseTime(this.getRightValue(t));this.options.time.round&&i.startOf(this.options.time.round),o.push(i),this.firstTick=null!==this.firstTick?a.min(this.firstTick,i):i,this.lastTick=null!==this.lastTick?a.max(this.lastTick,i):i},this):o=t,this.labelMoments.push(o)},this),this.options.time.min&&(this.firstTick=this.parseTime(this.options.time.min)),this.options.time.max&&(this.lastTick=this.parseTime(this.options.time.max)),this.firstTick=(this.firstTick||a()).clone(),this.lastTick=(this.lastTick||a()).clone()},buildTicks:function(a){if(this.ticks=[],this.unitScale=1,this.scaleSizeInUnits=0,this.options.time.unit)this.tickUnit=this.options.time.unit||"day",this.displayFormat=this.options.time.displayFormats[this.tickUnit],this.scaleSizeInUnits=this.lastTick.diff(this.firstTick,this.tickUnit,!0),this.unitScale=e.getValueOrDefault(this.options.time.unitStepSize,1);else{var s=e.getValueOrDefault(this.options.ticks.fontSize,t.defaults.global.defaultFontSize),o=this.isHorizontal()?this.width-(this.paddingLeft+this.paddingRight):this.height-(this.paddingTop+this.paddingBottom),n=this.tickFormatFunction(this.firstTick,0,[]),r=n.length*s,l=Math.cos(e.toRadians(this.options.ticks.maxRotation)),h=Math.sin(e.toRadians(this.options.ticks.maxRotation));r=r*l+s*h;var c=o/(r+10);this.tickUnit="millisecond",this.scaleSizeInUnits=this.lastTick.diff(this.firstTick,this.tickUnit,!0),this.displayFormat=this.options.time.displayFormats[this.tickUnit];for(var d=0,u=i.units[d];d<i.units.length;){if(this.unitScale=1,e.isArray(u.steps)&&Math.ceil(this.scaleSizeInUnits/c)<e.max(u.steps)){for(var g=0;g<u.steps.length;++g)if(u.steps[g]>Math.ceil(this.scaleSizeInUnits/c)){this.unitScale=e.getValueOrDefault(this.options.time.unitStepSize,u.steps[g]);break}break}if(u.maxStep===!1||Math.ceil(this.scaleSizeInUnits/c)<u.maxStep){this.unitScale=e.getValueOrDefault(this.options.time.unitStepSize,Math.ceil(this.scaleSizeInUnits/c));break}++d,u=i.units[d],this.tickUnit=u.name,this.scaleSizeInUnits=this.lastTick.diff(this.firstTick,this.tickUnit,!0),this.displayFormat=this.options.time.displayFormats[u.name]}}var f;this.options.time.min?f=this.firstTick.clone().startOf(this.tickUnit):(this.firstTick.startOf(this.tickUnit),f=this.firstTick),this.options.time.max||this.lastTick.endOf(this.tickUnit),this.smallestLabelSeparation=this.width,e.each(this.chart.data.datasets,function(t,e){for(var i=1;i<this.labelMoments[e].length;i++)this.smallestLabelSeparation=Math.min(this.smallestLabelSeparation,this.labelMoments[e][i].diff(this.labelMoments[e][i-1],this.tickUnit,!0))},this),this.options.time.displayFormat&&(this.displayFormat=this.options.time.displayFormat),this.ticks.push(this.firstTick.clone());for(var m=1;m<this.scaleSizeInUnits;++m){var p=f.clone().add(m,this.tickUnit);if(this.options.time.max&&p.diff(this.lastTick,this.tickUnit,!0)>=0)break;m%this.unitScale===0&&this.ticks.push(p)}(0!==this.ticks[this.ticks.length-1].diff(this.lastTick,this.tickUnit)||0===this.scaleSizeInUnits)&&(this.options.time.max?(this.ticks.push(this.lastTick.clone()),this.scaleSizeInUnits=this.lastTick.diff(this.ticks[0],this.tickUnit,!0)):(this.scaleSizeInUnits=Math.ceil(this.scaleSizeInUnits/this.unitScale)*this.unitScale,this.ticks.push(this.firstTick.clone().add(this.scaleSizeInUnits,this.tickUnit)),this.lastTick=this.ticks[this.ticks.length-1].clone()))},getLabelForIndex:function(t,e){var i=this.chart.data.labels&&t<this.chart.data.labels.length?this.chart.data.labels[t]:"";return"object"==typeof this.chart.data.datasets[e].data[0]&&(i=this.getRightValue(this.chart.data.datasets[e].data[t])),this.options.time.tooltipFormat&&(i=this.parseTime(i).format(this.options.time.tooltipFormat)),i},tickFormatFunction:function(t,e,i){var a=t.format(this.displayFormat);return this.options.ticks.userCallback?this.options.ticks.userCallback(a,e,i):a},convertTicksToLabels:function(){this.ticks=this.ticks.map(this.tickFormatFunction,this)},getPixelForValue:function(t,e,i,a){var s=this.getLabelMoment(i,e);if(s){var o=s.diff(this.firstTick,this.tickUnit,!0),n=o/this.scaleSizeInUnits;if(this.isHorizontal()){var r=this.width-(this.paddingLeft+this.paddingRight),l=(r/Math.max(this.ticks.length-1,1),r*n+this.paddingLeft);return this.left+Math.round(l)}var h=this.height-(this.paddingTop+this.paddingBottom),c=(h/Math.max(this.ticks.length-1,1),h*n+this.paddingTop);return this.top+Math.round(c)}},parseTime:function(t){return"string"==typeof this.options.time.parser?a(t,this.options.time.parser):"function"==typeof this.options.time.parser?this.options.time.parser(t):"function"==typeof t.getMonth||"number"==typeof t?a(t):t.isValid&&t.isValid()?t:"string"!=typeof this.options.time.format&&this.options.time.format.call?(console.warn("options.time.format is deprecated and replaced by options.time.parser. See http://nnnick.github.io/Chart.js/docs-v2/#scales-time-scale"),this.options.time.format(t)):a(t,this.options.time.format)}});t.scaleService.registerScaleType("time",o,s)}},{moment:1}]},{},[7]);
\ No newline at end of file
+!function(t){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).Chart=t()}}(function(){return function t(e,i,n){function a(r,s){if(!i[r]){if(!e[r]){var l="function"==typeof require&&require;if(!s&&l)return l(r,!0);if(o)return o(r,!0);var u=new Error("Cannot find module '"+r+"'");throw u.code="MODULE_NOT_FOUND",u}var d=i[r]={exports:{}};e[r][0].call(d.exports,function(t){var i=e[r][1][t];return a(i||t)},d,d.exports,t,e,i,n)}return i[r].exports}for(var o="function"==typeof require&&require,r=0;r<n.length;r++)a(n[r]);return a}({1:[function(t,e,i){},{}],2:[function(t,e,i){var n=t(6);function a(t){if(t){var e=[0,0,0],i=1,a=t.match(/^#([a-fA-F0-9]{3})$/i);if(a){a=a[1];for(var o=0;o<e.length;o++)e[o]=parseInt(a[o]+a[o],16)}else if(a=t.match(/^#([a-fA-F0-9]{6})$/i)){a=a[1];for(o=0;o<e.length;o++)e[o]=parseInt(a.slice(2*o,2*o+2),16)}else if(a=t.match(/^rgba?\(\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(o=0;o<e.length;o++)e[o]=parseInt(a[o+1]);i=parseFloat(a[4])}else if(a=t.match(/^rgba?\(\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(o=0;o<e.length;o++)e[o]=Math.round(2.55*parseFloat(a[o+1]));i=parseFloat(a[4])}else if(a=t.match(/(\w+)/)){if("transparent"==a[1])return[0,0,0,0];if(!(e=n[a[1]]))return}for(o=0;o<e.length;o++)e[o]=d(e[o],0,255);return i=i||0==i?d(i,0,1):1,e[3]=i,e}}function o(t){if(t){var e=t.match(/^hsla?\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var i=parseFloat(e[4]);return[d(parseInt(e[1]),0,360),d(parseFloat(e[2]),0,100),d(parseFloat(e[3]),0,100),d(isNaN(i)?1:i,0,1)]}}}function r(t){if(t){var e=t.match(/^hwb\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var i=parseFloat(e[4]);return[d(parseInt(e[1]),0,360),d(parseFloat(e[2]),0,100),d(parseFloat(e[3]),0,100),d(isNaN(i)?1:i,0,1)]}}}function s(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"rgba("+t[0]+", "+t[1]+", "+t[2]+", "+e+")"}function l(t,e){return"rgba("+Math.round(t[0]/255*100)+"%, "+Math.round(t[1]/255*100)+"%, "+Math.round(t[2]/255*100)+"%, "+(e||t[3]||1)+")"}function u(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"hsla("+t[0]+", "+t[1]+"%, "+t[2]+"%, "+e+")"}function d(t,e,i){return Math.min(Math.max(e,t),i)}function c(t){var e=t.toString(16).toUpperCase();return e.length<2?"0"+e:e}e.exports={getRgba:a,getHsla:o,getRgb:function(t){var e=a(t);return e&&e.slice(0,3)},getHsl:function(t){var e=o(t);return e&&e.slice(0,3)},getHwb:r,getAlpha:function(t){var e=a(t);{if(e)return e[3];if(e=o(t))return e[3];if(e=r(t))return e[3]}},hexString:function(t){return"#"+c(t[0])+c(t[1])+c(t[2])},rgbString:function(t,e){if(e<1||t[3]&&t[3]<1)return s(t,e);return"rgb("+t[0]+", "+t[1]+", "+t[2]+")"},rgbaString:s,percentString:function(t,e){if(e<1||t[3]&&t[3]<1)return l(t,e);var i=Math.round(t[0]/255*100),n=Math.round(t[1]/255*100),a=Math.round(t[2]/255*100);return"rgb("+i+"%, "+n+"%, "+a+"%)"},percentaString:l,hslString:function(t,e){if(e<1||t[3]&&t[3]<1)return u(t,e);return"hsl("+t[0]+", "+t[1]+"%, "+t[2]+"%)"},hslaString:u,hwbString:function(t,e){void 0===e&&(e=void 0!==t[3]?t[3]:1);return"hwb("+t[0]+", "+t[1]+"%, "+t[2]+"%"+(void 0!==e&&1!==e?", "+e:"")+")"},keyword:function(t){return h[t.slice(0,3)]}};var h={};for(var f in n)h[n[f]]=f},{6:6}],3:[function(t,e,i){var n=t(5),a=t(2),o=function(t){return t instanceof o?t:this instanceof o?(this.valid=!1,this.values={rgb:[0,0,0],hsl:[0,0,0],hsv:[0,0,0],hwb:[0,0,0],cmyk:[0,0,0,0],alpha:1},void("string"==typeof t?(e=a.getRgba(t))?this.setValues("rgb",e):(e=a.getHsla(t))?this.setValues("hsl",e):(e=a.getHwb(t))&&this.setValues("hwb",e):"object"==typeof t&&(void 0!==(e=t).r||void 0!==e.red?this.setValues("rgb",e):void 0!==e.l||void 0!==e.lightness?this.setValues("hsl",e):void 0!==e.v||void 0!==e.value?this.setValues("hsv",e):void 0!==e.w||void 0!==e.whiteness?this.setValues("hwb",e):void 0===e.c&&void 0===e.cyan||this.setValues("cmyk",e)))):new o(t);var e};o.prototype={isValid:function(){return this.valid},rgb:function(){return this.setSpace("rgb",arguments)},hsl:function(){return this.setSpace("hsl",arguments)},hsv:function(){return this.setSpace("hsv",arguments)},hwb:function(){return this.setSpace("hwb",arguments)},cmyk:function(){return this.setSpace("cmyk",arguments)},rgbArray:function(){return this.values.rgb},hslArray:function(){return this.values.hsl},hsvArray:function(){return this.values.hsv},hwbArray:function(){var t=this.values;return 1!==t.alpha?t.hwb.concat([t.alpha]):t.hwb},cmykArray:function(){return this.values.cmyk},rgbaArray:function(){var t=this.values;return t.rgb.concat([t.alpha])},hslaArray:function(){var t=this.values;return t.hsl.concat([t.alpha])},alpha:function(t){return void 0===t?this.values.alpha:(this.setValues("alpha",t),this)},red:function(t){return this.setChannel("rgb",0,t)},green:function(t){return this.setChannel("rgb",1,t)},blue:function(t){return this.setChannel("rgb",2,t)},hue:function(t){return t&&(t=(t%=360)<0?360+t:t),this.setChannel("hsl",0,t)},saturation:function(t){return this.setChannel("hsl",1,t)},lightness:function(t){return this.setChannel("hsl",2,t)},saturationv:function(t){return this.setChannel("hsv",1,t)},whiteness:function(t){return this.setChannel("hwb",1,t)},blackness:function(t){return this.setChannel("hwb",2,t)},value:function(t){return this.setChannel("hsv",2,t)},cyan:function(t){return this.setChannel("cmyk",0,t)},magenta:function(t){return this.setChannel("cmyk",1,t)},yellow:function(t){return this.setChannel("cmyk",2,t)},black:function(t){return this.setChannel("cmyk",3,t)},hexString:function(){return a.hexString(this.values.rgb)},rgbString:function(){return a.rgbString(this.values.rgb,this.values.alpha)},rgbaString:function(){return a.rgbaString(this.values.rgb,this.values.alpha)},percentString:function(){return a.percentString(this.values.rgb,this.values.alpha)},hslString:function(){return a.hslString(this.values.hsl,this.values.alpha)},hslaString:function(){return a.hslaString(this.values.hsl,this.values.alpha)},hwbString:function(){return a.hwbString(this.values.hwb,this.values.alpha)},keyword:function(){return a.keyword(this.values.rgb,this.values.alpha)},rgbNumber:function(){var t=this.values.rgb;return t[0]<<16|t[1]<<8|t[2]},luminosity:function(){for(var t=this.values.rgb,e=[],i=0;i<t.length;i++){var n=t[i]/255;e[i]=n<=.03928?n/12.92:Math.pow((n+.055)/1.055,2.4)}return.2126*e[0]+.7152*e[1]+.0722*e[2]},contrast:function(t){var e=this.luminosity(),i=t.luminosity();return e>i?(e+.05)/(i+.05):(i+.05)/(e+.05)},level:function(t){var e=this.contrast(t);return e>=7.1?"AAA":e>=4.5?"AA":""},dark:function(){var t=this.values.rgb;return(299*t[0]+587*t[1]+114*t[2])/1e3<128},light:function(){return!this.dark()},negate:function(){for(var t=[],e=0;e<3;e++)t[e]=255-this.values.rgb[e];return this.setValues("rgb",t),this},lighten:function(t){var e=this.values.hsl;return e[2]+=e[2]*t,this.setValues("hsl",e),this},darken:function(t){var e=this.values.hsl;return e[2]-=e[2]*t,this.setValues("hsl",e),this},saturate:function(t){var e=this.values.hsl;return e[1]+=e[1]*t,this.setValues("hsl",e),this},desaturate:function(t){var e=this.values.hsl;return e[1]-=e[1]*t,this.setValues("hsl",e),this},whiten:function(t){var e=this.values.hwb;return e[1]+=e[1]*t,this.setValues("hwb",e),this},blacken:function(t){var e=this.values.hwb;return e[2]+=e[2]*t,this.setValues("hwb",e),this},greyscale:function(){var t=this.values.rgb,e=.3*t[0]+.59*t[1]+.11*t[2];return this.setValues("rgb",[e,e,e]),this},clearer:function(t){var e=this.values.alpha;return this.setValues("alpha",e-e*t),this},opaquer:function(t){var e=this.values.alpha;return this.setValues("alpha",e+e*t),this},rotate:function(t){var e=this.values.hsl,i=(e[0]+t)%360;return e[0]=i<0?360+i:i,this.setValues("hsl",e),this},mix:function(t,e){var i=this,n=t,a=void 0===e?.5:e,o=2*a-1,r=i.alpha()-n.alpha(),s=((o*r==-1?o:(o+r)/(1+o*r))+1)/2,l=1-s;return this.rgb(s*i.red()+l*n.red(),s*i.green()+l*n.green(),s*i.blue()+l*n.blue()).alpha(i.alpha()*a+n.alpha()*(1-a))},toJSON:function(){return this.rgb()},clone:function(){var t,e,i=new o,n=this.values,a=i.values;for(var r in n)n.hasOwnProperty(r)&&(t=n[r],"[object Array]"===(e={}.toString.call(t))?a[r]=t.slice(0):"[object Number]"===e?a[r]=t:console.error("unexpected color value:",t));return i}},o.prototype.spaces={rgb:["red","green","blue"],hsl:["hue","saturation","lightness"],hsv:["hue","saturation","value"],hwb:["hue","whiteness","blackness"],cmyk:["cyan","magenta","yellow","black"]},o.prototype.maxes={rgb:[255,255,255],hsl:[360,100,100],hsv:[360,100,100],hwb:[360,100,100],cmyk:[100,100,100,100]},o.prototype.getValues=function(t){for(var e=this.values,i={},n=0;n<t.length;n++)i[t.charAt(n)]=e[t][n];return 1!==e.alpha&&(i.a=e.alpha),i},o.prototype.setValues=function(t,e){var i,a,o=this.values,r=this.spaces,s=this.maxes,l=1;if(this.valid=!0,"alpha"===t)l=e;else if(e.length)o[t]=e.slice(0,t.length),l=e[t.length];else if(void 0!==e[t.charAt(0)]){for(i=0;i<t.length;i++)o[t][i]=e[t.charAt(i)];l=e.a}else if(void 0!==e[r[t][0]]){var u=r[t];for(i=0;i<t.length;i++)o[t][i]=e[u[i]];l=e.alpha}if(o.alpha=Math.max(0,Math.min(1,void 0===l?o.alpha:l)),"alpha"===t)return!1;for(i=0;i<t.length;i++)a=Math.max(0,Math.min(s[t][i],o[t][i])),o[t][i]=Math.round(a);for(var d in r)d!==t&&(o[d]=n[t][d](o[t]));return!0},o.prototype.setSpace=function(t,e){var i=e[0];return void 0===i?this.getValues(t):("number"==typeof i&&(i=Array.prototype.slice.call(e)),this.setValues(t,i),this)},o.prototype.setChannel=function(t,e,i){var n=this.values[t];return void 0===i?n[e]:i===n[e]?this:(n[e]=i,this.setValues(t,n),this)},"undefined"!=typeof window&&(window.Color=o),e.exports=o},{2:2,5:5}],4:[function(t,e,i){function n(t){var e,i,n=t[0]/255,a=t[1]/255,o=t[2]/255,r=Math.min(n,a,o),s=Math.max(n,a,o),l=s-r;return s==r?e=0:n==s?e=(a-o)/l:a==s?e=2+(o-n)/l:o==s&&(e=4+(n-a)/l),(e=Math.min(60*e,360))<0&&(e+=360),i=(r+s)/2,[e,100*(s==r?0:i<=.5?l/(s+r):l/(2-s-r)),100*i]}function a(t){var e,i,n=t[0],a=t[1],o=t[2],r=Math.min(n,a,o),s=Math.max(n,a,o),l=s-r;return i=0==s?0:l/s*1e3/10,s==r?e=0:n==s?e=(a-o)/l:a==s?e=2+(o-n)/l:o==s&&(e=4+(n-a)/l),(e=Math.min(60*e,360))<0&&(e+=360),[e,i,s/255*1e3/10]}function o(t){var e=t[0],i=t[1],a=t[2];return[n(t)[0],100*(1/255*Math.min(e,Math.min(i,a))),100*(a=1-1/255*Math.max(e,Math.max(i,a)))]}function s(t){var e,i=t[0]/255,n=t[1]/255,a=t[2]/255;return[100*((1-i-(e=Math.min(1-i,1-n,1-a)))/(1-e)||0),100*((1-n-e)/(1-e)||0),100*((1-a-e)/(1-e)||0),100*e]}function l(t){return C[JSON.stringify(t)]}function u(t){var e=t[0]/255,i=t[1]/255,n=t[2]/255;return[100*(.4124*(e=e>.04045?Math.pow((e+.055)/1.055,2.4):e/12.92)+.3576*(i=i>.04045?Math.pow((i+.055)/1.055,2.4):i/12.92)+.1805*(n=n>.04045?Math.pow((n+.055)/1.055,2.4):n/12.92)),100*(.2126*e+.7152*i+.0722*n),100*(.0193*e+.1192*i+.9505*n)]}function d(t){var e=u(t),i=e[0],n=e[1],a=e[2];return n/=100,a/=108.883,i=(i/=95.047)>.008856?Math.pow(i,1/3):7.787*i+16/116,[116*(n=n>.008856?Math.pow(n,1/3):7.787*n+16/116)-16,500*(i-n),200*(n-(a=a>.008856?Math.pow(a,1/3):7.787*a+16/116))]}function c(t){var e,i,n,a,o,r=t[0]/360,s=t[1]/100,l=t[2]/100;if(0==s)return[o=255*l,o,o];e=2*l-(i=l<.5?l*(1+s):l+s-l*s),a=[0,0,0];for(var u=0;u<3;u++)(n=r+1/3*-(u-1))<0&&n++,n>1&&n--,o=6*n<1?e+6*(i-e)*n:2*n<1?i:3*n<2?e+(i-e)*(2/3-n)*6:e,a[u]=255*o;return a}function h(t){var e=t[0]/60,i=t[1]/100,n=t[2]/100,a=Math.floor(e)%6,o=e-Math.floor(e),r=255*n*(1-i),s=255*n*(1-i*o),l=255*n*(1-i*(1-o));n*=255;switch(a){case 0:return[n,l,r];case 1:return[s,n,r];case 2:return[r,n,l];case 3:return[r,s,n];case 4:return[l,r,n];case 5:return[n,r,s]}}function f(t){var e,i,n,a,o=t[0]/360,s=t[1]/100,l=t[2]/100,u=s+l;switch(u>1&&(s/=u,l/=u),n=6*o-(e=Math.floor(6*o)),0!=(1&e)&&(n=1-n),a=s+n*((i=1-l)-s),e){default:case 6:case 0:r=i,g=a,b=s;break;case 1:r=a,g=i,b=s;break;case 2:r=s,g=i,b=a;break;case 3:r=s,g=a,b=i;break;case 4:r=a,g=s,b=i;break;case 5:r=i,g=s,b=a}return[255*r,255*g,255*b]}function p(t){var e=t[0]/100,i=t[1]/100,n=t[2]/100,a=t[3]/100;return[255*(1-Math.min(1,e*(1-a)+a)),255*(1-Math.min(1,i*(1-a)+a)),255*(1-Math.min(1,n*(1-a)+a))]}function m(t){var e,i,n,a=t[0]/100,o=t[1]/100,r=t[2]/100;return i=-.9689*a+1.8758*o+.0415*r,n=.0557*a+-.204*o+1.057*r,e=(e=3.2406*a+-1.5372*o+-.4986*r)>.0031308?1.055*Math.pow(e,1/2.4)-.055:e*=12.92,i=i>.0031308?1.055*Math.pow(i,1/2.4)-.055:i*=12.92,n=n>.0031308?1.055*Math.pow(n,1/2.4)-.055:n*=12.92,[255*(e=Math.min(Math.max(0,e),1)),255*(i=Math.min(Math.max(0,i),1)),255*(n=Math.min(Math.max(0,n),1))]}function v(t){var e=t[0],i=t[1],n=t[2];return i/=100,n/=108.883,e=(e/=95.047)>.008856?Math.pow(e,1/3):7.787*e+16/116,[116*(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116)-16,500*(e-i),200*(i-(n=n>.008856?Math.pow(n,1/3):7.787*n+16/116))]}function x(t){var e,i,n,a,o=t[0],r=t[1],s=t[2];return o<=8?a=(i=100*o/903.3)/100*7.787+16/116:(i=100*Math.pow((o+16)/116,3),a=Math.pow(i/100,1/3)),[e=e/95.047<=.008856?e=95.047*(r/500+a-16/116)/7.787:95.047*Math.pow(r/500+a,3),i,n=n/108.883<=.008859?n=108.883*(a-s/200-16/116)/7.787:108.883*Math.pow(a-s/200,3)]}function y(t){var e,i=t[0],n=t[1],a=t[2];return(e=360*Math.atan2(a,n)/2/Math.PI)<0&&(e+=360),[i,Math.sqrt(n*n+a*a),e]}function k(t){return m(x(t))}function M(t){var e,i=t[0],n=t[1];return e=t[2]/360*2*Math.PI,[i,n*Math.cos(e),n*Math.sin(e)]}function w(t){return S[t]}e.exports={rgb2hsl:n,rgb2hsv:a,rgb2hwb:o,rgb2cmyk:s,rgb2keyword:l,rgb2xyz:u,rgb2lab:d,rgb2lch:function(t){return y(d(t))},hsl2rgb:c,hsl2hsv:function(t){var e=t[0],i=t[1]/100,n=t[2]/100;if(0===n)return[0,0,0];return[e,100*(2*(i*=(n*=2)<=1?n:2-n)/(n+i)),100*((n+i)/2)]},hsl2hwb:function(t){return o(c(t))},hsl2cmyk:function(t){return s(c(t))},hsl2keyword:function(t){return l(c(t))},hsv2rgb:h,hsv2hsl:function(t){var e,i,n=t[0],a=t[1]/100,o=t[2]/100;return e=a*o,[n,100*(e=(e/=(i=(2-a)*o)<=1?i:2-i)||0),100*(i/=2)]},hsv2hwb:function(t){return o(h(t))},hsv2cmyk:function(t){return s(h(t))},hsv2keyword:function(t){return l(h(t))},hwb2rgb:f,hwb2hsl:function(t){return n(f(t))},hwb2hsv:function(t){return a(f(t))},hwb2cmyk:function(t){return s(f(t))},hwb2keyword:function(t){return l(f(t))},cmyk2rgb:p,cmyk2hsl:function(t){return n(p(t))},cmyk2hsv:function(t){return a(p(t))},cmyk2hwb:function(t){return o(p(t))},cmyk2keyword:function(t){return l(p(t))},keyword2rgb:w,keyword2hsl:function(t){return n(w(t))},keyword2hsv:function(t){return a(w(t))},keyword2hwb:function(t){return o(w(t))},keyword2cmyk:function(t){return s(w(t))},keyword2lab:function(t){return d(w(t))},keyword2xyz:function(t){return u(w(t))},xyz2rgb:m,xyz2lab:v,xyz2lch:function(t){return y(v(t))},lab2xyz:x,lab2rgb:k,lab2lch:y,lch2lab:M,lch2xyz:function(t){return x(M(t))},lch2rgb:function(t){return k(M(t))}};var S={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},C={};for(var _ in S)C[JSON.stringify(S[_])]=_},{}],5:[function(t,e,i){var n=t(4),a=function(){return new u};for(var o in n){a[o+"Raw"]=function(t){return function(e){return"number"==typeof e&&(e=Array.prototype.slice.call(arguments)),n[t](e)}}(o);var r=/(\w+)2(\w+)/.exec(o),s=r[1],l=r[2];(a[s]=a[s]||{})[l]=a[o]=function(t){return function(e){"number"==typeof e&&(e=Array.prototype.slice.call(arguments));var i=n[t](e);if("string"==typeof i||void 0===i)return i;for(var a=0;a<i.length;a++)i[a]=Math.round(i[a]);return i}}(o)}var u=function(){this.convs={}};u.prototype.routeSpace=function(t,e){var i=e[0];return void 0===i?this.getValues(t):("number"==typeof i&&(i=Array.prototype.slice.call(e)),this.setValues(t,i))},u.prototype.setValues=function(t,e){return this.space=t,this.convs={},this.convs[t]=e,this},u.prototype.getValues=function(t){var e=this.convs[t];if(!e){var i=this.space,n=this.convs[i];e=a[i][t](n),this.convs[t]=e}return e},["rgb","hsl","hsv","cmyk","keyword"].forEach(function(t){u.prototype[t]=function(e){return this.routeSpace(t,arguments)}}),e.exports=a},{4:4}],6:[function(t,e,i){"use strict";e.exports={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]}},{}],7:[function(t,e,i){var n=t(29)();n.helpers=t(45),t(27)(n),n.defaults=t(25),n.Element=t(26),n.elements=t(40),n.Interaction=t(28),n.layouts=t(30),n.platform=t(48),n.plugins=t(31),n.Ticks=t(34),t(22)(n),t(23)(n),t(24)(n),t(33)(n),t(32)(n),t(35)(n),t(55)(n),t(53)(n),t(54)(n),t(56)(n),t(57)(n),t(58)(n),t(15)(n),t(16)(n),t(17)(n),t(18)(n),t(19)(n),t(20)(n),t(21)(n),t(8)(n),t(9)(n),t(10)(n),t(11)(n),t(12)(n),t(13)(n),t(14)(n);var a=t(49);for(var o in a)a.hasOwnProperty(o)&&n.plugins.register(a[o]);n.platform.initialize(),e.exports=n,"undefined"!=typeof window&&(window.Chart=n),n.Legend=a.legend._element,n.Title=a.title._element,n.pluginService=n.plugins,n.PluginBase=n.Element.extend({}),n.canvasHelpers=n.helpers.canvas,n.layoutService=n.layouts},{10:10,11:11,12:12,13:13,14:14,15:15,16:16,17:17,18:18,19:19,20:20,21:21,22:22,23:23,24:24,25:25,26:26,27:27,28:28,29:29,30:30,31:31,32:32,33:33,34:34,35:35,40:40,45:45,48:48,49:49,53:53,54:54,55:55,56:56,57:57,58:58,8:8,9:9}],8:[function(t,e,i){"use strict";e.exports=function(t){t.Bar=function(e,i){return i.type="bar",new t(e,i)}}},{}],9:[function(t,e,i){"use strict";e.exports=function(t){t.Bubble=function(e,i){return i.type="bubble",new t(e,i)}}},{}],10:[function(t,e,i){"use strict";e.exports=function(t){t.Doughnut=function(e,i){return i.type="doughnut",new t(e,i)}}},{}],11:[function(t,e,i){"use strict";e.exports=function(t){t.Line=function(e,i){return i.type="line",new t(e,i)}}},{}],12:[function(t,e,i){"use strict";e.exports=function(t){t.PolarArea=function(e,i){return i.type="polarArea",new t(e,i)}}},{}],13:[function(t,e,i){"use strict";e.exports=function(t){t.Radar=function(e,i){return i.type="radar",new t(e,i)}}},{}],14:[function(t,e,i){"use strict";e.exports=function(t){t.Scatter=function(e,i){return i.type="scatter",new t(e,i)}}},{}],15:[function(t,e,i){"use strict";var n=t(25),a=t(40),o=t(45);n._set("bar",{hover:{mode:"label"},scales:{xAxes:[{type:"category",categoryPercentage:.8,barPercentage:.9,offset:!0,gridLines:{offsetGridLines:!0}}],yAxes:[{type:"linear"}]}}),n._set("horizontalBar",{hover:{mode:"index",axis:"y"},scales:{xAxes:[{type:"linear",position:"bottom"}],yAxes:[{position:"left",type:"category",categoryPercentage:.8,barPercentage:.9,offset:!0,gridLines:{offsetGridLines:!0}}]},elements:{rectangle:{borderSkipped:"left"}},tooltips:{callbacks:{title:function(t,e){var i="";return t.length>0&&(t[0].yLabel?i=t[0].yLabel:e.labels.length>0&&t[0].index<e.labels.length&&(i=e.labels[t[0].index])),i},label:function(t,e){return(e.datasets[t.datasetIndex].label||"")+": "+t.xLabel}},mode:"index",axis:"y"}}),e.exports=function(t){t.controllers.bar=t.DatasetController.extend({dataElementType:a.Rectangle,initialize:function(){var e;t.DatasetController.prototype.initialize.apply(this,arguments),(e=this.getMeta()).stack=this.getDataset().stack,e.bar=!0},update:function(t){var e,i,n=this.getMeta().data;for(this._ruler=this.getRuler(),e=0,i=n.length;e<i;++e)this.updateElement(n[e],e,t)},updateElement:function(t,e,i){var n=this,a=n.chart,r=n.getMeta(),s=n.getDataset(),l=t.custom||{},u=a.options.elements.rectangle;t._xScale=n.getScaleForId(r.xAxisID),t._yScale=n.getScaleForId(r.yAxisID),t._datasetIndex=n.index,t._index=e,t._model={datasetLabel:s.label,label:a.data.labels[e],borderSkipped:l.borderSkipped?l.borderSkipped:u.borderSkipped,backgroundColor:l.backgroundColor?l.backgroundColor:o.valueAtIndexOrDefault(s.backgroundColor,e,u.backgroundColor),borderColor:l.borderColor?l.borderColor:o.valueAtIndexOrDefault(s.borderColor,e,u.borderColor),borderWidth:l.borderWidth?l.borderWidth:o.valueAtIndexOrDefault(s.borderWidth,e,u.borderWidth)},n.updateElementGeometry(t,e,i),t.pivot()},updateElementGeometry:function(t,e,i){var n=this,a=t._model,o=n.getValueScale(),r=o.getBasePixel(),s=o.isHorizontal(),l=n._ruler||n.getRuler(),u=n.calculateBarValuePixels(n.index,e),d=n.calculateBarIndexPixels(n.index,e,l);a.horizontal=s,a.base=i?r:u.base,a.x=s?i?r:u.head:d.center,a.y=s?d.center:i?r:u.head,a.height=s?d.size:void 0,a.width=s?void 0:d.size},getValueScaleId:function(){return this.getMeta().yAxisID},getIndexScaleId:function(){return this.getMeta().xAxisID},getValueScale:function(){return this.getScaleForId(this.getValueScaleId())},getIndexScale:function(){return this.getScaleForId(this.getIndexScaleId())},_getStacks:function(t){var e,i,n=this.chart,a=this.getIndexScale().options.stacked,o=void 0===t?n.data.datasets.length:t+1,r=[];for(e=0;e<o;++e)(i=n.getDatasetMeta(e)).bar&&n.isDatasetVisible(e)&&(!1===a||!0===a&&-1===r.indexOf(i.stack)||void 0===a&&(void 0===i.stack||-1===r.indexOf(i.stack)))&&r.push(i.stack);return r},getStackCount:function(){return this._getStacks().length},getStackIndex:function(t,e){var i=this._getStacks(t),n=void 0!==e?i.indexOf(e):-1;return-1===n?i.length-1:n},getRuler:function(){var t,e,i=this.getIndexScale(),n=this.getStackCount(),a=this.index,r=i.isHorizontal(),s=r?i.left:i.top,l=s+(r?i.width:i.height),u=[];for(t=0,e=this.getMeta().data.length;t<e;++t)u.push(i.getPixelForValue(null,t,a));return{min:o.isNullOrUndef(i.options.barThickness)?function(t,e){var i,n,a,o,r=t.isHorizontal()?t.width:t.height,s=t.getTicks();for(a=1,o=e.length;a<o;++a)r=Math.min(r,e[a]-e[a-1]);for(a=0,o=s.length;a<o;++a)n=t.getPixelForTick(a),r=a>0?Math.min(r,n-i):r,i=n;return r}(i,u):-1,pixels:u,start:s,end:l,stackCount:n,scale:i}},calculateBarValuePixels:function(t,e){var i,n,a,o,r,s,l=this.chart,u=this.getMeta(),d=this.getValueScale(),c=l.data.datasets,h=d.getRightValue(c[t].data[e]),f=d.options.stacked,g=u.stack,p=0;if(f||void 0===f&&void 0!==g)for(i=0;i<t;++i)(n=l.getDatasetMeta(i)).bar&&n.stack===g&&n.controller.getValueScaleId()===d.id&&l.isDatasetVisible(i)&&(a=d.getRightValue(c[i].data[e]),(h<0&&a<0||h>=0&&a>0)&&(p+=a));return o=d.getPixelForValue(p),{size:s=((r=d.getPixelForValue(p+h))-o)/2,base:o,head:r,center:r+s/2}},calculateBarIndexPixels:function(t,e,i){var n,a,r,s,l,u,d,c,h,f,g,p,m,v,b,x,y,k=i.scale.options,M="flex"===k.barThickness?(h=e,g=k,m=(f=i).pixels,v=m[h],b=h>0?m[h-1]:null,x=h<m.length-1?m[h+1]:null,y=g.categoryPercentage,null===b&&(b=v-(null===x?f.end-v:x-v)),null===x&&(x=v+v-b),p=v-(v-b)/2*y,{chunk:(x-b)/2*y/f.stackCount,ratio:g.barPercentage,start:p}):(n=e,a=i,u=(r=k).barThickness,d=a.stackCount,c=a.pixels[n],o.isNullOrUndef(u)?(s=a.min*r.categoryPercentage,l=r.barPercentage):(s=u*d,l=1),{chunk:s/d,ratio:l,start:c-s/2}),w=this.getStackIndex(t,this.getMeta().stack),S=M.start+M.chunk*w+M.chunk/2,C=Math.min(o.valueOrDefault(k.maxBarThickness,1/0),M.chunk*M.ratio);return{base:S-C/2,head:S+C/2,center:S,size:C}},draw:function(){var t=this.chart,e=this.getValueScale(),i=this.getMeta().data,n=this.getDataset(),a=i.length,r=0;for(o.canvas.clipArea(t.ctx,t.chartArea);r<a;++r)isNaN(e.getRightValue(n.data[r]))||i[r].draw();o.canvas.unclipArea(t.ctx)},setHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],i=t._index,n=t.custom||{},a=t._model;a.backgroundColor=n.hoverBackgroundColor?n.hoverBackgroundColor:o.valueAtIndexOrDefault(e.hoverBackgroundColor,i,o.getHoverColor(a.backgroundColor)),a.borderColor=n.hoverBorderColor?n.hoverBorderColor:o.valueAtIndexOrDefault(e.hoverBorderColor,i,o.getHoverColor(a.borderColor)),a.borderWidth=n.hoverBorderWidth?n.hoverBorderWidth:o.valueAtIndexOrDefault(e.hoverBorderWidth,i,a.borderWidth)},removeHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],i=t._index,n=t.custom||{},a=t._model,r=this.chart.options.elements.rectangle;a.backgroundColor=n.backgroundColor?n.backgroundColor:o.valueAtIndexOrDefault(e.backgroundColor,i,r.backgroundColor),a.borderColor=n.borderColor?n.borderColor:o.valueAtIndexOrDefault(e.borderColor,i,r.borderColor),a.borderWidth=n.borderWidth?n.borderWidth:o.valueAtIndexOrDefault(e.borderWidth,i,r.borderWidth)}}),t.controllers.horizontalBar=t.controllers.bar.extend({getValueScaleId:function(){return this.getMeta().xAxisID},getIndexScaleId:function(){return this.getMeta().yAxisID}})}},{25:25,40:40,45:45}],16:[function(t,e,i){"use strict";var n=t(25),a=t(40),o=t(45);n._set("bubble",{hover:{mode:"single"},scales:{xAxes:[{type:"linear",position:"bottom",id:"x-axis-0"}],yAxes:[{type:"linear",position:"left",id:"y-axis-0"}]},tooltips:{callbacks:{title:function(){return""},label:function(t,e){var i=e.datasets[t.datasetIndex].label||"",n=e.datasets[t.datasetIndex].data[t.index];return i+": ("+t.xLabel+", "+t.yLabel+", "+n.r+")"}}}}),e.exports=function(t){t.controllers.bubble=t.DatasetController.extend({dataElementType:a.Point,update:function(t){var e=this,i=e.getMeta().data;o.each(i,function(i,n){e.updateElement(i,n,t)})},updateElement:function(t,e,i){var n=this,a=n.getMeta(),o=t.custom||{},r=n.getScaleForId(a.xAxisID),s=n.getScaleForId(a.yAxisID),l=n._resolveElementOptions(t,e),u=n.getDataset().data[e],d=n.index,c=i?r.getPixelForDecimal(.5):r.getPixelForValue("object"==typeof u?u:NaN,e,d),h=i?s.getBasePixel():s.getPixelForValue(u,e,d);t._xScale=r,t._yScale=s,t._options=l,t._datasetIndex=d,t._index=e,t._model={backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,hitRadius:l.hitRadius,pointStyle:l.pointStyle,radius:i?0:l.radius,skip:o.skip||isNaN(c)||isNaN(h),x:c,y:h},t.pivot()},setHoverStyle:function(t){var e=t._model,i=t._options;e.backgroundColor=o.valueOrDefault(i.hoverBackgroundColor,o.getHoverColor(i.backgroundColor)),e.borderColor=o.valueOrDefault(i.hoverBorderColor,o.getHoverColor(i.borderColor)),e.borderWidth=o.valueOrDefault(i.hoverBorderWidth,i.borderWidth),e.radius=i.radius+i.hoverRadius},removeHoverStyle:function(t){var e=t._model,i=t._options;e.backgroundColor=i.backgroundColor,e.borderColor=i.borderColor,e.borderWidth=i.borderWidth,e.radius=i.radius},_resolveElementOptions:function(t,e){var i,n,a,r=this.chart,s=r.data.datasets[this.index],l=t.custom||{},u=r.options.elements.point,d=o.options.resolve,c=s.data[e],h={},f={chart:r,dataIndex:e,dataset:s,datasetIndex:this.index},g=["backgroundColor","borderColor","borderWidth","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth","hoverRadius","hitRadius","pointStyle"];for(i=0,n=g.length;i<n;++i)h[a=g[i]]=d([l[a],s[a],u[a]],f,e);return h.radius=d([l.radius,c?c.r:void 0,s.radius,u.radius],f,e),h}})}},{25:25,40:40,45:45}],17:[function(t,e,i){"use strict";var n=t(25),a=t(40),o=t(45);n._set("doughnut",{animation:{animateRotate:!0,animateScale:!1},hover:{mode:"single"},legendCallback:function(t){var e=[];e.push('<ul class="'+t.id+'-legend">');var i=t.data,n=i.datasets,a=i.labels;if(n.length)for(var o=0;o<n[0].data.length;++o)e.push('<li><span style="background-color:'+n[0].backgroundColor[o]+'"></span>'),a[o]&&e.push(a[o]),e.push("</li>");return e.push("</ul>"),e.join("")},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map(function(i,n){var a=t.getDatasetMeta(0),r=e.datasets[0],s=a.data[n],l=s&&s.custom||{},u=o.valueAtIndexOrDefault,d=t.options.elements.arc;return{text:i,fillStyle:l.backgroundColor?l.backgroundColor:u(r.backgroundColor,n,d.backgroundColor),strokeStyle:l.borderColor?l.borderColor:u(r.borderColor,n,d.borderColor),lineWidth:l.borderWidth?l.borderWidth:u(r.borderWidth,n,d.borderWidth),hidden:isNaN(r.data[n])||a.data[n].hidden,index:n}}):[]}},onClick:function(t,e){var i,n,a,o=e.index,r=this.chart;for(i=0,n=(r.data.datasets||[]).length;i<n;++i)(a=r.getDatasetMeta(i)).data[o]&&(a.data[o].hidden=!a.data[o].hidden);r.update()}},cutoutPercentage:50,rotation:-.5*Math.PI,circumference:2*Math.PI,tooltips:{callbacks:{title:function(){return""},label:function(t,e){var i=e.labels[t.index],n=": "+e.datasets[t.datasetIndex].data[t.index];return o.isArray(i)?(i=i.slice())[0]+=n:i+=n,i}}}}),n._set("pie",o.clone(n.doughnut)),n._set("pie",{cutoutPercentage:0}),e.exports=function(t){t.controllers.doughnut=t.controllers.pie=t.DatasetController.extend({dataElementType:a.Arc,linkScales:o.noop,getRingIndex:function(t){for(var e=0,i=0;i<t;++i)this.chart.isDatasetVisible(i)&&++e;return e},update:function(t){var e=this,i=e.chart,n=i.chartArea,a=i.options,r=a.elements.arc,s=n.right-n.left-r.borderWidth,l=n.bottom-n.top-r.borderWidth,u=Math.min(s,l),d={x:0,y:0},c=e.getMeta(),h=a.cutoutPercentage,f=a.circumference;if(f<2*Math.PI){var g=a.rotation%(2*Math.PI),p=(g+=2*Math.PI*(g>=Math.PI?-1:g<-Math.PI?1:0))+f,m=Math.cos(g),v=Math.sin(g),b=Math.cos(p),x=Math.sin(p),y=g<=0&&p>=0||g<=2*Math.PI&&2*Math.PI<=p,k=g<=.5*Math.PI&&.5*Math.PI<=p||g<=2.5*Math.PI&&2.5*Math.PI<=p,M=g<=-Math.PI&&-Math.PI<=p||g<=Math.PI&&Math.PI<=p,w=g<=.5*-Math.PI&&.5*-Math.PI<=p||g<=1.5*Math.PI&&1.5*Math.PI<=p,S=h/100,C=M?-1:Math.min(m*(m<0?1:S),b*(b<0?1:S)),_=w?-1:Math.min(v*(v<0?1:S),x*(x<0?1:S)),D=y?1:Math.max(m*(m>0?1:S),b*(b>0?1:S)),I=k?1:Math.max(v*(v>0?1:S),x*(x>0?1:S)),P=.5*(D-C),A=.5*(I-_);u=Math.min(s/P,l/A),d={x:-.5*(D+C),y:-.5*(I+_)}}i.borderWidth=e.getMaxBorderWidth(c.data),i.outerRadius=Math.max((u-i.borderWidth)/2,0),i.innerRadius=Math.max(h?i.outerRadius/100*h:0,0),i.radiusLength=(i.outerRadius-i.innerRadius)/i.getVisibleDatasetCount(),i.offsetX=d.x*i.outerRadius,i.offsetY=d.y*i.outerRadius,c.total=e.calculateTotal(),e.outerRadius=i.outerRadius-i.radiusLength*e.getRingIndex(e.index),e.innerRadius=Math.max(e.outerRadius-i.radiusLength,0),o.each(c.data,function(i,n){e.updateElement(i,n,t)})},updateElement:function(t,e,i){var n=this,a=n.chart,r=a.chartArea,s=a.options,l=s.animation,u=(r.left+r.right)/2,d=(r.top+r.bottom)/2,c=s.rotation,h=s.rotation,f=n.getDataset(),g=i&&l.animateRotate?0:t.hidden?0:n.calculateCircumference(f.data[e])*(s.circumference/(2*Math.PI)),p=i&&l.animateScale?0:n.innerRadius,m=i&&l.animateScale?0:n.outerRadius,v=o.valueAtIndexOrDefault;o.extend(t,{_datasetIndex:n.index,_index:e,_model:{x:u+a.offsetX,y:d+a.offsetY,startAngle:c,endAngle:h,circumference:g,outerRadius:m,innerRadius:p,label:v(f.label,e,a.data.labels[e])}});var b=t._model;this.removeHoverStyle(t),i&&l.animateRotate||(b.startAngle=0===e?s.rotation:n.getMeta().data[e-1]._model.endAngle,b.endAngle=b.startAngle+b.circumference),t.pivot()},removeHoverStyle:function(e){t.DatasetController.prototype.removeHoverStyle.call(this,e,this.chart.options.elements.arc)},calculateTotal:function(){var t,e=this.getDataset(),i=this.getMeta(),n=0;return o.each(i.data,function(i,a){t=e.data[a],isNaN(t)||i.hidden||(n+=Math.abs(t))}),n},calculateCircumference:function(t){var e=this.getMeta().total;return e>0&&!isNaN(t)?2*Math.PI*(Math.abs(t)/e):0},getMaxBorderWidth:function(t){for(var e,i,n=0,a=this.index,o=t.length,r=0;r<o;r++)e=t[r]._model?t[r]._model.borderWidth:0,n=(i=t[r]._chart?t[r]._chart.config.data.datasets[a].hoverBorderWidth:0)>(n=e>n?e:n)?i:n;return n}})}},{25:25,40:40,45:45}],18:[function(t,e,i){"use strict";var n=t(25),a=t(40),o=t(45);n._set("line",{showLines:!0,spanGaps:!1,hover:{mode:"label"},scales:{xAxes:[{type:"category",id:"x-axis-0"}],yAxes:[{type:"linear",id:"y-axis-0"}]}}),e.exports=function(t){function e(t,e){return o.valueOrDefault(t.showLine,e.showLines)}t.controllers.line=t.DatasetController.extend({datasetElementType:a.Line,dataElementType:a.Point,update:function(t){var i,n,a,r=this,s=r.getMeta(),l=s.dataset,u=s.data||[],d=r.chart.options,c=d.elements.line,h=r.getScaleForId(s.yAxisID),f=r.getDataset(),g=e(f,d);for(g&&(a=l.custom||{},void 0!==f.tension&&void 0===f.lineTension&&(f.lineTension=f.tension),l._scale=h,l._datasetIndex=r.index,l._children=u,l._model={spanGaps:f.spanGaps?f.spanGaps:d.spanGaps,tension:a.tension?a.tension:o.valueOrDefault(f.lineTension,c.tension),backgroundColor:a.backgroundColor?a.backgroundColor:f.backgroundColor||c.backgroundColor,borderWidth:a.borderWidth?a.borderWidth:f.borderWidth||c.borderWidth,borderColor:a.borderColor?a.borderColor:f.borderColor||c.borderColor,borderCapStyle:a.borderCapStyle?a.borderCapStyle:f.borderCapStyle||c.borderCapStyle,borderDash:a.borderDash?a.borderDash:f.borderDash||c.borderDash,borderDashOffset:a.borderDashOffset?a.borderDashOffset:f.borderDashOffset||c.borderDashOffset,borderJoinStyle:a.borderJoinStyle?a.borderJoinStyle:f.borderJoinStyle||c.borderJoinStyle,fill:a.fill?a.fill:void 0!==f.fill?f.fill:c.fill,steppedLine:a.steppedLine?a.steppedLine:o.valueOrDefault(f.steppedLine,c.stepped),cubicInterpolationMode:a.cubicInterpolationMode?a.cubicInterpolationMode:o.valueOrDefault(f.cubicInterpolationMode,c.cubicInterpolationMode)},l.pivot()),i=0,n=u.length;i<n;++i)r.updateElement(u[i],i,t);for(g&&0!==l._model.tension&&r.updateBezierControlPoints(),i=0,n=u.length;i<n;++i)u[i].pivot()},getPointBackgroundColor:function(t,e){var i=this.chart.options.elements.point.backgroundColor,n=this.getDataset(),a=t.custom||{};return a.backgroundColor?i=a.backgroundColor:n.pointBackgroundColor?i=o.valueAtIndexOrDefault(n.pointBackgroundColor,e,i):n.backgroundColor&&(i=n.backgroundColor),i},getPointBorderColor:function(t,e){var i=this.chart.options.elements.point.borderColor,n=this.getDataset(),a=t.custom||{};return a.borderColor?i=a.borderColor:n.pointBorderColor?i=o.valueAtIndexOrDefault(n.pointBorderColor,e,i):n.borderColor&&(i=n.borderColor),i},getPointBorderWidth:function(t,e){var i=this.chart.options.elements.point.borderWidth,n=this.getDataset(),a=t.custom||{};return isNaN(a.borderWidth)?!isNaN(n.pointBorderWidth)||o.isArray(n.pointBorderWidth)?i=o.valueAtIndexOrDefault(n.pointBorderWidth,e,i):isNaN(n.borderWidth)||(i=n.borderWidth):i=a.borderWidth,i},updateElement:function(t,e,i){var n,a,r=this,s=r.getMeta(),l=t.custom||{},u=r.getDataset(),d=r.index,c=u.data[e],h=r.getScaleForId(s.yAxisID),f=r.getScaleForId(s.xAxisID),g=r.chart.options.elements.point;void 0!==u.radius&&void 0===u.pointRadius&&(u.pointRadius=u.radius),void 0!==u.hitRadius&&void 0===u.pointHitRadius&&(u.pointHitRadius=u.hitRadius),n=f.getPixelForValue("object"==typeof c?c:NaN,e,d),a=i?h.getBasePixel():r.calculatePointY(c,e,d),t._xScale=f,t._yScale=h,t._datasetIndex=d,t._index=e,t._model={x:n,y:a,skip:l.skip||isNaN(n)||isNaN(a),radius:l.radius||o.valueAtIndexOrDefault(u.pointRadius,e,g.radius),pointStyle:l.pointStyle||o.valueAtIndexOrDefault(u.pointStyle,e,g.pointStyle),backgroundColor:r.getPointBackgroundColor(t,e),borderColor:r.getPointBorderColor(t,e),borderWidth:r.getPointBorderWidth(t,e),tension:s.dataset._model?s.dataset._model.tension:0,steppedLine:!!s.dataset._model&&s.dataset._model.steppedLine,hitRadius:l.hitRadius||o.valueAtIndexOrDefault(u.pointHitRadius,e,g.hitRadius)}},calculatePointY:function(t,e,i){var n,a,o,r=this.chart,s=this.getMeta(),l=this.getScaleForId(s.yAxisID),u=0,d=0;if(l.options.stacked){for(n=0;n<i;n++)if(a=r.data.datasets[n],"line"===(o=r.getDatasetMeta(n)).type&&o.yAxisID===l.id&&r.isDatasetVisible(n)){var c=Number(l.getRightValue(a.data[e]));c<0?d+=c||0:u+=c||0}var h=Number(l.getRightValue(t));return h<0?l.getPixelForValue(d+h):l.getPixelForValue(u+h)}return l.getPixelForValue(t)},updateBezierControlPoints:function(){var t,e,i,n,a=this.getMeta(),r=this.chart.chartArea,s=a.data||[];function l(t,e,i){return Math.max(Math.min(t,i),e)}if(a.dataset._model.spanGaps&&(s=s.filter(function(t){return!t._model.skip})),"monotone"===a.dataset._model.cubicInterpolationMode)o.splineCurveMonotone(s);else for(t=0,e=s.length;t<e;++t)i=s[t]._model,n=o.splineCurve(o.previousItem(s,t)._model,i,o.nextItem(s,t)._model,a.dataset._model.tension),i.controlPointPreviousX=n.previous.x,i.controlPointPreviousY=n.previous.y,i.controlPointNextX=n.next.x,i.controlPointNextY=n.next.y;if(this.chart.options.elements.line.capBezierPoints)for(t=0,e=s.length;t<e;++t)(i=s[t]._model).controlPointPreviousX=l(i.controlPointPreviousX,r.left,r.right),i.controlPointPreviousY=l(i.controlPointPreviousY,r.top,r.bottom),i.controlPointNextX=l(i.controlPointNextX,r.left,r.right),i.controlPointNextY=l(i.controlPointNextY,r.top,r.bottom)},draw:function(){var t=this.chart,i=this.getMeta(),n=i.data||[],a=t.chartArea,r=n.length,s=0;for(o.canvas.clipArea(t.ctx,a),e(this.getDataset(),t.options)&&i.dataset.draw(),o.canvas.unclipArea(t.ctx);s<r;++s)n[s].draw(a)},setHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],i=t._index,n=t.custom||{},a=t._model;a.radius=n.hoverRadius||o.valueAtIndexOrDefault(e.pointHoverRadius,i,this.chart.options.elements.point.hoverRadius),a.backgroundColor=n.hoverBackgroundColor||o.valueAtIndexOrDefault(e.pointHoverBackgroundColor,i,o.getHoverColor(a.backgroundColor)),a.borderColor=n.hoverBorderColor||o.valueAtIndexOrDefault(e.pointHoverBorderColor,i,o.getHoverColor(a.borderColor)),a.borderWidth=n.hoverBorderWidth||o.valueAtIndexOrDefault(e.pointHoverBorderWidth,i,a.borderWidth)},removeHoverStyle:function(t){var e=this,i=e.chart.data.datasets[t._datasetIndex],n=t._index,a=t.custom||{},r=t._model;void 0!==i.radius&&void 0===i.pointRadius&&(i.pointRadius=i.radius),r.radius=a.radius||o.valueAtIndexOrDefault(i.pointRadius,n,e.chart.options.elements.point.radius),r.backgroundColor=e.getPointBackgroundColor(t,n),r.borderColor=e.getPointBorderColor(t,n),r.borderWidth=e.getPointBorderWidth(t,n)}})}},{25:25,40:40,45:45}],19:[function(t,e,i){"use strict";var n=t(25),a=t(40),o=t(45);n._set("polarArea",{scale:{type:"radialLinear",angleLines:{display:!1},gridLines:{circular:!0},pointLabels:{display:!1},ticks:{beginAtZero:!0}},animation:{animateRotate:!0,animateScale:!0},startAngle:-.5*Math.PI,legendCallback:function(t){var e=[];e.push('<ul class="'+t.id+'-legend">');var i=t.data,n=i.datasets,a=i.labels;if(n.length)for(var o=0;o<n[0].data.length;++o)e.push('<li><span style="background-color:'+n[0].backgroundColor[o]+'"></span>'),a[o]&&e.push(a[o]),e.push("</li>");return e.push("</ul>"),e.join("")},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map(function(i,n){var a=t.getDatasetMeta(0),r=e.datasets[0],s=a.data[n].custom||{},l=o.valueAtIndexOrDefault,u=t.options.elements.arc;return{text:i,fillStyle:s.backgroundColor?s.backgroundColor:l(r.backgroundColor,n,u.backgroundColor),strokeStyle:s.borderColor?s.borderColor:l(r.borderColor,n,u.borderColor),lineWidth:s.borderWidth?s.borderWidth:l(r.borderWidth,n,u.borderWidth),hidden:isNaN(r.data[n])||a.data[n].hidden,index:n}}):[]}},onClick:function(t,e){var i,n,a,o=e.index,r=this.chart;for(i=0,n=(r.data.datasets||[]).length;i<n;++i)(a=r.getDatasetMeta(i)).data[o].hidden=!a.data[o].hidden;r.update()}},tooltips:{callbacks:{title:function(){return""},label:function(t,e){return e.labels[t.index]+": "+t.yLabel}}}}),e.exports=function(t){t.controllers.polarArea=t.DatasetController.extend({dataElementType:a.Arc,linkScales:o.noop,update:function(t){var e=this,i=e.chart,n=i.chartArea,a=e.getMeta(),r=i.options,s=r.elements.arc,l=Math.min(n.right-n.left,n.bottom-n.top);i.outerRadius=Math.max((l-s.borderWidth/2)/2,0),i.innerRadius=Math.max(r.cutoutPercentage?i.outerRadius/100*r.cutoutPercentage:1,0),i.radiusLength=(i.outerRadius-i.innerRadius)/i.getVisibleDatasetCount(),e.outerRadius=i.outerRadius-i.radiusLength*e.index,e.innerRadius=e.outerRadius-i.radiusLength,a.count=e.countVisibleElements(),o.each(a.data,function(i,n){e.updateElement(i,n,t)})},updateElement:function(t,e,i){for(var n=this,a=n.chart,r=n.getDataset(),s=a.options,l=s.animation,u=a.scale,d=a.data.labels,c=n.calculateCircumference(r.data[e]),h=u.xCenter,f=u.yCenter,g=0,p=n.getMeta(),m=0;m<e;++m)isNaN(r.data[m])||p.data[m].hidden||++g;var v=s.startAngle,b=t.hidden?0:u.getDistanceFromCenterForValue(r.data[e]),x=v+c*g,y=x+(t.hidden?0:c),k=l.animateScale?0:u.getDistanceFromCenterForValue(r.data[e]);o.extend(t,{_datasetIndex:n.index,_index:e,_scale:u,_model:{x:h,y:f,innerRadius:0,outerRadius:i?k:b,startAngle:i&&l.animateRotate?v:x,endAngle:i&&l.animateRotate?v:y,label:o.valueAtIndexOrDefault(d,e,d[e])}}),n.removeHoverStyle(t),t.pivot()},removeHoverStyle:function(e){t.DatasetController.prototype.removeHoverStyle.call(this,e,this.chart.options.elements.arc)},countVisibleElements:function(){var t=this.getDataset(),e=this.getMeta(),i=0;return o.each(e.data,function(e,n){isNaN(t.data[n])||e.hidden||i++}),i},calculateCircumference:function(t){var e=this.getMeta().count;return e>0&&!isNaN(t)?2*Math.PI/e:0}})}},{25:25,40:40,45:45}],20:[function(t,e,i){"use strict";var n=t(25),a=t(40),o=t(45);n._set("radar",{scale:{type:"radialLinear"},elements:{line:{tension:0}}}),e.exports=function(t){t.controllers.radar=t.DatasetController.extend({datasetElementType:a.Line,dataElementType:a.Point,linkScales:o.noop,update:function(t){var e=this,i=e.getMeta(),n=i.dataset,a=i.data,r=n.custom||{},s=e.getDataset(),l=e.chart.options.elements.line,u=e.chart.scale;void 0!==s.tension&&void 0===s.lineTension&&(s.lineTension=s.tension),o.extend(i.dataset,{_datasetIndex:e.index,_scale:u,_children:a,_loop:!0,_model:{tension:r.tension?r.tension:o.valueOrDefault(s.lineTension,l.tension),backgroundColor:r.backgroundColor?r.backgroundColor:s.backgroundColor||l.backgroundColor,borderWidth:r.borderWidth?r.borderWidth:s.borderWidth||l.borderWidth,borderColor:r.borderColor?r.borderColor:s.borderColor||l.borderColor,fill:r.fill?r.fill:void 0!==s.fill?s.fill:l.fill,borderCapStyle:r.borderCapStyle?r.borderCapStyle:s.borderCapStyle||l.borderCapStyle,borderDash:r.borderDash?r.borderDash:s.borderDash||l.borderDash,borderDashOffset:r.borderDashOffset?r.borderDashOffset:s.borderDashOffset||l.borderDashOffset,borderJoinStyle:r.borderJoinStyle?r.borderJoinStyle:s.borderJoinStyle||l.borderJoinStyle}}),i.dataset.pivot(),o.each(a,function(i,n){e.updateElement(i,n,t)},e),e.updateBezierControlPoints()},updateElement:function(t,e,i){var n=this,a=t.custom||{},r=n.getDataset(),s=n.chart.scale,l=n.chart.options.elements.point,u=s.getPointPositionForValue(e,r.data[e]);void 0!==r.radius&&void 0===r.pointRadius&&(r.pointRadius=r.radius),void 0!==r.hitRadius&&void 0===r.pointHitRadius&&(r.pointHitRadius=r.hitRadius),o.extend(t,{_datasetIndex:n.index,_index:e,_scale:s,_model:{x:i?s.xCenter:u.x,y:i?s.yCenter:u.y,tension:a.tension?a.tension:o.valueOrDefault(r.lineTension,n.chart.options.elements.line.tension),radius:a.radius?a.radius:o.valueAtIndexOrDefault(r.pointRadius,e,l.radius),backgroundColor:a.backgroundColor?a.backgroundColor:o.valueAtIndexOrDefault(r.pointBackgroundColor,e,l.backgroundColor),borderColor:a.borderColor?a.borderColor:o.valueAtIndexOrDefault(r.pointBorderColor,e,l.borderColor),borderWidth:a.borderWidth?a.borderWidth:o.valueAtIndexOrDefault(r.pointBorderWidth,e,l.borderWidth),pointStyle:a.pointStyle?a.pointStyle:o.valueAtIndexOrDefault(r.pointStyle,e,l.pointStyle),hitRadius:a.hitRadius?a.hitRadius:o.valueAtIndexOrDefault(r.pointHitRadius,e,l.hitRadius)}}),t._model.skip=a.skip?a.skip:isNaN(t._model.x)||isNaN(t._model.y)},updateBezierControlPoints:function(){var t=this.chart.chartArea,e=this.getMeta();o.each(e.data,function(i,n){var a=i._model,r=o.splineCurve(o.previousItem(e.data,n,!0)._model,a,o.nextItem(e.data,n,!0)._model,a.tension);a.controlPointPreviousX=Math.max(Math.min(r.previous.x,t.right),t.left),a.controlPointPreviousY=Math.max(Math.min(r.previous.y,t.bottom),t.top),a.controlPointNextX=Math.max(Math.min(r.next.x,t.right),t.left),a.controlPointNextY=Math.max(Math.min(r.next.y,t.bottom),t.top),i.pivot()})},setHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],i=t.custom||{},n=t._index,a=t._model;a.radius=i.hoverRadius?i.hoverRadius:o.valueAtIndexOrDefault(e.pointHoverRadius,n,this.chart.options.elements.point.hoverRadius),a.backgroundColor=i.hoverBackgroundColor?i.hoverBackgroundColor:o.valueAtIndexOrDefault(e.pointHoverBackgroundColor,n,o.getHoverColor(a.backgroundColor)),a.borderColor=i.hoverBorderColor?i.hoverBorderColor:o.valueAtIndexOrDefault(e.pointHoverBorderColor,n,o.getHoverColor(a.borderColor)),a.borderWidth=i.hoverBorderWidth?i.hoverBorderWidth:o.valueAtIndexOrDefault(e.pointHoverBorderWidth,n,a.borderWidth)},removeHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],i=t.custom||{},n=t._index,a=t._model,r=this.chart.options.elements.point;a.radius=i.radius?i.radius:o.valueAtIndexOrDefault(e.pointRadius,n,r.radius),a.backgroundColor=i.backgroundColor?i.backgroundColor:o.valueAtIndexOrDefault(e.pointBackgroundColor,n,r.backgroundColor),a.borderColor=i.borderColor?i.borderColor:o.valueAtIndexOrDefault(e.pointBorderColor,n,r.borderColor),a.borderWidth=i.borderWidth?i.borderWidth:o.valueAtIndexOrDefault(e.pointBorderWidth,n,r.borderWidth)}})}},{25:25,40:40,45:45}],21:[function(t,e,i){"use strict";t(25)._set("scatter",{hover:{mode:"single"},scales:{xAxes:[{id:"x-axis-1",type:"linear",position:"bottom"}],yAxes:[{id:"y-axis-1",type:"linear",position:"left"}]},showLines:!1,tooltips:{callbacks:{title:function(){return""},label:function(t){return"("+t.xLabel+", "+t.yLabel+")"}}}}),e.exports=function(t){t.controllers.scatter=t.controllers.line}},{25:25}],22:[function(t,e,i){"use strict";var n=t(25),a=t(26),o=t(45);n._set("global",{animation:{duration:1e3,easing:"easeOutQuart",onProgress:o.noop,onComplete:o.noop}}),e.exports=function(t){t.Animation=a.extend({chart:null,currentStep:0,numSteps:60,easing:"",render:null,onAnimationProgress:null,onAnimationComplete:null}),t.animationService={frameDuration:17,animations:[],dropFrames:0,request:null,addAnimation:function(t,e,i,n){var a,o,r=this.animations;for(e.chart=t,n||(t.animating=!0),a=0,o=r.length;a<o;++a)if(r[a].chart===t)return void(r[a]=e);r.push(e),1===r.length&&this.requestAnimationFrame()},cancelAnimation:function(t){var e=o.findIndex(this.animations,function(e){return e.chart===t});-1!==e&&(this.animations.splice(e,1),t.animating=!1)},requestAnimationFrame:function(){var t=this;null===t.request&&(t.request=o.requestAnimFrame.call(window,function(){t.request=null,t.startDigest()}))},startDigest:function(){var t=this,e=Date.now(),i=0;t.dropFrames>1&&(i=Math.floor(t.dropFrames),t.dropFrames=t.dropFrames%1),t.advance(1+i);var n=Date.now();t.dropFrames+=(n-e)/t.frameDuration,t.animations.length>0&&t.requestAnimationFrame()},advance:function(t){for(var e,i,n=this.animations,a=0;a<n.length;)i=(e=n[a]).chart,e.currentStep=(e.currentStep||0)+t,e.currentStep=Math.min(e.currentStep,e.numSteps),o.callback(e.render,[i,e],i),o.callback(e.onAnimationProgress,[e],i),e.currentStep>=e.numSteps?(o.callback(e.onAnimationComplete,[e],i),i.animating=!1,n.splice(a,1)):++a}},Object.defineProperty(t.Animation.prototype,"animationObject",{get:function(){return this}}),Object.defineProperty(t.Animation.prototype,"chartInstance",{get:function(){return this.chart},set:function(t){this.chart=t}})}},{25:25,26:26,45:45}],23:[function(t,e,i){"use strict";var n=t(25),a=t(45),o=t(28),r=t(30),s=t(48),l=t(31);e.exports=function(t){function e(t){return"top"===t||"bottom"===t}t.types={},t.instances={},t.controllers={},a.extend(t.prototype,{construct:function(e,i){var o,r,l=this;(r=(o=(o=i)||{}).data=o.data||{}).datasets=r.datasets||[],r.labels=r.labels||[],o.options=a.configMerge(n.global,n[o.type],o.options||{}),i=o;var u=s.acquireContext(e,i),d=u&&u.canvas,c=d&&d.height,h=d&&d.width;l.id=a.uid(),l.ctx=u,l.canvas=d,l.config=i,l.width=h,l.height=c,l.aspectRatio=c?h/c:null,l.options=i.options,l._bufferedRender=!1,l.chart=l,l.controller=l,t.instances[l.id]=l,Object.defineProperty(l,"data",{get:function(){return l.config.data},set:function(t){l.config.data=t}}),u&&d?(l.initialize(),l.update()):console.error("Failed to create chart: can't acquire context from the given item")},initialize:function(){var t=this;return l.notify(t,"beforeInit"),a.retinaScale(t,t.options.devicePixelRatio),t.bindEvents(),t.options.responsive&&t.resize(!0),t.ensureScalesHaveIDs(),t.buildOrUpdateScales(),t.initToolTip(),l.notify(t,"afterInit"),t},clear:function(){return a.canvas.clear(this),this},stop:function(){return t.animationService.cancelAnimation(this),this},resize:function(t){var e=this,i=e.options,n=e.canvas,o=i.maintainAspectRatio&&e.aspectRatio||null,r=Math.max(0,Math.floor(a.getMaximumWidth(n))),s=Math.max(0,Math.floor(o?r/o:a.getMaximumHeight(n)));if((e.width!==r||e.height!==s)&&(n.width=e.width=r,n.height=e.height=s,n.style.width=r+"px",n.style.height=s+"px",a.retinaScale(e,i.devicePixelRatio),!t)){var u={width:r,height:s};l.notify(e,"resize",[u]),e.options.onResize&&e.options.onResize(e,u),e.stop(),e.update(e.options.responsiveAnimationDuration)}},ensureScalesHaveIDs:function(){var t=this.options,e=t.scales||{},i=t.scale;a.each(e.xAxes,function(t,e){t.id=t.id||"x-axis-"+e}),a.each(e.yAxes,function(t,e){t.id=t.id||"y-axis-"+e}),i&&(i.id=i.id||"scale")},buildOrUpdateScales:function(){var i=this,n=i.options,o=i.scales||{},r=[],s=Object.keys(o).reduce(function(t,e){return t[e]=!1,t},{});n.scales&&(r=r.concat((n.scales.xAxes||[]).map(function(t){return{options:t,dtype:"category",dposition:"bottom"}}),(n.scales.yAxes||[]).map(function(t){return{options:t,dtype:"linear",dposition:"left"}}))),n.scale&&r.push({options:n.scale,dtype:"radialLinear",isDefault:!0,dposition:"chartArea"}),a.each(r,function(n){var r=n.options,l=r.id,u=a.valueOrDefault(r.type,n.dtype);e(r.position)!==e(n.dposition)&&(r.position=n.dposition),s[l]=!0;var d=null;if(l in o&&o[l].type===u)(d=o[l]).options=r,d.ctx=i.ctx,d.chart=i;else{var c=t.scaleService.getScaleConstructor(u);if(!c)return;d=new c({id:l,type:u,options:r,ctx:i.ctx,chart:i}),o[d.id]=d}d.mergeTicksOptions(),n.isDefault&&(i.scale=d)}),a.each(s,function(t,e){t||delete o[e]}),i.scales=o,t.scaleService.addScalesToLayout(this)},buildOrUpdateControllers:function(){var e=this,i=[],n=[];return a.each(e.data.datasets,function(a,o){var r=e.getDatasetMeta(o),s=a.type||e.config.type;if(r.type&&r.type!==s&&(e.destroyDatasetMeta(o),r=e.getDatasetMeta(o)),r.type=s,i.push(r.type),r.controller)r.controller.updateIndex(o),r.controller.linkScales();else{var l=t.controllers[r.type];if(void 0===l)throw new Error('"'+r.type+'" is not a chart type.');r.controller=new l(e,o),n.push(r.controller)}},e),n},resetElements:function(){var t=this;a.each(t.data.datasets,function(e,i){t.getDatasetMeta(i).controller.reset()},t)},reset:function(){this.resetElements(),this.tooltip.initialize()},update:function(e){var i,n,o=this;if(e&&"object"==typeof e||(e={duration:e,lazy:arguments[1]}),n=(i=o).options,a.each(i.scales,function(t){r.removeBox(i,t)}),n=a.configMerge(t.defaults.global,t.defaults[i.config.type],n),i.options=i.config.options=n,i.ensureScalesHaveIDs(),i.buildOrUpdateScales(),i.tooltip._options=n.tooltips,i.tooltip.initialize(),l._invalidate(o),!1!==l.notify(o,"beforeUpdate")){o.tooltip._data=o.data;var s=o.buildOrUpdateControllers();a.each(o.data.datasets,function(t,e){o.getDatasetMeta(e).controller.buildOrUpdateElements()},o),o.updateLayout(),o.options.animation&&o.options.animation.duration&&a.each(s,function(t){t.reset()}),o.updateDatasets(),o.tooltip.initialize(),o.lastActive=[],l.notify(o,"afterUpdate"),o._bufferedRender?o._bufferedRequest={duration:e.duration,easing:e.easing,lazy:e.lazy}:o.render(e)}},updateLayout:function(){!1!==l.notify(this,"beforeLayout")&&(r.update(this,this.width,this.height),l.notify(this,"afterScaleUpdate"),l.notify(this,"afterLayout"))},updateDatasets:function(){if(!1!==l.notify(this,"beforeDatasetsUpdate")){for(var t=0,e=this.data.datasets.length;t<e;++t)this.updateDataset(t);l.notify(this,"afterDatasetsUpdate")}},updateDataset:function(t){var e=this.getDatasetMeta(t),i={meta:e,index:t};!1!==l.notify(this,"beforeDatasetUpdate",[i])&&(e.controller.update(),l.notify(this,"afterDatasetUpdate",[i]))},render:function(e){var i=this;e&&"object"==typeof e||(e={duration:e,lazy:arguments[1]});var n=e.duration,o=e.lazy;if(!1!==l.notify(i,"beforeRender")){var r=i.options.animation,s=function(t){l.notify(i,"afterRender"),a.callback(r&&r.onComplete,[t],i)};if(r&&(void 0!==n&&0!==n||void 0===n&&0!==r.duration)){var u=new t.Animation({numSteps:(n||r.duration)/16.66,easing:e.easing||r.easing,render:function(t,e){var i=a.easing.effects[e.easing],n=e.currentStep,o=n/e.numSteps;t.draw(i(o),o,n)},onAnimationProgress:r.onProgress,onAnimationComplete:s});t.animationService.addAnimation(i,u,n,o)}else i.draw(),s(new t.Animation({numSteps:0,chart:i}));return i}},draw:function(t){var e=this;e.clear(),a.isNullOrUndef(t)&&(t=1),e.transition(t),!1!==l.notify(e,"beforeDraw",[t])&&(a.each(e.boxes,function(t){t.draw(e.chartArea)},e),e.scale&&e.scale.draw(),e.drawDatasets(t),e._drawTooltip(t),l.notify(e,"afterDraw",[t]))},transition:function(t){for(var e=0,i=(this.data.datasets||[]).length;e<i;++e)this.isDatasetVisible(e)&&this.getDatasetMeta(e).controller.transition(t);this.tooltip.transition(t)},drawDatasets:function(t){var e=this;if(!1!==l.notify(e,"beforeDatasetsDraw",[t])){for(var i=(e.data.datasets||[]).length-1;i>=0;--i)e.isDatasetVisible(i)&&e.drawDataset(i,t);l.notify(e,"afterDatasetsDraw",[t])}},drawDataset:function(t,e){var i=this.getDatasetMeta(t),n={meta:i,index:t,easingValue:e};!1!==l.notify(this,"beforeDatasetDraw",[n])&&(i.controller.draw(e),l.notify(this,"afterDatasetDraw",[n]))},_drawTooltip:function(t){var e=this.tooltip,i={tooltip:e,easingValue:t};!1!==l.notify(this,"beforeTooltipDraw",[i])&&(e.draw(),l.notify(this,"afterTooltipDraw",[i]))},getElementAtEvent:function(t){return o.modes.single(this,t)},getElementsAtEvent:function(t){return o.modes.label(this,t,{intersect:!0})},getElementsAtXAxis:function(t){return o.modes["x-axis"](this,t,{intersect:!0})},getElementsAtEventForMode:function(t,e,i){var n=o.modes[e];return"function"==typeof n?n(this,t,i):[]},getDatasetAtEvent:function(t){return o.modes.dataset(this,t,{intersect:!0})},getDatasetMeta:function(t){var e=this.data.datasets[t];e._meta||(e._meta={});var i=e._meta[this.id];return i||(i=e._meta[this.id]={type:null,data:[],dataset:null,controller:null,hidden:null,xAxisID:null,yAxisID:null}),i},getVisibleDatasetCount:function(){for(var t=0,e=0,i=this.data.datasets.length;e<i;++e)this.isDatasetVisible(e)&&t++;return t},isDatasetVisible:function(t){var e=this.getDatasetMeta(t);return"boolean"==typeof e.hidden?!e.hidden:!this.data.datasets[t].hidden},generateLegend:function(){return this.options.legendCallback(this)},destroyDatasetMeta:function(t){var e=this.id,i=this.data.datasets[t],n=i._meta&&i._meta[e];n&&(n.controller.destroy(),delete i._meta[e])},destroy:function(){var e,i,n=this,o=n.canvas;for(n.stop(),e=0,i=n.data.datasets.length;e<i;++e)n.destroyDatasetMeta(e);o&&(n.unbindEvents(),a.canvas.clear(n),s.releaseContext(n.ctx),n.canvas=null,n.ctx=null),l.notify(n,"destroy"),delete t.instances[n.id]},toBase64Image:function(){return this.canvas.toDataURL.apply(this.canvas,arguments)},initToolTip:function(){var e=this;e.tooltip=new t.Tooltip({_chart:e,_chartInstance:e,_data:e.data,_options:e.options.tooltips},e)},bindEvents:function(){var t=this,e=t._listeners={},i=function(){t.eventHandler.apply(t,arguments)};a.each(t.options.events,function(n){s.addEventListener(t,n,i),e[n]=i}),t.options.responsive&&(i=function(){t.resize()},s.addEventListener(t,"resize",i),e.resize=i)},unbindEvents:function(){var t=this,e=t._listeners;e&&(delete t._listeners,a.each(e,function(e,i){s.removeEventListener(t,i,e)}))},updateHoverStyle:function(t,e,i){var n,a,o,r=i?"setHoverStyle":"removeHoverStyle";for(a=0,o=t.length;a<o;++a)(n=t[a])&&this.getDatasetMeta(n._datasetIndex).controller[r](n)},eventHandler:function(t){var e=this,i=e.tooltip;if(!1!==l.notify(e,"beforeEvent",[t])){e._bufferedRender=!0,e._bufferedRequest=null;var n=e.handleEvent(t);i&&(n=i._start?i.handleEvent(t):n|i.handleEvent(t)),l.notify(e,"afterEvent",[t]);var a=e._bufferedRequest;return a?e.render(a):n&&!e.animating&&(e.stop(),e.render(e.options.hover.animationDuration,!0)),e._bufferedRender=!1,e._bufferedRequest=null,e}},handleEvent:function(t){var e,i=this,n=i.options||{},o=n.hover;return i.lastActive=i.lastActive||[],"mouseout"===t.type?i.active=[]:i.active=i.getElementsAtEventForMode(t,o.mode,o),a.callback(n.onHover||n.hover.onHover,[t.native,i.active],i),"mouseup"!==t.type&&"click"!==t.type||n.onClick&&n.onClick.call(i,t.native,i.active),i.lastActive.length&&i.updateHoverStyle(i.lastActive,o.mode,!1),i.active.length&&o.mode&&i.updateHoverStyle(i.active,o.mode,!0),e=!a.arrayEquals(i.active,i.lastActive),i.lastActive=i.active,e}}),t.Controller=t}},{25:25,28:28,30:30,31:31,45:45,48:48}],24:[function(t,e,i){"use strict";var n=t(45);e.exports=function(t){var e=["push","pop","shift","splice","unshift"];function i(t,i){var n=t._chartjs;if(n){var a=n.listeners,o=a.indexOf(i);-1!==o&&a.splice(o,1),a.length>0||(e.forEach(function(e){delete t[e]}),delete t._chartjs)}}t.DatasetController=function(t,e){this.initialize(t,e)},n.extend(t.DatasetController.prototype,{datasetElementType:null,dataElementType:null,initialize:function(t,e){this.chart=t,this.index=e,this.linkScales(),this.addElements()},updateIndex:function(t){this.index=t},linkScales:function(){var t=this,e=t.getMeta(),i=t.getDataset();null!==e.xAxisID&&e.xAxisID in t.chart.scales||(e.xAxisID=i.xAxisID||t.chart.options.scales.xAxes[0].id),null!==e.yAxisID&&e.yAxisID in t.chart.scales||(e.yAxisID=i.yAxisID||t.chart.options.scales.yAxes[0].id)},getDataset:function(){return this.chart.data.datasets[this.index]},getMeta:function(){return this.chart.getDatasetMeta(this.index)},getScaleForId:function(t){return this.chart.scales[t]},reset:function(){this.update(!0)},destroy:function(){this._data&&i(this._data,this)},createMetaDataset:function(){var t=this.datasetElementType;return t&&new t({_chart:this.chart,_datasetIndex:this.index})},createMetaData:function(t){var e=this.dataElementType;return e&&new e({_chart:this.chart,_datasetIndex:this.index,_index:t})},addElements:function(){var t,e,i=this.getMeta(),n=this.getDataset().data||[],a=i.data;for(t=0,e=n.length;t<e;++t)a[t]=a[t]||this.createMetaData(t);i.dataset=i.dataset||this.createMetaDataset()},addElementAndReset:function(t){var e=this.createMetaData(t);this.getMeta().data.splice(t,0,e),this.updateElement(e,t,!0)},buildOrUpdateElements:function(){var t,a,o=this,r=o.getDataset(),s=r.data||(r.data=[]);o._data!==s&&(o._data&&i(o._data,o),a=o,(t=s)._chartjs?t._chartjs.listeners.push(a):(Object.defineProperty(t,"_chartjs",{configurable:!0,enumerable:!1,value:{listeners:[a]}}),e.forEach(function(e){var i="onData"+e.charAt(0).toUpperCase()+e.slice(1),a=t[e];Object.defineProperty(t,e,{configurable:!0,enumerable:!1,value:function(){var e=Array.prototype.slice.call(arguments),o=a.apply(this,e);return n.each(t._chartjs.listeners,function(t){"function"==typeof t[i]&&t[i].apply(t,e)}),o}})})),o._data=s),o.resyncElements()},update:n.noop,transition:function(t){for(var e=this.getMeta(),i=e.data||[],n=i.length,a=0;a<n;++a)i[a].transition(t);e.dataset&&e.dataset.transition(t)},draw:function(){var t=this.getMeta(),e=t.data||[],i=e.length,n=0;for(t.dataset&&t.dataset.draw();n<i;++n)e[n].draw()},removeHoverStyle:function(t,e){var i=this.chart.data.datasets[t._datasetIndex],a=t._index,o=t.custom||{},r=n.valueAtIndexOrDefault,s=t._model;s.backgroundColor=o.backgroundColor?o.backgroundColor:r(i.backgroundColor,a,e.backgroundColor),s.borderColor=o.borderColor?o.borderColor:r(i.borderColor,a,e.borderColor),s.borderWidth=o.borderWidth?o.borderWidth:r(i.borderWidth,a,e.borderWidth)},setHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],i=t._index,a=t.custom||{},o=n.valueAtIndexOrDefault,r=n.getHoverColor,s=t._model;s.backgroundColor=a.hoverBackgroundColor?a.hoverBackgroundColor:o(e.hoverBackgroundColor,i,r(s.backgroundColor)),s.borderColor=a.hoverBorderColor?a.hoverBorderColor:o(e.hoverBorderColor,i,r(s.borderColor)),s.borderWidth=a.hoverBorderWidth?a.hoverBorderWidth:o(e.hoverBorderWidth,i,s.borderWidth)},resyncElements:function(){var t=this.getMeta(),e=this.getDataset().data,i=t.data.length,n=e.length;n<i?t.data.splice(n,i-n):n>i&&this.insertElements(i,n-i)},insertElements:function(t,e){for(var i=0;i<e;++i)this.addElementAndReset(t+i)},onDataPush:function(){this.insertElements(this.getDataset().data.length-1,arguments.length)},onDataPop:function(){this.getMeta().data.pop()},onDataShift:function(){this.getMeta().data.shift()},onDataSplice:function(t,e){this.getMeta().data.splice(t,e),this.insertElements(t,arguments.length-2)},onDataUnshift:function(){this.insertElements(0,arguments.length)}}),t.DatasetController.extend=n.inherits}},{45:45}],25:[function(t,e,i){"use strict";var n=t(45);e.exports={_set:function(t,e){return n.merge(this[t]||(this[t]={}),e)}}},{45:45}],26:[function(t,e,i){"use strict";var n=t(3),a=t(45);var o=function(t){a.extend(this,t),this.initialize.apply(this,arguments)};a.extend(o.prototype,{initialize:function(){this.hidden=!1},pivot:function(){var t=this;return t._view||(t._view=a.clone(t._model)),t._start={},t},transition:function(t){var e=this,i=e._model,a=e._start,o=e._view;return i&&1!==t?(o||(o=e._view={}),a||(a=e._start={}),function(t,e,i,a){var o,r,s,l,u,d,c,h,f,g=Object.keys(i);for(o=0,r=g.length;o<r;++o)if(d=i[s=g[o]],e.hasOwnProperty(s)||(e[s]=d),(l=e[s])!==d&&"_"!==s[0]){if(t.hasOwnProperty(s)||(t[s]=l),(c=typeof d)==typeof(u=t[s]))if("string"===c){if((h=n(u)).valid&&(f=n(d)).valid){e[s]=f.mix(h,a).rgbString();continue}}else if("number"===c&&isFinite(u)&&isFinite(d)){e[s]=u+(d-u)*a;continue}e[s]=d}}(a,o,i,t),e):(e._view=i,e._start=null,e)},tooltipPosition:function(){return{x:this._model.x,y:this._model.y}},hasValue:function(){return a.isNumber(this._model.x)&&a.isNumber(this._model.y)}}),o.extend=a.inherits,e.exports=o},{3:3,45:45}],27:[function(t,e,i){"use strict";var n=t(3),a=t(25),o=t(45);e.exports=function(t){function e(t,e,i){var n;return"string"==typeof t?(n=parseInt(t,10),-1!==t.indexOf("%")&&(n=n/100*e.parentNode[i])):n=t,n}function i(t){return null!=t&&"none"!==t}function r(t,n,a){var o=document.defaultView,r=t.parentNode,s=o.getComputedStyle(t)[n],l=o.getComputedStyle(r)[n],u=i(s),d=i(l),c=Number.POSITIVE_INFINITY;return u||d?Math.min(u?e(s,t,a):c,d?e(l,r,a):c):"none"}o.configMerge=function(){return o.merge(o.clone(arguments[0]),[].slice.call(arguments,1),{merger:function(e,i,n,a){var r=i[e]||{},s=n[e];"scales"===e?i[e]=o.scaleMerge(r,s):"scale"===e?i[e]=o.merge(r,[t.scaleService.getScaleDefaults(s.type),s]):o._merger(e,i,n,a)}})},o.scaleMerge=function(){return o.merge(o.clone(arguments[0]),[].slice.call(arguments,1),{merger:function(e,i,n,a){if("xAxes"===e||"yAxes"===e){var r,s,l,u=n[e].length;for(i[e]||(i[e]=[]),r=0;r<u;++r)l=n[e][r],s=o.valueOrDefault(l.type,"xAxes"===e?"category":"linear"),r>=i[e].length&&i[e].push({}),!i[e][r].type||l.type&&l.type!==i[e][r].type?o.merge(i[e][r],[t.scaleService.getScaleDefaults(s),l]):o.merge(i[e][r],l)}else o._merger(e,i,n,a)}})},o.where=function(t,e){if(o.isArray(t)&&Array.prototype.filter)return t.filter(e);var i=[];return o.each(t,function(t){e(t)&&i.push(t)}),i},o.findIndex=Array.prototype.findIndex?function(t,e,i){return t.findIndex(e,i)}:function(t,e,i){i=void 0===i?t:i;for(var n=0,a=t.length;n<a;++n)if(e.call(i,t[n],n,t))return n;return-1},o.findNextWhere=function(t,e,i){o.isNullOrUndef(i)&&(i=-1);for(var n=i+1;n<t.length;n++){var a=t[n];if(e(a))return a}},o.findPreviousWhere=function(t,e,i){o.isNullOrUndef(i)&&(i=t.length);for(var n=i-1;n>=0;n--){var a=t[n];if(e(a))return a}},o.isNumber=function(t){return!isNaN(parseFloat(t))&&isFinite(t)},o.almostEquals=function(t,e,i){return Math.abs(t-e)<i},o.almostWhole=function(t,e){var i=Math.round(t);return i-e<t&&i+e>t},o.max=function(t){return t.reduce(function(t,e){return isNaN(e)?t:Math.max(t,e)},Number.NEGATIVE_INFINITY)},o.min=function(t){return t.reduce(function(t,e){return isNaN(e)?t:Math.min(t,e)},Number.POSITIVE_INFINITY)},o.sign=Math.sign?function(t){return Math.sign(t)}:function(t){return 0===(t=+t)||isNaN(t)?t:t>0?1:-1},o.log10=Math.log10?function(t){return Math.log10(t)}:function(t){var e=Math.log(t)*Math.LOG10E,i=Math.round(e);return t===Math.pow(10,i)?i:e},o.toRadians=function(t){return t*(Math.PI/180)},o.toDegrees=function(t){return t*(180/Math.PI)},o.getAngleFromPoint=function(t,e){var i=e.x-t.x,n=e.y-t.y,a=Math.sqrt(i*i+n*n),o=Math.atan2(n,i);return o<-.5*Math.PI&&(o+=2*Math.PI),{angle:o,distance:a}},o.distanceBetweenPoints=function(t,e){return Math.sqrt(Math.pow(e.x-t.x,2)+Math.pow(e.y-t.y,2))},o.aliasPixel=function(t){return t%2==0?0:.5},o.splineCurve=function(t,e,i,n){var a=t.skip?e:t,o=e,r=i.skip?e:i,s=Math.sqrt(Math.pow(o.x-a.x,2)+Math.pow(o.y-a.y,2)),l=Math.sqrt(Math.pow(r.x-o.x,2)+Math.pow(r.y-o.y,2)),u=s/(s+l),d=l/(s+l),c=n*(u=isNaN(u)?0:u),h=n*(d=isNaN(d)?0:d);return{previous:{x:o.x-c*(r.x-a.x),y:o.y-c*(r.y-a.y)},next:{x:o.x+h*(r.x-a.x),y:o.y+h*(r.y-a.y)}}},o.EPSILON=Number.EPSILON||1e-14,o.splineCurveMonotone=function(t){var e,i,n,a,r,s,l,u,d,c=(t||[]).map(function(t){return{model:t._model,deltaK:0,mK:0}}),h=c.length;for(e=0;e<h;++e)if(!(n=c[e]).model.skip){if(i=e>0?c[e-1]:null,(a=e<h-1?c[e+1]:null)&&!a.model.skip){var f=a.model.x-n.model.x;n.deltaK=0!==f?(a.model.y-n.model.y)/f:0}!i||i.model.skip?n.mK=n.deltaK:!a||a.model.skip?n.mK=i.deltaK:this.sign(i.deltaK)!==this.sign(n.deltaK)?n.mK=0:n.mK=(i.deltaK+n.deltaK)/2}for(e=0;e<h-1;++e)n=c[e],a=c[e+1],n.model.skip||a.model.skip||(o.almostEquals(n.deltaK,0,this.EPSILON)?n.mK=a.mK=0:(r=n.mK/n.deltaK,s=a.mK/n.deltaK,(u=Math.pow(r,2)+Math.pow(s,2))<=9||(l=3/Math.sqrt(u),n.mK=r*l*n.deltaK,a.mK=s*l*n.deltaK)));for(e=0;e<h;++e)(n=c[e]).model.skip||(i=e>0?c[e-1]:null,a=e<h-1?c[e+1]:null,i&&!i.model.skip&&(d=(n.model.x-i.model.x)/3,n.model.controlPointPreviousX=n.model.x-d,n.model.controlPointPreviousY=n.model.y-d*n.mK),a&&!a.model.skip&&(d=(a.model.x-n.model.x)/3,n.model.controlPointNextX=n.model.x+d,n.model.controlPointNextY=n.model.y+d*n.mK))},o.nextItem=function(t,e,i){return i?e>=t.length-1?t[0]:t[e+1]:e>=t.length-1?t[t.length-1]:t[e+1]},o.previousItem=function(t,e,i){return i?e<=0?t[t.length-1]:t[e-1]:e<=0?t[0]:t[e-1]},o.niceNum=function(t,e){var i=Math.floor(o.log10(t)),n=t/Math.pow(10,i);return(e?n<1.5?1:n<3?2:n<7?5:10:n<=1?1:n<=2?2:n<=5?5:10)*Math.pow(10,i)},o.requestAnimFrame="undefined"==typeof window?function(t){t()}:window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(t){return window.setTimeout(t,1e3/60)},o.getRelativePosition=function(t,e){var i,n,a=t.originalEvent||t,r=t.currentTarget||t.srcElement,s=r.getBoundingClientRect(),l=a.touches;l&&l.length>0?(i=l[0].clientX,n=l[0].clientY):(i=a.clientX,n=a.clientY);var u=parseFloat(o.getStyle(r,"padding-left")),d=parseFloat(o.getStyle(r,"padding-top")),c=parseFloat(o.getStyle(r,"padding-right")),h=parseFloat(o.getStyle(r,"padding-bottom")),f=s.right-s.left-u-c,g=s.bottom-s.top-d-h;return{x:i=Math.round((i-s.left-u)/f*r.width/e.currentDevicePixelRatio),y:n=Math.round((n-s.top-d)/g*r.height/e.currentDevicePixelRatio)}},o.getConstraintWidth=function(t){return r(t,"max-width","clientWidth")},o.getConstraintHeight=function(t){return r(t,"max-height","clientHeight")},o.getMaximumWidth=function(t){var e=t.parentNode;if(!e)return t.clientWidth;var i=parseInt(o.getStyle(e,"padding-left"),10),n=parseInt(o.getStyle(e,"padding-right"),10),a=e.clientWidth-i-n,r=o.getConstraintWidth(t);return isNaN(r)?a:Math.min(a,r)},o.getMaximumHeight=function(t){var e=t.parentNode;if(!e)return t.clientHeight;var i=parseInt(o.getStyle(e,"padding-top"),10),n=parseInt(o.getStyle(e,"padding-bottom"),10),a=e.clientHeight-i-n,r=o.getConstraintHeight(t);return isNaN(r)?a:Math.min(a,r)},o.getStyle=function(t,e){return t.currentStyle?t.currentStyle[e]:document.defaultView.getComputedStyle(t,null).getPropertyValue(e)},o.retinaScale=function(t,e){var i=t.currentDevicePixelRatio=e||window.devicePixelRatio||1;if(1!==i){var n=t.canvas,a=t.height,o=t.width;n.height=a*i,n.width=o*i,t.ctx.scale(i,i),n.style.height||n.style.width||(n.style.height=a+"px",n.style.width=o+"px")}},o.fontString=function(t,e,i){return e+" "+t+"px "+i},o.longestText=function(t,e,i,n){var a=(n=n||{}).data=n.data||{},r=n.garbageCollect=n.garbageCollect||[];n.font!==e&&(a=n.data={},r=n.garbageCollect=[],n.font=e),t.font=e;var s=0;o.each(i,function(e){null!=e&&!0!==o.isArray(e)?s=o.measureText(t,a,r,s,e):o.isArray(e)&&o.each(e,function(e){null==e||o.isArray(e)||(s=o.measureText(t,a,r,s,e))})});var l=r.length/2;if(l>i.length){for(var u=0;u<l;u++)delete a[r[u]];r.splice(0,l)}return s},o.measureText=function(t,e,i,n,a){var o=e[a];return o||(o=e[a]=t.measureText(a).width,i.push(a)),o>n&&(n=o),n},o.numberOfLabelLines=function(t){var e=1;return o.each(t,function(t){o.isArray(t)&&t.length>e&&(e=t.length)}),e},o.color=n?function(t){return t instanceof CanvasGradient&&(t=a.global.defaultColor),n(t)}:function(t){return console.error("Color.js not found!"),t},o.getHoverColor=function(t){return t instanceof CanvasPattern?t:o.color(t).saturate(.5).darken(.1).rgbString()}}},{25:25,3:3,45:45}],28:[function(t,e,i){"use strict";var n=t(45);function a(t,e){return t.native?{x:t.x,y:t.y}:n.getRelativePosition(t,e)}function o(t,e){var i,n,a,o,r;for(n=0,o=t.data.datasets.length;n<o;++n)if(t.isDatasetVisible(n))for(a=0,r=(i=t.getDatasetMeta(n)).data.length;a<r;++a){var s=i.data[a];s._view.skip||e(s)}}function r(t,e){var i=[];return o(t,function(t){t.inRange(e.x,e.y)&&i.push(t)}),i}function s(t,e,i,n){var a=Number.POSITIVE_INFINITY,r=[];return o(t,function(t){if(!i||t.inRange(e.x,e.y)){var o=t.getCenterPoint(),s=n(e,o);s<a?(r=[t],a=s):s===a&&r.push(t)}}),r}function l(t){var e=-1!==t.indexOf("x"),i=-1!==t.indexOf("y");return function(t,n){var a=e?Math.abs(t.x-n.x):0,o=i?Math.abs(t.y-n.y):0;return Math.sqrt(Math.pow(a,2)+Math.pow(o,2))}}function u(t,e,i){var n=a(e,t);i.axis=i.axis||"x";var o=l(i.axis),u=i.intersect?r(t,n):s(t,n,!1,o),d=[];return u.length?(t.data.datasets.forEach(function(e,i){if(t.isDatasetVisible(i)){var n=t.getDatasetMeta(i).data[u[0]._index];n&&!n._view.skip&&d.push(n)}}),d):[]}e.exports={modes:{single:function(t,e){var i=a(e,t),n=[];return o(t,function(t){if(t.inRange(i.x,i.y))return n.push(t),n}),n.slice(0,1)},label:u,index:u,dataset:function(t,e,i){var n=a(e,t);i.axis=i.axis||"xy";var o=l(i.axis),u=i.intersect?r(t,n):s(t,n,!1,o);return u.length>0&&(u=t.getDatasetMeta(u[0]._datasetIndex).data),u},"x-axis":function(t,e){return u(t,e,{intersect:!1})},point:function(t,e){return r(t,a(e,t))},nearest:function(t,e,i){var n=a(e,t);i.axis=i.axis||"xy";var o=l(i.axis),r=s(t,n,i.intersect,o);return r.length>1&&r.sort(function(t,e){var i=t.getArea()-e.getArea();return 0===i&&(i=t._datasetIndex-e._datasetIndex),i}),r.slice(0,1)},x:function(t,e,i){var n=a(e,t),r=[],s=!1;return o(t,function(t){t.inXRange(n.x)&&r.push(t),t.inRange(n.x,n.y)&&(s=!0)}),i.intersect&&!s&&(r=[]),r},y:function(t,e,i){var n=a(e,t),r=[],s=!1;return o(t,function(t){t.inYRange(n.y)&&r.push(t),t.inRange(n.x,n.y)&&(s=!0)}),i.intersect&&!s&&(r=[]),r}}}},{45:45}],29:[function(t,e,i){"use strict";t(25)._set("global",{responsive:!0,responsiveAnimationDuration:0,maintainAspectRatio:!0,events:["mousemove","mouseout","click","touchstart","touchmove"],hover:{onHover:null,mode:"nearest",intersect:!0,animationDuration:400},onClick:null,defaultColor:"rgba(0,0,0,0.1)",defaultFontColor:"#666",defaultFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",defaultFontSize:12,defaultFontStyle:"normal",showLines:!0,elements:{},layout:{padding:{top:0,right:0,bottom:0,left:0}}}),e.exports=function(){var t=function(t,e){return this.construct(t,e),this};return t.Chart=t,t}},{25:25}],30:[function(t,e,i){"use strict";var n=t(45);function a(t,e){return n.where(t,function(t){return t.position===e})}function o(t,e){t.forEach(function(t,e){return t._tmpIndex_=e,t}),t.sort(function(t,i){var n=e?i:t,a=e?t:i;return n.weight===a.weight?n._tmpIndex_-a._tmpIndex_:n.weight-a.weight}),t.forEach(function(t){delete t._tmpIndex_})}e.exports={defaults:{},addBox:function(t,e){t.boxes||(t.boxes=[]),e.fullWidth=e.fullWidth||!1,e.position=e.position||"top",e.weight=e.weight||0,t.boxes.push(e)},removeBox:function(t,e){var i=t.boxes?t.boxes.indexOf(e):-1;-1!==i&&t.boxes.splice(i,1)},configure:function(t,e,i){for(var n,a=["fullWidth","position","weight"],o=a.length,r=0;r<o;++r)n=a[r],i.hasOwnProperty(n)&&(e[n]=i[n])},update:function(t,e,i){if(t){var r=t.options.layout||{},s=n.options.toPadding(r.padding),l=s.left,u=s.right,d=s.top,c=s.bottom,h=a(t.boxes,"left"),f=a(t.boxes,"right"),g=a(t.boxes,"top"),p=a(t.boxes,"bottom"),m=a(t.boxes,"chartArea");o(h,!0),o(f,!1),o(g,!0),o(p,!1);var v=e-l-u,b=i-d-c,x=b/2,y=(e-v/2)/(h.length+f.length),k=(i-x)/(g.length+p.length),M=v,w=b,S=[];n.each(h.concat(f,g,p),function(t){var e,i=t.isHorizontal();i?(e=t.update(t.fullWidth?v:M,k),w-=e.height):(e=t.update(y,w),M-=e.width),S.push({horizontal:i,minSize:e,box:t})});var C=0,_=0,D=0,I=0;n.each(g.concat(p),function(t){if(t.getPadding){var e=t.getPadding();C=Math.max(C,e.left),_=Math.max(_,e.right)}}),n.each(h.concat(f),function(t){if(t.getPadding){var e=t.getPadding();D=Math.max(D,e.top),I=Math.max(I,e.bottom)}});var P=l,A=u,T=d,F=c;n.each(h.concat(f),N),n.each(h,function(t){P+=t.width}),n.each(f,function(t){A+=t.width}),n.each(g.concat(p),N),n.each(g,function(t){T+=t.height}),n.each(p,function(t){F+=t.height}),n.each(h.concat(f),function(t){var e=n.findNextWhere(S,function(e){return e.box===t}),i={left:0,right:0,top:T,bottom:F};e&&t.update(e.minSize.width,w,i)}),P=l,A=u,T=d,F=c,n.each(h,function(t){P+=t.width}),n.each(f,function(t){A+=t.width}),n.each(g,function(t){T+=t.height}),n.each(p,function(t){F+=t.height});var O=Math.max(C-P,0);P+=O,A+=Math.max(_-A,0);var R=Math.max(D-T,0);T+=R,F+=Math.max(I-F,0);var L=i-T-F,z=e-P-A;z===M&&L===w||(n.each(h,function(t){t.height=L}),n.each(f,function(t){t.height=L}),n.each(g,function(t){t.fullWidth||(t.width=z)}),n.each(p,function(t){t.fullWidth||(t.width=z)}),w=L,M=z);var B=l+O,W=d+R;n.each(h.concat(g),V),B+=M,W+=w,n.each(f,V),n.each(p,V),t.chartArea={left:P,top:T,right:P+M,bottom:T+w},n.each(m,function(e){e.left=t.chartArea.left,e.top=t.chartArea.top,e.right=t.chartArea.right,e.bottom=t.chartArea.bottom,e.update(M,w)})}function N(t){var e=n.findNextWhere(S,function(e){return e.box===t});if(e)if(t.isHorizontal()){var i={left:Math.max(P,C),right:Math.max(A,_),top:0,bottom:0};t.update(t.fullWidth?v:M,b/2,i)}else t.update(e.minSize.width,w)}function V(t){t.isHorizontal()?(t.left=t.fullWidth?l:P,t.right=t.fullWidth?e-u:P+M,t.top=W,t.bottom=W+t.height,W=t.bottom):(t.left=B,t.right=B+t.width,t.top=T,t.bottom=T+w,B=t.right)}}}},{45:45}],31:[function(t,e,i){"use strict";var n=t(25),a=t(45);n._set("global",{plugins:{}}),e.exports={_plugins:[],_cacheId:0,register:function(t){var e=this._plugins;[].concat(t).forEach(function(t){-1===e.indexOf(t)&&e.push(t)}),this._cacheId++},unregister:function(t){var e=this._plugins;[].concat(t).forEach(function(t){var i=e.indexOf(t);-1!==i&&e.splice(i,1)}),this._cacheId++},clear:function(){this._plugins=[],this._cacheId++},count:function(){return this._plugins.length},getAll:function(){return this._plugins},notify:function(t,e,i){var n,a,o,r,s,l=this.descriptors(t),u=l.length;for(n=0;n<u;++n)if("function"==typeof(s=(o=(a=l[n]).plugin)[e])&&((r=[t].concat(i||[])).push(a.options),!1===s.apply(o,r)))return!1;return!0},descriptors:function(t){var e=t.$plugins||(t.$plugins={});if(e.id===this._cacheId)return e.descriptors;var i=[],o=[],r=t&&t.config||{},s=r.options&&r.options.plugins||{};return this._plugins.concat(r.plugins||[]).forEach(function(t){if(-1===i.indexOf(t)){var e=t.id,r=s[e];!1!==r&&(!0===r&&(r=a.clone(n.global.plugins[e])),i.push(t),o.push({plugin:t,options:r||{}}))}}),e.descriptors=o,e.id=this._cacheId,o},_invalidate:function(t){delete t.$plugins}}},{25:25,45:45}],32:[function(t,e,i){"use strict";var n=t(25),a=t(26),o=t(45),r=t(34);function s(t){var e,i,n=[];for(e=0,i=t.length;e<i;++e)n.push(t[e].label);return n}function l(t,e,i){var n=t.getPixelForTick(e);return i&&(n-=0===e?(t.getPixelForTick(1)-n)/2:(n-t.getPixelForTick(e-1))/2),n}n._set("scale",{display:!0,position:"left",offset:!1,gridLines:{display:!0,color:"rgba(0, 0, 0, 0.1)",lineWidth:1,drawBorder:!0,drawOnChartArea:!0,drawTicks:!0,tickMarkLength:10,zeroLineWidth:1,zeroLineColor:"rgba(0,0,0,0.25)",zeroLineBorderDash:[],zeroLineBorderDashOffset:0,offsetGridLines:!1,borderDash:[],borderDashOffset:0},scaleLabel:{display:!1,labelString:"",lineHeight:1.2,padding:{top:4,bottom:4}},ticks:{beginAtZero:!1,minRotation:0,maxRotation:50,mirror:!1,padding:0,reverse:!1,display:!0,autoSkip:!0,autoSkipPadding:0,labelOffset:0,callback:r.formatters.values,minor:{},major:{}}}),e.exports=function(t){function e(t,e,i){return o.isArray(e)?o.longestText(t,i,e):t.measureText(e).width}function i(t){var e=o.valueOrDefault,i=n.global,a=e(t.fontSize,i.defaultFontSize),r=e(t.fontStyle,i.defaultFontStyle),s=e(t.fontFamily,i.defaultFontFamily);return{size:a,style:r,family:s,font:o.fontString(a,r,s)}}function r(t){return o.options.toLineHeight(o.valueOrDefault(t.lineHeight,1.2),o.valueOrDefault(t.fontSize,n.global.defaultFontSize))}t.Scale=a.extend({getPadding:function(){return{left:this.paddingLeft||0,top:this.paddingTop||0,right:this.paddingRight||0,bottom:this.paddingBottom||0}},getTicks:function(){return this._ticks},mergeTicksOptions:function(){var t=this.options.ticks;for(var e in!1===t.minor&&(t.minor={display:!1}),!1===t.major&&(t.major={display:!1}),t)"major"!==e&&"minor"!==e&&(void 0===t.minor[e]&&(t.minor[e]=t[e]),void 0===t.major[e]&&(t.major[e]=t[e]))},beforeUpdate:function(){o.callback(this.options.beforeUpdate,[this])},update:function(t,e,i){var n,a,r,s,l,u,d=this;for(d.beforeUpdate(),d.maxWidth=t,d.maxHeight=e,d.margins=o.extend({left:0,right:0,top:0,bottom:0},i),d.longestTextCache=d.longestTextCache||{},d.beforeSetDimensions(),d.setDimensions(),d.afterSetDimensions(),d.beforeDataLimits(),d.determineDataLimits(),d.afterDataLimits(),d.beforeBuildTicks(),l=d.buildTicks()||[],d.afterBuildTicks(),d.beforeTickToLabelConversion(),r=d.convertTicksToLabels(l)||d.ticks,d.afterTickToLabelConversion(),d.ticks=r,n=0,a=r.length;n<a;++n)s=r[n],(u=l[n])?u.label=s:l.push(u={label:s,major:!1});return d._ticks=l,d.beforeCalculateTickRotation(),d.calculateTickRotation(),d.afterCalculateTickRotation(),d.beforeFit(),d.fit(),d.afterFit(),d.afterUpdate(),d.minSize},afterUpdate:function(){o.callback(this.options.afterUpdate,[this])},beforeSetDimensions:function(){o.callback(this.options.beforeSetDimensions,[this])},setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0},afterSetDimensions:function(){o.callback(this.options.afterSetDimensions,[this])},beforeDataLimits:function(){o.callback(this.options.beforeDataLimits,[this])},determineDataLimits:o.noop,afterDataLimits:function(){o.callback(this.options.afterDataLimits,[this])},beforeBuildTicks:function(){o.callback(this.options.beforeBuildTicks,[this])},buildTicks:o.noop,afterBuildTicks:function(){o.callback(this.options.afterBuildTicks,[this])},beforeTickToLabelConversion:function(){o.callback(this.options.beforeTickToLabelConversion,[this])},convertTicksToLabels:function(){var t=this.options.ticks;this.ticks=this.ticks.map(t.userCallback||t.callback,this)},afterTickToLabelConversion:function(){o.callback(this.options.afterTickToLabelConversion,[this])},beforeCalculateTickRotation:function(){o.callback(this.options.beforeCalculateTickRotation,[this])},calculateTickRotation:function(){var t=this,e=t.ctx,n=t.options.ticks,a=s(t._ticks),r=i(n);e.font=r.font;var l=n.minRotation||0;if(a.length&&t.options.display&&t.isHorizontal())for(var u,d=o.longestText(e,r.font,a,t.longestTextCache),c=d,h=t.getPixelForTick(1)-t.getPixelForTick(0)-6;c>h&&l<n.maxRotation;){var f=o.toRadians(l);if(u=Math.cos(f),Math.sin(f)*d>t.maxHeight){l--;break}l++,c=u*d}t.labelRotation=l},afterCalculateTickRotation:function(){o.callback(this.options.afterCalculateTickRotation,[this])},beforeFit:function(){o.callback(this.options.beforeFit,[this])},fit:function(){var t=this,n=t.minSize={width:0,height:0},a=s(t._ticks),l=t.options,u=l.ticks,d=l.scaleLabel,c=l.gridLines,h=l.display,f=t.isHorizontal(),g=i(u),p=l.gridLines.tickMarkLength;if(n.width=f?t.isFullWidth()?t.maxWidth-t.margins.left-t.margins.right:t.maxWidth:h&&c.drawTicks?p:0,n.height=f?h&&c.drawTicks?p:0:t.maxHeight,d.display&&h){var m=r(d)+o.options.toPadding(d.padding).height;f?n.height+=m:n.width+=m}if(u.display&&h){var v=o.longestText(t.ctx,g.font,a,t.longestTextCache),b=o.numberOfLabelLines(a),x=.5*g.size,y=t.options.ticks.padding;if(f){t.longestLabelWidth=v;var k=o.toRadians(t.labelRotation),M=Math.cos(k),w=Math.sin(k)*v+g.size*b+x*(b-1)+x;n.height=Math.min(t.maxHeight,n.height+w+y),t.ctx.font=g.font;var S=e(t.ctx,a[0],g.font),C=e(t.ctx,a[a.length-1],g.font);0!==t.labelRotation?(t.paddingLeft="bottom"===l.position?M*S+3:M*x+3,t.paddingRight="bottom"===l.position?M*x+3:M*C+3):(t.paddingLeft=S/2+3,t.paddingRight=C/2+3)}else u.mirror?v=0:v+=y+x,n.width=Math.min(t.maxWidth,n.width+v),t.paddingTop=g.size/2,t.paddingBottom=g.size/2}t.handleMargins(),t.width=n.width,t.height=n.height},handleMargins:function(){var t=this;t.margins&&(t.paddingLeft=Math.max(t.paddingLeft-t.margins.left,0),t.paddingTop=Math.max(t.paddingTop-t.margins.top,0),t.paddingRight=Math.max(t.paddingRight-t.margins.right,0),t.paddingBottom=Math.max(t.paddingBottom-t.margins.bottom,0))},afterFit:function(){o.callback(this.options.afterFit,[this])},isHorizontal:function(){return"top"===this.options.position||"bottom"===this.options.position},isFullWidth:function(){return this.options.fullWidth},getRightValue:function(t){if(o.isNullOrUndef(t))return NaN;if("number"==typeof t&&!isFinite(t))return NaN;if(t)if(this.isHorizontal()){if(void 0!==t.x)return this.getRightValue(t.x)}else if(void 0!==t.y)return this.getRightValue(t.y);return t},getLabelForIndex:o.noop,getPixelForValue:o.noop,getValueForPixel:o.noop,getPixelForTick:function(t){var e=this,i=e.options.offset;if(e.isHorizontal()){var n=(e.width-(e.paddingLeft+e.paddingRight))/Math.max(e._ticks.length-(i?0:1),1),a=n*t+e.paddingLeft;i&&(a+=n/2);var o=e.left+Math.round(a);return o+=e.isFullWidth()?e.margins.left:0}var r=e.height-(e.paddingTop+e.paddingBottom);return e.top+t*(r/(e._ticks.length-1))},getPixelForDecimal:function(t){var e=this;if(e.isHorizontal()){var i=(e.width-(e.paddingLeft+e.paddingRight))*t+e.paddingLeft,n=e.left+Math.round(i);return n+=e.isFullWidth()?e.margins.left:0}return e.top+t*e.height},getBasePixel:function(){return this.getPixelForValue(this.getBaseValue())},getBaseValue:function(){var t=this.min,e=this.max;return this.beginAtZero?0:t<0&&e<0?e:t>0&&e>0?t:0},_autoSkip:function(t){var e,i,n,a,r=this,s=r.isHorizontal(),l=r.options.ticks.minor,u=t.length,d=o.toRadians(r.labelRotation),c=Math.cos(d),h=r.longestLabelWidth*c,f=[];for(l.maxTicksLimit&&(a=l.maxTicksLimit),s&&(e=!1,(h+l.autoSkipPadding)*u>r.width-(r.paddingLeft+r.paddingRight)&&(e=1+Math.floor((h+l.autoSkipPadding)*u/(r.width-(r.paddingLeft+r.paddingRight)))),a&&u>a&&(e=Math.max(e,Math.floor(u/a)))),i=0;i<u;i++)n=t[i],(e>1&&i%e>0||i%e==0&&i+e>=u)&&i!==u-1&&delete n.label,f.push(n);return f},draw:function(t){var e=this,a=e.options;if(a.display){var s=e.ctx,u=n.global,d=a.ticks.minor,c=a.ticks.major||d,h=a.gridLines,f=a.scaleLabel,g=0!==e.labelRotation,p=e.isHorizontal(),m=d.autoSkip?e._autoSkip(e.getTicks()):e.getTicks(),v=o.valueOrDefault(d.fontColor,u.defaultFontColor),b=i(d),x=o.valueOrDefault(c.fontColor,u.defaultFontColor),y=i(c),k=h.drawTicks?h.tickMarkLength:0,M=o.valueOrDefault(f.fontColor,u.defaultFontColor),w=i(f),S=o.options.toPadding(f.padding),C=o.toRadians(e.labelRotation),_=[],D=e.options.gridLines.lineWidth,I="right"===a.position?e.right:e.right-D-k,P="right"===a.position?e.right+k:e.right,A="bottom"===a.position?e.top+D:e.bottom-k-D,T="bottom"===a.position?e.top+D+k:e.bottom+D;if(o.each(m,function(i,n){if(!o.isNullOrUndef(i.label)){var r,s,c,f,v,b,x,y,M,w,S,F,O,R,L=i.label;n===e.zeroLineIndex&&a.offset===h.offsetGridLines?(r=h.zeroLineWidth,s=h.zeroLineColor,c=h.zeroLineBorderDash,f=h.zeroLineBorderDashOffset):(r=o.valueAtIndexOrDefault(h.lineWidth,n),s=o.valueAtIndexOrDefault(h.color,n),c=o.valueOrDefault(h.borderDash,u.borderDash),f=o.valueOrDefault(h.borderDashOffset,u.borderDashOffset));var z="middle",B="middle",W=d.padding;if(p){var N=k+W;"bottom"===a.position?(B=g?"middle":"top",z=g?"right":"center",R=e.top+N):(B=g?"middle":"bottom",z=g?"left":"center",R=e.bottom-N);var V=l(e,n,h.offsetGridLines&&m.length>1);V<e.left&&(s="rgba(0,0,0,0)"),V+=o.aliasPixel(r),O=e.getPixelForTick(n)+d.labelOffset,v=x=M=S=V,b=A,y=T,w=t.top,F=t.bottom+D}else{var E,H="left"===a.position;d.mirror?(z=H?"left":"right",E=W):(z=H?"right":"left",E=k+W),O=H?e.right-E:e.left+E;var j=l(e,n,h.offsetGridLines&&m.length>1);j<e.top&&(s="rgba(0,0,0,0)"),j+=o.aliasPixel(r),R=e.getPixelForTick(n)+d.labelOffset,v=I,x=P,M=t.left,S=t.right+D,b=y=w=F=j}_.push({tx1:v,ty1:b,tx2:x,ty2:y,x1:M,y1:w,x2:S,y2:F,labelX:O,labelY:R,glWidth:r,glColor:s,glBorderDash:c,glBorderDashOffset:f,rotation:-1*C,label:L,major:i.major,textBaseline:B,textAlign:z})}}),o.each(_,function(t){if(h.display&&(s.save(),s.lineWidth=t.glWidth,s.strokeStyle=t.glColor,s.setLineDash&&(s.setLineDash(t.glBorderDash),s.lineDashOffset=t.glBorderDashOffset),s.beginPath(),h.drawTicks&&(s.moveTo(t.tx1,t.ty1),s.lineTo(t.tx2,t.ty2)),h.drawOnChartArea&&(s.moveTo(t.x1,t.y1),s.lineTo(t.x2,t.y2)),s.stroke(),s.restore()),d.display){s.save(),s.translate(t.labelX,t.labelY),s.rotate(t.rotation),s.font=t.major?y.font:b.font,s.fillStyle=t.major?x:v,s.textBaseline=t.textBaseline,s.textAlign=t.textAlign;var i=t.label;if(o.isArray(i))for(var n=i.length,a=1.5*b.size,r=e.isHorizontal()?0:-a*(n-1)/2,l=0;l<n;++l)s.fillText(""+i[l],0,r),r+=a;else s.fillText(i,0,0);s.restore()}}),f.display){var F,O,R=0,L=r(f)/2;if(p)F=e.left+(e.right-e.left)/2,O="bottom"===a.position?e.bottom-L-S.bottom:e.top+L+S.top;else{var z="left"===a.position;F=z?e.left+L+S.top:e.right-L-S.top,O=e.top+(e.bottom-e.top)/2,R=z?-.5*Math.PI:.5*Math.PI}s.save(),s.translate(F,O),s.rotate(R),s.textAlign="center",s.textBaseline="middle",s.fillStyle=M,s.font=w.font,s.fillText(f.labelString,0,0),s.restore()}if(h.drawBorder){s.lineWidth=o.valueAtIndexOrDefault(h.lineWidth,0),s.strokeStyle=o.valueAtIndexOrDefault(h.color,0);var B=e.left,W=e.right+D,N=e.top,V=e.bottom+D,E=o.aliasPixel(s.lineWidth);p?(N=V="top"===a.position?e.bottom:e.top,N+=E,V+=E):(B=W="left"===a.position?e.right:e.left,B+=E,W+=E),s.beginPath(),s.moveTo(B,N),s.lineTo(W,V),s.stroke()}}}})}},{25:25,26:26,34:34,45:45}],33:[function(t,e,i){"use strict";var n=t(25),a=t(45),o=t(30);e.exports=function(t){t.scaleService={constructors:{},defaults:{},registerScaleType:function(t,e,i){this.constructors[t]=e,this.defaults[t]=a.clone(i)},getScaleConstructor:function(t){return this.constructors.hasOwnProperty(t)?this.constructors[t]:void 0},getScaleDefaults:function(t){return this.defaults.hasOwnProperty(t)?a.merge({},[n.scale,this.defaults[t]]):{}},updateScaleDefaults:function(t,e){this.defaults.hasOwnProperty(t)&&(this.defaults[t]=a.extend(this.defaults[t],e))},addScalesToLayout:function(t){a.each(t.scales,function(e){e.fullWidth=e.options.fullWidth,e.position=e.options.position,e.weight=e.options.weight,o.addBox(t,e)})}}}},{25:25,30:30,45:45}],34:[function(t,e,i){"use strict";var n=t(45);e.exports={formatters:{values:function(t){return n.isArray(t)?t:""+t},linear:function(t,e,i){var a=i.length>3?i[2]-i[1]:i[1]-i[0];Math.abs(a)>1&&t!==Math.floor(t)&&(a=t-Math.floor(t));var o=n.log10(Math.abs(a)),r="";if(0!==t){var s=-1*Math.floor(o);s=Math.max(Math.min(s,20),0),r=t.toFixed(s)}else r="0";return r},logarithmic:function(t,e,i){var a=t/Math.pow(10,Math.floor(n.log10(t)));return 0===t?"0":1===a||2===a||5===a||0===e||e===i.length-1?t.toExponential():""}}}},{45:45}],35:[function(t,e,i){"use strict";var n=t(25),a=t(26),o=t(45);n._set("global",{tooltips:{enabled:!0,custom:null,mode:"nearest",position:"average",intersect:!0,backgroundColor:"rgba(0,0,0,0.8)",titleFontStyle:"bold",titleSpacing:2,titleMarginBottom:6,titleFontColor:"#fff",titleAlign:"left",bodySpacing:2,bodyFontColor:"#fff",bodyAlign:"left",footerFontStyle:"bold",footerSpacing:2,footerMarginTop:6,footerFontColor:"#fff",footerAlign:"left",yPadding:6,xPadding:6,caretPadding:2,caretSize:5,cornerRadius:6,multiKeyBackground:"#fff",displayColors:!0,borderColor:"rgba(0,0,0,0)",borderWidth:0,callbacks:{beforeTitle:o.noop,title:function(t,e){var i="",n=e.labels,a=n?n.length:0;if(t.length>0){var o=t[0];o.xLabel?i=o.xLabel:a>0&&o.index<a&&(i=n[o.index])}return i},afterTitle:o.noop,beforeBody:o.noop,beforeLabel:o.noop,label:function(t,e){var i=e.datasets[t.datasetIndex].label||"";return i&&(i+=": "),i+=t.yLabel},labelColor:function(t,e){var i=e.getDatasetMeta(t.datasetIndex).data[t.index]._view;return{borderColor:i.borderColor,backgroundColor:i.backgroundColor}},labelTextColor:function(){return this._options.bodyFontColor},afterLabel:o.noop,afterBody:o.noop,beforeFooter:o.noop,footer:o.noop,afterFooter:o.noop}}}),e.exports=function(t){function e(t,e){var i=o.color(t);return i.alpha(e*i.alpha()).rgbaString()}function i(t,e){return e&&(o.isArray(e)?Array.prototype.push.apply(t,e):t.push(e)),t}function r(t){var e=n.global,i=o.valueOrDefault;return{xPadding:t.xPadding,yPadding:t.yPadding,xAlign:t.xAlign,yAlign:t.yAlign,bodyFontColor:t.bodyFontColor,_bodyFontFamily:i(t.bodyFontFamily,e.defaultFontFamily),_bodyFontStyle:i(t.bodyFontStyle,e.defaultFontStyle),_bodyAlign:t.bodyAlign,bodyFontSize:i(t.bodyFontSize,e.defaultFontSize),bodySpacing:t.bodySpacing,titleFontColor:t.titleFontColor,_titleFontFamily:i(t.titleFontFamily,e.defaultFontFamily),_titleFontStyle:i(t.titleFontStyle,e.defaultFontStyle),titleFontSize:i(t.titleFontSize,e.defaultFontSize),_titleAlign:t.titleAlign,titleSpacing:t.titleSpacing,titleMarginBottom:t.titleMarginBottom,footerFontColor:t.footerFontColor,_footerFontFamily:i(t.footerFontFamily,e.defaultFontFamily),_footerFontStyle:i(t.footerFontStyle,e.defaultFontStyle),footerFontSize:i(t.footerFontSize,e.defaultFontSize),_footerAlign:t.footerAlign,footerSpacing:t.footerSpacing,footerMarginTop:t.footerMarginTop,caretSize:t.caretSize,cornerRadius:t.cornerRadius,backgroundColor:t.backgroundColor,opacity:0,legendColorBackground:t.multiKeyBackground,displayColors:t.displayColors,borderColor:t.borderColor,borderWidth:t.borderWidth}}t.Tooltip=a.extend({initialize:function(){this._model=r(this._options),this._lastActive=[]},getTitle:function(){var t=this._options.callbacks,e=t.beforeTitle.apply(this,arguments),n=t.title.apply(this,arguments),a=t.afterTitle.apply(this,arguments),o=[];return o=i(o=i(o=i(o,e),n),a)},getBeforeBody:function(){var t=this._options.callbacks.beforeBody.apply(this,arguments);return o.isArray(t)?t:void 0!==t?[t]:[]},getBody:function(t,e){var n=this,a=n._options.callbacks,r=[];return o.each(t,function(t){var o={before:[],lines:[],after:[]};i(o.before,a.beforeLabel.call(n,t,e)),i(o.lines,a.label.call(n,t,e)),i(o.after,a.afterLabel.call(n,t,e)),r.push(o)}),r},getAfterBody:function(){var t=this._options.callbacks.afterBody.apply(this,arguments);return o.isArray(t)?t:void 0!==t?[t]:[]},getFooter:function(){var t=this._options.callbacks,e=t.beforeFooter.apply(this,arguments),n=t.footer.apply(this,arguments),a=t.afterFooter.apply(this,arguments),o=[];return o=i(o=i(o=i(o,e),n),a)},update:function(e){var i,n,a,s,l,u,d,c,h,f,g,p,m,v,b,x,y,k,M,w,S=this,C=S._options,_=S._model,D=S._model=r(C),I=S._active,P=S._data,A={xAlign:_.xAlign,yAlign:_.yAlign},T={x:_.x,y:_.y},F={width:_.width,height:_.height},O={x:_.caretX,y:_.caretY};if(I.length){D.opacity=1;var R=[],L=[];O=t.Tooltip.positioners[C.position].call(S,I,S._eventPosition);var z=[];for(i=0,n=I.length;i<n;++i)z.push((x=I[i],y=void 0,k=void 0,void 0,void 0,y=x._xScale,k=x._yScale||x._scale,M=x._index,w=x._datasetIndex,{xLabel:y?y.getLabelForIndex(M,w):"",yLabel:k?k.getLabelForIndex(M,w):"",index:M,datasetIndex:w,x:x._model.x,y:x._model.y}));C.filter&&(z=z.filter(function(t){return C.filter(t,P)})),C.itemSort&&(z=z.sort(function(t,e){return C.itemSort(t,e,P)})),o.each(z,function(t){R.push(C.callbacks.labelColor.call(S,t,S._chart)),L.push(C.callbacks.labelTextColor.call(S,t,S._chart))}),D.title=S.getTitle(z,P),D.beforeBody=S.getBeforeBody(z,P),D.body=S.getBody(z,P),D.afterBody=S.getAfterBody(z,P),D.footer=S.getFooter(z,P),D.x=Math.round(O.x),D.y=Math.round(O.y),D.caretPadding=C.caretPadding,D.labelColors=R,D.labelTextColors=L,D.dataPoints=z,A=function(t,e){var i,n,a,o,r,s=t._model,l=t._chart,u=t._chart.chartArea,d="center",c="center";s.y<e.height?c="top":s.y>l.height-e.height&&(c="bottom");var h=(u.left+u.right)/2,f=(u.top+u.bottom)/2;"center"===c?(i=function(t){return t<=h},n=function(t){return t>h}):(i=function(t){return t<=e.width/2},n=function(t){return t>=l.width-e.width/2}),a=function(t){return t+e.width+s.caretSize+s.caretPadding>l.width},o=function(t){return t-e.width-s.caretSize-s.caretPadding<0},r=function(t){return t<=f?"top":"bottom"},i(s.x)?(d="left",a(s.x)&&(d="center",c=r(s.y))):n(s.x)&&(d="right",o(s.x)&&(d="center",c=r(s.y)));var g=t._options;return{xAlign:g.xAlign?g.xAlign:d,yAlign:g.yAlign?g.yAlign:c}}(this,F=function(t,e){var i=t._chart.ctx,n=2*e.yPadding,a=0,r=e.body,s=r.reduce(function(t,e){return t+e.before.length+e.lines.length+e.after.length},0);s+=e.beforeBody.length+e.afterBody.length;var l=e.title.length,u=e.footer.length,d=e.titleFontSize,c=e.bodyFontSize,h=e.footerFontSize;n+=l*d,n+=l?(l-1)*e.titleSpacing:0,n+=l?e.titleMarginBottom:0,n+=s*c,n+=s?(s-1)*e.bodySpacing:0,n+=u?e.footerMarginTop:0,n+=u*h,n+=u?(u-1)*e.footerSpacing:0;var f=0,g=function(t){a=Math.max(a,i.measureText(t).width+f)};return i.font=o.fontString(d,e._titleFontStyle,e._titleFontFamily),o.each(e.title,g),i.font=o.fontString(c,e._bodyFontStyle,e._bodyFontFamily),o.each(e.beforeBody.concat(e.afterBody),g),f=e.displayColors?c+2:0,o.each(r,function(t){o.each(t.before,g),o.each(t.lines,g),o.each(t.after,g)}),f=0,i.font=o.fontString(h,e._footerFontStyle,e._footerFontFamily),o.each(e.footer,g),{width:a+=2*e.xPadding,height:n}}(this,D)),a=D,s=F,l=A,u=S._chart,d=a.x,c=a.y,h=a.caretSize,f=a.caretPadding,g=a.cornerRadius,p=l.xAlign,m=l.yAlign,v=h+f,b=g+f,"right"===p?d-=s.width:"center"===p&&((d-=s.width/2)+s.width>u.width&&(d=u.width-s.width),d<0&&(d=0)),"top"===m?c+=v:c-="bottom"===m?s.height+v:s.height/2,"center"===m?"left"===p?d+=v:"right"===p&&(d-=v):"left"===p?d-=b:"right"===p&&(d+=b),T={x:d,y:c}}else D.opacity=0;return D.xAlign=A.xAlign,D.yAlign=A.yAlign,D.x=T.x,D.y=T.y,D.width=F.width,D.height=F.height,D.caretX=O.x,D.caretY=O.y,S._model=D,e&&C.custom&&C.custom.call(S,D),S},drawCaret:function(t,e){var i=this._chart.ctx,n=this._view,a=this.getCaretPosition(t,e,n);i.lineTo(a.x1,a.y1),i.lineTo(a.x2,a.y2),i.lineTo(a.x3,a.y3)},getCaretPosition:function(t,e,i){var n,a,o,r,s,l,u=i.caretSize,d=i.cornerRadius,c=i.xAlign,h=i.yAlign,f=t.x,g=t.y,p=e.width,m=e.height;if("center"===h)s=g+m/2,"left"===c?(a=(n=f)-u,o=n,r=s+u,l=s-u):(a=(n=f+p)+u,o=n,r=s-u,l=s+u);else if("left"===c?(n=(a=f+d+u)-u,o=a+u):"right"===c?(n=(a=f+p-d-u)-u,o=a+u):(n=(a=i.caretX)-u,o=a+u),"top"===h)s=(r=g)-u,l=r;else{s=(r=g+m)+u,l=r;var v=o;o=n,n=v}return{x1:n,x2:a,x3:o,y1:r,y2:s,y3:l}},drawTitle:function(t,i,n,a){var r=i.title;if(r.length){n.textAlign=i._titleAlign,n.textBaseline="top";var s,l,u=i.titleFontSize,d=i.titleSpacing;for(n.fillStyle=e(i.titleFontColor,a),n.font=o.fontString(u,i._titleFontStyle,i._titleFontFamily),s=0,l=r.length;s<l;++s)n.fillText(r[s],t.x,t.y),t.y+=u+d,s+1===r.length&&(t.y+=i.titleMarginBottom-d)}},drawBody:function(t,i,n,a){var r=i.bodyFontSize,s=i.bodySpacing,l=i.body;n.textAlign=i._bodyAlign,n.textBaseline="top",n.font=o.fontString(r,i._bodyFontStyle,i._bodyFontFamily);var u=0,d=function(e){n.fillText(e,t.x+u,t.y),t.y+=r+s};n.fillStyle=e(i.bodyFontColor,a),o.each(i.beforeBody,d);var c=i.displayColors;u=c?r+2:0,o.each(l,function(s,l){var u=e(i.labelTextColors[l],a);n.fillStyle=u,o.each(s.before,d),o.each(s.lines,function(o){c&&(n.fillStyle=e(i.legendColorBackground,a),n.fillRect(t.x,t.y,r,r),n.lineWidth=1,n.strokeStyle=e(i.labelColors[l].borderColor,a),n.strokeRect(t.x,t.y,r,r),n.fillStyle=e(i.labelColors[l].backgroundColor,a),n.fillRect(t.x+1,t.y+1,r-2,r-2),n.fillStyle=u),d(o)}),o.each(s.after,d)}),u=0,o.each(i.afterBody,d),t.y-=s},drawFooter:function(t,i,n,a){var r=i.footer;r.length&&(t.y+=i.footerMarginTop,n.textAlign=i._footerAlign,n.textBaseline="top",n.fillStyle=e(i.footerFontColor,a),n.font=o.fontString(i.footerFontSize,i._footerFontStyle,i._footerFontFamily),o.each(r,function(e){n.fillText(e,t.x,t.y),t.y+=i.footerFontSize+i.footerSpacing}))},drawBackground:function(t,i,n,a,o){n.fillStyle=e(i.backgroundColor,o),n.strokeStyle=e(i.borderColor,o),n.lineWidth=i.borderWidth;var r=i.xAlign,s=i.yAlign,l=t.x,u=t.y,d=a.width,c=a.height,h=i.cornerRadius;n.beginPath(),n.moveTo(l+h,u),"top"===s&&this.drawCaret(t,a),n.lineTo(l+d-h,u),n.quadraticCurveTo(l+d,u,l+d,u+h),"center"===s&&"right"===r&&this.drawCaret(t,a),n.lineTo(l+d,u+c-h),n.quadraticCurveTo(l+d,u+c,l+d-h,u+c),"bottom"===s&&this.drawCaret(t,a),n.lineTo(l+h,u+c),n.quadraticCurveTo(l,u+c,l,u+c-h),"center"===s&&"left"===r&&this.drawCaret(t,a),n.lineTo(l,u+h),n.quadraticCurveTo(l,u,l+h,u),n.closePath(),n.fill(),i.borderWidth>0&&n.stroke()},draw:function(){var t=this._chart.ctx,e=this._view;if(0!==e.opacity){var i={width:e.width,height:e.height},n={x:e.x,y:e.y},a=Math.abs(e.opacity<.001)?0:e.opacity,o=e.title.length||e.beforeBody.length||e.body.length||e.afterBody.length||e.footer.length;this._options.enabled&&o&&(this.drawBackground(n,e,t,i,a),n.x+=e.xPadding,n.y+=e.yPadding,this.drawTitle(n,e,t,a),this.drawBody(n,e,t,a),this.drawFooter(n,e,t,a))}},handleEvent:function(t){var e,i=this,n=i._options;return i._lastActive=i._lastActive||[],"mouseout"===t.type?i._active=[]:i._active=i._chart.getElementsAtEventForMode(t,n.mode,n),(e=!o.arrayEquals(i._active,i._lastActive))&&(i._lastActive=i._active,(n.enabled||n.custom)&&(i._eventPosition={x:t.x,y:t.y},i.update(!0),i.pivot())),e}}),t.Tooltip.positioners={average:function(t){if(!t.length)return!1;var e,i,n=0,a=0,o=0;for(e=0,i=t.length;e<i;++e){var r=t[e];if(r&&r.hasValue()){var s=r.tooltipPosition();n+=s.x,a+=s.y,++o}}return{x:Math.round(n/o),y:Math.round(a/o)}},nearest:function(t,e){var i,n,a,r=e.x,s=e.y,l=Number.POSITIVE_INFINITY;for(i=0,n=t.length;i<n;++i){var u=t[i];if(u&&u.hasValue()){var d=u.getCenterPoint(),c=o.distanceBetweenPoints(e,d);c<l&&(l=c,a=u)}}if(a){var h=a.tooltipPosition();r=h.x,s=h.y}return{x:r,y:s}}}}},{25:25,26:26,45:45}],36:[function(t,e,i){"use strict";var n=t(25),a=t(26),o=t(45);n._set("global",{elements:{arc:{backgroundColor:n.global.defaultColor,borderColor:"#fff",borderWidth:2}}}),e.exports=a.extend({inLabelRange:function(t){var e=this._view;return!!e&&Math.pow(t-e.x,2)<Math.pow(e.radius+e.hoverRadius,2)},inRange:function(t,e){var i=this._view;if(i){for(var n=o.getAngleFromPoint(i,{x:t,y:e}),a=n.angle,r=n.distance,s=i.startAngle,l=i.endAngle;l<s;)l+=2*Math.PI;for(;a>l;)a-=2*Math.PI;for(;a<s;)a+=2*Math.PI;var u=a>=s&&a<=l,d=r>=i.innerRadius&&r<=i.outerRadius;return u&&d}return!1},getCenterPoint:function(){var t=this._view,e=(t.startAngle+t.endAngle)/2,i=(t.innerRadius+t.outerRadius)/2;return{x:t.x+Math.cos(e)*i,y:t.y+Math.sin(e)*i}},getArea:function(){var t=this._view;return Math.PI*((t.endAngle-t.startAngle)/(2*Math.PI))*(Math.pow(t.outerRadius,2)-Math.pow(t.innerRadius,2))},tooltipPosition:function(){var t=this._view,e=t.startAngle+(t.endAngle-t.startAngle)/2,i=(t.outerRadius-t.innerRadius)/2+t.innerRadius;return{x:t.x+Math.cos(e)*i,y:t.y+Math.sin(e)*i}},draw:function(){var t=this._chart.ctx,e=this._view,i=e.startAngle,n=e.endAngle;t.beginPath(),t.arc(e.x,e.y,e.outerRadius,i,n),t.arc(e.x,e.y,e.innerRadius,n,i,!0),t.closePath(),t.strokeStyle=e.borderColor,t.lineWidth=e.borderWidth,t.fillStyle=e.backgroundColor,t.fill(),t.lineJoin="bevel",e.borderWidth&&t.stroke()}})},{25:25,26:26,45:45}],37:[function(t,e,i){"use strict";var n=t(25),a=t(26),o=t(45),r=n.global;n._set("global",{elements:{line:{tension:.4,backgroundColor:r.defaultColor,borderWidth:3,borderColor:r.defaultColor,borderCapStyle:"butt",borderDash:[],borderDashOffset:0,borderJoinStyle:"miter",capBezierPoints:!0,fill:!0}}}),e.exports=a.extend({draw:function(){var t,e,i,n,a=this._view,s=this._chart.ctx,l=a.spanGaps,u=this._children.slice(),d=r.elements.line,c=-1;for(this._loop&&u.length&&u.push(u[0]),s.save(),s.lineCap=a.borderCapStyle||d.borderCapStyle,s.setLineDash&&s.setLineDash(a.borderDash||d.borderDash),s.lineDashOffset=a.borderDashOffset||d.borderDashOffset,s.lineJoin=a.borderJoinStyle||d.borderJoinStyle,s.lineWidth=a.borderWidth||d.borderWidth,s.strokeStyle=a.borderColor||r.defaultColor,s.beginPath(),c=-1,t=0;t<u.length;++t)e=u[t],i=o.previousItem(u,t),n=e._view,0===t?n.skip||(s.moveTo(n.x,n.y),c=t):(i=-1===c?i:u[c],n.skip||(c!==t-1&&!l||-1===c?s.moveTo(n.x,n.y):o.canvas.lineTo(s,i._view,e._view),c=t));s.stroke(),s.restore()}})},{25:25,26:26,45:45}],38:[function(t,e,i){"use strict";var n=t(25),a=t(26),o=t(45),r=n.global.defaultColor;function s(t){var e=this._view;return!!e&&Math.abs(t-e.x)<e.radius+e.hitRadius}n._set("global",{elements:{point:{radius:3,pointStyle:"circle",backgroundColor:r,borderColor:r,borderWidth:1,hitRadius:1,hoverRadius:4,hoverBorderWidth:1}}}),e.exports=a.extend({inRange:function(t,e){var i=this._view;return!!i&&Math.pow(t-i.x,2)+Math.pow(e-i.y,2)<Math.pow(i.hitRadius+i.radius,2)},inLabelRange:s,inXRange:s,inYRange:function(t){var e=this._view;return!!e&&Math.abs(t-e.y)<e.radius+e.hitRadius},getCenterPoint:function(){var t=this._view;return{x:t.x,y:t.y}},getArea:function(){return Math.PI*Math.pow(this._view.radius,2)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y,padding:t.radius+t.borderWidth}},draw:function(t){var e=this._view,i=this._model,a=this._chart.ctx,s=e.pointStyle,l=e.radius,u=e.x,d=e.y,c=o.color,h=0;e.skip||(a.strokeStyle=e.borderColor||r,a.lineWidth=o.valueOrDefault(e.borderWidth,n.global.elements.point.borderWidth),a.fillStyle=e.backgroundColor||r,void 0!==t&&(i.x<t.left||1.01*t.right<i.x||i.y<t.top||1.01*t.bottom<i.y)&&(i.x<t.left?h=(u-i.x)/(t.left-i.x):1.01*t.right<i.x?h=(i.x-u)/(i.x-t.right):i.y<t.top?h=(d-i.y)/(t.top-i.y):1.01*t.bottom<i.y&&(h=(i.y-d)/(i.y-t.bottom)),h=Math.round(100*h)/100,a.strokeStyle=c(a.strokeStyle).alpha(h).rgbString(),a.fillStyle=c(a.fillStyle).alpha(h).rgbString()),o.canvas.drawPoint(a,s,l,u,d))}})},{25:25,26:26,45:45}],39:[function(t,e,i){"use strict";var n=t(25),a=t(26);function o(t){return void 0!==t._view.width}function r(t){var e,i,n,a,r=t._view;if(o(t)){var s=r.width/2;e=r.x-s,i=r.x+s,n=Math.min(r.y,r.base),a=Math.max(r.y,r.base)}else{var l=r.height/2;e=Math.min(r.x,r.base),i=Math.max(r.x,r.base),n=r.y-l,a=r.y+l}return{left:e,top:n,right:i,bottom:a}}n._set("global",{elements:{rectangle:{backgroundColor:n.global.defaultColor,borderColor:n.global.defaultColor,borderSkipped:"bottom",borderWidth:0}}}),e.exports=a.extend({draw:function(){var t,e,i,n,a,o,r,s=this._chart.ctx,l=this._view,u=l.borderWidth;if(l.horizontal?(t=l.base,e=l.x,i=l.y-l.height/2,n=l.y+l.height/2,a=e>t?1:-1,o=1,r=l.borderSkipped||"left"):(t=l.x-l.width/2,e=l.x+l.width/2,i=l.y,a=1,o=(n=l.base)>i?1:-1,r=l.borderSkipped||"bottom"),u){var d=Math.min(Math.abs(t-e),Math.abs(i-n)),c=(u=u>d?d:u)/2,h=t+("left"!==r?c*a:0),f=e+("right"!==r?-c*a:0),g=i+("top"!==r?c*o:0),p=n+("bottom"!==r?-c*o:0);h!==f&&(i=g,n=p),g!==p&&(t=h,e=f)}s.beginPath(),s.fillStyle=l.backgroundColor,s.strokeStyle=l.borderColor,s.lineWidth=u;var m=[[t,n],[t,i],[e,i],[e,n]],v=["bottom","left","top","right"].indexOf(r,0);function b(t){return m[(v+t)%4]}-1===v&&(v=0);var x=b(0);s.moveTo(x[0],x[1]);for(var y=1;y<4;y++)x=b(y),s.lineTo(x[0],x[1]);s.fill(),u&&s.stroke()},height:function(){var t=this._view;return t.base-t.y},inRange:function(t,e){var i=!1;if(this._view){var n=r(this);i=t>=n.left&&t<=n.right&&e>=n.top&&e<=n.bottom}return i},inLabelRange:function(t,e){if(!this._view)return!1;var i=r(this);return o(this)?t>=i.left&&t<=i.right:e>=i.top&&e<=i.bottom},inXRange:function(t){var e=r(this);return t>=e.left&&t<=e.right},inYRange:function(t){var e=r(this);return t>=e.top&&t<=e.bottom},getCenterPoint:function(){var t,e,i=this._view;return o(this)?(t=i.x,e=(i.y+i.base)/2):(t=(i.x+i.base)/2,e=i.y),{x:t,y:e}},getArea:function(){var t=this._view;return t.width*Math.abs(t.y-t.base)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y}}})},{25:25,26:26}],40:[function(t,e,i){"use strict";e.exports={},e.exports.Arc=t(36),e.exports.Line=t(37),e.exports.Point=t(38),e.exports.Rectangle=t(39)},{36:36,37:37,38:38,39:39}],41:[function(t,e,i){"use strict";var n=t(42);i=e.exports={clear:function(t){t.ctx.clearRect(0,0,t.width,t.height)},roundedRect:function(t,e,i,n,a,o){if(o){var r=Math.min(o,n/2),s=Math.min(o,a/2);t.moveTo(e+r,i),t.lineTo(e+n-r,i),t.quadraticCurveTo(e+n,i,e+n,i+s),t.lineTo(e+n,i+a-s),t.quadraticCurveTo(e+n,i+a,e+n-r,i+a),t.lineTo(e+r,i+a),t.quadraticCurveTo(e,i+a,e,i+a-s),t.lineTo(e,i+s),t.quadraticCurveTo(e,i,e+r,i)}else t.rect(e,i,n,a)},drawPoint:function(t,e,i,n,a){var o,r,s,l,u,d;if(!e||"object"!=typeof e||"[object HTMLImageElement]"!==(o=e.toString())&&"[object HTMLCanvasElement]"!==o){if(!(isNaN(i)||i<=0)){switch(e){default:t.beginPath(),t.arc(n,a,i,0,2*Math.PI),t.closePath(),t.fill();break;case"triangle":t.beginPath(),u=(r=3*i/Math.sqrt(3))*Math.sqrt(3)/2,t.moveTo(n-r/2,a+u/3),t.lineTo(n+r/2,a+u/3),t.lineTo(n,a-2*u/3),t.closePath(),t.fill();break;case"rect":d=1/Math.SQRT2*i,t.beginPath(),t.fillRect(n-d,a-d,2*d,2*d),t.strokeRect(n-d,a-d,2*d,2*d);break;case"rectRounded":var c=i/Math.SQRT2,h=n-c,f=a-c,g=Math.SQRT2*i;t.beginPath(),this.roundedRect(t,h,f,g,g,i/2),t.closePath(),t.fill();break;case"rectRot":d=1/Math.SQRT2*i,t.beginPath(),t.moveTo(n-d,a),t.lineTo(n,a+d),t.lineTo(n+d,a),t.lineTo(n,a-d),t.closePath(),t.fill();break;case"cross":t.beginPath(),t.moveTo(n,a+i),t.lineTo(n,a-i),t.moveTo(n-i,a),t.lineTo(n+i,a),t.closePath();break;case"crossRot":t.beginPath(),s=Math.cos(Math.PI/4)*i,l=Math.sin(Math.PI/4)*i,t.moveTo(n-s,a-l),t.lineTo(n+s,a+l),t.moveTo(n-s,a+l),t.lineTo(n+s,a-l),t.closePath();break;case"star":t.beginPath(),t.moveTo(n,a+i),t.lineTo(n,a-i),t.moveTo(n-i,a),t.lineTo(n+i,a),s=Math.cos(Math.PI/4)*i,l=Math.sin(Math.PI/4)*i,t.moveTo(n-s,a-l),t.lineTo(n+s,a+l),t.moveTo(n-s,a+l),t.lineTo(n+s,a-l),t.closePath();break;case"line":t.beginPath(),t.moveTo(n-i,a),t.lineTo(n+i,a),t.closePath();break;case"dash":t.beginPath(),t.moveTo(n,a),t.lineTo(n+i,a),t.closePath()}t.stroke()}}else t.drawImage(e,n-e.width/2,a-e.height/2,e.width,e.height)},clipArea:function(t,e){t.save(),t.beginPath(),t.rect(e.left,e.top,e.right-e.left,e.bottom-e.top),t.clip()},unclipArea:function(t){t.restore()},lineTo:function(t,e,i,n){if(i.steppedLine)return"after"===i.steppedLine&&!n||"after"!==i.steppedLine&&n?t.lineTo(e.x,i.y):t.lineTo(i.x,e.y),void t.lineTo(i.x,i.y);i.tension?t.bezierCurveTo(n?e.controlPointPreviousX:e.controlPointNextX,n?e.controlPointPreviousY:e.controlPointNextY,n?i.controlPointNextX:i.controlPointPreviousX,n?i.controlPointNextY:i.controlPointPreviousY,i.x,i.y):t.lineTo(i.x,i.y)}};n.clear=i.clear,n.drawRoundedRectangle=function(t){t.beginPath(),i.roundedRect.apply(i,arguments),t.closePath()}},{42:42}],42:[function(t,e,i){"use strict";var n,a={noop:function(){},uid:(n=0,function(){return n++}),isNullOrUndef:function(t){return null==t},isArray:Array.isArray?Array.isArray:function(t){return"[object Array]"===Object.prototype.toString.call(t)},isObject:function(t){return null!==t&&"[object Object]"===Object.prototype.toString.call(t)},valueOrDefault:function(t,e){return void 0===t?e:t},valueAtIndexOrDefault:function(t,e,i){return a.valueOrDefault(a.isArray(t)?t[e]:t,i)},callback:function(t,e,i){if(t&&"function"==typeof t.call)return t.apply(i,e)},each:function(t,e,i,n){var o,r,s;if(a.isArray(t))if(r=t.length,n)for(o=r-1;o>=0;o--)e.call(i,t[o],o);else for(o=0;o<r;o++)e.call(i,t[o],o);else if(a.isObject(t))for(r=(s=Object.keys(t)).length,o=0;o<r;o++)e.call(i,t[s[o]],s[o])},arrayEquals:function(t,e){var i,n,o,r;if(!t||!e||t.length!==e.length)return!1;for(i=0,n=t.length;i<n;++i)if(o=t[i],r=e[i],o instanceof Array&&r instanceof Array){if(!a.arrayEquals(o,r))return!1}else if(o!==r)return!1;return!0},clone:function(t){if(a.isArray(t))return t.map(a.clone);if(a.isObject(t)){for(var e={},i=Object.keys(t),n=i.length,o=0;o<n;++o)e[i[o]]=a.clone(t[i[o]]);return e}return t},_merger:function(t,e,i,n){var o=e[t],r=i[t];a.isObject(o)&&a.isObject(r)?a.merge(o,r,n):e[t]=a.clone(r)},_mergerIf:function(t,e,i){var n=e[t],o=i[t];a.isObject(n)&&a.isObject(o)?a.mergeIf(n,o):e.hasOwnProperty(t)||(e[t]=a.clone(o))},merge:function(t,e,i){var n,o,r,s,l,u=a.isArray(e)?e:[e],d=u.length;if(!a.isObject(t))return t;for(n=(i=i||{}).merger||a._merger,o=0;o<d;++o)if(e=u[o],a.isObject(e))for(l=0,s=(r=Object.keys(e)).length;l<s;++l)n(r[l],t,e,i);return t},mergeIf:function(t,e){return a.merge(t,e,{merger:a._mergerIf})},extend:function(t){for(var e=function(e,i){t[i]=e},i=1,n=arguments.length;i<n;++i)a.each(arguments[i],e);return t},inherits:function(t){var e=this,i=t&&t.hasOwnProperty("constructor")?t.constructor:function(){return e.apply(this,arguments)},n=function(){this.constructor=i};return n.prototype=e.prototype,i.prototype=new n,i.extend=a.inherits,t&&a.extend(i.prototype,t),i.__super__=e.prototype,i}};e.exports=a,a.callCallback=a.callback,a.indexOf=function(t,e,i){return Array.prototype.indexOf.call(t,e,i)},a.getValueOrDefault=a.valueOrDefault,a.getValueAtIndexOrDefault=a.valueAtIndexOrDefault},{}],43:[function(t,e,i){"use strict";var n=t(42),a={linear:function(t){return t},easeInQuad:function(t){return t*t},easeOutQuad:function(t){return-t*(t-2)},easeInOutQuad:function(t){return(t/=.5)<1?.5*t*t:-.5*(--t*(t-2)-1)},easeInCubic:function(t){return t*t*t},easeOutCubic:function(t){return(t-=1)*t*t+1},easeInOutCubic:function(t){return(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},easeInQuart:function(t){return t*t*t*t},easeOutQuart:function(t){return-((t-=1)*t*t*t-1)},easeInOutQuart:function(t){return(t/=.5)<1?.5*t*t*t*t:-.5*((t-=2)*t*t*t-2)},easeInQuint:function(t){return t*t*t*t*t},easeOutQuint:function(t){return(t-=1)*t*t*t*t+1},easeInOutQuint:function(t){return(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},easeInSine:function(t){return 1-Math.cos(t*(Math.PI/2))},easeOutSine:function(t){return Math.sin(t*(Math.PI/2))},easeInOutSine:function(t){return-.5*(Math.cos(Math.PI*t)-1)},easeInExpo:function(t){return 0===t?0:Math.pow(2,10*(t-1))},easeOutExpo:function(t){return 1===t?1:1-Math.pow(2,-10*t)},easeInOutExpo:function(t){return 0===t?0:1===t?1:(t/=.5)<1?.5*Math.pow(2,10*(t-1)):.5*(2-Math.pow(2,-10*--t))},easeInCirc:function(t){return t>=1?t:-(Math.sqrt(1-t*t)-1)},easeOutCirc:function(t){return Math.sqrt(1-(t-=1)*t)},easeInOutCirc:function(t){return(t/=.5)<1?-.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},easeInElastic:function(t){var e=1.70158,i=0,n=1;return 0===t?0:1===t?1:(i||(i=.3),n<1?(n=1,e=i/4):e=i/(2*Math.PI)*Math.asin(1/n),-n*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/i))},easeOutElastic:function(t){var e=1.70158,i=0,n=1;return 0===t?0:1===t?1:(i||(i=.3),n<1?(n=1,e=i/4):e=i/(2*Math.PI)*Math.asin(1/n),n*Math.pow(2,-10*t)*Math.sin((t-e)*(2*Math.PI)/i)+1)},easeInOutElastic:function(t){var e=1.70158,i=0,n=1;return 0===t?0:2==(t/=.5)?1:(i||(i=.45),n<1?(n=1,e=i/4):e=i/(2*Math.PI)*Math.asin(1/n),t<1?n*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/i)*-.5:n*Math.pow(2,-10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/i)*.5+1)},easeInBack:function(t){return t*t*(2.70158*t-1.70158)},easeOutBack:function(t){return(t-=1)*t*(2.70158*t+1.70158)+1},easeInOutBack:function(t){var e=1.70158;return(t/=.5)<1?t*t*((1+(e*=1.525))*t-e)*.5:.5*((t-=2)*t*((1+(e*=1.525))*t+e)+2)},easeInBounce:function(t){return 1-a.easeOutBounce(1-t)},easeOutBounce:function(t){return t<1/2.75?7.5625*t*t:t<2/2.75?7.5625*(t-=1.5/2.75)*t+.75:t<2.5/2.75?7.5625*(t-=2.25/2.75)*t+.9375:7.5625*(t-=2.625/2.75)*t+.984375},easeInOutBounce:function(t){return t<.5?.5*a.easeInBounce(2*t):.5*a.easeOutBounce(2*t-1)+.5}};e.exports={effects:a},n.easingEffects=a},{42:42}],44:[function(t,e,i){"use strict";var n=t(42);e.exports={toLineHeight:function(t,e){var i=(""+t).match(/^(normal|(\d+(?:\.\d+)?)(px|em|%)?)$/);if(!i||"normal"===i[1])return 1.2*e;switch(t=+i[2],i[3]){case"px":return t;case"%":t/=100}return e*t},toPadding:function(t){var e,i,a,o;return n.isObject(t)?(e=+t.top||0,i=+t.right||0,a=+t.bottom||0,o=+t.left||0):e=i=a=o=+t||0,{top:e,right:i,bottom:a,left:o,height:e+a,width:o+i}},resolve:function(t,e,i){var a,o,r;for(a=0,o=t.length;a<o;++a)if(void 0!==(r=t[a])&&(void 0!==e&&"function"==typeof r&&(r=r(e)),void 0!==i&&n.isArray(r)&&(r=r[i]),void 0!==r))return r}}},{42:42}],45:[function(t,e,i){"use strict";e.exports=t(42),e.exports.easing=t(43),e.exports.canvas=t(41),e.exports.options=t(44)},{41:41,42:42,43:43,44:44}],46:[function(t,e,i){e.exports={acquireContext:function(t){return t&&t.canvas&&(t=t.canvas),t&&t.getContext("2d")||null}}},{}],47:[function(t,e,i){"use strict";var n=t(45),a="$chartjs",o="chartjs-",r=o+"render-monitor",s=o+"render-animation",l=["animationstart","webkitAnimationStart"],u={touchstart:"mousedown",touchmove:"mousemove",touchend:"mouseup",pointerenter:"mouseenter",pointerdown:"mousedown",pointermove:"mousemove",pointerup:"mouseup",pointerleave:"mouseout",pointerout:"mouseout"};function d(t,e){var i=n.getStyle(t,e),a=i&&i.match(/^(\d+)(\.\d+)?px$/);return a?Number(a[1]):void 0}var c=!!function(){var t=!1;try{var e=Object.defineProperty({},"passive",{get:function(){t=!0}});window.addEventListener("e",null,e)}catch(t){}return t}()&&{passive:!0};function h(t,e,i){t.addEventListener(e,i,c)}function f(t,e,i){t.removeEventListener(e,i,c)}function g(t,e,i,n,a){return{type:t,chart:e,native:a||null,x:void 0!==i?i:null,y:void 0!==n?n:null}}function p(t,e,i){var u,d,c,f,p,m,v,b,x=t[a]||(t[a]={}),y=x.resizer=function(t){var e=document.createElement("div"),i=o+"size-monitor",n="position:absolute;left:0;top:0;right:0;bottom:0;overflow:hidden;pointer-events:none;visibility:hidden;z-index:-1;";e.style.cssText=n,e.className=i,e.innerHTML='<div class="'+i+'-expand" style="'+n+'"><div style="position:absolute;width:1000000px;height:1000000px;left:0;top:0"></div></div><div class="'+i+'-shrink" style="'+n+'"><div style="position:absolute;width:200%;height:200%;left:0; top:0"></div></div>';var a=e.childNodes[0],r=e.childNodes[1];e._reset=function(){a.scrollLeft=1e6,a.scrollTop=1e6,r.scrollLeft=1e6,r.scrollTop=1e6};var s=function(){e._reset(),t()};return h(a,"scroll",s.bind(a,"expand")),h(r,"scroll",s.bind(r,"shrink")),e}((u=function(){if(x.resizer)return e(g("resize",i))},c=!1,f=[],function(){f=Array.prototype.slice.call(arguments),d=d||this,c||(c=!0,n.requestAnimFrame.call(window,function(){c=!1,u.apply(d,f)}))}));m=function(){if(x.resizer){var e=t.parentNode;e&&e!==y.parentNode&&e.insertBefore(y,e.firstChild),y._reset()}},v=(p=t)[a]||(p[a]={}),b=v.renderProxy=function(t){t.animationName===s&&m()},n.each(l,function(t){h(p,t,b)}),v.reflow=!!p.offsetParent,p.classList.add(r)}function m(t){var e,i,o,s=t[a]||{},u=s.resizer;delete s.resizer,i=(e=t)[a]||{},(o=i.renderProxy)&&(n.each(l,function(t){f(e,t,o)}),delete i.renderProxy),e.classList.remove(r),u&&u.parentNode&&u.parentNode.removeChild(u)}e.exports={_enabled:"undefined"!=typeof window&&"undefined"!=typeof document,initialize:function(){var t,e,i,n="from{opacity:0.99}to{opacity:1}";e="@-webkit-keyframes "+s+"{"+n+"}@keyframes "+s+"{"+n+"}."+r+"{-webkit-animation:"+s+" 0.001s;animation:"+s+" 0.001s;}",i=(t=this)._style||document.createElement("style"),t._style||(t._style=i,e="/* Chart.js */\n"+e,i.setAttribute("type","text/css"),document.getElementsByTagName("head")[0].appendChild(i)),i.appendChild(document.createTextNode(e))},acquireContext:function(t,e){"string"==typeof t?t=document.getElementById(t):t.length&&(t=t[0]),t&&t.canvas&&(t=t.canvas);var i=t&&t.getContext&&t.getContext("2d");return i&&i.canvas===t?(function(t,e){var i=t.style,n=t.getAttribute("height"),o=t.getAttribute("width");if(t[a]={initial:{height:n,width:o,style:{display:i.display,height:i.height,width:i.width}}},i.display=i.display||"block",null===o||""===o){var r=d(t,"width");void 0!==r&&(t.width=r)}if(null===n||""===n)if(""===t.style.height)t.height=t.width/(e.options.aspectRatio||2);else{var s=d(t,"height");void 0!==r&&(t.height=s)}}(t,e),i):null},releaseContext:function(t){var e=t.canvas;if(e[a]){var i=e[a].initial;["height","width"].forEach(function(t){var a=i[t];n.isNullOrUndef(a)?e.removeAttribute(t):e.setAttribute(t,a)}),n.each(i.style||{},function(t,i){e.style[i]=t}),e.width=e.width,delete e[a]}},addEventListener:function(t,e,i){var o=t.canvas;if("resize"!==e){var r=i[a]||(i[a]={});h(o,e,(r.proxies||(r.proxies={}))[t.id+"_"+e]=function(e){var a,o,r,s;i((o=t,r=u[(a=e).type]||a.type,s=n.getRelativePosition(a,o),g(r,o,s.x,s.y,a)))})}else p(o,i,t)},removeEventListener:function(t,e,i){var n=t.canvas;if("resize"!==e){var o=((i[a]||{}).proxies||{})[t.id+"_"+e];o&&f(n,e,o)}else m(n)}},n.addEvent=h,n.removeEvent=f},{45:45}],48:[function(t,e,i){"use strict";var n=t(45),a=t(46),o=t(47),r=o._enabled?o:a;e.exports=n.extend({initialize:function(){},acquireContext:function(){},releaseContext:function(){},addEventListener:function(){},removeEventListener:function(){}},r)},{45:45,46:46,47:47}],49:[function(t,e,i){"use strict";e.exports={},e.exports.filler=t(50),e.exports.legend=t(51),e.exports.title=t(52)},{50:50,51:51,52:52}],50:[function(t,e,i){"use strict";var n=t(25),a=t(40),o=t(45);n._set("global",{plugins:{filler:{propagate:!0}}});var r={dataset:function(t){var e=t.fill,i=t.chart,n=i.getDatasetMeta(e),a=n&&i.isDatasetVisible(e)&&n.dataset._children||[],o=a.length||0;return o?function(t,e){return e<o&&a[e]._view||null}:null},boundary:function(t){var e=t.boundary,i=e?e.x:null,n=e?e.y:null;return function(t){return{x:null===i?t.x:i,y:null===n?t.y:n}}}};function s(t,e,i){var n,a=t._model||{},o=a.fill;if(void 0===o&&(o=!!a.backgroundColor),!1===o||null===o)return!1;if(!0===o)return"origin";if(n=parseFloat(o,10),isFinite(n)&&Math.floor(n)===n)return"-"!==o[0]&&"+"!==o[0]||(n=e+n),!(n===e||n<0||n>=i)&&n;switch(o){case"bottom":return"start";case"top":return"end";case"zero":return"origin";case"origin":case"start":case"end":return o;default:return!1}}function l(t){var e,i=t.el._model||{},n=t.el._scale||{},a=t.fill,o=null;if(isFinite(a))return null;if("start"===a?o=void 0===i.scaleBottom?n.bottom:i.scaleBottom:"end"===a?o=void 0===i.scaleTop?n.top:i.scaleTop:void 0!==i.scaleZero?o=i.scaleZero:n.getBasePosition?o=n.getBasePosition():n.getBasePixel&&(o=n.getBasePixel()),null!=o){if(void 0!==o.x&&void 0!==o.y)return o;if("number"==typeof o&&isFinite(o))return{x:(e=n.isHorizontal())?o:null,y:e?null:o}}return null}function u(t,e,i){var n,a=t[e].fill,o=[e];if(!i)return a;for(;!1!==a&&-1===o.indexOf(a);){if(!isFinite(a))return a;if(!(n=t[a]))return!1;if(n.visible)return a;o.push(a),a=n.fill}return!1}function d(t){return t&&!t.skip}function c(t,e,i,n,a){var r;if(n&&a){for(t.moveTo(e[0].x,e[0].y),r=1;r<n;++r)o.canvas.lineTo(t,e[r-1],e[r]);for(t.lineTo(i[a-1].x,i[a-1].y),r=a-1;r>0;--r)o.canvas.lineTo(t,i[r],i[r-1],!0)}}e.exports={id:"filler",afterDatasetsUpdate:function(t,e){var i,n,o,d,c,h,f,g=(t.data.datasets||[]).length,p=e.propagate,m=[];for(n=0;n<g;++n)d=null,(o=(i=t.getDatasetMeta(n)).dataset)&&o._model&&o instanceof a.Line&&(d={visible:t.isDatasetVisible(n),fill:s(o,n,g),chart:t,el:o}),i.$filler=d,m.push(d);for(n=0;n<g;++n)(d=m[n])&&(d.fill=u(m,n,p),d.boundary=l(d),d.mapper=(void 0,f=void 0,h=(c=d).fill,f="dataset",!1===h?null:(isFinite(h)||(f="boundary"),r[f](c))))},beforeDatasetDraw:function(t,e){var i=e.meta.$filler;if(i){var a=t.ctx,r=i.el,s=r._view,l=r._children||[],u=i.mapper,h=s.backgroundColor||n.global.defaultColor;u&&h&&l.length&&(o.canvas.clipArea(a,t.chartArea),function(t,e,i,n,a,o){var r,s,l,u,h,f,g,p=e.length,m=n.spanGaps,v=[],b=[],x=0,y=0;for(t.beginPath(),r=0,s=p+!!o;r<s;++r)h=i(u=e[l=r%p]._view,l,n),f=d(u),g=d(h),f&&g?(x=v.push(u),y=b.push(h)):x&&y&&(m?(f&&v.push(u),g&&b.push(h)):(c(t,v,b,x,y),x=y=0,v=[],b=[]));c(t,v,b,x,y),t.closePath(),t.fillStyle=a,t.fill()}(a,l,u,s,h,r._loop),o.canvas.unclipArea(a))}}}},{25:25,40:40,45:45}],51:[function(t,e,i){"use strict";var n=t(25),a=t(26),o=t(45),r=t(30),s=o.noop;function l(t,e){return t.usePointStyle?e*Math.SQRT2:t.boxWidth}n._set("global",{legend:{display:!0,position:"top",fullWidth:!0,reverse:!1,weight:1e3,onClick:function(t,e){var i=e.datasetIndex,n=this.chart,a=n.getDatasetMeta(i);a.hidden=null===a.hidden?!n.data.datasets[i].hidden:null,n.update()},onHover:null,labels:{boxWidth:40,padding:10,generateLabels:function(t){var e=t.data;return o.isArray(e.datasets)?e.datasets.map(function(e,i){return{text:e.label,fillStyle:o.isArray(e.backgroundColor)?e.backgroundColor[0]:e.backgroundColor,hidden:!t.isDatasetVisible(i),lineCap:e.borderCapStyle,lineDash:e.borderDash,lineDashOffset:e.borderDashOffset,lineJoin:e.borderJoinStyle,lineWidth:e.borderWidth,strokeStyle:e.borderColor,pointStyle:e.pointStyle,datasetIndex:i}},this):[]}}},legendCallback:function(t){var e=[];e.push('<ul class="'+t.id+'-legend">');for(var i=0;i<t.data.datasets.length;i++)e.push('<li><span style="background-color:'+t.data.datasets[i].backgroundColor+'"></span>'),t.data.datasets[i].label&&e.push(t.data.datasets[i].label),e.push("</li>");return e.push("</ul>"),e.join("")}});var u=a.extend({initialize:function(t){o.extend(this,t),this.legendHitBoxes=[],this.doughnutMode=!1},beforeUpdate:s,update:function(t,e,i){var n=this;return n.beforeUpdate(),n.maxWidth=t,n.maxHeight=e,n.margins=i,n.beforeSetDimensions(),n.setDimensions(),n.afterSetDimensions(),n.beforeBuildLabels(),n.buildLabels(),n.afterBuildLabels(),n.beforeFit(),n.fit(),n.afterFit(),n.afterUpdate(),n.minSize},afterUpdate:s,beforeSetDimensions:s,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:s,beforeBuildLabels:s,buildLabels:function(){var t=this,e=t.options.labels||{},i=o.callback(e.generateLabels,[t.chart],t)||[];e.filter&&(i=i.filter(function(i){return e.filter(i,t.chart.data)})),t.options.reverse&&i.reverse(),t.legendItems=i},afterBuildLabels:s,beforeFit:s,fit:function(){var t=this,e=t.options,i=e.labels,a=e.display,r=t.ctx,s=n.global,u=o.valueOrDefault,d=u(i.fontSize,s.defaultFontSize),c=u(i.fontStyle,s.defaultFontStyle),h=u(i.fontFamily,s.defaultFontFamily),f=o.fontString(d,c,h),g=t.legendHitBoxes=[],p=t.minSize,m=t.isHorizontal();if(m?(p.width=t.maxWidth,p.height=a?10:0):(p.width=a?10:0,p.height=t.maxHeight),a)if(r.font=f,m){var v=t.lineWidths=[0],b=t.legendItems.length?d+i.padding:0;r.textAlign="left",r.textBaseline="top",o.each(t.legendItems,function(e,n){var a=l(i,d)+d/2+r.measureText(e.text).width;v[v.length-1]+a+i.padding>=t.width&&(b+=d+i.padding,v[v.length]=t.left),g[n]={left:0,top:0,width:a,height:d},v[v.length-1]+=a+i.padding}),p.height+=b}else{var x=i.padding,y=t.columnWidths=[],k=i.padding,M=0,w=0,S=d+x;o.each(t.legendItems,function(t,e){var n=l(i,d)+d/2+r.measureText(t.text).width;w+S>p.height&&(k+=M+i.padding,y.push(M),M=0,w=0),M=Math.max(M,n),w+=S,g[e]={left:0,top:0,width:n,height:d}}),k+=M,y.push(M),p.width+=k}t.width=p.width,t.height=p.height},afterFit:s,isHorizontal:function(){return"top"===this.options.position||"bottom"===this.options.position},draw:function(){var t=this,e=t.options,i=e.labels,a=n.global,r=a.elements.line,s=t.width,u=t.lineWidths;if(e.display){var d,c=t.ctx,h=o.valueOrDefault,f=h(i.fontColor,a.defaultFontColor),g=h(i.fontSize,a.defaultFontSize),p=h(i.fontStyle,a.defaultFontStyle),m=h(i.fontFamily,a.defaultFontFamily),v=o.fontString(g,p,m);c.textAlign="left",c.textBaseline="middle",c.lineWidth=.5,c.strokeStyle=f,c.fillStyle=f,c.font=v;var b=l(i,g),x=t.legendHitBoxes,y=t.isHorizontal();d=y?{x:t.left+(s-u[0])/2,y:t.top+i.padding,line:0}:{x:t.left+i.padding,y:t.top+i.padding,line:0};var k=g+i.padding;o.each(t.legendItems,function(n,l){var f,p,m,v,M,w=c.measureText(n.text).width,S=b+g/2+w,C=d.x,_=d.y;y?C+S>=s&&(_=d.y+=k,d.line++,C=d.x=t.left+(s-u[d.line])/2):_+k>t.bottom&&(C=d.x=C+t.columnWidths[d.line]+i.padding,_=d.y=t.top+i.padding,d.line++),function(t,i,n){if(!(isNaN(b)||b<=0)){c.save(),c.fillStyle=h(n.fillStyle,a.defaultColor),c.lineCap=h(n.lineCap,r.borderCapStyle),c.lineDashOffset=h(n.lineDashOffset,r.borderDashOffset),c.lineJoin=h(n.lineJoin,r.borderJoinStyle),c.lineWidth=h(n.lineWidth,r.borderWidth),c.strokeStyle=h(n.strokeStyle,a.defaultColor);var s=0===h(n.lineWidth,r.borderWidth);if(c.setLineDash&&c.setLineDash(h(n.lineDash,r.borderDash)),e.labels&&e.labels.usePointStyle){var l=g*Math.SQRT2/2,u=l/Math.SQRT2,d=t+u,f=i+u;o.canvas.drawPoint(c,n.pointStyle,l,d,f)}else s||c.strokeRect(t,i,b,g),c.fillRect(t,i,b,g);c.restore()}}(C,_,n),x[l].left=C,x[l].top=_,f=n,p=w,v=b+(m=g/2)+C,M=_+m,c.fillText(f.text,v,M),f.hidden&&(c.beginPath(),c.lineWidth=2,c.moveTo(v,M),c.lineTo(v+p,M),c.stroke()),y?d.x+=S+i.padding:d.y+=k})}},handleEvent:function(t){var e=this,i=e.options,n="mouseup"===t.type?"click":t.type,a=!1;if("mousemove"===n){if(!i.onHover)return}else{if("click"!==n)return;if(!i.onClick)return}var o=t.x,r=t.y;if(o>=e.left&&o<=e.right&&r>=e.top&&r<=e.bottom)for(var s=e.legendHitBoxes,l=0;l<s.length;++l){var u=s[l];if(o>=u.left&&o<=u.left+u.width&&r>=u.top&&r<=u.top+u.height){if("click"===n){i.onClick.call(e,t.native,e.legendItems[l]),a=!0;break}if("mousemove"===n){i.onHover.call(e,t.native,e.legendItems[l]),a=!0;break}}}return a}});function d(t,e){var i=new u({ctx:t.ctx,options:e,chart:t});r.configure(t,i,e),r.addBox(t,i),t.legend=i}e.exports={id:"legend",_element:u,beforeInit:function(t){var e=t.options.legend;e&&d(t,e)},beforeUpdate:function(t){var e=t.options.legend,i=t.legend;e?(o.mergeIf(e,n.global.legend),i?(r.configure(t,i,e),i.options=e):d(t,e)):i&&(r.removeBox(t,i),delete t.legend)},afterEvent:function(t,e){var i=t.legend;i&&i.handleEvent(e)}}},{25:25,26:26,30:30,45:45}],52:[function(t,e,i){"use strict";var n=t(25),a=t(26),o=t(45),r=t(30),s=o.noop;n._set("global",{title:{display:!1,fontStyle:"bold",fullWidth:!0,lineHeight:1.2,padding:10,position:"top",text:"",weight:2e3}});var l=a.extend({initialize:function(t){o.extend(this,t),this.legendHitBoxes=[]},beforeUpdate:s,update:function(t,e,i){var n=this;return n.beforeUpdate(),n.maxWidth=t,n.maxHeight=e,n.margins=i,n.beforeSetDimensions(),n.setDimensions(),n.afterSetDimensions(),n.beforeBuildLabels(),n.buildLabels(),n.afterBuildLabels(),n.beforeFit(),n.fit(),n.afterFit(),n.afterUpdate(),n.minSize},afterUpdate:s,beforeSetDimensions:s,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:s,beforeBuildLabels:s,buildLabels:s,afterBuildLabels:s,beforeFit:s,fit:function(){var t=this,e=o.valueOrDefault,i=t.options,a=i.display,r=e(i.fontSize,n.global.defaultFontSize),s=t.minSize,l=o.isArray(i.text)?i.text.length:1,u=o.options.toLineHeight(i.lineHeight,r),d=a?l*u+2*i.padding:0;t.isHorizontal()?(s.width=t.maxWidth,s.height=d):(s.width=d,s.height=t.maxHeight),t.width=s.width,t.height=s.height},afterFit:s,isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},draw:function(){var t=this,e=t.ctx,i=o.valueOrDefault,a=t.options,r=n.global;if(a.display){var s,l,u,d=i(a.fontSize,r.defaultFontSize),c=i(a.fontStyle,r.defaultFontStyle),h=i(a.fontFamily,r.defaultFontFamily),f=o.fontString(d,c,h),g=o.options.toLineHeight(a.lineHeight,d),p=g/2+a.padding,m=0,v=t.top,b=t.left,x=t.bottom,y=t.right;e.fillStyle=i(a.fontColor,r.defaultFontColor),e.font=f,t.isHorizontal()?(l=b+(y-b)/2,u=v+p,s=y-b):(l="left"===a.position?b+p:y-p,u=v+(x-v)/2,s=x-v,m=Math.PI*("left"===a.position?-.5:.5)),e.save(),e.translate(l,u),e.rotate(m),e.textAlign="center",e.textBaseline="middle";var k=a.text;if(o.isArray(k))for(var M=0,w=0;w<k.length;++w)e.fillText(k[w],0,M,s),M+=g;else e.fillText(k,0,0,s);e.restore()}}});function u(t,e){var i=new l({ctx:t.ctx,options:e,chart:t});r.configure(t,i,e),r.addBox(t,i),t.titleBlock=i}e.exports={id:"title",_element:l,beforeInit:function(t){var e=t.options.title;e&&u(t,e)},beforeUpdate:function(t){var e=t.options.title,i=t.titleBlock;e?(o.mergeIf(e,n.global.title),i?(r.configure(t,i,e),i.options=e):u(t,e)):i&&(r.removeBox(t,i),delete t.titleBlock)}}},{25:25,26:26,30:30,45:45}],53:[function(t,e,i){"use strict";e.exports=function(t){var e=t.Scale.extend({getLabels:function(){var t=this.chart.data;return this.options.labels||(this.isHorizontal()?t.xLabels:t.yLabels)||t.labels},determineDataLimits:function(){var t,e=this,i=e.getLabels();e.minIndex=0,e.maxIndex=i.length-1,void 0!==e.options.ticks.min&&(t=i.indexOf(e.options.ticks.min),e.minIndex=-1!==t?t:e.minIndex),void 0!==e.options.ticks.max&&(t=i.indexOf(e.options.ticks.max),e.maxIndex=-1!==t?t:e.maxIndex),e.min=i[e.minIndex],e.max=i[e.maxIndex]},buildTicks:function(){var t=this,e=t.getLabels();t.ticks=0===t.minIndex&&t.maxIndex===e.length-1?e:e.slice(t.minIndex,t.maxIndex+1)},getLabelForIndex:function(t,e){var i=this,n=i.chart.data,a=i.isHorizontal();return n.yLabels&&!a?i.getRightValue(n.datasets[e].data[t]):i.ticks[t-i.minIndex]},getPixelForValue:function(t,e){var i,n=this,a=n.options.offset,o=Math.max(n.maxIndex+1-n.minIndex-(a?0:1),1);if(null!=t&&(i=n.isHorizontal()?t.x:t.y),void 0!==i||void 0!==t&&isNaN(e)){t=i||t;var r=n.getLabels().indexOf(t);e=-1!==r?r:e}if(n.isHorizontal()){var s=n.width/o,l=s*(e-n.minIndex);return a&&(l+=s/2),n.left+Math.round(l)}var u=n.height/o,d=u*(e-n.minIndex);return a&&(d+=u/2),n.top+Math.round(d)},getPixelForTick:function(t){return this.getPixelForValue(this.ticks[t],t+this.minIndex,null)},getValueForPixel:function(t){var e=this,i=e.options.offset,n=Math.max(e._ticks.length-(i?0:1),1),a=e.isHorizontal(),o=(a?e.width:e.height)/n;return t-=a?e.left:e.top,i&&(t-=o/2),(t<=0?0:Math.round(t/o))+e.minIndex},getBasePixel:function(){return this.bottom}});t.scaleService.registerScaleType("category",e,{position:"bottom"})}},{}],54:[function(t,e,i){"use strict";var n=t(25),a=t(45),o=t(34);e.exports=function(t){var e={position:"left",ticks:{callback:o.formatters.linear}},i=t.LinearScaleBase.extend({determineDataLimits:function(){var t=this,e=t.options,i=t.chart,n=i.data.datasets,o=t.isHorizontal();function r(e){return o?e.xAxisID===t.id:e.yAxisID===t.id}t.min=null,t.max=null;var s=e.stacked;if(void 0===s&&a.each(n,function(t,e){if(!s){var n=i.getDatasetMeta(e);i.isDatasetVisible(e)&&r(n)&&void 0!==n.stack&&(s=!0)}}),e.stacked||s){var l={};a.each(n,function(n,o){var s=i.getDatasetMeta(o),u=[s.type,void 0===e.stacked&&void 0===s.stack?o:"",s.stack].join(".");void 0===l[u]&&(l[u]={positiveValues:[],negativeValues:[]});var d=l[u].positiveValues,c=l[u].negativeValues;i.isDatasetVisible(o)&&r(s)&&a.each(n.data,function(i,n){var a=+t.getRightValue(i);isNaN(a)||s.data[n].hidden||(d[n]=d[n]||0,c[n]=c[n]||0,e.relativePoints?d[n]=100:a<0?c[n]+=a:d[n]+=a)})}),a.each(l,function(e){var i=e.positiveValues.concat(e.negativeValues),n=a.min(i),o=a.max(i);t.min=null===t.min?n:Math.min(t.min,n),t.max=null===t.max?o:Math.max(t.max,o)})}else a.each(n,function(e,n){var o=i.getDatasetMeta(n);i.isDatasetVisible(n)&&r(o)&&a.each(e.data,function(e,i){var n=+t.getRightValue(e);isNaN(n)||o.data[i].hidden||(null===t.min?t.min=n:n<t.min&&(t.min=n),null===t.max?t.max=n:n>t.max&&(t.max=n))})});t.min=isFinite(t.min)&&!isNaN(t.min)?t.min:0,t.max=isFinite(t.max)&&!isNaN(t.max)?t.max:1,this.handleTickRangeOptions()},getTickLimit:function(){var t,e=this.options.ticks;if(this.isHorizontal())t=Math.min(e.maxTicksLimit?e.maxTicksLimit:11,Math.ceil(this.width/50));else{var i=a.valueOrDefault(e.fontSize,n.global.defaultFontSize);t=Math.min(e.maxTicksLimit?e.maxTicksLimit:11,Math.ceil(this.height/(2*i)))}return t},handleDirectionalChanges:function(){this.isHorizontal()||this.ticks.reverse()},getLabelForIndex:function(t,e){return+this.getRightValue(this.chart.data.datasets[e].data[t])},getPixelForValue:function(t){var e=this,i=e.start,n=+e.getRightValue(t),a=e.end-i;return e.isHorizontal()?e.left+e.width/a*(n-i):e.bottom-e.height/a*(n-i)},getValueForPixel:function(t){var e=this,i=e.isHorizontal(),n=i?e.width:e.height,a=(i?t-e.left:e.bottom-t)/n;return e.start+(e.end-e.start)*a},getPixelForTick:function(t){return this.getPixelForValue(this.ticksAsNumbers[t])}});t.scaleService.registerScaleType("linear",i,e)}},{25:25,34:34,45:45}],55:[function(t,e,i){"use strict";var n=t(45);e.exports=function(t){var e=n.noop;t.LinearScaleBase=t.Scale.extend({getRightValue:function(e){return"string"==typeof e?+e:t.Scale.prototype.getRightValue.call(this,e)},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;if(e.beginAtZero){var i=n.sign(t.min),a=n.sign(t.max);i<0&&a<0?t.max=0:i>0&&a>0&&(t.min=0)}var o=void 0!==e.min||void 0!==e.suggestedMin,r=void 0!==e.max||void 0!==e.suggestedMax;void 0!==e.min?t.min=e.min:void 0!==e.suggestedMin&&(null===t.min?t.min=e.suggestedMin:t.min=Math.min(t.min,e.suggestedMin)),void 0!==e.max?t.max=e.max:void 0!==e.suggestedMax&&(null===t.max?t.max=e.suggestedMax:t.max=Math.max(t.max,e.suggestedMax)),o!==r&&t.min>=t.max&&(o?t.max=t.min+1:t.min=t.max-1),t.min===t.max&&(t.max++,e.beginAtZero||t.min--)},getTickLimit:e,handleDirectionalChanges:e,buildTicks:function(){var t=this,e=t.options.ticks,i=t.getTickLimit(),a={maxTicks:i=Math.max(2,i),min:e.min,max:e.max,stepSize:n.valueOrDefault(e.fixedStepSize,e.stepSize)},o=t.ticks=function(t,e){var i,a=[];if(t.stepSize&&t.stepSize>0)i=t.stepSize;else{var o=n.niceNum(e.max-e.min,!1);i=n.niceNum(o/(t.maxTicks-1),!0)}var r=Math.floor(e.min/i)*i,s=Math.ceil(e.max/i)*i;t.min&&t.max&&t.stepSize&&n.almostWhole((t.max-t.min)/t.stepSize,i/1e3)&&(r=t.min,s=t.max);var l=(s-r)/i;l=n.almostEquals(l,Math.round(l),i/1e3)?Math.round(l):Math.ceil(l);var u=1;i<1&&(u=Math.pow(10,i.toString().length-2),r=Math.round(r*u)/u,s=Math.round(s*u)/u),a.push(void 0!==t.min?t.min:r);for(var d=1;d<l;++d)a.push(Math.round((r+d*i)*u)/u);return a.push(void 0!==t.max?t.max:s),a}(a,t);t.handleDirectionalChanges(),t.max=n.max(o),t.min=n.min(o),e.reverse?(o.reverse(),t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max)},convertTicksToLabels:function(){var e=this;e.ticksAsNumbers=e.ticks.slice(),e.zeroLineIndex=e.ticks.indexOf(0),t.Scale.prototype.convertTicksToLabels.call(e)}})}},{45:45}],56:[function(t,e,i){"use strict";var n=t(45),a=t(34);e.exports=function(t){var e={position:"left",ticks:{callback:a.formatters.logarithmic}},i=t.Scale.extend({determineDataLimits:function(){var t=this,e=t.options,i=t.chart,a=i.data.datasets,o=t.isHorizontal();function r(e){return o?e.xAxisID===t.id:e.yAxisID===t.id}t.min=null,t.max=null,t.minNotZero=null;var s=e.stacked;if(void 0===s&&n.each(a,function(t,e){if(!s){var n=i.getDatasetMeta(e);i.isDatasetVisible(e)&&r(n)&&void 0!==n.stack&&(s=!0)}}),e.stacked||s){var l={};n.each(a,function(a,o){var s=i.getDatasetMeta(o),u=[s.type,void 0===e.stacked&&void 0===s.stack?o:"",s.stack].join(".");i.isDatasetVisible(o)&&r(s)&&(void 0===l[u]&&(l[u]=[]),n.each(a.data,function(e,i){var n=l[u],a=+t.getRightValue(e);isNaN(a)||s.data[i].hidden||a<0||(n[i]=n[i]||0,n[i]+=a)}))}),n.each(l,function(e){if(e.length>0){var i=n.min(e),a=n.max(e);t.min=null===t.min?i:Math.min(t.min,i),t.max=null===t.max?a:Math.max(t.max,a)}})}else n.each(a,function(e,a){var o=i.getDatasetMeta(a);i.isDatasetVisible(a)&&r(o)&&n.each(e.data,function(e,i){var n=+t.getRightValue(e);isNaN(n)||o.data[i].hidden||n<0||(null===t.min?t.min=n:n<t.min&&(t.min=n),null===t.max?t.max=n:n>t.max&&(t.max=n),0!==n&&(null===t.minNotZero||n<t.minNotZero)&&(t.minNotZero=n))})});this.handleTickRangeOptions()},handleTickRangeOptions:function(){var t=this,e=t.options.ticks,i=n.valueOrDefault;t.min=i(e.min,t.min),t.max=i(e.max,t.max),t.min===t.max&&(0!==t.min&&null!==t.min?(t.min=Math.pow(10,Math.floor(n.log10(t.min))-1),t.max=Math.pow(10,Math.floor(n.log10(t.max))+1)):(t.min=1,t.max=10)),null===t.min&&(t.min=Math.pow(10,Math.floor(n.log10(t.max))-1)),null===t.max&&(t.max=0!==t.min?Math.pow(10,Math.floor(n.log10(t.min))+1):10),null===t.minNotZero&&(t.min>0?t.minNotZero=t.min:t.max<1?t.minNotZero=Math.pow(10,Math.floor(n.log10(t.max))):t.minNotZero=1)},buildTicks:function(){var t=this,e=t.options.ticks,i=!t.isHorizontal(),a={min:e.min,max:e.max},o=t.ticks=function(t,e){var i,a,o=[],r=n.valueOrDefault,s=r(t.min,Math.pow(10,Math.floor(n.log10(e.min)))),l=Math.floor(n.log10(e.max)),u=Math.ceil(e.max/Math.pow(10,l));0===s?(i=Math.floor(n.log10(e.minNotZero)),a=Math.floor(e.minNotZero/Math.pow(10,i)),o.push(s),s=a*Math.pow(10,i)):(i=Math.floor(n.log10(s)),a=Math.floor(s/Math.pow(10,i)));for(var d=i<0?Math.pow(10,Math.abs(i)):1;o.push(s),10==++a&&(a=1,d=++i>=0?1:d),s=Math.round(a*Math.pow(10,i)*d)/d,i<l||i===l&&a<u;);var c=r(t.max,s);return o.push(c),o}(a,t);t.max=n.max(o),t.min=n.min(o),e.reverse?(i=!i,t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max),i&&o.reverse()},convertTicksToLabels:function(){this.tickValues=this.ticks.slice(),t.Scale.prototype.convertTicksToLabels.call(this)},getLabelForIndex:function(t,e){return+this.getRightValue(this.chart.data.datasets[e].data[t])},getPixelForTick:function(t){return this.getPixelForValue(this.tickValues[t])},_getFirstTickValue:function(t){var e=Math.floor(n.log10(t));return Math.floor(t/Math.pow(10,e))*Math.pow(10,e)},getPixelForValue:function(e){var i,a,o,r,s,l=this,u=l.options.ticks.reverse,d=n.log10,c=l._getFirstTickValue(l.minNotZero),h=0;return e=+l.getRightValue(e),u?(o=l.end,r=l.start,s=-1):(o=l.start,r=l.end,s=1),l.isHorizontal()?(i=l.width,a=u?l.right:l.left):(i=l.height,s*=-1,a=u?l.top:l.bottom),e!==o&&(0===o&&(i-=h=n.getValueOrDefault(l.options.ticks.fontSize,t.defaults.global.defaultFontSize),o=c),0!==e&&(h+=i/(d(r)-d(o))*(d(e)-d(o))),a+=s*h),a},getValueForPixel:function(e){var i,a,o,r,s=this,l=s.options.ticks.reverse,u=n.log10,d=s._getFirstTickValue(s.minNotZero);if(l?(a=s.end,o=s.start):(a=s.start,o=s.end),s.isHorizontal()?(i=s.width,r=l?s.right-e:e-s.left):(i=s.height,r=l?e-s.top:s.bottom-e),r!==a){if(0===a){var c=n.getValueOrDefault(s.options.ticks.fontSize,t.defaults.global.defaultFontSize);r-=c,i-=c,a=d}r*=u(o)-u(a),r/=i,r=Math.pow(10,u(a)+r)}return r}});t.scaleService.registerScaleType("logarithmic",i,e)}},{34:34,45:45}],57:[function(t,e,i){"use strict";var n=t(25),a=t(45),o=t(34);e.exports=function(t){var e=n.global,i={display:!0,animate:!0,position:"chartArea",angleLines:{display:!0,color:"rgba(0, 0, 0, 0.1)",lineWidth:1},gridLines:{circular:!1},ticks:{showLabelBackdrop:!0,backdropColor:"rgba(255,255,255,0.75)",backdropPaddingY:2,backdropPaddingX:2,callback:o.formatters.linear},pointLabels:{display:!0,fontSize:10,callback:function(t){return t}}};function r(t){var e=t.options;return e.angleLines.display||e.pointLabels.display?t.chart.data.labels.length:0}function s(t){var i=t.options.pointLabels,n=a.valueOrDefault(i.fontSize,e.defaultFontSize),o=a.valueOrDefault(i.fontStyle,e.defaultFontStyle),r=a.valueOrDefault(i.fontFamily,e.defaultFontFamily);return{size:n,style:o,family:r,font:a.fontString(n,o,r)}}function l(t,e,i,n,a){return t===n||t===a?{start:e-i/2,end:e+i/2}:t<n||t>a?{start:e-i-5,end:e}:{start:e,end:e+i+5}}function u(t,e,i,n){if(a.isArray(e))for(var o=i.y,r=1.5*n,s=0;s<e.length;++s)t.fillText(e[s],i.x,o),o+=r;else t.fillText(e,i.x,i.y)}function d(t){return a.isNumber(t)?t:0}var c=t.LinearScaleBase.extend({setDimensions:function(){var t=this,i=t.options,n=i.ticks;t.width=t.maxWidth,t.height=t.maxHeight,t.xCenter=Math.round(t.width/2),t.yCenter=Math.round(t.height/2);var o=a.min([t.height,t.width]),r=a.valueOrDefault(n.fontSize,e.defaultFontSize);t.drawingArea=i.display?o/2-(r/2+n.backdropPaddingY):o/2},determineDataLimits:function(){var t=this,e=t.chart,i=Number.POSITIVE_INFINITY,n=Number.NEGATIVE_INFINITY;a.each(e.data.datasets,function(o,r){if(e.isDatasetVisible(r)){var s=e.getDatasetMeta(r);a.each(o.data,function(e,a){var o=+t.getRightValue(e);isNaN(o)||s.data[a].hidden||(i=Math.min(o,i),n=Math.max(o,n))})}}),t.min=i===Number.POSITIVE_INFINITY?0:i,t.max=n===Number.NEGATIVE_INFINITY?0:n,t.handleTickRangeOptions()},getTickLimit:function(){var t=this.options.ticks,i=a.valueOrDefault(t.fontSize,e.defaultFontSize);return Math.min(t.maxTicksLimit?t.maxTicksLimit:11,Math.ceil(this.drawingArea/(1.5*i)))},convertTicksToLabels:function(){var e=this;t.LinearScaleBase.prototype.convertTicksToLabels.call(e),e.pointLabels=e.chart.data.labels.map(e.options.pointLabels.callback,e)},getLabelForIndex:function(t,e){return+this.getRightValue(this.chart.data.datasets[e].data[t])},fit:function(){var t,e;this.options.pointLabels.display?function(t){var e,i,n,o=s(t),u=Math.min(t.height/2,t.width/2),d={r:t.width,l:0,t:t.height,b:0},c={};t.ctx.font=o.font,t._pointLabelSizes=[];var h,f,g,p=r(t);for(e=0;e<p;e++){n=t.getPointPosition(e,u),h=t.ctx,f=o.size,g=t.pointLabels[e]||"",i=a.isArray(g)?{w:a.longestText(h,h.font,g),h:g.length*f+1.5*(g.length-1)*f}:{w:h.measureText(g).width,h:f},t._pointLabelSizes[e]=i;var m=t.getIndexAngle(e),v=a.toDegrees(m)%360,b=l(v,n.x,i.w,0,180),x=l(v,n.y,i.h,90,270);b.start<d.l&&(d.l=b.start,c.l=m),b.end>d.r&&(d.r=b.end,c.r=m),x.start<d.t&&(d.t=x.start,c.t=m),x.end>d.b&&(d.b=x.end,c.b=m)}t.setReductions(u,d,c)}(this):(t=this,e=Math.min(t.height/2,t.width/2),t.drawingArea=Math.round(e),t.setCenterPoint(0,0,0,0))},setReductions:function(t,e,i){var n=e.l/Math.sin(i.l),a=Math.max(e.r-this.width,0)/Math.sin(i.r),o=-e.t/Math.cos(i.t),r=-Math.max(e.b-this.height,0)/Math.cos(i.b);n=d(n),a=d(a),o=d(o),r=d(r),this.drawingArea=Math.min(Math.round(t-(n+a)/2),Math.round(t-(o+r)/2)),this.setCenterPoint(n,a,o,r)},setCenterPoint:function(t,e,i,n){var a=this,o=a.width-e-a.drawingArea,r=t+a.drawingArea,s=i+a.drawingArea,l=a.height-n-a.drawingArea;a.xCenter=Math.round((r+o)/2+a.left),a.yCenter=Math.round((s+l)/2+a.top)},getIndexAngle:function(t){return t*(2*Math.PI/r(this))+(this.chart.options&&this.chart.options.startAngle?this.chart.options.startAngle:0)*Math.PI*2/360},getDistanceFromCenterForValue:function(t){var e=this;if(null===t)return 0;var i=e.drawingArea/(e.max-e.min);return e.options.ticks.reverse?(e.max-t)*i:(t-e.min)*i},getPointPosition:function(t,e){var i=this.getIndexAngle(t)-Math.PI/2;return{x:Math.round(Math.cos(i)*e)+this.xCenter,y:Math.round(Math.sin(i)*e)+this.yCenter}},getPointPositionForValue:function(t,e){return this.getPointPosition(t,this.getDistanceFromCenterForValue(e))},getBasePosition:function(){var t=this.min,e=this.max;return this.getPointPositionForValue(0,this.beginAtZero?0:t<0&&e<0?e:t>0&&e>0?t:0)},draw:function(){var t=this,i=t.options,n=i.gridLines,o=i.ticks,l=a.valueOrDefault;if(i.display){var d=t.ctx,c=this.getIndexAngle(0),h=l(o.fontSize,e.defaultFontSize),f=l(o.fontStyle,e.defaultFontStyle),g=l(o.fontFamily,e.defaultFontFamily),p=a.fontString(h,f,g);a.each(t.ticks,function(i,s){if(s>0||o.reverse){var u=t.getDistanceFromCenterForValue(t.ticksAsNumbers[s]);if(n.display&&0!==s&&function(t,e,i,n){var o=t.ctx;if(o.strokeStyle=a.valueAtIndexOrDefault(e.color,n-1),o.lineWidth=a.valueAtIndexOrDefault(e.lineWidth,n-1),t.options.gridLines.circular)o.beginPath(),o.arc(t.xCenter,t.yCenter,i,0,2*Math.PI),o.closePath(),o.stroke();else{var s=r(t);if(0===s)return;o.beginPath();var l=t.getPointPosition(0,i);o.moveTo(l.x,l.y);for(var u=1;u<s;u++)l=t.getPointPosition(u,i),o.lineTo(l.x,l.y);o.closePath(),o.stroke()}}(t,n,u,s),o.display){var f=l(o.fontColor,e.defaultFontColor);if(d.font=p,d.save(),d.translate(t.xCenter,t.yCenter),d.rotate(c),o.showLabelBackdrop){var g=d.measureText(i).width;d.fillStyle=o.backdropColor,d.fillRect(-g/2-o.backdropPaddingX,-u-h/2-o.backdropPaddingY,g+2*o.backdropPaddingX,h+2*o.backdropPaddingY)}d.textAlign="center",d.textBaseline="middle",d.fillStyle=f,d.fillText(i,0,-u),d.restore()}}}),(i.angleLines.display||i.pointLabels.display)&&function(t){var i=t.ctx,n=t.options,o=n.angleLines,l=n.pointLabels;i.lineWidth=o.lineWidth,i.strokeStyle=o.color;var d,c,h,f,g=t.getDistanceFromCenterForValue(n.ticks.reverse?t.min:t.max),p=s(t);i.textBaseline="top";for(var m=r(t)-1;m>=0;m--){if(o.display){var v=t.getPointPosition(m,g);i.beginPath(),i.moveTo(t.xCenter,t.yCenter),i.lineTo(v.x,v.y),i.stroke(),i.closePath()}if(l.display){var b=t.getPointPosition(m,g+5),x=a.valueAtIndexOrDefault(l.fontColor,m,e.defaultFontColor);i.font=p.font,i.fillStyle=x;var y=t.getIndexAngle(m),k=a.toDegrees(y);i.textAlign=0===(f=k)||180===f?"center":f<180?"left":"right",d=k,c=t._pointLabelSizes[m],h=b,90===d||270===d?h.y-=c.h/2:(d>270||d<90)&&(h.y-=c.h),u(i,t.pointLabels[m]||"",b,p.size)}}}(t)}}});t.scaleService.registerScaleType("radialLinear",c,i)}},{25:25,34:34,45:45}],58:[function(t,e,i){"use strict";var n=t(1);n="function"==typeof n?n:window.moment;var a=t(25),o=t(45),r=Number.MIN_SAFE_INTEGER||-9007199254740991,s=Number.MAX_SAFE_INTEGER||9007199254740991,l={millisecond:{common:!0,size:1,steps:[1,2,5,10,20,50,100,250,500]},second:{common:!0,size:1e3,steps:[1,2,5,10,30]},minute:{common:!0,size:6e4,steps:[1,2,5,10,30]},hour:{common:!0,size:36e5,steps:[1,2,3,6,12]},day:{common:!0,size:864e5,steps:[1,2,5]},week:{common:!1,size:6048e5,steps:[1,2,3,4]},month:{common:!0,size:2628e6,steps:[1,2,3]},quarter:{common:!1,size:7884e6,steps:[1,2,3,4]},year:{common:!0,size:3154e7}},u=Object.keys(l);function d(t,e){return t-e}function c(t){var e,i,n,a={},o=[];for(e=0,i=t.length;e<i;++e)a[n=t[e]]||(a[n]=!0,o.push(n));return o}function h(t,e,i,n){var a=function(t,e,i){for(var n,a,o,r=0,s=t.length-1;r>=0&&r<=s;){if(a=t[(n=r+s>>1)-1]||null,o=t[n],!a)return{lo:null,hi:o};if(o[e]<i)r=n+1;else{if(!(a[e]>i))return{lo:a,hi:o};s=n-1}}return{lo:o,hi:null}}(t,e,i),o=a.lo?a.hi?a.lo:t[t.length-2]:t[0],r=a.lo?a.hi?a.hi:t[t.length-1]:t[1],s=r[e]-o[e],l=s?(i-o[e])/s:0,u=(r[n]-o[n])*l;return o[n]+u}function f(t,e){var i=e.parser,a=e.parser||e.format;return"function"==typeof i?i(t):"string"==typeof t&&"string"==typeof a?n(t,a):(t instanceof n||(t=n(t)),t.isValid()?t:"function"==typeof a?a(t):t)}function g(t,e){if(o.isNullOrUndef(t))return null;var i=e.options.time,n=f(e.getRightValue(t),i);return n.isValid()?(i.round&&n.startOf(i.round),n.valueOf()):null}function p(t){for(var e=u.indexOf(t)+1,i=u.length;e<i;++e)if(l[u[e]].common)return u[e]}function m(t,e,i,a){var r,d=a.time,c=d.unit||function(t,e,i,n){var a,o,r,d=u.length;for(a=u.indexOf(t);a<d-1;++a)if(r=(o=l[u[a]]).steps?o.steps[o.steps.length-1]:s,o.common&&Math.ceil((i-e)/(r*o.size))<=n)return u[a];return u[d-1]}(d.minUnit,t,e,i),h=p(c),f=o.valueOrDefault(d.stepSize,d.unitStepSize),g="week"===c&&d.isoWeekday,m=a.ticks.major.enabled,v=l[c],b=n(t),x=n(e),y=[];for(f||(f=function(t,e,i,n){var a,o,r,s=e-t,u=l[i],d=u.size,c=u.steps;if(!c)return Math.ceil(s/(n*d));for(a=0,o=c.length;a<o&&(r=c[a],!(Math.ceil(s/(d*r))<=n));++a);return r}(t,e,c,i)),g&&(b=b.isoWeekday(g),x=x.isoWeekday(g)),b=b.startOf(g?"day":c),(x=x.startOf(g?"day":c))<e&&x.add(1,c),r=n(b),m&&h&&!g&&!d.round&&(r.startOf(h),r.add(~~((b-r)/(v.size*f))*f,c));r<x;r.add(f,c))y.push(+r);return y.push(+r),y}e.exports=function(t){var e=t.Scale.extend({initialize:function(){if(!n)throw new Error("Chart.js - Moment.js could not be found! You must include it before Chart.js to use the time scale. Download at https://momentjs.com");this.mergeTicksOptions(),t.Scale.prototype.initialize.call(this)},update:function(){var e=this.options;return e.time&&e.time.format&&console.warn("options.time.format is deprecated and replaced by options.time.parser."),t.Scale.prototype.update.apply(this,arguments)},getRightValue:function(e){return e&&void 0!==e.t&&(e=e.t),t.Scale.prototype.getRightValue.call(this,e)},determineDataLimits:function(){var t,e,i,a,l,u,h=this,f=h.chart,p=h.options.time,m=p.unit||"day",v=s,b=r,x=[],y=[],k=[];for(t=0,i=f.data.labels.length;t<i;++t)k.push(g(f.data.labels[t],h));for(t=0,i=(f.data.datasets||[]).length;t<i;++t)if(f.isDatasetVisible(t))if(l=f.data.datasets[t].data,o.isObject(l[0]))for(y[t]=[],e=0,a=l.length;e<a;++e)u=g(l[e],h),x.push(u),y[t][e]=u;else x.push.apply(x,k),y[t]=k.slice(0);else y[t]=[];k.length&&(k=c(k).sort(d),v=Math.min(v,k[0]),b=Math.max(b,k[k.length-1])),x.length&&(x=c(x).sort(d),v=Math.min(v,x[0]),b=Math.max(b,x[x.length-1])),v=g(p.min,h)||v,b=g(p.max,h)||b,v=v===s?+n().startOf(m):v,b=b===r?+n().endOf(m)+1:b,h.min=Math.min(v,b),h.max=Math.max(v+1,b),h._horizontal=h.isHorizontal(),h._table=[],h._timestamps={data:x,datasets:y,labels:k}},buildTicks:function(){var t,e,i,a,o,r,s,d,c,v,b,x,y=this,k=y.min,M=y.max,w=y.options,S=w.time,C=[],_=[];switch(w.ticks.source){case"data":C=y._timestamps.data;break;case"labels":C=y._timestamps.labels;break;case"auto":default:C=m(k,M,y.getLabelCapacity(k),w)}for("ticks"===w.bounds&&C.length&&(k=C[0],M=C[C.length-1]),k=g(S.min,y)||k,M=g(S.max,y)||M,t=0,e=C.length;t<e;++t)(i=C[t])>=k&&i<=M&&_.push(i);return y.min=k,y.max=M,y._unit=S.unit||function(t,e,i,a){var o,r,s=n.duration(n(a).diff(n(i)));for(o=u.length-1;o>=u.indexOf(e);o--)if(r=u[o],l[r].common&&s.as(r)>=t.length)return r;return u[e?u.indexOf(e):0]}(_,S.minUnit,y.min,y.max),y._majorUnit=p(y._unit),y._table=function(t,e,i,n){if("linear"===n||!t.length)return[{time:e,pos:0},{time:i,pos:1}];var a,o,r,s,l,u=[],d=[e];for(a=0,o=t.length;a<o;++a)(s=t[a])>e&&s<i&&d.push(s);for(d.push(i),a=0,o=d.length;a<o;++a)l=d[a+1],r=d[a-1],s=d[a],void 0!==r&&void 0!==l&&Math.round((l+r)/2)===s||u.push({time:s,pos:a/(o-1)});return u}(y._timestamps.data,k,M,w.distribution),y._offsets=(a=y._table,o=_,r=k,s=M,b=0,x=0,(d=w).offset&&o.length&&(d.time.min||(c=o.length>1?o[1]:s,v=o[0],b=(h(a,"time",c,"pos")-h(a,"time",v,"pos"))/2),d.time.max||(c=o[o.length-1],v=o.length>1?o[o.length-2]:r,x=(h(a,"time",c,"pos")-h(a,"time",v,"pos"))/2)),{left:b,right:x}),y._labelFormat=function(t,e){var i,n,a,o=t.length;for(i=0;i<o;i++){if(0!==(n=f(t[i],e)).millisecond())return"MMM D, YYYY h:mm:ss.SSS a";0===n.second()&&0===n.minute()&&0===n.hour()||(a=!0)}return a?"MMM D, YYYY h:mm:ss a":"MMM D, YYYY"}(y._timestamps.data,S),function(t,e){var i,a,o,r,s=[];for(i=0,a=t.length;i<a;++i)o=t[i],r=!!e&&o===+n(o).startOf(e),s.push({value:o,major:r});return s}(_,y._majorUnit)},getLabelForIndex:function(t,e){var i=this.chart.data,n=this.options.time,a=i.labels&&t<i.labels.length?i.labels[t]:"",r=i.datasets[e].data[t];return o.isObject(r)&&(a=this.getRightValue(r)),n.tooltipFormat?f(a,n).format(n.tooltipFormat):"string"==typeof a?a:f(a,n).format(this._labelFormat)},tickFormatFunction:function(t,e,i,n){var a=this.options,r=t.valueOf(),s=a.time.displayFormats,l=s[this._unit],u=this._majorUnit,d=s[u],c=t.clone().startOf(u).valueOf(),h=a.ticks.major,f=h.enabled&&u&&d&&r===c,g=t.format(n||(f?d:l)),p=f?h:a.ticks.minor,m=o.valueOrDefault(p.callback,p.userCallback);return m?m(g,e,i):g},convertTicksToLabels:function(t){var e,i,a=[];for(e=0,i=t.length;e<i;++e)a.push(this.tickFormatFunction(n(t[e].value),e,t));return a},getPixelForOffset:function(t){var e=this,i=e._horizontal?e.width:e.height,n=e._horizontal?e.left:e.top,a=h(e._table,"time",t,"pos");return n+i*(e._offsets.left+a)/(e._offsets.left+1+e._offsets.right)},getPixelForValue:function(t,e,i){var n=null;if(void 0!==e&&void 0!==i&&(n=this._timestamps.datasets[i][e]),null===n&&(n=g(t,this)),null!==n)return this.getPixelForOffset(n)},getPixelForTick:function(t){var e=this.getTicks();return t>=0&&t<e.length?this.getPixelForOffset(e[t].value):null},getValueForPixel:function(t){var e=this,i=e._horizontal?e.width:e.height,a=e._horizontal?e.left:e.top,o=(i?(t-a)/i:0)*(e._offsets.left+1+e._offsets.left)-e._offsets.right,r=h(e._table,"pos",o,"time");return n(r)},getLabelWidth:function(t){var e=this.options.ticks,i=this.ctx.measureText(t).width,n=o.toRadians(e.maxRotation),r=Math.cos(n),s=Math.sin(n);return i*r+o.valueOrDefault(e.fontSize,a.global.defaultFontSize)*s},getLabelCapacity:function(t){var e=this,i=e.options.time.displayFormats.millisecond,a=e.tickFormatFunction(n(t),0,[],i),o=e.getLabelWidth(a),r=e.isHorizontal()?e.width:e.height,s=Math.floor(r/o);return s>0?s:1}});t.scaleService.registerScaleType("time",e,{position:"bottom",distribution:"linear",bounds:"data",time:{parser:!1,format:!1,unit:!1,round:!1,displayFormat:!1,isoWeekday:!1,minUnit:"millisecond",displayFormats:{millisecond:"h:mm:ss.SSS a",second:"h:mm:ss a",minute:"h:mm a",hour:"hA",day:"MMM D",week:"ll",month:"MMM YYYY",quarter:"[Q]Q - YYYY",year:"YYYY"}},ticks:{autoSkip:!1,source:"auto",major:{enabled:!1}}})}},{1:1,25:25,45:45}]},{},[7])(7)});
diff --git a/public/javascripts/spectrum.css b/public/javascripts/spectrum.css
index a8ad9e4f82f..03ffeda90c8 100644
--- a/public/javascripts/spectrum.css
+++ b/public/javascripts/spectrum.css
@@ -113,7 +113,7 @@ License: MIT
 .sp-clear-enabled .sp-clear {
     display: block;
     position:absolute;
-    top:0px;
+    top:0;
     right:0;
     bottom:0;
     left:84%;
diff --git a/script/bench.rb b/script/bench.rb
index ac6fe614fc8..a93b44faa31 100644
--- a/script/bench.rb
+++ b/script/bench.rb
@@ -11,6 +11,9 @@ require "fileutils"
 @mem_stats = false
 @unicorn = false
 @dump_heap = false
+@concurrency = 1
+@skip_asset_bundle = false
+@unicorn_workers = 3
 
 opts = OptionParser.new do |o|
   o.banner = "Usage: ruby bench.rb [options]"
@@ -35,9 +38,18 @@ opts = OptionParser.new do |o|
   o.on("-m", "--memory_stats") do
     @mem_stats = true
   end
-  o.on("-u", "--unicorn", "Use unicorn to serve pages as opposed to thin") do
+  o.on("-u", "--unicorn", "Use unicorn to serve pages as opposed to puma") do
     @unicorn = true
   end
+  o.on("-c", "--concurrency [NUM]", "Run benchmark with this number of concurrent requests (default: 1)") do |i|
+    @concurrency = i.to_i
+  end
+  o.on("-w", "--unicorn_workers [NUM]", "Run benchmark with this number of unicorn workers (default: 3)") do |i|
+    @unicorn_workers = i.to_i
+  end
+  o.on("-s", "--skip-bundle-assets", "Skip bundling assets") do
+    @skip_asset_bundle = true
+  end
 end
 opts.parse!
 
@@ -106,19 +118,41 @@ end
 
 ENV["RAILS_ENV"] = "profile"
 
-discourse_env_vars = %w(DISCOURSE_DUMP_HEAP RUBY_GC_HEAP_INIT_SLOTS RUBY_GC_HEAP_FREE_SLOTS RUBY_GC_HEAP_GROWTH_FACTOR RUBY_GC_HEAP_GROWTH_MAX_SLOTS RUBY_GC_MALLOC_LIMIT RUBY_GC_OLDMALLOC_LIMIT RUBY_GC_MALLOC_LIMIT_MAX RUBY_GC_OLDMALLOC_LIMIT_MAX RUBY_GC_MALLOC_LIMIT_GROWTH_FACTOR RUBY_GC_OLDMALLOC_LIMIT_GROWTH_FACTOR RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR)
+discourse_env_vars = %w(
+  DISCOURSE_DUMP_HEAP
+  RUBY_GC_HEAP_INIT_SLOTS
+  RUBY_GC_HEAP_FREE_SLOTS
+  RUBY_GC_HEAP_GROWTH_FACTOR
+  RUBY_GC_HEAP_GROWTH_MAX_SLOTS
+  RUBY_GC_MALLOC_LIMIT
+  RUBY_GC_OLDMALLOC_LIMIT
+  RUBY_GC_MALLOC_LIMIT_MAX
+  RUBY_GC_OLDMALLOC_LIMIT_MAX
+  RUBY_GC_MALLOC_LIMIT_GROWTH_FACTOR
+  RUBY_GC_OLDMALLOC_LIMIT_GROWTH_FACTOR
+  RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR
+  RUBY_GLOBAL_METHOD_CACHE_SIZE
+  LD_PRELOAD
+)
 
 if @include_env
   puts "Running with tuned environment"
-  discourse_env_vars - %w(RUBY_GC_MALLOC_LIMIT).each do |v|
+  discourse_env_vars.each do |v|
     ENV.delete v
   end
+
+  ENV['RUBY_GLOBAL_METHOD_CACHE_SIZE'] = '131072'
+  ENV['RUBY_GC_HEAP_GROWTH_MAX_SLOTS'] = '40000'
+  ENV['RUBY_GC_HEAP_INIT_SLOTS'] = '400000'
+  ENV['RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR'] = '1.5'
+
 else
   # clean env
   puts "Running with the following custom environment"
-  discourse_env_vars.each do |w|
-    puts "#{w}: #{ENV[w]}"
-  end
+end
+
+discourse_env_vars.each do |w|
+  puts "#{w}: #{ENV[w]}" if ENV[w].to_s.length > 0
 end
 
 def port_available?(port)
@@ -153,8 +187,9 @@ api_key = `bundle exec rake api_key:get`.split("\n")[-1]
 def bench(path, name)
   puts "Running apache bench warmup"
   add = ""
-  add = "-c 3 " if @unicorn
+  add = "-c #{@concurrency} " if @concurrency > 1
   `ab #{add} -n 20 -l "http://127.0.0.1:#{@port}#{path}"`
+
   puts "Benchmarking #{name} @ #{path}"
   `ab #{add} -n #{@iterations} -l -e tmp/ab.csv "http://127.0.0.1:#{@port}#{path}"`
 
@@ -168,16 +203,19 @@ end
 
 begin
   # critical cause cache may be incompatible
-  puts "precompiling assets"
-  run("bundle exec rake assets:precompile")
+  unless @skip_asset_bundle
+    puts "precompiling assets"
+    run("bundle exec rake assets:precompile")
+  end
 
   pid =
     if @unicorn
       ENV['UNICORN_PORT'] = @port.to_s
+      ENV['UNICORN_WORKERS'] = @unicorn_workers.to_s
       FileUtils.mkdir_p(File.join('tmp', 'pids'))
       spawn("bundle exec unicorn -c config/unicorn.conf.rb")
     else
-      spawn("bundle exec thin start -p #{@port}")
+      spawn("bundle exec puma -p #{@port} -e production")
     end
 
   while port_available? @port
@@ -223,6 +261,17 @@ begin
 
   puts "Your Results: (note for timings- percentile is first, duration is second in millisecs)"
 
+  if @unicorn
+    puts "Unicorn: (workers: #{@unicorn_workers})"
+  else
+    # TODO we want to also bench puma clusters
+    puts "Puma: (single threaded)"
+  end
+  puts "Include env: #{@include_env}"
+  puts "Iterations: #{@iterations}, Best of: #{@best_of}"
+  puts "Concurrency: #{@concurrency}"
+  puts
+
   # Prevent using external facts because it breaks when running in the
   # discourse/discourse_bench docker container.
   Facter::Util::Config.external_facts_dirs = []
diff --git a/script/benchmarks/middleware/test.rb b/script/benchmarks/middleware/test.rb
new file mode 100644
index 00000000000..58595dfcf96
--- /dev/null
+++ b/script/benchmarks/middleware/test.rb
@@ -0,0 +1,71 @@
+require 'memory_profiler'
+require 'benchmark/ips'
+
+ENV["RAILS_ENV"] = "production"
+
+require File.expand_path("../../../../config/environment", __FILE__)
+
+def req
+  _t = "9c1a318cb72cca57daf413cc511f0993"
+
+  data = {
+    "timings[1]" => "1001",
+    "timings[2]" => "1001",
+    "timings[3]" => "1001",
+    "topic_id" => "490310"
+  }
+
+  data = data.map do |k, v|
+    "#{CGI.escape(k)}=#{v}"
+  end.join("&")
+
+  {
+    "REQUEST_METHOD" => "POST",
+    "SCRIPT_NAME" => "",
+    "PATH_INFO" => "/topics/timings.json",
+    "QUERY_STRING" => "",
+    "SERVER_NAME" => "localhost",
+    "SERVER_PORT" => "80",
+    "HTTP_CONTENT_TYPE" => "application/x-www-form-urlencoded",
+    "HTTP_VERSION" => "HTTP/1.0",
+    "HTTP_COOKIE" => "_t=#{_t}",
+    "rack.input" => StringIO.new(data),
+    "rack.version" => [1, 2],
+    "rack.url_scheme" => "http"
+  }
+end
+
+1.times do
+  s = Time.now
+  Rails.application.call(req)
+  puts(Time.now - s)
+end
+exit
+#
+#
+StackProf.run(mode: :wall, out: 'report.dump') do
+  1000.times do
+    Rails.application.call(req)
+  end
+end
+#
+# MemoryProfiler.start
+# Rails.application.call(req)
+# MemoryProfiler.stop.pretty_print
+# exit
+
+# # exit
+# exit
+
+# Benchmark.ips do |x|
+#   x.report("default") do
+#     Rails.application.call(req)
+#   end
+# end
+
+# status, headers, body = Rails.application.call(req)
+# p status
+# p headers
+# body.each do |s|
+#   p s.to_s
+# end
diff --git a/script/boot_mem.rb b/script/boot_mem.rb
new file mode 100644
index 00000000000..61da1fa6c6b
--- /dev/null
+++ b/script/boot_mem.rb
@@ -0,0 +1,21 @@
+# simple script to measure memory at boot
+
+if ENV['RAILS_ENV'] != "production"
+  exec "RAILS_ENV=production ruby #{__FILE__}"
+end
+
+require 'memory_profiler'
+
+MemoryProfiler.report do
+  require File.expand_path("../../config/environment", __FILE__)
+
+  Rails.application.routes.recognize_path('abc') rescue nil
+
+  # load up the yaml for the localization bits, in master process
+  I18n.t(:posts)
+
+  # load up all models and schema
+  (ActiveRecord::Base.connection.tables - %w[schema_migrations versions]).each do |table|
+    table.classify.constantize.first rescue nil
+  end
+end.pretty_print
diff --git a/script/bulk_import/base.rb b/script/bulk_import/base.rb
index 66f61df4e05..57a7eac029c 100644
--- a/script/bulk_import/base.rb
+++ b/script/bulk_import/base.rb
@@ -1,9 +1,11 @@
 require "pg"
 require "set"
 require "redcarpet"
+require "htmlentities"
 
 puts "Loading application..."
 require_relative "../../config/environment"
+require_relative '../import_scripts/base/uploader'
 
 module BulkImport; end
 
@@ -12,10 +14,53 @@ class BulkImport::Base
   NOW ||= "now()".freeze
   PRIVATE_OFFSET ||= 2**30
 
+  CHARSET_MAP = {
+    "armscii8" => nil,
+    "ascii"    => Encoding::US_ASCII,
+    "big5"     => Encoding::Big5,
+    "binary"   => Encoding::ASCII_8BIT,
+    "cp1250"   => Encoding::Windows_1250,
+    "cp1251"   => Encoding::Windows_1251,
+    "cp1256"   => Encoding::Windows_1256,
+    "cp1257"   => Encoding::Windows_1257,
+    "cp850"    => Encoding::CP850,
+    "cp852"    => Encoding::CP852,
+    "cp866"    => Encoding::IBM866,
+    "cp932"    => Encoding::Windows_31J,
+    "dec8"     => nil,
+    "eucjpms"  => Encoding::EucJP_ms,
+    "euckr"    => Encoding::EUC_KR,
+    "gb2312"   => Encoding::EUC_CN,
+    "gbk"      => Encoding::GBK,
+    "geostd8"  => nil,
+    "greek"    => Encoding::ISO_8859_7,
+    "hebrew"   => Encoding::ISO_8859_8,
+    "hp8"      => nil,
+    "keybcs2"  => nil,
+    "koi8r"    => Encoding::KOI8_R,
+    "koi8u"    => Encoding::KOI8_U,
+    "latin1"   => Encoding::ISO_8859_1,
+    "latin2"   => Encoding::ISO_8859_2,
+    "latin5"   => Encoding::ISO_8859_9,
+    "latin7"   => Encoding::ISO_8859_13,
+    "macce"    => Encoding::MacCentEuro,
+    "macroman" => Encoding::MacRoman,
+    "sjis"     => Encoding::SHIFT_JIS,
+    "swe7"     => nil,
+    "tis620"   => Encoding::TIS_620,
+    "ucs2"     => Encoding::UTF_16BE,
+    "ujis"     => Encoding::EucJP_ms,
+    "utf8"     => Encoding::UTF_8,
+  }
+
   def initialize
+    charset = ENV["DB_CHARSET"] || "utf8"
     db = ActiveRecord::Base.connection_config
     @encoder = PG::TextEncoder::CopyRow.new
     @raw_connection = PG.connect(dbname: db[:database], host: db[:host_names]&.first, port: db[:port])
+    @uploader = ImportScripts::Uploader.new
+    @html_entities = HTMLEntities.new
+    @encoding = CHARSET_MAP[charset]
 
     @markdown = Redcarpet::Markdown.new(
       Redcarpet::Render::HTML.new(hard_wrap: true),
@@ -27,6 +72,7 @@ class BulkImport::Base
 
   def run
     puts "Starting..."
+    Rails.logger.level = 3 # :error, so that we don't create log files that are many GB
     preload_i18n
     fix_highest_post_numbers
     load_imported_ids
@@ -87,33 +133,38 @@ class BulkImport::Base
     @last_imported_private_post_id = imported_post_ids.select { |id| id > PRIVATE_OFFSET }.max || (PRIVATE_OFFSET - 1)
   end
 
+  def last_id(klass)
+    # the first record created will have id of this value + 1
+    [klass.unscoped.maximum(:id) || 0, 0].max
+  end
+
   def load_indexes
     puts "Loading groups indexes..."
     @last_group_id = Group.unscoped.maximum(:id)
     @group_names = Group.unscoped.pluck(:name).map(&:downcase).to_set
 
     puts "Loading users indexes..."
-    @last_user_id = User.unscoped.maximum(:id)
-    @last_user_email_id = UserEmail.unscoped.maximum(:id)
+    @last_user_id = last_id(User)
+    @last_user_email_id = last_id(UserEmail)
     @emails = User.unscoped.joins(:user_emails).pluck(:"user_emails.email").to_set
     @usernames_lower = User.unscoped.pluck(:username_lower).to_set
     @mapped_usernames = UserCustomField.joins(:user).where(name: "import_username").pluck("user_custom_fields.value", "users.username").to_h
 
     puts "Loading categories indexes..."
-    @last_category_id = Category.unscoped.maximum(:id)
+    @last_category_id = last_id(Category)
     @category_names = Category.unscoped.pluck(:parent_category_id, :name).map { |pci, name| "#{pci}-#{name}" }.to_set
 
     puts "Loading topics indexes..."
-    @last_topic_id = Topic.unscoped.maximum(:id)
+    @last_topic_id = last_id(Topic)
     @highest_post_number_by_topic_id = Topic.unscoped.pluck(:id, :highest_post_number).to_h
 
     puts "Loading posts indexes..."
-    @last_post_id = Post.unscoped.maximum(:id)
+    @last_post_id = last_id(Post)
     @post_number_by_post_id = Post.unscoped.pluck(:id, :post_number).to_h
     @topic_id_by_post_id = Post.unscoped.pluck(:id, :topic_id).to_h
 
     puts "Loading post actions indexes..."
-    @last_post_action_id = PostAction.unscoped.maximum(:id) || 0
+    @last_post_action_id = last_id(PostAction)
   end
 
   def execute
@@ -122,13 +173,13 @@ class BulkImport::Base
 
   def fix_primary_keys
     puts "Updating primary key sequences..."
-    @raw_connection.exec("SELECT setval('#{Group.sequence_name}', #{@last_group_id})")
-    @raw_connection.exec("SELECT setval('#{User.sequence_name}', #{@last_user_id})")
-    @raw_connection.exec("SELECT setval('#{UserEmail.sequence_name}', #{@last_user_email_id})")
-    @raw_connection.exec("SELECT setval('#{Category.sequence_name}', #{@last_category_id})")
-    @raw_connection.exec("SELECT setval('#{Topic.sequence_name}', #{@last_topic_id})")
-    @raw_connection.exec("SELECT setval('#{Post.sequence_name}', #{@last_post_id})")
-    @raw_connection.exec("SELECT setval('#{PostAction.sequence_name}', #{@last_post_action_id})")
+    @raw_connection.exec("SELECT setval('#{Group.sequence_name}', #{@last_group_id})") if @last_group_id > 0
+    @raw_connection.exec("SELECT setval('#{User.sequence_name}', #{@last_user_id})") if @last_user_id > 0
+    @raw_connection.exec("SELECT setval('#{UserEmail.sequence_name}', #{@last_user_email_id})") if @last_user_email_id > 0
+    @raw_connection.exec("SELECT setval('#{Category.sequence_name}', #{@last_category_id})") if @last_category_id > 0
+    @raw_connection.exec("SELECT setval('#{Topic.sequence_name}', #{@last_topic_id})") if @last_topic_id > 0
+    @raw_connection.exec("SELECT setval('#{Post.sequence_name}', #{@last_post_id})") if @last_post_id > 0
+    @raw_connection.exec("SELECT setval('#{PostAction.sequence_name}', #{@last_post_action_id})") if @last_post_action_id > 0
   end
 
   def group_id_from_imported_id(id); @groups[id.to_s]; end
@@ -194,6 +245,10 @@ class BulkImport::Base
     topic_id user_id created_at updated_at
   }
 
+  TOPIC_TAG_COLUMNS ||= %i{
+    topic_id tag_id created_at updated_at
+  }
+
   def create_groups(rows, &block); create_records(rows, "group", GROUP_COLUMNS, &block); end
 
   def create_users(rows, &block)
@@ -209,6 +264,14 @@ class BulkImport::Base
     end
   end
 
+  def create_categories(rows, &block)
+    create_records(rows, "category", CATEGORY_COLUMNS, &block)
+
+    Category.where(topic_id: nil).each do |c|
+      c.create_category_definition
+    end
+  end
+
   def create_user_emails(rows, &block) create_records(rows, "user_email", USER_EMAIL_COLUMNS, &block); end
   def create_user_stats(rows, &block) create_records(rows, "user_stat", USER_STAT_COLUMNS, &block); end
   def create_user_profiles(rows, &block); create_records(rows, "user_profile", USER_PROFILE_COLUMNS, &block); end
@@ -218,6 +281,7 @@ class BulkImport::Base
   def create_posts(rows, &block); create_records(rows, "post", POST_COLUMNS, &block); end
   def create_post_actions(rows, &block); create_records(rows, "post_action", POST_ACTION_COLUMNS, &block); end
   def create_topic_allowed_users(rows, &block); create_records(rows, "topic_allowed_user", TOPIC_ALLOWED_USER_COLUMNS, &block); end
+  def create_topic_tags(rows, &block); create_records(rows, "topic_tag", TOPIC_TAG_COLUMNS, &block); end
 
   def process_group(group)
     @groups[group[:imported_id].to_s] = group[:id] = @last_group_id += 1
@@ -282,9 +346,6 @@ class BulkImport::Base
     user_email[:email] ||= random_email
     user_email[:email].downcase!
 
-    # unique email
-    user_email[:email] = random_email until user_email[:email] =~ EmailValidator.email_regex && @emails.add?(user_email[:email])
-
     user_email
   end
 
@@ -386,6 +447,12 @@ class BulkImport::Base
     topic_allowed_user
   end
 
+  def process_topic_tag(topic_tag)
+    topic_tag[:created_at] = NOW
+    topic_tag[:updated_at] = NOW
+    topic_tag
+  end
+
   def process_raw(raw)
     # fix whitespaces
     raw.gsub!(/(\\r)?\\n/, "\n")
@@ -436,6 +503,9 @@ class BulkImport::Base
     # [IMG]...[/IMG]
     raw.gsub!(/(?:\s*\[IMG\]\s*)+(.+?)(?:\s*\[\/IMG\]\s*)+/im) { "\n\n#{$1}\n\n" }
 
+    # [IMG=url]
+    raw.gsub!(/\[IMG=([^\]]*)\]/im) { "\n\n#{$1}\n\n" }
+
     # [URL=...]...[/URL]
     raw.gsub!(/\[URL="?(.+?)"?\](.+?)\[\/URL\]/im) { "[#{$2.strip}](#{$1})" }
 
@@ -462,14 +532,19 @@ class BulkImport::Base
     raw.gsub!(/\[TD="?.*?"?\](.*?)\[\/TD\]/im, "\\1")
 
     # [QUOTE]...[/QUOTE]
-    raw.gsub!(/\[QUOTE\](.+?)\[\/QUOTE\]/im) { |quote|
-      quote.gsub!(/\[QUOTE\](.+?)\[\/QUOTE\]/im) { "\n#{$1}\n" }
-      quote.gsub!(/\n(.+?)/) { "\n> #{$1}" }
-    }
+    raw.gsub!(/\[QUOTE="([^\]]+)"\]/i) { "[QUOTE=#{$1}]" }
 
-    # [QUOTE=<username>;<postid>]...[/QUOTE]
-    raw.gsub!(/\[QUOTE=([^;]+);(\d+)\](.+?)\[\/QUOTE\]/im) do
-      imported_username, imported_postid, quote = $1, $2, $3
+    # Nested Quotes
+    raw.gsub!(/(\[\/?QUOTE.*?\])/mi) { |q| "\n#{q}\n" }
+
+    # raw.gsub!(/\[QUOTE\](.+?)\[\/QUOTE\]/im) { |quote|
+    #   quote.gsub!(/\[QUOTE\](.+?)\[\/QUOTE\]/im) { "\n#{$1}\n" }
+    #   quote.gsub!(/\n(.+?)/) { "\n> #{$1}" }
+    # }
+
+    # [QUOTE=<username>;<postid>]
+    raw.gsub!(/\[QUOTE=([^;\]]+);(\d+)\]/i) do
+      imported_username, imported_postid = $1, $2
 
       username = @mapped_usernames[imported_username] || imported_username
       post_id = post_id_from_imported_id(imported_postid)
@@ -477,9 +552,9 @@ class BulkImport::Base
       topic_id = @topic_id_by_post_id[post_id]
 
       if post_number && topic_id
-        "\n[quote=\"#{username}, post:#{post_number}, topic:#{topic_id}\"]\n#{quote}\n[/quote]"
+        "\n[quote=\"#{username}, post:#{post_number}, topic:#{topic_id}\"]\n"
       else
-        "\n[quote=\"#{username}\"]\n#{quote}\n[/quote]\n"
+        "\n[quote=\"#{username}\"]\n"
       end
     end
 
@@ -545,6 +620,10 @@ class BulkImport::Base
     end
   end
 
+  def create_upload(user_id, path, source_filename)
+    @uploader.create_upload(user_id, path, source_filename)
+  end
+
   def fix_name(name)
     name.scrub! if name.valid_encoding? == false
     return if name.blank?
@@ -610,4 +689,14 @@ class BulkImport::Base
     Redcarpet::Render::SmartyPants.render(ERB::Util.html_escape(title)).scrub.strip
   end
 
+  def normalize_text(text)
+    return nil unless text.present?
+    @html_entities.decode(normalize_charset(text.presence || "").scrub)
+  end
+
+  def normalize_charset(text)
+    return text if @encoding == Encoding::UTF_8
+    return text && text.encode(@encoding).force_encoding(Encoding::UTF_8)
+  end
+
 end
diff --git a/script/bulk_import/phpbb_postgresql.rb b/script/bulk_import/phpbb_postgresql.rb
index 3c171424b49..570944b397e 100644
--- a/script/bulk_import/phpbb_postgresql.rb
+++ b/script/bulk_import/phpbb_postgresql.rb
@@ -7,44 +7,6 @@ class BulkImport::PhpBB < BulkImport::Base
 
   SUSPENDED_TILL ||= Date.new(3000, 1, 1)
   TABLE_PREFIX ||= ENV['TABLE_PREFIX'] || "phpbb_"
-  CHARSET_MAP = {
-    "armscii8" => nil,
-    "ascii"    => Encoding::US_ASCII,
-    "big5"     => Encoding::Big5,
-    "binary"   => Encoding::ASCII_8BIT,
-    "cp1250"   => Encoding::Windows_1250,
-    "cp1251"   => Encoding::Windows_1251,
-    "cp1256"   => Encoding::Windows_1256,
-    "cp1257"   => Encoding::Windows_1257,
-    "cp850"    => Encoding::CP850,
-    "cp852"    => Encoding::CP852,
-    "cp866"    => Encoding::IBM866,
-    "cp932"    => Encoding::Windows_31J,
-    "dec8"     => nil,
-    "eucjpms"  => Encoding::EucJP_ms,
-    "euckr"    => Encoding::EUC_KR,
-    "gb2312"   => Encoding::EUC_CN,
-    "gbk"      => Encoding::GBK,
-    "geostd8"  => nil,
-    "greek"    => Encoding::ISO_8859_7,
-    "hebrew"   => Encoding::ISO_8859_8,
-    "hp8"      => nil,
-    "keybcs2"  => nil,
-    "koi8r"    => Encoding::KOI8_R,
-    "koi8u"    => Encoding::KOI8_U,
-    "latin1"   => Encoding::ISO_8859_1,
-    "latin2"   => Encoding::ISO_8859_2,
-    "latin5"   => Encoding::ISO_8859_9,
-    "latin7"   => Encoding::ISO_8859_13,
-    "macce"    => Encoding::MacCentEuro,
-    "macroman" => Encoding::MacRoman,
-    "sjis"     => Encoding::SHIFT_JIS,
-    "swe7"     => nil,
-    "tis620"   => Encoding::TIS_620,
-    "ucs2"     => Encoding::UTF_16BE,
-    "ujis"     => Encoding::EucJP_ms,
-    "utf8"     => Encoding::UTF_8,
-  }
 
   def initialize
     super
@@ -371,16 +333,6 @@ class BulkImport::PhpBB < BulkImport::Base
     pm_title
   end
 
-  def normalize_text(text)
-    return nil unless text.present?
-    @html_entities.decode(normalize_charset(text.presence || "").scrub)
-  end
-
-  def normalize_charset(text)
-    return text if @encoding == Encoding::UTF_8
-    return text && text.encode(@encoding).force_encoding(Encoding::UTF_8)
-  end
-
   def parse_birthday(birthday)
     return if birthday.blank?
     date_of_birth = Date.strptime(birthday.gsub(/[^\d-]+/, ""), "%m-%d-%Y") rescue nil
diff --git a/script/bulk_import/vanilla.rb b/script/bulk_import/vanilla.rb
new file mode 100644
index 00000000000..771a3ef67bb
--- /dev/null
+++ b/script/bulk_import/vanilla.rb
@@ -0,0 +1,580 @@
+require_relative "base"
+require "mysql2"
+require "rake"
+
+class BulkImport::Vanilla < BulkImport::Base
+
+  VANILLA_DB = "dbname"
+  TABLE_PREFIX = "GDN_"
+  ATTACHMENTS_BASE_DIR = "/my/absolute/path/to/from_vanilla/uploads"
+  BATCH_SIZE = 1000
+  CONVERT_HTML = true
+
+  SUSPENDED_TILL ||= Date.new(3000, 1, 1)
+
+  def initialize
+    super
+    @htmlentities = HTMLEntities.new
+    @client = Mysql2::Client.new(
+      host: "localhost",
+      username: "root",
+      database: VANILLA_DB
+    )
+
+    @import_tags = false
+    begin
+      r = @client.query("select count(*) count from #{TABLE_PREFIX}Tag where countdiscussions > 0")
+      @import_tags = true if r.first["count"].to_i > 0
+    rescue => e
+      puts "Tags won't be imported. None found. #{e.message}"
+    end
+
+    @category_mappings = {}
+  end
+
+  def start
+    run # will call execute, and then "complete" the migration
+
+    # Now that the migration is complete, do some more work:
+
+    Discourse::Application.load_tasks
+    Rake::Task["import:ensure_consistency"].invoke
+
+    import_avatars # slow
+    create_permalinks # TODO: do it bulk style
+  end
+
+  def execute
+    if @import_tags
+      SiteSetting.tagging_enabled = true
+      SiteSetting.max_tags_per_topic = 10
+      SiteSetting.max_tag_length = 100
+    end
+
+    # other good ones:
+
+    # SiteSetting.port = 3000
+    # SiteSetting.automatic_backups_enabled = false
+    # SiteSetting.disable_emails = true
+    # etc.
+
+    import_users
+    import_user_emails
+    import_user_profiles
+    import_user_stats
+
+    import_categories
+    import_topics
+    import_tags if @import_tags
+    import_posts
+
+    import_private_topics
+    import_topic_allowed_users
+    import_private_posts
+  end
+
+  def import_users
+    puts '', "Importing users..."
+
+    username = nil
+    total_count = mysql_query("SELECT count(*) count FROM #{TABLE_PREFIX}User;").first['count']
+
+    users = mysql_stream <<-SQL
+      SELECT UserID, Name, Title, Location, Email,
+             DateInserted, DateLastActive, InsertIPAddress, Admin, Banned
+        FROM #{TABLE_PREFIX}User
+       WHERE UserID > #{@last_imported_user_id}
+         AND Deleted = 0
+    ORDER BY UserID ASC
+    SQL
+
+    create_users(users) do |row|
+      next if row['Email'].blank?
+      next if row['Name'].blank?
+
+      if ip_address = row['InsertIPAddress']&.split(',').try(:[], 0)
+        ip_address = nil unless (IPAddr.new(ip_address) rescue false)
+      end
+
+      u = {
+        imported_id: row['UserID'],
+        email: row['Email'],
+        username: row['Name'],
+        name: row['Name'],
+        created_at: row['DateInserted'] == nil ? 0 : Time.zone.at(row['DateInserted']),
+        registration_ip_address: ip_address,
+        last_seen_at: row['DateLastActive'] == nil ? 0 : Time.zone.at(row['DateLastActive']),
+        location: row['Location'],
+        admin: row['Admin'] > 0
+      }
+      if row["Banned"] > 0
+        u[:suspended_at] = Time.zone.at(row['DateInserted'])
+        u[:suspended_till] = SUSPENDED_TILL
+      end
+      u
+    end
+  end
+
+  def import_user_emails
+    puts '', 'Importing user emails...'
+
+    users = mysql_stream <<-SQL
+      SELECT UserID, Name, Email, DateInserted
+        FROM #{TABLE_PREFIX}User
+       WHERE UserID > #{@last_imported_user_id}
+         AND Deleted = 0
+    ORDER BY UserID ASC
+    SQL
+
+    create_user_emails(users) do |row|
+      next if row['Email'].blank?
+      next if row['Name'].blank?
+
+      {
+        imported_id: row["UserID"],
+        imported_user_id: row["UserID"],
+        email: row["Email"],
+        created_at: Time.zone.at(row["DateInserted"])
+      }
+    end
+  end
+
+  def import_user_profiles
+    puts '', 'Importing user profiles...'
+
+    user_profiles = mysql_stream <<-SQL
+      SELECT UserID, Name, Email, Location, About
+        FROM #{TABLE_PREFIX}User
+       WHERE UserID > #{@last_imported_user_id}
+         AND Deleted = 0
+    ORDER BY UserID ASC
+    SQL
+
+    create_user_profiles(user_profiles) do |row|
+      next if row['Email'].blank?
+      next if row['Name'].blank?
+
+      {
+        user_id: user_id_from_imported_id(row["UserID"]),
+        location: row["Location"],
+        bio_raw: row["About"]
+      }
+    end
+  end
+
+  def import_user_stats
+    puts '', "Importing user stats..."
+
+    users = mysql_stream <<-SQL
+      SELECT UserID, CountDiscussions, CountComments, DateInserted
+        FROM #{TABLE_PREFIX}User
+       WHERE UserID > #{@last_imported_user_id}
+         AND Deleted = 0
+    ORDER BY UserID ASC
+    SQL
+
+    now = Time.zone.now
+
+    create_user_stats(users) do |row|
+      next unless @users[row['UserID'].to_s] # shouldn't need this but it can be NULL :<
+
+      {
+        imported_id: row['UserID'],
+        imported_user_id: row['UserID'],
+        new_since: Time.zone.at(row['DateInserted'] || now),
+        post_count: row['CountComments'] || 0,
+        topic_count: row['CountDiscussions'] || 0
+      }
+    end
+  end
+
+  def import_avatars
+    if ATTACHMENTS_BASE_DIR && File.exists?(ATTACHMENTS_BASE_DIR)
+      puts "", "importing user avatars"
+
+      start = Time.now
+      count = 0
+
+      User.find_each do |u|
+        count += 1
+        print "\r%7d - %6d/sec".freeze % [count, count.to_f / (Time.now - start)]
+
+        next unless u.custom_fields["import_id"]
+
+        r = mysql_query("SELECT photo FROM #{TABLE_PREFIX}User WHERE UserID = #{u.custom_fields['import_id']};").first
+        next if r.nil?
+        photo = r["photo"]
+        next unless photo.present?
+
+        # Possible encoded values:
+        # 1. cf://uploads/userpics/820/Y0AFUQYYM6QN.jpg
+        # 2. ~cf/userpics2/cf566487133f1f538e02da96f9a16b18.jpg
+        # 3. ~cf/userpics/txkt8kw1wozn.jpg
+        # 4. s3://uploads/xf/22/22690.jpg
+
+        photo_real_filename = nil
+        parts = photo.squeeze("/").split("/")
+        if parts[0] =~ /^[a-z0-9]{2}:/
+          photo_path = "#{ATTACHMENTS_BASE_DIR}/#{parts[2..-2].join('/')}".squeeze("/")
+        elsif parts[0] == "~cf"
+          photo_path = "#{ATTACHMENTS_BASE_DIR}/#{parts[1..-2].join('/')}".squeeze("/")
+        else
+          puts "UNKNOWN FORMAT: #{photo}"
+          next
+        end
+
+        if !File.exists?(photo_path)
+          puts "Path to avatar file not found! Skipping. #{photo_path}"
+          next
+        end
+
+        photo_real_filename = find_photo_file(photo_path, parts.last)
+        if photo_real_filename.nil?
+          puts "Couldn't find file for #{photo}. Skipping."
+          next
+        end
+
+        print "."
+
+        upload = create_upload(u.id, photo_real_filename, File.basename(photo_real_filename))
+        if upload.persisted?
+          u.import_mode = false
+          u.create_user_avatar
+          u.import_mode = true
+          u.user_avatar.update(custom_upload_id: upload.id)
+          u.update(uploaded_avatar_id: upload.id)
+        else
+          puts "Error: Upload did not persist for #{u.username} #{photo_real_filename}!"
+        end
+      end
+    end
+  end
+
+  def find_photo_file(path, base_filename)
+    base_guess = base_filename.dup
+    full_guess = File.join(path, base_guess) # often an exact match exists
+
+    return full_guess if File.exists?(full_guess)
+
+    # Otherwise, the file exists but with a prefix:
+    # The p prefix seems to be the full file, so try to find that one first.
+    ['p', 't', 'n'].each do |prefix|
+      full_guess = File.join(path, "#{prefix}#{base_guess}")
+      return full_guess if File.exists?(full_guess)
+    end
+
+    # Didn't find it.
+    nil
+  end
+
+  def import_categories
+    puts "", "Importing categories..."
+
+    categories = mysql_query("
+      SELECT CategoryID, ParentCategoryID, Name, Description, Sort
+      FROM #{TABLE_PREFIX}Category
+      WHERE CategoryID > 0
+      ORDER BY Sort, CategoryID
+    ").to_a
+
+    # Throw the -1 level categories away since they contain no topics.
+    # Use the next level as root categories.
+    root_category_ids = Set.new(categories.select { |c| c["ParentCategoryID"] == -1 }.map { |c| c["CategoryID"] })
+
+    top_level_categories = categories.select { |c| root_category_ids.include?(c["ParentCategoryID"]) }
+
+    # Depth = 2
+    create_categories(top_level_categories) do |category|
+      next if category_id_from_imported_id(category['CategoryID'])
+      {
+        imported_id: category['CategoryID'],
+        name: CGI.unescapeHTML(category['Name']),
+        description: category['Description'] ? CGI.unescapeHTML(category['Description']) : nil,
+        position: category['Sort']
+      }
+    end
+
+    top_level_category_ids = Set.new(top_level_categories.map { |c| c["CategoryID"] })
+
+    subcategories = categories.select { |c| top_level_category_ids.include?(c["ParentCategoryID"]) }
+
+    # Depth = 3
+    create_categories(subcategories) do |category|
+      next if category_id_from_imported_id(category['CategoryID'])
+      {
+        imported_id: category['CategoryID'],
+        parent_category_id: category_id_from_imported_id(category['ParentCategoryID']),
+        name: CGI.unescapeHTML(category['Name']),
+        description: category['Description'] ? CGI.unescapeHTML(category['Description']) : nil,
+        position: category['Sort']
+      }
+    end
+
+    subcategory_ids = Set.new(subcategories.map { |c| c['CategoryID'] })
+
+    # Depth 4 and 5 need to be tags
+
+    categories.each do |c|
+      next if c['ParentCategoryID'] == -1
+      next if top_level_category_ids.include?(c['CategoryID'])
+      next if subcategory_ids.include?(c['CategoryID'])
+
+      # Find a depth 3 category for topics in this category
+      parent = c
+      while !parent.nil? && !subcategory_ids.include?(parent['CategoryID'])
+        parent = categories.find { |subcat| subcat['CategoryID'] == parent['ParentCategoryID'] }
+      end
+
+      if parent
+        tag_name = DiscourseTagging.clean_tag(c['Name'])
+        @category_mappings[c['CategoryID']] = {
+          category_id: category_id_from_imported_id(parent['CategoryID']),
+          tag: Tag.find_by_name(tag_name) || Tag.create(name: tag_name)
+        }
+      else
+        puts '', "Couldn't find a category for #{c['CategoryID']} '#{c['Name']}'!"
+      end
+    end
+  end
+
+  def import_topics
+    puts "", "Importing topics..."
+
+    topics_sql = "SELECT DiscussionID, CategoryID, Name, Body, DateInserted, InsertUserID, Announce
+      FROM #{TABLE_PREFIX}Discussion
+      WHERE DiscussionID > #{@last_imported_topic_id}
+      ORDER BY DiscussionID ASC"
+
+    create_topics(mysql_stream(topics_sql)) do |row|
+      {
+        imported_id: row["DiscussionID"],
+        title: normalize_text(row["Name"]),
+        category_id: category_id_from_imported_id(row["CategoryID"]) ||
+          @category_mappings[row["CategoryID"]].try(:[], :category_id),
+        user_id: user_id_from_imported_id(row["InsertUserID"]),
+        created_at: Time.zone.at(row['DateInserted']),
+        pinned_at: row['Announce'] == 0 ? nil : Time.zone.at(row['DateInserted'])
+      }
+    end
+
+    puts "", "importing first posts..."
+
+    create_posts(mysql_stream(topics_sql)) do |row|
+      {
+        imported_id: "d-" + row['DiscussionID'].to_s,
+        topic_id: topic_id_from_imported_id(row["DiscussionID"]),
+        user_id: user_id_from_imported_id(row["InsertUserID"]),
+        created_at: Time.zone.at(row['DateInserted']),
+        raw: clean_up(row["Body"])
+      }
+    end
+
+    puts '', 'converting deep categories to tags...'
+
+    create_topic_tags(mysql_stream(topics_sql)) do |row|
+      next unless mapping = @category_mappings[row['CategoryID']]
+
+      {
+        tag_id: mapping[:tag].id,
+        topic_id: topic_id_from_imported_id(row["DiscussionID"])
+      }
+    end
+  end
+
+  def import_posts
+    puts "", "Importing posts..."
+
+    posts = mysql_stream(
+      "SELECT CommentID, DiscussionID, Body, DateInserted, InsertUserID
+         FROM #{TABLE_PREFIX}Comment
+         WHERE CommentID > #{@last_imported_post_id}
+         ORDER BY CommentID ASC")
+
+    create_posts(posts) do |row|
+      next unless topic_id = topic_id_from_imported_id(row['DiscussionID'])
+      next if row['Body'].blank?
+
+      {
+        imported_id: row['CommentID'],
+        topic_id: topic_id,
+        user_id: user_id_from_imported_id(row["InsertUserID"]),
+        created_at: Time.zone.at(row['DateInserted']),
+        raw: clean_up(row["Body"])
+      }
+    end
+  end
+
+  def import_tags
+    puts "", "Importing tags..."
+
+    tag_mapping = {}
+
+    mysql_query("SELECT TagID, Name FROM #{TABLE_PREFIX}Tag").each do |row|
+      tag_name = DiscourseTagging.clean_tag(row['Name'])
+      tag = Tag.find_by_name(tag_name) || Tag.create(name: tag_name)
+      tag_mapping[row['TagID']] = tag.id
+    end
+
+    tags = mysql_query(
+      "SELECT TagID, DiscussionID
+         FROM #{TABLE_PREFIX}TagDiscussion
+        WHERE DiscussionID > #{@last_imported_topic_id}
+    ORDER BY DateInserted")
+
+    create_topic_tags(tags) do |row|
+      next unless topic_id = topic_id_from_imported_id(row['DiscussionID'])
+
+      {
+        topic_id: topic_id,
+        tag_id: tag_mapping[row['TagID']]
+      }
+    end
+  end
+
+  def import_private_topics
+    puts "", "Importing private topics..."
+
+    topics_sql = "SELECT c.ConversationID, c.Subject, m.MessageID, m.Body, c.DateInserted, c.InsertUserID
+      FROM #{TABLE_PREFIX}Conversation c, #{TABLE_PREFIX}ConversationMessage m
+      WHERE c.FirstMessageID = m.MessageID
+        AND c.ConversationID > #{@last_imported_private_topic_id - PRIVATE_OFFSET}
+      ORDER BY c.ConversationID ASC"
+
+    create_topics(mysql_stream(topics_sql)) do |row|
+      {
+        archetype: Archetype.private_message,
+        imported_id: row["ConversationID"] + PRIVATE_OFFSET,
+        title: row["Subject"] ? normalize_text(row["Subject"]) : "Conversation #{row["ConversationID"]}",
+        user_id: user_id_from_imported_id(row["InsertUserID"]),
+        created_at: Time.zone.at(row['DateInserted'])
+      }
+    end
+  end
+
+  def import_topic_allowed_users
+    puts "", "importing topic_allowed_users..."
+
+    topic_allowed_users_sql = "
+      SELECT ConversationID, UserID
+        FROM #{TABLE_PREFIX}UserConversation
+       WHERE Deleted = 0
+         AND ConversationID > #{@last_imported_private_topic_id - PRIVATE_OFFSET}
+    ORDER BY ConversationID ASC"
+
+    added = 0
+
+    create_topic_allowed_users(mysql_stream(topic_allowed_users_sql)) do |row|
+      next unless topic_id = topic_id_from_imported_id(row['ConversationID'] + PRIVATE_OFFSET)
+      next unless user_id = user_id_from_imported_id(row["UserID"])
+      added += 1
+      {
+        topic_id: topic_id,
+        user_id: user_id,
+      }
+    end
+
+    puts '', "Added #{added} topic_allowed_users records."
+  end
+
+  def import_private_posts
+    puts "", "importing private replies..."
+
+    private_posts_sql = "
+      SELECT ConversationID, MessageID, Body, InsertUserID, DateInserted
+        FROM GDN_ConversationMessage
+       WHERE ConversationID > #{@last_imported_private_topic_id - PRIVATE_OFFSET}
+       ORDER BY ConversationID ASC, MessageID ASC"
+
+    create_posts(mysql_stream(private_posts_sql)) do |row|
+      next unless topic_id = topic_id_from_imported_id(row['ConversationID'] + PRIVATE_OFFSET)
+
+      {
+        imported_id: row['MessageID'] + PRIVATE_OFFSET,
+        topic_id: topic_id,
+        user_id: user_id_from_imported_id(row['InsertUserID']),
+        created_at: Time.zone.at(row['DateInserted']),
+        raw: clean_up(row['Body'])
+      }
+    end
+  end
+
+  # TODO: too slow
+  def create_permalinks
+    puts '', 'Creating permalinks...', ''
+
+    puts '    User pages...'
+
+    start = Time.now
+    count = 0
+    now = Time.zone.now
+
+    sql = "COPY permalinks (url, created_at, updated_at, external_url) FROM STDIN"
+
+    @raw_connection.copy_data(sql, @encoder) do
+      User.includes(:_custom_fields).find_each do |u|
+        count += 1
+        ucf = u.custom_fields
+        if ucf && ucf["import_id"]
+          vanilla_username = ucf["import_username"] || u.username
+          @raw_connection.put_copy_data(
+            ["profile/#{vanilla_username}", now, now, "/users/#{u.username}"]
+          )
+        end
+
+        print "\r%7d - %6d/sec".freeze % [count, count.to_f / (Time.now - start)] if count % 5000 == 0
+      end
+    end
+
+    puts '', '', '    Topics and posts...'
+
+    start = Time.now
+    count = 0
+
+    sql = "COPY permalinks (url, topic_id, post_id, created_at, updated_at) FROM STDIN"
+
+    @raw_connection.copy_data(sql, @encoder) do
+      Post.includes(:_custom_fields).find_each do |post|
+        count += 1
+        pcf = post.custom_fields
+        if pcf && pcf["import_id"]
+          topic = post.topic
+          id = pcf["import_id"].split('-').last
+          if post.post_number == 1
+            slug = Slug.for(topic.title) # probably matches what vanilla would do...
+            @raw_connection.put_copy_data(
+              ["discussion/#{id}/#{slug}", topic.id, nil, now, now]
+            )
+          else
+            @raw_connection.put_copy_data(
+              ["discussion/comment/#{id}", nil, post.id, now, now]
+            )
+          end
+        end
+
+        print "\r%7d - %6d/sec".freeze % [count, count.to_f / (Time.now - start)] if count % 5000 == 0
+      end
+    end
+  end
+
+  def clean_up(raw)
+    # post id is sometimes prefixed with "c-"
+    raw.gsub!(/\[QUOTE="([^;]+);c-(\d+)"\]/i) { "[QUOTE=#{$1};#{$2}]" }
+
+    raw
+  end
+
+  def staff_guardian
+    @_staff_guardian ||= Guardian.new(Discourse.system_user)
+  end
+
+  def mysql_stream(sql)
+    @client.query(sql, stream: true)
+  end
+
+  def mysql_query(sql)
+    @client.query(sql)
+  end
+
+end
+
+BulkImport::Vanilla.new.start
diff --git a/script/bulk_import/vbulletin.rb b/script/bulk_import/vbulletin.rb
index d9d394a7168..830c330e939 100644
--- a/script/bulk_import/vbulletin.rb
+++ b/script/bulk_import/vbulletin.rb
@@ -6,44 +6,6 @@ require "htmlentities"
 class BulkImport::VBulletin < BulkImport::Base
 
   SUSPENDED_TILL ||= Date.new(3000, 1, 1)
-  CHARSET_MAP = {
-    "armscii8" => nil,
-    "ascii"    => Encoding::US_ASCII,
-    "big5"     => Encoding::Big5,
-    "binary"   => Encoding::ASCII_8BIT,
-    "cp1250"   => Encoding::Windows_1250,
-    "cp1251"   => Encoding::Windows_1251,
-    "cp1256"   => Encoding::Windows_1256,
-    "cp1257"   => Encoding::Windows_1257,
-    "cp850"    => Encoding::CP850,
-    "cp852"    => Encoding::CP852,
-    "cp866"    => Encoding::IBM866,
-    "cp932"    => Encoding::Windows_31J,
-    "dec8"     => nil,
-    "eucjpms"  => Encoding::EucJP_ms,
-    "euckr"    => Encoding::EUC_KR,
-    "gb2312"   => Encoding::EUC_CN,
-    "gbk"      => Encoding::GBK,
-    "geostd8"  => nil,
-    "greek"    => Encoding::ISO_8859_7,
-    "hebrew"   => Encoding::ISO_8859_8,
-    "hp8"      => nil,
-    "keybcs2"  => nil,
-    "koi8r"    => Encoding::KOI8_R,
-    "koi8u"    => Encoding::KOI8_U,
-    "latin1"   => Encoding::ISO_8859_1,
-    "latin2"   => Encoding::ISO_8859_2,
-    "latin5"   => Encoding::ISO_8859_9,
-    "latin7"   => Encoding::ISO_8859_13,
-    "macce"    => Encoding::MacCentEuro,
-    "macroman" => Encoding::MacRoman,
-    "sjis"     => Encoding::SHIFT_JIS,
-    "swe7"     => nil,
-    "tis620"   => Encoding::TIS_620,
-    "ucs2"     => Encoding::UTF_16BE,
-    "ujis"     => Encoding::EucJP_ms,
-    "utf8"     => Encoding::UTF_8,
-  }
 
   def initialize
     super
@@ -502,15 +464,6 @@ class BulkImport::VBulletin < BulkImport::Base
     normalize_text(title).scrub.gsub(/^Re\s*:\s*/i, "")
   end
 
-  def normalize_text(text)
-    @html_entities.decode(normalize_charset(text.presence || "").scrub)
-  end
-
-  def normalize_charset(text)
-    return text if @encoding == Encoding::UTF_8
-    return text && text.encode(@encoding).force_encoding(Encoding::UTF_8)
-  end
-
   def parse_birthday(birthday)
     return if birthday.blank?
     date_of_birth = Date.strptime(birthday.gsub(/[^\d-]+/, ""), "%m-%d-%Y") rescue nil
diff --git a/script/demon_test/child b/script/demon_test/child
new file mode 100755
index 00000000000..909d58f84b3
--- /dev/null
+++ b/script/demon_test/child
@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+
+$parent_pid = ARGV[0].to_i
+
+puts "Hello from #{Process.pid} my parent is #{$parent_pid}"
+
+Thread.new do
+
+  def alive?(pid)
+    Process.kill(0, pid)
+    true
+  rescue
+    false
+  end
+
+  while true
+    begin
+      unless alive?($parent_pid)
+        STDERR.puts "Parent was terminated!"
+        Process.kill "TERM", Process.pid
+        sleep 10
+        Process.kill "KILL", Process.pid
+      end
+    rescue => e
+      STDERR.puts "URGENT monitoring thread had an exception #{e}"
+    end
+    sleep 1
+  end
+end
+
+sleep
diff --git a/script/demon_test/parent.rb b/script/demon_test/parent.rb
new file mode 100644
index 00000000000..beb2658302f
--- /dev/null
+++ b/script/demon_test/parent.rb
@@ -0,0 +1,25 @@
+require File.expand_path("../../../config/environment", __FILE__)
+
+puts "Parent is now loaded"
+
+class ForkExecDemon < Demon::Base
+  def self.prefix
+    "fork-exec-child"
+  end
+
+  def run
+    if @pid = fork
+      write_pid_file
+      return
+    end
+
+    exec "./child #{parent_pid}"
+  end
+end
+
+ForkExecDemon.start(1, verbose: true)
+
+while true
+  ForkExecDemon.ensure_running
+  sleep 0.1
+end
diff --git a/script/docker_test.rb b/script/docker_test.rb
index 0d6a199238a..cb3a3bf5230 100644
--- a/script/docker_test.rb
+++ b/script/docker_test.rb
@@ -13,7 +13,7 @@ def run_or_fail(command)
 end
 
 unless ENV['NO_UPDATE']
-  run_or_fail("git remote update")
+  run_or_fail("git pull")
 
   checkout = ENV['COMMIT_HASH'] || "HEAD"
   run_or_fail("git checkout #{checkout}")
diff --git a/script/downsize_uploads.rb b/script/downsize_uploads.rb
new file mode 100644
index 00000000000..9812ca7abf9
--- /dev/null
+++ b/script/downsize_uploads.rb
@@ -0,0 +1,35 @@
+require File.expand_path("../../config/environment", __FILE__)
+
+# no less than 1 megapixel
+max_image_pixels = [ARGV[0].to_i, 1_000_000].max
+
+puts '', "Downsizing uploads size to no more than #{max_image_pixels} pixels"
+
+count = 0
+
+Upload.where("lower(extension) in (?)", ['jpg', 'jpeg', 'gif', 'png', 'bmp', 'tif', 'tiff']).find_each do |upload|
+  count += 1
+  print "\r%8d".freeze % count
+  absolute_path = Discourse.store.path_for(upload)
+  if absolute_path && FileHelper.is_image?(upload.original_filename)
+    file = File.new(absolute_path) rescue nil
+    next unless file
+
+    image_info = FastImage.new(file) rescue nil
+    pixels = image_info.size&.reduce(:*).to_i
+
+    if pixels > max_image_pixels
+      OptimizedImage.downsize(file.path, file.path, "#{max_image_pixels}@", filename: upload.original_filename)
+
+      upload.filesize = File.size(file)
+      upload.width, upload.height = ImageSizer.resize(*FastImage.new(file).size)
+      upload.save!
+
+      upload.posts.each do |post|
+        Jobs.enqueue(:process_post, post_id: post.id, bypass_bump: true, cook: true)
+      end
+    end
+  end
+end
+
+puts '', 'Done', ''
diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb
index 4d177156b40..fc50cc13cd6 100644
--- a/script/import_scripts/base.rb
+++ b/script/import_scripts/base.rb
@@ -31,6 +31,7 @@ class ImportScripts::Base
     @site_settings_during_import = {}
     @old_site_settings = {}
     @start_times = { import: Time.now }
+    @skip_updates = false
   end
 
   def preload_i18n
@@ -46,14 +47,17 @@ class ImportScripts::Base
 
     puts ""
 
-    update_bumped_at
-    update_last_posted_at
-    update_last_seen_at
-    update_user_stats
-    update_feature_topic_users
-    update_category_featured_topics
-    update_topic_count_replies
-    reset_topic_counters
+    unless @skip_updates
+      update_topic_status
+      update_bumped_at
+      update_last_posted_at
+      update_last_seen_at
+      update_user_stats
+      update_feature_topic_users
+      update_category_featured_topics
+      update_topic_count_replies
+      reset_topic_counters
+    end
 
     elapsed = Time.now - @start_times[:import]
     puts '', '', 'Done (%02dh %02dmin %02dsec)' % [elapsed / 3600, elapsed / 60 % 60, elapsed % 60]
@@ -68,8 +72,8 @@ class ImportScripts::Base
       min_topic_title_length: 1,
       min_post_length: 1,
       min_first_post_length: 1,
-      min_private_message_post_length: 1,
-      min_private_message_title_length: 1,
+      min_personal_message_post_length: 1,
+      min_personal_message_title_length: 1,
       allow_duplicate_topic_titles: true,
       disable_emails: true,
       max_attachment_size_kb: 102400,
@@ -86,6 +90,10 @@ class ImportScripts::Base
       SiteSetting.set(key, value)
     end
 
+    # Some changes that should not be rolled back after the script is done
+    SiteSetting.purge_unactivated_users_grace_period_days = 60
+    SiteSetting.purge_deleted_uploads_grace_period_days = 90
+
     RateLimiter.disable
   end
 
@@ -151,7 +159,7 @@ class ImportScripts::Base
     results.each do |result|
       g = yield(result)
 
-      if group_id_from_imported_group_id(g[:id])
+      if g.nil? || group_id_from_imported_group_id(g[:id])
         skipped += 1
       else
         new_group = create_group(g, g[:id])
@@ -166,7 +174,7 @@ class ImportScripts::Base
         end
       end
 
-      print_status created + skipped + failed + (opts[:offset] || 0), total
+      print_status(created + skipped + failed + (opts[:offset] || 0), total, get_start_time("groups"))
     end
 
     [created, skipped]
@@ -174,11 +182,13 @@ class ImportScripts::Base
 
   def create_group(opts, import_id)
     opts = opts.dup.tap { |o| o.delete(:id) }
-    import_name = opts[:name]
+
+    import_name = opts[:name].presence || opts[:full_name]
     opts[:name] = UserNameSuggester.suggest(import_name)
 
-    existing = Group.where(name: opts[:name]).first
-    return existing if existing && existing.custom_fields["import_id"].to_s == (import_id.to_s)
+    existing = Group.find_by(name: opts[:name])
+    return existing if existing && existing.custom_fields["import_id"].to_s == import_id.to_s
+
     g = existing || Group.new(opts)
     g.custom_fields["import_id"] = import_id
     g.custom_fields["import_name"] = import_name
@@ -200,6 +210,7 @@ class ImportScripts::Base
     existing = existing.where(name: 'import_id')
       .joins('JOIN import_ids ON val = value')
       .count
+
     if existing == import_ids.length
       puts "Skipping #{import_ids.length} already imported #{type}"
       return true
@@ -258,7 +269,7 @@ class ImportScripts::Base
         end
       end
 
-      print_status created + skipped + failed + (opts[:offset] || 0), total
+      print_status(created + skipped + failed + (opts[:offset] || 0), total, get_start_time("users"))
     end
 
     [created, skipped]
@@ -417,7 +428,7 @@ class ImportScripts::Base
         created += 1
       end
 
-      print_status created + skipped, total
+      print_status(created + skipped, total, get_start_time("categories"))
     end
 
     [created, skipped]
@@ -433,9 +444,8 @@ class ImportScripts::Base
       name: opts[:name],
       user_id: opts[:user_id] || opts[:user].try(:id) || Discourse::SYSTEM_USER_ID,
       position: opts[:position],
-      description: opts[:description],
       parent_category_id: opts[:parent_category_id],
-      color: opts[:color] || "AB9364",
+      color: opts[:color] || category_color,
       text_color: opts[:text_color] || "FFF",
       read_restricted: opts[:read_restricted] || false,
     )
@@ -443,6 +453,12 @@ class ImportScripts::Base
     new_category.custom_fields["import_id"] = import_id if import_id
     new_category.save!
 
+    if opts[:description].present?
+      changes = { raw: opts[:description] }
+      opts = { skip_revision: true, skip_validations: true, bypass_bump: true }
+      new_category.topic.first_post.revise(Discourse.system_user, changes, opts)
+    end
+
     add_category(import_id, new_category)
 
     post_create_action.try(:call, new_category)
@@ -450,6 +466,15 @@ class ImportScripts::Base
     new_category
   end
 
+  def category_color
+    @category_colors ||= SiteSetting.category_colors.split('|')
+
+    index = @next_category_color_index.presence || 0
+    @next_category_color_index = index + 1 >= @category_colors.count ? 0 : index + 1
+
+    @category_colors[index]
+  end
+
   def created_post(post)
     # override if needed
   end
@@ -519,6 +544,13 @@ class ImportScripts::Base
     opts[:custom_fields] ||= {}
     opts[:custom_fields]['import_id'] = import_id
 
+    unless opts[:topic_id]
+      opts[:meta_data] = meta_data = {}
+      meta_data["import_closed"] = true if opts[:closed]
+      meta_data["import_archived"] = true if opts[:archived]
+      meta_data["import_topic_id"] = opts[:import_topic_id] if opts[:import_topic_id]
+    end
+
     opts[:guardian] = STAFF_GUARDIAN
     if @bbcode_to_md
       opts[:raw] = opts[:raw].bbcode_to_md(false) rescue opts[:raw]
@@ -570,7 +602,7 @@ class ImportScripts::Base
         end
       end
 
-      print_status created + skipped + (opts[:offset] || 0), total
+      print_status(created + skipped + (opts[:offset] || 0), total, get_start_time("bookmarks"))
     end
 
     [created, skipped]
@@ -587,17 +619,46 @@ class ImportScripts::Base
     query.find_each do |topic|
       topic.update_status('closed', true, Discourse.system_user)
       closed_count += 1
-      print_status(closed_count, total_count)
+      print_status(closed_count, total_count, get_start_time("close_inactive_topics"))
     end
   end
 
+  def update_topic_status
+    puts "", "Updating topic status"
+
+    Topic.exec_sql(<<~SQL)
+      UPDATE topics AS t
+      SET closed = TRUE
+      WHERE EXISTS(
+          SELECT 1
+          FROM topic_custom_fields AS f
+          WHERE f.topic_id = t.id AND f.name = 'import_closed' AND f.value = 't'
+      )
+    SQL
+
+    Topic.exec_sql(<<~SQL)
+      UPDATE topics AS t
+      SET archived = TRUE
+      WHERE EXISTS(
+          SELECT 1
+          FROM topic_custom_fields AS f
+          WHERE f.topic_id = t.id AND f.name = 'import_archived' AND f.value = 't'
+      )
+    SQL
+
+    TopicCustomField.exec_sql(<<~SQL)
+      DELETE FROM topic_custom_fields
+      WHERE name IN ('import_closed', 'import_archived')
+    SQL
+  end
+
   def update_bumped_at
-    puts "", "updating bumped_at on topics"
+    puts "", "Updating bumped_at on topics"
     Post.exec_sql("update topics t set bumped_at = COALESCE((select max(created_at) from posts where topic_id = t.id and post_type = #{Post.types[:regular]}), bumped_at)")
   end
 
   def update_last_posted_at
-    puts "", "updating last posted at on users"
+    puts "", "Updating last posted at on users"
 
     sql = <<-SQL
       WITH lpa AS (
@@ -619,20 +680,18 @@ class ImportScripts::Base
   def update_user_stats
     puts "", "Updating topic reply counts..."
 
-    start_time = Time.now
-    progress_count = 0
-    total_count = User.real.count
+    count = 0
+    total = User.real.count
 
-    User.find_each do |u|
+    User.real.find_each do |u|
       u.create_user_stat if u.user_stat.nil?
       us = u.user_stat
       us.update_topic_reply_count
       us.save
-      progress_count += 1
-      print_status(progress_count, total_count, start_time)
+      print_status(count += 1, total, get_start_time("user_stats"))
     end
 
-    puts "." "Updating first_post_created_at..."
+    puts "", "Updating first_post_created_at..."
 
     sql = <<-SQL
       WITH sub AS (
@@ -650,7 +709,7 @@ class ImportScripts::Base
 
     User.exec_sql(sql)
 
-    puts "Updating user post_count..."
+    puts "", "Updating user post_count..."
 
     sql = <<-SQL
       WITH sub AS (
@@ -668,7 +727,7 @@ class ImportScripts::Base
 
     User.exec_sql(sql)
 
-    puts "Updating user topic_count..."
+    puts "", "Updating user topic_count..."
 
     sql = <<-SQL
       WITH sub AS (
@@ -689,96 +748,88 @@ class ImportScripts::Base
 
   # scripts that are able to import last_seen_at from the source data should override this method
   def update_last_seen_at
-    puts "", "updating last seen at on users"
+    puts "", "Updating last seen at on users"
 
     User.exec_sql("UPDATE users SET last_seen_at = created_at WHERE last_seen_at IS NULL")
     User.exec_sql("UPDATE users SET last_seen_at = last_posted_at WHERE last_posted_at IS NOT NULL")
   end
 
   def update_feature_topic_users
-    puts "", "updating featured topic users"
+    puts "", "Updating featured topic users"
 
-    total_count = Topic.count
-    progress_count = 0
+    count = 0
+    total = Topic.count
 
     Topic.find_each do |topic|
       topic.feature_topic_users
-      progress_count += 1
-      print_status(progress_count, total_count)
+      print_status(count += 1, total, get_start_time("feature_topic_user"))
     end
   end
 
   def reset_topic_counters
-    puts "", "resetting topic counters"
+    puts "", "Resetting topic counters"
 
-    total_count = Topic.count
-    progress_count = 0
+    count = 0
+    total = Topic.count
 
     Topic.find_each do |topic|
       Topic.reset_highest(topic.id)
-      progress_count += 1
-      print_status(progress_count, total_count)
+      print_status(count += 1, total, get_start_time("topic_counters"))
     end
   end
 
   def update_category_featured_topics
-    puts "", "updating featured topics in categories"
+    puts "", "Updating featured topics in categories"
 
-    total_count = Category.count
-    progress_count = 0
+    count = 0
+    total = Category.count
 
     Category.find_each do |category|
       CategoryFeaturedTopic.feature_topics_for(category)
-      progress_count += 1
-      print_status(progress_count, total_count)
+      print_status(count += 1, total, get_start_time("category_featured_topics"))
     end
   end
 
   def update_topic_count_replies
-    puts "", "updating user topic reply counts"
+    puts "", "Updating user topic reply counts"
 
-    total_count = User.real.count
-    progress_count = 0
+    count = 0
+    total = User.real.count
 
     User.real.find_each do |u|
       u.user_stat.update_topic_reply_count
       u.user_stat.save!
-      progress_count += 1
-      print_status(progress_count, total_count)
+      print_status(count += 1, total, get_start_time("topic_count_replies"))
     end
   end
 
   def update_tl0
-    puts "", "setting users with no posts to trust level 0"
+    puts "", "Setting users with no posts to trust level 0"
 
-    total_count = User.count
-    progress_count = 0
+    count = 0
+    total = User.count
 
     User.includes(:user_stat).find_each do |user|
       begin
         user.update_columns(trust_level: 0) if user.trust_level > 0 && user.post_count == 0
       rescue Discourse::InvalidAccess
-        nil
       end
-      progress_count += 1
-      print_status(progress_count, total_count)
+      print_status(count += 1, total, get_start_time("update_tl0"))
     end
   end
 
   def update_user_signup_date_based_on_first_post
-    puts "", "setting users' signup date based on the date of their first post"
+    puts "", "Setting users' signup date based on the date of their first post"
 
-    total_count = User.count
-    progress_count = 0
+    count = 0
+    total = User.count
 
     User.find_each do |user|
-      first = user.posts.order('created_at ASC').first
-      if first
+      if first = user.posts.order('created_at ASC').first
         user.created_at = first.created_at
         user.save!
       end
-      progress_count += 1
-      print_status(progress_count, total_count)
+      print_status(count += 1, total, get_start_time("user_signup"))
     end
   end
 
diff --git a/script/import_scripts/base/generic_database.rb b/script/import_scripts/base/generic_database.rb
new file mode 100644
index 00000000000..5b7df59cf4b
--- /dev/null
+++ b/script/import_scripts/base/generic_database.rb
@@ -0,0 +1,220 @@
+require 'sqlite3'
+
+module ImportScripts
+  class GenericDatabase
+    def initialize(directory, batch_size:, recreate: false)
+      filename = "#{directory}/index.db"
+      File.delete(filename) if recreate && File.exists?(filename)
+
+      @db = SQLite3::Database.new(filename, results_as_hash: true)
+      @batch_size = batch_size
+
+      configure_database
+      create_category_table
+      create_user_table
+      create_topic_table
+      create_post_table
+    end
+
+    def insert_category(category)
+      @db.execute(<<-SQL, prepare(category))
+        INSERT OR REPLACE INTO category (id, name, description, position, url)
+        VALUES (:id, :name, :description, :position, :url)
+      SQL
+    end
+
+    def insert_user(user)
+      @db.execute(<<-SQL, prepare(user))
+        INSERT OR REPLACE INTO user (id, email, username, name, created_at, last_seen_at, active)
+        VALUES (:id, :email, :username, :name, :created_at, :last_seen_at, :active)
+      SQL
+    end
+
+    def insert_topic(topic)
+      @db.execute(<<-SQL, prepare(topic))
+        INSERT OR REPLACE INTO topic (id, title, raw, category_id, closed, user_id, created_at, url)
+        VALUES (:id, :title, :raw, :category_id, :closed, :user_id, :created_at, :url)
+      SQL
+    end
+
+    def insert_post(post)
+      @db.execute(<<-SQL, prepare(post))
+        INSERT OR REPLACE INTO post (id, raw, topic_id, user_id, created_at, reply_to_post_id, url)
+        VALUES (:id, :raw, :topic_id, :user_id, :created_at, :reply_to_post_id, :url)
+      SQL
+    end
+
+    def sort_posts_by_created_at
+      @db.execute 'DELETE FROM post_order'
+
+      @db.execute <<-SQL
+        INSERT INTO post_order (id)
+        SELECT id
+        FROM post
+        ORDER BY created_at, topic_id, id
+      SQL
+    end
+
+    def fetch_categories
+      @db.execute(<<-SQL)
+        SELECT *
+        FROM category
+        ORDER BY position, name
+      SQL
+    end
+
+    def count_users
+      @db.get_first_value(<<-SQL)
+        SELECT COUNT(*)
+        FROM user
+      SQL
+    end
+
+    def fetch_users(last_id)
+      rows = @db.execute(<<-SQL, last_id)
+        SELECT *
+        FROM user
+        WHERE id > :last_id
+        ORDER BY id
+        LIMIT #{@batch_size}
+      SQL
+
+      add_last_column_value(rows, 'id')
+    end
+
+    def count_topics
+      @db.get_first_value(<<-SQL)
+        SELECT COUNT(*)
+        FROM topic
+      SQL
+    end
+
+    def fetch_topics(last_id)
+      rows = @db.execute(<<-SQL, last_id)
+        SELECT *
+        FROM topic
+        WHERE id > :last_id
+        ORDER BY id
+        LIMIT #{@batch_size}
+      SQL
+
+      add_last_column_value(rows, 'id')
+    end
+
+    def count_posts
+      @db.get_first_value(<<-SQL)
+        SELECT COUNT(*)
+        FROM post
+      SQL
+    end
+
+    def fetch_posts(last_row_id)
+      rows = @db.execute(<<-SQL, last_row_id)
+        SELECT o.ROWID, p.*
+        FROM post p
+          JOIN post_order o USING (id)
+        WHERE o.ROWID > :last_row_id
+        ORDER BY o.ROWID
+        LIMIT #{@batch_size}
+      SQL
+
+      add_last_column_value(rows, 'rowid')
+    end
+
+    def execute_sql(sql)
+      @db.execute(sql)
+    end
+
+    private
+
+    def configure_database
+      @db.execute 'PRAGMA journal_mode = OFF'
+      @db.execute 'PRAGMA locking_mode = EXCLUSIVE'
+    end
+
+    def create_category_table
+      @db.execute <<-SQL
+        CREATE TABLE IF NOT EXISTS category (
+          id TEXT NOT NULL PRIMARY KEY,
+          name TEXT NOT NULL,
+          description TEXT,
+          position INTEGER,
+          url TEXT
+        )
+      SQL
+    end
+
+    def create_user_table
+      @db.execute <<-SQL
+        CREATE TABLE IF NOT EXISTS user (
+          id TEXT NOT NULL PRIMARY KEY,
+          email TEXT,
+          username TEXT,
+          name TEXT,
+          created_at DATETIME,
+          last_seen_at DATETIME,
+          active BOOLEAN NOT NULL DEFAULT true
+        )
+      SQL
+    end
+
+    def create_topic_table
+      @db.execute <<-SQL
+        CREATE TABLE IF NOT EXISTS topic (
+          id TEXT NOT NULL PRIMARY KEY,
+          title TEXT,
+          raw TEXT,
+          category_id TEXT NOT NULL,
+          closed BOOLEAN NOT NULL DEFAULT false,
+          user_id TEXT NOT NULL,
+          created_at DATETIME,
+          url TEXT
+        )
+      SQL
+
+      @db.execute 'CREATE INDEX IF NOT EXISTS topic_by_user_id ON topic (user_id)'
+    end
+
+    def create_post_table
+      @db.execute <<-SQL
+        CREATE TABLE IF NOT EXISTS post (
+          id TEXT NOT NULL PRIMARY KEY,
+          raw TEXT,
+          topic_id TEXT NOT NULL,
+          user_id TEXT NOT NULL,
+          created_at DATETIME,
+          reply_to_post_id TEXT,
+          url TEXT
+        )
+      SQL
+
+      @db.execute 'CREATE INDEX IF NOT EXISTS post_by_user_id ON post (user_id)'
+
+      @db.execute <<-SQL
+        CREATE TABLE IF NOT EXISTS post_order (
+          id TEXT NOT NULL PRIMARY KEY
+        )
+      SQL
+    end
+
+    def prepare(hash)
+      hash.each do |key, value|
+        if value.is_a?(TrueClass) || value.is_a?(FalseClass)
+          hash[key] = value ? 1 : 0
+        elsif value.is_a?(Date)
+          hash[key] = value.to_s
+        end
+      end
+    end
+
+    def add_last_column_value(rows, *last_columns)
+      return rows if last_columns.empty?
+
+      result = [rows]
+      last_row = rows.last
+
+      last_columns.each { |column| result.push(last_row ? last_row[column] : nil) }
+      result
+    end
+  end
+end
diff --git a/script/import_scripts/base/lookup_container.rb b/script/import_scripts/base/lookup_container.rb
index 86513775a28..8922b0e2358 100644
--- a/script/import_scripts/base/lookup_container.rb
+++ b/script/import_scripts/base/lookup_container.rb
@@ -1,31 +1,31 @@
 module ImportScripts
   class LookupContainer
     def initialize
-      puts 'loading existing groups...'
+      puts 'Loading existing groups...'
       @groups = {}
       GroupCustomField.where(name: 'import_id').pluck(:group_id, :value).each do |group_id, import_id|
         @groups[import_id] = group_id
       end
 
-      puts 'loading existing users...'
+      puts 'Loading existing users...'
       @users = {}
       UserCustomField.where(name: 'import_id').pluck(:user_id, :value).each do |user_id, import_id|
         @users[import_id] = user_id
       end
 
-      puts 'loading existing categories...'
+      puts 'Loading existing categories...'
       @categories = {}
       CategoryCustomField.where(name: 'import_id').pluck(:category_id, :value).each do |category_id, import_id|
         @categories[import_id] = category_id
       end
 
-      puts 'loading existing posts...'
+      puts 'Loading existing posts...'
       @posts = {}
       PostCustomField.where(name: 'import_id').pluck(:post_id, :value).each do |post_id, import_id|
         @posts[import_id] = post_id
       end
 
-      puts 'loading existing topics...'
+      puts 'Loading existing topics...'
       @topics = {}
       Post.joins(:topic).pluck('posts.id, posts.topic_id, posts.post_number, topics.slug').each do |p|
         @topics[p[0]] = {
diff --git a/script/import_scripts/bbpress.rb b/script/import_scripts/bbpress.rb
index 9059270f6f4..1538de4af8f 100644
--- a/script/import_scripts/bbpress.rb
+++ b/script/import_scripts/bbpress.rb
@@ -1,23 +1,15 @@
 require 'mysql2'
 require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 
-# Before running this script, paste these lines into your shell,
-# then use arrow keys to edit the values
-=begin
-export BBPRESS_HOST="localhost"
-export BBPRESS_USER="root"
-export BBPRESS_DB="bbpress"
-export BBPRESS_PW=""
-=end
-
 class ImportScripts::Bbpress < ImportScripts::Base
 
-  BB_PRESS_HOST ||= ENV['BBPRESS_HOST'] || "localhost"
-  BB_PRESS_DB ||= ENV['BBPRESS_DB'] || "bbpress"
-  BATCH_SIZE  ||= 1000
-  BB_PRESS_PW ||= ENV['BBPRESS_PW'] || ""
-  BB_PRESS_USER ||= ENV['BBPRESS_USER'] || "root"
-  BB_PRESS_PREFIX ||= ENV['BBPRESS_PREFIX'] || "wp_"
+  BB_PRESS_HOST            ||= ENV['BBPRESS_HOST'] || "localhost"
+  BB_PRESS_DB              ||= ENV['BBPRESS_DB'] || "bbpress"
+  BATCH_SIZE               ||= 1000
+  BB_PRESS_PW              ||= ENV['BBPRESS_PW'] || ""
+  BB_PRESS_USER            ||= ENV['BBPRESS_USER'] || "root"
+  BB_PRESS_PREFIX          ||= ENV['BBPRESS_PREFIX'] || "wp_"
+  BB_PRESS_ATTACHMENTS_DIR ||= ENV['BBPRESS_ATTACHMENTS_DIR'] || "/path/to/attachments"
 
   def initialize
     super
@@ -38,6 +30,7 @@ class ImportScripts::Bbpress < ImportScripts::Base
     import_categories
     import_topics_and_posts
     import_private_messages
+    import_attachments
     create_permalinks
   end
 
@@ -246,10 +239,15 @@ class ImportScripts::Bbpress < ImportScripts::Base
       create_posts(posts, total: total_posts, offset: offset) do |p|
         skip = false
 
+        user_id = user_id_from_imported_user_id(p["post_author"]) ||
+                  find_user_by_import_id(p["post_author"]).try(:id) ||
+                  user_id_from_imported_user_id(anon_names[p['id']]) ||
+                  find_user_by_import_id(anon_names[p['id']]).try(:id) ||
+                  -1
+
         post = {
           id: p["id"],
-          user_id: user_id_from_imported_user_id(p["post_author"]) || find_user_by_import_id(p["post_author"]).try(:id) ||
-              user_id_from_imported_user_id(anon_names[p['id']]) || find_user_by_import_id(anon_names[p['id']]).try(:id) || -1,
+          user_id: user_id,
           raw: p["post_content"],
           created_at: p["post_date"],
           like_count: posts_likes[p["id"]],
@@ -277,17 +275,118 @@ class ImportScripts::Bbpress < ImportScripts::Base
     end
   end
 
+  def import_attachments
+    import_attachments_from_postmeta
+    import_attachments_from_bb_attachments
+  end
+
+  def import_attachments_from_postmeta
+    puts "", "Importing attachments from 'postmeta'..."
+
+    count = 0
+    last_attachment_id = -1
+
+    total_attachments = bbpress_query(<<-SQL
+      SELECT COUNT(*) count
+        FROM #{BB_PRESS_PREFIX}postmeta pm
+        JOIN #{BB_PRESS_PREFIX}posts p ON p.id = pm.post_id
+       WHERE pm.meta_key = '_wp_attached_file'
+         AND p.post_parent > 0
+    SQL
+    ).first["count"]
+
+    batches(BATCH_SIZE) do |offset|
+      attachments = bbpress_query(<<-SQL
+        SELECT pm.meta_id id, pm.meta_value, p.post_parent post_id
+          FROM #{BB_PRESS_PREFIX}postmeta pm
+          JOIN #{BB_PRESS_PREFIX}posts p ON p.id = pm.post_id
+         WHERE pm.meta_key = '_wp_attached_file'
+           AND p.post_parent > 0
+           AND pm.meta_id > #{last_attachment_id}
+      ORDER BY pm.meta_id
+         LIMIT #{BATCH_SIZE}
+      SQL
+      ).to_a
+
+      break if attachments.empty?
+      last_attachment_id = attachments[-1]["id"].to_i
+
+      attachments.each do |a|
+        print_status(count += 1, total_attachments, get_start_time("attachments_from_postmeta"))
+        path = File.join(BB_PRESS_ATTACHMENTS_DIR, a["meta_value"])
+        if File.exists?(path)
+          if post = Post.find_by(id: post_id_from_imported_post_id(a["post_id"]))
+            filename = File.basename(a["meta_value"])
+            upload = create_upload(post.user.id, path, filename)
+            if upload&.persisted?
+              html = html_for_upload(upload, filename)
+              if !post.raw[html]
+                post.raw << "\n\n" << html
+                post.save!
+                PostUpload.create!(post: post, upload: upload) unless PostUpload.where(post: post, upload: upload).exists?
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+
+  def import_attachments_from_bb_attachments
+    puts "", "Importing attachments from 'bb_attachments'..."
+
+    count = 0
+    last_attachment_id = -1
+
+    total_attachments = bbpress_query(<<-SQL
+      SELECT COUNT(*) count
+        FROM #{BB_PRESS_PREFIX}bb_attachments
+       WHERE post_id IN (SELECT id FROM #{BB_PRESS_PREFIX}posts WHERE post_status <> 'spam' AND post_type IN ('topic', 'reply'))
+    SQL
+    ).first["count"]
+
+    batches(BATCH_SIZE) do |offset|
+      attachments = bbpress_query(<<-SQL
+        SELECT id, filename, post_id
+          FROM #{BB_PRESS_PREFIX}bb_attachments
+         WHERE post_id IN (SELECT id FROM #{BB_PRESS_PREFIX}posts WHERE post_status <> 'spam' AND post_type IN ('topic', 'reply'))
+           AND id > #{last_attachment_id}
+      ORDER BY id
+         LIMIT #{BATCH_SIZE}
+      SQL
+      ).to_a
+
+      break if attachments.empty?
+      last_attachment_id = attachments[-1]["id"].to_i
+
+      attachments.each do |a|
+        print_status(count += 1, total_attachments, get_start_time("attachments_from_bb_attachments"))
+        if path = find_attachment(a["filename"], a["id"])
+          if post = Post.find_by(id: post_id_from_imported_post_id(a["post_id"]))
+            upload = create_upload(post.user.id, path, a["filename"])
+            if upload&.persisted?
+              html = html_for_upload(upload, a["filename"])
+              if !post.raw[html]
+                post.raw << "\n\n" << html
+                post.save!
+                PostUpload.create!(post: post, upload: upload) unless PostUpload.where(post: post, upload: upload).exists?
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+
+  def find_attachment(filename, id)
+    @attachments ||= Dir[File.join(BB_PRESS_ATTACHMENTS_DIR, "vf-attachs", "**", "*.*")]
+    @attachments.find { |p| p.end_with?("/#{id}.#{filename}") }
+  end
+
   def create_permalinks
     puts "", "creating permalinks..."
 
     last_topic_id = -1
-    total_topics = bbpress_query(<<-SQL
-      SELECT COUNT(*) count
-        FROM #{BB_PRESS_PREFIX}posts
-       WHERE post_status <> 'spam'
-         AND post_type IN ('topic')
-    SQL
-    ).first["count"]
 
     batches(BATCH_SIZE) do |offset|
       topics = bbpress_query(<<-SQL
@@ -301,13 +400,14 @@ class ImportScripts::Bbpress < ImportScripts::Base
          LIMIT #{BATCH_SIZE}
       SQL
       ).to_a
+
       break if topics.empty?
+      last_topic_id = topics[-1]["id"].to_i
 
       topics.each do |t|
         topic = topic_lookup_from_imported_post_id(t['id'])
         Permalink.create(url: URI.parse(t['guid']).path.chomp('/'), topic_id: topic[:topic_id]) rescue nil
       end
-      last_topic_id = topics[-1]["id"].to_i
     end
   end
 
diff --git a/script/import_scripts/discuz_x.rb b/script/import_scripts/discuz_x.rb
index 8ee30b359cd..8f99ae49113 100644
--- a/script/import_scripts/discuz_x.rb
+++ b/script/import_scripts/discuz_x.rb
@@ -273,7 +273,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
         description: row['description'],
         position: row['position'].to_i + max_position,
         color: color,
-        suppress_from_homepage: (row['status'] == (0) || row['status'] == (3)),
+        suppress_from_latest: (row['status'] == (0) || row['status'] == (3)),
         post_create_action: lambda do |category|
           if slug = @category_slug[row['id']]
             category.update(slug: slug)
diff --git a/script/import_scripts/drupal-6.rb b/script/import_scripts/drupal-6.rb
index 018a1fba904..9b7b1f26288 100644
--- a/script/import_scripts/drupal-6.rb
+++ b/script/import_scripts/drupal-6.rb
@@ -115,8 +115,8 @@ class ImportScripts::Drupal < ImportScripts::Base
         FROM node n
         LEFT JOIN forum f ON f.vid=n.vid
         LEFT JOIN node_revisions nr ON nr.vid=n.vid
-        WHERE node.type = 'forum'
-          AND node.status = 1
+        WHERE n.type = 'forum'
+          AND n.status = 1
 	LIMIT #{batch_size}
           OFFSET #{offset};
       ", cache_rows: false)
@@ -152,9 +152,9 @@ class ImportScripts::Drupal < ImportScripts::Base
       SELECT COUNT(*) count
       FROM comments c
       LEFT JOIN node n ON n.nid=c.nid
-      WHERE node.type IN #{node_types}
-      AND node.status = 1
-      AND comments.status=0;
+      WHERE n.type IN #{node_types}
+      AND n.status = 1
+      AND c.status=0;
     ").first['count']
 
     batch_size = 1000
diff --git a/script/import_scripts/getsatisfaction.rb b/script/import_scripts/getsatisfaction.rb
index ffa0b0388e8..0111b5c8b59 100644
--- a/script/import_scripts/getsatisfaction.rb
+++ b/script/import_scripts/getsatisfaction.rb
@@ -1,22 +1,45 @@
 # getsatisfaction importer
 #
-# pre-req: you will get a bunch of CSV files, be sure to rename them all so
+# pre-req: You will either get an Excel or a bunch of CSV files. Be sure to rename them all so that
 #
-# - users.csv is the users table export (it may come from getsatisfaction as Users-Table 1.csv
+# - users.csv is the users table export
 # - replies.csv is the reply table export
 # - topics.csv is the topics table export
+# - categories.csv is the categories table export
+# - topics_categories.csv is the mapping between the topics and categories table
 #
+# Make sure that the CSV files use UTF-8 encoding, have consistent line endings and use comma as column separator.
+# That's usually the case when you export Excel sheets as CSV.
+# When you get MalformedCSVError during the import, try converting the line endings of the CSV into the Unix format.
+# Mixed line endings in CSV files can create weird errors!
 #
-# note, the importer will import all topics into a new category called 'Old Forum' and optionally close all the topics
+# You need to call fix_quotes_in_csv() for CSV files that use \" to escape quotes within quoted fields.
+# The import script expects quotes to be escaped with "".
 #
+# It's likely that some posts in replies.csv aren't in the correct order. Currently the import script doesn't handle
+# that correctly and will import the replies in the wrong order.
+# You should run `rake posts:reorder_posts` after the import.
+
 require 'csv'
+require 'set'
 require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 require 'reverse_markdown' # gem 'reverse_markdown'
 
 # Call it like this:
-#   RAILS_ENV=production bundle exec ruby script/import_scripts/getsatisfaction.rb
+#   RAILS_ENV=production bundle exec ruby script/import_scripts/getsatisfaction.rb DIRNAME
 class ImportScripts::GetSatisfaction < ImportScripts::Base
 
+  IMPORT_ARCHIVED_TOPICS = false
+
+  # The script classifies each topic as private when at least one associated category
+  # in "topics_categories.csv" is unknown (not included i "categories.csv").
+  IMPORT_PRIVATE_TOPICS = false
+
+  # Should the creation of permalinks be skipped? Make sure you configure OLD_DOMAIN if you
+  CREATE_PERMALINKS = true
+
+  # Replace "http://community.example.com/" with the URL of your community for permalinks
+  OLD_DOMAIN = "http://community.example.com/"
   BATCH_SIZE = 1000
 
   def initialize(path)
@@ -24,116 +47,78 @@ class ImportScripts::GetSatisfaction < ImportScripts::Base
     super()
     @bbcode_to_md = true
     @topic_slug = {}
-
-    puts "loading post mappings..."
-    @post_number_map = {}
-    Post.pluck(:id, :post_number).each do |post_id, post_number|
-      @post_number_map[post_id] = post_number
-    end
-  end
-
-  def created_post(post)
-    @post_number_map[post.id] = post.post_number
-    super
+    @topic_categories = {}
+    @skipped_topics = Set.new
   end
 
   def execute
-    c = Category.find_by(name: 'Old Forum') ||
-      Category.create!(name: 'Old Forum', user: Discourse.system_user)
+    # TODO Remove the call to fix_quotes_in_csv() if your replies.csv uses the double quotes ("").
+    # That's usually the case when you exported the file from Excel.
+    fix_quotes_in_csv("replies")
 
     import_users
-    import_posts(c)
+    import_categories
+    import_topics
+    import_posts
 
-    create_permalinks
-
-    # uncomment if you want to close all the topics
-    # Topic.where(category: c).update_all(closed: true)
+    create_permalinks if CREATE_PERMALINKS
   end
 
-  class RowResolver
-    def load(row)
-      @row = row
+  def csv_filename(table_name, use_fixed: true)
+    if use_fixed
+      filename = File.join(@path, "#{table_name}_fixed.csv")
+      return filename if File.exists?(filename)
     end
 
-    def self.create(cols)
-      Class.new(RowResolver).new(cols)
-    end
+    File.join(@path, "#{table_name}.csv")
+  end
 
-    def initialize(cols)
-      cols.each_with_index do |col, idx|
-        self.class.send(:define_method, col) do
-          @row[idx]
+  def fix_quotes_in_csv(*table_names)
+    puts "", "fixing CSV files"
+
+    table_names.each do |table_name|
+      source_filename = csv_filename(table_name, use_fixed: false)
+      target_filename = csv_filename("#{table_name}_fixed", use_fixed: false)
+
+      previous_line = nil
+
+      File.open(target_filename, "w") do |file|
+        File.open(source_filename).each_line do |line|
+          line.gsub!(/(?<![^\\]\\)\\"/, '""')
+          line.gsub!(/\\\\/, '\\')
+
+          if previous_line
+            previous_line << "\n" unless line.starts_with?(",")
+            line = "#{previous_line}#{line}"
+            previous_line = nil
+          end
+
+          if line.gsub!(/,\+1\\\R$/m, ',"+1"').present?
+            previous_line = line
+          else
+            file.puts(line)
+          end
         end
+
+        file.puts(previous_line) if previous_line
       end
     end
   end
 
-  def load_user_batch!(users, offset, total)
-    if users.length > 0
-      create_users(users, offset: offset, total: total) do |user|
-        user
-      end
-      users.clear
-    end
+  def csv_parse(table_name)
+    CSV.foreach(csv_filename(table_name),
+                headers: true,
+                header_converters: :symbol,
+                skip_blanks: true,
+                encoding: 'bom|utf-8') { |row| yield row }
   end
 
-  def csv_parse(name)
-    filename = "#{@path}/#{name}.csv"
-    first = true
-    row = nil
-
-    current_row = "";
-    double_quote_count = 0
-
-    # In case of Excel export file, I converted it to CSV and used:
-    # CSV.open(filename, encoding:'iso-8859-1:utf-8').each do |raw|
-    File.open(filename).each_line do |line|
-
-      line.strip!
-
-      current_row << "\n" unless current_row.empty?
-      current_row << line
-
-      raw = begin
-              CSV.parse(current_row, col_sep: ";")
-            rescue CSV::MalformedCSVError => e
-              puts e.message
-              puts "*" * 100
-              puts "Bad row skipped, line is: #{line}"
-              puts
-              puts current_row
-              puts
-              puts "double quote count is : #{double_quote_count}"
-              puts "*" * 100
-
-              current_row = ""
-              double_quote_count = 0
-
-              next
-            end[0]
-
-      if first
-        row = RowResolver.create(raw)
-
-        current_row = ""
-        double_quote_count = 0
-        first = false
-        next
-      end
-
-      row.load(raw)
-
-      yield row
-
-      current_row = ""
-      double_quote_count = 0
-    end
-  end
-
-  def total_rows(table)
-    # In case of Excel export file, I converted it to CSV and used:
-    # CSV.foreach("#{@path}/#{table}.csv", encoding:'iso-8859-1:utf-8').inject(0) {|c, line| c+1} - 1
-    File.foreach("#{@path}/#{table}.csv").inject(0) { |c, line| c + 1 } - 1
+  def total_rows(table_name)
+    CSV.foreach(csv_filename(table_name),
+                headers: true,
+                skip_blanks: true,
+                encoding: 'bom|utf-8')
+      .inject(0) { |c, _| c + 1 }
   end
 
   def import_users
@@ -145,52 +130,44 @@ class ImportScripts::GetSatisfaction < ImportScripts::Base
     total = total_rows("users")
 
     csv_parse("users") do |row|
-
-      if row.suspended_at
-        puts "skipping suspended user"
-        p row
-        next
-      end
-
-      id = row.user_id
-      email = row.email
-
-      # fake it
-      if row.email.blank? || row.email !~ /@/
-        email = SecureRandom.hex << "@domain.com"
-      end
-
-      name = row.real_name
-      username = row.nick
-      created_at = DateTime.parse(row.m_created)
-
-      username = name if username == "NULL"
-      username = email.split("@")[0] if username.blank?
-      name = email.split("@")[0] if name.blank?
-
       users << {
-        id: id,
-        email: email,
-        name: name,
-        username: username,
-        created_at: created_at,
-        active: false
+        id: row[:user_id],
+        email: row[:email],
+        name: row[:realname],
+        username: row[:nickname],
+        created_at: DateTime.parse(row[:joined_date]),
+        active: true
       }
 
       count += 1
       if count % BATCH_SIZE == 0
-        load_user_batch! users, count - users.length, total
+        import_users_batch!(users, count - users.length, total)
       end
-
     end
 
-    load_user_batch! users, count, total
+    import_users_batch!(users, count - users.length, total)
+  end
+
+  def import_users_batch!(users, offset, total)
+    return if users.empty?
+
+    create_users(users, offset: offset, total: total) do |user|
+      user
+    end
+    users.clear
   end
 
   def import_categories
+    puts "", "creating categories"
+
     rows = []
+
     csv_parse("categories") do |row|
-      rows << { id: row.id, name: row.name, description: row.description }
+      rows << {
+        id: row[:category_id],
+        name: row[:name],
+        description: row[:description].present? ? normalize_raw!(row[:description]) : nil
+      }
     end
 
     create_categories(rows) do |row|
@@ -198,8 +175,159 @@ class ImportScripts::GetSatisfaction < ImportScripts::Base
     end
   end
 
+  def import_topic_id(topic_id)
+    "T#{topic_id}"
+  end
+
+  def import_topics
+    read_topic_categories
+
+    puts "", "creating topics"
+
+    count = 0
+    topics = []
+
+    total = total_rows("topics")
+
+    csv_parse("topics") do |row|
+      topic = nil
+      topic_id = import_topic_id(row[:topic_id])
+
+      if skip_topic?(row)
+        @skipped_topics.add(topic_id)
+      else
+        topic = map_post(row)
+        topic[:id] = topic_id
+        topic[:title] = row[:subject].present? ? row[:subject].strip[0...255] : "Topic title missing"
+        topic[:category] = category_id(row)
+        topic[:archived] = row[:archived_at].present?
+
+        @topic_slug[topic[:id]] = row[:url] if CREATE_PERMALINKS
+      end
+
+      topics << topic
+      count += 1
+
+      if count % BATCH_SIZE == 0
+        import_topics_batch!(topics, count - topics.length, total)
+      end
+    end
+
+    import_topics_batch!(topics, count - topics.length, total)
+  end
+
+  def skip_topic?(row)
+    return true if row[:removed] == "1"
+    return true unless IMPORT_ARCHIVED_TOPICS || row[:archived_at].blank?
+
+    unless IMPORT_PRIVATE_TOPICS
+      categories = @topic_categories[row[:topic_id]]
+      return true if categories && categories[:has_unknown_category]
+    end
+
+    false
+  end
+
+  def category_id(row)
+    categories = @topic_categories[row[:topic_id]]
+    return categories[:category_ids].last if categories
+
+    SiteSetting.uncategorized_category_id
+  end
+
+  def read_topic_categories
+    puts "", "reading topic_categories"
+
+    count = 0
+    total = total_rows("topics_categories")
+
+    csv_parse("topics_categories") do |row|
+      topic_id = row[:topic_id]
+      category_id = category_id_from_imported_category_id(row[:category_id])
+
+      @topic_categories[topic_id] ||= { category_ids: [], has_unknown_category: false }
+
+      if category_id.nil?
+        @topic_categories[topic_id][:has_unknown_category] = true
+      else
+        @topic_categories[topic_id][:category_ids] << category_id
+      end
+
+      count += 1
+      print_status(count, total)
+    end
+  end
+
+  def import_topics_batch!(topics, offset, total)
+    return if topics.empty?
+
+    create_posts(topics, total: total, offset: offset) { |topic| topic }
+    topics.clear
+  end
+
+  def import_posts
+    puts "", "creating posts"
+
+    count = 0
+    posts = []
+
+    total = total_rows("replies")
+
+    csv_parse("replies") do |row|
+      post = nil
+
+      if row[:removed] != "1"
+        parent = topic_lookup_from_imported_post_id(row[:parent_id]) if row[:parent_id] != "NULL"
+
+        post = map_post(row)
+        post[:id] = row[:reply_id]
+        post[:topic_id] = import_topic_id(row[:topic_id])
+        post[:reply_to_post_number] = parent[:post_number] if parent
+      end
+
+      posts << post
+      count += 1
+
+      if count % BATCH_SIZE == 0
+        import_posts_batch!(posts, count - posts.length, total)
+      end
+    end
+
+    import_posts_batch!(posts, count - posts.length, total)
+  end
+
+  def import_posts_batch!(posts, offset, total)
+    return if posts.empty?
+
+    create_posts(posts, total: total, offset: offset) do |post|
+      next if post.nil? || @skipped_topics.include?(post[:topic_id])
+
+      topic = topic_lookup_from_imported_post_id(post[:topic_id])
+
+      if topic
+        post[:topic_id] = topic[:topic_id]
+      else
+        p "MISSING TOPIC #{post[:topic_id]}"
+        p post
+        next
+      end
+
+      post
+    end
+
+    posts.clear
+  end
+
+  def map_post(row)
+    {
+      user_id: user_id_from_imported_user_id(row[:user_id]) || Discourse.system_user.id,
+      created_at: DateTime.parse(row[:created_at]),
+      raw: normalize_raw!(row[:formatted_content])
+    }
+  end
+
   def normalize_raw!(raw)
-    return "<missing>" if raw.nil?
+    return "<missing>" if raw.blank?
     raw = raw.dup
 
     # hoist code
@@ -229,120 +357,14 @@ class ImportScripts::GetSatisfaction < ImportScripts::Base
     raw
   end
 
-  def import_post_batch!(posts, topics, offset, total)
-    create_posts(posts, total: total, offset: offset) do |post|
-
-      mapped = {}
-
-      mapped[:id] = post[:id]
-      mapped[:user_id] = user_id_from_imported_user_id(post[:user_id]) || -1
-      mapped[:raw] = post[:body]
-      mapped[:created_at] = post[:created_at]
-
-      topic = topics[post[:topic_id]]
-
-      unless topic
-        p "MISSING TOPIC #{post[:topic_id]}"
-        p post
-        next
-      end
-
-      unless topic[:post_id]
-        mapped[:title] = post[:title] || "Topic title missing"
-        topic[:post_id] = post[:id]
-        mapped[:category] = post[:category]
-      else
-        parent = topic_lookup_from_imported_post_id(topic[:post_id])
-        next unless parent
-
-        mapped[:topic_id] = parent[:topic_id]
-
-        reply_to_post_id = post_id_from_imported_post_id(post[:reply_id])
-        if reply_to_post_id
-          reply_to_post_number = @post_number_map[reply_to_post_id]
-          if reply_to_post_number && reply_to_post_number > 1
-            mapped[:reply_to_post_number] = reply_to_post_number
-          end
-        end
-      end
-
-      next if topic[:deleted] || post[:deleted]
-
-      mapped
-    end
-
-      posts.clear
-  end
-
-  def import_posts(category)
-    puts "", "creating topics and posts"
-
-    topic_map = {}
-
-    csv_parse("topics") do |topic|
-      @topic_slug[topic.id.to_i] = topic.url
-
-      topic_map[topic.id] = {
-        id: topic.id,
-        topic_id: topic.id,
-        title: topic.subject,
-        deleted: topic.removed == "1",
-        closed: true,
-        body: normalize_raw!(topic.additional_detail || topic.subject || "<missing>"),
-        created_at: DateTime.parse(topic.created_at),
-        user_id: topic.UserId,
-        category: category.name
-      }
-    end
-
-    total = total_rows("replies")
-
-    posts = []
-    count = 0
-
-    topic_map.each do |_, topic|
-      # a bit lazy
-      posts << topic if topic[:body]
-    end
-
-    csv_parse("replies") do |row|
-
-      unless row.created_at
-        puts "NO CREATION DATE FOR POST"
-        p row
-        next
-      end
-
-      row = {
-        id: row.id,
-        topic_id: row.topic_id,
-        reply_id: row.parent_id,
-        user_id: row.UserId,
-        body: normalize_raw!(row.content),
-        created_at: DateTime.parse(row.created_at)
-      }
-      posts << row
-      count += 1
-
-      if posts.length > 0 && posts.length % BATCH_SIZE == 0
-        import_post_batch!(posts, topic_map, count - posts.length, total)
-      end
-    end
-
-    import_post_batch!(posts, topic_map, count - posts.length, total) if posts.length > 0
-  end
-
   def create_permalinks
     puts '', 'Creating Permalinks...', ''
 
-    topic_mapping = []
-
     Topic.listable_topics.find_each do |topic|
       tcf = topic.first_post.custom_fields
       if tcf && tcf["import_id"]
-        slug = @topic_slug[tcf["import_id"].to_i]
-        # TODO: replace "http://community.example.com/" with the URL of your community
-        slug = slug.gsub("http://community.example.com/", "")
+        slug = @topic_slug[tcf["import_id"]]
+        slug = slug.gsub(OLD_DOMAIN, "")
         Permalink.create(url: slug, topic_id: topic.id)
       end
     end
diff --git a/script/import_scripts/ipboard.rb b/script/import_scripts/ipboard.rb
new file mode 100644
index 00000000000..18708898bf7
--- /dev/null
+++ b/script/import_scripts/ipboard.rb
@@ -0,0 +1,1017 @@
+# coding: utf-8
+require "mysql2"
+require File.expand_path(File.dirname(__FILE__) + "/base.rb")
+require 'htmlentities'
+begin
+  require 'reverse_markdown' # https://github.com/jqr/php-serialize
+rescue LoadError
+  puts
+  puts 'reverse_markdown not found.'
+  puts 'Add to Gemfile, like this: '
+  puts
+  puts "echo gem \\'reverse_markdown\\' >> Gemfile"
+  puts "bundle install"
+  exit
+end
+
+# 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="ipboard"
+export DB_PW="ipboard"
+export DB_USER="ipboard"
+export TABLE_PREFIX="ipb_"
+export IMPORT_AFTER="1970-01-01"
+export UPLOADS="http://example.com/uploads"
+export URL="http://example.com/"
+export AVATARS_DIR="/imports/avatars/"
+export USERDIR="user"
+=end
+
+class ImportScripts::IpboardSQL < ImportScripts::Base
+
+  DB_HOST ||= ENV['DB_HOST'] || "localhost"
+  DB_NAME ||= ENV['DB_NAME'] || "ipboard"
+  DB_PW ||= ENV['DB_PW'] || "ipboard"
+  DB_USER ||= ENV['DB_USER'] || "ipboard"
+  TABLE_PREFIX ||= ENV['TABLE_PREFIX'] || "ipb_"
+  IMPORT_AFTER ||= ENV['IMPORT_AFTER'] || "1970-01-01"
+  UPLOADS ||= ENV['UPLOADS'] || "http://UPLOADS+LOCATION+IS+NOT+SET/uploads"
+  USERDIR ||= ENV['USERDIR'] || "user"
+  URL ||= ENV['URL'] || "https://forum.example.com"
+  AVATARS_DIR ||= ENV['AVATARS_DIR'] || '/home/pfaffman/data/example.com/avatars/'
+  BATCH_SIZE = 1000
+  ID_FIRST = true
+  QUIET = true
+  DEBUG = false
+  GALLERY_CAT_ID = 1234567
+  GALLERY_CAT_NAME = 'galeria'
+  EMO_DIR ||= ENV['EMO_DIR'] || "default"
+  OLD_FORMAT = false
+  if OLD_FORMAT
+    MEMBERS_TABLE = "#{TABLE_PREFIX}core_members"
+    FORUMS_TABLE =  "#{TABLE_PREFIX}forums_forums"
+    POSTS_TABLE = "#{TABLE_PREFIX}forums_posts"
+    TOPICS_TABLE = "#{TABLE_PREFIX}forums_topics"
+  else
+    MEMBERS_TABLE = "#{TABLE_PREFIX}members"
+    FORUMS_TABLE = "#{TABLE_PREFIX}forums"
+    POSTS_TABLE = "#{TABLE_PREFIX}posts"
+    TOPICS_TABLE = "#{TABLE_PREFIX}topics"
+    GROUPS_TABLE = "#{TABLE_PREFIX}groups"
+    PROFILE_TABLE = "#{TABLE_PREFIX}profile_portal"
+    ATTACHMENT_TABLE = "#{TABLE_PREFIX}attachments"
+  end
+
+  # TODO: replace ipb_ with TABLE_PREFIX
+
+  #################
+  # Site settings #
+  #################
+  # don't send any emails
+  SiteSetting.disable_emails = true
+  # don't send digests (so you can enable email without users noticing)
+  SiteSetting.disable_digest_emails = true
+  # keep site and users private
+  SiteSetting.login_required = true
+  SiteSetting.hide_user_profiles_from_public = true
+  # if site is made available, don't let it get indexed
+  SiteSetting.allow_index_in_robots_txt = false
+  # don't notify users when images in their posts get downloaded
+  SiteSetting.disable_edit_notifications = true
+  #  SiteSetting.force_hostname='forum.dev1dev.com'
+  SiteSetting.title = "IPB Import"
+
+  if ID_FIRST
+    # TODO figure this out
+    puts "WARNING: permalink_normalizations not set!!!"
+    sleep 1
+  #raw = "[ORIGINAL POST](#{URL}/topic/#{id}-#{slug})\n\n" + raw
+  #SiteSetting.permalink_normalizations='/topic/(.*t)\?.*/\1'
+  else
+    # remove stuff after a "?" and work for urls that end in .html
+    SiteSetting.permalink_normalizations = '/(.*t)[?.].*/\1'
+    #raw = "[ORIGINAL POST](#{URL}/#{slug}-#{id}t)\n\n" + raw
+  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="ipboard"
+export DB_PW="ipboard"
+export DB_USER="ipboard"
+export TABLE_PREFIX="ipb_"
+export IMPORT_AFTER="1970-01-01"
+export URL="http://example.com"
+export UPLOADS=
+export USERDIR="user"
+
+Exiting.
+EOM
+      exit
+    end
+  end
+
+  def execute
+    import_users
+    import_categories
+    import_topics
+    import_posts
+    import_private_messages
+
+    # not supported import_image_categories
+    # NOT SUPPORTED import_gallery_topics
+    update_tl0
+    create_permalinks
+
+  end
+
+  def import_users
+    puts '', "creating users"
+
+    total_count = mysql_query("SELECT count(*) count FROM #{MEMBERS_TABLE}
+         WHERE last_activity > UNIX_TIMESTAMP(STR_TO_DATE('#{IMPORT_AFTER}', '%Y-%m-%d'));").first['count']
+
+    batches(BATCH_SIZE) do |offset|
+      #notes: no location, url,
+      results = mysql_query("
+             SELECT member_id id,
+                name username,
+                member_group_id usergroup,
+                email,
+                pp_thumb_photo avatar_url,
+#                pp_main_photo avatar_url,
+#                avatar_location avatar_url,
+# TODO consider joining ibf_profile_portal.avatar_location and avatar_type
+                FROM_UNIXTIME(joined) created_at,
+                FROM_UNIXTIME(last_activity) last_seen_at,
+                ip_address registration_ip_address,
+                member_banned banned,
+                bday_year, bday_month, bday_day,
+                g_title member_type,
+                last_visit last_seen_at
+     	        FROM #{MEMBERS_TABLE}, #{PROFILE_TABLE}, #{GROUPS_TABLE}
+       	        WHERE last_activity > UNIX_TIMESTAMP(STR_TO_DATE('#{IMPORT_AFTER}', '%Y-%m-%d'))
+                AND member_id=pp_member_id
+                AND member_group_id = g_id
+                order by member_id ASC
+                LIMIT #{BATCH_SIZE}
+                OFFSET #{offset};")
+
+      break if results.size < 1
+
+      next if all_records_exist? :users, results.map { |u| u['id'].to_i }
+
+      create_users(results, total: total_count, offset: offset) do |user|
+        next if user['email'].blank?
+        next if user['username'].blank?
+        next if @lookup.user_id_from_imported_user_id(user['id'])
+
+        birthday = Date.parse("#{user['bday_year']}-#{user['bday_month']}-#{user['bday_day']}") rescue nil
+        # TODO: what about timezones?
+        next if user['id'] == 0
+        { id: user['id'],
+          email: user['email'],
+          username: user['username'],
+          avatar_url: user['avatar_url'],
+          title: user['member_type'],
+          created_at: user['created_at'] == nil ? 0 : Time.zone.at(user['created_at']),
+          # bio_raw: user['bio_raw'],
+          registration_ip_address: user['registration_ip_address'],
+          # birthday: birthday,
+          last_seen_at: user['last_seen_at'] == nil ? 0 : Time.zone.at(user['last_seen_at']),
+          admin: /^Admin/.match(user['member_type']) ? true : false,
+          moderator: /^MOD/.match(user['member_type']) ? true : false,
+          post_create_action: proc do |newuser|
+            if user['avatar_url'] && user['avatar_url'].length > 0
+              photo_path = AVATARS_DIR + user['avatar_url']
+              if File.exists?(photo_path)
+                begin
+                  upload = create_upload(newuser.id, photo_path, File.basename(photo_path))
+                  if upload && upload.persisted?
+                    newuser.import_mode = false
+                    newuser.create_user_avatar
+                    newuser.import_mode = true
+                    newuser.user_avatar.update(custom_upload_id: upload.id)
+                    newuser.update(uploaded_avatar_id: upload.id)
+                  else
+                    puts "Error: Upload did not persist for #{photo_path}!"
+                  end
+                rescue SystemCallError => err
+                  puts "Could not import avatar #{photo_path}: #{err.message}"
+                end
+              else
+                puts "avatar file not found at #{photo_path}"
+              end
+            end
+            if user['banned'] != 0
+              suspend_user(newuser)
+            end
+          end
+        }
+      end
+    end
+  end
+
+  def suspend_user(user)
+    user.suspended_at = Time.now
+    user.suspended_till = 200.years.from_now
+    ban_reason = 'Account deactivated by administrator'
+
+    user_option = user.user_option
+    user_option.email_digests = false
+    user_option.email_private_messages = false
+    user_option.email_direct = false
+    user_option.email_always = false
+    user_option.save!
+
+    if user.save
+      StaffActionLogger.new(Discourse.system_user).log_user_suspend(user, ban_reason)
+    else
+      puts "Failed to suspend user #{user.username}. #{user.errors.try(:full_messages).try(:inspect)}"
+    end
+  end
+
+  def file_full_path(relpath)
+    File.join JSON_FILES_DIR, relpath.split("?").first
+  end
+
+  def import_image_categories
+    puts "", "importing image categories..."
+
+    categories = mysql_query("
+                  SELECT category_id id,
+                         category_name_seo name,
+	                 category_parent_id as parent_id
+                  FROM #{TABLE_PREFIX}gallery_categories
+                  ORDER BY id ASC
+                            ").to_a
+
+    category_names = mysql_query("
+                  SELECT DISTINCT word_key, word_default title
+                  FROM #{TABLE_PREFIX}core_sys_lang_words where word_app='gallery'
+                  AND word_key REGEXP 'gallery_category_[0-9]+$'
+                  ORDER BY word_key ASC
+                            ").to_a
+
+    cat_map = {}
+    puts "Creating gallery_cat_map"
+    category_names.each do |name|
+      title = name['title']
+      word_key = name['word_key']
+      puts "Processing #{word_key}: #{title}"
+      id = word_key.gsub('gallery_category_', '')
+      next if cat_map[id]
+      cat_map[id] = cat_map.has_value?(title) ? title + " " + id : title
+      puts "#{id} => #{cat_map[id]}"
+    end
+
+    params = { id: GALLERY_CAT_ID,
+               name: GALLERY_CAT_NAME }
+    create_category(params, params[:id])
+
+    create_categories(categories) do |category|
+      id = (category['id']).to_s
+      name = CGI.unescapeHTML(cat_map[id])
+      {
+        id: id + 'gal',
+        name: name,
+        parent_category_id: @lookup.category_id_from_imported_category_id(GALLERY_CAT_ID),
+        color: random_category_color
+      }
+    end
+  end
+
+  def import_categories
+    puts "", "importing categories..."
+
+    categories = mysql_query("
+                  SELECT id,
+                         name name,
+	                 parent_id as parent_id
+                  FROM #{FORUMS_TABLE}
+                  ORDER BY parent_id ASC
+                            ").to_a
+
+    top_level_categories = categories.select { |c| c["parent.id"] == -1 }
+
+    create_categories(top_level_categories) do |category|
+      id = category['id'].to_s
+      name = category['name']
+      {
+        id: id,
+        name: name,
+      }
+    end
+
+    children_categories = categories.select { |c| c["parent.id"] != -1 }
+    create_categories(children_categories) do |category|
+      id = category['id'].to_s
+      name = category['name']
+      {
+        id: id,
+        name: name,
+        parent_category_id: @lookup.category_id_from_imported_category_id(category['parent_id']),
+        color: random_category_color
+      }
+    end
+  end
+
+  def import_topics
+    puts "", "importing topics..."
+
+    total_count = mysql_query("SELECT count(*) count FROM #{POSTS_TABLE}
+       	        WHERE post_date > UNIX_TIMESTAMP(STR_TO_DATE('#{IMPORT_AFTER}', '%Y-%m-%d'))
+                AND new_topic=1;")
+      .first['count']
+
+    batches(BATCH_SIZE) do |offset|
+      discussions = mysql_query(<<-SQL
+            SELECT #{TOPICS_TABLE}.tid tid,
+               #{TOPICS_TABLE}.forum_id category,
+               #{POSTS_TABLE}.pid pid,
+               #{TOPICS_TABLE}.title title,
+               #{TOPICS_TABLE}.pinned pinned,
+               #{POSTS_TABLE}.post raw,
+               #{TOPICS_TABLE}.title_seo as slug,
+               FROM_UNIXTIME(#{POSTS_TABLE}.post_date) created_at,
+               #{POSTS_TABLE}.author_id user_id
+            FROM #{POSTS_TABLE}, #{TOPICS_TABLE}
+            WHERE #{POSTS_TABLE}.topic_id = #{TOPICS_TABLE}.tid
+            AND #{POSTS_TABLE}.new_topic = 1
+            AND #{POSTS_TABLE}.post_date > UNIX_TIMESTAMP(STR_TO_DATE('#{IMPORT_AFTER}', '%Y-%m-%d'))
+            ORDER BY #{POSTS_TABLE}.post_date ASC
+            LIMIT #{BATCH_SIZE}
+            OFFSET #{offset}
+            SQL
+                               )
+
+      break if discussions.size < 1
+      next if all_records_exist? :posts, discussions.map { |t| "discussion#" + t['tid'].to_s }
+
+      create_posts(discussions, total: total_count, offset: offset) do |discussion|
+        slug = discussion['slug']
+        id = discussion['tid']
+        raw = clean_up(discussion['raw'])
+        {
+          id: "discussion#" + discussion['tid'].to_s,
+          user_id: user_id_from_imported_user_id(discussion['user_id']) || Discourse::SYSTEM_USER_ID,
+          title: CGI.unescapeHTML(discussion['title']),
+          category: category_id_from_imported_category_id(discussion['category'].to_s),
+          raw: raw,
+          pinned_at: discussion['pinned'].to_i == 1 ? Time.zone.at(discussion['created_at']) : nil,
+          created_at: Time.zone.at(discussion['created_at']),
+        }
+      end
+    end
+  end
+
+  def array_from_members_string(invited_members = 'a:3:{i:0;i:22629;i:1;i:21837;i:2;i:22234;}')
+    out = []
+    count_regex = /a:(\d)+:/
+    count = count_regex.match(invited_members)[1]
+    rest = invited_members.sub(count_regex, "")
+    i_regex = /i:\d+;i:(\d+);/
+    while m = i_regex.match(rest)
+      i = m[1]
+      rest.sub!(i_regex, "")
+      puts "i: #{i}, #{rest}"
+      out += [ i.to_i ]
+    end
+    out
+  end
+
+  def import_private_messages
+    puts "", "importing private messages..."
+
+    topic_count = mysql_query("SELECT COUNT(msg_id) count FROM #{TABLE_PREFIX}message_posts").first["count"]
+
+    last_private_message_topic_id = -1
+
+    batches(BATCH_SIZE) do |offset|
+      private_messages = mysql_query(<<-SQL
+          SELECT msg_id pmtextid,
+                 msg_topic_id topic_id,
+                 msg_author_id fromuserid,
+                 mt_title title,
+                 msg_post message,
+                 mt_invited_members touserarray,
+                 mt_to_member_id to_user_id,
+                 msg_is_first_post first_post,
+                 msg_date dateline
+            FROM #{TABLE_PREFIX}message_topics, #{TABLE_PREFIX}message_posts
+           WHERE msg_topic_id = mt_id
+             AND msg_date > UNIX_TIMESTAMP(STR_TO_DATE('#{IMPORT_AFTER}', '%Y-%m-%d'))
+        ORDER BY msg_topic_id, msg_id
+           LIMIT #{BATCH_SIZE}
+          OFFSET #{offset}
+      SQL
+                                    )
+
+      puts "Processing #{private_messages.count} messages"
+      break if private_messages.count < 1
+      puts "Processing . . . "
+      private_messages = private_messages.reject { |pm| @lookup.post_already_imported?("pm-#{pm['pmtextid']}") }
+
+      title_username_of_pm_first_post = {}
+
+      create_posts(private_messages, total: topic_count, offset: offset) do |m|
+        skip = false
+        mapped = {}
+
+        mapped[:id] = "pm-#{m['pmtextid']}"
+        mapped[:user_id] = user_id_from_imported_user_id(m['fromuserid']) || Discourse::SYSTEM_USER_ID
+        mapped[:raw] = clean_up(m['message']) rescue nil
+        mapped[:created_at] = Time.zone.at(m['dateline'])
+        title = @htmlentities.decode(m['title']).strip[0...255]
+        topic_id = nil
+
+        next if mapped[:raw].blank?
+
+        # users who are part of this private message.
+        target_usernames = []
+        target_userids = []
+        begin
+          to_user_array = [ m['to_user_id'] ] + array_from_members_string(m['touserarray'])
+        rescue
+          puts "#{m['pmtextid']} -- #{m['touserarray']}"
+          skip = true
+        end
+
+        begin
+          to_user_array.each do |to_user|
+            user_id = user_id_from_imported_user_id(to_user)
+            username = User.find_by(id: user_id).try(:username)
+            target_userids << user_id || Discourse::SYSTEM_USER_ID
+            target_usernames << username if username
+            if user_id
+              puts "Found user: #{to_user} -- #{user_id} -- #{username}"
+            else
+              puts "Can't find user: #{to_user}"
+            end
+          end
+        rescue
+          puts "skipping pm-#{m['pmtextid']} `to_user_array` is broken -- #{to_user_array.inspect}"
+          skip = true
+        end
+
+        participants = target_userids
+        participants << mapped[:user_id]
+        begin
+          participants.sort!
+        rescue
+          puts "one of the participant's id is nil -- #{participants.inspect}"
+        end
+
+        if last_private_message_topic_id != m['topic_id']
+          last_private_message_topic_id = m['topic_id']
+          puts "New message: #{m['topic_id']}: #{title} from #{m['fromuserid']} (#{mapped[:user_id]})" unless QUIET
+          # topic post message
+          topic_id = m['topic_id']
+          mapped[:title] = title
+          mapped[:archetype] = Archetype.private_message
+          mapped[:target_usernames] = target_usernames.join(',')
+          if mapped[:target_usernames].size < 1 # pm with yourself?
+            # skip = true
+            mapped[:target_usernames] = "system"
+            puts "pm-#{m['pmtextid']} has no target (#{m['touserarray']})"
+          end
+        else # reply
+          topic_id = topic_lookup_from_imported_post_id("pm-#{topic_id}")
+          if !topic_id
+            skip = true
+          end
+          mapped[:topic_id] = topic_id
+          puts "Reply message #{topic_id}: #{m['topic_id']}: from #{m['fromuserid']} (#{mapped[:user_id]})"  unless QUIET
+        end
+        #        puts "#{target_usernames} -- #{mapped[:target_usernames]}"
+        #        puts "Adding #{mapped}"
+        skip ? nil : mapped
+        #        puts "#{'-'*50}> added"
+      end
+    end
+  end
+
+  def import_gallery_topics
+    # pfaffman: I'm not clear whether this is an IPBoard thing or from some other system
+    puts "", "importing gallery albums..."
+
+    gallery_count = 0
+    total_count = mysql_query("SELECT count(*) count FROM #{TABLE_PREFIX}gallery_images
+                ;")
+      .first['count']
+
+    # NOTE: for imports with huge numbers of galleries, this needs to use limits
+
+    batches(BATCH_SIZE) do |offset|
+      # galleries = mysql_query(<<-SQL
+
+      #       SELECT #{TABLE_PREFIX}gallery_albums.album_id tid,
+      #           #{TABLE_PREFIX}gallery_albums.album_category_id category,
+      #           #{TABLE_PREFIX}gallery_albums.album_owner_id user_id,
+      #           #{TABLE_PREFIX}gallery_albums.album_name title,
+      #           #{TABLE_PREFIX}gallery_albums.album_description raw,
+      #           #{TABLE_PREFIX}gallery_albums.album_type,
+      #            FROM_UNIXTIME(#{TABLE_PREFIX}gallery_albums.album_last_img_date) created_at
+      #       FROM #{TABLE_PREFIX}gallery_albums
+      #       ORDER BY #{TABLE_PREFIX}gallery_albums.album_id ASC
+
+      #       SQL
+      #                        )
+
+      images = mysql_query(<<-SQL
+
+            SELECT #{TABLE_PREFIX}gallery_albums.album_id tid,
+                #{TABLE_PREFIX}gallery_albums.album_category_id category,
+                #{TABLE_PREFIX}gallery_albums.album_owner_id user_id,
+                #{TABLE_PREFIX}gallery_albums.album_name title,
+                #{TABLE_PREFIX}gallery_albums.album_description raw,
+                #{TABLE_PREFIX}gallery_albums.album_type,
+                #{TABLE_PREFIX}gallery_images.image_caption caption,
+                #{TABLE_PREFIX}gallery_images.image_description description,
+                #{TABLE_PREFIX}gallery_images.image_masked_file_name masked,
+                #{TABLE_PREFIX}gallery_images.image_id image_id,
+                #{TABLE_PREFIX}gallery_images.image_medium_file_name medium,
+                #{TABLE_PREFIX}gallery_images.image_original_file_name orig,
+                 FROM_UNIXTIME(#{TABLE_PREFIX}gallery_albums.album_last_img_date) created_at,
+                #{TABLE_PREFIX}gallery_images.image_file_name filename
+                FROM #{TABLE_PREFIX}gallery_albums, #{TABLE_PREFIX}gallery_images
+                WHERE  #{TABLE_PREFIX}gallery_images.image_album_id=#{TABLE_PREFIX}gallery_albums.album_id
+            ORDER BY #{TABLE_PREFIX}gallery_albums.album_id, image_date DESC
+            LIMIT #{BATCH_SIZE}
+            OFFSET #{offset};
+
+            SQL
+
+                          )
+
+      break if images.size < 1
+      next if all_records_exist? :posts, images.map { |t| "gallery#" + t['tid'].to_s + t['image_id'].to_s }
+
+      last_id = images.first['tid']
+      raw = "Gallery ID: #{last_id}\n" + clean_up(images.first['raw'])
+      raw += "#{clean_up(images.first['description'])}\n"
+      last_gallery = images.first.dup
+      create_posts(images, total: total_count, offset: offset) do |gallery|
+        id = gallery['tid'].to_i
+        #puts "ID: #{id}, last_id: #{last_id}, image: #{gallery['image_id']}"
+        if id == last_id
+          raw += "### #{gallery['caption']}\n"
+          raw += "#{UPLOADS}/#{gallery['orig']}\n"
+          last_gallery = gallery.dup
+          next
+        else
+          insert_raw = raw.dup
+          last_id = gallery['tid']
+          if DEBUG
+            raw = "Gallery ID: #{last_id}\n" + clean_up(gallery['raw'])
+            raw += "Cat: #{last_gallery['category'].to_s} - #{category_id_from_imported_category_id(last_gallery['category'].to_s + 'gal')}"
+          end
+          raw += "#{clean_up(images.first['description'])}\n"
+          raw += "### #{gallery['caption']}\n"
+          if DEBUG
+            raw += "User #{gallery['user_id']}, image_id: #{gallery['image_id']}\n"
+          end
+          raw += "#{UPLOADS}/#{gallery['orig']}\n"
+          gallery_count += 1
+          puts "#{gallery_count}--Cat: #{last_gallery['category'].to_s} ==> #{category_id_from_imported_category_id(last_gallery['category'].to_s + 'gal')}" unless QUIET
+          {
+            id: "gallery#" + last_gallery['tid'].to_s + last_gallery['image_id'].to_s,
+            user_id: user_id_from_imported_user_id(last_gallery['user_id']) || Discourse::SYSTEM_USER_ID,
+            title: CGI.unescapeHTML(last_gallery['title']),
+            category: category_id_from_imported_category_id(last_gallery['category'].to_s + 'gal'),
+            raw: insert_raw,
+          }
+        end
+      end
+    end
+  end
+
+  # TODO: use this to figure out to pin posts
+  def map_first_post(row, mapped)
+    mapped[:category] = @lookup.category_id_from_imported_category_id(row[:forum_id])
+    mapped[:title] = CGI.unescapeHTML(row[:topic_title]).strip[0...255]
+    mapped[:pinned_at] = mapped[:created_at] unless row[:topic_type] == Constants::POST_NORMAL
+    mapped[:pinned_globally] = row[:topic_type] == Constants::POST_GLOBAL
+    mapped[:post_create_action] = proc do |post|
+      @permalink_importer.create_for_topic(post.topic, row[:topic_id])
+    end
+
+    mapped
+  end
+
+  def import_comments
+    puts "", "importing gallery comments..."
+
+    total_count = mysql_query("SELECT count(*) count FROM #{TABLE_PREFIX}gallery_comments;")
+      .first['count']
+
+    batches(BATCH_SIZE) do |offset|
+      comments = mysql_query(<<-SQL
+
+            SELECT #{TABLE_PREFIX}gallery_comments.tid tid,
+               #{TABLE_PREFIX}gallery_topics.forum_id category,
+               #{TABLE_PREFIX}gallery_posts.pid pid,
+               #{TABLE_PREFIX}gallery_topics.title title,
+               #{TABLE_PREFIX}gallery_posts.post raw,
+               FROM_UNIXTIME(#{TABLE_PREFIX}gallery_posts.post_date) created_at,
+               #{TABLE_PREFIX}gallery_posts.author_id user_id
+            FROM #{TABLE_PREFIX}gallery_posts, #{TABLE_PREFIX}gallery_topics
+            WHERE #{TABLE_PREFIX}gallery_posts.topic_id = #{TABLE_PREFIX}gallery_topics.tid
+            AND #{TABLE_PREFIX}gallery_posts.new_topic = 0
+            AND #{TABLE_PREFIX}gallery_posts.post_date > UNIX_TIMESTAMP(STR_TO_DATE('#{IMPORT_AFTER}', '%Y-%m-%d'))
+            ORDER BY #{TABLE_PREFIX}gallery_posts.post_date ASC
+            LIMIT #{BATCH_SIZE}
+            OFFSET #{offset}
+
+            SQL
+                            )
+
+      break if comments.size < 1
+      next if all_records_exist? :posts, comments.map { |comment| "comment#" + comment['pid'].to_s }
+
+      create_posts(comments, total: total_count, offset: offset) do |comment|
+        next unless t = topic_lookup_from_imported_post_id("discussion#" + comment['tid'].to_s)
+        next if comment['raw'].blank?
+        {
+          id: "comment#" + comment['pid'].to_s,
+          user_id: user_id_from_imported_user_id(comment['user_id']) || Discourse::SYSTEM_USER_ID,
+          topic_id: t[:topic_id],
+          raw: clean_up(comment['raw']),
+          created_at: Time.zone.at(comment['created_at'])
+        }
+      end
+    end
+  end
+
+  def import_posts
+    puts "", "importing posts..."
+
+    total_count = mysql_query("SELECT count(*) count FROM #{POSTS_TABLE}
+       	        WHERE post_date > UNIX_TIMESTAMP(STR_TO_DATE('#{IMPORT_AFTER}', '%Y-%m-%d'))
+                AND new_topic=0;")
+      .first['count']
+
+    batches(BATCH_SIZE) do |offset|
+      comments = mysql_query(<<-SQL
+            SELECT #{TOPICS_TABLE}.tid tid,
+               #{TOPICS_TABLE}.forum_id category,
+               #{POSTS_TABLE}.pid pid,
+               #{TOPICS_TABLE}.title title,
+               #{POSTS_TABLE}.post raw,
+               FROM_UNIXTIME(#{POSTS_TABLE}.post_date) created_at,
+               #{POSTS_TABLE}.author_id user_id
+            FROM #{POSTS_TABLE}, #{TOPICS_TABLE}
+            WHERE #{POSTS_TABLE}.topic_id = #{TOPICS_TABLE}.tid
+            AND #{POSTS_TABLE}.new_topic = 0
+            AND #{POSTS_TABLE}.post_date > UNIX_TIMESTAMP(STR_TO_DATE('#{IMPORT_AFTER}', '%Y-%m-%d'))
+            ORDER BY #{POSTS_TABLE}.post_date ASC
+            LIMIT #{BATCH_SIZE}
+            OFFSET #{offset}
+            SQL
+                            )
+
+      break if comments.size < 1
+      next if all_records_exist? :posts, comments.map { |comment| "comment#" + comment['pid'].to_s }
+
+      create_posts(comments, total: total_count, offset: offset) do |comment|
+        next unless t = topic_lookup_from_imported_post_id("discussion#" + comment['tid'].to_s)
+        next if comment['raw'].blank?
+        {
+          id: "comment#" + comment['pid'].to_s,
+          user_id: user_id_from_imported_user_id(comment['user_id']) || Discourse::SYSTEM_USER_ID,
+          topic_id: t[:topic_id],
+          raw: clean_up(comment['raw']),
+          created_at: Time.zone.at(comment['created_at'])
+        }
+      end
+    end
+  end
+
+  def nokogiri_fix_blockquotes(raw)
+    # this makes proper quotes with user/topic/post references.
+    # I'm not clear if it is for just some bizarre imported data, or it might ever be useful
+    # It should be integrated into the Nokogiri section of clean_up, though.
+    @doc = Nokogiri::XML("<html>" + raw + "</html>")
+
+    # handle <blockquote>s with links to original post
+    @doc.css('blockquote[class=ipsQuote]').each do |b|
+      # puts "\n#{'#'*50}\n#{b}\n\nCONTENT: #{b['data-ipsquote-contentid']}"
+      # b.options = Nokogiri::XML::ParseOptions::STRICT
+      imported_post_id = b['data-ipsquote-contentcommentid'].to_s
+      content_type = b['data-ipsquote-contenttype'].to_s
+      content_class = b['data-ipsquote-contentclass'].to_s
+      content_id = b['data-ipsquote-contentid'].to_s || b['data-cid'].to_s
+      topic_lookup = topic_lookup_from_imported_post_id("comment#" + imported_post_id)
+      post_lookup = topic_lookup_from_imported_post_id("discussion#" + content_id)
+      post = topic_lookup ? topic_lookup[:post_number] : nil
+      topic = topic_lookup ? topic_lookup[:topic_id] : nil
+      post ||= post_lookup ? post_lookup[:post_number] : nil
+      topic ||= post_lookup ? post_lookup[:topic_id] : nil
+
+      # TODO: consider: <blockquote class="ipsStyle_spoiler" data-ipsspoiler="">
+      # consider: <pre class="ipsCode prettyprint">
+      # TODO make sure it's the imported username
+      # TODO: do _s still get \-escaped?
+      ips_username = b['data-ipsquote-username'] || b['data-author']
+      username = ips_username
+      new_text = ""
+      if DEBUG
+        # new_text += "post: #{imported_post_id} --> #{post_lookup} --> |#{post}|<br>\n"
+        # new_text += "topic: #{content_id} --> #{topic_lookup} --> |#{topic}|<br>\n"
+        # new_text += "user: #{ips_username} --> |#{username}|<br>\n"
+        # new_text += "class: #{content_class}<br>\n"
+        # new_text += "type: #{content_type}<br>\n"
+        if content_class.length > 0 && content_class != "forums_Topic"
+          new_text += "UNEXPECTED CONTENT CLASS! #{content_class}<br>\n"
+        end
+        if content_type.length > 0 && content_type != "forums"
+          new_text += "UNEXPECTED CONTENT TYPE! #{content_type}<br>\n"
+        end
+        # puts "#{'-'*20} and NOWWWWW!!!! \n #{new_text}"
+      end
+      if post && topic && username
+        quote = "\n[quote=\"#{username}, post:#{post}, topic: #{topic}\"]\n\n"
+      else
+        if username && username.length > 1
+          quote = "\n[quote=\"#{username}\"]\n\n"
+        else
+          quote = "\n[quote]\n"
+        end
+        # new_doc = Nokogiri::XML("<div>#{new_text}</div>")
+      end
+      puts "QUOTE: #{quote}"
+      sleep 1
+      b.content = quote + b.content + "\n[/quote]\n"
+      b.name = 'div'
+    end
+
+    raw = @doc.to_html
+  end
+
+  def clean_up(raw)
+    return "" if raw.blank?
+
+    raw.gsub!(/<#EMO_DIR#>/, EMO_DIR)
+    # TODO what about uploads?
+    # raw.gsub!(/<fileStore.core_Attachment>/,UPLOADS)
+    raw.gsub!(/<br>/, "\n\n")
+    raw.gsub!(/<br \/>/, "\n\n")
+    raw.gsub!(/<p>&nbsp;<\/p>/, "\n\n")
+    raw.gsub!(/\[hr\]/, "\n***\n")
+    raw.gsub!(/&#39;/, "'")
+    raw.gsub!(/\[url="(.+?)"\]http.+?\[\/url\]/, "\\1\n")
+    raw.gsub!(/\[media\](.+?)\[\/media\]/, "\n\\1\n\n")
+    raw.gsub!(/\[\/quote\]/, "\n[/quote]\n")
+    raw.gsub!(/date=\'(.+?)\'/, '')
+    raw.gsub!(/timestamp=\'(.+?)\' /, '')
+
+    quote_regex = /\[quote name=\'(.+?)\'\s+post=\'(\d+?)\'\s*\]/
+    while quote = quote_regex.match(raw)
+      # get IPB post number and find Discourse post and topic number
+      puts "----------------------------------------\nName: #{quote[1]}, post: #{quote[2]}" unless QUIET
+      imported_post_id = quote[2].to_s
+      topic_lookup = topic_lookup_from_imported_post_id("comment#" + imported_post_id)
+      post_lookup = topic_lookup_from_imported_post_id("discussion#" + imported_post_id)
+      puts "topic_lookup: #{topic_lookup}, post: #{post_lookup}" unless QUIET
+      post_num = topic_lookup ? topic_lookup[:post_number] : nil
+      topic_num = topic_lookup ? topic_lookup[:topic_id] : nil
+      post_num ||= post_lookup ? post_lookup[:post_number] : nil
+      topic_num ||= post_lookup ? post_lookup[:topic_id] : nil
+
+      # Fix or leave bogus username?
+      username = find_user_by_import_id(quote[1]) || quote[1]
+      puts "username: #{username}, post_id: #{post_num}, topic_id: #{topic_num}" unless QUIET
+      puts "Before fixing a quote: #{raw}\n**************************************** " unless QUIET
+      post_string = post_num ? ", post:#{post_num}" : ""
+      topic_string = topic_num ? ", topic:#{topic_num}" : ""
+      raw.gsub!(quote_regex, "\n[quote=\"#{username}#{post_string}#{topic_string}\"]\n\n")
+      puts "AFTER!!!!!!!!!!!!1: #{raw}" unless QUIET
+      sleep 1
+      raw
+    end
+
+    attach_regex = /\[attachment=(\d+?):.+\]/
+    while attach = attach_regex.match(raw)
+      attach_id = attach[1]
+      attachments =
+        mysql_query("SELECT attach_location as loc,
+                            attach_file as filename
+                     FROM #{ATTACHMENT_TABLE}
+                     WHERE attach_id=#{attach_id}")
+      if attachments.count < 1
+        puts "Attachment #{attach_id} not found."
+        attach_string = "Attachment #{attach_id} not found."
+      else
+        attach_string = "#{attach_id}\n\n![#{attachments.first['filename']}](#{UPLOADS}/#{attachments.first['loc']})\n"
+      end
+      raw.gsub!(attach_regex, attach_string)
+    end
+
+    raw
+  end
+
+  def random_category_color
+    colors = SiteSetting.category_colors.split('|')
+    colors[rand(colors.count)]
+  end
+
+  def old_clean_up(raw)
+    # This was for a forum that appeared to have lots of customization's.
+    # IT did a good job of handling quotes and whatnot, but I don't know
+    # what version if IPBoard it was for.
+    return "" if raw.blank?
+
+    raw.gsub!(/<___base_url___>/, URL)
+    raw.gsub!(/<fileStore.core_Emoticons>/, UPLOADS)
+    raw.gsub!(/<fileStore.core_Attachment>/, UPLOADS)
+    raw.gsub!(/<br>/, "\n")
+
+    @doc = Nokogiri::XML("<html>" + raw + "</html>")
+
+    # handle <blockquote>s with links to original post
+    @doc.css('blockquote[class=ipsQuote]').each do |b|
+      imported_post_id = b['data-ipsquote-contentcommentid'].to_s
+      content_type = b['data-ipsquote-contenttype'].to_s
+      content_class = b['data-ipsquote-contentclass'].to_s
+      content_id = b['data-ipsquote-contentid'].to_s || b['data-cid'].to_s
+      topic_lookup = topic_lookup_from_imported_post_id("comment#" + imported_post_id)
+      post_lookup = topic_lookup_from_imported_post_id("discussion#" + content_id)
+      post = topic_lookup ? topic_lookup[:post_number] : nil
+      topic = topic_lookup ? topic_lookup[:topic_id] : nil
+      post ||= post_lookup ? post_lookup[:post_number] : nil
+      topic ||= post_lookup ? post_lookup[:topic_id] : nil
+
+      # TODO: consider: <blockquote class="ipsStyle_spoiler" data-ipsspoiler="">
+      # consider: <pre class="ipsCode prettyprint">
+      ips_username = b['data-ipsquote-username'] || b['data-author']
+      username = ips_username
+      new_text = ""
+      if DEBUG
+        if content_class.length > 0 && content_class != "forums_Topic"
+          new_text += "UNEXPECTED CONTENT CLASS! #{content_class}<br>\n"
+        end
+        if content_type.length > 0 && content_type != "forums"
+          new_text += "UNEXPECTED CONTENT TYPE! #{content_type}<br>\n"
+        end
+      end
+      if post && topic && username
+        quote = "[quote=\"#{username}, post:#{post}, topic: #{topic}\"]\n\n"
+      else
+        if username && username.length > 1
+          quote = "[quote=\"#{username}\"]\n\n"
+        else
+          quote = "[quote]\n"
+        end
+      end
+      b.content = quote + b.content + "\n[/quote]\n"
+      b.name = 'div'
+    end
+
+    @doc.css('object param embed').each do |embed|
+      embed.replace("\n#{embed['src']}\n")
+    end
+
+    # handle <iframe data-embedcontent>s with links to original post
+    # no examples in recent import
+    @doc.css('iframe[data-embedcontent]').each do |d|
+      d.to_s.match(/\-([0-9]+)t/)
+      imported_post_id = $1
+      if imported_post_id
+        puts "Searching for #{imported_post_id}" unless QUIET
+        topic_lookup = topic_lookup_from_imported_post_id("discussion#" + imported_post_id)
+        topic = topic_lookup ? topic_lookup[:topic_id] : nil
+        if topic
+          url = URL + "/t/#{topic}"
+          d.to_s.match(/comment=([0-9]+)&/)
+          content_id = $1 || "-1"
+          if content_id
+            post_lookup = topic_lookup_from_imported_post_id("comment#" + content_id)
+            post = topic_lookup ? topic_lookup[:post_number] : 1
+            url += "/#{post}"
+          end
+          d.content = url
+        end
+      end
+      d.name = 'div'
+    end
+
+    @doc.css('div[class=ipsQuote_citation]').each do |d|
+      d.remove
+    end
+
+    raw = @doc.to_html
+
+    # let ReverseMarkdown handle the rest
+    raw = ReverseMarkdown.convert raw
+
+    # remove tabs at start of line to avoid everything being a <pre>
+    raw = raw.gsub(/^\t+/, "")
+
+    # un \-escape _s in usernames in [quote]s
+    raw.gsub!(/^\[quote=.+?_.*$/) do |match|
+      match = match.gsub('\_', '_')
+      match
+    end
+    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...', ''
+
+    # TODO: permalink normalizations: /(.*t)\?.*/\1
+
+    puts '', 'Users...', ''
+    User.find_each do |u|
+      ucf = u.custom_fields
+      if ucf && ucf["import_id"] && ucf["import_username"]
+        username = URI.escape(ucf["import_username"])
+        Permalink.create(url: "#{USERDIR}/#{ucf['import_id']}-#{username}", 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"]
+        if post.post_number == 1
+          topic = post.topic
+          id = pcf["import_id"].split('#').last
+          slug = topic.slug
+          if ID_FIRST
+            Permalink.create(url: "topic/#{id}-#{slug}", topic_id: topic.id) rescue nil
+            unless QUIET
+              print_warning("#{URL}topic/#{id}-#{slug} --> http://localhost:3000/topic/#{id}-#{slug}")
+            end
+          else
+            Permalink.create(url: "#{slug}-#{id}t", topic_id: topic.id) rescue nil
+            unless QUIET
+              print_warning("#{URL}/#{slug}-#{id}t --> http://localhost:3000/t/#{topic.id}")
+            end
+          end
+        else # don't think we can do posts
+          # 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"]
+      slug = cat['slug']
+      unless QUIET
+        print_warning("/forum/#{URL}-#{slug}-#{id} --> /c/#{slug}")
+      end
+      Permalink.create(url: "/forum/#{id}-#{slug}", category_id: cat.id) rescue nil
+      print '.'
+    end
+  end
+
+  def print_warning(message)
+    $stderr.puts "#{message}"
+  end
+
+end
+
+ImportScripts::IpboardSQL.new.perform
diff --git a/script/import_scripts/ipboard3.rb b/script/import_scripts/ipboard3.rb
new file mode 100644
index 00000000000..5a9812f85d5
--- /dev/null
+++ b/script/import_scripts/ipboard3.rb
@@ -0,0 +1,410 @@
+require "mysql2"
+require "reverse_markdown"
+require File.expand_path(File.dirname(__FILE__) + "/base.rb")
+
+class ImportScripts::IPBoard3 < ImportScripts::Base
+
+  BATCH_SIZE  ||= 5000
+  UPLOADS_DIR ||= "/path/to/uploads"
+
+  def initialize
+    super
+
+    @client = Mysql2::Client.new(
+      host: ENV["DB_HOST"] || "localhost",
+      username: ENV["DB_USER"] || "root",
+      password: ENV["DB_PW"],
+      database: ENV["DB_NAME"],
+    )
+
+    @client.query("SET character_set_results = binary")
+  end
+
+  def execute
+    import_users
+    import_categories
+    import_topics
+    import_posts
+    close_topics
+    import_personal_topics
+    import_personal_posts
+  end
+
+  def import_users
+    puts "", "importing users..."
+
+    last_user_id = -1
+    total_users = mysql_query("SELECT COUNT(*) count FROM members").first["count"]
+
+    batches(BATCH_SIZE) do |offset|
+      users = mysql_query(<<~SQL
+        SELECT member_id id
+             , name
+             , email
+             , joined
+             , ip_address
+             , title
+             , CONCAT(bday_year, '-', bday_month, '-', bday_day) date_of_birth
+             , last_activity
+             , member_banned
+             , g_title
+             , pp_main_photo
+             , pp_about_me
+          FROM members
+     LEFT JOIN groups ON member_group_id = g_id
+     LEFT JOIN profile_portal ON member_id = pp_member_id
+         WHERE member_id > #{last_user_id}
+         ORDER BY member_id
+         LIMIT #{BATCH_SIZE}
+      SQL
+      ).to_a
+
+      break if users.empty?
+
+      last_user_id = users[-1]["id"]
+
+      create_users(users, total: total_users, offset: offset) do |u|
+        next if user_id_from_imported_user_id(u["id"])
+        %W{name email title pp_about_me}.each { |k| u[k]&.encode!("utf-8", "utf-8", invalid: :replace, undef: :replace, replace: "") }
+        next if u["name"].blank? && !Email.is_valid?(u["email"])
+
+        {
+          id: u["id"],
+          username: u["name"],
+          email: u["email"],
+          created_at: Time.zone.at(u["joined"]),
+          registration_ip_address: u["ip_address"],
+          title: CGI.unescapeHTML(u["title"].presence || ""),
+          date_of_birth: (Date.parse(u["date_of_birth"]) rescue nil),
+          last_seen_at: Time.zone.at(u["last_activity"]),
+          admin: !!(u["g_title"] =~ /admin/i),
+          moderator: !!(u["g_title"] =~ /moderator/i),
+          bio_raw: clean_up(u["pp_about_me"]),
+          post_create_action: proc do |new_user|
+            if u["member_banned"] == 1
+              new_user.update(suspended_at: DateTime.now, suspended_till: 100.years.from_now)
+            elsif u["pp_main_photo"].present?
+              path = File.join(UPLOADS_DIR, u["pp_main_photo"])
+              if File.exists?(path)
+                begin
+                  upload = create_upload(new_user.id, path, File.basename(path))
+                  if upload.persisted?
+                    new_user.create_user_avatar
+                    new_user.user_avatar.update(custom_upload_id: upload.id)
+                    new_user.update(uploaded_avatar_id: upload.id)
+                  end
+                rescue
+                  # don't care
+                end
+              end
+            end
+          end
+        }
+      end
+    end
+  end
+
+  def import_categories
+    puts "", "importing categories..."
+
+    categories = mysql_query("SELECT id, parent_id, name, description, position FROM forums ORDER BY id").to_a
+
+    parent_categories = categories.select { |c| c["parent_id"] == -1 }
+    child_categories  = categories.select { |c| c["parent_id"] != -1 }
+
+    create_categories(parent_categories) do |c|
+      next if category_id_from_imported_category_id(c["id"])
+      {
+        id: c["id"],
+        name: c["name"].encode("utf-8", "utf-8"),
+        description: clean_up(c["description"]),
+        position: c["position"],
+      }
+    end
+
+    create_categories(child_categories) do |c|
+      next if category_id_from_imported_category_id(c["id"])
+      {
+        id: c["id"],
+        parent_category_id: category_id_from_imported_category_id(c["parent_id"]),
+        name: c["name"].encode("utf-8", "utf-8"),
+        description: clean_up(c["description"]),
+        position: c["position"],
+      }
+    end
+  end
+
+  def import_topics
+    puts "", "importing topics..."
+
+    @closed_topic_ids = []
+
+    last_topic_id = -1
+    total_topics = mysql_query(<<~SQL
+      SELECT COUNT(*) count
+        FROM topics
+        JOIN posts ON tid = topic_id
+       WHERE tdelete_time = 0
+         AND pdelete_time = 0
+         AND new_topic = 1
+         AND approved = 1
+         AND queued = 0
+    SQL
+    ).first["count"]
+
+    batches(BATCH_SIZE) do |offset|
+      topics = mysql_query(<<~SQL
+        SELECT tid id
+             , title
+             , state
+             , starter_id
+             , start_date
+             , views
+             , forum_id
+             , pinned
+             , post
+          FROM topics
+          JOIN posts ON tid = topic_id
+         WHERE tdelete_time = 0
+           AND pdelete_time = 0
+           AND new_topic = 1
+           AND approved = 1
+           AND queued = 0
+           AND tid > #{last_topic_id}
+         ORDER BY tid
+         LIMIT #{BATCH_SIZE}
+      SQL
+      ).to_a
+
+      break if topics.empty?
+
+      last_topic_id = topics[-1]["id"]
+
+      create_posts(topics, total: total_topics, offset: offset) do |t|
+        @closed_topic_ids << "t-#{t["id"]}" if t["state"] != "open"
+        next if post_id_from_imported_post_id("t-#{t["id"]}")
+        created_at = Time.zone.at(t["start_date"])
+        user_id = user_id_from_imported_user_id(t["starter_id"]) || -1
+
+        {
+          id: "t-#{t["id"]}",
+          title: CGI.unescapeHTML(t["title"].encode("utf-8", "utf-8")),
+          user_id: user_id,
+          created_at: created_at,
+          views: t["views"],
+          category: category_id_from_imported_category_id(t["forum_id"]),
+          pinned_at: t["pinned"] == 1 ? created_at : nil,
+          raw: clean_up(t["post"], user_id),
+        }
+      end
+    end
+  end
+
+  def import_posts
+    puts "", "importing posts..."
+
+    last_post_id = -1
+    total_posts = mysql_query(<<~SQL
+      SELECT COUNT(*) count
+        FROM posts
+       WHERE new_topic = 0
+         AND pdelete_time = 0
+         AND queued = 0
+    SQL
+    ).first["count"]
+
+    batches(BATCH_SIZE) do |offset|
+      posts = mysql_query(<<~SQL
+        SELECT pid id
+             , author_id
+             , post_date
+             , post
+             , topic_id
+          FROM posts
+         WHERE new_topic = 0
+           AND pdelete_time = 0
+           AND queued = 0
+           AND pid > #{last_post_id}
+         ORDER BY pid
+         LIMIT #{BATCH_SIZE}
+      SQL
+      ).to_a
+
+      break if posts.empty?
+
+      last_post_id = posts[-1]["id"]
+
+      create_posts(posts, total: total_posts, offset: offset) do |p|
+        next if post_id_from_imported_post_id(p["id"])
+        next unless t = topic_lookup_from_imported_post_id("t-#{p["topic_id"]}")
+        user_id = user_id_from_imported_user_id(p["author_id"]) || -1
+
+        {
+          id: p["id"],
+          user_id: user_id,
+          created_at: Time.zone.at(p["post_date"]),
+          raw: clean_up(p["post"], user_id),
+          topic_id: t[:topic_id],
+        }
+      end
+    end
+  end
+
+  def close_topics
+    puts "", "closing #{@closed_topic_ids.size} topics..."
+
+    sql = <<~SQL
+      WITH closed_topic_ids AS (
+        SELECT t.id AS topic_id
+          FROM post_custom_fields pcf
+          JOIN posts p ON p.id = pcf.post_id
+          JOIN topics t ON t.id = p.topic_id
+         WHERE pcf.name = 'import_id'
+           AND pcf.value IN (?)
+      )
+      UPDATE topics
+         SET closed = true
+       WHERE id IN (SELECT topic_id FROM closed_topic_ids)
+    SQL
+
+    Topic.exec_sql(sql, @closed_topic_ids)
+  end
+
+  def import_personal_topics
+    puts "", "import personal topics..."
+
+    last_personal_topic_id = -1
+    total_personal_topics = mysql_query(<<~SQL
+      SELECT COUNT(*) count
+        FROM message_topics
+        JOIN message_posts ON msg_topic_id = mt_id
+       WHERE mt_is_deleted = 0
+         AND msg_is_first_post = 1
+    SQL
+    ).first["count"]
+
+    batches(BATCH_SIZE) do |offset|
+      personal_topics = mysql_query(<<~SQL
+        SELECT mt_id id
+             , mt_date
+             , mt_title
+             , mt_starter_id
+             , mt_to_member_id
+             , mt_invited_members
+             , msg_post
+          FROM message_topics
+          JOIN message_posts ON msg_topic_id = mt_id
+         WHERE mt_is_deleted = 0
+           AND msg_is_first_post = 1
+           AND mt_id > #{last_personal_topic_id}
+         ORDER BY mt_id
+         LIMIT #{BATCH_SIZE}
+      SQL
+      ).to_a
+
+      break if personal_topics.empty?
+
+      last_personal_topic_id = personal_topics[-1]["id"]
+
+      create_posts(personal_topics, total: total_personal_topics, offset: offset) do |pt|
+        next if post_id_from_imported_post_id("pt-#{pt["id"]}")
+        user_id = user_id_from_imported_user_id(pt["mt_starter_id"]) || -1
+
+        user_ids = [pt["mt_to_member_id"]] + pt["mt_invited_members"].scan(/i:(\d+);/).flatten.map(&:to_i)
+        user_ids.map! { |id| user_id_from_imported_user_id(id) }
+        user_ids.compact!
+        user_ids.uniq!
+
+        {
+          archetype: Archetype.private_message,
+          id: "pt-#{pt["id"]}",
+          created_at: Time.zone.at(pt["mt_date"]),
+          title: CGI.unescapeHTML(pt["mt_title"].encode("utf-8", "utf-8")),
+          user_id: user_id,
+          target_usernames: User.where(id: user_ids).pluck(:username),
+          raw: clean_up(pt["msg_post"], user_id),
+        }
+      end
+    end
+  end
+
+  def import_personal_posts
+    puts "", "importing personal posts..."
+
+    last_personal_post_id = -1
+    total_personal_posts = mysql_query("SELECT COUNT(*) count FROM message_posts WHERE msg_is_first_post = 0").first["count"]
+
+    batches(BATCH_SIZE) do |offset|
+      personal_posts = mysql_query(<<~SQL
+        SELECT msg_id id
+             , msg_topic_id
+             , msg_date
+             , msg_post
+             , msg_author_id
+          FROM message_posts
+         WHERE msg_is_first_post = 0
+           AND msg_id > #{last_personal_post_id}
+         ORDER BY msg_id
+         LIMIT #{BATCH_SIZE}
+      SQL
+      ).to_a
+
+      break if personal_posts.empty?
+
+      last_personal_post_id = personal_posts[-1]["id"]
+
+      create_posts(personal_posts, total: total_personal_posts, offset: offset) do |pp|
+        next if post_id_from_imported_post_id("pp-#{pp["id"]}")
+        next unless t = topic_lookup_from_imported_post_id("pt-#{pp["msg_topic_id"]}")
+        user_id = user_id_from_imported_user_id(pp["msg_author_id"]) || -1
+
+        {
+          id: "pp-#{pp["id"]}",
+          topic_id: t[:topic_id],
+          created_at: Time.zone.at(pp["msg_date"]),
+          raw: clean_up(pp["msg_post"], user_id),
+          user_id: user_id,
+        }
+      end
+    end
+  end
+
+  def clean_up(raw, user_id = -1)
+    raw.encode!("utf-8", "utf-8", invalid: :replace, undef: :replace, replace: "")
+
+    raw.gsub!(/<(.+)>&nbsp;<\/\1>/, "\n\n")
+
+    doc = Nokogiri::HTML.fragment(raw)
+
+    doc.css("blockquote.ipsBlockquote").each do |bq|
+      post_id = post_id_from_imported_post_id(bq["data-cid"])
+      if post = Post.find_by(id: post_id)
+        bq.replace %{<br>[quote="#{post.user.username},post:#{post.post_number},topic:#{post.topic_id}"]\n#{bq.inner_html}\n[/quote]<br>}
+      end
+    end
+
+    markdown = ReverseMarkdown.convert(doc.to_html)
+
+    markdown.gsub!(/\[attachment=(\d+):.+\]/) do
+      if a = mysql_query("SELECT attach_file, attach_location FROM attachments WHERE attach_id = #{$1}").first
+        path = File.join(UPLOADS_DIR, a["attach_location"])
+        if File.exists?(path)
+          begin
+            upload = create_upload(user_id, path, a["attach_file"])
+            return html_for_upload(upload, a["attach_file"]) if upload.persisted?
+          rescue
+          end
+        end
+      end
+    end
+
+    markdown
+  end
+
+  def mysql_query(sql)
+    @client.query(sql)
+  end
+
+end
+
+ImportScripts::IPBoard3.new.perform
diff --git a/script/import_scripts/lithium.rb b/script/import_scripts/lithium.rb
index b366a2a4d78..108fec921e5 100644
--- a/script/import_scripts/lithium.rb
+++ b/script/import_scripts/lithium.rb
@@ -27,13 +27,27 @@ class ImportScripts::Lithium < ImportScripts::Base
   # CHANGE THESE BEFORE RUNNING THE IMPORTER
   DATABASE = "wd"
   PASSWORD = "password"
-  CATEGORY_CSV = "/tmp/wd-cats.csv"
+  AVATAR_DIR = '/tmp/avatars'
+  ATTACHMENT_DIR = '/tmp/attachments'
   UPLOAD_DIR = '/tmp/uploads'
 
   OLD_DOMAIN = 'community.wd.com'
 
   TEMP = ""
 
+  USER_CUSTOM_FIELDS = [
+    { name: "sso_id", user: "sso_id" },
+    { name: "user_field_1", profile: "jobtitle" },
+    { name: "user_field_2", profile: "company" },
+    { name: "user_field_3", profile: "industry" },
+  ]
+
+  LITHIUM_PROFILE_FIELDS = "'profile.jobtitle', 'profile.company', 'profile.industry', 'profile.location'"
+
+  USERNAME_MAPPINGS = {
+    "admins": "admin_user"
+  }.with_indifferent_access
+
   def initialize
     super
 
@@ -53,6 +67,7 @@ class ImportScripts::Lithium < ImportScripts::Base
 
     @max_start_id = Post.maximum(:id)
 
+    import_groups
     import_categories
     import_users
     import_topics
@@ -70,15 +85,15 @@ class ImportScripts::Lithium < ImportScripts::Base
     puts "", "importing groups..."
 
     groups = mysql_query <<-SQL
-        SELECT usergroupid, title
-          FROM usergroup
-      ORDER BY usergroupid
+        SELECT DISTINCT name
+          FROM roles
+      ORDER BY name
     SQL
 
     create_groups(groups) do |group|
       {
-        id: group["usergroupid"],
-        name: @htmlentities.decode(group["title"]).strip
+        id: group["name"],
+        name: @htmlentities.decode(group["name"]).strip
       }
     end
   end
@@ -87,10 +102,11 @@ class ImportScripts::Lithium < ImportScripts::Base
     puts "", "importing users"
 
     user_count = mysql_query("SELECT COUNT(*) count FROM users").first["count"]
+    avatar_files = Dir.entries(AVATAR_DIR)
 
     batches(BATCH_SIZE) do |offset|
       users = mysql_query <<-SQL
-          SELECT id, nlogin, login_canon, email, registration_time
+          SELECT id, nlogin, login_canon, email, registration_time, sso_id
             FROM users
         ORDER BY id
            LIMIT #{BATCH_SIZE}
@@ -101,25 +117,87 @@ class ImportScripts::Lithium < ImportScripts::Base
 
       next if all_records_exist? :users, users.map { |u| u["id"].to_i }
 
+      users = users.to_a
+      first_id = users.first["id"]
+      last_id = users.last["id"]
+
+      profiles = mysql_query <<-SQL
+          SELECT user_id, param, nvalue
+            FROM user_profile
+          WHERE nvalue IS NOT NULL AND param IN (#{LITHIUM_PROFILE_FIELDS}) AND user_id >= #{first_id} AND user_id <= #{last_id}
+        ORDER BY user_id
+      SQL
+
       create_users(users, total: user_count, offset: offset) do |user|
+        profile = profiles.select { |p|  p["user_id"] == user["id"] }
+        result = profile.select { |p|  p["param"] == "profile.location" }
+        location = result.count > 0 ? result.first["nvalue"] : nil
+        username = user["login_canon"]
+        username = USERNAME_MAPPINGS[username] if USERNAME_MAPPINGS[username].present?
 
         {
           id: user["id"],
           name: user["nlogin"],
-          username: user["login-canon"],
+          username: username,
           email: user["email"].presence || fake_email,
+          location: location,
+          custom_fields: user_custom_fields(user, profile),
           # website: user["homepage"].strip,
           # title: @htmlentities.decode(user["usertitle"]).strip,
           # primary_group_id: group_id_from_imported_group_id(user["usergroupid"]),
           created_at: unix_time(user["registration_time"]),
           post_create_action: proc do |u|
-            @old_username_to_new_usernames[user["username"]] = u.username
+            @old_username_to_new_usernames[user["login_canon"]] = u.username
+
+            # import user avatar
+            sso_id = u.custom_fields["sso_id"]
+            if sso_id.present?
+              prefix = "#{AVATAR_DIR}/#{sso_id}_"
+              file = get_file(prefix + "actual.jpeg")
+              file ||= get_file(prefix + "profile.jpeg")
+
+              if file.present?
+                upload = UploadCreator.new(file, file.path, type: "avatar").create_for(u.id)
+                u.create_user_avatar unless u.user_avatar
+
+                if !u.user_avatar.contains_upload?(upload.id)
+                  u.user_avatar.update_columns(custom_upload_id: upload.id)
+
+                  if u.uploaded_avatar_id.nil? ||
+                    !u.user_avatar.contains_upload?(u.uploaded_avatar_id)
+                    u.update_columns(uploaded_avatar_id: upload.id)
+                  end
+                end
+              end
+            end
           end
         }
       end
     end
   end
 
+  def user_custom_fields(user, profile)
+    fields = Hash.new
+
+    USER_CUSTOM_FIELDS.each do |attr|
+      name = attr[:name]
+
+      if attr[:user].present?
+        fields[name] = user[attr[:user]]
+      elsif attr[:profile].present? && profile.count > 0
+        result = profile.select { |p|  p["param"] == "profile.#{attr[:profile]}" }
+        fields[name] = result.first["nvalue"] if result.count > 0
+      end
+    end
+
+    fields
+  end
+
+  def get_file(path)
+    return File.open(path) if File.exist?(path)
+    nil
+  end
+
   def unix_time(t)
     Time.at(t / 1000.0)
   end
@@ -183,89 +261,99 @@ class ImportScripts::Lithium < ImportScripts::Base
   def import_categories
     puts "", "importing top level categories..."
 
-    categories = mysql_query("SELECT node_id, display_id, position, parent_node_id from nodes").to_a
+    categories = mysql_query <<-SQL
+        SELECT n.node_id, n.display_id, c.nvalue c_title, b.nvalue b_title, n.position, n.parent_node_id, n.type_id
+          FROM nodes n
+          LEFT JOIN settings c ON n.node_id = c.node_id AND c.param = 'category.title'
+          LEFT JOIN settings b ON n.node_id = b.node_id AND b.param = 'board.title'
+          ORDER BY n.type_id DESC, n.node_id ASC
+    SQL
 
-    category_info = {}
-    top_level_ids = Set.new
-    child_ids = Set.new
-
-    parent = nil
-    CSV.foreach(CATEGORY_CSV) do |row|
-      display_id = row[2].strip
-
-      node = {
-        name: (row[0] || row[1]).strip,
-        secure: row[3] == "x",
-        top_level: !!row[0]
-      }
-
-      if row[0]
-        top_level_ids << display_id
-        parent = node
-      else
-        child_ids << display_id
-        node[:parent] = parent
-      end
-
-      category_info[display_id] = node
+    categories = categories.map { |c| (c["name"] = c["c_title"] || c["b_title"] || c["display_id"]) && c }
 
+    # To prevent duplicate category names
+    categories = categories.map do |category|
+      count = categories.to_a.count { |c| c["name"].present? && c["name"] == category["name"] }
+      category["name"] << " (#{category["node_id"]})" if count > 1
+      category
     end
 
-    top_level_categories = categories.select { |c| top_level_ids.include? c["display_id"] }
-
-    create_categories(top_level_categories) do |category|
-      info = category_info[category["display_id"]]
-      info[:id] = category["node_id"]
+    parent_categories = categories.select { |c| c["parent_node_id"] <= 2 }
 
+    create_categories(parent_categories) do |category|
       {
-        id: info[:id],
-        name:  info[:name],
-        position: category["position"]
+        id: category["node_id"],
+        name:  category["name"],
+        position: category["position"],
+        post_create_action: lambda do |record|
+          after_category_create(record, category)
+        end
       }
     end
 
     puts "", "importing children categories..."
 
-    children_categories = categories.select { |c| child_ids.include? c["display_id"] }
+    children_categories = categories.select { |c| c["parent_node_id"] > 2 }
 
     create_categories(children_categories) do |category|
-      info = category_info[category["display_id"]]
-      info[:id] = category["node_id"]
-
       {
-        id: info[:id],
-        name: info[:name],
+        id: category["node_id"],
+        name: category["name"],
         position: category["position"],
-        parent_category_id: category_id_from_imported_category_id(info[:parent][:id])
+        parent_category_id: category_id_from_imported_category_id(category["parent_node_id"]),
+        post_create_action: lambda do |record|
+          after_category_create(record, category)
+        end
       }
     end
+  end
 
-    puts "", "securing categories"
-    category_info.each do |_, info|
-      if info[:secure]
-        id = category_id_from_imported_category_id(info[:id])
-        if id
-          cat = Category.find(id)
-          cat.set_permissions({})
-          cat.save
-          putc "."
+  def after_category_create(category, params)
+    node_id = category.custom_fields["import_id"]
+    roles = mysql_query <<-SQL
+      SELECT name
+        FROM roles
+      WHERE node_id = #{node_id}
+    SQL
+
+    if roles.count > 0
+      category.update(read_restricted: true)
+
+      roles.each do |role|
+        group_id = group_id_from_imported_group_id(role["name"])
+        if group_id.present?
+          CategoryGroup.find_or_create_by(category: category, group_id: group_id) do |cg|
+            cg.permission_type = CategoryGroup.permission_types[:full]
+          end
+        else
+          puts "", "Group not found for id '#{role["name"]}'"
         end
       end
     end
 
   end
 
+  def staff_guardian
+    @_staff_guardian ||= Guardian.new(Discourse.system_user)
+  end
+
   def import_topics
     puts "", "importing topics..."
+    SiteSetting.tagging_enabled = true
+    default_max_tags_per_topic = SiteSetting.max_tags_per_topic
+    default_max_tag_length = SiteSetting.max_tag_length
+    SiteSetting.max_tags_per_topic = 10
+    SiteSetting.max_tag_length = 100
 
     topic_count = mysql_query("SELECT COUNT(*) count FROM message2 where id = root_id").first["count"]
+    topic_tags = mysql_query("SELECT e.target_id, GROUP_CONCAT(l.tag_text SEPARATOR ',') tags FROM tag_events_label_message e LEFT JOIN tags_label l ON e.tag_id = l.tag_id GROUP BY e.target_id")
 
     batches(BATCH_SIZE) do |offset|
       topics = mysql_query <<-SQL
           SELECT id, subject, body, deleted, user_id,
-                 post_date, views, node_id, unique_id
+                 post_date, views, node_id, unique_id, row_version
             FROM message2
-        WHERE id = root_id #{TEMP} AND deleted = 0
+        WHERE id = root_id #{TEMP}
         ORDER BY node_id, id
            LIMIT #{BATCH_SIZE}
           OFFSET #{offset}
@@ -278,10 +366,10 @@ class ImportScripts::Lithium < ImportScripts::Base
       create_posts(topics, total: topic_count, offset: offset) do |topic|
 
         category_id = category_id_from_imported_category_id(topic["node_id"])
-
+        deleted_at = topic["deleted"] == 1 ? topic["row_version"] : nil
         raw = topic["body"]
 
-        if category_id
+        if category_id.present? && raw.present?
           {
             id: "#{topic["node_id"]} #{topic["id"]}",
             user_id: user_id_from_imported_user_id(topic["user_id"]) || Discourse::SYSTEM_USER_ID,
@@ -289,16 +377,31 @@ class ImportScripts::Lithium < ImportScripts::Base
             category: category_id,
             raw: raw,
             created_at: unix_time(topic["post_date"]),
+            deleted_at: deleted_at,
             views: topic["views"],
             custom_fields: { import_unique_id: topic["unique_id"] },
-            import_mode: true
+            import_mode: true,
+            post_create_action: proc do |post|
+              result = topic_tags.select { |t| t["target_id"] == topic["unique_id"] }
+              if result.count > 0
+                tag_names = result.first["tags"].split(",")
+                DiscourseTagging.tag_topic_by_names(post.topic, staff_guardian, tag_names)
+              end
+            end
           }
         else
+          message = "Unknown"
+          message = "Category '#{category_id}' not exist" if category_id.blank?
+          message = "Topic 'body' is empty" if raw.blank?
+          PluginStoreRow.find_or_create_by(plugin_name: "topic_import_log", key: topic["unique_id"].to_s, value: message, type_name: 'String')
           nil
         end
 
       end
     end
+
+    SiteSetting.max_tags_per_topic = default_max_tags_per_topic
+    SiteSetting.max_tag_length = default_max_tag_length
   end
 
   def import_posts
@@ -311,9 +414,9 @@ class ImportScripts::Lithium < ImportScripts::Base
     batches(BATCH_SIZE) do |offset|
       posts = mysql_query <<-SQL
           SELECT id, body, deleted, user_id,
-                 post_date, parent_id, root_id, node_id, unique_id
+                 post_date, parent_id, root_id, node_id, unique_id, row_version
             FROM message2
-        WHERE id <> root_id #{TEMP} AND deleted = 0
+        WHERE id <> root_id #{TEMP}
         ORDER BY node_id, root_id, id
            LIMIT #{BATCH_SIZE}
           OFFSET #{offset}
@@ -327,27 +430,30 @@ class ImportScripts::Lithium < ImportScripts::Base
         raw = post["raw"]
         next unless topic = topic_lookup_from_imported_post_id("#{post["node_id"]} #{post["root_id"]}")
 
+        deleted_at = topic["deleted"] == 1 ? topic["row_version"] : nil
         raw = post["body"]
 
-        new_post = {
-          id: "#{post["node_id"]} #{post["root_id"]} #{post["id"]}",
-          user_id: user_id_from_imported_user_id(post["user_id"]) || Discourse::SYSTEM_USER_ID,
-          topic_id: topic[:topic_id],
-          raw: raw,
-          created_at: unix_time(post["post_date"]),
-          custom_fields: { import_unique_id: post["unique_id"] },
-          import_mode: true
-        }
+        if raw.present?
+          new_post = {
+            id: "#{post["node_id"]} #{post["root_id"]} #{post["id"]}",
+            user_id: user_id_from_imported_user_id(post["user_id"]) || Discourse::SYSTEM_USER_ID,
+            topic_id: topic[:topic_id],
+            raw: raw,
+            created_at: unix_time(post["post_date"]),
+            deleted_at: deleted_at,
+            custom_fields: { import_unique_id: post["unique_id"] },
+            import_mode: true
+          }
 
-        if post["deleted"] > 0
-          new_post["deleted_at"] = Time.now
+          if parent = topic_lookup_from_imported_post_id("#{post["node_id"]} #{post["root_id"]} #{post["parent_id"]}")
+            new_post[:reply_to_post_number] = parent[:post_number]
+          end
+
+          new_post
+        else
+          PluginStoreRow.find_or_create_by(plugin_name: "post_import_log", key: post["unique_id"].to_s, value: "Post 'body' is empty", type_name: 'String')
+          nil
         end
-
-        if parent = topic_lookup_from_imported_post_id("#{post["node_id"]} #{post["root_id"]} #{post["parent_id"]}")
-          new_post[:reply_to_post_number] = parent[:post_number]
-        end
-
-        new_post
       end
     end
   end
@@ -380,7 +486,7 @@ class ImportScripts::Lithium < ImportScripts::Base
   def import_likes
     puts "\nimporting likes..."
 
-    sql = "select source_id user_id, target_id post_id, row_version created_at from wd.tag_events_score_message"
+    sql = "select source_id user_id, target_id post_id, row_version created_at from tag_events_score_message"
     results = mysql_query(sql)
 
     puts "loading unique id map"
@@ -610,23 +716,28 @@ class ImportScripts::Lithium < ImportScripts::Base
 
         raw = topic["body"]
 
-        msg = {
-          id: "pm_#{topic["note_id"]}",
-          user_id: user_id,
-          raw: raw,
-          created_at: unix_time(topic["sent_time"]),
-          import_mode: true
-        }
+        if raw.present?
+          msg = {
+            id: "pm_#{topic["note_id"]}",
+            user_id: user_id,
+            raw: raw,
+            created_at: unix_time(topic["sent_time"]),
+            import_mode: true
+          }
 
-        unless topic_id
-          msg[:title] = @htmlentities.decode(topic["subject"]).strip[0...255]
-          msg[:archetype] = Archetype.private_message
-          msg[:target_usernames] = usernames.join(',')
+          unless topic_id
+            msg[:title] = @htmlentities.decode(topic["subject"]).strip[0...255]
+            msg[:archetype] = Archetype.private_message
+            msg[:target_usernames] = usernames.join(',')
+          else
+            msg[:topic_id] = topic_id
+          end
+
+          msg
         else
-          msg[:topic_id] = topic_id
+          PluginStoreRow.find_or_create_by(plugin_name: "pm_import_log", key: topic["note_id"].to_s, value: "PM 'body' is empty", type_name: 'String')
+          nil
         end
-
-        msg
       end
     end
 
@@ -686,27 +797,15 @@ SQL
 
   end
 
-  # find the uploaded file information from the db
-  def find_upload(post, attachment_id)
-    sql = "SELECT a.attachmentid attachment_id, a.userid user_id, a.filedataid file_id, a.filename filename,
-                  a.caption caption
-             FROM attachment a
-            WHERE a.attachmentid = #{attachment_id}"
-    results = mysql_query(sql)
+  def find_upload(user_id, attachment_id, real_filename)
+    filename = File.join(ATTACHMENT_DIR, "#{attachment_id.to_s.rjust(4, "0")}.dat")
 
-    unless (row = results.first)
-      puts "Couldn't find attachment record for post.id = #{post.id}, import_id = #{post.custom_fields['import_id']}"
-      return nil
-    end
-
-    filename = File.join(ATTACHMENT_DIR, row['user_id'].to_s.split('').join('/'), "#{row['file_id']}.attach")
     unless File.exists?(filename)
       puts "Attachment file doesn't exist: #{filename}"
       return nil
     end
-    real_filename = row['filename']
     real_filename.prepend SecureRandom.hex if real_filename[0] == '.'
-    upload = create_upload(post.user.id, filename, real_filename)
+    upload = create_upload(user_id, filename, real_filename)
 
     if upload.nil? || !upload.valid?
       puts "Upload not valid :("
@@ -715,20 +814,21 @@ SQL
     end
 
     return upload, real_filename
-  rescue Mysql2::Error => e
-    puts "SQL Error"
-    puts e.message
-    puts sql
-    return nil
   end
 
   def post_process_posts
     puts "", "Postprocessing posts..."
 
+    default_extensions = SiteSetting.authorized_extensions
+    default_max_att_size = SiteSetting.max_attachment_size_kb
+    SiteSetting.authorized_extensions = "*"
+    SiteSetting.max_attachment_size_kb = 307200
+
     current = 0
     max = Post.count
 
     mysql_query("create index idxUniqueId on message2(unique_id)") rescue nil
+    attachments = mysql_query("SELECT a.attachment_id, a.file_name, m.message_uid FROM tblia_attachment a INNER JOIN tblia_message_attachments m ON a.attachment_id = m.attachment_id")
 
     Post.where('id > ?', @max_start_id).find_each do |post|
       begin
@@ -740,8 +840,16 @@ SQL
           next
         end
         new_raw = postprocess_post_raw(raw, post.user_id)
-        post.raw = new_raw
-        post.save
+        files = attachments.select { |a| a["message_uid"].to_s == id }
+        new_raw << html_for_attachments(post.user_id, files)
+        unless post.raw == new_raw
+          post.raw = new_raw
+          post.cooked = post.cook(new_raw)
+          cpp = CookedPostProcessor.new(post)
+          cpp.keep_reverse_index_up_to_date
+          post.custom_fields["import_post_process"] = true
+          post.save
+        end
       rescue PrettyText::JavaScriptError
         puts "GOT A JS error on post: #{post.id}"
         nil
@@ -749,60 +857,108 @@ SQL
         print_status(current += 1, max)
       end
     end
+
+    SiteSetting.authorized_extensions = default_extensions
+    SiteSetting.max_attachment_size_kb = default_max_att_size
   end
 
   def postprocess_post_raw(raw, user_id)
 
     doc = Nokogiri::HTML.fragment(raw)
 
-    doc.css("a,img").each do |l|
-      uri = URI.parse(l["href"] || l["src"]) rescue nil
-      if uri && uri.hostname == OLD_DOMAIN
-        uri.hostname = nil
+    doc.css("a,img,li-image").each do |l|
+      upload_name, image, linked_upload = [nil] * 3
+
+      if l.name == "li-image" && l["id"]
+        upload_name = l["id"]
+      else
+        uri = URI.parse(l["href"] || l["src"]) rescue nil
+        uri.hostname = nil if uri && uri.hostname == OLD_DOMAIN
+
+        if uri && !uri.hostname
+          if l["href"]
+            l["href"] = uri.path
+            # we have an internal link, lets see if we can remap it?
+            permalink = Permalink.find_by_url(uri.path) rescue nil
+
+            if l["href"]
+              if permalink && permalink.target_url
+                l["href"] = permalink.target_url
+              elsif l["href"] =~ /^\/gartner\/attachments\/gartner\/([^.]*).(\w*)/
+                linked_upload = "#{$1}.#{$2}"
+              end
+            end
+          elsif l["src"]
+
+            # we need an upload here
+            upload_name = $1 if uri.path =~ /image-id\/([^\/]+)/
+          end
+        end
       end
 
-      if uri && !uri.hostname
-        if l["href"]
-          l["href"] = uri.path
-          # we have an internal link, lets see if we can remap it?
-          permalink = Permalink.find_by_url(uri.path) rescue nil
-          if l["href"] && permalink && permalink.target_url
-            l["href"] = permalink.target_url
-          end
-        elsif l["src"]
-
-          # we need an upload here
-          upload_name = $1 if uri.path =~ /image-id\/([^\/]+)/
-          if upload_name
-            png = UPLOAD_DIR + "/" + upload_name + ".png"
-            jpg = UPLOAD_DIR + "/" + upload_name + ".jpg"
-            gif = UPLOAD_DIR + "/" + upload_name + ".gif"
-
-            # check to see if we have it
-            if File.exist?(png)
-              image = png
-            elsif File.exists?(jpg)
-              image = jpg
-            elsif File.exists?(gif)
-              image = gif
-            end
-          end
-
-          if image
-            File.open(image) do |file|
-              upload = UploadCreator.new(file, "image." + (image.ends_with?(".png") ? "png" : "jpg")).create_for(user_id)
-              l["src"] = upload.url
-            end
-          else
-            puts "image was missing #{l["src"]}"
-          end
+      if upload_name
+        png = UPLOAD_DIR + "/" + upload_name + ".png"
+        jpg = UPLOAD_DIR + "/" + upload_name + ".jpg"
+        gif = UPLOAD_DIR + "/" + upload_name + ".gif"
 
+        # check to see if we have it
+        if File.exist?(png)
+          image = png
+        elsif File.exists?(jpg)
+          image = jpg
+        elsif File.exists?(gif)
+          image = gif
         end
 
+        if image
+          File.open(image) do |file|
+            upload = UploadCreator.new(file, "image." + (image.ends_with?(".png") ? "png" : "jpg")).create_for(user_id)
+            l.name = "img" if l.name == "li-image"
+            l["src"] = upload.url
+          end
+        else
+          puts "image was missing #{l["src"]}"
+        end
+      elsif linked_upload
+        segments = linked_upload.match(/\/(\d*)\/(\d)\/([^.]*).(\w*)$/)
+
+        if segments.present?
+          lithium_post_id = segments[1]
+          attachment_number = segments[2]
+
+          result = mysql_query("select a.attachment_id, f.file_name from tblia_message_attachments a
+            INNER JOIN message2 m ON a.message_uid = m.unique_id
+            INNER JOIN tblia_attachment f ON a.attachment_id = f.attachment_id
+            where m.id = #{lithium_post_id} AND a.attach_num = #{attachment_number} limit 0, 1")
+
+          result.each do |row|
+            upload, filename = find_upload(user_id, row["attachment_id"], row["file_name"])
+            if upload.present?
+              l["href"] = upload.url
+            else
+              puts "attachment was missing #{l["href"]}"
+            end
+          end
+        end
       end
 
     end
 
+    # for user mentions
+    doc.css("li-user").each do |l|
+      uid = l["uid"]
+
+      if uid.present?
+        user = UserCustomField.find_by(name: 'import_id', value: uid).try(:user)
+        if user.present?
+          username = user.username
+          span = doc.create_element "span"
+          span.inner_html = "@#{username}"
+          l.replace span
+        end
+      end
+    end
+
     raw = ReverseMarkdown.convert(doc.to_s)
     raw.gsub!(/^\s*&nbsp;\s*$/, "")
     # ugly quotes
@@ -815,6 +971,20 @@ SQL
     raw
   end
 
+  def html_for_attachments(user_id, files)
+    html = "";
+
+    files.each do |file|
+      upload, filename = find_upload(user_id, file["attachment_id"], file["file_name"])
+      if upload.present?
+        html << "\n" if html.present?
+        html << html_for_upload(upload, filename)
+      end
+    end
+
+    html
+  end
+
   def fake_email
     SecureRandom.hex << "@domain.com"
   end
diff --git a/script/import_scripts/mbox/importer.rb b/script/import_scripts/mbox/importer.rb
index dbdd7c1651d..4615f105247 100644
--- a/script/import_scripts/mbox/importer.rb
+++ b/script/import_scripts/mbox/importer.rb
@@ -24,9 +24,14 @@ module ImportScripts::Mbox
 
     def execute
       index_messages
-      import_categories
-      import_users
-      import_posts
+
+      if @settings.index_only
+        @skip_updates = true
+      else
+        import_categories
+        import_users
+        import_posts
+      end
     end
 
     def index_messages
@@ -64,8 +69,8 @@ module ImportScripts::Mbox
             email: row['email'],
             name: row['name'],
             trust_level: @settings.trust_level,
-            staged: true,
-            active: false,
+            staged: @settings.staged,
+            active: !@settings.staged,
             created_at: to_time(row['date_of_first_message'])
           }
         end
diff --git a/script/import_scripts/mbox/settings.yml b/script/import_scripts/mbox/settings.yml
index a8db4453fd7..a4b449a3d6f 100644
--- a/script/import_scripts/mbox/settings.yml
+++ b/script/import_scripts/mbox/settings.yml
@@ -1,10 +1,18 @@
-# PostgreSQL mailing lists
-#data_dir: /shared/import/data
-#split_regex: "^From .*@postgresql.org.*"
-
-# ruby-talk mailing list
 data_dir: /shared/import/data
-split_regex: ""
+
+# mbox files
+split_regex: "^From .+"
+#split_regex: "^From .+@example.com.+"
+
+# individual emails
+#split_regex: ""
+
+# Listserv files
+#split_regex: "^========================================================================="
 
 default_trust_level: 1
 prefer_html: false
+staged: true
+index_only: false
+
+group_messages_by_subject: false
diff --git a/script/import_scripts/mbox/support/database.rb b/script/import_scripts/mbox/support/database.rb
index 2a20960c25b..6121e23a5e8 100644
--- a/script/import_scripts/mbox/support/database.rb
+++ b/script/import_scripts/mbox/support/database.rb
@@ -2,7 +2,7 @@ require 'sqlite3'
 
 module ImportScripts::Mbox
   class Database
-    SCHEMA_VERSION = 1
+    SCHEMA_VERSION = 2
 
     def initialize(directory, batch_size)
       @db = SQLite3::Database.new("#{directory}/index.db", results_as_hash: true)
@@ -17,6 +17,15 @@ module ImportScripts::Mbox
       create_table_for_users
     end
 
+    def transaction
+      @db.transaction
+      yield self
+      @db.commit
+
+    rescue
+      @db.rollback
+    end
+
     def insert_category(category)
       @db.execute(<<-SQL, category)
         INSERT OR REPLACE INTO category (name, description)
@@ -35,10 +44,10 @@ module ImportScripts::Mbox
       @db.execute(<<-SQL, email)
         INSERT OR REPLACE INTO email (msg_id, from_email, from_name, subject,
           email_date, raw_message, body, elided, format, attachment_count, charset,
-          category, filename, first_line_number, last_line_number)
+          category, filename, first_line_number, last_line_number, index_duration)
         VALUES (:msg_id, :from_email, :from_name, :subject,
           :email_date, :raw_message, :body, :elided, :format, :attachment_count, :charset,
-          :category, :filename, :first_line_number, :last_line_number)
+          :category, :filename, :first_line_number, :last_line_number, :index_duration)
       SQL
     end
 
@@ -69,7 +78,21 @@ module ImportScripts::Mbox
       SQL
     end
 
-    def sort_emails
+    def update_in_reply_to_by_email_subject
+      @db.execute <<-SQL
+        UPDATE email
+        SET in_reply_to = NULLIF((
+          SELECT e.msg_id
+          FROM email e
+            JOIN email_order o ON (e.msg_id = o.msg_id)
+          WHERE e.subject = email.subject
+          ORDER BY o.ROWID
+          LIMIT 1
+        ), msg_id)
+      SQL
+    end
+
+    def sort_emails_by_date_and_reply_level
       @db.execute 'DELETE FROM email_order'
 
       @db.execute <<-SQL
@@ -90,6 +113,17 @@ module ImportScripts::Mbox
       SQL
     end
 
+    def sort_emails_by_subject
+      @db.execute 'DELETE FROM email_order'
+
+      @db.execute <<-SQL
+        INSERT INTO email_order (msg_id)
+        SELECT msg_id
+        FROM email
+        ORDER BY subject, filename, ROWID
+      SQL
+    end
+
     def fill_users_from_emails
       @db.execute 'DELETE FROM user'
 
@@ -97,7 +131,7 @@ module ImportScripts::Mbox
         INSERT INTO user (email, name, date_of_first_message)
         SELECT from_email, MIN(from_name) AS from_name, MIN(email_date)
         FROM email
-        WHERE from_email IS NOT NULL
+        WHERE from_email IS NOT NULL AND email_date IS NOT NULL
         GROUP BY from_email
         ORDER BY from_email
       SQL
@@ -164,10 +198,17 @@ module ImportScripts::Mbox
 
     def configure_database
       @db.execute 'PRAGMA journal_mode = OFF'
+      @db.execute 'PRAGMA locking_mode = EXCLUSIVE'
     end
 
     def upgrade_schema_version
-      # current_version = query("PRAGMA user_version").last[0]
+      current_version = @db.get_first_value("PRAGMA user_version")
+
+      case current_version
+      when 1
+        @db.execute "ALTER TABLE email ADD COLUMN index_duration REAL"
+      end
+
       @db.execute "PRAGMA user_version = #{SCHEMA_VERSION}"
     end
 
@@ -211,11 +252,13 @@ module ImportScripts::Mbox
           filename TEXT NOT NULL,
           first_line_number INTEGER,
           last_line_number INTEGER,
+          index_duration REAL,
           FOREIGN KEY(category) REFERENCES category(name)
         )
       SQL
 
       @db.execute 'CREATE INDEX IF NOT EXISTS email_by_from ON email (from_email)'
+      @db.execute 'CREATE INDEX IF NOT EXISTS email_by_subject ON email (subject)'
       @db.execute 'CREATE INDEX IF NOT EXISTS email_by_in_reply_to ON email (in_reply_to)'
       @db.execute 'CREATE INDEX IF NOT EXISTS email_by_date ON email (email_date)'
 
diff --git a/script/import_scripts/mbox/support/indexer.rb b/script/import_scripts/mbox/support/indexer.rb
index 251975f07da..dfaf74f68f7 100644
--- a/script/import_scripts/mbox/support/indexer.rb
+++ b/script/import_scripts/mbox/support/indexer.rb
@@ -8,12 +8,12 @@ module ImportScripts::Mbox
     # @param settings [ImportScripts::Mbox::Settings]
     def initialize(database, settings)
       @database = database
-      @root_directory = settings.data_dir
+      @settings = settings
       @split_regex = settings.split_regex
     end
 
     def execute
-      directories = Dir.glob(File.join(@root_directory, '*'))
+      directories = Dir.glob(File.join(@settings.data_dir, '*'))
       directories.select! { |f| File.directory?(f) }
       directories.sort!
 
@@ -24,14 +24,21 @@ module ImportScripts::Mbox
       end
 
       puts '', 'indexing replies and users'
-      @database.update_in_reply_to_of_emails
-      @database.sort_emails
+      if @settings.group_messages_by_subject
+        @database.sort_emails_by_subject
+        @database.update_in_reply_to_by_email_subject
+      else
+        @database.update_in_reply_to_of_emails
+        @database.sort_emails_by_date_and_reply_level
+      end
+
       @database.fill_users_from_emails
     end
 
     private
 
     METADATA_FILENAME = 'metadata.yml'.freeze
+    IGNORED_FILE_EXTENSIONS = ['.dbindex', '.dbnames', '.digest', '.subjects']
 
     def index_category(directory)
       metadata_file = File.join(directory, METADATA_FILENAME)
@@ -54,40 +61,55 @@ module ImportScripts::Mbox
     end
 
     def index_emails(directory, category_name)
-      all_messages(directory, category_name) do |receiver, filename, first_line_number, last_line_number|
-        msg_id = receiver.message_id
-        parsed_email = receiver.mail
-        from_email, from_display_name = receiver.parse_from_field(parsed_email)
-        body, elided, format = receiver.select_body
-        reply_message_ids = extract_reply_message_ids(parsed_email)
+      all_messages(directory, category_name) do |receiver, filename, opts|
+        begin
+          msg_id = receiver.message_id
+          parsed_email = receiver.mail
+          from_email, from_display_name = receiver.parse_from_field(parsed_email)
+          body, elided, format = receiver.select_body
+          reply_message_ids = extract_reply_message_ids(parsed_email)
 
-        email = {
-          msg_id: msg_id,
-          from_email: from_email,
-          from_name: from_display_name,
-          subject: extract_subject(receiver, category_name),
-          email_date: parsed_email.date&.to_s,
-          raw_message: receiver.raw_email,
-          body: body,
-          elided: elided,
-          format: format,
-          attachment_count: receiver.attachments.count,
-          charset: parsed_email.charset&.downcase,
-          category: category_name,
-          filename: File.basename(filename),
-          first_line_number: first_line_number,
-          last_line_number: last_line_number
-        }
+          email = {
+            msg_id: msg_id,
+            from_email: from_email,
+            from_name: from_display_name,
+            subject: extract_subject(receiver, category_name),
+            email_date: parsed_email.date&.to_s,
+            raw_message: receiver.raw_email,
+            body: body,
+            elided: elided,
+            format: format,
+            attachment_count: receiver.attachments.count,
+            charset: parsed_email.charset&.downcase,
+            category: category_name,
+            filename: File.basename(filename),
+            first_line_number: opts[:first_line_number],
+            last_line_number: opts[:last_line_number],
+            index_duration: (monotonic_time - opts[:start_time]).round(4)
+          }
 
-        @database.insert_email(email)
-        @database.insert_replies(msg_id, reply_message_ids) unless reply_message_ids.empty?
+          @database.transaction do |db|
+            db.insert_email(email)
+            db.insert_replies(msg_id, reply_message_ids) unless reply_message_ids.empty?
+          end
+        rescue StandardError => e
+          if opts[:first_line_number] && opts[:last_line_number]
+            STDERR.puts "Failed to index message in #{filename} at lines #{opts[:first_line_number]}-#{opts[:last_line_number]}"
+          else
+            STDERR.puts "Failed to index message in #{filename}"
+          end
+
+          STDERR.puts e.message
+          STDERR.puts e.backtrace.inspect
+        end
       end
     end
 
     def imported_file_checksums(category_name)
       rows = @database.fetch_imported_files(category_name)
       rows.each_with_object({}) do |row, hash|
-        hash[row['filename']] = row['checksum']
+        filename = File.basename(row['filename'])
+        hash[filename] = row['checksum']
       end
     end
 
@@ -102,12 +124,18 @@ module ImportScripts::Mbox
 
         if @split_regex.present?
           each_mail(filename) do |raw_message, first_line_number, last_line_number|
+            opts = {
+              first_line_number: first_line_number,
+              last_line_number: last_line_number,
+              start_time: monotonic_time
+            }
             receiver = read_mail_from_string(raw_message)
-            yield receiver, filename, first_line_number, last_line_number if receiver.present?
+            yield receiver, filename, opts if receiver.present?
           end
         else
+          opts = { start_time: monotonic_time }
           receiver = read_mail_from_file(filename)
-          yield receiver, filename if receiver.present?
+          yield receiver, filename, opts if receiver.present?
         end
 
         mark_as_fully_indexed(category_name, filename)
@@ -117,7 +145,7 @@ module ImportScripts::Mbox
     def mark_as_fully_indexed(category_name, filename)
       imported_file = {
         category: category_name,
-        filename: filename,
+        filename: File.basename(filename),
         checksum: calc_checksum(filename)
       }
 
@@ -132,10 +160,12 @@ module ImportScripts::Mbox
       each_line(filename) do |line|
         line = line.scrub
 
-        if line =~ @split_regex && last_line_number.positive?
-          yield raw_message, first_line_number, last_line_number
-          raw_message = ''
-          first_line_number = last_line_number + 1
+        if line =~ @split_regex
+          if last_line_number > 0
+            yield raw_message, first_line_number, last_line_number
+            raw_message = ''
+            first_line_number = last_line_number + 1
+          end
         else
           raw_message << line
         end
@@ -163,15 +193,11 @@ module ImportScripts::Mbox
     end
 
     def read_mail_from_string(raw_message)
-      Email::Receiver.new(raw_message, convert_plaintext: true) unless raw_message.blank?
+      Email::Receiver.new(raw_message, convert_plaintext: true, skip_trimming: false) unless raw_message.blank?
     end
 
     def extract_reply_message_ids(mail)
-      message_ids = [mail.in_reply_to, Email::Receiver.extract_references(mail.references)]
-      message_ids.flatten!
-      message_ids.select!(&:present?)
-      message_ids.uniq!
-      message_ids.first(20)
+      Email::Receiver.extract_reply_message_ids(mail, max_message_id_count: 20)
     end
 
     def extract_subject(receiver, list_name)
@@ -180,7 +206,7 @@ module ImportScripts::Mbox
 
       # TODO: make the list name (or maybe multiple names) configurable
       # Strip mailing list name from subject
-      subject = subject.gsub(/\[#{Regexp.escape(list_name)}\]/, '').strip
+      subject = subject.gsub(/\[#{Regexp.escape(list_name)}\]/i, '').strip
 
       clean_subject(subject)
     end
@@ -209,26 +235,26 @@ module ImportScripts::Mbox
       end
     end
 
-    def ignored_file?(filename, checksums)
-      File.directory?(filename) || hidden_file?(filename) ||
-        metadata_file?(filename) || fully_indexed?(filename, checksums)
+    def ignored_file?(path, checksums)
+      filename = File.basename(path)
+
+      filename.start_with?('.') ||
+        filename == METADATA_FILENAME ||
+        IGNORED_FILE_EXTENSIONS.include?(File.extname(filename)) ||
+        fully_indexed?(path, filename, checksums)
     end
 
-    def hidden_file?(filename)
-      File.basename(filename).start_with?('.')
-    end
-
-    def metadata_file?(filename)
-      File.basename(filename) == METADATA_FILENAME
-    end
-
-    def fully_indexed?(filename, checksums)
+    def fully_indexed?(path, filename, checksums)
       checksum = checksums[filename]
-      checksum.present? && calc_checksum(filename) == checksum
+      checksum.present? && calc_checksum(path) == checksum
     end
 
     def calc_checksum(filename)
       Digest::SHA256.file(filename).hexdigest
     end
+
+    def monotonic_time
+      Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    end
   end
 end
diff --git a/script/import_scripts/mbox/support/settings.rb b/script/import_scripts/mbox/support/settings.rb
index 8ec5456a230..703ec2220ad 100644
--- a/script/import_scripts/mbox/support/settings.rb
+++ b/script/import_scripts/mbox/support/settings.rb
@@ -12,6 +12,9 @@ module ImportScripts::Mbox
     attr_reader :batch_size
     attr_reader :trust_level
     attr_reader :prefer_html
+    attr_reader :staged
+    attr_reader :index_only
+    attr_reader :group_messages_by_subject
 
     def initialize(yaml)
       @data_dir = yaml['data_dir']
@@ -19,6 +22,9 @@ module ImportScripts::Mbox
       @batch_size = 1000 # no need to make this actually configurable at the moment
       @trust_level = yaml['default_trust_level']
       @prefer_html = yaml['prefer_html']
+      @staged = yaml['staged']
+      @index_only = yaml['index_only']
+      @group_messages_by_subject = yaml['group_messages_by_subject']
     end
   end
 end
diff --git a/script/import_scripts/nodebb/nodebb.rb b/script/import_scripts/nodebb/nodebb.rb
new file mode 100644
index 00000000000..1c9acfef222
--- /dev/null
+++ b/script/import_scripts/nodebb/nodebb.rb
@@ -0,0 +1,527 @@
+require_relative '../base.rb'
+require_relative './redis'
+
+class ImportScripts::NodeBB < ImportScripts::Base
+  # CHANGE THESE BEFORE RUNNING THE IMPORTER
+  # ATTACHMENT_DIR needs to be absolute, not relative path
+  ATTACHMENT_DIR = '/Users/orlando/www/orlando/NodeBB/public/uploads'
+  BATCH_SIZE = 2000
+
+  def initialize
+    super
+
+    adapter = NodeBB::Redis
+
+    @client = adapter.new(
+      host: "localhost",
+      port: "6379",
+      db: 0
+    )
+
+    load_merged_posts
+  end
+
+  def load_merged_posts
+    puts 'loading merged posts with topics...'
+
+    # we keep here the posts that were merged
+    # as topics
+    #
+    # { post_id: discourse_post_id }
+    @merged_posts_map = {}
+
+    PostCustomField.where(name: 'import_merged_post_id').pluck(:post_id, :value).each do |post_id, import_id|
+      post = Post.find(post_id)
+      topic_id = post.topic_id
+      nodebb_post_id = post.custom_fields['import_merged_post_id']
+
+      @merged_posts_map[nodebb_post_id] = topic_id
+    end
+  end
+
+  def execute
+    import_groups
+    import_categories
+    import_users
+    add_users_to_groups
+    import_topics
+    import_posts
+    import_attachments
+    post_process_posts
+  end
+
+  def import_groups
+    puts '', 'importing groups'
+
+    groups = @client.groups
+    total_count = groups.count
+    progress_count = 0
+    start_time = Time.now
+
+    create_groups(groups) do |group|
+      {
+        id: group["name"],
+        name: group["slug"]
+      }
+    end
+  end
+
+  def import_categories
+    puts "", "importing top level categories..."
+
+    category_map = @client.categories
+    category_ids = category_map.keys
+    categories = category_map.values
+
+    top_level_categories = categories.select { |c| c["parentCid"] == "0" }
+
+    create_categories(top_level_categories) do |category|
+      {
+        id: category["cid"],
+        name: category["name"],
+        position: category["order"],
+        description: category["description"],
+      }
+    end
+
+    puts "", "importing child categories..."
+
+    children_categories = categories.select { |c| c["parentCid"] != "0" }
+    top_level_category_ids = Set.new(top_level_categories.map { |c| c["cid"] })
+
+    # cut down the tree to only 2 levels of categories
+    children_categories.each do |cc|
+      while !top_level_category_ids.include?(cc["parentCid"])
+        cc["parentCid"] = categories.detect { |c| c["cid"] == cc["parentCid"] }["parentCid"]
+      end
+    end
+
+    create_categories(children_categories) do |category|
+      {
+        id: category["cid"],
+        name: category["name"],
+        position: category["order"],
+        description: category["description"],
+        parent_category_id: category_id_from_imported_category_id(category["parentCid"])
+      }
+    end
+  end
+
+  def import_users
+    puts "", "importing users"
+
+    users = @client.users
+    user_count = users.count
+
+    # we use this group to grant admin to users
+    admin_group = @client.group("administrators")
+
+    create_users(users, total: user_count) do |user|
+      username = user["username"]
+      email = user["email"]
+
+      # skip users without username
+      next unless username
+
+      # fake email for users without email
+      email = fake_email if email.blank?
+
+      # use user.suspended to handle banned users
+      if user["banned"] == "1"
+        suspended_at = Time.now
+        suspended_till = Time.now + 100.years
+      end
+
+      {
+        id: user["uid"],
+        name: user["fullname"],
+        username: username,
+        email: email,
+        admin: admin_group["member_ids"].include?(user["uid"]),
+        website: user["website"],
+        location: user["location"],
+        suspended_at: suspended_at,
+        suspended_till: suspended_till,
+        primary_group_id: group_id_from_imported_group_id(user["groupTitle"]),
+        created_at: user["joindate"],
+        custom_fields: {
+          import_pass: user["password"]
+        },
+        post_create_action: proc do |u|
+          import_profile_picture(user, u)
+          import_profile_background(user, u)
+        end
+      }
+    end
+  end
+
+  def import_profile_picture(old_user, imported_user)
+    picture = old_user["picture"]
+
+    return if picture.blank?
+
+    # URI.scheme returns nil for internal URLs
+    uri = URI.parse(picture)
+    is_external = uri.scheme
+
+    if is_external
+      # download external image
+      begin
+        string_io = open(picture, read_timeout: 5)
+      rescue Net::ReadTimeout
+        puts "timeout downloading avatar for user #{imported_user.id}"
+        return nil
+      end
+
+      # continue if download failed
+      return unless string_io
+
+      # try to get filename from headers
+      if string_io.meta["content-disposition"]
+        filename = string_io.meta["content-disposition"].match(/filename=(\"?)(.+)\1/)[2]
+      end
+
+      # try to get it from path
+      filename = File.basename(picture) unless filename
+
+      # can't determine filename, skip upload
+      if !filename
+        puts "Can't determine filename, skipping avatar upload for user #{imported_user.id}"
+        return
+      end
+
+      # write tmp file
+      file = Tempfile.new(filename, encoding: 'ascii-8bit')
+      file.write string_io.read
+      file.rewind
+
+      upload = UploadCreator.new(file, filename).create_for(imported_user.id)
+    else
+      # remove "/assets/uploads/" from attachment
+      picture = picture.gsub("/assets/uploads", "")
+      filepath = File.join(ATTACHMENT_DIR, picture)
+      filename = File.basename(picture)
+
+      unless File.exists?(filepath)
+        puts "Avatar file doesn't exist: #{filename}"
+        return nil
+      end
+
+      upload = create_upload(imported_user.id, filepath, filename)
+    end
+
+    return if !upload.persisted?
+
+    imported_user.create_user_avatar
+    imported_user.user_avatar.update(custom_upload_id: upload.id)
+    imported_user.update(uploaded_avatar_id: upload.id)
+  ensure
+    string_io.close rescue nil
+    file.close rescue nil
+    file.unlind rescue nil
+  end
+
+  def import_profile_background(old_user, imported_user)
+    picture = old_user["cover:url"]
+
+    return if picture.blank?
+
+    # URI returns nil for invalid URLs
+    uri = URI.parse(picture)
+    is_external = uri.scheme
+
+    if is_external
+      begin
+        string_io = open(picture, read_timeout: 5)
+      rescue Net::ReadTimeout
+        return nil
+      end
+
+      if string_io.meta["content-disposition"]
+        filename = string_io.meta["content-disposition"].match(/filename=(\"?)(.+)\1/)[2]
+      end
+
+      filename = File.basename(picture) unless filename
+
+      # can't determine filename, skip upload
+      if !filename
+        puts "Can't determine filename, skipping background upload for user #{imported_user.id}"
+        return
+      end
+
+      # write tmp file
+      file = Tempfile.new(filename, encoding: 'ascii-8bit')
+      file.write string_io.read
+      file.rewind
+
+      upload = UploadCreator.new(file, filename).create_for(imported_user.id)
+    else
+      # remove "/assets/uploads/" from attachment
+      picture = picture.gsub("/assets/uploads", "")
+      filepath = File.join(ATTACHMENT_DIR, picture)
+      filename = File.basename(picture)
+
+      unless File.exists?(filepath)
+        puts "Background file doesn't exist: #{filename}"
+        return nil
+      end
+
+      upload = create_upload(imported_user.id, filepath, filename)
+    end
+
+    return if !upload.persisted?
+
+    imported_user.user_profile.update(profile_background: upload.url)
+  ensure
+    string_io.close rescue nil
+    file.close rescue nil
+    file.unlink rescue nil
+  end
+
+  def add_users_to_groups
+    puts "", "adding users to groups..."
+
+    groups = @client.groups
+    total_count = groups.count
+    progress_count = 0
+    start_time = Time.now
+
+    @client.groups.each do |group|
+      dgroup = find_group_by_import_id(group["name"])
+
+      # do thing if we migrated this group already
+      next if dgroup.custom_fields['import_users_added']
+
+      group_member_ids = group["member_ids"].map { |uid| user_id_from_imported_user_id(uid) }
+      group_owner_ids = group["owner_ids"].map { |uid| user_id_from_imported_user_id(uid) }
+
+      # add members
+      dgroup.bulk_add(group_member_ids)
+
+      # reload group
+      dgroup.reload
+
+      # add owners
+      owners = User.find(group_owner_ids)
+      owners.each { |owner| dgroup.add_owner(owner) }
+
+      dgroup.custom_fields['import_users_added'] = true
+      dgroup.save
+
+      progress_count += 1
+      print_status(progress_count, total_count, start_time)
+    end
+  end
+
+  def import_topics
+    puts "", "importing topics..."
+
+    topic_count = @client.topic_count
+
+    batches(BATCH_SIZE) do |offset|
+      topics = @client.topics(offset, BATCH_SIZE)
+
+      break if topics.size < 1
+
+      create_posts(topics, total: topic_count, offset: offset) do |topic|
+        # skip if is deleted
+        if topic["deleted"] == "1"
+          puts "Topic with id #{topic["tid"]} was deleted, skipping"
+          next
+        end
+
+        topic_id = "t#{topic["tid"]}"
+        raw = topic["mainpost"]["content"]
+
+        data = {
+          id: topic_id,
+          user_id: user_id_from_imported_user_id(topic["uid"]) || Discourse::SYSTEM_USER_ID,
+          title: topic["title"],
+          category: category_id_from_imported_category_id(topic["cid"]),
+          raw: raw,
+          created_at: topic["timestamp"],
+          views: topic["viewcount"],
+          closed: topic["locked"] == "1",
+          post_create_action: proc do |p|
+            # keep track of this to use in import_posts
+            p.custom_fields["import_merged_post_id"] = topic["mainPid"]
+            p.save
+            @merged_posts_map[topic["mainPid"]] = p.id
+          end
+        }
+
+        data[:pinned_at] = data[:created_at] if topic["pinned"] == "1"
+
+        data
+      end
+    end
+  end
+
+  def import_posts
+    puts "", "importing posts..."
+
+    post_count = @client.post_count
+
+    batches(BATCH_SIZE) do |offset|
+      posts = @client.posts(offset, BATCH_SIZE)
+
+      break if posts.size < 1
+
+      create_posts(posts, total: post_count, offset: offset) do |post|
+        # skip if it's merged_post
+        next if @merged_posts_map[post["pid"]]
+
+        # skip if it's deleted
+        next if post["deleted"] == "1"
+
+        raw = post["content"]
+        post_id = "p#{post["pid"]}"
+
+        next if raw.blank?
+        topic = topic_lookup_from_imported_post_id("t#{post["tid"]}")
+
+        unless topic
+          puts "Topic with id #{post["tid"]} not found, skipping"
+          next
+        end
+
+        data = {
+          id: post_id,
+          user_id: user_id_from_imported_user_id(post["uid"]) || Discourse::SYSTEM_USER_ID,
+          topic_id: topic[:topic_id],
+          raw: raw,
+          created_at: post["timestamp"],
+          post_create_action: proc do |p|
+            post["upvoted_by"].each do |upvoter_id|
+              user = User.new
+              user.id = user_id_from_imported_user_id(upvoter_id) || Discourse::SYSTEM_USER_ID
+
+              begin
+                PostAction.act(user, p, PostActionType.types[:like])
+              rescue PostAction::AlreadyActed
+              end
+            end
+          end
+        }
+
+        if post['toPid']
+          # Look reply to topic
+          parent_id = topic_lookup_from_imported_post_id("t#{post['toPid']}").try(:[], :post_number)
+
+          # Look reply post if topic is missing
+          parent_id ||= topic_lookup_from_imported_post_id("p#{post['toPid']}").try(:[], :post_number)
+
+          if parent_id
+            data[:reply_to_post_number] = parent_id
+          else
+            puts "Post with id #{post["toPid"]} not found for reply"
+          end
+        end
+
+        data
+      end
+    end
+  end
+
+  def post_process_posts
+    puts "", "Postprocessing posts..."
+
+    current = 0
+    max = Post.count
+    start_time = Time.now
+
+    Post.find_each do |post|
+      begin
+        next if post.custom_fields['import_post_processing']
+
+        new_raw = postprocess_post(post)
+        if new_raw != post.raw
+          post.raw = new_raw
+          post.custom_fields['import_post_processing'] = true
+          post.save
+        end
+      ensure
+        print_status(current += 1, max, start_time)
+      end
+    end
+  end
+
+  def import_attachments
+    puts '', 'importing attachments...'
+
+    current = 0
+    max = Post.count
+    start_time = Time.now
+
+    Post.find_each do |post|
+      current += 1
+      print_status(current, max, start_time)
+
+      new_raw = post.raw.dup
+      new_raw.gsub!(/\[(.*)\]\((\/assets\/uploads\/files\/.*)\)/) do
+        image_md = Regexp.last_match[0]
+        text, filepath = $1, $2
+        filepath = filepath.gsub("/assets/uploads", ATTACHMENT_DIR)
+
+        # if file exists
+        # upload attachment and return html for it
+        if File.exists?(filepath)
+          filename = File.basename(filepath)
+          upload = create_upload(post.user_id, filepath, filename)
+
+          html_for_upload(upload, filename)
+        else
+          puts "File with path #{filepath} not found for post #{post.id}, upload will be broken"
+          image_md
+        end
+      end
+
+      if new_raw != post.raw
+        PostRevisor.new(post).revise!(post.user, { raw: new_raw }, bypass_bump: true, edit_reason: 'Import attachments from NodeBB')
+      end
+    end
+  end
+
+  def postprocess_post(post)
+    raw = post.raw
+
+    # [link to post](/post/:id)
+    raw = raw.gsub(/\[(.*)\]\(\/post\/(\d+).*\)/) do
+      text, post_id = $1, $2
+
+      if topic_lookup = topic_lookup_from_imported_post_id("p#{post_id}")
+        url = topic_lookup[:url]
+        "[#{text}](#{url})"
+      else
+        "/404"
+      end
+    end
+
+    # [link to topic](/topic/:id)
+    raw = raw.gsub(/\[(.*)\]\(\/topic\/(\d+).*\)/) do
+      text, topic_id = $1, $2
+
+      if topic_lookup = topic_lookup_from_imported_post_id("t#{topic_id}")
+        url = topic_lookup[:url]
+        "[#{text}](#{url})"
+      else
+        "/404"
+      end
+    end
+
+    # @username with dash to underscore
+    raw = raw.gsub(/@([a-zA-Z0-9-]+)/) do
+      username = $1
+
+      username.gsub('-', '_')
+    end
+
+    raw
+  end
+
+  def fake_email
+    SecureRandom.hex << "@domain.com"
+  end
+end
+
+ImportScripts::NodeBB.new.perform
diff --git a/script/import_scripts/nodebb/redis.rb b/script/import_scripts/nodebb/redis.rb
new file mode 100644
index 00000000000..e77e33f3578
--- /dev/null
+++ b/script/import_scripts/nodebb/redis.rb
@@ -0,0 +1,109 @@
+require 'redis'
+
+module NodeBB
+  class Redis
+    attr_reader :redis
+
+    def initialize(params)
+      @redis = ::Redis.new(params)
+    end
+
+    def groups
+      group_keys = redis.zrange('groups:visible:createtime', 0, -1)
+
+      group_keys.map { |group_key| group(group_key) }
+    end
+
+    def group(id)
+      group = redis.hgetall("group:#{id}")
+      group["createtime"] = timestamp_to_date(group["createtime"])
+      group["member_ids"] = redis.zrange("group:#{id}:members", 0, -1)
+      group["owner_ids"] = redis.smembers("group:#{id}:owners")
+
+      group
+    end
+
+    def users
+      user_keys = redis.zrange('users:joindate', 0, -1)
+
+      user_keys.map { |user_key| user(user_key) }
+    end
+
+    def user(id)
+      user = redis.hgetall("user:#{id}")
+
+      user["joindate"] = timestamp_to_date(user["joindate"])
+      user["lastonline"] = timestamp_to_date(user["lastonline"])
+
+      user
+    end
+
+    def categories
+      category_keys = redis.zrange('categories:cid', 0, -1)
+
+      {}.tap do |categories|
+        category_keys.each do |category_key|
+          category = redis.hgetall("category:#{category_key}")
+
+          categories[category['cid']] = category
+        end
+      end
+    end
+
+    def topics(offset = 0, page_size = 2000)
+      # redis get keys inclusive
+      # so we move the offset a bit to continue in the next item
+      offset = offset + 1 unless offset == 0
+      from = offset
+      to = page_size + offset
+
+      topic_keys = redis.zrange('topics:tid', from, to)
+
+      topic_keys.map { |topic_key| topic(topic_key) }
+    end
+
+    def topic(id)
+      topic = redis.hgetall("topic:#{id}")
+
+      topic["lastposttime"] = timestamp_to_date(topic["lastposttime"])
+      topic["timestamp"] = timestamp_to_date(topic["timestamp"])
+      topic["mainpost"] = post(topic["mainPid"])
+
+      topic
+    end
+
+    def topic_count
+      redis.zcard('topics:tid')
+    end
+
+    def posts(offset = 0, page_size = 2000)
+      # redis get keys inclusive
+      # so we move the offset a bit to continue in the next item
+      offset = offset + 1 unless offset == 0
+      from = offset
+      to = page_size + offset
+
+      post_keys = redis.zrange('posts:pid', from, to)
+
+      post_keys.map { |post_key| post(post_key) }
+    end
+
+    def post(id)
+      post = redis.hgetall("post:#{id}")
+      post["timestamp"] = timestamp_to_date(post["timestamp"])
+      post["upvoted_by"] = redis.smembers("pid:#{id}:upvote")
+
+      post
+    end
+
+    def post_count
+      redis.zcard('posts:pid')
+    end
+
+    private
+
+    def timestamp_to_date(createtime)
+      Time.at(createtime[0..-4].to_i).utc if createtime
+    end
+  end
+end
diff --git a/script/import_scripts/phpbb3/database/database_3_0.rb b/script/import_scripts/phpbb3/database/database_3_0.rb
index a54e0540a0b..ddee927acb7 100644
--- a/script/import_scripts/phpbb3/database/database_3_0.rb
+++ b/script/import_scripts/phpbb3/database/database_3_0.rb
@@ -30,9 +30,10 @@ module ImportScripts::PhpBB3
 
     def count_anonymous_users
       count(<<-SQL)
-        SELECT COUNT(DISTINCT post_username) AS count
-        FROM #{@table_prefix}posts
-        WHERE post_username <> ''
+        SELECT COUNT(DISTINCT p.post_username) AS count
+        FROM #{@table_prefix}posts p
+          JOIN #{@table_prefix}users u ON (p.poster_id = u.user_id)
+        WHERE p.post_username <> '' AND u.user_type = #{Constants::USER_TYPE_IGNORE}
       SQL
     end
 
@@ -40,11 +41,12 @@ module ImportScripts::PhpBB3
       last_username = escape(last_username)
 
       query(<<-SQL, :post_username)
-        SELECT post_username, MIN(post_time) AS first_post_time
-        FROM #{@table_prefix}posts
-        WHERE post_username > '#{last_username}'
-        GROUP BY post_username
-        ORDER BY post_username
+        SELECT p.post_username, MIN(p.post_time) AS first_post_time
+        FROM #{@table_prefix}posts p
+          JOIN #{@table_prefix}users u ON (p.poster_id = u.user_id)
+        WHERE p.post_username > '#{last_username}' AND u.user_type = #{Constants::USER_TYPE_IGNORE}
+        GROUP BY p.post_username
+        ORDER BY p.post_username
         LIMIT #{@batch_size}
       SQL
     end
@@ -73,11 +75,13 @@ module ImportScripts::PhpBB3
     def fetch_posts(last_post_id)
       query(<<-SQL, :post_id)
         SELECT p.post_id, p.topic_id, t.forum_id, t.topic_title, t.topic_first_post_id, p.poster_id,
-          p.post_text, p.post_time, p.post_username, t.topic_status, t.topic_type, t.poll_title,
+          p.post_text, p.post_time, t.topic_status, t.topic_type, t.poll_title, t.topic_views,
           CASE WHEN t.poll_length > 0 THEN t.poll_start + t.poll_length ELSE NULL END AS poll_end,
-          t.poll_max_options, p.post_attachment
+          t.poll_max_options, p.post_attachment, p.poster_ip,
+          CASE WHEN u.user_type = #{Constants::USER_TYPE_IGNORE} THEN p.post_username ELSE NULL END post_username
         FROM #{@table_prefix}posts p
           JOIN #{@table_prefix}topics t ON (p.topic_id = t.topic_id)
+          JOIN #{@table_prefix}users u ON (p.poster_id = u.user_id)
         WHERE p.post_id > #{last_post_id}
         ORDER BY p.post_id
         LIMIT #{@batch_size}
diff --git a/script/import_scripts/phpbb3/importers/post_importer.rb b/script/import_scripts/phpbb3/importers/post_importer.rb
index 051695585b7..edaf1ccab4b 100644
--- a/script/import_scripts/phpbb3/importers/post_importer.rb
+++ b/script/import_scripts/phpbb3/importers/post_importer.rb
@@ -21,7 +21,7 @@ module ImportScripts::PhpBB3
 
     def map_post(row)
       imported_user_id = row[:post_username].blank? ? row[:poster_id] : row[:post_username]
-      user_id = @lookup.user_id_from_imported_user_id(imported_user_id) || Discourse.system_user.id
+      user_id = @lookup.user_id_from_imported_user_id(imported_user_id) || -1
       is_first_post = row[:post_id] == row[:topic_first_post_id]
 
       attachments = import_attachments(row, user_id)
@@ -54,9 +54,11 @@ module ImportScripts::PhpBB3
       mapped[:title] = CGI.unescapeHTML(row[:topic_title]).strip[0...255]
       mapped[:pinned_at] = mapped[:created_at] unless row[:topic_type] == Constants::POST_NORMAL
       mapped[:pinned_globally] = row[:topic_type] == Constants::POST_GLOBAL
+      mapped[:views] = row[:topic_views]
       mapped[:post_create_action] = proc do |post|
         @permalink_importer.create_for_topic(post.topic, row[:topic_id])
         @permalink_importer.create_for_post(post, row[:post_id])
+        TopicViewItem.add(post.topic_id, row[:poster_ip], post.user_id, post.created_at, true)
       end
 
       add_poll(row, mapped) if @settings.import_polls
@@ -74,6 +76,7 @@ module ImportScripts::PhpBB3
       mapped[:topic_id] = parent[:topic_id]
       mapped[:post_create_action] = proc do |post|
         @permalink_importer.create_for_post(post, row[:post_id])
+        TopicViewItem.add(post.topic_id, row[:poster_ip], post.user_id, post.created_at, true)
       end
 
       mapped
diff --git a/script/import_scripts/phpbb3/importers/user_importer.rb b/script/import_scripts/phpbb3/importers/user_importer.rb
index f7414bb1f0f..97b37776d48 100644
--- a/script/import_scripts/phpbb3/importers/user_importer.rb
+++ b/script/import_scripts/phpbb3/importers/user_importer.rb
@@ -21,7 +21,7 @@ module ImportScripts::PhpBB3
         email: row[:user_email],
         username: row[:username],
         password: @settings.import_passwords ? row[:user_password] : nil,
-        name: @settings.username_as_name ? row[:username] : '',
+        name: @settings.username_as_name ? row[:username] : row[:name].presence,
         created_at: Time.zone.at(row[:user_regdate]),
         last_seen_at: row[:user_lastvisit] == 0 ? Time.zone.at(row[:user_regdate]) : Time.zone.at(row[:user_lastvisit]),
         registration_ip_address: (IPAddr.new(row[:user_ip]) rescue nil),
diff --git a/script/import_scripts/phpbb3/settings.yml b/script/import_scripts/phpbb3/settings.yml
index 4fd15fc9d0b..08b50e283a1 100644
--- a/script/import_scripts/phpbb3/settings.yml
+++ b/script/import_scripts/phpbb3/settings.yml
@@ -11,8 +11,8 @@ database:
   batch_size: 1000 # Don't change this unless you know what you're doing. The default (1000) should work just fine.
 
 import:
-  # Enable this option if you want to have a better conversion of BBCodes to Markdown.
-  # WARNING: This can slow down your import.
+  # WARNING: Do not activate this option unless you know what you are doing.
+  # It will probably break the BBCode to Markdown conversion and slows down your import.
   use_bbcode_to_md: false
 
   # This is the path to the root directory of your current phpBB installation (or a copy of it).
diff --git a/script/import_scripts/phpbb3/support/text_processor.rb b/script/import_scripts/phpbb3/support/text_processor.rb
index d89a6cc99fb..fa6e623d328 100644
--- a/script/import_scripts/phpbb3/support/text_processor.rb
+++ b/script/import_scripts/phpbb3/support/text_processor.rb
@@ -27,6 +27,7 @@ module ImportScripts::PhpBB3
       process_links(text)
       process_lists(text)
       process_code(text)
+      fix_markdown(text)
       text
     end
 
@@ -114,11 +115,13 @@ module ImportScripts::PhpBB3
       # convert list tags to ul and list=1 tags to ol
       # list=a is not supported, so handle it like list=1
       # list=9 and list=x have the same result as list=1 and list=a
-      text.gsub!(/\[list\](.*?)\[\/list:u\]/mi, '[ul]\1[/ul]')
-      text.gsub!(/\[list=.*?\](.*?)\[\/list:o\]/mi, '[ol]\1[/ol]')
+      text.gsub!(/\[list\](.*?)\[\/list:u\]/mi) do
+        $1.gsub(/\[\*\](.*?)\[\/\*:m\]\n*/mi) { "* #{$1}\n" }
+      end
 
-      # convert *-tags to li-tags so bbcode-to-md can do its magic on phpBB's lists:
-      text.gsub!(/\[\*\](.*?)\[\/\*:m\]/mi, '[li]\1[/li]')
+      text.gsub!(/\[list=.*?\](.*?)\[\/list:o\]/mi) do
+        $1.gsub(/\[\*\](.*?)\[\/\*:m\]\n*/mi) { "1. #{$1}\n" }
+      end
     end
 
     # This replaces existing [attachment] BBCodes with the corresponding HTML tags for Discourse.
@@ -149,9 +152,14 @@ module ImportScripts::PhpBB3
 
     def process_code(text)
       text.gsub!(/<span class="syntax.*?>(.*?)<\/span>/) { "#{$1}" }
-      text.gsub!(/\[code(=[a-z]*)?\](.*?)\[\/code\]/i) { "[code]#{@he.decode($2)}[/code]" }
+      text.gsub!(/\[code(=[a-z]*)?\](.*?)\[\/code\]/i) { "[code]\n#{@he.decode($2)}\n[/code]" }
       text.gsub!(/<br \/>/, "\n")
       text
     end
+
+    def fix_markdown(text)
+      text.gsub!(/(\n*\[\/?quote.*?\]\n*)/mi) { |q| "\n#{q.strip}\n" }
+      text
+    end
   end
 end
diff --git a/script/import_scripts/simplepress.rb b/script/import_scripts/simplepress.rb
index 62663842bc1..0e4c5e22a09 100644
--- a/script/import_scripts/simplepress.rb
+++ b/script/import_scripts/simplepress.rb
@@ -22,7 +22,8 @@ class ImportScripts::SimplePress < ImportScripts::Base
   def execute
     import_users
     import_categories
-    import_topics_and_posts
+    import_topics
+    import_posts
   end
 
   def import_users
@@ -93,12 +94,10 @@ class ImportScripts::SimplePress < ImportScripts::Base
     end
   end
 
-  def import_topics_and_posts
-    puts "", "creating topics and posts"
+  def import_topics
+    puts "", "creating topics"
 
-    total_count = mysql_query("SELECT count(*) count from #{TABLE_PREFIX}posts").first["count"]
-
-    topic_first_post_id = {}
+    total_count = mysql_query("SELECT COUNT(*) count FROM #{TABLE_PREFIX}posts WHERE post_index = 1").first["count"]
 
     batches(BATCH_SIZE) do |offset|
       results = mysql_query("
@@ -106,14 +105,16 @@ class ImportScripts::SimplePress < ImportScripts::Base
                p.topic_id topic_id,
                t.forum_id category_id,
                t.topic_name title,
-               p.post_index post_index,
+               t.topic_opened views,
+               t.topic_pinned pinned,
                p.user_id user_id,
                p.post_content raw,
                p.post_date post_time
           FROM #{TABLE_PREFIX}posts p,
                #{TABLE_PREFIX}topics t
          WHERE p.topic_id = t.topic_id
-      ORDER BY p.post_date
+           AND p.post_index = 1
+      ORDER BY p.post_id
          LIMIT #{BATCH_SIZE}
         OFFSET #{offset};
       ")
@@ -123,29 +124,68 @@ class ImportScripts::SimplePress < ImportScripts::Base
       next if all_records_exist? :posts, results.map { |m| m['id'].to_i }
 
       create_posts(results, total: total_count, offset: offset) do |m|
-        skip = false
-        mapped = {}
+        created_at = Time.zone.at(m['post_time'])
+        {
+          id: m['id'],
+          user_id: user_id_from_imported_user_id(m['user_id']) || -1,
+          raw: process_simplepress_post(m['raw'], m['id']),
+          created_at: created_at,
+          category: category_id_from_imported_category_id(m['category_id']),
+          title: CGI.unescapeHTML(m['title']),
+          views: m['views'],
+          pinned_at: m['pinned'] == 1 ? created_at : nil,
+        }
+      end
+    end
+  end
 
-        mapped[:id] = m['id']
-        mapped[:user_id] = user_id_from_imported_user_id(m['user_id']) || -1
-        mapped[:raw] = process_simplepress_post(m['raw'], m['id'])
-        mapped[:created_at] = Time.zone.at(m['post_time'])
+  def import_posts
+    puts "", "creating posts"
 
-        if m['post_index'] == 1
-          mapped[:category] = category_id_from_imported_category_id(m['category_id'])
-          mapped[:title] = CGI.unescapeHTML(m['title'])
-          topic_first_post_id[m['topic_id']] = m['id']
+    topic_first_post_id = {}
+
+    mysql_query("
+      SELECT t.topic_id, p.post_id
+        FROM #{TABLE_PREFIX}topics t
+        JOIN #{TABLE_PREFIX}posts p ON p.topic_id = t.topic_id
+       WHERE p.post_index = 1
+    ").each { |r| topic_first_post_id[r["topic_id"]] = r["post_id"] }
+
+    total_count = mysql_query("SELECT count(*) count FROM #{TABLE_PREFIX}posts WHERE post_index <> 1").first["count"]
+
+    batches(BATCH_SIZE) do |offset|
+      results = mysql_query("
+        SELECT p.post_id id,
+               p.topic_id topic_id,
+               p.user_id user_id,
+               p.post_content raw,
+               p.post_date post_time
+          FROM #{TABLE_PREFIX}posts p,
+               #{TABLE_PREFIX}topics t
+         WHERE p.topic_id = t.topic_id
+           AND p.post_index <> 1
+      ORDER BY p.post_id
+         LIMIT #{BATCH_SIZE}
+        OFFSET #{offset};
+      ")
+
+      break if results.size < 1
+
+      next if all_records_exist? :posts, results.map { |m| m['id'].to_i }
+
+      create_posts(results, total: total_count, offset: offset) do |m|
+        if parent = topic_lookup_from_imported_post_id(topic_first_post_id[m['topic_id']])
+          {
+            id: m['id'],
+            user_id: user_id_from_imported_user_id(m['user_id']) || -1,
+            topic_id: parent[:topic_id],
+            raw: process_simplepress_post(m['raw'], m['id']),
+            created_at: Time.zone.at(m['post_time']),
+          }
         else
-          parent = topic_lookup_from_imported_post_id(topic_first_post_id[m['topic_id']])
-          if parent
-            mapped[:topic_id] = parent[:topic_id]
-          else
-            puts "Parent post #{first_post_id} doesn't exist. Skipping #{m["id"]}: #{m["title"][0..40]}"
-            skip = true
-          end
+          puts "Parent post #{m['topic_id']} doesn't exist. Skipping #{m["id"]}"
+          nil
         end
-
-        skip ? nil : mapped
       end
     end
   end
diff --git a/script/import_scripts/smf1.rb b/script/import_scripts/smf1.rb
new file mode 100644
index 00000000000..858e98823f3
--- /dev/null
+++ b/script/import_scripts/smf1.rb
@@ -0,0 +1,638 @@
+require "mysql2"
+require "htmlentities"
+require File.expand_path(File.dirname(__FILE__) + "/base.rb")
+
+class ImportScripts::Smf1 < ImportScripts::Base
+
+  BATCH_SIZE  ||= 5000
+  UPLOADS_DIR ||= ENV["UPLOADS_DIR"].presence
+  FORUM_URL   ||= ENV["FORUM_URL"].presence
+
+  def initialize
+    fail "UPLOADS_DIR env variable is required (example: '/path/to/attachments')"   unless UPLOADS_DIR
+    fail "FORUM_URL env variable is required (example: 'https://domain.com/forum')" unless FORUM_URL
+
+    @client = Mysql2::Client.new(
+      host: ENV["DB_HOST"] || "localhost",
+      username: ENV["DB_USER"] || "root",
+      password: ENV["DB_PW"],
+      database: ENV["DB_NAME"],
+    )
+
+    check_version!
+
+    super
+
+    @htmlentities = HTMLEntities.new
+
+    puts "Loading existing usernames..."
+
+    @old_to_new_usernames = UserCustomField.joins(:user).where(name: "import_username").pluck("value", "users.username").to_h
+
+    puts "Loading pm mapping..."
+
+    @pm_mapping = {}
+
+    Topic
+      .joins(:topic_allowed_users)
+      .where(archetype: Archetype.private_message)
+      .where("title NOT ILIKE 'Re: %'")
+      .group(:id)
+      .order(:id)
+      .pluck("string_agg(topic_allowed_users.user_id::text, ',' ORDER BY topic_allowed_users.user_id), title, topics.id")
+      .each do |users, title, topic_id|
+      @pm_mapping[users] ||= {}
+      @pm_mapping[users][title] ||= []
+      @pm_mapping[users][title] << topic_id
+    end
+
+  end
+
+  def execute
+    SiteSetting.permalink_normalizations = "/(.+)\\?.*/\\1"
+
+    import_groups
+    import_users
+
+    import_categories
+    import_posts
+    import_personal_posts
+
+    import_attachments
+
+    import_likes
+    import_feedbacks
+
+    import_banned_domains
+    import_banned_emails
+    import_banned_ips
+  end
+
+  def check_version!
+    version = mysql_query("SELECT value FROM smf_settings WHERE variable = 'smfVersion' LIMIT 1").first["value"]
+    fail "Incompatible version (#{version})" unless version&.start_with?("1.")
+  end
+
+  def import_groups
+    puts "", "Importing groups..."
+
+    # skip administrators/moderators
+    groups = mysql_query("SELECT id_group, groupName FROM smf_membergroups WHERE id_group > 3").to_a
+
+    create_groups(groups) do |g|
+      next if g["groupName"].blank?
+
+      {
+        id: g["id_group"],
+        full_name: g["groupName"],
+      }
+    end
+  end
+
+  def import_users
+    puts "", "Importing users..."
+
+    last_user_id = -1
+    total = mysql_query("SELECT COUNT(*) count FROM smf_members").first["count"]
+
+    batches(BATCH_SIZE) do |offset|
+      users = mysql_query(<<~SQL
+        SELECT m.id_member
+             , memberName
+             , dateRegistered
+             , id_group
+             , lastLogin
+             , realName
+             , emailAddress
+             , personalText
+             , CASE WHEN birthdate > '1900-01-01' THEN birthdate ELSE NULL END birthdate
+             , websiteUrl
+             , location
+             , usertitle
+             , memberIP
+             , memberIP2
+             , is_activated
+             , additionalGroups
+             , id_attach
+             , attachmentType
+             , filename
+          FROM smf_members m
+     LEFT JOIN smf_attachments a ON a.id_member = m.id_member
+         WHERE m.id_member > #{last_user_id}
+         ORDER BY m.id_member
+         LIMIT #{BATCH_SIZE}
+      SQL
+      ).to_a
+
+      break if users.empty?
+
+      last_user_id = users[-1]["id_member"]
+      user_ids = users.map { |u| u["id_member"] }
+
+      next if all_records_exist?(:users, user_ids)
+
+      create_users(users, total: total, offset: offset) do |u|
+        created_at = Time.zone.at(u["dateRegistered"])
+        group_ids = [u["id_group"], *u["additionalGroups"].split(",").map(&:to_i)].uniq
+
+        {
+          id: u["id_member"],
+          username: u["memberName"],
+          created_at: created_at,
+          first_seen_at: created_at,
+          primary_group_id: group_id_from_imported_group_id(u["id_group"]),
+          admin: group_ids.include?(1),
+          moderator: group_ids.include?(2) || group_ids.include?(3),
+          last_seen_at: Time.zone.at(u["lastLogin"]),
+          name: u["realName"].presence,
+          email: u["emailAddress"],
+          bio_raw: pre_process_raw(u["personalText"].presence),
+          date_of_birth: u["birthdate"],
+          website: u["website"].presence,
+          location: u["location"].presence,
+          title: u["usertitle"].presence,
+          registration_ip_address: u["memberIP"],
+          ip_address: u["memberIP2"],
+          active: u["is_activated"] == 1,
+          approved: u["is_activated"] == 1,
+          post_create_action: proc do |user|
+            # usernames
+            @old_to_new_usernames[u["memberName"]] = user.username
+
+            # groups
+            GroupUser.transaction do
+              group_ids.each do |gid|
+                (group_id = group_id_from_imported_group_id(gid)) && GroupUser.find_or_create_by(user: user, group_id: group_id)
+              end
+            end
+
+            # avatar
+            avatar_url = if u["attachmentType"] == 0 && u["id_attach"].present?
+              "#{FORUM_URL}/index.php?action=dlattach;attach=#{u["id_attach"]};type=avatar"
+            elsif u["attachmentType"] == 1 && u["filename"].present?
+              "#{FORUM_URL}/avatar-members/#{u["filename"]}"
+            end
+
+            if avatar_url.present?
+              UserAvatar.import_url_for_user(avatar_url, user) rescue nil
+            end
+          end
+        }
+      end
+    end
+  end
+
+  def import_categories
+    puts "", "Importing categories..."
+
+    categories = mysql_query(<<~SQL
+      SELECT id_board
+           , id_parent
+           , boardOrder
+           , name
+           , description
+       FROM smf_boards
+      ORDER BY id_parent, id_board
+    SQL
+    ).to_a
+
+    parent_categories = categories.select { |c| c["id_parent"] == 0 }
+    children_categories = categories.select { |c| c["id_parent"] != 0 }
+
+    create_categories(parent_categories) do |c|
+      {
+        id: c["id_board"],
+        name: c["name"],
+        description: pre_process_raw(c["description"].presence),
+        position: c["boardOrder"],
+        post_create_action: proc do |category|
+          Permalink.find_or_create_by(url: "forums/index.php/board,#{c["id_board"]}.0.html", category_id: category.id)
+        end,
+      }
+    end
+
+    create_categories(children_categories) do |c|
+      {
+        id: c["id_board"],
+        parent_category_id: category_id_from_imported_category_id(c["id_parent"]),
+        name: c["name"],
+        description: pre_process_raw(c["description"].presence),
+        position: c["boardOrder"],
+        post_create_action: proc do |category|
+          Permalink.find_or_create_by(url: "forums/index.php/board,#{c["id_board"]}.0.html", category_id: category.id)
+        end,
+      }
+    end
+  end
+
+  def import_posts
+    puts "", "Importing posts..."
+
+    last_post_id = -1
+    total = mysql_query("SELECT COUNT(*) count FROM smf_messages").first["count"]
+
+    batches(BATCH_SIZE) do |offset|
+      posts = mysql_query(<<~SQL
+        SELECT m.id_msg
+             , m.id_topic
+             , m.id_board
+             , m.posterTime
+             , m.id_member
+             , m.subject
+             , m.body
+             , t.isSticky
+             , t.id_first_msg
+             , t.numViews
+         FROM smf_messages m
+         JOIN smf_topics t ON t.id_topic = m.id_topic
+        WHERE m.id_msg > #{last_post_id}
+        ORDER BY m.id_msg
+        LIMIT #{BATCH_SIZE}
+      SQL
+      ).to_a
+
+      break if posts.empty?
+
+      last_post_id = posts[-1]["id_msg"]
+      post_ids = posts.map { |p| p["id_msg"] }
+
+      next if all_records_exist?(:post, post_ids)
+
+      create_posts(posts, total: total, offset: offset) do |p|
+        created_at = Time.at(p["posterTime"])
+
+        post = {
+          id: p["id_msg"],
+          created_at: created_at,
+          user_id: user_id_from_imported_user_id(p["id_member"]) || -1,
+          raw: pre_process_raw(p["body"]),
+        }
+
+        if p["id_msg"] == p["id_first_msg"]
+          post[:category] = category_id_from_imported_category_id(p["id_board"])
+          post[:title] = @htmlentities.decode(p["subject"])
+          post[:views] = p["numViews"]
+          post[:pinned_at] = created_at if p["isSticky"] == 1
+          post[:post_create_action] = proc do |pp|
+            Permalink.find_or_create_by(url: "forums/index.php/topic,#{p["id_topic"]}.0.html", topic_id: pp.topic_id)
+          end
+        elsif parent = topic_lookup_from_imported_post_id(p["id_first_msg"])
+          post[:topic_id] = parent[:topic_id]
+          post[:post_create_action] = proc do |pp|
+            Permalink.find_or_create_by(url: "forums/index.php/topic,#{p["id_topic"]}.msg#{p["id_msg"]}.html", post_id: pp.id)
+          end
+        else
+          next
+        end
+
+        post
+      end
+    end
+  end
+
+  def import_personal_posts
+    puts "", "Importing personal posts..."
+
+    last_post_id = -1
+    total = mysql_query("SELECT COUNT(*) count FROM smf_personal_messages WHERE deletedBySender = 0").first["count"]
+
+    batches(BATCH_SIZE) do |offset|
+      posts = mysql_query(<<~SQL
+        SELECT id_pm
+             , id_member_from
+             , msgtime
+             , subject
+             , body
+             , (SELECT GROUP_CONCAT(id_member) FROM smf_pm_recipients r WHERE r.id_pm = pm.id_pm) recipients
+          FROM smf_personal_messages pm
+         WHERE deletedBySender = 0
+           AND id_pm > #{last_post_id}
+         ORDER BY id_pm
+         LIMIT #{BATCH_SIZE}
+      SQL
+      ).to_a
+
+      break if posts.empty?
+
+      last_post_id = posts[-1]["id_pm"]
+      post_ids = posts.map { |p| "pm-#{p["id_pm"]}" }
+
+      next if all_records_exist?(:post, post_ids)
+
+      create_posts(posts, total: total, offset: offset) do |p|
+        next unless user_id = user_id_from_imported_user_id(p["id_member_from"])
+        next if p["recipients"].blank?
+        recipients = p["recipients"].split(",").map { |id| user_id_from_imported_user_id(id) }.compact.uniq
+        next if recipients.empty?
+
+        id = "pm-#{p["id_pm"]}"
+        next if post_id_from_imported_post_id(id)
+
+        post = {
+          id: id,
+          created_at: Time.at(p["msgtime"]),
+          user_id: user_id,
+          raw: pre_process_raw(p["body"]),
+        }
+
+        users = (recipients + [user_id]).sort.uniq.join(",")
+        title = @htmlentities.decode(p["subject"])
+
+        if topic_id = find_pm_topic_id(users, title)
+          post[:topic_id] = topic_id
+        else
+          post[:archetype] = Archetype.private_message
+          post[:title] = title
+          post[:target_usernames] = User.where(id: recipients).pluck(:username)
+          post[:post_create_action] = proc do |p|
+            @pm_mapping[users] ||= {}
+            @pm_mapping[users][title] ||= []
+            @pm_mapping[users][title] << p.topic_id
+          end
+        end
+
+        post
+      end
+    end
+  end
+
+  def find_pm_topic_id(users, title)
+    return unless title.start_with?("Re: ")
+
+    return unless @pm_mapping[users]
+
+    title = title.gsub(/^(Re: )+/i, "")
+    return unless @pm_mapping[users][title]
+
+    @pm_mapping[users][title][-1]
+  end
+
+  def import_attachments
+    puts "", "Importing attachments..."
+
+    count = 0
+    last_upload_id = -1
+    total = mysql_query("SELECT COUNT(*) count FROM smf_attachments WHERE id_msg IS NOT NULL").first["count"]
+
+    batches(BATCH_SIZE) do |offset|
+      uploads = mysql_query(<<~SQL
+        SELECT id_attach
+             , id_msg
+             , filename
+             , file_hash
+          FROM smf_attachments
+         WHERE id_msg IS NOT NULL
+           AND id_attach > #{last_upload_id}
+         ORDER BY id_attach
+         LIMIT #{BATCH_SIZE}
+      SQL
+      ).to_a
+
+      break if uploads.empty?
+
+      last_upload_id = uploads[-1]["id_attach"]
+
+      uploads.each do |u|
+        count += 1
+
+        next unless post = PostCustomField.joins(:post).find_by(name: "import_id", value: u["id_msg"].to_s)&.post
+
+        path = File.join(UPLOADS_DIR, "#{u["id_attach"]}_#{u["file_hash"]}")
+        next unless File.exists?(path) && File.size(path) > 0
+
+        if upload = create_upload(post.user_id, path, u["filename"])
+          html = html_for_upload(upload, u["filename"])
+          unless post.raw[html]
+            post.raw += "\n\n#{html}\n\n"
+            post.save
+            PostUpload.create(upload: upload, post: post)
+          end
+        end
+
+        print_status(count, total, get_start_time("attachments"))
+      end
+    end
+  end
+
+  def import_likes
+    return if mysql_query("SHOW TABLES LIKE 'smf_thank_you_post'").first.nil?
+
+    puts "", "Importing likes..."
+
+    count = 0
+    total = mysql_query("SELECT COUNT(*) count FROM smf_thank_you_post WHERE thx_time > 0").first["count"]
+    like = PostActionType.types[:like]
+
+    mysql_query("SELECT id_msg, id_member, thx_time FROM smf_thank_you_post WHERE thx_time > 0 ORDER BY id_thx_post").each do |l|
+      print_status(count += 1, total, get_start_time("likes"))
+      next unless post_id = post_id_from_imported_post_id(l["id_msg"])
+      next unless user_id = user_id_from_imported_user_id(l["id_member"])
+      next if PostAction.where(post_action_type_id: like, post_id: post_id, user_id: user_id).exists?
+      PostAction.create(post_action_type_id: like, post_id: post_id, user_id: user_id, created_at: Time.at(l["thx_time"]))
+    end
+  end
+
+  FEEDBACKS ||= -"feedbacks"
+
+  def import_feedbacks
+    return if mysql_query("SHOW TABLES LIKE 'smf_feedback'").first.nil?
+
+    puts "", "Importing feedbacks..."
+
+    User.register_custom_field_type(FEEDBACKS, :json)
+
+    count = 0
+    total = mysql_query("SELECT COUNT(*) count FROM smf_feedback WHERE approved").first["count"]
+
+    mysql_query(<<~SQL
+      SELECT feedbackid
+           , id_member
+           , feedbackmember_id
+           , saledate
+           , saletype
+           , salevalue
+           , comment_short
+           , comment_long
+        FROM smf_feedback
+       WHERE approved
+       ORDER BY feedbackid
+    SQL
+    ).each do |f|
+      print_status(count += 1, total, get_start_time("feedbacks"))
+      next unless user_id_from = user_id_from_imported_user_id(f["id_member"])
+      next unless user_id_to = user_id_from_imported_user_id(f["feedbackmember_id"])
+      next unless user = User.find_by(id: user_id_to)
+
+      feedbacks = user.custom_fields[FEEDBACKS] || []
+      next if feedbacks.find { |ff| ff["id"] == f["feedbackid"] }
+
+      feedbacks << {
+        id: f["feedbackid"],
+        created_at: Time.at(f["saledate"]),
+        from: user_id_from,
+        type: f["saletype"],
+        value: f["salevalue"],
+        comment_short: @htmlentities.decode(f["comment_short"]).strip.presence,
+        comment_long: @htmlentities.decode(f["comment_long"]).strip.presence,
+      }
+
+      user.custom_fields[FEEDBACKS] = feedbacks.to_json
+      user.save_custom_fields
+    end
+  end
+
+  def import_banned_domains
+    puts "", "Importing banned email domains..."
+
+    blacklist = SiteSetting.email_domains_blacklist.split("|")
+    banned_domains = mysql_query("SELECT SUBSTRING(email_address, 3) domain FROM smf_ban_items WHERE email_address RLIKE '^%@[^%]+$' GROUP BY email_address").map { |r| r["domain"] }
+
+    SiteSetting.email_domains_blacklist = (blacklist + banned_domains).uniq.sort.join("|")
+  end
+
+  def import_banned_emails
+    puts "", "Importing banned emails..."
+
+    count = 0
+
+    banned_emails = mysql_query("SELECT email_address FROM smf_ban_items WHERE email_address RLIKE '^[^%]+@[^%]+$' GROUP BY email_address").map { |r| r["email_address"] }
+    banned_emails.each do |email|
+      print_status(count += 1, banned_emails.size, get_start_time("banned_emails"))
+      ScreenedEmail.find_or_create_by(email: email)
+    end
+  end
+
+  def import_banned_ips
+    puts "", "Importing banned IPs..."
+
+    count = 0
+
+    banned_ips = mysql_query(<<~SQL
+      SELECT CONCAT_WS('.', ip_low1, ip_low2, ip_low3, ip_low4) low
+           , CONCAT_WS('.', ip_high1, ip_high2, ip_high3, ip_high4) high
+           , hits
+        FROM smf_ban_items
+       WHERE (ip_low1 + ip_low2 + ip_low3 + ip_low4 + ip_high1 + ip_high2 + ip_high3 + ip_high4) > 0
+       GROUP BY low, high, hits;
+    SQL
+    ).to_a
+
+    banned_ips.each do |r|
+      print_status(count += 1, banned_ips.size, get_start_time("banned_ips"))
+      if r["low"] == r["high"]
+        if !ScreenedIpAddress.where("? <<= ip_address", r["low"]).exists?
+          ScreenedIpAddress.create(ip_address: r["low"], match_count: r["hits"])
+        end
+      else
+        low_values  = r["low"].split(".").map(&:to_i)
+        high_values = r["high"].split(".").map(&:to_i)
+        first_diff  = low_values.zip(high_values).count { |a, b| a == b }
+        first_diff -= 1 if low_values[first_diff] == 0 && high_values[first_diff] == 255
+        prefix      = low_values[0...first_diff]
+        suffix      = [0] * (3 - first_diff)
+        mask        = 8 * (first_diff + 1)
+        values      = (low_values[first_diff]..high_values[first_diff])
+        hits        = (r["hits"] / [1, values.count].max).floor
+        values.each do |v|
+          range_values = prefix + [v] + suffix
+          ip_address = "#{range_values.join(".")}/#{mask}"
+          if !ScreenedIpAddress.where("? <<= ip_address", ip_address).exists?
+            ScreenedIpAddress.create(ip_address: ip_address, match_count: hits)
+          end
+        end
+      end
+    end
+
+    ScreenedIpAddress.where(last_match_at: nil).update_all(last_match_at: Time.new(2000, 01, 01))
+
+    puts "", "Rolling up..."
+    ScreenedIpAddress.roll_up
+  end
+
+  IGNORED_BBCODE ||= %w{
+    black blue center color email flash font glow green img iurl left list move
+    red right shadown size table time white
+  }
+
+  def pre_process_raw(raw)
+    return "" if raw.blank?
+
+    raw = @htmlentities.decode(raw)
+
+    # [acronym]
+    raw.gsub!(/\[acronym=([^\]]+)\](.*?)\[\/acronym\]/im, %{<abbr title="#{$1}">#{$2}</abbr>})
+
+    # [br]
+    raw.gsub!(/\[br\]/i, "\n")
+    raw.gsub!(/<br\s*\/?>/i, "\n")
+    # [hr]
+    raw.gsub!(/\[hr\]/i, "<hr/>")
+
+    # [sub]
+    raw.gsub!(/\[sub\](.*?)\[\/sub\]/im, "<sub>#{$1}</sub>")
+    # [sup]
+    raw.gsub!(/\[sup\](.*?)\[\/sup\]/im, "<sup>#{$1}</sup>")
+
+    # [html]
+    raw.gsub!(/\[html\]/i, "\n```html\n")
+    raw.gsub!(/\[\/html\]/i, "\n```\n")
+
+    # [php]
+    raw.gsub!(/\[php\]/i, "\n```php\n")
+    raw.gsub!(/\[\/php\]/i, "\n```\n")
+
+    # [code]
+    raw.gsub!(/\[\/?code\]/i, "\n```\n")
+
+    # [pre]
+    raw.gsub!(/\[\/?pre\]/i, "\n```\n")
+
+    # [tt]
+    raw.gsub!(/\[\/?tt\]/i, "`")
+
+    # [ftp]
+    raw.gsub!(/\[ftp/i, "[url")
+    raw.gsub!(/\[\/ftp\]/i, "[/url]")
+
+    # [me]
+    raw.gsub!(/\[me=([^\]]*)\](.*?)\[\/me\]/im, "_\\* #{$1} #{$2}_")
+
+    # [li]
+    raw.gsub!(/\[li\](.*?)\[\/li\]/im, "- #{$1}")
+
+    # puts [youtube] on their own line
+    raw.gsub!(/\[youtube\](.*?)\[\/youtube\]/im, "\n#{$1}\n")
+
+    IGNORED_BBCODE.each { |code| raw.gsub!(/\[#{code}[^\]]*\](.*?)\[\/#{code}\]/im, '\1') }
+
+    # ensure [/quote] are on their own line
+    raw.gsub!(/\s*\[\/quote\]\s*/im, "\n[/quote]\n")
+
+    # [quote]
+    raw.gsub!(/\s*\[quote (.+?)\]\s/im) {
+      params = $1
+      post_id = params[/msg(\d+)/, 1]
+      username = params[/author=(.+) link=/, 1]
+      username = @old_to_new_usernames[username] if @old_to_new_usernames.has_key?(username)
+
+      if t = topic_lookup_from_imported_post_id(post_id)
+        %{\n[quote="#{username},post:#{t[:post_number]},topic:#{t[:topic_id]}"]\n}
+      else
+        %{\n[quote="#{username}"]\n}
+      end
+    }
+
+    # remove tapatalk mess
+    raw.gsub!(/Sent from .+? using \[url=.*?\].+?\[\/url\]/i, "")
+    raw.gsub!(/Sent from .+? using .+?\z/i, "")
+
+    raw
+  end
+
+  def mysql_query(sql)
+    @client.query(sql)
+  end
+
+end
+
+ImportScripts::Smf1.new.perform
diff --git a/script/import_scripts/vanilla_mysql.rb b/script/import_scripts/vanilla_mysql.rb
index e59a581ba1b..10882fb4ffa 100644
--- a/script/import_scripts/vanilla_mysql.rb
+++ b/script/import_scripts/vanilla_mysql.rb
@@ -59,8 +59,8 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
       results = mysql_query(
         "SELECT UserID, Name, Title, Location, About, Email,
                 DateInserted, DateLastActive, InsertIPAddress, Admin
-         WHERE id > #{@last_user_id}
          FROM #{TABLE_PREFIX}User
+         WHERE UserID > #{@last_user_id}
          ORDER BY UserID ASC
          LIMIT #{BATCH_SIZE};")
 
@@ -204,8 +204,8 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
       discussions = mysql_query(
         "SELECT DiscussionID, CategoryID, Name, Body,
                 DateInserted, InsertUserID
-         WHERE DiscussionID > #{@last_topic_id}
          FROM #{TABLE_PREFIX}Discussion
+         WHERE DiscussionID > #{@last_topic_id}
          ORDER BY DiscussionID ASC
          LIMIT #{BATCH_SIZE};")
 
@@ -241,8 +241,8 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
       comments = mysql_query(
         "SELECT CommentID, DiscussionID, Body,
                 DateInserted, InsertUserID
-         WHERE CommentID > #{@last_post_id}
          FROM #{TABLE_PREFIX}Comment
+         WHERE CommentID > #{@last_post_id}
          ORDER BY CommentID ASC
          LIMIT #{BATCH_SIZE};")
 
diff --git a/script/import_scripts/xenforo.rb b/script/import_scripts/xenforo.rb
index 217c956369b..ac23dcd0976 100644
--- a/script/import_scripts/xenforo.rb
+++ b/script/import_scripts/xenforo.rb
@@ -156,6 +156,11 @@ class ImportScripts::XenForo < ImportScripts::Base
     # phpBB shortens link text like this, which breaks our markdown processing:
     #   [http://answers.yahoo.com/question/index ... 223AAkkPli](http://answers.yahoo.com/question/index?qid=20070920134223AAkkPli)
     #
+    #Fix for the error: xenforo.rb: 160: in `gsub!': invalid byte sequence in UTF-8 (ArgumentError)
+    if ! s.valid_encoding?
+      s = s.encode("UTF-16be", invalid: :replace, replace: "?").encode('UTF-8')
+    end
+
     # Work around it for now:
     s.gsub!(/\[http(s)?:\/\/(www\.)?/, '[')
 
diff --git a/script/import_scripts/zendesk.rb b/script/import_scripts/zendesk.rb
new file mode 100644
index 00000000000..305431c7a52
--- /dev/null
+++ b/script/import_scripts/zendesk.rb
@@ -0,0 +1,248 @@
+# Zendesk importer
+#
+# You will need a bunch of CSV files:
+#
+# - users.csv
+# - topics.csv (topics in Zendesk are categories in Discourse)
+# - posts.csv (posts in Zendesk are topics in Discourse)
+# - comments.csv (comments in Zendesk are posts in Discourse)
+
+require 'csv'
+require 'reverse_markdown'
+require_relative 'base'
+require_relative 'base/generic_database'
+
+# Call it like this:
+#   RAILS_ENV=production bundle exec ruby script/import_scripts/zendesk.rb DIRNAME
+class ImportScripts::Zendesk < ImportScripts::Base
+  OLD_DOMAIN = "https://support.example.com"
+  BATCH_SIZE = 1000
+
+  def initialize(path)
+    super()
+
+    @path = path
+    @db = ImportScripts::GenericDatabase.new(@path, batch_size: BATCH_SIZE, recreate: true)
+  end
+
+  def execute
+    read_csv_files
+
+    import_categories
+    import_users
+    import_topics
+    import_posts
+  end
+
+  def read_csv_files
+    puts "", "reading CSV files"
+
+    csv_parse("topics") do |row|
+      @db.insert_category(
+        id: row[:id],
+        name: row[:name],
+        description: row[:description],
+        position: row[:position],
+        url: row[:htmlurl]
+      )
+    end
+
+    csv_parse("users") do |row|
+      @db.insert_user(
+        id: row[:id],
+        email: row[:email],
+        name: row[:name],
+        created_at: parse_datetime(row[:createdat]),
+        last_seen_at: parse_datetime(row[:lastloginat]),
+        active: true
+      )
+    end
+
+    csv_parse("posts") do |row|
+      @db.insert_topic(
+        id: row[:id],
+        title: row[:title],
+        raw: row[:details],
+        category_id: row[:topicid],
+        closed: row[:closed] == "TRUE",
+        user_id: row[:authorid],
+        created_at: parse_datetime(row[:createdat]),
+        url: row[:htmlurl]
+      )
+    end
+
+    csv_parse("comments") do |row|
+      @db.insert_post(
+        id: row[:id],
+        raw: row[:body],
+        topic_id: row[:postid],
+        user_id: row[:authorid],
+        created_at: parse_datetime(row[:createdat]),
+        url: row[:htmlurl]
+      )
+    end
+
+    @db.execute_sql(<<~SQL)
+      DELETE FROM user
+      WHERE NOT EXISTS(
+          SELECT 1
+          FROM topic
+          WHERE topic.user_id = user.id
+      ) AND NOT EXISTS(
+          SELECT 1
+          FROM post
+          WHERE post.user_id = user.id
+      )
+    SQL
+
+    @db.sort_posts_by_created_at
+  end
+
+  def parse_datetime(text)
+    return nil if text.blank? || text == "null"
+    DateTime.parse(text)
+  end
+
+  def import_categories
+    puts "", "creating categories"
+    rows = @db.fetch_categories
+
+    create_categories(rows) do |row|
+      {
+        id: row['id'],
+        name: row['name'],
+        description: row['description'],
+        position: row['position'],
+        post_create_action: proc do |category|
+          url = remove_domain(row['url'])
+          Permalink.create(url: url, category_id: category.id) unless permalink_exists?(url)
+        end
+      }
+    end
+  end
+
+  def batches
+    super(BATCH_SIZE)
+  end
+
+  def import_users
+    puts "", "creating users"
+    total_count = @db.count_users
+    last_id = ''
+
+    batches do |offset|
+      rows, last_id = @db.fetch_users(last_id)
+      break if rows.empty?
+
+      next if all_records_exist?(:users, rows.map { |row| row['id'] })
+
+      create_users(rows, total: total_count, offset: offset) do |row|
+        {
+          id: row['id'],
+          email: row['email'],
+          name: row['name'],
+          created_at: row['created_at'],
+          last_seen_at: row['last_seen_at'],
+          active: row['active'] == 1
+        }
+      end
+    end
+  end
+
+  def import_topics
+    puts "", "creating topics"
+    total_count = @db.count_topics
+    last_id = ''
+
+    batches do |offset|
+      rows, last_id = @db.fetch_topics(last_id)
+      break if rows.empty?
+
+      next if all_records_exist?(:posts, rows.map { |row| import_topic_id(row['id']) })
+
+      create_posts(rows, total: total_count, offset: offset) do |row|
+        {
+          id: import_topic_id(row['id']),
+          title: row['title'].present? ? row['title'].strip[0...255] : "Topic title missing",
+          raw: normalize_raw(row['raw']),
+          category: category_id_from_imported_category_id(row['category_id']),
+          user_id: user_id_from_imported_user_id(row['user_id']) || Discourse.system_user.id,
+          created_at: row['created_at'],
+          closed: row['closed'] == 1,
+          post_create_action: proc do |post|
+            url = remove_domain(row['url'])
+            Permalink.create(url: url, topic_id: post.topic.id) unless permalink_exists?(url)
+          end
+        }
+      end
+    end
+  end
+
+  def import_topic_id(topic_id)
+    "T#{topic_id}"
+  end
+
+  def import_posts
+    puts "", "creating posts"
+    total_count = @db.count_posts
+    last_row_id = 0
+
+    batches do |offset|
+      rows, last_row_id = @db.fetch_posts(last_row_id)
+      break if rows.empty?
+
+      next if all_records_exist?(:posts, rows.map { |row| row['id'] })
+
+      create_posts(rows, total: total_count, offset: offset) do |row|
+        topic = topic_lookup_from_imported_post_id(import_topic_id(row['topic_id']))
+
+        if topic.nil?
+          p "MISSING TOPIC #{row['topic_id']}"
+          p row
+          next
+        end
+
+        {
+          id: import_topic_id(row['id']),
+          raw: normalize_raw(row['raw']),
+          user_id: user_id_from_imported_user_id(row['user_id']) || Discourse.system_user.id,
+          topic_id: topic[:topic_id],
+          created_at: row['created_at'],
+          post_create_action: proc do |post|
+            url = remove_domain(row['url'])
+            Permalink.create(url: url, post_id: post.id) unless permalink_exists?(url)
+          end
+        }
+      end
+    end
+  end
+
+  def normalize_raw(raw)
+    raw = raw.gsub('\n', '')
+    raw = ReverseMarkdown.convert(raw)
+    raw
+  end
+
+  def remove_domain(url)
+    url.sub(OLD_DOMAIN, "")
+  end
+
+  def permalink_exists?(url)
+    Permalink.find_by(url: url)
+  end
+
+  def csv_parse(table_name)
+    CSV.foreach(File.join(@path, "#{table_name}.csv"),
+                headers: true,
+                header_converters: :symbol,
+                skip_blanks: true,
+                encoding: 'bom|utf-8') { |row| yield row }
+  end
+end
+
+unless ARGV[0] && Dir.exist?(ARGV[0])
+  puts "", "Usage:", "", "bundle exec ruby script/import_scripts/zendesk.rb DIRNAME", ""
+  exit 1
+end
+
+ImportScripts::Zendesk.new(ARGV[0]).perform
diff --git a/script/plugin-translations.rb b/script/plugin-translations.rb
index bdc85b1f093..c01e804a8ca 100644
--- a/script/plugin-translations.rb
+++ b/script/plugin-translations.rb
@@ -17,12 +17,13 @@ class PluginTxUpdater
     'discourse-assign',
     'discourse-cakeday',
     'discourse-canned-replies',
+    'discourse-characters-required',
     'discourse-chat-integration',
     'discourse-data-explorer',
     'discourse-math',
     'discourse-oauth2-basic',
     'discourse-patreon',
-    # 'discourse-saved-searches', # TODO
+    'discourse-saved-searches',
     'discourse-solved',
     'discourse-staff-notes',
     'discourse-voting'
diff --git a/script/profile_db_generator.rb b/script/profile_db_generator.rb
index 18cf34b5f68..37f757177d9 100644
--- a/script/profile_db_generator.rb
+++ b/script/profile_db_generator.rb
@@ -45,7 +45,7 @@ def create_admin(seq)
   User.new.tap { |admin|
     admin.email = "admin@localhost#{seq}.fake"
     admin.username = "admin#{seq}"
-    admin.password = "password"
+    admin.password = "password12345abc"
     admin.save!
     admin.grant_admin!
     admin.change_trust_level!(TrustLevel[4])
diff --git a/script/pull_translations.rb b/script/pull_translations.rb
old mode 100644
new mode 100755
index 003287b1bcf..8870974c5e6
--- a/script/pull_translations.rb
+++ b/script/pull_translations.rb
@@ -1,323 +1,59 @@
-# This script pulls translation files from Transifex and ensures they are in the format we need.
-# You need the Transifex client installed.
-# http://docs.transifex.com/developer/client/setup
-#
-# Don't use this script to create pull requests. Do translations in Transifex. The Discourse
-# team will pull them in.
+#!/usr/bin/env ruby
 
-require 'open3'
-require 'psych'
-require 'set'
-require 'fileutils'
-require_relative '../lib/i18n/locale_file_walker'
+require 'bundler/inline'
+
+gemfile(true) do
+  gem 'translations-manager', git: 'https://github.com/discourse/translations-manager.git'
+end
+
+require 'translations_manager'
+
+def expand_path(path)
+  File.expand_path("../../#{path}", __FILE__)
+end
+
+def supported_locales
+  Dir.glob(expand_path('config/locales/client.*.yml'))
+    .map { |x| x.split('.')[-2] }
+    .select { |x| x != 'en' }
+    .sort
+end
 
 YML_DIRS = ['config/locales',
             'plugins/poll/config/locales',
+            'plugins/discourse-details/config/locales',
+            'plugins/discourse-local-dates/config/locales',
             'plugins/discourse-narrative-bot/config/locales',
-            'plugins/discourse-presence/config/locales']
+            'plugins/discourse-nginx-performance-report/config/locales',
+            'plugins/discourse-presence/config/locales'].map { |dir| expand_path(dir) }
 YML_FILE_PREFIXES = ['server', 'client']
+TX_CONFIG = expand_path('.tx/config')
+JS_LOCALE_DIR = expand_path('app/assets/javascripts/locales')
 
-if `which tx`.strip.empty?
-  puts '', 'The Transifex client needs to be installed to use this script.'
-  puts 'Instructions are here: http://docs.transifex.com/client/setup/'
-  puts '', 'On Mac:', ''
-  puts '  sudo easy_install pip'
-  puts '  sudo pip install transifex-client', ''
+if ARGV.empty? && TranslationsManager::SUPPORTED_LOCALES != supported_locales
+  STDERR.puts <<~MESSAGE
+
+    The supported locales are out of sync.
+    Please update the TranslationsManager::SUPPORTED_LOCALES in translations-manager.
+    https://github.com/discourse/translations-manager
+
+    The following locales are currently supported by Discourse:
+
+  MESSAGE
+
+  STDERR.puts supported_locales.map { |l| "'#{l}'" }.join(",\n")
   exit 1
 end
 
-if ARGV.include?('force')
-  STDERR.puts 'Usage:   ruby pull_translations.rb [languages]'
-  STDERR.puts 'Example: ruby pull_translations.rb de it', ''
-  exit 1
-end
-
-def get_languages
-  if ARGV.empty?
-    Dir.glob(File.expand_path('../../config/locales/client.*.yml', __FILE__))
-      .map { |x| x.split('.')[-2] }
-  else
-    ARGV
-  end
-end
-
-def yml_path(dir, prefix, language)
-  path = "../../#{dir}/#{prefix}.#{language}.yml"
-  File.expand_path(path, __FILE__)
-end
-
-languages = get_languages.select { |x| x != 'en' }.sort
-
-# ensure that all locale files exists. tx doesn't create missing locale files during pull
-YML_DIRS.each do |dir|
-  YML_FILE_PREFIXES.each do |prefix|
-    languages.each do |language|
-      filename = yml_path(dir, prefix, language)
-      FileUtils.touch(filename) unless File.exists?(filename)
-    end
-  end
-end
-
-puts 'Pulling new translations...', ''
-command = "tx pull --mode=developer --language=#{languages.join(',')} --force"
-
-return_value = Open3.popen2e(command) do |_, stdout_err, wait_thr|
-  while (line = stdout_err.gets)
-    puts line
-  end
-  wait_thr.value
-end
-
-puts ''
-
-unless return_value.success?
-  STDERR.puts 'Something failed. Check the output above.', ''
-  exit return_value.exitstatus
-end
-
-YML_FILE_COMMENTS = <<END
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-END
-
-def yml_path_if_exists(dir, prefix, language)
-  path = yml_path(dir, prefix, language)
-  File.exists?(path) ? path : nil
-end
-
-# Add comments to the top of files and replace the language (first key in YAML file)
-def update_file_header(filename, language)
-  lines = File.readlines(filename)
-  lines.collect! { |line| line.gsub!(/^[a-z_]+:( {})?$/i, "#{language}:\\1") || line }
-
-  File.open(filename, 'w+') do |f|
-    f.puts(YML_FILE_COMMENTS, '') unless lines[0][0] == '#'
-    f.puts(lines)
-  end
-end
-
-class YamlAliasFinder < LocaleFileWalker
-  def initialize
-    @anchors = {}
-    @aliases = Hash.new { |hash, key| hash[key] = [] }
-  end
-
-  def parse_file(filename)
-    document = Psych.parse_file(filename)
-    handle_document(document)
-    { anchors: @anchors, aliases: @aliases }
-  end
-
-  private
-
-  def handle_alias(node, depth, parents)
-    @aliases[node.anchor] << parents.dup
-  end
-
-  def handle_mapping(node, depth, parents)
-    if node.anchor
-      @anchors[parents.dup] = node.anchor
-    end
-  end
-end
-
-class YamlAliasSynchronizer < LocaleFileWalker
-  def initialize(original_alias_data)
-    @anchors = original_alias_data[:anchors]
-    @aliases = original_alias_data[:aliases]
-    @used_anchors = Set.new
-
-    calculate_required_keys
-  end
-
-  def add_to(filename)
-    stream = Psych.parse_stream(File.read(filename))
-    stream.children.each { |document| handle_document(document) }
-
-    add_aliases
-    write_yaml(stream, filename)
-  end
-
-  private
-
-  def calculate_required_keys
-    @required_keys = {}
-
-    @aliases.each_value do |key_sets|
-      key_sets.each do |keys|
-        until keys.empty?
-          add_needed_node(keys)
-          keys = keys.dup
-          keys.pop
-        end
-      end
-    end
-
-    add_needed_node([]) unless @required_keys.empty?
-  end
-
-  def add_needed_node(keys)
-    @required_keys[keys] = { mapping: nil, scalar: nil, alias: nil }
-  end
-
-  def write_yaml(stream, filename)
-    yaml = stream.to_yaml(nil, line_width: -1)
-
-    File.open(filename, 'w') do |file|
-      file.write(yaml)
-    end
-  end
-
-  def handle_scalar(node, depth, parents)
-    super(node, depth, parents)
-
-    if @required_keys.has_key?(parents)
-      @required_keys[parents][:scalar] = node
-    end
-  end
-
-  def handle_alias(node, depth, parents)
-    if @required_keys.has_key?(parents)
-      @required_keys[parents][:alias] = node
-    end
-  end
-
-  def handle_mapping(node, depth, parents)
-    if @anchors.has_key?(parents)
-      node.anchor = @anchors[parents]
-      @used_anchors.add(node.anchor)
-    end
-
-    if @required_keys.has_key?(parents)
-      @required_keys[parents][:mapping] = node
-    end
-  end
-
-  def add_aliases
-    @used_anchors.each do |anchor|
-      @aliases[anchor].each do |keys|
-        parents = []
-        parent_node = @required_keys[[]]
-
-        keys.each_with_index do |key, index|
-          parents << key
-          current_node = @required_keys[parents]
-          is_last = index == keys.size - 1
-          add_node(current_node, parent_node, key, is_last ? anchor : nil)
-          parent_node = current_node
-        end
-      end
-    end
-  end
-
-  def add_node(node, parent_node, scalar_name, anchor)
-    parent_mapping = parent_node[:mapping]
-    parent_mapping.children ||= []
-
-    if node[:scalar].nil?
-      node[:scalar] = Psych::Nodes::Scalar.new(scalar_name)
-      parent_mapping.children << node[:scalar]
-    end
-
-    if anchor.nil?
-      if node[:mapping].nil?
-        node[:mapping] = Psych::Nodes::Mapping.new
-        parent_mapping.children << node[:mapping]
-      end
-    elsif node[:alias].nil?
-      parent_mapping.children << Psych::Nodes::Alias.new(anchor)
-    end
-  end
-end
-
-def get_english_alias_data(dir, prefix)
-  filename = yml_path_if_exists(dir, prefix, 'en')
-  filename ? YamlAliasFinder.new.parse_file(filename) : nil
-end
-
-def add_anchors_and_aliases(english_alias_data, filename)
-  if english_alias_data
-    YamlAliasSynchronizer.new(english_alias_data).add_to(filename)
-  end
-end
-
-def fix_invalid_yml_keys(filename)
-  lines = File.readlines(filename)
-
-  # fix YAML keys which are on the wrong line
-  lines.each { |line| line.gsub!(/^(.*(?:'|"))(\s*\S*:)$/, "\\1\n\\2") }
-
-  File.open(filename, 'w+') do |f|
-    f.puts(lines)
-  end
-end
-
-def fix_invalid_yml(filename)
-  lines = File.readlines(filename)
-
-  lines.each_with_index do |line, i|
-    if line =~ /^\s+#.*$/i
-      # remove comments
-      lines[i] = nil
-    elsif line.strip.empty?
-      # remove empty lines
-      lines[i] = nil
-    elsif line =~ /^\s+.*: (?:""|''|)$/i
-      # remove lines which contain empty string values
-      lines[i] = nil
-    elsif line =~ /^(\s)*.*: \|$/i
-      next_line = i + 1 < lines.size ? lines[i + 1] : nil
-
-      if next_line.nil? || line[/^\s*/].size + 2 != next_line[/^\s*/].size
-        # remove lines which contain the value | without a string in the next line
-        lines[i] = nil
-      end
-    end
-  end.compact!
-
-  loop do
-    lines.each_with_index do |line, i|
-      if line =~ /^\s+\w*:\s*$/i
-        next_line = i + 1 < lines.size ? lines[i + 1] : nil
-
-        if next_line.nil? || line[/^\s*/].size >= next_line[/^\s*/].size
-          # remove lines which have an empty value and are not followed
-          # by a key on the next level
-          lines[i] = nil
-        end
-      end
-    end
-
-    break if lines.compact!.nil?
-  end
-
-  File.open(filename, 'w+') do |f|
-    f.puts(lines)
-  end
-end
-
-YML_DIRS.each do |dir|
-  YML_FILE_PREFIXES.each do |prefix|
-    english_alias_data = get_english_alias_data(dir, prefix)
-
-    languages.each do |language|
-      filename = yml_path_if_exists(dir, prefix, language)
-
-      if filename
-        # The following methods were added to handle a bug in Transifex's yml. Should not be needed now.
-        # fix_invalid_yml_keys(filename)
-        # fix_invalid_yml(filename)
-
-        # TODO check if this is still needed with recent Transifex changes
-        #      Nov 14, 2017: yup, still needed
-        add_anchors_and_aliases(english_alias_data, filename)
-
-        update_file_header(filename, language)
-      end
-    end
-  end
+TranslationsManager::TransifexUpdater.new(YML_DIRS, YML_FILE_PREFIXES, *ARGV).perform(tx_config_filename: TX_CONFIG)
+
+TranslationsManager::SUPPORTED_LOCALES.each do |locale|
+  filename = File.join(JS_LOCALE_DIR, "#{locale}.js.erb")
+  next if File.exists?(filename)
+
+  File.write(filename, <<~ERB)
+    //= depend_on 'client.#{locale}.yml'
+    //= require locales/i18n
+    <%= JsLocaleHelper.output_locale(:#{locale}) %>
+  ERB
 end
diff --git a/script/theme-watcher b/script/theme-watcher
new file mode 100755
index 00000000000..8b07cf2ef4f
--- /dev/null
+++ b/script/theme-watcher
@@ -0,0 +1,185 @@
+#!/usr/bin/env ruby
+
+require 'fileutils'
+require 'pathname'
+require 'tempfile'
+require 'securerandom'
+require 'minitar'
+require 'zlib'
+require 'find'
+require 'net/http'
+require 'net/http/post/multipart'
+require 'uri'
+require 'listen'
+require 'json'
+
+# Work in progress theme watcher for Discourse
+#
+# Monitor a theme directory locally and automatically keep it in sync with Discourse
+
+def usage
+  puts "Usage: theme-watcher DIR SITE"
+  exit 1
+end
+
+WATCHER_SETTINGS_FILE = File.expand_path("~/.discourse-theme-watcher")
+
+$api_key = ENV['DISCOURSE_API_KEY']
+$dir = ARGV[0]
+$site = ARGV[1]
+$theme_id = nil
+
+if $site !~ /https?:\/\//i
+  $site = "http://#{$site}"
+end
+
+puts "Watching #{$dir} and uploading changes to #{$site}"
+
+if !$api_key && File.exist?(WATCHER_SETTINGS_FILE)
+  $api_key = File.read(WATCHER_SETTINGS_FILE).strip
+  puts "Using previously stored api key in #{WATCHER_SETTINGS_FILE}"
+end
+
+if !$api_key
+  puts "No API key found in DISCOURSE_API_KEY env var enter your API key: "
+  $api_key = STDIN.gets.strip
+  puts "Would you like me to store this API key in #{WATCHER_SETTINGS_FILE}? (Yes|No)"
+  answer = STDIN.gets.strip
+  if answer =~ /y(es)?/i
+    File.write WATCHER_SETTINGS_FILE, $api_key
+  end
+end
+
+if !File.exist?("#{$dir}/about.json")
+  puts "No about.json file found in #{dir}!"
+  puts
+  usage
+end
+
+def compress_dir(gzip, dir)
+  sgz = Zlib::GzipWriter.new(File.open(gzip, 'wb'))
+  tar = Archive::Tar::Minitar::Output.new(sgz)
+
+  Dir.chdir(dir + "/../") do
+    Find.find(File.basename(dir)) do |x|
+      Find.prune if File.basename(x)[0] == ?.
+      next if File.directory?(x)
+
+      Minitar.pack_file(x, tar)
+    end
+  end
+ensure
+  tar.close
+  sgz.close
+end
+
+def diagnose_errors(json)
+  count = 0
+  json["theme"]["theme_fields"].each do |row|
+    if (error = row["error"]) && error.length > 0
+      if count == 0
+        puts
+      end
+      count += 1
+      puts
+      puts "Error in #{row["target"]} #{row["name"]}: #{row["error"]}"
+      puts
+    end
+  end
+  count
+end
+
+def upload_theme_field(target: , name: , type_id: , value:)
+  args = {
+    theme: {
+      theme_fields: [{
+        name: name,
+        target: target,
+        type_id: type_id,
+        value: value
+      }]
+    }
+  }
+
+  uri = URI.parse($site + "/admin/themes/#{$theme_id}?api_key=#{$api_key}")
+
+  http = Net::HTTP.new(uri.host, uri.port)
+  request = Net::HTTP::Put.new(uri.request_uri, 'Content-Type' => 'application/json')
+  request.body = args.to_json
+
+  http.start do |h|
+    response = h.request(request)
+    if response.code.to_i == 200
+      json = JSON.parse(response.body)
+      if diagnose_errors(json) == 0
+        puts "(done)"
+      end
+    else
+      puts "Error importing field status: #{response.code}"
+    end
+  end
+end
+
+def upload_full_theme(dir, site)
+  filename = "#{Pathname.new(Dir.tmpdir).realpath}/bundle_#{SecureRandom.hex}.tar.gz"
+  compress_dir(filename, dir)
+
+  # new full upload endpoint
+  uri = URI.parse(site + "/admin/themes/import.json?api_key=#{$api_key}")
+  http = Net::HTTP.new(uri.host, uri.port)
+  File.open(filename) do |tgz|
+
+    request = Net::HTTP::Post::Multipart.new(
+      uri.request_uri,
+      "bundle" => UploadIO.new(tgz, "application/tar+gzip", "bundle.tar.gz"),
+    )
+    response = http.request(request)
+    if response.code.to_i == 201
+      json = JSON.parse(response.body)
+      $theme_id = json["theme"]["id"]
+      if diagnose_errors(json) == 0
+        puts "(done)"
+      end
+    else
+      puts "Error importing theme status: #{response.code}"
+    end
+  end
+
+ensure
+  FileUtils.rm_f filename
+end
+
+print "Uploading theme: "
+upload_full_theme($dir, $site)
+
+def resolve_file(path)
+  dir_len = File.expand_path($dir).length
+  name = File.expand_path(path)[dir_len + 1..-1]
+
+  target, file = name.split("/")
+
+  if ["common", "desktop", "mobile"].include?(target)
+    if file = "#{target}.scss"
+      # a CSS file
+      return [target, "scss", 1]
+    end
+  end
+
+  nil
+end
+
+listener = Listen.to($dir) do |modified, added, removed|
+  if modified.length == 1 &&
+      added.length == 0 &&
+      removed.length == 0 &&
+      (target, name, type_id = resolve_file(modified[0]))
+    print "Updating #{target} #{name}: "
+    upload_theme_field(target: target, name: name, value: File.read(modified[0]), type_id: type_id)
+  else
+    print "Full re-sync is required, re-uploading theme: "
+    upload_full_theme($dir, $site)
+  end
+end
+
+listener.start
+sleep
diff --git a/spec/components/admin_user_index_query_spec.rb b/spec/components/admin_user_index_query_spec.rb
index 2eee6d48521..d31e9b5d7d2 100644
--- a/spec/components/admin_user_index_query_spec.rb
+++ b/spec/components/admin_user_index_query_spec.rb
@@ -2,8 +2,8 @@ require 'rails_helper'
 require_dependency 'admin_user_index_query'
 
 describe AdminUserIndexQuery do
-  def real_users_count(query)
-    query.find_users_query.where('users.id > 0').count
+  def real_users(query)
+    query.find_users_query.where('users.id > 0')
   end
 
   describe "sql order" do
@@ -70,7 +70,7 @@ describe AdminUserIndexQuery do
     TrustLevel.levels.each do |key, value|
       it "#{key} returns no records" do
         query = ::AdminUserIndexQuery.new(query: key.to_s)
-        expect(real_users_count(query)).to eq(0)
+        expect(real_users(query)).to eq([])
       end
     end
 
@@ -80,9 +80,11 @@ describe AdminUserIndexQuery do
 
     TrustLevel.levels.each do |key, value|
       it "finds user with trust #{key}" do
-        Fabricate(:user, trust_level: TrustLevel.levels[key])
+        user = Fabricate(:user, trust_level: value)
+        Fabricate(:user, trust_level: value + 1)
+
         query = ::AdminUserIndexQuery.new(query: key.to_s)
-        expect(real_users_count(query)).to eq(1)
+        expect(real_users(query)).to eq([user])
       end
     end
 
@@ -146,10 +148,11 @@ describe AdminUserIndexQuery do
   describe "with an admin user" do
 
     let!(:user) { Fabricate(:user, admin: true) }
+    let!(:user2) { Fabricate(:user, admin: false) }
 
     it "finds the admin" do
       query = ::AdminUserIndexQuery.new(query: 'admins')
-      expect(real_users_count(query)).to eq(1)
+      expect(real_users(query)).to eq([user])
     end
 
   end
@@ -157,10 +160,11 @@ describe AdminUserIndexQuery do
   describe "with a moderator" do
 
     let!(:user) { Fabricate(:user, moderator: true) }
+    let!(:user2) { Fabricate(:user, moderator: false) }
 
     it "finds the moderator" do
       query = ::AdminUserIndexQuery.new(query: 'moderators')
-      expect(real_users_count(query)).to eq(1)
+      expect(real_users(query)).to eq([user])
     end
 
   end
@@ -168,10 +172,23 @@ describe AdminUserIndexQuery do
   describe "with a silenced user" do
 
     let!(:user) { Fabricate(:user, silenced_till: 1.year.from_now) }
+    let!(:user2) { Fabricate(:user) }
 
     it "finds the silenced user" do
       query = ::AdminUserIndexQuery.new(query: 'silenced')
-      expect(query.find_users.count).to eq(1)
+      expect(real_users(query)).to eq([user])
+    end
+
+  end
+
+  describe "with a staged user" do
+
+    let!(:user) { Fabricate(:user, staged: true) }
+    let!(:user2) { Fabricate(:user, staged: false) }
+
+    it "finds the staged user" do
+      query = ::AdminUserIndexQuery.new(query: 'staged')
+      expect(real_users(query)).to eq([user])
     end
 
   end
diff --git a/spec/components/auth/default_current_user_provider_spec.rb b/spec/components/auth/default_current_user_provider_spec.rb
index b86d60fff13..75a76ef27a1 100644
--- a/spec/components/auth/default_current_user_provider_spec.rb
+++ b/spec/components/auth/default_current_user_provider_spec.rb
@@ -88,6 +88,19 @@ describe Auth::DefaultCurrentUserProvider do
       expect(provider("/?api_key=hello&api_username=#{user.username.downcase}").current_user.id).to eq(user.id)
     end
 
+    it "finds a user for a correct system api key with external id" do
+      user = Fabricate(:user)
+      ApiKey.create!(key: "hello", created_by_id: -1)
+      SingleSignOnRecord.create(user_id: user.id, external_id: "abc", last_payload: '')
+      expect(provider("/?api_key=hello&api_user_external_id=abc").current_user.id).to eq(user.id)
+    end
+
+    it "finds a user for a correct system api key with id" do
+      user = Fabricate(:user)
+      ApiKey.create!(key: "hello", created_by_id: -1)
+      expect(provider("/?api_key=hello&api_user_id=#{user.id}").current_user.id).to eq(user.id)
+    end
+
     context "rate limiting" do
       before do
         RateLimiter.enable
@@ -156,26 +169,6 @@ describe Auth::DefaultCurrentUserProvider do
     expect(provider("/topic/anything/goes", method: "GET").should_update_last_seen?).to eq(true)
   end
 
-  it "correctly supports legacy tokens" do
-    user = Fabricate(:user)
-    token = SecureRandom.hex(16)
-    user_token = UserAuthToken.create!(user_id: user.id, auth_token: token,
-                                       prev_auth_token: token, legacy: true,
-                                       rotated_at: Time.zone.now
-                                      )
-
-    prov = provider("/", "HTTP_COOKIE" => "_t=#{user_token.auth_token}")
-    expect(prov.current_user.id).to eq(user.id)
-
-    # sets a new token up cause it got a global token
-    cookies = {}
-    prov.refresh_session(user, {}, cookies)
-    user.reload
-
-    expect(user.user_auth_tokens.count).to eq(2)
-    expect(cookies["_t"][:value]).not_to eq(token)
-  end
-
   it "correctly rotates tokens" do
     SiteSetting.maximum_session_age = 3
     user = Fabricate(:user)
@@ -320,6 +313,13 @@ describe Auth::DefaultCurrentUserProvider do
     expect(provider("/", "HTTP_COOKIE" => "_t=#{token.unhashed_auth_token}").current_user).to eq(nil)
   end
 
+  it "always unstage users" do
+    staged_user = Fabricate(:user, staged: true)
+    provider("/").log_on_user(staged_user, {}, {})
+    staged_user.reload
+    expect(staged_user.staged).to eq(false)
+  end
+
   context "user api" do
     let :user do
       Fabricate(:user)
diff --git a/spec/components/auth/github_authenticator_spec.rb b/spec/components/auth/github_authenticator_spec.rb
index 1d83fefbc89..17fff987cdf 100644
--- a/spec/components/auth/github_authenticator_spec.rb
+++ b/spec/components/auth/github_authenticator_spec.rb
@@ -1,11 +1,5 @@
 require 'rails_helper'
 
-# In the ghetto ... getting the spec to run in autospec
-#  thing is we need to load up all auth really early pre-fork
-#  it means that the require is not going to get a new copy
-Auth.send(:remove_const, :GithubAuthenticator)
-load 'auth/github_authenticator.rb'
-
 def auth_token_for(user)
   {
     extra: {
@@ -17,7 +11,6 @@ def auth_token_for(user)
     },
     info: {
       email: user.email,
-      email_verified: true,
       nickname: user.username,
       name: user.name,
       image: "https://avatars3.githubusercontent.com/u/#{user.username}",
@@ -31,9 +24,8 @@ describe Auth::GithubAuthenticator do
   let(:user) { Fabricate(:user) }
 
   context 'after_authenticate' do
-
-    it 'can authenticate and create a user record for already existing users' do
-      hash = {
+    let(:data) do
+      {
         extra: {
           all_emails: [{
             email: user.email,
@@ -43,20 +35,53 @@ describe Auth::GithubAuthenticator do
         },
         info: {
           email: user.email,
-          email_verified: true,
           nickname: user.username,
           name: user.name,
         },
         uid: "100"
       }
+    end
 
-      result = authenticator.after_authenticate(hash)
+    it 'can authenticate and create a user record for already existing users' do
+      result = authenticator.after_authenticate(data)
 
       expect(result.user.id).to eq(user.id)
       expect(result.username).to eq(user.username)
       expect(result.name).to eq(user.name)
       expect(result.email).to eq(user.email)
       expect(result.email_valid).to eq(true)
+
+      # Authenticates again when user has Github user info
+      result = authenticator.after_authenticate(data)
+
+      expect(result.email).to eq(user.email)
+      expect(result.email_valid).to eq(true)
+    end
+
+    it 'should use primary email for new user creation over other available emails' do
+      hash = {
+        extra: {
+          all_emails: [{
+            email: "bob@example.com",
+            primary: false,
+            verified: true,
+          }, {
+            email: "john@example.com",
+            primary: true,
+            verified: true,
+          }]
+        },
+        info: {
+          email: "john@example.com",
+          nickname: "john",
+          name: "John Bob",
+        },
+        uid: "100"
+      }
+
+      result = authenticator.after_authenticate(hash)
+
+      expect(result.email).to eq("john@example.com")
     end
 
     it 'will not authenticate for already existing users with an unverified email' do
@@ -70,7 +95,6 @@ describe Auth::GithubAuthenticator do
         },
         info: {
           email: user.email,
-          email_verified: false,
           nickname: user.username,
           name: user.name,
         },
@@ -97,7 +121,6 @@ describe Auth::GithubAuthenticator do
         },
         info: {
           email: "person@example.com",
-          email_verified: true,
           nickname: "person",
           name: "Person Lastname",
         },
@@ -110,7 +133,7 @@ describe Auth::GithubAuthenticator do
       expect(result.username).to eq(hash[:info][:nickname])
       expect(result.name).to eq(hash[:info][:name])
       expect(result.email).to eq(hash[:info][:email])
-      expect(result.email_valid).to eq(hash[:info][:email_verified])
+      expect(result.email_valid).to eq(hash[:info][:email].present?)
     end
 
     it 'will skip blacklisted domains for non existing users' do
@@ -128,7 +151,6 @@ describe Auth::GithubAuthenticator do
         },
         info: {
           email: "not_allowed@blacklist.com",
-          email_verified: true,
           nickname: "person",
           name: "Person Lastname",
         },
@@ -154,7 +176,7 @@ describe Auth::GithubAuthenticator do
             verified: true,
           }, {
             email: "not_allowed@blacklist.com",
-            primary: true,
+            primary: false,
             verified: true,
           }, {
             email: "allowed@whitelist.com",
@@ -164,7 +186,6 @@ describe Auth::GithubAuthenticator do
         },
         info: {
           email: "person@example.com",
-          email_verified: true,
           nickname: "person",
           name: "Person Lastname",
         },
@@ -186,8 +207,6 @@ describe Auth::GithubAuthenticator do
   describe 'avatar retrieval' do
     let(:job_klass) { Jobs::DownloadAvatarFromUrl }
 
-    before { SiteSetting.queue_jobs = true }
-
     context 'when user has a custom avatar' do
       let(:user_avatar) { Fabricate(:user_avatar, custom_upload: Fabricate(:upload)) }
       let(:user_with_custom_avatar) { Fabricate(:user, user_avatar: user_avatar) }
diff --git a/spec/components/auth/google_oauth2_authenticator_spec.rb b/spec/components/auth/google_oauth2_authenticator_spec.rb
index e3af7278baf..525d65f9aa9 100644
--- a/spec/components/auth/google_oauth2_authenticator_spec.rb
+++ b/spec/components/auth/google_oauth2_authenticator_spec.rb
@@ -81,35 +81,4 @@ describe Auth::GoogleOAuth2Authenticator do
       expect(result.extra_data[:name]).to eq("Jane Doe")
     end
   end
-
-  context 'after_create_account' do
-    it 'confirms email' do
-      authenticator = Auth::GoogleOAuth2Authenticator.new
-      user = Fabricate(:user, email: 'realgoogleuser@gmail.com')
-      session = {
-        email_valid: "true",
-        extra_data: {
-          google_user_id: 1,
-          email: 'realgoogleuser@gmail.com'
-        }
-      }
-      authenticator.after_create_account(user, session)
-      expect(user.email_confirmed?).to eq(true)
-    end
-
-    it "doesn't confirm email if it was changed" do
-      authenticator = Auth::GoogleOAuth2Authenticator.new
-      user = Fabricate(:user, email: 'changed@gmail.com')
-      session = {
-        email_valid: "true",
-        extra_data: {
-          google_user_id: 1,
-          email: 'realgoogleuser@gmail.com'
-        }
-      }
-      authenticator.after_create_account(user, session)
-      expect(user.email_confirmed?).to eq(false)
-    end
-  end
-
 end
diff --git a/spec/components/cache_spec.rb b/spec/components/cache_spec.rb
index 1f531f62f61..0d44360edf5 100644
--- a/spec/components/cache_spec.rb
+++ b/spec/components/cache_spec.rb
@@ -73,4 +73,11 @@ describe Cache do
     end
     expect(r).to eq("bill")
   end
+
+  it "can fetch keys with pattern" do
+    cache.write "users:admins", "jeff"
+    cache.write "users:moderators", "bob"
+
+    expect(cache.keys("users:*").count).to eq(2)
+  end
 end
diff --git a/spec/components/column_dropper_spec.rb b/spec/components/column_dropper_spec.rb
deleted file mode 100644
index 3fd75815905..00000000000
--- a/spec/components/column_dropper_spec.rb
+++ /dev/null
@@ -1,140 +0,0 @@
-require 'rails_helper'
-require 'column_dropper'
-
-RSpec.describe ColumnDropper do
-
-  def has_column?(table, column)
-    Topic.exec_sql("SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS
-                    WHERE
-                      table_schema = 'public' AND
-                      table_name = :table AND
-                      column_name = :column
-                   ",
-                      table: table, column: column
-                  ).to_a.length == 1
-  end
-
-  it "can correctly drop columns after correct delay" do
-    Topic.exec_sql "ALTER TABLE topics ADD COLUMN junk int"
-    name = Topic
-      .exec_sql("SELECT name FROM schema_migration_details LIMIT 1")
-      .getvalue(0, 0)
-
-    Topic.exec_sql("UPDATE schema_migration_details SET created_at = :created_at WHERE name = :name",
-                  name: name, created_at: 15.minutes.ago)
-
-    dropped_proc_called = false
-
-    ColumnDropper.drop(
-      table: 'topics',
-      after_migration: name,
-      columns: ['junk'],
-      delay: 20.minutes,
-      on_drop: ->() { dropped_proc_called = true }
-    )
-
-    expect(has_column?('topics', 'junk')).to eq(true)
-    expect(dropped_proc_called).to eq(false)
-
-    ColumnDropper.drop(
-      table: 'topics',
-      after_migration: name,
-      columns: ['junk'],
-      delay: 10.minutes,
-      on_drop: ->() { dropped_proc_called = true }
-    )
-
-    expect(has_column?('topics', 'junk')).to eq(false)
-    expect(dropped_proc_called).to eq(true)
-
-  end
-
-  describe '.mark_readonly' do
-    let(:table_name) { "table_with_readonly_column" }
-
-    before do
-      ActiveRecord::Base.exec_sql <<~SQL
-      CREATE TABLE #{table_name} (topic_id INTEGER, email TEXT);
-
-      INSERT INTO #{table_name} (topic_id, email)
-      VALUES (1, 'something@email.com');
-      SQL
-
-      ColumnDropper.mark_readonly(table_name, 'email')
-    end
-
-    after do
-      ActiveRecord::Base.connection.reset!
-
-      ActiveRecord::Base.exec_sql <<~SQL
-      DROP TABLE IF EXISTS #{table_name};
-      DROP TRIGGER IF EXISTS #{table_name}_email_readonly ON #{table_name};
-      SQL
-    end
-
-    it 'should be droppable' do
-      name = Topic
-        .exec_sql("SELECT name FROM schema_migration_details LIMIT 1")
-        .getvalue(0, 0)
-
-      dropped_proc_called = false
-      ColumnDropper.drop(
-        table: table_name,
-        after_migration: name,
-        columns: ['email'],
-        delay: 0.minutes,
-        on_drop: ->() { dropped_proc_called = true }
-      )
-
-      expect(dropped_proc_called).to eq(true)
-
-    end
-    it 'should prevent updates to the readonly column' do
-      expect do
-        ActiveRecord::Base.connection.raw_connection.exec <<~SQL
-        UPDATE #{table_name}
-        SET email = 'testing@email.com'
-        WHERE topic_id = 1;
-        SQL
-      end.to raise_error(
-        PG::RaiseException,
-        /Discourse: email in #{table_name} is readonly/
-      )
-    end
-
-    it 'should allow updates to the other columns' do
-      ActiveRecord::Base.exec_sql <<~SQL
-      UPDATE #{table_name}
-      SET topic_id = 2
-      WHERE topic_id = 1
-      SQL
-
-      expect(
-        ActiveRecord::Base.exec_sql("SELECT * FROM #{table_name};").values
-      ).to include([2, "something@email.com"])
-    end
-
-    it 'should prevent insertions to the readonly column' do
-      expect do
-        ActiveRecord::Base.connection.raw_connection.exec <<~SQL
-        INSERT INTO #{table_name} (topic_id, email)
-        VALUES (2, 'something@email.com');
-        SQL
-      end.to raise_error(
-        PG::RaiseException,
-        /Discourse: email in table_with_readonly_column is readonly/
-      )
-    end
-
-    it 'should allow insertions to the other columns' do
-      ActiveRecord::Base.exec_sql <<~SQL
-      INSERT INTO #{table_name} (topic_id)
-      VALUES (2);
-      SQL
-
-      expect(
-        ActiveRecord::Base.exec_sql("SELECT * FROM #{table_name} WHERE topic_id = 2;").values
-      ).to include([2, nil])
-    end
-  end
-end
diff --git a/spec/components/composer_messages_finder_spec.rb b/spec/components/composer_messages_finder_spec.rb
index fc5b04d0d28..3425162702c 100644
--- a/spec/components/composer_messages_finder_spec.rb
+++ b/spec/components/composer_messages_finder_spec.rb
@@ -442,7 +442,9 @@ describe ComposerMessagesFinder do
 
         it "notifies if last post is old" do
           topic = Fabricate(:topic, last_posted_at: 181.days.ago)
-          expect(described_class.new(user, composer_action: 'reply', topic_id: topic.id).check_reviving_old_topic).not_to be_blank
+          message = described_class.new(user, composer_action: 'reply', topic_id: topic.id).check_reviving_old_topic
+          expect(message).not_to be_blank
+          expect(message[:body]).to match(/6 months ago/)
         end
       end
 
diff --git a/spec/components/concern/has_custom_fields_spec.rb b/spec/components/concern/has_custom_fields_spec.rb
index f1bf5933cb5..035e0260c5a 100644
--- a/spec/components/concern/has_custom_fields_spec.rb
+++ b/spec/components/concern/has_custom_fields_spec.rb
@@ -98,6 +98,15 @@ describe HasCustomFields do
     end
 
     it "handles arrays properly" do
+
+      CustomFieldsTestItem.register_custom_field_type "array", [:integer]
+      test_item = CustomFieldsTestItem.new
+      test_item.custom_fields = { "array" => ["1"] }
+      test_item.save
+
+      db_item = CustomFieldsTestItem.find(test_item.id)
+      expect(db_item.custom_fields).to eq("array" => [1])
+
       test_item = CustomFieldsTestItem.new
       test_item.custom_fields = { "a" => ["b", "c", "d"] }
       test_item.save
@@ -215,5 +224,31 @@ describe HasCustomFields do
       test_item.save_custom_fields(true)
       expect(test_item.reload.custom_fields).to eq(expected)
     end
+
+    describe "upsert_custom_fields" do
+      it 'upserts records' do
+        test_item = CustomFieldsTestItem.create
+        test_item.upsert_custom_fields('hello' => 'world', 'abc' => 'def')
+
+        # In memory
+        expect(test_item.custom_fields['hello']).to eq('world')
+        expect(test_item.custom_fields['abc']).to eq('def')
+
+        # Persisted
+        test_item.reload
+        expect(test_item.custom_fields['hello']).to eq('world')
+        expect(test_item.custom_fields['abc']).to eq('def')
+
+        # In memory
+        test_item.upsert_custom_fields('abc' => 'ghi')
+        expect(test_item.custom_fields['hello']).to eq('world')
+        expect(test_item.custom_fields['abc']).to eq('ghi')
+
+        # Persisted
+        test_item.reload
+        expect(test_item.custom_fields['hello']).to eq('world')
+        expect(test_item.custom_fields['abc']).to eq('ghi')
+      end
+    end
   end
 end
diff --git a/spec/components/concern/second_factor_manager_spec.rb b/spec/components/concern/second_factor_manager_spec.rb
new file mode 100644
index 00000000000..ccecf68da57
--- /dev/null
+++ b/spec/components/concern/second_factor_manager_spec.rb
@@ -0,0 +1,110 @@
+require 'rails_helper'
+
+RSpec.describe SecondFactorManager do
+  let(:user_second_factor) { Fabricate(:user_second_factor) }
+  let(:user) { user_second_factor.user }
+  let(:another_user) { Fabricate(:user) }
+
+  describe '#totp' do
+    it 'should return the right data' do
+      totp = nil
+
+      expect do
+        totp = another_user.totp
+      end.to change { UserSecondFactor.count }.by(1)
+
+      expect(totp.issuer).to eq(SiteSetting.title)
+      expect(totp.secret).to eq(another_user.reload.user_second_factor.data)
+    end
+  end
+
+  describe '#create_totp' do
+    it 'should create the right record' do
+      second_factor = another_user.create_totp(enabled: true)
+
+      expect(second_factor.method).to eq(UserSecondFactor.methods[:totp])
+      expect(second_factor.data).to be_present
+      expect(second_factor.enabled).to eq(true)
+    end
+
+    describe 'when user has a second factor' do
+      it 'should return nil' do
+        expect(user.create_totp).to eq(nil)
+      end
+    end
+  end
+
+  describe '#totp_provisioning_uri' do
+    it 'should return the right uri' do
+      expect(user.totp_provisioning_uri).to eq(
+        "otpauth://totp/#{SiteSetting.title}:#{user.email}?secret=#{user_second_factor.data}&issuer=#{SiteSetting.title}"
+      )
+    end
+  end
+
+  describe '#authenticate_totp' do
+    it 'should be able to authenticate a token' do
+      freeze_time do
+        expect(user.user_second_factor.last_used).to eq(nil)
+
+        token = user.totp.now
+
+        expect(user.authenticate_totp(token)).to eq(true)
+        expect(user.user_second_factor.last_used).to eq(DateTime.now)
+        expect(user.authenticate_totp(token)).to eq(false)
+      end
+    end
+
+    describe 'when token is blank' do
+      it 'should be false' do
+        expect(user.authenticate_totp(nil)).to eq(false)
+        expect(user.user_second_factor.last_used).to eq(nil)
+      end
+    end
+
+    describe 'when token is invalid' do
+      it 'should be false' do
+        expect(user.authenticate_totp('111111')).to eq(false)
+        expect(user.user_second_factor.last_used).to eq(nil)
+      end
+    end
+  end
+
+  describe '#totp_enabled?' do
+    describe 'when user does not have a second factor record' do
+      it 'should return false' do
+        expect(another_user.totp_enabled?).to eq(false)
+      end
+    end
+
+    describe "when user's second factor record is disabled" do
+      it 'should return false' do
+        user.user_second_factor.update!(enabled: false)
+        expect(user.totp_enabled?).to eq(false)
+      end
+    end
+
+    describe "when user's second factor record is enabled" do
+      it 'should return true' do
+        expect(user.totp_enabled?).to eq(true)
+      end
+    end
+
+    describe 'when SSO is enabled' do
+      it 'should return false' do
+        SiteSetting.sso_url = 'http://someurl.com'
+        SiteSetting.enable_sso = true
+
+        expect(user.totp_enabled?).to eq(false)
+      end
+    end
+
+    describe 'when local login is disabled' do
+      it 'should return false' do
+        SiteSetting.enable_local_logins = false
+
+        expect(user.totp_enabled?).to eq(false)
+      end
+    end
+  end
+end
diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index b6bf69b1b0e..103bbc4f799 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -180,7 +180,7 @@ describe CookedPostProcessor do
         SiteSetting.create_thumbnails = true
 
         Upload.expects(:get_from_url).returns(upload)
-        FastImage.expects(:size).returns([860, 1900])
+        FastImage.expects(:size).returns([860, 2000])
         OptimizedImage.expects(:resize).never
         OptimizedImage.expects(:crop).returns(true)
 
@@ -479,16 +479,35 @@ describe CookedPostProcessor do
 
     before do
       Oneboxer.expects(:onebox)
-        .with("http://www.youtube.com/watch?v=9bZkp7q19f0", post_id: 123, invalidate_oneboxes: true)
+        .with("http://www.youtube.com/watch?v=9bZkp7q19f0", invalidate_oneboxes: true, user_id: nil, category_id: post.topic.category_id)
         .returns("<div>GANGNAM STYLE</div>")
       cpp.post_process_oneboxes
     end
+
     it "inserts the onebox without wrapping p" do
       expect(cpp).to be_dirty
       expect(cpp.html).to match_html "<div>GANGNAM STYLE</div>"
     end
   end
 
+  context ".post_process_oneboxes removes nofollow if add_rel_nofollow_to_user_content is disabled" do
+    let(:post) { build(:post_with_youtube, id: 123) }
+    let(:cpp) { CookedPostProcessor.new(post, invalidate_oneboxes: true) }
+
+    before do
+      SiteSetting.add_rel_nofollow_to_user_content = false
+      Oneboxer.expects(:onebox)
+        .with("http://www.youtube.com/watch?v=9bZkp7q19f0", invalidate_oneboxes: true, user_id: nil, category_id: post.topic.category_id)
+        .returns('<aside class="onebox"><a href="https://www.youtube.com/watch?v=9bZkp7q19f0" rel="nofollow noopener">GANGNAM STYLE</a></aside>')
+      cpp.post_process_oneboxes
+    end
+
+    it "removes nofollow noopener from links" do
+      expect(cpp).to be_dirty
+      expect(cpp.html).to match_html '<aside class="onebox"><a href="https://www.youtube.com/watch?v=9bZkp7q19f0">GANGNAM STYLE</a></aside>'
+    end
+  end
+
   context ".post_process_oneboxes with square image" do
 
     it "generates a onebox-avatar class" do
@@ -506,8 +525,8 @@ describe CookedPostProcessor do
       </html>
       HTML
 
-      stub_request(:head, url).to_return(status: 200)
-      stub_request(:get , url).to_return(status: 200, body: body)
+      stub_request(:head, url)
+      stub_request(:get , url).to_return(body: body)
       FinalDestination.stubs(:lookup_ip).returns('1.2.3.4')
 
       # not an ideal stub but shipping the whole image to fast image can add
@@ -777,4 +796,38 @@ describe CookedPostProcessor do
 
   end
 
+  context "quote processing" do
+    let(:cpp) { CookedPostProcessor.new(cp) }
+    let(:pp) { Fabricate(:post, raw: "This post is ripe for quoting!") }
+
+    context "with an unmodified quote" do
+      let(:cp) do
+        Fabricate(
+          :post,
+          raw: "[quote=\"#{pp.user.username}, post: #{pp.post_number}, topic:#{pp.topic_id}]\nripe for quoting\n[/quote]\ntest"
+        )
+      end
+
+      it "should not be marked as modified" do
+        cpp.post_process_quotes
+        expect(cpp.doc.css('aside.quote.quote-modified')).to be_blank
+      end
+    end
+
+    context "with a modified quote" do
+      let(:cp) do
+        Fabricate(
+          :post,
+          raw: "[quote=\"#{pp.user.username}, post: #{pp.post_number}, topic:#{pp.topic_id}]\nmodified\n[/quote]\ntest"
+        )
+      end
+
+      it "should be marked as modified" do
+        cpp.post_process_quotes
+        expect(cpp.doc.css('aside.quote.quote-modified')).to be_present
+      end
+    end
+
+  end
+
 end
diff --git a/spec/components/crawler_detection_spec.rb b/spec/components/crawler_detection_spec.rb
index 6443d84a529..65f811ef518 100644
--- a/spec/components/crawler_detection_spec.rb
+++ b/spec/components/crawler_detection_spec.rb
@@ -6,9 +6,9 @@ describe CrawlerDetection do
 
     it "can be amended via site settings" do
       SiteSetting.crawler_user_agents = 'Mooble|Kaboodle+*'
-      expect(CrawlerDetection.crawler?("Mozilla/5.0 (compatible; Kaboodle+*/2.1; +http://www.google.com/bot.html)")).to eq(true)
-      expect(CrawlerDetection.crawler?("Mozilla/5.0 (compatible; Mooble+*/2.1; +http://www.google.com/bot.html)")).to eq(true)
-      expect(CrawlerDetection.crawler?("Mozilla/5.0 (compatible; Gooble+*/2.1; +http://www.google.com/bot.html)")).to eq(false)
+      expect(CrawlerDetection.crawler?("Mozilla/5.0 Safari (compatible; Kaboodle+*/2.1; +http://www.google.com/bot.html)")).to eq(true)
+      expect(CrawlerDetection.crawler?("Mozilla/5.0 Safari (compatible; Mooble+*/2.1; +http://www.google.com/bot.html)")).to eq(true)
+      expect(CrawlerDetection.crawler?("Mozilla/5.0 Safari (compatible; Gooble+*/2.1; +http://www.google.com/bot.html)")).to eq(false)
     end
 
     it "returns true for crawler user agents" do
@@ -28,6 +28,12 @@ describe CrawlerDetection do
       expect(described_class.crawler?("Mozilla/5.0 (compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)")).to eq(true)
       expect(described_class.crawler?("Baiduspider+(+http://www.baidu.com/search/spider.htm)")).to eq(true)
       expect(described_class.crawler?("Mozilla/5.0 (compatible; YandexBot/3.0; +http://yandex.com/bots)")).to eq(true)
+
+      expect(described_class.crawler?("DiscourseAPI Ruby Gem 0.19.0")).to eq(true)
+      expect(described_class.crawler?("Pingdom.com_bot_version_1.4_(http://www.pingdom.com/)")).to eq(true)
+      expect(described_class.crawler?("LogicMonitor SiteMonitor/1.0")).to eq(true)
+      expect(described_class.crawler?("Java/1.8.0_151")).to eq(true)
+      expect(described_class.crawler?("Mozilla/5.0 (compatible; Yahoo! Slurp; http://help.yahoo.com/help/us/ysearch/slurp)")).to eq(true)
     end
 
     it "returns false for non-crawler user agents" do
@@ -40,4 +46,103 @@ describe CrawlerDetection do
     end
 
   end
+
+  describe 'allow_crawler?' do
+    it 'returns true if whitelist and blacklist are blank' do
+      expect(CrawlerDetection.allow_crawler?('Googlebot/2.1 (+http://www.google.com/bot.html)')).to eq(true)
+    end
+
+    context 'whitelist is set' do
+      before do
+        SiteSetting.whitelisted_crawler_user_agents = 'Googlebot|Twitterbot'
+      end
+
+      it 'returns true for matching user agents' do
+        expect(CrawlerDetection.allow_crawler?('Googlebot/2.1 (+http://www.google.com/bot.html)')).to eq(true)
+        expect(CrawlerDetection.allow_crawler?('Googlebot-Image/1.0')).to eq(true)
+        expect(CrawlerDetection.allow_crawler?('Twitterbot')).to eq(true)
+      end
+
+      it 'returns false for user agents that do not match' do
+        expect(CrawlerDetection.allow_crawler?('facebookexternalhit/1.1 (+http(s)://www.facebook.com/externalhit_uatext.php)')).to eq(false)
+        expect(CrawlerDetection.allow_crawler?('Mozilla/5.0 (compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)')).to eq(false)
+        expect(CrawlerDetection.allow_crawler?('')).to eq(false)
+      end
+
+      context 'and blacklist is set' do
+        before do
+          SiteSetting.blacklisted_crawler_user_agents = 'Googlebot-Image'
+        end
+
+        it 'ignores the blacklist' do
+          expect(CrawlerDetection.allow_crawler?('Googlebot-Image/1.0')).to eq(true)
+        end
+      end
+    end
+
+    context 'blacklist is set' do
+      before do
+        SiteSetting.blacklisted_crawler_user_agents = 'Googlebot|Twitterbot'
+      end
+
+      it 'returns true for crawlers that do not match' do
+        expect(CrawlerDetection.allow_crawler?('Mediapartners-Google')).to eq(true)
+        expect(CrawlerDetection.allow_crawler?('facebookexternalhit/1.1 (+http(s)://www.facebook.com/externalhit_uatext.php)')).to eq(true)
+        expect(CrawlerDetection.allow_crawler?('')).to eq(true)
+      end
+
+      it 'returns false for user agents that match' do
+        expect(CrawlerDetection.allow_crawler?('Googlebot/2.1 (+http://www.google.com/bot.html)')).to eq(false)
+        expect(CrawlerDetection.allow_crawler?('Googlebot-Image/1.0')).to eq(false)
+        expect(CrawlerDetection.allow_crawler?('Twitterbot')).to eq(false)
+      end
+    end
+  end
+
+  describe 'is_blocked_crawler?' do
+    it 'is false if user agent is a crawler and no whitelist or blacklist is defined' do
+      expect(CrawlerDetection.is_blocked_crawler?('Twitterbot')).to eq(false)
+    end
+
+    it 'is false if user agent is not a crawler and no whitelist or blacklist is defined' do
+      expect(CrawlerDetection.is_blocked_crawler?('Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36')).to eq(false)
+    end
+
+    it 'is true if user agent is a crawler and is not whitelisted' do
+      SiteSetting.whitelisted_crawler_user_agents = 'Googlebot'
+      expect(CrawlerDetection.is_blocked_crawler?('Twitterbot')).to eq(true)
+    end
+
+    it 'is false if user agent is not a crawler and there is a whitelist' do
+      SiteSetting.whitelisted_crawler_user_agents = 'Googlebot'
+      expect(CrawlerDetection.is_blocked_crawler?('Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36')).to eq(false)
+    end
+
+    it 'is true if user agent is a crawler and is blacklisted' do
+      SiteSetting.blacklisted_crawler_user_agents = 'Twitterbot'
+      expect(CrawlerDetection.is_blocked_crawler?('Twitterbot')).to eq(true)
+    end
+
+    it 'is true if user agent is a crawler and is not blacklisted' do
+      SiteSetting.blacklisted_crawler_user_agents = 'Twitterbot'
+      expect(CrawlerDetection.is_blocked_crawler?('Googlebot')).to eq(false)
+    end
+
+    it 'is false if user agent is not a crawler and blacklist is defined' do
+      SiteSetting.blacklisted_crawler_user_agents = 'Mozilla'
+      expect(CrawlerDetection.is_blocked_crawler?('Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36')).to eq(false)
+    end
+
+    it 'is true if user agent is missing and whitelist is defined' do
+      SiteSetting.whitelisted_crawler_user_agents = 'Googlebot'
+      expect(CrawlerDetection.is_blocked_crawler?('')).to eq(true)
+      expect(CrawlerDetection.is_blocked_crawler?(nil)).to eq(true)
+    end
+
+    it 'is false if user agent is missing and blacklist is defined' do
+      SiteSetting.blacklisted_crawler_user_agents = 'Googlebot'
+      expect(CrawlerDetection.is_blocked_crawler?('')).to eq(false)
+      expect(CrawlerDetection.is_blocked_crawler?(nil)).to eq(false)
+    end
+  end
 end
diff --git a/spec/components/discourse_diff_spec.rb b/spec/components/discourse_diff_spec.rb
index b089124e572..b797920b2f0 100644
--- a/spec/components/discourse_diff_spec.rb
+++ b/spec/components/discourse_diff_spec.rb
@@ -60,42 +60,42 @@ describe DiscourseDiff do
   describe "side_by_side_html" do
 
     it "returns two empty divs when no content is diffed" do
-      expect(DiscourseDiff.new("", "").side_by_side_html).to eq("<div class=\"span8\"></div><div class=\"span8 offset1\"></div>")
+      expect(DiscourseDiff.new("", "").side_by_side_html).to eq("<div class=\"revision-content\"></div><div class=\"revision-content\"></div>")
     end
 
     it "returns the diffed content on both sides when there is no difference" do
       before = after = "<p>this is a paragraph</p>"
-      expect(DiscourseDiff.new(before, after).side_by_side_html).to eq("<div class=\"span8\"><p>this is a paragraph</p></div><div class=\"span8 offset1\"><p>this is a paragraph</p></div>")
+      expect(DiscourseDiff.new(before, after).side_by_side_html).to eq("<div class=\"revision-content\"><p>this is a paragraph</p></div><div class=\"revision-content\"><p>this is a paragraph</p></div>")
     end
 
     it "adds <ins> tags around added text on the right div" do
       before = "<p>this is a paragraph</p>"
       after = "<p>this is a great paragraph</p>"
-      expect(DiscourseDiff.new(before, after).side_by_side_html).to eq("<div class=\"span8\"><p>this is a paragraph</p></div><div class=\"span8 offset1\"><p>this is a <ins>great </ins>paragraph</p></div>")
+      expect(DiscourseDiff.new(before, after).side_by_side_html).to eq("<div class=\"revision-content\"><p>this is a paragraph</p></div><div class=\"revision-content\"><p>this is a <ins>great </ins>paragraph</p></div>")
     end
 
     it "adds <del> tags around removed text on the left div" do
       before = "<p>this is a great paragraph</p>"
       after = "<p>this is a paragraph</p>"
-      expect(DiscourseDiff.new(before, after).side_by_side_html).to eq("<div class=\"span8\"><p>this is a <del>great </del>paragraph</p></div><div class=\"span8 offset1\"><p>this is a paragraph</p></div>")
+      expect(DiscourseDiff.new(before, after).side_by_side_html).to eq("<div class=\"revision-content\"><p>this is a <del>great </del>paragraph</p></div><div class=\"revision-content\"><p>this is a paragraph</p></div>")
     end
 
     it "adds .diff-ins class when a paragraph is added" do
       before = "<p>this is the first paragraph</p>"
       after = "<p>this is the first paragraph</p><p>this is the second paragraph</p>"
-      expect(DiscourseDiff.new(before, after).side_by_side_html).to eq("<div class=\"span8\"><p>this is the first paragraph</p></div><div class=\"span8 offset1\"><p>this is the first paragraph</p><p class=\"diff-ins\">this is the second paragraph</p></div>")
+      expect(DiscourseDiff.new(before, after).side_by_side_html).to eq("<div class=\"revision-content\"><p>this is the first paragraph</p></div><div class=\"revision-content\"><p>this is the first paragraph</p><p class=\"diff-ins\">this is the second paragraph</p></div>")
     end
 
     it "adds .diff-del class when a paragraph is removed" do
       before = "<p>this is the first paragraph</p><p>this is the second paragraph</p>"
       after = "<p>this is the second paragraph</p>"
-      expect(DiscourseDiff.new(before, after).side_by_side_html).to eq("<div class=\"span8\"><p class=\"diff-del\">this is the first paragraph</p><p>this is the second paragraph</p></div><div class=\"span8 offset1\"><p>this is the second paragraph</p></div>")
+      expect(DiscourseDiff.new(before, after).side_by_side_html).to eq("<div class=\"revision-content\"><p class=\"diff-del\">this is the first paragraph</p><p>this is the second paragraph</p></div><div class=\"revision-content\"><p>this is the second paragraph</p></div>")
     end
 
     it "does not break diff on character references" do
       before = "<p>'</p>"
       after = "<p></p>"
-      expect(DiscourseDiff.new(before, after).side_by_side_html).to eq("<div class=\"span8\"><p><del>&#39;</del></p></div><div class=\"span8 offset1\"><p></p></div>")
+      expect(DiscourseDiff.new(before, after).side_by_side_html).to eq("<div class=\"revision-content\"><p><del>&#39;</del></p></div><div class=\"revision-content\"><p></p></div>")
     end
 
   end
diff --git a/spec/components/discourse_i18n_spec.rb b/spec/components/discourse_i18n_spec.rb
index 0074b2e464c..72dfc368ce5 100644
--- a/spec/components/discourse_i18n_spec.rb
+++ b/spec/components/discourse_i18n_spec.rb
@@ -11,7 +11,7 @@ describe I18n::Backend::DiscourseI18n do
     backend.store_translations(:en, foo: 'Foo in :en', bar: 'Bar in :en', wat: "Hello %{count}")
     backend.store_translations(:en, items: { one: 'one item', other: "%{count} items" })
     backend.store_translations(:de, bar: 'Bar in :de')
-    backend.store_translations(:'de-AT', baz: 'Baz in :de-AT')
+    backend.store_translations(:ru, baz: 'Baz in :ru')
   end
 
   after do
@@ -41,9 +41,23 @@ describe I18n::Backend::DiscourseI18n do
     expect(results['items.other']).to eq('%{count} items')
   end
 
-  it 'uses fallback locales for searching' do
-    expect(backend.search(:de, 'bar')).to eq('bar' => 'Bar in :de')
-    expect(backend.search(:de, 'foo')).to eq('foo' => 'Foo in :en')
+  describe 'fallbacks' do
+    it 'uses fallback locales for searching' do
+      expect(backend.search(:de, 'bar')).to eq('bar' => 'Bar in :de')
+      expect(backend.search(:de, 'foo')).to eq('foo' => 'Foo in :en')
+    end
+
+    it 'uses fallback locales for translating' do
+      expect(backend.translate(:de, 'bar')).to eq('Bar in :de')
+      expect(backend.translate(:de, 'foo')).to eq('Foo in :en')
+    end
+
+    it 'uses default_locale as fallback when key exists' do
+      SiteSetting.default_locale = 'ru'
+      expect(backend.translate(:de, 'bar')).to eq('Bar in :de')
+      expect(backend.translate(:de, 'baz')).to eq('Baz in :ru')
+      expect(backend.translate(:de, 'foo')).to eq('Foo in :en')
+    end
   end
 
   describe '#exists?' do
@@ -58,23 +72,23 @@ describe I18n::Backend::DiscourseI18n do
     it 'returns true when an existing key and an existing locale is given' do
       expect(backend.exists?(:en, :foo)).to eq(true)
       expect(backend.exists?(:de, :bar)).to eq(true)
-      expect(backend.exists?(:'de-AT', :baz)).to eq(true)
+      expect(backend.exists?(:ru, :baz)).to eq(true)
     end
 
     it 'returns false when a non-existing key and an existing locale is given' do
       expect(backend.exists?(:en, :bogus)).to eq(false)
       expect(backend.exists?(:de, :bogus)).to eq(false)
-      expect(backend.exists?(:'de-AT', :bogus)).to eq(false)
+      expect(backend.exists?(:ru, :bogus)).to eq(false)
     end
 
     it 'returns true when a key is given which is missing from the given locale and exists in a fallback locale' do
       expect(backend.exists?(:de, :foo)).to eq(true)
-      expect(backend.exists?(:'de-AT', :foo)).to eq(true)
+      expect(backend.exists?(:ru, :foo)).to eq(true)
     end
 
     it 'returns true when a key is given which is missing from the given locale and all its fallback locales' do
       expect(backend.exists?(:de, :baz)).to eq(false)
-      expect(backend.exists?(:'de-AT', :bogus)).to eq(false)
+      expect(backend.exists?(:ru, :bogus)).to eq(false)
     end
   end
 
diff --git a/spec/components/discourse_plugin_registry_spec.rb b/spec/components/discourse_plugin_registry_spec.rb
index b6b00018e65..82ecbbe680b 100644
--- a/spec/components/discourse_plugin_registry_spec.rb
+++ b/spec/components/discourse_plugin_registry_spec.rb
@@ -168,6 +168,13 @@ describe DiscoursePluginRegistry do
       expect(registry.admin_javascripts.count).to eq(1)
       expect(registry.javascripts.count).to eq(0)
     end
+
+    it "registers vendored_core_pretty_text properly" do
+      registry.register_asset("my_lib.js", :vendored_core_pretty_text)
+
+      expect(registry.vendored_core_pretty_text.count).to eq(1)
+      expect(registry.javascripts.count).to eq(0)
+    end
   end
 
   context '#register_seed_data' do
diff --git a/spec/components/discourse_redis_spec.rb b/spec/components/discourse_redis_spec.rb
index c1b94859f9e..7e87438d70f 100644
--- a/spec/components/discourse_redis_spec.rb
+++ b/spec/components/discourse_redis_spec.rb
@@ -97,6 +97,7 @@ describe DiscourseRedis do
         $redis.set('test', '1')
       ensure
         fallback_handler.master = true
+        $redis.del('test')
       end
     end
   end
@@ -104,6 +105,10 @@ describe DiscourseRedis do
   describe DiscourseRedis::Connector do
     let(:connector) { DiscourseRedis::Connector.new(config) }
 
+    after do
+      fallback_handler.master = true
+    end
+
     it 'should return the master config when master is up' do
       expect(connector.resolve).to eq(config)
     end
@@ -122,46 +127,44 @@ describe DiscourseRedis do
     end
 
     it 'should return the slave config when master is down' do
-      begin
-        error = Redis::CannotConnectError
-        expect { connector.resolve(BrokenRedis.new(error)) }.to raise_error(Redis::CannotConnectError)
+      error = Redis::CannotConnectError
 
-        config = connector.resolve
+      expect do
+        connector.resolve(BrokenRedis.new(error))
+      end.to raise_error(Redis::CannotConnectError)
 
-        expect(config[:host]).to eq(slave_host)
-        expect(config[:port]).to eq(slave_port)
-      ensure
-        fallback_handler.master = true
-      end
+      config = connector.resolve
+
+      expect(config[:host]).to eq(slave_host)
+      expect(config[:port]).to eq(slave_port)
     end
 
     it "should return the slave config when master's hostname cannot be resolved" do
-      begin
-        error = RuntimeError.new('Name or service not known')
+      error = RuntimeError.new('Name or service not known')
 
-        expect { connector.resolve(BrokenRedis.new(error)) }.to raise_error(error)
-        expect(fallback_handler.master).to eq(false)
+      expect do
+        connector.resolve(BrokenRedis.new(error))
+      end.to raise_error(error)
 
-        config = connector.resolve
+      expect(fallback_handler.master).to eq(false)
 
-        expect(config[:host]).to eq(slave_host)
-        expect(config[:port]).to eq(slave_port)
-        expect(fallback_handler.master).to eq(false)
-      ensure
-        fallback_handler.master = true
-      end
+      config = connector.resolve
+
+      expect(config[:host]).to eq(slave_host)
+      expect(config[:port]).to eq(slave_port)
+      expect(fallback_handler.master).to eq(false)
     end
 
     it "should return the slave config when master is still loading data" do
-      begin
-        Redis::Client.any_instance.expects(:call).with([:info]).returns("someconfig:haha\r\nloading:1")
-        config = connector.resolve
+      Redis::Client.any_instance
+        .expects(:call)
+        .with([:info])
+        .returns("someconfig:haha\r\nloading:1")
 
-        expect(config[:host]).to eq(slave_host)
-        expect(config[:port]).to eq(slave_port)
-      ensure
-        fallback_handler.master = true
-      end
+      config = connector.resolve
+
+      expect(config[:host]).to eq(slave_host)
+      expect(config[:port]).to eq(slave_port)
     end
 
     it "should raise the right error" do
@@ -172,9 +175,13 @@ describe DiscourseRedis do
   end
 
   describe DiscourseRedis::FallbackHandler do
+    before do
+      @original_keepalive_interval = MessageBus.keepalive_interval
+    end
+
     after do
       fallback_handler.master = true
-      MessageBus.keepalive_interval = -1
+      MessageBus.keepalive_interval = @original_keepalive_interval
     end
 
     describe '#initiate_fallback_to_master' do
@@ -188,7 +195,7 @@ describe DiscourseRedis do
 
       it 'should fallback to the master server once it is up' do
         fallback_handler.master = false
-        redis_connection = DiscourseRedis.raw_connection.client
+        redis_connection = mock('test')
         Redis::Client.expects(:new).with(DiscourseRedis.slave_config).returns(redis_connection)
 
         redis_connection.expects(:call).with([:info]).returns(DiscourseRedis::FallbackHandler::MASTER_LINK_STATUS)
@@ -197,6 +204,8 @@ describe DiscourseRedis do
           redis_connection.expects(:call).with([:client, [:kill, 'type', connection_type]])
         end
 
+        redis_connection.expects(:disconnect)
+
         expect(fallback_handler.initiate_fallback_to_master).to eq(true)
         expect(fallback_handler.master).to eq(true)
         expect(Discourse.recently_readonly?).to eq(false)
diff --git a/spec/components/discourse_tagging_spec.rb b/spec/components/discourse_tagging_spec.rb
new file mode 100644
index 00000000000..fb1ce805460
--- /dev/null
+++ b/spec/components/discourse_tagging_spec.rb
@@ -0,0 +1,161 @@
+# encoding: UTF-8
+
+require 'rails_helper'
+require 'discourse_tagging'
+
+# More tests are found in the category_tag_spec integration specs
+
+describe DiscourseTagging do
+
+  let(:admin) { Fabricate(:admin) }
+  let(:user)  { Fabricate(:user) }
+
+  let!(:tag1) { Fabricate(:tag, name: "fun") }
+  let!(:tag2) { Fabricate(:tag, name: "fun2") }
+  let!(:tag3) { Fabricate(:tag, name: "fun3") }
+
+  before do
+    SiteSetting.tagging_enabled = true
+    SiteSetting.min_trust_to_create_tag = 0
+    SiteSetting.min_trust_level_to_tag_topics = 0
+  end
+
+  describe 'filter_allowed_tags' do
+    context 'for input fields' do
+      it "doesn't return selected tags if there's a search term" do
+        tags = DiscourseTagging.filter_allowed_tags(Tag.all, Guardian.new(user),
+          selected_tags: [tag2.name],
+          for_input: true,
+          term: 'fun'
+        ).map(&:name)
+        expect(tags).to contain_exactly(tag1.name, tag3.name)
+      end
+
+      it "doesn't return selected tags if there's no search term" do
+        tags = DiscourseTagging.filter_allowed_tags(Tag.all, Guardian.new(user),
+          selected_tags: [tag2.name],
+          for_input: true
+        ).map(&:name)
+        expect(tags).to contain_exactly(tag1.name, tag3.name)
+      end
+
+      context 'with tags visible only to staff' do
+        let(:hidden_tag) { Fabricate(:tag) }
+        let!(:staff_tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name]) }
+
+        it 'should return all tags to staff' do
+          tags = DiscourseTagging.filter_allowed_tags(Tag.all, Guardian.new(admin)).to_a
+          expect(tags).to contain_exactly(tag1, tag2, tag3, hidden_tag)
+          expect(tags.size).to eq(4)
+        end
+
+        it 'should not return hidden tag to non-staff' do
+          tags = DiscourseTagging.filter_allowed_tags(Tag.all, Guardian.new(user)).to_a
+          expect(tags).to contain_exactly(tag1, tag2, tag3)
+          expect(tags.size).to eq(3)
+        end
+      end
+    end
+  end
+
+  describe 'filter_visible' do
+    let(:hidden_tag) { Fabricate(:tag) }
+    let!(:staff_tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name]) }
+    let(:topic) { Fabricate(:topic, tags: [tag1, tag2, tag3, hidden_tag]) }
+
+    it 'returns all tags to staff' do
+      tags = DiscourseTagging.filter_visible(topic.tags, Guardian.new(admin))
+      expect(tags.size).to eq(4)
+      expect(tags).to contain_exactly(tag1, tag2, tag3, hidden_tag)
+    end
+
+    it 'does not return hidden tags to non-staff' do
+      tags = DiscourseTagging.filter_visible(topic.tags, Guardian.new(user))
+      expect(tags.size).to eq(3)
+      expect(tags).to contain_exactly(tag1, tag2, tag3)
+    end
+
+    it 'returns staff only tags to everyone' do
+      create_staff_tags(['important'])
+      staff_tag = Tag.where(name: 'important').first
+      topic.tags << staff_tag
+      tags = DiscourseTagging.filter_visible(topic.tags, Guardian.new(user))
+      expect(tags.size).to eq(4)
+      expect(tags).to contain_exactly(tag1, tag2, tag3, staff_tag)
+    end
+  end
+
+  describe 'tag_topic_by_names' do
+    context 'staff-only tags' do
+      let(:topic) { Fabricate(:topic) }
+
+      before do
+        create_staff_tags(['alpha'])
+      end
+
+      it "regular users can't add staff-only tags" do
+        valid = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(user), ['alpha'])
+        expect(valid).to eq(false)
+        expect(topic.errors[:base]&.first).to eq(I18n.t("tags.staff_tag_disallowed", tag: 'alpha'))
+      end
+
+      it 'staff can add staff-only tags' do
+        valid = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(admin), ['alpha'])
+        expect(valid).to eq(true)
+        expect(topic.errors[:base]).to be_empty
+      end
+    end
+
+    context 'respects category minimum_required_tags setting' do
+      let(:category) { Fabricate(:category, minimum_required_tags: 2) }
+      let(:topic) { Fabricate(:topic, category: category) }
+
+      it 'when tags are not present' do
+        valid = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(user), [])
+        expect(valid).to eq(false)
+        expect(topic.errors[:base]&.first).to eq(I18n.t("tags.minimum_required_tags", count: category.minimum_required_tags))
+      end
+
+      it 'when tags are less than minimum_required_tags' do
+        valid = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(user), [tag1.name])
+        expect(valid).to eq(false)
+        expect(topic.errors[:base]&.first).to eq(I18n.t("tags.minimum_required_tags", count: category.minimum_required_tags))
+      end
+
+      it 'when tags are equal to minimum_required_tags' do
+        valid = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(user), [tag1.name, tag2.name])
+        expect(valid).to eq(true)
+        expect(topic.errors[:base]).to be_empty
+      end
+
+      it 'lets admin tag a topic regardless of minimum_required_tags' do
+        valid = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(admin), [tag1.name])
+        expect(valid).to eq(true)
+        expect(topic.errors[:base]).to be_empty
+      end
+    end
+
+    context 'hidden tags' do
+      let(:hidden_tag) { Fabricate(:tag) }
+      let!(:staff_tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name]) }
+      let(:topic) { Fabricate(:topic, user: user) }
+      let(:post) { Fabricate(:post, user: user, topic: topic, post_number: 1) }
+
+      it 'user cannot add hidden tag by knowing its name' do
+        expect(PostRevisor.new(post).revise!(topic.user, raw: post.raw + " edit", tags: [hidden_tag.name])).to be_falsey
+        expect(topic.reload.tags).to be_empty
+      end
+
+      it 'admin can add hidden tag' do
+        expect(PostRevisor.new(post).revise!(admin, raw: post.raw, tags: [hidden_tag.name])).to be_truthy
+        expect(topic.reload.tags).to eq([hidden_tag])
+      end
+
+      it 'user does not get an error when editing their topic with a hidden tag' do
+        PostRevisor.new(post).revise!(admin, raw: post.raw, tags: [hidden_tag.name])
+        expect(PostRevisor.new(post).revise!(topic.user, raw: post.raw + " edit", tags: [])).to be_truthy
+        expect(topic.reload.tags).to eq([hidden_tag])
+      end
+    end
+  end
+end
diff --git a/spec/discourse_tagging_spec.rb b/spec/components/discourse_tagging_spec.rb.rb
similarity index 100%
rename from spec/discourse_tagging_spec.rb
rename to spec/components/discourse_tagging_spec.rb.rb
diff --git a/spec/components/distributed_cache_spec.rb b/spec/components/distributed_cache_spec.rb
index e1256346acb..a1b442edf17 100644
--- a/spec/components/distributed_cache_spec.rb
+++ b/spec/components/distributed_cache_spec.rb
@@ -17,12 +17,16 @@ describe DistributedCache do
     DistributedCache.new(name, manager: @manager)
   end
 
+  let :cache_name do
+    SecureRandom.hex
+  end
+
   let! :cache1 do
-    cache("test")
+    cache(cache_name)
   end
 
   let! :cache2 do
-    cache("test")
+    cache(cache_name)
   end
 
   it 'allows us to store Set' do
diff --git a/spec/components/email/message_builder_spec.rb b/spec/components/email/message_builder_spec.rb
index 9283f87262e..9ed9200d519 100644
--- a/spec/components/email/message_builder_spec.rb
+++ b/spec/components/email/message_builder_spec.rb
@@ -247,6 +247,17 @@ describe Email::MessageBuilder do
 
   end
 
+  context "PM multiple participants" do
+    let(:pm_multiple) { Email::MessageBuilder.new(to_address,
+                                                               body: 'hello world',
+                                                               private_reply: true,
+                                                               participants: "user1, user2") }
+
+    it "lists participants out" do
+      expect(pm_multiple.body).to match('hello world\nuser1, user2')
+    end
+  end
+
   context "from field" do
 
     it "has the default from" do
diff --git a/spec/components/email/processor_spec.rb b/spec/components/email/processor_spec.rb
index d7c5113f9b2..727ea23bb58 100644
--- a/spec/components/email/processor_spec.rb
+++ b/spec/components/email/processor_spec.rb
@@ -87,6 +87,20 @@ describe Email::Processor do
 
   end
 
+  context "from reply to email address" do
+
+    let(:mail) { "From: reply@bar.com\nTo: reply@bar.com\nSubject: FOO BAR\n\nFoo foo bar bar?" }
+
+    it "ignores the email" do
+      Email::Receiver.any_instance.stubs(:process_internal).raises(Email::Receiver::FromReplyByAddressError.new)
+
+      expect {
+        Email::Processor.process!(mail)
+      }.to change { EmailLog.count }.by(0)
+    end
+
+  end
+
   context "mailinglist mirror" do
     before do
       SiteSetting.email_in = true
diff --git a/spec/components/email/receiver_spec.rb b/spec/components/email/receiver_spec.rb
index d9da0a04351..a6525afce8c 100644
--- a/spec/components/email/receiver_spec.rb
+++ b/spec/components/email/receiver_spec.rb
@@ -78,6 +78,13 @@ describe Email::Receiver do
     expect { process(:bad_destinations) }.to raise_error(Email::Receiver::BadDestinationAddress)
   end
 
+  it "raises an OldDestinationError when notification is too old" do
+    topic = Fabricate(:topic, id: 424242)
+    post  = Fabricate(:post, topic: topic, id: 123456, created_at: 1.year.ago)
+
+    expect { process(:old_destination) }.to raise_error(Email::Receiver::OldDestinationError)
+  end
+
   it "raises a BouncerEmailError when email is a bounced email" do
     expect { process(:bounced_email) }.to raise_error(Email::Receiver::BouncedEmailError)
     expect(IncomingEmail.last.is_bounce).to eq(true)
@@ -100,17 +107,12 @@ describe Email::Receiver do
     let!(:email_log) { Fabricate(:email_log, user: user, bounce_key: bounce_key) }
     let!(:email_log_2) { Fabricate(:email_log, user: user, bounce_key: bounce_key_2) }
 
-    before do
-      $redis.del("bounce_score:#{user.email}:#{Date.today}")
-      $redis.del("bounce_score:#{user.email}:#{2.days.from_now.to_date}")
-    end
-
     it "deals with soft bounces" do
       expect { process(:soft_bounce_via_verp) }.to raise_error(Email::Receiver::BouncedEmailError)
 
       email_log.reload
       expect(email_log.bounced).to eq(true)
-      expect(email_log.user.user_stat.bounce_score).to eq(1)
+      expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.soft_bounce_score)
     end
 
     it "deals with hard bounces" do
@@ -118,17 +120,30 @@ describe Email::Receiver do
 
       email_log.reload
       expect(email_log.bounced).to eq(true)
-      expect(email_log.user.user_stat.bounce_score).to eq(2)
-
-      freeze_time 2.days.from_now
+      expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score)
 
       expect { process(:hard_bounce_via_verp_2) }.to raise_error(Email::Receiver::BouncedEmailError)
 
       email_log_2.reload
-      expect(email_log_2.user.user_stat.bounce_score).to eq(4)
+      expect(email_log_2.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score * 2)
       expect(email_log_2.bounced).to eq(true)
     end
 
+    it "automatically deactive users once they reach the 'bounce_score_threshold_deactivate' threshold" do
+      expect(user.active).to eq(true)
+
+      user.user_stat.bounce_score = SiteSetting.bounce_score_threshold_deactivate - 1
+      user.user_stat.save!
+
+      expect { process(:soft_bounce_via_verp) }.to raise_error(Email::Receiver::BouncedEmailError)
+
+      user.reload
+      email_log.reload
+
+      expect(email_log.bounced).to eq(true)
+      expect(user.active).to eq(false)
+    end
+
   end
 
   context "reply" do
@@ -150,6 +165,10 @@ describe Email::Receiver do
       expect { process(:reply_user_not_matching) }.to raise_error(Email::Receiver::ReplyUserNotMatchingError)
     end
 
+    it "raises a FromReplyByAddressError when the email is from the reply by email address" do
+      expect { process(:from_reply_by_email_address) }.to raise_error(Email::Receiver::FromReplyByAddressError)
+    end
+
     it "raises a TopicNotFoundError when the topic was deleted" do
       topic.update_columns(deleted_at: 1.day.ago)
       expect { process(:reply_user_matching) }.to raise_error(Email::Receiver::TopicNotFoundError)
@@ -183,7 +202,7 @@ describe Email::Receiver do
 
     it "works" do
       expect { process(:text_reply) }.to change { topic.posts.count }
-      expect(topic.posts.last.raw).to eq("This is a text reply :)")
+      expect(topic.posts.last.raw).to eq("This is a text reply :)\n\nEmail parsing should not break because of a UTF-8 character: ’")
       expect(topic.posts.last.via_email).to eq(true)
       expect(topic.posts.last.cooked).not_to match(/<br/)
 
@@ -191,6 +210,12 @@ describe Email::Receiver do
       expect(topic.posts.last.raw).to eq("This is a **HTML** reply ;)")
     end
 
+    it "automatically elides gmail quotes" do
+      SiteSetting.always_show_trimmed_content = true
+      expect { process(:gmail_html_reply) }.to change { topic.posts.count }
+      expect(topic.posts.last.raw).to eq("This is a **GMAIL** reply ;)\n\n<details class='elided'>\n<summary title='Show trimmed content'>&#183;&#183;&#183;</summary>\n\nThis is the *elided* part!\n\n</details>")
+    end
+
     it "doesn't process email with same message-id more than once" do
       expect do
         process(:text_reply)
@@ -210,10 +235,10 @@ describe Email::Receiver do
 
       expect { process(:reply_with_8bit_encoding) }.to change { topic.posts.count }
       expect(topic.posts.last.raw).to eq("hab vergessen kritische zeichen einzufügen:\näöüÄÖÜß")
-
     end
 
-    it "prefers text over html" do
+    it "prefers text over html when site setting is disabled" do
+      SiteSetting.incoming_email_prefer_html = false
       expect { process(:text_and_html_reply) }.to change { topic.posts.count }
       expect(topic.posts.last.raw).to eq("This is the *text* part.")
     end
@@ -227,7 +252,7 @@ describe Email::Receiver do
     it "uses text when prefer_html site setting is enabled but no html is available" do
       SiteSetting.incoming_email_prefer_html = true
       expect { process(:text_reply) }.to change { topic.posts.count }
-      expect(topic.posts.last.raw).to eq("This is a text reply :)")
+      expect(topic.posts.last.raw).to eq("This is a text reply :)\n\nEmail parsing should not break because of a UTF-8 character: ’")
     end
 
     it "removes the 'on <date>, <contact> wrote' quoting line" do
@@ -363,7 +388,7 @@ describe Email::Receiver do
     end
 
     it "supports attached images in TEXT part" do
-      SiteSetting.queue_jobs = true
+      SiteSetting.incoming_email_prefer_html = false
 
       expect { process(:no_body_with_image) }.to change { topic.posts.count }
       expect(topic.posts.last.raw).to match(/<img/)
@@ -373,7 +398,6 @@ describe Email::Receiver do
     end
 
     it "supports attached images in HTML part" do
-      SiteSetting.queue_jobs = true
       SiteSetting.incoming_email_prefer_html = true
 
       expect { process(:inline_image) }.to change { topic.posts.count }
@@ -390,6 +414,12 @@ describe Email::Receiver do
       expect(topic.posts.last.raw).to_not match(/text\.txt/)
     end
 
+    it "supports emails with just an attachment" do
+      SiteSetting.authorized_extensions = "pdf"
+      expect { process(:attached_pdf_file) }.to change { topic.posts.count }
+      expect(topic.posts.last.raw).to match(/discourse\.pdf/)
+    end
+
     it "supports liking via email" do
       expect { process(:like) }.to change(PostAction, :count)
     end
@@ -399,7 +429,7 @@ describe Email::Receiver do
       expect(topic.posts.last.created_at).to be_within(1.minute).of(DateTime.now)
     end
 
-    it "accepts emails with wrong reply key if the system knows about the forwareded email" do
+    it "accepts emails with wrong reply key if the system knows about the forwarded email" do
       Fabricate(:incoming_email,
                 raw: <<~RAW,
                   Return-Path: <discourse@bar.com>
@@ -536,6 +566,27 @@ describe Email::Receiver do
 
     end
 
+    context "when message sent to a group has no key and find_related_post_with_key is enabled" do
+      let!(:topic) do
+        SiteSetting.find_related_post_with_key = true
+        process(:email_reply_1)
+        Topic.last
+      end
+
+      it "creates a reply when the sender and referenced message id are known" do
+        expect { process(:email_reply_2) }.to change { topic.posts.count }.by(1).and change { Topic.count }.by(0)
+      end
+
+      it "creates a new topic when the sender is not known" do
+        IncomingEmail.where(message_id: '34@foo.bar.mail').update(cc_addresses: 'three@foo.com')
+        expect { process(:email_reply_2) }.to change { topic.posts.count }.by(0).and change { Topic.count }.by(1)
+      end
+
+      it "creates a new topic when the referenced message id is not known" do
+        IncomingEmail.where(message_id: '34@foo.bar.mail').update(message_id: '99@foo.bar.mail')
+        expect { process(:email_reply_2) }.to change { topic.posts.count }.by(0).and change { Topic.count }.by(1)
+      end
+    end
   end
 
   context "new topic in a category" do
@@ -630,24 +681,24 @@ describe Email::Receiver do
       SiteSetting.alternative_reply_by_email_addresses = nil
     end
 
-    it "is empty by default" do
-      expect(Email::Receiver.reply_by_email_address_regex).to eq(//)
+    it "it maches nothing if there is not reply_by_email_address" do
+      expect(Email::Receiver.reply_by_email_address_regex).to eq(/$a/)
     end
 
     it "uses 'reply_by_email_address' site setting" do
       SiteSetting.reply_by_email_address = "foo+%{reply_key}@bar.com"
-      expect(Email::Receiver.reply_by_email_address_regex).to eq(/foo\+(\h{32})@bar\.com/)
+      expect(Email::Receiver.reply_by_email_address_regex).to eq(/foo\+?(\h{32})?@bar\.com/)
     end
 
     it "uses 'alternative_reply_by_email_addresses' site setting" do
       SiteSetting.alternative_reply_by_email_addresses = "alt.foo+%{reply_key}@bar.com"
-      expect(Email::Receiver.reply_by_email_address_regex).to eq(/alt\.foo\+(\h{32})@bar\.com/)
+      expect(Email::Receiver.reply_by_email_address_regex).to eq(/alt\.foo\+?(\h{32})?@bar\.com/)
     end
 
     it "combines both 'reply_by_email' settings" do
       SiteSetting.reply_by_email_address = "foo+%{reply_key}@bar.com"
       SiteSetting.alternative_reply_by_email_addresses = "alt.foo+%{reply_key}@bar.com"
-      expect(Email::Receiver.reply_by_email_address_regex).to eq(/foo\+(\h{32})@bar\.com|alt\.foo\+(\h{32})@bar\.com/)
+      expect(Email::Receiver.reply_by_email_address_regex).to eq(/foo\+?(\h{32})?@bar\.com|alt\.foo\+?(\h{32})?@bar\.com/)
     end
 
   end
@@ -674,7 +725,7 @@ describe Email::Receiver do
     end
   end
 
-  context "no staged users on error" do
+  context "staged users" do
     before do
       SiteSetting.enable_staged_users = true
     end
@@ -711,7 +762,7 @@ describe Email::Receiver do
       include_examples "no staged users", :unsubscribe_new_user, Email::Receiver::UnsubscribeNotAllowed
     end
 
-    context "when email address is not on whitelist" do
+    context "when From email address is not on whitelist" do
       before do
         SiteSetting.email_domains_whitelist = "example.com|bar.com"
       end
@@ -719,7 +770,7 @@ describe Email::Receiver do
       include_examples "no staged users", :blacklist_whitelist_email, Email::Receiver::EmailNotAllowed
     end
 
-    context "when email address is on blacklist" do
+    context "when From email address is on blacklist" do
       before do
         SiteSetting.email_domains_blacklist = "email.com|mail.com"
       end
@@ -727,6 +778,30 @@ describe Email::Receiver do
       include_examples "no staged users", :blacklist_whitelist_email, Email::Receiver::EmailNotAllowed
     end
 
+    context "blacklist and whitelist for To and Cc" do
+      before do
+        Fabricate(:group, incoming_email: "some_group@bar.com")
+      end
+
+      it "does not create staged users for email addresses not on whitelist" do
+        SiteSetting.email_domains_whitelist = "mail.com|example.com"
+        process(:blacklist_whitelist_email)
+
+        expect(User.find_by_email("alice@foo.com")).to be_nil
+        expect(User.find_by_email("bob@foo.com")).to be_nil
+        expect(User.find_by_email("carol@example.com")).to be_present
+      end
+
+      it "does not create staged users for email addresses on blacklist" do
+        SiteSetting.email_domains_blacklist = "email.com|foo.com"
+        process(:blacklist_whitelist_email)
+
+        expect(User.find_by_email("alice@foo.com")).to be_nil
+        expect(User.find_by_email("bob@foo.com")).to be_nil
+        expect(User.find_by_email("carol@example.com")).to be_present
+      end
+    end
+
     context "when destinations aren't matching any of the incoming emails" do
       include_examples "no staged users", :bad_destinations, Email::Receiver::BadDestinationAddress
     end
@@ -798,16 +873,17 @@ describe Email::Receiver do
     end
   end
 
-  context "mailinglist mirror" do
+  context "mailing list mirror" do
+    let!(:category) { Fabricate(:mailinglist_mirror_category) }
+
     before do
       SiteSetting.block_auto_generated_emails = true
       SiteSetting.find_related_post_with_key = true
-
-      Fabricate(:mailinglist_mirror_category)
     end
 
     it "should allow creating topic even when email is autogenerated" do
       expect { process(:mailinglist) }.to change { Topic.count }
+      expect(IncomingEmail.last.is_auto_generated).to eq(false)
     end
 
     it "should allow replying without reply key" do
@@ -816,5 +892,44 @@ describe Email::Receiver do
 
       expect { process(:mailinglist_reply) }.to change { topic.posts.count }
     end
+
+    it "should skip validations for staged users" do
+      Fabricate(:user, email: "alice@foo.com", staged: true)
+      expect { process(:mailinglist_short_message) }.to change { Topic.count }
+    end
+
+    it "should skip validations for regular users" do
+      Fabricate(:user, email: "alice@foo.com")
+      expect { process(:mailinglist_short_message) }.to change { Topic.count }
+    end
+
+    context "read-only category" do
+      before do
+        category.set_permissions(everyone: :readonly)
+        category.save
+
+        Fabricate(:user, email: "alice@foo.com")
+        Fabricate(:user, email: "bob@bar.com")
+      end
+
+      it "should allow creating topic within read-only category" do
+        expect { process(:mailinglist) }.to change { Topic.count }
+      end
+
+      it "should allow replying within read-only category" do
+        process(:mailinglist)
+        topic = Topic.last
+
+        expect { process(:mailinglist_reply) }.to change { topic.posts.count }
+      end
+    end
+  end
+
+  it "tries to fix unparsable email addresses in To and CC headers" do
+    expect { process(:unparsable_email_addresses) }.to raise_error(Email::Receiver::BadDestinationAddress)
+
+    email = IncomingEmail.last
+    expect(email.to_addresses).to eq("foo@bar.com")
+    expect(email.cc_addresses).to eq("bob@example.com;carol@example.com")
   end
 end
diff --git a/spec/components/email/sender_spec.rb b/spec/components/email/sender_spec.rb
index 72124c68549..7c73e7e2fb0 100644
--- a/spec/components/email/sender_spec.rb
+++ b/spec/components/email/sender_spec.rb
@@ -211,9 +211,9 @@ describe Email::Sender do
         email_sender.send
 
         references = [
+          "<topic/#{topic.id}@test.localhost>",
           "<topic/#{topic.id}/#{post_3.id}@test.localhost>",
           "<topic/#{topic.id}/#{post_2.id}@test.localhost>",
-          "<topic/#{topic.id}@test.localhost>",
         ]
 
         expect(message.header['References'].to_s).to eq(references.join(" "))
@@ -231,9 +231,9 @@ describe Email::Sender do
         expect(message.header['Message-Id'].to_s).to eq("<#{post_4_incoming_email.message_id}>")
 
         references = [
+          "<#{topic_incoming_email.message_id}>",
           "<topic/#{topic.id}/#{post_3.id}@test.localhost>",
           "<#{post_2_incoming_email.message_id}>",
-          "<#{topic_incoming_email.message_id}>",
         ]
 
         expect(message.header['References'].to_s).to eq(references.join(" "))
diff --git a/spec/components/excerpt_parser_spec.rb b/spec/components/excerpt_parser_spec.rb
new file mode 100644
index 00000000000..8410b9d5e45
--- /dev/null
+++ b/spec/components/excerpt_parser_spec.rb
@@ -0,0 +1,35 @@
+require "rails_helper"
+require "excerpt_parser"
+
+describe ExcerptParser do
+
+  it "handles nested <details> blocks" do
+    html = <<~HTML.strip
+      <details>
+      <summary>
+      FOO</summary>
+      <details>
+      <summary>
+      BAR</summary>
+      <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce ultrices, ex bibendum vestibulum vestibulum, mi velit pulvinar risus, sed consequat eros libero in eros. Fusce luctus mattis mauris, vitae semper lorem sodales quis. Donec pellentesque lacus ac ante aliquam, tincidunt iaculis risus interdum. In ullamcorper cursus massa ut lacinia. Donec quis diam finibus, rutrum odio eu, maximus leo. Nulla facilisi. Nullam suscipit quam et bibendum sagittis. Praesent sollicitudin neque at luctus ornare. Maecenas tristique dapibus risus, ac dictum ipsum gravida aliquam. Phasellus vehicula eu arcu sed imperdiet. Vestibulum ornare eros a nisi faucibus vehicula. Quisque congue placerat nulla, nec finibus nulla ultrices vitae. Quisque ac mi sem. Curabitur eu porttitor justo. Etiam dignissim in orci iaculis congue. Donec tempus cursus orci, a placerat elit varius nec.</p>
+      </details>
+      </details>
+    HTML
+
+    expect(ExcerptParser.get_excerpt(html, 50, {})).to match_html(<<~HTML)
+      <details><summary>FOO</summary>BAR
+      Lorem ipsum dolor sit amet, consectetur adi&hellip;</details>
+    HTML
+
+    expect(ExcerptParser.get_excerpt(html, 6, {})).to match_html('<details><summary>FOO</summary>BAR&hellip;</details>')
+    expect(ExcerptParser.get_excerpt(html, 3, {})).to match_html('<details class="disabled"><summary>FOO</summary></details>')
+  end
+
+  it "respects length parameter for <details> block" do
+    html = '<details><summary>foo</summary><p>bar</p></details>'
+    expect(ExcerptParser.get_excerpt(html, 100, {})).to match_html('<details><summary>foo</summary>bar</details>')
+    expect(ExcerptParser.get_excerpt(html, 5, {})).to match_html('<details><summary>foo</summary>ba&hellip;</details>')
+    expect(ExcerptParser.get_excerpt(html, 3, {})).to match_html('<details class="disabled"><summary>foo</summary></details>')
+    expect(ExcerptParser.get_excerpt(html, 2, {})).to match_html('<details class="disabled"><summary>fo&hellip;</summary></details>')
+  end
+end
diff --git a/spec/components/fallback_locale_list_spec.rb b/spec/components/fallback_locale_list_spec.rb
new file mode 100644
index 00000000000..2786ff1cd6f
--- /dev/null
+++ b/spec/components/fallback_locale_list_spec.rb
@@ -0,0 +1,48 @@
+require 'rails_helper'
+require 'i18n/backend/fallback_locale_list'
+
+describe I18n::Backend::FallbackLocaleList do
+  let(:list) { I18n::Backend::FallbackLocaleList.new }
+
+  it "works when default_locale is English" do
+    SiteSetting.default_locale = :en
+
+    expect(list[:ru]).to eq([:ru, :en])
+    expect(list[:en]).to eq([:en])
+  end
+
+  it "works when default_locale is not English" do
+    SiteSetting.default_locale = :de
+
+    expect(list[:ru]).to eq([:ru, :de, :en])
+    expect(list[:de]).to eq([:de, :en])
+    expect(list[:en]).to eq([:en, :de])
+  end
+
+  context "when plugin registered fallback locale" do
+    before do
+      DiscoursePluginRegistry.register_locale("es_MX", fallbackLocale: "es")
+      DiscoursePluginRegistry.register_locale("de_AT", fallbackLocale: "de")
+    end
+
+    after do
+      DiscoursePluginRegistry.reset!
+    end
+
+    it "works when default_locale is English" do
+      SiteSetting.default_locale = :en
+
+      expect(list[:de_AT]).to eq([:de_AT, :de, :en])
+      expect(list[:de]).to eq([:de, :en])
+      expect(list[:en]).to eq([:en])
+    end
+
+    it "works when default_locale is not English" do
+      SiteSetting.default_locale = :de
+
+      expect(list[:es_MX]).to eq([:es_MX, :es, :de, :en])
+      expect(list[:es]).to eq([:es, :de, :en])
+      expect(list[:en]).to eq([:en, :de])
+    end
+  end
+end
diff --git a/spec/components/file_helper_spec.rb b/spec/components/file_helper_spec.rb
index d5d0ccd86bb..2ba6cb405ec 100644
--- a/spec/components/file_helper_spec.rb
+++ b/spec/components/file_helper_spec.rb
@@ -15,7 +15,6 @@ describe FileHelper do
 
     it "correctly raises an OpenURI HTTP error if it gets a 404 even with redirect" do
       url = "http://fourohfour.com/404"
-      stub_request(:head, url).to_return(status: 404, body: "404")
       stub_request(:get, url).to_return(status: 404, body: "404")
 
       expect do
@@ -36,7 +35,6 @@ describe FileHelper do
     it "correctly raises an OpenURI HTTP error if it gets a 404" do
       url = "http://fourohfour.com/404"
 
-      stub_request(:head, url).to_return(status: 404, body: "404")
       stub_request(:get, url).to_return(status: 404, body: "404")
 
       expect do
diff --git a/spec/components/final_destination_spec.rb b/spec/components/final_destination_spec.rb
index 93b6f061d26..1d2d8887b2d 100644
--- a/spec/components/final_destination_spec.rb
+++ b/spec/components/final_destination_spec.rb
@@ -22,8 +22,7 @@ describe FinalDestination do
         when 'force.get.com' then '22.102.29.40'
         when 'wikipedia.com' then '1.2.3.4'
         else
-          as_ip = IPAddr.new(host) rescue nil
-          raise "couldn't lookup #{host}" if as_ip.nil?
+          as_ip = IPAddr.new(host)
           host
         end
       end
@@ -176,7 +175,7 @@ describe FinalDestination do
             'Set-Cookie' => 'evil=trout'
           }
         )
-        stub_request(:head, 'https://discourse.org').to_return(status: 200)
+        stub_request(:head, 'https://discourse.org')
       end
 
       context "when the status code is 405" do
@@ -204,6 +203,85 @@ describe FinalDestination do
           expect(final.cookie).to eq('evil=trout')
         end
       end
+
+      it "correctly extracts cookies during GET" do
+        stub_request(:head, "https://eviltrout.com").to_return(status: 405)
+
+        stub_request(:get, "https://eviltrout.com")
+          .to_return(status: 302, body: "" , headers: {
+            "Location" => "https://eviltrout.com",
+            "Set-Cookie" => ["foo=219ffwef9w0f; expires=Mon, 19-Feb-2018 10:44:24 GMT; path=/; domain=eviltrout.com",
+                             "bar=1",
+                             "baz=2; expires=Tue, 19-Feb-2019 10:14:24 GMT; path=/; domain=eviltrout.com"]
+          })
+
+        stub_request(:head, "https://eviltrout.com")
+          .with(headers: { "Cookie" => "bar=1; baz=2; foo=219ffwef9w0f" })
+
+        final = FinalDestination.new("https://eviltrout.com", opts)
+        expect(final.resolve.to_s).to eq("https://eviltrout.com")
+        expect(final.status).to eq(:resolved)
+        expect(final.cookie).to eq("bar=1; baz=2; foo=219ffwef9w0f")
+      end
+    end
+
+    it "should use the correct format for cookies when there is only one cookie" do
+      stub_request(:head, "https://eviltrout.com")
+        .to_return(status: 302, headers: {
+          "Location" => "https://eviltrout.com",
+          "Set-Cookie" => "foo=219ffwef9w0f; expires=Mon, 19-Feb-2018 10:44:24 GMT; path=/; domain=eviltrout.com"
+        })
+
+      stub_request(:head, "https://eviltrout.com")
+        .with(headers: { "Cookie" => "foo=219ffwef9w0f" })
+
+      final = FinalDestination.new("https://eviltrout.com", opts)
+      expect(final.resolve.to_s).to eq("https://eviltrout.com")
+      expect(final.status).to eq(:resolved)
+      expect(final.cookie).to eq("foo=219ffwef9w0f")
+    end
+
+    it "should use the correct format for cookies when there are multiple cookies" do
+      stub_request(:head, "https://eviltrout.com")
+        .to_return(status: 302, headers: {
+          "Location" => "https://eviltrout.com",
+          "Set-Cookie" => ["foo=219ffwef9w0f; expires=Mon, 19-Feb-2018 10:44:24 GMT; path=/; domain=eviltrout.com",
+                           "bar=1",
+                           "baz=2; expires=Tue, 19-Feb-2019 10:14:24 GMT; path=/; domain=eviltrout.com"]
+        })
+
+      stub_request(:head, "https://eviltrout.com")
+        .with(headers: { "Cookie" => "bar=1; baz=2; foo=219ffwef9w0f" })
+
+      final = FinalDestination.new("https://eviltrout.com", opts)
+      expect(final.resolve.to_s).to eq("https://eviltrout.com")
+      expect(final.status).to eq(:resolved)
+      expect(final.cookie).to eq("bar=1; baz=2; foo=219ffwef9w0f")
+    end
+  end
+
+  describe '.get' do
+
+    it "can correctly stream with a redirect" do
+      FinalDestination.clear_https_cache!("wikipedia.com")
+
+      stub_request(:get, "http://wikipedia.com/").
+        to_return(status: 302, body: "" , headers: { "location" => "https://wikipedia.com/" })
+
+      # webmock does not do chunks
+      stub_request(:get, "https://wikipedia.com/").
+        to_return(status: 200, body: "<html><head>" , headers: {})
+
+      result = nil
+      chunk = nil
+
+      result = FinalDestination.new("http://wikipedia.com", opts).get do |resp, c|
+        chunk = c
+        throw :done
+      end
+
+      expect(result).to eq("https://wikipedia.com/")
+      expect(chunk).to eq("<html><head>")
     end
   end
 
@@ -316,13 +394,12 @@ describe FinalDestination do
 
       stub_request(:head, "http://wikipedia.com/image.png")
         .to_return(status: 302, body: "", headers: { location: 'https://wikipedia.com/image.png' })
+
       stub_request(:head, "https://wikipedia.com/image.png")
-        .to_return(status: 200, body: "", headers: [])
 
       fd('http://wikipedia.com/image.png').resolve
 
       stub_request(:head, "https://wikipedia.com/image2.png")
-        .to_return(status: 200, body: "", headers: [])
 
       fd('http://wikipedia.com/image2.png').resolve
     end
diff --git a/spec/components/flag_query_spec.rb b/spec/components/flag_query_spec.rb
index 7e39c61feff..428a5aa319f 100644
--- a/spec/components/flag_query_spec.rb
+++ b/spec/components/flag_query_spec.rb
@@ -5,6 +5,41 @@ describe FlagQuery do
 
   let(:codinghorror) { Fabricate(:coding_horror) }
 
+  describe "flagged_topics" do
+    it "respects `min_flags_staff_visibility`" do
+      admin = Fabricate(:admin)
+      moderator = Fabricate(:moderator)
+
+      post = create_post
+
+      PostAction.act(moderator, post, PostActionType.types[:spam])
+
+      SiteSetting.min_flags_staff_visibility = 1
+
+      result = FlagQuery.flagged_topics
+      expect(result[:flagged_topics]).to be_present
+      ft = result[:flagged_topics].first
+      expect(ft.topic).to eq(post.topic)
+      expect(ft.flag_counts).to eq(PostActionType.types[:spam] => 1)
+
+      SiteSetting.min_flags_staff_visibility = 2
+
+      result = FlagQuery.flagged_topics
+      expect(result[:flagged_topics]).to be_blank
+
+      PostAction.act(admin, post, PostActionType.types[:inappropriate])
+      result = FlagQuery.flagged_topics
+      expect(result[:flagged_topics]).to be_present
+      ft = result[:flagged_topics].first
+      expect(ft.topic).to eq(post.topic)
+      expect(ft.flag_counts).to eq(
+        PostActionType.types[:spam] => 1,
+        PostActionType.types[:inappropriate] => 1
+      )
+    end
+
+  end
+
   describe "flagged_posts_report" do
     it "does not return flags on system posts" do
       admin = Fabricate(:admin)
@@ -59,6 +94,12 @@ describe FlagQuery do
       posts = FlagQuery.flagged_posts_report(admin, topic_id: -1)
       expect(posts[0]).to be_blank
 
+      # Try by user
+      posts = FlagQuery.flagged_posts_report(admin, user_id: post.user_id)
+      expect(posts).to be_present
+      posts = FlagQuery.flagged_posts_report(admin, user_id: -1000)
+      expect(posts[0]).to be_blank
+
       # chuck post in category a mod can not see and make sure its missing
       category = Fabricate(:category)
       category.set_permissions(admins: :full)
@@ -69,7 +110,27 @@ describe FlagQuery do
       posts, users = FlagQuery.flagged_posts_report(moderator)
 
       expect(posts.count).to eq(1)
+    end
 
+    it "respects `min_flags_staff_visibility`" do
+      admin = Fabricate(:admin)
+      moderator = Fabricate(:moderator)
+
+      post = create_post
+
+      PostAction.act(moderator, post, PostActionType.types[:spam])
+
+      SiteSetting.min_flags_staff_visibility = 2
+      posts, topics, users = FlagQuery.flagged_posts_report(admin)
+      expect(posts).to be_blank
+      expect(topics).to be_blank
+      expect(users).to be_blank
+
+      PostAction.act(admin, post, PostActionType.types[:inappropriate])
+      posts, topics, users = FlagQuery.flagged_posts_report(admin)
+      expect(posts).to be_present
+      expect(topics).to be_present
+      expect(users).to be_present
     end
 
   end
diff --git a/spec/components/freedom_patches/translate_accelerator_spec.rb b/spec/components/freedom_patches/translate_accelerator_spec.rb
index 883edd6f1c4..941b68e52a1 100644
--- a/spec/components/freedom_patches/translate_accelerator_spec.rb
+++ b/spec/components/freedom_patches/translate_accelerator_spec.rb
@@ -1,6 +1,9 @@
 require "rails_helper"
 
 describe "translate accelerator" do
+  after do
+    I18n.reload!
+  end
 
   it "overrides for both string and symbol keys" do
     key = "user.email.not_allowed"
@@ -32,4 +35,39 @@ describe "translate accelerator" do
     end
   end
 
+  context "plugins" do
+    before do
+      DiscoursePluginRegistry.register_locale(
+        "foo",
+        name: "Foo",
+        nativeName: "Foo Bar",
+        plural: {
+          keys: [:one, :few, :other],
+          rule: lambda do |n|
+            return :one if n == 1
+            return :few if n < 10
+            :other
+          end
+        }
+      )
+
+      LocaleSiteSetting.reset!
+      I18n.reload!
+    end
+
+    after do
+      DiscoursePluginRegistry.reset!
+      LocaleSiteSetting.reset!
+    end
+
+    it "loads plural rules from plugins" do
+      I18n.backend.store_translations(:foo, items: { one: 'one item', few: 'some items', other: "%{count} items" })
+      I18n.locale = :foo
+
+      expect(I18n.t('i18n.plural.keys')).to eq([:one, :few, :other])
+      expect(I18n.t('items', count: 1)).to eq('one item')
+      expect(I18n.t('items', count: 3)).to eq('some items')
+      expect(I18n.t('items', count: 20)).to eq('20 items')
+    end
+  end
 end
diff --git a/spec/components/guardian/category_guardian_spec.rb b/spec/components/guardian/category_guardian_spec.rb
new file mode 100644
index 00000000000..3dccbb9e075
--- /dev/null
+++ b/spec/components/guardian/category_guardian_spec.rb
@@ -0,0 +1,47 @@
+require 'rails_helper'
+
+RSpec.describe CategoryGuardian do
+  let(:admin) { Fabricate(:admin) }
+  let(:guardian) { Guardian.new(admin) }
+  let(:category) { Fabricate(:category) }
+
+  describe '#cannot_delete_category_reason' do
+    describe 'when category is uncategorized' do
+      it 'should return the reason' do
+        category = Category.find(SiteSetting.uncategorized_category_id)
+
+        expect(guardian.cannot_delete_category_reason(category)).to eq(
+          I18n.t('category.cannot_delete.uncategorized')
+        )
+      end
+    end
+
+    describe 'when category has subcategories' do
+      it 'should return the right reason' do
+        category.subcategories << Fabricate(:category)
+
+        expect(guardian.cannot_delete_category_reason(category)).to eq(
+          I18n.t('category.cannot_delete.has_subcategories')
+        )
+      end
+    end
+
+    describe 'when category has topics' do
+      it 'should return the right reason' do
+        topic = Fabricate(:topic,
+          title: '</a><script>alert(document.cookie);</script><a>',
+          category: category
+        )
+
+        category.reload
+
+        expect(guardian.cannot_delete_category_reason(category)).to eq(
+          I18n.t('category.cannot_delete.topic_exists',
+            count: 1,
+            topic_link: "<a href=\"#{topic.url}\">&lt;/a&gt;&lt;script&gt;alert(document.cookie);&lt;/script&gt;&lt;a&gt;</a>"
+          )
+        )
+      end
+    end
+  end
+end
diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb
index df904c0aa40..d849d583f59 100644
--- a/spec/components/guardian_spec.rb
+++ b/spec/components/guardian_spec.rb
@@ -2,6 +2,7 @@ require 'rails_helper';
 
 require 'guardian'
 require_dependency 'post_destroyer'
+require_dependency 'post_locker'
 
 describe Guardian do
 
@@ -25,7 +26,25 @@ describe Guardian do
     expect { Guardian.new(user) }.not_to raise_error
   end
 
-  describe 'post_can_act?' do
+  describe "can_post_link?" do
+    it "returns false for anonymous users" do
+      expect(Guardian.new.can_post_link?).to eq(false)
+    end
+
+    it "returns true for a regular user" do
+      expect(Guardian.new(user).can_post_link?).to eq(true)
+    end
+
+    it "supports customization by site setting" do
+      user.trust_level = 0
+      SiteSetting.min_trust_to_post_links = 0
+      expect(Guardian.new(user).can_post_link?).to eq(true)
+      SiteSetting.min_trust_to_post_links = 1
+      expect(Guardian.new(user).can_post_link?).to eq(false)
+    end
+  end
+
+  describe '#post_can_act?' do
     let(:post) { build(:post) }
     let(:user) { build(:user) }
 
@@ -47,11 +66,29 @@ describe Guardian do
       expect(Guardian.new(user).post_can_act?(post, :like)).to be_falsey
     end
 
-    it "always allows flagging" do
+    it "allows flagging archived posts" do
       post.topic.archived = true
       expect(Guardian.new(user).post_can_act?(post, :spam)).to be_truthy
     end
 
+    it "allows flagging of staff posts when allow_flagging_staff is true" do
+      SiteSetting.allow_flagging_staff = true
+      staff_post = Fabricate(:post, user: Fabricate(:moderator))
+      expect(Guardian.new(user).post_can_act?(staff_post, :spam)).to be_truthy
+    end
+
+    it "doesn't allow flagging of staff posts when allow_flagging_staff is false" do
+      SiteSetting.allow_flagging_staff = false
+      staff_post = Fabricate(:post, user: Fabricate(:moderator))
+      expect(Guardian.new(user).post_can_act?(staff_post, :spam)).to eq(false)
+    end
+
+    it "allows liking of staff when allow_flagging_staff is false" do
+      SiteSetting.allow_flagging_staff = false
+      staff_post = Fabricate(:post, user: Fabricate(:moderator))
+      expect(Guardian.new(user).post_can_act?(staff_post, :like)).to eq(true)
+    end
+
     it "returns false when liking yourself" do
       expect(Guardian.new(post.user).post_can_act?(post, :like)).to be_falsey
     end
@@ -63,20 +100,22 @@ describe Guardian do
     end
 
     it "returns false when you already flagged a post" do
-      expect(Guardian.new(user).post_can_act?(post, :off_topic, opts: {
-        taken_actions: { PostActionType.types[:spam] => 1 }
-      })).to be_falsey
+      PostActionType.notify_flag_types.each do |type, _id|
+        expect(Guardian.new(user).post_can_act?(post, :off_topic, opts: {
+          taken_actions: { PostActionType.types[type] => 1 }
+        })).to be_falsey
+      end
     end
 
     it "returns false for notify_user if private messages are disabled" do
-      SiteSetting.enable_private_messages = false
+      SiteSetting.enable_personal_messages = false
       user.trust_level = TrustLevel[2]
       expect(Guardian.new(user).post_can_act?(post, :notify_user)).to be_falsey
       expect(Guardian.new(user).post_can_act?(post, :notify_moderators)).to be_falsey
     end
 
     it "returns false for notify_user and notify_moderators if private messages are enabled but threshold not met" do
-      SiteSetting.enable_private_messages = true
+      SiteSetting.enable_personal_messages = true
       SiteSetting.min_trust_to_send_messages = 2
       user.trust_level = TrustLevel[1]
       expect(Guardian.new(user).post_can_act?(post, :notify_user)).to be_falsey
@@ -89,11 +128,17 @@ describe Guardian do
         expect(Guardian.new(user).post_can_act?(post, :like)).to be_truthy
       end
 
-      it "returns false for a new user flagging a standard post as spam" do
+      it "returns false for a new user flagging as spam" do
         user.trust_level = TrustLevel[0]
         expect(Guardian.new(user).post_can_act?(post, :spam)).to be_falsey
       end
 
+      it "returns true for a new user flagging as spam if enabled" do
+        SiteSetting.min_trust_to_flag_posts = 0
+        user.trust_level = TrustLevel[0]
+        expect(Guardian.new(user).post_can_act?(post, :spam)).to be_truthy
+      end
+
       it "returns true for a new user flagging a private message as spam" do
         post = Fabricate(:private_message_post, user: Fabricate(:admin))
         user.trust_level = TrustLevel[0]
@@ -113,6 +158,35 @@ describe Guardian do
     end
   end
 
+  describe "can_enable_safe_mode" do
+    let(:user) { Fabricate.build(:user) }
+    let(:moderator) { Fabricate.build(:moderator) }
+
+    context "when enabled" do
+      before do
+        SiteSetting.enable_safe_mode = true
+      end
+
+      it "can be performed" do
+        expect(Guardian.new.can_enable_safe_mode?).to eq(true)
+        expect(Guardian.new(user).can_enable_safe_mode?).to eq(true)
+        expect(Guardian.new(moderator).can_enable_safe_mode?).to eq(true)
+      end
+    end
+
+    context "when disabled" do
+      before do
+        SiteSetting.enable_safe_mode = false
+      end
+
+      it "can be performed" do
+        expect(Guardian.new.can_enable_safe_mode?).to eq(false)
+        expect(Guardian.new(user).can_enable_safe_mode?).to eq(false)
+        expect(Guardian.new(moderator).can_enable_safe_mode?).to eq(true)
+      end
+    end
+  end
+
   describe "can_defer_flags" do
     let(:post) { Fabricate(:post) }
     let(:user) { post.user }
@@ -169,8 +243,8 @@ describe Guardian do
       expect(Guardian.new(user).can_send_private_message?(another_user)).to be_falsey
     end
 
-    context "enable_private_messages is false" do
-      before { SiteSetting.enable_private_messages = false }
+    context "enable_personal_messages is false" do
+      before { SiteSetting.enable_personal_messages = false }
 
       it "returns false if user is not staff member" do
         expect(Guardian.new(trust_level_4).can_send_private_message?(another_user)).to be_falsey
@@ -301,11 +375,6 @@ describe Guardian do
       expect(Guardian.new(moderator).can_see_post_actors?(topic, PostActionType.types[:notify_user])).to be_truthy
     end
 
-    it 'returns false for private votes' do
-      topic.expects(:has_meta_data_boolean?).with(:private_poll).returns(true)
-      expect(Guardian.new(user).can_see_post_actors?(topic, PostActionType.types[:vote])).to be_falsey
-    end
-
   end
 
   describe 'can_impersonate?' do
@@ -434,6 +503,11 @@ describe Guardian do
       it 'returns true for a group owner' do
         expect(Guardian.new(group_owner).can_invite_to?(group_private_topic)).to be_truthy
       end
+
+      it 'returns true for normal user when inviting to topic and PM disabled' do
+        SiteSetting.enable_personal_messages = false
+        expect(Guardian.new(trust_level_2).can_invite_to?(topic)).to be_truthy
+      end
     end
 
     describe "private messages" do
@@ -450,7 +524,7 @@ describe Guardian do
 
       context "when private messages are disabled" do
         before do
-          SiteSetting.enable_private_messages = false
+          SiteSetting.enable_personal_messages = false
         end
 
         it "doesn't allow a regular user to invite" do
@@ -857,6 +931,25 @@ describe Guardian do
         end
       end
 
+      context "system message" do
+        let(:private_message) {
+          Fabricate(
+            :topic,
+            archetype: Archetype.private_message,
+            subtype: 'system_message',
+            category_id: nil
+          )
+        }
+
+        before { user.save! }
+        it "allows the user to reply to system messages" do
+          expect(Guardian.new(user).can_create_post?(private_message)).to eq(true)
+          SiteSetting.enable_system_message_replies = false
+          expect(Guardian.new(user).can_create_post?(private_message)).to eq(false)
+        end
+
+      end
+
       context "private message" do
         let(:private_message) { Fabricate(:topic, archetype: Archetype.private_message, category_id: nil) }
 
@@ -922,19 +1015,6 @@ describe Guardian do
         topic.archived = true
         expect(Guardian.new(user).post_can_act?(post, :like)).to be_falsey
       end
-
-      describe 'multiple voting' do
-
-        it "isn't allowed if the user voted and the topic doesn't allow multiple votes" do
-          Topic.any_instance.expects(:has_meta_data_boolean?).with(:single_vote).returns(true)
-          expect(Guardian.new(user).can_vote?(post, voted_in_topic: true)).to be_falsey
-        end
-
-        it "is allowed if the user voted and the topic doesn't allow multiple votes" do
-          expect(Guardian.new(user).can_vote?(post, voted_in_topic: false)).to be_truthy
-        end
-      end
-
     end
   end
 
@@ -1049,6 +1129,11 @@ describe Guardian do
     it 'returns true when an admin' do
       expect(Guardian.new(admin).can_convert_topic?(topic)).to be_truthy
     end
+
+    it 'returns false when personal messages are disabled' do
+      SiteSetting.enable_personal_messages = false
+      expect(Guardian.new(admin).can_convert_topic?(topic)).to be_falsey
+    end
   end
 
   describe 'can_edit?' do
@@ -1072,6 +1157,11 @@ describe Guardian do
         expect(Guardian.new(post.user).can_edit?(post)).to be_truthy
       end
 
+      it 'returns false if you try to edit a locked post' do
+        post.locked_by_id = moderator.id
+        expect(Guardian.new(post.user).can_edit?(post)).to be_falsey
+      end
+
       it "returns false if the post is hidden due to flagging and it's too soon" do
         post.hidden = true
         post.hidden_at = Time.now
@@ -1145,6 +1235,11 @@ describe Guardian do
         expect(Guardian.new(moderator).can_edit?(post)).to be_truthy
       end
 
+      it 'returns true as a moderator, even if locked' do
+        post.locked_by_id = admin.id
+        expect(Guardian.new(moderator).can_edit?(post)).to be_truthy
+      end
+
       it 'returns true as an admin' do
         expect(Guardian.new(admin).can_edit?(post)).to be_truthy
       end
@@ -1153,6 +1248,11 @@ describe Guardian do
         expect(Guardian.new(trust_level_4).can_edit?(post)).to be_truthy
       end
 
+      it 'returns false as a TL4 user if trusted_users_can_edit_others is true' do
+        SiteSetting.trusted_users_can_edit_others = false
+        expect(Guardian.new(trust_level_4).can_edit?(post)).to eq(false)
+      end
+
       it 'returns false when trying to edit a post with no trust' do
         SiteSetting.min_trust_to_edit_post = 2
         post.user.trust_level = 1
@@ -1260,6 +1360,11 @@ describe Guardian do
           expect(Guardian.new(trust_level_3).can_edit?(topic)).to eq(true)
         end
 
+        it 'is false at TL3, if `trusted_users_can_edit_others` is false' do
+          SiteSetting.trusted_users_can_edit_others = false
+          expect(Guardian.new(trust_level_3).can_edit?(topic)).to eq(false)
+        end
+
         it "returns false when the category is read only" do
           topic.category.set_permissions(everyone: :readonly)
           topic.category.save
@@ -1309,6 +1414,11 @@ describe Guardian do
           expect(Guardian.new(trust_level_4).can_edit?(archived_topic)).to be_truthy
         end
 
+        it 'is false at TL4, if `trusted_users_can_edit_others` is false' do
+          SiteSetting.trusted_users_can_edit_others = false
+          expect(Guardian.new(trust_level_4).can_edit?(archived_topic)).to eq(false)
+        end
+
         it 'returns false at trust level 3' do
           expect(Guardian.new(trust_level_3).can_edit?(archived_topic)).to be_falsey
         end
@@ -1938,6 +2048,7 @@ describe Guardian do
 
       it "is true if user is not an admin and first post is not too old" do
         user = Fabricate.build(:user, created_at: 100.days.ago)
+        user.stubs(:post_count).returns(10)
         user.stubs(:first_post_created_at).returns(9.days.ago)
         SiteSetting.delete_user_max_post_age = 10
         expect(Guardian.new(actor).can_delete_user?(user)).to be_truthy
@@ -1949,20 +2060,33 @@ describe Guardian do
 
       it "is false if user's first post is too old" do
         user = Fabricate.build(:user, created_at: 100.days.ago)
+        user.stubs(:post_count).returns(10)
         user.stubs(:first_post_created_at).returns(11.days.ago)
         SiteSetting.delete_user_max_post_age = 10
         expect(Guardian.new(actor).can_delete_user?(user)).to be_falsey
       end
     end
 
+    shared_examples "can_delete_user staff examples" do
+      it "is true if posts are less than or equal to 5" do
+        user = Fabricate.build(:user, created_at: 100.days.ago)
+        user.stubs(:post_count).returns(4)
+        user.stubs(:first_post_created_at).returns(11.days.ago)
+        SiteSetting.delete_user_max_post_age = 10
+        expect(Guardian.new(actor).can_delete_user?(user)).to be_truthy
+      end
+    end
+
     context "for moderators" do
       let(:actor) { moderator }
       include_examples "can_delete_user examples"
+      include_examples "can_delete_user staff examples"
     end
 
     context "for admins" do
       let(:actor) { admin }
       include_examples "can_delete_user examples"
+      include_examples "can_delete_user staff examples"
     end
   end
 
@@ -2091,6 +2215,35 @@ describe Guardian do
     it 'is false without a user to look at' do
       expect(Guardian.new(admin).can_grant_title?(nil)).to be_falsey
     end
+
+    context 'with title argument' do
+      let(:title_badge) { Fabricate(:badge, name: 'Helper', allow_title: true) }
+      let(:no_title_badge) { Fabricate(:badge, name: 'Writer', allow_title: false) }
+      let(:group) { Fabricate(:group, title: 'Groupie') }
+
+      it 'returns true if title belongs to a badge that user has' do
+        BadgeGranter.grant(title_badge, user)
+        expect(Guardian.new(user).can_grant_title?(user, title_badge.name)).to eq(true)
+      end
+
+      it "returns false if title belongs to a badge that user doesn't have" do
+        expect(Guardian.new(user).can_grant_title?(user, title_badge.name)).to eq(false)
+      end
+
+      it "returns false if title belongs to a badge that user has but can't be used as a title" do
+        BadgeGranter.grant(no_title_badge, user)
+        expect(Guardian.new(user).can_grant_title?(user, no_title_badge.name)).to eq(false)
+      end
+
+      it 'returns true if title is from a group the user belongs to' do
+        group.add(user)
+        expect(Guardian.new(user).can_grant_title?(user, group.title)).to eq(true)
+      end
+
+      it "returns false if title is from a group the user doesn't belong to" do
+        expect(Guardian.new(user).can_grant_title?(user, group.title)).to eq(false)
+      end
+    end
   end
 
   describe 'can_change_trust_level?' do
diff --git a/spec/components/hijack_spec.rb b/spec/components/hijack_spec.rb
index 3a9522ab9b6..0a8b44eeee0 100644
--- a/spec/components/hijack_spec.rb
+++ b/spec/components/hijack_spec.rb
@@ -114,6 +114,16 @@ describe Hijack do
     expect(headers).to eq(expected)
   end
 
+  it "handles transfers headers" do
+    tester.response.headers["Hello-World"] = "sam"
+    tester.hijack_test do
+      expires_in 1.year
+      render body: "hello world", status: 402
+    end
+
+    expect(tester.io.string).to include("Hello-World: sam")
+  end
+
   it "handles expires_in" do
     tester.hijack_test do
       expires_in 1.year
@@ -141,36 +151,43 @@ describe Hijack do
   end
 
   it "renders a redirect correctly" do
+    Process.stubs(:clock_gettime).returns(1.0)
     tester.hijack_test do
+      Process.stubs(:clock_gettime).returns(2.0)
       redirect_to 'http://awesome.com'
     end
 
-    result = "HTTP/1.1 302 Found\r\nLocation: http://awesome.com\r\nContent-Type: text/html\r\nContent-Length: 84\r\nConnection: close\r\n\r\n<html><body>You are being <a href=\"http://awesome.com\">redirected</a>.</body></html>"
+    result = "HTTP/1.1 302 Found\r\nLocation: http://awesome.com\r\nContent-Type: text/html; charset=utf-8\r\nContent-Length: 84\r\nConnection: close\r\nX-Runtime: 1.000000\r\n\r\n<html><body>You are being <a href=\"http://awesome.com\">redirected</a>.</body></html>"
     expect(tester.io.string).to eq(result)
   end
 
   it "renders stuff correctly if is empty" do
+    Process.stubs(:clock_gettime).returns(1.0)
     tester.hijack_test do
+      Process.stubs(:clock_gettime).returns(2.0)
       render body: nil
     end
 
-    result = "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nContent-Length: 0\r\nConnection: close\r\n\r\n"
+    result = "HTTP/1.1 200 OK\r\nContent-Type: text/plain; charset=utf-8\r\nContent-Length: 0\r\nConnection: close\r\nX-Runtime: 1.000000\r\n\r\n"
     expect(tester.io.string).to eq(result)
   end
 
   it "renders stuff correctly if it works" do
+    Process.stubs(:clock_gettime).returns(1.0)
     tester.hijack_test do
+      Process.stubs(:clock_gettime).returns(2.0)
       render plain: "hello world"
     end
 
-    result = "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nContent-Length: 11\r\nConnection: close\r\n\r\nhello world"
+    result = "HTTP/1.1 200 OK\r\nContent-Type: text/plain; charset=utf-8\r\nContent-Length: 11\r\nConnection: close\r\nX-Runtime: 1.000000\r\n\r\nhello world"
     expect(tester.io.string).to eq(result)
   end
 
   it "returns 500 by default" do
+    Process.stubs(:clock_gettime).returns(1.0)
     tester.hijack_test
 
-    expected = "HTTP/1.1 500 Internal Server Error\r\nContent-Type: text/html\r\nContent-Length: 0\r\nConnection: close\r\n\r\n"
+    expected = "HTTP/1.1 500 Internal Server Error\r\nContent-Type: text/html; charset=utf-8\r\nContent-Length: 0\r\nConnection: close\r\nX-Runtime: 0.000000\r\n\r\n"
     expect(tester.io.string).to eq(expected)
   end
 
diff --git a/spec/components/html_normalize_spec.rb b/spec/components/html_normalize_spec.rb
deleted file mode 100644
index 7c75d8a15bd..00000000000
--- a/spec/components/html_normalize_spec.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-require 'rails_helper'
-require 'html_normalize'
-
-describe HtmlNormalize do
-
-  def n(html)
-    HtmlNormalize.normalize(html)
-  end
-
-  it "handles attributes without values" do
-    expect(n "<img alt>").to eq("<img alt>")
-  end
-
-  it "handles self closing tags" do
-
-    source = <<-HTML
-<div>
-  <span><img src='testing'>
-  boo</span>
-</div>
-HTML
-    expect(n source).to eq(source.strip)
-  end
-
-  it "Can handle aside" do
-
-    source = <<~HTML
-        <aside class="quote" data-topic="2" data-post="1">
-          <div class="title">
-          <div class="quote-controls"></div>
-          <a href="http://test.localhost/t/this-is-a-test-topic-slight-smile/x/2">This is a test topic <img src="/images/emoji/emoji_one/slight_smile.png?v=5" title="slight_smile" alt="slight_smile" class="emoji"></a></div>
-          <blockquote>
-          <p>ddd</p>
-          </blockquote></aside>
-HTML
-      expected = <<~HTML
-        <aside class="quote" data-post="1" data-topic="2">
-          <div class="title">
-          <div class="quote-controls"></div>
-          <a href="http://test.localhost/t/this-is-a-test-topic-slight-smile/x/2">This is a test topic <img src="/images/emoji/emoji_one/slight_smile.png?v=5" title="slight_smile" alt="slight_smile" class="emoji"></a>
-          </div>
-          <blockquote>
-            <p>ddd</p>
-          </blockquote>
-        </aside>
-HTML
-
-      expect(n expected).to eq(n source)
-  end
-
-  it "Can normalize attributes" do
-
-    source = "<a class='a b' name='sam'>b</a>"
-    same = "<a name='sam' class='a b' >b</a>"
-
-    expect(n source).to eq(n same)
-  end
-
-  it "Can indent divs nicely" do
-    source = "<div> <div><div>hello world</div> </div>     </div>"
-    expected = <<~HTML
-        <div>
-          <div>
-            <div>
-              hello world
-            </div>
-          </div>
-        </div>
-HTML
-
-    expect(n source).to eq(expected.strip)
-  end
-end
diff --git a/spec/components/html_to_markdown_spec.rb b/spec/components/html_to_markdown_spec.rb
index 352547215dd..486baf40a19 100644
--- a/spec/components/html_to_markdown_spec.rb
+++ b/spec/components/html_to_markdown_spec.rb
@@ -191,6 +191,10 @@ describe HtmlToMarkdown do
     expect(html_to_markdown(%Q{<pre><code class="lang-javascript">var foo = 'bar';</code></pre>})).to eq("```javascript\nvar foo = 'bar';\n```")
   end
 
+  it "supports <pre> inside <blockquote>" do
+    expect(html_to_markdown("<blockquote><pre><code>var foo = 'bar';</code></pre></blockquote>")).to eq("> ```\n> var foo = 'bar';\n> ```")
+  end
+
   it "works" do
     expect(html_to_markdown("<ul><li><p>A list item with a blockquote:</p><blockquote><p>This is a <strong>blockquote</strong><br>inside a list item.</p></blockquote></li></ul>")).to eq("- A list item with a blockquote:\n\n  > This is a **blockquote**\n  > inside a list item.")
   end
diff --git a/spec/components/inline_oneboxer_spec.rb b/spec/components/inline_oneboxer_spec.rb
index 491f322a0cd..1779a7fbfa9 100644
--- a/spec/components/inline_oneboxer_spec.rb
+++ b/spec/components/inline_oneboxer_spec.rb
@@ -71,11 +71,8 @@ describe InlineOneboxer do
     it "will crawl anything if allowed to" do
       SiteSetting.enable_inline_onebox_on_all_domains = true
 
-      # Final destination does a HEAD and a GET
-      stub_request(:head, "https://eviltrout.com/some-path").to_return(status: 200)
-
       stub_request(:get, "https://eviltrout.com/some-path").
-        to_return(status: 200, body: "<html><head><title>a blog</title></head></html>", headers: {})
+        to_return(status: 200, body: "<html><head><title>a blog</title></head></html>")
 
       onebox = InlineOneboxer.lookup(
         "https://eviltrout.com/some-path",
@@ -87,6 +84,22 @@ describe InlineOneboxer do
       expect(onebox[:title]).to eq("a blog")
     end
 
+    it "will not return a onebox if it does not meet minimal length" do
+      SiteSetting.enable_inline_onebox_on_all_domains = true
+
+      stub_request(:get, "https://eviltrout.com/some-path").
+        to_return(status: 200, body: "<html><head><title>a</title></head></html>")
+
+      onebox = InlineOneboxer.lookup(
+        "https://eviltrout.com/some-path",
+        skip_cache: true
+      )
+
+      expect(onebox).to be_present
+      expect(onebox[:url]).to eq("https://eviltrout.com/some-path")
+      expect(onebox[:title]).to eq(nil)
+    end
+
     it "will lookup whitelisted domains" do
       SiteSetting.inline_onebox_domains_whitelist = "eviltrout.com"
       RetrieveTitle.stubs(:crawl).returns("Evil Trout's Blog")
diff --git a/spec/components/js_locale_helper_spec.rb b/spec/components/js_locale_helper_spec.rb
index 120b6b029bd..430a372504c 100644
--- a/spec/components/js_locale_helper_spec.rb
+++ b/spec/components/js_locale_helper_spec.rb
@@ -34,12 +34,17 @@ describe JsLocaleHelper do
   end
 
   context "message format" do
+    def message_format_filename(locale)
+      Rails.root + "lib/javascripts/locale/#{locale}.js"
+    end
 
     def setup_message_format(format)
+      filename = message_format_filename('en')
+      compiled = JsLocaleHelper.compile_message_format(filename, 'en', format)
+
       @ctx = MiniRacer::Context.new
       @ctx.eval('MessageFormat = {locale: {}};')
-      @ctx.load(Rails.root + 'lib/javascripts/locale/en.js')
-      compiled = JsLocaleHelper.compile_message_format('en', format)
+      @ctx.load(filename)
       @ctx.eval("var test = #{compiled}")
     end
 
@@ -110,7 +115,7 @@ describe JsLocaleHelper do
     end
 
     it 'load pluralizations rules before precompile' do
-      message = JsLocaleHelper.compile_message_format('ru', 'format')
+      message = JsLocaleHelper.compile_message_format(message_format_filename('ru'), 'ru', 'format')
       expect(message).not_to match 'Plural Function not found'
     end
   end
diff --git a/spec/components/method_profiler_spec.rb b/spec/components/method_profiler_spec.rb
index cbbfcff65a8..480280a5fae 100644
--- a/spec/components/method_profiler_spec.rb
+++ b/spec/components/method_profiler_spec.rb
@@ -5,6 +5,22 @@ describe MethodProfiler do
   class Sneetch
     def beach
     end
+
+    def recurse(count = 5)
+      if count > 0
+        recurse(count - 1)
+      end
+    end
+  end
+
+  it "can bypass recursion on demand" do
+    MethodProfiler.patch(Sneetch, [:recurse], :recurse, no_recurse: true)
+
+    MethodProfiler.start
+    Sneetch.new.recurse
+    result = MethodProfiler.stop
+
+    expect(result[:recurse][:calls]).to eq(1)
   end
 
   it "can transfer data between threads" do
diff --git a/spec/components/middleware/anonymous_cache_spec.rb b/spec/components/middleware/anonymous_cache_spec.rb
index 50d608c8708..ed4ad96c34e 100644
--- a/spec/components/middleware/anonymous_cache_spec.rb
+++ b/spec/components/middleware/anonymous_cache_spec.rb
@@ -45,6 +45,74 @@ describe Middleware::AnonymousCache::Helper do
     end
   end
 
+  context 'force_anonymous!' do
+    before do
+      RateLimiter.enable
+    end
+
+    after do
+      RateLimiter.disable
+    end
+
+    it 'will revert to anonymous once we reach the limit' do
+
+      RateLimiter.clear_all!
+
+      is_anon = false
+
+      app = Middleware::AnonymousCache.new(
+        lambda do |env|
+          is_anon = env["HTTP_COOKIE"].nil?
+          [200, {}, ["ok"]]
+        end
+      )
+
+      global_setting :force_anonymous_min_per_10_seconds, 2
+      global_setting :force_anonymous_min_queue_seconds, 1
+
+      env = {
+        "HTTP_COOKIE" => "_t=#{SecureRandom.hex}",
+        "HOST" => "site.com",
+        "REQUEST_METHOD" => "GET",
+        "REQUEST_URI" => "/somewhere/rainbow",
+        "REQUEST_QUEUE_SECONDS" => 2.1,
+        "rack.input" => StringIO.new
+      }
+
+      is_anon = false
+      app.call(env.dup)
+      expect(is_anon).to eq(false)
+
+      is_anon = false
+      app.call(env.dup)
+      expect(is_anon).to eq(false)
+
+      is_anon = false
+      app.call(env.dup)
+      expect(is_anon).to eq(true)
+
+      is_anon = false
+      _status, headers, _body = app.call(env.dup)
+      expect(is_anon).to eq(true)
+      expect(headers['Set-Cookie']).to eq('dosp=1; Path=/')
+
+      # tricky change, a 50ms delay still will trigger protection
+      # once it is tripped
+
+      env["REQUEST_QUEUE_SECONDS"] = 0.05
+      is_anon = false
+
+      app.call(env.dup)
+      expect(is_anon).to eq(true)
+
+      is_anon = false
+      env["REQUEST_QUEUE_SECONDS"] = 0.01
+
+      app.call(env.dup)
+      expect(is_anon).to eq(false)
+    end
+  end
+
   context "cached" do
     let!(:helper) do
       new_helper("ANON_CACHE_DURATION" => 10)
diff --git a/spec/components/middleware/request_tracker_spec.rb b/spec/components/middleware/request_tracker_spec.rb
index 94d76b94c16..d93e4085db8 100644
--- a/spec/components/middleware/request_tracker_spec.rb
+++ b/spec/components/middleware/request_tracker_spec.rb
@@ -6,8 +6,10 @@ describe Middleware::RequestTracker do
   def env(opts = {})
     {
       "HTTP_HOST" => "http://test.com",
+      "HTTP_USER_AGENT" => "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36",
       "REQUEST_URI" => "/path?bla=1",
       "REQUEST_METHOD" => "GET",
+      "HTTP_ACCEPT" => "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8",
       "rack.input" => ""
     }.merge(opts)
   end
@@ -104,7 +106,7 @@ describe Middleware::RequestTracker do
     end
 
     it "does nothing by default" do
-      global_setting :max_requests_per_ip_per_10_seconds, 1
+      global_setting :max_reqs_per_ip_per_10_seconds, 1
 
       status, _ = middleware.call(env)
       status, _ = middleware.call(env)
@@ -112,9 +114,76 @@ describe Middleware::RequestTracker do
       expect(status).to eq(200)
     end
 
+    it "blocks private IPs if not skipped" do
+      global_setting :max_reqs_per_ip_per_10_seconds, 1
+      global_setting :max_reqs_per_ip_mode, 'warn+block'
+      global_setting :max_reqs_rate_limit_on_private, true
+
+      env1 = env("REMOTE_ADDR" => "127.0.0.2")
+
+      status, _ = middleware.call(env1)
+      status, _ = middleware.call(env1)
+
+      expect(Rails.logger.warnings).to eq(1)
+      expect(status).to eq(429)
+    end
+
+    describe "register_ip_skipper" do
+      before do
+        Middleware::RequestTracker.register_ip_skipper do |ip|
+          ip == "1.1.1.2"
+        end
+        global_setting :max_reqs_per_ip_per_10_seconds, 1
+        global_setting :max_reqs_per_ip_mode, 'block'
+      end
+
+      after do
+        Middleware::RequestTracker.unregister_ip_skipper
+      end
+
+      it "won't block if the ip is skipped" do
+        env1 = env("REMOTE_ADDR" => "1.1.1.2")
+        status, _ = middleware.call(env1)
+        status, _ = middleware.call(env1)
+        expect(status).to eq(200)
+      end
+
+      it "blocks if the ip isn't skipped" do
+        env1 = env("REMOTE_ADDR" => "1.1.1.1")
+        status, _ = middleware.call(env1)
+        status, _ = middleware.call(env1)
+        expect(status).to eq(429)
+      end
+    end
+
+    it "does nothing for private IPs if skipped" do
+      global_setting :max_reqs_per_ip_per_10_seconds, 1
+      global_setting :max_reqs_per_ip_mode, 'warn+block'
+      global_setting :max_reqs_rate_limit_on_private, false
+
+      env1 = env("REMOTE_ADDR" => "127.0.3.1")
+
+      status, _ = middleware.call(env1)
+      status, _ = middleware.call(env1)
+
+      expect(Rails.logger.warnings).to eq(0)
+      expect(status).to eq(200)
+    end
+
+    it "does warn if rate limiter is enabled via warn+block" do
+      global_setting :max_reqs_per_ip_per_10_seconds, 1
+      global_setting :max_reqs_per_ip_mode, 'warn+block'
+
+      status, _ = middleware.call(env)
+      status, _ = middleware.call(env)
+
+      expect(Rails.logger.warnings).to eq(1)
+      expect(status).to eq(429)
+    end
+
     it "does warn if rate limiter is enabled" do
-      global_setting :max_requests_per_ip_per_10_seconds, 1
-      global_setting :max_requests_per_ip_mode, 'warn'
+      global_setting :max_reqs_per_ip_per_10_seconds, 1
+      global_setting :max_reqs_per_ip_mode, 'warn'
 
       status, _ = middleware.call(env)
       status, _ = middleware.call(env)
@@ -123,21 +192,43 @@ describe Middleware::RequestTracker do
       expect(status).to eq(200)
     end
 
+    it "allows assets for more requests" do
+      global_setting :max_reqs_per_ip_per_10_seconds, 1
+      global_setting :max_reqs_per_ip_mode, 'block'
+      global_setting :max_asset_reqs_per_ip_per_10_seconds, 3
+
+      env1 = env("REMOTE_ADDR" => "1.1.1.1", "DISCOURSE_IS_ASSET_PATH" => 1)
+
+      status, _ = middleware.call(env1)
+      expect(status).to eq(200)
+      status, _ = middleware.call(env1)
+      expect(status).to eq(200)
+      status, _ = middleware.call(env1)
+      expect(status).to eq(200)
+      status, _ = middleware.call(env1)
+      expect(status).to eq(429)
+
+      env2 = env("REMOTE_ADDR" => "1.1.1.1")
+
+      status, _ = middleware.call(env2)
+      expect(status).to eq(429)
+    end
+
     it "does block if rate limiter is enabled" do
-      global_setting :max_requests_per_ip_per_10_seconds, 1
-      global_setting :max_requests_per_ip_mode, 'block'
+      global_setting :max_reqs_per_ip_per_10_seconds, 1
+      global_setting :max_reqs_per_ip_mode, 'block'
 
       env1 = env("REMOTE_ADDR" => "1.1.1.1")
       env2 = env("REMOTE_ADDR" => "1.1.1.2")
 
       status, _ = middleware.call(env1)
-      status, _ = middleware.call(env1)
+      expect(status).to eq(200)
 
+      status, _ = middleware.call(env1)
       expect(status).to eq(429)
 
       status, _ = middleware.call(env2)
       expect(status).to eq(200)
-
     end
   end
 
@@ -145,7 +236,7 @@ describe Middleware::RequestTracker do
     def app(result, sql_calls: 0, redis_calls: 0)
       lambda do |env|
         sql_calls.times do
-          User.where(id: -100).first
+          User.where(id: -100).pluck(:id)
         end
         redis_calls.times do
           $redis.get("x")
@@ -166,12 +257,23 @@ describe Middleware::RequestTracker do
     end
 
     after do
-      Middleware::RequestTracker.register_detailed_request_logger(logger)
+      Middleware::RequestTracker.unregister_detailed_request_logger(logger)
     end
 
     it "can correctly log detailed data" do
+
+      # ensure pg is warmed up with the select 1 query
+      User.where(id: -100).pluck(:id)
+
+      freeze_time
+      start = Time.now.to_f
+
+      freeze_time 1.minute.from_now
+
       tracker = Middleware::RequestTracker.new(app([200, {}, []], sql_calls: 2, redis_calls: 2))
-      tracker.call(env)
+      tracker.call(env("HTTP_X_REQUEST_START" => "t=#{start}"))
+
+      expect(@data[:queue_seconds]).to eq(60)
 
       timing = @data[:timing]
       expect(timing[:total_duration]).to be > 0
@@ -183,4 +285,58 @@ describe Middleware::RequestTracker do
       expect(timing[:redis][:calls]).to eq 2
     end
   end
+
+  context "crawler blocking" do
+    let :middleware do
+      app = lambda do |env|
+        [200, {}, ['OK']]
+      end
+
+      Middleware::RequestTracker.new(app)
+    end
+
+    def expect_success_response(status, _, response)
+      expect(status).to eq(200)
+      expect(response).to eq(['OK'])
+    end
+
+    def expect_blocked_response(status, _, response)
+      expect(status).to eq(403)
+      expect(response).to eq(['Crawler is not allowed'])
+    end
+
+    it "applies whitelisted_crawler_user_agents correctly" do
+      SiteSetting.whitelisted_crawler_user_agents = 'Googlebot'
+      expect_success_response(*middleware.call(env))
+      expect_blocked_response(*middleware.call(env('HTTP_USER_AGENT' => 'Twitterbot')))
+      expect_success_response(*middleware.call(env('HTTP_USER_AGENT' => 'Googlebot/2.1 (+http://www.google.com/bot.html)')))
+      expect_blocked_response(*middleware.call(env('HTTP_USER_AGENT' => 'DiscourseAPI Ruby Gem 0.19.0')))
+    end
+
+    it "applies blacklisted_crawler_user_agents correctly" do
+      SiteSetting.blacklisted_crawler_user_agents = 'Googlebot'
+      expect_success_response(*middleware.call(env))
+      expect_blocked_response(*middleware.call(env('HTTP_USER_AGENT' => 'Googlebot/2.1 (+http://www.google.com/bot.html)')))
+      expect_success_response(*middleware.call(env('HTTP_USER_AGENT' => 'Twitterbot')))
+      expect_success_response(*middleware.call(env('HTTP_USER_AGENT' => 'DiscourseAPI Ruby Gem 0.19.0')))
+    end
+
+    it "blocked crawlers shouldn't log page views" do
+      ApplicationRequest.clear_cache!
+      SiteSetting.blacklisted_crawler_user_agents = 'Googlebot'
+      expect {
+        middleware.call(env('HTTP_USER_AGENT' => 'Googlebot/2.1 (+http://www.google.com/bot.html)'))
+        ApplicationRequest.write_cache!
+      }.to_not change { ApplicationRequest.count }
+    end
+
+    it "blocks json requests" do
+      SiteSetting.blacklisted_crawler_user_agents = 'Googlebot'
+      expect_blocked_response(*middleware.call(env(
+        'HTTP_USER_AGENT' => 'Googlebot/2.1 (+http://www.google.com/bot.html)',
+        'HTTP_ACCEPT' => 'application/json'
+      )))
+    end
+  end
+
 end
diff --git a/spec/components/migration/column_dropper_spec.rb b/spec/components/migration/column_dropper_spec.rb
new file mode 100644
index 00000000000..9a0bd536e2b
--- /dev/null
+++ b/spec/components/migration/column_dropper_spec.rb
@@ -0,0 +1,201 @@
+require 'rails_helper'
+require_dependency 'migration/column_dropper'
+
+RSpec.describe Migration::ColumnDropper do
+
+  def has_column?(table, column)
+    ActiveRecord::Base.exec_sql(<<~SQL, table: table, column: column).to_a.length == 1
+      SELECT 1
+      FROM INFORMATION_SCHEMA.COLUMNS
+      WHERE
+        table_schema = 'public' AND
+        table_name = :table AND
+        column_name = :column
+    SQL
+  end
+
+  def update_first_migration_date(created_at)
+    ActiveRecord::Base.exec_sql(<<~SQL, created_at: created_at)
+        UPDATE schema_migration_details
+        SET created_at = :created_at
+        WHERE id = (SELECT MIN(id)
+                    FROM schema_migration_details)
+    SQL
+  end
+
+  describe ".drop" do
+    let(:migration_name) do
+      ActiveRecord::Base
+        .exec_sql("SELECT name FROM schema_migration_details ORDER BY id DESC LIMIT 1")
+        .getvalue(0, 0)
+    end
+
+    before do
+      Topic.exec_sql "ALTER TABLE topics ADD COLUMN junk int"
+
+      ActiveRecord::Base.exec_sql(<<~SQL, name: migration_name, created_at: 15.minutes.ago)
+        UPDATE schema_migration_details
+        SET created_at = :created_at
+        WHERE name = :name
+      SQL
+    end
+
+    it "can correctly drop columns after correct delay" do
+      dropped_proc_called = false
+      update_first_migration_date(2.years.ago)
+
+      Migration::ColumnDropper.drop(
+        table: 'topics',
+        after_migration: migration_name,
+        columns: ['junk'],
+        delay: 20.minutes,
+        on_drop: ->() { dropped_proc_called = true }
+      )
+
+      expect(has_column?('topics', 'junk')).to eq(true)
+      expect(dropped_proc_called).to eq(false)
+
+      Migration::ColumnDropper.drop(
+        table: 'topics',
+        after_migration: migration_name,
+        columns: ['junk'],
+        delay: 10.minutes,
+        on_drop: ->() { dropped_proc_called = true }
+      )
+
+      expect(has_column?('topics', 'junk')).to eq(false)
+      expect(dropped_proc_called).to eq(true)
+
+      dropped_proc_called = false
+
+      Migration::ColumnDropper.drop(
+        table: 'topics',
+        after_migration: migration_name,
+        columns: ['junk'],
+        delay: 10.minutes,
+        on_drop: ->() { dropped_proc_called = true }
+      )
+
+      # it should call "on_drop" only when there are columns to drop
+      expect(dropped_proc_called).to eq(false)
+    end
+
+    it "drops the columns immediately if the first migration was less than 10 minutes ago" do
+      dropped_proc_called = false
+      update_first_migration_date(11.minutes.ago)
+
+      Migration::ColumnDropper.drop(
+        table: 'topics',
+        after_migration: migration_name,
+        columns: ['junk'],
+        delay: 30.minutes,
+        on_drop: ->() { dropped_proc_called = true }
+      )
+
+      expect(has_column?('topics', 'junk')).to eq(true)
+      expect(dropped_proc_called).to eq(false)
+
+      update_first_migration_date(9.minutes.ago)
+
+      Migration::ColumnDropper.drop(
+        table: 'topics',
+        after_migration: migration_name,
+        columns: ['junk'],
+        delay: 30.minutes,
+        on_drop: ->() { dropped_proc_called = true }
+      )
+
+      expect(has_column?('topics', 'junk')).to eq(false)
+      expect(dropped_proc_called).to eq(true)
+    end
+  end
+
+  describe '.mark_readonly' do
+    let(:table_name) { "table_with_readonly_column" }
+
+    before do
+      ActiveRecord::Base.exec_sql <<~SQL
+      CREATE TABLE #{table_name} (topic_id INTEGER, email TEXT);
+
+      INSERT INTO #{table_name} (topic_id, email)
+      VALUES (1, 'something@email.com');
+      SQL
+
+      Migration::ColumnDropper.mark_readonly(table_name, 'email')
+    end
+
+    after do
+      ActiveRecord::Base.connection.reset!
+
+      ActiveRecord::Base.exec_sql <<~SQL
+      DROP TABLE IF EXISTS #{table_name};
+      DROP TRIGGER IF EXISTS #{table_name}_email_readonly ON #{table_name};
+      SQL
+    end
+
+    it 'should be droppable' do
+      name = Topic
+        .exec_sql("SELECT name FROM schema_migration_details LIMIT 1")
+        .getvalue(0, 0)
+
+      dropped_proc_called = false
+      Migration::ColumnDropper.drop(
+        table: table_name,
+        after_migration: name,
+        columns: ['email'],
+        delay: 0.minutes,
+        on_drop: ->() { dropped_proc_called = true }
+      )
+
+      expect(dropped_proc_called).to eq(true)
+
+    end
+    it 'should prevent updates to the readonly column' do
+      expect do
+        ActiveRecord::Base.connection.raw_connection.exec <<~SQL
+        UPDATE #{table_name}
+        SET email = 'testing@email.com'
+        WHERE topic_id = 1;
+        SQL
+      end.to raise_error(
+        PG::RaiseException,
+        /Discourse: email in #{table_name} is readonly/
+      )
+    end
+
+    it 'should allow updates to the other columns' do
+      ActiveRecord::Base.exec_sql <<~SQL
+      UPDATE #{table_name}
+      SET topic_id = 2
+      WHERE topic_id = 1
+      SQL
+
+      expect(
+        ActiveRecord::Base.exec_sql("SELECT * FROM #{table_name};").values
+      ).to include([2, "something@email.com"])
+    end
+
+    it 'should prevent insertions to the readonly column' do
+      expect do
+        ActiveRecord::Base.connection.raw_connection.exec <<~SQL
+        INSERT INTO #{table_name} (topic_id, email)
+        VALUES (2, 'something@email.com');
+        SQL
+      end.to raise_error(
+        PG::RaiseException,
+        /Discourse: email in table_with_readonly_column is readonly/
+      )
+    end
+
+    it 'should allow insertions to the other columns' do
+      ActiveRecord::Base.exec_sql <<~SQL
+      INSERT INTO #{table_name} (topic_id)
+      VALUES (2);
+      SQL
+
+      expect(
+        ActiveRecord::Base.exec_sql("SELECT * FROM #{table_name} WHERE topic_id = 2;").values
+      ).to include([2, nil])
+    end
+  end
+end
diff --git a/spec/components/migration/safe_migrate_spec.rb b/spec/components/migration/safe_migrate_spec.rb
new file mode 100644
index 00000000000..1be7f7c86d1
--- /dev/null
+++ b/spec/components/migration/safe_migrate_spec.rb
@@ -0,0 +1,104 @@
+require 'rails_helper'
+require_dependency 'migration/safe_migrate'
+
+describe Migration::SafeMigrate do
+  before do
+    Migration::SafeMigrate::SafeMigration.disable_safe!
+  end
+
+  after do
+    Migration::SafeMigrate.disable!
+    Migration::SafeMigrate::SafeMigration.enable_safe!
+  end
+
+  def capture_stdout
+    old_stdout = $stdout
+    io = StringIO.new
+    $stdout = io
+    yield
+    io.string
+  ensure
+    $stdout = old_stdout
+  end
+
+  it "bans all table removal" do
+    Migration::SafeMigrate.enable!
+
+    path = File.expand_path "#{Rails.root}/spec/fixtures/migrate/drop_table"
+
+    output = capture_stdout do
+      expect(lambda do
+        ActiveRecord::Migrator.up([path])
+      end).to raise_error(StandardError)
+    end
+
+    expect(output).to include("TableDropper")
+
+    expect { User.first }.not_to raise_error
+    expect(User.first).not_to eq(nil)
+  end
+
+  it "bans all table renames" do
+    Migration::SafeMigrate.enable!
+
+    path = File.expand_path "#{Rails.root}/spec/fixtures/migrate/rename_table"
+
+    output = capture_stdout do
+      expect(lambda do
+        ActiveRecord::Migrator.up([path])
+      end).to raise_error(StandardError)
+    end
+
+    expect(output).to include("TableDropper")
+
+    expect { User.first }.not_to raise_error
+    expect(User.first).not_to eq(nil)
+  end
+
+  it "bans all column removal" do
+    Migration::SafeMigrate.enable!
+
+    path = File.expand_path "#{Rails.root}/spec/fixtures/migrate/remove_column"
+
+    output = capture_stdout do
+      expect(lambda do
+        ActiveRecord::Migrator.up([path])
+      end).to raise_error(StandardError)
+    end
+
+    expect(output).to include("ColumnDropper")
+
+    expect(User.first).not_to eq(nil)
+    expect { User.first.username }.not_to raise_error
+  end
+
+  it "bans all column renames" do
+    Migration::SafeMigrate.enable!
+
+    path = File.expand_path "#{Rails.root}/spec/fixtures/migrate/rename_column"
+
+    output = capture_stdout do
+      expect(lambda do
+        ActiveRecord::Migrator.up([path])
+      end).to raise_error(StandardError)
+    end
+
+    expect(output).to include("ColumnDropper")
+
+    expect(User.first).not_to eq(nil)
+    expect { User.first.username }.not_to raise_error
+  end
+
+  it "supports being disabled" do
+    Migration::SafeMigrate.enable!
+    Migration::SafeMigrate.disable!
+
+    path = File.expand_path "#{Rails.root}/spec/fixtures/migrate/drop_table"
+
+    output = capture_stdout do
+      ActiveRecord::Migrator.up([path])
+    end
+
+    expect(output).to include("drop_table(:users)")
+  end
+end
diff --git a/spec/components/migration/table_dropper_spec.rb b/spec/components/migration/table_dropper_spec.rb
new file mode 100644
index 00000000000..0b798f82bcb
--- /dev/null
+++ b/spec/components/migration/table_dropper_spec.rb
@@ -0,0 +1,206 @@
+require 'rails_helper'
+require_dependency 'migration/table_dropper'
+
+describe Migration::TableDropper do
+
+  def table_exists?(table_name)
+    sql = <<~SQL
+      SELECT 1
+      FROM INFORMATION_SCHEMA.TABLES
+      WHERE table_schema = 'public' AND
+            table_name = '#{table_name}'
+    SQL
+
+    ActiveRecord::Base.exec_sql(sql).to_a.length > 0
+  end
+
+  def update_first_migration_date(created_at)
+    ActiveRecord::Base.exec_sql(<<~SQL, created_at: created_at)
+        UPDATE schema_migration_details
+        SET created_at = :created_at
+        WHERE id = (SELECT MIN(id)
+                    FROM schema_migration_details)
+    SQL
+  end
+
+  def create_new_table
+    ActiveRecord::Base.exec_sql "CREATE TABLE table_with_new_name (topic_id INTEGER)"
+  end
+
+  let(:migration_name) do
+    ActiveRecord::Base
+      .exec_sql("SELECT name FROM schema_migration_details ORDER BY id DESC LIMIT 1")
+      .getvalue(0, 0)
+  end
+
+  before do
+    ActiveRecord::Base.exec_sql "CREATE TABLE table_with_old_name (topic_id INTEGER)"
+
+    ActiveRecord::Base.exec_sql(<<~SQL, name: migration_name, created_at: 15.minutes.ago)
+      UPDATE schema_migration_details
+      SET created_at = :created_at
+      WHERE name = :name
+    SQL
+  end
+
+  context "first migration was a long time ago" do
+    before do
+      update_first_migration_date(2.years.ago)
+    end
+
+    describe ".delayed_rename" do
+      it "can drop a table after correct delay and when new table exists" do
+        dropped_proc_called = false
+
+        described_class.delayed_rename(
+          old_name: 'table_with_old_name',
+          new_name: 'table_with_new_name',
+          after_migration: migration_name,
+          delay: 20.minutes,
+          on_drop: ->() { dropped_proc_called = true }
+        )
+
+        expect(table_exists?('table_with_old_name')).to eq(true)
+        expect(dropped_proc_called).to eq(false)
+
+        described_class.delayed_rename(
+          old_name: 'table_with_old_name',
+          new_name: 'table_with_new_name',
+          after_migration: migration_name,
+          delay: 10.minutes,
+          on_drop: ->() { dropped_proc_called = true }
+        )
+
+        expect(table_exists?('table_with_old_name')).to eq(true)
+        expect(dropped_proc_called).to eq(false)
+
+        create_new_table
+
+        described_class.delayed_rename(
+          old_name: 'table_with_old_name',
+          new_name: 'table_with_new_name',
+          after_migration: migration_name,
+          delay: 10.minutes,
+          on_drop: ->() { dropped_proc_called = true }
+        )
+
+        expect(table_exists?('table_with_old_name')).to eq(false)
+        expect(dropped_proc_called).to eq(true)
+
+        dropped_proc_called = false
+
+        described_class.delayed_rename(
+          old_name: 'table_with_old_name',
+          new_name: 'table_with_new_name',
+          after_migration: migration_name,
+          delay: 10.minutes,
+          on_drop: ->() { dropped_proc_called = true }
+        )
+
+        # it should call "on_drop" only when there is a table to drop
+        expect(dropped_proc_called).to eq(false)
+      end
+    end
+
+    describe ".delayed_drop" do
+      it "can drop a table after correct delay" do
+        dropped_proc_called = false
+
+        described_class.delayed_drop(
+          table_name: 'table_with_old_name',
+          after_migration: migration_name,
+          delay: 20.minutes,
+          on_drop: ->() { dropped_proc_called = true }
+        )
+
+        expect(table_exists?('table_with_old_name')).to eq(true)
+        expect(dropped_proc_called).to eq(false)
+
+        described_class.delayed_drop(
+          table_name: 'table_with_old_name',
+          after_migration: migration_name,
+          delay: 10.minutes,
+          on_drop: ->() { dropped_proc_called = true }
+        )
+
+        expect(table_exists?('table_with_old_name')).to eq(false)
+        expect(dropped_proc_called).to eq(true)
+
+        dropped_proc_called = false
+
+        described_class.delayed_drop(
+          table_name: 'table_with_old_name',
+          after_migration: migration_name,
+          delay: 10.minutes,
+          on_drop: ->() { dropped_proc_called = true }
+        )
+
+        # it should call "on_drop" only when there is a table to drop
+        expect(dropped_proc_called).to eq(false)
+      end
+    end
+  end
+
+  context "first migration was a less than 10 minutes ago" do
+    describe ".delayed_rename" do
+      it "can drop a table after correct delay and when new table exists" do
+        dropped_proc_called = false
+        update_first_migration_date(11.minutes.ago)
+        create_new_table
+
+        described_class.delayed_rename(
+          old_name: 'table_with_old_name',
+          new_name: 'table_with_new_name',
+          after_migration: migration_name,
+          delay: 30.minutes,
+          on_drop: ->() { dropped_proc_called = true }
+        )
+
+        expect(table_exists?('table_with_old_name')).to eq(true)
+        expect(dropped_proc_called).to eq(false)
+
+        update_first_migration_date(9.minutes.ago)
+
+        described_class.delayed_rename(
+          old_name: 'table_with_old_name',
+          new_name: 'table_with_new_name',
+          after_migration: migration_name,
+          delay: 30.minutes,
+          on_drop: ->() { dropped_proc_called = true }
+        )
+
+        expect(table_exists?('table_with_old_name')).to eq(false)
+        expect(dropped_proc_called).to eq(true)
+      end
+    end
+
+    describe ".delayed_drop" do
+      it "immediately drops the table" do
+        dropped_proc_called = false
+        update_first_migration_date(11.minutes.ago)
+
+        described_class.delayed_drop(
+          table_name: 'table_with_old_name',
+          after_migration: migration_name,
+          delay: 30.minutes,
+          on_drop: ->() { dropped_proc_called = true }
+        )
+
+        expect(table_exists?('table_with_old_name')).to eq(true)
+        expect(dropped_proc_called).to eq(false)
+
+        update_first_migration_date(9.minutes.ago)
+
+        described_class.delayed_drop(
+          table_name: 'table_with_old_name',
+          after_migration: migration_name,
+          delay: 30.minutes,
+          on_drop: ->() { dropped_proc_called = true }
+        )
+
+        expect(table_exists?('table_with_old_name')).to eq(false)
+        expect(dropped_proc_called).to eq(true)
+      end
+    end
+  end
+end
diff --git a/spec/components/new_post_manager_spec.rb b/spec/components/new_post_manager_spec.rb
index 65aee5054f0..22218a67dc5 100644
--- a/spec/components/new_post_manager_spec.rb
+++ b/spec/components/new_post_manager_spec.rb
@@ -115,6 +115,18 @@ describe NewPostManager do
       end
     end
 
+    context 'with staged moderation setting enabled' do
+      before do
+        SiteSetting.approve_unless_staged = true
+        topic.user.staged = true
+      end
+      it "will return an enqueue result" do
+        result = NewPostManager.default_handler(manager)
+        expect(NewPostManager.queue_enabled?).to eq(true)
+        expect(result.action).to eq(:enqueued)
+      end
+    end
+
     context 'with a high trust level setting for new topics but post responds to existing topic' do
       before do
         SiteSetting.approve_new_topics_unless_trust_level = 4
diff --git a/spec/components/onebox/engine/discourse_local_onebox_spec.rb b/spec/components/onebox/engine/discourse_local_onebox_spec.rb
deleted file mode 100644
index 911ef40b312..00000000000
--- a/spec/components/onebox/engine/discourse_local_onebox_spec.rb
+++ /dev/null
@@ -1,144 +0,0 @@
-require 'rails_helper'
-
-describe Onebox::Engine::DiscourseLocalOnebox do
-
-  before { SiteSetting.external_system_avatars_enabled = false }
-
-  def build_link(url)
-    %|<a href="#{url}" rel="nofollow noopener">#{url}</a>|
-  end
-
-  context "for a link to a post" do
-    let(:post)  { Fabricate(:post) }
-    let(:post2) { Fabricate(:post, topic: post.topic, post_number: 2) }
-
-    it "returns a link if post isn't found" do
-      url = "#{Discourse.base_url}/t/not-exist/3/2"
-      expect(Onebox.preview(url).to_s).to eq(build_link(url))
-    end
-
-    it "returns a link if not allowed to see the post" do
-      url = "#{Discourse.base_url}#{post2.url}"
-      Guardian.any_instance.expects(:can_see_post?).returns(false)
-      expect(Onebox.preview(url).to_s).to eq(build_link(url))
-    end
-
-    it "returns a link if post is hidden" do
-      hidden_post = Fabricate(:post, topic: post.topic, post_number: 2, hidden: true, hidden_reason_id: Post.hidden_reasons[:flag_threshold_reached])
-      url = "#{Discourse.base_url}#{hidden_post.url}"
-      expect(Onebox.preview(url).to_s).to eq(build_link(url))
-    end
-
-    it "returns some onebox goodness if post exists and can be seen" do
-      url = "#{Discourse.base_url}#{post2.url}?source_topic_id=#{post2.topic_id + 1}"
-      html = Onebox.preview(url).to_s
-      expect(html).to include(post2.excerpt)
-      expect(html).to include(post2.topic.title)
-
-      url = "#{Discourse.base_url}#{post2.url}/?source_topic_id=#{post2.topic_id + 1}"
-      html = Onebox.preview(url).to_s
-      expect(html).to include(post2.excerpt)
-      expect(html).to include(post2.topic.title)
-
-      html = Onebox.preview("#{Discourse.base_url}#{post2.url}").to_s
-      expect(html).to include(post2.user.username)
-      expect(html).to include(post2.excerpt)
-    end
-  end
-
-  context "for a link to a topic" do
-    let(:post)  { Fabricate(:post) }
-    let(:topic) { post.topic }
-
-    it "returns a link if topic isn't found" do
-      url = "#{Discourse.base_url}/t/not-found/123"
-      expect(Onebox.preview(url).to_s).to eq(build_link(url))
-    end
-
-    it "returns a link if not allowed to see the topic" do
-      url = topic.url
-      Guardian.any_instance.expects(:can_see_topic?).returns(false)
-      expect(Onebox.preview(url).to_s).to eq(build_link(url))
-    end
-
-    it "replaces emoji in the title" do
-      topic.update_column(:title, "Who wants to eat a :hamburger:")
-      expect(Onebox.preview(topic.url).to_s).to match(/hamburger\.png/)
-    end
-
-    it "returns some onebox goodness if topic exists and can be seen" do
-      html = Onebox.preview(topic.url).to_s
-      expect(html).to include(topic.ordered_posts.first.user.username)
-      expect(html).to include("<blockquote>")
-
-      html = Onebox.preview("#{topic.url}/?u=codinghorror").to_s
-      expect(html).to include(topic.ordered_posts.first.user.username)
-      expect(html).to include("<blockquote>")
-    end
-  end
-
-  context "for a link to an internal audio or video file" do
-
-    let(:sha) { Digest::SHA1.hexdigest("discourse") }
-    let(:path) { "/uploads/default/original/3X/5/c/#{sha}" }
-
-    it "returns nil if file type is not audio or video" do
-      url = "#{Discourse.base_url}#{path}.pdf"
-      stub_request(:get, url).to_return(body: '')
-      expect(Onebox.preview(url).to_s).to eq("")
-    end
-
-    it "returns some onebox goodness for audio file" do
-      url = "#{Discourse.base_url}#{path}.MP3"
-      html = Onebox.preview(url).to_s
-      # </source> will be removed by the browser
-      # need to fix https://github.com/rubys/nokogumbo/issues/14
-      expect(html).to eq(%|<audio controls=""><source src="#{url}"></source>#{build_link(url)}</audio>|)
-    end
-
-    it "returns some onebox goodness for video file" do
-      url = "#{Discourse.base_url}#{path}.mov"
-      html = Onebox.preview(url).to_s
-      expect(html).to eq(%|<video width="100%" height="100%" controls=""><source src="#{url}"></source>#{build_link(url)}</video>|)
-    end
-  end
-
-  context "When deployed to a subfolder" do
-    let(:base_uri) { "/subfolder" }
-    let(:base_url) { "http://test.localhost#{base_uri}" }
-
-    before do
-      Discourse.stubs(:base_url).returns(base_url)
-      Discourse.stubs(:base_uri).returns(base_uri)
-    end
-
-    context "for a link to a post" do
-      let(:post)  { Fabricate(:post) }
-      let(:post2) { Fabricate(:post, topic: post.topic, post_number: 2) }
-
-      it "returns some onebox goodness if post exists and can be seen" do
-        url = "#{Discourse.base_url}#{post2.url}?source_topic_id=#{post2.topic_id + 1}"
-        html = Onebox.preview(url).to_s
-        expect(html).to include(post2.excerpt)
-        expect(html).to include(post2.topic.title)
-      end
-    end
-  end
-
-  context "When login_required is enabled" do
-    before { SiteSetting.login_required = true }
-
-    context "for a link to a topic" do
-      let(:post)  { Fabricate(:post) }
-      let(:topic) { post.topic }
-
-      it "returns some onebox goodness if post exists and can be seen" do
-        html = Onebox.preview(topic.url).to_s
-        expect(html).to include(topic.ordered_posts.first.user.username)
-        expect(html).to include("<blockquote>")
-      end
-    end
-
-  end
-
-end
diff --git a/spec/components/oneboxer_spec.rb b/spec/components/oneboxer_spec.rb
index 6579e1f6e2e..b5ebd305ce2 100644
--- a/spec/components/oneboxer_spec.rb
+++ b/spec/components/oneboxer_spec.rb
@@ -4,11 +4,107 @@ require_dependency 'oneboxer'
 describe Oneboxer do
 
   it "returns blank string for an invalid onebox" do
+    stub_request(:head, "http://boom.com")
     stub_request(:get, "http://boom.com").to_return(body: "")
-    stub_request(:head, "http://boom.com").to_return(body: "")
 
     expect(Oneboxer.preview("http://boom.com")).to eq("")
     expect(Oneboxer.onebox("http://boom.com")).to eq("")
   end
 
+  context "local oneboxes" do
+
+    def link(url)
+      url = "#{Discourse.base_url}#{url}"
+      %{<a href="#{url}">#{url}</a>}
+    end
+
+    def preview(url, user = nil, category = nil, topic = nil)
+      Oneboxer.preview("#{Discourse.base_url}#{url}",
+        user_id: user&.id,
+        category_id: category&.id,
+        topic_id: topic&.id).to_s
+    end
+
+    it "links to a topic/post" do
+      staff = Fabricate(:user)
+      Group[:staff].add(staff)
+
+      secured_category = Fabricate(:category)
+      secured_category.permissions = { staff: :full }
+      secured_category.save!
+
+      replier = Fabricate(:user)
+
+      public_post   = Fabricate(:post, raw: "This post has an emoji :+1:")
+      public_topic  = public_post.topic
+      public_reply  = Fabricate(:post, topic: public_topic, post_number: 2, user: replier)
+      public_hidden = Fabricate(:post, topic: public_topic, post_number: 3, hidden: true)
+
+      user = public_post.user
+      public_category = public_topic.category
+
+      secured_topic = Fabricate(:topic, user: staff, category: secured_category)
+      secured_post  = Fabricate(:post, user: staff, topic: secured_topic)
+      secured_reply = Fabricate(:post, user: staff, topic: secured_topic, post_number: 2)
+
+      expect(preview(public_topic.relative_url, user, public_category)).to include(public_topic.title)
+      onebox = preview(public_post.url, user, public_category)
+      expect(onebox).to include(public_topic.title)
+      expect(onebox).to include("/images/emoji/")
+
+      onebox = preview(public_reply.url, user, public_category)
+      expect(onebox).to include(public_reply.excerpt)
+      expect(onebox).to include(%{data-post="2"})
+      expect(onebox).to include(PrettyText.avatar_img(replier.avatar_template, "tiny"))
+
+      onebox = preview(public_reply.url, user, public_category, public_topic)
+      expect(onebox).not_to include(public_topic.title)
+      expect(onebox).to include(replier.avatar_template.sub("{size}", "40"))
+
+      expect(preview(public_hidden.url, user, public_category)).to match_html(link(public_hidden.url))
+      expect(preview(secured_topic.relative_url, user, public_category)).to match_html(link(secured_topic.relative_url))
+      expect(preview(secured_post.url, user, public_category)).to match_html(link(secured_post.url))
+      expect(preview(secured_reply.url, user, public_category)).to match_html(link(secured_reply.url))
+
+      expect(preview(public_topic.relative_url, user, secured_category)).to match_html(link(public_topic.relative_url))
+      expect(preview(public_reply.url, user, secured_category)).to match_html(link(public_reply.url))
+      expect(preview(secured_post.url, user, secured_category)).to match_html(link(secured_post.url))
+      expect(preview(secured_reply.url, user, secured_category)).to match_html(link(secured_reply.url))
+
+      expect(preview(public_topic.relative_url, staff, secured_category)).to include(public_topic.title)
+      expect(preview(public_post.url, staff, secured_category)).to include(public_topic.title)
+      expect(preview(public_reply.url, staff, secured_category)).to include(public_reply.excerpt)
+      expect(preview(public_hidden.url, staff, secured_category)).to match_html(link(public_hidden.url))
+      expect(preview(secured_topic.relative_url, staff, secured_category)).to include(secured_topic.title)
+      expect(preview(secured_post.url, staff, secured_category)).to include(secured_topic.title)
+      expect(preview(secured_reply.url, staff, secured_category)).to include(secured_reply.excerpt)
+      expect(preview(secured_reply.url, staff, secured_category, secured_topic)).not_to include(secured_topic.title)
+    end
+
+    it "links to an user profile" do
+      user = Fabricate(:user)
+
+      expect(preview("/u/does-not-exist")).to match_html(link("/u/does-not-exist"))
+      expect(preview("/u/#{user.username}")).to include(user.name)
+    end
+
+    it "links to an upload" do
+      path = "/uploads/default/original/3X/e/8/e8fcfa624e4fb6623eea57f54941a58ba797f14d"
+
+      expect(preview("#{path}.pdf")).to match_html(link("#{path}.pdf"))
+      expect(preview("#{path}.MP3")).to include("<audio ")
+      expect(preview("#{path}.mov")).to include("<video ")
+    end
+
+  end
+
+  context ".onebox_raw" do
+    it "should escape the onebox URL before processing" do
+      post = Fabricate(:post, raw: Discourse.base_url + "/new?'class=black")
+      cpp = CookedPostProcessor.new(post, invalidate_oneboxes: true)
+      cpp.post_process_oneboxes
+      expect(cpp.html).to eq("<p><a href=\"#{Discourse.base_url}/new?%27class=black\">http://test.localhost/new?%27class=black</a></p>")
+    end
+  end
+
 end
diff --git a/spec/components/plugin/instance_spec.rb b/spec/components/plugin/instance_spec.rb
index 7c1f37f6a50..b791a7d8f83 100644
--- a/spec/components/plugin/instance_spec.rb
+++ b/spec/components/plugin/instance_spec.rb
@@ -10,8 +10,8 @@ describe Plugin::Instance do
   context "find_all" do
     it "can find plugins correctly" do
       plugins = Plugin::Instance.find_all("#{Rails.root}/spec/fixtures/plugins")
-      expect(plugins.count).to eq(1)
-      plugin = plugins[0]
+      expect(plugins.count).to eq(2)
+      plugin = plugins[1]
 
       expect(plugin.name).to eq("plugin-name")
       expect(plugin.path).to eq("#{Rails.root}/spec/fixtures/plugins/my_plugin/plugin.rb")
@@ -93,6 +93,15 @@ describe Plugin::Instance do
       expect(DiscoursePluginRegistry.mobile_stylesheets.count).to eq(0)
       expect(DiscoursePluginRegistry.stylesheets.count).to eq(2)
     end
+
+    it "remaps vendored_core_pretty_text asset" do
+      plugin = Plugin::Instance.new nil, "/tmp/test.rb"
+      plugin.register_asset("moment.js", :vendored_core_pretty_text)
+
+      plugin.send :register_assets!
+
+      expect(DiscoursePluginRegistry.vendored_core_pretty_text.first).to eq("lib/javascripts/moment.js")
+    end
   end
 
   context "register service worker" do
@@ -268,4 +277,123 @@ describe Plugin::Instance do
       expect(called).to eq(1)
     end
   end
+
+  context "locales" do
+    let(:plugin_path) { "#{Rails.root}/spec/fixtures/plugins/custom_locales" }
+    let!(:plugin) { Plugin::Instance.new(nil, "#{plugin_path}/plugin.rb") }
+    let(:plural) do
+      {
+        keys: [:one, :few, :other],
+        rule: lambda do |n|
+          return :one if n == 1
+          return :few if n < 10
+          :other
+        end
+      }
+    end
+
+    def register_locale(locale, opts)
+      plugin.register_locale(locale, opts)
+      plugin.activate!
+
+      DiscoursePluginRegistry.locales[locale]
+    end
+
+    it "enables the registered locales only on activate" do
+      plugin.register_locale("foo", name: "Foo", nativeName: "Foo Bar", plural: plural)
+      plugin.register_locale("es_MX", name: "Spanish (Mexico)", nativeName: "Español (México)", fallbackLocale: "es")
+      expect(DiscoursePluginRegistry.locales.count).to eq(0)
+
+      plugin.activate!
+      expect(DiscoursePluginRegistry.locales.count).to eq(2)
+    end
+
+    it "allows finding the locale by string and symbol" do
+      register_locale("foo", name: "Foo", nativeName: "Foo Bar", plural: plural)
+
+      expect(DiscoursePluginRegistry.locales).to have_key(:foo)
+      expect(DiscoursePluginRegistry.locales).to have_key('foo')
+    end
+
+    it "correctly registers a new locale" do
+      locale = register_locale("foo", name: "Foo", nativeName: "Foo Bar", plural: plural)
+
+      expect(DiscoursePluginRegistry.locales.count).to eq(1)
+      expect(DiscoursePluginRegistry.locales).to have_key(:foo)
+
+      expect(locale[:fallbackLocale]).to be_nil
+      expect(locale[:message_format]).to eq(["foo", "#{plugin_path}/lib/javascripts/locale/message_format/foo.js"])
+      expect(locale[:moment_js]).to eq(["foo", "#{plugin_path}/lib/javascripts/locale/moment_js/foo.js"])
+      expect(locale[:plural]).to eq(plural.with_indifferent_access)
+
+      expect(Rails.configuration.assets.precompile).to include("locales/foo.js")
+    end
+
+    it "correctly registers a new locale using a fallback locale" do
+      locale = register_locale("es_MX", name: "Spanish (Mexico)", nativeName: "Español (México)", fallbackLocale: "es")
+
+      expect(DiscoursePluginRegistry.locales.count).to eq(1)
+      expect(DiscoursePluginRegistry.locales).to have_key(:es_MX)
+
+      expect(locale[:fallbackLocale]).to eq("es")
+      expect(locale[:message_format]).to eq(["es", "#{Rails.root}/lib/javascripts/locale/es.js"])
+      expect(locale[:moment_js]).to eq(["es", "#{Rails.root}/lib/javascripts/moment_locale/es.js"])
+      expect(locale[:plural]).to be_nil
+
+      expect(Rails.configuration.assets.precompile).to include("locales/es_MX.js")
+    end
+
+    it "correctly registers a new locale when some files exist in core" do
+      locale = register_locale("tlh", name: "Klingon", nativeName: "tlhIngan Hol", plural: plural)
+
+      expect(DiscoursePluginRegistry.locales.count).to eq(1)
+      expect(DiscoursePluginRegistry.locales).to have_key(:tlh)
+
+      expect(locale[:fallbackLocale]).to be_nil
+      expect(locale[:message_format]).to eq(["tlh", "#{plugin_path}/lib/javascripts/locale/message_format/tlh.js"])
+      expect(locale[:moment_js]).to eq(["tlh", "#{Rails.root}/lib/javascripts/moment_locale/tlh.js"])
+      expect(locale[:plural]).to eq(plural.with_indifferent_access)
+
+      expect(Rails.configuration.assets.precompile).to include("locales/tlh.js")
+    end
+
+    it "does not register a new locale when the fallback locale does not exist" do
+      register_locale("bar", name: "Bar", nativeName: "Bar", fallbackLocale: "foo")
+      expect(DiscoursePluginRegistry.locales.count).to eq(0)
+    end
+
+    [
+      "config/locales/client.foo.yml",
+      "config/locales/server.foo.yml",
+      "lib/javascripts/locale/message_format/foo.js",
+      "lib/javascripts/locale/moment_js/foo.js",
+      "assets/locales/foo.js.erb"
+    ].each do |path|
+      it "does not register a new locale when #{path} is missing" do
+        path = "#{plugin_path}/#{path}"
+        File.stubs('exist?').returns(false)
+        File.stubs('exist?').with(regexp_matches(/#{Regexp.quote(plugin_path)}.*/)).returns(true)
+        File.stubs('exist?').with(path).returns(false)
+
+        register_locale("foo", name: "Foo", nativeName: "Foo Bar", plural: plural)
+        expect(DiscoursePluginRegistry.locales.count).to eq(0)
+      end
+    end
+  end
+
+  describe '#enabled_site_setting_filter' do
+    describe 'when filter is blank' do
+      it 'should return the right value' do
+        expect(Plugin::Instance.new.enabled_site_setting_filter).to eq(nil)
+      end
+    end
+
+    it 'should set the right value' do
+      instance = Plugin::Instance.new
+      instance.enabled_site_setting_filter('test')
+
+      expect(instance.enabled_site_setting_filter).to eq('test')
+    end
+  end
+
 end
diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb
index 57ab779b7ab..876b5a9830b 100644
--- a/spec/components/post_creator_spec.rb
+++ b/spec/components/post_creator_spec.rb
@@ -266,7 +266,6 @@ describe PostCreator do
       it 'creates a post with featured link' do
         SiteSetting.topic_featured_link_enabled = true
         SiteSetting.min_first_post_length = 100
-        SiteSetting.queue_jobs = true
 
         post = creator_with_featured_link.create
         expect(post.topic.featured_link).to eq('http://www.discourse.org')
@@ -290,10 +289,6 @@ describe PostCreator do
       end
 
       describe "topic's auto close" do
-        before do
-          SiteSetting.queue_jobs = true
-        end
-
         it "doesn't update topic's auto close when it's not based on last post" do
           freeze_time
 
@@ -306,23 +301,64 @@ describe PostCreator do
           expect(topic_status_update.created_at).to be_within(1.second).of(Time.zone.now)
         end
 
-        it "updates topic's auto close date when it's based on last post" do
-          freeze_time
-          topic = Fabricate(:topic_timer,
-            based_on_last_post: true,
-            execute_at: Time.zone.now - 12.hours,
-            created_at: Time.zone.now - 24.hours
-          ).topic
+        describe "topic's auto close based on last post" do
+          let(:topic_timer) do
+            Fabricate(:topic_timer,
+              based_on_last_post: true,
+              execute_at: Time.zone.now - 12.hours,
+              created_at: Time.zone.now - 24.hours
+            )
+          end
 
-          Fabricate(:post, topic: topic)
+          let(:topic) { topic_timer.topic }
 
-          PostCreator.new(topic.user, topic_id: topic.id, raw: "this is a second post").create
+          let(:post) do
+            Fabricate(:post, topic: topic)
+          end
 
-          topic_status_update = TopicTimer.last
-          expect(topic_status_update.execute_at).to be_within(1.second).of(Time.zone.now + 12.hours)
-          expect(topic_status_update.created_at).to be_within(1.second).of(Time.zone.now)
+          it "updates topic's auto close date" do
+            freeze_time
+            post
+
+            PostCreator.new(
+              topic.user,
+              topic_id: topic.id,
+              raw: "this is a second post"
+            ).create
+
+            topic_timer.reload
+
+            expect(topic_timer.execute_at).to eq(Time.zone.now + 12.hours)
+            expect(topic_timer.created_at).to eq(Time.zone.now)
+          end
+
+          describe "when auto_close_topics_post_count has been reached" do
+            before do
+              SiteSetting.auto_close_topics_post_count = 2
+            end
+
+            it "closes the topic and deletes the topic timer" do
+              freeze_time
+              post
+
+              PostCreator.new(
+                topic.user,
+                topic_id: topic.id,
+                raw: "this is a second post"
+              ).create
+
+              topic.reload
+
+              expect(topic.posts.last.raw).to eq(I18n.t(
+                'topic_statuses.autoclosed_topic_max_posts',
+                count: SiteSetting.auto_close_topics_post_count
+              ))
+
+              expect(topic.closed).to eq(true)
+              expect(topic_timer.reload.deleted_at).to eq(Time.zone.now)
+            end
+          end
         end
-
       end
 
       context "tags" do
@@ -742,9 +778,17 @@ describe PostCreator do
       post1 = create_post(archetype: Archetype.private_message,
                           target_usernames: [admin.username])
 
-      _post2 = create_post(user: post1.user, topic_id: post1.topic_id)
+      expect do
+        create_post(user: post1.user, topic_id: post1.topic_id)
+      end.to change { Post.count }.by(2)
 
       post1.topic.reload
+
+      expect(post1.topic.posts.last.raw).to eq(I18n.t(
+        'topic_statuses.autoclosed_message_max_posts',
+        count: SiteSetting.auto_close_messages_post_count
+      ))
+
       expect(post1.topic.closed).to eq(true)
     end
 
@@ -752,11 +796,18 @@ describe PostCreator do
       SiteSetting.auto_close_topics_post_count = 2
 
       post1 = create_post
-      _post2 = create_post(user: post1.user, topic_id: post1.topic_id)
+
+      expect do
+        create_post(user: post1.user, topic_id: post1.topic_id)
+      end.to change { Post.count }.by(2)
 
       post1.topic.reload
 
-      expect(post1.topic.posts_count).to eq(3)
+      expect(post1.topic.posts.last.raw).to eq(I18n.t(
+        'topic_statuses.autoclosed_topic_max_posts',
+        count: SiteSetting.auto_close_topics_post_count
+      ))
+
       expect(post1.topic.closed).to eq(true)
     end
   end
@@ -782,6 +833,8 @@ describe PostCreator do
     end
 
     it 'can post to a group correctly' do
+      SiteSetting.queue_jobs = false
+
       expect(post.topic.archetype).to eq(Archetype.private_message)
       expect(post.topic.topic_allowed_users.count).to eq(1)
       expect(post.topic.topic_allowed_groups.count).to eq(1)
diff --git a/spec/components/post_destroyer_spec.rb b/spec/components/post_destroyer_spec.rb
index c4430c8d4f1..416686c0635 100644
--- a/spec/components/post_destroyer_spec.rb
+++ b/spec/components/post_destroyer_spec.rb
@@ -521,6 +521,7 @@ describe PostDestroyer do
 
   context '@mentions' do
     it 'removes notifications when deleted' do
+      SiteSetting.queue_jobs = false
       user = Fabricate(:evil_trout)
       post = create_post(raw: 'Hello @eviltrout')
       expect {
diff --git a/spec/components/post_locker_spec.rb b/spec/components/post_locker_spec.rb
new file mode 100644
index 00000000000..dd1e0291a04
--- /dev/null
+++ b/spec/components/post_locker_spec.rb
@@ -0,0 +1,49 @@
+require 'rails_helper'
+require_dependency 'post_locker'
+
+describe PostLocker do
+  let(:moderator) { Fabricate(:moderator) }
+  let(:post) { Fabricate(:post) }
+
+  it "doesn't allow regular users to lock posts" do
+    expect {
+      PostLocker.new(post, post.user).lock
+    }.to raise_error(Discourse::InvalidAccess)
+
+    expect(post).not_to be_locked
+    expect(post.locked_by_id).to be_blank
+  end
+
+  it "doesn't allow regular users to unlock posts" do
+    PostLocker.new(post, moderator).lock
+
+    expect {
+      PostLocker.new(post, post.user).lock
+    }.to raise_error(Discourse::InvalidAccess)
+
+    expect(post).to be_locked
+    expect(post.locked_by_id).to eq(moderator.id)
+  end
+
+  it "allows staff to lock and unlock posts" do
+    expect(post).not_to be_locked
+    expect(post.locked_by_id).to be_blank
+
+    PostLocker.new(post, moderator).lock
+    expect(post).to be_locked
+    expect(post.locked_by_id).to eq(moderator.id)
+    expect(UserHistory.where(
+      acting_user_id: moderator.id,
+      action: UserHistory.actions[:post_locked]
+    ).exists?).to eq(true)
+
+    PostLocker.new(post, moderator).unlock
+    expect(post).not_to be_locked
+    expect(post.locked_by_id).to be_blank
+    expect(UserHistory.where(
+      acting_user_id: moderator.id,
+      action: UserHistory.actions[:post_unlocked]
+    ).exists?).to eq(true)
+  end
+
+end
diff --git a/spec/components/post_revisor_spec.rb b/spec/components/post_revisor_spec.rb
index 8abeb897bee..3e6efb0a6f1 100644
--- a/spec/components/post_revisor_spec.rb
+++ b/spec/components/post_revisor_spec.rb
@@ -111,8 +111,42 @@ describe PostRevisor do
         expect(subject.category_changed).to be_blank
       end
 
+      it "does create a new version if a large diff happens" do
+        SiteSetting.editing_grace_period_max_diff = 10
+
+        post = Fabricate(:post, raw: 'hello world')
+        revisor = PostRevisor.new(post)
+        revisor.revise!(post.user, { raw: 'hello world123456789' }, revised_at: post.updated_at + 1.second)
+
+        post.reload
+
+        expect(post.version).to eq(1)
+
+        revisor = PostRevisor.new(post)
+        revisor.revise!(post.user, { raw: 'hello world12345678901' }, revised_at: post.updated_at + 1.second)
+
+        post.reload
+        expect(post.version).to eq(2)
+
+        expect(post.revisions.first.modifications["raw"][0]).to eq("hello world")
+        expect(post.revisions.first.modifications["cooked"][0]).to eq("<p>hello world</p>")
+
+        SiteSetting.editing_grace_period_max_diff_high_trust = 100
+
+        post.user.update_columns(trust_level: 2)
+
+        revisor = PostRevisor.new(post)
+        revisor.revise!(post.user, { raw: 'hello world12345678901 123456789012' }, revised_at: post.updated_at + 1.second)
+
+        post.reload
+        expect(post.version).to eq(2)
+        expect(post.revisions.count).to eq(1)
+
+      end
+
       it "doesn't create a new version" do
         SiteSetting.editing_grace_period = 1.minute
+        SiteSetting.editing_grace_period_max_diff = 100
 
         # making a revision
         subject.revise!(post.user, { raw: 'updated body' }, revised_at: post.updated_at + SiteSetting.editing_grace_period + 1.seconds)
@@ -317,48 +351,34 @@ describe PostRevisor do
     end
 
     describe 'with a new body' do
+      before do
+        SiteSetting.editing_grace_period_max_diff = 1000
+      end
+
       let(:changed_by) { Fabricate(:coding_horror) }
       let!(:result) { subject.revise!(changed_by, raw: "lets update the body. Здравствуйте") }
 
-      it 'returns true' do
+      it 'correctly updates raw' do
         expect(result).to eq(true)
-      end
-
-      it 'updates the body' do
         expect(post.raw).to eq("lets update the body. Здравствуйте")
-      end
-
-      it 'sets the invalidate oneboxes attribute' do
         expect(post.invalidate_oneboxes).to eq(true)
-      end
-
-      it 'increased the versions' do
         expect(post.version).to eq(2)
         expect(post.public_version).to eq(2)
-      end
-
-      it 'has the new revision' do
         expect(post.revisions.size).to eq(1)
-      end
-
-      it "saved the user who made the change in the revisions" do
         expect(post.revisions.first.user_id).to eq(changed_by.id)
-      end
 
-      it "updates the word count" do
+        # updates word count
         expect(post.word_count).to eq(5)
         post.topic.reload
         expect(post.topic.word_count).to eq(5)
       end
 
       context 'second poster posts again quickly' do
-        before do
+
+        it 'is a ninja edit, because the second poster posted again quickly' do
           SiteSetting.editing_grace_period = 1.minute
           subject.revise!(changed_by, { raw: 'yet another updated body' }, revised_at: post.updated_at + 10.seconds)
           post.reload
-        end
-
-        it 'is a ninja edit, because the second poster posted again quickly' do
           expect(post.version).to eq(2)
           expect(post.public_version).to eq(2)
           expect(post.revisions.size).to eq(1)
@@ -417,6 +437,157 @@ describe PostRevisor do
       end
     end
 
+    context "logging staff edits" do
+      let(:moderator) { Fabricate(:moderator) }
+
+      it "doesn't log when a regular user revises a post" do
+        subject.revise!(
+          post.user,
+          raw: "lets totally update the body"
+        )
+        log = UserHistory.where(
+          acting_user_id: post.user.id,
+          action: UserHistory.actions[:post_edit]
+        )
+        expect(log).to be_blank
+      end
+
+      it "logs an edit when a staff member revises a post" do
+        subject.revise!(
+          moderator,
+          raw: "lets totally update the body"
+        )
+        log = UserHistory.where(
+          acting_user_id: moderator.id,
+          action: UserHistory.actions[:post_edit]
+        ).first
+        expect(log).to be_present
+        expect(log.details).to eq("Hello world\n\n---\n\nlets totally update the body")
+      end
+
+      it "doesn't log an edit when a staff member edits their own post" do
+        revisor = PostRevisor.new(
+          Fabricate(:post, user: moderator)
+        )
+        revisor.revise!(
+          moderator,
+          raw: "my own edit to my own thing"
+        )
+
+        log = UserHistory.where(
+          acting_user_id: moderator.id,
+          action: UserHistory.actions[:post_edit]
+        )
+        expect(log).to be_blank
+      end
+    end
+
+    context "staff_edit_locks_post" do
+
+      context "disabled" do
+        let(:moderator) { Fabricate(:moderator) }
+
+        before do
+          SiteSetting.staff_edit_locks_post = false
+        end
+
+        it "does not lock the post when revised" do
+          result = subject.revise!(
+            moderator,
+            raw: "lets totally update the body"
+          )
+          expect(result).to eq(true)
+          post.reload
+          expect(post).not_to be_locked
+
+        end
+      end
+
+      context "enabled" do
+        let(:moderator) { Fabricate(:moderator) }
+
+        before do
+          SiteSetting.staff_edit_locks_post = true
+        end
+
+        it "locks the post when revised by staff" do
+          result = subject.revise!(
+            moderator,
+            raw: "lets totally update the body"
+          )
+          expect(result).to eq(true)
+          post.reload
+          expect(post).to be_locked
+        end
+
+        it "doesn't wiki posts" do
+          post.wiki = true
+          result = subject.revise!(
+            moderator,
+            raw: "some new raw content"
+          )
+          expect(result).to eq(true)
+          post.reload
+          expect(post).not_to be_locked
+        end
+        it "doesn't lock the post when the raw did not change" do
+          result = subject.revise!(
+            moderator,
+            title: "New topic title, cool!"
+          )
+          expect(result).to eq(true)
+          post.reload
+          expect(post.topic.title).to eq("New topic title, cool!")
+          expect(post).not_to be_locked
+        end
+
+        it "doesn't lock the post when revised by a regular user" do
+          result = subject.revise!(
+            Fabricate(:user),
+            raw: "lets totally update the body"
+          )
+          expect(result).to eq(true)
+          post.reload
+          expect(post).not_to be_locked
+        end
+
+        it "doesn't lock a staff member's post" do
+          staff_post = Fabricate(:post, user: moderator)
+          revisor = PostRevisor.new(staff_post)
+
+          result = revisor.revise!(
+            moderator,
+            raw: "lets totally update the body"
+          )
+          expect(result).to eq(true)
+          staff_post.reload
+          expect(staff_post).not_to be_locked
+        end
+      end
+    end
+
+    context "alerts" do
+
+      let(:mentioned_user) { Fabricate(:user) }
+
+      before do
+        SiteSetting.queue_jobs = false
+      end
+
+      it "generates a notification for a mention" do
+        expect {
+          subject.revise!(Fabricate(:user), raw: "Random user is mentioning @#{mentioned_user.username_lower}")
+        }.to change { Notification.where(notification_type: Notification.types[:mentioned]).count }
+      end
+
+      it "never generates a notification for a mention when the System user revise a post" do
+        expect {
+          subject.revise!(Discourse.system_user, raw: "System user is mentioning @#{mentioned_user.username_lower}")
+        }.not_to change { Notification.where(notification_type: Notification.types[:mentioned]).count }
+      end
+
+    end
+
     context "tagging" do
       context "tagging disabled" do
         before do
@@ -478,14 +649,14 @@ describe PostRevisor do
           end
 
           it "can't add staff-only tags" do
-            SiteSetting.staff_tags = "important"
+            create_staff_tags(['important'])
             result = subject.revise!(Fabricate(:user), raw: "lets totally update the body", tags: ['important', 'stuff'])
             expect(result).to eq(false)
             expect(post.topic.errors.present?).to eq(true)
           end
 
           it "staff can add staff-only tags" do
-            SiteSetting.staff_tags = "important"
+            create_staff_tags(['important'])
             result = subject.revise!(Fabricate(:admin), raw: "lets totally update the body", tags: ['important', 'stuff'])
             expect(result).to eq(true)
             post.reload
@@ -494,9 +665,9 @@ describe PostRevisor do
 
           context "with staff-only tags" do
             before do
-              SiteSetting.staff_tags = "important"
+              create_staff_tags(['important'])
               topic = post.topic
-              topic.tags = [Fabricate(:tag, name: "super"), Fabricate(:tag, name: "important"), Fabricate(:tag, name: "stuff")]
+              topic.tags = [Fabricate(:tag, name: "super"), Tag.where(name: "important").first, Fabricate(:tag, name: "stuff")]
             end
 
             it "staff-only tags can't be removed" do
diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb
index d02683bee8c..62a02b74fc4 100644
--- a/spec/components/pretty_text_spec.rb
+++ b/spec/components/pretty_text_spec.rb
@@ -1,6 +1,5 @@
 require 'rails_helper'
 require 'pretty_text'
-require 'html_normalize'
 
 describe PrettyText do
 
@@ -9,11 +8,11 @@ describe PrettyText do
   end
 
   def n(html)
-    HtmlNormalize.normalize(html)
+    html.strip
   end
 
   def cook(*args)
-    n(PrettyText.cook(*args))
+    PrettyText.cook(*args)
   end
 
   let(:wrapped_image) { "<div class=\"lightbox-wrapper\"><a href=\"//localhost:3000/uploads/default/4399/33691397e78b4d75.png\" class=\"lightbox\" title=\"Screen Shot 2014-04-14 at 9.47.10 PM.png\"><img src=\"//localhost:3000/uploads/default/_optimized/bd9/b20/bbbcd6a0c0_655x500.png\" width=\"655\" height=\"500\"><div class=\"meta\">\n<span class=\"filename\">Screen Shot 2014-04-14 at 9.47.10 PM.png</span><span class=\"informations\">966x737 1.47 MB</span><span class=\"expand\"></span>\n</div></a></div>" }
@@ -33,13 +32,13 @@ describe PrettyText do
 
         topic = Fabricate(:topic, title: "this is a test topic :slight_smile:")
         expected = <<~HTML
-          <aside class="quote" data-topic="#{topic.id}" data-post="2">
+          <aside class="quote no-group" data-post="2" data-topic="#{topic.id}">
           <div class="title">
-            <div class="quote-controls"></div>
-            <a href="http://test.localhost/t/this-is-a-test-topic-slight-smile/#{topic.id}/2">This is a test topic <img src="/images/emoji/twitter/slight_smile.png?v=5" title="slight_smile" alt="slight_smile" class="emoji"></a>
+          <div class="quote-controls"></div>
+          <a href="http://test.localhost/t/this-is-a-test-topic/#{topic.id}/2">This is a test topic <img src="/images/emoji/twitter/slight_smile.png?v=5" title="slight_smile" alt="slight_smile" class="emoji"></a>
           </div>
           <blockquote>
-            <p>ddd</p>
+          <p>ddd</p>
           </blockquote>
           </aside>
         HTML
@@ -56,7 +55,7 @@ describe PrettyText do
           [/quote]
         MD
         html = <<~HTML
-          <aside class="quote" data-post="123" data-topic="456" data-full="true">
+          <aside class="quote no-group" data-post="123" data-topic="456" data-full="true">
           <div class="title">
           <div class="quote-controls"></div>
           <img alt width="20" height="20" src="//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png" class="avatar"> #{user.username}:</div>
@@ -78,7 +77,7 @@ describe PrettyText do
           [/quote]
         MD
         html = <<~HTML
-          <aside class="quote" data-post="123" data-topic="456" data-full="true">
+          <aside class="quote no-group" data-post="123" data-topic="456" data-full="true">
           <div class="title">
           <div class="quote-controls"></div>
           <img alt width="20" height="20" src="//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png" class="avatar"> #{user.username}:</div>
@@ -99,7 +98,7 @@ describe PrettyText do
         MD
 
         html = <<~HTML
-          <aside class="quote" data-post="555" data-topic="666">
+          <aside class="quote no-group" data-post="555" data-topic="666">
           <div class="title">
           <div class="quote-controls"></div>
           <img alt width="20" height="20" src="//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png" class="avatar"> #{user.username}:</div>
@@ -126,13 +125,13 @@ describe PrettyText do
 
         topic = Fabricate(:topic, title: "this is a test topic")
         expected = <<~HTML
-          <aside class="quote group-#{group.name}" data-topic="#{topic.id}" data-post="2">
+          <aside class="quote group-#{group.name}" data-post="2" data-topic="#{topic.id}">
           <div class="title">
-            <div class="quote-controls"></div>
-            <img alt class='avatar' height='20' src='//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png' width='20'><a href='http://test.localhost/t/this-is-a-test-topic/#{topic.id}/2'>This is a test topic</a>
+          <div class="quote-controls"></div>
+          <img alt width="20" height="20" src="//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png" class="avatar"><a href="http://test.localhost/t/this-is-a-test-topic/#{topic.id}/2">This is a test topic</a>
           </div>
           <blockquote>
-            <p>ddd</p>
+          <p>ddd</p>
           </blockquote>
           </aside>
         HTML
@@ -145,7 +144,7 @@ describe PrettyText do
       cooked = PrettyText.cook("[quote]te **s** t[/quote]")
 
       html = <<~HTML
-        <aside class="quote">
+        <aside class="quote no-group">
         <blockquote>
         <p>te <strong>s</strong> t</p>
         </blockquote>
@@ -390,7 +389,7 @@ describe PrettyText do
       end
 
       it "should keep details if too long" do
-        expect(PrettyText.excerpt("<details><summary>expand</summary><p>hello</p></details>", 30)).to match_html "<details class='disabled'><summary>expand</summary></details>"
+        expect(PrettyText.excerpt("<details><summary>expand</summary><p>hello</p></details>", 6)).to match_html "<details class='disabled'><summary>expand</summary></details>"
       end
 
       it "doesn't disable details if short enough" do
@@ -726,6 +725,29 @@ describe PrettyText do
 
       test_s3_cdn
     end
+
+    def test_s3_with_subfolder_cdn
+      raw = <<~RAW
+        <img src='https:#{Discourse.store.absolute_base_url}/subfolder/original/9/9/99c9384b8b6d87f8509f8395571bc7512ca3cad1.jpg'>
+      RAW
+
+      html = <<~HTML
+        <p><img src="https://awesome.cdn/subfolder/original/9/9/99c9384b8b6d87f8509f8395571bc7512ca3cad1.jpg"></p>
+      HTML
+
+      expect(PrettyText.cook(raw)).to eq(html.strip)
+    end
+
+    it 'can substitute s3 with subfolder cdn when added via global setting' do
+
+      global_setting :s3_access_key_id, 'XXX'
+      global_setting :s3_secret_access_key, 'XXX'
+      global_setting :s3_bucket, 'XXX/subfolder'
+      global_setting :s3_region, 'XXX'
+      global_setting :s3_cdn_url, 'https://awesome.cdn/subfolder'
+
+      test_s3_with_subfolder_cdn
+    end
   end
 
   describe "emoji" do
@@ -746,6 +768,20 @@ describe PrettyText do
       expect(PrettyText.cook("💣")).not_to match(/\:bomb\:/)
     end
 
+    it "doesn't replace emoji if emoji is disabled" do
+      SiteSetting.enable_emoji = false
+      expect(PrettyText.cook(":bomb:")).to eq("<p>:bomb:</p>")
+    end
+
+    it "doesn't replace shortcuts if disabled" do
+      SiteSetting.enable_emoji_shortcuts = false
+      expect(PrettyText.cook(":)")).to eq("<p>:)</p>")
+    end
+
+    it "does replace shortcuts if enabled" do
+      expect(PrettyText.cook(":)")).to match("smile")
+    end
+
     it "replaces skin toned emoji" do
       expect(PrettyText.cook("hello 👱🏿‍♀️")).to eq("<p>hello <img src=\"/images/emoji/twitter/blonde_woman/6.png?v=5\" title=\":blonde_woman:t6:\" class=\"emoji\" alt=\":blonde_woman:t6:\"></p>")
       expect(PrettyText.cook("hello 👩‍🎤")).to eq("<p>hello <img src=\"/images/emoji/twitter/woman_singer.png?v=5\" title=\":woman_singer:\" class=\"emoji\" alt=\":woman_singer:\"></p>")
@@ -763,15 +799,6 @@ describe PrettyText do
     end
   end
 
-  describe "censored_pattern site setting" do
-    it "can be cleared if it causes cooking to timeout" do
-      SiteSetting.censored_pattern = "evilregex"
-      described_class.stubs(:markdown).raises(MiniRacer::ScriptTerminatedError)
-      PrettyText.cook("Protect against it plz.") rescue nil
-      expect(SiteSetting.censored_pattern).to be_blank
-    end
-  end
-
   it "replaces skin toned emoji" do
     expect(PrettyText.cook("hello 👱🏿‍♀️")).to eq("<p>hello <img src=\"/images/emoji/twitter/blonde_woman/6.png?v=5\" title=\":blonde_woman:t6:\" class=\"emoji\" alt=\":blonde_woman:t6:\"></p>")
     expect(PrettyText.cook("hello 👩‍🎤")).to eq("<p>hello <img src=\"/images/emoji/twitter/woman_singer.png?v=5\" title=\":woman_singer:\" class=\"emoji\" alt=\":woman_singer:\"></p>")
@@ -797,6 +824,17 @@ describe PrettyText do
     expect(cooked).to eq(n expected)
   end
 
+  it 'allows only tel URL scheme to start with a plus character' do
+    SiteSetting.allowed_href_schemes = "tel|steam"
+    cooked = cook("[Tel URL Scheme](tel://+452530579785)")
+    expected = '<p><a href="tel://+452530579785" rel="nofollow noopener">Tel URL Scheme</a></p>'
+    expect(cooked).to eq(n expected)
+
+    cooked2 = cook("[Steam URL Scheme](steam://+store/452530)")
+    expected2 = '<p><a>Steam URL Scheme</a></p>'
+    expect(cooked2).to eq(n expected2)
+  end
+
   it "produces hashtag links" do
     category = Fabricate(:category, name: 'testing')
     category2 = Fabricate(:category, name: 'known')
@@ -928,10 +966,8 @@ HTML
     SiteSetting.enable_inline_onebox_on_all_domains = true
     InlineOneboxer.purge("http://cnn.com/a")
 
-    stub_request(:head, "http://cnn.com/a").to_return(status: 200)
-
     stub_request(:get, "http://cnn.com/a").
-      to_return(status: 200, body: "<html><head><title>news</title></head></html>", headers: {})
+      to_return(status: 200, body: "<html><head><title>news</title></head></html>")
 
     expect(PrettyText.cook("- http://cnn.com/a\n- a http://cnn.com/a").split("news").length).to eq(3)
     expect(PrettyText.cook("- http://cnn.com/a\n    - a http://cnn.com/a").split("news").length).to eq(3)
@@ -941,10 +977,8 @@ HTML
     SiteSetting.enable_inline_onebox_on_all_domains = true
     InlineOneboxer.purge("http://cnn.com?a")
 
-    stub_request(:head, "http://cnn.com?a").to_return(status: 200)
-
     stub_request(:get, "http://cnn.com?a").
-      to_return(status: 200, body: "<html><head><title>news</title></head></html>", headers: {})
+      to_return(status: 200, body: "<html><head><title>news</title></head></html>")
 
     expect(PrettyText.cook("- http://cnn.com?a\n- a http://cnn.com?a").split("news").length).to eq(3)
     expect(PrettyText.cook("- http://cnn.com?a\n    - a http://cnn.com?a").split("news").length).to eq(3)
@@ -957,9 +991,8 @@ HTML
     SiteSetting.enable_inline_onebox_on_all_domains = true
     InlineOneboxer.purge("http://cnn.com/")
 
-    stub_request(:head, "http://cnn.com/").to_return(status: 200)
     stub_request(:get, "http://cnn.com/").
-      to_return(status: 200, body: "<html><head><title>news</title></head></html>", headers: {})
+      to_return(status: 200, body: "<html><head><title>news</title></head></html>")
 
     expect(PrettyText.cook("- http://cnn.com/\n- a http://cnn.com/").split("news").length).to eq(1)
     expect(PrettyText.cook("- cnn.com\n    - a http://cnn.com/").split("news").length).to eq(1)
@@ -970,6 +1003,14 @@ HTML
     expect(PrettyText.cook("a[i]b[/i]c")).to eq('<p>a<span class="bbcode-i">b</span>c</p>')
   end
 
+  it "can handle bbcode after a newline" do
+    # this is not 100% ideal cause we get an extra p here, but this is pretty rare
+    expect(PrettyText.cook("a\n[code]code[/code]")).to eq("<p>a</p>\n<pre><code class=\"lang-auto\">code</code></pre>")
+
+    # this is fine
+    expect(PrettyText.cook("a\na[code]code[/code]")).to eq("<p>a<br>\na<code>code</code></p>")
+  end
+
   it "can onebox local topics" do
     op = Fabricate(:post)
     reply = Fabricate(:post, topic_id: op.topic_id)
@@ -1212,4 +1253,49 @@ HTML
 
   end
 
+  it "You can disable linkify" do
+    md = "www.cnn.com test.it http://test.com https://test.ab https://a"
+    cooked = PrettyText.cook(md)
+
+    html = <<~HTML
+      <p><a href="http://www.cnn.com" rel="nofollow noopener">www.cnn.com</a> test.it <a href="http://test.com" rel="nofollow noopener">http://test.com</a> <a href="https://test.ab" rel="nofollow noopener">https://test.ab</a> <a href="https://a" rel="nofollow noopener">https://a</a></p>
+    HTML
+
+    expect(cooked).to eq(html.strip)
+
+    # notice how cnn.com is no longer linked but it is
+    SiteSetting.markdown_linkify_tlds = "not_com|it"
+
+    cooked = PrettyText.cook(md)
+    html = <<~HTML
+    <p>www.cnn.com <a href="http://test.it" rel="nofollow noopener">test.it</a> <a href="http://test.com" rel="nofollow noopener">http://test.com</a> <a href="https://test.ab" rel="nofollow noopener">https://test.ab</a> <a href="https://a" rel="nofollow noopener">https://a</a></p>
+    HTML
+
+    expect(cooked).to eq(html.strip)
+
+    # no tlds anymore
+    SiteSetting.markdown_linkify_tlds = ""
+
+    cooked = PrettyText.cook(md)
+    html = <<~HTML
+      <p>www.cnn.com test.it <a href="http://test.com" rel="nofollow noopener">http://test.com</a> <a href="https://test.ab" rel="nofollow noopener">https://test.ab</a> <a href="https://a" rel="nofollow noopener">https://a</a></p>
+    HTML
+
+    expect(cooked).to eq(html.strip)
+
+    # lastly ... what about no linkify
+    SiteSetting.enable_markdown_linkify = false
+
+    cooked = PrettyText.cook(md)
+
+    html = <<~HTML
+      <p>www.cnn.com test.it http://test.com https://test.ab https://a</p>
+    HTML
+  end
+
+  it "has a proper data whitlist on div" do
+    cooked = PrettyText.cook("<div data-theme-a='a'>test</div>")
+    expect(cooked).to include("data-theme-a")
+  end
+
 end
diff --git a/spec/components/quote_comparer_spec.rb b/spec/components/quote_comparer_spec.rb
new file mode 100644
index 00000000000..e0be873dd38
--- /dev/null
+++ b/spec/components/quote_comparer_spec.rb
@@ -0,0 +1,41 @@
+require 'rails_helper'
+require 'quote_comparer'
+
+describe QuoteComparer do
+
+  describe "#modified?" do
+    let(:post) { Fabricate(:post, raw: "This has **text** we _are_ matching") }
+
+    def qc(text)
+      QuoteComparer.new(post.topic_id, post.post_number, text)
+    end
+
+    it "returns true for no post" do
+      expect(QuoteComparer.new(nil, nil, "test")).to be_modified
+    end
+
+    it "returns true for nil text" do
+      expect(qc(nil)).to be_modified
+    end
+
+    it "returns true for empty text" do
+      expect(qc("")).to be_modified
+    end
+
+    it "returns true for modified text" do
+      expect(qc("text is modified")).to be_modified
+    end
+
+    it "return false when the text matches exactly" do
+      expect(qc("This has text we are matching")).not_to be_modified
+    end
+
+    it "return false when there's a substring" do
+      expect(qc("text we are")).not_to be_modified
+    end
+
+    it "return false when there's extra space" do
+      expect(qc("\n\ntext   we are \t")).not_to be_modified
+    end
+  end
+end
diff --git a/spec/components/rate_limiter_spec.rb b/spec/components/rate_limiter_spec.rb
index ce9bed2a114..b7b4e652987 100644
--- a/spec/components/rate_limiter_spec.rb
+++ b/spec/components/rate_limiter_spec.rb
@@ -93,6 +93,17 @@ describe RateLimiter do
       end
     end
 
+    context 'max is less than or equal to zero' do
+
+      it 'should raise the right error' do
+        [-1, 0, nil].each do |max|
+          expect do
+            RateLimiter.new(user, "a", max, 60).performed!
+          end.to raise_error(RateLimiter::LimitExceeded)
+        end
+      end
+    end
+
     context "multiple calls" do
       before do
         rate_limiter.performed!
diff --git a/spec/components/retrieve_title_spec.rb b/spec/components/retrieve_title_spec.rb
index 09edb28eae3..3a7af745fc1 100644
--- a/spec/components/retrieve_title_spec.rb
+++ b/spec/components/retrieve_title_spec.rb
@@ -54,7 +54,18 @@ describe RetrieveTitle do
       )
       expect(title).to eq("Video Title")
     end
+  end
 
+  context "crawl" do
+    it "can properly extract a title from a url" do
+      stub_request(:get, "https://brelksdjflaskfj.com/amazing")
+        .to_return(status: 200, body: "<html><title>very amazing</title>")
+
+      # we still resolve the IP address for every host
+      IPSocket.stubs(:getaddress).returns('100.2.3.4')
+
+      expect(RetrieveTitle.crawl("https://brelksdjflaskfj.com/amazing")).to eq("very amazing")
+    end
   end
 
 end
diff --git a/spec/components/scheduler/manager_spec.rb b/spec/components/scheduler/manager_spec.rb
index 6ae829c558d..4e96014726b 100644
--- a/spec/components/scheduler/manager_spec.rb
+++ b/spec/components/scheduler/manager_spec.rb
@@ -116,6 +116,9 @@ describe Scheduler::Manager do
 
   describe 'per host jobs' do
     it "correctly schedules on multiple hosts" do
+
+      freeze_time
+
       Testing::PerHostJob.runs = 0
 
       hosts = ['a', 'b', 'c']
@@ -126,7 +129,7 @@ describe Scheduler::Manager do
         manager.ensure_schedule!(Testing::PerHostJob)
 
         info = manager.schedule_info(Testing::PerHostJob)
-        info.next_run = Time.now.to_i - 1
+        info.next_run = Time.now.to_i - 10
         info.write!
 
         manager
@@ -137,6 +140,7 @@ describe Scheduler::Manager do
         manager.stop!
 
       end
+
       expect(Testing::PerHostJob.runs).to eq(3)
     end
   end
diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb
index 16cdae30a24..e293a87fd2e 100644
--- a/spec/components/search_spec.rb
+++ b/spec/components/search_spec.rb
@@ -251,7 +251,6 @@ describe Search do
       end
 
       it 'displays multiple results within a topic' do
-
         topic = Fabricate(:topic)
         topic2 = Fabricate(:topic)
 
@@ -260,8 +259,7 @@ describe Search do
 
         post1 = new_post('this is the other post I am posting', topic)
         post2 = new_post('this is my first post I am posting', topic)
-        post3 = new_post('this is a real long and complicated bla this is my second post I am Posting birds
-                         with more stuff bla bla', topic)
+        post3 = new_post('this is a real long and complicated bla this is my second post I am Posting birds with more stuff bla bla', topic)
         post4 = new_post('this is my fourth post I am posting', topic)
 
         # update posts_count
@@ -281,6 +279,13 @@ describe Search do
         results = Search.execute('"fourth post I am posting"', search_context: post1.topic)
         expect(results.posts.length).to eq(1)
       end
+
+      it "works for unlisted topics" do
+        topic.update_attributes(visible: false)
+        _post = new_post('discourse is awesome', topic)
+        results = Search.execute('discourse', search_context: topic)
+        expect(results.posts.length).to eq(1)
+      end
     end
 
     context 'searching the OP' do
@@ -307,6 +312,16 @@ describe Search do
       end
     end
 
+    context 'searching for quoted title' do
+      it "can find quoted title" do
+        create_post(raw: "this is the raw body", title: "I am a title yeah")
+        result = Search.execute('"a title yeah"')
+
+        expect(result.posts.length).to eq(1)
+      end
+
+    end
+
     context "search for a topic by id" do
       let(:result) { Search.execute(topic.id, type_filter: 'topic', search_for_id: true, min_search_term_length: 1) }
 
@@ -395,6 +410,27 @@ describe Search do
     let(:tag_group) { Fabricate(:tag_group) }
     let(:category) { Fabricate(:category) }
 
+    context 'post searching' do
+      it 'can find posts with tags' do
+        SiteSetting.tagging_enabled = true
+
+        post = Fabricate(:post, raw: 'I am special post')
+        DiscourseTagging.tag_topic_by_names(post.topic, Guardian.new(Fabricate.build(:admin)), [tag.name])
+        post.topic.save
+
+        # we got to make this index (it is deferred)
+        Jobs::ReindexSearch.new.rebuild_problem_posts
+
+        result = Search.execute(tag.name)
+        expect(result.posts.length).to eq(1)
+
+        SiteSetting.tagging_enabled = false
+
+        result = Search.execute(tag.name)
+        expect(result.posts.length).to eq(0)
+      end
+    end
+
     context 'tagging is disabled' do
       before { SiteSetting.tagging_enabled = false }
 
@@ -411,11 +447,10 @@ describe Search do
       end
 
       it 'shows staff tags' do
-        staff_tag = Fabricate(:tag, name: "#{tag.name}9")
-        SiteSetting.staff_tags = "#{staff_tag.name}"
+        create_staff_tags(["#{tag.name}9"])
 
-        expect(Search.execute(tag.name, guardian: Guardian.new(Fabricate(:admin))).tags).to contain_exactly(tag, staff_tag)
-        expect(search.tags).to contain_exactly(tag, staff_tag)
+        expect(Search.execute(tag.name, guardian: Guardian.new(Fabricate(:admin))).tags.map(&:name)).to contain_exactly(tag.name, "#{tag.name}9")
+        expect(search.tags.map(&:name)).to contain_exactly(tag.name, "#{tag.name}9")
       end
 
       it 'includes category-restricted tags' do
@@ -802,6 +837,9 @@ describe Search do
 
       results = Search.new('#777').execute
       expect(results.posts.length).to eq(0)
+
+      results = Search.new('xxx #:').execute
+      expect(results.posts.length).to eq(0)
     end
 
     context 'tags' do
@@ -856,7 +894,7 @@ describe Search do
     str = " grigio:babel deprecated? "
     str << "page page on Atmosphere](https://atmospherejs.com/grigio/babel)xxx: aaa.js:222 aaa'\"bbb"
 
-    ts_query = Search.ts_query(str, "simple")
+    ts_query = Search.ts_query(term: str, ts_config: "simple")
     Post.exec_sql("SELECT to_tsvector('bbb') @@ " << ts_query)
   end
 
@@ -915,6 +953,25 @@ describe Search do
       results = s.execute
       expect(results.search_log_id).to be_present
     end
+
+    it "does not log search if search_type is not present" do
+      s = Search.new('foo bar', ip_address: '127.0.0.1')
+      results = s.execute
+      expect(results.search_log_id).not_to be_present
+    end
+  end
+
+  context 'in:title' do
+    it 'allows for search in title' do
+      topic = Fabricate(:topic, title: 'I am testing a title search')
+      _post = Fabricate(:post, topic_id: topic.id, raw: 'this is the first post')
+
+      results = Search.execute('title in:title')
+      expect(results.posts.length).to eq(1)
+
+      results = Search.execute('first in:title')
+      expect(results.posts.length).to eq(0)
+    end
   end
 
   context 'pagination' do
diff --git a/spec/components/site_setting_extension_spec.rb b/spec/components/site_setting_extension_spec.rb
index 8adf3c15567..4171b9db4cb 100644
--- a/spec/components/site_setting_extension_spec.rb
+++ b/spec/components/site_setting_extension_spec.rb
@@ -4,6 +4,24 @@ require_dependency 'site_settings/local_process_provider'
 
 describe SiteSettingExtension do
 
+  # We disable message bus here to avoid a large amount
+  # of uneeded messaging, tests are careful to call refresh
+  # when they need to.
+  #
+  # DistributedCache used by locale handler can under certain
+  # cases take a tiny bit to stabalize.
+  #
+  # TODO: refactor SiteSettingExtension not to rely on statics in
+  # DefaultsProvider
+  #
+  before do
+    MessageBus.off
+  end
+
+  after do
+    MessageBus.on
+  end
+
   describe '#types' do
     context "verify enum sequence" do
       before do
@@ -25,8 +43,11 @@ describe SiteSettingExtension do
   end
 
   def new_settings(provider)
+    # we want to avoid leaking a big pile of MessageBus subscriptions here (1 per class)
+    # so we set listen_for_changes to false
     Class.new do
       extend SiteSettingExtension
+      self.listen_for_changes = false
       self.provider = provider
     end
   end
@@ -39,6 +60,30 @@ describe SiteSettingExtension do
     new_settings(provider_local)
   end
 
+  it "Does not leak state cause changes are not linked" do
+    t1 = Thread.new do
+      5.times do
+        settings = new_settings(SiteSettings::LocalProcessProvider.new)
+        settings.setting(:title, 'test')
+        settings.title = 'title1'
+        expect(settings.title).to eq 'title1'
+
+      end
+    end
+
+    t2 = Thread.new do
+      5.times do
+        settings = new_settings(SiteSettings::LocalProcessProvider.new)
+        settings.setting(:title, 'test')
+        settings.title = 'title2'
+        expect(settings.title).to eq 'title2'
+      end
+    end
+
+    t1.join
+    t2.join
+  end
+
   describe "refresh!" do
 
     it "will reset to default if provider vanishes" do
@@ -393,11 +438,30 @@ describe SiteSettingExtension do
   end
 
   describe ".set_and_log" do
+    before do
+      settings.setting(:s3_secret_access_key, "old_secret_key")
+      settings.setting(:title, "Discourse v1")
+      settings.refresh!
+    end
+
     it "raises an error when set for an invalid setting name" do
       expect {
         settings.set_and_log("provider", "haxxed")
       }.to raise_error(ArgumentError)
     end
+
+    it "scrubs secret setting values from logs" do
+      settings.set_and_log("s3_secret_access_key", "new_secret_key")
+      expect(UserHistory.last.previous_value).to eq("[FILTERED]")
+      expect(UserHistory.last.new_value).to eq("[FILTERED]")
+    end
+
+    it "works" do
+      settings.set_and_log("title", "Discourse v2")
+      expect(settings.title).to eq("Discourse v2")
+      expect(UserHistory.last.previous_value).to eq("Discourse v1")
+      expect(UserHistory.last.new_value).to eq("Discourse v2")
+    end
   end
 
   describe "filter domain name" do
@@ -586,4 +650,15 @@ describe SiteSettingExtension do
     end
   end
 
+  describe "get_hostname" do
+
+    it "properly extracts the hostname" do
+      expect(settings.send(:get_hostname, "discourse.org")).to eq("discourse.org")
+      expect(settings.send(:get_hostname, " discourse.org ")).to eq("discourse.org")
+      expect(settings.send(:get_hostname, "@discourse.org")).to eq("discourse.org")
+      expect(settings.send(:get_hostname, "https://discourse.org")).to eq("discourse.org")
+    end
+
+  end
+
 end
diff --git a/spec/components/site_settings/defaults_provider_spec.rb b/spec/components/site_settings/defaults_provider_spec.rb
index 7587748a340..e19b369f2bd 100644
--- a/spec/components/site_settings/defaults_provider_spec.rb
+++ b/spec/components/site_settings/defaults_provider_spec.rb
@@ -6,9 +6,18 @@ describe SiteSettings::DefaultsProvider do
     SiteSettings::LocalProcessProvider.new
   end
 
+  before do
+    MessageBus.off
+  end
+
+  after do
+    MessageBus.on
+  end
+
   def new_settings(provider)
     Class.new do
       extend SiteSettingExtension
+      self.listen_for_changes = false
       self.provider = provider
     end
   end
diff --git a/spec/components/slug_spec.rb b/spec/components/slug_spec.rb
index ad436f6b524..991ff235e14 100644
--- a/spec/components/slug_spec.rb
+++ b/spec/components/slug_spec.rb
@@ -24,6 +24,10 @@ describe Slug do
       expect(Slug.for("o_o_o")).to eq("o-o-o")
     end
 
+    it 'strips emoji string' do
+      expect(Slug.for(":smile: To Infinity and beyond! 🚀 :woman:t5:")).to eq("to-infinity-and-beyond")
+    end
+
     context 'ascii generator' do
       before { SiteSetting.slug_generation_method = 'ascii' }
 
diff --git a/spec/components/stylesheet/manager_spec.rb b/spec/components/stylesheet/manager_spec.rb
index 07571887fa3..9e5b6ff3475 100644
--- a/spec/components/stylesheet/manager_spec.rb
+++ b/spec/components/stylesheet/manager_spec.rb
@@ -65,6 +65,30 @@ describe Stylesheet::Manager do
     expect(new_link).to include("/stylesheets/desktop_theme_#{theme.id}_")
   end
 
+  describe 'digest' do
+    after do
+      DiscoursePluginRegistry.stylesheets.delete "fake_file"
+    end
+
+    it 'can correctly account for plugins in digest' do
+
+      theme = Theme.create!(
+        name: 'parent',
+        user_id: -1
+      )
+
+      manager = Stylesheet::Manager.new(:desktop_theme, theme.key)
+      digest1 = manager.digest
+
+      DiscoursePluginRegistry.stylesheets.add "fake_file"
+
+      manager = Stylesheet::Manager.new(:desktop_theme, theme.key)
+      digest2 = manager.digest
+
+      expect(digest1).not_to eq(digest2)
+    end
+  end
+
   describe 'color_scheme_digest' do
     it "changes with category background image" do
       theme = Theme.new(
diff --git a/spec/components/table_migration_helper_spec.rb b/spec/components/table_migration_helper_spec.rb
deleted file mode 100644
index 9f690140697..00000000000
--- a/spec/components/table_migration_helper_spec.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-require 'rails_helper'
-require 'table_migration_helper'
-
-describe TableMigrationHelper do
-
-  def table_exists?(table_name)
-    sql = <<-SQL
-    SELECT 1
-    FROM INFORMATION_SCHEMA.TABLES
-    WHERE table_schema = 'public' AND
-          table_name = '#{table_name}'
-    SQL
-
-    ActiveRecord::Base.exec_sql(sql).to_a.length > 0
-  end
-
-  describe '#delayed_drop' do
-    it "can drop a table after correct delay and when new table exists" do
-      ActiveRecord::Base.exec_sql "CREATE TABLE table_with_old_name (topic_id INTEGER)"
-
-      name = ActiveRecord::Base
-        .exec_sql("SELECT name FROM schema_migration_details LIMIT 1")
-        .getvalue(0, 0)
-
-      Topic.exec_sql("UPDATE schema_migration_details SET created_at = :created_at WHERE name = :name",
-                    name: name, created_at: 15.minutes.ago)
-
-      dropped_proc_called = false
-
-      described_class.delayed_drop(
-        old_name: 'table_with_old_name',
-        new_name: 'table_with_new_name',
-        after_migration: name,
-        delay: 20.minutes,
-        on_drop: ->() { dropped_proc_called = true }
-      )
-
-      expect(table_exists?('table_with_old_name')).to eq(true)
-      expect(dropped_proc_called).to eq(false)
-
-      described_class.delayed_drop(
-        old_name: 'table_with_old_name',
-        new_name: 'table_with_new_name',
-        after_migration: name,
-        delay: 10.minutes,
-        on_drop: ->() { dropped_proc_called = true }
-      )
-
-      expect(table_exists?('table_with_old_name')).to eq(true)
-      expect(dropped_proc_called).to eq(false)
-
-      ActiveRecord::Base.exec_sql "CREATE TABLE table_with_new_name (topic_id INTEGER)"
-
-      described_class.delayed_drop(
-        old_name: 'table_with_old_name',
-        new_name: 'table_with_new_name',
-        after_migration: name,
-        delay: 10.minutes,
-        on_drop: ->() { dropped_proc_called = true }
-      )
-
-      expect(table_exists?('table_with_old_name')).to eq(false)
-      expect(dropped_proc_called).to eq(true)
-    end
-  end
-end
diff --git a/spec/components/text_cleaner_spec.rb b/spec/components/text_cleaner_spec.rb
index 8a25c29de82..e4a4dd2a9fc 100644
--- a/spec/components/text_cleaner_spec.rb
+++ b/spec/components/text_cleaner_spec.rb
@@ -159,6 +159,11 @@ describe TextCleaner do
       expect(TextCleaner.clean_title(" \t Hello there \n ")).to eq("Hello there")
     end
 
+    it "strips zero width spaces" do
+      expect(TextCleaner.clean_title("Hello​ ​there")).to eq("Hello there")
+      expect(TextCleaner.clean_title("Hello​ ​there").length).to eq(11)
+    end
+
     context "title_prettify site setting is enabled" do
 
       before { SiteSetting.title_prettify = true }
diff --git a/spec/components/text_sentinel_spec.rb b/spec/components/text_sentinel_spec.rb
index 5707fa9895d..e704f6d02ca 100644
--- a/spec/components/text_sentinel_spec.rb
+++ b/spec/components/text_sentinel_spec.rb
@@ -143,7 +143,7 @@ describe TextSentinel do
 
     it "uses a sensible min entropy value when min pm body length is less than min entropy" do
       SiteSetting.min_post_length = 5
-      SiteSetting.min_private_message_post_length = 3
+      SiteSetting.min_personal_message_post_length = 3
       SiteSetting.body_min_entropy = 7
       expect(TextSentinel.body_sentinel('Lol', private_message: true)).to be_valid
     end
diff --git a/spec/components/theme_settings_manager_spec.rb b/spec/components/theme_settings_manager_spec.rb
new file mode 100644
index 00000000000..f5b90619205
--- /dev/null
+++ b/spec/components/theme_settings_manager_spec.rb
@@ -0,0 +1,117 @@
+require 'rails_helper'
+require 'theme_settings_manager'
+
+describe ThemeSettingsManager do
+
+  let(:theme_settings) do
+    theme = Theme.create!(name: "awesome theme", user_id: -1)
+    yaml = File.read("#{Rails.root}/spec/fixtures/theme_settings/valid_settings.yaml")
+    theme.set_field(target: :settings, name: "yaml", value: yaml)
+    theme.save!
+    theme.settings
+  end
+
+  def find_by_name(name)
+    theme_settings.find { |setting| setting.name == name }
+  end
+
+  context "Enum" do
+    it "only accepts values from its choices" do
+      enum_setting = find_by_name(:enum_setting)
+      expect { enum_setting.value = "trust level 2" }.to raise_error(Discourse::InvalidParameters)
+      expect { enum_setting.value = "trust level 0" }.not_to raise_error
+
+      enum_setting = find_by_name(:enum_setting_02)
+      expect { enum_setting.value = "10" }.not_to raise_error
+
+      enum_setting = find_by_name(:enum_setting_03)
+      expect { enum_setting.value = "10" }.not_to raise_error
+      expect { enum_setting.value = 1 }.not_to raise_error
+      expect { enum_setting.value = 15 }.to raise_error(Discourse::InvalidParameters)
+    end
+  end
+
+  context "Bool" do
+    it "is either true or false" do
+      bool_setting = find_by_name(:boolean_setting)
+      expect(bool_setting.value).to eq(true) # default
+
+      bool_setting.value = "true"
+      expect(bool_setting.value).to eq(true)
+
+      bool_setting.value = "falsse" # intentionally misspelled
+      expect(bool_setting.value).to eq(false)
+
+      bool_setting.value = true
+      expect(bool_setting.value).to eq(true)
+    end
+  end
+
+  context "Integer" do
+    it "is always an integer" do
+      int_setting = find_by_name(:integer_setting)
+      int_setting.value = 1.6
+      expect(int_setting.value).to eq(1)
+
+      int_setting.value = "4.3"
+      expect(int_setting.value).to eq(4)
+
+      int_setting.value = "10"
+      expect(int_setting.value).to eq(10)
+
+      int_setting.value = "text"
+      expect(int_setting.value).to eq(0)
+    end
+
+    it "can have min or max value" do
+      int_setting = find_by_name(:integer_setting_02)
+      expect { int_setting.value = 0 }.to raise_error(Discourse::InvalidParameters)
+      expect { int_setting.value = 61 }.to raise_error(Discourse::InvalidParameters)
+
+      int_setting.value = 60
+      expect(int_setting.value).to eq(60)
+
+      int_setting.value = 1
+      expect(int_setting.value).to eq(1)
+    end
+  end
+
+  context "Float" do
+    it "is always a float" do
+      float_setting = find_by_name(:float_setting)
+      float_setting.value = 1.615
+      expect(float_setting.value).to eq(1.615)
+
+      float_setting.value = "3.1415"
+      expect(float_setting.value).to eq(3.1415)
+
+      float_setting.value = 10
+      expect(float_setting.value).to eq(10)
+    end
+
+    it "can have min or max value" do
+      float_setting = find_by_name(:float_setting)
+      expect { float_setting.value = 1.4 }.to raise_error(Discourse::InvalidParameters)
+      expect { float_setting.value = 10.01 }.to raise_error(Discourse::InvalidParameters)
+      expect { float_setting.value = "text" }.to raise_error(Discourse::InvalidParameters)
+
+      float_setting.value = 9.521
+      expect(float_setting.value).to eq(9.521)
+    end
+  end
+
+  context "String" do
+    it "can have min or max length" do
+      string_setting = find_by_name(:string_setting_02)
+      expect { string_setting.value = "a" }.to raise_error(Discourse::InvalidParameters)
+
+      string_setting.value = "ab"
+      expect(string_setting.value).to eq("ab")
+
+      string_setting.value = "ab" * 10
+      expect(string_setting.value).to eq("ab" * 10)
+
+      expect { string_setting.value = ("a" * 21) }.to raise_error(Discourse::InvalidParameters)
+    end
+  end
+end
diff --git a/spec/components/theme_settings_parser_spec.rb b/spec/components/theme_settings_parser_spec.rb
new file mode 100644
index 00000000000..cfdea790e63
--- /dev/null
+++ b/spec/components/theme_settings_parser_spec.rb
@@ -0,0 +1,85 @@
+require 'rails_helper'
+require 'theme_settings_parser'
+
+describe ThemeSettingsParser do
+  after(:all) do
+    ThemeField.destroy_all
+  end
+
+  def types
+    ThemeSetting.types
+  end
+
+  class Loader
+    def initialize
+      @settings ||= []
+      load_settings
+    end
+
+    def load_settings
+      yaml = File.read("#{Rails.root}/spec/fixtures/theme_settings/valid_settings.yaml")
+      field = ThemeField.create!(theme_id: 1, target_id: 3, name: "yaml", value: yaml)
+
+      ThemeSettingsParser.new(field).load do |name, default, type, opts|
+        @settings << setting(name, default, type, opts)
+      end
+    end
+
+    def setting(name, default, type, opts = {})
+      { name: name, default: default, type: type, opts: opts }
+    end
+
+    def find_by_name(name)
+      @settings.find { |setting| setting[:name] == name }
+    end
+  end
+
+  let(:loader) { Loader.new }
+
+  it "guesses types correctly" do
+    expect(loader.find_by_name(:boolean_setting)[:type]).to     eq(types[:bool])
+    expect(loader.find_by_name(:boolean_setting_02)[:type]).to  eq(types[:bool])
+    expect(loader.find_by_name(:string_setting)[:type]).to      eq(types[:string])
+    expect(loader.find_by_name(:integer_setting)[:type]).to     eq(types[:integer])
+    expect(loader.find_by_name(:integer_setting_03)[:type]).to  eq(types[:integer])
+    expect(loader.find_by_name(:float_setting)[:type]).to       eq(types[:float])
+    expect(loader.find_by_name(:list_setting)[:type]).to        eq(types[:list])
+    expect(loader.find_by_name(:enum_setting)[:type]).to        eq(types[:enum])
+  end
+
+  context "description locale" do
+    it "favors I18n.locale" do
+      I18n.locale = :ar
+      SiteSetting.default_locale = "en"
+      expect(loader.find_by_name(:enum_setting_02)[:opts][:description]).to eq("Arabic text")
+    end
+
+    it "uses SiteSetting.default_locale if I18n.locale isn't supported" do
+      I18n.locale = :en
+      SiteSetting.default_locale = "es"
+      expect(loader.find_by_name(:integer_setting_02)[:opts][:description]).to eq("Spanish text")
+    end
+
+    it "finds the first supported locale and uses it as a last resort" do
+      I18n.locale = :de
+      SiteSetting.default_locale = "it"
+      expect(loader.find_by_name(:integer_setting_02)[:opts][:description]).to eq("French text")
+    end
+
+    it "doesn't set locale if no supported locale is provided" do
+      expect(loader.find_by_name(:integer_setting_03)[:opts][:description]).to be_nil
+    end
+  end
+
+  context "enum setting" do
+    it "should never have less than 1 choices" do
+      choices = loader.find_by_name(:enum_setting)[:opts][:choices]
+      expect(choices.class).to eq(Array)
+      expect(choices.length).to eq(3)
+
+      choices = loader.find_by_name(:enum_setting_02)[:opts][:choices]
+      expect(choices.class).to eq(Array)
+      expect(choices.length).to eq(1)
+    end
+  end
+end
diff --git a/spec/components/theme_store/tgz_importer_spec.rb b/spec/components/theme_store/tgz_importer_spec.rb
new file mode 100644
index 00000000000..693074a1b2c
--- /dev/null
+++ b/spec/components/theme_store/tgz_importer_spec.rb
@@ -0,0 +1,37 @@
+
+# encoding: utf-8
+
+require 'rails_helper'
+require 'theme_store/tgz_importer'
+
+describe ThemeStore::TgzImporter do
+  before do
+    @temp_folder = "#{Pathname.new(Dir.tmpdir).realpath}/discourse_theme_#{SecureRandom.hex}"
+  end
+
+  after do
+    FileUtils.rm_rf @temp_folder
+  end
+
+  it "can import a simple theme" do
+
+    FileUtils.mkdir(@temp_folder)
+
+    Dir.chdir(@temp_folder) do
+      FileUtils.mkdir('test/')
+      File.write("test/hello.txt", "hello world")
+      FileUtils.mkdir('test/a')
+      File.write("test/a/inner", "hello world inner")
+
+      `tar -cvzf test.tar.gz test/*`
+    end
+
+    importer = ThemeStore::TgzImporter.new("#{@temp_folder}/test.tar.gz")
+    importer.import!
+
+    expect(importer["hello.txt"]).to eq("hello world")
+    expect(importer["a/inner"]).to eq("hello world inner")
+
+    importer.cleanup!
+  end
+end
diff --git a/spec/components/topic_creator_spec.rb b/spec/components/topic_creator_spec.rb
index 0ed814cae12..e56da86f49e 100644
--- a/spec/components/topic_creator_spec.rb
+++ b/spec/components/topic_creator_spec.rb
@@ -60,6 +60,72 @@ describe TopicCreator do
       end
     end
 
+    context 'tags' do
+      let!(:tag1) { Fabricate(:tag, name: "fun") }
+      let!(:tag2) { Fabricate(:tag, name: "fun2") }
+
+      before do
+        SiteSetting.tagging_enabled = true
+        SiteSetting.min_trust_to_create_tag = 0
+        SiteSetting.min_trust_level_to_tag_topics = 0
+      end
+
+      context 'regular tags' do
+        it "user can add tags to topic" do
+          topic = TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(tags: [tag1.name]))
+          expect(topic).to be_valid
+          expect(topic.tags.length).to eq(1)
+        end
+      end
+
+      context 'staff-only tags' do
+        before do
+          create_staff_tags(['alpha'])
+        end
+
+        it "regular users can't add staff-only tags" do
+          expect do
+            TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(tags: ['alpha']))
+          end.to raise_error(ActiveRecord::Rollback)
+        end
+
+        it 'staff can add staff-only tags' do
+          topic = TopicCreator.create(admin, Guardian.new(admin), valid_attrs.merge(tags: ['alpha']))
+          expect(topic).to be_valid
+          expect(topic.tags.length).to eq(1)
+        end
+      end
+
+      context 'minimum_required_tags is present' do
+        let!(:category) { Fabricate(:category, name: "beta", minimum_required_tags: 2) }
+
+        it "fails for regular user if minimum_required_tags is not satisfied" do
+          expect do
+            TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(category: "beta"))
+          end.to raise_error(ActiveRecord::Rollback)
+        end
+
+        it "lets admin create a topic regardless of minimum_required_tags" do
+          topic = TopicCreator.create(admin, Guardian.new(admin), valid_attrs.merge(tags: [tag1.name], category: "beta"))
+          expect(topic).to be_valid
+          expect(topic.tags.length).to eq(1)
+        end
+
+        it "works for regular user if minimum_required_tags is satisfied" do
+          topic = TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(tags: [tag1.name, tag2.name], category: "beta"))
+          expect(topic).to be_valid
+          expect(topic.tags.length).to eq(2)
+        end
+
+        it "lets new user create a topic if they don't have sufficient trust level to tag topics" do
+          SiteSetting.min_trust_level_to_tag_topics = 1
+          new_user = Fabricate(:newuser)
+          topic = TopicCreator.create(new_user, Guardian.new(new_user), valid_attrs.merge(category: "beta"))
+          expect(topic).to be_valid
+        end
+      end
+    end
+
     context 'private message' do
 
       context 'success cases' do
@@ -80,7 +146,7 @@ describe TopicCreator do
         end
 
         it "should be possible for a trusted user to send private messages via email" do
-          SiteSetting.expects(:enable_private_email_messages).returns(true)
+          SiteSetting.expects(:enable_personal_email_messages).returns(true)
           SiteSetting.min_trust_to_send_email_messages = TrustLevel[1]
 
           expect(TopicCreator.create(user, Guardian.new(user), pm_to_email_valid_attrs)).to be_valid
@@ -89,7 +155,7 @@ describe TopicCreator do
 
       context 'failure cases' do
         it "should be rollback the changes when email is invalid" do
-          SiteSetting.expects(:enable_private_email_messages).returns(true)
+          SiteSetting.expects(:enable_personal_email_messages).returns(true)
           SiteSetting.min_trust_to_send_email_messages = TrustLevel[1]
           attrs = pm_to_email_valid_attrs.dup
           attrs[:target_emails] = "t" * 256
diff --git a/spec/components/topic_publisher_spec.rb b/spec/components/topic_publisher_spec.rb
new file mode 100644
index 00000000000..43d33172f58
--- /dev/null
+++ b/spec/components/topic_publisher_spec.rb
@@ -0,0 +1,56 @@
+require 'topic_publisher'
+require 'rails_helper'
+
+describe TopicPublisher do
+
+  context "shared drafts" do
+    let(:shared_drafts_category) { Fabricate(:category) }
+    let(:category) { Fabricate(:category) }
+
+    before do
+      SiteSetting.shared_drafts_category = shared_drafts_category.id
+    end
+
+    context "publishing" do
+      let(:topic) { Fabricate(:topic, category: shared_drafts_category, visible: false) }
+      let(:shared_draft) { Fabricate(:shared_draft, topic: topic, category: category) }
+      let(:moderator) { Fabricate(:moderator) }
+      let(:op) { Fabricate(:post, topic: topic) }
+
+      before do
+        # Create a revision
+        op.set_owner(Fabricate(:coding_horror), Discourse.system_user)
+        op.reload
+      end
+
+      it "will publish the topic properly" do
+        published_at = 1.hour.from_now.change(usec: 0)
+        freeze_time(published_at) do
+          TopicPublisher.new(topic, moderator, shared_draft.category_id).publish!
+
+          topic.reload
+          expect(topic.category).to eq(category)
+          expect(topic).to be_visible
+          expect(topic.created_at).to eq(published_at)
+          expect(topic.updated_at).to eq(published_at)
+          expect(topic.shared_draft).to be_blank
+          expect(UserHistory.where(
+            acting_user_id: moderator.id,
+            action: UserHistory.actions[:topic_published]
+          )).to be_present
+          op.reload
+
+          # Should delete any edits on the OP
+          expect(op.revisions.size).to eq(0)
+          expect(op.version).to eq(1)
+          expect(op.public_version).to eq(1)
+          expect(op.created_at).to eq(published_at)
+          expect(op.updated_at).to eq(published_at)
+          expect(op.last_version_at).to eq(published_at)
+        end
+      end
+    end
+
+  end
+
+end
diff --git a/spec/components/topic_query_spec.rb b/spec/components/topic_query_spec.rb
index be119f53099..fcce4812528 100644
--- a/spec/components/topic_query_spec.rb
+++ b/spec/components/topic_query_spec.rb
@@ -166,26 +166,26 @@ describe TopicQuery do
     end
 
     context "no category filter" do
-      # create some topics before each test:
       let!(:tagged_topic1) { Fabricate(:topic, tags: [tag]) }
       let!(:tagged_topic2) { Fabricate(:topic, tags: [other_tag]) }
       let!(:tagged_topic3) { Fabricate(:topic, tags: [tag, other_tag]) }
       let!(:no_tags_topic) { Fabricate(:topic) }
 
       it "returns topics with the tag when filtered to it" do
-        expect(TopicQuery.new(moderator, tags: [tag.name]).list_latest.topics.map(&:id).sort).to eq([tagged_topic1.id, tagged_topic3.id].sort)
-        expect(TopicQuery.new(moderator, tags: [tag.id]).list_latest.topics.map(&:id).sort).to eq([tagged_topic1.id, tagged_topic3.id].sort)
+        expect(TopicQuery.new(moderator, tags: [tag.name]).list_latest.topics)
+          .to contain_exactly(tagged_topic1, tagged_topic3)
 
-        two_tag_topic = TopicQuery.new(moderator, tags: [tag.name]).list_latest.topics.find { |t| t.id == tagged_topic3.id }
-        expect(two_tag_topic.tags.size).to eq(2)
+        expect(TopicQuery.new(moderator, tags: [tag.id]).list_latest.topics)
+          .to contain_exactly(tagged_topic1, tagged_topic3)
 
-        # topics with ANY of the given tags:
-        expect(TopicQuery.new(moderator, tags: [tag.name, other_tag.name]).list_latest.topics.map(&:id).sort).to eq([tagged_topic1.id, tagged_topic2.id, tagged_topic3.id].sort)
-        expect(TopicQuery.new(moderator, tags: [tag.id, other_tag.id]).list_latest.topics.map(&:id).sort).to eq([tagged_topic1.id, tagged_topic2.id, tagged_topic3.id].sort)
+        expect(TopicQuery.new(
+          moderator, tags: [tag.name, other_tag.name]
+        ).list_latest.topics).to contain_exactly(
+          tagged_topic1, tagged_topic2, tagged_topic3
+        )
 
-        # TODO: topics with ALL of the given tags:
-        # expect(TopicQuery.new(moderator, tags: [tag.name, other_tag.name]).list_latest.topics.map(&:id)).to eq([tagged_topic3.id].sort)
-        # expect(TopicQuery.new(moderator, tags: [tag.id, other_tag.id]).list_latest.topics.map(&:id)).to eq([tagged_topic3.id].sort)
+        expect(TopicQuery.new(moderator, tags: [tag.id, other_tag.id]).list_latest.topics)
+          .to contain_exactly(tagged_topic1, tagged_topic2, tagged_topic3)
       end
 
       it "can return topics with all specified tags" do
@@ -695,6 +695,10 @@ describe TopicQuery do
       expect(TopicQuery.new(user).list_suggested_for(pm_to_user).topics.map(&:id)).to(
         eq([new_pm.id, unread_pm.id, related_by_user_pm.id])
       )
+
+      SiteSetting.enable_personal_messages = false
+      expect(TopicQuery.new(user).list_suggested_for(pm_to_group)).to be_blank
+      expect(TopicQuery.new(user).list_suggested_for(pm_to_user)).to be_blank
     end
   end
 
@@ -819,6 +823,19 @@ describe TopicQuery do
             expect(suggested_topics).to eq([private_group_topic.id, private_message.id])
           end
         end
+
+        context "by tag filter" do
+          let(:tag) { Fabricate(:tag) }
+          let!(:user) { group_user }
+
+          it 'should return only tagged topics' do
+            Fabricate(:topic_tag, topic: private_message, tag: tag)
+            Fabricate(:topic_tag, topic: private_group_topic)
+
+            expect(TopicQuery.new(user, tags: [tag.name]).list_private_messages_tag(user).topics).to eq([private_message])
+          end
+
+        end
       end
 
       context 'with some existing topics' do
@@ -868,10 +885,135 @@ describe TopicQuery do
           expect(suggested_topics[1, 3]).to include(closed_topic.id)
           expect(suggested_topics[1, 3]).to include(archived_topic.id)
         end
+      end
+    end
+  end
 
+  describe '#list_group_topics' do
+    let(:group) { Fabricate(:group) }
+
+    let(:user) do
+      user = Fabricate(:user)
+      group.add(user)
+      user
+    end
+
+    let(:user2) do
+      user = Fabricate(:user)
+      group.add(user)
+      user
+    end
+
+    let(:user3) { Fabricate(:user) }
+
+    let(:private_category) do
+      Fabricate(:private_category, group: group)
+    end
+
+    let!(:private_message_topic) { Fabricate(:private_message_post, user: user).topic }
+    let!(:topic1) { Fabricate(:topic, user: user) }
+    let!(:topic2) { Fabricate(:topic, user: user, category: Fabricate(:category)) }
+    let!(:topic3) { Fabricate(:topic, user: user, category: private_category) }
+    let!(:topic4) { Fabricate(:topic) }
+    let!(:topic5) { Fabricate(:topic, user: user, visible: false) }
+    let!(:topic6) { Fabricate(:topic, user: user2) }
+
+    it 'should return the right lists for anon user' do
+      topics = TopicQuery.new.list_group_topics(group).topics
+
+      expect(topics).to contain_exactly(topic1, topic2, topic6)
+    end
+
+    it 'should retun the right list for users in the same group' do
+      topics = TopicQuery.new(user).list_group_topics(group).topics
+
+      expect(topics).to contain_exactly(topic1, topic2, topic3, topic6)
+
+      topics = TopicQuery.new(user2).list_group_topics(group).topics
+
+      expect(topics).to contain_exactly(topic1, topic2, topic3, topic6)
+    end
+
+    it 'should return the right list for user no in the group' do
+      topics = TopicQuery.new(user3).list_group_topics(group).topics
+
+      expect(topics).to contain_exactly(topic1, topic2, topic6)
+    end
+  end
+
+  describe '#list_private_messages_group' do
+    let(:group) { Fabricate(:group) }
+
+    let!(:group_message) do
+      Fabricate(:private_message_topic,
+        allowed_groups: [group],
+        topic_allowed_users: [
+          Fabricate.build(:topic_allowed_user, user: Fabricate(:user)),
+        ]
+      )
+    end
+
+    before do
+      group.add(creator)
+    end
+
+    it 'should return the right list for a group user' do
+      topics = TopicQuery.new(nil, group_name: group.name)
+        .list_private_messages_group(creator)
+        .topics
+
+      expect(topics).to contain_exactly(group_message)
+    end
+
+    it 'should return the right list for an admin not part of the group' do
+      topics = TopicQuery.new(nil, group_name: group.name)
+        .list_private_messages_group(Fabricate(:admin))
+        .topics
+
+      expect(topics).to contain_exactly(group_message)
+    end
+
+    it 'should return the right list for a user not part of the group' do
+      topics = TopicQuery.new(nil, group_name: group.name)
+        .list_private_messages_group(Fabricate(:user))
+        .topics
+
+      expect(topics).to eq([])
+    end
+  end
+
+  context "shared drafts" do
+    let(:category) { Fabricate(:category) }
+    let(:shared_drafts_category) { Fabricate(:category) }
+    let!(:topic) { Fabricate(:topic, category: shared_drafts_category) }
+    let!(:shared_draft) { Fabricate(:shared_draft, topic: topic, category: category) }
+    let(:admin) { Fabricate(:admin) }
+    let(:user) { Fabricate(:user) }
+    let(:group) { Fabricate(:group) }
+
+    before do
+      shared_drafts_category.set_permissions(group => :full)
+      shared_drafts_category.save
+      SiteSetting.shared_drafts_category = shared_drafts_category.id
+    end
+
+    context "destination_category_id" do
+      it "doesn't allow regular users to query destination_category_id" do
+        list = TopicQuery.new(user, destination_category_id: category.id).list_latest
+        expect(list.topics).not_to include(topic)
+      end
+
+      it "allows staff users to query destination_category_id" do
+        list = TopicQuery.new(admin, destination_category_id: category.id).list_latest
+        expect(list.topics).to include(topic)
       end
     end
 
+    context "latest" do
+      it "doesn't include shared topics unless filtering by category" do
+        list = TopicQuery.new(moderator).list_latest
+        expect(list.topics).not_to include(topic)
+      end
+    end
   end
-
 end
diff --git a/spec/components/topic_view_spec.rb b/spec/components/topic_view_spec.rb
index 3e8897ae533..06fb8099a08 100644
--- a/spec/components/topic_view_spec.rb
+++ b/spec/components/topic_view_spec.rb
@@ -4,13 +4,18 @@ require 'topic_view'
 describe TopicView do
 
   let(:topic) { create_topic }
-  let(:coding_horror) { Fabricate(:coding_horror) }
+  let(:evil_trout) { Fabricate(:evil_trout) }
   let(:first_poster) { topic.user }
 
-  let(:topic_view) { TopicView.new(topic.id, coding_horror) }
+  let(:topic_view) { TopicView.new(topic.id, evil_trout) }
 
   it "raises a not found error if the topic doesn't exist" do
-    expect { TopicView.new(1231232, coding_horror) }.to raise_error(Discourse::NotFound)
+    expect { TopicView.new(1231232, evil_trout) }.to raise_error(Discourse::NotFound)
+  end
+
+  it "accepts a topic or a topic id" do
+    expect(TopicView.new(topic, evil_trout).topic).to eq(topic)
+    expect(TopicView.new(topic.id, evil_trout).topic).to eq(topic)
   end
 
   # see also spec/controllers/topics_controller_spec.rb TopicsController::show::permission errors
@@ -28,23 +33,23 @@ describe TopicView do
 
   context "chunk_size" do
     it "returns `chunk_size` by default" do
-      expect(TopicView.new(topic.id, coding_horror).chunk_size).to eq(TopicView.chunk_size)
+      expect(TopicView.new(topic.id, evil_trout).chunk_size).to eq(TopicView.chunk_size)
     end
 
     it "returns `slow_chunk_size` when slow_platform is true" do
-      tv = TopicView.new(topic.id, coding_horror, slow_platform: true)
+      tv = TopicView.new(topic.id, evil_trout, slow_platform: true)
       expect(tv.chunk_size).to eq(TopicView.slow_chunk_size)
     end
 
     it "returns `print_chunk_size` when print param is true" do
-      tv = TopicView.new(topic.id, coding_horror, print: true)
+      tv = TopicView.new(topic.id, evil_trout, print: true)
       expect(tv.chunk_size).to eq(TopicView.print_chunk_size)
     end
   end
 
   context "with a few sample posts" do
     let!(:p1) { Fabricate(:post, topic: topic, user: first_poster, percent_rank: 1) }
-    let!(:p2) { Fabricate(:post, topic: topic, user: coding_horror, percent_rank: 0.5) }
+    let!(:p2) { Fabricate(:post, topic: topic, user: evil_trout, percent_rank: 0.5) }
     let!(:p3) { Fabricate(:post, topic: topic, user: first_poster, percent_rank: 0) }
 
     let(:moderator) { Fabricate(:moderator) }
@@ -52,7 +57,7 @@ describe TopicView do
 
     it "it can find the best responses" do
 
-      best2 = TopicView.new(topic.id, coding_horror, best: 2)
+      best2 = TopicView.new(topic.id, evil_trout, best: 2)
       expect(best2.posts.count).to eq(2)
       expect(best2.posts[0].id).to eq(p2.id)
       expect(best2.posts[1].id).to eq(p3.id)
@@ -67,7 +72,7 @@ describe TopicView do
       expect(best.posts.pluck(:id)).to match_array([p2.id, p3.id])
 
       # should get no results for trust level too low
-      best = TopicView.new(topic.id, nil, best: 99, min_trust_level: coding_horror.trust_level + 1)
+      best = TopicView.new(topic.id, nil, best: 99, min_trust_level: evil_trout.trust_level + 1)
       expect(best.posts.count).to eq(0)
 
       # should filter out the posts with a score that is too low
@@ -81,11 +86,11 @@ describe TopicView do
       # should punch through posts if the score is high enough
       p2.update_column(:score, 100)
 
-      best = TopicView.new(topic.id, nil, best: 99, bypass_trust_level_score: 100, min_trust_level: coding_horror.trust_level + 1)
+      best = TopicView.new(topic.id, nil, best: 99, bypass_trust_level_score: 100, min_trust_level: evil_trout.trust_level + 1)
       expect(best.posts.count).to eq(1)
 
       # 0 means ignore
-      best = TopicView.new(topic.id, nil, best: 99, bypass_trust_level_score: 0, min_trust_level: coding_horror.trust_level + 1)
+      best = TopicView.new(topic.id, nil, best: 99, bypass_trust_level_score: 0, min_trust_level: evil_trout.trust_level + 1)
       expect(best.posts.count).to eq(0)
 
       # If we restrict to posts a moderator liked, return none
@@ -109,6 +114,52 @@ describe TopicView do
       expect { TopicView.new(topic.id, nil) }.to raise_error(Discourse::NotLoggedIn)
     end
 
+    context 'log_check_personal_message is enabled' do
+      let(:group) { Fabricate(:group) }
+      let(:private_message) { Fabricate(:private_message_topic, allowed_groups: [group]) }
+
+      before do
+        SiteSetting.log_personal_messages_views = true
+        evil_trout.admin = true
+      end
+
+      it "logs view if Admin views personal message for other user/group" do
+        allowed_user = private_message.topic_allowed_users.first.user
+        TopicView.new(private_message.id, allowed_user)
+        expect(UserHistory.where(action: UserHistory.actions[:check_personal_message]).count).to eq(0)
+
+        TopicView.new(private_message.id, evil_trout)
+        expect(UserHistory.where(action: UserHistory.actions[:check_personal_message]).count).to eq(1)
+      end
+
+      it "does not log personal message view for group he belongs to" do
+        group.users << evil_trout
+        TopicView.new(private_message.id, evil_trout)
+        expect(UserHistory.where(action: UserHistory.actions[:check_personal_message]).count).to eq(0)
+      end
+
+      it "does not log personal message view for his own personal message" do
+        private_message.allowed_users << evil_trout
+        TopicView.new(private_message.id, evil_trout)
+        expect(UserHistory.where(action: UserHistory.actions[:check_personal_message]).count).to eq(0)
+      end
+
+      it "does not log personal message view if user can't see the message" do
+        expect { TopicView.new(private_message.id, Fabricate(:user)) }.to raise_error(Discourse::InvalidAccess)
+        expect(UserHistory.where(action: UserHistory.actions[:check_personal_message]).count).to eq(0)
+      end
+
+      it "does not log personal message view if there exists a similar log in previous hour" do
+        2.times { TopicView.new(private_message.id, evil_trout) }
+        expect(UserHistory.where(action: UserHistory.actions[:check_personal_message]).count).to eq(1)
+
+        freeze_time (2.hours.from_now)
+
+        TopicView.new(private_message.id, evil_trout)
+        expect(UserHistory.where(action: UserHistory.actions[:check_personal_message]).count).to eq(2)
+      end
+    end
+
     it "provides an absolute url" do
       expect(topic_view.absolute_url).to be_present
     end
@@ -161,11 +212,11 @@ describe TopicView do
 
     context '.post_counts_by_user' do
       it 'returns the two posters with their appropriate counts' do
-        Fabricate(:post, topic: topic, user: coding_horror, post_type: Post.types[:whisper])
+        Fabricate(:post, topic: topic, user: evil_trout, post_type: Post.types[:whisper])
 
-        expect(topic_view.post_counts_by_user.to_a).to match_array([[first_poster.id, 2], [coding_horror.id, 2]])
+        expect(topic_view.post_counts_by_user.to_a).to match_array([[first_poster.id, 2], [evil_trout.id, 2]])
 
-        expect(TopicView.new(topic.id, first_poster).post_counts_by_user.to_a).to match_array([[first_poster.id, 2], [coding_horror.id, 1]])
+        expect(TopicView.new(topic.id, first_poster).post_counts_by_user.to_a).to match_array([[first_poster.id, 2], [evil_trout.id, 1]])
       end
 
       it "doesn't return counts for posts with authors who have been deleted" do
@@ -178,7 +229,7 @@ describe TopicView do
 
     context '.participants' do
       it 'returns the two participants hashed by id' do
-        expect(topic_view.participants.to_a).to match_array([[first_poster.id, first_poster], [coding_horror.id, coding_horror]])
+        expect(topic_view.participants.to_a).to match_array([[first_poster.id, first_poster], [evil_trout.id, evil_trout]])
       end
     end
 
@@ -188,7 +239,7 @@ describe TopicView do
       end
 
       it 'returns the like' do
-        PostAction.act(coding_horror, p1, PostActionType.types[:like])
+        PostAction.act(evil_trout, p1, PostActionType.types[:like])
         expect(topic_view.all_post_actions[p1.id][PostActionType.types[:like]]).to be_present
       end
     end
@@ -200,14 +251,14 @@ describe TopicView do
 
       it 'returns the active flags' do
         PostAction.act(moderator, p1, PostActionType.types[:off_topic])
-        PostAction.act(coding_horror, p1, PostActionType.types[:off_topic])
+        PostAction.act(evil_trout, p1, PostActionType.types[:off_topic])
 
         expect(topic_view.all_active_flags[p1.id][PostActionType.types[:off_topic]].count).to eq(2)
       end
 
       it 'returns only the active flags' do
         PostAction.act(moderator, p1, PostActionType.types[:off_topic])
-        PostAction.act(coding_horror, p1, PostActionType.types[:off_topic])
+        PostAction.act(evil_trout, p1, PostActionType.types[:off_topic])
 
         PostAction.defer_flags!(p1, moderator)
 
@@ -223,12 +274,12 @@ describe TopicView do
         # random user has nothing
         expect(topic_view.read?(1)).to eq(false)
 
-        coding_horror.created_at = 2.days.ago
+        evil_trout.created_at = 2.days.ago
 
         # a real user that just read it should have it marked
-        PostTiming.process_timings(coding_horror, topic.id, 1, [[1, 1000]])
-        expect(TopicView.new(topic.id, coding_horror).read?(1)).to eq(true)
-        expect(TopicView.new(topic.id, coding_horror).topic_user).to be_present
+        PostTiming.process_timings(evil_trout, topic.id, 1, [[1, 1000]])
+        expect(TopicView.new(topic.id, evil_trout).read?(1)).to eq(true)
+        expect(TopicView.new(topic.id, evil_trout).topic_user).to be_present
       end
     end
 
@@ -262,11 +313,11 @@ describe TopicView do
 
   context 'whispers' do
     it "handles their visibility properly" do
-      p1 = Fabricate(:post, topic: topic, user: coding_horror)
-      p2 = Fabricate(:post, topic: topic, user: coding_horror, post_type: Post.types[:whisper])
-      p3 = Fabricate(:post, topic: topic, user: coding_horror)
+      p1 = Fabricate(:post, topic: topic, user: evil_trout)
+      p2 = Fabricate(:post, topic: topic, user: evil_trout, post_type: Post.types[:whisper])
+      p3 = Fabricate(:post, topic: topic, user: evil_trout)
 
-      ch_posts = TopicView.new(topic.id, coding_horror).posts
+      ch_posts = TopicView.new(topic.id, evil_trout).posts
       expect(ch_posts.map(&:id)).to eq([p1.id, p2.id, p3.id])
 
       anon_posts = TopicView.new(topic.id).posts
@@ -280,12 +331,12 @@ describe TopicView do
   context '.posts' do
 
     # Create the posts in a different order than the sort_order
-    let!(:p5) { Fabricate(:post, topic: topic, user: coding_horror) }
-    let!(:p2) { Fabricate(:post, topic: topic, user: coding_horror) }
+    let!(:p5) { Fabricate(:post, topic: topic, user: evil_trout) }
+    let!(:p2) { Fabricate(:post, topic: topic, user: evil_trout) }
     let!(:p6) { Fabricate(:post, topic: topic, user: Fabricate(:user), deleted_at: Time.now) }
-    let!(:p4) { Fabricate(:post, topic: topic, user: coding_horror, deleted_at: Time.now) }
+    let!(:p4) { Fabricate(:post, topic: topic, user: evil_trout, deleted_at: Time.now) }
     let!(:p1) { Fabricate(:post, topic: topic, user: first_poster) }
-    let!(:p7) { Fabricate(:post, topic: topic, user: coding_horror, deleted_at: Time.now) }
+    let!(:p7) { Fabricate(:post, topic: topic, user: evil_trout, deleted_at: Time.now) }
     let!(:p3) { Fabricate(:post, topic: topic, user: first_poster) }
 
     before do
@@ -305,11 +356,11 @@ describe TopicView do
         # does not contain contains_gaps with default filtering
         expect(topic_view.contains_gaps?).to eq(false)
         # contains contains_gaps when filtered by username" do
-        expect(TopicView.new(topic.id, coding_horror, username_filters: ['eviltrout']).contains_gaps?).to eq(true)
+        expect(TopicView.new(topic.id, evil_trout, username_filters: ['eviltrout']).contains_gaps?).to eq(true)
         # contains contains_gaps when filtered by summary
-        expect(TopicView.new(topic.id, coding_horror, filter: 'summary').contains_gaps?).to eq(true)
+        expect(TopicView.new(topic.id, evil_trout, filter: 'summary').contains_gaps?).to eq(true)
         # contains contains_gaps when filtered by best
-        expect(TopicView.new(topic.id, coding_horror, best: 5).contains_gaps?).to eq(true)
+        expect(TopicView.new(topic.id, evil_trout, best: 5).contains_gaps?).to eq(true)
       end
     end
 
@@ -324,10 +375,10 @@ describe TopicView do
       topic.save!
 
       expect {
-        TopicView.new(topic.id, coding_horror).posts.count
+        TopicView.new(topic.id, evil_trout).posts.count
       }.to raise_error(Discourse::InvalidAccess)
 
-      expect(TopicView.new(t2.id, coding_horror, post_ids: [p1.id, p2.id]).posts.count).to eq(0)
+      expect(TopicView.new(t2.id, evil_trout, post_ids: [p1.id, p2.id]).posts.count).to eq(0)
 
     end
 
@@ -345,7 +396,7 @@ describe TopicView do
     describe "filter_posts_near" do
 
       def topic_view_near(post, show_deleted = false)
-        TopicView.new(topic.id, coding_horror, post_number: post.post_number, show_deleted: show_deleted)
+        TopicView.new(topic.id, evil_trout, post_number: post.post_number, show_deleted: show_deleted)
       end
 
       it "snaps to the lower boundary" do
@@ -370,7 +421,7 @@ describe TopicView do
       end
 
       it "gaps deleted posts to an admin" do
-        coding_horror.admin = true
+        evil_trout.admin = true
         near_view = topic_view_near(p3)
         expect(near_view.desired_post).to eq(p3)
         expect(near_view.posts).to eq([p2, p3, p5])
@@ -379,7 +430,7 @@ describe TopicView do
       end
 
       it "returns deleted posts to an admin with show_deleted" do
-        coding_horror.admin = true
+        evil_trout.admin = true
         near_view = topic_view_near(p3, true)
         expect(near_view.desired_post).to eq(p3)
         expect(near_view.posts).to eq([p2, p3, p4])
@@ -387,7 +438,7 @@ describe TopicView do
       end
 
       it "gaps deleted posts by nuked users to an admin" do
-        coding_horror.admin = true
+        evil_trout.admin = true
         near_view = topic_view_near(p5)
         expect(near_view.desired_post).to eq(p5)
         # note: both p4 and p6 get skipped
@@ -397,7 +448,7 @@ describe TopicView do
       end
 
       it "returns deleted posts by nuked users to an admin with show_deleted" do
-        coding_horror.admin = true
+        evil_trout.admin = true
         near_view = topic_view_near(p5, true)
         expect(near_view.desired_post).to eq(p5)
         expect(near_view.posts).to eq([p4, p5, p6])
@@ -414,7 +465,7 @@ describe TopicView do
         end
 
         it 'gaps deleted posts to admins' do
-          coding_horror.admin = true
+          evil_trout.admin = true
           near_view = topic_view_near(p5)
           expect(near_view.posts).to eq([p1, p2, p3, p5])
           expect(near_view.gaps.before).to eq(p5.id => [p4.id])
@@ -422,7 +473,7 @@ describe TopicView do
         end
 
         it 'returns deleted posts to admins' do
-          coding_horror.admin = true
+          evil_trout.admin = true
           near_view = topic_view_near(p5, true)
           expect(near_view.posts).to eq([p1, p2, p3, p4, p5, p6, p7])
           expect(near_view.contains_gaps?).to eq(false)
@@ -435,7 +486,7 @@ describe TopicView do
     let(:tag1) { Fabricate(:tag) }
     let(:tag2) { Fabricate(:tag, topic_count: 2) }
 
-    subject { TopicView.new(topic.id, coding_horror).page_title }
+    subject { TopicView.new(topic.id, evil_trout).page_title }
 
     context "uncategorized topic" do
       context "topic_page_title_includes_category is false" do
diff --git a/spec/components/validators/enable_local_logins_via_email_validator_spec.rb b/spec/components/validators/enable_local_logins_via_email_validator_spec.rb
new file mode 100644
index 00000000000..289ce4911d0
--- /dev/null
+++ b/spec/components/validators/enable_local_logins_via_email_validator_spec.rb
@@ -0,0 +1,47 @@
+require 'rails_helper'
+
+RSpec.describe EnableLocalLoginsViaEmailValidator do
+  subject { described_class.new }
+
+  describe '#valid_value?' do
+    describe "when 'enable_local_logins' is false" do
+      before do
+        SiteSetting.enable_local_logins = false
+      end
+
+      describe 'when val is false' do
+        it 'should be valid' do
+          expect(subject.valid_value?('f')).to eq(true)
+        end
+      end
+
+      describe 'when value is true' do
+        it 'should not be valid' do
+          expect(subject.valid_value?('t')).to eq(false)
+
+          expect(subject.error_message).to eq(I18n.t(
+            'site_settings.errors.enable_local_logins_disabled'
+          ))
+        end
+      end
+    end
+
+    describe "when 'enable_local_logins' is true" do
+      before do
+        SiteSetting.enable_local_logins = true
+      end
+
+      describe 'when val is false' do
+        it 'should be valid' do
+          expect(subject.valid_value?('f')).to eq(true)
+        end
+      end
+
+      describe 'when value is true' do
+        it 'should be valid' do
+          expect(subject.valid_value?('t')).to eq(true)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/components/validators/max_emojis_validator_spec.rb b/spec/components/validators/max_emojis_validator_spec.rb
new file mode 100644
index 00000000000..351746e44b0
--- /dev/null
+++ b/spec/components/validators/max_emojis_validator_spec.rb
@@ -0,0 +1,54 @@
+# encoding: UTF-8
+
+require 'rails_helper'
+require 'validators/max_emojis_validator'
+
+describe MaxEmojisValidator do
+
+  # simulate Rails behavior (singleton)
+  def validate
+    @validator ||= MaxEmojisValidator.new(attributes: :title)
+    @validator.validate_each(record, :title, record.title)
+  end
+
+  shared_examples "validating any topic title" do
+    it 'adds an error when emoji count is greater than SiteSetting.max_emojis_in_title' do
+      SiteSetting.max_emojis_in_title = 3
+      record.title = '🧐 Lots of emojis here 🎃 :joy: :sunglasses:'
+      validate
+      expect(record.errors[:title][0]).to eq(I18n.t("errors.messages.max_emojis", max_emojis_count: 3))
+
+      record.title = ':joy: :blush: :smile: is not only about emojis: Happyness::start()'
+      validate
+      expect(record.valid?).to be true
+    end
+  end
+
+  describe 'topic' do
+    let(:record) { Fabricate.build(:topic) }
+
+    it 'does not add an error when emoji count is good' do
+      SiteSetting.max_emojis_in_title = 2
+
+      record.title = 'To Infinity and beyond! 🚀 :woman:t5:'
+      validate
+      expect(record.errors[:title]).to_not be_present
+    end
+
+    include_examples "validating any topic title"
+  end
+
+  describe 'private message' do
+    let(:record) { Fabricate.build(:private_message_topic) }
+
+    it 'does not add an error when emoji count is good' do
+      SiteSetting.max_emojis_in_title = 1
+
+      record.title = 'To Infinity and beyond! 🚀'
+      validate
+      expect(record.errors[:title]).to_not be_present
+    end
+
+    include_examples "validating any topic title"
+  end
+end
diff --git a/spec/components/validators/post_validator_spec.rb b/spec/components/validators/post_validator_spec.rb
index 008e92fa16b..61c530cd8cb 100644
--- a/spec/components/validators/post_validator_spec.rb
+++ b/spec/components/validators/post_validator_spec.rb
@@ -135,6 +135,49 @@ describe Validators::PostValidator do
     end
   end
 
+  context "too_many_images" do
+    before do
+      SiteSetting.min_trust_to_post_images = 0
+      SiteSetting.newuser_max_images = 2
+    end
+
+    it "should be invalid when new user exceeds max mentions limit" do
+      post.acting_user = build(:newuser)
+      post.expects(:image_count).returns(3)
+      validator.max_images_validator(post)
+      expect(post.errors.count).to be > 0
+    end
+
+    it "should be valid when new user does not exceed max mentions limit" do
+      post.acting_user = build(:newuser)
+      post.expects(:image_count).returns(2)
+      validator.max_images_validator(post)
+      expect(post.errors.count).to be(0)
+    end
+
+    it "should be invalid when user trust level is not sufficient" do
+      SiteSetting.min_trust_to_post_images = 4
+      post.acting_user = build(:leader)
+      post.expects(:image_count).returns(2)
+      validator.max_images_validator(post)
+      expect(post.errors.count).to be > 0
+    end
+
+    it "should be valid for moderator in all cases" do
+      post.acting_user = build(:moderator)
+      post.expects(:image_count).never
+      validator.max_images_validator(post)
+      expect(post.errors.count).to be(0)
+    end
+
+    it "should be valid for admin in all cases" do
+      post.acting_user = build(:admin)
+      post.expects(:image_count).never
+      validator.max_images_validator(post)
+      expect(post.errors.count).to be(0)
+    end
+  end
+
   context "invalid post" do
     it "should be invalid" do
       validator.validate(post)
@@ -184,7 +227,7 @@ describe Validators::PostValidator do
       validator.expects(:max_mention_validator).never
       validator.expects(:max_images_validator).never
       validator.expects(:max_attachments_validator).never
-      validator.expects(:max_links_validator).never
+      validator.expects(:newuser_links_validator).never
       validator.expects(:unique_post_validator).never
       validator.validate(post)
     end
diff --git a/spec/components/validators/regex_presence_validator_spec.rb b/spec/components/validators/regex_presence_validator_spec.rb
new file mode 100644
index 00000000000..819269e155f
--- /dev/null
+++ b/spec/components/validators/regex_presence_validator_spec.rb
@@ -0,0 +1,31 @@
+require "rails_helper"
+
+RSpec.describe RegexPresenceValidator do
+  subject { described_class.new(regex: 'latest', regex_error: 'site_settings.errors.must_include_latest') }
+
+  describe "#valid_value?" do
+    describe "when value is present" do
+      it "without regex match" do
+        expect(subject.valid_value?("categories|new")).to eq(false)
+
+        expect(subject.error_message).to eq(I18n.t(
+          "site_settings.errors.must_include_latest"
+        ))
+      end
+
+      it "with regex match" do
+        expect(subject.valid_value?("latest|categories")).to eq(true)
+      end
+    end
+
+    describe "when value is empty" do
+      it "should not be valid" do
+        expect(subject.valid_value?("")).to eq(false)
+
+        expect(subject.error_message).to eq(I18n.t(
+          "site_settings.errors.must_include_latest"
+        ))
+      end
+    end
+  end
+end
diff --git a/spec/components/validators/reply_by_email_address_validator_spec.rb b/spec/components/validators/reply_by_email_address_validator_spec.rb
index ac580b7f016..c64a4a62a5e 100644
--- a/spec/components/validators/reply_by_email_address_validator_spec.rb
+++ b/spec/components/validators/reply_by_email_address_validator_spec.rb
@@ -12,12 +12,18 @@ describe ReplyByEmailAddressValidator do
 
     it "returns false if value is not an email address" do
       expect(validator.valid_value?('WAT%{reply_key}.com')).to eq(false)
+      expect(validator.valid_value?('word +%{reply_key}@example.com')).to eq(false)
     end
 
     it "returns false if value does not contain '%{reply_key}'" do
       expect(validator.valid_value?('foo@bar.com')).to eq(false)
     end
 
+    it "returns true if value does not contain '%{reply_key}' but 'find_related_post_with_key' is also disabled" do
+      SiteSetting.expects(:find_related_post_with_key).returns(false)
+      expect(validator.valid_value?('foo@bar.com')).to eq(true)
+    end
+
     it "returns false if value is the same as SiteSetting.notification_email" do
       SiteSetting.expects(:notification_email).returns("foo@bar.com")
       expect(validator.valid_value?('foo+%{reply_key}@bar.com')).to eq(false)
diff --git a/spec/components/validators/topic_title_length_validator_spec.rb b/spec/components/validators/topic_title_length_validator_spec.rb
index 58068ae7f2c..dc39cca0eb3 100644
--- a/spec/components/validators/topic_title_length_validator_spec.rb
+++ b/spec/components/validators/topic_title_length_validator_spec.rb
@@ -52,14 +52,14 @@ describe TopicTitleLengthValidator do
   describe 'private message' do
     let(:record) { Fabricate.build(:private_message_topic) }
 
-    it 'adds an error when topic title is shorter than SiteSetting.min_private_message_title_length' do
-      record.title = 'a' * (SiteSetting.min_private_message_title_length - 1)
+    it 'adds an error when topic title is shorter than SiteSetting.min_personal_message_title_length' do
+      record.title = 'a' * (SiteSetting.min_personal_message_title_length - 1)
       validate
       expect(record.errors[:title]).to be_present
     end
 
     it 'does not add an error when topic title is shorter than SiteSetting.min_topic_title_length' do
-      record.title = 'a' * (SiteSetting.min_private_message_title_length)
+      record.title = 'a' * (SiteSetting.min_personal_message_title_length)
       validate
       expect(record.errors[:title]).to_not be_present
     end
diff --git a/spec/components/validators/upload_validator_spec.rb b/spec/components/validators/upload_validator_spec.rb
new file mode 100644
index 00000000000..77dd4a1f0c0
--- /dev/null
+++ b/spec/components/validators/upload_validator_spec.rb
@@ -0,0 +1,27 @@
+require 'rails_helper'
+
+describe Validators::UploadValidator do
+  subject(:validator) { described_class.new }
+
+  describe 'validate' do
+    let(:user) { Fabricate(:user) }
+    let(:filename) { "discourse.csv" }
+    let(:csv_file) { file_from_fixtures(filename, "csv") }
+
+    it "should create an invalid upload when the filename is blank" do
+      SiteSetting.authorized_extensions = "*"
+      created_upload = UploadCreator.new(csv_file, nil).create_for(user.id)
+      validator.validate(created_upload)
+      expect(created_upload).to_not be_valid
+      expect(created_upload.errors.full_messages.first).to include(I18n.t("activerecord.errors.messages.blank"))
+    end
+
+    it "allows 'gz' as extension when uploading export file" do
+      SiteSetting.authorized_extensions = ""
+
+      created_upload = UploadCreator.new(csv_file, "#{filename}.gz", for_export: true).create_for(user.id)
+      expect(created_upload).to be_valid
+    end
+
+  end
+end
diff --git a/spec/controllers/admin/admin_controller_spec.rb b/spec/controllers/admin/admin_controller_spec.rb
index 54db42f3f96..f26b081a9d2 100644
--- a/spec/controllers/admin/admin_controller_spec.rb
+++ b/spec/controllers/admin/admin_controller_spec.rb
@@ -5,13 +5,12 @@ describe Admin::AdminController do
   context 'index' do
 
     it 'needs you to be logged in' do
-      expect do
-        get :index, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      get :index, format: :json
+      expect(response.status).to eq(403)
     end
 
     it "raises an error if you aren't an admin" do
-      user = log_in
+      _user = log_in
       get :index, format: :json
       expect(response).to be_forbidden
     end
diff --git a/spec/controllers/admin/backups_controller_spec.rb b/spec/controllers/admin/backups_controller_spec.rb
index d8adecf94d8..4f7a6c78946 100644
--- a/spec/controllers/admin/backups_controller_spec.rb
+++ b/spec/controllers/admin/backups_controller_spec.rb
@@ -248,7 +248,12 @@ describe Admin::BackupsController do
             expect(response.status).to eq(200)
             expect(response.body).to eq("")
           ensure
-            File.delete(File.join(Backup.base_directory, filename))
+            begin
+              File.delete(
+                File.join(Backup.base_directory, 'tmp', 'test', "#{filename}.part1")
+              )
+            rescue Errno::ENOENT
+            end
           end
         end
       end
diff --git a/spec/controllers/admin/badges_controller_spec.rb b/spec/controllers/admin/badges_controller_spec.rb
index 3fea129cf69..d5995aac40f 100644
--- a/spec/controllers/admin/badges_controller_spec.rb
+++ b/spec/controllers/admin/badges_controller_spec.rb
@@ -48,6 +48,8 @@ describe Admin::BadgesController do
         expect(response.status).to eq(200)
         expect(json["badge"]["name"]).to eq('test')
         expect(json["badge"]["query"]).to eq('select 1 as user_id, null as granted_at')
+
+        expect(UserHistory.where(acting_user_id: user.id, action: UserHistory.actions[:create_badge]).exists?).to eq(true)
       end
     end
 
@@ -83,14 +85,11 @@ describe Admin::BadgesController do
     end
 
     context '.destroy' do
-      it 'returns success' do
-        delete :destroy, params: { id: badge.id }, format: :json
-        expect(response).to be_success
-      end
-
       it 'deletes the badge' do
         delete :destroy, params: { id: badge.id }, format: :json
-        expect(Badge.where(id: badge.id).count).to eq(0)
+        expect(response).to be_success
+        expect(Badge.where(id: badge.id).exists?).to eq(false)
+        expect(UserHistory.where(acting_user_id: user.id, action: UserHistory.actions[:delete_badge]).exists?).to eq(true)
       end
     end
 
@@ -108,6 +107,8 @@ describe Admin::BadgesController do
         expect(response).to be_success
         editor_badge.reload
         expect(editor_badge.name).to eq(editor_badge_name)
+
+        expect(UserHistory.where(acting_user_id: user.id, action: UserHistory.actions[:change_badge]).exists?).to eq(true)
       end
 
       it 'does not allow query updates if badge_sql is disabled' do
diff --git a/spec/controllers/admin/email_controller_spec.rb b/spec/controllers/admin/email_controller_spec.rb
index e778f8b7d95..0b0c2ffca2d 100644
--- a/spec/controllers/admin/email_controller_spec.rb
+++ b/spec/controllers/admin/email_controller_spec.rb
@@ -83,7 +83,6 @@ describe Admin::EmailController do
   context '#handle_mail' do
     before do
       log_in_user(Fabricate(:admin))
-      SiteSetting.queue_jobs = true
     end
 
     it 'should enqueue the right job' do
diff --git a/spec/controllers/admin/groups_controller_spec.rb b/spec/controllers/admin/groups_controller_spec.rb
deleted file mode 100644
index e8ecd77c0ac..00000000000
--- a/spec/controllers/admin/groups_controller_spec.rb
+++ /dev/null
@@ -1,128 +0,0 @@
-require 'rails_helper'
-
-describe Admin::GroupsController do
-  let(:user) { Fabricate(:user) }
-  let(:group) { Fabricate(:group) }
-
-  before do
-    @admin = log_in(:admin)
-  end
-
-  it "is a subclass of AdminController" do
-    expect(Admin::GroupsController < Admin::AdminController).to eq(true)
-  end
-
-  context ".bulk" do
-    it "can assign users to a group by email or username" do
-      group = Fabricate(:group, name: "test", primary_group: true, title: 'WAT', grant_trust_level: 3)
-      user = Fabricate(:user, trust_level: 2)
-      user2 = Fabricate(:user, trust_level: 4)
-
-      put :bulk_perform, params: {
-        group_id: group.id, users: [user.username.upcase, user2.email, 'doesnt_exist']
-      }, format: :json
-
-      expect(response).to be_success
-
-      user.reload
-      expect(user.primary_group).to eq(group)
-      expect(user.title).to eq("WAT")
-      expect(user.trust_level).to eq(3)
-
-      user2.reload
-      expect(user2.primary_group).to eq(group)
-      expect(user2.title).to eq("WAT")
-      expect(user2.trust_level).to eq(4)
-
-      # verify JSON response
-      json = ::JSON.parse(response.body)
-      expect(json['message']).to eq("2 users have been added to the group.")
-      expect(json['users_not_added'][0]).to eq("doesnt_exist")
-    end
-  end
-
-  context "#update" do
-    it 'should update a group' do
-      group.add_owner(user)
-
-      expect do
-        put :update, params: {
-          id: group.id,
-          group: {
-            visibility_level: Group.visibility_levels[:owners],
-            allow_membership_requests: "true"
-          }
-        }, format: :json
-
-      end.to change { GroupHistory.count }.by(2)
-
-      expect(response).to be_success
-
-      group.reload
-
-      expect(group.visibility_level).to eq(Group.visibility_levels[:owners])
-      expect(group.allow_membership_requests).to eq(true)
-    end
-
-    it "ignore name change on automatic group" do
-      put :update, params: { id: 1, group: { name: "WAT" } }, format: :json
-      expect(response).to be_success
-
-      group = Group.find(1)
-      expect(group.name).not_to eq("WAT")
-    end
-
-    it "doesn't launch the 'automatic group membership' job when it's not retroactive" do
-      Jobs.expects(:enqueue).never
-      group = Fabricate(:group)
-
-      put :update, params: {
-        id: group.id, group: { automatic_membership_retroactive: "false" }
-      }, format: :json
-
-      expect(response).to be_success
-    end
-
-    it "launches the 'automatic group membership' job when it's retroactive" do
-      group = Fabricate(:group)
-      Jobs.expects(:enqueue).with(:automatic_group_membership, group_id: group.id)
-
-      put :update, params: {
-        id: group.id, group: { automatic_membership_retroactive: "true" }
-      }, format: :json
-
-      expect(response).to be_success
-    end
-
-  end
-
-  context ".destroy" do
-
-    it "returns a 422 if the group is automatic" do
-      group = Fabricate(:group, automatic: true)
-      delete :destroy, params: { id: group.id }, format: :json
-      expect(response.status).to eq(422)
-      expect(Group.where(id: group.id).count).to eq(1)
-    end
-
-    it "is able to destroy a non-automatic group" do
-      group = Fabricate(:group)
-      delete :destroy, params: { id: group.id }, format: :json
-      expect(response.status).to eq(200)
-      expect(Group.where(id: group.id).count).to eq(0)
-    end
-
-  end
-
-  context ".refresh_automatic_groups" do
-
-    it "is able to refresh automatic groups" do
-      Group.expects(:refresh_automatic_groups!).returns(true)
-
-      post :refresh_automatic_groups, format: :json
-      expect(response.status).to eq(200)
-    end
-
-  end
-
-end
diff --git a/spec/controllers/admin/site_texts_controller_spec.rb b/spec/controllers/admin/site_texts_controller_spec.rb
index fe3f30def61..7a1676a8315 100644
--- a/spec/controllers/admin/site_texts_controller_spec.rb
+++ b/spec/controllers/admin/site_texts_controller_spec.rb
@@ -125,6 +125,34 @@ describe Admin::SiteTextsController do
         expect(log.new_value).to eq(original_title)
         expect(log.action).to eq(UserHistory.actions[:change_site_text])
       end
+
+      it 'returns site texts for the correct locale' do
+        SiteSetting.default_locale = :ru
+
+        ru_title = 'title ru'
+        ru_mf_text = 'ru {NUM_RESULTS, plural, one {1 result} other {many} }'
+
+        put :update, params: { id: 'title', site_text: { value: ru_title } }, format: :json
+        put :update, params: { id: 'js.topic.read_more_MF', site_text: { value: ru_mf_text } }, format: :json
+
+        get :show, params: { id: 'title' }, format: :json
+        json = ::JSON.parse(response.body)
+        expect(json['site_text']['value']).to eq(ru_title)
+
+        get :show, params: { id: 'js.topic.read_more_MF' }, format: :json
+        json = ::JSON.parse(response.body)
+        expect(json['site_text']['value']).to eq(ru_mf_text)
+
+        SiteSetting.default_locale = :en
+
+        get :show, params: { id: 'title' }, format: :json
+        json = ::JSON.parse(response.body)
+        expect(json['site_text']['value']).to_not eq(ru_title)
+
+        get :show, params: { id: 'js.topic.read_more_MF' }, format: :json
+        json = ::JSON.parse(response.body)
+        expect(json['site_text']['value']).to_not eq(ru_mf_text)
+      end
     end
   end
 
diff --git a/spec/controllers/admin/staff_action_logs_controller_spec.rb b/spec/controllers/admin/staff_action_logs_controller_spec.rb
index d1e302bd1f7..3da6dfa1587 100644
--- a/spec/controllers/admin/staff_action_logs_controller_spec.rb
+++ b/spec/controllers/admin/staff_action_logs_controller_spec.rb
@@ -12,7 +12,7 @@ describe Admin::StaffActionLogsController do
     it 'generates logs' do
 
       topic = Fabricate(:topic)
-      _record = StaffActionLogger.new(Discourse.system_user).log_topic_deletion(topic)
+      _record = StaffActionLogger.new(Discourse.system_user).log_topic_delete_recover(topic, "delete_topic")
 
       get :index, params: { action_id: UserHistory.actions[:delete_topic] }, format: :json
 
diff --git a/spec/controllers/admin/themes_controller_spec.rb b/spec/controllers/admin/themes_controller_spec.rb
index 1418f165a8f..c2c00b78df3 100644
--- a/spec/controllers/admin/themes_controller_spec.rb
+++ b/spec/controllers/admin/themes_controller_spec.rb
@@ -12,6 +12,15 @@ describe Admin::ThemesController do
       @user = log_in(:admin)
     end
 
+    context '.generate_key_pair' do
+      it 'can generate key pairs' do
+        post :generate_key_pair, format: :json
+        json = JSON.parse(response.body)
+        expect(json["private_key"]).to include("RSA PRIVATE KEY")
+        expect(json["public_key"]).to include("ssh-rsa ")
+      end
+    end
+
     context '.upload_asset' do
       render_views
 
diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb
index 80f9a865a00..d026d7bfb53 100644
--- a/spec/controllers/admin/users_controller_spec.rb
+++ b/spec/controllers/admin/users_controller_spec.rb
@@ -12,7 +12,7 @@ describe Admin::UsersController do
       @user = log_in(:admin)
     end
 
-    context '.index' do
+    context '#index' do
       it 'returns success' do
         get :index, format: :json
         expect(response).to be_success
@@ -44,7 +44,7 @@ describe Admin::UsersController do
       end
     end
 
-    describe '.show' do
+    describe '#show' do
       context 'an existing user' do
         it 'returns success' do
           get :show, params: { id: @user.id }, format: :json
@@ -60,7 +60,7 @@ describe Admin::UsersController do
       end
     end
 
-    context '.approve_bulk' do
+    context '#approve_bulk' do
 
       let(:evil_trout) { Fabricate(:evil_trout) }
 
@@ -83,7 +83,7 @@ describe Admin::UsersController do
 
     end
 
-    context '.generate_api_key' do
+    context '#generate_api_key' do
       let(:evil_trout) { Fabricate(:evil_trout) }
 
       it 'calls generate_api_key' do
@@ -92,7 +92,7 @@ describe Admin::UsersController do
       end
     end
 
-    context '.revoke_api_key' do
+    context '#revoke_api_key' do
 
       let(:evil_trout) { Fabricate(:evil_trout) }
 
@@ -103,7 +103,7 @@ describe Admin::UsersController do
 
     end
 
-    context '.approve' do
+    context '#approve' do
 
       let(:evil_trout) { Fabricate(:evil_trout) }
 
@@ -120,7 +120,7 @@ describe Admin::UsersController do
 
     end
 
-    context '.suspend' do
+    context '#suspend' do
       let(:user) { Fabricate(:evil_trout) }
 
       it "works properly" do
@@ -148,24 +148,42 @@ describe Admin::UsersController do
         expect(log.details).to match(/because I said so/)
       end
 
-      it "can have an associated post" do
-        post = Fabricate(:post)
-
-        put(
-          :suspend,
-          params: {
-            user_id: user.id,
+      context "with an associated post" do
+        let(:post) { Fabricate(:post) }
+        let(:suspend_params) do
+          { user_id: user.id,
             suspend_until: 5.hours.from_now,
             reason: "because of this post",
             post_id: post.id,
-            format: :json
-          }
-        )
-        expect(response).to be_success
+            format: :json }
+        end
 
-        log = UserHistory.where(target_user_id: user.id).order('id desc').first
-        expect(log).to be_present
-        expect(log.post_id).to eq(post.id)
+        it "can have an associated post" do
+          put(:suspend, params: suspend_params)
+          expect(response).to be_success
+
+          log = UserHistory.where(target_user_id: user.id).order('id desc').first
+          expect(log).to be_present
+          expect(log.post_id).to eq(post.id)
+        end
+
+        it "can delete an associated post" do
+          put(:suspend, params: suspend_params.merge(post_action: 'delete'))
+          post.reload
+          expect(post.deleted_at).to be_present
+          expect(response).to be_success
+        end
+
+        it "can edit an associated post" do
+          put(:suspend, params: suspend_params.merge(
+            post_action: 'edit',
+            post_edit: 'this is the edited content'
+          ))
+          post.reload
+          expect(post.deleted_at).to be_blank
+          expect(post.raw).to eq("this is the edited content")
+          expect(response).to be_success
+        end
       end
 
       it "can send a message to the user" do
@@ -202,7 +220,7 @@ describe Admin::UsersController do
 
     end
 
-    context '.revoke_admin' do
+    context '#revoke_admin' do
       before do
         @another_admin = Fabricate(:admin)
       end
@@ -220,7 +238,7 @@ describe Admin::UsersController do
       end
     end
 
-    context '.grant_admin' do
+    context '#grant_admin' do
       before do
         @another_user = Fabricate(:coding_horror)
       end
@@ -247,7 +265,7 @@ describe Admin::UsersController do
       end
     end
 
-    context '.add_group' do
+    context '#add_group' do
       let(:user) { Fabricate(:user) }
       let(:group) { Fabricate(:group) }
 
@@ -274,7 +292,7 @@ describe Admin::UsersController do
       end
     end
 
-    context '.primary_group' do
+    context '#primary_group' do
       let(:group) { Fabricate(:group) }
 
       before do
@@ -329,7 +347,7 @@ describe Admin::UsersController do
       end
     end
 
-    context '.trust_level' do
+    context '#trust_level' do
       before do
         @another_user = Fabricate(:coding_horror, created_at: 1.month.ago)
       end
@@ -383,7 +401,7 @@ describe Admin::UsersController do
       end
     end
 
-    describe '.revoke_moderation' do
+    describe '#revoke_moderation' do
       before do
         @moderator = Fabricate(:moderator)
       end
@@ -407,7 +425,7 @@ describe Admin::UsersController do
       end
     end
 
-    context '.grant_moderation' do
+    context '#grant_moderation' do
       before do
         @another_user = Fabricate(:coding_horror)
       end
@@ -430,7 +448,7 @@ describe Admin::UsersController do
       end
     end
 
-    context '.reject_bulk' do
+    context '#reject_bulk' do
       let(:reject_me)     { Fabricate(:user) }
       let(:reject_me_too) { Fabricate(:user) }
 
@@ -496,7 +514,7 @@ describe Admin::UsersController do
       end
     end
 
-    context '.destroy' do
+    context '#destroy' do
       let(:delete_me) { Fabricate(:user) }
 
       it "returns a 403 if the user doesn't exist" do
@@ -511,9 +529,11 @@ describe Admin::UsersController do
           _post = create_post(topic: topic, user: delete_me)
         end
 
-        it "returns an error" do
+        it "returns an api response that the user can't be deleted because it has posts" do
           delete :destroy, params: { id: delete_me.id }, format: :json
           expect(response).to be_forbidden
+          json = ::JSON.parse(response.body)
+          expect(json['deleted']).to eq(false)
         end
 
         it "doesn't return an error if delete_posts == true" do
@@ -597,6 +617,31 @@ describe Admin::UsersController do
         expect(@reg_user).to be_silenced
       end
 
+      it "can have an associated post" do
+        silence_post = Fabricate(:post, user: @reg_user)
+
+        put :silence, params: {
+          user_id: @reg_user.id,
+          post_id: silence_post.id,
+          post_action: 'edit',
+          post_edit: "this is the new contents for the post"
+        }, format: :json
+        expect(response).to be_success
+
+        silence_post.reload
+        expect(silence_post.raw).to eq("this is the new contents for the post")
+
+        log = UserHistory.where(
+          target_user_id: @reg_user.id,
+          action: UserHistory.actions[:silence_user]
+        ).first
+        expect(log).to be_present
+        expect(log.post_id).to eq(silence_post.id)
+
+        @reg_user.reload
+        expect(@reg_user).to be_silenced
+      end
+
       it "will set a length of time if provided" do
         future_date = 1.month.from_now.to_date
         put(
diff --git a/spec/controllers/categories_controller_spec.rb b/spec/controllers/categories_controller_spec.rb
index f0cca3fa944..695f06c41bf 100644
--- a/spec/controllers/categories_controller_spec.rb
+++ b/spec/controllers/categories_controller_spec.rb
@@ -4,11 +4,13 @@ describe CategoriesController do
   describe "create" do
 
     it "requires the user to be logged in" do
-      expect { post :create, format: :json }.to raise_error(Discourse::NotLoggedIn)
+      post :create, format: :json
+      expect(response.status).to eq(403)
     end
 
     describe "logged in" do
       before do
+        SiteSetting.queue_jobs = false
         @user = log_in(:admin)
       end
 
@@ -48,8 +50,6 @@ describe CategoriesController do
           }, format: :json
         end
 
-        it { is_expected.not_to respond_with(:success) }
-
         it "returns errors on a duplicate category name" do
           expect(response.status).to eq(422)
         end
@@ -90,8 +90,8 @@ describe CategoriesController do
   describe "destroy" do
 
     it "requires the user to be logged in" do
-      expect { delete :destroy, params: { id: "category" }, format: :json }
-        .to raise_error(Discourse::NotLoggedIn)
+      delete :destroy, params: { id: "category" }, format: :json
+      expect(response.status).to eq(403)
     end
 
     describe "logged in" do
@@ -156,9 +156,13 @@ describe CategoriesController do
   end
 
   describe "update" do
+    before do
+      SiteSetting.queue_jobs = false
+    end
 
     it "requires the user to be logged in" do
-      expect { put :update, params: { id: 'category' }, format: :json }.to raise_error(Discourse::NotLoggedIn)
+      put :update, params: { id: 'category' }, format: :json
+      expect(response.status).to eq(403)
     end
 
     describe "logged in" do
@@ -302,9 +306,8 @@ describe CategoriesController do
 
   describe 'update_slug' do
     it 'requires the user to be logged in' do
-      expect do
-        put :update_slug, params: { category_id: 'category' }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      put :update_slug, params: { category_id: 'category' }, format: :json
+      expect(response.status).to eq(403)
     end
 
     describe 'logged in' do
diff --git a/spec/controllers/category_hashtags_controller_spec.rb b/spec/controllers/category_hashtags_controller_spec.rb
index 56d9b50565a..f177811df2c 100644
--- a/spec/controllers/category_hashtags_controller_spec.rb
+++ b/spec/controllers/category_hashtags_controller_spec.rb
@@ -44,9 +44,8 @@ describe CategoryHashtagsController do
 
     describe "not logged in" do
       it 'raises an exception' do
-        expect do
-          get :check, params: { category_slugs: [] }, format: :json
-        end.to raise_error(Discourse::NotLoggedIn)
+        get :check, params: { category_slugs: [] }, format: :json
+        expect(response.status).to eq(403)
       end
     end
   end
diff --git a/spec/controllers/clicks_controller_spec.rb b/spec/controllers/clicks_controller_spec.rb
index 238199db0b2..67650b2eb85 100644
--- a/spec/controllers/clicks_controller_spec.rb
+++ b/spec/controllers/clicks_controller_spec.rb
@@ -5,15 +5,13 @@ describe ClicksController do
   context 'create' do
 
     context 'missing params' do
-      it 'raises a 404 without the url param' do
-        get :track, params: { post_id: 123 }, format: :json
+
+      it 'raises a 404 without a url' do
+        get :track, params: { post_id: 123 }
+
         expect(response).to be_not_found
       end
 
-      it "redirects to the url even without the topic_id or post_id params" do
-        get :track, params: { url: 'http://google.com' }, format: :json
-        expect(response).not_to be_redirect
-      end
     end
 
     context 'correct params' do
@@ -24,24 +22,23 @@ describe ClicksController do
       end
 
       context "with a made up url" do
+        render_views
+
         it "doesn't redirect" do
           TopicLinkClick.expects(:create_from).returns(nil)
 
-          get :track,
-            params: { url: 'http://discourse.org', post_id: 123 },
-            format: :json
+          get :track, params: { url: 'http://discourse.org', post_id: 123 }
 
           expect(response).not_to be_redirect
+          expect(response.body).to include(I18n.t("redirect_warning"))
         end
       end
 
-      context "with a query string" do
+      context "with a valid url" do
         it "redirects" do
           TopicLinkClick.expects(:create_from).with(has_entries('url' => 'http://discourse.org/?hello=123')).returns(url)
 
-          get :track, params: {
-            url: 'http://discourse.org/?hello=123', post_id: 123, format: :json
-          }
+          get :track, params: { url: 'http://discourse.org/?hello=123', post_id: 123 }
 
           expect(response).to redirect_to(url)
         end
@@ -51,7 +48,7 @@ describe ClicksController do
         it 'redirects' do
           TopicLinkClick.expects(:create_from).with('url' => url, 'post_id' => '123', 'ip' => '192.168.0.1').returns(url)
 
-          get :track, params: { url: url, post_id: 123, format: :json }
+          get :track, params: { url: url, post_id: 123 }
 
           expect(response).to redirect_to(url)
         end
@@ -60,7 +57,7 @@ describe ClicksController do
           log_in(:admin)
           whisper = Fabricate(:post, post_type: Post.types[:whisper])
 
-          get :track, params: { url: url, post_id: whisper.id, format: :json }
+          get :track, params: { url: url, post_id: whisper.id }
 
           expect(response).to redirect_to(url)
         end
@@ -68,9 +65,7 @@ describe ClicksController do
         it "doesn't redirect with the redirect=false param" do
           TopicLinkClick.expects(:create_from).with('url' => url, 'post_id' => '123', 'ip' => '192.168.0.1', 'redirect' => 'false').returns(url)
 
-          get :track, params: {
-            url: url, post_id: 123, redirect: 'false', format: :json
-          }
+          get :track, params: { url: url, post_id: 123, redirect: 'false' }
 
           expect(response).not_to be_redirect
         end
@@ -79,7 +74,9 @@ describe ClicksController do
       context 'with a topic_id' do
         it 'redirects' do
           TopicLinkClick.expects(:create_from).with('url' => url, 'topic_id' => '789', 'ip' => '192.168.0.1').returns(url)
-          get :track, params: { url: url, topic_id: 789, format: :json }
+
+          get :track, params: { url: url, topic_id: 789 }
+
           expect(response).to redirect_to(url)
         end
       end
diff --git a/spec/controllers/composer_messages_controller_spec.rb b/spec/controllers/composer_messages_controller_spec.rb
index 5f22deda8e2..c2333fa33fc 100644
--- a/spec/controllers/composer_messages_controller_spec.rb
+++ b/spec/controllers/composer_messages_controller_spec.rb
@@ -5,7 +5,8 @@ describe ComposerMessagesController do
   context '.index' do
 
     it 'requires you to be logged in' do
-      expect { get :index, format: :json }.to raise_error(Discourse::NotLoggedIn)
+      get :index, format: :json
+      expect(response.status).to eq(403)
     end
 
     context 'when logged in' do
diff --git a/spec/controllers/draft_controller_spec.rb b/spec/controllers/draft_controller_spec.rb
index fd8912caa7c..d7e63615f2f 100644
--- a/spec/controllers/draft_controller_spec.rb
+++ b/spec/controllers/draft_controller_spec.rb
@@ -3,7 +3,8 @@ require 'rails_helper'
 describe DraftController do
 
   it 'requires you to be logged in' do
-    expect { post :update }.to raise_error(Discourse::NotLoggedIn)
+    post :update
+    expect(response.status).to eq(403)
   end
 
   it 'saves a draft on update' do
diff --git a/spec/controllers/email_controller_spec.rb b/spec/controllers/email_controller_spec.rb
index 4a1a03994f7..4fdab4cca6d 100644
--- a/spec/controllers/email_controller_spec.rb
+++ b/spec/controllers/email_controller_spec.rb
@@ -5,7 +5,8 @@ describe EmailController do
   context '.preferences_redirect' do
 
     it 'requires you to be logged in' do
-      expect { get :preferences_redirect, format: :json }.to raise_error(Discourse::NotLoggedIn)
+      get :preferences_redirect, format: :json
+      expect(response.status).to eq(403)
     end
 
     context 'when logged in' do
@@ -19,135 +20,6 @@ describe EmailController do
 
   end
 
-  context '.perform unsubscribe' do
-    it 'raises not found on invalid key' do
-      post :perform_unsubscribe, params: { key: "123" }, format: :json
-      expect(response.status).to eq(404)
-    end
-
-    it 'can fully unsubscribe' do
-      user = Fabricate(:user)
-      key = UnsubscribeKey.create_key_for(user, "all")
-
-      user.user_option.update_columns(email_always: true,
-                                      email_digests: true,
-                                      email_direct: true,
-                                      email_private_messages: true)
-
-      post :perform_unsubscribe,
-        params: { key: key, unsubscribe_all: "1" },
-        format: :json
-
-      expect(response.status).to eq(302)
-
-      user.user_option.reload
-
-      expect(user.user_option.email_always).to eq(false)
-      expect(user.user_option.email_digests).to eq(false)
-      expect(user.user_option.email_direct).to eq(false)
-      expect(user.user_option.email_private_messages).to eq(false)
-
-    end
-
-    it 'can disable mailing list' do
-      user = Fabricate(:user)
-      key = UnsubscribeKey.create_key_for(user, "all")
-
-      user.user_option.update_columns(mailing_list_mode: true)
-
-      post :perform_unsubscribe,
-        params: { key: key, disable_mailing_list: "1" },
-        format: :json
-
-      expect(response.status).to eq(302)
-
-      user.user_option.reload
-
-      expect(user.user_option.mailing_list_mode).to eq(false)
-    end
-
-    it 'can disable digest' do
-      user = Fabricate(:user)
-      key = UnsubscribeKey.create_key_for(user, "all")
-
-      user.user_option.update_columns(email_digests: true)
-
-      post :perform_unsubscribe,
-        params: { key: key, disable_digest_emails: "1" },
-        format: :json
-
-      expect(response.status).to eq(302)
-
-      user.user_option.reload
-
-      expect(user.user_option.email_digests).to eq(false)
-    end
-
-    it 'can unwatch topic' do
-      p = Fabricate(:post)
-      key = UnsubscribeKey.create_key_for(p.user, p)
-
-      TopicUser.change(p.user_id, p.topic_id, notification_level: TopicUser.notification_levels[:watching])
-
-      post :perform_unsubscribe,
-        params: { key: key, unwatch_topic: "1" },
-        format: :json
-
-      expect(response.status).to eq(302)
-
-      expect(TopicUser.get(p.topic, p.user).notification_level).to eq(TopicUser.notification_levels[:tracking])
-    end
-
-    it 'can mute topic' do
-      p = Fabricate(:post)
-      key = UnsubscribeKey.create_key_for(p.user, p)
-
-      TopicUser.change(p.user_id, p.topic_id, notification_level: TopicUser.notification_levels[:watching])
-
-      post :perform_unsubscribe,
-        params: { key: key, mute_topic: "1" },
-        format: :json
-
-      expect(response.status).to eq(302)
-
-      expect(TopicUser.get(p.topic, p.user).notification_level).to eq(TopicUser.notification_levels[:muted])
-    end
-
-    it 'can unwatch category' do
-      p = Fabricate(:post)
-      key = UnsubscribeKey.create_key_for(p.user, p)
-
-      cu = CategoryUser.create!(user_id: p.user.id,
-                                category_id: p.topic.category_id,
-                                notification_level: CategoryUser.notification_levels[:watching])
-
-      post :perform_unsubscribe,
-        params: { key: key, unwatch_category: "1" },
-        format: :json
-
-      expect(response.status).to eq(302)
-
-      expect(CategoryUser.find_by(id: cu.id)).to eq(nil)
-    end
-
-    it 'can unwatch first post from category' do
-      p = Fabricate(:post)
-      key = UnsubscribeKey.create_key_for(p.user, p)
-
-      cu = CategoryUser.create!(user_id: p.user.id,
-                                category_id: p.topic.category_id,
-                                notification_level: CategoryUser.notification_levels[:watching_first_post])
-
-      post :perform_unsubscribe,
-        params: { key: key, unwatch_category: "1" },
-        format: :json
-
-      expect(response.status).to eq(302)
-
-      expect(CategoryUser.find_by(id: cu.id)).to eq(nil)
-    end
-  end
-
   context '.unsubscribe' do
 
     render_views
diff --git a/spec/controllers/export_csv_controller_spec.rb b/spec/controllers/export_csv_controller_spec.rb
index 53d5be2ea14..2e1256653c9 100644
--- a/spec/controllers/export_csv_controller_spec.rb
+++ b/spec/controllers/export_csv_controller_spec.rb
@@ -3,15 +3,6 @@ require "rails_helper"
 describe ExportCsvController do
   let(:export_filename) { "user-archive-codinghorror-150115-234817-999.csv.gz" }
 
-  context "while not logged in" do
-    describe ".download" do
-      it "returns 404 when the unauthorized user tries to export csv file" do
-        get :show, params: { id: export_filename }
-        expect(response.status).to eq(404)
-      end
-    end
-  end
-
   context "while logged in as normal user" do
     before { @user = log_in(:user) }
 
@@ -34,30 +25,6 @@ describe ExportCsvController do
         expect(response).not_to be_success
       end
     end
-
-    describe ".download" do
-      it "uses send_file to transmit the export file" do
-        file = UserExport.create(file_name: "user-archive-codinghorror-150116-003249", user_id: @user.id)
-        file_name = "user-archive-codinghorror-150116-003249-#{file.id}.csv.gz"
-        controller.stubs(:render)
-        export = UserExport.new()
-        UserExport.expects(:get_download_path).with(file_name).returns(export)
-        subject.expects(:send_file).with(export)
-        get :show, params: { id: file_name }
-        expect(response).to be_success
-      end
-
-      it "returns 404 when the user tries to export another user's csv file" do
-        get :show, params: { id: export_filename }
-        expect(response).to be_not_found
-      end
-
-      it "returns 404 when the export file does not exist" do
-        UserExport.expects(:get_download_path).returns(nil)
-        get :show, params: { id: export_filename }
-        expect(response).to be_not_found
-      end
-    end
   end
 
   context "while logged in as an admin" do
@@ -77,25 +44,5 @@ describe ExportCsvController do
         expect(response).to be_success
       end
     end
-
-    describe ".download" do
-      it "uses send_file to transmit the export file" do
-        file = UserExport.create(file_name: "screened-email-150116-010145", user_id: @admin.id)
-        file_name = "screened-email-150116-010145-#{file.id}.csv.gz"
-        controller.stubs(:render)
-        export = UserExport.new()
-        UserExport.expects(:get_download_path).with(file_name).returns(export)
-        subject.expects(:send_file).with(export)
-        get :show, params: { id: file_name }
-        expect(response).to be_success
-      end
-
-      it "returns 404 when the export file does not exist" do
-        UserExport.expects(:get_download_path).returns(nil)
-        get :show, params: { id: export_filename }
-        expect(response).to be_not_found
-      end
-    end
   end
-
 end
diff --git a/spec/controllers/extra_locales_controller_spec.rb b/spec/controllers/extra_locales_controller_spec.rb
index 8ec2784ead2..c3aa308d517 100644
--- a/spec/controllers/extra_locales_controller_spec.rb
+++ b/spec/controllers/extra_locales_controller_spec.rb
@@ -4,6 +4,16 @@ describe ExtraLocalesController do
 
   context 'show' do
 
+    it "caches for 24 hours if version is provided and it matches current hash" do
+      get :show, params: { bundle: 'admin', v: ExtraLocalesController.bundle_js_hash('admin') }
+      expect(response.headers["Cache-Control"]).to eq("max-age=86400, public, immutable")
+    end
+
+    it "does not cache at all if version is invalid" do
+      get :show, params: { bundle: 'admin', v: 'a' * 32 }
+      expect(response.headers["Cache-Control"]).not_to eq("max-age=86400, public, immutable")
+    end
+
     it "needs a valid bundle" do
       get :show, params: { bundle: 'made-up-bundle' }
       expect(response).to_not be_success
diff --git a/spec/controllers/finish_installation_controller_spec.rb b/spec/controllers/finish_installation_controller_spec.rb
index ea222c9bc21..e239a9af302 100644
--- a/spec/controllers/finish_installation_controller_spec.rb
+++ b/spec/controllers/finish_installation_controller_spec.rb
@@ -50,13 +50,12 @@ describe FinishInstallationController do
       end
 
       it "raises an error when the email is not in the allowed list" do
-        expect do
-          post :register, params: {
-            email: 'notrobin@example.com',
-            username: 'eviltrout',
-            password: 'disismypasswordokay'
-          }, format: :json
-        end.to raise_error(Discourse::InvalidParameters)
+        post :register, params: {
+          email: 'notrobin@example.com',
+          username: 'eviltrout',
+          password: 'disismypasswordokay'
+        }, format: :json
+        expect(response.status).to eq(400)
       end
 
       it "doesn't redirect when fields are wrong" do
diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb
deleted file mode 100644
index 05b082a9351..00000000000
--- a/spec/controllers/groups_controller_spec.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-require 'rails_helper'
-
-describe GroupsController do
-  let(:group) { Fabricate(:group) }
-
-  describe 'show' do
-    it "ensures the group can be seen" do
-      Guardian.any_instance.expects(:can_see?).with(group).returns(false)
-      get :show, params: { id: group.name }, format: :json
-      expect(response).not_to be_success
-    end
-
-    it "responds with JSON" do
-      Guardian.any_instance.expects(:can_see?).with(group).returns(true)
-      get :show, params: { id: group.name }, format: :json
-      expect(response).to be_success
-      expect(::JSON.parse(response.body)['basic_group']['id']).to eq(group.id)
-    end
-
-    it "works even with an upper case group name" do
-      Guardian.any_instance.expects(:can_see?).with(group).returns(true)
-      get :show, params: { id: group.name.upcase }, format: :json
-      expect(response).to be_success
-      expect(::JSON.parse(response.body)['basic_group']['id']).to eq(group.id)
-    end
-  end
-
-  describe "posts" do
-    it "ensures the group can be seen" do
-      Guardian.any_instance.expects(:can_see?).with(group).returns(false)
-      get :posts, params: { group_id: group.name }, format: :json
-      expect(response).not_to be_success
-    end
-
-    it "calls `posts_for` and responds with JSON" do
-      Guardian.any_instance.expects(:can_see?).with(group).returns(true)
-      Group.any_instance.expects(:posts_for).returns(Group.none)
-      get :posts, params: { group_id: group.name }, format: :json
-      expect(response).to be_success
-    end
-  end
-
-  describe "members" do
-    it "ensures the group can be seen" do
-      Guardian.any_instance.expects(:can_see?).with(group).returns(false)
-      get :members, params: { group_id: group.name }, format: :json
-      expect(response).not_to be_success
-    end
-
-    it "calls `posts_for` and responds with JSON" do
-      Guardian.any_instance.expects(:can_see?).with(group).returns(true)
-      get :posts, params: { group_id: group.name }, format: :json
-      expect(response).to be_success
-    end
-
-    it "ensures that membership can be paginated" do
-      5.times { group.add(Fabricate(:user)) }
-      usernames = group.users.map { |m| m.username }.sort
-
-      get :members, params: { group_id: group.name, limit: 3 }, format: :json
-      expect(response).to be_success
-      members = JSON.parse(response.body)["members"]
-      expect(members.map { |m| m['username'] }).to eq(usernames[0..2])
-
-      get :members, params: { group_id: group.name, limit: 3, offset: 3 }, format: :json
-      expect(response).to be_success
-      members = JSON.parse(response.body)["members"]
-      expect(members.map { |m| m['username'] }).to eq(usernames[3..4])
-    end
-  end
-
-  describe '.posts_feed' do
-    it 'renders RSS' do
-      get :posts_feed, params: { group_id: group.name }, format: :rss
-      expect(response).to be_success
-      expect(response.content_type).to eq('application/rss+xml')
-    end
-  end
-
-  describe '.mentions_feed' do
-    it 'renders RSS' do
-      get :mentions_feed, params: { group_id: group.name }, format: :rss
-      expect(response).to be_success
-      expect(response.content_type).to eq('application/rss+xml')
-    end
-
-    it 'fails when disabled' do
-      SiteSetting.enable_mentions = false
-      get :mentions_feed, params: { group_id: group.name }, format: :rss
-      expect(response).not_to be_success
-    end
-  end
-
-end
diff --git a/spec/controllers/inline_onebox_controller_spec.rb b/spec/controllers/inline_onebox_controller_spec.rb
index 72ee3762e8a..e68387fa550 100644
--- a/spec/controllers/inline_onebox_controller_spec.rb
+++ b/spec/controllers/inline_onebox_controller_spec.rb
@@ -3,9 +3,8 @@ require 'rails_helper'
 describe InlineOneboxController do
 
   it "requires the user to be logged in" do
-    expect do
-      get :show, params: { urls: [] }, format: :json
-    end.to raise_error(Discourse::NotLoggedIn)
+    get :show, params: { urls: [] }, format: :json
+    expect(response.status).to eq(403)
   end
 
   context "logged in" do
diff --git a/spec/controllers/invites_controller_spec.rb b/spec/controllers/invites_controller_spec.rb
index 28266d4531a..6433a2de7fd 100644
--- a/spec/controllers/invites_controller_spec.rb
+++ b/spec/controllers/invites_controller_spec.rb
@@ -2,41 +2,13 @@ require 'rails_helper'
 
 describe InvitesController do
 
-  context '.show' do
-    render_views
-
-    it "shows error if invite not found" do
-      get :show, params: { id: 'nopeNOPEnope' }
-
-      expect(response).to be_success
-
-      body = response.body
-
-      expect(body).to_not have_tag(:script, with: { src: '/assets/application.js' })
-      expect(CGI.unescapeHTML(body)).to include(I18n.t('invite.not_found'))
-    end
-
-    it "renders the accept invite page if invite exists" do
-      i = Fabricate(:invite)
-      get :show, params: { id: i.invite_key }
-
-      expect(response).to be_success
-
-      body = response.body
-
-      expect(body).to have_tag(:script, with: { src: '/assets/application.js' })
-      expect(CGI.unescapeHTML(body)).to_not include(I18n.t('invite.not_found'))
-    end
-  end
-
   context '.destroy' do
 
     it 'requires you to be logged in' do
-      expect do
-        delete :destroy,
-          params: { email: 'jake@adventuretime.ooo' },
-          format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      delete :destroy,
+        params: { email: 'jake@adventuretime.ooo' },
+        format: :json
+      expect(response.status).to eq(403)
     end
 
     context 'while logged in' do
@@ -49,15 +21,13 @@ describe InvitesController do
       end
 
       it "raises an error when the email cannot be found" do
-        expect do
-          delete :destroy, params: { email: 'finn@adventuretime.ooo' }, format: :json
-        end.to raise_error(Discourse::InvalidParameters)
+        delete :destroy, params: { email: 'finn@adventuretime.ooo' }, format: :json
+        expect(response.status).to eq(400)
       end
 
       it 'raises an error when the invite is not yours' do
-        expect do
-          delete :destroy, params: { email: another_invite.email }, format: :json
-        end.to raise_error(Discourse::InvalidParameters)
+        delete :destroy, params: { email: another_invite.email }, format: :json
+        expect(response.status).to eq(400)
       end
 
       it "destroys the invite" do
@@ -71,9 +41,8 @@ describe InvitesController do
 
   context '#create' do
     it 'requires you to be logged in' do
-      expect do
-        post :create, params: { email: 'jake@adventuretime.ooo' }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      post :create, params: { email: 'jake@adventuretime.ooo' }, format: :json
+      expect(response.status).to eq(403)
     end
 
     context 'while logged in' do
@@ -136,11 +105,10 @@ describe InvitesController do
 
   context '.create_invite_link' do
     it 'requires you to be logged in' do
-      expect {
-        post :create_invite_link, params: {
-          email: 'jake@adventuretime.ooo'
-        }, format: :json
-      }.to raise_error(Discourse::NotLoggedIn)
+      post :create_invite_link, params: {
+        email: 'jake@adventuretime.ooo'
+      }, format: :json
+      expect(response.status).to eq(403)
     end
 
     context 'while logged in' do
@@ -363,9 +331,8 @@ describe InvitesController do
   context '.resend_invite' do
 
     it 'requires you to be logged in' do
-      expect {
-        delete :resend_invite, params: { email: 'first_name@example.com' }, format: :json
-      }.to raise_error(Discourse::NotLoggedIn)
+      delete :resend_invite, params: { email: 'first_name@example.com' }, format: :json
+      expect(response.status).to eq(403)
     end
 
     context 'while logged in' do
@@ -378,15 +345,13 @@ describe InvitesController do
       end
 
       it "raises an error when the email cannot be found" do
-        expect do
-          post :resend_invite, params: { email: 'first_name@example.com' }, format: :json
-        end.to raise_error(Discourse::InvalidParameters)
+        post :resend_invite, params: { email: 'first_name@example.com' }, format: :json
+        expect(response.status).to eq(400)
       end
 
       it 'raises an error when the invite is not yours' do
-        expect do
-          post :resend_invite, params: { email: another_invite.email }, format: :json
-        end.to raise_error(Discourse::InvalidParameters)
+        post :resend_invite, params: { email: another_invite.email }, format: :json
+        expect(response.status).to eq(400)
       end
 
       it "resends the invite" do
@@ -400,9 +365,8 @@ describe InvitesController do
 
   context '.upload_csv' do
     it 'requires you to be logged in' do
-      expect {
-        post :upload_csv, format: :json
-      }.to raise_error(Discourse::NotLoggedIn)
+      post :upload_csv, format: :json
+      expect(response.status).to eq(403)
     end
 
     context 'while logged in' do
diff --git a/spec/controllers/list_controller_spec.rb b/spec/controllers/list_controller_spec.rb
index 412833aa174..1f1374c5c92 100644
--- a/spec/controllers/list_controller_spec.rb
+++ b/spec/controllers/list_controller_spec.rb
@@ -7,8 +7,7 @@ describe ListController do
     @user = Fabricate(:coding_horror)
     @post = Fabricate(:post, user: @user)
 
-    # forces tests down some code paths
-    SiteSetting.top_menu = 'latest,-video|new|unread|categories|category/beer'
+    SiteSetting.top_menu = 'latest|new|unread|categories'
   end
 
   describe 'indexes' do
@@ -297,7 +296,8 @@ describe ListController do
 
   context 'read' do
     it 'raises an error when not logged in' do
-      expect { get :read }.to raise_error(Discourse::NotLoggedIn)
+      get :read
+      expect(response.status).to eq(404)
     end
 
     context 'when logged in' do
@@ -363,13 +363,13 @@ describe ListController do
 
   describe "categories suppression" do
     let(:category_one) { Fabricate(:category) }
-    let(:sub_category) { Fabricate(:category, parent_category: category_one, suppress_from_homepage: true) }
+    let(:sub_category) { Fabricate(:category, parent_category: category_one, suppress_from_latest: true) }
     let!(:topic_in_sub_category) { Fabricate(:topic, category: sub_category) }
 
-    let(:category_two) { Fabricate(:category, suppress_from_homepage: true) }
+    let(:category_two) { Fabricate(:category, suppress_from_latest: true) }
     let!(:topic_in_category_two) { Fabricate(:topic, category: category_two) }
 
-    it "suppresses categories from the homepage" do
+    it "suppresses categories from the latest list" do
       get SiteSetting.homepage, format: :json
       expect(response).to be_success
 
diff --git a/spec/controllers/metadata_controller_spec.rb b/spec/controllers/metadata_controller_spec.rb
index cf15a697de2..96558ec0c76 100644
--- a/spec/controllers/metadata_controller_spec.rb
+++ b/spec/controllers/metadata_controller_spec.rb
@@ -15,6 +15,20 @@ RSpec.describe MetadataController do
       expect(manifest["name"]).to eq(title)
       expect(manifest["icons"].first["src"]).to eq("http://big.square/png")
     end
+
+    it 'can guess mime types' do
+      SiteSetting.large_icon_url = "http://big.square/ico.jpg"
+      get :manifest
+      manifest = JSON.parse(response.body)
+      expect(manifest["icons"].first["type"]).to eq("image/jpeg")
+    end
+
+    it 'defaults to png' do
+      SiteSetting.large_icon_url = "http://big.square/noidea.bogus"
+      get :manifest
+      manifest = JSON.parse(response.body)
+      expect(manifest["icons"].first["type"]).to eq("image/png")
+    end
   end
 
   describe 'opensearch.xml' do
diff --git a/spec/controllers/notifications_controller_spec.rb b/spec/controllers/notifications_controller_spec.rb
index b5d4b1acbcd..d322abd848f 100644
--- a/spec/controllers/notifications_controller_spec.rb
+++ b/spec/controllers/notifications_controller_spec.rb
@@ -1,84 +1,179 @@
 require 'rails_helper'
 
+def create_notification(user_id, resp_code, matcher)
+  notification_count = Notification.count
+  post :create, params: { notification_type: Notification.types[:mentioned], user_id: user_id, data: { message: 'tada' }.to_json }, format: :json
+  expect(response.status).to eq(resp_code)
+  expect(Notification.count).send(matcher, eq(notification_count))
+end
+
+def update_notification(topic_id, resp_code, matcher)
+  notification = Fabricate(:notification)
+  post :update, params: { id: notification.id, topic_id: topic_id }, format: :json
+  expect(response.status).to eq(resp_code)
+  notification.reload
+  expect(notification.topic_id).send(matcher, eq(topic_id))
+end
+
+def delete_notification(resp_code, matcher)
+  notification = Fabricate(:notification)
+  notification_count = Notification.count
+  delete :destroy, params: { id: notification.id }, format: :json
+  expect(response.status).to eq(resp_code)
+  expect(Notification.count).send(matcher, eq(notification_count))
+end
+
 describe NotificationsController do
 
   context 'when logged in' do
-    let!(:user) { log_in }
 
-    describe '#index' do
-      it 'should succeed for recent' do
-        get :index, params: { recent: true }
-        expect(response).to be_success
-      end
+    context 'as normal user' do
 
-      it 'should succeed for history' do
-        get :index
-        expect(response).to be_success
-      end
+      let!(:user) { log_in }
 
-      it 'should mark notifications as viewed' do
-        notification = Fabricate(:notification, user: user)
-        expect(user.reload.unread_notifications).to eq(1)
-        expect(user.reload.total_unread_notifications).to eq(1)
-        get :index, params: { recent: true }, format: :json
-        expect(user.reload.unread_notifications).to eq(0)
-        expect(user.reload.total_unread_notifications).to eq(1)
-      end
+      describe '#index' do
+        it 'should succeed for recent' do
+          get :index, params: { recent: true }
+          expect(response).to be_success
+        end
 
-      it 'should not mark notifications as viewed if silent param is present' do
-        notification = Fabricate(:notification, user: user)
-        expect(user.reload.unread_notifications).to eq(1)
-        expect(user.reload.total_unread_notifications).to eq(1)
-        get :index, params: { recent: true, silent: true }
-        expect(user.reload.unread_notifications).to eq(1)
-        expect(user.reload.total_unread_notifications).to eq(1)
-      end
+        it 'should succeed for history' do
+          get :index
+          expect(response).to be_success
+        end
 
-      context 'when username params is not valid' do
-        it 'should raise the right error' do
-          get :index, params: { username: 'somedude' }, format: :json
+        it 'should mark notifications as viewed' do
+          _notification = Fabricate(:notification, user: user)
+          expect(user.reload.unread_notifications).to eq(1)
+          expect(user.reload.total_unread_notifications).to eq(1)
+          get :index, params: { recent: true }, format: :json
+          expect(user.reload.unread_notifications).to eq(0)
+          expect(user.reload.total_unread_notifications).to eq(1)
+        end
 
-          expect(response).to_not be_success
-          expect(response.status).to eq(404)
+        it 'should not mark notifications as viewed if silent param is present' do
+          _notification = Fabricate(:notification, user: user)
+          expect(user.reload.unread_notifications).to eq(1)
+          expect(user.reload.total_unread_notifications).to eq(1)
+          get :index, params: { recent: true, silent: true }
+          expect(user.reload.unread_notifications).to eq(1)
+          expect(user.reload.total_unread_notifications).to eq(1)
+        end
+
+        context 'when username params is not valid' do
+          it 'should raise the right error' do
+            get :index, params: { username: 'somedude' }, format: :json
+
+            expect(response).to_not be_success
+            expect(response.status).to eq(404)
+          end
         end
       end
+
+      it 'should succeed' do
+        put :mark_read, format: :json
+        expect(response).to be_success
+      end
+
+      it "can update a single notification" do
+        notification = Fabricate(:notification, user: user)
+        notification2 = Fabricate(:notification, user: user)
+        put :mark_read, params: { id: notification.id }, format: :json
+        expect(response).to be_success
+
+        notification.reload
+        notification2.reload
+
+        expect(notification.read).to eq(true)
+        expect(notification2.read).to eq(false)
+      end
+
+      it "updates the `read` status" do
+        _notification = Fabricate(:notification, user: user)
+        expect(user.reload.unread_notifications).to eq(1)
+        expect(user.reload.total_unread_notifications).to eq(1)
+        put :mark_read, format: :json
+        user.reload
+        expect(user.reload.unread_notifications).to eq(0)
+        expect(user.reload.total_unread_notifications).to eq(0)
+      end
+
+      describe '#create' do
+        it "can't create notification" do
+          create_notification(user.id, 403, :to)
+        end
+      end
+
+      describe '#update' do
+        it "can't update notification" do
+          update_notification(8, 403, :to_not)
+        end
+      end
+
+      describe '#destroy' do
+        it "can't delete notification" do
+          delete_notification(403, :to)
+        end
+      end
+
     end
 
-    it 'should succeed' do
-      put :mark_read, format: :json
-      expect(response).to be_success
+    context 'as admin' do
+
+      let!(:admin) { log_in(:admin) }
+
+      describe '#create' do
+        it "can create notification" do
+          create_notification(admin.id, 200, :to_not)
+          expect(::JSON.parse(response.body)["id"]).to_not eq(nil)
+        end
+      end
+
+      describe '#update' do
+        it "can update notification" do
+          update_notification(8, 200, :to)
+          expect(::JSON.parse(response.body)["topic_id"]).to eq(8)
+        end
+      end
+
+      describe '#destroy' do
+        it "can delete notification" do
+          delete_notification(200, :to_not)
+        end
+      end
+
     end
 
-    it "can update a single notification" do
-      notification = Fabricate(:notification, user: user)
-      notification2 = Fabricate(:notification, user: user)
-      put :mark_read, params: { id: notification.id }, format: :json
-      expect(response).to be_success
-
-      notification.reload
-      notification2.reload
-
-      expect(notification.read).to eq(true)
-      expect(notification2.read).to eq(false)
-    end
-
-    it "updates the `read` status" do
-      notification = Fabricate(:notification, user: user)
-      expect(user.reload.unread_notifications).to eq(1)
-      expect(user.reload.total_unread_notifications).to eq(1)
-      put :mark_read, format: :json
-      user.reload
-      expect(user.reload.unread_notifications).to eq(0)
-      expect(user.reload.total_unread_notifications).to eq(0)
-    end
   end
 
   context 'when not logged in' do
-    it 'should raise an error' do
-      expect do
+
+    describe '#index' do
+      it 'should raise an error' do
         get :index, params: { recent: true }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+        expect(response.status).to eq(403)
+      end
     end
+
+    describe '#create' do
+      it "can't create notification" do
+        user = Fabricate(:user)
+        create_notification(user.id, 403, :to)
+      end
+    end
+
+    describe '#update' do
+      it "can't update notification" do
+        update_notification(8, 403, :to_not)
+      end
+    end
+
+    describe '#destroy' do
+      it "can't delete notification" do
+        delete_notification(403, :to)
+      end
+    end
+
   end
 
 end
diff --git a/spec/controllers/omniauth_callbacks_controller_spec.rb b/spec/controllers/omniauth_callbacks_controller_spec.rb
deleted file mode 100644
index df05b2c2f17..00000000000
--- a/spec/controllers/omniauth_callbacks_controller_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'rails_helper'
-
-describe Users::OmniauthCallbacksController do
-
-  context ".find_authenticator" do
-    it "fails if a provider is disabled" do
-      SiteSetting.enable_twitter_logins = false
-
-      expect {
-        Users::OmniauthCallbacksController.find_authenticator("twitter")
-      }.to raise_error(Discourse::InvalidAccess)
-    end
-
-    it "fails for unknown" do
-      expect {
-        Users::OmniauthCallbacksController.find_authenticator("twitter1")
-      }.to raise_error(Discourse::InvalidAccess)
-    end
-
-    it "finds an authenticator when enabled" do
-      SiteSetting.enable_twitter_logins = true
-      expect(Users::OmniauthCallbacksController.find_authenticator("twitter")).not_to eq(nil)
-    end
-  end
-
-end
diff --git a/spec/controllers/onebox_controller_spec.rb b/spec/controllers/onebox_controller_spec.rb
index 8995a78710f..9e2008c8488 100644
--- a/spec/controllers/onebox_controller_spec.rb
+++ b/spec/controllers/onebox_controller_spec.rb
@@ -5,9 +5,8 @@ describe OneboxController do
   let(:url) { "http://google.com" }
 
   it "requires the user to be logged in" do
-    expect do
-      get :show, params: { url: url }, format: :json
-    end.to raise_error(Discourse::NotLoggedIn)
+    get :show, params: { url: url }, format: :json
+    expect(response.status).to eq(403)
   end
 
   describe "logged in" do
@@ -15,8 +14,8 @@ describe OneboxController do
     before { @user = log_in(:admin) }
 
     it 'invalidates the cache if refresh is passed' do
-      Oneboxer.expects(:preview).with(url, invalidate_oneboxes: true)
-      get :show, params: { url: url, refresh: 'true', user_id: @user.id }, format: :json
+      Oneboxer.expects(:preview).with(url, invalidate_oneboxes: true, user_id: @user.id, category_id: 0, topic_id: 0)
+      get :show, params: { url: url, refresh: 'true' }, format: :json
     end
 
     describe "cached onebox" do
@@ -36,19 +35,16 @@ describe OneboxController do
 
         url = "http://noodle.com/"
 
-        stub_request(:head, url).
-          to_return(status: 200, body: "", headers: {}).then.to_raise
+        stub_request(:head, url)
+        stub_request(:get, url).to_return(body: onebox_html).then.to_raise
 
-        stub_request(:get, url)
-          .to_return(status: 200, headers: {}, body: onebox_html).then.to_raise
-
-        get :show, params: { url: url, user_id: @user.id, refresh: "true" }, format: :json
+        get :show, params: { url: url, refresh: "true" }, format: :json
 
         expect(response).to be_success
         expect(response.body).to include('Fred')
         expect(response.body).to include('bodycontent')
 
-        get :show, params: { url: url, user_id: @user.id }, format: :json
+        get :show, params: { url: url }, format: :json
         expect(response).to be_success
         expect(response.body).to include('Fred')
         expect(response.body).to include('bodycontent')
@@ -60,7 +56,7 @@ describe OneboxController do
 
       it "returns 429" do
         Oneboxer.expects(:is_previewing?).returns(true)
-        get :show, params: { url: url, user_id: @user.id }, format: :json
+        get :show, params: { url: url }, format: :json
         expect(response.status).to eq(429)
       end
 
@@ -71,8 +67,8 @@ describe OneboxController do
       let(:body) { "this is the onebox body" }
 
       before do
-        Oneboxer.expects(:preview).with(url, invalidate_oneboxes: false).returns(body)
-        get :show, params: { url: url, user_id: @user.id }, format: :json
+        Oneboxer.expects(:preview).returns(body)
+        get :show, params: { url: url }, format: :json
       end
 
       it 'returns the onebox response in the body' do
@@ -85,19 +81,82 @@ describe OneboxController do
     describe "missing onebox" do
 
       it "returns 404 if the onebox is nil" do
-        Oneboxer.expects(:preview).with(url, invalidate_oneboxes: false).returns(nil)
-        get :show, params: { url: url, user_id: @user.id }, format: :json
+        Oneboxer.expects(:preview).returns(nil)
+        get :show, params: { url: url }, format: :json
         expect(response.response_code).to eq(404)
       end
 
       it "returns 404 if the onebox is an empty string" do
-        Oneboxer.expects(:preview).with(url, invalidate_oneboxes: false).returns(" \t ")
-        get :show, params: { url: url, user_id: @user.id }, format: :json
+        Oneboxer.expects(:preview).returns(" \t ")
+        get :show, params: { url: url }, format: :json
         expect(response.response_code).to eq(404)
       end
 
     end
 
+    describe "local onebox" do
+
+      it 'does not cache local oneboxes' do
+        post = create_post
+        url = Discourse.base_url + post.url
+
+        get :show, params: { url: url, category_id: post.topic.category_id }, format: :json
+        expect(response.body).to include('blockquote')
+
+        post.trash!
+
+        get :show, params: { url: url, category_id: post.topic.category_id }, format: :json
+        expect(response.body).not_to include('blockquote')
+      end
+    end
+
+    it 'does not onebox when you have no permission on category' do
+      log_in
+
+      post = create_post
+      url = Discourse.base_url + post.url
+
+      get :show, params: { url: url, category_id: post.topic.category_id }, format: :json
+      expect(response.body).to include('blockquote')
+
+      post.topic.category.set_permissions(staff: :full)
+      post.topic.category.save
+
+      get :show, params: { url: url, category_id: post.topic.category_id }, format: :json
+      expect(response.body).not_to include('blockquote')
+    end
+
+    it 'does not allow onebox of PMs' do
+      user = log_in
+
+      post = create_post(archetype: 'private_message', target_usernames: [user.username])
+      url = Discourse.base_url + post.url
+
+      get :show, params: { url: url }, format: :json
+      expect(response.body).not_to include('blockquote')
+    end
+
+    it 'does not allow whisper onebox' do
+      log_in
+
+      post = create_post
+      whisper = create_post(topic_id: post.topic_id, post_type: Post.types[:whisper])
+      url = Discourse.base_url + whisper.url
+
+      get :show, params: { url: url }, format: :json
+      expect(response.body).not_to include('blockquote')
+    end
+
+    it 'allows onebox to public topics/posts in PM' do
+      log_in
+
+      post = create_post
+      url = Discourse.base_url + post.url
+
+      get :show, params: { url: url }, format: :json
+      expect(response.body).to include('blockquote')
+    end
+
   end
 
 end
diff --git a/spec/controllers/post_actions_controller_spec.rb b/spec/controllers/post_actions_controller_spec.rb
index 5a68642acee..0994fc601d1 100644
--- a/spec/controllers/post_actions_controller_spec.rb
+++ b/spec/controllers/post_actions_controller_spec.rb
@@ -3,11 +3,6 @@ require 'rails_helper'
 describe PostActionsController do
 
   describe 'create' do
-    it 'requires you to be logged in' do
-      expect do
-        post :create, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
-    end
 
     context 'logged in as user' do
       let(:user) { Fabricate(:user) }
@@ -32,12 +27,6 @@ describe PostActionsController do
 
     let(:post) { Fabricate(:post, user: Fabricate(:coding_horror)) }
 
-    it 'requires you to be logged in' do
-      expect do
-        delete :destroy, params: { id: post.id }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
-    end
-
     context 'logged in' do
       let!(:user) { log_in }
 
@@ -89,9 +78,8 @@ describe PostActionsController do
 
     context "not logged in" do
       it "should not allow them to clear flags" do
-        expect do
-          post :defer_flags, format: :json
-        end.to raise_error(Discourse::NotLoggedIn)
+        post :defer_flags, format: :json
+        expect(response.status).to eq(403)
       end
     end
 
diff --git a/spec/controllers/posts_controller_spec.rb b/spec/controllers/posts_controller_spec.rb
deleted file mode 100644
index 1981d15bf68..00000000000
--- a/spec/controllers/posts_controller_spec.rb
+++ /dev/null
@@ -1,1221 +0,0 @@
-require 'rails_helper'
-
-shared_examples 'finding and showing post' do
-  let(:user) { log_in }
-  let(:post) { Fabricate(:post, user: user) }
-
-  it 'ensures the user can see the post' do
-    Guardian.any_instance.expects(:can_see?).with(post).returns(false)
-    get action, params: params, format: :json
-    expect(response).to be_forbidden
-  end
-
-  it 'succeeds' do
-    get action, params: params, format: :json
-    expect(response).to be_success
-  end
-
-  context "deleted post" do
-    before do
-      post.trash!(user)
-    end
-
-    it "can't find deleted posts as an anonymous user" do
-      get action, params: params, format: :json
-      expect(response.status).to eq(404)
-    end
-
-    it "can't find deleted posts as a regular user" do
-      log_in(:user)
-      get action, params: params, format: :json
-      expect(response.status).to eq(404)
-    end
-
-    it "can find posts as a moderator" do
-      log_in(:moderator)
-      get action, params: params, format: :json
-      expect(response).to be_success
-    end
-
-    it "can find posts as a admin" do
-      log_in(:admin)
-      get action, params: params, format: :json
-      expect(response).to be_success
-    end
-  end
-end
-
-shared_examples 'action requires login' do |method, action, params|
-  it 'raises an exception when not logged in' do
-    expect do
-      options = { format: :json }
-      options.merge!(params: params) if params
-      self.public_send(method, action, options)
-    end.to raise_error(Discourse::NotLoggedIn)
-  end
-end
-
-describe PostsController do
-
-  describe 'latest' do
-    let(:user) { log_in }
-    let!(:public_topic) { Fabricate(:topic) }
-    let!(:post) { Fabricate(:post, user: user, topic: public_topic) }
-    let!(:private_topic) { Fabricate(:topic, archetype: Archetype.private_message, category: nil) }
-    let!(:private_post) { Fabricate(:post, user: user, topic: private_topic) }
-    let!(:topicless_post) { Fabricate(:post, user: user, raw: '<p>Car 54, where are you?</p>') }
-
-    context "public posts" do
-      before do
-        topicless_post.update topic_id: -100
-      end
-
-      it 'returns public posts with topic for json' do
-        get :latest, params: { id: "latest_posts" }, format: :json
-        expect(response).to be_success
-        json = ::JSON.parse(response.body)
-        post_ids = json['latest_posts'].map { |p| p['id'] }
-        expect(post_ids).to include post.id
-        expect(post_ids).to_not include private_post.id
-        expect(post_ids).to_not include topicless_post.id
-      end
-    end
-
-    context 'private posts' do
-      before do
-        Guardian.any_instance.expects(:can_see?).with(private_post).returns(true)
-      end
-
-      it 'returns private posts for json' do
-        get :latest, params: { id: "private_posts" }, format: :json
-        expect(response).to be_success
-        json = ::JSON.parse(response.body)
-        post_ids = json['private_posts'].map { |p| p['id'] }
-        expect(post_ids).to include private_post.id
-        expect(post_ids).to_not include post.id
-      end
-    end
-  end
-
-  describe 'cooked' do
-    before do
-      post = Post.new(cooked: 'wat')
-      PostsController.any_instance.expects(:find_post_from_params).returns(post)
-    end
-
-    it 'returns the cooked conent' do
-      get :cooked, params: { id: 1234 }, format: :json
-      expect(response).to be_success
-      json = ::JSON.parse(response.body)
-      expect(json).to be_present
-      expect(json['cooked']).to eq('wat')
-    end
-  end
-
-  describe 'raw_email' do
-    include_examples "action requires login", :get, :raw_email, id: 2
-
-    describe "when logged in" do
-      let(:user) { log_in }
-      let(:post) { Fabricate(:post, deleted_at: 2.hours.ago, user: user, raw_email: 'email_content') }
-
-      it "raises an error if the user doesn't have permission to view raw email" do
-        Guardian.any_instance.expects(:can_view_raw_email?).returns(false)
-
-        get :raw_email, params: { id: post.id }, format: :json
-
-        expect(response).to be_forbidden
-      end
-
-      it "can view raw email" do
-        Guardian.any_instance.expects(:can_view_raw_email?).returns(true)
-
-        get :raw_email, params: { id: post.id }, format: :json
-
-        expect(response).to be_success
-        json = ::JSON.parse(response.body)
-        expect(json['raw_email']).to eq('email_content')
-      end
-
-    end
-
-  end
-
-  describe 'show' do
-    include_examples 'finding and showing post' do
-      let(:action) { :show }
-      let(:params) { { id: post.id } }
-    end
-
-    it 'gets all the expected fields' do
-      # non fabricated test
-      new_post = create_post
-      get :show, params: { id: new_post.id }, format: :json
-      parsed = JSON.parse(response.body)
-      expect(parsed["topic_slug"]).to eq(new_post.topic.slug)
-      expect(parsed["moderator"]).to eq(false)
-      expect(parsed["username"]).to eq(new_post.user.username)
-      expect(parsed["cooked"]).to eq(new_post.cooked)
-    end
-  end
-
-  describe 'by_number' do
-    include_examples 'finding and showing post' do
-      let(:action) { :by_number }
-      let(:params) { { topic_id: post.topic_id, post_number: post.post_number } }
-    end
-  end
-
-  describe 'reply_history' do
-    include_examples 'finding and showing post' do
-      let(:action) { :reply_history }
-      let(:params) { { id: post.id } }
-    end
-
-    it 'asks post for reply history' do
-      Post.any_instance.expects(:reply_history)
-      get :reply_history, params: { id: post.id }, format: :json
-    end
-  end
-
-  describe 'replies' do
-    include_examples 'finding and showing post' do
-      let(:action) { :replies }
-      let(:params) { { post_id: post.id } }
-    end
-
-    it 'asks post for replies' do
-      p1 = Fabricate(:post)
-      get :replies, params: { post_id: p1.id }, format: :json
-      expect(response.status).to eq(200)
-    end
-  end
-
-  describe 'delete a post' do
-    include_examples 'action requires login', :delete, :destroy, id: 123
-
-    describe 'when logged in' do
-
-      let(:user) { log_in(:moderator) }
-      let(:post) { Fabricate(:post, user: user, post_number: 2) }
-
-      it 'does not allow to destroy when edit time limit expired' do
-        Guardian.any_instance.stubs(:can_delete_post?).with(post).returns(false)
-        Post.any_instance.stubs(:edit_time_limit_expired?).returns(true)
-
-        delete :destroy, params: { id: post.id }, format: :json
-
-        expect(response.status).to eq(422)
-        expect(JSON.parse(response.body)['errors']).to include(I18n.t('too_late_to_edit'))
-      end
-
-      it "raises an error when the user doesn't have permission to see the post" do
-        Guardian.any_instance.expects(:can_delete?).with(post).returns(false)
-        delete :destroy, params: { id: post.id }, format: :json
-        expect(response).to be_forbidden
-      end
-
-      it "uses a PostDestroyer" do
-        destroyer = mock
-        PostDestroyer.expects(:new).returns(destroyer)
-        destroyer.expects(:destroy)
-        delete :destroy, params: { id: post.id }, format: :json
-      end
-
-    end
-  end
-
-  describe 'recover a post' do
-    include_examples 'action requires login', :put, :recover, post_id: 123
-
-    describe 'when logged in' do
-
-      let(:user) { log_in(:moderator) }
-      let(:post) { Fabricate(:post, user: user, post_number: 2) }
-
-      it "raises an error when the user doesn't have permission to see the post" do
-        Guardian.any_instance.expects(:can_recover_post?).with(post).returns(false)
-        put :recover, params: { post_id: post.id }, format: :json
-        expect(response).to be_forbidden
-      end
-
-      it "recovers a post correctly" do
-        topic_id = create_post.topic_id
-        post = create_post(topic_id: topic_id)
-
-        PostDestroyer.new(user, post).destroy
-        put :recover, params: { post_id: post.id }, format: :json
-        post.reload
-        expect(post.deleted_at).to eq(nil)
-      end
-
-    end
-  end
-
-  describe 'destroy_many' do
-    include_examples 'action requires login', :delete, :destroy_many, post_ids: [123, 345]
-
-    describe 'when logged in' do
-
-      let!(:poster) { log_in(:moderator) }
-      let!(:post1) { Fabricate(:post, user: poster, post_number: 2) }
-      let!(:post2) { Fabricate(:post, topic_id: post1.topic_id, user: poster, post_number: 3, reply_to_post_number: post1.post_number) }
-
-      it "raises invalid parameters no post_ids" do
-        expect do
-          delete :destroy_many, format: :json
-        end.to raise_error(ActionController::ParameterMissing)
-      end
-
-      it "raises invalid parameters with missing ids" do
-        expect do
-          delete :destroy_many, params: { post_ids: [12345] }, format: :json
-        end.to raise_error(Discourse::InvalidParameters)
-      end
-
-      it "raises an error when the user doesn't have permission to delete the posts" do
-        Guardian.any_instance.expects(:can_delete?).with(instance_of(Post)).returns(false)
-        delete :destroy_many, params: { post_ids: [post1.id, post2.id] }, format: :json
-        expect(response).to be_forbidden
-      end
-
-      it "deletes the post" do
-        PostDestroyer.any_instance.expects(:destroy).twice
-        delete :destroy_many, params: { post_ids: [post1.id, post2.id] }, format: :json
-      end
-
-      it "updates the highest read data for the forum" do
-        Topic.expects(:reset_highest).twice
-        delete :destroy_many, params: { post_ids: [post1.id, post2.id] }, format: :json
-      end
-
-      describe "can delete replies" do
-
-        before do
-          PostReply.create(post_id: post1.id, reply_id: post2.id)
-        end
-
-        it "deletes the post and the reply to it" do
-          PostDestroyer.any_instance.expects(:destroy).twice
-          delete :destroy_many,
-            params: { post_ids: [post1.id], reply_post_ids: [post1.id] },
-            format: :json
-        end
-
-      end
-
-    end
-
-  end
-
-  describe 'edit a post' do
-
-    include_examples 'action requires login', :put, :update, id: 2
-
-    let(:post) { Fabricate(:post, user: logged_in_as) }
-    let(:update_params) do
-      {
-        id: post.id,
-        post: { raw: 'edited body', edit_reason: 'typo' },
-        image_sizes: { 'http://image.com/image.jpg' => { 'width' => 123, 'height' => 456 } },
-      }
-    end
-    let(:moderator) { Fabricate(:moderator) }
-
-    describe 'when logged in as a regular user' do
-      let(:logged_in_as) { log_in }
-
-      it 'does not allow to update when edit time limit expired' do
-        Guardian.any_instance.stubs(:can_edit?).with(post).returns(false)
-        Post.any_instance.stubs(:edit_time_limit_expired?).returns(true)
-
-        put :update, params: update_params, format: :json
-
-        expect(response.status).to eq(422)
-        expect(JSON.parse(response.body)['errors']).to include(I18n.t('too_late_to_edit'))
-      end
-
-      it 'passes the image sizes through' do
-        Post.any_instance.expects(:image_sizes=)
-        put :update, params: update_params, format: :json
-      end
-
-      it 'passes the edit reason through' do
-        Post.any_instance.expects(:edit_reason=)
-        put :update, params: update_params, format: :json
-      end
-
-      it "raises an error when the post parameter is missing" do
-        update_params.delete(:post)
-        expect {
-          put :update, params: update_params, format: :json
-        }.to raise_error(ActionController::ParameterMissing)
-      end
-
-      it "raises an error when the user doesn't have permission to see the post" do
-        Guardian.any_instance.expects(:can_edit?).with(post).at_least_once.returns(false)
-        put :update, params: update_params, format: :json
-        expect(response).to be_forbidden
-      end
-
-      it "calls revise with valid parameters" do
-        PostRevisor.any_instance.expects(:revise!).with(post.user, { raw: 'edited body' , edit_reason: 'typo' }, anything)
-        put :update, params: update_params, format: :json
-      end
-
-      it "extracts links from the new body" do
-        param = update_params
-        param[:post][:raw] = 'I just visited this https://google.com so many cool links'
-
-        put :update, params: param, format: :json
-
-        expect(response).to be_success
-        expect(TopicLink.count).to eq(1)
-      end
-
-      it "doesn't allow updating of deleted posts" do
-        first_post = post.topic.ordered_posts.first
-        PostDestroyer.new(moderator, first_post).destroy
-
-        put :update, params: update_params, format: :json
-        expect(response).not_to be_success
-      end
-    end
-
-    describe "when logged in as staff" do
-      let(:logged_in_as) { log_in(:moderator) }
-
-      it "supports updating posts in deleted topics" do
-        first_post = post.topic.ordered_posts.first
-        PostDestroyer.new(moderator, first_post).destroy
-
-        put :update, params: update_params, format: :json
-        expect(response).to be_success
-
-        post.reload
-        expect(post.raw).to eq('edited body')
-      end
-    end
-
-  end
-
-  describe 'bookmark a post' do
-
-    include_examples 'action requires login', :put, :bookmark, post_id: 2
-
-    describe 'when logged in' do
-      let(:user) { log_in }
-      let(:post) { Fabricate(:post, user: user) }
-      let(:private_message) { Fabricate(:private_message_post) }
-
-      it "raises an error if the user doesn't have permission to see the post" do
-        post
-
-        put :bookmark,
-          params: { post_id: private_message.id, bookmarked: 'true' },
-          format: :json
-
-        expect(response).to be_forbidden
-      end
-
-      it 'creates a bookmark' do
-        put :bookmark,
-          params: { post_id: post.id, bookmarked: 'true' },
-          format: :json
-
-        post_action = PostAction.find_by(user: user, post: post)
-
-        expect(post_action.post_action_type_id).to eq(PostActionType.types[:bookmark])
-      end
-
-      context "removing a bookmark" do
-        let(:post_action) { PostAction.act(user, post, PostActionType.types[:bookmark]) }
-        let(:admin) { Fabricate(:admin) }
-
-        it "returns the right response when post is not bookmarked" do
-          put :bookmark,
-            params: { post_id: Fabricate(:post, user: user).id },
-            format: :json
-
-          expect(response.status).to eq(404)
-        end
-
-        it 'should be able to remove a bookmark' do
-          post_action
-          put :bookmark, params: { post_id: post.id }, format: :json
-
-          expect(PostAction.find_by(id: post_action.id)).to eq(nil)
-        end
-
-        describe "when user doesn't have permission to see bookmarked post" do
-          it "should still be able to remove a bookmark" do
-            post_action
-            post = post_action.post
-            topic = post.topic
-            topic.convert_to_private_message(admin)
-            topic.remove_allowed_user(admin, user.username)
-
-            expect(Guardian.new(user).can_see_post?(post.reload)).to eq(false)
-
-            put :bookmark, params: { post_id: post.id }, format: :json
-
-            expect(PostAction.find_by(id: post_action.id)).to eq(nil)
-          end
-        end
-
-        describe "when post has been deleted" do
-          it "should still be able to remove a bookmark" do
-            post = post_action.post
-            post.trash!
-
-            put :bookmark, params: { post_id: post.id }, format: :json
-
-            expect(PostAction.find_by(id: post_action.id)).to eq(nil)
-          end
-        end
-      end
-
-    end
-
-  end
-
-  describe "wiki" do
-
-    include_examples "action requires login", :put, :wiki, post_id: 2
-
-    describe "when logged in" do
-      let(:user) { log_in }
-      let(:post) { Fabricate(:post, user: user) }
-
-      it "raises an error if the user doesn't have permission to wiki the post" do
-        Guardian.any_instance.expects(:can_wiki?).with(post).returns(false)
-
-        put :wiki,
-          params: { post_id: post.id, wiki: 'true' },
-          format: :json
-
-        expect(response).to be_forbidden
-      end
-
-      it "toggle wiki status should create a new version" do
-        _admin = log_in(:admin)
-        another_user = Fabricate(:user)
-        another_post = Fabricate(:post, user: another_user)
-
-        expect do
-          put :wiki,
-            params: { post_id: another_post.id, wiki: 'true' },
-            format: :json
-        end.to change { another_post.reload.version }.by(1)
-
-        expect do
-          put :wiki,
-            params: { post_id: another_post.id, wiki: 'false' },
-            format: :json
-        end.to change { another_post.reload.version }.by(-1)
-
-        _another_admin = log_in(:admin)
-
-        expect do
-          put :wiki,
-            params: { post_id: another_post.id, wiki: 'true' },
-            format: :json
-        end.to change { another_post.reload.version }.by(1)
-      end
-
-      it "can wiki a post" do
-        Guardian.any_instance.expects(:can_wiki?).with(post).returns(true)
-
-        put :wiki, params: { post_id: post.id, wiki: 'true' }, format: :json
-
-        post.reload
-        expect(post.wiki).to eq(true)
-      end
-
-      it "can unwiki a post" do
-        wikied_post = Fabricate(:post, user: user, wiki: true)
-        Guardian.any_instance.expects(:can_wiki?).with(wikied_post).returns(true)
-
-        put :wiki, params: { post_id: wikied_post.id, wiki: 'false' }, format: :json
-
-        wikied_post.reload
-        expect(wikied_post.wiki).to eq(false)
-      end
-
-    end
-
-  end
-
-  describe "post_type" do
-
-    include_examples "action requires login", :put, :post_type, post_id: 2
-
-    describe "when logged in" do
-      let(:user) { log_in }
-      let(:post) { Fabricate(:post, user: user) }
-
-      it "raises an error if the user doesn't have permission to change the post type" do
-        Guardian.any_instance.expects(:can_change_post_type?).returns(false)
-
-        put :post_type, params: { post_id: post.id, post_type: 2 }, format: :json
-
-        expect(response).to be_forbidden
-      end
-
-      it "can change the post type" do
-        Guardian.any_instance.expects(:can_change_post_type?).returns(true)
-
-        put :post_type, params: { post_id: post.id, post_type: 2 }, format: :json
-
-        post.reload
-        expect(post.post_type).to eq(2)
-      end
-
-    end
-
-  end
-
-  describe "rebake" do
-
-    include_examples "action requires login", :put, :rebake, post_id: 2
-
-    describe "when logged in" do
-      let(:user) { log_in }
-      let(:post) { Fabricate(:post, user: user) }
-
-      it "raises an error if the user doesn't have permission to rebake the post" do
-        Guardian.any_instance.expects(:can_rebake?).returns(false)
-
-        put :rebake, params: { post_id: post.id }, format: :json
-
-        expect(response).to be_forbidden
-      end
-
-      it "can rebake the post" do
-        Guardian.any_instance.expects(:can_rebake?).returns(true)
-
-        put :rebake, params: { post_id: post.id }, format: :json
-
-        expect(response).to be_success
-      end
-
-    end
-
-  end
-
-  describe 'creating a post' do
-
-    before do
-      SiteSetting.min_first_post_typing_time = 0
-    end
-
-    include_examples 'action requires login', :post, :create
-
-    context 'api' do
-      it 'memoizes duplicate requests' do
-        raw = "this is a test post 123 #{SecureRandom.hash}"
-        title = "this is a title #{SecureRandom.hash}"
-
-        user = Fabricate(:user)
-        master_key = ApiKey.create_master_key.key
-
-        post :create, params: {
-          api_username: user.username,
-          api_key: master_key,
-          raw: raw,
-          title: title,
-          wpid: 1
-        }, format: :json
-
-        expect(response).to be_success
-        original = response.body
-
-        post :create, params: {
-          api_username: user.username_lower,
-          api_key: master_key,
-          raw: raw,
-          title: title,
-          wpid: 2
-        }, format: :json
-
-        expect(response).to be_success
-        expect(response.body).to eq(original)
-      end
-
-      it 'allows to create posts in import_mode' do
-        NotificationEmailer.enable
-        post_1 = Fabricate(:post)
-        user = Fabricate(:user)
-        master_key = ApiKey.create_master_key.key
-
-        post :create, params: {
-          api_username: user.username,
-          api_key: master_key,
-          raw: 'this is test reply 1',
-          topic_id: post_1.topic.id,
-          reply_to_post_number: 1
-        }, format: :json
-
-        expect(response).to be_success
-        expect(post_1.topic.user.notifications.count).to eq(1)
-        post_1.topic.user.notifications.destroy_all
-
-        post :create, params: {
-          api_username: user.username,
-          api_key: master_key,
-          raw: 'this is test reply 2',
-          topic_id: post_1.topic.id,
-          reply_to_post_number: 1,
-          import_mode: true
-        }, format: :json
-
-        expect(response).to be_success
-        expect(post_1.topic.user.notifications.count).to eq(0)
-
-        post :create, params: {
-          api_username: user.username,
-          api_key: master_key,
-          raw: 'this is test reply 3',
-          topic_id: post_1.topic.id,
-          reply_to_post_number: 1,
-          import_mode: false
-        }
-
-        expect(response).to be_success
-        expect(post_1.topic.user.notifications.count).to eq(1)
-      end
-    end
-
-    describe 'when logged in' do
-
-      let!(:user) { log_in }
-      let(:moderator) { log_in(:moderator) }
-      let(:new_post) { Fabricate.build(:post, user: user) }
-
-      context "fast typing" do
-        before do
-          SiteSetting.min_first_post_typing_time = 3000
-          SiteSetting.auto_silence_fast_typers_max_trust_level = 1
-        end
-
-        it 'queues the post if min_first_post_typing_time is not met' do
-          post :create, params: {
-            raw: 'this is the test content',
-            title: 'this is the test title for the topic'
-          }, format: :json
-
-          expect(response).to be_success
-          parsed = ::JSON.parse(response.body)
-
-          expect(parsed["action"]).to eq("enqueued")
-
-          user.reload
-          expect(user).to be_silenced
-
-          qp = QueuedPost.first
-
-          mod = Fabricate(:moderator)
-          qp.approve!(mod)
-
-          user.reload
-          expect(user).not_to be_silenced
-        end
-
-        it "doesn't enqueue replies when the topic is closed" do
-          topic = Fabricate(:closed_topic)
-
-          post :create, params: {
-            raw: 'this is the test content',
-            title: 'this is the test title for the topic',
-            topic_id: topic.id
-          }, format: :json
-
-          expect(response).not_to be_success
-          parsed = ::JSON.parse(response.body)
-          expect(parsed["action"]).not_to eq("enqueued")
-        end
-
-        it "doesn't enqueue replies when the post is too long" do
-          SiteSetting.max_post_length = 10
-
-          post :create, params: {
-            raw: 'this is the test content',
-            title: 'this is the test title for the topic'
-          }, format: :json
-
-          expect(response).not_to be_success
-          parsed = ::JSON.parse(response.body)
-          expect(parsed["action"]).not_to eq("enqueued")
-        end
-      end
-
-      it 'silences correctly based on auto_silence_first_post_regex' do
-        SiteSetting.auto_silence_first_post_regex = "I love candy|i eat s[1-5]"
-
-        post :create, params: {
-          raw: 'this is the test content',
-          title: 'when I eat s3 sometimes when not looking'
-        }, format: :json
-
-        expect(response).to be_success
-        parsed = ::JSON.parse(response.body)
-
-        expect(parsed["action"]).to eq("enqueued")
-
-        user.reload
-        expect(user).to be_silenced
-      end
-
-      it "can send a message to a group" do
-
-        group = Group.create(name: 'test_group', messageable_level: Group::ALIAS_LEVELS[:nobody])
-        user1 = Fabricate(:user)
-        group.add(user1)
-
-        post :create, params: {
-          raw: 'I can haz a test',
-          title: 'I loves my test',
-          target_usernames: group.name,
-          archetype: Archetype.private_message
-        }, format: :json
-
-        expect(response).not_to be_success
-
-        # allow pm to this group
-        group.update_columns(messageable_level: Group::ALIAS_LEVELS[:everyone])
-
-        post :create, params: {
-          raw: 'I can haz a test',
-          title: 'I loves my test',
-          target_usernames: group.name,
-          archetype: Archetype.private_message
-        }, format: :json
-
-        expect(response).to be_success
-
-        parsed = ::JSON.parse(response.body)
-        post = Post.find(parsed['id'])
-
-        expect(post.topic.topic_allowed_users.length).to eq(1)
-        expect(post.topic.topic_allowed_groups.length).to eq(1)
-      end
-
-      it "returns the nested post with a param" do
-        post :create, params: {
-          raw: 'this is the test content',
-          title: 'this is the test title for the topic',
-          nested_post: true
-        }, format: :json
-
-        expect(response).to be_success
-        parsed = ::JSON.parse(response.body)
-        expect(parsed['post']).to be_present
-        expect(parsed['post']['cooked']).to be_present
-      end
-
-      it 'protects against dupes' do
-        raw = "this is a test post 123 #{SecureRandom.hash}"
-        title = "this is a title #{SecureRandom.hash}"
-
-        post :create, params: { raw: raw, title: title, wpid: 1 }, format: :json
-        expect(response).to be_success
-
-        post :create, params: { raw: raw, title: title, wpid: 2 }, format: :json
-        expect(response).not_to be_success
-      end
-
-      context "errors" do
-
-        let(:post_with_errors) { Fabricate.build(:post, user: user) }
-
-        before do
-          post_with_errors.errors.add(:base, I18n.t(:spamming_host))
-          PostCreator.any_instance.stubs(:errors).returns(post_with_errors.errors)
-          PostCreator.any_instance.expects(:create).returns(post_with_errors)
-        end
-
-        it "does not succeed" do
-          post :create, params: { raw: 'test' }, format: :json
-          User.any_instance.expects(:flag_linked_posts_as_spam).never
-          expect(response).not_to be_success
-        end
-
-        it "it triggers flag_linked_posts_as_spam when the post creator returns spam" do
-          PostCreator.any_instance.expects(:spam?).returns(true)
-          User.any_instance.expects(:flag_linked_posts_as_spam)
-          post :create, params: { raw: 'test' }, format: :json
-        end
-      end
-    end
-  end
-
-  describe "revisions" do
-
-    let(:post) { Fabricate(:post, version: 2) }
-    let(:post_revision) { Fabricate(:post_revision, post: post) }
-
-    it "throws an exception when revision is < 2" do
-      expect {
-        get :revisions, params: {
-          post_id: post_revision.post_id, revision: 1
-        }, format: :json
-      }.to raise_error(Discourse::InvalidParameters)
-    end
-
-    context "when edit history is not visible to the public" do
-
-      before { SiteSetting.edit_history_visible_to_public = false }
-
-      it "ensures anonymous cannot see the revisions" do
-        get :revisions, params: {
-          post_id: post_revision.post_id, revision: post_revision.number
-        }, format: :json
-
-        expect(response).to be_forbidden
-      end
-
-      it "ensures regular user cannot see the revisions" do
-        log_in(:user)
-        get :revisions, params: {
-          post_id: post_revision.post_id, revision: post_revision.number
-        }, format: :json
-        expect(response).to be_forbidden
-      end
-
-      it "ensures staff can see the revisions" do
-        log_in(:admin)
-        get :revisions, params: {
-          post_id: post_revision.post_id, revision: post_revision.number
-        }, format: :json
-        expect(response).to be_success
-      end
-
-      it "ensures poster can see the revisions" do
-        user = log_in(:active_user)
-        post = Fabricate(:post, user: user, version: 3)
-        pr = Fabricate(:post_revision, user: user, post: post)
-        get :revisions, params: {
-          post_id: pr.post_id, revision: pr.number
-        }, format: :json
-        expect(response).to be_success
-      end
-
-      it "ensures trust level 4 can see the revisions" do
-        log_in(:trust_level_4)
-        get :revisions, params: {
-          post_id: post_revision.post_id, revision: post_revision.number
-        }, format: :json
-        expect(response).to be_success
-      end
-
-    end
-
-    context "when edit history is visible to everyone" do
-
-      before { SiteSetting.edit_history_visible_to_public = true }
-
-      it "ensures anyone can see the revisions" do
-        get :revisions, params: {
-          post_id: post_revision.post_id, revision: post_revision.number
-        }, format: :json
-        expect(response).to be_success
-      end
-
-    end
-
-    context "deleted post" do
-      let(:admin) { log_in(:admin) }
-      let(:deleted_post) { Fabricate(:post, user: admin, version: 3) }
-      let(:deleted_post_revision) { Fabricate(:post_revision, user: admin, post: deleted_post) }
-
-      before { deleted_post.trash!(admin) }
-
-      it "also work on deleted post" do
-        get :revisions, params: {
-          post_id: deleted_post_revision.post_id, revision: deleted_post_revision.number
-        }, format: :json
-        expect(response).to be_success
-      end
-    end
-
-    context "deleted topic" do
-      let(:admin) { log_in(:admin) }
-      let(:deleted_topic) { Fabricate(:topic, user: admin) }
-      let(:post) { Fabricate(:post, user: admin, topic: deleted_topic, version: 3) }
-      let(:post_revision) { Fabricate(:post_revision, user: admin, post: post) }
-
-      before { deleted_topic.trash!(admin) }
-
-      it "also work on deleted topic" do
-        get :revisions, params: {
-          post_id: post_revision.post_id, revision: post_revision.number
-        }
-        expect(response).to be_success
-      end
-    end
-
-  end
-
-  describe 'revert post to a specific revision' do
-    include_examples 'action requires login', :put, :revert, post_id: 123, revision: 2
-
-    let(:post) { Fabricate(:post, user: logged_in_as, raw: "Lorem ipsum dolor sit amet, cu nam libris tractatos, ancillae senserit ius ex") }
-    let(:post_revision) { Fabricate(:post_revision, post: post, modifications: { "raw" => ["this is original post body.", "this is edited post body."] }) }
-    let(:blank_post_revision) { Fabricate(:post_revision, post: post, modifications: { "edit_reason" => ["edit reason #1", "edit reason #2"] }) }
-    let(:same_post_revision) { Fabricate(:post_revision, post: post, modifications: { "raw" => ["Lorem ipsum dolor sit amet, cu nam libris tractatos, ancillae senserit ius ex", "this is edited post body."] }) }
-
-    let(:revert_params) do
-      {
-        post_id: post.id,
-        revision: post_revision.number
-      }
-    end
-    let(:moderator) { Fabricate(:moderator) }
-
-    describe 'when logged in as a regular user' do
-      let(:logged_in_as) { log_in }
-
-      it "does not work" do
-        put :revert, params: revert_params, format: :json
-        expect(response).to_not be_success
-      end
-    end
-
-    describe "when logged in as staff" do
-      let(:logged_in_as) { log_in(:moderator) }
-
-      it "throws an exception when revision is < 2" do
-        expect {
-          put :revert, params:  { post_id: post.id, revision: 1 }, format: :json
-        }.to raise_error(Discourse::InvalidParameters)
-      end
-
-      it "fails when post_revision record is not found" do
-        put :revert, params: {
-          post_id: post.id, revision: post_revision.number + 1
-        }, format: :json
-        expect(response).to_not be_success
-      end
-
-      it "fails when post record is not found" do
-        put :revert, params: {
-          post_id: post.id + 1, revision: post_revision.number
-        }, format: :json
-        expect(response).to_not be_success
-      end
-
-      it "fails when revision is blank" do
-        put :revert, params: {
-          post_id: post.id, revision: blank_post_revision.number
-        }, format: :json
-
-        expect(response.status).to eq(422)
-        expect(JSON.parse(response.body)['errors']).to include(I18n.t('revert_version_same'))
-      end
-
-      it "fails when revised version is same as current version" do
-        put :revert, params: {
-          post_id: post.id, revision: same_post_revision.number
-        }, format: :json
-
-        expect(response.status).to eq(422)
-        expect(JSON.parse(response.body)['errors']).to include(I18n.t('revert_version_same'))
-      end
-
-      it "works!" do
-        put :revert, params: revert_params, format: :json
-        expect(response).to be_success
-      end
-
-      it "supports reverting posts in deleted topics" do
-        first_post = post.topic.ordered_posts.first
-        PostDestroyer.new(moderator, first_post).destroy
-
-        put :revert, params: revert_params, format: :json
-        expect(response).to be_success
-      end
-    end
-  end
-
-  describe 'expandable embedded posts' do
-    let(:post) { Fabricate(:post) }
-
-    it "raises an error when you can't see the post" do
-      Guardian.any_instance.expects(:can_see?).with(post).returns(false)
-      get :expand_embed, params: { id: post.id }, format: :json
-      expect(response).not_to be_success
-    end
-
-    it "retrieves the body when you can see the post" do
-      Guardian.any_instance.expects(:can_see?).with(post).returns(true)
-      TopicEmbed.expects(:expanded_for).with(post).returns("full content")
-      get :expand_embed, params: { id: post.id }, format: :json
-      expect(response).to be_success
-      expect(::JSON.parse(response.body)['cooked']).to eq("full content")
-    end
-  end
-
-  describe "flagged posts" do
-
-    include_examples "action requires login", :get, :flagged_posts, username: "system"
-
-    describe "when logged in" do
-      before { log_in }
-
-      it "raises an error if the user doesn't have permission to see the flagged posts" do
-        Guardian.any_instance.expects(:can_see_flagged_posts?).returns(false)
-        get :flagged_posts, params: { username: "system" }, format: :json
-        expect(response).to be_forbidden
-      end
-
-      it "can see the flagged posts when authorized" do
-        Guardian.any_instance.expects(:can_see_flagged_posts?).returns(true)
-        get :flagged_posts, params: { username: "system" }, format: :json
-        expect(response).to be_success
-      end
-
-      it "only shows agreed and deferred flags" do
-        user = Fabricate(:user)
-        post_agreed = create_post(user: user)
-        post_deferred = create_post(user: user)
-        post_disagreed = create_post(user: user)
-
-        moderator = Fabricate(:moderator)
-        PostAction.act(moderator, post_agreed, PostActionType.types[:spam])
-        PostAction.act(moderator, post_deferred, PostActionType.types[:off_topic])
-        PostAction.act(moderator, post_disagreed, PostActionType.types[:inappropriate])
-
-        admin = Fabricate(:admin)
-        PostAction.agree_flags!(post_agreed, admin)
-        PostAction.defer_flags!(post_deferred, admin)
-        PostAction.clear_flags!(post_disagreed, admin)
-
-        Guardian.any_instance.expects(:can_see_flagged_posts?).returns(true)
-        get :flagged_posts, params: { username: user.username }, format: :json
-        expect(response).to be_success
-
-        expect(JSON.parse(response.body).length).to eq(2)
-      end
-
-    end
-
-  end
-
-  describe "deleted posts" do
-
-    include_examples "action requires login", :get, :deleted_posts, username: "system"
-
-    describe "when logged in" do
-      before { log_in }
-
-      it "raises an error if the user doesn't have permission to see the deleted posts" do
-        Guardian.any_instance.expects(:can_see_deleted_posts?).returns(false)
-        get :deleted_posts, params: { username: "system" }, format: :json
-        expect(response).to be_forbidden
-      end
-
-      it "can see the deleted posts when authorized" do
-        Guardian.any_instance.expects(:can_see_deleted_posts?).returns(true)
-        get :deleted_posts, params: { username: "system" }, format: :json
-        expect(response).to be_success
-      end
-
-      it "doesn't return secured categories for moderators if they don't have access" do
-        user = Fabricate(:user)
-        admin = Fabricate(:admin)
-        Fabricate(:moderator)
-
-        group = Fabricate(:group)
-        group.add_owner(user)
-
-        secured_category = Fabricate(:private_category, group: group)
-        secured_post = create_post(user: user, category: secured_category)
-        PostDestroyer.new(admin, secured_post).destroy
-
-        log_in(:moderator)
-        get :deleted_posts, params: { username: user.username }, format: :json
-        expect(response).to be_success
-
-        data = JSON.parse(response.body)
-        expect(data.length).to eq(0)
-      end
-
-      it "doesn't return PMs for moderators" do
-        user = Fabricate(:user)
-        admin = Fabricate(:admin)
-        Fabricate(:moderator)
-
-        pm_post = create_post(user: user, archetype: 'private_message', target_usernames: [admin.username])
-        PostDestroyer.new(admin, pm_post).destroy
-
-        log_in(:moderator)
-        get :deleted_posts, params: { username: user.username }, format: :json
-        expect(response).to be_success
-
-        data = JSON.parse(response.body)
-        expect(data.length).to eq(0)
-      end
-
-      it "only shows posts deleted by other users" do
-        user = Fabricate(:user)
-        admin = Fabricate(:admin)
-
-        create_post(user: user)
-        post_deleted_by_user = create_post(user: user)
-        post_deleted_by_admin = create_post(user: user)
-
-        PostDestroyer.new(user, post_deleted_by_user).destroy
-        PostDestroyer.new(admin, post_deleted_by_admin).destroy
-
-        Guardian.any_instance.expects(:can_see_deleted_posts?).returns(true)
-        get :deleted_posts, params: { username: user.username }, format: :json
-        expect(response).to be_success
-
-        data = JSON.parse(response.body)
-        expect(data.length).to eq(1)
-        expect(data[0]["id"]).to eq(post_deleted_by_admin.id)
-        expect(data[0]["deleted_by"]["id"]).to eq(admin.id)
-      end
-
-    end
-
-  end
-
-  describe "view raw" do
-    describe "by ID" do
-      it "can be viewed by anonymous" do
-        post = Fabricate(:post, raw: "123456789")
-        get :markdown_id, params: { id: post.id }, format: :json
-        expect(response).to be_success
-        expect(response.body).to eq("123456789")
-      end
-    end
-
-    describe "by post number" do
-      it "can be viewed by anonymous" do
-        topic = Fabricate(:topic)
-        post = Fabricate(:post, topic: topic, post_number: 1, raw: "123456789")
-        post.save
-        get :markdown_num, params: { topic_id: topic.id, post_number: 1 }, format: :json
-        expect(response).to be_success
-        expect(response.body).to eq("123456789")
-      end
-    end
-  end
-
-  describe "short link" do
-    let(:topic) { Fabricate(:topic) }
-    let(:post) { Fabricate(:post, topic: topic) }
-
-    it "redirects to the topic" do
-      get :short_link, params: { post_id: post.id }, format: :json
-      expect(response).to be_redirect
-    end
-
-    it "returns a 403 when access is denied" do
-      Guardian.any_instance.stubs(:can_see?).returns(false)
-      get :short_link, params: { post_id: post.id }, format: :json
-      expect(response).to be_forbidden
-    end
-  end
-end
diff --git a/spec/controllers/search_controller_spec.rb b/spec/controllers/search_controller_spec.rb
index d6cec92d0b3..f81f9ef9378 100644
--- a/spec/controllers/search_controller_spec.rb
+++ b/spec/controllers/search_controller_spec.rb
@@ -125,19 +125,17 @@ describe SearchController do
 
   context "search context" do
     it "raises an error with an invalid context type" do
-      expect do
-        get :query, params: {
-          term: 'test', search_context: { type: 'security', id: 'hole' }
-        }, format: :json
-      end.to raise_error(Discourse::InvalidParameters)
+      get :query, params: {
+        term: 'test', search_context: { type: 'security', id: 'hole' }
+      }, format: :json
+      expect(response.status).to eq(400)
     end
 
     it "raises an error with a missing id" do
-      expect do
-        get :query,
-          params: { term: 'test', search_context: { type: 'user' } },
-          format: :json
-      end.to raise_error(Discourse::InvalidParameters)
+      get :query,
+        params: { term: 'test', search_context: { type: 'user' } },
+        format: :json
+      expect(response.status).to eq(400)
     end
 
     context "with a user" do
@@ -148,7 +146,6 @@ describe SearchController do
         get :query, params: {
           term: 'test', search_context: { type: 'user', id: user.username }
         }, format: :json
-
         expect(response).not_to be_success
       end
 
@@ -164,6 +161,10 @@ describe SearchController do
   end
 
   context "#click" do
+    after do
+      SearchLog.clear_debounce_cache!
+    end
+
     it "doesn't work wthout the necessary parameters" do
       expect do
         post :click, format: :json
diff --git a/spec/controllers/steps_controller_spec.rb b/spec/controllers/steps_controller_spec.rb
index 50a31a28d2a..ec1f7fd6089 100644
--- a/spec/controllers/steps_controller_spec.rb
+++ b/spec/controllers/steps_controller_spec.rb
@@ -7,11 +7,10 @@ describe StepsController do
   end
 
   it 'needs you to be logged in' do
-    expect do
-      put :update, params: {
-        id: 'made-up-id', fields: { forum_title: "updated title" }
-      }, format: :json
-    end.to raise_error(Discourse::NotLoggedIn)
+    put :update, params: {
+      id: 'made-up-id', fields: { forum_title: "updated title" }
+    }, format: :json
+    expect(response.status).to eq(403)
   end
 
   it "raises an error if you aren't an admin" do
diff --git a/spec/controllers/topic_controller_spec.rb b/spec/controllers/topic_controller_spec.rb
index 6be013eb884..16ecfc9e33f 100644
--- a/spec/controllers/topic_controller_spec.rb
+++ b/spec/controllers/topic_controller_spec.rb
@@ -33,7 +33,7 @@ describe TopicsController do
       get :show, params: { id: 666 }
       expect(controller.theme_key).to eq(theme.key)
 
-      theme.update_columns(user_selectable: false)
+      theme.update_attribute(:user_selectable, false)
 
       get :show, params: { id: 666 }
       expect(controller.theme_key).not_to eq(theme.key)
@@ -125,34 +125,6 @@ describe TopicsController do
     end
   end
 
-  describe "crawler" do
-    render_views
-
-    context "when not a crawler" do
-      it "renders with the application layout" do
-        get :show, params: { topic_id: topic.id, slug: topic.slug }
-
-        body = response.body
-
-        expect(body).to have_tag(:script, with: { src: '/assets/application.js' })
-        expect(body).to have_tag(:meta, with: { name: 'fragment' })
-      end
-    end
-
-    context "when a crawler" do
-      it "renders with the crawler layout" do
-        request.env["HTTP_USER_AGENT"] = "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)"
-        get :show, params: { topic_id: topic.id, slug: topic.slug }
-
-        body = response.body
-
-        expect(body).to have_tag(:body, with: { class: 'crawler' })
-        expect(body).to_not have_tag(:meta, with: { name: 'fragment' })
-      end
-    end
-
-  end
-
   describe "print" do
     render_views
 
diff --git a/spec/controllers/topics_controller_spec.rb b/spec/controllers/topics_controller_spec.rb
deleted file mode 100644
index 12c7537cf07..00000000000
--- a/spec/controllers/topics_controller_spec.rb
+++ /dev/null
@@ -1,1644 +0,0 @@
-require 'rails_helper'
-
-def topics_controller_show_gen_perm_tests(expected, ctx)
-  expected.each do |sym, status|
-    params = "topic_id: #{sym}.id, slug: #{sym}.slug"
-    if sym == :nonexist
-      params = "topic_id: nonexist_topic_id"
-    end
-
-    method = <<~TEXT
-    it 'returns #{status} for #{sym}' do
-      begin
-        get :show, params: { #{params} }
-        expect(response.status).to eq(#{status})
-      rescue Discourse::NotLoggedIn
-        expect(302).to eq(#{status})
-      end
-    end
-    TEXT
-
-    ctx.instance_eval(method)
-  end
-end
-
-describe TopicsController do
-
-  context 'wordpress' do
-    let!(:user) { log_in(:moderator) }
-    let(:p1) { Fabricate(:post, user: user) }
-    let(:topic) { p1.topic }
-    let!(:p2) { Fabricate(:post, topic: topic, user: user) }
-
-    it "returns the JSON in the format our wordpress plugin needs" do
-      SiteSetting.external_system_avatars_enabled = false
-
-      get :wordpress, params: { topic_id: topic.id, best: 3 }, format: :json
-
-      expect(response).to be_success
-      json = ::JSON.parse(response.body)
-      expect(json).to be_present
-
-      # The JSON has the data the wordpress plugin needs
-      expect(json['id']).to eq(topic.id)
-      expect(json['posts_count']).to eq(2)
-      expect(json['filtered_posts_count']).to eq(2)
-
-      # Posts
-      expect(json['posts'].size).to eq(1)
-      post = json['posts'][0]
-      expect(post['id']).to eq(p2.id)
-      expect(post['username']).to eq(user.username)
-      expect(post['avatar_template']).to eq("#{Discourse.base_url_no_prefix}#{user.avatar_template}")
-      expect(post['name']).to eq(user.name)
-      expect(post['created_at']).to be_present
-      expect(post['cooked']).to eq(p2.cooked)
-
-      # Participants
-      expect(json['participants'].size).to eq(1)
-      participant = json['participants'][0]
-      expect(participant['id']).to eq(user.id)
-      expect(participant['username']).to eq(user.username)
-      expect(participant['avatar_template']).to eq("#{Discourse.base_url_no_prefix}#{user.avatar_template}")
-    end
-  end
-
-  context 'move_posts' do
-    it 'needs you to be logged in' do
-      expect do
-        post :move_posts, params: {
-          topic_id: 111,
-          title: 'blah',
-          post_ids: [1, 2, 3]
-        }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
-    end
-
-    describe 'moving to a new topic' do
-      let(:user) { log_in(:moderator) }
-      let(:p1) { Fabricate(:post, user: user) }
-      let(:topic) { p1.topic }
-
-      it "raises an error without postIds" do
-        expect do
-          post :move_posts, params: {
-            topic_id: topic.id, title: 'blah'
-          }, format: :json
-        end.to raise_error(ActionController::ParameterMissing)
-      end
-
-      it "raises an error when the user doesn't have permission to move the posts" do
-        Guardian.any_instance.expects(:can_move_posts?).returns(false)
-
-        post :move_posts, params: {
-          topic_id: topic.id, title: 'blah', post_ids: [1, 2, 3]
-        }, format: :json
-
-        expect(response).to be_forbidden
-      end
-
-      context 'success' do
-        let(:user) { log_in(:admin) }
-        let(:p2) { Fabricate(:post, user: user, topic: topic) }
-
-        it "returns success" do
-          p2
-
-          expect do
-            post :move_posts, params: {
-              topic_id: topic.id,
-              title: 'Logan is a good movie',
-              post_ids: [p2.id],
-              category_id: 123
-            }, format: :json
-          end.to change { Topic.count }.by(1)
-
-          expect(response).to be_success
-
-          result = ::JSON.parse(response.body)
-
-          expect(result['success']).to eq(true)
-          expect(result['url']).to eq(Topic.last.relative_url)
-        end
-
-        describe 'when topic has been deleted' do
-          it 'should still be able to move posts' do
-            PostDestroyer.new(user, topic.first_post).destroy
-
-            expect(topic.reload.deleted_at).to_not be_nil
-
-            expect do
-              post :move_posts, params: {
-                topic_id: topic.id,
-                title: 'Logan is a good movie',
-                post_ids: [p2.id],
-                category_id: 123
-              }, format: :json
-            end.to change { Topic.count }.by(1)
-
-            expect(response).to be_success
-
-            result = JSON.parse(response.body)
-
-            expect(result['success']).to eq(true)
-            expect(result['url']).to eq(Topic.last.relative_url)
-          end
-        end
-      end
-
-      context 'failure' do
-        let(:p2) { Fabricate(:post, user: user) }
-
-        before do
-          Topic.any_instance.expects(:move_posts).with(user, [p2.id], title: 'blah').returns(nil)
-
-          post :move_posts, params: {
-            topic_id: topic.id, title: 'blah', post_ids: [p2.id]
-          }, format: :json
-        end
-
-        it "returns JSON with a false success" do
-          expect(response).to be_success
-          result = ::JSON.parse(response.body)
-          expect(result['success']).to eq(false)
-          expect(result['url']).to be_blank
-        end
-      end
-    end
-
-    describe "moving replied posts" do
-      let!(:user) { log_in(:moderator) }
-      let!(:p1) { Fabricate(:post, user: user) }
-      let!(:topic) { p1.topic }
-      let!(:p2) { Fabricate(:post, topic: topic, user: user, reply_to_post_number: p1.post_number) }
-
-      context 'success' do
-
-        before do
-          PostReply.create(post_id: p1.id, reply_id: p2.id)
-        end
-
-        it "moves the child posts too" do
-          Topic.any_instance.expects(:move_posts).with(user, [p1.id, p2.id], title: 'blah').returns(topic)
-
-          post :move_posts, params: {
-            topic_id: topic.id,
-            title: 'blah',
-            post_ids: [p1.id],
-            reply_post_ids: [p1.id]
-          }, format: :json
-        end
-      end
-
-    end
-
-    describe 'moving to an existing topic' do
-      let!(:user) { log_in(:moderator) }
-      let(:p1) { Fabricate(:post, user: user) }
-      let(:topic) { p1.topic }
-      let(:dest_topic) { Fabricate(:topic) }
-
-      context 'success' do
-        let(:p2) { Fabricate(:post, user: user) }
-
-        before do
-          Topic.any_instance.expects(:move_posts).with(user, [p2.id], destination_topic_id: dest_topic.id).returns(topic)
-
-          post :move_posts, params: {
-            topic_id: topic.id,
-            post_ids: [p2.id],
-            destination_topic_id: dest_topic.id
-          }, format: :json
-        end
-
-        it "returns success" do
-          expect(response).to be_success
-          result = ::JSON.parse(response.body)
-          expect(result['success']).to eq(true)
-          expect(result['url']).to be_present
-        end
-      end
-
-      context 'failure' do
-        let(:p2) { Fabricate(:post, user: user) }
-
-        before do
-          Topic.any_instance.expects(:move_posts).with(user, [p2.id], destination_topic_id: dest_topic.id).returns(nil)
-
-          post :move_posts, params: {
-            topic_id: topic.id,
-            destination_topic_id: dest_topic.id,
-            post_ids: [p2.id]
-          }, format: :json
-        end
-
-        it "returns JSON with a false success" do
-          expect(response).to be_success
-          result = ::JSON.parse(response.body)
-          expect(result['success']).to eq(false)
-          expect(result['url']).to be_blank
-        end
-      end
-    end
-  end
-
-  context "merge_topic" do
-    it 'needs you to be logged in' do
-      expect do
-        post :merge_topic, params: {
-          topic_id: 111, destination_topic_id: 345
-        }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
-    end
-
-    describe 'moving to a new topic' do
-      let!(:user) { log_in(:moderator) }
-      let(:p1) { Fabricate(:post, user: user) }
-      let(:topic) { p1.topic }
-
-      it "raises an error without destination_topic_id" do
-        expect do
-          post :merge_topic, params: { topic_id: topic.id }, format: :json
-        end.to raise_error(ActionController::ParameterMissing)
-      end
-
-      it "raises an error when the user doesn't have permission to merge" do
-        Guardian.any_instance.expects(:can_move_posts?).returns(false)
-
-        post :merge_topic,
-          params: { topic_id: 111, destination_topic_id: 345 },
-          format: :json
-
-        expect(response).to be_forbidden
-      end
-
-      let(:dest_topic) { Fabricate(:topic) }
-
-      context 'moves all the posts to the destination topic' do
-        let(:p2) { Fabricate(:post, user: user) }
-
-        before do
-          Topic.any_instance.expects(:move_posts).with(user, [p1.id], destination_topic_id: dest_topic.id).returns(topic)
-
-          post :merge_topic, params: {
-            topic_id: topic.id, destination_topic_id: dest_topic.id
-          }, format: :json
-        end
-
-        it "returns success" do
-          expect(response).to be_success
-          result = ::JSON.parse(response.body)
-          expect(result['success']).to eq(true)
-          expect(result['url']).to be_present
-        end
-      end
-
-    end
-
-  end
-
-  context 'change_post_owners' do
-    it 'needs you to be logged in' do
-      expect do
-        post :change_post_owners, params: {
-          topic_id: 111,
-          username: 'user_a',
-          post_ids: [1, 2, 3]
-        }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
-    end
-
-    describe 'forbidden to moderators' do
-      let!(:moderator) { log_in(:moderator) }
-      it 'correctly denies' do
-        post :change_post_owners, params: {
-          topic_id: 111, username: 'user_a', post_ids: [1, 2, 3]
-        }, format: :json
-
-        expect(response).to be_forbidden
-      end
-    end
-
-    describe 'forbidden to trust_level_4s' do
-      let!(:trust_level_4) { log_in(:trust_level_4) }
-
-      it 'correctly denies' do
-        post :change_post_owners, params: {
-          topic_id: 111, username: 'user_a', post_ids: [1, 2, 3]
-        }, format: :json
-
-        expect(response).to be_forbidden
-      end
-    end
-
-    describe 'changing ownership' do
-      let!(:editor) { log_in(:admin) }
-      let(:topic) { Fabricate(:topic) }
-      let(:user_a) { Fabricate(:user) }
-      let(:p1) { Fabricate(:post, topic_id: topic.id) }
-      let(:p2) { Fabricate(:post, topic_id: topic.id) }
-
-      it "raises an error with a parameter missing" do
-        expect do
-          post :change_post_owners, params: {
-            topic_id: 111, post_ids: [1, 2, 3]
-          }, format: :json
-        end.to raise_error(ActionController::ParameterMissing)
-
-        expect do
-          post :change_post_owners, params: {
-            topic_id: 111, username: 'user_a'
-          }, format: :json
-        end.to raise_error(ActionController::ParameterMissing)
-      end
-
-      it "calls PostOwnerChanger" do
-        PostOwnerChanger.any_instance.expects(:change_owner!).returns(true)
-        post :change_post_owners, params: {
-          topic_id: topic.id, username: user_a.username_lower, post_ids: [p1.id]
-        }, format: :json
-
-        expect(response).to be_success
-      end
-
-      it "changes multiple posts" do
-        post :change_post_owners, params: {
-          topic_id: topic.id, username: user_a.username_lower, post_ids: [p1.id, p2.id]
-        }, format: :json
-
-        expect(response).to be_success
-
-        p1.reload
-        p2.reload
-
-        expect(p1.user).to_not eq(nil)
-        expect(p1.reload.user).to eq(p2.reload.user)
-      end
-
-      it "works with deleted users" do
-        deleted_user = Fabricate(:user)
-        t2 = Fabricate(:topic, user: deleted_user)
-        p3 = Fabricate(:post, topic_id: t2.id, user: deleted_user)
-        deleted_user.save
-        t2.save
-        p3.save
-
-        UserDestroyer.new(editor).destroy(deleted_user, delete_posts: true, context: 'test', delete_as_spammer: true)
-
-        post :change_post_owners, params: {
-          topic_id: t2.id, username: user_a.username_lower, post_ids: [p3.id]
-        }, format: :json
-
-        expect(response).to be_success
-        t2.reload
-        p3.reload
-        expect(t2.deleted_at).to be_nil
-        expect(p3.user).to eq(user_a)
-      end
-    end
-  end
-
-  context 'change_timestamps' do
-    let(:params) { { topic_id: 1, timestamp: Time.zone.now } }
-
-    it 'needs you to be logged in' do
-      expect do
-        put :change_timestamps, params: params, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
-    end
-
-    [:moderator, :trust_level_4].each do |user|
-      describe "forbidden to #{user}" do
-        let!(user) { log_in(user) }
-
-        it 'correctly denies' do
-          put :change_timestamps, params: params, format: :json
-          expect(response).to be_forbidden
-        end
-      end
-    end
-
-    describe 'changing timestamps' do
-      let!(:admin) { log_in(:admin) }
-      let(:old_timestamp) { Time.zone.now }
-      let(:new_timestamp) { old_timestamp - 1.day }
-      let!(:topic) { Fabricate(:topic, created_at: old_timestamp) }
-      let!(:p1) { Fabricate(:post, topic_id: topic.id, created_at: old_timestamp) }
-      let!(:p2) { Fabricate(:post, topic_id: topic.id, created_at: old_timestamp + 1.day) }
-
-      it 'raises an error with a missing parameter' do
-        expect do
-          put :change_timestamps, params: { topic_id: 1 }, format: :json
-        end.to raise_error(ActionController::ParameterMissing)
-      end
-
-      it 'should update the timestamps of selected posts' do
-        put :change_timestamps, params: {
-          topic_id: topic.id, timestamp: new_timestamp.to_f
-        }, format: :json
-
-        expect(topic.reload.created_at).to be_within_one_second_of(new_timestamp)
-        expect(p1.reload.created_at).to be_within_one_second_of(new_timestamp)
-        expect(p2.reload.created_at).to be_within_one_second_of(old_timestamp)
-      end
-    end
-  end
-
-  context 'clear_pin' do
-    it 'needs you to be logged in' do
-      expect do
-        put :clear_pin, params: { topic_id: 1 }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
-    end
-
-    context 'when logged in' do
-      let(:topic) { Fabricate(:topic) }
-      let!(:user) { log_in }
-
-      it "fails when the user can't see the topic" do
-        Guardian.any_instance.expects(:can_see?).with(topic).returns(false)
-        put :clear_pin, params: { topic_id: topic.id }, format: :json
-        expect(response).not_to be_success
-      end
-
-      describe 'when the user can see the topic' do
-        it "calls clear_pin_for if the user can see the topic" do
-          Topic.any_instance.expects(:clear_pin_for).with(user).once
-          put :clear_pin, params: { topic_id: topic.id }, format: :json
-        end
-
-        it "succeeds" do
-          put :clear_pin, params: { topic_id: topic.id }, format: :json
-          expect(response).to be_success
-        end
-      end
-
-    end
-
-  end
-
-  context 'status' do
-    it 'needs you to be logged in' do
-      expect do
-        put :status, params: {
-          topic_id: 1, status: 'visible', enabled: true
-        }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
-    end
-
-    describe 'when logged in' do
-      before do
-        @user = log_in(:moderator)
-        @topic = Fabricate(:topic, user: @user)
-      end
-
-      it "raises an exception if you can't change it" do
-        Guardian.any_instance.expects(:can_moderate?).with(@topic).returns(false)
-
-        put :status, params: {
-          topic_id: @topic.id, status: 'visible', enabled: 'true'
-        }, format: :json
-
-        expect(response).to be_forbidden
-      end
-
-      it 'requires the status parameter' do
-        expect do
-          put :status, params: {
-            topic_id: @topic.id, enabled: true
-          }, format: :json
-        end.to raise_error(ActionController::ParameterMissing)
-      end
-
-      it 'requires the enabled parameter' do
-        expect do
-          put :status, params: {
-            topic_id: @topic.id, status: 'visible'
-          }, format: :json
-        end.to raise_error(ActionController::ParameterMissing)
-      end
-
-      it 'raises an error with a status not in the whitelist' do
-        expect do
-          put :status, params: {
-            topic_id: @topic.id, status: 'title', enabled: 'true'
-          }, format: :json
-        end.to raise_error(Discourse::InvalidParameters)
-      end
-
-      it 'should update the status of the topic correctly' do
-        @topic = Fabricate(:topic, user: @user, closed: true, topic_timers: [
-          Fabricate(:topic_timer, status_type: TopicTimer.types[:open])
-        ])
-
-        put :status, params: {
-          topic_id: @topic.id, status: 'closed', enabled: 'false'
-        }, format: :json
-
-        expect(response).to be_success
-        expect(@topic.reload.closed).to eq(false)
-        expect(@topic.topic_timers).to eq([])
-
-        body = JSON.parse(response.body)
-
-        expect(body['topic_status_update']).to eq(nil)
-      end
-
-    end
-
-  end
-
-  context 'delete_timings' do
-
-    it 'needs you to be logged in' do
-      expect do
-        delete :destroy_timings, params: { topic_id: 1 }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
-    end
-
-    context 'when logged in' do
-      before do
-        @user = log_in
-        @topic = Fabricate(:topic, user: @user)
-        @topic_user = TopicUser.get(@topic, @topic.user)
-      end
-
-      it 'deletes the forum topic user record' do
-        PostTiming.expects(:destroy_for).with(@user.id, [@topic.id])
-        delete :destroy_timings, params: { topic_id: @topic.id }, format: :json
-      end
-
-    end
-
-  end
-
-  describe 'mute/unmute' do
-
-    it 'needs you to be logged in' do
-      expect do
-        put :mute, params: { topic_id: 99 }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
-    end
-
-    it 'needs you to be logged in' do
-      expect do
-        put :unmute, params: { topic_id: 99 }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
-    end
-  end
-
-  describe 'recover' do
-    it "won't allow us to recover a topic when we're not logged in" do
-      expect do
-        put :recover, params: { topic_id: 1 }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
-    end
-
-    describe 'when logged in' do
-      let(:topic) { Fabricate(:topic, user: log_in, deleted_at: Time.now, deleted_by: log_in) }
-
-      describe 'without access' do
-        it "raises an exception when the user doesn't have permission to delete the topic" do
-          Guardian.any_instance.expects(:can_recover_topic?).with(topic).returns(false)
-          put :recover, params: { topic_id: topic.id }, format: :json
-          expect(response).to be_forbidden
-        end
-      end
-
-      context 'with permission' do
-        before do
-          Guardian.any_instance.expects(:can_recover_topic?).with(topic).returns(true)
-        end
-
-        it 'succeeds' do
-          PostDestroyer.any_instance.expects(:recover)
-          put :recover, params: { topic_id: topic.id }, format: :json
-          expect(response).to be_success
-        end
-      end
-    end
-
-  end
-
-  describe 'delete' do
-    it "won't allow us to delete a topic when we're not logged in" do
-      expect do
-        delete :destroy, params: { id: 1 }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
-    end
-
-    describe 'when logged in' do
-      let(:topic) { Fabricate(:topic, user: log_in) }
-
-      describe 'without access' do
-        it "raises an exception when the user doesn't have permission to delete the topic" do
-          Guardian.any_instance.expects(:can_delete?).with(topic).returns(false)
-          delete :destroy, params: { id: topic.id }, format: :json
-          expect(response).to be_forbidden
-        end
-      end
-
-      describe 'with permission' do
-        before do
-          Guardian.any_instance.expects(:can_delete?).with(topic).returns(true)
-        end
-
-        it 'succeeds' do
-          PostDestroyer.any_instance.expects(:destroy)
-          delete :destroy, params: { id: topic.id }, format: :json
-          expect(response).to be_success
-        end
-
-      end
-
-    end
-  end
-
-  describe 'id_for_slug' do
-    let(:topic) { Fabricate(:post).topic }
-
-    it "returns JSON for the slug" do
-      get :id_for_slug, params: { slug: topic.slug }, format: :json
-      expect(response).to be_success
-      json = ::JSON.parse(response.body)
-      expect(json).to be_present
-      expect(json['topic_id']).to eq(topic.id)
-      expect(json['url']).to eq(topic.url)
-      expect(json['slug']).to eq(topic.slug)
-    end
-
-    it "returns invalid access if the user can't see the topic" do
-      Guardian.any_instance.expects(:can_see?).with(topic).returns(false)
-      get :id_for_slug, params: { slug: topic.slug }, format: :json
-      expect(response).not_to be_success
-    end
-  end
-
-  describe 'show full render' do
-    render_views
-
-    it 'correctly renders canoicals' do
-      topic = Fabricate(:post).topic
-      get :show, params: { topic_id: topic.id, slug: topic.slug }
-
-      expect(response).to be_success
-      expect(css_select("link[rel=canonical]").length).to eq(1)
-      expect(response.headers["Cache-Control"]).to eq("no-store, must-revalidate, no-cache, private")
-    end
-  end
-
-  describe 'show unlisted' do
-    it 'returns 301 even if slug does not match URL' do
-      # in the past we had special logic for unlisted topics
-      # we would require slug unless you made a json call
-      # this was not really providing any security
-      #
-      # we no longer require a topic be visible to perform url correction
-      # if you need to properly hide a topic for users use a secure category
-      # or a PM
-      topic = Fabricate(:topic, visible: false)
-      Fabricate(:post, topic: topic)
-
-      get :show, params: { topic_id: topic.id, slug: topic.slug }, format: :json
-      expect(response).to be_success
-
-      get :show, params: { topic_id: topic.id, slug: "just-guessing" }, format: :json
-      expect(response.code).to eq("301")
-
-      get :show, params: { id: topic.slug }, format: :json
-      expect(response.code).to eq("301")
-    end
-  end
-
-  describe 'show' do
-
-    let(:topic) { Fabricate(:post).topic }
-    let!(:p1) { Fabricate(:post, user: topic.user) }
-    let!(:p2) { Fabricate(:post, user: topic.user) }
-
-    it 'shows a topic correctly' do
-      get :show, params: { topic_id: topic.id, slug: topic.slug }, format: :json
-      expect(response).to be_success
-    end
-
-    it 'return 404 for an invalid page' do
-      get :show, params: { topic_id: topic.id, slug: topic.slug, page: 2 }, format: :json
-      expect(response.code).to eq("404")
-    end
-
-    it 'can find a topic given a slug in the id param' do
-      get :show, params: { id: topic.slug }
-      expect(response).to redirect_to(topic.relative_url)
-    end
-
-    it 'can find a topic when a slug has a number in front' do
-      another_topic = Fabricate(:post).topic
-
-      topic.update_column(:slug, "#{another_topic.id}-reasons-discourse-is-awesome")
-      get :show, params: { id: "#{another_topic.id}-reasons-discourse-is-awesome" }
-
-      expect(response).to redirect_to(topic.relative_url)
-    end
-
-    it 'keeps the post_number parameter around when redirecting' do
-      get :show, params: { id: topic.slug, post_number: 42 }
-      expect(response).to redirect_to(topic.relative_url + "/42")
-    end
-
-    it 'keeps the page around when redirecting' do
-      get :show, params: {
-        id: topic.slug, post_number: 42, page: 123
-      }
-
-      expect(response).to redirect_to(topic.relative_url + "/42?page=123")
-    end
-
-    it 'does not accept page params as an array' do
-      get :show, params: {
-        id: topic.slug, post_number: 42, page: [2]
-      }
-
-      expect(response).to redirect_to("#{topic.relative_url}/42?page=1")
-    end
-
-    it 'returns 404 when an invalid slug is given and no id' do
-      get :show, params: {
-        id: 'nope-nope'
-      }, format: :json
-
-      expect(response.status).to eq(404)
-    end
-
-    it 'returns a 404 when slug and topic id do not match a topic' do
-      get :show, params: {
-        topic_id: 123123, slug: 'topic-that-is-made-up'
-      }, format: :json
-
-      expect(response.status).to eq(404)
-    end
-
-    it 'returns a 404 for an ID that is larger than postgres limits' do
-      get :show, params: {
-        topic_id: 5014217323220164041, slug: 'topic-that-is-made-up'
-      }, format: :json
-
-      expect(response.status).to eq(404)
-    end
-
-    context 'a topic with nil slug exists' do
-      before do
-        @nil_slug_topic = Fabricate(:topic)
-        Topic.connection.execute("update topics set slug=null where id = #{@nil_slug_topic.id}") # can't find a way to set slug column to null using the model
-      end
-
-      it 'returns a 404 when slug and topic id do not match a topic' do
-        get :show, params: {
-          topic_id: 123123, slug: 'topic-that-is-made-up'
-        }, format: :json
-
-        expect(response.status).to eq(404)
-      end
-    end
-
-    context 'permission errors' do
-      let(:allowed_user) { Fabricate(:user) }
-      let(:allowed_group) { Fabricate(:group) }
-      let(:secure_category) {
-        c = Fabricate(:category)
-        c.permissions = [[allowed_group, :full]]
-        c.save
-        allowed_user.groups = [allowed_group]
-        allowed_user.save
-        c }
-      let(:normal_topic) { Fabricate(:topic) }
-      let(:secure_topic) { Fabricate(:topic, category: secure_category) }
-      let(:private_topic) { Fabricate(:private_message_topic, user: allowed_user) }
-      let(:deleted_topic) { Fabricate(:deleted_topic) }
-      let(:deleted_secure_topic) { Fabricate(:topic, category: secure_category, deleted_at: 1.day.ago) }
-      let(:deleted_private_topic) { Fabricate(:private_message_topic, user: allowed_user, deleted_at: 1.day.ago) }
-      let(:nonexist_topic_id) { Topic.last.id + 10000 }
-
-      context 'anonymous' do
-        expected = {
-          normal_topic: 200,
-          secure_topic: 403,
-          private_topic: 302,
-          deleted_topic: 410,
-          deleted_secure_topic: 403,
-          deleted_private_topic: 302,
-          nonexist: 404
-        }
-        topics_controller_show_gen_perm_tests(expected, self)
-      end
-
-      context 'anonymous with login required' do
-        before do
-          SiteSetting.login_required = true
-        end
-        expected = {
-          normal_topic: 302,
-          secure_topic: 302,
-          private_topic: 302,
-          deleted_topic: 302,
-          deleted_secure_topic: 302,
-          deleted_private_topic: 302,
-          nonexist: 302
-        }
-        topics_controller_show_gen_perm_tests(expected, self)
-      end
-
-      context 'normal user' do
-        before do
-          log_in(:user)
-        end
-
-        expected = {
-          normal_topic: 200,
-          secure_topic: 403,
-          private_topic: 403,
-          deleted_topic: 410,
-          deleted_secure_topic: 403,
-          deleted_private_topic: 403,
-          nonexist: 404
-        }
-        topics_controller_show_gen_perm_tests(expected, self)
-      end
-
-      context 'allowed user' do
-        before do
-          log_in_user(allowed_user)
-        end
-
-        expected = {
-          normal_topic: 200,
-          secure_topic: 200,
-          private_topic: 200,
-          deleted_topic: 410,
-          deleted_secure_topic: 410,
-          deleted_private_topic: 410,
-          nonexist: 404
-        }
-        topics_controller_show_gen_perm_tests(expected, self)
-      end
-
-      context 'moderator' do
-        before do
-          log_in(:moderator)
-        end
-
-        expected = {
-          normal_topic: 200,
-          secure_topic: 403,
-          private_topic: 403,
-          deleted_topic: 200,
-          deleted_secure_topic: 403,
-          deleted_private_topic: 403,
-          nonexist: 404
-        }
-        topics_controller_show_gen_perm_tests(expected, self)
-      end
-
-      context 'admin' do
-        before do
-          log_in(:admin)
-        end
-
-        expected = {
-          normal_topic: 200,
-          secure_topic: 200,
-          private_topic: 200,
-          deleted_topic: 200,
-          deleted_secure_topic: 200,
-          deleted_private_topic: 200,
-          nonexist: 404
-        }
-        topics_controller_show_gen_perm_tests(expected, self)
-      end
-    end
-
-    it 'records a view' do
-      expect do
-        get :show, params: {
-          topic_id: topic.id, slug: topic.slug
-        }, format: :json
-      end.to change(TopicViewItem, :count).by(1)
-    end
-
-    it 'records incoming links' do
-      user = Fabricate(:user)
-
-      get :show, params: {
-        topic_id: topic.id, slug: topic.slug, u: user.username
-      }
-
-      expect(IncomingLink.count).to eq(1)
-    end
-
-    context 'print' do
-
-      it "doesn't renders the print view when disabled" do
-        SiteSetting.max_prints_per_hour_per_user = 0
-
-        get :show, params: {
-          topic_id: topic.id, slug: topic.slug, print: true
-        }
-
-        expect(response).to be_forbidden
-      end
-
-      it 'renders the print view when enabled' do
-        SiteSetting.max_prints_per_hour_per_user = 10
-
-        get :show, params: {
-          topic_id: topic.id, slug: topic.slug, print: true
-        }
-
-        expect(response).to be_successful
-      end
-    end
-
-    it 'records redirects' do
-      request.env['HTTP_REFERER'] = 'http://twitter.com'
-      get :show, params: { id: topic.id }
-
-      request.env['HTTP_REFERER'] = nil
-      get :show, params: { topic_id: topic.id, slug: topic.slug }
-
-      link = IncomingLink.first
-      expect(link.referer).to eq('http://twitter.com')
-    end
-
-    it 'tracks a visit for all html requests' do
-      current_user = log_in(:coding_horror)
-      TopicUser.expects(:track_visit!).with(topic.id, current_user.id)
-      get :show, params: { topic_id: topic.id, slug: topic.slug }
-    end
-
-    context 'consider for a promotion' do
-      let!(:user) { log_in(:coding_horror) }
-      let(:promotion) do
-        result = double
-        Promotion.stubs(:new).with(user).returns(result)
-        result
-      end
-
-      it "reviews the user for a promotion if they're new" do
-        user.update_column(:trust_level, TrustLevel[0])
-        Promotion.any_instance.expects(:review)
-        get :show, params: { topic_id: topic.id, slug: topic.slug }, format: :json
-      end
-    end
-
-    context 'filters' do
-
-      it 'grabs first page when no filter is provided' do
-        TopicView.any_instance.expects(:filter_posts_in_range).with(0, 19)
-
-        get :show, params: {
-          topic_id: topic.id, slug: topic.slug
-        }, format: :json
-      end
-
-      it 'grabs first page when first page is provided' do
-        TopicView.any_instance.expects(:filter_posts_in_range).with(0, 19)
-
-        get :show, params: {
-          topic_id: topic.id, slug: topic.slug, page: 1
-        }, format: :json
-      end
-
-      it 'grabs correct range when a page number is provided' do
-        TopicView.any_instance.expects(:filter_posts_in_range).with(20, 39)
-
-        get :show, params: {
-          topic_id: topic.id, slug: topic.slug, page: 2
-        }, format: :json
-      end
-
-      it 'delegates a post_number param to TopicView#filter_posts_near' do
-        TopicView.any_instance.expects(:filter_posts_near).with(p2.post_number)
-
-        get :show, params: {
-          topic_id: topic.id, slug: topic.slug, post_number: p2.post_number
-        }, format: :json
-      end
-    end
-
-    context "when 'login required' site setting has been enabled" do
-      before { SiteSetting.login_required = true }
-
-      context 'and the user is logged in' do
-        before { log_in(:coding_horror) }
-
-        it 'shows the topic' do
-          get :show, params: { topic_id: topic.id, slug: topic.slug }, format: :json
-          expect(response).to be_successful
-        end
-      end
-
-      context 'and the user is not logged in' do
-        let(:api_key) { topic.user.generate_api_key(topic.user) }
-
-        it 'redirects to the login page' do
-          get :show, params: {
-            topic_id: topic.id, slug: topic.slug
-          }, format: :json
-
-          expect(response).to redirect_to login_path
-        end
-
-        it 'shows the topic if valid api key is provided' do
-          get :show, params: {
-            topic_id: topic.id, slug: topic.slug, api_key: api_key.key
-          }, format: :json
-
-          expect(response).to be_successful
-          topic.reload
-          # free test, only costs a reload
-          expect(topic.views).to eq(1)
-        end
-
-        it 'returns 403 for an invalid key' do
-          [:json, :html].each do |format|
-            get :show, params: {
-              topic_id: topic.id, slug: topic.slug, api_key: "bad"
-            }, format: format
-
-            expect(response.code.to_i).to be(403)
-            expect(response.body).to include(I18n.t("invalid_access"))
-          end
-        end
-      end
-    end
-  end
-
-  describe '#posts' do
-    let(:topic) { Fabricate(:post).topic }
-
-    it 'returns first posts of the topic' do
-      get :posts, params: { topic_id: topic.id }, format: :json
-      expect(response).to be_success
-      expect(response.content_type).to eq('application/json')
-    end
-  end
-
-  describe '#feed' do
-    let(:topic) { Fabricate(:post).topic }
-
-    it 'renders rss of the topic' do
-      get :feed, params: { topic_id: topic.id, slug: 'foo' }, format: :rss
-      expect(response).to be_success
-      expect(response.content_type).to eq('application/rss+xml')
-    end
-  end
-
-  describe 'update' do
-    it "won't allow us to update a topic when we're not logged in" do
-      expect do
-        put :update, params: { topic_id: 1, slug: 'xyz' }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
-    end
-
-    describe 'when logged in' do
-      before do
-        @topic = Fabricate(:topic, user: log_in)
-        Fabricate(:post, topic: @topic)
-      end
-
-      describe 'without permission' do
-        it "raises an exception when the user doesn't have permission to update the topic" do
-          Guardian.any_instance.expects(:can_edit?).with(@topic).returns(false)
-
-          put :update, params: {
-            topic_id: @topic.id, slug: @topic.title
-          }, format: :json
-
-          expect(response).to be_forbidden
-        end
-      end
-
-      describe 'with permission' do
-        before do
-          Guardian.any_instance.expects(:can_edit?).with(@topic).returns(true)
-        end
-
-        it 'succeeds' do
-          put :update, params: {
-            topic_id: @topic.id, slug: @topic.title
-          }, format: :json
-
-          expect(response).to be_success
-          expect(::JSON.parse(response.body)['basic_topic']).to be_present
-        end
-
-        it 'allows a change of title' do
-          put :update, params: {
-            topic_id: @topic.id, slug: @topic.title, title: 'This is a new title for the topic'
-          }, format: :json
-
-          @topic.reload
-          expect(@topic.title).to eq('This is a new title for the topic')
-        end
-
-        it "returns errors with invalid titles" do
-          put :update, params: {
-            topic_id: @topic.id, slug: @topic.title, title: 'asdf'
-          }, format: :json
-
-          expect(response).not_to be_success
-        end
-
-        it "returns errors when the rate limit is exceeded" do
-          EditRateLimiter.any_instance.expects(:performed!).raises(RateLimiter::LimitExceeded.new(60))
-          put :update, params: {
-            topic_id: @topic.id, slug: @topic.title, title: 'This is a new title for the topic'
-          }, format: :json
-
-          expect(response).not_to be_success
-        end
-
-        it "returns errors with invalid categories" do
-          put :update, params: {
-            topic_id: @topic.id, slug: @topic.title, category_id: -1
-          }, format: :json
-
-          expect(response).not_to be_success
-        end
-
-        it "doesn't call the PostRevisor when there is no changes" do
-          PostRevisor.any_instance.expects(:revise!).never
-          put :update, params: {
-            topic_id: @topic.id, slug: @topic.title, title: @topic.title, category_id: @topic.category_id
-          }, format: :json
-
-          expect(response).to be_success
-        end
-
-        context 'when topic is private' do
-          before do
-            @topic.archetype = Archetype.private_message
-            @topic.category = nil
-            @topic.save!
-          end
-
-          context 'when there are no changes' do
-            it 'does not call the PostRevisor' do
-              PostRevisor.any_instance.expects(:revise!).never
-
-              put :update, params: {
-                topic_id: @topic.id, slug: @topic.title, title: @topic.title, category_id: @topic.category_id
-              }, format: :json
-
-              expect(response).to be_success
-            end
-          end
-        end
-
-        context "allow_uncategorized_topics is false" do
-          before do
-            SiteSetting.allow_uncategorized_topics = false
-          end
-
-          it "can add a category to an uncategorized topic" do
-            c = Fabricate(:category)
-
-            put :update, params: {
-              topic_id: @topic.id, slug: @topic.title, category_id: c.id
-            }, format: :json
-
-            expect(response).to be_success
-          end
-        end
-
-      end
-    end
-  end
-
-  describe 'invite_group' do
-    let :admins do
-      Group[:admins]
-    end
-
-    let! :admin do
-      log_in :admin
-    end
-
-    before do
-      admins.messageable_level = Group::ALIAS_LEVELS[:everyone]
-      admins.save!
-    end
-
-    it "disallows inviting a group to a topic" do
-      topic = Fabricate(:topic)
-      post :invite_group, params: {
-        topic_id: topic.id, group: 'admins'
-      }, format: :json
-
-      expect(response.status).to eq(422)
-    end
-
-    it "allows inviting a group to a PM" do
-      topic = Fabricate(:private_message_topic)
-      post :invite_group, params: {
-        topic_id: topic.id, group: 'admins'
-      }, format: :json
-
-      expect(response.status).to eq(200)
-      expect(topic.allowed_groups.first.id).to eq(admins.id)
-    end
-  end
-
-  describe 'invite' do
-
-    describe "group invites" do
-      it "works correctly" do
-        group = Fabricate(:group)
-        topic = Fabricate(:topic)
-        _admin = log_in(:admin)
-
-        post :invite, params: {
-          topic_id: topic.id, email: 'hiro@from.heros', group_ids: "#{group.id}"
-        }, format: :json
-
-        expect(response).to be_success
-
-        invite = Invite.find_by(email: 'hiro@from.heros')
-        groups = invite.groups.to_a
-        expect(groups.count).to eq(1)
-        expect(groups[0].id).to eq(group.id)
-      end
-    end
-
-    it "won't allow us to invite toa topic when we're not logged in" do
-      expect do
-        post :invite, params: {
-          topic_id: 1, email: 'jake@adventuretime.ooo'
-        }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
-    end
-
-    describe 'when logged in as group manager' do
-      let(:group_manager) { log_in }
-      let(:group) { Fabricate(:group).tap { |g| g.add_owner(group_manager) } }
-      let(:private_category)  { Fabricate(:private_category, group: group) }
-      let(:group_private_topic) { Fabricate(:topic, category: private_category, user: group_manager) }
-      let(:recipient) { 'jake@adventuretime.ooo' }
-
-      it "should attach group to the invite" do
-        post :invite, params: {
-          topic_id: group_private_topic.id, user: recipient
-        }, format: :json
-
-        expect(response).to be_success
-        expect(Invite.find_by(email: recipient).groups).to eq([group])
-      end
-    end
-
-    describe 'when logged in' do
-      before do
-        @topic = Fabricate(:topic, user: log_in)
-      end
-
-      it 'requires an email parameter' do
-        expect do
-          post :invite, params: { topic_id: @topic.id }, format: :json
-        end.to raise_error(ActionController::ParameterMissing)
-      end
-
-      describe 'without permission' do
-        it "raises an exception when the user doesn't have permission to invite to the topic" do
-          post :invite, params: {
-            topic_id: @topic.id, user: 'jake@adventuretime.ooo'
-          }, format: :json
-
-          expect(response).to be_forbidden
-        end
-      end
-
-      describe 'with admin permission' do
-
-        let!(:admin) do
-          log_in :admin
-        end
-
-        it 'should work as expected' do
-          post :invite, params: {
-            topic_id: @topic.id, user: 'jake@adventuretime.ooo'
-          }, format: :json
-
-          expect(response).to be_success
-          expect(::JSON.parse(response.body)).to eq('success' => 'OK')
-          expect(Invite.where(invited_by_id: admin.id).count).to eq(1)
-        end
-
-        it 'should fail on shoddy email' do
-          post :invite, params: {
-            topic_id: @topic.id, user: 'i_am_not_an_email'
-          }, format: :json
-
-          expect(response).not_to be_success
-          expect(::JSON.parse(response.body)).to eq('failed' => 'FAILED')
-        end
-
-      end
-
-    end
-
-  end
-
-  describe 'make_banner' do
-
-    it 'needs you to be a staff member' do
-      log_in
-      put :make_banner, params: { topic_id: 99 }, format: :json
-      expect(response).to be_forbidden
-    end
-
-    describe 'when logged in' do
-
-      it "changes the topic archetype to 'banner'" do
-        topic = Fabricate(:topic, user: log_in(:admin))
-        Topic.any_instance.expects(:make_banner!)
-
-        put :make_banner, params: { topic_id: topic.id }, format: :json
-        expect(response).to be_success
-      end
-    end
-  end
-
-  describe 'remove_allowed_user' do
-    it 'admin can be removed from a pm' do
-
-      admin = log_in :admin
-      user = Fabricate(:user)
-      pm = create_post(user: user, archetype: 'private_message', target_usernames: [user.username, admin.username])
-
-      put :remove_allowed_user, params: {
-        topic_id: pm.topic_id, username: admin.username
-      }, format: :json
-
-      expect(response.status).to eq(200)
-      expect(TopicAllowedUser.where(topic_id: pm.topic_id, user_id: admin.id).first).to eq(nil)
-    end
-  end
-
-  describe 'remove_banner' do
-
-    it 'needs you to be a staff member' do
-      log_in
-      put :remove_banner, params: { topic_id: 99 }, format: :json
-      expect(response).to be_forbidden
-    end
-
-    describe 'when logged in' do
-
-      it "resets the topic archetype" do
-        topic = Fabricate(:topic, user: log_in(:admin))
-        Topic.any_instance.expects(:remove_banner!)
-
-        put :remove_banner, params: { topic_id: topic.id }, format: :json
-        expect(response).to be_success
-      end
-
-    end
-
-  end
-
-  describe "bulk" do
-    it 'needs you to be logged in' do
-      expect do
-        put :bulk, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
-    end
-
-    describe "when logged in" do
-      let!(:user) { log_in }
-      let(:operation) { { type: 'change_category', category_id: '1' } }
-      let(:topic_ids) { [1, 2, 3] }
-
-      it "requires a list of topic_ids or filter" do
-        expect do
-          put :bulk, params: { operation: operation }, format: :json
-        end.to raise_error(ActionController::ParameterMissing)
-      end
-
-      it "requires an operation param" do
-        expect do
-          put :bulk, params: { topic_ids: topic_ids }, format: :json
-        end.to raise_error(ActionController::ParameterMissing)
-      end
-
-      it "requires a type field for the operation param" do
-        expect do
-          put :bulk, params: { topic_ids: topic_ids, operation: {} }, format: :json
-        end.to raise_error(ActionController::ParameterMissing)
-      end
-
-      it "can find unread" do
-        # mark all unread muted
-        put :bulk, params: {
-          filter: 'unread', operation: { type: :change_notification_level, notification_level_id: 0 }
-        }, format: :json
-
-        expect(response.status).to eq(200)
-      end
-
-      it "delegates work to `TopicsBulkAction`" do
-        topics_bulk_action = mock
-        TopicsBulkAction.expects(:new).with(user, topic_ids, operation, group: nil).returns(topics_bulk_action)
-        topics_bulk_action.expects(:perform!)
-
-        put :bulk, params: {
-          topic_ids: topic_ids, operation: operation
-        }, format: :json
-      end
-    end
-  end
-
-  describe 'remove_bookmarks' do
-    it "should remove bookmarks properly from non first post" do
-      bookmark = PostActionType.types[:bookmark]
-      user = log_in
-
-      post = create_post
-      post2 = create_post(topic_id: post.topic_id)
-
-      PostAction.act(user, post2, bookmark)
-
-      put :bookmark, params: { topic_id: post.topic_id }, format: :json
-      expect(PostAction.where(user_id: user.id, post_action_type: bookmark).count).to eq(2)
-
-      put :remove_bookmarks, params: { topic_id: post.topic_id }, format: :json
-      expect(PostAction.where(user_id: user.id, post_action_type: bookmark).count).to eq(0)
-    end
-
-    it "should disallow bookmarks on posts you have no access to" do
-      log_in
-      user = Fabricate(:user)
-      pm = create_post(user: user, archetype: 'private_message', target_usernames: [user.username])
-
-      put :bookmark, params: { topic_id: pm.topic_id }, format: :json
-      expect(response).to be_forbidden
-    end
-  end
-
-  describe 'reset_new' do
-    it 'needs you to be logged in' do
-      expect do
-        put :reset_new, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
-    end
-
-    let(:user) { log_in(:user) }
-
-    it "updates the `new_since` date" do
-      old_date = 2.years.ago
-
-      user.user_stat.update_column(:new_since, old_date)
-
-      put :reset_new, format: :json
-      user.reload
-      expect(user.user_stat.new_since.to_date).not_to eq(old_date.to_date)
-    end
-
-  end
-
-  describe "feature_stats" do
-    it "works" do
-      get :feature_stats, params: { category_id: 1 }, format: :json
-
-      expect(response).to be_success
-      json = JSON.parse(response.body)
-      expect(json["pinned_in_category_count"]).to eq(0)
-      expect(json["pinned_globally_count"]).to eq(0)
-      expect(json["banner_count"]).to eq(0)
-    end
-
-    it "allows unlisted banner topic" do
-      Fabricate(:topic, category_id: 1, archetype: Archetype.banner, visible: false)
-
-      get :feature_stats, params: { category_id: 1 }, format: :json
-      json = JSON.parse(response.body)
-      expect(json["banner_count"]).to eq(1)
-    end
-  end
-
-  describe "x-robots-tag" do
-    it "is included for unlisted topics" do
-      topic = Fabricate(:topic, visible: false)
-      get :show, params: { topic_id: topic.id, slug: topic.slug }, format: :json
-
-      expect(response.headers['X-Robots-Tag']).to eq('noindex')
-    end
-    it "is not included for normal topics" do
-      topic = Fabricate(:topic, visible: true)
-      get :show, params: { topic_id: topic.id, slug: topic.slug }, format: :json
-
-      expect(response.headers['X-Robots-Tag']).to eq(nil)
-    end
-  end
-
-  context "excerpts" do
-
-    it "can correctly get excerpts" do
-
-      first_post = create_post(raw: 'This is the first post :)', title: 'This is a test title I am making yay')
-      second_post = create_post(raw: 'This is second post', topic: first_post.topic)
-
-      random_post = Fabricate(:post)
-
-      get :excerpts, params: {
-        topic_id: first_post.topic_id,
-        post_ids: [first_post.id, second_post.id, random_post.id]
-      }, format: :json
-
-      json = JSON.parse(response.body)
-      json.sort! { |a, b| a["post_id"] <=> b["post_id"] }
-
-      # no random post
-      expect(json.length).to eq(2)
-      # keep emoji images
-      expect(json[0]["excerpt"]).to match(/emoji/)
-      expect(json[0]["excerpt"]).to match(/first post/)
-      expect(json[0]["username"]).to eq(first_post.user.username)
-      expect(json[0]["post_id"]).to eq(first_post.id)
-
-      expect(json[1]["excerpt"]).to match(/second post/)
-
-    end
-
-  end
-
-  context "convert_topic" do
-    it 'needs you to be logged in' do
-      expect do
-        put :convert_topic, params: { id: 111, type: "private" }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
-    end
-
-    describe 'converting public topic to private message' do
-      let(:user) { Fabricate(:user) }
-      let(:topic) { Fabricate(:topic, user: user) }
-
-      it "raises an error when the user doesn't have permission to convert topic" do
-        log_in
-        put :convert_topic, params: {
-          id: topic.id, type: "private"
-        }, format: :json
-
-        expect(response).to be_forbidden
-      end
-
-      context "success" do
-        before do
-          admin = log_in(:admin)
-          Topic.any_instance.expects(:convert_to_private_message).with(admin).returns(topic)
-
-          put :convert_topic, params: {
-            id: topic.id, type: "private"
-          }, format: :json
-        end
-
-        it "returns success" do
-          expect(response).to be_success
-          result = ::JSON.parse(response.body)
-          expect(result['success']).to eq(true)
-          expect(result['url']).to be_present
-        end
-      end
-    end
-
-    describe 'converting private message to public topic' do
-      let(:user) { Fabricate(:user) }
-      let(:topic) { Fabricate(:topic, user: user) }
-
-      it "raises an error when the user doesn't have permission to convert topic" do
-        log_in
-        put :convert_topic, params: {
-          id: topic.id, type: "public"
-        }, format: :json
-
-        expect(response).to be_forbidden
-      end
-
-      context "success" do
-        before do
-          admin = log_in(:admin)
-          Topic.any_instance.expects(:convert_to_public_topic).with(admin).returns(topic)
-
-          put :convert_topic, params: {
-            id: topic.id, type: "public"
-          }, format: :json
-        end
-
-        it "returns success" do
-          expect(response).to be_success
-          result = ::JSON.parse(response.body)
-          expect(result['success']).to eq(true)
-          expect(result['url']).to be_present
-        end
-      end
-    end
-  end
-
-end
diff --git a/spec/controllers/uploads_controller_spec.rb b/spec/controllers/uploads_controller_spec.rb
index 988b7f2dc45..a98cd9ebe77 100644
--- a/spec/controllers/uploads_controller_spec.rb
+++ b/spec/controllers/uploads_controller_spec.rb
@@ -5,7 +5,8 @@ describe UploadsController do
   context '.create' do
 
     it 'requires you to be logged in' do
-      expect { post :create, format: :json }.to raise_error(Discourse::NotLoggedIn)
+      post :create, format: :json
+      expect(response.status).to eq(403)
     end
 
     context 'logged in' do
@@ -58,21 +59,20 @@ describe UploadsController do
         expect(id).to be
       end
 
-      it 'is successful with synchronous api' do
+      it 'is successful with api' do
         SiteSetting.authorized_extensions = "*"
         controller.stubs(:is_api?).returns(true)
 
+        FinalDestination.stubs(:lookup_ip).returns("1.2.3.4")
+
         Jobs.expects(:enqueue).with(:create_avatar_thumbnails, anything)
 
-        stub_request(:head, 'http://example.com/image.png')
-        stub_request(:get, "http://example.com/image.png").to_return(body: File.read('spec/fixtures/images/logo.png'))
+        url = "http://example.com/image.png"
+        png = File.read(Rails.root + "spec/fixtures/images/logo.png")
 
-        post :create, params: {
-          url: 'http://example.com/image.png',
-          type: "avatar",
-          synchronous: true,
-          format: :json
-        }
+        stub_request(:get, url).to_return(status: 200, body: png)
+
+        post :create, params: { url: url, type: "avatar", format: :json }
 
         json = ::JSON.parse(response.body)
 
@@ -147,6 +147,36 @@ describe UploadsController do
         expect(id).to be
       end
 
+      it 'respects `authorized_extensions_for_staff` setting when staff upload file' do
+        SiteSetting.authorized_extensions = ""
+        SiteSetting.authorized_extensions_for_staff = "*"
+        @user.update_columns(moderator: true)
+
+        post :create, params: {
+          file: text_file,
+          type: "composer",
+          format: :json
+        }
+
+        expect(response).to be_success
+        data = JSON.parse(response.body)
+        expect(data["id"]).to be
+      end
+
+      it 'ignores `authorized_extensions_for_staff` setting when non-staff upload file' do
+        SiteSetting.authorized_extensions = ""
+        SiteSetting.authorized_extensions_for_staff = "*"
+
+        post :create, params: {
+          file: text_file,
+          type: "composer",
+          format: :json
+        }
+
+        data = JSON.parse(response.body)
+        expect(data["errors"].first).to eq(I18n.t("upload.unauthorized", authorized_extensions: ''))
+      end
+
       it 'returns an error when it could not determine the dimensions of an image' do
         Jobs.expects(:enqueue).with(:create_avatar_thumbnails, anything).never
 
diff --git a/spec/controllers/user_api_keys_controller_spec.rb b/spec/controllers/user_api_keys_controller_spec.rb
index 64a43182a12..5e430cc5c07 100644
--- a/spec/controllers/user_api_keys_controller_spec.rb
+++ b/spec/controllers/user_api_keys_controller_spec.rb
@@ -55,9 +55,8 @@ describe UserApiKeysController do
   context 'create' do
 
     it "does not allow anon" do
-      expect {
-        post :create, params: args, format: :json
-      }.to raise_error(Discourse::NotLoggedIn)
+      post :create, params: args, format: :json
+      expect(response.status).to eq(403)
     end
 
     it "refuses to redirect to disallowed place" do
diff --git a/spec/controllers/user_avatars_controller_spec.rb b/spec/controllers/user_avatars_controller_spec.rb
index 57a9a2cdf35..7218cd8a065 100644
--- a/spec/controllers/user_avatars_controller_spec.rb
+++ b/spec/controllers/user_avatars_controller_spec.rb
@@ -31,7 +31,6 @@ describe UserAvatarsController do
       SiteSetting.s3_upload_bucket = "test"
       SiteSetting.s3_cdn_url = "http://cdn.com"
 
-      stub_request(:head, "http://cdn.com/something/else")
       stub_request(:get, "http://cdn.com/something/else").to_return(body: 'image')
 
       GlobalSetting.expects(:cdn_url).returns("http://awesome.com/boom")
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
deleted file mode 100644
index 704ff66e998..00000000000
--- a/spec/controllers/users_controller_spec.rb
+++ /dev/null
@@ -1,2397 +0,0 @@
-require 'rails_helper'
-
-describe UsersController do
-
-  describe '.show' do
-
-    context "anon" do
-
-      let(:user) { Discourse.system_user }
-
-      it "returns success" do
-        get :show, params: { username: user.username }, format: :json
-        expect(response).to be_success
-      end
-
-      it "should redirect to login page for anonymous user when profiles are hidden" do
-        SiteSetting.hide_user_profiles_from_public = true
-        get :show, params: { username: user.username }, format: :json
-        expect(response).to redirect_to '/login'
-      end
-
-    end
-
-    context "logged in" do
-
-      let(:user) { log_in }
-
-      it 'returns success' do
-        get :show, params: { username: user.username, format: :json }, format: :json
-        expect(response).to be_success
-        json = JSON.parse(response.body)
-
-        expect(json["user"]["has_title_badges"]).to eq(false)
-      end
-
-      it "returns not found when the username doesn't exist" do
-        get :show, params: { username: 'madeuppity' }, format: :json
-        expect(response).not_to be_success
-      end
-
-      it 'returns not found when the user is inactive' do
-        inactive = Fabricate(:user, active: false)
-        get :show, params: { username: inactive.username }, format: :json
-        expect(response).not_to be_success
-      end
-
-      it 'returns success when show_inactive_accounts is true and user is logged in' do
-        SiteSetting.show_inactive_accounts = true
-        log_in_user(user)
-        inactive = Fabricate(:user, active: false)
-        get :show, params: { username: inactive.username }, format: :json
-        expect(response).to be_success
-      end
-
-      it "raises an error on invalid access" do
-        Guardian.any_instance.expects(:can_see?).with(user).returns(false)
-        get :show, params: { username: user.username }, format: :json
-        expect(response).to be_forbidden
-      end
-
-      describe "user profile views" do
-        let(:other_user) { Fabricate(:user) }
-
-        it "should track a user profile view for a signed in user" do
-          UserProfileView.expects(:add).with(other_user.user_profile.id, request.remote_ip, user.id)
-          get :show, params: { username: other_user.username }, format: :json
-        end
-
-        it "should not track a user profile view for a user viewing his own profile" do
-          UserProfileView.expects(:add).never
-          get :show, params: { username: user.username }, format: :json
-        end
-
-        it "should track a user profile view for an anon user" do
-          UserProfileView.expects(:add).with(other_user.user_profile.id, request.remote_ip, nil)
-          get :show, params: { username: other_user.username }, format: :json
-        end
-
-        it "skips tracking" do
-          UserProfileView.expects(:add).never
-          get :show, params: { username: user.username, skip_track_visit: true }, format: :json
-        end
-      end
-
-      context "fetching a user by external_id" do
-        before { user.create_single_sign_on_record(external_id: '997', last_payload: '') }
-
-        it "returns fetch for a matching external_id" do
-          get :show, params: { external_id: '997' }, format: :json
-          expect(response).to be_success
-        end
-
-        it "returns not found when external_id doesn't match" do
-          get :show, params: { external_id: '99' }, format: :json
-          expect(response).not_to be_success
-        end
-      end
-
-      describe "include_post_count_for" do
-
-        let(:admin) { Fabricate(:admin) }
-        let(:topic) { Fabricate(:topic) }
-
-        before do
-          Fabricate(:post, user: user, topic: topic)
-          Fabricate(:post, user: admin, topic: topic)
-          Fabricate(:post, user: admin, topic: topic, post_type: Post.types[:whisper])
-        end
-
-        it "includes only visible posts" do
-          get :show,
-            params: { username: admin.username, include_post_count_for: topic.id },
-            format: :json
-
-          topic_post_count = JSON.parse(response.body).dig("user", "topic_post_count")
-          expect(topic_post_count[topic.id.to_s]).to eq(1)
-        end
-
-        it "includes all post types for staff members" do
-          log_in_user(admin)
-
-          get :show,
-            params: { username: admin.username, include_post_count_for: topic.id },
-            format: :json
-
-          topic_post_count = JSON.parse(response.body).dig("user", "topic_post_count")
-          expect(topic_post_count[topic.id.to_s]).to eq(2)
-        end
-
-      end
-
-    end
-
-  end
-
-  describe '.user_preferences_redirect' do
-    it 'requires the user to be logged in' do
-      expect { get :user_preferences_redirect }.to raise_error(Discourse::NotLoggedIn)
-    end
-
-    it "redirects to their profile when logged in" do
-      user = log_in
-      get :user_preferences_redirect
-      expect(response).to redirect_to("/u/#{user.username_lower}/preferences")
-    end
-  end
-
-  describe '.activate_account' do
-    before do
-      UsersController.any_instance.stubs(:honeypot_or_challenge_fails?).returns(false)
-    end
-
-    context 'invalid token' do
-
-      it 'return success' do
-        EmailToken.expects(:confirm).with('asdfasdf').returns(nil)
-        put :perform_account_activation, params: { token: 'asdfasdf' }
-        expect(response).to be_success
-        expect(flash[:error]).to be_present
-      end
-    end
-
-    context 'valid token' do
-      let(:user) { Fabricate(:user) }
-
-      context 'welcome message' do
-        before do
-          EmailToken.expects(:confirm).with('asdfasdf').returns(user)
-        end
-
-        it 'enqueues a welcome message if the user object indicates so' do
-          user.send_welcome_message = true
-          user.expects(:enqueue_welcome_message).with('welcome_user')
-
-          put :perform_account_activation, params: { token: 'asdfasdf' }
-        end
-
-        it "doesn't enqueue the welcome message if the object returns false" do
-          user.send_welcome_message = false
-          user.expects(:enqueue_welcome_message).with('welcome_user').never
-
-          put :perform_account_activation, params: { token: 'asdfasdf' }
-        end
-      end
-
-      context "honeypot" do
-        it "raises an error if the honeypot is invalid" do
-          UsersController.any_instance.stubs(:honeypot_or_challenge_fails?).returns(true)
-          put :perform_account_activation, params: { token: 'asdfasdf' }, format: :json
-          expect(response).not_to be_success
-        end
-      end
-
-      context 'response' do
-        render_views
-
-        before do
-          Guardian.any_instance.expects(:can_access_forum?).returns(true)
-          EmailToken.expects(:confirm).with('asdfasdf').returns(user)
-        end
-
-        it 'correctly logs on user' do
-          events = DiscourseEvent.track_events do
-            put :perform_account_activation, params: { token: 'asdfasdf' }
-          end
-
-          expect(events.map { |event| event[:event_name] }).to include(
-            :user_logged_in, :user_first_logged_in
-          )
-
-          expect(response).to be_success
-          expect(flash[:error]).to be_blank
-          expect(session[:current_user_id]).to be_present
-
-          expect(response).to be_success
-
-          expect(CGI.unescapeHTML(response.body))
-            .to_not include(I18n.t('activation.approval_required'))
-        end
-
-      end
-
-      context 'user is not approved' do
-        render_views
-
-        before do
-          SiteSetting.must_approve_users = true
-          EmailToken.expects(:confirm).with('asdfasdf').returns(user)
-          put :perform_account_activation, params: { token: 'asdfasdf' }
-        end
-
-        it 'should return the right response' do
-          expect(response).to be_success
-
-          expect(CGI.unescapeHTML(response.body))
-            .to include(I18n.t('activation.approval_required'))
-
-          expect(response.body).to_not have_tag(:script, with: {
-            src: '/assets/application.js'
-          })
-
-          expect(flash[:error]).to be_blank
-          expect(session[:current_user_id]).to be_blank
-        end
-      end
-
-    end
-  end
-
-  describe '#perform_account_activation' do
-    describe 'when cookies contains a destination URL' do
-      let(:token) { 'asdadwewq' }
-      let(:user) { Fabricate(:user) }
-
-      before do
-        UsersController.any_instance.stubs(:honeypot_or_challenge_fails?).returns(false)
-        EmailToken.expects(:confirm).with(token).returns(user)
-      end
-
-      it 'should redirect to the URL' do
-        destination_url = 'http://thisisasite.com/somepath'
-        request.cookies[:destination_url] = destination_url
-
-        put :perform_account_activation, params: { token: token }
-
-        expect(response).to redirect_to(destination_url)
-      end
-    end
-  end
-
-  describe '.password_reset' do
-    let(:user) { Fabricate(:user) }
-
-    context "you can view it even if login is required" do
-      it "returns success" do
-        SiteSetting.login_required = true
-        get :password_reset, params: { token: 'asdfasdf' }
-        expect(response).to be_success
-      end
-    end
-
-    context 'missing token' do
-      render_views
-
-      before do
-        get :password_reset, params: { token: SecureRandom.hex }
-      end
-
-      it 'disallows login' do
-        expect(response).to be_success
-
-        expect(CGI.unescapeHTML(response.body))
-          .to include(I18n.t('password_reset.no_token'))
-
-        expect(response.body).to_not have_tag(:script, with: {
-          src: '/assets/application.js'
-        })
-
-        expect(session[:current_user_id]).to be_blank
-      end
-    end
-
-    context 'invalid token' do
-      render_views
-
-      it 'disallows login' do
-        get :password_reset, params: { token: "evil_trout!" }
-
-        expect(response).to be_success
-
-        expect(CGI.unescapeHTML(response.body))
-          .to include(I18n.t('password_reset.no_token'))
-
-        expect(response.body).to_not have_tag(:script, with: {
-          src: '/assets/application.js'
-        })
-
-        expect(session[:current_user_id]).to be_blank
-      end
-
-      it "responds with proper error message" do
-        put :password_reset, params: {
-          token: "evil_trout!", password: "awesomeSecretPassword"
-        }, format: :json
-
-        expect(response).to be_success
-        expect(JSON.parse(response.body)["message"]).to eq(I18n.t('password_reset.no_token'))
-        expect(session[:current_user_id]).to be_blank
-      end
-    end
-
-    context 'valid token' do
-      render_views
-
-      context 'when rendered' do
-        it 'renders referrer never on get requests' do
-          user = Fabricate(:user)
-          token = user.email_tokens.create(email: user.email).token
-          get :password_reset, params: { token: token }
-
-          expect(response.body).to include('<meta name="referrer" content="never">')
-        end
-      end
-
-      it 'returns success' do
-        user = Fabricate(:user)
-        user_auth_token = UserAuthToken.generate!(user_id: user.id)
-        token = user.email_tokens.create(email: user.email).token
-        get :password_reset, params: { token: token }
-
-        events = DiscourseEvent.track_events do
-          put :password_reset,
-            params: { token: token, password: 'hg9ow8yhg98o' }
-        end
-
-        expect(events.map { |event| event[:event_name] }).to include(
-          :user_logged_in, :user_first_logged_in
-        )
-
-        expect(response).to be_success
-        expect(response.body).to include('{"is_developer":false,"admin":false}')
-
-        user.reload
-
-        expect(session["password-#{token}"]).to be_blank
-        expect(UserAuthToken.where(id: user_auth_token.id).count).to eq(0)
-      end
-
-      it 'disallows double password reset' do
-        user = Fabricate(:user)
-        token = user.email_tokens.create(email: user.email).token
-
-        get :password_reset, params: { token: token }
-
-        put :password_reset,
-          params: { token: token, password: 'hg9ow8yHG32O' }
-
-        put :password_reset,
-          params: { token: token, password: 'test123987AsdfXYZ' }
-
-        user.reload
-        expect(user.confirm_password?('hg9ow8yHG32O')).to eq(true)
-
-        # logged in now
-        expect(user.user_auth_tokens.count).to eq(1)
-      end
-
-      it "doesn't redirect to wizard on get" do
-        user = Fabricate(:admin)
-        UserAuthToken.generate!(user_id: user.id)
-
-        token = user.email_tokens.create(email: user.email).token
-        get :password_reset, params: { token: token }, format: :json
-        expect(response).not_to redirect_to(wizard_path)
-      end
-
-      it "redirects to the wizard if you're the first admin" do
-        user = Fabricate(:admin)
-        UserAuthToken.generate!(user_id: user.id)
-
-        token = user.email_tokens.create(email: user.email).token
-        get :password_reset, params: { token: token }
-
-        put :password_reset, params: {
-          token: token, password: 'hg9ow8yhg98oadminlonger'
-        }
-
-        expect(response).to redirect_to(wizard_path)
-      end
-
-      it "doesn't invalidate the token when loading the page" do
-        user = Fabricate(:user)
-        user_token = UserAuthToken.generate!(user_id: user.id)
-
-        email_token = user.email_tokens.create(email: user.email)
-
-        get :password_reset, params: { token: email_token.token }, format: :json
-
-        email_token.reload
-
-        expect(email_token.confirmed).to eq(false)
-        expect(UserAuthToken.where(id: user_token.id).count).to eq(1)
-      end
-    end
-
-    context 'submit change' do
-      let(:token) { EmailToken.generate_token }
-
-      before do
-        EmailToken.expects(:confirm).with(token).returns(user)
-      end
-
-      it "fails when the password is blank" do
-        put :password_reset, params: {
-          token: token, password: ''
-        }, format: :json
-
-        expect(response).to be_success
-        expect(JSON.parse(response.body)["errors"]).to be_present
-        expect(session[:current_user_id]).to be_blank
-      end
-
-      it "fails when the password is too long" do
-        put :password_reset, params: {
-          token: token, password: ('x' * (User.max_password_length + 1))
-        }, format: :json
-
-        expect(response).to be_success
-        expect(JSON.parse(response.body)["errors"]).to be_present
-        expect(session[:current_user_id]).to be_blank
-      end
-
-      it "logs in the user" do
-        put :password_reset, params: {
-          token: token, password: 'ksjafh928r'
-        }, format: :json
-
-        expect(response).to be_success
-        expect(JSON.parse(response.body)["errors"]).to be_blank
-        expect(session[:current_user_id]).to be_present
-      end
-
-      it "doesn't log in the user when not approved" do
-        SiteSetting.must_approve_users = true
-        put :password_reset, params: {
-          token: token, password: 'ksjafh928r'
-        }, format: :json
-
-        expect(JSON.parse(response.body)["errors"]).to be_blank
-        expect(session[:current_user_id]).to be_blank
-      end
-    end
-  end
-
-  describe '.confirm_email_token' do
-    let(:user) { Fabricate(:user) }
-
-    it "token doesn't match any records" do
-      email_token = user.email_tokens.create(email: user.email)
-      get :confirm_email_token, params: { token: SecureRandom.hex }, format: :json
-      expect(response).to be_success
-      expect(email_token.reload.confirmed).to eq(false)
-    end
-
-    it "token matches" do
-      email_token = user.email_tokens.create(email: user.email)
-      get :confirm_email_token, params: { token: email_token.token }, format: :json
-      expect(response).to be_success
-      expect(email_token.reload.confirmed).to eq(true)
-    end
-  end
-
-  describe '.admin_login' do
-    let(:admin) { Fabricate(:admin) }
-    let(:user) { Fabricate(:user) }
-
-    context 'enqueues mail' do
-      it 'enqueues mail with admin email and sso enabled' do
-        Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :admin_login, user_id: admin.id))
-        put :admin_login, params: { email: admin.email }
-      end
-    end
-
-    context 'logs in admin' do
-      it 'does not log in admin with invalid token' do
-        SiteSetting.sso_url = "https://www.example.com/sso"
-        SiteSetting.enable_sso = true
-        get :admin_login, params: { token: "invalid" }
-        expect(session[:current_user_id]).to be_blank
-      end
-
-      context 'valid token' do
-        it 'does log in admin with SSO disabled' do
-          SiteSetting.enable_sso = false
-          token = admin.email_tokens.create(email: admin.email).token
-
-          get :admin_login, params: { token: token }
-          expect(response).to redirect_to('/')
-          expect(session[:current_user_id]).to eq(admin.id)
-        end
-
-        it 'logs in admin with SSO enabled' do
-          SiteSetting.sso_url = "https://www.example.com/sso"
-          SiteSetting.enable_sso = true
-          token = admin.email_tokens.create(email: admin.email).token
-
-          get :admin_login, params: { token: token }
-          expect(response).to redirect_to('/')
-          expect(session[:current_user_id]).to eq(admin.id)
-        end
-      end
-    end
-  end
-
-  describe '#toggle_anon' do
-    it 'allows you to toggle anon if enabled' do
-      SiteSetting.allow_anonymous_posting = true
-
-      user = log_in
-      user.trust_level = 1
-      user.save
-
-      post :toggle_anon, format: :json
-      expect(response).to be_success
-      expect(session[:current_user_id]).to eq(AnonymousShadowCreator.get(user).id)
-
-      post :toggle_anon, format: :json
-      expect(response).to be_success
-      expect(session[:current_user_id]).to eq(user.id)
-
-    end
-  end
-
-  describe '#create' do
-
-    before do
-      UsersController.any_instance.stubs(:honeypot_value).returns(nil)
-      UsersController.any_instance.stubs(:challenge_value).returns(nil)
-      SiteSetting.allow_new_registrations = true
-      @user = Fabricate.build(:user)
-      @user.password = "strongpassword"
-    end
-
-    let(:post_user_params) do
-      { name: @user.name,
-        username: @user.username,
-        password: "strongpassword",
-        email: @user.email }
-    end
-
-    def post_user
-      post :create, params: post_user_params, format: :json
-    end
-
-    context 'when email params is missing' do
-      it 'should raise the right error' do
-        expect do
-          post :create, params: {
-            name: @user.name,
-            username: @user.username,
-            passsword: 'tesing12352343'
-          }, format: :json
-        end.to raise_error(ActionController::ParameterMissing)
-      end
-    end
-
-    context 'when creating a user' do
-      it 'sets the user locale to I18n.locale' do
-        SiteSetting.default_locale = 'en'
-        I18n.stubs(:locale).returns(:fr)
-        post_user
-        expect(User.find_by(username: @user.username).locale).to eq('fr')
-      end
-    end
-
-    context 'when creating a non active user (unconfirmed email)' do
-
-      it 'returns a 500 when local logins are disabled' do
-        SiteSetting.enable_local_logins = false
-        post_user
-
-        expect(response.status).to eq(500)
-      end
-
-      it 'returns an error when new registrations are disabled' do
-        SiteSetting.allow_new_registrations = false
-        post_user
-        json = JSON.parse(response.body)
-        expect(json['success']).to eq(false)
-        expect(json['message']).to be_present
-      end
-
-      it 'creates a user correctly' do
-        Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :signup))
-        User.any_instance.expects(:enqueue_welcome_message).with('welcome_user').never
-
-        post_user
-
-        expect(JSON.parse(response.body)['active']).to be_falsey
-
-        # should save user_created_message in session
-        expect(session["user_created_message"]).to be_present
-        expect(session[SessionController::ACTIVATE_USER_KEY]).to be_present
-      end
-
-      context "`must approve users` site setting is enabled" do
-        before { SiteSetting.must_approve_users = true }
-
-        it 'creates a user correctly' do
-          Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :signup))
-          User.any_instance.expects(:enqueue_welcome_message).with('welcome_user').never
-
-          post_user
-
-          expect(JSON.parse(response.body)['active']).to be_falsey
-
-          # should save user_created_message in session
-          expect(session["user_created_message"]).to be_present
-          expect(session[SessionController::ACTIVATE_USER_KEY]).to be_present
-        end
-      end
-
-      context 'users already exists with given email' do
-        let!(:existing) { Fabricate(:user, email: post_user_params[:email]) }
-
-        it 'returns an error if hide_email_address_taken is disabled' do
-          SiteSetting.hide_email_address_taken = false
-          post_user
-          json = JSON.parse(response.body)
-          expect(json['success']).to eq(false)
-          expect(json['message']).to be_present
-        end
-
-        it 'returns success if hide_email_address_taken is enabled' do
-          SiteSetting.hide_email_address_taken = true
-          expect {
-            post_user
-          }.to_not change { User.count }
-          json = JSON.parse(response.body)
-          expect(json['active']).to be_falsey
-          expect(session["user_created_message"]).to be_present
-        end
-      end
-    end
-
-    context "creating as active" do
-      it "won't create the user as active" do
-        post :create, params: post_user_params.merge(active: true), format: :json
-        expect(JSON.parse(response.body)['active']).to be_falsey
-      end
-
-      context "with a regular api key" do
-        let(:user) { Fabricate(:user) }
-        let(:api_key) { Fabricate(:api_key, user: user) }
-
-        it "won't create the user as active with a regular key" do
-          post :create,
-            params: post_user_params.merge(active: true, api_key: api_key.key),
-            format: :json
-
-          expect(JSON.parse(response.body)['active']).to be_falsey
-        end
-      end
-
-      context "with an admin api key" do
-        let(:admin) { Fabricate(:admin) }
-        let(:api_key) { Fabricate(:api_key, user: admin) }
-
-        it "creates the user as active with a regular key" do
-          SiteSetting.queue_jobs = true
-          SiteSetting.send_welcome_message = true
-          SiteSetting.must_approve_users = true
-
-          Sidekiq::Client.expects(:enqueue).never
-
-          post :create,
-            params: post_user_params.merge(approved: true, active: true, api_key: api_key.key),
-            format: :json
-
-          json = JSON.parse(response.body)
-
-          new_user = User.find(json["user_id"])
-
-          expect(json['active']).to be_truthy
-
-          expect(new_user.active).to eq(true)
-          expect(new_user.approved).to eq(true)
-          expect(new_user.approved_by_id).to eq(admin.id)
-          expect(new_user.approved_at).to_not eq(nil)
-        end
-
-        it "won't create the developer as active" do
-          UsernameCheckerService.expects(:is_developer?).returns(true)
-
-          post :create,
-            params: post_user_params.merge(active: true, api_key: api_key.key),
-            format: :json
-
-          expect(JSON.parse(response.body)['active']).to be_falsy
-        end
-      end
-    end
-
-    context "creating as staged" do
-      it "won't create the user as staged" do
-        post :create,
-          params: post_user_params.merge(staged: true),
-          format: :json
-
-        new_user = User.where(username: post_user_params[:username]).first
-        expect(new_user.staged?).to eq(false)
-      end
-
-      context "with a regular api key" do
-        let(:user) { Fabricate(:user) }
-        let(:api_key) { Fabricate(:api_key, user: user) }
-
-        it "won't create the user as staged with a regular key" do
-          post :create,
-            params: post_user_params.merge(staged: true, api_key: api_key.key),
-            format: :json
-
-          new_user = User.where(username: post_user_params[:username]).first
-          expect(new_user.staged?).to eq(false)
-        end
-      end
-
-      context "with an admin api key" do
-        let(:user) { Fabricate(:admin) }
-        let(:api_key) { Fabricate(:api_key, user: user) }
-
-        it "creates the user as staged with a regular key" do
-          post :create,
-            params: post_user_params.merge(staged: true, api_key: api_key.key),
-            format: :json
-
-          new_user = User.where(username: post_user_params[:username]).first
-          expect(new_user.staged?).to eq(true)
-        end
-
-        it "won't create the developer as staged" do
-          UsernameCheckerService.expects(:is_developer?).returns(true)
-          post :create,
-            params: post_user_params.merge(staged: true, api_key: api_key.key),
-            format: :json
-
-          new_user = User.where(username: post_user_params[:username]).first
-          expect(new_user.staged?).to eq(false)
-        end
-      end
-    end
-
-    context 'when creating an active user (confirmed email)' do
-      before { User.any_instance.stubs(:active?).returns(true) }
-
-      it 'enqueues a welcome email' do
-        User.any_instance.expects(:enqueue_welcome_message).with('welcome_user')
-        post_user
-
-        # should save user_created_message in session
-        expect(session["user_created_message"]).to be_present
-        expect(session[SessionController::ACTIVATE_USER_KEY]).to be_present
-      end
-
-      it "shows the 'active' message" do
-        User.any_instance.expects(:enqueue_welcome_message)
-        post_user
-        expect(JSON.parse(response.body)['message']).to eq(
-          I18n.t 'login.active'
-        )
-      end
-
-      it "should be logged in" do
-        User.any_instance.expects(:enqueue_welcome_message)
-        post_user
-        expect(session[:current_user_id]).to be_present
-      end
-
-      it 'indicates the user is active in the response' do
-        User.any_instance.expects(:enqueue_welcome_message)
-        post_user
-        expect(JSON.parse(response.body)['active']).to be_truthy
-      end
-
-      it 'returns 500 status when new registrations are disabled' do
-        SiteSetting.allow_new_registrations = false
-
-        post_user
-
-        json = JSON.parse(response.body)
-        expect(json['success']).to eq(false)
-        expect(json['message']).to be_present
-      end
-
-      context 'authentication records for' do
-
-        it 'should create twitter user info if required' do
-          SiteSetting.must_approve_users = true
-          SiteSetting.enable_twitter_logins = true
-          twitter_auth = { twitter_user_id: 42, twitter_screen_name: "bruce" }
-          auth = session[:authentication] = {}
-          auth[:authenticator_name] = 'twitter'
-          auth[:extra_data] = twitter_auth
-
-          post_user
-
-          expect(TwitterUserInfo.count).to eq(1)
-        end
-      end
-
-      it "returns an error when email has been changed from the validated email address" do
-        auth = session[:authentication] = {}
-        auth[:email_valid] = 'true'
-        auth[:email] = 'therealone@gmail.com'
-        post_user
-        json = JSON.parse(response.body)
-        expect(json['success']).to eq(false)
-        expect(json['message']).to be_present
-      end
-
-      it "will create the user successfully if email validation is required" do
-        auth = session[:authentication] = {}
-        auth[:email] = post_user_params[:email]
-        post_user
-        json = JSON.parse(response.body)
-        expect(json['success']).to eq(true)
-      end
-    end
-
-    context 'after success' do
-      before { post_user }
-
-      it 'should succeed' do
-        is_expected.to respond_with(:success)
-      end
-
-      it 'has the proper JSON' do
-        json = JSON::parse(response.body)
-        expect(json["success"]).to eq(true)
-      end
-
-      it 'should not result in an active account' do
-        expect(User.find_by(username: @user.username).active).to eq(false)
-      end
-    end
-
-    shared_examples 'honeypot fails' do
-      it 'should not create a new user' do
-        expect {
-          post :create, params: create_params, format: :json
-        }.to_not change { User.count }
-      end
-
-      it 'should not send an email' do
-        User.any_instance.expects(:enqueue_welcome_message).never
-        post :create, params: create_params, format: :json
-      end
-
-      it 'should say it was successful' do
-        post :create, params: create_params, format: :json
-        json = JSON::parse(response.body)
-        expect(json["success"]).to eq(true)
-
-        # should not change the session
-        expect(session["user_created_message"]).to be_blank
-        expect(session[SessionController::ACTIVATE_USER_KEY]).to be_blank
-      end
-    end
-
-    context 'when honeypot value is wrong' do
-      before do
-        UsersController.any_instance.stubs(:honeypot_value).returns('abc')
-      end
-      let(:create_params) { { name: @user.name, username: @user.username, password: "strongpassword", email: @user.email, password_confirmation: 'wrong' } }
-      include_examples 'honeypot fails'
-    end
-
-    context 'when challenge answer is wrong' do
-      before do
-        UsersController.any_instance.stubs(:challenge_value).returns('abc')
-      end
-      let(:create_params) { { name: @user.name, username: @user.username, password: "strongpassword", email: @user.email, challenge: 'abc' } }
-      include_examples 'honeypot fails'
-    end
-
-    context "when 'invite only' setting is enabled" do
-      before { SiteSetting.invite_only = true }
-
-      let(:create_params) { {
-        name: @user.name,
-        username: @user.username,
-        password: 'strongpassword',
-        email: @user.email
-      }}
-
-      include_examples 'honeypot fails'
-    end
-
-    shared_examples 'failed signup' do
-      it 'should not create a new User' do
-        expect { post :create, params: create_params, format: :json }.to_not change { User.count }
-      end
-
-      it 'should report failed' do
-        post :create, params: create_params, format: :json
-        json = JSON::parse(response.body)
-        expect(json["success"]).not_to eq(true)
-
-        # should not change the session
-        expect(session["user_created_message"]).to be_blank
-        expect(session[SessionController::ACTIVATE_USER_KEY]).to be_blank
-      end
-    end
-
-    context 'when password is blank' do
-      let(:create_params) { { name: @user.name, username: @user.username, password: "", email: @user.email } }
-      include_examples 'failed signup'
-    end
-
-    context 'when password is too long' do
-      let(:create_params) { { name: @user.name, username: @user.username, password: "x" * (User.max_password_length + 1), email: @user.email } }
-      include_examples 'failed signup'
-    end
-
-    context 'when password param is missing' do
-      let(:create_params) { { name: @user.name, username: @user.username, email: @user.email } }
-      include_examples 'failed signup'
-    end
-
-    context 'with a reserved username' do
-      let(:create_params) { { name: @user.name, username: 'Reserved', email: @user.email, password: "x" * 20 } }
-      before { SiteSetting.reserved_usernames = 'a|reserved|b' }
-      after { SiteSetting.reserved_usernames = nil }
-      include_examples 'failed signup'
-    end
-
-    context 'when an Exception is raised' do
-      before { User.any_instance.stubs(:save).raises(ActiveRecord::StatementInvalid.new('Oh no')) }
-
-      let(:create_params) {
-        { name: @user.name, username: @user.username,
-          password: "strongpassword", email: @user.email }
-      }
-
-      include_examples 'failed signup'
-    end
-
-    context "with custom fields" do
-      let!(:user_field) { Fabricate(:user_field) }
-      let!(:another_field) { Fabricate(:user_field) }
-      let!(:optional_field) { Fabricate(:user_field, required: false) }
-
-      context "without a value for the fields" do
-        let(:create_params) { { name: @user.name, password: 'watwatwat', username: @user.username, email: @user.email } }
-        include_examples 'failed signup'
-      end
-
-      context "with values for the fields" do
-        let(:create_params) { {
-          name: @user.name,
-          password: 'suChS3cuRi7y',
-          username: @user.username,
-          email: @user.email,
-          user_fields: {
-            user_field.id.to_s => 'value1',
-            another_field.id.to_s => 'value2',
-          }
-        } }
-
-        it "should succeed without the optional field" do
-          post :create, params: create_params, format: :json
-          expect(response).to be_success
-          inserted = User.find_by_email(@user.email)
-          expect(inserted).to be_present
-          expect(inserted.custom_fields).to be_present
-          expect(inserted.custom_fields["user_field_#{user_field.id}"]).to eq('value1')
-          expect(inserted.custom_fields["user_field_#{another_field.id}"]).to eq('value2')
-          expect(inserted.custom_fields["user_field_#{optional_field.id}"]).to be_blank
-        end
-
-        it "should succeed with the optional field" do
-          create_params[:user_fields][optional_field.id.to_s] = 'value3'
-          post :create, params: create_params.merge(create_params), format: :json
-          expect(response).to be_success
-          inserted = User.find_by_email(@user.email)
-          expect(inserted).to be_present
-          expect(inserted.custom_fields).to be_present
-          expect(inserted.custom_fields["user_field_#{user_field.id}"]).to eq('value1')
-          expect(inserted.custom_fields["user_field_#{another_field.id}"]).to eq('value2')
-          expect(inserted.custom_fields["user_field_#{optional_field.id}"]).to eq('value3')
-        end
-
-        it "trims excessively long fields" do
-          create_params[:user_fields][optional_field.id.to_s] = ('x' * 3000)
-          post :create, params: create_params.merge(create_params), format: :json
-          expect(response).to be_success
-          inserted = User.find_by_email(@user.email)
-
-          val = inserted.custom_fields["user_field_#{optional_field.id}"]
-          expect(val.length).to eq(UserField.max_length)
-        end
-      end
-    end
-
-    context "with only optional custom fields" do
-      let!(:user_field) { Fabricate(:user_field, required: false) }
-
-      context "without values for the fields" do
-        let(:create_params) { {
-          name: @user.name,
-          password: 'suChS3cuRi7y',
-          username: @user.username,
-          email: @user.email,
-        } }
-
-        it "should succeed" do
-          post :create, params: create_params, format: :json
-          expect(response).to be_success
-          inserted = User.find_by_email(@user.email)
-          expect(inserted).to be_present
-          expect(inserted.custom_fields).not_to be_present
-          expect(inserted.custom_fields["user_field_#{user_field.id}"]).to be_blank
-        end
-      end
-    end
-
-  end
-
-  context '#username' do
-    it 'raises an error when not logged in' do
-      expect do
-        put :username, params: { username: 'somename' }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
-    end
-
-    context 'while logged in' do
-      let(:old_username) { "OrigUsrname" }
-      let(:new_username) { "#{old_username}1234" }
-      let(:user) { Fabricate(:user, username: old_username) }
-
-      before do
-        user.username = old_username
-        log_in_user(user)
-      end
-
-      it 'raises an error without a new_username param' do
-        expect do
-          put :username, params: { username: user.username }, format: :json
-        end.to raise_error(ActionController::ParameterMissing)
-
-        expect(user.reload.username).to eq(old_username)
-      end
-
-      it 'raises an error when you don\'t have permission to change the username' do
-        Guardian.any_instance.expects(:can_edit_username?).with(user).returns(false)
-
-        put :username, params: {
-          username: user.username, new_username: new_username
-        }, format: :json
-
-        expect(response).to be_forbidden
-        expect(user.reload.username).to eq(old_username)
-      end
-
-      it 'raises an error when change_username fails' do
-        put :username,
-          params: { username: user.username, new_username: '@' },
-          format: :json
-
-        expect(response).to_not be_success
-
-        body = JSON.parse(response.body)
-
-        expect(body['errors'].first).to include(I18n.t(
-          'user.username.short', min: User.username_length.begin
-        ))
-
-        expect(user.reload.username).to eq(old_username)
-      end
-
-      it 'should succeed in normal circumstances' do
-        put :username,
-          params: { username: user.username, new_username: new_username },
-          format: :json
-
-        expect(response).to be_success
-        expect(user.reload.username).to eq(new_username)
-      end
-
-      it 'should fail if the user is old' do
-        # Older than the change period and >1 post
-        user.created_at = Time.now - (SiteSetting.username_change_period + 1).days
-        PostCreator.new(user,
-          title: 'This is a test topic',
-          raw: 'This is a test this is a test'
-        ).create
-
-        put :username, params: {
-          username: user.username, new_username: new_username
-        }, format: :json
-
-        expect(response).to be_forbidden
-        expect(user.reload.username).to eq(old_username)
-      end
-
-      it 'should create a staff action log when a staff member changes the username' do
-        acting_user = Fabricate(:admin)
-        log_in_user(acting_user)
-
-        put :username, params: {
-          username: user.username, new_username: new_username
-        }, format: :json
-
-        expect(response).to be_success
-        expect(UserHistory.where(action: UserHistory.actions[:change_username], target_user_id: user.id, acting_user_id: acting_user.id)).to be_present
-        expect(user.reload.username).to eq(new_username)
-      end
-
-      it 'should return a JSON response with the updated username' do
-        put :username, params: {
-          username: user.username, new_username: new_username
-        }, format: :json
-
-        expect(::JSON.parse(response.body)['username']).to eq(new_username)
-      end
-
-    end
-  end
-
-  context '.check_username' do
-    it 'raises an error without any parameters' do
-      expect do
-        get :check_username, format: :json
-      end.to raise_error(ActionController::ParameterMissing)
-    end
-
-    shared_examples 'when username is unavailable' do
-      it 'should return success' do
-        expect(response).to be_success
-      end
-
-      it 'should return available as false in the JSON' do
-        expect(::JSON.parse(response.body)['available']).to eq(false)
-      end
-
-      it 'should return a suggested username' do
-        expect(::JSON.parse(response.body)['suggestion']).to be_present
-      end
-    end
-
-    shared_examples 'when username is available' do
-      it 'should return success' do
-        expect(response).to be_success
-      end
-
-      it 'should return available in the JSON' do
-        expect(::JSON.parse(response.body)['available']).to eq(true)
-      end
-    end
-
-    it 'returns nothing when given an email param but no username' do
-      get :check_username, params: { email: 'dood@example.com' }, format: :json
-      expect(response).to be_success
-    end
-
-    context 'username is available' do
-      before do
-        get :check_username, params: { username: 'BruceWayne' }, format: :json
-      end
-      include_examples 'when username is available'
-    end
-
-    context 'username is unavailable' do
-      let!(:user) { Fabricate(:user) }
-      before do
-        get :check_username, params: { username: user.username }, format: :json
-      end
-      include_examples 'when username is unavailable'
-    end
-
-    shared_examples 'checking an invalid username' do
-      it 'should return success' do
-        expect(response).to be_success
-      end
-
-      it 'should not return an available key' do
-        expect(::JSON.parse(response.body)['available']).to eq(nil)
-      end
-
-      it 'should return an error message' do
-        expect(::JSON.parse(response.body)['errors']).not_to be_empty
-      end
-    end
-
-    context 'has invalid characters' do
-      before do
-        get :check_username, params: {
-          username: 'bad username'
-        }, format: :json
-      end
-      include_examples 'checking an invalid username'
-
-      it 'should return the invalid characters message' do
-        expect(::JSON.parse(response.body)['errors']).to include(I18n.t(:'user.username.characters'))
-      end
-    end
-
-    context 'is too long' do
-      before do
-        get :check_username, params: {
-          username: generate_username(User.username_length.last + 1)
-        }, format: :json
-      end
-      include_examples 'checking an invalid username'
-
-      it 'should return the "too long" message' do
-        expect(::JSON.parse(response.body)['errors']).to include(I18n.t(:'user.username.long', max: User.username_length.end))
-      end
-    end
-
-    describe 'different case of existing username' do
-      context "it's my username" do
-        let!(:user) { Fabricate(:user, username: 'hansolo') }
-        before do
-          log_in_user(user)
-
-          get :check_username, params: {
-            username: 'HanSolo'
-          }, format: :json
-        end
-        include_examples 'when username is available'
-      end
-
-      context "it's someone else's username" do
-        let!(:user) { Fabricate(:user, username: 'hansolo') }
-        before do
-          log_in
-
-          get :check_username, params: {
-            username: 'HanSolo'
-          }, format: :json
-        end
-        include_examples 'when username is unavailable'
-      end
-
-      context "an admin changing it for someone else" do
-        let!(:user) { Fabricate(:user, username: 'hansolo') }
-        before do
-          log_in_user(Fabricate(:admin))
-
-          get :check_username, params: {
-            username: 'HanSolo', for_user_id: user.id
-          }, format: :json
-        end
-        include_examples 'when username is available'
-      end
-    end
-  end
-
-  describe '#invited' do
-    it 'returns success' do
-      user = Fabricate(:user)
-      get :invited, params: { username: user.username }, format: :json
-
-      expect(response).to be_success
-    end
-
-    it 'filters by email' do
-      inviter = Fabricate(:user)
-      invitee = Fabricate(:user)
-      _invite = Fabricate(
-        :invite,
-        email: 'billybob@example.com',
-        invited_by: inviter,
-        user: invitee
-      )
-      Fabricate(
-        :invite,
-        email: 'jimtom@example.com',
-        invited_by: inviter,
-        user: invitee
-      )
-
-      get :invited, params: {
-        username: inviter.username, search: 'billybob'
-      }, format: :json
-
-      invites = JSON.parse(response.body)['invites']
-      expect(invites.size).to eq(1)
-      expect(invites.first).to include('email' => 'billybob@example.com')
-    end
-
-    it 'filters by username' do
-      inviter = Fabricate(:user)
-      invitee = Fabricate(:user, username: 'billybob')
-      _invite = Fabricate(
-        :invite,
-        invited_by: inviter,
-        email: 'billybob@example.com',
-        user: invitee
-      )
-      Fabricate(
-        :invite,
-        invited_by: inviter,
-        user: Fabricate(:user, username: 'jimtom')
-      )
-
-      get :invited, params: {
-        username: inviter.username, search: 'billybob'
-      }, format: :json
-
-      invites = JSON.parse(response.body)['invites']
-      expect(invites.size).to eq(1)
-      expect(invites.first).to include('email' => 'billybob@example.com')
-    end
-
-    context 'with guest' do
-      context 'with pending invites' do
-        it 'does not return invites' do
-          inviter = Fabricate(:user)
-          Fabricate(:invite, invited_by: inviter)
-
-          get :invited,
-            params: { username: inviter.username, filter: 'pending' },
-            format: :json
-
-          invites = JSON.parse(response.body)['invites']
-          expect(invites).to be_empty
-        end
-      end
-
-      context 'with redeemed invites' do
-        it 'returns invites' do
-          inviter = Fabricate(:user)
-          invitee = Fabricate(:user)
-          invite = Fabricate(:invite, invited_by: inviter, user: invitee)
-
-          get :invited,
-            params: { username: inviter.username },
-            format: :json
-
-          invites = JSON.parse(response.body)['invites']
-          expect(invites.size).to eq(1)
-          expect(invites.first).to include('email' => invite.email)
-        end
-      end
-    end
-
-    context 'with authenticated user' do
-      context 'with pending invites' do
-        context 'with permission to see pending invites' do
-          it 'returns invites' do
-            user = log_in
-            inviter = Fabricate(:user)
-            invite = Fabricate(:invite, invited_by: inviter)
-            stub_guardian(user) do |guardian|
-              guardian.stubs(:can_see_invite_details?).
-                with(inviter).returns(true)
-            end
-
-            get :invited, params: {
-              username: inviter.username, filter: 'pending'
-            }, format: :json
-
-            invites = JSON.parse(response.body)['invites']
-            expect(invites.size).to eq(1)
-            expect(invites.first).to include("email" => invite.email)
-          end
-        end
-
-        context 'without permission to see pending invites' do
-          it 'does not return invites' do
-            user = log_in
-            inviter = Fabricate(:user)
-            _invitee = Fabricate(:user)
-            Fabricate(:invite, invited_by: inviter)
-            stub_guardian(user) do |guardian|
-              guardian.stubs(:can_see_invite_details?).
-                with(inviter).returns(false)
-            end
-
-            get :invited, params: {
-              username: inviter.username, filter: 'pending'
-            }, format: :json
-
-            json = JSON.parse(response.body)['invites']
-            expect(json).to be_empty
-          end
-        end
-      end
-
-      context 'with redeemed invites' do
-        it 'returns invites' do
-          _user = log_in
-          inviter = Fabricate(:user)
-          invitee = Fabricate(:user)
-          invite = Fabricate(:invite, invited_by: inviter, user: invitee)
-
-          get :invited, params: { username: inviter.username }, format: :json
-
-          invites = JSON.parse(response.body)['invites']
-          expect(invites.size).to eq(1)
-          expect(invites.first).to include('email' => invite.email)
-        end
-      end
-    end
-  end
-
-  describe '#update' do
-    context 'with guest' do
-      it 'raises an error' do
-        expect do
-          put :update, params: { username: 'guest' }, format: :json
-        end.to raise_error(Discourse::NotLoggedIn)
-      end
-    end
-
-    context "as a staff user" do
-      let!(:user) { log_in(:admin) }
-
-      context "uneditable field" do
-        let!(:user_field) { Fabricate(:user_field, editable: false) }
-
-        it "allows staff to edit the field" do
-          put :update, params: {
-            username: user.username,
-            name: 'Jim Tom',
-            title: "foobar",
-            user_fields: { user_field.id.to_s => 'happy' }
-          }, format: :json
-
-          expect(response).to be_success
-
-          user.reload
-
-          expect(user.user_fields[user_field.id.to_s]).to eq('happy')
-          expect(user.title).to eq("foobar")
-        end
-      end
-
-    end
-
-    context 'with authenticated user' do
-      context 'with permission to update' do
-        let!(:user) { log_in(:user) }
-
-        it 'allows the update' do
-          user2 = Fabricate(:user)
-          user3 = Fabricate(:user)
-
-          put :update, params: {
-            username: user.username,
-            name: 'Jim Tom',
-            custom_fields: { test: :it },
-            muted_usernames: "#{user2.username},#{user3.username}"
-          }, format: :json
-
-          expect(response).to be_success
-
-          user.reload
-
-          expect(user.name).to eq 'Jim Tom'
-          expect(user.custom_fields['test']).to eq 'it'
-          expect(user.muted_users.pluck(:username).sort).to eq [user2.username, user3.username].sort
-
-          theme = Theme.create(name: "test", user_selectable: true, user_id: -1)
-
-          put :update, params: {
-            username: user.username,
-            muted_usernames: "",
-            theme_key: theme.key,
-            email_direct: false
-          }, format: :json
-
-          user.reload
-
-          expect(user.muted_users.pluck(:username).sort).to be_empty
-          expect(user.user_option.theme_key).to eq(theme.key)
-          expect(user.user_option.email_direct).to eq(false)
-        end
-
-        context 'a locale is chosen that differs from I18n.locale' do
-          it "updates the user's locale" do
-            I18n.stubs(:locale).returns('fr')
-
-            put :update, params: {
-              username: user.username,
-              locale: :fa_IR
-            }, format: :json
-
-            expect(User.find_by(username: user.username).locale).to eq('fa_IR')
-          end
-
-        end
-
-        context "with user fields" do
-          context "an editable field" do
-            let!(:user_field) { Fabricate(:user_field) }
-            let!(:optional_field) { Fabricate(:user_field, required: false) }
-
-            it "should update the user field" do
-              put :update, params: {
-                username: user.username, name: 'Jim Tom', user_fields: { user_field.id.to_s => 'happy' }
-              }, format: :json
-
-              expect(response).to be_success
-              expect(user.user_fields[user_field.id.to_s]).to eq 'happy'
-            end
-
-            it "cannot be updated to blank" do
-              put :update, params: {
-                username: user.username, name: 'Jim Tom', user_fields: { user_field.id.to_s => '' }
-              }, format: :json
-
-              expect(response).not_to be_success
-              expect(user.user_fields[user_field.id.to_s]).not_to eq('happy')
-            end
-
-            it "trims excessively large fields" do
-              put :update, params: {
-                username: user.username, name: 'Jim Tom', user_fields: { user_field.id.to_s => ('x' * 3000) }
-              }, format: :json
-
-              expect(user.user_fields[user_field.id.to_s].size).to eq(UserField.max_length)
-            end
-
-            it "should retain existing user fields" do
-              put :update, params: {
-                username: user.username, name: 'Jim Tom', user_fields: { user_field.id.to_s => 'happy', optional_field.id.to_s => 'feet' }
-              }, format: :json
-
-              expect(response).to be_success
-              expect(user.user_fields[user_field.id.to_s]).to eq('happy')
-              expect(user.user_fields[optional_field.id.to_s]).to eq('feet')
-
-              put :update, params: {
-                username: user.username, name: 'Jim Tom', user_fields: { user_field.id.to_s => 'sad' }
-              }, format: :json
-
-              expect(response).to be_success
-
-              user.reload
-
-              expect(user.user_fields[user_field.id.to_s]).to eq('sad')
-              expect(user.user_fields[optional_field.id.to_s]).to eq('feet')
-            end
-          end
-
-          context "uneditable field" do
-            let!(:user_field) { Fabricate(:user_field, editable: false) }
-
-            it "does not update the user field" do
-              put :update, params: {
-                username: user.username, name: 'Jim Tom', user_fields: { user_field.id.to_s => 'happy' }
-              }, format: :json
-
-              expect(response).to be_success
-              expect(user.user_fields[user_field.id.to_s]).to be_blank
-            end
-          end
-
-        end
-
-        it 'returns user JSON' do
-          put :update, params: { username: user.username }, format: :json
-
-          json = JSON.parse(response.body)
-          expect(json['user']['id']).to eq user.id
-        end
-
-      end
-
-      context 'without permission to update' do
-        it 'does not allow the update' do
-          user = Fabricate(:user, name: 'Billy Bob')
-          log_in_user(user)
-          Guardian.any_instance.expects(:can_edit?).with(user).returns(false)
-
-          put :update,
-            params: { username: user.username, name: 'Jim Tom' },
-            format: :json
-
-          expect(response).to be_forbidden
-          expect(user.reload.name).not_to eq 'Jim Tom'
-        end
-      end
-    end
-  end
-
-  describe "badge_card" do
-    let(:user) { Fabricate(:user) }
-    let(:badge) { Fabricate(:badge) }
-    let(:user_badge) { BadgeGranter.grant(badge, user) }
-
-    it "sets the user's card image to the badge" do
-      log_in_user user
-      put :update_card_badge, params: {
-        user_badge_id: user_badge.id, username: user.username
-      }, format: :json
-
-      expect(user.user_profile.reload.card_image_badge_id).to be_blank
-      badge.update_attributes image: "wat.com/wat.jpg"
-
-      put :update_card_badge, params: {
-        user_badge_id: user_badge.id, username: user.username
-      }, format: :json
-
-      expect(user.user_profile.reload.card_image_badge_id).to eq(badge.id)
-
-      # Can set to nothing
-      put :update_card_badge, params: {
-        username: user.username
-      }, format: :json
-
-      expect(user.user_profile.reload.card_image_badge_id).to be_blank
-    end
-  end
-
-  describe "badge_title" do
-    let(:user) { Fabricate(:user) }
-    let(:badge) { Fabricate(:badge) }
-    let(:user_badge) { BadgeGranter.grant(badge, user) }
-
-    it "sets the user's title to the badge name if it is titleable" do
-      log_in_user user
-
-      put :badge_title, params: {
-        user_badge_id: user_badge.id, username: user.username
-      }, format: :json
-
-      expect(user.reload.title).not_to eq(badge.name)
-      badge.update_attributes allow_title: true
-
-      put :badge_title, params: {
-        user_badge_id: user_badge.id, username: user.username
-      }, format: :json
-
-      expect(user.reload.title).to eq(badge.name)
-      expect(user.user_profile.badge_granted_title).to eq(true)
-
-      user.title = "testing"
-      user.save
-      user.user_profile.reload
-      expect(user.user_profile.badge_granted_title).to eq(false)
-
-    end
-  end
-
-  describe 'send_activation_email' do
-    context 'for an existing user' do
-      let(:user) { Fabricate(:user, active: false) }
-
-      context 'for an activated account with email confirmed' do
-        it 'fails' do
-          active_user = Fabricate(:user, active: true)
-          email_token = active_user.email_tokens.create(email: active_user.email).token
-          EmailToken.confirm(email_token)
-          session[SessionController::ACTIVATE_USER_KEY] = active_user.id
-
-          post :send_activation_email, params: {
-            username: active_user.username
-          }, format: :json
-
-          expect(response.status).to eq(409)
-
-          expect(JSON.parse(response.body)['errors']).to include(I18n.t(
-            'activation.activated'
-          ))
-
-          expect(session[SessionController::ACTIVATE_USER_KEY]).to eq(nil)
-        end
-      end
-
-      context 'for an activated account with unconfirmed email' do
-        it 'should send an email' do
-          unconfirmed_email_user = Fabricate(:user, active: true)
-          unconfirmed_email_user.email_tokens.create(email: unconfirmed_email_user.email)
-          session[SessionController::ACTIVATE_USER_KEY] = unconfirmed_email_user.id
-          Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :signup, to_address: unconfirmed_email_user.email))
-
-          post :send_activation_email, params: {
-            username: unconfirmed_email_user.username
-          }, format: :json
-
-          expect(response.status).to eq(200)
-
-          expect(session[SessionController::ACTIVATE_USER_KEY]).to eq(nil)
-        end
-      end
-
-      context "approval is enabled" do
-        before do
-          SiteSetting.must_approve_users = true
-        end
-
-        it "should raise an error" do
-          unconfirmed_email_user = Fabricate(:user, active: true)
-          unconfirmed_email_user.email_tokens.create(email: unconfirmed_email_user.email)
-          session[SessionController::ACTIVATE_USER_KEY] = unconfirmed_email_user.id
-          post :send_activation_email, params: {
-            username: unconfirmed_email_user.username
-          }, format: :json
-
-          expect(response.status).to eq(403)
-        end
-      end
-
-      describe 'when user does not have a valid session' do
-        it 'should not be valid' do
-          user = Fabricate(:user)
-          post :send_activation_email, params: {
-            username: user.username
-          }, format: :json
-
-          expect(response.status).to eq(403)
-        end
-
-        it 'should allow staff regardless' do
-          log_in :admin
-          user = Fabricate(:user, active: false)
-
-          post :send_activation_email, params: {
-            username: user.username
-          }, format: :json
-
-          expect(response.status).to eq(200)
-        end
-      end
-
-      context 'with a valid email_token' do
-        it 'should send the activation email' do
-          session[SessionController::ACTIVATE_USER_KEY] = user.id
-          Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :signup))
-
-          post :send_activation_email, params: {
-            username: user.username
-          }, format: :json
-
-          expect(session[SessionController::ACTIVATE_USER_KEY]).to eq(nil)
-        end
-      end
-
-      context 'without an existing email_token' do
-        before do
-          user.email_tokens.each { |t| t.destroy }
-          user.reload
-        end
-
-        it 'should generate a new token' do
-          expect {
-            session[SessionController::ACTIVATE_USER_KEY] = user.id
-
-            post :send_activation_email,
-              params: { username: user.username },
-              format: :json
-          }.to change { user.reload.email_tokens.count }.by(1)
-        end
-
-        it 'should send an email' do
-          session[SessionController::ACTIVATE_USER_KEY] = user.id
-          Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :signup))
-
-          post :send_activation_email,
-            params: { username: user.username },
-            format: :json
-
-          expect(session[SessionController::ACTIVATE_USER_KEY]).to eq(nil)
-        end
-      end
-    end
-
-    context 'when username does not exist' do
-      it 'should not send an email' do
-        Jobs.expects(:enqueue).never
-
-        post :send_activation_email,
-          params: { username: 'nopenopenopenope' },
-          format: :json
-      end
-    end
-  end
-
-  describe '.pick_avatar' do
-
-    it 'raises an error when not logged in' do
-      expect {
-        put :pick_avatar, params: {
-          username: 'asdf', avatar_id: 1, type: "custom"
-        }, format: :json
-      }.to raise_error(Discourse::NotLoggedIn)
-    end
-
-    context 'while logged in' do
-
-      let!(:user) { log_in }
-      let(:upload) { Fabricate(:upload) }
-
-      it "raises an error when you don't have permission to toggle the avatar" do
-        another_user = Fabricate(:user)
-        put :pick_avatar, params: {
-          username: another_user.username, upload_id: upload.id, type: "custom"
-        }, format: :json
-
-        expect(response).to be_forbidden
-      end
-
-      it "raises an error when sso_overrides_avatar is disabled" do
-        SiteSetting.sso_overrides_avatar = true
-        put :pick_avatar, params: {
-          username: user.username, upload_id: upload.id, type: "custom"
-        }, format: :json
-
-        expect(response).to_not be_success
-      end
-
-      it "raises an error when selecting the custom/uploaded avatar and allow_uploaded_avatars is disabled" do
-        SiteSetting.allow_uploaded_avatars = false
-        put :pick_avatar, params: {
-          username: user.username, upload_id: upload.id, type: "custom"
-        }, format: :json
-
-        expect(response).to_not be_success
-      end
-
-      it 'can successfully pick the system avatar' do
-        put :pick_avatar, params: {
-          username: user.username
-        }, format: :json
-
-        expect(response).to be_success
-        expect(user.reload.uploaded_avatar_id).to eq(nil)
-      end
-
-      it 'can successfully pick a gravatar' do
-        put :pick_avatar, params: {
-          username: user.username, upload_id: upload.id, type: "gravatar"
-        }, format: :json
-
-        expect(response).to be_success
-        expect(user.reload.uploaded_avatar_id).to eq(upload.id)
-        expect(user.user_avatar.reload.gravatar_upload_id).to eq(upload.id)
-      end
-
-      it 'can successfully pick a custom avatar' do
-        put :pick_avatar, params: {
-          username: user.username, upload_id: upload.id, type: "custom"
-        }, format: :json
-
-        expect(response).to be_success
-        expect(user.reload.uploaded_avatar_id).to eq(upload.id)
-        expect(user.user_avatar.reload.custom_upload_id).to eq(upload.id)
-      end
-
-    end
-
-  end
-
-  describe '.destroy_user_image' do
-
-    it 'raises an error when not logged in' do
-      expect do
-        delete :destroy_user_image,
-          params: { type: 'profile_background', username: 'asdf' },
-          format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
-    end
-
-    context 'while logged in' do
-
-      let!(:user) { log_in }
-
-      it 'raises an error when you don\'t have permission to clear the profile background' do
-        Guardian.any_instance.expects(:can_edit?).with(user).returns(false)
-
-        delete :destroy_user_image,
-          params: { username: user.username, type: 'profile_background' },
-          format: :json
-
-        expect(response).to be_forbidden
-      end
-
-      it "requires the `type` param" do
-        expect do
-          delete :destroy_user_image, params: { username: user.username }, format: :json
-        end.to raise_error(ActionController::ParameterMissing)
-      end
-
-      it "only allows certain `types`" do
-        expect do
-          delete :destroy_user_image,
-            params: { username: user.username, type: 'wat' },
-            format: :json
-        end.to raise_error(Discourse::InvalidParameters)
-      end
-
-      it 'can clear the profile background' do
-        delete :destroy_user_image, params: {
-          type: 'profile_background', username: user.username
-        }, format: :json
-
-        expect(user.reload.user_profile.profile_background).to eq("")
-        expect(response).to be_success
-      end
-
-    end
-  end
-
-  describe '.destroy' do
-    it 'raises an error when not logged in' do
-      expect do
-        delete :destroy, params: { username: 'nobody' }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
-    end
-
-    context 'while logged in' do
-      let!(:user) { log_in }
-
-      it 'raises an error when you cannot delete your account' do
-        Guardian.any_instance.stubs(:can_delete_user?).returns(false)
-        UserDestroyer.any_instance.expects(:destroy).never
-        delete :destroy, params: { username: user.username }, format: :json
-        expect(response).to be_forbidden
-      end
-
-      it "raises an error when you try to delete someone else's account" do
-        UserDestroyer.any_instance.expects(:destroy).never
-        delete :destroy, params: { username: Fabricate(:user).username }, format: :json
-        expect(response).to be_forbidden
-      end
-
-      it "deletes your account when you're allowed to" do
-        Guardian.any_instance.stubs(:can_delete_user?).returns(true)
-        UserDestroyer.any_instance.expects(:destroy).with(user, anything).returns(user)
-        delete :destroy, params: { username: user.username }, format: :json
-        expect(response).to be_success
-      end
-    end
-  end
-
-  describe '.my_redirect' do
-
-    it "redirects if the user is not logged in" do
-      get :my_redirect, params: { path: "wat" }, format: :json
-      expect(response).not_to be_success
-      expect(response).to be_redirect
-    end
-
-    context "when the user is logged in" do
-      let!(:user) { log_in }
-
-      it "will not redirect to an invalid path" do
-        get :my_redirect, params: { path: "wat/..password.txt" }, format: :json
-        expect(response).not_to be_redirect
-      end
-
-      it "will redirect to an valid path" do
-        get :my_redirect, params: { path: "preferences" }, format: :json
-        expect(response).to be_redirect
-      end
-
-      it "permits forward slashes" do
-        get :my_redirect, params: { path: "activity/posts" }, format: :json
-        expect(response).to be_redirect
-      end
-    end
-  end
-
-  describe '.check_emails' do
-
-    it 'raises an error when not logged in' do
-      expect do
-        put :check_emails, params: { username: 'zogstrip' }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
-    end
-
-    context 'while logged in' do
-      let!(:user) { log_in }
-
-      it "raises an error when you aren't allowed to check emails" do
-        Guardian.any_instance.expects(:can_check_emails?).returns(false)
-
-        put :check_emails,
-          params: { username: Fabricate(:user).username },
-          format: :json
-
-        expect(response).to be_forbidden
-      end
-
-      it "returns both email and associated_accounts when you're allowed to see them" do
-        Guardian.any_instance.expects(:can_check_emails?).returns(true)
-
-        put :check_emails,
-          params: { username: Fabricate(:user).username },
-          format: :json
-
-        expect(response).to be_success
-        json = JSON.parse(response.body)
-        expect(json["email"]).to be_present
-        expect(json["associated_accounts"]).to be_present
-      end
-
-      it "works on inactive users" do
-        inactive_user = Fabricate(:user, active: false)
-        Guardian.any_instance.expects(:can_check_emails?).returns(true)
-
-        put :check_emails, params: {
-          username: inactive_user.username
-        }, format: :json
-
-        expect(response).to be_success
-        json = JSON.parse(response.body)
-        expect(json["email"]).to be_present
-        expect(json["associated_accounts"]).to be_present
-      end
-
-    end
-
-  end
-
-  describe ".is_local_username" do
-
-    let(:user) { Fabricate(:user) }
-    let(:group) { Fabricate(:group, name: "Discourse") }
-    let(:topic) { Fabricate(:topic) }
-    let(:allowed_user) { Fabricate(:user) }
-    let(:private_topic) { Fabricate(:private_message_topic, user: allowed_user) }
-
-    it "finds the user" do
-      get :is_local_username, params: {
-        username: user.username
-      }, format: :json
-
-      expect(response).to be_success
-      json = JSON.parse(response.body)
-      expect(json["valid"][0]).to eq(user.username)
-    end
-
-    it "finds the group" do
-      get :is_local_username, params: {
-        username: group.name
-      }, format: :json
-
-      expect(response).to be_success
-      json = JSON.parse(response.body)
-      expect(json["valid_groups"][0]).to eq(group.name)
-    end
-
-    it "supports multiples usernames" do
-      get :is_local_username, params: {
-        usernames: [user.username, "system"]
-      }, format: :json
-
-      expect(response).to be_success
-      json = JSON.parse(response.body)
-      expect(json["valid"].size).to eq(2)
-    end
-
-    it "never includes staged accounts" do
-      staged = Fabricate(:user, staged: true)
-
-      get :is_local_username, params: {
-        usernames: [staged.username]
-      }, format: :json
-
-      expect(response).to be_success
-      json = JSON.parse(response.body)
-      expect(json["valid"].size).to eq(0)
-    end
-
-    it "returns user who cannot see topic" do
-      Guardian.any_instance.expects(:can_see?).with(topic).returns(false)
-
-      get :is_local_username, params: {
-        usernames: [user.username], topic_id: topic.id
-      }, format: :json
-
-      expect(response).to be_success
-      json = JSON.parse(response.body)
-      expect(json["cannot_see"].size).to eq(1)
-    end
-
-    it "never returns a user who can see the topic" do
-      Guardian.any_instance.expects(:can_see?).with(topic).returns(true)
-
-      get :is_local_username, params: {
-        usernames: [user.username], topic_id: topic.id
-      }, format: :json
-
-      expect(response).to be_success
-      json = JSON.parse(response.body)
-      expect(json["cannot_see"].size).to eq(0)
-    end
-
-    it "returns user who cannot see a private topic" do
-      Guardian.any_instance.expects(:can_see?).with(private_topic).returns(false)
-
-      get :is_local_username, params: {
-        usernames: [user.username], topic_id: private_topic.id
-      }, format: :json
-
-      expect(response).to be_success
-      json = JSON.parse(response.body)
-      expect(json["cannot_see"].size).to eq(1)
-    end
-
-    it "never returns a user who can see the topic" do
-      Guardian.any_instance.expects(:can_see?).with(private_topic).returns(true)
-
-      get :is_local_username, params: {
-        usernames: [allowed_user.username], topic_id: private_topic.id
-      }, format: :json
-
-      expect(response).to be_success
-      json = JSON.parse(response.body)
-      expect(json["cannot_see"].size).to eq(0)
-    end
-
-  end
-
-  describe '.topic_tracking_state' do
-    let(:user) { Fabricate(:user) }
-
-    context 'anon' do
-      it "raises an error on anon for topic_tracking_state" do
-        expect {
-          get :topic_tracking_state, params: { username: user.username }, format: :json
-        }.to raise_error(Discourse::NotLoggedIn)
-      end
-    end
-
-    context 'logged on' do
-      it "detects new topic" do
-        log_in_user(user)
-
-        topic = Fabricate(:topic)
-        get :topic_tracking_state, params: { username: user.username }, format: :json
-
-        states = JSON.parse(response.body)
-
-        expect(states[0]["topic_id"]).to eq(topic.id)
-      end
-    end
-  end
-
-  describe '.summary' do
-
-    it "generates summary info" do
-      user = Fabricate(:user)
-      create_post(user: user)
-
-      get :summary, params: { username: user.username_lower }, format: :json
-      expect(response).to be_success
-      json = JSON.parse(response.body)
-
-      expect(json["user_summary"]["topic_count"]).to eq(1)
-      expect(json["user_summary"]["post_count"]).to eq(0)
-    end
-  end
-
-  describe ".confirm_admin" do
-    it "fails without a valid token" do
-      expect {
-        get :confirm_admin, params: { token: 'invalid-token' }, format: :json
-      }.to raise_error(ActionController::UrlGenerationError)
-    end
-
-    it "fails with a missing token" do
-      get :confirm_admin, params: { token: 'a0a0a0a0a0' }, format: :json
-      expect(response).to_not be_success
-    end
-
-    it "succeeds with a valid code as anonymous" do
-      user = Fabricate(:user)
-      ac = AdminConfirmation.new(user, Fabricate(:admin))
-      ac.create_confirmation
-      get :confirm_admin, params: { token: ac.token }
-      expect(response).to be_success
-
-      user.reload
-      expect(user.admin?).to eq(false)
-    end
-
-    it "succeeds with a valid code when logged in as that user" do
-      admin = log_in(:admin)
-      user = Fabricate(:user)
-
-      ac = AdminConfirmation.new(user, admin)
-      ac.create_confirmation
-      get :confirm_admin, params: { token: ac.token }
-      expect(response).to be_success
-
-      user.reload
-      expect(user.admin?).to eq(false)
-    end
-
-    it "fails if you're logged in as a different account" do
-      log_in(:admin)
-      user = Fabricate(:user)
-
-      ac = AdminConfirmation.new(user, Fabricate(:admin))
-      ac.create_confirmation
-      get :confirm_admin, params: { token: ac.token }, format: :json
-      expect(response).to_not be_success
-
-      user.reload
-      expect(user.admin?).to eq(false)
-    end
-
-    describe "post" do
-      it "gives the user admin access when POSTed" do
-        user = Fabricate(:user)
-        ac = AdminConfirmation.new(user, Fabricate(:admin))
-        ac.create_confirmation
-        post :confirm_admin, params: { token: ac.token }
-        expect(response).to be_success
-
-        user.reload
-        expect(user.admin?).to eq(true)
-      end
-    end
-
-  end
-
-  describe '.update_activation_email' do
-
-    context "with a session variable" do
-
-      it "raises an error with an invalid session value" do
-        session[SessionController::ACTIVATE_USER_KEY] = 1234
-
-        put :update_activation_email, params: {
-          email: 'updatedemail@example.com'
-        }, format: :json
-
-        expect(response).to_not be_success
-      end
-
-      it "raises an error for an active user" do
-        user = Fabricate(:walter_white)
-        session[SessionController::ACTIVATE_USER_KEY] = user.id
-
-        put :update_activation_email, params: {
-          email: 'updatedemail@example.com'
-        }, format: :json
-
-        expect(response).to_not be_success
-      end
-
-      it "raises an error when logged in" do
-        moderator = log_in(:moderator)
-        session[SessionController::ACTIVATE_USER_KEY] = moderator.id
-
-        put :update_activation_email, params: {
-          email: 'updatedemail@example.com'
-        }, format: :json
-
-        expect(response).to_not be_success
-      end
-
-      it "raises an error when the new email is taken" do
-        active_user = Fabricate(:user)
-        user = Fabricate(:inactive_user)
-        session[SessionController::ACTIVATE_USER_KEY] = user.id
-
-        put :update_activation_email, params: {
-          email: active_user.email
-        }, format: :json
-
-        expect(response).to_not be_success
-      end
-
-      it "raises an error when the email is blacklisted" do
-        user = Fabricate(:inactive_user)
-        SiteSetting.email_domains_blacklist = 'example.com'
-        session[SessionController::ACTIVATE_USER_KEY] = user.id
-        put :update_activation_email, params: { email: 'test@example.com' }, format: :json
-        expect(response).to_not be_success
-      end
-
-      it "can be updated" do
-        user = Fabricate(:inactive_user)
-        token = user.email_tokens.first
-
-        session[SessionController::ACTIVATE_USER_KEY] = user.id
-
-        put :update_activation_email, params: {
-          email: 'updatedemail@example.com'
-        }, format: :json
-
-        expect(response).to be_success
-
-        user.reload
-        expect(user.email).to eq('updatedemail@example.com')
-        expect(user.email_tokens.where(email: 'updatedemail@example.com', expired: false)).to be_present
-
-        token.reload
-        expect(token.expired?).to eq(true)
-      end
-    end
-
-    context "with a username and password" do
-      it "raises an error with an invalid username" do
-        put :update_activation_email, params: {
-          username: 'eviltrout',
-          password: 'invalid-password',
-          email: 'updatedemail@example.com'
-        }, format: :json
-
-        expect(response).to_not be_success
-      end
-
-      it "raises an error with an invalid password" do
-        put :update_activation_email, params: {
-          username: Fabricate(:inactive_user).username,
-          password: 'invalid-password',
-          email: 'updatedemail@example.com'
-        }, format: :json
-
-        expect(response).to_not be_success
-      end
-
-      it "raises an error for an active user" do
-        put :update_activation_email, params: {
-          username: Fabricate(:walter_white).username,
-          password: 'letscook',
-          email: 'updatedemail@example.com'
-        }, format: :json
-
-        expect(response).to_not be_success
-      end
-
-      it "raises an error when logged in" do
-        log_in(:moderator)
-
-        put :update_activation_email, params: {
-          username: Fabricate(:inactive_user).username,
-          password: 'qwerqwer123',
-          email: 'updatedemail@example.com'
-        }, format: :json
-
-        expect(response).to_not be_success
-      end
-
-      it "raises an error when the new email is taken" do
-        user = Fabricate(:user)
-
-        put :update_activation_email, params: {
-          username: Fabricate(:inactive_user).username,
-          password: 'qwerqwer123',
-          email: user.email
-        }, format: :json
-
-        expect(response).to_not be_success
-      end
-
-      it "can be updated" do
-        user = Fabricate(:inactive_user)
-        token = user.email_tokens.first
-
-        put :update_activation_email, params: {
-          username: user.username,
-          password: 'qwerqwer123',
-          email: 'updatedemail@example.com'
-        }, format: :json
-
-        expect(response).to be_success
-
-        user.reload
-        expect(user.email).to eq('updatedemail@example.com')
-        expect(user.email_tokens.where(email: 'updatedemail@example.com', expired: false)).to be_present
-
-        token.reload
-        expect(token.expired?).to eq(true)
-      end
-    end
-  end
-end
diff --git a/spec/controllers/wizard_controller_spec.rb b/spec/controllers/wizard_controller_spec.rb
index a6d38fee2cd..0875e31c264 100644
--- a/spec/controllers/wizard_controller_spec.rb
+++ b/spec/controllers/wizard_controller_spec.rb
@@ -10,9 +10,15 @@ describe WizardController do
     end
 
     it 'needs you to be logged in' do
-      expect do
-        get :index, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      get :index, format: :json
+      expect(response.status).to eq(403)
+    end
+
+    it 'needs you to be logged in' do
+      get :index
+      # for whatever reason, no access is 404
+      # we may want to revisit this at some point and make it 403
+      expect(response.status).to eq(404)
     end
 
     it "raises an error if you aren't an admin" do
diff --git a/spec/fabricators/shared_draft_fabricator.rb b/spec/fabricators/shared_draft_fabricator.rb
new file mode 100644
index 00000000000..4a286374e4a
--- /dev/null
+++ b/spec/fabricators/shared_draft_fabricator.rb
@@ -0,0 +1,4 @@
+Fabricator(:shared_draft) do
+  topic
+  category
+end
diff --git a/spec/fabricators/topic_fabricator.rb b/spec/fabricators/topic_fabricator.rb
index 1fd06233cdd..b3efbb98e3d 100644
--- a/spec/fabricators/topic_fabricator.rb
+++ b/spec/fabricators/topic_fabricator.rb
@@ -17,7 +17,6 @@ Fabricator(:banner_topic, from: :topic) do
 end
 
 Fabricator(:private_message_topic, from: :topic) do
-  user
   category_id { nil }
   title { sequence(:title) { |i| "This is a private message #{i}" } }
   archetype "private_message"
diff --git a/spec/fabricators/topic_tag_fabricator.rb b/spec/fabricators/topic_tag_fabricator.rb
new file mode 100644
index 00000000000..033f50656cd
--- /dev/null
+++ b/spec/fabricators/topic_tag_fabricator.rb
@@ -0,0 +1,4 @@
+Fabricator(:topic_tag) do
+  tag
+  topic
+end
diff --git a/spec/fabricators/user_second_factor_fabricator.rb b/spec/fabricators/user_second_factor_fabricator.rb
new file mode 100644
index 00000000000..1bb88567873
--- /dev/null
+++ b/spec/fabricators/user_second_factor_fabricator.rb
@@ -0,0 +1,6 @@
+Fabricator(:user_second_factor) do
+  user
+  data 'rcyryaqage3jexfj'
+  enabled true
+  method UserSecondFactor.methods[:totp]
+end
diff --git a/spec/fabricators/web_crawler_request_fabricator.rb b/spec/fabricators/web_crawler_request_fabricator.rb
new file mode 100644
index 00000000000..ed678cc8876
--- /dev/null
+++ b/spec/fabricators/web_crawler_request_fabricator.rb
@@ -0,0 +1,5 @@
+Fabricator(:web_crawler_request) do
+  user_agent { sequence(:ua) { |i| "Googlebot #{i}.0" } }
+  date Time.zone.now.to_date
+  count 0
+end
diff --git a/spec/fabricators/web_hook_fabricator.rb b/spec/fabricators/web_hook_fabricator.rb
index d9354fb59e6..c7632cd2d07 100644
--- a/spec/fabricators/web_hook_fabricator.rb
+++ b/spec/fabricators/web_hook_fabricator.rb
@@ -29,6 +29,14 @@ Fabricator(:topic_web_hook, from: :web_hook) do
   end
 end
 
+Fabricator(:post_web_hook, from: :web_hook) do
+  transient topic_hook: WebHookEventType.find_by(name: 'post')
+
+  after_build do |web_hook, transients|
+    web_hook.web_hook_event_types = [transients[:post_hook]]
+  end
+end
+
 Fabricator(:user_web_hook, from: :web_hook) do
   transient user_hook: WebHookEventType.find_by(name: 'user')
 
@@ -36,3 +44,35 @@ Fabricator(:user_web_hook, from: :web_hook) do
     web_hook.web_hook_event_types = [transients[:user_hook]]
   end
 end
+
+Fabricator(:group_web_hook, from: :web_hook) do
+  transient group_hook: WebHookEventType.find_by(name: 'group')
+
+  after_build do |web_hook, transients|
+    web_hook.web_hook_event_types = [transients[:group_hook]]
+  end
+end
+
+Fabricator(:category_web_hook, from: :web_hook) do
+  transient category_hook: WebHookEventType.find_by(name: 'category')
+
+  after_build do |web_hook, transients|
+    web_hook.web_hook_event_types = [transients[:category_hook]]
+  end
+end
+
+Fabricator(:tag_web_hook, from: :web_hook) do
+  transient tag_hook: WebHookEventType.find_by(name: 'tag')
+
+  after_build do |web_hook, transients|
+    web_hook.web_hook_event_types = [transients[:tag_hook]]
+  end
+end
+
+Fabricator(:flag_web_hook, from: :web_hook) do
+  transient flag_hook: WebHookEventType.find_by(name: 'flag')
+
+  after_build do |web_hook, transients|
+    web_hook.web_hook_event_types = [transients[:flag_hook]]
+  end
+end
diff --git a/spec/fixtures/csv/discourse.csv b/spec/fixtures/csv/discourse.csv
index 3a71578994f..b12e45a3cd9 100644
--- a/spec/fixtures/csv/discourse.csv
+++ b/spec/fixtures/csv/discourse.csv
@@ -1 +1,5 @@
-jeff@gmail.com,discourse;ubuntu,100
sam@yahoo.com,ubuntu,
robin@outlook.com,discourse,200
neil@aol.com,random,
regis@live.com,,8888
\ No newline at end of file
+jeff@gmail.com,discourse;ubuntu,100
+sam@yahoo.com,ubuntu,
+robin@outlook.com,discourse,200
+neil@aol.com,random,
+regis@live.com,,8888
diff --git a/spec/fixtures/emails/attached_pdf_file.eml b/spec/fixtures/emails/attached_pdf_file.eml
new file mode 100644
index 00000000000..91c2a5e13d8
Binary files /dev/null and b/spec/fixtures/emails/attached_pdf_file.eml differ
diff --git a/spec/fixtures/emails/blacklist_whitelist_email.eml b/spec/fixtures/emails/blacklist_whitelist_email.eml
index f6b38bfcce3..f9b0adf7905 100644
Binary files a/spec/fixtures/emails/blacklist_whitelist_email.eml and b/spec/fixtures/emails/blacklist_whitelist_email.eml differ
diff --git a/spec/fixtures/emails/encoded_display_name.eml b/spec/fixtures/emails/encoded_display_name.eml
index 1b5d6bb3a10..132e4404011 100644
Binary files a/spec/fixtures/emails/encoded_display_name.eml and b/spec/fixtures/emails/encoded_display_name.eml differ
diff --git a/spec/fixtures/emails/forwarded_email_3.eml b/spec/fixtures/emails/forwarded_email_3.eml
index 1f37822b0a7..d09f9e063e6 100644
Binary files a/spec/fixtures/emails/forwarded_email_3.eml and b/spec/fixtures/emails/forwarded_email_3.eml differ
diff --git a/spec/fixtures/emails/from_reply_by_email_address.eml b/spec/fixtures/emails/from_reply_by_email_address.eml
new file mode 100644
index 00000000000..4dfbd9f7d42
Binary files /dev/null and b/spec/fixtures/emails/from_reply_by_email_address.eml differ
diff --git a/spec/fixtures/emails/gmail_html_reply.eml b/spec/fixtures/emails/gmail_html_reply.eml
new file mode 100644
index 00000000000..6a69a3f35b1
Binary files /dev/null and b/spec/fixtures/emails/gmail_html_reply.eml differ
diff --git a/spec/fixtures/emails/inline_image.eml b/spec/fixtures/emails/inline_image.eml
index af3283702a9..b169f8167a0 100644
Binary files a/spec/fixtures/emails/inline_image.eml and b/spec/fixtures/emails/inline_image.eml differ
diff --git a/spec/fixtures/emails/mailinglist_short_message.eml b/spec/fixtures/emails/mailinglist_short_message.eml
new file mode 100644
index 00000000000..b14209fce97
Binary files /dev/null and b/spec/fixtures/emails/mailinglist_short_message.eml differ
diff --git a/spec/fixtures/emails/old_destination.eml b/spec/fixtures/emails/old_destination.eml
new file mode 100644
index 00000000000..eb847ead444
Binary files /dev/null and b/spec/fixtures/emails/old_destination.eml differ
diff --git a/spec/fixtures/emails/reply_with_8bit_encoding.eml b/spec/fixtures/emails/reply_with_8bit_encoding.eml
index ed99f6752a8..2d025dd929b 100644
Binary files a/spec/fixtures/emails/reply_with_8bit_encoding.eml and b/spec/fixtures/emails/reply_with_8bit_encoding.eml differ
diff --git a/spec/fixtures/emails/text_reply.eml b/spec/fixtures/emails/text_reply.eml
index 1d295a3f233..a3c6ab57140 100644
Binary files a/spec/fixtures/emails/text_reply.eml and b/spec/fixtures/emails/text_reply.eml differ
diff --git a/spec/fixtures/emails/unparsable_email_addresses.eml b/spec/fixtures/emails/unparsable_email_addresses.eml
new file mode 100644
index 00000000000..c94956d0554
Binary files /dev/null and b/spec/fixtures/emails/unparsable_email_addresses.eml differ
diff --git a/spec/fixtures/json/import-export.json b/spec/fixtures/json/import-export.json
index 1bc4da072a9..02446824cbb 100644
--- a/spec/fixtures/json/import-export.json
+++ b/spec/fixtures/json/import-export.json
@@ -4,12 +4,12 @@
     {"id":42,"name":"custom_group_import","created_at":"2017-10-26T15:33:46.328Z","mentionable_level":0,"messageable_level":0,"visibility_level":0,"automatic_membership_email_domains":"","automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"user_ids":[2]}
   ],
   "categories":[
-    {"id":8,"name":"Custom Category","color":"AB9364","created_at":"2017-10-26T15:32:44.083Z","user_id":1,"slug":"custom-category","description":null,"text_color":"FFFFFF","auto_close_hours":null,"parent_category_id":3,"auto_close_based_on_last_post":false,"topic_template":"","suppress_from_homepage":false,"all_topics_wiki":false,"permissions_params":{"custom_group":1,"everyone":2}},
-    {"id":10,"name":"Site Feedback Import","color":"808281","created_at":"2017-10-26T17:12:39.995Z","user_id":-1,"slug":"site-feedback-import","description":"Discussion about this site, its organization, how it works, and how we can improve it.","text_color":"FFFFFF","auto_close_hours":null,"parent_category_id":null,"auto_close_based_on_last_post":false,"topic_template":null,"suppress_from_homepage":false,"all_topics_wiki":false,"permissions_params":{}},
-    {"id":11,"name":"Uncategorized Import","color":"AB9364","created_at":"2017-10-26T17:12:32.359Z","user_id":-1,"slug":"uncategorized-import","description":"","text_color":"FFFFFF","auto_close_hours":null,"parent_category_id":null,"auto_close_based_on_last_post":false,"topic_template":null,"suppress_from_homepage":false,"all_topics_wiki":false,"permissions_params":{}},
-    {"id":12,"name":"Lounge Import","color":"EEEEEE","created_at":"2017-10-26T17:12:39.490Z","user_id":-1,"slug":"lounge-import","description":"A category exclusive to members with trust level 3 and higher.","text_color":"652D90","auto_close_hours":null,"parent_category_id":null,"auto_close_based_on_last_post":false,"topic_template":null,"suppress_from_homepage":false,"all_topics_wiki":false,"permissions_params":{"trust_level_3":1}},
-    {"id":13,"name":"Staff Import","color":"283890","created_at":"2017-10-26T17:12:42.806Z","user_id":2,"slug":"staff-import","description":"Private category for staff discussions. Topics are only visible to admins and moderators.","text_color":"FFFFFF","auto_close_hours":null,"parent_category_id":null,"auto_close_based_on_last_post":false,"topic_template":null,"suppress_from_homepage":false,"all_topics_wiki":false,"permissions_params":{"custom_group_import":1,"staff":1}},
-    {"id":15,"name":"Custom Category Import","color":"AB9364","created_at":"2017-10-26T15:32:44.083Z","user_id":2,"slug":"custom-category-import","description":null,"text_color":"FFFFFF","auto_close_hours":null,"parent_category_id":10,"auto_close_based_on_last_post":false,"topic_template":"","suppress_from_homepage":false,"all_topics_wiki":false,"permissions_params":{"custom_group_import":1,"everyone":2}}
+    {"id":8,"name":"Custom Category","color":"AB9364","created_at":"2017-10-26T15:32:44.083Z","user_id":1,"slug":"custom-category","description":null,"text_color":"FFFFFF","auto_close_hours":null,"parent_category_id":3,"auto_close_based_on_last_post":false,"topic_template":"","suppress_from_latest":false,"all_topics_wiki":false,"permissions_params":{"custom_group":1,"everyone":2}},
+    {"id":10,"name":"Site Feedback Import","color":"808281","created_at":"2017-10-26T17:12:39.995Z","user_id":-1,"slug":"site-feedback-import","description":"Discussion about this site, its organization, how it works, and how we can improve it.","text_color":"FFFFFF","auto_close_hours":null,"parent_category_id":null,"auto_close_based_on_last_post":false,"topic_template":null,"suppress_from_latest":false,"all_topics_wiki":false,"permissions_params":{}},
+    {"id":11,"name":"Uncategorized Import","color":"AB9364","created_at":"2017-10-26T17:12:32.359Z","user_id":-1,"slug":"uncategorized-import","description":"","text_color":"FFFFFF","auto_close_hours":null,"parent_category_id":null,"auto_close_based_on_last_post":false,"topic_template":null,"suppress_from_latest":false,"all_topics_wiki":false,"permissions_params":{}},
+    {"id":12,"name":"Lounge Import","color":"EEEEEE","created_at":"2017-10-26T17:12:39.490Z","user_id":-1,"slug":"lounge-import","description":"A category exclusive to members with trust level 3 and higher.","text_color":"652D90","auto_close_hours":null,"parent_category_id":null,"auto_close_based_on_last_post":false,"topic_template":null,"suppress_from_latest":false,"all_topics_wiki":false,"permissions_params":{"trust_level_3":1}},
+    {"id":13,"name":"Staff Import","color":"283890","created_at":"2017-10-26T17:12:42.806Z","user_id":2,"slug":"staff-import","description":"Private category for staff discussions. Topics are only visible to admins and moderators.","text_color":"FFFFFF","auto_close_hours":null,"parent_category_id":null,"auto_close_based_on_last_post":false,"topic_template":null,"suppress_from_latest":false,"all_topics_wiki":false,"permissions_params":{"custom_group_import":1,"staff":1}},
+    {"id":15,"name":"Custom Category Import","color":"AB9364","created_at":"2017-10-26T15:32:44.083Z","user_id":2,"slug":"custom-category-import","description":null,"text_color":"FFFFFF","auto_close_hours":null,"parent_category_id":10,"auto_close_based_on_last_post":false,"topic_template":"","suppress_from_latest":false,"all_topics_wiki":false,"permissions_params":{"custom_group_import":1,"everyone":2}}
   ],
   "users":[
     {"id":1,"email":"email@example.com","username":"example","name":"Example","created_at":"2017-10-07T15:01:24.597Z","trust_level":4,"active":true,"last_emailed_at":null},
diff --git a/spec/fixtures/md/spec.txt b/spec/fixtures/md/spec.txt
index c66f93b77fc..08ce0a57ef9 100644
--- a/spec/fixtures/md/spec.txt
+++ b/spec/fixtures/md/spec.txt
@@ -1,8 +1,8 @@
 ---
 title: CommonMark Spec
 author: John MacFarlane
-version: 0.27
-date: '2016-11-18'
+version: 0.28
+date: '2017-08-01'
 license: '[CC-BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)'
 ...
 
@@ -11,10 +11,12 @@ license: '[CC-BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)'
 ## What is Markdown?
 
 Markdown is a plain text format for writing structured documents,
-based on conventions used for indicating formatting in email and
-usenet posts.  It was developed in 2004 by John Gruber, who wrote
-the first Markdown-to-HTML converter in Perl, and it soon became
-ubiquitous.  In the next decade, dozens of implementations were
+based on conventions for indicating formatting in email
+and usenet posts.  It was developed by John Gruber (with
+help from Aaron Swartz) and released in 2004 in the form of a
+[syntax description](http://daringfireball.net/projects/markdown/syntax)
+and a Perl script (`Markdown.pl`) for converting Markdown to
+HTML.  In the next decade, dozens of implementations were
 developed in many languages.  Some extended the original
 Markdown syntax with conventions for footnotes, tables, and
 other document elements.  Some allowed Markdown documents to be
@@ -312,7 +314,7 @@ form feed (`U+000C`), or carriage return (`U+000D`).
 characters].
 
 A [Unicode whitespace character](@) is
-any code point in the Unicode `Zs` class, or a tab (`U+0009`),
+any code point in the Unicode `Zs` general category, or a tab (`U+0009`),
 carriage return (`U+000D`), newline (`U+000A`), or form feed
 (`U+000C`).
 
@@ -331,7 +333,7 @@ is `!`, `"`, `#`, `$`, `%`, `&`, `'`, `(`, `)`,
 
 A [punctuation character](@) is an [ASCII
 punctuation character] or anything in
-the Unicode classes `Pc`, `Pd`, `Pe`, `Pf`, `Pi`, `Po`, or `Ps`.
+the general Unicode categories  `Pc`, `Pd`, `Pe`, `Pf`, `Pi`, `Po`, or `Ps`.
 
 ## Tabs
 
@@ -402,8 +404,8 @@ as indentation with four spaces would:
 Normally the `>` that begins a block quote may be followed
 optionally by a space, which is not considered part of the
 content.  In the following case `>` is followed by a tab,
-which is treated as if it were expanded into spaces.
-Since one of theses spaces is considered part of the
+which is treated as if it were expanded into three spaces.
+Since one of these spaces is considered part of the
 delimiter, `foo` is considered to be indented six spaces
 inside the block quote context, so we get an indented
 code block starting with two spaces.
@@ -481,7 +483,7 @@ We can think of a document as a sequence of
 quotations, lists, headings, rules, and code blocks.  Some blocks (like
 block quotes and list items) contain other blocks; others (like
 headings and paragraphs) contain [inline](@) content---text,
-links, emphasized text, images, code, and so on.
+links, emphasized text, images, code spans, and so on.
 
 ## Precedence
 
@@ -525,7 +527,7 @@ Markdown document.
 
 A line consisting of 0-3 spaces of indentation, followed by a sequence
 of three or more matching `-`, `_`, or `*` characters, each followed
-optionally by any number of spaces, forms a
+optionally by any number of spaces or tabs, forms a
 [thematic break](@).
 
 ```````````````````````````````` example
@@ -1582,7 +1584,7 @@ begins with a code fence, indented no more than three spaces.
 
 The line with the opening code fence may optionally contain some text
 following the code fence; this is trimmed of leading and trailing
-spaces and called the [info string](@).
+whitespace and called the [info string](@).
 The [info string] may not contain any backtick
 characters.  (The reason for this restriction is that otherwise
 some inline code would be incorrectly interpreted as the
@@ -1643,6 +1645,15 @@ With tildes:
 </code></pre>
 ````````````````````````````````
 
+Fewer than three backticks is not enough:
+
+```````````````````````````````` example
+``
+foo
+``
+.
+<p><code>foo</code></p>
+````````````````````````````````
 
 The closing code fence must use the same character as the opening
 fence:
@@ -2031,6 +2042,37 @@ or [closing tag] (with any [tag name] other than `script`,
 or the end of the line.\
 **End condition:** line is followed by a [blank line].
 
+HTML blocks continue until they are closed by their appropriate
+[end condition], or the last line of the document or other [container block].
+This means any HTML **within an HTML block** that might otherwise be recognised
+as a start condition will be ignored by the parser and passed through as-is,
+without changing the parser's state.
+
+For instance, `<pre>` within a HTML block started by `<table>` will not affect
+the parser state; as the HTML block was started in by start condition 6, it
+will end at any blank line. This can be surprising:
+
+```````````````````````````````` example
+<table><tr><td>
+<pre>
+**Hello**,
+
+_world_.
+</pre>
+</td></tr></table>
+.
+<table><tr><td>
+<pre>
+**Hello**,
+<p><em>world</em>.
+</pre></p>
+</td></tr></table>
+````````````````````````````````
+
+In this case, the HTML block is terminated by the newline — the `**Hello**`
+text remains verbatim — and regular parsing resumes, with a paragraph,
+emphasised `world` and inline and block HTML following.
+
 All types of [HTML blocks] except type 7 may interrupt
 a paragraph.  Blocks of type 7 may not interrupt a paragraph.
 (This restriction is intended to prevent unwanted interpretation
@@ -3637,11 +3679,15 @@ The following rules define [list items]:
     If the list item is ordered, then it is also assigned a start
     number, based on the ordered list marker.
 
-    Exceptions: When the first list item in a [list] interrupts
-    a paragraph---that is, when it starts on a line that would
-    otherwise count as [paragraph continuation text]---then (a)
-    the lines *Ls* must not begin with a blank line, and (b) if
-    the list item is ordered, the start number must be 1.
+    Exceptions:
+
+    1. When the first list item in a [list] interrupts
+       a paragraph---that is, when it starts on a line that would
+       otherwise count as [paragraph continuation text]---then (a)
+       the lines *Ls* must not begin with a blank line, and (b) if
+       the list item is ordered, the start number must be 1.
+    2. If any line is a [thematic break][thematic breaks] then
+       that line is not a list item.
 
 For example, let *Ls* be the lines
 
@@ -5796,6 +5842,15 @@ we just have literal backticks:
 <p>`foo</p>
 ````````````````````````````````
 
+The following case also illustrates the need for opening and
+closing backtick strings to be equal in length:
+
+```````````````````````````````` example
+`foo``bar``
+.
+<p>`foo<code>bar</code></p>
+````````````````````````````````
+
 
 ## Emphasis and strong emphasis
 
@@ -5845,19 +5900,20 @@ for efficient parsing strategies that do not backtrack.
 
 First, some definitions.  A [delimiter run](@) is either
 a sequence of one or more `*` characters that is not preceded or
-followed by a `*` character, or a sequence of one or more `_`
-characters that is not preceded or followed by a `_` character.
+followed by a non-backslash-escaped `*` character, or a sequence
+of one or more `_` characters that is not preceded or followed by
+a non-backslash-escaped `_` character.
 
 A [left-flanking delimiter run](@) is
 a [delimiter run] that is (a) not followed by [Unicode whitespace],
-and (b) either not followed by a [punctuation character], or
+and (b) not followed by a [punctuation character], or
 preceded by [Unicode whitespace] or a [punctuation character].
 For purposes of this definition, the beginning and the end of
 the line count as Unicode whitespace.
 
 A [right-flanking delimiter run](@) is
 a [delimiter run] that is (a) not preceded by [Unicode whitespace],
-and (b) either not preceded by a [punctuation character], or
+and (b) not preceded by a [punctuation character], or
 followed by [Unicode whitespace] or a [punctuation character].
 For purposes of this definition, the beginning and the end of
 the line count as Unicode whitespace.
@@ -5936,7 +5992,7 @@ The following rules define emphasis and strong emphasis:
 7.  A double `**` [can close strong emphasis](@)
     iff it is part of a [right-flanking delimiter run].
 
-8.  A double `__` [can close strong emphasis]
+8.  A double `__` [can close strong emphasis] iff
     it is part of a [right-flanking delimiter run]
     and either (a) not part of a [left-flanking delimiter run]
     or (b) part of a [left-flanking delimiter run]
@@ -5976,8 +6032,8 @@ the following principles resolve ambiguity:
     an interpretation `<strong>...</strong>` is always preferred to
     `<em><em>...</em></em>`.
 
-14. An interpretation `<strong><em>...</em></strong>` is always
-    preferred to `<em><strong>..</strong></em>`.
+14. An interpretation `<em><strong>...</strong></em>` is always
+    preferred to `<strong><em>...</em></strong>`.
 
 15. When two potential emphasis or strong emphasis spans overlap,
     so that the second begins before the first ends and ends after
@@ -7000,14 +7056,14 @@ Rule 14:
 ```````````````````````````````` example
 ***foo***
 .
-<p><strong><em>foo</em></strong></p>
+<p><em><strong>foo</strong></em></p>
 ````````````````````````````````
 
 
 ```````````````````````````````` example
 _____foo_____
 .
-<p><strong><strong><em>foo</em></strong></strong></p>
+<p><em><strong><strong>foo</strong></strong></em></p>
 ````````````````````````````````
 
 
@@ -7148,8 +7204,9 @@ A [link destination](@) consists of either
 - a nonempty sequence of characters that does not include
   ASCII space or control characters, and includes parentheses
   only if (a) they are backslash-escaped or (b) they are part of
-  a balanced pair of unescaped parentheses that is not itself
-  inside a balanced pair of unescaped parentheses.
+  a balanced pair of unescaped parentheses.  (Implementations
+  may impose limits on parentheses nesting to avoid performance
+  issues, but at least three levels of nesting should be supported.)
 
 A [link title](@)  consists of either
 
@@ -7255,35 +7312,29 @@ Parentheses inside the link destination may be escaped:
 <p><a href="(foo)">link</a></p>
 ````````````````````````````````
 
-One level of balanced parentheses is allowed without escaping:
-
-```````````````````````````````` example
-[link]((foo)and(bar))
-.
-<p><a href="(foo)and(bar)">link</a></p>
-````````````````````````````````
-
-However, if you have parentheses within parentheses, you need to escape
-or use the `<...>` form:
+Any number of parentheses are allowed without escaping, as long as they are
+balanced:
 
 ```````````````````````````````` example
 [link](foo(and(bar)))
 .
-<p>[link](foo(and(bar)))</p>
+<p><a href="foo(and(bar))">link</a></p>
+````````````````````````````````
+
+However, if you have unbalanced parentheses, you need to escape or use the
+`<...>` form:
+
+```````````````````````````````` example
+[link](foo\(and\(bar\))
+.
+<p><a href="foo(and(bar)">link</a></p>
 ````````````````````````````````
 
 
 ```````````````````````````````` example
-[link](foo(and\(bar\)))
+[link](<foo(and(bar)>)
 .
-<p><a href="foo(and(bar))">link</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[link](<foo(and(bar))>)
-.
-<p><a href="foo(and(bar))">link</a></p>
+<p><a href="foo(and(bar)">link</a></p>
 ````````````````````````````````
 
 
@@ -7567,13 +7618,16 @@ that [matches] a [link reference definition] elsewhere in the document.
 A [link label](@)  begins with a left bracket (`[`) and ends
 with the first right bracket (`]`) that is not backslash-escaped.
 Between these brackets there must be at least one [non-whitespace character].
-Unescaped square bracket characters are not allowed in
-[link labels].  A link label can have at most 999
-characters inside the square brackets.
+Unescaped square bracket characters are not allowed inside the
+opening and closing square brackets of [link labels].  A link
+label can have at most 999 characters inside the square
+brackets.
 
 One label [matches](@)
 another just in case their normalized forms are equal.  To normalize a
-label, perform the *Unicode case fold* and collapse consecutive internal
+label, strip off the opening and closing brackets,
+perform the *Unicode case fold*, strip leading and trailing
+[whitespace] and collapse consecutive internal
 [whitespace] to a single space.  If there are multiple
 matching reference link definitions, the one that comes first in the
 document is used.  (It is desirable in such cases to emit a warning.)
@@ -8326,11 +8380,11 @@ The link labels are case-insensitive:
 ````````````````````````````````
 
 
-If you just want bracketed text, you can backslash-escape the
-opening `!` and `[`:
+If you just want a literal `!` followed by bracketed text, you can
+backslash-escape the opening `[`:
 
 ```````````````````````````````` example
-\!\[foo]
+!\[foo]
 
 [foo]: /url "title"
 .
@@ -8570,7 +8624,7 @@ a [single-quoted attribute value], or a [double-quoted attribute value].
 
 An [unquoted attribute value](@)
 is a nonempty string of characters not
-including spaces, `"`, `'`, `=`, `<`, `>`, or `` ` ``.
+including [whitespace], `"`, `'`, `=`, `<`, `>`, or `` ` ``.
 
 A [single-quoted attribute value](@)
 consists of `'`, zero or more
@@ -8691,9 +8745,13 @@ Illegal [whitespace]:
 ```````````````````````````````` example
 < a><
 foo><bar/ >
+<foo bar=baz
+bim!bop />
 .
 <p>&lt; a&gt;&lt;
-foo&gt;&lt;bar/ &gt;</p>
+foo&gt;&lt;bar/ &gt;
+&lt;foo bar=baz
+bim!bop /&gt;</p>
 ````````````````````````````````
 
 
diff --git a/spec/fixtures/migrate/drop_table/20990309014014_drop_table.rb b/spec/fixtures/migrate/drop_table/20990309014014_drop_table.rb
new file mode 100644
index 00000000000..211c70d7643
--- /dev/null
+++ b/spec/fixtures/migrate/drop_table/20990309014014_drop_table.rb
@@ -0,0 +1,9 @@
+class DropTable < ActiveRecord::Migration[5.1]
+  def up
+    drop_table :users
+  end
+
+  def down
+    raise "not tested"
+  end
+end
diff --git a/spec/fixtures/migrate/remove_column/20990309014014_remove_column.rb b/spec/fixtures/migrate/remove_column/20990309014014_remove_column.rb
new file mode 100644
index 00000000000..25bc82b171a
--- /dev/null
+++ b/spec/fixtures/migrate/remove_column/20990309014014_remove_column.rb
@@ -0,0 +1,9 @@
+class RemoveColumn < ActiveRecord::Migration[5.1]
+  def up
+    remove_column :users, :username
+  end
+
+  def down
+    raise "not tested"
+  end
+end
diff --git a/spec/fixtures/migrate/rename_column/20990309014014_rename_column.rb b/spec/fixtures/migrate/rename_column/20990309014014_rename_column.rb
new file mode 100644
index 00000000000..1e0b568ada7
--- /dev/null
+++ b/spec/fixtures/migrate/rename_column/20990309014014_rename_column.rb
@@ -0,0 +1,9 @@
+class RenameColumn < ActiveRecord::Migration[5.1]
+  def up
+    rename_column :users, :username, :username1
+  end
+
+  def down
+    raise "not tested"
+  end
+end
diff --git a/spec/fixtures/migrate/rename_table/20990309014014_rename_table.rb b/spec/fixtures/migrate/rename_table/20990309014014_rename_table.rb
new file mode 100644
index 00000000000..7aca85e1555
--- /dev/null
+++ b/spec/fixtures/migrate/rename_table/20990309014014_rename_table.rb
@@ -0,0 +1,9 @@
+class RenameTable < ActiveRecord::Migration[5.1]
+  def up
+    rename_table :users, :persons
+  end
+
+  def down
+    raise "not tested"
+  end
+end
diff --git a/spec/fixtures/plugins/custom_locales/assets/locales/es_MX.js.erb b/spec/fixtures/plugins/custom_locales/assets/locales/es_MX.js.erb
new file mode 100644
index 00000000000..d07d575a09e
--- /dev/null
+++ b/spec/fixtures/plugins/custom_locales/assets/locales/es_MX.js.erb
@@ -0,0 +1,2 @@
+//= require locales/i18n
+<%= JsLocaleHelper.output_locale(:es_MX) %>
diff --git a/spec/fixtures/plugins/custom_locales/assets/locales/foo.js.erb b/spec/fixtures/plugins/custom_locales/assets/locales/foo.js.erb
new file mode 100644
index 00000000000..601dadb7774
--- /dev/null
+++ b/spec/fixtures/plugins/custom_locales/assets/locales/foo.js.erb
@@ -0,0 +1,2 @@
+//= require locales/i18n
+<%= JsLocaleHelper.output_locale(:foo) %>
diff --git a/spec/fixtures/plugins/custom_locales/assets/locales/tlh.js.erb b/spec/fixtures/plugins/custom_locales/assets/locales/tlh.js.erb
new file mode 100644
index 00000000000..2e3284dc996
--- /dev/null
+++ b/spec/fixtures/plugins/custom_locales/assets/locales/tlh.js.erb
@@ -0,0 +1,2 @@
+//= require locales/i18n
+<%= JsLocaleHelper.output_locale(:tlh) %>
diff --git a/spec/fixtures/plugins/custom_locales/config/locales/client.es_MX.yml b/spec/fixtures/plugins/custom_locales/config/locales/client.es_MX.yml
new file mode 100644
index 00000000000..c9cb23e960b
--- /dev/null
+++ b/spec/fixtures/plugins/custom_locales/config/locales/client.es_MX.yml
@@ -0,0 +1 @@
+es_MX:
diff --git a/spec/fixtures/plugins/custom_locales/config/locales/client.foo.yml b/spec/fixtures/plugins/custom_locales/config/locales/client.foo.yml
new file mode 100644
index 00000000000..0152a79652d
--- /dev/null
+++ b/spec/fixtures/plugins/custom_locales/config/locales/client.foo.yml
@@ -0,0 +1 @@
+foo:
diff --git a/spec/fixtures/plugins/custom_locales/config/locales/client.tlh.yml b/spec/fixtures/plugins/custom_locales/config/locales/client.tlh.yml
new file mode 100644
index 00000000000..884714fb718
--- /dev/null
+++ b/spec/fixtures/plugins/custom_locales/config/locales/client.tlh.yml
@@ -0,0 +1 @@
+tlh:
diff --git a/spec/fixtures/plugins/custom_locales/config/locales/server.es_MX.yml b/spec/fixtures/plugins/custom_locales/config/locales/server.es_MX.yml
new file mode 100644
index 00000000000..c9cb23e960b
--- /dev/null
+++ b/spec/fixtures/plugins/custom_locales/config/locales/server.es_MX.yml
@@ -0,0 +1 @@
+es_MX:
diff --git a/spec/fixtures/plugins/custom_locales/config/locales/server.foo.yml b/spec/fixtures/plugins/custom_locales/config/locales/server.foo.yml
new file mode 100644
index 00000000000..0152a79652d
--- /dev/null
+++ b/spec/fixtures/plugins/custom_locales/config/locales/server.foo.yml
@@ -0,0 +1 @@
+foo:
diff --git a/spec/fixtures/plugins/custom_locales/config/locales/server.tlh.yml b/spec/fixtures/plugins/custom_locales/config/locales/server.tlh.yml
new file mode 100644
index 00000000000..884714fb718
--- /dev/null
+++ b/spec/fixtures/plugins/custom_locales/config/locales/server.tlh.yml
@@ -0,0 +1 @@
+tlh:
diff --git a/spec/fixtures/plugins/custom_locales/lib/javascripts/locale/message_format/foo.js b/spec/fixtures/plugins/custom_locales/lib/javascripts/locale/message_format/foo.js
new file mode 100644
index 00000000000..79b527258a0
--- /dev/null
+++ b/spec/fixtures/plugins/custom_locales/lib/javascripts/locale/message_format/foo.js
@@ -0,0 +1 @@
+// this file should contain plural rules
diff --git a/spec/fixtures/plugins/custom_locales/lib/javascripts/locale/message_format/tlh.js b/spec/fixtures/plugins/custom_locales/lib/javascripts/locale/message_format/tlh.js
new file mode 100644
index 00000000000..79b527258a0
--- /dev/null
+++ b/spec/fixtures/plugins/custom_locales/lib/javascripts/locale/message_format/tlh.js
@@ -0,0 +1 @@
+// this file should contain plural rules
diff --git a/spec/fixtures/plugins/custom_locales/lib/javascripts/locale/moment_js/foo.js b/spec/fixtures/plugins/custom_locales/lib/javascripts/locale/moment_js/foo.js
new file mode 100644
index 00000000000..971b3b1a1ca
--- /dev/null
+++ b/spec/fixtures/plugins/custom_locales/lib/javascripts/locale/moment_js/foo.js
@@ -0,0 +1 @@
+// this file should contain the locale configuration for moment.js
diff --git a/spec/fixtures/plugins/custom_locales/plugin.rb b/spec/fixtures/plugins/custom_locales/plugin.rb
new file mode 100644
index 00000000000..700c68cb5f8
--- /dev/null
+++ b/spec/fixtures/plugins/custom_locales/plugin.rb
@@ -0,0 +1,4 @@
+# name: custom-locales
+# about: Fixtures for plugin that adds new locales
+# version: 1.0
+# authors: Gerhard Schlager
diff --git a/spec/fixtures/theme_settings/invalid_settings.yaml b/spec/fixtures/theme_settings/invalid_settings.yaml
new file mode 100644
index 00000000000..184f7e59691
--- /dev/null
+++ b/spec/fixtures/theme_settings/invalid_settings.yaml
@@ -0,0 +1,19 @@
+no_match_setting:
+  type: bool
+  default: "string value"
+
+no_default_setting:
+  type: string
+
+invalid_type_setting:
+  type: listt
+  default: "name|age|last name"
+
+default_out_of_range:
+  default: 100
+  min: 1
+  max: 20
+
+string_default_out_of_range:
+  default: "abcdefg"
+  min: 20
diff --git a/spec/fixtures/theme_settings/valid_settings.yaml b/spec/fixtures/theme_settings/valid_settings.yaml
new file mode 100644
index 00000000000..33c9c4ed85e
--- /dev/null
+++ b/spec/fixtures/theme_settings/valid_settings.yaml
@@ -0,0 +1,60 @@
+boolean_setting: true
+
+boolean_setting_02:
+  default: false
+
+string_setting: "string value"
+
+string_setting_02:
+  default: "string value"
+  min: 2
+  max: 20
+
+integer_setting: 51
+
+integer_setting_02:
+  type: integer
+  default: 51
+  min: 1
+  max: 60
+  description:
+    fr: "French text"
+    es: "Spanish text"
+
+integer_setting_03:
+  default: 15
+  max: 60
+  description:
+    xyz: "invalid language"
+
+float_setting:
+  default: 2.5
+  min: 1.5
+  max: 10
+
+list_setting:
+  type: list
+  description: "help text"
+  default: "name|age|last name"
+
+enum_setting:
+  default: "trust level 4"
+  type: enum
+  choices:
+    - "trust level 0"
+    - "trust level 1"
+
+enum_setting_02:
+  type: enum
+  default: 10
+  description:
+    en: "English text"
+    ar: "Arabic text"
+
+enum_setting_03:
+  type: enum
+  default: 1
+  choices:
+    - 10
+    - 100
+    - 1000
diff --git a/spec/helpers/user_notifications_helper_spec.rb b/spec/helpers/user_notifications_helper_spec.rb
new file mode 100644
index 00000000000..32e1f140809
--- /dev/null
+++ b/spec/helpers/user_notifications_helper_spec.rb
@@ -0,0 +1,56 @@
+require 'rails_helper'
+
+describe UserNotificationsHelper do
+  describe 'email_excerpt' do
+    let(:paragraphs) { [
+      "<p>This is the first paragraph, but you should read more.</p>",
+      "<p>And here is its friend, the second paragraph.</p>"
+    ] }
+
+    let(:cooked) do
+      paragraphs.join("\n")
+    end
+
+    it "can return the first paragraph" do
+      SiteSetting.digest_min_excerpt_length = 50
+      expect(helper.email_excerpt(cooked)).to eq(paragraphs[0])
+    end
+
+    it "can return another paragraph to satisfy digest_min_excerpt_length" do
+      SiteSetting.digest_min_excerpt_length = 100
+      expect(helper.email_excerpt(cooked)).to eq(paragraphs.join)
+    end
+
+    it "doesn't count emoji images" do
+      with_emoji = "<p>Hi <img src=\"/images/emoji/twitter/smile.png?v=5\" title=\":smile:\" class=\"emoji\" alt=\":smile:\"></p>"
+      arg = ([with_emoji] + paragraphs).join("\n")
+      SiteSetting.digest_min_excerpt_length = 50
+      expect(helper.email_excerpt(arg)).to eq([with_emoji, paragraphs[0]].join)
+    end
+
+    it "only counts link text" do
+      with_link = "<p>Hi <a href=\"https://really-long.essays.com/essay/number/9000/this-one-is-about-friends-and-got-a-C-minus-in-grade-9\">friends</a>!</p>"
+      arg = ([with_link] + paragraphs).join("\n")
+      SiteSetting.digest_min_excerpt_length = 50
+      expect(helper.email_excerpt(arg)).to eq([with_link, paragraphs[0]].join)
+    end
+
+    it "uses user quotes but not post quotes" do
+      cooked = <<~HTML
+        <p>BEFORE</p>
+        <blockquote>
+          <p>This is a user quote</p>
+        </blockquote>
+        <aside class="quote" data-post="3" data-topic="87369">
+          <div class="title">A Title</div>
+          <blockquote>
+            <p>This is a post quote</p>
+          </blockquote>
+        </aside>
+        <p>AFTER</p>
+      HTML
+
+      expect(helper.email_excerpt(cooked)).to eq "<p>BEFORE</p><blockquote>\n  <p>This is a user quote</p>\n</blockquote><p>AFTER</p>"
+    end
+  end
+end
diff --git a/spec/import_export/category_exporter_spec.rb b/spec/import_export/category_exporter_spec.rb
index 785f520c85f..4ed57242bef 100644
--- a/spec/import_export/category_exporter_spec.rb
+++ b/spec/import_export/category_exporter_spec.rb
@@ -6,6 +6,8 @@ describe ImportExport::CategoryExporter do
   let(:category) { Fabricate(:category) }
   let(:group) { Fabricate(:group) }
   let(:user) { Fabricate(:user) }
+  let(:user2) { Fabricate(:user) }
+  let(:user3) { Fabricate(:user) }
 
   before do
     STDOUT.stubs(:write)
@@ -38,13 +40,17 @@ describe ImportExport::CategoryExporter do
 
     it 'export the category with topics and users' do
       topic1 = Fabricate(:topic, category: category, user_id: -1)
+      Fabricate(:post, topic: topic1, user: User.find(-1), post_number: 1)
       topic2 = Fabricate(:topic, category: category, user: user)
+      Fabricate(:post, topic: topic2, user: user, post_number: 1)
+      reply1 = Fabricate(:post, topic: topic2, user: user2, post_number: 2)
+      reply2 = Fabricate(:post, topic: topic2, user: user3, post_number: 3)
       data = ImportExport::CategoryExporter.new([category.id]).perform.export_data
 
       expect(data[:categories].count).to eq(1)
       expect(data[:groups].count).to eq(0)
       expect(data[:topics].count).to eq(2)
-      expect(data[:users].count).to eq(1)
+      expect(data[:users].map { |u| u[:id] }).to match_array([user.id, user2.id, user3.id])
     end
   end
 
diff --git a/spec/import_export/topic_exporter_spec.rb b/spec/import_export/topic_exporter_spec.rb
index db767e4da58..03edeff0464 100644
--- a/spec/import_export/topic_exporter_spec.rb
+++ b/spec/import_export/topic_exporter_spec.rb
@@ -9,6 +9,7 @@ describe ImportExport::TopicExporter do
 
   let(:user) { Fabricate(:user) }
   let(:topic) { Fabricate(:topic, user: user) }
+  let!(:post) { Fabricate(:post, topic: topic, user: user) }
 
   context '.perform' do
     it 'export a single topic' do
@@ -22,12 +23,13 @@ describe ImportExport::TopicExporter do
 
     it 'export multiple topics' do
       topic2 = Fabricate(:topic, user: user)
+      post2 = Fabricate(:post, user: user, topic: topic2)
       data = ImportExport::TopicExporter.new([topic.id, topic2.id]).perform.export_data
 
       expect(data[:categories].blank?).to eq(true)
       expect(data[:groups].blank?).to eq(true)
       expect(data[:topics].count).to eq(2)
-      expect(data[:users].count).to eq(1)
+      expect(data[:users].map { |u| u[:id] }).to match_array([user.id])
     end
   end
 
diff --git a/spec/integration/category_tag_spec.rb b/spec/integration/category_tag_spec.rb
index cbc58c0d8a4..86ff857cb34 100644
--- a/spec/integration/category_tag_spec.rb
+++ b/spec/integration/category_tag_spec.rb
@@ -13,10 +13,10 @@ describe "category tag restrictions" do
     DiscourseTagging.filter_allowed_tags(Tag.all, Guardian.new(user), opts)
   end
 
-  let!(:tag1) { Fabricate(:tag) }
-  let!(:tag2) { Fabricate(:tag) }
-  let!(:tag3) { Fabricate(:tag) }
-  let!(:tag4) { Fabricate(:tag) }
+  let!(:tag1) { Fabricate(:tag, name: 'tag1') }
+  let!(:tag2) { Fabricate(:tag, name: 'tag2') }
+  let!(:tag3) { Fabricate(:tag, name: 'tag3') }
+  let!(:tag4) { Fabricate(:tag, name: 'tag4') }
 
   let(:user)  { Fabricate(:user) }
   let(:admin) { Fabricate(:admin) }
@@ -37,23 +37,25 @@ describe "category tag restrictions" do
 
     it "tags belonging to that category can only be used there" do
       post = create_post(category: category_with_tags, tags: [tag1.name, tag2.name, tag3.name])
-      expect(post.topic.tags.map(&:name).sort).to eq([tag1.name, tag2.name].sort)
+      expect(post.topic.tags).to contain_exactly(tag1, tag2)
 
       post = create_post(category: other_category, tags: [tag1.name, tag2.name, tag3.name])
-      expect(post.topic.tags.map(&:name)).to eq([tag3.name])
+      expect(post.topic.tags).to contain_exactly(tag3)
     end
 
     it "search can show only permitted tags" do
       expect(filter_allowed_tags.count).to eq(Tag.count)
-      expect(filter_allowed_tags(for_input: true, category: category_with_tags).pluck(:name).sort).to eq([tag1.name, tag2.name].sort)
-      expect(filter_allowed_tags(for_input: true).pluck(:name).sort).to eq([tag3.name, tag4.name].sort)
+      expect(filter_allowed_tags(for_input: true, category: category_with_tags)).to contain_exactly(tag1, tag2)
+      expect(filter_allowed_tags(for_input: true)).to contain_exactly(tag3, tag4)
+      expect(filter_allowed_tags(for_input: true, category: category_with_tags, selected_tags: [tag1.name])).to contain_exactly(tag2)
+      expect(filter_allowed_tags(for_input: true, category: category_with_tags, selected_tags: [tag1.name], term: 'tag')).to contain_exactly(tag2)
     end
 
     it "can't create new tags in a restricted category" do
       post = create_post(category: category_with_tags, tags: [tag1.name, "newtag"])
-      expect(post.topic.tags.map(&:name)).to eq([tag1.name])
+      expect(post.topic.tags).to contain_exactly(tag1)
       post = create_post(category: category_with_tags, tags: [tag1.name, "newtag"], user: admin)
-      expect(post.topic.tags.map(&:name)).to eq([tag1.name])
+      expect(post.topic.tags).to contain_exactly(tag1)
     end
 
     it "can create new tags in a non-restricted category" do
@@ -80,13 +82,13 @@ describe "category tag restrictions" do
       category.allowed_tag_groups = [tag_group1.name]
       category.reload
 
-      expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: category))).to eq(sorted_tag_names([tag1, tag2]))
-      expect(sorted_tag_names(filter_allowed_tags(for_input: true))).to eq(sorted_tag_names([tag3, tag4]))
+      expect(filter_allowed_tags(for_input: true, category: category)).to contain_exactly(tag1, tag2)
+      expect(filter_allowed_tags(for_input: true)).to contain_exactly(tag3, tag4)
 
       tag_group1.tags = [tag2, tag3, tag4]
-      expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: category))).to eq(sorted_tag_names([tag2, tag3, tag4]))
-      expect(sorted_tag_names(filter_allowed_tags(for_input: true))).to eq(sorted_tag_names([tag1]))
-      expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: other_category))).to eq(sorted_tag_names([tag1]))
+      expect(filter_allowed_tags(for_input: true, category: category)).to contain_exactly(tag2, tag3, tag4)
+      expect(filter_allowed_tags(for_input: true)).to contain_exactly(tag1)
+      expect(filter_allowed_tags(for_input: true, category: other_category)).to contain_exactly(tag1)
     end
 
     it "groups and individual tags can be mixed" do
@@ -94,9 +96,16 @@ describe "category tag restrictions" do
       category.allowed_tags = [tag4.name]
       category.reload
 
-      expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: category))).to eq(sorted_tag_names([tag1, tag2, tag4]))
-      expect(sorted_tag_names(filter_allowed_tags(for_input: true))).to eq(sorted_tag_names([tag3]))
-      expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: other_category))).to eq(sorted_tag_names([tag3]))
+      expect(filter_allowed_tags(for_input: true, category: category)).to contain_exactly(tag1, tag2, tag4)
+      expect(filter_allowed_tags(for_input: true)).to contain_exactly(tag3)
+      expect(filter_allowed_tags(for_input: true, category: other_category)).to contain_exactly(tag3)
+    end
+
+    it "enforces restrictions when creating a topic" do
+      category.allowed_tag_groups = [tag_group1.name]
+      category.reload
+      post = create_post(category: category, tags: [tag1.name, "newtag"])
+      expect(post.topic.tags.map(&:name)).to eq([tag1.name])
     end
   end
 
@@ -104,9 +113,9 @@ describe "category tag restrictions" do
     it "filter_allowed_tags returns results based on whether parent tag is present or not" do
       tag_group = Fabricate(:tag_group, parent_tag_id: tag1.id)
       tag_group.tags = [tag3, tag4]
-      expect(sorted_tag_names(filter_allowed_tags(for_input: true))).to eq(sorted_tag_names([tag1, tag2]))
-      expect(sorted_tag_names(filter_allowed_tags(for_input: true, selected_tags: [tag1.name]))).to eq(sorted_tag_names([tag1, tag2, tag3, tag4]))
-      expect(sorted_tag_names(filter_allowed_tags(for_input: true, selected_tags: [tag1.name, tag3.name]))).to eq(sorted_tag_names([tag1, tag2, tag3, tag4]))
+      expect(filter_allowed_tags(for_input: true)).to contain_exactly(tag1, tag2)
+      expect(filter_allowed_tags(for_input: true, selected_tags: [tag1.name])).to contain_exactly(tag2, tag3, tag4)
+      expect(filter_allowed_tags(for_input: true, selected_tags: [tag1.name, tag3.name])).to contain_exactly(tag2, tag4)
     end
 
     context "and category restrictions" do
@@ -137,15 +146,15 @@ describe "category tag restrictions" do
 
       it "handles all those rules" do
         # car tags can't be used outside of car category:
-        expect(sorted_tag_names(filter_allowed_tags(for_input: true))).to eq(sorted_tag_names([tag1, tag2, tag3, tag4]))
-        expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: other_category))).to eq(sorted_tag_names([tag1, tag2, tag3, tag4]))
+        expect(filter_allowed_tags(for_input: true)).to contain_exactly(tag1, tag2, tag3, tag4)
+        expect(filter_allowed_tags(for_input: true, category: other_category)).to contain_exactly(tag1, tag2, tag3, tag4)
 
         # in car category, a make tag must be given first:
         expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: car_category))).to eq(['ford', 'honda'])
 
         # model tags depend on which make is chosen:
-        expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: car_category, selected_tags: ['honda']))).to eq(['accord', 'civic', 'ford', 'honda'])
-        expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: car_category, selected_tags: ['ford']))).to eq(['ford', 'honda', 'mustang', 'taurus'])
+        expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: car_category, selected_tags: ['honda']))).to eq(['accord', 'civic', 'ford'])
+        expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: car_category, selected_tags: ['ford']))).to eq(['honda', 'mustang', 'taurus'])
       end
 
       it "can apply the tags to a topic" do
@@ -162,9 +171,9 @@ describe "category tag restrictions" do
 
         it "can restrict one tag from each group" do
           expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: car_category))).to eq(['ford', 'honda'])
-          expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: car_category, selected_tags: ['honda']))).to eq(['accord', 'civic', 'honda'])
-          expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: car_category, selected_tags: ['ford']))).to eq(['ford', 'mustang', 'taurus'])
-          expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: car_category, selected_tags: ['ford', 'mustang']))).to eq(['ford', 'mustang'])
+          expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: car_category, selected_tags: ['honda']))).to eq(['accord', 'civic'])
+          expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: car_category, selected_tags: ['ford']))).to eq(['mustang', 'taurus'])
+          expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: car_category, selected_tags: ['ford', 'mustang']))).to eq([])
         end
 
         it "can apply the tags to a topic" do
@@ -176,10 +185,100 @@ describe "category tag restrictions" do
           # A weird case that input field wouldn't allow.
           # Only one tag from car makers is allowed, but we're saying that two have been selected.
           names = filter_allowed_tags(for_input: true, category: car_category, selected_tags: ['honda', 'ford']).map(&:name)
-          expect(names.include?('honda') && names.include?('ford')).to eq(false)
-          expect(names.include?('honda') || names.include?('ford')).to eq(true)
+          expect(names.include?('honda') || names.include?('ford')).to eq(false)
+          expect(names).to include('civic')
+          expect(names).to include('mustang')
         end
       end
     end
   end
 end
+
+describe "tag topic counts per category" do
+  let(:user)  { Fabricate(:user) }
+  let(:admin) { Fabricate(:admin) }
+  let(:category) { Fabricate(:category) }
+  let(:category2) { Fabricate(:category) }
+  let(:tag1) { Fabricate(:tag) }
+  let(:tag2) { Fabricate(:tag) }
+  let(:tag3) { Fabricate(:tag) }
+
+  before do
+    SiteSetting.tagging_enabled = true
+    SiteSetting.min_trust_to_create_tag = 0
+    SiteSetting.min_trust_level_to_tag_topics = 0
+  end
+
+  it "counts when a topic is created with tags" do
+    expect {
+      Fabricate(:topic, category: category, tags: [tag1, tag2])
+    }.to change { CategoryTagStat.count }.by(2)
+    expect(CategoryTagStat.where(category: category, tag: tag1).sum(:topic_count)).to eq(1)
+    expect(CategoryTagStat.where(category: category, tag: tag2).sum(:topic_count)).to eq(1)
+  end
+
+  it "counts when tag is added to an existing topic" do
+    topic = Fabricate(:topic, category: category)
+    post = Fabricate(:post, user: topic.user, topic: topic)
+    expect(CategoryTagStat.where(category: category).count).to eq(0)
+    expect {
+      PostRevisor.new(post).revise!(topic.user, raw: post.raw, tags: [tag1.name, tag2.name])
+    }.to change { CategoryTagStat.count }.by(2)
+    expect(CategoryTagStat.where(category: category, tag: tag1).sum(:topic_count)).to eq(1)
+    expect(CategoryTagStat.where(category: category, tag: tag2).sum(:topic_count)).to eq(1)
+  end
+
+  context "topic with 2 tags" do
+    let(:topic) { Fabricate(:topic, category: category, tags: [tag1, tag2]) }
+    let(:post)  { Fabricate(:post, user: topic.user, topic: topic) }
+
+    it "has correct counts after tag is removed from a topic" do
+      post
+      topic2 = Fabricate(:topic, category: category, tags: [tag2])
+      expect(CategoryTagStat.where(category: category, tag: tag2).sum(:topic_count)).to eq(2)
+      PostRevisor.new(post).revise!(topic.user, raw: post.raw, tags: [])
+      expect(CategoryTagStat.where(category: category, tag: tag2).sum(:topic_count)).to eq(1)
+      expect(CategoryTagStat.where(category: category, tag: tag1).sum(:topic_count)).to eq(0)
+    end
+
+    it "has correct counts after a topic's category changes" do
+      PostRevisor.new(post).revise!(topic.user, category_id: category2.id, raw: post.raw, tags: [tag1.name, tag2.name])
+      expect(CategoryTagStat.where(category: category, tag: tag1).sum(:topic_count)).to eq(0)
+      expect(CategoryTagStat.where(category: category, tag: tag2).sum(:topic_count)).to eq(0)
+      expect(CategoryTagStat.where(category: category2, tag: tag1).sum(:topic_count)).to eq(1)
+      expect(CategoryTagStat.where(category: category2, tag: tag2).sum(:topic_count)).to eq(1)
+    end
+
+    it "has correct counts after topic's category AND tags changed" do
+      PostRevisor.new(post).revise!(topic.user, raw: post.raw, tags: [tag2.name, tag3.name], category_id: category2.id)
+      expect(CategoryTagStat.where(category: category, tag: tag1).sum(:topic_count)).to eq(0)
+      expect(CategoryTagStat.where(category: category, tag: tag2).sum(:topic_count)).to eq(0)
+      expect(CategoryTagStat.where(category: category, tag: tag3).sum(:topic_count)).to eq(0)
+      expect(CategoryTagStat.where(category: category2, tag: tag1).sum(:topic_count)).to eq(0)
+      expect(CategoryTagStat.where(category: category2, tag: tag2).sum(:topic_count)).to eq(1)
+      expect(CategoryTagStat.where(category: category2, tag: tag3).sum(:topic_count)).to eq(1)
+    end
+  end
+
+  context "topic with one tag" do
+    let(:topic) { Fabricate(:topic, tags: [tag1], category: category) }
+    let(:post) { Fabricate(:post, user: topic.user, topic: topic) }
+
+    it "counts after topic becomes uncategorized" do
+      PostRevisor.new(post).revise!(topic.user, raw: post.raw, tags: [tag1.name], category_id: SiteSetting.uncategorized_category_id)
+      expect(CategoryTagStat.where(category: Category.find(SiteSetting.uncategorized_category_id), tag: tag1).sum(:topic_count)).to eq(1)
+      expect(CategoryTagStat.where(category: category, tag: tag1).sum(:topic_count)).to eq(0)
+    end
+
+    it "updates counts after topic is deleted" do
+      PostDestroyer.new(admin, post).destroy
+      expect(CategoryTagStat.where(category: category, tag: tag1).sum(:topic_count)).to eq(0)
+    end
+
+    it "updates counts after topic is recovered" do
+      PostDestroyer.new(admin, post).destroy
+      PostDestroyer.new(admin, post).recover
+      expect(CategoryTagStat.where(category: category, tag: tag1).sum(:topic_count)).to eq(1)
+    end
+  end
+end
diff --git a/spec/integration/rate_limiting_spec.rb b/spec/integration/rate_limiting_spec.rb
index e3211fa55ba..25a389cf9b0 100644
--- a/spec/integration/rate_limiting_spec.rb
+++ b/spec/integration/rate_limiting_spec.rb
@@ -2,36 +2,55 @@
 
 require 'rails_helper'
 
-describe 'admin rate limit' do
+describe 'rate limiter integration' do
 
   before do
     RateLimiter.enable
+    RateLimiter.clear_all!
   end
 
   after do
     RateLimiter.disable
   end
 
-  it 'can cleanly limit requests' do
+  it "will clear the token cookie if invalid" do
+    name = Auth::DefaultCurrentUserProvider::TOKEN_COOKIE
+
+    # we try 11 times because the rate limit is 10
+    11.times {
+      cookies[name] = SecureRandom.hex
+      get '/categories.json'
+      expect(response.cookies.has_key?(name)).to eq(true)
+      expect(response.cookies[name]).to be_nil
+    }
+  end
+
+  it 'can cleanly limit requests and sets a Retry-After header' do
+    freeze_time
+    #request.set_header("action_dispatch.show_exceptions", true)
 
     admin = Fabricate(:admin)
     api_key = Fabricate(:api_key, key: SecureRandom.hex, user: admin)
 
     global_setting :max_admin_api_reqs_per_key_per_minute, 1
 
-    get '/admin/users.json', params: {
+    get '/admin/api/keys.json', params: {
       api_key: api_key.key,
       api_username: admin.username
     }
 
     expect(response.status).to eq(200)
 
-    get '/admin/users.json', params: {
+    get '/admin/api/keys.json', params: {
       api_key: api_key.key,
       api_username: admin.username
     }
 
     expect(response.status).to eq(429)
 
+    data = JSON.parse(response.body)
+
+    expect(response.headers['Retry-After']).to eq(60)
+    expect(data["extras"]["wait_seconds"]).to eq(60)
   end
 end
diff --git a/spec/integration/topic_auto_close_spec.rb b/spec/integration/topic_auto_close_spec.rb
index 7dd24eef55d..19ea2563df1 100644
--- a/spec/integration/topic_auto_close_spec.rb
+++ b/spec/integration/topic_auto_close_spec.rb
@@ -28,7 +28,6 @@ describe Topic do
 
     context 'jobs may be queued' do
       before do
-        SiteSetting.queue_jobs = true
         freeze_time
       end
 
diff --git a/spec/integration/watched_words_spec.rb b/spec/integration/watched_words_spec.rb
index 03034e9b441..b165b175a26 100644
--- a/spec/integration/watched_words_spec.rb
+++ b/spec/integration/watched_words_spec.rb
@@ -21,7 +21,7 @@ describe WatchedWord do
       expect {
         result = manager.perform
         expect(result).to_not be_success
-        expect(result.errors[:base]&.first).to eq(I18n.t('contains_blocked_words'))
+        expect(result.errors[:base]&.first).to eq(I18n.t('contains_blocked_words', word: block_word.word))
       }.to_not change { Post.count }
     end
 
@@ -163,6 +163,7 @@ describe WatchedWord do
     end
 
     it "flags on revisions" do
+      SiteSetting.queue_jobs = false
       post = Fabricate(:post, topic: Fabricate(:topic, user: tl2_user), user: tl2_user)
       expect {
         PostRevisor.new(post).revise!(post.user, { raw: "Want some #{flag_word.word} for cheap?" }, revised_at: post.updated_at + 10.seconds)
diff --git a/spec/integrity/common_mark_spec.rb b/spec/integrity/common_mark_spec.rb
index 063e6ddff92..89009866619 100644
--- a/spec/integrity/common_mark_spec.rb
+++ b/spec/integrity/common_mark_spec.rb
@@ -27,7 +27,8 @@ describe "CommonMark" do
         html.gsub!('<hr />', '<hr>')
         html.gsub!(/<img([^>]+) \/>/, "<img\\1>")
 
-        cooked = PrettyText.markdown(md, sanitize: false, linkify: false)
+        SiteSetting.enable_markdown_linkify = false
+        cooked = PrettyText.markdown(md, sanitize: false)
         cooked.strip!
         cooked.gsub!(" class=\"lang-auto\"", '')
         cooked.gsub!(/<span class="hashtag">(.*)<\/span>/, "\\1")
diff --git a/spec/jobs/automatic_group_membership_spec.rb b/spec/jobs/automatic_group_membership_spec.rb
index 55776b99e42..93758a56953 100644
--- a/spec/jobs/automatic_group_membership_spec.rb
+++ b/spec/jobs/automatic_group_membership_spec.rb
@@ -11,8 +11,13 @@ describe Jobs::AutomaticGroupMembership do
     user1 = Fabricate(:user, email: "no@bar.com")
     user2 = Fabricate(:user, email: "no@wat.com")
     user3 = Fabricate(:user, email: "noo@wat.com", staged: true)
+    EmailToken.confirm(user3.email_tokens.last.token)
     user4 = Fabricate(:user, email: "yes@wat.com")
     EmailToken.confirm(user4.email_tokens.last.token)
+    user5 = Fabricate(:user, email: "sso@wat.com")
+    user5.create_single_sign_on_record(external_id: 123, external_email: "hacker@wat.com", last_payload: "")
+    user6 = Fabricate(:user, email: "sso2@wat.com")
+    user6.create_single_sign_on_record(external_id: 456, external_email: "sso2@wat.com", last_payload: "")
 
     group = Fabricate(:group, automatic_membership_email_domains: "wat.com", automatic_membership_retroactive: true)
 
@@ -23,6 +28,8 @@ describe Jobs::AutomaticGroupMembership do
     expect(group.users.include?(user2)).to eq(false)
     expect(group.users.include?(user3)).to eq(false)
     expect(group.users.include?(user4)).to eq(true)
+    expect(group.users.include?(user5)).to eq(false)
+    expect(group.users.include?(user6)).to eq(true)
   end
 
 end
diff --git a/spec/jobs/bulk_invite_spec.rb b/spec/jobs/bulk_invite_spec.rb
index 0739a415743..573f27639c9 100644
--- a/spec/jobs/bulk_invite_spec.rb
+++ b/spec/jobs/bulk_invite_spec.rb
@@ -12,12 +12,13 @@ describe Jobs::BulkInvite do
     context '.read_csv_file' do
       let(:user) { Fabricate(:user) }
       let(:bulk_invite) { Jobs::BulkInvite.new }
-      let(:csv_file) { File.new("#{Rails.root}/spec/fixtures/csv/discourse.csv") }
+      let(:csv_file) { "#{Rails.root}/spec/fixtures/csv/discourse.csv" }
 
       it 'reads csv file' do
         bulk_invite.current_user = user
         bulk_invite.read_csv_file(csv_file)
         expect(Invite.where(email: "robin@outlook.com").exists?).to eq(true)
+        expect(Invite.where(email: "jeff@gmail.com").exists?).to eq(true) # handles BOM
       end
     end
 
diff --git a/spec/jobs/clean_up_crawler_stats_spec.rb b/spec/jobs/clean_up_crawler_stats_spec.rb
new file mode 100644
index 00000000000..46c069e9e6f
--- /dev/null
+++ b/spec/jobs/clean_up_crawler_stats_spec.rb
@@ -0,0 +1,31 @@
+require 'rails_helper'
+
+describe Jobs::CleanUpCrawlerStats do
+  subject { Jobs::CleanUpCrawlerStats.new.execute({}) }
+
+  it "deletes records older than 30 days old" do
+    freeze_time
+
+    today = Fabricate(:web_crawler_request, date: Time.zone.now.to_date)
+    yesterday = Fabricate(:web_crawler_request, date: 1.day.ago.to_date)
+    too_old = Fabricate(:web_crawler_request, date: 31.days.ago.to_date)
+
+    expect { subject }.to change { WebCrawlerRequest.count }.by(-1)
+    expect(WebCrawlerRequest.where(id: too_old.id)).to_not exist
+  end
+
+  it "keeps only the top records from the previous day" do
+    freeze_time
+
+    WebCrawlerRequest.stubs(:max_records_per_day).returns(3)
+
+    req1 = Fabricate(:web_crawler_request, date: 1.day.ago.to_date, count: 100)
+    req4 = Fabricate(:web_crawler_request, date: 1.day.ago.to_date, count: 30)
+    req3 = Fabricate(:web_crawler_request, date: 1.day.ago.to_date, count: 40)
+    req2 = Fabricate(:web_crawler_request, date: 1.day.ago.to_date, count: 50)
+    req5 = Fabricate(:web_crawler_request, date: 1.day.ago.to_date, count: 1)
+
+    expect { subject }.to change { WebCrawlerRequest.count }.by(-2)
+    expect(WebCrawlerRequest.all).to contain_exactly(req1, req2, req3)
+  end
+end
diff --git a/spec/jobs/clean_up_digest_keys.rb b/spec/jobs/clean_up_digest_keys.rb
deleted file mode 100644
index d148836a71c..00000000000
--- a/spec/jobs/clean_up_digest_keys.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module Jobs
-
-  class CleanUpDigestKeys < Jobs::Scheduled
-    every 1.day
-
-    def execute(args)
-      # Remove unused digest keys
-      DigestUnsubscribeKey.where('created_at < ?', 2.months.ago).delete_all
-    end
-  end
-
-end
diff --git a/spec/jobs/clean_up_uploads_spec.rb b/spec/jobs/clean_up_uploads_spec.rb
index 73b778d0146..6539655807e 100644
--- a/spec/jobs/clean_up_uploads_spec.rb
+++ b/spec/jobs/clean_up_uploads_spec.rb
@@ -167,4 +167,13 @@ describe Jobs::CleanUpUploads do
     expect(Upload.find_by(id: upload.id)).to eq(upload)
   end
 
+  it "does not delete user exported csv uploads" do
+    csv_file = fabricate_upload
+    UserExport.create(file_name: "export.csv", user_id: Fabricate(:user).id, upload_id: csv_file.id)
+
+    Jobs::CleanUpUploads.new.execute(nil)
+
+    expect(Upload.find_by(id: @upload.id)).to eq(nil)
+    expect(Upload.find_by(id: csv_file.id)).to eq(csv_file)
+  end
 end
diff --git a/spec/jobs/delete_topic_spec.rb b/spec/jobs/delete_topic_spec.rb
index 03ca8a53efa..a1621b52721 100644
--- a/spec/jobs/delete_topic_spec.rb
+++ b/spec/jobs/delete_topic_spec.rb
@@ -9,10 +9,6 @@ describe Jobs::DeleteTopic do
 
   let(:first_post) { create_post(topic: topic) }
 
-  before do
-    SiteSetting.queue_jobs = true
-  end
-
   it "can delete a topic" do
     first_post
 
diff --git a/spec/jobs/download_backup_email_spec.rb b/spec/jobs/download_backup_email_spec.rb
index cda261c675d..5c389750f92 100644
--- a/spec/jobs/download_backup_email_spec.rb
+++ b/spec/jobs/download_backup_email_spec.rb
@@ -15,8 +15,6 @@ RSpec.describe Jobs::DownloadBackupEmail do
       email_prefix: SiteSetting.title
     ))
 
-    expect(email.body.raw_source).to eq(I18n.t('download_backup_mailer.text_body_template',
-      backup_file_path: "http://some.example.test/?token=#{EmailBackupToken.get(user.id)}"
-    ))
+    expect(email.body.raw_source).to include("http://some.example.test/?token=#{EmailBackupToken.get(user.id)}")
   end
 end
diff --git a/spec/jobs/download_profile_background_from_url_spec.rb b/spec/jobs/download_profile_background_from_url_spec.rb
new file mode 100644
index 00000000000..a7913cc73c9
--- /dev/null
+++ b/spec/jobs/download_profile_background_from_url_spec.rb
@@ -0,0 +1,16 @@
+require 'rails_helper'
+
+RSpec.describe Jobs::DownloadProfileBackgroundFromUrl do
+  let(:user) { Fabricate(:user) }
+
+  describe 'when url is invalid' do
+    it 'should not raise any error' do
+      expect do
+        described_class.new.execute(
+          url: '/assets/something/nice.jpg',
+          user_id: user.id
+        )
+      end.to_not raise_error
+    end
+  end
+end
diff --git a/spec/jobs/emit_web_hook_event_spec.rb b/spec/jobs/emit_web_hook_event_spec.rb
index fbc1cf13ec7..97a86f66838 100644
--- a/spec/jobs/emit_web_hook_event_spec.rb
+++ b/spec/jobs/emit_web_hook_event_spec.rb
@@ -7,21 +7,51 @@ describe Jobs::EmitWebHookEvent do
   let(:user) { Fabricate(:user) }
 
   it 'raises an error when there is no web hook record' do
-    expect { subject.execute(event_type: 'post') }.to raise_error(Discourse::InvalidParameters)
+    expect do
+      subject.execute(event_type: 'post', payload: {})
+    end.to raise_error(Discourse::InvalidParameters)
   end
 
   it 'raises an error when there is no event type' do
-    expect { subject.execute(web_hook_id: 1) }.to raise_error(Discourse::InvalidParameters)
+    expect do
+      subject.execute(web_hook_id: 1, payload: {})
+    end.to raise_error(Discourse::InvalidParameters)
+  end
+
+  it 'raises an error when there is no payload' do
+    expect do
+      subject.execute(web_hook_id: 1, event_type: 'post')
+    end.to raise_error(Discourse::InvalidParameters)
+  end
+
+  it 'does not raise an error for a ping event without payload' do
+    stub_request(:post, "https://meta.discourse.org/webhook_listener")
+      .to_return(body: 'OK', status: 200)
+
+    subject.execute(
+      web_hook_id: post_hook.id,
+      event_type: described_class::PING_EVENT
+    )
   end
 
   it "doesn't emit when the hook is inactive" do
-    Jobs::EmitWebHookEvent.any_instance.expects(:web_hook_request).never
-    subject.execute(web_hook_id: inactive_hook.id, event_type: 'post', post_id: post.id)
+    subject.execute(
+      web_hook_id: inactive_hook.id,
+      event_type: 'post',
+      payload: { test: "some payload" }.to_json
+    )
   end
 
   it 'emits normally with sufficient arguments' do
-    Jobs::EmitWebHookEvent.any_instance.expects(:web_hook_request).once
-    subject.execute(web_hook_id: post_hook.id, event_type: 'post', post_id: post.id)
+    stub_request(:post, "https://meta.discourse.org/webhook_listener")
+      .with(body: "{\"post\":{\"test\":\"some payload\"}}")
+      .to_return(body: 'OK', status: 200)
+
+    subject.execute(
+      web_hook_id: post_hook.id,
+      event_type: 'post',
+      payload: { test: "some payload" }.to_json
+    )
   end
 
   context 'with category filters' do
@@ -31,54 +61,64 @@ describe Jobs::EmitWebHookEvent do
     let(:topic_hook) { Fabricate(:topic_web_hook, categories: [category]) }
 
     it "doesn't emit when event is not related with defined categories" do
-      Jobs::EmitWebHookEvent.any_instance.expects(:web_hook_request).never
-
-      subject.execute(web_hook_id: topic_hook.id,
-                      event_type: 'topic',
-                      topic_id: topic.id,
-                      user_id: user.id,
-                      category_id: topic.category.id)
+      subject.execute(
+        web_hook_id: topic_hook.id,
+        event_type: 'topic',
+        category_id: topic.category.id,
+        payload: { test: "some payload" }.to_json
+      )
     end
 
     it 'emit when event is related with defined categories' do
-      Jobs::EmitWebHookEvent.any_instance.expects(:web_hook_request).once
+      stub_request(:post, "https://meta.discourse.org/webhook_listener")
+        .with(body: "{\"topic\":{\"test\":\"some payload\"}}")
+        .to_return(body: 'OK', status: 200)
 
-      subject.execute(web_hook_id: topic_hook.id,
-                      event_type: 'topic',
-                      topic_id: topic_with_category.id,
-                      user_id: user.id,
-                      category_id: topic_with_category.category.id)
+      subject.execute(
+        web_hook_id: topic_hook.id,
+        event_type: 'topic',
+        category_id: topic_with_category.category.id,
+        payload: { test: "some payload" }.to_json
+      )
     end
   end
 
-  describe '.web_hook_request' do
+  describe '#web_hook_request' do
     it 'creates delivery event record' do
       stub_request(:post, "https://meta.discourse.org/webhook_listener")
         .to_return(body: 'OK', status: 200)
 
-      expect do
-        subject.execute(web_hook_id: post_hook.id, event_type: 'post', post_id: post.id)
-      end.to change(WebHookEvent, :count).by(1)
-    end
+      WebHookEventType.all.pluck(:name).each do |name|
+        web_hook_id = Fabricate("#{name}_web_hook").id
 
-    it 'skips silently on missing post' do
-      expect do
-        subject.execute(web_hook_id: post_hook.id, event_type: 'post', post_id: (Post.maximum(:id).to_i + 1))
-      end.not_to raise_error
+        expect do
+          subject.execute(
+            web_hook_id: web_hook_id,
+            event_type: name,
+            payload: { test: "some payload" }.to_json
+          )
+        end.to change(WebHookEvent, :count).by(1)
+      end
     end
 
     it 'sets up proper request headers' do
       stub_request(:post, "https://meta.discourse.org/webhook_listener")
         .to_return(headers: { test: 'string' }, body: 'OK', status: 200)
 
-      subject.execute(web_hook_id: post_hook.id, event_type: 'ping', event_name: 'ping')
+      subject.execute(
+        web_hook_id: post_hook.id,
+        event_type: described_class::PING_EVENT,
+        event_name: described_class::PING_EVENT,
+        payload: { test: "this payload shouldn't appear" }.to_json
+      )
+
       event = WebHookEvent.last
       headers = MultiJson.load(event.headers)
       expect(headers['Content-Length']).to eq(13)
       expect(headers['Host']).to eq("meta.discourse.org")
       expect(headers['X-Discourse-Event-Id']).to eq(event.id)
-      expect(headers['X-Discourse-Event-Type']).to eq('ping')
-      expect(headers['X-Discourse-Event']).to eq('ping')
+      expect(headers['X-Discourse-Event-Type']).to eq(described_class::PING_EVENT)
+      expect(headers['X-Discourse-Event']).to eq(described_class::PING_EVENT)
       expect(headers['X-Discourse-Event-Signature']).to eq('sha256=162f107f6b5022353274eb1a7197885cfd35744d8d08e5bcea025d309386b7d6')
       expect(event.payload).to eq(MultiJson.dump(ping: 'OK'))
       expect(event.status).to eq(200)
diff --git a/spec/jobs/export_csv_file_spec.rb b/spec/jobs/export_csv_file_spec.rb
index c9c5e96bd66..1852556da2d 100644
--- a/spec/jobs/export_csv_file_spec.rb
+++ b/spec/jobs/export_csv_file_spec.rb
@@ -3,8 +3,24 @@ require 'rails_helper'
 describe Jobs::ExportCsvFile do
 
   context '.execute' do
+    let(:user) { Fabricate(:user, username: "john_doe") }
+
     it 'raises an error when the entity is missing' do
-      expect { Jobs::ExportCsvFile.new.execute(user_id: "1") }.to raise_error(Discourse::InvalidParameters)
+      expect { Jobs::ExportCsvFile.new.execute(user_id: user.id) }.to raise_error(Discourse::InvalidParameters)
+    end
+
+    it 'works' do
+      begin
+        Jobs::ExportCsvFile.new.execute(user_id: user.id, entity: "user_archive")
+
+        expect(user.topics_allowed.last.title).to eq(I18n.t(
+          "system_messages.csv_export_succeeded.subject_template",
+          export_title: "User Archive"
+        ))
+        expect(user.topics_allowed.last.first_post.raw).to include("user-archive-john_doe-")
+      ensure
+        user.uploads.find_each { |upload| upload.destroy! }
+      end
     end
   end
 
diff --git a/spec/jobs/grant_new_user_of_the_month_badges_spec.rb b/spec/jobs/grant_new_user_of_the_month_badges_spec.rb
index fd77fbf7d52..7882bfdbf4c 100644
--- a/spec/jobs/grant_new_user_of_the_month_badges_spec.rb
+++ b/spec/jobs/grant_new_user_of_the_month_badges_spec.rb
@@ -162,11 +162,11 @@ describe Jobs::GrantNewUserOfTheMonthBadges do
       PostAction.act(um, p, PostActionType.types[:like])
       PostAction.act(ua, p, PostActionType.types[:like])
       PostAction.act(Discourse.system_user, p, PostActionType.types[:like])
-      expect(granter.scores[user.id]).to eq(4.425)
+      expect(granter.scores[user.id]).to eq(1.55)
 
       # It goes down the more they post
       Fabricate(:post, user: user)
-      expect(granter.scores[user.id]).to eq(2.95)
+      expect(granter.scores[user.id]).to eq(1.35625)
     end
 
     it "is limited to two accounts" do
diff --git a/spec/jobs/jobs_spec.rb b/spec/jobs/jobs_spec.rb
index 7ec26fd6049..9f49d3d5b6c 100644
--- a/spec/jobs/jobs_spec.rb
+++ b/spec/jobs/jobs_spec.rb
@@ -55,34 +55,28 @@ describe Jobs do
           Jobs::ProcessPost.any_instance.stubs(:execute).returns(true)
         end
 
-        it 'should not execute the job' do
-          Jobs::ProcessPost.any_instance.expects(:execute).never
-          Jobs.enqueue(:process_post, post_id: 1, current_site_id: 'test_db') rescue nil
-        end
-
         it 'should raise an exception' do
+          Jobs::ProcessPost.any_instance.expects(:execute).never
+          RailsMultisite::ConnectionManagement.expects(:establish_connection).never
+
           expect {
             Jobs.enqueue(:process_post, post_id: 1, current_site_id: 'test_db')
           }.to raise_error(ArgumentError)
         end
-
-        it 'should not connect to the given database' do
-          RailsMultisite::ConnectionManagement.expects(:establish_connection).never
-          Jobs.enqueue(:process_post, post_id: 1, current_site_id: 'test_db') rescue nil
-        end
       end
     end
 
   end
 
   describe 'cancel_scheduled_job' do
+    let(:scheduled_jobs) { Sidekiq::ScheduledSet.new }
+
+    after do
+      scheduled_jobs.clear
+    end
 
     it 'deletes the matching job' do
-      SiteSetting.queue_jobs = true
-
       Sidekiq::Testing.disable! do
-        scheduled_jobs = Sidekiq::ScheduledSet.new
-
         expect(scheduled_jobs.size).to eq(0)
 
         Jobs.enqueue_in(1.year, :run_heartbeat, topic_id: 123)
diff --git a/spec/jobs/poll_feed_spec.rb b/spec/jobs/poll_feed_spec.rb
index 5ba0383068b..92f98f685e0 100644
--- a/spec/jobs/poll_feed_spec.rb
+++ b/spec/jobs/poll_feed_spec.rb
@@ -82,6 +82,18 @@ describe Jobs::PollFeed do
             expect { poller.poll_feed }.to change { Topic.count }.by(1)
             expect(Topic.last.user).to eq(feed_author)
           end
+
+          it "updates the post if it had been polled" do
+            embed_url = 'https://blog.discourse.org/2017/09/poll-feed-spec-fixture'
+            post = TopicEmbed.import(Fabricate(:user), embed_url, 'old title', 'old content')
+
+            expect { poller.poll_feed }.to_not change { Topic.count }
+
+            post.reload
+            expect(post.topic.title).to eq('Poll Feed Spec Fixture')
+            expect(post.raw).to include('<p>This is the body &amp; content. </p>')
+            expect(post.user).to eq(feed_author)
+          end
         end
       end
 
@@ -99,9 +111,8 @@ describe Jobs::PollFeed do
         SiteSetting.feed_polling_url = 'https://blog.discourse.org/feed/'
         SiteSetting.embed_by_username = embed_by_username
 
-        stub_request(:head, SiteSetting.feed_polling_url).to_return(status: 200)
+        stub_request(:head, SiteSetting.feed_polling_url)
         stub_request(:get, SiteSetting.feed_polling_url).to_return(
-          status: 200,
           body: file_from_fixtures('feed.rss', 'feed').read,
           headers: { "Content-Type" => "application/rss+xml" }
         )
@@ -116,9 +127,8 @@ describe Jobs::PollFeed do
         SiteSetting.feed_polling_url = 'https://blog.discourse.org/feed/atom/'
         SiteSetting.embed_by_username = embed_by_username
 
-        stub_request(:head, SiteSetting.feed_polling_url).to_return(status: 200)
+        stub_request(:head, SiteSetting.feed_polling_url)
         stub_request(:get, SiteSetting.feed_polling_url).to_return(
-          status: 200,
           body: file_from_fixtures('feed.atom', 'feed').read,
           headers: { "Content-Type" => "application/atom+xml" }
         )
diff --git a/spec/jobs/publish_topic_to_category_spec.rb b/spec/jobs/publish_topic_to_category_spec.rb
index 84158e9adb8..a026002ffd6 100644
--- a/spec/jobs/publish_topic_to_category_spec.rb
+++ b/spec/jobs/publish_topic_to_category_spec.rb
@@ -16,10 +16,6 @@ RSpec.describe Jobs::PublishTopicToCategory do
     topic
   end
 
-  before do
-    SiteSetting.queue_jobs = true
-  end
-
   describe 'when topic has been deleted' do
     it 'should not publish the topic to the new category' do
       freeze_time 1.hour.ago
diff --git a/spec/jobs/pull_hotlinked_images_spec.rb b/spec/jobs/pull_hotlinked_images_spec.rb
index 0c8ee74c437..38a0f766bad 100644
--- a/spec/jobs/pull_hotlinked_images_spec.rb
+++ b/spec/jobs/pull_hotlinked_images_spec.rb
@@ -11,10 +11,8 @@ describe Jobs::PullHotlinkedImages do
 
   before do
     stub_request(:get, image_url).to_return(body: png, headers: { "Content-Type" => "image/png" })
-    stub_request(:head, image_url)
-    stub_request(:head, broken_image_url).to_return(status: 404)
+    stub_request(:get, broken_image_url).to_return(status: 404)
     stub_request(:get, large_image_url).to_return(body: large_png, headers: { "Content-Type" => "image/png" })
-    stub_request(:head, large_image_url)
     SiteSetting.crawl_images = true
     SiteSetting.download_remote_images_to_local = true
     SiteSetting.max_image_size_kb = 2
@@ -34,6 +32,7 @@ describe Jobs::PullHotlinkedImages do
 
   describe '#execute' do
     before do
+      SiteSetting.queue_jobs = false
       FastImage.expects(:size).returns([100, 100]).at_least_once
     end
 
@@ -59,7 +58,6 @@ describe Jobs::PullHotlinkedImages do
     it 'replaces images without extension' do
       url = image_url.sub(/\.[a-zA-Z0-9]+$/, '')
       stub_request(:get, url).to_return(body: png, headers: { "Content-Type" => "image/png" })
-      stub_request(:head, url)
       post = Fabricate(:post, raw: "<img src='#{url}'>")
 
       Jobs::PullHotlinkedImages.new.execute(post_id: post.id)
@@ -75,8 +73,8 @@ describe Jobs::PullHotlinkedImages do
 
       before do
         SiteSetting.queue_jobs = true
-        stub_request(:get, url).to_return(body: '')
         stub_request(:head, url)
+        stub_request(:get, url).to_return(body: '')
         stub_request(:get, api_url).to_return(body: "{
           \"query\": {
             \"pages\": {
@@ -91,7 +89,6 @@ describe Jobs::PullHotlinkedImages do
             }
           }
         }")
-        stub_request(:head, api_url)
       end
 
       it 'replaces image src' do
diff --git a/spec/jobs/tl3_promotions_spec.rb b/spec/jobs/tl3_promotions_spec.rb
index bf440918fdf..e96d809da94 100644
--- a/spec/jobs/tl3_promotions_spec.rb
+++ b/spec/jobs/tl3_promotions_spec.rb
@@ -2,10 +2,23 @@ require 'rails_helper'
 
 describe Jobs::Tl3Promotions do
 
+  def create_qualifying_stats(user)
+    user.create_user_stat if user.user_stat.nil?
+    user.user_stat.update_attributes!(
+      days_visited: 1000,
+      topic_reply_count: 1000,
+      topics_entered: 1000,
+      posts_read_count: 1000,
+      likes_given: 1000,
+      likes_received: 1000
+    )
+  end
+
   subject(:run_job) { described_class.new.execute({}) }
 
   it "promotes tl2 user who qualifies for tl3" do
     _tl2_user = Fabricate(:user, trust_level: TrustLevel[2])
+    create_qualifying_stats(_tl2_user)
     TrustLevel3Requirements.any_instance.stubs(:requirements_met?).returns(true)
     Promotion.any_instance.expects(:change_trust_level!).with(TrustLevel[3], anything).once
     run_job
@@ -14,6 +27,8 @@ describe Jobs::Tl3Promotions do
   it "doesn't promote tl1 and tl0 users who have met tl3 requirements" do
     _tl1_user = Fabricate(:user, trust_level: TrustLevel[1])
     _tl0_user = Fabricate(:user, trust_level: TrustLevel[0])
+    create_qualifying_stats(_tl1_user)
+    create_qualifying_stats(_tl0_user)
     TrustLevel3Requirements.any_instance.expects(:requirements_met?).never
     Promotion.any_instance.expects(:change_trust_level!).never
     run_job
diff --git a/spec/jobs/toggle_topic_closed_spec.rb b/spec/jobs/toggle_topic_closed_spec.rb
index 2e36f8abaa8..77e1afbe081 100644
--- a/spec/jobs/toggle_topic_closed_spec.rb
+++ b/spec/jobs/toggle_topic_closed_spec.rb
@@ -7,10 +7,6 @@ describe Jobs::ToggleTopicClosed do
     Fabricate(:topic_timer, user: admin).topic
   end
 
-  before do
-    SiteSetting.queue_jobs = true
-  end
-
   it 'should be able to close a topic' do
     topic
 
@@ -28,20 +24,49 @@ describe Jobs::ToggleTopicClosed do
     end
   end
 
-  it 'should be able to open a topic' do
-    topic.update!(closed: true)
+  describe 'opening a topic' do
+    it 'should be work' do
+      topic.update!(closed: true)
 
-    freeze_time(1.hour.from_now) do
-      described_class.new.execute(
-        topic_timer_id: topic.public_topic_timer.id,
-        state: false
-      )
+      freeze_time(1.hour.from_now) do
+        described_class.new.execute(
+          topic_timer_id: topic.public_topic_timer.id,
+          state: false
+        )
 
-      expect(topic.reload.closed).to eq(false)
+        expect(topic.reload.closed).to eq(false)
 
-      expect(Post.last.raw).to eq(I18n.t(
-        'topic_statuses.autoclosed_disabled_minutes', count: 60
-      ))
+        expect(Post.last.raw).to eq(I18n.t(
+          'topic_statuses.autoclosed_disabled_minutes', count: 60
+        ))
+      end
+    end
+
+    describe 'when category has auto close configured' do
+      let(:category) { Fabricate(:category, auto_close_hours: 5) }
+      let(:topic) { Fabricate(:topic, category: category, closed: true) }
+
+      it "should restore the category's auto close timer" do
+        Fabricate(:topic_timer,
+          status_type: TopicTimer.types[:open],
+          topic: topic,
+          user: admin
+        )
+
+        freeze_time(1.hour.from_now) do
+          described_class.new.execute(
+            topic_timer_id: topic.public_topic_timer.id,
+            state: false
+          )
+
+          expect(topic.reload.closed).to eq(false)
+
+          topic_timer = topic.public_topic_timer
+
+          expect(topic_timer.status_type).to eq(TopicTimer.types[:close])
+          expect(topic_timer.execute_at).to eq(5.hours.from_now)
+        end
+      end
     end
   end
 
diff --git a/spec/jobs/topic_reminder_spec.rb b/spec/jobs/topic_reminder_spec.rb
index 1a373c87dad..f77bfd214cb 100644
--- a/spec/jobs/topic_reminder_spec.rb
+++ b/spec/jobs/topic_reminder_spec.rb
@@ -10,10 +10,6 @@ describe Jobs::TopicReminder do
     ).topic
   end
 
-  before do
-    SiteSetting.queue_jobs = true
-  end
-
   it "should be able to create a reminder" do
     topic_timer = topic.topic_timers.first
     freeze_time 1.day.from_now
diff --git a/spec/jobs/unsilence_users_spec.rb b/spec/jobs/unsilence_users_spec.rb
new file mode 100644
index 00000000000..3f16350297a
--- /dev/null
+++ b/spec/jobs/unsilence_users_spec.rb
@@ -0,0 +1,16 @@
+require "rails_helper"
+
+describe Jobs::UnsilenceUsers do
+  it "unsilence users" do
+    user = Fabricate(:user)
+    UserSilencer.silence(user, Discourse.system_user, silenced_till: 2.days.ago)
+
+    user.reload
+    expect(user.silenced_till).to be
+
+    Jobs::UnsilenceUsers.new.execute({})
+
+    user.reload
+    expect(user.silenced_till).to be(nil)
+  end
+end
diff --git a/spec/jobs/update_gravatar_spec.rb b/spec/jobs/update_gravatar_spec.rb
index 096a4d6b3c3..6dcd52876ef 100644
--- a/spec/jobs/update_gravatar_spec.rb
+++ b/spec/jobs/update_gravatar_spec.rb
@@ -9,7 +9,6 @@ describe Jobs::UpdateGravatar do
 
     png = Base64.decode64("R0lGODlhAQABALMAAAAAAIAAAACAAICAAAAAgIAAgACAgMDAwICAgP8AAAD/AP//AAAA//8A/wD//wBiZCH5BAEAAA8ALAAAAAABAAEAAAQC8EUAOw==")
     url = "https://www.gravatar.com/avatar/d10ca8d11301c2f4993ac2279ce4b930.png?s=360&d=404"
-    stub_request(:head, url).to_return(status: 200)
     stub_request(:get, url).to_return(body: png)
 
     SiteSetting.automatically_download_gravatars = true
diff --git a/spec/mailers/invite_mailer_spec.rb b/spec/mailers/invite_mailer_spec.rb
index 4bf13fddfda..dc1b60fe307 100644
--- a/spec/mailers/invite_mailer_spec.rb
+++ b/spec/mailers/invite_mailer_spec.rb
@@ -78,7 +78,11 @@ describe InviteMailer do
       let(:topic) { Fabricate(:topic, excerpt: "Topic invite support is now available in Discourse!", user: trust_level_2) }
 
       context "default invite message" do
-        let(:invite) { topic.invite(topic.user, 'name@example.com') }
+        let(:invite) do
+          topic.invite(topic.user, 'name@example.com')
+          Invite.find_by(invited_by_id: topic.user.id)
+        end
+
         let(:invite_mail) { InviteMailer.send_invite(invite) }
 
         it 'renders the invitee email' do
@@ -123,7 +127,16 @@ describe InviteMailer do
       end
 
       context "custom invite message" do
-        let(:invite) { topic.invite(topic.user, 'name@example.com', nil, "Hey, I thought you might enjoy this topic!") }
+        let(:invite) do
+          topic.invite(
+            topic.user,
+            'name@example.com',
+            nil,
+            "Hey, I thought you might enjoy this topic!"
+          )
+
+          Invite.find_by(invited_by_id: topic.user.id)
+        end
         let(:custom_invite_mail) { InviteMailer.send_invite(invite) }
 
         it 'renders custom_message' do
diff --git a/spec/mailers/user_notifications_spec.rb b/spec/mailers/user_notifications_spec.rb
index 9e3327aa927..bb8118d499f 100644
--- a/spec/mailers/user_notifications_spec.rb
+++ b/spec/mailers/user_notifications_spec.rb
@@ -79,6 +79,28 @@ describe UserNotifications do
 
   end
 
+  describe '.email_login' do
+    let(:email_token) { user.email_tokens.create!(email: user.email).token }
+    subject { UserNotifications.email_login(user, email_token: email_token) }
+
+    it "generates the right email" do
+      expect(subject.to).to eq([user.email])
+      expect(subject.from).to eq([SiteSetting.notification_email])
+
+      expect(subject.subject).to eq(I18n.t(
+        'user_notifications.email_login.subject_template',
+        email_prefix: SiteSetting.title
+      ))
+
+      expect(subject.body.to_s).to match(I18n.t(
+        'user_notifications.email_login.text_body_template',
+        site_name: SiteSetting.title,
+        base_url: Discourse.base_url,
+        email_token: email_token
+      ))
+    end
+  end
+
   describe '.digest' do
 
     subject { UserNotifications.digest(user) }
@@ -357,7 +379,7 @@ describe UserNotifications do
       expect(mail[:from].display_names).to eql(['john'])
 
       # subject should include "[PM]"
-      expect(mail.subject).to match("[PM]")
+      expect(mail.subject).to include("[PM] ")
 
       # 1 "visit message" link
       expect(mail.html_part.to_s.scan(/Visit Message/).count).to eq(1)
@@ -387,6 +409,91 @@ describe UserNotifications do
       expect(mail.text_part.to_s).to_not include(response.raw)
       expect(mail.text_part.to_s).to_not include(topic.url)
     end
+
+    it "doesn't include group name in subject" do
+      group = Fabricate(:group)
+      topic.allowed_groups = [ group ]
+      mail = UserNotifications.user_private_message(
+        response.user,
+        post: response,
+        notification_type: notification.notification_type,
+        notification_data_hash: notification.data_hash
+      )
+
+      expect(mail.subject).to include("[PM] ")
+    end
+
+    it "includes a list of participants, groups first with member lists" do
+      group1 = Fabricate(:group, name: "group1")
+      group2 = Fabricate(:group, name: "group2")
+
+      user1 = Fabricate(:user, username: "one", groups: [group1, group2])
+      user2 = Fabricate(:user, username: "two", groups: [group1])
+
+      topic.allowed_users = [user1, user2]
+      topic.allowed_groups = [group1, group2]
+
+      mail = UserNotifications.user_private_message(
+        response.user,
+        post: response,
+        notification_type: notification.notification_type,
+        notification_data_hash: notification.data_hash
+      )
+
+      expect(mail.body).to include("#{I18n.t("user_notifications.pm_participants")} [group1 (2)](http://test.localhost/groups/group1), [group2 (1)](http://test.localhost/groups/group2), [one](http://test.localhost/u/one), [two](http://test.localhost/u/two)")
+    end
+
+    context "when SiteSetting.group_name_in_subject is true" do
+      before do
+        SiteSetting.group_in_subject = true
+      end
+
+      let(:group) { Fabricate(:group, name: "my_group") }
+      let(:mail) { UserNotifications.user_private_message(
+        response.user,
+        post: response,
+        notification_type: notification.notification_type,
+        notification_data_hash: notification.data_hash
+      ) }
+
+      shared_examples "includes first group name" do
+        it "includes first group name in subject" do
+          expect(mail.subject).to include("[my_group] ")
+        end
+
+        context "when first group has full name" do
+          it "includes full name in subject" do
+            group.full_name = "My Group"
+            group.save
+            expect(mail.subject).to include("[My Group] ")
+          end
+        end
+      end
+
+      context "one group in pm" do
+        before do
+          topic.allowed_groups = [ group ]
+        end
+
+        include_examples "includes first group name"
+      end
+
+      context "multiple groups in pm" do
+        let(:group2) { Fabricate(:group) }
+
+        before do
+          topic.allowed_groups = [ group, group2 ]
+        end
+
+        include_examples "includes first group name"
+      end
+
+      context "no groups in pm" do
+        it "includes %{optional_pm} in subject" do
+          expect(mail.subject).to include("[PM] ")
+        end
+      end
+    end
   end
 
   it 'adds a warning when mail limit is reached' do
diff --git a/spec/models/admin_dashboard_data_spec.rb b/spec/models/admin_dashboard_data_spec.rb
index d04142bef5f..f65de862fd1 100644
--- a/spec/models/admin_dashboard_data_spec.rb
+++ b/spec/models/admin_dashboard_data_spec.rb
@@ -15,6 +15,9 @@ describe AdminDashboardData do
 
       AdminDashboardData.fetch_problems
       expect(called).to eq(true)
+
+      AdminDashboardData.fetch_problems(check_force_https: true)
+      expect(called).to eq(true)
     end
 
     it 'calls the passed method' do
@@ -281,6 +284,32 @@ describe AdminDashboardData do
     end
   end
 
+  describe 'force_https_check' do
+    subject { described_class.new(check_force_https: true).force_https_check }
+
+    it 'returns nil if force_https site setting enabled' do
+      SiteSetting.force_https = true
+      expect(subject).to be_nil
+    end
+
+    it 'returns nil if force_https site setting not enabled' do
+      SiteSetting.force_https = false
+      expect(subject).to eq(I18n.t('dashboard.force_https_warning'))
+    end
+  end
+
+  describe 'ignore force_https_check' do
+    subject { described_class.new(check_force_https: false).force_https_check }
+
+    it 'returns nil' do
+      SiteSetting.force_https = true
+      expect(subject).to be_nil
+
+      SiteSetting.force_https = false
+      expect(subject).to be_nil
+    end
+  end
+
   describe 'stats cache' do
     include_examples 'stats cachable'
   end
diff --git a/spec/models/badge_spec.rb b/spec/models/badge_spec.rb
index f6f8b0c0d79..cbac526cb7f 100644
--- a/spec/models/badge_spec.rb
+++ b/spec/models/badge_spec.rb
@@ -61,4 +61,23 @@ describe Badge do
     expect(b.grant_count).to eq(1)
   end
 
+  describe '#manually_grantable?' do
+    let(:badge) { Fabricate(:badge, name: 'Test Badge') }
+    subject { badge.manually_grantable? }
+
+    context 'when system badge' do
+      before { badge.system = true }
+      it { is_expected.to be false }
+    end
+
+    context 'when has query' do
+      before { badge.query = 'SELECT id FROM users' }
+      it { is_expected.to be false }
+    end
+
+    context 'when neither system nor has query' do
+      before { badge.update_columns(system: false, query: nil) }
+      it { is_expected.to be true }
+    end
+  end
 end
diff --git a/spec/models/category_featured_user_spec.rb b/spec/models/category_featured_user_spec.rb
deleted file mode 100644
index bdfcbeaef28..00000000000
--- a/spec/models/category_featured_user_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'rails_helper'
-
-describe CategoryFeaturedUser do
-
-  it { is_expected.to belong_to :category }
-  it { is_expected.to belong_to :user }
-
-  context 'featuring users' do
-
-    before do
-      @category = Fabricate(:category)
-      CategoryFeaturedUser.feature_users_in(@category)
-    end
-
-    it 'has a featured user' do
-      expect(CategoryFeaturedUser.count).to be(1)
-    end
-
-    it 'returns the user via the category association' do
-      expect(@category.featured_users).to be_present
-    end
-
-  end
-
-end
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index 7c9fbc565bd..51992b1ce56 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -368,6 +368,17 @@ describe Category do
     end
   end
 
+  describe 'new' do
+    subject { Fabricate.build(:category, user: Fabricate(:user)) }
+
+    it 'triggers a extensibility event' do
+      event = DiscourseEvent.track_events { subject.save! }.last
+
+      expect(event[:event_name]).to eq(:category_created)
+      expect(event[:params].first).to eq(subject)
+    end
+  end
+
   describe "update" do
     it "should enforce uniqueness of slug" do
       Fabricate(:category, slug: "the-slug")
@@ -383,12 +394,21 @@ describe Category do
       @category = Fabricate(:category)
       @category_id = @category.id
       @topic_id = @category.topic_id
-      @category.destroy
+      SiteSetting.shared_drafts_category = @category.id.to_s
     end
 
     it 'is deleted correctly' do
+      @category.destroy
       expect(Category.exists?(id: @category_id)).to be false
       expect(Topic.exists?(id: @topic_id)).to be false
+      expect(SiteSetting.shared_drafts_category).to be_blank
+    end
+
+    it 'triggers a extensibility event' do
+      event = DiscourseEvent.track_events { @category.destroy }.first
+
+      expect(event[:event_name]).to eq(:category_destroyed)
+      expect(event[:params].first).to eq(@category)
     end
   end
 
diff --git a/spec/models/category_user_spec.rb b/spec/models/category_user_spec.rb
index d4608f2f46c..8313c0b7157 100644
--- a/spec/models/category_user_spec.rb
+++ b/spec/models/category_user_spec.rb
@@ -68,6 +68,7 @@ describe CategoryUser do
 
   context 'integration' do
     before do
+      SiteSetting.queue_jobs = false
       NotificationEmailer.enable
     end
 
diff --git a/spec/models/color_scheme_spec.rb b/spec/models/color_scheme_spec.rb
index 329eaa81d20..270c848a393 100644
--- a/spec/models/color_scheme_spec.rb
+++ b/spec/models/color_scheme_spec.rb
@@ -62,11 +62,11 @@ describe ColorScheme do
       end
 
       it "returns nil for a missing attribute" do
-        expect(described_class.hex_for_name('undefined')).to eq nil
+        expect(ColorScheme.hex_for_name('undefined')).to eq nil
       end
 
       it "returns the base color for an attribute" do
-        expect(described_class.hex_for_name('second_one')).to eq base_colors[:second_one]
+        expect(ColorScheme.hex_for_name('second_one')).to eq base_colors[:second_one]
       end
     end
   end
diff --git a/spec/models/discourse_single_sign_on_spec.rb b/spec/models/discourse_single_sign_on_spec.rb
index 06c718d560e..8d7ddf0a3e2 100644
--- a/spec/models/discourse_single_sign_on_spec.rb
+++ b/spec/models/discourse_single_sign_on_spec.rb
@@ -8,6 +8,7 @@ describe DiscourseSingleSignOn do
     SiteSetting.sso_url = @sso_url
     SiteSetting.enable_sso = true
     SiteSetting.sso_secret = @sso_secret
+    SiteSetting.queue_jobs = false
   end
 
   def make_sso
@@ -121,6 +122,39 @@ describe DiscourseSingleSignOn do
     expect(admin_group.users.where('users.id = ?', user.id).exists?).to eq(true)
   end
 
+  it "can force a list of groups with the groups attribute" do
+    user = Fabricate(:user)
+    group1 = Fabricate(:group, name: 'group1')
+    group2 = Fabricate(:group, name: 'group2')
+
+    sso = DiscourseSingleSignOn.new
+    sso.username = "bobsky"
+    sso.name = "Bob"
+    sso.email = user.email
+    sso.external_id = "A"
+
+    sso.groups = "#{group2.name.capitalize},group4,badname,trust_level_4"
+    sso.lookup_or_create_user(ip_address)
+
+    SiteSetting.sso_overrides_groups = true
+
+    group1.reload
+    expect(group1.usernames).to eq("")
+    expect(group2.usernames).to eq("")
+
+    group1.add(user)
+    group1.save
+
+    sso.lookup_or_create_user(ip_address)
+    expect(group1.usernames).to eq("")
+    expect(group2.usernames).to eq(user.username)
+
+    sso.groups = "badname,trust_level_4"
+    sso.lookup_or_create_user(ip_address)
+    expect(group1.usernames).to eq("")
+    expect(group2.usernames).to eq("")
+  end
+
   it "can specify groups" do
 
     user = Fabricate(:user)
@@ -166,6 +200,53 @@ describe DiscourseSingleSignOn do
     expect(add_group4.usernames).to eq(user.username)
   end
 
+  it 'can override username properly when only the case changes' do
+    SiteSetting.sso_overrides_username = true
+
+    sso = DiscourseSingleSignOn.new
+    sso.username = "testuser"
+    sso.name = "test user"
+    sso.email = "test@test.com"
+    sso.external_id = "100"
+    sso.bio = "This **is** the bio"
+    sso.suppress_welcome_message = true
+
+    # create the original user
+    user = sso.lookup_or_create_user(ip_address)
+    expect(user.username).to eq "testuser"
+
+    # change the username case
+    sso.username = "TestUser"
+    user = sso.lookup_or_create_user(ip_address)
+    expect(user.username).to eq "TestUser"
+  end
+
+  it 'behaves properly when sso_overrides_username is set but username is missing or blank' do
+    SiteSetting.sso_overrides_username = true
+
+    sso = DiscourseSingleSignOn.new
+    sso.username = "testuser"
+    sso.name = "test user"
+    sso.email = "test@test.com"
+    sso.external_id = "100"
+    sso.bio = "This **is** the bio"
+    sso.suppress_welcome_message = true
+
+    # create the original user
+    user = sso.lookup_or_create_user(ip_address)
+    expect(user.username).to eq "testuser"
+
+    # remove username from payload
+    sso.username = nil
+    user = sso.lookup_or_create_user(ip_address)
+    expect(user.username).to eq "testuser"
+
+    # set username in payload to blank
+    sso.username = ''
+    user = sso.lookup_or_create_user(ip_address)
+    expect(user.username).to eq "testuser"
+  end
+
   it "can override name / email / username" do
     admin = Fabricate(:admin)
 
@@ -419,6 +500,7 @@ describe DiscourseSingleSignOn do
       old_id = user.uploaded_avatar_id
       Upload.destroy(old_id)
 
+      FileHelper.stubs(:download).returns(file_from_fixtures("logo.png"))
       user = sso.lookup_or_create_user(ip_address)
       user.reload
       avatar_id = user.uploaded_avatar_id
@@ -426,32 +508,32 @@ describe DiscourseSingleSignOn do
       expect(avatar_id).to_not eq(nil)
       expect(old_id).to_not eq(avatar_id)
 
-      FileHelper.stubs(:download) { raise "should not be called" }
-      sso.avatar_url = "https://some.new/avatar.png"
-      user = sso.lookup_or_create_user(ip_address)
-      user.reload
-
-      # avatar updated but no override specified ...
-      expect(user.uploaded_avatar_id).to eq(avatar_id)
-
-      sso.avatar_force_update = true
-      FileHelper.stubs(:download).returns(file_from_fixtures("logo-dev.png"))
-      user = sso.lookup_or_create_user(ip_address)
-      user.reload
-
-      # we better have a new avatar
-      expect(user.uploaded_avatar_id).not_to eq(avatar_id)
-      expect(user.uploaded_avatar_id).not_to eq(nil)
-
-      avatar_id = user.uploaded_avatar_id
-
-      sso.avatar_force_update = true
-      FileHelper.stubs(:download) { raise "not found" }
-      user = sso.lookup_or_create_user(ip_address)
-      user.reload
-
-      # we better have the same avatar
-      expect(user.uploaded_avatar_id).to eq(avatar_id)
+      # FileHelper.stubs(:download) { raise "should not be called" }
+      # sso.avatar_url = "https://some.new/avatar.png"
+      # user = sso.lookup_or_create_user(ip_address)
+      # user.reload
+      #
+      # # avatar updated but no override specified ...
+      # expect(user.uploaded_avatar_id).to eq(avatar_id)
+      #
+      # sso.avatar_force_update = true
+      # FileHelper.stubs(:download).returns(file_from_fixtures("logo-dev.png"))
+      # user = sso.lookup_or_create_user(ip_address)
+      # user.reload
+      #
+      # # we better have a new avatar
+      # expect(user.uploaded_avatar_id).not_to eq(avatar_id)
+      # expect(user.uploaded_avatar_id).not_to eq(nil)
+      #
+      # avatar_id = user.uploaded_avatar_id
+      #
+      # sso.avatar_force_update = true
+      # FileHelper.stubs(:download) { raise "not found" }
+      # user = sso.lookup_or_create_user(ip_address)
+      # user.reload
+      #
+      # # we better have the same avatar
+      # expect(user.uploaded_avatar_id).to eq(avatar_id)
     end
 
   end
@@ -503,4 +585,167 @@ describe DiscourseSingleSignOn do
       end
     end
   end
+
+  context 'when sso_overrides_profile_background is not enabled' do
+
+    it "correctly handles provided profile_background_urls" do
+      sso = DiscourseSingleSignOn.new
+      sso.external_id = 666
+      sso.email = "sam@sam.com"
+      sso.name = "sam"
+      sso.username = "sam"
+      sso.profile_background_url = "http://awesome.com/image.png"
+      sso.suppress_welcome_message = true
+
+      FileHelper.stubs(:download).returns(file_from_fixtures("logo.png"))
+      user = sso.lookup_or_create_user(ip_address)
+      user.reload
+      user.user_profile.reload
+      profile_background = user.user_profile.profile_background
+
+      # initial creation ...
+      expect(profile_background).to_not eq(nil)
+      expect(profile_background).to_not eq('')
+
+      FileHelper.stubs(:download) { raise "should not be called" }
+      sso.profile_background_url = "https://some.new/avatar.png"
+      user = sso.lookup_or_create_user(ip_address)
+      user.reload
+      user.user_profile.reload
+
+      # profile_background updated but no override specified ...
+      expect(user.user_profile.profile_background).to eq(profile_background)
+    end
+  end
+
+  context 'when sso_overrides_profile_background is enabled' do
+    let!(:sso_record) { Fabricate(:single_sign_on_record, external_profile_background_url: "http://example.com/an_image.png") }
+
+    let!(:sso) {
+      sso = DiscourseSingleSignOn.new
+      sso.username = "test"
+      sso.name = "test"
+      sso.email = sso_record.user.email
+      sso.external_id = sso_record.external_id
+      sso
+    }
+
+    let(:logo) { file_from_fixtures("logo.png") }
+
+    before do
+      SiteSetting.sso_overrides_profile_background = true
+    end
+
+    it "deal with no profile_background_url passed for an existing user with a profile_background" do
+      Sidekiq::Testing.inline! do
+        # Deliberately not setting profile_background_url so it should not update
+        sso_record.user.user_profile.update_columns(profile_background: '')
+        user = sso.lookup_or_create_user(ip_address)
+        user.reload
+        user.user_profile.reload
+
+        expect(user).to_not be_nil
+        expect(user.user_profile.profile_background).to eq('')
+      end
+    end
+
+    it "deal with a profile_background_url passed for an existing user with a profile_background" do
+      Sidekiq::Testing.inline! do
+        FileHelper.stubs(:download).returns(logo)
+
+        sso_record.user.user_profile.update_columns(profile_background: '')
+
+        sso.profile_background_url = "http://example.com/a_different_image.png"
+
+        user = sso.lookup_or_create_user(ip_address)
+        user.reload
+        user.user_profile.reload
+
+        expect(user).to_not be_nil
+        expect(user.user_profile.profile_background).to_not eq('')
+      end
+    end
+  end
+
+  context 'when sso_overrides_card_background is not enabled' do
+
+    it "correctly handles provided card_background_urls" do
+      sso = DiscourseSingleSignOn.new
+      sso.external_id = 666
+      sso.email = "sam@sam.com"
+      sso.name = "sam"
+      sso.username = "sam"
+      sso.card_background_url = "http://awesome.com/image.png"
+      sso.suppress_welcome_message = true
+
+      FileHelper.stubs(:download).returns(file_from_fixtures("logo.png"))
+      user = sso.lookup_or_create_user(ip_address)
+      user.reload
+      user.user_profile.reload
+      card_background = user.user_profile.card_background
+
+      # initial creation ...
+      expect(card_background).to_not eq(nil)
+      expect(card_background).to_not eq('')
+
+      FileHelper.stubs(:download) { raise "should not be called" }
+      sso.card_background_url = "https://some.new/avatar.png"
+      user = sso.lookup_or_create_user(ip_address)
+      user.reload
+      user.user_profile.reload
+
+      # card_background updated but no override specified ...
+      expect(user.user_profile.card_background).to eq(card_background)
+    end
+  end
+
+  context 'when sso_overrides_card_background is enabled' do
+    let!(:sso_record) { Fabricate(:single_sign_on_record, external_card_background_url: "http://example.com/an_image.png") }
+
+    let!(:sso) {
+      sso = DiscourseSingleSignOn.new
+      sso.username = "test"
+      sso.name = "test"
+      sso.email = sso_record.user.email
+      sso.external_id = sso_record.external_id
+      sso
+    }
+
+    let(:logo) { file_from_fixtures("logo.png") }
+
+    before do
+      SiteSetting.sso_overrides_card_background = true
+    end
+
+    it "deal with no card_background_url passed for an existing user with a card_background" do
+      Sidekiq::Testing.inline! do
+        # Deliberately not setting card_background_url so it should not update
+        sso_record.user.user_profile.update_columns(card_background: '')
+        user = sso.lookup_or_create_user(ip_address)
+        user.reload
+        user.user_profile.reload
+
+        expect(user).to_not be_nil
+        expect(user.user_profile.card_background).to eq('')
+      end
+    end
+
+    it "deal with a card_background_url passed for an existing user with a card_background_url" do
+      Sidekiq::Testing.inline! do
+        FileHelper.stubs(:download).returns(logo)
+
+        sso_record.user.user_profile.update_columns(card_background: '')
+
+        sso.card_background_url = "http://example.com/a_different_image.png"
+
+        user = sso.lookup_or_create_user(ip_address)
+        user.reload
+        user.user_profile.reload
+
+        expect(user).to_not be_nil
+        expect(user.user_profile.card_background).to_not eq('')
+      end
+    end
+  end
+
 end
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index e8a8427e323..cab2c2cd43d 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -5,6 +5,66 @@ describe Group do
   let(:user) { Fabricate(:user) }
   let(:group) { Fabricate(:group) }
 
+  context 'validations' do
+    describe '#grant_trust_level' do
+      describe 'when trust level is not valid' do
+        it 'should not be valid' do
+          group.grant_trust_level = 123456
+
+          expect(group.valid?).to eq(false)
+
+          expect(group.errors.full_messages.join(",")).to eq(I18n.t(
+            'groups.errors.grant_trust_level_not_valid',
+            trust_level: 123456
+          ))
+        end
+      end
+    end
+
+    describe '#name' do
+      context 'when a user with a similar name exists' do
+        it 'should not be valid' do
+          new_group = Fabricate.build(:group, name: admin.username.upcase)
+
+          expect(new_group).to_not be_valid
+
+          expect(new_group.errors.full_messages.first)
+            .to include(I18n.t("activerecord.errors.messages.taken"))
+        end
+      end
+
+      context 'when a group with a similar name exists' do
+        it 'should not be valid' do
+          new_group = Fabricate.build(:group, name: group.name.upcase)
+
+          expect(new_group).to_not be_valid
+
+          expect(new_group.errors.full_messages.first)
+            .to include(I18n.t("activerecord.errors.messages.taken"))
+        end
+      end
+    end
+  end
+
+  describe "#posts_for" do
+    it "returns the post in the group" do
+      p = Fabricate(:post)
+      group.add(p.user)
+
+      posts = group.posts_for(Guardian.new)
+      expect(posts).to include(p)
+    end
+
+    it "doesn't include unlisted posts" do
+      p = Fabricate(:post)
+      p.topic.update_column(:visible, false)
+      group.add(p.user)
+
+      posts = group.posts_for(Guardian.new)
+      expect(posts).not_to include(p)
+    end
+  end
+
   describe '#builtin' do
     context "verify enum sequence" do
       before do
@@ -360,7 +420,7 @@ describe Group do
     user2 = Fabricate(:coding_horror)
     user2.change_trust_level!(TrustLevel[3])
 
-    expect(Group[:trust_level_2].user_ids.sort.reject { |id| id < -1 }).to eq [-1, user.id, user2.id].sort
+    expect(Group[:trust_level_2].user_ids).to include(user.id, user2.id)
   end
 
   it "Correctly updates all automatic groups upon request" do
@@ -368,7 +428,7 @@ describe Group do
     user = Fabricate(:user)
     user.change_trust_level!(TrustLevel[2])
 
-    Group.exec_sql("update groups set user_count=0 where id = #{Group::AUTO_GROUPS[:trust_level_2]}")
+    Group.exec_sql("UPDATE groups SET user_count = 0 WHERE id = #{Group::AUTO_GROUPS[:trust_level_2]}")
 
     Group.refresh_automatic_groups!
 
@@ -376,23 +436,20 @@ describe Group do
     expect(groups.count).to eq Group::AUTO_GROUPS.count
 
     g = groups.find { |grp| grp.id == Group::AUTO_GROUPS[:admins] }
-    expect(g.users.count).to eq(g.user_count)
-    expect(g.users.pluck(:id).sort.reject { |id| id < -1 }).to eq([-1, admin.id])
+    expect(g.users.count).to eq g.user_count
+    expect(g.users.pluck(:id)).to contain_exactly(admin.id)
 
     g = groups.find { |grp| grp.id == Group::AUTO_GROUPS[:staff] }
-    expect(g.users.count).to eq (g.user_count)
-    expect(g.users.pluck(:id).sort.reject { |id| id < -1 }).to eq([-1, admin.id])
+    expect(g.users.count).to eq g.user_count
+    expect(g.users.pluck(:id)).to contain_exactly(admin.id)
 
     g = groups.find { |grp| grp.id == Group::AUTO_GROUPS[:trust_level_1] }
-    # admin, system and user
     expect(g.users.count).to eq g.user_count
-    expect(g.users.where('users.id > -2').count).to eq 3
+    expect(g.users.pluck(:id)).to contain_exactly(admin.id, user.id)
 
     g = groups.find { |grp| grp.id == Group::AUTO_GROUPS[:trust_level_2] }
-    # system and user
     expect(g.users.count).to eq g.user_count
-    expect(g.users.where('users.id > -2').count).to eq 2
-
+    expect(g.users.pluck(:id)).to contain_exactly(user.id)
   end
 
   it "can set members via usernames helper" do
@@ -417,17 +474,37 @@ describe Group do
     expect(g.usernames.split(",").sort).to eq usernames.split(",").sort
   end
 
-  it "correctly destroys groups" do
+  describe 'new' do
+    subject { Fabricate.build(:group) }
 
-    g = Fabricate(:group)
-    u1 = Fabricate(:user)
-    g.add(u1)
-    g.save!
+    it 'triggers a extensibility event' do
+      event = DiscourseEvent.track_events { subject.save! }.first
 
-    g.destroy
+      expect(event[:event_name]).to eq(:group_created)
+      expect(event[:params].first).to eq(subject)
+    end
+  end
 
-    expect(User.where(id: u1.id).count).to eq 1
-    expect(GroupUser.where(group_id: g.id).count).to eq 0
+  describe 'destroy' do
+    let(:user) { Fabricate(:user) }
+    let(:group) { Fabricate(:group, users: [user]) }
+
+    before do
+      group.add(user)
+    end
+
+    it "it deleted correctly" do
+      group.destroy!
+      expect(User.where(id: user.id).count).to eq 1
+      expect(GroupUser.where(group_id: group.id).count).to eq 0
+    end
+
+    it 'triggers a extensibility event' do
+      event = DiscourseEvent.track_events { group.destroy! }.first
+
+      expect(event[:event_name]).to eq(:group_destroyed)
+      expect(event[:params].first).to eq(group)
+    end
   end
 
   it "has custom fields" do
@@ -486,50 +563,83 @@ describe Group do
     end
   end
 
-  it "correctly grants a trust level to members" do
-    group = Fabricate(:group, grant_trust_level: 2)
-    u0 = Fabricate(:user, trust_level: 0)
-    u3 = Fabricate(:user, trust_level: 3)
+  describe 'trust level management' do
+    it "correctly grants a trust level to members" do
+      group = Fabricate(:group, grant_trust_level: 2)
+      u0 = Fabricate(:user, trust_level: 0)
+      u3 = Fabricate(:user, trust_level: 3)
 
-    group.add(u0)
-    expect(u0.reload.trust_level).to eq(2)
+      group.add(u0)
+      expect(u0.reload.trust_level).to eq(2)
 
-    group.add(u3)
-    expect(u3.reload.trust_level).to eq(3)
-  end
+      group.add(u3)
+      expect(u3.reload.trust_level).to eq(3)
+    end
 
-  it "adjusts the user trust level" do
-    g0 = Fabricate(:group, grant_trust_level: 2)
-    g1 = Fabricate(:group, grant_trust_level: 3)
-    g2 = Fabricate(:group)
+    describe 'when a user has qualified for trust level 1' do
+      let(:user) do
+        Fabricate(:user,
+          trust_level: 1,
+          created_at: Time.zone.now - 10.years
+        )
+      end
 
-    user = Fabricate(:user, trust_level: 0)
+      let(:group) { Fabricate(:group, grant_trust_level: 1) }
+      let(:group2) { Fabricate(:group, grant_trust_level: 0) }
 
-    # Add a group without one to consider `NULL` check
-    g2.add(user)
-    expect(user.group_locked_trust_level).to be_nil
-    expect(user.manual_locked_trust_level).to be_nil
+      before do
+        user.user_stat.update!(
+          topics_entered: 999,
+          posts_read_count: 999,
+          time_read: 999
+        )
+      end
 
-    g0.add(user)
-    expect(user.reload.trust_level).to eq(2)
-    expect(user.group_locked_trust_level).to eq(2)
-    expect(user.manual_locked_trust_level).to be_nil
+      it "should not demote the user" do
+        group.add(user)
+        group2.add(user)
 
-    g1.add(user)
-    expect(user.reload.trust_level).to eq(3)
-    expect(user.group_locked_trust_level).to eq(3)
-    expect(user.manual_locked_trust_level).to be_nil
+        expect(user.reload.trust_level).to eq(1)
 
-    g1.remove(user)
-    expect(user.reload.trust_level).to eq(2)
-    expect(user.group_locked_trust_level).to eq(2)
-    expect(user.manual_locked_trust_level).to be_nil
+        group.remove(user)
 
-    g0.remove(user)
-    user.reload
-    expect(user.manual_locked_trust_level).to be_nil
-    expect(user.group_locked_trust_level).to be_nil
-    expect(user.trust_level).to eq(0)
+        expect(user.reload.trust_level).to eq(0)
+      end
+    end
+
+    it "adjusts the user trust level" do
+      g0 = Fabricate(:group, grant_trust_level: 2)
+      g1 = Fabricate(:group, grant_trust_level: 3)
+      g2 = Fabricate(:group)
+
+      user = Fabricate(:user, trust_level: 0)
+
+      # Add a group without one to consider `NULL` check
+      g2.add(user)
+      expect(user.group_locked_trust_level).to be_nil
+      expect(user.manual_locked_trust_level).to be_nil
+
+      g0.add(user)
+      expect(user.reload.trust_level).to eq(2)
+      expect(user.group_locked_trust_level).to eq(2)
+      expect(user.manual_locked_trust_level).to be_nil
+
+      g1.add(user)
+      expect(user.reload.trust_level).to eq(3)
+      expect(user.group_locked_trust_level).to eq(3)
+      expect(user.manual_locked_trust_level).to be_nil
+
+      g1.remove(user)
+      expect(user.reload.trust_level).to eq(2)
+      expect(user.group_locked_trust_level).to eq(2)
+      expect(user.manual_locked_trust_level).to be_nil
+
+      g0.remove(user)
+      user.reload
+      expect(user.manual_locked_trust_level).to be_nil
+      expect(user.group_locked_trust_level).to be_nil
+      expect(user.trust_level).to eq(0)
+    end
   end
 
   it 'should cook the bio' do
@@ -597,7 +707,7 @@ describe Group do
       it "should publish the group's categories to the client" do
         group.update!(public_admission: true, categories: [category])
 
-        message = MessageBus.track_publish { group.add(user) }.first
+        message = MessageBus.track_publish("/categories") { group.add(user) }.first
 
         expect(message.data[:categories].count).to eq(1)
         expect(message.data[:categories].first[:id]).to eq(category.id)
@@ -644,6 +754,13 @@ describe Group do
 
       expect(group.group_users.map(&:user_id)).to contain_exactly(user.id, admin.id)
     end
+
+    it 'updates group user count' do
+      expect {
+        group.bulk_add([user.id, admin.id])
+        group.reload
+      }.to change { group.user_count }.by(2)
+    end
   end
 
   it "Correctly updates has_messages" do
diff --git a/spec/models/incoming_link_spec.rb b/spec/models/incoming_link_spec.rb
index 1e32b9d0bd7..00e3b9825cd 100644
--- a/spec/models/incoming_link_spec.rb
+++ b/spec/models/incoming_link_spec.rb
@@ -2,6 +2,8 @@ require 'rails_helper'
 
 describe IncomingLink do
 
+  let(:sharing_user) { Fabricate(:user, name: 'Alice') }
+  let(:current_user) { Fabricate(:user, name: 'Bob') }
   let(:post) { Fabricate(:post) }
   let(:topic) { post.topic }
 
@@ -82,11 +84,42 @@ describe IncomingLink do
     end
 
     it "is able to look up user_id and log it from the GET params" do
-      user = Fabricate(:user, username: "Bob")
-      add(host: 'test.com', username: "bob", post_id: 1)
+      add(host: 'test.com', username: sharing_user.username, post_id: 1)
 
       first = IncomingLink.first
-      expect(first.user_id).to eq user.id
+      expect(first.user_id).to eq sharing_user.id
+    end
+
+    it "logs an incoming and stores IP with no current user" do
+      add(referer: 'https://example.social/@alice/1234',
+          post_id: post.id,
+          username: sharing_user.username,
+          current_user: nil,
+          ip_address: '100.64.1.1')
+      expect(IncomingLink.count).to eq 1
+      il = IncomingLink.last
+      expect(il.ip_address).to eq '100.64.1.1'
+    end
+
+    it "does not log when the sharing user clicks their own link" do
+      add(referer: 'https://example.social/@alice/1234',
+          post_id: post.id,
+          username: sharing_user.username,
+          current_user: sharing_user,
+          ip_address: '100.64.1.2')
+      expect(IncomingLink.count).to eq 0
+    end
+
+    it "does not store ip address when a logged-in user clicks" do
+      add(referer: 'https://example.social/@alice/1234',
+          post_id: post.id,
+          username: sharing_user.username,
+          current_user: current_user,
+          ip_address: '100.64.1.3')
+      expect(IncomingLink.count).to eq 1
+      il = IncomingLink.last
+      expect(il.ip_address).to eq nil
+      expect(il.current_user_id).to eq current_user.id
     end
   end
 
diff --git a/spec/models/incoming_links_report_spec.rb b/spec/models/incoming_links_report_spec.rb
index 2ce2398fc7d..1ee041b23b1 100644
--- a/spec/models/incoming_links_report_spec.rb
+++ b/spec/models/incoming_links_report_spec.rb
@@ -52,8 +52,47 @@ describe IncomingLinksReport do
 
       r = IncomingLinksReport.find('top_referred_topics').as_json
       expect(r[:data]).to eq [
-        { topic_id: p1.topic.id, topic_title: p1.topic.title, topic_slug: p1.topic.slug, num_clicks: 7 },
-        { topic_id: p2.topic.id, topic_title: p2.topic.title, topic_slug: p2.topic.slug, num_clicks: 2 + 3 },
+        { topic_id: p1.topic.id, topic_title: p1.topic.title, topic_url: p1.topic.relative_url, num_clicks: 7 },
+        { topic_id: p2.topic.id, topic_title: p2.topic.title, topic_url: p2.topic.relative_url, num_clicks: 2 + 3 },
+      ]
+    end
+
+    it "does not report PMs" do
+      public_topic = Fabricate(:topic)
+      message_topic = Fabricate(:private_message_topic)
+
+      public_post = Fabricate(:post, topic: public_topic)
+      message_post = Fabricate(:post, topic: message_topic)
+
+      IncomingLink.add(
+        referer: "http://foo.com",
+        host: "http://discourse.example.com",
+        topic_id: public_topic.id,
+        id_address: "1.2.3.4",
+        username: public_post.user.username,
+      )
+
+      IncomingLink.add(
+        referer: "http://foo.com",
+        host: "http://discourse.example.com",
+        topic_id: message_topic.id,
+        id_address: "5.6.7.8",
+        username: message_post.user.username,
+      )
+
+      r = IncomingLinksReport.find('top_referrers').as_json
+      expect(r[:data]).to eq [
+        { username: public_post.user.username, user_id: public_post.user.id, num_clicks: 1, num_topics: 1 },
+      ]
+
+      r = IncomingLinksReport.find('top_traffic_sources').as_json
+      expect(r[:data]).to eq [
+        { domain: 'foo.com', num_clicks: 1, num_topics: 1 },
+      ]
+
+      r = IncomingLinksReport.find('top_referred_topics').as_json
+      expect(r[:data]).to eq [
+        { topic_id: public_topic.id, topic_title: public_topic.title, topic_url: public_topic.relative_url, num_clicks: 1 },
       ]
     end
   end
@@ -161,10 +200,12 @@ describe IncomingLinksReport do
       topic1 = Fabricate.build(:topic, id: 123); topic2 = Fabricate.build(:topic, id: 234)
       # TODO: OMG OMG THE STUBBING
       IncomingLinksReport.stubs(:link_count_per_topic).returns(topic1.id => 8, topic2.id => 3)
-      Topic.stubs(:select).returns(Topic); Topic.stubs(:where).returns(Topic) # bypass some activerecord methods
+      # bypass some activerecord methods
+      Topic.stubs(:select).returns(Topic)
+      Topic.stubs(:where).returns(Topic)
       Topic.stubs(:all).returns([topic1, topic2])
-      expect(top_referred_topics[:data][0]).to eq(topic_id: topic1.id, topic_title: topic1.title, topic_slug: topic1.slug, num_clicks: 8)
-      expect(top_referred_topics[:data][1]).to eq(topic_id: topic2.id, topic_title: topic2.title, topic_slug: topic2.slug, num_clicks: 3)
+      expect(top_referred_topics[:data][0]).to eq(topic_id: topic1.id, topic_title: topic1.title, topic_url: topic1.relative_url, num_clicks: 8)
+      expect(top_referred_topics[:data][1]).to eq(topic_id: topic2.id, topic_title: topic2.title, topic_url: topic2.relative_url, num_clicks: 3)
     end
   end
 
diff --git a/spec/models/invite_redeemer_spec.rb b/spec/models/invite_redeemer_spec.rb
index 49b800daa22..ac31409b522 100644
--- a/spec/models/invite_redeemer_spec.rb
+++ b/spec/models/invite_redeemer_spec.rb
@@ -30,6 +30,18 @@ describe InviteRedeemer do
       expect(error).to be_present
       expect(error.record.errors[:password]).to be_present
     end
+
+    it "should unstage user" do
+      staged_user = Fabricate(:staged, email: 'staged@account.com', active: true, username: 'staged1', name: 'Stage Name')
+      user = InviteRedeemer.create_user_from_invite(Fabricate(:invite, email: 'staged@account.com'), 'walter', 'Walter White')
+
+      expect(user.id).to eq(staged_user.id)
+      expect(user.username).to eq('walter')
+      expect(user.name).to eq('Walter White')
+      expect(user.active).to eq(false)
+      expect(user.email).to eq('staged@account.com')
+      expect(user.approved).to eq(true)
+    end
   end
 
   describe "#redeem" do
@@ -116,5 +128,17 @@ describe InviteRedeemer do
       expect(user.group_users.count).to eq(4)
       expect(user.trust_level).to eq(2)
     end
+
+    it "only allows one user to be created per invite" do
+      user = invite_redeemer.redeem
+      invite.reload
+
+      user.email = "john@example.com"
+      user.save!
+
+      another_invite_redeemer = InviteRedeemer.new(invite, username, name)
+      another_user = another_invite_redeemer.redeem
+      expect(another_user).to eq(nil)
+    end
   end
 end
diff --git a/spec/models/invite_spec.rb b/spec/models/invite_spec.rb
index 552a953194f..95edd750c54 100644
--- a/spec/models/invite_spec.rb
+++ b/spec/models/invite_spec.rb
@@ -162,6 +162,13 @@ describe Invite do
       invite = group_private_topic.invite_by_email(tl2_user, 'foo@bar.com')
       expect(invite.groups.count).to eq(0)
     end
+
+    context 'automatic groups' do
+      it 'should not add invited user to automatic groups' do
+        group.update!(automatic: true)
+        expect(group_private_topic.invite_by_email(Fabricate(:admin), iceking).groups.count).to eq(0)
+      end
+    end
   end
 
   context 'an existing user' do
@@ -178,6 +185,16 @@ describe Invite do
 
   end
 
+  context 'a staged user' do
+    it 'creates an invite for a staged user' do
+      Fabricate(:staged, email: 'staged@account.com')
+      invite = Invite.invite_by_email('staged@account.com', Fabricate(:coding_horror))
+
+      expect(invite).to be_valid
+      expect(invite.email).to eq('staged@account.com')
+    end
+  end
+
   context '.redeem' do
 
     let(:invite) { Fabricate(:invite) }
@@ -291,25 +308,8 @@ describe Invite do
         end
 
         context 'again' do
-          context "without a passthrough" do
-            before do
-              SiteSetting.invite_passthrough_hours = 0
-            end
-
-            it 'will not redeem twice' do
-              expect(invite.redeem).to be_blank
-            end
-          end
-
-          context "with a passthrough" do
-            before do
-              SiteSetting.invite_passthrough_hours = 1
-            end
-
-            it 'will not redeem twice' do
-              expect(invite.redeem).to be_present
-              expect(invite.redeem.send_welcome_message).to eq(false)
-            end
+          it 'will not redeem twice' do
+            expect(invite.redeem).to be_blank
           end
         end
       end
@@ -319,9 +319,11 @@ describe Invite do
     context 'invited to topics' do
       let(:tl2_user) { Fabricate(:user, trust_level: 2) }
       let!(:topic) { Fabricate(:private_message_topic, user: tl2_user) }
-      let!(:invite) {
+
+      let!(:invite) do
         topic.invite(topic.user, 'jake@adventuretime.ooo')
-      }
+        Invite.find_by(invited_by_id: topic.user)
+      end
 
       context 'redeem topic invite' do
         it 'adds the user to the topic_users' do
diff --git a/spec/models/locale_site_setting_spec.rb b/spec/models/locale_site_setting_spec.rb
index ef81765dc07..06406385eb1 100644
--- a/spec/models/locale_site_setting_spec.rb
+++ b/spec/models/locale_site_setting_spec.rb
@@ -1,6 +1,15 @@
 require 'rails_helper'
 
 describe LocaleSiteSetting do
+  def core_locales
+    pattern = File.join(Rails.root, 'config', 'locales', 'client.*.yml')
+    Dir.glob(pattern).map { |x| x.split('.')[-2] }
+  end
+
+  def native_locale_name(locale)
+    value = LocaleSiteSetting.values.find { |v| v[:value] == locale }
+    value[:name]
+  end
 
   describe 'valid_value?' do
     it 'returns true for a locale that we have translations for' do
@@ -14,8 +23,69 @@ describe LocaleSiteSetting do
 
   describe 'values' do
     it 'returns all the locales that we have translations for' do
-      expect(LocaleSiteSetting.values.map { |x| x[:value] }).to include(*Dir.glob(File.join(Rails.root, 'config', 'locales', 'client.*.yml')).map { |x| x.split('.')[-2] })
+      expect(LocaleSiteSetting.values.map { |x| x[:value] }).to include(*core_locales)
+    end
+
+    it 'returns native names' do
+      expect(native_locale_name('de')).to eq('Deutsch')
+      expect(native_locale_name('zh_CN')).to eq('中文')
+      expect(native_locale_name('zh_TW')).to eq('中文 (TW)')
     end
   end
 
+  context 'with locales from plugin' do
+    before do
+      DiscoursePluginRegistry.register_locale("foo", name: "Foo", nativeName: "Native Foo")
+      DiscoursePluginRegistry.register_locale("bar", name: "Bar", nativeName: "Native Bar")
+      DiscoursePluginRegistry.register_locale("de", name: "Renamed German", nativeName: "Native renamed German")
+      DiscoursePluginRegistry.register_locale("de_AT", name: "German (Austria)", nativeName: "Österreichisch", fallbackLocale: "de")
+      DiscoursePluginRegistry.register_locale("tlh")
+
+      # Plugins normally register a locale before LocaleSiteSetting is initialized.
+      # That's not happening in tests, so we need to call reset!
+      LocaleSiteSetting.reset!
+    end
+
+    after do
+      DiscoursePluginRegistry.reset!
+    end
+
+    describe 'valid_value?' do
+      it 'returns true for locales from core' do
+        expect(LocaleSiteSetting.valid_value?('en')).to eq(true)
+        expect(LocaleSiteSetting.valid_value?('de')).to eq(true)
+      end
+
+      it 'returns true for locales added by plugins' do
+        expect(LocaleSiteSetting.valid_value?('foo')).to eq(true)
+        expect(LocaleSiteSetting.valid_value?('bar')).to eq(true)
+      end
+    end
+
+    describe 'values' do
+      it 'returns native names added by plugin' do
+        expect(native_locale_name('foo')).to eq('Native Foo')
+        expect(native_locale_name('bar')).to eq('Native Bar')
+      end
+
+      it 'does not allow plugins to override native names that exist in core' do
+        expect(native_locale_name('de')).to eq('Deutsch')
+      end
+
+      it 'returns the language code when no nativeName is set' do
+        expect(native_locale_name('tlh')).to eq('tlh')
+      end
+    end
+
+    describe 'fallback_locale' do
+      it 'returns the fallback locale registered by plugin' do
+        expect(LocaleSiteSetting.fallback_locale('de_AT')).to eq(:de)
+        expect(LocaleSiteSetting.fallback_locale(:de_AT)).to eq(:de)
+      end
+
+      it 'returns nothing when no fallback locale was registered' do
+        expect(LocaleSiteSetting.fallback_locale('foo')).to be_nil
+      end
+    end
+  end
 end
diff --git a/spec/models/post_action_spec.rb b/spec/models/post_action_spec.rb
index 9c742835dfe..b460306d369 100644
--- a/spec/models/post_action_spec.rb
+++ b/spec/models/post_action_spec.rb
@@ -141,6 +141,17 @@ describe PostAction do
       expect(PostAction.flagged_posts_count).to eq(0)
     end
 
+    it "respects min_flags_staff_visibility" do
+      SiteSetting.min_flags_staff_visibility = 2
+      expect(PostAction.flagged_posts_count).to eq(0)
+
+      PostAction.act(codinghorror, post, PostActionType.types[:off_topic])
+      expect(PostAction.flagged_posts_count).to eq(0)
+
+      PostAction.act(eviltrout, post, PostActionType.types[:off_topic])
+      expect(PostAction.flagged_posts_count).to eq(1)
+    end
+
     it "should reset counts when a topic is deleted" do
       PostAction.act(codinghorror, post, PostActionType.types[:off_topic])
       post.topic.trash!
@@ -276,6 +287,26 @@ describe PostAction do
       expect(post.like_count).to eq(0)
       expect(post.like_score).to eq(0)
     end
+
+    it "shouldn't change given_likes unless likes are given or removed" do
+      freeze_time(Time.zone.now)
+
+      PostAction.act(codinghorror, Fabricate(:post), PostActionType.types[:like])
+      expect(value_for(codinghorror.id, Date.today)).to eq(1)
+
+      PostActionType.types.each do |type_name, type_id|
+        post = Fabricate(:post)
+
+        PostAction.act(codinghorror, post, type_id)
+        actual_count = value_for(codinghorror.id, Date.today)
+        expected_count = type_name == :like ? 2 : 1
+        expect(actual_count).to eq(expected_count), "Expected likes_given to be #{expected_count} when adding '#{type_name}', but got #{actual_count}"
+
+        PostAction.remove_act(codinghorror, post, type_id)
+        actual_count = value_for(codinghorror.id, Date.today)
+        expect(actual_count).to eq(1), "Expected likes_given to be 1 when removing '#{type_name}', but got #{actual_count}"
+      end
+    end
   end
 
   describe "undo/redo repeatedly" do
@@ -362,6 +393,38 @@ describe PostAction do
       expect(post.spam_count).to eq(0)
     end
 
+    it "will not allow regular users to auto hide staff posts" do
+      mod = Fabricate(:moderator)
+      post = Fabricate(:post, user: mod)
+
+      SiteSetting.flags_required_to_hide_post = 2
+      Discourse.stubs(:site_contact_user).returns(admin)
+
+      PostAction.act(eviltrout, post, PostActionType.types[:spam])
+      PostAction.act(Fabricate(:walter_white), post, PostActionType.types[:spam])
+
+      post.reload
+
+      expect(post.hidden).to eq(false)
+      expect(post.hidden_at).to be_blank
+    end
+
+    it "allows staff users to auto hide staff posts" do
+      mod = Fabricate(:moderator)
+      post = Fabricate(:post, user: mod)
+
+      SiteSetting.flags_required_to_hide_post = 2
+      Discourse.stubs(:site_contact_user).returns(admin)
+
+      PostAction.act(eviltrout, post, PostActionType.types[:spam])
+      PostAction.act(Fabricate(:admin), post, PostActionType.types[:spam])
+
+      post.reload
+
+      expect(post.hidden).to eq(true)
+      expect(post.hidden_at).to be_present
+    end
+
     it 'should follow the rules for automatic hiding workflow' do
       post = create_post
       walterwhite = Fabricate(:walter_white)
@@ -372,6 +435,10 @@ describe PostAction do
       PostAction.act(eviltrout, post, PostActionType.types[:spam])
       PostAction.act(walterwhite, post, PostActionType.types[:spam])
 
+      job_args = Jobs::SendSystemMessage.jobs.last["args"].first
+      expect(job_args["user_id"]).to eq(post.user.id)
+      expect(job_args["message_type"]).to eq("post_hidden")
+
       post.reload
 
       expect(post.hidden).to eq(true)
@@ -391,6 +458,10 @@ describe PostAction do
       PostAction.act(eviltrout, post, PostActionType.types[:spam])
       PostAction.act(walterwhite, post, PostActionType.types[:off_topic])
 
+      job_args = Jobs::SendSystemMessage.jobs.last["args"].first
+      expect(job_args["user_id"]).to eq(post.user.id)
+      expect(job_args["message_type"]).to eq("post_hidden_again")
+
       post.reload
 
       expect(post.hidden).to eq(true)
@@ -547,6 +618,13 @@ describe PostAction do
       end
     end
 
+    it "should succeed even with low max title length" do
+      SiteSetting.max_topic_title_length = 50
+      post.topic.title = 'This is a test topic ' * 2
+      post.topic.save!
+      message_id = PostAction.create_message_for_post_action(Discourse.system_user, post, PostActionType.types[:notify_moderators], message: "WAT")
+      expect(message_id).to be_present
+    end
   end
 
   describe ".lookup_for" do
@@ -579,6 +657,7 @@ describe PostAction do
     end
 
     it "should create a notification in the related topic" do
+      SiteSetting.queue_jobs = false
       post = Fabricate(:post)
       user = Fabricate(:user)
       action = PostAction.act(user, post, PostActionType.types[:spam], message: "WAT")
@@ -623,4 +702,62 @@ describe PostAction do
 
   end
 
+  describe '#is_flag?' do
+    describe 'when post action is a flag' do
+      it 'should return true' do
+        PostActionType.notify_flag_types.each do |_type, id|
+          post_action = PostAction.new(
+            user: codinghorror,
+            post_action_type_id: id
+          )
+
+          expect(post_action.is_flag?).to eq(true)
+        end
+      end
+    end
+
+    describe 'when post action is not a flag' do
+      it 'should return false' do
+        post_action = PostAction.new(
+          user: codinghorror,
+          post_action_type_id: 99
+        )
+
+        expect(post_action.is_flag?).to eq(false)
+      end
+    end
+  end
+
+  describe "triggers Discourse events" do
+    let(:post) { Fabricate(:post) }
+
+    it 'flag created' do
+      event = DiscourseEvent.track_events { PostAction.act(eviltrout, post, PostActionType.types[:spam]) }.last
+      expect(event[:event_name]).to eq(:flag_created)
+    end
+
+    context "resolving flags" do
+      before do
+        @flag = PostAction.act(eviltrout, post, PostActionType.types[:spam])
+      end
+
+      it 'flag agreed' do
+        event = DiscourseEvent.track_events { PostAction.agree_flags!(post, moderator) }.last
+        expect(event[:event_name]).to eq(:flag_agreed)
+        expect(event[:params].first).to eq(@flag)
+      end
+
+      it 'flag disagreed' do
+        event = DiscourseEvent.track_events { PostAction.clear_flags!(post, moderator) }.last
+        expect(event[:event_name]).to eq(:flag_disagreed)
+        expect(event[:params].first).to eq(@flag)
+      end
+
+      it 'flag deferred' do
+        event = DiscourseEvent.track_events { PostAction.defer_flags!(post, moderator) }.last
+        expect(event[:event_name]).to eq(:flag_deferred)
+        expect(event[:params].first).to eq(@flag)
+      end
+    end
+  end
 end
diff --git a/spec/models/post_analyzer_spec.rb b/spec/models/post_analyzer_spec.rb
index 937b47687cf..f7e20efc1e6 100644
--- a/spec/models/post_analyzer_spec.rb
+++ b/spec/models/post_analyzer_spec.rb
@@ -176,6 +176,11 @@ describe PostAnalyzer do
       expect(post_analyzer.link_count).to eq(0)
     end
 
+    it "returns links with href=''" do
+      post_analyzer = PostAnalyzer.new('<a href="">Hello world</a>', nil)
+      expect(post_analyzer.link_count).to eq(1)
+    end
+
     it "finds links from markdown" do
       Oneboxer.stubs :onebox
       post_analyzer = PostAnalyzer.new(raw_post_one_link_md, default_topic_id)
diff --git a/spec/models/post_mover_spec.rb b/spec/models/post_mover_spec.rb
index 3ef6bd21542..49ce2674d36 100644
--- a/spec/models/post_mover_spec.rb
+++ b/spec/models/post_mover_spec.rb
@@ -23,7 +23,7 @@ describe PostMover do
     let(:another_user) { Fabricate(:evil_trout) }
     let(:category) { Fabricate(:category, user: user) }
     let!(:topic) { Fabricate(:topic, user: user) }
-    let!(:p1) { Fabricate(:post, topic: topic, user: user) }
+    let!(:p1) { Fabricate(:post, topic: topic, user: user, created_at: 3.hours.ago) }
 
     let!(:p2) do
       Fabricate(:post,
@@ -39,6 +39,7 @@ describe PostMover do
     let(:p6) { Fabricate(:post, topic: topic) }
 
     before do
+      SiteSetting.queue_jobs = false
       p1.replies << p3
       p2.replies << p4
       UserActionCreator.enable
@@ -192,8 +193,11 @@ describe PostMover do
           new_topic.reload
           expect(new_topic.posts_count).to eq(2)
           expect(new_topic.highest_post_number).to eq(2)
-          expect(new_topic.last_post_user_id).to eq(new_topic.posts.last.user_id)
-          expect(new_topic.last_posted_at).to be_present
+
+          last_post = new_topic.posts.last
+          expect(new_topic.last_post_user_id).to eq(last_post.user_id)
+          expect(new_topic.last_posted_at).to eq(last_post.created_at)
+          expect(new_topic.bumped_at).to eq(last_post.created_at)
 
           p2.reload
           expect(p2.sort_order).to eq(1)
@@ -398,6 +402,7 @@ describe PostMover do
           # New first post
           new_first = new_topic.posts.where(post_number: 1).first
           expect(new_first.reply_count).to eq(1)
+          expect(new_first.created_at).to be_within(1.second).of(p1.created_at)
 
           # Second post is in a new topic
           p2.reload
@@ -495,6 +500,17 @@ describe PostMover do
         end
       end
 
+      it "skips validations when moving posts" do
+        p1.update_attribute(:raw, "foo")
+        p2.update_attribute(:raw, "bar")
+
+        new_topic = topic.move_posts(user, [p1.id, p2.id], title: "new testing topic name")
+
+        expect(new_topic).to be_present
+        expect(new_topic.posts.by_post_number.first.raw).to eq(p1.raw)
+        expect(new_topic.posts.by_post_number.last.raw).to eq(p2.raw)
+        expect(new_topic.posts_count).to eq(2)
+      end
     end
   end
 end
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index 3582aa4db69..8a7d5776848 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -169,6 +169,9 @@ describe Post do
     let(:post_two_images) { post_with_body("<img src='http://discourse.org/logo.png'> <img src='http://bbc.co.uk/sherlock.jpg'>", newuser) }
     let(:post_with_avatars) { post_with_body('<img alt="smiley" title=":smiley:" src="/assets/emoji/smiley.png" class="avatar"> <img alt="wink" title=":wink:" src="/assets/emoji/wink.png" class="avatar">', newuser) }
     let(:post_with_favicon) { post_with_body('<img src="/assets/favicons/wikipedia.png" class="favicon">', newuser) }
+    let(:post_image_within_quote) { post_with_body('[quote]<img src="coolimage.png">[/quote]', newuser) }
+    let(:post_image_within_code) { post_with_body('<code><img src="coolimage.png"></code>', newuser) }
+    let(:post_image_within_pre) { post_with_body('<pre><img src="coolimage.png"></pre>', newuser) }
     let(:post_with_thumbnail) { post_with_body('<img src="/assets/emoji/smiley.png" class="thumbnail">', newuser) }
     let(:post_with_two_classy_images) { post_with_body("<img src='http://discourse.org/logo.png' class='classy'> <img src='http://bbc.co.uk/sherlock.jpg' class='classy'>", newuser) }
 
@@ -188,6 +191,40 @@ describe Post do
       expect(post_with_avatars.image_count).to eq(0)
     end
 
+    it "allows images by default" do
+      expect(post_one_image).to be_valid
+    end
+
+    it "doesn't allow more than `min_trust_to_post_images`" do
+      SiteSetting.min_trust_to_post_images = 4
+      post_one_image.user.trust_level = 3
+      expect(post_one_image).not_to be_valid
+    end
+
+    it "doesn't allow more than `min_trust_to_post_images` in a quote" do
+      SiteSetting.min_trust_to_post_images = 4
+      post_one_image.user.trust_level = 3
+      expect(post_image_within_quote).not_to be_valid
+    end
+
+    it "doesn't allow more than `min_trust_to_post_images` in code" do
+      SiteSetting.min_trust_to_post_images = 4
+      post_one_image.user.trust_level = 3
+      expect(post_image_within_code).not_to be_valid
+    end
+
+    it "doesn't allow more than `min_trust_to_post_images` in pre" do
+      SiteSetting.min_trust_to_post_images = 4
+      post_one_image.user.trust_level = 3
+      expect(post_image_within_pre).not_to be_valid
+    end
+
+    it "doesn't allow more than `min_trust_to_post_images`" do
+      SiteSetting.min_trust_to_post_images = 4
+      post_one_image.user.trust_level = 4
+      expect(post_one_image).to be_valid
+    end
+
     it "doesn't count favicons as images" do
       PrettyText.stubs(:cook).returns(post_with_favicon.raw)
       expect(post_with_favicon.image_count).to eq(0)
@@ -352,9 +389,11 @@ describe Post do
 
   end
 
-  describe "maximum links" do
+  describe "maximums" do
     let(:newuser) { Fabricate(:user, trust_level: TrustLevel[0]) }
     let(:post_one_link) { post_with_body("[sherlock](http://www.bbc.co.uk/programmes/b018ttws)", newuser) }
+    let(:post_onebox) { post_with_body("http://www.google.com", newuser) }
+    let(:post_code_link) { post_with_body("<code>http://www.google.com</code>", newuser) }
     let(:post_two_links) { post_with_body("<a href='http://discourse.org'>discourse</a> <a href='http://twitter.com'>twitter</a>", newuser) }
     let(:post_with_mentions) { post_with_body("hello @#{newuser.username} how are you doing?", newuser) }
 
@@ -371,7 +410,6 @@ describe Post do
     end
 
     it "finds links from HTML" do
-
       expect(post_two_links.link_count).to eq(2)
     end
 
@@ -391,11 +429,31 @@ describe Post do
         end
       end
 
-      it "allows multiple images for basic accounts" do
+      it "allows multiple links for basic accounts" do
         post_two_links.user.trust_level = TrustLevel[1]
         expect(post_two_links).to be_valid
       end
 
+      context "min_trust_to_post_links" do
+        it "considers oneboxes links" do
+          SiteSetting.min_trust_to_post_links = 3
+          post_onebox.user.trust_level = TrustLevel[2]
+          expect(post_onebox).not_to be_valid
+        end
+
+        it "considers links within code" do
+          SiteSetting.min_trust_to_post_links = 3
+          post_onebox.user.trust_level = TrustLevel[2]
+          expect(post_code_link).not_to be_valid
+        end
+
+        it "doesn't allow allow links if `min_trust_to_post_links` is not met" do
+          SiteSetting.min_trust_to_post_links = 2
+          post_two_links.user.trust_level = TrustLevel[1]
+          expect(post_one_link).not_to be_valid
+        end
+      end
+
     end
 
   end
@@ -615,7 +673,7 @@ describe Post do
       context 'second poster posts again quickly' do
 
         it 'is a ninja edit, because the second poster posted again quickly' do
-          SiteSetting.expects(:editing_grace_period).returns(1.minute.to_i)
+          SiteSetting.editing_grace_period = 1.minute.to_i
           post.revise(changed_by, { raw: 'yet another updated body' }, revised_at: post.updated_at + 10.seconds)
           post.reload
 
@@ -805,6 +863,14 @@ describe Post do
       expect(p6.reply_ids).to be_empty # quotes itself
     end
 
+    it "does not skip any replies" do
+      expect(p1.reply_ids(only_replies_to_single_post: false)).to eq([{ id: p2.id, level: 1 }, { id: p4.id, level: 2 }, { id: p5.id, level: 3 }, { id: p6.id, level: 2 }])
+      expect(p2.reply_ids(only_replies_to_single_post: false)).to eq([{ id: p4.id, level: 1 }, { id: p5.id, level: 2 }, { id: p6.id, level: 1 }])
+      expect(p3.reply_ids(only_replies_to_single_post: false)).to eq([{ id: p5.id, level: 1 }])
+      expect(p4.reply_ids(only_replies_to_single_post: false)).to eq([{ id: p5.id, level: 1 }])
+      expect(p5.reply_ids(only_replies_to_single_post: false)).to be_empty # has no replies
+      expect(p6.reply_ids(only_replies_to_single_post: false)).to be_empty # quotes itself
+    end
   end
 
   describe 'urls' do
@@ -1029,4 +1095,11 @@ describe Post do
     expect(hidden_topic.visible).to eq(false)
   end
 
+  it "automatically orders post revisions by number ascending" do
+    post = Fabricate(:post)
+    post.revisions.create!(user_id: 1, post_id: post.id, number: 2)
+    post.revisions.create!(user_id: 1, post_id: post.id, number: 1)
+    expect(post.revisions.pluck(:number)).to eq([1, 2])
+  end
+
 end
diff --git a/spec/models/queued_post_spec.rb b/spec/models/queued_post_spec.rb
index 5f5f32eb93a..b6e5113efe2 100644
--- a/spec/models/queued_post_spec.rb
+++ b/spec/models/queued_post_spec.rb
@@ -69,6 +69,11 @@ describe QueuedPost do
       expect(post).to be_present
     end
 
+    it "logs post approvals" do
+      qp.approve!(admin)
+      expect(UserHistory.where(action: UserHistory.actions[:post_approved]).count).to eq(1)
+    end
+
     it "follows the correct workflow for rejection" do
       qp.create_pending_action
       qp.reject!(admin)
@@ -124,6 +129,8 @@ describe QueuedPost do
         topic = post.topic
         expect(topic).to be_present
         expect(topic.category).to eq(category)
+
+        expect(UserHistory.where(action: UserHistory.actions[:post_approved]).count).to eq(1)
       end
 
       it "rejecting doesn't create the post and topic" do
diff --git a/spec/models/quoted_post_spec.rb b/spec/models/quoted_post_spec.rb
index 4c61952c693..b5cbee0acc0 100644
--- a/spec/models/quoted_post_spec.rb
+++ b/spec/models/quoted_post_spec.rb
@@ -1,14 +1,36 @@
 require 'rails_helper'
 
 describe QuotedPost do
-  it 'correctly extracts quotes in integration test' do
-    post1 = create_post
-    post2 = create_post(topic_id: post1.topic_id,
-                        raw: "[quote=\"#{post1.user.username}, post: 1, topic:#{post1.topic_id}\"]\ntest\n[/quote]\nthis is a test post",
-                        reply_to_post_number: 1)
+  it 'correctly extracts quotes' do
+    SiteSetting.queue_jobs = false
 
-    expect(QuotedPost.find_by(post_id: post2.id, quoted_post_id: post1.id)).not_to eq(nil)
-    expect(post2.reply_quoted).to eq(true)
+    topic = Fabricate(:topic)
+    post1 = create_post(topic: topic, post_number: 1, raw: "foo bar")
+    post2 = create_post(topic: topic, post_number: 2, raw: "lorem ipsum")
+    post3 = create_post(topic: topic, post_number: 3, raw: "test post")
+
+    raw = <<~RAW
+      #{post1.full_url}
+
+      [quote="#{post2.user.username}, post:#{post2.post_number}, topic:#{post2.topic.id}"]
+      lorem
+      [/quote]
+
+      this is a test post
+
+      #{post3.full_url}
+    RAW
+
+    post4 = create_post(topic: topic, raw: raw, post_number: 4, reply_to_post_number: post3.post_number)
+
+    expect(QuotedPost.where(post_id: post4.id).pluck(:quoted_post_id)).to contain_exactly(post1.id, post2.id, post3.id)
+    expect(post4.reload.reply_quoted).to eq(true)
+
+    SiteSetting.editing_grace_period = 1.minute.to_i
+    post5 = create_post(topic: topic, post_number: 5, raw: "post 5")
+    raw.sub!(post3.full_url, post5.full_url)
+    post4.revise(post4.user, { raw: raw }, revised_at: post4.updated_at + 2.minutes)
+    expect(QuotedPost.where(post_id: post4.id).pluck(:quoted_post_id)).to contain_exactly(post1.id, post2.id, post5.id)
   end
 
   it 'correctly handles deltas' do
diff --git a/spec/models/remote_theme_spec.rb b/spec/models/remote_theme_spec.rb
index 1bac7d8485b..31f772b94ec 100644
--- a/spec/models/remote_theme_spec.rb
+++ b/spec/models/remote_theme_spec.rb
@@ -18,10 +18,8 @@ describe RemoteTheme do
       repo_dir
     end
 
-    def about_json(options = {})
-      options[:love] ||= "FAFAFA"
-
-<<JSON
+    def about_json(love_color: "FAFAFA", color_scheme_name: "Amazing")
+      <<~JSON
         {
           "name": "awesome theme",
           "about_url": "https://www.site.com/about",
@@ -38,12 +36,12 @@ describe RemoteTheme do
             "name": "sam"
           },
           "color_schemes": {
-            "Amazing": {
-              "love": "#{options[:love]}"
+            "#{color_scheme_name}": {
+              "love": "#{love_color}"
             }
           }
         }
-JSON
+      JSON
     end
 
     let :scss_data do
@@ -58,6 +56,7 @@ JSON
         "common/random.html" => "I AM SILLY",
         "common/embedded.scss" => "EMBED",
         "assets/awesome.woff2" => "FAKE FONT",
+        "settings.yaml" => "boolean_setting: true"
       )
     end
 
@@ -81,7 +80,7 @@ JSON
       expect(remote.about_url).to eq("https://www.site.com/about")
       expect(remote.license_url).to eq("https://www.site.com/license")
 
-      expect(@theme.theme_fields.length).to eq(6)
+      expect(@theme.theme_fields.length).to eq(7)
 
       mapped = Hash[*@theme.theme_fields.map { |f| ["#{f.target_id}-#{f.name}", f.value] }.flatten]
 
@@ -93,7 +92,12 @@ JSON
       expect(mapped["0-font"]).to eq("")
       expect(mapped["0-name"]).to eq("sam")
 
-      expect(mapped.length).to eq(6)
+      expect(mapped["3-yaml"]).to eq("boolean_setting: true")
+
+      expect(mapped.length).to eq(7)
+
+      expect(@theme.settings.length).to eq(1)
+      expect(@theme.settings.first.value).to eq(true)
 
       expect(remote.remote_updated_at).to eq(time)
 
@@ -102,8 +106,12 @@ JSON
       expect(scheme.colors.find_by(name: 'love').hex).to eq('fafafa')
 
       File.write("#{initial_repo}/common/header.html", "I AM UPDATED")
-      File.write("#{initial_repo}/about.json", about_json(love: "EAEAEA"))
+      File.write("#{initial_repo}/about.json", about_json(love_color: "EAEAEA"))
 
+      File.write("#{initial_repo}/settings.yml", "integer_setting: 32")
+      `cd #{initial_repo} && git add settings.yml`
+
+      File.delete("#{initial_repo}/settings.yaml")
       `cd #{initial_repo} && git commit -am "update"`
 
       time = Time.new('2001')
@@ -125,8 +133,22 @@ JSON
 
       expect(mapped["0-header"]).to eq("I AM UPDATED")
       expect(mapped["1-scss"]).to eq(scss_data)
+
+      expect(@theme.settings.length).to eq(1)
+      expect(@theme.settings.first.value).to eq(32)
+
       expect(remote.remote_updated_at).to eq(time)
 
+      # It should be able to remove old colors as well
+      File.write("#{initial_repo}/about.json", about_json(love_color: "BABABA", color_scheme_name: "Amazing 2"))
+      `cd #{initial_repo} && git commit -am "update"`
+
+      remote.update_from_remote
+      @theme.save
+      @theme.reload
+
+      scheme_count = ColorScheme.where(theme_id: @theme.id).count
+      expect(scheme_count).to eq(1)
     end
   end
 end
diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb
index c70f9a4fff8..1f36ce5ff37 100644
--- a/spec/models/report_spec.rb
+++ b/spec/models/report_spec.rb
@@ -2,6 +2,61 @@ require 'rails_helper'
 
 describe Report do
 
+  describe "counting" do
+    describe "requests" do
+      before do
+        freeze_time DateTime.parse('2017-03-01 12:00')
+
+        # today, an incomplete day:
+        ApplicationRequest.create(date: 0.days.ago.to_time, req_type: ApplicationRequest.req_types['http_total'], count: 1)
+
+        # 60 complete days:
+        30.times do |i|
+          ApplicationRequest.create(date: (i + 1).days.ago.to_time, req_type: ApplicationRequest.req_types['http_total'], count: 10)
+        end
+        30.times do |i|
+          ApplicationRequest.create(date: (31 + i).days.ago.to_time, req_type: ApplicationRequest.req_types['http_total'], count: 100)
+        end
+      end
+
+      subject(:json) { Report.find("http_total_reqs").as_json }
+
+      it "counts the correct records" do
+        expect(json[:data].size).to eq(31) # today and 30 full days
+        expect(json[:data][0..-2].sum { |d| d[:y] }).to eq(300)
+        expect(json[:prev30Days]).to eq(3000)
+      end
+    end
+
+    describe "topics" do
+      before do
+        Report.clear_cache
+        freeze_time DateTime.parse('2017-03-01 12:00')
+
+        ((0..32).to_a + [60, 61, 62, 63]).each do |i|
+          Fabricate(:topic, created_at: i.days.ago)
+        end
+      end
+
+      it "counts the correct records" do
+        json = Report.find("topics").as_json
+        expect(json[:data].size).to eq(31)
+        expect(json[:prev30Days]).to eq(3)
+
+        # lets make sure we can ask for the correct options for the report
+        json = Report.find("topics",
+          start_date: 5.days.ago.beginning_of_day,
+          end_date: 1.day.ago.end_of_day,
+          facets: [:prev_period]
+        ).as_json
+
+        expect(json[:prev_period]).to eq(5)
+        expect(json[:data].length).to eq(5)
+        expect(json[:prev30Days]).to eq(nil)
+      end
+    end
+  end
+
   describe 'visits report' do
     let(:report) { Report.find('visits') }
 
@@ -40,7 +95,7 @@ describe Report do
 
       context "with #{pluralized}" do
         before(:each) do
-          freeze_time
+          freeze_time DateTime.parse('2017-03-01 12:00')
           fabricator = case arg
                        when :signup
                          :user
@@ -58,25 +113,24 @@ describe Report do
           Fabricate(fabricator, created_at: 35.days.ago)
         end
 
-        context 'returns a report with data'
-          it "returns today's data" do
-            expect(report.data.select { |v| v[:x].today? }).to be_present
-          end
+        it "returns today's data" do
+          expect(report.data.select { |v| v[:x].today? }).to be_present
+        end
 
-          it 'returns total data' do
-            expect(report.total).to eq 7
-          end
+        it 'returns total data' do
+          expect(report.total).to eq 7
+        end
 
-          it "returns previous 30 day's data" do
-            expect(report.prev30Days).to be_present
-          end
+        it "returns previous 30 day's data" do
+          expect(report.prev30Days).to be_present
+        end
       end
     end
   end
 
   [:http_total, :http_2xx, :http_background, :http_3xx, :http_4xx, :http_5xx, :page_view_crawler, :page_view_logged_in, :page_view_anon].each do |request_type|
     describe "#{request_type} request reports" do
-      let(:report) { Report.find("#{request_type}_reqs", start_date: 10.days.ago.to_time, end_date: Date.today.to_time) }
+      let(:report) { Report.find("#{request_type}_reqs", start_date: 10.days.ago.to_time, end_date: Time.now) }
 
       context "with no #{request_type} records" do
         it 'returns an empty report' do
@@ -86,10 +140,10 @@ describe Report do
 
       context "with #{request_type}" do
         before(:each) do
-          freeze_time
+          freeze_time DateTime.parse('2017-03-01 12:00')
           ApplicationRequest.create(date: 35.days.ago.to_time, req_type: ApplicationRequest.req_types[request_type.to_s], count: 35)
           ApplicationRequest.create(date: 7.days.ago.to_time, req_type: ApplicationRequest.req_types[request_type.to_s], count: 8)
-          ApplicationRequest.create(date: Date.today.to_time, req_type: ApplicationRequest.req_types[request_type.to_s], count: 1)
+          ApplicationRequest.create(date: Time.now, req_type: ApplicationRequest.req_types[request_type.to_s], count: 1)
           ApplicationRequest.create(date: 1.day.ago.to_time, req_type: ApplicationRequest.req_types[request_type.to_s], count: 2)
           ApplicationRequest.create(date: 2.days.ago.to_time, req_type: ApplicationRequest.req_types[request_type.to_s], count: 3)
         end
@@ -123,7 +177,7 @@ describe Report do
   end
 
   describe 'private messages' do
-    let(:report) { Report.find('user_to_user_private_messages') }
+    let(:report) { Report.find('user_to_user_private_messages_with_replies') }
 
     it 'topic report).to not include private messages' do
       Fabricate(:private_message_topic, created_at: 1.hour.ago)
@@ -207,6 +261,169 @@ describe Report do
     end
   end
 
+  describe 'new contributors report' do
+    let(:report) { Report.find('new_contributors') }
+
+    context "no contributors" do
+      it "returns an empty report" do
+        expect(report.data).to be_blank
+      end
+    end
+
+    context "with contributors" do
+      before do
+        jeff = Fabricate(:user)
+        jeff.user_stat = UserStat.new(new_since: 1.hour.ago, first_post_created_at: 1.day.ago)
+
+        regis = Fabricate(:user)
+        regis.user_stat = UserStat.new(new_since: 1.hour.ago, first_post_created_at: 2.days.ago)
+
+        hawk = Fabricate(:user)
+        hawk.user_stat = UserStat.new(new_since: 1.hour.ago, first_post_created_at: 2.days.ago)
+      end
+
+      it "returns a report with data" do
+        expect(report.data).to be_present
+
+        expect(report.data[0][:y]).to eq 2
+        expect(report.data[1][:y]).to eq 1
+      end
+    end
+  end
+
+  describe 'users by types level report' do
+    let(:report) { Report.find('users_by_type') }
+
+    context "no users" do
+      it "returns an empty report" do
+        expect(report.data).to be_blank
+      end
+    end
+
+    context "with users at different trust levels" do
+      before do
+        3.times { Fabricate(:user, admin: true) }
+        2.times { Fabricate(:user, moderator: true) }
+        UserSilencer.silence(Fabricate(:user), Fabricate.build(:admin))
+        Fabricate(:user, suspended_till: 1.week.from_now, suspended_at: 1.day.ago)
+      end
+
+      it "returns a report with data" do
+        expect(report.data).to be_present
+
+        label = Proc.new { |key| I18n.t("reports.users_by_type.xaxis_labels.#{key}") }
+        expect(report.data.find { |d| d[:x] == label.call("admin") }[:y]).to eq 3
+        expect(report.data.find { |d| d[:x] == label.call("moderator") }[:y]).to eq 2
+        expect(report.data.find { |d| d[:x] == label.call("silenced") }[:y]).to eq 1
+        expect(report.data.find { |d| d[:x] == label.call("suspended") }[:y]).to eq 1
+      end
+    end
+  end
+
+  describe 'trending search report' do
+    let(:report) { Report.find('trending_search') }
+
+    context "no searches" do
+      it "returns an empty report" do
+        expect(report.data).to be_blank
+      end
+    end
+
+    context "with different searches" do
+      before do
+        SearchLog.log(term: 'ruby', search_type: :header, ip_address: '127.0.0.1')
+
+        SearchLog.create!(term: 'ruby', search_result_id: 1, search_type: 1, ip_address: '127.0.0.1', user_id: Fabricate(:user).id)
+
+        SearchLog.log(term: 'ruby', search_type: :header, ip_address: '127.0.0.2')
+        SearchLog.log(term: 'php', search_type: :header, ip_address: '127.0.0.1')
+      end
+
+      after do
+        SearchLog.clear_debounce_cache!
+      end
+
+      it "returns a report with data" do
+        expect(report.data[0][:term]).to eq("ruby")
+        expect(report.data[0][:unique_searches]).to eq(2)
+        expect(report.data[0][:ctr]).to eq('33.4%')
+
+        expect(report.data[1][:term]).to eq("php")
+        expect(report.data[1][:unique_searches]).to eq(1)
+      end
+    end
+  end
+
+  describe 'DAU/MAU report' do
+    let(:report) { Report.find('dau_by_mau') }
+
+    context "no activity" do
+      it "returns an empty report" do
+        expect(report.data).to be_blank
+      end
+    end
+
+    context "with different users/visits" do
+      before do
+        freeze_time DateTime.parse('2017-03-01 12:00')
+
+        arpit = Fabricate(:user)
+        arpit.user_visits.create(visited_at:  1.day.ago)
+
+        sam = Fabricate(:user)
+        sam.user_visits.create(visited_at: 2.days.ago)
+
+        robin = Fabricate(:user)
+        robin.user_visits.create(visited_at: 2.days.ago)
+
+        michael = Fabricate(:user)
+        michael.user_visits.create(visited_at: 35.days.ago)
+
+        gerhard = Fabricate(:user)
+        gerhard.user_visits.create(visited_at: 45.days.ago)
+      end
+
+      it "returns a report with data" do
+        expect(report.data.first[:y]).to eq(100)
+        expect(report.data.last[:y]).to eq(33.34)
+        expect(report.prev30Days).to eq(75)
+      end
+    end
+  end
+
+  describe 'Daily engaged users' do
+    let(:report) { Report.find('daily_engaged_users') }
+
+    context "no activity" do
+      it "returns an empty report" do
+        expect(report.data).to be_blank
+      end
+    end
+
+    context "with different activities" do
+      before do
+        freeze_time DateTime.parse('2017-03-01 12:00')
+
+        UserActionCreator.enable
+
+        arpit = Fabricate(:user)
+        sam = Fabricate(:user)
+
+        jeff = Fabricate(:user, created_at: 1.day.ago)
+        topic = Fabricate(:topic, user: jeff, created_at: 1.day.ago)
+        post = Fabricate(:post, topic: topic, user: jeff, created_at: 1.day.ago)
+
+        PostAction.act(arpit, post, PostActionType.types[:like])
+        PostAction.act(sam, post, PostActionType.types[:like])
+      end
+
+      it "returns a report with data" do
+        expect(report.data.first[:y]).to eq(1)
+        expect(report.data.last[:y]).to eq(2)
+      end
+    end
+  end
+
   describe 'posts counts' do
     it "only counts regular posts" do
       post = Fabricate(:post)
diff --git a/spec/models/screened_ip_address_spec.rb b/spec/models/screened_ip_address_spec.rb
index 6210f832b0d..2b8a8d82f80 100644
--- a/spec/models/screened_ip_address_spec.rb
+++ b/spec/models/screened_ip_address_spec.rb
@@ -31,6 +31,13 @@ describe ScreenedIpAddress do
         described_class.new(valid_params.merge(action_name: nil))
       }.to raise_error(ArgumentError)
     end
+
+    it 'returns a useful error if ip address matches an existing record' do
+      ScreenedIpAddress.create(ip_address: '2600:387:b:f::7a/128', action_name: :block)
+      r = ScreenedIpAddress.new(ip_address: '2600:387:b:f::7a', action_name: :block)
+      expect(r.save).to eq(false)
+      expect(r.errors[:ip_address]).to be_present
+    end
   end
 
   describe "ip_address_with_mask" do
diff --git a/spec/models/search_log_spec.rb b/spec/models/search_log_spec.rb
index 478fc8d0334..8811fca9abc 100644
--- a/spec/models/search_log_spec.rb
+++ b/spec/models/search_log_spec.rb
@@ -2,6 +2,10 @@ require 'rails_helper'
 
 RSpec.describe SearchLog, type: :model do
 
+  after do
+    SearchLog.clear_debounce_cache!
+  end
+
   describe ".log" do
 
     context "invalid arguments" do
@@ -122,6 +126,7 @@ RSpec.describe SearchLog, type: :model do
         expect(action).to eq(:created)
 
         freeze_time(10.minutes.from_now)
+        $redis.del(SearchLog.redis_key(ip_address: '192.168.0.1', user_id: user.id))
 
         action, _ = SearchLog.log(
           term: 'hello',
@@ -172,6 +177,7 @@ RSpec.describe SearchLog, type: :model do
 
       SearchLog.where(term: 'ruby', ip_address: '127.0.0.2').update_all(search_result_id: 24)
       term_click_through_details = SearchLog.term_details("ruby", :all, :click_through_only)
+      expect(term_click_through_details[:period]).to eq("all")
       expect(term_click_through_details[:data][0][:y]).to eq(1)
     end
   end
diff --git a/spec/models/site_setting_spec.rb b/spec/models/site_setting_spec.rb
index 65907a77a5d..fbe059c125a 100644
--- a/spec/models/site_setting_spec.rb
+++ b/spec/models/site_setting_spec.rb
@@ -26,7 +26,7 @@ describe SiteSetting do
 
   describe 'private_message_title_length' do
     it 'returns a range of min/max pm topic title length' do
-      expect(SiteSetting.private_message_title_length).to eq(SiteSetting.defaults[:min_private_message_title_length]..SiteSetting.defaults[:max_topic_title_length])
+      expect(SiteSetting.private_message_title_length).to eq(SiteSetting.defaults[:min_personal_message_title_length]..SiteSetting.defaults[:max_topic_title_length])
     end
   end
 
@@ -52,7 +52,19 @@ describe SiteSetting do
   end
 
   describe "top_menu" do
-    before { SiteSetting.top_menu = 'one,-nope|two|three,-not|four,ignored|category/xyz|latest' }
+    describe "validations" do
+      it "always demands latest" do
+        expect do
+          SiteSetting.top_menu = 'categories'
+        end.to raise_error(Discourse::InvalidParameters)
+      end
+
+      it "does not allow random text" do
+        expect do
+          SiteSetting.top_menu = 'latest|random'
+        end.to raise_error(Discourse::InvalidParameters)
+      end
+    end
 
     describe "items" do
       let(:items) { SiteSetting.top_menu_items }
@@ -64,7 +76,8 @@ describe SiteSetting do
 
     describe "homepage" do
       it "has homepage" do
-        expect(SiteSetting.homepage).to eq('one')
+        SiteSetting.top_menu = "bookmarks|latest"
+        expect(SiteSetting.homepage).to eq('bookmarks')
       end
     end
   end
@@ -119,15 +132,31 @@ describe SiteSetting do
     it "returns https when using ssl" do
       expect(SiteSetting.scheme).to eq("https")
     end
+  end
 
+  context "shared_drafts_enabled?" do
+    it "returns false by default" do
+      expect(SiteSetting.shared_drafts_enabled?).to eq(false)
+    end
+
+    it "returns false when the category is uncategorized" do
+      SiteSetting.shared_drafts_category = SiteSetting.uncategorized_category_id
+      expect(SiteSetting.shared_drafts_enabled?).to eq(false)
+    end
+
+    it "returns true when the category is valid" do
+      SiteSetting.shared_drafts_category = Fabricate(:category).id
+      expect(SiteSetting.shared_drafts_enabled?).to eq(true)
+    end
   end
 
   context 'deprecated site settings' do
-    before do
-      SiteSetting.force_https = true
-    end
 
     describe '#use_https' do
+      before do
+        SiteSetting.force_https = true
+      end
+
       it 'should act as a proxy to the new methods' do
         expect(SiteSetting.use_https).to eq(true)
         expect(SiteSetting.use_https?).to eq(true)
@@ -138,5 +167,37 @@ describe SiteSetting do
         expect(SiteSetting.force_https?).to eq(false)
       end
     end
+
+    describe 'rename private message to personal message' do
+      before do
+        SiteSetting.min_personal_message_title_length = 15
+        SiteSetting.enable_personal_messages = true
+        SiteSetting.personal_email_time_window_seconds = 15
+        SiteSetting.max_personal_messages_per_day = 15
+        SiteSetting.default_email_personal_messages = true
+      end
+
+      it 'should act as a proxy to the new methods' do
+        expect(SiteSetting.min_private_message_title_length).to eq(15)
+        SiteSetting.min_private_message_title_length = 5
+        expect(SiteSetting.min_personal_message_title_length).to eq(5)
+
+        expect(SiteSetting.enable_private_messages).to eq(true)
+        SiteSetting.enable_private_messages = false
+        expect(SiteSetting.enable_personal_messages).to eq(false)
+
+        expect(SiteSetting.private_email_time_window_seconds).to eq(15)
+        SiteSetting.private_email_time_window_seconds = 5
+        expect(SiteSetting.personal_email_time_window_seconds).to eq(5)
+
+        expect(SiteSetting.max_private_messages_per_day).to eq(15)
+        SiteSetting.max_private_messages_per_day = 5
+        expect(SiteSetting.max_personal_messages_per_day).to eq(5)
+
+        expect(SiteSetting.default_email_private_messages).to eq(true)
+        SiteSetting.default_email_private_messages = false
+        expect(SiteSetting.default_email_personal_messages).to eq(false)
+      end
+    end
   end
 end
diff --git a/spec/models/tag_group_spec.rb b/spec/models/tag_group_spec.rb
new file mode 100644
index 00000000000..b2fcd20c9d7
--- /dev/null
+++ b/spec/models/tag_group_spec.rb
@@ -0,0 +1,75 @@
+require 'rails_helper'
+
+describe TagGroup do
+  describe '#visible' do
+    let(:user1) { Fabricate(:user) }
+    let(:user2) { Fabricate(:user) }
+    let(:admin) { Fabricate(:admin) }
+    let(:moderator) { Fabricate(:moderator) }
+
+    let(:group) { Fabricate(:group) }
+
+    let!(:everyone_tag_group) { Fabricate(:tag_group, name: 'Visible & usable by everyone', tag_names: ['foo-bar']) }
+    let!(:visible_tag_group) { Fabricate(:tag_group, name: 'Visible by everyone, usable by staff', tag_names: ['foo']) }
+    let!(:staff_only_tag_group) { Fabricate(:tag_group, name: 'Staff only', tag_names: ['bar']) }
+
+    let!(:public_tag_group) { Fabricate(:tag_group, name: 'Public', tag_names: ['public1']) }
+    let!(:private_tag_group) { Fabricate(:tag_group, name: 'Private', tag_names: ['privatetag1']) }
+    let!(:staff_tag_group) { Fabricate(:tag_group, name: 'Staff Talk', tag_names: ['stafftag1']) }
+    let!(:unrestricted_tag_group) { Fabricate(:tag_group, name: 'Unrestricted', tag_names: ['use-anywhere']) }
+
+    let!(:public_category) { Fabricate(:category, name: 'Public Category') }
+    let!(:private_category) { Fabricate(:private_category, group: group) }
+    let!(:staff_category) { Fabricate(:category, name: 'Secret') }
+
+    let(:everyone) { Group::AUTO_GROUPS[:everyone] }
+    let(:staff) { Group::AUTO_GROUPS[:staff] }
+
+    let(:full) { TagGroupPermission.permission_types[:full] }
+    let(:readonly) { TagGroupPermission.permission_types[:readonly] }
+
+    before do
+      group.add(user2)
+      group.save!
+
+      staff_category.set_permissions(admins: :full)
+      staff_category.save!
+
+      private_category.set_permissions(staff: :full, group => :full)
+      private_category.save!
+
+      public_category.allowed_tag_groups = [public_tag_group.name]
+      private_category.allowed_tag_groups = [private_tag_group.name]
+      staff_category.allowed_tag_groups = [staff_tag_group.name]
+
+      everyone_tag_group.permissions = [[everyone, full]]
+      everyone_tag_group.save!
+
+      visible_tag_group.permissions = [[everyone, readonly], [staff, full]]
+      visible_tag_group.save!
+
+      staff_only_tag_group.permissions = [[staff, full]]
+      staff_only_tag_group.save!
+    end
+
+    it "returns correct groups based on category & tag group permissions" do
+      expect(TagGroup.visible(Guardian.new(admin)).pluck(:name)).to match_array(TagGroup.pluck(:name))
+      expect(TagGroup.visible(Guardian.new(moderator)).pluck(:name)).to match_array(TagGroup.pluck(:name))
+
+      expect(TagGroup.visible(Guardian.new(user2)).pluck(:name)).to match_array([
+        public_tag_group.name, unrestricted_tag_group.name, private_tag_group.name,
+        everyone_tag_group.name, visible_tag_group.name,
+      ])
+
+      expect(TagGroup.visible(Guardian.new(user1)).pluck(:name)).to match_array([
+        public_tag_group.name, unrestricted_tag_group.name, everyone_tag_group.name,
+        visible_tag_group.name,
+      ])
+
+      expect(TagGroup.visible(Guardian.new(nil)).pluck(:name)).to match_array([
+        public_tag_group.name, unrestricted_tag_group.name, everyone_tag_group.name,
+        visible_tag_group.name,
+      ])
+    end
+  end
+end
diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
index 6cea43f3052..c7cc72496bb 100644
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -10,56 +10,41 @@ describe Tag do
     end
   end
 
+  let(:tag) { Fabricate(:tag) }
+  let(:topic) { Fabricate(:topic, tags: [tag]) }
+
   before do
     SiteSetting.tagging_enabled = true
     SiteSetting.min_trust_level_to_tag_topics = 0
   end
 
-  describe '#tags_by_count_query' do
-    it "returns empty hash if nothing is tagged" do
-      expect(described_class.tags_by_count_query.count(Tag::COUNT_ARG)).to eq({})
+  describe 'new' do
+    subject { Fabricate.build(:tag) }
+
+    it 'triggers a extensibility event' do
+      event = DiscourseEvent.track_events { subject.save! }.last
+
+      expect(event[:event_name]).to eq(:tag_created)
+      expect(event[:params].first).to eq(subject)
     end
+  end
 
-    context "with some tagged topics" do
-      before do
-        @topics = []
-        3.times { @topics << Fabricate(:topic) }
-        make_some_tags(count: 2)
-        @topics[0].tags << @tags[0]
-        @topics[0].tags << @tags[1]
-        @topics[1].tags << @tags[0]
-      end
+  describe 'destroy' do
+    subject { Fabricate(:tag) }
 
-      it "returns tag names with topic counts in a hash" do
-        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 'triggers a extensibility event' do
+      event = DiscourseEvent.track_events { subject.destroy! }.last
 
-      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(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
-
-      it "doesn't include deleted topics in counts" do
-        deleted_topic_tag = Fabricate(:tag)
-        delete_topic = Fabricate(:topic)
-        post = Fabricate(:post, topic: delete_topic, user: delete_topic.user)
-        delete_topic.tags << deleted_topic_tag
-        PostDestroyer.new(Fabricate(:admin), post).destroy
-
-        counts = described_class.tags_by_count_query.count(Tag::COUNT_ARG)
-        expect(counts[deleted_topic_tag.name]).to eq(0)
-      end
+      expect(event[:event_name]).to eq(:tag_destroyed)
+      expect(event[:params].first).to eq(subject)
     end
   end
 
+  it "can delete tags on deleted topics" do
+    topic.trash!
+    expect { tag.destroy }.to change { Tag.count }.by(-1)
+  end
+
   describe '#top_tags' do
     it "returns nothing if nothing has been tagged" do
       make_some_tags(tag_a_topic: false)
@@ -131,5 +116,64 @@ describe Tag do
         expect(described_class.top_tags.sort).to eq([@tags[0].name, @tags[1].name, @tags[2].name].sort)
       end
     end
+
+    context "with hidden tags" do
+      let(:hidden_tag) { Fabricate(:tag, name: 'hidden') }
+      let!(:staff_tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name]) }
+      let!(:topic2) { Fabricate(:topic, tags: [tag, hidden_tag]) }
+
+      it "returns all tags to staff" do
+        expect(Tag.top_tags(guardian: Guardian.new(Fabricate(:admin)))).to include(hidden_tag.name)
+      end
+
+      it "doesn't return hidden tags to anon" do
+        expect(Tag.top_tags).to_not include(hidden_tag.name)
+      end
+
+      it "doesn't return hidden tags to non-staff" do
+        expect(Tag.top_tags(guardian: Guardian.new(Fabricate(:user)))).to_not include(hidden_tag.name)
+      end
+    end
+  end
+
+  describe '#pm_tags' do
+    let(:regular_user) { Fabricate(:trust_level_4) }
+    let(:admin) { Fabricate(:admin) }
+    let(:personal_message) do
+      Fabricate(:private_message_topic, user: regular_user, topic_allowed_users: [
+        Fabricate.build(:topic_allowed_user, user: regular_user),
+        Fabricate.build(:topic_allowed_user, user: admin)
+      ])
+    end
+
+    before do
+      2.times { |i| Fabricate(:tag, topics: [personal_message], name: "tag-#{i}") }
+    end
+
+    it "returns nothing if user is not a staff" do
+      expect(described_class.pm_tags(guardian: Guardian.new(regular_user))).to be_empty
+    end
+
+    it "returns nothing if allow_staff_to_tag_pms setting is disabled" do
+      SiteSetting.allow_staff_to_tag_pms = false
+      expect(described_class.pm_tags(guardian: Guardian.new(admin)).sort).to be_empty
+    end
+
+    it "returns all pm tags if user is a staff and pm tagging is enabled" do
+      SiteSetting.allow_staff_to_tag_pms = true
+      tags = described_class.pm_tags(guardian: Guardian.new(admin), allowed_user: regular_user)
+      expect(tags.length).to eq(2)
+      expect(tags.map { |t| t[:id] }).to contain_exactly("tag-0", "tag-1")
+    end
+  end
+
+  context "topic counts" do
+    it "should exclude private message topics" do
+      topic
+      Fabricate(:private_message_topic, tags: [tag])
+      described_class.ensure_consistency!
+      tag.reload
+      expect(tag.topic_count).to eq(1)
+    end
   end
 end
diff --git a/spec/models/tag_user_spec.rb b/spec/models/tag_user_spec.rb
index b5b9dabacb8..9a120f28901 100644
--- a/spec/models/tag_user_spec.rb
+++ b/spec/models/tag_user_spec.rb
@@ -74,6 +74,9 @@ describe TagUser do
     let(:tracked_tag) { Fabricate(:tag) }
 
     context "with some tag notification settings" do
+      before do
+        SiteSetting.queue_jobs = false
+      end
 
       let :watched_post do
         TagUser.create!(user: user, tag: watched_tag, notification_level: TagUser.notification_levels[:watching])
@@ -156,7 +159,7 @@ describe TagUser do
         staff = Fabricate(:admin)
         topic = create_post.topic
 
-        SiteSetting.staff_tags = "foo"
+        create_staff_tags(['foo'])
 
         result = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(user), ["foo"])
         expect(result).to eq(false)
diff --git a/spec/models/theme_field_spec.rb b/spec/models/theme_field_spec.rb
index 798cb478197..8ec0a5249b1 100644
--- a/spec/models/theme_field_spec.rb
+++ b/spec/models/theme_field_spec.rb
@@ -3,6 +3,10 @@
 require 'rails_helper'
 
 describe ThemeField do
+  after(:all) do
+    ThemeField.destroy_all
+  end
+
   it "correctly generates errors for transpiled js" do
     html = <<HTML
 <script type="text/discourse-plugin" version="0.8">
@@ -17,6 +21,22 @@ HTML
     expect(field.error).to eq(nil)
   end
 
+  it "allows us to use theme settings in handlebars templates" do
+    html = <<HTML
+<script type='text/x-handlebars' data-template-name='my-template'>
+    <div class="testing-div">{{themeSettings.string_setting}}</div>
+</script>
+HTML
+
+    ThemeField.create!(theme_id: 1, target_id: 3, name: "yaml", value: "string_setting: \"test text \\\" 123!\"")
+    baked_value = ThemeField.create!(theme_id: 1, target_id: 0, name: "head_tag", value: html).value_baked
+
+    expect(baked_value).to include("testing-div")
+    expect(baked_value).to include("theme-setting-injector")
+    expect(baked_value).to include("string_setting")
+    expect(baked_value).to include("test text \\\\\\\\u0022 123!")
+  end
+
   it "correctly generates errors for transpiled css" do
     css = "body {"
     field = ThemeField.create!(theme_id: 1, target_id: 0, name: "scss", value: css)
@@ -44,4 +64,52 @@ HTML
     expect { create_upload_theme_field!("a42") }.not_to raise_error
   end
 
+  def get_fixture(type)
+    File.read("#{Rails.root}/spec/fixtures/theme_settings/#{type}_settings.yaml")
+  end
+
+  def create_yaml_field(value)
+    field = ThemeField.create!(theme_id: 1, target_id: Theme.targets[:settings], name: "yaml", value: value)
+    field.reload
+    field
+  end
+
+  let(:key) { "themes.settings_errors" }
+
+  it "generates errors for bad YAML" do
+    yaml = "invalid_setting 5"
+    field = create_yaml_field(yaml)
+    expect(field.error).to eq(I18n.t("#{key}.invalid_yaml"))
+
+    field.value = "valid_setting: true"
+    field.save!
+    field.reload
+    expect(field.error).to eq(nil)
+  end
+
+  it "generates errors when default value's type doesn't match setting type" do
+    field = create_yaml_field(get_fixture("invalid"))
+    expect(field.error).to include(I18n.t("#{key}.default_not_match_type", name: "no_match_setting"))
+  end
+
+  it "generates errors when no default value is passed" do
+    field = create_yaml_field(get_fixture("invalid"))
+    expect(field.error).to include(I18n.t("#{key}.default_value_missing", name: "no_default_setting"))
+  end
+
+  it "generates errors when invalid type is passed" do
+    field = create_yaml_field(get_fixture("invalid"))
+    expect(field.error).to include(I18n.t("#{key}.data_type_not_a_number", name: "invalid_type_setting"))
+  end
+
+  it "generates errors when default value is not within allowed range" do
+    field = create_yaml_field(get_fixture("invalid"))
+    expect(field.error).to include(I18n.t("#{key}.default_out_range", name: "default_out_of_range"))
+    expect(field.error).to include(I18n.t("#{key}.default_out_range", name: "string_default_out_of_range"))
+  end
+
+  it "works correctly when valid yaml is provided" do
+    field = create_yaml_field(get_fixture("valid"))
+    expect(field.error).to be_nil
+  end
 end
diff --git a/spec/models/theme_spec.rb b/spec/models/theme_spec.rb
index 817326a1ad0..352147e3680 100644
--- a/spec/models/theme_spec.rb
+++ b/spec/models/theme_spec.rb
@@ -123,7 +123,7 @@ HTML
 
   context "plugin api" do
     def transpile(html)
-      f = ThemeField.create!(target_id: Theme.targets[:mobile], theme_id: -1, name: "after_header", value: html)
+      f = ThemeField.create!(target_id: Theme.targets[:mobile], theme_id: 1, name: "after_header", value: html)
       f.value_baked
     end
 
@@ -213,6 +213,54 @@ HTML
     end
   end
 
+  context "theme settings" do
+    it "allows values to be used in scss" do
+      theme = Theme.new(name: "awesome theme", user_id: -1)
+      theme.set_field(target: :settings, name: :yaml, value: "background_color: red\nfont_size: 25px")
+      theme.set_field(target: :common, name: :scss, value: 'body {background-color: $background_color; font-size: $font-size}')
+      theme.save!
+
+      scss, _map = Stylesheet::Compiler.compile('@import "theme_variables"; @import "desktop_theme"; ', "theme.scss", theme_id: theme.id)
+      expect(scss).to include("background-color:red")
+      expect(scss).to include("font-size:25px")
+
+      setting = theme.settings.find { |s| s.name == :font_size }
+      setting.value = '30px'
+
+      scss, _map = Stylesheet::Compiler.compile('@import "theme_variables"; @import "desktop_theme"; ', "theme.scss", theme_id: theme.id)
+      expect(scss).to include("font-size:30px")
+    end
+
+    it "allows values to be used in JS" do
+      theme = Theme.new(name: "awesome theme", user_id: -1)
+      theme.set_field(target: :settings, name: :yaml, value: "name: bob")
+      theme.set_field(target: :common, name: :after_header, value: '<script type="text/discourse-plugin" version="1.0">alert(settings.name); let a = ()=>{};</script>')
+      theme.save!
+
+      transpiled = <<~HTML
+      <script>Discourse._registerPluginCode('1.0', function (api) {
+        var settings = { "name": "bob" };
+        alert(settings.name);var a = function a() {};
+      });</script>
+      HTML
+
+      expect(Theme.lookup_field(theme.key, :desktop, :after_header)).to eq(transpiled.strip)
+
+      setting = theme.settings.find { |s| s.name == :name }
+      setting.value = 'bill'
+
+      transpiled = <<~HTML
+      <script>Discourse._registerPluginCode('1.0', function (api) {
+        var settings = { "name": "bill" };
+        alert(settings.name);var a = function a() {};
+      });</script>
+      HTML
+      expect(Theme.lookup_field(theme.key, :desktop, :after_header)).to eq(transpiled.strip)
+
+    end
+
+  end
+
   it 'correctly caches theme keys' do
     Theme.destroy_all
 
@@ -266,4 +314,41 @@ HTML
     expect(user_themes).to eq([])
   end
 
+  def cached_settings(key)
+    Theme.settings_for_client(key) # returns json
+  end
+
+  it 'handles settings cache correctly' do
+    Theme.destroy_all
+    expect(cached_settings(nil)).to eq("{}")
+
+    theme = Theme.create!(name: "awesome theme", user_id: -1)
+    theme.save!
+    expect(cached_settings(theme.key)).to eq("{}")
+
+    theme.set_field(target: :settings, name: "yaml", value: "boolean_setting: true")
+    theme.save!
+    expect(cached_settings(theme.key)).to match(/\"boolean_setting\":true/)
+
+    theme.settings.first.value = "false"
+    expect(cached_settings(theme.key)).to match(/\"boolean_setting\":false/)
+
+    child = Theme.create!(name: "child theme", user_id: -1)
+    child.set_field(target: :settings, name: "yaml", value: "integer_setting: 54")
+
+    child.save!
+    theme.add_child_theme!(child)
+
+    json = cached_settings(theme.key)
+    expect(json).to match(/\"boolean_setting\":false/)
+    expect(json).to match(/\"integer_setting\":54/)
+
+    expect(cached_settings(child.key)).to eq("{\"integer_setting\":54}")
+
+    child.destroy!
+    json = cached_settings(theme.key)
+    expect(json).not_to match(/\"integer_setting\":54/)
+    expect(json).to match(/\"boolean_setting\":false/)
+  end
+
 end
diff --git a/spec/models/top_menu_item_spec.rb b/spec/models/top_menu_item_spec.rb
index 61f78e08490..2027edbf3a9 100644
--- a/spec/models/top_menu_item_spec.rb
+++ b/spec/models/top_menu_item_spec.rb
@@ -2,39 +2,14 @@ require 'rails_helper'
 
 describe TopMenuItem do
   before do
-    SiteSetting.top_menu = 'one,-nope|two|three,-not|four,ignored|latest|category/xyz'
+    SiteSetting.top_menu = 'categories|latest'
   end
 
   let(:items) { SiteSetting.top_menu_items }
 
   it 'has name' do
-    expect(items[0].name).to eq('one')
-    expect(items[1].name).to eq('two')
-    expect(items[2].name).to eq('three')
-  end
-
-  it 'has a filter' do
-    expect(items[0].filter).to eq('nope')
-    expect(items[0].has_filter?).to be_truthy
-    expect(items[2].filter).to eq('not')
-    expect(items[2].has_filter?).to be_truthy
-  end
-
-  it 'does not have a filter' do
-    expect(items[1].filter).to be_nil
-    expect(items[1].has_filter?).to be_falsey
-    expect(items[3].filter).to be_nil
-    expect(items[3].has_filter?).to be_falsey
-  end
-
-  it "has a specific category" do
-    expect(items.first.has_specific_category?).to be_falsey
-    expect(items.last.has_specific_category?).to be_truthy
-  end
-
-  it "does not have a specific category" do
-    expect(items.first.specific_category).to be_nil
-    expect(items.last.specific_category).to eq('xyz')
+    expect(items[0].name).to eq('categories')
+    expect(items[1].name).to eq('latest')
   end
 
 end
diff --git a/spec/models/topic_converter_spec.rb b/spec/models/topic_converter_spec.rb
index 05d28b10e62..ad18f421476 100644
--- a/spec/models/topic_converter_spec.rb
+++ b/spec/models/topic_converter_spec.rb
@@ -5,7 +5,7 @@ describe TopicConverter do
   context 'convert_to_public_topic' do
     let(:admin) { Fabricate(:admin) }
     let(:author) { Fabricate(:user) }
-    let(:category) { Fabricate(:category) }
+    let(:category) { Fabricate(:category, topic_count: 1) }
     let(:private_message) { Fabricate(:private_message_topic, user: author) } # creates a topic without a first post
     let(:first_post) { Fabricate(:post, topic: private_message, user: author) }
     let(:other_user) { private_message.topic_allowed_users.find { |u| u.user != author }.user }
@@ -19,6 +19,7 @@ describe TopicConverter do
         expect(topic).to be_valid
         expect(topic.archetype).to eq("regular")
         expect(topic.category_id).to eq(SiteSetting.uncategorized_category_id)
+        expect(topic.category.topic_count).to eq(1)
       end
 
       describe 'when uncategorized category is not allowed' do
@@ -38,6 +39,7 @@ describe TopicConverter do
             .where(read_restricted: false).order('id asc').first
 
           expect(topic.category_id).to eq(first_category.id)
+          expect(topic.category.topic_count).to eq(2)
         end
       end
 
@@ -46,6 +48,7 @@ describe TopicConverter do
           topic = TopicConverter.new(private_message, admin).convert_to_public_topic(category.id)
 
           expect(topic.reload.category).to eq(category)
+          expect(topic.category.topic_count).to eq(2)
         end
       end
 
@@ -86,13 +89,16 @@ describe TopicConverter do
   context 'convert_to_private_message' do
     let(:admin) { Fabricate(:admin) }
     let(:author) { Fabricate(:user) }
-    let(:topic) { Fabricate(:topic, user: author) }
+    let(:category) { Fabricate(:category) }
+    let(:topic) { Fabricate(:topic, user: author, category_id: category.id) }
 
     context 'success' do
       it "converts regular topic to private message" do
         private_message = topic.convert_to_private_message(admin)
         expect(private_message).to be_valid
         expect(topic.archetype).to eq("private_message")
+        expect(topic.category_id).to eq(nil)
+        expect(category.reload.topic_count).to eq(0)
       end
 
       it "updates user stats" do
@@ -131,5 +137,17 @@ describe TopicConverter do
         expect(topic.reload.user.user_stat.post_count).to eq(0)
       end
     end
+
+    context 'when user already exists in topic_allowed_users table' do
+      before do
+        topic.topic_allowed_users.create!(user_id: admin.id)
+      end
+
+      it "works" do
+        private_message = topic.convert_to_private_message(admin)
+        expect(private_message).to be_valid
+        expect(topic.archetype).to eq("private_message")
+      end
+    end
   end
 end
diff --git a/spec/models/topic_embed_spec.rb b/spec/models/topic_embed_spec.rb
index 447e8ff667f..679ae0684ad 100644
--- a/spec/models/topic_embed_spec.rb
+++ b/spec/models/topic_embed_spec.rb
@@ -41,8 +41,13 @@ describe TopicEmbed do
       end
 
       it "Supports updating the post" do
-        post = TopicEmbed.import(user, url, title, "muhahaha new contents!")
+        new_user = Fabricate(:user)
+
+        post = TopicEmbed.import(new_user, url, "I am a new title", "muhahaha new contents!")
+
         expect(post.cooked).to match(/new contents/)
+        expect(post.topic.title).to eq("I am a new title")
+        expect(post.user).to eq(new_user)
       end
 
       it "Should leave uppercase Feed Entry URL untouched in content" do
@@ -58,6 +63,38 @@ describe TopicEmbed do
       end
     end
 
+    context "post creation supports markdown rendering" do
+      before do
+        SiteSetting.embed_support_markdown = true
+      end
+
+      it "works as expected" do
+        post = TopicEmbed.import(user, url, title, "some random content")
+        expect(post).to be_present
+
+        # It uses regular rendering
+        expect(post.cook_method).to eq(Post.cook_methods[:regular])
+      end
+    end
+  end
+
+  context '.topic_id_for_embed' do
+    it "returns correct topic id irrespective of url protocol" do
+      topic_embed = Fabricate(:topic_embed, embed_url: "http://example.com/post/248")
+
+      expect(TopicEmbed.topic_id_for_embed('http://exAMPle.com/post/248')).to eq(topic_embed.topic_id)
+      expect(TopicEmbed.topic_id_for_embed('https://example.com/post/248/')).to eq(topic_embed.topic_id)
+
+      expect(TopicEmbed.topic_id_for_embed('http://example.com/post/248/2')).to eq(nil)
+      expect(TopicEmbed.topic_id_for_embed('http://examples.com/post/248')).to eq(nil)
+      expect(TopicEmbed.topic_id_for_embed('http://example.com/post/24')).to eq(nil)
+      expect(TopicEmbed.topic_id_for_embed('http://example.com/post')).to eq(nil)
+    end
+
+    it "finds the topic id when the embed_url contains a query string" do
+      topic_embed = Fabricate(:topic_embed, embed_url: "http://example.com/post/248?key=foo")
+      expect(TopicEmbed.topic_id_for_embed('http://example.com/post/248?key=foo')).to eq(topic_embed.topic_id)
+    end
   end
 
   context '.topic_id_for_embed' do
diff --git a/spec/models/topic_link_click_spec.rb b/spec/models/topic_link_click_spec.rb
index f4953f014d3..5b440f7265d 100644
--- a/spec/models/topic_link_click_spec.rb
+++ b/spec/models/topic_link_click_spec.rb
@@ -73,6 +73,22 @@ describe TopicLinkClick do
 
       end
 
+      context 'while logged in' do
+        let(:other_user) { Fabricate(:user) }
+        before do
+          @url = TopicLinkClick.create_from(url: @topic_link.url, post_id: @post.id, ip: '127.0.0.1', user_id: other_user.id)
+          @click = TopicLinkClick.last
+        end
+
+        it 'creates a click without an IP' do
+          expect(@click).to be_present
+          expect(@click.topic_link).to eq(@topic_link)
+          expect(@click.user_id).to eq(other_user.id)
+          expect(@click.ip_address).to eq(nil)
+        end
+
+      end
+
       context "relative urls" do
         let(:host) { URI.parse(Discourse.base_url).host }
 
diff --git a/spec/models/topic_link_spec.rb b/spec/models/topic_link_spec.rb
index bb9408f8081..606ba5f7bae 100644
--- a/spec/models/topic_link_spec.rb
+++ b/spec/models/topic_link_spec.rb
@@ -169,6 +169,14 @@ http://b.com/#{'a' * 500}
       end
     end
 
+    context "email address" do
+      it "does not extract a link" do
+        post = topic.posts.create(user: user, raw: "Valid email: foo@bar.com\n\nInvalid email: rfc822;name@domain.com")
+        TopicLink.extract_from(post)
+        expect(topic.topic_links).to be_blank
+      end
+    end
+
     context "mail link" do
       let(:post) { topic.posts.create(user: user, raw: "[email]bar@example.com[/email]") }
 
diff --git a/spec/models/topic_list_spec.rb b/spec/models/topic_list_spec.rb
index dcb6b5aab71..d5022065f79 100644
--- a/spec/models/topic_list_spec.rb
+++ b/spec/models/topic_list_spec.rb
@@ -46,12 +46,12 @@ describe TopicList do
     end
   end
 
-  describe '#tags' do
+  describe '#top_tags' do
     it 'should return the right tags' do
       tag = Fabricate(:tag, topics: [topic])
       other_tag = Fabricate(:tag, topics: [topic], name: "use-anywhere")
       output = [tag.name, other_tag.name]
-      expect(topic_list.tags.sort).to eq(output.sort)
+      expect(topic_list.top_tags.sort).to eq(output.sort)
     end
 
     describe 'when there are tags restricted to a category' do
@@ -62,19 +62,19 @@ describe TopicList do
       let!(:other_tag) { Fabricate(:tag, topics: [topic], name: "use-anywhere") }
       let(:topic_list) { TopicList.new('latest', topic.user, [topic], category: category.id, category_id: category.id) }
 
-      it 'should only return tags allowed in the category' do
-        expect(topic_list.tags).to eq([tag.name])
+      it 'should return tags used in the category' do
+        expect(topic_list.top_tags).to eq([tag.name, other_tag.name].sort)
       end
 
       it "with no category, should return all tags" do
-        expect(TopicList.new('latest', other_topic.user, [other_topic]).tags.sort).to eq([tag.name, other_tag.name].sort)
+        expect(TopicList.new('latest', other_topic.user, [other_topic]).top_tags.sort).to eq([tag.name, other_tag.name].sort)
       end
 
       it "with another category with no tags, should return no tags" do
         other_category = Fabricate(:category)
         topic3 = Fabricate(:topic, category: other_category)
         list = TopicList.new('latest', topic3.user, [topic3], category: other_category.id, category_id: other_category.id)
-        expect(list.tags).to be_empty
+        expect(list.top_tags).to be_empty
       end
     end
   end
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index 14a42e3406f..57ad210e343 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -30,22 +30,6 @@ describe Topic do
     context "#title" do
       it { is_expected.to validate_presence_of :title }
 
-      describe 'censored pattern' do
-        describe 'when title matches censored pattern' do
-          it 'should not be valid' do
-            SiteSetting.censored_pattern = 'orange.*'
-
-            topic.title = 'I have orangEjuice orange monkey orange stuff'
-
-            expect(topic).to_not be_valid
-
-            expect(topic.errors.full_messages.first).to include(I18n.t(
-              'errors.messages.matches_censored_pattern', censored_words: 'orangejuice orange monkey orange stuff'
-            ))
-          end
-        end
-      end
-
       describe 'censored words' do
         after do
           $redis.flushall
@@ -215,11 +199,11 @@ describe Topic do
   context 'private message title' do
     before do
       SiteSetting.min_topic_title_length = 15
-      SiteSetting.min_private_message_title_length = 3
+      SiteSetting.min_personal_message_title_length = 3
     end
 
     it 'allows shorter titles' do
-      pm = Fabricate.build(:private_message_topic, title: 'a' * SiteSetting.min_private_message_title_length)
+      pm = Fabricate.build(:private_message_topic, title: 'a' * SiteSetting.min_personal_message_title_length)
       expect(pm).to be_valid
     end
 
@@ -481,6 +465,201 @@ describe Topic do
 
   end
 
+  describe '#invite' do
+    let(:topic) { Fabricate(:topic, user: user) }
+    let(:another_user) { Fabricate(:user) }
+
+    context 'rate limits' do
+      before do
+        SiteSetting.max_topic_invitations_per_day = 1
+        RateLimiter.enable
+      end
+
+      after do
+        RateLimiter.clear_all!
+        RateLimiter.disable
+      end
+
+      it "rate limits topic invitations" do
+        start = Time.now.tomorrow.beginning_of_day
+        freeze_time(start)
+
+        trust_level_2 = Fabricate(:user, trust_level: 2)
+        topic = Fabricate(:topic, user: trust_level_2)
+
+        topic.invite(topic.user, user.username)
+
+        expect {
+          topic.invite(topic.user, another_user.username)
+        }.to raise_error(RateLimiter::LimitExceeded)
+      end
+
+      it "rate limits PM invitations" do
+        start = Time.now.tomorrow.beginning_of_day
+        freeze_time(start)
+
+        trust_level_2 = Fabricate(:user, trust_level: 2)
+        topic = Fabricate(:private_message_topic, user: trust_level_2)
+
+        topic.invite(topic.user, user.username)
+
+        expect {
+          topic.invite(topic.user, another_user.username)
+        }.to raise_error(RateLimiter::LimitExceeded)
+      end
+    end
+
+    describe 'when username_or_email is not valid' do
+      it 'should return the right value' do
+        expect do
+          expect(topic.invite(user, 'somerandomstring')).to eq(nil)
+        end.to_not change { topic.allowed_users }
+      end
+    end
+
+    describe 'when user is already allowed' do
+      it 'should raise the right error' do
+        topic.allowed_users << another_user
+
+        expect { topic.invite(user, another_user.username) }
+          .to raise_error(Topic::UserExists)
+      end
+    end
+
+    describe 'private message' do
+      let(:user) { Fabricate(:user, trust_level: TrustLevel[2]) }
+      let(:topic) { Fabricate(:private_message_topic, user: user) }
+
+      describe 'by username' do
+        it 'should be able to invite a user' do
+          expect(topic.invite(user, another_user.username)).to eq(true)
+          expect(topic.allowed_users).to include(another_user)
+          expect(Post.last.action_code).to eq("invited_user")
+
+          notification = Notification.last
+
+          expect(notification.notification_type)
+            .to eq(Notification.types[:invited_to_private_message])
+
+          expect(topic.remove_allowed_user(user, another_user.username)).to eq(true)
+          expect(topic.reload.allowed_users).to_not include(another_user)
+          expect(Post.last.action_code).to eq("removed_user")
+        end
+
+        context "from a muted user" do
+          before { MutedUser.create!(user: another_user, muted_user: user) }
+
+          it 'silently fails' do
+            expect(topic.invite(user, another_user.username)).to eq(true)
+            expect(topic.allowed_users).to_not include(another_user)
+            expect(Post.last).to be_blank
+            expect(Notification.last).to be_blank
+          end
+        end
+
+        context "when PMs are enabled for TL3 or higher only" do
+          before do
+            SiteSetting.min_trust_to_send_messages = 3
+          end
+
+          it 'should raise error' do
+            expect { topic.invite(user, another_user.username) }
+              .to raise_error(Topic::UserExists)
+          end
+        end
+      end
+
+      describe 'by email' do
+        it 'should be able to invite a user' do
+          expect(topic.invite(user, another_user.email)).to eq(true)
+          expect(topic.allowed_users).to include(another_user)
+
+          expect(Notification.last.notification_type)
+            .to eq(Notification.types[:invited_to_private_message])
+        end
+
+        describe 'when user is not found' do
+          it 'should create the right invite' do
+            expect(topic.invite(user, 'test@email.com')).to eq(true)
+
+            invite = Invite.last
+
+            expect(invite.email).to eq('test@email.com')
+            expect(invite.invited_by).to eq(user)
+          end
+
+          describe 'when user does not have sufficient trust level' do
+            before { user.update!(trust_level: TrustLevel[1]) }
+
+            it 'should not create an invite' do
+              expect do
+                expect(topic.invite(user, 'test@email.com')).to eq(nil)
+              end.to_not change { Invite.count }
+            end
+          end
+        end
+      end
+    end
+
+    describe 'public topic' do
+      def expect_the_right_notification_to_be_created
+        notification = Notification.last
+
+        expect(notification.notification_type)
+          .to eq(Notification.types[:invited_to_topic])
+
+        expect(notification.user).to eq(another_user)
+        expect(notification.topic).to eq(topic)
+
+        notification_data = JSON.parse(notification.data)
+
+        expect(notification_data["topic_title"]).to eq(topic.title)
+        expect(notification_data["display_username"]).to eq(user.username)
+      end
+
+      describe 'by username' do
+        it 'should invite user into a topic' do
+          topic.invite(user, another_user.username)
+
+          expect(topic.reload.allowed_users.last).to eq(another_user)
+          expect_the_right_notification_to_be_created
+        end
+      end
+
+      describe 'by email' do
+        it 'should be able to invite a user' do
+          expect(topic.invite(user, another_user.email)).to eq(true)
+          expect(topic.reload.allowed_users.last).to eq(another_user)
+          expect_the_right_notification_to_be_created
+        end
+
+        context "for a muted topic" do
+          before { TopicUser.change(another_user.id, topic.id, notification_level: TopicUser.notification_levels[:muted]) }
+
+          it 'silently fails' do
+            expect(topic.invite(user, another_user.username)).to eq(true)
+            expect(topic.allowed_users).to_not include(another_user)
+            expect(Post.last).to be_blank
+            expect(Notification.last).to be_blank
+          end
+        end
+
+        describe 'when user can invite via email' do
+          before { user.update!(trust_level: TrustLevel[2]) }
+
+          it 'should create an invite' do
+            expect(topic.invite(user, 'test@email.com')).to eq(true)
+
+            invite = Invite.last
+
+            expect(invite.email).to eq('test@email.com')
+            expect(invite.invited_by).to eq(user)
+          end
+        end
+      end
+    end
+  end
+
   context 'private message' do
     let(:coding_horror) { User.find_by(username: "CodingHorror") }
     let(:evil_trout) { Fabricate(:evil_trout) }
@@ -492,9 +671,6 @@ describe Topic do
       expect(Guardian.new(evil_trout).can_see?(topic)).to eq(false)
       expect(Guardian.new(coding_horror).can_see?(topic)).to eq(true)
       expect(TopicQuery.new(evil_trout).list_latest.topics).not_to include(topic)
-
-      # invites
-      expect(topic.invite(topic.user, 'duhhhhh')).to eq(false)
     end
 
     context 'invite' do
@@ -522,6 +698,7 @@ describe Topic do
 
             group.add(user)
             group.add(user_2)
+            group.add(topic.user)
 
             group.group_users.find_by(user: user_2).update!(
               notification_level: NotificationLevels.all[:muted]
@@ -538,42 +715,8 @@ describe Topic do
             expect(notification.notification_type)
               .to eq(Notification.types[:invited_to_private_message])
           end
-
-        end
-
-        context 'by username' do
-
-          it 'adds and removes walter to the allowed users' do
-            expect(topic.invite(topic.user, walter.username)).to eq(true)
-            expect(topic.allowed_users.include?(walter)).to eq(true)
-
-            expect(topic.remove_allowed_user(topic.user, walter.username)).to eq(true)
-            topic.reload
-            expect(topic.allowed_users.include?(walter)).to eq(false)
-          end
-
-          it 'creates a notification' do
-            expect { topic.invite(topic.user, walter.username) }.to change(Notification, :count)
-          end
-
-          it 'creates a small action post' do
-            expect { topic.invite(topic.user, walter.username) }.to change(Post, :count)
-            expect { topic.remove_allowed_user(topic.user, walter.username) }.to change(Post, :count)
-          end
-        end
-
-        context 'by email' do
-
-          it 'adds user correctly' do
-            expect {
-              expect(topic.invite(topic.user, walter.email)).to eq(true)
-            }.to change(Notification, :count)
-            expect(topic.allowed_users.include?(walter)).to eq(true)
-          end
-
         end
       end
-
     end
 
     context "user actions" do
@@ -591,35 +734,6 @@ describe Topic do
 
   end
 
-  context 'rate limits' do
-
-    it "rate limits topic invitations" do
-      SiteSetting.max_topic_invitations_per_day = 2
-      RateLimiter.enable
-      RateLimiter.clear_all!
-
-      start = Time.now.tomorrow.beginning_of_day
-      freeze_time(start)
-
-      user = Fabricate(:user)
-      trust_level_2 = Fabricate(:user, trust_level: 2)
-      topic = Fabricate(:topic, user: trust_level_2)
-
-      freeze_time(start + 10.minutes)
-      topic.invite(topic.user, user.username)
-
-      freeze_time(start + 20.minutes)
-      topic.invite(topic.user, "walter@white.com")
-
-      freeze_time(start + 30.minutes)
-
-      expect {
-        topic.invite(topic.user, "user@example.com")
-      }.to raise_error(RateLimiter::LimitExceeded)
-    end
-
-  end
-
   context 'bumping topics' do
 
     before do
@@ -643,8 +757,8 @@ describe Topic do
 
       it "doesn't bump the topic on an edit to the last post that doesn't result in a new version" do
         expect {
-          SiteSetting.expects(:editing_grace_period).returns(5.minutes)
-          @last_post.revise(@last_post.user, { raw: 'updated contents' }, revised_at: @last_post.created_at + 10.seconds)
+          SiteSetting.editing_grace_period = 5.minutes
+          @last_post.revise(@last_post.user, { raw: @last_post.raw + "a" }, revised_at: @last_post.created_at + 10.seconds)
           @topic.reload
         }.not_to change(@topic, :bumped_at)
       end
@@ -1077,11 +1191,8 @@ describe Topic do
         category.reload
       end
 
-      it 'increases the topic_count' do
-        expect(category.topic_count).to eq(1)
-      end
-
       it "doesn't change the topic_count when the value doesn't change" do
+        expect(category.topic_count).to eq(1)
         expect { topic.change_category_to_id(category.id); category.reload }.not_to change(category, :topic_count)
       end
 
@@ -1101,6 +1212,46 @@ describe Topic do
           expect(category.reload.topic_count).to eq(0)
         end
 
+        describe 'user that is watching the new category' do
+          it 'should generate the notification for the topic' do
+            SiteSetting.queue_jobs = false
+
+            topic.posts << Fabricate(:post)
+
+            CategoryUser.set_notification_level_for_category(
+              user,
+              CategoryUser::notification_levels[:watching],
+              new_category.id
+            )
+
+            another_user = Fabricate(:user)
+
+            CategoryUser.set_notification_level_for_category(
+              another_user,
+              CategoryUser::notification_levels[:watching_first_post],
+              new_category.id
+            )
+
+            expect do
+              topic.change_category_to_id(new_category.id)
+            end.to change { Notification.count }.by(2)
+
+            expect(Notification.where(
+              user_id: user.id,
+              topic_id: topic.id,
+              post_number: 1,
+              notification_type: Notification.types[:posted]
+            ).exists?).to eq(true)
+
+            expect(Notification.where(
+              user_id: another_user.id,
+              topic_id: topic.id,
+              post_number: 1,
+              notification_type: Notification.types[:watching_first_post]
+            ).exists?).to eq(true)
+          end
+        end
+
         describe 'when new category is set to auto close by default' do
           before do
             new_category.update!(auto_close_hours: 5)
@@ -1120,7 +1271,6 @@ describe Topic do
 
           describe 'when topic is already closed' do
             before do
-              SiteSetting.queue_jobs = true
               topic.update_status('closed', true, Discourse.system_user)
             end
 
@@ -1278,6 +1428,18 @@ describe Topic do
       expect(topic.topic_timers.first.errors[:execute_at]).to be_present
     end
 
+    it "sets a validation error when give a timestamp of an invalid format" do
+      freeze_time now
+
+      expect do
+        topic.set_or_create_timer(
+          TopicTimer.types[:close],
+          '۲۰۱۸-۰۳-۲۶ ۱۸:۰۰+۰۸:۰۰',
+          by_user: admin
+        )
+      end.to raise_error(Discourse::InvalidParameters)
+    end
+
     it "can take a timestamp with timezone" do
       freeze_time now
       topic.set_or_create_timer(TopicTimer.types[:close], '2013-11-25T01:35:00-08:00', by_user: admin)
@@ -1358,6 +1520,8 @@ describe Topic do
       let(:topic) { Fabricate(:topic, category: category) }
 
       it "should be able to override category's default auto close" do
+        SiteSetting.queue_jobs = false
+
         expect(topic.topic_timers.first.duration).to eq(4)
 
         topic.set_or_create_timer(TopicTimer.types[:close], 2, by_user: admin)
@@ -1600,7 +1764,7 @@ describe Topic do
 
   describe '#listable_count_per_day' do
     before(:each) do
-      freeze_time
+      freeze_time DateTime.parse('2017-03-01 12:00')
 
       Fabricate(:topic)
       Fabricate(:topic, created_at: 1.day.ago)
@@ -1824,8 +1988,8 @@ describe Topic do
       let(:randolph) { 'randolph@duke.ooo' }
 
       it "should attach group to the invite" do
-        invite = group_private_topic.invite(group_manager, randolph)
-        expect(invite.groups).to eq([group])
+        group_private_topic.invite(group_manager, randolph)
+        expect(Invite.last.groups).to eq([group])
       end
     end
 
@@ -1849,12 +2013,21 @@ describe Topic do
     expect(topic.message_archived?(user)).to eq(false)
 
     group = Fabricate(:group)
+    group2 = Fabricate(:group)
+
     group.add(user)
 
     TopicAllowedGroup.create!(topic_id: topic.id, group_id: group.id)
+    TopicAllowedGroup.create!(topic_id: topic.id, group_id: group2.id)
     GroupArchivedMessage.create!(topic_id: topic.id, group_id: group.id)
 
     expect(topic.message_archived?(user)).to eq(true)
+
+    # here is a pickle, we add another group, make the user a
+    # member of that new group... now this message is not properly archived
+    # for the user any more
+    group2.add(user)
+    expect(topic.message_archived?(user)).to eq(false)
   end
 
   it 'will trigger :topic_status_updated' do
diff --git a/spec/models/topic_tag_spec.rb b/spec/models/topic_tag_spec.rb
new file mode 100644
index 00000000000..c944ecd4999
--- /dev/null
+++ b/spec/models/topic_tag_spec.rb
@@ -0,0 +1,47 @@
+require 'rails_helper'
+
+describe TopicTag do
+
+  let(:topic) { Fabricate(:topic) }
+  let(:tag) { Fabricate(:tag) }
+  let(:topic_tag) { Fabricate(:topic_tag, topic: topic, tag: tag) }
+
+  context '#after_create' do
+
+    it "tag topic_count should be increased" do
+      expect {
+        topic_tag
+      }.to change(tag, :topic_count).by(1)
+    end
+
+    it "tag topic_count should not be increased" do
+      topic.archetype = Archetype.private_message
+
+      expect {
+        topic_tag
+      }.to change(tag, :topic_count).by(0)
+    end
+
+  end
+
+  context '#after_destroy' do
+
+    it "tag topic_count should be decreased" do
+      topic_tag
+      expect {
+        topic_tag.destroy
+      }.to change(tag, :topic_count).by(-1)
+    end
+
+    it "tag topic_count should not be decreased" do
+      topic.archetype = Archetype.private_message
+      topic_tag
+
+      expect {
+        topic_tag.destroy
+      }.to change(tag, :topic_count).by(0)
+    end
+
+  end
+
+end
diff --git a/spec/models/topic_timer_spec.rb b/spec/models/topic_timer_spec.rb
index ef1e32e712a..639ef1d55ea 100644
--- a/spec/models/topic_timer_spec.rb
+++ b/spec/models/topic_timer_spec.rb
@@ -176,6 +176,10 @@ RSpec.describe TopicTimer, type: :model do
         )
       end
 
+      before do
+        SiteSetting.queue_jobs = false
+      end
+
       it 'should close the topic' do
         topic_timer
         expect(topic.reload.closed).to eq(true)
@@ -201,6 +205,10 @@ RSpec.describe TopicTimer, type: :model do
         )
       end
 
+      before do
+        SiteSetting.queue_jobs = false
+      end
+
       it 'should open the topic' do
         topic_timer
         expect(topic.reload.closed).to eq(false)
@@ -239,10 +247,6 @@ RSpec.describe TopicTimer, type: :model do
   end
 
   describe '.ensure_consistency!' do
-    before do
-      SiteSetting.queue_jobs = true
-    end
-
     it 'should enqueue jobs that have been missed' do
       close_topic_timer = Fabricate(:topic_timer,
         execute_at: Time.zone.now - 1.hour,
diff --git a/spec/models/topic_tracking_state_spec.rb b/spec/models/topic_tracking_state_spec.rb
index aed7813ed88..bbeefa368f1 100644
--- a/spec/models/topic_tracking_state_spec.rb
+++ b/spec/models/topic_tracking_state_spec.rb
@@ -10,9 +10,256 @@ describe TopicTrackingState do
     create_post
   end
 
-  it "can correctly publish unread" do
-    # TODO setup stuff and look at messages
-    TopicTrackingState.publish_unread(post)
+  let(:topic) { post.topic }
+  let(:private_message_post) { Fabricate(:private_message_post) }
+  let(:private_message_topic) { private_message_post.topic }
+
+  describe '#publish_latest' do
+    it 'can correctly publish latest' do
+      message = MessageBus.track_publish("/latest") do
+        described_class.publish_latest(topic)
+      end.first
+
+      data = message.data
+
+      expect(data["topic_id"]).to eq(topic.id)
+      expect(data["message_type"]).to eq(described_class::LATEST_MESSAGE_TYPE)
+      expect(data["payload"]["archetype"]).to eq(Archetype.default)
+    end
+
+    describe 'private message' do
+      it 'should not publish any message' do
+        messages = MessageBus.track_publish do
+          described_class.publish_latest(private_message_topic)
+        end
+
+        expect(messages).to eq([])
+      end
+    end
+  end
+
+  describe '#publish_unread' do
+    it "can correctly publish unread" do
+      message = MessageBus.track_publish(described_class.unread_channel_key(post.user.id)) do
+        TopicTrackingState.publish_unread(post)
+      end.first
+
+      data = message.data
+
+      expect(data["topic_id"]).to eq(topic.id)
+      expect(data["message_type"]).to eq(described_class::UNREAD_MESSAGE_TYPE)
+      expect(data["payload"]["archetype"]).to eq(Archetype.default)
+    end
+
+    describe 'for a private message' do
+      before do
+        TopicUser.change(
+          private_message_topic.allowed_users.first.id,
+          private_message_topic.id,
+          notification_level: TopicUser.notification_levels[:tracking]
+        )
+      end
+
+      it 'should not publish any message' do
+        messages = MessageBus.track_publish do
+          TopicTrackingState.publish_unread(private_message_post)
+        end
+
+        expect(messages).to eq([])
+      end
+    end
+  end
+
+  describe '#publish_private_message' do
+    let!(:admin) { Fabricate(:admin) }
+
+    describe 'normal topic' do
+      it 'should publish the right message' do
+        allowed_users = private_message_topic.allowed_users
+
+        messages = MessageBus.track_publish do
+          TopicTrackingState.publish_private_message(private_message_topic)
+        end
+
+        expect(messages.count).to eq(1)
+
+        message = messages.first
+
+        expect(message.channel).to eq('/private-messages/inbox')
+        expect(message.data["topic_id"]).to eq(private_message_topic.id)
+        expect(message.user_ids).to eq(allowed_users.map(&:id))
+      end
+    end
+
+    describe 'topic with groups' do
+      let(:group1) { Fabricate(:group, users: [Fabricate(:user)]) }
+      let(:group2) { Fabricate(:group, users: [Fabricate(:user), Fabricate(:user)]) }
+
+      before do
+        [group1, group2].each do |group|
+          private_message_topic.allowed_groups << group
+        end
+      end
+
+      it "should publish the right message" do
+        messages = MessageBus.track_publish do
+          TopicTrackingState.publish_private_message(
+            private_message_topic
+          )
+        end
+
+        expect(messages.map(&:channel)).to contain_exactly(
+          '/private-messages/inbox',
+          "/private-messages/group/#{group1.name}",
+          "/private-messages/group/#{group2.name}"
+        )
+
+        message = messages.find do |message|
+          message.channel == '/private-messages/inbox'
+        end
+
+        expect(message.data["topic_id"]).to eq(private_message_topic.id)
+        expect(message.user_ids).to eq(private_message_topic.allowed_users.map(&:id))
+
+        [group1, group2].each do |group|
+          message = messages.find do |message|
+            message.channel == "/private-messages/group/#{group.name}"
+          end
+
+          expect(message.data["topic_id"]).to eq(private_message_topic.id)
+          expect(message.user_ids).to eq(group.users.map(&:id))
+        end
+      end
+
+      describe "archiving topic" do
+        it "should publish the right message" do
+          messages = MessageBus.track_publish do
+            TopicTrackingState.publish_private_message(
+              private_message_topic,
+              group_archive: true
+            )
+          end
+
+          expect(messages.map(&:channel)).to contain_exactly(
+            '/private-messages/inbox',
+            "/private-messages/group/#{group1.name}",
+            "/private-messages/group/#{group1.name}/archive",
+            "/private-messages/group/#{group2.name}",
+            "/private-messages/group/#{group2.name}/archive",
+          )
+
+          message = messages.find do |message|
+            message.channel == '/private-messages/inbox'
+          end
+
+          expect(message.data["topic_id"]).to eq(private_message_topic.id)
+          expect(message.user_ids).to eq(private_message_topic.allowed_users.map(&:id))
+
+          [group1, group2].each do |group|
+            group_channel = "/private-messages/group/#{group.name}"
+
+            [
+              group_channel,
+              "#{group_channel}/archive"
+            ].each do |channel|
+              message = messages.find do |message|
+                message.channel == channel
+              end
+
+              expect(message.data["topic_id"]).to eq(private_message_topic.id)
+              expect(message.user_ids).to eq(group.users.map(&:id))
+            end
+          end
+        end
+      end
+    end
+
+    describe 'topic with new post' do
+      let(:user) { private_message_topic.allowed_users.last }
+
+      let!(:post) do
+        Fabricate(:post,
+          topic: private_message_topic,
+          user: user
+        )
+      end
+
+      let!(:group) do
+        group = Fabricate(:group, users: [Fabricate(:user)])
+        private_message_topic.allowed_groups << group
+        group
+      end
+
+      it 'should publish the right message' do
+        messages = MessageBus.track_publish do
+          TopicTrackingState.publish_private_message(
+            private_message_topic,
+            post: post
+          )
+        end
+
+        expected_channels = [
+          '/private-messages/inbox',
+          '/private-messages/sent',
+          "/private-messages/group/#{group.name}"
+        ]
+
+        expect(messages.map(&:channel)).to contain_exactly(*expected_channels)
+
+        expected_channels.zip([
+          private_message_topic.allowed_users.map(&:id),
+          [user.id],
+          [group.users.first.id]
+        ]).each do |channel, user_ids|
+          message = messages.find do |message|
+            message.channel == channel
+          end
+
+          expect(message.data["topic_id"]).to eq(private_message_topic.id)
+          expect(message.user_ids).to eq(user_ids)
+        end
+      end
+    end
+
+    describe 'archived topic' do
+      it 'should publish the right message' do
+        messages = MessageBus.track_publish do
+          TopicTrackingState.publish_private_message(
+            private_message_topic,
+            archive_user_id: private_message_post.user_id,
+          )
+        end
+
+        expected_channels = [
+          "/private-messages/archive",
+          "/private-messages/inbox",
+          "/private-messages/sent",
+        ]
+
+        expect(messages.map(&:channel)).to eq(expected_channels)
+
+        expected_channels.each do |channel|
+          message = messages.find do |message|
+            message.channel = channel
+          end
+
+          expect(message.data["topic_id"]).to eq(private_message_topic.id)
+          expect(message.user_ids).to eq([private_message_post.user_id])
+        end
+      end
+    end
+
+    describe 'for a regular topic' do
+      it 'should not publish any message' do
+        topic.allowed_users << Fabricate(:user)
+
+        messages = MessageBus.track_publish do
+          TopicTrackingState.publish_private_message(topic)
+        end
+
+        expect(messages).to eq([])
+      end
+    end
   end
 
   it "correctly handles muted categories" do
diff --git a/spec/models/topic_user_spec.rb b/spec/models/topic_user_spec.rb
index 1c47b31a8b2..c0ed6c986ba 100644
--- a/spec/models/topic_user_spec.rb
+++ b/spec/models/topic_user_spec.rb
@@ -234,13 +234,63 @@ describe TopicUser do
     end
 
     context 'private messages' do
+      let(:target_user) { Fabricate(:user) }
+
+      let(:post) do
+        create_post(
+          archetype: Archetype.private_message,
+          target_usernames: target_user.username
+        );
+      end
+
+      let(:topic) { post.topic }
+
       it 'should ensure recepients and senders are watching' do
+        expect(TopicUser.get(topic, post.user).notification_level)
+          .to eq(TopicUser.notification_levels[:watching])
 
-        target_user = Fabricate(:user)
-        post = create_post(archetype: Archetype.private_message, target_usernames: target_user.username);
+        expect(TopicUser.get(topic, target_user).notification_level)
+          .to eq(TopicUser.notification_levels[:watching])
+      end
 
-        expect(TopicUser.get(post.topic, post.user).notification_level).to eq(TopicUser.notification_levels[:watching])
-        expect(TopicUser.get(post.topic, target_user).notification_level).to eq(TopicUser.notification_levels[:watching])
+      it 'should ensure invited user is watching once visited' do
+        another_user = Fabricate(:user)
+        topic.invite(target_user, another_user.username)
+        TopicUser.track_visit!(topic.id, another_user.id)
+
+        expect(TopicUser.get(topic, another_user).notification_level)
+          .to eq(TopicUser.notification_levels[:watching])
+
+        another_user = Fabricate(:user)
+        TopicUser.track_visit!(topic.id, another_user.id)
+
+        expect(TopicUser.get(topic, another_user).notification_level)
+          .to eq(TopicUser.notification_levels[:regular])
+      end
+
+      describe 'inviting a group' do
+        let(:group) do
+          Fabricate(:group,
+            default_notification_level: NotificationLevels.topic_levels[:tracking]
+          )
+        end
+
+        it "should use group's default notification level" do
+          another_user = Fabricate(:user)
+          group.add(another_user)
+          topic.invite_group(target_user, group)
+          TopicUser.track_visit!(topic.id, another_user.id)
+
+          expect(TopicUser.get(topic, another_user).notification_level)
+            .to eq(TopicUser.notification_levels[:tracking])
+
+          another_user = Fabricate(:user)
+          topic.invite(target_user, another_user.username)
+          TopicUser.track_visit!(topic.id, another_user.id)
+
+          expect(TopicUser.get(topic, another_user).notification_level)
+            .to eq(TopicUser.notification_levels[:watching])
+        end
       end
     end
 
@@ -387,6 +437,7 @@ describe TopicUser do
     it "will receive email notification for every topic" do
       user1 = Fabricate(:user)
 
+      SiteSetting.queue_jobs = false
       SiteSetting.default_email_mailing_list_mode = true
       SiteSetting.default_email_mailing_list_mode_frequency = 1
 
diff --git a/spec/models/translation_override_spec.rb b/spec/models/translation_override_spec.rb
index 9929d325f66..c6b214fac5e 100644
--- a/spec/models/translation_override_spec.rb
+++ b/spec/models/translation_override_spec.rb
@@ -46,11 +46,52 @@ describe TranslationOverride do
   end
 
   it "stores js for a message format key" do
-    TranslationOverride.upsert!('en', 'some.key_MF', '{NUM_RESULTS, plural, one {1 result} other {many} }')
+    TranslationOverride.upsert!('ru', 'some.key_MF', '{NUM_RESULTS, plural, one {1 result} other {many} }')
 
-    ovr = TranslationOverride.where(locale: 'en', translation_key: 'some.key_MF').first
+    ovr = TranslationOverride.where(locale: 'ru', translation_key: 'some.key_MF').first
     expect(ovr).to be_present
-    expect(ovr.compiled_js).to match(/function/)
+    expect(ovr.compiled_js).to start_with('function')
+    expect(ovr.compiled_js).to_not match(/Invalid Format/i)
   end
 
+  context "site cache" do
+    def cached_value(guardian, types_name, name_key, attribute)
+      json = Site.json_for(guardian)
+
+      JSON.parse(json)[types_name]
+        .find { |x| x['name_key'] == name_key }[attribute]
+    end
+
+    shared_examples "resets site text" do
+      it "resets the site cache when translations of post_action_types are changed" do
+        anon_guardian = Guardian.new
+        user_guardian = Guardian.new(Fabricate(:user))
+        original_value = I18n.t(translation_key)
+        types_name, name_key, attribute = translation_key.split('.')
+
+        expect(cached_value(user_guardian, types_name, name_key, attribute)).to eq(original_value)
+        expect(cached_value(anon_guardian, types_name, name_key, attribute)).to eq(original_value)
+
+        TranslationOverride.upsert!('en', translation_key, 'bar')
+        expect(cached_value(user_guardian, types_name, name_key, attribute)).to eq('bar')
+        expect(cached_value(anon_guardian, types_name, name_key, attribute)).to eq('bar')
+
+        TranslationOverride.revert!('en', translation_key)
+        expect(cached_value(user_guardian, types_name, name_key, attribute)).to eq(original_value)
+        expect(cached_value(anon_guardian, types_name, name_key, attribute)).to eq(original_value)
+      end
+    end
+
+    context "post_action_types" do
+      let(:translation_key) { 'post_action_types.off_topic.description' }
+
+      include_examples "resets site text"
+    end
+
+    context "topic_flag_types" do
+      let(:translation_key) { 'topic_flag_types.spam.description' }
+
+      include_examples "resets site text"
+    end
+  end
 end
diff --git a/spec/models/trust_level3_requirements_spec.rb b/spec/models/trust_level3_requirements_spec.rb
index 1c99fd9ee9b..b2d9c580f8d 100644
--- a/spec/models/trust_level3_requirements_spec.rb
+++ b/spec/models/trust_level3_requirements_spec.rb
@@ -4,6 +4,7 @@ describe TrustLevel3Requirements do
 
   let(:user) { Fabricate.build(:user) }
   subject(:tl3_requirements) { described_class.new(user) }
+  let(:moderator) { Fabricate(:moderator) }
 
   before do
     described_class.clear_cache
@@ -14,6 +15,44 @@ describe TrustLevel3Requirements do
   end
 
   describe "requirements" do
+
+    describe "penalty_counts" do
+
+      it "returns if the user has ever been silenced" do
+        expect(tl3_requirements.penalty_counts.silenced).to eq(0)
+        expect(tl3_requirements.penalty_counts.total).to eq(0)
+        UserSilencer.new(user, moderator).silence
+        expect(tl3_requirements.penalty_counts.silenced).to eq(1)
+        expect(tl3_requirements.penalty_counts.total).to eq(1)
+        UserSilencer.new(user, moderator).unsilence
+        expect(tl3_requirements.penalty_counts.silenced).to eq(0)
+        expect(tl3_requirements.penalty_counts.total).to eq(0)
+      end
+
+      it "returns if the user has ever been suspended" do
+        user.save!
+
+        expect(tl3_requirements.penalty_counts.suspended).to eq(0)
+        expect(tl3_requirements.penalty_counts.total).to eq(0)
+
+        UserHistory.create!(
+          target_user_id: user.id,
+          action: UserHistory.actions[:suspend_user]
+        )
+
+        expect(tl3_requirements.penalty_counts.suspended).to eq(1)
+        expect(tl3_requirements.penalty_counts.total).to eq(1)
+
+        UserHistory.create!(
+          target_user_id: user.id,
+          action: UserHistory.actions[:unsuspend_user]
+        )
+
+        expect(tl3_requirements.penalty_counts.suspended).to eq(0)
+        expect(tl3_requirements.penalty_counts.total).to eq(0)
+      end
+    end
+
     it "time_period uses site setting" do
       SiteSetting.tl3_time_period = 80
       expect(tl3_requirements.time_period).to eq(80)
@@ -357,7 +396,24 @@ describe TrustLevel3Requirements do
     end
 
     it "are not met if suspended" do
-      user.stubs(:suspended?).returns(true)
+      user.suspended_till = 3.weeks.from_now
+      expect(tl3_requirements.requirements_met?).to eq(false)
+    end
+
+    it "are not met if silenced" do
+      user.silenced_till = 3.weeks.from_now
+      expect(tl3_requirements.requirements_met?).to eq(false)
+    end
+
+    it "are not met if previously silenced" do
+      user.save
+      UserHistory.create(target_user_id: user.id, action: UserHistory.actions[:silence_user])
+      expect(tl3_requirements.requirements_met?).to eq(false)
+    end
+
+    it "are not met if previously suspended" do
+      user.save
+      UserHistory.create(target_user_id: user.id, action: UserHistory.actions[:suspend_user])
       expect(tl3_requirements.requirements_met?).to eq(false)
     end
 
@@ -372,7 +428,12 @@ describe TrustLevel3Requirements do
     end
 
     it "are lost if suspended" do
-      user.stubs(:suspended?).returns(true)
+      user.suspended_till = 4.weeks.from_now
+      expect(tl3_requirements.requirements_lost?).to eq(true)
+    end
+
+    it "are lost if silenced" do
+      user.silenced_till = 4.weeks.from_now
       expect(tl3_requirements.requirements_lost?).to eq(true)
     end
   end
diff --git a/spec/models/upload_spec.rb b/spec/models/upload_spec.rb
index b8803fda54a..32b86bbc182 100644
--- a/spec/models/upload_spec.rb
+++ b/spec/models/upload_spec.rb
@@ -87,6 +87,8 @@ describe Upload do
 
     it "doesn't blow up with an invalid URI" do
       expect { Upload.get_from_url("http://ip:port/index.html") }.not_to raise_error
+      expect { Upload.get_from_url("mailto:admin%40example.com") }.not_to raise_error
+      expect { Upload.get_from_url("mailto:example") }.not_to raise_error
     end
 
     describe "s3 store" do
@@ -111,6 +113,22 @@ describe Upload do
 
         expect(Upload.get_from_url(URI.join(s3_cdn_url, path).to_s)).to eq(upload)
       end
+
+      it "should return the right upload when using one CDN for both s3 and assets" do
+        begin
+          original_asset_host = Rails.configuration.action_controller.asset_host
+          cdn_url = 'http://my.cdn.com'
+          Rails.configuration.action_controller.asset_host = cdn_url
+          SiteSetting.s3_cdn_url = cdn_url
+          upload
+
+          expect(Upload.get_from_url(
+            URI.join(cdn_url, path).to_s
+          )).to eq(upload)
+        ensure
+          Rails.configuration.action_controller.asset_host = original_asset_host
+        end
+      end
     end
   end
 
diff --git a/spec/models/user_action_spec.rb b/spec/models/user_action_spec.rb
index d76d6afad61..6ab8a1537ab 100644
--- a/spec/models/user_action_spec.rb
+++ b/spec/models/user_action_spec.rb
@@ -9,7 +9,7 @@ describe UserAction do
   it { is_expected.to validate_presence_of :action_type }
   it { is_expected.to validate_presence_of :user_id }
 
-  describe 'lists' do
+  describe '#stream' do
 
     let(:public_post) { Fabricate(:post) }
     let(:public_topic) { public_post.topic }
@@ -46,8 +46,8 @@ describe UserAction do
         UserAction.stats(user.id, Guardian.new(viewer)).map { |r| r["action_type"].to_i }.sort
       end
 
-      def stream_count(viewer = nil)
-        UserAction.stream(user_id: user.id, guardian: Guardian.new(viewer)).count
+      def stream(viewer = nil)
+        UserAction.stream(user_id: user.id, guardian: Guardian.new(viewer))
       end
 
       it 'includes the events correctly' do
@@ -56,38 +56,38 @@ describe UserAction do
         mystats = stats_for_user(user)
         expecting = [UserAction::NEW_TOPIC, UserAction::NEW_PRIVATE_MESSAGE, UserAction::GOT_PRIVATE_MESSAGE, UserAction::BOOKMARK].sort
         expect(mystats).to eq(expecting)
-        expect(stream_count(user)).to eq(4)
+
+        expect(stream(user).map(&:action_type))
+          .to contain_exactly(*expecting)
 
         other_stats = stats_for_user
         expecting = [UserAction::NEW_TOPIC]
-        expect(stream_count).to eq(1)
-
+        expect(stream.map(&:action_type)).to contain_exactly(*expecting)
         expect(other_stats).to eq(expecting)
 
         public_topic.trash!(user)
         expect(stats_for_user).to eq([])
-        expect(stream_count).to eq(0)
+        expect(stream).to eq([])
 
         # groups
         category = Fabricate(:category, read_restricted: true)
 
         public_topic.recover!
-        public_topic.category = category
-        public_topic.save
+        public_topic.update!(category: category)
 
         expect(stats_for_user).to eq([])
-        expect(stream_count).to eq(0)
+        expect(stream).to eq([])
 
         group = Fabricate(:group)
         u = Fabricate(:coding_horror)
         group.add(u)
-        group.save
 
         category.set_permissions(group => :full)
-        category.save
+        category.save!
 
-        expect(stats_for_user(u)).to eq([UserAction::NEW_TOPIC])
-        expect(stream_count(u)).to eq(1)
+        expecting = [UserAction::NEW_TOPIC]
+        expect(stats_for_user(u)).to eq(expecting)
+        expect(stream(u).map(&:action_type)).to contain_exactly(*expecting)
 
         # duplicate should not exception out
         log_test_action
@@ -103,6 +103,29 @@ describe UserAction do
       end
     end
 
+    describe 'assignments' do
+      let(:stream) do
+        UserAction.stream(user_id: user.id, guardian: Guardian.new(user))
+      end
+
+      before do
+        log_test_action(action_type: UserAction::ASSIGNED)
+        private_post.custom_fields ||= {}
+        private_post.custom_fields["action_code_who"] = 'testing'
+        private_post.custom_fields["random_field"] = 'random_value'
+        private_post.save!
+      end
+
+      it 'should include the right attributes in the stream' do
+        expect(stream.count).to eq(1)
+
+        user_action_row = stream.first
+
+        expect(user_action_row.action_type).to eq(UserAction::ASSIGNED)
+        expect(user_action_row.action_code_who).to eq('testing')
+      end
+    end
+
     describe "mentions" do
       before do
         log_test_action(action_type: UserAction::MENTION)
@@ -116,7 +139,8 @@ describe UserAction do
       end
 
       it "is returned by the stream" do
-        expect(stream).to be_present
+        expect(stream.count).to eq(1)
+        expect(stream.first.action_type).to eq(UserAction::MENTION)
       end
 
       it "isn't returned when mentions aren't enabled" do
@@ -127,10 +151,6 @@ describe UserAction do
 
   end
 
-  describe "mentions" do
-    it "returns the mention in the stream" do
-    end
-  end
   describe 'when user likes' do
 
     let(:post) { Fabricate(:post) }
diff --git a/spec/models/user_archived_message_spec.rb b/spec/models/user_archived_message_spec.rb
index 060a097de82..73f1a3e2601 100644
--- a/spec/models/user_archived_message_spec.rb
+++ b/spec/models/user_archived_message_spec.rb
@@ -10,11 +10,11 @@ describe UserArchivedMessage do
                         target_usernames: [user2.username, user.username].join(","),
                         archetype: Archetype.private_message).topic
 
-    UserArchivedMessage.archive!(user.id, topic.id)
+    UserArchivedMessage.archive!(user.id, topic)
     expect(topic.message_archived?(user)).to eq(true)
 
     TopicUser.change(user.id, topic.id, notification_level: TopicUser.notification_levels[:muted])
-    UserArchivedMessage.move_to_inbox!(user.id, topic.id)
+    UserArchivedMessage.move_to_inbox!(user.id, topic)
     expect(topic.message_archived?(user)).to eq(true)
   end
 end
diff --git a/spec/models/user_auth_token_spec.rb b/spec/models/user_auth_token_spec.rb
index ffe003c43d5..e9f8923522b 100644
--- a/spec/models/user_auth_token_spec.rb
+++ b/spec/models/user_auth_token_spec.rb
@@ -31,7 +31,7 @@ describe UserAuthToken do
 
   end
 
-  it "can lookup both hashed and unhashed" do
+  it "can lookup hashed" do
     user = Fabricate(:user)
 
     token = UserAuthToken.generate!(user_id: user.id,
@@ -45,12 +45,6 @@ describe UserAuthToken do
     lookup_token = UserAuthToken.lookup(token.auth_token)
 
     expect(lookup_token).to eq(nil)
-
-    token.update_columns(legacy: true)
-
-    lookup_token = UserAuthToken.lookup(token.auth_token)
-
-    expect(user.id).to eq(lookup_token.user.id)
   end
 
   it "can validate token was seen at lookup time" do
diff --git a/spec/models/user_avatar_spec.rb b/spec/models/user_avatar_spec.rb
index e76da538077..75f31ac8db8 100644
--- a/spec/models/user_avatar_spec.rb
+++ b/spec/models/user_avatar_spec.rb
@@ -46,8 +46,11 @@ describe UserAvatar do
 
     describe 'when avatar url returns an invalid status code' do
       it 'should not do anything' do
+        stub_request(:get, "http://thisfakesomething.something.com/")
+          .to_return(status: 500, body: "", headers: {})
+
         url = "http://thisfakesomething.something.com/"
-        stub_request(:head, url).to_return(status: 404)
+
         UserAvatar.import_url_for_user(url, user)
 
         user.reload
diff --git a/spec/models/user_profile_spec.rb b/spec/models/user_profile_spec.rb
index 0fffc455aaa..ee05902c3ec 100644
--- a/spec/models/user_profile_spec.rb
+++ b/spec/models/user_profile_spec.rb
@@ -71,6 +71,13 @@ describe UserProfile do
         user_profile.website = "http://discourse.org"
         expect(user_profile).to be_valid
       end
+
+      it "doesn't blow up with an invalid URI" do
+        SiteSetting.user_website_domains_whitelist = "discourse.org"
+
+        user_profile.website = 'user - https://forum.example.com/user'
+        expect { user_profile.save! }.to raise_error(ActiveRecord::RecordInvalid)
+      end
     end
 
     describe 'after save' do
@@ -118,7 +125,8 @@ describe UserProfile do
     end
 
     it 'supports emoji images' do
-      expect(user.user_profile.bio_excerpt(500, keep_emoji_images: true)).to eq("hello <img src=\"/uploads/default/original/1X/f588830852fc8091a094cf0be0be0e6559dc8304.png?v=5\" title=\":test:\" class=\"emoji emoji-custom\" alt=\":test:\"> <img src=\"/images/emoji/twitter/woman_scientist/5.png?v=5\" title=\":woman_scientist:t5:\" class=\"emoji\" alt=\":woman_scientist:t5:\"> <img src=\"/images/emoji/twitter/thinking.png?v=5\" title=\":thinking:\" class=\"emoji\" alt=\":thinking:\">")
+
+      expect(user.user_profile.bio_excerpt(500, keep_emoji_images: true)).to eq("hello <img src=\"/uploads/default/original/1X/#{Upload.find(1).sha1}.png?v=5\" title=\":test:\" class=\"emoji emoji-custom\" alt=\":test:\"> <img src=\"/images/emoji/twitter/woman_scientist/5.png?v=5\" title=\":woman_scientist:t5:\" class=\"emoji\" alt=\":woman_scientist:t5:\"> <img src=\"/images/emoji/twitter/thinking.png?v=5\" title=\":thinking:\" class=\"emoji\" alt=\":thinking:\">")
     end
   end
 
@@ -201,4 +209,39 @@ describe UserProfile do
       end
     end
   end
+
+  context '.import_url_for_user' do
+    let(:user) { Fabricate(:user) }
+
+    before do
+      stub_request(:any, "thisfakesomething.something.com")
+        .to_return(body: "abc", status: 404, headers: { 'Content-Length' => 3 })
+    end
+
+    describe 'when profile_background_url returns an invalid status code' do
+      it 'should not do anything' do
+        url = "http://thisfakesomething.something.com/"
+
+        UserProfile.import_url_for_user(url, user, is_card_background: false)
+
+        user.reload
+
+        expect(user.user_profile.profile_background).to eq(nil)
+      end
+    end
+
+    describe 'when card_background_url returns an invalid status code' do
+      it 'should not do anything' do
+        url = "http://thisfakesomething.something.com/"
+
+        UserProfile.import_url_for_user(url, user, is_card_background: true)
+
+        user.reload
+
+        expect(user.user_profile.card_background).to eq(nil)
+      end
+    end
+
+  end
+
 end
diff --git a/spec/models/user_profile_view_spec.rb b/spec/models/user_profile_view_spec.rb
index de82b167c75..75c235a3b23 100644
--- a/spec/models/user_profile_view_spec.rb
+++ b/spec/models/user_profile_view_spec.rb
@@ -28,12 +28,13 @@ RSpec.describe UserProfileView do
     end
   end
 
-  it "should not create duplicated profile view for signed in user" do
+  it "should not create duplicated profile view or log IP for signed in user" do
     time = Time.zone.now
 
     ['1.1.1.1', '2.2.2.2'].each do |ip|
       add(user_profile_id, ip, other_user.id, time)
       expect(described_class.count).to eq(1)
+      expect(UserProfileView.find_by(user_id: other_user.id).ip_address).to eq(nil)
     end
   end
 
diff --git a/spec/models/user_second_factor_spec.rb b/spec/models/user_second_factor_spec.rb
new file mode 100644
index 00000000000..2a61b064222
--- /dev/null
+++ b/spec/models/user_second_factor_spec.rb
@@ -0,0 +1,9 @@
+require 'rails_helper'
+
+RSpec.describe UserSecondFactor do
+  describe '.methods' do
+    it 'should retain the right order' do
+      expect(described_class.methods[:totp]).to eq(1)
+    end
+  end
+end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index d057e042c33..55ce4646d99 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -5,10 +5,36 @@ describe User do
   let(:user) { Fabricate(:user) }
 
   context 'validations' do
-    it { is_expected.to validate_presence_of :username }
-    it { is_expected.to validate_presence_of :primary_email }
+    describe '#username' do
+      it { is_expected.to validate_presence_of :username }
+
+      describe 'when username already exists' do
+        it 'should not be valid' do
+          new_user = Fabricate.build(:user, username: user.username.upcase)
+
+          expect(new_user).to_not be_valid
+
+          expect(new_user.errors.full_messages.first)
+            .to include(I18n.t(:'user.username.unique'))
+        end
+      end
+
+      describe 'when group with a same name already exists' do
+        it 'should not be valid' do
+          group = Fabricate(:group)
+          new_user = Fabricate.build(:user, username: group.name.upcase)
+
+          expect(new_user).to_not be_valid
+
+          expect(new_user.errors.full_messages.first)
+            .to include(I18n.t(:'user.username.unique'))
+        end
+      end
+    end
 
     describe 'emails' do
+      it { is_expected.to validate_presence_of :primary_email }
+
       let(:user) { Fabricate.build(:user) }
 
       describe 'when record has a valid email' do
@@ -28,6 +54,19 @@ describe User do
         end
       end
 
+      describe 'when record has an email that as already been taken' do
+        it 'should not be valid' do
+          user2 = Fabricate(:user)
+          user.email = user2.email.upcase
+
+          expect(user).to_not be_valid
+
+          expect(user.errors.messages[:primary_email]).to include(I18n.t(
+            'activerecord.errors.messages.taken'
+          ))
+        end
+      end
+
       describe 'when user is staged' do
         it 'should still validate presence of primary_email' do
           user.staged = true
@@ -37,13 +76,25 @@ describe User do
           expect(user.errors.messages).to include(:primary_email)
         end
       end
+
+      describe 'when primary_email is being reassigned to another user' do
+        it "should not be valid" do
+          user2 = Fabricate.build(:user, email: nil)
+          user.save!
+          user2.primary_email = user.primary_email
+
+          expect(user2).to_not be_valid
+          expect(user2.errors.messages).to include(:primary_email)
+          expect(user2.primary_email.errors.messages).to include(:user_id)
+        end
+      end
     end
   end
 
   describe '#count_by_signup_date' do
     before(:each) do
       User.destroy_all
-      freeze_time
+      freeze_time DateTime.parse('2017-02-01 12:00')
       Fabricate(:user)
       Fabricate(:user, created_at: 1.day.ago)
       Fabricate(:user, created_at: 1.day.ago)
@@ -372,9 +423,10 @@ describe User do
       GoogleUserInfo.create(user_id: user.id, email: "sam@sam.com", google_user_id: 1)
       GithubUserInfo.create(user_id: user.id, screen_name: "sam", github_user_id: 1)
       Oauth2UserInfo.create(user_id: user.id, provider: "linkedin", email: "sam@sam.com", uid: 1)
+      InstagramUserInfo.create(user_id: user.id, screen_name: "sam", instagram_user_id: "examplel123123")
 
       user.reload
-      expect(user.associated_accounts).to eq("Twitter(sam), Facebook(sam), Google(sam@sam.com), Github(sam), linkedin(sam@sam.com)")
+      expect(user.associated_accounts).to eq("Twitter(sam), Facebook(sam), Google(sam@sam.com), GitHub(sam), Instagram(sam), linkedin(sam@sam.com)")
 
     end
   end
@@ -397,6 +449,14 @@ describe User do
     it 'is able to guess a decent name from an email' do
       expect(User.suggest_name('sam.saffron@gmail.com')).to eq('Sam Saffron')
     end
+
+    it 'is able to guess a decent name from username' do
+      expect(User.suggest_name('@sam.saffron')).to eq('Sam Saffron')
+    end
+
+    it 'is able to guess a decent name from name' do
+      expect(User.suggest_name('sam saffron')).to eq('Sam Saffron')
+    end
   end
 
   describe 'username format' do
@@ -494,6 +554,11 @@ describe User do
       user = Fabricate(:user, email: "bar@foo.com")
       expect(User.username_available?(user.username, user.primary_email.email)).to eq(false)
     end
+
+    it 'returns false when a username equals an existing group name' do
+      Fabricate(:group, name: 'foo')
+      expect(User.username_available?('Foo')).to eq(false)
+    end
   end
 
   describe '.reserved_username?' do
@@ -1001,6 +1066,7 @@ describe User do
 
       context "with a reply" do
         before do
+          SiteSetting.queue_jobs = false
           PostCreator.new(Fabricate(:user),
                             raw: 'whatever this is a raw post',
                             topic_id: topic.id,
@@ -1172,7 +1238,6 @@ describe User do
   describe "refresh_avatar" do
     it "enqueues the update_gravatar job when automatically downloading gravatars" do
       SiteSetting.automatically_download_gravatars = true
-      SiteSetting.queue_jobs = true
 
       user = Fabricate(:user)
 
@@ -1184,24 +1249,28 @@ describe User do
 
   describe "#purge_unactivated" do
     let!(:user) { Fabricate(:user) }
-    let!(:inactive) { Fabricate(:user, active: false) }
-    let!(:inactive_old) { Fabricate(:user, active: false, created_at: 1.month.ago) }
+    let!(:unactivated) { Fabricate(:user, active: false) }
+    let!(:unactivated_old) { Fabricate(:user, active: false, created_at: 1.month.ago) }
+    let!(:unactivated_old_with_pm) { Fabricate(:user, active: false, created_at: 2.months.ago) }
+
+    before do
+      PostCreator.new(Discourse.system_user,
+        title: "Welcome to our Discourse",
+        raw: "This is a welcome message",
+        archetype: Archetype.private_message,
+        target_usernames: [unactivated_old_with_pm.username],
+      ).create
+    end
 
     it 'should only remove old, unactivated users' do
       User.purge_unactivated
-      all_users = User.all
-      expect(all_users.include?(user)).to eq(true)
-      expect(all_users.include?(inactive)).to eq(true)
-      expect(all_users.include?(inactive_old)).to eq(false)
+      expect(User.real.all).to match_array([user, unactivated, unactivated_old_with_pm])
     end
 
     it "does nothing if purge_unactivated_users_grace_period_days is 0" do
       SiteSetting.purge_unactivated_users_grace_period_days = 0
       User.purge_unactivated
-      all_users = User.all
-      expect(all_users.include?(user)).to eq(true)
-      expect(all_users.include?(inactive)).to eq(true)
-      expect(all_users.include?(inactive_old)).to eq(true)
+      expect(User.real.all).to match_array([user, unactivated, unactivated_old, unactivated_old_with_pm])
     end
   end
 
@@ -1262,6 +1331,14 @@ describe User do
       expect(group_history.target_user).to eq(user)
     end
 
+    it "is automatically added to a group when the email matches the SSO record" do
+      user = Fabricate(:user, active: true, email: "sso@bar.com")
+      user.create_single_sign_on_record(external_id: 123, external_email: "sso@bar.com", last_payload: "")
+      user.set_automatic_groups
+      group.reload
+      expect(group.users.include?(user)).to eq(true)
+    end
+
     it "get attributes from the group" do
       user = Fabricate.build(:user,
         active: true,
@@ -1354,7 +1431,7 @@ describe User do
 
     before do
       SiteSetting.default_email_digest_frequency = 1440 # daily
-      SiteSetting.default_email_private_messages = false
+      SiteSetting.default_email_personal_messages = false
       SiteSetting.default_email_direct = false
       SiteSetting.default_email_mailing_list_mode = true
       SiteSetting.default_email_always = true
@@ -1466,7 +1543,7 @@ describe User do
 
     describe 'when user is an old user' do
       it 'should return the right value' do
-        user.update_attributes!(created_at: 1.year.ago)
+        user.update_attributes!(first_seen_at: 1.year.ago)
 
         expect(user.read_first_notification?).to eq(true)
       end
@@ -1568,4 +1645,103 @@ describe User do
     end
   end
 
+  describe "#unstage" do
+    let!(:staged_user) { Fabricate(:staged, email: 'staged@account.com', active: true, username: 'staged1', name: 'Stage Name') }
+    let(:params) { { email: 'staged@account.com', active: true, username: 'unstaged1', name: 'Foo Bar' } }
+
+    it "correctyl unstages a user" do
+      user = User.unstage(params)
+
+      expect(user.id).to eq(staged_user.id)
+      expect(user.username).to eq('unstaged1')
+      expect(user.name).to eq('Foo Bar')
+      expect(user.active).to eq(false)
+      expect(user.email).to eq('staged@account.com')
+    end
+
+    it "returns nil when the user cannot be unstaged" do
+      Fabricate(:coding_horror)
+      expect(User.unstage(email: 'jeff@somewhere.com')).to be_nil
+      expect(User.unstage(email: 'no@account.com')).to be_nil
+    end
+
+    it "removes all previous notifications during unstaging" do
+      Fabricate(:notification, user: user)
+      Fabricate(:private_message_notification, user: user)
+      user.reload
+
+      expect(user.total_unread_notifications).to eq(2)
+      user = User.unstage(params)
+      expect(user.total_unread_notifications).to eq(0)
+    end
+
+    it "triggers an event" do
+      unstaged_user = nil
+      event = DiscourseEvent.track_events { unstaged_user = User.unstage(params) }.first
+
+      expect(event[:event_name]).to eq(:user_unstaged)
+      expect(event[:params].first).to eq(unstaged_user)
+    end
+  end
+
+  describe "#activate" do
+    let!(:inactive) { Fabricate(:user, active: false) }
+
+    it 'confirms email token and activates user' do
+      inactive.activate
+      inactive.reload
+      expect(inactive.email_confirmed?).to eq(true)
+      expect(inactive.active).to eq(true)
+    end
+
+    it 'activates user even if email token is already confirmed' do
+      token = inactive.email_tokens.find_by(email: inactive.email)
+      token.update_column(:confirmed, true)
+      inactive.activate
+      expect(inactive.active).to eq(true)
+    end
+  end
+
+  def filter_by(method)
+    username = 'someuniqueusername'
+    user.update!(username: username)
+
+    username2 = 'awesomeusername'
+    user2 = Fabricate(:user, username: username2)
+
+    expect(User.public_send(method, username))
+      .to eq([user])
+
+    expect(User.public_send(method, 'UNiQuE'))
+      .to eq([user])
+
+    expect(User.public_send(method, [username, username2]))
+      .to contain_exactly(user, user2)
+
+    expect(User.public_send(method, ['UNiQuE', 'sOME']))
+      .to contain_exactly(user, user2)
+  end
+
+  describe '#filter_by_username' do
+    it 'should be able to filter by username' do
+      filter_by(:filter_by_username)
+    end
+  end
+
+  describe '#filter_by_username_or_email' do
+    it 'should be able to filter by email' do
+      email = 'veryspecialtest@discourse.org'
+      user.update!(email: email)
+
+      expect(User.filter_by_username_or_email(email))
+        .to eq([user])
+
+      expect(User.filter_by_username_or_email('veryspeCiaLtest'))
+        .to eq([user])
+    end
+
+    it 'should be able to filter by username' do
+      filter_by(:filter_by_username_or_email)
+    end
+  end
 end
diff --git a/spec/models/user_stat_spec.rb b/spec/models/user_stat_spec.rb
index ccb9638d7a7..43e73819a14 100644
--- a/spec/models/user_stat_spec.rb
+++ b/spec/models/user_stat_spec.rb
@@ -77,22 +77,26 @@ describe UserStat do
     let(:stat) { user.user_stat }
 
     it 'makes no changes if nothing is cached' do
-      stat.expects(:last_seen_cached).returns(nil)
+      $redis.del(UserStat.last_seen_key(user.id))
       stat.update_time_read!
       stat.reload
       expect(stat.time_read).to eq(0)
     end
 
     it 'makes a change if time read is below threshold' do
-      stat.expects(:last_seen_cached).returns(Time.now - 10)
+      freeze_time
+      UserStat.cache_last_seen(user.id, (Time.now - 10).to_f)
       stat.update_time_read!
       stat.reload
       expect(stat.time_read).to eq(10)
     end
 
     it 'makes no change if time read is above threshold' do
+      freeze_time
+
       t = Time.now - 1 - UserStat::MAX_TIME_READ_DIFF
-      stat.expects(:last_seen_cached).returns(t)
+      UserStat.cache_last_seen(user.id, t.to_f)
+
       stat.update_time_read!
       stat.reload
       expect(stat.time_read).to eq(0)
diff --git a/spec/models/watched_word_spec.rb b/spec/models/watched_word_spec.rb
index 7bc52d47e5e..f4cc34bc102 100644
--- a/spec/models/watched_word_spec.rb
+++ b/spec/models/watched_word_spec.rb
@@ -11,8 +11,8 @@ describe WatchedWord do
     expect(described_class.count).to eq(1)
   end
 
-  it "downcases words" do
-    expect(described_class.create(word: "ShooT").word).to eq('shoot')
+  it "doesn't downcase words" do
+    expect(described_class.create(word: "ShooT").word).to eq('ShooT')
   end
 
   it "strips leading and trailing spaces" do
diff --git a/spec/models/web_crawler_request_spec.rb b/spec/models/web_crawler_request_spec.rb
new file mode 100644
index 00000000000..03f8da5a866
--- /dev/null
+++ b/spec/models/web_crawler_request_spec.rb
@@ -0,0 +1,114 @@
+require 'rails_helper'
+
+describe WebCrawlerRequest do
+  before do
+    WebCrawlerRequest.last_flush = Time.now.utc
+    WebCrawlerRequest.clear_cache!
+  end
+
+  after do
+    WebCrawlerRequest.clear_cache!
+  end
+
+  def inc(user_agent, opts = nil)
+    WebCrawlerRequest.increment!(user_agent, opts)
+  end
+
+  def disable_date_flush!
+    freeze_time(Time.now)
+    WebCrawlerRequest.last_flush = Time.now.utc
+  end
+
+  def web_crawler_request(user_agent)
+    WebCrawlerRequest.where(user_agent: user_agent).first
+  end
+
+  it 'works even if redis is in readonly' do
+    disable_date_flush!
+
+    inc('Googlebot')
+    inc('Googlebot')
+
+    $redis.without_namespace.stubs(:incr).raises(Redis::CommandError.new("READONLY"))
+    $redis.without_namespace.stubs(:eval).raises(Redis::CommandError.new("READONLY"))
+
+    inc('Googlebot', autoflush: 3)
+    WebCrawlerRequest.write_cache!
+
+    $redis.without_namespace.unstub(:incr)
+    $redis.without_namespace.unstub(:eval)
+
+    inc('Googlebot', autoflush: 3)
+    expect(web_crawler_request('Googlebot').count).to eq(3)
+  end
+
+  it 'logs nothing for an unflushed increment' do
+    WebCrawlerRequest.increment!('Googlebot')
+    expect(WebCrawlerRequest.count).to eq(0)
+  end
+
+  it 'can automatically flush' do
+    disable_date_flush!
+
+    inc('Googlebot', autoflush: 3)
+    expect(web_crawler_request('Googlebot')).to_not be_present
+    expect(WebCrawlerRequest.count).to eq(0)
+    inc('Googlebot', autoflush: 3)
+    expect(web_crawler_request('Googlebot')).to_not be_present
+    inc('Googlebot', autoflush: 3)
+    expect(web_crawler_request('Googlebot').count).to eq(3)
+    expect(WebCrawlerRequest.count).to eq(1)
+
+    3.times { inc('Googlebot', autoflush: 3) }
+    expect(web_crawler_request('Googlebot').count).to eq(6)
+    expect(WebCrawlerRequest.count).to eq(1)
+  end
+
+  it 'can flush based on time' do
+    t1 = Time.now.utc.at_midnight
+    freeze_time(t1)
+    WebCrawlerRequest.write_cache!
+    inc('Googlebot')
+    expect(WebCrawlerRequest.count).to eq(0)
+
+    freeze_time(t1 + WebCrawlerRequest.autoflush_seconds + 1)
+    inc('Googlebot')
+
+    expect(WebCrawlerRequest.count).to eq(1)
+  end
+
+  it 'flushes yesterdays results' do
+    t1 = Time.now.utc.at_midnight
+    freeze_time(t1)
+    inc('Googlebot')
+    freeze_time(t1.tomorrow)
+    inc('Googlebot')
+
+    WebCrawlerRequest.write_cache!
+    expect(WebCrawlerRequest.count).to eq(2)
+  end
+
+  it 'clears cache correctly' do
+    inc('Googlebot')
+    inc('Twitterbot')
+    WebCrawlerRequest.clear_cache!
+    WebCrawlerRequest.write_cache!
+
+    expect(WebCrawlerRequest.count).to eq(0)
+  end
+
+  it 'logs a few counts once flushed' do
+    time = Time.now.at_midnight
+    freeze_time(time)
+
+    3.times { inc('Googlebot') }
+    2.times { inc('Twitterbot') }
+    4.times { inc('Bingbot') }
+
+    WebCrawlerRequest.write_cache!
+
+    expect(web_crawler_request('Googlebot').count).to eq(3)
+    expect(web_crawler_request('Twitterbot').count).to eq(2)
+    expect(web_crawler_request('Bingbot').count).to eq(4)
+  end
+end
diff --git a/spec/models/web_hook_spec.rb b/spec/models/web_hook_spec.rb
index dbb53ca8371..d37e10b8bea 100644
--- a/spec/models/web_hook_spec.rb
+++ b/spec/models/web_hook_spec.rb
@@ -42,69 +42,72 @@ describe WebHook do
       expect(post_hook.payload_url).to eq("https://example.com")
     end
 
-    describe '#find_by_type' do
+    describe '#active_web_hooks' do
       it "returns unique hooks" do
         post_hook.web_hook_event_types << WebHookEventType.find_by(name: 'topic')
         post_hook.update!(wildcard_web_hook: true)
 
-        expect(WebHook.find_by_type(:post)).to eq([post_hook])
+        expect(WebHook.active_web_hooks(:post)).to eq([post_hook])
       end
 
       it 'find relevant hooks' do
-        expect(WebHook.find_by_type(:post)).to eq([post_hook])
-        expect(WebHook.find_by_type(:topic)).to eq([topic_hook])
+        expect(WebHook.active_web_hooks(:post)).to eq([post_hook])
+        expect(WebHook.active_web_hooks(:topic)).to eq([topic_hook])
       end
 
       it 'excludes inactive hooks' do
-        post_hook.update_attributes!(active: false)
+        post_hook.update!(active: false)
 
-        expect(WebHook.find_by_type(:post)).to eq([])
-        expect(WebHook.find_by_type(:topic)).to eq([topic_hook])
+        expect(WebHook.active_web_hooks(:post)).to eq([])
+        expect(WebHook.active_web_hooks(:topic)).to eq([topic_hook])
+      end
+
+      describe 'wildcard web hooks' do
+        let!(:wildcard_hook) { Fabricate(:wildcard_web_hook) }
+
+        it 'should include wildcard hooks' do
+          expect(WebHook.active_web_hooks(:wildcard)).to eq([wildcard_hook])
+
+          expect(WebHook.active_web_hooks(:post)).to contain_exactly(
+            post_hook, wildcard_hook
+          )
+
+          expect(WebHook.active_web_hooks(:topic)).to contain_exactly(
+            topic_hook, wildcard_hook
+          )
+        end
       end
     end
 
     describe '#enqueue_hooks' do
-      it 'enqueues hooks with id and name' do
-        Jobs.expects(:enqueue).with(:emit_web_hook_event, web_hook_id: post_hook.id, event_type: 'post')
-
-        WebHook.enqueue_hooks(:post)
-      end
-
       it 'accepts additional parameters' do
-        Jobs.expects(:enqueue).with(:emit_web_hook_event, web_hook_id: post_hook.id, post_id: 1, event_type: 'post')
+        payload = { test: 'some payload' }.to_json
+        WebHook.enqueue_hooks(:post, payload: payload)
 
-        WebHook.enqueue_hooks(:post, post_id: 1)
-      end
-    end
+        job_args = Jobs::EmitWebHookEvent.jobs.first["args"].first
 
-    context 'includes wildcard hooks' do
-      let!(:wildcard_hook) { Fabricate(:wildcard_web_hook) }
-
-      describe '#find_by_type' do
-        it 'can find wildcard hooks' do
-          expect(WebHook.find_by_type(:wildcard)).to eq([wildcard_hook])
-        end
-
-        it 'can include wildcard hooks' do
-          expect(WebHook.find_by_type(:post).sort_by(&:id)).to eq([post_hook, wildcard_hook])
-          expect(WebHook.find_by_type(:topic).sort_by(&:id)).to eq([topic_hook, wildcard_hook])
-
-        end
+        expect(job_args["web_hook_id"]).to eq(post_hook.id)
+        expect(job_args["event_type"]).to eq('post')
+        expect(job_args["payload"]).to eq(payload)
       end
 
-      describe '#enqueue_hooks' do
-        it 'enqueues hooks with ids' do
-          Jobs.expects(:enqueue).with(:emit_web_hook_event, web_hook_id: post_hook.id, event_type: 'post')
-          Jobs.expects(:enqueue).with(:emit_web_hook_event, web_hook_id: wildcard_hook.id, event_type: 'post')
+      context 'includes wildcard hooks' do
+        let!(:wildcard_hook) { Fabricate(:wildcard_web_hook) }
 
-          WebHook.enqueue_hooks(:post)
-        end
+        describe '#enqueue_hooks' do
+          it 'enqueues hooks with ids' do
+            WebHook.enqueue_hooks(:post)
 
-        it 'accepts additional parameters' do
-          Jobs.expects(:enqueue).with(:emit_web_hook_event, web_hook_id: post_hook.id, post_id: 1, event_type: 'post')
-          Jobs.expects(:enqueue).with(:emit_web_hook_event, web_hook_id: wildcard_hook.id, post_id: 1, event_type: 'post')
+            job_args = Jobs::EmitWebHookEvent.jobs.first["args"].first
 
-          WebHook.enqueue_hooks(:post, post_id: 1)
+            expect(job_args["web_hook_id"]).to eq(post_hook.id)
+            expect(job_args["event_type"]).to eq('post')
+
+            job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+
+            expect(job_args["web_hook_id"]).to eq(wildcard_hook.id)
+            expect(job_args["event_type"]).to eq('post')
+          end
         end
       end
     end
@@ -115,118 +118,297 @@ describe WebHook do
     let(:admin) { Fabricate(:admin) }
     let(:topic) { Fabricate(:topic, user: user) }
     let(:post) { Fabricate(:post, topic: topic, user: user) }
+    let(:topic_web_hook) { Fabricate(:topic_web_hook) }
 
     before do
-      SiteSetting.queue_jobs = true
+      topic_web_hook
+    end
+
+    describe 'when there are no active hooks' do
+      it 'should not enqueue anything' do
+        topic_web_hook.destroy!
+        post = PostCreator.create(user, raw: 'post', title: 'topic', skip_validations: true)
+        expect(Jobs::EmitWebHookEvent.jobs.length).to eq(0)
+      end
     end
 
     it 'should enqueue the right hooks for topic events' do
-      Fabricate(:topic_web_hook)
+      post = PostCreator.create(user, raw: 'post', title: 'topic', skip_validations: true)
+      topic_id = post.topic.id
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
 
-      Sidekiq::Testing.fake! do
-        post = PostCreator.create(user, raw: 'post', title: 'topic', skip_validations: true)
-        topic_id = post.topic_id
+      expect(job_args["event_name"]).to eq("topic_created")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(topic_id)
+
+      PostDestroyer.new(user, post).destroy
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+
+      expect(job_args["event_name"]).to eq("topic_destroyed")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(topic_id)
+
+      PostDestroyer.new(user, post).recover
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+
+      expect(job_args["event_name"]).to eq("topic_recovered")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(topic_id)
+
+      %w{archived closed visible}.each do |status|
+        post.topic.update_status(status, true, topic.user)
         job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
 
-        expect(job_args["event_name"]).to eq("topic_created")
-        expect(job_args["topic_id"]).to eq(topic_id)
+        expect(job_args["event_name"]).to eq("topic_#{status}_status_updated")
+        payload = JSON.parse(job_args["payload"])
+        expect(payload["id"]).to eq(topic_id)
+      end
+    end
 
-        PostDestroyer.new(user, post).destroy
-        job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+    describe 'when topic has been deleted' do
+      it 'should not enqueue a post/topic edited hooks' do
+        topic.trash!
+        post.reload
 
-        expect(job_args["event_name"]).to eq("topic_destroyed")
-        expect(job_args["topic_id"]).to eq(topic_id)
+        PostRevisor.new(post, topic).revise!(
+          post.user,
+          {
+            category_id: Category.last.id,
+            raw: "#{post.raw} new"
+          },
+          {}
+        )
 
-        PostDestroyer.new(user, post).recover
-        job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
-
-        expect(job_args["event_name"]).to eq("topic_recovered")
-        expect(job_args["topic_id"]).to eq(topic_id)
+        expect(Jobs::EmitWebHookEvent.jobs.count).to eq(0)
       end
     end
 
     it 'should enqueue the right hooks for post events' do
       Fabricate(:web_hook)
 
-      Sidekiq::Testing.fake! do
-        user
-        topic
+      post = PostCreator.create!(user,
+        raw: 'post',
+        topic_id: topic.id,
+        reply_to_post_number: 1,
+        skip_validations: true
+      )
 
-        post = PostCreator.create(user,
-          raw: 'post',
-          topic_id: topic.id,
-          reply_to_post_number: 1,
-          skip_validations: true
-        )
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
 
-        job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
-        Sidekiq::Worker.clear_all
+      expect(job_args["event_name"]).to eq("post_created")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(post.id)
 
-        expect(job_args["event_name"]).to eq("post_created")
-        expect(job_args["post_id"]).to eq(post.id)
+      Jobs::EmitWebHookEvent.jobs.clear
 
-        # post destroy or recover triggers a moderator post
-        expect { PostDestroyer.new(user, post).destroy }
-          .to change { Jobs::EmitWebHookEvent.jobs.count }.by(2)
+      # post destroy or recover triggers a moderator post
+      expect { PostDestroyer.new(user, post).destroy }
+        .to change { Jobs::EmitWebHookEvent.jobs.count }.by(3)
 
-        job_args = Jobs::EmitWebHookEvent.jobs.first["args"].first
+      job_args = Jobs::EmitWebHookEvent.jobs[0]["args"].first
 
-        expect(job_args["event_name"]).to eq("post_edited")
-        expect(job_args["post_id"]).to eq(post.id)
+      expect(job_args["event_name"]).to eq("post_edited")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(post.id)
 
-        job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+      job_args = Jobs::EmitWebHookEvent.jobs[1]["args"].first
 
-        expect(job_args["event_name"]).to eq("post_destroyed")
-        expect(job_args["post_id"]).to eq(post.id)
+      expect(job_args["event_name"]).to eq("post_destroyed")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(post.id)
 
-        PostDestroyer.new(user, post).recover
-        job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+      job_args = Jobs::EmitWebHookEvent.jobs[2]["args"].first
 
-        expect(job_args["event_name"]).to eq("post_recovered")
-        expect(job_args["post_id"]).to eq(post.id)
-      end
+      expect(job_args["event_name"]).to eq("topic_destroyed")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(post.topic.id)
+
+      Jobs::EmitWebHookEvent.jobs.clear
+
+      expect { PostDestroyer.new(user, post).recover }
+        .to change { Jobs::EmitWebHookEvent.jobs.count }.by(3)
+
+      job_args = Jobs::EmitWebHookEvent.jobs[0]["args"].first
+
+      expect(job_args["event_name"]).to eq("post_edited")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(post.id)
+
+      job_args = Jobs::EmitWebHookEvent.jobs[1]["args"].first
+
+      expect(job_args["event_name"]).to eq("post_recovered")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(post.id)
+
+      job_args = Jobs::EmitWebHookEvent.jobs[2]["args"].first
+
+      expect(job_args["event_name"]).to eq("topic_recovered")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(post.topic.id)
     end
 
     it 'should enqueue the right hooks for user events' do
-      user_web_hook = Fabricate(:user_web_hook, active: true)
+      Fabricate(:user_web_hook, active: true)
 
-      Sidekiq::Testing.fake! do
-        user
-        job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+      user
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
 
-        expect(job_args["event_name"]).to eq("user_created")
-        expect(job_args["user_id"]).to eq(user.id)
+      expect(job_args["event_name"]).to eq("user_created")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(user.id)
 
-        admin
-        job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+      admin
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
 
-        expect(job_args["event_name"]).to eq("user_created")
-        expect(job_args["user_id"]).to eq(admin.id)
+      expect(job_args["event_name"]).to eq("user_created")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(admin.id)
 
-        user.approve(admin)
-        job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+      user.approve(admin)
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
 
-        expect(job_args["event_name"]).to eq("user_approved")
-        expect(job_args["user_id"]).to eq(user.id)
+      expect(job_args["event_name"]).to eq("user_approved")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(user.id)
 
-        UserUpdater.new(admin, user).update(username: 'testing123')
-        job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+      UserUpdater.new(admin, user).update(username: 'testing123')
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
 
-        expect(job_args["event_name"]).to eq("user_updated")
-        expect(job_args["user_id"]).to eq(user.id)
+      expect(job_args["event_name"]).to eq("user_updated")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(user.id)
 
-        user.logged_out
-        job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+      user.logged_out
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
 
-        expect(job_args["event_name"]).to eq("user_logged_out")
-        expect(job_args["user_id"]).to eq(user.id)
+      expect(job_args["event_name"]).to eq("user_logged_out")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(user.id)
 
-        user.logged_in
-        job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+      user.logged_in
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
 
-        expect(job_args["event_name"]).to eq("user_logged_in")
-        expect(job_args["user_id"]).to eq(user.id)
-      end
+      expect(job_args["event_name"]).to eq("user_logged_in")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(user.id)
+    end
+
+    it 'should enqueue the right hooks for category events' do
+      Fabricate(:category_web_hook)
+      category = Fabricate(:category)
+
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+
+      expect(job_args["event_name"]).to eq("category_created")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(category.id)
+
+      category.update!(slug: 'testing')
+
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+
+      expect(job_args["event_name"]).to eq("category_updated")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(category.id)
+      expect(payload["slug"]).to eq('testing')
+
+      category.destroy!
+
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+
+      expect(job_args["event_name"]).to eq("category_destroyed")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(category.id)
+    end
+
+    it 'should enqueue the right hooks for group events' do
+      Fabricate(:group_web_hook)
+      group = Fabricate(:group)
+
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+
+      expect(job_args["event_name"]).to eq("group_created")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(group.id)
+
+      group.update!(full_name: 'testing')
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+
+      expect(job_args["event_name"]).to eq("group_updated")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(group.id)
+      expect(payload["full_name"]).to eq('testing')
+
+      group.destroy!
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+
+      expect(job_args["event_name"]).to eq("group_destroyed")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["full_name"]).to eq('testing')
+    end
+
+    it 'should enqueue the right hooks for tag events' do
+      Fabricate(:tag_web_hook)
+      tag = Fabricate(:tag)
+
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+
+      expect(job_args["event_name"]).to eq("tag_created")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(tag.id)
+
+      tag.update!(name: 'testing')
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+
+      expect(job_args["event_name"]).to eq("tag_updated")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(tag.id)
+      expect(payload["name"]).to eq('testing')
+
+      tag.destroy!
+
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+
+      expect(job_args["event_name"]).to eq("tag_destroyed")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(tag.id)
+    end
+
+    it 'should enqueue the right hooks for flag events' do
+      post = Fabricate(:post)
+      admin = Fabricate(:admin)
+      moderator = Fabricate(:moderator)
+      Fabricate(:flag_web_hook)
+
+      post_action = PostAction.act(admin, post, PostActionType.types[:spam])
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+
+      expect(job_args["event_name"]).to eq("flag_created")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(post_action.id)
+
+      PostAction.agree_flags!(post, moderator)
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+
+      expect(job_args["event_name"]).to eq("flag_agreed")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(post_action.id)
+
+      PostAction.clear_flags!(post, moderator)
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+
+      expect(job_args["event_name"]).to eq("flag_disagreed")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(post_action.id)
+
+      post = Fabricate(:post)
+      post_action = PostAction.act(admin, post, PostActionType.types[:spam])
+      PostAction.defer_flags!(post, moderator)
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+
+      expect(job_args["event_name"]).to eq("flag_deferred")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(post_action.id)
     end
   end
 end
diff --git a/spec/multisite/distributed_cache_spec.rb b/spec/multisite/distributed_cache_spec.rb
index 6267e181941..f7f83918a83 100644
--- a/spec/multisite/distributed_cache_spec.rb
+++ b/spec/multisite/distributed_cache_spec.rb
@@ -5,18 +5,10 @@ RSpec.describe 'Multisite SiteSettings' do
 
   before do
     conn.config_filename = "spec/fixtures/multisite/two_dbs.yml"
-    conn.load_settings!
-    conn.remove_class_variable(:@@current_db)
   end
 
   after do
     conn.clear_settings!
-
-    [:@@db_spec_cache, :@@host_spec_cache, :@@default_spec].each do |class_variable|
-      conn.remove_class_variable(class_variable)
-    end
-
-    conn.set_current_db
   end
 
   def cache(name, namespace: true)
diff --git a/spec/multisite/jobs.rb b/spec/multisite/jobs_spec.rb
similarity index 69%
rename from spec/multisite/jobs.rb
rename to spec/multisite/jobs_spec.rb
index d9a88b0294a..076f6cea54a 100644
--- a/spec/multisite/jobs.rb
+++ b/spec/multisite/jobs_spec.rb
@@ -5,18 +5,11 @@ RSpec.describe "Running Sidekiq Jobs in Multisite" do
 
   before do
     conn.config_filename = "spec/fixtures/multisite/two_dbs.yml"
-    conn.load_settings!
-    conn.remove_class_variable(:@@current_db)
+    SiteSetting.defaults.refresh_site_locale!
   end
 
   after do
     conn.clear_settings!
-
-    [:@@db_spec_cache, :@@host_spec_cache, :@@default_spec].each do |class_variable|
-      conn.remove_class_variable(class_variable)
-    end
-
-    conn.set_current_db
   end
 
   it 'should revert back to the default connection' do
diff --git a/spec/multisite/site_settings_spec.rb b/spec/multisite/site_settings_spec.rb
index 09a5b90bb5c..55afb5ef9a5 100644
--- a/spec/multisite/site_settings_spec.rb
+++ b/spec/multisite/site_settings_spec.rb
@@ -7,8 +7,6 @@ RSpec.describe 'Multisite SiteSettings' do
     @original_provider = SiteSetting.provider
     SiteSetting.provider = SiteSettings::DbProvider.new(SiteSetting)
     conn.config_filename = "spec/fixtures/multisite/two_dbs.yml"
-    conn.load_settings!
-    conn.remove_class_variable(:@@current_db)
   end
 
   after do
@@ -17,12 +15,6 @@ RSpec.describe 'Multisite SiteSettings' do
     end
 
     conn.clear_settings!
-
-    [:@@db_spec_cache, :@@host_spec_cache, :@@default_spec].each do |class_variable|
-      conn.remove_class_variable(class_variable)
-    end
-
-    conn.set_current_db
     SiteSetting.provider = @original_provider
   end
 
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index d2b575f2944..f86eb06bc68 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -14,6 +14,31 @@ require 'mocha/api'
 require 'certified'
 require 'webmock/rspec'
 
+class RspecErrorTracker
+
+  def self.last_exception=(ex)
+    @ex = ex
+  end
+
+  def self.last_exception
+    @ex
+  end
+
+  def initialize(app, config = {})
+    @app = app
+  end
+
+  def call(env)
+    begin
+      @app.call(env)
+    rescue => e
+      RspecErrorTracker.last_exception = e
+      raise e
+    end
+  ensure
+  end
+end
+
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
@@ -96,6 +121,18 @@ RSpec.configure do |config|
     end
   end
 
+  config.after :each do |x|
+    if x.exception && ex = RspecErrorTracker.last_exception
+      # magic in a cause if we have none
+      unless x.exception.cause
+        class << x.exception
+          attr_accessor :cause
+        end
+        x.exception.cause = ex
+      end
+    end
+  end
+
   config.before :each do |x|
     # TODO not sure about this, we could use a mock redis implementation here:
     #   this gives us really clean "flush" semantics, howere the side-effect is that
@@ -121,11 +158,17 @@ RSpec.configure do |config|
     # very expensive IO operations
     SiteSetting.automatically_download_gravatars = false
 
+    # Running jobs are expensive and most of our tests are not concern with
+    # code that runs inside jobs
+    SiteSetting.queue_jobs = true
+
     Discourse.clear_readonly!
     Sidekiq::Worker.clear_all
 
     I18n.locale = :en
 
+    RspecErrorTracker.last_exception = nil
+
     if $test_cleanup_callbacks
       $test_cleanup_callbacks.reverse_each(&:call)
       $test_cleanup_callbacks = nil
diff --git a/spec/controllers/about_controller_spec.rb b/spec/requests/about_controller_spec.rb
similarity index 87%
rename from spec/controllers/about_controller_spec.rb
rename to spec/requests/about_controller_spec.rb
index 647e50c4976..e4e4b01a0a2 100644
--- a/spec/controllers/about_controller_spec.rb
+++ b/spec/requests/about_controller_spec.rb
@@ -6,22 +6,22 @@ describe AboutController do
 
     it "should display the about page for anonymous user when login_required is false" do
       SiteSetting.login_required = false
-      get :index
+      get "/about"
 
       expect(response).to be_success
     end
 
     it 'should redirect to login page for anonymous user when login_required is true' do
       SiteSetting.login_required = true
-      get :index
+      get "/about"
 
       expect(response).to redirect_to '/login'
     end
 
     it "should display the about page for logged in user when login_required is true" do
       SiteSetting.login_required = true
-      log_in
-      get :index
+      sign_in(Fabricate(:user))
+      get "/about"
 
       expect(response).to be_success
     end
diff --git a/spec/requests/admin/admin_controller_spec.rb b/spec/requests/admin/admin_controller_spec.rb
index 2d55f8747a6..c479ada153b 100644
--- a/spec/requests/admin/admin_controller_spec.rb
+++ b/spec/requests/admin/admin_controller_spec.rb
@@ -2,8 +2,10 @@ require 'rails_helper'
 
 RSpec.describe Admin::AdminController do
   it "should return the right response if user isn't a staff" do
-    expect do
-      get "/admin", params: { api_key: 'asdiasiduga' }
-    end.to raise_error(ActionController::RoutingError)
+    get "/admin", params: { api_key: 'asdiasiduga' }
+    expect(response.status).to eq(404)
+
+    get "/admin"
+    expect(response.status).to eq(404)
   end
 end
diff --git a/spec/requests/admin/backups_controller_spec.rb b/spec/requests/admin/backups_controller_spec.rb
index 719056f64b4..7504cb31c3e 100644
--- a/spec/requests/admin/backups_controller_spec.rb
+++ b/spec/requests/admin/backups_controller_spec.rb
@@ -25,8 +25,8 @@ RSpec.describe Admin::BackupsController do
     end
 
     it 'should not allow rollback via a GET request' do
-      expect { get "/admin/backups/rollback.json" }
-        .to raise_error(ActionController::RoutingError)
+      get "/admin/backups/rollback.json"
+      expect(response.status).to eq(404)
     end
   end
 
@@ -40,8 +40,8 @@ RSpec.describe Admin::BackupsController do
     end
 
     it 'should not allow cancel via a GET request' do
-      expect { get "/admin/backups/cancel.json" }
-        .to raise_error(ActionController::RoutingError)
+      get "/admin/backups/cancel.json"
+      expect(response.status).to eq(404)
     end
   end
 
diff --git a/spec/requests/admin/email_templates_controller_spec.rb b/spec/requests/admin/email_templates_controller_spec.rb
index 071ff0fd48c..9babb31b383 100644
--- a/spec/requests/admin/email_templates_controller_spec.rb
+++ b/spec/requests/admin/email_templates_controller_spec.rb
@@ -19,16 +19,14 @@ RSpec.describe Admin::EmailTemplatesController do
 
   context "#index" do
     it "raises an error if you aren't logged in" do
-      expect do
-        get '/admin/customize/email_templates.json'
-      end.to raise_error(ActionController::RoutingError)
+      get '/admin/customize/email_templates.json'
+      expect(response.status).to eq(404)
     end
 
     it "raises an error if you aren't an admin" do
       sign_in(user)
-      expect do
-        get '/admin/customize/email_templates.json'
-      end.to raise_error(ActionController::RoutingError)
+      get '/admin/customize/email_templates.json'
+      expect(response.status).to eq(404)
     end
 
     it "should work if you are an admin" do
@@ -44,20 +42,18 @@ RSpec.describe Admin::EmailTemplatesController do
 
   context "#update" do
     it "raises an error if you aren't logged in" do
-      expect do
-        put '/admin/customize/email_templates/some_id', params: {
-          email_template: { subject: 'Subject', body: 'Body' }
-        }, headers: headers
-      end.to raise_error(ActionController::RoutingError)
+      put '/admin/customize/email_templates/some_id', params: {
+        email_template: { subject: 'Subject', body: 'Body' }
+      }, headers: headers
+      expect(response.status).to eq(404)
     end
 
     it "raises an error if you aren't an admin" do
       sign_in(user)
-      expect do
-        put '/admin/customize/email_templates/some_id', params: {
-          email_template: { subject: 'Subject', body: 'Body' }
-        }, headers: headers
-      end.to raise_error(ActionController::RoutingError)
+      put '/admin/customize/email_templates/some_id', params: {
+        email_template: { subject: 'Subject', body: 'Body' }
+      }, headers: headers
+      expect(response.status).to eq(404)
     end
 
     context "when logged in as admin" do
@@ -224,16 +220,14 @@ RSpec.describe Admin::EmailTemplatesController do
 
   context "#revert" do
     it "raises an error if you aren't logged in" do
-      expect do
-        delete '/admin/customize/email_templates/some_id', headers: headers
-      end.to raise_error(ActionController::RoutingError)
+      delete '/admin/customize/email_templates/some_id', headers: headers
+      expect(response.status).to eq(404)
     end
 
     it "raises an error if you aren't an admin" do
       sign_in(user)
-      expect do
-        delete '/admin/customize/email_templates/some_id', headers: headers
-      end.to raise_error(ActionController::RoutingError)
+      delete '/admin/customize/email_templates/some_id', headers: headers
+      expect(response.status).to eq(404)
     end
 
     context "when logged in as admin" do
diff --git a/spec/requests/admin/flags_controller_spec.rb b/spec/requests/admin/flags_controller_spec.rb
index 2906624d2f0..98ee91c8510 100644
--- a/spec/requests/admin/flags_controller_spec.rb
+++ b/spec/requests/admin/flags_controller_spec.rb
@@ -36,12 +36,14 @@ RSpec.describe Admin::FlagsController do
   context '#agree' do
     it 'should work' do
       SiteSetting.allow_user_locale = true
+      SiteSetting.queue_jobs = false
+
       post_action = PostAction.act(user, post_1, PostActionType.types[:spam], message: 'bad')
       admin.update!(locale: 'ja')
 
       post "/admin/flags/agree/#{post_1.id}.json"
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       post_action.reload
 
diff --git a/spec/requests/admin/groups_controller_spec.rb b/spec/requests/admin/groups_controller_spec.rb
index 7d6045b6085..32ff704d454 100644
--- a/spec/requests/admin/groups_controller_spec.rb
+++ b/spec/requests/admin/groups_controller_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe Admin::GroupsController do
         }
       }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       group = Group.last
 
@@ -40,10 +40,93 @@ RSpec.describe Admin::GroupsController do
         }
       }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
+
+      response_body = JSON.parse(response.body)
+
+      expect(response_body["usernames"]).to contain_exactly(user.username, admin.username)
 
       expect(group.group_users.where(owner: true).map(&:user))
         .to contain_exactly(user, admin)
     end
   end
+
+  describe '#remove_owner' do
+    it 'should work' do
+      group.add_owner(user)
+
+      delete "/admin/groups/#{group.id}/owners.json", params: {
+        user_id: user.id
+      }
+
+      expect(response.status).to eq(200)
+      expect(group.group_users.where(owner: true)).to eq([])
+    end
+  end
+
+  describe "#bulk_perform" do
+    let(:group) do
+      Fabricate(:group,
+        name: "test",
+        primary_group: true,
+        title: 'WAT',
+        grant_trust_level: 3
+      )
+    end
+
+    let(:user) { Fabricate(:user, trust_level: 2) }
+    let(:user2) { Fabricate(:user, trust_level: 4) }
+
+    it "can assign users to a group by email or username" do
+      SiteSetting.queue_jobs = false
+
+      put "/admin/groups/bulk.json", params: {
+        group_id: group.id, users: [user.username.upcase, user2.email, 'doesnt_exist']
+      }
+
+      expect(response.status).to eq(200)
+
+      user.reload
+      expect(user.primary_group).to eq(group)
+      expect(user.title).to eq("WAT")
+      expect(user.trust_level).to eq(3)
+
+      user2.reload
+      expect(user2.primary_group).to eq(group)
+      expect(user2.title).to eq("WAT")
+      expect(user2.trust_level).to eq(4)
+
+      json = ::JSON.parse(response.body)
+      expect(json['message']).to eq("2 users have been added to the group.")
+      expect(json['users_not_added'][0]).to eq("doesnt_exist")
+    end
+  end
+
+  context "#destroy" do
+    it 'should return the right response for an invalid group_id' do
+      delete "/admin/groups/123.json"
+
+      expect(response.status).to eq(404)
+    end
+
+    describe 'when group is automatic' do
+      it "returns the right response" do
+        group.update!(automatic: true)
+
+        delete "/admin/groups/#{group.id}.json"
+
+        expect(response.status).to eq(422)
+        expect(Group.find(group.id)).to eq(group)
+      end
+    end
+
+    describe 'for a non automatic group' do
+      it "returns the right response" do
+        delete "/admin/groups/#{group.id}.json"
+
+        expect(response.status).to eq(200)
+        expect(Group.find_by(id: group.id)).to eq(nil)
+      end
+    end
+  end
 end
diff --git a/spec/requests/admin/search_logs_spec.rb b/spec/requests/admin/search_logs_spec.rb
index c4f852b4802..f811bfd44f4 100644
--- a/spec/requests/admin/search_logs_spec.rb
+++ b/spec/requests/admin/search_logs_spec.rb
@@ -8,18 +8,20 @@ RSpec.describe Admin::SearchLogsController do
     SearchLog.log(term: 'ruby', search_type: :header, ip_address: '127.0.0.1')
   end
 
+  after do
+    SearchLog.clear_debounce_cache!
+  end
+
   context "#index" do
     it "raises an error if you aren't logged in" do
-      expect do
-        get '/admin/logs/search_logs.json'
-      end.to raise_error(ActionController::RoutingError)
+      get '/admin/logs/search_logs.json'
+      expect(response.status).to eq(404)
     end
 
     it "raises an error if you aren't an admin" do
       sign_in(user)
-      expect do
-        get '/admin/logs/search_logs.json'
-      end.to raise_error(ActionController::RoutingError)
+      get '/admin/logs/search_logs.json'
+      expect(response.status).to eq(404)
     end
 
     it "should work if you are an admin" do
@@ -35,16 +37,14 @@ RSpec.describe Admin::SearchLogsController do
 
   context "#term" do
     it "raises an error if you aren't logged in" do
-      expect do
-        get '/admin/logs/search_logs/term/ruby.json'
-      end.to raise_error(ActionController::RoutingError)
+      get '/admin/logs/search_logs/term/ruby.json'
+      expect(response.status).to eq(404)
     end
 
     it "raises an error if you aren't an admin" do
       sign_in(user)
-      expect do
-        get '/admin/logs/search_logs/term/ruby.json'
-      end.to raise_error(ActionController::RoutingError)
+      get '/admin/logs/search_logs/term/ruby.json'
+      expect(response.status).to eq(404)
     end
 
     it "should work if you are an admin" do
@@ -55,6 +55,7 @@ RSpec.describe Admin::SearchLogsController do
 
       json = ::JSON.parse(response.body)
       expect(json['term']['type']).to eq('search_log_term')
+      expect(json['term']['search_result']).to be_present
     end
   end
 end
diff --git a/spec/requests/admin/site_texts_controller_spec.rb b/spec/requests/admin/site_texts_controller_spec.rb
new file mode 100644
index 00000000000..f19c6015c8f
--- /dev/null
+++ b/spec/requests/admin/site_texts_controller_spec.rb
@@ -0,0 +1,73 @@
+require 'rails_helper'
+
+RSpec.describe Admin::SiteTextsController do
+  let(:admin) { Fabricate(:admin) }
+  let(:user) { Fabricate(:user) }
+
+  after do
+    TranslationOverride.delete_all
+    I18n.reload!
+  end
+
+  context "#update" do
+    it "raises an error if you aren't logged in" do
+      put '/admin/customize/site_texts/some_key.json', params: {
+        site_text: { value: 'foo' }
+      }
+
+      expect(response.status).to eq(404)
+    end
+
+    it "raises an error if you aren't an admin" do
+      sign_in(user)
+
+      put '/admin/customize/site_texts/some_key', params: {
+        site_text: { value: 'foo' }
+      }
+
+      expect(response.status).to eq(404)
+    end
+
+    context "when logged in as admin" do
+      before do
+        sign_in(admin)
+      end
+
+      it "returns 'not found' when an unknown key is used" do
+        put '/admin/customize/site_texts/some_key.json', params: {
+          site_text: { value: 'foo' }
+        }
+
+        expect(response.status).to eq(404)
+
+        json = JSON.parse(response.body)
+        expect(json['error_type']).to eq('not_found')
+      end
+
+      it "works as expectd with correct keys" do
+        put '/admin/customize/site_texts/login_required.welcome_message.json', params: {
+          site_text: { value: 'foo' }
+        }
+
+        expect(response.status).to eq(200)
+
+        json = ::JSON.parse(response.body)
+        site_text = json['site_text']
+
+        expect(site_text['id']).to eq('login_required.welcome_message')
+        expect(site_text['value']).to eq('foo')
+      end
+
+      it "does not update restricted keys" do
+        put '/admin/customize/site_texts/user_notifications.confirm_old_email.title.json', params: {
+          site_text: { value: 'foo' }
+        }
+
+        expect(response.status).to eq(404)
+
+        json = ::JSON.parse(response.body)
+        expect(json['error_type']).to eq('not_found')
+      end
+    end
+  end
+end
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
new file mode 100644
index 00000000000..a89e92f9cf7
--- /dev/null
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -0,0 +1,86 @@
+require 'rails_helper'
+
+RSpec.describe Admin::UsersController do
+  let(:admin) { Fabricate(:admin) }
+  let(:user) { Fabricate(:user) }
+
+  describe '#disable_second_factor' do
+    let(:second_factor) { user.create_totp }
+
+    describe 'as an admin' do
+      before do
+        sign_in(admin)
+        second_factor
+        expect(user.reload.user_second_factor).to eq(second_factor)
+      end
+
+      it 'should able to disable the second factor for another user' do
+        expect do
+          put "/admin/users/#{user.id}/disable_second_factor.json"
+        end.to change { Jobs::CriticalUserEmail.jobs.length }.by(1)
+
+        expect(response.status).to eq(200)
+        expect(user.reload.user_second_factor).to eq(nil)
+
+        job_args = Jobs::CriticalUserEmail.jobs.first["args"].first
+
+        expect(job_args["user_id"]).to eq(user.id)
+        expect(job_args["type"]).to eq('account_second_factor_disabled')
+      end
+
+      it 'should not be able to disable the second factor for the current user' do
+        put "/admin/users/#{admin.id}/disable_second_factor.json"
+
+        expect(response.status).to eq(403)
+      end
+
+      describe 'when user does not have second factor enabled' do
+        it 'should raise the right error' do
+          user.user_second_factor.destroy!
+
+          put "/admin/users/#{user.id}/disable_second_factor.json"
+
+          expect(response.status).to eq(400)
+        end
+      end
+    end
+  end
+
+  describe "#penalty_history" do
+    let(:moderator) { Fabricate(:moderator) }
+    let(:logger) { StaffActionLogger.new(admin) }
+
+    it "doesn't allow moderators to clear a user's history" do
+      sign_in(moderator)
+      delete "/admin/users/#{user.id}/penalty_history.json"
+      expect(response.code).to eq("404")
+    end
+
+    def find_logs(action)
+      UserHistory.where(target_user_id: user.id, action: UserHistory.actions[action])
+    end
+
+    it "allows admins to clear a user's history" do
+      logger.log_user_suspend(user, "suspend reason")
+      logger.log_user_unsuspend(user)
+      logger.log_unsilence_user(user)
+      logger.log_silence_user(user)
+
+      sign_in(admin)
+      delete "/admin/users/#{user.id}/penalty_history.json"
+      expect(response.code).to eq("200")
+
+      expect(find_logs(:suspend_user)).to be_blank
+      expect(find_logs(:unsuspend_user)).to be_blank
+      expect(find_logs(:silence_user)).to be_blank
+      expect(find_logs(:unsilence_user)).to be_blank
+
+      expect(find_logs(:removed_suspend_user)).to be_present
+      expect(find_logs(:removed_unsuspend_user)).to be_present
+      expect(find_logs(:removed_silence_user)).to be_present
+      expect(find_logs(:removed_unsilence_user)).to be_present
+    end
+
+  end
+
+end
diff --git a/spec/requests/application_controller_spec.rb b/spec/requests/application_controller_spec.rb
new file mode 100644
index 00000000000..3e19b5f5048
--- /dev/null
+++ b/spec/requests/application_controller_spec.rb
@@ -0,0 +1,35 @@
+require 'rails_helper'
+
+RSpec.describe ApplicationController do
+  describe '#redirect_to_login_if_required' do
+    let(:admin) { Fabricate(:admin) }
+
+    before do
+      admin  # to skip welcome wizard at home page `/`
+      SiteSetting.login_required = true
+    end
+
+    it "should carry-forward authComplete param to login page redirect" do
+      get "/?authComplete=true"
+      expect(response).to redirect_to('/login?authComplete=true')
+    end
+  end
+
+  describe 'build_not_found_page' do
+    describe 'topic not found' do
+      it 'should return 404 and show Google search' do
+        get "/t/nope-nope/99999999"
+        expect(response.status).to eq(404)
+        expect(response.body).to include(I18n.t('page_not_found.search_google'))
+      end
+
+      it 'should not include Google search if login_required is enabled' do
+        SiteSetting.login_required = true
+        sign_in(Fabricate(:user))
+        get "/t/nope-nope/99999999"
+        expect(response.status).to eq(404)
+        expect(response.body).to_not include('google.com/search')
+      end
+    end
+  end
+end
diff --git a/spec/controllers/badges_controller_spec.rb b/spec/requests/badges_controller_spec.rb
similarity index 82%
rename from spec/controllers/badges_controller_spec.rb
rename to spec/requests/badges_controller_spec.rb
index de894666c6b..2b03b23e38f 100644
--- a/spec/controllers/badges_controller_spec.rb
+++ b/spec/requests/badges_controller_spec.rb
@@ -10,7 +10,7 @@ describe BadgesController do
 
   context 'index' do
     it 'should return a list of all badges' do
-      get :index, format: :json
+      get "/badges.json"
 
       expect(response.status).to eq(200)
       parsed = JSON.parse(response.body)
@@ -20,22 +20,22 @@ describe BadgesController do
 
   context 'show' do
     it "should return a badge" do
-      get :show, params: { id: badge.id }, format: :json
+      get "/badges/#{badge.id}.json"
       expect(response.status).to eq(200)
       parsed = JSON.parse(response.body)
       expect(parsed["badge"]).to be_present
     end
 
     it "should mark the notification as viewed" do
-      log_in_user(user)
+      sign_in(user)
       user_badge = BadgeGranter.grant(badge, user)
       expect(user_badge.notification.read).to eq(false)
-      get :show, params: { id: badge.id }
+      get "/badges/#{badge.id}.json"
       expect(user_badge.notification.reload.read).to eq(true)
     end
 
     it 'renders rss feed of a badge' do
-      get :show, params: { id: badge.id }, format: :rss
+      get "/badges/#{badge.id}.rss"
       expect(response.status).to eq(200)
       expect(response.content_type).to eq('application/rss+xml')
     end
diff --git a/spec/requests/categories_controller_spec.rb b/spec/requests/categories_controller_spec.rb
new file mode 100644
index 00000000000..9f0b113aecf
--- /dev/null
+++ b/spec/requests/categories_controller_spec.rb
@@ -0,0 +1,42 @@
+require 'rails_helper'
+
+describe CategoriesController do
+
+  context 'index' do
+
+    it 'suppresses categories correctly' do
+      post = create_post(title: 'super AMAZING AMAZING post')
+
+      get "/categories"
+      expect(response.body).to include('AMAZING AMAZING')
+
+      post.topic.category.update_columns(suppress_from_latest: true)
+
+      get "/categories"
+      expect(response.body).not_to include('AMAZING AMAZING')
+    end
+  end
+
+  context 'extensibility event' do
+    let(:admin) { Fabricate(:admin) }
+    let(:category) { Fabricate(:category, user: admin) }
+
+    before do
+      category
+      sign_in(admin)
+    end
+
+    it "triggers a extensibility event" do
+      event = DiscourseEvent.track_events {
+        put "/categories/#{category.id}.json", params: {
+          name: 'hello',
+          color: 'ff0',
+          text_color: 'fff'
+        }
+      }.last
+
+      expect(event[:event_name]).to eq(:category_updated)
+      expect(event[:params].first).to eq(category)
+    end
+  end
+end
diff --git a/spec/requests/composer_controller_spec.rb b/spec/requests/composer_controller_spec.rb
index 2a8923c37b2..a5bcb668efb 100644
--- a/spec/requests/composer_controller_spec.rb
+++ b/spec/requests/composer_controller_spec.rb
@@ -6,11 +6,10 @@ RSpec.describe ComposerController do
   describe '#parse_html' do
 
     it "should not be able access without sign in" do
-      expect {
-        post "/composer/parse_html.json", params: {
-          html: "<strong>hello</strong>"
-        }
-      }.to raise_error(Discourse::NotLoggedIn)
+      post "/composer/parse_html.json", params: {
+        html: "<strong>hello</strong>"
+      }
+      expect(response.status).to eq(403)
     end
 
     it "should convert html tags to markdown text" do
diff --git a/spec/requests/directory_items_controller_spec.rb b/spec/requests/directory_items_controller_spec.rb
index 4d6b6f93f1e..c9126347032 100644
--- a/spec/requests/directory_items_controller_spec.rb
+++ b/spec/requests/directory_items_controller_spec.rb
@@ -2,11 +2,14 @@ require 'rails_helper'
 
 describe DirectoryItemsController do
   let!(:user) { Fabricate(:user) }
+  let!(:evil_trout) { Fabricate(:evil_trout) }
+  let!(:walter_white) { Fabricate(:walter_white) }
+  let!(:stage_user) { Fabricate(:staged, username: 'stage_user') }
+  let!(:group) { Fabricate(:group, users: [evil_trout, stage_user]) }
 
   it "requires a `period` param" do
-    expect do
-      get '/directory_items.json'
-    end.to raise_error(ActionController::ParameterMissing)
+    get '/directory_items.json'
+    expect(response.status).to eq(400)
   end
 
   it "requires a proper `period` param" do
@@ -29,10 +32,6 @@ describe DirectoryItemsController do
 
   context "with data" do
     before do
-      Fabricate(:evil_trout)
-      Fabricate(:walter_white)
-      Fabricate(:staged, username: 'stage_user')
-
       DirectoryItem.refresh!
     end
 
@@ -78,5 +77,29 @@ describe DirectoryItemsController do
       expect(json['total_rows_directory_items']).to eq(1)
       expect(json['directory_items'][0]['user']['username']).to eq('stage_user')
     end
+
+    it "excludes users by username" do
+      get '/directory_items.json', params: { period: 'all', exclude_usernames: "stage_user,eviltrout" }
+      expect(response).to be_success
+
+      json = ::JSON.parse(response.body)
+      expect(json).to be_present
+      expect(json['directory_items'].length).to eq(2)
+      expect(json['total_rows_directory_items']).to eq(2)
+      expect(json['directory_items'][0]['user']['username']).to eq(walter_white.username) | eq(user.username)
+      expect(json['directory_items'][1]['user']['username']).to eq(walter_white.username) | eq(user.username)
+    end
+
+    it "filters users by group" do
+      get '/directory_items.json', params: { period: 'all', group: group.name }
+      expect(response).to be_success
+
+      json = ::JSON.parse(response.body)
+      expect(json).to be_present
+      expect(json['directory_items'].length).to eq(2)
+      expect(json['total_rows_directory_items']).to eq(2)
+      expect(json['directory_items'][0]['user']['username']).to eq(evil_trout.username) | eq(stage_user.username)
+      expect(json['directory_items'][1]['user']['username']).to eq(evil_trout.username) | eq(stage_user.username)
+    end
   end
 end
diff --git a/spec/requests/email_controller_spec.rb b/spec/requests/email_controller_spec.rb
index 370f697935f..196b3b277a5 100644
--- a/spec/requests/email_controller_spec.rb
+++ b/spec/requests/email_controller_spec.rb
@@ -5,18 +5,146 @@ RSpec.describe EmailController do
   let(:topic) { Fabricate(:topic) }
   let(:private_topic) { Fabricate(:private_message_topic) }
 
+  context '.perform unsubscribe' do
+    it 'raises not found on invalid key' do
+      post "/email/unsubscribe/123.json"
+      expect(response.status).to eq(404)
+    end
+
+    it 'can fully unsubscribe' do
+      user = Fabricate(:user)
+      key = UnsubscribeKey.create_key_for(user, "all")
+
+      user.user_option.update_columns(email_always: true,
+                                      email_digests: true,
+                                      email_direct: true,
+                                      email_private_messages: true)
+
+      post "/email/unsubscribe/#{key}.json",
+        params: { unsubscribe_all: "1" }
+
+      expect(response.status).to eq(302)
+
+      get response.redirect_url
+
+      # cause it worked ... yay
+      expect(body).to include(user.email)
+
+      user.user_option.reload
+
+      expect(user.user_option.email_always).to eq(false)
+      expect(user.user_option.email_digests).to eq(false)
+      expect(user.user_option.email_direct).to eq(false)
+      expect(user.user_option.email_private_messages).to eq(false)
+
+    end
+
+    it 'can disable mailing list' do
+      user = Fabricate(:user)
+      key = UnsubscribeKey.create_key_for(user, "all")
+
+      user.user_option.update_columns(mailing_list_mode: true)
+
+      post "/email/unsubscribe/#{key}.json",
+        params: { disable_mailing_list: "1" }
+
+      expect(response.status).to eq(302)
+
+      user.user_option.reload
+
+      expect(user.user_option.mailing_list_mode).to eq(false)
+    end
+
+    it 'can disable digest' do
+      user = Fabricate(:user)
+      key = UnsubscribeKey.create_key_for(user, "all")
+
+      user.user_option.update_columns(email_digests: true)
+
+      post "/email/unsubscribe/#{key}.json",
+        params: { disable_digest_emails: "1" }
+
+      expect(response.status).to eq(302)
+
+      user.user_option.reload
+
+      expect(user.user_option.email_digests).to eq(false)
+    end
+
+    it 'can unwatch topic' do
+      p = Fabricate(:post)
+      key = UnsubscribeKey.create_key_for(p.user, p)
+
+      TopicUser.change(p.user_id, p.topic_id, notification_level: TopicUser.notification_levels[:watching])
+
+      post "/email/unsubscribe/#{key}.json",
+        params: { unwatch_topic: "1" }
+
+      expect(response.status).to eq(302)
+
+      expect(TopicUser.get(p.topic, p.user).notification_level).to eq(TopicUser.notification_levels[:tracking])
+    end
+
+    it 'can mute topic' do
+      p = Fabricate(:post)
+      key = UnsubscribeKey.create_key_for(p.user, p)
+
+      TopicUser.change(p.user_id, p.topic_id, notification_level: TopicUser.notification_levels[:watching])
+
+      post "/email/unsubscribe/#{key}.json",
+        params: { mute_topic: "1" }
+
+      expect(response.status).to eq(302)
+
+      expect(TopicUser.get(p.topic, p.user).notification_level).to eq(TopicUser.notification_levels[:muted])
+    end
+
+    it 'can unwatch category' do
+      p = Fabricate(:post)
+      key = UnsubscribeKey.create_key_for(p.user, p)
+
+      cu = CategoryUser.create!(user_id: p.user.id,
+                                category_id: p.topic.category_id,
+                                notification_level: CategoryUser.notification_levels[:watching])
+
+      post "/email/unsubscribe/#{key}.json",
+        params: { unwatch_category: "1" }
+
+      expect(response.status).to eq(302)
+
+      expect(CategoryUser.find_by(id: cu.id)).to eq(nil)
+    end
+
+    it 'can unwatch first post from category' do
+      p = Fabricate(:post)
+      key = UnsubscribeKey.create_key_for(p.user, p)
+
+      cu = CategoryUser.create!(user_id: p.user.id,
+                                category_id: p.topic.category_id,
+                                notification_level: CategoryUser.notification_levels[:watching_first_post])
+
+      post "/email/unsubscribe/#{key}.json",
+        params: { unwatch_category: "1" }
+
+      expect(response.status).to eq(302)
+
+      expect(CategoryUser.find_by(id: cu.id)).to eq(nil)
+    end
+  end
+
   describe '#unsubscribed' do
     describe 'when email is invalid' do
       it 'should return the right response' do
         get '/email/unsubscribed', params: { email: 'somerandomstring' }
-
         expect(response.status).to eq(404)
       end
     end
 
     describe 'when topic is public' do
       it 'should return the right response' do
-        get '/email/unsubscribed', params: { email: user.email, topic_id: topic.id }
+        key = SecureRandom.hex
+        $redis.set(key, user.email)
+        get '/email/unsubscribed', params: { key: key, topic_id: topic.id }
         expect(response).to be_success
         expect(response.body).to include(topic.title)
       end
@@ -24,7 +152,9 @@ RSpec.describe EmailController do
 
     describe 'when topic is private' do
       it 'should return the right response' do
-        get '/email/unsubscribed', params: { email: user.email, topic_id: private_topic.id }
+        key = SecureRandom.hex
+        $redis.set(key, user.email)
+        get '/email/unsubscribed', params: { key: key, topic_id: private_topic.id }
         expect(response).to be_success
         expect(response.body).to_not include(private_topic.title)
       end
diff --git a/spec/requests/embed_controller_spec.rb b/spec/requests/embed_controller_spec.rb
index 8b098b621f6..42b6f018d3f 100644
--- a/spec/requests/embed_controller_spec.rb
+++ b/spec/requests/embed_controller_spec.rb
@@ -80,6 +80,10 @@ describe EmbedController do
     context "success" do
       let(:headers) { { 'REFERER' => embed_url } }
 
+      before do
+        SiteSetting.queue_jobs = false
+      end
+
       after do
         expect(response).to be_success
         expect(response.headers['X-Frame-Options']).to eq("ALLOWALL")
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index 1d7c14abeb7..b268542391c 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -3,44 +3,153 @@ require 'rails_helper'
 describe GroupsController do
   let(:user) { Fabricate(:user) }
   let(:group) { Fabricate(:group, users: [user]) }
+  let(:moderator_group_id) { Group::AUTO_GROUPS[:moderators] }
+  let(:admin) { Fabricate(:admin) }
+  let(:moderator) { Fabricate(:moderator) }
 
   describe '#index' do
-    let!(:staff_group) do
+    let(:staff_group) do
       Fabricate(:group, name: '0000', visibility_level: Group.visibility_levels[:staff])
     end
 
     context 'when group directory is disabled' do
-      it 'should deny access' do
+      before do
         SiteSetting.enable_group_directory = false
+      end
 
+      it 'should deny access for an anon user' do
         get "/groups.json"
-        expect(response).to be_forbidden
+        expect(response.status).to eq(403)
+      end
+
+      it 'should deny access for a normal user' do
+        get "/groups.json"
+        expect(response.status).to eq(403)
+      end
+
+      it 'should not deny access for an admin' do
+        sign_in(admin)
+        get "/groups.json"
+
+        expect(response.status).to eq(200)
+      end
+
+      it 'should not deny access for a moderator' do
+        sign_in(moderator)
+        get "/groups.json"
+
+        expect(response.status).to eq(200)
+      end
+    end
+
+    context 'searchable' do
+      it 'should return the right response' do
+        other_group = Fabricate(:group, name: 'testing')
+        get "/groups.json", params: { filter: 'test' }
+
+        expect(response.status).to eq(200)
+        expect(JSON.parse(response.body)["groups"].first["id"]).to eq(other_group.id)
+      end
+    end
+
+    context 'sortable' do
+      let!(:other_group) { Fabricate(:group, name: "zzzzzz", users: [user]) }
+
+      %w{
+        desc
+        asc
+      }.each do |order|
+        context "#{order} order" do
+          it 'should return the right response' do
+            is_asc = order == 'asc'
+            params = { order: 'name' }
+            params.merge!(asc: true) if is_asc
+            group
+            get "/groups.json", params: params
+
+            expect(response.status).to eq(200)
+
+            group_ids = [moderator_group_id, group.id, other_group.id]
+            group_ids.reverse! if !is_asc
+
+            expect(JSON.parse(response.body)["groups"].map { |group| group["id"] })
+              .to eq(group_ids)
+          end
+        end
+      end
+
+      context 'ascending order' do
+        it 'should return the right response' do
+          group
+          get "/groups.json", params: { order: 'name' }
+
+          expect(response.status).to eq(200)
+
+          expect(JSON.parse(response.body)["groups"].map { |group| group["id"] })
+            .to eq([other_group.id, group.id, moderator_group_id])
+        end
       end
     end
 
     it 'should return the right response' do
       group
+      staff_group
       get "/groups.json"
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       response_body = JSON.parse(response.body)
 
       group_ids = response_body["groups"].map { |g| g["id"] }
 
-      expect(response_body["extras"]["group_user_ids"]).to eq([])
       expect(group_ids).to include(group.id)
       expect(group_ids).to_not include(staff_group.id)
       expect(response_body["load_more_groups"]).to eq("/groups?page=1")
-      expect(response_body["total_rows_groups"]).to eq(1)
+      expect(response_body["total_rows_groups"]).to eq(2)
+
+      expect(response_body["extras"]["type_filters"].map(&:to_sym)).to eq(
+        described_class::TYPE_FILTERS.keys - [:my, :owner, :automatic]
+      )
+    end
+
+    context 'viewing groups of another user' do
+      describe 'when an invalid username is given' do
+        it 'should return the right response' do
+          group
+          get "/groups.json", params: { username: 'asdasd' }
+
+          expect(response.status).to eq(404)
+        end
+      end
+
+      it 'should return the right response' do
+        user2 = Fabricate(:user)
+        group
+        sign_in(user2)
+
+        get "/groups.json", params: { username: user.username }
+
+        expect(response.status).to eq(200)
+
+        response_body = JSON.parse(response.body)
+
+        group_ids = response_body["groups"].map { |g| g["id"] }
+
+        expect(group_ids).to contain_exactly(group.id)
+      end
     end
 
     context 'viewing as an admin' do
-      it 'should display automatic groups' do
-        admin = Fabricate(:admin)
+      let(:admin) { Fabricate(:admin) }
+
+      before do
         sign_in(admin)
         group.add(admin)
+        group.add_owner(admin)
+      end
 
+      it 'should return the right response' do
+        staff_group
         get "/groups.json"
 
         expect(response).to be_success
@@ -48,12 +157,223 @@ describe GroupsController do
         response_body = JSON.parse(response.body)
 
         group_ids = response_body["groups"].map { |g| g["id"] }
+        group_body = response_body["groups"].find { |g| g["id"] == group.id }
 
-        expect(response_body["extras"]["group_user_ids"]).to eq([group.id])
+        expect(group_body["is_group_user"]).to eq(true)
+        expect(group_body["is_group_owner"]).to eq(true)
         expect(group_ids).to include(group.id, staff_group.id)
         expect(response_body["load_more_groups"]).to eq("/groups?page=1")
         expect(response_body["total_rows_groups"]).to eq(10)
+
+        expect(response_body["extras"]["type_filters"].map(&:to_sym)).to eq(
+          described_class::TYPE_FILTERS.keys
+        )
       end
+
+      context 'filterable by type' do
+        def expect_type_to_return_right_groups(type, expected_group_ids)
+          get "/groups.json", params: { type: type }
+
+          expect(response.status).to eq(200)
+
+          response_body = JSON.parse(response.body)
+          group_ids = response_body["groups"].map { |g| g["id"] }
+
+          expect(response_body["total_rows_groups"]).to eq(expected_group_ids.count)
+          expect(group_ids).to contain_exactly(*expected_group_ids)
+        end
+
+        describe 'my groups' do
+          it 'should return the right response' do
+            expect_type_to_return_right_groups('my', [group.id])
+          end
+        end
+
+        describe 'owner groups' do
+          it 'should return the right response' do
+            group2 = Fabricate(:group)
+            group3 = Fabricate(:group)
+            group2.add_owner(admin)
+
+            expect_type_to_return_right_groups('owner', [group.id, group2.id])
+          end
+        end
+
+        describe 'automatic groups' do
+          it 'should return the right response' do
+            expect_type_to_return_right_groups(
+              'automatic',
+              Group::AUTO_GROUP_IDS.keys - [0]
+            )
+          end
+        end
+
+        describe 'public groups' do
+          it 'should return the right response' do
+            group2 = Fabricate(:group, public_admission: true)
+
+            expect_type_to_return_right_groups('public', [group2.id])
+          end
+        end
+
+        describe 'close groups' do
+          it 'should return the right response' do
+            group2 = Fabricate(:group, public_admission: false)
+            group3 = Fabricate(:group, public_admission: true)
+
+            expect_type_to_return_right_groups('close', [group.id, group2.id])
+          end
+        end
+      end
+    end
+  end
+
+  describe '#show' do
+    it "ensures the group can be seen" do
+      sign_in(Fabricate(:user))
+      group.update!(visibility_level: Group.visibility_levels[:owners])
+
+      get "/groups/#{group.name}.json"
+
+      expect(response.status).to eq(403)
+    end
+
+    it "returns the right response" do
+      sign_in(user)
+      get "/groups/#{group.name}.json"
+
+      expect(response.status).to eq(200)
+
+      response_body = JSON.parse(response.body)
+
+      expect(response_body['group']['id']).to eq(group.id)
+      expect(response_body['extras']["visible_group_names"]).to eq([group.name])
+    end
+
+    context 'as an admin' do
+      it "returns the right response" do
+        sign_in(Fabricate(:admin))
+        get "/groups/#{group.name}.json"
+
+        expect(response.status).to eq(200)
+
+        response_body = JSON.parse(response.body)
+
+        expect(response_body['group']['id']).to eq(group.id)
+
+        groups = Group::AUTO_GROUPS.keys
+        groups.delete(:everyone)
+        groups.push(group.name)
+
+        expect(response_body['extras']["visible_group_names"])
+          .to contain_exactly(*groups.map(&:to_s))
+      end
+    end
+
+    it 'should respond to HTML' do
+      group.update_attribute(:bio_cooked, 'testing group bio')
+
+      get "/groups/#{group.name}.html"
+
+      expect(response.status).to eq(200)
+
+      expect(response.body).to have_tag(:meta, with: {
+        property: 'og:title', content: group.name
+      })
+
+      expect(response.body).to have_tag(:meta, with: {
+        property: 'og:description', content: group.bio_cooked
+      })
+    end
+
+    describe 'when viewing activity filters' do
+      it 'should return the right response' do
+        get "/groups/#{group.name}/activity/posts.json"
+
+        expect(response.status).to eq(200)
+
+        response_body = JSON.parse(response.body)['group']
+
+        expect(response_body["id"]).to eq(group.id)
+      end
+    end
+  end
+
+  describe "#posts" do
+    it "ensures the group can be seen" do
+      sign_in(Fabricate(:user))
+      group.update!(visibility_level: Group.visibility_levels[:owners])
+
+      get "/groups/#{group.name}/posts.json"
+
+      expect(response.status).to eq(403)
+    end
+
+    it "calls `posts_for` and responds with JSON" do
+      sign_in(user)
+      post = Fabricate(:post, user: user)
+      get "/groups/#{group.name}/posts.json"
+
+      expect(response.status).to eq(200)
+      expect(JSON.parse(response.body).first["id"]).to eq(post.id)
+    end
+  end
+
+  describe "#members" do
+    it "ensures the group can be seen" do
+      sign_in(Fabricate(:user))
+      group.update!(visibility_level: Group.visibility_levels[:owners])
+
+      get "/groups/#{group.name}/members.json"
+
+      expect(response.status).to eq(403)
+    end
+
+    it "ensures that membership can be paginated" do
+      5.times { group.add(Fabricate(:user)) }
+      usernames = group.users.map { |m| m.username }.sort
+
+      get "/groups/#{group.name}/members.json", params: { limit: 3 }
+
+      expect(response.status).to eq(200)
+
+      members = JSON.parse(response.body)["members"]
+
+      expect(members.map { |m| m['username'] }).to eq(usernames[0..2])
+
+      get "/groups/#{group.name}/members.json", params: { limit: 3, offset: 3 }
+
+      expect(response.status).to eq(200)
+
+      members = JSON.parse(response.body)["members"]
+
+      expect(members.map { |m| m['username'] }).to eq(usernames[3..5])
+    end
+  end
+
+  describe '#posts_feed' do
+    it 'renders RSS' do
+      get "/groups/#{group.name}/posts.rss"
+
+      expect(response.status).to eq(200)
+      expect(response.content_type).to eq('application/rss+xml')
+    end
+  end
+
+  describe '#mentions_feed' do
+    it 'renders RSS' do
+      get "/groups/#{group.name}/mentions.rss"
+
+      expect(response.status).to eq(200)
+      expect(response.content_type).to eq('application/rss+xml')
+    end
+
+    it 'fails when disabled' do
+      SiteSetting.enable_mentions = false
+
+      get "/groups/#{group.name}/mentions.rss"
+
+      expect(response.status).to eq(404)
     end
   end
 
@@ -96,11 +416,28 @@ describe GroupsController do
       end
 
       it "should be able update the group" do
-        group.update!(allow_membership_requests: false)
+        group.update!(
+          allow_membership_requests: false,
+          visibility_level: 2,
+          mentionable_level: 2,
+          messageable_level: 2,
+          default_notification_level: 0,
+          grant_trust_level: 0,
+          automatic_membership_retroactive: false
+        )
 
         expect do
           put "/groups/#{group.id}.json", params: {
             group: {
+              mentionable_level: 1,
+              messageable_level: 1,
+              visibility_level: 1,
+              automatic_membership_email_domains: 'test.org',
+              automatic_membership_retroactive: true,
+              title: 'haha',
+              primary_group: true,
+              grant_trust_level: 1,
+              incoming_email: 'test@mail.org',
               flair_bg_color: 'FFF',
               flair_color: 'BBB',
               flair_url: 'fa-adjust',
@@ -110,11 +447,13 @@ describe GroupsController do
               public_exit: true,
               allow_membership_requests: true,
               membership_request_template: 'testing',
+              default_notification_level: 1,
+              name: 'testing'
             }
           }
-        end.to change { GroupHistory.count }.by(9)
+        end.to change { GroupHistory.count }.by(13)
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         group.reload
 
@@ -127,7 +466,29 @@ describe GroupsController do
         expect(group.public_exit).to eq(true)
         expect(group.allow_membership_requests).to eq(true)
         expect(group.membership_request_template).to eq('testing')
-        expect(GroupHistory.last.subject).to eq('membership_request_template')
+        expect(group.name).to eq('test')
+        expect(group.visibility_level).to eq(2)
+        expect(group.mentionable_level).to eq(1)
+        expect(group.messageable_level).to eq(1)
+        expect(group.default_notification_level).to eq(1)
+        expect(group.automatic_membership_email_domains).to eq(nil)
+        expect(group.automatic_membership_retroactive).to eq(false)
+        expect(group.title).to eq('haha')
+        expect(group.primary_group).to eq(false)
+        expect(group.incoming_email).to eq(nil)
+        expect(group.grant_trust_level).to eq(0)
+      end
+
+      it 'should not be allowed to update automatic groups' do
+        group = Group.find(Group::AUTO_GROUPS[:admins])
+
+        put "/groups/#{group.id}.json", params: {
+          group: {
+            messageable_level: 1
+          }
+        }
+
+        expect(response.status).to eq(403)
       end
     end
 
@@ -138,10 +499,80 @@ describe GroupsController do
       end
 
       it 'should be able to update the group' do
-        put "/groups/#{group.id}.json", params: { group: { flair_color: 'BBB' } }
+        group.update!(
+          visibility_level: 2,
+          automatic_membership_retroactive: false,
+          grant_trust_level: 0
+        )
 
-        expect(response).to be_success
-        expect(group.reload.flair_color).to eq('BBB')
+        put "/groups/#{group.id}.json", params: {
+          group: {
+            flair_color: 'BBB',
+            name: 'testing',
+            incoming_email: 'test@mail.org',
+            primary_group: true,
+            automatic_membership_email_domains: 'test.org',
+            automatic_membership_retroactive: true,
+            grant_trust_level: 2,
+            visibility_level: 1
+          }
+        }
+
+        expect(response.status).to eq(200)
+
+        group.reload
+        expect(group.flair_color).to eq('BBB')
+        expect(group.name).to eq('testing')
+        expect(group.incoming_email).to eq("test@mail.org")
+        expect(group.primary_group).to eq(true)
+        expect(group.visibility_level).to eq(1)
+        expect(group.automatic_membership_email_domains).to eq('test.org')
+        expect(group.automatic_membership_retroactive).to eq(true)
+        expect(group.grant_trust_level).to eq(2)
+
+        expect(Jobs::AutomaticGroupMembership.jobs.first["args"].first["group_id"])
+          .to eq(group.id)
+      end
+
+      it "should be able to update an automatic group" do
+        group = Group.find(Group::AUTO_GROUPS[:admins])
+
+        group.update!(
+          visibility_level: 2,
+          mentionable_level: 2,
+          messageable_level: 2,
+          default_notification_level: 2
+        )
+
+        put "/groups/#{group.id}.json", params: {
+          group: {
+            flair_color: 'BBB',
+            name: 'testing',
+            visibility_level: 1,
+            mentionable_level: 1,
+            messageable_level: 1,
+            default_notification_level: 1
+          }
+        }
+
+        expect(response.status).to eq(200)
+
+        group.reload
+        expect(group.flair_color).to eq(nil)
+        expect(group.name).to eq('admins')
+        expect(group.visibility_level).to eq(1)
+        expect(group.mentionable_level).to eq(1)
+        expect(group.messageable_level).to eq(1)
+        expect(group.default_notification_level).to eq(1)
+      end
+
+      it 'triggers a extensibility event' do
+        event = DiscourseEvent.track_events {
+          put "/groups/#{group.id}.json", params: { group: { flair_color: 'BBB' } }
+        }.last
+
+        expect(event[:event_name]).to eq(:group_updated)
+        expect(event[:params].first).to eq(group)
       end
     end
 
@@ -222,11 +653,63 @@ describe GroupsController do
 
       members = JSON.parse(response.body)["members"]
 
-      expect(members.map { |m| m["id"] }).to eq([user1.id, user2.id, user3.id])
+      expect(members.map { |m| m["id"] })
+        .to contain_exactly(user1.id, user2.id, user3.id)
+    end
+
+    describe 'filterable' do
+      describe 'as a normal user' do
+        it "should not allow members to be filterable by email" do
+          email = 'uniquetest@discourse.org'
+          user1.update!(email: email)
+
+          get "/groups/#{group.name}/members.json", params: { filter: email }
+
+          expect(response.status).to eq(200)
+          members = JSON.parse(response.body)["members"]
+          expect(members).to eq([])
+        end
+      end
+
+      describe 'as an admin' do
+        before do
+          sign_in(Fabricate(:admin))
+        end
+
+        it "should allow members to be filterable by username" do
+          email = 'uniquetest@discourse.org'
+          user1.update!(email: email)
+
+          {
+            email.upcase => [user1.id],
+            'QUEtes' => [user1.id],
+            "#{user1.email},#{user2.email}" => [user1.id, user2.id]
+          }.each do |filter, ids|
+            get "/groups/#{group.name}/members.json", params: { filter: filter }
+
+            expect(response.status).to eq(200)
+            members = JSON.parse(response.body)["members"]
+            expect(members.map { |m| m["id"] }).to contain_exactly(*ids)
+          end
+        end
+
+        it "should allow members to be filterable by email" do
+          username = 'uniquetest'
+          user1.update!(username: username)
+
+          [username.upcase, 'QUEtes'].each do |filter|
+            get "/groups/#{group.name}/members.json", params: { filter: filter }
+
+            expect(response.status).to eq(200)
+            members = JSON.parse(response.body)["members"]
+            expect(members.map { |m| m["id"] }).to contain_exactly(user1.id)
+          end
+        end
+      end
     end
   end
 
-  describe "edit" do
+  describe "#edit" do
     let(:group) { Fabricate(:group) }
 
     context 'when user is not signed in' do
@@ -245,11 +728,11 @@ describe GroupsController do
             public_exit: true
           )
 
-          expect { put "/groups/#{group.id}/members.json", params: { usernames: "bob" } }
-            .to raise_error(Discourse::NotLoggedIn)
+          put "/groups/#{group.id}/members.json", params: { usernames: "bob" }
+          expect(response.status).to eq(403)
 
-          expect { delete "/groups/#{group.id}/members.json", params: { username: "bob" } }
-            .to raise_error(Discourse::NotLoggedIn)
+          delete "/groups/#{group.id}/members.json", params: { username: "bob" }
+          expect(response.status).to eq(403)
         end
       end
     end
@@ -293,7 +776,7 @@ describe GroupsController do
       sign_in(admin)
     end
 
-    context 'add_members' do
+    context '#add_members' do
       it "can make incremental adds" do
         user2 = Fabricate(:user)
 
@@ -347,18 +830,53 @@ describe GroupsController do
 
           expect(response).to be_success
         end
+
+        it 'fails when multiple member already exists' do
+          user2.update!(username: 'alice')
+          user3 = Fabricate(:user, username: 'bob')
+          [user2, user3].each { |user| group.add(user) }
+
+          expect do
+            put "/groups/#{group.id}/members.json",
+              params: { user_emails: [user1.email, user2.email, user3.email].join(",") }
+          end.to change { group.users.count }.by(0)
+
+          expect(response.status).to eq(422)
+
+          expect(JSON.parse(response.body)["errors"]).to include(I18n.t(
+            "groups.errors.member_already_exist",
+            username: "alice, bob",
+            count: 2
+          ))
+        end
       end
 
       it "returns 422 if member already exists" do
         put "/groups/#{group.id}/members.json", params: { usernames: user.username }
 
         expect(response.status).to eq(422)
+
+        expect(JSON.parse(response.body)["errors"]).to include(I18n.t(
+          "groups.errors.member_already_exist",
+          username: user.username,
+          count: 1
+        ))
       end
 
-      it "returns 404 if member is not found" do
-        put "/groups/#{group.id}/members.json", params: { usernames: 'some donkey' }
+      it "returns 400 if member is not found" do
+        [
+          { usernames: "some thing" },
+          { user_ids: "-5,-6" },
+          { user_emails: "some@test.org" }
+        ].each do |params|
+          put "/groups/#{group.id}/members.json", params: params
 
-        expect(response.status).to eq(404)
+          expect(response.status).to eq(400)
+
+          body = JSON.parse(response.body)
+
+          expect(body["error_type"]).to eq("invalid_parameters")
+        end
       end
 
       context 'public group' do
@@ -496,12 +1014,11 @@ describe GroupsController do
     end
   end
 
-  describe "group histories" do
+  describe "#histories" do
     context 'when user is not signed in' do
       it 'should raise the right error' do
-        expect do
-          get "/groups/#{group.name}/logs.json"
-        end.to raise_error(Discourse::NotLoggedIn)
+        get "/groups/#{group.name}/logs.json"
+        expect(response.status).to eq(403)
       end
     end
 
@@ -517,18 +1034,20 @@ describe GroupsController do
       end
     end
 
-    describe 'viewing history' do
-      context 'public group' do
-        before do
-          group.add_owner(user)
+    describe 'when user is a group owner' do
+      before do
+        group.add_owner(user)
+        sign_in(user)
+      end
 
+      describe 'when viewing a public group' do
+        before do
           group.update_attributes!(
             public_admission: true,
             public_exit: true
           )
 
           GroupActionLogger.new(user, group).log_change_group_settings
-          sign_in(user)
         end
 
         it 'should allow group owner to view history' do
@@ -545,40 +1064,56 @@ describe GroupsController do
         end
       end
 
-      context 'admin' do
-        let(:admin) { Fabricate(:admin) }
+      it 'should not be allowed to view history of an automatic group' do
+        group = Group.find_by(id: Group::AUTO_GROUPS[:admins])
 
-        before do
-          sign_in(admin)
-        end
+        get "/groups/#{group.name}/logs.json"
 
-        it 'should be able to view history' do
-          GroupActionLogger.new(admin, group).log_remove_user_from_group(user)
+        expect(response.status).to eq(403)
+      end
+    end
 
-          get "/groups/#{group.name}/logs.json"
+    context 'when user is an admin' do
+      let(:admin) { Fabricate(:admin) }
 
-          expect(response).to be_success
+      before do
+        sign_in(admin)
+      end
 
-          result = JSON.parse(response.body)["logs"].first
+      it 'should be able to view history' do
+        GroupActionLogger.new(admin, group).log_remove_user_from_group(user)
 
-          expect(result["action"]).to eq(GroupHistory.actions[3].to_s)
-        end
+        get "/groups/#{group.name}/logs.json"
 
-        it 'should be able to filter through the history' do
-          GroupActionLogger.new(admin, group).log_add_user_to_group(user)
-          GroupActionLogger.new(admin, group).log_remove_user_from_group(user)
+        expect(response).to be_success
 
-          get "/groups/#{group.name}/logs.json", params: {
-            filters: { "action" => "add_user_to_group" }
-          }
+        result = JSON.parse(response.body)["logs"].first
 
-          expect(response).to be_success
+        expect(result["action"]).to eq(GroupHistory.actions[3].to_s)
+      end
 
-          logs = JSON.parse(response.body)["logs"]
+      it 'should be able to view history of automatic groups' do
+        group = Group.find_by(id: Group::AUTO_GROUPS[:admins])
 
-          expect(logs.count).to eq(1)
-          expect(logs.first["action"]).to eq(GroupHistory.actions[2].to_s)
-        end
+        get "/groups/#{group.name}/logs.json"
+
+        expect(response.status).to eq(200)
+      end
+
+      it 'should be able to filter through the history' do
+        GroupActionLogger.new(admin, group).log_add_user_to_group(user)
+        GroupActionLogger.new(admin, group).log_remove_user_from_group(user)
+
+        get "/groups/#{group.name}/logs.json", params: {
+          filters: { "action" => "add_user_to_group" }
+        }
+
+        expect(response).to be_success
+
+        logs = JSON.parse(response.body)["logs"]
+
+        expect(logs.count).to eq(1)
+        expect(logs.first["action"]).to eq(GroupHistory.actions[2].to_s)
       end
     end
   end
@@ -587,17 +1122,15 @@ describe GroupsController do
     let(:new_user) { Fabricate(:user) }
 
     it 'requires the user to log in' do
-      expect do
-        post "/groups/#{group.name}/request_membership.json"
-      end.to raise_error(Discourse::NotLoggedIn)
+      post "/groups/#{group.name}/request_membership.json"
+      expect(response.status).to eq(403)
     end
 
     it 'requires a reason' do
       sign_in(user)
 
-      expect do
-        post "/groups/#{group.name}/request_membership.json"
-      end.to raise_error(ActionController::ParameterMissing)
+      post "/groups/#{group.name}/request_membership.json"
+      expect(response.status).to eq(400)
     end
 
     it 'should create the right PM' do
@@ -649,9 +1182,8 @@ describe GroupsController do
 
     context 'as an anon user' do
       it "returns the right response" do
-        expect do
-          get '/groups/search.json'
-        end.to raise_error(Discourse::NotLoggedIn)
+        get '/groups/search.json'
+        expect(response.status).to eq(403)
       end
     end
 
@@ -723,4 +1255,34 @@ describe GroupsController do
       end
     end
   end
+
+  describe '#new' do
+    describe 'for an anon user' do
+      it 'should return 404' do
+        get '/groups/custom/new'
+
+        expect(response.status).to eq(404)
+      end
+    end
+
+    describe 'for a normal user' do
+      before { sign_in(user) }
+
+      it 'should return 404' do
+        get '/groups/custom/new'
+
+        expect(response.status).to eq(404)
+      end
+    end
+
+    describe 'for an admin user' do
+      before { sign_in(Fabricate(:admin)) }
+
+      it 'should return 404' do
+        get '/groups/custom/new'
+
+        expect(response.status).to eq(200)
+      end
+    end
+  end
 end
diff --git a/spec/requests/invites_controller_spec.rb b/spec/requests/invites_controller_spec.rb
new file mode 100644
index 00000000000..4f622c196ab
--- /dev/null
+++ b/spec/requests/invites_controller_spec.rb
@@ -0,0 +1,40 @@
+require 'rails_helper'
+
+describe InvitesController do
+
+  context 'show' do
+    let(:invite) { Fabricate(:invite) }
+    let(:user) { Fabricate(:coding_horror) }
+
+    it "returns error if invite not found" do
+      get "/invites/nopeNOPEnope"
+
+      expect(response).to be_success
+
+      body = response.body
+      expect(body).to_not have_tag(:script, with: { src: '/assets/application.js' })
+      expect(CGI.unescapeHTML(body)).to include(I18n.t('invite.not_found_template', site_name: SiteSetting.title, base_url: Discourse.base_url))
+    end
+
+    it "renders the accept invite page if invite exists" do
+      get "/invites/#{invite.invite_key}"
+
+      expect(response).to be_success
+
+      body = response.body
+      expect(body).to have_tag(:script, with: { src: '/assets/application.js' })
+      expect(CGI.unescapeHTML(body)).to_not include(I18n.t('invite.not_found_template', site_name: SiteSetting.title, base_url: Discourse.base_url))
+    end
+
+    it "returns error if invite has already been redeemed" do
+      invite.update_attributes!(redeemed_at: 1.day.ago)
+      get "/invites/#{invite.invite_key}"
+
+      expect(response).to be_success
+
+      body = response.body
+      expect(body).to_not have_tag(:script, with: { src: '/assets/application.js' })
+      expect(CGI.unescapeHTML(body)).to include(I18n.t('invite.not_found_template', site_name: SiteSetting.title, base_url: Discourse.base_url))
+    end
+  end
+end
diff --git a/spec/requests/list_controller_spec.rb b/spec/requests/list_controller_spec.rb
index 9a0d21a5c95..288d49cd293 100644
--- a/spec/requests/list_controller_spec.rb
+++ b/spec/requests/list_controller_spec.rb
@@ -2,6 +2,7 @@ require 'rails_helper'
 
 RSpec.describe ListController do
   let(:topic) { Fabricate(:topic) }
+  let(:group) { Fabricate(:group) }
 
   describe '#index' do
     it "doesn't throw an error with a negative page" do
@@ -15,6 +16,48 @@ RSpec.describe ListController do
     end
   end
 
+  describe "categories and X" do
+    it "returns top topics" do
+      Fabricate(:topic, like_count: 1000, posts_count: 100)
+      TopTopic.refresh!
+
+      get "/categories_and_top.json"
+      data = JSON.parse(response.body)
+      expect(data["topic_list"]["topics"].length).to eq(1)
+
+      get "/categories_and_latest.json"
+      data = JSON.parse(response.body)
+      expect(data["topic_list"]["topics"].length).to eq(1)
+    end
+  end
+
+  describe 'suppress from latest' do
+
+    it 'supresses categories' do
+      topic
+
+      get "/latest.json"
+      data = JSON.parse(response.body)
+      expect(data["topic_list"]["topics"].length).to eq(1)
+
+      get "/categories_and_latest.json"
+      data = JSON.parse(response.body)
+      expect(data["topic_list"]["topics"].length).to eq(1)
+
+      topic.category.suppress_from_latest = true
+      topic.category.save
+
+      get "/latest.json"
+      data = JSON.parse(response.body)
+      expect(data["topic_list"]["topics"].length).to eq(0)
+
+      get "/categories_and_latest.json"
+      data = JSON.parse(response.body)
+      expect(data["topic_list"]["topics"].length).to eq(0)
+    end
+
+  end
+
   describe 'titles for crawler layout' do
     it 'has no title for the default URL' do
       topic
@@ -38,4 +81,133 @@ RSpec.describe ListController do
       )
     end
   end
+
+  describe "filter private messages by tag" do
+    let(:user) { Fabricate(:user) }
+    let(:moderator) { Fabricate(:moderator) }
+    let(:admin) { Fabricate(:admin) }
+    let(:tag) { Fabricate(:tag) }
+    let(:private_message) { Fabricate(:private_message_topic) }
+
+    before do
+      SiteSetting.tagging_enabled = true
+      SiteSetting.allow_staff_to_tag_pms = true
+      Fabricate(:topic_tag, tag: tag, topic: private_message)
+    end
+
+    it 'should fail for non-staff users' do
+      sign_in(user)
+      get "/topics/private-messages-tags/#{user.username}/#{tag.name}.json"
+      expect(response.status).to eq(404)
+    end
+
+    it 'should be success for staff users' do
+      [moderator, admin].each do |user|
+        sign_in(user)
+        get "/topics/private-messages-tags/#{user.username}/#{tag.name}.json"
+        expect(response.status).to eq(200)
+      end
+    end
+  end
+
+  describe '#private_messages_group' do
+    let(:user) do
+      user = Fabricate(:user)
+      group.add(user)
+      sign_in(user)
+      user
+    end
+
+    let!(:topic) do
+      Fabricate(:private_message_topic,
+        allowed_groups: [group],
+      )
+    end
+
+    let(:private_post) { Fabricate(:post, topic: topic) }
+
+    it 'should return the right response' do
+      get "/topics/private-messages-group/#{user.username}/#{group.name}.json"
+
+      expect(response.status).to eq(200)
+
+      expect(JSON.parse(response.body)["topic_list"]["topics"].first["id"])
+        .to eq(topic.id)
+    end
+  end
+
+  describe '#group_topics' do
+    %i{user user2}.each do |user|
+      let(user) do
+        user = Fabricate(:user)
+        group.add(user)
+        user
+      end
+    end
+
+    let!(:topic) { Fabricate(:topic, user: user) }
+    let!(:topic2) { Fabricate(:topic, user: user2) }
+    let!(:another_topic) { Fabricate(:topic) }
+
+    describe 'when an invalid group name is given' do
+      it 'should return the right response' do
+        get "/topics/groups/something.json"
+
+        expect(response.status).to eq(404)
+      end
+    end
+
+    describe 'for an anon user' do
+      describe 'public visible group' do
+        it 'should return the right response' do
+          get "/topics/groups/#{group.name}.json"
+
+          expect(response.status).to eq(200)
+          expect(JSON.parse(response.body)["topic_list"]).to be_present
+        end
+      end
+
+      describe 'restricted group' do
+        before { group.update!(visibility_level: Group.visibility_levels[:staff]) }
+
+        it 'should return the right response' do
+          get "/topics/groups/#{group.name}.json"
+
+          expect(response.status).to eq(403)
+        end
+      end
+    end
+
+    describe 'for a normal user' do
+      before { sign_in(Fabricate(:user)) }
+
+      describe 'restricted group' do
+        before { group.update!(visibility_level: Group.visibility_levels[:staff]) }
+
+        it 'should return the right response' do
+          get "/topics/groups/#{group.name}.json"
+
+          expect(response.status).to eq(403)
+        end
+      end
+    end
+
+    describe 'for a group user' do
+      before do
+        sign_in(user)
+      end
+
+      it 'should be able to view the topics started by group users' do
+        get "/topics/groups/#{group.name}.json"
+
+        expect(response.status).to eq(200)
+
+        topics = JSON.parse(response.body)["topic_list"]["topics"]
+
+        expect(topics.map { |topic| topic["id"] }).to contain_exactly(
+          topic.id, topic2.id
+        )
+      end
+    end
+  end
 end
diff --git a/spec/requests/omniauth_callbacks_controller_spec.rb b/spec/requests/omniauth_callbacks_controller_spec.rb
index 20ca66324b4..5e0a18edd90 100644
--- a/spec/requests/omniauth_callbacks_controller_spec.rb
+++ b/spec/requests/omniauth_callbacks_controller_spec.rb
@@ -12,6 +12,29 @@ RSpec.describe Users::OmniauthCallbacksController do
     OmniAuth.config.test_mode = false
   end
 
+  describe ".find_authenticator" do
+    it "fails if a provider is disabled" do
+      SiteSetting.enable_twitter_logins = false
+
+      expect do
+        Users::OmniauthCallbacksController.find_authenticator("twitter")
+      end.to raise_error(Discourse::InvalidAccess)
+    end
+
+    it "fails for unknown" do
+      expect do
+        Users::OmniauthCallbacksController.find_authenticator("twitter1")
+      end.to raise_error(Discourse::InvalidAccess)
+    end
+
+    it "finds an authenticator when enabled" do
+      SiteSetting.enable_twitter_logins = true
+
+      expect(Users::OmniauthCallbacksController.find_authenticator("twitter"))
+        .not_to eq(nil)
+    end
+  end
+
   context 'Google Oauth2' do
     before do
       SiteSetting.enable_google_oauth2_logins = true
@@ -109,6 +132,29 @@ RSpec.describe Users::OmniauthCallbacksController do
         expect(user.registration_ip_address).to be_present
       end
 
+      context 'when user has second factor enabled' do
+        before do
+          user.create_totp(enabled: true)
+        end
+
+        it 'should return the right response' do
+          get "/auth/google_oauth2/callback.json"
+
+          expect(response.status).to eq(200)
+
+          response_body = JSON.parse(response.body)
+
+          expect(response_body["email"]).to eq(user.email)
+          expect(response_body["omniauth_disallow_totp"]).to eq(true)
+
+          user.update!(email: 'different@user.email')
+          get "/auth/google_oauth2/callback.json"
+
+          expect(response.status).to eq(200)
+          expect(JSON.parse(response.body)["email"]).to eq(user.email)
+        end
+      end
+
       context 'when user has not verified his email' do
         before do
           GoogleUserInfo.create!(google_user_id: '12345', user: user)
@@ -176,6 +222,7 @@ RSpec.describe Users::OmniauthCallbacksController do
         Rails.application.env_config["omniauth.auth"] = OmniAuth.config.mock_auth[:google_oauth2]
 
         get "/auth/google_oauth2/callback.json"
+        expect(response.status).to eq(200)
         JSON.parse(response.body)
       end
 
diff --git a/spec/requests/post_actions_controller_spec.rb b/spec/requests/post_actions_controller_spec.rb
index 5ad8455334a..cb20f94f3a0 100644
--- a/spec/requests/post_actions_controller_spec.rb
+++ b/spec/requests/post_actions_controller_spec.rb
@@ -1,7 +1,22 @@
 require 'rails_helper'
 
 RSpec.describe PostActionsController do
+  describe '#destroy' do
+    let(:post) { Fabricate(:post, user: Fabricate(:coding_horror)) }
+
+    it 'requires you to be logged in' do
+      delete '/post_action.json', params: { id: post.id }
+      expect(response.status).to eq(404)
+    end
+  end
+
   describe '#create' do
+
+    it 'requires you to be logged in' do
+      post '/post_actions.json'
+      expect(response.status).to eq(403)
+    end
+
     describe 'as a moderator' do
       let(:user) { Fabricate(:moderator) }
       let(:post_1) { Fabricate(:post, user: Fabricate(:coding_horror)) }
@@ -11,11 +26,10 @@ RSpec.describe PostActionsController do
       end
 
       it 'raises an error when the id is missing' do
-        expect do
-          post "/post_actions.json", params: {
-            post_action_type_id: PostActionType.types[:like]
-          }
-        end.to raise_error(ActionController::ParameterMissing)
+        post "/post_actions.json", params: {
+          post_action_type_id: PostActionType.types[:like]
+        }
+        expect(response.status).to eq(400)
       end
 
       it 'fails when the id is invalid' do
@@ -27,9 +41,8 @@ RSpec.describe PostActionsController do
       end
 
       it 'raises an error when the post_action_type_id index is missing' do
-        expect do
-          post "/post_actions.json", params: { id: post_1.id }
-        end.to raise_error(ActionController::ParameterMissing)
+        post "/post_actions.json", params: { id: post_1.id }
+        expect(response.status).to eq(400)
       end
 
       it "fails when the user doesn't have permission to see the post" do
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index 95496792285..f43a5b511f5 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -1,10 +1,65 @@
 require 'rails_helper'
 
-RSpec.describe PostsController do
+shared_examples 'finding and showing post' do
+  let(:user) { Fabricate(:user) }
+  let(:post) { Fabricate(:post, user: user) }
+
+  it "ensures the user can't see the post" do
+    topic = post.topic
+    topic.convert_to_private_message(Discourse.system_user)
+    topic.remove_allowed_user(Discourse.system_user, user.username)
+    get url
+    expect(response).to be_forbidden
+  end
+
+  it 'succeeds' do
+    get url
+    expect(response).to be_success
+  end
+
+  context "deleted post" do
+    before do
+      post.trash!(user)
+    end
+
+    it "can't find deleted posts as an anonymous user" do
+      get url
+      expect(response.status).to eq(404)
+    end
+
+    it "can't find deleted posts as a regular user" do
+      sign_in(user)
+      get url
+      expect(response.status).to eq(404)
+    end
+
+    it "can find posts as a moderator" do
+      sign_in(Fabricate(:moderator))
+      get url
+      expect(response).to be_success
+    end
+
+    it "can find posts as a admin" do
+      sign_in(Fabricate(:admin))
+      get url
+      expect(response).to be_success
+    end
+  end
+end
+
+shared_examples 'action requires login' do |method, url, params = {}|
+  it 'raises an exception when not logged in' do
+    self.public_send(method, url, params)
+    expect(response.status).to eq(403)
+  end
+end
+
+describe PostsController do
   let(:user) { Fabricate(:user) }
   let(:category) { Fabricate(:category) }
   let(:topic) { Fabricate(:topic) }
   let(:public_post) { Fabricate(:post, user: user, topic: topic) }
+  let(:topicless_post) { Fabricate(:post, user: user, raw: '<p>Car 54, where are you?</p>') }
 
   let(:private_topic) do
     Fabricate(:topic, archetype: Archetype.private_message, category: nil)
@@ -12,7 +67,275 @@ RSpec.describe PostsController do
 
   let(:private_post) { Fabricate(:post, user: user, topic: private_topic) }
 
+  describe '#show' do
+    include_examples 'finding and showing post' do
+      let(:url) { "/posts/#{post.id}.json" }
+    end
+
+    it 'gets all the expected fields' do
+      # non fabricated test
+      new_post = create_post
+
+      get "/posts/#{new_post.id}.json"
+      parsed = JSON.parse(response.body)
+
+      expect(parsed["topic_slug"]).to eq(new_post.topic.slug)
+      expect(parsed["moderator"]).to eq(false)
+      expect(parsed["username"]).to eq(new_post.user.username)
+      expect(parsed["cooked"]).to eq(new_post.cooked)
+    end
+  end
+
+  describe '#by_number' do
+    include_examples 'finding and showing post' do
+      let(:url) { "/posts/by_number/#{post.topic_id}/#{post.post_number}.json" }
+    end
+  end
+
+  describe '#reply_history' do
+    include_examples 'finding and showing post' do
+      let(:url) { "/posts/#{post.id}/reply-history.json" }
+    end
+
+    it 'asks post for reply history' do
+      post = Fabricate(:post)
+      get "/posts/#{post.id}/reply-history.json"
+      expect(response.status).to eq(200)
+    end
+  end
+
+  describe '#replies' do
+    include_examples 'finding and showing post' do
+      let(:url) { "/posts/#{post.id}/replies.json" }
+    end
+
+    it 'asks post for replies' do
+      p1 = Fabricate(:post)
+      get "/posts/#{p1.id}/replies.json"
+      expect(response.status).to eq(200)
+    end
+  end
+
+  describe '#destroy' do
+    include_examples 'action requires login', :delete, "/posts/123.json"
+
+    describe 'when logged in' do
+      let(:topic) { Fabricate(:topic) }
+      let(:user) { Fabricate(:user) }
+      let(:moderator) { Fabricate(:moderator) }
+
+      it 'does not allow to destroy when edit time limit expired' do
+        SiteSetting.post_edit_time_limit = 5
+
+        post = Fabricate(:post, topic_id: topic.id, created_at: 10.minutes.ago, user_id: user.id, post_number: 3)
+        sign_in(user)
+
+        delete "/posts/#{post.id}.json"
+
+        expect(response.status).to eq(422)
+        expect(JSON.parse(response.body)['errors']).to include(I18n.t('too_late_to_edit'))
+      end
+
+      it "raises an error when the user doesn't have permission to see the post" do
+        pm = Fabricate(:private_message_topic)
+        post = Fabricate(:post, topic: pm, post_number: 3)
+
+        sign_in(user)
+
+        delete "/posts/#{post.id}.json"
+        expect(response).to be_forbidden
+      end
+
+      it "uses a PostDestroyer" do
+        post = Fabricate(:post, topic_id: topic.id, post_number: 3)
+        sign_in(moderator)
+
+        destroyer = mock
+        PostDestroyer.expects(:new).returns(destroyer)
+        destroyer.expects(:destroy)
+
+        delete "/posts/#{post.id}.json"
+      end
+    end
+  end
+
+  describe '#destroy_many' do
+    include_examples 'action requires login', :delete, "/posts/destroy_many.json", params: { post_ids: [123, 345] }
+
+    describe 'when logged in' do
+      let(:poster) { Fabricate(:moderator) }
+      let(:post1) { Fabricate(:post, user: poster, post_number: 2) }
+      let(:post2) { Fabricate(:post, topic_id: post1.topic_id, user: poster, post_number: 3, reply_to_post_number: post1.post_number) }
+
+      it "raises invalid parameters no post_ids" do
+        sign_in(poster)
+        delete "/posts/destroy_many.json"
+        expect(response.status).to eq(400)
+        expect(response.message.downcase).to eq("bad request")
+      end
+
+      it "raises invalid parameters with missing ids" do
+        sign_in(poster)
+        delete "/posts/destroy_many.json", params: { post_ids: [12345] }
+        expect(response.status).to eq(400)
+      end
+
+      it "raises an error when the user doesn't have permission to delete the posts" do
+        sign_in(Fabricate(:user))
+        delete "/posts/destroy_many.json", params: { post_ids: [post1.id, post2.id] }
+        expect(response).to be_forbidden
+      end
+
+      it "deletes the post" do
+        sign_in(poster)
+        PostDestroyer.any_instance.expects(:destroy).twice
+        delete "/posts/destroy_many.json", params: { post_ids: [post1.id, post2.id] }
+        expect(response.status).to eq(200)
+      end
+
+      it "updates the highest read data for the forum" do
+        sign_in(poster)
+        Topic.expects(:reset_highest).twice
+        delete "/posts/destroy_many.json", params: { post_ids: [post1.id, post2.id] }
+      end
+
+      describe "can delete replies" do
+        before do
+          PostReply.create(post_id: post1.id, reply_id: post2.id)
+        end
+
+        it "deletes the post and the reply to it" do
+          sign_in(poster)
+          PostDestroyer.any_instance.expects(:destroy).twice
+          delete "/posts/destroy_many.json", params: { post_ids: [post1.id], reply_post_ids: [post1.id] }
+        end
+      end
+    end
+  end
+
+  describe '#recover' do
+    include_examples 'action requires login', :put, "/posts/123/recover.json"
+
+    describe 'when logged in' do
+      let(:user) { Fabricate(:user) }
+      let(:post) { Fabricate(:post, user: user, post_number: 2) }
+
+      it "raises an error when the user doesn't have permission to see the post" do
+        post = Fabricate(:post, topic: Fabricate(:private_message_topic), post_number: 3)
+        sign_in(user)
+
+        put "/posts/#{post.id}/recover.json"
+        expect(response).to be_forbidden
+      end
+
+      it "recovers a post correctly" do
+        topic_id = create_post.topic_id
+        post = create_post(topic_id: topic_id)
+        sign_in(user)
+
+        PostDestroyer.new(user, post).destroy
+        put "/posts/#{post.id}/recover.json"
+        post.reload
+        expect(post.trashed?).to be_falsey
+      end
+    end
+  end
+
   describe '#update' do
+    include_examples 'action requires login', :put, "/posts/2.json"
+
+    let(:user) { Fabricate(:user) }
+    let(:post) { Fabricate(:post, user: user) }
+    let(:update_params) do
+      {
+        post: { raw: 'edited body', edit_reason: 'typo' },
+        image_sizes: { 'http://image.com/image.jpg' => { 'width' => 123, 'height' => 456 } },
+      }
+    end
+
+    let(:moderator) { Fabricate(:moderator) }
+
+    describe 'when logged in as a regular user' do
+      before do
+        sign_in(user)
+      end
+
+      it 'does not allow to update when edit time limit expired' do
+        SiteSetting.post_edit_time_limit = 5
+        post = Fabricate(:post, created_at: 10.minutes.ago, user: user)
+
+        put "/posts/#{post.id}.json", params: update_params
+
+        expect(response.status).to eq(422)
+        expect(JSON.parse(response.body)['errors']).to include(I18n.t('too_late_to_edit'))
+      end
+
+      it 'passes the image sizes through' do
+        Post.any_instance.expects(:image_sizes=)
+        put "/posts/#{post.id}.json", params: update_params
+      end
+
+      it 'passes the edit reason through' do
+        put "/posts/#{post.id}.json", params: update_params
+        expect(response).to be_success
+        post.reload
+        expect(post.edit_reason).to eq("typo")
+        expect(post.raw).to eq("edited body")
+      end
+
+      it "raises an error when the post parameter is missing" do
+        update_params.delete(:post)
+        put "/posts/#{post.id}.json", params: update_params
+        expect(response.status).to eq(400)
+        expect(response.message.downcase).to eq("bad request")
+      end
+
+      it "raises an error when the user doesn't have permission to see the post" do
+        post = Fabricate(:private_message_post, post_number: 3)
+        put "/posts/#{post.id}.json", params: update_params
+        expect(response).to be_forbidden
+      end
+
+      it "calls revise with valid parameters" do
+        PostRevisor.any_instance.expects(:revise!).with(post.user, { raw: 'edited body' , edit_reason: 'typo' }, anything)
+        put "/posts/#{post.id}.json", params: update_params
+      end
+
+      it "extracts links from the new body" do
+        param = update_params
+        param[:post][:raw] = 'I just visited this https://google.com so many cool links'
+
+        put "/posts/#{post.id}.json", params: param
+
+        expect(response).to be_success
+        expect(TopicLink.count).to eq(1)
+      end
+
+      it "doesn't allow updating of deleted posts" do
+        first_post = post.topic.ordered_posts.first
+        PostDestroyer.new(moderator, first_post).destroy
+
+        put "/posts/#{first_post.id}.json", params: update_params
+        expect(response).not_to be_success
+      end
+    end
+
+    describe "when logged in as staff" do
+      before do
+        sign_in(moderator)
+      end
+
+      it "supports updating posts in deleted topics" do
+        first_post = post.topic.ordered_posts.first
+        PostDestroyer.new(moderator, first_post).destroy
+
+        put "/posts/#{first_post.id}.json", params: update_params
+        expect(response).to be_success
+
+        post.reload
+        expect(post.raw).to eq('edited body')
+      end
+    end
 
     it 'can not change category to a disallowed category' do
       post = create_post
@@ -22,7 +345,6 @@ RSpec.describe PostsController do
       category.set_permissions(staff: :full)
       category.save!
 
-      # strange API, why is topic id in here twice
       put "/posts/#{post.id}.json", params: {
         post: { category_id: category.id, raw: "this is a test edit to post" }
       }
@@ -30,95 +352,553 @@ RSpec.describe PostsController do
       expect(response.status).not_to eq(200)
       expect(post.topic.category_id).not_to eq(category.id)
     end
+  end
 
+  describe '#bookmark' do
+    include_examples 'action requires login', :put, "/posts/2/bookmark.json"
+
+    describe 'when logged in' do
+      before do
+        sign_in(user)
+      end
+
+      let(:user) { Fabricate(:user) }
+      let(:post) { Fabricate(:post, user: user) }
+      let(:private_message) { Fabricate(:private_message_post) }
+
+      it "raises an error if the user doesn't have permission to see the post" do
+        put "/posts/#{private_message.id}/bookmark.json", params: { bookmarked: "true" }
+        expect(response).to be_forbidden
+      end
+
+      it 'creates a bookmark' do
+        put "/posts/#{post.id}/bookmark.json", params: { bookmarked: "true" }
+        expect(response).to be_success
+
+        post_action = PostAction.find_by(user: user, post: post)
+        expect(post_action.post_action_type_id).to eq(PostActionType.types[:bookmark])
+      end
+
+      context "removing a bookmark" do
+        let(:post_action) { PostAction.act(user, post, PostActionType.types[:bookmark]) }
+        let(:admin) { Fabricate(:admin) }
+
+        it "returns the right response when post is not bookmarked" do
+          put "/posts/#{Fabricate(:post, user: user).id}/bookmark.json"
+          expect(response.status).to eq(404)
+        end
+
+        it "should be able to remove a bookmark" do
+          post_action
+          put "/posts/#{post.id}/bookmark.json"
+
+          expect(PostAction.find_by(id: post_action.id)).to eq(nil)
+        end
+
+        describe "when user doesn't have permission to see bookmarked post" do
+          it "should still be able to remove a bookmark" do
+            post_action
+            post = post_action.post
+            topic = post.topic
+            topic.convert_to_private_message(admin)
+            topic.remove_allowed_user(admin, user.username)
+
+            expect(Guardian.new(user).can_see_post?(post.reload)).to eq(false)
+
+            put "/posts/#{post.id}/bookmark.json"
+
+            expect(PostAction.find_by(id: post_action.id)).to eq(nil)
+          end
+        end
+
+        describe "when post has been deleted" do
+          it "should still be able to remove a bookmark" do
+            post = post_action.post
+            post.trash!
+
+            put "/posts/#{post.id}/bookmark.json"
+
+            expect(PostAction.find_by(id: post_action.id)).to eq(nil)
+          end
+        end
+      end
+    end
+  end
+
+  describe '#wiki' do
+    include_examples "action requires login", :put, "/posts/2/wiki.json"
+
+    describe "when logged in" do
+      before do
+        sign_in(user)
+      end
+
+      let(:user) { Fabricate(:user) }
+      let(:post) { Fabricate(:post, user: user) }
+
+      it "raises an error if the user doesn't have permission to wiki the post" do
+        put "/posts/#{post.id}/wiki.json", params: { wiki: 'true' }
+        expect(response).to be_forbidden
+      end
+
+      it "toggle wiki status should create a new version" do
+        sign_in(Fabricate(:admin))
+        another_user = Fabricate(:user)
+        another_post = Fabricate(:post, user: another_user)
+
+        expect do
+          put "/posts/#{another_post.id}/wiki.json", params: { wiki: 'true' }
+        end.to change { another_post.reload.version }.by(1)
+
+        expect do
+          put "/posts/#{another_post.id}/wiki.json", params: { wiki: 'false' }
+        end.to change { another_post.reload.version }.by(-1)
+
+        sign_in(Fabricate(:admin))
+
+        expect do
+          put "/posts/#{another_post.id}/wiki.json", params: { wiki: 'true' }
+        end.to change { another_post.reload.version }.by(1)
+      end
+
+      it "can wiki a post" do
+        sign_in(Fabricate(:admin))
+        put "/posts/#{post.id}/wiki.json", params: { wiki: 'true' }
+
+        post.reload
+        expect(post.wiki).to eq(true)
+      end
+
+      it "can unwiki a post" do
+        wikied_post = Fabricate(:post, user: user, wiki: true)
+        sign_in(Fabricate(:admin))
+
+        put "/posts/#{wikied_post.id}/wiki.json", params: { wiki: 'false' }
+
+        wikied_post.reload
+        expect(wikied_post.wiki).to eq(false)
+      end
+    end
+  end
+
+  describe '#post_type' do
+    include_examples "action requires login", :put, "/posts/2/post_type.json"
+
+    describe "when logged in" do
+      before do
+        sign_in(user)
+      end
+
+      let(:user) { Fabricate(:user) }
+      let(:post) { Fabricate(:post, user: user) }
+
+      it "raises an error if the user doesn't have permission to change the post type" do
+        put "/posts/#{post.id}/post_type.json", params: { post_type: 2 }
+        expect(response).to be_forbidden
+      end
+
+      it "can change the post type" do
+        sign_in(Fabricate(:moderator))
+        put "/posts/#{post.id}/post_type.json", params: { post_type: 2 }
+
+        post.reload
+        expect(post.post_type).to eq(2)
+      end
+    end
+  end
+
+  describe '#rebake' do
+    include_examples "action requires login", :put, "/posts/2/rebake.json"
+
+    describe "when logged in" do
+      let(:post) { Fabricate(:post, user: user) }
+
+      it "raises an error if the user doesn't have permission to rebake the post" do
+        sign_in(Fabricate(:user))
+        put "/posts/#{post.id}/rebake.json"
+        expect(response).to be_forbidden
+      end
+
+      it "can rebake the post" do
+        sign_in(Fabricate(:moderator))
+        put "/posts/#{post.id}/rebake.json"
+        expect(response).to be_success
+      end
+    end
   end
 
   describe '#create' do
+    include_examples 'action requires login', :post, "/posts.json"
+
     before do
-      sign_in(user)
+      SiteSetting.min_first_post_typing_time = 0
     end
 
-    it 'can not create a post in a disallowed category' do
+    let(:user) { Fabricate(:user) }
 
-      category.set_permissions(staff: :full)
-      category.save!
+    context 'api' do
+      it 'memoizes duplicate requests' do
+        raw = "this is a test post 123 #{SecureRandom.hash}"
+        title = "this is a title #{SecureRandom.hash}"
 
-      post "/posts.json", params: {
-        raw: 'this is the test content',
-        title: 'this is the test title for the topic',
-        category: category.id,
-        meta_data: { xyz: 'abc' }
-      }
+        user = Fabricate(:user)
+        master_key = ApiKey.create_master_key.key
 
-      expect(response.status).to eq(403)
+        post "/posts.json", params: {
+          api_username: user.username,
+          api_key: master_key,
+          raw: raw,
+          title: title,
+          wpid: 1
+        }
+
+        expect(response).to be_success
+        original = response.body
+
+        post "/posts.json", params: {
+          api_username: user.username_lower,
+          api_key: master_key,
+          raw: raw,
+          title: title,
+          wpid: 2
+        }
+
+        expect(response).to be_success
+        expect(response.body).to eq(original)
+      end
+
+      it 'allows to create posts in import_mode' do
+        SiteSetting.queue_jobs = false
+        NotificationEmailer.enable
+        post_1 = Fabricate(:post)
+        user = Fabricate(:user)
+        master_key = ApiKey.create_master_key.key
+
+        post "/posts.json", params: {
+          api_username: user.username,
+          api_key: master_key,
+          raw: 'this is test reply 1',
+          topic_id: post_1.topic.id,
+          reply_to_post_number: 1
+        }
+
+        expect(response).to be_success
+        expect(post_1.topic.user.notifications.count).to eq(1)
+        post_1.topic.user.notifications.destroy_all
+
+        post "/posts.json", params: {
+          api_username: user.username,
+          api_key: master_key,
+          raw: 'this is test reply 2',
+          topic_id: post_1.topic.id,
+          reply_to_post_number: 1,
+          import_mode: true
+        }
+
+        expect(response).to be_success
+        expect(post_1.topic.user.notifications.count).to eq(0)
+
+        post "/posts.json", params: {
+          api_username: user.username,
+          api_key: master_key,
+          raw: 'this is test reply 3',
+          topic_id: post_1.topic.id,
+          reply_to_post_number: 1,
+          import_mode: false
+        }
+
+        expect(response).to be_success
+        expect(post_1.topic.user.notifications.count).to eq(1)
+      end
     end
 
-    it 'creates the post' do
-      post "/posts.json", params: {
-        raw: 'this is the test content',
-        title: 'this is the test title for the topic',
-        category: category.id,
-        meta_data: { xyz: 'abc' }
-      }
+    describe "when logged in" do
+      before do
+        sign_in(user)
+      end
 
-      expect(response).to be_success
+      context "fast typing" do
+        before do
+          SiteSetting.min_first_post_typing_time = 3000
+          SiteSetting.auto_silence_fast_typers_max_trust_level = 1
+        end
 
-      new_post = Post.last
-      topic = new_post.topic
+        it 'queues the post if min_first_post_typing_time is not met' do
+          post "/posts.json", params: {
+            raw: 'this is the test content',
+            title: 'this is the test title for the topic'
+          }
 
-      expect(new_post.user).to eq(user)
-      expect(new_post.raw).to eq('this is the test content')
-      expect(topic.title).to eq('This is the test title for the topic')
-      expect(topic.category).to eq(category)
-      expect(topic.meta_data).to eq("xyz" => 'abc')
+          expect(response).to be_success
+          parsed = ::JSON.parse(response.body)
+
+          expect(parsed["action"]).to eq("enqueued")
+
+          user.reload
+          expect(user).to be_silenced
+
+          qp = QueuedPost.first
+
+          mod = Fabricate(:moderator)
+          qp.approve!(mod)
+
+          user.reload
+          expect(user).not_to be_silenced
+        end
+
+        it "doesn't enqueue replies when the topic is closed" do
+          topic = Fabricate(:closed_topic)
+
+          post "/posts.json", params: {
+            raw: 'this is the test content',
+            title: 'this is the test title for the topic',
+            topic_id: topic.id
+          }
+
+          expect(response).not_to be_success
+          parsed = ::JSON.parse(response.body)
+          expect(parsed["action"]).not_to eq("enqueued")
+        end
+
+        it "doesn't enqueue replies when the post is too long" do
+          SiteSetting.max_post_length = 10
+
+          post "/posts.json", params: {
+            raw: 'this is the test content',
+            title: 'this is the test title for the topic'
+          }
+
+          expect(response).not_to be_success
+          parsed = ::JSON.parse(response.body)
+          expect(parsed["action"]).not_to eq("enqueued")
+        end
+      end
+
+      it 'silences correctly based on auto_silence_first_post_regex' do
+        SiteSetting.auto_silence_first_post_regex = "I love candy|i eat s[1-5]"
+
+        post "/posts.json", params: {
+          raw: 'this is the test content',
+          title: 'when I eat s3 sometimes when not looking'
+        }
+
+        expect(response).to be_success
+        parsed = ::JSON.parse(response.body)
+
+        expect(parsed["action"]).to eq("enqueued")
+
+        user.reload
+        expect(user).to be_silenced
+      end
+
+      it "can send a message to a group" do
+        group = Group.create(name: 'test_group', messageable_level: Group::ALIAS_LEVELS[:nobody])
+        user1 = Fabricate(:user)
+        group.add(user1)
+
+        post "/posts.json", params: {
+          raw: 'I can haz a test',
+          title: 'I loves my test',
+          target_usernames: group.name,
+          archetype: Archetype.private_message
+        }
+
+        expect(response).not_to be_success
+
+        # allow pm to this group
+        group.update_columns(messageable_level: Group::ALIAS_LEVELS[:everyone])
+
+        post "/posts.json", params: {
+          raw: 'I can haz a test',
+          title: 'I loves my test',
+          target_usernames: group.name,
+          archetype: Archetype.private_message
+        }
+
+        expect(response).to be_success
+
+        parsed = ::JSON.parse(response.body)
+        post = Post.find(parsed['id'])
+
+        expect(post.topic.topic_allowed_users.length).to eq(1)
+        expect(post.topic.topic_allowed_groups.length).to eq(1)
+      end
+
+      it "returns the nested post with a param" do
+        post "/posts.json", params: {
+          raw: 'this is the test content',
+          title: 'this is the test title for the topic',
+          nested_post: true
+        }
+
+        expect(response).to be_success
+        parsed = ::JSON.parse(response.body)
+        expect(parsed['post']).to be_present
+        expect(parsed['post']['cooked']).to be_present
+      end
+
+      it 'protects against dupes' do
+        raw = "this is a test post 123 #{SecureRandom.hash}"
+        title = "this is a title #{SecureRandom.hash}"
+
+        post "/posts.json", params: { raw: raw, title: title, wpid: 1 }
+        expect(response).to be_success
+
+        post "/posts.json", params: { raw: raw, title: title, wpid: 2 }
+        expect(response).not_to be_success
+      end
+
+      it 'can not create a post in a disallowed category' do
+        category.set_permissions(staff: :full)
+        category.save!
+
+        post "/posts.json", params: {
+          raw: 'this is the test content',
+          title: 'this is the test title for the topic',
+          category: category.id,
+          meta_data: { xyz: 'abc' }
+        }
+
+        expect(response.status).to eq(403)
+      end
+
+      it 'creates the post' do
+        post "/posts.json", params: {
+          raw: 'this is the test content',
+          title: 'this is the test title for the topic',
+          category: category.id,
+          meta_data: { xyz: 'abc' }
+        }
+
+        expect(response).to be_success
+
+        new_post = Post.last
+        topic = new_post.topic
+
+        expect(new_post.user).to eq(user)
+        expect(new_post.raw).to eq('this is the test content')
+        expect(topic.title).to eq('This is the test title for the topic')
+        expect(topic.category).to eq(category)
+        expect(topic.meta_data).to eq("xyz" => 'abc')
+      end
+
+      it 'can create a reply to a post' do
+        topic = Fabricate(:private_message_post, user: user).topic
+        post_2 = Fabricate(:private_message_post, user: user, topic: topic)
+
+        post "/posts.json", params: {
+          raw: 'this is the test content',
+          topic_id: topic.id,
+          reply_to_post_number: post_2.post_number,
+          image_sizes: { width: '100', height: '200' }
+        }
+
+        expect(response).to be_success
+
+        new_post = Post.last
+        topic = new_post.topic
+
+        expect(new_post.user).to eq(user)
+        expect(new_post.raw).to eq('this is the test content')
+        expect(new_post.reply_to_post_number).to eq(post_2.post_number)
+
+        job_args = Jobs::ProcessPost.jobs.first["args"].first
+
+        expect(job_args["image_sizes"]).to eq("width" => '100', "height" => '200')
+      end
+
+      it 'creates a private post' do
+        user_2 = Fabricate(:user)
+        user_3 = Fabricate(:user)
+
+        post "/posts.json", params: {
+          raw: 'this is the test content',
+          archetype: 'private_message',
+          title: "this is some post",
+          target_usernames: "#{user_2.username},#{user_3.username}"
+        }
+
+        expect(response).to be_success
+
+        new_post = Post.last
+        new_topic = Topic.last
+
+        expect(new_post.user).to eq(user)
+        expect(new_topic.private_message?).to eq(true)
+        expect(new_topic.allowed_users).to contain_exactly(user, user_2, user_3)
+      end
+
+      context "errors" do
+        it "does not succeed" do
+          post "/posts.json", params: { raw: 'test' }
+          expect(response).not_to be_success
+          expect(response.status).to eq(422)
+        end
+
+        it "it triggers flag_linked_posts_as_spam when the post creator returns spam" do
+          SiteSetting.newuser_spam_host_threshold = 1
+          sign_in(Fabricate(:user, trust_level: 0))
+
+          post "/posts.json", params: {
+            raw: 'this is the test content http://fakespamwebsite.com http://fakespamwebsite.com/spam http://fakespamwebsite.com/spammy',
+            title: 'this is the test title for the topic',
+            meta_data: { xyz: 'abc' }
+          }
+
+          expect(JSON.parse(response.body)["errors"]).to include(I18n.t(:spamming_host))
+        end
+      end
     end
 
-    it 'can create a reply to a post' do
-      SiteSetting.queue_jobs = true
+    describe 'shared draft' do
+      let(:destination_category) { Fabricate(:category) }
 
-      topic = Fabricate(:private_message_post, user: user).topic
-      post_2 = Fabricate(:private_message_post, user: user, topic: topic)
+      it "will raise an error for regular users" do
+        post "/posts.json", params: {
+          raw: 'this is the shared draft content',
+          title: "this is the shared draft title",
+          category: destination_category.id,
+          shared_draft: 'true'
+        }
+        expect(response).not_to be_success
+      end
 
-      post "/posts.json", params: {
-        raw: 'this is the test content',
-        topic_id: topic.id,
-        reply_to_post_number: post_2.post_number,
-        image_sizes: { width: '100', height: '200' }
-      }
+      describe "as a staff user" do
+        before do
+          sign_in(Fabricate(:moderator))
+        end
 
-      expect(response).to be_success
+        it "will raise an error if there is no shared draft category" do
+          post "/posts.json", params: {
+            raw: 'this is the shared draft content',
+            title: "this is the shared draft title",
+            category: destination_category.id,
+            shared_draft: 'true'
+          }
+          expect(response).not_to be_success
+        end
 
-      new_post = Post.last
-      topic = new_post.topic
+        context "with a shared category" do
+          let(:shared_category) { Fabricate(:category) }
+          before do
+            SiteSetting.shared_drafts_category = shared_category.id
+          end
 
-      expect(new_post.user).to eq(user)
-      expect(new_post.raw).to eq('this is the test content')
-      expect(new_post.reply_to_post_number).to eq(post_2.post_number)
-
-      job_args = Jobs::ProcessPost.jobs.first["args"].first
-
-      expect(job_args["image_sizes"]).to eq("width" => '100', "height" => '200')
-    end
-
-    it 'creates a private post' do
-      user_2 = Fabricate(:user)
-      user_3 = Fabricate(:user)
-
-      post "/posts.json", params: {
-        raw: 'this is the test content',
-        archetype: 'private_message',
-        title: "this is some post",
-        target_usernames: "#{user_2.username},#{user_3.username}"
-      }
-
-      expect(response).to be_success
-
-      new_post = Post.last
-      new_topic = Topic.last
-
-      expect(new_post.user).to eq(user)
-      expect(new_topic.private_message?).to eq(true)
-      expect(new_topic.allowed_users).to contain_exactly(user, user_2, user_3)
+          it "will work if the shared draft category is present" do
+            post "/posts.json", params: {
+              raw: 'this is the shared draft content',
+              title: "this is the shared draft title",
+              category: destination_category.id,
+              shared_draft: 'true'
+            }
+            expect(response).to be_success
+            result = JSON.parse(response.body)
+            topic = Topic.find(result['topic_id'])
+            expect(topic.category_id).to eq(shared_category.id)
+            expect(topic.shared_draft.category_id).to eq(destination_category.id)
+          end
+        end
+      end
     end
 
     describe 'warnings' do
@@ -166,6 +946,7 @@ RSpec.describe PostsController do
 
       context 'as a normal user' do
         it 'should not be able to mark a topic as warning' do
+          sign_in(user)
           post "/posts.json", params: {
             raw: 'this is the test content',
             archetype: 'private_message',
@@ -185,6 +966,334 @@ RSpec.describe PostsController do
     end
   end
 
+  describe '#revisions' do
+    let(:post) { Fabricate(:post, version: 2) }
+    let(:post_revision) { Fabricate(:post_revision, post: post) }
+
+    it "throws an exception when revision is < 2" do
+      get "/posts/#{post.id}/revisions/1.json"
+      expect(response.status).to eq(400)
+    end
+
+    context "when edit history is not visible to the public" do
+
+      before { SiteSetting.edit_history_visible_to_public = false }
+
+      it "ensures anonymous cannot see the revisions" do
+        get "/posts/#{post.id}/revisions/#{post_revision.number}.json"
+        expect(response).to be_forbidden
+      end
+
+      it "ensures regular user cannot see the revisions" do
+        sign_in(Fabricate(:user))
+        get "/posts/#{post.id}/revisions/#{post_revision.number}.json"
+        expect(response).to be_forbidden
+      end
+
+      it "ensures staff can see the revisions" do
+        sign_in(Fabricate(:admin))
+        get "/posts/#{post.id}/revisions/#{post_revision.number}.json"
+        expect(response).to be_success
+      end
+
+      it "ensures poster can see the revisions" do
+        user = Fabricate(:active_user)
+        sign_in(user)
+
+        post = Fabricate(:post, user: user, version: 3)
+        pr = Fabricate(:post_revision, user: user, post: post)
+
+        get "/posts/#{pr.post_id}/revisions/#{pr.number}.json"
+        expect(response).to be_success
+      end
+
+      it "ensures trust level 4 can see the revisions" do
+        sign_in(Fabricate(:user, trust_level: 4))
+        get "/posts/#{post_revision.post_id}/revisions/#{post_revision.number}.json"
+        expect(response).to be_success
+      end
+    end
+
+    context "when edit history is visible to everyone" do
+
+      before { SiteSetting.edit_history_visible_to_public = true }
+
+      it "ensures anyone can see the revisions" do
+        get "/posts/#{post_revision.post_id}/revisions/#{post_revision.number}.json"
+        expect(response).to be_success
+      end
+    end
+
+    context "deleted post" do
+      let(:admin) { Fabricate(:admin) }
+      let(:deleted_post) { Fabricate(:post, user: admin, version: 3) }
+      let(:deleted_post_revision) { Fabricate(:post_revision, user: admin, post: deleted_post) }
+
+      before { deleted_post.trash!(admin) }
+
+      it "also work on deleted post" do
+        sign_in(admin)
+        get "/posts/#{deleted_post_revision.post_id}/revisions/#{deleted_post_revision.number}.json"
+        expect(response).to be_success
+      end
+    end
+
+    context "deleted topic" do
+      let(:admin) { Fabricate(:admin) }
+      let(:deleted_topic) { Fabricate(:topic, user: admin) }
+      let(:post) { Fabricate(:post, user: admin, topic: deleted_topic, version: 3) }
+      let(:post_revision) { Fabricate(:post_revision, user: admin, post: post) }
+
+      before { deleted_topic.trash!(admin) }
+
+      it "also work on deleted topic" do
+        sign_in(admin)
+        get "/posts/#{post_revision.post_id}/revisions/#{post_revision.number}.json"
+        expect(response).to be_success
+      end
+    end
+  end
+
+  describe '#revert' do
+    include_examples 'action requires login', :put, "/posts/123/revisions/2/revert.json"
+
+    let(:post) { Fabricate(:post, user: Fabricate(:user), raw: "Lorem ipsum dolor sit amet, cu nam libris tractatos, ancillae senserit ius ex") }
+    let(:post_revision) { Fabricate(:post_revision, post: post, modifications: { "raw" => ["this is original post body.", "this is edited post body."] }) }
+    let(:blank_post_revision) { Fabricate(:post_revision, post: post, modifications: { "edit_reason" => ["edit reason #1", "edit reason #2"] }) }
+    let(:same_post_revision) { Fabricate(:post_revision, post: post, modifications: { "raw" => ["Lorem ipsum dolor sit amet, cu nam libris tractatos, ancillae senserit ius ex", "this is edited post body."] }) }
+
+    let(:post_id) { post.id }
+    let(:revision_id) { post_revision.number }
+    let(:moderator) { Fabricate(:moderator) }
+
+    describe 'when logged in as a regular user' do
+      it "does not work" do
+        sign_in(Fabricate(:user))
+        put "/posts/#{post_id}/revisions/#{revision_id}/revert.json"
+        expect(response).to_not be_success
+      end
+    end
+
+    describe "when logged in as staff" do
+      before do
+        sign_in(moderator)
+      end
+
+      it "fails when revision is < 2" do
+        put "/posts/#{post_id}/revisions/1/revert.json"
+        expect(response.status).to eq(400)
+      end
+
+      it "fails when post_revision record is not found" do
+        put "/posts/#{post_id}/revisions/#{revision_id + 1}/revert.json"
+        expect(response).to_not be_success
+      end
+
+      it "fails when post record is not found" do
+        put "/posts/#{post_id + 1}/revisions/#{revision_id}/revert.json"
+        expect(response).to_not be_success
+      end
+
+      it "fails when revision is blank" do
+        put "/posts/#{post_id}/revisions/#{blank_post_revision.number}/revert.json"
+        expect(response.status).to eq(422)
+        expect(JSON.parse(response.body)['errors']).to include(I18n.t('revert_version_same'))
+      end
+
+      it "fails when revised version is same as current version" do
+        put "/posts/#{post_id}/revisions/#{same_post_revision.number}/revert.json"
+        expect(response.status).to eq(422)
+        expect(JSON.parse(response.body)['errors']).to include(I18n.t('revert_version_same'))
+      end
+
+      it "works!" do
+        put "/posts/#{post_id}/revisions/#{revision_id}/revert.json"
+        expect(response).to be_success
+      end
+
+      it "supports reverting posts in deleted topics" do
+        first_post = post.topic.ordered_posts.first
+        PostDestroyer.new(moderator, first_post).destroy
+
+        put "/posts/#{post_id}/revisions/#{revision_id}/revert.json"
+        expect(response).to be_success
+      end
+    end
+  end
+
+  describe '#expand_embed' do
+    before do
+      sign_in(Fabricate(:user))
+    end
+
+    let(:post) { Fabricate(:post) }
+
+    it "raises an error when you can't see the post" do
+      post = Fabricate(:private_message_post)
+      get "/posts/#{post.id}/expand-embed.json"
+      expect(response).not_to be_success
+    end
+
+    it "retrieves the body when you can see the post" do
+      TopicEmbed.expects(:expanded_for).with(post).returns("full content")
+      get "/posts/#{post.id}/expand-embed.json"
+      expect(response).to be_success
+      expect(::JSON.parse(response.body)['cooked']).to eq("full content")
+    end
+  end
+
+  describe '#flagged_posts' do
+    include_examples "action requires login", :get, "/posts/system/flagged.json"
+
+    describe "when logged in" do
+      it "raises an error if the user doesn't have permission to see the flagged posts" do
+        sign_in(Fabricate(:user))
+        get "/posts/system/flagged.json"
+        expect(response).to be_forbidden
+      end
+
+      it "can see the flagged posts when authorized" do
+        sign_in(Fabricate(:moderator))
+        get "/posts/system/flagged.json"
+        expect(response).to be_success
+      end
+
+      it "only shows agreed and deferred flags" do
+        user = Fabricate(:user)
+        post_agreed = create_post(user: user)
+        post_deferred = create_post(user: user)
+        post_disagreed = create_post(user: user)
+
+        moderator = Fabricate(:moderator)
+        PostAction.act(moderator, post_agreed, PostActionType.types[:spam])
+        PostAction.act(moderator, post_deferred, PostActionType.types[:off_topic])
+        PostAction.act(moderator, post_disagreed, PostActionType.types[:inappropriate])
+
+        admin = Fabricate(:admin)
+        PostAction.agree_flags!(post_agreed, admin)
+        PostAction.defer_flags!(post_deferred, admin)
+        PostAction.clear_flags!(post_disagreed, admin)
+
+        sign_in(Fabricate(:moderator))
+        get "/posts/#{user.username}/flagged.json"
+        expect(response).to be_success
+
+        expect(JSON.parse(response.body).length).to eq(2)
+      end
+    end
+  end
+
+  describe '#deleted_posts' do
+    include_examples "action requires login", :get, "/posts/system/deleted.json"
+
+    describe "when logged in" do
+      it "raises an error if the user doesn't have permission to see the deleted posts" do
+        sign_in(Fabricate(:user))
+        get "/posts/system/deleted.json"
+        expect(response).to be_forbidden
+      end
+
+      it "can see the deleted posts when authorized" do
+        sign_in(Fabricate(:moderator))
+        get "/posts/system/deleted.json"
+        expect(response).to be_success
+      end
+
+      it "doesn't return secured categories for moderators if they don't have access" do
+        user = Fabricate(:user)
+        admin = Fabricate(:admin)
+        Fabricate(:moderator)
+
+        group = Fabricate(:group)
+        group.add_owner(user)
+
+        secured_category = Fabricate(:private_category, group: group)
+        secured_post = create_post(user: user, category: secured_category)
+        PostDestroyer.new(admin, secured_post).destroy
+
+        sign_in(Fabricate(:moderator))
+        get "/posts/#{user.username}/deleted.json"
+        expect(response).to be_success
+
+        data = JSON.parse(response.body)
+        expect(data.length).to eq(0)
+      end
+
+      it "doesn't return PMs for moderators" do
+        user = Fabricate(:user)
+        admin = Fabricate(:admin)
+        Fabricate(:moderator)
+
+        pm_post = create_post(user: user, archetype: 'private_message', target_usernames: [admin.username])
+        PostDestroyer.new(admin, pm_post).destroy
+
+        sign_in(Fabricate(:moderator))
+        get "/posts/#{user.username}/deleted.json"
+        expect(response).to be_success
+
+        data = JSON.parse(response.body)
+        expect(data.length).to eq(0)
+      end
+
+      it "only shows posts deleted by other users" do
+        user = Fabricate(:user)
+        admin = Fabricate(:admin)
+
+        create_post(user: user)
+        post_deleted_by_user = create_post(user: user)
+        post_deleted_by_admin = create_post(user: user)
+
+        PostDestroyer.new(user, post_deleted_by_user).destroy
+        PostDestroyer.new(admin, post_deleted_by_admin).destroy
+
+        sign_in(Fabricate(:admin))
+        get "/posts/#{user.username}/deleted.json"
+        expect(response).to be_success
+
+        data = JSON.parse(response.body)
+        expect(data.length).to eq(1)
+        expect(data[0]["id"]).to eq(post_deleted_by_admin.id)
+        expect(data[0]["deleted_by"]["id"]).to eq(admin.id)
+      end
+    end
+  end
+
+  describe '#markdown_id' do
+    it "can be viewed by anonymous" do
+      post = Fabricate(:post, raw: "123456789")
+      get "/posts/#{post.id}/raw.json"
+      expect(response).to be_success
+      expect(response.body).to eq("123456789")
+    end
+  end
+
+  describe '#markdown_num' do
+    it "can be viewed by anonymous" do
+      topic = Fabricate(:topic)
+      post = Fabricate(:post, topic: topic, post_number: 1, raw: "123456789")
+      post.save
+      get "/raw/#{topic.id}/1.json"
+      expect(response).to be_success
+      expect(response.body).to eq("123456789")
+    end
+  end
+
+  describe '#short_link' do
+    let(:topic) { Fabricate(:topic) }
+    let(:post) { Fabricate(:post, topic: topic) }
+
+    it "redirects to the topic" do
+      get "/p/#{post.id}.json"
+      expect(response).to be_redirect
+    end
+
+    it "returns a 403 when access is denied" do
+      post = Fabricate(:private_message_post)
+      get "/p/#{post.id}.json"
+      expect(response).to be_forbidden
+    end
+  end
+
   describe '#user_posts_feed' do
     it 'returns public posts rss feed' do
       public_post
@@ -217,6 +1326,21 @@ RSpec.describe PostsController do
         expect(body).to include(private_post.url)
         expect(body).to_not include(public_post.url)
       end
+
+      it 'returns private posts for json' do
+        sign_in(Fabricate(:admin))
+
+        public_post
+        private_post
+        get "/private-posts.json"
+        expect(response).to be_success
+
+        json = ::JSON.parse(response.body)
+        post_ids = json['private_posts'].map { |p| p['id'] }
+
+        expect(post_ids).to include private_post.id
+        expect(post_ids).to_not include public_post.id
+      end
     end
 
     context 'public posts' do
@@ -233,6 +1357,81 @@ RSpec.describe PostsController do
         expect(body).to include(public_post.url)
         expect(body).to_not include(private_post.url)
       end
+
+      it 'returns public posts with topic for json' do
+        topicless_post.update topic_id: -100
+
+        public_post
+        private_post
+        topicless_post
+
+        get "/posts.json"
+        expect(response).to be_success
+
+        json = ::JSON.parse(response.body)
+        post_ids = json['latest_posts'].map { |p| p['id'] }
+
+        expect(post_ids).to include public_post.id
+        expect(post_ids).to_not include private_post.id
+        expect(post_ids).to_not include topicless_post.id
+      end
     end
   end
+
+  describe '#cooked' do
+    it 'returns the cooked conent' do
+      post = Fabricate(:post, cooked: "WAt")
+      get "/posts/#{post.id}/cooked.json"
+
+      expect(response).to be_success
+      json = ::JSON.parse(response.body)
+
+      expect(json).to be_present
+      expect(json['cooked']).to eq('WAt')
+    end
+  end
+
+  describe '#raw_email' do
+    include_examples "action requires login", :get, "/posts/2/raw-email.json"
+
+    describe "when logged in" do
+      let(:post) { Fabricate(:post, deleted_at: 2.hours.ago, user: Fabricate(:user), raw_email: 'email_content') }
+
+      it "raises an error if the user doesn't have permission to view raw email" do
+        sign_in(Fabricate(:user))
+
+        get "/posts/#{post.id}/raw-email.json"
+        expect(response).to be_forbidden
+      end
+
+      it "can view raw email" do
+        sign_in(Fabricate(:moderator))
+
+        get "/posts/#{post.id}/raw-email.json"
+        expect(response).to be_success
+
+        json = ::JSON.parse(response.body)
+        expect(json['raw_email']).to eq('email_content')
+      end
+    end
+  end
+
+  describe "#locked" do
+    before do
+      sign_in(Fabricate(:moderator))
+    end
+
+    it 'can lock and unlock the post' do
+      put "/posts/#{public_post.id}/locked.json", params: { locked: "true" }
+      expect(response).to be_success
+      public_post.reload
+      expect(public_post).to be_locked
+
+      put "/posts/#{public_post.id}/locked.json", params: { locked: "false" }
+      expect(response).to be_success
+      public_post.reload
+      expect(public_post).not_to be_locked
+    end
+  end
+
 end
diff --git a/spec/requests/push_notification_controller_spec.rb b/spec/requests/push_notification_controller_spec.rb
new file mode 100644
index 00000000000..42f12e3a073
--- /dev/null
+++ b/spec/requests/push_notification_controller_spec.rb
@@ -0,0 +1,112 @@
+require 'rails_helper'
+
+describe PushNotificationController do
+  let(:user) { Fabricate(:user) }
+
+  context "logged out" do
+    it "should not allow subscribe" do
+      post '/push_notifications/subscribe.json', params: {
+        username: "test",
+        subscription: {
+          endpoint: "endpoint",
+          keys: {
+            p256dh: "256dh",
+            auth: "auth"
+          }
+        },
+        send_confirmation: false
+      }
+
+      expect(response.status).to eq(403)
+    end
+  end
+
+  context "logged in" do
+    before { sign_in(user) }
+
+    it "should subscribe" do
+      post '/push_notifications/subscribe.json', params: {
+        username: user.username,
+        subscription: {
+          endpoint: "endpoint",
+          keys: {
+            p256dh: "256dh",
+            auth: "auth"
+          }
+        },
+        send_confirmation: false
+      }
+
+      expect(response.status).to eq(200)
+      expect(user.push_subscriptions.count).to eq(1)
+    end
+
+    it "should fix duplicate subscriptions" do
+      subscription = {
+        endpoint: "endpoint",
+        keys: {
+          p256dh: "256dh",
+          auth: "auth"
+        }
+      }
+      PushSubscription.create user: user, data: subscription.to_json
+      post '/push_notifications/subscribe.json', params: {
+             username: user.username,
+             subscription: subscription,
+             send_confirmation: false
+           }
+
+      expect(response.status).to eq(200)
+      expect(user.push_subscriptions.count).to eq(1)
+    end
+
+    it "should not create duplicate subscriptions" do
+      2.times do
+        post '/push_notifications/subscribe.json', params: {
+           username: user.username,
+           subscription: {
+             endpoint: "endpoint",
+             keys: {
+               p256dh: "256dh",
+               auth: "auth"
+             }
+           },
+           send_confirmation: false
+         }
+      end
+
+      expect(response.status).to eq(200)
+      expect(user.push_subscriptions.count).to eq(1)
+    end
+
+    it "should unsubscribe with existing subscription" do
+      sub = { endpoint: "endpoint", keys: { p256dh: "256dh", auth: "auth" } }
+      PushSubscription.create!(user: user, data: sub.to_json)
+
+      post '/push_notifications/unsubscribe.json', params: {
+        username: user.username,
+        subscription: sub
+      }
+
+      expect(response.status).to eq(200)
+      expect(user.push_subscriptions).to eq([])
+    end
+
+    it "should unsubscribe without subscription" do
+      post '/push_notifications/unsubscribe.json', params: {
+        username: user.username,
+        subscription: {
+          endpoint: "endpoint",
+          keys: {
+            p256dh: "256dh",
+            auth: "auth"
+          }
+        }
+      }
+
+      expect(response.status).to eq(200)
+      expect(user.push_subscriptions).to eq([])
+    end
+  end
+
+end
diff --git a/spec/requests/robots_txt_controller_spec.rb b/spec/requests/robots_txt_controller_spec.rb
index 68d5912be41..c5627c0f19b 100644
--- a/spec/requests/robots_txt_controller_spec.rb
+++ b/spec/requests/robots_txt_controller_spec.rb
@@ -1,12 +1,95 @@
 require 'rails_helper'
 
 RSpec.describe RobotsTxtController do
-  describe '#index' do
-    it "returns index when indexing is allowed" do
-      SiteSetting.allow_index_in_robots_txt = true
-      get '/robots.txt'
+  describe '#builder' do
+    it "returns json information for building a robots.txt" do
+      get "/robots-builder.json"
+      json = ::JSON.parse(response.body)
+      expect(json).to be_present
+      expect(json['header']).to be_present
+      expect(json['agents']).to be_present
+    end
+  end
 
-      expect(response.body).to include("Disallow: /u/")
+  describe '#index' do
+
+    context 'subfolder' do
+      it 'prefixes the rules with the directory' do
+        Discourse.stubs(:base_uri).returns('/forum')
+        get '/robots.txt'
+        expect(response.body).to include("\nDisallow: /forum/admin")
+      end
+    end
+
+    context 'crawl delay' do
+      it 'allows you to set crawl delay on particular bots' do
+        SiteSetting.allow_index_in_robots_txt = true
+        SiteSetting.slow_down_crawler_rate = 17
+        SiteSetting.slow_down_crawler_user_agents = 'bingbot|googlebot'
+        get '/robots.txt'
+        expect(response.body).to include("\nUser-agent: bingbot\nCrawl-delay: 17")
+        expect(response.body).to include("\nUser-agent: googlebot\nCrawl-delay: 17")
+      end
+    end
+
+    context 'allow_index_in_robots_txt is true' do
+
+      def expect_allowed_and_disallowed_sections(allow_index, disallow_index)
+        expect(allow_index).to be_present
+        expect(disallow_index).to be_present
+
+        allow_section = allow_index < disallow_index ?
+          response.body[allow_index...disallow_index] : response.body[allow_index..-1]
+
+        expect(allow_section).to include('Disallow: /u/')
+        expect(allow_section).to_not include("Disallow: /\n")
+
+        disallowed_section = allow_index < disallow_index ?
+          response.body[disallow_index..-1] : response.body[disallow_index...allow_index]
+        expect(disallowed_section).to include("Disallow: /\n")
+      end
+
+      it "returns index when indexing is allowed" do
+        SiteSetting.allow_index_in_robots_txt = true
+        get '/robots.txt'
+
+        i = response.body.index('User-agent: *')
+        expect(i).to be_present
+        expect(response.body[i..-1]).to include("Disallow: /u/")
+      end
+
+      it "can whitelist user agents" do
+        SiteSetting.whitelisted_crawler_user_agents = "Googlebot|Twitterbot"
+        get '/robots.txt'
+        expect(response.body).to include('User-agent: Googlebot')
+        expect(response.body).to include('User-agent: Twitterbot')
+
+        allowed_index = [response.body.index('User-agent: Googlebot'), response.body.index('User-agent: Twitterbot')].min
+        disallow_all_index = response.body.index('User-agent: *')
+
+        expect_allowed_and_disallowed_sections(allowed_index, disallow_all_index)
+      end
+
+      it "can blacklist user agents" do
+        SiteSetting.blacklisted_crawler_user_agents = "Googlebot|Twitterbot"
+        get '/robots.txt'
+        expect(response.body).to include('User-agent: Googlebot')
+        expect(response.body).to include('User-agent: Twitterbot')
+
+        disallow_index = [response.body.index('User-agent: Googlebot'), response.body.index('User-agent: Twitterbot')].min
+        allow_index = response.body.index('User-agent: *')
+
+        expect_allowed_and_disallowed_sections(allow_index, disallow_index)
+      end
+
+      it "ignores blacklist if whitelist is set" do
+        SiteSetting.whitelisted_crawler_user_agents = "Googlebot|Twitterbot"
+        SiteSetting.blacklisted_crawler_user_agents = "Bananabot"
+        get '/robots.txt'
+        expect(response.body).to_not include('Bananabot')
+        expect(response.body).to include('User-agent: Googlebot')
+        expect(response.body).to include('User-agent: Twitterbot')
+      end
     end
 
     it "returns noindex when indexing is disallowed" do
diff --git a/spec/requests/safe_mode_controller_spec.rb b/spec/requests/safe_mode_controller_spec.rb
index a47d2f085c5..2b6037eb0e9 100644
--- a/spec/requests/safe_mode_controller_spec.rb
+++ b/spec/requests/safe_mode_controller_spec.rb
@@ -5,9 +5,24 @@ RSpec.describe SafeModeController do
     context 'when no params are given' do
       it 'should redirect back to safe mode page' do
         post '/safe-mode'
-
         expect(response.status).to redirect_to(safe_mode_path)
       end
     end
+
+    context 'when safe mode is not enabled' do
+      it 'should raise an error' do
+        SiteSetting.enable_safe_mode = false
+        post '/safe-mode'
+        expect(response.status).to eq(404)
+      end
+
+      it "doesn't raise an error for staff" do
+        SiteSetting.enable_safe_mode = false
+        sign_in(Fabricate(:moderator))
+        post '/safe-mode'
+        expect(response.status).to redirect_to(safe_mode_path)
+      end
+    end
+
   end
 end
diff --git a/spec/controllers/session_controller_spec.rb b/spec/requests/session_controller_spec.rb
similarity index 51%
rename from spec/controllers/session_controller_spec.rb
rename to spec/requests/session_controller_spec.rb
index cc535e72223..3dfb07c5833 100644
--- a/spec/controllers/session_controller_spec.rb
+++ b/spec/requests/session_controller_spec.rb
@@ -1,39 +1,234 @@
 require 'rails_helper'
 
-describe SessionController do
+RSpec.describe SessionController do
+  let(:email_token) { Fabricate(:email_token) }
+  let(:user) { email_token.user }
+  let(:logo_fixture) { "http://#{Discourse.current_hostname}/uploads/logo.png" }
+
   shared_examples 'failed to continue local login' do
     it 'should return the right response' do
       expect(response).not_to be_success
-      expect(response.status.to_i).to eq 500
+      expect(response.status).to eq(500)
     end
   end
 
-  describe 'become' do
+  describe '#email_login' do
+    before do
+      SiteSetting.enable_local_logins_via_email = true
+    end
+
+    context 'missing token' do
+      it 'returns the right response' do
+        get "/session/email-login"
+        expect(response.status).to eq(404)
+      end
+    end
+
+    context 'invalid token' do
+      it 'returns the right response' do
+        get "/session/email-login/adasdad"
+
+        expect(response).to be_success
+
+        expect(CGI.unescapeHTML(response.body)).to match(
+          I18n.t('email_login.invalid_token')
+        )
+      end
+
+      context 'when token has expired' do
+        it 'should return the right response' do
+          email_token.update!(created_at: 999.years.ago)
+
+          get "/session/email-login/#{email_token.token}"
+
+          expect(response).to be_success
+
+          expect(CGI.unescapeHTML(response.body)).to match(
+            I18n.t('email_login.invalid_token')
+          )
+        end
+      end
+    end
+
+    context 'valid token' do
+      it 'returns success' do
+        get "/session/email-login/#{email_token.token}"
+
+        expect(response).to redirect_to("/")
+      end
+
+      it 'fails when local logins via email is disabled' do
+        SiteSetting.enable_local_logins_via_email = false
+
+        get "/session/email-login/#{email_token.token}"
+
+        expect(response.status).to eq(404)
+      end
+
+      it 'fails when local logins is disabled' do
+        SiteSetting.enable_local_logins = false
+
+        get "/session/email-login/#{email_token.token}"
+
+        expect(response.status).to eq(500)
+      end
+
+      it "doesn't log in the user when not approved" do
+        SiteSetting.must_approve_users = true
+
+        get "/session/email-login/#{email_token.token}"
+
+        expect(response.status).to eq(200)
+
+        expect(CGI.unescapeHTML(response.body)).to include(
+          I18n.t("login.not_approved")
+        )
+      end
+
+      context "when admin IP address is not valid" do
+        before do
+          Fabricate(:screened_ip_address,
+            ip_address: "111.111.11.11",
+            action_type: ScreenedIpAddress.actions[:allow_admin]
+          )
+
+          SiteSetting.use_admin_ip_whitelist = true
+          user.update!(admin: true)
+        end
+
+        it 'returns the right response' do
+          get "/session/email-login/#{email_token.token}"
+
+          expect(response.status).to eq(200)
+
+          expect(CGI.unescapeHTML(response.body)).to include(
+            I18n.t("login.admin_not_allowed_from_ip_address", username: user.username)
+          )
+        end
+      end
+
+      context "when IP address is blocked" do
+        let(:permitted_ip_address) { '111.234.23.11' }
+
+        before do
+          Fabricate(:screened_ip_address,
+            ip_address: permitted_ip_address,
+            action_type: ScreenedIpAddress.actions[:block]
+          )
+        end
+
+        it 'returns the right response' do
+          ActionDispatch::Request.any_instance.stubs(:remote_ip).returns(permitted_ip_address)
+
+          get "/session/email-login/#{email_token.token}"
+
+          expect(response.status).to eq(200)
+
+          expect(CGI.unescapeHTML(response.body)).to include(
+            I18n.t("login.not_allowed_from_ip_address", username: user.username)
+          )
+        end
+      end
+
+      it "fails when user is suspended" do
+        user.update!(
+          suspended_till: 2.days.from_now,
+          suspended_at: Time.zone.now
+        )
+
+        get "/session/email-login/#{email_token.token}"
+
+        expect(response.status).to eq(200)
+
+        expect(CGI.unescapeHTML(response.body)).to include(I18n.t("login.suspended",
+          date: I18n.l(user.suspended_till, format: :date_only)
+        ))
+      end
+
+      context 'user has 2-factor logins' do
+        let!(:user_second_factor) { Fabricate(:user_second_factor, user: user) }
+
+        describe 'requires second factor' do
+          it 'should return a second factor prompt' do
+            get "/session/email-login/#{email_token.token}"
+
+            expect(response.status).to eq(200)
+
+            response_body = CGI.unescapeHTML(response.body)
+
+            expect(response_body).to include(I18n.t(
+              "login.second_factor_title"
+            ))
+
+            expect(response_body).to_not include(I18n.t(
+              "login.invalid_second_factor_code"
+            ))
+          end
+        end
+
+        describe 'errors on incorrect 2-factor' do
+          it 'does not log in with incorrect two factor' do
+            post "/session/email-login/#{email_token.token}", params: { second_factor_token: "0000" }
+
+            expect(response.status).to eq(200)
+
+            expect(CGI.unescapeHTML(response.body)).to include(I18n.t(
+              "login.invalid_second_factor_code"
+            ))
+          end
+        end
+
+        describe 'allows successful 2-factor' do
+          it 'logs in correctly' do
+            post "/session/email-login/#{email_token.token}", params: {
+              second_factor_token: ROTP::TOTP.new(user_second_factor.data).now
+            }
+
+            expect(response).to redirect_to("/")
+          end
+        end
+      end
+    end
+  end
+
+  context 'logoff support' do
+    it 'can log off users cleanly' do
+      user = Fabricate(:user)
+      sign_in(user)
+
+      UserAuthToken.destroy_all
+
+      # we need a route that will call current user
+      post '/draft.json', params: {}
+      expect(response.headers['Discourse-Logged-Out']).to eq("1")
+    end
+  end
+
+  describe '#become' do
     let!(:user) { Fabricate(:user) }
 
-    it "does not work when not in development mode" do
-      Rails.env.stubs(:development?).returns(false)
-      get :become, params: { session_id: user.username }, format: :json
-      expect(response).not_to be_redirect
+    it "does not work when in production mode" do
+      Rails.env.stubs(:production?).returns(true)
+      get "/session/#{user.username}/become.json"
+
+      expect(response.status).to eq(403)
+      expect(JSON.parse(response.body)["error_type"]).to eq("invalid_access")
       expect(session[:current_user_id]).to be_blank
     end
 
     it "works in developmenet mode" do
       Rails.env.stubs(:development?).returns(true)
-      get :become, params: { session_id: user.username }, format: :json
+      get "/session/#{user.username}/become.json"
       expect(response).to be_redirect
       expect(session[:current_user_id]).to eq(user.id)
     end
   end
 
-  describe '.sso_login' do
-
+  describe '#sso_login' do
     before do
       @sso_url = "http://somesite.com/discourse_sso"
       @sso_secret = "shjkfdhsfkjh"
 
-      request.host = Discourse.current_hostname
-
       SiteSetting.sso_url = @sso_url
       SiteSetting.enable_sso = true
       SiteSetting.sso_secret = @sso_secret
@@ -45,6 +240,8 @@ describe SessionController do
       # SiteSetting.send_welcome_message = false
     end
 
+    let(:headers) { { host: Discourse.current_hostname } }
+
     def get_sso(return_path)
       nonce = SecureRandom.hex
       dso = DiscourseSingleSignOn.new
@@ -64,7 +261,7 @@ describe SessionController do
       sso.external_id = 'abc'
       sso.username = 'sam'
 
-      get :sso_login, params: Rack::Utils.parse_query(sso.payload)
+      get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
 
       expect(response).to redirect_to('/')
       logged_on_user = Discourse.current_user_provider.new(request.env).current_user
@@ -83,25 +280,27 @@ describe SessionController do
     end
 
     it 'respects IP restrictions on create' do
-      screened_ip = Fabricate(:screened_ip_address)
-      ActionDispatch::Request.any_instance.stubs(:remote_ip).returns(screened_ip.ip_address)
+      ScreenedIpAddress.all.destroy_all
+      get "/"
+      screened_ip = Fabricate(:screened_ip_address, ip_address: request.remote_ip, action_type: ScreenedIpAddress.actions[:block])
 
       sso = sso_for_ip_specs
-      get :sso_login, params: Rack::Utils.parse_query(sso.payload)
+      get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
 
       logged_on_user = Discourse.current_user_provider.new(request.env).current_user
       expect(logged_on_user).to eq(nil)
     end
 
     it 'respects IP restrictions on login' do
+      ScreenedIpAddress.all.destroy_all
+      get "/"
       sso = sso_for_ip_specs
-      _user = DiscourseSingleSignOn.parse(sso.payload).lookup_or_create_user(request.remote_ip)
+      DiscourseSingleSignOn.parse(sso.payload).lookup_or_create_user(request.remote_ip)
 
       sso = sso_for_ip_specs
-      screened_ip = Fabricate(:screened_ip_address)
-      ActionDispatch::Request.any_instance.stubs(:remote_ip).returns(screened_ip.ip_address)
+      screened_ip = Fabricate(:screened_ip_address, ip_address: request.remote_ip, action_type: ScreenedIpAddress.actions[:block])
 
-      get :sso_login, params: Rack::Utils.parse_query(sso.payload)
+      get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
       logged_on_user = Discourse.current_user_provider.new(request.env).current_user
       expect(logged_on_user).to be_blank
     end
@@ -114,7 +313,7 @@ describe SessionController do
       sso.username = 'sam'
 
       ScreenedEmail.block('bob@bob.com')
-      get :sso_login, params: Rack::Utils.parse_query(sso.payload)
+      get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
 
       logged_on_user = Discourse.current_user_provider.new(request.env).current_user
       expect(logged_on_user).to eq(nil)
@@ -130,7 +329,7 @@ describe SessionController do
       sso.custom_fields["shop_name"] = "Sam"
       sso.admin = true
 
-      get :sso_login, params: Rack::Utils.parse_query(sso.payload)
+      get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
 
       logged_on_user = Discourse.current_user_provider.new(request.env).current_user
       expect(logged_on_user.admin).to eq(true)
@@ -143,7 +342,7 @@ describe SessionController do
       sso.name = 'Sam Saffron'
       sso.username = 'sam'
 
-      get :sso_login, params: Rack::Utils.parse_query(sso.payload)
+      get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
       expect(response).to redirect_to('/b/')
     end
 
@@ -156,7 +355,7 @@ describe SessionController do
       sso.name = 'Sam Saffron'
       sso.username = 'sam'
 
-      get :sso_login, params: Rack::Utils.parse_query(sso.payload)
+      get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
       expect(response).to redirect_to('https://gusundtrout.com')
     end
 
@@ -167,7 +366,7 @@ describe SessionController do
       sso.name = 'Sam Saffron'
       sso.username = 'sam'
 
-      get :sso_login, params: Rack::Utils.parse_query(sso.payload)
+      get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
       expect(response).to redirect_to('/')
     end
 
@@ -178,7 +377,7 @@ describe SessionController do
       sso.name = 'Sam Saffron'
       sso.username = 'sam'
 
-      get :sso_login, params: Rack::Utils.parse_query(sso.payload)
+      get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
       expect(response).to redirect_to('/')
     end
 
@@ -192,7 +391,7 @@ describe SessionController do
       sso.custom_fields["shop_name"] = "Sam"
 
       events = DiscourseEvent.track_events do
-        get :sso_login, params: Rack::Utils.parse_query(sso.payload)
+        get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
       end
 
       expect(events.map { |event| event[:event_name] }).to include(
@@ -229,14 +428,13 @@ describe SessionController do
           sso.username = 'sam'
           sso.require_activation = true
 
-          get :sso_login, params: Rack::Utils.parse_query(sso.payload)
+          get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
 
           logged_on_user = Discourse.current_user_provider.new(request.env).current_user
           expect(logged_on_user).to eq(nil)
         end
 
         it 'sends an activation email' do
-          Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :signup))
           sso = get_sso('/a/')
           sso.external_id = '666' # the number of the beast
           sso.email = 'bob@bob.com'
@@ -244,7 +442,8 @@ describe SessionController do
           sso.username = 'sam'
           sso.require_activation = true
 
-          get :sso_login, params: Rack::Utils.parse_query(sso.payload)
+          get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
+          expect(Jobs::CriticalUserEmail.jobs.size).to eq(1)
         end
       end
 
@@ -259,7 +458,7 @@ describe SessionController do
           user.create_single_sign_on_record(external_id: '997', last_payload: '')
           user.stubs(:active?).returns(true)
 
-          get :sso_login, params: Rack::Utils.parse_query(sso.payload)
+          get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
 
           logged_on_user = Discourse.current_user_provider.new(request.env).current_user
           expect(user.id).to eq(logged_on_user.id)
@@ -275,7 +474,7 @@ describe SessionController do
       user = Fabricate(:user)
       user.create_single_sign_on_record(external_id: '997', last_payload: '')
 
-      get :sso_login, params: Rack::Utils.parse_query(sso.payload)
+      get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
 
       user.single_sign_on_record.reload
       expect(user.single_sign_on_record.last_payload).to eq(sso.unsigned_payload)
@@ -286,12 +485,17 @@ describe SessionController do
       expect(user.id).to eq(logged_on_user.id)
 
       # nonce is bad now
-      get :sso_login, params: Rack::Utils.parse_query(sso.payload)
-      expect(response.code).to eq('419')
+      get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
+      expect(response.status).to eq(419)
     end
 
     describe 'can act as an SSO provider' do
       before do
+        stub_request(:any, /#{Discourse.current_hostname}\/uploads/).to_return(
+          status: 200,
+          body: lambda { |request| file_from_fixtures("logo.png") }
+        )
+
         SiteSetting.enable_sso_provider = true
         SiteSetting.enable_sso = false
         SiteSetting.enable_local_logins = true
@@ -305,19 +509,25 @@ describe SessionController do
         @user = Fabricate(:user, password: "myfrogs123ADMIN", active: true, admin: true)
         group = Fabricate(:group)
         group.add(@user)
+
+        @user.create_user_avatar!
+        UserAvatar.import_url_for_user(logo_fixture, @user)
+        UserProfile.import_url_for_user(logo_fixture, @user, is_card_background: false)
+        UserProfile.import_url_for_user(logo_fixture, @user, is_card_background: true)
+
         @user.reload
+        @user.user_avatar.reload
+        @user.user_profile.reload
         EmailToken.update_all(confirmed: true)
       end
 
       it "successfully logs in and redirects user to return_sso_url when the user is not logged in" do
-        get :sso_provider, params: Rack::Utils.parse_query(@sso.payload)
+        get "/session/sso_provider", params: Rack::Utils.parse_query(@sso.payload), headers: headers
+
         expect(response).to redirect_to("/login")
 
-        post :create,
-          params: { login: @user.username, password: "myfrogs123ADMIN" },
-          format: :json,
-          xhr: true
-
+        post "/session.json",
+          params: { login: @user.username, password: "myfrogs123ADMIN" }, xhr: true
         location = response.cookies["sso_destination_url"]
         # javascript code will handle redirection of user to return_sso_url
         expect(location).to match(/^http:\/\/somewhere.over.rainbow\/sso/)
@@ -331,13 +541,21 @@ describe SessionController do
         expect(sso2.external_id).to eq(@user.id.to_s)
         expect(sso2.admin).to eq(true)
         expect(sso2.moderator).to eq(false)
-        expect(sso2.groups).to eq(@user.groups.pluck(:name))
+        expect(sso2.groups).to eq(@user.groups.pluck(:name).join(","))
+
+        expect(sso2.avatar_url.blank?).to_not eq(true)
+        expect(sso2.profile_background_url.blank?).to_not eq(true)
+        expect(sso2.card_background_url.blank?).to_not eq(true)
+
+        expect(sso2.avatar_url).to start_with(Discourse.base_url)
+        expect(sso2.profile_background_url).to start_with(Discourse.base_url)
+        expect(sso2.card_background_url).to start_with(Discourse.base_url)
       end
 
       it "successfully redirects user to return_sso_url when the user is logged in" do
-        log_in_user(@user)
+        sign_in(@user)
 
-        get :sso_provider, params: Rack::Utils.parse_query(@sso.payload)
+        get "/session/sso_provider", params: Rack::Utils.parse_query(@sso.payload), headers: headers
 
         location = response.header["Location"]
         expect(location).to match(/^http:\/\/somewhere.over.rainbow\/sso/)
@@ -351,6 +569,70 @@ describe SessionController do
         expect(sso2.external_id).to eq(@user.id.to_s)
         expect(sso2.admin).to eq(true)
         expect(sso2.moderator).to eq(false)
+        expect(sso2.groups).to eq(@user.groups.pluck(:name).join(","))
+
+        expect(sso2.avatar_url.blank?).to_not eq(true)
+        expect(sso2.profile_background_url.blank?).to_not eq(true)
+        expect(sso2.card_background_url.blank?).to_not eq(true)
+
+        expect(sso2.avatar_url).to start_with(Discourse.base_url)
+        expect(sso2.profile_background_url).to start_with(Discourse.base_url)
+        expect(sso2.card_background_url).to start_with(Discourse.base_url)
+      end
+
+      it 'handles non local content correctly' do
+        SiteSetting.avatar_sizes = "100|49"
+        SiteSetting.enable_s3_uploads = true
+        SiteSetting.s3_access_key_id = "XXX"
+        SiteSetting.s3_secret_access_key = "XXX"
+        SiteSetting.s3_upload_bucket = "test"
+        SiteSetting.s3_cdn_url = "http://cdn.com"
+
+        stub_request(:any, /test.s3.amazonaws.com/).to_return(status: 200, body: "", headers: {})
+
+        @user.create_user_avatar!
+        upload = Fabricate(:upload, url: "//test.s3.amazonaws.com/something")
+
+        Fabricate(:optimized_image,
+          sha1: SecureRandom.hex << "A" * 8,
+          upload: upload,
+          width: 98,
+          height: 98,
+          url: "//test.s3.amazonaws.com/something/else"
+        )
+
+        @user.update_columns(uploaded_avatar_id: upload.id)
+        @user.user_profile.update_columns(
+          profile_background: "//test.s3.amazonaws.com/something",
+          card_background: "//test.s3.amazonaws.com/something"
+        )
+
+        @user.reload
+        @user.user_avatar.reload
+        @user.user_profile.reload
+
+        sign_in(@user)
+
+        stub_request(:get, "http://cdn.com/something/else").to_return(
+          body: lambda { |request| File.new(Rails.root + 'spec/fixtures/images/logo.png') }
+        )
+
+        get "/session/sso_provider", params: Rack::Utils.parse_query(@sso.payload), headers: headers
+
+        location = response.header["Location"]
+        # javascript code will handle redirection of user to return_sso_url
+        expect(location).to match(/^http:\/\/somewhere.over.rainbow\/sso/)
+
+        payload = location.split("?")[1]
+        sso2 = SingleSignOn.parse(payload, "topsecret")
+
+        expect(sso2.avatar_url.blank?).to_not eq(true)
+        expect(sso2.profile_background_url.blank?).to_not eq(true)
+        expect(sso2.card_background_url.blank?).to_not eq(true)
+
+        expect(sso2.avatar_url).to start_with(SiteSetting.s3_cdn_url)
+        expect(sso2.profile_background_url).to start_with(SiteSetting.s3_cdn_url)
+        expect(sso2.card_background_url).to start_with(SiteSetting.s3_cdn_url)
       end
     end
 
@@ -378,7 +660,7 @@ describe SessionController do
       end
 
       it 'stores the external attributes' do
-        get :sso_login, params: Rack::Utils.parse_query(@sso.payload)
+        get "/session/sso_login", params: Rack::Utils.parse_query(@sso.payload), headers: headers
         @user.single_sign_on_record.reload
         expect(@user.single_sign_on_record.external_username).to eq(@sso.username)
         expect(@user.single_sign_on_record.external_email).to eq(@sso.email)
@@ -386,7 +668,7 @@ describe SessionController do
       end
 
       it 'overrides attributes' do
-        get :sso_login, params: Rack::Utils.parse_query(@sso.payload)
+        get "/session/sso_login", params: Rack::Utils.parse_query(@sso.payload), headers: headers
 
         logged_on_user = Discourse.current_user_provider.new(request.env).current_user
         expect(logged_on_user.username).to eq(@suggested_username)
@@ -399,19 +681,23 @@ describe SessionController do
         @sso.name = @user.name
         @sso.email = @user.email
 
-        get :sso_login, params: Rack::Utils.parse_query(@sso.payload)
+        get "/session/sso_login", params: Rack::Utils.parse_query(@sso.payload), headers: headers
 
         logged_on_user = Discourse.current_user_provider.new(request.env).current_user
         expect(logged_on_user.username).to eq(@user.username)
         expect(logged_on_user.name).to eq(@user.name)
         expect(logged_on_user.email).to eq(@user.email)
       end
-
     end
   end
 
-  describe '.sso_provider' do
+  describe '#sso_provider' do
     before do
+      stub_request(:any, /#{Discourse.current_hostname}\/uploads/).to_return(
+        status: 200,
+        body: lambda { |request| file_from_fixtures("logo.png") }
+      )
+
       SiteSetting.enable_sso_provider = true
       SiteSetting.enable_sso = false
       SiteSetting.enable_local_logins = true
@@ -423,16 +709,23 @@ describe SessionController do
       @sso.return_sso_url = "http://somewhere.over.rainbow/sso"
 
       @user = Fabricate(:user, password: "myfrogs123ADMIN", active: true, admin: true)
+      @user.create_user_avatar!
+      UserAvatar.import_url_for_user(logo_fixture, @user)
+      UserProfile.import_url_for_user(logo_fixture, @user, is_card_background: false)
+      UserProfile.import_url_for_user(logo_fixture, @user, is_card_background: true)
+
+      @user.reload
+      @user.user_avatar.reload
+      @user.user_profile.reload
       EmailToken.update_all(confirmed: true)
     end
 
     it "successfully logs in and redirects user to return_sso_url when the user is not logged in" do
-      get :sso_provider, params: Rack::Utils.parse_query(@sso.payload)
+      get "/session/sso_provider", params: Rack::Utils.parse_query(@sso.payload)
       expect(response).to redirect_to("/login")
 
-      post :create,
+      post "/session.json",
         params: { login: @user.username, password: "myfrogs123ADMIN" },
-        format: :json,
         xhr: true
 
       location = response.cookies["sso_destination_url"]
@@ -448,12 +741,21 @@ describe SessionController do
       expect(sso2.external_id).to eq(@user.id.to_s)
       expect(sso2.admin).to eq(true)
       expect(sso2.moderator).to eq(false)
+      expect(sso2.groups).to eq(@user.groups.pluck(:name).join(","))
+
+      expect(sso2.avatar_url.blank?).to_not eq(true)
+      expect(sso2.profile_background_url.blank?).to_not eq(true)
+      expect(sso2.card_background_url.blank?).to_not eq(true)
+
+      expect(sso2.avatar_url).to start_with(Discourse.base_url)
+      expect(sso2.profile_background_url).to start_with(Discourse.base_url)
+      expect(sso2.card_background_url).to start_with(Discourse.base_url)
     end
 
     it "successfully redirects user to return_sso_url when the user is logged in" do
-      log_in_user(@user)
+      sign_in(@user)
 
-      get :sso_provider, params: Rack::Utils.parse_query(@sso.payload)
+      get "/session/sso_provider", params: Rack::Utils.parse_query(@sso.payload)
 
       location = response.header["Location"]
       expect(location).to match(/^http:\/\/somewhere.over.rainbow\/sso/)
@@ -467,20 +769,27 @@ describe SessionController do
       expect(sso2.external_id).to eq(@user.id.to_s)
       expect(sso2.admin).to eq(true)
       expect(sso2.moderator).to eq(false)
+
+      expect(sso2.avatar_url.blank?).to_not eq(true)
+      expect(sso2.profile_background_url.blank?).to_not eq(true)
+      expect(sso2.card_background_url.blank?).to_not eq(true)
+
+      expect(sso2.avatar_url).to start_with(Discourse.base_url)
+      expect(sso2.profile_background_url).to start_with(Discourse.base_url)
+      expect(sso2.card_background_url).to start_with(Discourse.base_url)
     end
   end
 
-  describe '.create' do
-
+  describe '#create' do
     let(:user) { Fabricate(:user) }
 
     context 'local login is disabled' do
       before do
         SiteSetting.enable_local_logins = false
 
-        post :create, params: {
+        post "/session.json", params: {
           login: user.username, password: 'myawesomepassword'
-        }, format: :json
+        }
       end
       it_behaves_like "failed to continue local login"
     end
@@ -490,9 +799,9 @@ describe SessionController do
         SiteSetting.sso_url = "https://www.example.com/sso"
         SiteSetting.enable_sso = true
 
-        post :create, params: {
+        post "/session.json", params: {
           login: user.username, password: 'myawesomepassword'
-        }, format: :json
+        }
       end
       it_behaves_like "failed to continue local login"
     end
@@ -504,29 +813,34 @@ describe SessionController do
       end
 
       it "raises an error when the login isn't present" do
-        expect do
-          post :create, format: :json
-        end.to raise_error(ActionController::ParameterMissing)
+        post "/session.json"
+        expect(response.status).to eq(400)
       end
 
       describe 'invalid password' do
         it "should return an error with an invalid password" do
-          post :create, params: {
+          post "/session.json", params: {
             login: user.username, password: 'sssss'
-          }, format: :json
+          }
 
-          expect(::JSON.parse(response.body)['error']).to be_present
+          expect(response).to be_success
+          expect(::JSON.parse(response.body)['error']).to eq(
+            I18n.t("login.incorrect_username_email_or_password")
+          )
         end
       end
 
       describe 'invalid password' do
         it "should return an error with an invalid password if too long" do
           User.any_instance.expects(:confirm_password?).never
-          post :create, params: {
+          post "/session.json", params: {
             login: user.username, password: ('s' * (User.max_password_length + 1))
-          }, format: :json
+          }
 
-          expect(::JSON.parse(response.body)['error']).to be_present
+          expect(response).to be_success
+          expect(::JSON.parse(response.body)['error']).to eq(
+            I18n.t("login.incorrect_username_email_or_password")
+          )
         end
       end
 
@@ -536,25 +850,29 @@ describe SessionController do
           user.suspended_at = Time.now
           user.save!
           StaffActionLogger.new(user).log_user_suspend(user, "<strike>banned</strike>")
-          post :create, params: {
-            login: user.username, password: 'myawesomepassword'
-          }, format: :json
 
-          error = ::JSON.parse(response.body)['error']
-          expect(error).to be_present
-          expect(error).to match(/banned/)
-          expect(error).not_to match(/<strike>/)
+          post "/session.json", params: {
+            login: user.username, password: 'myawesomepassword'
+          }
+
+          expect(response).to be_success
+          expect(JSON.parse(response.body)['error']).to eq(I18n.t('login.suspended_with_reason',
+            date: I18n.l(user.suspended_till, format: :date_only),
+            reason: Rack::Utils.escape_html(user.suspend_reason)
+          ))
         end
       end
 
       describe 'deactivated user' do
         it 'should return an error' do
-          User.any_instance.stubs(:active).returns(false)
+          user.active = false
+          user.save!
 
-          post :create, params: {
+          post "/session.json", params: {
             login: user.username, password: 'myawesomepassword'
-          }, format: :json
+          }
 
+          expect(response).to be_success
           expect(JSON.parse(response.body)['error']).to eq(I18n.t('login.not_activated'))
         end
       end
@@ -562,12 +880,13 @@ describe SessionController do
       describe 'success by username' do
         it 'logs in correctly' do
           events = DiscourseEvent.track_events do
-            post :create, params: {
+            post "/session.json", params: {
               login: user.username, password: 'myawesomepassword'
-            }, format: :json
+            }
           end
 
-          expect(events.map { |event| event[:event_name] }).to include(
+          expect(response).to be_success
+          expect(events.map { |event| event[:event_name] }).to contain_exactly(
             :user_logged_in, :user_first_logged_in
           )
 
@@ -579,44 +898,90 @@ describe SessionController do
         end
       end
 
-      describe 'with a blocked IP' do
-        before do
-          screened_ip = Fabricate(:screened_ip_address)
-          ActionDispatch::Request.any_instance.stubs(:remote_ip).returns(screened_ip.ip_address)
-          post :create, params: {
-            login: "@" + user.username, password: 'myawesomepassword'
-          }, format: :json
+      context 'when user has 2-factor logins' do
+        let!(:user_second_factor) { Fabricate(:user_second_factor, user: user) }
 
-          user.reload
+        describe 'when second factor token is missing' do
+          it 'should return the right response' do
+            post "/session.json", params: {
+              login: user.username,
+              password: 'myawesomepassword',
+            }
+
+            expect(response).to be_success
+            expect(JSON.parse(response.body)['error']).to eq(I18n.t(
+              'login.invalid_second_factor_code'
+            ))
+          end
         end
 
+        describe 'when second factor token is invalid' do
+          it 'should return the right response' do
+            post "/session.json", params: {
+              login: user.username,
+              password: 'myawesomepassword',
+              second_factor_token: '00000000'
+            }
+
+            expect(response).to be_success
+            expect(JSON.parse(response.body)['error']).to eq(I18n.t(
+              'login.invalid_second_factor_code'
+            ))
+          end
+        end
+
+        describe 'when second factor token is valid' do
+          it 'should log the user in' do
+            post "/session.json", params: {
+              login: user.username,
+              password: 'myawesomepassword',
+              second_factor_token: ROTP::TOTP.new(user_second_factor.data).now
+            }
+            expect(response).to be_success
+            user.reload
+
+            expect(session[:current_user_id]).to eq(user.id)
+            expect(user.user_auth_tokens.count).to eq(1)
+
+            expect(UserAuthToken.hash_token(cookies[:_t]))
+              .to eq(user.user_auth_tokens.first.auth_token)
+          end
+        end
+      end
+
+      describe 'with a blocked IP' do
         it "doesn't log in" do
+          ScreenedIpAddress.all.destroy_all
+          get "/"
+          screened_ip = Fabricate(:screened_ip_address, ip_address: request.remote_ip)
+          post "/session.json", params: {
+            login: "@" + user.username, password: 'myawesomepassword'
+          }
+          expect(response).to be_success
+          user.reload
+
           expect(session[:current_user_id]).to be_nil
         end
       end
 
       describe 'strips leading @ symbol' do
-        before do
-          post :create, params: {
-            login: "@" + user.username, password: 'myawesomepassword'
-          }, format: :json
-
-          user.reload
-        end
-
         it 'sets a session id' do
+          post "/session.json", params: {
+            login: "@" + user.username, password: 'myawesomepassword'
+          }
+          expect(response).to be_success
+          user.reload
+
           expect(session[:current_user_id]).to eq(user.id)
         end
       end
 
       describe 'also allow login by email' do
-        before do
-          post :create, params: {
-            login: user.email, password: 'myawesomepassword'
-          }, format: :json
-        end
-
         it 'sets a session id' do
+          post "/session.json", params: {
+            login: user.email, password: 'myawesomepassword'
+          }
+          expect(response).to be_success
           expect(session[:current_user_id]).to eq(user.id)
         end
       end
@@ -626,39 +991,41 @@ describe SessionController do
         let(:email) { " #{user.email} " }
 
         it "strips spaces from the username" do
-          post :create, params: {
+          post "/session.json", params: {
             login: username, password: 'myawesomepassword'
-          }, format: :json
-
+          }
+          expect(response).to be_success
           expect(::JSON.parse(response.body)['error']).not_to be_present
         end
 
         it "strips spaces from the email" do
-          post :create, params: {
+          post "/session.json", params: {
             login: email, password: 'myawesomepassword'
-          }, format: :json
-
+          }
+          expect(response).to be_success
           expect(::JSON.parse(response.body)['error']).not_to be_present
         end
       end
 
       describe "when the site requires approval of users" do
         before do
-          SiteSetting.expects(:must_approve_users?).returns(true)
+          SiteSetting.must_approve_users = true
         end
 
         context 'with an unapproved user' do
           before do
-            post :create, params: {
+            post "/session.json", params: {
               login: user.email, password: 'myawesomepassword'
-            }, format: :json
+            }
           end
 
           it "doesn't log in the user" do
+            expect(response).to be_success
             expect(session[:current_user_id]).to be_blank
           end
 
           it "shows the 'not approved' error message" do
+            expect(response).to be_success
             expect(JSON.parse(response.body)['error']).to eq(
               I18n.t('login.not_approved')
             )
@@ -666,15 +1033,14 @@ describe SessionController do
         end
 
         context "with an unapproved user who is an admin" do
-          before do
-            User.any_instance.stubs(:admin?).returns(true)
-
-            post :create, params: {
-              login: user.email, password: 'myawesomepassword'
-            }, format: :json
-          end
-
           it 'sets a session id' do
+            user.admin = true
+            user.save!
+
+            post "/session.json", params: {
+              login: user.email, password: 'myawesomepassword'
+            }
+            expect(response).to be_success
             expect(session[:current_user_id]).to eq(user.id)
           end
         end
@@ -683,41 +1049,48 @@ describe SessionController do
       context 'when admins are restricted by ip address' do
         let(:permitted_ip_address) { '111.234.23.11' }
         before do
-          Fabricate(:screened_ip_address, ip_address: permitted_ip_address, action_type: ScreenedIpAddress.actions[:allow_admin])
           SiteSetting.use_admin_ip_whitelist = true
+          ScreenedIpAddress.all.destroy_all
         end
 
         it 'is successful for admin at the ip address' do
-          User.any_instance.stubs(:admin?).returns(true)
-          ActionDispatch::Request.any_instance.stubs(:remote_ip).returns(permitted_ip_address)
+          get "/"
+          Fabricate(:screened_ip_address, ip_address: request.remote_ip, action_type: ScreenedIpAddress.actions[:allow_admin])
 
-          post :create, params: {
+          user.admin = true
+          user.save!
+
+          post "/session.json", params: {
             login: user.username, password: 'myawesomepassword'
-          }, format: :json
-
+          }
+          expect(response).to be_success
           expect(session[:current_user_id]).to eq(user.id)
         end
 
         it 'returns an error for admin not at the ip address' do
-          User.any_instance.stubs(:admin?).returns(true)
-          ActionDispatch::Request.any_instance.stubs(:remote_ip).returns("111.234.23.12")
+          Fabricate(:screened_ip_address, ip_address: "111.234.23.11", action_type: ScreenedIpAddress.actions[:allow_admin])
+          user.admin = true
+          user.save!
 
-          post :create, params: {
+          post "/session.json", params: {
             login: user.username, password: 'myawesomepassword'
-          }, format: :json
+          }
 
+          expect(response).to be_success
           expect(JSON.parse(response.body)['error']).to be_present
           expect(session[:current_user_id]).not_to eq(user.id)
         end
 
         it 'is successful for non-admin not at the ip address' do
-          User.any_instance.stubs(:admin?).returns(false)
-          ActionDispatch::Request.any_instance.stubs(:remote_ip).returns("111.234.23.12")
+          Fabricate(:screened_ip_address, ip_address: "111.234.23.11", action_type: ScreenedIpAddress.actions[:allow_admin])
+          user.admin = false
+          user.save!
 
-          post :create, params: {
+          post "/session.json", params: {
             login: user.username, password: 'myawesomepassword'
-          }, format: :json
+          }
 
+          expect(response).to be_success
           expect(session[:current_user_id]).to eq(user.id)
         end
       end
@@ -725,28 +1098,31 @@ describe SessionController do
 
     context 'when email has not been confirmed' do
       def post_login
-        post :create, params: {
+        post "/session.json", params: {
           login: user.email, password: 'myawesomepassword'
-        }, format: :json
+        }
       end
 
       it "doesn't log in the user" do
         post_login
+        expect(response).to be_success
         expect(session[:current_user_id]).to be_blank
       end
 
       it "shows the 'not activated' error message" do
         post_login
+        expect(response).to be_success
         expect(JSON.parse(response.body)['error']).to eq(
           I18n.t 'login.not_activated'
         )
       end
 
       context "and the 'must approve users' site setting is enabled" do
-        before { SiteSetting.expects(:must_approve_users?).returns(true) }
+        before { SiteSetting.must_approve_users = true }
 
         it "shows the 'not approved' error message" do
           post_login
+          expect(response).to be_success
           expect(JSON.parse(response.body)['error']).to eq(
             I18n.t 'login.not_approved'
           )
@@ -761,57 +1137,72 @@ describe SessionController do
         RateLimiter.clear_all!
 
         2.times do
-          post :create, params: {
+          post "/session.json", params: {
             login: user.username, password: 'myawesomepassword'
-          }, format: :json
+          }
 
           expect(response).to be_success
         end
 
-        post :create, params: {
+        post "/session.json", params: {
           login: user.username, password: 'myawesomepassword'
-        }, format: :json
+        }
 
-        expect(response).not_to be_success
+        expect(response.status).to eq(429)
+        json = JSON.parse(response.body)
+        expect(json["error_type"]).to eq("rate_limit")
+      end
+
+      it 'rate limits second factor attempts' do
+        RateLimiter.enable
+        RateLimiter.clear_all!
+
+        3.times do
+          post "/session.json", params: {
+            login: user.username,
+            password: 'myawesomepassword',
+            second_factor_token: '000000'
+          }
+
+          expect(response).to be_success
+        end
+
+        post "/session.json", params: {
+          login: user.username,
+          password: 'myawesomepassword',
+          second_factor_token: '000000'
+        }
+
+        expect(response.status).to eq(429)
         json = JSON.parse(response.body)
         expect(json["error_type"]).to eq("rate_limit")
       end
     end
   end
 
-  describe '.destroy' do
-    before do
-      @user = log_in
-      delete :destroy, params: { id: @user.username }, format: :json
-    end
+  describe '#destroy' do
+    it 'removes the session variable and the auth token cookies' do
+      user = sign_in(Fabricate(:user))
+      delete "/session/#{user.username}.json"
 
-    it 'removes the session variable' do
+      expect(response.status).to eq(302)
       expect(session[:current_user_id]).to be_blank
-    end
-
-    it 'removes the auth token cookie' do
       expect(response.cookies["_t"]).to be_blank
     end
   end
 
-  describe '.forgot_password' do
-
+  describe '#forgot_password' do
     it 'raises an error without a username parameter' do
-      expect do
-        post :forgot_password, format: :json
-      end.to raise_error(ActionController::ParameterMissing)
+      post "/session/forgot_password.json"
+      expect(response.status).to eq(400)
     end
 
     context 'for a non existant username' do
       it "doesn't generate a new token for a made up username" do
         expect do
-          post :forgot_password, params: { login: 'made_up' }, format: :json
+          post "/session/forgot_password.json", params: { login: 'made_up' }
         end.not_to change(EmailToken, :count)
-      end
-
-      it "doesn't enqueue an email" do
-        Jobs.expects(:enqueue).with(:user_mail, anything).never
-        post :forgot_password, params: { login: 'made_up' }, format: :json
+        expect(Jobs::CriticalUserEmail.jobs.size).to eq(0)
       end
     end
 
@@ -821,7 +1212,7 @@ describe SessionController do
       context 'local login is disabled' do
         before do
           SiteSetting.enable_local_logins = false
-          post :forgot_password, params: { login: user.username }, format: :json
+          post "/session/forgot_password.json", params: { login: user.username }
         end
         it_behaves_like "failed to continue local login"
       end
@@ -831,22 +1222,22 @@ describe SessionController do
           SiteSetting.sso_url = "https://www.example.com/sso"
           SiteSetting.enable_sso = true
 
-          post :create, params: {
+          post "/session.json", params: {
             login: user.username, password: 'myawesomepassword'
-          }, format: :json
+          }
         end
         it_behaves_like "failed to continue local login"
       end
 
       it "generates a new token for a made up username" do
         expect do
-          post :forgot_password, params: { login: user.username }, format: :json
+          post "/session/forgot_password.json", params: { login: user.username }
         end.to change(EmailToken, :count)
       end
 
       it "enqueues an email" do
-        Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :forgot_password, user_id: user.id))
-        post :forgot_password, params: { login: user.username }, format: :json
+        post "/session/forgot_password.json", params: { login: user.username }
+        expect(Jobs::CriticalUserEmail.jobs.size).to eq(1)
       end
     end
 
@@ -855,13 +1246,13 @@ describe SessionController do
 
       it 'generates no token for system username' do
         expect do
-          post :forgot_password, params: { login: system.username }, format: :json
+          post "/session/forgot_password.json", params: { login: system.username }
         end.not_to change(EmailToken, :count)
       end
 
       it 'enqueues no email' do
-        Jobs.expects(:enqueue).never
-        post :forgot_password, params: { login: system.username }, format: :json
+        post "/session/forgot_password.json", params: { login: system.username }
+        expect(Jobs::CriticalUserEmail.jobs.size).to eq(0)
       end
     end
 
@@ -870,30 +1261,30 @@ describe SessionController do
 
       it 'generates no token for staged username' do
         expect do
-          post :forgot_password, params: { login: staged.username }, format: :json
+          post "/session/forgot_password.json", params: { login: staged.username }
         end.not_to change(EmailToken, :count)
       end
 
       it 'enqueues no email' do
-        Jobs.expects(:enqueue).never
-        post :forgot_password, params: { login: staged.username }, format: :json
+        post "/session/forgot_password.json", params: { login: staged.username }
+        expect(Jobs::CriticalUserEmail.jobs.size).to eq(0)
       end
     end
   end
 
-  describe '.current' do
+  describe '#current' do
     context "when not logged in" do
       it "retuns 404" do
-        get :current, format: :json
-        expect(response).not_to be_success
+        get "/session/current.json"
+        expect(response.status).to eq(404)
       end
     end
 
     context "when logged in" do
-      let!(:user) { log_in }
+      let!(:user) { sign_in(Fabricate(:user)) }
 
       it "returns the JSON for the user" do
-        get :current, format: :json
+        get "/session/current.json"
         expect(response).to be_success
         json = ::JSON.parse(response.body)
         expect(json['current_user']).to be_present
diff --git a/spec/requests/static_controller_spec.rb b/spec/requests/static_controller_spec.rb
index f4376253ace..624bdadb2c6 100644
--- a/spec/requests/static_controller_spec.rb
+++ b/spec/requests/static_controller_spec.rb
@@ -3,20 +3,14 @@ require 'rails_helper'
 describe StaticController do
 
   context '#favicon' do
-    before do
-      # this is a mess in test, will fix in a future commit
-      FinalDestination.stubs(:lookup_ip).returns('1.2.3.4')
-    end
-
     let(:png) { Base64.decode64("R0lGODlhAQABALMAAAAAAIAAAACAAICAAAAAgIAAgACAgMDAwICAgP8AAAD/AP//AAAA//8A/wD//wBiZCH5BAEAAA8ALAAAAAABAAEAAAQC8EUAOw==") }
 
+    before { FinalDestination.stubs(:lookup_ip).returns("1.2.3.4") }
+
     it 'returns the default favicon for a missing download' do
+      url = "https://fav.icon/#{SecureRandom.hex}.png"
 
-      url = "https://somewhere1.over.rainbow/#{SecureRandom.hex}.png"
-
-      stub_request(:head, url).
-        with(headers: { 'Host' => 'somewhere1.over.rainbow' }).
-        to_return(status: 404, body: "", headers: {})
+      stub_request(:get, url).to_return(status: 404)
 
       SiteSetting.favicon_url = url
 
@@ -30,14 +24,9 @@ describe StaticController do
     end
 
     it 'can proxy a favicon correctly' do
-      url = "https://somewhere.over.rainbow/#{SecureRandom.hex}.png"
+      url = "https://fav.icon/#{SecureRandom.hex}.png"
 
-      stub_request(:head, url).
-        with(headers: { 'Host' => 'somewhere.over.rainbow' }).
-        to_return(status: 200, body: "", headers: {})
-
-      stub_request(:get, url).
-        to_return(status: 200, body: png, headers: {})
+      stub_request(:get, url).to_return(status: 200, body: png)
 
       SiteSetting.favicon_url = url
 
@@ -51,7 +40,6 @@ describe StaticController do
 
   context '#brotli_asset' do
     it 'returns a non brotli encoded 404 if asset is missing' do
-
       get "/brotli_asset/missing.js"
 
       expect(response.status).to eq(404)
diff --git a/spec/requests/tags_controller_spec.rb b/spec/requests/tags_controller_spec.rb
index 568fa9858dd..65165852a98 100644
--- a/spec/requests/tags_controller_spec.rb
+++ b/spec/requests/tags_controller_spec.rb
@@ -5,6 +5,67 @@ describe TagsController do
     SiteSetting.tagging_enabled = true
   end
 
+  describe '#index' do
+
+    before do
+      Fabricate(:tag, name: 'test')
+      Fabricate(:tag, name: 'topic-test', topic_count: 1)
+    end
+
+    shared_examples "successfully retrieve tags with topic_count > 0" do
+      it "should return the right response" do
+        get "/tags.json"
+
+        expect(response).to be_success
+
+        tags = JSON.parse(response.body)["tags"]
+        expect(tags.length).to eq(1)
+        expect(tags[0]['text']).to eq("topic-test")
+      end
+    end
+
+    context "with tags_listed_by_group enabled" do
+      before { SiteSetting.tags_listed_by_group = true }
+      include_examples "successfully retrieve tags with topic_count > 0"
+    end
+
+    context "with tags_listed_by_group disabled" do
+      before { SiteSetting.tags_listed_by_group = false }
+      include_examples "successfully retrieve tags with topic_count > 0"
+    end
+
+    context "when user can admin tags" do
+
+      it "succesfully retrieve all tags" do
+        sign_in(Fabricate(:admin))
+
+        get "/tags.json"
+
+        expect(response).to be_success
+
+        tags = JSON.parse(response.body)["tags"]
+        expect(tags.length).to eq(2)
+      end
+
+    end
+  end
+
+  describe '#show' do
+    before do
+      Fabricate(:tag, name: 'test')
+    end
+
+    it "should return the right response" do
+      get "/tags/test"
+      expect(response).to be_success
+    end
+
+    it "should handle invalid tags" do
+      get "/tags/%2ftest%2f"
+      expect(response.status).to eq(404)
+    end
+  end
+
   describe '#check_hashtag' do
     let(:tag) { Fabricate(:tag, name: 'test') }
 
@@ -17,4 +78,98 @@ describe TagsController do
       expect(tag["value"]).to eq('test')
     end
   end
+
+  describe "#update" do
+    let(:tag) { Fabricate(:tag) }
+    let(:admin) { Fabricate(:admin) }
+
+    before do
+      tag
+      sign_in(admin)
+    end
+
+    it "triggers a extensibility event" do
+      event = DiscourseEvent.track_events {
+        put "/tags/#{tag.name}.json", params: {
+          tag: {
+            id: 'hello'
+          }
+        }
+      }.last
+
+      expect(event[:event_name]).to eq(:tag_updated)
+      expect(event[:params].first).to eq(tag)
+    end
+  end
+
+  describe '#personal_messages' do
+    let(:regular_user) { Fabricate(:trust_level_4) }
+    let(:moderator) { Fabricate(:moderator) }
+    let(:admin) { Fabricate(:admin) }
+    let(:personal_message) do
+      Fabricate(:private_message_topic, user: regular_user, topic_allowed_users: [
+        Fabricate.build(:topic_allowed_user, user: regular_user),
+        Fabricate.build(:topic_allowed_user, user: moderator),
+        Fabricate.build(:topic_allowed_user, user: admin)
+      ])
+    end
+
+    before do
+      SiteSetting.allow_staff_to_tag_pms = true
+      Fabricate(:tag, topics: [personal_message], name: 'test')
+    end
+
+    context "as a regular user" do
+      it "can't see pm tags" do
+        get "/tags/personal_messages/#{regular_user.username}.json"
+
+        expect(response).not_to be_success
+      end
+    end
+
+    context "as an moderator" do
+      before do
+        sign_in(moderator)
+      end
+
+      it "can't see pm tags for regular user" do
+        get "/tags/personal_messages/#{regular_user.username}.json"
+
+        expect(response).not_to be_success
+      end
+
+      it "can see their own pm tags" do
+        get "/tags/personal_messages/#{moderator.username}.json"
+
+        expect(response).to be_success
+
+        tag = JSON.parse(response.body)['tags']
+        expect(tag[0]["id"]).to eq('test')
+      end
+    end
+
+    context "as an admin" do
+      before do
+        sign_in(admin)
+      end
+
+      it "can see pm tags for regular user" do
+        get "/tags/personal_messages/#{regular_user.username}.json"
+
+        expect(response).to be_success
+
+        tag = JSON.parse(response.body)['tags']
+        expect(tag[0]["id"]).to eq('test')
+      end
+
+      it "can see their own pm tags" do
+        get "/tags/personal_messages/#{admin.username}.json"
+
+        expect(response).to be_success
+
+        tag = JSON.parse(response.body)['tags']
+        expect(tag[0]["id"]).to eq('test')
+      end
+    end
+  end
 end
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 45ad9c2e2ef..597ced4be5c 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -4,27 +4,774 @@ RSpec.describe TopicsController do
   let(:topic) { Fabricate(:topic) }
   let(:user) { Fabricate(:user) }
 
-  describe '#update' do
+  describe '#wordpress' do
+    let!(:user) { sign_in(Fabricate(:moderator)) }
+    let(:p1) { Fabricate(:post, user: user) }
+    let(:topic) { p1.topic }
+    let!(:p2) { Fabricate(:post, topic: topic, user: user) }
 
-    it 'can not change category to a disallowed category' do
-      post = create_post
-      sign_in(post.user)
+    it "returns the JSON in the format our wordpress plugin needs" do
+      SiteSetting.external_system_avatars_enabled = false
 
-      category = Fabricate(:category)
-      category.set_permissions(staff: :full)
-      category.save!
+      get "/t/#{topic.id}/wordpress.json", params: { best: 3 }
 
-      # strange API, why is topic id in here twice
-      put "/t/#{post.topic_id}.json", params: { category_id: category.id, topic_id: post.topic_id }
-      expect(response.status).not_to eq(200)
+      expect(response).to be_success
+      json = ::JSON.parse(response.body)
 
-      expect(post.topic.category_id).not_to eq(category.id)
+      # The JSON has the data the wordpress plugin needs
+      expect(json['id']).to eq(topic.id)
+      expect(json['posts_count']).to eq(2)
+      expect(json['filtered_posts_count']).to eq(2)
+
+      # Posts
+      expect(json['posts'].size).to eq(1)
+      post = json['posts'][0]
+      expect(post['id']).to eq(p2.id)
+      expect(post['username']).to eq(user.username)
+      expect(post['avatar_template']).to eq("#{Discourse.base_url_no_prefix}#{user.avatar_template}")
+      expect(post['name']).to eq(user.name)
+      expect(post['created_at']).to be_present
+      expect(post['cooked']).to eq(p2.cooked)
+
+      # Participants
+      expect(json['participants'].size).to eq(1)
+      participant = json['participants'][0]
+      expect(participant['id']).to eq(user.id)
+      expect(participant['username']).to eq(user.username)
+      expect(participant['avatar_template']).to eq("#{Discourse.base_url_no_prefix}#{user.avatar_template}")
+    end
+  end
+
+  describe '#move_posts' do
+    before do
+      SiteSetting.min_topic_title_length = 2
     end
 
+    it 'needs you to be logged in' do
+      post "/t/111/move-posts.json", params: {
+        title: 'blah',
+        post_ids: [1, 2, 3]
+      }
+      expect(response.status).to eq(403)
+    end
+
+    describe 'moving to a new topic' do
+      let(:user) { Fabricate(:user) }
+      let(:moderator) { Fabricate(:moderator) }
+      let(:p1) { Fabricate(:post, user: user, post_number: 1) }
+      let(:p2) { Fabricate(:post, user: user, post_number: 2, topic: p1.topic) }
+      let!(:topic) { p1.topic }
+
+      it "raises an error without post_ids" do
+        sign_in(moderator)
+        post "/t/#{topic.id}/move-posts.json", params: { title: 'blah' }
+        expect(response.status).to eq(400)
+      end
+
+      it "raises an error when the user doesn't have permission to move the posts" do
+        sign_in(user)
+
+        post "/t/#{topic.id}/move-posts.json", params: {
+          title: 'blah', post_ids: [p1.post_number, p2.post_number]
+        }
+
+        expect(response).to be_forbidden
+      end
+
+      it "raises an error when the OP is not a regular post" do
+        sign_in(moderator)
+        p2 = Fabricate(:post, topic: topic, post_number: 2, post_type: Post.types[:whisper])
+        p3 = Fabricate(:post, topic: topic, post_number: 3)
+
+        post "/t/#{topic.id}/move-posts.json", params: {
+          title: 'blah', post_ids: [p2.id, p3.id]
+        }
+        expect(response.status).to eq(422)
+
+        result = ::JSON.parse(response.body)
+
+        expect(result['errors']).to be_present
+      end
+
+      context 'success' do
+        before { sign_in(Fabricate(:admin)) }
+
+        it "returns success" do
+          expect do
+            post "/t/#{topic.id}/move-posts.json", params: {
+              title: 'Logan is a good movie',
+              post_ids: [p2.id],
+              category_id: 123
+            }
+          end.to change { Topic.count }.by(1)
+
+          expect(response).to be_success
+
+          result = ::JSON.parse(response.body)
+
+          expect(result['success']).to eq(true)
+          expect(result['url']).to eq(Topic.last.relative_url)
+        end
+
+        describe 'when topic has been deleted' do
+          it 'should still be able to move posts' do
+            PostDestroyer.new(Fabricate(:admin), topic.first_post).destroy
+
+            expect(topic.reload.deleted_at).to_not be_nil
+
+            expect do
+              post "/t/#{topic.id}/move-posts.json", params: {
+                title: 'Logan is a good movie',
+                post_ids: [p2.id],
+                category_id: 123
+              }
+            end.to change { Topic.count }.by(1)
+
+            expect(response).to be_success
+
+            result = JSON.parse(response.body)
+
+            expect(result['success']).to eq(true)
+            expect(result['url']).to eq(Topic.last.relative_url)
+          end
+        end
+      end
+
+      context 'failure' do
+        it "returns JSON with a false success" do
+          sign_in(moderator)
+          post "/t/#{topic.id}/move-posts.json", params: {
+            post_ids: [p2.id]
+          }
+          expect(response).to be_success
+          result = ::JSON.parse(response.body)
+          expect(result['success']).to eq(false)
+          expect(result['url']).to be_blank
+        end
+      end
+
+      describe "moving replied posts" do
+        context 'success' do
+          it "moves the child posts too" do
+            user = sign_in(Fabricate(:moderator))
+            p1 = Fabricate(:post, topic: topic, user: user)
+            p2 = Fabricate(:post, topic: topic, user: user, reply_to_post_number: p1.post_number)
+            PostReply.create(post_id: p1.id, reply_id: p2.id)
+
+            post "/t/#{topic.id}/move-posts.json", params: {
+              title: 'new topic title',
+              post_ids: [p1.id],
+              reply_post_ids: [p1.id]
+            }
+            expect(response.status).to eq(200)
+
+            p1.reload
+            p2.reload
+
+            new_topic_id = JSON.parse(response.body)["url"].split("/").last.to_i
+            new_topic = Topic.find(new_topic_id)
+            expect(p1.topic.id).to eq(new_topic.id)
+            expect(p2.topic.id).to eq(new_topic.id)
+            expect(p2.reply_to_post_number).to eq(p1.post_number)
+          end
+        end
+      end
+    end
+
+    describe 'moving to an existing topic' do
+      let!(:user) { sign_in(Fabricate(:moderator)) }
+      let(:p1) { Fabricate(:post, user: user) }
+      let(:topic) { p1.topic }
+      let(:dest_topic) { Fabricate(:topic) }
+      let(:p2) { Fabricate(:post, user: user, topic: topic) }
+
+      context 'success' do
+        it "returns success" do
+          user
+          post "/t/#{topic.id}/move-posts.json", params: {
+            post_ids: [p2.id],
+            destination_topic_id: dest_topic.id
+          }
+
+          expect(response).to be_success
+          result = ::JSON.parse(response.body)
+          expect(result['success']).to eq(true)
+          expect(result['url']).to be_present
+        end
+      end
+
+      context 'failure' do
+        let(:p2) { Fabricate(:post, user: user) }
+        it "returns JSON with a false success" do
+          post "/t/#{topic.id}/move-posts.json", params: {
+            post_ids: [p2.id]
+          }
+
+          expect(response).to be_success
+          result = ::JSON.parse(response.body)
+          expect(result['success']).to eq(false)
+          expect(result['url']).to be_blank
+        end
+      end
+    end
+  end
+
+  describe '#merge_topic' do
+    it 'needs you to be logged in' do
+      post "/t/111/merge-topic.json", params: {
+        destination_topic_id: 345
+      }
+      expect(response.status).to eq(403)
+    end
+
+    describe 'moving to a new topic' do
+      let(:moderator) { Fabricate(:moderator) }
+      let(:user) { Fabricate(:user) }
+      let(:p1) { Fabricate(:post, user: user) }
+      let(:topic) { p1.topic }
+
+      it "raises an error without destination_topic_id" do
+        sign_in(moderator)
+        post "/t/#{topic.id}/merge-topic.json"
+        expect(response.status).to eq(400)
+      end
+
+      it "raises an error when the user doesn't have permission to merge" do
+        sign_in(user)
+        post "/t/111/merge-topic.json", params: { destination_topic_id: 345 }
+        expect(response).to be_forbidden
+      end
+
+      let(:dest_topic) { Fabricate(:topic) }
+
+      context 'moves all the posts to the destination topic' do
+        it "returns success" do
+          sign_in(moderator)
+          post "/t/#{topic.id}/merge-topic.json", params: {
+            destination_topic_id: dest_topic.id
+          }
+
+          expect(response).to be_success
+          result = ::JSON.parse(response.body)
+          expect(result['success']).to eq(true)
+          expect(result['url']).to be_present
+        end
+      end
+    end
+  end
+
+  describe '#change_post_owners' do
+    it 'needs you to be logged in' do
+      post "/t/111/change-owner.json", params: {
+        username: 'user_a',
+        post_ids: [1, 2, 3]
+      }
+      expect(response).to be_forbidden
+    end
+
+    describe 'forbidden to moderators' do
+      before do
+        sign_in(Fabricate(:moderator))
+      end
+      it 'correctly denies' do
+        post "/t/111/change-owner.json", params: {
+          topic_id: 111, username: 'user_a', post_ids: [1, 2, 3]
+        }
+        expect(response).to be_forbidden
+      end
+    end
+
+    describe 'forbidden to trust_level_4s' do
+      before do
+        sign_in(Fabricate(:trust_level_4))
+      end
+
+      it 'correctly denies' do
+        post "/t/111/change-owner.json", params: {
+          topic_id: 111, username: 'user_a', post_ids: [1, 2, 3]
+        }
+        expect(response).to be_forbidden
+      end
+    end
+
+    describe 'changing ownership' do
+      let!(:editor) { sign_in(Fabricate(:admin)) }
+      let(:topic) { Fabricate(:topic) }
+      let(:user_a) { Fabricate(:user) }
+      let(:p1) { Fabricate(:post, topic_id: topic.id) }
+      let(:p2) { Fabricate(:post, topic_id: topic.id) }
+
+      it "raises an error with a parameter missing" do
+        [
+          { post_ids: [1, 2, 3] },
+          { username: 'user_a' }
+        ].each do |params|
+          post "/t/111/change-owner.json", params: params
+          expect(response.status).to eq(400)
+        end
+      end
+
+      it "changes the topic and posts ownership" do
+        post "/t/#{topic.id}/change-owner.json", params: {
+          username: user_a.username_lower, post_ids: [p1.id]
+        }
+        topic.reload
+        p1.reload
+        expect(response).to be_success
+        expect(topic.user.username).to eq(user_a.username)
+        expect(p1.user.username).to eq(user_a.username)
+      end
+
+      it "changes multiple posts" do
+        post "/t/#{topic.id}/change-owner.json", params: {
+          username: user_a.username_lower, post_ids: [p1.id, p2.id]
+        }
+
+        expect(response).to be_success
+
+        p1.reload
+        p2.reload
+
+        expect(p1.user).to_not eq(nil)
+        expect(p1.reload.user).to eq(p2.reload.user)
+      end
+
+      it "works with deleted users" do
+        deleted_user = Fabricate(:user)
+        t2 = Fabricate(:topic, user: deleted_user)
+        p3 = Fabricate(:post, topic_id: t2.id, user: deleted_user)
+
+        UserDestroyer.new(editor).destroy(deleted_user, delete_posts: true, context: 'test', delete_as_spammer: true)
+
+        post "/t/#{t2.id}/change-owner.json", params: {
+          username: user_a.username_lower, post_ids: [p3.id]
+        }
+
+        expect(response).to be_success
+        t2.reload
+        p3.reload
+        expect(t2.deleted_at).to be_nil
+        expect(p3.user).to eq(user_a)
+      end
+    end
+  end
+
+  describe '#change_timestamps' do
+    let(:params) { { timestamp: Time.zone.now } }
+
+    it 'needs you to be logged in' do
+      put "/t/1/change-timestamp.json", params: params
+      expect(response.status).to eq(403)
+    end
+
+    [:moderator, :trust_level_4].each do |user|
+      describe "forbidden to #{user}" do
+        let!(user) { sign_in(Fabricate(user)) }
+
+        it 'correctly denies' do
+          put "/t/1/change-timestamp.json", params: params
+          expect(response).to be_forbidden
+        end
+      end
+    end
+
+    describe 'changing timestamps' do
+      let!(:admin) { sign_in(Fabricate(:admin)) }
+      let(:old_timestamp) { Time.zone.now }
+      let(:new_timestamp) { old_timestamp - 1.day }
+      let!(:topic) { Fabricate(:topic, created_at: old_timestamp) }
+      let!(:p1) { Fabricate(:post, topic_id: topic.id, created_at: old_timestamp) }
+      let!(:p2) { Fabricate(:post, topic_id: topic.id, created_at: old_timestamp + 1.day) }
+
+      it 'raises an error with a missing parameter' do
+        put "/t/1/change-timestamp.json"
+        expect(response.status).to eq(400)
+      end
+
+      it 'should update the timestamps of selected posts' do
+        put "/t/#{topic.id}/change-timestamp.json", params: {
+          timestamp: new_timestamp.to_f
+        }
+
+        expect(response).to be_success
+        expect(topic.reload.created_at).to be_within_one_second_of(new_timestamp)
+        expect(p1.reload.created_at).to be_within_one_second_of(new_timestamp)
+        expect(p2.reload.created_at).to be_within_one_second_of(old_timestamp)
+      end
+    end
+  end
+
+  describe '#clear_pin' do
+    it 'needs you to be logged in' do
+      put "/t/1/clear-pin.json"
+      expect(response.status).to eq(403)
+    end
+
+    context 'when logged in' do
+      let(:topic) { Fabricate(:topic) }
+      let(:pm) { Fabricate(:private_message_topic) }
+      let(:user) { Fabricate(:user) }
+      before do
+        sign_in(user)
+      end
+
+      it "fails when the user can't see the topic" do
+        put "/t/#{pm.id}/clear-pin.json"
+        expect(response).to be_forbidden
+      end
+
+      describe 'when the user can see the topic' do
+        it "succeeds" do
+          expect do
+            put "/t/#{topic.id}/clear-pin.json"
+          end.to change { TopicUser.where(topic_id: topic.id, user_id: user.id).count }.by(1)
+          expect(response).to be_success
+        end
+      end
+    end
+  end
+
+  describe '#status' do
+    it 'needs you to be logged in' do
+      put "/t/1/status.json", params: {
+        status: 'visible', enabled: true
+      }
+      expect(response.status).to eq(403)
+    end
+
+    describe 'when logged in' do
+      let(:user) { Fabricate(:user) }
+      let(:moderator) { Fabricate(:moderator) }
+      let(:topic) { Fabricate(:topic) }
+      before do
+        sign_in(moderator)
+      end
+
+      it "raises an exception if you can't change it" do
+        sign_in(user)
+        put "/t/#{topic.id}/status.json", params: {
+          status: 'visible', enabled: 'true'
+        }
+        expect(response).to be_forbidden
+      end
+
+      it 'requires the status parameter' do
+        put "/t/#{topic.id}/status.json", params: { enabled: true }
+        expect(response.status).to eq(400)
+      end
+
+      it 'requires the enabled parameter' do
+        put "/t/#{topic.id}/status.json", params: { status: 'visible' }
+        expect(response.status).to eq(400)
+      end
+
+      it 'raises an error with a status not in the whitelist' do
+        put "/t/#{topic.id}/status.json", params: {
+          status: 'title', enabled: 'true'
+        }
+        expect(response.status).to eq(400)
+      end
+
+      it 'should update the status of the topic correctly' do
+        topic = Fabricate(:topic, user: user, closed: true, topic_timers: [
+          Fabricate(:topic_timer, status_type: TopicTimer.types[:open])
+        ])
+
+        put "/t/#{topic.id}/status.json", params: {
+          status: 'closed', enabled: 'false'
+        }
+
+        expect(response).to be_success
+        expect(topic.reload.closed).to eq(false)
+        expect(topic.topic_timers).to eq([])
+
+        body = JSON.parse(response.body)
+
+        expect(body['topic_status_update']).to eq(nil)
+      end
+    end
+  end
+
+  describe '#destroy_timings' do
+    it 'needs you to be logged in' do
+      delete "/t/1/timings.json"
+      expect(response.status).to eq(403)
+    end
+
+    def topic_user_post_timings_count(user, topic)
+      [TopicUser, PostTiming].map do |klass|
+        klass.where(user: user, topic: topic).count
+      end
+    end
+
+    context 'when logged in' do
+      before do
+        @user = sign_in(Fabricate(:user))
+        @topic = Fabricate(:topic, user: @user)
+        Fabricate(:post, user: @user, topic: @topic, post_number: 2)
+        TopicUser.create!(topic: @topic, user: @user)
+        PostTiming.create!(topic: @topic, user: @user, post_number: 2, msecs: 1000)
+      end
+
+      it 'deletes the forum topic user and post timings records' do
+        expect do
+          delete "/t/#{@topic.id}/timings.json"
+        end.to change { topic_user_post_timings_count(@user, @topic) }.from([1, 1]).to([0, 0])
+      end
+    end
+  end
+
+  describe '#mute/unmute' do
+    it 'needs you to be logged in' do
+      put "/t/99/mute.json"
+      expect(response.status).to eq(403)
+    end
+
+    it 'needs you to be logged in' do
+      put "/t/99/unmute.json"
+      expect(response.status).to eq(403)
+    end
+  end
+
+  describe '#recover' do
+    it "won't allow us to recover a topic when we're not logged in" do
+      put "/t/1/recover.json"
+      expect(response.status).to eq(403)
+    end
+
+    describe 'when logged in' do
+      let(:user) { Fabricate(:user) }
+      let(:moderator) { Fabricate(:moderator) }
+      let(:topic) { Fabricate(:topic, user: user, deleted_at: Time.now, deleted_by: moderator) }
+      let!(:post) { Fabricate(:post, user: user, topic: topic, post_number: 1, deleted_at: Time.now, deleted_by: moderator) }
+
+      describe 'without access' do
+        it "raises an exception when the user doesn't have permission to delete the topic" do
+          sign_in(user)
+          put "/t/#{topic.id}/recover.json"
+          expect(response).to be_forbidden
+        end
+      end
+
+      context 'with permission' do
+        before do
+          sign_in(moderator)
+        end
+
+        it 'succeeds' do
+          put "/t/#{topic.id}/recover.json"
+          topic.reload
+          post.reload
+          expect(response).to be_success
+          expect(topic.trashed?).to be_falsey
+          expect(post.trashed?).to be_falsey
+        end
+      end
+    end
+  end
+
+  describe '#delete' do
+    it "won't allow us to delete a topic when we're not logged in" do
+      delete "/t/1.json"
+      expect(response.status).to eq(403)
+    end
+
+    describe 'when logged in' do
+      let(:user) { Fabricate(:user) }
+      let(:moderator) { Fabricate(:moderator) }
+      let(:topic) { Fabricate(:topic, user: user) }
+      let!(:post) { Fabricate(:post, topic: topic, user: user, post_number: 1) }
+
+      describe 'without access' do
+        it "raises an exception when the user doesn't have permission to delete the topic" do
+          sign_in(user)
+          delete "/t/#{topic.id}.json"
+          expect(response).to be_forbidden
+        end
+      end
+
+      describe 'with permission' do
+        before do
+          sign_in(moderator)
+        end
+
+        it 'succeeds' do
+          delete "/t/#{topic.id}.json"
+          expect(response).to be_success
+          topic.reload
+          expect(topic.trashed?).to be_truthy
+        end
+      end
+    end
+  end
+
+  describe '#id_for_slug' do
+    let(:topic) { Fabricate(:post).topic }
+    let(:pm) { Fabricate(:private_message_topic) }
+
+    it "returns JSON for the slug" do
+      get "/t/id_for/#{topic.slug}.json"
+      expect(response).to be_success
+      json = ::JSON.parse(response.body)
+      expect(json['topic_id']).to eq(topic.id)
+      expect(json['url']).to eq(topic.url)
+      expect(json['slug']).to eq(topic.slug)
+    end
+
+    it "returns invalid access if the user can't see the topic" do
+      get "/t/id_for/#{pm.slug}.json"
+      expect(response).to be_forbidden
+    end
+  end
+
+  describe '#update' do
+    it "won't allow us to update a topic when we're not logged in" do
+      put "/t/1.json", params: { slug: 'xyz' }
+      expect(response.status).to eq(403)
+    end
+
+    describe 'when logged in' do
+      let(:topic) { Fabricate(:topic, user: user) }
+
+      before do
+        Fabricate(:post, topic: topic)
+        SiteSetting.editing_grace_period = 0
+        sign_in(user)
+      end
+
+      it 'can not change category to a disallowed category' do
+        category = Fabricate(:category)
+        category.set_permissions(staff: :full)
+        category.save!
+
+        put "/t/#{topic.id}.json", params: { category_id: category.id }
+
+        expect(response.status).not_to eq(200)
+        expect(topic.category_id).not_to eq(category.id)
+      end
+
+      describe 'without permission' do
+        it "raises an exception when the user doesn't have permission to update the topic" do
+          topic.update!(archived: true)
+          put "/t/#{topic.slug}/#{topic.id}.json"
+
+          expect(response.status).to eq(403)
+        end
+      end
+
+      describe 'with permission' do
+        it 'succeeds' do
+          put "/t/#{topic.slug}/#{topic.id}.json"
+
+          expect(response.status).to eq(200)
+          expect(::JSON.parse(response.body)['basic_topic']).to be_present
+        end
+
+        it "can update a topic to an uncategorized topic" do
+          topic.update!(category: Fabricate(:category))
+
+          put "/t/#{topic.slug}/#{topic.id}.json", params: {
+            category_id: ""
+          }
+
+          expect(response.status).to eq(200)
+          expect(topic.reload.category_id).to eq(SiteSetting.uncategorized_category_id)
+        end
+
+        it 'allows a change of title' do
+          put "/t/#{topic.slug}/#{topic.id}.json", params: {
+            title: 'This is a new title for the topic'
+          }
+
+          topic.reload
+          expect(topic.title).to eq('This is a new title for the topic')
+        end
+
+        it "returns errors with invalid titles" do
+          put "/t/#{topic.slug}/#{topic.id}.json", params: {
+            title: 'asdf'
+          }
+
+          expect(response.status).to eq(422)
+          expect(JSON.parse(response.body)['errors']).to be_present
+        end
+
+        it "returns errors when the rate limit is exceeded" do
+          EditRateLimiter.any_instance.expects(:performed!).raises(RateLimiter::LimitExceeded.new(60))
+
+          put "/t/#{topic.slug}/#{topic.id}.json", params: {
+            title: 'This is a new title for the topic'
+          }
+
+          expect(response.status).to eq(429)
+        end
+
+        it "returns errors with invalid categories" do
+          put "/t/#{topic.slug}/#{topic.id}.json", params: {
+            category_id: -1
+          }
+
+          expect(response.status).to eq(422)
+        end
+
+        it "doesn't call the PostRevisor when there is no changes" do
+          expect do
+            put "/t/#{topic.slug}/#{topic.id}.json", params: {
+              category_id: topic.category_id
+            }
+          end.not_to change(PostRevision.all, :count)
+
+          expect(response.status).to eq(200)
+        end
+
+        context 'when topic is private' do
+          before do
+            topic.update!(
+              archetype: Archetype.private_message,
+              category: nil,
+              allowed_users: [topic.user]
+            )
+          end
+
+          context 'when there are no changes' do
+            it 'does not call the PostRevisor' do
+              expect do
+                put "/t/#{topic.slug}/#{topic.id}.json", params: {
+                  category_id: topic.category_id
+                }
+              end.not_to change(PostRevision.all, :count)
+
+              expect(response.status).to eq(200)
+            end
+          end
+        end
+
+        context "allow_uncategorized_topics is false" do
+          before do
+            SiteSetting.allow_uncategorized_topics = false
+          end
+
+          it "can add a category to an uncategorized topic" do
+            category = Fabricate(:category)
+
+            put "/t/#{topic.slug}/#{topic.id}.json", params: {
+              category_id: category.id
+            }
+
+            expect(response.status).to eq(200)
+            expect(topic.reload.category).to eq(category)
+          end
+        end
+      end
+    end
   end
 
   describe '#show' do
     let(:private_topic) { Fabricate(:private_message_topic) }
+    let(:topic) { Fabricate(:post).topic }
+
+    let!(:p1) { Fabricate(:post, user: topic.user) }
+    let!(:p2) { Fabricate(:post, user: topic.user) }
 
     describe 'when topic is not allowed' do
       it 'should return the right response' do
@@ -36,6 +783,692 @@ RSpec.describe TopicsController do
         expect(response.body).to eq(I18n.t('invalid_access'))
       end
     end
+
+    it 'correctly renders canoicals' do
+      get "/t/#{topic.id}", params: { slug: topic.slug }
+
+      expect(response).to be_success
+      expect(css_select("link[rel=canonical]").length).to eq(1)
+      expect(response.headers["Cache-Control"]).to eq("no-store, must-revalidate, no-cache, private")
+    end
+
+    it 'returns 301 even if slug does not match URL' do
+      # in the past we had special logic for unlisted topics
+      # we would require slug unless you made a json call
+      # this was not really providing any security
+      #
+      # we no longer require a topic be visible to perform url correction
+      # if you need to properly hide a topic for users use a secure category
+      # or a PM
+      topic = Fabricate(:topic, visible: false)
+      Fabricate(:post, topic: topic)
+
+      get "/t/#{topic.id}.json", params: { slug: topic.slug }
+      expect(response).to be_success
+
+      get "/t/#{topic.id}.json", params: { slug: "just-guessing" }
+      expect(response.status).to eq(301)
+
+      get "/t/#{topic.slug}.json"
+      expect(response.status).to eq(301)
+    end
+
+    it 'shows a topic correctly' do
+      get "/t/#{topic.slug}/#{topic.id}.json"
+      expect(response).to be_success
+    end
+
+    it 'return 404 for an invalid page' do
+      get "/t/#{topic.slug}/#{topic.id}.json", params: { page: 2 }
+      expect(response.status).to eq(404)
+    end
+
+    it 'can find a topic given a slug in the id param' do
+      get "/t/#{topic.slug}"
+      expect(response).to redirect_to(topic.relative_url)
+    end
+
+    it 'can find a topic when a slug has a number in front' do
+      another_topic = Fabricate(:post).topic
+
+      topic.update_column(:slug, "#{another_topic.id}-reasons-discourse-is-awesome")
+      get "/t/#{another_topic.id}-reasons-discourse-is-awesome"
+
+      expect(response).to redirect_to(topic.relative_url)
+    end
+
+    it 'keeps the post_number parameter around when redirecting' do
+      get "/t/#{topic.slug}", params: { post_number: 42 }
+      expect(response).to redirect_to(topic.relative_url + "/42")
+    end
+
+    it 'keeps the page around when redirecting' do
+      get "/t/#{topic.slug}", params: {
+        post_number: 42, page: 123
+      }
+
+      expect(response).to redirect_to(topic.relative_url + "/42?page=123")
+    end
+
+    it 'does not accept page params as an array' do
+      get "/t/#{topic.slug}", params: {
+        post_number: 42, page: [2]
+      }
+
+      expect(response).to redirect_to("#{topic.relative_url}/42?page=1")
+    end
+
+    it 'returns 404 when an invalid slug is given and no id' do
+      get "/t/nope-nope.json"
+
+      expect(response.status).to eq(404)
+    end
+
+    it 'returns a 404 when slug and topic id do not match a topic' do
+      get "/t/made-up-topic-slug/123456.json"
+      expect(response.status).to eq(404)
+    end
+
+    it 'returns a 404 for an ID that is larger than postgres limits' do
+      get "/t/made-up-topic-slug/5014217323220164041.json"
+
+      expect(response.status).to eq(404)
+    end
+
+    context 'a topic with nil slug exists' do
+      before do
+        nil_slug_topic = Fabricate(:topic)
+        Topic.connection.execute("update topics set slug=null where id = #{nil_slug_topic.id}") # can't find a way to set slug column to null using the model
+      end
+
+      it 'returns a 404 when slug and topic id do not match a topic' do
+        get "/t/made-up-topic-slug/123123.json"
+        expect(response.status).to eq(404)
+      end
+    end
+
+    context 'permission errors' do
+      let(:allowed_user) { Fabricate(:user) }
+      let(:allowed_group) { Fabricate(:group) }
+      let(:secure_category) do
+        c = Fabricate(:category)
+        c.permissions = [[allowed_group, :full]]
+        c.save
+        allowed_user.groups = [allowed_group]
+        allowed_user.save
+        c
+      end
+      let(:normal_topic) { Fabricate(:topic) }
+      let(:secure_topic) { Fabricate(:topic, category: secure_category) }
+      let(:private_topic) { Fabricate(:private_message_topic, user: allowed_user) }
+      let(:deleted_topic) { Fabricate(:deleted_topic) }
+      let(:deleted_secure_topic) { Fabricate(:topic, category: secure_category, deleted_at: 1.day.ago) }
+      let(:deleted_private_topic) { Fabricate(:private_message_topic, user: allowed_user, deleted_at: 1.day.ago) }
+      let(:nonexist_topic_id) { Topic.last.id + 10000 }
+
+      shared_examples "various scenarios" do |expected|
+        expected.each do |key, value|
+          it "returns #{value} for #{key}" do
+            slug = key == :nonexist ? "garbage-slug" : eval(key.to_s).slug
+            topic_id = key == :nonexist ? nonexist_topic_id : eval(key.to_s).id
+            get "/t/#{slug}/#{topic_id}.json"
+            expect(response.status).to eq(value)
+          end
+        end
+      end
+
+      context 'anonymous' do
+        expected = {
+          normal_topic: 200,
+          secure_topic: 403,
+          private_topic: 403,
+          deleted_topic: 410,
+          deleted_secure_topic: 403,
+          deleted_private_topic: 403,
+          nonexist: 404
+        }
+        include_examples "various scenarios", expected
+      end
+
+      context 'anonymous with login required' do
+        before do
+          SiteSetting.login_required = true
+        end
+        expected = {
+          normal_topic: 302,
+          secure_topic: 302,
+          private_topic: 302,
+          deleted_topic: 302,
+          deleted_secure_topic: 302,
+          deleted_private_topic: 302,
+          nonexist: 302
+        }
+        include_examples "various scenarios", expected
+      end
+
+      context 'normal user' do
+        before do
+          sign_in(Fabricate(:user))
+        end
+
+        expected = {
+          normal_topic: 200,
+          secure_topic: 403,
+          private_topic: 403,
+          deleted_topic: 410,
+          deleted_secure_topic: 403,
+          deleted_private_topic: 403,
+          nonexist: 404
+        }
+        include_examples "various scenarios", expected
+      end
+
+      context 'allowed user' do
+        before do
+          sign_in(allowed_user)
+        end
+
+        expected = {
+          normal_topic: 200,
+          secure_topic: 200,
+          private_topic: 200,
+          deleted_topic: 410,
+          deleted_secure_topic: 410,
+          deleted_private_topic: 410,
+          nonexist: 404
+        }
+        include_examples "various scenarios", expected
+      end
+
+      context 'moderator' do
+        before do
+          sign_in(Fabricate(:moderator))
+        end
+
+        expected = {
+          normal_topic: 200,
+          secure_topic: 403,
+          private_topic: 403,
+          deleted_topic: 200,
+          deleted_secure_topic: 403,
+          deleted_private_topic: 403,
+          nonexist: 404
+        }
+        include_examples "various scenarios", expected
+      end
+
+      context 'admin' do
+        before do
+          sign_in(Fabricate(:admin))
+        end
+
+        expected = {
+          normal_topic: 200,
+          secure_topic: 200,
+          private_topic: 200,
+          deleted_topic: 200,
+          deleted_secure_topic: 200,
+          deleted_private_topic: 200,
+          nonexist: 404
+        }
+        include_examples "various scenarios", expected
+      end
+    end
+
+    it 'records a view' do
+      expect do
+        get "/t/#{topic.slug}/#{topic.id}.json"
+      end.to change(TopicViewItem, :count).by(1)
+    end
+
+    it 'records incoming links' do
+      user = Fabricate(:user)
+
+      expect do
+        get "/t/#{topic.slug}/#{topic.id}", params: {
+          u: user.username
+        }
+      end.to change { IncomingLink.count }.by(1)
+    end
+
+    context 'print' do
+      it "doesn't renders the print view when disabled" do
+        SiteSetting.max_prints_per_hour_per_user = 0
+
+        get "/t/#{topic.slug}/#{topic.id}/print"
+
+        expect(response).to be_forbidden
+      end
+
+      it 'renders the print view when enabled' do
+        SiteSetting.max_prints_per_hour_per_user = 10
+
+        get "/t/#{topic.slug}/#{topic.id}/print"
+
+        expect(response).to be_successful
+      end
+    end
+
+    it 'records redirects' do
+      get "/t/#{topic.id}", headers: { HTTP_REFERER: "http://twitter.com" }
+      get "/t/#{topic.slug}/#{topic.id}", headers: { HTTP_REFERER: nil }
+
+      link = IncomingLink.first
+      expect(link.referer).to eq('http://twitter.com')
+    end
+
+    it 'tracks a visit for all html requests' do
+      sign_in(user)
+      get "/t/#{topic.slug}/#{topic.id}"
+      topic_user = TopicUser.where(user: user, topic: topic).first
+      expect(topic_user.last_visited_at).to eq(topic_user.first_visited_at)
+    end
+
+    context 'consider for a promotion' do
+      before do
+        SiteSetting.tl1_requires_topics_entered = 0
+        SiteSetting.tl1_requires_read_posts = 0
+        SiteSetting.tl1_requires_time_spent_mins = 0
+        SiteSetting.tl1_requires_time_spent_mins = 0
+      end
+
+      it "reviews the user for a promotion if they're new" do
+        sign_in(user)
+        user.update_column(:trust_level, TrustLevel[0])
+        get "/t/#{topic.slug}/#{topic.id}.json"
+        user.reload
+        expect(user.trust_level).to eq(1)
+      end
+    end
+
+    context 'filters' do
+      def extract_post_stream
+        json = JSON.parse(response.body)
+        json["post_stream"]["posts"].map { |post| post["id"] }
+      end
+
+      before do
+        TopicView.stubs(:chunk_size).returns(2)
+        @post_ids = topic.posts.pluck(:id)
+        3.times do
+          @post_ids << Fabricate(:post, topic: topic).id
+        end
+      end
+
+      it 'grabs the correct set of posts' do
+        get "/t/#{topic.slug}/#{topic.id}.json"
+        expect(response).to be_success
+        expect(extract_post_stream).to eq(@post_ids[0..1])
+
+        get "/t/#{topic.slug}/#{topic.id}.json", params: { page: 1 }
+        expect(response).to be_success
+        expect(extract_post_stream).to eq(@post_ids[0..1])
+
+        get "/t/#{topic.slug}/#{topic.id}.json", params: { page: 2 }
+        expect(response).to be_success
+        expect(extract_post_stream).to eq(@post_ids[2..3])
+
+        post_number = topic.posts.pluck(:post_number).sort[3]
+        get "/t/#{topic.slug}/#{topic.id}/#{post_number}.json"
+        expect(response).to be_success
+        expect(extract_post_stream).to eq(@post_ids[-2..-1])
+      end
+    end
+
+    context "when 'login required' site setting has been enabled" do
+      before { SiteSetting.login_required = true }
+
+      context 'and the user is logged in' do
+        before { sign_in(Fabricate(:coding_horror)) }
+
+        it 'shows the topic' do
+          get "/t/#{topic.slug}/#{topic.id}.json"
+          expect(response).to be_successful
+        end
+      end
+
+      context 'and the user is not logged in' do
+        let(:api_key) { topic.user.generate_api_key(topic.user) }
+
+        it 'redirects to the login page' do
+          get "/t/#{topic.slug}/#{topic.id}.json"
+
+          expect(response).to redirect_to login_path
+        end
+
+        it 'shows the topic if valid api key is provided' do
+          get "/t/#{topic.slug}/#{topic.id}.json", params: { api_key: api_key.key }
+
+          expect(response).to be_successful
+          topic.reload
+          expect(topic.views).to eq(1)
+        end
+
+        it 'returns 403 for an invalid key' do
+          [:json, :html].each do |format|
+            get "/t/#{topic.slug}/#{topic.id}.#{format}", params: { api_key: "bad" }
+
+            expect(response.code.to_i).to be(403)
+            expect(response.body).to include(I18n.t("invalid_access"))
+          end
+        end
+      end
+    end
+
+    it "is included for unlisted topics" do
+      topic = Fabricate(:topic, visible: false)
+      get "/t/#{topic.slug}/#{topic.id}.json"
+
+      expect(response.headers['X-Robots-Tag']).to eq('noindex')
+    end
+
+    it "is not included for normal topics" do
+      topic = Fabricate(:topic, visible: true)
+      get "/t/#{topic.slug}/#{topic.id}.json"
+
+      expect(response.headers['X-Robots-Tag']).to eq(nil)
+    end
+  end
+
+  describe '#posts' do
+    let(:topic) { Fabricate(:post).topic }
+
+    it 'returns first posts of the topic' do
+      get "/t/#{topic.id}/posts.json"
+      expect(response).to be_success
+      expect(response.content_type).to eq('application/json')
+    end
+  end
+
+  describe '#feed' do
+    let(:topic) { Fabricate(:post).topic }
+
+    it 'renders rss of the topic' do
+      get "/t/foo/#{topic.id}.rss"
+      expect(response).to be_success
+      expect(response.content_type).to eq('application/rss+xml')
+    end
+  end
+
+  describe '#invite_group' do
+    let(:admins) { Group[:admins] }
+
+    let!(:admin) { sign_in(Fabricate(:admin)) }
+
+    before do
+      admins.messageable_level = Group::ALIAS_LEVELS[:everyone]
+      admins.save!
+    end
+
+    it "disallows inviting a group to a topic" do
+      topic = Fabricate(:topic)
+      post "/t/#{topic.id}/invite-group.json", params: {
+        group: 'admins'
+      }
+
+      expect(response.status).to eq(422)
+    end
+
+    it "allows inviting a group to a PM" do
+      topic = Fabricate(:private_message_topic)
+      post "/t/#{topic.id}/invite-group.json", params: {
+        group: 'admins'
+      }
+
+      expect(response.status).to eq(200)
+      expect(topic.allowed_groups.first.id).to eq(admins.id)
+    end
+  end
+
+  describe '#make_banner' do
+    it 'needs you to be a staff member' do
+      sign_in(Fabricate(:user))
+      put "/t/99/make-banner.json"
+      expect(response).to be_forbidden
+    end
+
+    describe 'when logged in' do
+      it "changes the topic archetype to 'banner'" do
+        topic = Fabricate(:topic, user: sign_in(Fabricate(:admin)))
+
+        put "/t/#{topic.id}/make-banner.json"
+        expect(response).to be_success
+        topic.reload
+        expect(topic.archetype).to eq(Archetype.banner)
+      end
+    end
+  end
+
+  describe '#remove_banner' do
+    it 'needs you to be a staff member' do
+      sign_in(Fabricate(:user))
+      put "/t/99/remove-banner.json"
+      expect(response).to be_forbidden
+    end
+
+    describe 'when logged in' do
+      it "resets the topic archetype" do
+        topic = Fabricate(:topic, user: sign_in(Fabricate(:admin)), archetype: Archetype.banner)
+
+        put "/t/#{topic.id}/remove-banner.json"
+        expect(response).to be_success
+        topic.reload
+        expect(topic.archetype).to eq(Archetype.default)
+      end
+    end
+  end
+
+  describe '#remove_allowed_user' do
+    it 'admin can be removed from a pm' do
+      admin = sign_in(Fabricate(:admin))
+      user = Fabricate(:user)
+      pm = create_post(user: user, archetype: 'private_message', target_usernames: [user.username, admin.username])
+
+      put "/t/#{pm.topic_id}/remove-allowed-user.json", params: {
+        username: admin.username
+      }
+
+      expect(response.status).to eq(200)
+      expect(TopicAllowedUser.where(topic_id: pm.topic_id, user_id: admin.id).first).to eq(nil)
+    end
+  end
+
+  describe '#bulk' do
+    it 'needs you to be logged in' do
+      put "/topics/bulk.json"
+      expect(response.status).to eq(403)
+    end
+
+    describe "when logged in" do
+      let!(:user) { sign_in(Fabricate(:user)) }
+      let(:operation) { { type: 'change_category', category_id: '1' } }
+      let(:topic_ids) { [1, 2, 3] }
+
+      it "requires a list of topic_ids or filter" do
+        put "/topics/bulk.json", params: { operation: operation }
+        expect(response.status).to eq(400)
+      end
+
+      it "requires an operation param" do
+        put "/topics/bulk.json", params: { topic_ids: topic_ids }
+        expect(response.status).to eq(400)
+      end
+
+      it "requires a type field for the operation param" do
+        put "/topics/bulk.json", params: { topic_ids: topic_ids, operation: {} }
+        expect(response.status).to eq(400)
+      end
+
+      it "can find unread" do
+        # mark all unread muted
+        put "/topics/bulk.json", params: {
+          filter: 'unread', operation: { type: :change_notification_level, notification_level_id: 0 }
+        }
+
+        expect(response.status).to eq(200)
+      end
+
+      it "delegates work to `TopicsBulkAction`" do
+        topics_bulk_action = mock
+        TopicsBulkAction.expects(:new).with(user, topic_ids, operation, group: nil).returns(topics_bulk_action)
+        topics_bulk_action.expects(:perform!)
+
+        put "/topics/bulk.json", params: {
+          topic_ids: topic_ids, operation: operation
+        }
+      end
+    end
+  end
+
+  describe '#remove_bookmarks' do
+    it "should remove bookmarks properly from non first post" do
+      bookmark = PostActionType.types[:bookmark]
+      user = sign_in(Fabricate(:user))
+
+      post = create_post
+      post2 = create_post(topic_id: post.topic_id)
+
+      PostAction.act(user, post2, bookmark)
+
+      put "/t/#{post.topic_id}/bookmark.json"
+      expect(PostAction.where(user_id: user.id, post_action_type: bookmark).count).to eq(2)
+
+      put "/t/#{post.topic_id}/remove_bookmarks.json"
+      expect(PostAction.where(user_id: user.id, post_action_type: bookmark).count).to eq(0)
+    end
+
+    it "should disallow bookmarks on posts you have no access to" do
+      sign_in(Fabricate(:user))
+      user = Fabricate(:user)
+      pm = create_post(user: user, archetype: 'private_message', target_usernames: [user.username])
+
+      put "/t/#{pm.topic_id}/bookmark.json"
+      expect(response).to be_forbidden
+    end
+  end
+
+  describe '#reset_new' do
+    let(:user) { sign_in(Fabricate(:user)) }
+    it 'needs you to be logged in' do
+      put "/topics/reset-new.json"
+      expect(response.status).to eq(403)
+    end
+
+    it "updates the `new_since` date" do
+      old_date = 2.years.ago
+
+      user.user_stat.update_column(:new_since, old_date)
+
+      put "/topics/reset-new.json"
+      expect(response).to be_success
+      user.reload
+      expect(user.user_stat.new_since.to_date).not_to eq(old_date.to_date)
+    end
+  end
+
+  describe '#feature_stats' do
+    it "works" do
+      get "/topics/feature_stats.json", params: { category_id: 1 }
+
+      expect(response).to be_success
+      json = JSON.parse(response.body)
+      expect(json["pinned_in_category_count"]).to eq(0)
+      expect(json["pinned_globally_count"]).to eq(0)
+      expect(json["banner_count"]).to eq(0)
+    end
+
+    it "allows unlisted banner topic" do
+      Fabricate(:topic, category_id: 1, archetype: Archetype.banner, visible: false)
+
+      get "/topics/feature_stats.json", params: { category_id: 1 }
+      json = JSON.parse(response.body)
+      expect(json["banner_count"]).to eq(1)
+    end
+  end
+
+  describe '#excerpts' do
+    it "can correctly get excerpts" do
+      first_post = create_post(raw: 'This is the first post :)', title: 'This is a test title I am making yay')
+      second_post = create_post(raw: 'This is second post', topic: first_post.topic)
+
+      random_post = Fabricate(:post)
+
+      get "/t/#{first_post.topic_id}/excerpts.json", params: {
+        post_ids: [first_post.id, second_post.id, random_post.id]
+      }
+
+      json = JSON.parse(response.body)
+      json.sort! { |a, b| a["post_id"] <=> b["post_id"] }
+
+      # no random post
+      expect(json.length).to eq(2)
+      # keep emoji images
+      expect(json[0]["excerpt"]).to match(/emoji/)
+      expect(json[0]["excerpt"]).to match(/first post/)
+      expect(json[0]["username"]).to eq(first_post.user.username)
+      expect(json[0]["post_id"]).to eq(first_post.id)
+
+      expect(json[1]["excerpt"]).to match(/second post/)
+    end
+  end
+
+  describe '#convert_topic' do
+    it 'needs you to be logged in' do
+      put "/t/111/convert-topic/private.json"
+      expect(response.status).to eq(403)
+    end
+
+    describe 'converting public topic to private message' do
+      let(:user) { Fabricate(:user) }
+      let(:topic) { Fabricate(:topic, user: user) }
+
+      it "raises an error when the user doesn't have permission to convert topic" do
+        sign_in(Fabricate(:user))
+        put "/t/#{topic.id}/convert-topic/private.json"
+        expect(response).to be_forbidden
+      end
+
+      context "success" do
+        it "returns success" do
+          admin = sign_in(Fabricate(:admin))
+          put "/t/#{topic.id}/convert-topic/private.json"
+
+          topic.reload
+          expect(topic.archetype).to eq(Archetype.private_message)
+          expect(response).to be_success
+
+          result = ::JSON.parse(response.body)
+          expect(result['success']).to eq(true)
+          expect(result['url']).to be_present
+        end
+      end
+    end
+
+    describe 'converting private message to public topic' do
+      let(:user) { Fabricate(:user) }
+      let(:topic) { Fabricate(:private_message_topic, user: user) }
+
+      it "raises an error when the user doesn't have permission to convert topic" do
+        sign_in(Fabricate(:user))
+        put "/t/#{topic.id}/convert-topic/public.json"
+        expect(response).to be_forbidden
+      end
+
+      context "success" do
+        it "returns success" do
+          admin = sign_in(Fabricate(:admin))
+          put "/t/#{topic.id}/convert-topic/public.json"
+
+          topic.reload
+          expect(topic.archetype).to eq(Archetype.default)
+          expect(response).to be_success
+
+          result = ::JSON.parse(response.body)
+          expect(result['success']).to eq(true)
+          expect(result['url']).to be_present
+        end
+      end
+    end
   end
 
   describe '#timings' do
@@ -63,12 +1496,11 @@ RSpec.describe TopicsController do
   describe '#timer' do
     context 'when a user is not logged in' do
       it 'should return the right response' do
-        expect do
-          post "/t/#{topic.id}/timer.json", params: {
-            time: '24',
-            status_type: TopicTimer.types[1]
-          }
-        end.to raise_error(Discourse::NotLoggedIn)
+        post "/t/#{topic.id}/timer.json", params: {
+          time: '24',
+          status_type: TopicTimer.types[1]
+        }
+        expect(response.status).to eq(403)
       end
     end
 
@@ -94,8 +1526,6 @@ RSpec.describe TopicsController do
       end
 
       it 'should be able to create a topic status update' do
-        time = 24
-
         post "/t/#{topic.id}/timer.json", params: {
           time: 24,
           status_type: TopicTimer.types[1]
@@ -139,8 +1569,6 @@ RSpec.describe TopicsController do
 
       describe 'publishing topic to category in the future' do
         it 'should be able to create the topic status update' do
-          SiteSetting.queue_jobs = true
-
           post "/t/#{topic.id}/timer.json", params: {
             time: 24,
             status_type: TopicTimer.types[3],
@@ -167,17 +1595,121 @@ RSpec.describe TopicsController do
 
       describe 'invalid status type' do
         it 'should raise the right error' do
-          expect do
-            post "/t/#{topic.id}/timer.json", params: {
-              time: 10,
-              status_type: 'something'
-            }
-          end.to raise_error(Discourse::InvalidParameters)
+          post "/t/#{topic.id}/timer.json", params: {
+            time: 10,
+            status_type: 'something'
+          }
+          expect(response.status).to eq(400)
+          expect(response.body).to include('status_type')
         end
       end
     end
   end
 
+  describe '#invite' do
+    describe 'when not logged in' do
+      it "should return the right response" do
+        post "/t/#{topic.id}/invite.json", params: {
+          email: 'jake@adventuretime.ooo'
+        }
+
+        expect(response.status).to eq(403)
+      end
+    end
+
+    describe 'when logged in' do
+      before do
+        sign_in(user)
+      end
+
+      describe 'as a valid user' do
+        let(:topic) { Fabricate(:topic, user: user) }
+
+        it 'should return the right response' do
+          user.update!(trust_level: TrustLevel[2])
+
+          expect do
+            post "/t/#{topic.id}/invite.json", params: {
+              email: 'someguy@email.com'
+            }
+          end.to change { Invite.where(invited_by_id: user.id).count }.by(1)
+
+          expect(response.status).to eq(200)
+        end
+      end
+
+      describe 'when user is a group manager' do
+        let(:group) { Fabricate(:group).tap { |g| g.add_owner(user) } }
+        let(:private_category)  { Fabricate(:private_category, group: group) }
+
+        let(:group_private_topic) do
+          Fabricate(:topic, category: private_category, user: user)
+        end
+
+        let(:recipient) { 'jake@adventuretime.ooo' }
+
+        it "should attach group to the invite" do
+
+          post "/t/#{group_private_topic.id}/invite.json", params: {
+            user: recipient
+          }
+
+          expect(response.status).to eq(200)
+          expect(Invite.find_by(email: recipient).groups).to eq([group])
+        end
+      end
+
+      describe 'when topic id is invalid' do
+        it 'should return the right response' do
+          post "/t/999/invite.json", params: {
+            email: Fabricate(:user).email
+          }
+
+          expect(response.status).to eq(400)
+        end
+      end
+
+      it 'requires an email parameter' do
+        post "/t/#{topic.id}/invite.json"
+        expect(response.status).to eq(400)
+      end
+
+      describe 'when user does not have permission to invite to the topic' do
+        let(:topic) { Fabricate(:private_message_topic) }
+
+        it "should return the right response" do
+          post "/t/#{topic.id}/invite.json", params: {
+            user: user.username
+          }
+
+          expect(response.status).to eq(403)
+        end
+      end
+    end
+
+    describe "when inviting a group to a topic" do
+      let(:group) { Fabricate(:group) }
+
+      before do
+        sign_in(Fabricate(:admin))
+      end
+
+      it "should work correctly" do
+        email = 'hiro@from.heros'
+
+        post "/t/#{topic.id}/invite.json", params: {
+          email: email, group_ids: group.id
+        }
+
+        expect(response.status).to eq(200)
+
+        groups = Invite.find_by(email: email).groups
+        expect(groups.count).to eq(1)
+        expect(groups.first.id).to eq(group.id)
+      end
+    end
+  end
+
   describe 'invite_group' do
     let(:admins) { Group[:admins] }
     let(:pm) { Fabricate(:private_message_topic) }
@@ -232,4 +1764,154 @@ RSpec.describe TopicsController do
       end
     end
   end
+
+  describe 'shared drafts' do
+    let(:shared_drafts_category) { Fabricate(:category) }
+    let(:category) { Fabricate(:category) }
+
+    before do
+      SiteSetting.shared_drafts_category = shared_drafts_category.id
+    end
+
+    describe "#update_shared_draft" do
+      let(:other_cat) { Fabricate(:category) }
+      let(:category) { Fabricate(:category) }
+      let(:topic) { Fabricate(:topic, category: shared_drafts_category, visible: false) }
+
+      context "anonymous" do
+        it "doesn't allow staff to update the shared draft" do
+          put "/t/#{topic.id}/shared-draft.json", params: { category_id: other_cat.id }
+          expect(response.code.to_i).to eq(403)
+        end
+      end
+
+      context "as a moderator" do
+        let(:moderator) { Fabricate(:moderator) }
+        before do
+          sign_in(moderator)
+        end
+
+        context "with a shared draft" do
+          let!(:shared_draft) { Fabricate(:shared_draft, topic: topic, category: category) }
+          it "allows staff to update the category id" do
+            put "/t/#{topic.id}/shared-draft.json", params: { category_id: other_cat.id }
+            expect(response).to be_success
+            topic.reload
+            expect(topic.shared_draft.category_id).to eq(other_cat.id)
+          end
+        end
+
+        context "without a shared draft" do
+          it "allows staff to update the category id" do
+            put "/t/#{topic.id}/shared-draft.json", params: { category_id: other_cat.id }
+            expect(response).to be_success
+            topic.reload
+            expect(topic.shared_draft.category_id).to eq(other_cat.id)
+          end
+        end
+      end
+    end
+
+    describe "#publish" do
+      let(:category) { Fabricate(:category) }
+      let(:topic) { Fabricate(:topic, category: shared_drafts_category, visible: false) }
+      let(:shared_draft) { Fabricate(:shared_draft, topic: topic, category: category) }
+      let(:moderator) { Fabricate(:moderator) }
+
+      it "fails for anonymous users" do
+        put "/t/#{topic.id}/publish.json", params: { destination_category_id: category.id }
+        expect(response.status).to eq(403)
+      end
+
+      it "fails as a regular user" do
+        sign_in(Fabricate(:user))
+        put "/t/#{topic.id}/publish.json", params: { destination_category_id: category.id }
+        expect(response.status).to eq(403)
+      end
+
+      context "as staff" do
+        before do
+          sign_in(moderator)
+        end
+
+        it "will publish the topic" do
+          put "/t/#{topic.id}/publish.json", params: { destination_category_id: category.id }
+          expect(response.status).to eq(200)
+          json = ::JSON.parse(response.body)['basic_topic']
+
+          result = Topic.find(json['id'])
+          expect(result.category_id).to eq(category.id)
+          expect(result.visible).to eq(true)
+        end
+      end
+    end
+  end
+
+  describe "crawler" do
+
+    context "when not a crawler" do
+      it "renders with the application layout" do
+        get topic.url
+
+        body = response.body
+
+        expect(body).to have_tag(:script, with: { src: '/assets/application.js' })
+        expect(body).to have_tag(:meta, with: { name: 'fragment' })
+      end
+    end
+
+    context "when a crawler" do
+      it "renders with the crawler layout, and handles proper pagination" do
+
+        page1_time = 3.months.ago
+        page2_time = 2.months.ago
+        page3_time = 1.month.ago
+
+        freeze_time page1_time
+
+        topic = Fabricate(:topic)
+        Fabricate(:post, topic_id: topic.id)
+        Fabricate(:post, topic_id: topic.id)
+
+        freeze_time page2_time
+        Fabricate(:post, topic_id: topic.id)
+        Fabricate(:post, topic_id: topic.id)
+
+        freeze_time page3_time
+        Fabricate(:post, topic_id: topic.id)
+
+        # ugly, but no inteface to set this and we don't want to create
+        # 100 posts to test this thing
+        TopicView.stubs(:chunk_size).returns(2)
+
+        user_agent = "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)"
+
+        get topic.url, env: { "HTTP_USER_AGENT" => user_agent }
+
+        body = response.body
+
+        expect(body).to have_tag(:body, with: { class: 'crawler' })
+        expect(body).to_not have_tag(:meta, with: { name: 'fragment' })
+        expect(body).to include('<link rel="next" href="' + topic.relative_url + "?page=2")
+
+        expect(response.headers['Last-Modified']).to eq(page1_time.httpdate)
+
+        get topic.url + "?page=2", env: { "HTTP_USER_AGENT" => user_agent }
+        body = response.body
+
+        expect(response.headers['Last-Modified']).to eq(page2_time.httpdate)
+
+        expect(body).to include('<link rel="prev" href="' + topic.relative_url)
+        expect(body).to include('<link rel="next" href="' + topic.relative_url + "?page=3")
+
+        get topic.url + "?page=3", env: { "HTTP_USER_AGENT" => user_agent }
+        body = response.body
+
+        expect(response.headers['Last-Modified']).to eq(page3_time.httpdate)
+        expect(body).to include('<link rel="prev" href="' + topic.relative_url + "?page=2")
+      end
+    end
+
+  end
+
 end
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 9495effe712..5b7e588c528 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -1,19 +1,1000 @@
 require 'rails_helper'
 
-RSpec.describe UsersController do
+describe UsersController do
   let(:user) { Fabricate(:user) }
 
-  def honeypot_magic(params)
-    get '/u/hp.json'
-    json = JSON.parse(response.body)
-    params[:password_confirmation] = json["value"]
-    params[:challenge] = json["challenge"].reverse
-    params
+  describe '#perform_account_activation' do
+    let(:token) do
+      return @token if @token.present?
+      email_token = EmailToken.create!(expired: false, confirmed: false, user: user, email: user.email)
+      @token = email_token.token
+      @token
+    end
+
+    before do
+      UsersController.any_instance.stubs(:honeypot_or_challenge_fails?).returns(false)
+    end
+
+    context 'invalid token' do
+      it 'return success' do
+        put "/u/activate-account/invalid-tooken"
+        expect(response.status).to eq(200)
+        expect(flash[:error]).to be_present
+      end
+    end
+
+    context 'valid token' do
+      context 'welcome message' do
+        it 'enqueues a welcome message if the user object indicates so' do
+          user.update(active: false)
+          put "/u/activate-account/#{token}"
+          expect(response.status).to eq(200)
+          expect(Jobs::SendSystemMessage.jobs.size).to eq(1)
+          expect(Jobs::SendSystemMessage.jobs.first["args"].first["message_type"]).to eq("welcome_user")
+        end
+
+        it "doesn't enqueue the welcome message if the object returns false" do
+          user.update(active: true)
+          put "/u/activate-account/#{token}"
+          expect(response.status).to eq(200)
+          expect(Jobs::SendSystemMessage.jobs.size).to eq(0)
+        end
+      end
+
+      context "honeypot" do
+        it "raises an error if the honeypot is invalid" do
+          UsersController.any_instance.stubs(:honeypot_or_challenge_fails?).returns(true)
+          put "/u/activate-account/#{token}"
+          expect(response.status).to eq(403)
+        end
+      end
+
+      context 'response' do
+        before do
+          Guardian.any_instance.expects(:can_access_forum?).returns(true)
+          EmailToken.expects(:confirm).with("#{token}").returns(user)
+        end
+
+        it 'correctly logs on user' do
+          events = DiscourseEvent.track_events do
+            put "/u/activate-account/#{token}"
+          end
+
+          expect(events.map { |event| event[:event_name] }).to contain_exactly(
+            :user_logged_in, :user_first_logged_in
+          )
+
+          expect(response).to be_success
+          expect(flash[:error]).to be_blank
+          expect(session[:current_user_id]).to be_present
+
+          expect(CGI.unescapeHTML(response.body))
+            .to_not include(I18n.t('activation.approval_required'))
+        end
+      end
+
+      context 'user is not approved' do
+        before do
+          SiteSetting.must_approve_users = true
+          EmailToken.expects(:confirm).with("#{token}").returns(user)
+          put "/u/activate-account/#{token}"
+        end
+
+        it 'should return the right response' do
+          expect(response).to be_success
+
+          expect(CGI.unescapeHTML(response.body))
+            .to include(I18n.t('activation.approval_required'))
+
+          expect(response.body).to_not have_tag(:script, with: {
+            src: '/assets/application.js'
+          })
+
+          expect(flash[:error]).to be_blank
+          expect(session[:current_user_id]).to be_blank
+        end
+      end
+    end
+
+    context 'when cookies contains a destination URL' do
+      it 'should redirect to the URL' do
+        destination_url = 'http://thisisasite.com/somepath'
+        cookies[:destination_url] = destination_url
+
+        put "/u/activate-account/#{token}"
+
+        expect(response).to redirect_to(destination_url)
+      end
+    end
+  end
+
+  describe '#password_reset' do
+    let(:user) { Fabricate(:user) }
+    let(:token) { SecureRandom.hex }
+
+    context "you can view it even if login is required" do
+      it "returns success" do
+        SiteSetting.login_required = true
+        get "/u/password-reset/#{token}"
+        expect(response).to be_success
+        expect(CGI.unescapeHTML(response.body)).to include(I18n.t('password_reset.no_token'))
+      end
+    end
+
+    context 'missing token' do
+      before do
+        get "/u/password-reset/#{token}"
+      end
+
+      it 'disallows login' do
+        expect(response).to be_success
+
+        expect(CGI.unescapeHTML(response.body))
+          .to include(I18n.t('password_reset.no_token'))
+
+        expect(response.body).to_not have_tag(:script, with: {
+          src: '/assets/application.js'
+        })
+
+        expect(session[:current_user_id]).to be_blank
+      end
+    end
+
+    context 'invalid token' do
+      it 'disallows login' do
+        get "/u/password-reset/ev!l_trout@!"
+
+        expect(response).to be_success
+
+        expect(CGI.unescapeHTML(response.body))
+          .to include(I18n.t('password_reset.no_token'))
+
+        expect(response.body).to_not have_tag(:script, with: {
+          src: '/assets/application.js'
+        })
+
+        expect(session[:current_user_id]).to be_blank
+      end
+
+      it "responds with proper error message" do
+        put "/u/password-reset/evil_trout!.json", params: { password: "awesomeSecretPassword" }
+
+        expect(response).to be_success
+        expect(JSON.parse(response.body)["message"]).to eq(I18n.t('password_reset.no_token'))
+        expect(session[:current_user_id]).to be_blank
+      end
+    end
+
+    context 'valid token' do
+      context 'when rendered' do
+        it 'renders referrer never on get requests' do
+          user = Fabricate(:user)
+          token = user.email_tokens.create(email: user.email).token
+          get "/u/password-reset/#{token}"
+          expect(response.status).to eq(200)
+          expect(response.body).to include('<meta name="referrer" content="never">')
+        end
+      end
+
+      it 'returns success' do
+        user = Fabricate(:user)
+        user_auth_token = UserAuthToken.generate!(user_id: user.id)
+        token = user.email_tokens.create(email: user.email).token
+
+        events = DiscourseEvent.track_events do
+          put "/u/password-reset/#{token}", params: { password: 'hg9ow8yhg98o' }
+        end
+
+        expect(events.map { |event| event[:event_name] }).to contain_exactly(
+          :user_logged_in, :user_first_logged_in
+        )
+
+        expect(response).to be_success
+        expect(response.body).to include('{"is_developer":false,"admin":false,"second_factor_required":false}')
+
+        expect(session["password-#{token}"]).to be_blank
+        expect(UserAuthToken.where(id: user_auth_token.id).count).to eq(0)
+      end
+
+      it 'disallows double password reset' do
+        user = Fabricate(:user)
+        token = user.email_tokens.create(email: user.email).token
+
+        put "/u/password-reset/#{token}", params: { password: 'hg9ow8yHG32O' }
+
+        put "/u/password-reset/#{token}", params: { password: 'test123987AsdfXYZ' }
+
+        user.reload
+        expect(user.confirm_password?('hg9ow8yHG32O')).to eq(true)
+
+        # logged in now
+        expect(user.user_auth_tokens.count).to eq(1)
+      end
+
+      it "doesn't redirect to wizard on get" do
+        user = Fabricate(:admin)
+        UserAuthToken.generate!(user_id: user.id)
+
+        token = user.email_tokens.create(email: user.email).token
+        get "/u/password-reset/#{token}.json"
+        expect(response).not_to redirect_to(wizard_path)
+      end
+
+      it "redirects to the wizard if you're the first admin" do
+        user = Fabricate(:admin)
+        UserAuthToken.generate!(user_id: user.id)
+
+        token = user.email_tokens.create(email: user.email).token
+        get "/u/password-reset/#{token}"
+
+        put "/u/password-reset/#{token}", params: { password: 'hg9ow8yhg98oadminlonger' }
+
+        expect(response).to redirect_to(wizard_path)
+      end
+
+      it "doesn't invalidate the token when loading the page" do
+        user = Fabricate(:user)
+        user_token = UserAuthToken.generate!(user_id: user.id)
+
+        email_token = user.email_tokens.create(email: user.email)
+
+        get "/u/password-reset/#{email_token.token}.json"
+        expect(response.status).to eq(200)
+
+        email_token.reload
+
+        expect(email_token.confirmed).to eq(false)
+        expect(UserAuthToken.where(id: user_token.id).count).to eq(1)
+      end
+
+      context '2 factor authentication required' do
+        let!(:second_factor) { Fabricate(:user_second_factor, user: user) }
+
+        it 'does not change with an invalid token' do
+          token = user.email_tokens.create!(email: user.email).token
+
+          get "/u/password-reset/#{token}"
+
+          expect(response.body).to include('{"is_developer":false,"admin":false,"second_factor_required":true}')
+
+          put "/u/password-reset/#{token}", params: { password: 'hg9ow8yHG32O', second_factor_token: '000000' }
+
+          expect(response.body).to include(I18n.t("login.invalid_second_factor_code"))
+
+          user.reload
+          expect(user.confirm_password?('hg9ow8yHG32O')).not_to eq(true)
+          expect(user.user_auth_tokens.count).not_to eq(1)
+        end
+
+        it 'changes password with valid 2-factor tokens' do
+          token = user.email_tokens.create(email: user.email).token
+
+          get "/u/password-reset/#{token}"
+
+          put "/u/password-reset/#{token}", params: {
+            password: 'hg9ow8yHG32O',
+            second_factor_token: ROTP::TOTP.new(second_factor.data).now
+          }
+
+          user.reload
+          expect(response.status).to eq(200)
+          expect(user.confirm_password?('hg9ow8yHG32O')).to eq(true)
+          expect(user.user_auth_tokens.count).to eq(1)
+        end
+      end
+    end
+
+    context 'submit change' do
+      let(:token) { EmailToken.generate_token }
+
+      before do
+        EmailToken.expects(:confirm).with(token).returns(user)
+      end
+
+      it "fails when the password is blank" do
+        put "/u/password-reset/#{token}.json", params: { password: '' }
+
+        expect(response).to be_success
+        expect(JSON.parse(response.body)["errors"]).to be_present
+        expect(session[:current_user_id]).to be_blank
+      end
+
+      it "fails when the password is too long" do
+        put "/u/password-reset/#{token}.json", params: { password: ('x' * (User.max_password_length + 1)) }
+
+        expect(response).to be_success
+        expect(JSON.parse(response.body)["errors"]).to be_present
+        expect(session[:current_user_id]).to be_blank
+      end
+
+      it "logs in the user" do
+        put "/u/password-reset/#{token}.json", params: { password: 'ksjafh928r' }
+
+        expect(response).to be_success
+        expect(JSON.parse(response.body)["errors"]).to be_blank
+        expect(session[:current_user_id]).to be_present
+      end
+
+      it "doesn't log in the user when not approved" do
+        SiteSetting.must_approve_users = true
+
+        put "/u/password-reset/#{token}.json", params: { password: 'ksjafh928r' }
+        expect(JSON.parse(response.body)["errors"]).to be_blank
+        expect(session[:current_user_id]).to be_blank
+      end
+    end
+  end
+
+  describe '#confirm_email_token' do
+    let(:user) { Fabricate(:user) }
+
+    it "token doesn't match any records" do
+      email_token = user.email_tokens.create(email: user.email)
+      get "/u/confirm-email-token/#{SecureRandom.hex}.json"
+      expect(response).to be_success
+      expect(email_token.reload.confirmed).to eq(false)
+    end
+
+    it "token matches" do
+      email_token = user.email_tokens.create(email: user.email)
+      get "/u/confirm-email-token/#{email_token.token}.json"
+      expect(response).to be_success
+      expect(email_token.reload.confirmed).to eq(true)
+    end
+  end
+
+  describe '#admin_login' do
+    let(:admin) { Fabricate(:admin) }
+    let(:user) { Fabricate(:user) }
+
+    context 'enqueues mail' do
+      it 'enqueues mail with admin email and sso enabled' do
+        put "/u/admin-login", params: { email: admin.email }
+        expect(response.status).to eq(200)
+        expect(Jobs::CriticalUserEmail.jobs.size).to eq(1)
+        args = Jobs::CriticalUserEmail.jobs.first["args"].first
+        expect(args["user_id"]).to eq(admin.id)
+      end
+    end
+
+    context 'when email is incorrect' do
+      it 'should return the right response' do
+        put "/u/admin-login", params: { email: 'random' }
+
+        expect(response.status).to eq(200)
+
+        response_body = response.body
+
+        expect(response_body).to match(I18n.t("admin_login.errors.unknown_email_address"))
+        expect(response_body).to_not match(I18n.t("login.second_factor_description"))
+      end
+    end
+
+    context 'logs in admin' do
+      it 'does not log in admin with invalid token' do
+        SiteSetting.sso_url = "https://www.example.com/sso"
+        SiteSetting.enable_sso = true
+        get "/u/admin-login/invalid"
+        expect(session[:current_user_id]).to be_blank
+      end
+
+      context 'valid token' do
+        it 'does log in admin with SSO disabled' do
+          SiteSetting.enable_sso = false
+          token = admin.email_tokens.create(email: admin.email).token
+
+          get "/u/admin-login/#{token}"
+          expect(response).to redirect_to('/')
+          expect(session[:current_user_id]).to eq(admin.id)
+        end
+
+        it 'logs in admin with SSO enabled' do
+          SiteSetting.sso_url = "https://www.example.com/sso"
+          SiteSetting.enable_sso = true
+          token = admin.email_tokens.create(email: admin.email).token
+
+          get "/u/admin-login/#{token}"
+          expect(response).to redirect_to('/')
+          expect(session[:current_user_id]).to eq(admin.id)
+        end
+      end
+
+      describe 'when 2 factor authentication is enabled' do
+        let(:second_factor) { Fabricate(:user_second_factor, user: admin) }
+        let(:email_token) { Fabricate(:email_token, user: admin) }
+
+        it 'does not log in when token required' do
+          second_factor
+          get "/u/admin-login/#{email_token.token}"
+          expect(response).not_to redirect_to('/')
+          expect(session[:current_user_id]).not_to eq(admin.id)
+          expect(response.body).to include(I18n.t('login.second_factor_description'));
+        end
+
+        describe 'invalid 2 factor token' do
+          it 'should display the right error' do
+            second_factor
+
+            put "/u/admin-login/#{email_token.token}", params: { second_factor_token: '13213' }
+
+            expect(response.status).to eq(200)
+            expect(response.body).to include(I18n.t('login.second_factor_description'));
+            expect(response.body).to include(I18n.t('login.invalid_second_factor_code'));
+          end
+        end
+
+        it 'logs in when a valid 2-factor token is given' do
+          put "/u/admin-login/#{email_token.token}", params: { second_factor_token: ROTP::TOTP.new(second_factor.data).now }
+
+          expect(response).to redirect_to('/')
+          expect(session[:current_user_id]).to eq(admin.id)
+        end
+      end
+    end
+  end
+
+  describe '#toggle_anon' do
+    it 'allows you to toggle anon if enabled' do
+      SiteSetting.allow_anonymous_posting = true
+
+      user = sign_in(Fabricate(:user))
+      user.trust_level = 1
+      user.save!
+
+      post "/u/toggle-anon.json"
+      expect(response).to be_success
+      expect(session[:current_user_id]).to eq(AnonymousShadowCreator.get(user).id)
+
+      post "/u/toggle-anon.json"
+      expect(response).to be_success
+      expect(session[:current_user_id]).to eq(user.id)
+    end
   end
 
   describe '#create' do
+    def honeypot_magic(params)
+      get '/u/hp.json'
+      json = JSON.parse(response.body)
+      params[:password_confirmation] = json["value"]
+      params[:challenge] = json["challenge"].reverse
+      params
+    end
+
+    before do
+      UsersController.any_instance.stubs(:honeypot_value).returns(nil)
+      UsersController.any_instance.stubs(:challenge_value).returns(nil)
+      SiteSetting.allow_new_registrations = true
+      @user = Fabricate.build(:user, password: "strongpassword")
+    end
+
+    let(:post_user_params) do
+      { name: @user.name,
+        username: @user.username,
+        password: "strongpassword",
+        email: @user.email }
+    end
+
+    def post_user
+      post "/u.json", params: post_user_params
+    end
+
+    context 'when email params is missing' do
+      it 'should raise the right error' do
+        post "/u.json", params: {
+          name: @user.name,
+          username: @user.username,
+          passsword: 'tesing12352343'
+        }
+        expect(response.status).to eq(400)
+      end
+    end
+
+    context 'when creating a user' do
+      it 'sets the user locale to I18n.locale' do
+        SiteSetting.default_locale = 'en'
+        I18n.stubs(:locale).returns(:fr)
+        post_user
+        expect(User.find_by(username: @user.username).locale).to eq('fr')
+      end
+    end
+
+    context 'when creating a non active user (unconfirmed email)' do
+      it 'returns 403 forbidden when local logins are disabled' do
+        SiteSetting.enable_local_logins = false
+        post_user
+
+        expect(response.status).to eq(403)
+      end
+
+      it 'returns an error when new registrations are disabled' do
+        SiteSetting.allow_new_registrations = false
+
+        post_user
+        expect(response.status).to eq(200)
+
+        json = JSON.parse(response.body)
+        expect(json['success']).to eq(false)
+        expect(json['message']).to be_present
+      end
+
+      it 'creates a user correctly' do
+        post_user
+        expect(response.status).to eq(200)
+        expect(JSON.parse(response.body)['active']).to be_falsey
+
+        # should save user_created_message in session
+        expect(session["user_created_message"]).to be_present
+        expect(session[SessionController::ACTIVATE_USER_KEY]).to be_present
+
+        expect(Jobs::SendSystemMessage.jobs.size).to eq(0)
+
+        expect(Jobs::CriticalUserEmail.jobs.size).to eq(1)
+        args = Jobs::CriticalUserEmail.jobs.first["args"].first
+        expect(args["type"]).to eq("signup")
+      end
+
+      context "`must approve users` site setting is enabled" do
+        before { SiteSetting.must_approve_users = true }
+
+        it 'creates a user correctly' do
+          post_user
+          expect(response.status).to eq(200)
+
+          expect(JSON.parse(response.body)['active']).to be_falsey
+
+          # should save user_created_message in session
+          expect(session["user_created_message"]).to be_present
+          expect(session[SessionController::ACTIVATE_USER_KEY]).to be_present
+
+          expect(Jobs::SendSystemMessage.jobs.size).to eq(0)
+
+          expect(Jobs::CriticalUserEmail.jobs.size).to eq(1)
+          args = Jobs::CriticalUserEmail.jobs.first["args"].first
+          expect(args["type"]).to eq("signup")
+        end
+      end
+
+      context 'users already exists with given email' do
+        let!(:existing) { Fabricate(:user, email: post_user_params[:email]) }
+
+        it 'returns an error if hide_email_address_taken is disabled' do
+          SiteSetting.hide_email_address_taken = false
+
+          post_user
+          expect(response.status).to eq(200)
+
+          json = JSON.parse(response.body)
+          expect(json['success']).to eq(false)
+          expect(json['message']).to be_present
+        end
+
+        it 'returns success if hide_email_address_taken is enabled' do
+          SiteSetting.hide_email_address_taken = true
+          expect {
+            post_user
+          }.to_not change { User.count }
+
+          expect(response.status).to eq(200)
+          expect(session["user_created_message"]).to be_present
+
+          json = JSON.parse(response.body)
+          expect(json['active']).to be_falsey
+          expect(json['message']).to eq(I18n.t("login.activate_email", email: post_user_params[:email]))
+        end
+      end
+    end
+
+    context "creating as active" do
+      it "won't create the user as active" do
+        post "/u.json", params: post_user_params.merge(active: true)
+        expect(response.status).to eq(200)
+        expect(JSON.parse(response.body)['active']).to be_falsey
+      end
+
+      context "with a regular api key" do
+        let(:user) { Fabricate(:user) }
+        let(:api_key) { Fabricate(:api_key, user: user) }
+
+        it "won't create the user as active with a regular key" do
+          post "/u.json",
+            params: post_user_params.merge(active: true, api_key: api_key.key)
+
+          expect(response.status).to eq(200)
+          expect(JSON.parse(response.body)['active']).to be_falsey
+        end
+      end
+
+      context "with an admin api key" do
+        let(:admin) { Fabricate(:admin) }
+        let(:api_key) { Fabricate(:api_key, user: admin) }
+
+        it "creates the user as active with a regular key" do
+          SiteSetting.send_welcome_message = true
+          SiteSetting.must_approve_users = true
+
+          #Sidekiq::Client.expects(:enqueue).never
+          post "/u.json", params: post_user_params.merge(approved: true, active: true, api_key: api_key.key)
+
+          expect(Jobs::CriticalUserEmail.jobs.size).to eq(0)
+          expect(Jobs::SendSystemMessage.jobs.size).to eq(0)
+
+          expect(response.status).to eq(200)
+          json = JSON.parse(response.body)
+
+          new_user = User.find(json["user_id"])
+
+          expect(json['active']).to be_truthy
+
+          expect(new_user.active).to eq(true)
+          expect(new_user.approved).to eq(true)
+          expect(new_user.approved_by_id).to eq(admin.id)
+          expect(new_user.approved_at).to_not eq(nil)
+        end
+
+        it "won't create the developer as active" do
+          UsernameCheckerService.expects(:is_developer?).returns(true)
+
+          post "/u.json", params: post_user_params.merge(active: true, api_key: api_key.key)
+          expect(response.status).to eq(200)
+          expect(JSON.parse(response.body)['active']).to be_falsy
+        end
+      end
+    end
+
+    context "creating as staged" do
+      it "won't create the user as staged" do
+        post "/u.json", params: post_user_params.merge(staged: true)
+        expect(response.status).to eq(200)
+        new_user = User.where(username: post_user_params[:username]).first
+        expect(new_user.staged?).to eq(false)
+      end
+
+      context "with a regular api key" do
+        let(:user) { Fabricate(:user) }
+        let(:api_key) { Fabricate(:api_key, user: user) }
+
+        it "won't create the user as staged with a regular key" do
+          post "/u.json", params: post_user_params.merge(staged: true, api_key: api_key.key)
+          expect(response.status).to eq(200)
+
+          new_user = User.where(username: post_user_params[:username]).first
+          expect(new_user.staged?).to eq(false)
+        end
+      end
+
+      context "with an admin api key" do
+        let(:user) { Fabricate(:admin) }
+        let(:api_key) { Fabricate(:api_key, user: user) }
+
+        it "creates the user as staged with a regular key" do
+          post "/u.json", params: post_user_params.merge(staged: true, api_key: api_key.key)
+          expect(response.status).to eq(200)
+
+          new_user = User.where(username: post_user_params[:username]).first
+          expect(new_user.staged?).to eq(true)
+        end
+
+        it "won't create the developer as staged" do
+          UsernameCheckerService.expects(:is_developer?).returns(true)
+          post "/u.json", params: post_user_params.merge(staged: true, api_key: api_key.key)
+          expect(response.status).to eq(200)
+
+          new_user = User.where(username: post_user_params[:username]).first
+          expect(new_user.staged?).to eq(false)
+        end
+      end
+    end
+
+    context 'when creating an active user (confirmed email)' do
+      before { User.any_instance.stubs(:active?).returns(true) }
+
+      it 'enqueues a welcome email' do
+        User.any_instance.expects(:enqueue_welcome_message).with('welcome_user')
+
+        post_user
+        expect(response.status).to eq(200)
+
+        # should save user_created_message in session
+        expect(session["user_created_message"]).to be_present
+        expect(session[SessionController::ACTIVATE_USER_KEY]).to be_present
+      end
+
+      it "shows the 'active' message" do
+        User.any_instance.expects(:enqueue_welcome_message)
+        post_user
+        expect(response.status).to eq(200)
+        expect(JSON.parse(response.body)['message']).to eq(
+          I18n.t 'login.active'
+        )
+      end
+
+      it "should be logged in" do
+        User.any_instance.expects(:enqueue_welcome_message)
+        post_user
+        expect(response.status).to eq(200)
+        expect(session[:current_user_id]).to be_present
+      end
+
+      it 'indicates the user is active in the response' do
+        User.any_instance.expects(:enqueue_welcome_message)
+        post_user
+        expect(response.status).to eq(200)
+        expect(JSON.parse(response.body)['active']).to be_truthy
+      end
+
+      it 'doesn\'t succeed when new registrations are disabled' do
+        SiteSetting.allow_new_registrations = false
+
+        post_user
+        expect(response.status).to eq(200)
+
+        json = JSON.parse(response.body)
+        expect(json['success']).to eq(false)
+        expect(json['message']).to be_present
+      end
+
+      context 'authentication records for' do
+        let(:user) { Fabricate(:user) }
+
+        before do
+          OmniAuth.config.test_mode = true
+
+          OmniAuth.config.mock_auth[:twitter] = OmniAuth::AuthHash.new(
+            provider: 'twitter',
+            uid: '123545',
+            info: OmniAuth::AuthHash::InfoHash.new(
+              email: "osama@mail.com",
+              nickname: "testosama"
+            )
+          )
+
+          Rails.application.env_config["omniauth.auth"] = OmniAuth.config.mock_auth[:twitter]
+          SiteSetting.enable_twitter_logins = true
+          get "/auth/twitter/callback.json"
+        end
+
+        after do
+          Rails.application.env_config["omniauth.auth"] = OmniAuth.config.mock_auth[:twitter] = nil
+          OmniAuth.config.test_mode = false
+        end
+
+        it 'should create twitter user info if required' do
+          post "/u.json", params: {
+            name: "Test Osama",
+            username: "testosama",
+            password: "strongpassword",
+            email: "osama@mail.com"
+          }
+
+          expect(response.status).to eq(200)
+          expect(TwitterUserInfo.count).to eq(1)
+        end
+
+        it "returns an error when email has been changed from the validated email address" do
+          post "/u.json", params: {
+            name: "Test Osama",
+            username: "testosama",
+            password: "strongpassword",
+            email: "unvalidatedemail@mail.com"
+          }
+
+          expect(response.status).to eq(200)
+          json = JSON.parse(response.body)
+          expect(json['success']).to eq(false)
+          expect(json['message']).to be_present
+        end
+
+        it "will create the user successfully if email validation is required" do
+          post "/u.json", params: {
+            name: "Test Osama",
+            username: "testosama",
+            password: "strongpassword",
+            email: "osama@mail.com"
+          }
+
+          expect(response.status).to eq(200)
+          json = JSON.parse(response.body)
+          expect(json['success']).to eq(true)
+        end
+      end
+    end
+
+    it "creates user successfully but doesn't activate the account" do
+      post_user
+      expect(response.status).to eq(200)
+      json = JSON::parse(response.body)
+      expect(json["success"]).to eq(true)
+      expect(User.find_by(username: @user.username).active).to eq(false)
+    end
+
+    shared_examples 'honeypot fails' do
+      it 'should not create a new user' do
+        expect {
+          post "/u.json", params: create_params
+        }.to_not change { User.count }
+        expect(response.status).to eq(200)
+      end
+
+      it 'should not send an email' do
+        User.any_instance.expects(:enqueue_welcome_message).never
+        post "/u.json", params: create_params
+        expect(response.status).to eq(200)
+      end
+
+      it 'should say it was successful' do
+        post "/u.json", params: create_params
+        json = JSON::parse(response.body)
+        expect(response.status).to eq(200)
+        expect(json["success"]).to eq(true)
+
+        # should not change the session
+        expect(session["user_created_message"]).to be_blank
+        expect(session[SessionController::ACTIVATE_USER_KEY]).to be_blank
+      end
+    end
+
+    context 'when honeypot value is wrong' do
+      before do
+        UsersController.any_instance.stubs(:honeypot_value).returns('abc')
+      end
+      let(:create_params) { { name: @user.name, username: @user.username, password: "strongpassword", email: @user.email, password_confirmation: 'wrong' } }
+      include_examples 'honeypot fails'
+    end
+
+    context 'when challenge answer is wrong' do
+      before do
+        UsersController.any_instance.stubs(:challenge_value).returns('abc')
+      end
+      let(:create_params) { { name: @user.name, username: @user.username, password: "strongpassword", email: @user.email, challenge: 'abc' } }
+      include_examples 'honeypot fails'
+    end
+
+    context "when 'invite only' setting is enabled" do
+      before { SiteSetting.invite_only = true }
+
+      let(:create_params) { {
+        name: @user.name,
+        username: @user.username,
+        password: 'strongpassword',
+        email: @user.email
+      }}
+
+      include_examples 'honeypot fails'
+    end
+
+    shared_examples 'failed signup' do
+      it 'should not create a new User' do
+        expect { post "/u.json", params: create_params }.to_not change { User.count }
+      end
+
+      it 'should report failed' do
+        post "/u.json", params: create_params
+        json = JSON::parse(response.body)
+        expect(json["success"]).not_to eq(true)
+
+        # should not change the session
+        expect(session["user_created_message"]).to be_blank
+        expect(session[SessionController::ACTIVATE_USER_KEY]).to be_blank
+      end
+    end
+
+    context 'when password is blank' do
+      let(:create_params) { { name: @user.name, username: @user.username, password: "", email: @user.email } }
+      include_examples 'failed signup'
+    end
+
+    context 'when password is too long' do
+      let(:create_params) { { name: @user.name, username: @user.username, password: "x" * (User.max_password_length + 1), email: @user.email } }
+      include_examples 'failed signup'
+    end
+
+    context 'when password param is missing' do
+      let(:create_params) { { name: @user.name, username: @user.username, email: @user.email } }
+      include_examples 'failed signup'
+    end
+
+    context 'with a reserved username' do
+      let(:create_params) { { name: @user.name, username: 'Reserved', email: @user.email, password: "x" * 20 } }
+      before { SiteSetting.reserved_usernames = 'a|reserved|b' }
+      include_examples 'failed signup'
+    end
+
+    context 'when an Exception is raised' do
+      before { User.any_instance.stubs(:save).raises(ActiveRecord::StatementInvalid.new('Oh no')) }
+
+      let(:create_params) {
+        { name: @user.name, username: @user.username,
+          password: "strongpassword", email: @user.email }
+      }
+
+      include_examples 'failed signup'
+    end
+
+    context "with custom fields" do
+      let!(:user_field) { Fabricate(:user_field) }
+      let!(:another_field) { Fabricate(:user_field) }
+      let!(:optional_field) { Fabricate(:user_field, required: false) }
+
+      context "without a value for the fields" do
+        let(:create_params) { { name: @user.name, password: 'watwatwat', username: @user.username, email: @user.email } }
+        include_examples 'failed signup'
+      end
+
+      context "with values for the fields" do
+        let(:create_params) { {
+          name: @user.name,
+          password: 'suChS3cuRi7y',
+          username: @user.username,
+          email: @user.email,
+          user_fields: {
+            user_field.id.to_s => 'value1',
+            another_field.id.to_s => 'value2',
+          }
+        } }
+
+        it "should succeed without the optional field" do
+          post "/u.json", params: create_params
+          expect(response).to be_success
+          inserted = User.find_by_email(@user.email)
+          expect(inserted).to be_present
+          expect(inserted.custom_fields).to be_present
+          expect(inserted.custom_fields["user_field_#{user_field.id}"]).to eq('value1')
+          expect(inserted.custom_fields["user_field_#{another_field.id}"]).to eq('value2')
+          expect(inserted.custom_fields["user_field_#{optional_field.id}"]).to be_blank
+        end
+
+        it "should succeed with the optional field" do
+          create_params[:user_fields][optional_field.id.to_s] = 'value3'
+          post "/u.json", params: create_params.merge(create_params)
+          expect(response).to be_success
+          inserted = User.find_by_email(@user.email)
+          expect(inserted).to be_present
+          expect(inserted.custom_fields).to be_present
+          expect(inserted.custom_fields["user_field_#{user_field.id}"]).to eq('value1')
+          expect(inserted.custom_fields["user_field_#{another_field.id}"]).to eq('value2')
+          expect(inserted.custom_fields["user_field_#{optional_field.id}"]).to eq('value3')
+        end
+
+        it "trims excessively long fields" do
+          create_params[:user_fields][optional_field.id.to_s] = ('x' * 3000)
+          post "/u.json", params: create_params.merge(create_params)
+          expect(response).to be_success
+          inserted = User.find_by_email(@user.email)
+
+          val = inserted.custom_fields["user_field_#{optional_field.id}"]
+          expect(val.length).to eq(UserField.max_length)
+        end
+      end
+    end
+
+    context "with only optional custom fields" do
+      let!(:user_field) { Fabricate(:user_field, required: false) }
+
+      context "without values for the fields" do
+        let(:create_params) { {
+          name: @user.name,
+          password: 'suChS3cuRi7y',
+          username: @user.username,
+          email: @user.email,
+        } }
+
+        it "should succeed" do
+          post "/u.json", params: create_params
+          expect(response).to be_success
+          inserted = User.find_by_email(@user.email)
+          expect(inserted).to be_present
+          expect(inserted.custom_fields).not_to be_present
+          expect(inserted.custom_fields["user_field_#{user_field.id}"]).to be_blank
+        end
+      end
+    end
 
     context "when taking over a staged account" do
+      before do
+        UsersController.any_instance.stubs(:honeypot_value).returns("abc")
+        UsersController.any_instance.stubs(:challenge_value).returns("efg")
+      end
+
       let!(:staged) { Fabricate(:staged, email: "staged@account.com", active: true) }
 
       it "succeeds" do
@@ -39,13 +1020,1396 @@ RSpec.describe UsersController do
 
         created_user.reload
         expect(created_user.email).to eq("staged@account.com")
-        expect(response.status).not_to eq(200)
+        expect(response.status).to eq(403)
+      end
+    end
+  end
+
+  describe '#username' do
+    it 'raises an error when not logged in' do
+      put "/u/somename/preferences/username.json"
+      expect(response.status).to eq(403)
+    end
+
+    context 'while logged in' do
+      let(:old_username) { "OrigUsrname" }
+      let(:new_username) { "#{old_username}1234" }
+      let(:user) { Fabricate(:user, username: old_username) }
+
+      before do
+        user.username = old_username
+        sign_in(user)
+      end
+
+      it 'raises an error without a new_username param' do
+        put "/u/#{user.username}/preferences/username.json", params: { username: user.username }
+        expect(response.status).to eq(400)
+        expect(user.reload.username).to eq(old_username)
+      end
+
+      it 'raises an error when you don\'t have permission to change the username' do
+        Guardian.any_instance.expects(:can_edit_username?).with(user).returns(false)
+
+        put "/u/#{user.username}/preferences/username.json", params: { new_username: new_username }
+
+        expect(response).to be_forbidden
+        expect(user.reload.username).to eq(old_username)
+      end
+
+      it 'raises an error when change_username fails' do
+        put "/u/#{user.username}/preferences/username.json", params: { new_username: '@' }
+
+        expect(response.status).to eq(422)
+
+        body = JSON.parse(response.body)
+
+        expect(body['errors'].first).to include(I18n.t(
+          'user.username.short', min: User.username_length.begin
+        ))
+
+        expect(user.reload.username).to eq(old_username)
+      end
+
+      it 'should succeed in normal circumstances' do
+        put "/u/#{user.username}/preferences/username.json", params: { new_username: new_username }
+
+        expect(response).to be_success
+        expect(user.reload.username).to eq(new_username)
+      end
+
+      it 'should fail if the user is old' do
+        # Older than the change period and >1 post
+        user.created_at = Time.now - (SiteSetting.username_change_period + 1).days
+        PostCreator.new(user,
+          title: 'This is a test topic',
+          raw: 'This is a test this is a test'
+        ).create
+
+        put "/u/#{user.username}/preferences/username.json", params: { new_username: new_username }
+
+        expect(response).to be_forbidden
+        expect(user.reload.username).to eq(old_username)
+      end
+
+      it 'should create a staff action log when a staff member changes the username' do
+        acting_user = Fabricate(:admin)
+        sign_in(acting_user)
+
+        put "/u/#{user.username}/preferences/username.json", params: { new_username: new_username }
+
+        expect(response).to be_success
+        expect(UserHistory.where(action: UserHistory.actions[:change_username], target_user_id: user.id, acting_user_id: acting_user.id)).to be_present
+        expect(user.reload.username).to eq(new_username)
+      end
+
+      it 'should return a JSON response with the updated username' do
+        put "/u/#{user.username}/preferences/username.json", params: { new_username: new_username }
+
+        expect(::JSON.parse(response.body)['username']).to eq(new_username)
+      end
+    end
+  end
+
+  describe '#check_username' do
+    it 'raises an error without any parameters' do
+      get "/u/check_username.json"
+      expect(response.status).to eq(400)
+    end
+
+    shared_examples 'when username is unavailable' do
+      it 'should return available as false in the JSON and return a suggested username' do
+        expect(response.status).to eq(200)
+        expect(::JSON.parse(response.body)['available']).to eq(false)
+        expect(::JSON.parse(response.body)['suggestion']).to be_present
       end
     end
 
+    shared_examples 'when username is available' do
+      it 'should return available in the JSON' do
+        expect(response.status).to eq(200)
+        expect(::JSON.parse(response.body)['available']).to eq(true)
+      end
+    end
+
+    it 'returns nothing when given an email param but no username' do
+      get "/u/check_username.json", params: { email: 'dood@example.com' }
+      expect(response.status).to eq(200)
+    end
+
+    context 'username is available' do
+      before do
+        get "/u/check_username.json", params: { username: 'BruceWayne' }
+      end
+      include_examples 'when username is available'
+    end
+
+    context 'username is unavailable' do
+      let!(:user) { Fabricate(:user) }
+      before do
+        get "/u/check_username.json", params: { username: user.username }
+      end
+      include_examples 'when username is unavailable'
+    end
+
+    shared_examples 'checking an invalid username' do
+      it 'should not return an available key but should return an error message' do
+        expect(response.status).to eq(200)
+        expect(::JSON.parse(response.body)['available']).to eq(nil)
+        expect(::JSON.parse(response.body)['errors']).to be_present
+      end
+    end
+
+    context 'has invalid characters' do
+      before do
+        get "/u/check_username.json", params: { username: 'bad username' }
+      end
+      include_examples 'checking an invalid username'
+
+      it 'should return the invalid characters message' do
+        expect(response.status).to eq(200)
+        expect(::JSON.parse(response.body)['errors']).to include(I18n.t(:'user.username.characters'))
+      end
+    end
+
+    context 'is too long' do
+      before do
+        get "/u/check_username.json", params: { username: generate_username(User.username_length.last + 1) }
+      end
+      include_examples 'checking an invalid username'
+
+      it 'should return the "too long" message' do
+        expect(response.status).to eq(200)
+        expect(::JSON.parse(response.body)['errors']).to include(I18n.t(:'user.username.long', max: User.username_length.end))
+      end
+    end
+
+    describe 'different case of existing username' do
+      context "it's my username" do
+        let!(:user) { Fabricate(:user, username: 'hansolo') }
+        before do
+          sign_in(user)
+
+          get "/u/check_username.json", params: { username: 'HanSolo' }
+        end
+        include_examples 'when username is available'
+      end
+
+      context "it's someone else's username" do
+        let!(:user) { Fabricate(:user, username: 'hansolo') }
+        before do
+          sign_in(Fabricate(:user))
+
+          get "/u/check_username.json", params: { username: 'HanSolo' }
+        end
+        include_examples 'when username is unavailable'
+      end
+
+      context "an admin changing it for someone else" do
+        let!(:user) { Fabricate(:user, username: 'hansolo') }
+        before do
+          sign_in(Fabricate(:admin))
+
+          get "/u/check_username.json", params: { username: 'HanSolo', for_user_id: user.id }
+        end
+        include_examples 'when username is available'
+      end
+    end
+  end
+
+  describe '#invited' do
+    it 'returns success' do
+      user = Fabricate(:user)
+      get "/u/#{user.username}/invited.json", params: { username: user.username }
+
+      expect(response).to be_success
+    end
+
+    it 'filters by email' do
+      inviter = Fabricate(:user)
+      invitee = Fabricate(:user)
+      Fabricate(
+        :invite,
+        email: 'billybob@example.com',
+        invited_by: inviter,
+        user: invitee
+      )
+      Fabricate(
+        :invite,
+        email: 'jimtom@example.com',
+        invited_by: inviter,
+        user: invitee
+      )
+
+      get "/u/#{inviter.username}/invited.json", params: { search: 'billybob' }
+
+      invites = JSON.parse(response.body)['invites']
+      expect(invites.size).to eq(1)
+      expect(invites.first).to include('email' => 'billybob@example.com')
+    end
+
+    it 'filters by username' do
+      inviter = Fabricate(:user)
+      invitee = Fabricate(:user, username: 'billybob')
+      _invite = Fabricate(
+        :invite,
+        invited_by: inviter,
+        email: 'billybob@example.com',
+        user: invitee
+      )
+      Fabricate(
+        :invite,
+        invited_by: inviter,
+        user: Fabricate(:user, username: 'jimtom')
+      )
+
+      get "/u/#{inviter.username}/invited.json", params: { search: 'billybob' }
+
+      invites = JSON.parse(response.body)['invites']
+      expect(invites.size).to eq(1)
+      expect(invites.first).to include('email' => 'billybob@example.com')
+    end
+
+    context 'with guest' do
+      context 'with pending invites' do
+        it 'does not return invites' do
+          inviter = Fabricate(:user)
+          Fabricate(:invite, invited_by: inviter)
+
+          get "/u/#{user.username}/invited/pending.json"
+
+          invites = JSON.parse(response.body)['invites']
+          expect(invites).to be_empty
+        end
+      end
+
+      context 'with redeemed invites' do
+        it 'returns invites' do
+          inviter = Fabricate(:user)
+          invitee = Fabricate(:user)
+          invite = Fabricate(:invite, invited_by: inviter, user: invitee)
+
+          get "/u/#{inviter.username}/invited.json"
+
+          invites = JSON.parse(response.body)['invites']
+          expect(invites.size).to eq(1)
+          expect(invites.first).to include('email' => invite.email)
+        end
+      end
+    end
+
+    context 'with authenticated user' do
+      context 'with pending invites' do
+        context 'with permission to see pending invites' do
+          it 'returns invites' do
+            inviter = Fabricate(:user)
+            invite = Fabricate(:invite, invited_by: inviter)
+            sign_in(inviter)
+
+            get "/u/#{inviter.username}/invited/pending.json"
+
+            invites = JSON.parse(response.body)['invites']
+            expect(invites.size).to eq(1)
+            expect(invites.first).to include("email" => invite.email)
+          end
+        end
+
+        context 'without permission to see pending invites' do
+          it 'does not return invites' do
+            user = sign_in(Fabricate(:user))
+            inviter = Fabricate(:user)
+            _invitee = Fabricate(:user)
+            Fabricate(:invite, invited_by: inviter)
+            stub_guardian(user) do |guardian|
+              guardian.stubs(:can_see_invite_details?).
+                with(inviter).returns(false)
+            end
+
+            get "/u/#{inviter.username}/invited/pending.json"
+
+            json = JSON.parse(response.body)['invites']
+            expect(json).to be_empty
+          end
+        end
+      end
+
+      context 'with redeemed invites' do
+        it 'returns invites' do
+          _user = sign_in(Fabricate(:user))
+          inviter = Fabricate(:user)
+          invitee = Fabricate(:user)
+          invite = Fabricate(:invite, invited_by: inviter, user: invitee)
+
+          get "/u/#{inviter.username}/invited.json"
+
+          invites = JSON.parse(response.body)['invites']
+          expect(invites.size).to eq(1)
+          expect(invites.first).to include('email' => invite.email)
+        end
+      end
+    end
+  end
+
+  describe '#update' do
+    context 'with guest' do
+      it 'raises an error' do
+        put "/u/guest.json"
+        expect(response.status).to eq(403)
+      end
+    end
+
+    context "when username contains a period" do
+      before do
+        sign_in(user)
+      end
+      let(:user) { Fabricate(:user) }
+
+      it "should be able to update a user" do
+        put "/u/#{user.username}.json", params: { name: 'test.test' }
+
+        expect(response).to be_success
+        expect(user.reload.name).to eq('test.test')
+      end
+
+      it "should be able to update a user" do
+        put "/u/#{user.username}.json", params: { name: 'testing123' }
+
+        expect(response).to be_success
+        expect(user.reload.name).to eq('testing123')
+      end
+    end
+
+    context "as a staff user" do
+      context "uneditable field" do
+        let!(:user_field) { Fabricate(:user_field, editable: false) }
+
+        it "allows staff to edit the field" do
+          sign_in(Fabricate(:admin))
+          user = Fabricate(:user)
+          put "/u/#{user.username}.json", params: {
+            name: 'Jim Tom',
+            title: "foobar",
+            user_fields: { user_field.id.to_s => 'happy' }
+          }
+
+          expect(response).to be_success
+
+          user.reload
+
+          expect(user.user_fields[user_field.id.to_s]).to eq('happy')
+          expect(user.title).to eq("foobar")
+        end
+      end
+    end
+
+    context 'with authenticated user' do
+      context 'with permission to update' do
+        let!(:user) { sign_in(Fabricate(:user)) }
+
+        it 'allows the update' do
+          user2 = Fabricate(:user)
+          user3 = Fabricate(:user)
+          tags = [Fabricate(:tag), Fabricate(:tag)]
+
+          put "/u/#{user.username}.json", params: {
+            name: 'Jim Tom',
+            custom_fields: { test: :it },
+            muted_usernames: "#{user2.username},#{user3.username}",
+            watched_tags: "#{tags[0].name},#{tags[1].name}"
+          }
+
+          expect(response).to be_success
+
+          user.reload
+
+          expect(user.name).to eq 'Jim Tom'
+          expect(user.custom_fields['test']).to eq 'it'
+          expect(user.muted_users.pluck(:username).sort).to eq [user2.username, user3.username].sort
+          expect(TagUser.where(
+            user: user,
+            notification_level: TagUser.notification_levels[:watching]
+          ).pluck(:tag_id)).to contain_exactly(tags[0].id, tags[1].id)
+
+          theme = Theme.create(name: "test", user_selectable: true, user_id: -1)
+
+          put "/u/#{user.username}.json", params: {
+            muted_usernames: "",
+            theme_key: theme.key,
+            email_direct: false
+          }
+
+          user.reload
+
+          expect(user.muted_users.pluck(:username).sort).to be_empty
+          expect(user.user_option.theme_key).to eq(theme.key)
+          expect(user.user_option.email_direct).to eq(false)
+        end
+
+        context 'a locale is chosen that differs from I18n.locale' do
+          it "updates the user's locale" do
+            I18n.stubs(:locale).returns('fr')
+            put "/u/#{user.username}.json", params: { locale: :fa_IR }
+            expect(User.find_by(username: user.username).locale).to eq('fa_IR')
+          end
+        end
+
+        context "with user fields" do
+          context "an editable field" do
+            let!(:user_field) { Fabricate(:user_field) }
+            let!(:optional_field) { Fabricate(:user_field, required: false) }
+
+            it "should update the user field" do
+              put "/u/#{user.username}.json", params: { name: 'Jim Tom', user_fields: { user_field.id.to_s => 'happy' } }
+
+              expect(response).to be_success
+              expect(user.user_fields[user_field.id.to_s]).to eq 'happy'
+            end
+
+            it "cannot be updated to blank" do
+              put "/u/#{user.username}.json", params: { name: 'Jim Tom', user_fields: { user_field.id.to_s => '' } }
+
+              expect(response.status).to eq(422)
+              expect(user.user_fields[user_field.id.to_s]).not_to eq('happy')
+            end
+
+            it "trims excessively large fields" do
+              put "/u/#{user.username}.json", params: { name: 'Jim Tom', user_fields: { user_field.id.to_s => ('x' * 3000) } }
+
+              expect(user.user_fields[user_field.id.to_s].size).to eq(UserField.max_length)
+            end
+
+            it "should retain existing user fields" do
+              put "/u/#{user.username}.json", params: { name: 'Jim Tom', user_fields: { user_field.id.to_s => 'happy', optional_field.id.to_s => 'feet' } }
+
+              expect(response).to be_success
+              expect(user.user_fields[user_field.id.to_s]).to eq('happy')
+              expect(user.user_fields[optional_field.id.to_s]).to eq('feet')
+
+              put "/u/#{user.username}.json", params: { name: 'Jim Tom', user_fields: { user_field.id.to_s => 'sad' } }
+
+              expect(response).to be_success
+
+              user.reload
+
+              expect(user.user_fields[user_field.id.to_s]).to eq('sad')
+              expect(user.user_fields[optional_field.id.to_s]).to eq('feet')
+            end
+          end
+
+          context "uneditable field" do
+            let!(:user_field) { Fabricate(:user_field, editable: false) }
+
+            it "does not update the user field" do
+              put "/u/#{user.username}.json", params: { name: 'Jim Tom', user_fields: { user_field.id.to_s => 'happy' } }
+
+              expect(response).to be_success
+              expect(user.user_fields[user_field.id.to_s]).to be_blank
+            end
+          end
+        end
+
+        it 'returns user JSON' do
+          put "/u/#{user.username}.json"
+
+          json = JSON.parse(response.body)
+          expect(json['user']['id']).to eq user.id
+        end
+      end
+
+      context 'without permission to update' do
+        it 'does not allow the update' do
+          user = Fabricate(:user, name: 'Billy Bob')
+          sign_in(Fabricate(:user))
+
+          put "/u/#{user.username}.json", params: { name: 'Jim Tom' }
+
+          expect(response).to be_forbidden
+          expect(user.reload.name).not_to eq 'Jim Tom'
+        end
+      end
+    end
+  end
+
+  describe '#badge_title' do
+    let(:user) { Fabricate(:user) }
+    let(:badge) { Fabricate(:badge) }
+    let(:user_badge) { BadgeGranter.grant(badge, user) }
+
+    it "sets the user's title to the badge name if it is titleable" do
+      sign_in(user)
+
+      put "/u/#{user.username}/preferences/badge_title.json", params: { user_badge_id: user_badge.id }
+
+      expect(user.reload.title).not_to eq(badge.display_name)
+      badge.update_attributes allow_title: true
+
+      put "/u/#{user.username}/preferences/badge_title.json", params: { user_badge_id: user_badge.id }
+
+      expect(user.reload.title).to eq(badge.display_name)
+      expect(user.user_profile.badge_granted_title).to eq(true)
+
+      user.title = "testing"
+      user.save
+      user.user_profile.reload
+      expect(user.user_profile.badge_granted_title).to eq(false)
+    end
+
+    context "with overrided name" do
+      let(:badge) { Fabricate(:badge, name: 'Demogorgon', allow_title: true) }
+      let(:user_badge) { BadgeGranter.grant(badge, user) }
+
+      before do
+        TranslationOverride.upsert!('en', 'badges.demogorgon.name', 'Boss')
+      end
+
+      after do
+        TranslationOverride.revert!('en', ['badges.demogorgon.name'])
+      end
+
+      it "uses the badge display name as user title" do
+        sign_in(user)
+
+        put "/u/#{user.username}/preferences/badge_title.json", params: { user_badge_id: user_badge.id }
+        expect(user.reload.title).to eq(badge.display_name)
+      end
+    end
+  end
+
+  describe '#send_activation_email' do
+    before do
+      UsersController.any_instance.stubs(:honeypot_value).returns(nil)
+      UsersController.any_instance.stubs(:challenge_value).returns(nil)
+    end
+
+    let(:post_user) do
+      post "/u.json", params: {
+        username: "osamatest",
+        password: "strongpassword",
+        email: "dsdsds@sasa.com"
+      }
+
+      User.find_by(username: "osamatest")
+    end
+
+    context 'for an existing user' do
+      context 'for an activated account with email confirmed' do
+        it 'fails' do
+          user = post_user
+          email_token = user.email_tokens.create(email: user.email).token
+          EmailToken.confirm(email_token)
+
+          post "/u/action/send_activation_email.json", params: { username: user.username }
+
+          expect(response.status).to eq(409)
+          expect(JSON.parse(response.body)['errors']).to include(I18n.t(
+            'activation.activated'
+          ))
+          expect(session[SessionController::ACTIVATE_USER_KEY]).to eq(nil)
+        end
+      end
+
+      context 'for an activated account with unconfirmed email' do
+        it 'should send an email' do
+          user = post_user
+          user.update(active: true)
+          user.save!
+          user.email_tokens.create(email: user.email)
+          Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :signup, to_address: user.email))
+
+          post "/u/action/send_activation_email.json", params: {
+            username: user.username
+          }
+
+          expect(response.status).to eq(200)
+
+          expect(session[SessionController::ACTIVATE_USER_KEY]).to eq(nil)
+        end
+      end
+
+      context "approval is enabled" do
+        before do
+          SiteSetting.must_approve_users = true
+        end
+
+        it "should raise an error" do
+          user = post_user
+          user.update(active: true)
+          user.save!
+          user.email_tokens.create(email: user.email)
+          post "/u/action/send_activation_email.json", params: {
+            username: user.username
+          }
+
+          expect(response.status).to eq(403)
+        end
+      end
+
+      describe 'when user does not have a valid session' do
+        it 'should not be valid' do
+          user = Fabricate(:user)
+          post "/u/action/send_activation_email.json", params: {
+            username: user.username
+          }
+          expect(response.status).to eq(403)
+        end
+
+        it 'should allow staff regardless' do
+          sign_in(Fabricate(:admin))
+          user = Fabricate(:user, active: false)
+          post "/u/action/send_activation_email.json", params: {
+            username: user.username
+          }
+          expect(response.status).to eq(200)
+        end
+      end
+
+      context 'with a valid email_token' do
+        it 'should send the activation email' do
+          user = post_user
+          Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :signup))
+          post "/u/action/send_activation_email.json", params: {
+            username: user.username
+          }
+          expect(session[SessionController::ACTIVATE_USER_KEY]).to eq(nil)
+        end
+      end
+
+      context 'without an existing email_token' do
+        let(:user) { post_user }
+        before do
+          user.email_tokens.each { |t| t.destroy }
+          user.reload
+        end
+
+        it 'should generate a new token' do
+          expect {
+            post "/u/action/send_activation_email.json", params: { username: user.username }
+          }.to change { user.reload.email_tokens.count }.by(1)
+        end
+
+        it 'should send an email' do
+          expect do
+            post "/u/action/send_activation_email.json", params: {
+              username: user.username
+            }
+          end.to change { Jobs::CriticalUserEmail.jobs.size }.by(1)
+
+          expect(session[SessionController::ACTIVATE_USER_KEY]).to eq(nil)
+        end
+      end
+    end
+
+    context 'when username does not exist' do
+      it 'should not send an email' do
+        post "/u/action/send_activation_email.json", params: { username: 'nopenopenopenope' }
+        expect(response.status).to eq(404)
+        expect(Jobs::CriticalUserEmail.jobs.size).to eq(0)
+      end
+    end
+  end
+
+  describe '#pick_avatar' do
+    it 'raises an error when not logged in' do
+      put "/u/asdf/preferences/avatar/pick.json", params: { avatar_id: 1, type: "custom" }
+      expect(response.status).to eq(403)
+    end
+
+    context 'while logged in' do
+
+      let!(:user) { sign_in(Fabricate(:user)) }
+      let(:upload) { Fabricate(:upload) }
+
+      it "raises an error when you don't have permission to toggle the avatar" do
+        another_user = Fabricate(:user)
+        put "/u/#{another_user.username}/preferences/avatar/pick.json", params: {
+          upload_id: upload.id, type: "custom"
+        }
+
+        expect(response).to be_forbidden
+      end
+
+      it "raises an error when sso_overrides_avatar is disabled" do
+        SiteSetting.sso_overrides_avatar = true
+        put "/u/#{user.username}/preferences/avatar/pick.json", params: {
+          upload_id: upload.id, type: "custom"
+        }
+
+        expect(response.status).to eq(422)
+      end
+
+      it "raises an error when selecting the custom/uploaded avatar and allow_uploaded_avatars is disabled" do
+        SiteSetting.allow_uploaded_avatars = false
+        put "/u/#{user.username}/preferences/avatar/pick.json", params: {
+          upload_id: upload.id, type: "custom"
+        }
+
+        expect(response.status).to eq(422)
+      end
+
+      it 'can successfully pick the system avatar' do
+        put "/u/#{user.username}/preferences/avatar/pick.json"
+
+        expect(response).to be_success
+        expect(user.reload.uploaded_avatar_id).to eq(nil)
+      end
+
+      it 'can successfully pick a gravatar' do
+        put "/u/#{user.username}/preferences/avatar/pick.json", params: {
+          upload_id: upload.id, type: "gravatar"
+        }
+
+        expect(response).to be_success
+        expect(user.reload.uploaded_avatar_id).to eq(upload.id)
+        expect(user.user_avatar.reload.gravatar_upload_id).to eq(upload.id)
+      end
+
+      it 'can successfully pick a custom avatar' do
+        put "/u/#{user.username}/preferences/avatar/pick.json", params: {
+          upload_id: upload.id, type: "custom"
+        }
+
+        expect(response).to be_success
+        expect(user.reload.uploaded_avatar_id).to eq(upload.id)
+        expect(user.user_avatar.reload.custom_upload_id).to eq(upload.id)
+      end
+    end
+  end
+
+  describe '#destroy_user_image' do
+
+    it 'raises an error when not logged in' do
+      delete "/u/asdf/preferences/user_image.json", params: { type: 'profile_background' }
+      expect(response.status).to eq(403)
+    end
+
+    context 'while logged in' do
+      let(:another_user) { Fabricate(:user) }
+      let(:user) { Fabricate(:user) }
+      before do
+        sign_in(user)
+      end
+
+      it 'raises an error when you don\'t have permission to clear the profile background' do
+        delete "/u/#{another_user.username}/preferences/user_image.json", params: { type: 'profile_background' }
+        expect(response).to be_forbidden
+      end
+
+      it "requires the `type` param" do
+        delete "/u/#{user.username}/preferences/user_image.json"
+        expect(response.status).to eq(400)
+      end
+
+      it "only allows certain `types`" do
+        delete "/u/#{user.username}/preferences/user_image.json", params: { type: 'wat' }
+        expect(response.status).to eq(400)
+      end
+
+      it 'can clear the profile background' do
+        delete "/u/#{user.username}/preferences/user_image.json", params: { type: 'profile_background' }
+
+        expect(user.reload.user_profile.profile_background).to eq("")
+        expect(response).to be_success
+      end
+    end
+  end
+
+  describe '#destroy' do
+    it 'raises an error when not logged in' do
+      delete "/u/nobody.json"
+      expect(response.status).to eq(403)
+    end
+
+    context 'while logged in' do
+      let(:user) { Fabricate(:user) }
+      let(:another_user) { Fabricate(:user) }
+      before do
+        sign_in(user)
+      end
+
+      it 'raises an error when you cannot delete your account' do
+        UserDestroyer.any_instance.expects(:destroy).never
+        stat = user.user_stat
+        stat.post_count = 3
+        stat.save!
+        delete "/u/#{user.username}.json"
+        expect(response).to be_forbidden
+      end
+
+      it "raises an error when you try to delete someone else's account" do
+        UserDestroyer.any_instance.expects(:destroy).never
+        delete "/u/#{another_user.username}.json"
+        expect(response).to be_forbidden
+      end
+
+      it "deletes your account when you're allowed to" do
+        UserDestroyer.any_instance.expects(:destroy).with(user, anything).returns(user)
+        delete "/u/#{user.username}.json"
+        expect(response).to be_success
+      end
+    end
+  end
+
+  describe '#my_redirect' do
+    it "redirects if the user is not logged in" do
+      get "/my/wat.json"
+      expect(response).to be_redirect
+    end
+
+    context "when the user is logged in" do
+      let!(:user) { sign_in(Fabricate(:user)) }
+
+      it "will not redirect to an invalid path" do
+        get "/my/wat/..password.txt"
+        expect(response).not_to be_redirect
+      end
+
+      it "will redirect to an valid path" do
+        get "/my/preferences.json"
+        expect(response).to be_redirect
+      end
+
+      it "permits forward slashes" do
+        get "/my/activity/posts.json"
+        expect(response).to be_redirect
+      end
+    end
+  end
+
+  describe '#check_emails' do
+    it 'raises an error when not logged in' do
+      get "/u/zogstrip/emails.json"
+      expect(response.status).to eq(403)
+    end
+
+    context 'while logged in' do
+      let(:sign_in_admin) { sign_in(Fabricate(:admin)) }
+
+      it "raises an error when you aren't allowed to check emails" do
+        sign_in(Fabricate(:user))
+        get "/u/#{Fabricate(:user).username}/emails.json"
+        expect(response).to be_forbidden
+      end
+
+      it "returns both email and associated_accounts when you're allowed to see them" do
+        sign_in_admin
+
+        get "/u/#{Fabricate(:user).username}/emails.json"
+
+        expect(response).to be_success
+        json = JSON.parse(response.body)
+        expect(json["email"]).to be_present
+        expect(json["associated_accounts"]).to be_present
+      end
+
+      it "works on inactive users" do
+        inactive_user = Fabricate(:user, active: false)
+        sign_in_admin
+
+        get "/u/#{inactive_user.username}/emails.json"
+
+        expect(response).to be_success
+        json = JSON.parse(response.body)
+        expect(json["email"]).to be_present
+        expect(json["associated_accounts"]).to be_present
+      end
+    end
+  end
+
+  describe '#is_local_username' do
+    let(:user) { Fabricate(:user) }
+    let(:group) { Fabricate(:group, name: "Discourse") }
+    let(:topic) { Fabricate(:topic) }
+    let(:allowed_user) { Fabricate(:user) }
+    let(:private_topic) { Fabricate(:private_message_topic, user: allowed_user) }
+
+    it "finds the user" do
+      get "/u/is_local_username.json", params: { username: user.username }
+
+      expect(response.status).to eq(200)
+      json = JSON.parse(response.body)
+      expect(json["valid"][0]).to eq(user.username)
+    end
+
+    it "finds the group" do
+      get "/u/is_local_username.json", params: { username: group.name }
+
+      expect(response.status).to eq(200)
+      json = JSON.parse(response.body)
+      expect(json["valid_groups"][0]).to eq(group.name)
+    end
+
+    it "supports multiples usernames" do
+      get "/u/is_local_username.json", params: { usernames: [user.username, "system"] }
+
+      expect(response.status).to eq(200)
+      json = JSON.parse(response.body)
+      expect(json["valid"].size).to eq(2)
+    end
+
+    it "never includes staged accounts" do
+      staged = Fabricate(:user, staged: true)
+
+      get "/u/is_local_username.json", params: { usernames: [staged.username] }
+
+      expect(response.status).to eq(200)
+      json = JSON.parse(response.body)
+      expect(json["valid"].size).to eq(0)
+    end
+
+    it "returns user who cannot see topic" do
+      Guardian.any_instance.expects(:can_see?).with(topic).returns(false)
+
+      get "/u/is_local_username.json", params: {
+        usernames: [user.username], topic_id: topic.id
+      }
+
+      expect(response.status).to eq(200)
+      json = JSON.parse(response.body)
+      expect(json["cannot_see"].size).to eq(1)
+    end
+
+    it "never returns a user who can see the topic" do
+      Guardian.any_instance.expects(:can_see?).with(topic).returns(true)
+
+      get "/u/is_local_username.json", params: {
+        usernames: [user.username], topic_id: topic.id
+      }
+
+      expect(response.status).to eq(200)
+      json = JSON.parse(response.body)
+      expect(json["cannot_see"].size).to eq(0)
+    end
+
+    it "returns user who cannot see a private topic" do
+      Guardian.any_instance.expects(:can_see?).with(private_topic).returns(false)
+
+      get "/u/is_local_username.json", params: {
+        usernames: [user.username], topic_id: private_topic.id
+      }
+
+      expect(response.status).to eq(200)
+      json = JSON.parse(response.body)
+      expect(json["cannot_see"].size).to eq(1)
+    end
+
+    it "never returns a user who can see the topic" do
+      Guardian.any_instance.expects(:can_see?).with(private_topic).returns(true)
+
+      get "/u/is_local_username.json", params: {
+        usernames: [allowed_user.username], topic_id: private_topic.id
+      }
+
+      expect(response.status).to eq(200)
+      json = JSON.parse(response.body)
+      expect(json["cannot_see"].size).to eq(0)
+    end
+  end
+
+  describe '#topic_tracking_state' do
+    let(:user) { Fabricate(:user) }
+
+    context 'anon' do
+      it "raises an error on anon for topic_tracking_state" do
+        get "/u/#{user.username}/topic-tracking-state.json"
+        expect(response.status).to eq(403)
+      end
+    end
+
+    context 'logged on' do
+      it "detects new topic" do
+        sign_in(user)
+
+        topic = Fabricate(:topic)
+        get "/u/#{user.username}/topic-tracking-state.json"
+
+        expect(response.status).to eq(200)
+        states = JSON.parse(response.body)
+        expect(states[0]["topic_id"]).to eq(topic.id)
+      end
+    end
+  end
+
+  describe '#summary' do
+    it "generates summary info" do
+      user = Fabricate(:user)
+      create_post(user: user)
+
+      get "/u/#{user.username_lower}/summary.json"
+      expect(response).to be_success
+      json = JSON.parse(response.body)
+
+      expect(json["user_summary"]["topic_count"]).to eq(1)
+      expect(json["user_summary"]["post_count"]).to eq(0)
+    end
+  end
+
+  describe '#confirm_admin' do
+    it "fails without a valid token" do
+      get "/u/confirm-admin/invalid-token.josn"
+      expect(response).not_to be_success
+    end
+
+    it "fails with a missing token" do
+      get "/u/confirm-admin/a0a0a0a0a0.josn"
+      expect(response).to_not be_success
+    end
+
+    it "succeeds with a valid code as anonymous" do
+      user = Fabricate(:user)
+      ac = AdminConfirmation.new(user, Fabricate(:admin))
+      ac.create_confirmation
+      get "/u/confirm-admin/#{ac.token}.josn"
+      expect(response).to be_success
+
+      user.reload
+      expect(user.admin?).to eq(false)
+    end
+
+    it "succeeds with a valid code when logged in as that user" do
+      admin = sign_in(Fabricate(:admin))
+      user = Fabricate(:user)
+
+      ac = AdminConfirmation.new(user, admin)
+      ac.create_confirmation
+      get "/u/confirm-admin/#{ac.token}.josn", params: { token: ac.token }
+      expect(response).to be_success
+
+      user.reload
+      expect(user.admin?).to eq(false)
+    end
+
+    it "fails if you're logged in as a different account" do
+      sign_in(Fabricate(:admin))
+      user = Fabricate(:user)
+
+      ac = AdminConfirmation.new(user, Fabricate(:admin))
+      ac.create_confirmation
+      get "/u/confirm-admin/#{ac.token}.josn"
+      expect(response).to_not be_success
+
+      user.reload
+      expect(user.admin?).to eq(false)
+    end
+
+    describe "post" do
+      it "gives the user admin access when POSTed" do
+        user = Fabricate(:user)
+        ac = AdminConfirmation.new(user, Fabricate(:admin))
+        ac.create_confirmation
+        post "/u/confirm-admin/#{ac.token}.josn"
+        expect(response).to be_success
+
+        user.reload
+        expect(user.admin?).to eq(true)
+      end
+    end
+  end
+
+  describe '#update_activation_email' do
+    before do
+      UsersController.any_instance.stubs(:honeypot_value).returns(nil)
+      UsersController.any_instance.stubs(:challenge_value).returns(nil)
+    end
+
+    let(:post_user) do
+      post "/u.json", params: {
+        username: "osamatest",
+        password: "strongpassword",
+        email: "osama@example.com"
+      }
+      user = User.where(username: "osamatest").first
+      user.active = false
+      user.save!
+      user
+    end
+
+    context "with a session variable" do
+      it "raises an error with an invalid session value" do
+        post_user
+
+        post "/u.json", params: {
+          username: "osamatest2",
+          password: "strongpassword2",
+          email: "osama22@example.com"
+        }
+        user = User.where(username: "osamatest2").first
+        user.destroy
+
+        put "/u/update-activation-email.json", params: {
+          email: 'osamaupdated@example.com'
+        }
+
+        expect(response.status).to eq(403)
+      end
+
+      it "raises an error for an active user" do
+        user = post_user
+        user.update(active: true)
+        user.save!
+
+        put "/u/update-activation-email.json", params: {
+          email: 'osama@example.com'
+        }
+
+        expect(response.status).to eq(403)
+      end
+
+      it "raises an error when logged in" do
+        moderator = sign_in(Fabricate(:moderator))
+        post_user
+
+        put "/u/update-activation-email.json", params: {
+          email: 'updatedemail@example.com'
+        }
+
+        expect(response.status).to eq(403)
+      end
+
+      it "raises an error when the new email is taken" do
+        active_user = Fabricate(:user)
+        user = post_user
+
+        put "/u/update-activation-email.json", params: {
+          email: active_user.email
+        }
+
+        expect(response.status).to eq(422)
+      end
+
+      it "raises an error when the email is blacklisted" do
+        user = post_user
+        SiteSetting.email_domains_blacklist = 'example.com'
+        put "/u/update-activation-email.json", params: { email: 'test@example.com' }
+        expect(response.status).to eq(422)
+      end
+
+      it "can be updated" do
+        user = post_user
+        token = user.email_tokens.first
+
+        put "/u/update-activation-email.json", params: {
+          email: 'updatedemail@example.com'
+        }
+
+        expect(response.status).to eq(200)
+
+        user.reload
+        expect(user.email).to eq('updatedemail@example.com')
+        expect(user.email_tokens.where(email: 'updatedemail@example.com', expired: false)).to be_present
+
+        token.reload
+        expect(token.expired?).to eq(true)
+      end
+    end
+
+    context "with a username and password" do
+      it "raises an error with an invalid username" do
+        put "/u/update-activation-email.json", params: {
+          username: 'eviltrout',
+          password: 'invalid-password',
+          email: 'updatedemail@example.com'
+        }
+
+        expect(response.status).to eq(403)
+      end
+
+      it "raises an error with an invalid password" do
+        put "/u/update-activation-email.json", params: {
+          username: Fabricate(:inactive_user).username,
+          password: 'invalid-password',
+          email: 'updatedemail@example.com'
+        }
+
+        expect(response.status).to eq(403)
+      end
+
+      it "raises an error for an active user" do
+        put "/u/update-activation-email.json", params: {
+          username: Fabricate(:walter_white).username,
+          password: 'letscook',
+          email: 'updatedemail@example.com'
+        }
+
+        expect(response.status).to eq(403)
+      end
+
+      it "raises an error when logged in" do
+        sign_in(Fabricate(:moderator))
+
+        put "/u/update-activation-email.json", params: {
+          username: Fabricate(:inactive_user).username,
+          password: 'qwerqwer123',
+          email: 'updatedemail@example.com'
+        }
+
+        expect(response.status).to eq(403)
+      end
+
+      it "raises an error when the new email is taken" do
+        user = Fabricate(:user)
+
+        put "/u/update-activation-email.json", params: {
+          username: Fabricate(:inactive_user).username,
+          password: 'qwerqwer123',
+          email: user.email
+        }
+
+        expect(response.status).to eq(422)
+      end
+
+      it "can be updated" do
+        user = Fabricate(:inactive_user)
+        token = user.email_tokens.first
+
+        put "/u/update-activation-email.json", params: {
+          username: user.username,
+          password: 'qwerqwer123',
+          email: 'updatedemail@example.com'
+        }
+
+        expect(response.status).to eq(200)
+
+        user.reload
+        expect(user.email).to eq('updatedemail@example.com')
+        expect(user.email_tokens.where(email: 'updatedemail@example.com', expired: false)).to be_present
+
+        token.reload
+        expect(token.expired?).to eq(true)
+      end
+    end
   end
 
   describe '#show' do
+    context "anon" do
+      let(:user) { Discourse.system_user }
+      let(:other_user) { Fabricate(:user) }
+
+      it "returns success" do
+        get "/u/#{user.username}.json"
+        expect(response).to be_success
+        expect(JSON.parse(response.body)["user"]["username"]).to eq(user.username)
+      end
+
+      it "should redirect to login page for anonymous user when profiles are hidden" do
+        SiteSetting.hide_user_profiles_from_public = true
+        get "/u/#{user.username}.json"
+        expect(response).to redirect_to '/login'
+      end
+
+      describe "user profile views" do
+        let(:other_user) { Fabricate(:user) }
+
+        it "should track a user profile view for an anon user" do
+          get "/"
+          UserProfileView.expects(:add).with(other_user.user_profile.id, request.remote_ip, nil)
+          get "/u/#{other_user.username}.json"
+        end
+
+        it "skips tracking" do
+          UserProfileView.expects(:add).never
+          get "/u/#{user.username}.json", params: { skip_track_visit: true }
+        end
+      end
+    end
+
+    context "logged in" do
+      before do
+        sign_in(user)
+      end
+
+      let(:user) { Fabricate(:user) }
+
+      it 'returns success' do
+        get "/u/#{user.username}.json"
+        expect(response).to be_success
+        json = JSON.parse(response.body)
+
+        expect(json["user"]["has_title_badges"]).to eq(false)
+      end
+
+      it "returns not found when the username doesn't exist" do
+        get "/u/madeuppity.json"
+        expect(response).not_to be_success
+      end
+
+      it 'returns not found when the user is inactive' do
+        inactive = Fabricate(:user, active: false)
+        get "/u/#{inactive.username}.json"
+        expect(response).not_to be_success
+      end
+
+      it 'returns success when show_inactive_accounts is true and user is logged in' do
+        SiteSetting.show_inactive_accounts = true
+        inactive = Fabricate(:user, active: false)
+        get "/u/#{inactive.username}.json"
+        expect(response).to be_success
+      end
+
+      it "raises an error on invalid access" do
+        Guardian.any_instance.expects(:can_see?).with(user).returns(false)
+        get "/u/#{user.username}.json"
+        expect(response).to be_forbidden
+      end
+
+      describe "user profile views" do
+        let(:other_user) { Fabricate(:user) }
+
+        it "should track a user profile view for a signed in user" do
+          UserProfileView.expects(:add).with(other_user.user_profile.id, request.remote_ip, user.id)
+          get "/u/#{other_user.username}.json"
+        end
+
+        it "should not track a user profile view for a user viewing his own profile" do
+          UserProfileView.expects(:add).never
+          get "/u/#{user.username}.json"
+        end
+
+        it "skips tracking" do
+          UserProfileView.expects(:add).never
+          get "/u/#{user.username}.json", params: { skip_track_visit: true }
+        end
+      end
+
+      context "fetching a user by external_id" do
+        before { user.create_single_sign_on_record(external_id: '997', last_payload: '') }
+
+        it "returns fetch for a matching external_id" do
+          get "/u/by-external/997.json"
+          expect(response).to be_success
+          expect(JSON.parse(response.body)["user"]["username"]).to eq(user.username)
+        end
+
+        it "returns not found when external_id doesn't match" do
+          get "/u/by-external/99.json"
+          expect(response).not_to be_success
+        end
+      end
+
+      describe "include_post_count_for" do
+
+        let(:admin) { Fabricate(:admin) }
+        let(:topic) { Fabricate(:topic) }
+
+        before do
+          Fabricate(:post, user: user, topic: topic)
+          Fabricate(:post, user: admin, topic: topic)
+          Fabricate(:post, user: admin, topic: topic, post_type: Post.types[:whisper])
+        end
+
+        it "includes only visible posts" do
+          get "/u/#{admin.username}.json", params: { include_post_count_for: topic.id }
+          topic_post_count = JSON.parse(response.body).dig("user", "topic_post_count")
+          expect(topic_post_count[topic.id.to_s]).to eq(1)
+        end
+
+        it "includes all post types for staff members" do
+          sign_in(admin)
+
+          get "/u/#{admin.username}.json", params: { include_post_count_for: topic.id }
+          topic_post_count = JSON.parse(response.body).dig("user", "topic_post_count")
+          expect(topic_post_count[topic.id.to_s]).to eq(2)
+        end
+      end
+    end
 
     it "should be able to view a user" do
       get "/u/#{user.username}"
@@ -68,7 +2432,7 @@ RSpec.describe UsersController do
     end
   end
 
-  describe "#badges" do
+  describe '#badges' do
     it "renders fine by default" do
       get "/u/#{user.username}/badges"
       expect(response).to be_success
@@ -81,32 +2445,6 @@ RSpec.describe UsersController do
     end
   end
 
-  describe "updating a user" do
-    before do
-      sign_in(user)
-    end
-
-    it "should be able to update a user" do
-      put "/u/#{user.username}.json", params: { name: 'test.test' }
-
-      expect(response).to be_success
-      expect(user.reload.name).to eq('test.test')
-    end
-
-    describe 'when username contains a period' do
-      before do
-        user.update!(username: 'test.test')
-      end
-
-      it "should be able to update a user" do
-        put "/u/#{user.username}.json", params: { name: 'testing123' }
-
-        expect(response).to be_success
-        expect(user.reload.name).to eq('testing123')
-      end
-    end
-  end
-
   describe "#account_created" do
     it "returns a message when no session is present" do
       get "/u/account-created"
@@ -141,7 +2479,7 @@ RSpec.describe UsersController do
     end
   end
 
-  describe "search_users" do
+  describe '#search_users' do
     let(:topic) { Fabricate :topic }
     let(:user)  { Fabricate :user, username: "joecabot", name: "Lawrence Tierney" }
     let(:post1) { Fabricate(:post, user: user, topic: topic) }
@@ -327,4 +2665,222 @@ RSpec.describe UsersController do
       end
     end
   end
+
+  describe '#user_preferences_redirect' do
+    it 'requires the user to be logged in' do
+      get '/user_preferences'
+      expect(response.status).to eq(404)
+    end
+
+    it "redirects to their profile when logged in" do
+      sign_in(user)
+      get '/user_preferences'
+      expect(response).to redirect_to("/u/#{user.username_lower}/preferences")
+    end
+  end
+
+  describe '#email_login' do
+    before do
+      SiteSetting.enable_local_logins_via_email = true
+    end
+
+    it "enqueues the right email" do
+      post "/u/email-login.json", params: { login: user.email }
+
+      expect(response).to be_success
+      expect(JSON.parse(response.body)['user_found']).to eq(true)
+
+      job_args = Jobs::CriticalUserEmail.jobs.last["args"].first
+
+      expect(job_args["user_id"]).to eq(user.id)
+      expect(job_args["type"]).to eq("email_login")
+      expect(job_args["email_token"]).to eq(user.email_tokens.last.token)
+    end
+
+    describe 'when enable_local_logins_via_email is disabled' do
+      before do
+        SiteSetting.enable_local_logins_via_email = false
+      end
+
+      it 'should return the right response' do
+        post "/u/email-login.json", params: { login: user.email }
+
+        expect(response.status).to eq(404)
+      end
+    end
+
+    describe 'when username or email is not valid' do
+      it 'should not enqueue the email to login' do
+        post "/u/email-login.json", params: { login: '@random' }
+
+        expect(response).to be_success
+        expect(JSON.parse(response.body)['user_found']).to eq(false)
+        expect(Jobs::CriticalUserEmail.jobs).to eq([])
+      end
+    end
+
+    describe 'when hide_email_address_taken is true' do
+      it 'should return the right response' do
+        SiteSetting.hide_email_address_taken = true
+        post "/u/email-login.json", params: { login: user.email }
+
+        expect(response).to be_success
+        expect(JSON.parse(response.body).has_key?('user_found')).to eq(false)
+      end
+    end
+
+    describe "when user is already logged in" do
+      it 'should redirect to the root path' do
+        sign_in(user)
+        post "/u/email-login.json", params: { login: user.email }
+
+        expect(response).to redirect_to("/")
+      end
+    end
+  end
+
+  describe '#create_second_factor' do
+    context 'when not logged in' do
+      it 'should return the right response' do
+        post "/users/second_factors.json", params: {
+          password: 'wrongpassword'
+        }
+
+        expect(response.status).to eq(403)
+      end
+    end
+
+    context 'when logged in' do
+      before do
+        sign_in(user)
+      end
+
+      describe 'create 2fa request' do
+        it 'fails on incorrect password' do
+          post "/users/second_factors.json", params: {
+            password: 'wrongpassword'
+          }
+
+          expect(response.status).to eq(200)
+
+          expect(JSON.parse(response.body)['error']).to eq(I18n.t(
+            "login.incorrect_password")
+          )
+        end
+
+        describe 'when local logins are disabled' do
+          it 'should return the right response' do
+            SiteSetting.enable_local_logins = false
+
+            post "/users/second_factors.json", params: {
+              password: 'myawesomepassword'
+            }
+
+            expect(response.status).to eq(404)
+          end
+        end
+
+        describe 'when SSO is enabled' do
+          it 'should return the right response' do
+            SiteSetting.sso_url = 'http://someurl.com'
+            SiteSetting.enable_sso = true
+
+            post "/users/second_factors.json", params: {
+              password: 'myawesomepassword'
+            }
+
+            expect(response.status).to eq(404)
+          end
+        end
+
+        it 'succeeds on correct password' do
+          user.create_totp
+          user.user_second_factor.update!(data: "abcdefghijklmnop")
+
+          post "/users/second_factors.json", params: {
+            password: 'myawesomepassword'
+          }
+
+          expect(response.status).to eq(200)
+
+          response_body = JSON.parse(response.body)
+
+          expect(response_body['key']).to eq(
+            "abcd efgh ijkl mnop"
+          )
+
+          expect(response_body['qr']).to be_present
+        end
+      end
+    end
+  end
+
+  describe '#update_second_factor' do
+    let(:user_second_factor) { Fabricate(:user_second_factor, user: user) }
+
+    context 'when not logged in' do
+      it 'should return the right response' do
+        put "/users/second_factor.json", params: {
+          second_factor_token: ROTP::TOTP.new(user_second_factor.data).now
+        }
+
+        expect(response.status).to eq(403)
+      end
+    end
+
+    context 'when logged in' do
+      before do
+        sign_in(user)
+        user_second_factor
+      end
+
+      context 'when user has totp setup' do
+        context 'when token is missing' do
+          it 'returns the right response' do
+            put "/users/second_factor.json", params: {
+              enable: 'true',
+            }
+
+            expect(response.status).to eq(400)
+          end
+        end
+
+        context 'when token is invalid' do
+          it 'returns the right response' do
+            put "/users/second_factor.json", params: {
+              second_factor_token: '000000',
+              enable: 'true',
+            }
+
+            expect(response.status).to eq(200)
+
+            expect(JSON.parse(response.body)['error']).to eq(I18n.t(
+              "login.invalid_second_factor_code"
+            ))
+          end
+        end
+
+        context 'when token is valid' do
+          it 'should allow second factor for the user to be enabled' do
+            put "/users/second_factor.json", params: {
+              second_factor_token: ROTP::TOTP.new(user_second_factor.data).now,
+              enable: 'true',
+            }
+
+            expect(response.status).to eq(200)
+            expect(user.reload.user_second_factor.enabled).to be true
+          end
+
+          it 'should allow second factor for the user to be disabled' do
+            put "/users/second_factor.json", params: {
+              second_factor_token: ROTP::TOTP.new(user_second_factor.data).now,
+            }
+
+            expect(response.status).to eq(200)
+            expect(user.reload.user_second_factor).to eq(nil)
+          end
+        end
+      end
+    end
+  end
 end
diff --git a/spec/requests/users_email_controller_spec.rb b/spec/requests/users_email_controller_spec.rb
index a0572cb726e..e5628103194 100644
--- a/spec/requests/users_email_controller_spec.rb
+++ b/spec/requests/users_email_controller_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe UsersEmailController do
 
-  describe '.confirm' do
+  describe '#confirm' do
     it 'errors out for invalid tokens' do
       get "/u/authorize-email/asdfasdf"
 
@@ -60,29 +60,72 @@ describe UsersEmailController do
         expect(user.user_stat.bounce_score).to eq(0)
         expect(user.user_stat.reset_bounce_score_after).to eq(nil)
       end
+
+      it 'automatically adds the user to a group when the email matches' do
+        group = Fabricate(:group, automatic_membership_email_domains: "example.com")
+
+        get "/u/authorize-email/#{user.email_tokens.last.token}"
+
+        expect(response).to be_success
+        expect(group.reload.users.include?(user)).to eq(true)
+      end
+
+      context 'second factor required' do
+        let!(:second_factor) { Fabricate(:user_second_factor, user: user) }
+
+        it 'requires a second factor token' do
+          get "/u/authorize-email/#{user.email_tokens.last.token}"
+
+          expect(response.status).to eq(200)
+
+          response_body = response.body
+
+          expect(response_body).to include(I18n.t("login.second_factor_title"))
+          expect(response_body).not_to include(I18n.t("login.invalid_second_factor_code"))
+        end
+
+        it 'adds an error on a second factor attempt' do
+          get "/u/authorize-email/#{user.email_tokens.last.token}", params: {
+            second_factor_token: "000000"
+          }
+
+          expect(response.status).to eq(200)
+          expect(response.body).to include(I18n.t("login.invalid_second_factor_code"))
+        end
+
+        it 'confirms with a correct second token' do
+          get "/u/authorize-email/#{user.email_tokens.last.token}", params: {
+            second_factor_token: ROTP::TOTP.new(second_factor.data).now
+          }
+
+          expect(response.status).to eq(200)
+
+          response_body = response.body
+
+          expect(response_body).not_to include(I18n.t("login.second_factor_title"))
+          expect(response_body).not_to include(I18n.t("login.invalid_second_factor_code"))
+        end
+      end
     end
   end
 
-  describe '.update' do
+  describe '#update' do
+    let(:user) { Fabricate(:user) }
     let(:new_email) { 'bubblegum@adventuretime.ooo' }
 
     it "requires you to be logged in" do
-      expect do
-        put "/u/asdf/preferences/email.json"
-      end.to raise_error(Discourse::NotLoggedIn)
+      put "/u/#{user.username}/preferences/email.json", params: { email: new_email }
+      expect(response.status).to eq(403)
     end
 
     context 'when logged in' do
-      let(:user) { Fabricate(:user) }
-
       before do
         sign_in(user)
       end
 
       it 'raises an error without an email parameter' do
-        expect do
-          put "/u/#{user.username}/preferences/email.json"
-        end.to raise_error(ActionController::ParameterMissing)
+        put "/u/#{user.username}/preferences/email.json"
+        expect(response.status).to eq(400)
       end
 
       it "raises an error if you can't edit the user's email" do
diff --git a/spec/serializers/admin_plugin_serializer_spec.rb b/spec/serializers/admin_plugin_serializer_spec.rb
new file mode 100644
index 00000000000..70d8430a050
--- /dev/null
+++ b/spec/serializers/admin_plugin_serializer_spec.rb
@@ -0,0 +1,14 @@
+require 'rails_helper'
+
+RSpec.describe AdminPluginSerializer do
+  let(:instance) { Plugin::Instance.new }
+
+  subject { described_class.new(instance) }
+
+  describe 'enabled_setting' do
+    it 'should return the right value' do
+      instance.enabled_site_setting('test')
+      expect(subject.enabled_setting).to eq('test')
+    end
+  end
+end
diff --git a/spec/serializers/basic_group_serializer_spec.rb b/spec/serializers/basic_group_serializer_spec.rb
index 712f06fa7f3..7b06b2959d6 100644
--- a/spec/serializers/basic_group_serializer_spec.rb
+++ b/spec/serializers/basic_group_serializer_spec.rb
@@ -1,7 +1,9 @@
 require 'rails_helper'
 
 describe BasicGroupSerializer do
-  subject { described_class.new(group, scope: Guardian.new, root: false) }
+  let(:guardian) { Guardian.new }
+  let(:group) { Fabricate(:group) }
+  subject { described_class.new(group, scope: guardian, root: false) }
 
   describe '#display_name' do
     describe 'automatic group' do
@@ -20,4 +22,57 @@ describe BasicGroupSerializer do
       end
     end
   end
+
+  describe '#bio_raw' do
+    let(:group) { Fabricate(:group, bio_raw: 'testing') }
+
+    subject do
+      described_class.new(group, scope: guardian, root: false, owner_group_ids: [group.id])
+    end
+
+    describe 'group owner' do
+      let(:user) do
+        user = Fabricate(:user)
+        group.add_owner(user)
+        user
+      end
+
+      it 'should include bio_raw' do
+        expect(subject.as_json[:bio_raw]).to eq('testing')
+      end
+    end
+  end
+
+  describe '#has_messages' do
+    let(:group) { Fabricate(:group, has_messages: true) }
+
+    describe 'for a staff user' do
+      let(:guardian) { Guardian.new(Fabricate(:moderator)) }
+
+      it 'should be present' do
+        expect(subject.as_json[:has_messages]).to eq(true)
+      end
+    end
+
+    describe 'for a group user' do
+      let(:user) { Fabricate(:user) }
+      let(:guardian) { Guardian.new(user) }
+
+      before do
+        group.add(user)
+      end
+
+      it 'should be present' do
+        expect(subject.as_json[:has_messages]).to eq(true)
+      end
+    end
+
+    describe 'for a normal user' do
+      let(:guardian) { Guardian.new(Fabricate(:user)) }
+
+      it 'should not be present' do
+        expect(subject.as_json[:has_messages]).to eq(nil)
+      end
+    end
+  end
 end
diff --git a/spec/serializers/current_user_serializer_spec.rb b/spec/serializers/current_user_serializer_spec.rb
new file mode 100644
index 00000000000..5e11505bb05
--- /dev/null
+++ b/spec/serializers/current_user_serializer_spec.rb
@@ -0,0 +1,35 @@
+require 'rails_helper'
+
+RSpec.describe CurrentUserSerializer do
+  context "when SSO is not enabled" do
+    let(:user) { Fabricate(:user) }
+    let :serializer do
+      CurrentUserSerializer.new(user, scope: Guardian.new, root: false)
+    end
+
+    it "should not include the external_id field" do
+      payload = serializer.as_json
+      expect(payload).not_to have_key(:external_id)
+    end
+  end
+
+  context "when SSO is enabled" do
+    let :user do
+      user = Fabricate(:user)
+      SingleSignOnRecord.create!(user_id: user.id, external_id: '12345', last_payload: '')
+      user
+    end
+
+    let :serializer do
+      CurrentUserSerializer.new(user, scope: Guardian.new, root: false)
+    end
+
+    it "should include the external_id" do
+      SiteSetting.sso_url = "http://example.com/discourse_sso"
+      SiteSetting.sso_secret = "12345678910"
+      SiteSetting.enable_sso = true
+      payload = serializer.as_json
+      expect(payload[:external_id]).to eq("12345")
+    end
+  end
+end
diff --git a/spec/serializers/post_revision_serializer_spec.rb b/spec/serializers/post_revision_serializer_spec.rb
new file mode 100644
index 00000000000..9bed7723e00
--- /dev/null
+++ b/spec/serializers/post_revision_serializer_spec.rb
@@ -0,0 +1,53 @@
+require 'rails_helper'
+
+describe PostRevisionSerializer do
+  let(:post) { Fabricate(:post, version: 2) }
+
+  context 'hidden tags' do
+    let(:public_tag) { Fabricate(:tag, name: 'public') }
+    let(:public_tag2) { Fabricate(:tag, name: 'visible') }
+    let(:hidden_tag) { Fabricate(:tag, name: 'hidden') }
+    let(:hidden_tag2) { Fabricate(:tag, name: 'secret') }
+
+    let(:staff_tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name, hidden_tag2.name]) }
+
+    let(:post_revision) do
+      Fabricate(:post_revision,
+        post: post,
+        modifications: { 'tags' => [['public', 'hidden'], ['visible', 'hidden']] }
+      )
+    end
+
+    let(:post_revision2) do
+      Fabricate(:post_revision,
+        post: post,
+        modifications: { 'tags' => [['visible', 'hidden', 'secret'], ['visible', 'hidden']] }
+      )
+    end
+
+    before do
+      SiteSetting.tagging_enabled = true
+      staff_tag_group
+      post.topic.tags = [public_tag2, hidden_tag]
+    end
+
+    it 'returns all tag changes to staff' do
+      json = PostRevisionSerializer.new(post_revision, scope: Guardian.new(Fabricate(:admin)), root: false).as_json
+      expect(json[:tags_changes][:previous]).to include(public_tag.name)
+      expect(json[:tags_changes][:previous]).to include(hidden_tag.name)
+      expect(json[:tags_changes][:current]).to include(public_tag2.name)
+      expect(json[:tags_changes][:current]).to include(hidden_tag.name)
+    end
+
+    it 'does not return hidden tags to non-staff' do
+      json = PostRevisionSerializer.new(post_revision, scope: Guardian.new(Fabricate(:user)), root: false).as_json
+      expect(json[:tags_changes][:previous]).to eq([public_tag.name])
+      expect(json[:tags_changes][:current]).to eq([public_tag2.name])
+    end
+
+    it 'does not show tag modificiatons if changes are not visible to the user' do
+      json = PostRevisionSerializer.new(post_revision2, scope: Guardian.new(Fabricate(:user)), root: false).as_json
+      expect(json[:tags_changes]).to_not be_present
+    end
+  end
+end
diff --git a/spec/serializers/suggested_topic_serializer_spec.rb b/spec/serializers/suggested_topic_serializer_spec.rb
new file mode 100644
index 00000000000..da29757bf96
--- /dev/null
+++ b/spec/serializers/suggested_topic_serializer_spec.rb
@@ -0,0 +1,58 @@
+require 'rails_helper'
+
+describe SuggestedTopicSerializer do
+  let(:user) { Fabricate(:user) }
+  let(:admin) { Fabricate(:admin) }
+
+  describe '#featured_link and #featured_link_root_domain' do
+    let(:featured_link) { 'http://meta.discourse.org' }
+    let(:topic) { Fabricate(:topic, featured_link: featured_link, category: Fabricate(:category, topic_featured_link_allowed: true)) }
+    subject(:json) { SuggestedTopicSerializer.new(topic, scope: Guardian.new(user), root: false).as_json }
+
+    context 'when topic featured link is disable' do
+      before do
+        SiteSetting.topic_featured_link_enabled = true
+        topic
+        SiteSetting.topic_featured_link_enabled = false
+      end
+
+      it 'should not return featured link attrs' do
+        expect(json[:featured_link]).to eq(nil)
+        expect(json[:featured_link_root_domain]).to eq(nil)
+      end
+    end
+
+    context 'when topic featured link is enabled' do
+      before do
+        SiteSetting.topic_featured_link_enabled = true
+      end
+
+      it 'should return featured link attrs' do
+        expect(json[:featured_link]).to eq(featured_link)
+        expect(json[:featured_link_root_domain]).to eq('discourse.org')
+      end
+    end
+  end
+
+  describe 'hidden tags' do
+    let(:topic) { Fabricate(:topic) }
+    let(:hidden_tag) { Fabricate(:tag, name: 'hidden') }
+    let(:staff_tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name]) }
+
+    before do
+      SiteSetting.tagging_enabled = true
+      staff_tag_group
+      topic.tags << hidden_tag
+    end
+
+    it 'returns hidden tag to staff' do
+      json = SuggestedTopicSerializer.new(topic, scope: Guardian.new(admin), root: false).as_json
+      expect(json[:tags]).to eq([hidden_tag.name])
+    end
+
+    it 'does not return hidden tag to non-staff' do
+      json = SuggestedTopicSerializer.new(topic, scope: Guardian.new(user), root: false).as_json
+      expect(json[:tags]).to eq([])
+    end
+  end
+end
diff --git a/spec/serializers/topic_list_item_serializer_spec.rb b/spec/serializers/topic_list_item_serializer_spec.rb
index 86f599e30d3..319d8f02c6e 100644
--- a/spec/serializers/topic_list_item_serializer_spec.rb
+++ b/spec/serializers/topic_list_item_serializer_spec.rb
@@ -43,4 +43,25 @@ describe TopicListItemSerializer do
       expect(serialized[:featured_link_root_domain]).to eq(nil)
     end
   end
+
+  describe 'hidden tags' do
+    let(:hidden_tag) { Fabricate(:tag, name: 'hidden') }
+    let(:staff_tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name]) }
+
+    before do
+      SiteSetting.tagging_enabled = true
+      staff_tag_group
+      topic.tags << hidden_tag
+    end
+
+    it 'returns hidden tag to staff' do
+      json = TopicListItemSerializer.new(topic, scope: Guardian.new(Fabricate(:admin)), root: false).as_json
+      expect(json[:tags]).to eq([hidden_tag.name])
+    end
+
+    it 'does not return hidden tag to non-staff' do
+      json = TopicListItemSerializer.new(topic, scope: Guardian.new(Fabricate(:user)), root: false).as_json
+      expect(json[:tags]).to eq([])
+    end
+  end
 end
diff --git a/spec/serializers/topic_view_serializer_spec.rb b/spec/serializers/topic_view_serializer_spec.rb
index c2970db194f..5b50522b890 100644
--- a/spec/serializers/topic_view_serializer_spec.rb
+++ b/spec/serializers/topic_view_serializer_spec.rb
@@ -1,8 +1,19 @@
 require 'rails_helper'
 
 describe TopicViewSerializer do
+  def serialize_topic(topic, user_arg)
+    topic_view = TopicView.new(topic.id, user_arg)
+    TopicViewSerializer.new(topic_view, scope: Guardian.new(user_arg), root: false).as_json
+  end
+
+  before do
+    # ensure no suggested ids are cached cause that can muck up suggested
+    RandomTopicSelector.clear_cache!
+  end
+
   let(:topic) { Fabricate(:topic) }
   let(:user) { Fabricate(:user) }
+  let(:admin) { Fabricate(:admin) }
 
   describe '#featured_link and #featured_link_root_domain' do
     let(:featured_link) { 'http://meta.discourse.org' }
@@ -12,8 +23,7 @@ describe TopicViewSerializer do
         topic.update!(featured_link: featured_link)
         SiteSetting.topic_featured_link_enabled = false
 
-        topic_view = TopicView.new(topic.id, user)
-        json = described_class.new(topic_view, scope: Guardian.new(user), root: false).as_json
+        json = serialize_topic(topic, user)
 
         expect(json[:featured_link]).to eq(nil)
         expect(json[:featured_link_root_domain]).to eq(nil)
@@ -24,8 +34,7 @@ describe TopicViewSerializer do
       it 'should return the right attributes' do
         topic.update!(featured_link: featured_link)
 
-        topic_view = TopicView.new(topic.id, user)
-        json = described_class.new(topic_view, scope: Guardian.new(user), root: false).as_json
+        json = serialize_topic(topic, user)
 
         expect(json[:featured_link]).to eq(featured_link)
         expect(json[:featured_link_root_domain]).to eq('discourse.org')
@@ -42,8 +51,7 @@ describe TopicViewSerializer do
 
     describe 'when loading last chunk' do
       it 'should include suggested topics' do
-        topic_view = TopicView.new(topic.id, user)
-        json = described_class.new(topic_view, scope: Guardian.new(user), root: false).as_json
+        json = serialize_topic(topic, user)
 
         expect(json[:suggested_topics].first.id).to eq(topic2.id)
       end
@@ -64,4 +72,62 @@ describe TopicViewSerializer do
       end
     end
   end
+
+  describe 'when tags added to private message topics' do
+    let(:moderator) { Fabricate(:moderator) }
+    let(:tag) { Fabricate(:tag) }
+    let(:pm) do
+      Fabricate(:private_message_topic, tags: [tag], topic_allowed_users: [
+        Fabricate.build(:topic_allowed_user, user: moderator),
+        Fabricate.build(:topic_allowed_user, user: user)
+      ])
+    end
+
+    before do
+      SiteSetting.tagging_enabled = true
+      SiteSetting.allow_staff_to_tag_pms = true
+    end
+
+    it "should not include the tag for normal users" do
+      json = serialize_topic(pm, user)
+      expect(json[:tags]).to eq(nil)
+    end
+
+    it "should include the tag for staff users" do
+      [moderator, admin].each do |user|
+        json = serialize_topic(pm, user)
+        expect(json[:tags]).to eq([tag.name])
+      end
+    end
+
+    it "should not include the tag if pm tags disabled" do
+      SiteSetting.allow_staff_to_tag_pms = false
+
+      [moderator, admin].each do |user|
+        json = serialize_topic(pm, user)
+        expect(json[:tags]).to eq(nil)
+      end
+    end
+  end
+
+  describe 'with hidden tags' do
+    let(:hidden_tag) { Fabricate(:tag, name: 'hidden') }
+    let(:staff_tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name]) }
+
+    before do
+      SiteSetting.tagging_enabled = true
+      staff_tag_group
+      topic.tags << hidden_tag
+    end
+
+    it 'returns hidden tag to staff' do
+      json = serialize_topic(topic, admin)
+      expect(json[:tags]).to eq([hidden_tag.name])
+    end
+
+    it 'does not return hidden tag to non-staff' do
+      json = serialize_topic(topic, user)
+      expect(json[:tags]).to eq([])
+    end
+  end
 end
diff --git a/spec/serializers/web_hook_post_serializer_spec.rb b/spec/serializers/web_hook_post_serializer_spec.rb
index 2f1f4870603..2d56df376cd 100644
--- a/spec/serializers/web_hook_post_serializer_spec.rb
+++ b/spec/serializers/web_hook_post_serializer_spec.rb
@@ -3,11 +3,14 @@ require 'rails_helper'
 RSpec.describe WebHookPostSerializer do
   let(:admin) { Fabricate(:admin) }
   let(:post) { Fabricate(:post) }
-  let(:serializer) { WebHookPostSerializer.new(post, scope: Guardian.new(admin), root: false) }
+
+  def serialized_for_user(u)
+    WebHookPostSerializer.new(post, scope: Guardian.new(u), root: false).as_json
+  end
 
   it 'should only include the required keys' do
-    count = serializer.as_json.keys.count
-    difference = count - 40
+    count = serialized_for_user(admin).keys.count
+    difference = count - 34
 
     expect(difference).to eq(0), lambda {
       message = ""
@@ -21,4 +24,18 @@ RSpec.describe WebHookPostSerializer do
       message << "\nPlease verify if those key(s) are required as part of the web hook's payload."
     }
   end
+
+  it 'should only include deleted topic title for staffs' do
+    topic = post.topic
+    PostDestroyer.new(Discourse.system_user, post).destroy
+    post.reload
+
+    [nil, post.user, Fabricate(:user)].each do |user|
+      expect(serialized_for_user(user)[:topic_title]).to eq(nil)
+    end
+
+    [Fabricate(:moderator), admin].each do |user|
+      expect(serialized_for_user(user)[:topic_title]).to eq(topic.title)
+    end
+  end
 end
diff --git a/spec/serializers/web_hook_topic_view_serializer_spec.rb b/spec/serializers/web_hook_topic_view_serializer_spec.rb
new file mode 100644
index 00000000000..d7ee1005555
--- /dev/null
+++ b/spec/serializers/web_hook_topic_view_serializer_spec.rb
@@ -0,0 +1,30 @@
+require 'rails_helper'
+
+RSpec.describe WebHookTopicViewSerializer do
+  let(:admin) { Fabricate(:admin) }
+  let(:topic) { Fabricate(:topic) }
+
+  let(:serializer) do
+    WebHookTopicViewSerializer.new(TopicView.new(topic),
+      scope: Guardian.new(admin),
+      root: false
+    )
+  end
+
+  it 'should only include the required keys' do
+    count = serializer.as_json.keys.count
+    difference = count - 30
+
+    expect(difference).to eq(0), lambda {
+      message = ""
+
+      if difference < 0
+        message << "#{difference * -1} key(s) have been removed from this serializer."
+      else
+        message << "#{difference} key(s) have been added to this serializer."
+      end
+
+      message << "\nPlease verify if those key(s) are required as part of the web hook's payload."
+    }
+  end
+end
diff --git a/spec/serializers/web_hook_user_serializer_spec.rb b/spec/serializers/web_hook_user_serializer_spec.rb
index ad854ca13e2..6b6d3b1a623 100644
--- a/spec/serializers/web_hook_user_serializer_spec.rb
+++ b/spec/serializers/web_hook_user_serializer_spec.rb
@@ -1,14 +1,38 @@
 require 'rails_helper'
 
 RSpec.describe WebHookUserSerializer do
-  let(:user) { Fabricate(:user) }
+  let(:user) do
+    user = Fabricate(:user)
+    SingleSignOnRecord.create!(user_id: user.id, external_id: '12345', last_payload: '')
+    user
+  end
+
   let(:admin) { Fabricate(:admin) }
 
-  subject { described_class.new(user, scope: Guardian.new(admin), root: false) }
-
-  it "should include the user's email" do
-    payload = subject.as_json
+  let :serializer do
+    WebHookUserSerializer.new(user, scope: Guardian.new(admin), root: false)
+  end
 
+  it "should include relevant user info" do
+    payload = serializer.as_json
     expect(payload[:email]).to eq(user.email)
+    expect(payload[:external_id]).to eq('12345')
+  end
+
+  it 'should only include the required keys' do
+    count = serializer.as_json.keys.count
+    difference = count - 43
+
+    expect(difference).to eq(0), lambda {
+      message = ""
+
+      if difference < 0
+        message << "#{difference * -1} key(s) have been removed from this serializer."
+      else
+        message << "#{difference} key(s) have been added to this serializer."
+      end
+
+      message << "\nPlease verify if those key(s) are required as part of the web hook's payload."
+    }
   end
 end
diff --git a/spec/services/anonymous_shadow_creator_spec.rb b/spec/services/anonymous_shadow_creator_spec.rb
index 2ec4ea90a71..e658be53b23 100644
--- a/spec/services/anonymous_shadow_creator_spec.rb
+++ b/spec/services/anonymous_shadow_creator_spec.rb
@@ -10,12 +10,17 @@ describe AnonymousShadowCreator do
 
     before { SiteSetting.allow_anonymous_posting = true }
 
-    let(:user) { Fabricate(:user, trust_level: 3) }
+    let(:user) { Fabricate(:user_single_email, trust_level: 3) }
 
     it "returns no shadow if trust level is not met" do
       expect(AnonymousShadowCreator.get(Fabricate.build(:user, trust_level: 0))).to eq(nil)
     end
 
+    it "returns no shadow if must_approve_users is true and user is not approved" do
+      SiteSetting.must_approve_users = true
+      expect(AnonymousShadowCreator.get(Fabricate.build(:user, approved: false))).to eq(nil)
+    end
+
     it "returns a new shadow once time expires" do
       SiteSetting.anonymous_account_duration_minutes = 1
 
@@ -62,6 +67,11 @@ describe AnonymousShadowCreator do
       expect { AnonymousShadowCreator.get(user) }.to_not raise_error
     end
 
+    it "works when there is an email whitelist" do
+      SiteSetting.email_domains_whitelist = "wayne.com"
+
+      expect { AnonymousShadowCreator.get(user) }.to_not raise_error
+    end
   end
 
 end
diff --git a/spec/services/destroy_task_spec.rb b/spec/services/destroy_task_spec.rb
new file mode 100644
index 00000000000..13193938531
--- /dev/null
+++ b/spec/services/destroy_task_spec.rb
@@ -0,0 +1,76 @@
+require 'rails_helper'
+
+describe DestroyTask do
+
+  describe 'destroy topics' do
+    let!(:c) { Fabricate(:category) }
+    let!(:t) { Fabricate(:topic, category_id: c.id) }
+    let!(:p) { Fabricate(:post, topic_id: t.id) }
+    let!(:c2) { Fabricate(:category) }
+    let!(:t2) { Fabricate(:topic, category_id: c2.id) }
+    let!(:p2) { Fabricate(:post, topic_id: t2.id) }
+
+    it 'destroys all topics in a category' do
+      before_count = Topic.where(category_id: c.id).count
+      DestroyTask.destroy_topics(c.slug)
+      expect(Topic.where(category_id: c.id).count).to eq before_count - 1
+    end
+
+    it "doesn't destroy system topics" do
+      DestroyTask.destroy_topics(c2.slug)
+      expect(Topic.where(category_id: c2.id).count).to eq 1
+    end
+
+    it 'destroys topics in all categories' do
+      DestroyTask.destroy_topics_all_categories
+      expect(Post.where(topic_id: [t.id, t2.id]).count).to eq 0
+    end
+  end
+
+  describe 'private messages' do
+    let!(:pm) { Fabricate(:private_message_post) }
+    let!(:pm2) { Fabricate(:private_message_post) }
+
+    it 'destroys all private messages' do
+      DestroyTask.destroy_private_messages
+      expect(Topic.where(archetype: "private_message").count).to eq 0
+    end
+  end
+
+  describe 'groups' do
+    let!(:g) { Fabricate(:group) }
+    let!(:g2) { Fabricate(:group) }
+
+    it 'destroys all groups' do
+      DestroyTask.destroy_groups
+      expect(Group.where(automatic: false).count).to eq 0
+    end
+
+    it "doesn't destroy default groups" do
+      before_count = Group.count
+      DestroyTask.destroy_groups
+      expect(Group.count).to eq before_count - 2
+    end
+  end
+
+  describe 'users' do
+    it 'destroys all non-admin users' do
+      before_count = User.count
+
+      Fabricate(:user)
+      Fabricate(:user)
+      Fabricate(:admin)
+
+      DestroyTask.destroy_users
+      expect(User.where(admin: false).count).to eq 0
+      # admin does not get detroyed
+      expect(User.count).to eq before_count + 1
+    end
+  end
+
+  describe 'stats' do
+    it 'destroys all site stats' do
+      DestroyTask.destroy_stats
+    end
+  end
+end
diff --git a/spec/services/group_mentions_updater_spec.rb b/spec/services/group_mentions_updater_spec.rb
index 301fa134d50..7bdfce7cde3 100644
--- a/spec/services/group_mentions_updater_spec.rb
+++ b/spec/services/group_mentions_updater_spec.rb
@@ -3,6 +3,10 @@ require 'rails_helper'
 RSpec.describe GroupMentionsUpdater do
   let(:post) { Fabricate(:post) }
 
+  before do
+    SiteSetting.queue_jobs = false
+  end
+
   describe '.update' do
     it 'should update valid group mentions' do
       new_group_name = 'awesome_team'
diff --git a/spec/services/notification_emailer_spec.rb b/spec/services/notification_emailer_spec.rb
index 2d8642826b3..a3d60f441ed 100644
--- a/spec/services/notification_emailer_spec.rb
+++ b/spec/services/notification_emailer_spec.rb
@@ -144,7 +144,7 @@ describe NotificationEmailer do
 
   context 'user_private_message' do
     let(:type) { :user_private_message }
-    let(:delay) { SiteSetting.private_email_time_window_seconds }
+    let(:delay) { SiteSetting.personal_email_time_window_seconds }
     let!(:notification) { create_notification(:private_message) }
 
     include_examples "enqueue_private"
@@ -159,7 +159,7 @@ describe NotificationEmailer do
 
   context 'user_invited_to_private_message' do
     let(:type) { :user_invited_to_private_message }
-    let(:delay) { SiteSetting.private_email_time_window_seconds }
+    let(:delay) { SiteSetting.personal_email_time_window_seconds }
     let!(:notification) { create_notification(:invited_to_private_message) }
 
     include_examples "enqueue_public"
@@ -167,7 +167,7 @@ describe NotificationEmailer do
 
   context 'user_invited_to_topic' do
     let(:type) { :user_invited_to_topic }
-    let(:delay) { SiteSetting.private_email_time_window_seconds }
+    let(:delay) { SiteSetting.personal_email_time_window_seconds }
     let!(:notification) { create_notification(:invited_to_topic) }
 
     include_examples "enqueue_public"
diff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rb
index c500ce2d1e3..87408d112f9 100644
--- a/spec/services/post_alerter_spec.rb
+++ b/spec/services/post_alerter_spec.rb
@@ -1,5 +1,28 @@
 require 'rails_helper'
 
+RSpec::Matchers.define :add_notification do |user, notification_type|
+  match(notify_expectation_failures: true) do |actual|
+    notifications = user.notifications
+    before = notifications.count
+
+    actual.call
+
+    expect(notifications.count).to eq(before + 1), "expected 1 new notification, got #{notifications.count - before}"
+
+    last_notification_type = notifications.last.notification_type
+    expect(last_notification_type).to eq(Notification.types[notification_type]),
+                                      "expected notification type to be '#{notification_type}', got '#{Notification.types.key(last_notification_type)}'"
+  end
+
+  match_when_negated do |actual|
+    expect { actual.call }.to_not change { user.notifications.where(notification_type: Notification.types[notification_type]).count }
+  end
+
+  supports_block_expectations
+end
+
+RSpec::Matchers.define_negated_matcher :not_add_notification, :add_notification
+
 describe PostAlerter do
 
   let!(:evil_trout) { Fabricate(:evil_trout) }
@@ -94,6 +117,46 @@ describe PostAlerter do
 
       expect(Notification.where(post_number: 1, topic_id: post.topic_id).count).to eq(3)
     end
+
+    it 'notifies flaggers when flagged post gets unhidden by edit' do
+      post = create_post
+      walterwhite = Fabricate(:walter_white)
+      coding_horror = Fabricate(:coding_horror)
+
+      PostActionNotifier.enable
+      SiteSetting.flags_required_to_hide_post = 2
+
+      PostAction.act(evil_trout, post, PostActionType.types[:spam])
+      PostAction.act(walterwhite, post, PostActionType.types[:spam])
+
+      post.reload
+      expect(post.hidden).to eq(true)
+
+      expect {
+        post.revise(post.user, raw: post.raw + " ha I edited it ")
+      }.to add_notification(evil_trout, :edited)
+        .and add_notification(walterwhite, :edited)
+
+      post.reload
+      expect(post.hidden).to eq(false)
+
+      notification = walterwhite.notifications.last
+      expect(notification.topic_id).to eq(post.topic.id)
+      expect(notification.post_number).to eq(post.post_number)
+      expect(notification.data_hash["display_username"]).to eq(post.user.username)
+
+      PostAction.act(coding_horror, post, PostActionType.types[:spam])
+      PostAction.act(walterwhite, post, PostActionType.types[:off_topic])
+
+      post.reload
+      expect(post.hidden).to eq(true)
+
+      expect {
+        post.revise(post.user, raw: post.raw + " ha I edited it again ")
+      }.to not_add_notification(evil_trout, :edited)
+        .and not_add_notification(coding_horror, :edited)
+        .and not_add_notification(walterwhite, :edited)
+    end
   end
 
   context 'likes' do
@@ -204,8 +267,15 @@ describe PostAlerter do
     end
 
     it 'notifies a user by username' do
+      topic = Fabricate(:topic)
+
       expect {
-        create_post_with_alerts(raw: '[quote="EvilTrout, post:1"]whatup[/quote]')
+        2.times do
+          create_post_with_alerts(
+            raw: '[quote="EvilTrout, post:1"]whatup[/quote]',
+            topic: topic
+          )
+        end
       }.to change(evil_trout.notifications, :count).by(1)
     end
 
@@ -237,6 +307,10 @@ describe PostAlerter do
     let(:user) { post1.user }
     let(:linking_post) { create_post(raw: "my magic topic\n##{Discourse.base_url}#{post1.url}") }
 
+    before do
+      SiteSetting.queue_jobs = false
+    end
+
     it "will notify correctly on linking" do
       linking_post
 
@@ -309,6 +383,10 @@ describe PostAlerter do
     let(:mention_post) { create_post_with_alerts(user: user, raw: 'Hello @eviltrout') }
     let(:topic) { mention_post.topic }
 
+    before do
+      SiteSetting.queue_jobs = false
+    end
+
     it 'notifies a user' do
       expect {
         mention_post
@@ -337,15 +415,182 @@ describe PostAlerter do
       expect(events).to include(event_name: :before_create_notifications_for_users, params: [[evil_trout], mention_post])
     end
 
-  it "notification comes from editor is mention is added later" do
-    admin = Fabricate(:admin)
-      post = create_post_with_alerts(user: user, raw: 'No mention here.')
+    it "notification comes from editor if mention is added later" do
+      admin = Fabricate(:admin)
+        post = create_post_with_alerts(user: user, raw: 'No mention here.')
+        expect {
+          post.revise(admin, raw: "Mention @eviltrout in this edit.")
+        }.to change(evil_trout.notifications, :count)
+        n = evil_trout.notifications.last
+        expect(n.data_hash["original_username"]).to eq(admin.username)
+    end
+
+    it "doesn't notify the last post editor if they mention themself" do
+      post = create_post_with_alerts(user: user, raw: 'Post without a mention.')
       expect {
-        post.revise(admin, raw: "Mention @eviltrout in this edit.")
-      }.to change(evil_trout.notifications, :count)
-      n = evil_trout.notifications.last
-      expect(n.data_hash["original_username"]).to eq(admin.username)
-  end
+        post.revise(evil_trout, raw: "O hai, @eviltrout!")
+      }.not_to change(evil_trout.notifications, :count)
+    end
+
+    let(:alice) { Fabricate(:user, username: 'alice') }
+    let(:bob) { Fabricate(:user, username: 'bob') }
+    let(:carol) { Fabricate(:admin, username: 'carol') }
+    let(:dave) { Fabricate(:user, username: 'dave') }
+    let(:eve) { Fabricate(:user, username: 'eve') }
+    let(:group) { Fabricate(:group, name: 'group', mentionable_level: Group::ALIAS_LEVELS[:everyone]) }
+
+    before do
+      group.bulk_add([alice.id, carol.id])
+    end
+
+    def create_post_with_alerts(args = {})
+      post = Fabricate(:post, args)
+      PostAlerter.post_created(post)
+    end
+
+    def set_topic_notification_level(user, topic, level_name)
+      TopicUser.change(user.id, topic.id, notification_level: TopicUser.notification_levels[level_name])
+    end
+
+    context "topic" do
+      let(:topic) { Fabricate(:topic, user: alice) }
+      let(:first_post) { Fabricate(:post, user: topic.user) }
+
+      [:watching, :tracking, :regular].each do |notification_level|
+        context "when notification level is '#{notification_level}'" do
+          before do
+            set_topic_notification_level(alice, topic, notification_level)
+          end
+
+          it "notifies about @username mention" do
+            args = { user: bob, topic: topic, raw: 'Hello @alice' }
+            expect { create_post_with_alerts(args) }.to add_notification(alice, :mentioned)
+          end
+        end
+      end
+
+      context "when notification level is 'muted'" do
+        before do
+          set_topic_notification_level(alice, topic, :muted)
+        end
+
+        it "does not notify about @username mention" do
+          args = { user: bob, topic: topic, raw: 'Hello @alice' }
+          expect { create_post_with_alerts(args) }.to_not add_notification(alice, :mentioned)
+        end
+      end
+    end
+
+    shared_context "message" do
+      context "when mentioned user is part of conversation" do
+        [:watching, :tracking, :regular].each do |notification_level|
+          context "when notification level is '#{notification_level}'" do
+            before do
+              set_topic_notification_level(alice, pm_topic, notification_level)
+            end
+
+            it "notifies about @username mention" do
+              args = { user: bob, topic: pm_topic, raw: 'Hello @alice' }
+              expect { create_post_with_alerts(args) }.to add_notification(alice, :mentioned)
+            end
+
+            it "notifies about @username mentions by non-human users" do
+              args = { user: Discourse.system_user, topic: pm_topic, raw: 'Hello @alice' }
+              expect { create_post_with_alerts(args) }.to add_notification(alice, :mentioned)
+            end
+
+            it "notifies about @group mention" do
+              args = { user: bob, topic: pm_topic, raw: 'Hello @group' }
+              expect { create_post_with_alerts(args) }.to add_notification(alice, :group_mentioned)
+            end
+
+            it "notifies about @group mentions by non-human users" do
+              args = { user: Discourse.system_user, topic: pm_topic, raw: 'Hello @group' }
+              expect { create_post_with_alerts(args) }.to add_notification(alice, :group_mentioned)
+            end
+          end
+        end
+
+        context "when notification level is 'muted'" do
+          before do
+            set_topic_notification_level(alice, pm_topic, :muted)
+          end
+
+          it "does not notify about @username mention" do
+            args = { user: bob, topic: pm_topic, raw: 'Hello @alice' }
+            expect { create_post_with_alerts(args) }.to_not add_notification(alice, :mentioned)
+          end
+
+          it "does not notify about @group mention" do
+            args = { user: bob, topic: pm_topic, raw: 'Hello @group' }
+            expect { create_post_with_alerts(args) }.to_not add_notification(alice, :group_mentioned)
+          end
+        end
+      end
+
+      context "when mentioned user is not part of conversation" do
+        it "notifies about @username mention when mentioned user is allowed to see message" do
+          args = { user: bob, topic: pm_topic, raw: 'Hello @carol' }
+          expect { create_post_with_alerts(args) }.to add_notification(carol, :mentioned)
+        end
+
+        it "does not notify about @username mention by non-human user even though mentioned user is allowed to see message" do
+          args = { user: Discourse.system_user, topic: pm_topic, raw: 'Hello @carol' }
+          expect { create_post_with_alerts(args) }.to_not add_notification(carol, :mentioned)
+        end
+
+        it "does not notify about @username mention when mentioned user is not allowed to see message" do
+          args = { user: bob, topic: pm_topic, raw: 'Hello @dave' }
+          expect { create_post_with_alerts(args) }.to_not add_notification(dave, :mentioned)
+        end
+
+        it "notifies about @group mention when mentioned user is allowed to see message" do
+          args = { user: bob, topic: pm_topic, raw: 'Hello @group' }
+          expect { create_post_with_alerts(args) }.to add_notification(carol, :group_mentioned)
+        end
+
+        it "does not notify about @group mention by non-human user even though mentioned user is allowed to see message" do
+          args = { user: Discourse.system_user, topic: pm_topic, raw: 'Hello @group' }
+          expect { create_post_with_alerts(args) }.to_not add_notification(carol, :group_mentioned)
+        end
+
+        it "does not notify about @group mention when mentioned user is not allowed to see message" do
+          args = { user: bob, topic: pm_topic, raw: 'Hello @group' }
+          expect { create_post_with_alerts(args) }.to_not add_notification(dave, :group_mentioned)
+        end
+      end
+    end
+
+    context "personal message" do
+      let(:pm_topic) do
+        Fabricate(:private_message_topic, user: alice, topic_allowed_users: [
+          Fabricate.build(:topic_allowed_user, user: alice),
+          Fabricate.build(:topic_allowed_user, user: bob),
+          Fabricate.build(:topic_allowed_user, user: eve)
+        ])
+      end
+      let(:first_post) { Fabricate(:post, topic: pm_topic, user: pm_topic.user) }
+
+      include_context "message"
+    end
+
+    context "group message" do
+      let(:some_group) { Fabricate(:group, name: 'some_group') }
+      let(:pm_topic) do
+        Fabricate(:private_message_topic, user: alice, topic_allowed_groups: [
+          Fabricate.build(:topic_allowed_group, group: some_group)
+        ], topic_allowed_users: [
+          Fabricate.build(:topic_allowed_user, user: eve)
+        ])
+      end
+      let(:first_post) { Fabricate(:post, topic: pm_topic, user: pm_topic.user) }
+
+      before do
+        some_group.add(alice)
+      end
+
+      include_context "message"
+    end
   end
 
   describe ".create_notification" do
@@ -392,7 +637,6 @@ describe PostAlerter do
     let(:topic) { mention_post.topic }
 
     it "pushes nothing to suspended users" do
-      SiteSetting.queue_jobs = true
       SiteSetting.allowed_user_api_push_urls = "https://site.com/push|https://site2.com/push"
 
       evil_trout.update_columns(suspended_till: 1.year.from_now)
@@ -410,6 +654,7 @@ describe PostAlerter do
     end
 
     it "correctly pushes notifications if configured correctly" do
+      SiteSetting.queue_jobs = false
       SiteSetting.allowed_user_api_push_urls = "https://site.com/push|https://site2.com/push"
 
       2.times do |i|
diff --git a/spec/services/post_owner_changer_spec.rb b/spec/services/post_owner_changer_spec.rb
index f4896ea1972..b9f836533e4 100644
--- a/spec/services/post_owner_changer_spec.rb
+++ b/spec/services/post_owner_changer_spec.rb
@@ -5,8 +5,8 @@ describe PostOwnerChanger do
     let!(:editor) { Fabricate(:admin) }
     let(:topic) { Fabricate(:topic) }
     let(:user_a) { Fabricate(:user) }
-    let(:p1) { Fabricate(:post, topic_id: topic.id) }
-    let(:p2) { Fabricate(:post, topic_id: topic.id) }
+    let(:p1) { Fabricate(:post, topic_id: topic.id, post_number: 1) }
+    let(:p2) { Fabricate(:post, topic_id: topic.id, post_number: 2) }
     let(:p3) { Fabricate(:post) }
 
     it "raises an error with a parameter missing" do
@@ -62,6 +62,43 @@ describe PostOwnerChanger do
       expect(p2.revisions.size).to eq(0)
     end
 
+    it "changes the user even when the post does not pass validation" do
+      p1.update_attribute(:raw, "foo")
+      PostOwnerChanger.new(post_ids: [p1.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
+      expect(p1.reload.user).to eq(user_a)
+    end
+
+    it "changes the user even when the topic does not pass validation" do
+      topic.update_column(:title, "short")
+
+      PostOwnerChanger.new(post_ids: [p1.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
+      expect(p1.reload.user).to eq(user_a)
+    end
+
+    it "changes the owner when the post is deleted" do
+      p4 = Fabricate(:post, topic_id: topic.id, reply_to_post_number: p2.post_number)
+      PostDestroyer.new(editor, p4).destroy
+
+      PostOwnerChanger.new(post_ids: [p4.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
+      expect(p4.reload.user).to eq(user_a)
+    end
+
+    context "sets topic notification level for the new owner" do
+      let(:p4) { Fabricate(:post, post_number: 2, topic_id: topic.id) }
+
+      it "'watching' if the first post gets a new owner" do
+        described_class.new(post_ids: [p1.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
+        tu = TopicUser.find_by(user_id: user_a.id, topic_id: topic.id)
+        expect(tu.notification_level).to eq(3)
+      end
+
+      it "'tracking' if other than the first post gets a new owner" do
+        described_class.new(post_ids: [p4.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
+        tu = TopicUser.find_by(user_id: user_a.id, topic_id: topic.id)
+        expect(tu.notification_level).to eq(2)
+      end
+    end
+
     context "integration tests" do
       let(:p1user) { p1.user }
       let(:p2user) { p2.user }
diff --git a/spec/services/push_notification_pusher_spec.rb b/spec/services/push_notification_pusher_spec.rb
new file mode 100644
index 00000000000..33ec16c625f
--- /dev/null
+++ b/spec/services/push_notification_pusher_spec.rb
@@ -0,0 +1,14 @@
+require 'rails_helper'
+
+RSpec.describe PushNotificationPusher do
+
+  it "returns badges url by default" do
+    expect(PushNotificationPusher.get_badge).to eq("/assets/push-notifications/discourse.png")
+  end
+
+  it "returns custom badges url" do
+    SiteSetting.push_notifications_icon_url = "/test.png"
+    expect(PushNotificationPusher.get_badge).to eq("/test.png")
+  end
+
+end
diff --git a/spec/services/search_indexer_spec.rb b/spec/services/search_indexer_spec.rb
index efbfce82c1b..543d78b9d5b 100644
--- a/spec/services/search_indexer_spec.rb
+++ b/spec/services/search_indexer_spec.rb
@@ -7,26 +7,34 @@ describe SearchIndexer do
     data = "你好世界"
     expect(data.split(" ").length).to eq(1)
 
-    SearchIndexer.update_posts_index(post_id, "你好世界", "", nil)
+    SearchIndexer.update_posts_index(post_id, "你好世界", "", "", nil)
 
     raw_data = PostSearchData.where(post_id: post_id).pluck(:raw_data)[0]
     expect(raw_data.split(' ').length).to eq(2)
   end
 
+  it 'extract youtube title' do
+    html = "<div class=\"lazyYT\" data-youtube-id=\"lmFgeFh2nlw\" data-youtube-title=\"Metallica Mixer Explains Missing Bass on 'And Justice for All' [Exclusive]\" data-width=\"480\" data-height=\"270\" data-parameters=\"feature=oembed&amp;wmode=opaque\"></div>"
+
+    scrubbed = SearchIndexer::HtmlScrubber.scrub(html)
+
+    expect(scrubbed).to eq(" Metallica Mixer Explains Missing Bass on 'And Justice for All' [Exclusive] ")
+  end
+
   it 'correctly indexes a post according to version' do
     # Preparing so that they can be indexed to right version
-    SearchIndexer.update_posts_index(post_id, "dummy", "", nil)
+    SearchIndexer.update_posts_index(post_id, "dummy", "", nil, nil)
     PostSearchData.find_by(post_id: post_id).update_attributes!(version: -1)
 
     data = "<a>This</a> is a test"
-    SearchIndexer.update_posts_index(post_id, data, "", nil)
+    SearchIndexer.update_posts_index(post_id, "", "", nil, data)
 
     raw_data, locale, version = PostSearchData.where(post_id: post_id).pluck(:raw_data, :locale, :version)[0]
     expect(raw_data).to eq("This is a test")
     expect(locale).to eq("en")
     expect(version).to eq(Search::INDEX_VERSION)
 
-    SearchIndexer.update_posts_index(post_id, "tester", "", nil)
+    SearchIndexer.update_posts_index(post_id, "tester", "", nil, nil)
 
     raw_data = PostSearchData.where(post_id: post_id).pluck(:raw_data)[0]
     expect(raw_data).to eq("tester")
diff --git a/spec/services/site_settings_spec.rb b/spec/services/site_settings_spec.rb
new file mode 100644
index 00000000000..f23ae4a6a3c
--- /dev/null
+++ b/spec/services/site_settings_spec.rb
@@ -0,0 +1,40 @@
+require 'rails_helper'
+
+describe SiteSettingsTask do
+
+  before do
+    Discourse::Application.load_tasks
+  end
+
+  describe 'export' do
+    it 'creates a hash of all site settings' do
+      h = SiteSettingsTask.export_to_hash
+      expect(h.count).to be > 0
+    end
+  end
+
+  describe 'import' do
+    it 'updates site settings' do
+      yml = "title: Test"
+      log, counts = SiteSettingsTask.import(yml)
+      expect(log[0]).to eq "Changed title FROM: Discourse TO: Test"
+      expect(counts[:updated]).to eq 1
+      expect(SiteSetting.title).to eq "Test"
+    end
+
+    it "won't update a setting that doesn't exist" do
+      yml = "fake_setting: foo"
+      log, counts = SiteSettingsTask.import(yml)
+      expect(log[0]).to eq "NOT FOUND: existing site setting not found for fake_setting"
+      expect(counts[:not_found]).to eq 1
+    end
+
+    it "will log that an error has occured" do
+      yml = "min_password_length: 0"
+      log, counts = SiteSettingsTask.import(yml)
+      expect(log[0]).to eq "ERROR: min_password_length: Value must be between 8 and 500."
+      expect(counts[:errors]).to eq 1
+      expect(SiteSetting.min_password_length).to eq 10
+    end
+  end
+end
diff --git a/spec/services/staff_action_logger_spec.rb b/spec/services/staff_action_logger_spec.rb
index b8159b28fda..70132a7a51e 100644
--- a/spec/services/staff_action_logger_spec.rb
+++ b/spec/services/staff_action_logger_spec.rb
@@ -72,21 +72,39 @@ describe StaffActionLogger do
     end
   end
 
-  describe 'log_topic_deletion' do
-    let(:deleted_topic) { Fabricate(:topic) }
+  describe 'log_topic_delete_recover' do
+    let(:topic) { Fabricate(:topic) }
 
-    subject(:log_topic_deletion) { described_class.new(admin).log_topic_deletion(deleted_topic) }
+    context "when deleting topic" do
+      subject(:log_topic_delete_recover) { described_class.new(admin).log_topic_delete_recover(topic) }
 
-    it 'raises an error when topic is nil' do
-      expect { logger.log_topic_deletion(nil) }.to raise_error(Discourse::InvalidParameters)
+      it 'raises an error when topic is nil' do
+        expect { logger.log_topic_delete_recover(nil) }.to raise_error(Discourse::InvalidParameters)
+      end
+
+      it 'raises an error when topic is not a Topic' do
+        expect { logger.log_topic_delete_recover(1) }.to raise_error(Discourse::InvalidParameters)
+      end
+
+      it 'creates a new UserHistory record' do
+        expect { log_topic_delete_recover }.to change { UserHistory.count }.by(1)
+      end
     end
 
-    it 'raises an error when topic is not a Topic' do
-      expect { logger.log_topic_deletion(1) }.to raise_error(Discourse::InvalidParameters)
-    end
+    context "when recovering topic" do
+      subject(:log_topic_delete_recover) { described_class.new(admin).log_topic_delete_recover(topic, "recover_topic") }
 
-    it 'creates a new UserHistory record' do
-      expect { log_topic_deletion }.to change { UserHistory.count }.by(1)
+      it 'raises an error when topic is nil' do
+        expect { logger.log_topic_delete_recover(nil, "recover_topic") }.to raise_error(Discourse::InvalidParameters)
+      end
+
+      it 'raises an error when topic is not a Topic' do
+        expect { logger.log_topic_delete_recover(1, "recover_topic") }.to raise_error(Discourse::InvalidParameters)
+      end
+
+      it 'creates a new UserHistory record' do
+        expect { log_topic_delete_recover }.to change { UserHistory.count }.by(1)
+      end
     end
   end
 
@@ -434,4 +452,40 @@ describe StaffActionLogger do
       expect(user_history.previous_value).to eq('t')
     end
   end
+
+  describe 'log_check_personal_message' do
+    let(:personal_message) { Fabricate(:private_message_topic) }
+
+    subject(:log_check_personal_message) { described_class.new(admin).log_check_personal_message(personal_message) }
+
+    it 'raises an error when topic is nil' do
+      expect { logger.log_check_personal_message(nil) }.to raise_error(Discourse::InvalidParameters)
+    end
+
+    it 'raises an error when topic is not a Topic' do
+      expect { logger.log_check_personal_message(1) }.to raise_error(Discourse::InvalidParameters)
+    end
+
+    it 'creates a new UserHistory record' do
+      expect { log_check_personal_message }.to change { UserHistory.count }.by(1)
+    end
+  end
+
+  describe 'log_post_approved' do
+    let(:approved_post) { Fabricate(:post) }
+
+    subject(:log_post_approved) { described_class.new(admin).log_post_approved(approved_post) }
+
+    it 'raises an error when post is nil' do
+      expect { logger.log_post_approved(nil) }.to raise_error(Discourse::InvalidParameters)
+    end
+
+    it 'raises an error when post is not a Post' do
+      expect { logger.log_post_approved(1) }.to raise_error(Discourse::InvalidParameters)
+    end
+
+    it 'creates a new UserHistory record' do
+      expect { log_post_approved }.to change { UserHistory.count }.by(1)
+    end
+  end
 end
diff --git a/spec/services/user_anonymizer_spec.rb b/spec/services/user_anonymizer_spec.rb
index 778538cce19..f397bc930bb 100644
--- a/spec/services/user_anonymizer_spec.rb
+++ b/spec/services/user_anonymizer_spec.rb
@@ -2,10 +2,28 @@ require "rails_helper"
 
 describe UserAnonymizer do
 
-  describe "make_anonymous" do
-    let(:admin) { Fabricate(:admin) }
-    let(:user) { Fabricate(:user, username: "edward") }
+  let(:admin) { Fabricate(:admin) }
 
+  describe "event" do
+    let(:user) { Fabricate(:user, username: "edward") }
+    subject(:make_anonymous) { described_class.make_anonymous(user, admin, anonymize_ip: '2.2.2.2') }
+
+    it "triggers the event" do
+      events = DiscourseEvent.track_events do
+        make_anonymous
+      end
+
+      anon_event = events.detect { |e| e[:event_name] == :user_anonymized }
+      expect(anon_event).to be_present
+      params_hash = anon_event[:params][0]
+
+      expect(params_hash[:user]).to eq(user)
+      expect(params_hash[:opts][:anonymize_ip]).to eq('2.2.2.2')
+    end
+  end
+
+  describe "make_anonymous" do
+    let(:user) { Fabricate(:user, username: "edward") }
     subject(:make_anonymous) { described_class.make_anonymous(user, admin) }
 
     it "changes username" do
@@ -101,8 +119,58 @@ describe UserAnonymizer do
       expect(user.uploaded_avatar_id).to eq(nil)
     end
 
-    it "logs the action" do
-      expect { make_anonymous }.to change { UserHistory.count }.by(1)
+    it "updates the avatar in posts" do
+      SiteSetting.queue_jobs = false
+      upload = Fabricate(:upload, user: user)
+      user.user_avatar = UserAvatar.new(user_id: user.id, custom_upload_id: upload.id)
+      user.uploaded_avatar_id = upload.id # chosen in user preferences
+      user.save!
+
+      topic = Fabricate(:topic, user: user)
+      quoted_post = create_post(user: user, topic: topic, post_number: 1, raw: "quoted post")
+      post = create_post(raw: <<~RAW)
+        Lorem ipsum
+
+        [quote="#{quoted_post.username}, post:1, topic:#{quoted_post.topic.id}"]
+        quoted post
+        [/quote]
+      RAW
+
+      old_avatar_url = user.avatar_template.gsub("{size}", "40")
+      expect(post.cooked).to include(old_avatar_url)
+
+      make_anonymous
+      post.reload
+      new_avatar_url = user.reload.avatar_template.gsub("{size}", "40")
+
+      expect(post.cooked).to_not include(old_avatar_url)
+      expect(post.cooked).to include(new_avatar_url)
+    end
+
+    it "logs the action with the original details" do
+      SiteSetting.log_anonymizer_details = true
+      helper = UserAnonymizer.new(user, admin)
+      orig_email = user.email
+      orig_username = user.username
+      helper.make_anonymous
+
+      history = helper.user_history
+      expect(history).to be_present
+      expect(history.email).to eq(orig_email)
+      expect(history.details).to match(orig_username)
+    end
+
+    it "logs the action without the original details" do
+      SiteSetting.log_anonymizer_details = false
+      helper = UserAnonymizer.new(user, admin)
+      orig_email = user.email
+      orig_username = user.username
+      helper.make_anonymous
+
+      history = helper.user_history
+      expect(history).to be_present
+      expect(history.email).not_to eq(orig_email)
+      expect(history.details).not_to match(orig_username)
     end
 
     it "removes external auth assocations" do
@@ -112,6 +180,7 @@ describe UserAnonymizer do
       user.facebook_user_info = FacebookUserInfo.create(user_id: user.id, facebook_user_id: "example")
       user.single_sign_on_record = SingleSignOnRecord.create(user_id: user.id, external_id: "example", last_payload: "looks good")
       user.oauth2_user_info = Oauth2UserInfo.create(user_id: user.id, uid: "example", provider: "example")
+      user.instagram_user_info = InstagramUserInfo.create(user_id: user.id, screen_name: "example", instagram_user_id: "examplel123123")
       UserOpenId.create(user_id: user.id, email: user.email, url: "http://example.com/openid", active: true)
       make_anonymous
       user.reload
@@ -121,6 +190,7 @@ describe UserAnonymizer do
       expect(user.facebook_user_info).to eq(nil)
       expect(user.single_sign_on_record).to eq(nil)
       expect(user.oauth2_user_info).to eq(nil)
+      expect(user.instagram_user_info).to eq(nil)
       expect(user.user_open_ids.count).to eq(0)
     end
 
@@ -133,4 +203,73 @@ describe UserAnonymizer do
 
   end
 
+  describe "anonymize_ip" do
+    let(:old_ip) { "1.2.3.4" }
+    let(:anon_ip) { "0.0.0.0" }
+    let(:user) { Fabricate(:user, ip_address: old_ip, registration_ip_address: old_ip) }
+    let(:post) { Fabricate(:post) }
+    let(:topic) { post.topic }
+
+    it "doesn't anonymize ips by default" do
+      UserAnonymizer.make_anonymous(user, admin)
+      expect(user.ip_address).to eq(old_ip)
+    end
+
+    it "is called if you pass an option" do
+      UserAnonymizer.make_anonymous(user, admin, anonymize_ip: anon_ip)
+      user.reload
+      expect(user.ip_address).to eq(anon_ip)
+    end
+
+    it "exhaustively replaces all user ips" do
+      link = IncomingLink.create!(current_user_id: user.id, ip_address: old_ip, post_id: post.id)
+
+      screened_email = ScreenedEmail.create!(email: user.email, ip_address: old_ip)
+
+      search_log = SearchLog.create!(
+        term: 'wat',
+        search_type: SearchLog.search_types[:header],
+        user_id: user.id,
+        ip_address: old_ip
+      )
+
+      topic_link = TopicLink.create!(
+        user_id: admin.id,
+        topic_id: topic.id,
+        url: 'https://discourse.org',
+        domain: 'discourse.org'
+      )
+
+      topic_link_click = TopicLinkClick.create!(
+        topic_link_id: topic_link.id,
+        user_id: user.id,
+        ip_address: old_ip
+      )
+
+      user_profile_view = UserProfileView.create!(
+        user_id: user.id,
+        user_profile_id: admin.user_profile.id,
+        ip_address: old_ip,
+        viewed_at: Time.now
+      )
+
+      TopicViewItem.create!(topic_id: topic.id, user_id: user.id, ip_address: old_ip, viewed_at: Time.now)
+      delete_history = StaffActionLogger.new(admin).log_user_deletion(user)
+      user_history = StaffActionLogger.new(user).log_backup_create
+
+      UserAnonymizer.make_anonymous(user, admin, anonymize_ip: anon_ip)
+      expect(user.registration_ip_address).to eq(anon_ip)
+      expect(link.reload.ip_address).to eq(anon_ip)
+      expect(screened_email.reload.ip_address).to eq(anon_ip)
+      expect(search_log.reload.ip_address).to eq(anon_ip)
+      expect(topic_link_click.reload.ip_address).to eq(anon_ip)
+      topic_view = TopicViewItem.where(topic_id: topic.id, user_id: user.id).first
+      expect(topic_view.ip_address).to eq(anon_ip)
+      expect(delete_history.reload.ip_address).to eq(anon_ip)
+      expect(user_history.reload.ip_address).to eq(anon_ip)
+      expect(user_profile_view.reload.ip_address).to eq(anon_ip)
+    end
+
+  end
+
 end
diff --git a/spec/services/user_authenticator_spec.rb b/spec/services/user_authenticator_spec.rb
new file mode 100644
index 00000000000..3590711a32d
--- /dev/null
+++ b/spec/services/user_authenticator_spec.rb
@@ -0,0 +1,60 @@
+require 'rails_helper'
+require_dependency 'user_authenticator'
+
+def github_auth(email_valid)
+  {
+    email: "user53@discourse.org",
+    username: "joedoe546",
+    email_valid: email_valid,
+    omit_username: nil,
+    name: "Joe Doe 546",
+    authenticator_name: "github",
+    extra_data: {
+      github_user_id: "100",
+      github_screen_name: "joedoe546"
+    },
+    skip_email_validation: false
+  }
+end
+
+describe UserAuthenticator do
+  context "#finish" do
+    let(:authenticator) { Auth::GithubAuthenticator.new }
+    let(:group) { Fabricate(:group, automatic_membership_email_domains: "discourse.org") }
+
+    before do
+      SiteSetting.enable_github_logins = true
+    end
+
+    it "confirms email and adds the user to appropraite groups based on email" do
+      user = Fabricate(:user, email: "user53@discourse.org")
+      expect(group.usernames).not_to include(user.username)
+
+      authentication = github_auth(true)
+
+      UserAuthenticator.new(user, authentication: authentication).finish
+      expect(user.email_confirmed?).to be_truthy
+      expect(group.usernames).to include(user.username)
+    end
+
+    it "doesn't confirm email if email is invalid" do
+      user = Fabricate(:user, email: "user53@discourse.org")
+
+      authentication = github_auth(false)
+
+      UserAuthenticator.new(user, authentication: authentication).finish
+      expect(user.email_confirmed?).to be_falsey
+      expect(group.usernames).not_to include(user.username)
+    end
+
+    it "doesn't confirm email if it was changed" do
+      user = Fabricate(:user, email: "changed@discourse.org")
+
+      authentication = github_auth(true)
+
+      UserAuthenticator.new(user, authentication: authentication).finish
+      expect(user.email_confirmed?).to be_falsey
+      expect(group.usernames).not_to include(user.username)
+    end
+  end
+end
diff --git a/spec/services/user_destroyer_spec.rb b/spec/services/user_destroyer_spec.rb
index 3c829d89fdb..e958136b9d2 100644
--- a/spec/services/user_destroyer_spec.rb
+++ b/spec/services/user_destroyer_spec.rb
@@ -2,6 +2,10 @@ require 'rails_helper'
 require_dependency 'user_destroyer'
 
 describe UserDestroyer do
+
+  let(:user) { Fabricate(:user) }
+  let(:admin) { Fabricate(:admin) }
+
   describe 'new' do
     it 'raises an error when user is nil' do
       expect { UserDestroyer.new(nil) }.to raise_error(Discourse::InvalidParameters)
@@ -74,8 +78,6 @@ describe UserDestroyer do
     end
 
     context "with a queued post" do
-      let(:user) { Fabricate(:user) }
-      let(:admin) { Fabricate(:admin) }
       let!(:qp) { Fabricate(:queued_post, user: user) }
 
       it "removes the queued post" do
@@ -85,8 +87,6 @@ describe UserDestroyer do
     end
 
     context "with a directory item record" do
-      let(:user) { Fabricate(:user) }
-      let(:admin) { Fabricate(:admin) }
 
       it "removes the directory item" do
         DirectoryItem.create!(
@@ -104,8 +104,6 @@ describe UserDestroyer do
     end
 
     context "with a draft" do
-      let(:user) { Fabricate(:user) }
-      let(:admin) { Fabricate(:admin) }
       let!(:draft) { Draft.set(user, 'test', 1, 'test') }
 
       it "removed the draft" do
@@ -127,17 +125,10 @@ describe UserDestroyer do
           @user.stubs(:first_post_created_at).returns(Time.zone.now)
         end
 
-        it 'should not delete the user' do
-          expect { destroy rescue nil }.to_not change { User.count }
-        end
-
-        it 'should raise an error' do
-          expect { destroy }.to raise_error(UserDestroyer::PostsExistError)
-        end
-
-        it 'should not log the action' do
+        it 'should raise the right error' do
           StaffActionLogger.any_instance.expects(:log_user_deletion).never
-          destroy rescue nil
+          expect { destroy }.to raise_error(UserDestroyer::PostsExistError)
+          expect(user.reload.id).to be_present
         end
       end
 
@@ -319,7 +310,6 @@ describe UserDestroyer do
     end
 
     context 'user got an email' do
-      let(:user) { Fabricate(:user) }
       let!(:email_log) { Fabricate(:email_log, user: user) }
 
       it "deletes the email log" do
@@ -343,6 +333,21 @@ describe UserDestroyer do
         expect(@post.reload.like_count).to eq(0)
       end
     end
+
+    context 'user belongs to groups that grant trust level' do
+      let(:group) { Fabricate(:group, grant_trust_level: 2) }
+
+      before do
+        group.add(user)
+      end
+
+      it 'can delete the user' do
+        d = UserDestroyer.new(admin)
+        expect {
+          d.destroy(user)
+        }.to change { User.count }.by(-1)
+      end
+    end
   end
 
 end
diff --git a/spec/services/user_merger_spec.rb b/spec/services/user_merger_spec.rb
new file mode 100644
index 00000000000..2d81ad8e3be
--- /dev/null
+++ b/spec/services/user_merger_spec.rb
@@ -0,0 +1,1022 @@
+require 'rails_helper'
+
+describe UserMerger do
+  let!(:target_user) { Fabricate(:user_single_email, username: 'alice', email: 'alice@example.com') }
+  let!(:source_user) { Fabricate(:user_single_email, username: 'alice1', email: 'alice@work.com') }
+  let(:walter) { Fabricate(:walter_white) }
+
+  def merge_users!(source = nil, target =  nil)
+    source ||= source_user
+    target ||= target_user
+    UserMerger.new(source, target).merge!
+  end
+
+  it "changes owner of topics and posts" do
+    topic1 = Fabricate(:topic, user: source_user)
+    post1 = Fabricate(:post, topic: topic1, user: source_user)
+    post2 = Fabricate(:post, topic: topic1, user: walter)
+    post3 = Fabricate(:post, topic: topic1, user: target_user)
+    post4 = Fabricate(:post, topic: topic1, user: walter)
+    post5 = Fabricate(:post, topic: topic1, user: source_user)
+
+    topic2 = Fabricate(:topic, user: walter)
+    post6 = Fabricate(:post, topic: topic2, user: walter)
+    post7 = Fabricate(:post, topic: topic2, user: source_user)
+    post8 = Fabricate(:post, topic: topic2, user: source_user, deleted_at: Time.now)
+
+    merge_users!
+
+    [topic1, post1, post3, post5, post7, post8].each do |x|
+      expect(x.reload.user).to eq(target_user)
+    end
+
+    [post2, post4, topic2, post6].each do |x|
+      expect(x.reload.user).to eq(walter)
+    end
+  end
+
+  it "changes owner of personal messages" do
+    pm_topic = Fabricate(:private_message_topic)
+
+    post1 = Fabricate(:post, topic: pm_topic, user: source_user)
+    post2 = Fabricate(:post, topic: pm_topic, user: walter)
+    post3 = Fabricate(:post, topic: pm_topic, user: target_user)
+    post4 = Fabricate(:post, topic: pm_topic, user: source_user, deleted_at: Time.now)
+
+    merge_users!
+
+    expect(post1.reload.user).to eq(target_user)
+    expect(post2.reload.user).to eq(walter)
+    expect(post3.reload.user).to eq(target_user)
+    expect(post4.reload.user).to eq(target_user)
+  end
+
+  it "changes owner of categories" do
+    category = Fabricate(:category, user: source_user)
+    merge_users!
+
+    expect(category.reload.user).to eq(target_user)
+  end
+
+  it "merges category notification settings" do
+    category1 = Fabricate(:category)
+    category2 = Fabricate(:category)
+    category3 = Fabricate(:category)
+    watching = CategoryUser.notification_levels[:watching]
+
+    CategoryUser.batch_set(source_user, :watching, [category1.id, category2.id])
+    CategoryUser.batch_set(target_user, :watching, [category2.id, category3.id])
+
+    merge_users!
+
+    category_ids = CategoryUser.where(user_id: target_user.id, notification_level: watching).pluck(:category_id)
+    expect(category_ids).to contain_exactly(category1.id, category2.id, category3.id)
+
+    category_ids = CategoryUser.where(user_id: source_user.id, notification_level: watching).pluck(:category_id)
+    expect(category_ids).to be_empty
+  end
+
+  context "developer flag" do
+    it "moves the developer flag when the target user isn't a developer yet" do
+      Developer.create!(user_id: source_user.id)
+      merge_users!
+
+      expect(Developer.where(user_id: source_user.id).count).to eq(0)
+      expect(Developer.where(user_id: target_user.id).count).to eq(1)
+    end
+
+    it "deletes the source's developer flag when the target user is already a developer" do
+      Developer.create!(user_id: source_user.id)
+      Developer.create!(user_id: target_user.id)
+      merge_users!
+
+      expect(Developer.where(user_id: source_user.id).count).to eq(0)
+      expect(Developer.where(user_id: target_user.id).count).to eq(1)
+    end
+  end
+
+  context "drafts" do
+    def create_draft(user, key, text)
+      seq = DraftSequence.next!(user, key)
+      Draft.set(user, key, seq, text)
+    end
+
+    def current_target_user_draft(key)
+      seq = DraftSequence.current(target_user, key)
+      Draft.get(target_user, key, seq)
+    end
+
+    it "merges drafts" do
+      key_topic_17 = "#{Draft::EXISTING_TOPIC}#{17}"
+      key_topic_19 = "#{Draft::EXISTING_TOPIC}#{19}"
+
+      create_draft(source_user, Draft::NEW_TOPIC, 'new topic draft by alice1')
+      create_draft(source_user, key_topic_17, 'draft by alice1')
+      create_draft(source_user, key_topic_19,  'draft by alice1')
+      create_draft(target_user, key_topic_19,  'draft by alice')
+
+      merge_users!
+
+      expect(current_target_user_draft(Draft::NEW_TOPIC)).to eq('new topic draft by alice1')
+      expect(current_target_user_draft(key_topic_17)).to eq('draft by alice1')
+      expect(current_target_user_draft(key_topic_19)).to eq('draft by alice')
+
+      expect(DraftSequence.where(user_id: source_user.id).count).to eq(0)
+      expect(Draft.where(user_id: source_user.id).count).to eq(0)
+    end
+  end
+
+  it "updates email logs" do
+    Fabricate(:email_log, user: source_user)
+    merge_users!
+
+    expect(EmailLog.where(user_id: source_user.id).count).to eq(0)
+    expect(EmailLog.where(user_id: target_user.id).count).to eq(1)
+  end
+
+  context "likes" do
+    def given_daily_like_count_for(user, date)
+      GivenDailyLike.find_for(user.id, date).pluck(:likes_given)[0] || 0
+    end
+
+    it "merges likes" do
+      p1 = Fabricate(:post)
+      p2 = Fabricate(:post)
+      p3 = Fabricate(:post)
+      p4 = Fabricate(:post)
+      p5 = Fabricate(:post)
+      p6 = Fabricate(:post)
+
+      now = Time.zone.now
+
+      freeze_time(now - 1.day)
+      PostAction.act(source_user, p1, PostActionType.types[:like])
+      PostAction.act(source_user, p2, PostActionType.types[:like])
+      PostAction.act(target_user, p2, PostActionType.types[:like])
+      PostAction.act(target_user, p3, PostActionType.types[:like])
+
+      freeze_time(now)
+      PostAction.act(source_user, p4, PostActionType.types[:like])
+      PostAction.act(source_user, p5, PostActionType.types[:like])
+      PostAction.act(target_user, p5, PostActionType.types[:like])
+      PostAction.act(source_user, p6, PostActionType.types[:like])
+      PostAction.remove_act(source_user, p6, PostActionType.types[:like])
+
+      merge_users!
+
+      [p1, p2, p3, p4, p5].each { |p| expect(p.reload.like_count).to eq(1) }
+      expect(PostAction.with_deleted.where(user_id: source_user.id).count).to eq(0)
+      expect(PostAction.with_deleted.where(user_id: target_user.id).count).to eq(6)
+
+      expect(given_daily_like_count_for(source_user, Date.yesterday)).to eq(0)
+      expect(given_daily_like_count_for(target_user, Date.yesterday)).to eq(3)
+      expect(given_daily_like_count_for(source_user, Date.today)).to eq(0)
+      expect(given_daily_like_count_for(target_user, Date.today)).to eq(2)
+    end
+  end
+
+  it "updates group history" do
+    group = Fabricate(:group)
+    group.add_owner(source_user)
+    logger = GroupActionLogger.new(source_user, group)
+    logger.log_add_user_to_group(walter)
+    logger.log_add_user_to_group(target_user)
+
+    group = Fabricate(:group)
+    group.add_owner(target_user)
+    logger = GroupActionLogger.new(target_user, group)
+    logger.log_add_user_to_group(walter)
+    logger.log_add_user_to_group(source_user)
+
+    merge_users!
+
+    expect(GroupHistory.where(acting_user_id: source_user.id).count).to eq(0)
+    expect(GroupHistory.where(acting_user_id: target_user.id).count).to eq(4)
+
+    expect(GroupHistory.where(target_user_id: source_user.id).count).to eq(0)
+    expect(GroupHistory.where(target_user_id: target_user.id).count).to eq(2)
+  end
+
+  it "merges group memberships" do
+    group1 = Fabricate(:group)
+    group1.add_owner(target_user)
+    group1.bulk_add([walter.id, source_user.id])
+
+    group2 = Fabricate(:group)
+    group2.bulk_add([walter.id, target_user.id])
+
+    group3 = Fabricate(:group)
+    group3.add_owner(source_user)
+    group3.add(walter)
+
+    merge_users!
+
+    [group1, group2, group3].each do |g|
+      owner = [group1, group3].include?(g)
+      expect(GroupUser.where(group_id: g.id, user_id: target_user.id, owner: owner).count).to eq(1)
+      expect(Group.where(id: g.id).pluck(:user_count).first).to eq(2)
+    end
+    expect(GroupUser.where(user_id: source_user.id).count).to eq(0)
+  end
+
+  it "updates incoming emails" do
+    email = Fabricate(:incoming_email, user: source_user)
+    merge_users!
+
+    expect(email.reload.user).to eq(target_user)
+  end
+
+  it "updates incoming links" do
+    link1 = Fabricate(:incoming_link, user: source_user)
+    link2 = Fabricate(:incoming_link, current_user_id: source_user.id)
+
+    merge_users!
+
+    expect(link1.reload.user).to eq(target_user)
+    expect(link2.reload.current_user_id).to eq(target_user.id)
+  end
+
+  it "updates invites" do
+    invite1 = Fabricate(:invite, invited_by: walter, user: source_user)
+    invite2 = Fabricate(:invite, invited_by: source_user)
+    invite3 = Fabricate(:invite, invited_by: source_user)
+    invite3.trash!(source_user)
+
+    merge_users!
+
+    [invite1, invite2, invite3].each { |x| x.reload }
+
+    expect(invite1.user).to eq(target_user)
+    expect(invite2.invited_by).to eq(target_user)
+    expect(invite3.invited_by).to eq(target_user)
+    expect(invite3.deleted_by).to eq(target_user)
+  end
+
+  it "merges muted users" do
+    muted1 = Fabricate(:user)
+    muted2 = Fabricate(:user)
+    muted3 = Fabricate(:user)
+    coding_horror = Fabricate(:coding_horror)
+
+    MutedUser.create!(user_id: source_user.id, muted_user_id: muted1.id)
+    MutedUser.create!(user_id: source_user.id, muted_user_id: muted2.id)
+    MutedUser.create!(user_id: target_user.id, muted_user_id: muted2.id)
+    MutedUser.create!(user_id: target_user.id, muted_user_id: muted3.id)
+    MutedUser.create!(user_id: walter.id, muted_user_id: source_user.id)
+    MutedUser.create!(user_id: coding_horror.id, muted_user_id: source_user.id)
+    MutedUser.create!(user_id: coding_horror.id, muted_user_id: target_user.id)
+
+    merge_users!
+
+    [muted1, muted2, muted3].each do |m|
+      expect(MutedUser.where(user_id: target_user.id, muted_user_id: m.id).count).to eq(1)
+    end
+    expect(MutedUser.where(user_id: source_user.id).count).to eq(0)
+
+    expect(MutedUser.where(user_id: walter.id, muted_user_id: target_user.id).count).to eq(1)
+    expect(MutedUser.where(user_id: coding_horror.id, muted_user_id: target_user.id).count).to eq(1)
+    expect(MutedUser.where(muted_user_id: source_user.id).count).to eq(0)
+  end
+
+  context "notifications" do
+    it "updates notifications" do
+      Fabricate(:notification, user: source_user)
+      Fabricate(:notification, user: source_user)
+      Fabricate(:notification, user: walter)
+
+      merge_users!
+
+      expect(Notification.where(user_id: target_user.id).count).to eq(2)
+      expect(Notification.where(user_id: source_user.id).count).to eq(0)
+    end
+  end
+
+  context "post actions" do
+    it "merges post actions" do
+      p1 = Fabricate(:post)
+      p2 = Fabricate(:post)
+      p3 = Fabricate(:post)
+      type_ids = PostActionType.public_type_ids + [PostActionType.flag_types.values.first]
+
+      type_ids.each do |type|
+        PostAction.act(source_user, p1, type)
+        PostAction.act(source_user, p2, type)
+        PostAction.act(target_user, p2, type)
+        PostAction.act(target_user, p3, type)
+      end
+
+      merge_users!
+
+      type_ids.each do |type|
+        expect(PostAction.where(user_id: target_user.id, post_action_type_id: type)
+                 .pluck(:post_id)).to contain_exactly(p1.id, p2.id, p3.id)
+      end
+
+      expect(PostAction.where(user_id: source_user.id).count).to eq(0)
+    end
+
+    it "updates post actions" do
+      p1 = Fabricate(:post)
+      p2 = Fabricate(:post)
+      p3 = Fabricate(:post)
+      p4 = Fabricate(:post)
+
+      action1 = PostAction.act(source_user, p1, PostActionType.flag_types[:off_topic])
+      action1.update_attribute(:deleted_by_id, source_user.id)
+
+      action2 = PostAction.act(source_user, p2, PostActionType.flag_types[:off_topic])
+      action2.update_attribute(:deferred_by_id, source_user.id)
+
+      action3 = PostAction.act(source_user, p3, PostActionType.flag_types[:off_topic])
+      action3.update_attribute(:agreed_by_id, source_user.id)
+
+      action4 = PostAction.act(source_user, p4, PostActionType.flag_types[:off_topic])
+      action4.update_attribute(:disagreed_by_id, source_user.id)
+
+      merge_users!
+
+      expect(action1.reload.deleted_by_id).to eq(target_user.id)
+      expect(action2.reload.deferred_by_id).to eq(target_user.id)
+      expect(action3.reload.agreed_by_id).to eq(target_user.id)
+      expect(action4.reload.disagreed_by_id).to eq(target_user.id)
+    end
+  end
+
+  it "updates post revisions" do
+    post = Fabricate(:post)
+    post_revision = Fabricate(:post_revision, post: post, user: source_user)
+
+    merge_users!
+    expect(post_revision.reload.user).to eq(target_user)
+  end
+
+  context "post timings" do
+    def create_post_timing(post, user, msecs)
+      PostTiming.create!(
+        topic_id: post.topic_id,
+        post_number: post.post_number,
+        user_id: user.id,
+        msecs: msecs
+      )
+    end
+
+    def post_timing_msecs_for(post, user)
+      PostTiming.where(
+        topic_id: post.topic_id,
+        post_number: post.post_number,
+        user_id: user.id
+      ).pluck(:msecs)[0] || 0
+    end
+
+    it "merges post timings" do
+      post1 = Fabricate(:post)
+      post2 = Fabricate(:post)
+      post3 = Fabricate(:post)
+
+      create_post_timing(post1, source_user, 12345)
+      create_post_timing(post2, source_user, 9876)
+      create_post_timing(post2, target_user, 3333)
+      create_post_timing(post3, target_user, 10000)
+
+      merge_users!
+
+      expect(post_timing_msecs_for(post1, target_user)).to eq(12345)
+      expect(post_timing_msecs_for(post2, target_user)).to eq(13209)
+      expect(post_timing_msecs_for(post3, target_user)).to eq(10000)
+
+      expect(PostTiming.where(user_id: source_user.id).count).to eq(0)
+    end
+  end
+
+  context "posts" do
+    it "updates user ids of posts" do
+      source_user.update_attribute(:moderator, true)
+
+      topic = Fabricate(:topic)
+      Fabricate(:post, topic: topic, user: source_user)
+
+      post2 = Fabricate(:basic_reply, topic: topic, user: walter)
+      post2.revise(source_user, raw: "#{post2.raw} foo")
+      PostLocker.new(post2, source_user).lock
+      post2.trash!(source_user)
+
+      merge_users!
+      post2.reload
+
+      expect(post2.deleted_by).to eq(target_user)
+      expect(post2.last_editor).to eq(target_user)
+      expect(post2.locked_by_id).to eq(target_user.id)
+      expect(post2.reply_to_user).to eq(target_user)
+    end
+
+    it "updates post action counts" do
+      posts = {}
+
+      PostActionType.types.each do |type_name, type_id|
+        posts[type_name] = post = Fabricate(:post, user: walter)
+        PostAction.act(source_user, post, type_id)
+        PostAction.act(target_user, post, type_id)
+      end
+
+      merge_users!
+
+      posts.each do |type, post|
+        post.reload
+        expect(post.send("#{type}_count")).to eq(1)
+      end
+    end
+  end
+
+  it "updates queued posts" do
+    topic = Fabricate(:topic)
+    post1 = Fabricate(:queued_post, topic: topic, user: source_user)
+    post2 = Fabricate(:queued_post, topic: topic, approved_by: source_user)
+    post3 = Fabricate(:queued_post, topic: topic, rejected_by: source_user)
+
+    merge_users!
+
+    expect(post1.reload.user).to eq(target_user)
+    expect(post2.reload.approved_by).to eq(target_user)
+    expect(post3.reload.rejected_by).to eq(target_user)
+  end
+
+  describe 'search logs' do
+    after do
+      SearchLog.clear_debounce_cache!
+    end
+
+    it "updates search log entries" do
+      SearchLog.log(term: 'hello', search_type: :full_page, ip_address: '192.168.0.1', user_id: source_user.id)
+      SearchLog.log(term: 'world', search_type: :full_page, ip_address: '192.168.0.1', user_id: source_user.id)
+      SearchLog.log(term: 'star trek', search_type: :full_page, ip_address: '192.168.0.2', user_id: target_user.id)
+      SearchLog.log(term: 'bad', search_type: :full_page, ip_address: '192.168.0.3', user_id: walter.id)
+
+      merge_users!
+
+      expect(SearchLog.where(user_id: target_user.id).count).to eq(3)
+      expect(SearchLog.where(user_id: source_user.id).count).to eq(0)
+      expect(SearchLog.where(user_id: walter.id).count).to eq(1)
+    end
+  end
+
+  it "merges tag notification settings" do
+    tag1 = Fabricate(:tag)
+    tag2 = Fabricate(:tag)
+    tag3 = Fabricate(:tag)
+    watching = TagUser.notification_levels[:watching]
+
+    TagUser.batch_set(source_user, :watching, [tag1.name, tag2.name])
+    TagUser.batch_set(target_user, :watching, [tag2.name, tag3.name])
+
+    merge_users!
+
+    tag_ids = TagUser.where(user_id: target_user.id, notification_level: watching).pluck(:tag_id)
+    expect(tag_ids).to contain_exactly(tag1.id, tag2.id, tag3.id)
+
+    tag_ids = TagUser.where(user_id: source_user.id, notification_level: watching).pluck(:tag_id)
+    expect(tag_ids).to be_empty
+  end
+
+  it "updates themes" do
+    theme = Theme.create!(name: 'my name', user_id: source_user.id)
+    merge_users!
+
+    expect(theme.reload.user_id).to eq(target_user.id)
+  end
+
+  it "merges allowed users for topics" do
+    pm_topic1 = Fabricate(:private_message_topic, topic_allowed_users: [
+      Fabricate.build(:topic_allowed_user, user: target_user),
+      Fabricate.build(:topic_allowed_user, user: walter),
+      Fabricate.build(:topic_allowed_user, user: source_user)
+    ])
+
+    pm_topic2 = Fabricate(:private_message_topic, topic_allowed_users: [
+      Fabricate.build(:topic_allowed_user, user: walter),
+      Fabricate.build(:topic_allowed_user, user: source_user)
+    ])
+
+    merge_users!
+
+    expect(pm_topic1.allowed_users).to contain_exactly(target_user, walter)
+    expect(pm_topic2.allowed_users).to contain_exactly(target_user, walter)
+    expect(TopicAllowedUser.where(user_id: source_user.id).count).to eq(0)
+  end
+
+  it "updates topic embeds" do
+    topic_embed = Fabricate(:topic_embed, embed_url: "http://example.com/post/248")
+    topic_embed.trash!(source_user)
+
+    merge_users!
+
+    expect(topic_embed.reload.deleted_by).to eq(target_user)
+  end
+
+  it "updates topic links" do
+    topic = Fabricate(:topic, user: source_user)
+    post = Fabricate(:post_with_external_links, user: source_user, topic: topic)
+    TopicLink.extract_from(post)
+    link = topic.topic_links.first
+
+    TopicLinkClick.create!(topic_link_id: link.id, user_id: source_user.id, ip_address: '127.0.0.1')
+    TopicLinkClick.create!(topic_link_id: link.id, user_id: target_user.id, ip_address: '127.0.0.1')
+    TopicLinkClick.create!(topic_link_id: link.id, user_id: walter.id, ip_address: '127.0.0.1')
+
+    merge_users!
+
+    expect(TopicLink.where(user_id: target_user.id).count).to be > 0
+    expect(TopicLink.where(user_id: source_user.id).count).to eq(0)
+
+    expect(TopicLinkClick.where(user_id: target_user.id).count).to eq(2)
+    expect(TopicLinkClick.where(user_id: source_user.id).count).to eq(0)
+    expect(TopicLinkClick.where(user_id: walter.id).count).to eq(1)
+  end
+
+  context "topic timers" do
+    def create_topic_timer(topic, user, status_type, deleted_by = nil)
+      timer = Fabricate(:topic_timer, topic: topic, user: user, status_type: TopicTimer.types[status_type])
+      timer.trash!(deleted_by) if deleted_by
+      timer.reload
+    end
+
+    it "merges topic timers" do
+      topic1 = Fabricate(:topic)
+      timer1 = create_topic_timer(topic1, source_user, :close, Discourse.system_user)
+      timer2 = create_topic_timer(topic1, source_user, :close)
+      timer3 = create_topic_timer(topic1, source_user, :reminder, source_user)
+      timer4 = create_topic_timer(topic1, target_user, :reminder, target_user)
+      timer5 = create_topic_timer(topic1, source_user, :reminder)
+
+      topic2 = Fabricate(:topic)
+      timer6 = create_topic_timer(topic2, target_user, :close)
+      timer7 = create_topic_timer(topic2, target_user, :reminder, Discourse.system_user)
+      create_topic_timer(topic2, source_user, :reminder, Discourse.system_user)
+
+      merge_users!
+
+      [timer1, timer2, timer3, timer4, timer5, timer6, timer7].each do |t|
+        expect(t.reload.user).to eq(target_user)
+      end
+
+      expect(TopicTimer.with_deleted.where(user_id: source_user.id).count).to eq(0)
+      expect(TopicTimer.with_deleted.where(deleted_by_id: target_user.id).count).to eq(2)
+      expect(TopicTimer.with_deleted.where(deleted_by_id: source_user.id).count).to eq(0)
+    end
+  end
+
+  it "merges topic notification settings" do
+    topic1 = Fabricate(:topic)
+    topic2 = Fabricate(:topic)
+    topic3 = Fabricate(:topic)
+    watching = TopicUser.notification_levels[:watching]
+
+    Fabricate(:topic_user, notification_level: watching, topic: topic1, user: source_user)
+    Fabricate(:topic_user, notification_level: watching, topic: topic2, user: source_user)
+    Fabricate(:topic_user, notification_level: watching, topic: topic2, user: target_user)
+    Fabricate(:topic_user, notification_level: watching, topic: topic3, user: target_user)
+
+    merge_users!
+
+    topic_ids = TopicUser.where(user_id: target_user.id, notification_level: watching).pluck(:topic_id)
+    expect(topic_ids).to contain_exactly(topic1.id, topic2.id, topic3.id)
+
+    topic_ids = TopicUser.where(user_id: source_user.id, notification_level: watching).pluck(:topic_id)
+    expect(topic_ids).to be_empty
+  end
+
+  it "merges topic views" do
+    topic1 = Fabricate(:topic)
+    topic2 = Fabricate(:topic)
+    topic3 = Fabricate(:topic)
+    ip = '127.0.0.1'
+
+    TopicViewItem.add(topic1.id, ip, source_user.id)
+    TopicViewItem.add(topic2.id, ip, source_user.id)
+    TopicViewItem.add(topic2.id, ip, target_user.id)
+    TopicViewItem.add(topic3.id, ip, target_user.id)
+
+    merge_users!
+
+    topic_ids = TopicViewItem.where(user_id: target_user.id).pluck(:topic_id)
+    expect(topic_ids).to contain_exactly(topic1.id, topic2.id, topic3.id)
+    expect(TopicViewItem.where(user_id: source_user.id).count).to eq(0)
+  end
+
+  it "updates topics" do
+    topic = Fabricate(:topic)
+    Fabricate(:post, user: walter, topic: topic)
+    Fabricate(:post, user: source_user, topic: topic)
+    topic.trash!(source_user)
+
+    merge_users!
+    topic.reload
+
+    expect(topic.deleted_by).to eq(target_user)
+    expect(topic.last_poster).to eq(target_user)
+  end
+
+  it "updates unsubscribe keys" do
+    UnsubscribeKey.create_key_for(source_user, "digest")
+    UnsubscribeKey.create_key_for(target_user, "digest")
+    UnsubscribeKey.create_key_for(walter, "digest")
+
+    merge_users!
+
+    expect(UnsubscribeKey.where(user_id: target_user.id).count).to eq(2)
+    expect(UnsubscribeKey.where(user_id: source_user.id).count).to eq(0)
+  end
+
+  it "updates uploads" do
+    Fabricate(:upload, user: source_user)
+    Fabricate(:upload, user: target_user)
+    Fabricate(:upload, user: walter)
+
+    merge_users!
+
+    expect(Upload.where(user_id: target_user.id).count).to eq(2)
+    expect(Upload.where(user_id: source_user.id).count).to eq(0)
+  end
+
+  context "user actions" do
+    # action_type and user_id are not nullable
+    # target_topic_id and acting_user_id are nullable, but always have a value
+
+    let(:post1) { Fabricate(:post) }
+    let(:post2) { Fabricate(:post) }
+    let(:post3) { Fabricate(:post) }
+
+    def log_pending_action(user, post)
+      UserAction.log_action!(action_type: UserAction::PENDING,
+                             user_id: user.id,
+                             acting_user_id: user.id,
+                             target_topic_id: post.topic.id,
+                             queued_post_id: post.id)
+    end
+
+    def log_like_action(acting_user, user, post)
+      UserAction.log_action!(action_type: UserAction::LIKE,
+                             user_id: user.id,
+                             acting_user_id: acting_user.id,
+                             target_topic_id: post.topic_id,
+                             target_post_id: post.id)
+    end
+
+    def log_got_private_message(acting_user, user, topic)
+      UserAction.log_action!(action_type: UserAction::GOT_PRIVATE_MESSAGE,
+                             user_id: user.id,
+                             acting_user_id: acting_user.id,
+                             target_topic_id: topic.id,
+                             target_post_id: -1)
+    end
+
+    it "merges when target_post_id is not set" do
+      a1 = log_pending_action(source_user, post1)
+      a2 = log_pending_action(source_user, post2)
+      a3 = log_pending_action(target_user, post2)
+      a4 = log_pending_action(target_user, post3)
+
+      merge_users!
+
+      expect(UserAction.count).to eq(3)
+
+      action_ids = UserAction.where(action_type: UserAction::PENDING,
+                                    user_id: target_user.id,
+                                    acting_user_id: target_user.id).pluck(:id)
+      expect(action_ids).to contain_exactly(a1.id, a3.id, a4.id)
+    end
+
+    it "merges when target_post_id is set" do
+      a1 = log_like_action(source_user, walter, post1)
+      a2 = log_like_action(target_user, walter, post1)
+      a3 = log_like_action(source_user, walter, post2)
+
+      merge_users!
+
+      expect(UserAction.count).to eq(2)
+
+      action_ids = UserAction.where(action_type: UserAction::LIKE,
+                                    user_id: walter.id,
+                                    acting_user_id: target_user.id).pluck(:id)
+      expect(action_ids).to contain_exactly(a2.id, a3.id)
+    end
+
+    it "merges when acting_user is neither source_user nor target_user" do
+      coding_horror = Fabricate(:coding_horror)
+
+      pm_topic1 = Fabricate(:private_message_topic, topic_allowed_users: [
+        Fabricate.build(:topic_allowed_user, user: walter),
+        Fabricate.build(:topic_allowed_user, user: source_user),
+        Fabricate.build(:topic_allowed_user, user: target_user),
+        Fabricate.build(:topic_allowed_user, user: coding_horror),
+      ])
+
+      pm_topic2 = Fabricate(:private_message_topic, topic_allowed_users: [
+        Fabricate.build(:topic_allowed_user, user: walter),
+        Fabricate.build(:topic_allowed_user, user: source_user)
+      ])
+
+      pm_topic3 = Fabricate(:private_message_topic, topic_allowed_users: [
+        Fabricate.build(:topic_allowed_user, user: walter),
+        Fabricate.build(:topic_allowed_user, user: target_user)
+      ])
+
+      a1 = log_got_private_message(walter, source_user, pm_topic1)
+      a2 = log_got_private_message(walter, target_user, pm_topic1)
+      a3 = log_got_private_message(walter, coding_horror, pm_topic1)
+      a4 = log_got_private_message(walter, source_user, pm_topic2)
+      a5 = log_got_private_message(walter, target_user, pm_topic3)
+
+      merge_users!
+
+      expect(UserAction.count).to eq(4)
+
+      action_ids = UserAction.where(action_type: UserAction::GOT_PRIVATE_MESSAGE,
+                                    user_id: target_user.id,
+                                    acting_user_id: walter.id).pluck(:id)
+      expect(action_ids).to contain_exactly(a2.id, a4.id, a5.id)
+    end
+  end
+
+  it "merges archived messages" do
+    pm_topic1 = Fabricate(:private_message_topic, topic_allowed_users: [
+      Fabricate.build(:topic_allowed_user, user: target_user),
+      Fabricate.build(:topic_allowed_user, user: walter),
+      Fabricate.build(:topic_allowed_user, user: source_user)
+    ])
+
+    pm_topic2 = Fabricate(:private_message_topic, topic_allowed_users: [
+      Fabricate.build(:topic_allowed_user, user: walter),
+      Fabricate.build(:topic_allowed_user, user: source_user)
+    ])
+
+    UserArchivedMessage.archive!(source_user.id, pm_topic1)
+    UserArchivedMessage.archive!(target_user.id, pm_topic1)
+    UserArchivedMessage.archive!(source_user.id, pm_topic2)
+    UserArchivedMessage.archive!(walter.id, pm_topic2)
+
+    merge_users!
+
+    topic_ids = UserArchivedMessage.where(user_id: target_user.id).pluck(:topic_id)
+    expect(topic_ids).to contain_exactly(pm_topic1.id, pm_topic2.id)
+    expect(UserArchivedMessage.where(user_id: source_user.id).count).to eq(0)
+  end
+
+  context "badges" do
+    def create_badge(badge, user, opts = {})
+      UserBadge.create!(
+        badge: badge,
+        user: user,
+        granted_by: opts[:granted_by] || Discourse.system_user,
+        granted_at: opts[:granted_at] || Time.now,
+        post: opts[:post],
+        seq: opts[:seq] || 0
+      )
+    end
+
+    it "merges user badges" do
+      anniversary_badge = Badge.find(Badge::Anniversary)
+      create_badge(anniversary_badge, source_user, seq: 1)
+      b1 = create_badge(anniversary_badge, target_user, seq: 1)
+      b2 = create_badge(anniversary_badge, source_user, seq: 2)
+
+      great_post_badge = Badge.find(Badge::GreatPost)
+      b3 = create_badge(great_post_badge, target_user, post: Fabricate(:post, user: target_user))
+      b4 = create_badge(great_post_badge, source_user, post: Fabricate(:post, user: source_user))
+
+      autobiographer_badge = Badge.find(Badge::Autobiographer)
+      b5 = create_badge(autobiographer_badge, source_user)
+
+      merge_users!
+
+      user_badge_ids = UserBadge.where(user_id: target_user.id).pluck(:id)
+      expect(user_badge_ids).to contain_exactly(b1.id, b2.id, b3.id, b4.id, b5.id)
+      expect(UserBadge.where(user_id: source_user.id).count).to eq(0)
+    end
+
+    it "updates granted_by for user badges" do
+      badge = Badge.create!(name: 'Hero', badge_type_id: BadgeType::Gold)
+      user_badge = create_badge(badge, walter, seq: 1, granted_by: source_user)
+
+      merge_users!
+
+      expect(user_badge.reload.granted_by).to eq(target_user)
+    end
+  end
+
+  it "merges user custom fields" do
+    UserCustomField.create!(user_id: source_user.id, name: 'foo', value: '123')
+    UserCustomField.create!(user_id: source_user.id, name: 'bar', value: '456')
+    UserCustomField.create!(user_id: source_user.id, name: 'duplicate', value: 'source')
+    UserCustomField.create!(user_id: target_user.id, name: 'duplicate', value: 'target')
+    UserCustomField.create!(user_id: target_user.id, name: 'baz', value: '789')
+
+    merge_users!
+
+    fields = UserCustomField.where(user_id: target_user.id).pluck(:name, :value)
+    expect(fields).to contain_exactly(['foo', '123'], ['bar', '456'], ['duplicate', 'target'], ['baz', '789'])
+    expect(UserCustomField.where(user_id: source_user.id).count).to eq(0)
+  end
+
+  it "merges email addresses" do
+    merge_users!
+
+    emails = UserEmail.where(user_id: target_user.id).pluck(:email, :primary)
+    expect(emails).to contain_exactly(['alice@example.com', true], ['alice@work.com', false])
+    expect(UserEmail.where(user_id: source_user.id).count).to eq(0)
+  end
+
+  it "skips merging email adresses when a secondary email address exists" do
+    merge_users!(source_user, target_user)
+
+    alice2 = Fabricate(:user_single_email, username: 'alice2', email: 'alice@foo.com')
+    merge_users!(alice2, target_user)
+
+    emails = UserEmail.where(user_id: target_user.id).pluck(:email, :primary)
+    expect(emails).to contain_exactly(['alice@example.com', true], ['alice@work.com', false])
+    expect(UserEmail.where(user_id: source_user.id).count).to eq(0)
+  end
+
+  it "updates exports" do
+    UserExport.create(file_name: "user-archive-alice1-190218-003249", user_id: source_user.id)
+
+    merge_users!
+
+    expect(UserExport.where(user_id: target_user.id).count).to eq(1)
+    expect(UserExport.where(user_id: source_user.id).count).to eq(0)
+  end
+
+  it "updates user history" do
+    UserHistory.create(action: UserHistory.actions[:notified_about_get_a_room], target_user_id: source_user.id)
+    UserHistory.create(action: UserHistory.actions[:anonymize_user], target_user_id: walter.id, acting_user_id: source_user.id)
+
+    merge_users!
+
+    expect(UserHistory.where(target_user_id: target_user.id).count).to eq(1)
+    expect(UserHistory.where(target_user_id: source_user.id).count).to eq(0)
+
+    expect(UserHistory.where(acting_user_id: target_user.id).count).to eq(1)
+    expect(UserHistory.where(acting_user_id: source_user.id).count).to eq(0)
+  end
+
+  it "updates user profile views" do
+    ip = '127.0.0.1'
+    UserProfileView.add(source_user.id, ip, walter.id, Time.now, true)
+    UserProfileView.add(source_user.id, ip, target_user.id, Time.now, true)
+    UserProfileView.add(target_user.id, ip, source_user.id, Time.now, true)
+    UserProfileView.add(walter.id, ip, source_user.id, Time.now, true)
+
+    merge_users!
+
+    expect(UserProfileView.where(user_profile_id: target_user.id).count).to eq(3)
+    expect(UserProfileView.where(user_profile_id: walter.id).count).to eq(1)
+    expect(UserProfileView.where(user_profile_id: source_user.id).count).to eq(0)
+
+    expect(UserProfileView.where(user_id: target_user.id).count).to eq(3)
+    expect(UserProfileView.where(user_id: walter.id).count).to eq(1)
+    expect(UserProfileView.where(user_id: source_user.id).count).to eq(0)
+  end
+
+  it "merges user visits" do
+    freeze_time DateTime.parse('2010-01-01 12:00')
+
+    UserVisit.create!(user_id: source_user.id, visited_at: 2.days.ago, posts_read: 22, mobile: false, time_read: 400)
+    UserVisit.create!(user_id: source_user.id, visited_at: Date.yesterday, posts_read: 8, mobile: false, time_read: 100)
+    UserVisit.create!(user_id: target_user.id, visited_at: Date.yesterday, posts_read: 12, mobile: true, time_read: 270)
+    UserVisit.create!(user_id: target_user.id, visited_at: Date.today, posts_read: 10, mobile: true, time_read: 150)
+
+    merge_users!
+
+    expect(UserVisit.where(user_id: target_user.id).count).to eq(3)
+    expect(UserVisit.where(user_id: source_user.id).count).to eq(0)
+
+    expect(UserVisit.where(user_id: target_user.id, visited_at: 2.days.ago, posts_read: 22, mobile: false, time_read: 400).count).to eq(1)
+    expect(UserVisit.where(user_id: target_user.id, visited_at: Date.yesterday, posts_read: 20, mobile: true, time_read: 370).count).to eq(1)
+    expect(UserVisit.where(user_id: target_user.id, visited_at: Date.today, posts_read: 10, mobile: true, time_read: 150).count).to eq(1)
+  end
+
+  it "updates user warnings" do
+    UserWarning.create!(topic: Fabricate(:topic), user: source_user, created_by: walter)
+    UserWarning.create!(topic: Fabricate(:topic), user: target_user, created_by: walter)
+    UserWarning.create!(topic: Fabricate(:topic), user: walter, created_by: source_user)
+
+    merge_users!
+
+    expect(UserWarning.where(user_id: target_user.id).count).to eq(2)
+    expect(UserWarning.where(user_id: source_user.id).count).to eq(0)
+
+    expect(UserWarning.where(created_by_id: target_user.id).count).to eq(1)
+    expect(UserWarning.where(created_by_id: source_user.id).count).to eq(0)
+  end
+
+  it "triggers :merging_users event" do
+    events = DiscourseEvent.track_events do
+      merge_users!
+    end
+
+    expect(events).to include(event_name: :merging_users, params: [source_user, target_user])
+  end
+
+  context "site settings" do
+    it "updates usernames in site settings" do
+      SiteSetting.site_contact_username = source_user.username
+      SiteSetting.embed_by_username = source_user.username
+
+      merge_users!
+
+      expect(SiteSetting.site_contact_username).to eq(target_user.username)
+      expect(SiteSetting.embed_by_username).to eq(target_user.username)
+    end
+
+    it "updates only the old username in site settings" do
+      SiteSetting.site_contact_username = source_user.username
+      SiteSetting.embed_by_username = walter.username
+
+      merge_users!
+
+      expect(SiteSetting.site_contact_username).to eq(target_user.username)
+      expect(SiteSetting.embed_by_username).to eq(walter.username)
+    end
+  end
+
+  it "updates users" do
+    walter.update_attribute(:approved_by, source_user)
+    merge_users!
+
+    expect(walter.reload.approved_by).to eq(target_user)
+  end
+
+  it "deletes the source user even when it's an admin" do
+    source_user.update_attribute(:admin, true)
+
+    expect(User.find_by_username(source_user.username)).to be_present
+    merge_users!
+    expect(User.find_by_username(source_user.username)).to be_nil
+  end
+
+  it "deletes external auth infos of source user" do
+    FacebookUserInfo.create(user_id: source_user.id, facebook_user_id: "example")
+    GithubUserInfo.create(user_id: source_user.id, screen_name: "example", github_user_id: "examplel123123")
+    GoogleUserInfo.create(user_id: source_user.id, google_user_id: "google@gmail.com")
+    InstagramUserInfo.create(user_id: source_user.id, screen_name: "example", instagram_user_id: "examplel123123")
+    Oauth2UserInfo.create(user_id: source_user.id, uid: "example", provider: "example")
+    SingleSignOnRecord.create(user_id: source_user.id, external_id: "example", last_payload: "looks good")
+    TwitterUserInfo.create(user_id: source_user.id, screen_name: "example", twitter_user_id: "examplel123123")
+    UserOpenId.create(user_id: source_user.id, email: source_user.email, url: "http://example.com/openid", active: true)
+
+    merge_users!
+
+    expect(FacebookUserInfo.where(user_id: source_user.id).count).to eq(0)
+    expect(GithubUserInfo.where(user_id: source_user.id).count).to eq(0)
+    expect(GoogleUserInfo.where(user_id: source_user.id).count).to eq(0)
+    expect(InstagramUserInfo.where(user_id: source_user.id).count).to eq(0)
+    expect(Oauth2UserInfo.where(user_id: source_user.id).count).to eq(0)
+    expect(SingleSignOnRecord.where(user_id: source_user.id).count).to eq(0)
+    expect(TwitterUserInfo.where(user_id: source_user.id).count).to eq(0)
+    expect(UserOpenId.where(user_id: source_user.id).count).to eq(0)
+  end
+
+  it "deletes auth tokens" do
+    Fabricate(:api_key, user: source_user)
+    Fabricate(:readonly_user_api_key, user: source_user)
+    Fabricate(:user_second_factor, user: source_user)
+
+    SiteSetting.verbose_auth_token_logging = true
+    UserAuthToken.generate!(user_id: source_user.id, user_agent: "Firefox", client_ip: "127.0.0.1")
+
+    merge_users!
+
+    expect(ApiKey.where(user_id: source_user.id).count).to eq(0)
+    expect(UserApiKey.where(user_id: source_user.id).count).to eq(0)
+    expect(UserSecondFactor.where(user_id: source_user.id).count).to eq(0)
+    expect(UserAuthToken.where(user_id: source_user.id).count).to eq(0)
+    expect(UserAuthTokenLog.where(user_id: source_user.id).count).to eq(0)
+  end
+
+  it "cleans up all remaining references to the source user" do
+    DirectoryItem.refresh!
+    Fabricate(:email_change_request, user: source_user)
+    Fabricate(:email_token, user: source_user)
+    Fabricate(:user_avatar, user: source_user)
+
+    merge_users!
+
+    expect(DirectoryItem.where(user_id: source_user.id).count).to eq(0)
+    expect(EmailChangeRequest.where(user_id: source_user.id).count).to eq(0)
+    expect(EmailToken.where(user_id: source_user.id).count).to eq(0)
+    expect(UserAvatar.where(user_id: source_user.id).count).to eq(0)
+
+    expect(User.find_by_username(source_user.username)).to be_nil
+  end
+
+  it "updates the username" do
+    Jobs::UpdateUsername.any_instance
+      .expects(:execute)
+      .with(user_id: source_user.id,
+            old_username: 'alice1',
+            new_username: 'alice',
+            avatar_template: target_user.avatar_template)
+      .once
+
+    merge_users!
+  end
+end
diff --git a/spec/services/user_silencer_spec.rb b/spec/services/user_silencer_spec.rb
index 188bd0435fd..73bab2e19ff 100644
--- a/spec/services/user_silencer_spec.rb
+++ b/spec/services/user_silencer_spec.rb
@@ -60,7 +60,7 @@ describe UserSilencer do
     end
 
     it "logs it with context" do
-      SystemMessage.stubs(:create).returns(Fabricate.build(:post))
+      SystemMessage.stubs(:create)
       expect {
         UserSilencer.silence(user, Fabricate(:admin))
       }.to change { UserHistory.count }.by(1)
diff --git a/spec/services/user_updater_spec.rb b/spec/services/user_updater_spec.rb
index a1003ab4f93..14d820d488e 100644
--- a/spec/services/user_updater_spec.rb
+++ b/spec/services/user_updater_spec.rb
@@ -27,6 +27,10 @@ describe UserUpdater do
   end
 
   describe '#update' do
+    let(:category) { Fabricate(:category) }
+    let(:tag) { Fabricate(:tag) }
+    let(:tag2) { Fabricate(:tag) }
+
     it 'saves user' do
       user = Fabricate(:user, name: 'Billy Bob')
       updater = UserUpdater.new(acting_user, user)
@@ -37,18 +41,21 @@ describe UserUpdater do
     end
 
     it 'can update categories and tags' do
-      category = Fabricate(:category)
-      tag = Fabricate(:tag)
-
       user = Fabricate(:user)
       updater = UserUpdater.new(acting_user, user)
-      updater.update(watched_tags: [tag.name], muted_category_ids: [category.id])
+      updater.update(watched_tags: "#{tag.name},#{tag2.name}", muted_category_ids: [category.id])
 
       expect(TagUser.where(
         user_id: user.id,
         tag_id: tag.id,
         notification_level: TagUser.notification_levels[:watching]
-      ).count).to eq(1)
+      ).exists?).to eq(true)
+
+      expect(TagUser.where(
+        user_id: user.id,
+        tag_id: tag2.id,
+        notification_level: TagUser.notification_levels[:watching]
+      ).exists?).to eq(true)
 
       expect(CategoryUser.where(
         user_id: user.id,
@@ -58,6 +65,18 @@ describe UserUpdater do
 
     end
 
+    it "doesn't remove notification prefs when updating something else" do
+      user = Fabricate(:user)
+      TagUser.create!(user: user, tag: tag, notification_level: TagUser.notification_levels[:watching])
+      CategoryUser.create!(user: user, category: category, notification_level: CategoryUser.notification_levels[:muted])
+
+      updater = UserUpdater.new(acting_user, user)
+      updater.update(name: "Steve Dave")
+
+      expect(TagUser.where(user: user).count).to eq(1)
+      expect(CategoryUser.where(user: user).count).to eq(1)
+    end
+
     it 'updates various fields' do
       user = Fabricate(:user)
       updater = UserUpdater.new(acting_user, user)
@@ -140,7 +159,7 @@ describe UserUpdater do
       it 'allows user to change title' do
         user = Fabricate(:user, title: 'Emperor')
         guardian = stub
-        guardian.stubs(:can_grant_title?).with(user).returns(true)
+        guardian.stubs(:can_grant_title?).with(user, 'Minion').returns(true)
         Guardian.stubs(:new).with(acting_user).returns(guardian)
         updater = UserUpdater.new(acting_user, user)
 
@@ -150,11 +169,63 @@ describe UserUpdater do
       end
     end
 
+    context 'title is from a badge' do
+      let(:user) { Fabricate(:user, title: 'Emperor') }
+      let(:badge) { Fabricate(:badge, name: 'Minion') }
+
+      context 'badge can be used as a title' do
+        before do
+          badge.update_attributes(allow_title: true)
+        end
+
+        it 'can use as title, sets badge_granted_title' do
+          BadgeGranter.grant(badge, user)
+          updater = UserUpdater.new(user, user)
+          updater.update(title: badge.name)
+          user.reload
+          expect(user.user_profile.badge_granted_title).to eq(true)
+        end
+
+        it 'badge has not been granted, does not change title' do
+          badge.update_attributes(allow_title: true)
+          updater = UserUpdater.new(user, user)
+          updater.update(title: badge.name)
+          user.reload
+          expect(user.title).not_to eq(badge.name)
+          expect(user.user_profile.badge_granted_title).to eq(false)
+        end
+
+        it 'changing to a title that is not from a badge, unsets badge_granted_title' do
+          user.update_attributes(title: badge.name)
+          user.user_profile.update_attributes(badge_granted_title: true)
+
+          guardian = stub
+          guardian.stubs(:can_grant_title?).with(user, 'Dancer').returns(true)
+          Guardian.stubs(:new).with(user).returns(guardian)
+
+          updater = UserUpdater.new(user, user)
+          updater.update(title: 'Dancer')
+          user.reload
+          expect(user.title).to eq('Dancer')
+          expect(user.user_profile.badge_granted_title).to eq(false)
+        end
+      end
+
+      it 'cannot use as title, does not change title' do
+        BadgeGranter.grant(badge, user)
+        updater = UserUpdater.new(user, user)
+        updater.update(title: badge.name)
+        user.reload
+        expect(user.title).not_to eq(badge.name)
+        expect(user.user_profile.badge_granted_title).to eq(false)
+      end
+    end
+
     context 'without permission to update title' do
       it 'does not allow user to change title' do
         user = Fabricate(:user, title: 'Emperor')
         guardian = stub
-        guardian.stubs(:can_grant_title?).with(user).returns(false)
+        guardian.stubs(:can_grant_title?).with(user, 'Minion').returns(false)
         Guardian.stubs(:new).with(acting_user).returns(guardian)
         updater = UserUpdater.new(acting_user, user)
 
diff --git a/spec/services/username_changer_spec.rb b/spec/services/username_changer_spec.rb
index 79e18091c91..87e5da2b0c9 100644
--- a/spec/services/username_changer_spec.rb
+++ b/spec/services/username_changer_spec.rb
@@ -1,6 +1,9 @@
 require 'rails_helper'
 
 describe UsernameChanger do
+  before do
+    SiteSetting.queue_jobs = false
+  end
 
   describe '#change' do
     let(:user) { Fabricate(:user) }
@@ -8,21 +11,13 @@ describe UsernameChanger do
     context 'success' do
       let(:new_username) { "#{user.username}1234" }
 
-      before do
-        @result = UsernameChanger.change(user, new_username)
-      end
-
-      it 'returns true' do
-        expect(@result).to eq(true)
-      end
-
       it 'should change the username' do
+        @result = UsernameChanger.change(user, new_username)
+
+        expect(@result).to eq(true)
+
         user.reload
         expect(user.username).to eq(new_username)
-      end
-
-      it 'should change the username_lower' do
-        user.reload
         expect(user.username_lower).to eq(new_username.downcase)
       end
     end
@@ -32,21 +27,12 @@ describe UsernameChanger do
       let(:username_before_change) { user.username }
       let(:username_lower_before_change) { user.username_lower }
 
-      before do
-        @result = UsernameChanger.change(user, wrong_username)
-      end
-
-      it 'returns false' do
-        expect(@result).to eq(false)
-      end
-
       it 'should not change the username' do
+        @result = UsernameChanger.change(user, wrong_username)
+        expect(@result).to eq(false)
+
         user.reload
         expect(user.username).to eq(username_before_change)
-      end
-
-      it 'should not change the username_lower' do
-        user.reload
         expect(user.username_lower).to eq(username_lower_before_change)
       end
     end
@@ -54,18 +40,16 @@ describe UsernameChanger do
     describe 'change the case of my username' do
       let!(:myself) { Fabricate(:user, username: 'hansolo') }
 
-      it 'should return true' do
-        expect(UsernameChanger.change(myself, "HanSolo")).to eq(true)
-      end
-
       it 'should change the username' do
-        UsernameChanger.change(myself, "HanSolo")
-        expect(myself.reload.username).to eq('HanSolo')
-      end
+        expect do
+          expect(UsernameChanger.change(myself, "HanSolo", myself)).to eq(true)
+        end.to change { UserHistory.count }.by(1)
 
-      it "logs the action" do
-        expect { UsernameChanger.change(myself, "HanSolo", myself) }.to change { UserHistory.count }.by(1)
-        expect { UsernameChanger.change(myself, "HanSolo", myself) }.to change { UserHistory.count }.by(0) # make sure it does not log a dupe
+        expect(myself.reload.username).to eq('HanSolo')
+
+        expect do
+          UsernameChanger.change(myself, "HanSolo", myself)
+        end.to change { UserHistory.count }.by(0) # make sure it does not log a dupe
       end
     end
 
@@ -90,6 +74,459 @@ describe UsernameChanger do
         expect(result).to eq(false)
       end
     end
+
+    context 'posts and revisions' do
+      let(:user) { Fabricate(:user, username: 'foo') }
+      let(:topic) { Fabricate(:topic, user: user) }
+
+      before do
+        UserActionCreator.enable
+        Discourse.expects(:warn_exception).never
+      end
+
+      after do
+        UserActionCreator.disable
+      end
+
+      def create_post_and_change_username(args = {}, &block)
+        post = create_post(args.merge(topic_id: topic.id))
+
+        args.delete(:revisions)&.each do |revision|
+          post.revise(post.user, revision, force_new_version: true)
+        end
+
+        block.call(post) if block
+
+        UsernameChanger.change(user, 'bar')
+        post.reload
+      end
+
+      context 'mentions' do
+        it 'rewrites cooked correctly' do
+          post = create_post_and_change_username(raw: "Hello @foo")
+          expect(post.cooked).to eq(%Q(<p>Hello <a class="mention" href="/u/bar">@bar</a></p>))
+
+          post.rebake!
+          expect(post.cooked).to eq(%Q(<p>Hello <a class="mention" href="/u/bar">@bar</a></p>))
+        end
+
+        it 'removes the username from the search index' do
+          SearchIndexer.enable
+          create_post_and_change_username(raw: "Hello @foo")
+
+          results = Search.execute('foo', min_search_term_length: 1)
+          expect(results.posts).to be_empty
+        end
+
+        it 'ignores case when replacing mentions' do
+          post = create_post_and_change_username(raw: "There's no difference between @foo and @Foo")
+
+          expect(post.raw).to eq("There's no difference between @bar and @bar")
+          expect(post.cooked).to eq(%Q(<p>There’s no difference between <a class="mention" href="/u/bar">@bar</a> and <a class="mention" href="/u/bar">@bar</a></p>))
+        end
+
+        it 'replaces mentions when there are leading symbols' do
+          post = create_post_and_change_username(raw: ".@foo -@foo %@foo _@foo ,@foo ;@foo @@foo")
+
+          expect(post.raw).to eq(".@bar -@bar %@bar _@bar ,@bar ;@bar @@bar")
+          expect(post.cooked).to match_html(<<~HTML)
+          <p>.<a class="mention" href="/u/bar">@bar</a>
+             -<a class="mention" href="/u/bar">@bar</a>
+             %<a class="mention" href="/u/bar">@bar</a>
+             _<a class="mention" href="/u/bar">@bar</a>
+             ,<a class="mention" href="/u/bar">@bar</a>
+             ;<a class="mention" href="/u/bar">@bar</a>
+             @<a class="mention" href="/u/bar">@bar</a></p>
+          HTML
+        end
+
+        it 'replaces mentions within double and single quotes' do
+          post = create_post_and_change_username(raw: %Q("@foo" '@foo'))
+
+          expect(post.raw).to eq(%Q("@bar" '@bar'))
+          expect(post.cooked).to eq(%Q(<p>“<a class="mention" href="/u/bar">@bar</a>” ‘<a class="mention" href="/u/bar">@bar</a>’</p>))
+        end
+
+        it 'replaces mentions when there are trailing symbols' do
+          post = create_post_and_change_username(raw: "@foo. @foo, @foo: @foo; @foo-")
+
+          expect(post.raw).to eq("@bar. @bar, @bar: @bar; @bar-")
+          expect(post.cooked).to match_html(<<~HTML)
+          <p><a class="mention" href="/u/bar">@bar</a>.
+             <a class="mention" href="/u/bar">@bar</a>,
+             <a class="mention" href="/u/bar">@bar</a>:
+             <a class="mention" href="/u/bar">@bar</a>;
+             <a class="mention" href="/u/bar">@bar</a>-</p>
+          HTML
+        end
+
+        it 'does not replace mention when followed by an underscore' do
+          post = create_post_and_change_username(raw: "@foo_")
+
+          expect(post.raw).to eq("@foo_")
+          expect(post.cooked).to eq(%Q(<p><span class="mention">@foo_</span></p>))
+        end
+
+        it 'does not replace mentions when there are leading alphanumeric chars' do
+          post = create_post_and_change_username(raw: "a@foo 2@foo")
+
+          expect(post.raw).to eq("a@foo 2@foo")
+          expect(post.cooked).to eq(%Q(<p>a@foo 2@foo</p>))
+        end
+
+        it 'does not replace username within email address' do
+          post = create_post_and_change_username(raw: "mail@foo.com")
+
+          expect(post.raw).to eq("mail@foo.com")
+          expect(post.cooked).to eq(%Q(<p><a href="mailto:mail@foo.com">mail@foo.com</a></p>))
+        end
+
+        it 'does not replace username in a mention of a similar username' do
+          Fabricate(:user, username: 'foobar')
+          Fabricate(:user, username: 'foo-bar')
+          Fabricate(:user, username: 'foo_bar')
+          Fabricate(:user, username: 'foo1')
+
+          post = create_post_and_change_username(raw: "@foo @foobar @foo-bar @foo_bar @foo1")
+
+          expect(post.raw).to eq("@bar @foobar @foo-bar @foo_bar @foo1")
+          expect(post.cooked).to match_html(<<~HTML)
+          <p><a class="mention" href="/u/bar">@bar</a>
+             <a class="mention" href="/u/foobar">@foobar</a>
+             <a class="mention" href="/u/foo-bar">@foo-bar</a>
+             <a class="mention" href="/u/foo_bar">@foo_bar</a>
+             <a class="mention" href="/u/foo1">@foo1</a></p>
+          HTML
+        end
+
+        it 'updates the path to the user even when it links to /user instead of /u' do
+          post = create_post_and_change_username(raw: "Hello @foo")
+          post.update_column(:cooked, post.cooked.gsub("/u/foo", "/users/foo"))
+
+          expect(post.raw).to eq("Hello @bar")
+          expect(post.cooked).to eq(%Q(<p>Hello <a class="mention" href="/u/bar">@bar</a></p>))
+        end
+
+        it 'replaces mentions within revisions' do
+          revisions = [{ raw: "Hello Foo" }, { title: "new topic title" }, { raw: "Hello @foo!" }, { raw: "Hello @foo!!" }]
+          post = create_post_and_change_username(raw: "Hello @foo", revisions: revisions)
+
+          expect(post.raw).to eq("Hello @bar!!")
+          expect(post.cooked).to eq(%Q(<p>Hello <a class="mention" href="/u/bar">@bar</a>!!</p>))
+
+          expect(post.revisions.count).to eq(4)
+
+          expect(post.revisions[0].modifications["raw"][0]).to eq("Hello @bar")
+          expect(post.revisions[0].modifications["raw"][1]).to eq("Hello Foo")
+          expect(post.revisions[0].modifications["cooked"][0]).to eq(%Q(<p>Hello <a class="mention" href="/u/bar">@bar</a></p>))
+          expect(post.revisions[0].modifications["cooked"][1]).to eq(%Q(<p>Hello Foo</p>))
+
+          expect(post.revisions[1].modifications).to include("title")
+
+          expect(post.revisions[2].modifications["raw"][0]).to eq("Hello Foo")
+          expect(post.revisions[2].modifications["raw"][1]).to eq("Hello @bar!")
+          expect(post.revisions[2].modifications["cooked"][0]).to eq(%Q(<p>Hello Foo</p>))
+          expect(post.revisions[2].modifications["cooked"][1]).to eq(%Q(<p>Hello <a class="mention" href="/u/bar">@bar</a>!</p>))
+
+          expect(post.revisions[3].modifications["raw"][0]).to eq("Hello @bar!")
+          expect(post.revisions[3].modifications["raw"][1]).to eq("Hello @bar!!")
+          expect(post.revisions[3].modifications["cooked"][0]).to eq(%Q(<p>Hello <a class="mention" href="/u/bar">@bar</a>!</p>))
+          expect(post.revisions[3].modifications["cooked"][1]).to eq(%Q(<p>Hello <a class="mention" href="/u/bar">@bar</a>!!</p>))
+        end
+
+        it 'replaces mentions in posts marked for deletion' do
+          post = create_post_and_change_username(raw: "Hello @foo") do |p|
+            PostDestroyer.new(p.user, p).destroy
+          end
+
+          expect(post.raw).to_not include("@foo")
+          expect(post.cooked).to_not include("foo")
+          expect(post.revisions.count).to eq(1)
+
+          expect(post.revisions[0].modifications["raw"][0]).to eq("Hello @bar")
+          expect(post.revisions[0].modifications["cooked"][0]).to eq(%Q(<p>Hello <a class="mention" href="/u/bar">@bar</a></p>))
+        end
+
+        it 'works when users are mentioned with HTML' do
+          post = create_post_and_change_username(raw: '<a class="mention">@foo</a> and <a class="mention">@someuser</a>')
+
+          expect(post.raw).to eq('<a class="mention">@bar</a> and <a class="mention">@someuser</a>')
+          expect(post.cooked).to match_html('<p><a class="mention">@bar</a> and <a class="mention">@someuser</a></p>')
+        end
+      end
+
+      context 'quotes' do
+        let(:quoted_post) { create_post(user: user, topic: topic, post_number: 1, raw: "quoted post") }
+        let(:avatar_url) { user.avatar_template.gsub("{size}", "40") }
+
+        it 'replaces the username in quote tags and updates avatar' do
+          post = create_post_and_change_username(raw: <<~RAW)
+            Lorem ipsum
+
+            [quote="foo, post:1, topic:#{quoted_post.topic.id}"]
+            quoted post
+            [/quote]
+
+            [quote='foo']
+            quoted post
+            [/quote]
+
+            [quote=foo, post:1, topic:#{quoted_post.topic.id}]
+            quoted post
+            [/quote]
+
+            dolor sit amet
+          RAW
+
+          expect(post.raw).to eq(<<~RAW.strip)
+            Lorem ipsum
+
+            [quote="bar, post:1, topic:#{quoted_post.topic.id}"]
+            quoted post
+            [/quote]
+
+            [quote='bar']
+            quoted post
+            [/quote]
+
+            [quote=bar, post:1, topic:#{quoted_post.topic.id}]
+            quoted post
+            [/quote]
+
+            dolor sit amet
+          RAW
+
+          expect(post.cooked).to match_html(<<~HTML)
+            <p>Lorem ipsum</p>
+            <aside class="quote no-group" data-post="1" data-topic="#{quoted_post.topic.id}">
+            <div class="title">
+            <div class="quote-controls"></div>
+            <img alt='' width="20" height="20" src="#{avatar_url}" class="avatar"> bar:</div>
+            <blockquote>
+            <p>quoted post</p>
+            </blockquote>
+            </aside>
+            <aside class="quote no-group">
+            <div class="title">
+            <div class="quote-controls"></div>
+            <img alt='' width="20" height="20" src="#{avatar_url}" class="avatar"> bar:</div>
+            <blockquote>
+            <p>quoted post</p>
+            </blockquote>
+            </aside>
+            <aside class="quote no-group" data-post="1" data-topic="#{quoted_post.topic.id}">
+            <div class="title">
+            <div class="quote-controls"></div>
+            <img alt='' width="20" height="20" src="#{avatar_url}" class="avatar"> bar:</div>
+            <blockquote>
+            <p>quoted post</p>
+            </blockquote>
+            </aside>
+            <p>dolor sit amet</p>
+          HTML
+        end
+
+        context 'simple quote' do
+          let(:raw) do <<~RAW
+              Lorem ipsum
+
+              [quote="foo, post:1, topic:#{quoted_post.topic.id}"]
+              quoted post
+              [/quote]
+            RAW
+          end
+
+          let(:expected_raw) do
+            <<~RAW.strip
+              Lorem ipsum
+
+              [quote="bar, post:1, topic:#{quoted_post.topic.id}"]
+              quoted post
+              [/quote]
+            RAW
+          end
+
+          let(:expected_cooked) do
+            <<~HTML
+              <p>Lorem ipsum</p>
+              <aside class="quote no-group" data-post="1" data-topic="#{quoted_post.topic.id}">
+              <div class="title">
+              <div class="quote-controls"></div>
+              <img alt='' width="20" height="20" src="#{avatar_url}" class="avatar"> bar:</div>
+              <blockquote>
+              <p>quoted post</p>
+              </blockquote>
+              </aside>
+            HTML
+          end
+
+          it 'replaces the username in quote tags when the post is deleted' do
+            post = create_post_and_change_username(raw: raw) do |p|
+              PostDestroyer.new(Discourse.system_user, p).destroy
+            end
+
+            expect(post.raw).to eq(expected_raw)
+            expect(post.cooked).to match_html(expected_cooked)
+          end
+        end
+      end
+
+      context 'oneboxes' do
+        let(:quoted_post) { create_post(user: user, topic: topic, post_number: 1, raw: "quoted post") }
+        let(:avatar_url) { user_avatar_url(user) }
+        let(:evil_trout) { Fabricate(:evil_trout) }
+        let(:another_quoted_post) { create_post(user: evil_trout, topic: topic, post_number: 2, raw: "evil post") }
+
+        def protocol_relative_url(url)
+          url.sub(/^https?:/, '')
+        end
+
+        def user_avatar_url(u)
+          u.avatar_template.gsub("{size}", "40")
+        end
+
+        it 'updates avatar for linked topics and posts' do
+          raw = "#{quoted_post.full_url}\n#{quoted_post.topic.url}"
+          post = create_post_and_change_username(raw: raw)
+
+          expect(post.raw).to eq(raw)
+
+          expect(post.cooked).to match_html(<<~HTML)
+            <p><aside class="quote" data-post="#{quoted_post.post_number}" data-topic="#{quoted_post.topic.id}">
+              <div class="title">
+                <div class="quote-controls"></div>
+                <img alt="" width="20" height="20" src="#{avatar_url}" class="avatar">
+                <a href="#{protocol_relative_url(quoted_post.full_url)}">#{quoted_post.topic.title}</a>
+              </div>
+              <blockquote>
+                quoted post
+              </blockquote>
+            </aside>
+            <br>
+            <aside class="quote" data-post="#{quoted_post.post_number}" data-topic="#{quoted_post.topic.id}">
+              <div class="title">
+                <div class="quote-controls"></div>
+                <img alt="" width="20" height="20" src="#{avatar_url}" class="avatar">
+                <a href="#{protocol_relative_url(quoted_post.topic.url)}">#{quoted_post.topic.title}</a>
+              </div>
+              <blockquote>
+                quoted post
+              </blockquote>
+            </aside>
+            </p>
+          HTML
+        end
+
+        it 'does not update the wrong avatar' do
+          raw = "#{quoted_post.full_url}\n#{another_quoted_post.full_url}"
+          post = create_post_and_change_username(raw: raw)
+
+          expect(post.raw).to eq(raw)
+
+          expect(post.cooked).to match_html(<<~HTML)
+            <p><aside class="quote" data-post="#{quoted_post.post_number}" data-topic="#{quoted_post.topic.id}">
+              <div class="title">
+                <div class="quote-controls"></div>
+                <img alt="" width="20" height="20" src="#{avatar_url}" class="avatar">
+                <a href="#{protocol_relative_url(quoted_post.full_url)}">#{quoted_post.topic.title}</a>
+              </div>
+              <blockquote>
+                quoted post
+              </blockquote>
+            </aside>
+            <br>
+            <aside class="quote" data-post="#{another_quoted_post.post_number}" data-topic="#{another_quoted_post.topic.id}">
+              <div class="title">
+                <div class="quote-controls"></div>
+                <img alt="" width="20" height="20" src="#{user_avatar_url(evil_trout)}" class="avatar">
+                <a href="#{protocol_relative_url(another_quoted_post.full_url)}">#{another_quoted_post.topic.title}</a>
+              </div>
+              <blockquote>
+                evil post
+              </blockquote>
+            </aside>
+            </p>
+          HTML
+        end
+      end
+
+      it 'updates username in small action posts' do
+        invited_by = Fabricate(:user)
+        p1 = topic.add_small_action(invited_by, 'invited_user', 'foo')
+        p2 = topic.add_small_action(invited_by, 'invited_user', 'foobar')
+        UsernameChanger.change(user, 'bar')
+
+        expect(p1.reload.custom_fields['action_code_who']).to eq('bar')
+        expect(p2.reload.custom_fields['action_code_who']).to eq('foobar')
+      end
+    end
+
+    context 'notifications' do
+      def create_notification(type, notified_user, post, data = {})
+        Fabricate(
+          :notification,
+          notification_type: Notification.types[type],
+          user: notified_user,
+          data: data.to_json,
+          topic: post&.topic,
+          post_number: post&.post_number
+        )
+      end
+
+      def notification_data(notification)
+        JSON.parse(notification.reload.data, symbolize_names: true)
+      end
+
+      def original_and_display_username(username)
+        { original_username: username, display_username: username, foo: "bar" }
+      end
+
+      def original_username_and_some_text_as_display_username(username)
+        { original_username: username, display_username: "some text", foo: "bar" }
+      end
+
+      def only_display_username(username)
+        { display_username: username }
+      end
+
+      def username_and_something_else(username)
+        { username: username, foo: "bar" }
+      end
+
+      it 'replaces usernames in notifications' do
+        renamed_user = Fabricate(:user, username: "alice")
+        another_user = Fabricate(:user, username: "another_user")
+        notified_user = Fabricate(:user)
+        p1 = Fabricate(:post, post_number: 1, user: renamed_user)
+        p2 = Fabricate(:post, post_number: 1, user: another_user)
+        Fabricate(:invite, invited_by: notified_user, user: renamed_user)
+        Fabricate(:invite, invited_by: notified_user, user: another_user)
+
+        n01 = create_notification(:mentioned, notified_user, p1, original_and_display_username("alice"))
+        n02 = create_notification(:mentioned, notified_user, p2, original_and_display_username("another_user"))
+        n03 = create_notification(:mentioned, notified_user, p1, original_username_and_some_text_as_display_username("alice"))
+        n04 = create_notification(:mentioned, notified_user, p1, only_display_username("alice"))
+        n05 = create_notification(:invitee_accepted, notified_user, nil, only_display_username("alice"))
+        n06 = create_notification(:invitee_accepted, notified_user, nil, only_display_username("another_user"))
+        n07 = create_notification(:granted_badge, renamed_user, nil, username_and_something_else("alice"))
+        n08 = create_notification(:granted_badge, another_user, nil, username_and_something_else("another_user"))
+        n09 = create_notification(:group_message_summary, renamed_user, nil, username_and_something_else("alice"))
+        n10 = create_notification(:group_message_summary, another_user, nil, username_and_something_else("another_user"))
+
+        UsernameChanger.change(renamed_user, "bob")
+
+        expect(notification_data(n01)).to eq(original_and_display_username("bob"))
+        expect(notification_data(n02)).to eq(original_and_display_username("another_user"))
+        expect(notification_data(n03)).to eq(original_username_and_some_text_as_display_username("bob"))
+        expect(notification_data(n04)).to eq(only_display_username("bob"))
+        expect(notification_data(n05)).to eq(only_display_username("bob"))
+        expect(notification_data(n06)).to eq(only_display_username("another_user"))
+        expect(notification_data(n07)).to eq(username_and_something_else("bob"))
+        expect(notification_data(n08)).to eq(username_and_something_else("another_user"))
+        expect(notification_data(n09)).to eq(username_and_something_else("bob"))
+        expect(notification_data(n10)).to eq(username_and_something_else("another_user"))
+      end
+    end
   end
 
 end
diff --git a/spec/services/word_watcher_spec.rb b/spec/services/word_watcher_spec.rb
index 334446502c8..52264cf41af 100644
--- a/spec/services/word_watcher_spec.rb
+++ b/spec/services/word_watcher_spec.rb
@@ -76,6 +76,21 @@ describe WordWatcher do
           m = WordWatcher.new("trooooooooot").word_matches_for_action?(:require_approval)
           expect(m[1]).to eq("trooooooooot")
         end
+
+        it "support uppercase" do
+          Fabricate(
+            :watched_word,
+            word: /a\S+ce/,
+            action: WatchedWord.actions[:require_approval]
+          )
+
+          m = WordWatcher.new('Amazing place').word_matches_for_action?(:require_approval)
+          expect(m).to be_nil
+          m = WordWatcher.new('Amazing applesauce').word_matches_for_action?(:require_approval)
+          expect(m[1]).to eq('applesauce')
+          m = WordWatcher.new('Amazing AppleSauce').word_matches_for_action?(:require_approval)
+          expect(m[1]).to eq('AppleSauce')
+        end
       end
 
     end
diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb
index 0a74e2df384..a137b1e12d3 100644
--- a/spec/support/helpers.rb
+++ b/spec/support/helpers.rb
@@ -85,4 +85,21 @@ module Helpers
   def email(email_name)
     fixture_file("emails/#{email_name}.eml")
   end
+
+  def create_staff_tags(tag_names)
+    tag_group = Fabricate(:tag_group, name: 'Staff Tags')
+    TagGroupPermission.create!(
+      tag_group: tag_group,
+      group_id: Group::AUTO_GROUPS[:everyone],
+      permission_type: TagGroupPermission.permission_types[:readonly]
+    )
+    TagGroupPermission.create!(
+      tag_group: tag_group,
+      group_id: Group::AUTO_GROUPS[:staff],
+      permission_type: TagGroupPermission.permission_types[:full]
+    )
+    tag_names.each do |name|
+      tag_group.tags << (Tag.where(name: name).first || Fabricate(:tag, name: name))
+    end
+  end
 end
diff --git a/spec/support/integration_helpers.rb b/spec/support/integration_helpers.rb
index ceea9935559..94d245caae2 100644
--- a/spec/support/integration_helpers.rb
+++ b/spec/support/integration_helpers.rb
@@ -24,11 +24,7 @@ module IntegrationHelpers
   end
 
   def sign_in(user)
-    password = 'somecomplicatedpassword'
-    user.update!(password: password)
-    Fabricate(:email_token, confirmed: true, user: user)
-    post "/session.json", params: { login: user.username, password: password }
-    expect(response).to be_success
+    get "/session/#{user.username}/become"
     user
   end
 end
diff --git a/test/javascripts/acceptance/admin-flags-test.js.es6 b/test/javascripts/acceptance/admin-flags-test.js.es6
index e64e823039e..3f38df94b18 100644
--- a/test/javascripts/acceptance/admin-flags-test.js.es6
+++ b/test/javascripts/acceptance/admin-flags-test.js.es6
@@ -104,15 +104,6 @@ QUnit.test("flagged posts - delete + deleteSpammer", assert => {
   });
 });
 
-QUnit.test("flagged posts - suspend", assert => {
-  visit("/admin/flags/active");
-  click('.suspend-user');
-  andThen(() => {
-    assert.equal(find('.suspend-user-modal:visible').length, 1);
-    assert.equal(find('.suspend-user-modal .cant-suspend').length, 1);
-  });
-});
-
 QUnit.test("topics with flags", assert => {
   visit("/admin/flags/topics");
   andThen(() => {
diff --git a/test/javascripts/acceptance/admin-search-log-term-test.js.es6 b/test/javascripts/acceptance/admin-search-log-term-test.js.es6
index dd6b1e62693..9d3fbd6b439 100644
--- a/test/javascripts/acceptance/admin-search-log-term-test.js.es6
+++ b/test/javascripts/acceptance/admin-search-log-term-test.js.es6
@@ -5,6 +5,7 @@ QUnit.test("show search log term details", assert => {
   visit("/admin/logs/search_logs/term/ruby");
   andThen(() => {
     assert.ok($('div.search-logs-filter').length, "has the search type filter");
-    assert.ok(exists('iframe.chartjs-hidden-iframe'), "has graph iframe");
+    assert.ok(exists('canvas.chartjs-render-monitor'), "has graph canvas");
+    assert.ok(exists('div.header-search-results'), "has header search results");
   });
 });
diff --git a/test/javascripts/acceptance/composer-actions-test.js.es6 b/test/javascripts/acceptance/composer-actions-test.js.es6
new file mode 100644
index 00000000000..cf9ad80e0e4
--- /dev/null
+++ b/test/javascripts/acceptance/composer-actions-test.js.es6
@@ -0,0 +1,173 @@
+import { acceptance } from 'helpers/qunit-helpers';
+import { _clearSnapshots } from 'select-kit/components/composer-actions';
+
+acceptance('Composer Actions', {
+  loggedIn: true,
+  settings: {
+    enable_whispers: true
+  },
+  beforeEach() {
+    _clearSnapshots();
+  },
+});
+
+QUnit.test('replying to post', async assert => {
+  const composerActions = selectKit('.composer-actions');
+
+  await visit('/t/internationalization-localization/280');
+  await click('article#post_3 button.reply');
+  await composerActions.expandAwait();
+
+  assert.equal(composerActions.rowByIndex(0).value(), 'reply_as_new_topic');
+  assert.equal(composerActions.rowByIndex(1).value(), 'reply_as_private_message');
+  assert.equal(composerActions.rowByIndex(2).value(), 'reply_to_topic');
+  assert.equal(composerActions.rowByIndex(3).value(), 'toggle_whisper');
+  assert.equal(composerActions.rowByIndex(4).value(), undefined);
+});
+
+QUnit.test('replying to post - reply_as_private_message', async assert => {
+  const composerActions = selectKit('.composer-actions');
+
+  await visit('/t/internationalization-localization/280');
+  await click('article#post_3 button.reply');
+
+  await composerActions.expandAwait();
+  await composerActions.selectRowByValueAwait('reply_as_private_message');
+
+  assert.equal(find('.users-input .item:eq(0)').text(), 'codinghorror');
+  assert.ok(find('.d-editor-input').val().indexOf('Continuing the discussion') >= 0);
+});
+
+QUnit.test('replying to post - reply_to_topic', async assert => {
+  const composerActions = selectKit('.composer-actions');
+
+  await visit('/t/internationalization-localization/280');
+  await click('article#post_3 button.reply');
+  await fillIn('.d-editor-input', 'test replying to topic when initially replied to post');
+
+  await composerActions.expandAwait();
+  await composerActions.selectRowByValueAwait('reply_to_topic');
+
+  assert.equal(find('.action-title .topic-link').text().trim(), 'Internationalization / localization');
+  assert.equal(find('.action-title .topic-link').attr("href"), '/t/internationalization-localization/280');
+  assert.equal(find('.d-editor-input').val(), 'test replying to topic when initially replied to post');
+});
+
+QUnit.test('replying to post - toggle_whisper', async assert => {
+  const composerActions = selectKit('.composer-actions');
+
+  await visit('/t/internationalization-localization/280');
+  await click('article#post_3 button.reply');
+  await fillIn('.d-editor-input', 'test replying as whisper to topic when initially not a whisper');
+
+  await composerActions.expandAwait();
+  await composerActions.selectRowByValueAwait('toggle_whisper');
+
+  assert.ok(
+    find('.composer-fields .whisper').text().indexOf(I18n.t("composer.whisper")) > 0
+  );
+});
+
+QUnit.test('replying to post - reply_as_new_topic', async assert => {
+  const composerActions = selectKit('.composer-actions');
+  const categoryChooser = selectKit('.title-wrapper .category-chooser');
+  const categoryChooserReplyArea = selectKit('.reply-area .category-chooser');
+  const quote = 'test replying as new topic when initially replied to post';
+
+  await visit('/t/internationalization-localization/280');
+
+  await click('#topic-title .d-icon-pencil');
+  await categoryChooser.expandAwait();
+  await categoryChooser.selectRowByValueAwait(4);
+  await click('#topic-title .submit-edit');
+
+  await click('article#post_3 button.reply');
+  await fillIn('.d-editor-input', quote);
+
+  await composerActions.expandAwait();
+  await composerActions.selectRowByValueAwait('reply_as_new_topic');
+
+  assert.equal(categoryChooserReplyArea.header().name(), 'faq');
+  assert.equal(find('.action-title').text().trim(), I18n.t("topic.create_long"));
+  assert.ok(find('.d-editor-input').val().includes(quote));
+});
+
+QUnit.test('shared draft', async assert => {
+  const composerActions = selectKit('.composer-actions');
+
+  await visit("/");
+  await click('#create-topic');
+
+  await composerActions.expandAwait();
+  await composerActions.selectRowByValueAwait('shared_draft');
+
+  assert.equal(
+    find('#reply-control .btn-primary.create .d-button-label').text(),
+    I18n.t('composer.create_shared_draft')
+  );
+  assert.ok(find('#reply-control.composing-shared-draft').length === 1);
+});
+
+QUnit.test('hide component if no content', async assert => {
+  const composerActions = selectKit('.composer-actions');
+
+  await visit('/u/eviltrout/messages');
+  await click('.new-private-message');
+
+  assert.ok(composerActions.el().hasClass("is-hidden"));
+});
+
+QUnit.test('interactions', async assert => {
+  const composerActions = selectKit('.composer-actions');
+  const quote = 'Life is like riding a bicycle.';
+
+  await visit('/t/internationalization-localization/280');
+  await click('article#post_3 button.reply');
+  await fillIn('.d-editor-input', quote);
+  await composerActions.expandAwait();
+  await composerActions.selectRowByValueAwait('reply_to_topic');
+
+  assert.equal(find('.action-title').text().trim(), "Internationalization / localization");
+  assert.equal(find('.d-editor-input').val(), quote);
+
+  await composerActions.expandAwait();
+
+  assert.equal(composerActions.rowByIndex(0).value(), 'reply_as_new_topic');
+  assert.equal(composerActions.rowByIndex(1).value(), 'reply_to_post');
+  assert.equal(composerActions.rowByIndex(2).value(), 'reply_as_private_message');
+  assert.equal(composerActions.rowByIndex(3).value(), 'toggle_whisper');
+  assert.equal(composerActions.rows().length, 4);
+
+  await composerActions.selectRowByValueAwait('reply_to_post');
+  await composerActions.expandAwait();
+
+  assert.ok(exists(find('.action-title img.avatar')));
+  assert.equal(find('.action-title .user-link').text().trim(), "codinghorror");
+  assert.equal(find('.d-editor-input').val(), quote);
+  assert.equal(composerActions.rowByIndex(0).value(), 'reply_as_new_topic');
+  assert.equal(composerActions.rowByIndex(1).value(), 'reply_as_private_message');
+  assert.equal(composerActions.rowByIndex(2).value(), 'reply_to_topic');
+  assert.equal(composerActions.rowByIndex(3).value(), 'toggle_whisper');
+  assert.equal(composerActions.rows().length, 4);
+
+  await composerActions.selectRowByValueAwait('reply_as_new_topic');
+  await composerActions.expandAwait();
+
+  assert.equal(find('.action-title').text().trim(), I18n.t("topic.create_long"));
+  assert.ok(find('.d-editor-input').val().includes(quote));
+  assert.equal(composerActions.rowByIndex(0).value(), 'reply_to_post');
+  assert.equal(composerActions.rowByIndex(1).value(), 'reply_as_private_message');
+  assert.equal(composerActions.rowByIndex(2).value(), 'reply_to_topic');
+  assert.equal(composerActions.rowByIndex(3).value(), 'shared_draft');
+  assert.equal(composerActions.rows().length, 4);
+
+  await composerActions.selectRowByValueAwait('reply_as_private_message');
+  await composerActions.expandAwait();
+
+  assert.equal(find('.action-title').text().trim(), I18n.t("topic.private_message"));
+  assert.ok(find('.d-editor-input').val().indexOf("Continuing the discussion") === 0);
+  assert.equal(composerActions.rowByIndex(0).value(), 'reply_as_new_topic');
+  assert.equal(composerActions.rowByIndex(1).value(), 'reply_to_post');
+  assert.equal(composerActions.rowByIndex(2).value(), 'reply_to_topic');
+  assert.equal(composerActions.rows().length, 3);
+});
diff --git a/test/javascripts/acceptance/composer-test.js.es6 b/test/javascripts/acceptance/composer-test.js.es6
index e35505eca67..bd60b6cbb78 100644
--- a/test/javascripts/acceptance/composer-test.js.es6
+++ b/test/javascripts/acceptance/composer-test.js.es6
@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance, replaceCurrentUser } from "helpers/qunit-helpers";
 
 acceptance("Composer", {
   loggedIn: true,
@@ -335,3 +335,39 @@ QUnit.test("Composer draft with dirty reply can toggle to edit", assert => {
     assert.equal(find('.d-editor-input').val().indexOf('This is the first post.'), 0, 'it populates the input with the post text');
   });
 });
+
+acceptance("Composer and uncategorized is not allowed", {
+  loggedIn: true,
+  settings: {
+    enable_whispers: true,
+    allow_uncategorized_topics: false
+  }
+});
+
+QUnit.test("Disable body until category is selected", assert => {
+  replaceCurrentUser({ admin: false, staff: false, trust_level: 1 });
+
+  visit("/");
+  click('#create-topic');
+  andThen(() => {
+    assert.ok(exists('.d-editor-input'), 'the composer input is visible');
+    assert.ok(exists('.title-input .popup-tip.bad.hide'), 'title errors are hidden by default');
+    assert.ok(exists('.d-editor-textarea-wrapper .popup-tip.bad.hide'), 'body errors are hidden by default');
+    assert.ok(exists('.d-editor-textarea-wrapper.disabled'), 'textarea is disabled');
+  });
+
+  const categoryChooser = selectKit('.category-chooser');
+
+  categoryChooser.expand().selectRowByValue(2);
+
+  andThen(() => {
+    assert.ok(find('.d-editor-textarea-wrapper.disabled').length === 0, 'textarea is enabled');
+  });
+
+  fillIn('.d-editor-input', 'Now I can type stuff');
+  categoryChooser.expand().selectRowByValue('__none__');
+
+  andThen(() => {
+    assert.ok(find('.d-editor-textarea-wrapper.disabled').length === 0, 'textarea is still enabled');
+  });
+});
diff --git a/test/javascripts/acceptance/composer-topic-links-test.js.es6 b/test/javascripts/acceptance/composer-topic-links-test.js.es6
index 6f55248803e..60bd14487eb 100644
--- a/test/javascripts/acceptance/composer-topic-links-test.js.es6
+++ b/test/javascripts/acceptance/composer-topic-links-test.js.es6
@@ -1,10 +1,11 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance, replaceCurrentUser } from "helpers/qunit-helpers";
 
 acceptance("Composer topic featured links", {
   loggedIn: true,
   settings: {
     topic_featured_link_enabled: true,
-    max_topic_title_length: 80
+    max_topic_title_length: 80,
+    enable_markdown_linkify: true,
   }
 });
 
@@ -75,3 +76,30 @@ QUnit.test("onebox with title but extra words in title field", assert => {
     assert.equal(find('.title-input input').val(), "http://www.example.com/has-title.html test", "title is unchanged");
   });
 });
+
+acceptance("Composer topic featured links when uncategorized is not allowed", {
+  loggedIn: true,
+  settings: {
+    topic_featured_link_enabled: true,
+    max_topic_title_length: 80,
+    enable_markdown_linkify: true,
+    allow_uncategorized_topics: false
+  }
+});
+
+QUnit.test("Pasting a link enables the text input area", assert => {
+  replaceCurrentUser({ admin: false, staff: false, trust_level: 1 });
+
+  visit("/");
+  click('#create-topic');
+  andThen(() => {
+    assert.ok(find('.d-editor-textarea-wrapper.disabled').length, 'textarea is disabled');
+  });
+  fillIn('#reply-title', "http://www.example.com/has-title.html");
+  andThen(() => {
+    assert.ok(find('.d-editor-preview').html().trim().indexOf('onebox') > 0, "it pastes the link into the body and previews it");
+    assert.ok(exists('.d-editor-textarea-wrapper .popup-tip.good'), 'the body is now good');
+    assert.equal(find('.title-input input').val(), "An interesting article", "title is from the oneboxed article");
+    assert.ok(find('.d-editor-textarea-wrapper.disabled').length === 0, 'textarea is enabled');
+  });
+});
diff --git a/test/javascripts/acceptance/dashboard-next-test.js.es6 b/test/javascripts/acceptance/dashboard-next-test.js.es6
new file mode 100644
index 00000000000..46d50d0087a
--- /dev/null
+++ b/test/javascripts/acceptance/dashboard-next-test.js.es6
@@ -0,0 +1,22 @@
+import {
+  acceptance
+}
+from "helpers/qunit-helpers";
+
+acceptance("Dashboard Next", {
+  loggedIn: true
+});
+
+QUnit.test("Visit dashboard next page", assert => {
+  visit("/admin");
+
+  andThen(() => {
+    assert.ok($('.dashboard-next').length, "has dashboard-next class");
+
+    assert.ok($('.dashboard-mini-chart.signups').length, "has a signups chart");
+    assert.ok($('.dashboard-mini-chart.posts').length, "has a posts chart");
+    assert.ok($('.dashboard-mini-chart.dau_by_mau').length, "has a dau_by_mau chart");
+    assert.ok($('.dashboard-mini-chart.daily_engaged_users').length, "has a daily_engaged_users chart");
+    assert.ok($('.dashboard-mini-chart.new_contributors').length, "has a new_contributors chart");
+  });
+});
diff --git a/test/javascripts/acceptance/forgot-password-test.js.es6 b/test/javascripts/acceptance/forgot-password-test.js.es6
new file mode 100644
index 00000000000..19a0d39c6bc
--- /dev/null
+++ b/test/javascripts/acceptance/forgot-password-test.js.es6
@@ -0,0 +1,87 @@
+import { acceptance } from "helpers/qunit-helpers";
+
+let userFound = false;
+
+acceptance("Forgot password", {
+  beforeEach() {
+    const response = object => {
+      return [
+        200,
+        { "Content-Type": "application/json" },
+        object
+      ];
+    };
+
+    server.post('/session/forgot_password', () => { // eslint-disable-line no-undef
+      return response({ "user_found": userFound });
+    });
+  }
+});
+
+QUnit.test("requesting password reset", assert => {
+  visit("/");
+  click("header .login-button");
+  click('#forgot-password-link');
+
+  andThen(() => {
+    assert.equal(
+      find('.forgot-password-reset').attr("disabled"),
+      "disabled",
+      'it should disable the button until the field is filled'
+    );
+  });
+
+  fillIn("#username-or-email", 'someuser');
+  click('.forgot-password-reset');
+
+  andThen(() => {
+    assert.equal(
+      find(".alert-error").html().trim(),
+      I18n.t('forgot_password.complete_username_not_found', { username: 'someuser' }),
+      'it should display an error for an invalid username'
+    );
+  });
+
+  fillIn("#username-or-email", 'someuser@gmail.com');
+  click('.forgot-password-reset');
+
+  andThen(() => {
+    assert.equal(
+      find(".alert-error").html().trim(),
+      I18n.t('forgot_password.complete_email_not_found', { email: 'someuser@gmail.com' }),
+      'it should display an error for an invalid email'
+    );
+  });
+
+  fillIn("#username-or-email", 'someuser');
+
+  andThen(() => {
+    userFound = true;
+  });
+
+  click('.forgot-password-reset');
+
+  andThen(() => {
+    assert.notOk(exists(find(".alert-error")), 'it should remove the flash error when succeeding');
+
+    assert.equal(
+      find(".modal-body").html().trim(),
+      I18n.t('forgot_password.complete_username_found', { username: 'someuser' }),
+      'it should display a success message for a valid username'
+    );
+  });
+
+  visit("/");
+  click("header .login-button");
+  click('#forgot-password-link');
+  fillIn("#username-or-email", 'someuser@gmail.com');
+  click('.forgot-password-reset');
+
+  andThen(() => {
+    assert.equal(
+      find(".modal-body").html().trim(),
+      I18n.t('forgot_password.complete_email_found', { email: 'someuser@gmail.com' }),
+      'it should display a success message for a valid email'
+    );
+  });
+});
diff --git a/test/javascripts/acceptance/group-card-mobile-test.js.es6 b/test/javascripts/acceptance/group-card-mobile-test.js.es6
new file mode 100644
index 00000000000..33204c89629
--- /dev/null
+++ b/test/javascripts/acceptance/group-card-mobile-test.js.es6
@@ -0,0 +1,15 @@
+import { acceptance } from "helpers/qunit-helpers";
+
+acceptance("Group Card - Mobile", { mobileView: true });
+
+QUnit.test("group card", assert => {
+  visit('/t/301/1');
+
+  assert.ok(invisible('#group-card'), 'user card is invisible by default');
+  click('a.mention-group:first');
+
+  andThen(() => {
+    assert.ok(visible('.group-details-container'), 'group page show be shown');
+  });
+
+});
diff --git a/test/javascripts/acceptance/group-card-test.js.es6 b/test/javascripts/acceptance/group-card-test.js.es6
new file mode 100644
index 00000000000..15389afd12b
--- /dev/null
+++ b/test/javascripts/acceptance/group-card-test.js.es6
@@ -0,0 +1,15 @@
+import { acceptance } from "helpers/qunit-helpers";
+
+acceptance("Group Card");
+
+QUnit.test("group card", assert => {
+  visit('/t/301/1');
+
+  assert.ok(invisible('#group-card'), 'user card is invisible by default');
+  click('a.mention-group:first');
+
+  andThen(() => {
+    assert.ok(visible('#group-card'), 'card should appear');
+  });
+
+});
diff --git a/test/javascripts/acceptance/group-edit-test.js.es6 b/test/javascripts/acceptance/group-edit-test.js.es6
deleted file mode 100644
index 4b1f3f987e8..00000000000
--- a/test/javascripts/acceptance/group-edit-test.js.es6
+++ /dev/null
@@ -1,64 +0,0 @@
-import { acceptance, logIn } from "helpers/qunit-helpers";
-
-acceptance("Editing Group");
-
-QUnit.test("Editing group", assert => {
-  logIn();
-  Discourse.reset();
-
-  visit("/groups/discourse/edit");
-
-  andThen(() => {
-    assert.ok(find('.group-flair-inputs').length === 1, 'it should display avatar flair inputs');
-    assert.ok(find('.group-edit-bio').length === 1, 'it should display group bio input');
-    assert.ok(find('.group-edit-full-name').length === 1, 'it should display group full name input');
-
-    assert.ok(
-      find('.group-edit-public-admission').length === 1,
-      'it should display group public admission input'
-    );
-
-    assert.ok(
-      find('.group-edit-public-exit').length === 1,
-      'it should display group public exit input'
-    );
-
-    assert.ok(find('.group-edit-allow-membership-requests').length === 1, 'it should display group allow_membership_requets input');
-    assert.ok(find('.group-members-input .item').length === 7, 'it should display group members');
-    assert.ok(find('.group-members-input-selector').length === 1, 'it should display input to add group members');
-    assert.ok(find('.group-members-input-selector .add[disabled]').length === 1, 'add members button should be disabled');
-
-    assert.ok(
-      find('.group-edit-allow-membership-requests[disabled]').length === 1,
-      'it should disable group allow_membership_request input'
-    );
-  });
-
-  click('.group-edit-public-admission');
-  click('.group-edit-allow-membership-requests');
-
-  andThen(() => {
-    assert.ok(
-      find('.group-edit-public-admission[disabled]').length === 1,
-      'it should disable group public admission input'
-    );
-
-    assert.ok(
-      find('.group-edit-public-exit[disabled]').length === 0,
-      'it should not disable group public exit input'
-    );
-
-    assert.equal(
-      find('.group-edit-membership-request-template').length, 1,
-      'it should display the membership request template field'
-    );
-  });
-});
-
-QUnit.test("Editing group as an anonymous user", assert => {
-  visit("/groups/discourse/edit");
-
-  andThen(() => {
-    assert.ok(count('.group-members tr') > 0, "it should redirect to members page for an anonymous user");
-  });
-});
diff --git a/test/javascripts/acceptance/group-index-test.js.es6 b/test/javascripts/acceptance/group-index-test.js.es6
new file mode 100644
index 00000000000..dbb768639c2
--- /dev/null
+++ b/test/javascripts/acceptance/group-index-test.js.es6
@@ -0,0 +1,59 @@
+import { acceptance, logIn, replaceCurrentUser } from "helpers/qunit-helpers";
+
+acceptance("Group Members");
+
+QUnit.test("Viewing Members as anon user", assert => {
+  visit("/groups/discourse");
+
+  andThen(() => {
+    assert.ok(count('.avatar-flair .fa-adjust') === 1, "it displays the group's avatar flair");
+    assert.ok(count('.group-members tr') > 0, "it lists group members");
+
+    assert.ok(
+      count('.group-member-dropdown') === 0,
+      'it does not allow anon user to manage group members'
+    );
+
+    assert.equal(
+      find('.group-username-filter').attr('placeholder'),
+      I18n.t('groups.members.filter_placeholder'),
+      'it should display the right filter placehodler'
+    );
+  });
+});
+
+QUnit.test("Viewing Members as a group owner", assert => {
+  logIn();
+  Discourse.reset();
+  replaceCurrentUser({ admin: false, staff: false });
+
+  visit("/groups/discourse");
+  click('.group-members-add');
+
+  andThen(() => {
+    assert.equal(
+      find('#group-add-members-user-selector').length, 1,
+      'it should display the add members modal'
+    );
+  });
+});
+
+QUnit.test("Viewing Members as an admin user", assert => {
+  logIn();
+  Discourse.reset();
+
+  visit("/groups/discourse");
+
+  andThen(() => {
+    assert.ok(
+      count('.group-member-dropdown') > 0,
+      'it allows admin user to manage group members'
+    );
+
+    assert.equal(
+      find('.group-username-filter').attr('placeholder'),
+      I18n.t('groups.members.filter_placeholder_admin'),
+      'it should display the right filter placehodler'
+    );
+  });
+});
diff --git a/test/javascripts/acceptance/group-manage-interaction-test.js.es6 b/test/javascripts/acceptance/group-manage-interaction-test.js.es6
new file mode 100644
index 00000000000..59793c1a8ed
--- /dev/null
+++ b/test/javascripts/acceptance/group-manage-interaction-test.js.es6
@@ -0,0 +1,71 @@
+import { acceptance, replaceCurrentUser } from "helpers/qunit-helpers";
+
+acceptance("Managing Group Interaction Settings", {
+  loggedIn: true,
+  settings: {
+    email_in: true
+  }
+});
+
+QUnit.test("As an admin", assert => {
+  visit("/groups/discourse/manage/interaction");
+
+  andThen(() => {
+    assert.equal(
+      find('.groups-form-visibility-level').length, 1,
+      'it should display visibility level selector'
+    );
+
+    assert.equal(
+      find('.groups-form-mentionable-level').length, 1,
+      'it should display mentionable level selector'
+    );
+
+    assert.equal(
+      find('.groups-form-messageable-level').length, 1,
+      'it should display messageable level selector'
+    );
+
+    assert.equal(
+      find('.groups-form-incoming-email').length, 1,
+      'it should display incoming email input'
+    );
+
+    assert.equal(
+      find('.groups-form-default-notification-level').length, 1,
+      'it should display default notification level input'
+    );
+  });
+});
+
+QUnit.test("As a group owner", assert => {
+  replaceCurrentUser({ admin: false, staff: false });
+  visit("/groups/discourse/manage/interaction");
+
+  andThen(() => {
+    assert.equal(
+      find('.groups-form-visibility-level').length, 0,
+      'it should display visibility level selector'
+    );
+
+    assert.equal(
+      find('.groups-form-mentionable-level').length, 1,
+      'it should display mentionable level selector'
+    );
+
+    assert.equal(
+      find('.groups-form-messageable-level').length, 1,
+      'it should display messageable level selector'
+    );
+
+    assert.equal(
+      find('.groups-form-incoming-email').length, 0,
+      'it should not display incoming email input'
+    );
+
+    assert.equal(
+      find('.groups-form-default-notification-level').length, 1,
+      'it should display default notification level input'
+    );
+  });
+});
diff --git a/test/javascripts/acceptance/group-logs-test.js.es6 b/test/javascripts/acceptance/group-manage-logs-test.js.es6
similarity index 65%
rename from test/javascripts/acceptance/group-logs-test.js.es6
rename to test/javascripts/acceptance/group-manage-logs-test.js.es6
index 86d760cb0c2..95c76dc70a6 100644
--- a/test/javascripts/acceptance/group-logs-test.js.es6
+++ b/test/javascripts/acceptance/group-manage-logs-test.js.es6
@@ -1,6 +1,6 @@
 import { acceptance } from "helpers/qunit-helpers";
 
-acceptance("Group Logs", {
+acceptance("Group logs", {
   loggedIn: true,
   beforeEach() {
     const response = object => {
@@ -12,7 +12,7 @@ acceptance("Group Logs", {
     };
 
     server.get('/groups/snorlax.json', () => { // eslint-disable-line no-undef
-      return response({"basic_group":{"id":41,"automatic":false,"name":"snorlax","user_count":1,"alias_level":0,"visible":true,"automatic_membership_email_domains":"","automatic_membership_retroactive":false,"primary_group":true,"title":"Team Snorlax","grant_trust_level":null,"incoming_email":null,"has_messages":false,"flair_url":"","flair_bg_color":"","flair_color":"","bio_raw":"","bio_cooked":null,"public":true,"is_group_user":true,"is_group_owner":true}});
+      return response({"group":{"id":41,"automatic":false,"name":"snorlax","user_count":1,"alias_level":0,"visible":true,"automatic_membership_email_domains":"","automatic_membership_retroactive":false,"primary_group":true,"title":"Team Snorlax","grant_trust_level":null,"incoming_email":null,"has_messages":false,"flair_url":"","flair_bg_color":"","flair_color":"","bio_raw":"","bio_cooked":null,"public":true,"is_group_user":true,"is_group_owner":true}});
     });
 
     // Workaround while awaiting https://github.com/tildeio/route-recognizer/issues/53
@@ -27,14 +27,14 @@ acceptance("Group Logs", {
 });
 
 QUnit.test("Browsing group logs", assert => {
-  visit("/groups/snorlax/logs");
+  visit("/groups/snorlax/manage/logs");
 
   andThen(() => {
-    assert.ok(find('tr.group-logs-row').length === 2, 'it should display the right number of logs');
-    click(find(".group-logs-row button")[0]);
+    assert.ok(find('tr.group-manage-logs-row').length === 2, 'it should display the right number of logs');
+    click(find(".group-manage-logs-row button")[0]);
   });
 
   andThen(() => {
-    assert.ok(find('tr.group-logs-row').length === 1, 'it should display the right number of logs');
+    assert.ok(find('tr.group-manage-logs-row').length === 1, 'it should display the right number of logs');
   });
-});
\ No newline at end of file
+});
diff --git a/test/javascripts/acceptance/group-manage-membership-test.js.es6 b/test/javascripts/acceptance/group-manage-membership-test.js.es6
new file mode 100644
index 00000000000..5b1dad16e5e
--- /dev/null
+++ b/test/javascripts/acceptance/group-manage-membership-test.js.es6
@@ -0,0 +1,119 @@
+import { acceptance, replaceCurrentUser } from "helpers/qunit-helpers";
+
+acceptance("Managing Group Membership", {
+  loggedIn: true
+});
+
+QUnit.test("As an admin", assert => {
+  visit("/groups/discourse/manage/membership");
+
+  andThen(() => {
+    assert.ok(
+      find('label[for="automatic_membership"]').length === 1,
+      'it should display automatic membership label'
+    );
+
+    assert.ok(
+      find('.groups-form-automatic-membership-retroactive').length === 1,
+      'it should display automatic membership retroactive checkbox'
+    );
+
+    assert.ok(
+      find('.groups-form-primary-group').length === 1,
+      'it should display set as primary group checkbox'
+    );
+
+    assert.ok(
+      find('.groups-form-grant-trust-level').length === 1,
+      'it should display grant trust level selector'
+    );
+
+    assert.ok(
+      find('.group-form-public-admission').length === 1,
+      'it should display group public admission input'
+    );
+
+    assert.ok(
+      find('.group-form-public-exit').length === 1,
+      'it should display group public exit input'
+    );
+
+    assert.ok(
+      find('.group-form-allow-membership-requests').length === 1,
+      'it should display group allow_membership_request input'
+    );
+
+    assert.ok(
+      find('.group-form-allow-membership-requests[disabled]').length === 1,
+      'it should disable group allow_membership_request input'
+    );
+  });
+
+  click('.group-form-public-admission');
+  click('.group-form-allow-membership-requests');
+
+  andThen(() => {
+    assert.ok(
+      find('.group-form-public-admission[disabled]').length === 1,
+      'it should disable group public admission input'
+    );
+
+    assert.ok(
+      find('.group-form-public-exit[disabled]').length === 0,
+      'it should not disable group public exit input'
+    );
+
+    assert.equal(
+      find('.group-form-membership-request-template').length, 1,
+      'it should display the membership request template field'
+    );
+  });
+});
+
+QUnit.test("As a group owner", assert => {
+  replaceCurrentUser({ staff: false, admin: false });
+
+  visit("/groups/discourse/manage/membership");
+
+  andThen(() => {
+    assert.ok(
+      find('label[for="automatic_membership"]').length === 0,
+      'it should not display automatic membership label'
+    );
+
+    assert.ok(
+      find('.groups-form-automatic-membership-retroactive').length === 0,
+      'it should not display automatic membership retroactive checkbox'
+    );
+
+    assert.ok(
+      find('.groups-form-primary-group').length === 0,
+      'it should not display set as primary group checkbox'
+    );
+
+    assert.ok(
+      find('.groups-form-grant-trust-level').length === 0,
+      'it should not display grant trust level selector'
+    );
+
+    assert.ok(
+      find('.group-form-public-admission').length === 1,
+      'it should display group public admission input'
+    );
+
+    assert.ok(
+      find('.group-form-public-exit').length === 1,
+      'it should display group public exit input'
+    );
+
+    assert.ok(
+      find('.group-form-allow-membership-requests').length === 1,
+      'it should display group allow_membership_request input'
+    );
+
+    assert.ok(
+      find('.group-form-allow-membership-requests[disabled]').length === 1,
+      'it should disable group allow_membership_request input'
+    );
+  });
+});
diff --git a/test/javascripts/acceptance/group-manage-profile-test.js.es6 b/test/javascripts/acceptance/group-manage-profile-test.js.es6
new file mode 100644
index 00000000000..f8e42d29727
--- /dev/null
+++ b/test/javascripts/acceptance/group-manage-profile-test.js.es6
@@ -0,0 +1,40 @@
+import { acceptance, logIn, replaceCurrentUser } from "helpers/qunit-helpers";
+
+acceptance("Managing Group Profile");
+
+QUnit.test("As an admin", assert => {
+  logIn();
+  Discourse.reset();
+
+  visit("/groups/discourse/manage/profile");
+
+  andThen(() => {
+    assert.ok(find('.group-flair-inputs').length === 1, 'it should display avatar flair inputs');
+    assert.ok(find('.group-form-bio').length === 1, 'it should display group bio input');
+    assert.ok(find('.group-form-name').length === 1, 'it should display group name input');
+    assert.ok(find('.group-form-full-name').length === 1, 'it should display group full name input');
+  });
+});
+
+QUnit.test("As a group owner", assert => {
+  logIn();
+  Discourse.reset();
+  replaceCurrentUser({ staff: false, admin: false });
+
+  visit("/groups/discourse/manage/profile");
+
+  andThen(() => {
+    assert.equal(
+      find('.group-form-name').length, 0,
+      'it should not display group name input'
+    );
+  });
+});
+
+QUnit.test("As an anonymous user", assert => {
+  visit("/groups/discourse/manage/profile");
+
+  andThen(() => {
+    assert.ok(count('.group-members tr') > 0, "it should redirect to members page for an anonymous user");
+  });
+});
diff --git a/test/javascripts/acceptance/group-test.js.es6 b/test/javascripts/acceptance/group-test.js.es6
new file mode 100644
index 00000000000..a119b5aa4cb
--- /dev/null
+++ b/test/javascripts/acceptance/group-test.js.es6
@@ -0,0 +1,176 @@
+import { acceptance, logIn } from "helpers/qunit-helpers";
+
+acceptance("Group", {
+  settings: {
+    enable_group_directory: true
+  }
+});
+
+const response = object => {
+  return [
+    200,
+    { "Content-Type": "application/json" },
+    object
+  ];
+};
+
+QUnit.test("Anonymous Viewing Group", async assert => {
+  await visit("/groups/discourse");
+
+  assert.equal(
+    count(".nav-pills li a[title='Messages']"),
+    0,
+    'it deos not show group messages navigation link'
+  );
+
+  await click(".nav-pills li a[title='Activity']");
+
+  assert.ok(count('.user-stream-item') > 0, "it lists stream items");
+
+  await click(".activity-nav li a[href='/groups/discourse/activity/topics']");
+
+  assert.ok(find('.topic-list'), "it shows the topic list");
+  assert.equal(count('.topic-list-item'), 2, "it lists stream items");
+
+  await click(".activity-nav li a[href='/groups/discourse/activity/mentions']");
+
+  assert.ok(count('.user-stream-item') > 0, "it lists stream items");
+  assert.ok(find(".nav-pills li a[title='Edit Group']").length === 0, 'it should not show messages tab if user is not admin');
+  assert.ok(find(".nav-pills li a[title='Logs']").length === 0, 'it should not show Logs tab if user is not admin');
+  assert.ok(count('.user-stream-item') > 0, "it lists stream items");
+
+  await expandSelectKit('.group-dropdown');
+
+  assert.equal(
+    find('.select-kit-row').text().trim(), 'discourse',
+    'it displays the right row'
+  );
+
+  assert.equal(
+    find('.group-dropdown-filter').text().trim(), I18n.t("groups.index.all").toLowerCase(),
+    'it displays the right header'
+  );
+
+  Discourse.SiteSettings.enable_group_directory = false;
+
+  await visit("/groups");
+  await visit("/groups/discourse");
+  await expandSelectKit('.group-dropdown');
+
+  assert.equal(
+    find('.group-dropdown-filter').length, 0,
+    'it should not display the default header'
+  );
+});
+
+QUnit.test("Anonymous Viewing Automatic Group", assert => {
+  visit("/groups/moderators");
+
+  andThen(() => {
+    assert.equal(
+      count(".nav-pills li a[title='Manage']"),
+      0,
+      'it deos not show group messages navigation link'
+    );
+  });
+});
+
+QUnit.test("User Viewing Group", assert => {
+  logIn();
+  Discourse.reset();
+
+  visit("/groups");
+  click('.group-index-request');
+
+  server.post('/groups/Macdonald/request_membership', () => { // eslint-disable-line no-undef
+    return [
+      200,
+      { "Content-Type": "application/json" },
+      { relative_url: '/t/internationalization-localization/280' }
+    ];
+  });
+
+  andThen(() => {
+    assert.equal(find('.modal-header').text().trim(), I18n.t(
+      'groups.membership_request.title', { group_name: 'Macdonald' }
+    ));
+
+    assert.equal(find('.request-group-membership-form textarea').val(), 'Please add me');
+  });
+
+  click('.modal-footer .btn-primary');
+
+  andThen(() => {
+    assert.equal(
+      find('.fancy-title').text().trim(),
+      "Internationalization / localization"
+    );
+  });
+
+  visit("/groups/discourse");
+
+  click('.group-message-button');
+
+  andThen(() => {
+    assert.ok(count('#reply-control') === 1, 'it opens the composer');
+    assert.equal(find('.ac-wrap .item').text(), 'discourse', 'it prefills the group name');
+  });
+});
+
+QUnit.test("Admin viewing group messages when there are no messages", assert => {
+  server.get('/topics/private-messages-group/eviltrout/discourse.json', () => { // eslint-disable-line no-undef
+    return response({ topic_list: { topics: [] } });
+  });
+
+  logIn();
+  Discourse.reset();
+
+  visit("/groups/discourse");
+
+  click(".nav-pills li a[title='Messages']");
+
+  andThen(() => {
+    assert.equal(
+      find(".alert").text().trim(),
+      I18n.t('choose_topic.none_found'),
+      'it should display the right alert'
+    );
+  });
+});
+
+QUnit.test("Admin viewing group messages", assert => {
+  server.get('/topics/private-messages-group/eviltrout/discourse.json', () => { // eslint-disable-line no-undef
+    return response({"users":[{"id":2, "username":"bruce1", "avatar_template":"/user_avatar/meta.discourse.org/bruce1/{size}/5245.png"}, {"id":3, "username":"CodingHorror", "avatar_template":"/user_avatar/meta.discourse.org/codinghorror/{size}/5245.png"}], "primary_groups":[], "topic_list":{"can_create_topic":true, "draft":null, "draft_key":"new_topic", "draft_sequence":0, "per_page":30, "topics":[{"id":12199, "title":"This is a private message 1", "fancy_title":"This is a private message 1", "slug":"this-is-a-private-message-1", "posts_count":0, "reply_count":0, "highest_post_number":0, "image_url":null, "created_at":"2018-03-16T03:38:45.583Z", "last_posted_at":null, "bumped":true, "bumped_at":"2018-03-16T03:38:45.583Z", "unseen":false, "pinned":false, "unpinned":null, "visible":true, "closed":false, "archived":false, "bookmarked":null, "liked":null, "views":0, "like_count":0, "has_summary":false, "archetype":"private_message", "last_poster_username":"bruce1", "category_id":null, "pinned_globally":false, "featured_link":null, "posters":[{"extras":"latest single", "description":"Original Poster, Most Recent Poster", "user_id":2, "primary_group_id":null}], "participants":[{"extras":"latest", "description":null, "user_id":2, "primary_group_id":null}, {"extras":null, "description":null, "user_id":3, "primary_group_id":null}]}]}});
+  });
+
+  logIn();
+  Discourse.reset();
+
+  visit("/groups/discourse");
+  click(".nav-pills li a[title='Messages']");
+
+  andThen(() => {
+    assert.equal(
+      find(".topic-list-item .link-top-line").text().trim(),
+      "This is a private message 1",
+      'it should display the list of group topics'
+    );
+  });
+});
+
+QUnit.test("Admin Viewing Group", assert => {
+  logIn();
+  Discourse.reset();
+
+  visit("/groups/discourse");
+
+  andThen(() => {
+    assert.ok(
+      find(".nav-pills li a[title='Manage']").length === 1,
+      'it should show manage group tab if user is admin'
+    );
+
+    assert.equal(count('.group-message-button'), 1, 'it displays show group message button');
+    assert.equal(find('.group-info-name').text(), 'Awesome Team', 'it should display the group name');
+  });
+});
diff --git a/test/javascripts/acceptance/groups-index-test.js.es6 b/test/javascripts/acceptance/groups-index-test.js.es6
new file mode 100644
index 00000000000..503372269fc
--- /dev/null
+++ b/test/javascripts/acceptance/groups-index-test.js.es6
@@ -0,0 +1,43 @@
+import { acceptance } from "helpers/qunit-helpers";
+
+acceptance("Groups");
+
+QUnit.test("Browsing Groups", assert => {
+  visit("/groups");
+
+  andThen(() => {
+    assert.equal(count('.groups-table-row'), 2, 'it displays visible groups');
+    assert.equal(find('.group-index-join').length, 1, 'it shows button to join group');
+    assert.equal(find('.group-index-request').length, 1, 'it shows button to request for group membership');
+  });
+
+  click('.group-index-join');
+
+  andThen(() => {
+    assert.ok(exists('.modal.login-modal'), 'it shows the login modal');
+  });
+
+  click('.login-modal .close');
+
+  andThen(() => {
+    assert.ok(invisible('.modal.login-modal'), 'it closes the login modal');
+  });
+
+  click('.group-index-request');
+
+  andThen(() => {
+    assert.ok(exists('.modal.login-modal'), 'it shows the login modal');
+  });
+
+  click("a[href='/groups/discourse/members']");
+
+  andThen(() => {
+    assert.equal(find('.group-info-name').text().trim(), 'Awesome Team', "it displays the group page");
+  });
+
+  click('.group-index-join');
+
+  andThen(() => {
+    assert.ok(exists('.modal.login-modal'), 'it shows the login modal');
+  });
+});
diff --git a/test/javascripts/acceptance/groups-new-test.js.es6 b/test/javascripts/acceptance/groups-new-test.js.es6
new file mode 100644
index 00000000000..423f189abd9
--- /dev/null
+++ b/test/javascripts/acceptance/groups-new-test.js.es6
@@ -0,0 +1,80 @@
+import { acceptance, logIn } from "helpers/qunit-helpers";
+
+acceptance("New Group");
+
+QUnit.test("As an anon user", assert => {
+  visit("/groups");
+
+  andThen(() => {
+    assert.equal(
+      find('.groups-header-new').length, 0,
+      'it should not display the button to create a group'
+    );
+  });
+});
+
+QUnit.test("Creating a new group", assert => {
+  logIn();
+  Discourse.reset();
+
+  visit("/groups");
+
+  click(".groups-header-new");
+
+  andThen(() => {
+    assert.equal(
+      find('.group-form-save[disabled]').length, 1,
+      'save button should be disabled'
+    );
+  });
+
+  fillIn("input[name='name']", '1');
+
+  andThen(() => {
+    assert.equal(
+      find('.tip.bad').text().trim(), I18n.t("admin.groups.new.name.too_short"),
+      'it should show the right validation tooltip'
+    );
+
+    assert.ok(
+      find(".group-form-save:disabled").length === 1,
+      'it should disable the save button'
+    );
+  });
+
+  fillIn("input[name='name']", 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');
+
+  andThen(() => {
+    assert.equal(
+      find('.tip.bad').text().trim(), I18n.t("admin.groups.new.name.too_long"),
+      'it should show the right validation tooltip'
+    );
+  });
+
+  fillIn("input[name='name']", '');
+
+  andThen(() => {
+    assert.equal(
+      find('.tip.bad').text().trim(), I18n.t("admin.groups.new.name.blank"),
+      'it should show the right validation tooltip'
+    );
+  });
+
+  fillIn("input[name='name']", 'goodusername');
+
+  andThen(() => {
+    assert.equal(
+      find('.tip.good').text().trim(), I18n.t("admin.groups.new.name.available"),
+      'it should show the right validation tooltip'
+    );
+  });
+
+  click(".group-form-public-admission");
+
+  andThen(() => {
+    assert.equal(
+      find('groups-new-allow-membership-requests').length, 0,
+      'it should disable the membership requests checkbox'
+    );
+  });
+});
diff --git a/test/javascripts/acceptance/groups-test.js.es6 b/test/javascripts/acceptance/groups-test.js.es6
deleted file mode 100644
index 4e098f31694..00000000000
--- a/test/javascripts/acceptance/groups-test.js.es6
+++ /dev/null
@@ -1,148 +0,0 @@
-import { acceptance, logIn } from "helpers/qunit-helpers";
-
-acceptance("Groups");
-
-QUnit.test("Browsing Groups", assert => {
-  visit("/groups");
-
-  andThen(() => {
-    assert.equal(count('.groups-table-row'), 2, 'it displays visible groups');
-    assert.equal(find('.group-index-join').length, 1, 'it shows button to join group');
-    assert.equal(find('.group-index-request').length, 1, 'it shows button to request for group membership');
-  });
-
-  click('.group-index-join');
-
-  andThen(() => {
-    assert.ok(exists('.modal.login-modal'), 'it shows the login modal');
-  });
-
-  click('.login-modal .close');
-
-  andThen(() => {
-    assert.ok(invisible('.modal.login-modal'), 'it closes the login modal');
-  });
-
-  click('.group-index-request');
-
-  andThen(() => {
-    assert.ok(exists('.modal.login-modal'), 'it shows the login modal');
-  });
-
-  click("a[href='/groups/discourse/members']");
-
-  andThen(() => {
-    assert.equal(find('.group-info-name').text().trim(), 'Awesome Team', "it displays the group page");
-  });
-
-  click('.group-index-join');
-
-  andThen(() => {
-    assert.ok(exists('.modal.login-modal'), 'it shows the login modal');
-  });
-});
-
-QUnit.test("Anonymous Viewing Group", assert => {
-  visit("/groups/discourse");
-
-  andThen(() => {
-    assert.ok(count('.avatar-flair .fa-adjust') === 1, "it displays the group's avatar flair");
-    assert.ok(count('.group-members tr') > 0, "it lists group members");
-    assert.ok(count('.group-message-button') === 0, 'it does not show group message button');
-  });
-
-  click(".nav-pills li a[title='Activity']");
-
-  andThen(() => {
-    assert.ok(count('.group-post') > 0, "it lists stream items");
-  });
-
-  click(".group-activity-nav li a[href='/groups/discourse/activity/topics']");
-
-  andThen(() => {
-    assert.ok(count('.group-post') > 0, "it lists stream items");
-  });
-
-  click(".group-activity-nav li a[href='/groups/discourse/activity/mentions']");
-
-  andThen(() => {
-    assert.ok(count('.group-post') > 0, "it lists stream items");
-  });
-
-  andThen(() => {
-    assert.equal(
-      find(".group-activity li a[href='/groups/discourse/activity/messages']").length,
-      0,
-      'it should not show messages tab if user is not a group user or admin'
-    );
-    assert.ok(find(".nav-pills li a[title='Edit Group']").length === 0, 'it should not show messages tab if user is not admin');
-    assert.ok(find(".nav-pills li a[title='Logs']").length === 0, 'it should not show Logs tab if user is not admin');
-    assert.ok(count('.group-post') > 0, "it lists stream items");
-  });
-});
-
-QUnit.test("User Viewing Group", assert => {
-  logIn();
-  Discourse.reset();
-
-  visit("/groups");
-  click('.group-index-request');
-
-  server.post('/groups/Macdonald/request_membership', () => { // eslint-disable-line no-undef
-    return [
-      200,
-      { "Content-Type": "application/json" },
-      { relative_url: '/t/internationalization-localization/280' }
-    ];
-  });
-
-  andThen(() => {
-    assert.equal(find('.modal-header').text().trim(), I18n.t(
-      'groups.membership_request.title', { group_name: 'Macdonald' }
-    ));
-
-    assert.equal(find('.request-group-membership-form textarea').val(), 'Please add me');
-  });
-
-  click('.modal-footer .btn-primary');
-
-  andThen(() => {
-    assert.equal(
-      find('.fancy-title').text().trim(),
-      "Internationalization / localization"
-    );
-  });
-
-  visit("/groups/discourse");
-
-  click('.group-message-button');
-
-  andThen(() => {
-    assert.ok(count('#reply-control') === 1, 'it opens the composer');
-    assert.equal(find('.ac-wrap .item').text(), 'discourse', 'it prefills the group name');
-  });
-});
-
-QUnit.test("Admin Viewing Group", assert => {
-  logIn();
-  Discourse.reset();
-
-  visit("/groups/discourse");
-
-  andThen(() => {
-    assert.ok(find(".nav-pills li a[title='Edit Group']").length === 1, 'it should show edit group tab if user is admin');
-    assert.ok(find(".nav-pills li a[title='Logs']").length === 1, 'it should show Logs tab if user is admin');
-    assert.equal(count('.group-message-button'), 1, 'it displays show group message button');
-    assert.equal(find('.group-info-name').text(), 'Awesome Team', 'it should display the group name');
-  });
-
-  click(".nav-pills li a[title='Activity']");
-
-  andThen(() => {
-    assert.equal(
-      find(".group-activity li a[href='/groups/discourse/activity/messages']").length,
-      1,
-      'it should show messages tab if user is admin'
-    );
-  });
-});
diff --git a/test/javascripts/acceptance/login-with-email-test.js.es6 b/test/javascripts/acceptance/login-with-email-test.js.es6
new file mode 100644
index 00000000000..ecd8f161d72
--- /dev/null
+++ b/test/javascripts/acceptance/login-with-email-test.js.es6
@@ -0,0 +1,153 @@
+import { acceptance } from "helpers/qunit-helpers";
+
+let userFound = false;
+
+acceptance("Login with email", {
+  settings: {
+    enable_local_logins_via_email: true,
+    enable_facebook_logins: true
+  },
+  beforeEach() {
+    const response = object => {
+      return [
+        200,
+        { "Content-Type": "application/json" },
+        object
+      ];
+    };
+
+    server.post('/u/email-login', () => { // eslint-disable-line no-undef
+      return response({ "success": "OK", "user_found": userFound });
+    });
+  }
+});
+
+QUnit.test("logging in via email (link)", assert => {
+  visit("/");
+  click("header .login-button");
+
+  andThen(() => {
+    assert.notOk(exists(".login-with-email-link"), 'it displays the link only when field is filled');
+    userFound = false;
+  });
+
+  fillIn("#login-account-name", "someuser");
+  click(".login-with-email-link");
+
+  andThen(() => {
+    assert.equal(
+      find(".alert-error").html(),
+      I18n.t('email_login.complete_username_not_found', { username: 'someuser' }),
+      'it should display an error for an invalid username'
+    );
+  });
+
+  fillIn("#login-account-name", 'someuser@gmail.com');
+  click('.login-with-email-link');
+
+  andThen(() => {
+    assert.equal(
+      find(".alert-error").html(),
+      I18n.t('email_login.complete_email_not_found', { email: 'someuser@gmail.com' }),
+      'it should display an error for an invalid email'
+    );
+  });
+
+  fillIn("#login-account-name", 'someuser');
+
+  andThen(() => {
+    userFound = true;
+  });
+
+  click('.login-with-email-link');
+
+  andThen(() => {
+    assert.equal(
+      find(".alert-success").html().trim(),
+      I18n.t('email_login.complete_username_found', { username: 'someuser' }),
+      'it should display a success message for a valid username'
+    );
+  });
+
+  visit("/");
+  click("header .login-button");
+  fillIn("#login-account-name", 'someuser@gmail.com');
+  click('.login-with-email-link');
+
+  andThen(() => {
+    assert.equal(
+      find(".alert-success").html().trim(),
+      I18n.t('email_login.complete_email_found', { email: 'someuser@gmail.com' }),
+      'it should display a success message for a valid email'
+    );
+  });
+
+  andThen(() => {
+    userFound = false;
+  });
+});
+
+QUnit.test("logging in via email (button)", assert => {
+  visit("/");
+  click("header .login-button");
+  click('.login-with-email-button');
+
+  andThen(() => {
+    assert.equal(
+      find(".alert-error").html(),
+      I18n.t('login.blank_username'),
+      'it should display an error for blank username'
+    );
+  });
+
+  andThen(() => {
+    userFound = true;
+  });
+
+  fillIn("#login-account-name", 'someuser');
+  click('.login-with-email-button');
+
+  andThen(() => {
+    assert.equal(
+      find(".alert-success").html().trim(),
+      I18n.t('email_login.complete_username_found', { username: 'someuser' }),
+      'it should display a success message for a valid username'
+    );
+  });
+});
+
+acceptance("Login with email", {
+  settings: {
+    enable_local_logins_via_email: true,
+    enable_facebook_logins: true,
+    hide_email_address_taken: true
+  },
+  beforeEach() {
+    const response = object => {
+      return [
+        200,
+        { "Content-Type": "application/json" },
+        object
+      ];
+    };
+
+    server.post('/u/email-login', () => { // eslint-disable-line no-undef
+      return response({ "success": "OK" });
+    });
+  }
+});
+
+QUnit.test("login via email with hide_email_address_taken enabled", assert => {
+  visit("/");
+  click("header .login-button");
+  fillIn("#login-account-name", 'someuser@example.com');
+  click('.login-with-email-button');
+
+  andThen(() => {
+    assert.equal(
+      find(".alert-success").html().trim(),
+      I18n.t('email_login.complete_email_found', { email: 'someuser@example.com' }),
+      'it should display the success message for any email address'
+    );
+  });
+});
diff --git a/test/javascripts/acceptance/password-reset-test.js.es6 b/test/javascripts/acceptance/password-reset-test.js.es6
index 4706b88c29b..b105315b47d 100644
--- a/test/javascripts/acceptance/password-reset-test.js.es6
+++ b/test/javascripts/acceptance/password-reset-test.js.es6
@@ -24,6 +24,25 @@ acceptance("Password Reset", {
         return response({success: "OK", message: I18n.t('password_reset.success')});
       }
     });
+
+    server.get('/u/confirm-email-token/requiretwofactor.json', () => { //eslint-disable-line
+      return response({ success: "OK" });
+    });
+
+    server.put('/u/password-reset/requiretwofactor.json', request => { //eslint-disable-line
+      const body = parsePostData(request.requestBody);
+      if (body.password === "perf3ctly5ecur3" && body.second_factor_token === "123123") {
+        return response({ success: "OK", message: I18n.t('password_reset.success') });
+      } else if (body.second_factor_token === "123123") {
+        return response({ success: false, errors: { password: ["invalid"] } });
+      } else {
+        return response({
+          success: false,
+          message: "invalid token",
+          errors: { user_second_factor: ["invalid token"] }
+        });
+      }
+    });
   }
 });
 
@@ -58,4 +77,45 @@ QUnit.test("Password Reset Page", assert => {
   andThen(() => {
     assert.ok(!exists(".password-reset form"), "form is gone");
   });
-});
\ No newline at end of file
+});
+
+QUnit.test("Password Reset Page With Second Factor", assert => {
+  PreloadStore.store('password_reset', {
+    is_developer: false,
+    second_factor_required: true
+  });
+
+  visit("/u/password-reset/requiretwofactor");
+
+  andThen(() => {
+    assert.notOk(exists("#new-account-password"), "does not show the input");
+    assert.ok(exists("#second-factor"), "shows the second factor prompt");
+  });
+
+  fillIn('#second-factor', '0000');
+  click('.password-reset form button');
+
+  andThen(() => {
+    assert.ok(exists(".alert-error"), "shows 2 factor error");
+
+    assert.ok(
+      find(".alert-error").html().indexOf("invalid token") > -1,
+      "shows server validation error message"
+    );
+  });
+
+  fillIn('#second-factor', '123123');
+  click('.password-reset form button');
+
+  andThen(() => {
+    assert.notOk(exists(".alert-error"), "hides error");
+    assert.ok(exists("#new-account-password"), "shows the input");
+  });
+
+  fillIn('.password-reset input', 'perf3ctly5ecur3');
+  click('.password-reset form button');
+
+  andThen(() => {
+    assert.ok(!exists(".password-reset form"), "form is gone");
+  });
+});
diff --git a/test/javascripts/acceptance/personal-message-test.js.es6 b/test/javascripts/acceptance/personal-message-test.js.es6
new file mode 100644
index 00000000000..eb31bf048ec
--- /dev/null
+++ b/test/javascripts/acceptance/personal-message-test.js.es6
@@ -0,0 +1,26 @@
+import { acceptance } from "helpers/qunit-helpers";
+
+acceptance("Personal Message", {
+  loggedIn: true
+});
+
+QUnit.test("footer edit button", assert => {
+  visit("/t/pm-for-testing/12");
+
+  andThen(() => {
+    assert.ok(!exists('.edit-message'), 'does not show edit first post button on footer by default');
+  });
+});
+
+acceptance("Personal Message Tagging", {
+  loggedIn: true,
+  site: { can_tag_pms: true }
+});
+
+QUnit.test("show footer edit button", assert => {
+  visit("/t/pm-for-testing/12");
+
+  andThen(() => {
+    assert.ok(exists('.edit-message'), 'shows edit first post button on footer when PM tagging is enabled');
+  });
+});
diff --git a/test/javascripts/acceptance/preferences-test.js.es6 b/test/javascripts/acceptance/preferences-test.js.es6
index 0014cefd652..ac9dd14529d 100644
--- a/test/javascripts/acceptance/preferences-test.js.es6
+++ b/test/javascripts/acceptance/preferences-test.js.es6
@@ -1,5 +1,27 @@
 import { acceptance } from "helpers/qunit-helpers";
-acceptance("User Preferences", { loggedIn: true });
+acceptance("User Preferences", {
+  loggedIn: true,
+  beforeEach() {
+    const response = (object) => {
+      return [
+        200,
+        {"Content-Type": "application/json"},
+        object
+      ];
+    };
+
+    server.post('/u/second_factors.json', () => { //eslint-disable-line
+      return response({
+        key: "rcyryaqage3jexfj",
+        qr: '<div id="test-qr">qr-code</div>'
+      });
+    });
+
+    server.put('/u/second_factor.json', () => { //eslint-disable-line
+      return response({ error: 'invalid token' });
+    });
+  }
+});
 
 QUnit.test("update some fields", assert => {
   visit("/u/eviltrout/preferences");
@@ -73,3 +95,45 @@ QUnit.test("email", assert => {
     assert.equal(find('.tip.bad').text().trim(), I18n.t('user.email.invalid'), 'it should display invalid email tip');
   });
 });
+
+QUnit.test("second factor", assert => {
+  visit("/u/eviltrout/preferences/second-factor");
+
+  andThen(() => {
+    assert.ok(exists("#password"), "it has a password input");
+  });
+
+  fillIn('#password', 'secrets');
+  click(".user-content .btn-primary");
+
+  andThen(() => {
+    assert.ok(exists("#test-qr"), "shows qr code");
+    assert.notOk(exists("#password"), "it hides the password input");
+  });
+
+  fillIn("#second-factor-token", '111111');
+  click('.btn-primary');
+
+  andThen(() => {
+    assert.ok(
+      find(".alert-error").html().indexOf("invalid token") > -1,
+      "shows server validation error message"
+    );
+  });
+});
+
+acceptance("User Preferences when badges are disabled", {
+  loggedIn: true,
+  settings: {
+    enable_badges: false
+  }
+});
+
+QUnit.test("visit my preferences", assert => {
+  visit("/u/eviltrout/preferences");
+  andThen(() => {
+    assert.ok($('body.user-preferences-page').length, "has the body class");
+    assert.equal(currentURL(), '/u/eviltrout/preferences/account', "defaults to account tab");
+    assert.ok(exists('.user-preferences'), 'it shows the preferences');
+  });
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/search-full-test.js.es6 b/test/javascripts/acceptance/search-full-test.js.es6
index dba53a92525..61566c00bde 100644
--- a/test/javascripts/acceptance/search-full-test.js.es6
+++ b/test/javascripts/acceptance/search-full-test.js.es6
@@ -40,69 +40,34 @@ acceptance("Search - Full Page", {
   }
 });
 
+
 QUnit.test("perform various searches", assert => {
   visit("/search");
 
   andThen(() => {
     assert.ok($('body.search-page').length, "has body class");
     assert.ok(exists('.search-container'), "has container class");
-    assert.ok(find('input.search').length > 0);
+    assert.ok(find('.search-query').length > 0);
     assert.ok(find('.fps-topic').length === 0);
   });
 
-  fillIn('.search input.full-page-search', 'none');
-  click('.search .btn-primary');
+  fillIn('.search-query', 'none');
+  click('.search-cta');
 
   andThen(() => {
     assert.ok(find('.fps-topic').length === 0, 'has no results');
     assert.ok(find('.no-results-suggestion .google-search-form'));
   });
 
-  fillIn('.search input.full-page-search', 'posts');
-  click('.search .btn-primary');
+  fillIn('.search-query', 'posts');
+  click('.search-cta');
 
   andThen(() => assert.ok(find('.fps-topic').length === 1, 'has one post'));
 });
 
-QUnit.test("open advanced search", assert => {
-  visit("/search");
-
-  andThen(() => assert.ok(exists('.search .search-advanced'), 'shows advanced search panel'));
-
-  fillIn('.search input.full-page-search', 'none');
-  click('.search-advanced-btn');
-
-  andThen(() => assert.ok(visible('.search-advanced .search-advanced-options'), '"search-advanced-options" is visible'));
-});
-
-// these tests are screwy with the runloop
-
-// test("validate population of advanced search", assert => {
-//   visit("/search");
-//   fillIn('.search input.full-page-search', 'test user:admin #bug group:moderators badge:Reader tags:monkey in:likes in:private in:wiki in:bookmarks status:open after:2016-10-05 min_post_count:10');
-//   click('.search-advanced-btn');
-//
-//   andThen(() => {
-//     assert.ok(exists('.search-advanced-options span:contains("admin")'), 'has "admin" pre-populated');
-//     assert.ok(exists('.search-advanced-options .badge-category:contains("bug")'), 'has "bug" pre-populated');
-//     //assert.ok(exists('.search-advanced-options span:contains("moderators")'), 'has "moderators" pre-populated');
-//     //assert.ok(exists('.search-advanced-options span:contains("Reader")'), 'has "Reader" pre-populated');
-//     assert.ok(exists('.search-advanced-options .tag-chooser .tag-monkey'), 'has "monkey" pre-populated');
-//     assert.ok(exists('.search-advanced-options .in-likes:checked'), 'has "I liked" pre-populated');
-//     assert.ok(exists('.search-advanced-options .in-private:checked'), 'has "are in my messages" pre-populated');
-//     assert.ok(exists('.search-advanced-options .in-wiki:checked'), 'has "are wiki" pre-populated');
-//     assert.ok(exists('.search-advanced-options .combobox .select2-choice .select2-chosen:contains("I\'ve bookmarked")'), 'has "I\'ve bookmarked" pre-populated');
-//     assert.ok(exists('.search-advanced-options .combobox .select2-choice .select2-chosen:contains("are open")'), 'has "are open" pre-populated');
-//     assert.ok(exists('.search-advanced-options .combobox .select2-choice .select2-chosen:contains("after")'), 'has "after" pre-populated');
-//     assert.equal(find('.search-advanced-options #search-post-date').val(), "2016-10-05", 'has "2016-10-05" pre-populated');
-//     assert.equal(find('.search-advanced-options #search-min-post-count').val(), "10", 'has "10" pre-populated');
-//   });
-// });
-
 QUnit.test("escape search term", (assert) => {
   visit("/search");
-  fillIn('.search input.full-page-search', '@<script>prompt(1337)</script>gmail.com');
-  click('.search-advanced-btn');
+  fillIn('.search-query', '@<script>prompt(1337)</script>gmail.com');
 
   andThen(() => {
     assert.ok(exists('.search-advanced-options span:contains("<script>prompt(1337)</script>gmail.com")'), 'it escapes search term');
@@ -111,8 +76,7 @@ QUnit.test("escape search term", (assert) => {
 
 QUnit.test("update username through advanced search ui", assert => {
   visit("/search");
-  fillIn('.search input.full-page-search', 'none');
-  click('.search-advanced-btn');
+  fillIn('.search-query', 'none');
   fillIn('.search-advanced-options .user-selector', 'admin');
   click('.search-advanced-options .user-selector');
   keyEvent('.search-advanced-options .user-selector', 'keydown', 8);
@@ -126,7 +90,7 @@ QUnit.test("update username through advanced search ui", assert => {
 
       andThen(() => {
         assert.ok(exists('.search-advanced-options span:contains("admin")'), 'has "admin" pre-populated');
-        assert.equal(find('.search input.full-page-search').val(), "none @admin", 'has updated search term to "none user:admin"');
+        assert.equal(find('.search-query').val(), "none @admin", 'has updated search term to "none user:admin"');
       });
     });
   });
@@ -137,20 +101,19 @@ QUnit.test("update category through advanced search ui", assert => {
 
   visit("/search");
 
-  fillIn('.search input.full-page-search', 'none');
-  click('.search-advanced-btn');
+  fillIn('.search-query', 'none');
   categoryChooser.expand().fillInFilter('faq').selectRowByValue(4);
 
   andThen(() => {
     assert.ok(exists('.search-advanced-options .badge-category:contains("faq")'), 'has "faq" populated');
-    assert.equal(find('.search input.full-page-search').val(), "none #faq", 'has updated search term to "none #faq"');
+    assert.equal(find('.search-query').val(), "none #faq", 'has updated search term to "none #faq"');
   });
 });
 
 // test("update group through advanced search ui", assert => {
 //   visit("/search");
-//   fillIn('.search input.full-page-search', 'none');
-//   click('.search-advanced-btn');
+//   fillIn('.search-query', 'none');
+//
 //   fillIn('.search-advanced-options .group-selector', 'moderators');
 //   click('.search-advanced-options .group-selector');
 //   keyEvent('.search-advanced-options .group-selector', 'keydown', 8);
@@ -164,7 +127,7 @@ QUnit.test("update category through advanced search ui", assert => {
 //
 //       andThen(() => {
 //         assert.ok(exists('.search-advanced-options span:contains("moderators")'), 'has "moderators" pre-populated');
-//         assert.equal(find('.search input.full-page-search').val(), "none group:moderators", 'has updated search term to "none group:moderators"');
+//         assert.equal(find('.search-query').val(), "none group:moderators", 'has updated search term to "none group:moderators"');
 //       });
 //     });
 //   });
@@ -172,8 +135,8 @@ QUnit.test("update category through advanced search ui", assert => {
 
 // test("update badges through advanced search ui", assert => {
 //   visit("/search");
-//   fillIn('.search input.full-page-search', 'none');
-//   click('.search-advanced-btn');
+//   fillIn('.search-query', 'none');
+//
 //   fillIn('.search-advanced-options .badge-names', 'Reader');
 //   click('.search-advanced-options .badge-names');
 //   keyEvent('.search-advanced-options .badge-names', 'keydown', 8);
@@ -187,7 +150,7 @@ QUnit.test("update category through advanced search ui", assert => {
 //
 //       andThen(() => {
 //         assert.ok(exists('.search-advanced-options span:contains("Reader")'), 'has "Reader" pre-populated');
-//         assert.equal(find('.search input.full-page-search').val(), "none badge:Reader", 'has updated search term to "none badge:Reader"');
+//         assert.equal(find('.search-query').val(), "none badge:Reader", 'has updated search term to "none badge:Reader"');
 //       });
 //     });
 //   });
@@ -195,8 +158,8 @@ QUnit.test("update category through advanced search ui", assert => {
 
 // test("update tags through advanced search ui", assert => {
 //   visit("/search");
-//   fillIn('.search input.full-page-search', 'none');
-//   click('.search-advanced-btn');
+//   fillIn('.search-query', 'none');
+//
 //
 //   keyEvent('.search-advanced-options .tag-chooser input.select2-input', 'keydown', 110);
 //   fillIn('.search-advanced-options .tag-chooser input.select2-input', 'monkey');
@@ -207,46 +170,50 @@ QUnit.test("update category through advanced search ui", assert => {
 //       click('li.select2-result-selectable:first');
 //       andThen(() => {
 //         assert.ok(exists('.search-advanced-options .tag-chooser .tag-monkey'), 'has "monkey" pre-populated');
-//         assert.equal(find('.search input.full-page-search').val(), "none tags:monkey", 'has updated search term to "none tags:monkey"');
+//         assert.equal(find('.search-query').val(), "none tags:monkey", 'has updated search term to "none tags:monkey"');
 //       });
 //     });
 //   });
 // });
+//
+QUnit.test("update in:title filter through advanced search ui", async assert => {
+  await visit("/search");
+  await fillIn('.search-query', 'none');
+  await click('.search-advanced-options .in-title');
 
-QUnit.test("update in:likes filter through advanced search ui", assert => {
-  visit("/search");
-  fillIn('.search input.full-page-search', 'none');
-  click('.search-advanced-btn');
-  click('.search-advanced-options .in-likes');
+  assert.ok(exists('.search-advanced-options .in-title:checked'), 'has "in title" populated');
+  assert.equal(find('.search-query').val(), "none in:title", 'has updated search term to "none in:title"');
+});
 
-  andThen(() => {
-    assert.ok(exists('.search-advanced-options .in-likes:checked'), 'has "I liked" populated');
-    assert.equal(find('.search input.full-page-search').val(), "none in:likes", 'has updated search term to "none in:likes"');
-  });
+QUnit.test("update in:likes filter through advanced search ui", async assert => {
+  await visit("/search");
+  await fillIn('.search-query', 'none');
+  await click('.search-advanced-options .in-likes');
+
+  assert.ok(exists('.search-advanced-options .in-likes:checked'), 'has "I liked" populated');
+  assert.equal(find('.search-query').val(), "none in:likes", 'has updated search term to "none in:likes"');
 });
 
 QUnit.test("update in:private filter through advanced search ui", assert => {
   visit("/search");
-  fillIn('.search input.full-page-search', 'none');
-  click('.search-advanced-btn');
+  fillIn('.search-query', 'none');
   click('.search-advanced-options .in-private');
 
   andThen(() => {
     assert.ok(exists('.search-advanced-options .in-private:checked'), 'has "are in my messages" populated');
-    assert.equal(find('.search input.full-page-search').val(), "none in:private", 'has updated search term to "none in:private"');
+    assert.equal(find('.search-query').val(), "none in:private", 'has updated search term to "none in:private"');
   });
 });
 
 QUnit.test("update in:seen filter through advanced search ui", assert => {
   visit("/search");
-  fillIn('.search input.full-page-search', 'none');
-  click('.search-advanced-btn');
+  fillIn('.search-query', 'none');
   click('.search-advanced-options .in-seen');
 
   andThen(() => {
     assert.ok(exists('.search-advanced-options .in-seen:checked'), 'it should check the right checkbox');
 
-    assert.equal(find('.search input.full-page-search').val(), "none in:seen",
+    assert.equal(find('.search-query').val(), "none in:seen",
       'it should update the search term'
     );
   });
@@ -257,13 +224,12 @@ QUnit.test("update in filter through advanced search ui", assert => {
 
   visit("/search");
 
-  fillIn('.search input.full-page-search', 'none');
-  click('.search-advanced-btn');
+  fillIn('.search-query', 'none');
   inSelector.expand().selectRowByValue('bookmarks');
 
   andThen(() => {
     assert.ok(inSelector.rowByName("I bookmarked").exists(), 'has "I bookmarked" populated');
-    assert.equal(find('.search input.full-page-search').val(), "none in:bookmarks", 'has updated search term to "none in:bookmarks"');
+    assert.equal(find('.search-query').val(), "none in:bookmarks", 'has updated search term to "none in:bookmarks"');
   });
 });
 
@@ -272,13 +238,12 @@ QUnit.test("update status through advanced search ui", assert => {
 
   visit("/search");
 
-  fillIn('.search input.full-page-search', 'none');
-  click('.search-advanced-btn');
+  fillIn('.search-query', 'none');
   statusSelector.expand().selectRowByValue('closed');
 
   andThen(() => {
     assert.ok(statusSelector.rowByName("are closed").exists(), 'has "are closed" populated');
-    assert.equal(find('.search input.full-page-search').val(), "none status:closed", 'has updated search term to "none status:closed"');
+    assert.equal(find('.search-query').val(), "none status:closed", 'has updated search term to "none status:closed"');
   });
 });
 
@@ -287,26 +252,24 @@ QUnit.test("update post time through advanced search ui", assert => {
 
   visit("/search");
 
-  fillIn('.search input.full-page-search', 'none');
-  click('.search-advanced-btn');
+  fillIn('.search-query', 'none');
   fillIn('#search-post-date .date-picker', '2016-10-05');
   postTimeSelector.expand().selectRowByValue('after');
 
   andThen(() => {
     assert.ok(postTimeSelector.rowByName("after").exists(), 'has "after" populated');
-    assert.equal(find('.search input.full-page-search').val(), "none after:2016-10-05", 'has updated search term to "none after:2016-10-05"');
+    assert.equal(find('.search-query').val(), "none after:2016-10-05", 'has updated search term to "none after:2016-10-05"');
   });
 });
 
 QUnit.test("update min post count through advanced search ui", assert => {
   visit("/search");
-  fillIn('.search input.full-page-search', 'none');
-  click('.search-advanced-btn');
+  fillIn('.search-query', 'none');
   fillIn('#search-min-post-count', '5');
 
   andThen(() => {
     assert.equal(find('.search-advanced-options #search-min-post-count').val(), "5", 'has "5" populated');
-    assert.equal(find('.search input.full-page-search').val(), "none min_post_count:5", 'has updated search term to "none min_post_count:5"');
+    assert.equal(find('.search-query').val(), "none min_post_count:5", 'has updated search term to "none min_post_count:5"');
   });
 });
 
@@ -316,6 +279,6 @@ QUnit.test("validate advanced search when initially empty", assert => {
 
   andThen(() => {
     assert.ok(exists('.search-advanced-options .in-likes:checked'), 'has "I liked" populated');
-    assert.equal(find('.search input.full-page-search').val(), "in:likes", 'has updated search term to "in:likes"');
+    assert.equal(find('.search-query').val(), "in:likes", 'has updated search term to "in:likes"');
   });
 });
diff --git a/test/javascripts/acceptance/search-test.js.es6 b/test/javascripts/acceptance/search-test.js.es6
index 5929078b285..d388d67787d 100644
--- a/test/javascripts/acceptance/search-test.js.es6
+++ b/test/javascripts/acceptance/search-test.js.es6
@@ -69,6 +69,11 @@ QUnit.test("Search with context", assert => {
 
   andThen(() => {
     assert.ok(exists('.search-menu .results ul li'), 'it shows results');
+
+    assert.ok(
+      exists('.cooked span.highlight-strong'),
+      'it should highlight the search term'
+    );
   });
 
   visit("/");
diff --git a/test/javascripts/acceptance/shared-drafts-test.js.es6 b/test/javascripts/acceptance/shared-drafts-test.js.es6
new file mode 100644
index 00000000000..6aea6ec38be
--- /dev/null
+++ b/test/javascripts/acceptance/shared-drafts-test.js.es6
@@ -0,0 +1,19 @@
+import { acceptance } from "helpers/qunit-helpers";
+
+acceptance("Shared Drafts", { loggedIn: true });
+
+QUnit.test('Viewing', assert => {
+  visit("/t/some-topic/9");
+  andThen(() => {
+    assert.ok(find('.shared-draft-controls').length === 1);
+    let categoryChooser = selectKit('.shared-draft-controls .category-chooser');
+    assert.equal(categoryChooser.header().value(), '3');
+  });
+
+  click('.publish-shared-draft');
+  click('.bootbox .btn-primary');
+
+  andThen(() => {
+    assert.ok(find('.shared-draft-controls').length === 0);
+  });
+});
diff --git a/test/javascripts/acceptance/sign-in-test.js.es6 b/test/javascripts/acceptance/sign-in-test.js.es6
index 12d77228a59..1320be56ee2 100644
--- a/test/javascripts/acceptance/sign-in-test.js.es6
+++ b/test/javascripts/acceptance/sign-in-test.js.es6
@@ -76,6 +76,33 @@ QUnit.test("sign in - not activated - edit email", assert => {
   });
 });
 
+QUnit.test("second factor", assert => {
+  visit("/");
+  click("header .login-button");
+
+  andThen(() => {
+    assert.ok(exists('.login-modal'), "it shows the login modal");
+  });
+
+  fillIn('#login-account-name', 'eviltrout');
+  fillIn('#login-account-password', 'need-second-factor');
+  click('.modal-footer .btn-primary');
+
+  andThen(() => {
+    assert.not(exists('#modal-alert:visible'), 'it hides the login error');
+    assert.not(exists('#credentials:visible'), 'it hides the username and password prompt');
+    assert.ok(exists('#second-factor:visible'), 'it displays the second factor prompt');
+    assert.not(exists('.modal-footer .btn-primary:disabled'), "enables the login button");
+  });
+
+  fillIn('#login-second-factor', '123456');
+  click('.modal-footer .btn-primary');
+
+  andThen(() => {
+    assert.ok(exists('.modal-footer .btn-primary:disabled'), "disables the login button");
+  });
+});
+
 QUnit.test("create account", assert => {
   visit("/");
   click("header .sign-up-button");
@@ -106,4 +133,4 @@ QUnit.test("create account", assert => {
   andThen(() => {
     assert.ok(exists('.modal-footer .btn-primary:disabled'), "create account is disabled");
   });
-});
\ No newline at end of file
+});
diff --git a/test/javascripts/acceptance/tags-test.js.es6 b/test/javascripts/acceptance/tags-test.js.es6
index ca7a745a94c..8971f83ee33 100644
--- a/test/javascripts/acceptance/tags-test.js.es6
+++ b/test/javascripts/acceptance/tags-test.js.es6
@@ -8,4 +8,57 @@ QUnit.test("list the tags", assert => {
     assert.ok($('body.tags-page').length, "has the body class");
     assert.ok(exists('.tag-eviltrout'), "shows the evil trout tag");
   });
-});
\ No newline at end of file
+});
+
+acceptance("Tags listed by group", {
+  loggedIn: true,
+  settings: {
+    tags_listed_by_group: true
+  }
+});
+
+
+QUnit.test("list the tags in groups", assert => {
+  server.get('/tags', () => { // eslint-disable-line no-undef
+    return [
+      200,
+      { "Content-Type": "application/json" },
+      {
+        "tags":[{id: 'planned', text: 'planned', count: 7, pm_count: 0}],
+        "extras": { "tag_groups": [
+          {id: 2, name: "Ford Cars", tags: [
+            {id: 'escort', text: 'escort', count: 1, pm_count: 0},
+            {id: 'focus', text: 'focus', count: 3, pm_count: 0}
+          ]},
+          {id: 1, name: "Honda Cars", tags: [
+            {id: 'civic', text: 'civic', count: 4, pm_count: 0},
+            {id: 'accord', text: 'accord', count: 2, pm_count: 0}
+          ]},
+          {id: 1, name: "Makes", tags: [
+            {id: 'ford', text: 'ford', count: 5, pm_count: 0},
+            {id: 'honda', text: 'honda', count: 6, pm_count: 0}
+          ]}
+        ]}
+      }
+    ];
+  });
+
+  visit('/tags');
+  andThen(() => {
+    assert.equal($('.tag-list').length, 4, "shows separate lists for the 3 groups and the ungrouped tags");
+    assert.ok(
+      _.isEqual(
+        _.map($('.tag-list h3'), i => { return $(i).text(); } ),
+        ['Ford Cars', 'Honda Cars', 'Makes', 'Other Tags']
+      ),
+      'shown in given order and with tags that are not in a group'
+    );
+    assert.ok(
+      _.isEqual(
+        _.map($('.tag-list:first .discourse-tag'), i => { return $(i).text(); }),
+        ['focus', 'escort']
+      ),
+      'shows the tags in default sort (by count)'
+    );
+  });
+});
diff --git a/test/javascripts/acceptance/topic-anonymous-test.js.es6 b/test/javascripts/acceptance/topic-anonymous-test.js.es6
index f077e99fca3..c0eff198659 100644
--- a/test/javascripts/acceptance/topic-anonymous-test.js.es6
+++ b/test/javascripts/acceptance/topic-anonymous-test.js.es6
@@ -6,6 +6,7 @@ QUnit.test("Enter a Topic", assert => {
   andThen(() => {
     assert.ok(exists("#topic"), "The topic was rendered");
     assert.ok(exists("#topic .cooked"), "The topic has cooked posts");
+    assert.ok(find('.shared-draft-notice').length === 0, "no shared draft unless there's a dest category id");
   });
 });
 
@@ -38,4 +39,4 @@ QUnit.test("Enter with 500 errors", assert => {
     assert.ok(!exists("#topic"), "The topic was not rendered");
     assert.ok(exists(".topic-error"), "An error message is displayed");
   });
-});
\ No newline at end of file
+});
diff --git a/test/javascripts/acceptance/topic-edit-timer-test.js.es6 b/test/javascripts/acceptance/topic-edit-timer-test.js.es6
index 569639d810a..b3ed4df7440 100644
--- a/test/javascripts/acceptance/topic-edit-timer-test.js.es6
+++ b/test/javascripts/acceptance/topic-edit-timer-test.js.es6
@@ -1,4 +1,4 @@
-import { acceptance } from 'helpers/qunit-helpers';
+import { acceptance, replaceCurrentUser } from 'helpers/qunit-helpers';
 acceptance('Topic - Edit timer', { loggedIn: true });
 
 QUnit.test('default', assert => {
@@ -162,6 +162,22 @@ QUnit.test('schedule', assert => {
   });
 });
 
+QUnit.test("TL4 can't auto-delete", assert => {
+  replaceCurrentUser({ staff: false, trust_level: 4 });
+
+  visit('/t/internationalization-localization');
+  click('.toggle-admin-menu');
+  click('.topic-admin-status-update button');
+
+  const timerType = selectKit('.select-kit.timer-type');
+
+  timerType.expand();
+
+  andThen(() => {
+    assert.ok(!timerType.rowByValue("delete").exists());
+  });
+});
+
 QUnit.test('auto delete', assert => {
   const timerType = selectKit('.select-kit.timer-type');
   const futureDateInputSelector = selectKit('.future-date-input-selector');
diff --git a/test/javascripts/acceptance/user-card-test.js.es6 b/test/javascripts/acceptance/user-card-test.js.es6
index e19d96836b7..dcab0c2930f 100644
--- a/test/javascripts/acceptance/user-card-test.js.es6
+++ b/test/javascripts/acceptance/user-card-test.js.es6
@@ -1,7 +1,8 @@
 import { acceptance } from "helpers/qunit-helpers";
+
 acceptance("User Card");
 
-QUnit.test("card", assert => {
+QUnit.test("user card", assert => {
   visit('/');
 
   assert.ok(invisible('#user-card'), 'user card is invisible by default');
@@ -11,4 +12,4 @@ QUnit.test("card", assert => {
     assert.ok(visible('#user-card'), 'card should appear');
   });
 
-});
\ No newline at end of file
+});
diff --git a/test/javascripts/acceptance/users-test.js.es6 b/test/javascripts/acceptance/users-test.js.es6
index 427225a774e..648b41890d1 100644
--- a/test/javascripts/acceptance/users-test.js.es6
+++ b/test/javascripts/acceptance/users-test.js.es6
@@ -1,17 +1,25 @@
 import { acceptance } from "helpers/qunit-helpers";
 acceptance("User Directory");
 
-QUnit.test("Visit Page", assert => {
-  visit("/users");
-  andThen(() => {
-    assert.ok($('body.users-page').length, "has the body class");
-    assert.ok(exists('.directory table tr'), "has a list of users");
-  });
+QUnit.test("Visit Page", async assert => {
+  await visit("/u");
+  assert.ok($('body.users-page').length, "has the body class");
+  assert.ok(exists('.directory table tr'), "has a list of users");
 });
 
-QUnit.test("Visit All Time", assert => {
-  visit("/users?period=all");
-  andThen(() => {
-    assert.ok(exists('.time-read'), "has time read column");
-  });
+QUnit.test("Visit All Time", async assert => {
+  await visit("/u?period=all");
+  assert.ok(exists('.time-read'), "has time read column");
+});
+
+QUnit.test("Visit Without Usernames", async assert => {
+  await visit("/u?exclude_usernames=system");
+  assert.ok($('body.users-page').length, "has the body class");
+  assert.ok(exists('.directory table tr'), "has a list of users");
+});
+
+QUnit.test("Visit With Group Filter", async assert => {
+  await visit("/u?group=trust_level_0");
+  assert.ok($('body.users-page').length, "has the body class");
+  assert.ok(exists('.directory table tr'), "has a list of users");
 });
\ No newline at end of file
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 112ef64d041..763644eaddb 100644
--- a/test/javascripts/admin/controllers/admin-user-badges-test.js.es6
+++ b/test/javascripts/admin/controllers/admin-user-badges-test.js.es6
@@ -9,11 +9,17 @@ moduleFor('controller:admin-user-badges', {
 });
 
 QUnit.test("grantableBadges", function(assert) {
-  const badgeFirst = Badge.create({id: 3, name: "A Badge", enabled: true});
-  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({ model: [], badges: [badgeLast, badgeFirst, badgeMiddle, badgeDisabled] });
+  const badgeFirst = Badge.create({ id: 3, name: "A Badge", enabled: true, manually_grantable: true });
+  const badgeMiddle = Badge.create({ id: 1, name: "My Badge", enabled: true, manually_grantable: true });
+  const badgeLast = Badge.create({ id: 2, name: "Zoo Badge", enabled: true, manually_grantable: true });
+  const badgeDisabled = Badge.create({ id: 4, name: "Disabled Badge", enabled: false, manually_grantable: true });
+  const badgeAutomatic = Badge.create({ id: 5, name: "Automatic Badge", enabled: true, manually_grantable: false });
+
+  const controller = this.subject({
+    model: [],
+    badges: [badgeLast, badgeFirst, badgeMiddle, badgeDisabled, badgeAutomatic]
+  });
+
   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/category-chooser-test.js.es6 b/test/javascripts/components/category-chooser-test.js.es6
index bb129c872bd..62df66fadea 100644
--- a/test/javascripts/components/category-chooser-test.js.es6
+++ b/test/javascripts/components/category-chooser-test.js.es6
@@ -35,9 +35,9 @@ componentTest('with scopedCategoryId', {
     this.get('subject').expand();
 
     andThen(() => {
-      assert.equal(this.get('subject').rowByIndex(0).title(), 'feature');
+      assert.equal(this.get('subject').rowByIndex(0).title(), 'Discussion about features or potential features of Discourse: how they work, why they work, etc.');
       assert.equal(this.get('subject').rowByIndex(0).value(), 2);
-      assert.equal(this.get('subject').rowByIndex(1).title(), 'spec');
+      assert.equal(this.get('subject').rowByIndex(1).title(), 'My idea here is to have mini specs for features we would like built but have no bandwidth to build');
       assert.equal(this.get('subject').rowByIndex(1).value(), 26);
       assert.equal(this.get('subject').rows().length, 2);
     });
@@ -54,7 +54,7 @@ componentTest('with allowUncategorized=null', {
   test(assert) {
     andThen(() => {
       assert.equal(this.get('subject').header().value(), null);
-      assert.equal(this.get('subject').header().title(), "Select a category&hellip;");
+      assert.equal(this.get('subject').header().title(), "Select a category");
     });
   }
 });
@@ -69,7 +69,7 @@ componentTest('with allowUncategorized=null rootNone=true', {
   test(assert) {
     andThen(() => {
       assert.equal(this.get('subject').header().value(), null);
-      assert.equal(this.get('subject').header().title(), 'Select a category&hellip;');
+      assert.equal(this.get('subject').header().title(), 'Select a category');
     });
   }
 });
@@ -85,7 +85,7 @@ componentTest('with disallowed uncategorized, rootNone and rootNoneLabel', {
   test(assert) {
     andThen(() => {
       assert.equal(this.get('subject').header().value(), null);
-      assert.equal(this.get('subject').header().title(), 'Select a category&hellip;');
+      assert.equal(this.get('subject').header().title(), 'Select a category');
     });
   }
 });
diff --git a/test/javascripts/components/category-selector-test.js.es6 b/test/javascripts/components/category-selector-test.js.es6
index ff35b7817b4..befc4a9e166 100644
--- a/test/javascripts/components/category-selector-test.js.es6
+++ b/test/javascripts/components/category-selector-test.js.es6
@@ -72,6 +72,7 @@ componentTest('interactions', {
       assert.equal(this.get('categories').length, 3);
     });
 
+    this.get('subject').expand();
     this.get('subject').keyboard().backspace();
     this.get('subject').keyboard().backspace();
 
diff --git a/test/javascripts/components/combo-box-test.js.es6 b/test/javascripts/components/combo-box-test.js.es6
index e1237ccc3f9..45af48de9aa 100644
--- a/test/javascripts/components/combo-box-test.js.es6
+++ b/test/javascripts/components/combo-box-test.js.es6
@@ -192,3 +192,20 @@ componentTest('with empty string as value', {
     });
   }
 });
+
+componentTest('with noneLabel', {
+  template: '{{combo-box content=items allowAutoSelectFirst=false noneLabel=noneLabel}}',
+  beforeEach() {
+    I18n.translations[I18n.locale].js.test = {none: 'none'};
+    this.set('items', ['evil', 'trout', 'hat']);
+    this.set('noneLabel', 'test.none');
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.equal(this.get('subject').header().name(), 'none', 'it displays noneLabel as the header name');
+    });
+  }
+});
diff --git a/test/javascripts/components/d-editor-test.js.es6 b/test/javascripts/components/d-editor-test.js.es6
index cf3dfdfcd17..e0409e4957d 100644
--- a/test/javascripts/components/d-editor-test.js.es6
+++ b/test/javascripts/components/d-editor-test.js.es6
@@ -248,6 +248,9 @@ testCase('link modal (simple link) with selected text', function(assert, textare
   textarea.selectionEnd = 12;
 
   click('button.link');
+  andThen(() => {
+    assert.equal(this.$('input.link-text')[0].value, 'hello world.');
+  });
   fillIn('.insert-link input.link-url', 'http://eviltrout.com');
   click('.insert-link button.btn-primary');
   andThen(() => {
@@ -712,6 +715,26 @@ testCase(`list button with line sequence`, function(assert, textarea) {
   });
 });
 
+componentTest('clicking the toggle-direction button toggles the direction', {
+  template: '{{d-editor value=value}}',
+  beforeEach() {
+    this.siteSettings.support_mixed_text_direction = true;
+    this.siteSettings.default_locale = "en";
+  },
+
+  test(assert) {
+    const textarea = this.$('textarea.d-editor-input');
+    click('button.toggle-direction');
+    andThen(() => {
+      assert.equal(textarea.attr('dir'), 'rtl');
+    });
+    click('button.toggle-direction');
+    andThen(() => {
+      assert.equal(textarea.attr('dir'), 'ltr');
+    });
+  }
+});
+
 testCase(`doesn't jump to bottom with long text`, function(assert, textarea) {
 
   let longText = 'hello world.';
diff --git a/test/javascripts/components/group-membership-button-test.js.es6 b/test/javascripts/components/group-membership-button-test.js.es6
index 1937d380886..a321d7ed4f8 100644
--- a/test/javascripts/components/group-membership-button-test.js.es6
+++ b/test/javascripts/components/group-membership-button-test.js.es6
@@ -61,22 +61,7 @@ QUnit.test('userIsGroupUser', function(assert) {
 
   assert.equal(this.subject().get('userIsGroupUser'), false);
 
-  this.subject().setProperties({ model: { id: 1 }, groupUserIds: [1] });
-
-  assert.equal(this.subject().get('userIsGroupUser'), true);
-
-  this.subject().set('groupUserIds', [3]);
-
-  assert.equal(this.subject().get('userIsGroupUser'), false);
-
-  this.subject().set('groupUserIds', undefined);
-
-  assert.equal(this.subject().get('userIsGroupUser'), false);
-
-  this.subject().setProperties({
-    groupUserIds: [1, 3],
-    model: { id: 1, is_group_user: false }
-  });
+  this.subject().set('model.is_group_user', null);
 
   assert.equal(this.subject().get('userIsGroupUser'), false);
 });
diff --git a/test/javascripts/components/list-setting-test.js.es6 b/test/javascripts/components/list-setting-test.js.es6
index b5592974a07..d45e02429cb 100644
--- a/test/javascripts/components/list-setting-test.js.es6
+++ b/test/javascripts/components/list-setting-test.js.es6
@@ -63,7 +63,7 @@ componentTest('interactions', {
       assert.equal(listSetting.header().value(), 'bold,italic,underline');
     });
 
-    listSetting.fillInFilter('strike');
+    listSetting.expand().fillInFilter('strike');
 
     andThen(() => {
       assert.equal(listSetting.highlightedRow().value(), 'strike');
diff --git a/test/javascripts/components/multi-select-test.js.es6 b/test/javascripts/components/multi-select-test.js.es6
index 1bb5f940be8..c829b3ea534 100644
--- a/test/javascripts/components/multi-select-test.js.es6
+++ b/test/javascripts/components/multi-select-test.js.es6
@@ -66,6 +66,7 @@ componentTest('interactions', {
     });
 
     this.get('subject').selectRowByValue(3);
+    this.get('subject').expand();
 
     andThen(() => {
       assert.equal(
@@ -145,3 +146,58 @@ componentTest('interactions', {
     });
   }
 });
+
+componentTest('with limitMatches', {
+  template: '{{multi-select content=content limitMatches=2}}',
+
+  beforeEach() {
+    this.set('content', ['sam', 'jeff', 'neil']);
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => assert.equal(this.get('subject').el().find(".select-kit-row").length, 2));
+  }
+});
+
+componentTest('with minimum', {
+  template: '{{multi-select content=content minimum=1}}',
+
+  beforeEach() {
+    this.set('content', ['sam', 'jeff', 'neil']);
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => assert.equal(this.get('subject').validationMessage(), 'Select at least 1 item.'));
+
+    this.get('subject').selectRowByValue('sam');
+
+    andThen(() => {
+      assert.equal(this.get('subject').header().label(), 'sam');
+    });
+  }
+});
+
+componentTest('with minimumLabel', {
+  template: '{{multi-select content=content minimum=1 minimumLabel="test.minimum"}}',
+
+  beforeEach() {
+    I18n.translations[I18n.locale].js.test = { minimum: 'min %{count}' };
+    this.set('content', ['sam', 'jeff', 'neil']);
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => assert.equal(this.get('subject').validationMessage(), 'min 1'));
+
+    this.get('subject').selectRowByValue('jeff');
+
+    andThen(() => {
+      assert.equal(this.get('subject').header().label(), 'jeff');
+    });
+  }
+});
diff --git a/test/javascripts/components/single-select-test.js.es6 b/test/javascripts/components/single-select-test.js.es6
index f79b2b5182a..671896bc188 100644
--- a/test/javascripts/components/single-select-test.js.es6
+++ b/test/javascripts/components/single-select-test.js.es6
@@ -103,7 +103,7 @@ componentTest('custom search icon', {
 
     andThen(() => {
       assert.ok(
-        this.get('subject').filter().icon().hasClass("fa-shower"),
+        this.get('subject').filter().icon().hasClass("d-icon-shower"),
         "it has a the correct icon"
       );
     });
@@ -158,23 +158,6 @@ componentTest('doesn’t render collection content before first expand', {
   }
 });
 
-componentTest('supports options to limit size', {
-  template: '{{single-select collectionHeight=20 content=content}}',
-
-  beforeEach() {
-    this.set("content", ["robin", "régis"]);
-  },
-
-  test(assert) {
-    this.get('subject').expand();
-
-    andThen(() => {
-      const height = find(".select-kit-collection").height();
-      assert.equal(parseInt(height, 10), 20, "it limits the height");
-    });
-  }
-});
-
 componentTest('dynamic headerText', {
   template: '{{single-select value=1 content=content}}',
 
@@ -249,6 +232,33 @@ componentTest('supports converting select value to integer', {
   }
 });
 
+componentTest('supports converting string as boolean to boolean', {
+  template: '{{single-select value=value content=content castBoolean=true}}',
+
+  beforeEach() {
+    this.set('value', true);
+    this.set('content', [{ id: 'true', name: 'ASC'}, {id: 'false', name: 'DESC' }]);
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => assert.equal(this.get('subject').selectedRow().name(), 'ASC') );
+
+    andThen(() => {
+      this.set('value', false);
+    });
+
+    andThen(() => {
+      assert.equal(
+        this.get('subject').selectedRow().name(),
+        'DESC',
+        'it works with dynamic content'
+      );
+    });
+  }
+});
+
 componentTest('supports keyboard events', {
   template: '{{single-select content=content filterable=true}}',
 
@@ -469,58 +479,6 @@ componentTest('with collection header', {
   }
 });
 
-componentTest('with onToggle', {
-  template: '{{single-select onToggle=onToggle}}',
-
-  beforeEach() {
-    this.set("onToggle", () => $(".select-kit").append("<span class='onToggleTest'></span>"));
-  },
-
-  test(assert) {
-    andThen(() => assert.notOk(exists(".onToggleTest")));
-
-    this.get('subject').expand();
-
-    andThen(() => assert.ok(exists(".onToggleTest")));
-  }
-});
-
-componentTest('with onExpand', {
-  template: '{{single-select onExpand=onExpand}}',
-
-  beforeEach() {
-    this.set("onExpand", () => $(".select-kit").append("<span class='onExpandTest'></span>"));
-  },
-
-  test(assert) {
-    andThen(() => assert.notOk(exists(".onExpandTest")));
-
-    this.get('subject').expand();
-
-    andThen(() => assert.ok(exists(".onExpandTest")));
-  }
-});
-
-componentTest('with onCollapse', {
-  template: '{{single-select onCollapse=onCollapse}}',
-
-  beforeEach() {
-    this.set("onCollapse", () => $(".select-kit").append("<span class='onCollapseTest'></span>"));
-  },
-
-  test(assert) {
-    andThen(() => assert.notOk(exists(".onCollapseTest")));
-
-    this.get('subject').expand();
-
-    andThen(() => assert.notOk(exists(".onCollapseTest")));
-
-    this.get('subject').collapse();
-
-    andThen(() => assert.ok(exists(".onCollapseTest")));
-  }
-});
-
 componentTest('with title', {
   template: '{{single-select title=(i18n "test.title")}}',
 
@@ -532,3 +490,82 @@ componentTest('with title', {
     andThen(() => assert.equal(this.get('subject').header().title(), 'My title') );
   }
 });
+
+componentTest('support modifying header computed content through plugin api', {
+  template: '{{single-select content=content}}',
+
+  beforeEach() {
+    withPluginApi('0.8.15', api => {
+      api.modifySelectKit("select-kit")
+        .modifyHeaderComputedContent((context, computedContent) => {
+          computedContent.title = "Not so evil";
+          return computedContent;
+        });
+    });
+
+    this.set("content", [{ id: "1", name: "robin"}]);
+  },
+
+  test(assert) {
+    andThen(() => {
+      assert.equal(this.get('subject').header().title(), "Not so evil");
+    });
+
+    andThen(() => clearCallbacks());
+  }
+});
+
+componentTest('with limitMatches', {
+  template: '{{single-select content=content limitMatches=2}}',
+
+  beforeEach() {
+    this.set('content', ['sam', 'jeff', 'neil']);
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => assert.equal(this.get('subject').el().find(".select-kit-row").length, 2));
+  }
+});
+
+componentTest('with minimum', {
+  template: '{{single-select content=content minimum=1 allowAutoSelectFirst=false}}',
+
+  beforeEach() {
+    this.set('content', ['sam', 'jeff', 'neil']);
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => assert.equal(this.get('subject').validationMessage(), 'Select at least 1 item.'));
+
+    this.get('subject').selectRowByValue('sam');
+
+    andThen(() => {
+      assert.equal(this.get('subject').header().label(), 'sam');
+    });
+  }
+});
+
+componentTest('with minimumLabel', {
+  template: '{{single-select content=content minimum=1 minimumLabel="test.minimum" allowAutoSelectFirst=false}}',
+
+  beforeEach() {
+    I18n.translations[I18n.locale].js.test = { minimum: 'min %{count}' };
+    this.set('content', ['sam', 'jeff', 'neil']);
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => assert.equal(this.get('subject').validationMessage(), 'min 1'));
+
+    this.get('subject').selectRowByValue('jeff');
+
+    andThen(() => {
+      assert.equal(this.get('subject').header().label(), 'jeff');
+    });
+  }
+});
diff --git a/test/javascripts/components/text-field-test.js.es6 b/test/javascripts/components/text-field-test.js.es6
index e18662c2ab9..7a2de69a5a2 100644
--- a/test/javascripts/components/text-field-test.js.es6
+++ b/test/javascripts/components/text-field-test.js.es6
@@ -22,3 +22,27 @@ componentTest("support a placeholder", {
     assert.equal(this.$('input').prop('placeholder'), 'placeholder.i18n.key');
   }
 });
+
+componentTest("sets the dir attribute to ltr for Hebrew text", {
+  template: `{{text-field value='זהו שם עברי עם מקום עברי'}}`,
+  beforeEach() {
+    this.siteSettings.support_mixed_text_direction = true;
+  },
+
+  test(assert) {
+    assert.equal(this.$('input').attr('dir'), 'rtl');
+  }
+});
+
+componentTest("sets the dir attribute to ltr for English text", {
+  template: `{{text-field value='This is a ltr title'}}`,
+  beforeEach() {
+    this.siteSettings.support_mixed_text_direction = true;
+  },
+
+  test(assert) {
+    assert.equal(this.$('input').attr('dir'), 'ltr');
+  }
+});
+
+
diff --git a/test/javascripts/controllers/admin-group-test.js.es6 b/test/javascripts/controllers/admin-group-test.js.es6
deleted file mode 100644
index 01d77cb5ee3..00000000000
--- a/test/javascripts/controllers/admin-group-test.js.es6
+++ /dev/null
@@ -1,41 +0,0 @@
-moduleFor("controller:admin-group", {
-  needs: ['controller:adminGroupsType']
-});
-
-QUnit.test("disablePublicSetting", function(assert) {
-  this.subject().setProperties({
-    model: { visibility_level: 1, allow_membership_requests: false }
-  });
-
-  assert.equal(this.subject().get("disablePublicSetting"), true, "it should disable setting");
-
-  this.subject().set("model.visibility_level", 0);
-
-  assert.equal(this.subject().get("disablePublicSetting"), false, "it should enable setting");
-
-  this.subject().set("model.allow_membership_requests", true);
-
-  assert.equal(this.subject().get("disablePublicSetting"), true, "it should disable setting");
-});
-
-QUnit.test("disableMembershipRequestSetting", function(assert) {
-  this.subject().setProperties({
-    model: { visibility_level: 1, public_admission: false, canEveryoneMention: true }
-  });
-
-  assert.equal(this.subject().get("disableMembershipRequestSetting"), true, "it should disable setting");
-
-  this.subject().set("model.visibility_level", 0);
-
-  assert.equal(
-    this.subject().get("disableMembershipRequestSetting"), false,
-    "it should enable setting"
-  );
-
-  this.subject().set("model.public_admission", true);
-
-  assert.equal(
-    this.subject().get("disableMembershipRequestSetting"), true,
-    "it should disable setting"
-  );
-});
diff --git a/test/javascripts/controllers/preferences-second-factor-test.js.es6 b/test/javascripts/controllers/preferences-second-factor-test.js.es6
new file mode 100644
index 00000000000..0bbf07100a2
--- /dev/null
+++ b/test/javascripts/controllers/preferences-second-factor-test.js.es6
@@ -0,0 +1,27 @@
+moduleFor("controller:preferences/second-factor");
+
+QUnit.test("displayOAuthWarning when OAuth login methods are disabled", function(assert) {
+  const controller = this.subject({
+    siteSettings: {
+      enable_google_oauth2_logins: false
+    }
+  });
+
+  assert.equal(
+    controller.get('displayOAuthWarning'),
+    false
+  );
+});
+
+QUnit.test("displayOAuthWarning when OAuth login methods are enabled", function(assert) {
+  const controller = this.subject({
+    siteSettings: {
+      enable_google_oauth2_logins: true
+    }
+  });
+
+  assert.equal(
+    controller.get('displayOAuthWarning'),
+    true
+  );
+});
diff --git a/test/javascripts/controllers/topic-test.js.es6 b/test/javascripts/controllers/topic-test.js.es6
index 804d819a904..eeb72861e99 100644
--- a/test/javascripts/controllers/topic-test.js.es6
+++ b/test/javascripts/controllers/topic-test.js.es6
@@ -164,8 +164,12 @@ QUnit.test("canDeleteSelected", function(assert) {
 
 QUnit.test("Can split/merge topic", function(assert) {
   const postStream = {
-    posts: [{ id: 1 }, { id: 2 }],
-    stream: [1, 2]
+    posts: [
+      { id: 1, post_number: 1, post_type: 1 },
+      { id: 2, post_number: 2, post_type: 4 },
+      { id: 3, post_number: 3, post_type: 1 }
+    ],
+    stream: [1, 2, 3]
   };
 
   const model = Topic.create({ postStream, details: { can_move_posts: false } });
@@ -185,8 +189,14 @@ QUnit.test("Can split/merge topic", function(assert) {
   assert.ok(controller.get("canSplitTopic"), "can split topic");
   assert.ok(controller.get("canMergeTopic"), "can merge topic");
 
+  selectedPostIds.removeObject(1);
   selectedPostIds.pushObject(2);
 
+  assert.not(controller.get("canSplitTopic"), "can't split topic when 1st post is not a regular post");
+  assert.ok(controller.get("canMergeTopic"), "can merge topic when 1st post is not a regular post");
+
+  selectedPostIds.pushObject(3);
+
   assert.not(controller.get("canSplitTopic"), "can't split topic when all posts are selected");
   assert.ok(controller.get("canMergeTopic"), "can merge topic when all posts are selected");
 });
@@ -315,4 +325,3 @@ QUnit.test("selectBelow", function(assert) {
   assert.equal(selectedPostIds[1], 4, "also selected 1st post below post #3");
   assert.equal(selectedPostIds[2], 5, "also selected 2nd post below post #3");
 });
-
diff --git a/test/javascripts/fixtures/daily-engaged-users.js.es6 b/test/javascripts/fixtures/daily-engaged-users.js.es6
new file mode 100644
index 00000000000..4787c458f37
--- /dev/null
+++ b/test/javascripts/fixtures/daily-engaged-users.js.es6
@@ -0,0 +1,20 @@
+export default {
+  "/admin/reports/daily_engaged_users": {
+    "report": {
+      "type": "daily_engaged_users",
+      "title": "Daily Engaged Users",
+      "xaxis": "Day",
+      "yaxis": "Engaged Users",
+      "description": "Number of users that have liked or posted in the last day",
+      "data": null,
+      "total": null,
+      "start_date": "2018-04-03",
+      "end_date": "2018-05-03",
+      "category_id": null,
+      "group_id": null,
+      "prev30Days": null,
+      "labels": null,
+      "report_key": ""
+    }
+  }
+};
diff --git a/test/javascripts/fixtures/dashboard-next.js.es6 b/test/javascripts/fixtures/dashboard-next.js.es6
new file mode 100644
index 00000000000..91ff5ea2bf8
--- /dev/null
+++ b/test/javascripts/fixtures/dashboard-next.js.es6
@@ -0,0 +1,13 @@
+export default {
+  "/admin/dashboard-next.json": {
+    "reports": [],
+    "last_backup_taken_at": "2018-04-13T12:51:19.926Z",
+    "updated_at": "2018-04-25T08:06:11.292Z",
+    "disk_space": {
+      "uploads_used": "74.5 KB",
+      "uploads_free": "117 GB",
+      "backups_used": "4.24 GB",
+      "backups_free": "117 GB"
+    }
+  }
+};
diff --git a/test/javascripts/fixtures/dau-by-mau.js.es6 b/test/javascripts/fixtures/dau-by-mau.js.es6
new file mode 100644
index 00000000000..78a125d9522
--- /dev/null
+++ b/test/javascripts/fixtures/dau-by-mau.js.es6
@@ -0,0 +1,20 @@
+export default {
+  "/admin/reports/dau_by_mau": {
+    "report": {
+      "type": "dau_by_mau",
+      "title": "DAU/MAU",
+      "xaxis": "Day",
+      "yaxis": "DAU/MAY",
+      "description": "Percentage of daily active users on monthly active users",
+      "data": null,
+      "total": null,
+      "start_date": "2018-01-26T00:00:00.000Z",
+      "end_date": "2018-04-27T23:59:59.999Z",
+      "category_id": null,
+      "group_id": null,
+      "prev30Days": 46,
+      "labels": null,
+      "report_key": ""
+    }
+  }
+};
diff --git a/test/javascripts/fixtures/discovery_fixtures.js.es6 b/test/javascripts/fixtures/discovery_fixtures.js.es6
index 27bc78bd0cb..8f0acc137d9 100644
--- a/test/javascripts/fixtures/discovery_fixtures.js.es6
+++ b/test/javascripts/fixtures/discovery_fixtures.js.es6
@@ -1,7 +1,7 @@
 /*jshint maxlen:10000000 */
 export default {
 "/latest.json": {"users":[{"id":7204,"username":"reyman64","avatar_template":"/images/avatar.png"},{"id":1,"username":"sam","avatar_template":"/images/avatar.png"},{"id":5481,"username":"f0rkz","avatar_template":"/images/avatar.png"},{"id":6473,"username":"jkf","avatar_template":"/images/avatar.png"},{"id":6973,"username":"stellarhopper","avatar_template":"/images/avatar.png"},{"id":19,"username":"eviltrout","avatar_template":"/images/avatar.png"},{"id":14,"username":"clay","avatar_template":"/images/avatar.png"},{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"},{"id":1917,"username":"sil","avatar_template":"/images/avatar.png"},{"id":7197,"username":"peeja","avatar_template":"/images/avatar.png"},{"id":1995,"username":"zogstrip","avatar_template":"/images/avatar.png"},{"id":8021,"username":"Abhishek_Gupta","avatar_template":"/images/avatar.png"},{"id":2291,"username":"PabloC","avatar_template":"/images/avatar.png"},{"id":791,"username":"srid","avatar_template":"/images/avatar.png"},{"id":1580,"username":"ABillionSuns","avatar_template":"/images/avatar.png"},{"id":7270,"username":"mhurwi","avatar_template":"/images/avatar.png"},{"id":6695,"username":"illspirit","avatar_template":"/images/avatar.png"},{"id":6929,"username":"BCHK","avatar_template":"/images/avatar.png"},{"id":4385,"username":"jeans","avatar_template":"/images/avatar.png"},{"id":7073,"username":"5an1ty","avatar_template":"/images/avatar.png"},{"id":6626,"username":"riking","avatar_template":"/images/avatar.png"},{"id":4457,"username":"Lee_Ars","avatar_template":"/images/avatar.png"},{"id":4263,"username":"mcwumbly","avatar_template":"/images/avatar.png"},{"id":8134,"username":"iontishina","avatar_template":"/images/avatar.png"},{"id":2072,"username":"nXqd","avatar_template":"/images/avatar.png"},{"id":4983,"username":"hey_julien","avatar_template":"/images/avatar.png"},{"id":3657,"username":"steelmaiden","avatar_template":"/images/avatar.png"},{"id":2624,"username":"BowlingX","avatar_template":"/images/avatar.png"},{"id":8085,"username":"watchmanmonitor","avatar_template":"/images/avatar.png"},{"id":4612,"username":"Iszi","avatar_template":"/images/avatar.png"},{"id":8018,"username":"shivermetimbers","avatar_template":"/images/avatar.png"},{"id":6060,"username":"lightyear","avatar_template":"/images/avatar.png"},{"id":2,"username":"neil","avatar_template":"/images/avatar.png"},{"id":8037,"username":"printec","avatar_template":"/images/avatar.png"},{"id":3415,"username":"radq","avatar_template":"/images/avatar.png"},{"id":6283,"username":"hrishikesh","avatar_template":"/images/avatar.png"},{"id":471,"username":"BhaelOchon","avatar_template":"/images/avatar.png"},{"id":6548,"username":"michaeld","avatar_template":"/images/avatar.png"},{"id":7286,"username":"mrotsnahoj","avatar_template":"/images/avatar.png"},{"id":3169,"username":"dgw","avatar_template":"/images/avatar.png"},{"id":926,"username":"martinnormark","avatar_template":"/images/avatar.png"},{"id":2003,"username":"taylor","avatar_template":"/images/avatar.png"},{"id":369,"username":"CvX","avatar_template":"/images/avatar.png"},{"id":562,"username":"nightpool","avatar_template":"/images/avatar.png"},{"id":6653,"username":"amitfrid","avatar_template":"/images/avatar.png"},{"id":6677,"username":"Tropnevad","avatar_template":"/images/avatar.png"},{"id":5048,"username":"SneakySly","avatar_template":"/images/avatar.png"},{"id":7333,"username":"Jong","avatar_template":"/images/avatar.png"},{"id":3124,"username":"sipp11","avatar_template":"/images/avatar.png"},{"id":7604,"username":"citkane","avatar_template":"/images/avatar.png"},{"id":3929,"username":"ScotterC","avatar_template":"/images/avatar.png"},{"id":6680,"username":"cdman","avatar_template":"/images/avatar.png"},{"id":500,"username":"aeid","avatar_template":"/images/avatar.png"},{"id":8,"username":"geek","avatar_template":"/images/avatar.png"},{"id":606,"username":"Cafeine","avatar_template":"/images/avatar.png"}],"topic_list":{"can_create_topic":false,"more_topics_url":"/latest.json?page=1","draft":null,"draft_key":"new_topic","draft_sequence":null,"topics":[{"id":11557,"title":"Error after upgrade to 0.9.7.9+","fancy_title":"Error after upgrade to 0.9.7.9+","slug":"error-after-upgrade-to-0-9-7-9","posts_count":83,"reply_count":58,"highest_post_number":85,"image_url":null,"created_at":"2013-12-22T17:12:05.000-05:00","last_posted_at":"2014-01-16T00:52:30.000-05:00","bumped":true,"bumped_at":"2014-01-16T00:52:30.000-05:00","unseen":false,"pinned":true,"excerpt":"Hi, \n\nI&#39;m using webfaction postgresql specific private instance to run discourse (custom port already configured for discourse 0.9.7.6). \n\nThis is not my first update, but this time i have an error. Impossible to upgrade&hellip;","visible":true,"closed":false,"archived":false,"views":1230,"like_count":40,"has_summary":true,"archetype":"regular","last_poster_username":"stellarhopper","category_id":17,"posters":[{"extras":null,"description":"Original Poster","user_id":7204},{"extras":null,"description":"Most Posts","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":5481},{"extras":null,"description":"Frequent Poster","user_id":6473},{"extras":"latest","description":"Most Recent Poster","user_id":6973}]},{"id":1,"title":"Welcome to meta.discourse.org","fancy_title":"Welcome to meta.discourse.org","slug":"welcome-to-meta-discourse-org","posts_count":5,"reply_count":5,"highest_post_number":23,"image_url":null,"created_at":"2013-01-31T23:52:28.000-05:00","last_posted_at":"2013-02-07T16:50:41.000-05:00","bumped":true,"bumped_at":"2013-02-07T11:57:34.000-05:00","unseen":false,"pinned":true,"excerpt":"Welcome to meta, the official site for discussing the next-gen open source Discourse forum software. You&#39;ll find topics on features, bugs, hosting, development, and general support here. \n\nDiscourse is early beta softwar&hellip;","visible":true,"closed":true,"archived":false,"views":13792,"like_count":108,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":17,"posters":[{"extras":null,"description":"Original Poster","user_id":1},{"extras":null,"description":"Most Posts","user_id":19},{"extras":null,"description":"Frequent Poster","user_id":14},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11997,"title":"Create topic in the future","fancy_title":"Create topic in the future","slug":"create-topic-in-the-future","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-16T12:14:36.000-05:00","last_posted_at":"2014-01-16T12:14:36.000-05:00","bumped":false,"bumped_at":"2014-01-16T12:14:36.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":7,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"sil","category_id":2,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":1917}]},{"id":11996,"title":"It's really hard to navigate the Create Topic / Reply pane with the keyboard","fancy_title":"It&rsquo;s really hard to navigate the Create Topic / Reply pane with the keyboard","slug":"its-really-hard-to-navigate-the-create-topic-reply-pane-with-the-keyboard","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":null,"created_at":"2014-01-16T10:51:36.000-05:00","last_posted_at":"2014-01-16T11:11:10.000-05:00","bumped":true,"bumped_at":"2014-01-16T11:11:10.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":12,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"zogstrip","category_id":9,"posters":[{"extras":null,"description":"Original Poster","user_id":7197},{"extras":"latest","description":"Most Recent Poster","user_id":1995}]},{"id":11994,"title":"Cross domain rules, followed?","fancy_title":"Cross domain rules, followed?","slug":"cross-domain-rules-followed","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":"/plugins/emoji/images/smile.png","created_at":"2014-01-16T09:59:15.000-05:00","last_posted_at":"2014-01-16T09:59:15.000-05:00","bumped":true,"bumped_at":"2014-01-16T11:04:32.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":15,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"Abhishek_Gupta","category_id":1,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":8021}]},{"id":11995,"title":"Discourse as a CAS Server","fancy_title":"Discourse as a CAS Server","slug":"discourse-as-a-cas-server","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-16T10:15:30.000-05:00","last_posted_at":"2014-01-16T10:15:31.000-05:00","bumped":true,"bumped_at":"2014-01-16T10:15:31.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":12,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"PabloC","category_id":6,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":2291}]},{"id":11993,"title":"How to check the user level via ajax?","fancy_title":"How to check the user level via ajax?","slug":"how-to-check-the-user-level-via-ajax","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-16T08:13:09.000-05:00","last_posted_at":"2014-01-16T08:13:09.000-05:00","bumped":true,"bumped_at":"2014-01-16T09:20:59.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":13,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"Abhishek_Gupta","category_id":7,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":8021}]},{"id":9540,"title":"Docker images for Discourse","fancy_title":"Docker images for Discourse","slug":"docker-images-for-discourse","posts_count":35,"reply_count":28,"highest_post_number":36,"image_url":null,"created_at":"2013-09-02T00:07:02.000-04:00","last_posted_at":"2014-01-16T07:47:18.000-05:00","bumped":true,"bumped_at":"2014-01-16T07:47:18.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":1322,"like_count":23,"has_summary":false,"archetype":"regular","last_poster_username":"illspirit","category_id":8,"posters":[{"extras":null,"description":"Original Poster","user_id":791},{"extras":null,"description":"Most Posts","user_id":1580},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":7270},{"extras":"latest","description":"Most Recent Poster","user_id":6695}]},{"id":11957,"title":"Daily Active Users, Monthly Active Users - Statistics Need","fancy_title":"Daily Active Users, Monthly Active Users - Statistics Need","slug":"daily-active-users-monthly-active-users-statistics-need","posts_count":8,"reply_count":4,"highest_post_number":8,"image_url":null,"created_at":"2014-01-14T13:40:56.000-05:00","last_posted_at":"2014-01-16T06:46:05.000-05:00","bumped":true,"bumped_at":"2014-01-16T06:46:05.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":97,"like_count":3,"has_summary":false,"archetype":"regular","last_poster_username":"jeans","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":6929},{"extras":null,"description":"Most Posts","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":4385}]},{"id":11973,"title":"Pressing Wrench Icon in the Categories section","fancy_title":"Pressing Wrench Icon in the Categories section","slug":"pressing-wrench-icon-in-the-categories-section","posts_count":6,"reply_count":3,"highest_post_number":6,"image_url":"/uploads/default/2907/d8d4e0accd5ee244.png","created_at":"2014-01-15T05:58:12.000-05:00","last_posted_at":"2014-01-16T05:15:52.000-05:00","bumped":true,"bumped_at":"2014-01-16T05:15:52.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":46,"like_count":2,"has_summary":false,"archetype":"regular","last_poster_username":"5an1ty","category_id":9,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":7073},{"extras":null,"description":"Most Posts","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":6626}]},{"id":11835,"title":"The Road to Discourse 1.0","fancy_title":"The Road to Discourse 1.0","slug":"the-road-to-discourse-1-0","posts_count":6,"reply_count":2,"highest_post_number":6,"image_url":null,"created_at":"2014-01-08T19:08:44.000-05:00","last_posted_at":"2014-01-16T04:49:16.000-05:00","bumped":true,"bumped_at":"2014-01-16T04:49:16.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":421,"like_count":33,"has_summary":false,"archetype":"regular","last_poster_username":"iontishina","category_id":13,"posters":[{"extras":null,"description":"Original Poster","user_id":32},{"extras":null,"description":"Most Posts","user_id":4457},{"extras":null,"description":"Frequent Poster","user_id":4263},{"extras":"latest","description":"Most Recent Poster","user_id":8134}]},{"id":11992,"title":"Specific customization for each category","fancy_title":"Specific customization for each category","slug":"specific-customization-for-each-category","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-16T04:04:58.000-05:00","last_posted_at":"2014-01-16T04:04:58.000-05:00","bumped":false,"bumped_at":"2014-01-16T04:04:58.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":18,"like_count":2,"has_summary":false,"archetype":"regular","last_poster_username":"nXqd","category_id":2,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":2072}]},{"id":9214,"title":"Please make category url shorter","fancy_title":"Please make category url shorter","slug":"please-make-category-url-shorter","posts_count":9,"reply_count":3,"highest_post_number":9,"image_url":null,"created_at":"2013-08-20T05:28:17.000-04:00","last_posted_at":"2014-01-16T04:02:46.000-05:00","bumped":true,"bumped_at":"2014-01-16T04:02:46.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":319,"like_count":13,"has_summary":false,"archetype":"regular","last_poster_username":"nXqd","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":4983},{"extras":null,"description":"Most Posts","user_id":3657},{"extras":null,"description":"Frequent Poster","user_id":2624},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":2072}]},{"id":11989,"title":"Where to change the email subject prefix","fancy_title":"Where to change the email subject prefix","slug":"where-to-change-the-email-subject-prefix","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":"/uploads/default/2919/adbfe0ff90353440.png","created_at":"2014-01-16T01:03:48.000-05:00","last_posted_at":"2014-01-16T03:20:09.000-05:00","bumped":true,"bumped_at":"2014-01-16T03:20:09.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":19,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":6,"posters":[{"extras":null,"description":"Original Poster","user_id":8085},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":10866,"title":"Header logo overflows the top header area","fancy_title":"Header logo overflows the top header area","slug":"header-logo-overflows-the-top-header-area","posts_count":4,"reply_count":1,"highest_post_number":4,"image_url":null,"created_at":"2013-11-09T03:40:04.000-05:00","last_posted_at":"2014-01-16T02:27:52.000-05:00","bumped":true,"bumped_at":"2014-01-16T02:40:47.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":157,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"stellarhopper","category_id":6,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":6973},{"extras":null,"description":"Most Posts","user_id":32}]},{"id":11988,"title":"Could not locate Gemfile error","fancy_title":"Could not locate Gemfile error","slug":"could-not-locate-gemfile-error","posts_count":7,"reply_count":3,"highest_post_number":7,"image_url":null,"created_at":"2014-01-16T00:41:57.000-05:00","last_posted_at":"2014-01-16T01:20:46.000-05:00","bumped":true,"bumped_at":"2014-01-16T01:20:46.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":18,"like_count":3,"has_summary":false,"archetype":"regular","last_poster_username":"sam","category_id":6,"posters":[{"extras":null,"description":"Original Poster","user_id":6973},{"extras":"latest","description":"Most Recent Poster","user_id":1}]},{"id":6266,"title":"What sort of replies trigger a notice?","fancy_title":"What sort of replies trigger a notice?","slug":"what-sort-of-replies-trigger-a-notice","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":null,"created_at":"2013-04-30T17:46:39.000-04:00","last_posted_at":"2014-01-16T00:52:21.000-05:00","bumped":true,"bumped_at":"2014-01-16T00:57:46.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":115,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":17,"posters":[{"extras":null,"description":"Original Poster","user_id":4612},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11610,"title":"Private replies that only admins can see","fancy_title":"Private replies that only admins can see","slug":"private-replies-that-only-admins-can-see","posts_count":21,"reply_count":20,"highest_post_number":23,"image_url":null,"created_at":"2013-12-26T20:31:10.000-05:00","last_posted_at":"2014-01-16T00:18:19.000-05:00","bumped":true,"bumped_at":"2014-01-16T00:18:19.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":206,"like_count":9,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":8018},{"extras":null,"description":"Most Posts","user_id":4263},{"extras":null,"description":"Frequent Poster","user_id":6060},{"extras":null,"description":"Frequent Poster","user_id":6626},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11888,"title":"Uncategorized topics not allowed, still seeing tag places","fancy_title":"Uncategorized topics not allowed, still seeing tag places","slug":"uncategorized-topics-not-allowed-still-seeing-tag-places","posts_count":5,"reply_count":1,"highest_post_number":5,"image_url":null,"created_at":"2014-01-10T19:23:37.000-05:00","last_posted_at":"2014-01-15T22:41:25.000-05:00","bumped":true,"bumped_at":"2014-01-15T22:41:25.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":50,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"illspirit","category_id":1,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":6695},{"extras":null,"description":"Most Posts","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":2}]},{"id":11985,"title":"Installation nearly installs on Centos 6.5 with Apache/Phusion","fancy_title":"Installation nearly installs on Centos 6.5 with Apache/Phusion","slug":"installation-nearly-installs-on-centos-6-5-with-apache-phusion","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-15T19:48:30.000-05:00","last_posted_at":"2014-01-15T19:48:30.000-05:00","bumped":false,"bumped_at":"2014-01-15T19:48:30.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":26,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"printec","category_id":6,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":8037}]},{"id":11981,"title":"Excluding categories from the top view?","fancy_title":"Excluding categories from the top view?","slug":"excluding-categories-from-the-top-view","posts_count":6,"reply_count":1,"highest_post_number":6,"image_url":"/uploads/default/_optimized/f01/22f/7ea01f77b9_690x355.png","created_at":"2014-01-15T15:01:37.000-05:00","last_posted_at":"2014-01-15T18:57:52.000-05:00","bumped":true,"bumped_at":"2014-01-15T18:57:47.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":43,"like_count":6,"has_summary":false,"archetype":"regular","last_poster_username":"zogstrip","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":3415},{"extras":null,"description":"Most Posts","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":1995}]},{"id":9408,"title":"Different home page for regular vs. new user","fancy_title":"Different home page for regular vs. new user","slug":"different-home-page-for-regular-vs-new-user","posts_count":25,"reply_count":17,"highest_post_number":25,"image_url":null,"created_at":"2013-08-28T09:54:41.000-04:00","last_posted_at":"2014-01-15T18:33:16.000-05:00","bumped":true,"bumped_at":"2014-01-15T18:33:16.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":334,"like_count":21,"has_summary":false,"archetype":"regular","last_poster_username":"mcwumbly","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":6283},{"extras":null,"description":"Most Posts","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":1995},{"extras":null,"description":"Frequent Poster","user_id":471},{"extras":"latest","description":"Most Recent Poster","user_id":4263}]},{"id":11896,"title":"Problem creating new account","fancy_title":"Problem creating new account","slug":"problem-creating-new-account","posts_count":11,"reply_count":2,"highest_post_number":11,"image_url":null,"created_at":"2014-01-11T09:07:20.000-05:00","last_posted_at":"2014-01-15T20:50:05.000-05:00","bumped":true,"bumped_at":"2014-01-15T15:23:32.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":87,"like_count":6,"has_summary":false,"archetype":"regular","last_poster_username":"sam","category_id":6,"posters":[{"extras":null,"description":"Original Poster","user_id":6548},{"extras":null,"description":"Most Posts","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":2},{"extras":"latest","description":"Most Recent Poster","user_id":1}]},{"id":10511,"title":"External urls should open in new tab","fancy_title":"External urls should open in new tab","slug":"external-urls-should-open-in-new-tab","posts_count":7,"reply_count":3,"highest_post_number":7,"image_url":null,"created_at":"2013-10-20T14:54:27.000-04:00","last_posted_at":"2014-01-15T14:02:11.000-05:00","bumped":true,"bumped_at":"2014-01-15T14:01:55.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":242,"like_count":10,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":7286},{"extras":null,"description":"Most Posts","user_id":3169},{"extras":null,"description":"Frequent Poster","user_id":4263},{"extras":null,"description":"Frequent Poster","user_id":6626},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":1589,"title":"Keyboard shortcuts?","fancy_title":"Keyboard shortcuts?","slug":"keyboard-shortcuts","posts_count":19,"reply_count":10,"highest_post_number":20,"image_url":null,"created_at":"2013-02-06T14:05:01.000-05:00","last_posted_at":"2014-01-15T13:52:45.000-05:00","bumped":true,"bumped_at":"2014-01-15T13:52:45.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":754,"like_count":31,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":926},{"extras":null,"description":"Most Posts","user_id":2003},{"extras":null,"description":"Frequent Poster","user_id":369},{"extras":null,"description":"Frequent Poster","user_id":562},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11763,"title":"Google AdSense plugin is now available","fancy_title":"Google AdSense plugin is now available","slug":"google-adsense-plugin-is-now-available","posts_count":7,"reply_count":2,"highest_post_number":7,"image_url":"/uploads/default/_optimized/66d/cf0/d69e6709fe_496x500.PNG","created_at":"2014-01-05T14:28:58.000-05:00","last_posted_at":"2014-01-15T13:32:35.000-05:00","bumped":true,"bumped_at":"2014-01-15T13:32:35.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":213,"like_count":14,"has_summary":false,"archetype":"regular","last_poster_username":"michaeld","category_id":5,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":6548},{"extras":null,"description":"Most Posts","user_id":6653},{"extras":null,"description":"Frequent Poster","user_id":6677},{"extras":null,"description":"Frequent Poster","user_id":5048},{"extras":null,"description":"Frequent Poster","user_id":7333}]},{"id":9151,"title":"Apple touch icon doesn't show if there is no sub domain","fancy_title":"Apple touch icon doesn&rsquo;t show if there is no sub domain","slug":"apple-touch-icon-doesnt-show-if-there-is-no-sub-domain","posts_count":7,"reply_count":4,"highest_post_number":7,"image_url":null,"created_at":"2013-08-16T18:16:53.000-04:00","last_posted_at":"2014-01-15T17:10:18.000-05:00","bumped":true,"bumped_at":"2014-01-15T13:19:22.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":188,"like_count":3,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":3124},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":11977,"title":"Show subcategory topics in categories list summary","fancy_title":"Show subcategory topics in categories list summary","slug":"show-subcategory-topics-in-categories-list-summary","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":"/uploads/default/_optimized/084/4e4/8af88c0839_571x500.png","created_at":"2014-01-15T12:09:49.000-05:00","last_posted_at":"2014-01-15T12:50:04.000-05:00","bumped":true,"bumped_at":"2014-01-15T12:50:04.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":32,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":7604},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":10201,"title":"How To override an existing handlebars template from plugin","fancy_title":"How To override an existing handlebars template from plugin","slug":"how-to-override-an-existing-handlebars-template-from-plugin","posts_count":6,"reply_count":1,"highest_post_number":6,"image_url":null,"created_at":"2013-10-04T10:44:33.000-04:00","last_posted_at":"2014-01-15T12:35:01.000-05:00","bumped":true,"bumped_at":"2014-01-15T12:34:58.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":325,"like_count":6,"has_summary":false,"archetype":"regular","last_poster_username":"zogstrip","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":3929},{"extras":null,"description":"Most Posts","user_id":3415},{"extras":null,"description":"Frequent Poster","user_id":6680},{"extras":null,"description":"Frequent Poster","user_id":2},{"extras":"latest","description":"Most Recent Poster","user_id":1995}]},{"id":531,"title":"Discourse and Wordpress Integration","fancy_title":"Discourse and Wordpress Integration","slug":"discourse-and-wordpress-integration","posts_count":76,"reply_count":64,"highest_post_number":78,"image_url":null,"created_at":"2013-02-05T18:56:37.000-05:00","last_posted_at":"2014-01-15T11:56:54.000-05:00","bumped":true,"bumped_at":"2014-01-15T11:56:54.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":3809,"like_count":84,"has_summary":true,"archetype":"regular","last_poster_username":"codinghorror","category_id":5,"posters":[{"extras":null,"description":"Original Poster","user_id":500},{"extras":null,"description":"Most Posts","user_id":8},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":606},{"extras":"latest","description":"Most Recent Poster","user_id":32}]}]}},
-"/categories.json": {"featured_users":[{"id":8021,"username":"Abhishek_Gupta","avatar_template":"/images/avatar.png"},{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"},{"id":6695,"username":"illspirit","avatar_template":"/images/avatar.png"},{"id":2,"username":"neil","avatar_template":"/images/avatar.png"},{"id":1995,"username":"zogstrip","avatar_template":"/images/avatar.png"},{"id":1917,"username":"sil","avatar_template":"/images/avatar.png"},{"id":4385,"username":"jeans","avatar_template":"/images/avatar.png"},{"id":2072,"username":"nXqd","avatar_template":"/images/avatar.png"},{"id":4263,"username":"mcwumbly","avatar_template":"/images/avatar.png"},{"id":2291,"username":"PabloC","avatar_template":"/images/avatar.png"},{"id":6973,"username":"stellarhopper","avatar_template":"/images/avatar.png"},{"id":1,"username":"sam","avatar_template":"/images/avatar.png"},{"id":8085,"username":"watchmanmonitor","avatar_template":"/images/avatar.png"},{"id":5428,"username":"abbat","avatar_template":"/images/avatar.png"},{"id":8208,"username":"maximaximums","avatar_template":"/images/avatar.png"},{"id":7995,"username":"Hunter","avatar_template":"/images/avatar.png"},{"id":7197,"username":"peeja","avatar_template":"/images/avatar.png"},{"id":7073,"username":"5an1ty","avatar_template":"/images/avatar.png"},{"id":6626,"username":"riking","avatar_template":"/images/avatar.png"},{"id":6548,"username":"michaeld","avatar_template":"/images/avatar.png"},{"id":8202,"username":"Matthieu","avatar_template":"/images/avatar.png"},{"id":6677,"username":"Tropnevad","avatar_template":"/images/avatar.png"},{"id":7333,"username":"Jong","avatar_template":"/images/avatar.png"},{"id":6018,"username":"robypez","avatar_template":"/images/avatar.png"},{"id":1580,"username":"ABillionSuns","avatar_template":"/images/avatar.png"},{"id":7030,"username":"naabster","avatar_template":"/images/avatar.png"},{"id":8163,"username":"znation","avatar_template":"/images/avatar.png"},{"id":19,"username":"eviltrout","avatar_template":"/images/avatar.png"},{"id":7796,"username":"almereyda","avatar_template":"/images/avatar.png"},{"id":8024,"username":"stefanobernardi","avatar_template":"/images/avatar.png"},{"id":5174,"username":"MaSe","avatar_template":"/images/avatar.png"},{"id":4534,"username":"Julien","avatar_template":"/images/avatar.png"},{"id":2316,"username":"pakl","avatar_template":"/images/avatar.png"},{"id":4457,"username":"Lee_Ars","avatar_template":"/images/avatar.png"},{"id":8134,"username":"iontishina","avatar_template":"/images/avatar.png"},{"id":8047,"username":"zooko","avatar_template":"/images/avatar.png"},{"id":7483,"username":"jhogendorn","avatar_template":"/images/avatar.png"},{"id":5548,"username":"pdbradley","avatar_template":"/images/avatar.png"},{"id":4755,"username":"andanthor","avatar_template":"/images/avatar.png"},{"id":7984,"username":"sophearak","avatar_template":"/images/avatar.png"},{"id":5351,"username":"erlend_sh","avatar_template":"/images/avatar.png"}],"category_list":{"can_create_category":false,"can_create_topic":false,"draft":null,"draft_key":"new_topic","draft_sequence":null,"categories":[{"id":1,"name":"bug","color":"e9dd00","text_color":"000000","slug":"bug","topic_count":660,"description":"Bug reports on Discourse. Do be sure to search prior to submitting bugs. Include repro steps, and only describe one bug per topic please.","topic_url":"/t/category-definition-for-bug/2","read_restricted":false,"permission":null,"post_count":4318,"topics_day":0,"topics_week":18,"topics_month":54,"topics_year":658,"posts_day":0,"posts_week":330,"posts_month":574,"posts_year":4319,"description_excerpt":"Bug reports on Discourse. Do be sure to search prior to submitting bugs. Include repro steps, and only describe one bug per topic please.","featured_user_ids":[8021,32,6695,2,1995],"topics":[{"id":11994,"title":"Cross domain rules, followed?","fancy_title":"Cross domain rules, followed?","slug":"cross-domain-rules-followed","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":"/plugins/emoji/images/smile.png","created_at":"2014-01-16T09:59:15.000-05:00","last_posted_at":"2014-01-16T09:59:15.000-05:00","bumped":true,"bumped_at":"2014-01-16T11:04:32.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":8021,"username":"Abhishek_Gupta","avatar_template":"/images/avatar.png"}},{"id":11888,"title":"Uncategorized topics not allowed, still seeing tag places","fancy_title":"Uncategorized topics not allowed, still seeing tag places","slug":"uncategorized-topics-not-allowed-still-seeing-tag-places","posts_count":5,"reply_count":1,"highest_post_number":5,"image_url":null,"created_at":"2014-01-10T19:23:37.000-05:00","last_posted_at":"2014-01-15T22:41:25.000-05:00","bumped":true,"bumped_at":"2014-01-15T22:41:25.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":6695,"username":"illspirit","avatar_template":"/images/avatar.png"}},{"id":9151,"title":"Apple touch icon doesn't show if there is no sub domain","fancy_title":"Apple touch icon doesn&rsquo;t show if there is no sub domain","slug":"apple-touch-icon-doesnt-show-if-there-is-no-sub-domain","posts_count":7,"reply_count":4,"highest_post_number":7,"image_url":null,"created_at":"2013-08-16T18:16:53.000-04:00","last_posted_at":"2014-01-15T17:10:18.000-05:00","bumped":true,"bumped_at":"2014-01-15T13:19:22.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}}]},{"id":2,"name":"feature","color":"0E76BD","text_color":"FFFFFF","slug":"feature","topic_count":727,"description":"Discussion about features or potential features of Discourse: how they work, why they work, etc.","topic_url":"/t/category-definition-for-feature/11","read_restricted":false,"permission":null,"post_count":6186,"topics_day":0,"topics_week":17,"topics_month":46,"topics_year":725,"posts_day":0,"posts_week":180,"posts_month":468,"posts_year":6187,"description_excerpt":"Discussion about features or potential features of Discourse: how they work, why they work, etc.","featured_user_ids":[1917,4385,2072,32,4263],"topics":[{"id":11997,"title":"Create topic in the future","fancy_title":"Create topic in the future","slug":"create-topic-in-the-future","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-16T12:14:36.000-05:00","last_posted_at":"2014-01-16T12:14:36.000-05:00","bumped":false,"bumped_at":"2014-01-16T12:14:36.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":1917,"username":"sil","avatar_template":"/images/avatar.png"}},{"id":11957,"title":"Daily Active Users, Monthly Active Users - Statistics Need","fancy_title":"Daily Active Users, Monthly Active Users - Statistics Need","slug":"daily-active-users-monthly-active-users-statistics-need","posts_count":8,"reply_count":4,"highest_post_number":8,"image_url":null,"created_at":"2014-01-14T13:40:56.000-05:00","last_posted_at":"2014-01-16T06:46:05.000-05:00","bumped":true,"bumped_at":"2014-01-16T06:46:05.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":4385,"username":"jeans","avatar_template":"/images/avatar.png"}},{"id":11992,"title":"Specific customization for each category","fancy_title":"Specific customization for each category","slug":"specific-customization-for-each-category","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-16T04:04:58.000-05:00","last_posted_at":"2014-01-16T04:04:58.000-05:00","bumped":false,"bumped_at":"2014-01-16T04:04:58.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":2072,"username":"nXqd","avatar_template":"/images/avatar.png"}}]},{"id":6,"name":"support","color":"b99","text_color":"FFFFFF","slug":"support","topic_count":782,"description":"Support on configuring, using, and installing Discourse. Not for software development related topics, but for admins and end users configuring and using Discourse.","topic_url":"/t/category-definition-for-support/389","read_restricted":false,"permission":null,"post_count":5396,"topics_day":0,"topics_week":16,"topics_month":67,"topics_year":779,"posts_day":0,"posts_week":122,"posts_month":481,"posts_year":5400,"description_excerpt":"Support on configuring, using, and installing Discourse. Not for software development related topics, but for admins and end users configuring and using Discourse.","featured_user_ids":[2291,32,6973,1,8085],"topics":[{"id":11995,"title":"Discourse as a CAS Server","fancy_title":"Discourse as a CAS Server","slug":"discourse-as-a-cas-server","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-16T10:15:30.000-05:00","last_posted_at":"2014-01-16T10:15:31.000-05:00","bumped":true,"bumped_at":"2014-01-16T10:15:31.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":2291,"username":"PabloC","avatar_template":"/images/avatar.png"}},{"id":11989,"title":"Where to change the email subject prefix","fancy_title":"Where to change the email subject prefix","slug":"where-to-change-the-email-subject-prefix","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":"/uploads/default/2919/adbfe0ff90353440.png","created_at":"2014-01-16T01:03:48.000-05:00","last_posted_at":"2014-01-16T03:20:09.000-05:00","bumped":true,"bumped_at":"2014-01-16T03:20:09.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}},{"id":10866,"title":"Header logo overflows the top header area","fancy_title":"Header logo overflows the top header area","slug":"header-logo-overflows-the-top-header-area","posts_count":4,"reply_count":1,"highest_post_number":4,"image_url":null,"created_at":"2013-11-09T03:40:04.000-05:00","last_posted_at":"2014-01-16T02:27:52.000-05:00","bumped":true,"bumped_at":"2014-01-16T02:40:47.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":6973,"username":"stellarhopper","avatar_template":"/images/avatar.png"}}]},{"id":7,"name":"dev","color":"000","text_color":"FFFFFF","slug":"dev","topic_count":284,"description":"This category is for topics related to hacking on Discourse: submitting pull requests, configuring development environments, coding conventions, and so forth.","topic_url":"/t/category-definition-for-dev/1026","read_restricted":false,"permission":null,"post_count":2352,"topics_day":0,"topics_week":3,"topics_month":19,"topics_year":284,"posts_day":0,"posts_week":37,"posts_month":150,"posts_year":2353,"description_excerpt":"This category is for topics related to hacking on Discourse: submitting pull requests, configuring development environments, coding conventions, and so forth.","featured_user_ids":[8021,1995,5428,8208,7995],"topics":[{"id":3823,"title":"So, you want to help out with Discourse","fancy_title":"So, you want to help out with Discourse","slug":"so-you-want-to-help-out-with-discourse","posts_count":22,"reply_count":28,"highest_post_number":56,"image_url":null,"created_at":"2013-02-23T00:46:11.000-05:00","last_posted_at":"2014-01-12T21:33:12.000-05:00","bumped":true,"bumped_at":"2014-01-12T21:33:12.000-05:00","unseen":false,"pinned":true,"excerpt":"People are wondering, how it is they can help out with Discourse.  \n\nWe have seen some chattering both here and on Github. \n\nI wanted to create a topic @eviltrout , @codinghorror and myself can keep up to date with clear&hellip;","visible":true,"closed":false,"archived":false,"last_poster":{"id":7995,"username":"Hunter","avatar_template":"/images/avatar.png"}},{"id":11993,"title":"How to check the user level via ajax?","fancy_title":"How to check the user level via ajax?","slug":"how-to-check-the-user-level-via-ajax","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-16T08:13:09.000-05:00","last_posted_at":"2014-01-16T08:13:09.000-05:00","bumped":true,"bumped_at":"2014-01-16T09:20:59.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":8021,"username":"Abhishek_Gupta","avatar_template":"/images/avatar.png"}},{"id":10201,"title":"How To override an existing handlebars template from plugin","fancy_title":"How To override an existing handlebars template from plugin","slug":"how-to-override-an-existing-handlebars-template-from-plugin","posts_count":6,"reply_count":1,"highest_post_number":6,"image_url":null,"created_at":"2013-10-04T10:44:33.000-04:00","last_posted_at":"2014-01-15T12:35:01.000-05:00","bumped":true,"bumped_at":"2014-01-15T12:34:58.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"last_poster":{"id":1995,"username":"zogstrip","avatar_template":"/images/avatar.png"}}]},{"id":9,"name":"ux","color":"5F497A","text_color":"FFFFFF","slug":"ux","topic_count":184,"description":"Discussion about the user interface of Discourse, how features are presented to the user in the client, including language and UI elements.","topic_url":"/t/category-definition-for-ux/2628","read_restricted":false,"permission":null,"post_count":1511,"topics_day":0,"topics_week":3,"topics_month":10,"topics_year":183,"posts_day":0,"posts_week":34,"posts_month":117,"posts_year":1511,"description_excerpt":"Discussion about the user interface of Discourse, how features are presented to the user in the client, including language and UI elements.","featured_user_ids":[1995,7197,7073,1,6626],"topics":[{"id":11996,"title":"It's really hard to navigate the Create Topic / Reply pane with the keyboard","fancy_title":"It&rsquo;s really hard to navigate the Create Topic / Reply pane with the keyboard","slug":"its-really-hard-to-navigate-the-create-topic-reply-pane-with-the-keyboard","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":null,"created_at":"2014-01-16T10:51:36.000-05:00","last_posted_at":"2014-01-16T11:11:10.000-05:00","bumped":true,"bumped_at":"2014-01-16T11:11:10.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":1995,"username":"zogstrip","avatar_template":"/images/avatar.png"}},{"id":11973,"title":"Pressing Wrench Icon in the Categories section","fancy_title":"Pressing Wrench Icon in the Categories section","slug":"pressing-wrench-icon-in-the-categories-section","posts_count":6,"reply_count":3,"highest_post_number":6,"image_url":"/uploads/default/2907/d8d4e0accd5ee244.png","created_at":"2014-01-15T05:58:12.000-05:00","last_posted_at":"2014-01-16T05:15:52.000-05:00","bumped":true,"bumped_at":"2014-01-16T05:15:52.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":7073,"username":"5an1ty","avatar_template":"/images/avatar.png"}},{"id":5542,"title":"Title character requirements not very visible","fancy_title":"Title character requirements not very visible","slug":"title-character-requirements-not-very-visible","posts_count":24,"reply_count":11,"highest_post_number":24,"image_url":null,"created_at":"2013-04-02T20:09:59.000-04:00","last_posted_at":"2014-01-15T05:26:07.000-05:00","bumped":true,"bumped_at":"2014-01-15T05:26:04.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"last_poster":{"id":1995,"username":"zogstrip","avatar_template":"/images/avatar.png"}}]},{"id":5,"name":"extensibility","color":"FE8432","text_color":"FFFFFF","slug":"extensibility","topic_count":102,"description":"Topics about extending the functionality of Discourse with plugins, themes, add-ons, or other mechanisms for extensibility.  ","topic_url":"/t/category-definition-for-extensibility/28","read_restricted":false,"permission":null,"post_count":964,"topics_day":0,"topics_week":2,"topics_month":18,"topics_year":102,"posts_day":0,"posts_week":17,"posts_month":76,"posts_year":964,"description_excerpt":"Topics about extending the functionality of Discourse with plugins, themes, add-ons, or other mechanisms for extensibility.","featured_user_ids":[6548,32,8202,6677,7333],"topics":[{"id":11763,"title":"Google AdSense plugin is now available","fancy_title":"Google AdSense plugin is now available","slug":"google-adsense-plugin-is-now-available","posts_count":7,"reply_count":2,"highest_post_number":7,"image_url":"/uploads/default/_optimized/66d/cf0/d69e6709fe_496x500.PNG","created_at":"2014-01-05T14:28:58.000-05:00","last_posted_at":"2014-01-15T13:32:35.000-05:00","bumped":true,"bumped_at":"2014-01-15T13:32:35.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":6548,"username":"michaeld","avatar_template":"/images/avatar.png"}},{"id":531,"title":"Discourse and Wordpress Integration","fancy_title":"Discourse and Wordpress Integration","slug":"discourse-and-wordpress-integration","posts_count":76,"reply_count":64,"highest_post_number":78,"image_url":null,"created_at":"2013-02-05T18:56:37.000-05:00","last_posted_at":"2014-01-15T11:56:54.000-05:00","bumped":true,"bumped_at":"2014-01-15T11:56:54.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}},{"id":11965,"title":"In your opinion, what is the best wiki engine to be associated with discourse?","fancy_title":"In your opinion, what is the best wiki engine to be associated with discourse?","slug":"in-your-opinion-what-is-the-best-wiki-engine-to-be-associated-with-discourse","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-14T19:27:06.000-05:00","last_posted_at":"2014-01-14T19:27:06.000-05:00","bumped":false,"bumped_at":"2014-01-14T19:27:06.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":8202,"username":"Matthieu","avatar_template":"/images/avatar.png"}}]},{"id":8,"name":"hosting","color":"74CCED","text_color":"FFFFFF","slug":"hosting","topic_count":69,"description":"Topics about hosting Discourse, either on your own servers, in the cloud, or with specific hosting services.","topic_url":"/t/category-definition-for-hosting/2626","read_restricted":false,"permission":null,"post_count":664,"topics_day":0,"topics_week":2,"topics_month":2,"topics_year":69,"posts_day":0,"posts_week":15,"posts_month":35,"posts_year":664,"description_excerpt":"Topics about hosting Discourse, either on your own servers, in the cloud, or with specific hosting services.","featured_user_ids":[6695,1,6018,1580,7030],"topics":[{"id":9540,"title":"Docker images for Discourse","fancy_title":"Docker images for Discourse","slug":"docker-images-for-discourse","posts_count":35,"reply_count":28,"highest_post_number":36,"image_url":null,"created_at":"2013-09-02T00:07:02.000-04:00","last_posted_at":"2014-01-16T07:47:18.000-05:00","bumped":true,"bumped_at":"2014-01-16T07:47:18.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":6695,"username":"illspirit","avatar_template":"/images/avatar.png"}},{"id":11971,"title":"Installing Discourse on Ubuntu 12.04 with Parallels Plesk and Apache","fancy_title":"Installing Discourse on Ubuntu 12.04 with Parallels Plesk and Apache","slug":"installing-discourse-on-ubuntu-12-04-with-parallels-plesk-and-apache","posts_count":3,"reply_count":1,"highest_post_number":3,"image_url":null,"created_at":"2014-01-15T04:23:38.000-05:00","last_posted_at":"2014-01-15T04:47:20.000-05:00","bumped":true,"bumped_at":"2014-01-15T04:47:20.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":7030,"username":"naabster","avatar_template":"/images/avatar.png"}},{"id":10844,"title":"Discourse in a Docker container","fancy_title":"Discourse in a Docker container","slug":"discourse-in-a-docker-container","posts_count":12,"reply_count":8,"highest_post_number":12,"image_url":null,"created_at":"2013-11-07T19:12:22.000-05:00","last_posted_at":"2014-01-11T14:43:53.000-05:00","bumped":true,"bumped_at":"2014-01-11T14:43:53.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":1,"username":"sam","avatar_template":"/images/avatar.png"}}]},{"id":17,"name":"uncategorized","color":"AB9364","text_color":"FFFFFF","slug":"uncategorized","topic_count":229,"description":"","topic_url":null,"read_restricted":false,"permission":null,"post_count":2138,"topics_day":0,"topics_week":0,"topics_month":9,"topics_year":229,"posts_day":1,"posts_week":11,"posts_month":183,"posts_year":2138,"description_excerpt":"","is_uncategorized":true,"featured_user_ids":[6973,32,1,1995,7073],"topics":[{"id":1,"title":"Welcome to meta.discourse.org","fancy_title":"Welcome to meta.discourse.org","slug":"welcome-to-meta-discourse-org","posts_count":5,"reply_count":5,"highest_post_number":23,"image_url":null,"created_at":"2013-01-31T23:52:28.000-05:00","last_posted_at":"2013-02-07T16:50:41.000-05:00","bumped":true,"bumped_at":"2013-02-07T11:57:34.000-05:00","unseen":false,"pinned":true,"excerpt":"Welcome to meta, the official site for discussing the next-gen open source Discourse forum software. You&#39;ll find topics on features, bugs, hosting, development, and general support here. \n\nDiscourse is early beta softwar&hellip;","visible":true,"closed":true,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}},{"id":11557,"title":"Error after upgrade to 0.9.7.9+","fancy_title":"Error after upgrade to 0.9.7.9+","slug":"error-after-upgrade-to-0-9-7-9","posts_count":83,"reply_count":58,"highest_post_number":85,"image_url":null,"created_at":"2013-12-22T17:12:05.000-05:00","last_posted_at":"2014-01-16T00:52:30.000-05:00","bumped":true,"bumped_at":"2014-01-16T00:52:30.000-05:00","unseen":false,"pinned":true,"excerpt":"Hi, \n\nI&#39;m using webfaction postgresql specific private instance to run discourse (custom port already configured for discourse 0.9.7.6). \n\nThis is not my first update, but this time i have an error. Impossible to upgrade&hellip;","visible":true,"closed":false,"archived":false,"last_poster":{"id":6973,"username":"stellarhopper","avatar_template":"/images/avatar.png"}},{"id":6266,"title":"What sort of replies trigger a notice?","fancy_title":"What sort of replies trigger a notice?","slug":"what-sort-of-replies-trigger-a-notice","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":null,"created_at":"2013-04-30T17:46:39.000-04:00","last_posted_at":"2014-01-16T00:52:21.000-05:00","bumped":true,"bumped_at":"2014-01-16T00:57:46.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}}]},{"id":11,"name":"login","color":"edb400","text_color":"FFFFFF","slug":"login","topic_count":27,"description":"Topics about logging in to Discourse, using any standard third party provider (Twitter, Facebook, Google), traditional username and password, or with a custom plugin.","topic_url":"/t/category-definition-for-login/2828","read_restricted":false,"permission":null,"post_count":200,"topics_day":0,"topics_week":1,"topics_month":1,"topics_year":27,"posts_day":0,"posts_week":10,"posts_month":27,"posts_year":200,"description_excerpt":"Topics about logging in to Discourse, using any standard third party provider (Twitter, Facebook, Google), traditional username and password, or with a custom plugin.","featured_user_ids":[8163,19,7796,32,8024],"topics":[{"id":11959,"title":"Get current user information via JSON","fancy_title":"Get current user information via JSON","slug":"get-current-user-information-via-json","posts_count":3,"reply_count":1,"highest_post_number":3,"image_url":null,"created_at":"2014-01-14T15:05:34.000-05:00","last_posted_at":"2014-01-14T16:43:28.000-05:00","bumped":true,"bumped_at":"2014-01-14T16:43:28.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":8163,"username":"znation","avatar_template":"/images/avatar.png"}},{"id":6242,"title":"Allow authentication via multiple services on one account","fancy_title":"Allow authentication via multiple services on one account","slug":"allow-authentication-via-multiple-services-on-one-account","posts_count":34,"reply_count":27,"highest_post_number":34,"image_url":null,"created_at":"2013-04-29T18:51:52.000-04:00","last_posted_at":"2014-01-14T00:25:42.000-05:00","bumped":true,"bumped_at":"2014-01-14T00:25:42.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":7796,"username":"almereyda","avatar_template":"/images/avatar.png"}},{"id":4738,"title":"Login support for browser password managers","fancy_title":"Login support for browser password managers","slug":"login-support-for-browser-password-managers","posts_count":6,"reply_count":2,"highest_post_number":6,"image_url":null,"created_at":"2013-03-13T17:55:29.000-04:00","last_posted_at":"2014-01-13T14:21:34.000-05:00","bumped":true,"bumped_at":"2014-01-13T14:21:34.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}}]},{"id":3,"name":"meta","color":"aaa","text_color":"FFFFFF","slug":"meta","topic_count":79,"description":"Discussion about meta.discourse.org itself, the organization of this forum about Discourse, how it works, and how we can improve this site.","topic_url":"/t/category-definition-for-meta/24","read_restricted":false,"permission":null,"post_count":695,"topics_day":0,"topics_week":1,"topics_month":3,"topics_year":79,"posts_day":0,"posts_week":4,"posts_month":18,"posts_year":696,"description_excerpt":"Discussion about meta.discourse.org itself, the organization of this forum about Discourse, how it works, and how we can improve this site.","featured_user_ids":[19,8085,32,5174,4534],"topics":[{"id":5249,"title":"What is \"Meta\"?","fancy_title":"What is &ldquo;Meta&rdquo;?","slug":"what-is-meta","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":null,"created_at":"2013-03-25T18:00:52.000-04:00","last_posted_at":"2013-03-25T18:00:56.000-04:00","bumped":false,"bumped_at":"2013-03-25T18:00:52.000-04:00","unseen":false,"pinned":true,"excerpt":"Meta means discussion of the discussion itself instead of the actual topic of the discussion.  \n\nWhy do we need a meta category?\n\nMeta is where communities come together to decide who they are and what they are about.  \n&hellip;","visible":true,"closed":false,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}},{"id":11943,"title":"How far to take user documentation?","fancy_title":"How far to take user documentation?","slug":"how-far-to-take-user-documentation","posts_count":4,"reply_count":2,"highest_post_number":4,"image_url":"/plugins/emoji/images/smile.png","created_at":"2014-01-13T19:21:26.000-05:00","last_posted_at":"2014-01-14T14:19:46.000-05:00","bumped":true,"bumped_at":"2014-01-14T14:19:46.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":19,"username":"eviltrout","avatar_template":"/images/avatar.png"}},{"id":11822,"title":"Search engine traffic share and level to Discourse","fancy_title":"Search engine traffic share and level to Discourse","slug":"search-engine-traffic-share-and-level-to-discourse","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":null,"created_at":"2014-01-08T01:54:56.000-05:00","last_posted_at":"2014-01-08T02:21:25.000-05:00","bumped":true,"bumped_at":"2014-01-08T02:21:25.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}}]},{"id":12,"name":"discourse hub","color":"b2c79f","text_color":"FFFFFF","slug":"discourse-hub","topic_count":4,"description":"Topics about current or future Discourse Hub functionality at discourse.org including nickname registration, global user pages, and the site directory.","topic_url":"/t/category-definition-for-discourse-hub/3038","read_restricted":false,"permission":null,"post_count":121,"topics_day":0,"topics_week":0,"topics_month":0,"topics_year":4,"posts_day":0,"posts_week":3,"posts_month":3,"posts_year":121,"description_excerpt":"Topics about current or future Discourse Hub functionality at discourse.org including nickname registration, global user pages, and the site directory.","featured_user_ids":[2,32,2316,6695,4457],"topics":[{"id":6547,"title":"Where to get discourse_org_access_key?","fancy_title":"Where to get discourse_org_access_key?","slug":"where-to-get-discourse-org-access-key","posts_count":13,"reply_count":4,"highest_post_number":13,"image_url":null,"created_at":"2013-05-10T22:06:08.000-04:00","last_posted_at":"2014-01-13T11:38:15.000-05:00","bumped":true,"bumped_at":"2014-01-13T11:38:15.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":2,"username":"neil","avatar_template":"/images/avatar.png"}},{"id":2544,"title":"Discourse central hub questions","fancy_title":"Discourse central hub questions","slug":"discourse-central-hub-questions","posts_count":51,"reply_count":44,"highest_post_number":52,"image_url":null,"created_at":"2013-02-09T04:28:21.000-05:00","last_posted_at":"2013-09-19T13:36:49.000-04:00","bumped":true,"bumped_at":"2013-09-19T14:04:08.000-04:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":2128,"username":"ultimape","avatar_template":"/images/avatar.png"}},{"id":424,"title":"What are the 'consequences' of changing your name?","fancy_title":"What are the &lsquo;consequences&rsquo; of changing your name?","slug":"what-are-the-consequences-of-changing-your-name","posts_count":35,"reply_count":36,"highest_post_number":43,"image_url":null,"created_at":"2013-02-05T17:37:52.000-05:00","last_posted_at":"2013-09-19T13:55:11.000-04:00","bumped":true,"bumped_at":"2013-09-19T13:55:11.000-04:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":2128,"username":"ultimape","avatar_template":"/images/avatar.png"}}]},{"id":13,"name":"blog","color":"ED207B","text_color":"FFFFFF","slug":"blog","topic_count":14,"description":"Discussion topics generated from the official Discourse Blog. These topics are linked from the bottom of each blog entry where the blog comments would normally be.","topic_url":"/t/category-definition-for-blog/5250","read_restricted":false,"permission":null,"post_count":206,"topics_day":0,"topics_week":0,"topics_month":1,"topics_year":14,"posts_day":0,"posts_week":2,"posts_month":11,"posts_year":206,"description_excerpt":"Discussion topics generated from the official Discourse Blog. These topics are linked from the bottom of each blog entry where the blog comments would normally be.","featured_user_ids":[8134,32,4457,4263,1995],"topics":[{"id":11835,"title":"The Road to Discourse 1.0","fancy_title":"The Road to Discourse 1.0","slug":"the-road-to-discourse-1-0","posts_count":6,"reply_count":2,"highest_post_number":6,"image_url":null,"created_at":"2014-01-08T19:08:44.000-05:00","last_posted_at":"2014-01-16T04:49:16.000-05:00","bumped":true,"bumped_at":"2014-01-16T04:49:16.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":8134,"username":"iontishina","avatar_template":"/images/avatar.png"}},{"id":5751,"title":"Discourse as Your First Rails App","fancy_title":"Discourse as Your First Rails App","slug":"discourse-as-your-first-rails-app","posts_count":62,"reply_count":43,"highest_post_number":71,"image_url":null,"created_at":"2013-04-09T19:08:33.000-04:00","last_posted_at":"2013-12-19T18:27:37.000-05:00","bumped":true,"bumped_at":"2013-12-19T18:27:37.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":1995,"username":"zogstrip","avatar_template":"/images/avatar.png"}},{"id":5898,"title":"The Discourse Servers","fancy_title":"The Discourse Servers","slug":"the-discourse-servers","posts_count":42,"reply_count":32,"highest_post_number":42,"image_url":null,"created_at":"2013-04-15T15:19:09.000-04:00","last_posted_at":"2013-11-29T15:14:35.000-05:00","bumped":true,"bumped_at":"2013-11-29T15:14:35.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":6626,"username":"riking","avatar_template":"/images/avatar.png"}}]},{"id":4,"name":"faq","color":"33b","text_color":"FFFFFF","slug":"faq","topic_count":49,"description":"Topics that come up very often when discussing Discourse will eventually be classified into this Frequently Asked Questions category. Should only be added to popular topics.","topic_url":"/t/category-definition-for-faq/25","read_restricted":false,"permission":null,"post_count":450,"topics_day":0,"topics_week":0,"topics_month":0,"topics_year":49,"posts_day":0,"posts_week":1,"posts_month":10,"posts_year":450,"description_excerpt":"Topics that come up very often when discussing Discourse will eventually be classified into this Frequently Asked Questions category. Should only be added to popular topics.","featured_user_ids":[32,8047,7483,2,6626],"topics":[{"id":5372,"title":"UX confusion (or me confusion) is it possible to edit old posts or only your most recent post in a topic?","fancy_title":"UX confusion (or me confusion) is it possible to edit old posts or only your most recent post in a topic?","slug":"ux-confusion-or-me-confusion-is-it-possible-to-edit-old-posts-or-only-your-most-recent-post-in-a-topic","posts_count":3,"reply_count":0,"highest_post_number":3,"image_url":null,"created_at":"2013-03-28T22:25:57.000-04:00","last_posted_at":"2014-01-13T13:44:39.000-05:00","bumped":true,"bumped_at":"2014-01-13T13:44:39.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}},{"id":9631,"title":"All the options to deploy Discourse with their relative pros and cons","fancy_title":"All the options to deploy Discourse with their relative pros and cons","slug":"all-the-options-to-deploy-discourse-with-their-relative-pros-and-cons","posts_count":14,"reply_count":7,"highest_post_number":15,"image_url":null,"created_at":"2013-09-06T03:55:09.000-04:00","last_posted_at":"2013-09-26T18:49:04.000-04:00","bumped":true,"bumped_at":"2013-12-30T12:32:59.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":3929,"username":"ScotterC","avatar_template":"/images/avatar.png"}},{"id":4325,"title":"How to delete a user?","fancy_title":"How to delete a user?","slug":"how-to-delete-a-user","posts_count":31,"reply_count":23,"highest_post_number":33,"image_url":null,"created_at":"2013-03-01T23:18:55.000-05:00","last_posted_at":"2013-12-20T21:26:06.000-05:00","bumped":true,"bumped_at":"2013-12-20T21:26:06.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}}]},{"id":14,"name":"marketplace","color":"8C6238","text_color":"FFFFFF","slug":"marketplace","topic_count":24,"description":"About commercial Discourse related stuff: jobs or paid gigs, plugins, themes, hosting, etc.","topic_url":"/t/category-definition-for-marketplace/5425","read_restricted":false,"permission":null,"post_count":106,"topics_day":0,"topics_week":1,"topics_month":3,"topics_year":24,"posts_day":0,"posts_week":1,"posts_month":7,"posts_year":106,"description_excerpt":"About commercial Discourse related stuff: jobs or paid gigs, plugins, themes, hosting, etc.","featured_user_ids":[6548,32,5548,2291,4755],"topics":[{"id":11866,"title":"DiscourseHosting is now accepting BTC payments","fancy_title":"DiscourseHosting is now accepting BTC payments","slug":"discoursehosting-is-now-accepting-btc-payments","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-10T10:17:28.000-05:00","last_posted_at":"2014-01-10T10:17:28.000-05:00","bumped":false,"bumped_at":"2014-01-10T10:17:28.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":6548,"username":"michaeld","avatar_template":"/images/avatar.png"}},{"id":11571,"title":"Looking for a developer for Discourse Customization","fancy_title":"Looking for a developer for Discourse Customization","slug":"looking-for-a-developer-for-discourse-customization","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":null,"created_at":"2013-12-23T20:54:04.000-05:00","last_posted_at":"2013-12-24T13:12:17.000-05:00","bumped":true,"bumped_at":"2013-12-30T16:36:17.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":2291,"username":"PabloC","avatar_template":"/images/avatar.png"}},{"id":11594,"title":"Need someone to fix a topic in my discourse install that won't load for moderators. Will pay","fancy_title":"Need someone to fix a topic in my discourse install that won&rsquo;t load for moderators. Will pay","slug":"need-someone-to-fix-a-topic-in-my-discourse-install-that-wont-load-for-moderators-will-pay","posts_count":4,"reply_count":1,"highest_post_number":4,"image_url":null,"created_at":"2013-12-25T10:25:57.000-05:00","last_posted_at":"2013-12-26T17:01:41.000-05:00","bumped":true,"bumped_at":"2013-12-25T17:01:15.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}}]},{"id":10,"name":"howto","color":"76923C","text_color":"FFFFFF","slug":"howto","topic_count":58,"description":"Tutorial topics that describe how to set up, configure, or install Discourse using a specific platform or environment. Topics in this category may only be created by trust level 2 and up. ","topic_url":"/t/category-definition-for-howto/2629","read_restricted":false,"permission":null,"post_count":677,"topics_day":0,"topics_week":0,"topics_month":1,"topics_year":58,"posts_day":0,"posts_week":0,"posts_month":13,"posts_year":675,"description_excerpt":"Tutorial topics that describe how to set up, configure, or install Discourse using a specific platform or environment. Topics in this category may only be created by trust level 2 and up.","featured_user_ids":[7984,4457,1995,6018,5351],"topics":[{"id":7582,"title":"Twitter login with Passenger + Varnish - quick lessons learned","fancy_title":"Twitter login with Passenger + Varnish - quick lessons learned","slug":"twitter-login-with-passenger-varnish-quick-lessons-learned","posts_count":9,"reply_count":3,"highest_post_number":9,"image_url":"/plugins/emoji/images/smile.png","created_at":"2013-06-17T19:46:31.000-04:00","last_posted_at":"2013-12-31T21:03:59.000-05:00","bumped":true,"bumped_at":"2013-12-31T21:03:59.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":7984,"username":"sophearak","avatar_template":"/images/avatar.png"}},{"id":7229,"title":"How to set up image uploads to S3?","fancy_title":"How to set up image uploads to S3?","slug":"how-to-set-up-image-uploads-to-s3","posts_count":14,"reply_count":11,"highest_post_number":14,"image_url":"/uploads/meta_discourse/1019/782cbc7e309ce43f.png","created_at":"2013-06-06T15:37:43.000-04:00","last_posted_at":"2013-12-31T11:54:18.000-05:00","bumped":true,"bumped_at":"2013-12-31T11:54:18.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":1995,"username":"zogstrip","avatar_template":"/images/avatar.png"}},{"id":11628,"title":"My experience with a successful migration (hints for a guide)","fancy_title":"My experience with a successful migration (hints for a guide)","slug":"my-experience-with-a-successful-migration-hints-for-a-guide","posts_count":3,"reply_count":1,"highest_post_number":3,"image_url":null,"created_at":"2013-12-28T09:23:45.000-05:00","last_posted_at":"2013-12-28T10:38:48.000-05:00","bumped":true,"bumped_at":"2013-12-28T10:38:48.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":6018,"username":"robypez","avatar_template":"/images/avatar.png"}}]}]}},
+"/categories.json": {"category_list":{"can_create_category":false,"can_create_topic":false,"draft":null,"draft_key":"new_topic","draft_sequence":null,"categories":[{"id":1,"name":"bug","color":"e9dd00","text_color":"000000","slug":"bug","topic_count":660,"description":"Bug reports on Discourse. Do be sure to search prior to submitting bugs. Include repro steps, and only describe one bug per topic please.","topic_url":"/t/category-definition-for-bug/2","read_restricted":false,"permission":null,"post_count":4318,"topics_day":0,"topics_week":18,"topics_month":54,"topics_year":658,"posts_day":0,"posts_week":330,"posts_month":574,"posts_year":4319,"description_excerpt":"Bug reports on Discourse. Do be sure to search prior to submitting bugs. Include repro steps, and only describe one bug per topic please.","featured_user_ids":[8021,32,6695,2,1995],"topics":[{"id":11994,"title":"Cross domain rules, followed?","fancy_title":"Cross domain rules, followed?","slug":"cross-domain-rules-followed","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":"/plugins/emoji/images/smile.png","created_at":"2014-01-16T09:59:15.000-05:00","last_posted_at":"2014-01-16T09:59:15.000-05:00","bumped":true,"bumped_at":"2014-01-16T11:04:32.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":8021,"username":"Abhishek_Gupta","avatar_template":"/images/avatar.png"}},{"id":11888,"title":"Uncategorized topics not allowed, still seeing tag places","fancy_title":"Uncategorized topics not allowed, still seeing tag places","slug":"uncategorized-topics-not-allowed-still-seeing-tag-places","posts_count":5,"reply_count":1,"highest_post_number":5,"image_url":null,"created_at":"2014-01-10T19:23:37.000-05:00","last_posted_at":"2014-01-15T22:41:25.000-05:00","bumped":true,"bumped_at":"2014-01-15T22:41:25.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":6695,"username":"illspirit","avatar_template":"/images/avatar.png"}},{"id":9151,"title":"Apple touch icon doesn't show if there is no sub domain","fancy_title":"Apple touch icon doesn&rsquo;t show if there is no sub domain","slug":"apple-touch-icon-doesnt-show-if-there-is-no-sub-domain","posts_count":7,"reply_count":4,"highest_post_number":7,"image_url":null,"created_at":"2013-08-16T18:16:53.000-04:00","last_posted_at":"2014-01-15T17:10:18.000-05:00","bumped":true,"bumped_at":"2014-01-15T13:19:22.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}}]},{"id":2,"name":"feature","color":"0E76BD","text_color":"FFFFFF","slug":"feature","topic_count":727,"description":"Discussion about features or potential features of Discourse: how they work, why they work, etc.","topic_url":"/t/category-definition-for-feature/11","read_restricted":false,"permission":null,"post_count":6186,"topics_day":0,"topics_week":17,"topics_month":46,"topics_year":725,"posts_day":0,"posts_week":180,"posts_month":468,"posts_year":6187,"description_excerpt":"Discussion about features or potential features of Discourse: how they work, why they work, etc.","featured_user_ids":[1917,4385,2072,32,4263],"topics":[{"id":11997,"title":"Create topic in the future","fancy_title":"Create topic in the future","slug":"create-topic-in-the-future","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-16T12:14:36.000-05:00","last_posted_at":"2014-01-16T12:14:36.000-05:00","bumped":false,"bumped_at":"2014-01-16T12:14:36.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":1917,"username":"sil","avatar_template":"/images/avatar.png"}},{"id":11957,"title":"Daily Active Users, Monthly Active Users - Statistics Need","fancy_title":"Daily Active Users, Monthly Active Users - Statistics Need","slug":"daily-active-users-monthly-active-users-statistics-need","posts_count":8,"reply_count":4,"highest_post_number":8,"image_url":null,"created_at":"2014-01-14T13:40:56.000-05:00","last_posted_at":"2014-01-16T06:46:05.000-05:00","bumped":true,"bumped_at":"2014-01-16T06:46:05.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":4385,"username":"jeans","avatar_template":"/images/avatar.png"}},{"id":11992,"title":"Specific customization for each category","fancy_title":"Specific customization for each category","slug":"specific-customization-for-each-category","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-16T04:04:58.000-05:00","last_posted_at":"2014-01-16T04:04:58.000-05:00","bumped":false,"bumped_at":"2014-01-16T04:04:58.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":2072,"username":"nXqd","avatar_template":"/images/avatar.png"}}]},{"id":6,"name":"support","color":"b99","text_color":"FFFFFF","slug":"support","topic_count":782,"description":"Support on configuring, using, and installing Discourse. Not for software development related topics, but for admins and end users configuring and using Discourse.","topic_url":"/t/category-definition-for-support/389","read_restricted":false,"permission":null,"post_count":5396,"topics_day":0,"topics_week":16,"topics_month":67,"topics_year":779,"posts_day":0,"posts_week":122,"posts_month":481,"posts_year":5400,"description_excerpt":"Support on configuring, using, and installing Discourse. Not for software development related topics, but for admins and end users configuring and using Discourse.","featured_user_ids":[2291,32,6973,1,8085],"topics":[{"id":11995,"title":"Discourse as a CAS Server","fancy_title":"Discourse as a CAS Server","slug":"discourse-as-a-cas-server","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-16T10:15:30.000-05:00","last_posted_at":"2014-01-16T10:15:31.000-05:00","bumped":true,"bumped_at":"2014-01-16T10:15:31.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":2291,"username":"PabloC","avatar_template":"/images/avatar.png"}},{"id":11989,"title":"Where to change the email subject prefix","fancy_title":"Where to change the email subject prefix","slug":"where-to-change-the-email-subject-prefix","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":"/uploads/default/2919/adbfe0ff90353440.png","created_at":"2014-01-16T01:03:48.000-05:00","last_posted_at":"2014-01-16T03:20:09.000-05:00","bumped":true,"bumped_at":"2014-01-16T03:20:09.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}},{"id":10866,"title":"Header logo overflows the top header area","fancy_title":"Header logo overflows the top header area","slug":"header-logo-overflows-the-top-header-area","posts_count":4,"reply_count":1,"highest_post_number":4,"image_url":null,"created_at":"2013-11-09T03:40:04.000-05:00","last_posted_at":"2014-01-16T02:27:52.000-05:00","bumped":true,"bumped_at":"2014-01-16T02:40:47.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":6973,"username":"stellarhopper","avatar_template":"/images/avatar.png"}}]},{"id":7,"name":"dev","color":"000","text_color":"FFFFFF","slug":"dev","topic_count":284,"description":"This category is for topics related to hacking on Discourse: submitting pull requests, configuring development environments, coding conventions, and so forth.","topic_url":"/t/category-definition-for-dev/1026","read_restricted":false,"permission":null,"post_count":2352,"topics_day":0,"topics_week":3,"topics_month":19,"topics_year":284,"posts_day":0,"posts_week":37,"posts_month":150,"posts_year":2353,"description_excerpt":"This category is for topics related to hacking on Discourse: submitting pull requests, configuring development environments, coding conventions, and so forth.","featured_user_ids":[8021,1995,5428,8208,7995],"topics":[{"id":3823,"title":"So, you want to help out with Discourse","fancy_title":"So, you want to help out with Discourse","slug":"so-you-want-to-help-out-with-discourse","posts_count":22,"reply_count":28,"highest_post_number":56,"image_url":null,"created_at":"2013-02-23T00:46:11.000-05:00","last_posted_at":"2014-01-12T21:33:12.000-05:00","bumped":true,"bumped_at":"2014-01-12T21:33:12.000-05:00","unseen":false,"pinned":true,"excerpt":"People are wondering, how it is they can help out with Discourse.  \n\nWe have seen some chattering both here and on Github. \n\nI wanted to create a topic @eviltrout , @codinghorror and myself can keep up to date with clear&hellip;","visible":true,"closed":false,"archived":false,"last_poster":{"id":7995,"username":"Hunter","avatar_template":"/images/avatar.png"}},{"id":11993,"title":"How to check the user level via ajax?","fancy_title":"How to check the user level via ajax?","slug":"how-to-check-the-user-level-via-ajax","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-16T08:13:09.000-05:00","last_posted_at":"2014-01-16T08:13:09.000-05:00","bumped":true,"bumped_at":"2014-01-16T09:20:59.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":8021,"username":"Abhishek_Gupta","avatar_template":"/images/avatar.png"}},{"id":10201,"title":"How To override an existing handlebars template from plugin","fancy_title":"How To override an existing handlebars template from plugin","slug":"how-to-override-an-existing-handlebars-template-from-plugin","posts_count":6,"reply_count":1,"highest_post_number":6,"image_url":null,"created_at":"2013-10-04T10:44:33.000-04:00","last_posted_at":"2014-01-15T12:35:01.000-05:00","bumped":true,"bumped_at":"2014-01-15T12:34:58.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"last_poster":{"id":1995,"username":"zogstrip","avatar_template":"/images/avatar.png"}}]},{"id":9,"name":"ux","color":"5F497A","text_color":"FFFFFF","slug":"ux","topic_count":184,"description":"Discussion about the user interface of Discourse, how features are presented to the user in the client, including language and UI elements.","topic_url":"/t/category-definition-for-ux/2628","read_restricted":false,"permission":null,"post_count":1511,"topics_day":0,"topics_week":3,"topics_month":10,"topics_year":183,"posts_day":0,"posts_week":34,"posts_month":117,"posts_year":1511,"description_excerpt":"Discussion about the user interface of Discourse, how features are presented to the user in the client, including language and UI elements.","featured_user_ids":[1995,7197,7073,1,6626],"topics":[{"id":11996,"title":"It's really hard to navigate the Create Topic / Reply pane with the keyboard","fancy_title":"It&rsquo;s really hard to navigate the Create Topic / Reply pane with the keyboard","slug":"its-really-hard-to-navigate-the-create-topic-reply-pane-with-the-keyboard","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":null,"created_at":"2014-01-16T10:51:36.000-05:00","last_posted_at":"2014-01-16T11:11:10.000-05:00","bumped":true,"bumped_at":"2014-01-16T11:11:10.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":1995,"username":"zogstrip","avatar_template":"/images/avatar.png"}},{"id":11973,"title":"Pressing Wrench Icon in the Categories section","fancy_title":"Pressing Wrench Icon in the Categories section","slug":"pressing-wrench-icon-in-the-categories-section","posts_count":6,"reply_count":3,"highest_post_number":6,"image_url":"/uploads/default/2907/d8d4e0accd5ee244.png","created_at":"2014-01-15T05:58:12.000-05:00","last_posted_at":"2014-01-16T05:15:52.000-05:00","bumped":true,"bumped_at":"2014-01-16T05:15:52.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":7073,"username":"5an1ty","avatar_template":"/images/avatar.png"}},{"id":5542,"title":"Title character requirements not very visible","fancy_title":"Title character requirements not very visible","slug":"title-character-requirements-not-very-visible","posts_count":24,"reply_count":11,"highest_post_number":24,"image_url":null,"created_at":"2013-04-02T20:09:59.000-04:00","last_posted_at":"2014-01-15T05:26:07.000-05:00","bumped":true,"bumped_at":"2014-01-15T05:26:04.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"last_poster":{"id":1995,"username":"zogstrip","avatar_template":"/images/avatar.png"}}]},{"id":5,"name":"extensibility","color":"FE8432","text_color":"FFFFFF","slug":"extensibility","topic_count":102,"description":"Topics about extending the functionality of Discourse with plugins, themes, add-ons, or other mechanisms for extensibility.  ","topic_url":"/t/category-definition-for-extensibility/28","read_restricted":false,"permission":null,"post_count":964,"topics_day":0,"topics_week":2,"topics_month":18,"topics_year":102,"posts_day":0,"posts_week":17,"posts_month":76,"posts_year":964,"description_excerpt":"Topics about extending the functionality of Discourse with plugins, themes, add-ons, or other mechanisms for extensibility.","featured_user_ids":[6548,32,8202,6677,7333],"topics":[{"id":11763,"title":"Google AdSense plugin is now available","fancy_title":"Google AdSense plugin is now available","slug":"google-adsense-plugin-is-now-available","posts_count":7,"reply_count":2,"highest_post_number":7,"image_url":"/uploads/default/_optimized/66d/cf0/d69e6709fe_496x500.PNG","created_at":"2014-01-05T14:28:58.000-05:00","last_posted_at":"2014-01-15T13:32:35.000-05:00","bumped":true,"bumped_at":"2014-01-15T13:32:35.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":6548,"username":"michaeld","avatar_template":"/images/avatar.png"}},{"id":531,"title":"Discourse and Wordpress Integration","fancy_title":"Discourse and Wordpress Integration","slug":"discourse-and-wordpress-integration","posts_count":76,"reply_count":64,"highest_post_number":78,"image_url":null,"created_at":"2013-02-05T18:56:37.000-05:00","last_posted_at":"2014-01-15T11:56:54.000-05:00","bumped":true,"bumped_at":"2014-01-15T11:56:54.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}},{"id":11965,"title":"In your opinion, what is the best wiki engine to be associated with discourse?","fancy_title":"In your opinion, what is the best wiki engine to be associated with discourse?","slug":"in-your-opinion-what-is-the-best-wiki-engine-to-be-associated-with-discourse","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-14T19:27:06.000-05:00","last_posted_at":"2014-01-14T19:27:06.000-05:00","bumped":false,"bumped_at":"2014-01-14T19:27:06.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":8202,"username":"Matthieu","avatar_template":"/images/avatar.png"}}]},{"id":8,"name":"hosting","color":"74CCED","text_color":"FFFFFF","slug":"hosting","topic_count":69,"description":"Topics about hosting Discourse, either on your own servers, in the cloud, or with specific hosting services.","topic_url":"/t/category-definition-for-hosting/2626","read_restricted":false,"permission":null,"post_count":664,"topics_day":0,"topics_week":2,"topics_month":2,"topics_year":69,"posts_day":0,"posts_week":15,"posts_month":35,"posts_year":664,"description_excerpt":"Topics about hosting Discourse, either on your own servers, in the cloud, or with specific hosting services.","featured_user_ids":[6695,1,6018,1580,7030],"topics":[{"id":9540,"title":"Docker images for Discourse","fancy_title":"Docker images for Discourse","slug":"docker-images-for-discourse","posts_count":35,"reply_count":28,"highest_post_number":36,"image_url":null,"created_at":"2013-09-02T00:07:02.000-04:00","last_posted_at":"2014-01-16T07:47:18.000-05:00","bumped":true,"bumped_at":"2014-01-16T07:47:18.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":6695,"username":"illspirit","avatar_template":"/images/avatar.png"}},{"id":11971,"title":"Installing Discourse on Ubuntu 12.04 with Parallels Plesk and Apache","fancy_title":"Installing Discourse on Ubuntu 12.04 with Parallels Plesk and Apache","slug":"installing-discourse-on-ubuntu-12-04-with-parallels-plesk-and-apache","posts_count":3,"reply_count":1,"highest_post_number":3,"image_url":null,"created_at":"2014-01-15T04:23:38.000-05:00","last_posted_at":"2014-01-15T04:47:20.000-05:00","bumped":true,"bumped_at":"2014-01-15T04:47:20.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":7030,"username":"naabster","avatar_template":"/images/avatar.png"}},{"id":10844,"title":"Discourse in a Docker container","fancy_title":"Discourse in a Docker container","slug":"discourse-in-a-docker-container","posts_count":12,"reply_count":8,"highest_post_number":12,"image_url":null,"created_at":"2013-11-07T19:12:22.000-05:00","last_posted_at":"2014-01-11T14:43:53.000-05:00","bumped":true,"bumped_at":"2014-01-11T14:43:53.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":1,"username":"sam","avatar_template":"/images/avatar.png"}}]},{"id":17,"name":"uncategorized","color":"AB9364","text_color":"FFFFFF","slug":"uncategorized","topic_count":229,"description":"","topic_url":null,"read_restricted":false,"permission":null,"post_count":2138,"topics_day":0,"topics_week":0,"topics_month":9,"topics_year":229,"posts_day":1,"posts_week":11,"posts_month":183,"posts_year":2138,"description_excerpt":"","is_uncategorized":true,"featured_user_ids":[6973,32,1,1995,7073],"topics":[{"id":1,"title":"Welcome to meta.discourse.org","fancy_title":"Welcome to meta.discourse.org","slug":"welcome-to-meta-discourse-org","posts_count":5,"reply_count":5,"highest_post_number":23,"image_url":null,"created_at":"2013-01-31T23:52:28.000-05:00","last_posted_at":"2013-02-07T16:50:41.000-05:00","bumped":true,"bumped_at":"2013-02-07T11:57:34.000-05:00","unseen":false,"pinned":true,"excerpt":"Welcome to meta, the official site for discussing the next-gen open source Discourse forum software. You&#39;ll find topics on features, bugs, hosting, development, and general support here. \n\nDiscourse is early beta softwar&hellip;","visible":true,"closed":true,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}},{"id":11557,"title":"Error after upgrade to 0.9.7.9+","fancy_title":"Error after upgrade to 0.9.7.9+","slug":"error-after-upgrade-to-0-9-7-9","posts_count":83,"reply_count":58,"highest_post_number":85,"image_url":null,"created_at":"2013-12-22T17:12:05.000-05:00","last_posted_at":"2014-01-16T00:52:30.000-05:00","bumped":true,"bumped_at":"2014-01-16T00:52:30.000-05:00","unseen":false,"pinned":true,"excerpt":"Hi, \n\nI&#39;m using webfaction postgresql specific private instance to run discourse (custom port already configured for discourse 0.9.7.6). \n\nThis is not my first update, but this time i have an error. Impossible to upgrade&hellip;","visible":true,"closed":false,"archived":false,"last_poster":{"id":6973,"username":"stellarhopper","avatar_template":"/images/avatar.png"}},{"id":6266,"title":"What sort of replies trigger a notice?","fancy_title":"What sort of replies trigger a notice?","slug":"what-sort-of-replies-trigger-a-notice","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":null,"created_at":"2013-04-30T17:46:39.000-04:00","last_posted_at":"2014-01-16T00:52:21.000-05:00","bumped":true,"bumped_at":"2014-01-16T00:57:46.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}}]},{"id":11,"name":"login","color":"edb400","text_color":"FFFFFF","slug":"login","topic_count":27,"description":"Topics about logging in to Discourse, using any standard third party provider (Twitter, Facebook, Google), traditional username and password, or with a custom plugin.","topic_url":"/t/category-definition-for-login/2828","read_restricted":false,"permission":null,"post_count":200,"topics_day":0,"topics_week":1,"topics_month":1,"topics_year":27,"posts_day":0,"posts_week":10,"posts_month":27,"posts_year":200,"description_excerpt":"Topics about logging in to Discourse, using any standard third party provider (Twitter, Facebook, Google), traditional username and password, or with a custom plugin.","featured_user_ids":[8163,19,7796,32,8024],"topics":[{"id":11959,"title":"Get current user information via JSON","fancy_title":"Get current user information via JSON","slug":"get-current-user-information-via-json","posts_count":3,"reply_count":1,"highest_post_number":3,"image_url":null,"created_at":"2014-01-14T15:05:34.000-05:00","last_posted_at":"2014-01-14T16:43:28.000-05:00","bumped":true,"bumped_at":"2014-01-14T16:43:28.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":8163,"username":"znation","avatar_template":"/images/avatar.png"}},{"id":6242,"title":"Allow authentication via multiple services on one account","fancy_title":"Allow authentication via multiple services on one account","slug":"allow-authentication-via-multiple-services-on-one-account","posts_count":34,"reply_count":27,"highest_post_number":34,"image_url":null,"created_at":"2013-04-29T18:51:52.000-04:00","last_posted_at":"2014-01-14T00:25:42.000-05:00","bumped":true,"bumped_at":"2014-01-14T00:25:42.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":7796,"username":"almereyda","avatar_template":"/images/avatar.png"}},{"id":4738,"title":"Login support for browser password managers","fancy_title":"Login support for browser password managers","slug":"login-support-for-browser-password-managers","posts_count":6,"reply_count":2,"highest_post_number":6,"image_url":null,"created_at":"2013-03-13T17:55:29.000-04:00","last_posted_at":"2014-01-13T14:21:34.000-05:00","bumped":true,"bumped_at":"2014-01-13T14:21:34.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}}]},{"id":3,"name":"meta","color":"aaa","text_color":"FFFFFF","slug":"meta","topic_count":79,"description":"Discussion about meta.discourse.org itself, the organization of this forum about Discourse, how it works, and how we can improve this site.","topic_url":"/t/category-definition-for-meta/24","read_restricted":false,"permission":null,"post_count":695,"topics_day":0,"topics_week":1,"topics_month":3,"topics_year":79,"posts_day":0,"posts_week":4,"posts_month":18,"posts_year":696,"description_excerpt":"Discussion about meta.discourse.org itself, the organization of this forum about Discourse, how it works, and how we can improve this site.","featured_user_ids":[19,8085,32,5174,4534],"topics":[{"id":5249,"title":"What is \"Meta\"?","fancy_title":"What is &ldquo;Meta&rdquo;?","slug":"what-is-meta","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":null,"created_at":"2013-03-25T18:00:52.000-04:00","last_posted_at":"2013-03-25T18:00:56.000-04:00","bumped":false,"bumped_at":"2013-03-25T18:00:52.000-04:00","unseen":false,"pinned":true,"excerpt":"Meta means discussion of the discussion itself instead of the actual topic of the discussion.  \n\nWhy do we need a meta category?\n\nMeta is where communities come together to decide who they are and what they are about.  \n&hellip;","visible":true,"closed":false,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}},{"id":11943,"title":"How far to take user documentation?","fancy_title":"How far to take user documentation?","slug":"how-far-to-take-user-documentation","posts_count":4,"reply_count":2,"highest_post_number":4,"image_url":"/plugins/emoji/images/smile.png","created_at":"2014-01-13T19:21:26.000-05:00","last_posted_at":"2014-01-14T14:19:46.000-05:00","bumped":true,"bumped_at":"2014-01-14T14:19:46.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":19,"username":"eviltrout","avatar_template":"/images/avatar.png"}},{"id":11822,"title":"Search engine traffic share and level to Discourse","fancy_title":"Search engine traffic share and level to Discourse","slug":"search-engine-traffic-share-and-level-to-discourse","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":null,"created_at":"2014-01-08T01:54:56.000-05:00","last_posted_at":"2014-01-08T02:21:25.000-05:00","bumped":true,"bumped_at":"2014-01-08T02:21:25.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}}]},{"id":12,"name":"discourse hub","color":"b2c79f","text_color":"FFFFFF","slug":"discourse-hub","topic_count":4,"description":"Topics about current or future Discourse Hub functionality at discourse.org including nickname registration, global user pages, and the site directory.","topic_url":"/t/category-definition-for-discourse-hub/3038","read_restricted":false,"permission":null,"post_count":121,"topics_day":0,"topics_week":0,"topics_month":0,"topics_year":4,"posts_day":0,"posts_week":3,"posts_month":3,"posts_year":121,"description_excerpt":"Topics about current or future Discourse Hub functionality at discourse.org including nickname registration, global user pages, and the site directory.","featured_user_ids":[2,32,2316,6695,4457],"topics":[{"id":6547,"title":"Where to get discourse_org_access_key?","fancy_title":"Where to get discourse_org_access_key?","slug":"where-to-get-discourse-org-access-key","posts_count":13,"reply_count":4,"highest_post_number":13,"image_url":null,"created_at":"2013-05-10T22:06:08.000-04:00","last_posted_at":"2014-01-13T11:38:15.000-05:00","bumped":true,"bumped_at":"2014-01-13T11:38:15.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":2,"username":"neil","avatar_template":"/images/avatar.png"}},{"id":2544,"title":"Discourse central hub questions","fancy_title":"Discourse central hub questions","slug":"discourse-central-hub-questions","posts_count":51,"reply_count":44,"highest_post_number":52,"image_url":null,"created_at":"2013-02-09T04:28:21.000-05:00","last_posted_at":"2013-09-19T13:36:49.000-04:00","bumped":true,"bumped_at":"2013-09-19T14:04:08.000-04:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":2128,"username":"ultimape","avatar_template":"/images/avatar.png"}},{"id":424,"title":"What are the 'consequences' of changing your name?","fancy_title":"What are the &lsquo;consequences&rsquo; of changing your name?","slug":"what-are-the-consequences-of-changing-your-name","posts_count":35,"reply_count":36,"highest_post_number":43,"image_url":null,"created_at":"2013-02-05T17:37:52.000-05:00","last_posted_at":"2013-09-19T13:55:11.000-04:00","bumped":true,"bumped_at":"2013-09-19T13:55:11.000-04:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":2128,"username":"ultimape","avatar_template":"/images/avatar.png"}}]},{"id":13,"name":"blog","color":"ED207B","text_color":"FFFFFF","slug":"blog","topic_count":14,"description":"Discussion topics generated from the official Discourse Blog. These topics are linked from the bottom of each blog entry where the blog comments would normally be.","topic_url":"/t/category-definition-for-blog/5250","read_restricted":false,"permission":null,"post_count":206,"topics_day":0,"topics_week":0,"topics_month":1,"topics_year":14,"posts_day":0,"posts_week":2,"posts_month":11,"posts_year":206,"description_excerpt":"Discussion topics generated from the official Discourse Blog. These topics are linked from the bottom of each blog entry where the blog comments would normally be.","featured_user_ids":[8134,32,4457,4263,1995],"topics":[{"id":11835,"title":"The Road to Discourse 1.0","fancy_title":"The Road to Discourse 1.0","slug":"the-road-to-discourse-1-0","posts_count":6,"reply_count":2,"highest_post_number":6,"image_url":null,"created_at":"2014-01-08T19:08:44.000-05:00","last_posted_at":"2014-01-16T04:49:16.000-05:00","bumped":true,"bumped_at":"2014-01-16T04:49:16.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":8134,"username":"iontishina","avatar_template":"/images/avatar.png"}},{"id":5751,"title":"Discourse as Your First Rails App","fancy_title":"Discourse as Your First Rails App","slug":"discourse-as-your-first-rails-app","posts_count":62,"reply_count":43,"highest_post_number":71,"image_url":null,"created_at":"2013-04-09T19:08:33.000-04:00","last_posted_at":"2013-12-19T18:27:37.000-05:00","bumped":true,"bumped_at":"2013-12-19T18:27:37.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":1995,"username":"zogstrip","avatar_template":"/images/avatar.png"}},{"id":5898,"title":"The Discourse Servers","fancy_title":"The Discourse Servers","slug":"the-discourse-servers","posts_count":42,"reply_count":32,"highest_post_number":42,"image_url":null,"created_at":"2013-04-15T15:19:09.000-04:00","last_posted_at":"2013-11-29T15:14:35.000-05:00","bumped":true,"bumped_at":"2013-11-29T15:14:35.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":6626,"username":"riking","avatar_template":"/images/avatar.png"}}]},{"id":4,"name":"faq","color":"33b","text_color":"FFFFFF","slug":"faq","topic_count":49,"description":"Topics that come up very often when discussing Discourse will eventually be classified into this Frequently Asked Questions category. Should only be added to popular topics.","topic_url":"/t/category-definition-for-faq/25","read_restricted":false,"permission":null,"post_count":450,"topics_day":0,"topics_week":0,"topics_month":0,"topics_year":49,"posts_day":0,"posts_week":1,"posts_month":10,"posts_year":450,"description_excerpt":"Topics that come up very often when discussing Discourse will eventually be classified into this Frequently Asked Questions category. Should only be added to popular topics.","featured_user_ids":[32,8047,7483,2,6626],"topics":[{"id":5372,"title":"UX confusion (or me confusion) is it possible to edit old posts or only your most recent post in a topic?","fancy_title":"UX confusion (or me confusion) is it possible to edit old posts or only your most recent post in a topic?","slug":"ux-confusion-or-me-confusion-is-it-possible-to-edit-old-posts-or-only-your-most-recent-post-in-a-topic","posts_count":3,"reply_count":0,"highest_post_number":3,"image_url":null,"created_at":"2013-03-28T22:25:57.000-04:00","last_posted_at":"2014-01-13T13:44:39.000-05:00","bumped":true,"bumped_at":"2014-01-13T13:44:39.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}},{"id":9631,"title":"All the options to deploy Discourse with their relative pros and cons","fancy_title":"All the options to deploy Discourse with their relative pros and cons","slug":"all-the-options-to-deploy-discourse-with-their-relative-pros-and-cons","posts_count":14,"reply_count":7,"highest_post_number":15,"image_url":null,"created_at":"2013-09-06T03:55:09.000-04:00","last_posted_at":"2013-09-26T18:49:04.000-04:00","bumped":true,"bumped_at":"2013-12-30T12:32:59.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":3929,"username":"ScotterC","avatar_template":"/images/avatar.png"}},{"id":4325,"title":"How to delete a user?","fancy_title":"How to delete a user?","slug":"how-to-delete-a-user","posts_count":31,"reply_count":23,"highest_post_number":33,"image_url":null,"created_at":"2013-03-01T23:18:55.000-05:00","last_posted_at":"2013-12-20T21:26:06.000-05:00","bumped":true,"bumped_at":"2013-12-20T21:26:06.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}}]},{"id":14,"name":"marketplace","color":"8C6238","text_color":"FFFFFF","slug":"marketplace","topic_count":24,"description":"About commercial Discourse related stuff: jobs or paid gigs, plugins, themes, hosting, etc.","topic_url":"/t/category-definition-for-marketplace/5425","read_restricted":false,"permission":null,"post_count":106,"topics_day":0,"topics_week":1,"topics_month":3,"topics_year":24,"posts_day":0,"posts_week":1,"posts_month":7,"posts_year":106,"description_excerpt":"About commercial Discourse related stuff: jobs or paid gigs, plugins, themes, hosting, etc.","featured_user_ids":[6548,32,5548,2291,4755],"topics":[{"id":11866,"title":"DiscourseHosting is now accepting BTC payments","fancy_title":"DiscourseHosting is now accepting BTC payments","slug":"discoursehosting-is-now-accepting-btc-payments","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-10T10:17:28.000-05:00","last_posted_at":"2014-01-10T10:17:28.000-05:00","bumped":false,"bumped_at":"2014-01-10T10:17:28.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":6548,"username":"michaeld","avatar_template":"/images/avatar.png"}},{"id":11571,"title":"Looking for a developer for Discourse Customization","fancy_title":"Looking for a developer for Discourse Customization","slug":"looking-for-a-developer-for-discourse-customization","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":null,"created_at":"2013-12-23T20:54:04.000-05:00","last_posted_at":"2013-12-24T13:12:17.000-05:00","bumped":true,"bumped_at":"2013-12-30T16:36:17.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":2291,"username":"PabloC","avatar_template":"/images/avatar.png"}},{"id":11594,"title":"Need someone to fix a topic in my discourse install that won't load for moderators. Will pay","fancy_title":"Need someone to fix a topic in my discourse install that won&rsquo;t load for moderators. Will pay","slug":"need-someone-to-fix-a-topic-in-my-discourse-install-that-wont-load-for-moderators-will-pay","posts_count":4,"reply_count":1,"highest_post_number":4,"image_url":null,"created_at":"2013-12-25T10:25:57.000-05:00","last_posted_at":"2013-12-26T17:01:41.000-05:00","bumped":true,"bumped_at":"2013-12-25T17:01:15.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}}]},{"id":10,"name":"howto","color":"76923C","text_color":"FFFFFF","slug":"howto","topic_count":58,"description":"Tutorial topics that describe how to set up, configure, or install Discourse using a specific platform or environment. Topics in this category may only be created by trust level 2 and up. ","topic_url":"/t/category-definition-for-howto/2629","read_restricted":false,"permission":null,"post_count":677,"topics_day":0,"topics_week":0,"topics_month":1,"topics_year":58,"posts_day":0,"posts_week":0,"posts_month":13,"posts_year":675,"description_excerpt":"Tutorial topics that describe how to set up, configure, or install Discourse using a specific platform or environment. Topics in this category may only be created by trust level 2 and up.","featured_user_ids":[7984,4457,1995,6018,5351],"topics":[{"id":7582,"title":"Twitter login with Passenger + Varnish - quick lessons learned","fancy_title":"Twitter login with Passenger + Varnish - quick lessons learned","slug":"twitter-login-with-passenger-varnish-quick-lessons-learned","posts_count":9,"reply_count":3,"highest_post_number":9,"image_url":"/plugins/emoji/images/smile.png","created_at":"2013-06-17T19:46:31.000-04:00","last_posted_at":"2013-12-31T21:03:59.000-05:00","bumped":true,"bumped_at":"2013-12-31T21:03:59.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":7984,"username":"sophearak","avatar_template":"/images/avatar.png"}},{"id":7229,"title":"How to set up image uploads to S3?","fancy_title":"How to set up image uploads to S3?","slug":"how-to-set-up-image-uploads-to-s3","posts_count":14,"reply_count":11,"highest_post_number":14,"image_url":"/uploads/meta_discourse/1019/782cbc7e309ce43f.png","created_at":"2013-06-06T15:37:43.000-04:00","last_posted_at":"2013-12-31T11:54:18.000-05:00","bumped":true,"bumped_at":"2013-12-31T11:54:18.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":1995,"username":"zogstrip","avatar_template":"/images/avatar.png"}},{"id":11628,"title":"My experience with a successful migration (hints for a guide)","fancy_title":"My experience with a successful migration (hints for a guide)","slug":"my-experience-with-a-successful-migration-hints-for-a-guide","posts_count":3,"reply_count":1,"highest_post_number":3,"image_url":null,"created_at":"2013-12-28T09:23:45.000-05:00","last_posted_at":"2013-12-28T10:38:48.000-05:00","bumped":true,"bumped_at":"2013-12-28T10:38:48.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":6018,"username":"robypez","avatar_template":"/images/avatar.png"}}]}]}},
 "/c/bug/l/latest.json": {"users":[{"id":1,"username":"sam","avatar_template":"/images/avatar.png"},{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"},{"id":8021,"username":"Abhishek_Gupta","avatar_template":"/images/avatar.png"},{"id":6695,"username":"illspirit","avatar_template":"/images/avatar.png"},{"id":2,"username":"neil","avatar_template":"/images/avatar.png"},{"id":3124,"username":"sipp11","avatar_template":"/images/avatar.png"},{"id":7513,"username":"digit","avatar_template":"/images/avatar.png"},{"id":19,"username":"eviltrout","avatar_template":"/images/avatar.png"},{"id":3,"username":"supermathie","avatar_template":"/images/avatar.png"},{"id":7073,"username":"5an1ty","avatar_template":"/images/avatar.png"},{"id":4996,"username":"wmertens","avatar_template":"/images/avatar.png"},{"id":6377,"username":"zh99998","avatar_template":"/images/avatar.png"},{"id":1496,"username":"cfstras","avatar_template":"/images/avatar.png"},{"id":7995,"username":"Hunter","avatar_template":"/images/avatar.png"},{"id":6626,"username":"riking","avatar_template":"/images/avatar.png"},{"id":1995,"username":"zogstrip","avatar_template":"/images/avatar.png"},{"id":5048,"username":"SneakySly","avatar_template":"/images/avatar.png"},{"id":7731,"username":"YOU","avatar_template":"/images/avatar.png"},{"id":7985,"username":"onlinedev","avatar_template":"/images/avatar.png"},{"id":3415,"username":"radq","avatar_template":"/images/avatar.png"},{"id":5351,"username":"erlend_sh","avatar_template":"/images/avatar.png"},{"id":471,"username":"BhaelOchon","avatar_template":"/images/avatar.png"},{"id":7,"username":"pekka","avatar_template":"/images/avatar.png"},{"id":4780,"username":"HugoAlmeida","avatar_template":"/images/avatar.png"},{"id":5053,"username":"Blue","avatar_template":"/images/avatar.png"},{"id":212,"username":"alxndr","avatar_template":"/images/avatar.png"},{"id":6118,"username":"lukelarris","avatar_template":"/images/avatar.png"},{"id":7076,"username":"philnelson","avatar_template":"/images/avatar.png"},{"id":4851,"username":"jab","avatar_template":"/images/avatar.png"},{"id":4457,"username":"Lee_Ars","avatar_template":"/images/avatar.png"},{"id":6280,"username":"mx2000","avatar_template":"/images/avatar.png"},{"id":3681,"username":"Ajarn","avatar_template":"/images/avatar.png"},{"id":1621,"username":"bnb","avatar_template":"/images/avatar.png"},{"id":6266,"username":"bragi","avatar_template":"/images/avatar.png"},{"id":5335,"username":"masda70","avatar_template":"/images/avatar.png"},{"id":6314,"username":"rafaelfranca","avatar_template":"/images/avatar.png"}],"topic_list":{"can_create_topic":false,"more_topics_url":"/latest.json?category=1&page=1","draft":null,"draft_key":"new_topic","draft_sequence":null,"topics":[{"id":2,"title":"Category definition for bug","fancy_title":"Category definition for bug","slug":"category-definition-for-bug","posts_count":2,"reply_count":0,"highest_post_number":3,"image_url":null,"created_at":"2013-01-31T23:56:34.000-05:00","last_posted_at":"2013-03-07T22:42:27.000-05:00","bumped":true,"bumped_at":"2013-02-26T18:52:56.000-05:00","unseen":false,"pinned":true,"excerpt":"Bug reports on Discourse. Do be sure to search prior to submitting bugs. Include repro steps, and only describe one bug per topic please.","visible":true,"closed":false,"archived":false,"views":469,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":1},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11994,"title":"Cross domain rules, followed?","fancy_title":"Cross domain rules, followed?","slug":"cross-domain-rules-followed","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":"/plugins/emoji/images/smile.png","created_at":"2014-01-16T09:59:15.000-05:00","last_posted_at":"2014-01-16T09:59:15.000-05:00","bumped":true,"bumped_at":"2014-01-16T11:04:32.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":15,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"Abhishek_Gupta","category_id":1,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":8021}]},{"id":11888,"title":"Uncategorized topics not allowed, still seeing tag places","fancy_title":"Uncategorized topics not allowed, still seeing tag places","slug":"uncategorized-topics-not-allowed-still-seeing-tag-places","posts_count":5,"reply_count":1,"highest_post_number":5,"image_url":null,"created_at":"2014-01-10T19:23:37.000-05:00","last_posted_at":"2014-01-15T22:41:25.000-05:00","bumped":true,"bumped_at":"2014-01-15T22:41:25.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":50,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"illspirit","category_id":1,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":6695},{"extras":null,"description":"Most Posts","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":2}]},{"id":9151,"title":"Apple touch icon doesn't show if there is no sub domain","fancy_title":"Apple touch icon doesn&rsquo;t show if there is no sub domain","slug":"apple-touch-icon-doesnt-show-if-there-is-no-sub-domain","posts_count":7,"reply_count":4,"highest_post_number":7,"image_url":null,"created_at":"2013-08-16T18:16:53.000-04:00","last_posted_at":"2014-01-15T17:10:18.000-05:00","bumped":true,"bumped_at":"2014-01-15T13:19:22.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":188,"like_count":3,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":3124},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":10911,"title":"/users/activate-account pulling blank logo instead of defaulting to h2","fancy_title":"/users/activate-account pulling blank logo instead of defaulting to h2","slug":"users-activate-account-pulling-blank-logo-instead-of-defaulting-to-h2","posts_count":3,"reply_count":1,"highest_post_number":3,"image_url":null,"created_at":"2013-11-12T14:49:04.000-05:00","last_posted_at":"2014-01-15T10:21:37.000-05:00","bumped":true,"bumped_at":"2014-01-15T10:21:37.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":121,"like_count":3,"has_summary":false,"archetype":"regular","last_poster_username":"eviltrout","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":7513},{"extras":"latest","description":"Most Recent Poster","user_id":19}]},{"id":11937,"title":"Smiley parser is busted","fancy_title":"Smiley parser is busted","slug":"smiley-parser-is-busted","posts_count":4,"reply_count":4,"highest_post_number":7,"image_url":"/plugins/emoji/images/smile.png","created_at":"2014-01-13T15:42:00.000-05:00","last_posted_at":"2014-01-15T05:51:16.000-05:00","bumped":true,"bumped_at":"2014-01-15T05:51:16.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":66,"like_count":2,"has_summary":false,"archetype":"regular","last_poster_username":"sam","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":3},{"extras":null,"description":"Most Posts","user_id":7073},{"extras":"latest","description":"Most Recent Poster","user_id":1}]},{"id":6625,"title":"Error 500 on PUT of site config","fancy_title":"Error 500 on PUT of site config","slug":"error-500-on-put-of-site-config","posts_count":4,"reply_count":1,"highest_post_number":4,"image_url":null,"created_at":"2013-05-14T18:13:56.000-04:00","last_posted_at":"2014-01-16T04:55:50.000-05:00","bumped":true,"bumped_at":"2014-01-15T04:43:23.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":132,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":4996},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":11225,"title":"Forum acts weirdly after client side updates","fancy_title":"Forum acts weirdly after client side updates","slug":"forum-acts-weirdly-after-client-side-updates","posts_count":5,"reply_count":1,"highest_post_number":5,"image_url":null,"created_at":"2013-12-02T18:32:10.000-05:00","last_posted_at":"2014-01-15T04:04:55.000-05:00","bumped":true,"bumped_at":"2014-01-15T02:55:18.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":117,"like_count":7,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":1},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":11903,"title":"Error after update to 0.9.8.1","fancy_title":"Error after update to 0.9.8.1","slug":"error-after-update-to-0-9-8-1","posts_count":14,"reply_count":6,"highest_post_number":17,"image_url":null,"created_at":"2014-01-12T06:55:45.000-05:00","last_posted_at":"2014-01-15T01:48:58.000-05:00","bumped":true,"bumped_at":"2014-01-15T01:48:58.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":121,"like_count":6,"has_summary":false,"archetype":"regular","last_poster_username":"zh99998","category_id":1,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":6377},{"extras":null,"description":"Most Posts","user_id":1496},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":19}]},{"id":11969,"title":"Qunit error and possibly related ember.js problem","fancy_title":"Qunit error and possibly related ember.js problem","slug":"qunit-error-and-possibly-related-ember-js-problem","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-14T22:51:32.000-05:00","last_posted_at":"2014-01-14T22:51:32.000-05:00","bumped":false,"bumped_at":"2014-01-14T22:51:32.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":32,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"Hunter","category_id":1,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":7995}]},{"id":11945,"title":"Stuff disappears on the groups page","fancy_title":"Stuff disappears on the groups page","slug":"stuff-disappears-on-the-groups-page","posts_count":7,"reply_count":2,"highest_post_number":7,"image_url":null,"created_at":"2014-01-13T23:03:53.000-05:00","last_posted_at":"2014-01-15T01:26:07.000-05:00","bumped":true,"bumped_at":"2014-01-14T21:09:01.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":54,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"zogstrip","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":6695},{"extras":null,"description":"Most Posts","user_id":6626},{"extras":"latest","description":"Most Recent Poster, Frequent Poster","user_id":1995}]},{"id":11520,"title":"Discourse WordPress Plugin: Emoji's do not properly display","fancy_title":"Discourse WordPress Plugin: Emoji&rsquo;s do not properly display","slug":"discourse-wordpress-plugin-emojis-do-not-properly-display","posts_count":9,"reply_count":4,"highest_post_number":9,"image_url":"/uploads/default/_optimized/638/4db/eff43a45b8_690x420.png","created_at":"2013-12-19T23:32:03.000-05:00","last_posted_at":"2014-01-15T04:32:19.000-05:00","bumped":true,"bumped_at":"2014-01-14T17:53:34.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":168,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":5048},{"extras":null,"description":"Frequent Poster","user_id":7731},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":11597,"title":"All categories drop down does not close after clicking on first menu \"all categories\"","fancy_title":"All categories drop down does not close after clicking on first menu &ldquo;all categories&rdquo;","slug":"all-categories-drop-down-does-not-close-after-clicking-on-first-menu-all-categories","posts_count":5,"reply_count":2,"highest_post_number":5,"image_url":"/uploads/default/2495/f9efe463ae67632d.png","created_at":"2013-12-25T15:09:27.000-05:00","last_posted_at":"2014-01-14T17:46:41.000-05:00","bumped":true,"bumped_at":"2014-01-14T17:46:41.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":73,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"radq","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":7985},{"extras":null,"description":"Most Posts","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":3415}]},{"id":11962,"title":"Editor When Clicking on Wrench Issue","fancy_title":"Editor When Clicking on Wrench Issue","slug":"editor-when-clicking-on-wrench-issue","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":"/uploads/default/_optimized/ca4/f70/ac7278b8f6_690x176.png","created_at":"2014-01-14T17:23:20.000-05:00","last_posted_at":"2014-01-14T17:24:02.000-05:00","bumped":true,"bumped_at":"2014-01-14T17:24:02.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":30,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":7073},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11831,"title":"Broken links, possibly related to HTTPS","fancy_title":"Broken links, possibly related to HTTPS","slug":"broken-links-possibly-related-to-https","posts_count":17,"reply_count":13,"highest_post_number":18,"image_url":null,"created_at":"2014-01-08T17:40:45.000-05:00","last_posted_at":"2014-01-14T16:03:07.000-05:00","bumped":true,"bumped_at":"2014-01-14T16:03:07.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":102,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"eviltrout","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":5351},{"extras":null,"description":"Most Posts","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":471},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":19}]},{"id":11916,"title":"Unable to save user preferences","fancy_title":"Unable to save user preferences","slug":"unable-to-save-user-preferences","posts_count":4,"reply_count":1,"highest_post_number":4,"image_url":null,"created_at":"2014-01-13T02:29:26.000-05:00","last_posted_at":"2014-01-14T14:39:32.000-05:00","bumped":true,"bumped_at":"2014-01-14T14:39:29.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":34,"like_count":3,"has_summary":false,"archetype":"regular","last_poster_username":"zogstrip","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":6626},{"extras":"latest","description":"Most Recent Poster","user_id":1995}]},{"id":10425,"title":"Editing category permissions: select value doesn't change","fancy_title":"Editing category permissions: select value doesn&rsquo;t change","slug":"editing-category-permissions-select-value-doesnt-change","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":"/uploads/meta_discourse/1956/d55fba29dbd7e1fe.png","created_at":"2013-10-17T18:20:20.000-04:00","last_posted_at":"2013-10-17T18:20:21.000-04:00","bumped":true,"bumped_at":"2014-01-14T13:35:37.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":92,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"pekka","category_id":1,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":7}]},{"id":6557,"title":"Middle clicking a link twice does not work as expected","fancy_title":"Middle clicking a link twice does not work as expected","slug":"middle-clicking-a-link-twice-does-not-work-as-expected","posts_count":10,"reply_count":7,"highest_post_number":10,"image_url":null,"created_at":"2013-05-11T13:56:02.000-04:00","last_posted_at":"2014-01-14T13:13:04.000-05:00","bumped":true,"bumped_at":"2014-01-14T13:13:04.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":401,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"neil","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":4780},{"extras":null,"description":"Most Posts","user_id":5053},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":2}]},{"id":11944,"title":"Regression: Cannot sort topic list","fancy_title":"Regression: Cannot sort topic list","slug":"regression-cannot-sort-topic-list","posts_count":5,"reply_count":0,"highest_post_number":5,"image_url":null,"created_at":"2014-01-13T20:14:06.000-05:00","last_posted_at":"2014-01-14T19:31:28.000-05:00","bumped":true,"bumped_at":"2014-01-14T07:31:19.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":true,"views":37,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"zogstrip","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":6626},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":1995}]},{"id":10462,"title":"Rebake error when posts contain deleted YouTube video","fancy_title":"Rebake error when posts contain deleted YouTube video","slug":"rebake-error-when-posts-contain-deleted-youtube-video","posts_count":7,"reply_count":1,"highest_post_number":7,"image_url":null,"created_at":"2013-10-19T00:01:21.000-04:00","last_posted_at":"2014-01-14T02:24:19.000-05:00","bumped":true,"bumped_at":"2014-01-14T02:24:12.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":178,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":6695},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11932,"title":"Use of blockquote tag causes text outside a paragraph","fancy_title":"Use of blockquote tag causes text outside a paragraph","slug":"use-of-blockquote-tag-causes-text-outside-a-paragraph","posts_count":4,"reply_count":2,"highest_post_number":4,"image_url":null,"created_at":"2014-01-13T13:38:15.000-05:00","last_posted_at":"2014-01-13T19:30:37.000-05:00","bumped":true,"bumped_at":"2014-01-14T02:22:58.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":54,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":6626},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":10357,"title":"Displaced Wrench Icon Chrome","fancy_title":"Displaced Wrench Icon Chrome","slug":"displaced-wrench-icon-chrome","posts_count":12,"reply_count":4,"highest_post_number":12,"image_url":"/uploads/default/_optimized/9f3/f35/c5379beffe_690x300.jpg","created_at":"2013-10-14T05:48:21.000-04:00","last_posted_at":"2014-01-14T03:21:32.000-05:00","bumped":true,"bumped_at":"2014-01-13T19:03:33.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":206,"like_count":10,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":7073},{"extras":null,"description":"Frequent Poster","user_id":212},{"extras":null,"description":"Frequent Poster","user_id":6118},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":10114,"title":"Invitation expiry workflow is wonky","fancy_title":"Invitation expiry workflow is wonky","slug":"invitation-expiry-workflow-is-wonky","posts_count":14,"reply_count":7,"highest_post_number":14,"image_url":null,"created_at":"2013-09-30T00:59:36.000-04:00","last_posted_at":"2014-01-13T18:51:26.000-05:00","bumped":true,"bumped_at":"2014-01-13T18:51:26.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":176,"like_count":2,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":1},{"extras":null,"description":"Most Posts","user_id":7076},{"extras":null,"description":"Frequent Poster","user_id":2},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":6330,"title":"Reply not disabled if topic closed while viewing","fancy_title":"Reply not disabled if topic closed while viewing","slug":"reply-not-disabled-if-topic-closed-while-viewing","posts_count":5,"reply_count":1,"highest_post_number":5,"image_url":"https://www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s=40&r=pg&d=identicon","created_at":"2013-05-02T06:02:06.000-04:00","last_posted_at":"2014-01-13T11:54:22.000-05:00","bumped":true,"bumped_at":"2014-01-13T11:54:22.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":164,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":4851},{"extras":null,"description":"Most Posts","user_id":2},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":8367,"title":"Very fast scrolling fails to mark all posts read in a thread","fancy_title":"Very fast scrolling fails to mark all posts read in a thread","slug":"very-fast-scrolling-fails-to-mark-all-posts-read-in-a-thread","posts_count":11,"reply_count":7,"highest_post_number":13,"image_url":null,"created_at":"2013-07-14T12:37:02.000-04:00","last_posted_at":"2014-01-13T11:16:56.000-05:00","bumped":true,"bumped_at":"2014-01-13T11:16:33.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":288,"like_count":5,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":4457},{"extras":null,"description":"Most Posts","user_id":6280},{"extras":null,"description":"Frequent Poster","user_id":3681},{"extras":null,"description":"Frequent Poster","user_id":1621},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":8815,"title":"Cache headers confuse proxies","fancy_title":"Cache headers confuse proxies","slug":"cache-headers-confuse-proxies","posts_count":9,"reply_count":3,"highest_post_number":9,"image_url":null,"created_at":"2013-08-02T05:45:26.000-04:00","last_posted_at":"2014-01-13T11:12:09.000-05:00","bumped":true,"bumped_at":"2014-01-13T10:41:44.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":true,"views":314,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":6266},{"extras":null,"description":"Most Posts","user_id":19},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":4457},{"extras":"latest","description":"Most Recent Poster, Frequent Poster","user_id":32}]},{"id":11371,"title":"Search not working for Staff users","fancy_title":"Search not working for Staff users","slug":"search-not-working-for-staff-users","posts_count":15,"reply_count":10,"highest_post_number":15,"image_url":null,"created_at":"2013-12-11T13:22:56.000-05:00","last_posted_at":"2014-01-13T01:41:50.000-05:00","bumped":true,"bumped_at":"2014-01-13T01:41:46.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":true,"views":217,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"sam","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":5335},{"extras":null,"description":"Most Posts","user_id":19},{"extras":null,"description":"Frequent Poster","user_id":6314},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":1}]},{"id":9908,"title":"Draft bar overrides pagination widget","fancy_title":"Draft bar overrides pagination widget","slug":"draft-bar-overrides-pagination-widget","posts_count":4,"reply_count":0,"highest_post_number":4,"image_url":null,"created_at":"2013-09-19T17:19:52.000-04:00","last_posted_at":"2014-01-13T01:26:01.000-05:00","bumped":true,"bumped_at":"2014-01-13T01:25:12.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":true,"views":108,"like_count":2,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":5351},{"extras":null,"description":"Most Posts","user_id":471},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":6134,"title":"Unread topic is stuck as unread after insertion of staff message","fancy_title":"Unread topic is stuck as unread after insertion of staff message","slug":"unread-topic-is-stuck-as-unread-after-insertion-of-staff-message","posts_count":5,"reply_count":1,"highest_post_number":5,"image_url":"https://www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s=40&r=pg&d=identicon","created_at":"2013-04-24T13:37:32.000-04:00","last_posted_at":"2014-01-13T01:22:49.000-05:00","bumped":true,"bumped_at":"2014-01-13T01:22:42.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":169,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":3681},{"extras":null,"description":"Most Posts","user_id":5351},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11914,"title":"Google analytics is not registering page views","fancy_title":"Google analytics is not registering page views","slug":"google-analytics-is-not-registering-page-views","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-13T00:32:45.000-05:00","last_posted_at":"2014-01-13T00:32:46.000-05:00","bumped":true,"bumped_at":"2014-01-13T00:32:46.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":37,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"sam","category_id":1,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":1}]}]}},
 "/c/feature/l/latest.json": {"users":[{"id":1,"username":"sam","avatar_template":"/images/avatar.png"},{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"},{"id":8021,"username":"Abhishek_Gupta","avatar_template":"/images/avatar.png"},{"id":6695,"username":"illspirit","avatar_template":"/images/avatar.png"},{"id":2,"username":"neil","avatar_template":"/images/avatar.png"},{"id":3124,"username":"sipp11","avatar_template":"/images/avatar.png"},{"id":7513,"username":"digit","avatar_template":"/images/avatar.png"},{"id":19,"username":"eviltrout","avatar_template":"/images/avatar.png"},{"id":3,"username":"supermathie","avatar_template":"/images/avatar.png"},{"id":7073,"username":"5an1ty","avatar_template":"/images/avatar.png"},{"id":4996,"username":"wmertens","avatar_template":"/images/avatar.png"},{"id":6377,"username":"zh99998","avatar_template":"/images/avatar.png"},{"id":1496,"username":"cfstras","avatar_template":"/images/avatar.png"},{"id":7995,"username":"Hunter","avatar_template":"/images/avatar.png"},{"id":6626,"username":"riking","avatar_template":"/images/avatar.png"},{"id":1995,"username":"zogstrip","avatar_template":"/images/avatar.png"},{"id":5048,"username":"SneakySly","avatar_template":"/images/avatar.png"},{"id":7731,"username":"YOU","avatar_template":"/images/avatar.png"},{"id":7985,"username":"onlinedev","avatar_template":"/images/avatar.png"},{"id":3415,"username":"radq","avatar_template":"/images/avatar.png"},{"id":5351,"username":"erlend_sh","avatar_template":"/images/avatar.png"},{"id":471,"username":"BhaelOchon","avatar_template":"/images/avatar.png"},{"id":7,"username":"pekka","avatar_template":"/images/avatar.png"},{"id":4780,"username":"HugoAlmeida","avatar_template":"/images/avatar.png"},{"id":5053,"username":"Blue","avatar_template":"/images/avatar.png"},{"id":212,"username":"alxndr","avatar_template":"/images/avatar.png"},{"id":6118,"username":"lukelarris","avatar_template":"/images/avatar.png"},{"id":7076,"username":"philnelson","avatar_template":"/images/avatar.png"},{"id":4851,"username":"jab","avatar_template":"/images/avatar.png"},{"id":4457,"username":"Lee_Ars","avatar_template":"/images/avatar.png"},{"id":6280,"username":"mx2000","avatar_template":"/images/avatar.png"},{"id":3681,"username":"Ajarn","avatar_template":"/images/avatar.png"},{"id":1621,"username":"bnb","avatar_template":"/images/avatar.png"},{"id":6266,"username":"bragi","avatar_template":"/images/avatar.png"},{"id":5335,"username":"masda70","avatar_template":"/images/avatar.png"},{"id":6314,"username":"rafaelfranca","avatar_template":"/images/avatar.png"}],"topic_list":{"can_create_topic":false,"more_topics_url":"/latest.json?category=2&page=1","draft":null,"draft_key":"new_topic","draft_sequence":null,"topics":[{"id":2,"title":"Category definition for feature","fancy_title":"Category definition for feature","slug":"category-definition-for-feature","posts_count":2,"reply_count":0,"highest_post_number":3,"image_url":null,"created_at":"2013-01-31T23:56:34.000-05:00","last_posted_at":"2013-03-07T22:42:27.000-05:00","bumped":true,"bumped_at":"2013-02-26T18:52:56.000-05:00","unseen":false,"pinned":true,"excerpt":"Features on Discourse.","visible":true,"closed":false,"archived":false,"views":469,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":1},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11994,"title":"Cross domain rules, followed?","fancy_title":"Cross domain rules, followed?","slug":"cross-domain-rules-followed","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":"/plugins/emoji/images/smile.png","created_at":"2014-01-16T09:59:15.000-05:00","last_posted_at":"2014-01-16T09:59:15.000-05:00","bumped":true,"bumped_at":"2014-01-16T11:04:32.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":15,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"Abhishek_Gupta","category_id":2,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":8021}]},{"id":11888,"title":"Uncategorized topics not allowed, still seeing tag places","fancy_title":"Uncategorized topics not allowed, still seeing tag places","slug":"uncategorized-topics-not-allowed-still-seeing-tag-places","posts_count":5,"reply_count":1,"highest_post_number":5,"image_url":null,"created_at":"2014-01-10T19:23:37.000-05:00","last_posted_at":"2014-01-15T22:41:25.000-05:00","bumped":true,"bumped_at":"2014-01-15T22:41:25.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":50,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"illspirit","category_id":2,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":6695},{"extras":null,"description":"Most Posts","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":2}]},{"id":9151,"title":"Apple touch icon doesn't show if there is no sub domain","fancy_title":"Apple touch icon doesn&rsquo;t show if there is no sub domain","slug":"apple-touch-icon-doesnt-show-if-there-is-no-sub-domain","posts_count":7,"reply_count":4,"highest_post_number":7,"image_url":null,"created_at":"2013-08-16T18:16:53.000-04:00","last_posted_at":"2014-01-15T17:10:18.000-05:00","bumped":true,"bumped_at":"2014-01-15T13:19:22.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":188,"like_count":3,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":3124},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":10911,"title":"/users/activate-account pulling blank logo instead of defaulting to h2","fancy_title":"/users/activate-account pulling blank logo instead of defaulting to h2","slug":"users-activate-account-pulling-blank-logo-instead-of-defaulting-to-h2","posts_count":3,"reply_count":1,"highest_post_number":3,"image_url":null,"created_at":"2013-11-12T14:49:04.000-05:00","last_posted_at":"2014-01-15T10:21:37.000-05:00","bumped":true,"bumped_at":"2014-01-15T10:21:37.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":121,"like_count":3,"has_summary":false,"archetype":"regular","last_poster_username":"eviltrout","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":7513},{"extras":"latest","description":"Most Recent Poster","user_id":19}]},{"id":11937,"title":"Smiley parser is busted","fancy_title":"Smiley parser is busted","slug":"smiley-parser-is-busted","posts_count":4,"reply_count":4,"highest_post_number":7,"image_url":"/plugins/emoji/images/smile.png","created_at":"2014-01-13T15:42:00.000-05:00","last_posted_at":"2014-01-15T05:51:16.000-05:00","bumped":true,"bumped_at":"2014-01-15T05:51:16.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":66,"like_count":2,"has_summary":false,"archetype":"regular","last_poster_username":"sam","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":3},{"extras":null,"description":"Most Posts","user_id":7073},{"extras":"latest","description":"Most Recent Poster","user_id":1}]},{"id":6625,"title":"Error 500 on PUT of site config","fancy_title":"Error 500 on PUT of site config","slug":"error-500-on-put-of-site-config","posts_count":4,"reply_count":1,"highest_post_number":4,"image_url":null,"created_at":"2013-05-14T18:13:56.000-04:00","last_posted_at":"2014-01-16T04:55:50.000-05:00","bumped":true,"bumped_at":"2014-01-15T04:43:23.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":132,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":4996},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":11225,"title":"Forum acts weirdly after client side updates","fancy_title":"Forum acts weirdly after client side updates","slug":"forum-acts-weirdly-after-client-side-updates","posts_count":5,"reply_count":1,"highest_post_number":5,"image_url":null,"created_at":"2013-12-02T18:32:10.000-05:00","last_posted_at":"2014-01-15T04:04:55.000-05:00","bumped":true,"bumped_at":"2014-01-15T02:55:18.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":117,"like_count":7,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":1},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":11903,"title":"Error after update to 0.9.8.1","fancy_title":"Error after update to 0.9.8.1","slug":"error-after-update-to-0-9-8-1","posts_count":14,"reply_count":6,"highest_post_number":17,"image_url":null,"created_at":"2014-01-12T06:55:45.000-05:00","last_posted_at":"2014-01-15T01:48:58.000-05:00","bumped":true,"bumped_at":"2014-01-15T01:48:58.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":121,"like_count":6,"has_summary":false,"archetype":"regular","last_poster_username":"zh99998","category_id":2,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":6377},{"extras":null,"description":"Most Posts","user_id":1496},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":19}]},{"id":11969,"title":"Qunit error and possibly related ember.js problem","fancy_title":"Qunit error and possibly related ember.js problem","slug":"qunit-error-and-possibly-related-ember-js-problem","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-14T22:51:32.000-05:00","last_posted_at":"2014-01-14T22:51:32.000-05:00","bumped":false,"bumped_at":"2014-01-14T22:51:32.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":32,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"Hunter","category_id":2,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":7995}]},{"id":11945,"title":"Stuff disappears on the groups page","fancy_title":"Stuff disappears on the groups page","slug":"stuff-disappears-on-the-groups-page","posts_count":7,"reply_count":2,"highest_post_number":7,"image_url":null,"created_at":"2014-01-13T23:03:53.000-05:00","last_posted_at":"2014-01-15T01:26:07.000-05:00","bumped":true,"bumped_at":"2014-01-14T21:09:01.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":54,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"zogstrip","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":6695},{"extras":null,"description":"Most Posts","user_id":6626},{"extras":"latest","description":"Most Recent Poster, Frequent Poster","user_id":1995}]},{"id":11520,"title":"Discourse WordPress Plugin: Emoji's do not properly display","fancy_title":"Discourse WordPress Plugin: Emoji&rsquo;s do not properly display","slug":"discourse-wordpress-plugin-emojis-do-not-properly-display","posts_count":9,"reply_count":4,"highest_post_number":9,"image_url":"/uploads/default/_optimized/638/4db/eff43a45b8_690x420.png","created_at":"2013-12-19T23:32:03.000-05:00","last_posted_at":"2014-01-15T04:32:19.000-05:00","bumped":true,"bumped_at":"2014-01-14T17:53:34.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":168,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":5048},{"extras":null,"description":"Frequent Poster","user_id":7731},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":11597,"title":"All categories drop down does not close after clicking on first menu \"all categories\"","fancy_title":"All categories drop down does not close after clicking on first menu &ldquo;all categories&rdquo;","slug":"all-categories-drop-down-does-not-close-after-clicking-on-first-menu-all-categories","posts_count":5,"reply_count":2,"highest_post_number":5,"image_url":"/uploads/default/2495/f9efe463ae67632d.png","created_at":"2013-12-25T15:09:27.000-05:00","last_posted_at":"2014-01-14T17:46:41.000-05:00","bumped":true,"bumped_at":"2014-01-14T17:46:41.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":73,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"radq","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":7985},{"extras":null,"description":"Most Posts","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":3415}]},{"id":11962,"title":"Editor When Clicking on Wrench Issue","fancy_title":"Editor When Clicking on Wrench Issue","slug":"editor-when-clicking-on-wrench-issue","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":"/uploads/default/_optimized/ca4/f70/ac7278b8f6_690x176.png","created_at":"2014-01-14T17:23:20.000-05:00","last_posted_at":"2014-01-14T17:24:02.000-05:00","bumped":true,"bumped_at":"2014-01-14T17:24:02.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":30,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":7073},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11831,"title":"Broken links, possibly related to HTTPS","fancy_title":"Broken links, possibly related to HTTPS","slug":"broken-links-possibly-related-to-https","posts_count":17,"reply_count":13,"highest_post_number":18,"image_url":null,"created_at":"2014-01-08T17:40:45.000-05:00","last_posted_at":"2014-01-14T16:03:07.000-05:00","bumped":true,"bumped_at":"2014-01-14T16:03:07.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":102,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"eviltrout","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":5351},{"extras":null,"description":"Most Posts","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":471},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":19}]},{"id":11916,"title":"Unable to save user preferences","fancy_title":"Unable to save user preferences","slug":"unable-to-save-user-preferences","posts_count":4,"reply_count":1,"highest_post_number":4,"image_url":null,"created_at":"2014-01-13T02:29:26.000-05:00","last_posted_at":"2014-01-14T14:39:32.000-05:00","bumped":true,"bumped_at":"2014-01-14T14:39:29.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":34,"like_count":3,"has_summary":false,"archetype":"regular","last_poster_username":"zogstrip","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":6626},{"extras":"latest","description":"Most Recent Poster","user_id":1995}]},{"id":10425,"title":"Editing category permissions: select value doesn't change","fancy_title":"Editing category permissions: select value doesn&rsquo;t change","slug":"editing-category-permissions-select-value-doesnt-change","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":"/uploads/meta_discourse/1956/d55fba29dbd7e1fe.png","created_at":"2013-10-17T18:20:20.000-04:00","last_posted_at":"2013-10-17T18:20:21.000-04:00","bumped":true,"bumped_at":"2014-01-14T13:35:37.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":92,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"pekka","category_id":2,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":7}]},{"id":6557,"title":"Middle clicking a link twice does not work as expected","fancy_title":"Middle clicking a link twice does not work as expected","slug":"middle-clicking-a-link-twice-does-not-work-as-expected","posts_count":10,"reply_count":7,"highest_post_number":10,"image_url":null,"created_at":"2013-05-11T13:56:02.000-04:00","last_posted_at":"2014-01-14T13:13:04.000-05:00","bumped":true,"bumped_at":"2014-01-14T13:13:04.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":401,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"neil","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":4780},{"extras":null,"description":"Most Posts","user_id":5053},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":2}]},{"id":11944,"title":"Regression: Cannot sort topic list","fancy_title":"Regression: Cannot sort topic list","slug":"regression-cannot-sort-topic-list","posts_count":5,"reply_count":0,"highest_post_number":5,"image_url":null,"created_at":"2014-01-13T20:14:06.000-05:00","last_posted_at":"2014-01-14T19:31:28.000-05:00","bumped":true,"bumped_at":"2014-01-14T07:31:19.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":true,"views":37,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"zogstrip","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":6626},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":1995}]},{"id":10462,"title":"Rebake error when posts contain deleted YouTube video","fancy_title":"Rebake error when posts contain deleted YouTube video","slug":"rebake-error-when-posts-contain-deleted-youtube-video","posts_count":7,"reply_count":1,"highest_post_number":7,"image_url":null,"created_at":"2013-10-19T00:01:21.000-04:00","last_posted_at":"2014-01-14T02:24:19.000-05:00","bumped":true,"bumped_at":"2014-01-14T02:24:12.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":178,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":6695},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11932,"title":"Use of blockquote tag causes text outside a paragraph","fancy_title":"Use of blockquote tag causes text outside a paragraph","slug":"use-of-blockquote-tag-causes-text-outside-a-paragraph","posts_count":4,"reply_count":2,"highest_post_number":4,"image_url":null,"created_at":"2014-01-13T13:38:15.000-05:00","last_posted_at":"2014-01-13T19:30:37.000-05:00","bumped":true,"bumped_at":"2014-01-14T02:22:58.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":54,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":6626},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":10357,"title":"Displaced Wrench Icon Chrome","fancy_title":"Displaced Wrench Icon Chrome","slug":"displaced-wrench-icon-chrome","posts_count":12,"reply_count":4,"highest_post_number":12,"image_url":"/uploads/default/_optimized/9f3/f35/c5379beffe_690x300.jpg","created_at":"2013-10-14T05:48:21.000-04:00","last_posted_at":"2014-01-14T03:21:32.000-05:00","bumped":true,"bumped_at":"2014-01-13T19:03:33.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":206,"like_count":10,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":7073},{"extras":null,"description":"Frequent Poster","user_id":212},{"extras":null,"description":"Frequent Poster","user_id":6118},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":10114,"title":"Invitation expiry workflow is wonky","fancy_title":"Invitation expiry workflow is wonky","slug":"invitation-expiry-workflow-is-wonky","posts_count":14,"reply_count":7,"highest_post_number":14,"image_url":null,"created_at":"2013-09-30T00:59:36.000-04:00","last_posted_at":"2014-01-13T18:51:26.000-05:00","bumped":true,"bumped_at":"2014-01-13T18:51:26.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":176,"like_count":2,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":1},{"extras":null,"description":"Most Posts","user_id":7076},{"extras":null,"description":"Frequent Poster","user_id":2},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":6330,"title":"Reply not disabled if topic closed while viewing","fancy_title":"Reply not disabled if topic closed while viewing","slug":"reply-not-disabled-if-topic-closed-while-viewing","posts_count":5,"reply_count":1,"highest_post_number":5,"image_url":"https://www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s=40&r=pg&d=identicon","created_at":"2013-05-02T06:02:06.000-04:00","last_posted_at":"2014-01-13T11:54:22.000-05:00","bumped":true,"bumped_at":"2014-01-13T11:54:22.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":164,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":4851},{"extras":null,"description":"Most Posts","user_id":2},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":8367,"title":"Very fast scrolling fails to mark all posts read in a thread","fancy_title":"Very fast scrolling fails to mark all posts read in a thread","slug":"very-fast-scrolling-fails-to-mark-all-posts-read-in-a-thread","posts_count":11,"reply_count":7,"highest_post_number":13,"image_url":null,"created_at":"2013-07-14T12:37:02.000-04:00","last_posted_at":"2014-01-13T11:16:56.000-05:00","bumped":true,"bumped_at":"2014-01-13T11:16:33.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":288,"like_count":5,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":4457},{"extras":null,"description":"Most Posts","user_id":6280},{"extras":null,"description":"Frequent Poster","user_id":3681},{"extras":null,"description":"Frequent Poster","user_id":1621},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":8815,"title":"Cache headers confuse proxies","fancy_title":"Cache headers confuse proxies","slug":"cache-headers-confuse-proxies","posts_count":9,"reply_count":3,"highest_post_number":9,"image_url":null,"created_at":"2013-08-02T05:45:26.000-04:00","last_posted_at":"2014-01-13T11:12:09.000-05:00","bumped":true,"bumped_at":"2014-01-13T10:41:44.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":true,"views":314,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":6266},{"extras":null,"description":"Most Posts","user_id":19},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":4457},{"extras":"latest","description":"Most Recent Poster, Frequent Poster","user_id":32}]},{"id":11371,"title":"Search not working for Staff users","fancy_title":"Search not working for Staff users","slug":"search-not-working-for-staff-users","posts_count":15,"reply_count":10,"highest_post_number":15,"image_url":null,"created_at":"2013-12-11T13:22:56.000-05:00","last_posted_at":"2014-01-13T01:41:50.000-05:00","bumped":true,"bumped_at":"2014-01-13T01:41:46.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":true,"views":217,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"sam","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":5335},{"extras":null,"description":"Most Posts","user_id":19},{"extras":null,"description":"Frequent Poster","user_id":6314},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":1}]},{"id":9908,"title":"Draft bar overrides pagination widget","fancy_title":"Draft bar overrides pagination widget","slug":"draft-bar-overrides-pagination-widget","posts_count":4,"reply_count":0,"highest_post_number":4,"image_url":null,"created_at":"2013-09-19T17:19:52.000-04:00","last_posted_at":"2014-01-13T01:26:01.000-05:00","bumped":true,"bumped_at":"2014-01-13T01:25:12.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":true,"views":108,"like_count":2,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":5351},{"extras":null,"description":"Most Posts","user_id":471},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":6134,"title":"Unread topic is stuck as unread after insertion of staff message","fancy_title":"Unread topic is stuck as unread after insertion of staff message","slug":"unread-topic-is-stuck-as-unread-after-insertion-of-staff-message","posts_count":5,"reply_count":1,"highest_post_number":5,"image_url":"https://www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s=40&r=pg&d=identicon","created_at":"2013-04-24T13:37:32.000-04:00","last_posted_at":"2014-01-13T01:22:49.000-05:00","bumped":true,"bumped_at":"2014-01-13T01:22:42.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":169,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":3681},{"extras":null,"description":"Most Posts","user_id":5351},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11914,"title":"Google analytics is not registering page views","fancy_title":"Google analytics is not registering page views","slug":"google-analytics-is-not-registering-page-views","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-13T00:32:45.000-05:00","last_posted_at":"2014-01-13T00:32:46.000-05:00","bumped":true,"bumped_at":"2014-01-13T00:32:46.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":37,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"sam","category_id":2,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":1}]}]}},
 "/c/dev/l/latest.json": {"users":[{"id":1,"username":"sam","avatar_template":"/images/avatar.png"},{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"},{"id":8021,"username":"Abhishek_Gupta","avatar_template":"/images/avatar.png"},{"id":6695,"username":"illspirit","avatar_template":"/images/avatar.png"},{"id":2,"username":"neil","avatar_template":"/images/avatar.png"},{"id":3124,"username":"sipp11","avatar_template":"/images/avatar.png"},{"id":7513,"username":"digit","avatar_template":"/images/avatar.png"},{"id":19,"username":"eviltrout","avatar_template":"/images/avatar.png"},{"id":3,"username":"supermathie","avatar_template":"/images/avatar.png"},{"id":7073,"username":"5an1ty","avatar_template":"/images/avatar.png"},{"id":4996,"username":"wmertens","avatar_template":"/images/avatar.png"},{"id":6377,"username":"zh99998","avatar_template":"/images/avatar.png"},{"id":1496,"username":"cfstras","avatar_template":"/images/avatar.png"},{"id":7995,"username":"Hunter","avatar_template":"/images/avatar.png"},{"id":6626,"username":"riking","avatar_template":"/images/avatar.png"},{"id":1995,"username":"zogstrip","avatar_template":"/images/avatar.png"},{"id":5048,"username":"SneakySly","avatar_template":"/images/avatar.png"},{"id":7731,"username":"YOU","avatar_template":"/images/avatar.png"},{"id":7985,"username":"onlinedev","avatar_template":"/images/avatar.png"},{"id":3415,"username":"radq","avatar_template":"/images/avatar.png"},{"id":5351,"username":"erlend_sh","avatar_template":"/images/avatar.png"},{"id":471,"username":"BhaelOchon","avatar_template":"/images/avatar.png"},{"id":7,"username":"pekka","avatar_template":"/images/avatar.png"},{"id":4780,"username":"HugoAlmeida","avatar_template":"/images/avatar.png"},{"id":5053,"username":"Blue","avatar_template":"/images/avatar.png"},{"id":212,"username":"alxndr","avatar_template":"/images/avatar.png"},{"id":6118,"username":"lukelarris","avatar_template":"/images/avatar.png"},{"id":7076,"username":"philnelson","avatar_template":"/images/avatar.png"},{"id":4851,"username":"jab","avatar_template":"/images/avatar.png"},{"id":4457,"username":"Lee_Ars","avatar_template":"/images/avatar.png"},{"id":6280,"username":"mx2000","avatar_template":"/images/avatar.png"},{"id":3681,"username":"Ajarn","avatar_template":"/images/avatar.png"},{"id":1621,"username":"bnb","avatar_template":"/images/avatar.png"},{"id":6266,"username":"bragi","avatar_template":"/images/avatar.png"},{"id":5335,"username":"masda70","avatar_template":"/images/avatar.png"},{"id":6314,"username":"rafaelfranca","avatar_template":"/images/avatar.png"}],"topic_list":{"can_create_topic":false,"more_topics_url":"/latest.json?category=2&page=1","draft":null,"draft_key":"new_topic","draft_sequence":null,"topics":[{"id":2,"title":"Category definition for dev","fancy_title":"Category definition for dev","slug":"category-definition-for-dev","posts_count":2,"reply_count":0,"highest_post_number":3,"image_url":null,"created_at":"2013-01-31T23:56:34.000-05:00","last_posted_at":"2013-03-07T22:42:27.000-05:00","bumped":true,"bumped_at":"2013-02-26T18:52:56.000-05:00","unseen":false,"pinned":true,"excerpt":"Development of Discourse.","visible":true,"closed":false,"archived":false,"views":469,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":1},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11994,"title":"Cross domain rules, followed?","fancy_title":"Cross domain rules, followed?","slug":"cross-domain-rules-followed","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":"/plugins/emoji/images/smile.png","created_at":"2014-01-16T09:59:15.000-05:00","last_posted_at":"2014-01-16T09:59:15.000-05:00","bumped":true,"bumped_at":"2014-01-16T11:04:32.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":15,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"Abhishek_Gupta","category_id":7,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":8021}]},{"id":11888,"title":"Uncategorized topics not allowed, still seeing tag places","fancy_title":"Uncategorized topics not allowed, still seeing tag places","slug":"uncategorized-topics-not-allowed-still-seeing-tag-places","posts_count":5,"reply_count":1,"highest_post_number":5,"image_url":null,"created_at":"2014-01-10T19:23:37.000-05:00","last_posted_at":"2014-01-15T22:41:25.000-05:00","bumped":true,"bumped_at":"2014-01-15T22:41:25.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":50,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"illspirit","category_id":7,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":6695},{"extras":null,"description":"Most Posts","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":2}]},{"id":9151,"title":"Apple touch icon doesn't show if there is no sub domain","fancy_title":"Apple touch icon doesn&rsquo;t show if there is no sub domain","slug":"apple-touch-icon-doesnt-show-if-there-is-no-sub-domain","posts_count":7,"reply_count":4,"highest_post_number":7,"image_url":null,"created_at":"2013-08-16T18:16:53.000-04:00","last_posted_at":"2014-01-15T17:10:18.000-05:00","bumped":true,"bumped_at":"2014-01-15T13:19:22.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":188,"like_count":3,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":3124},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":10911,"title":"/users/activate-account pulling blank logo instead of defaulting to h2","fancy_title":"/users/activate-account pulling blank logo instead of defaulting to h2","slug":"users-activate-account-pulling-blank-logo-instead-of-defaulting-to-h2","posts_count":3,"reply_count":1,"highest_post_number":3,"image_url":null,"created_at":"2013-11-12T14:49:04.000-05:00","last_posted_at":"2014-01-15T10:21:37.000-05:00","bumped":true,"bumped_at":"2014-01-15T10:21:37.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":121,"like_count":3,"has_summary":false,"archetype":"regular","last_poster_username":"eviltrout","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":7513},{"extras":"latest","description":"Most Recent Poster","user_id":19}]},{"id":11937,"title":"Smiley parser is busted","fancy_title":"Smiley parser is busted","slug":"smiley-parser-is-busted","posts_count":4,"reply_count":4,"highest_post_number":7,"image_url":"/plugins/emoji/images/smile.png","created_at":"2014-01-13T15:42:00.000-05:00","last_posted_at":"2014-01-15T05:51:16.000-05:00","bumped":true,"bumped_at":"2014-01-15T05:51:16.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":66,"like_count":2,"has_summary":false,"archetype":"regular","last_poster_username":"sam","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":3},{"extras":null,"description":"Most Posts","user_id":7073},{"extras":"latest","description":"Most Recent Poster","user_id":1}]},{"id":6625,"title":"Error 500 on PUT of site config","fancy_title":"Error 500 on PUT of site config","slug":"error-500-on-put-of-site-config","posts_count":4,"reply_count":1,"highest_post_number":4,"image_url":null,"created_at":"2013-05-14T18:13:56.000-04:00","last_posted_at":"2014-01-16T04:55:50.000-05:00","bumped":true,"bumped_at":"2014-01-15T04:43:23.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":132,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":4996},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":11225,"title":"Forum acts weirdly after client side updates","fancy_title":"Forum acts weirdly after client side updates","slug":"forum-acts-weirdly-after-client-side-updates","posts_count":5,"reply_count":1,"highest_post_number":5,"image_url":null,"created_at":"2013-12-02T18:32:10.000-05:00","last_posted_at":"2014-01-15T04:04:55.000-05:00","bumped":true,"bumped_at":"2014-01-15T02:55:18.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":117,"like_count":7,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":1},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":11903,"title":"Error after update to 0.9.8.1","fancy_title":"Error after update to 0.9.8.1","slug":"error-after-update-to-0-9-8-1","posts_count":14,"reply_count":6,"highest_post_number":17,"image_url":null,"created_at":"2014-01-12T06:55:45.000-05:00","last_posted_at":"2014-01-15T01:48:58.000-05:00","bumped":true,"bumped_at":"2014-01-15T01:48:58.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":121,"like_count":6,"has_summary":false,"archetype":"regular","last_poster_username":"zh99998","category_id":7,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":6377},{"extras":null,"description":"Most Posts","user_id":1496},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":19}]},{"id":11969,"title":"Qunit error and possibly related ember.js problem","fancy_title":"Qunit error and possibly related ember.js problem","slug":"qunit-error-and-possibly-related-ember-js-problem","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-14T22:51:32.000-05:00","last_posted_at":"2014-01-14T22:51:32.000-05:00","bumped":false,"bumped_at":"2014-01-14T22:51:32.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":32,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"Hunter","category_id":7,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":7995}]},{"id":11945,"title":"Stuff disappears on the groups page","fancy_title":"Stuff disappears on the groups page","slug":"stuff-disappears-on-the-groups-page","posts_count":7,"reply_count":2,"highest_post_number":7,"image_url":null,"created_at":"2014-01-13T23:03:53.000-05:00","last_posted_at":"2014-01-15T01:26:07.000-05:00","bumped":true,"bumped_at":"2014-01-14T21:09:01.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":54,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"zogstrip","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":6695},{"extras":null,"description":"Most Posts","user_id":6626},{"extras":"latest","description":"Most Recent Poster, Frequent Poster","user_id":1995}]},{"id":11520,"title":"Discourse WordPress Plugin: Emoji's do not properly display","fancy_title":"Discourse WordPress Plugin: Emoji&rsquo;s do not properly display","slug":"discourse-wordpress-plugin-emojis-do-not-properly-display","posts_count":9,"reply_count":4,"highest_post_number":9,"image_url":"/uploads/default/_optimized/638/4db/eff43a45b8_690x420.png","created_at":"2013-12-19T23:32:03.000-05:00","last_posted_at":"2014-01-15T04:32:19.000-05:00","bumped":true,"bumped_at":"2014-01-14T17:53:34.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":168,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":5048},{"extras":null,"description":"Frequent Poster","user_id":7731},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":11597,"title":"All categories drop down does not close after clicking on first menu \"all categories\"","fancy_title":"All categories drop down does not close after clicking on first menu &ldquo;all categories&rdquo;","slug":"all-categories-drop-down-does-not-close-after-clicking-on-first-menu-all-categories","posts_count":5,"reply_count":2,"highest_post_number":5,"image_url":"/uploads/default/2495/f9efe463ae67632d.png","created_at":"2013-12-25T15:09:27.000-05:00","last_posted_at":"2014-01-14T17:46:41.000-05:00","bumped":true,"bumped_at":"2014-01-14T17:46:41.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":73,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"radq","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":7985},{"extras":null,"description":"Most Posts","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":3415}]},{"id":11962,"title":"Editor When Clicking on Wrench Issue","fancy_title":"Editor When Clicking on Wrench Issue","slug":"editor-when-clicking-on-wrench-issue","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":"/uploads/default/_optimized/ca4/f70/ac7278b8f6_690x176.png","created_at":"2014-01-14T17:23:20.000-05:00","last_posted_at":"2014-01-14T17:24:02.000-05:00","bumped":true,"bumped_at":"2014-01-14T17:24:02.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":30,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":7073},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11831,"title":"Broken links, possibly related to HTTPS","fancy_title":"Broken links, possibly related to HTTPS","slug":"broken-links-possibly-related-to-https","posts_count":17,"reply_count":13,"highest_post_number":18,"image_url":null,"created_at":"2014-01-08T17:40:45.000-05:00","last_posted_at":"2014-01-14T16:03:07.000-05:00","bumped":true,"bumped_at":"2014-01-14T16:03:07.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":102,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"eviltrout","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":5351},{"extras":null,"description":"Most Posts","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":471},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":19}]},{"id":11916,"title":"Unable to save user preferences","fancy_title":"Unable to save user preferences","slug":"unable-to-save-user-preferences","posts_count":4,"reply_count":1,"highest_post_number":4,"image_url":null,"created_at":"2014-01-13T02:29:26.000-05:00","last_posted_at":"2014-01-14T14:39:32.000-05:00","bumped":true,"bumped_at":"2014-01-14T14:39:29.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":34,"like_count":3,"has_summary":false,"archetype":"regular","last_poster_username":"zogstrip","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":6626},{"extras":"latest","description":"Most Recent Poster","user_id":1995}]},{"id":10425,"title":"Editing category permissions: select value doesn't change","fancy_title":"Editing category permissions: select value doesn&rsquo;t change","slug":"editing-category-permissions-select-value-doesnt-change","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":"/uploads/meta_discourse/1956/d55fba29dbd7e1fe.png","created_at":"2013-10-17T18:20:20.000-04:00","last_posted_at":"2013-10-17T18:20:21.000-04:00","bumped":true,"bumped_at":"2014-01-14T13:35:37.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":92,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"pekka","category_id":7,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":7}]},{"id":6557,"title":"Middle clicking a link twice does not work as expected","fancy_title":"Middle clicking a link twice does not work as expected","slug":"middle-clicking-a-link-twice-does-not-work-as-expected","posts_count":10,"reply_count":7,"highest_post_number":10,"image_url":null,"created_at":"2013-05-11T13:56:02.000-04:00","last_posted_at":"2014-01-14T13:13:04.000-05:00","bumped":true,"bumped_at":"2014-01-14T13:13:04.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":401,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"neil","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":4780},{"extras":null,"description":"Most Posts","user_id":5053},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":2}]},{"id":11944,"title":"Regression: Cannot sort topic list","fancy_title":"Regression: Cannot sort topic list","slug":"regression-cannot-sort-topic-list","posts_count":5,"reply_count":0,"highest_post_number":5,"image_url":null,"created_at":"2014-01-13T20:14:06.000-05:00","last_posted_at":"2014-01-14T19:31:28.000-05:00","bumped":true,"bumped_at":"2014-01-14T07:31:19.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":true,"views":37,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"zogstrip","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":6626},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":1995}]},{"id":10462,"title":"Rebake error when posts contain deleted YouTube video","fancy_title":"Rebake error when posts contain deleted YouTube video","slug":"rebake-error-when-posts-contain-deleted-youtube-video","posts_count":7,"reply_count":1,"highest_post_number":7,"image_url":null,"created_at":"2013-10-19T00:01:21.000-04:00","last_posted_at":"2014-01-14T02:24:19.000-05:00","bumped":true,"bumped_at":"2014-01-14T02:24:12.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":178,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":6695},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11932,"title":"Use of blockquote tag causes text outside a paragraph","fancy_title":"Use of blockquote tag causes text outside a paragraph","slug":"use-of-blockquote-tag-causes-text-outside-a-paragraph","posts_count":4,"reply_count":2,"highest_post_number":4,"image_url":null,"created_at":"2014-01-13T13:38:15.000-05:00","last_posted_at":"2014-01-13T19:30:37.000-05:00","bumped":true,"bumped_at":"2014-01-14T02:22:58.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":54,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":6626},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":10357,"title":"Displaced Wrench Icon Chrome","fancy_title":"Displaced Wrench Icon Chrome","slug":"displaced-wrench-icon-chrome","posts_count":12,"reply_count":4,"highest_post_number":12,"image_url":"/uploads/default/_optimized/9f3/f35/c5379beffe_690x300.jpg","created_at":"2013-10-14T05:48:21.000-04:00","last_posted_at":"2014-01-14T03:21:32.000-05:00","bumped":true,"bumped_at":"2014-01-13T19:03:33.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":206,"like_count":10,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":7073},{"extras":null,"description":"Frequent Poster","user_id":212},{"extras":null,"description":"Frequent Poster","user_id":6118},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":10114,"title":"Invitation expiry workflow is wonky","fancy_title":"Invitation expiry workflow is wonky","slug":"invitation-expiry-workflow-is-wonky","posts_count":14,"reply_count":7,"highest_post_number":14,"image_url":null,"created_at":"2013-09-30T00:59:36.000-04:00","last_posted_at":"2014-01-13T18:51:26.000-05:00","bumped":true,"bumped_at":"2014-01-13T18:51:26.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":176,"like_count":2,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":1},{"extras":null,"description":"Most Posts","user_id":7076},{"extras":null,"description":"Frequent Poster","user_id":2},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":6330,"title":"Reply not disabled if topic closed while viewing","fancy_title":"Reply not disabled if topic closed while viewing","slug":"reply-not-disabled-if-topic-closed-while-viewing","posts_count":5,"reply_count":1,"highest_post_number":5,"image_url":"https://www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s=40&r=pg&d=identicon","created_at":"2013-05-02T06:02:06.000-04:00","last_posted_at":"2014-01-13T11:54:22.000-05:00","bumped":true,"bumped_at":"2014-01-13T11:54:22.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":164,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":4851},{"extras":null,"description":"Most Posts","user_id":2},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":8367,"title":"Very fast scrolling fails to mark all posts read in a thread","fancy_title":"Very fast scrolling fails to mark all posts read in a thread","slug":"very-fast-scrolling-fails-to-mark-all-posts-read-in-a-thread","posts_count":11,"reply_count":7,"highest_post_number":13,"image_url":null,"created_at":"2013-07-14T12:37:02.000-04:00","last_posted_at":"2014-01-13T11:16:56.000-05:00","bumped":true,"bumped_at":"2014-01-13T11:16:33.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":288,"like_count":5,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":4457},{"extras":null,"description":"Most Posts","user_id":6280},{"extras":null,"description":"Frequent Poster","user_id":3681},{"extras":null,"description":"Frequent Poster","user_id":1621},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":8815,"title":"Cache headers confuse proxies","fancy_title":"Cache headers confuse proxies","slug":"cache-headers-confuse-proxies","posts_count":9,"reply_count":3,"highest_post_number":9,"image_url":null,"created_at":"2013-08-02T05:45:26.000-04:00","last_posted_at":"2014-01-13T11:12:09.000-05:00","bumped":true,"bumped_at":"2014-01-13T10:41:44.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":true,"views":314,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":6266},{"extras":null,"description":"Most Posts","user_id":19},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":4457},{"extras":"latest","description":"Most Recent Poster, Frequent Poster","user_id":32}]},{"id":11371,"title":"Search not working for Staff users","fancy_title":"Search not working for Staff users","slug":"search-not-working-for-staff-users","posts_count":15,"reply_count":10,"highest_post_number":15,"image_url":null,"created_at":"2013-12-11T13:22:56.000-05:00","last_posted_at":"2014-01-13T01:41:50.000-05:00","bumped":true,"bumped_at":"2014-01-13T01:41:46.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":true,"views":217,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"sam","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":5335},{"extras":null,"description":"Most Posts","user_id":19},{"extras":null,"description":"Frequent Poster","user_id":6314},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":1}]},{"id":9908,"title":"Draft bar overrides pagination widget","fancy_title":"Draft bar overrides pagination widget","slug":"draft-bar-overrides-pagination-widget","posts_count":4,"reply_count":0,"highest_post_number":4,"image_url":null,"created_at":"2013-09-19T17:19:52.000-04:00","last_posted_at":"2014-01-13T01:26:01.000-05:00","bumped":true,"bumped_at":"2014-01-13T01:25:12.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":true,"views":108,"like_count":2,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":5351},{"extras":null,"description":"Most Posts","user_id":471},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":6134,"title":"Unread topic is stuck as unread after insertion of staff message","fancy_title":"Unread topic is stuck as unread after insertion of staff message","slug":"unread-topic-is-stuck-as-unread-after-insertion-of-staff-message","posts_count":5,"reply_count":1,"highest_post_number":5,"image_url":"https://www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s=40&r=pg&d=identicon","created_at":"2013-04-24T13:37:32.000-04:00","last_posted_at":"2014-01-13T01:22:49.000-05:00","bumped":true,"bumped_at":"2014-01-13T01:22:42.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":169,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":3681},{"extras":null,"description":"Most Posts","user_id":5351},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11914,"title":"Google analytics is not registering page views","fancy_title":"Google analytics is not registering page views","slug":"google-analytics-is-not-registering-page-views","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-13T00:32:45.000-05:00","last_posted_at":"2014-01-13T00:32:46.000-05:00","bumped":true,"bumped_at":"2014-01-13T00:32:46.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":37,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"sam","category_id":7,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":1}]}]}},
diff --git a/test/javascripts/fixtures/group-fixtures.js.es6 b/test/javascripts/fixtures/group-fixtures.js.es6
index 07cb5ef9f5f..4493e65df7b 100644
--- a/test/javascripts/fixtures/group-fixtures.js.es6
+++ b/test/javascripts/fixtures/group-fixtures.js.es6
@@ -1,6 +1,39 @@
 export default {
+  "/groups/moderators.json":{
+    "group": {
+      "id": 50,
+      "automatic": true,
+      "name": "moderators",
+      "display_name": "moderators",
+      "mentionable_level": 0,
+      "messageable_level": 99,
+      "visibility_level": 0,
+      "automatic_membership_email_domains": null,
+      "automatic_membership_retroactive": false,
+      "primary_group": false,
+      "title": null,
+      "grant_trust_level": null,
+      "incoming_email": null,
+      "has_messages": true,
+      "flair_url": null,
+      "flair_bg_color": null,
+      "flair_color": null,
+      "bio_raw": null,
+      "bio_cooked": null,
+      "public_admission": false,
+      "public_exit": false,
+      "allow_membership_requests": false,
+      "full_name": null,
+      "default_notification_level": 2,
+      "membership_request_template": null,
+      "is_group_user": true,
+      "is_group_owner": true,
+      "mentionable": false,
+      "messageable": true
+    },
+  },
   "/groups/discourse.json":{
-    "basic_group":{
+    "group":{
       "id":47,
       "automatic":false,
       "name":"discourse",
@@ -14,6 +47,109 @@ export default {
       "is_group_owner":true,
       "mentionable":true,
       "messageable":true
+    },
+    "extras": {
+      "visible_group_names": ["discourse"]
+    }
+  },
+  "/topics/groups/discourse.json":{
+    "users":[
+      {
+        "id":2,
+        "username":"bruce1",
+        "avatar_template":"/user_avatar/meta.discourse.org/bruce1/{size}/5245.png"
+      },
+      {
+        "id":1,
+        "username":"bruce0",
+        "avatar_template":"/user_avatar/meta.discourse.org/bruce0/{size}/5245.png"
+      }
+    ],
+    "primary_groups":[],
+    "topic_list":{
+      "can_create_topic":true,
+      "draft":null,
+      "draft_key":"new_topic",
+      "draft_sequence":1,
+      "per_page":30,
+      "topics":[
+        {
+          "id":12074,
+          "title":"This is a test topic 1",
+          "fancy_title":"This is a test topic 1",
+          "slug":"this-is-a-test-topic-1",
+          "posts_count":0,
+          "reply_count":0,
+          "highest_post_number":0,
+          "image_url":null,
+          "created_at":"2018-03-15T03:12:48.955Z",
+          "last_posted_at":null,
+          "bumped":true,
+          "bumped_at":"2018-03-15T03:12:48.955Z",
+          "unseen":true,
+          "pinned":false,
+          "unpinned":null,
+          "visible":true,
+          "closed":false,
+          "archived":false,
+          "bookmarked":null,
+          "liked":null,
+          "views":0,
+          "like_count":0,
+          "has_summary":false,
+          "archetype":"regular",
+          "last_poster_username":"bruce1",
+          "category_id":1,
+          "pinned_globally":false,
+          "featured_link":null,
+          "posters":[
+            {
+              "extras":"latest single",
+              "description":"Original Poster, Most Recent Poster",
+              "user_id":2,
+              "primary_group_id":null
+            }
+          ]
+        },
+        {
+          "id":12073,
+          "title":"This is a test topic 0",
+          "fancy_title":"This is a test topic 0",
+          "slug":"this-is-a-test-topic-0",
+          "posts_count":0,
+          "reply_count":0,
+          "highest_post_number":0,
+          "image_url":null,
+          "created_at":"2018-03-15T03:12:48.899Z",
+          "last_posted_at":null,
+          "bumped":true,
+          "bumped_at":"2018-03-15T03:12:48.900Z",
+          "unseen":true,
+          "pinned":false,
+          "unpinned":null,
+          "visible":true,
+          "closed":false,
+          "archived":false,
+          "bookmarked":null,
+          "liked":null,
+          "views":0,
+          "like_count":0,
+          "has_summary":false,
+          "archetype":"regular",
+          "last_poster_username":"bruce0",
+          "category_id":1,
+          "pinned_globally":false,
+          "featured_link":null,
+          "posters":[
+            {
+              "extras":"latest single",
+              "description":"Original Poster, Most Recent Poster",
+              "user_id":1,
+              "primary_group_id":null
+            }
+          ]
+        }
+      ]
     }
   },
   "/groups/discourse/counts.json":{
diff --git a/test/javascripts/fixtures/new-contributors.js.es6 b/test/javascripts/fixtures/new-contributors.js.es6
new file mode 100644
index 00000000000..fc3d6f86c9e
--- /dev/null
+++ b/test/javascripts/fixtures/new-contributors.js.es6
@@ -0,0 +1,49 @@
+export default {
+  "/admin/reports/new_contributors": {
+    "report": {
+      "type": "new_contributors",
+      "title": "New Contributors",
+      "xaxis": "",
+      "yaxis": "",
+      "data": [{
+        "x": "2018-04-11",
+        "y": 10
+      }, {
+        "x": "2018-04-12",
+        "y": 10
+      }, {
+        "x": "2018-04-13",
+        "y": 60
+      }, {
+        "x": "2018-04-14",
+        "y": 60
+      }, {
+        "x": "2018-04-15",
+        "y": 10
+      }, {
+        "x": "2018-04-16",
+        "y": 10
+      }, {
+        "x": "2018-04-17",
+        "y": 10
+      }, {
+        "x": "2018-04-19",
+        "y": 10
+      }, {
+        "x": "2018-04-18",
+        "y": 10
+      }, {
+        "x": "2018-04-20",
+        "y": 1
+      }],
+      "total": 121,
+      "start_date": "2018-03-26T00:00:00.000Z",
+      "end_date": "2018-04-25T23:59:59.999Z",
+      "category_id": null,
+      "group_id": null,
+      "prev30Days": null,
+      "labels": null,
+      "report_key": ""
+    }
+  }
+};
diff --git a/test/javascripts/fixtures/notification_fixtures.js.es6 b/test/javascripts/fixtures/notification_fixtures.js.es6
index 22493d34ee2..a1b092c503c 100644
--- a/test/javascripts/fixtures/notification_fixtures.js.es6
+++ b/test/javascripts/fixtures/notification_fixtures.js.es6
@@ -1,2 +1,2 @@
 /*jshint maxlen:10000000 */
-export default {"/notifications": {notifications: [ { id: 123, notification_type: 2, read: true, post_number: 2, topic_id: 1234, slug: "a-slug", data: { topic_title: "some title", display_username: "velesin" } } ]  }};
+export default {"/notifications": {notifications: [ { id: 123, notification_type: 2, read: false, post_number: 2, topic_id: 1234, slug: "a-slug", data: { topic_title: "some title", display_username: "velesin" } } ]  }};
diff --git a/test/javascripts/fixtures/posts.js.es6 b/test/javascripts/fixtures/posts.js.es6
new file mode 100644
index 00000000000..dea89045210
--- /dev/null
+++ b/test/javascripts/fixtures/posts.js.es6
@@ -0,0 +1,19 @@
+export default {
+  "/admin/reports/posts": {
+    "report": {
+      "type": "topics",
+      "title": "Topics",
+      "xaxis": "Day",
+      "yaxis": "Number of new posts",
+      "data": null,
+      "total": null,
+      "start_date": "2018-03-26T00:00:00.000Z",
+      "end_date": "2018-04-25T23:59:59.999Z",
+      "category_id": null,
+      "group_id": null,
+      "prev30Days": 0,
+      "labels": null,
+      "report_key": ""
+    }
+  }
+};
diff --git a/test/javascripts/fixtures/problems.js.es6 b/test/javascripts/fixtures/problems.js.es6
new file mode 100644
index 00000000000..d9f77979fdb
--- /dev/null
+++ b/test/javascripts/fixtures/problems.js.es6
@@ -0,0 +1,4 @@
+export default {
+  "/admin/dashboard/problems.json": {
+  }
+};
diff --git a/test/javascripts/fixtures/session-fixtures.js.es6 b/test/javascripts/fixtures/session-fixtures.js.es6
index fa940ccec9f..dbccd58c34d 100644
--- a/test/javascripts/fixtures/session-fixtures.js.es6
+++ b/test/javascripts/fixtures/session-fixtures.js.es6
@@ -1,4 +1,3 @@
 export default {
   "/session/current.json": {"current_user":{"id":19,"username":"eviltrout","uploaded_avatar_id":5275,"avatar_template":"/user_avatar/localhost/eviltrout/{size}/5275.png","name":"Robin Ward","total_unread_notifications":205,"unread_notifications":0,"unread_private_messages":0,"admin":true,"notification_channel_position":null,"site_flagged_posts_count":1,"moderator":true,"staff":true,"title":"co-founder","reply_count":859,"topic_count":36,"enable_quoting":true,"external_links_in_new_tab":false,"dynamic_favicon":true,"trust_level":4,"can_edit":true,"can_invite_to_forum":true,"should_be_redirected_to_top":false,"disable_jump_reply":false,"custom_fields":{},"muted_category_ids":[],"dismissed_banner_key":null,"akismet_review_count":0}}
 };
-
diff --git a/test/javascripts/fixtures/signups.js.es6 b/test/javascripts/fixtures/signups.js.es6
new file mode 100644
index 00000000000..c4ccb1a9bb7
--- /dev/null
+++ b/test/javascripts/fixtures/signups.js.es6
@@ -0,0 +1,46 @@
+export default {
+  "/admin/reports/signups": {
+    "report": {
+      "type": "signups",
+      "title": "Signups",
+      "xaxis": "Day",
+      "yaxis": "Number of new users",
+      "data": [{
+        "x": "2018-04-11",
+        "y": 10
+      }, {
+        "x": "2018-04-12",
+        "y": 10
+      }, {
+        "x": "2018-04-13",
+        "y": 22
+      }, {
+        "x": "2018-04-14",
+        "y": 58
+      }, {
+        "x": "2018-04-15",
+        "y": 10
+      }, {
+        "x": "2018-04-16",
+        "y": 10
+      }, {
+        "x": "2018-04-17",
+        "y": 19
+      }, {
+        "x": "2018-04-18",
+        "y": 12
+      }, {
+        "x": "2018-04-19",
+        "y": 19
+      }],
+      "total": 136,
+      "start_date": "2018-03-26T00:00:00.000Z",
+      "end_date": "2018-04-25T23:59:59.999Z",
+      "category_id": null,
+      "group_id": null,
+      "prev30Days": 0,
+      "labels": null,
+      "report_key": ""
+    }
+  }
+};
diff --git a/test/javascripts/fixtures/site-fixtures.js.es6 b/test/javascripts/fixtures/site-fixtures.js.es6
index 4c22c04f0c1..3b4eac5a701 100644
--- a/test/javascripts/fixtures/site-fixtures.js.es6
+++ b/test/javascripts/fixtures/site-fixtures.js.es6
@@ -3,6 +3,7 @@ export default {
     "site":{
       "default_archetype":"regular",
       "disabled_plugins":[],
+      "shared_drafts_category_id":24,
       "notification_types":{
         "mentioned":1,
         "replied":2,
@@ -171,17 +172,16 @@ export default {
         },
         {
           "id":24,
-          "name":"sso",
+          "name":"Shared Drafts",
           "color":"92278F",
           "text_color":"FFFFFF",
-          "slug":"sso",
+          "slug":"shared-drafts",
           "topic_count":13,
           "post_count":53,
-          "description":"Only include actual maintained SSO (single sign on) implementations in this category. See the <a href=\"https://meta.discourse.org/t/official-single-sign-on-for-discourse/13045\">official documentation on Discourse's SSO support</a>.",
-          "topic_url":"/t/about-the-sso-category/13110",
-          "read_restricted":false,
+          "description":"An area for staff members to post shared drafts",
+          "topic_url":"/t/about-the-shared-drafts-category/13110",
+          "read_restricted":true,
           "permission":1,
-          "parent_category_id":5,
           "notification_level":null,
           "logo_url":null,
           "background_url":null
diff --git a/test/javascripts/fixtures/top_referred_topics.js.es6 b/test/javascripts/fixtures/top_referred_topics.js.es6
new file mode 100644
index 00000000000..d601ff9d0e1
--- /dev/null
+++ b/test/javascripts/fixtures/top_referred_topics.js.es6
@@ -0,0 +1,18 @@
+export default {
+  "/admin/reports/top_referred_topics": {
+    "report": {
+      "type": "top_referred_topics",
+      "title": "Trending search",
+      "xaxis": "",
+      "yaxis": "",
+      "data": null,
+      "total": null,
+      "start_date": "2018-03-26T00:00:00.000Z",
+      "end_date": "2018-04-25T23:59:59.999Z",
+      "category_id": null,
+      "group_id": null,
+      "prev30Days": null,
+      "labels": ["Topic", "Visits"]
+    }
+  }
+};
diff --git a/test/javascripts/fixtures/topic.js.es6 b/test/javascripts/fixtures/topic.js.es6
index 3b8344c8999..74aa4fa02e9 100644
--- a/test/javascripts/fixtures/topic.js.es6
+++ b/test/javascripts/fixtures/topic.js.es6
@@ -1,6 +1,7 @@
 /*jshint maxlen:10000000 */
 export default {"/t/280/1.json": {"post_stream":{"posts":[{"id":398,"name":"Uwe Keim","username":"uwe_keim","avatar_template":"/images/avatar.png","uploaded_avatar_id":5697,"created_at":"2013-02-05T21:29:00.280Z","cooked":"<p>Any plans to support localization of UI elements, so that I (for example) could set up a completely German speaking forum?</p>","post_number":1,"post_type":1,"updated_at":"2013-02-05T21:29:00.280Z","like_count":0,"reply_count":1,"reply_to_post_number":null,"quote_count":0,"avg_time":25,"incoming_link_count":314,"reads":475,"score":1702.25,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Uwe Keim","primary_group_name":null,"version":1,"can_edit":true,"can_delete":false,"can_recover":true,"link_counts":[{"url":"https://meta.discourse.org/t/language-mirrors/2378/2","internal":true,"reflection":true,"title":"Language mirrors","clicks":3},{"url":"https://meta.discourse.org/t/translation-workflow/6102","internal":true,"reflection":true,"title":"Translation workflow","clicks":2},{"url":"https://meta.discourse.org/t/solving-xda-developer-style-forums/4368/4","internal":true,"reflection":true,"title":"Solving XDA-Developer style forums","clicks":2},{"url":"https://meta.discourse.org/t/comrades-lets-join-our-efforts-on-ukrainian-and-russian-translations/4403/5","internal":true,"reflection":true,"title":"Comrades let's join our efforts on ukrainian and russian translations","clicks":1},{"url":"https://meta.discourse.org/t/bookmark-last-read-sometimes-doesn-t-go-to-the-end-of-a-topic/4825/9","internal":true,"reflection":true,"title":"Bookmark/last read sometimes doesn't go to the end of a topic","clicks":0},{"url":"https://meta.discourse.org/t/roadplan-for-discourse/2939/5","internal":true,"reflection":true,"title":"Roadplan for Discourse 2013","clicks":0}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":255,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":419,"name":"Tim Stone","username":"tms","avatar_template":"/images/avatar.png","uploaded_avatar_id":40181,"created_at":"2013-02-05T21:32:47.649Z","cooked":"<p>The application strings <a href=\"https://github.com/discourse/discourse/blob/master/config/locales/en.yml\" rel=\"nofollow\">are externalized</a>, so localization should be entirely possible with enough translation effort.</p>","post_number":2,"post_type":1,"updated_at":"2013-02-06T10:15:27.965Z","like_count":4,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":27,"incoming_link_count":16,"reads":460,"score":308.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Tim Stone","primary_group_name":null,"version":2,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://github.com/discourse/discourse/blob/master/config/locales/en.yml","internal":false,"reflection":false,"clicks":118}],"read":true,"user_title":"Great contributor","actions_summary":[{"id":2,"count":4,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":9,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":1060,"name":"Jeff Atwood","username":"codinghorror","avatar_template":"/images/avatar.png","uploaded_avatar_id":5297,"created_at":"2013-02-06T02:26:24.922Z","cooked":"<p>Yep, all strings are going through a lookup table.*</p>\n\n<p><a href=\"https://github.com/discourse/discourse/blob/master/config/locales\">master/config/locales</a></p>\n\n<p>So you could replace that lookup table with the \"de\" one to get German.</p>\n\n<p><sub>* we didn't get all the strings into the lookup table for launch, but the vast, vast majority of them are and the ones that are not, we will fix as we go!</sub></p>","post_number":3,"post_type":1,"updated_at":"2014-02-24T05:23:39.211Z","like_count":4,"reply_count":3,"reply_to_post_number":null,"quote_count":0,"avg_time":33,"incoming_link_count":5,"reads":449,"score":191.45,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Jeff Atwood","primary_group_name":"discourse","version":4,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://github.com/discourse/discourse/blob/master/config/locales","internal":false,"reflection":false,"title":"discourse/config/locales at master · discourse/discourse · GitHub","clicks":62},{"url":"https://meta.discourse.org/t/github-onebox-rendering-issue/7616","internal":true,"reflection":true,"title":"GitHub OneBox Rendering Issue","clicks":0}],"read":true,"user_title":"co-founder","actions_summary":[{"id":2,"count":4,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":32,"hidden":false,"hidden_reason_id":null,"trust_level":3,"deleted_at":null,"user_deleted":false,"edit_reason":"","can_view_edit_history":true,"wiki":false},{"id":3623,"name":"Shade","username":"shade","avatar_template":"/images/avatar.png","uploaded_avatar_id":8306,"created_at":"2013-02-07T12:55:33.129Z","cooked":"<p>Is it a coincidence that the strings file is 1337 lines long? <img src=\"/images/emoji/twitter/smiley.png\" title=\":smiley:\" class=\"emoji\" alt=\"smiley\" width=\"64\" height=\"64\"></p>","post_number":4,"post_type":1,"updated_at":"2013-02-07T12:55:33.129Z","like_count":7,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":20,"incoming_link_count":15,"reads":401,"score":291.2,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Shade","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://meta.discourse.org/t/hi-support-chinese/4393/6","internal":true,"reflection":true,"title":"Hi, support Chinese?","clicks":0}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":7,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":1808,"hidden":false,"hidden_reason_id":null,"trust_level":1,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3651,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/images/avatar.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T14:02:07.869Z","cooked":"<p><aside class=\"quote\" data-post=\"3\" data-topic=\"280\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img width=\"20\" height=\"20\" src=\"/user_avatar/meta.discourse.org/codinghorror/40/5297.png\" class=\"avatar\">codinghorror said:</div>\n<blockquote><p>So you could replace that lookup table with the \"de\" one to get German.</p></blockquote></aside></p>\n\n<p>The problem I see here is that  this file is likely two grow and change massively over the next couple months, and tracking these changes in order to keep a localized file up to date is going to be a <em>bitch</em>. </p>\n\n<p>I wonder where there is a tool that can compare two yml structures and point out which nodes are missing? That would help keep track of new strings.</p>\n\n<p>Re keeping track of <em>changed</em> strings, <a class=\"mention\" href=\"/users/codinghorror\">@codinghorror</a> I found this very interesting: <a href=\"http://stackoverflow.com/questions/4232922/why-do-people-use-plain-english-as-translation-placeholders\" rel=\"nofollow\">http://stackoverflow.com/questions/4232922/why-do-people-use-plain-english-as-translation-placeholders</a> if plain English placeholders were used, any change in strings would lead to a <em>new</em> node in the yml file, making keeping the translation up to date easier. Maybe worth thinking about in the future.</p>","post_number":5,"post_type":1,"updated_at":"2013-02-07T14:05:42.328Z","like_count":2,"reply_count":2,"reply_to_post_number":3,"quote_count":1,"avg_time":22,"incoming_link_count":10,"reads":386,"score":213.3,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"http://stackoverflow.com/questions/4232922/why-do-people-use-plain-english-as-translation-placeholders","internal":false,"reflection":false,"title":"internationalization - Why do people use plain english as translation placeholders? - Stack Overflow","clicks":63}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":2,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3654,"name":"Sam Saffron","username":"sam","avatar_template":"/images/avatar.png","uploaded_avatar_id":5243,"created_at":"2013-02-07T14:05:39.910Z","cooked":"<p>Yes, I really like the concept of fuzzy matching for localization, perhaps you can chase up <a href=\"https://github.com/SlexAxton\">alex sexton</a> he was meaning to upload a localization tool for this kind of stuff. </p>\n\n<p>Also, I am a big fan of <a href=\"https://github.com/SlexAxton/messageformat.js\">ICU message format</a>, but it is not the \"Rails way (tm)\". </p>","post_number":6,"post_type":1,"updated_at":"2013-02-07T14:05:39.910Z","like_count":1,"reply_count":1,"reply_to_post_number":5,"quote_count":0,"avg_time":17,"incoming_link_count":4,"reads":329,"score":106.65,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Sam Saffron","primary_group_name":"discourse","version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://github.com/SlexAxton/messageformat.js","internal":false,"reflection":false,"title":"SlexAxton/messageformat.js · GitHub","clicks":46},{"url":"https://github.com/SlexAxton","internal":false,"reflection":false,"title":"SlexAxton (Alex Sexton) · GitHub","clicks":10}],"read":true,"user_title":"co-founder","reply_to_user":{"username":"pekka","avatar_template":"/images/avatar.png","uploaded_avatar_id":5253},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3655,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/images/avatar.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T14:08:17.493Z","cooked":"<p>Looks interesting, I'll take a peek.</p>\n\n<p>As said on dev, the best tool I can see in terms of giving translators a proper interface <em>and</em> quality control would be something like <a href=\"http://translate.wordpress.org/projects/bbpress/dev\" rel=\"nofollow\">GlotPress</a>. It's based on the PO messages format (is that somehow related to ICU?) but looks pretty great.</p>\n\n<p><aside class=\"quote\" data-post=\"6\" data-topic=\"280\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img width=\"20\" height=\"20\" src=\"/user_avatar/meta.discourse.org/sam/40/5243.png\" class=\"avatar\">sam said:</div>\n<blockquote><p>fuzzy matching for localization</p></blockquote></aside></p>\n\n<p>I'm not familiar with the term in this context, you mean keeping the English version in the code base (instead of a generic code like <code>message_error_nametooshort</code> ?)</p>","post_number":7,"post_type":1,"updated_at":"2013-02-07T14:12:02.965Z","like_count":1,"reply_count":1,"reply_to_post_number":6,"quote_count":1,"avg_time":16,"incoming_link_count":0,"reads":326,"score":86.0,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"http://translate.wordpress.org/projects/bbpress/dev","internal":false,"reflection":false,"title":"WordPress › Development < GlotPress","clicks":16}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3658,"name":"Sam Saffron","username":"sam","avatar_template":"/images/avatar.png","uploaded_avatar_id":5243,"created_at":"2013-02-07T14:12:22.582Z","cooked":"<p>ICU Message format is basically Gettext on steroids, Gettext has been around for so many years and actually works pretty well, being super prevalent in Linux. </p>\n\n<p>Trouble is you need a fuzzy matcher for translators if you are going to store stuff like <code>mf.compile( 'This is a message.' )</code> in source, one letter change and all your translators need to validate it.</p>","post_number":8,"post_type":1,"updated_at":"2013-02-07T14:12:22.582Z","like_count":1,"reply_count":1,"reply_to_post_number":7,"quote_count":0,"avg_time":11,"incoming_link_count":2,"reads":296,"score":89.75,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Sam Saffron","primary_group_name":"discourse","version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://meta.discourse.org/t/what-i-love-about-wordpress-plugins/5697","internal":true,"reflection":true,"title":"What I love about WordPress plugins","clicks":0}],"read":true,"user_title":"co-founder","reply_to_user":{"username":"pekka","avatar_template":"/images/avatar.png","uploaded_avatar_id":5253},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3660,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/images/avatar.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T14:14:12.666Z","cooked":"<p><aside class=\"quote\" data-post=\"8\" data-topic=\"280\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img width=\"20\" height=\"20\" src=\"/user_avatar/meta.discourse.org/sam/40/5243.png\" class=\"avatar\">sam said:</div>\n<blockquote><p>one letter change and all your translators need to validate it.</p></blockquote></aside></p>\n\n<p>Yeah, that's why I've always been a friend of <code>message_error_nametooshort</code> placeholders, until I asked the SO question linked above. The accepted answer makes a good argument against those placeholders: you <em>want</em> translations to break even on small changes in the English original because the translations will probably need to reflect the change, too.  Maybe that's not the case right now as new stuff is being checked in pretty much every couple of hours, but in the long run, it'll be overwhelmingly true.</p>","post_number":9,"post_type":1,"updated_at":"2013-02-07T14:18:09.569Z","like_count":1,"reply_count":1,"reply_to_post_number":8,"quote_count":1,"avg_time":10,"incoming_link_count":0,"reads":293,"score":79.1,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3667,"name":"Tim Stone","username":"tms","avatar_template":"/images/avatar.png","uploaded_avatar_id":40181,"created_at":"2013-02-07T14:25:16.859Z","cooked":"<p>Hmm...You could theoretically also build something into the development process that would monitor changes to the English locale file and make a translator-friendly list of changes between versions.</p>","post_number":10,"post_type":1,"updated_at":"2013-02-07T14:25:16.859Z","like_count":1,"reply_count":1,"reply_to_post_number":9,"quote_count":0,"avg_time":7,"incoming_link_count":0,"reads":275,"score":75.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Tim Stone","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":"Great contributor","reply_to_user":{"username":"pekka","avatar_template":"/images/avatar.png","uploaded_avatar_id":5253},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":9,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3673,"name":"Sam Saffron","username":"sam","avatar_template":"/images/avatar.png","uploaded_avatar_id":5243,"created_at":"2013-02-07T14:30:21.401Z","cooked":"<p>Yeah, totally, also we could build tools for dev that make introducing string less annoying and make it possible to garbage collect old unused strings, I hate trudging through that file.</p>","post_number":11,"post_type":1,"updated_at":"2013-02-07T14:30:21.401Z","like_count":1,"reply_count":1,"reply_to_post_number":10,"quote_count":0,"avg_time":7,"incoming_link_count":1,"reads":273,"score":79.95,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Sam Saffron","primary_group_name":"discourse","version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":"co-founder","reply_to_user":{"username":"tms","avatar_template":"/images/avatar.png","uploaded_avatar_id":40181},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3675,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/images/avatar.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T14:33:38.280Z","cooked":"<p><aside class=\"quote\" data-post=\"11\" data-topic=\"280\" data-full=\"true\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img width=\"20\" height=\"20\" src=\"/user_avatar/meta.discourse.org/sam/40/5243.png\" class=\"avatar\">sam said:</div>\n<blockquote><p>Yeah, totally, also we could build tools for dev that make introducing string less annoying and make it possible to garbage collect old unused strings, I hate trudging through that file.</p></blockquote></aside></p>\n\n<p>As said, I'd look into whether WP's tools can't be reused for this with some tweaking. They seem to be able to scan a code base for new strings, and make them available automatically to translators.</p>\n\n<p>They're PHP based which isn't ideal, but it looks like they've done a crapload of work to take the hassle out of translations.</p>","post_number":12,"post_type":1,"updated_at":"2013-02-07T14:34:39.910Z","like_count":1,"reply_count":1,"reply_to_post_number":11,"quote_count":1,"avg_time":7,"incoming_link_count":2,"reads":273,"score":84.95,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3690,"name":"Valts","username":"Vilx","avatar_template":"/images/avatar.png","uploaded_avatar_id":7299,"created_at":"2013-02-07T15:05:35.867Z","cooked":"<p>This site looks so nice with all the little tweaks like \"10 minutes ago\" instead of simply time, etc - I wonder if there will also be support for proper pluralization in other languages? That's a pretty hard task though, I don't think I've ever seen a website that has done that. But it would be <em>awesome</em>.</p>","post_number":13,"post_type":1,"updated_at":"2013-02-07T15:05:35.867Z","like_count":3,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":7,"incoming_link_count":11,"reads":290,"score":158.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Valts","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":3,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":1216,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3925,"name":"Eric Kidd","username":"emk","avatar_template":"/images/avatar.png","uploaded_avatar_id":8400,"created_at":"2013-02-07T19:37:06.194Z","cooked":"<p><aside class=\"quote\" data-post=\"12\" data-topic=\"280\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img width=\"20\" height=\"20\" src=\"/user_avatar/meta.discourse.org/pekka/40/5253.png\" class=\"avatar\">pekka said:</div>\n<blockquote><p>As said, I'd look into whether WP's tools can't be reused for this with some tweaking. They seem to be able to scan a code base for new strings, and make them available automatically to translators.</p></blockquote></aside></p>\n\n<p>I've had pretty decent luck using Localeapp to localize Rails applications:</p>\n\n<p><a href=\"http://www.localeapp.com/\" class=\"onebox\" target=\"_blank\" rel=\"nofollow\">http://www.localeapp.com/</a></p>\n\n<p>The developer workflow took me about an hour to really get used to, and there were a few minor glitches. But the non-technical translators had very few problems. One limitation: It insists on rewriting all those yaml files full of strings.</p>\n\n<p>Anyway, it's worth a look, and it's free for open source, if I recall correctly. Certainly easier than doing a whole bunch of toolsmithing from scratch.</p>","post_number":14,"post_type":1,"updated_at":"2013-02-07T19:37:06.194Z","like_count":3,"reply_count":1,"reply_to_post_number":12,"quote_count":1,"avg_time":9,"incoming_link_count":0,"reads":283,"score":137.05,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Eric Kidd","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"http://www.localeapp.com/","internal":false,"reflection":false,"title":"Easy localization for Rails apps | Locale","clicks":69}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":3,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":1860,"hidden":false,"hidden_reason_id":null,"trust_level":1,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3938,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/images/avatar.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T19:52:13.748Z","cooked":"<p><aside class=\"quote\" data-post=\"14\" data-topic=\"280\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img width=\"20\" height=\"20\" src=\"/user_avatar/meta.discourse.org/emk/40/8400.png\" class=\"avatar\">emk said:</div>\n<blockquote><p>I've had pretty decent luck using Localeapp to localize Rails applications</p></blockquote></aside></p>\n\n<p>Ohhh. Looking sexy. <em>droool</em></p>","post_number":15,"post_type":1,"updated_at":"2013-02-07T19:52:13.748Z","like_count":1,"reply_count":1,"reply_to_post_number":14,"quote_count":1,"avg_time":7,"incoming_link_count":0,"reads":260,"score":72.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3982,"name":"Eric Kidd","username":"emk","avatar_template":"/images/avatar.png","uploaded_avatar_id":8400,"created_at":"2013-02-07T20:52:22.454Z","cooked":"<p><aside class=\"quote\" data-post=\"15\" data-topic=\"280\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img width=\"20\" height=\"20\" src=\"/user_avatar/meta.discourse.org/pekka/40/5253.png\" class=\"avatar\">pekka said:</div>\n<blockquote><p>Ohhh. Looking sexy. droool</p></blockquote></aside></p>\n\n<p>Yeah, it's pretty. <img src=\"/images/emoji/twitter/smile.png\" title=\":smile:\" class=\"emoji\" alt=\"smile\" width=\"64\" height=\"64\"> But there were still some rough edges as of a few months ago.</p>\n\n<p>Whether or not those rough edges are a deal-breaker will probably depends on whether or not localization is already a source of acute pain. If you're already hurting, Localeapp is a pretty useful tool, especially when it comes to enlisting non-technical translators.</p>\n\n<p>But it does require changing how you work with text, and adding one new tool to the mix. So for projects that just don't want to know about non-English languages, it's not yet seamless the way Unicode is these days.</p>\n\n<p>(Sweet forum software, by the way. I was just testing out Egyptian hieroglyphics on the test server, because they're well off the Basic Multilingual Plane, and tend to flush Unicode bugs. Everything worked flawlessly.)</p>","post_number":16,"post_type":1,"updated_at":"2013-02-07T20:52:22.454Z","like_count":1,"reply_count":1,"reply_to_post_number":15,"quote_count":1,"avg_time":7,"incoming_link_count":0,"reads":254,"score":71.15,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Eric Kidd","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":1860,"hidden":false,"hidden_reason_id":null,"trust_level":1,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3989,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/images/avatar.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T21:04:15.405Z","cooked":"<p><aside class=\"quote\" data-post=\"16\" data-topic=\"280\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img width=\"20\" height=\"20\" src=\"/user_avatar/meta.discourse.org/emk/40/8400.png\" class=\"avatar\">emk said:</div>\n<blockquote><p>But it does require changing how you work with text, and adding one new tool to the mix. So for projects that just don't want to know about non-English languages, it's not yet seamless the way Unicode is these days.</p></blockquote></aside></p>\n\n<p>Interesting, thanks for the insight. I don't think localization is seriously on their table right now, there's likely to be many other things on the table before it... but it will become an issue sooner or later.</p>","post_number":17,"post_type":1,"updated_at":"2013-02-07T21:04:15.405Z","like_count":1,"reply_count":2,"reply_to_post_number":16,"quote_count":1,"avg_time":7,"incoming_link_count":0,"reads":255,"score":76.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3996,"name":"Sam Saffron","username":"sam","avatar_template":"/images/avatar.png","uploaded_avatar_id":5243,"created_at":"2013-02-07T21:12:06.575Z","cooked":"<p>I had an idea ... what if in dev mode, you could right-click on a page and get access to all the translations on the page, make your edits and have it refreshed live. </p>\n\n<p>I think it would be awesome, very doable technically.</p>","post_number":18,"post_type":1,"updated_at":"2013-02-07T21:12:06.575Z","like_count":7,"reply_count":2,"reply_to_post_number":17,"quote_count":0,"avg_time":8,"incoming_link_count":0,"reads":264,"score":168.2,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Sam Saffron","primary_group_name":"discourse","version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":"co-founder","reply_to_user":{"username":"pekka","avatar_template":"/images/avatar.png","uploaded_avatar_id":5253},"actions_summary":[{"id":2,"count":7,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":4009,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/images/avatar.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T21:18:47.422Z","cooked":"<p>That would be fricking cool. There'd still be some leftovers (like error messages that normally never show up, etc.) but you could corral those up on a specific page.</p>\n\n<p>It could have a dropdown giving you all the languages that you have a .yml for in the locale directory, and write the changes into the one selected. I'm sure people would love it.</p>","post_number":19,"post_type":1,"updated_at":"2013-02-07T21:22:10.692Z","like_count":1,"reply_count":0,"reply_to_post_number":18,"quote_count":0,"avg_time":8,"incoming_link_count":1,"reads":241,"score":68.6,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"reply_to_user":{"username":"sam","avatar_template":"/images/avatar.png","uploaded_avatar_id":5243},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":4012,"name":"Marco Ceppi","username":"marcoceppi","avatar_template":"/images/avatar.png","uploaded_avatar_id":6552,"created_at":"2013-02-07T21:22:46.376Z","cooked":"<p>If you use gettext format you could leverage <a href=\"https://translations.launchpad.net/\" rel=\"nofollow\">Launchpad</a> translations and the community behind it.</p>","post_number":20,"post_type":1,"updated_at":"2013-02-07T21:22:46.376Z","like_count":1,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":9,"incoming_link_count":2,"reads":244,"score":74.25,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Marco Ceppi","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://translations.launchpad.net/","internal":false,"reflection":false,"title":"Launchpad Translations","clicks":13}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":761,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false}],"stream":[398,419,1060,3623,3651,3654,3655,3658,3660,3667,3673,3675,3690,3925,3938,3982,3989,3996,4009,4012],"gaps":{"before":{"20706":[20125]},"after":{}}},"id":280,"title":"Internationalization / localization","fancy_title":"Internationalization / localization","posts_count":103,"created_at":"2013-02-05T21:29:00.174Z","views":5211,"reply_count":67,"participant_count":40,"like_count":135,"last_posted_at":"2015-03-04T15:07:10.487Z","visible":true,"closed":false,"archived":false,"has_summary":true,"archetype":"regular","slug":"internationalization-localization","category_id":2,"word_count":6198,"deleted_at":null,"draft":null,"draft_key":"topic_280","draft_sequence":4,"posted":true,"unpinned":null,"pinned_globally":false,"pinned":false,"pinned_at":null,"details":{"auto_close_at":null,"auto_close_hours":null,"auto_close_based_on_last_post":false,"created_by":{"id":255,"username":"uwe_keim","uploaded_avatar_id":5697,"avatar_template":"/images/avatar.png"},"last_poster":{"id":14091,"username":"Luciano_Fantuzzi","uploaded_avatar_id":39484,"avatar_template":"/images/avatar.png"},"participants":[{"id":212,"username":"alxndr","uploaded_avatar_id":5619,"avatar_template":"/images/avatar.png","post_count":11},{"id":1,"username":"sam","uploaded_avatar_id":5243,"avatar_template":"/images/avatar.png","post_count":11},{"id":7,"username":"pekka","uploaded_avatar_id":5253,"avatar_template":"/images/avatar.png","post_count":8},{"id":461,"username":"kuba","uploaded_avatar_id":6049,"avatar_template":"/images/avatar.png","post_count":7},{"id":2995,"username":"tattoo","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","post_count":6},{"id":2540,"username":"jgourdon","uploaded_avatar_id":9537,"avatar_template":"/images/avatar.png","post_count":5},{"id":1860,"username":"emk","uploaded_avatar_id":8400,"avatar_template":"/images/avatar.png","post_count":4},{"id":1275,"username":"dacap","uploaded_avatar_id":7401,"avatar_template":"/images/avatar.png","post_count":4},{"id":19,"username":"eviltrout","uploaded_avatar_id":5275,"avatar_template":"/images/avatar.png","post_count":4},{"id":3704,"username":"mojzis","uploaded_avatar_id":31201,"avatar_template":"/images/avatar.png","post_count":3},{"id":3190,"username":"gururea","uploaded_avatar_id":10663,"avatar_template":"/images/avatar.png","post_count":3},{"id":1895,"username":"maciek","uploaded_avatar_id":8463,"avatar_template":"/images/avatar.png","post_count":3},{"id":22,"username":"splattne","uploaded_avatar_id":5280,"avatar_template":"/images/avatar.png","post_count":2},{"id":1979,"username":"Superuser","uploaded_avatar_id":8604,"avatar_template":"/images/avatar.png","post_count":2},{"id":3818,"username":"Tudor","uploaded_avatar_id":11675,"avatar_template":"/images/avatar.png","post_count":2},{"id":32,"username":"codinghorror","uploaded_avatar_id":5297,"avatar_template":"/images/avatar.png","post_count":2},{"id":3620,"username":"potthast","uploaded_avatar_id":11363,"avatar_template":"/images/avatar.png","post_count":2},{"id":9,"username":"tms","uploaded_avatar_id":40181,"avatar_template":"/images/avatar.png","post_count":2},{"id":14091,"username":"Luciano_Fantuzzi","uploaded_avatar_id":39484,"avatar_template":"/images/avatar.png","post_count":1},{"id":255,"username":"uwe_keim","uploaded_avatar_id":5697,"avatar_template":"/images/avatar.png","post_count":1},{"id":9006,"username":"berk","uploaded_avatar_id":19348,"avatar_template":"/images/avatar.png","post_count":1},{"id":754,"username":"danneu","uploaded_avatar_id":6540,"avatar_template":"/images/avatar.png","post_count":1},{"id":761,"username":"marcoceppi","uploaded_avatar_id":6552,"avatar_template":"/images/avatar.png","post_count":1},{"id":2753,"username":"mikl","uploaded_avatar_id":9918,"avatar_template":"/images/avatar.png","post_count":1}],"suggested_topics":[{"id":27331,"title":"Polls are still very buggy","fancy_title":"Polls are still very buggy","slug":"polls-are-still-very-buggy","posts_count":4,"reply_count":1,"highest_post_number":4,"image_url":"/uploads/default/_optimized/cd1/b8c/c162528887_690x401.png","created_at":"2015-04-08T09:51:00.357Z","last_posted_at":"2015-04-08T15:59:16.258Z","bumped":true,"bumped_at":"2015-04-08T16:05:09.842Z","unseen":false,"last_read_post_number":3,"unread":0,"new_posts":1,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":11,"views":55,"category_id":1},{"id":27343,"title":"Mobile theme doesn't show last activity time for topics on category page","fancy_title":"Mobile theme doesn&rsquo;t show last activity time for topics on category page","slug":"mobile-theme-doesnt-show-last-activity-time-for-topics-on-category-page","posts_count":4,"reply_count":2,"highest_post_number":4,"image_url":"/uploads/default/_optimized/13e/25c/bd30b466be_281x500.png","created_at":"2015-04-08T14:20:51.177Z","last_posted_at":"2015-04-08T15:40:30.037Z","bumped":true,"bumped_at":"2015-04-08T15:40:30.037Z","unseen":false,"last_read_post_number":2,"unread":0,"new_posts":2,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":3,"views":23,"category_id":9},{"id":27346,"title":"Reply+{messagekey}@... optionaly in header \"from\" in addition to \"reply-to\"","fancy_title":"Reply+{messagekey}@&hellip; optionaly in header &ldquo;from&rdquo; in addition to &ldquo;reply-to&rdquo;","slug":"reply-messagekey-optionaly-in-header-from-in-addition-to-reply-to","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2015-04-08T16:05:13.103Z","last_posted_at":"2015-04-08T16:05:13.415Z","bumped":true,"bumped_at":"2015-04-08T16:05:13.415Z","unseen":true,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":0,"views":8,"category_id":2},{"id":19670,"title":"Parsing (Oneboxing) IMDB links","fancy_title":"Parsing (Oneboxing) IMDB links","slug":"parsing-oneboxing-imdb-links","posts_count":8,"reply_count":1,"highest_post_number":8,"image_url":null,"created_at":"2014-09-05T07:19:26.161Z","last_posted_at":"2015-04-07T09:21:21.570Z","bumped":true,"bumped_at":"2015-04-07T09:21:21.570Z","unseen":false,"last_read_post_number":8,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":4,"views":253,"category_id":2},{"id":7512,"title":"Support for Piwik Analytics as an alternative to Google Analytics","fancy_title":"Support for Piwik Analytics as an alternative to Google Analytics","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","posts_count":53,"reply_count":41,"highest_post_number":65,"image_url":"/plugins/emoji/images/smile.png","created_at":"2013-06-16T01:32:30.596Z","last_posted_at":"2015-02-22T13:46:26.845Z","bumped":true,"bumped_at":"2015-02-22T13:46:26.845Z","unseen":false,"last_read_post_number":65,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":62,"views":1877,"category_id":2},{"id":25480,"title":"CSS admin-contents reloaded","fancy_title":"CSS admin-contents reloaded","slug":"css-admin-contents-reloaded","posts_count":22,"reply_count":15,"highest_post_number":22,"image_url":null,"created_at":"2015-02-21T12:15:57.707Z","last_posted_at":"2015-03-02T23:24:18.899Z","bumped":true,"bumped_at":"2015-03-02T23:24:18.899Z","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":21,"views":185,"category_id":2},{"id":26576,"title":"Badge timestamp should be the time the badge was granted?","fancy_title":"Badge timestamp should be the time the badge was granted?","slug":"badge-timestamp-should-be-the-time-the-badge-was-granted","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":null,"created_at":"2015-03-20T13:22:08.266Z","last_posted_at":"2015-03-21T00:33:52.243Z","bumped":true,"bumped_at":"2015-03-21T00:33:52.243Z","unseen":false,"last_read_post_number":1,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":1,"bookmarked":false,"liked":false,"archetype":"regular","like_count":9,"views":87,"category_id":2}],"links":[{"url":"https://github.com/discourse/discourse/blob/master/config/locales/en.yml","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":118,"user_id":9,"domain":"github.com"},{"url":"http://www.localeapp.com/","title":"Easy localization for Rails apps | Locale","fancy_title":null,"internal":false,"reflection":false,"clicks":69,"user_id":1860,"domain":"www.localeapp.com"},{"url":"http://stackoverflow.com/questions/4232922/why-do-people-use-plain-english-as-translation-placeholders","title":"internationalization - Why do people use plain english as translation placeholders? - Stack Overflow","fancy_title":null,"internal":false,"reflection":false,"clicks":63,"user_id":7,"domain":"stackoverflow.com"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales","title":"discourse/config/locales at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":62,"user_id":32,"domain":"github.com"},{"url":"https://github.com/SlexAxton/messageformat.js","title":"SlexAxton/messageformat.js · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":46,"user_id":1,"domain":"github.com"},{"url":"http://www.localeapp.com/projects/1537/translations?utf8=%E2%9C%93&search=source_code","title":"langforums | Locale","fancy_title":null,"internal":false,"reflection":false,"clicks":25,"user_id":1860,"domain":"www.localeapp.com"},{"url":"https://translations.launchpad.net/","title":"Launchpad Translations","fancy_title":null,"internal":false,"reflection":false,"clicks":23,"user_id":761,"domain":"translations.launchpad.net"},{"url":"https://www.transifex.com/","title":"Transifex - Continuous Localization Platform","fancy_title":null,"internal":false,"reflection":false,"clicks":22,"user_id":1979,"domain":"www.transifex.com"},{"url":"https://github.com/berk/tr8n","title":"berk/tr8n · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":22,"user_id":1,"domain":"github.com"},{"url":"http://translate.wordpress.org/projects/bbpress/dev","title":"WordPress › Development < GlotPress","fancy_title":null,"internal":false,"reflection":false,"clicks":16,"user_id":7,"domain":"translate.wordpress.org"},{"url":"http://weblate.org","title":"Weblate - web-based translation","fancy_title":null,"internal":false,"reflection":false,"clicks":15,"user_id":2316,"domain":"weblate.org"},{"url":"https://github.com/discourse/discourse/tree/master/config/locales","title":"discourse/config/locales at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":14,"user_id":19,"domain":"github.com"},{"url":"https://github.com/discourse/discourse/pull/493","title":"Danish translation. by mikl · Pull Request #493 · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":12,"user_id":2753,"domain":"github.com"},{"url":"https://github.com/SlexAxton","title":"SlexAxton (Alex Sexton) · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":10,"user_id":1,"domain":"github.com"},{"url":"https://github.com/gururea/discourse/tree/master/config/locales","title":"discourse/config/locales at master · gururea/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":9,"user_id":3190,"domain":"github.com"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/client.en.yml#L691","title":"discourse/config/locales/client.en.yml at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":7,"user_id":461,"domain":"github.com"},{"url":"https://github.com/dacap/discourse/tree/spanish","title":"dacap/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":7,"user_id":1275,"domain":"github.com"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/client.nl.yml","title":"discourse/config/locales/client.nl.yml at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":7,"user_id":461,"domain":"github.com"},{"url":"https://github.com/discourse/discourse/commit/c5761eae8afe37e20cec0d0f9d14b85b6e585bda","title":"Support for Simplified Chinese thanks to tangramor · c5761ea · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":6,"user_id":212,"domain":"github.com"},{"url":"http://tr8n.github.com/","title":"tr8n","fancy_title":null,"internal":false,"reflection":false,"clicks":6,"user_id":212,"domain":"tr8n.github.com"},{"url":"http://www.getlocalization.com/","title":"Crowdsourced, Social and Collaborative App & Website Translation - Get Localization","fancy_title":null,"internal":false,"reflection":false,"clicks":6,"user_id":22,"domain":"www.getlocalization.com"},{"url":"http://blog.discourse.org/2013/04/discourse-as-your-first-rails-app/","title":"Discourse as Your First Rails App","fancy_title":null,"internal":false,"reflection":false,"clicks":5,"user_id":1995,"domain":"blog.discourse.org"},{"url":"https://github.com/alxndr/discourse/blob/i18n-chinese/config/locales/server.zh.yml","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":5,"user_id":212,"domain":"github.com"},{"url":"http://translate.sourceforge.net/wiki/virtaal/index","title":"Easy-to-use and powerful offline translation tool | Virtaal","fancy_title":null,"internal":false,"reflection":false,"clicks":4,"user_id":1979,"domain":"translate.sourceforge.net"},{"url":"https://poeditor.com/","title":"POEditor - online software localization tool","fancy_title":null,"internal":false,"reflection":false,"clicks":4,"user_id":1979,"domain":"poeditor.com"},{"url":"http://en.lichess.org/@/Hellball","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":1979,"domain":"en.lichess.org"},{"url":"http://en.wikipedia.org/wiki/T%E2%80%93V_distinction","title":"T–V distinction - Wikipedia, the free encyclopedia","fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":3620,"domain":"en.wikipedia.org"},{"url":"http://www.slideshare.net/HeatherRivers/linguistic-potluck-crowdsourcing-localization-with-rails","title":"Linguistic Potluck: Crowdsourcing localization with Rails","fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":212,"domain":"www.slideshare.net"},{"url":"https://meta.discourse.org/t/language-mirrors/2378/2","title":"Language mirrors","fancy_title":null,"internal":true,"reflection":true,"clicks":3,"user_id":32,"domain":"meta.discourse.org"},{"url":"http://www.madanalogy.com/2012/06/rails-i18n-translations-in-yaml.html","title":"Mad Analogy: Rails i18n translations in Yaml: translation tool support","fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":3190,"domain":"www.madanalogy.com"},{"url":"https://github.com/tr8n","title":"Translation Exchange · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":9006,"domain":"github.com"},{"url":"http://pootle.locamotion.org/","title":"Main | Pootle Demo","fancy_title":null,"internal":false,"reflection":false,"clicks":2,"user_id":3190,"domain":"pootle.locamotion.org"},{"url":"http://www.youtube.com/watch?v=MqqdzJ98q7s","title":"GoGaRuCo 2012 - Linguistic Potluck: Crowdsourcing Localization in Rails by Heather Rivers - YouTube","fancy_title":null,"internal":false,"reflection":false,"clicks":2,"user_id":212,"domain":"www.youtube.com"},{"url":"https://meta.discourse.org/t/translation-workflow/6102","title":"Translation workflow","fancy_title":null,"internal":true,"reflection":true,"clicks":2,"user_id":4702,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/solving-xda-developer-style-forums/4368/4","title":"Solving XDA-Developer style forums","fancy_title":null,"internal":true,"reflection":true,"clicks":2,"user_id":639,"domain":"meta.discourse.org"},{"url":"https://tr8nhub.com","title":"TranslationExchange","fancy_title":null,"internal":false,"reflection":false,"clicks":2,"user_id":9006,"domain":"tr8nhub.com"},{"url":"https://meta.discourse.org/t/roadplan-for-discourse/2939/3","title":"Roadplan for Discourse 2013","fancy_title":null,"internal":true,"reflection":true,"clicks":1,"user_id":2540,"domain":"meta.discourse.org"},{"url":"http://sugarjs.com/dates#date_locales","title":"Dates - Sugar","fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":461,"domain":"sugarjs.com"},{"url":"http://blog.discourse.org/2013/03/localizing-discourse/","title":"Localizing Discourse","fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":893,"domain":"blog.discourse.org"},{"url":"https://github.com/discourse/discourse/blob/master/app/assets/javascripts/locales/date_locales.js","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":461,"domain":"github.com"},{"url":"http://transifex.com/projects/p/discourse-pt-br/","title":"Discourse-Translations-Project localization","fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":893,"domain":"transifex.com"},{"url":"https://github.com/discourse/discourse/issues/279","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":893,"domain":"github.com"},{"url":"https://meta.discourse.org/t/comrades-lets-join-our-efforts-on-ukrainian-and-russian-translations/4403/5","title":"Comrades let's join our efforts on ukrainian and russian translations","fancy_title":null,"internal":true,"reflection":true,"clicks":1,"user_id":3417,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/translation-workflow/6102/6","title":"Translation workflow","fancy_title":null,"internal":true,"reflection":false,"clicks":0,"user_id":1995,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/bookmark-last-read-sometimes-doesn-t-go-to-the-end-of-a-topic/4825/9","title":"Bookmark/last read sometimes doesn't go to the end of a topic","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":3681,"domain":"meta.discourse.org"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/client.de.yml","title":"discourse/config/locales/client.de.yml at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":0,"user_id":2,"domain":"github.com"},{"url":"https://meta.discourse.org/t/what-i-love-about-wordpress-plugins/5697","title":"What I love about WordPress plugins","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":1,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/github-onebox-rendering-issue/7616","title":"GitHub OneBox Rendering Issue","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":5372,"domain":"meta.discourse.org"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/server.de.yml","title":"discourse/config/locales/server.de.yml at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":0,"user_id":2,"domain":"github.com"},{"url":"https://meta.discourse.org/t/roadplan-for-discourse/2939/5","title":"Roadplan for Discourse 2013","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":32,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/translation-tools-transifex-localeapp/7763","title":"Translation Tools: Transifex? Localeapp?","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":2,"domain":"meta.discourse.org"},{"url":"http://guides.rubyonrails.org/i18n.html#the-public-i18n-api","title":"Rails Internationalization (I18n) API — Ruby on Rails Guides","fancy_title":null,"internal":false,"reflection":false,"clicks":0,"user_id":1895,"domain":"guides.rubyonrails.org"},{"url":"https://meta.discourse.org/t/hi-support-chinese/4393/6","title":"Hi, support Chinese?","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":2014,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/translation-tools-transifex-localeapp/7763/41","title":"Translation Tools: Transifex? Localeapp?","fancy_title":null,"internal":true,"reflection":false,"clicks":0,"user_id":6626,"domain":"meta.discourse.org"}],"notification_level":2,"notifications_reason_id":4,"can_move_posts":true,"can_edit":true,"can_delete":true,"can_recover":true,"can_remove_allowed_users":true,"can_invite_to":true,"can_create_post":true,"can_reply_as_new_topic":true,"can_flag_topic":true},"highest_post_number":10,"last_read_post_number":10,"deleted_by":null,"has_deleted":true,"actions_summary":[{"id":4,"count":0,"hidden":false,"can_act":true},{"id":7,"count":0,"hidden":false,"can_act":true},{"id":8,"count":0,"hidden":false,"can_act":true}],"chunk_size":20,"bookmarked":false,"tags":null},
 "/t/28830/1.json": {"post_stream":{"posts":[{"id":118591,"name":"spends too much time on WTDWTF","username":"RaceProUK","avatar_template":"/images/avatar.png","uploaded_avatar_id":40071,"created_at":"2015-05-14T20:18:17.954Z","cooked":"<p>Normally, actions such as Liking are rate-limited, and when you hit the limit, you get a message telling you you've hit the limit. However, in 1.3.0beta9, it seems those popups are no longer appearing.</p>\n\n<p>Edit: Possibly linked to <a href=\"https://meta.discourse.org/t/post-reply-on-different-topic-no-longer-works/28825?u=raceprouk\">this issue</a>?</p>","post_number":1,"post_type":1,"updated_at":"2015-05-14T20:21:42.825Z","like_count":6,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":null,"incoming_link_count":14,"reads":24,"score":224.6,"yours":false,"topic_id":28830,"topic_slug":"1-3-0beta9-no-rate-limit-popups","display_username":"spends too much time on WTDWTF","primary_group_name":null,"version":1,"can_edit":false,"can_delete":false,"can_recover":false,"link_counts":[{"url":"https://meta.discourse.org/t/post-reply-on-different-topic-no-longer-works/28825","internal":true,"reflection":false,"title":"Post reply on different topic no longer works","clicks":6}],"read":true,"user_title":"Contributor","actions_summary":[{"id":2,"count":6,"hidden":false,"can_act":false},{"id":3,"count":0,"hidden":false,"can_act":false},{"id":4,"count":0,"hidden":false,"can_act":false},{"id":5,"count":0,"hidden":true,"can_act":false},{"id":6,"count":0,"hidden":false,"can_act":false},{"id":7,"count":0,"hidden":false,"can_act":false},{"id":8,"count":0,"hidden":false,"can_act":false}],"moderator":false,"admin":false,"staff":false,"user_id":14169,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":"","can_view_edit_history":true,"wiki":false},{"id":118597,"name":"Sam","username":"Yuun","avatar_template":"/images/avatar.png","uploaded_avatar_id":null,"created_at":"2015-05-14T20:35:03.793Z","cooked":"<p>I'm seeing this issue as well. When you hit the rate limit, any further likes look like the forum is attempting and failing to apply them - the text saying 'you liked this' comes into place before quickly being removed. </p>\n\n<p>This makes it look (to the user) like the forum software is running into errors instead of said user hitting an intentional limit, which is a bit unfortunate.</p>","post_number":2,"post_type":1,"updated_at":"2015-05-14T20:35:03.793Z","like_count":0,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":null,"incoming_link_count":6,"reads":22,"score":34.2,"yours":false,"topic_id":28830,"topic_slug":"1-3-0beta9-no-rate-limit-popups","display_username":"Sam","primary_group_name":null,"version":1,"can_edit":false,"can_delete":false,"can_recover":false,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":0,"hidden":false,"can_act":false},{"id":3,"count":0,"hidden":false,"can_act":false},{"id":4,"count":0,"hidden":false,"can_act":false},{"id":5,"count":0,"hidden":true,"can_act":false},{"id":6,"count":0,"hidden":false,"can_act":false},{"id":7,"count":0,"hidden":false,"can_act":false},{"id":8,"count":0,"hidden":false,"can_act":false}],"moderator":false,"admin":false,"staff":false,"user_id":14795,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":118601,"name":"Kane York","username":"riking","avatar_template":"/images/avatar.png","uploaded_avatar_id":40212,"created_at":"2015-05-14T21:05:19.837Z","cooked":"<p>I'm going to guess that the bootbox library got broken somehow?</p>","post_number":3,"post_type":1,"updated_at":"2015-05-14T21:05:19.837Z","like_count":0,"reply_count":1,"reply_to_post_number":null,"quote_count":0,"avg_time":null,"incoming_link_count":0,"reads":14,"score":7.2,"yours":false,"topic_id":28830,"topic_slug":"1-3-0beta9-no-rate-limit-popups","display_username":"Kane York","primary_group_name":null,"version":1,"can_edit":false,"can_delete":false,"can_recover":false,"read":true,"user_title":"team summer intern 2014","actions_summary":[{"id":2,"count":0,"hidden":false,"can_act":false},{"id":3,"count":0,"hidden":false,"can_act":false},{"id":4,"count":0,"hidden":false,"can_act":false},{"id":5,"count":0,"hidden":true,"can_act":false},{"id":6,"count":0,"hidden":false,"can_act":false},{"id":7,"count":0,"hidden":false,"can_act":false},{"id":8,"count":0,"hidden":false,"can_act":false}],"moderator":false,"admin":false,"staff":false,"user_id":6626,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":118606,"name":"Jeff Atwood","username":"codinghorror","avatar_template":"/images/avatar.png","uploaded_avatar_id":5297,"created_at":"2015-05-14T21:15:41.612Z","cooked":"<p>Yeah maybe another Ember 1.10 regression for <a class=\"mention\" href=\"/users/eviltrout\">@eviltrout</a> ?</p>","post_number":4,"post_type":1,"updated_at":"2015-05-14T21:15:41.612Z","like_count":0,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":null,"incoming_link_count":6,"reads":12,"score":31.6,"yours":false,"topic_id":28830,"topic_slug":"1-3-0beta9-no-rate-limit-popups","display_username":"Jeff Atwood","primary_group_name":"discourse","version":1,"can_edit":false,"can_delete":false,"can_recover":false,"read":true,"user_title":"co-founder","actions_summary":[{"id":2,"count":0,"hidden":false,"can_act":false},{"id":3,"count":0,"hidden":false,"can_act":false},{"id":4,"count":0,"hidden":false,"can_act":false},{"id":5,"count":0,"hidden":true,"can_act":false},{"id":6,"count":0,"hidden":false,"can_act":false},{"id":7,"count":0,"hidden":false,"can_act":false},{"id":8,"count":0,"hidden":false,"can_act":false}],"moderator":true,"admin":true,"staff":true,"user_id":32,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":118612,"name":"TDWTF member","username":"Onyx","avatar_template":"/images/avatar.png","uploaded_avatar_id":33015,"created_at":"2015-05-14T21:23:09.562Z","cooked":"<aside class=\"quote\" data-post=\"3\" data-topic=\"28830\" data-full=\"true\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img alt=\"\" width=\"20\" height=\"20\" src=\"/user_avatar/meta.discourse.org/riking/40/40212.png\" class=\"avatar\">riking:</div>\n<blockquote><p>I'm going to guess that the bootbox library got broken somehow?</p></blockquote></aside>\n\n<p>You mean the popup box library, guessing by the name? Still shows up when you want to cancel a post, so it's not <em>all</em> popups it seems.</p>","post_number":5,"post_type":1,"updated_at":"2015-05-14T21:23:09.562Z","like_count":1,"reply_count":0,"reply_to_post_number":3,"quote_count":1,"avg_time":null,"incoming_link_count":0,"reads":11,"score":16.0,"yours":false,"topic_id":28830,"topic_slug":"1-3-0beta9-no-rate-limit-popups","display_username":"TDWTF member","primary_group_name":null,"version":1,"can_edit":false,"can_delete":false,"can_recover":false,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":false},{"id":3,"count":0,"hidden":false,"can_act":false},{"id":4,"count":0,"hidden":false,"can_act":false},{"id":5,"count":0,"hidden":true,"can_act":false},{"id":6,"count":0,"hidden":false,"can_act":false},{"id":7,"count":0,"hidden":false,"can_act":false},{"id":8,"count":0,"hidden":false,"can_act":false}],"moderator":false,"admin":false,"staff":false,"user_id":10886,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false}],"stream":[118591,118597,118601,118606,118612]},"id":28830,"title":"1.3.0beta9: No rate-limit popups","fancy_title":"1.3.0beta9: No rate-limit popups","posts_count":5,"created_at":"2015-05-14T20:18:17.877Z","views":38,"reply_count":1,"participant_count":5,"like_count":7,"last_posted_at":"2015-05-14T21:23:09.562Z","visible":true,"closed":false,"archived":false,"has_summary":false,"archetype":"regular","slug":"1-3-0beta9-no-rate-limit-popups","category_id":1,"word_count":198,"deleted_at":null,"pending_posts_count":0,"draft":null,"draft_key":"topic_28830","draft_sequence":null,"unpinned":null,"pinned_globally":false,"pinned":false,"pinned_at":null,"details":{"auto_close_at":null,"auto_close_hours":null,"auto_close_based_on_last_post":false,"created_by":{"id":14169,"username":"RaceProUK","uploaded_avatar_id":40071,"avatar_template":"/images/avatar.png"},"last_poster":{"id":10886,"username":"Onyx","uploaded_avatar_id":33015,"avatar_template":"/images/avatar.png"},"participants":[{"id":14795,"username":"Yuun","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","post_count":1},{"id":10886,"username":"Onyx","uploaded_avatar_id":33015,"avatar_template":"/images/avatar.png","post_count":1},{"id":14169,"username":"RaceProUK","uploaded_avatar_id":40071,"avatar_template":"/images/avatar.png","post_count":1},{"id":6626,"username":"riking","uploaded_avatar_id":40212,"avatar_template":"/images/avatar.png","post_count":1},{"id":32,"username":"codinghorror","uploaded_avatar_id":5297,"avatar_template":"/images/avatar.png","post_count":1}],"suggested_topics":[{"id":2890,"title":"Expanded quoted text not highlighting when text is formatted","fancy_title":"Expanded quoted text not highlighting when text is formatted","slug":"expanded-quoted-text-not-highlighting-when-text-is-formatted","posts_count":8,"reply_count":5,"highest_post_number":8,"image_url":null,"created_at":"2013-02-12T12:18:02.181Z","last_posted_at":"2013-02-14T15:59:40.014Z","bumped":true,"bumped_at":"2013-02-14T15:59:40.014Z","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":3,"views":361,"category_id":1},{"id":14213,"title":"Plugins not being parsed in correct javascript context when loaded for jobs","fancy_title":"Plugins not being parsed in correct javascript context when loaded for jobs","slug":"plugins-not-being-parsed-in-correct-javascript-context-when-loaded-for-jobs","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":"/plugins/emoji/images/frowning.png","created_at":"2014-03-27T23:57:00.974Z","last_posted_at":"2015-03-20T04:56:03.982Z","bumped":true,"bumped_at":"2015-03-20T04:56:03.982Z","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":0,"views":156,"category_id":1},{"id":22544,"title":"Like count on profile off by one","fancy_title":"Like count on profile off by one","slug":"like-count-on-profile-off-by-one","posts_count":7,"reply_count":2,"highest_post_number":7,"image_url":null,"created_at":"2014-11-26T08:15:39.802Z","last_posted_at":"2014-11-27T07:23:37.638Z","bumped":true,"bumped_at":"2014-11-27T07:23:37.638Z","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":18,"views":192,"category_id":1},{"id":27670,"title":"Using back still shows unread indicator on the topic","fancy_title":"Using back still shows unread indicator on the topic","slug":"using-back-still-shows-unread-indicator-on-the-topic","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":null,"created_at":"2015-04-16T23:21:42.739Z","last_posted_at":"2015-04-17T02:43:08.447Z","bumped":true,"bumped_at":"2015-04-17T02:43:08.447Z","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":1,"views":85,"category_id":1},{"id":26628,"title":"Embed blacklist selector is broken","fancy_title":"Embed blacklist selector is broken","slug":"embed-blacklist-selector-is-broken","posts_count":11,"reply_count":7,"highest_post_number":11,"image_url":null,"created_at":"2015-03-22T11:21:14.825Z","last_posted_at":"2015-04-20T09:11:38.999Z","bumped":true,"bumped_at":"2015-04-20T09:11:38.999Z","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":1,"views":247,"category_id":1},{"id":18027,"title":"Minor: delete/undelete needs a rate limit","fancy_title":"Minor: delete/undelete needs a rate limit","slug":"minor-delete-undelete-needs-a-rate-limit","posts_count":4,"reply_count":1,"highest_post_number":4,"image_url":null,"created_at":"2014-07-25T02:51:41.158Z","last_posted_at":"2014-07-25T04:01:15.343Z","bumped":true,"bumped_at":"2014-07-25T11:06:46.213Z","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":1,"views":165,"category_id":1},{"id":17396,"title":"Bad Reply Key when pulling Autoforwarded Emails to Discourse","fancy_title":"Bad Reply Key when pulling Autoforwarded Emails to Discourse","slug":"bad-reply-key-when-pulling-autoforwarded-emails-to-discourse","posts_count":20,"reply_count":15,"highest_post_number":20,"image_url":null,"created_at":"2014-07-09T18:34:57.114Z","last_posted_at":"2014-10-21T15:08:50.441Z","bumped":true,"bumped_at":"2014-10-21T15:08:50.441Z","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":7,"views":542,"category_id":1}],"links":[{"url":"https://meta.discourse.org/t/post-reply-on-different-topic-no-longer-works/28825","title":"Post reply on different topic no longer works","fancy_title":null,"internal":true,"reflection":false,"clicks":6,"user_id":14169,"domain":"meta.discourse.org"}],"notification_level":1,"can_flag_topic":false},"highest_post_number":5,"deleted_by":null,"actions_summary":[{"id":4,"count":0,"hidden":false,"can_act":false},{"id":7,"count":0,"hidden":false,"can_act":false},{"id":8,"count":0,"hidden":false,"can_act":false}],"chunk_size":20,"bookmarked":null,"tags":null},
-"/t/9/1.json": {"post_stream":{"posts":[{"id":18,"username":"eviltrout","avatar_template":"/images/avatar.png","name":"Evil Trout","uploaded_avatar_id":9,"created_at":"2015-08-13T14:49:11.840Z","cooked":"<p>This is the first post.</p>","post_number":1,"post_type":1,"updated_at":"2015-08-13T14:49:11.840Z","reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":null,"incoming_link_count":0,"reads":1,"score":0,"yours":true,"topic_id":9,"topic_slug":"this-is-a-test-topic","display_username":"","primary_group_name":null,"version":1,"can_edit":true,"can_delete":false,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":3,"can_act":true},{"id":4,"can_act":true},{"id":5,"hidden":true,"can_act":true},{"id":7,"can_act":true},{"id":8,"can_act":true}],"moderator":false,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":19,"username":"eviltrout","avatar_template":"/images/avatar.png","name":"Evil Trout","uploaded_avatar_id":9,"created_at":"2015-08-13T14:49:18.231Z","cooked":"<p>This is the second post.</p>","post_number":2,"post_type":1,"updated_at":"2015-08-13T14:49:18.231Z","reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":null,"incoming_link_count":0,"reads":1,"score":0,"yours":true,"topic_id":9,"topic_slug":"this-is-a-test-topic","display_username":"","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":3,"can_act":true},{"id":4,"can_act":true},{"id":5,"hidden":true,"can_act":true},{"id":7,"can_act":true},{"id":8,"can_act":true}],"moderator":false,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":20,"username":"eviltrout","avatar_template":"/images/avatar.png","name":"Evil Trout","uploaded_avatar_id":9,"created_at":"2015-08-13T14:49:23.927Z","cooked":"<p>This is the third post.</p>","post_number":3,"post_type":1,"updated_at":"2015-08-13T14:49:23.927Z","reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":null,"incoming_link_count":0,"reads":1,"score":0,"yours":true,"topic_id":9,"topic_slug":"this-is-a-test-topic","display_username":"","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":3,"can_act":true},{"id":4,"can_act":true},{"id":5,"hidden":true,"can_act":true},{"id":7,"can_act":true},{"id":8,"can_act":true}],"moderator":false,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false}],"stream":[18,19,20]},"id":9,"title":"This is a test topic!","fancy_title":"This is a test topic!","posts_count":3,"created_at":"2015-08-13T14:49:11.720Z","views":1,"reply_count":0,"participant_count":1,"like_count":0,"last_posted_at":"2015-08-13T14:49:23.927Z","visible":true,"closed":false,"archived":false,"has_summary":false,"archetype":"regular","slug":"this-is-a-test-topic","category_id":1,"word_count":15,"deleted_at":null,"pending_posts_count":0,"user_id":1,"draft":null,"draft_key":"topic_9","draft_sequence":3,"posted":true,"unpinned":null,"pinned_globally":false,"pinned":false,"pinned_at":null,"pinned_until":null,"details":{"auto_close_at":null,"auto_close_hours":null,"auto_close_based_on_last_post":false,"created_by":{"id":1,"username":"tgxworld","uploaded_avatar_id":9,"avatar_template":"/images/avatar.png"},"last_poster":{"id":1,"username":"tgxworld","uploaded_avatar_id":9,"avatar_template":"/images/avatar.png"},"participants":[{"id":1,"username":"tgxworld","uploaded_avatar_id":9,"avatar_template":"/images/avatar.png","post_count":3}],"suggested_topics":[{"id":8,"title":"This is a new and awesome topic!","fancy_title":"This is a new and awesome topic!","slug":"this-is-a-new-and-awesome-topic","posts_count":3,"reply_count":0,"highest_post_number":5,"image_url":null,"created_at":"2015-08-13T05:17:00.000Z","last_posted_at":"2015-08-13T10:14:34.799Z","bumped":true,"bumped_at":"2015-08-13T10:14:34.799Z","unseen":false,"last_read_post_number":5,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":0,"views":2,"category_id":1},{"id":7,"title":"This is a test category!","fancy_title":"This is a test category!","slug":"this-is-a-test-category","posts_count":3,"reply_count":0,"highest_post_number":3,"image_url":null,"created_at":"2015-08-10T13:40:38.439Z","last_posted_at":"2015-08-13T01:59:44.928Z","bumped":true,"bumped_at":"2015-08-13T01:58:35.206Z","unseen":false,"last_read_post_number":3,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":3,"bookmarked":false,"liked":false,"archetype":"regular","like_count":0,"views":2,"category_id":1}],"notification_level":3,"notifications_reason_id":1,"can_move_posts":true,"can_edit":true,"can_delete":true,"can_recover":true,"can_remove_allowed_users":true,"can_invite_to":true,"can_create_post":true,"can_reply_as_new_topic":true,"can_flag_topic":true},"highest_post_number":3,"last_read_post_number":3,"deleted_by":null,"has_deleted":false,"actions_summary":[{"id":4,"count":0,"hidden":false,"can_act":true},{"id":7,"count":0,"hidden":false,"can_act":true},{"id":8,"count":0,"hidden":false,"can_act":true}],"chunk_size":20,"bookmarked":false},
+"/t/9/1.json": {"post_stream":{"posts":[{"id":18,"username":"eviltrout","avatar_template":"/images/avatar.png","name":"Evil Trout","uploaded_avatar_id":9,"created_at":"2015-08-13T14:49:11.840Z","cooked":"<p>This is the first post.</p>","post_number":1,"post_type":1,"updated_at":"2015-08-13T14:49:11.840Z","reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":null,"incoming_link_count":0,"reads":1,"score":0,"yours":true,"topic_id":9,"topic_slug":"this-is-a-test-topic","display_username":"","primary_group_name":null,"version":1,"can_edit":true,"can_delete":false,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":3,"can_act":true},{"id":4,"can_act":true},{"id":5,"hidden":true,"can_act":true},{"id":7,"can_act":true},{"id":8,"can_act":true}],"moderator":false,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":19,"username":"eviltrout","avatar_template":"/images/avatar.png","name":"Evil Trout","uploaded_avatar_id":9,"created_at":"2015-08-13T14:49:18.231Z","cooked":"<p>This is the second post.</p>","post_number":2,"post_type":1,"updated_at":"2015-08-13T14:49:18.231Z","reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":null,"incoming_link_count":0,"reads":1,"score":0,"yours":true,"topic_id":9,"topic_slug":"this-is-a-test-topic","display_username":"","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":3,"can_act":true},{"id":4,"can_act":true},{"id":5,"hidden":true,"can_act":true},{"id":7,"can_act":true},{"id":8,"can_act":true}],"moderator":false,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":20,"username":"eviltrout","avatar_template":"/images/avatar.png","name":"Evil Trout","uploaded_avatar_id":9,"created_at":"2015-08-13T14:49:23.927Z","cooked":"<p>This is the third post.</p>","post_number":3,"post_type":1,"updated_at":"2015-08-13T14:49:23.927Z","reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":null,"incoming_link_count":0,"reads":1,"score":0,"yours":true,"topic_id":9,"topic_slug":"this-is-a-test-topic","display_username":"","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":3,"can_act":true},{"id":4,"can_act":true},{"id":5,"hidden":true,"can_act":true},{"id":7,"can_act":true},{"id":8,"can_act":true}],"moderator":false,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false}],"stream":[18,19,20]},"id":9,"title":"This is a test topic!","fancy_title":"This is a test topic!","posts_count":3,"created_at":"2015-08-13T14:49:11.720Z","views":1,"reply_count":0,"participant_count":1,"like_count":0,"last_posted_at":"2015-08-13T14:49:23.927Z","visible":true,"closed":false,"archived":false,"has_summary":false,"archetype":"regular","slug":"this-is-a-test-topic","category_id":24,"word_count":15,"deleted_at":null,"pending_posts_count":0,"user_id":1,"draft":null,"draft_key":"topic_9","draft_sequence":3,"posted":true,"unpinned":null,"pinned_globally":false,"pinned":false,"pinned_at":null,"pinned_until":null,"details":{"auto_close_at":null,"auto_close_hours":null,"auto_close_based_on_last_post":false,"created_by":{"id":1,"username":"tgxworld","uploaded_avatar_id":9,"avatar_template":"/images/avatar.png"},"last_poster":{"id":1,"username":"tgxworld","uploaded_avatar_id":9,"avatar_template":"/images/avatar.png"},"participants":[{"id":1,"username":"tgxworld","uploaded_avatar_id":9,"avatar_template":"/images/avatar.png","post_count":3}],"suggested_topics":[{"id":8,"title":"This is a new and awesome topic!","fancy_title":"This is a new and awesome topic!","slug":"this-is-a-new-and-awesome-topic","posts_count":3,"reply_count":0,"highest_post_number":5,"image_url":null,"created_at":"2015-08-13T05:17:00.000Z","last_posted_at":"2015-08-13T10:14:34.799Z","bumped":true,"bumped_at":"2015-08-13T10:14:34.799Z","unseen":false,"last_read_post_number":5,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":0,"views":2,"category_id":1},{"id":7,"title":"This is a test category!","fancy_title":"This is a test category!","slug":"this-is-a-test-category","posts_count":3,"reply_count":0,"highest_post_number":3,"image_url":null,"created_at":"2015-08-10T13:40:38.439Z","last_posted_at":"2015-08-13T01:59:44.928Z","bumped":true,"bumped_at":"2015-08-13T01:58:35.206Z","unseen":false,"last_read_post_number":3,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":3,"bookmarked":false,"liked":false,"archetype":"regular","like_count":0,"views":2,"category_id":1}],"notification_level":3,"notifications_reason_id":1,"can_move_posts":true,"can_edit":true,"can_delete":true,"can_recover":true,"can_remove_allowed_users":true,"can_invite_to":true,"can_create_post":true,"can_reply_as_new_topic":true,"can_flag_topic":true},"highest_post_number":3,"last_read_post_number":3,"deleted_by":null,"has_deleted":false,"actions_summary":[{"id":4,"count":0,"hidden":false,"can_act":true},{"id":7,"count":0,"hidden":false,"can_act":true},{"id":8,"count":0,"hidden":false,"can_act":true}],"chunk_size":20,"bookmarked":false,"destination_category_id":3},
 "/t/12/1.json": {"post_stream":{"posts":[{"id":15,"name":null,"username":"test","avatar_template":"/images/avatar.png","created_at":"2017-01-27T03:53:58.394Z","cooked":"<p>I have a pen, I have an apple</p>","post_number":1,"post_type":1,"updated_at":"2017-01-27T03:53:58.394Z","reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":null,"incoming_link_count":0,"reads":1,"score":0,"yours":true,"topic_id":12,"topic_slug":"pm-for-testing","display_username":null,"primary_group_name":null,"primary_group_flair_url":null,"primary_group_flair_bg_color":null,"primary_group_flair_color":null,"version":1,"can_edit":true,"can_delete":false,"can_recover":true,"can_wiki":true,"read":true,"user_title":null,"actions_summary":[{"id":3,"can_act":true},{"id":4,"can_act":true},{"id":5,"hidden":true,"can_act":true},{"id":7,"can_act":true},{"id":8,"can_act":true}],"moderator":false,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false,"can_translate":false},{"id":16,"name":null,"username":"test","avatar_template":"/images/avatar.png","created_at":"2017-01-27T04:10:02.941Z","cooked":"","post_number":2,"post_type":3,"updated_at":"2017-01-27T04:10:02.941Z","reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":null,"incoming_link_count":0,"reads":1,"score":0,"yours":true,"topic_id":12,"topic_slug":"pm-for-testing","display_username":null,"primary_group_name":null,"primary_group_flair_url":null,"primary_group_flair_bg_color":null,"primary_group_flair_color":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"can_wiki":true,"read":true,"user_title":null,"actions_summary":[{"id":3,"can_act":true},{"id":4,"can_act":true},{"id":5,"hidden":true,"can_act":true},{"id":7,"can_act":true},{"id":8,"can_act":true}],"moderator":false,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false,"action_code":"invited_group","action_code_who":"Group","can_translate":false}],"stream":[15,16]},"timeline_lookup":[[1,0]],"id":12,"title":"PM for testing","fancy_title":"PM for testing","posts_count":2,"created_at":"2017-01-27T03:53:58.360Z","views":1,"reply_count":0,"participant_count":1,"like_count":0,"last_posted_at":"2017-01-27T04:10:02.941Z","visible":true,"closed":false,"archived":false,"has_summary":false,"archetype":"private_message","slug":"pm-for-testing","category_id":null,"word_count":8,"deleted_at":null,"user_id":1,"draft":null,"draft_key":"topic_12","draft_sequence":2,"posted":true,"unpinned":null,"pinned_globally":false,"pinned":false,"pinned_at":null,"pinned_until":null,"details":{"auto_close_at":null,"auto_close_hours":null,"auto_close_based_on_last_post":false,"created_by":{"id":1,"username":"test","avatar_template":"/images/avatar.png"},"last_poster":{"id":1,"username":"test","avatar_template":"/images/avatar.png"},"allowed_groups":[{"id":41,"automatic":false,"name":"Group","user_count":0,"alias_level":99,"visible":true,"automatic_membership_email_domains":"","automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":null,"bio_cooked":null,"public":false,"allow_membership_requests":false,"full_name":null}],"allowed_users":[{"id":2,"username":"someguy","avatar_template":"/images/avatar.png"},{"id":1,"username":"test","avatar_template":"/images/avatar.png"}],"participants":[{"id":1,"username":"test","avatar_template":"/images/avatar.png","post_count":2,"primary_group_name":null,"primary_group_flair_url":null,"primary_group_flair_color":null,"primary_group_flair_bg_color":null}],"suggested_topics":[{"id":11,"title":"This is a very important announcement","fancy_title":"This is a very important announcement","slug":"this-is-a-very-important-announcement","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2017-01-27T03:52:02.061Z","last_posted_at":"2017-01-27T03:52:02.119Z","bumped":true,"bumped_at":"2017-01-27T03:52:02.119Z","unseen":false,"last_read_post_number":1,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":3,"bookmarked":false,"liked":false,"archetype":"private_message","like_count":0,"views":1,"category_id":null,"featured_link":null,"posters":[{"extras":"latest single","description":"Original Poster, Most Recent Poster","user":{"id":1,"username":"test","avatar_template":"/images/avatar.png"}}]}],"notification_level":3,"notifications_reason_id":1,"can_move_posts":true,"can_edit":true,"can_delete":true,"can_recover":true,"can_remove_allowed_users":true,"can_invite_to":true,"can_create_post":true,"can_reply_as_new_topic":true,"can_flag_topic":true},"highest_post_number":2,"last_read_post_number":2,"last_read_post_id":16,"deleted_by":null,"has_deleted":false,"actions_summary":[{"id":4,"count":0,"hidden":false,"can_act":true},{"id":7,"count":0,"hidden":false,"can_act":true},{"id":8,"count":0,"hidden":false,"can_act":true}],"chunk_size":20,"bookmarked":false,"message_archived":false,"featured_link":null},
-"/t/299/1.json": {"post_stream":{"posts":[{"id":18,"username":"eviltrout","avatar_template":"/images/avatar.png","name":"Evil Trout","uploaded_avatar_id":9,"created_at":"2015-08-13T14:49:11.840Z","cooked":"<p>This is the first post.</p>","post_number":1,"post_type":1,"updated_at":"2015-08-13T14:49:11.840Z","reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":null,"incoming_link_count":0,"reads":1,"score":0,"yours":true,"topic_id":9,"topic_slug":"this-is-a-test-topic","display_username":"","primary_group_name":null,"version":1,"can_edit":true,"can_delete":false,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":3,"can_act":true},{"id":4,"can_act":true},{"id":5,"hidden":true,"can_act":true},{"id":7,"can_act":true},{"id":8,"can_act":true}],"moderator":false,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":19,"username":"eviltrout","avatar_template":"/images/avatar.png","name":"Evil Trout","uploaded_avatar_id":9,"created_at":"2015-08-13T14:49:18.231Z","cooked":"<p>This is the second post.</p>","post_number":2,"post_type":1,"updated_at":"2015-08-13T14:49:18.231Z","reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":null,"incoming_link_count":0,"reads":1,"score":0,"yours":true,"topic_id":9,"topic_slug":"this-is-a-test-topic","display_username":"","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":3,"can_act":true},{"id":4,"can_act":true},{"id":5,"hidden":true,"can_act":true},{"id":7,"can_act":true},{"id":8,"can_act":true}],"moderator":false,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":20,"username":"eviltrout","avatar_template":"/images/avatar.png","name":"Evil Trout","uploaded_avatar_id":9,"created_at":"2015-08-13T14:49:23.927Z","cooked":"<p>This is the third post.</p>","post_number":3,"post_type":1,"updated_at":"2015-08-13T14:49:23.927Z","reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":null,"incoming_link_count":0,"reads":1,"score":0,"yours":true,"topic_id":9,"topic_slug":"this-is-a-test-topic","display_username":"","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":3,"can_act":true},{"id":4,"can_act":true},{"id":5,"hidden":true,"can_act":true},{"id":7,"can_act":true},{"id":8,"can_act":true}],"moderator":false,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false}],"stream":[18,19,20]},"id":299,"title":"Look at this link","fancy_title":"Look at this link","posts_count":3,"created_at":"2015-08-13T14:49:11.720Z","views":1,"reply_count":0,"participant_count":1,"like_count":0,"last_posted_at":"2015-08-13T14:49:23.927Z","visible":true,"closed":false,"archived":false,"has_summary":false,"archetype":"regular","slug":"this-is-a-test-topic","category_id":1,"word_count":15,"deleted_at":null,"pending_posts_count":0,"user_id":1,"draft":null,"draft_key":"topic_9","draft_sequence":3,"posted":true,"unpinned":null,"pinned_globally":false,"pinned":false,"pinned_at":null,"pinned_until":null,featured_link:"http://www.example.com/has-title.html","details":{"auto_close_at":null,"auto_close_hours":null,"auto_close_based_on_last_post":false,"created_by":{"id":1,"username":"tgxworld","uploaded_avatar_id":9,"avatar_template":"/images/avatar.png"},"last_poster":{"id":1,"username":"tgxworld","uploaded_avatar_id":9,"avatar_template":"/images/avatar.png"},"participants":[{"id":1,"username":"tgxworld","uploaded_avatar_id":9,"avatar_template":"/images/avatar.png","post_count":3}],"suggested_topics":[{"id":8,"title":"This is a new and awesome topic!","fancy_title":"This is a new and awesome topic!","slug":"this-is-a-new-and-awesome-topic","posts_count":3,"reply_count":0,"highest_post_number":5,"image_url":null,"created_at":"2015-08-13T05:17:00.000Z","last_posted_at":"2015-08-13T10:14:34.799Z","bumped":true,"bumped_at":"2015-08-13T10:14:34.799Z","unseen":false,"last_read_post_number":5,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":0,"views":2,"category_id":1},{"id":7,"title":"This is a test category!","fancy_title":"This is a test category!","slug":"this-is-a-test-category","posts_count":3,"reply_count":0,"highest_post_number":3,"image_url":null,"created_at":"2015-08-10T13:40:38.439Z","last_posted_at":"2015-08-13T01:59:44.928Z","bumped":true,"bumped_at":"2015-08-13T01:58:35.206Z","unseen":false,"last_read_post_number":3,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":3,"bookmarked":false,"liked":false,"archetype":"regular","like_count":0,"views":2,"category_id":1}],"notification_level":3,"notifications_reason_id":1,"can_move_posts":true,"can_edit":true,"can_delete":true,"can_recover":true,"can_remove_allowed_users":true,"can_invite_to":true,"can_create_post":true,"can_reply_as_new_topic":true,"can_flag_topic":true},"highest_post_number":3,"last_read_post_number":3,"deleted_by":null,"has_deleted":false,"actions_summary":[{"id":4,"count":0,"hidden":false,"can_act":true},{"id":7,"count":0,"hidden":false,"can_act":true},{"id":8,"count":0,"hidden":false,"can_act":true}],"chunk_size":20,"bookmarked":false} };
+"/t/299/1.json": {"post_stream":{"posts":[{"id":18,"username":"eviltrout","avatar_template":"/images/avatar.png","name":"Evil Trout","uploaded_avatar_id":9,"created_at":"2015-08-13T14:49:11.840Z","cooked":"<p>This is the first post.</p>","post_number":1,"post_type":1,"updated_at":"2015-08-13T14:49:11.840Z","reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":null,"incoming_link_count":0,"reads":1,"score":0,"yours":true,"topic_id":9,"topic_slug":"this-is-a-test-topic","display_username":"","primary_group_name":null,"version":1,"can_edit":true,"can_delete":false,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":3,"can_act":true},{"id":4,"can_act":true},{"id":5,"hidden":true,"can_act":true},{"id":7,"can_act":true},{"id":8,"can_act":true}],"moderator":false,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":19,"username":"eviltrout","avatar_template":"/images/avatar.png","name":"Evil Trout","uploaded_avatar_id":9,"created_at":"2015-08-13T14:49:18.231Z","cooked":"<p>This is the second post.</p>","post_number":2,"post_type":1,"updated_at":"2015-08-13T14:49:18.231Z","reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":null,"incoming_link_count":0,"reads":1,"score":0,"yours":true,"topic_id":9,"topic_slug":"this-is-a-test-topic","display_username":"","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":3,"can_act":true},{"id":4,"can_act":true},{"id":5,"hidden":true,"can_act":true},{"id":7,"can_act":true},{"id":8,"can_act":true}],"moderator":false,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":20,"username":"eviltrout","avatar_template":"/images/avatar.png","name":"Evil Trout","uploaded_avatar_id":9,"created_at":"2015-08-13T14:49:23.927Z","cooked":"<p>This is the third post.</p>","post_number":3,"post_type":1,"updated_at":"2015-08-13T14:49:23.927Z","reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":null,"incoming_link_count":0,"reads":1,"score":0,"yours":true,"topic_id":9,"topic_slug":"this-is-a-test-topic","display_username":"","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":3,"can_act":true},{"id":4,"can_act":true},{"id":5,"hidden":true,"can_act":true},{"id":7,"can_act":true},{"id":8,"can_act":true}],"moderator":false,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false}],"stream":[18,19,20]},"id":299,"title":"Look at this link","fancy_title":"Look at this link","posts_count":3,"created_at":"2015-08-13T14:49:11.720Z","views":1,"reply_count":0,"participant_count":1,"like_count":0,"last_posted_at":"2015-08-13T14:49:23.927Z","visible":true,"closed":false,"archived":false,"has_summary":false,"archetype":"regular","slug":"this-is-a-test-topic","category_id":1,"word_count":15,"deleted_at":null,"pending_posts_count":0,"user_id":1,"draft":null,"draft_key":"topic_9","draft_sequence":3,"posted":true,"unpinned":null,"pinned_globally":false,"pinned":false,"pinned_at":null,"pinned_until":null,featured_link:"http://www.example.com/has-title.html","details":{"auto_close_at":null,"auto_close_hours":null,"auto_close_based_on_last_post":false,"created_by":{"id":1,"username":"tgxworld","uploaded_avatar_id":9,"avatar_template":"/images/avatar.png"},"last_poster":{"id":1,"username":"tgxworld","uploaded_avatar_id":9,"avatar_template":"/images/avatar.png"},"participants":[{"id":1,"username":"tgxworld","uploaded_avatar_id":9,"avatar_template":"/images/avatar.png","post_count":3}],"suggested_topics":[{"id":8,"title":"This is a new and awesome topic!","fancy_title":"This is a new and awesome topic!","slug":"this-is-a-new-and-awesome-topic","posts_count":3,"reply_count":0,"highest_post_number":5,"image_url":null,"created_at":"2015-08-13T05:17:00.000Z","last_posted_at":"2015-08-13T10:14:34.799Z","bumped":true,"bumped_at":"2015-08-13T10:14:34.799Z","unseen":false,"last_read_post_number":5,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":0,"views":2,"category_id":1},{"id":7,"title":"This is a test category!","fancy_title":"This is a test category!","slug":"this-is-a-test-category","posts_count":3,"reply_count":0,"highest_post_number":3,"image_url":null,"created_at":"2015-08-10T13:40:38.439Z","last_posted_at":"2015-08-13T01:59:44.928Z","bumped":true,"bumped_at":"2015-08-13T01:58:35.206Z","unseen":false,"last_read_post_number":3,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":3,"bookmarked":false,"liked":false,"archetype":"regular","like_count":0,"views":2,"category_id":1}],"notification_level":3,"notifications_reason_id":1,"can_move_posts":true,"can_edit":true,"can_delete":true,"can_recover":true,"can_remove_allowed_users":true,"can_invite_to":true,"can_create_post":true,"can_reply_as_new_topic":true,"can_flag_topic":true},"highest_post_number":3,"last_read_post_number":3,"deleted_by":null,"has_deleted":false,"actions_summary":[{"id":4,"count":0,"hidden":false,"can_act":true},{"id":7,"count":0,"hidden":false,"can_act":true},{"id":8,"count":0,"hidden":false,"can_act":true}],"chunk_size":20,"bookmarked":false},
+"/t/301/1.json": {"post_stream":{"posts":[{"id":18,"username":"eviltrout","avatar_template":"/images/avatar.png","name":"Evil Trout","uploaded_avatar_id":9,"created_at":"2015-08-13T14:49:11.840Z","cooked":"<p>This is the first post. <a class=\"mention-group\" href=\"/groups/discourse\">@discourse</a></p>","post_number":1,"post_type":1,"updated_at":"2015-08-13T14:49:11.840Z","reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":null,"incoming_link_count":0,"reads":1,"score":0,"yours":true,"topic_id":9,"topic_slug":"this-is-a-test-topic","display_username":"","primary_group_name":null,"version":1,"can_edit":true,"can_delete":false,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":3,"can_act":true},{"id":4,"can_act":true},{"id":5,"hidden":true,"can_act":true},{"id":7,"can_act":true},{"id":8,"can_act":true}],"moderator":false,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":19,"username":"eviltrout","avatar_template":"/images/avatar.png","name":"Evil Trout","uploaded_avatar_id":9,"created_at":"2015-08-13T14:49:18.231Z","cooked":"<p>This is the second post.</p>","post_number":2,"post_type":1,"updated_at":"2015-08-13T14:49:18.231Z","reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":null,"incoming_link_count":0,"reads":1,"score":0,"yours":true,"topic_id":9,"topic_slug":"this-is-a-test-topic","display_username":"","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":3,"can_act":true},{"id":4,"can_act":true},{"id":5,"hidden":true,"can_act":true},{"id":7,"can_act":true},{"id":8,"can_act":true}],"moderator":false,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":20,"username":"eviltrout","avatar_template":"/images/avatar.png","name":"Evil Trout","uploaded_avatar_id":9,"created_at":"2015-08-13T14:49:23.927Z","cooked":"<p>This is the third post.</p>","post_number":3,"post_type":1,"updated_at":"2015-08-13T14:49:23.927Z","reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":null,"incoming_link_count":0,"reads":1,"score":0,"yours":true,"topic_id":9,"topic_slug":"this-is-a-test-topic","display_username":"","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":3,"can_act":true},{"id":4,"can_act":true},{"id":5,"hidden":true,"can_act":true},{"id":7,"can_act":true},{"id":8,"can_act":true}],"moderator":false,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false}],"stream":[18,19,20]},"id":299,"title":"Look at this link","fancy_title":"Look at this link","posts_count":3,"created_at":"2015-08-13T14:49:11.720Z","views":1,"reply_count":0,"participant_count":1,"like_count":0,"last_posted_at":"2015-08-13T14:49:23.927Z","visible":true,"closed":false,"archived":false,"has_summary":false,"archetype":"regular","slug":"this-is-a-test-topic","category_id":1,"word_count":15,"deleted_at":null,"pending_posts_count":0,"user_id":1,"draft":null,"draft_key":"topic_9","draft_sequence":3,"posted":true,"unpinned":null,"pinned_globally":false,"pinned":false,"pinned_at":null,"pinned_until":null,featured_link:"http://www.example.com/has-title.html","details":{"auto_close_at":null,"auto_close_hours":null,"auto_close_based_on_last_post":false,"created_by":{"id":1,"username":"tgxworld","uploaded_avatar_id":9,"avatar_template":"/images/avatar.png"},"last_poster":{"id":1,"username":"tgxworld","uploaded_avatar_id":9,"avatar_template":"/images/avatar.png"},"participants":[{"id":1,"username":"tgxworld","uploaded_avatar_id":9,"avatar_template":"/images/avatar.png","post_count":3}],"suggested_topics":[{"id":8,"title":"This is a new and awesome topic!","fancy_title":"This is a new and awesome topic!","slug":"this-is-a-new-and-awesome-topic","posts_count":3,"reply_count":0,"highest_post_number":5,"image_url":null,"created_at":"2015-08-13T05:17:00.000Z","last_posted_at":"2015-08-13T10:14:34.799Z","bumped":true,"bumped_at":"2015-08-13T10:14:34.799Z","unseen":false,"last_read_post_number":5,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":0,"views":2,"category_id":1},{"id":7,"title":"This is a test category!","fancy_title":"This is a test category!","slug":"this-is-a-test-category","posts_count":3,"reply_count":0,"highest_post_number":3,"image_url":null,"created_at":"2015-08-10T13:40:38.439Z","last_posted_at":"2015-08-13T01:59:44.928Z","bumped":true,"bumped_at":"2015-08-13T01:58:35.206Z","unseen":false,"last_read_post_number":3,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":3,"bookmarked":false,"liked":false,"archetype":"regular","like_count":0,"views":2,"category_id":1}],"notification_level":3,"notifications_reason_id":1,"can_move_posts":true,"can_edit":true,"can_delete":true,"can_recover":true,"can_remove_allowed_users":true,"can_invite_to":true,"can_create_post":true,"can_reply_as_new_topic":true,"can_flag_topic":true},"highest_post_number":3,"last_read_post_number":3,"deleted_by":null,"has_deleted":false,"actions_summary":[{"id":4,"count":0,"hidden":false,"can_act":true},{"id":7,"count":0,"hidden":false,"can_act":true},{"id":8,"count":0,"hidden":false,"can_act":true}],"chunk_size":20,"bookmarked":false} };
diff --git a/test/javascripts/fixtures/topics.js.es6 b/test/javascripts/fixtures/topics.js.es6
new file mode 100644
index 00000000000..c5a5f9b2451
--- /dev/null
+++ b/test/javascripts/fixtures/topics.js.es6
@@ -0,0 +1,19 @@
+export default {
+  "/admin/reports/topics": {
+    "report": {
+      "type": "topics",
+      "title": "Topics",
+      "xaxis": "Day",
+      "yaxis": "Number of new topics",
+      "data": null,
+      "total": null,
+      "start_date": "2018-03-26T00:00:00.000Z",
+      "end_date": "2018-04-25T23:59:59.999Z",
+      "category_id": null,
+      "group_id": null,
+      "prev30Days": 0,
+      "labels": null,
+      "report_key": ""
+    }
+  }
+};
diff --git a/test/javascripts/fixtures/trending-search.js.es6 b/test/javascripts/fixtures/trending-search.js.es6
new file mode 100644
index 00000000000..c02721d8eca
--- /dev/null
+++ b/test/javascripts/fixtures/trending-search.js.es6
@@ -0,0 +1,19 @@
+export default {
+  "/admin/reports/trending_search": {
+    "report": {
+      "type": "trending_search",
+      "title": "Trending search",
+      "xaxis": "",
+      "yaxis": "",
+      "data": null,
+      "total": null,
+      "start_date": "2018-03-26T00:00:00.000Z",
+      "end_date": "2018-04-25T23:59:59.999Z",
+      "category_id": null,
+      "group_id": null,
+      "prev30Days": null,
+      "labels": ["Term", "Searches", "Unique"],
+      "report_key": ""
+    }
+  }
+};
diff --git a/test/javascripts/fixtures/users-by-trust-level.js.es6 b/test/javascripts/fixtures/users-by-trust-level.js.es6
new file mode 100644
index 00000000000..6af6b12c74c
--- /dev/null
+++ b/test/javascripts/fixtures/users-by-trust-level.js.es6
@@ -0,0 +1,20 @@
+export default {
+  "/admin/reports/users_by_trust_level": {
+    "report": {
+      "type": "users_by_trust_level",
+      "title": "Users per Trust Level",
+      "xaxis": "Trust Level",
+      "yaxis": "Number of Users",
+      "description": "translation missing: en.reports.users_by_trust_level.description",
+      "data": null,
+      "total": null,
+      "start_date": "2018-03-30T00:00:00.000Z",
+      "end_date": "2018-04-29T23:59:59.999Z",
+      "category_id": null,
+      "group_id": null,
+      "prev30Days": null,
+      "labels": null,
+      "report_key": ""
+    }
+  }
+};
diff --git a/test/javascripts/fixtures/users-by-type.js.es6 b/test/javascripts/fixtures/users-by-type.js.es6
new file mode 100644
index 00000000000..1da202a59e2
--- /dev/null
+++ b/test/javascripts/fixtures/users-by-type.js.es6
@@ -0,0 +1,20 @@
+export default {
+  "/admin/reports/users_by_type": {
+    "report": {
+      "type": "users_by_type",
+      "title": "Users per Type",
+      "xaxis": "Type",
+      "yaxis": "Number of Users",
+      "description": "translation missing: en.reports.users_by_type.description",
+      "data": null,
+      "total": null,
+      "start_date": "2018-03-30T00:00:00.000Z",
+      "end_date": "2018-04-29T23:59:59.999Z",
+      "category_id": null,
+      "group_id": null,
+      "prev30Days": null,
+      "labels": null,
+      "report_key": ""
+    }
+  }
+};
diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6
index b0bb47e3e8d..678d4a782c5 100644
--- a/test/javascripts/helpers/create-pretender.js.es6
+++ b/test/javascripts/helpers/create-pretender.js.es6
@@ -151,6 +151,7 @@ export default function() {
 
     this.delete('/t/:id', success);
     this.put('/t/:id/recover', success);
+    this.put('/t/:id/publish', success);
 
     this.get("/404-body", () => {
       return [200, {"Content-Type": "text/html"}, "<div class='page-not-found'>not found</div>"];
@@ -227,6 +228,17 @@ export default function() {
                           current_email: 'current@example.com' });
       }
 
+      if (data.password === 'need-second-factor') {
+        if (data.second_factor_token) {
+          return response({ username: 'eviltrout' });
+        }
+
+        return response({ error: "Invalid Second Factor",
+                          reason: "invalid_second_factor",
+                          sent_to_email: 'eviltrout@example.com',
+                          current_email: 'current@example.com' });
+      }
+
       return response(400, {error: 'invalid login'});
     });
 
@@ -284,8 +296,8 @@ export default function() {
       return response(200, []);
     });
 
-    this.get("/groups/discourse/topics.json", () => {
-      return response(200, fixturesByUrl['/groups/discourse/posts.json']);
+    this.get("/topics/groups/discourse.json", () => {
+      return response(200, fixturesByUrl['/topics/groups/discourse.json']);
     });
 
     this.get("/groups/discourse/mentions.json", () => {
@@ -296,6 +308,10 @@ export default function() {
       return response(200, fixturesByUrl['/groups/discourse/posts.json']);
     });
 
+    this.get("/groups/moderators/members.json", () => {
+      return response(200, fixturesByUrl['/groups/discourse/members.json']);
+    });
+
     this.get('/t/:topic_id/posts.json', request => {
       const postIds = request.queryParams.post_ids;
       const posts = postIds.map(p => ({id: parseInt(p), post_number: parseInt(p) }));
diff --git a/test/javascripts/helpers/qunit-helpers.js.es6 b/test/javascripts/helpers/qunit-helpers.js.es6
index 4a12fc22396..50bf08bef0d 100644
--- a/test/javascripts/helpers/qunit-helpers.js.es6
+++ b/test/javascripts/helpers/qunit-helpers.js.es6
@@ -9,11 +9,19 @@ import { clearHTMLCache } from 'discourse/helpers/custom-html';
 import { flushMap } from 'discourse/models/store';
 import { clearRewrites } from 'discourse/lib/url';
 import { initSearchData } from 'discourse/widgets/search-menu';
+import { resetDecorators } from 'discourse/widgets/widget';
+import { resetCustomPostMessageCallbacks } from 'discourse/controllers/topic';
 
 export function currentUser() {
   return Discourse.User.create(sessionFixtures['/session/current.json'].current_user);
 }
 
+export function replaceCurrentUser(properties) {
+  const user = Discourse.User.current();
+  user.setProperties(properties);
+  Discourse.User.resetCurrent(user);
+}
+
 export function logIn() {
   Discourse.User.resetCurrent(currentUser());
 }
@@ -99,6 +107,8 @@ export function acceptance(name, options) {
       resetPluginApi();
       clearRewrites();
       initSearchData();
+      resetDecorators();
+      resetCustomPostMessageCallbacks();
       Discourse.reset();
     }
   });
diff --git a/test/javascripts/helpers/select-kit-helper.js b/test/javascripts/helpers/select-kit-helper.js
index be2debd6a83..c54c8435dd2 100644
--- a/test/javascripts/helpers/select-kit-helper.js
+++ b/test/javascripts/helpers/select-kit-helper.js
@@ -63,6 +63,7 @@ function selectKit(selector) { // eslint-disable-line no-unused-vars
     return {
       value: function() { return header.attr('data-value'); },
       name: function() { return header.attr('data-name'); },
+      label: function() { return header.text().trim(); },
       icon: function() { return header.find('.icon'); },
       title: function() { return header.attr('title'); },
       el: function() { return header; }
@@ -87,7 +88,7 @@ function selectKit(selector) { // eslint-disable-line no-unused-vars
         var type = options.type || 'keydown';
         var event = jQuery.Event(type);
         event.keyCode = keyCode;
-        if (options && options.metaKey === true) { event.metaKey = true; }
+        if (options && options.metaKey) { event.metaKey = true; }
         find(eventSelector).trigger(event);
       });
     }
@@ -104,6 +105,10 @@ function selectKit(selector) { // eslint-disable-line no-unused-vars
   };
 
   return {
+    expandAwait: function() {
+      return expandSelectKit(selector);
+    },
+
     expand: function() {
       expandSelectKit(selector);
       return selectKit(selector);
@@ -119,6 +124,10 @@ function selectKit(selector) { // eslint-disable-line no-unused-vars
       return selectKit(selector);
     },
 
+    selectRowByValueAwait: function(value) {
+      return selectKitSelectRowByValue(value, selector);
+    },
+
     selectRowByValue: function(value) {
       selectKitSelectRowByValue(value, selector);
       return selectKit(selector);
@@ -183,6 +192,16 @@ function selectKit(selector) { // eslint-disable-line no-unused-vars
       return rowHelper(find(selector).find('.select-kit-row.none'));
     },
 
+    validationMessage: function() {
+      var validationMessage = find(selector).find('.validation-message');
+
+      if (validationMessage.length) {
+        return validationMessage.html().trim();
+      } else {
+        return null;
+      }
+    },
+
     selectedRow: function() {
       return rowHelper(find(selector).find('.select-kit-row.is-selected'));
     },
diff --git a/test/javascripts/helpers/site-settings.js b/test/javascripts/helpers/site-settings.js
index f11eb01177a..f84fd111e05 100644
--- a/test/javascripts/helpers/site-settings.js
+++ b/test/javascripts/helpers/site-settings.js
@@ -39,11 +39,11 @@ Discourse.SiteSettingsOriginal = {
   "delete_user_max_post_age":60,
   "delete_all_posts_max":15,
   "min_post_length":20,
-  "min_private_message_post_length":10,
+  "min_personal_message_post_length":10,
   "max_post_length":32000,
   "min_topic_title_length":15,
   "max_topic_title_length":255,
-  "min_private_message_title_length":2,
+  "min_personal_message_title_length":2,
   "allow_uncategorized_topics":true,
   "min_title_similar_length":10,
   "edit_history_visible_to_public":true,
@@ -59,6 +59,7 @@ Discourse.SiteSettingsOriginal = {
   "autohighlight_all_code":false,
   "email_in":false,
   "authorized_extensions":".jpg|.jpeg|.png|.gif|.svg|.txt|.ico|.yml",
+  "authorized_extensions_for_staff": "",
   "max_image_width":690,
   "max_image_height":500,
   "allow_profile_backgrounds":true,
@@ -89,6 +90,7 @@ Discourse.SiteSettingsOriginal = {
   "enable_emoji":true,
   "emoji_set":"emoji_one",
   "desktop_category_page_style":"categories_and_latest_topics",
-  "enable_mentions":true
+  "enable_mentions":true,
+  "enable_personal_messages": true
 };
 Discourse.SiteSettings = jQuery.extend(true, {}, Discourse.SiteSettingsOriginal);
diff --git a/test/javascripts/helpers/store-pretender.js.es6 b/test/javascripts/helpers/store-pretender.js.es6
index d86f1260e81..e0420538821 100644
--- a/test/javascripts/helpers/store-pretender.js.es6
+++ b/test/javascripts/helpers/store-pretender.js.es6
@@ -53,7 +53,7 @@ export default function(helpers) {
   this.get('/widgets/:widget_id', function(request) {
     const w = _widgets.findBy('id', parseInt(request.params.widget_id));
     if (w) {
-      return response({widget: w});
+      return response({ widget: w, extras: { hello: 'world' }});
     } else {
       return response(404);
     }
diff --git a/test/javascripts/lib/bbcode-test.js.es6 b/test/javascripts/lib/bbcode-test.js.es6
new file mode 100644
index 00000000000..3f306877740
--- /dev/null
+++ b/test/javascripts/lib/bbcode-test.js.es6
@@ -0,0 +1,11 @@
+import { parseBBCodeTag } from 'pretty-text/engines/discourse-markdown/bbcode-block';
+
+QUnit.module("lib:pretty-text:bbcode");
+
+QUnit.test("block with multiple quoted attributes", assert => {
+  const parsed = parseBBCodeTag('[test one="foo" two="bar bar"]', 0, 30);
+
+  assert.equal(parsed.tag, "test");
+  assert.equal(parsed.attrs.one, "foo");
+  assert.equal(parsed.attrs.two, "bar bar");
+});
diff --git a/test/javascripts/lib/category-badge-test.js.es6 b/test/javascripts/lib/category-badge-test.js.es6
index 6dc1ba2c513..5fdc807dec4 100644
--- a/test/javascripts/lib/category-badge-test.js.es6
+++ b/test/javascripts/lib/category-badge-test.js.es6
@@ -26,7 +26,7 @@ QUnit.test("Regular categoryBadge", assert => {
   const label = tag.children[1];
   assert.equal(label.attributes.title, 'cool description', 'it has the correct title');
 
-  assert.equal(label.children[0].data, 'hello', 'it has the category name');
+  assert.equal(label.children[0].children[0].data, 'hello', 'it has the category name');
 });
 
 QUnit.test("undefined color", assert => {
@@ -45,3 +45,28 @@ QUnit.test("allowUncategorized", assert => {
   assert.blank(categoryBadgeHTML(uncategorized), "it doesn't return HTML for uncategorized by default");
   assert.present(categoryBadgeHTML(uncategorized, {allowUncategorized: true}), "it returns HTML");
 });
+
+QUnit.test("category names are wrapped in dir-spans", assert => {
+  Discourse.SiteSettings.support_mixed_text_direction = true;
+  const store = createStore();
+  const rtlCategory = store.createRecord('category', {
+    name: 'תכנות עם Ruby',
+    id: 123,
+    description_text: 'cool description',
+    color: 'ff0',
+    text_color: 'f00'
+  });
+
+  const ltrCategory = store.createRecord('category', {
+    name: 'Programming in Ruby',
+    id: 234
+  });
+
+  let tag = parseHTML(categoryBadgeHTML(rtlCategory))[0];
+  let dirSpan = tag.children[1].children[0];
+  assert.equal(dirSpan.attributes.dir, 'rtl');
+
+  tag = parseHTML(categoryBadgeHTML(ltrCategory))[0];
+  dirSpan = tag.children[1].children[0];
+  assert.equal(dirSpan.attributes.dir, 'ltr');
+});
diff --git a/test/javascripts/lib/formatter-test.js.es6 b/test/javascripts/lib/formatter-test.js.es6
index 1d3d4e43fc1..e7299cb464a 100644
--- a/test/javascripts/lib/formatter-test.js.es6
+++ b/test/javascripts/lib/formatter-test.js.es6
@@ -211,6 +211,10 @@ QUnit.test("number", assert => {
   assert.equal(number(NaN), "0", "it returns 0 for NaN");
   assert.equal(number(3333), "3.3k", "it abbreviates thousands");
   assert.equal(number(2499999), "2.5M", "it abbreviates millions");
+  assert.equal(number(1000000), "1.0M", "it abbreviates a million");
+  assert.equal(number(999999), "999k", "it abbreviates hundreds of thousands");
+  assert.equal(number(18.2), "18", "it returns a float number converted to an integer as a string");
+  assert.equal(number(18.6, { ceil: true }), "19", "it ceils the value if requested");
 });
 
 QUnit.test("durationTiny", assert => {
diff --git a/test/javascripts/lib/i18n-test.js.es6 b/test/javascripts/lib/i18n-test.js.es6
index 314c4cc6938..e653a8d0ca3 100644
--- a/test/javascripts/lib/i18n-test.js.es6
+++ b/test/javascripts/lib/i18n-test.js.es6
@@ -1,17 +1,30 @@
 QUnit.module("lib:i18n", {
   _locale: I18n.locale,
+  _fallbackLocale: I18n.fallbackLocale,
   _translations: I18n.translations,
 
   beforeEach() {
     I18n.locale = "fr";
 
     I18n.translations = {
+      "fr_FOO": {
+        "js": {
+          "topic": {
+            "reply": {
+              "title": "Foo"
+            }
+          },
+        }
+      },
       "fr": {
         "js": {
           "hello": "Bonjour",
           "topic": {
             "reply": {
-              "title": "Répondre",
+              "title": "Répondre"
+            },
+            "share": {
+              "title": "Partager"
             }
           },
           "character_count": {
@@ -56,6 +69,7 @@ QUnit.module("lib:i18n", {
 
   afterEach() {
     I18n.locale = this._locale;
+    I18n.fallbackLocale = this._fallbackLocale;
     I18n.translations = this._translations;
   }
 });
@@ -92,4 +106,13 @@ QUnit.test("pluralizations", assert => {
   assert.equal(I18n.t("word_count", { count: 3 }), "3 words");
   assert.equal(I18n.t("word_count", { count: 10 }), "10 words");
   assert.equal(I18n.t("word_count", { count: 100 }), "100 words");
-});
\ No newline at end of file
+});
+
+QUnit.test("fallback", assert => {
+  I18n.locale = "fr_FOO";
+  I18n.fallbackLocale = "fr";
+
+  assert.equal(I18n.t("topic.reply.title"), "Foo", "uses locale translations when they exist");
+  assert.equal(I18n.t("topic.share.title"), "Partager", "falls back to fallbackLocale translations when they exist");
+  assert.equal(I18n.t("topic.reply.help"), "begin composing a reply to this topic", "falls back to English translations");
+});
diff --git a/test/javascripts/lib/pretty-text-test.js.es6 b/test/javascripts/lib/pretty-text-test.js.es6
index 65803e8b188..892a9aca49c 100644
--- a/test/javascripts/lib/pretty-text-test.js.es6
+++ b/test/javascripts/lib/pretty-text-test.js.es6
@@ -8,13 +8,15 @@ QUnit.module("lib:pretty-text");
 const rawOpts = {
   siteSettings: {
     enable_emoji: true,
+    enable_emoji_shortcuts: true,
     enable_mentions: true,
     emoji_set: 'emoji_one',
     highlighted_languages: 'json|ruby|javascript',
     default_code_lang: 'auto',
-    censored_pattern: '\\d{3}-\\d{4}|tech\\w*'
+    enable_markdown_linkify: true,
+    markdown_linkify_tlds: 'com'
   },
-  censoredWords: 'shucks|whiz|whizzer|a**le',
+  censoredWords: 'shucks|whiz|whizzer|a**le|badword*',
   getURL: url => url
 };
 
@@ -65,7 +67,7 @@ QUnit.test("basic cooking", assert => {
   assert.cooked("__bold__", "<p><strong>bold</strong></p>", "it bolds text.");
   assert.cooked("*trout*", "<p><em>trout</em></p>", "it italicizes text.");
   assert.cooked("_trout_", "<p><em>trout</em></p>", "it italicizes text.");
-  assert.cooked("***hello***", "<p><strong><em>hello</em></strong></p>", "it can do bold and italics at once.");
+  assert.cooked("***hello***", "<p><em><strong>hello</strong></em></p>", "it can do bold and italics at once.");
   assert.cooked("word_with_underscores", "<p>word_with_underscores</p>", "it doesn't do intraword italics");
   assert.cooked("common/_special_font_face.html.erb", "<p>common/_special_font_face.html.erb</p>", "it doesn't intraword with a slash");
   assert.cooked("hello \\*evil\\*", "<p>hello *evil*</p>", "it supports escaping of asterisks");
@@ -233,7 +235,7 @@ QUnit.test("Quotes", assert => {
 
   assert.cookedOptions("[quote=\"eviltrout, post: 1\"]\na quote\n\nsecond line\n\nthird line\n[/quote]",
                 { topicId: 2 },
-    `<aside class=\"quote\" data-post=\"1\">
+    `<aside class=\"quote no-group\" data-post=\"1\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
  eviltrout:</div>
@@ -247,7 +249,7 @@ QUnit.test("Quotes", assert => {
 
   assert.cookedOptions("[quote=\"bob, post:1\"]\nmy quote\n[/quote]",
                 { topicId: 2, lookupAvatar: function() { } },
-    `<aside class=\"quote\" data-post=\"1\">
+    `<aside class=\"quote no-group\" data-post=\"1\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
  bob:</div>
@@ -258,10 +260,10 @@ QUnit.test("Quotes", assert => {
                 "includes no avatar if none is found");
 
   assert.cooked(`[quote]\na\n\n[quote]\nb\n[/quote]\n[/quote]`,
-    `<aside class=\"quote\">
+    `<aside class=\"quote no-group\">
 <blockquote>
 <p>a</p>
-<aside class=\"quote\">
+<aside class=\"quote no-group\">
 <blockquote>
 <p>b</p>
 </blockquote>
@@ -598,12 +600,35 @@ QUnit.test("censoring", assert => {
          "it won't break links by censoring them.");
 
   assert.cooked("Call techapj the computer whiz at 555-555-1234 for free help.",
-         "<p>Call ■■■■■■■ the computer ■■■■ at 555-■■■■■■■■ for free help.</p>",
+         "<p>Call techapj the computer ■■■■ at 555-555-1234 for free help.</p>",
          "uses both censored words and patterns from site settings");
 
   assert.cooked("I have a pen, I have an a**le",
          "<p>I have a pen, I have an ■■■■■</p>",
          "it escapes regexp chars");
+  assert.cooked("No badword or apple here plz.",
+    "<p>No ■■■■■■■ or ■■■■■ here plz.</p>",
+    "it handles * as wildcard");
+
+  assert.cookedOptions(
+    "Pleased to meet you, but pleeeease call me later, xyz123",
+    { siteSettings: {
+        watched_words_regular_expressions: true
+      },
+      censoredWords: 'xyz*|plee+ase'
+    },
+    "<p>Pleased to meet you, but ■■■■ call me later, ■■■■123</p>",
+    "supports words as regular expressions");
+
+  assert.cookedOptions(
+    "Meet downtown in your town at the townhouse on Main St.",
+    { siteSettings: {
+        watched_words_regular_expressions: true
+      },
+      censoredWords: '\\btown\\b'
+    },
+    "<p>Meet downtown in your ■■■■ at the townhouse on Main St.</p>",
+    "supports words as regular expressions");
 });
 
 QUnit.test("code blocks/spans hoisting", assert => {
@@ -692,27 +717,23 @@ QUnit.test("quotes", assert => {
               "[quote=\"eviltrout, post:1, topic:2, full:true\"]\n**lorem** ipsum\n[/quote]\n\n",
                "keeps BBCode formatting");
 
-  formatQuote("this is <not> a bug",
-              "[quote=\"eviltrout, post:1, topic:2\"]\nthis is &lt;not&gt; a bug\n[/quote]\n\n",
-              "it escapes the contents of the quote");
-
   assert.cooked("[quote]\ntest\n[/quote]",
-         "<aside class=\"quote\">\n<blockquote>\n<p>test</p>\n</blockquote>\n</aside>",
+         "<aside class=\"quote no-group\">\n<blockquote>\n<p>test</p>\n</blockquote>\n</aside>",
          "it supports quotes without params");
 
   assert.cooked("[quote]\n*test*\n[/quote]",
-         "<aside class=\"quote\">\n<blockquote>\n<p><em>test</em></p>\n</blockquote>\n</aside>",
+         "<aside class=\"quote no-group\">\n<blockquote>\n<p><em>test</em></p>\n</blockquote>\n</aside>",
          "it doesn't insert a new line for italics");
 
   assert.cooked("[quote=,script='a'><script>alert('test');//':a]\n[/quote]",
-         "<aside class=\"quote\">\n<blockquote></blockquote>\n</aside>",
+         "<aside class=\"quote no-group\">\n<blockquote></blockquote>\n</aside>",
          "It will not create a script tag within an attribute");
 });
 
 QUnit.test("quote formatting", assert => {
 
   assert.cooked("[quote=\"EvilTrout, post:123, topic:456, full:true\"]\n[sam]\n[/quote]",
-`<aside class=\"quote\" data-post=\"123\" data-topic=\"456\" data-full=\"true\">
+`<aside class=\"quote no-group\" data-post=\"123\" data-topic=\"456\" data-full=\"true\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
  EvilTrout:</div>
@@ -723,7 +744,7 @@ QUnit.test("quote formatting", assert => {
           "it allows quotes with [] inside");
 
   assert.cooked("[quote=\"eviltrout, post:1, topic:1\"]\nabc\n[/quote]",
-`<aside class=\"quote\" data-post=\"1\" data-topic=\"1\">
+`<aside class=\"quote no-group\" data-post=\"1\" data-topic=\"1\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
  eviltrout:</div>
@@ -734,7 +755,7 @@ QUnit.test("quote formatting", assert => {
          "renders quotes properly");
 
   assert.cooked("[quote=\"eviltrout, post:1, topic:1\"]\nabc\n[/quote]\nhello",
-`<aside class=\"quote\" data-post=\"1\" data-topic=\"1\">
+`<aside class=\"quote no-group\" data-post=\"1\" data-topic=\"1\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
  eviltrout:</div>
@@ -746,12 +767,12 @@ QUnit.test("quote formatting", assert => {
          "handles new lines properly");
 
   assert.cooked("[quote=\"Alice, post:1, topic:1\"]\n[quote=\"Bob, post:2, topic:1\"]\n[/quote]\n[/quote]",
-`<aside class=\"quote\" data-post=\"1\" data-topic=\"1\">
+`<aside class=\"quote no-group\" data-post=\"1\" data-topic=\"1\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
  Alice:</div>
 <blockquote>
-<aside class=\"quote\" data-post=\"2\" data-topic=\"1\">
+<aside class=\"quote no-group\" data-post=\"2\" data-topic=\"1\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
  Bob:</div>
@@ -763,7 +784,7 @@ QUnit.test("quote formatting", assert => {
 
   assert.cooked("[quote=\"Alice, post:1, topic:1\"]\n[quote=\"Bob, post:2, topic:1\"]\n[/quote]",
 `<p>[quote=&quot;Alice, post:1, topic:1&quot;]</p>
-<aside class=\"quote\" data-post=\"2\" data-topic=\"1\">
+<aside class=\"quote no-group\" data-post=\"2\" data-topic=\"1\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
  Bob:</div>
@@ -773,7 +794,7 @@ QUnit.test("quote formatting", assert => {
          "handles mismatched nested quote tags (non greedy)");
 
   assert.cooked("[quote=\"Alice, post:1, topic:1\"]\n```javascript\nvar foo ='foo';\nvar bar = 'bar';\n```\n[/quote]",
-`<aside class=\"quote\" data-post=\"1\" data-topic=\"1\">
+`<aside class=\"quote no-group\" data-post=\"1\" data-topic=\"1\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
  Alice:</div>
@@ -786,7 +807,7 @@ var bar = 'bar';
           "quotes can have code blocks without leading newline");
 
   assert.cooked("[quote=\"Alice, post:1, topic:1\"]\n\n```javascript\nvar foo ='foo';\nvar bar = 'bar';\n```\n[/quote]",
-`<aside class=\"quote\" data-post=\"1\" data-topic=\"1\">
+`<aside class=\"quote no-group\" data-post=\"1\" data-topic=\"1\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
  Alice:</div>
@@ -802,7 +823,7 @@ var bar = 'bar';
 QUnit.test("quotes with trailing formatting", assert => {
   const result = new PrettyText(defaultOpts).cook("[quote=\"EvilTrout, post:123, topic:456, full:true\"]\nhello\n[/quote]\n*Test*");
   assert.equal(result,
-`<aside class=\"quote\" data-post=\"123\" data-topic=\"456\" data-full=\"true\">
+`<aside class=\"quote no-group\" data-post=\"123\" data-topic=\"456\" data-full=\"true\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
  EvilTrout:</div>
diff --git a/test/javascripts/lib/text-direction-test.js.es6 b/test/javascripts/lib/text-direction-test.js.es6
new file mode 100644
index 00000000000..c8ddee262b8
--- /dev/null
+++ b/test/javascripts/lib/text-direction-test.js.es6
@@ -0,0 +1,23 @@
+import { isRTL, isLTR } from 'discourse/lib/text-direction';
+
+QUnit.module('lib:text-direction');
+
+QUnit.test("isRTL", assert => {
+  // Hebrew
+  assert.equal(isRTL('זה מבחן'), true);
+
+  // Arabic
+  assert.equal(isRTL('هذا اختبار'), true);
+
+  // Persian
+  assert.equal(isRTL('این یک امتحان است'), true);
+
+  assert.equal(isRTL('This is a test'), false);
+  assert.equal(isRTL(''), false);
+});
+
+QUnit.test("isLTR", assert => {
+  assert.equal(isLTR('This is a test'), true);
+  assert.equal(isLTR('זה מבחן'), false);
+});
+
diff --git a/test/javascripts/lib/to-markdown-test.js.es6 b/test/javascripts/lib/to-markdown-test.js.es6
index 3c2f04566b8..6336da48ad1 100644
--- a/test/javascripts/lib/to-markdown-test.js.es6
+++ b/test/javascripts/lib/to-markdown-test.js.es6
@@ -104,7 +104,7 @@ QUnit.test("converts table tags", assert => {
       <tbody>
         <tr><td>Lorem</td><td>ipsum</td></tr>
         <tr><td><b>dolor</b></td> <td><i>sit amet</i></td> </tr>
-        
+
         </tbody>
 </table>
   `;
@@ -119,7 +119,7 @@ QUnit.test("converts table tags", assert => {
   assert.equal(toMarkdown(html), markdown);
 });
 
-QUnit.test("returns empty string if table format not supported", assert => {
+QUnit.test("replace pipes with spaces if table format not supported", assert => {
   let html = `<table>
     <thead> <tr><th>Headi<br><br>ng 1</th><th>Head 2</th></tr> </thead>
       <tbody>
@@ -127,7 +127,8 @@ QUnit.test("returns empty string if table format not supported", assert => {
         <tr><td><a href="http://example.com"><img src="http://dolor.com/image.png" /></a></td> <td><i>sit amet</i></td></tr></tbody>
 </table>
   `;
-  assert.equal(toMarkdown(html), "");
+  let markdown = `Headi\n\nng 1 Head 2\nLorem ipsum\n[![](http://dolor.com/image.png)](http://example.com) *sit amet*`;
+  assert.equal(toMarkdown(html), markdown);
 
   html = `<table>
     <thead> <tr><th>Heading 1</th></tr> </thead>
@@ -136,10 +137,12 @@ QUnit.test("returns empty string if table format not supported", assert => {
         <tr><td><i>sit amet</i></td></tr></tbody>
 </table>
   `;
-  assert.equal(toMarkdown(html), "");
+  markdown = `Heading 1\nLorem\n*sit amet*`;
+  assert.equal(toMarkdown(html), markdown);
 
-  html = `<table><tr><td>Lorem</td><td><i>sit amet</i></td></tr></table>`;
-  assert.equal(toMarkdown(html), "");
+  html = `<table><tr><td>Lorem</td><td><strong>sit amet</strong></td></tr></table>`;
+  markdown = `Lorem **sit amet**`;
+  assert.equal(toMarkdown(html), markdown);
 });
 
 QUnit.test("converts img tag", assert => {
@@ -178,6 +181,9 @@ QUnit.test("supporting html tags by keeping them", assert => {
   html = `Lorem <del>ipsum dolor</del> sit.`;
   assert.equal(toMarkdown(html), html);
 
+  html = `Have you tried clicking the <kbd>Help Me!</kbd> button?`;
+  assert.equal(toMarkdown(html), html);
+
   html = `Lorem <a href="http://example.com"><del>ipsum \n\n\n dolor</del> sit.</a>`;
   output = `Lorem [<del>ipsum dolor</del> sit.](http://example.com)`;
   assert.equal(toMarkdown(html), output);
@@ -236,3 +242,63 @@ QUnit.test("converts ol list tag", assert => {
   const markdown = `Testing\n\n1. Item 1\n2. Item 2\n  100. Sub Item 1\n  101. Sub Item 2\n3. Item 3`;
   assert.equal(toMarkdown(html), markdown);
 });
+
+QUnit.test("converts list tag from word", assert => {
+  const html = `Sample<!--StartFragment-->
+  <p class=MsoListParagraphCxSpFirst style='text-indent:-.25in;mso-list:l0 level1 lfo1'>
+    <![if !supportLists]>
+    <span style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family:  Symbol;mso-bidi-font-weight:bold'>
+      <span style='mso-list:Ignore'>·
+        <span style='font:7.0pt "Times New Roman"'> </span>
+      </span>
+    </span>
+    <![endif]>
+    <b>Item 1
+      <o:p></o:p>
+    </b>
+  </p>
+  <p class=MsoListParagraphCxSpMiddle style='text-indent:-.25in;mso-list:l0 level2 lfo1'>
+    <![if !supportLists]>
+    <span style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family:  Symbol;mso-bidi-font-style:italic'>
+      <span style='mso-list:Ignore'>·
+        <span style='font:7.0pt "Times New Roman"'> </span>
+      </span>
+    </span>
+    <![endif]>
+    <i>Item 2
+      <o:p></o:p>
+    </i>
+  </p>
+  <p class=MsoListParagraphCxSpMiddle style='text-indent:-.25in;mso-list:l0 level3 lfo1'>
+    <![if !supportLists]>
+    <span style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family:  Symbol'>
+      <span style='mso-list:Ignore'>·
+        <span style='font:7.0pt "Times New Roman"'> </span>
+      </span>
+    </span>
+    <![endif]>Item 3 </p>
+  <p class=MsoListParagraphCxSpLast style='text-indent:-.25in;mso-list:l0 level1 lfo1'>
+    <![if !supportLists]>
+    <span style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family:  Symbol'>
+      <span style='mso-list:Ignore'>·
+        <span style='font:7.0pt "Times New Roman"'> </span>
+      </span>
+    </span>
+    <![endif]>Item 4</p>
+  <!--EndFragment-->List`;
+  const markdown = `Sample\n\n* **Item 1**\n  * *Item 2*\n    * Item 3\n* Item 4\n\nList`;
+  assert.equal(toMarkdown(html), markdown);
+});
+
+QUnit.test("keeps mention/hash class", assert => {
+  const html = `
+    <p>User mention: <a class="mention" href="/u/discourse">@discourse</a></p>
+    <p>Group mention: <a class="mention-group" href="/groups/discourse">@discourse-group</a></p>
+    <p>Category link: <a class="hashtag" href="/c/foo/1">#<span>foo</span></a></p>
+    <p>Sub-category link: <a class="hashtag" href="/c/foo/bar/2">#<span>foo:bar</span></a></p>
+  `;
+
+  const markdown = `User mention: @discourse\n\nGroup mention: @discourse-group\n\nCategory link: #foo\n\nSub-category link: #foo:bar`;
+
+  assert.equal(toMarkdown(html), markdown);
+});
diff --git a/test/javascripts/lib/user-search-test.js.es6 b/test/javascripts/lib/user-search-test.js.es6
index 9cdb8302216..a34f1143950 100644
--- a/test/javascripts/lib/user-search-test.js.es6
+++ b/test/javascripts/lib/user-search-test.js.es6
@@ -47,6 +47,10 @@ QUnit.module("lib:user-search", {
             }
           ],
           groups: [
+            {
+              "name": "bob",
+              "usernames": []
+            },
             {
               "name": "team",
               "usernames": []
@@ -57,8 +61,7 @@ QUnit.module("lib:user-search", {
   }
 });
 
-QUnit.test("it places groups unconditionally for exact match", assert => {
-  return userSearch({term: 'Team'}).then((results)=>{
-     assert.equal(results[results.length-1]["name"], "team");
-  });
-});
\ No newline at end of file
+QUnit.test("it places groups unconditionally for exact match", async assert => {
+  let results = await userSearch({term: 'Team'});
+  assert.equal(results[results.length-1]["name"], "team");
+});
diff --git a/test/javascripts/lib/utilities-test.js.es6 b/test/javascripts/lib/utilities-test.js.es6
index 00e00f4c198..9b5f4e4265a 100644
--- a/test/javascripts/lib/utilities-test.js.es6
+++ b/test/javascripts/lib/utilities-test.js.es6
@@ -14,7 +14,8 @@ import {
   validateUploadedFiles,
   getUploadMarkdown,
   caretRowCol,
-  setCaretPosition
+  setCaretPosition,
+  fillMissingDates
 } from 'discourse/lib/utilities';
 import * as Utilities from 'discourse/lib/utilities';
 
@@ -122,6 +123,7 @@ var testUploadMarkdown = function(filename) {
 
 QUnit.test("getUploadMarkdown", assert => {
   assert.equal(testUploadMarkdown("lolcat.gif"),'![lolcat|100x200](/uploads/123/abcdef.ext)');
+  assert.equal(testUploadMarkdown("[foo|bar].png"),'![%5Bfoo%7Cbar%5D|100x200](/uploads/123/abcdef.ext)');
   assert.ok(testUploadMarkdown("important.txt") === '<a class="attachment" href="/uploads/123/abcdef.ext">important.txt</a> (42 Bytes)\n');
 });
 
@@ -253,3 +255,12 @@ QUnit.test("caretRowCol", assert => {
 
   document.body.removeChild(textarea);
 });
+
+QUnit.test("fillMissingDates", assert => {
+  const startDate = "2017-11-12"; // YYYY-MM-DD
+  const endDate = "2017-12-12"; // YYYY-MM-DD
+  const data = '[{"x":"2017-11-12","y":3},{"x":"2017-11-27","y":2},{"x":"2017-12-06","y":9},{"x":"2017-12-11","y":2}]';
+
+  assert.equal(fillMissingDates(JSON.parse(data), startDate, endDate).length, 31,
+        "it returns a JSON array with 31 dates");
+});
diff --git a/test/javascripts/mixins/grant-badge-controller-test.js.es6 b/test/javascripts/mixins/grant-badge-controller-test.js.es6
new file mode 100644
index 00000000000..d1e34cd133a
--- /dev/null
+++ b/test/javascripts/mixins/grant-badge-controller-test.js.es6
@@ -0,0 +1,38 @@
+import GrantBadgeControllerMixin from 'discourse/mixins/grant-badge-controller';
+import Badge from 'discourse/models/badge';
+
+QUnit.module('mixin:grant-badge-controller', {
+  before: function() {
+    this.GrantBadgeController = Ember.Controller.extend(GrantBadgeControllerMixin);
+
+    this.badgeFirst = Badge.create({ id: 3, name: 'A Badge', enabled: true, manually_grantable: true });
+    this.badgeMiddle = Badge.create({ id: 1, name: 'My Badge', enabled: true, manually_grantable: true });
+    this.badgeLast = Badge.create({ id: 2, name: 'Zoo Badge', enabled: true, manually_grantable: true });
+    this.badgeDisabled = Badge.create({ id: 4, name: 'Disabled Badge', enabled: false, manually_grantable: true });
+    this.badgeAutomatic = Badge.create({ id: 5, name: 'Automatic Badge', enabled: true, manually_grantable: false });
+  },
+
+  beforeEach: function() {
+    this.subject = this.GrantBadgeController.create({
+      userBadges: [],
+      allBadges: [this.badgeLast, this.badgeFirst, this.badgeMiddle, this.badgeDisabled, this.badgeAutomatic],
+    });
+  }
+});
+
+QUnit.test('grantableBadges', function(assert) {
+  const sortedNames = [this.badgeFirst.name, this.badgeMiddle.name, this.badgeLast.name];
+  const badgeNames = this.subject.get('grantableBadges').map(badge => badge.name);
+
+  assert.not(badgeNames.includes(this.badgeDisabled), 'excludes disabled badges');
+  assert.not(badgeNames.includes(this.badgeAutomatic), 'excludes automatic badges');
+  assert.deepEqual(badgeNames, sortedNames, 'sorts badges by name');
+});
+
+QUnit.test('selectedBadgeGrantable', function(assert) {
+  this.subject.set('selectedBadgeId', this.badgeDisabled.id);
+  assert.not(this.subject.get('selectedBadgeGrantable'));
+
+  this.subject.set('selectedBadgeId', this.badgeFirst.id);
+  assert.ok(this.subject.get('selectedBadgeGrantable'));
+});
diff --git a/test/javascripts/models/composer-test.js.es6 b/test/javascripts/models/composer-test.js.es6
index 02475ddb4b6..4add3a84525 100644
--- a/test/javascripts/models/composer-test.js.es6
+++ b/test/javascripts/models/composer-test.js.es6
@@ -38,7 +38,7 @@ QUnit.test('missingReplyCharacters', assert => {
 
   missingReplyCharacters('hi', false, false, Discourse.SiteSettings.min_post_length - 2, 'too short public post');
   missingReplyCharacters('hi', false, true,  Discourse.SiteSettings.min_first_post_length - 2, 'too short first post');
-  missingReplyCharacters('hi', true, false,  Discourse.SiteSettings.min_private_message_post_length - 2, 'too short private message');
+  missingReplyCharacters('hi', true, false,  Discourse.SiteSettings.min_personal_message_post_length - 2, 'too short private message');
 
   const link = "http://imgur.com/gallery/grxX8";
   const composer = createComposer({ canEditTopicFeaturedLink: true, title: link, featuredLink: link, reply: link });
@@ -53,7 +53,7 @@ QUnit.test('missingTitleCharacters', assert => {
   };
 
   missingTitleCharacters('hi', false, Discourse.SiteSettings.min_topic_title_length - 2, 'too short post title');
-  missingTitleCharacters('z', true,  Discourse.SiteSettings.min_private_message_title_length - 1, 'too short pm title');
+  missingTitleCharacters('z', true,  Discourse.SiteSettings.min_personal_message_title_length - 1, 'too short pm title');
 });
 
 QUnit.test('replyDirty', assert => {
@@ -130,7 +130,7 @@ QUnit.test("Title length for regular topics", assert => {
 });
 
 QUnit.test("Title length for private messages", assert => {
-  Discourse.SiteSettings.min_private_message_title_length = 5;
+  Discourse.SiteSettings.min_personal_message_title_length = 5;
   Discourse.SiteSettings.max_topic_title_length = 10;
   const composer = createComposer({action: Composer.PRIVATE_MESSAGE});
 
@@ -145,7 +145,7 @@ QUnit.test("Title length for private messages", assert => {
 });
 
 QUnit.test("Title length for private messages", assert => {
-  Discourse.SiteSettings.min_private_message_title_length = 5;
+  Discourse.SiteSettings.min_personal_message_title_length = 5;
   Discourse.SiteSettings.max_topic_title_length = 10;
   const composer = createComposer({action: Composer.PRIVATE_MESSAGE});
 
diff --git a/test/javascripts/models/report-test.js.es6 b/test/javascripts/models/report-test.js.es6
index 1e4f73d89ea..6af13105731 100644
--- a/test/javascripts/models/report-test.js.es6
+++ b/test/javascripts/models/report-test.js.es6
@@ -1,63 +1,193 @@
-import Report from 'admin/models/report';
+import Report from "admin/models/report";
 
 QUnit.module("Report");
 
 function reportWithData(data) {
   return Report.create({
-    type: 'topics',
-    data: _.map(data, function(val, index) {
-      return { x: moment().subtract(index, "days").format('YYYY-MM-DD'), y: val };
+    type: "topics",
+    data: _.map(data, (val, index) => {
+      return { x: moment().subtract(index, "days").format("YYYY-MM-DD"), y: val };
     })
   });
 }
 
 QUnit.test("counts", assert => {
-  var report = reportWithData([5, 4, 3, 2, 1, 100, 99, 98, 1000]);
+  const report = reportWithData([5, 4, 3, 2, 1, 100, 99, 98, 1000]);
 
-  assert.equal(report.get('todayCount'), 5);
-  assert.equal(report.get('yesterdayCount'), 4);
+  assert.equal(report.get("todayCount"), 5);
+  assert.equal(report.get("yesterdayCount"), 4);
   assert.equal(report.valueFor(2, 4), 6, "adds the values for the given range of days, inclusive");
-  assert.equal(report.get('lastSevenDaysCount'), 307, "sums 7 days excluding today");
+  assert.equal(report.get("lastSevenDaysCount"), 307, "sums 7 days excluding today");
 
   report.set("method", "average");
   assert.equal(report.valueFor(2, 4), 2, "averages the values for the given range of days");
 });
 
 QUnit.test("percentChangeString", assert => {
-  var report = reportWithData([]);
+  const report = reportWithData([]);
 
-  assert.equal(report.percentChangeString(8, 5), "+60%", "value increased");
-  assert.equal(report.percentChangeString(2, 8), "-75%", "value decreased");
+  assert.equal(report.percentChangeString(5, 8), "+60%", "value increased");
+  assert.equal(report.percentChangeString(8, 2), "-75%", "value decreased");
   assert.equal(report.percentChangeString(8, 8), "0%", "value unchanged");
-  assert.blank(report.percentChangeString(8, 0), "returns blank when previous value was 0");
-  assert.equal(report.percentChangeString(0, 8), "-100%", "yesterday was 0");
+  assert.blank(report.percentChangeString(0, 8), "returns blank when previous value was 0");
+  assert.equal(report.percentChangeString(8, 0), "-100%", "yesterday was 0");
   assert.blank(report.percentChangeString(0, 0), "returns blank when both were 0");
 });
 
 QUnit.test("yesterdayCountTitle with valid values", assert => {
-  var title = reportWithData([6,8,5,2,1]).get('yesterdayCountTitle');
-  assert.ok(title.indexOf('+60%') !== -1);
+  const title = reportWithData([6,8,5,2,1]).get("yesterdayCountTitle");
+  assert.ok(title.indexOf("+60%") !== -1);
   assert.ok(title.match(/Was 5/));
 });
 
 QUnit.test("yesterdayCountTitle when two days ago was 0", assert => {
-  var title = reportWithData([6,8,0,2,1]).get('yesterdayCountTitle');
-  assert.equal(title.indexOf('%'), -1);
+  const title = reportWithData([6,8,0,2,1]).get("yesterdayCountTitle");
+  assert.equal(title.indexOf("%"), -1);
   assert.ok(title.match(/Was 0/));
 });
 
 
-QUnit.test("sevenDayCountTitle", assert => {
-  var title = reportWithData([100,1,1,1,1,1,1,1,2,2,2,2,2,2,2,100,100]).get('sevenDayCountTitle');
+QUnit.test("sevenDaysCountTitle", assert => {
+  const title = reportWithData([100,1,1,1,1,1,1,1,2,2,2,2,2,2,2,100,100]).get("sevenDaysCountTitle");
   assert.ok(title.match(/-50%/));
   assert.ok(title.match(/Was 14/));
 });
 
-QUnit.test("thirtyDayCountTitle", assert => {
-  var report = reportWithData([5,5,5,5]);
-  report.set('prev30Days', 10);
-  var title = report.get('thirtyDayCountTitle');
+QUnit.test("thirtyDaysCountTitle", assert => {
+  const report = reportWithData([5,5,5,5]);
+  report.set("prev30Days", 10);
+  const title = report.get("thirtyDaysCountTitle");
 
-  assert.ok(title.indexOf('+50%') !== -1);
+  assert.ok(title.indexOf("+50%") !== -1);
   assert.ok(title.match(/Was 10/));
-});
\ No newline at end of file
+});
+
+QUnit.test("sevenDaysTrend", assert => {
+  let report;
+  let trend;
+
+  report = reportWithData([0, 1,1,1,1,1,1,1, 1,1,1,1,1,1,1]);
+  trend = report.get("sevenDaysTrend");
+  assert.ok(trend === "no-change");
+
+  report = reportWithData([0, 1,1,1,1,1,1,1, 0,0,0,0,0,0,0]);
+  trend = report.get("sevenDaysTrend");
+  assert.ok(trend === "high-trending-up");
+
+  report = reportWithData([0, 1,1,1,1,1,1,1, 1,1,1,1,1,1,0]);
+  trend = report.get("sevenDaysTrend");
+  assert.ok(trend === "trending-up");
+
+  report = reportWithData([0, 0,0,0,0,0,0,0, 1,1,1,1,1,1,1]);
+  trend = report.get("sevenDaysTrend");
+  assert.ok(trend === "high-trending-down");
+
+  report = reportWithData([0, 1,1,1,1,1,1,0, 1,1,1,1,1,1,1]);
+  trend = report.get("sevenDaysTrend");
+  assert.ok(trend === "trending-down");
+});
+
+QUnit.test("yesterdayTrend", assert => {
+  let report;
+  let trend;
+
+  report = reportWithData([0, 1, 1]);
+  trend = report.get("yesterdayTrend");
+  assert.ok(trend === "no-change");
+
+  report = reportWithData([0, 1, 0]);
+  trend = report.get("yesterdayTrend");
+  assert.ok(trend === "high-trending-up");
+
+  report = reportWithData([0, 1.1, 1]);
+  trend = report.get("yesterdayTrend");
+  assert.ok(trend === "trending-up");
+
+  report = reportWithData([0, 0, 1]);
+  trend = report.get("yesterdayTrend");
+  assert.ok(trend === "high-trending-down");
+
+  report = reportWithData([0, 1, 1.1]);
+  trend = report.get("yesterdayTrend");
+  assert.ok(trend === "trending-down");
+});
+
+QUnit.test("thirtyDaysTrend", assert => {
+  let report;
+  let trend;
+
+  report = reportWithData([0, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1]);
+  report.set("prev30Days", 30);
+  trend = report.get("thirtyDaysTrend");
+  assert.ok(trend === "no-change");
+
+  report = reportWithData([0, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1]);
+  report.set("prev30Days", 0);
+  trend = report.get("thirtyDaysTrend");
+  assert.ok(trend === "high-trending-up");
+
+  report = reportWithData([0, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1]);
+  report.set("prev30Days", 25);
+  trend = report.get("thirtyDaysTrend");
+  assert.ok(trend === "trending-up");
+
+  report = reportWithData([0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]);
+  report.set("prev30Days", 60);
+  trend = report.get("thirtyDaysTrend");
+  assert.ok(trend === "high-trending-down");
+
+  report = reportWithData([0, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0]);
+  report.set("prev30Days", 35);
+  trend = report.get("thirtyDaysTrend");
+  assert.ok(trend === "trending-down");
+});
+
+QUnit.test("higher is better false", assert => {
+  let report;
+  let trend;
+
+  report = reportWithData([0, 1, 0]);
+  report.set("higher_is_better", false);
+  trend = report.get("yesterdayTrend");
+  assert.ok(trend === "high-trending-down");
+
+  report = reportWithData([0, 1.1, 1]);
+  report.set("higher_is_better", false);
+  trend = report.get("yesterdayTrend");
+  assert.ok(trend === "trending-down");
+
+  report = reportWithData([0, 0, 1]);
+  report.set("higher_is_better", false);
+  trend = report.get("yesterdayTrend");
+  assert.ok(trend === "high-trending-up");
+
+  report = reportWithData([0, 1, 1.1]);
+  report.set("higher_is_better", false);
+  trend = report.get("yesterdayTrend");
+  assert.ok(trend === "trending-up");
+});
+
+QUnit.test("small variation (-2/+2% change) is no-change", assert => {
+  let report;
+  let trend;
+
+  report = reportWithData([0, 1,1,1,1,1,1,0.9, 1,1,1,1,1,1,1]);
+  trend = report.get("sevenDaysTrend");
+  assert.ok(trend === "no-change");
+
+  report = reportWithData([0, 1,1,1,1,1,1,1.1, 1,1,1,1,1,1,1]);
+  trend = report.get("sevenDaysTrend");
+  assert.ok(trend === "no-change");
+});
+
+QUnit.test("average", assert => {
+  let report;
+
+  report = reportWithData([5, 5, 5, 5, 5, 5, 5, 5]);
+
+  report.set("average", true);
+  assert.ok(report.get("lastSevenDaysCount") === 5);
+
+  report.set("average", false);
+  assert.ok(report.get("lastSevenDaysCount") === 35);
+});
diff --git a/test/javascripts/models/store-test.js.es6 b/test/javascripts/models/store-test.js.es6
index 232055bb285..e62d77dc4e0 100644
--- a/test/javascripts/models/store-test.js.es6
+++ b/test/javascripts/models/store-test.js.es6
@@ -49,14 +49,17 @@ QUnit.test('createRecord with a record as attributes returns that record from th
 
 QUnit.test('find', assert => {
   const store = createStore();
+
   return store.find('widget', 123).then(function(w) {
     assert.equal(w.get('name'), 'Trout Lure');
     assert.equal(w.get('id'), 123);
     assert.ok(!w.get('isNew'), 'found records are not new');
+    assert.equal(w.get('extras.hello'), 'world', "extra attributes are set");
 
     // A second find by id returns the same object
     store.find('widget', 123).then(function(w2) {
       assert.equal(w, w2);
+      assert.equal(w.get('extras.hello'), 'world', "extra attributes are set");
     });
   });
 });
diff --git a/test/javascripts/models/topic-test.js.es6 b/test/javascripts/models/topic-test.js.es6
index 2e9ce444365..7c33bceff03 100644
--- a/test/javascripts/models/topic-test.js.es6
+++ b/test/javascripts/models/topic-test.js.es6
@@ -98,6 +98,15 @@ QUnit.test('fancyTitle', assert => {
         "supports emojis");
 });
 
+QUnit.test('fancyTitle direction', assert => {
+  const rtlTopic = Topic.create({ fancy_title: "هذا اختبار" });
+  const ltrTopic = Topic.create({ fancy_title: "This is a test"});
+
+  Discourse.SiteSettings.support_mixed_text_direction = true;
+  assert.equal(rtlTopic.get('fancyTitle'), `<span dir="rtl">هذا اختبار</span>`, "sets the dir-span to rtl");
+  assert.equal(ltrTopic.get('fancyTitle'), `<span dir="ltr">This is a test</span>`, "sets the dir-span to ltr");
+});
+
 QUnit.test('excerpt', assert => {
   const topic = Topic.create({ excerpt: "This is a test topic :smile:", pinned: true });
 
diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index 83716217317..e5832987b45 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -169,4 +169,7 @@ Object.keys(requirejs.entries).forEach(function(entry) {
   }
 });
 
+// forces 0 as duration for all jquery animations
+jQuery.fx.off = true;
+
 resetSite();
diff --git a/test/javascripts/widgets/home-logo-test.js.es6 b/test/javascripts/widgets/home-logo-test.js.es6
index 96bd889f50f..70615b7805d 100644
--- a/test/javascripts/widgets/home-logo-test.js.es6
+++ b/test/javascripts/widgets/home-logo-test.js.es6
@@ -51,7 +51,7 @@ widgetTest('no logo', {
   },
 
   test(assert) {
-    assert.ok(this.$('h2#site-text-logo.text-logo').length === 1);
+    assert.ok(this.$('h1#site-text-logo.text-logo').length === 1);
     assert.equal(this.$('#site-text-logo').text(), title);
   }
 });
diff --git a/test/javascripts/widgets/user-menu-test.js.es6 b/test/javascripts/widgets/user-menu-test.js.es6
index 8b26410e0fa..19b4640a658 100644
--- a/test/javascripts/widgets/user-menu-test.js.es6
+++ b/test/javascripts/widgets/user-menu-test.js.es6
@@ -35,7 +35,7 @@ widgetTest('log out', {
 widgetTest('private messages - disabled', {
   template: '{{mount-widget widget="user-menu"}}',
   beforeEach() {
-    this.siteSettings.enable_private_messages = false;
+    this.siteSettings.enable_personal_messages = false;
   },
 
   test(assert) {
@@ -46,7 +46,7 @@ widgetTest('private messages - disabled', {
 widgetTest('private messages - enabled', {
   template: '{{mount-widget widget="user-menu"}}',
   beforeEach() {
-    this.siteSettings.enable_private_messages = true;
+    this.siteSettings.enable_personal_messages = true;
   },
 
   test(assert) {
diff --git a/test/smoke_test.js b/test/smoke_test.js
index 282a3e9c250..095d2b95ab2 100644
--- a/test/smoke_test.js
+++ b/test/smoke_test.js
@@ -14,34 +14,42 @@ const path = require('path');
 
 (async () => {
   const browser = await puppeteer.launch({
-    // headless: false,
-    // slowMo: 10,
+    // when debugging localy setting headless to "false" can be very helpful
+    headless: true,
     args: ["--disable-local-storage"]
   });
   const page = await browser.newPage();
 
-  page.setViewport = {
+  await page.setViewport({
     width: 1366,
     height: 768
+  });
+
+  const takeFailureScreenshot = function() {
+    const screenshotPath = `${process.env.SMOKE_TEST_SCREENSHOT_PATH || 'tmp/smoke-test-screenshots'}/smoke-test-${Date.now()}.png`;
+    console.log(`Screenshot of failure taken at ${screenshotPath}`);
+    return page.screenshot({ path: screenshotPath, fullPage: true });
   };
 
   const exec = (description, fn, assertion) => {
     const start = +new Date();
 
-    return fn.call().then(output => {
+    return fn.call().then(async output => {
       if (assertion) {
         if (assertion.call(this, output)) {
           console.log(`PASSED: ${description} - ${(+new Date()) - start}ms`);
         } else {
           console.log(`FAILED: ${description} - ${(+new Date()) - start}ms`);
+          await takeFailureScreenshot();
           console.log("SMOKE TEST FAILED");
           process.exit(1);
         }
       } else {
         console.log(`PASSED: ${description} - ${(+new Date()) - start}ms`);
       }
-    }).catch(error => {
+    }).catch(async error => {
       console.log(`ERROR (${description}): ${error.message} - ${(+new Date()) - start}ms`);
+      await takeFailureScreenshot();
       console.log("SMOKE TEST FAILED");
       process.exit(1);
     });
@@ -53,11 +61,17 @@ const path = require('path');
 
   page.on('console', msg => console.log(`PAGE LOG: ${msg.text}`));
 
+  page.on('response', resp => {
+    if (resp.status !== 200) {
+      console.log("FAILED HTTP REQUEST TO " + resp.url + " Status is: " + resp.status);
+    }
+    return resp;
+  });
+
   if (process.env.AUTH_USER && process.env.AUTH_PASSWORD) {
     await exec("basic authentication", () => {
-      return page.authenticate({
-        username: process.env.AUTH_USER,
-        password: process.env.AUTH_PASSWORD
+      return page.setExtraHTTPHeaders({
+        'Authorization': `Basic ${new Buffer(`${process.env.AUTH_USER}:${process.env.AUTH_PASSWORD}`).toString('base64')}`
       });
     });
   }
diff --git a/test/stylesheets/test_helper.css b/test/stylesheets/test_helper.css
index c42fb810acf..4e8f83a6b92 100644
--- a/test/stylesheets/test_helper.css
+++ b/test/stylesheets/test_helper.css
@@ -3,3 +3,7 @@
 .modal-backdrop {
   display: none;
 }
+
+#reply-control {
+  transition-property: none !important;
+}
diff --git a/vendor/assets/javascripts/caret_position.js b/vendor/assets/javascripts/caret_position.js
index e3f94b3597d..8a7b2e0616e 100644
--- a/vendor/assets/javascripts/caret_position.js
+++ b/vendor/assets/javascripts/caret_position.js
@@ -54,6 +54,7 @@ $.fn.caretPosition = function(options) {
     return styles.getPropertyValue(prop);
   };
 
+  const isRTL = $('html').hasClass('rtl');
   clone.css({
     border: "1px solid black",
     padding: important("padding"),
@@ -62,7 +63,8 @@ $.fn.caretPosition = function(options) {
     "overflow-y": "auto",
     "word-wrap": "break-word",
     position: "absolute",
-    left: "-7000px"
+    left: isRTL ? "auto" : "-7000px",
+    right: isRTL ? "-7000px" : "auto"
   });
 
   p.css({
diff --git a/vendor/assets/javascripts/jquery.js b/vendor/assets/javascripts/jquery.js
index 1e0ba997403..9b5206bcc60 100644
--- a/vendor/assets/javascripts/jquery.js
+++ b/vendor/assets/javascripts/jquery.js
@@ -1,20 +1,22 @@
 /*!
- * jQuery JavaScript Library v2.2.0
- * http://jquery.com/
+ * jQuery JavaScript Library v3.3.1
+ * https://jquery.com/
  *
  * Includes Sizzle.js
- * http://sizzlejs.com/
+ * https://sizzlejs.com/
  *
- * Copyright jQuery Foundation and other contributors
+ * Copyright JS Foundation and other contributors
  * Released under the MIT license
- * http://jquery.org/license
+ * https://jquery.org/license
  *
- * Date: 2016-01-08T20:02Z
+ * Date: 2018-01-20T17:24Z
  */
+( function( global, factory ) {
 
-(function( global, factory ) {
+	"use strict";
 
 	if ( typeof module === "object" && typeof module.exports === "object" ) {
+
 		// For CommonJS and CommonJS-like environments where a proper `window`
 		// is present, execute the factory and get jQuery.
 		// For environments that do not have a `window` with a `document`
@@ -35,17 +37,20 @@
 	}
 
 // Pass this if window is not defined yet
-}(typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
+} )( typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
+
+// Edge <= 12 - 13+, Firefox <=18 - 45+, IE 10 - 11, Safari 5.1 - 9+, iOS 6 - 9.1
+// throw exceptions when non-strict code (e.g., ASP.NET 4.5) accesses strict mode
+// arguments.callee.caller (trac-13335). But as of jQuery 3.0 (2016), strict mode should be common
+// enough that all such attempts are guarded in a try block.
+"use strict";
 
-// Support: Firefox 18+
-// Can't be in strict mode, several libs including ASP.NET trace
-// the stack via arguments.caller.callee and Firefox dies if
-// you try to trace through "use strict" call chains. (#13335)
-//"use strict";
 var arr = [];
 
 var document = window.document;
 
+var getProto = Object.getPrototypeOf;
+
 var slice = arr.slice;
 
 var concat = arr.concat;
@@ -60,12 +65,71 @@ var toString = class2type.toString;
 
 var hasOwn = class2type.hasOwnProperty;
 
+var fnToString = hasOwn.toString;
+
+var ObjectFunctionString = fnToString.call( Object );
+
 var support = {};
 
+var isFunction = function isFunction( obj ) {
+
+      // Support: Chrome <=57, Firefox <=52
+      // In some browsers, typeof returns "function" for HTML <object> elements
+      // (i.e., `typeof document.createElement( "object" ) === "function"`).
+      // We don't want to classify *any* DOM node as a function.
+      return typeof obj === "function" && typeof obj.nodeType !== "number";
+  };
+
+
+var isWindow = function isWindow( obj ) {
+		return obj != null && obj === obj.window;
+	};
+
+
+
+
+	var preservedScriptAttributes = {
+		type: true,
+		src: true,
+		noModule: true
+	};
+
+	function DOMEval( code, doc, node ) {
+		doc = doc || document;
+
+		var i,
+			script = doc.createElement( "script" );
+
+		script.text = code;
+		if ( node ) {
+			for ( i in preservedScriptAttributes ) {
+				if ( node[ i ] ) {
+					script[ i ] = node[ i ];
+				}
+			}
+		}
+		doc.head.appendChild( script ).parentNode.removeChild( script );
+	}
+
+
+function toType( obj ) {
+	if ( obj == null ) {
+		return obj + "";
+	}
+
+	// Support: Android <=2.3 only (functionish RegExp)
+	return typeof obj === "object" || typeof obj === "function" ?
+		class2type[ toString.call( obj ) ] || "object" :
+		typeof obj;
+}
+/* global Symbol */
+// Defining this global in .eslintrc.json would create a danger of using the global
+// unguarded in another place, it seems safer to define global only for this module
+
 
 
 var
-	version = "2.2.0",
+	version = "3.3.1",
 
 	// Define a local copy of jQuery
 	jQuery = function( selector, context ) {
@@ -75,18 +139,9 @@ var
 		return new jQuery.fn.init( selector, context );
 	},
 
-	// Support: Android<4.1
+	// Support: Android <=4.0 only
 	// Make sure we trim BOM and NBSP
-	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
-
-	// Matches dashed string for camelizing
-	rmsPrefix = /^-ms-/,
-	rdashAlpha = /-([\da-z])/gi,
-
-	// Used by jQuery.camelCase as callback to replace()
-	fcamelCase = function( all, letter ) {
-		return letter.toUpperCase();
-	};
+	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;
 
 jQuery.fn = jQuery.prototype = {
 
@@ -95,9 +150,6 @@ jQuery.fn = jQuery.prototype = {
 
 	constructor: jQuery,
 
-	// Start with an empty selector
-	selector: "",
-
 	// The default length of a jQuery object is 0
 	length: 0,
 
@@ -108,13 +160,14 @@ jQuery.fn = jQuery.prototype = {
 	// Get the Nth element in the matched element set OR
 	// Get the whole matched element set as a clean array
 	get: function( num ) {
-		return num != null ?
 
-			// Return just the one element from the set
-			( num < 0 ? this[ num + this.length ] : this[ num ] ) :
+		// Return all the elements in a clean array
+		if ( num == null ) {
+			return slice.call( this );
+		}
 
-			// Return all the elements in a clean array
-			slice.call( this );
+		// Return just the one element from the set
+		return num < 0 ? this[ num + this.length ] : this[ num ];
 	},
 
 	// Take an array of elements and push it onto the stack
@@ -126,7 +179,6 @@ jQuery.fn = jQuery.prototype = {
 
 		// Add the old object onto the stack (as a reference)
 		ret.prevObject = this;
-		ret.context = this.context;
 
 		// Return the newly-formed element set
 		return ret;
@@ -189,7 +241,7 @@ jQuery.extend = jQuery.fn.extend = function() {
 	}
 
 	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction( target ) ) {
+	if ( typeof target !== "object" && !isFunction( target ) ) {
 		target = {};
 	}
 
@@ -216,11 +268,11 @@ jQuery.extend = jQuery.fn.extend = function() {
 
 				// Recurse if we're merging plain objects or arrays
 				if ( deep && copy && ( jQuery.isPlainObject( copy ) ||
-					( copyIsArray = jQuery.isArray( copy ) ) ) ) {
+					( copyIsArray = Array.isArray( copy ) ) ) ) {
 
 					if ( copyIsArray ) {
 						copyIsArray = false;
-						clone = src && jQuery.isArray( src ) ? src : [];
+						clone = src && Array.isArray( src ) ? src : [];
 
 					} else {
 						clone = src && jQuery.isPlainObject( src ) ? src : {};
@@ -255,100 +307,42 @@ jQuery.extend( {
 
 	noop: function() {},
 
-	isFunction: function( obj ) {
-		return jQuery.type( obj ) === "function";
-	},
-
-	isArray: Array.isArray,
-
-	isWindow: function( obj ) {
-		return obj != null && obj === obj.window;
-	},
-
-	isNumeric: function( obj ) {
-
-		// parseFloat NaNs numeric-cast false positives (null|true|false|"")
-		// ...but misinterprets leading-number strings, particularly hex literals ("0x...")
-		// subtraction forces infinities to NaN
-		// adding 1 corrects loss of precision from parseFloat (#15100)
-		var realStringObj = obj && obj.toString();
-		return !jQuery.isArray( obj ) && ( realStringObj - parseFloat( realStringObj ) + 1 ) >= 0;
-	},
-
 	isPlainObject: function( obj ) {
+		var proto, Ctor;
 
-		// Not plain objects:
-		// - Any object or value whose internal [[Class]] property is not "[object Object]"
-		// - DOM nodes
-		// - window
-		if ( jQuery.type( obj ) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
+		// Detect obvious negatives
+		// Use toString instead of jQuery.type to catch host objects
+		if ( !obj || toString.call( obj ) !== "[object Object]" ) {
 			return false;
 		}
 
-		if ( obj.constructor &&
-				!hasOwn.call( obj.constructor.prototype, "isPrototypeOf" ) ) {
-			return false;
+		proto = getProto( obj );
+
+		// Objects with no prototype (e.g., `Object.create( null )`) are plain
+		if ( !proto ) {
+			return true;
 		}
 
-		// If the function hasn't returned already, we're confident that
-		// |obj| is a plain object, created by {} or constructed with new Object
-		return true;
+		// Objects with prototype are plain iff they were constructed by a global Object function
+		Ctor = hasOwn.call( proto, "constructor" ) && proto.constructor;
+		return typeof Ctor === "function" && fnToString.call( Ctor ) === ObjectFunctionString;
 	},
 
 	isEmptyObject: function( obj ) {
+
+		/* eslint-disable no-unused-vars */
+		// See https://github.com/eslint/eslint/issues/6125
 		var name;
+
 		for ( name in obj ) {
 			return false;
 		}
 		return true;
 	},
 
-	type: function( obj ) {
-		if ( obj == null ) {
-			return obj + "";
-		}
-
-		// Support: Android<4.0, iOS<6 (functionish RegExp)
-		return typeof obj === "object" || typeof obj === "function" ?
-			class2type[ toString.call( obj ) ] || "object" :
-			typeof obj;
-	},
-
 	// Evaluates a script in a global context
 	globalEval: function( code ) {
-		var script,
-			indirect = eval;
-
-		code = jQuery.trim( code );
-
-		if ( code ) {
-
-			// If the code includes a valid, prologue position
-			// strict mode pragma, execute code by injecting a
-			// script tag into the document.
-			if ( code.indexOf( "use strict" ) === 1 ) {
-				script = document.createElement( "script" );
-				script.text = code;
-				document.head.appendChild( script ).parentNode.removeChild( script );
-			} else {
-
-				// Otherwise, avoid the DOM node creation, insertion
-				// and removal by using an indirect global eval
-
-				indirect( code );
-			}
-		}
-	},
-
-	// Convert dashed to camelCase; used by the css and data modules
-	// Support: IE9-11+
-	// Microsoft forgot to hump their vendor prefix (#9572)
-	camelCase: function( string ) {
-		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
+		DOMEval( code );
 	},
 
 	each: function( obj, callback ) {
@@ -372,7 +366,7 @@ jQuery.extend( {
 		return obj;
 	},
 
-	// Support: Android<4.1
+	// Support: Android <=4.0 only
 	trim: function( text ) {
 		return text == null ?
 			"" :
@@ -401,6 +395,8 @@ jQuery.extend( {
 		return arr == null ? -1 : indexOf.call( arr, elem, i );
 	},
 
+	// Support: Android <=4.0 only, PhantomJS 1 only
+	// push.apply(_, arraylike) throws on ancient WebKit
 	merge: function( first, second ) {
 		var len = +second.length,
 			j = 0,
@@ -469,51 +465,14 @@ jQuery.extend( {
 	// A global GUID counter for objects
 	guid: 1,
 
-	// Bind a function to a context, optionally partially applying any
-	// arguments.
-	proxy: function( fn, context ) {
-		var tmp, args, proxy;
-
-		if ( typeof context === "string" ) {
-			tmp = fn[ context ];
-			context = fn;
-			fn = tmp;
-		}
-
-		// Quick check to determine if target is callable, in the spec
-		// this throws a TypeError, but we will just return undefined.
-		if ( !jQuery.isFunction( fn ) ) {
-			return undefined;
-		}
-
-		// Simulated bind
-		args = slice.call( arguments, 2 );
-		proxy = function() {
-			return fn.apply( context || this, args.concat( slice.call( arguments ) ) );
-		};
-
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		proxy.guid = fn.guid = fn.guid || jQuery.guid++;
-
-		return proxy;
-	},
-
-	now: Date.now,
-
 	// jQuery.support is not used in Core but other projects attach their
 	// properties to it so it needs to exist.
 	support: support
 } );
 
-// JSHint would error on this code due to the Symbol not being defined in ES5.
-// Defining this global in .jshintrc would create a danger of using the global
-// unguarded in another place, it seems safer to just disable JSHint for these
-// three lines.
-/* jshint ignore: start */
 if ( typeof Symbol === "function" ) {
 	jQuery.fn[ Symbol.iterator ] = arr[ Symbol.iterator ];
 }
-/* jshint ignore: end */
 
 // Populate the class2type map
 jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ),
@@ -523,14 +482,14 @@ function( i, name ) {
 
 function isArrayLike( obj ) {
 
-	// Support: iOS 8.2 (not reproducible in simulator)
+	// Support: real iOS 8.2 only (not reproducible in simulator)
 	// `in` check used to prevent JIT error (gh-2145)
 	// hasOwn isn't used here due to false negatives
 	// regarding Nodelist length in IE
 	var length = !!obj && "length" in obj && obj.length,
-		type = jQuery.type( obj );
+		type = toType( obj );
 
-	if ( type === "function" || jQuery.isWindow( obj ) ) {
+	if ( isFunction( obj ) || isWindow( obj ) ) {
 		return false;
 	}
 
@@ -539,14 +498,14 @@ function isArrayLike( obj ) {
 }
 var Sizzle =
 /*!
- * Sizzle CSS Selector Engine v2.2.1
- * http://sizzlejs.com/
+ * Sizzle CSS Selector Engine v2.3.3
+ * https://sizzlejs.com/
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license
  * http://jquery.org/license
  *
- * Date: 2015-10-17
+ * Date: 2016-08-08
  */
 (function( window ) {
 
@@ -587,9 +546,6 @@ var i,
 		return 0;
 	},
 
-	// General-purpose constants
-	MAX_NEGATIVE = 1 << 31,
-
 	// Instance methods
 	hasOwn = ({}).hasOwnProperty,
 	arr = [],
@@ -598,7 +554,7 @@ var i,
 	push = arr.push,
 	slice = arr.slice,
 	// Use a stripped-down indexOf as it's faster than native
-	// http://jsperf.com/thor-indexof-vs-for/5
+	// https://jsperf.com/thor-indexof-vs-for/5
 	indexOf = function( list, elem ) {
 		var i = 0,
 			len = list.length;
@@ -618,7 +574,7 @@ var i,
 	whitespace = "[\\x20\\t\\r\\n\\f]",
 
 	// http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
-	identifier = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
+	identifier = "(?:\\\\.|[\\w-]|[^\0-\\xa0])+",
 
 	// Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
 	attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace +
@@ -675,9 +631,9 @@ var i,
 	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
 
 	rsibling = /[+~]/,
-	rescape = /'|\\/g,
 
-	// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
+	// CSS escapes
+	// http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
 	runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
 	funescape = function( _, escaped, escapedWhitespace ) {
 		var high = "0x" + escaped - 0x10000;
@@ -693,13 +649,39 @@ var i,
 				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
 	},
 
+	// CSS string/identifier serialization
+	// https://drafts.csswg.org/cssom/#common-serializing-idioms
+	rcssescape = /([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,
+	fcssescape = function( ch, asCodePoint ) {
+		if ( asCodePoint ) {
+
+			// U+0000 NULL becomes U+FFFD REPLACEMENT CHARACTER
+			if ( ch === "\0" ) {
+				return "\uFFFD";
+			}
+
+			// Control characters and (dependent upon position) numbers get escaped as code points
+			return ch.slice( 0, -1 ) + "\\" + ch.charCodeAt( ch.length - 1 ).toString( 16 ) + " ";
+		}
+
+		// Other potentially-special ASCII characters get backslash-escaped
+		return "\\" + ch;
+	},
+
 	// Used for iframes
 	// See setDocument()
 	// Removing the function wrapper causes a "Permission Denied"
 	// error in IE
 	unloadHandler = function() {
 		setDocument();
-	};
+	},
+
+	disabledAncestor = addCombinator(
+		function( elem ) {
+			return elem.disabled === true && ("form" in elem || "label" in elem);
+		},
+		{ dir: "parentNode", next: "legend" }
+	);
 
 // Optimize for push.apply( _, NodeList )
 try {
@@ -731,7 +713,7 @@ try {
 }
 
 function Sizzle( selector, context, results, seed ) {
-	var m, i, elem, nid, nidselect, match, groups, newSelector,
+	var m, i, elem, nid, match, groups, newSelector,
 		newContext = context && context.ownerDocument,
 
 		// nodeType defaults to 9, since context defaults to document
@@ -824,7 +806,7 @@ function Sizzle( selector, context, results, seed ) {
 
 					// Capture the context ID, setting it first if necessary
 					if ( (nid = context.getAttribute( "id" )) ) {
-						nid = nid.replace( rescape, "\\$&" );
+						nid = nid.replace( rcssescape, fcssescape );
 					} else {
 						context.setAttribute( "id", (nid = expando) );
 					}
@@ -832,9 +814,8 @@ function Sizzle( selector, context, results, seed ) {
 					// Prefix every selector in the list
 					groups = tokenize( selector );
 					i = groups.length;
-					nidselect = ridentifier.test( nid ) ? "#" + nid : "[id='" + nid + "']";
 					while ( i-- ) {
-						groups[i] = nidselect + " " + toSelector( groups[i] );
+						groups[i] = "#" + nid + " " + toSelector( groups[i] );
 					}
 					newSelector = groups.join( "," );
 
@@ -895,22 +876,22 @@ function markFunction( fn ) {
 
 /**
  * Support testing using an element
- * @param {Function} fn Passed the created div and expects a boolean result
+ * @param {Function} fn Passed the created element and returns a boolean result
  */
 function assert( fn ) {
-	var div = document.createElement("div");
+	var el = document.createElement("fieldset");
 
 	try {
-		return !!fn( div );
+		return !!fn( el );
 	} catch (e) {
 		return false;
 	} finally {
 		// Remove from its parent by default
-		if ( div.parentNode ) {
-			div.parentNode.removeChild( div );
+		if ( el.parentNode ) {
+			el.parentNode.removeChild( el );
 		}
 		// release memory in IE
-		div = null;
+		el = null;
 	}
 }
 
@@ -937,8 +918,7 @@ function addHandle( attrs, handler ) {
 function siblingCheck( a, b ) {
 	var cur = b && a,
 		diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
-			( ~b.sourceIndex || MAX_NEGATIVE ) -
-			( ~a.sourceIndex || MAX_NEGATIVE );
+			a.sourceIndex - b.sourceIndex;
 
 	// Use IE sourceIndex if available on both nodes
 	if ( diff ) {
@@ -979,6 +959,62 @@ function createButtonPseudo( type ) {
 	};
 }
 
+/**
+ * Returns a function to use in pseudos for :enabled/:disabled
+ * @param {Boolean} disabled true for :disabled; false for :enabled
+ */
+function createDisabledPseudo( disabled ) {
+
+	// Known :disabled false positives: fieldset[disabled] > legend:nth-of-type(n+2) :can-disable
+	return function( elem ) {
+
+		// Only certain elements can match :enabled or :disabled
+		// https://html.spec.whatwg.org/multipage/scripting.html#selector-enabled
+		// https://html.spec.whatwg.org/multipage/scripting.html#selector-disabled
+		if ( "form" in elem ) {
+
+			// Check for inherited disabledness on relevant non-disabled elements:
+			// * listed form-associated elements in a disabled fieldset
+			//   https://html.spec.whatwg.org/multipage/forms.html#category-listed
+			//   https://html.spec.whatwg.org/multipage/forms.html#concept-fe-disabled
+			// * option elements in a disabled optgroup
+			//   https://html.spec.whatwg.org/multipage/forms.html#concept-option-disabled
+			// All such elements have a "form" property.
+			if ( elem.parentNode && elem.disabled === false ) {
+
+				// Option elements defer to a parent optgroup if present
+				if ( "label" in elem ) {
+					if ( "label" in elem.parentNode ) {
+						return elem.parentNode.disabled === disabled;
+					} else {
+						return elem.disabled === disabled;
+					}
+				}
+
+				// Support: IE 6 - 11
+				// Use the isDisabled shortcut property to check for disabled fieldset ancestors
+				return elem.isDisabled === disabled ||
+
+					// Where there is no isDisabled, check manually
+					/* jshint -W018 */
+					elem.isDisabled !== !disabled &&
+						disabledAncestor( elem ) === disabled;
+			}
+
+			return elem.disabled === disabled;
+
+		// Try to winnow out elements that can't be disabled before trusting the disabled property.
+		// Some victims get caught in our net (label, legend, menu, track), but it shouldn't
+		// even exist on them, let alone have a boolean value.
+		} else if ( "label" in elem ) {
+			return elem.disabled === disabled;
+		}
+
+		// Remaining elements are neither :enabled nor :disabled
+		return false;
+	};
+}
+
 /**
  * Returns a function to use in pseudos for positionals
  * @param {Function} fn
@@ -1031,7 +1067,7 @@ isXML = Sizzle.isXML = function( elem ) {
  * @returns {Object} Returns the current document
  */
 setDocument = Sizzle.setDocument = function( node ) {
-	var hasCompare, parent,
+	var hasCompare, subWindow,
 		doc = node ? node.ownerDocument || node : preferredDoc;
 
 	// Return early if doc is invalid or already selected
@@ -1046,14 +1082,16 @@ setDocument = Sizzle.setDocument = function( node ) {
 
 	// Support: IE 9-11, Edge
 	// Accessing iframe documents after unload throws "permission denied" errors (jQuery #13936)
-	if ( (parent = document.defaultView) && parent.top !== parent ) {
-		// Support: IE 11
-		if ( parent.addEventListener ) {
-			parent.addEventListener( "unload", unloadHandler, false );
+	if ( preferredDoc !== document &&
+		(subWindow = document.defaultView) && subWindow.top !== subWindow ) {
+
+		// Support: IE 11, Edge
+		if ( subWindow.addEventListener ) {
+			subWindow.addEventListener( "unload", unloadHandler, false );
 
 		// Support: IE 9 - 10 only
-		} else if ( parent.attachEvent ) {
-			parent.attachEvent( "onunload", unloadHandler );
+		} else if ( subWindow.attachEvent ) {
+			subWindow.attachEvent( "onunload", unloadHandler );
 		}
 	}
 
@@ -1063,18 +1101,18 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// Support: IE<8
 	// Verify that getAttribute really returns attributes and not properties
 	// (excepting IE8 booleans)
-	support.attributes = assert(function( div ) {
-		div.className = "i";
-		return !div.getAttribute("className");
+	support.attributes = assert(function( el ) {
+		el.className = "i";
+		return !el.getAttribute("className");
 	});
 
 	/* getElement(s)By*
 	---------------------------------------------------------------------- */
 
 	// Check if getElementsByTagName("*") returns only elements
-	support.getElementsByTagName = assert(function( div ) {
-		div.appendChild( document.createComment("") );
-		return !div.getElementsByTagName("*").length;
+	support.getElementsByTagName = assert(function( el ) {
+		el.appendChild( document.createComment("") );
+		return !el.getElementsByTagName("*").length;
 	});
 
 	// Support: IE<9
@@ -1082,32 +1120,28 @@ setDocument = Sizzle.setDocument = function( node ) {
 
 	// Support: IE<10
 	// Check if getElementById returns elements by name
-	// The broken getElementById methods don't pick up programatically-set names,
+	// The broken getElementById methods don't pick up programmatically-set names,
 	// so use a roundabout getElementsByName test
-	support.getById = assert(function( div ) {
-		docElem.appendChild( div ).id = expando;
+	support.getById = assert(function( el ) {
+		docElem.appendChild( el ).id = expando;
 		return !document.getElementsByName || !document.getElementsByName( expando ).length;
 	});
 
-	// ID find and filter
+	// ID filter and find
 	if ( support.getById ) {
-		Expr.find["ID"] = function( id, context ) {
-			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
-				var m = context.getElementById( id );
-				return m ? [ m ] : [];
-			}
-		};
 		Expr.filter["ID"] = function( id ) {
 			var attrId = id.replace( runescape, funescape );
 			return function( elem ) {
 				return elem.getAttribute("id") === attrId;
 			};
 		};
+		Expr.find["ID"] = function( id, context ) {
+			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
+				var elem = context.getElementById( id );
+				return elem ? [ elem ] : [];
+			}
+		};
 	} else {
-		// Support: IE6/7
-		// getElementById is not reliable as a find shortcut
-		delete Expr.find["ID"];
-
 		Expr.filter["ID"] =  function( id ) {
 			var attrId = id.replace( runescape, funescape );
 			return function( elem ) {
@@ -1116,6 +1150,36 @@ setDocument = Sizzle.setDocument = function( node ) {
 				return node && node.value === attrId;
 			};
 		};
+
+		// Support: IE 6 - 7 only
+		// getElementById is not reliable as a find shortcut
+		Expr.find["ID"] = function( id, context ) {
+			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
+				var node, i, elems,
+					elem = context.getElementById( id );
+
+				if ( elem ) {
+
+					// Verify the id attribute
+					node = elem.getAttributeNode("id");
+					if ( node && node.value === id ) {
+						return [ elem ];
+					}
+
+					// Fall back on getElementsByName
+					elems = context.getElementsByName( id );
+					i = 0;
+					while ( (elem = elems[i++]) ) {
+						node = elem.getAttributeNode("id");
+						if ( node && node.value === id ) {
+							return [ elem ];
+						}
+					}
+				}
+
+				return [];
+			}
+		};
 	}
 
 	// Tag
@@ -1169,77 +1233,87 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// We allow this because of a bug in IE8/9 that throws an error
 	// whenever `document.activeElement` is accessed on an iframe
 	// So, we allow :focus to pass through QSA all the time to avoid the IE error
-	// See http://bugs.jquery.com/ticket/13378
+	// See https://bugs.jquery.com/ticket/13378
 	rbuggyQSA = [];
 
 	if ( (support.qsa = rnative.test( document.querySelectorAll )) ) {
 		// Build QSA regex
 		// Regex strategy adopted from Diego Perini
-		assert(function( div ) {
+		assert(function( el ) {
 			// Select is set to empty string on purpose
 			// This is to test IE's treatment of not explicitly
 			// setting a boolean content attribute,
 			// since its presence should be enough
-			// http://bugs.jquery.com/ticket/12359
-			docElem.appendChild( div ).innerHTML = "<a id='" + expando + "'></a>" +
+			// https://bugs.jquery.com/ticket/12359
+			docElem.appendChild( el ).innerHTML = "<a id='" + expando + "'></a>" +
 				"<select id='" + expando + "-\r\\' msallowcapture=''>" +
 				"<option selected=''></option></select>";
 
 			// Support: IE8, Opera 11-12.16
 			// Nothing should be selected when empty strings follow ^= or $= or *=
 			// The test attribute must be unknown in Opera but "safe" for WinRT
-			// http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
-			if ( div.querySelectorAll("[msallowcapture^='']").length ) {
+			// https://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
+			if ( el.querySelectorAll("[msallowcapture^='']").length ) {
 				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
 			}
 
 			// Support: IE8
 			// Boolean attributes and "value" are not treated correctly
-			if ( !div.querySelectorAll("[selected]").length ) {
+			if ( !el.querySelectorAll("[selected]").length ) {
 				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
 			}
 
 			// Support: Chrome<29, Android<4.4, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.8+
-			if ( !div.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
+			if ( !el.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
 				rbuggyQSA.push("~=");
 			}
 
 			// Webkit/Opera - :checked should return selected option elements
 			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
 			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":checked").length ) {
+			if ( !el.querySelectorAll(":checked").length ) {
 				rbuggyQSA.push(":checked");
 			}
 
 			// Support: Safari 8+, iOS 8+
 			// https://bugs.webkit.org/show_bug.cgi?id=136851
-			// In-page `selector#id sibing-combinator selector` fails
-			if ( !div.querySelectorAll( "a#" + expando + "+*" ).length ) {
+			// In-page `selector#id sibling-combinator selector` fails
+			if ( !el.querySelectorAll( "a#" + expando + "+*" ).length ) {
 				rbuggyQSA.push(".#.+[+~]");
 			}
 		});
 
-		assert(function( div ) {
+		assert(function( el ) {
+			el.innerHTML = "<a href='' disabled='disabled'></a>" +
+				"<select disabled='disabled'><option/></select>";
+
 			// Support: Windows 8 Native Apps
 			// The type and name attributes are restricted during .innerHTML assignment
 			var input = document.createElement("input");
 			input.setAttribute( "type", "hidden" );
-			div.appendChild( input ).setAttribute( "name", "D" );
+			el.appendChild( input ).setAttribute( "name", "D" );
 
 			// Support: IE8
 			// Enforce case-sensitivity of name attribute
-			if ( div.querySelectorAll("[name=d]").length ) {
+			if ( el.querySelectorAll("[name=d]").length ) {
 				rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
 			}
 
 			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
 			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":enabled").length ) {
+			if ( el.querySelectorAll(":enabled").length !== 2 ) {
+				rbuggyQSA.push( ":enabled", ":disabled" );
+			}
+
+			// Support: IE9-11+
+			// IE's :disabled selector does not pick up the children of disabled fieldsets
+			docElem.appendChild( el ).disabled = true;
+			if ( el.querySelectorAll(":disabled").length !== 2 ) {
 				rbuggyQSA.push( ":enabled", ":disabled" );
 			}
 
 			// Opera 10-11 does not throw on post-comma invalid pseudos
-			div.querySelectorAll("*,:x");
+			el.querySelectorAll("*,:x");
 			rbuggyQSA.push(",.*:");
 		});
 	}
@@ -1250,14 +1324,14 @@ setDocument = Sizzle.setDocument = function( node ) {
 		docElem.oMatchesSelector ||
 		docElem.msMatchesSelector) )) ) {
 
-		assert(function( div ) {
+		assert(function( el ) {
 			// Check to see if it's possible to do matchesSelector
 			// on a disconnected node (IE 9)
-			support.disconnectedMatch = matches.call( div, "div" );
+			support.disconnectedMatch = matches.call( el, "*" );
 
 			// This should fail with an exception
 			// Gecko does not error, returns false instead
-			matches.call( div, "[s!='']:x" );
+			matches.call( el, "[s!='']:x" );
 			rbuggyMatches.push( "!=", pseudos );
 		});
 	}
@@ -1459,6 +1533,10 @@ Sizzle.attr = function( elem, name ) {
 				null;
 };
 
+Sizzle.escape = function( sel ) {
+	return (sel + "").replace( rcssescape, fcssescape );
+};
+
 Sizzle.error = function( msg ) {
 	throw new Error( "Syntax error, unrecognized expression: " + msg );
 };
@@ -1926,13 +2004,8 @@ Expr = Sizzle.selectors = {
 		},
 
 		// Boolean properties
-		"enabled": function( elem ) {
-			return elem.disabled === false;
-		},
-
-		"disabled": function( elem ) {
-			return elem.disabled === true;
-		},
+		"enabled": createDisabledPseudo( false ),
+		"disabled": createDisabledPseudo( true ),
 
 		"checked": function( elem ) {
 			// In CSS3, :checked should return both checked and selected elements
@@ -2134,7 +2207,9 @@ function toSelector( tokens ) {
 
 function addCombinator( matcher, combinator, base ) {
 	var dir = combinator.dir,
-		checkNonElements = base && dir === "parentNode",
+		skip = combinator.next,
+		key = skip || dir,
+		checkNonElements = base && key === "parentNode",
 		doneName = done++;
 
 	return combinator.first ?
@@ -2145,6 +2220,7 @@ function addCombinator( matcher, combinator, base ) {
 					return matcher( elem, context, xml );
 				}
 			}
+			return false;
 		} :
 
 		// Check against all ancestor/preceding elements
@@ -2170,14 +2246,16 @@ function addCombinator( matcher, combinator, base ) {
 						// Defend against cloned attroperties (jQuery gh-1709)
 						uniqueCache = outerCache[ elem.uniqueID ] || (outerCache[ elem.uniqueID ] = {});
 
-						if ( (oldCache = uniqueCache[ dir ]) &&
+						if ( skip && skip === elem.nodeName.toLowerCase() ) {
+							elem = elem[ dir ] || elem;
+						} else if ( (oldCache = uniqueCache[ key ]) &&
 							oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
 
 							// Assign to newCache so results back-propagate to previous elements
 							return (newCache[ 2 ] = oldCache[ 2 ]);
 						} else {
 							// Reuse newcache so results back-propagate to previous elements
-							uniqueCache[ dir ] = newCache;
+							uniqueCache[ key ] = newCache;
 
 							// A match means we're done; a fail means we have to keep checking
 							if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) {
@@ -2187,6 +2265,7 @@ function addCombinator( matcher, combinator, base ) {
 					}
 				}
 			}
+			return false;
 		};
 }
 
@@ -2549,8 +2628,7 @@ select = Sizzle.select = function( selector, context, results, seed ) {
 		// Reduce context if the leading compound selector is an ID
 		tokens = match[0] = match[0].slice( 0 );
 		if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
-				support.getById && context.nodeType === 9 && documentIsHTML &&
-				Expr.relative[ tokens[1].type ] ) {
+				context.nodeType === 9 && documentIsHTML && Expr.relative[ tokens[1].type ] ) {
 
 			context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
 			if ( !context ) {
@@ -2620,17 +2698,17 @@ setDocument();
 
 // Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
 // Detached nodes confoundingly follow *each other*
-support.sortDetached = assert(function( div1 ) {
+support.sortDetached = assert(function( el ) {
 	// Should return 1, but returns 4 (following)
-	return div1.compareDocumentPosition( document.createElement("div") ) & 1;
+	return el.compareDocumentPosition( document.createElement("fieldset") ) & 1;
 });
 
 // Support: IE<8
 // Prevent attribute/property "interpolation"
-// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !assert(function( div ) {
-	div.innerHTML = "<a href='#'></a>";
-	return div.firstChild.getAttribute("href") === "#" ;
+// https://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
+if ( !assert(function( el ) {
+	el.innerHTML = "<a href='#'></a>";
+	return el.firstChild.getAttribute("href") === "#" ;
 }) ) {
 	addHandle( "type|href|height|width", function( elem, name, isXML ) {
 		if ( !isXML ) {
@@ -2641,10 +2719,10 @@ if ( !assert(function( div ) {
 
 // Support: IE<9
 // Use defaultValue in place of getAttribute("value")
-if ( !support.attributes || !assert(function( div ) {
-	div.innerHTML = "<input/>";
-	div.firstChild.setAttribute( "value", "" );
-	return div.firstChild.getAttribute( "value" ) === "";
+if ( !support.attributes || !assert(function( el ) {
+	el.innerHTML = "<input/>";
+	el.firstChild.setAttribute( "value", "" );
+	return el.firstChild.getAttribute( "value" ) === "";
 }) ) {
 	addHandle( "value", function( elem, name, isXML ) {
 		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
@@ -2655,8 +2733,8 @@ if ( !support.attributes || !assert(function( div ) {
 
 // Support: IE<9
 // Use getAttributeNode to fetch booleans when getAttribute lies
-if ( !assert(function( div ) {
-	return div.getAttribute("disabled") == null;
+if ( !assert(function( el ) {
+	return el.getAttribute("disabled") == null;
 }) ) {
 	addHandle( booleans, function( elem, name, isXML ) {
 		var val;
@@ -2677,11 +2755,15 @@ return Sizzle;
 
 jQuery.find = Sizzle;
 jQuery.expr = Sizzle.selectors;
+
+// Deprecated
 jQuery.expr[ ":" ] = jQuery.expr.pseudos;
 jQuery.uniqueSort = jQuery.unique = Sizzle.uniqueSort;
 jQuery.text = Sizzle.getText;
 jQuery.isXMLDoc = Sizzle.isXML;
 jQuery.contains = Sizzle.contains;
+jQuery.escapeSelector = Sizzle.escape;
+
 
 
 
@@ -2716,40 +2798,41 @@ var siblings = function( n, elem ) {
 
 var rneedsContext = jQuery.expr.match.needsContext;
 
-var rsingleTag = ( /^<([\w-]+)\s*\/?>(?:<\/\1>|)$/ );
 
 
+function nodeName( elem, name ) {
+
+  return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
+
+};
+var rsingleTag = ( /^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i );
+
 
-var risSimple = /^.[^:#\[\.,]*$/;
 
 // Implement the identical functionality for filter and not
 function winnow( elements, qualifier, not ) {
-	if ( jQuery.isFunction( qualifier ) ) {
+	if ( isFunction( qualifier ) ) {
 		return jQuery.grep( elements, function( elem, i ) {
-			/* jshint -W018 */
 			return !!qualifier.call( elem, i, elem ) !== not;
 		} );
-
 	}
 
+	// Single element
 	if ( qualifier.nodeType ) {
 		return jQuery.grep( elements, function( elem ) {
 			return ( elem === qualifier ) !== not;
 		} );
-
 	}
 
-	if ( typeof qualifier === "string" ) {
-		if ( risSimple.test( qualifier ) ) {
-			return jQuery.filter( qualifier, elements, not );
-		}
-
-		qualifier = jQuery.filter( qualifier, elements );
+	// Arraylike of elements (jQuery, arguments, Array)
+	if ( typeof qualifier !== "string" ) {
+		return jQuery.grep( elements, function( elem ) {
+			return ( indexOf.call( qualifier, elem ) > -1 ) !== not;
+		} );
 	}
 
-	return jQuery.grep( elements, function( elem ) {
-		return ( indexOf.call( qualifier, elem ) > -1 ) !== not;
-	} );
+	// Filtered directly for both simple and complex selectors
+	return jQuery.filter( qualifier, elements, not );
 }
 
 jQuery.filter = function( expr, elems, not ) {
@@ -2759,18 +2842,19 @@ jQuery.filter = function( expr, elems, not ) {
 		expr = ":not(" + expr + ")";
 	}
 
-	return elems.length === 1 && elem.nodeType === 1 ?
-		jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] :
-		jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
-			return elem.nodeType === 1;
-		} ) );
+	if ( elems.length === 1 && elem.nodeType === 1 ) {
+		return jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [];
+	}
+
+	return jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
+		return elem.nodeType === 1;
+	} ) );
 };
 
 jQuery.fn.extend( {
 	find: function( selector ) {
-		var i,
+		var i, ret,
 			len = this.length,
-			ret = [],
 			self = this;
 
 		if ( typeof selector !== "string" ) {
@@ -2783,14 +2867,13 @@ jQuery.fn.extend( {
 			} ) );
 		}
 
+		ret = this.pushStack( [] );
+
 		for ( i = 0; i < len; i++ ) {
 			jQuery.find( selector, self[ i ], ret );
 		}
 
-		// Needed because $( selector, context ) becomes $( context ).find( selector )
-		ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
-		ret.selector = this.selector ? this.selector + " " + selector : selector;
-		return ret;
+		return len > 1 ? jQuery.uniqueSort( ret ) : ret;
 	},
 	filter: function( selector ) {
 		return this.pushStack( winnow( this, selector || [], false ) );
@@ -2822,7 +2905,8 @@ var rootjQuery,
 	// A simple way to check for HTML strings
 	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
 	// Strict HTML recognition (#11290: must start with <)
-	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,
+	// Shortcut simple #id case for speed
+	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/,
 
 	init = jQuery.fn.init = function( selector, context, root ) {
 		var match, elem;
@@ -2869,7 +2953,7 @@ var rootjQuery,
 						for ( match in context ) {
 
 							// Properties of context are called as methods if possible
-							if ( jQuery.isFunction( this[ match ] ) ) {
+							if ( isFunction( this[ match ] ) ) {
 								this[ match ]( context[ match ] );
 
 							// ...and otherwise set as attributes
@@ -2885,17 +2969,12 @@ var rootjQuery,
 				} else {
 					elem = document.getElementById( match[ 2 ] );
 
-					// Support: Blackberry 4.6
-					// gEBID returns nodes no longer in the document (#6963)
-					if ( elem && elem.parentNode ) {
+					if ( elem ) {
 
 						// Inject the element directly into the jQuery object
-						this.length = 1;
 						this[ 0 ] = elem;
+						this.length = 1;
 					}
-
-					this.context = document;
-					this.selector = selector;
 					return this;
 				}
 
@@ -2911,13 +2990,13 @@ var rootjQuery,
 
 		// HANDLE: $(DOMElement)
 		} else if ( selector.nodeType ) {
-			this.context = this[ 0 ] = selector;
+			this[ 0 ] = selector;
 			this.length = 1;
 			return this;
 
 		// HANDLE: $(function)
 		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
+		} else if ( isFunction( selector ) ) {
 			return root.ready !== undefined ?
 				root.ready( selector ) :
 
@@ -2925,11 +3004,6 @@ var rootjQuery,
 				selector( jQuery );
 		}
 
-		if ( selector.selector !== undefined ) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
 		return jQuery.makeArray( selector, this );
 	};
 
@@ -2970,23 +3044,24 @@ jQuery.fn.extend( {
 			i = 0,
 			l = this.length,
 			matched = [],
-			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
-				jQuery( selectors, context || this.context ) :
-				0;
+			targets = typeof selectors !== "string" && jQuery( selectors );
 
-		for ( ; i < l; i++ ) {
-			for ( cur = this[ i ]; cur && cur !== context; cur = cur.parentNode ) {
+		// Positional selectors never match, since there's no _selection_ context
+		if ( !rneedsContext.test( selectors ) ) {
+			for ( ; i < l; i++ ) {
+				for ( cur = this[ i ]; cur && cur !== context; cur = cur.parentNode ) {
 
-				// Always skip document fragments
-				if ( cur.nodeType < 11 && ( pos ?
-					pos.index( cur ) > -1 :
+					// Always skip document fragments
+					if ( cur.nodeType < 11 && ( targets ?
+						targets.index( cur ) > -1 :
 
-					// Don't pass non-elements to Sizzle
-					cur.nodeType === 1 &&
-						jQuery.find.matchesSelector( cur, selectors ) ) ) {
+						// Don't pass non-elements to Sizzle
+						cur.nodeType === 1 &&
+							jQuery.find.matchesSelector( cur, selectors ) ) ) {
 
-					matched.push( cur );
-					break;
+						matched.push( cur );
+						break;
+					}
 				}
 			}
 		}
@@ -3071,7 +3146,18 @@ jQuery.each( {
 		return siblings( elem.firstChild );
 	},
 	contents: function( elem ) {
-		return elem.contentDocument || jQuery.merge( [], elem.childNodes );
+        if ( nodeName( elem, "iframe" ) ) {
+            return elem.contentDocument;
+        }
+
+        // Support: IE 9 - 11 only, iOS 7 only, Android Browser <=4.3 only
+        // Treat the template element as a regular one in browsers that
+        // don't support it.
+        if ( nodeName( elem, "template" ) ) {
+            elem = elem.content || elem;
+        }
+
+        return jQuery.merge( [], elem.childNodes );
 	}
 }, function( name, fn ) {
 	jQuery.fn[ name ] = function( until, selector ) {
@@ -3101,14 +3187,14 @@ jQuery.each( {
 		return this.pushStack( matched );
 	};
 } );
-var rnotwhite = ( /\S+/g );
+var rnothtmlwhite = ( /[^\x20\t\r\n\f]+/g );
 
 
 
 // Convert String-formatted options into Object-formatted ones
 function createOptions( options ) {
 	var object = {};
-	jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) {
+	jQuery.each( options.match( rnothtmlwhite ) || [], function( _, flag ) {
 		object[ flag ] = true;
 	} );
 	return object;
@@ -3169,7 +3255,7 @@ jQuery.Callbacks = function( options ) {
 		fire = function() {
 
 			// Enforce single-firing
-			locked = options.once;
+			locked = locked || options.once;
 
 			// Execute callbacks for all pending executions,
 			// respecting firingIndex overrides and runtime changes
@@ -3225,11 +3311,11 @@ jQuery.Callbacks = function( options ) {
 
 					( function add( args ) {
 						jQuery.each( args, function( _, arg ) {
-							if ( jQuery.isFunction( arg ) ) {
+							if ( isFunction( arg ) ) {
 								if ( !options.unique || !self.has( arg ) ) {
 									list.push( arg );
 								}
-							} else if ( arg && arg.length && jQuery.type( arg ) !== "string" ) {
+							} else if ( arg && arg.length && toType( arg ) !== "string" ) {
 
 								// Inspect recursively
 								add( arg );
@@ -3293,7 +3379,7 @@ jQuery.Callbacks = function( options ) {
 			// Abort any pending executions
 			lock: function() {
 				locked = queue = [];
-				if ( !memory ) {
+				if ( !memory && !firing ) {
 					list = memory = "";
 				}
 				return this;
@@ -3331,15 +3417,59 @@ jQuery.Callbacks = function( options ) {
 };
 
 
+function Identity( v ) {
+	return v;
+}
+function Thrower( ex ) {
+	throw ex;
+}
+
+function adoptValue( value, resolve, reject, noValue ) {
+	var method;
+
+	try {
+
+		// Check for promise aspect first to privilege synchronous behavior
+		if ( value && isFunction( ( method = value.promise ) ) ) {
+			method.call( value ).done( resolve ).fail( reject );
+
+		// Other thenables
+		} else if ( value && isFunction( ( method = value.then ) ) ) {
+			method.call( value, resolve, reject );
+
+		// Other non-thenables
+		} else {
+
+			// Control `resolve` arguments by letting Array#slice cast boolean `noValue` to integer:
+			// * false: [ value ].slice( 0 ) => resolve( value )
+			// * true: [ value ].slice( 1 ) => resolve()
+			resolve.apply( undefined, [ value ].slice( noValue ) );
+		}
+
+	// For Promises/A+, convert exceptions into rejections
+	// Since jQuery.when doesn't unwrap thenables, we can skip the extra checks appearing in
+	// Deferred#then to conditionally suppress rejection.
+	} catch ( value ) {
+
+		// Support: Android 4.0 only
+		// Strict mode functions invoked without .call/.apply get global-object context
+		reject.apply( undefined, [ value ] );
+	}
+}
+
 jQuery.extend( {
 
 	Deferred: function( func ) {
 		var tuples = [
 
-				// action, add listener, listener list, final state
-				[ "resolve", "done", jQuery.Callbacks( "once memory" ), "resolved" ],
-				[ "reject", "fail", jQuery.Callbacks( "once memory" ), "rejected" ],
-				[ "notify", "progress", jQuery.Callbacks( "memory" ) ]
+				// action, add listener, callbacks,
+				// ... .then handlers, argument index, [final state]
+				[ "notify", "progress", jQuery.Callbacks( "memory" ),
+					jQuery.Callbacks( "memory" ), 2 ],
+				[ "resolve", "done", jQuery.Callbacks( "once memory" ),
+					jQuery.Callbacks( "once memory" ), 0, "resolved" ],
+				[ "reject", "fail", jQuery.Callbacks( "once memory" ),
+					jQuery.Callbacks( "once memory" ), 1, "rejected" ]
 			],
 			state = "pending",
 			promise = {
@@ -3350,23 +3480,33 @@ jQuery.extend( {
 					deferred.done( arguments ).fail( arguments );
 					return this;
 				},
-				then: function( /* fnDone, fnFail, fnProgress */ ) {
+				"catch": function( fn ) {
+					return promise.then( null, fn );
+				},
+
+				// Keep pipe for back-compat
+				pipe: function( /* fnDone, fnFail, fnProgress */ ) {
 					var fns = arguments;
+
 					return jQuery.Deferred( function( newDefer ) {
 						jQuery.each( tuples, function( i, tuple ) {
-							var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
 
-							// deferred[ done | fail | progress ] for forwarding actions to newDefer
+							// Map tuples (progress, done, fail) to arguments (done, fail, progress)
+							var fn = isFunction( fns[ tuple[ 4 ] ] ) && fns[ tuple[ 4 ] ];
+
+							// deferred.progress(function() { bind to newDefer or newDefer.notify })
+							// deferred.done(function() { bind to newDefer or newDefer.resolve })
+							// deferred.fail(function() { bind to newDefer or newDefer.reject })
 							deferred[ tuple[ 1 ] ]( function() {
 								var returned = fn && fn.apply( this, arguments );
-								if ( returned && jQuery.isFunction( returned.promise ) ) {
+								if ( returned && isFunction( returned.promise ) ) {
 									returned.promise()
 										.progress( newDefer.notify )
 										.done( newDefer.resolve )
 										.fail( newDefer.reject );
 								} else {
 									newDefer[ tuple[ 0 ] + "With" ](
-										this === promise ? newDefer.promise() : this,
+										this,
 										fn ? [ returned ] : arguments
 									);
 								}
@@ -3375,6 +3515,170 @@ jQuery.extend( {
 						fns = null;
 					} ).promise();
 				},
+				then: function( onFulfilled, onRejected, onProgress ) {
+					var maxDepth = 0;
+					function resolve( depth, deferred, handler, special ) {
+						return function() {
+							var that = this,
+								args = arguments,
+								mightThrow = function() {
+									var returned, then;
+
+									// Support: Promises/A+ section 2.3.3.3.3
+									// https://promisesaplus.com/#point-59
+									// Ignore double-resolution attempts
+									if ( depth < maxDepth ) {
+										return;
+									}
+
+									returned = handler.apply( that, args );
+
+									// Support: Promises/A+ section 2.3.1
+									// https://promisesaplus.com/#point-48
+									if ( returned === deferred.promise() ) {
+										throw new TypeError( "Thenable self-resolution" );
+									}
+
+									// Support: Promises/A+ sections 2.3.3.1, 3.5
+									// https://promisesaplus.com/#point-54
+									// https://promisesaplus.com/#point-75
+									// Retrieve `then` only once
+									then = returned &&
+
+										// Support: Promises/A+ section 2.3.4
+										// https://promisesaplus.com/#point-64
+										// Only check objects and functions for thenability
+										( typeof returned === "object" ||
+											typeof returned === "function" ) &&
+										returned.then;
+
+									// Handle a returned thenable
+									if ( isFunction( then ) ) {
+
+										// Special processors (notify) just wait for resolution
+										if ( special ) {
+											then.call(
+												returned,
+												resolve( maxDepth, deferred, Identity, special ),
+												resolve( maxDepth, deferred, Thrower, special )
+											);
+
+										// Normal processors (resolve) also hook into progress
+										} else {
+
+											// ...and disregard older resolution values
+											maxDepth++;
+
+											then.call(
+												returned,
+												resolve( maxDepth, deferred, Identity, special ),
+												resolve( maxDepth, deferred, Thrower, special ),
+												resolve( maxDepth, deferred, Identity,
+													deferred.notifyWith )
+											);
+										}
+
+									// Handle all other returned values
+									} else {
+
+										// Only substitute handlers pass on context
+										// and multiple values (non-spec behavior)
+										if ( handler !== Identity ) {
+											that = undefined;
+											args = [ returned ];
+										}
+
+										// Process the value(s)
+										// Default process is resolve
+										( special || deferred.resolveWith )( that, args );
+									}
+								},
+
+								// Only normal processors (resolve) catch and reject exceptions
+								process = special ?
+									mightThrow :
+									function() {
+										try {
+											mightThrow();
+										} catch ( e ) {
+
+											if ( jQuery.Deferred.exceptionHook ) {
+												jQuery.Deferred.exceptionHook( e,
+													process.stackTrace );
+											}
+
+											// Support: Promises/A+ section 2.3.3.3.4.1
+											// https://promisesaplus.com/#point-61
+											// Ignore post-resolution exceptions
+											if ( depth + 1 >= maxDepth ) {
+
+												// Only substitute handlers pass on context
+												// and multiple values (non-spec behavior)
+												if ( handler !== Thrower ) {
+													that = undefined;
+													args = [ e ];
+												}
+
+												deferred.rejectWith( that, args );
+											}
+										}
+									};
+
+							// Support: Promises/A+ section 2.3.3.3.1
+							// https://promisesaplus.com/#point-57
+							// Re-resolve promises immediately to dodge false rejection from
+							// subsequent errors
+							if ( depth ) {
+								process();
+							} else {
+
+								// Call an optional hook to record the stack, in case of exception
+								// since it's otherwise lost when execution goes async
+								if ( jQuery.Deferred.getStackHook ) {
+									process.stackTrace = jQuery.Deferred.getStackHook();
+								}
+								window.setTimeout( process );
+							}
+						};
+					}
+
+					return jQuery.Deferred( function( newDefer ) {
+
+						// progress_handlers.add( ... )
+						tuples[ 0 ][ 3 ].add(
+							resolve(
+								0,
+								newDefer,
+								isFunction( onProgress ) ?
+									onProgress :
+									Identity,
+								newDefer.notifyWith
+							)
+						);
+
+						// fulfilled_handlers.add( ... )
+						tuples[ 1 ][ 3 ].add(
+							resolve(
+								0,
+								newDefer,
+								isFunction( onFulfilled ) ?
+									onFulfilled :
+									Identity
+							)
+						);
+
+						// rejected_handlers.add( ... )
+						tuples[ 2 ][ 3 ].add(
+							resolve(
+								0,
+								newDefer,
+								isFunction( onRejected ) ?
+									onRejected :
+									Thrower
+							)
+						);
+					} ).promise();
+				},
 
 				// Get a promise for this deferred
 				// If obj is provided, the promise aspect is added to the object
@@ -3384,33 +3688,58 @@ jQuery.extend( {
 			},
 			deferred = {};
 
-		// Keep pipe for back-compat
-		promise.pipe = promise.then;
-
 		// Add list-specific methods
 		jQuery.each( tuples, function( i, tuple ) {
 			var list = tuple[ 2 ],
-				stateString = tuple[ 3 ];
+				stateString = tuple[ 5 ];
 
-			// promise[ done | fail | progress ] = list.add
+			// promise.progress = list.add
+			// promise.done = list.add
+			// promise.fail = list.add
 			promise[ tuple[ 1 ] ] = list.add;
 
 			// Handle state
 			if ( stateString ) {
-				list.add( function() {
+				list.add(
+					function() {
 
-					// state = [ resolved | rejected ]
-					state = stateString;
+						// state = "resolved" (i.e., fulfilled)
+						// state = "rejected"
+						state = stateString;
+					},
 
-				// [ reject_list | resolve_list ].disable; progress_list.lock
-				}, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
+					// rejected_callbacks.disable
+					// fulfilled_callbacks.disable
+					tuples[ 3 - i ][ 2 ].disable,
+
+					// rejected_handlers.disable
+					// fulfilled_handlers.disable
+					tuples[ 3 - i ][ 3 ].disable,
+
+					// progress_callbacks.lock
+					tuples[ 0 ][ 2 ].lock,
+
+					// progress_handlers.lock
+					tuples[ 0 ][ 3 ].lock
+				);
 			}
 
-			// deferred[ resolve | reject | notify ]
+			// progress_handlers.fire
+			// fulfilled_handlers.fire
+			// rejected_handlers.fire
+			list.add( tuple[ 3 ].fire );
+
+			// deferred.notify = function() { deferred.notifyWith(...) }
+			// deferred.resolve = function() { deferred.resolveWith(...) }
+			// deferred.reject = function() { deferred.rejectWith(...) }
 			deferred[ tuple[ 0 ] ] = function() {
-				deferred[ tuple[ 0 ] + "With" ]( this === deferred ? promise : this, arguments );
+				deferred[ tuple[ 0 ] + "With" ]( this === deferred ? undefined : this, arguments );
 				return this;
 			};
+
+			// deferred.notifyWith = list.fireWith
+			// deferred.resolveWith = list.fireWith
+			// deferred.rejectWith = list.fireWith
 			deferred[ tuple[ 0 ] + "With" ] = list.fireWith;
 		} );
 
@@ -3427,68 +3756,95 @@ jQuery.extend( {
 	},
 
 	// Deferred helper
-	when: function( subordinate /* , ..., subordinateN */ ) {
-		var i = 0,
+	when: function( singleValue ) {
+		var
+
+			// count of uncompleted subordinates
+			remaining = arguments.length,
+
+			// count of unprocessed arguments
+			i = remaining,
+
+			// subordinate fulfillment data
+			resolveContexts = Array( i ),
 			resolveValues = slice.call( arguments ),
-			length = resolveValues.length,
 
-			// the count of uncompleted subordinates
-			remaining = length !== 1 ||
-				( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
+			// the master Deferred
+			master = jQuery.Deferred(),
 
-			// the master Deferred.
-			// If resolveValues consist of only a single Deferred, just use that.
-			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
-
-			// Update function for both resolve and progress values
-			updateFunc = function( i, contexts, values ) {
+			// subordinate callback factory
+			updateFunc = function( i ) {
 				return function( value ) {
-					contexts[ i ] = this;
-					values[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
-					if ( values === progressValues ) {
-						deferred.notifyWith( contexts, values );
-					} else if ( !( --remaining ) ) {
-						deferred.resolveWith( contexts, values );
+					resolveContexts[ i ] = this;
+					resolveValues[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
+					if ( !( --remaining ) ) {
+						master.resolveWith( resolveContexts, resolveValues );
 					}
 				};
-			},
+			};
 
-			progressValues, progressContexts, resolveContexts;
+		// Single- and empty arguments are adopted like Promise.resolve
+		if ( remaining <= 1 ) {
+			adoptValue( singleValue, master.done( updateFunc( i ) ).resolve, master.reject,
+				!remaining );
 
-		// Add listeners to Deferred subordinates; treat others as resolved
-		if ( length > 1 ) {
-			progressValues = new Array( length );
-			progressContexts = new Array( length );
-			resolveContexts = new Array( length );
-			for ( ; i < length; i++ ) {
-				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
-					resolveValues[ i ].promise()
-						.progress( updateFunc( i, progressContexts, progressValues ) )
-						.done( updateFunc( i, resolveContexts, resolveValues ) )
-						.fail( deferred.reject );
-				} else {
-					--remaining;
-				}
+			// Use .then() to unwrap secondary thenables (cf. gh-3000)
+			if ( master.state() === "pending" ||
+				isFunction( resolveValues[ i ] && resolveValues[ i ].then ) ) {
+
+				return master.then();
 			}
 		}
 
-		// If we're not waiting on anything, resolve the master
-		if ( !remaining ) {
-			deferred.resolveWith( resolveContexts, resolveValues );
+		// Multiple arguments are aggregated like Promise.all array elements
+		while ( i-- ) {
+			adoptValue( resolveValues[ i ], updateFunc( i ), master.reject );
 		}
 
-		return deferred.promise();
+		return master.promise();
 	}
 } );
 
 
+// These usually indicate a programmer mistake during development,
+// warn about them ASAP rather than swallowing them by default.
+var rerrorNames = /^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;
+
+jQuery.Deferred.exceptionHook = function( error, stack ) {
+
+	// Support: IE 8 - 9 only
+	// Console exists when dev tools are open, which can happen at any time
+	if ( window.console && window.console.warn && error && rerrorNames.test( error.name ) ) {
+		window.console.warn( "jQuery.Deferred exception: " + error.message, error.stack, stack );
+	}
+};
+
+
+
+
+jQuery.readyException = function( error ) {
+	window.setTimeout( function() {
+		throw error;
+	} );
+};
+
+
+
+
 // The deferred used on DOM ready
-var readyList;
+var readyList = jQuery.Deferred();
 
 jQuery.fn.ready = function( fn ) {
 
-	// Add the callback
-	jQuery.ready.promise().done( fn );
+	readyList
+		.then( fn )
+
+		// Wrap jQuery.readyException in a function so that the lookup
+		// happens at the time of error handling instead of callback
+		// registration.
+		.catch( function( error ) {
+			jQuery.readyException( error );
+		} );
 
 	return this;
 };
@@ -3502,15 +3858,6 @@ jQuery.extend( {
 	// the ready event fires. See #6781
 	readyWait: 1,
 
-	// Hold (or release) the ready event
-	holdReady: function( hold ) {
-		if ( hold ) {
-			jQuery.readyWait++;
-		} else {
-			jQuery.ready( true );
-		}
-	},
-
 	// Handle when the DOM is ready
 	ready: function( wait ) {
 
@@ -3529,53 +3876,36 @@ jQuery.extend( {
 
 		// If there are functions bound, to execute
 		readyList.resolveWith( document, [ jQuery ] );
-
-		// Trigger any bound ready events
-		if ( jQuery.fn.triggerHandler ) {
-			jQuery( document ).triggerHandler( "ready" );
-			jQuery( document ).off( "ready" );
-		}
 	}
 } );
 
-/**
- * The ready event handler and self cleanup method
- */
+jQuery.ready.then = readyList.then;
+
+// The ready event handler and self cleanup method
 function completed() {
 	document.removeEventListener( "DOMContentLoaded", completed );
 	window.removeEventListener( "load", completed );
 	jQuery.ready();
 }
 
-jQuery.ready.promise = function( obj ) {
-	if ( !readyList ) {
+// Catch cases where $(document).ready() is called
+// after the browser event has already occurred.
+// Support: IE <=9 - 10 only
+// Older IE sometimes signals "interactive" too soon
+if ( document.readyState === "complete" ||
+	( document.readyState !== "loading" && !document.documentElement.doScroll ) ) {
 
-		readyList = jQuery.Deferred();
+	// Handle it asynchronously to allow scripts the opportunity to delay ready
+	window.setTimeout( jQuery.ready );
 
-		// Catch cases where $(document).ready() is called
-		// after the browser event has already occurred.
-		// Support: IE9-10 only
-		// Older IE sometimes signals "interactive" too soon
-		if ( document.readyState === "complete" ||
-			( document.readyState !== "loading" && !document.documentElement.doScroll ) ) {
+} else {
 
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			window.setTimeout( jQuery.ready );
+	// Use the handy event callback
+	document.addEventListener( "DOMContentLoaded", completed );
 
-		} else {
-
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", completed );
-
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", completed );
-		}
-	}
-	return readyList.promise( obj );
-};
-
-// Kick off the DOM ready check even if the user does not
-jQuery.ready.promise();
+	// A fallback to window.onload, that will always work
+	window.addEventListener( "load", completed );
+}
 
 
 
@@ -3588,7 +3918,7 @@ var access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
 		bulk = key == null;
 
 	// Sets many values
-	if ( jQuery.type( key ) === "object" ) {
+	if ( toType( key ) === "object" ) {
 		chainable = true;
 		for ( i in key ) {
 			access( elems, fn, i, key[ i ], true, emptyGet, raw );
@@ -3598,7 +3928,7 @@ var access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
 	} else if ( value !== undefined ) {
 		chainable = true;
 
-		if ( !jQuery.isFunction( value ) ) {
+		if ( !isFunction( value ) ) {
 			raw = true;
 		}
 
@@ -3629,14 +3959,34 @@ var access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
 		}
 	}
 
-	return chainable ?
-		elems :
+	if ( chainable ) {
+		return elems;
+	}
 
-		// Gets
-		bulk ?
-			fn.call( elems ) :
-			len ? fn( elems[ 0 ], key ) : emptyGet;
+	// Gets
+	if ( bulk ) {
+		return fn.call( elems );
+	}
+
+	return len ? fn( elems[ 0 ], key ) : emptyGet;
 };
+
+
+// Matches dashed string for camelizing
+var rmsPrefix = /^-ms-/,
+	rdashAlpha = /-([a-z])/g;
+
+// Used by camelCase as callback to replace()
+function fcamelCase( all, letter ) {
+	return letter.toUpperCase();
+}
+
+// Convert dashed to camelCase; used by the css and data modules
+// Support: IE <=9 - 11, Edge 12 - 15
+// Microsoft forgot to hump their vendor prefix (#9572)
+function camelCase( string ) {
+	return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
+}
 var acceptData = function( owner ) {
 
 	// Accepts only:
@@ -3645,7 +3995,6 @@ var acceptData = function( owner ) {
 	//    - Node.DOCUMENT_NODE
 	//  - Object
 	//    - Any
-	/* jshint -W018 */
 	return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType );
 };
 
@@ -3660,35 +4009,8 @@ Data.uid = 1;
 
 Data.prototype = {
 
-	register: function( owner, initial ) {
-		var value = initial || {};
-
-		// If it is a node unlikely to be stringify-ed or looped over
-		// use plain assignment
-		if ( owner.nodeType ) {
-			owner[ this.expando ] = value;
-
-		// Otherwise secure it in a non-enumerable, non-writable property
-		// configurability must be true to allow the property to be
-		// deleted with the delete operator
-		} else {
-			Object.defineProperty( owner, this.expando, {
-				value: value,
-				writable: true,
-				configurable: true
-			} );
-		}
-		return owner[ this.expando ];
-	},
 	cache: function( owner ) {
 
-		// We can accept data for non-element nodes in modern browsers,
-		// but we should not, see #8335.
-		// Always return an empty object.
-		if ( !acceptData( owner ) ) {
-			return {};
-		}
-
 		// Check if the owner object already has a cache
 		var value = owner[ this.expando ];
 
@@ -3725,15 +4047,16 @@ Data.prototype = {
 			cache = this.cache( owner );
 
 		// Handle: [ owner, key, value ] args
+		// Always use camelCase key (gh-2257)
 		if ( typeof data === "string" ) {
-			cache[ data ] = value;
+			cache[ camelCase( data ) ] = value;
 
 		// Handle: [ owner, { properties } ] args
 		} else {
 
 			// Copy the properties one-by-one to the cache object
 			for ( prop in data ) {
-				cache[ prop ] = data[ prop ];
+				cache[ camelCase( prop ) ] = data[ prop ];
 			}
 		}
 		return cache;
@@ -3741,10 +4064,11 @@ Data.prototype = {
 	get: function( owner, key ) {
 		return key === undefined ?
 			this.cache( owner ) :
-			owner[ this.expando ] && owner[ this.expando ][ key ];
+
+			// Always use camelCase key (gh-2257)
+			owner[ this.expando ] && owner[ this.expando ][ camelCase( key ) ];
 	},
 	access: function( owner, key, value ) {
-		var stored;
 
 		// In cases where either:
 		//
@@ -3760,10 +4084,7 @@ Data.prototype = {
 		if ( key === undefined ||
 				( ( key && typeof key === "string" ) && value === undefined ) ) {
 
-			stored = this.get( owner, key );
-
-			return stored !== undefined ?
-				stored : this.get( owner, jQuery.camelCase( key ) );
+			return this.get( owner, key );
 		}
 
 		// When the key is not a string, or both a key and value
@@ -3779,58 +4100,45 @@ Data.prototype = {
 		return value !== undefined ? value : key;
 	},
 	remove: function( owner, key ) {
-		var i, name, camel,
+		var i,
 			cache = owner[ this.expando ];
 
 		if ( cache === undefined ) {
 			return;
 		}
 
-		if ( key === undefined ) {
-			this.register( owner );
-
-		} else {
+		if ( key !== undefined ) {
 
 			// Support array or space separated string of keys
-			if ( jQuery.isArray( key ) ) {
+			if ( Array.isArray( key ) ) {
 
-				// If "name" is an array of keys...
-				// When data is initially created, via ("key", "val") signature,
-				// keys will be converted to camelCase.
-				// Since there is no way to tell _how_ a key was added, remove
-				// both plain key and camelCase key. #12786
-				// This will only penalize the array argument path.
-				name = key.concat( key.map( jQuery.camelCase ) );
+				// If key is an array of keys...
+				// We always set camelCase keys, so remove that.
+				key = key.map( camelCase );
 			} else {
-				camel = jQuery.camelCase( key );
+				key = camelCase( key );
 
-				// Try the string as a key before any manipulation
-				if ( key in cache ) {
-					name = [ key, camel ];
-				} else {
-
-					// If a key with the spaces exists, use it.
-					// Otherwise, create an array by matching non-whitespace
-					name = camel;
-					name = name in cache ?
-						[ name ] : ( name.match( rnotwhite ) || [] );
-				}
+				// If a key with the spaces exists, use it.
+				// Otherwise, create an array by matching non-whitespace
+				key = key in cache ?
+					[ key ] :
+					( key.match( rnothtmlwhite ) || [] );
 			}
 
-			i = name.length;
+			i = key.length;
 
 			while ( i-- ) {
-				delete cache[ name[ i ] ];
+				delete cache[ key[ i ] ];
 			}
 		}
 
 		// Remove the expando if there's no more data
 		if ( key === undefined || jQuery.isEmptyObject( cache ) ) {
 
-			// Support: Chrome <= 35-45+
+			// Support: Chrome <=35 - 45
 			// Webkit & Blink performance suffers when deleting properties
 			// from DOM nodes, so set to undefined instead
-			// https://code.google.com/p/chromium/issues/detail?id=378607
+			// https://bugs.chromium.org/p/chromium/issues/detail?id=378607 (bug restricted)
 			if ( owner.nodeType ) {
 				owner[ this.expando ] = undefined;
 			} else {
@@ -3862,6 +4170,31 @@ var dataUser = new Data();
 var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,
 	rmultiDash = /[A-Z]/g;
 
+function getData( data ) {
+	if ( data === "true" ) {
+		return true;
+	}
+
+	if ( data === "false" ) {
+		return false;
+	}
+
+	if ( data === "null" ) {
+		return null;
+	}
+
+	// Only convert to a number if it doesn't change the string
+	if ( data === +data + "" ) {
+		return +data;
+	}
+
+	if ( rbrace.test( data ) ) {
+		return JSON.parse( data );
+	}
+
+	return data;
+}
+
 function dataAttr( elem, key, data ) {
 	var name;
 
@@ -3873,14 +4206,7 @@ function dataAttr( elem, key, data ) {
 
 		if ( typeof data === "string" ) {
 			try {
-				data = data === "true" ? true :
-					data === "false" ? false :
-					data === "null" ? null :
-
-					// Only convert to a number if it doesn't change the string
-					+data + "" === data ? +data :
-					rbrace.test( data ) ? jQuery.parseJSON( data ) :
-					data;
+				data = getData( data );
 			} catch ( e ) {}
 
 			// Make sure we set the data so it isn't changed later
@@ -3931,12 +4257,12 @@ jQuery.fn.extend( {
 					i = attrs.length;
 					while ( i-- ) {
 
-						// Support: IE11+
+						// Support: IE 11 only
 						// The attrs elements can be null (#14894)
 						if ( attrs[ i ] ) {
 							name = attrs[ i ].name;
 							if ( name.indexOf( "data-" ) === 0 ) {
-								name = jQuery.camelCase( name.slice( 5 ) );
+								name = camelCase( name.slice( 5 ) );
 								dataAttr( elem, name, data[ name ] );
 							}
 						}
@@ -3956,7 +4282,7 @@ jQuery.fn.extend( {
 		}
 
 		return access( this, function( value ) {
-			var data, camelKey;
+			var data;
 
 			// The calling jQuery object (element matches) is not empty
 			// (and therefore has an element appears at this[ 0 ]) and the
@@ -3966,29 +4292,15 @@ jQuery.fn.extend( {
 			if ( elem && value === undefined ) {
 
 				// Attempt to get data from the cache
-				// with the key as-is
-				data = dataUser.get( elem, key ) ||
-
-					// Try to find dashed key if it exists (gh-2779)
-					// This is for 2.2.x only
-					dataUser.get( elem, key.replace( rmultiDash, "-$&" ).toLowerCase() );
-
-				if ( data !== undefined ) {
-					return data;
-				}
-
-				camelKey = jQuery.camelCase( key );
-
-				// Attempt to get data from the cache
-				// with the key camelized
-				data = dataUser.get( elem, camelKey );
+				// The key will always be camelCased in Data
+				data = dataUser.get( elem, key );
 				if ( data !== undefined ) {
 					return data;
 				}
 
 				// Attempt to "discover" the data in
 				// HTML5 custom data-* attrs
-				data = dataAttr( elem, camelKey, undefined );
+				data = dataAttr( elem, key );
 				if ( data !== undefined ) {
 					return data;
 				}
@@ -3998,24 +4310,10 @@ jQuery.fn.extend( {
 			}
 
 			// Set the data...
-			camelKey = jQuery.camelCase( key );
 			this.each( function() {
 
-				// First, attempt to store a copy or reference of any
-				// data that might've been store with a camelCased key.
-				var data = dataUser.get( this, camelKey );
-
-				// For HTML5 data-* attribute interop, we have to
-				// store property names with dashes in a camelCase form.
-				// This might not apply to all properties...*
-				dataUser.set( this, camelKey, value );
-
-				// *... In the case of properties that might _actually_
-				// have dashes, we need to also store a copy of that
-				// unchanged property.
-				if ( key.indexOf( "-" ) > -1 && data !== undefined ) {
-					dataUser.set( this, key, value );
-				}
+				// We always store the camelCased key
+				dataUser.set( this, key, value );
 			} );
 		}, null, value, arguments.length > 1, null, true );
 	},
@@ -4038,7 +4336,7 @@ jQuery.extend( {
 
 			// Speed up dequeue by getting out quickly if this is just a lookup
 			if ( data ) {
-				if ( !queue || jQuery.isArray( data ) ) {
+				if ( !queue || Array.isArray( data ) ) {
 					queue = dataPriv.access( elem, type, jQuery.makeArray( data ) );
 				} else {
 					queue.push( data );
@@ -4168,24 +4466,58 @@ var rcssNum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" );
 
 var cssExpand = [ "Top", "Right", "Bottom", "Left" ];
 
-var isHidden = function( elem, el ) {
+var isHiddenWithinTree = function( elem, el ) {
 
-		// isHidden might be called from jQuery#filter function;
+		// isHiddenWithinTree might be called from jQuery#filter function;
 		// in that case, element will be second argument
 		elem = el || elem;
-		return jQuery.css( elem, "display" ) === "none" ||
-			!jQuery.contains( elem.ownerDocument, elem );
+
+		// Inline style trumps all
+		return elem.style.display === "none" ||
+			elem.style.display === "" &&
+
+			// Otherwise, check computed style
+			// Support: Firefox <=43 - 45
+			// Disconnected elements can have computed display: none, so first confirm that elem is
+			// in the document.
+			jQuery.contains( elem.ownerDocument, elem ) &&
+
+			jQuery.css( elem, "display" ) === "none";
 	};
 
+var swap = function( elem, options, callback, args ) {
+	var ret, name,
+		old = {};
+
+	// Remember the old values, and insert the new ones
+	for ( name in options ) {
+		old[ name ] = elem.style[ name ];
+		elem.style[ name ] = options[ name ];
+	}
+
+	ret = callback.apply( elem, args || [] );
+
+	// Revert the old values
+	for ( name in options ) {
+		elem.style[ name ] = old[ name ];
+	}
+
+	return ret;
+};
+
+
 
 
 function adjustCSS( elem, prop, valueParts, tween ) {
-	var adjusted,
-		scale = 1,
+	var adjusted, scale,
 		maxIterations = 20,
 		currentValue = tween ?
-			function() { return tween.cur(); } :
-			function() { return jQuery.css( elem, prop, "" ); },
+			function() {
+				return tween.cur();
+			} :
+			function() {
+				return jQuery.css( elem, prop, "" );
+			},
 		initial = currentValue(),
 		unit = valueParts && valueParts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
 
@@ -4195,30 +4527,33 @@ function adjustCSS( elem, prop, valueParts, tween ) {
 
 	if ( initialInUnit && initialInUnit[ 3 ] !== unit ) {
 
+		// Support: Firefox <=54
+		// Halve the iteration target value to prevent interference from CSS upper bounds (gh-2144)
+		initial = initial / 2;
+
 		// Trust units reported by jQuery.css
 		unit = unit || initialInUnit[ 3 ];
 
-		// Make sure we update the tween properties later on
-		valueParts = valueParts || [];
-
 		// Iteratively approximate from a nonzero starting point
 		initialInUnit = +initial || 1;
 
-		do {
+		while ( maxIterations-- ) {
 
-			// If previous iteration zeroed out, double until we get *something*.
-			// Use string for doubling so we don't accidentally see scale as unchanged below
-			scale = scale || ".5";
-
-			// Adjust and apply
-			initialInUnit = initialInUnit / scale;
+			// Evaluate and update our best guess (doubling guesses that zero out).
+			// Finish if the scale equals or crosses 1 (making the old*new product non-positive).
 			jQuery.style( elem, prop, initialInUnit + unit );
+			if ( ( 1 - scale ) * ( 1 - ( scale = currentValue() / initial || 0.5 ) ) <= 0 ) {
+				maxIterations = 0;
+			}
+			initialInUnit = initialInUnit / scale;
 
-		// Update scale, tolerating zero or NaN from tween.cur()
-		// Break the loop if scale is unchanged or perfect, or if we've just had enough.
-		} while (
-			scale !== ( scale = currentValue() / initial ) && scale !== 1 && --maxIterations
-		);
+		}
+
+		initialInUnit = initialInUnit * 2;
+		jQuery.style( elem, prop, initialInUnit + unit );
+
+		// Make sure we update the tween properties later on
+		valueParts = valueParts || [];
 	}
 
 	if ( valueParts ) {
@@ -4236,18 +4571,114 @@ function adjustCSS( elem, prop, valueParts, tween ) {
 	}
 	return adjusted;
 }
+
+
+var defaultDisplayMap = {};
+
+function getDefaultDisplay( elem ) {
+	var temp,
+		doc = elem.ownerDocument,
+		nodeName = elem.nodeName,
+		display = defaultDisplayMap[ nodeName ];
+
+	if ( display ) {
+		return display;
+	}
+
+	temp = doc.body.appendChild( doc.createElement( nodeName ) );
+	display = jQuery.css( temp, "display" );
+
+	temp.parentNode.removeChild( temp );
+
+	if ( display === "none" ) {
+		display = "block";
+	}
+	defaultDisplayMap[ nodeName ] = display;
+
+	return display;
+}
+
+function showHide( elements, show ) {
+	var display, elem,
+		values = [],
+		index = 0,
+		length = elements.length;
+
+	// Determine new display value for elements that need to change
+	for ( ; index < length; index++ ) {
+		elem = elements[ index ];
+		if ( !elem.style ) {
+			continue;
+		}
+
+		display = elem.style.display;
+		if ( show ) {
+
+			// Since we force visibility upon cascade-hidden elements, an immediate (and slow)
+			// check is required in this first loop unless we have a nonempty display value (either
+			// inline or about-to-be-restored)
+			if ( display === "none" ) {
+				values[ index ] = dataPriv.get( elem, "display" ) || null;
+				if ( !values[ index ] ) {
+					elem.style.display = "";
+				}
+			}
+			if ( elem.style.display === "" && isHiddenWithinTree( elem ) ) {
+				values[ index ] = getDefaultDisplay( elem );
+			}
+		} else {
+			if ( display !== "none" ) {
+				values[ index ] = "none";
+
+				// Remember what we're overwriting
+				dataPriv.set( elem, "display", display );
+			}
+		}
+	}
+
+	// Set the display of the elements in a second loop to avoid constant reflow
+	for ( index = 0; index < length; index++ ) {
+		if ( values[ index ] != null ) {
+			elements[ index ].style.display = values[ index ];
+		}
+	}
+
+	return elements;
+}
+
+jQuery.fn.extend( {
+	show: function() {
+		return showHide( this, true );
+	},
+	hide: function() {
+		return showHide( this );
+	},
+	toggle: function( state ) {
+		if ( typeof state === "boolean" ) {
+			return state ? this.show() : this.hide();
+		}
+
+		return this.each( function() {
+			if ( isHiddenWithinTree( this ) ) {
+				jQuery( this ).show();
+			} else {
+				jQuery( this ).hide();
+			}
+		} );
+	}
+} );
 var rcheckableType = ( /^(?:checkbox|radio)$/i );
 
-var rtagName = ( /<([\w:-]+)/ );
+var rtagName = ( /<([a-z][^\/\0>\x20\t\r\n\f]+)/i );
 
-var rscriptType = ( /^$|\/(?:java|ecma)script/i );
+var rscriptType = ( /^$|^module$|\/(?:java|ecma)script/i );
 
 
 
 // We have to close these tags to support XHTML (#13200)
 var wrapMap = {
 
-	// Support: IE9
+	// Support: IE <=9 only
 	option: [ 1, "<select multiple='multiple'>", "</select>" ],
 
 	// XHTML parsers do not magically insert elements in the
@@ -4261,7 +4692,7 @@ var wrapMap = {
 	_default: [ 0, "", "" ]
 };
 
-// Support: IE9
+// Support: IE <=9 only
 wrapMap.optgroup = wrapMap.option;
 
 wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
@@ -4270,17 +4701,25 @@ wrapMap.th = wrapMap.td;
 
 function getAll( context, tag ) {
 
-	// Support: IE9-11+
+	// Support: IE <=9 - 11 only
 	// Use typeof to avoid zero-argument method invocation on host objects (#15151)
-	var ret = typeof context.getElementsByTagName !== "undefined" ?
-			context.getElementsByTagName( tag || "*" ) :
-			typeof context.querySelectorAll !== "undefined" ?
-				context.querySelectorAll( tag || "*" ) :
-			[];
+	var ret;
 
-	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
-		jQuery.merge( [ context ], ret ) :
-		ret;
+	if ( typeof context.getElementsByTagName !== "undefined" ) {
+		ret = context.getElementsByTagName( tag || "*" );
+
+	} else if ( typeof context.querySelectorAll !== "undefined" ) {
+		ret = context.querySelectorAll( tag || "*" );
+
+	} else {
+		ret = [];
+	}
+
+	if ( tag === undefined || tag && nodeName( context, tag ) ) {
+		return jQuery.merge( [ context ], ret );
+	}
+
+	return ret;
 }
 
 
@@ -4314,9 +4753,9 @@ function buildFragment( elems, context, scripts, selection, ignored ) {
 		if ( elem || elem === 0 ) {
 
 			// Add nodes directly
-			if ( jQuery.type( elem ) === "object" ) {
+			if ( toType( elem ) === "object" ) {
 
-				// Support: Android<4.1, PhantomJS<2
+				// Support: Android <=4.0 only, PhantomJS 1 only
 				// push.apply(_, arraylike) throws on ancient WebKit
 				jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
 
@@ -4339,7 +4778,7 @@ function buildFragment( elems, context, scripts, selection, ignored ) {
 					tmp = tmp.lastChild;
 				}
 
-				// Support: Android<4.1, PhantomJS<2
+				// Support: Android <=4.0 only, PhantomJS 1 only
 				// push.apply(_, arraylike) throws on ancient WebKit
 				jQuery.merge( nodes, tmp.childNodes );
 
@@ -4396,7 +4835,7 @@ function buildFragment( elems, context, scripts, selection, ignored ) {
 		div = fragment.appendChild( document.createElement( "div" ) ),
 		input = document.createElement( "input" );
 
-	// Support: Android 4.0-4.3, Safari<=5.1
+	// Support: Android 4.0 - 4.3 only
 	// Check state lost if the name is set (#11217)
 	// Support: Windows Web Apps (WWA)
 	// `name` and `type` must use .setAttribute for WWA (#14901)
@@ -4406,15 +4845,17 @@ function buildFragment( elems, context, scripts, selection, ignored ) {
 
 	div.appendChild( input );
 
-	// Support: Safari<=5.1, Android<4.2
+	// Support: Android <=4.1 only
 	// Older WebKit doesn't clone checked state correctly in fragments
 	support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
 
-	// Support: IE<=11+
+	// Support: IE <=11 only
 	// Make sure textarea (and checkbox) defaultValue is properly cloned
 	div.innerHTML = "<textarea>x</textarea>";
 	support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
 } )();
+var documentElement = document.documentElement;
+
 
 
 var
@@ -4430,7 +4871,7 @@ function returnFalse() {
 	return false;
 }
 
-// Support: IE9
+// Support: IE <=9 only
 // See #13393 for more info
 function safeActiveElement() {
 	try {
@@ -4479,7 +4920,7 @@ function on( elem, types, selector, data, fn, one ) {
 	if ( fn === false ) {
 		fn = returnFalse;
 	} else if ( !fn ) {
-		return this;
+		return elem;
 	}
 
 	if ( one === 1 ) {
@@ -4526,6 +4967,12 @@ jQuery.event = {
 			selector = handleObjIn.selector;
 		}
 
+		// Ensure that invalid selectors throw exceptions at attach time
+		// Evaluate against documentElement in case elem is a non-element node (e.g., document)
+		if ( selector ) {
+			jQuery.find.matchesSelector( documentElement, selector );
+		}
+
 		// Make sure that the handler has a unique ID, used to find/remove it later
 		if ( !handler.guid ) {
 			handler.guid = jQuery.guid++;
@@ -4546,7 +4993,7 @@ jQuery.event = {
 		}
 
 		// Handle multiple events separated by a space
-		types = ( types || "" ).match( rnotwhite ) || [ "" ];
+		types = ( types || "" ).match( rnothtmlwhite ) || [ "" ];
 		t = types.length;
 		while ( t-- ) {
 			tmp = rtypenamespace.exec( types[ t ] ) || [];
@@ -4628,7 +5075,7 @@ jQuery.event = {
 		}
 
 		// Once for each type.namespace in types; type may be omitted
-		types = ( types || "" ).match( rnotwhite ) || [ "" ];
+		types = ( types || "" ).match( rnothtmlwhite ) || [ "" ];
 		t = types.length;
 		while ( t-- ) {
 			tmp = rtypenamespace.exec( types[ t ] ) || [];
@@ -4689,19 +5136,23 @@ jQuery.event = {
 		}
 	},
 
-	dispatch: function( event ) {
+	dispatch: function( nativeEvent ) {
 
 		// Make a writable jQuery.Event from the native event object
-		event = jQuery.event.fix( event );
+		var event = jQuery.event.fix( nativeEvent );
 
-		var i, j, ret, matched, handleObj,
-			handlerQueue = [],
-			args = slice.call( arguments ),
+		var i, j, ret, matched, handleObj, handlerQueue,
+			args = new Array( arguments.length ),
 			handlers = ( dataPriv.get( this, "events" ) || {} )[ event.type ] || [],
 			special = jQuery.event.special[ event.type ] || {};
 
 		// Use the fix-ed jQuery.Event rather than the (read-only) native event
 		args[ 0 ] = event;
+
+		for ( i = 1; i < arguments.length; i++ ) {
+			args[ i ] = arguments[ i ];
+		}
+
 		event.delegateTarget = this;
 
 		// Call the preDispatch hook for the mapped type, and let it bail if desired
@@ -4750,146 +5201,95 @@ jQuery.event = {
 	},
 
 	handlers: function( event, handlers ) {
-		var i, matches, sel, handleObj,
+		var i, handleObj, sel, matchedHandlers, matchedSelectors,
 			handlerQueue = [],
 			delegateCount = handlers.delegateCount,
 			cur = event.target;
 
-		// Support (at least): Chrome, IE9
 		// Find delegate handlers
-		// Black-hole SVG <use> instance trees (#13180)
-		//
-		// Support: Firefox<=42+
-		// Avoid non-left-click in FF but don't block IE radio events (#3861, gh-2343)
-		if ( delegateCount && cur.nodeType &&
-			( event.type !== "click" || isNaN( event.button ) || event.button < 1 ) ) {
+		if ( delegateCount &&
+
+			// Support: IE <=9
+			// Black-hole SVG <use> instance trees (trac-13180)
+			cur.nodeType &&
+
+			// Support: Firefox <=42
+			// Suppress spec-violating clicks indicating a non-primary pointer button (trac-3861)
+			// https://www.w3.org/TR/DOM-Level-3-Events/#event-type-click
+			// Support: IE 11 only
+			// ...but not arrow key "clicks" of radio inputs, which can have `button` -1 (gh-2343)
+			!( event.type === "click" && event.button >= 1 ) ) {
 
 			for ( ; cur !== this; cur = cur.parentNode || this ) {
 
 				// Don't check non-elements (#13208)
 				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
-				if ( cur.nodeType === 1 && ( cur.disabled !== true || event.type !== "click" ) ) {
-					matches = [];
+				if ( cur.nodeType === 1 && !( event.type === "click" && cur.disabled === true ) ) {
+					matchedHandlers = [];
+					matchedSelectors = {};
 					for ( i = 0; i < delegateCount; i++ ) {
 						handleObj = handlers[ i ];
 
 						// Don't conflict with Object.prototype properties (#13203)
 						sel = handleObj.selector + " ";
 
-						if ( matches[ sel ] === undefined ) {
-							matches[ sel ] = handleObj.needsContext ?
+						if ( matchedSelectors[ sel ] === undefined ) {
+							matchedSelectors[ sel ] = handleObj.needsContext ?
 								jQuery( sel, this ).index( cur ) > -1 :
 								jQuery.find( sel, this, null, [ cur ] ).length;
 						}
-						if ( matches[ sel ] ) {
-							matches.push( handleObj );
+						if ( matchedSelectors[ sel ] ) {
+							matchedHandlers.push( handleObj );
 						}
 					}
-					if ( matches.length ) {
-						handlerQueue.push( { elem: cur, handlers: matches } );
+					if ( matchedHandlers.length ) {
+						handlerQueue.push( { elem: cur, handlers: matchedHandlers } );
 					}
 				}
 			}
 		}
 
 		// Add the remaining (directly-bound) handlers
+		cur = this;
 		if ( delegateCount < handlers.length ) {
-			handlerQueue.push( { elem: this, handlers: handlers.slice( delegateCount ) } );
+			handlerQueue.push( { elem: cur, handlers: handlers.slice( delegateCount ) } );
 		}
 
 		return handlerQueue;
 	},
 
-	// Includes some event props shared by KeyEvent and MouseEvent
-	props: ( "altKey bubbles cancelable ctrlKey currentTarget detail eventPhase " +
-		"metaKey relatedTarget shiftKey target timeStamp view which" ).split( " " ),
+	addProp: function( name, hook ) {
+		Object.defineProperty( jQuery.Event.prototype, name, {
+			enumerable: true,
+			configurable: true,
 
-	fixHooks: {},
+			get: isFunction( hook ) ?
+				function() {
+					if ( this.originalEvent ) {
+							return hook( this.originalEvent );
+					}
+				} :
+				function() {
+					if ( this.originalEvent ) {
+							return this.originalEvent[ name ];
+					}
+				},
 
-	keyHooks: {
-		props: "char charCode key keyCode".split( " " ),
-		filter: function( event, original ) {
-
-			// Add which for key events
-			if ( event.which == null ) {
-				event.which = original.charCode != null ? original.charCode : original.keyCode;
+			set: function( value ) {
+				Object.defineProperty( this, name, {
+					enumerable: true,
+					configurable: true,
+					writable: true,
+					value: value
+				} );
 			}
-
-			return event;
-		}
+		} );
 	},
 
-	mouseHooks: {
-		props: ( "button buttons clientX clientY offsetX offsetY pageX pageY " +
-			"screenX screenY toElement" ).split( " " ),
-		filter: function( event, original ) {
-			var eventDoc, doc, body,
-				button = original.button;
-
-			// Calculate pageX/Y if missing and clientX/Y available
-			if ( event.pageX == null && original.clientX != null ) {
-				eventDoc = event.target.ownerDocument || document;
-				doc = eventDoc.documentElement;
-				body = eventDoc.body;
-
-				event.pageX = original.clientX +
-					( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) -
-					( doc && doc.clientLeft || body && body.clientLeft || 0 );
-				event.pageY = original.clientY +
-					( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) -
-					( doc && doc.clientTop  || body && body.clientTop  || 0 );
-			}
-
-			// Add which for click: 1 === left; 2 === middle; 3 === right
-			// Note: button is not normalized, so don't use it
-			if ( !event.which && button !== undefined ) {
-				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
-			}
-
-			return event;
-		}
-	},
-
-	fix: function( event ) {
-		if ( event[ jQuery.expando ] ) {
-			return event;
-		}
-
-		// Create a writable copy of the event object and normalize some properties
-		var i, prop, copy,
-			type = event.type,
-			originalEvent = event,
-			fixHook = this.fixHooks[ type ];
-
-		if ( !fixHook ) {
-			this.fixHooks[ type ] = fixHook =
-				rmouseEvent.test( type ) ? this.mouseHooks :
-				rkeyEvent.test( type ) ? this.keyHooks :
-				{};
-		}
-		copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
-
-		event = new jQuery.Event( originalEvent );
-
-		i = copy.length;
-		while ( i-- ) {
-			prop = copy[ i ];
-			event[ prop ] = originalEvent[ prop ];
-		}
-
-		// Support: Cordova 2.5 (WebKit) (#13255)
-		// All events should have a target; Cordova deviceready doesn't
-		if ( !event.target ) {
-			event.target = document;
-		}
-
-		// Support: Safari 6.0+, Chrome<28
-		// Target should not be a text node (#504, #13143)
-		if ( event.target.nodeType === 3 ) {
-			event.target = event.target.parentNode;
-		}
-
-		return fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
+	fix: function( originalEvent ) {
+		return originalEvent[ jQuery.expando ] ?
+			originalEvent :
+			new jQuery.Event( originalEvent );
 	},
 
 	special: {
@@ -4922,7 +5322,7 @@ jQuery.event = {
 
 			// For checkbox, fire native event so checked state will be right
 			trigger: function() {
-				if ( this.type === "checkbox" && this.click && jQuery.nodeName( this, "input" ) ) {
+				if ( this.type === "checkbox" && this.click && nodeName( this, "input" ) ) {
 					this.click();
 					return false;
 				}
@@ -4930,7 +5330,7 @@ jQuery.event = {
 
 			// For cross-browser consistency, don't fire native .click() on links
 			_default: function( event ) {
-				return jQuery.nodeName( event.target, "a" );
+				return nodeName( event.target, "a" );
 			}
 		},
 
@@ -4972,11 +5372,21 @@ jQuery.Event = function( src, props ) {
 		this.isDefaultPrevented = src.defaultPrevented ||
 				src.defaultPrevented === undefined &&
 
-				// Support: Android<4.0
+				// Support: Android <=2.3 only
 				src.returnValue === false ?
 			returnTrue :
 			returnFalse;
 
+		// Create target properties
+		// Support: Safari <=6 - 7 only
+		// Target should not be a text node (#504, #13143)
+		this.target = ( src.target && src.target.nodeType === 3 ) ?
+			src.target.parentNode :
+			src.target;
+
+		this.currentTarget = src.currentTarget;
+		this.relatedTarget = src.relatedTarget;
+
 	// Event type
 	} else {
 		this.type = src;
@@ -4988,26 +5398,27 @@ jQuery.Event = function( src, props ) {
 	}
 
 	// Create a timestamp if incoming event doesn't have one
-	this.timeStamp = src && src.timeStamp || jQuery.now();
+	this.timeStamp = src && src.timeStamp || Date.now();
 
 	// Mark it as fixed
 	this[ jQuery.expando ] = true;
 };
 
 // jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
+// https://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
 jQuery.Event.prototype = {
 	constructor: jQuery.Event,
 	isDefaultPrevented: returnFalse,
 	isPropagationStopped: returnFalse,
 	isImmediatePropagationStopped: returnFalse,
+	isSimulated: false,
 
 	preventDefault: function() {
 		var e = this.originalEvent;
 
 		this.isDefaultPrevented = returnTrue;
 
-		if ( e ) {
+		if ( e && !this.isSimulated ) {
 			e.preventDefault();
 		}
 	},
@@ -5016,7 +5427,7 @@ jQuery.Event.prototype = {
 
 		this.isPropagationStopped = returnTrue;
 
-		if ( e ) {
+		if ( e && !this.isSimulated ) {
 			e.stopPropagation();
 		}
 	},
@@ -5025,7 +5436,7 @@ jQuery.Event.prototype = {
 
 		this.isImmediatePropagationStopped = returnTrue;
 
-		if ( e ) {
+		if ( e && !this.isSimulated ) {
 			e.stopImmediatePropagation();
 		}
 
@@ -5033,13 +5444,74 @@ jQuery.Event.prototype = {
 	}
 };
 
+// Includes all common event props including KeyEvent and MouseEvent specific props
+jQuery.each( {
+	altKey: true,
+	bubbles: true,
+	cancelable: true,
+	changedTouches: true,
+	ctrlKey: true,
+	detail: true,
+	eventPhase: true,
+	metaKey: true,
+	pageX: true,
+	pageY: true,
+	shiftKey: true,
+	view: true,
+	"char": true,
+	charCode: true,
+	key: true,
+	keyCode: true,
+	button: true,
+	buttons: true,
+	clientX: true,
+	clientY: true,
+	offsetX: true,
+	offsetY: true,
+	pointerId: true,
+	pointerType: true,
+	screenX: true,
+	screenY: true,
+	targetTouches: true,
+	toElement: true,
+	touches: true,
+
+	which: function( event ) {
+		var button = event.button;
+
+		// Add which for key events
+		if ( event.which == null && rkeyEvent.test( event.type ) ) {
+			return event.charCode != null ? event.charCode : event.keyCode;
+		}
+
+		// Add which for click: 1 === left; 2 === middle; 3 === right
+		if ( !event.which && button !== undefined && rmouseEvent.test( event.type ) ) {
+			if ( button & 1 ) {
+				return 1;
+			}
+
+			if ( button & 2 ) {
+				return 3;
+			}
+
+			if ( button & 4 ) {
+				return 2;
+			}
+
+			return 0;
+		}
+
+		return event.which;
+	}
+}, jQuery.event.addProp );
+
 // Create mouseenter/leave events using mouseover/out and event-time checks
 // so that event delegation works in jQuery.
 // Do the same for pointerenter/pointerleave and pointerover/pointerout
 //
 // Support: Safari 7 only
 // Safari sends mouseenter too often; see:
-// https://code.google.com/p/chromium/issues/detail?id=470258
+// https://bugs.chromium.org/p/chromium/issues/detail?id=470258
 // for the description of the bug (it existed in older Chrome versions as well).
 jQuery.each( {
 	mouseenter: "mouseover",
@@ -5070,6 +5542,7 @@ jQuery.each( {
 } );
 
 jQuery.fn.extend( {
+
 	on: function( types, selector, data, fn ) {
 		return on( this, types, selector, data, fn );
 	},
@@ -5116,23 +5589,29 @@ jQuery.fn.extend( {
 
 
 var
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,
 
-	// Support: IE 10-11, Edge 10240+
+	/* eslint-disable max-len */
+
+	// See https://github.com/eslint/eslint/issues/3229
+	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,
+
+	/* eslint-enable */
+
+	// Support: IE <=10 - 11, Edge 12 - 13 only
 	// In IE/Edge using regex groups here causes severe slowdowns.
 	// See https://connect.microsoft.com/IE/feedback/details/1736512/
 	rnoInnerhtml = /<script|<style|<link/i,
 
 	// checked="checked" or checked
 	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
-	rscriptTypeMasked = /^true\/(.*)/,
 	rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;
 
+// Prefer a tbody over its parent table for containing new rows
 function manipulationTarget( elem, content ) {
-	if ( jQuery.nodeName( elem, "table" ) &&
-		jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ) {
+	if ( nodeName( elem, "table" ) &&
+		nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ) {
 
-		return elem.getElementsByTagName( "tbody" )[ 0 ] || elem;
+		return jQuery( elem ).children( "tbody" )[ 0 ] || elem;
 	}
 
 	return elem;
@@ -5144,10 +5623,8 @@ function disableScript( elem ) {
 	return elem;
 }
 function restoreScript( elem ) {
-	var match = rscriptTypeMasked.exec( elem.type );
-
-	if ( match ) {
-		elem.type = match[ 1 ];
+	if ( ( elem.type || "" ).slice( 0, 5 ) === "true/" ) {
+		elem.type = elem.type.slice( 5 );
 	} else {
 		elem.removeAttribute( "type" );
 	}
@@ -5213,15 +5690,15 @@ function domManip( collection, args, callback, ignored ) {
 		l = collection.length,
 		iNoClone = l - 1,
 		value = args[ 0 ],
-		isFunction = jQuery.isFunction( value );
+		valueIsFunction = isFunction( value );
 
 	// We can't cloneNode fragments that contain checked, in WebKit
-	if ( isFunction ||
+	if ( valueIsFunction ||
 			( l > 1 && typeof value === "string" &&
 				!support.checkClone && rchecked.test( value ) ) ) {
 		return collection.each( function( index ) {
 			var self = collection.eq( index );
-			if ( isFunction ) {
+			if ( valueIsFunction ) {
 				args[ 0 ] = value.call( this, index, self.html() );
 			}
 			domManip( self, args, callback, ignored );
@@ -5253,7 +5730,7 @@ function domManip( collection, args, callback, ignored ) {
 					// Keep references to cloned scripts for later restoration
 					if ( hasScripts ) {
 
-						// Support: Android<4.1, PhantomJS<2
+						// Support: Android <=4.0 only, PhantomJS 1 only
 						// push.apply(_, arraylike) throws on ancient WebKit
 						jQuery.merge( scripts, getAll( node, "script" ) );
 					}
@@ -5275,14 +5752,14 @@ function domManip( collection, args, callback, ignored ) {
 						!dataPriv.access( node, "globalEval" ) &&
 						jQuery.contains( doc, node ) ) {
 
-						if ( node.src ) {
+						if ( node.src && ( node.type || "" ).toLowerCase()  !== "module" ) {
 
 							// Optional AJAX dependency, but won't run scripts if not present
 							if ( jQuery._evalUrl ) {
 								jQuery._evalUrl( node.src );
 							}
 						} else {
-							jQuery.globalEval( node.textContent.replace( rcleanScript, "" ) );
+							DOMEval( node.textContent.replace( rcleanScript, "" ), doc, node );
 						}
 					}
 				}
@@ -5328,7 +5805,7 @@ jQuery.extend( {
 		if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) &&
 				!jQuery.isXMLDoc( elem ) ) {
 
-			// We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
+			// We eschew Sizzle here for performance reasons: https://jsperf.com/getall-vs-sizzle/2
 			destElements = getAll( clone );
 			srcElements = getAll( elem );
 
@@ -5381,13 +5858,13 @@ jQuery.extend( {
 						}
 					}
 
-					// Support: Chrome <= 35-45+
+					// Support: Chrome <=35 - 45+
 					// Assign undefined instead of using delete, see Data#remove
 					elem[ dataPriv.expando ] = undefined;
 				}
 				if ( elem[ dataUser.expando ] ) {
 
-					// Support: Chrome <= 35-45+
+					// Support: Chrome <=35 - 45+
 					// Assign undefined instead of using delete, see Data#remove
 					elem[ dataUser.expando ] = undefined;
 				}
@@ -5397,10 +5874,6 @@ jQuery.extend( {
 } );
 
 jQuery.fn.extend( {
-
-	// Keep domManip exposed until 3.0 (gh-2225)
-	domManip: domManip,
-
 	detach: function( selector ) {
 		return remove( this, selector, true );
 	},
@@ -5558,124 +6031,86 @@ jQuery.each( {
 			elems = i === last ? this : this.clone( true );
 			jQuery( insert[ i ] )[ original ]( elems );
 
-			// Support: QtWebKit
-			// .get() because push.apply(_, arraylike) throws
+			// Support: Android <=4.0 only, PhantomJS 1 only
+			// .get() because push.apply(_, arraylike) throws on ancient WebKit
 			push.apply( ret, elems.get() );
 		}
 
 		return this.pushStack( ret );
 	};
 } );
-
-
-var iframe,
-	elemdisplay = {
-
-		// Support: Firefox
-		// We have to pre-define these values for FF (#10227)
-		HTML: "block",
-		BODY: "block"
-	};
-
-/**
- * Retrieve the actual display of a element
- * @param {String} name nodeName of the element
- * @param {Object} doc Document object
- */
-
-// Called only from within defaultDisplay
-function actualDisplay( name, doc ) {
-	var elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
-
-		display = jQuery.css( elem[ 0 ], "display" );
-
-	// We don't have any data stored on the element,
-	// so use "detach" method as fast way to get rid of the element
-	elem.detach();
-
-	return display;
-}
-
-/**
- * Try to determine the default display value of an element
- * @param {String} nodeName
- */
-function defaultDisplay( nodeName ) {
-	var doc = document,
-		display = elemdisplay[ nodeName ];
-
-	if ( !display ) {
-		display = actualDisplay( nodeName, doc );
-
-		// If the simple way fails, read from inside an iframe
-		if ( display === "none" || !display ) {
-
-			// Use the already-created iframe if possible
-			iframe = ( iframe || jQuery( "<iframe frameborder='0' width='0' height='0'/>" ) )
-				.appendTo( doc.documentElement );
-
-			// Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse
-			doc = iframe[ 0 ].contentDocument;
-
-			// Support: IE
-			doc.write();
-			doc.close();
-
-			display = actualDisplay( nodeName, doc );
-			iframe.detach();
-		}
-
-		// Store the correct default display
-		elemdisplay[ nodeName ] = display;
-	}
-
-	return display;
-}
-var rmargin = ( /^margin/ );
-
 var rnumnonpx = new RegExp( "^(" + pnum + ")(?!px)[a-z%]+$", "i" );
 
 var getStyles = function( elem ) {
 
-		// Support: IE<=11+, Firefox<=30+ (#15098, #14150)
+		// Support: IE <=11 only, Firefox <=30 (#15098, #14150)
 		// IE throws on elements created in popups
 		// FF meanwhile throws on frame elements through "defaultView.getComputedStyle"
 		var view = elem.ownerDocument.defaultView;
 
-		if ( !view.opener ) {
+		if ( !view || !view.opener ) {
 			view = window;
 		}
 
 		return view.getComputedStyle( elem );
 	};
 
-var swap = function( elem, options, callback, args ) {
-	var ret, name,
-		old = {};
-
-	// Remember the old values, and insert the new ones
-	for ( name in options ) {
-		old[ name ] = elem.style[ name ];
-		elem.style[ name ] = options[ name ];
-	}
-
-	ret = callback.apply( elem, args || [] );
-
-	// Revert the old values
-	for ( name in options ) {
-		elem.style[ name ] = old[ name ];
-	}
-
-	return ret;
-};
-
-
-var documentElement = document.documentElement;
+var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
 
 
 
 ( function() {
-	var pixelPositionVal, boxSizingReliableVal, pixelMarginRightVal, reliableMarginLeftVal,
+
+	// Executing both pixelPosition & boxSizingReliable tests require only one layout
+	// so they're executed at the same time to save the second computation.
+	function computeStyleTests() {
+
+		// This is a singleton, we need to execute it only once
+		if ( !div ) {
+			return;
+		}
+
+		container.style.cssText = "position:absolute;left:-11111px;width:60px;" +
+			"margin-top:1px;padding:0;border:0";
+		div.style.cssText =
+			"position:relative;display:block;box-sizing:border-box;overflow:scroll;" +
+			"margin:auto;border:1px;padding:1px;" +
+			"width:60%;top:1%";
+		documentElement.appendChild( container ).appendChild( div );
+
+		var divStyle = window.getComputedStyle( div );
+		pixelPositionVal = divStyle.top !== "1%";
+
+		// Support: Android 4.0 - 4.3 only, Firefox <=3 - 44
+		reliableMarginLeftVal = roundPixelMeasures( divStyle.marginLeft ) === 12;
+
+		// Support: Android 4.0 - 4.3 only, Safari <=9.1 - 10.1, iOS <=7.0 - 9.3
+		// Some styles come back with percentage values, even though they shouldn't
+		div.style.right = "60%";
+		pixelBoxStylesVal = roundPixelMeasures( divStyle.right ) === 36;
+
+		// Support: IE 9 - 11 only
+		// Detect misreporting of content dimensions for box-sizing:border-box elements
+		boxSizingReliableVal = roundPixelMeasures( divStyle.width ) === 36;
+
+		// Support: IE 9 only
+		// Detect overflow:scroll screwiness (gh-3699)
+		div.style.position = "absolute";
+		scrollboxSizeVal = div.offsetWidth === 36 || "absolute";
+
+		documentElement.removeChild( container );
+
+		// Nullify the div so it wouldn't be stored in the memory and
+		// it will also be a sign that checks already performed
+		div = null;
+	}
+
+	function roundPixelMeasures( measure ) {
+		return Math.round( parseFloat( measure ) );
+	}
+
+	var pixelPositionVal, boxSizingReliableVal, scrollboxSizeVal, pixelBoxStylesVal,
+		reliableMarginLeftVal,
 		container = document.createElement( "div" ),
 		div = document.createElement( "div" );
 
@@ -5684,103 +6119,32 @@ var documentElement = document.documentElement;
 		return;
 	}
 
-	// Support: IE9-11+
+	// Support: IE <=9 - 11 only
 	// Style of cloned element affects source element cloned (#8908)
 	div.style.backgroundClip = "content-box";
 	div.cloneNode( true ).style.backgroundClip = "";
 	support.clearCloneStyle = div.style.backgroundClip === "content-box";
 
-	container.style.cssText = "border:0;width:8px;height:0;top:0;left:-9999px;" +
-		"padding:0;margin-top:1px;position:absolute";
-	container.appendChild( div );
-
-	// Executing both pixelPosition & boxSizingReliable tests require only one layout
-	// so they're executed at the same time to save the second computation.
-	function computeStyleTests() {
-		div.style.cssText =
-
-			// Support: Firefox<29, Android 2.3
-			// Vendor-prefix box-sizing
-			"-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;" +
-			"position:relative;display:block;" +
-			"margin:auto;border:1px;padding:1px;" +
-			"top:1%;width:50%";
-		div.innerHTML = "";
-		documentElement.appendChild( container );
-
-		var divStyle = window.getComputedStyle( div );
-		pixelPositionVal = divStyle.top !== "1%";
-		reliableMarginLeftVal = divStyle.marginLeft === "2px";
-		boxSizingReliableVal = divStyle.width === "4px";
-
-		// Support: Android 4.0 - 4.3 only
-		// Some styles come back with percentage values, even though they shouldn't
-		div.style.marginRight = "50%";
-		pixelMarginRightVal = divStyle.marginRight === "4px";
-
-		documentElement.removeChild( container );
-	}
-
 	jQuery.extend( support, {
+		boxSizingReliable: function() {
+			computeStyleTests();
+			return boxSizingReliableVal;
+		},
+		pixelBoxStyles: function() {
+			computeStyleTests();
+			return pixelBoxStylesVal;
+		},
 		pixelPosition: function() {
-
-			// This test is executed only once but we still do memoizing
-			// since we can use the boxSizingReliable pre-computing.
-			// No need to check if the test was already performed, though.
 			computeStyleTests();
 			return pixelPositionVal;
 		},
-		boxSizingReliable: function() {
-			if ( boxSizingReliableVal == null ) {
-				computeStyleTests();
-			}
-			return boxSizingReliableVal;
-		},
-		pixelMarginRight: function() {
-
-			// Support: Android 4.0-4.3
-			// We're checking for boxSizingReliableVal here instead of pixelMarginRightVal
-			// since that compresses better and they're computed together anyway.
-			if ( boxSizingReliableVal == null ) {
-				computeStyleTests();
-			}
-			return pixelMarginRightVal;
-		},
 		reliableMarginLeft: function() {
-
-			// Support: IE <=8 only, Android 4.0 - 4.3 only, Firefox <=3 - 37
-			if ( boxSizingReliableVal == null ) {
-				computeStyleTests();
-			}
+			computeStyleTests();
 			return reliableMarginLeftVal;
 		},
-		reliableMarginRight: function() {
-
-			// Support: Android 2.3
-			// Check if div with explicit width and no margin-right incorrectly
-			// gets computed margin-right based on width of container. (#3333)
-			// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-			// This support function is only executed once so no memoizing is needed.
-			var ret,
-				marginDiv = div.appendChild( document.createElement( "div" ) );
-
-			// Reset CSS: box-sizing; display; margin; border; padding
-			marginDiv.style.cssText = div.style.cssText =
-
-				// Support: Android 2.3
-				// Vendor-prefix box-sizing
-				"-webkit-box-sizing:content-box;box-sizing:content-box;" +
-				"display:block;margin:0;border:0;padding:0";
-			marginDiv.style.marginRight = marginDiv.style.width = "0";
-			div.style.width = "1px";
-			documentElement.appendChild( container );
-
-			ret = !parseFloat( window.getComputedStyle( marginDiv ).marginRight );
-
-			documentElement.removeChild( container );
-			div.removeChild( marginDiv );
-
-			return ret;
+		scrollboxSize: function() {
+			computeStyleTests();
+			return scrollboxSizeVal;
 		}
 	} );
 } )();
@@ -5788,12 +6152,18 @@ var documentElement = document.documentElement;
 
 function curCSS( elem, name, computed ) {
 	var width, minWidth, maxWidth, ret,
+
+		// Support: Firefox 51+
+		// Retrieving style before computed somehow
+		// fixes an issue with getting wrong values
+		// on detached elements
 		style = elem.style;
 
 	computed = computed || getStyles( elem );
 
-	// Support: IE9
-	// getPropertyValue is only needed for .css('filter') (#12537)
+	// getPropertyValue is needed for:
+	//   .css('filter') (IE 9 only, #12537)
+	//   .css('--customProperty) (#3144)
 	if ( computed ) {
 		ret = computed.getPropertyValue( name ) || computed[ name ];
 
@@ -5805,8 +6175,8 @@ function curCSS( elem, name, computed ) {
 		// Android Browser returns percentage for some values,
 		// but width seems to be reliably pixels.
 		// This is against the CSSOM draft spec:
-		// http://dev.w3.org/csswg/cssom/#resolved-values
-		if ( !support.pixelMarginRight() && rnumnonpx.test( ret ) && rmargin.test( name ) ) {
+		// https://drafts.csswg.org/cssom/#resolved-values
+		if ( !support.pixelBoxStyles() && rnumnonpx.test( ret ) && rboxStyle.test( name ) ) {
 
 			// Remember the original values
 			width = style.width;
@@ -5826,7 +6196,7 @@ function curCSS( elem, name, computed ) {
 
 	return ret !== undefined ?
 
-		// Support: IE9-11+
+		// Support: IE <=9 - 11 only
 		// IE returns zIndex value as an integer.
 		ret + "" :
 		ret;
@@ -5859,14 +6229,14 @@ var
 	// except "table", "table-cell", or "table-caption"
 	// See here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
 	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
-
+	rcustomProp = /^--/,
 	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
 	cssNormalTransform = {
 		letterSpacing: "0",
 		fontWeight: "400"
 	},
 
-	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ],
+	cssPrefixes = [ "Webkit", "Moz", "ms" ],
 	emptyStyle = document.createElement( "div" ).style;
 
 // Return a css property mapped to a potentially vendor prefixed property
@@ -5889,6 +6259,16 @@ function vendorPropName( name ) {
 	}
 }
 
+// Return a property mapped along what jQuery.cssProps suggests or to
+// a vendor prefixed property.
+function finalPropName( name ) {
+	var ret = jQuery.cssProps[ name ];
+	if ( !ret ) {
+		ret = jQuery.cssProps[ name ] = vendorPropName( name ) || name;
+	}
+	return ret;
+}
+
 function setPositiveNumber( elem, value, subtract ) {
 
 	// Any relative (+/-) values have already been
@@ -5901,168 +6281,124 @@ function setPositiveNumber( elem, value, subtract ) {
 		value;
 }
 
-function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
-	var i = extra === ( isBorderBox ? "border" : "content" ) ?
+function boxModelAdjustment( elem, dimension, box, isBorderBox, styles, computedVal ) {
+	var i = dimension === "width" ? 1 : 0,
+		extra = 0,
+		delta = 0;
 
-		// If we already have the right measurement, avoid augmentation
-		4 :
-
-		// Otherwise initialize for horizontal or vertical properties
-		name === "width" ? 1 : 0,
-
-		val = 0;
+	// Adjustment may not be necessary
+	if ( box === ( isBorderBox ? "border" : "content" ) ) {
+		return 0;
+	}
 
 	for ( ; i < 4; i += 2 ) {
 
-		// Both box models exclude margin, so add it if we want it
-		if ( extra === "margin" ) {
-			val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
+		// Both box models exclude margin
+		if ( box === "margin" ) {
+			delta += jQuery.css( elem, box + cssExpand[ i ], true, styles );
 		}
 
-		if ( isBorderBox ) {
+		// If we get here with a content-box, we're seeking "padding" or "border" or "margin"
+		if ( !isBorderBox ) {
 
-			// border-box includes padding, so remove it if we want content
-			if ( extra === "content" ) {
-				val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+			// Add padding
+			delta += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+
+			// For "border" or "margin", add border
+			if ( box !== "padding" ) {
+				delta += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+
+			// But still keep track of it otherwise
+			} else {
+				extra += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
 			}
 
-			// At this point, extra isn't border nor margin, so remove border
-			if ( extra !== "margin" ) {
-				val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
+		// If we get here with a border-box (content + padding + border), we're seeking "content" or
+		// "padding" or "margin"
 		} else {
 
-			// At this point, extra isn't content, so add padding
-			val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+			// For "content", subtract padding
+			if ( box === "content" ) {
+				delta -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+			}
 
-			// At this point, extra isn't content nor padding, so add border
-			if ( extra !== "padding" ) {
-				val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+			// For "content" or "padding", subtract border
+			if ( box !== "margin" ) {
+				delta -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
 			}
 		}
 	}
 
-	return val;
-}
+	// Account for positive content-box scroll gutter when requested by providing computedVal
+	if ( !isBorderBox && computedVal >= 0 ) {
 
-function getWidthOrHeight( elem, name, extra ) {
-
-	// Start with offset property, which is equivalent to the border-box value
-	var valueIsBorderBox = true,
-		val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
-		styles = getStyles( elem ),
-		isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
-
-	// Support: IE11 only
-	// In IE 11 fullscreen elements inside of an iframe have
-	// 100x too small dimensions (gh-1764).
-	if ( document.msFullscreenElement && window.top !== window ) {
-
-		// Support: IE11 only
-		// Running getBoundingClientRect on a disconnected node
-		// in IE throws an error.
-		if ( elem.getClientRects().length ) {
-			val = Math.round( elem.getBoundingClientRect()[ name ] * 100 );
-		}
+		// offsetWidth/offsetHeight is a rounded sum of content, padding, scroll gutter, and border
+		// Assuming integer scroll gutter, subtract the rest and round down
+		delta += Math.max( 0, Math.ceil(
+			elem[ "offset" + dimension[ 0 ].toUpperCase() + dimension.slice( 1 ) ] -
+			computedVal -
+			delta -
+			extra -
+			0.5
+		) );
 	}
 
-	// Some non-html elements return undefined for offsetWidth, so check for null/undefined
-	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
-	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
-	if ( val <= 0 || val == null ) {
+	return delta;
+}
 
-		// Fall back to computed then uncomputed css if necessary
-		val = curCSS( elem, name, styles );
-		if ( val < 0 || val == null ) {
-			val = elem.style[ name ];
-		}
+function getWidthOrHeight( elem, dimension, extra ) {
 
-		// Computed unit is not pixels. Stop here and return.
-		if ( rnumnonpx.test( val ) ) {
+	// Start with computed style
+	var styles = getStyles( elem ),
+		val = curCSS( elem, dimension, styles ),
+		isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
+		valueIsBorderBox = isBorderBox;
+
+	// Support: Firefox <=54
+	// Return a confounding non-pixel value or feign ignorance, as appropriate.
+	if ( rnumnonpx.test( val ) ) {
+		if ( !extra ) {
 			return val;
 		}
-
-		// Check for style in case a browser which returns unreliable values
-		// for getComputedStyle silently falls back to the reliable elem.style
-		valueIsBorderBox = isBorderBox &&
-			( support.boxSizingReliable() || val === elem.style[ name ] );
-
-		// Normalize "", auto, and prepare for extra
-		val = parseFloat( val ) || 0;
+		val = "auto";
 	}
 
-	// Use the active box-sizing model to add/subtract irrelevant styles
+	// Check for style in case a browser which returns unreliable values
+	// for getComputedStyle silently falls back to the reliable elem.style
+	valueIsBorderBox = valueIsBorderBox &&
+		( support.boxSizingReliable() || val === elem.style[ dimension ] );
+
+	// Fall back to offsetWidth/offsetHeight when value is "auto"
+	// This happens for inline elements with no explicit setting (gh-3571)
+	// Support: Android <=4.1 - 4.3 only
+	// Also use offsetWidth/offsetHeight for misreported inline dimensions (gh-3602)
+	if ( val === "auto" ||
+		!parseFloat( val ) && jQuery.css( elem, "display", false, styles ) === "inline" ) {
+
+		val = elem[ "offset" + dimension[ 0 ].toUpperCase() + dimension.slice( 1 ) ];
+
+		// offsetWidth/offsetHeight provide border-box values
+		valueIsBorderBox = true;
+	}
+
+	// Normalize "" and auto
+	val = parseFloat( val ) || 0;
+
+	// Adjust for the element's box model
 	return ( val +
-		augmentWidthOrHeight(
+		boxModelAdjustment(
 			elem,
-			name,
+			dimension,
 			extra || ( isBorderBox ? "border" : "content" ),
 			valueIsBorderBox,
-			styles
+			styles,
+
+			// Provide the current computed size to request scroll gutter calculation (gh-3589)
+			val
 		)
 	) + "px";
 }
 
-function showHide( elements, show ) {
-	var display, elem, hidden,
-		values = [],
-		index = 0,
-		length = elements.length;
-
-	for ( ; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-
-		values[ index ] = dataPriv.get( elem, "olddisplay" );
-		display = elem.style.display;
-		if ( show ) {
-
-			// Reset the inline display of this element to learn if it is
-			// being hidden by cascaded rules or not
-			if ( !values[ index ] && display === "none" ) {
-				elem.style.display = "";
-			}
-
-			// Set elements which have been overridden with display: none
-			// in a stylesheet to whatever the default browser style is
-			// for such an element
-			if ( elem.style.display === "" && isHidden( elem ) ) {
-				values[ index ] = dataPriv.access(
-					elem,
-					"olddisplay",
-					defaultDisplay( elem.nodeName )
-				);
-			}
-		} else {
-			hidden = isHidden( elem );
-
-			if ( display !== "none" || !hidden ) {
-				dataPriv.set(
-					elem,
-					"olddisplay",
-					hidden ? display : jQuery.css( elem, "display" )
-				);
-			}
-		}
-	}
-
-	// Set the display of most of the elements in a second loop
-	// to avoid the constant reflow
-	for ( index = 0; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-		if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
-			elem.style.display = show ? values[ index ] || "" : "none";
-		}
-	}
-
-	return elements;
-}
-
 jQuery.extend( {
 
 	// Add in style property hooks for overriding the default
@@ -6099,9 +6435,7 @@ jQuery.extend( {
 
 	// Add in properties whose names you wish to fix before
 	// setting or getting the value
-	cssProps: {
-		"float": "cssFloat"
-	},
+	cssProps: {},
 
 	// Get and set the style property on a DOM Node
 	style: function( elem, name, value, extra ) {
@@ -6113,11 +6447,16 @@ jQuery.extend( {
 
 		// Make sure that we're working with the right name
 		var ret, type, hooks,
-			origName = jQuery.camelCase( name ),
+			origName = camelCase( name ),
+			isCustomProp = rcustomProp.test( name ),
 			style = elem.style;
 
-		name = jQuery.cssProps[ origName ] ||
-			( jQuery.cssProps[ origName ] = vendorPropName( origName ) || origName );
+		// Make sure that we're working with the right name. We don't
+		// want to query the value if it is a CSS custom property
+		// since they are user-defined.
+		if ( !isCustomProp ) {
+			name = finalPropName( origName );
+		}
 
 		// Gets hook for the prefixed version, then unprefixed version
 		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
@@ -6144,7 +6483,6 @@ jQuery.extend( {
 				value += ret && ret[ 3 ] || ( jQuery.cssNumber[ origName ] ? "" : "px" );
 			}
 
-			// Support: IE9-11+
 			// background-* props affect original clone's values
 			if ( !support.clearCloneStyle && value === "" && name.indexOf( "background" ) === 0 ) {
 				style[ name ] = "inherit";
@@ -6154,7 +6492,11 @@ jQuery.extend( {
 			if ( !hooks || !( "set" in hooks ) ||
 				( value = hooks.set( elem, value, extra ) ) !== undefined ) {
 
-				style[ name ] = value;
+				if ( isCustomProp ) {
+					style.setProperty( name, value );
+				} else {
+					style[ name ] = value;
+				}
 			}
 
 		} else {
@@ -6173,11 +6515,15 @@ jQuery.extend( {
 
 	css: function( elem, name, extra, styles ) {
 		var val, num, hooks,
-			origName = jQuery.camelCase( name );
+			origName = camelCase( name ),
+			isCustomProp = rcustomProp.test( name );
 
-		// Make sure that we're working with the right name
-		name = jQuery.cssProps[ origName ] ||
-			( jQuery.cssProps[ origName ] = vendorPropName( origName ) || origName );
+		// Make sure that we're working with the right name. We don't
+		// want to modify the value if it is a CSS custom property
+		// since they are user-defined.
+		if ( !isCustomProp ) {
+			name = finalPropName( origName );
+		}
 
 		// Try prefixed name followed by the unprefixed name
 		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
@@ -6202,43 +6548,63 @@ jQuery.extend( {
 			num = parseFloat( val );
 			return extra === true || isFinite( num ) ? num || 0 : val;
 		}
+
 		return val;
 	}
 } );
 
-jQuery.each( [ "height", "width" ], function( i, name ) {
-	jQuery.cssHooks[ name ] = {
+jQuery.each( [ "height", "width" ], function( i, dimension ) {
+	jQuery.cssHooks[ dimension ] = {
 		get: function( elem, computed, extra ) {
 			if ( computed ) {
 
 				// Certain elements can have dimension info if we invisibly show them
 				// but it must have a current display style that would benefit
 				return rdisplayswap.test( jQuery.css( elem, "display" ) ) &&
-					elem.offsetWidth === 0 ?
+
+					// Support: Safari 8+
+					// Table columns in Safari have non-zero offsetWidth & zero
+					// getBoundingClientRect().width unless display is changed.
+					// Support: IE <=11 only
+					// Running getBoundingClientRect on a disconnected node
+					// in IE throws an error.
+					( !elem.getClientRects().length || !elem.getBoundingClientRect().width ) ?
 						swap( elem, cssShow, function() {
-							return getWidthOrHeight( elem, name, extra );
+							return getWidthOrHeight( elem, dimension, extra );
 						} ) :
-						getWidthOrHeight( elem, name, extra );
+						getWidthOrHeight( elem, dimension, extra );
 			}
 		},
 
 		set: function( elem, value, extra ) {
 			var matches,
-				styles = extra && getStyles( elem ),
-				subtract = extra && augmentWidthOrHeight(
+				styles = getStyles( elem ),
+				isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
+				subtract = extra && boxModelAdjustment(
 					elem,
-					name,
+					dimension,
 					extra,
-					jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
+					isBorderBox,
 					styles
 				);
 
+			// Account for unreliable border-box dimensions by comparing offset* to computed and
+			// faking a content-box to get border and padding (gh-3699)
+			if ( isBorderBox && support.scrollboxSize() === styles.position ) {
+				subtract -= Math.ceil(
+					elem[ "offset" + dimension[ 0 ].toUpperCase() + dimension.slice( 1 ) ] -
+					parseFloat( styles[ dimension ] ) -
+					boxModelAdjustment( elem, dimension, "border", false, styles ) -
+					0.5
+				);
+			}
+
 			// Convert to pixels if value adjustment is needed
 			if ( subtract && ( matches = rcssNum.exec( value ) ) &&
 				( matches[ 3 ] || "px" ) !== "px" ) {
 
-				elem.style[ name ] = value;
-				value = jQuery.css( elem, name );
+				elem.style[ dimension ] = value;
+				value = jQuery.css( elem, dimension );
 			}
 
 			return setPositiveNumber( elem, value, subtract );
@@ -6259,16 +6625,6 @@ jQuery.cssHooks.marginLeft = addGetHookIf( support.reliableMarginLeft,
 	}
 );
 
-// Support: Android 2.3
-jQuery.cssHooks.marginRight = addGetHookIf( support.reliableMarginRight,
-	function( elem, computed ) {
-		if ( computed ) {
-			return swap( elem, { "display": "inline-block" },
-				curCSS, [ elem, "marginRight" ] );
-		}
-	}
-);
-
 // These hooks are used by animate to expand properties
 jQuery.each( {
 	margin: "",
@@ -6292,7 +6648,7 @@ jQuery.each( {
 		}
 	};
 
-	if ( !rmargin.test( prefix ) ) {
+	if ( prefix !== "margin" ) {
 		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
 	}
 } );
@@ -6304,7 +6660,7 @@ jQuery.fn.extend( {
 				map = {},
 				i = 0;
 
-			if ( jQuery.isArray( name ) ) {
+			if ( Array.isArray( name ) ) {
 				styles = getStyles( elem );
 				len = name.length;
 
@@ -6319,25 +6675,6 @@ jQuery.fn.extend( {
 				jQuery.style( elem, name, value ) :
 				jQuery.css( elem, name );
 		}, name, value, arguments.length > 1 );
-	},
-	show: function() {
-		return showHide( this, true );
-	},
-	hide: function() {
-		return showHide( this );
-	},
-	toggle: function( state ) {
-		if ( typeof state === "boolean" ) {
-			return state ? this.show() : this.hide();
-		}
-
-		return this.each( function() {
-			if ( isHidden( this ) ) {
-				jQuery( this ).show();
-			} else {
-				jQuery( this ).hide();
-			}
-		} );
 	}
 } );
 
@@ -6432,7 +6769,7 @@ Tween.propHooks = {
 	}
 };
 
-// Support: IE9
+// Support: IE <=9 only
 // Panic based approach to setting things on disconnected nodes
 Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
 	set: function( tween ) {
@@ -6454,23 +6791,35 @@ jQuery.easing = {
 
 jQuery.fx = Tween.prototype.init;
 
-// Back Compat <1.8 extension point
+// Back compat <1.8 extension point
 jQuery.fx.step = {};
 
 
 
 
 var
-	fxNow, timerId,
+	fxNow, inProgress,
 	rfxtypes = /^(?:toggle|show|hide)$/,
 	rrun = /queueHooks$/;
 
+function schedule() {
+	if ( inProgress ) {
+		if ( document.hidden === false && window.requestAnimationFrame ) {
+			window.requestAnimationFrame( schedule );
+		} else {
+			window.setTimeout( schedule, jQuery.fx.interval );
+		}
+
+		jQuery.fx.tick();
+	}
+}
+
 // Animations created synchronously will run synchronously
 function createFxNow() {
 	window.setTimeout( function() {
 		fxNow = undefined;
 	} );
-	return ( fxNow = jQuery.now() );
+	return ( fxNow = Date.now() );
 }
 
 // Generate parameters to create a standard animation
@@ -6482,7 +6831,7 @@ function genFx( type, includeWidth ) {
 	// If we include width, step value is 1 to do all cssExpand values,
 	// otherwise step value is 2 to skip over Left and Right
 	includeWidth = includeWidth ? 1 : 0;
-	for ( ; i < 4 ; i += 2 - includeWidth ) {
+	for ( ; i < 4; i += 2 - includeWidth ) {
 		which = cssExpand[ i ];
 		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
 	}
@@ -6509,15 +6858,15 @@ function createTween( value, prop, animation ) {
 }
 
 function defaultPrefilter( elem, props, opts ) {
-	/* jshint validthis: true */
-	var prop, value, toggle, tween, hooks, oldfire, display, checkDisplay,
+	var prop, value, toggle, hooks, oldfire, propTween, restoreDisplay, display,
+		isBox = "width" in props || "height" in props,
 		anim = this,
 		orig = {},
 		style = elem.style,
-		hidden = elem.nodeType && isHidden( elem ),
+		hidden = elem.nodeType && isHiddenWithinTree( elem ),
 		dataShow = dataPriv.get( elem, "fxshow" );
 
-	// Handle queue: false promises
+	// Queue-skipping animations hijack the fx hooks
 	if ( !opts.queue ) {
 		hooks = jQuery._queueHooks( elem, "fx" );
 		if ( hooks.unqueued == null ) {
@@ -6543,25 +6892,78 @@ function defaultPrefilter( elem, props, opts ) {
 		} );
 	}
 
-	// Height/width overflow pass
-	if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
+	// Detect show/hide animations
+	for ( prop in props ) {
+		value = props[ prop ];
+		if ( rfxtypes.test( value ) ) {
+			delete props[ prop ];
+			toggle = toggle || value === "toggle";
+			if ( value === ( hidden ? "hide" : "show" ) ) {
 
-		// Make sure that nothing sneaks out
-		// Record all 3 overflow attributes because IE9-10 do not
-		// change the overflow attribute when overflowX and
-		// overflowY are set to the same value
+				// Pretend to be hidden if this is a "show" and
+				// there is still data from a stopped show/hide
+				if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) {
+					hidden = true;
+
+				// Ignore all other no-op show/hide data
+				} else {
+					continue;
+				}
+			}
+			orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
+		}
+	}
+
+	// Bail out if this is a no-op like .hide().hide()
+	propTween = !jQuery.isEmptyObject( props );
+	if ( !propTween && jQuery.isEmptyObject( orig ) ) {
+		return;
+	}
+
+	// Restrict "overflow" and "display" styles during box animations
+	if ( isBox && elem.nodeType === 1 ) {
+
+		// Support: IE <=9 - 11, Edge 12 - 15
+		// Record all 3 overflow attributes because IE does not infer the shorthand
+		// from identically-valued overflowX and overflowY and Edge just mirrors
+		// the overflowX value there.
 		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
 
-		// Set display property to inline-block for height/width
-		// animations on inline elements that are having width/height animated
+		// Identify a display type, preferring old show/hide data over the CSS cascade
+		restoreDisplay = dataShow && dataShow.display;
+		if ( restoreDisplay == null ) {
+			restoreDisplay = dataPriv.get( elem, "display" );
+		}
 		display = jQuery.css( elem, "display" );
+		if ( display === "none" ) {
+			if ( restoreDisplay ) {
+				display = restoreDisplay;
+			} else {
 
-		// Test default display if display is currently "none"
-		checkDisplay = display === "none" ?
-			dataPriv.get( elem, "olddisplay" ) || defaultDisplay( elem.nodeName ) : display;
+				// Get nonempty value(s) by temporarily forcing visibility
+				showHide( [ elem ], true );
+				restoreDisplay = elem.style.display || restoreDisplay;
+				display = jQuery.css( elem, "display" );
+				showHide( [ elem ] );
+			}
+		}
 
-		if ( checkDisplay === "inline" && jQuery.css( elem, "float" ) === "none" ) {
-			style.display = "inline-block";
+		// Animate inline elements as inline-block
+		if ( display === "inline" || display === "inline-block" && restoreDisplay != null ) {
+			if ( jQuery.css( elem, "float" ) === "none" ) {
+
+				// Restore the original display value at the end of pure show/hide animations
+				if ( !propTween ) {
+					anim.done( function() {
+						style.display = restoreDisplay;
+					} );
+					if ( restoreDisplay == null ) {
+						display = style.display;
+						restoreDisplay = display === "none" ? "" : display;
+					}
+				}
+				style.display = "inline-block";
+			}
 		}
 	}
 
@@ -6574,73 +6976,56 @@ function defaultPrefilter( elem, props, opts ) {
 		} );
 	}
 
-	// show/hide pass
-	for ( prop in props ) {
-		value = props[ prop ];
-		if ( rfxtypes.exec( value ) ) {
-			delete props[ prop ];
-			toggle = toggle || value === "toggle";
-			if ( value === ( hidden ? "hide" : "show" ) ) {
+	// Implement show/hide animations
+	propTween = false;
+	for ( prop in orig ) {
 
-				// If there is dataShow left over from a stopped hide or show
-				// and we are going to proceed with show, we should pretend to be hidden
-				if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) {
-					hidden = true;
-				} else {
-					continue;
+		// General show/hide setup for this element animation
+		if ( !propTween ) {
+			if ( dataShow ) {
+				if ( "hidden" in dataShow ) {
+					hidden = dataShow.hidden;
 				}
+			} else {
+				dataShow = dataPriv.access( elem, "fxshow", { display: restoreDisplay } );
 			}
-			orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
 
-		// Any non-fx value stops us from restoring the original display value
-		} else {
-			display = undefined;
-		}
-	}
-
-	if ( !jQuery.isEmptyObject( orig ) ) {
-		if ( dataShow ) {
-			if ( "hidden" in dataShow ) {
-				hidden = dataShow.hidden;
+			// Store hidden/visible for toggle so `.stop().toggle()` "reverses"
+			if ( toggle ) {
+				dataShow.hidden = !hidden;
 			}
-		} else {
-			dataShow = dataPriv.access( elem, "fxshow", {} );
-		}
 
-		// Store state if its toggle - enables .stop().toggle() to "reverse"
-		if ( toggle ) {
-			dataShow.hidden = !hidden;
-		}
-		if ( hidden ) {
-			jQuery( elem ).show();
-		} else {
+			// Show elements before animating them
+			if ( hidden ) {
+				showHide( [ elem ], true );
+			}
+
+			/* eslint-disable no-loop-func */
+
 			anim.done( function() {
-				jQuery( elem ).hide();
+
+			/* eslint-enable no-loop-func */
+
+				// The final step of a "hide" animation is actually hiding the element
+				if ( !hidden ) {
+					showHide( [ elem ] );
+				}
+				dataPriv.remove( elem, "fxshow" );
+				for ( prop in orig ) {
+					jQuery.style( elem, prop, orig[ prop ] );
+				}
 			} );
 		}
-		anim.done( function() {
-			var prop;
 
-			dataPriv.remove( elem, "fxshow" );
-			for ( prop in orig ) {
-				jQuery.style( elem, prop, orig[ prop ] );
-			}
-		} );
-		for ( prop in orig ) {
-			tween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
-
-			if ( !( prop in dataShow ) ) {
-				dataShow[ prop ] = tween.start;
-				if ( hidden ) {
-					tween.end = tween.start;
-					tween.start = prop === "width" || prop === "height" ? 1 : 0;
-				}
+		// Per-property setup
+		propTween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
+		if ( !( prop in dataShow ) ) {
+			dataShow[ prop ] = propTween.start;
+			if ( hidden ) {
+				propTween.end = propTween.start;
+				propTween.start = 0;
 			}
 		}
-
-	// If this is a noop like .hide().hide(), restore an overwritten display value
-	} else if ( ( display === "none" ? defaultDisplay( elem.nodeName ) : display ) === "inline" ) {
-		style.display = display;
 	}
 }
 
@@ -6649,10 +7034,10 @@ function propFilter( props, specialEasing ) {
 
 	// camelCase, specialEasing and expand cssHook pass
 	for ( index in props ) {
-		name = jQuery.camelCase( index );
+		name = camelCase( index );
 		easing = specialEasing[ name ];
 		value = props[ index ];
-		if ( jQuery.isArray( value ) ) {
+		if ( Array.isArray( value ) ) {
 			easing = value[ 1 ];
 			value = props[ index ] = value[ 0 ];
 		}
@@ -6698,25 +7083,32 @@ function Animation( elem, properties, options ) {
 			var currentTime = fxNow || createFxNow(),
 				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
 
-				// Support: Android 2.3
+				// Support: Android 2.3 only
 				// Archaic crash bug won't allow us to use `1 - ( 0.5 || 0 )` (#12497)
 				temp = remaining / animation.duration || 0,
 				percent = 1 - temp,
 				index = 0,
 				length = animation.tweens.length;
 
-			for ( ; index < length ; index++ ) {
+			for ( ; index < length; index++ ) {
 				animation.tweens[ index ].run( percent );
 			}
 
 			deferred.notifyWith( elem, [ animation, percent, remaining ] );
 
+			// If there's more to do, yield
 			if ( percent < 1 && length ) {
 				return remaining;
-			} else {
-				deferred.resolveWith( elem, [ animation ] );
-				return false;
 			}
+
+			// If this was an empty animation, synthesize a final progress notification
+			if ( !length ) {
+				deferred.notifyWith( elem, [ animation, 1, 0 ] );
+			}
+
+			// Resolve the animation and report its conclusion
+			deferred.resolveWith( elem, [ animation ] );
+			return false;
 		},
 		animation = deferred.promise( {
 			elem: elem,
@@ -6746,7 +7138,7 @@ function Animation( elem, properties, options ) {
 					return this;
 				}
 				stopped = true;
-				for ( ; index < length ; index++ ) {
+				for ( ; index < length; index++ ) {
 					animation.tweens[ index ].run( 1 );
 				}
 
@@ -6764,12 +7156,12 @@ function Animation( elem, properties, options ) {
 
 	propFilter( props, animation.opts.specialEasing );
 
-	for ( ; index < length ; index++ ) {
+	for ( ; index < length; index++ ) {
 		result = Animation.prefilters[ index ].call( animation, elem, props, animation.opts );
 		if ( result ) {
-			if ( jQuery.isFunction( result.stop ) ) {
+			if ( isFunction( result.stop ) ) {
 				jQuery._queueHooks( animation.elem, animation.opts.queue ).stop =
-					jQuery.proxy( result.stop, result );
+					result.stop.bind( result );
 			}
 			return result;
 		}
@@ -6777,10 +7169,17 @@ function Animation( elem, properties, options ) {
 
 	jQuery.map( props, createTween, animation );
 
-	if ( jQuery.isFunction( animation.opts.start ) ) {
+	if ( isFunction( animation.opts.start ) ) {
 		animation.opts.start.call( elem, animation );
 	}
 
+	// Attach callbacks from options
+	animation
+		.progress( animation.opts.progress )
+		.done( animation.opts.done, animation.opts.complete )
+		.fail( animation.opts.fail )
+		.always( animation.opts.always );
+
 	jQuery.fx.timer(
 		jQuery.extend( tick, {
 			elem: elem,
@@ -6789,14 +7188,11 @@ function Animation( elem, properties, options ) {
 		} )
 	);
 
-	// attach callbacks from options
-	return animation.progress( animation.opts.progress )
-		.done( animation.opts.done, animation.opts.complete )
-		.fail( animation.opts.fail )
-		.always( animation.opts.always );
+	return animation;
 }
 
 jQuery.Animation = jQuery.extend( Animation, {
+
 	tweeners: {
 		"*": [ function( prop, value ) {
 			var tween = this.createTween( prop, value );
@@ -6806,18 +7202,18 @@ jQuery.Animation = jQuery.extend( Animation, {
 	},
 
 	tweener: function( props, callback ) {
-		if ( jQuery.isFunction( props ) ) {
+		if ( isFunction( props ) ) {
 			callback = props;
 			props = [ "*" ];
 		} else {
-			props = props.match( rnotwhite );
+			props = props.match( rnothtmlwhite );
 		}
 
 		var prop,
 			index = 0,
 			length = props.length;
 
-		for ( ; index < length ; index++ ) {
+		for ( ; index < length; index++ ) {
 			prop = props[ index ];
 			Animation.tweeners[ prop ] = Animation.tweeners[ prop ] || [];
 			Animation.tweeners[ prop ].unshift( callback );
@@ -6838,14 +7234,25 @@ jQuery.Animation = jQuery.extend( Animation, {
 jQuery.speed = function( speed, easing, fn ) {
 	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
 		complete: fn || !fn && easing ||
-			jQuery.isFunction( speed ) && speed,
+			isFunction( speed ) && speed,
 		duration: speed,
-		easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
+		easing: fn && easing || easing && !isFunction( easing ) && easing
 	};
 
-	opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ?
-		opt.duration : opt.duration in jQuery.fx.speeds ?
-			jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
+	// Go to the end state if fx are off
+	if ( jQuery.fx.off ) {
+		opt.duration = 0;
+
+	} else {
+		if ( typeof opt.duration !== "number" ) {
+			if ( opt.duration in jQuery.fx.speeds ) {
+				opt.duration = jQuery.fx.speeds[ opt.duration ];
+
+			} else {
+				opt.duration = jQuery.fx.speeds._default;
+			}
+		}
+	}
 
 	// Normalize opt.queue - true/undefined/null -> "fx"
 	if ( opt.queue == null || opt.queue === true ) {
@@ -6856,7 +7263,7 @@ jQuery.speed = function( speed, easing, fn ) {
 	opt.old = opt.complete;
 
 	opt.complete = function() {
-		if ( jQuery.isFunction( opt.old ) ) {
+		if ( isFunction( opt.old ) ) {
 			opt.old.call( this );
 		}
 
@@ -6872,7 +7279,7 @@ jQuery.fn.extend( {
 	fadeTo: function( speed, to, easing, callback ) {
 
 		// Show any hidden elements after setting opacity to 0
-		return this.filter( isHidden ).css( "opacity", 0 ).show()
+		return this.filter( isHiddenWithinTree ).css( "opacity", 0 ).show()
 
 			// Animate to the value specified
 			.end().animate( { opacity: to }, speed, easing, callback );
@@ -7020,12 +7427,12 @@ jQuery.fx.tick = function() {
 		i = 0,
 		timers = jQuery.timers;
 
-	fxNow = jQuery.now();
+	fxNow = Date.now();
 
 	for ( ; i < timers.length; i++ ) {
 		timer = timers[ i ];
 
-		// Checks the timer has not already been removed
+		// Run the timer and safely remove it when done (allowing for external removal)
 		if ( !timer() && timers[ i ] === timer ) {
 			timers.splice( i--, 1 );
 		}
@@ -7039,24 +7446,21 @@ jQuery.fx.tick = function() {
 
 jQuery.fx.timer = function( timer ) {
 	jQuery.timers.push( timer );
-	if ( timer() ) {
-		jQuery.fx.start();
-	} else {
-		jQuery.timers.pop();
-	}
+	jQuery.fx.start();
 };
 
 jQuery.fx.interval = 13;
 jQuery.fx.start = function() {
-	if ( !timerId ) {
-		timerId = window.setInterval( jQuery.fx.tick, jQuery.fx.interval );
+	if ( inProgress ) {
+		return;
 	}
+
+	inProgress = true;
+	schedule();
 };
 
 jQuery.fx.stop = function() {
-	window.clearInterval( timerId );
-
-	timerId = null;
+	inProgress = null;
 };
 
 jQuery.fx.speeds = {
@@ -7069,7 +7473,7 @@ jQuery.fx.speeds = {
 
 
 // Based off of the plugin by Clint Helfers, with permission.
-// http://web.archive.org/web/20100324014747/http://blindsignals.com/index.php/2009/07/jquery-delay/
+// https://web.archive.org/web/20100324014747/http://blindsignals.com/index.php/2009/07/jquery-delay/
 jQuery.fn.delay = function( time, type ) {
 	time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
 	type = type || "fx";
@@ -7090,20 +7494,15 @@ jQuery.fn.delay = function( time, type ) {
 
 	input.type = "checkbox";
 
-	// Support: iOS<=5.1, Android<=4.2+
+	// Support: Android <=4.3 only
 	// Default value for a checkbox should be "on"
 	support.checkOn = input.value !== "";
 
-	// Support: IE<=11+
+	// Support: IE <=11 only
 	// Must access selectedIndex to make default options select
 	support.optSelected = opt.selected;
 
-	// Support: Android<=2.3
-	// Options inside disabled selects are incorrectly marked as disabled
-	select.disabled = true;
-	support.optDisabled = !opt.disabled;
-
-	// Support: IE<=11+
+	// Support: IE <=11 only
 	// An input loses its value after becoming a radio
 	input = document.createElement( "input" );
 	input.value = "t";
@@ -7142,11 +7541,10 @@ jQuery.extend( {
 			return jQuery.prop( elem, name, value );
 		}
 
-		// All attributes are lowercase
+		// Attribute hooks are determined by the lowercase version
 		// Grab necessary hook if one is defined
 		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
-			name = name.toLowerCase();
-			hooks = jQuery.attrHooks[ name ] ||
+			hooks = jQuery.attrHooks[ name.toLowerCase() ] ||
 				( jQuery.expr.match.bool.test( name ) ? boolHook : undefined );
 		}
 
@@ -7179,7 +7577,7 @@ jQuery.extend( {
 		type: {
 			set: function( elem, value ) {
 				if ( !support.radioValue && value === "radio" &&
-					jQuery.nodeName( elem, "input" ) ) {
+					nodeName( elem, "input" ) ) {
 					var val = elem.value;
 					elem.setAttribute( "type", value );
 					if ( val ) {
@@ -7192,21 +7590,15 @@ jQuery.extend( {
 	},
 
 	removeAttr: function( elem, value ) {
-		var name, propName,
+		var name,
 			i = 0,
-			attrNames = value && value.match( rnotwhite );
+
+			// Attribute names can contain non-HTML whitespace characters
+			// https://html.spec.whatwg.org/multipage/syntax.html#attributes-2
+			attrNames = value && value.match( rnothtmlwhite );
 
 		if ( attrNames && elem.nodeType === 1 ) {
 			while ( ( name = attrNames[ i++ ] ) ) {
-				propName = jQuery.propFix[ name ] || name;
-
-				// Boolean attributes get special treatment (#10870)
-				if ( jQuery.expr.match.bool.test( name ) ) {
-
-					// Set corresponding property to false
-					elem[ propName ] = false;
-				}
-
 				elem.removeAttribute( name );
 			}
 		}
@@ -7226,20 +7618,23 @@ boolHook = {
 		return name;
 	}
 };
+
 jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
 	var getter = attrHandle[ name ] || jQuery.find.attr;
 
 	attrHandle[ name ] = function( elem, name, isXML ) {
-		var ret, handle;
+		var ret, handle,
+			lowercaseName = name.toLowerCase();
+
 		if ( !isXML ) {
 
 			// Avoid an infinite loop by temporarily removing this function from the getter
-			handle = attrHandle[ name ];
-			attrHandle[ name ] = ret;
+			handle = attrHandle[ lowercaseName ];
+			attrHandle[ lowercaseName ] = ret;
 			ret = getter( elem, name, isXML ) != null ?
-				name.toLowerCase() :
+				lowercaseName :
 				null;
-			attrHandle[ name ] = handle;
+			attrHandle[ lowercaseName ] = handle;
 		}
 		return ret;
 	};
@@ -7300,18 +7695,26 @@ jQuery.extend( {
 		tabIndex: {
 			get: function( elem ) {
 
+				// Support: IE <=9 - 11 only
 				// elem.tabIndex doesn't always return the
 				// correct value when it hasn't been explicitly set
-				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+				// https://web.archive.org/web/20141116233347/http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
 				// Use proper attribute retrieval(#12072)
 				var tabindex = jQuery.find.attr( elem, "tabindex" );
 
-				return tabindex ?
-					parseInt( tabindex, 10 ) :
+				if ( tabindex ) {
+					return parseInt( tabindex, 10 );
+				}
+
+				if (
 					rfocusable.test( elem.nodeName ) ||
-						rclickable.test( elem.nodeName ) && elem.href ?
-							0 :
-							-1;
+					rclickable.test( elem.nodeName ) &&
+					elem.href
+				) {
+					return 0;
+				}
+
+				return -1;
 			}
 		}
 	},
@@ -7322,14 +7725,38 @@ jQuery.extend( {
 	}
 } );
 
+// Support: IE <=11 only
+// Accessing the selectedIndex property
+// forces the browser to respect setting selected
+// on the option
+// The getter ensures a default option is selected
+// when in an optgroup
+// eslint rule "no-unused-expressions" is disabled for this code
+// since it considers such accessions noop
 if ( !support.optSelected ) {
 	jQuery.propHooks.selected = {
 		get: function( elem ) {
+
+			/* eslint no-unused-expressions: "off" */
+
 			var parent = elem.parentNode;
 			if ( parent && parent.parentNode ) {
 				parent.parentNode.selectedIndex;
 			}
 			return null;
+		},
+		set: function( elem ) {
+
+			/* eslint no-unused-expressions: "off" */
+
+			var parent = elem.parentNode;
+			if ( parent ) {
+				parent.selectedIndex;
+
+				if ( parent.parentNode ) {
+					parent.parentNode.selectedIndex;
+				}
+			}
 		}
 	};
 }
@@ -7352,30 +7779,45 @@ jQuery.each( [
 
 
 
-var rclass = /[\t\r\n\f]/g;
+	// Strip and collapse whitespace according to HTML spec
+	// https://infra.spec.whatwg.org/#strip-and-collapse-ascii-whitespace
+	function stripAndCollapse( value ) {
+		var tokens = value.match( rnothtmlwhite ) || [];
+		return tokens.join( " " );
+	}
+
 
 function getClass( elem ) {
 	return elem.getAttribute && elem.getAttribute( "class" ) || "";
 }
 
+function classesToArray( value ) {
+	if ( Array.isArray( value ) ) {
+		return value;
+	}
+	if ( typeof value === "string" ) {
+		return value.match( rnothtmlwhite ) || [];
+	}
+	return [];
+}
+
 jQuery.fn.extend( {
 	addClass: function( value ) {
 		var classes, elem, cur, curValue, clazz, j, finalValue,
 			i = 0;
 
-		if ( jQuery.isFunction( value ) ) {
+		if ( isFunction( value ) ) {
 			return this.each( function( j ) {
 				jQuery( this ).addClass( value.call( this, j, getClass( this ) ) );
 			} );
 		}
 
-		if ( typeof value === "string" && value ) {
-			classes = value.match( rnotwhite ) || [];
+		classes = classesToArray( value );
 
+		if ( classes.length ) {
 			while ( ( elem = this[ i++ ] ) ) {
 				curValue = getClass( elem );
-				cur = elem.nodeType === 1 &&
-					( " " + curValue + " " ).replace( rclass, " " );
+				cur = elem.nodeType === 1 && ( " " + stripAndCollapse( curValue ) + " " );
 
 				if ( cur ) {
 					j = 0;
@@ -7386,7 +7828,7 @@ jQuery.fn.extend( {
 					}
 
 					// Only assign if different to avoid unneeded rendering.
-					finalValue = jQuery.trim( cur );
+					finalValue = stripAndCollapse( cur );
 					if ( curValue !== finalValue ) {
 						elem.setAttribute( "class", finalValue );
 					}
@@ -7401,7 +7843,7 @@ jQuery.fn.extend( {
 		var classes, elem, cur, curValue, clazz, j, finalValue,
 			i = 0;
 
-		if ( jQuery.isFunction( value ) ) {
+		if ( isFunction( value ) ) {
 			return this.each( function( j ) {
 				jQuery( this ).removeClass( value.call( this, j, getClass( this ) ) );
 			} );
@@ -7411,15 +7853,14 @@ jQuery.fn.extend( {
 			return this.attr( "class", "" );
 		}
 
-		if ( typeof value === "string" && value ) {
-			classes = value.match( rnotwhite ) || [];
+		classes = classesToArray( value );
 
+		if ( classes.length ) {
 			while ( ( elem = this[ i++ ] ) ) {
 				curValue = getClass( elem );
 
 				// This expression is here for better compressibility (see addClass)
-				cur = elem.nodeType === 1 &&
-					( " " + curValue + " " ).replace( rclass, " " );
+				cur = elem.nodeType === 1 && ( " " + stripAndCollapse( curValue ) + " " );
 
 				if ( cur ) {
 					j = 0;
@@ -7432,7 +7873,7 @@ jQuery.fn.extend( {
 					}
 
 					// Only assign if different to avoid unneeded rendering.
-					finalValue = jQuery.trim( cur );
+					finalValue = stripAndCollapse( cur );
 					if ( curValue !== finalValue ) {
 						elem.setAttribute( "class", finalValue );
 					}
@@ -7444,13 +7885,14 @@ jQuery.fn.extend( {
 	},
 
 	toggleClass: function( value, stateVal ) {
-		var type = typeof value;
+		var type = typeof value,
+			isValidValue = type === "string" || Array.isArray( value );
 
-		if ( typeof stateVal === "boolean" && type === "string" ) {
+		if ( typeof stateVal === "boolean" && isValidValue ) {
 			return stateVal ? this.addClass( value ) : this.removeClass( value );
 		}
 
-		if ( jQuery.isFunction( value ) ) {
+		if ( isFunction( value ) ) {
 			return this.each( function( i ) {
 				jQuery( this ).toggleClass(
 					value.call( this, i, getClass( this ), stateVal ),
@@ -7462,12 +7904,12 @@ jQuery.fn.extend( {
 		return this.each( function() {
 			var className, i, self, classNames;
 
-			if ( type === "string" ) {
+			if ( isValidValue ) {
 
 				// Toggle individual class names
 				i = 0;
 				self = jQuery( this );
-				classNames = value.match( rnotwhite ) || [];
+				classNames = classesToArray( value );
 
 				while ( ( className = classNames[ i++ ] ) ) {
 
@@ -7510,10 +7952,8 @@ jQuery.fn.extend( {
 		className = " " + selector + " ";
 		while ( ( elem = this[ i++ ] ) ) {
 			if ( elem.nodeType === 1 &&
-				( " " + getClass( elem ) + " " ).replace( rclass, " " )
-					.indexOf( className ) > -1
-			) {
-				return true;
+				( " " + stripAndCollapse( getClass( elem ) ) + " " ).indexOf( className ) > -1 ) {
+					return true;
 			}
 		}
 
@@ -7528,7 +7968,7 @@ var rreturn = /\r/g;
 
 jQuery.fn.extend( {
 	val: function( value ) {
-		var hooks, ret, isFunction,
+		var hooks, ret, valueIsFunction,
 			elem = this[ 0 ];
 
 		if ( !arguments.length ) {
@@ -7545,19 +7985,19 @@ jQuery.fn.extend( {
 
 				ret = elem.value;
 
-				return typeof ret === "string" ?
+				// Handle most common string cases
+				if ( typeof ret === "string" ) {
+					return ret.replace( rreturn, "" );
+				}
 
-					// Handle most common string cases
-					ret.replace( rreturn, "" ) :
-
-					// Handle cases where value is null/undef or number
-					ret == null ? "" : ret;
+				// Handle cases where value is null/undef or number
+				return ret == null ? "" : ret;
 			}
 
 			return;
 		}
 
-		isFunction = jQuery.isFunction( value );
+		valueIsFunction = isFunction( value );
 
 		return this.each( function( i ) {
 			var val;
@@ -7566,7 +8006,7 @@ jQuery.fn.extend( {
 				return;
 			}
 
-			if ( isFunction ) {
+			if ( valueIsFunction ) {
 				val = value.call( this, i, jQuery( this ).val() );
 			} else {
 				val = value;
@@ -7579,7 +8019,7 @@ jQuery.fn.extend( {
 			} else if ( typeof val === "number" ) {
 				val += "";
 
-			} else if ( jQuery.isArray( val ) ) {
+			} else if ( Array.isArray( val ) ) {
 				val = jQuery.map( val, function( value ) {
 					return value == null ? "" : value + "";
 				} );
@@ -7600,35 +8040,45 @@ jQuery.extend( {
 		option: {
 			get: function( elem ) {
 
-				// Support: IE<11
-				// option.value not trimmed (#14858)
-				return jQuery.trim( elem.value );
+				var val = jQuery.find.attr( elem, "value" );
+				return val != null ?
+					val :
+
+					// Support: IE <=10 - 11 only
+					// option.text throws exceptions (#14686, #14858)
+					// Strip and collapse whitespace
+					// https://html.spec.whatwg.org/#strip-and-collapse-whitespace
+					stripAndCollapse( jQuery.text( elem ) );
 			}
 		},
 		select: {
 			get: function( elem ) {
-				var value, option,
+				var value, option, i,
 					options = elem.options,
 					index = elem.selectedIndex,
-					one = elem.type === "select-one" || index < 0,
+					one = elem.type === "select-one",
 					values = one ? null : [],
-					max = one ? index + 1 : options.length,
-					i = index < 0 ?
-						max :
-						one ? index : 0;
+					max = one ? index + 1 : options.length;
+
+				if ( index < 0 ) {
+					i = max;
+
+				} else {
+					i = one ? index : 0;
+				}
 
 				// Loop through all the selected options
 				for ( ; i < max; i++ ) {
 					option = options[ i ];
 
+					// Support: IE <=9 only
 					// IE8-9 doesn't update selected after form reset (#2551)
 					if ( ( option.selected || i === index ) &&
 
 							// Don't return options that are disabled or in a disabled optgroup
-							( support.optDisabled ?
-								!option.disabled : option.getAttribute( "disabled" ) === null ) &&
+							!option.disabled &&
 							( !option.parentNode.disabled ||
-								!jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
+								!nodeName( option.parentNode, "optgroup" ) ) ) {
 
 						// Get the specific value for the option
 						value = jQuery( option ).val();
@@ -7654,11 +8104,16 @@ jQuery.extend( {
 
 				while ( i-- ) {
 					option = options[ i ];
+
+					/* eslint-disable no-cond-assign */
+
 					if ( option.selected =
-							jQuery.inArray( jQuery.valHooks.option.get( option ), values ) > -1
+						jQuery.inArray( jQuery.valHooks.option.get( option ), values ) > -1
 					) {
 						optionSet = true;
 					}
+
+					/* eslint-enable no-cond-assign */
 				}
 
 				// Force browsers to behave consistently when non-matching value is set
@@ -7675,7 +8130,7 @@ jQuery.extend( {
 jQuery.each( [ "radio", "checkbox" ], function() {
 	jQuery.valHooks[ this ] = {
 		set: function( elem, value ) {
-			if ( jQuery.isArray( value ) ) {
+			if ( Array.isArray( value ) ) {
 				return ( elem.checked = jQuery.inArray( jQuery( elem ).val(), value ) > -1 );
 			}
 		}
@@ -7693,18 +8148,24 @@ jQuery.each( [ "radio", "checkbox" ], function() {
 // Return jQuery for attributes-only inclusion
 
 
-var rfocusMorph = /^(?:focusinfocus|focusoutblur)$/;
+support.focusin = "onfocusin" in window;
+
+
+var rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
+	stopPropagationCallback = function( e ) {
+		e.stopPropagation();
+	};
 
 jQuery.extend( jQuery.event, {
 
 	trigger: function( event, data, elem, onlyHandlers ) {
 
-		var i, cur, tmp, bubbleType, ontype, handle, special,
+		var i, cur, tmp, bubbleType, ontype, handle, special, lastElement,
 			eventPath = [ elem || document ],
 			type = hasOwn.call( event, "type" ) ? event.type : event,
 			namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split( "." ) : [];
 
-		cur = tmp = elem = elem || document;
+		cur = lastElement = tmp = elem = elem || document;
 
 		// Don't do events on text and comment nodes
 		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
@@ -7756,7 +8217,7 @@ jQuery.extend( jQuery.event, {
 
 		// Determine event propagation path in advance, per W3C events spec (#9951)
 		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
-		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
+		if ( !onlyHandlers && !special.noBubble && !isWindow( elem ) ) {
 
 			bubbleType = special.delegateType || type;
 			if ( !rfocusMorph.test( bubbleType + type ) ) {
@@ -7776,7 +8237,7 @@ jQuery.extend( jQuery.event, {
 		// Fire handlers on the event path
 		i = 0;
 		while ( ( cur = eventPath[ i++ ] ) && !event.isPropagationStopped() ) {
-
+			lastElement = cur;
 			event.type = i > 1 ?
 				bubbleType :
 				special.bindType || type;
@@ -7806,9 +8267,9 @@ jQuery.extend( jQuery.event, {
 				special._default.apply( eventPath.pop(), data ) === false ) &&
 				acceptData( elem ) ) {
 
-				// Call a native DOM method on the target with the same name name as the event.
+				// Call a native DOM method on the target with the same name as the event.
 				// Don't do default actions on window, that's where global variables be (#6170)
-				if ( ontype && jQuery.isFunction( elem[ type ] ) && !jQuery.isWindow( elem ) ) {
+				if ( ontype && isFunction( elem[ type ] ) && !isWindow( elem ) ) {
 
 					// Don't re-trigger an onFOO event when we call its FOO() method
 					tmp = elem[ ontype ];
@@ -7819,7 +8280,17 @@ jQuery.extend( jQuery.event, {
 
 					// Prevent re-triggering of the same event, since we already bubbled it above
 					jQuery.event.triggered = type;
+
+					if ( event.isPropagationStopped() ) {
+						lastElement.addEventListener( type, stopPropagationCallback );
+					}
+
 					elem[ type ]();
+
+					if ( event.isPropagationStopped() ) {
+						lastElement.removeEventListener( type, stopPropagationCallback );
+					}
+
 					jQuery.event.triggered = undefined;
 
 					if ( tmp ) {
@@ -7833,6 +8304,7 @@ jQuery.extend( jQuery.event, {
 	},
 
 	// Piggyback on a donor event to simulate a different one
+	// Used only for `focus(in | out)` events
 	simulate: function( type, elem, event ) {
 		var e = jQuery.extend(
 			new jQuery.Event(),
@@ -7840,27 +8312,10 @@ jQuery.extend( jQuery.event, {
 			{
 				type: type,
 				isSimulated: true
-
-				// Previously, `originalEvent: {}` was set here, so stopPropagation call
-				// would not be triggered on donor event, since in our own
-				// jQuery.event.stopPropagation function we had a check for existence of
-				// originalEvent.stopPropagation method, so, consequently it would be a noop.
-				//
-				// But now, this "simulate" function is used only for events
-				// for which stopPropagation() is noop, so there is no need for that anymore.
-				//
-				// For the compat branch though, guard for "click" and "submit"
-				// events is still used, but was moved to jQuery.event.stopPropagation function
-				// because `originalEvent` should point to the original event for the constancy
-				// with other events and for more focused logic
 			}
 		);
 
 		jQuery.event.trigger( e, null, elem );
-
-		if ( e.isDefaultPrevented() ) {
-			event.preventDefault();
-		}
 	}
 
 } );
@@ -7881,39 +8336,14 @@ jQuery.fn.extend( {
 } );
 
 
-jQuery.each( ( "blur focus focusin focusout load resize scroll unload click dblclick " +
-	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup error contextmenu" ).split( " " ),
-	function( i, name ) {
-
-	// Handle event binding
-	jQuery.fn[ name ] = function( data, fn ) {
-		return arguments.length > 0 ?
-			this.on( name, null, data, fn ) :
-			this.trigger( name );
-	};
-} );
-
-jQuery.fn.extend( {
-	hover: function( fnOver, fnOut ) {
-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-	}
-} );
-
-
-
-
-support.focusin = "onfocusin" in window;
-
-
-// Support: Firefox
+// Support: Firefox <=44
 // Firefox doesn't have focus(in | out) events
 // Related ticket - https://bugzilla.mozilla.org/show_bug.cgi?id=687787
 //
-// Support: Chrome, Safari
+// Support: Chrome <=48 - 49, Safari <=9.0 - 9.1
 // focus(in | out) events fire after focus & blur events,
 // which is spec violation - http://www.w3.org/TR/DOM-Level-3-Events/#events-focusevent-event-order
-// Related ticket - https://code.google.com/p/chromium/issues/detail?id=449857
+// Related ticket - https://bugs.chromium.org/p/chromium/issues/detail?id=449857
 if ( !support.focusin ) {
 	jQuery.each( { focus: "focusin", blur: "focusout" }, function( orig, fix ) {
 
@@ -7949,19 +8379,12 @@ if ( !support.focusin ) {
 }
 var location = window.location;
 
-var nonce = jQuery.now();
+var nonce = Date.now();
 
 var rquery = ( /\?/ );
 
 
 
-// Support: Android 2.3
-// Workaround failure to string-cast null input
-jQuery.parseJSON = function( data ) {
-	return JSON.parse( data + "" );
-};
-
-
 // Cross-browser xml parsing
 jQuery.parseXML = function( data ) {
 	var xml;
@@ -7969,7 +8392,8 @@ jQuery.parseXML = function( data ) {
 		return null;
 	}
 
-	// Support: IE9
+	// Support: IE 9 - 11 only
+	// IE throws on parseFromString with invalid input.
 	try {
 		xml = ( new window.DOMParser() ).parseFromString( data, "text/xml" );
 	} catch ( e ) {
@@ -7984,8 +8408,128 @@ jQuery.parseXML = function( data ) {
 
 
 var
+	rbracket = /\[\]$/,
+	rCRLF = /\r?\n/g,
+	rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
+	rsubmittable = /^(?:input|select|textarea|keygen)/i;
+
+function buildParams( prefix, obj, traditional, add ) {
+	var name;
+
+	if ( Array.isArray( obj ) ) {
+
+		// Serialize array item.
+		jQuery.each( obj, function( i, v ) {
+			if ( traditional || rbracket.test( prefix ) ) {
+
+				// Treat each array item as a scalar.
+				add( prefix, v );
+
+			} else {
+
+				// Item is non-scalar (array or object), encode its numeric index.
+				buildParams(
+					prefix + "[" + ( typeof v === "object" && v != null ? i : "" ) + "]",
+					v,
+					traditional,
+					add
+				);
+			}
+		} );
+
+	} else if ( !traditional && toType( obj ) === "object" ) {
+
+		// Serialize object item.
+		for ( name in obj ) {
+			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
+		}
+
+	} else {
+
+		// Serialize scalar item.
+		add( prefix, obj );
+	}
+}
+
+// Serialize an array of form elements or a set of
+// key/values into a query string
+jQuery.param = function( a, traditional ) {
+	var prefix,
+		s = [],
+		add = function( key, valueOrFunction ) {
+
+			// If value is a function, invoke it and use its return value
+			var value = isFunction( valueOrFunction ) ?
+				valueOrFunction() :
+				valueOrFunction;
+
+			s[ s.length ] = encodeURIComponent( key ) + "=" +
+				encodeURIComponent( value == null ? "" : value );
+		};
+
+	// If an array was passed in, assume that it is an array of form elements.
+	if ( Array.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
+
+		// Serialize the form elements
+		jQuery.each( a, function() {
+			add( this.name, this.value );
+		} );
+
+	} else {
+
+		// If traditional, encode the "old" way (the way 1.3.2 or older
+		// did it), otherwise encode params recursively.
+		for ( prefix in a ) {
+			buildParams( prefix, a[ prefix ], traditional, add );
+		}
+	}
+
+	// Return the resulting serialization
+	return s.join( "&" );
+};
+
+jQuery.fn.extend( {
+	serialize: function() {
+		return jQuery.param( this.serializeArray() );
+	},
+	serializeArray: function() {
+		return this.map( function() {
+
+			// Can add propHook for "elements" to filter or add form elements
+			var elements = jQuery.prop( this, "elements" );
+			return elements ? jQuery.makeArray( elements ) : this;
+		} )
+		.filter( function() {
+			var type = this.type;
+
+			// Use .is( ":disabled" ) so that fieldset[disabled] works
+			return this.name && !jQuery( this ).is( ":disabled" ) &&
+				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
+				( this.checked || !rcheckableType.test( type ) );
+		} )
+		.map( function( i, elem ) {
+			var val = jQuery( this ).val();
+
+			if ( val == null ) {
+				return null;
+			}
+
+			if ( Array.isArray( val ) ) {
+				return jQuery.map( val, function( val ) {
+					return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+				} );
+			}
+
+			return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+		} ).get();
+	}
+} );
+
+
+var
+	r20 = /%20/g,
 	rhash = /#.*$/,
-	rts = /([?&])_=[^&]*/,
+	rantiCache = /([?&])_=[^&]*/,
 	rheaders = /^(.*?):[ \t]*([^\r\n]*)$/mg,
 
 	// #7653, #8125, #8152: local protocol detection
@@ -8031,9 +8575,9 @@ function addToPrefiltersOrTransports( structure ) {
 
 		var dataType,
 			i = 0,
-			dataTypes = dataTypeExpression.toLowerCase().match( rnotwhite ) || [];
+			dataTypes = dataTypeExpression.toLowerCase().match( rnothtmlwhite ) || [];
 
-		if ( jQuery.isFunction( func ) ) {
+		if ( isFunction( func ) ) {
 
 			// For each dataType in the dataTypeExpression
 			while ( ( dataType = dataTypes[ i++ ] ) ) {
@@ -8193,7 +8737,7 @@ function ajaxConvert( s, response, jqXHR, isSuccess ) {
 
 		if ( current ) {
 
-		// There's only work to do if current dataType is non-auto
+			// There's only work to do if current dataType is non-auto
 			if ( current === "*" ) {
 
 				current = prev;
@@ -8273,6 +8817,7 @@ jQuery.extend( {
 		processData: true,
 		async: true,
 		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+
 		/*
 		timeout: 0,
 		data: null,
@@ -8316,7 +8861,7 @@ jQuery.extend( {
 			"text html": true,
 
 			// Evaluate text as a json expression
-			"text json": jQuery.parseJSON,
+			"text json": JSON.parse,
 
 			// Parse text as xml
 			"text xml": jQuery.parseXML
@@ -8375,12 +8920,18 @@ jQuery.extend( {
 			// Url cleanup var
 			urlAnchor,
 
+			// Request state (becomes false upon send and true upon completion)
+			completed,
+
 			// To know if global events are to be dispatched
 			fireGlobals,
 
 			// Loop variable
 			i,
 
+			// uncached part of the url
+			uncached,
+
 			// Create the final options object
 			s = jQuery.ajaxSetup( {}, options ),
 
@@ -8404,9 +8955,6 @@ jQuery.extend( {
 			requestHeaders = {},
 			requestHeadersNames = {},
 
-			// The jqXHR state
-			state = 0,
-
 			// Default abort message
 			strAbort = "canceled",
 
@@ -8417,7 +8965,7 @@ jQuery.extend( {
 				// Builds headers hashtable if needed
 				getResponseHeader: function( key ) {
 					var match;
-					if ( state === 2 ) {
+					if ( completed ) {
 						if ( !responseHeaders ) {
 							responseHeaders = {};
 							while ( ( match = rheaders.exec( responseHeadersString ) ) ) {
@@ -8431,14 +8979,14 @@ jQuery.extend( {
 
 				// Raw string
 				getAllResponseHeaders: function() {
-					return state === 2 ? responseHeadersString : null;
+					return completed ? responseHeadersString : null;
 				},
 
 				// Caches the header
 				setRequestHeader: function( name, value ) {
-					var lname = name.toLowerCase();
-					if ( !state ) {
-						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
+					if ( completed == null ) {
+						name = requestHeadersNames[ name.toLowerCase() ] =
+							requestHeadersNames[ name.toLowerCase() ] || name;
 						requestHeaders[ name ] = value;
 					}
 					return this;
@@ -8446,7 +8994,7 @@ jQuery.extend( {
 
 				// Overrides response content-type header
 				overrideMimeType: function( type ) {
-					if ( !state ) {
+					if ( completed == null ) {
 						s.mimeType = type;
 					}
 					return this;
@@ -8456,16 +9004,16 @@ jQuery.extend( {
 				statusCode: function( map ) {
 					var code;
 					if ( map ) {
-						if ( state < 2 ) {
-							for ( code in map ) {
-
-								// Lazy-add the new callback in a way that preserves old ones
-								statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
-							}
-						} else {
+						if ( completed ) {
 
 							// Execute the appropriate callbacks
 							jqXHR.always( map[ jqXHR.status ] );
+						} else {
+
+							// Lazy-add the new callbacks in a way that preserves old ones
+							for ( code in map ) {
+								statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
+							}
 						}
 					}
 					return this;
@@ -8483,33 +9031,31 @@ jQuery.extend( {
 			};
 
 		// Attach deferreds
-		deferred.promise( jqXHR ).complete = completeDeferred.add;
-		jqXHR.success = jqXHR.done;
-		jqXHR.error = jqXHR.fail;
+		deferred.promise( jqXHR );
 
-		// Remove hash character (#7531: and string promotion)
 		// Add protocol if not provided (prefilters might expect it)
 		// Handle falsy url in the settings object (#10093: consistency with old signature)
 		// We also use the url parameter if available
-		s.url = ( ( url || s.url || location.href ) + "" ).replace( rhash, "" )
+		s.url = ( ( url || s.url || location.href ) + "" )
 			.replace( rprotocol, location.protocol + "//" );
 
 		// Alias method option to type as per ticket #12004
 		s.type = options.method || options.type || s.method || s.type;
 
 		// Extract dataTypes list
-		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().match( rnotwhite ) || [ "" ];
+		s.dataTypes = ( s.dataType || "*" ).toLowerCase().match( rnothtmlwhite ) || [ "" ];
 
 		// A cross-domain request is in order when the origin doesn't match the current origin.
 		if ( s.crossDomain == null ) {
 			urlAnchor = document.createElement( "a" );
 
-			// Support: IE8-11+
-			// IE throws exception if url is malformed, e.g. http://example.com:80x/
+			// Support: IE <=8 - 11, Edge 12 - 15
+			// IE throws exception on accessing the href property if url is malformed,
+			// e.g. http://example.com:80x/
 			try {
 				urlAnchor.href = s.url;
 
-				// Support: IE8-11+
+				// Support: IE <=8 - 11 only
 				// Anchor's host property isn't correctly set when s.url is relative
 				urlAnchor.href = urlAnchor.href;
 				s.crossDomain = originAnchor.protocol + "//" + originAnchor.host !==
@@ -8531,7 +9077,7 @@ jQuery.extend( {
 		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
 
 		// If request was aborted inside a prefilter, stop there
-		if ( state === 2 ) {
+		if ( completed ) {
 			return jqXHR;
 		}
 
@@ -8552,29 +9098,36 @@ jQuery.extend( {
 
 		// Save the URL in case we're toying with the If-Modified-Since
 		// and/or If-None-Match header later on
-		cacheURL = s.url;
+		// Remove hash to simplify url manipulation
+		cacheURL = s.url.replace( rhash, "" );
 
 		// More options handling for requests with no content
 		if ( !s.hasContent ) {
 
-			// If data is available, append data to url
-			if ( s.data ) {
-				cacheURL = ( s.url += ( rquery.test( cacheURL ) ? "&" : "?" ) + s.data );
+			// Remember the hash so we can put it back
+			uncached = s.url.slice( cacheURL.length );
+
+			// If data is available and should be processed, append data to url
+			if ( s.data && ( s.processData || typeof s.data === "string" ) ) {
+				cacheURL += ( rquery.test( cacheURL ) ? "&" : "?" ) + s.data;
 
 				// #9682: remove data so that it's not used in an eventual retry
 				delete s.data;
 			}
 
-			// Add anti-cache in url if needed
+			// Add or update anti-cache param if needed
 			if ( s.cache === false ) {
-				s.url = rts.test( cacheURL ) ?
-
-					// If there is already a '_' parameter, set its value
-					cacheURL.replace( rts, "$1_=" + nonce++ ) :
-
-					// Otherwise add one to the end
-					cacheURL + ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + nonce++;
+				cacheURL = cacheURL.replace( rantiCache, "$1" );
+				uncached = ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ( nonce++ ) + uncached;
 			}
+
+			// Put hash and anti-cache on the URL that will be requested (gh-1732)
+			s.url = cacheURL + uncached;
+
+		// Change '%20' to '+' if this is encoded form body content (gh-2658)
+		} else if ( s.data && s.processData &&
+			( s.contentType || "" ).indexOf( "application/x-www-form-urlencoded" ) === 0 ) {
+			s.data = s.data.replace( r20, "+" );
 		}
 
 		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
@@ -8608,7 +9161,7 @@ jQuery.extend( {
 
 		// Allow custom headers/mimetypes and early abort
 		if ( s.beforeSend &&
-			( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
+			( s.beforeSend.call( callbackContext, jqXHR, s ) === false || completed ) ) {
 
 			// Abort if not done already and return
 			return jqXHR.abort();
@@ -8618,9 +9171,9 @@ jQuery.extend( {
 		strAbort = "abort";
 
 		// Install callbacks on deferreds
-		for ( i in { success: 1, error: 1, complete: 1 } ) {
-			jqXHR[ i ]( s[ i ] );
-		}
+		completeDeferred.add( s.complete );
+		jqXHR.done( s.success );
+		jqXHR.fail( s.error );
 
 		// Get transport
 		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
@@ -8637,7 +9190,7 @@ jQuery.extend( {
 			}
 
 			// If request was aborted inside ajaxSend, stop there
-			if ( state === 2 ) {
+			if ( completed ) {
 				return jqXHR;
 			}
 
@@ -8649,18 +9202,17 @@ jQuery.extend( {
 			}
 
 			try {
-				state = 1;
+				completed = false;
 				transport.send( requestHeaders, done );
 			} catch ( e ) {
 
-				// Propagate exception as error if not done
-				if ( state < 2 ) {
-					done( -1, e );
-
-				// Simply rethrow otherwise
-				} else {
+				// Rethrow post-completion exceptions
+				if ( completed ) {
 					throw e;
 				}
+
+				// Propagate others as results
+				done( -1, e );
 			}
 		}
 
@@ -8669,13 +9221,12 @@ jQuery.extend( {
 			var isSuccess, success, error, response, modified,
 				statusText = nativeStatusText;
 
-			// Called once
-			if ( state === 2 ) {
+			// Ignore repeat invocations
+			if ( completed ) {
 				return;
 			}
 
-			// State is "done" now
-			state = 2;
+			completed = true;
 
 			// Clear timeout if it exists
 			if ( timeoutTimer ) {
@@ -8794,7 +9345,7 @@ jQuery.each( [ "get", "post" ], function( i, method ) {
 	jQuery[ method ] = function( url, data, callback, type ) {
 
 		// Shift arguments if data argument was omitted
-		if ( jQuery.isFunction( data ) ) {
+		if ( isFunction( data ) ) {
 			type = type || callback;
 			callback = data;
 			data = undefined;
@@ -8819,6 +9370,7 @@ jQuery._evalUrl = function( url ) {
 		// Make this explicit, since user can override this through ajaxSetup (#11264)
 		type: "GET",
 		dataType: "script",
+		cache: true,
 		async: false,
 		global: false,
 		"throws": true
@@ -8830,13 +9382,10 @@ jQuery.fn.extend( {
 	wrapAll: function( html ) {
 		var wrap;
 
-		if ( jQuery.isFunction( html ) ) {
-			return this.each( function( i ) {
-				jQuery( this ).wrapAll( html.call( this, i ) );
-			} );
-		}
-
 		if ( this[ 0 ] ) {
+			if ( isFunction( html ) ) {
+				html = html.call( this[ 0 ] );
+			}
 
 			// The elements to wrap the target around
 			wrap = jQuery( html, this[ 0 ].ownerDocument ).eq( 0 ).clone( true );
@@ -8860,7 +9409,7 @@ jQuery.fn.extend( {
 	},
 
 	wrapInner: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
+		if ( isFunction( html ) ) {
 			return this.each( function( i ) {
 				jQuery( this ).wrapInner( html.call( this, i ) );
 			} );
@@ -8880,154 +9429,32 @@ jQuery.fn.extend( {
 	},
 
 	wrap: function( html ) {
-		var isFunction = jQuery.isFunction( html );
+		var htmlIsFunction = isFunction( html );
 
 		return this.each( function( i ) {
-			jQuery( this ).wrapAll( isFunction ? html.call( this, i ) : html );
+			jQuery( this ).wrapAll( htmlIsFunction ? html.call( this, i ) : html );
 		} );
 	},
 
-	unwrap: function() {
-		return this.parent().each( function() {
-			if ( !jQuery.nodeName( this, "body" ) ) {
-				jQuery( this ).replaceWith( this.childNodes );
-			}
-		} ).end();
+	unwrap: function( selector ) {
+		this.parent( selector ).not( "body" ).each( function() {
+			jQuery( this ).replaceWith( this.childNodes );
+		} );
+		return this;
 	}
 } );
 
 
-jQuery.expr.filters.hidden = function( elem ) {
-	return !jQuery.expr.filters.visible( elem );
+jQuery.expr.pseudos.hidden = function( elem ) {
+	return !jQuery.expr.pseudos.visible( elem );
 };
-jQuery.expr.filters.visible = function( elem ) {
-
-	// Support: Opera <= 12.12
-	// Opera reports offsetWidths and offsetHeights less than zero on some elements
-	// Use OR instead of AND as the element is not visible if either is true
-	// See tickets #10406 and #13132
-	return elem.offsetWidth > 0 || elem.offsetHeight > 0 || elem.getClientRects().length > 0;
+jQuery.expr.pseudos.visible = function( elem ) {
+	return !!( elem.offsetWidth || elem.offsetHeight || elem.getClientRects().length );
 };
 
 
 
 
-var r20 = /%20/g,
-	rbracket = /\[\]$/,
-	rCRLF = /\r?\n/g,
-	rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
-	rsubmittable = /^(?:input|select|textarea|keygen)/i;
-
-function buildParams( prefix, obj, traditional, add ) {
-	var name;
-
-	if ( jQuery.isArray( obj ) ) {
-
-		// Serialize array item.
-		jQuery.each( obj, function( i, v ) {
-			if ( traditional || rbracket.test( prefix ) ) {
-
-				// Treat each array item as a scalar.
-				add( prefix, v );
-
-			} else {
-
-				// Item is non-scalar (array or object), encode its numeric index.
-				buildParams(
-					prefix + "[" + ( typeof v === "object" && v != null ? i : "" ) + "]",
-					v,
-					traditional,
-					add
-				);
-			}
-		} );
-
-	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
-
-		// Serialize object item.
-		for ( name in obj ) {
-			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
-		}
-
-	} else {
-
-		// Serialize scalar item.
-		add( prefix, obj );
-	}
-}
-
-// Serialize an array of form elements or a set of
-// key/values into a query string
-jQuery.param = function( a, traditional ) {
-	var prefix,
-		s = [],
-		add = function( key, value ) {
-
-			// If value is a function, invoke it and return its value
-			value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
-			s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
-		};
-
-	// Set traditional to true for jQuery <= 1.3.2 behavior.
-	if ( traditional === undefined ) {
-		traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
-	}
-
-	// If an array was passed in, assume that it is an array of form elements.
-	if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
-
-		// Serialize the form elements
-		jQuery.each( a, function() {
-			add( this.name, this.value );
-		} );
-
-	} else {
-
-		// If traditional, encode the "old" way (the way 1.3.2 or older
-		// did it), otherwise encode params recursively.
-		for ( prefix in a ) {
-			buildParams( prefix, a[ prefix ], traditional, add );
-		}
-	}
-
-	// Return the resulting serialization
-	return s.join( "&" ).replace( r20, "+" );
-};
-
-jQuery.fn.extend( {
-	serialize: function() {
-		return jQuery.param( this.serializeArray() );
-	},
-	serializeArray: function() {
-		return this.map( function() {
-
-			// Can add propHook for "elements" to filter or add form elements
-			var elements = jQuery.prop( this, "elements" );
-			return elements ? jQuery.makeArray( elements ) : this;
-		} )
-		.filter( function() {
-			var type = this.type;
-
-			// Use .is( ":disabled" ) so that fieldset[disabled] works
-			return this.name && !jQuery( this ).is( ":disabled" ) &&
-				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
-				( this.checked || !rcheckableType.test( type ) );
-		} )
-		.map( function( i, elem ) {
-			var val = jQuery( this ).val();
-
-			return val == null ?
-				null :
-				jQuery.isArray( val ) ?
-					jQuery.map( val, function( val ) {
-						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-					} ) :
-					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-		} ).get();
-	}
-} );
-
-
 jQuery.ajaxSettings.xhr = function() {
 	try {
 		return new window.XMLHttpRequest();
@@ -9039,7 +9466,7 @@ var xhrSuccessStatus = {
 		// File protocol always yields status code 0, assume 200
 		0: 200,
 
-		// Support: IE9
+		// Support: IE <=9 only
 		// #1450: sometimes IE returns 1223 when it should be 204
 		1223: 204
 	},
@@ -9097,13 +9524,14 @@ jQuery.ajaxTransport( function( options ) {
 					return function() {
 						if ( callback ) {
 							callback = errorCallback = xhr.onload =
-								xhr.onerror = xhr.onabort = xhr.onreadystatechange = null;
+								xhr.onerror = xhr.onabort = xhr.ontimeout =
+									xhr.onreadystatechange = null;
 
 							if ( type === "abort" ) {
 								xhr.abort();
 							} else if ( type === "error" ) {
 
-								// Support: IE9
+								// Support: IE <=9 only
 								// On a manual native abort, IE9 throws
 								// errors on any property access that is not readyState
 								if ( typeof xhr.status !== "number" ) {
@@ -9121,7 +9549,7 @@ jQuery.ajaxTransport( function( options ) {
 									xhrSuccessStatus[ xhr.status ] || xhr.status,
 									xhr.statusText,
 
-									// Support: IE9 only
+									// Support: IE <=9 only
 									// IE9 has no XHR2 but throws on binary (trac-11426)
 									// For XHR2 non-text, let the caller handle it (gh-2498)
 									( xhr.responseType || "text" ) !== "text"  ||
@@ -9137,9 +9565,9 @@ jQuery.ajaxTransport( function( options ) {
 
 				// Listen to events
 				xhr.onload = callback();
-				errorCallback = xhr.onerror = callback( "error" );
+				errorCallback = xhr.onerror = xhr.ontimeout = callback( "error" );
 
-				// Support: IE9
+				// Support: IE 9 only
 				// Use onreadystatechange to replace onabort
 				// to handle uncaught aborts
 				if ( xhr.onabort !== undefined ) {
@@ -9191,6 +9619,13 @@ jQuery.ajaxTransport( function( options ) {
 
 
 
+// Prevent auto-execution of scripts when no explicit dataType was provided (See gh-2432)
+jQuery.ajaxPrefilter( function( s ) {
+	if ( s.crossDomain ) {
+		s.contents.script = false;
+	}
+} );
+
 // Install script dataType
 jQuery.ajaxSetup( {
 	accepts: {
@@ -9284,7 +9719,7 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
 	if ( jsonProp || s.dataTypes[ 0 ] === "jsonp" ) {
 
 		// Get callback name, remembering preexisting value associated with it
-		callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?
+		callbackName = s.jsonpCallback = isFunction( s.jsonpCallback ) ?
 			s.jsonpCallback() :
 			s.jsonpCallback;
 
@@ -9335,7 +9770,7 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
 			}
 
 			// Call if it was a function and we have a response
-			if ( responseContainer && jQuery.isFunction( overwritten ) ) {
+			if ( responseContainer && isFunction( overwritten ) ) {
 				overwritten( responseContainer[ 0 ] );
 			}
 
@@ -9350,7 +9785,7 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
 
 
 
-// Support: Safari 8+
+// Support: Safari 8 only
 // In Safari 8 documents created via document.implementation.createHTMLDocument
 // collapse sibling forms: the second one becomes a child of the first one.
 // Because of that, this security measure has to be disabled in Safari 8.
@@ -9367,22 +9802,36 @@ support.createHTMLDocument = ( function() {
 // defaults to document
 // keepScripts (optional): If true, will include scripts passed in the html string
 jQuery.parseHTML = function( data, context, keepScripts ) {
-	if ( !data || typeof data !== "string" ) {
-		return null;
+	if ( typeof data !== "string" ) {
+		return [];
 	}
 	if ( typeof context === "boolean" ) {
 		keepScripts = context;
 		context = false;
 	}
 
-	// Stop scripts or inline event handlers from being executed immediately
-	// by using document.implementation
-	context = context || ( support.createHTMLDocument ?
-		document.implementation.createHTMLDocument( "" ) :
-		document );
+	var base, parsed, scripts;
 
-	var parsed = rsingleTag.exec( data ),
-		scripts = !keepScripts && [];
+	if ( !context ) {
+
+		// Stop scripts or inline event handlers from being executed immediately
+		// by using document.implementation
+		if ( support.createHTMLDocument ) {
+			context = document.implementation.createHTMLDocument( "" );
+
+			// Set the base href for the created document
+			// so any parsed elements with URLs
+			// are based on the document's URL (gh-2965)
+			base = context.createElement( "base" );
+			base.href = document.location.href;
+			context.head.appendChild( base );
+		} else {
+			context = document;
+		}
+	}
+
+	parsed = rsingleTag.exec( data );
+	scripts = !keepScripts && [];
 
 	// Single tag
 	if ( parsed ) {
@@ -9399,28 +9848,21 @@ jQuery.parseHTML = function( data, context, keepScripts ) {
 };
 
 
-// Keep a copy of the old load method
-var _load = jQuery.fn.load;
-
 /**
  * Load a url into a page
  */
 jQuery.fn.load = function( url, params, callback ) {
-	if ( typeof url !== "string" && _load ) {
-		return _load.apply( this, arguments );
-	}
-
 	var selector, type, response,
 		self = this,
 		off = url.indexOf( " " );
 
 	if ( off > -1 ) {
-		selector = jQuery.trim( url.slice( off ) );
+		selector = stripAndCollapse( url.slice( off ) );
 		url = url.slice( 0, off );
 	}
 
 	// If it's a function
-	if ( jQuery.isFunction( params ) ) {
+	if ( isFunction( params ) ) {
 
 		// We assume that it's the callback
 		callback = params;
@@ -9461,7 +9903,7 @@ jQuery.fn.load = function( url, params, callback ) {
 		// If it fails, this function gets "jqXHR", "status", "error"
 		} ).always( callback && function( jqXHR, status ) {
 			self.each( function() {
-				callback.apply( self, response || [ jqXHR.responseText, status, jqXHR ] );
+				callback.apply( this, response || [ jqXHR.responseText, status, jqXHR ] );
 			} );
 		} );
 	}
@@ -9489,7 +9931,7 @@ jQuery.each( [
 
 
 
-jQuery.expr.filters.animated = function( elem ) {
+jQuery.expr.pseudos.animated = function( elem ) {
 	return jQuery.grep( jQuery.timers, function( fn ) {
 		return elem === fn.elem;
 	} ).length;
@@ -9498,13 +9940,6 @@ jQuery.expr.filters.animated = function( elem ) {
 
 
 
-/**
- * Gets a window from an element
- */
-function getWindow( elem ) {
-	return jQuery.isWindow( elem ) ? elem : elem.nodeType === 9 && elem.defaultView;
-}
-
 jQuery.offset = {
 	setOffset: function( elem, options, i ) {
 		var curPosition, curLeft, curCSSTop, curTop, curOffset, curCSSLeft, calculatePosition,
@@ -9535,7 +9970,7 @@ jQuery.offset = {
 			curLeft = parseFloat( curCSSLeft ) || 0;
 		}
 
-		if ( jQuery.isFunction( options ) ) {
+		if ( isFunction( options ) ) {
 
 			// Use jQuery.extend here to allow modification of coordinates argument (gh-1848)
 			options = options.call( elem, i, jQuery.extend( {}, curOffset ) );
@@ -9558,7 +9993,11 @@ jQuery.offset = {
 };
 
 jQuery.fn.extend( {
+
+	// offset() relates an element's border box to the document origin
 	offset: function( options ) {
+
+		// Preserve chaining for setter
 		if ( arguments.length ) {
 			return options === undefined ?
 				this :
@@ -9567,63 +10006,67 @@ jQuery.fn.extend( {
 				} );
 		}
 
-		var docElem, win,
-			elem = this[ 0 ],
-			box = { top: 0, left: 0 },
-			doc = elem && elem.ownerDocument;
+		var rect, win,
+			elem = this[ 0 ];
 
-		if ( !doc ) {
+		if ( !elem ) {
 			return;
 		}
 
-		docElem = doc.documentElement;
-
-		// Make sure it's not a disconnected DOM node
-		if ( !jQuery.contains( docElem, elem ) ) {
-			return box;
+		// Return zeros for disconnected and hidden (display: none) elements (gh-2310)
+		// Support: IE <=11 only
+		// Running getBoundingClientRect on a
+		// disconnected node in IE throws an error
+		if ( !elem.getClientRects().length ) {
+			return { top: 0, left: 0 };
 		}
 
-		box = elem.getBoundingClientRect();
-		win = getWindow( doc );
+		// Get document-relative position by adding viewport scroll to viewport-relative gBCR
+		rect = elem.getBoundingClientRect();
+		win = elem.ownerDocument.defaultView;
 		return {
-			top: box.top + win.pageYOffset - docElem.clientTop,
-			left: box.left + win.pageXOffset - docElem.clientLeft
+			top: rect.top + win.pageYOffset,
+			left: rect.left + win.pageXOffset
 		};
 	},
 
+	// position() relates an element's margin box to its offset parent's padding box
+	// This corresponds to the behavior of CSS absolute positioning
 	position: function() {
 		if ( !this[ 0 ] ) {
 			return;
 		}
 
-		var offsetParent, offset,
+		var offsetParent, offset, doc,
 			elem = this[ 0 ],
 			parentOffset = { top: 0, left: 0 };
 
-		// Fixed elements are offset from window (parentOffset = {top:0, left: 0},
-		// because it is its only offset parent
+		// position:fixed elements are offset from the viewport, which itself always has zero offset
 		if ( jQuery.css( elem, "position" ) === "fixed" ) {
 
-			// Assume getBoundingClientRect is there when computed position is fixed
+			// Assume position:fixed implies availability of getBoundingClientRect
 			offset = elem.getBoundingClientRect();
 
 		} else {
-
-			// Get *real* offsetParent
-			offsetParent = this.offsetParent();
-
-			// Get correct offsets
 			offset = this.offset();
-			if ( !jQuery.nodeName( offsetParent[ 0 ], "html" ) ) {
-				parentOffset = offsetParent.offset();
-			}
 
-			// Add offsetParent borders
-			// Subtract offsetParent scroll positions
-			parentOffset.top += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true ) -
-				offsetParent.scrollTop();
-			parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true ) -
-				offsetParent.scrollLeft();
+			// Account for the *real* offset parent, which can be the document or its root element
+			// when a statically positioned element is identified
+			doc = elem.ownerDocument;
+			offsetParent = elem.offsetParent || doc.documentElement;
+			while ( offsetParent &&
+				( offsetParent === doc.body || offsetParent === doc.documentElement ) &&
+				jQuery.css( offsetParent, "position" ) === "static" ) {
+
+				offsetParent = offsetParent.parentNode;
+			}
+			if ( offsetParent && offsetParent !== elem && offsetParent.nodeType === 1 ) {
+
+				// Incorporate borders into its offset, since they are outside its content origin
+				parentOffset = jQuery( offsetParent ).offset();
+				parentOffset.top += jQuery.css( offsetParent, "borderTopWidth", true );
+				parentOffset.left += jQuery.css( offsetParent, "borderLeftWidth", true );
+			}
 		}
 
 		// Subtract parent offsets and element margins
@@ -9662,7 +10105,14 @@ jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function(
 
 	jQuery.fn[ method ] = function( val ) {
 		return access( this, function( elem, method, val ) {
-			var win = getWindow( elem );
+
+			// Coalesce documents and windows
+			var win;
+			if ( isWindow( elem ) ) {
+				win = elem;
+			} else if ( elem.nodeType === 9 ) {
+				win = elem.defaultView;
+			}
 
 			if ( val === undefined ) {
 				return win ? win[ prop ] : elem[ method ];
@@ -9681,10 +10131,10 @@ jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function(
 	};
 } );
 
-// Support: Safari<7-8+, Chrome<37-44+
+// Support: Safari <=7 - 9.1, Chrome <=37 - 49
 // Add the top/left cssHooks using jQuery.fn.position
 // Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
-// Blink bug: https://code.google.com/p/chromium/issues/detail?id=229280
+// Blink bug: https://bugs.chromium.org/p/chromium/issues/detail?id=589347
 // getComputedStyle returns percent when specified for top/left/bottom/right;
 // rather than make the css module depend on the offset module, just check for it here
 jQuery.each( [ "top", "left" ], function( i, prop ) {
@@ -9716,12 +10166,12 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
 			return access( this, function( elem, type, value ) {
 				var doc;
 
-				if ( jQuery.isWindow( elem ) ) {
+				if ( isWindow( elem ) ) {
 
-					// As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
-					// isn't a whole lot we can do. See pull request at this URL for discussion:
-					// https://github.com/jquery/jquery/pull/764
-					return elem.document.documentElement[ "client" + name ];
+					// $( window ).outerWidth/Height return w/h including scrollbars (gh-1729)
+					return funcName.indexOf( "outer" ) === 0 ?
+						elem[ "inner" + name ] :
+						elem.document.documentElement[ "client" + name ];
 				}
 
 				// Get document width or height
@@ -9744,12 +10194,34 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
 
 					// Set width or height on the element
 					jQuery.style( elem, type, value, extra );
-			}, type, chainable ? margin : undefined, chainable, null );
+			}, type, chainable ? margin : undefined, chainable );
 		};
 	} );
 } );
 
 
+jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
+	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
+	"change select submit keydown keypress keyup contextmenu" ).split( " " ),
+	function( i, name ) {
+
+	// Handle event binding
+	jQuery.fn[ name ] = function( data, fn ) {
+		return arguments.length > 0 ?
+			this.on( name, null, data, fn ) :
+			this.trigger( name );
+	};
+} );
+
+jQuery.fn.extend( {
+	hover: function( fnOver, fnOut ) {
+		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
+	}
+} );
+
+
+
+
 jQuery.fn.extend( {
 
 	bind: function( types, data, fn ) {
@@ -9768,13 +10240,70 @@ jQuery.fn.extend( {
 		return arguments.length === 1 ?
 			this.off( selector, "**" ) :
 			this.off( types, selector || "**", fn );
-	},
-	size: function() {
-		return this.length;
 	}
 } );
 
-jQuery.fn.andSelf = jQuery.fn.addBack;
+// Bind a function to a context, optionally partially applying any
+// arguments.
+// jQuery.proxy is deprecated to promote standards (specifically Function#bind)
+// However, it is not slated for removal any time soon
+jQuery.proxy = function( fn, context ) {
+	var tmp, args, proxy;
+
+	if ( typeof context === "string" ) {
+		tmp = fn[ context ];
+		context = fn;
+		fn = tmp;
+	}
+
+	// Quick check to determine if target is callable, in the spec
+	// this throws a TypeError, but we will just return undefined.
+	if ( !isFunction( fn ) ) {
+		return undefined;
+	}
+
+	// Simulated bind
+	args = slice.call( arguments, 2 );
+	proxy = function() {
+		return fn.apply( context || this, args.concat( slice.call( arguments ) ) );
+	};
+
+	// Set the guid of unique handler to the same of original handler, so it can be removed
+	proxy.guid = fn.guid = fn.guid || jQuery.guid++;
+
+	return proxy;
+};
+
+jQuery.holdReady = function( hold ) {
+	if ( hold ) {
+		jQuery.readyWait++;
+	} else {
+		jQuery.ready( true );
+	}
+};
+jQuery.isArray = Array.isArray;
+jQuery.parseJSON = JSON.parse;
+jQuery.nodeName = nodeName;
+jQuery.isFunction = isFunction;
+jQuery.isWindow = isWindow;
+jQuery.camelCase = camelCase;
+jQuery.type = toType;
+
+jQuery.now = Date.now;
+
+jQuery.isNumeric = function( obj ) {
+
+	// As of jQuery 3.0, isNumeric is limited to
+	// strings and numbers (primitives or objects)
+	// that can be coerced to finite numbers (gh-2662)
+	var type = jQuery.type( obj );
+	return ( type === "number" || type === "string" ) &&
+
+		// parseFloat NaNs numeric-cast false positives ("")
+		// ...but misinterprets leading-number strings, particularly hex literals ("0x...")
+		// subtraction forces infinities to NaN
+		!isNaN( obj - parseFloat( obj ) );
+};
 
 
 
@@ -9800,6 +10329,7 @@ if ( typeof define === "function" && define.amd ) {
 
 
 
+
 var
 
 	// Map over jQuery in case of overwrite
@@ -9827,5 +10357,8 @@ if ( !noGlobal ) {
 	window.jQuery = window.$ = jQuery;
 }
 
+
+
+
 return jQuery;
-}));
+} );
diff --git a/vendor/assets/javascripts/markdown-it.js b/vendor/assets/javascripts/markdown-it.js
index 2de3b1c16e4..c71e33057ae 100644
--- a/vendor/assets/javascripts/markdown-it.js
+++ b/vendor/assets/javascripts/markdown-it.js
@@ -1,4 +1,4 @@
-/*! markdown-it 8.3.1 https://github.com//markdown-it/markdown-it @license MIT */(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.markdownit = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+/*! markdown-it 8.4.1 https://github.com//markdown-it/markdown-it @license MIT */(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.markdownit = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
 // HTML5 entities map: { name -> utf16string }
 //
 'use strict';
@@ -64,10 +64,8 @@ module.exports = [
   'option',
   'p',
   'param',
-  'pre',
   'section',
   'source',
-  'title',
   'summary',
   'table',
   'tbody',
@@ -459,18 +457,18 @@ module.exports = function parseLinkDestination(str, pos, max) {
 
     if (code === 0x28 /* ( */) {
       level++;
-      if (level > 1) { break; }
     }
 
     if (code === 0x29 /* ) */) {
+      if (level === 0) { break; }
       level--;
-      if (level < 0) { break; }
     }
 
     pos++;
   }
 
   if (start === pos) { return result; }
+  if (level !== 0) { return result; }
 
   result.str = unescapeAll(str.slice(start, pos));
   result.lines = lines;
@@ -1185,7 +1183,7 @@ var _rules = [
   [ 'table',      require('./rules_block/table'),      [ 'paragraph', 'reference' ] ],
   [ 'code',       require('./rules_block/code') ],
   [ 'fence',      require('./rules_block/fence'),      [ 'paragraph', 'reference', 'blockquote', 'list' ] ],
-  [ 'blockquote', require('./rules_block/blockquote'), [ 'paragraph', 'reference', 'list' ] ],
+  [ 'blockquote', require('./rules_block/blockquote'), [ 'paragraph', 'reference', 'blockquote', 'list' ] ],
   [ 'hr',         require('./rules_block/hr'),         [ 'paragraph', 'reference', 'blockquote', 'list' ] ],
   [ 'list',       require('./rules_block/list'),       [ 'paragraph', 'reference', 'blockquote' ] ],
   [ 'reference',  require('./rules_block/reference') ],
@@ -1250,7 +1248,7 @@ ParserBlock.prototype.tokenize = function (state, startLine, endLine) {
       if (ok) { break; }
     }
 
-    // set state.tight iff we had an empty line before current tag
+    // set state.tight if we had an empty line before current tag
     // i.e. latest empty line should not count
     state.tight = !hasEmptyLines;
 
@@ -1778,7 +1776,7 @@ default_rules.fence = function (tokens, idx, options, env, slf) {
     return highlighted + '\n';
   }
 
-  // If language exists, inject class gently, without mudofying original token.
+  // If language exists, inject class gently, without modifying original token.
   // May be, one day we will add .clone() for token and simplify this part, but
   // now we prefer to keep things local.
   if (info) {
@@ -1867,7 +1865,7 @@ function Renderer() {
    * var result = md.renderInline(...);
    * ```
    *
-   * Each rule is called as independed static function with fixed signature:
+   * Each rule is called as independent static function with fixed signature:
    *
    * ```javascript
    * function my_token_render(tokens, idx, options, env, renderer) {
@@ -2423,7 +2421,6 @@ module.exports = function blockquote(state, startLine, endLine, silent) {
       ch,
       i,
       initial,
-      isOutdented,
       l,
       lastLineEmpty,
       lines,
@@ -2439,6 +2436,7 @@ module.exports = function blockquote(state, startLine, endLine, silent) {
       terminate,
       terminatorRules,
       token,
+      wasOutdented,
       oldLineMax = state.lineMax,
       pos = state.bMarks[startLine] + state.tShift[startLine],
       max = state.eMarks[startLine];
@@ -2519,6 +2517,7 @@ module.exports = function blockquote(state, startLine, endLine, silent) {
 
   oldParentType = state.parentType;
   state.parentType = 'blockquote';
+  wasOutdented = false;
 
   // Search the end of the block
   //
@@ -2547,7 +2546,7 @@ module.exports = function blockquote(state, startLine, endLine, silent) {
     //    > current blockquote
     // 2. checking this line
     // ```
-    isOutdented = state.sCount[nextLine] < state.blkIndent;
+    if (state.sCount[nextLine] < state.blkIndent) wasOutdented = true;
 
     pos = state.bMarks[nextLine] + state.tShift[nextLine];
     max = state.eMarks[nextLine];
@@ -2557,7 +2556,7 @@ module.exports = function blockquote(state, startLine, endLine, silent) {
       break;
     }
 
-    if (state.src.charCodeAt(pos++) === 0x3E/* > */ && !isOutdented) {
+    if (state.src.charCodeAt(pos++) === 0x3E/* > */ && !wasOutdented) {
       // This line is inside the blockquote.
 
       // skip spaces after ">" and re-calculate offset
@@ -2657,8 +2656,6 @@ module.exports = function blockquote(state, startLine, endLine, silent) {
       break;
     }
 
-    if (isOutdented) break;
-
     oldBMarks.push(state.bMarks[nextLine]);
     oldBSCount.push(state.bsCount[nextLine]);
     oldTShift.push(state.tShift[nextLine]);
@@ -3103,7 +3100,7 @@ module.exports = function lheading(state, startLine, endLine/*, silent*/) {
 var isSpace = require('../common/utils').isSpace;
 
 
-// Search `[-+*][\n ]`, returns next pos arter marker on success
+// Search `[-+*][\n ]`, returns next pos after marker on success
 // or -1 on fail.
 function skipBulletListMarker(state, startLine) {
   var marker, pos, max, ch;
@@ -3131,7 +3128,7 @@ function skipBulletListMarker(state, startLine) {
   return pos;
 }
 
-// Search `\d+[.)][\n ]`, returns next pos arter marker on success
+// Search `\d+[.)][\n ]`, returns next pos after marker on success
 // or -1 on fail.
 function skipOrderedListMarker(state, startLine) {
   var ch,
@@ -3308,12 +3305,10 @@ module.exports = function list(state, startLine, endLine, silent) {
     while (pos < max) {
       ch = state.src.charCodeAt(pos);
 
-      if (isSpace(ch)) {
-        if (ch === 0x09) {
-          offset += 4 - (offset + state.bsCount[nextLine]) % 4;
-        } else {
-          offset++;
-        }
+      if (ch === 0x09) {
+        offset += 4 - (offset + state.bsCount[nextLine]) % 4;
+      } else if (ch === 0x20) {
+        offset++;
       } else {
         break;
       }
@@ -3414,7 +3409,7 @@ module.exports = function list(state, startLine, endLine, silent) {
     if (markerCharCode !== state.src.charCodeAt(posAfterMarker - 1)) { break; }
   }
 
-  // Finilize list
+  // Finalize list
   if (isOrdered) {
     token = state.push('ordered_list_close', 'ol', -1);
   } else {
@@ -4480,7 +4475,8 @@ function process_inlines(tokens, state) {
         lastChar = text.charCodeAt(t.index - 1);
       } else {
         for (j = i - 1; j >= 0; j--) {
-          if (tokens[j].type !== 'text') { continue; }
+          if (tokens[j].type === 'softbreak' || tokens[j].type === 'hardbreak') break; // lastChar defaults to 0x20
+          if (tokens[j].type !== 'text') continue;
 
           lastChar = tokens[j].content.charCodeAt(tokens[j].content.length - 1);
           break;
@@ -4496,7 +4492,8 @@ function process_inlines(tokens, state) {
         nextChar = text.charCodeAt(pos);
       } else {
         for (j = i + 1; j < tokens.length; j++) {
-          if (tokens[j].type !== 'text') { continue; }
+          if (tokens[j].type === 'softbreak' || tokens[j].type === 'hardbreak') break; // nextChar defaults to 0x20
+          if (tokens[j].type !== 'text') continue;
 
           nextChar = tokens[j].content.charCodeAt(0);
           break;
@@ -4880,7 +4877,7 @@ module.exports.postProcess = function emphasis(state) {
       delimiters = state.delimiters,
       max = state.delimiters.length;
 
-  for (i = 0; i < max; i++) {
+  for (i = max - 1; i >= 0; i--) {
     startDelim = delimiters[i];
 
     if (startDelim.marker !== 0x5F/* _ */ && startDelim.marker !== 0x2A/* * */) {
@@ -4894,16 +4891,16 @@ module.exports.postProcess = function emphasis(state) {
 
     endDelim = delimiters[startDelim.end];
 
-    // If the next delimiter has the same marker and is adjacent to this one,
+    // If the previous delimiter has the same marker and is adjacent to this one,
     // merge those into one strong delimiter.
     //
     // `<em><em>whatever</em></em>` -> `<strong>whatever</strong>`
     //
-    isStrong = i + 1 < max &&
-               delimiters[i + 1].end === startDelim.end - 1 &&
-               delimiters[i + 1].token === startDelim.token + 1 &&
-               delimiters[startDelim.end - 1].token === endDelim.token - 1 &&
-               delimiters[i + 1].marker === startDelim.marker;
+    isStrong = i > 0 &&
+               delimiters[i - 1].end === startDelim.end + 1 &&
+               delimiters[i - 1].token === startDelim.token - 1 &&
+               delimiters[startDelim.end + 1].token === endDelim.token + 1 &&
+               delimiters[i - 1].marker === startDelim.marker;
 
     ch = String.fromCharCode(startDelim.marker);
 
@@ -4922,9 +4919,9 @@ module.exports.postProcess = function emphasis(state) {
     token.content = '';
 
     if (isStrong) {
-      state.tokens[delimiters[i + 1].token].content = '';
-      state.tokens[delimiters[startDelim.end - 1].token].content = '';
-      i++;
+      state.tokens[delimiters[i - 1].token].content = '';
+      state.tokens[delimiters[startDelim.end + 1].token].content = '';
+      i--;
     }
   }
 };
@@ -4980,7 +4977,7 @@ module.exports = function entity(state, silent) {
 };
 
 },{"../common/entities":1,"../common/utils":4}],42:[function(require,module,exports){
-// Proceess escaped chars and hardbreaks
+// Process escaped chars and hardbreaks
 
 'use strict';
 
@@ -7944,7 +7941,7 @@ module.exports=/[\0-\x1F\x7F-\x9F]/
 },{}],62:[function(require,module,exports){
 module.exports=/[\xAD\u0600-\u0605\u061C\u06DD\u070F\u08E2\u180E\u200B-\u200F\u202A-\u202E\u2060-\u2064\u2066-\u206F\uFEFF\uFFF9-\uFFFB]|\uD804\uDCBD|\uD82F[\uDCA0-\uDCA3]|\uD834[\uDD73-\uDD7A]|\uDB40[\uDC01\uDC20-\uDC7F]/
 },{}],63:[function(require,module,exports){
-module.exports=/[!-#%-\*,-/:;\?@\[-\]_\{\}\xA1\xA7\xAB\xB6\xB7\xBB\xBF\u037E\u0387\u055A-\u055F\u0589\u058A\u05BE\u05C0\u05C3\u05C6\u05F3\u05F4\u0609\u060A\u060C\u060D\u061B\u061E\u061F\u066A-\u066D\u06D4\u0700-\u070D\u07F7-\u07F9\u0830-\u083E\u085E\u0964\u0965\u0970\u0AF0\u0DF4\u0E4F\u0E5A\u0E5B\u0F04-\u0F12\u0F14\u0F3A-\u0F3D\u0F85\u0FD0-\u0FD4\u0FD9\u0FDA\u104A-\u104F\u10FB\u1360-\u1368\u1400\u166D\u166E\u169B\u169C\u16EB-\u16ED\u1735\u1736\u17D4-\u17D6\u17D8-\u17DA\u1800-\u180A\u1944\u1945\u1A1E\u1A1F\u1AA0-\u1AA6\u1AA8-\u1AAD\u1B5A-\u1B60\u1BFC-\u1BFF\u1C3B-\u1C3F\u1C7E\u1C7F\u1CC0-\u1CC7\u1CD3\u2010-\u2027\u2030-\u2043\u2045-\u2051\u2053-\u205E\u207D\u207E\u208D\u208E\u2308-\u230B\u2329\u232A\u2768-\u2775\u27C5\u27C6\u27E6-\u27EF\u2983-\u2998\u29D8-\u29DB\u29FC\u29FD\u2CF9-\u2CFC\u2CFE\u2CFF\u2D70\u2E00-\u2E2E\u2E30-\u2E44\u3001-\u3003\u3008-\u3011\u3014-\u301F\u3030\u303D\u30A0\u30FB\uA4FE\uA4FF\uA60D-\uA60F\uA673\uA67E\uA6F2-\uA6F7\uA874-\uA877\uA8CE\uA8CF\uA8F8-\uA8FA\uA8FC\uA92E\uA92F\uA95F\uA9C1-\uA9CD\uA9DE\uA9DF\uAA5C-\uAA5F\uAADE\uAADF\uAAF0\uAAF1\uABEB\uFD3E\uFD3F\uFE10-\uFE19\uFE30-\uFE52\uFE54-\uFE61\uFE63\uFE68\uFE6A\uFE6B\uFF01-\uFF03\uFF05-\uFF0A\uFF0C-\uFF0F\uFF1A\uFF1B\uFF1F\uFF20\uFF3B-\uFF3D\uFF3F\uFF5B\uFF5D\uFF5F-\uFF65]|\uD800[\uDD00-\uDD02\uDF9F\uDFD0]|\uD801\uDD6F|\uD802[\uDC57\uDD1F\uDD3F\uDE50-\uDE58\uDE7F\uDEF0-\uDEF6\uDF39-\uDF3F\uDF99-\uDF9C]|\uD804[\uDC47-\uDC4D\uDCBB\uDCBC\uDCBE-\uDCC1\uDD40-\uDD43\uDD74\uDD75\uDDC5-\uDDC9\uDDCD\uDDDB\uDDDD-\uDDDF\uDE38-\uDE3D\uDEA9]|\uD805[\uDC4B-\uDC4F\uDC5B\uDC5D\uDCC6\uDDC1-\uDDD7\uDE41-\uDE43\uDE60-\uDE6C\uDF3C-\uDF3E]|\uD807[\uDC41-\uDC45\uDC70\uDC71]|\uD809[\uDC70-\uDC74]|\uD81A[\uDE6E\uDE6F\uDEF5\uDF37-\uDF3B\uDF44]|\uD82F\uDC9F|\uD836[\uDE87-\uDE8B]|\uD83A[\uDD5E\uDD5F]/
+module.exports=/[!-#%-\*,-/:;\?@\[-\]_\{\}\xA1\xA7\xAB\xB6\xB7\xBB\xBF\u037E\u0387\u055A-\u055F\u0589\u058A\u05BE\u05C0\u05C3\u05C6\u05F3\u05F4\u0609\u060A\u060C\u060D\u061B\u061E\u061F\u066A-\u066D\u06D4\u0700-\u070D\u07F7-\u07F9\u0830-\u083E\u085E\u0964\u0965\u0970\u09FD\u0AF0\u0DF4\u0E4F\u0E5A\u0E5B\u0F04-\u0F12\u0F14\u0F3A-\u0F3D\u0F85\u0FD0-\u0FD4\u0FD9\u0FDA\u104A-\u104F\u10FB\u1360-\u1368\u1400\u166D\u166E\u169B\u169C\u16EB-\u16ED\u1735\u1736\u17D4-\u17D6\u17D8-\u17DA\u1800-\u180A\u1944\u1945\u1A1E\u1A1F\u1AA0-\u1AA6\u1AA8-\u1AAD\u1B5A-\u1B60\u1BFC-\u1BFF\u1C3B-\u1C3F\u1C7E\u1C7F\u1CC0-\u1CC7\u1CD3\u2010-\u2027\u2030-\u2043\u2045-\u2051\u2053-\u205E\u207D\u207E\u208D\u208E\u2308-\u230B\u2329\u232A\u2768-\u2775\u27C5\u27C6\u27E6-\u27EF\u2983-\u2998\u29D8-\u29DB\u29FC\u29FD\u2CF9-\u2CFC\u2CFE\u2CFF\u2D70\u2E00-\u2E2E\u2E30-\u2E49\u3001-\u3003\u3008-\u3011\u3014-\u301F\u3030\u303D\u30A0\u30FB\uA4FE\uA4FF\uA60D-\uA60F\uA673\uA67E\uA6F2-\uA6F7\uA874-\uA877\uA8CE\uA8CF\uA8F8-\uA8FA\uA8FC\uA92E\uA92F\uA95F\uA9C1-\uA9CD\uA9DE\uA9DF\uAA5C-\uAA5F\uAADE\uAADF\uAAF0\uAAF1\uABEB\uFD3E\uFD3F\uFE10-\uFE19\uFE30-\uFE52\uFE54-\uFE61\uFE63\uFE68\uFE6A\uFE6B\uFF01-\uFF03\uFF05-\uFF0A\uFF0C-\uFF0F\uFF1A\uFF1B\uFF1F\uFF20\uFF3B-\uFF3D\uFF3F\uFF5B\uFF5D\uFF5F-\uFF65]|\uD800[\uDD00-\uDD02\uDF9F\uDFD0]|\uD801\uDD6F|\uD802[\uDC57\uDD1F\uDD3F\uDE50-\uDE58\uDE7F\uDEF0-\uDEF6\uDF39-\uDF3F\uDF99-\uDF9C]|\uD804[\uDC47-\uDC4D\uDCBB\uDCBC\uDCBE-\uDCC1\uDD40-\uDD43\uDD74\uDD75\uDDC5-\uDDC9\uDDCD\uDDDB\uDDDD-\uDDDF\uDE38-\uDE3D\uDEA9]|\uD805[\uDC4B-\uDC4F\uDC5B\uDC5D\uDCC6\uDDC1-\uDDD7\uDE41-\uDE43\uDE60-\uDE6C\uDF3C-\uDF3E]|\uD806[\uDE3F-\uDE46\uDE9A-\uDE9C\uDE9E-\uDEA2]|\uD807[\uDC41-\uDC45\uDC70\uDC71]|\uD809[\uDC70-\uDC74]|\uD81A[\uDE6E\uDE6F\uDEF5\uDF37-\uDF3B\uDF44]|\uD82F\uDC9F|\uD836[\uDE87-\uDE8B]|\uD83A[\uDD5E\uDD5F]/
 },{}],64:[function(require,module,exports){
 module.exports=/[ \xA0\u1680\u2000-\u200A\u202F\u205F\u3000]/
 },{}],65:[function(require,module,exports){
diff --git a/vendor/assets/javascripts/run-qunit.js b/vendor/assets/javascripts/run-qunit.js
index 78b157590bf..9295969312b 100644
--- a/vendor/assets/javascripts/run-qunit.js
+++ b/vendor/assets/javascripts/run-qunit.js
@@ -7,94 +7,108 @@
 
 var args = process.argv.slice(2);
 
-if (args.length < 1 || args.length > 2) {
-  console.log("Usage: node run-qunit.js <URL> <timeout>");
+if (args.length < 1 || args.length > 3) {
+  console.log("Usage: node run-qunit.js <URL> <timeout> <result_file>");
   process.exit(1);
 }
 
 const chromeLauncher = require('chrome-launcher');
 const CDP = require('chrome-remote-interface');
 
-(function() {
+const QUNIT_RESULT = args[2];
+const fs = require('fs');
+
+if (QUNIT_RESULT) {
+  (async () => {
+    await fs.stat(QUNIT_RESULT, (err, stats) => {
+      if (stats && stats.isFile()) fs.unlink(QUNIT_RESULT);
+    });
+  })();
+}
+
+async function runAllTests() {
 
   function launchChrome() {
-    return chromeLauncher.launch({
+    const options = {
       chromeFlags: [
         '--disable-gpu',
        '--headless',
        '--no-sandbox'
       ]
-    });
+    };
+
+    if (process.env.REMOTE_DEBUG) {
+      options.port = 9222;
+    }
+
+    return chromeLauncher.launch(options);
   }
 
-  launchChrome().then(chrome => {
-    CDP({
-      port: chrome.port
-    }).then(protocol => {
-      const {Page, Runtime} = protocol;
-      Promise.all([Page.enable(), Runtime.enable()]).then(()=>{
+  let chrome = await launchChrome();
+  let protocol = await CDP({ port: chrome.port});
 
-        Runtime.consoleAPICalled((response) => {
-          const message = response['args'][0].value;
+  const {Page, Runtime} = protocol;
 
-          // If it's a simple test result, write without newline
-          if(message === "." || message === "F"){
-            process.stdout.write(message);
-          }else{
-            console.log(message);
-          }
-        });
+  await Promise.all([Page.enable(), Runtime.enable()]);
 
-        Page.navigate({
-          url: args[0]
-        });
+  Runtime.consoleAPICalled((response) => {
+    const message = response['args'][0].value;
 
-        Page.loadEventFired(() => {
+    // If it's a simple test result, write without newline
+    if(message === "." || message === "F"){
+      process.stdout.write(message);
+    } else if (message && message.startsWith("AUTOSPEC:")) {
+      fs.appendFileSync(QUNIT_RESULT, `${message.slice(10)}\n`);
+    } else {
+      console.log(message);
+    }
+  });
 
-          Runtime.evaluate({
-            expression: `(${qunit_script})()`
-          }).then(() => {
-            const timeout = parseInt(args[1] || 300000, 10);
-            var start = Date.now();
+  console.log("navigate to " + args[0]);
+  Page.navigate({url: args[0]});
 
-            var interval = setInterval(() => {
-              if (Date.now() > start + timeout) {
-                console.error("Tests timed out");
+  Page.loadEventFired(async () => {
 
-                protocol.close();
-                chrome.kill();
-                process.exit(124);
-              } else {
+    await Runtime.evaluate({ expression: `(${qunit_script})()`});
 
-                Runtime.evaluate({
-                  expression: `(${check_script})()`
-                }).then(numFails => {
-                  if (numFails.result.type !== 'undefined') {
-                    clearInterval(interval);
-                    protocol.close();
-                    chrome.kill();
+    const timeout = parseInt(args[1] || 300000, 10);
+    var start = Date.now();
 
-                    if (numFails.result.value > 0) {
-                      process.exit(1);
-                    } else {
-                      process.exit();
-                    }
-                  }
-                }).catch(error);
-              }
-            }, 250);
-          }).catch(error(1));
-        });
-      }).catch(error(3));
-    }).catch(error(4));
-  }).catch(error(5));
-})();
+    var interval;
 
-function error(code){
-  return function(){
-    console.log("A promise failed to resolve code:"+code);
-    process.exit(1);
-  };
+    let runTests = async function() {
+      if (Date.now() > start + timeout) {
+        console.error("Tests timed out");
+        protocol.close();
+        chrome.kill();
+        process.exit(124);
+      }
+
+      let numFails = await Runtime.evaluate({expression: `(${check_script})()`});
+
+      if (numFails && numFails.result && numFails.result.type !== 'undefined') {
+        clearInterval(interval);
+        protocol.close();
+        chrome.kill();
+
+        if (numFails.result.value > 0) {
+          process.exit(1);
+        } else {
+          process.exit();
+        }
+      }
+    };
+
+    interval = setInterval(runTests, 250);
+  });
+
+}
+
+try {
+  runAllTests();
+} catch(e) {
+  console.log("Failed to run tests: " + e);
+  process.exit(1);
 }
 
 // The following functions are converted to strings
@@ -116,9 +130,17 @@ function logQUnit() {
     }
   });
 
+  let durations = {};
+
   QUnit.testDone(function(context) {
+
+    durations[context.module + "::" + context.name] = context.runtime;
+
     if (context.failed) {
       var msg = "  Test Failed: " + context.name + assertionErrors.join("    ");
+
+      /* QUNIT_RESULT */
+
       testErrors.push(msg);
       assertionErrors = [];
       console.log("F");
@@ -151,6 +173,14 @@ function logQUnit() {
       }
     }
 
+    console.log("Slowest tests");
+    console.log("----------------------------------------------");
+    let ary = Object.keys(durations).map((key) => ({ 'key': key, 'value': durations[key] }))
+    ary.sort((p1, p2) => (p2.value - p1.value));
+    ary.slice(0, 30).forEach(pair => {
+      console.log(pair.key + ": " + pair.value + "ms");
+    });
+
     var stats = [
       "Time: " + context.runtime + "ms",
       "Total: " + context.total,
@@ -158,14 +188,22 @@ function logQUnit() {
       "Failed: " + context.failed
     ];
     console.log(stats.join(", "));
+
+
     window.qunitDone = context;
   });
 }
-const qunit_script = logQUnit.toString();
+let qunit_script = logQUnit.toString();
+
+if (QUNIT_RESULT) {
+  qunit_script = qunit_script.replace("/* QUNIT_RESULT */", "console.log(`AUTOSPEC: ${context.module}:::${context.testId}:::${context.name}`);");
+
+}
 
 function check() {
   if(window.qunitDone){
     return window.qunitDone.failed;
   }
 }
+
 const check_script = check.toString();
diff --git a/vendor/assets/javascripts/select2.js b/vendor/assets/javascripts/select2.js
deleted file mode 100644
index 195ccee5bb0..00000000000
--- a/vendor/assets/javascripts/select2.js
+++ /dev/null
@@ -1,3729 +0,0 @@
-/*
-Copyright 2012 Igor Vaynberg
-
-Version: 3.5.4 Timestamp: Sun Aug 30 13:30:32 EDT 2015
-
-This software is licensed under the Apache License, Version 2.0 (the "Apache License") or the GNU
-General Public License version 2 (the "GPL License"). You may choose either license to govern your
-use of this software only upon the condition that you accept all of the terms of either the Apache
-License or the GPL License.
-
-You may obtain a copy of the Apache License and the GPL License at:
-
-    http://www.apache.org/licenses/LICENSE-2.0
-    http://www.gnu.org/licenses/gpl-2.0.html
-
-Unless required by applicable law or agreed to in writing, software distributed under the
-Apache License or the GPL License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the Apache License and the GPL License for
-the specific language governing permissions and limitations under the Apache License and the GPL License.
-*/
-(function ($) {
-    if(typeof $.fn.each2 == "undefined") {
-        $.extend($.fn, {
-            /*
-            * 4-10 times faster .each replacement
-            * use it carefully, as it overrides jQuery context of element on each iteration
-            */
-            each2 : function (c) {
-                var j = $([0]), i = -1, l = this.length;
-                while (
-                    ++i < l
-                    && (j.context = j[0] = this[i])
-                    && c.call(j[0], i, j) !== false //"this"=DOM, i=index, j=jQuery object
-                );
-                return this;
-            }
-        });
-    }
-})(jQuery);
-
-(function ($, undefined) {
-    "use strict";
-    /*global document, window, jQuery, console */
-
-    if (window.Select2 !== undefined) {
-        return;
-    }
-
-    var AbstractSelect2, SingleSelect2, MultiSelect2, nextUid, sizer,
-        lastMousePosition={x:0,y:0}, $document, scrollBarDimensions,
-
-    KEY = {
-        TAB: 9,
-        ENTER: 13,
-        ESC: 27,
-        SPACE: 32,
-        LEFT: 37,
-        UP: 38,
-        RIGHT: 39,
-        DOWN: 40,
-        SHIFT: 16,
-        CTRL: 17,
-        ALT: 18,
-        PAGE_UP: 33,
-        PAGE_DOWN: 34,
-        HOME: 36,
-        END: 35,
-        BACKSPACE: 8,
-        DELETE: 46,
-        isArrow: function (k) {
-            k = k.which ? k.which : k;
-            switch (k) {
-            case KEY.LEFT:
-            case KEY.RIGHT:
-            case KEY.UP:
-            case KEY.DOWN:
-                return true;
-            }
-            return false;
-        },
-        isControl: function (e) {
-            var k = e.which;
-            switch (k) {
-            case KEY.SHIFT:
-            case KEY.CTRL:
-            case KEY.ALT:
-                return true;
-            }
-
-            if (e.metaKey) return true;
-
-            return false;
-        },
-        isFunctionKey: function (k) {
-            k = k.which ? k.which : k;
-            return k >= 112 && k <= 123;
-        }
-    },
-    MEASURE_SCROLLBAR_TEMPLATE = "<div class='select2-measure-scrollbar'></div>",
-
-    DIACRITICS = {"\u24B6":"A","\uFF21":"A","\u00C0":"A","\u00C1":"A","\u00C2":"A","\u1EA6":"A","\u1EA4":"A","\u1EAA":"A","\u1EA8":"A","\u00C3":"A","\u0100":"A","\u0102":"A","\u1EB0":"A","\u1EAE":"A","\u1EB4":"A","\u1EB2":"A","\u0226":"A","\u01E0":"A","\u00C4":"A","\u01DE":"A","\u1EA2":"A","\u00C5":"A","\u01FA":"A","\u01CD":"A","\u0200":"A","\u0202":"A","\u1EA0":"A","\u1EAC":"A","\u1EB6":"A","\u1E00":"A","\u0104":"A","\u023A":"A","\u2C6F":"A","\uA732":"AA","\u00C6":"AE","\u01FC":"AE","\u01E2":"AE","\uA734":"AO","\uA736":"AU","\uA738":"AV","\uA73A":"AV","\uA73C":"AY","\u24B7":"B","\uFF22":"B","\u1E02":"B","\u1E04":"B","\u1E06":"B","\u0243":"B","\u0182":"B","\u0181":"B","\u24B8":"C","\uFF23":"C","\u0106":"C","\u0108":"C","\u010A":"C","\u010C":"C","\u00C7":"C","\u1E08":"C","\u0187":"C","\u023B":"C","\uA73E":"C","\u24B9":"D","\uFF24":"D","\u1E0A":"D","\u010E":"D","\u1E0C":"D","\u1E10":"D","\u1E12":"D","\u1E0E":"D","\u0110":"D","\u018B":"D","\u018A":"D","\u0189":"D","\uA779":"D","\u01F1":"DZ","\u01C4":"DZ","\u01F2":"Dz","\u01C5":"Dz","\u24BA":"E","\uFF25":"E","\u00C8":"E","\u00C9":"E","\u00CA":"E","\u1EC0":"E","\u1EBE":"E","\u1EC4":"E","\u1EC2":"E","\u1EBC":"E","\u0112":"E","\u1E14":"E","\u1E16":"E","\u0114":"E","\u0116":"E","\u00CB":"E","\u1EBA":"E","\u011A":"E","\u0204":"E","\u0206":"E","\u1EB8":"E","\u1EC6":"E","\u0228":"E","\u1E1C":"E","\u0118":"E","\u1E18":"E","\u1E1A":"E","\u0190":"E","\u018E":"E","\u24BB":"F","\uFF26":"F","\u1E1E":"F","\u0191":"F","\uA77B":"F","\u24BC":"G","\uFF27":"G","\u01F4":"G","\u011C":"G","\u1E20":"G","\u011E":"G","\u0120":"G","\u01E6":"G","\u0122":"G","\u01E4":"G","\u0193":"G","\uA7A0":"G","\uA77D":"G","\uA77E":"G","\u24BD":"H","\uFF28":"H","\u0124":"H","\u1E22":"H","\u1E26":"H","\u021E":"H","\u1E24":"H","\u1E28":"H","\u1E2A":"H","\u0126":"H","\u2C67":"H","\u2C75":"H","\uA78D":"H","\u24BE":"I","\uFF29":"I","\u00CC":"I","\u00CD":"I","\u00CE":"I","\u0128":"I","\u012A":"I","\u012C":"I","\u0130":"I","\u00CF":"I","\u1E2E":"I","\u1EC8":"I","\u01CF":"I","\u0208":"I","\u020A":"I","\u1ECA":"I","\u012E":"I","\u1E2C":"I","\u0197":"I","\u24BF":"J","\uFF2A":"J","\u0134":"J","\u0248":"J","\u24C0":"K","\uFF2B":"K","\u1E30":"K","\u01E8":"K","\u1E32":"K","\u0136":"K","\u1E34":"K","\u0198":"K","\u2C69":"K","\uA740":"K","\uA742":"K","\uA744":"K","\uA7A2":"K","\u24C1":"L","\uFF2C":"L","\u013F":"L","\u0139":"L","\u013D":"L","\u1E36":"L","\u1E38":"L","\u013B":"L","\u1E3C":"L","\u1E3A":"L","\u0141":"L","\u023D":"L","\u2C62":"L","\u2C60":"L","\uA748":"L","\uA746":"L","\uA780":"L","\u01C7":"LJ","\u01C8":"Lj","\u24C2":"M","\uFF2D":"M","\u1E3E":"M","\u1E40":"M","\u1E42":"M","\u2C6E":"M","\u019C":"M","\u24C3":"N","\uFF2E":"N","\u01F8":"N","\u0143":"N","\u00D1":"N","\u1E44":"N","\u0147":"N","\u1E46":"N","\u0145":"N","\u1E4A":"N","\u1E48":"N","\u0220":"N","\u019D":"N","\uA790":"N","\uA7A4":"N","\u01CA":"NJ","\u01CB":"Nj","\u24C4":"O","\uFF2F":"O","\u00D2":"O","\u00D3":"O","\u00D4":"O","\u1ED2":"O","\u1ED0":"O","\u1ED6":"O","\u1ED4":"O","\u00D5":"O","\u1E4C":"O","\u022C":"O","\u1E4E":"O","\u014C":"O","\u1E50":"O","\u1E52":"O","\u014E":"O","\u022E":"O","\u0230":"O","\u00D6":"O","\u022A":"O","\u1ECE":"O","\u0150":"O","\u01D1":"O","\u020C":"O","\u020E":"O","\u01A0":"O","\u1EDC":"O","\u1EDA":"O","\u1EE0":"O","\u1EDE":"O","\u1EE2":"O","\u1ECC":"O","\u1ED8":"O","\u01EA":"O","\u01EC":"O","\u00D8":"O","\u01FE":"O","\u0186":"O","\u019F":"O","\uA74A":"O","\uA74C":"O","\u01A2":"OI","\uA74E":"OO","\u0222":"OU","\u24C5":"P","\uFF30":"P","\u1E54":"P","\u1E56":"P","\u01A4":"P","\u2C63":"P","\uA750":"P","\uA752":"P","\uA754":"P","\u24C6":"Q","\uFF31":"Q","\uA756":"Q","\uA758":"Q","\u024A":"Q","\u24C7":"R","\uFF32":"R","\u0154":"R","\u1E58":"R","\u0158":"R","\u0210":"R","\u0212":"R","\u1E5A":"R","\u1E5C":"R","\u0156":"R","\u1E5E":"R","\u024C":"R","\u2C64":"R","\uA75A":"R","\uA7A6":"R","\uA782":"R","\u24C8":"S","\uFF33":"S","\u1E9E":"S","\u015A":"S","\u1E64":"S","\u015C":"S","\u1E60":"S","\u0160":"S","\u1E66":"S","\u1E62":"S","\u1E68":"S","\u0218":"S","\u015E":"S","\u2C7E":"S","\uA7A8":"S","\uA784":"S","\u24C9":"T","\uFF34":"T","\u1E6A":"T","\u0164":"T","\u1E6C":"T","\u021A":"T","\u0162":"T","\u1E70":"T","\u1E6E":"T","\u0166":"T","\u01AC":"T","\u01AE":"T","\u023E":"T","\uA786":"T","\uA728":"TZ","\u24CA":"U","\uFF35":"U","\u00D9":"U","\u00DA":"U","\u00DB":"U","\u0168":"U","\u1E78":"U","\u016A":"U","\u1E7A":"U","\u016C":"U","\u00DC":"U","\u01DB":"U","\u01D7":"U","\u01D5":"U","\u01D9":"U","\u1EE6":"U","\u016E":"U","\u0170":"U","\u01D3":"U","\u0214":"U","\u0216":"U","\u01AF":"U","\u1EEA":"U","\u1EE8":"U","\u1EEE":"U","\u1EEC":"U","\u1EF0":"U","\u1EE4":"U","\u1E72":"U","\u0172":"U","\u1E76":"U","\u1E74":"U","\u0244":"U","\u24CB":"V","\uFF36":"V","\u1E7C":"V","\u1E7E":"V","\u01B2":"V","\uA75E":"V","\u0245":"V","\uA760":"VY","\u24CC":"W","\uFF37":"W","\u1E80":"W","\u1E82":"W","\u0174":"W","\u1E86":"W","\u1E84":"W","\u1E88":"W","\u2C72":"W","\u24CD":"X","\uFF38":"X","\u1E8A":"X","\u1E8C":"X","\u24CE":"Y","\uFF39":"Y","\u1EF2":"Y","\u00DD":"Y","\u0176":"Y","\u1EF8":"Y","\u0232":"Y","\u1E8E":"Y","\u0178":"Y","\u1EF6":"Y","\u1EF4":"Y","\u01B3":"Y","\u024E":"Y","\u1EFE":"Y","\u24CF":"Z","\uFF3A":"Z","\u0179":"Z","\u1E90":"Z","\u017B":"Z","\u017D":"Z","\u1E92":"Z","\u1E94":"Z","\u01B5":"Z","\u0224":"Z","\u2C7F":"Z","\u2C6B":"Z","\uA762":"Z","\u24D0":"a","\uFF41":"a","\u1E9A":"a","\u00E0":"a","\u00E1":"a","\u00E2":"a","\u1EA7":"a","\u1EA5":"a","\u1EAB":"a","\u1EA9":"a","\u00E3":"a","\u0101":"a","\u0103":"a","\u1EB1":"a","\u1EAF":"a","\u1EB5":"a","\u1EB3":"a","\u0227":"a","\u01E1":"a","\u00E4":"a","\u01DF":"a","\u1EA3":"a","\u00E5":"a","\u01FB":"a","\u01CE":"a","\u0201":"a","\u0203":"a","\u1EA1":"a","\u1EAD":"a","\u1EB7":"a","\u1E01":"a","\u0105":"a","\u2C65":"a","\u0250":"a","\uA733":"aa","\u00E6":"ae","\u01FD":"ae","\u01E3":"ae","\uA735":"ao","\uA737":"au","\uA739":"av","\uA73B":"av","\uA73D":"ay","\u24D1":"b","\uFF42":"b","\u1E03":"b","\u1E05":"b","\u1E07":"b","\u0180":"b","\u0183":"b","\u0253":"b","\u24D2":"c","\uFF43":"c","\u0107":"c","\u0109":"c","\u010B":"c","\u010D":"c","\u00E7":"c","\u1E09":"c","\u0188":"c","\u023C":"c","\uA73F":"c","\u2184":"c","\u24D3":"d","\uFF44":"d","\u1E0B":"d","\u010F":"d","\u1E0D":"d","\u1E11":"d","\u1E13":"d","\u1E0F":"d","\u0111":"d","\u018C":"d","\u0256":"d","\u0257":"d","\uA77A":"d","\u01F3":"dz","\u01C6":"dz","\u24D4":"e","\uFF45":"e","\u00E8":"e","\u00E9":"e","\u00EA":"e","\u1EC1":"e","\u1EBF":"e","\u1EC5":"e","\u1EC3":"e","\u1EBD":"e","\u0113":"e","\u1E15":"e","\u1E17":"e","\u0115":"e","\u0117":"e","\u00EB":"e","\u1EBB":"e","\u011B":"e","\u0205":"e","\u0207":"e","\u1EB9":"e","\u1EC7":"e","\u0229":"e","\u1E1D":"e","\u0119":"e","\u1E19":"e","\u1E1B":"e","\u0247":"e","\u025B":"e","\u01DD":"e","\u24D5":"f","\uFF46":"f","\u1E1F":"f","\u0192":"f","\uA77C":"f","\u24D6":"g","\uFF47":"g","\u01F5":"g","\u011D":"g","\u1E21":"g","\u011F":"g","\u0121":"g","\u01E7":"g","\u0123":"g","\u01E5":"g","\u0260":"g","\uA7A1":"g","\u1D79":"g","\uA77F":"g","\u24D7":"h","\uFF48":"h","\u0125":"h","\u1E23":"h","\u1E27":"h","\u021F":"h","\u1E25":"h","\u1E29":"h","\u1E2B":"h","\u1E96":"h","\u0127":"h","\u2C68":"h","\u2C76":"h","\u0265":"h","\u0195":"hv","\u24D8":"i","\uFF49":"i","\u00EC":"i","\u00ED":"i","\u00EE":"i","\u0129":"i","\u012B":"i","\u012D":"i","\u00EF":"i","\u1E2F":"i","\u1EC9":"i","\u01D0":"i","\u0209":"i","\u020B":"i","\u1ECB":"i","\u012F":"i","\u1E2D":"i","\u0268":"i","\u0131":"i","\u24D9":"j","\uFF4A":"j","\u0135":"j","\u01F0":"j","\u0249":"j","\u24DA":"k","\uFF4B":"k","\u1E31":"k","\u01E9":"k","\u1E33":"k","\u0137":"k","\u1E35":"k","\u0199":"k","\u2C6A":"k","\uA741":"k","\uA743":"k","\uA745":"k","\uA7A3":"k","\u24DB":"l","\uFF4C":"l","\u0140":"l","\u013A":"l","\u013E":"l","\u1E37":"l","\u1E39":"l","\u013C":"l","\u1E3D":"l","\u1E3B":"l","\u017F":"l","\u0142":"l","\u019A":"l","\u026B":"l","\u2C61":"l","\uA749":"l","\uA781":"l","\uA747":"l","\u01C9":"lj","\u24DC":"m","\uFF4D":"m","\u1E3F":"m","\u1E41":"m","\u1E43":"m","\u0271":"m","\u026F":"m","\u24DD":"n","\uFF4E":"n","\u01F9":"n","\u0144":"n","\u00F1":"n","\u1E45":"n","\u0148":"n","\u1E47":"n","\u0146":"n","\u1E4B":"n","\u1E49":"n","\u019E":"n","\u0272":"n","\u0149":"n","\uA791":"n","\uA7A5":"n","\u01CC":"nj","\u24DE":"o","\uFF4F":"o","\u00F2":"o","\u00F3":"o","\u00F4":"o","\u1ED3":"o","\u1ED1":"o","\u1ED7":"o","\u1ED5":"o","\u00F5":"o","\u1E4D":"o","\u022D":"o","\u1E4F":"o","\u014D":"o","\u1E51":"o","\u1E53":"o","\u014F":"o","\u022F":"o","\u0231":"o","\u00F6":"o","\u022B":"o","\u1ECF":"o","\u0151":"o","\u01D2":"o","\u020D":"o","\u020F":"o","\u01A1":"o","\u1EDD":"o","\u1EDB":"o","\u1EE1":"o","\u1EDF":"o","\u1EE3":"o","\u1ECD":"o","\u1ED9":"o","\u01EB":"o","\u01ED":"o","\u00F8":"o","\u01FF":"o","\u0254":"o","\uA74B":"o","\uA74D":"o","\u0275":"o","\u01A3":"oi","\u0223":"ou","\uA74F":"oo","\u24DF":"p","\uFF50":"p","\u1E55":"p","\u1E57":"p","\u01A5":"p","\u1D7D":"p","\uA751":"p","\uA753":"p","\uA755":"p","\u24E0":"q","\uFF51":"q","\u024B":"q","\uA757":"q","\uA759":"q","\u24E1":"r","\uFF52":"r","\u0155":"r","\u1E59":"r","\u0159":"r","\u0211":"r","\u0213":"r","\u1E5B":"r","\u1E5D":"r","\u0157":"r","\u1E5F":"r","\u024D":"r","\u027D":"r","\uA75B":"r","\uA7A7":"r","\uA783":"r","\u24E2":"s","\uFF53":"s","\u00DF":"s","\u015B":"s","\u1E65":"s","\u015D":"s","\u1E61":"s","\u0161":"s","\u1E67":"s","\u1E63":"s","\u1E69":"s","\u0219":"s","\u015F":"s","\u023F":"s","\uA7A9":"s","\uA785":"s","\u1E9B":"s","\u24E3":"t","\uFF54":"t","\u1E6B":"t","\u1E97":"t","\u0165":"t","\u1E6D":"t","\u021B":"t","\u0163":"t","\u1E71":"t","\u1E6F":"t","\u0167":"t","\u01AD":"t","\u0288":"t","\u2C66":"t","\uA787":"t","\uA729":"tz","\u24E4":"u","\uFF55":"u","\u00F9":"u","\u00FA":"u","\u00FB":"u","\u0169":"u","\u1E79":"u","\u016B":"u","\u1E7B":"u","\u016D":"u","\u00FC":"u","\u01DC":"u","\u01D8":"u","\u01D6":"u","\u01DA":"u","\u1EE7":"u","\u016F":"u","\u0171":"u","\u01D4":"u","\u0215":"u","\u0217":"u","\u01B0":"u","\u1EEB":"u","\u1EE9":"u","\u1EEF":"u","\u1EED":"u","\u1EF1":"u","\u1EE5":"u","\u1E73":"u","\u0173":"u","\u1E77":"u","\u1E75":"u","\u0289":"u","\u24E5":"v","\uFF56":"v","\u1E7D":"v","\u1E7F":"v","\u028B":"v","\uA75F":"v","\u028C":"v","\uA761":"vy","\u24E6":"w","\uFF57":"w","\u1E81":"w","\u1E83":"w","\u0175":"w","\u1E87":"w","\u1E85":"w","\u1E98":"w","\u1E89":"w","\u2C73":"w","\u24E7":"x","\uFF58":"x","\u1E8B":"x","\u1E8D":"x","\u24E8":"y","\uFF59":"y","\u1EF3":"y","\u00FD":"y","\u0177":"y","\u1EF9":"y","\u0233":"y","\u1E8F":"y","\u00FF":"y","\u1EF7":"y","\u1E99":"y","\u1EF5":"y","\u01B4":"y","\u024F":"y","\u1EFF":"y","\u24E9":"z","\uFF5A":"z","\u017A":"z","\u1E91":"z","\u017C":"z","\u017E":"z","\u1E93":"z","\u1E95":"z","\u01B6":"z","\u0225":"z","\u0240":"z","\u2C6C":"z","\uA763":"z","\u0386":"\u0391","\u0388":"\u0395","\u0389":"\u0397","\u038A":"\u0399","\u03AA":"\u0399","\u038C":"\u039F","\u038E":"\u03A5","\u03AB":"\u03A5","\u038F":"\u03A9","\u03AC":"\u03B1","\u03AD":"\u03B5","\u03AE":"\u03B7","\u03AF":"\u03B9","\u03CA":"\u03B9","\u0390":"\u03B9","\u03CC":"\u03BF","\u03CD":"\u03C5","\u03CB":"\u03C5","\u03B0":"\u03C5","\u03C9":"\u03C9","\u03C2":"\u03C3"};
-
-    $document = $(document);
-
-    nextUid=(function() { var counter=1; return function() { return counter++; }; }());
-
-
-    function reinsertElement(element) {
-        var placeholder = $(document.createTextNode(''));
-
-        element.before(placeholder);
-        placeholder.before(element);
-        placeholder.remove();
-    }
-
-    function stripDiacritics(str) {
-        // Used 'uni range + named function' from http://jsperf.com/diacritics/18
-        function match(a) {
-            return DIACRITICS[a] || a;
-        }
-
-        return str.replace(/[^\u0000-\u007E]/g, match);
-    }
-
-    function indexOf(value, array) {
-        var i = 0, l = array.length;
-        for (; i < l; i = i + 1) {
-            if (equal(value, array[i])) return i;
-        }
-        return -1;
-    }
-
-    function measureScrollbar () {
-        var $template = $( MEASURE_SCROLLBAR_TEMPLATE );
-        $template.appendTo(document.body);
-
-        var dim = {
-            width: $template.width() - $template[0].clientWidth,
-            height: $template.height() - $template[0].clientHeight
-        };
-        $template.remove();
-
-        return dim;
-    }
-
-    /**
-     * Compares equality of a and b
-     * @param a
-     * @param b
-     */
-    function equal(a, b) {
-        if (a === b) return true;
-        if (a === undefined || b === undefined) return false;
-        if (a === null || b === null) return false;
-        // Check whether 'a' or 'b' is a string (primitive or object).
-        // The concatenation of an empty string (+'') converts its argument to a string's primitive.
-        if (a.constructor === String) return a+'' === b+''; // a+'' - in case 'a' is a String object
-        if (b.constructor === String) return b+'' === a+''; // b+'' - in case 'b' is a String object
-        return false;
-    }
-
-    /**
-     * Splits the string into an array of values, transforming each value. An empty array is returned for nulls or empty
-     * strings
-     * @param string
-     * @param separator
-     */
-    function splitVal(string, separator, transform) {
-        var val, i, l;
-        if (string === null || string.length < 1) return [];
-        val = string.split(separator);
-        for (i = 0, l = val.length; i < l; i = i + 1) val[i] = transform(val[i]);
-        return val;
-    }
-
-    function getSideBorderPadding(element) {
-        return element.outerWidth(false) - element.width();
-    }
-
-    function installKeyUpChangeEvent(element) {
-        var key="keyup-change-value";
-        element.on("keydown", function () {
-            if ($.data(element, key) === undefined) {
-                $.data(element, key, element.val());
-            }
-        });
-        element.on("keyup", function () {
-            var val= $.data(element, key);
-            if (val !== undefined && element.val() !== val) {
-                $.removeData(element, key);
-                element.trigger("keyup-change");
-            }
-        });
-    }
-
-
-    /**
-     * filters mouse events so an event is fired only if the mouse moved.
-     *
-     * filters out mouse events that occur when mouse is stationary but
-     * the elements under the pointer are scrolled.
-     */
-    function installFilteredMouseMove(element) {
-        element.on("mousemove", function (e) {
-            var lastpos = lastMousePosition;
-            if (lastpos === undefined || lastpos.x !== e.pageX || lastpos.y !== e.pageY) {
-                $(e.target).trigger("mousemove-filtered", e);
-            }
-        });
-    }
-
-    /**
-     * Debounces a function. Returns a function that calls the original fn function only if no invocations have been made
-     * within the last quietMillis milliseconds.
-     *
-     * @param quietMillis number of milliseconds to wait before invoking fn
-     * @param fn function to be debounced
-     * @param ctx object to be used as this reference within fn
-     * @return debounced version of fn
-     */
-    function debounce(quietMillis, fn, ctx) {
-        ctx = ctx || undefined;
-        var timeout;
-        return function () {
-            var args = arguments;
-            window.clearTimeout(timeout);
-            timeout = window.setTimeout(function() {
-                fn.apply(ctx, args);
-            }, quietMillis);
-        };
-    }
-
-    function installDebouncedScroll(threshold, element) {
-        var notify = debounce(threshold, function (e) { element.trigger("scroll-debounced", e);});
-        element.on("scroll", function (e) {
-            if (indexOf(e.target, element.get()) >= 0) notify(e);
-        });
-    }
-
-    function focus($el) {
-        if ($el[0] === document.activeElement) return;
-
-        /* set the focus in a 0 timeout - that way the focus is set after the processing
-            of the current event has finished - which seems like the only reliable way
-            to set focus */
-        window.setTimeout(function() {
-            var el=$el[0], pos=$el.val().length, range;
-
-            $el.focus();
-
-            /* make sure el received focus so we do not error out when trying to manipulate the caret.
-                sometimes modals or others listeners may steal it after its set */
-            var isVisible = (el.offsetWidth > 0 || el.offsetHeight > 0);
-            if (isVisible && el === document.activeElement) {
-
-                /* after the focus is set move the caret to the end, necessary when we val()
-                    just before setting focus */
-                if(el.setSelectionRange)
-                {
-                    el.setSelectionRange(pos, pos);
-                }
-                else if (el.createTextRange) {
-                    range = el.createTextRange();
-                    range.collapse(false);
-                    range.select();
-                }
-            }
-        }, 0);
-    }
-
-    function getCursorInfo(el) {
-        el = $(el)[0];
-        var offset = 0;
-        var length = 0;
-        if ('selectionStart' in el) {
-            offset = el.selectionStart;
-            length = el.selectionEnd - offset;
-        } else if ('selection' in document) {
-            el.focus();
-            var sel = document.selection.createRange();
-            length = document.selection.createRange().text.length;
-            sel.moveStart('character', -el.value.length);
-            offset = sel.text.length - length;
-        }
-        return { offset: offset, length: length };
-    }
-
-    function killEvent(event) {
-        event.preventDefault();
-        event.stopPropagation();
-    }
-    function killEventImmediately(event) {
-        event.preventDefault();
-        event.stopImmediatePropagation();
-    }
-
-    function measureTextWidth(e) {
-        if (!sizer){
-            var style = e[0].currentStyle || window.getComputedStyle(e[0], null);
-            sizer = $(document.createElement("div")).css({
-                position: "absolute",
-                left: "-10000px",
-                top: "-10000px",
-                display: "none",
-                fontSize: style.fontSize,
-                fontFamily: style.fontFamily,
-                fontStyle: style.fontStyle,
-                fontWeight: style.fontWeight,
-                letterSpacing: style.letterSpacing,
-                textTransform: style.textTransform,
-                whiteSpace: "nowrap"
-            });
-            sizer.attr("class","select2-sizer");
-            $(document.body).append(sizer);
-        }
-        sizer.text(e.val());
-        return sizer.width();
-    }
-
-    function syncCssClasses(dest, src, adapter) {
-        var classes, replacements = [], adapted;
-
-        classes = $.trim(dest.attr("class"));
-
-        if (classes) {
-            classes = '' + classes; // for IE which returns object
-
-            $(classes.split(/\s+/)).each2(function() {
-                if (this.indexOf("select2-") === 0) {
-                    replacements.push(this);
-                }
-            });
-        }
-
-        classes = $.trim(src.attr("class"));
-
-        if (classes) {
-            classes = '' + classes; // for IE which returns object
-
-            $(classes.split(/\s+/)).each2(function() {
-                if (this.indexOf("select2-") !== 0) {
-                    adapted = adapter(this);
-
-                    if (adapted) {
-                        replacements.push(adapted);
-                    }
-                }
-            });
-        }
-
-        dest.attr("class", replacements.join(" "));
-    }
-
-
-    function markMatch(text, term, markup, escapeMarkup) {
-        var match=stripDiacritics(text.toUpperCase()).indexOf(stripDiacritics(term.toUpperCase())),
-            tl=term.length;
-
-        if (match<0) {
-            markup.push(escapeMarkup(text));
-            return;
-        }
-
-        markup.push(escapeMarkup(text.substring(0, match)));
-        markup.push("<span class='select2-match'>");
-        markup.push(escapeMarkup(text.substring(match, match + tl)));
-        markup.push("</span>");
-        markup.push(escapeMarkup(text.substring(match + tl, text.length)));
-    }
-
-    function defaultEscapeMarkup(markup) {
-        var replace_map = {
-            '\\': '&#92;',
-            '&': '&amp;',
-            '<': '&lt;',
-            '>': '&gt;',
-            '"': '&quot;',
-            "'": '&#39;',
-            "/": '&#47;'
-        };
-
-        return String(markup).replace(/[&<>"'\/\\]/g, function (match) {
-            return replace_map[match];
-        });
-    }
-
-    /**
-     * Produces an ajax-based query function
-     *
-     * @param options object containing configuration parameters
-     * @param options.params parameter map for the transport ajax call, can contain such options as cache, jsonpCallback, etc. see $.ajax
-     * @param options.transport function that will be used to execute the ajax request. must be compatible with parameters supported by $.ajax
-     * @param options.url url for the data
-     * @param options.data a function(searchTerm, pageNumber, context) that should return an object containing query string parameters for the above url.
-     * @param options.dataType request data type: ajax, jsonp, other datatypes supported by jQuery's $.ajax function or the transport function if specified
-     * @param options.quietMillis (optional) milliseconds to wait before making the ajaxRequest, helps debounce the ajax function if invoked too often
-     * @param options.results a function(remoteData, pageNumber, query) that converts data returned form the remote request to the format expected by Select2.
-     *      The expected format is an object containing the following keys:
-     *      results array of objects that will be used as choices
-     *      more (optional) boolean indicating whether there are more results available
-     *      Example: {results:[{id:1, text:'Red'},{id:2, text:'Blue'}], more:true}
-     */
-    function ajax(options) {
-        var timeout, // current scheduled but not yet executed request
-            handler = null,
-            quietMillis = options.quietMillis || 100,
-            ajaxUrl = options.url,
-            self = this;
-
-        return function (query) {
-            window.clearTimeout(timeout);
-            timeout = window.setTimeout(function () {
-                var data = options.data, // ajax data function
-                    url = ajaxUrl, // ajax url string or function
-                    transport = options.transport || $.fn.select2.ajaxDefaults.transport,
-                    // deprecated - to be removed in 4.0  - use params instead
-                    deprecated = {
-                        type: options.type || 'GET', // set type of request (GET or POST)
-                        cache: options.cache || false,
-                        jsonpCallback: options.jsonpCallback||undefined,
-                        dataType: options.dataType||"json"
-                    },
-                    params = $.extend({}, $.fn.select2.ajaxDefaults.params, deprecated);
-
-                data = data ? data.call(self, query.term, query.page, query.context) : null;
-                url = (typeof url === 'function') ? url.call(self, query.term, query.page, query.context) : url;
-
-                if (handler && typeof handler.abort === "function") { handler.abort(); }
-
-                if (options.params) {
-                    if ($.isFunction(options.params)) {
-                        $.extend(params, options.params.call(self));
-                    } else {
-                        $.extend(params, options.params);
-                    }
-                }
-
-                $.extend(params, {
-                    url: url,
-                    dataType: options.dataType,
-                    data: data,
-                    success: function (data) {
-                        // TODO - replace query.page with query so users have access to term, page, etc.
-                        // added query as third paramter to keep backwards compatibility
-                        var results = options.results(data, query.page, query);
-                        query.callback(results);
-                    },
-                    error: function(jqXHR, textStatus, errorThrown){
-                        var results = {
-                            hasError: true,
-                            jqXHR: jqXHR,
-                            textStatus: textStatus,
-                            errorThrown: errorThrown
-                        };
-
-                        query.callback(results);
-                    }
-                });
-                handler = transport.call(self, params);
-            }, quietMillis);
-        };
-    }
-
-    /**
-     * Produces a query function that works with a local array
-     *
-     * @param options object containing configuration parameters. The options parameter can either be an array or an
-     * object.
-     *
-     * If the array form is used it is assumed that it contains objects with 'id' and 'text' keys.
-     *
-     * If the object form is used it is assumed that it contains 'data' and 'text' keys. The 'data' key should contain
-     * an array of objects that will be used as choices. These objects must contain at least an 'id' key. The 'text'
-     * key can either be a String in which case it is expected that each element in the 'data' array has a key with the
-     * value of 'text' which will be used to match choices. Alternatively, text can be a function(item) that can extract
-     * the text.
-     */
-    function local(options) {
-        var data = options, // data elements
-            dataText,
-            tmp,
-            text = function (item) { return ""+item.text; }; // function used to retrieve the text portion of a data item that is matched against the search
-
-         if ($.isArray(data)) {
-            tmp = data;
-            data = { results: tmp };
-        }
-
-         if ($.isFunction(data) === false) {
-            tmp = data;
-            data = function() { return tmp; };
-        }
-
-        var dataItem = data();
-        if (dataItem.text) {
-            text = dataItem.text;
-            // if text is not a function we assume it to be a key name
-            if (!$.isFunction(text)) {
-                dataText = dataItem.text; // we need to store this in a separate variable because in the next step data gets reset and data.text is no longer available
-                text = function (item) { return item[dataText]; };
-            }
-        }
-
-        return function (query) {
-            var t = query.term, filtered = { results: [] }, process;
-            if (t === "") {
-                query.callback(data());
-                return;
-            }
-
-            process = function(datum, collection) {
-                var group, attr;
-                datum = datum[0];
-                if (datum.children) {
-                    group = {};
-                    for (attr in datum) {
-                        if (datum.hasOwnProperty(attr)) group[attr]=datum[attr];
-                    }
-                    group.children=[];
-                    $(datum.children).each2(function(i, childDatum) { process(childDatum, group.children); });
-                    if (group.children.length || query.matcher(t, text(group), datum)) {
-                        collection.push(group);
-                    }
-                } else {
-                    if (query.matcher(t, text(datum), datum)) {
-                        collection.push(datum);
-                    }
-                }
-            };
-
-            $(data().results).each2(function(i, datum) { process(datum, filtered.results); });
-            query.callback(filtered);
-        };
-    }
-
-    // TODO javadoc
-    function tags(data) {
-        var isFunc = $.isFunction(data);
-        return function (query) {
-            var t = query.term, filtered = {results: []};
-            var result = isFunc ? data(query) : data;
-            if ($.isArray(result)) {
-                $(result).each(function () {
-                    var isObject = this.text !== undefined,
-                        text = isObject ? this.text : this;
-                    if (t === "" || query.matcher(t, text)) {
-                        filtered.results.push(isObject ? this : {id: this, text: this});
-                    }
-                });
-                query.callback(filtered);
-            }
-        };
-    }
-
-    /**
-     * Checks if the formatter function should be used.
-     *
-     * Throws an error if it is not a function. Returns true if it should be used,
-     * false if no formatting should be performed.
-     *
-     * @param formatter
-     */
-    function checkFormatter(formatter, formatterName) {
-        if ($.isFunction(formatter)) return true;
-        if (!formatter) return false;
-        if (typeof(formatter) === 'string') return true;
-        throw new Error(formatterName +" must be a string, function, or falsy value");
-    }
-
-  /**
-   * Returns a given value
-   * If given a function, returns its output
-   *
-   * @param val string|function
-   * @param context value of "this" to be passed to function
-   * @returns {*}
-   */
-    function evaluate(val, context) {
-        if ($.isFunction(val)) {
-            var args = Array.prototype.slice.call(arguments, 2);
-            return val.apply(context, args);
-        }
-        return val;
-    }
-
-    function countResults(results) {
-        var count = 0;
-        $.each(results, function(i, item) {
-            if (item.children) {
-                count += countResults(item.children);
-            } else {
-                count++;
-            }
-        });
-        return count;
-    }
-
-    /**
-     * Default tokenizer. This function uses breaks the input on substring match of any string from the
-     * opts.tokenSeparators array and uses opts.createSearchChoice to create the choice object. Both of those
-     * two options have to be defined in order for the tokenizer to work.
-     *
-     * @param input text user has typed so far or pasted into the search field
-     * @param selection currently selected choices
-     * @param selectCallback function(choice) callback tho add the choice to selection
-     * @param opts select2's opts
-     * @return undefined/null to leave the current input unchanged, or a string to change the input to the returned value
-     */
-    function defaultTokenizer(input, selection, selectCallback, opts) {
-        var original = input, // store the original so we can compare and know if we need to tell the search to update its text
-            dupe = false, // check for whether a token we extracted represents a duplicate selected choice
-            token, // token
-            index, // position at which the separator was found
-            i, l, // looping variables
-            separator; // the matched separator
-
-        if (!opts.createSearchChoice || !opts.tokenSeparators || opts.tokenSeparators.length < 1) return undefined;
-
-        while (true) {
-            index = -1;
-
-            for (i = 0, l = opts.tokenSeparators.length; i < l; i++) {
-                separator = opts.tokenSeparators[i];
-                index = input.indexOf(separator);
-                if (index >= 0) break;
-            }
-
-            if (index < 0) break; // did not find any token separator in the input string, bail
-
-            token = input.substring(0, index);
-            input = input.substring(index + separator.length);
-
-            if (token.length > 0) {
-                token = opts.createSearchChoice.call(this, token, selection);
-                if (token !== undefined && token !== null && opts.id(token) !== undefined && opts.id(token) !== null) {
-                    dupe = false;
-                    for (i = 0, l = selection.length; i < l; i++) {
-                        if (equal(opts.id(token), opts.id(selection[i]))) {
-                            dupe = true; break;
-                        }
-                    }
-
-                    if (!dupe) selectCallback(token);
-                }
-            }
-        }
-
-        if (original!==input) return input;
-    }
-
-    function cleanupJQueryElements() {
-        var self = this;
-
-        $.each(arguments, function (i, element) {
-            self[element].remove();
-            self[element] = null;
-        });
-    }
-
-    /**
-     * Creates a new class
-     *
-     * @param superClass
-     * @param methods
-     */
-    function clazz(SuperClass, methods) {
-        var constructor = function () {};
-        constructor.prototype = new SuperClass;
-        constructor.prototype.constructor = constructor;
-        constructor.prototype.parent = SuperClass.prototype;
-        constructor.prototype = $.extend(constructor.prototype, methods);
-        return constructor;
-    }
-
-    AbstractSelect2 = clazz(Object, {
-
-        // abstract
-        bind: function (func) {
-            var self = this;
-            return function () {
-                func.apply(self, arguments);
-            };
-        },
-
-        // abstract
-        init: function (opts) {
-            var results, search, resultsSelector = ".select2-results";
-
-            // prepare options
-            this.opts = opts = this.prepareOpts(opts);
-
-            this.id=opts.id;
-
-            // destroy if called on an existing component
-            if (opts.element.data("select2") !== undefined &&
-                opts.element.data("select2") !== null) {
-                opts.element.data("select2").destroy();
-            }
-
-            this.container = this.createContainer();
-
-            this.liveRegion = $('.select2-hidden-accessible');
-            if (this.liveRegion.length == 0) {
-                this.liveRegion = $("<span>", {
-                        role: "status",
-                        "aria-live": "polite"
-                    })
-                    .addClass("select2-hidden-accessible")
-                    .appendTo(document.body);
-            }
-
-            this.containerId="s2id_"+(opts.element.attr("id") || "autogen"+nextUid());
-            this.containerEventName= this.containerId
-                .replace(/([.])/g, '_')
-                .replace(/([;&,\-\.\+\*\~':"\!\^#$%@\[\]\(\)=>\|])/g, '\\$1');
-            this.container.attr("id", this.containerId);
-
-            this.container.attr("title", opts.element.attr("title"));
-
-            this.body = $(document.body);
-
-            syncCssClasses(this.container, this.opts.element, this.opts.adaptContainerCssClass);
-
-            this.container.attr("style", opts.element.attr("style"));
-            this.container.css(evaluate(opts.containerCss, this.opts.element));
-            this.container.addClass(evaluate(opts.containerCssClass, this.opts.element));
-
-            this.elementTabIndex = this.opts.element.attr("tabindex");
-
-            // swap container for the element
-            this.opts.element
-                .data("select2", this)
-                .attr("tabindex", "-1")
-                .before(this.container)
-                .on("click.select2", killEvent); // do not leak click events
-
-            this.container.data("select2", this);
-
-            this.dropdown = this.container.find(".select2-drop");
-
-            syncCssClasses(this.dropdown, this.opts.element, this.opts.adaptDropdownCssClass);
-
-            this.dropdown.addClass(evaluate(opts.dropdownCssClass, this.opts.element));
-            this.dropdown.data("select2", this);
-            this.dropdown.on("click", killEvent);
-
-            this.results = results = this.container.find(resultsSelector);
-            this.search = search = this.container.find("input.select2-input");
-
-            this.queryCount = 0;
-            this.resultsPage = 0;
-            this.context = null;
-
-            // initialize the container
-            this.initContainer();
-
-            this.container.on("click", killEvent);
-
-            installFilteredMouseMove(this.results);
-
-            this.dropdown.on("mousemove-filtered", resultsSelector, this.bind(this.highlightUnderEvent));
-            this.dropdown.on("touchstart touchmove touchend", resultsSelector, this.bind(function (event) {
-                this._touchEvent = true;
-                this.highlightUnderEvent(event);
-            }));
-            this.dropdown.on("touchmove", resultsSelector, this.bind(this.touchMoved));
-            this.dropdown.on("touchstart touchend", resultsSelector, this.bind(this.clearTouchMoved));
-
-            // Waiting for a click event on touch devices to select option and hide dropdown
-            // otherwise click will be triggered on an underlying element
-            this.dropdown.on('click', this.bind(function (event) {
-                if (this._touchEvent) {
-                    this._touchEvent = false;
-                    this.selectHighlighted();
-                }
-            }));
-
-            installDebouncedScroll(80, this.results);
-            this.dropdown.on("scroll-debounced", resultsSelector, this.bind(this.loadMoreIfNeeded));
-
-            // do not propagate change event from the search field out of the component
-            $(this.container).on("change", ".select2-input", function(e) {e.stopPropagation();});
-            $(this.dropdown).on("change", ".select2-input", function(e) {e.stopPropagation();});
-
-            // if jquery.mousewheel plugin is installed we can prevent out-of-bounds scrolling of results via mousewheel
-            if ($.fn.mousewheel) {
-                results.mousewheel(function (e, delta, deltaX, deltaY) {
-                    var top = results.scrollTop();
-                    if (deltaY > 0 && top - deltaY <= 0) {
-                        results.scrollTop(0);
-                        killEvent(e);
-                    } else if (deltaY < 0 && results.get(0).scrollHeight - results.scrollTop() + deltaY <= results.height()) {
-                        results.scrollTop(results.get(0).scrollHeight - results.height());
-                        killEvent(e);
-                    }
-                });
-            }
-
-            installKeyUpChangeEvent(search);
-            search.on("keyup-change input paste", this.bind(this.updateResults));
-            search.on("focus", function () { search.addClass("select2-focused"); });
-            search.on("blur", function () { search.removeClass("select2-focused");});
-
-            this.dropdown.on("mouseup", resultsSelector, this.bind(function (e) {
-                if ($(e.target).closest(".select2-result-selectable").length > 0) {
-                    this.highlightUnderEvent(e);
-                    this.selectHighlighted(e);
-                }
-            }));
-
-            // trap all mouse events from leaving the dropdown. sometimes there may be a modal that is listening
-            // for mouse events outside of itself so it can close itself. since the dropdown is now outside the select2's
-            // dom it will trigger the popup close, which is not what we want
-            // focusin can cause focus wars between modals and select2 since the dropdown is outside the modal.
-            this.dropdown.on("click mouseup mousedown touchstart touchend focusin", function (e) { e.stopPropagation(); });
-
-            this.lastSearchTerm = undefined;
-
-            if ($.isFunction(this.opts.initSelection)) {
-                // initialize selection based on the current value of the source element
-                this.initSelection();
-
-                // if the user has provided a function that can set selection based on the value of the source element
-                // we monitor the change event on the element and trigger it, allowing for two way synchronization
-                this.monitorSource();
-            }
-
-            if (opts.maximumInputLength !== null) {
-                this.search.attr("maxlength", opts.maximumInputLength);
-            }
-
-            var disabled = opts.element.prop("disabled");
-            if (disabled === undefined) disabled = false;
-            this.enable(!disabled);
-
-            var readonly = opts.element.prop("readonly");
-            if (readonly === undefined) readonly = false;
-            this.readonly(readonly);
-
-            // Calculate size of scrollbar
-            scrollBarDimensions = scrollBarDimensions || measureScrollbar();
-
-            this.autofocus = opts.element.prop("autofocus");
-            opts.element.prop("autofocus", false);
-            if (this.autofocus) this.focus();
-
-            this.search.attr("placeholder", opts.searchInputPlaceholder);
-        },
-
-        // abstract
-        destroy: function () {
-            var element=this.opts.element, select2 = element.data("select2"), self = this;
-
-            this.close();
-
-            if (element.length && element[0].detachEvent && self._sync) {
-                element.each(function () {
-                    if (self._sync) {
-                        this.detachEvent("onpropertychange", self._sync);
-                    }
-                });
-            }
-            if (this.propertyObserver) {
-                this.propertyObserver.disconnect();
-                this.propertyObserver = null;
-            }
-            this._sync = null;
-
-            if (select2 !== undefined) {
-                select2.container.remove();
-                select2.liveRegion.remove();
-                select2.dropdown.remove();
-                element.removeData("select2")
-                    .off(".select2");
-                if (!element.is("input[type='hidden']")) {
-                    element
-                        .show()
-                        .prop("autofocus", this.autofocus || false);
-                    if (this.elementTabIndex) {
-                        element.attr({tabindex: this.elementTabIndex});
-                    } else {
-                        element.removeAttr("tabindex");
-                    }
-                    element.show();
-                } else {
-                    element.css("display", "");
-                }
-            }
-
-            cleanupJQueryElements.call(this,
-                "container",
-                "liveRegion",
-                "dropdown",
-                "results",
-                "search"
-            );
-        },
-
-        // abstract
-        optionToData: function(element) {
-            if (element.is("option")) {
-                return {
-                    id:element.prop("value"),
-                    text:element.text(),
-                    element: element.get(),
-                    css: element.attr("class"),
-                    disabled: element.prop("disabled"),
-                    locked: equal(element.attr("locked"), "locked") || equal(element.data("locked"), true)
-                };
-            } else if (element.is("optgroup")) {
-                return {
-                    text:element.attr("label"),
-                    children:[],
-                    element: element.get(),
-                    css: element.attr("class")
-                };
-            }
-        },
-
-        // abstract
-        prepareOpts: function (opts) {
-            var element, select, idKey, ajaxUrl, self = this;
-
-            element = opts.element;
-
-            if (element.get(0).tagName.toLowerCase() === "select") {
-                this.select = select = opts.element;
-            }
-
-            if (select) {
-                // these options are not allowed when attached to a select because they are picked up off the element itself
-                $.each(["id", "multiple", "ajax", "query", "createSearchChoice", "initSelection", "data", "tags"], function () {
-                    if (this in opts) {
-                        throw new Error("Option '" + this + "' is not allowed for Select2 when attached to a <select> element.");
-                    }
-                });
-            }
-
-            opts.debug = opts.debug || $.fn.select2.defaults.debug;
-
-            // Warnings for options renamed/removed in Select2 4.0.0
-            // Only when it's enabled through debug mode
-            if (opts.debug && console && console.warn) {
-                // id was removed
-                if (opts.id != null) {
-                    console.warn(
-                        'Select2: The `id` option has been removed in Select2 4.0.0, ' +
-                        'consider renaming your `id` property or mapping the property before your data makes it to Select2. ' +
-                        'You can read more at https://select2.github.io/announcements-4.0.html#changed-id'
-                    );
-                }
-
-                // text was removed
-                if (opts.text != null) {
-                    console.warn(
-                        'Select2: The `text` option has been removed in Select2 4.0.0, ' +
-                        'consider renaming your `text` property or mapping the property before your data makes it to Select2. ' +
-                        'You can read more at https://select2.github.io/announcements-4.0.html#changed-id'
-                    );
-                }
-
-                // sortResults was renamed to results
-                if (opts.sortResults != null) {
-                    console.warn(
-                        'Select2: the `sortResults` option has been renamed to `sorter` in Select2 4.0.0. '
-                    );
-                }
-
-                // selectOnBlur was renamed to selectOnClose
-                if (opts.selectOnBlur != null) {
-                    console.warn(
-                        'Select2: The `selectOnBlur` option has been renamed to `selectOnClose` in Select2 4.0.0.'
-                    );
-                }
-
-                // ajax.results was renamed to ajax.processResults
-                if (opts.ajax != null && opts.ajax.results != null) {
-                    console.warn(
-                        'Select2: The `ajax.results` option has been renamed to `ajax.processResults` in Select2 4.0.0.'
-                    );
-                }
-
-                // format* options were renamed to language.*
-                if (opts.formatNoResults != null) {
-                    console.warn(
-                        'Select2: The `formatNoResults` option has been renamed to `language.noResults` in Select2 4.0.0.'
-                    );
-                }
-                if (opts.formatSearching != null) {
-                    console.warn(
-                        'Select2: The `formatSearching` option has been renamed to `language.searching` in Select2 4.0.0.'
-                    );
-                }
-                if (opts.formatInputTooShort != null) {
-                    console.warn(
-                        'Select2: The `formatInputTooShort` option has been renamed to `language.inputTooShort` in Select2 4.0.0.'
-                    );
-                }
-                if (opts.formatInputTooLong != null) {
-                    console.warn(
-                        'Select2: The `formatInputTooLong` option has been renamed to `language.inputTooLong` in Select2 4.0.0.'
-                    );
-                }
-                if (opts.formatLoading != null) {
-                    console.warn(
-                        'Select2: The `formatLoading` option has been renamed to `language.loadingMore` in Select2 4.0.0.'
-                    );
-                }
-                if (opts.formatSelectionTooBig != null) {
-                    console.warn(
-                        'Select2: The `formatSelectionTooBig` option has been renamed to `language.maximumSelected` in Select2 4.0.0.'
-                    );
-                }
-
-                if (opts.element.data('select2Tags')) {
-                    console.warn(
-                        'Select2: The `data-select2-tags` attribute has been renamed to `data-tags` in Select2 4.0.0.'
-                    );
-                }
-            }
-
-            // Aliasing options renamed in Select2 4.0.0
-
-            // data-select2-tags -> data-tags
-            if (opts.element.data('tags') != null) {
-                var elemTags = opts.element.data('tags');
-
-                // data-tags should actually be a boolean
-                if (!$.isArray(elemTags)) {
-                    elemTags = [];
-                }
-
-                opts.element.data('select2Tags', elemTags);
-            }
-
-            // sortResults -> sorter
-            if (opts.sorter != null) {
-                opts.sortResults = opts.sorter;
-            }
-
-            // selectOnBlur -> selectOnClose
-            if (opts.selectOnClose != null) {
-                opts.selectOnBlur = opts.selectOnClose;
-            }
-
-            // ajax.results -> ajax.processResults
-            if (opts.ajax != null) {
-                if ($.isFunction(opts.ajax.processResults)) {
-                    opts.ajax.results = opts.ajax.processResults;
-                }
-            }
-
-            // Formatters/language options
-            if (opts.language != null) {
-                var lang = opts.language;
-
-                // formatNoMatches -> language.noMatches
-                if ($.isFunction(lang.noMatches)) {
-                    opts.formatNoMatches = lang.noMatches;
-                }
-
-                // formatSearching -> language.searching
-                if ($.isFunction(lang.searching)) {
-                    opts.formatSearching = lang.searching;
-                }
-
-                // formatInputTooShort -> language.inputTooShort
-                if ($.isFunction(lang.inputTooShort)) {
-                    opts.formatInputTooShort = lang.inputTooShort;
-                }
-
-                // formatInputTooLong -> language.inputTooLong
-                if ($.isFunction(lang.inputTooLong)) {
-                    opts.formatInputTooLong = lang.inputTooLong;
-                }
-
-                // formatLoading -> language.loadingMore
-                if ($.isFunction(lang.loadingMore)) {
-                    opts.formatLoading = lang.loadingMore;
-                }
-
-                // formatSelectionTooBig -> language.maximumSelected
-                if ($.isFunction(lang.maximumSelected)) {
-                    opts.formatSelectionTooBig = lang.maximumSelected;
-                }
-            }
-
-            opts = $.extend({}, {
-                populateResults: function(container, results, query) {
-                    var populate, id=this.opts.id, liveRegion=this.liveRegion;
-
-                    populate=function(results, container, depth) {
-
-                        var i, l, result, selectable, disabled, compound, node, label, innerContainer, formatted;
-
-                        results = opts.sortResults(results, container, query);
-
-                        // collect the created nodes for bulk append
-                        var nodes = [];
-                        for (i = 0, l = results.length; i < l; i = i + 1) {
-
-                            result=results[i];
-
-                            disabled = (result.disabled === true);
-                            selectable = (!disabled) && (id(result) !== undefined);
-
-                            compound=result.children && result.children.length > 0;
-
-                            node=$("<li></li>");
-                            node.addClass("select2-results-dept-"+depth);
-                            node.addClass("select2-result");
-                            node.addClass(selectable ? "select2-result-selectable" : "select2-result-unselectable");
-                            if (disabled) { node.addClass("select2-disabled"); }
-                            if (compound) { node.addClass("select2-result-with-children"); }
-                            node.addClass(self.opts.formatResultCssClass(result));
-                            node.attr("role", "presentation");
-
-                            label=$(document.createElement("div"));
-                            label.addClass("select2-result-label");
-                            label.attr("id", "select2-result-label-" + nextUid());
-                            label.attr("role", "option");
-
-                            formatted=opts.formatResult(result, label, query, self.opts.escapeMarkup);
-                            if (formatted!==undefined) {
-                                label.html(formatted);
-                                node.append(label);
-                            }
-
-
-                            if (compound) {
-                                innerContainer=$("<ul></ul>");
-                                innerContainer.addClass("select2-result-sub");
-                                populate(result.children, innerContainer, depth+1);
-                                node.append(innerContainer);
-                            }
-
-                            node.data("select2-data", result);
-                            nodes.push(node[0]);
-                        }
-
-                        // bulk append the created nodes
-                        container.append(nodes);
-                        liveRegion.text(opts.formatMatches(results.length));
-                    };
-
-                    populate(results, container, 0);
-                }
-            }, $.fn.select2.defaults, opts);
-
-            if (typeof(opts.id) !== "function") {
-                idKey = opts.id;
-                opts.id = function (e) { return e[idKey]; };
-            }
-
-            if ($.isArray(opts.element.data("select2Tags"))) {
-                if ("tags" in opts) {
-                    throw "tags specified as both an attribute 'data-select2-tags' and in options of Select2 " + opts.element.attr("id");
-                }
-                opts.tags=opts.element.data("select2Tags");
-            }
-
-            if (select) {
-                opts.query = this.bind(function (query) {
-                    var data = { results: [], more: false },
-                        term = query.term,
-                        children, placeholderOption, process;
-
-                    process=function(element, collection) {
-                        var group;
-                        if (element.is("option")) {
-                            if (query.matcher(term, element.text(), element)) {
-                                collection.push(self.optionToData(element));
-                            }
-                        } else if (element.is("optgroup")) {
-                            group=self.optionToData(element);
-                            element.children().each2(function(i, elm) { process(elm, group.children); });
-                            if (group.children.length>0) {
-                                collection.push(group);
-                            }
-                        }
-                    };
-
-                    children=element.children();
-
-                    // ignore the placeholder option if there is one
-                    if (this.getPlaceholder() !== undefined && children.length > 0) {
-                        placeholderOption = this.getPlaceholderOption();
-                        if (placeholderOption) {
-                            children=children.not(placeholderOption);
-                        }
-                    }
-
-                    children.each2(function(i, elm) { process(elm, data.results); });
-
-                    query.callback(data);
-                });
-                // this is needed because inside val() we construct choices from options and their id is hardcoded
-                opts.id=function(e) { return e.id; };
-            } else {
-                if (!("query" in opts)) {
-                    if ("ajax" in opts) {
-                        ajaxUrl = opts.element.data("ajax-url");
-                        if (ajaxUrl && ajaxUrl.length > 0) {
-                            opts.ajax.url = ajaxUrl;
-                        }
-                        opts.query = ajax.call(opts.element, opts.ajax);
-                    } else if ("data" in opts) {
-                        opts.query = local(opts.data);
-                    } else if ("tags" in opts) {
-                        opts.query = tags(opts.tags);
-                        if (opts.createSearchChoice === undefined) {
-                            opts.createSearchChoice = function (term) { return {id: $.trim(term), text: $.trim(term)}; };
-                        }
-                        if (opts.initSelection === undefined) {
-                            opts.initSelection = function (element, callback) {
-                                var data = [];
-                                $(splitVal(element.val(), opts.separator, opts.transformVal)).each(function () {
-                                    var obj = { id: this, text: this },
-                                        tags = opts.tags;
-                                    if ($.isFunction(tags)) tags=tags();
-                                    $(tags).each(function() { if (equal(this.id, obj.id)) { obj = this; return false; } });
-                                    data.push(obj);
-                                });
-
-                                callback(data);
-                            };
-                        }
-                    }
-                }
-            }
-            if (typeof(opts.query) !== "function") {
-                throw "query function not defined for Select2 " + opts.element.attr("id");
-            }
-
-            if (opts.createSearchChoicePosition === 'top') {
-                opts.createSearchChoicePosition = function(list, item) { list.unshift(item); };
-            }
-            else if (opts.createSearchChoicePosition === 'bottom') {
-                opts.createSearchChoicePosition = function(list, item) { list.push(item); };
-            }
-            else if (typeof(opts.createSearchChoicePosition) !== "function")  {
-                throw "invalid createSearchChoicePosition option must be 'top', 'bottom' or a custom function";
-            }
-
-            return opts;
-        },
-
-        /**
-         * Monitor the original element for changes and update select2 accordingly
-         */
-        // abstract
-        monitorSource: function () {
-            var el = this.opts.element, observer, self = this;
-
-            el.on("change.select2", this.bind(function (e) {
-                if (this.opts.element.data("select2-change-triggered") !== true) {
-                    this.initSelection();
-                }
-            }));
-
-            this._sync = this.bind(function () {
-
-                // sync enabled state
-                var disabled = el.prop("disabled");
-                if (disabled === undefined) disabled = false;
-                this.enable(!disabled);
-
-                var readonly = el.prop("readonly");
-                if (readonly === undefined) readonly = false;
-                this.readonly(readonly);
-
-                if (this.container) {
-                    syncCssClasses(this.container, this.opts.element, this.opts.adaptContainerCssClass);
-                    this.container.addClass(evaluate(this.opts.containerCssClass, this.opts.element));
-                }
-
-                if (this.dropdown) {
-                    syncCssClasses(this.dropdown, this.opts.element, this.opts.adaptDropdownCssClass);
-                    this.dropdown.addClass(evaluate(this.opts.dropdownCssClass, this.opts.element));
-                }
-
-            });
-
-            // IE8-10 (IE9/10 won't fire propertyChange via attachEventListener)
-            if (el.length && el[0].attachEvent) {
-                el.each(function() {
-                    this.attachEvent("onpropertychange", self._sync);
-                });
-            }
-
-            // safari, chrome, firefox, IE11
-            observer = window.MutationObserver || window.WebKitMutationObserver|| window.MozMutationObserver;
-            if (observer !== undefined) {
-                if (this.propertyObserver) { delete this.propertyObserver; this.propertyObserver = null; }
-                this.propertyObserver = new observer(function (mutations) {
-                    $.each(mutations, self._sync);
-                });
-                this.propertyObserver.observe(el.get(0), { attributes:true, subtree:false });
-            }
-        },
-
-        // abstract
-        triggerSelect: function(data) {
-            var evt = $.Event("select2-selecting", { val: this.id(data), object: data, choice: data });
-            this.opts.element.trigger(evt);
-            return !evt.isDefaultPrevented();
-        },
-
-        /**
-         * Triggers the change event on the source element
-         */
-        // abstract
-        triggerChange: function (details) {
-
-            details = details || {};
-            details= $.extend({}, details, { type: "change", val: this.val() });
-            // prevents recursive triggering
-            this.opts.element.data("select2-change-triggered", true);
-            this.opts.element.trigger(details);
-            this.opts.element.data("select2-change-triggered", false);
-
-            // some validation frameworks ignore the change event and listen instead to keyup, click for selects
-            // so here we trigger the click event manually
-            this.opts.element.click();
-
-            // ValidationEngine ignores the change event and listens instead to blur
-            // so here we trigger the blur event manually if so desired
-            if (this.opts.blurOnChange)
-                this.opts.element.blur();
-        },
-
-        //abstract
-        isInterfaceEnabled: function()
-        {
-            return this.enabledInterface === true;
-        },
-
-        // abstract
-        enableInterface: function() {
-            var enabled = this._enabled && !this._readonly,
-                disabled = !enabled;
-
-            if (enabled === this.enabledInterface) return false;
-
-            this.container.toggleClass("select2-container-disabled", disabled);
-            this.close();
-            this.enabledInterface = enabled;
-
-            return true;
-        },
-
-        // abstract
-        enable: function(enabled) {
-            if (enabled === undefined) enabled = true;
-            if (this._enabled === enabled) return;
-            this._enabled = enabled;
-
-            this.opts.element.prop("disabled", !enabled);
-            this.enableInterface();
-        },
-
-        // abstract
-        disable: function() {
-            this.enable(false);
-        },
-
-        // abstract
-        readonly: function(enabled) {
-            if (enabled === undefined) enabled = false;
-            if (this._readonly === enabled) return;
-            this._readonly = enabled;
-
-            this.opts.element.prop("readonly", enabled);
-            this.enableInterface();
-        },
-
-        // abstract
-        opened: function () {
-            return (this.container) ? this.container.hasClass("select2-dropdown-open") : false;
-        },
-
-        // abstract
-        positionDropdown: function() {
-            var $dropdown = this.dropdown,
-                container = this.container,
-                offset = container.offset(),
-                height = container.outerHeight(false),
-                width = container.outerWidth(false),
-                dropHeight = $dropdown.outerHeight(false),
-                $window = $(window),
-                windowWidth = $window.width(),
-                windowHeight = $window.height(),
-                viewPortRight = $window.scrollLeft() + windowWidth,
-                viewportBottom = $window.scrollTop() + windowHeight,
-                dropTop = offset.top + height,
-                dropLeft = offset.left,
-                enoughRoomBelow = dropTop + dropHeight <= viewportBottom,
-                enoughRoomAbove = (offset.top - dropHeight) >= $window.scrollTop(),
-                dropWidth = $dropdown.outerWidth(false),
-                enoughRoomOnRight = function() {
-                    return dropLeft + dropWidth <= viewPortRight;
-                },
-                enoughRoomOnLeft = function() {
-                    return offset.left + viewPortRight + container.outerWidth(false)  > dropWidth;
-                },
-                aboveNow = $dropdown.hasClass("select2-drop-above"),
-                bodyOffset,
-                above,
-                changeDirection,
-                css,
-                resultsListNode;
-
-            // always prefer the current above/below alignment, unless there is not enough room
-            if (aboveNow) {
-                above = true;
-                if (!enoughRoomAbove && enoughRoomBelow) {
-                    changeDirection = true;
-                    above = false;
-                }
-            } else {
-                above = false;
-                if (!enoughRoomBelow && enoughRoomAbove) {
-                    changeDirection = true;
-                    above = true;
-                }
-            }
-
-            //if we are changing direction we need to get positions when dropdown is hidden;
-            if (changeDirection) {
-                $dropdown.hide();
-                offset = this.container.offset();
-                height = this.container.outerHeight(false);
-                width = this.container.outerWidth(false);
-                dropHeight = $dropdown.outerHeight(false);
-                viewPortRight = $window.scrollLeft() + windowWidth;
-                viewportBottom = $window.scrollTop() + windowHeight;
-                dropTop = offset.top + height;
-                dropLeft = offset.left;
-                dropWidth = $dropdown.outerWidth(false);
-                $dropdown.show();
-
-                // fix so the cursor does not move to the left within the search-textbox in IE
-                this.focusSearch();
-            }
-
-            if (this.opts.dropdownAutoWidth) {
-                resultsListNode = $('.select2-results', $dropdown)[0];
-                $dropdown.addClass('select2-drop-auto-width');
-                $dropdown.css('width', '');
-                // Add scrollbar width to dropdown if vertical scrollbar is present
-                dropWidth = $dropdown.outerWidth(false) + (resultsListNode.scrollHeight === resultsListNode.clientHeight ? 0 : scrollBarDimensions.width);
-                dropWidth > width ? width = dropWidth : dropWidth = width;
-                dropHeight = $dropdown.outerHeight(false);
-            }
-            else {
-                this.container.removeClass('select2-drop-auto-width');
-            }
-
-            //console.log("below/ droptop:", dropTop, "dropHeight", dropHeight, "sum", (dropTop+dropHeight)+" viewport bottom", viewportBottom, "enough?", enoughRoomBelow);
-            //console.log("above/ offset.top", offset.top, "dropHeight", dropHeight, "top", (offset.top-dropHeight), "scrollTop", this.body.scrollTop(), "enough?", enoughRoomAbove);
-
-            // fix positioning when body has an offset and is not position: static
-            if (this.body.css('position') !== 'static') {
-                bodyOffset = this.body.offset();
-                dropTop -= bodyOffset.top;
-                dropLeft -= bodyOffset.left;
-            }
-
-            if (!enoughRoomOnRight() && enoughRoomOnLeft()) {
-                dropLeft = offset.left + this.container.outerWidth(false) - dropWidth;
-            }
-
-            css =  {
-                left: dropLeft,
-                width: width
-            };
-
-            if (above) {
-                this.container.addClass("select2-drop-above");
-                $dropdown.addClass("select2-drop-above");
-                dropHeight = $dropdown.outerHeight(false);
-                css.top = offset.top - dropHeight;
-                css.bottom = 'auto';
-            }
-            else {
-                css.top = dropTop;
-                css.bottom = 'auto';
-                this.container.removeClass("select2-drop-above");
-                $dropdown.removeClass("select2-drop-above");
-            }
-            css = $.extend(css, evaluate(this.opts.dropdownCss, this.opts.element));
-
-            $dropdown.css(css);
-        },
-
-        // abstract
-        shouldOpen: function() {
-            var event;
-
-            if (this.opened()) return false;
-
-            if (this._enabled === false || this._readonly === true) return false;
-
-            event = $.Event("select2-opening");
-            this.opts.element.trigger(event);
-            return !event.isDefaultPrevented();
-        },
-
-        // abstract
-        clearDropdownAlignmentPreference: function() {
-            // clear the classes used to figure out the preference of where the dropdown should be opened
-            this.container.removeClass("select2-drop-above");
-            this.dropdown.removeClass("select2-drop-above");
-        },
-
-        /**
-         * Opens the dropdown
-         *
-         * @return {Boolean} whether or not dropdown was opened. This method will return false if, for example,
-         * the dropdown is already open, or if the 'open' event listener on the element called preventDefault().
-         */
-        // abstract
-        open: function () {
-
-            if (!this.shouldOpen()) return false;
-
-            this.opening();
-
-            // Only bind the document mousemove when the dropdown is visible
-            $document.on("mousemove.select2Event", function (e) {
-                lastMousePosition.x = e.pageX;
-                lastMousePosition.y = e.pageY;
-            });
-
-            return true;
-        },
-
-        /**
-         * Performs the opening of the dropdown
-         */
-        // abstract
-        opening: function() {
-            var cid = this.containerEventName,
-                scroll = "scroll." + cid,
-                resize = "resize."+cid,
-                orient = "orientationchange."+cid,
-                mask;
-
-            this.container.addClass("select2-dropdown-open").addClass("select2-container-active");
-
-            this.clearDropdownAlignmentPreference();
-
-            if(this.dropdown[0] !== this.body.children().last()[0]) {
-                this.dropdown.detach().appendTo(this.body);
-            }
-
-            // create the dropdown mask if doesn't already exist
-            mask = $("#select2-drop-mask");
-            if (mask.length === 0) {
-                mask = $(document.createElement("div"));
-                mask.attr("id","select2-drop-mask").attr("class","select2-drop-mask");
-                mask.hide();
-                mask.appendTo(this.body);
-                mask.on("mousedown touchstart click", function (e) {
-                    // Prevent IE from generating a click event on the body
-                    reinsertElement(mask);
-
-                    var dropdown = $("#select2-drop"), self;
-                    if (dropdown.length > 0) {
-                        self=dropdown.data("select2");
-                        if (self.opts.selectOnBlur) {
-                            self.selectHighlighted({noFocus: true});
-                        }
-                        self.close();
-                        e.preventDefault();
-                        e.stopPropagation();
-                    }
-                });
-            }
-
-            // ensure the mask is always right before the dropdown
-            if (this.dropdown.prev()[0] !== mask[0]) {
-                this.dropdown.before(mask);
-            }
-
-            // move the global id to the correct dropdown
-            $("#select2-drop").removeAttr("id");
-            this.dropdown.attr("id", "select2-drop");
-
-            // show the elements
-            mask.show();
-
-            this.positionDropdown();
-            this.dropdown.show();
-            this.positionDropdown();
-
-            this.dropdown.addClass("select2-drop-active");
-
-            // attach listeners to events that can change the position of the container and thus require
-            // the position of the dropdown to be updated as well so it does not come unglued from the container
-            var that = this;
-            this.container.parents().add(window).each(function () {
-                $(this).on(resize+" "+scroll+" "+orient, function (e) {
-                    if (that.opened()) that.positionDropdown();
-                });
-            });
-
-
-        },
-
-        // abstract
-        close: function () {
-            if (!this.opened()) return;
-
-            var cid = this.containerEventName,
-                scroll = "scroll." + cid,
-                resize = "resize."+cid,
-                orient = "orientationchange."+cid;
-
-            // unbind event listeners
-            this.container.parents().add(window).each(function () { $(this).off(scroll).off(resize).off(orient); });
-
-            this.clearDropdownAlignmentPreference();
-
-            $("#select2-drop-mask").hide();
-            this.dropdown.removeAttr("id"); // only the active dropdown has the select2-drop id
-            this.dropdown.hide();
-            this.container.removeClass("select2-dropdown-open").removeClass("select2-container-active");
-            this.results.empty();
-
-            // Now that the dropdown is closed, unbind the global document mousemove event
-            $document.off("mousemove.select2Event");
-
-            this.clearSearch();
-            this.search.removeClass("select2-active");
-
-            // Remove the aria active descendant for highlighted element
-            this.search.removeAttr("aria-activedescendant");
-            this.opts.element.trigger($.Event("select2-close"));
-        },
-
-        /**
-         * Opens control, sets input value, and updates results.
-         */
-        // abstract
-        externalSearch: function (term) {
-            this.open();
-            this.search.val(term);
-            this.updateResults(false);
-        },
-
-        // abstract
-        clearSearch: function () {
-
-        },
-
-        /**
-         * @return {Boolean} Whether or not search value was changed.
-         * @private
-         */
-        prefillNextSearchTerm: function () {
-            // initializes search's value with nextSearchTerm (if defined by user)
-            // ignore nextSearchTerm if the dropdown is opened by the user pressing a letter
-            if(this.search.val() !== "") {
-                return false;
-            }
-
-            var nextSearchTerm = this.opts.nextSearchTerm(this.data(), this.lastSearchTerm);
-            if(nextSearchTerm !== undefined){
-                this.search.val(nextSearchTerm);
-                this.search.select();
-                return true;
-            }
-
-            return false;
-        },
-
-        //abstract
-        getMaximumSelectionSize: function() {
-            return evaluate(this.opts.maximumSelectionSize, this.opts.element);
-        },
-
-        // abstract
-        ensureHighlightVisible: function () {
-            var results = this.results, children, index, child, hb, rb, y, more, topOffset;
-
-            index = this.highlight();
-
-            if (index < 0) return;
-
-            if (index == 0) {
-
-                // if the first element is highlighted scroll all the way to the top,
-                // that way any unselectable headers above it will also be scrolled
-                // into view
-
-                results.scrollTop(0);
-                return;
-            }
-
-            children = this.findHighlightableChoices().find('.select2-result-label');
-
-            child = $(children[index]);
-
-            topOffset = (child.offset() || {}).top || 0;
-
-            hb = topOffset + child.outerHeight(true);
-
-            // if this is the last child lets also make sure select2-more-results is visible
-            if (index === children.length - 1) {
-                more = results.find("li.select2-more-results");
-                if (more.length > 0) {
-                    hb = more.offset().top + more.outerHeight(true);
-                }
-            }
-
-            rb = results.offset().top + results.outerHeight(false);
-            if (hb > rb) {
-                results.scrollTop(results.scrollTop() + (hb - rb));
-            }
-            y = topOffset - results.offset().top;
-
-            // make sure the top of the element is visible
-            if (y < 0 && child.css('display') != 'none' ) {
-                results.scrollTop(results.scrollTop() + y); // y is negative
-            }
-        },
-
-        // abstract
-        findHighlightableChoices: function() {
-            return this.results.find(".select2-result-selectable:not(.select2-disabled):not(.select2-selected)");
-        },
-
-        // abstract
-        moveHighlight: function (delta) {
-            var choices = this.findHighlightableChoices(),
-                index = this.highlight();
-
-            while (index > -1 && index < choices.length) {
-                index += delta;
-                var choice = $(choices[index]);
-                if (choice.hasClass("select2-result-selectable") && !choice.hasClass("select2-disabled") && !choice.hasClass("select2-selected")) {
-                    this.highlight(index);
-                    break;
-                }
-            }
-        },
-
-        // abstract
-        highlight: function (index) {
-            var choices = this.findHighlightableChoices(),
-                choice,
-                data;
-
-            if (arguments.length === 0) {
-                return indexOf(choices.filter(".select2-highlighted")[0], choices.get());
-            }
-
-            if (index >= choices.length) index = choices.length - 1;
-            if (index < 0) index = 0;
-
-            this.removeHighlight();
-
-            choice = $(choices[index]);
-            choice.addClass("select2-highlighted");
-
-            // ensure assistive technology can determine the active choice
-            this.search.attr("aria-activedescendant", choice.find(".select2-result-label").attr("id"));
-
-            this.ensureHighlightVisible();
-
-            this.liveRegion.text(choice.text());
-
-            data = choice.data("select2-data");
-            if (data) {
-                this.opts.element.trigger({ type: "select2-highlight", val: this.id(data), choice: data });
-            }
-        },
-
-        removeHighlight: function() {
-            this.results.find(".select2-highlighted").removeClass("select2-highlighted");
-        },
-
-        touchMoved: function() {
-            this._touchMoved = true;
-        },
-
-        clearTouchMoved: function() {
-          this._touchMoved = false;
-        },
-
-        // abstract
-        countSelectableResults: function() {
-            return this.findHighlightableChoices().length;
-        },
-
-        // abstract
-        highlightUnderEvent: function (event) {
-            var el = $(event.target).closest(".select2-result-selectable");
-            if (el.length > 0 && !el.is(".select2-highlighted")) {
-                var choices = this.findHighlightableChoices();
-                this.highlight(choices.index(el));
-            } else if (el.length == 0) {
-                // if we are over an unselectable item remove all highlights
-                this.removeHighlight();
-            }
-        },
-
-        // abstract
-        loadMoreIfNeeded: function () {
-            var results = this.results,
-                more = results.find("li.select2-more-results"),
-                below, // pixels the element is below the scroll fold, below==0 is when the element is starting to be visible
-                page = this.resultsPage + 1,
-                self=this,
-                term=this.search.val(),
-                context=this.context;
-
-            if (more.length === 0) return;
-            below = more.offset().top - results.offset().top - results.height();
-
-            if (below <= this.opts.loadMorePadding) {
-                more.addClass("select2-active");
-                this.opts.query({
-                        element: this.opts.element,
-                        term: term,
-                        page: page,
-                        context: context,
-                        matcher: this.opts.matcher,
-                        callback: this.bind(function (data) {
-
-                    // ignore a response if the select2 has been closed before it was received
-                    if (!self.opened()) return;
-
-
-                    self.opts.populateResults.call(this, results, data.results, {term: term, page: page, context:context});
-                    self.postprocessResults(data, false, false);
-
-                    if (data.more===true) {
-                        more.detach().appendTo(results).html(self.opts.escapeMarkup(evaluate(self.opts.formatLoadMore, self.opts.element, page+1)));
-                        window.setTimeout(function() { self.loadMoreIfNeeded(); }, 10);
-                    } else {
-                        more.remove();
-                    }
-                    self.positionDropdown();
-                    self.resultsPage = page;
-                    self.context = data.context;
-                    this.opts.element.trigger({ type: "select2-loaded", items: data });
-                })});
-            }
-        },
-
-        /**
-         * Default tokenizer function which does nothing
-         */
-        tokenize: function() {
-
-        },
-
-        /**
-         * @param initial whether or not this is the call to this method right after the dropdown has been opened
-         */
-        // abstract
-        updateResults: function (initial) {
-            var search = this.search,
-                results = this.results,
-                opts = this.opts,
-                data,
-                self = this,
-                input,
-                term = search.val(),
-                lastTerm = $.data(this.container, "select2-last-term"),
-                // sequence number used to drop out-of-order responses
-                queryNumber;
-
-            // prevent duplicate queries against the same term
-            if (initial !== true && lastTerm && equal(term, lastTerm)) return;
-
-            $.data(this.container, "select2-last-term", term);
-
-            // if the search is currently hidden we do not alter the results
-            if (initial !== true && (this.showSearchInput === false || !this.opened())) {
-                return;
-            }
-
-            function postRender() {
-                search.removeClass("select2-active");
-                self.positionDropdown();
-                if (results.find('.select2-no-results,.select2-selection-limit,.select2-searching').length) {
-                    self.liveRegion.text(results.text());
-                }
-                else {
-                    self.liveRegion.text(self.opts.formatMatches(results.find('.select2-result-selectable:not(".select2-selected")').length));
-                }
-            }
-
-            function render(html) {
-                results.html(html);
-                postRender();
-            }
-
-            queryNumber = ++this.queryCount;
-
-            var maxSelSize = this.getMaximumSelectionSize();
-            if (maxSelSize >=1) {
-                data = this.data();
-                if ($.isArray(data) && data.length >= maxSelSize && checkFormatter(opts.formatSelectionTooBig, "formatSelectionTooBig")) {
-                    render("<li class='select2-selection-limit'>" + evaluate(opts.formatSelectionTooBig, opts.element, maxSelSize) + "</li>");
-                    return;
-                }
-            }
-
-            if (search.val().length < opts.minimumInputLength) {
-                if (checkFormatter(opts.formatInputTooShort, "formatInputTooShort")) {
-                    render("<li class='select2-no-results'>" + evaluate(opts.formatInputTooShort, opts.element, search.val(), opts.minimumInputLength) + "</li>");
-                } else {
-                    render("");
-                }
-                if (initial && this.showSearch) this.showSearch(true);
-                return;
-            }
-
-            if (opts.maximumInputLength && search.val().length > opts.maximumInputLength) {
-                if (checkFormatter(opts.formatInputTooLong, "formatInputTooLong")) {
-                    render("<li class='select2-no-results'>" + evaluate(opts.formatInputTooLong, opts.element, search.val(), opts.maximumInputLength) + "</li>");
-                } else {
-                    render("");
-                }
-                return;
-            }
-
-            if (opts.formatSearching && this.findHighlightableChoices().length === 0) {
-                render("<li class='select2-searching'>" + evaluate(opts.formatSearching, opts.element) + "</li>");
-            }
-
-            search.addClass("select2-active");
-
-            this.removeHighlight();
-
-            // give the tokenizer a chance to pre-process the input
-            input = this.tokenize();
-            if (input != undefined && input != null) {
-                search.val(input);
-            }
-
-            this.resultsPage = 1;
-
-            opts.query({
-                element: opts.element,
-                    term: search.val(),
-                    page: this.resultsPage,
-                    context: null,
-                    matcher: opts.matcher,
-                    callback: this.bind(function (data) {
-                var def; // default choice
-
-                // ignore old responses
-                if (queryNumber != this.queryCount) {
-                  return;
-                }
-
-                // ignore a response if the select2 has been closed before it was received
-                if (!this.opened()) {
-                    this.search.removeClass("select2-active");
-                    return;
-                }
-
-                // handle ajax error
-                if(data.hasError !== undefined && checkFormatter(opts.formatAjaxError, "formatAjaxError")) {
-                    render("<li class='select2-ajax-error'>" + evaluate(opts.formatAjaxError, opts.element, data.jqXHR, data.textStatus, data.errorThrown) + "</li>");
-                    return;
-                }
-
-                // save context, if any
-                this.context = (data.context===undefined) ? null : data.context;
-                // create a default choice and prepend it to the list
-                if (this.opts.createSearchChoice && search.val() !== "") {
-                    def = this.opts.createSearchChoice.call(self, search.val(), data.results);
-                    if (def !== undefined && def !== null && self.id(def) !== undefined && self.id(def) !== null) {
-                        if ($(data.results).filter(
-                            function () {
-                                return equal(self.id(this), self.id(def));
-                            }).length === 0) {
-                            this.opts.createSearchChoicePosition(data.results, def);
-                        }
-                    }
-                }
-
-                if (data.results.length === 0 && checkFormatter(opts.formatNoMatches, "formatNoMatches")) {
-                    render("<li class='select2-no-results'>" + evaluate(opts.formatNoMatches, opts.element, search.val()) + "</li>");
-                    if(this.showSearch){
-                        this.showSearch(search.val());
-                    }
-                    return;
-                }
-
-                results.empty();
-                self.opts.populateResults.call(this, results, data.results, {term: search.val(), page: this.resultsPage, context:null});
-
-                if (data.more === true && checkFormatter(opts.formatLoadMore, "formatLoadMore")) {
-                    results.append("<li class='select2-more-results'>" + opts.escapeMarkup(evaluate(opts.formatLoadMore, opts.element, this.resultsPage)) + "</li>");
-                    window.setTimeout(function() { self.loadMoreIfNeeded(); }, 10);
-                }
-
-                this.postprocessResults(data, initial);
-
-                postRender();
-
-                this.opts.element.trigger({ type: "select2-loaded", items: data });
-            })});
-        },
-
-        // abstract
-        cancel: function () {
-            this.close();
-        },
-
-        // abstract
-        blur: function () {
-            // if selectOnBlur == true, select the currently highlighted option
-            if (this.opts.selectOnBlur)
-                this.selectHighlighted({noFocus: true});
-
-            this.close();
-            this.container.removeClass("select2-container-active");
-            // synonymous to .is(':focus'), which is available in jquery >= 1.6
-            if (this.search[0] === document.activeElement) { this.search.blur(); }
-            this.clearSearch();
-            this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus");
-        },
-
-        // abstract
-        focusSearch: function () {
-            focus(this.search);
-        },
-
-        // abstract
-        selectHighlighted: function (options) {
-            if (this._touchMoved) {
-              this.clearTouchMoved();
-              return;
-            }
-            var index=this.highlight(),
-                highlighted=this.results.find(".select2-highlighted"),
-                data = highlighted.closest('.select2-result').data("select2-data");
-
-            if (data) {
-                this.highlight(index);
-                this.onSelect(data, options);
-            } else if (options && options.noFocus) {
-                this.close();
-            }
-        },
-
-        // abstract
-        getPlaceholder: function () {
-            var placeholderOption;
-            return this.opts.element.attr("placeholder") ||
-                this.opts.element.attr("data-placeholder") || // jquery 1.4 compat
-                this.opts.element.data("placeholder") ||
-                this.opts.placeholder ||
-                ((placeholderOption = this.getPlaceholderOption()) !== undefined ? placeholderOption.text() : undefined);
-        },
-
-        // abstract
-        getPlaceholderOption: function() {
-            if (this.select) {
-                var firstOption = this.select.children('option').first();
-                if (this.opts.placeholderOption !== undefined ) {
-                    //Determine the placeholder option based on the specified placeholderOption setting
-                    return (this.opts.placeholderOption === "first" && firstOption) ||
-                           (typeof this.opts.placeholderOption === "function" && this.opts.placeholderOption(this.select));
-                } else if ($.trim(firstOption.text()) === "" && firstOption.val() === "") {
-                    //No explicit placeholder option specified, use the first if it's blank
-                    return firstOption;
-                }
-            }
-        },
-
-        /**
-         * Get the desired width for the container element.  This is
-         * derived first from option `width` passed to select2, then
-         * the inline 'style' on the original element, and finally
-         * falls back to the jQuery calculated element width.
-         */
-        // abstract
-        initContainerWidth: function () {
-            function resolveContainerWidth() {
-                var style, attrs, matches, i, l, attr;
-
-                if (this.opts.width === "off") {
-                    return null;
-                } else if (this.opts.width === "element"){
-                    return this.opts.element.outerWidth(false) === 0 ? 'auto' : this.opts.element.outerWidth(false) + 'px';
-                } else if (this.opts.width === "copy" || this.opts.width === "resolve") {
-                    // check if there is inline style on the element that contains width
-                    style = this.opts.element.attr('style');
-                    if (typeof(style) === "string") {
-                        attrs = style.split(';');
-                        for (i = 0, l = attrs.length; i < l; i = i + 1) {
-                            attr = attrs[i].replace(/\s/g, '');
-                            matches = attr.match(/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i);
-                            if (matches !== null && matches.length >= 1)
-                                return matches[1];
-                        }
-                    }
-
-                    if (this.opts.width === "resolve") {
-                        // next check if css('width') can resolve a width that is percent based, this is sometimes possible
-                        // when attached to input type=hidden or elements hidden via css
-                        style = this.opts.element.css('width');
-                        if (style.indexOf("%") > 0) return style;
-
-                        // finally, fallback on the calculated width of the element
-                        return (this.opts.element.outerWidth(false) === 0 ? 'auto' : this.opts.element.outerWidth(false) + 'px');
-                    }
-
-                    return null;
-                } else if ($.isFunction(this.opts.width)) {
-                    return this.opts.width();
-                } else {
-                    return this.opts.width;
-               }
-            };
-
-            var width = resolveContainerWidth.call(this);
-            if (width !== null) {
-                this.container.css("width", width);
-            }
-        }
-    });
-
-    SingleSelect2 = clazz(AbstractSelect2, {
-
-        // single
-
-        createContainer: function () {
-            var container = $(document.createElement("div")).attr({
-                "class": "select2-container"
-            }).html([
-                "<a href='javascript:void(0)' class='select2-choice' tabindex='-1'>",
-                "   <span class='select2-chosen'>&#160;</span><abbr class='select2-search-choice-close'></abbr>",
-                "   <span class='select2-arrow' role='presentation'><b role='presentation'></b></span>",
-                "</a>",
-                "<label for='' class='select2-offscreen'></label>",
-                "<input class='select2-focusser select2-offscreen' type='text' aria-haspopup='true' role='button' />",
-                "<div class='select2-drop select2-display-none'>",
-                "   <div class='select2-search'>",
-                "       <label for='' class='select2-offscreen'></label>",
-                "       <input type='text' autocomplete='off' autocorrect='off' autocapitalize='off' spellcheck='false' class='select2-input' role='combobox' aria-expanded='true'",
-                "       aria-autocomplete='list' />",
-                "   </div>",
-                "   <ul class='select2-results' role='listbox'>",
-                "   </ul>",
-                "</div>"].join(""));
-            return container;
-        },
-
-        // single
-        enableInterface: function() {
-            if (this.parent.enableInterface.apply(this, arguments)) {
-                this.focusser.prop("disabled", !this.isInterfaceEnabled());
-            }
-        },
-
-        // single
-        opening: function () {
-            var el, range, len;
-
-            if (this.opts.minimumResultsForSearch >= 0) {
-                this.showSearch(true);
-            }
-
-            this.parent.opening.apply(this, arguments);
-
-            if (this.showSearchInput !== false) {
-                // IE appends focusser.val() at the end of field :/ so we manually insert it at the beginning using a range
-                // all other browsers handle this just fine
-
-                this.search.val(this.focusser.val());
-            }
-            if (this.opts.shouldFocusInput(this)) {
-                this.search.focus();
-                // move the cursor to the end after focussing, otherwise it will be at the beginning and
-                // new text will appear *before* focusser.val()
-                el = this.search.get(0);
-                if (el.createTextRange) {
-                    range = el.createTextRange();
-                    range.collapse(false);
-                    range.select();
-                } else if (el.setSelectionRange) {
-                    len = this.search.val().length;
-                    el.setSelectionRange(len, len);
-                }
-            }
-
-            this.prefillNextSearchTerm();
-
-            this.focusser.prop("disabled", true).val("");
-            this.updateResults(true);
-            this.opts.element.trigger($.Event("select2-open"));
-        },
-
-        // single
-        close: function () {
-            if (!this.opened()) return;
-            this.parent.close.apply(this, arguments);
-
-            this.focusser.prop("disabled", false);
-
-            if (this.opts.shouldFocusInput(this)) {
-                this.focusser.focus();
-            }
-        },
-
-        // single
-        focus: function () {
-            if (this.opened()) {
-                this.close();
-            } else {
-                this.focusser.prop("disabled", false);
-                if (this.opts.shouldFocusInput(this)) {
-                    this.focusser.focus();
-                }
-            }
-        },
-
-        // single
-        isFocused: function () {
-            return this.container.hasClass("select2-container-active");
-        },
-
-        // single
-        cancel: function () {
-            this.parent.cancel.apply(this, arguments);
-            this.focusser.prop("disabled", false);
-
-            if (this.opts.shouldFocusInput(this)) {
-                this.focusser.focus();
-            }
-        },
-
-        // single
-        destroy: function() {
-            $("label[for='" + this.focusser.attr('id') + "']")
-                .attr('for', this.opts.element.attr("id"));
-            this.parent.destroy.apply(this, arguments);
-
-            cleanupJQueryElements.call(this,
-                "selection",
-                "focusser"
-            );
-        },
-
-        // single
-        initContainer: function () {
-
-            var selection,
-                container = this.container,
-                dropdown = this.dropdown,
-                idSuffix = nextUid(),
-                elementLabel;
-
-            if (this.opts.minimumResultsForSearch < 0) {
-                this.showSearch(false);
-            } else {
-                this.showSearch(true);
-            }
-
-            this.selection = selection = container.find(".select2-choice");
-
-            this.focusser = container.find(".select2-focusser");
-
-            // add aria associations
-            selection.find(".select2-chosen").attr("id", "select2-chosen-"+idSuffix);
-            this.focusser.attr("aria-labelledby", "select2-chosen-"+idSuffix);
-            this.results.attr("id", "select2-results-"+idSuffix);
-            this.search.attr("aria-owns", "select2-results-"+idSuffix);
-
-            // rewrite labels from original element to focusser
-            this.focusser.attr("id", "s2id_autogen"+idSuffix);
-
-            elementLabel = $("label[for='" + this.opts.element.attr("id") + "']");
-            this.opts.element.on('focus.select2', this.bind(function () { this.focus(); }));
-
-            this.focusser.prev()
-                .text(elementLabel.text())
-                .attr('for', this.focusser.attr('id'));
-
-            // Ensure the original element retains an accessible name
-            var originalTitle = this.opts.element.attr("title");
-            this.opts.element.attr("title", (originalTitle || elementLabel.text()));
-
-            this.focusser.attr("tabindex", this.elementTabIndex);
-
-            // write label for search field using the label from the focusser element
-            this.search.attr("id", this.focusser.attr('id') + '_search');
-
-            this.search.prev()
-                .text($("label[for='" + this.focusser.attr('id') + "']").text())
-                .attr('for', this.search.attr('id'));
-
-            this.search.on("keydown", this.bind(function (e) {
-                if (!this.isInterfaceEnabled()) return;
-
-                // filter 229 keyCodes (input method editor is processing key input)
-                if (229 == e.keyCode) return;
-
-                if (e.which === KEY.PAGE_UP || e.which === KEY.PAGE_DOWN) {
-                    // prevent the page from scrolling
-                    killEvent(e);
-                    return;
-                }
-
-                switch (e.which) {
-                    case KEY.UP:
-                    case KEY.DOWN:
-                        this.moveHighlight((e.which === KEY.UP) ? -1 : 1);
-                        killEvent(e);
-                        return;
-                    case KEY.ENTER:
-                        this.selectHighlighted();
-                        killEvent(e);
-                        return;
-                    case KEY.TAB:
-                        this.selectHighlighted({noFocus: true});
-                        return;
-                    case KEY.ESC:
-                        this.cancel(e);
-                        killEvent(e);
-                        return;
-                }
-            }));
-
-            this.search.on("blur", this.bind(function(e) {
-                // a workaround for chrome to keep the search field focussed when the scroll bar is used to scroll the dropdown.
-                // without this the search field loses focus which is annoying
-                if (document.activeElement === this.body.get(0)) {
-                    window.setTimeout(this.bind(function() {
-                        if (this.opened() && this.results && this.results.length > 1) {
-                            this.search.focus();
-                        }
-                    }), 0);
-                }
-            }));
-
-            this.focusser.on("keydown", this.bind(function (e) {
-                if (!this.isInterfaceEnabled()) return;
-
-                if (e.which === KEY.TAB || KEY.isControl(e) || KEY.isFunctionKey(e) || e.which === KEY.ESC) {
-                    return;
-                }
-
-                if (this.opts.openOnEnter === false && e.which === KEY.ENTER) {
-                    killEvent(e);
-                    return;
-                }
-
-                if (e.which == KEY.DOWN || e.which == KEY.UP
-                    || (e.which == KEY.ENTER && this.opts.openOnEnter)) {
-
-                    if (e.altKey || e.ctrlKey || e.shiftKey || e.metaKey) return;
-
-                    this.open();
-                    killEvent(e);
-                    return;
-                }
-
-                if (e.which == KEY.DELETE || e.which == KEY.BACKSPACE) {
-                    if (this.opts.allowClear) {
-                        this.clear();
-                    }
-                    killEvent(e);
-                    return;
-                }
-            }));
-
-
-            installKeyUpChangeEvent(this.focusser);
-            this.focusser.on("keyup-change input", this.bind(function(e) {
-                if (this.opts.minimumResultsForSearch >= 0) {
-                    e.stopPropagation();
-                    if (this.opened()) return;
-                    this.open();
-                }
-            }));
-
-            selection.on("mousedown touchstart", "abbr", this.bind(function (e) {
-                if (!this.isInterfaceEnabled()) {
-                    return;
-                }
-
-                this.clear();
-                killEventImmediately(e);
-                this.close();
-
-                if (this.selection) {
-                    this.selection.focus();
-                }
-            }));
-
-            selection.on("mousedown touchstart", this.bind(function (e) {
-                // Prevent IE from generating a click event on the body
-                reinsertElement(selection);
-
-                if (!this.container.hasClass("select2-container-active")) {
-                    this.opts.element.trigger($.Event("select2-focus"));
-                }
-
-                if (this.opened()) {
-                    this.close();
-                } else if (this.isInterfaceEnabled()) {
-                    this.open();
-                }
-
-                killEvent(e);
-            }));
-
-            dropdown.on("mousedown touchstart", this.bind(function() {
-                if (this.opts.shouldFocusInput(this)) {
-                    this.search.focus();
-                }
-            }));
-
-            selection.on("focus", this.bind(function(e) {
-                killEvent(e);
-            }));
-
-            this.focusser.on("focus", this.bind(function(){
-                if (!this.container.hasClass("select2-container-active")) {
-                    this.opts.element.trigger($.Event("select2-focus"));
-                }
-                this.container.addClass("select2-container-active");
-            })).on("blur", this.bind(function() {
-                if (!this.opened()) {
-                    this.container.removeClass("select2-container-active");
-                    this.opts.element.trigger($.Event("select2-blur"));
-                }
-            }));
-            this.search.on("focus", this.bind(function(){
-                if (!this.container.hasClass("select2-container-active")) {
-                    this.opts.element.trigger($.Event("select2-focus"));
-                }
-                this.container.addClass("select2-container-active");
-            }));
-
-            this.initContainerWidth();
-            this.opts.element.hide();
-            this.setPlaceholder();
-
-        },
-
-        // single
-        clear: function(triggerChange) {
-            var data=this.selection.data("select2-data");
-            if (data) { // guard against queued quick consecutive clicks
-                var evt = $.Event("select2-clearing");
-                this.opts.element.trigger(evt);
-                if (evt.isDefaultPrevented()) {
-                    return;
-                }
-                var placeholderOption = this.getPlaceholderOption();
-                this.opts.element.val(placeholderOption ? placeholderOption.val() : "");
-                this.selection.find(".select2-chosen").empty();
-                this.selection.removeData("select2-data");
-                this.setPlaceholder();
-
-                if (triggerChange !== false){
-                    this.opts.element.trigger({ type: "select2-removed", val: this.id(data), choice: data });
-                    this.triggerChange({removed:data});
-                }
-            }
-        },
-
-        /**
-         * Sets selection based on source element's value
-         */
-        // single
-        initSelection: function () {
-            var selected;
-            if (this.isPlaceholderOptionSelected()) {
-                this.updateSelection(null);
-                this.close();
-                this.setPlaceholder();
-            } else {
-                var self = this;
-                this.opts.initSelection.call(null, this.opts.element, function(selected){
-                    if (selected !== undefined && selected !== null) {
-                        self.updateSelection(selected);
-                        self.close();
-                        self.setPlaceholder();
-                        self.lastSearchTerm = self.search.val();
-                    }
-                });
-            }
-        },
-
-        isPlaceholderOptionSelected: function() {
-            var placeholderOption;
-            if (this.getPlaceholder() === undefined) return false; // no placeholder specified so no option should be considered
-            return ((placeholderOption = this.getPlaceholderOption()) !== undefined && placeholderOption.prop("selected"))
-                || (this.opts.element.val() === "")
-                || (this.opts.element.val() === undefined)
-                || (this.opts.element.val() === null);
-        },
-
-        // single
-        prepareOpts: function () {
-            var opts = this.parent.prepareOpts.apply(this, arguments),
-                self=this;
-
-            if (opts.element.get(0).tagName.toLowerCase() === "select") {
-                // install the selection initializer
-                opts.initSelection = function (element, callback) {
-                    var selected = element.find("option").filter(function() { return this.selected && !this.disabled });
-                    // a single select box always has a value, no need to null check 'selected'
-                    callback(self.optionToData(selected));
-                };
-            } else if ("data" in opts) {
-                // install default initSelection when applied to hidden input and data is local
-                opts.initSelection = opts.initSelection || function (element, callback) {
-                    var id = element.val();
-                    //search in data by id, storing the actual matching item
-                    var match = null;
-                    opts.query({
-                        matcher: function(term, text, el){
-                            var is_match = equal(id, opts.id(el));
-                            if (is_match) {
-                                match = el;
-                            }
-                            return is_match;
-                        },
-                        callback: !$.isFunction(callback) ? $.noop : function() {
-                            callback(match);
-                        }
-                    });
-                };
-            }
-
-            return opts;
-        },
-
-        // single
-        getPlaceholder: function() {
-            // if a placeholder is specified on a single select without a valid placeholder option ignore it
-            if (this.select) {
-                if (this.getPlaceholderOption() === undefined) {
-                    return undefined;
-                }
-            }
-
-            return this.parent.getPlaceholder.apply(this, arguments);
-        },
-
-        // single
-        setPlaceholder: function () {
-            var placeholder = this.getPlaceholder();
-
-            if (this.isPlaceholderOptionSelected() && placeholder !== undefined) {
-
-                // check for a placeholder option if attached to a select
-                if (this.select && this.getPlaceholderOption() === undefined) return;
-
-                this.selection.find(".select2-chosen").html(this.opts.escapeMarkup(placeholder));
-
-                this.selection.addClass("select2-default");
-
-                this.container.removeClass("select2-allowclear");
-            }
-        },
-
-        // single
-        postprocessResults: function (data, initial, noHighlightUpdate) {
-            var selected = 0, self = this, showSearchInput = true;
-
-            // find the selected element in the result list
-
-            this.findHighlightableChoices().each2(function (i, elm) {
-                if (equal(self.id(elm.data("select2-data")), self.opts.element.val())) {
-                    selected = i;
-                    return false;
-                }
-            });
-
-            // and highlight it
-            if (noHighlightUpdate !== false) {
-                if (initial === true && selected >= 0) {
-                    this.highlight(selected);
-                } else {
-                    this.highlight(0);
-                }
-            }
-
-            // hide the search box if this is the first we got the results and there are enough of them for search
-
-            if (initial === true) {
-                var min = this.opts.minimumResultsForSearch;
-                if (min >= 0) {
-                    this.showSearch(countResults(data.results) >= min);
-                }
-            }
-        },
-
-        // single
-        showSearch: function(showSearchInput) {
-            if (this.showSearchInput === showSearchInput) return;
-
-            this.showSearchInput = showSearchInput;
-
-            this.dropdown.find(".select2-search").toggleClass("select2-search-hidden", !showSearchInput);
-            this.dropdown.find(".select2-search").toggleClass("select2-offscreen", !showSearchInput);
-            //add "select2-with-searchbox" to the container if search box is shown
-            $(this.dropdown, this.container).toggleClass("select2-with-searchbox", showSearchInput);
-        },
-
-        // single
-        onSelect: function (data, options) {
-
-            if (!this.triggerSelect(data)) { return; }
-
-            var old = this.opts.element.val(),
-                oldData = this.data();
-
-            this.opts.element.val(this.id(data));
-            this.updateSelection(data);
-
-            this.opts.element.trigger({ type: "select2-selected", val: this.id(data), choice: data });
-
-            this.lastSearchTerm = this.search.val();
-            this.close();
-
-            if ((!options || !options.noFocus) && this.opts.shouldFocusInput(this)) {
-                this.focusser.focus();
-            }
-
-            if (!equal(old, this.id(data))) {
-                this.triggerChange({ added: data, removed: oldData });
-            }
-        },
-
-        // single
-        updateSelection: function (data) {
-
-            var container=this.selection.find(".select2-chosen"), formatted, cssClass;
-
-            this.selection.data("select2-data", data);
-
-            container.empty();
-            if (data !== null) {
-                formatted=this.opts.formatSelection(data, container, this.opts.escapeMarkup);
-            }
-            if (formatted !== undefined) {
-                container.append(formatted);
-            }
-            cssClass=this.opts.formatSelectionCssClass(data, container);
-            if (cssClass !== undefined) {
-                container.addClass(cssClass);
-            }
-
-            this.selection.removeClass("select2-default");
-
-            if (this.opts.allowClear && this.getPlaceholder() !== undefined) {
-                this.container.addClass("select2-allowclear");
-            }
-        },
-
-        // single
-        val: function () {
-            var val,
-                triggerChange = false,
-                data = null,
-                self = this,
-                oldData = this.data();
-
-            if (arguments.length === 0) {
-                return this.opts.element.val();
-            }
-
-            val = arguments[0];
-
-            if (arguments.length > 1) {
-                triggerChange = arguments[1];
-
-                if (this.opts.debug && console && console.warn) {
-                    console.warn(
-                        'Select2: The second option to `select2("val")` is not supported in Select2 4.0.0. ' +
-                        'The `change` event will always be triggered in 4.0.0.'
-                    );
-                }
-            }
-
-            if (this.select) {
-                if (this.opts.debug && console && console.warn) {
-                    console.warn(
-                        'Select2: Setting the value on a <select> using `select2("val")` is no longer supported in 4.0.0. ' +
-                        'You can use the `.val(newValue).trigger("change")` method provided by jQuery instead.'
-                    );
-                }
-
-                this.select
-                    .val(val)
-                    .find("option").filter(function() { return this.selected }).each2(function (i, elm) {
-                        data = self.optionToData(elm);
-                        return false;
-                    });
-                this.updateSelection(data);
-                this.setPlaceholder();
-                if (triggerChange) {
-                    this.triggerChange({added: data, removed:oldData});
-                }
-            } else {
-                // val is an id. !val is true for [undefined,null,'',0] - 0 is legal
-                if (!val && val !== 0) {
-                    this.clear(triggerChange);
-                    return;
-                }
-                if (this.opts.initSelection === undefined) {
-                    throw new Error("cannot call val() if initSelection() is not defined");
-                }
-                this.opts.element.val(val);
-                this.opts.initSelection(this.opts.element, function(data){
-                    self.opts.element.val(!data ? "" : self.id(data));
-                    self.updateSelection(data);
-                    self.setPlaceholder();
-                    if (triggerChange) {
-                        self.triggerChange({added: data, removed:oldData});
-                    }
-                });
-            }
-        },
-
-        // single
-        clearSearch: function () {
-            this.search.val("");
-            this.focusser.val("");
-        },
-
-        // single
-        data: function(value) {
-            var data,
-                triggerChange = false;
-
-            if (arguments.length === 0) {
-                data = this.selection.data("select2-data");
-                if (data == undefined) data = null;
-                return data;
-            } else {
-                if (this.opts.debug && console && console.warn) {
-                    console.warn(
-                        'Select2: The `select2("data")` method can no longer set selected values in 4.0.0, ' +
-                        'consider using the `.val()` method instead.'
-                    );
-                }
-
-                if (arguments.length > 1) {
-                    triggerChange = arguments[1];
-                }
-                if (!value) {
-                    this.clear(triggerChange);
-                } else {
-                    data = this.data();
-                    this.opts.element.val(!value ? "" : this.id(value));
-                    this.updateSelection(value);
-                    if (triggerChange) {
-                        this.triggerChange({added: value, removed:data});
-                    }
-                }
-            }
-        }
-    });
-
-    MultiSelect2 = clazz(AbstractSelect2, {
-
-        // multi
-        createContainer: function () {
-            var container = $(document.createElement("div")).attr({
-                "class": "select2-container select2-container-multi"
-            }).html([
-                "<ul class='select2-choices'>",
-                "  <li class='select2-search-field'>",
-                "    <label for='' class='select2-offscreen'></label>",
-                "    <input type='text' autocomplete='off' autocorrect='off' autocapitalize='off' spellcheck='false' class='select2-input'>",
-                "  </li>",
-                "</ul>",
-                "<div class='select2-drop select2-drop-multi select2-display-none'>",
-                "   <ul class='select2-results'>",
-                "   </ul>",
-                "</div>"].join(""));
-            return container;
-        },
-
-        // multi
-        prepareOpts: function () {
-            var opts = this.parent.prepareOpts.apply(this, arguments),
-                self=this;
-
-            // TODO validate placeholder is a string if specified
-            if (opts.element.get(0).tagName.toLowerCase() === "select") {
-                // install the selection initializer
-                opts.initSelection = function (element, callback) {
-
-                    var data = [];
-
-                    element.find("option").filter(function() { return this.selected && !this.disabled }).each2(function (i, elm) {
-                        data.push(self.optionToData(elm));
-                    });
-                    callback(data);
-                };
-            } else if ("data" in opts) {
-                // install default initSelection when applied to hidden input and data is local
-                opts.initSelection = opts.initSelection || function (element, callback) {
-                    var ids = splitVal(element.val(), opts.separator, opts.transformVal);
-                    //search in data by array of ids, storing matching items in a list
-                    var matches = [];
-                    opts.query({
-                        matcher: function(term, text, el){
-                            var is_match = $.grep(ids, function(id) {
-                                return equal(id, opts.id(el));
-                            }).length;
-                            if (is_match) {
-                                matches.push(el);
-                            }
-                            return is_match;
-                        },
-                        callback: !$.isFunction(callback) ? $.noop : function() {
-                            // reorder matches based on the order they appear in the ids array because right now
-                            // they are in the order in which they appear in data array
-                            var ordered = [];
-                            for (var i = 0; i < ids.length; i++) {
-                                var id = ids[i];
-                                for (var j = 0; j < matches.length; j++) {
-                                    var match = matches[j];
-                                    if (equal(id, opts.id(match))) {
-                                        ordered.push(match);
-                                        matches.splice(j, 1);
-                                        break;
-                                    }
-                                }
-                            }
-                            callback(ordered);
-                        }
-                    });
-                };
-            }
-
-            return opts;
-        },
-
-        // multi
-        selectChoice: function (choice) {
-
-            var selected = this.container.find(".select2-search-choice-focus");
-            if (selected.length && choice && choice[0] == selected[0]) {
-
-            } else {
-                if (selected.length) {
-                    this.opts.element.trigger("choice-deselected", selected);
-                }
-                selected.removeClass("select2-search-choice-focus");
-                if (choice && choice.length) {
-                    this.close();
-                    choice.addClass("select2-search-choice-focus");
-                    this.opts.element.trigger("choice-selected", choice);
-                }
-            }
-        },
-
-        // multi
-        destroy: function() {
-            $("label[for='" + this.search.attr('id') + "']")
-                .attr('for', this.opts.element.attr("id"));
-            this.parent.destroy.apply(this, arguments);
-
-            cleanupJQueryElements.call(this,
-                "searchContainer",
-                "selection"
-            );
-        },
-
-        // multi
-        initContainer: function () {
-
-            var selector = ".select2-choices", selection;
-
-            this.searchContainer = this.container.find(".select2-search-field");
-            this.selection = selection = this.container.find(selector);
-
-            var _this = this;
-            this.selection.on("click", ".select2-container:not(.select2-container-disabled) .select2-search-choice:not(.select2-locked)", function (e) {
-                _this.search[0].focus();
-                _this.selectChoice($(this));
-            });
-
-            // rewrite labels from original element to focusser
-            this.search.attr("id", "s2id_autogen"+nextUid());
-
-            this.search.prev()
-                .text($("label[for='" + this.opts.element.attr("id") + "']").text())
-                .attr('for', this.search.attr('id'));
-            this.opts.element.on('focus.select2', this.bind(function () { this.focus(); }));
-
-            this.search.on("input paste", this.bind(function() {
-                if (this.search.attr('placeholder') && this.search.val().length == 0) return;
-                if (!this.isInterfaceEnabled()) return;
-                if (!this.opened()) {
-                    this.open();
-                }
-            }));
-
-            this.search.attr("tabindex", this.elementTabIndex);
-
-            this.keydowns = 0;
-            this.search.on("keydown", this.bind(function (e) {
-                if (!this.isInterfaceEnabled()) return;
-
-                ++this.keydowns;
-                var selected = selection.find(".select2-search-choice-focus");
-                var prev = selected.prev(".select2-search-choice:not(.select2-locked)");
-                var next = selected.next(".select2-search-choice:not(.select2-locked)");
-                var pos = getCursorInfo(this.search);
-
-                if (selected.length &&
-                    (e.which == KEY.LEFT || e.which == KEY.RIGHT || e.which == KEY.BACKSPACE || e.which == KEY.DELETE || e.which == KEY.ENTER)) {
-                    var selectedChoice = selected;
-                    if (e.which == KEY.LEFT && prev.length) {
-                        selectedChoice = prev;
-                    }
-                    else if (e.which == KEY.RIGHT) {
-                        selectedChoice = next.length ? next : null;
-                    }
-                    else if (e.which === KEY.BACKSPACE) {
-                        if (this.unselect(selected.first())) {
-                            this.search.width(10);
-                            selectedChoice = prev.length ? prev : next;
-                        }
-                    } else if (e.which == KEY.DELETE) {
-                        if (this.unselect(selected.first())) {
-                            this.search.width(10);
-                            selectedChoice = next.length ? next : null;
-                        }
-                    } else if (e.which == KEY.ENTER) {
-                        selectedChoice = null;
-                    }
-
-                    this.selectChoice(selectedChoice);
-                    killEvent(e);
-                    if (!selectedChoice || !selectedChoice.length) {
-                        this.open();
-                    }
-                    return;
-                } else if (((e.which === KEY.BACKSPACE && this.keydowns == 1)
-                    || e.which == KEY.LEFT) && (pos.offset == 0 && !pos.length)) {
-
-                    this.selectChoice(selection.find(".select2-search-choice:not(.select2-locked)").last());
-                    killEvent(e);
-                    return;
-                } else {
-                    this.selectChoice(null);
-                }
-
-                if (this.opened()) {
-                    switch (e.which) {
-                    case KEY.UP:
-                    case KEY.DOWN:
-                        this.moveHighlight((e.which === KEY.UP) ? -1 : 1);
-                        killEvent(e);
-                        return;
-                    case KEY.ENTER:
-                        this.selectHighlighted();
-                        killEvent(e);
-                        return;
-                    case KEY.TAB:
-                        this.selectHighlighted({noFocus:true});
-                        this.close();
-                        return;
-                    case KEY.ESC:
-                        this.cancel(e);
-                        killEvent(e);
-                        return;
-                    }
-                }
-
-                if (e.which === KEY.TAB || KEY.isControl(e) || KEY.isFunctionKey(e)
-                 || e.which === KEY.BACKSPACE || e.which === KEY.ESC) {
-                    return;
-                }
-
-                if (e.which === KEY.ENTER) {
-                    if (this.opts.openOnEnter === false) {
-                        return;
-                    } else if (e.altKey || e.ctrlKey || e.shiftKey || e.metaKey) {
-                        return;
-                    }
-                }
-
-                this.open();
-
-                if (e.which === KEY.PAGE_UP || e.which === KEY.PAGE_DOWN) {
-                    // prevent the page from scrolling
-                    killEvent(e);
-                }
-
-                if (e.which === KEY.ENTER) {
-                    // prevent form from being submitted
-                    killEvent(e);
-                }
-
-            }));
-
-            this.search.on("keyup", this.bind(function (e) {
-                this.keydowns = 0;
-                this.resizeSearch();
-            })
-            );
-
-            this.search.on("blur", this.bind(function(e) {
-                this.container.removeClass("select2-container-active");
-                this.search.removeClass("select2-focused");
-                this.selectChoice(null);
-                if (!this.opened()) this.clearSearch();
-                e.stopImmediatePropagation();
-                this.opts.element.trigger($.Event("select2-blur"));
-            }));
-
-            this.container.on("click", selector, this.bind(function (e) {
-                if (!this.isInterfaceEnabled()) return;
-                if ($(e.target).closest(".select2-search-choice").length > 0) {
-                    // clicked inside a select2 search choice, do not open
-                    return;
-                }
-                this.selectChoice(null);
-                this.clearPlaceholder();
-                if (!this.container.hasClass("select2-container-active")) {
-                    this.opts.element.trigger($.Event("select2-focus"));
-                }
-                this.open();
-                this.focusSearch();
-                e.preventDefault();
-            }));
-
-            this.container.on("focus", selector, this.bind(function () {
-                if (!this.isInterfaceEnabled()) return;
-                if (!this.container.hasClass("select2-container-active")) {
-                    this.opts.element.trigger($.Event("select2-focus"));
-                }
-                this.container.addClass("select2-container-active");
-                this.dropdown.addClass("select2-drop-active");
-                this.clearPlaceholder();
-            }));
-
-            this.initContainerWidth();
-            this.opts.element.hide();
-
-            // set the placeholder if necessary
-            this.clearSearch();
-        },
-
-        // multi
-        enableInterface: function() {
-            if (this.parent.enableInterface.apply(this, arguments)) {
-                this.search.prop("disabled", !this.isInterfaceEnabled());
-            }
-        },
-
-        // multi
-        initSelection: function () {
-            var data;
-            if (this.opts.element.val() === "" && this.opts.element.text() === "") {
-                this.updateSelection([]);
-                this.close();
-                // set the placeholder if necessary
-                this.clearSearch();
-            }
-            if (this.select || this.opts.element.val() !== "") {
-                var self = this;
-                this.opts.initSelection.call(null, this.opts.element, function(data){
-                    if (data !== undefined && data !== null) {
-                        self.updateSelection(data);
-                        self.close();
-                        // set the placeholder if necessary
-                        self.clearSearch();
-                    }
-                });
-            }
-        },
-
-        // multi
-        clearSearch: function () {
-            var placeholder = this.getPlaceholder(),
-                maxWidth = this.getMaxSearchWidth();
-
-            if (placeholder !== undefined  && this.getVal().length === 0 && this.search.hasClass("select2-focused") === false) {
-                this.search.val(placeholder).addClass("select2-default");
-                // stretch the search box to full width of the container so as much of the placeholder is visible as possible
-                // we could call this.resizeSearch(), but we do not because that requires a sizer and we do not want to create one so early because of a firefox bug, see #944
-                this.search.width(maxWidth > 0 ? maxWidth : this.container.css("width"));
-            } else {
-                this.search.val("").width(10);
-            }
-        },
-
-        // multi
-        clearPlaceholder: function () {
-            if (this.search.hasClass("select2-default")) {
-                this.search.val("").removeClass("select2-default");
-            }
-        },
-
-        // multi
-        opening: function () {
-            this.clearPlaceholder(); // should be done before super so placeholder is not used to search
-            this.resizeSearch();
-
-            this.parent.opening.apply(this, arguments);
-
-            this.focusSearch();
-
-            this.prefillNextSearchTerm();
-            this.updateResults(true);
-
-            if (this.opts.shouldFocusInput(this)) {
-                this.search.focus();
-            }
-            this.opts.element.trigger($.Event("select2-open"));
-        },
-
-        // multi
-        close: function () {
-            if (!this.opened()) return;
-            this.parent.close.apply(this, arguments);
-        },
-
-        // multi
-        focus: function () {
-            this.close();
-            this.search.focus();
-        },
-
-        // multi
-        isFocused: function () {
-            return this.search.hasClass("select2-focused");
-        },
-
-        // multi
-        updateSelection: function (data) {
-            var ids = {}, filtered = [], self = this;
-
-            // filter out duplicates
-            $(data).each(function () {
-                if (!(self.id(this) in ids)) {
-                    ids[self.id(this)] = 0;
-                    filtered.push(this);
-                }
-            });
-
-            this.selection.find(".select2-search-choice").remove();
-            this.addSelectedChoice(filtered);
-            self.postprocessResults();
-        },
-
-        // multi
-        tokenize: function() {
-            var input = this.search.val();
-            input = this.opts.tokenizer.call(this, input, this.data(), this.bind(this.onSelect), this.opts);
-            if (input != null && input != undefined) {
-                this.search.val(input);
-                if (input.length > 0) {
-                    this.open();
-                }
-            }
-
-        },
-
-        // multi
-        onSelect: function (data, options) {
-
-            if (!this.triggerSelect(data) || data.text === "") { return; }
-
-            this.addSelectedChoice(data);
-
-            this.opts.element.trigger({ type: "selected", val: this.id(data), choice: data });
-
-            // keep track of the search's value before it gets cleared
-            this.lastSearchTerm = this.search.val();
-
-            this.clearSearch();
-            this.updateResults();
-
-            if (this.select || !this.opts.closeOnSelect) this.postprocessResults(data, false, this.opts.closeOnSelect===true);
-
-            if (this.opts.closeOnSelect) {
-                this.close();
-                this.search.width(10);
-            } else {
-                if (this.countSelectableResults()>0) {
-                    this.search.width(10);
-                    this.resizeSearch();
-                    if (this.getMaximumSelectionSize() > 0 && this.val().length >= this.getMaximumSelectionSize()) {
-                        // if we reached max selection size repaint the results so choices
-                        // are replaced with the max selection reached message
-                        this.updateResults(true);
-                    } else {
-                        // initializes search's value with nextSearchTerm and update search result
-                        if (this.prefillNextSearchTerm()) {
-                            this.updateResults();
-                        }
-                    }
-                    this.positionDropdown();
-                } else {
-                    // if nothing left to select close
-                    this.close();
-                    this.search.width(10);
-                }
-            }
-
-            // since its not possible to select an element that has already been
-            // added we do not need to check if this is a new element before firing change
-            this.triggerChange({ added: data });
-
-            if (!options || !options.noFocus)
-                this.focusSearch();
-        },
-
-        // multi
-        cancel: function () {
-            this.close();
-            this.focusSearch();
-        },
-
-        addSelectedChoice: function (data) {
-            var val = this.getVal(), self = this;
-            $(data).each(function () {
-                val.push(self.createChoice(this));
-            });
-            this.setVal(val);
-        },
-
-        createChoice: function (data) {
-            var enableChoice = !data.locked,
-                enabledItem = $(
-                    "<li class='select2-search-choice'>" +
-                    "    <div></div>" +
-                    "    <a href='#' class='select2-search-choice-close' tabindex='-1'></a>" +
-                    "</li>"),
-                disabledItem = $(
-                    "<li class='select2-search-choice select2-locked'>" +
-                    "<div></div>" +
-                    "</li>");
-            var choice = enableChoice ? enabledItem : disabledItem,
-                id = this.id(data),
-                formatted,
-                cssClass;
-
-            formatted=this.opts.formatSelection(data, choice.find("div"), this.opts.escapeMarkup);
-            if (formatted != undefined) {
-                choice.find("div").replaceWith($("<div></div>").html(formatted));
-            }
-            cssClass=this.opts.formatSelectionCssClass(data, choice.find("div"));
-            if (cssClass != undefined) {
-                choice.addClass(cssClass);
-            }
-
-            if(enableChoice){
-              choice.find(".select2-search-choice-close")
-                  .on("mousedown", killEvent)
-                  .on("click dblclick", this.bind(function (e) {
-                  if (!this.isInterfaceEnabled()) return;
-
-                  this.unselect($(e.target));
-                  this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus");
-                  killEvent(e);
-                  this.close();
-                  this.focusSearch();
-              })).on("focus", this.bind(function () {
-                  if (!this.isInterfaceEnabled()) return;
-                  this.container.addClass("select2-container-active");
-                  this.dropdown.addClass("select2-drop-active");
-              }));
-            }
-
-            choice.data("select2-data", data);
-            choice.insertBefore(this.searchContainer);
-
-            return id;
-        },
-
-        // multi
-        unselect: function (selected) {
-            var val = this.getVal(),
-                data,
-                index;
-            selected = selected.closest(".select2-search-choice");
-
-            if (selected.length === 0) {
-                throw "Invalid argument: " + selected + ". Must be .select2-search-choice";
-            }
-
-            data = selected.data("select2-data");
-
-            if (!data) {
-                // prevent a race condition when the 'x' is clicked really fast repeatedly the event can be queued
-                // and invoked on an element already removed
-                return;
-            }
-
-            var evt = $.Event("select2-removing");
-            evt.val = this.id(data);
-            evt.choice = data;
-            this.opts.element.trigger(evt);
-
-            if (evt.isDefaultPrevented()) {
-                return false;
-            }
-
-            while((index = indexOf(this.id(data), val)) >= 0) {
-                val.splice(index, 1);
-                this.setVal(val);
-                if (this.select) this.postprocessResults();
-            }
-
-            selected.remove();
-
-            this.opts.element.trigger({ type: "select2-removed", val: this.id(data), choice: data });
-            this.triggerChange({ removed: data });
-
-            return true;
-        },
-
-        // multi
-        postprocessResults: function (data, initial, noHighlightUpdate) {
-            var val = this.getVal(),
-                choices = this.results.find(".select2-result"),
-                compound = this.results.find(".select2-result-with-children"),
-                self = this;
-
-            choices.each2(function (i, choice) {
-                var id = self.id(choice.data("select2-data"));
-                if (indexOf(id, val) >= 0) {
-                    choice.addClass("select2-selected");
-                    // mark all children of the selected parent as selected
-                    choice.find(".select2-result-selectable").addClass("select2-selected");
-                }
-            });
-
-            compound.each2(function(i, choice) {
-                // hide an optgroup if it doesn't have any selectable children
-                if (!choice.is('.select2-result-selectable')
-                    && choice.find(".select2-result-selectable:not(.select2-selected)").length === 0) {
-                    choice.addClass("select2-selected");
-                }
-            });
-
-            if (this.highlight() == -1 && noHighlightUpdate !== false && this.opts.closeOnSelect === true){
-                self.highlight(0);
-            }
-
-            //If all results are chosen render formatNoMatches
-            if(!this.opts.createSearchChoice && !choices.filter('.select2-result:not(.select2-selected)').length > 0){
-                if(!data || data && !data.more && this.results.find(".select2-no-results").length === 0) {
-                    if (checkFormatter(self.opts.formatNoMatches, "formatNoMatches")) {
-                        this.results.append("<li class='select2-no-results'>" + evaluate(self.opts.formatNoMatches, self.opts.element, self.search.val()) + "</li>");
-                    }
-                }
-            }
-
-        },
-
-        // multi
-        getMaxSearchWidth: function() {
-            return this.selection.width() - getSideBorderPadding(this.search);
-        },
-
-        // multi
-        resizeSearch: function () {
-            var minimumWidth, left, maxWidth, containerLeft, searchWidth,
-                sideBorderPadding = getSideBorderPadding(this.search);
-
-            minimumWidth = measureTextWidth(this.search) + 10;
-
-            left = this.search.offset().left;
-
-            maxWidth = this.selection.width();
-            containerLeft = this.selection.offset().left;
-
-            searchWidth = maxWidth - (left - containerLeft) - sideBorderPadding;
-
-            if (searchWidth < minimumWidth) {
-                searchWidth = maxWidth - sideBorderPadding;
-            }
-
-            if (searchWidth < 40) {
-                searchWidth = maxWidth - sideBorderPadding;
-            }
-
-            if (searchWidth <= 0) {
-              searchWidth = minimumWidth;
-            }
-
-            this.search.width(Math.floor(searchWidth));
-        },
-
-        // multi
-        getVal: function () {
-            var val;
-            if (this.select) {
-                val = this.select.val();
-                return val === null ? [] : val;
-            } else {
-                val = this.opts.element.val();
-                return splitVal(val, this.opts.separator, this.opts.transformVal);
-            }
-        },
-
-        // multi
-        setVal: function (val) {
-            if (this.select) {
-                this.select.val(val);
-            } else {
-                var unique = [], valMap = {};
-                // filter out duplicates
-                $(val).each(function () {
-                    if (!(this in valMap)) {
-                        unique.push(this);
-                        valMap[this] = 0;
-                    }
-                });
-                this.opts.element.val(unique.length === 0 ? "" : unique.join(this.opts.separator));
-            }
-        },
-
-        // multi
-        buildChangeDetails: function (old, current) {
-            var current = current.slice(0),
-                old = old.slice(0);
-
-            // remove intersection from each array
-            for (var i = 0; i < current.length; i++) {
-                for (var j = 0; j < old.length; j++) {
-                    if (equal(this.opts.id(current[i]), this.opts.id(old[j]))) {
-                        current.splice(i, 1);
-                        i--;
-                        old.splice(j, 1);
-                        break;
-                    }
-                }
-            }
-
-            return {added: current, removed: old};
-        },
-
-
-        // multi
-        val: function (val, triggerChange) {
-            var oldData, self=this;
-
-            if (arguments.length === 0) {
-                return this.getVal();
-            }
-
-            oldData=this.data();
-            if (!oldData.length) oldData=[];
-
-            // val is an id. !val is true for [undefined,null,'',0] - 0 is legal
-            if (!val && val !== 0) {
-                this.opts.element.val("");
-                this.updateSelection([]);
-                this.clearSearch();
-                if (triggerChange) {
-                    this.triggerChange({added: this.data(), removed: oldData});
-                }
-                return;
-            }
-
-            // val is a list of ids
-            this.setVal(val);
-
-            if (this.select) {
-                this.opts.initSelection(this.select, this.bind(this.updateSelection));
-                if (triggerChange) {
-                    this.triggerChange(this.buildChangeDetails(oldData, this.data()));
-                }
-            } else {
-                if (this.opts.initSelection === undefined) {
-                    throw new Error("val() cannot be called if initSelection() is not defined");
-                }
-
-                this.opts.initSelection(this.opts.element, function(data){
-                    var ids=$.map(data, self.id);
-                    self.setVal(ids);
-                    self.updateSelection(data);
-                    self.clearSearch();
-                    if (triggerChange) {
-                        self.triggerChange(self.buildChangeDetails(oldData, self.data()));
-                    }
-                });
-            }
-            this.clearSearch();
-        },
-
-        // multi
-        onSortStart: function() {
-            if (this.select) {
-                throw new Error("Sorting of elements is not supported when attached to <select>. Attach to <input type='hidden'/> instead.");
-            }
-
-            // collapse search field into 0 width so its container can be collapsed as well
-            this.search.width(0);
-            // hide the container
-            this.searchContainer.hide();
-        },
-
-        // multi
-        onSortEnd:function() {
-
-            var val=[], self=this;
-
-            // show search and move it to the end of the list
-            this.searchContainer.show();
-            // make sure the search container is the last item in the list
-            this.searchContainer.appendTo(this.searchContainer.parent());
-            // since we collapsed the width in dragStarted, we resize it here
-            this.resizeSearch();
-
-            // update selection
-            this.selection.find(".select2-search-choice").each(function() {
-                val.push(self.opts.id($(this).data("select2-data")));
-            });
-            this.setVal(val);
-            this.triggerChange();
-        },
-
-        // multi
-        data: function(values, triggerChange) {
-            var self=this, ids, old;
-            if (arguments.length === 0) {
-                 return this.selection
-                     .children(".select2-search-choice")
-                     .map(function() { return $(this).data("select2-data"); })
-                     .get();
-            } else {
-                old = this.data();
-                if (!values) { values = []; }
-                ids = $.map(values, function(e) { return self.opts.id(e); });
-                this.setVal(ids);
-                this.updateSelection(values);
-                this.clearSearch();
-                if (triggerChange) {
-                    this.triggerChange(this.buildChangeDetails(old, this.data()));
-                }
-            }
-        }
-    });
-
-    $.fn.select2 = function () {
-
-        var args = Array.prototype.slice.call(arguments, 0),
-            opts,
-            select2,
-            method, value, multiple,
-            allowedMethods = ["val", "destroy", "opened", "open", "close", "focus", "isFocused", "container", "dropdown", "onSortStart", "onSortEnd", "enable", "disable", "readonly", "positionDropdown", "data", "search"],
-            valueMethods = ["opened", "isFocused", "container", "dropdown"],
-            propertyMethods = ["val", "data"],
-            methodsMap = { search: "externalSearch" };
-
-        this.each(function () {
-            if (args.length === 0 || typeof(args[0]) === "object") {
-                opts = args.length === 0 ? {} : $.extend({}, args[0]);
-                opts.element = $(this);
-
-                if (opts.element.get(0).tagName.toLowerCase() === "select") {
-                    multiple = opts.element.prop("multiple");
-                } else {
-                    multiple = opts.multiple || false;
-                    if ("tags" in opts) {opts.multiple = multiple = true;}
-                }
-
-                select2 = multiple ? new window.Select2["class"].multi() : new window.Select2["class"].single();
-                select2.init(opts);
-            } else if (typeof(args[0]) === "string") {
-
-                if (indexOf(args[0], allowedMethods) < 0) {
-                    throw "Unknown method: " + args[0];
-                }
-
-                value = undefined;
-                select2 = $(this).data("select2");
-                if (select2 === undefined) return;
-
-                method=args[0];
-
-                if (method === "container") {
-                    value = select2.container;
-                } else if (method === "dropdown") {
-                    value = select2.dropdown;
-                } else {
-                    if (methodsMap[method]) method = methodsMap[method];
-
-                    value = select2[method].apply(select2, args.slice(1));
-                }
-                if (indexOf(args[0], valueMethods) >= 0
-                    || (indexOf(args[0], propertyMethods) >= 0 && args.length == 1)) {
-                    return false; // abort the iteration, ready to return first matched value
-                }
-            } else {
-                throw "Invalid arguments to select2 plugin: " + args;
-            }
-        });
-        return (value === undefined) ? this : value;
-    };
-
-    // plugin defaults, accessible to users
-    $.fn.select2.defaults = {
-        debug: false,
-        width: "copy",
-        loadMorePadding: 0,
-        closeOnSelect: true,
-        openOnEnter: true,
-        containerCss: {},
-        dropdownCss: {},
-        containerCssClass: "",
-        dropdownCssClass: "",
-        formatResult: function(result, container, query, escapeMarkup) {
-            var markup=[];
-            markMatch(this.text(result), query.term, markup, escapeMarkup);
-            return markup.join("");
-        },
-        transformVal: function(val) {
-            return $.trim(val);
-        },
-        formatSelection: function (data, container, escapeMarkup) {
-            return data ? escapeMarkup(this.text(data)) : undefined;
-        },
-        sortResults: function (results, container, query) {
-            return results;
-        },
-        formatResultCssClass: function(data) {return data.css;},
-        formatSelectionCssClass: function(data, container) {return undefined;},
-        minimumResultsForSearch: 0,
-        minimumInputLength: 0,
-        maximumInputLength: null,
-        maximumSelectionSize: 0,
-        id: function (e) { return e == undefined ? null : e.id; },
-        text: function (e) {
-          if (e && this.data && this.data.text) {
-            if ($.isFunction(this.data.text)) {
-              return this.data.text(e);
-            } else {
-              return e[this.data.text];
-            }
-          } else {
-            return e.text;
-          }
-        },
-        matcher: function(term, text) {
-            return stripDiacritics(''+text).toUpperCase().indexOf(stripDiacritics(''+term).toUpperCase()) >= 0;
-        },
-        separator: ",",
-        tokenSeparators: [],
-        tokenizer: defaultTokenizer,
-        escapeMarkup: defaultEscapeMarkup,
-        blurOnChange: false,
-        selectOnBlur: false,
-        adaptContainerCssClass: function(c) { return c; },
-        adaptDropdownCssClass: function(c) { return null; },
-        nextSearchTerm: function(selectedObject, currentSearchTerm) { return undefined; },
-        searchInputPlaceholder: '',
-        createSearchChoicePosition: 'top',
-        shouldFocusInput: function (instance) {
-            // Attempt to detect touch devices
-            var supportsTouchEvents = (('ontouchstart' in window) ||
-                                       (navigator.msMaxTouchPoints > 0));
-
-            // Only devices which support touch events should be special cased
-            if (!supportsTouchEvents) {
-                return true;
-            }
-
-            // Never focus the input if search is disabled
-            if (instance.opts.minimumResultsForSearch < 0) {
-                return false;
-            }
-
-            return true;
-        }
-    };
-
-    $.fn.select2.locales = [];
-
-    $.fn.select2.locales['en'] = {
-         formatMatches: function (matches) { if (matches === 1) { return "One result is available, press enter to select it."; } return matches + " results are available, use up and down arrow keys to navigate."; },
-         formatNoMatches: function () { return "No matches found"; },
-         formatAjaxError: function (jqXHR, textStatus, errorThrown) { return "Loading failed"; },
-         formatInputTooShort: function (input, min) { var n = min - input.length; return "Please enter " + n + " or more character" + (n == 1 ? "" : "s"); },
-         formatInputTooLong: function (input, max) { var n = input.length - max; return "Please delete " + n + " character" + (n == 1 ? "" : "s"); },
-         formatSelectionTooBig: function (limit) { return "You can only select " + limit + " item" + (limit == 1 ? "" : "s"); },
-         formatLoadMore: function (pageNumber) { return "Loading more results…"; },
-         formatSearching: function () { return "Searching…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['en']);
-
-    $.fn.select2.ajaxDefaults = {
-        transport: $.ajax,
-        params: {
-            type: "GET",
-            cache: false,
-            dataType: "json"
-        }
-    };
-
-    // exports
-    window.Select2 = {
-        query: {
-            ajax: ajax,
-            local: local,
-            tags: tags
-        }, util: {
-            debounce: debounce,
-            markMatch: markMatch,
-            escapeMarkup: defaultEscapeMarkup,
-            stripDiacritics: stripDiacritics
-        }, "class": {
-            "abstract": AbstractSelect2,
-            "single": SingleSelect2,
-            "multi": MultiSelect2
-        }
-    };
-
-}(jQuery));
diff --git a/vendor/assets/stylesheets/qunit.css b/vendor/assets/stylesheets/qunit.css
new file mode 100644
index 00000000000..859544eb228
--- /dev/null
+++ b/vendor/assets/stylesheets/qunit.css
@@ -0,0 +1,436 @@
+/*!
+ * QUnit 2.6.0
+ * https://qunitjs.com/
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license
+ * https://jquery.org/license
+ *
+ * Date: 2018-03-27T02:18Z
+ */
+
+/** Font Family and Sizes */
+
+#qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-filteredTest, #qunit-userAgent, #qunit-testresult {
+	font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif;
+}
+
+#qunit-testrunner-toolbar, #qunit-filteredTest, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; }
+#qunit-tests { font-size: smaller; }
+
+
+/** Resets */
+
+#qunit-tests, #qunit-header, #qunit-banner, #qunit-filteredTest, #qunit-userAgent, #qunit-testresult, #qunit-modulefilter {
+	margin: 0;
+	padding: 0;
+}
+
+
+/** Header (excluding toolbar) */
+
+#qunit-header {
+	padding: 0.5em 0 0.5em 1em;
+
+	color: #8699A4;
+	background-color: #0D3349;
+
+	font-size: 1.5em;
+	line-height: 1em;
+	font-weight: 400;
+
+	border-radius: 5px 5px 0 0;
+}
+
+#qunit-header a {
+	text-decoration: none;
+	color: #C2CCD1;
+}
+
+#qunit-header a:hover,
+#qunit-header a:focus {
+	color: #FFF;
+}
+
+#qunit-banner {
+	height: 5px;
+}
+
+#qunit-filteredTest {
+	padding: 0.5em 1em 0.5em 1em;
+	color: #366097;
+	background-color: #F4FF77;
+}
+
+#qunit-userAgent {
+	padding: 0.5em 1em 0.5em 1em;
+	color: #FFF;
+	background-color: #2B81AF;
+	text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
+}
+
+
+/** Toolbar */
+
+#qunit-testrunner-toolbar {
+	padding: 0.5em 1em 0.5em 1em;
+	color: #5E740B;
+	background-color: #EEE;
+}
+
+#qunit-testrunner-toolbar .clearfix {
+	height: 0;
+	clear: both;
+}
+
+#qunit-testrunner-toolbar label {
+	display: inline-block;
+}
+
+#qunit-testrunner-toolbar input[type=checkbox],
+#qunit-testrunner-toolbar input[type=radio] {
+	margin: 3px;
+	vertical-align: -2px;
+}
+
+#qunit-testrunner-toolbar input[type=text] {
+	box-sizing: border-box;
+	height: 1.6em;
+}
+
+.qunit-url-config,
+.qunit-filter,
+#qunit-modulefilter {
+	display: inline-block;
+	line-height: 2.1em;
+}
+
+.qunit-filter,
+#qunit-modulefilter {
+	float: right;
+	position: relative;
+	margin-left: 1em;
+}
+
+.qunit-url-config label {
+	margin-right: 0.5em;
+}
+
+#qunit-modulefilter-search {
+	box-sizing: border-box;
+	width: 400px;
+}
+
+#qunit-modulefilter-search-container:after {
+	position: absolute;
+	right: 0.3em;
+	content: "\25bc";
+	color: black;
+}
+
+#qunit-modulefilter-dropdown {
+	/* align with #qunit-modulefilter-search */
+	box-sizing: border-box;
+	width: 400px;
+	position: absolute;
+	right: 0;
+	top: 50%;
+	margin-top: 0.8em;
+
+	border: 1px solid #D3D3D3;
+	border-top: none;
+	border-radius: 0 0 .25em .25em;
+	color: #000;
+	background-color: #F5F5F5;
+	z-index: 99;
+}
+
+#qunit-modulefilter-dropdown a {
+	color: inherit;
+	text-decoration: none;
+}
+
+#qunit-modulefilter-dropdown .clickable.checked {
+	font-weight: bold;
+	color: #000;
+	background-color: #D2E0E6;
+}
+
+#qunit-modulefilter-dropdown .clickable:hover {
+	color: #FFF;
+	background-color: #0D3349;
+}
+
+#qunit-modulefilter-actions {
+	display: block;
+	overflow: auto;
+
+	/* align with #qunit-modulefilter-dropdown-list */
+	font: smaller/1.5em sans-serif;
+}
+
+#qunit-modulefilter-dropdown #qunit-modulefilter-actions > * {
+	box-sizing: border-box;
+	max-height: 2.8em;
+	display: block;
+	padding: 0.4em;
+}
+
+#qunit-modulefilter-dropdown #qunit-modulefilter-actions > button {
+	float: right;
+	font: inherit;
+}
+
+#qunit-modulefilter-dropdown #qunit-modulefilter-actions > :last-child {
+	/* insert padding to align with checkbox margins */
+	padding-left: 3px;
+}
+
+#qunit-modulefilter-dropdown-list {
+	max-height: 200px;
+	overflow-y: auto;
+	margin: 0;
+	border-top: 2px groove threedhighlight;
+	padding: 0.4em 0 0;
+	font: smaller/1.5em sans-serif;
+}
+
+#qunit-modulefilter-dropdown-list li {
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+#qunit-modulefilter-dropdown-list .clickable {
+	display: block;
+	padding-left: 0.15em;
+}
+
+
+/** Tests: Pass/Fail */
+
+#qunit-tests {
+	list-style-position: inside;
+}
+
+#qunit-tests li {
+	padding: 0.4em 1em 0.4em 1em;
+	border-bottom: 1px solid #FFF;
+	list-style-position: inside;
+}
+
+#qunit-tests > li {
+	display: none;
+}
+
+#qunit-tests li.running,
+#qunit-tests li.pass,
+#qunit-tests li.fail,
+#qunit-tests li.skipped,
+#qunit-tests li.aborted {
+	display: list-item;
+}
+
+#qunit-tests.hidepass {
+	position: relative;
+}
+
+#qunit-tests.hidepass li.running,
+#qunit-tests.hidepass li.pass:not(.todo) {
+	visibility: hidden;
+	position: absolute;
+	width:   0;
+	height:  0;
+	padding: 0;
+	border:  0;
+	margin:  0;
+}
+
+#qunit-tests li strong {
+	cursor: pointer;
+}
+
+#qunit-tests li.skipped strong {
+	cursor: default;
+}
+
+#qunit-tests li a {
+	padding: 0.5em;
+	color: #C2CCD1;
+	text-decoration: none;
+}
+
+#qunit-tests li p a {
+	padding: 0.25em;
+	color: #6B6464;
+}
+#qunit-tests li a:hover,
+#qunit-tests li a:focus {
+	color: #000;
+}
+
+#qunit-tests li .runtime {
+	float: right;
+	font-size: smaller;
+}
+
+.qunit-assert-list {
+	margin-top: 0.5em;
+	padding: 0.5em;
+
+	background-color: #FFF;
+
+	border-radius: 5px;
+}
+
+.qunit-source {
+	margin: 0.6em 0 0.3em;
+}
+
+.qunit-collapsed {
+	display: none;
+}
+
+#qunit-tests table {
+	border-collapse: collapse;
+	margin-top: 0.2em;
+}
+
+#qunit-tests th {
+	text-align: right;
+	vertical-align: top;
+	padding: 0 0.5em 0 0;
+}
+
+#qunit-tests td {
+	vertical-align: top;
+}
+
+#qunit-tests pre {
+	margin: 0;
+	white-space: pre-wrap;
+	word-wrap: break-word;
+}
+
+#qunit-tests del {
+	color: #374E0C;
+	background-color: #E0F2BE;
+	text-decoration: none;
+}
+
+#qunit-tests ins {
+	color: #500;
+	background-color: #FFCACA;
+	text-decoration: none;
+}
+
+/*** Test Counts */
+
+#qunit-tests b.counts                       { color: #000; }
+#qunit-tests b.passed                       { color: #5E740B; }
+#qunit-tests b.failed                       { color: #710909; }
+
+#qunit-tests li li {
+	padding: 5px;
+	background-color: #FFF;
+	border-bottom: none;
+	list-style-position: inside;
+}
+
+/*** Passing Styles */
+
+#qunit-tests li li.pass {
+	color: #3C510C;
+	background-color: #FFF;
+	border-left: 10px solid #C6E746;
+}
+
+#qunit-tests .pass                          { color: #528CE0; background-color: #D2E0E6; }
+#qunit-tests .pass .test-name               { color: #366097; }
+
+#qunit-tests .pass .test-actual,
+#qunit-tests .pass .test-expected           { color: #999; }
+
+#qunit-banner.qunit-pass                    { background-color: #C6E746; }
+
+/*** Failing Styles */
+
+#qunit-tests li li.fail {
+	color: #710909;
+	background-color: #FFF;
+	border-left: 10px solid #EE5757;
+	white-space: pre;
+}
+
+#qunit-tests > li:last-child {
+	border-radius: 0 0 5px 5px;
+}
+
+#qunit-tests .fail                          { color: #000; background-color: #EE5757; }
+#qunit-tests .fail .test-name,
+#qunit-tests .fail .module-name             { color: #000; }
+
+#qunit-tests .fail .test-actual             { color: #EE5757; }
+#qunit-tests .fail .test-expected           { color: #008000; }
+
+#qunit-banner.qunit-fail                    { background-color: #EE5757; }
+
+
+/*** Aborted tests */
+#qunit-tests .aborted { color: #000; background-color: orange; }
+/*** Skipped tests */
+
+#qunit-tests .skipped {
+	background-color: #EBECE9;
+}
+
+#qunit-tests .qunit-todo-label,
+#qunit-tests .qunit-skipped-label {
+	background-color: #F4FF77;
+	display: inline-block;
+	font-style: normal;
+	color: #366097;
+	line-height: 1.8em;
+	padding: 0 0.5em;
+	margin: -0.4em 0.4em -0.4em 0;
+}
+
+#qunit-tests .qunit-todo-label {
+	background-color: #EEE;
+}
+
+/** Result */
+
+#qunit-testresult {
+	color: #2B81AF;
+	background-color: #D2E0E6;
+
+	border-bottom: 1px solid #FFF;
+}
+#qunit-testresult .clearfix {
+	height: 0;
+	clear: both;
+}
+#qunit-testresult .module-name {
+	font-weight: 700;
+}
+#qunit-testresult-display {
+	padding: 0.5em 1em 0.5em 1em;
+	width: 85%;
+	float:left;
+}
+#qunit-testresult-controls {
+	padding: 0.5em 1em 0.5em 1em;
+  width: 10%;
+	float:left;
+}
+
+/** Fixture */
+
+#qunit-fixture {
+	position: absolute;
+	top: -10000px;
+	left: -10000px;
+	width: 1000px;
+	height: 1000px;
+}